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/.cargo/config.toml b/.cargo/config.toml
index d7681b6c2c0a9..189584de8e2e2 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -17,7 +17,7 @@ x = "run --package aptos-cargo-cli --bin aptos-cargo-cli --"
 [build]
 rustflags = ["--cfg", "tokio_unstable", "-C", "force-frame-pointers=yes", "-C", "force-unwind-tables=yes"]
 
-# TODO(grao): Figure out whether we should enable other cpu features, and whether we should use a different way to configure them rather than list every single one here.
+# TODO(grao): Figure out whether we should enable othaer cpu features, and whether we should use a different way to configure them rather than list every single one here.
 [target.x86_64-unknown-linux-gnu]
 rustflags = ["--cfg", "tokio_unstable", "-C", "link-arg=-fuse-ld=lld", "-C", "force-frame-pointers=yes", "-C", "force-unwind-tables=yes", "-C", "target-feature=+sse4.2"]
 
diff --git a/.dockerignore b/.dockerignore
index 4236e8027a391..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/
@@ -38,3 +38,6 @@
 !testsuite/forge/src/backend/k8s/
 !third_party/move/move-prover/boogie-backend/**/*.bpl
 !testsuite/testcases/src/data/
+!types/src/jwks/rsa/insecure_test_jwk.json
+!types/src/jwks/rsa/secure_test_jwk.json
+!types/src/jwks/rsa/insecure_test_jwk_private_key.pem
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 0cbdd3628f006..708522c57bd6d 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,8 +1,8 @@
 blank_issues_enabled: true
 contact_links:
-  - name: Questions and Help (on Stack Overflow)
-    url: https://stackoverflow.com/questions/tagged/aptos
-    about: Support and other Questions are handled by the team and the community on Stack Overflow.
+  - name: Questions and Help (on Aptos Developer Discussions)
+    url: (https://github.com/aptos-labs/aptos-developer-discussions/discussions
+    about: Support and other Questions are handled by the team and the community on Aptos Developer Discussions.
   - name: Questions, Help and Chat (on Discord)
     url: https://discord.gg/aptosnetwork
     about: Contact the development team, contributors and community on Discord
diff --git a/.github/actionlint.yaml b/.github/actionlint.yaml
index a92d6c8ea3bcc..11d59e9073cef 100644
--- a/.github/actionlint.yaml
+++ b/.github/actionlint.yaml
@@ -1,4 +1,4 @@
 self-hosted-runner:
   # Labels of self-hosted runners in array of string
   labels:
-    - high-perf-docker
+    - runs-on,cpu=64,family=c7,hdd=500,image=aptos-ubuntu-x64,run-id=${{ github.run_id }}
diff --git a/.github/actions/general-lints/action.yaml b/.github/actions/general-lints/action.yaml
index 64260bb42de22..aa01b32c9d568 100644
--- a/.github/actions/general-lints/action.yaml
+++ b/.github/actions/general-lints/action.yaml
@@ -29,9 +29,7 @@ runs:
 
     # Setup pnpm
     - name: Setup pnpm
-      uses: pnpm/action-setup@v2
-      with:
-        version: 8.2.0
+      uses: pnpm/action-setup@v4
 
     # Install packages for examples and run package build, lint and tests
     - name: Run ecosystem lint
diff --git a/.github/actions/move-tests-compiler-v2/action.yaml b/.github/actions/move-tests-compiler-v2/action.yaml
index 60c1ba1cb95cd..65411f58939a0 100644
--- a/.github/actions/move-tests-compiler-v2/action.yaml
+++ b/.github/actions/move-tests-compiler-v2/action.yaml
@@ -13,14 +13,6 @@ runs:
       with:
         ref: ${{ github.event.pull_request.head.sha }}
         fetch-depth: 0 # Fetch all git history for accurate target determination
-    - uses: aptos-labs/aptos-core/.github/actions/rust-setup@main
-      with:
-        GIT_CREDENTIALS: ${{ inputs.GIT_CREDENTIALS }}
-
-    # Install nextest
-    - uses: taiki-e/install-action@v1.5.6
-      with:
-        tool: nextest
 
     # Output the changed files
     - name: Output the changed files
diff --git a/.github/actions/run-ts-sdk-e2e-tests/action.yaml b/.github/actions/run-ts-sdk-e2e-tests/action.yaml
index 247bdcfe6cc19..342164652e657 100644
--- a/.github/actions/run-ts-sdk-e2e-tests/action.yaml
+++ b/.github/actions/run-ts-sdk-e2e-tests/action.yaml
@@ -38,7 +38,7 @@ runs:
     # Run a local testnet. This installs node and pnpm too.
     - uses: aptos-labs/actions/run-local-testnet@main
       with:
-        PNPM_VERSION: 8.15.6
+        PNPM_VERSION: 8.3.1
         DOCKER_ARTIFACT_REPO: ${{ inputs.GCP_DOCKER_ARTIFACT_REPO }}
         CLI_GIT_REF: ${{ steps.get-docker-image-tag.outputs.IMAGE_TAG }}
 
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/actions/rust-lints/action.yaml b/.github/actions/rust-lints/action.yaml
index 4ab32c04770c5..762aee0f957de 100644
--- a/.github/actions/rust-lints/action.yaml
+++ b/.github/actions/rust-lints/action.yaml
@@ -10,10 +10,6 @@ runs:
   steps:
     # The source code must be checkout out by the workflow that invokes this action.
 
-    - uses: aptos-labs/aptos-core/.github/actions/rust-setup@main
-      with:
-        GIT_CREDENTIALS: ${{ inputs.GIT_CREDENTIALS }}
-
     # Run the pre-commit checks
     - uses: pre-commit/action@v3.0.0
 
diff --git a/.github/actions/rust-smoke-tests/action.yaml b/.github/actions/rust-smoke-tests/action.yaml
index 4f895164e726a..7bc9c532e1120 100644
--- a/.github/actions/rust-smoke-tests/action.yaml
+++ b/.github/actions/rust-smoke-tests/action.yaml
@@ -10,15 +10,6 @@ runs:
   steps:
     # The source code must be checkout out by the workflow that invokes this action.
 
-    - uses: aptos-labs/aptos-core/.github/actions/rust-setup@main
-      with:
-        GIT_CREDENTIALS: ${{ inputs.GIT_CREDENTIALS }}
-
-    # Install nextest
-    - uses: taiki-e/install-action@v1.5.6
-      with:
-        tool: nextest
-
     # Run a postgres database
     - name: Run postgres database
       run: docker run --detach -p 5432:5432 cimg/postgres:14.2
diff --git a/.github/actions/rust-targeted-unit-tests/action.yaml b/.github/actions/rust-targeted-unit-tests/action.yaml
index e3948ba59dd49..98188ce34b7d2 100644
--- a/.github/actions/rust-targeted-unit-tests/action.yaml
+++ b/.github/actions/rust-targeted-unit-tests/action.yaml
@@ -9,14 +9,6 @@ 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 }}
-
-    # Install nextest
-    - uses: taiki-e/install-action@v1.5.6
-      with:
-        tool: nextest
 
     # Run a postgres database
     - name: Run postgres database
@@ -25,18 +17,18 @@ runs:
 
     # Output the changed files
     - name: Output the changed files
-      run: cargo x changed-files -vv
+      run: cargo x changed-files -vvv
       shell: bash
 
     # Output the affected packages
     - name: Output the affected packages
-      run: cargo x affected-packages -vv
+      run: cargo x affected-packages -vvv
       shell: bash
 
     # Run only the targeted rust unit tests
     - name: Run only the targeted unit tests
       run: |
-        cargo x targeted-unit-tests -vv --profile ci --cargo-profile ci --locked --no-fail-fast --retries 3
+        cargo x targeted-unit-tests -vvv --profile ci --cargo-profile ci --locked --no-fail-fast --retries 3
       shell: bash
       env:
         INDEXER_DATABASE_URL: postgresql://postgres@localhost/postgres
diff --git a/.github/actions/rust-unit-tests/action.yaml b/.github/actions/rust-unit-tests/action.yaml
index a0fb2c8103f1f..e88a2c2e9a0dd 100644
--- a/.github/actions/rust-unit-tests/action.yaml
+++ b/.github/actions/rust-unit-tests/action.yaml
@@ -4,17 +4,11 @@ inputs:
   GIT_CREDENTIALS:
     description: "Optional credentials to pass to git. Useful if you need to pull private repos for dependencies"
     required: false
-  BUILDKITE_ANALYTICS_TOKEN:
-    description: "The Buildkite API token"
-    required: true
 
 runs:
   using: composite
   steps:
     # The source code must be checkout 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 VM features
     - name: Check VM features
@@ -26,16 +20,6 @@ runs:
       run: cargo test --profile ci --locked --doc --workspace --exclude aptos-node-checker
       shell: bash
 
-    # Install nextest
-    - uses: taiki-e/install-action@v1.5.6
-      with:
-        tool: nextest
-
-    # Install buildkite-test-collector
-    - name: Install buildkite-test-collector
-      run: cargo install buildkite-test-collector
-      shell: bash
-
     # Run a postgres database
     - name: Run postgres database
       run: docker run --detach -p 5432:5432 cimg/postgres:14.2
@@ -44,8 +28,7 @@ runs:
     # Run the rust unit tests
     - name: Run all unit tests
       run: |
-        NEXTEST_EXPERIMENTAL_LIBTEST_JSON=1 cargo nextest run --profile ci --cargo-profile ci --locked --workspace --exclude smoke-test --exclude aptos-testcases --retries 3 --no-fail-fast --message-format libtest-json > nextest_output.json || python3 .github/actions/rust-unit-tests/nextest_summary.py nextest_output.json "$GITHUB_STEP_SUMMARY" -f
-        buildkite-test-collector < nextest_output.json || echo "Warning: buildkite-test-collector encountered an error"
+        NEXTEST_EXPERIMENTAL_LIBTEST_JSON=1 cargo nextest run --profile ci --cargo-profile ci --locked --workspace --exclude smoke-test --exclude aptos-testcases --exclude aptos-keyless-circuit --retries 3 --no-fail-fast --message-format libtest-json > nextest_output.json || python3 .github/actions/rust-unit-tests/nextest_summary.py nextest_output.json "$GITHUB_STEP_SUMMARY" -f
         python3 .github/actions/rust-unit-tests/nextest_summary.py nextest_output.json "$GITHUB_STEP_SUMMARY" || echo "summary generation had an error"
         rm nextest_output.json
       shell: bash
@@ -58,4 +41,3 @@ runs:
         CVC5_EXE: /home/runner/bin/cvc5
         DOTNET_ROOT: /home/runner/.dotnet
         BOOGIE_EXE: /home/runner/.dotnet/tools/boogie
-        BUILDKITE_ANALYTICS_TOKEN: ${{ inputs.BUILDKITE_ANALYTICS_TOKEN }}
diff --git a/.github/runs-on.yml b/.github/runs-on.yml
new file mode 100644
index 0000000000000..5394f6bda60ab
--- /dev/null
+++ b/.github/runs-on.yml
@@ -0,0 +1,10 @@
+images:
+  aptos-ubuntu-x64:
+    platform: "linux"
+    arch: "x64"
+    ami: "ami-07ce6402e4a205d44"
+  aptos-ubuntu-x64-latest:
+    platform: "linux"
+    arch: "x64"
+    owner: "058264343338" # aptos-ci AWS account id
+    name: "aptos-runs-on-*"
diff --git a/.github/workflows/adhoc-forge.yaml b/.github/workflows/adhoc-forge.yaml
index 3a3b0bd184000..843d1b86c5c52 100644
--- a/.github/workflows/adhoc-forge.yaml
+++ b/.github/workflows/adhoc-forge.yaml
@@ -1,5 +1,8 @@
 name: "Ad-hoc Forge Run"
 on:
+  pull_request:
+    paths:
+      - ".github/workflows/adhoc-forge.yaml"
   workflow_dispatch:
     inputs:
       GIT_SHA:
@@ -28,6 +31,19 @@ on:
         required: false
         type: string
         description: The Forge k8s cluster to be used for test
+      FORGE_ENABLE_HAPROXY:
+        required: false
+        default: false
+        type: boolean
+        description: enable haproxy for the forge test
+      FORGE_NUM_VALIDATORS:
+        required: false
+        type: string
+        description: Number of validators to use for the forge test
+      FORGE_NUM_VALIDATOR_FULLNODES:
+        required: false
+        type: string
+        description: Number of validator fullnodes to use for the forge test
 
 permissions:
   contents: read
@@ -47,13 +63,19 @@ jobs:
           echo "FORGE_RUNNER_DURATION_SECS: ${{ inputs.FORGE_RUNNER_DURATION_SECS }}"
           echo "FORGE_TEST_SUITE: ${{ inputs.FORGE_TEST_SUITE }}"
           echo "FORGE_CLUSTER_NAME: ${{ inputs.FORGE_CLUSTER_NAME }}"
+          echo "FORGE_ENABLE_HAPROXY: ${{ inputs.FORGE_ENABLE_HAPROXY }}"
+          echo "FORGE_NUM_VALIDATORS: ${{ inputs.FORGE_NUM_VALIDATORS }}"
+          echo "FORGE_NUM_VALIDATOR_FULLNODES: ${{ inputs.FORGE_NUM_VALIDATOR_FULLNODES }}"
     outputs:
       gitSha: ${{ inputs.GIT_SHA }}
       imageTag: ${{ inputs.IMAGE_TAG }}
       forgeImageTag: ${{ inputs.FORGE_IMAGE_TAG }}
-      forgeRunnerDurationSecs: ${{ inputs.FORGE_RUNNER_DURATION_SECS }}
+      forgeRunnerDurationSecs: ${{ inputs.FORGE_RUNNER_DURATION_SECS || 600 }}
       forgeTestSuite: ${{ inputs.FORGE_TEST_SUITE }}
       forgeClusterName: ${{ inputs.FORGE_CLUSTER_NAME }}
+      forgeEnableHaproxy: ${{ inputs.FORGE_ENABLE_HAPROXY }}
+      forgeNumValidators: ${{ inputs.FORGE_NUM_VALIDATORS }}
+      forgeNumValidatorFullnodes: ${{ inputs.FORGE_NUM_VALIDATOR_FULLNODES }}
 
   adhoc-forge-test:
     uses: aptos-labs/aptos-core/.github/workflows/workflow-run-forge.yaml@main
@@ -66,3 +88,6 @@ jobs:
       FORGE_TEST_SUITE: ${{ needs.determine-forge-run-metadata.outputs.forgeTestSuite }}
       FORGE_RUNNER_DURATION_SECS: ${{ fromJSON(needs.determine-forge-run-metadata.outputs.forgeRunnerDurationSecs) }} # fromJSON converts to integer
       FORGE_CLUSTER_NAME: ${{ needs.determine-forge-run-metadata.outputs.forgeClusterName }}
+      FORGE_ENABLE_HAPROXY: ${{ needs.determine-forge-run-metadata.outputs.forgeEnableHaproxy }}
+      FORGE_NUM_VALIDATORS: ${{ needs.determine-forge-run-metadata.outputs.forgeNumValidators }}
+      FORGE_NUM_VALIDATOR_FULLNODES: ${{ needs.determine-forge-run-metadata.outputs.forgeNumValidatorFullnodes }}
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/.github/workflows/check-protos.yaml b/.github/workflows/check-protos.yaml
index acb4a5016a654..adc7cae232c32 100644
--- a/.github/workflows/check-protos.yaml
+++ b/.github/workflows/check-protos.yaml
@@ -51,9 +51,7 @@ jobs:
           version: "25.x"
 
       # Set up pnpm.
-      - uses: pnpm/action-setup@v2
-        with:
-          version: 8.6.2
+      - uses: pnpm/action-setup@v4
 
       # Set up Poetry.
       - name: Install Python deps for generating code from protos
diff --git a/.github/workflows/check-sdk-examples.yaml b/.github/workflows/check-sdk-examples.yaml
index 6e3c5221f9984..b45b52f11267c 100644
--- a/.github/workflows/check-sdk-examples.yaml
+++ b/.github/workflows/check-sdk-examples.yaml
@@ -27,7 +27,7 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version-file: .node-version
-      - uses: pnpm/action-setup@v2
+      - uses: pnpm/action-setup@v4
 
       # Run example code in typescript.
       - uses: nick-fields/retry@7f8f3d9f0f62fe5925341be21c2e8314fd4f7c7c # pin@v2
diff --git a/.github/workflows/cli-e2e-tests.yaml b/.github/workflows/cli-e2e-tests.yaml
index c068d31516f4d..70a1415ba9708 100644
--- a/.github/workflows/cli-e2e-tests.yaml
+++ b/.github/workflows/cli-e2e-tests.yaml
@@ -25,7 +25,7 @@ jobs:
   # we ensure that the Aptos CLI works with all 3 prod networks, at least
   # based on the tests in the test suite.
   run-cli-tests:
-    runs-on: high-perf-docker
+    runs-on: runs-on,cpu=64,family=c7,hdd=500,image=aptos-ubuntu-x64,run-id=${{ github.run_id }}
     permissions:
       contents: read
       id-token: write
diff --git a/.github/workflows/copy-images-to-dockerhub.yaml b/.github/workflows/copy-images-to-dockerhub.yaml
index b2c11a156c6e1..a0063eef1c5bc 100644
--- a/.github/workflows/copy-images-to-dockerhub.yaml
+++ b/.github/workflows/copy-images-to-dockerhub.yaml
@@ -52,7 +52,7 @@ jobs:
         with:
           node-version-file: .node-version
 
-      - uses: pnpm/action-setup@v2
+      - uses: pnpm/action-setup@v4
 
       - name: Release Images
         env:
diff --git a/.github/workflows/coverage-move-only.yaml b/.github/workflows/coverage-move-only.yaml
index 77c73f0cb3b4c..e0b35b9671762 100644
--- a/.github/workflows/coverage-move-only.yaml
+++ b/.github/workflows/coverage-move-only.yaml
@@ -30,7 +30,7 @@ concurrency:
 jobs:
   rust-move-unit-coverage:
     timeout-minutes: 60
-    runs-on: high-perf-docker
+    runs-on: runs-on,cpu=64,family=c7,hdd=500,image=aptos-ubuntu-x64,run-id=${{ github.run_id }}
     steps:
       - uses: actions/checkout@v3
       - uses: aptos-labs/aptos-core/.github/actions/rust-setup@main
@@ -46,11 +46,11 @@ jobs:
           echo "/home/runner/.dotnet" | tee -a $GITHUB_PATH
           echo "/home/runner/.dotnet/tools" | tee -a $GITHUB_PATH
       - run: rustup component add llvm-tools-preview
-      - uses: taiki-e/install-action@6f1ebcd9e21315fc37d7f7bc851dfcc8356d7da3 # pin@v1.5.6
+      - uses: taiki-e/install-action@4fedbddde88aab767a45a011661f832d68202716 # pin@v2.33.28
         with:
           tool: nextest,cargo-llvm-cov
       - run: docker run --detach -p 5432:5432 cimg/postgres:14.2
-      - run: cargo llvm-cov --ignore-run-fail -p aptos-framework -p "move*" --lcov --jobs 32 --output-path lcov_unit.info
+      - run: cargo llvm-cov nextest --lcov --output-path lcov_unit.info --ignore-run-fail -p aptos-framework -p "move*"
         env:
           INDEXER_DATABASE_URL: postgresql://postgres@localhost/postgres
       - uses: actions/upload-artifact@v3
diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml
index 5860e91e606a2..c599f3ef023dd 100644
--- a/.github/workflows/coverage.yaml
+++ b/.github/workflows/coverage.yaml
@@ -27,18 +27,18 @@ jobs:
       (github.event_name == 'schedule' && github.ref_name == 'main')
     # Note the tests run slowly due to instrutmentation. It takes CI 10 hrs
     timeout-minutes: 720
-    runs-on: high-perf-docker
+    runs-on: runs-on,cpu=64,family=c7,hdd=500,image=aptos-ubuntu-x64,run-id=${{ github.run_id }}
     steps:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0 # get all the history because cargo xtest --change-since origin/main requires it.
       - uses: aptos-labs/aptos-core/.github/actions/rust-setup@main
       - run: rustup component add llvm-tools-preview
-      - uses: taiki-e/install-action@6f1ebcd9e21315fc37d7f7bc851dfcc8356d7da3 # pin@v1.5.6
+      - uses: taiki-e/install-action@4fedbddde88aab767a45a011661f832d68202716 # pin@v2.33.28
         with:
           tool: nextest,cargo-llvm-cov
       - run: docker run --detach -p 5432:5432 cimg/postgres:14.2
-      - run: cargo llvm-cov --ignore-run-fail --workspace --exclude smoke-test --exclude aptos-testcases --lcov --jobs 32 --output-path lcov_unit.info -vv
+      - run: cargo llvm-cov nextest --lcov --output-path lcov_unit.info -vv --ignore-run-fail --workspace --exclude smoke-test --exclude aptos-testcases
         env:
           INDEXER_DATABASE_URL: postgresql://postgres@localhost/postgres
           RUST_MIN_STACK: 33554432 # 32 MB of stack
@@ -58,18 +58,18 @@ jobs:
       contains(github.event.pull_request.labels.*.name, 'CICD:run-coverage') ||
       (github.event_name == 'schedule' && github.ref_name == 'main')
     timeout-minutes: 720 # incremented from 240 due to execution time limit hit in cron
-    runs-on: high-perf-docker
+    runs-on: runs-on,cpu=64,family=c7,hdd=500,image=aptos-ubuntu-x64,run-id=${{ github.run_id }}
     steps:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0 # get all the history because cargo xtest --change-since origin/main requires it.
       - uses: aptos-labs/aptos-core/.github/actions/rust-setup@main
       - run: rustup component add llvm-tools-preview
-      - uses: taiki-e/install-action@6f1ebcd9e21315fc37d7f7bc851dfcc8356d7da3 # pin@v1.5.6
+      - uses: taiki-e/install-action@4fedbddde88aab767a45a011661f832d68202716 # pin@v2.33.28
         with:
           tool: nextest,cargo-llvm-cov
       - run: docker run --detach -p 5432:5432 cimg/postgres:14.2
-      - run: cargo llvm-cov --ignore-run-fail --package smoke-test --lcov --output-path lcov_smoke.info -vv
+      - run: cargo build --locked --package=aptos-node --features=failpoints,indexer --release && LLVM_PROFDATA_FLAGS="--failure-mode=all" LOCAL_SWARM_NODE_RELEASE=1 cargo llvm-cov nextest --lcov --output-path lcov_smoke.info -vv --ignore-run-fail --profile smoke-test -p smoke-test
         env:
           INDEXER_DATABASE_URL: postgresql://postgres@localhost/postgres
           RUST_MIN_STACK: 33554432
diff --git a/.github/workflows/docker-build-rosetta.yaml b/.github/workflows/docker-build-rosetta.yaml
index 8d5b32b60c86c..6139c8d8ed194 100644
--- a/.github/workflows/docker-build-rosetta.yaml
+++ b/.github/workflows/docker-build-rosetta.yaml
@@ -17,7 +17,7 @@ permissions:
 
 jobs:
   build:
-    runs-on: high-perf-docker
+    runs-on: runs-on,cpu=64,family=c7,hdd=500,image=aptos-ubuntu-x64,run-id=${{ github.run_id }}
     steps:
       - uses: actions/checkout@v3
 
diff --git a/.github/workflows/docker-build-test.yaml b/.github/workflows/docker-build-test.yaml
index efccf0e2c2f78..bed1625f8697e 100644
--- a/.github/workflows/docker-build-test.yaml
+++ b/.github/workflows/docker-build-test.yaml
@@ -312,7 +312,7 @@ jobs:
     with:
       GIT_SHA: ${{ needs.determine-docker-build-metadata.outputs.gitSha }}
       FORGE_TEST_SUITE: compat
-      IMAGE_TAG: 01b24e7e3548382dd25440b39a0438a993387f12 #aptos-node-v1.11 with randomness disabled in genesis
+      IMAGE_TAG: 1c2ee7082d6eff8c811ee25d6f5a7d00860a75d5 #aptos-node-v1.16.0
       FORGE_RUNNER_DURATION_SECS: 300
       COMMENT_HEADER: forge-compat
       FORGE_NAMESPACE: forge-compat-${{ needs.determine-docker-build-metadata.outputs.targetCacheId }}
@@ -340,7 +340,7 @@ jobs:
     with:
       GIT_SHA: ${{ needs.determine-docker-build-metadata.outputs.gitSha }}
       FORGE_TEST_SUITE: framework_upgrade
-      IMAGE_TAG: 01b24e7e3548382dd25440b39a0438a993387f12 #aptos-node-v1.11 with randomness disabled in genesis
+      IMAGE_TAG: 1c2ee7082d6eff8c811ee25d6f5a7d00860a75d5 #aptos-node-v1.16.0
       FORGE_RUNNER_DURATION_SECS: 3600
       COMMENT_HEADER: forge-framework-upgrade
       FORGE_NAMESPACE: forge-framework-upgrade-${{ needs.determine-docker-build-metadata.outputs.targetCacheId }}
diff --git a/.github/workflows/faucet-tests-main.yaml b/.github/workflows/faucet-tests-main.yaml
index 82f35a0699ba2..0ca51a2f84708 100644
--- a/.github/workflows/faucet-tests-main.yaml
+++ b/.github/workflows/faucet-tests-main.yaml
@@ -49,7 +49,7 @@ jobs:
   # be compatible in production.
   run-tests-main:
     if: contains(github.event.pull_request.labels.*.name, 'CICD:non-required-tests')
-    runs-on: high-perf-docker
+    runs-on: runs-on,cpu=64,family=c7,hdd=500,image=aptos-ubuntu-x64,run-id=${{ github.run_id }}
     steps:
       - uses: actions/checkout@v3
         if: ${{ !inputs.SKIP_JOB }}
diff --git a/.github/workflows/faucet-tests-prod.yaml b/.github/workflows/faucet-tests-prod.yaml
index 58b0a2dfee5cc..940ef883a1e20 100644
--- a/.github/workflows/faucet-tests-prod.yaml
+++ b/.github/workflows/faucet-tests-prod.yaml
@@ -37,7 +37,7 @@ jobs:
   run-tests-devnet:
     if: contains(github.event.pull_request.labels.*.name, 'CICD:non-required-tests')
     needs: [permission-check]
-    runs-on: high-perf-docker
+    runs-on: runs-on,cpu=64,family=c7,hdd=500,image=aptos-ubuntu-x64,run-id=${{ github.run_id }}
     steps:
       - uses: actions/checkout@v3
       - uses: aptos-labs/aptos-core/.github/actions/docker-setup@main
@@ -57,7 +57,7 @@ jobs:
   run-tests-testnet:
     if: contains(github.event.pull_request.labels.*.name, 'CICD:non-required-tests')
     needs: [permission-check]
-    runs-on: high-perf-docker
+    runs-on: runs-on,cpu=64,family=c7,hdd=500,image=aptos-ubuntu-x64,run-id=${{ github.run_id }}
     permissions:
       contents: read
       id-token: write
diff --git a/.github/workflows/find-packages-with-undeclared-feature-dependencies.yaml b/.github/workflows/find-packages-with-undeclared-feature-dependencies.yaml
index 42ee5c8f3db93..45dfe907189b5 100644
--- a/.github/workflows/find-packages-with-undeclared-feature-dependencies.yaml
+++ b/.github/workflows/find-packages-with-undeclared-feature-dependencies.yaml
@@ -4,7 +4,7 @@ on:
 
 jobs:
   find-packages-with-undeclared-feature-dependencies:
-    runs-on: high-perf-docker
+    runs-on: runs-on,cpu=64,family=c7,hdd=500,image=aptos-ubuntu-x64,run-id=${{ github.run_id }}
     steps:
       - uses: actions/checkout@v3
       - uses: aptos-labs/aptos-core/.github/actions/rust-setup@main
diff --git a/.github/workflows/forge-stable.yaml b/.github/workflows/forge-stable.yaml
index 3ee64df78ab4f..f9a40f10b2c8c 100644
--- a/.github/workflows/forge-stable.yaml
+++ b/.github/workflows/forge-stable.yaml
@@ -24,15 +24,14 @@ on:
         required: false
         type: string
         description: The git SHA1 to checkout. This affects the Forge test runner that is used. If not specified, the latest main will be used
+  # NOTE: to support testing different branches on different schedules, you need to specify the cron schedule in the 'determine-test-branch' step as well below
+  # Reference: https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#schedule
   schedule:
-    - cron: "0 6 * * *" # The main branch cadence. This runs every day at 6am UTC.
+    - cron: "0 22 * * 0,2,4" # The main branch cadence. This runs every Sun,Tues,Thurs
   pull_request:
     paths:
       - ".github/workflows/forge-stable.yaml"
       - "testsuite/find_latest_image.py"
-  push:
-    branches:
-      - aptos-release-v* # the aptos release branches
 
 env:
   AWS_ACCOUNT_NUM: ${{ secrets.ENV_ECR_AWS_ACCOUNT_NUM }}
@@ -55,9 +54,10 @@ jobs:
 
       - name: Determine branch based on cadence
         id: determine-test-branch
+        # NOTE: the schedule cron MUST match the one in the 'on.schedule.cron' section above
         run: |
           if [[ "${{ github.event_name }}" == "schedule" ]]; then
-            if [[ "${{ github.event.schedule }}" == "0 6 * * *" ]]; then
+            if [[ "${{ github.event.schedule }}" == "0 22 * * 0,2,4" ]]; then
               echo "Branch: main"
               echo "BRANCH=main" >> $GITHUB_OUTPUT
             else
@@ -128,33 +128,21 @@ jobs:
     uses: aptos-labs/aptos-core/.github/workflows/workflow-run-forge.yaml@main
     secrets: inherit
     with:
-      IMAGE_TAG: 01b24e7e3548382dd25440b39a0438a993387f12 #aptos-node-v1.11 with randomness disabled in genesis
+      IMAGE_TAG: 1c2ee7082d6eff8c811ee25d6f5a7d00860a75d5 #aptos-node-v1.16.0
       FORGE_NAMESPACE: forge-framework-upgrade-${{ needs.determine-test-metadata.outputs.BRANCH_HASH }}
       FORGE_RUNNER_DURATION_SECS: 7200 # Run for 2 hours
       FORGE_TEST_SUITE: framework_upgrade
       POST_TO_SLACK: true
 
-  run-forge-realistic-env-max-load-long:
-    if: ${{ github.event_name != 'pull_request' && always() }}
-    needs: [determine-test-metadata, run-forge-framework-upgrade-test] # Only run after the previous job completes
-    uses: aptos-labs/aptos-core/.github/workflows/workflow-run-forge.yaml@main
-    secrets: inherit
-    with:
-      IMAGE_TAG: ${{ needs.determine-test-metadata.outputs.IMAGE_TAG }}
-      FORGE_NAMESPACE: forge-realistic-env-max-load-long-${{ needs.determine-test-metadata.outputs.BRANCH_HASH }}
-      FORGE_RUNNER_DURATION_SECS: 7200 # Run for 2 hours
-      FORGE_TEST_SUITE: realistic_env_max_load_large
-      POST_TO_SLACK: true
-
   run-forge-realistic-env-load-sweep:
     if: ${{ github.event_name != 'pull_request' && always() }}
-    needs: [determine-test-metadata, run-forge-realistic-env-max-load-long] # Only run after the previous job completes
+    needs: [determine-test-metadata, run-forge-framework-upgrade-test] # Only run after the previous job completes
     uses: aptos-labs/aptos-core/.github/workflows/workflow-run-forge.yaml@main
     secrets: inherit
     with:
       IMAGE_TAG: ${{ needs.determine-test-metadata.outputs.IMAGE_TAG }}
       FORGE_NAMESPACE: forge-realistic-env-load-sweep-${{ needs.determine-test-metadata.outputs.BRANCH_HASH }}
-      FORGE_RUNNER_DURATION_SECS: 1500 # Run for 25 minutes (5 tests, each for 300 seconds)
+      FORGE_RUNNER_DURATION_SECS: 1800 # Run for 30 minutes (6 tests, each for 300 seconds)
       FORGE_TEST_SUITE: realistic_env_load_sweep
       POST_TO_SLACK: true
 
@@ -166,7 +154,7 @@ jobs:
     with:
       IMAGE_TAG: ${{ needs.determine-test-metadata.outputs.IMAGE_TAG }}
       FORGE_NAMESPACE: forge-realistic-env-workload-sweep-${{ needs.determine-test-metadata.outputs.BRANCH_HASH }}
-      FORGE_RUNNER_DURATION_SECS: 1600 # Run for 26 minutes (4 tests, each for 400 seconds)
+      FORGE_RUNNER_DURATION_SECS: 2000 # Run for 33 minutes (5 tests, each for 400 seconds)
       FORGE_TEST_SUITE: realistic_env_workload_sweep
       POST_TO_SLACK: true
 
@@ -182,11 +170,35 @@ jobs:
       FORGE_TEST_SUITE: realistic_env_graceful_overload
       POST_TO_SLACK: true
 
-  run-forge-realistic-network-tuned-for-throughput:
+  run-forge-realistic-env-graceful-workload-sweep:
     if: ${{ github.event_name != 'pull_request' && always() }}
     needs: [determine-test-metadata, run-forge-realistic-env-graceful-overload] # Only run after the previous job completes
     uses: aptos-labs/aptos-core/.github/workflows/workflow-run-forge.yaml@main
     secrets: inherit
+    with:
+      IMAGE_TAG: ${{ needs.determine-test-metadata.outputs.IMAGE_TAG }}
+      FORGE_NAMESPACE: forge-realistic-env-graceful-workload-sweep-${{ needs.determine-test-metadata.outputs.BRANCH_HASH }}
+      FORGE_RUNNER_DURATION_SECS: 2100 # Run for 5 minutes per test, 7 tests.
+      FORGE_TEST_SUITE: realistic_env_graceful_workload_sweep
+      POST_TO_SLACK: true
+
+  run-forge-realistic-env-fairness-workload-sweep:
+    if: ${{ github.event_name != 'pull_request' && always() }}
+    needs: [determine-test-metadata, run-forge-realistic-env-graceful-workload-sweep] # Only run after the previous job completes
+    uses: aptos-labs/aptos-core/.github/workflows/workflow-run-forge.yaml@main
+    secrets: inherit
+    with:
+      IMAGE_TAG: ${{ needs.determine-test-metadata.outputs.IMAGE_TAG }}
+      FORGE_NAMESPACE: forge-realistic-env-fairness-workload-sweep-${{ needs.determine-test-metadata.outputs.BRANCH_HASH }}
+      FORGE_RUNNER_DURATION_SECS: 900 # Run for 5 minutes per test, 3 tests.
+      FORGE_TEST_SUITE: realistic_env_fairness_workload_sweep
+      POST_TO_SLACK: true
+
+  run-forge-realistic-network-tuned-for-throughput:
+    if: ${{ github.event_name != 'pull_request' && always() }}
+    needs: [ determine-test-metadata, run-forge-realistic-env-fairness-workload-sweep ] # Only run after the previous job completes
+    uses: aptos-labs/aptos-core/.github/workflows/workflow-run-forge.yaml@main
+    secrets: inherit
     with:
       IMAGE_TAG: ${{ needs.determine-test-metadata.outputs.IMAGE_TAG }}
       FORGE_NAMESPACE: forge-realistic-network-tuned-for-throughput-${{ needs.determine-test-metadata.outputs.BRANCH_HASH }}
@@ -233,22 +245,9 @@ jobs:
       FORGE_TEST_SUITE: single_vfn_perf
       POST_TO_SLACK: true
 
-  run-forge-haproxy:
-    if: ${{ github.event_name != 'pull_request' && always() }}
-    needs: [determine-test-metadata, run-forge-single-vfn-perf] # Only run after the previous job completes
-    uses: aptos-labs/aptos-core/.github/workflows/workflow-run-forge.yaml@main
-    secrets: inherit
-    with:
-      IMAGE_TAG: ${{ needs.determine-test-metadata.outputs.IMAGE_TAG }}
-      FORGE_NAMESPACE: forge-haproxy-${{ needs.determine-test-metadata.outputs.BRANCH_HASH }}
-      FORGE_RUNNER_DURATION_SECS: 600 # Run for 10 minutes
-      FORGE_ENABLE_HAPROXY: true
-      FORGE_TEST_SUITE: realistic_env_max_load
-      POST_TO_SLACK: true
-
   run-forge-fullnode-reboot-stress-test:
     if: ${{ github.event_name != 'pull_request' && always() }}
-    needs: [determine-test-metadata, run-forge-haproxy] # Only run after the previous job completes
+    needs: [determine-test-metadata, run-forge-single-vfn-perf] # Only run after the previous job completes
     uses: aptos-labs/aptos-core/.github/workflows/workflow-run-forge.yaml@main
     secrets: inherit
     with:
@@ -270,7 +269,7 @@ jobs:
       FORGE_RUNNER_DURATION_SECS: 300 # Run for 5 minutes
       # This will upgrade from testnet branch to the latest main
       FORGE_TEST_SUITE: compat
-      IMAGE_TAG: 01b24e7e3548382dd25440b39a0438a993387f12 #aptos-node-v1.11 with randomness disabled in genesis
+      IMAGE_TAG: 1c2ee7082d6eff8c811ee25d6f5a7d00860a75d5 #aptos-node-v1.16.0
       GIT_SHA: ${{ needs.determine-test-metadata.outputs.IMAGE_TAG }} # this is the git ref to checkout
       POST_TO_SLACK: true
 
@@ -314,3 +313,18 @@ jobs:
       FORGE_RUNNER_DURATION_SECS: 900 # Run for 15 minutes
       FORGE_TEST_SUITE: pfn_const_tps_with_realistic_env
       POST_TO_SLACK: true
+
+
+  # longest test for last, to get useful signal from short tests first
+
+  run-forge-realistic-env-max-load-long:
+    if: ${{ github.event_name != 'pull_request' && always() }}
+    needs: [determine-test-metadata, run-forge-pfn-const-tps-realistic-env] # Only run after the previous job completes
+    uses: aptos-labs/aptos-core/.github/workflows/workflow-run-forge.yaml@main
+    secrets: inherit
+    with:
+      IMAGE_TAG: ${{ needs.determine-test-metadata.outputs.IMAGE_TAG }}
+      FORGE_NAMESPACE: forge-realistic-env-max-load-long-${{ needs.determine-test-metadata.outputs.BRANCH_HASH }}
+      FORGE_RUNNER_DURATION_SECS: 7200 # Run for 2 hours
+      FORGE_TEST_SUITE: realistic_env_max_load_large
+      POST_TO_SLACK: true
diff --git a/.github/workflows/forge-unstable.yaml b/.github/workflows/forge-unstable.yaml
index dc0d6e5eb4d4f..bfc926007220e 100644
--- a/.github/workflows/forge-unstable.yaml
+++ b/.github/workflows/forge-unstable.yaml
@@ -101,7 +101,7 @@ jobs:
 
   run-forge-state-sync-slow-processing-catching-up-test:
     if: ${{ github.event_name != 'pull_request' && always() }}
-    needs: [determine-test-metadata, forge-continuous] # Only run after the previous job completes
+    needs: [ determine-test-metadata, forge-continuous ] # Only run after the previous job completes
     uses: aptos-labs/aptos-core/.github/workflows/workflow-run-forge.yaml@main
     secrets: inherit
     with:
@@ -116,7 +116,7 @@ jobs:
 
   run-forge-twin-validator-test:
     if: ${{ github.event_name != 'pull_request' && always() }}
-    needs: [determine-test-metadata, run-forge-state-sync-slow-processing-catching-up-test] # Only run after the previous job completes
+    needs: [ determine-test-metadata, run-forge-state-sync-slow-processing-catching-up-test ] # Only run after the previous job completes
     uses: aptos-labs/aptos-core/.github/workflows/workflow-run-forge.yaml@main
     secrets: inherit
     with:
@@ -130,7 +130,7 @@ jobs:
 
   run-forge-state-sync-failures-catching-up-test:
     if: ${{ github.event_name != 'pull_request' && always() }}
-    needs: [determine-test-metadata, run-forge-twin-validator-test] # Only run after the previous job completes
+    needs: [ determine-test-metadata, run-forge-twin-validator-test ] # Only run after the previous job completes
     uses: aptos-labs/aptos-core/.github/workflows/workflow-run-forge.yaml@main
     secrets: inherit
     with:
@@ -145,7 +145,7 @@ jobs:
 
   run-forge-validator-reboot-stress-test:
     if: ${{ github.event_name != 'pull_request' && always() }}
-    needs: [determine-test-metadata, run-forge-state-sync-failures-catching-up-test] # Only run after the previous job completes
+    needs: [ determine-test-metadata, run-forge-state-sync-failures-catching-up-test ] # Only run after the previous job completes
     uses: aptos-labs/aptos-core/.github/workflows/workflow-run-forge.yaml@main
     secrets: inherit
     with:
@@ -156,3 +156,18 @@ jobs:
       FORGE_RUNNER_DURATION_SECS: 2400 # Run for 40 minutes
       FORGE_TEST_SUITE: validator_reboot_stress_test
       POST_TO_SLACK: true
+
+  run-forge-haproxy:
+    if: ${{ github.event_name != 'pull_request' && always() }}
+    needs: [ determine-test-metadata, run-forge-validator-reboot-stress-test ] # Only run after the previous job completes
+    uses: aptos-labs/aptos-core/.github/workflows/workflow-run-forge.yaml@main
+    secrets: inherit
+    with:
+      IMAGE_TAG: ${{ needs.determine-test-metadata.outputs.IMAGE_TAG }}
+      # GCP cluster
+      FORGE_CLUSTER_NAME: aptos-forge-1
+      FORGE_NAMESPACE: forge-haproxy-${{ needs.determine-test-metadata.outputs.BRANCH_HASH }}
+      FORGE_RUNNER_DURATION_SECS: 600 # Run for 10 minutes
+      FORGE_ENABLE_HAPROXY: true
+      FORGE_TEST_SUITE: realistic_env_max_load
+      POST_TO_SLACK: true
diff --git a/.github/workflows/fuzzer-test.yaml b/.github/workflows/fuzzer-test.yaml
new file mode 100644
index 0000000000000..5f63d44614dec
--- /dev/null
+++ b/.github/workflows/fuzzer-test.yaml
@@ -0,0 +1,33 @@
+name: "Fuzzers test"
+
+on:
+  pull_request:
+    types: [labeled, opened, synchronize, reopened, auto_merge_enabled]
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+
+jobs:
+  test-fuzzers:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Maximize build space
+        uses: easimon/maximize-build-space@fc881a613ad2a34aca9c9624518214ebc21dfc0c
+        with:
+          root-reserve-mb: 4096
+          swap-size-mb: 1024
+          remove-dotnet: 'true'
+          remove-android: 'true'
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Install Dependencies
+        shell: bash
+        run: |
+            scripts/dev_setup.sh -b
+
+      - name: Test Fuzzers
+        shell: bash
+        run: |
+          cd testsuite/fuzzer && ./fuzz.sh test
\ No newline at end of file
diff --git a/.github/workflows/indexer-grpc-integration-tests.yaml b/.github/workflows/indexer-grpc-integration-tests.yaml
index 5d739a532a24f..4a1c2aa93b181 100644
--- a/.github/workflows/indexer-grpc-integration-tests.yaml
+++ b/.github/workflows/indexer-grpc-integration-tests.yaml
@@ -30,7 +30,7 @@ jobs:
   run-tests-local-testnet:
     if: contains(github.event.pull_request.labels.*.name, 'CICD:non-required-tests')
     needs: [permission-check]
-    runs-on: high-perf-docker
+    runs-on: runs-on,cpu=64,family=c7,hdd=500,image=aptos-ubuntu-x64,run-id=${{ github.run_id }}
     env:
       # spin up the local testnet using the latest devnet image
       VALIDATOR_IMAGE_REPO: ${{ vars.GCP_DOCKER_ARTIFACT_REPO }}/validator
diff --git a/.github/workflows/keyless-circuit-daily-test.yaml b/.github/workflows/keyless-circuit-daily-test.yaml
new file mode 100644
index 0000000000000..8fecb6df2c516
--- /dev/null
+++ b/.github/workflows/keyless-circuit-daily-test.yaml
@@ -0,0 +1,32 @@
+name: "Keyless Circuit Daily Test"
+on:
+  # Allow us to manually run this specific workflow without a PR
+  workflow_dispatch:
+  schedule:
+    - cron: "12 12 * * *" # at 12:12 UTC every day
+  pull_request:
+    paths:
+      - ".github/workflows/keyless-circuit-daily-test.yaml"
+      - "keyless/circuit/**"
+env:
+  CARGO_INCREMENTAL: "0"
+  CARGO_TERM_COLOR: always
+
+# cancel redundant builds
+concurrency:
+  # cancel redundant builds on PRs (only on PR, not on branches)
+  group: ${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.ref) || github.sha }}
+  cancel-in-progress: true
+
+jobs:
+  run-all-circuit-tests:
+    runs-on: runs-on,cpu=64,family=c7,hdd=500,image=aptos-ubuntu-x64,run-id=${{ github.run_id }}
+    timeout-minutes: 30
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0 # get all the history because cargo xtest --change-since origin/main requires it.
+      - uses: ./.github/actions/rust-setup
+      - run: |
+          . keyless/circuit/tools/install-deps.sh
+          cargo test -p aptos-keyless-circuit -- --nocapture
diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml
index 6782c2701e09e..6cc655ec8e75e 100644
--- a/.github/workflows/lint-test.yaml
+++ b/.github/workflows/lint-test.yaml
@@ -56,20 +56,16 @@ jobs:
   # Run the crypto hasher domain separation checks
   rust-cryptohasher-domain-separation-check:
     needs: file_change_determinator
-    runs-on: high-perf-docker
+    runs-on: runs-on,cpu=64,family=c7,hdd=500,image=aptos-ubuntu-x64,run-id=${{ github.run_id }}
     if: contains(github.event.pull_request.labels.*.name, 'CICD:non-required-tests')
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v4
-      - uses: aptos-labs/aptos-core/.github/actions/rust-setup@main
-        with:
-          GIT_CREDENTIALS: ${{ secrets.GIT_CREDENTIALS }}
       - run: python3 scripts/check-cryptohasher-symbols.py
 
   # Run all rust lints. This is a PR required job.
   rust-lints:
     needs: file_change_determinator
-    runs-on: high-perf-docker
+    runs-on: runs-on,cpu=64,family=c7,hdd=500,image=aptos-ubuntu-x64,run-id=${{ github.run_id }}
     steps:
       - uses: actions/checkout@v4
         if: needs.file_change_determinator.outputs.only_docs_changed != 'true'
@@ -83,6 +79,36 @@ jobs:
       - run: echo "Skipping rust lints! Unrelated changes detected."
         if: needs.file_change_determinator.outputs.only_docs_changed == 'true'
 
+  # Run cargo deny. This is a PR required job.
+  rust-cargo-deny:
+    needs: file_change_determinator
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        if: needs.file_change_determinator.outputs.only_docs_changed != 'true'
+      - uses: EmbarkStudios/cargo-deny-action@v1
+        with:
+          command: check licenses
+      - run: echo "Skipping cargo deny! Unrelated changes detected."
+        if: needs.file_change_determinator.outputs.only_docs_changed == 'true'
+
+  # Run the docs tests. This is a PR required job.
+  rust-doc-tests:
+    if: | # Only run when an appropriate event occurs
+      (
+        github.event_name == 'workflow_dispatch' ||
+        github.event_name == 'push' ||
+        contains(github.event.pull_request.labels.*.name, 'CICD:run-e2e-tests') ||
+        github.event.pull_request.auto_merge != null
+      )
+    runs-on: runs-on,cpu=64,family=c7,hdd=500,image=aptos-ubuntu-x64,run-id=${{ github.run_id }}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Run rust doc tests
+        uses: ./.github/actions/rust-doc-tests
+        with:
+          GIT_CREDENTIALS: ${{ secrets.GIT_CREDENTIALS }}
+
   # Run all rust smoke tests. This is a PR required job.
   rust-smoke-tests:
     needs: file_change_determinator
@@ -94,7 +120,7 @@ jobs:
         github.event.pull_request.auto_merge != null) ||
         contains(github.event.pull_request.body, '#e2e'
       )
-    runs-on: high-perf-docker
+    runs-on: runs-on,cpu=64,family=c7,hdd=500,image=aptos-ubuntu-x64,run-id=${{ github.run_id }}
     steps:
       - uses: actions/checkout@v4
         if: needs.file_change_determinator.outputs.only_docs_changed != 'true'
@@ -106,10 +132,32 @@ jobs:
       - run: echo "Skipping rust smoke tests! Unrelated changes detected."
         if: needs.file_change_determinator.outputs.only_docs_changed == 'true'
 
+  # Check the freshess of the merge base. This is a PR required job.
+  rust-check-merge-base:
+    if: | # Don't run on release branches
+      (
+        !contains(github.event.pull_request.base.ref, '-release-')
+      )
+    needs: file_change_determinator
+    runs-on: runs-on,cpu=64,family=c7,hdd=500,image=aptos-ubuntu-x64,run-id=${{ github.run_id }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+          fetch-depth: 0 # Fetch all git history for accurate target determination
+      - name: Run the merge base freshness check
+        uses: ./.github/actions/rust-check-merge-base
+        with:
+          GIT_CREDENTIALS: ${{ secrets.GIT_CREDENTIALS }}
+
   # Run only the targeted rust unit tests. This is a PR required job.
   rust-targeted-unit-tests:
+    if: | # Don't run on release branches. Instead, all unit tests will be triggered.
+      (
+        !contains(github.event.pull_request.base.ref, '-release-')
+      )
     needs: file_change_determinator
-    runs-on: high-perf-docker
+    runs-on: runs-on,cpu=64,family=c7,hdd=500,image=aptos-ubuntu-x64,run-id=${{ github.run_id }}
     steps:
       - uses: actions/checkout@v4
         with:
@@ -126,16 +174,16 @@ jobs:
       (
         github.event_name == 'workflow_dispatch' ||
         github.event_name == 'push' ||
-        contains(github.event.pull_request.labels.*.name, 'CICD:run-all-unit-tests')
+        contains(github.event.pull_request.labels.*.name, 'CICD:run-all-unit-tests') ||
+        contains(github.event.pull_request.base.ref, '-release-')
       )
-    runs-on: high-perf-docker
+    runs-on: runs-on,cpu=64,family=c7,hdd=500,image=aptos-ubuntu-x64,run-id=${{ github.run_id }}
     steps:
       - uses: actions/checkout@v4
       - name: Run rust unit tests
         uses: ./.github/actions/rust-unit-tests
         with:
           GIT_CREDENTIALS: ${{ secrets.GIT_CREDENTIALS }}
-          BUILDKITE_ANALYTICS_TOKEN: ${{ secrets.BUILDKITE_ANALYTICS_TOKEN }}
 
   # Run the cached packages build. This is a PR required job.
   rust-build-cached-packages:
@@ -147,13 +195,10 @@ jobs:
         contains(github.event.pull_request.labels.*.name, 'CICD:run-e2e-tests') ||
         github.event.pull_request.auto_merge != null
       )
-    runs-on: high-perf-docker
+    runs-on: runs-on,cpu=64,family=c7,hdd=500,image=aptos-ubuntu-x64,run-id=${{ github.run_id }}
     steps:
       - uses: actions/checkout@v4
         if: needs.file_change_determinator.outputs.only_docs_changed != 'true'
-      - uses: aptos-labs/aptos-core/.github/actions/rust-setup@main
-        with:
-          GIT_CREDENTIALS: ${{ secrets.GIT_CREDENTIALS }}
       - name: Run aptos cached packages build test
         if: needs.file_change_determinator.outputs.only_docs_changed != 'true'
         run: scripts/cargo_build_aptos_cached_packages.sh --check
@@ -162,32 +207,20 @@ jobs:
 
   # Run the consensus only unit tests
   rust-consensus-only-unit-test:
-    runs-on: high-perf-docker
+    runs-on: runs-on,cpu=64,family=c7,hdd=500,image=aptos-ubuntu-x64,run-id=${{ github.run_id }}
     if: contains(github.event.pull_request.labels.*.name, 'CICD:build-consensus-only-image')
     steps:
       - uses: actions/checkout@v4
-      - uses: aptos-labs/aptos-core/.github/actions/rust-setup@main
-        with:
-          GIT_CREDENTIALS: ${{ secrets.GIT_CREDENTIALS }}
-      - uses: taiki-e/install-action@v1.5.6
-        with:
-          tool: nextest
       - run: cargo nextest run --locked --workspace --exclude smoke-test --exclude aptos-testcases --exclude aptos-api --exclude aptos-executor-benchmark --exclude aptos-backup-cli --retries 3 --no-fail-fast -F consensus-only-perf-test
         env:
           RUST_MIN_STACK: 4297152
 
   # Run the consensus only smoke test
   rust-consensus-only-smoke-test:
-    runs-on: high-perf-docker
+    runs-on: runs-on,cpu=64,family=c7,hdd=500,image=aptos-ubuntu-x64,run-id=${{ github.run_id }}
     if: contains(github.event.pull_request.labels.*.name, 'CICD:build-consensus-only-image')
     steps:
       - uses: actions/checkout@v4
-      - uses: aptos-labs/aptos-core/.github/actions/rust-setup@main
-        with:
-          GIT_CREDENTIALS: ${{ secrets.GIT_CREDENTIALS }}
-      - uses: taiki-e/install-action@v1.5.6
-        with:
-          tool: nextest
       # prebuild aptos-node binary, so that tests don't start before node is built.
       # also prebuild aptos-node binary as a separate step to avoid feature unification issues
       - run: cargo build --locked --package=aptos-node -F consensus-only-perf-test --release && LOCAL_SWARM_NODE_RELEASE=1 CONSENSUS_ONLY_PERF_TEST=1 cargo nextest run --release --package smoke-test -E "test(test_consensus_only_with_txn_emitter)" --run-ignored all
diff --git a/.github/workflows/move-test-compiler-v2.yaml b/.github/workflows/move-test-compiler-v2.yaml
index 1b7bf22e85fa1..449892ab72f59 100644
--- a/.github/workflows/move-test-compiler-v2.yaml
+++ b/.github/workflows/move-test-compiler-v2.yaml
@@ -26,7 +26,7 @@ concurrency:
 jobs:
   # Run Aptos Move Compiler v2 tests. This is a PR required job.
   rust-move-tests:
-    runs-on: high-perf-docker
+    runs-on: runs-on,cpu=64,family=c7,hdd=500,image=aptos-ubuntu-x64,run-id=${{ github.run_id }}
     steps:
       - uses: actions/checkout@v3
       - name: Run Aptos Move tests with compiler V2
diff --git a/.github/workflows/node-api-compatibility-tests.yaml b/.github/workflows/node-api-compatibility-tests.yaml
index 4be84bf6f02fd..0593a7ec533a9 100644
--- a/.github/workflows/node-api-compatibility-tests.yaml
+++ b/.github/workflows/node-api-compatibility-tests.yaml
@@ -43,7 +43,7 @@ jobs:
   # if there are any changes that would affect it within the PR / commit. If
   # everything is checked in, run tests, build the SDK, and upload it to npmjs.
   node-api-compatibility-tests:
-    runs-on: high-perf-docker
+    runs-on: runs-on,cpu=64,family=c7,hdd=500,image=aptos-ubuntu-x64,run-id=${{ github.run_id }}
     permissions:
       contents: read
       id-token: write
@@ -71,7 +71,7 @@ jobs:
 
       # Self hosted runners don't have pnpm preinstalled.
       # https://github.com/actions/setup-node/issues/182
-      - uses: pnpm/action-setup@v2
+      - uses: pnpm/action-setup@v4
         if: ${{ !inputs.SKIP_JOB }}
 
       # When using high-perf-docker, the CI is actually run with two containers
diff --git a/.github/workflows/prover-daily-test.yaml b/.github/workflows/prover-daily-test.yaml
index aecf35e45cf75..5ed59ec538937 100644
--- a/.github/workflows/prover-daily-test.yaml
+++ b/.github/workflows/prover-daily-test.yaml
@@ -22,7 +22,7 @@ concurrency:
 
 jobs:
   prover-inconsistency-test:
-    runs-on: high-perf-docker
+    runs-on: runs-on,cpu=64,family=c7,hdd=500,image=aptos-ubuntu-x64,run-id=${{ github.run_id }}
     timeout-minutes: ${{ github.event_name == 'pull_request' && 10 || 480}}
     steps:
       - uses: actions/checkout@v3
diff --git a/.github/workflows/prune-old-workflow-runs.yaml b/.github/workflows/prune-old-workflow-runs.yaml
index 65271424432e2..8f715eb35b543 100644
--- a/.github/workflows/prune-old-workflow-runs.yaml
+++ b/.github/workflows/prune-old-workflow-runs.yaml
@@ -20,7 +20,7 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version-file: .node-version
-      - uses: pnpm/action-setup@v2
+      - uses: pnpm/action-setup@v4
 
       - run: pnpm i && pnpm pruneGithubWorkflowRuns
         env:
diff --git a/.github/workflows/replay-verify.yaml b/.github/workflows/replay-verify.yaml
index e03b338d566f8..d0e91d30a3723 100644
--- a/.github/workflows/replay-verify.yaml
+++ b/.github/workflows/replay-verify.yaml
@@ -23,11 +23,7 @@ on:
       - ".github/workflows/replay-verify.yaml"
       - "testsuite/replay_verify.py"
   schedule:
-    - cron: "0 22 * * *"
-  push:
-    branches:
-      - aptos-release-v* # the aptos release branches
-      - aptos-node-v*
+    - cron: "0 22 * * 0,2,4" # The main branch cadence. This runs every Sun,Tues,Thurs
 
 # cancel redundant builds
 concurrency:
@@ -86,7 +82,7 @@ jobs:
       TIMEOUT_MINUTES: 480
 
   test-replay:
-    if: ${{ github.event_name == 'pull_request' }}
+    if: ${{ (github.event_name == 'pull_request') && contains(github.event.pull_request.labels.*.name, 'CICD:test-replay')}}
     needs: determine-test-metadata
     uses: ./.github/workflows/workflow-run-replay-verify.yaml
     secrets: inherit
diff --git a/.github/workflows/run-gas-calibration.yaml b/.github/workflows/run-gas-calibration.yaml
index bf861c8ffd2aa..1f91062a4f633 100644
--- a/.github/workflows/run-gas-calibration.yaml
+++ b/.github/workflows/run-gas-calibration.yaml
@@ -25,7 +25,7 @@ concurrency:
 jobs:
   run-gas-calibration:
     if: contains(github.event.pull_request.labels.*.name, 'CICD:non-required-tests')
-    runs-on: high-perf-docker
+    runs-on: runs-on,cpu=64,family=c7,hdd=500,image=aptos-ubuntu-x64,run-id=${{ github.run_id }}
     steps:
       - uses: actions/checkout@v3
         with:
diff --git a/.github/workflows/rust-client-tests.yaml b/.github/workflows/rust-client-tests.yaml
index 90a3f07adff39..0b5ce8e5a9c9a 100644
--- a/.github/workflows/rust-client-tests.yaml
+++ b/.github/workflows/rust-client-tests.yaml
@@ -31,7 +31,7 @@ jobs:
   run-tests-devnet:
     if: contains(github.event.pull_request.labels.*.name, 'CICD:non-required-tests')
     needs: [permission-check]
-    runs-on: high-perf-docker
+    runs-on: runs-on,cpu=64,family=c7,hdd=500,image=aptos-ubuntu-x64,run-id=${{ github.run_id }}
     steps:
       - uses: actions/checkout@v3
       - uses: aptos-labs/aptos-core/.github/actions/docker-setup@main
@@ -50,7 +50,7 @@ jobs:
   run-tests-testnet:
     if: contains(github.event.pull_request.labels.*.name, 'CICD:non-required-tests')
     needs: [permission-check]
-    runs-on: high-perf-docker
+    runs-on: runs-on,cpu=64,family=c7,hdd=500,image=aptos-ubuntu-x64,run-id=${{ github.run_id }}
     steps:
       - uses: actions/checkout@v3
       - uses: aptos-labs/aptos-core/.github/actions/docker-setup@main
@@ -69,7 +69,7 @@ jobs:
   run-tests-mainnet:
     if: contains(github.event.pull_request.labels.*.name, 'CICD:non-required-tests')
     needs: [permission-check]
-    runs-on: high-perf-docker
+    runs-on: runs-on,cpu=64,family=c7,hdd=500,image=aptos-ubuntu-x64,run-id=${{ github.run_id }}
     steps:
       - uses: actions/checkout@v3
       - uses: aptos-labs/aptos-core/.github/actions/docker-setup@main
diff --git a/.github/workflows/test-copy-images-to-dockerhub.yaml b/.github/workflows/test-copy-images-to-dockerhub.yaml
index 4f01de7814f18..b488d771f04c4 100644
--- a/.github/workflows/test-copy-images-to-dockerhub.yaml
+++ b/.github/workflows/test-copy-images-to-dockerhub.yaml
@@ -22,7 +22,7 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version-file: .node-version
-      - uses: pnpm/action-setup@v2
+      - uses: pnpm/action-setup@v4
       - run: pnpm install
       - name: Test Release Images
         run: ./docker/test.sh
diff --git a/.github/workflows/ts-sdk-e2e-tests.yaml b/.github/workflows/ts-sdk-e2e-tests.yaml
index 942d07e24f66d..c906451abd78b 100644
--- a/.github/workflows/ts-sdk-e2e-tests.yaml
+++ b/.github/workflows/ts-sdk-e2e-tests.yaml
@@ -53,7 +53,7 @@ jobs:
   # Now that the latter runs against the local testnet too we make these land blocking.
   run-tests-main-branch:
     needs: [permission-check, file_change_determinator]
-    runs-on: high-perf-docker
+    runs-on: runs-on,cpu=64,family=c7,hdd=500,image=aptos-ubuntu-x64,run-id=${{ github.run_id }}
     steps:
       - uses: actions/checkout@v3
         if: needs.file_change_determinator.outputs.only_docs_changed != 'true'
diff --git a/.github/workflows/windows-build.yaml b/.github/workflows/windows-build.yaml
index e276fe5b9b84c..920d5d8f942f5 100644
--- a/.github/workflows/windows-build.yaml
+++ b/.github/workflows/windows-build.yaml
@@ -5,19 +5,20 @@ on:
   workflow_dispatch:
   pull_request:
     types: [labeled, opened, synchronize, reopened, auto_merge_enabled]
-  push:
-    branches:
-      - main
+  schedule: 
+    # Run twice a day at 12PM PT and 8PM PT Monday through Friday
+    - cron: "0 19,3 * * 1-5"
+    # Run once a day at 12PM PT on Saturday and Sunday
+    - cron: "0 19 * * 6,0"
 
 jobs:
   windows-build:
-    runs-on: windows-latest-8-core
+    runs-on: windows-latest
     if: | # Only run on each PR once an appropriate event occurs
       (
         github.event_name == 'workflow_dispatch' ||
-        github.event_name == 'push' ||
-        contains(github.event.pull_request.labels.*.name, 'CICD:run-windows-tests') ||
-        github.event.pull_request.auto_merge != null
+        github.event_name == 'schedule' ||
+        contains(github.event.pull_request.labels.*.name, 'CICD:run-windows-tests')
       )
     defaults:
       run:
@@ -28,14 +29,17 @@ jobs:
           ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0 # Fetch all git history for accurate target determination
 
+      - name: Set up WinGet
+        run: Set-Variable ProgressPreference SilentlyContinue ; PowerShell -ExecutionPolicy Bypass -File scripts/windows_dev_setup.ps1
+
       # This action will cache ~/.cargo and ./target (or the equivalent on Windows in
       # this case). See more here:
       # https://github.com/Swatinem/rust-cache#cache-details
       - name: Run cargo cache
         uses: Swatinem/rust-cache@359a70e43a0bb8a13953b04a90f76428b4959bb6 # pin@v2.2.0
 
-      - name: Install the developer tools
-        run: PowerShell -ExecutionPolicy Bypass -File scripts/windows_dev_setup.ps1
+      - name: Install the Developer Tools
+        run: Set-Variable ProgressPreference SilentlyContinue ; PowerShell -ExecutionPolicy Bypass -File scripts/windows_dev_setup.ps1 -t
 
       # This is required for the openssl-sys crate to build.
       # See: https://github.com/sfackler/rust-openssl/issues/1542#issuecomment-1399358351
diff --git a/.github/workflows/workflow-run-docker-rust-build.yaml b/.github/workflows/workflow-run-docker-rust-build.yaml
index eb39e8a60438b..c21a5e10710bb 100644
--- a/.github/workflows/workflow-run-docker-rust-build.yaml
+++ b/.github/workflows/workflow-run-docker-rust-build.yaml
@@ -73,12 +73,27 @@ permissions:
 
 jobs:
   rust-all:
-    runs-on: experimental-docker
+    runs-on: runs-on,cpu=64,family=c7,hdd=1024,image=aptos-ubuntu-x64,run-id=${{ github.run_id }},spot=co
     steps:
       - uses: actions/checkout@v3
         with:
           ref: ${{ env.GIT_SHA }}
 
+      - name: Setup Runs On Cache for Docker
+        uses: runs-on/cache@v4
+        with:
+          path: |
+            /home/runner/docker-cache.tzst
+          key: docker-buildkit-cache-${{ env.PROFILE }}-${{ env.FEATURES }}${{ hashFiles('Cargo.lock') }}
+
+      - name: Untar cache if present
+        run: |
+          if [ -f /home/runner/docker-cache.tzst ]; then
+            sudo systemctl stop docker
+            sudo tar --posix -xf /home/runner/docker-cache.tzst -P -C /var/lib/docker --use-compress-program zstdmt .
+            sudo systemctl start docker
+          fi          
+
       - uses: aptos-labs/aptos-core/.github/actions/docker-setup@main
         with:
           GCP_WORKLOAD_IDENTITY_PROVIDER: ${{ secrets.GCP_WORKLOAD_IDENTITY_PROVIDER }}
@@ -96,3 +111,11 @@ jobs:
           BUILD_ADDL_TESTING_IMAGES: ${{ env.BUILD_ADDL_TESTING_IMAGES }}
           GIT_CREDENTIALS: ${{ secrets.GIT_CREDENTIALS }}
           TARGET_REGISTRY: ${{ env.TARGET_REGISTRY }}
+      
+      - name: Prepare Docker for Caching
+        run: |
+          if [ ! -f /home/runner/docker-cache.tzst ]; then
+            sudo systemctl stop docker
+            sudo tar --posix -cf /home/runner/docker-cache.tzst -P -C /var/lib/docker --use-compress-program zstdmt .
+          fi
+
diff --git a/.github/workflows/workflow-run-forge.yaml b/.github/workflows/workflow-run-forge.yaml
index 5de05cc005469..4e0d9b30cfee4 100644
--- a/.github/workflows/workflow-run-forge.yaml
+++ b/.github/workflows/workflow-run-forge.yaml
@@ -72,6 +72,14 @@ on:
         default: false
         type: boolean
         description: Set to true to skip this job. Useful for PRs that don't require this workflow.
+      FORGE_NUM_VALIDATORS:
+        required: false
+        type: string
+        description: Number of validators to use for the forge test
+      FORGE_NUM_VALIDATOR_FULLNODES:
+        required: false
+        type: string
+        description: Number of validator fullnodes to use for the forge test
 
 env:
   AWS_ACCOUNT_NUM: ${{ secrets.ENV_ECR_AWS_ACCOUNT_NUM }}
@@ -99,6 +107,8 @@ env:
   COMMENT_HEADER: ${{ inputs.COMMENT_HEADER }}
   VERBOSE: true
   COMMENT_ON_PR: ${{ inputs.COMMENT_ON_PR }}
+  FORGE_NUM_VALIDATORS: ${{ inputs.FORGE_NUM_VALIDATORS }}
+  FORGE_NUM_VALIDATOR_FULLNODES: ${{ inputs.FORGE_NUM_VALIDATOR_FULLNODES }}
 
 # TODO: should we migrate this to a composite action, so that we can skip it
 # at the call site, and don't need to wrap each step in an if statement?
diff --git a/CODEOWNERS b/CODEOWNERS
index 0567e784df4cd..73eb4fa743af3 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -79,20 +79,10 @@
 # Owners for the `/dashboards` directory and all its subdirectories.
 /dashboards/ @aptos-labs/prod-eng
 
-# Owners for the `/developer-docs-site` directory and all its subdirectories.
-/developer-docs-site/ @davidiw @gregnazario @banool
-
-# Owner for docs tutorials for the token_standard and related tutorials.
-/developer-docs-site/docs/tutorials @areshand @gregnazario
-
 # Owners for the `/docker` directory and all its subdirectories.
 /docker/ @aptos-labs/prod-eng
 /docker/builder/docker-bake-rust-all.hcl @aptos-labs/prod-eng @aptos-labs/security
 
-# Owners for the `SDKs`.
-/ecosystem/python/sdk @davidiw @gregnazario @banool @0xmaayan
-/ecosystem/typescript/sdk @gregnazario @banool @0xmaayan
-
 # Owners for execution and storage.
 /execution/ @msmouse @lightmark @grao1991
 
@@ -100,7 +90,7 @@
 /mempool/ @bchocho
 
 # Owners for the network and all its subdirectories.
-/network/ @gregnazario @joshlind @brianolson
+/network/ @joshlind @brianolson
 
 # Owners for the scripts
 /scripts/ @aptos-labs/prod-eng
diff --git a/Cargo.lock b/Cargo.lock
index 197dee80062a6..871e7f57e779e 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.3.0"
+version = "4.0.0"
 dependencies = [
  "anyhow",
  "aptos-api-types",
@@ -266,7 +288,7 @@ dependencies = [
  "aptos-move-debugger",
  "aptos-network-checker",
  "aptos-node",
- "aptos-protos 1.3.0",
+ "aptos-protos 1.3.1",
  "aptos-rest-client",
  "aptos-sdk",
  "aptos-storage-interface",
@@ -286,11 +308,11 @@ dependencies = [
  "clap_complete",
  "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",
@@ -311,7 +333,8 @@ dependencies = [
  "poem",
  "processor",
  "rand 0.7.3",
- "reqwest",
+ "regex",
+ "reqwest 0.11.23",
  "self_update",
  "serde",
  "serde_json",
@@ -364,11 +387,11 @@ dependencies = [
  "aptos-logger",
  "aptos-runtimes",
  "aptos-storage-interface",
- "aptos-system-utils",
+ "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",
@@ -401,7 +424,6 @@ dependencies = [
  "aptos-cached-packages",
  "aptos-config",
  "aptos-crypto",
- "aptos-db-indexer",
  "aptos-framework",
  "aptos-gas-meter",
  "aptos-gas-schedule",
@@ -409,20 +431,19 @@ dependencies = [
  "aptos-logger",
  "aptos-mempool",
  "aptos-metrics-core",
+ "aptos-move-stdlib",
  "aptos-proptest-helpers",
  "aptos-runtimes",
  "aptos-sdk",
  "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",
@@ -437,7 +458,7 @@ dependencies = [
  "proptest",
  "rand 0.7.3",
  "regex",
- "reqwest",
+ "reqwest 0.11.23",
  "serde",
  "serde_json",
  "tokio",
@@ -458,6 +479,7 @@ dependencies = [
  "aptos-executor-types",
  "aptos-framework",
  "aptos-genesis",
+ "aptos-indexer-grpc-table-info",
  "aptos-mempool",
  "aptos-mempool-notifications",
  "aptos-sdk",
@@ -470,7 +492,7 @@ dependencies = [
  "bcs 0.1.4",
  "bytes",
  "goldenfile",
- "hyper",
+ "hyper 0.14.28",
  "rand 0.7.3",
  "regex",
  "serde_json",
@@ -510,7 +532,6 @@ dependencies = [
  "anyhow",
  "aptos-config",
  "aptos-crypto",
- "aptos-db-indexer",
  "aptos-framework",
  "aptos-logger",
  "aptos-openapi",
@@ -542,12 +563,15 @@ 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",
+ "aptos-metrics-core",
  "aptos-proptest-helpers",
  "aptos-push-metrics",
  "aptos-storage-interface",
@@ -560,7 +584,7 @@ dependencies = [
  "clap 4.4.14",
  "csv",
  "futures",
- "itertools 0.12.1",
+ "itertools 0.13.0",
  "move-binary-format",
  "move-bytecode-verifier",
  "num_cpus",
@@ -569,7 +593,7 @@ dependencies = [
  "proptest",
  "rand 0.7.3",
  "regex",
- "reqwest",
+ "reqwest 0.11.23",
  "serde",
  "serde_json",
  "serde_yaml 0.8.26",
@@ -596,11 +620,12 @@ dependencies = [
  "aptos-types",
  "bcs 0.1.4",
  "bytes",
- "hyper",
+ "hyper 0.14.28",
  "once_cell",
- "reqwest",
+ "reqwest 0.11.23",
  "serde",
  "tokio",
+ "tokio-stream",
  "warp",
 ]
 
@@ -648,7 +673,7 @@ dependencies = [
  "dashmap",
  "derivative",
  "fail",
- "itertools 0.12.1",
+ "itertools 0.13.0",
  "move-binary-format",
  "move-core-types",
  "move-vm-types",
@@ -675,7 +700,7 @@ dependencies = [
  "clap 4.4.14",
  "criterion",
  "dashmap",
- "itertools 0.12.1",
+ "itertools 0.13.0",
  "jemallocator",
  "move-core-types",
  "once_cell",
@@ -721,13 +746,14 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "camino",
+ "chrono",
  "clap 4.4.14",
  "clap-verbosity-flag",
  "determinator",
  "env_logger",
  "guppy",
  "log",
- "reqwest",
+ "reqwest 0.11.23",
  "url",
 ]
 
@@ -770,7 +796,7 @@ dependencies = [
  "bcs 0.1.4",
  "clap 4.4.14",
  "futures",
- "itertools 0.12.1",
+ "itertools 0.13.0",
  "move-compiler",
  "move-core-types",
  "move-model",
@@ -817,7 +843,6 @@ dependencies = [
  "get_if_addrs",
  "maplit",
  "num_cpus",
- "number_range",
  "poem-openapi",
  "rand 0.7.3",
  "serde",
@@ -859,6 +884,7 @@ dependencies = [
  "aptos-mempool",
  "aptos-metrics-core",
  "aptos-network",
+ "aptos-peer-monitoring-service-types",
  "aptos-reliable-broadcast",
  "aptos-runtimes",
  "aptos-safety-rules",
@@ -884,15 +910,19 @@ dependencies = [
  "futures",
  "futures-channel",
  "hex",
- "itertools 0.12.1",
+ "itertools 0.13.0",
+ "lru 0.7.8",
  "maplit",
  "mini-moka",
  "mirai-annotations",
+ "mockall",
  "move-core-types",
  "num-derive",
  "num-traits",
  "once_cell",
+ "ordered-float 3.9.2",
  "proptest",
+ "proptest-derive",
  "rand 0.7.3",
  "rayon",
  "scopeguard",
@@ -906,6 +936,7 @@ dependencies = [
  "thiserror",
  "tokio",
  "tokio-retry",
+ "tokio-stream",
 ]
 
 [[package]]
@@ -938,8 +969,9 @@ dependencies = [
  "aptos-short-hex-str",
  "aptos-types",
  "bcs 0.1.4",
+ "fail",
  "futures",
- "itertools 0.12.1",
+ "itertools 0.13.0",
  "mini-moka",
  "mirai-annotations",
  "once_cell",
@@ -1060,7 +1092,7 @@ dependencies = [
  "claims",
  "dashmap",
  "futures",
- "itertools 0.12.1",
+ "itertools 0.13.0",
  "maplit",
  "mockall",
  "ordered-float 3.9.2",
@@ -1107,6 +1139,7 @@ dependencies = [
  "aptos-config",
  "aptos-crypto",
  "aptos-db-indexer",
+ "aptos-db-indexer-schemas",
  "aptos-executor",
  "aptos-executor-types",
  "aptos-experimental-runtimes",
@@ -1128,9 +1161,12 @@ dependencies = [
  "byteorder",
  "claims",
  "clap 4.4.14",
+ "crossbeam-channel",
  "dashmap",
  "either",
- "itertools 0.12.1",
+ "hex",
+ "indicatif 0.15.0",
+ "itertools 0.13.0",
  "lru 0.7.8",
  "move-core-types",
  "num-derive",
@@ -1151,6 +1187,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "aptos-config",
+ "aptos-db-indexer-schemas",
  "aptos-logger",
  "aptos-proptest-helpers",
  "aptos-resource-viewer",
@@ -1162,6 +1199,21 @@ dependencies = [
  "bytes",
  "dashmap",
  "move-core-types",
+ "rand 0.7.3",
+]
+
+[[package]]
+name = "aptos-db-indexer-schemas"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "aptos-crypto",
+ "aptos-proptest-helpers",
+ "aptos-schemadb",
+ "aptos-storage-interface",
+ "aptos-types",
+ "bcs 0.1.4",
+ "byteorder",
  "proptest",
  "proptest-derive",
  "rand 0.7.3",
@@ -1187,7 +1239,7 @@ dependencies = [
  "aptos-vm",
  "bcs 0.1.4",
  "clap 4.4.14",
- "itertools 0.12.1",
+ "itertools 0.13.0",
  "tokio",
 ]
 
@@ -1202,6 +1254,7 @@ dependencies = [
  "aptos-move-debugger",
  "aptos-push-metrics",
  "clap 4.4.14",
+ "jemallocator",
  "tokio",
 ]
 
@@ -1343,16 +1396,20 @@ dependencies = [
  "aptos-consensus-types",
  "aptos-crypto",
  "aptos-db",
+ "aptos-db-indexer",
+ "aptos-db-indexer-schemas",
  "aptos-drop-helper",
  "aptos-executor-service",
  "aptos-executor-test-helpers",
  "aptos-executor-types",
  "aptos-experimental-runtimes",
  "aptos-genesis",
+ "aptos-indexer-grpc-table-info",
  "aptos-infallible",
  "aptos-logger",
  "aptos-metrics-core",
  "aptos-scratchpad",
+ "aptos-sdk",
  "aptos-storage-interface",
  "aptos-temppath",
  "aptos-types",
@@ -1363,7 +1420,7 @@ dependencies = [
  "bytes",
  "dashmap",
  "fail",
- "itertools 0.12.1",
+ "itertools 0.13.0",
  "move-core-types",
  "once_cell",
  "proptest",
@@ -1392,7 +1449,7 @@ dependencies = [
  "aptos-logger",
  "aptos-metrics-core",
  "aptos-node-resource-metrics",
- "aptos-profiler",
+ "aptos-profiler 0.1.0",
  "aptos-push-metrics",
  "aptos-sdk",
  "aptos-storage-interface",
@@ -1406,7 +1463,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",
@@ -1440,7 +1497,7 @@ dependencies = [
  "crossbeam-channel",
  "ctrlc",
  "dashmap",
- "itertools 0.12.1",
+ "itertools 0.13.0",
  "num_cpus",
  "once_cell",
  "rayon",
@@ -1482,23 +1539,44 @@ 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-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]]
@@ -1578,7 +1656,7 @@ dependencies = [
  "poem-openapi",
  "rand 0.7.3",
  "redis",
- "reqwest",
+ "reqwest 0.11.23",
  "serde",
  "serde_json",
  "serde_yaml 0.8.26",
@@ -1622,7 +1700,7 @@ dependencies = [
  "env_logger",
  "futures",
  "gcp-bigquery-client",
- "reqwest",
+ "reqwest 0.11.23",
  "serde",
  "serde_json",
  "tokio",
@@ -1647,6 +1725,7 @@ dependencies = [
  "aptos-logger",
  "aptos-rest-client",
  "aptos-retrier",
+ "aptos-runtimes",
  "aptos-sdk",
  "aptos-short-hex-str",
  "aptos-state-sync-driver",
@@ -1658,8 +1737,8 @@ dependencies = [
  "either",
  "futures",
  "hex",
- "hyper",
- "itertools 0.12.1",
+ "hyper 0.14.28",
+ "itertools 0.13.0",
  "json-patch",
  "k8s-openapi",
  "kube",
@@ -1668,7 +1747,7 @@ dependencies = [
  "prometheus-http-query",
  "rand 0.7.3",
  "regex",
- "reqwest",
+ "reqwest 0.11.23",
  "serde",
  "serde_json",
  "serde_yaml 0.8.26",
@@ -1700,7 +1779,7 @@ dependencies = [
  "once_cell",
  "rand 0.7.3",
  "random_word",
- "reqwest",
+ "reqwest 0.11.23",
  "serde_yaml 0.8.26",
  "tokio",
  "url",
@@ -1740,7 +1819,7 @@ dependencies = [
  "either",
  "flate2",
  "hex",
- "itertools 0.12.1",
+ "itertools 0.13.0",
  "libsecp256k1",
  "log",
  "lru 0.7.8",
@@ -1954,7 +2033,7 @@ dependencies = [
  "aptos-indexer-grpc-utils",
  "aptos-metrics-core",
  "aptos-moving-average 0.1.0 (git+https://github.com/aptos-labs/aptos-indexer-processors.git?rev=4801acae7aea30d7e96bbfbe5ec5b04056dfa4cf)",
- "aptos-protos 1.3.0",
+ "aptos-protos 1.3.1",
  "async-trait",
  "clap 4.4.14",
  "futures",
@@ -1963,7 +2042,7 @@ dependencies = [
  "once_cell",
  "prost 0.12.3",
  "redis",
- "reqwest",
+ "reqwest 0.11.23",
  "serde",
  "tempfile",
  "tokio",
@@ -1981,7 +2060,8 @@ dependencies = [
  "aptos-indexer-grpc-utils",
  "aptos-metrics-core",
  "aptos-moving-average 0.1.0 (git+https://github.com/aptos-labs/aptos-indexer-processors.git?rev=4801acae7aea30d7e96bbfbe5ec5b04056dfa4cf)",
- "aptos-protos 1.3.0",
+ "aptos-protos 1.3.1",
+ "aptos-transaction-filter",
  "async-trait",
  "clap 4.4.14",
  "futures",
@@ -2019,6 +2099,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"
@@ -2031,7 +2131,6 @@ dependencies = [
  "aptos-config",
  "aptos-crypto",
  "aptos-db",
- "aptos-db-indexer",
  "aptos-executor",
  "aptos-executor-types",
  "aptos-framework",
@@ -2044,7 +2143,7 @@ dependencies = [
  "aptos-metrics-core",
  "aptos-moving-average 0.1.0 (git+https://github.com/aptos-labs/aptos-indexer-processors.git?rev=4801acae7aea30d7e96bbfbe5ec5b04056dfa4cf)",
  "aptos-proptest-helpers",
- "aptos-protos 1.3.0",
+ "aptos-protos 1.3.1",
  "aptos-runtimes",
  "aptos-sdk",
  "aptos-secure-storage",
@@ -2059,8 +2158,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",
@@ -2081,7 +2180,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "aptos-indexer-grpc-utils",
- "aptos-protos 1.3.0",
+ "aptos-protos 1.3.1",
  "futures",
  "jemallocator",
  "lazy_static",
@@ -2091,37 +2190,13 @@ 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"
 dependencies = [
  "anyhow",
  "aptos-metrics-core",
- "aptos-system-utils",
+ "aptos-system-utils 0.1.0",
  "async-trait",
  "backtrace",
  "clap 4.4.14",
@@ -2155,7 +2230,7 @@ dependencies = [
  "flate2",
  "futures",
  "google-cloud-storage",
- "hyper",
+ "hyper 0.14.28",
  "rocksdb",
  "serde",
  "serde_json",
@@ -2173,7 +2248,7 @@ version = "1.0.0"
 dependencies = [
  "anyhow",
  "aptos-metrics-core",
- "aptos-protos 1.3.0",
+ "aptos-protos 1.3.1",
  "async-trait",
  "backoff",
  "base64 0.13.1",
@@ -2181,7 +2256,7 @@ dependencies = [
  "cloud-storage",
  "dashmap",
  "futures",
- "itertools 0.12.1",
+ "itertools 0.13.0",
  "lz4",
  "once_cell",
  "prometheus",
@@ -2220,10 +2295,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",
@@ -2246,7 +2321,7 @@ dependencies = [
  "arr_macro",
  "bcs 0.1.4",
  "byteorder",
- "itertools 0.12.1",
+ "itertools 0.13.0",
  "num-derive",
  "num-traits",
  "once_cell",
@@ -2272,6 +2347,7 @@ dependencies = [
  "aptos-enum-conversion-derive",
  "aptos-event-notifications",
  "aptos-infallible",
+ "aptos-jwk-utils",
  "aptos-logger",
  "aptos-metrics-core",
  "aptos-network",
@@ -2287,13 +2363,25 @@ dependencies = [
  "futures-util",
  "move-core-types",
  "once_cell",
- "reqwest",
  "serde",
- "serde_json",
  "tokio",
  "tokio-retry",
 ]
 
+[[package]]
+name = "aptos-jwk-utils"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "aptos-types",
+ "http 0.2.11",
+ "move-core-types",
+ "reqwest 0.11.23",
+ "serde",
+ "serde_json",
+ "tokio",
+]
+
 [[package]]
 name = "aptos-keygen"
 version = "0.1.0"
@@ -2303,6 +2391,48 @@ dependencies = [
  "rand 0.7.3",
 ]
 
+[[package]]
+name = "aptos-keyless-circuit"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "aptos-crypto",
+ "aptos-keyless-common",
+ "aptos-logger",
+ "ark-bn254",
+ "ark-ff",
+ "base64 0.13.1",
+ "hex",
+ "itertools 0.13.0",
+ "num-bigint 0.3.3",
+ "num-modular",
+ "num-traits",
+ "rand 0.7.3",
+ "rand_chacha 0.3.1",
+ "rsa 0.9.6",
+ "serde_json",
+ "sha2 0.9.9",
+ "tempfile",
+ "tokio",
+]
+
+[[package]]
+name = "aptos-keyless-common"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "aptos-types",
+ "ark-bn254",
+ "ark-ff",
+ "base64 0.13.1",
+ "hex",
+ "num-bigint 0.3.3",
+ "serde",
+ "serde_json",
+ "tempfile",
+ "tracing",
+]
+
 [[package]]
 name = "aptos-keyless-pepper-common"
 version = "0.1.0"
@@ -2337,13 +2467,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",
 ]
@@ -2355,6 +2487,7 @@ dependencies = [
  "aes-gcm",
  "anyhow",
  "aptos-crypto",
+ "aptos-infallible",
  "aptos-inspection-service",
  "aptos-keyless-pepper-common",
  "aptos-logger",
@@ -2366,14 +2499,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",
@@ -2406,6 +2540,7 @@ dependencies = [
  "aptos-vm-types",
  "bcs 0.1.4",
  "bytes",
+ "claims",
  "goldenfile",
  "move-binary-format",
  "move-command-line-common",
@@ -2494,7 +2629,6 @@ dependencies = [
  "aptos-consensus-types",
  "aptos-crypto",
  "aptos-event-notifications",
- "aptos-experimental-runtimes",
  "aptos-id-generator",
  "aptos-infallible",
  "aptos-logger",
@@ -2513,7 +2647,7 @@ dependencies = [
  "enum_dispatch",
  "fail",
  "futures",
- "itertools 0.12.1",
+ "itertools 0.13.0",
  "maplit",
  "num_cpus",
  "once_cell",
@@ -2564,6 +2698,7 @@ name = "aptos-move-debugger"
 version = "0.1.0"
 dependencies = [
  "anyhow",
+ "aptos-block-executor",
  "aptos-consensus",
  "aptos-crypto",
  "aptos-gas-profiling",
@@ -2576,8 +2711,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",
 ]
@@ -2642,7 +2778,7 @@ dependencies = [
 [[package]]
 name = "aptos-moving-average"
 version = "0.1.0"
-source = "git+https://github.com/aptos-labs/aptos-indexer-processors.git?rev=a11f0b6532349aa6b9a80c9a1d77524f02d8a013#a11f0b6532349aa6b9a80c9a1d77524f02d8a013"
+source = "git+https://github.com/aptos-labs/aptos-indexer-processors.git?rev=fa1ce4947f4c2be57529f1c9732529e05a06cb7f#fa1ce4947f4c2be57529f1c9732529e05a06cb7f"
 dependencies = [
  "chrono",
 ]
@@ -2732,7 +2868,7 @@ dependencies = [
  "futures",
  "futures-util",
  "hex",
- "itertools 0.12.1",
+ "itertools 0.13.0",
  "maplit",
  "once_cell",
  "ordered-float 3.9.2",
@@ -2844,26 +2980,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]]
@@ -2958,7 +3095,7 @@ dependencies = [
  "poem",
  "poem-openapi",
  "prometheus-parse",
- "reqwest",
+ "reqwest 0.11.23",
  "serde",
  "serde_json",
  "serde_yaml 0.8.26",
@@ -3005,7 +3142,6 @@ dependencies = [
 name = "aptos-openapi"
 version = "0.1.0"
 dependencies = [
- "async-trait",
  "percent-encoding",
  "poem",
  "poem-openapi",
@@ -3032,7 +3168,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "aptos-framework",
- "itertools 0.12.1",
+ "itertools 0.13.0",
  "move-command-line-common",
  "move-package",
  "tempfile",
@@ -3122,6 +3258,19 @@ dependencies = [
  "regex",
 ]
 
+[[package]]
+name = "aptos-profiler"
+version = "0.1.0"
+source = "git+https://github.com/aptos-labs/aptos-core.git?rev=4541add3fd29826ec57f22658ca286d2d6134b93#4541add3fd29826ec57f22658ca286d2d6134b93"
+dependencies = [
+ "anyhow",
+ "backtrace",
+ "jemalloc-sys",
+ "jemallocator",
+ "pprof",
+ "regex",
+]
+
 [[package]]
 name = "aptos-proptest-helpers"
 version = "0.1.0"
@@ -3133,7 +3282,7 @@ dependencies = [
 
 [[package]]
 name = "aptos-protos"
-version = "1.3.0"
+version = "1.3.1"
 dependencies = [
  "futures-core",
  "pbjson",
@@ -3144,15 +3293,14 @@ dependencies = [
 
 [[package]]
 name = "aptos-protos"
-version = "1.3.0"
-source = "git+https://github.com/aptos-labs/aptos-core.git?tag=aptos-node-v1.10.0#b24f6cd08f84b179e49090c7e51a501c535096ca"
+version = "1.3.1"
+source = "git+https://github.com/aptos-labs/aptos-core.git?rev=5c48aee129b5a141be2792ffa3d9bd0a1a61c9cb#5c48aee129b5a141be2792ffa3d9bd0a1a61c9cb"
 dependencies = [
  "futures-core",
  "pbjson",
  "prost 0.12.3",
- "prost-types 0.12.3",
  "serde",
- "tonic 0.10.2",
+ "tonic 0.11.0",
 ]
 
 [[package]]
@@ -3200,25 +3348,38 @@ 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",
+ "parking_lot 0.12.1",
+ "reqwest 0.11.23",
  "serde",
  "serde_json",
  "serde_yaml 0.8.26",
+ "sha3 0.9.1",
  "strum 0.24.1",
  "strum_macros 0.24.3",
  "tokio",
  "url",
+ "walkdir",
 ]
 
 [[package]]
@@ -3234,6 +3395,8 @@ dependencies = [
  "aptos-time-service",
  "aptos-types",
  "async-trait",
+ "bytes",
+ "claims",
  "futures",
  "futures-channel",
  "tokio",
@@ -3268,7 +3431,7 @@ dependencies = [
  "clap 4.4.14",
  "hex",
  "move-core-types",
- "reqwest",
+ "reqwest 0.11.23",
  "serde",
  "serde_json",
  "thiserror",
@@ -3312,13 +3475,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",
@@ -3365,6 +3527,7 @@ dependencies = [
  "aptos-secure-storage",
  "aptos-types",
  "aptos-vault-client",
+ "claims",
  "criterion",
  "once_cell",
  "proptest",
@@ -3406,7 +3569,7 @@ dependencies = [
  "aptos-types",
  "bitvec 1.0.1",
  "criterion",
- "itertools 0.12.1",
+ "itertools 0.13.0",
  "jemallocator",
  "once_cell",
  "proptest",
@@ -3429,6 +3592,7 @@ dependencies = [
  "base64 0.13.1",
  "bcs 0.1.4",
  "ed25519-dalek-bip32",
+ "hex",
  "move-core-types",
  "once_cell",
  "rand 0.7.3",
@@ -3467,7 +3631,7 @@ dependencies = [
  "aptos-config",
  "aptos-logger",
  "aptos-metrics-core",
- "aptos-protos 1.3.0",
+ "aptos-protos 1.3.1",
  "bcs 0.1.4",
  "crossbeam-channel",
  "once_cell",
@@ -3682,10 +3846,30 @@ name = "aptos-system-utils"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "aptos-profiler",
+ "aptos-profiler 0.1.0",
+ "async-mutex",
+ "http 0.2.11",
+ "hyper 0.14.28",
+ "lazy_static",
+ "mime",
+ "pprof",
+ "regex",
+ "rstack-self",
+ "tokio",
+ "tracing",
+ "url",
+]
+
+[[package]]
+name = "aptos-system-utils"
+version = "0.1.0"
+source = "git+https://github.com/aptos-labs/aptos-core.git?rev=4541add3fd29826ec57f22658ca286d2d6134b93#4541add3fd29826ec57f22658ca286d2d6134b93"
+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",
@@ -3740,7 +3924,7 @@ dependencies = [
  "prometheus",
  "rand 0.7.3",
  "rand_core 0.5.1",
- "reqwest",
+ "reqwest 0.11.23",
  "reqwest-middleware",
  "reqwest-retry",
  "serde",
@@ -3779,7 +3963,7 @@ dependencies = [
  "prometheus",
  "rand 0.7.3",
  "rand_core 0.5.1",
- "reqwest",
+ "reqwest 0.11.23",
  "reqwest-middleware",
  "reqwest-retry",
  "serde",
@@ -3819,14 +4003,16 @@ dependencies = [
  "aptos-temppath",
  "aptos-types",
  "assert_approx_eq",
+ "async-trait",
  "bcs 0.1.4",
  "csv",
  "futures",
  "hex",
- "itertools 0.12.1",
+ "itertools 0.13.0",
  "rand 0.7.3",
- "reqwest",
+ "reqwest 0.11.23",
  "tokio",
+ "tokio-scoped",
 ]
 
 [[package]]
@@ -3862,9 +4048,7 @@ dependencies = [
  "criterion",
  "criterion-cpu-time",
  "num_cpus",
- "once_cell",
  "proptest",
- "rayon",
 ]
 
 [[package]]
@@ -3900,24 +4084,39 @@ 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",
 ]
 
 [[package]]
-name = "aptos-transaction-generator-lib"
-version = "0.0.0"
+name = "aptos-transaction-filter"
+version = "0.1.0"
 dependencies = [
  "anyhow",
- "aptos-framework",
- "aptos-infallible",
- "aptos-logger",
+ "aptos-protos 1.3.1",
+ "derive_builder",
+ "lz4",
+ "prost 0.12.3",
+ "serde",
+ "serde_json",
+ "serde_yaml 0.8.26",
+ "thiserror",
+]
+
+[[package]]
+name = "aptos-transaction-generator-lib"
+version = "0.0.0"
+dependencies = [
+ "anyhow",
+ "aptos-framework",
+ "aptos-infallible",
+ "aptos-logger",
  "aptos-sdk",
  "async-trait",
  "clap 4.4.14",
@@ -3946,6 +4145,7 @@ dependencies = [
  "aptos-vm-genesis",
  "bcs 0.1.4",
  "clap 4.4.14",
+ "codespan-reporting",
  "datatest-stable",
  "hex",
  "move-binary-format",
@@ -3955,10 +4155,12 @@ dependencies = [
  "move-compiler-v2",
  "move-core-types",
  "move-model",
+ "move-symbol-pool",
  "move-transactional-test-runner",
  "move-vm-runtime",
  "once_cell",
  "serde_json",
+ "tempfile",
 ]
 
 [[package]]
@@ -3992,11 +4194,13 @@ 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",
  "move-core-types",
  "move-table-extension",
+ "move-vm-runtime",
  "move-vm-types",
  "num-bigint 0.3.3",
  "num-derive",
@@ -4006,13 +4210,15 @@ dependencies = [
  "passkey-authenticator",
  "passkey-client",
  "passkey-types",
+ "poem-openapi",
+ "poem-openapi-derive",
  "proptest",
  "proptest-derive",
  "quick_cache",
  "rand 0.7.3",
  "rayon",
  "regex",
- "reqwest",
+ "reqwest 0.11.23",
  "ring 0.16.20",
  "rsa 0.9.6",
  "serde",
@@ -4121,7 +4327,6 @@ dependencies = [
  "futures",
  "hex",
  "move-binary-format",
- "move-bytecode-verifier",
  "move-core-types",
  "move-unit-test",
  "move-vm-runtime",
@@ -4161,9 +4366,9 @@ dependencies = [
  "aptos-proptest-helpers",
  "aptos-types",
  "aptos-vm",
- "aptos-vm-types",
  "bcs 0.1.4",
  "bytes",
+ "claims",
  "move-core-types",
  "move-vm-runtime",
  "move-vm-types",
@@ -4231,6 +4436,7 @@ dependencies = [
  "either",
  "move-binary-format",
  "move-core-types",
+ "move-vm-runtime",
  "move-vm-types",
  "rand 0.7.3",
  "serde",
@@ -4268,33 +4474,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-cached-packages",
- "aptos-crypto",
- "aptos-framework",
- "aptos-gas-schedule",
- "aptos-types",
- "aptos-vm",
- "aptos-vm-types",
- "handlebars",
- "move-compiler",
- "move-core-types",
- "move-vm-runtime",
- "move-vm-types",
- "serde",
- "tempfile",
-]
-
 [[package]]
 name = "arbitrary"
 version = "1.3.2"
@@ -4611,9 +4796,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",
@@ -4877,102 +5062,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]]
@@ -5034,6 +5219,12 @@ version = "0.21.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c79fed4cdb43e993fcdadc7e58a09fd0e3e649c4436fa11da71c9f1f3ee7feb9"
 
+[[package]]
+name = "base64"
+version = "0.22.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
+
 [[package]]
 name = "base64ct"
 version = "1.6.0"
@@ -5161,17 +5352,16 @@ dependencies = [
 
 [[package]]
 name = "bindgen"
-version = "0.65.1"
+version = "0.69.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5"
+checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.6.0",
  "cexpr",
  "clang-sys",
+ "itertools 0.12.1",
  "lazy_static",
  "lazycell",
- "peeking_take_while",
- "prettyplease",
  "proc-macro2",
  "quote",
  "regex",
@@ -5209,9 +5399,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"
@@ -5389,8 +5579,8 @@ dependencies = [
  "futures-core",
  "futures-util",
  "hex",
- "http",
- "hyper",
+ "http 0.2.11",
+ "hyper 0.14.28",
  "hyperlocal",
  "log",
  "pin-project-lite",
@@ -5575,6 +5765,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"
@@ -5678,11 +5881,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",
@@ -5690,7 +5899,7 @@ dependencies = [
  "num-traits",
  "serde",
  "wasm-bindgen",
- "windows-targets 0.48.5",
+ "windows-targets 0.52.0",
 ]
 
 [[package]]
@@ -5917,7 +6126,7 @@ dependencies = [
  "lazy_static",
  "pem 0.8.3",
  "percent-encoding",
- "reqwest",
+ "reqwest 0.11.23",
  "ring 0.16.20",
  "serde",
  "serde_json",
@@ -5981,6 +6190,19 @@ dependencies = [
  "tokio-util 0.7.10",
 ]
 
+[[package]]
+name = "compute-module-expansion-size"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "clap 4.4.14",
+ "futures",
+ "move-binary-format",
+ "move-core-types",
+ "rayon",
+ "tokio",
+]
+
 [[package]]
 name = "concurrent-queue"
 version = "2.4.0"
@@ -6005,35 +6227,37 @@ dependencies = [
 
 [[package]]
 name = "console-api"
-version = "0.5.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2895653b4d9f1538a83970077cb01dfc77a4810524e51a110944688e916b18e"
+checksum = "a257c22cd7e487dd4a13d413beabc512c5052f0bc048db0da6a84c3d8a6142fd"
 dependencies = [
- "prost 0.11.9",
- "prost-types 0.11.9",
- "tonic 0.9.2",
+ "futures-core",
+ "prost 0.12.3",
+ "prost-types 0.12.3",
+ "tonic 0.11.0",
  "tracing-core",
 ]
 
 [[package]]
 name = "console-subscriber"
-version = "0.1.10"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4cf42660ac07fcebed809cfe561dd8730bcd35b075215e6479c516bcd0d11cb"
+checksum = "31c4cc54bae66f7d9188996404abdf7fdfa23034ef8e43478c8810828abad758"
 dependencies = [
  "console-api",
  "crossbeam-channel",
  "crossbeam-utils",
- "futures",
+ "futures-task",
  "hdrhistogram",
  "humantime",
- "prost-types 0.11.9",
+ "prost 0.12.3",
+ "prost-types 0.12.3",
  "serde",
  "serde_json",
  "thread_local",
  "tokio",
  "tokio-stream",
- "tonic 0.9.2",
+ "tonic 0.11.0",
  "tracing",
  "tracing-core",
  "tracing-subscriber 0.3.18",
@@ -6051,6 +6275,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"
@@ -6095,6 +6339,15 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
 
+[[package]]
+name = "convert_case"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"
+dependencies = [
+ "unicode-segmentation",
+]
+
 [[package]]
 name = "cookie"
 version = "0.16.2"
@@ -6108,12 +6361,12 @@ dependencies = [
 
 [[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",
@@ -6428,6 +6681,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"
@@ -6545,22 +6808,12 @@ dependencies = [
 
 [[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.3"
+version = "0.20.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e"
+checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1"
 dependencies = [
- "darling_core 0.20.3",
- "darling_macro 0.20.3",
+ "darling_core 0.20.9",
+ "darling_macro 0.20.9",
 ]
 
 [[package]]
@@ -6579,29 +6832,15 @@ dependencies = [
 
 [[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.3"
+version = "0.20.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621"
+checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120"
 dependencies = [
  "fnv",
  "ident_case",
  "proc-macro2",
  "quote",
- "strsim 0.10.0",
+ "strsim 0.11.1",
  "syn 2.0.48",
 ]
 
@@ -6618,22 +6857,11 @@ dependencies = [
 
 [[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.3"
+version = "0.20.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"
+checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178"
 dependencies = [
- "darling_core 0.20.3",
+ "darling_core 0.20.9",
  "quote",
  "syn 2.0.48",
 ]
@@ -6778,13 +7006,44 @@ dependencies = [
  "syn 2.0.48",
 ]
 
+[[package]]
+name = "derive_builder"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0350b5cb0331628a5916d6c5c0b72e97393b8b6b03b47a9284f4e7f5a405ffd7"
+dependencies = [
+ "derive_builder_macro",
+]
+
+[[package]]
+name = "derive_builder_core"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d"
+dependencies = [
+ "darling 0.20.9",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "derive_builder_macro"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b"
+dependencies = [
+ "derive_builder_core",
+ "syn 2.0.48",
+]
+
 [[package]]
 name = "derive_more"
 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",
@@ -6821,7 +7080,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",
@@ -6834,20 +7093,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"
@@ -6862,18 +7107,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"
@@ -7059,6 +7292,12 @@ dependencies = [
  "pkg-config",
 ]
 
+[[package]]
+name = "dyn-clone"
+version = "1.0.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
+
 [[package]]
 name = "e2e-move-tests"
 version = "0.1.0"
@@ -7072,6 +7311,7 @@ dependencies = [
  "aptos-gas-schedule",
  "aptos-language-e2e-tests",
  "aptos-package-builder",
+ "aptos-transaction-generator-lib",
  "aptos-types",
  "aptos-vm",
  "aptos-vm-types",
@@ -7090,6 +7330,7 @@ dependencies = [
  "rand 0.7.3",
  "rstest",
  "serde",
+ "sha3 0.9.1",
  "test-case",
 ]
 
@@ -7670,22 +7911,45 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6"
 
 [[package]]
-name = "fixed"
-version = "1.25.1"
+name = "firestore"
+version = "0.43.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e29e5681dc8556fb9df1409e95eae050e12e8776394313da3546dcb8cf390c73"
+checksum = "11f7f676812c6a51d8584aa52252e2d3a02417ee0b27966c7059fe4ef80945d5"
 dependencies = [
- "az",
- "bytemuck",
- "half 2.2.1",
- "typenum",
-]
-
-[[package]]
-name = "fixed-hash"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfcf0ed7fe52a17a03854ec54a9f76d6d84508d1c0e66bc1793301c73fc8493c"
+ "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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e29e5681dc8556fb9df1409e95eae050e12e8776394313da3546dcb8cf390c73"
+dependencies = [
+ "az",
+ "bytemuck",
+ "half 2.2.1",
+ "typenum",
+]
+
+[[package]]
+name = "fixed-hash"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfcf0ed7fe52a17a03854ec54a9f76d6d84508d1c0e66bc1793301c73fc8493c"
 dependencies = [
  "byteorder",
  "rand 0.8.5",
@@ -7984,7 +8248,6 @@ dependencies = [
  "move-binary-format",
  "move-bytecode-verifier",
  "move-core-types",
- "move-vm-runtime",
  "move-vm-types",
  "once_cell",
  "rayon",
@@ -8005,42 +8268,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",
@@ -8050,15 +8298,17 @@ dependencies = [
 
 [[package]]
 name = "gcp-bigquery-client"
-version = "0.13.0"
+version = "0.16.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09ab5966c98f6d4e71e247cda6a6d8497bc8a1df3a4ba9ee548087842cffc21d"
+checksum = "fb67dedb3fce3a6d25829158e40b22c5e9aa107fdbae0f2fef564931c9161a6a"
 dependencies = [
  "async-stream",
- "hyper",
- "hyper-rustls 0.23.2",
+ "async-trait",
+ "dyn-clone",
+ "hyper 0.14.28",
+ "hyper-rustls 0.24.2",
  "log",
- "reqwest",
+ "reqwest 0.11.23",
  "serde",
  "serde_json",
  "thiserror",
@@ -8278,7 +8528,7 @@ dependencies = [
  "google-cloud-token",
  "home",
  "jsonwebtoken 8.3.0",
- "reqwest",
+ "reqwest 0.11.23",
  "serde",
  "serde_json",
  "thiserror",
@@ -8295,7 +8545,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",
@@ -8321,7 +8571,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",
 ]
@@ -8362,7 +8612,7 @@ dependencies = [
  "once_cell",
  "percent-encoding",
  "regex",
- "reqwest",
+ "reqwest 0.11.23",
  "ring 0.16.20",
  "rsa 0.6.1",
  "serde",
@@ -8459,7 +8709,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",
@@ -8480,6 +8749,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "02b4af3693f1b705df946e9fe5631932443781d0aabb423b62fcd4d73f6d2fd0"
 dependencies = [
  "crunchy",
+ "num-traits",
 ]
 
 [[package]]
@@ -8560,8 +8830,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",
@@ -8573,7 +8858,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]]
@@ -8591,6 +8885,12 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
 [[package]]
 name = "hermit-abi"
 version = "0.1.19"
@@ -8729,6 +9029,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"
@@ -8736,7 +9047,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",
 ]
 
@@ -8772,7 +9106,7 @@ dependencies = [
  "crossbeam-utils",
  "form_urlencoded",
  "futures-util",
- "hyper",
+ "hyper 0.14.28",
  "isahc",
  "lazy_static",
  "levenshtein",
@@ -8811,9 +9145,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",
@@ -8825,14 +9159,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",
@@ -8847,25 +9202,58 @@ 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",
  "tokio",
  "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"
@@ -8873,12 +9261,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"
@@ -8887,7 +9295,7 @@ checksum = "0fafdf7b2b2de7c9784f76e02c0935e65a8117ec3b768644379983ab333ac98c"
 dependencies = [
  "futures-util",
  "hex",
- "hyper",
+ "hyper 0.14.28",
  "pin-project 1.1.3",
  "tokio",
 ]
@@ -9178,6 +9586,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"
@@ -9257,7 +9671,7 @@ dependencies = [
  "encoding_rs",
  "event-listener 2.5.3",
  "futures-lite 1.13.0",
- "http",
+ "http 0.2.11",
  "log",
  "mime",
  "once_cell",
@@ -9297,6 +9711,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"
@@ -9400,6 +9823,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"
@@ -9472,11 +9910,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",
@@ -9491,7 +9929,7 @@ dependencies = [
  "tokio",
  "tokio-util 0.6.10",
  "tower",
- "tower-http 0.2.5",
+ "tower-http",
  "tracing",
 ]
 
@@ -9503,7 +9941,7 @@ checksum = "c52b6ab05d160691083430f6f431707a4e05b64903f2ffa0095ee5efde759117"
 dependencies = [
  "chrono",
  "form_urlencoded",
- "http",
+ "http 0.2.11",
  "json-patch",
  "k8s-openapi",
  "once_cell",
@@ -9653,9 +10091,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"
@@ -9714,16 +10152,16 @@ 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",
 ]
 
 [[package]]
 name = "librocksdb-sys"
-version = "0.11.0+8.1.1"
+version = "0.16.0+8.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3386f101bcb4bd252d8e9d2fb41ec3b0862a15a62b478c355b2982efa469e3e"
+checksum = "ce3d60bc059831dc1c83903fb45c103f75db65c5a7bf22272764d9cc683e348c"
 dependencies = [
  "bindgen",
  "bzip2-sys",
@@ -9844,15 +10282,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"
@@ -9906,9 +10335,9 @@ dependencies = [
 
 [[package]]
 name = "lz4"
-version = "1.24.0"
+version = "1.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e9e2dd86df36ce760a60f6ff6ad526f7ba1f14ba0356f8254fb6905e6494df1"
+checksum = "d6eab492fe7f8651add23237ea56dbf11b3c4ff762ab83d40a47f11433421f91"
 dependencies = [
  "libc",
  "lz4-sys",
@@ -9916,21 +10345,21 @@ dependencies = [
 
 [[package]]
 name = "lz4-sys"
-version = "1.9.4"
+version = "1.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57d27b317e207b10f69f5e75494119e391a96f48861ae870d1da6edac98ca900"
+checksum = "e9764018d143cc854c9f17f0b907de70f14393b1f502da6375dce70f00514eb3"
 dependencies = [
  "cc",
  "libc",
 ]
 
 [[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]]
@@ -9960,12 +10389,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"
@@ -9994,9 +10417,9 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.7.1"
+version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
 name = "memmap2"
@@ -10188,6 +10611,7 @@ dependencies = [
  "move-model",
  "move-prover",
  "move-prover-test-utils",
+ "move-stdlib",
  "serde",
  "tempfile",
 ]
@@ -10200,7 +10624,7 @@ dependencies = [
  "better_any",
  "bytes",
  "datatest-stable",
- "itertools 0.12.1",
+ "itertools 0.13.0",
  "move-binary-format",
  "move-command-line-common",
  "move-compiler",
@@ -10222,6 +10646,7 @@ dependencies = [
  "arbitrary",
  "backtrace",
  "indexmap 1.9.3",
+ "move-bytecode-spec",
  "move-core-types",
  "proptest",
  "proptest-derive",
@@ -10249,6 +10674,15 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "move-bytecode-spec"
+version = "0.1.0"
+dependencies = [
+ "once_cell",
+ "quote",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "move-bytecode-utils"
 version = "0.1.0"
@@ -10294,17 +10728,12 @@ name = "move-cli"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "bcs 0.1.4",
- "bytes",
  "clap 4.4.14",
  "codespan-reporting",
  "colored",
  "datatest-stable",
- "difference",
  "httpmock",
  "move-binary-format",
- "move-bytecode-utils",
- "move-bytecode-verifier",
  "move-bytecode-viewer",
  "move-command-line-common",
  "move-compiler",
@@ -10314,23 +10743,15 @@ dependencies = [
  "move-disassembler",
  "move-docgen",
  "move-errmapgen",
- "move-ir-types",
  "move-model",
  "move-package",
  "move-prover",
- "move-resource-viewer",
  "move-stdlib",
  "move-unit-test",
  "move-vm-runtime",
  "move-vm-test-utils",
  "once_cell",
- "reqwest",
- "serde",
- "serde_json",
- "serde_yaml 0.8.26",
  "tempfile",
- "toml_edit 0.14.4",
- "walkdir",
 ]
 
 [[package]]
@@ -10397,10 +10818,11 @@ dependencies = [
  "ethnum",
  "flexi_logger",
  "im",
- "itertools 0.12.1",
+ "itertools 0.13.0",
  "log",
  "move-binary-format",
  "move-bytecode-source-map",
+ "move-bytecode-verifier",
  "move-command-line-common",
  "move-compiler",
  "move-core-types",
@@ -10422,7 +10844,7 @@ name = "move-compiler-v2-transactional-tests"
 version = "0.1.0"
 dependencies = [
  "datatest-stable",
- "itertools 0.12.1",
+ "itertools 0.13.0",
  "move-command-line-common",
  "move-compiler-v2",
  "move-model",
@@ -10496,10 +10918,11 @@ name = "move-docgen"
 version = "0.1.0"
 dependencies = [
  "anyhow",
+ "clap 4.4.14",
  "codespan",
  "codespan-reporting",
  "datatest-stable",
- "itertools 0.12.1",
+ "itertools 0.13.0",
  "log",
  "move-compiler",
  "move-core-types",
@@ -10540,6 +10963,7 @@ name = "move-examples"
 version = "0.1.1"
 dependencies = [
  "move-cli",
+ "move-stdlib",
 ]
 
 [[package]]
@@ -10625,7 +11049,7 @@ dependencies = [
  "codespan-reporting",
  "datatest-stable",
  "internment",
- "itertools 0.12.1",
+ "itertools 0.13.0",
  "log",
  "move-binary-format",
  "move-bytecode-source-map",
@@ -10653,7 +11077,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",
@@ -10664,6 +11088,7 @@ dependencies = [
  "move-core-types",
  "move-docgen",
  "move-model",
+ "move-stdlib",
  "move-symbol-pool",
  "move-to-yul",
  "named-lock",
@@ -10689,7 +11114,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",
@@ -10720,7 +11145,7 @@ dependencies = [
  "codespan",
  "codespan-reporting",
  "futures",
- "itertools 0.12.1",
+ "itertools 0.13.0",
  "log",
  "move-binary-format",
  "move-command-line-common",
@@ -10747,7 +11172,7 @@ dependencies = [
  "anyhow",
  "codespan-reporting",
  "datatest-stable",
- "itertools 0.12.1",
+ "itertools 0.13.0",
  "log",
  "move-binary-format",
  "move-core-types",
@@ -10792,7 +11217,7 @@ dependencies = [
  "datatest-stable",
  "ethnum",
  "im",
- "itertools 0.12.1",
+ "itertools 0.13.0",
  "log",
  "move-binary-format",
  "move-core-types",
@@ -10887,7 +11312,7 @@ dependencies = [
  "ethnum",
  "evm",
  "evm-exec-utils",
- "itertools 0.12.1",
+ "itertools 0.13.0",
  "maplit",
  "move-command-line-common",
  "move-compiler",
@@ -10916,7 +11341,7 @@ dependencies = [
  "difference",
  "move-binary-format",
  "move-bytecode-source-map",
- "move-cli",
+ "move-bytecode-verifier",
  "move-command-line-common",
  "move-compiler",
  "move-compiler-v2",
@@ -10950,7 +11375,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",
@@ -11054,9 +11479,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",
@@ -11076,12 +11502,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",
 ]
@@ -11193,11 +11636,23 @@ 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",
+]
+
 [[package]]
 name = "no-std-compat"
 version = "0.4.1"
@@ -11426,6 +11881,17 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "num-modular"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17bb261bf36fa7d83f4c294f834e91256769097b3cb505d44831e0a179ac647f"
+dependencies = [
+ "num-bigint 0.4.4",
+ "num-integer",
+ "num-traits",
+]
+
 [[package]]
 name = "num-rational"
 version = "0.3.2"
@@ -11491,17 +11957,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"
@@ -11541,7 +11996,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",
@@ -11720,7 +12175,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",
@@ -11780,6 +12235,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"
@@ -11828,7 +12317,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",
@@ -11902,12 +12391,6 @@ dependencies = [
  "crypto-mac 0.8.0",
 ]
 
-[[package]]
-name = "peeking_take_while"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
-
 [[package]]
 name = "pem"
 version = "0.8.3"
@@ -11928,6 +12411,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"
@@ -12225,39 +12718,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",
@@ -12266,11 +12761,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",
@@ -12278,19 +12772,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",
@@ -12303,19 +12797,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",
 ]
 
@@ -12551,16 +13044,6 @@ dependencies = [
  "structopt",
 ]
 
-[[package]]
-name = "prettyplease"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a41cf62165e97c7f814d2221421dbb9afcbcdb0a88068e5ea206e19951c2cbb5"
-dependencies = [
- "proc-macro2",
- "syn 2.0.48",
-]
-
 [[package]]
 name = "prettytable-rs"
 version = "0.10.0"
@@ -12623,14 +13106,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"
@@ -12679,39 +13170,46 @@ dependencies = [
 [[package]]
 name = "processor"
 version = "1.0.0"
-source = "git+https://github.com/aptos-labs/aptos-indexer-processors.git?rev=a11f0b6532349aa6b9a80c9a1d77524f02d8a013#a11f0b6532349aa6b9a80c9a1d77524f02d8a013"
+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=a11f0b6532349aa6b9a80c9a1d77524f02d8a013)",
- "aptos-protos 1.3.0 (git+https://github.com/aptos-labs/aptos-core.git?tag=aptos-node-v1.10.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",
@@ -12719,9 +13217,10 @@ dependencies = [
  "sha2 0.9.9",
  "sha3 0.9.1",
  "strum 0.24.1",
+ "tiny-keccak",
  "tokio",
  "tokio-postgres",
- "tonic 0.10.2",
+ "tonic 0.11.0",
  "tracing",
  "unescape",
  "url",
@@ -12768,7 +13267,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",
@@ -12795,7 +13294,7 @@ checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf"
 dependencies = [
  "bit-set",
  "bit-vec",
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
  "lazy_static",
  "num-traits",
  "rand 0.8.5",
@@ -12838,6 +13337,16 @@ 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"
@@ -12864,6 +13373,19 @@ dependencies = [
  "syn 2.0.48",
 ]
 
+[[package]]
+name = "prost-derive"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "18bec9b0adc4eba778b33684b7ba3e7137789434769ee3ce3930463ef904cfca"
+dependencies = [
+ "anyhow",
+ "itertools 0.13.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
 [[package]]
 name = "prost-types"
 version = "0.11.9"
@@ -12882,6 +13404,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"
@@ -12915,7 +13446,7 @@ dependencies = [
  "chrono",
  "clap 4.4.14",
  "codespan-reporting",
- "itertools 0.12.1",
+ "itertools 0.13.0",
  "log",
  "move-compiler",
  "move-model",
@@ -12990,7 +13521,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "11bafc859c6815fbaffbbbf4229ecb767ac913fecb27f9ad4343662e9ef099ea"
 dependencies = [
  "memchr",
- "serde",
 ]
 
 [[package]]
@@ -13004,9 +13534,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",
@@ -13024,6 +13554,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"
@@ -13318,51 +13894,96 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
 
 [[package]]
 name = "reqwest"
-version = "0.11.23"
+version = "0.11.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41"
+dependencies = [
+ "base64 0.21.6",
+ "bytes",
+ "cookie 0.16.2",
+ "cookie_store",
+ "encoding_rs",
+ "futures-core",
+ "futures-util",
+ "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",
+ "js-sys",
+ "log",
+ "mime",
+ "mime_guess",
+ "native-tls",
+ "once_cell",
+ "percent-encoding",
+ "pin-project-lite",
+ "rustls 0.21.10",
+ "rustls-pemfile 1.0.4",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "system-configuration",
+ "tokio",
+ "tokio-native-tls",
+ "tokio-rustls 0.24.1",
+ "tokio-util 0.7.10",
+ "tower-service",
+ "url",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "wasm-streams 0.3.0",
+ "web-sys",
+ "webpki-roots 0.25.3",
+ "winreg 0.50.0",
+]
+
+[[package]]
+name = "reqwest"
+version = "0.12.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41"
+checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37"
 dependencies = [
  "async-compression",
- "base64 0.21.6",
+ "base64 0.22.1",
  "bytes",
- "cookie 0.16.2",
- "cookie_store",
- "encoding_rs",
  "futures-core",
  "futures-util",
- "h2",
- "http",
- "http-body",
- "hyper",
- "hyper-rustls 0.24.2",
- "hyper-tls",
+ "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",
- "native-tls",
  "once_cell",
  "percent-encoding",
  "pin-project-lite",
- "rustls 0.21.10",
- "rustls-pemfile 1.0.4",
+ "quinn",
+ "rustls 0.23.7",
+ "rustls-native-certs 0.7.0",
+ "rustls-pemfile 2.1.1",
+ "rustls-pki-types",
  "serde",
  "serde_json",
  "serde_urlencoded",
- "system-configuration",
+ "sync_wrapper 1.0.1",
  "tokio",
- "tokio-native-tls",
- "tokio-rustls 0.24.1",
+ "tokio-rustls 0.26.0",
  "tokio-util 0.7.10",
  "tower-service",
  "url",
  "wasm-bindgen",
  "wasm-bindgen-futures",
- "wasm-streams",
+ "wasm-streams 0.4.0",
  "web-sys",
- "webpki-roots 0.25.3",
- "winreg",
+ "winreg 0.52.0",
 ]
 
 [[package]]
@@ -13373,8 +13994,8 @@ checksum = "88a3e86aa6053e59030e7ce2d2a3b258dd08fc2d337d52f73f6cb480f5858690"
 dependencies = [
  "anyhow",
  "async-trait",
- "http",
- "reqwest",
+ "http 0.2.11",
+ "reqwest 0.11.23",
  "serde",
  "task-local-extensions",
  "thiserror",
@@ -13391,10 +14012,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",
@@ -13509,9 +14130,9 @@ dependencies = [
 
 [[package]]
 name = "rocksdb"
-version = "0.21.0"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb6f170a4041d50a0ce04b0d2e14916d6ca863ea2e422689a5b694395d299ffe"
+checksum = "6bd13e55d6d7b8cd0ea569161127567cd587676c99f4472f779a0279aa60a7a7"
 dependencies = [
  "libc",
  "librocksdb-sys",
@@ -13551,12 +14172,24 @@ dependencies = [
  "pkcs1 0.7.5",
  "pkcs8 0.10.2",
  "rand_core 0.6.4",
+ "sha2 0.10.8",
  "signature 2.2.0",
  "spki 0.7.3",
  "subtle",
  "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"
@@ -13671,7 +14304,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",
@@ -13704,11 +14337,26 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.22.2"
+version = "0.22.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432"
+dependencies = [
+ "log",
+ "ring 0.17.7",
+ "rustls-pki-types",
+ "rustls-webpki 0.102.2",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "rustls"
+version = "0.23.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e87c9956bd9807afa1f77e0f7594af32566e830e088a5576d27c5b6f30f49d41"
+checksum = "ebbbdb961df0ad3f2652da8f3fdc4b36122f568f968f45ad3316f26c025c677b"
 dependencies = [
  "log",
+ "once_cell",
  "ring 0.17.7",
  "rustls-pki-types",
  "rustls-webpki 0.102.2",
@@ -13750,15 +14398,6 @@ dependencies = [
  "base64 0.13.1",
 ]
 
-[[package]]
-name = "rustls-pemfile"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ee86d63972a7c661d1536fefe8c3c8407321c3df668891286de28abcd087360"
-dependencies = [
- "base64 0.13.1",
-]
-
 [[package]]
 name = "rustls-pemfile"
 version = "1.0.4"
@@ -13833,6 +14472,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"
@@ -14005,12 +14664,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",
@@ -14030,14 +14689,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"
@@ -14158,6 +14813,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"
@@ -14223,7 +14888,7 @@ version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "93634eb5f75a2323b16de4748022ac4297f9e76b6dced2be287a099f41b5e788"
 dependencies = [
- "darling 0.20.3",
+ "darling 0.20.9",
  "proc-macro2",
  "quote",
  "syn 2.0.48",
@@ -14277,13 +14942,13 @@ dependencies = [
 [[package]]
 name = "server-framework"
 version = "1.0.0"
-source = "git+https://github.com/aptos-labs/aptos-indexer-processors.git?rev=a11f0b6532349aa6b9a80c9a1d77524f02d8a013#a11f0b6532349aa6b9a80c9a1d77524f02d8a013"
+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",
@@ -14629,6 +15294,8 @@ dependencies = [
  "aptos-consensus",
  "aptos-crypto",
  "aptos-db",
+ "aptos-db-indexer",
+ "aptos-db-indexer-schemas",
  "aptos-debugger",
  "aptos-dkg",
  "aptos-faucet-core",
@@ -14639,6 +15306,7 @@ dependencies = [
  "aptos-genesis",
  "aptos-global-constants",
  "aptos-indexer",
+ "aptos-indexer-grpc-table-info",
  "aptos-infallible",
  "aptos-inspection-service",
  "aptos-keygen",
@@ -14647,6 +15315,7 @@ dependencies = [
  "aptos-release-builder",
  "aptos-rest-client",
  "aptos-rosetta",
+ "aptos-schemadb",
  "aptos-sdk",
  "aptos-secure-storage",
  "aptos-storage-interface",
@@ -14661,16 +15330,17 @@ 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",
+ "tempfile",
  "tokio",
  "url",
  "walkdir",
@@ -14829,6 +15499,21 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
+[[package]]
+name = "strsim"
+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"
@@ -14871,6 +15556,12 @@ dependencies = [
  "strum_macros 0.25.3",
 ]
 
+[[package]]
+name = "strum"
+version = "0.26.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29"
+
 [[package]]
 name = "strum_macros"
 version = "0.24.3"
@@ -14897,6 +15588,19 @@ dependencies = [
  "syn 2.0.48",
 ]
 
+[[package]]
+name = "strum_macros"
+version = "0.26.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
+dependencies = [
+ "heck 0.5.0",
+ "proc-macro2",
+ "quote",
+ "rustversion",
+ "syn 2.0.48",
+]
+
 [[package]]
 name = "subtle"
 version = "2.5.0"
@@ -14960,6 +15664,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"
@@ -15149,7 +15862,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",
@@ -15160,7 +15873,6 @@ dependencies = [
  "move-vm-test-utils",
  "move-vm-types",
  "num_cpus",
- "once_cell",
  "rand 0.8.5",
  "tracing",
  "tracing-subscriber 0.3.18",
@@ -15215,18 +15927,18 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
 
 [[package]]
 name = "thiserror"
-version = "1.0.56"
+version = "1.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad"
+checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.56"
+version = "1.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471"
+checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -15252,6 +15964,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"
@@ -15462,11 +16185,32 @@ version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f"
 dependencies = [
- "rustls 0.22.2",
+ "rustls 0.22.4",
+ "rustls-pki-types",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-rustls"
+version = "0.26.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
+dependencies = [
+ "rustls 0.23.7",
  "rustls-pki-types",
  "tokio",
 ]
 
+[[package]]
+name = "tokio-scoped"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4beb8ba13bc53ac53ce1d52b42f02e5d8060f0f42138862869beb769722b256"
+dependencies = [
+ "tokio",
+ "tokio-stream",
+]
+
 [[package]]
 name = "tokio-stream"
 version = "0.1.14"
@@ -15556,43 +16300,42 @@ 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",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.14.4"
+version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5376256e44f2443f8896ac012507c19a012df0fe8758b55246ae51a2279db51f"
+checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
- "combine",
- "indexmap 1.9.3",
- "itertools 0.10.5",
+ "indexmap 2.2.5",
  "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "winnow",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.19.15"
+version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
+checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338"
 dependencies = [
  "indexmap 2.2.5",
- "serde",
- "serde_spanned",
  "toml_datetime",
  "winnow",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.20.2"
+version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338"
+checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
 dependencies = [
  "indexmap 2.2.5",
  "toml_datetime",
@@ -15613,15 +16356,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",
@@ -15635,67 +16377,68 @@ dependencies = [
 
 [[package]]
 name = "tonic"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d560933a0de61cf715926b9cac824d4c883c2c43142f787595e48280c40a1d0e"
+version = "0.11.0"
+source = "git+https://github.com/aptos-labs/tonic.git?rev=0da1ba8b1751d6e19eb55be24cccf9ae933c666e#0da1ba8b1751d6e19eb55be24cccf9ae933c666e"
 dependencies = [
  "async-stream",
  "async-trait",
  "axum 0.6.20",
- "base64 0.21.6",
+ "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",
- "rustls 0.21.10",
- "rustls-native-certs 0.6.3",
- "rustls-pemfile 1.0.4",
+ "rustls-native-certs 0.7.0",
+ "rustls-pemfile 2.1.1",
+ "strum 0.26.2",
+ "strum_macros 0.26.4",
  "tokio",
- "tokio-rustls 0.24.1",
+ "tokio-rustls 0.26.0",
  "tokio-stream",
  "tower",
  "tower-layer",
  "tower-service",
  "tracing",
+ "zstd",
 ]
 
 [[package]]
 name = "tonic"
-version = "0.11.0"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76c4eb7a4e9ef9d4763600161f12f5070b92a578e1b634db88a6887844c91a13"
+checksum = "38659f4a91aba8598d27821589f5db7dddd94601e7a01b1e485a50e5484c7401"
 dependencies = [
  "async-stream",
  "async-trait",
- "axum 0.6.20",
- "base64 0.21.6",
+ "axum 0.7.5",
+ "base64 0.22.1",
  "bytes",
- "flate2",
- "h2",
- "http",
- "http-body",
- "hyper",
- "hyper-timeout",
+ "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.12.3",
+ "prost 0.13.1",
  "rustls-native-certs 0.7.0",
  "rustls-pemfile 2.1.1",
- "rustls-pki-types",
+ "socket2 0.5.5",
  "tokio",
- "tokio-rustls 0.25.0",
+ "tokio-rustls 0.26.0",
  "tokio-stream",
  "tower",
  "tower-layer",
  "tower-service",
  "tracing",
- "zstd",
 ]
 
 [[package]]
@@ -15742,8 +16485,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",
@@ -15751,25 +16494,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"
@@ -15971,7 +16695,7 @@ dependencies = [
  "byteorder",
  "bytes",
  "data-encoding",
- "http",
+ "http 0.2.11",
  "httparse",
  "log",
  "rand 0.8.5",
@@ -15981,6 +16705,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"
@@ -16282,9 +17016,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",
@@ -16379,13 +17113,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",
@@ -16408,9 +17142,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",
@@ -16513,6 +17247,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"
@@ -16877,6 +17624,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"
@@ -16936,22 +17693,22 @@ checksum = "1367295b8f788d371ce2dbc842c7b709c73ee1364d30351dd300ec2203b12377"
 
 [[package]]
 name = "yup-oauth2"
-version = "7.0.1"
+version = "8.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98748970d2ddf05253e6525810d989740334aa7509457864048a829902db76f3"
+checksum = "b61da40aeb0907a65f7fb5c1de83c5a224d6a9ebb83bf918588a2bb744d636b8"
 dependencies = [
  "anyhow",
  "async-trait",
- "base64 0.13.1",
+ "base64 0.21.6",
  "futures",
- "http",
- "hyper",
- "hyper-rustls 0.23.2",
- "itertools 0.10.5",
+ "http 0.2.11",
+ "hyper 0.14.28",
+ "hyper-rustls 0.24.2",
+ "itertools 0.12.1",
  "log",
  "percent-encoding",
- "rustls 0.20.9",
- "rustls-pemfile 0.3.0",
+ "rustls 0.22.4",
+ "rustls-pemfile 1.0.4",
  "seahash",
  "serde",
  "serde_json",
@@ -17037,20 +17794,19 @@ dependencies = [
 
 [[package]]
 name = "zstd"
-version = "0.12.4"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a27595e173641171fc74a1232b7b1c7a7cb6e18222c11e9dfb9888fa424c53c"
+checksum = "bffb3309596d527cfcba7dfc6ed6052f1d39dfbd7c867aa2e865e4a449c10110"
 dependencies = [
  "zstd-safe",
 ]
 
 [[package]]
 name = "zstd-safe"
-version = "6.0.6"
+version = "7.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee98ffd0b48ee95e6c5168188e44a54550b1564d9d530ee21d5f0eaed1069581"
+checksum = "43747c7422e2924c11144d5229878b98180ef8b06cca4ab5af37afc8a8d8ea3e"
 dependencies = [
- "libc",
  "zstd-sys",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index 6babe1e5819f5..175e667c73783 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",
@@ -102,6 +101,7 @@ members = [
     "crates/crash-handler",
     "crates/fallible",
     "crates/indexer",
+    "crates/jwk-utils",
     "crates/node-resource-metrics",
     "crates/num-variants",
     "crates/proxy",
@@ -116,12 +116,13 @@ 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/transaction-filter",
     "ecosystem/nft-metadata-crawler-parser",
     "ecosystem/node-checker",
     "ecosystem/node-checker/fn-check-client",
@@ -133,7 +134,10 @@ members = [
     "execution/executor-types",
     "experimental/execution/ptx-executor",
     "experimental/runtimes",
+    "experimental/storage/hexy",
     "experimental/storage/layered-map",
+    "keyless/circuit",
+    "keyless/common",
     "keyless/pepper/common",
     "keyless/pepper/example-client-rust",
     "keyless/pepper/service",
@@ -169,14 +173,12 @@ members = [
     "storage/db-tool",
     "storage/executable-store",
     "storage/indexer",
+    "storage/indexer_schemas",
     "storage/jellyfish-merkle",
     "storage/rocksdb-options",
     "storage/schemadb",
     "storage/scratchpad",
     "storage/storage-interface",
-    "testsuite/dos/http_test",
-    "testsuite/dos/listener",
-    "testsuite/dos/sender",
     "testsuite/forge",
     "testsuite/forge-cli",
     "testsuite/fuzzer",
@@ -193,6 +195,7 @@ members = [
     "third_party/move/move-binary-format",
     "third_party/move/move-binary-format/serializer-tests",
     "third_party/move/move-borrow-graph",
+    "third_party/move/move-bytecode-spec",
     "third_party/move/move-bytecode-verifier",
     "third_party/move/move-bytecode-verifier/bytecode-verifier-tests",
     "third_party/move/move-bytecode-verifier/fuzz",
@@ -243,6 +246,7 @@ members = [
     "third_party/move/tools/move-resource-viewer",
     "third_party/move/tools/move-unit-test",
     "tools/calc-dep-sizes",
+    "tools/compute-module-expansion-size",
     "types",
     "vm-validator",
 ]
@@ -276,7 +280,7 @@ homepage = "https://aptoslabs.com"
 license = "Apache-2.0"
 publish = false
 repository = "https://github.com/aptos-labs/aptos-core"
-rust-version = "1.75.0"
+rust-version = "1.78.0"
 
 [workspace.dependencies]
 # Internal crate dependencies.
@@ -311,6 +315,7 @@ aptos-data-client = { path = "state-sync/aptos-data-client" }
 aptos-data-streaming-service = { path = "state-sync/data-streaming-service" }
 aptos-db = { path = "storage/aptosdb" }
 aptos-db-indexer = { path = "storage/indexer" }
+aptos-db-indexer-schemas = { path = "storage/indexer_schemas" }
 aptos-db-tool = { path = "storage/db-tool" }
 aptos-debugger = { path = "crates/aptos-debugger" }
 aptos-dkg = { path = "crates/aptos-dkg" }
@@ -324,6 +329,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" }
@@ -350,6 +356,7 @@ 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" }
@@ -359,6 +366,7 @@ aptos-infallible = { path = "crates/aptos-infallible" }
 aptos-inspection-service = { path = "crates/aptos-inspection-service" }
 aptos-jellyfish-merkle = { path = "storage/jellyfish-merkle" }
 aptos-jwk-consensus = { path = "crates/aptos-jwk-consensus" }
+aptos-jwk-utils = { path = "crates/jwk-utils" }
 aptos-keygen = { path = "crates/aptos-keygen" }
 aptos-language-e2e-tests = { path = "aptos-move/e2e-tests" }
 aptos-ledger = { path = "crates/aptos-ledger" }
@@ -391,6 +399,7 @@ aptos-package-builder = { path = "aptos-move/package-builder" }
 aptos-peer-monitoring-service-client = { path = "peer-monitoring-service/client" }
 aptos-peer-monitoring-service-server = { path = "peer-monitoring-service/server" }
 aptos-peer-monitoring-service-types = { path = "peer-monitoring-service/types" }
+aptos-keyless-common = { path = "keyless/common" }
 aptos-keyless-pepper-common = { path = "keyless/pepper/common" }
 aptos-keyless-pepper-service = { path = "keyless/pepper/service" }
 aptos-profiler = { path = "crates/aptos-profiler" }
@@ -423,6 +432,7 @@ aptos-storage-service-notifications = { path = "state-sync/inter-component/stora
 aptos-storage-service-types = { path = "state-sync/storage-service/types" }
 aptos-storage-service-server = { path = "state-sync/storage-service/server" }
 aptos-system-utils = { path = "crates/aptos-system-utils" }
+aptos-transaction-filter = { path = "ecosystem/indexer-grpc/transaction-filter" }
 aptos-telemetry = { path = "crates/aptos-telemetry" }
 aptos-telemetry-service = { path = "crates/aptos-telemetry-service" }
 aptos-temppath = { path = "crates/aptos-temppath" }
@@ -444,7 +454,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.
@@ -475,7 +484,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"] }
@@ -512,7 +521,7 @@ codespan = "0.11.1"
 codespan-reporting = "0.11.1"
 colored = "2.0.0"
 concurrent-queue = "2.2.0"
-console-subscriber = "0.1.8"
+console-subscriber = "0.3.0"
 const_format = "0.2.26"
 core_affinity = "0.8.1"
 coset = "0.3"
@@ -529,12 +538,18 @@ datatest-stable = "0.1.1"
 debug-ignore = { version = "1.0.3", features = ["serde"] }
 derivative = "2.2.0"
 derivation-path = "0.2.0"
+derive_builder = "0.20.0"
 determinator = "0.12.0"
 derive_more = "0.99.11"
 diesel = "2.1"
 # Use the crate version once this feature gets released on crates.io:
 # https://github.com/weiznich/diesel_async/commit/e165e8c96a6c540ebde2d6d7c52df5c5620a4bf1
-diesel-async = { git = "https://github.com/weiznich/diesel_async.git", rev = "d02798c67065d763154d7272dd0c09b39757d0f2", features = ["async-connection-wrapper", "postgres", "bb8", "tokio"] }
+diesel-async = { git = "https://github.com/weiznich/diesel_async.git", rev = "d02798c67065d763154d7272dd0c09b39757d0f2", features = [
+    "async-connection-wrapper",
+    "postgres",
+    "bb8",
+    "tokio",
+] }
 diesel_migrations = { version = "2.1.0", features = ["postgres"] }
 difference = "2.0.0"
 digest = "0.9.0"
@@ -557,6 +572,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"
@@ -566,7 +582,7 @@ futures-core = "0.3.29"
 futures-util = "0.3.29"
 fxhash = "0.2.1"
 getrandom = "0.2.2"
-gcp-bigquery-client = "0.13.0"
+gcp-bigquery-client = "0.16.8"
 get_if_addrs = "0.5.3"
 git2 = "0.16.1"
 glob = "0.3.0"
@@ -594,7 +610,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",
@@ -609,7 +625,7 @@ libfuzzer-sys = "0.4.6"
 libsecp256k1 = "0.7.0"
 log = "0.4.17"
 lru = "0.7.5"
-lz4 = "1.24.0"
+lz4 = "1.25.0"
 maplit = "1.0.2"
 merlin = "3"
 memory-stats = "1.0.0"
@@ -628,7 +644,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"
@@ -650,9 +665,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"
@@ -686,13 +702,14 @@ reqwest = { version = "0.11.11", features = [
     "blocking",
     "cookies",
     "json",
+    "multipart",
     "stream",
 ] }
 reqwest-middleware = "0.2.0"
 reqwest-retry = "0.2.1"
 ring = { version = "0.16.20", features = ["std"] }
 ripemd = "0.1.1"
-rocksdb = { version = "0.21.0", features = ["lz4"] }
+rocksdb = { version = "0.22.0", features = ["lz4"] }
 rsa = { version = "0.9.6" }
 rstack-self = { version = "0.3.0", features = ["dw"], default_features = false }
 rstest = "0.15.0"
@@ -788,6 +805,7 @@ z3tracer = "0.8.0"
 # MOVE DEPENDENCIES
 move-abigen = { path = "third_party/move/move-prover/move-abigen" }
 move-binary-format = { path = "third_party/move/move-binary-format" }
+move-bytecode-spec = { path = "third_party/move/move-bytecode-spec" }
 move-bytecode-verifier = { path = "third_party/move/move-bytecode-verifier" }
 move-bytecode-utils = { path = "third_party/move/tools/move-bytecode-utils" }
 move-cli = { path = "third_party/move/tools/move-cli" }
@@ -859,3 +877,4 @@ debug = true
 serde-reflection = { git = "https://github.com/aptos-labs/serde-reflection", rev = "73b6bbf748334b71ff6d7d09d06a29e3062ca075" }
 merlin = { git = "https://github.com/aptos-labs/merlin" }
 x25519-dalek = { git = "https://github.com/aptos-labs/x25519-dalek", branch = "zeroize_v1" }
+tonic = { git = "https://github.com/aptos-labs/tonic.git", rev = "0da1ba8b1751d6e19eb55be24cccf9ae933c666e" }
diff --git a/RELEASE.md b/RELEASE.md
index d5e5a73617018..86ad2d66f087f 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -39,13 +39,13 @@ The aptos cli release tags are created to track the CLI versions for community t
 (The time length here is a rough estimate, it varies depends on each release.)
 * [day 0] A release branch `aptos-release-vx.y` will be created, with a commit hash `abcde`. The full test suite will be triggered for the commit hash for validation.
 * [day 1] The release will be deployed to **devnet**.
-* [day 7] Once the release passed devnet test, a release tag `aptos-node-vx.y.z` will be created, and get deployed to **testnet**.
-* [day 14] After the binary release stablized on testnet, testnet framework will be upgraded.
+* [day 7] Once the release passed devnet test, a release tag `aptos-node-vx.y.z.rc` will be created, and get deployed to **testnet**.
+* [day 10] After the binary release stablized on testnet, testnet framework will be upgraded.
 * Hot-fixes release will be created as needed when a release version is soaking in testnet, and we will only promote a release from testnet to Mainnet after confirming a release version is stable.
-* [day 24] Once confirmed that both binary upgrade and framework upgrade stablized on testnet, the release version will be deployed to 1% of the stake on **Mainnet**.
-* [day 25] Wider announcement will be made for the community to upgrade the binary, `aptos-node-vx.y.z` will be updated with "[Mainnet]" in the release page, Mainnet validators will be slowly upgrading.
-* [day 30] A list of framework upgrade proposals will be submitted to Mainnet for voting.
-* [day 37] Proposals executed on-chain if passed voting.
+* [day 14] Once confirmed that both binary upgrade and framework upgrade stablized on testnet, a release tag `aptos-node-vx.y.z` will be created, the release version will be deployed to 1% of the stake on **Mainnet**.
+* [day 16] Wider announcement will be made for the community to upgrade the binary, `aptos-node-vx.y.z` will be updated with "[Mainnet]" in the release page, Mainnet validators will be slowly upgrading.
+* [day 17] A list of framework upgrade proposals will be submitted to Mainnet for voting.
+* [day 24] Proposals executed on-chain if passed voting.
 
 ## Release Announcement
 * Each of the network release will be announced on Aptos Network [Discord](https://discord.gg/aptosnetwork). Follow mainnet-release, testnet-release, devnet-release channel to get updates.
diff --git a/SECURITY.md b/SECURITY.md
index 48c42cb940f20..acb4ca035fe1c 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -1,139 +1,5 @@
-# Aptos Core Bug Bounty
+# Aptos Foundation Bounty Program
 
-## Reporting a Security Concern
+The Aptos Foundation welcomes feedback from security researchers and the general public to help improve the security of the Aptos Network, and, at its sole discretion, offers bounty rewards for security reports that identify previously unknown, in-scope security vulnerabilities.
 
-**DO NOT CREATE AN ISSUE** to report a security problem.
-
-Go to https://github.com/aptos-labs/aptos-core/security/advisories and open a vulnerability report. Send an email to [security@aptosfoundation.org](mailto:security@aptosfoundation.org) and provide your GitHub username. The team will triage the issue from there.
-
-For security reasons, DO NOT include attachments or provide detail sufficient for exploitation regarding the security issue in this email. Instead, wait for the advisory to be created, and **provide any sensitive details in the private GitHub advisory**.
-
-If you haven't done so already, please **enable two-factor authentation** in your GitHub account.
-
-Send the email from an email domain that is less likely to get flagged for spam by gmail.
-
-This is an actively monitored account, the team will quickly respond.
-
-If you do not receive a response within 24 hours, please directly followup with the team in [Discord](https://discord.gg/aptosnetwork) by reaching out to anyone with the role “Aptos Labs”.
-
-As above, please DO NOT include attachments or provide detail regarding the security issue in this email.
-
-## Incident Response Process
-
-1. Establish a new draft security advisory
-    1. In response to an email to [security@aptosfoundation.org](mailto:security@aptosfoundation.org), a member of the Aptos Labs will create a new draft security advisory for the incident at [https://github.com/aptos-labs/aptos-core/security/policy](https://github.com/aptos-labs/aptos-core/security/policy).
-    2. Add the reporter's GitHub account and relevant individuals to the draft security advisory.
-    3. Respond to the reporter by email, sharing a link to the draft security advisory.
-2. Responder should add appropriate content to the draft security advisory. To be eligible for a bug bounty, this includes:
-    1. A clear description of the issue and the impacted areas.
-    2. The code and the methodology to reproduce the underlying issue.
-    3. Discussion of potential remediations.
-3. Triage
-    1. Validate the issue.
-    2. Determine the criticality of the issue.
-    3. If this is a bug and not a security issue, recommend to the submitter to create an issue.
-4. Resolve by building new docker containers and binaries that contain the fix and pushing to affected entities.
-
-## Bug Bounties
-
-Aptos Foundation offers bounties for security reports. Reports will be validated against the GitHub repository branch labeled "mainnet" and no others. Moreover, any code within mainnet but not in an actively deployed network or in a position to be deployed in such an environment, such as experimental or actively developed code, are out of scope for the bug bounty program. In addition, if a bug discovered in mainnet is already fixed in main, it is out of scope. Production environments include the Aptos testnet and mainnet.
-
-The scope includes code within
-
-- [Aptos Core — main branch](https://github.com/aptos-labs/aptos-core/tree/main)
-- [Move — Aptos branch](https://github.com/move-language/move/tree/aptos)
-
-Aptos Foundation considers the following levels of severity:
-
-### Critical — Up to $1,000,000 USD in APT tokens (locked for 12 months)
-
-- Direct loss of funds to users or protocols with minimal preconditions, such as, Move type confusion.
-- Vulnerabilities in the Proof of Stake system which directly compromise consensus.
-- Unintended permanent chain split requiring hard fork (network partition requiring hardfork).
-- Permanent freezing, burning, or modification of funds (fix requires hardfork).
-
-### High — Up to $100,000 USD in APT tokens (locked for 12 months)
-
-- Loss of funds with some pre-conditions, such as, halting the network.
-- Interrupting blockchain progress or halting the network.
-
-### Medium — Up to $25,000 USD in APT tokens (locked for 12 months)
-
-- Denial of service issues which compromise the integrity or availability of the chain.
-- Loss of funds with many preconditions.
-- Ability to crash a production node with some pre-conditions.
-
-## Payment of Bug Bounties
-
-- Bounties are currently awarded on a rolling/weekly basis and paid out within 30 days upon receipt of successful KYC and payment contract.
-- The APT/USD conversion rate used for payments is the market price of APT (denominated in USD) at 11:59 PM PST the day that both KYC and the payment contract are completed.
-- The reference for this price is the Closing Price given by Coingecko.com on that date given here: [https://www.coingecko.com/en/coins/aptos/historical_data#panel](https://www.coingecko.com/en/coins/aptos/historical_data#panel)
-- Bug bounties that are paid out in APT are paid to locked to the account provided by the reporter with a lockup expiring 12 months from the date of the delivery of APT.
-- Multiple vulnerabilities of similar root cause will be paid out as one report.
-
-## Duplicate Reports
-
-Compensation for duplicate reports will be split among reporters with first to report taking priority using the following equation:
-
-```
-R: total reports
-ri: report priority
-bi: bounty share
-
-bi = 2 ^ (R - ri) / ((2^R) - 1)
-```
-
-Where report priority derives from the set of integers beginning at 1, where the first reporter has `ri = 1`, the second reporter `ri = 2`, and so forth.
-
-Note, reports that come in after the issue has been fully triaged and resolved will not be eligible for splitting.
-
-## KYC Requirements
-
-This bug bounty program is only open to individuals [outside the OFAC restricted countries](https://home.treasury.gov/policy-issues/financial-sanctions/sanctions-programs-and-country-information). Bug bounty hunters will be required to provide evidence that they are not a resident or citizen of these countries to be eligible for a reward. If the individual is a US person, tax information will be required, such as a W-9, in order to properly issue a 1099. Aptos requires KYC to be done for all bug bounty hunters submitting a report and wanting a reward. Form W-9 or Form W-8 is required for tax purposes. All bug bounty hunters are required to use Persona for KYC, links will be provided upon resolution of the issue. The collection of this information will be done by the Aptos Foundation.
-
-If an impact can be caused to any other asset managed by Aptos that isn’t on this table but for which the impact is not inscope, you are encouraged to submit it for consideration by the project.
-
-## Out of Scope
-
-The following vulnerabilities are excluded from the rewards for this bug bounty program:
-
-- Attacks that the reporter has already exploited themselves, leading to damage.
-- Attacks requiring access to leaked keys/credentials.
-- Internally known issues, duplicate issues, or issues that have already been made public; in such cases, proof of prior disclosure will be provided.
-- Attacks that rely on social engineering or require physical access to the victim’s device.
-- Information disclosure with minimal security impact (Ex: stack traces, path disclosure, directory listing, logs).
-- Tab-nabbing.
-- Vulnerabilities related to auto-fill web forms.
-- Vulnerabilities only exploitable on out-of-date browsers or platforms.
-- Attacks requiring physical access to the victim device.
-- Incorrect data supplied by third party oracles.
-
-### Blockchain:
-
-- Basic economic governance attacks (e.g. 51% attack).
-- Best practice critiques.
-- Missing or incorrect data in events.
-- Sybil attacks.
-- Centralization risk.
-
-### Smart Contracts:
-
-- Incorrect data supplied by third-party oracles (not to exclude oracle manipulation/flash loan attacks; use of such methods to generate critical impacts remain in-scope for this program).
-- Basic economic governance attacks (e.g., 51% attack).
-- Lack of liquidity.
-- Best practice critiques.
-- Missing or incorrect data in events.
-- Incorrect naming (but still correct data) in contracts.
-- Minor rounding errors that don’t lead to substantial loss of funds.
-
-## Exclusions
-
-The following activities are prohibited by this bug bounty program:
-
-- Any testing with mainnet or public testnet contracts; all testing should be done on [private testnets](https://aptos.dev/nodes/localnet/).
-- Any testing with pricing oracles or third party smart contracts.
-- Attempting to phish or otherwise use social engineering attacks against contributors, employees, and/or customers.
-- Any testing with third-party systems and applications (e.g., browser extensions) as well as websites (e.g., SSO providers, advertising networks).
-- Any denial of service attacks.
-- Automated testing of services that generates significant amounts of traffic.
-- Public disclosure of an unpatched vulnerability in an embargoed bounty.
+To learn more visit the [Aptos Foundation Bounty Program](https://hackenproof.com/aptos) page.
diff --git a/api/Cargo.toml b/api/Cargo.toml
index cbb61e7b0dd40..fcc5efdca74ec 100644
--- a/api/Cargo.toml
+++ b/api/Cargo.toml
@@ -19,7 +19,6 @@ aptos-bcs-utils = { workspace = true }
 aptos-build-info = { workspace = true }
 aptos-config = { workspace = true }
 aptos-crypto = { workspace = true }
-aptos-db-indexer = { workspace = true }
 aptos-gas-schedule = { workspace = true }
 aptos-global-constants = { workspace = true }
 aptos-logger = { workspace = true }
@@ -29,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 }
@@ -56,6 +53,7 @@ aptos-cached-packages = { workspace = true }
 aptos-framework = { workspace = true }
 aptos-gas-meter = { workspace = true }
 aptos-gas-schedule = { workspace = true, features = ["testing"] }
+aptos-move-stdlib = { workspace = true }
 aptos-proptest-helpers = { workspace = true }
 aptos-sdk = { workspace = true }
 move-package = { workspace = true }
diff --git a/api/doc/CHANGELOG.md b/api/doc/CHANGELOG.md
index 7d5746ecc9041..63ad6763a3232 100644
--- a/api/doc/CHANGELOG.md
+++ b/api/doc/CHANGELOG.md
@@ -5,7 +5,7 @@ All notable changes to the Aptos Node API will be captured in this file. This ch
 **Note**: The Aptos 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 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta http-equiv="cache-control" content="no-cache">
-    <title>Aptos REST API</title>
+    <title>Aptos Node API</title>
     <!-- Embed elements Elements via Web Component -->
     <script src="https://unpkg.com/@stoplight/elements/web-components.min.js"></script>
     <link rel="stylesheet" href="https://unpkg.com/@stoplight/elements/styles.min.css">
diff --git a/api/doc/spec.json b/api/doc/spec.json
index a6358ad123abf..231c4dc0107e6 100644
--- a/api/doc/spec.json
+++ b/api/doc/spec.json
@@ -13990,6 +13990,9 @@
             "properties": {
               "type": {
                 "type": "string",
+                "enum": [
+                  "ed25519_signature"
+                ],
                 "example": "ed25519_signature"
               }
             }
@@ -14009,6 +14012,9 @@
             "properties": {
               "type": {
                 "type": "string",
+                "enum": [
+                  "multi_ed25519_signature"
+                ],
                 "example": "multi_ed25519_signature"
               }
             }
@@ -14028,6 +14034,9 @@
             "properties": {
               "type": {
                 "type": "string",
+                "enum": [
+                  "multi_key_signature"
+                ],
                 "example": "multi_key_signature"
               }
             }
@@ -14047,6 +14056,9 @@
             "properties": {
               "type": {
                 "type": "string",
+                "enum": [
+                  "single_key_signature"
+                ],
                 "example": "single_key_signature"
               }
             }
@@ -14146,6 +14158,91 @@
           }
         }
       },
+      "BlockEndInfo": {
+        "type": "object",
+        "required": [
+          "block_gas_limit_reached",
+          "block_output_limit_reached",
+          "block_effective_block_gas_units",
+          "block_approx_output_size"
+        ],
+        "properties": {
+          "block_gas_limit_reached": {
+            "type": "boolean"
+          },
+          "block_output_limit_reached": {
+            "type": "boolean"
+          },
+          "block_effective_block_gas_units": {
+            "type": "integer",
+            "format": "uint64"
+          },
+          "block_approx_output_size": {
+            "type": "integer",
+            "format": "uint64"
+          }
+        }
+      },
+      "BlockEpilogueTransaction": {
+        "type": "object",
+        "description": "A block epilogue transaction",
+        "required": [
+          "version",
+          "hash",
+          "state_change_hash",
+          "event_root_hash",
+          "gas_used",
+          "success",
+          "vm_status",
+          "accumulator_root_hash",
+          "changes",
+          "timestamp"
+        ],
+        "properties": {
+          "version": {
+            "$ref": "#/components/schemas/U64"
+          },
+          "hash": {
+            "$ref": "#/components/schemas/HashValue"
+          },
+          "state_change_hash": {
+            "$ref": "#/components/schemas/HashValue"
+          },
+          "event_root_hash": {
+            "$ref": "#/components/schemas/HashValue"
+          },
+          "state_checkpoint_hash": {
+            "$ref": "#/components/schemas/HashValue"
+          },
+          "gas_used": {
+            "$ref": "#/components/schemas/U64"
+          },
+          "success": {
+            "type": "boolean",
+            "description": "Whether the transaction was successful"
+          },
+          "vm_status": {
+            "type": "string",
+            "description": "The VM status of the transaction, can tell useful information in a failure"
+          },
+          "accumulator_root_hash": {
+            "$ref": "#/components/schemas/HashValue"
+          },
+          "changes": {
+            "type": "array",
+            "description": "Final state of resources changed by the transaction",
+            "items": {
+              "$ref": "#/components/schemas/WriteSetChange"
+            }
+          },
+          "timestamp": {
+            "$ref": "#/components/schemas/U64"
+          },
+          "block_end_info": {
+            "$ref": "#/components/schemas/BlockEndInfo"
+          }
+        }
+      },
       "BlockMetadataTransaction": {
         "type": "object",
         "description": "A block metadata transaction\n\nThis signifies the beginning of a block, and contains information\nabout the specific block",
@@ -14245,6 +14342,73 @@
           }
         }
       },
+      "DKGResultTransaction": {
+        "type": "object",
+        "required": [
+          "version",
+          "hash",
+          "state_change_hash",
+          "event_root_hash",
+          "gas_used",
+          "success",
+          "vm_status",
+          "accumulator_root_hash",
+          "changes",
+          "events",
+          "timestamp",
+          "dkg_transcript"
+        ],
+        "properties": {
+          "version": {
+            "$ref": "#/components/schemas/U64"
+          },
+          "hash": {
+            "$ref": "#/components/schemas/HashValue"
+          },
+          "state_change_hash": {
+            "$ref": "#/components/schemas/HashValue"
+          },
+          "event_root_hash": {
+            "$ref": "#/components/schemas/HashValue"
+          },
+          "state_checkpoint_hash": {
+            "$ref": "#/components/schemas/HashValue"
+          },
+          "gas_used": {
+            "$ref": "#/components/schemas/U64"
+          },
+          "success": {
+            "type": "boolean",
+            "description": "Whether the transaction was successful"
+          },
+          "vm_status": {
+            "type": "string",
+            "description": "The VM status of the transaction, can tell useful information in a failure"
+          },
+          "accumulator_root_hash": {
+            "$ref": "#/components/schemas/HashValue"
+          },
+          "changes": {
+            "type": "array",
+            "description": "Final state of resources changed by the transaction",
+            "items": {
+              "$ref": "#/components/schemas/WriteSetChange"
+            }
+          },
+          "events": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Event"
+            }
+          },
+          "timestamp": {
+            "$ref": "#/components/schemas/U64"
+          },
+          "dkg_transcript": {
+            "$ref": "#/components/schemas/ExportedDKGTranscript"
+          }
+        }
+      },
       "DecodedTableData": {
         "type": "object",
         "description": "Decoded table data",
@@ -14377,6 +14541,17 @@
           }
         }
       },
+      "Ed25519": {
+        "type": "object",
+        "required": [
+          "value"
+        ],
+        "properties": {
+          "value": {
+            "$ref": "#/components/schemas/HexEncodedBytes"
+          }
+        }
+      },
       "Ed25519Signature": {
         "type": "object",
         "description": "A single Ed25519 signature",
@@ -14502,6 +14677,84 @@
           }
         }
       },
+      "ExportedAggregateSignature": {
+        "type": "object",
+        "description": "A more API-friendly representation of the on-chain `aptos_types::aggregate_signature::AggregateSignature`.",
+        "required": [
+          "signer_indices"
+        ],
+        "properties": {
+          "signer_indices": {
+            "type": "array",
+            "items": {
+              "type": "integer",
+              "format": "uint64"
+            }
+          },
+          "sig": {
+            "$ref": "#/components/schemas/HexEncodedBytes"
+          }
+        }
+      },
+      "ExportedDKGTranscript": {
+        "type": "object",
+        "required": [
+          "epoch",
+          "author",
+          "payload"
+        ],
+        "properties": {
+          "epoch": {
+            "$ref": "#/components/schemas/U64"
+          },
+          "author": {
+            "$ref": "#/components/schemas/Address"
+          },
+          "payload": {
+            "$ref": "#/components/schemas/HexEncodedBytes"
+          }
+        }
+      },
+      "ExportedProviderJWKs": {
+        "type": "object",
+        "description": "A more API-friendly representation of the on-chain `aptos_types::jwks::ProviderJWKs`.",
+        "required": [
+          "issuer",
+          "version",
+          "jwks"
+        ],
+        "properties": {
+          "issuer": {
+            "type": "string"
+          },
+          "version": {
+            "type": "integer",
+            "format": "uint64"
+          },
+          "jwks": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/JWK"
+            }
+          }
+        }
+      },
+      "ExportedQuorumCertifiedUpdate": {
+        "type": "object",
+        "description": "A more API-friendly representation of the on-chain `aptos_types::jwks::QuorumCertifiedUpdate`.",
+        "required": [
+          "update",
+          "multi_sig"
+        ],
+        "properties": {
+          "update": {
+            "$ref": "#/components/schemas/ExportedProviderJWKs"
+          },
+          "multi_sig": {
+            "$ref": "#/components/schemas/ExportedAggregateSignature"
+          }
+        }
+      },
       "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",
@@ -14601,6 +14854,9 @@
             "properties": {
               "type": {
                 "type": "string",
+                "enum": [
+                  "write_set_payload"
+                ],
                 "example": "write_set_payload"
               }
             }
@@ -14761,6 +15017,96 @@
           }
         }
       },
+      "JWK": {
+        "type": "object",
+        "description": "The JWK type that can be converted from/to `JWKMoveStruct` but easier to use in rust.",
+        "anyOf": [
+          {
+            "$ref": "#/components/schemas/RSA_JWK"
+          },
+          {
+            "$ref": "#/components/schemas/UnsupportedJWK"
+          }
+        ]
+      },
+      "JWKUpdateTransaction": {
+        "type": "object",
+        "required": [
+          "version",
+          "hash",
+          "state_change_hash",
+          "event_root_hash",
+          "gas_used",
+          "success",
+          "vm_status",
+          "accumulator_root_hash",
+          "changes",
+          "events",
+          "timestamp",
+          "quorum_certified_update"
+        ],
+        "properties": {
+          "version": {
+            "$ref": "#/components/schemas/U64"
+          },
+          "hash": {
+            "$ref": "#/components/schemas/HashValue"
+          },
+          "state_change_hash": {
+            "$ref": "#/components/schemas/HashValue"
+          },
+          "event_root_hash": {
+            "$ref": "#/components/schemas/HashValue"
+          },
+          "state_checkpoint_hash": {
+            "$ref": "#/components/schemas/HashValue"
+          },
+          "gas_used": {
+            "$ref": "#/components/schemas/U64"
+          },
+          "success": {
+            "type": "boolean",
+            "description": "Whether the transaction was successful"
+          },
+          "vm_status": {
+            "type": "string",
+            "description": "The VM status of the transaction, can tell useful information in a failure"
+          },
+          "accumulator_root_hash": {
+            "$ref": "#/components/schemas/HashValue"
+          },
+          "changes": {
+            "type": "array",
+            "description": "Final state of resources changed by the transaction",
+            "items": {
+              "$ref": "#/components/schemas/WriteSetChange"
+            }
+          },
+          "events": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Event"
+            }
+          },
+          "timestamp": {
+            "$ref": "#/components/schemas/U64"
+          },
+          "quorum_certified_update": {
+            "$ref": "#/components/schemas/ExportedQuorumCertifiedUpdate"
+          }
+        }
+      },
+      "Keyless": {
+        "type": "object",
+        "required": [
+          "value"
+        ],
+        "properties": {
+          "value": {
+            "$ref": "#/components/schemas/HexEncodedBytes"
+          }
+        }
+      },
       "MoveAbility": {
         "type": "string"
       },
@@ -14936,6 +15282,7 @@
         "required": [
           "name",
           "is_native",
+          "is_event",
           "abilities",
           "generic_type_params",
           "fields"
@@ -14948,6 +15295,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",
@@ -15208,6 +15559,9 @@
             "properties": {
               "type": {
                 "type": "string",
+                "enum": [
+                  "entry_function_payload"
+                ],
                 "example": "entry_function_payload"
               }
             }
@@ -15260,29 +15614,95 @@
         "type": "object",
         "oneOf": [
           {
-            "$ref": "#/components/schemas/PublicKey_string(HexEncodedBytes)"
+            "$ref": "#/components/schemas/PublicKey_Ed25519"
+          },
+          {
+            "$ref": "#/components/schemas/PublicKey_Secp256k1Ecdsa"
+          },
+          {
+            "$ref": "#/components/schemas/PublicKey_Secp256r1Ecdsa"
+          },
+          {
+            "$ref": "#/components/schemas/PublicKey_Keyless"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "ed25519": "#/components/schemas/PublicKey_Ed25519",
+            "secp256k1_ecdsa": "#/components/schemas/PublicKey_Secp256k1Ecdsa",
+            "secp256r1_ecdsa": "#/components/schemas/PublicKey_Secp256r1Ecdsa",
+            "keyless": "#/components/schemas/PublicKey_Keyless"
+          }
+        }
+      },
+      "PublicKey_Ed25519": {
+        "allOf": [
+          {
+            "type": "object",
+            "required": [
+              "type"
+            ],
+            "properties": {
+              "type": {
+                "type": "string",
+                "enum": [
+                  "ed25519"
+                ],
+                "example": "ed25519"
+              }
+            }
+          },
+          {
+            "$ref": "#/components/schemas/Ed25519"
+          }
+        ]
+      },
+      "PublicKey_Keyless": {
+        "allOf": [
+          {
+            "type": "object",
+            "required": [
+              "type"
+            ],
+            "properties": {
+              "type": {
+                "type": "string",
+                "enum": [
+                  "keyless"
+                ],
+                "example": "keyless"
+              }
+            }
           },
           {
-            "$ref": "#/components/schemas/PublicKey_string(HexEncodedBytes)"
-          },
+            "$ref": "#/components/schemas/Keyless"
+          }
+        ]
+      },
+      "PublicKey_Secp256k1Ecdsa": {
+        "allOf": [
           {
-            "$ref": "#/components/schemas/PublicKey_string(HexEncodedBytes)"
+            "type": "object",
+            "required": [
+              "type"
+            ],
+            "properties": {
+              "type": {
+                "type": "string",
+                "enum": [
+                  "secp256k1_ecdsa"
+                ],
+                "example": "secp256k1_ecdsa"
+              }
+            }
           },
           {
-            "$ref": "#/components/schemas/PublicKey_string(HexEncodedBytes)"
-          }
-        ],
-        "discriminator": {
-          "propertyName": "type",
-          "mapping": {
-            "ed25519": "#/components/schemas/PublicKey_string(HexEncodedBytes)",
-            "secp256k1_ecdsa": "#/components/schemas/PublicKey_string(HexEncodedBytes)",
-            "secp256r1_ecdsa": "#/components/schemas/PublicKey_string(HexEncodedBytes)",
-            "keyless": "#/components/schemas/PublicKey_string(HexEncodedBytes)"
+            "$ref": "#/components/schemas/Secp256k1Ecdsa"
           }
-        }
+        ]
       },
-      "PublicKey_string(HexEncodedBytes)": {
+      "PublicKey_Secp256r1Ecdsa": {
         "allOf": [
           {
             "type": "object",
@@ -15292,15 +15712,46 @@
             "properties": {
               "type": {
                 "type": "string",
-                "example": "keyless"
+                "enum": [
+                  "secp256r1_ecdsa"
+                ],
+                "example": "secp256r1_ecdsa"
               }
             }
           },
           {
-            "$ref": "#/components/schemas/HexEncodedBytes"
+            "$ref": "#/components/schemas/Secp256r1Ecdsa"
           }
         ]
       },
+      "RSA_JWK": {
+        "type": "object",
+        "description": "Move type `0x1::jwks::RSA_JWK` in rust.\nSee its doc in Move for more details.",
+        "required": [
+          "kid",
+          "kty",
+          "alg",
+          "e",
+          "n"
+        ],
+        "properties": {
+          "kid": {
+            "type": "string"
+          },
+          "kty": {
+            "type": "string"
+          },
+          "alg": {
+            "type": "string"
+          },
+          "e": {
+            "type": "string"
+          },
+          "n": {
+            "type": "string"
+          }
+        }
+      },
       "RawTableItemRequest": {
         "type": "object",
         "description": "Table Item request for the GetTableItemRaw API",
@@ -15361,33 +15812,77 @@
           }
         }
       },
+      "Secp256k1Ecdsa": {
+        "type": "object",
+        "required": [
+          "value"
+        ],
+        "properties": {
+          "value": {
+            "$ref": "#/components/schemas/HexEncodedBytes"
+          }
+        }
+      },
+      "Secp256r1Ecdsa": {
+        "type": "object",
+        "required": [
+          "value"
+        ],
+        "properties": {
+          "value": {
+            "$ref": "#/components/schemas/HexEncodedBytes"
+          }
+        }
+      },
       "Signature": {
         "type": "object",
         "oneOf": [
           {
-            "$ref": "#/components/schemas/Signature_string(HexEncodedBytes)"
+            "$ref": "#/components/schemas/Signature_Ed25519"
           },
           {
-            "$ref": "#/components/schemas/Signature_string(HexEncodedBytes)"
+            "$ref": "#/components/schemas/Signature_Secp256k1Ecdsa"
           },
           {
-            "$ref": "#/components/schemas/Signature_string(HexEncodedBytes)"
+            "$ref": "#/components/schemas/Signature_WebAuthn"
           },
           {
-            "$ref": "#/components/schemas/Signature_string(HexEncodedBytes)"
+            "$ref": "#/components/schemas/Signature_Keyless"
           }
         ],
         "discriminator": {
           "propertyName": "type",
           "mapping": {
-            "ed25519": "#/components/schemas/Signature_string(HexEncodedBytes)",
-            "secp256k1_ecdsa": "#/components/schemas/Signature_string(HexEncodedBytes)",
-            "web_authn": "#/components/schemas/Signature_string(HexEncodedBytes)",
-            "keyless": "#/components/schemas/Signature_string(HexEncodedBytes)"
+            "ed25519": "#/components/schemas/Signature_Ed25519",
+            "secp256k1_ecdsa": "#/components/schemas/Signature_Secp256k1Ecdsa",
+            "web_authn": "#/components/schemas/Signature_WebAuthn",
+            "keyless": "#/components/schemas/Signature_Keyless"
           }
         }
       },
-      "Signature_string(HexEncodedBytes)": {
+      "Signature_Ed25519": {
+        "allOf": [
+          {
+            "type": "object",
+            "required": [
+              "type"
+            ],
+            "properties": {
+              "type": {
+                "type": "string",
+                "enum": [
+                  "ed25519"
+                ],
+                "example": "ed25519"
+              }
+            }
+          },
+          {
+            "$ref": "#/components/schemas/Ed25519"
+          }
+        ]
+      },
+      "Signature_Keyless": {
         "allOf": [
           {
             "type": "object",
@@ -15397,12 +15892,59 @@
             "properties": {
               "type": {
                 "type": "string",
+                "enum": [
+                  "keyless"
+                ],
                 "example": "keyless"
               }
             }
           },
           {
-            "$ref": "#/components/schemas/HexEncodedBytes"
+            "$ref": "#/components/schemas/Keyless"
+          }
+        ]
+      },
+      "Signature_Secp256k1Ecdsa": {
+        "allOf": [
+          {
+            "type": "object",
+            "required": [
+              "type"
+            ],
+            "properties": {
+              "type": {
+                "type": "string",
+                "enum": [
+                  "secp256k1_ecdsa"
+                ],
+                "example": "secp256k1_ecdsa"
+              }
+            }
+          },
+          {
+            "$ref": "#/components/schemas/Secp256k1Ecdsa"
+          }
+        ]
+      },
+      "Signature_WebAuthn": {
+        "allOf": [
+          {
+            "type": "object",
+            "required": [
+              "type"
+            ],
+            "properties": {
+              "type": {
+                "type": "string",
+                "enum": [
+                  "web_authn"
+                ],
+                "example": "web_authn"
+              }
+            }
+          },
+          {
+            "$ref": "#/components/schemas/WebAuthn"
           }
         ]
       },
@@ -15559,6 +16101,9 @@
           {
             "$ref": "#/components/schemas/Transaction_StateCheckpointTransaction"
           },
+          {
+            "$ref": "#/components/schemas/Transaction_BlockEpilogueTransaction"
+          },
           {
             "$ref": "#/components/schemas/Transaction_ValidatorTransaction"
           }
@@ -15571,6 +16116,7 @@
             "genesis_transaction": "#/components/schemas/Transaction_GenesisTransaction",
             "block_metadata_transaction": "#/components/schemas/Transaction_BlockMetadataTransaction",
             "state_checkpoint_transaction": "#/components/schemas/Transaction_StateCheckpointTransaction",
+            "block_epilogue_transaction": "#/components/schemas/Transaction_BlockEpilogueTransaction",
             "validator_transaction": "#/components/schemas/Transaction_ValidatorTransaction"
           }
         }
@@ -15612,6 +16158,9 @@
             "properties": {
               "type": {
                 "type": "string",
+                "enum": [
+                  "module_bundle_payload"
+                ],
                 "example": "module_bundle_payload"
               }
             }
@@ -15631,6 +16180,9 @@
             "properties": {
               "type": {
                 "type": "string",
+                "enum": [
+                  "entry_function_payload"
+                ],
                 "example": "entry_function_payload"
               }
             }
@@ -15650,6 +16202,9 @@
             "properties": {
               "type": {
                 "type": "string",
+                "enum": [
+                  "multisig_payload"
+                ],
                 "example": "multisig_payload"
               }
             }
@@ -15669,6 +16224,9 @@
             "properties": {
               "type": {
                 "type": "string",
+                "enum": [
+                  "script_payload"
+                ],
                 "example": "script_payload"
               }
             }
@@ -15719,6 +16277,9 @@
             "properties": {
               "type": {
                 "type": "string",
+                "enum": [
+                  "single_sender"
+                ],
                 "example": "single_sender"
               }
             }
@@ -15738,6 +16299,9 @@
             "properties": {
               "type": {
                 "type": "string",
+                "enum": [
+                  "ed25519_signature"
+                ],
                 "example": "ed25519_signature"
               }
             }
@@ -15757,6 +16321,9 @@
             "properties": {
               "type": {
                 "type": "string",
+                "enum": [
+                  "fee_payer_signature"
+                ],
                 "example": "fee_payer_signature"
               }
             }
@@ -15776,6 +16343,9 @@
             "properties": {
               "type": {
                 "type": "string",
+                "enum": [
+                  "multi_agent_signature"
+                ],
                 "example": "multi_agent_signature"
               }
             }
@@ -15795,6 +16365,9 @@
             "properties": {
               "type": {
                 "type": "string",
+                "enum": [
+                  "multi_ed25519_signature"
+                ],
                 "example": "multi_ed25519_signature"
               }
             }
@@ -15804,6 +16377,28 @@
           }
         ]
       },
+      "Transaction_BlockEpilogueTransaction": {
+        "allOf": [
+          {
+            "type": "object",
+            "required": [
+              "type"
+            ],
+            "properties": {
+              "type": {
+                "type": "string",
+                "enum": [
+                  "block_epilogue_transaction"
+                ],
+                "example": "block_epilogue_transaction"
+              }
+            }
+          },
+          {
+            "$ref": "#/components/schemas/BlockEpilogueTransaction"
+          }
+        ]
+      },
       "Transaction_BlockMetadataTransaction": {
         "allOf": [
           {
@@ -15814,6 +16409,9 @@
             "properties": {
               "type": {
                 "type": "string",
+                "enum": [
+                  "block_metadata_transaction"
+                ],
                 "example": "block_metadata_transaction"
               }
             }
@@ -15833,6 +16431,9 @@
             "properties": {
               "type": {
                 "type": "string",
+                "enum": [
+                  "genesis_transaction"
+                ],
                 "example": "genesis_transaction"
               }
             }
@@ -15852,6 +16453,9 @@
             "properties": {
               "type": {
                 "type": "string",
+                "enum": [
+                  "pending_transaction"
+                ],
                 "example": "pending_transaction"
               }
             }
@@ -15871,6 +16475,9 @@
             "properties": {
               "type": {
                 "type": "string",
+                "enum": [
+                  "state_checkpoint_transaction"
+                ],
                 "example": "state_checkpoint_transaction"
               }
             }
@@ -15890,6 +16497,9 @@
             "properties": {
               "type": {
                 "type": "string",
+                "enum": [
+                  "user_transaction"
+                ],
                 "example": "user_transaction"
               }
             }
@@ -15909,6 +16519,9 @@
             "properties": {
               "type": {
                 "type": "string",
+                "enum": [
+                  "validator_transaction"
+                ],
                 "example": "validator_transaction"
               }
             }
@@ -15970,6 +16583,30 @@
         "description": "A string containing a 64-bit unsigned integer.\n\nWe represent u64 values as a string to ensure compatibility with languages such\nas JavaScript that do not parse u64s in JSON natively.\n",
         "example": "32425224034"
       },
+      "UnsupportedJWK": {
+        "type": "object",
+        "description": "Move type `0x1::jwks::UnsupportedJWK` in rust.\nSee its doc in Move for more details.",
+        "required": [
+          "id",
+          "payload"
+        ],
+        "properties": {
+          "id": {
+            "type": "array",
+            "items": {
+              "type": "integer",
+              "format": "uint8"
+            }
+          },
+          "payload": {
+            "type": "array",
+            "items": {
+              "type": "integer",
+              "format": "uint8"
+            }
+          }
+        }
+      },
       "UserTransaction": {
         "type": "object",
         "description": "A transaction submitted by a user to change the state of the blockchain",
@@ -16064,66 +16701,65 @@
       },
       "ValidatorTransaction": {
         "type": "object",
-        "required": [
-          "version",
-          "hash",
-          "state_change_hash",
-          "event_root_hash",
-          "gas_used",
-          "success",
-          "vm_status",
-          "accumulator_root_hash",
-          "changes",
-          "events",
-          "timestamp"
-        ],
-        "properties": {
-          "version": {
-            "$ref": "#/components/schemas/U64"
-          },
-          "hash": {
-            "$ref": "#/components/schemas/HashValue"
-          },
-          "state_change_hash": {
-            "$ref": "#/components/schemas/HashValue"
-          },
-          "event_root_hash": {
-            "$ref": "#/components/schemas/HashValue"
-          },
-          "state_checkpoint_hash": {
-            "$ref": "#/components/schemas/HashValue"
-          },
-          "gas_used": {
-            "$ref": "#/components/schemas/U64"
-          },
-          "success": {
-            "type": "boolean",
-            "description": "Whether the transaction was successful"
-          },
-          "vm_status": {
-            "type": "string",
-            "description": "The VM status of the transaction, can tell useful information in a failure"
-          },
-          "accumulator_root_hash": {
-            "$ref": "#/components/schemas/HashValue"
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/ValidatorTransaction_JWKUpdateTransaction"
           },
-          "changes": {
-            "type": "array",
-            "description": "Final state of resources changed by the transaction",
-            "items": {
-              "$ref": "#/components/schemas/WriteSetChange"
+          {
+            "$ref": "#/components/schemas/ValidatorTransaction_DKGResultTransaction"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "validator_transaction_type",
+          "mapping": {
+            "observed_jwk_update": "#/components/schemas/ValidatorTransaction_JWKUpdateTransaction",
+            "dkg_result": "#/components/schemas/ValidatorTransaction_DKGResultTransaction"
+          }
+        }
+      },
+      "ValidatorTransaction_DKGResultTransaction": {
+        "allOf": [
+          {
+            "type": "object",
+            "required": [
+              "validator_transaction_type"
+            ],
+            "properties": {
+              "validator_transaction_type": {
+                "type": "string",
+                "enum": [
+                  "dkg_result"
+                ],
+                "example": "dkg_result"
+              }
             }
           },
-          "events": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/Event"
+          {
+            "$ref": "#/components/schemas/DKGResultTransaction"
+          }
+        ]
+      },
+      "ValidatorTransaction_JWKUpdateTransaction": {
+        "allOf": [
+          {
+            "type": "object",
+            "required": [
+              "validator_transaction_type"
+            ],
+            "properties": {
+              "validator_transaction_type": {
+                "type": "string",
+                "enum": [
+                  "observed_jwk_update"
+                ],
+                "example": "observed_jwk_update"
+              }
             }
           },
-          "timestamp": {
-            "$ref": "#/components/schemas/U64"
+          {
+            "$ref": "#/components/schemas/JWKUpdateTransaction"
           }
-        }
+        ]
       },
       "VersionedEvent": {
         "type": "object",
@@ -16179,6 +16815,17 @@
           }
         }
       },
+      "WebAuthn": {
+        "type": "object",
+        "required": [
+          "value"
+        ],
+        "properties": {
+          "value": {
+            "$ref": "#/components/schemas/HexEncodedBytes"
+          }
+        }
+      },
       "WriteModule": {
         "type": "object",
         "description": "Write a new module or update an existing one",
@@ -16285,6 +16932,9 @@
             "properties": {
               "type": {
                 "type": "string",
+                "enum": [
+                  "delete_module"
+                ],
                 "example": "delete_module"
               }
             }
@@ -16304,6 +16954,9 @@
             "properties": {
               "type": {
                 "type": "string",
+                "enum": [
+                  "delete_resource"
+                ],
                 "example": "delete_resource"
               }
             }
@@ -16323,6 +16976,9 @@
             "properties": {
               "type": {
                 "type": "string",
+                "enum": [
+                  "delete_table_item"
+                ],
                 "example": "delete_table_item"
               }
             }
@@ -16342,6 +16998,9 @@
             "properties": {
               "type": {
                 "type": "string",
+                "enum": [
+                  "write_module"
+                ],
                 "example": "write_module"
               }
             }
@@ -16361,6 +17020,9 @@
             "properties": {
               "type": {
                 "type": "string",
+                "enum": [
+                  "write_resource"
+                ],
                 "example": "write_resource"
               }
             }
@@ -16380,6 +17042,9 @@
             "properties": {
               "type": {
                 "type": "string",
+                "enum": [
+                  "write_table_item"
+                ],
                 "example": "write_table_item"
               }
             }
@@ -16411,6 +17076,9 @@
             "properties": {
               "type": {
                 "type": "string",
+                "enum": [
+                  "direct_write_set"
+                ],
                 "example": "direct_write_set"
               }
             }
@@ -16430,6 +17098,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 3734d167806ee..423043b41344b 100644
--- a/api/doc/spec.yaml
+++ b/api/doc/spec.yaml
@@ -10468,6 +10468,8 @@ components:
         properties:
           type:
             type: string
+            enum:
+            - ed25519_signature
             example: ed25519_signature
       - $ref: '#/components/schemas/Ed25519Signature'
     AccountSignature_MultiEd25519Signature:
@@ -10478,6 +10480,8 @@ components:
         properties:
           type:
             type: string
+            enum:
+            - multi_ed25519_signature
             example: multi_ed25519_signature
       - $ref: '#/components/schemas/MultiEd25519Signature'
     AccountSignature_MultiKeySignature:
@@ -10488,6 +10492,8 @@ components:
         properties:
           type:
             type: string
+            enum:
+            - multi_key_signature
             example: multi_key_signature
       - $ref: '#/components/schemas/MultiKeySignature'
     AccountSignature_SingleKeySignature:
@@ -10498,6 +10504,8 @@ components:
         properties:
           type:
             type: string
+            enum:
+            - single_key_signature
             example: single_key_signature
       - $ref: '#/components/schemas/SingleKeySignature'
     Address:
@@ -10585,6 +10593,68 @@ components:
           description: The transactions in the block in sequential order
           items:
             $ref: '#/components/schemas/Transaction'
+    BlockEndInfo:
+      type: object
+      required:
+      - block_gas_limit_reached
+      - block_output_limit_reached
+      - block_effective_block_gas_units
+      - block_approx_output_size
+      properties:
+        block_gas_limit_reached:
+          type: boolean
+        block_output_limit_reached:
+          type: boolean
+        block_effective_block_gas_units:
+          type: integer
+          format: uint64
+        block_approx_output_size:
+          type: integer
+          format: uint64
+    BlockEpilogueTransaction:
+      type: object
+      description: A block epilogue transaction
+      required:
+      - version
+      - hash
+      - state_change_hash
+      - event_root_hash
+      - gas_used
+      - success
+      - vm_status
+      - accumulator_root_hash
+      - changes
+      - timestamp
+      properties:
+        version:
+          $ref: '#/components/schemas/U64'
+        hash:
+          $ref: '#/components/schemas/HashValue'
+        state_change_hash:
+          $ref: '#/components/schemas/HashValue'
+        event_root_hash:
+          $ref: '#/components/schemas/HashValue'
+        state_checkpoint_hash:
+          $ref: '#/components/schemas/HashValue'
+        gas_used:
+          $ref: '#/components/schemas/U64'
+        success:
+          type: boolean
+          description: Whether the transaction was successful
+        vm_status:
+          type: string
+          description: The VM status of the transaction, can tell useful information in a failure
+        accumulator_root_hash:
+          $ref: '#/components/schemas/HashValue'
+        changes:
+          type: array
+          description: Final state of resources changed by the transaction
+          items:
+            $ref: '#/components/schemas/WriteSetChange'
+        timestamp:
+          $ref: '#/components/schemas/U64'
+        block_end_info:
+          $ref: '#/components/schemas/BlockEndInfo'
     BlockMetadataTransaction:
       type: object
       description: |-
@@ -10663,6 +10733,55 @@ components:
             format: uint32
         timestamp:
           $ref: '#/components/schemas/U64'
+    DKGResultTransaction:
+      type: object
+      required:
+      - version
+      - hash
+      - state_change_hash
+      - event_root_hash
+      - gas_used
+      - success
+      - vm_status
+      - accumulator_root_hash
+      - changes
+      - events
+      - timestamp
+      - dkg_transcript
+      properties:
+        version:
+          $ref: '#/components/schemas/U64'
+        hash:
+          $ref: '#/components/schemas/HashValue'
+        state_change_hash:
+          $ref: '#/components/schemas/HashValue'
+        event_root_hash:
+          $ref: '#/components/schemas/HashValue'
+        state_checkpoint_hash:
+          $ref: '#/components/schemas/HashValue'
+        gas_used:
+          $ref: '#/components/schemas/U64'
+        success:
+          type: boolean
+          description: Whether the transaction was successful
+        vm_status:
+          type: string
+          description: The VM status of the transaction, can tell useful information in a failure
+        accumulator_root_hash:
+          $ref: '#/components/schemas/HashValue'
+        changes:
+          type: array
+          description: Final state of resources changed by the transaction
+          items:
+            $ref: '#/components/schemas/WriteSetChange'
+        events:
+          type: array
+          items:
+            $ref: '#/components/schemas/Event'
+        timestamp:
+          $ref: '#/components/schemas/U64'
+        dkg_transcript:
+          $ref: '#/components/schemas/ExportedDKGTranscript'
     DecodedTableData:
       type: object
       description: Decoded table data
@@ -10756,6 +10875,13 @@ components:
           type: array
           items:
             $ref: '#/components/schemas/Event'
+    Ed25519:
+      type: object
+      required:
+      - value
+      properties:
+        value:
+          $ref: '#/components/schemas/HexEncodedBytes'
     Ed25519Signature:
       type: object
       description: A single Ed25519 signature
@@ -10850,6 +10976,60 @@ components:
           $ref: '#/components/schemas/U64'
         account_address:
           $ref: '#/components/schemas/Address'
+    ExportedAggregateSignature:
+      type: object
+      description: A more API-friendly representation of the on-chain `aptos_types::aggregate_signature::AggregateSignature`.
+      required:
+      - signer_indices
+      properties:
+        signer_indices:
+          type: array
+          items:
+            type: integer
+            format: uint64
+        sig:
+          $ref: '#/components/schemas/HexEncodedBytes'
+    ExportedDKGTranscript:
+      type: object
+      required:
+      - epoch
+      - author
+      - payload
+      properties:
+        epoch:
+          $ref: '#/components/schemas/U64'
+        author:
+          $ref: '#/components/schemas/Address'
+        payload:
+          $ref: '#/components/schemas/HexEncodedBytes'
+    ExportedProviderJWKs:
+      type: object
+      description: A more API-friendly representation of the on-chain `aptos_types::jwks::ProviderJWKs`.
+      required:
+      - issuer
+      - version
+      - jwks
+      properties:
+        issuer:
+          type: string
+        version:
+          type: integer
+          format: uint64
+        jwks:
+          type: array
+          items:
+            $ref: '#/components/schemas/JWK'
+    ExportedQuorumCertifiedUpdate:
+      type: object
+      description: A more API-friendly representation of the on-chain `aptos_types::jwks::QuorumCertifiedUpdate`.
+      required:
+      - update
+      - multi_sig
+      properties:
+        update:
+          $ref: '#/components/schemas/ExportedProviderJWKs'
+        multi_sig:
+          $ref: '#/components/schemas/ExportedAggregateSignature'
     FeePayerSignature:
       type: object
       description: |-
@@ -10918,6 +11098,8 @@ components:
         properties:
           type:
             type: string
+            enum:
+            - write_set_payload
             example: write_set_payload
       - $ref: '#/components/schemas/WriteSetPayload'
     GenesisTransaction:
@@ -11041,6 +11223,68 @@ components:
           format: uint8
         signature:
           $ref: '#/components/schemas/Signature'
+    JWK:
+      type: object
+      description: The JWK type that can be converted from/to `JWKMoveStruct` but easier to use in rust.
+      anyOf:
+      - $ref: '#/components/schemas/RSA_JWK'
+      - $ref: '#/components/schemas/UnsupportedJWK'
+    JWKUpdateTransaction:
+      type: object
+      required:
+      - version
+      - hash
+      - state_change_hash
+      - event_root_hash
+      - gas_used
+      - success
+      - vm_status
+      - accumulator_root_hash
+      - changes
+      - events
+      - timestamp
+      - quorum_certified_update
+      properties:
+        version:
+          $ref: '#/components/schemas/U64'
+        hash:
+          $ref: '#/components/schemas/HashValue'
+        state_change_hash:
+          $ref: '#/components/schemas/HashValue'
+        event_root_hash:
+          $ref: '#/components/schemas/HashValue'
+        state_checkpoint_hash:
+          $ref: '#/components/schemas/HashValue'
+        gas_used:
+          $ref: '#/components/schemas/U64'
+        success:
+          type: boolean
+          description: Whether the transaction was successful
+        vm_status:
+          type: string
+          description: The VM status of the transaction, can tell useful information in a failure
+        accumulator_root_hash:
+          $ref: '#/components/schemas/HashValue'
+        changes:
+          type: array
+          description: Final state of resources changed by the transaction
+          items:
+            $ref: '#/components/schemas/WriteSetChange'
+        events:
+          type: array
+          items:
+            $ref: '#/components/schemas/Event'
+        timestamp:
+          $ref: '#/components/schemas/U64'
+        quorum_certified_update:
+          $ref: '#/components/schemas/ExportedQuorumCertifiedUpdate'
+    Keyless:
+      type: object
+      required:
+      - value
+      properties:
+        value:
+          $ref: '#/components/schemas/HexEncodedBytes'
     MoveAbility:
       type: string
     MoveFunction:
@@ -11175,6 +11419,7 @@ components:
       required:
       - name
       - is_native
+      - is_event
       - abilities
       - generic_type_params
       - fields
@@ -11184,6 +11429,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
@@ -11443,6 +11691,8 @@ components:
         properties:
           type:
             type: string
+            enum:
+            - entry_function_payload
             example: entry_function_payload
       - $ref: '#/components/schemas/EntryFunctionPayload'
     PendingTransaction:
@@ -11476,18 +11726,30 @@ components:
     PublicKey:
       type: object
       oneOf:
-      - $ref: '#/components/schemas/PublicKey_string(HexEncodedBytes)'
-      - $ref: '#/components/schemas/PublicKey_string(HexEncodedBytes)'
-      - $ref: '#/components/schemas/PublicKey_string(HexEncodedBytes)'
-      - $ref: '#/components/schemas/PublicKey_string(HexEncodedBytes)'
+      - $ref: '#/components/schemas/PublicKey_Ed25519'
+      - $ref: '#/components/schemas/PublicKey_Secp256k1Ecdsa'
+      - $ref: '#/components/schemas/PublicKey_Secp256r1Ecdsa'
+      - $ref: '#/components/schemas/PublicKey_Keyless'
       discriminator:
         propertyName: type
         mapping:
-          ed25519: '#/components/schemas/PublicKey_string(HexEncodedBytes)'
-          secp256k1_ecdsa: '#/components/schemas/PublicKey_string(HexEncodedBytes)'
-          secp256r1_ecdsa: '#/components/schemas/PublicKey_string(HexEncodedBytes)'
-          keyless: '#/components/schemas/PublicKey_string(HexEncodedBytes)'
-    PublicKey_string(HexEncodedBytes):
+          ed25519: '#/components/schemas/PublicKey_Ed25519'
+          secp256k1_ecdsa: '#/components/schemas/PublicKey_Secp256k1Ecdsa'
+          secp256r1_ecdsa: '#/components/schemas/PublicKey_Secp256r1Ecdsa'
+          keyless: '#/components/schemas/PublicKey_Keyless'
+    PublicKey_Ed25519:
+      allOf:
+      - type: object
+        required:
+        - type
+        properties:
+          type:
+            type: string
+            enum:
+            - ed25519
+            example: ed25519
+      - $ref: '#/components/schemas/Ed25519'
+    PublicKey_Keyless:
       allOf:
       - type: object
         required:
@@ -11495,8 +11757,56 @@ components:
         properties:
           type:
             type: string
+            enum:
+            - keyless
             example: keyless
-      - $ref: '#/components/schemas/HexEncodedBytes'
+      - $ref: '#/components/schemas/Keyless'
+    PublicKey_Secp256k1Ecdsa:
+      allOf:
+      - type: object
+        required:
+        - type
+        properties:
+          type:
+            type: string
+            enum:
+            - secp256k1_ecdsa
+            example: secp256k1_ecdsa
+      - $ref: '#/components/schemas/Secp256k1Ecdsa'
+    PublicKey_Secp256r1Ecdsa:
+      allOf:
+      - type: object
+        required:
+        - type
+        properties:
+          type:
+            type: string
+            enum:
+            - secp256r1_ecdsa
+            example: secp256r1_ecdsa
+      - $ref: '#/components/schemas/Secp256r1Ecdsa'
+    RSA_JWK:
+      type: object
+      description: |-
+        Move type `0x1::jwks::RSA_JWK` in rust.
+        See its doc in Move for more details.
+      required:
+      - kid
+      - kty
+      - alg
+      - e
+      - n
+      properties:
+        kid:
+          type: string
+        kty:
+          type: string
+        alg:
+          type: string
+        e:
+          type: string
+        n:
+          type: string
     RawTableItemRequest:
       type: object
       description: Table Item request for the GetTableItemRaw API
@@ -11539,21 +11849,47 @@ components:
           $ref: '#/components/schemas/Address'
         script:
           $ref: '#/components/schemas/ScriptPayload'
+    Secp256k1Ecdsa:
+      type: object
+      required:
+      - value
+      properties:
+        value:
+          $ref: '#/components/schemas/HexEncodedBytes'
+    Secp256r1Ecdsa:
+      type: object
+      required:
+      - value
+      properties:
+        value:
+          $ref: '#/components/schemas/HexEncodedBytes'
     Signature:
       type: object
       oneOf:
-      - $ref: '#/components/schemas/Signature_string(HexEncodedBytes)'
-      - $ref: '#/components/schemas/Signature_string(HexEncodedBytes)'
-      - $ref: '#/components/schemas/Signature_string(HexEncodedBytes)'
-      - $ref: '#/components/schemas/Signature_string(HexEncodedBytes)'
+      - $ref: '#/components/schemas/Signature_Ed25519'
+      - $ref: '#/components/schemas/Signature_Secp256k1Ecdsa'
+      - $ref: '#/components/schemas/Signature_WebAuthn'
+      - $ref: '#/components/schemas/Signature_Keyless'
       discriminator:
         propertyName: type
         mapping:
-          ed25519: '#/components/schemas/Signature_string(HexEncodedBytes)'
-          secp256k1_ecdsa: '#/components/schemas/Signature_string(HexEncodedBytes)'
-          web_authn: '#/components/schemas/Signature_string(HexEncodedBytes)'
-          keyless: '#/components/schemas/Signature_string(HexEncodedBytes)'
-    Signature_string(HexEncodedBytes):
+          ed25519: '#/components/schemas/Signature_Ed25519'
+          secp256k1_ecdsa: '#/components/schemas/Signature_Secp256k1Ecdsa'
+          web_authn: '#/components/schemas/Signature_WebAuthn'
+          keyless: '#/components/schemas/Signature_Keyless'
+    Signature_Ed25519:
+      allOf:
+      - type: object
+        required:
+        - type
+        properties:
+          type:
+            type: string
+            enum:
+            - ed25519
+            example: ed25519
+      - $ref: '#/components/schemas/Ed25519'
+    Signature_Keyless:
       allOf:
       - type: object
         required:
@@ -11561,8 +11897,34 @@ components:
         properties:
           type:
             type: string
+            enum:
+            - keyless
             example: keyless
-      - $ref: '#/components/schemas/HexEncodedBytes'
+      - $ref: '#/components/schemas/Keyless'
+    Signature_Secp256k1Ecdsa:
+      allOf:
+      - type: object
+        required:
+        - type
+        properties:
+          type:
+            type: string
+            enum:
+            - secp256k1_ecdsa
+            example: secp256k1_ecdsa
+      - $ref: '#/components/schemas/Secp256k1Ecdsa'
+    Signature_WebAuthn:
+      allOf:
+      - type: object
+        required:
+        - type
+        properties:
+          type:
+            type: string
+            enum:
+            - web_authn
+            example: web_authn
+      - $ref: '#/components/schemas/WebAuthn'
     SingleKeySignature:
       type: object
       description: A single key signature
@@ -11673,6 +12035,7 @@ components:
       - $ref: '#/components/schemas/Transaction_GenesisTransaction'
       - $ref: '#/components/schemas/Transaction_BlockMetadataTransaction'
       - $ref: '#/components/schemas/Transaction_StateCheckpointTransaction'
+      - $ref: '#/components/schemas/Transaction_BlockEpilogueTransaction'
       - $ref: '#/components/schemas/Transaction_ValidatorTransaction'
       discriminator:
         propertyName: type
@@ -11682,6 +12045,7 @@ components:
           genesis_transaction: '#/components/schemas/Transaction_GenesisTransaction'
           block_metadata_transaction: '#/components/schemas/Transaction_BlockMetadataTransaction'
           state_checkpoint_transaction: '#/components/schemas/Transaction_StateCheckpointTransaction'
+          block_epilogue_transaction: '#/components/schemas/Transaction_BlockEpilogueTransaction'
           validator_transaction: '#/components/schemas/Transaction_ValidatorTransaction'
     TransactionPayload:
       type: object
@@ -11706,6 +12070,8 @@ components:
         properties:
           type:
             type: string
+            enum:
+            - module_bundle_payload
             example: module_bundle_payload
       - $ref: '#/components/schemas/DeprecatedModuleBundlePayload'
     TransactionPayload_EntryFunctionPayload:
@@ -11716,6 +12082,8 @@ components:
         properties:
           type:
             type: string
+            enum:
+            - entry_function_payload
             example: entry_function_payload
       - $ref: '#/components/schemas/EntryFunctionPayload'
     TransactionPayload_MultisigPayload:
@@ -11726,6 +12094,8 @@ components:
         properties:
           type:
             type: string
+            enum:
+            - multisig_payload
             example: multisig_payload
       - $ref: '#/components/schemas/MultisigPayload'
     TransactionPayload_ScriptPayload:
@@ -11736,6 +12106,8 @@ components:
         properties:
           type:
             type: string
+            enum:
+            - script_payload
             example: script_payload
       - $ref: '#/components/schemas/ScriptPayload'
     TransactionSignature:
@@ -11763,6 +12135,8 @@ components:
         properties:
           type:
             type: string
+            enum:
+            - single_sender
             example: single_sender
       - $ref: '#/components/schemas/AccountSignature'
     TransactionSignature_Ed25519Signature:
@@ -11773,6 +12147,8 @@ components:
         properties:
           type:
             type: string
+            enum:
+            - ed25519_signature
             example: ed25519_signature
       - $ref: '#/components/schemas/Ed25519Signature'
     TransactionSignature_FeePayerSignature:
@@ -11783,6 +12159,8 @@ components:
         properties:
           type:
             type: string
+            enum:
+            - fee_payer_signature
             example: fee_payer_signature
       - $ref: '#/components/schemas/FeePayerSignature'
     TransactionSignature_MultiAgentSignature:
@@ -11793,6 +12171,8 @@ components:
         properties:
           type:
             type: string
+            enum:
+            - multi_agent_signature
             example: multi_agent_signature
       - $ref: '#/components/schemas/MultiAgentSignature'
     TransactionSignature_MultiEd25519Signature:
@@ -11803,8 +12183,22 @@ components:
         properties:
           type:
             type: string
+            enum:
+            - multi_ed25519_signature
             example: multi_ed25519_signature
       - $ref: '#/components/schemas/MultiEd25519Signature'
+    Transaction_BlockEpilogueTransaction:
+      allOf:
+      - type: object
+        required:
+        - type
+        properties:
+          type:
+            type: string
+            enum:
+            - block_epilogue_transaction
+            example: block_epilogue_transaction
+      - $ref: '#/components/schemas/BlockEpilogueTransaction'
     Transaction_BlockMetadataTransaction:
       allOf:
       - type: object
@@ -11813,6 +12207,8 @@ components:
         properties:
           type:
             type: string
+            enum:
+            - block_metadata_transaction
             example: block_metadata_transaction
       - $ref: '#/components/schemas/BlockMetadataTransaction'
     Transaction_GenesisTransaction:
@@ -11823,6 +12219,8 @@ components:
         properties:
           type:
             type: string
+            enum:
+            - genesis_transaction
             example: genesis_transaction
       - $ref: '#/components/schemas/GenesisTransaction'
     Transaction_PendingTransaction:
@@ -11833,6 +12231,8 @@ components:
         properties:
           type:
             type: string
+            enum:
+            - pending_transaction
             example: pending_transaction
       - $ref: '#/components/schemas/PendingTransaction'
     Transaction_StateCheckpointTransaction:
@@ -11843,6 +12243,8 @@ components:
         properties:
           type:
             type: string
+            enum:
+            - state_checkpoint_transaction
             example: state_checkpoint_transaction
       - $ref: '#/components/schemas/StateCheckpointTransaction'
     Transaction_UserTransaction:
@@ -11853,6 +12255,8 @@ components:
         properties:
           type:
             type: string
+            enum:
+            - user_transaction
             example: user_transaction
       - $ref: '#/components/schemas/UserTransaction'
     Transaction_ValidatorTransaction:
@@ -11863,6 +12267,8 @@ components:
         properties:
           type:
             type: string
+            enum:
+            - validator_transaction
             example: validator_transaction
       - $ref: '#/components/schemas/ValidatorTransaction'
     TransactionsBatchSingleSubmissionFailure:
@@ -11919,6 +12325,25 @@ components:
         We represent u64 values as a string to ensure compatibility with languages such
         as JavaScript that do not parse u64s in JSON natively.
       example: '32425224034'
+    UnsupportedJWK:
+      type: object
+      description: |-
+        Move type `0x1::jwks::UnsupportedJWK` in rust.
+        See its doc in Move for more details.
+      required:
+      - id
+      - payload
+      properties:
+        id:
+          type: array
+          items:
+            type: integer
+            format: uint8
+        payload:
+          type: array
+          items:
+            type: integer
+            format: uint8
     UserTransaction:
       type: object
       description: A transaction submitted by a user to change the state of the blockchain
@@ -11989,50 +12414,38 @@ components:
           $ref: '#/components/schemas/U64'
     ValidatorTransaction:
       type: object
-      required:
-      - version
-      - hash
-      - state_change_hash
-      - event_root_hash
-      - gas_used
-      - success
-      - vm_status
-      - accumulator_root_hash
-      - changes
-      - events
-      - timestamp
-      properties:
-        version:
-          $ref: '#/components/schemas/U64'
-        hash:
-          $ref: '#/components/schemas/HashValue'
-        state_change_hash:
-          $ref: '#/components/schemas/HashValue'
-        event_root_hash:
-          $ref: '#/components/schemas/HashValue'
-        state_checkpoint_hash:
-          $ref: '#/components/schemas/HashValue'
-        gas_used:
-          $ref: '#/components/schemas/U64'
-        success:
-          type: boolean
-          description: Whether the transaction was successful
-        vm_status:
-          type: string
-          description: The VM status of the transaction, can tell useful information in a failure
-        accumulator_root_hash:
-          $ref: '#/components/schemas/HashValue'
-        changes:
-          type: array
-          description: Final state of resources changed by the transaction
-          items:
-            $ref: '#/components/schemas/WriteSetChange'
-        events:
-          type: array
-          items:
-            $ref: '#/components/schemas/Event'
-        timestamp:
-          $ref: '#/components/schemas/U64'
+      oneOf:
+      - $ref: '#/components/schemas/ValidatorTransaction_JWKUpdateTransaction'
+      - $ref: '#/components/schemas/ValidatorTransaction_DKGResultTransaction'
+      discriminator:
+        propertyName: validator_transaction_type
+        mapping:
+          observed_jwk_update: '#/components/schemas/ValidatorTransaction_JWKUpdateTransaction'
+          dkg_result: '#/components/schemas/ValidatorTransaction_DKGResultTransaction'
+    ValidatorTransaction_DKGResultTransaction:
+      allOf:
+      - type: object
+        required:
+        - validator_transaction_type
+        properties:
+          validator_transaction_type:
+            type: string
+            enum:
+            - dkg_result
+            example: dkg_result
+      - $ref: '#/components/schemas/DKGResultTransaction'
+    ValidatorTransaction_JWKUpdateTransaction:
+      allOf:
+      - type: object
+        required:
+        - validator_transaction_type
+        properties:
+          validator_transaction_type:
+            type: string
+            enum:
+            - observed_jwk_update
+            example: observed_jwk_update
+      - $ref: '#/components/schemas/JWKUpdateTransaction'
     VersionedEvent:
       type: object
       description: An event from a transaction with a version
@@ -12072,6 +12485,13 @@ components:
           type: array
           description: Arguments of the function
           items: {}
+    WebAuthn:
+      type: object
+      required:
+      - value
+      properties:
+        value:
+          $ref: '#/components/schemas/HexEncodedBytes'
     WriteModule:
       type: object
       description: Write a new module or update an existing one
@@ -12140,6 +12560,8 @@ components:
         properties:
           type:
             type: string
+            enum:
+            - delete_module
             example: delete_module
       - $ref: '#/components/schemas/DeleteModule'
     WriteSetChange_DeleteResource:
@@ -12150,6 +12572,8 @@ components:
         properties:
           type:
             type: string
+            enum:
+            - delete_resource
             example: delete_resource
       - $ref: '#/components/schemas/DeleteResource'
     WriteSetChange_DeleteTableItem:
@@ -12160,6 +12584,8 @@ components:
         properties:
           type:
             type: string
+            enum:
+            - delete_table_item
             example: delete_table_item
       - $ref: '#/components/schemas/DeleteTableItem'
     WriteSetChange_WriteModule:
@@ -12170,6 +12596,8 @@ components:
         properties:
           type:
             type: string
+            enum:
+            - write_module
             example: write_module
       - $ref: '#/components/schemas/WriteModule'
     WriteSetChange_WriteResource:
@@ -12180,6 +12608,8 @@ components:
         properties:
           type:
             type: string
+            enum:
+            - write_resource
             example: write_resource
       - $ref: '#/components/schemas/WriteResource'
     WriteSetChange_WriteTableItem:
@@ -12190,6 +12620,8 @@ components:
         properties:
           type:
             type: string
+            enum:
+            - write_table_item
             example: write_table_item
       - $ref: '#/components/schemas/WriteTableItem'
     WriteSetPayload:
@@ -12208,6 +12640,8 @@ components:
         properties:
           type:
             type: string
+            enum:
+            - direct_write_set
             example: direct_write_set
       - $ref: '#/components/schemas/DirectWriteSet'
     WriteSet_ScriptWriteSet:
@@ -12218,6 +12652,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__secp256k1_ecdsa__test_multi_secp256k1_ecdsa.json b/api/goldens/aptos_api__tests__secp256k1_ecdsa__test_multi_secp256k1_ecdsa.json
new file mode 100644
index 0000000000000..bac77b4abe72f
--- /dev/null
+++ b/api/goldens/aptos_api__tests__secp256k1_ecdsa__test_multi_secp256k1_ecdsa.json
@@ -0,0 +1,19 @@
+{
+  "public_keys": [
+    {
+      "value": "0x049b8327d929a0e45285c04d19c9fffbee065c266b701972922d807228120e43f34ad68ac77f6ec0205fe39f7c5b6055dad973a03464a3a743302de0feaf6ec6d9",
+      "type": "secp256k1_ecdsa"
+    }
+  ],
+  "signatures": [
+    {
+      "index": 0,
+      "signature": {
+        "value": "0xd1c84463d33b27977431b60664b36c6c1717569b1fbe2f9808c1e78f36958ae71a2b59a7c062e9491c12e69e25e3d3f82253a4efd1c1857b3695ff1b9050c5e4",
+        "type": "secp256k1_ecdsa"
+      }
+    }
+  ],
+  "signatures_required": 1,
+  "type": "single_sender"
+}
diff --git a/api/goldens/aptos_api__tests__secp256k1_ecdsa__test_secp256k1_ecdsa.json b/api/goldens/aptos_api__tests__secp256k1_ecdsa__test_secp256k1_ecdsa.json
new file mode 100644
index 0000000000000..958ae2122777f
--- /dev/null
+++ b/api/goldens/aptos_api__tests__secp256k1_ecdsa__test_secp256k1_ecdsa.json
@@ -0,0 +1,11 @@
+{
+  "public_key": {
+    "value": "0x049b8327d929a0e45285c04d19c9fffbee065c266b701972922d807228120e43f34ad68ac77f6ec0205fe39f7c5b6055dad973a03464a3a743302de0feaf6ec6d9",
+    "type": "secp256k1_ecdsa"
+  },
+  "signature": {
+    "value": "0x357a77abdb3ef4a01aea1e8d0cb932606655bcf66e6726d2cefbfd904d57703b0bf38eb19bc3da1e3e9f6929db0d4806f83fa5370f6981d704efa42cdba56fb9",
+    "type": "secp256k1_ecdsa"
+  },
+  "type": "single_sender"
+}
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__transactions_test__test_simulation_failure_with_detail_error.json b/api/goldens/aptos_api__tests__transactions_test__test_simulation_failure_with_detail_error.json
new file mode 100644
index 0000000000000..0e9929fbdde81
--- /dev/null
+++ b/api/goldens/aptos_api__tests__transactions_test__test_simulation_failure_with_detail_error.json
@@ -0,0 +1,95 @@
+[
+  {
+    "version": "0",
+    "hash": "",
+    "state_change_hash": "",
+    "event_root_hash": "",
+    "state_checkpoint_hash": null,
+    "gas_used": "3",
+    "success": false,
+    "vm_status": "LINKER_ERROR\nExecution failed with message: Linker Error: Module 0000000000000000000000000000000000000000000000000000000000000001::MemeCoin doesn't exist",
+    "accumulator_root_hash": "",
+    "changes": [
+      {
+        "address": "0xa550c18",
+        "state_key_hash": "",
+        "data": {
+          "type": "0x1::account::Account",
+          "data": {
+            "authentication_key": "0xcef8ffd1ab9017e96132df8a56b22de39a8155e1c3fc32affbbf93eb624b532a",
+            "coin_register_events": {
+              "counter": "1",
+              "guid": {
+                "id": {
+                  "addr": "0xa550c18",
+                  "creation_num": "0"
+                }
+              }
+            },
+            "guid_creation_num": "4",
+            "key_rotation_events": {
+              "counter": "0",
+              "guid": {
+                "id": {
+                  "addr": "0xa550c18",
+                  "creation_num": "1"
+                }
+              }
+            },
+            "rotation_capability_offer": {
+              "for": {
+                "vec": []
+              }
+            },
+            "sequence_number": "1",
+            "signer_capability_offer": {
+              "for": {
+                "vec": []
+              }
+            }
+          }
+        },
+        "type": "write_resource"
+      }
+    ],
+    "sender": "0xa550c18",
+    "sequence_number": "0",
+    "max_gas_amount": "100000000",
+    "gas_unit_price": "0",
+    "expiration_timestamp_secs": "18446744073709551615",
+    "payload": {
+      "function": "0x1::MemeCoin::transfer",
+      "type_arguments": [
+        "0x1::aptos_coin::AptosCoin"
+      ],
+      "arguments": [
+        "0x00000000000000000000000000000000000000000000000000000000000000dd",
+        "0x0100000000000000"
+      ],
+      "type": "entry_function_payload"
+    },
+    "signature": {
+      "public_key": "0x14418f867a0bd6d42abb2daa50cd68a5a869ce208282481f57504f630510d0d3",
+      "signature": "0x1d4f1d6c0b140deb6c63e81c742ffd546c832683a14970c687fa823641d34395197548c242c126ea7226730ce66b9ab2f695a2bcda982f30944163179f9a3c08",
+      "type": "ed25519_signature"
+    },
+    "events": [
+      {
+        "guid": {
+          "creation_number": "0",
+          "account_address": "0x0"
+        },
+        "sequence_number": "0",
+        "type": "0x1::transaction_fee::FeeStatement",
+        "data": {
+          "execution_gas_units": "3",
+          "io_gas_units": "0",
+          "storage_fee_octas": "0",
+          "storage_fee_refund_octas": "0",
+          "total_charge_gas_units": "3"
+        }
+      }
+    ],
+    "timestamp": "0"
+  }
+]
diff --git a/api/goldens/aptos_api__tests__transactions_test__test_simulation_failure_with_move_abort_error_rendering.json b/api/goldens/aptos_api__tests__transactions_test__test_simulation_failure_with_move_abort_error_rendering.json
new file mode 100644
index 0000000000000..836779403fc98
--- /dev/null
+++ b/api/goldens/aptos_api__tests__transactions_test__test_simulation_failure_with_move_abort_error_rendering.json
@@ -0,0 +1,93 @@
+[
+  {
+    "version": "3",
+    "hash": "",
+    "state_change_hash": "",
+    "event_root_hash": "",
+    "state_checkpoint_hash": null,
+    "gas_used": "11",
+    "success": false,
+    "vm_status": "Move abort in 0x1::coin: EINSUFFICIENT_BALANCE(0x10006): Not enough coins to complete transaction",
+    "accumulator_root_hash": "",
+    "changes": [
+      {
+        "address": "0x34bf7e2d17674feb234371a7ea58efd715f0e56ba20ebf13789480d9d643afaf",
+        "state_key_hash": "",
+        "data": {
+          "type": "0x1::account::Account",
+          "data": {
+            "authentication_key": "0x34bf7e2d17674feb234371a7ea58efd715f0e56ba20ebf13789480d9d643afaf",
+            "coin_register_events": {
+              "counter": "1",
+              "guid": {
+                "id": {
+                  "addr": "0x34bf7e2d17674feb234371a7ea58efd715f0e56ba20ebf13789480d9d643afaf",
+                  "creation_num": "0"
+                }
+              }
+            },
+            "guid_creation_num": "4",
+            "key_rotation_events": {
+              "counter": "0",
+              "guid": {
+                "id": {
+                  "addr": "0x34bf7e2d17674feb234371a7ea58efd715f0e56ba20ebf13789480d9d643afaf",
+                  "creation_num": "1"
+                }
+              }
+            },
+            "rotation_capability_offer": {
+              "for": {
+                "vec": []
+              }
+            },
+            "sequence_number": "1",
+            "signer_capability_offer": {
+              "for": {
+                "vec": []
+              }
+            }
+          }
+        },
+        "type": "write_resource"
+      }
+    ],
+    "sender": "0x34bf7e2d17674feb234371a7ea58efd715f0e56ba20ebf13789480d9d643afaf",
+    "sequence_number": "0",
+    "max_gas_amount": "100000000",
+    "gas_unit_price": "0",
+    "expiration_timestamp_secs": "18446744073709551615",
+    "payload": {
+      "function": "0x1::aptos_account::transfer",
+      "type_arguments": [],
+      "arguments": [
+        "0x1",
+        "999999999999999999"
+      ],
+      "type": "entry_function_payload"
+    },
+    "signature": {
+      "public_key": "0xd5a781494d2bf1a174ddffde1e02cb8881cff6dab70e61cbdef393deac0ce639",
+      "signature": "0x0090fadcba9d32d9918286f8b651772a4d04a23633cc9d10f4339ad4d0b1b7c4ca4829542aa9a8b5a6a28e0e63dfd52863d38ca1ba1d2a57c4bf1efc72c0fb06",
+      "type": "ed25519_signature"
+    },
+    "events": [
+      {
+        "guid": {
+          "creation_number": "0",
+          "account_address": "0x0"
+        },
+        "sequence_number": "0",
+        "type": "0x1::transaction_fee::FeeStatement",
+        "data": {
+          "execution_gas_units": "6",
+          "io_gas_units": "6",
+          "storage_fee_octas": "0",
+          "storage_fee_refund_octas": "0",
+          "total_charge_gas_units": "11"
+        }
+      }
+    ],
+    "timestamp": "500000"
+  }
+]
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<Self> {
         let accept = Accept::from_request_without_body(request).await?;
diff --git a/api/src/accounts.rs b/api/src/accounts.rs
index 0193a7626d93e..3ac9a13005e61 100644
--- a/api/src/accounts.rs
+++ b/api/src/accounts.rs
@@ -66,7 +66,7 @@ impl AccountsApi {
 
         let context = self.context.clone();
         api_spawn_blocking(move || {
-            let account = Account::new(context, address.0, ledger_version.0, None, None)?;
+            let account = Account::new(context, address.0, ledger_version.0, None, None, false)?;
             account.account(&accept_type)
         })
         .await
@@ -118,6 +118,7 @@ impl AccountsApi {
                 ledger_version.0,
                 start.0.map(StateKey::from),
                 limit.0,
+                true,
             )?;
             account.resources(&accept_type)
         })
@@ -170,6 +171,7 @@ impl AccountsApi {
                 ledger_version.0,
                 start.0.map(StateKey::from),
                 limit.0,
+                true,
             )?;
             account.modules(&accept_type)
         })
@@ -183,7 +185,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<StateKey>,
     /// Max number of items to retrieve
@@ -193,25 +195,35 @@ 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<Context>,
         address: Address,
         requested_ledger_version: Option<U64>,
         start: Option<StateKey>,
         limit: Option<u16>,
+        require_state_indices: bool,
     ) -> Result<Self, BasicErrorWith404> {
-        // Use the latest ledger version, or the requested associated version
-        let (latest_ledger_info, requested_ledger_version) = context
-            .get_latest_ledger_info_and_verify_lookup_version(
+        let sharding_enabled = context
+            .node_config
+            .storage
+            .rocksdb_configs
+            .enable_storage_sharding;
+
+        let (latest_ledger_info, requested_version) = if sharding_enabled && require_state_indices {
+            context.get_latest_ledger_info_and_verify_internal_indexer_lookup_version(
                 requested_ledger_version.map(|inner| inner.0),
-            )?;
+            )?
+        } else {
+            // Use the latest ledger version, or the requested associated version
+            context.get_latest_ledger_info_and_verify_lookup_version(
+                requested_ledger_version.map(|inner| inner.0),
+            )?
+        };
 
         Ok(Self {
             context,
             address,
-            ledger_version: requested_ledger_version,
+            ledger_version: requested_version,
             start,
             limit,
             latest_ledger_info,
@@ -342,10 +354,8 @@ impl Account {
                 let state_view = self
                     .context
                     .latest_state_view_poem(&self.latest_ledger_info)?;
-                let converter = state_view.as_converter(
-                    self.context.db.clone(),
-                    self.context.table_info_reader.clone(),
-                );
+                let converter = state_view
+                    .as_converter(self.context.db.clone(), self.context.indexer_reader.clone());
                 let converted_resources = converter
                     .try_into_resources(resources.iter().map(|(k, v)| (k.clone(), v.as_slice())))
                     .context("Failed to build move resource response from data in DB")
@@ -473,7 +483,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)
@@ -513,19 +523,23 @@ 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<Vec<(Identifier, move_core_types::value::MoveValue)>, BasicErrorWith404> {
-        let (ledger_info, ledger_version, state_view) =
+    ) -> Result<
+        (
+            Option<Identifier>,
+            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
-            .as_converter(
-                self.context.db.clone(),
-                self.context.table_info_reader.clone(),
-            )
+            .as_converter(self.context.db.clone(), self.context.indexer_reader.clone())
             .find_resource(&state_view, self.address, resource_type)
             .context(format!(
                 "Failed to query DB to check for {} at {}",
@@ -539,14 +553,16 @@ 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
-            .as_converter(
-                self.context.db.clone(),
-                self.context.table_info_reader.clone(),
-            )
+            .as_converter(self.context.db.clone(), self.context.indexer_reader.clone())
             .move_struct_fields(resource_type, &bytes)
             .context("Failed to convert move structs from storage")
             .map_err(|err| {
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<Self> {
-        let data: Vec<u8> = FromRequest::from_request(request, body).await?;
+        let data = Vec::<u8>::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<E> {
     max_size: u64,
 }
 
-#[async_trait::async_trait]
 impl<E: Endpoint> Endpoint for PostSizeLimitEndpoint<E> {
     type Output = E::Output;
 
diff --git a/api/src/context.rs b/api/src/context.rs
index 7535e8faceb76..aa9e59848544f 100644
--- a/api/src/context.rs
+++ b/api/src/context.rs
@@ -18,13 +18,12 @@ use aptos_api_types::{
 };
 use aptos_config::config::{NodeConfig, RoleType};
 use aptos_crypto::HashValue;
-use aptos_db_indexer::table_info_reader::TableInfoReader;
 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},
@@ -34,6 +33,7 @@ use aptos_types::{
     chain_id::ChainId,
     contract_event::EventWithVersion,
     event::EventKey,
+    indexer::indexer_db_reader::IndexerReader,
     ledger_info::LedgerInfoWithSignatures,
     on_chain_config::{GasSchedule, GasScheduleV2, OnChainConfig, OnChainExecutionConfig},
     state_store::{
@@ -41,7 +41,9 @@ use aptos_types::{
         state_value::StateValue,
         TStateView,
     },
-    transaction::{SignedTransaction, TransactionWithProof, Version},
+    transaction::{
+        block_epilogue::BlockEndInfo, SignedTransaction, Transaction, TransactionWithProof, Version,
+    },
 };
 use futures::{channel::oneshot, SinkExt};
 use mini_moka::sync::Cache;
@@ -74,7 +76,7 @@ pub struct Context {
     gas_limit_cache: Arc<RwLock<GasLimitCache>>,
     view_function_stats: Arc<FunctionStats>,
     simulate_txn_stats: Arc<FunctionStats>,
-    pub table_info_reader: Option<Arc<dyn TableInfoReader>>,
+    pub indexer_reader: Option<Arc<dyn IndexerReader>>,
     pub wait_for_hash_active_connections: Arc<AtomicUsize>,
 }
 
@@ -90,7 +92,7 @@ impl Context {
         db: Arc<dyn DbReader>,
         mp_sender: MempoolClientSender,
         node_config: NodeConfig,
-        table_info_reader: Option<Arc<dyn TableInfoReader>>,
+        indexer_reader: Option<Arc<dyn IndexerReader>>,
     ) -> Self {
         let (view_function_stats, simulate_txn_stats) = {
             let log_per_call_stats = node_config.api.periodic_function_stats_sec.is_some();
@@ -127,7 +129,7 @@ impl Context {
             })),
             view_function_stats,
             simulate_txn_stats,
-            table_info_reader,
+            indexer_reader,
             wait_for_hash_active_connections: Arc::new(AtomicUsize::new(0)),
         }
     }
@@ -250,6 +252,35 @@ impl Context {
         ))
     }
 
+    pub fn get_latest_ledger_info_and_verify_internal_indexer_lookup_version<E: StdApiError>(
+        &self,
+        requested_ledger_version: Option<Version>,
+    ) -> Result<(LedgerInfo, Version), E> {
+        if self.indexer_reader.is_none() {
+            return Err(E::internal_with_code_no_info(
+                "Indexer reader doesn't exist",
+                AptosErrorCode::InternalError,
+            ));
+        }
+
+        let (latest_ledger_info, latest_internal_indexer_ledger_version) =
+            self.get_latest_internal_indexer_ledger_version_and_main_db_info()?;
+        if let Some(version) = requested_ledger_version {
+            let request_ledger_version = Version::from(version);
+            if latest_internal_indexer_ledger_version < request_ledger_version {
+                return Err(version_not_found(
+                    request_ledger_version,
+                    &latest_ledger_info,
+                ));
+            } else if request_ledger_version < latest_ledger_info.oldest_ledger_version.0 {
+                return Err(version_pruned(request_ledger_version, &latest_ledger_info));
+            }
+            Ok((latest_ledger_info, request_ledger_version))
+        } else {
+            Ok((latest_ledger_info, latest_internal_indexer_ledger_version))
+        }
+    }
+
     pub fn get_latest_ledger_info_and_verify_lookup_version<E: StdApiError>(
         &self,
         requested_ledger_version: Option<Version>,
@@ -275,6 +306,25 @@ impl Context {
         Ok((latest_ledger_info, requested_ledger_version))
     }
 
+    pub fn get_latest_internal_indexer_ledger_version_and_main_db_info<E: StdApiError>(
+        &self,
+    ) -> Result<(LedgerInfo, Version), E> {
+        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::internal_with_code_no_info(err, AptosErrorCode::InternalError))?
+            {
+                let latest_ledger_info = self.get_latest_ledger_info()?;
+                return Ok((latest_ledger_info, latest_version));
+            }
+        }
+
+        Err(E::internal_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<LedgerInfoWithSignatures> {
         Ok(self.db.get_latest_ledger_info()?)
     }
@@ -348,19 +398,26 @@ impl Context {
         address: AccountAddress,
         version: u64,
     ) -> Result<HashMap<StateKey, StateValue>> {
-        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::<Result<_>>()?;
         if iter.next().transpose()?.is_some() {
             bail!("Too many state items under account ({:?}).", address);
@@ -375,11 +432,26 @@ impl Context {
         version: u64,
         limit: u64,
     ) -> Result<(Vec<(StructTag, Vec<u8>)>, Option<StateKey>)> {
-        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<Result<(PathType, StructTag, Vec<u8>)>>
@@ -406,7 +478,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
@@ -416,7 +488,7 @@ impl Context {
 
         // We should be able to do an unwrap here, otherwise the above db read would fail.
         let state_view = self.state_view_at_version(version)?;
-        let converter = state_view.as_converter(self.db.clone(), self.table_info_reader.clone());
+        let converter = state_view.as_converter(self.db.clone(), self.indexer_reader.clone());
 
         // Extract resources from resource groups and flatten into all resources
         let kvs = kvs
@@ -451,11 +523,26 @@ impl Context {
         version: u64,
         limit: u64,
     ) -> Result<(Vec<(ModuleId, Vec<u8>)>, Option<StateKey>)> {
-        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() {
@@ -471,7 +558,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
@@ -576,7 +663,7 @@ impl Context {
 
         // We can only get the max_transactions page size
         let max_txns = std::cmp::min(
-            self.node_config.api.max_transactions_page_size,
+            self.node_config.api.max_block_transactions_page_size,
             (last_version - first_version + 1) as u16,
         );
         let txns = if with_transactions {
@@ -616,7 +703,7 @@ impl Context {
         }
 
         let state_view = self.latest_state_view_poem(ledger_info)?;
-        let converter = state_view.as_converter(self.db.clone(), self.table_info_reader.clone());
+        let converter = state_view.as_converter(self.db.clone(), self.indexer_reader.clone());
         let txns: Vec<aptos_api_types::Transaction> = data
             .into_iter()
             .map(|t| {
@@ -648,7 +735,7 @@ impl Context {
         }
 
         let state_view = self.latest_state_view_poem(ledger_info)?;
-        let converter = state_view.as_converter(self.db.clone(), self.table_info_reader.clone());
+        let converter = state_view.as_converter(self.db.clone(), self.indexer_reader.clone());
         let txns: Vec<aptos_api_types::Transaction> = data
             .into_iter()
             .map(|t| {
@@ -728,15 +815,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)
@@ -811,28 +914,25 @@ impl Context {
         limit: u16,
         ledger_version: u64,
     ) -> Result<Vec<EventWithVersion>> {
-        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)
         }
     }
 
@@ -892,29 +992,37 @@ impl Context {
         start_version: Version,
         limit: u64,
         ledger_version: Version,
-    ) -> Result<Vec<(u64, u64)>> {
+    ) -> Result<(Vec<(u64, u64)>, Vec<BlockEndInfo>)> {
         if start_version > ledger_version || limit == 0 {
-            return Ok(vec![]);
+            return Ok((vec![], vec![]));
         }
 
-        // This is just an estimation, so we cna just skip over errors
+        // This is just an estimation, so we can just skip over errors
         let limit = std::cmp::min(limit, ledger_version - start_version + 1);
         let txns = self.db.get_transaction_iterator(start_version, limit)?;
         let infos = self
             .db
             .get_transaction_info_iterator(start_version, limit)?;
-        let gas_prices: Vec<_> = txns
-            .zip(infos)
-            .filter_map(|(txn, info)| {
-                txn.as_ref()
-                    .ok()
-                    .and_then(|t| t.try_as_signed_user_txn())
-                    .map(|t| (t.gas_unit_price(), info))
-            })
-            .filter_map(|(unit_price, info)| info.as_ref().ok().map(|i| (unit_price, i.gas_used())))
-            .collect();
 
-        Ok(gas_prices)
+        let mut gas_prices = Vec::new();
+        let mut block_end_infos = Vec::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()));
+                    }
+                },
+                Ok(Transaction::BlockEpilogue(txn)) => {
+                    if let Some(block_end_info) = txn.try_as_block_end_info() {
+                        block_end_infos.push(block_end_info.clone());
+                    }
+                },
+                _ => {},
+            }
+        }
+
+        Ok((gas_prices, block_end_infos))
     }
 
     pub fn estimate_gas_price<E: InternalError>(
@@ -1009,20 +1117,17 @@ impl Context {
                 last - first,
                 ledger_info.ledger_version.0,
             ) {
-                Ok(prices_and_used) => {
+                Ok((prices_and_used, block_end_infos)) => {
                     let is_full_block = if prices_and_used.len() >= config.full_block_txns {
                         true
-                    } else if let Some(full_block_gas_used) =
+                    } 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()
                     {
-                        // be pessimistic for conflicts, as such information is not onchain
                         let gas_used = prices_and_used.iter().map(|(_, used)| *used).sum::<u64>();
-                        let max_conflict_multiplier = block_config
-                            .block_gas_limit_type
-                            .conflict_penalty_window()
-                            .unwrap_or(1)
-                            as u64;
-                        gas_used * max_conflict_multiplier >= full_block_gas_used
+                        gas_used >= block_gas_limit
                     } else {
                         false
                     };
@@ -1170,17 +1275,22 @@ impl Context {
                     E::internal_with_code(e, AptosErrorCode::InternalError, ledger_info)
                 })?;
 
-            let gas_schedule_params =
-                match GasScheduleV2::fetch_config(&state_view).and_then(|gas_schedule| {
-                    let feature_version = gas_schedule.feature_version;
-                    let gas_schedule = gas_schedule.to_btree_map();
-                    AptosGasParameters::from_on_chain_gas_schedule(&gas_schedule, feature_version)
+            let gas_schedule_params = {
+                let may_be_params =
+                    GasScheduleV2::fetch_config(&state_view).and_then(|gas_schedule| {
+                        let feature_version = gas_schedule.feature_version;
+                        let gas_schedule = gas_schedule.into_btree_map();
+                        AptosGasParameters::from_on_chain_gas_schedule(
+                            &gas_schedule,
+                            feature_version,
+                        )
                         .ok()
-                }) {
+                    });
+                match may_be_params {
                     Some(gas_schedule) => Ok(gas_schedule),
                     None => GasSchedule::fetch_config(&state_view)
                         .and_then(|gas_schedule| {
-                            let gas_schedule = gas_schedule.to_btree_map();
+                            let gas_schedule = gas_schedule.into_btree_map();
                             AptosGasParameters::from_on_chain_gas_schedule(&gas_schedule, 0).ok()
                         })
                         .ok_or_else(|| {
@@ -1190,7 +1300,8 @@ impl Context {
                                 ledger_info,
                             )
                         }),
-                }?;
+                }?
+            };
 
             // Update the cache
             cache.gas_schedule_params = Some(gas_schedule_params.clone());
@@ -1431,3 +1542,7 @@ impl FunctionStats {
         }
     }
 }
+
+fn db_sharding_enabled(node_config: &NodeConfig) -> bool {
+    node_config.storage.rocksdb_configs.enable_storage_sharding
+}
diff --git a/api/src/events.rs b/api/src/events.rs
index 5dc4f2310f789..5c9266df373b8 100644
--- a/api/src/events.rs
+++ b/api/src/events.rs
@@ -77,7 +77,7 @@ impl EventsApi {
         // Ensure that account exists
         let api = self.clone();
         api_spawn_blocking(move || {
-            let account = Account::new(api.context.clone(), address.0, None, None, None)?;
+            let account = Account::new(api.context.clone(), address.0, None, None, None, true)?;
             account.verify_account_or_object_resource()?;
             api.list(
                 account.latest_ledger_info,
@@ -144,7 +144,7 @@ impl EventsApi {
 
         let api = self.clone();
         api_spawn_blocking(move || {
-            let account = Account::new(api.context.clone(), address.0, None, None, None)?;
+            let account = Account::new(api.context.clone(), address.0, None, None, None, true)?;
             let key = account.find_event_key(event_handle.0, field_name.0.into())?;
             api.list(account.latest_ledger_info, accept_type, page, key)
         })
@@ -184,10 +184,7 @@ impl EventsApi {
                 let events = self
                     .context
                     .latest_state_view_poem(&latest_ledger_info)?
-                    .as_converter(
-                        self.context.db.clone(),
-                        self.context.table_info_reader.clone(),
-                    )
+                    .as_converter(self.context.db.clone(), self.context.indexer_reader.clone())
                     .try_into_versioned_events(&events)
                     .context("Failed to convert events from storage into response")
                     .map_err(|err| {
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/response.rs b/api/src/response.rs
index e376ca42e9182..ab94491b083bc 100644
--- a/api/src/response.rs
+++ b/api/src/response.rs
@@ -77,6 +77,7 @@ macro_rules! generate_error_traits {
         $(
         pub trait [<$trait_name Error>]: AptosErrorResponse {
             // With ledger info and an error code
+            #[allow(unused)]
             fn [<$trait_name:snake _with_code>]<Err: std::fmt::Display>(
                 err: Err,
                 error_code: aptos_api_types::AptosErrorCode,
@@ -84,11 +85,13 @@ macro_rules! generate_error_traits {
             ) -> Self where Self: Sized;
 
             // With an error code and no ledger info headers (special case)
+            #[allow(unused)]
             fn [<$trait_name:snake _with_code_no_info>]<Err: std::fmt::Display>(
                 err: Err,
                 error_code: aptos_api_types::AptosErrorCode,
             ) -> Self where Self: Sized;
 
+            #[allow(unused)]
             fn [<$trait_name:snake _with_vm_status>]<Err: std::fmt::Display>(
                 err: Err,
                 error_code: aptos_api_types::AptosErrorCode,
@@ -96,6 +99,7 @@ macro_rules! generate_error_traits {
                 ledger_info: &aptos_api_types::LedgerInfo
             ) -> Self where Self: Sized;
 
+            #[allow(unused)]
             fn [<$trait_name:snake _from_aptos_error>](
                 aptos_error: aptos_api_types::AptosError,
                 ledger_info: &aptos_api_types::LedgerInfo
diff --git a/api/src/runtime.rs b/api/src/runtime.rs
index 4673c087235a1..219036a90b5d7 100644
--- a/api/src/runtime.rs
+++ b/api/src/runtime.rs
@@ -3,18 +3,27 @@
 // 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;
 use aptos_config::config::{ApiConfig, NodeConfig};
-use aptos_db_indexer::table_info_reader::TableInfoReader;
 use aptos_logger::info;
 use aptos_mempool::MempoolClientSender;
 use aptos_storage_interface::DbReader;
-use aptos_types::chain_id::ChainId;
+use aptos_types::{chain_id::ChainId, indexer::indexer_db_reader::IndexerReader};
 use poem::{
     handler,
     http::Method,
@@ -35,12 +44,12 @@ pub fn bootstrap(
     chain_id: ChainId,
     db: Arc<dyn DbReader>,
     mp_sender: MempoolClientSender,
-    table_info_reader: Option<Arc<dyn TableInfoReader>>,
+    indexer_reader: Option<Arc<dyn IndexerReader>>,
 ) -> anyhow::Result<Runtime> {
     let max_runtime_workers = get_max_runtime_workers(&config.api);
     let runtime = aptos_runtimes::spawn_named_runtime("api".into(), Some(max_runtime_workers));
 
-    let context = Context::new(chain_id, db, mp_sender, config.clone(), table_info_reader);
+    let context = Context::new(chain_id, db, mp_sender, config.clone(), indexer_reader);
 
     attach_poem_to_runtime(runtime.handle(), context.clone(), config, false)
         .context("Failed to attach poem to runtime")?;
@@ -165,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<T, W>(service: &OpenApiService<T, W>, 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<T, W>(service: &OpenApiService<T, W>) -> 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<T, W>(service: &OpenApiService<T, W>) -> 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/state.rs b/api/src/state.rs
index 4b083a6d47b16..8c11810b98ccb 100644
--- a/api/src/state.rs
+++ b/api/src/state.rs
@@ -287,10 +287,7 @@ impl StateApi {
 
         let (ledger_info, ledger_version, state_view) = self.context.state_view(ledger_version)?;
         let bytes = state_view
-            .as_converter(
-                self.context.db.clone(),
-                self.context.table_info_reader.clone(),
-            )
+            .as_converter(self.context.db.clone(), self.context.indexer_reader.clone())
             .find_resource(&state_view, address, &tag)
             .context(format!(
                 "Failed to query DB to check for {} at {}",
@@ -308,10 +305,7 @@ impl StateApi {
         match accept_type {
             AcceptType::Json => {
                 let resource = state_view
-                    .as_converter(
-                        self.context.db.clone(),
-                        self.context.table_info_reader.clone(),
-                    )
+                    .as_converter(self.context.db.clone(), self.context.indexer_reader.clone())
                     .try_into_resource(&tag, &bytes)
                     .context("Failed to deserialize resource data retrieved from DB")
                     .map_err(|err| {
@@ -412,10 +406,8 @@ impl StateApi {
             .context
             .state_view(ledger_version.map(|inner| inner.0))?;
 
-        let converter = state_view.as_converter(
-            self.context.db.clone(),
-            self.context.table_info_reader.clone(),
-        );
+        let converter =
+            state_view.as_converter(self.context.db.clone(), self.context.indexer_reader.clone());
 
         // Convert key to lookup version for DB
         let vm_key = converter
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 b02c5b0c976fb..eb6e132ecb277 100644
--- a/api/src/tests/multisig_transactions_test.rs
+++ b/api/src/tests/multisig_transactions_test.rs
@@ -333,6 +333,74 @@ async fn test_multisig_transaction_with_payload_not_matching_hash() {
         .await;
 }
 
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn test_multisig_transaction_with_matching_payload() {
+    let mut context = new_test_context(current_function_name!());
+    let owner_account = &mut context.create_account().await;
+    let multisig_account = context
+        .create_multisig_account(owner_account, vec![], 1, 1000)
+        .await;
+    assert_eq!(1000, context.get_apt_balance(multisig_account).await);
+    let multisig_payload = construct_multisig_txn_transfer_payload(owner_account.address(), 1000);
+    context
+        .create_multisig_transaction(owner_account, multisig_account, multisig_payload.clone())
+        .await;
+    context
+        .execute_multisig_transaction_with_payload(
+            owner_account,
+            multisig_account,
+            "0x1::aptos_account::transfer",
+            &[],
+            &[&owner_account.address().to_hex_literal(), "1000"],
+            202,
+        )
+        .await;
+
+    // The multisig tx that transfers away 1000 APT should have succeeded.
+    assert_multisig_tx_executed(&mut context, multisig_account, multisig_payload, 1).await;
+    assert_eq!(0, context.get_apt_balance(multisig_account).await);
+}
+
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn test_multisig_transaction_with_mismatching_payload() {
+    let mut context = new_test_context(current_function_name!());
+    let owner_account = &mut context.create_account().await;
+    let multisig_account = context
+        .create_multisig_account(owner_account, vec![], 1, 1000)
+        .await;
+    let multisig_payload = construct_multisig_txn_transfer_payload(owner_account.address(), 1000);
+    context
+        .create_multisig_transaction(owner_account, multisig_account, multisig_payload.clone())
+        .await;
+
+    // The multisig transaction execution should fail due to the payload mismatch
+    // amount being different (1000 vs 2000).
+    context
+        .execute_multisig_transaction_with_payload(
+            owner_account,
+            multisig_account,
+            "0x1::aptos_account::transfer",
+            &[],
+            &[&owner_account.address().to_hex_literal(), "2000"],
+            400,
+        )
+        .await;
+    // Balance didn't change since the target transaction failed.
+    assert_eq!(1000, context.get_apt_balance(multisig_account).await);
+
+    // Excuting the transaction with the correct payload should succeed.
+    context
+        .execute_multisig_transaction_with_payload(
+            owner_account,
+            multisig_account,
+            "0x1::aptos_account::transfer",
+            &[],
+            &[&owner_account.address().to_hex_literal(), "1000"],
+            202,
+        )
+        .await;
+}
+
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn test_multisig_transaction_simulation() {
     let mut context = new_test_context(current_function_name!());
@@ -367,7 +435,7 @@ async fn test_multisig_transaction_simulation() {
     let withdraw_event = &simulation_resp["events"].as_array().unwrap()[0];
     assert_eq!(
         withdraw_event["type"].as_str().unwrap(),
-        "0x1::coin::Withdraw<0x1::aptos_coin::AptosCoin>"
+        "0x1::coin::CoinWithdraw"
     );
     let withdraw_from_account =
         AccountAddress::from_hex_literal(withdraw_event["data"]["account"].as_str().unwrap())
diff --git a/api/src/tests/secp256k1_ecdsa.rs b/api/src/tests/secp256k1_ecdsa.rs
index d8c8e8f2085d6..3a0121bf41a43 100644
--- a/api/src/tests/secp256k1_ecdsa.rs
+++ b/api/src/tests/secp256k1_ecdsa.rs
@@ -4,14 +4,73 @@
 
 use super::new_test_context;
 use aptos_api_test_context::current_function_name;
-use aptos_crypto::{ed25519::Ed25519PrivateKey, secp256k1_ecdsa};
+use aptos_crypto::{ed25519::Ed25519PrivateKey, secp256k1_ecdsa, SigningKey};
 use aptos_sdk::types::{
-    transaction::authenticator::{AnyPublicKey, AuthenticationKey},
+    transaction::{
+        authenticator::{
+            AccountAuthenticator, AnyPublicKey, AnySignature, AuthenticationKey, MultiKey,
+            MultiKeyAuthenticator,
+        },
+        SignedTransaction,
+    },
     LocalAccount,
 };
 use rand::{rngs::StdRng, SeedableRng};
 use std::convert::TryInto;
 
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn test_multi_secp256k1_ecdsa() {
+    let mut context = new_test_context(current_function_name!());
+    let other = context.create_account().await;
+
+    let mut rng: StdRng = SeedableRng::from_seed([0; 32]);
+    let private_key: secp256k1_ecdsa::PrivateKey = aptos_crypto::Uniform::generate(&mut rng);
+    let public_key = aptos_crypto::PrivateKey::public_key(&private_key);
+    let address = AuthenticationKey::multi_key(
+        MultiKey::new(vec![AnyPublicKey::secp256k1_ecdsa(public_key.clone())], 1).unwrap(),
+    )
+    .account_address();
+
+    // Set a dummy key
+    let key_bytes =
+        hex::decode("a38ba78b1a0fbfc55e2c5dfdedf48d1172283d0f7c59fd64c02d811130a2f4b2").unwrap();
+    let ed25519_private_key: Ed25519PrivateKey = (&key_bytes[..]).try_into().unwrap();
+    let mut account = LocalAccount::new(address, ed25519_private_key, 0);
+
+    let txn0 = context.create_user_account(&account).await;
+    context.commit_block(&vec![txn0]).await;
+    let txn1 = context.mint_user_account(&account).await;
+    context.commit_block(&vec![txn1]).await;
+    let txn2 = context.create_user_account(&other).await;
+    context.commit_block(&vec![txn2]).await;
+
+    let ed22519_txn = context.account_transfer(&mut account, &other, 5);
+    let raw_txn = ed22519_txn.into_raw_transaction();
+
+    let signature = private_key.sign(&raw_txn).unwrap();
+    let authenticator = AccountAuthenticator::multi_key(
+        MultiKeyAuthenticator::new(
+            MultiKey::new(vec![AnyPublicKey::secp256k1_ecdsa(public_key)], 1).unwrap(),
+            vec![(0, AnySignature::secp256k1_ecdsa(signature))],
+        )
+        .unwrap(),
+    );
+    let secp256k1_ecdsa_txn = SignedTransaction::new_single_sender(raw_txn, authenticator);
+    let balance_start = context.get_apt_balance(other.address()).await;
+    let bcs_txn = bcs::to_bytes(&secp256k1_ecdsa_txn).unwrap();
+    context
+        .expect_status_code(202)
+        .post_bcs_txn("/transactions", bcs_txn)
+        .await;
+    context.commit_mempool_txns(1).await;
+    assert_eq!(
+        balance_start + 5,
+        context.get_apt_balance(other.address()).await
+    );
+    let txns = context.get("/transactions?start=14&limit=1").await;
+    context.check_golden_output(txns[0]["signature"].clone());
+}
+
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn test_secp256k1_ecdsa() {
     let mut context = new_test_context(current_function_name!());
@@ -52,4 +111,6 @@ async fn test_secp256k1_ecdsa() {
         balance_start + 5,
         context.get_apt_balance(other.address()).await
     );
+    let txns = context.get("/transactions?start=14&limit=1").await;
+    context.check_golden_output(txns[0]["signature"].clone());
 }
diff --git a/api/src/tests/state_test.rs b/api/src/tests/state_test.rs
index 0aaf1bfddb699..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_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_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_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 6339b30a3d052..82fabded83bab 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::{
@@ -11,7 +13,7 @@ use aptos_crypto::{
     multi_ed25519::{MultiEd25519PrivateKey, MultiEd25519PublicKey},
     PrivateKey, SigningKey, Uniform,
 };
-use aptos_sdk::types::LocalAccount;
+use aptos_sdk::types::{AccountKey, LocalAccount};
 use aptos_types::{
     account_address::AccountAddress,
     account_config::aptos_test_root_address,
@@ -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!());
@@ -1504,6 +1517,77 @@ async fn test_simulation_failure_error_message() {
         .contains("Division by zero"));
 }
 
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn test_simulation_failure_with_move_abort_error_rendering() {
+    let mut context = new_test_context(current_function_name!());
+    let account = context.create_account().await;
+    let raw_txn = context
+        .transaction_factory()
+        .entry_function(EntryFunction::new(
+            ModuleId::new(
+                AccountAddress::from_hex_literal("0x1").unwrap(),
+                Identifier::new("aptos_account").unwrap(),
+            ),
+            Identifier::new("transfer").unwrap(),
+            vec![],
+            vec![
+                bcs::to_bytes(&AccountAddress::from_hex_literal("0x1").unwrap()).unwrap(),
+                bcs::to_bytes(&999999999999999999u64).unwrap(),
+            ],
+        ))
+        .sender(account.address())
+        .sequence_number(account.sequence_number())
+        .expiration_timestamp_secs(u64::MAX)
+        .build();
+    let invalid_key = AccountKey::generate(&mut context.rng());
+
+    let txn = raw_txn
+        .sign(invalid_key.private_key(), account.public_key().clone())
+        .unwrap()
+        .into_inner();
+    let body = bcs::to_bytes(&txn).unwrap();
+    let resp = context
+        .expect_status_code(200)
+        .post_bcs_txn("/transactions/simulate", body)
+        .await;
+    context.check_golden_output(resp);
+}
+
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn test_simulation_failure_with_detail_error() {
+    let mut context = new_test_context(current_function_name!());
+    let account = context.root_account().await;
+    let raw_txn = context
+        .transaction_factory()
+        .entry_function(EntryFunction::new(
+            ModuleId::new(
+                AccountAddress::from_hex_literal("0x1").unwrap(),
+                Identifier::new("MemeCoin").unwrap(),
+            ),
+            Identifier::new("transfer").unwrap(),
+            vec![APTOS_COIN_TYPE.clone()],
+            vec![
+                bcs::to_bytes(&AccountAddress::from_hex_literal("0xdd").unwrap()).unwrap(),
+                bcs::to_bytes(&1u64).unwrap(),
+            ],
+        ))
+        .sender(account.address())
+        .sequence_number(account.sequence_number())
+        .expiration_timestamp_secs(u64::MAX)
+        .build();
+    let invalid_key = AccountKey::generate(&mut context.rng());
+    let txn = raw_txn
+        .sign(invalid_key.private_key(), account.public_key().clone())
+        .unwrap()
+        .into_inner();
+    let body = bcs::to_bytes(&txn).unwrap();
+    let resp = context
+        .expect_status_code(200)
+        .post_bcs_txn("/transactions/simulate", body)
+        .await;
+    context.check_golden_output(resp);
+}
+
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn test_runtime_error_message_in_interpreter() {
     let context = new_test_context(current_function_name!());
diff --git a/api/src/transactions.rs b/api/src/transactions.rs
index 81dcf59a89e36..7a11b73288a41 100644
--- a/api/src/transactions.rs
+++ b/api/src/transactions.rs
@@ -898,7 +898,7 @@ impl TransactionsApi {
                         state_view
                             .as_converter(
                                 self.context.db.clone(),
-                                self.context.table_info_reader.clone(),
+                                self.context.indexer_reader.clone(),
                             )
                             .try_into_onchain_transaction(timestamp, txn)
                             .context("Failed to convert on chain transaction to Transaction")
@@ -911,10 +911,7 @@ impl TransactionsApi {
                             })?
                     },
                     TransactionData::Pending(txn) => state_view
-                        .as_converter(
-                            self.context.db.clone(),
-                            self.context.table_info_reader.clone(),
-                        )
+                        .as_converter(self.context.db.clone(), self.context.indexer_reader.clone())
                         .try_into_pending_transaction(*txn)
                         .context("Failed to convert on pending transaction to Transaction")
                         .map_err(|err| {
@@ -989,7 +986,7 @@ impl TransactionsApi {
         address: Address,
     ) -> BasicResultWith404<Vec<Transaction>> {
         // Verify the account exists
-        let account = Account::new(self.context.clone(), address, None, None, None)?;
+        let account = Account::new(self.context.clone(), address, None, None, None, true)?;
         account.get_account_resource()?;
 
         let latest_ledger_info = account.latest_ledger_info;
@@ -998,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 {
@@ -1092,10 +1089,7 @@ impl TransactionsApi {
             SubmitTransactionPost::Json(data) => self
                 .context
                 .latest_state_view_poem(ledger_info)?
-                .as_converter(
-                    self.context.db.clone(),
-                    self.context.table_info_reader.clone(),
-                )
+                .as_converter(self.context.db.clone(), self.context.indexer_reader.clone())
                 .try_into_signed_transaction_poem(data.0, self.context.chain_id())
                 .context("Failed to create SignedTransaction from SubmitTransactionRequest")
                 .map_err(|err| {
@@ -1173,7 +1167,7 @@ impl TransactionsApi {
                 .enumerate()
                 .map(|(index, txn)| {
                     self.context.latest_state_view_poem(ledger_info)?
-                        .as_converter(self.context.db.clone(), self.context.table_info_reader.clone())
+                        .as_converter(self.context.db.clone(), self.context.indexer_reader.clone())
                         .try_into_signed_transaction_poem(txn, self.context.chain_id())
                         .context(format!("Failed to create SignedTransaction from SubmitTransactionRequest at position {}", index))
                         .map_err(|err| {
@@ -1264,7 +1258,7 @@ impl TransactionsApi {
 
                     // We provide the pending transaction so that users have the hash associated
                     let pending_txn = state_view
-                            .as_converter(self.context.db.clone(), self.context.table_info_reader.clone())
+                            .as_converter(self.context.db.clone(), self.context.indexer_reader.clone())
                             .try_into_pending_transaction_poem(txn)
                             .context("Failed to build PendingTransaction from mempool response, even though it said the request was accepted")
                             .map_err(|err| SubmitTransactionError::internal_with_code(
@@ -1376,12 +1370,10 @@ impl TransactionsApi {
         let version = ledger_info.version();
 
         // Ensure that all known statuses return their values in the output (even if they aren't supposed to)
-        let exe_status = match vm_status.clone().keep_or_discard() {
-            Ok(kept_vm_status) => kept_vm_status.into(),
-            Err(discarded_vm_status) => {
-                ExecutionStatus::MiscellaneousError(Some(discarded_vm_status))
-            },
-        };
+        let exe_status = ExecutionStatus::conmbine_vm_status_for_simulation(
+            output.auxiliary_data(),
+            output.status().clone(),
+        );
 
         let stats_key = match txn.payload() {
             TransactionPayload::Script(_) => {
@@ -1443,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), ..
@@ -1452,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(
@@ -1500,10 +1491,7 @@ impl TransactionsApi {
         let ledger_info = self.context.get_latest_ledger_info()?;
         let state_view = self.context.latest_state_view_poem(&ledger_info)?;
         let raw_txn: RawTransaction = state_view
-            .as_converter(
-                self.context.db.clone(),
-                self.context.table_info_reader.clone(),
-            )
+            .as_converter(self.context.db.clone(), self.context.indexer_reader.clone())
             .try_into_raw_transaction_poem(request.transaction, self.context.chain_id())
             .context("The given transaction is invalid")
             .map_err(|err| {
@@ -1562,7 +1550,7 @@ fn override_gas_parameters(
     );
 
     // TODO: Check that signature is null, this would just be helpful for downstream use
-    SignedTransaction::new_with_authenticator(raw_txn, signed_txn.authenticator())
+    SignedTransaction::new_signed_transaction(raw_txn, signed_txn.authenticator())
 }
 
 enum GetByVersionResponse {
diff --git a/api/src/view_function.rs b/api/src/view_function.rs
index 08335c5e7005a..fa6b31e4f732b 100644
--- a/api/src/view_function.rs
+++ b/api/src/view_function.rs
@@ -95,7 +95,7 @@ fn view_request(
 
     let view_function: ViewFunction = match request {
         ViewFunctionRequest::Json(data) => state_view
-            .as_converter(context.db.clone(), context.table_info_reader.clone())
+            .as_converter(context.db.clone(), context.indexer_reader.clone())
             .convert_view_function(data.0)
             .map_err(|err| {
                 BasicErrorWith404::bad_request_with_code(
@@ -167,7 +167,7 @@ fn view_request(
         },
         AcceptType::Json => {
             let return_types = state_view
-                .as_converter(context.db.clone(), context.table_info_reader.clone())
+                .as_converter(context.db.clone(), context.indexer_reader.clone())
                 .function_return_types(&view_function)
                 .and_then(|tys| {
                     tys.into_iter()
@@ -187,7 +187,7 @@ fn view_request(
                 .zip(return_types.into_iter())
                 .map(|(v, ty)| {
                     state_view
-                        .as_converter(context.db.clone(), context.table_info_reader.clone())
+                        .as_converter(context.db.clone(), context.indexer_reader.clone())
                         .try_into_move_value(&ty, &v)
                 })
                 .collect::<anyhow::Result<Vec<_>>>()
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 c8786900d73d4..b9f938de52b12 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/Cargo.toml b/api/types/Cargo.toml
index 1ff09c771eed3..4f395c7457dd9 100644
--- a/api/types/Cargo.toml
+++ b/api/types/Cargo.toml
@@ -16,7 +16,6 @@ rust-version = { workspace = true }
 anyhow = { workspace = true }
 aptos-config = { workspace = true }
 aptos-crypto = { workspace = true }
-aptos-db-indexer = { workspace = true }
 aptos-framework = { workspace = true }
 aptos-logger = { workspace = true }
 aptos-openapi = { workspace = true }
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 09798fb76a4a5..11fc0aedae6b2 100644
--- a/api/types/src/convert.rs
+++ b/api/types/src/convert.rs
@@ -4,8 +4,8 @@
 
 use crate::{
     transaction::{
-        DecodedTableData, DeleteModule, DeleteResource, DeleteTableItem, DeletedTableData,
-        MultisigPayload, MultisigTransactionPayload, StateCheckpointTransaction,
+        BlockEpilogueTransaction, DecodedTableData, DeleteModule, DeleteResource, DeleteTableItem,
+        DeletedTableData, MultisigPayload, MultisigTransactionPayload, StateCheckpointTransaction,
         UserTransactionRequestInner, WriteModule, WriteResource, WriteTableItem,
     },
     view::{ViewFunction, ViewRequest},
@@ -18,7 +18,6 @@ use crate::{
 };
 use anyhow::{bail, ensure, format_err, Context as AnyhowContext, Result};
 use aptos_crypto::{hash::CryptoHash, HashValue};
-use aptos_db_indexer::table_info_reader::TableInfoReader;
 use aptos_logger::{sample, sample::SampleRate};
 use aptos_resource_viewer::AptosValueAnnotator;
 use aptos_storage_interface::DbReader;
@@ -26,13 +25,15 @@ use aptos_types::{
     access_path::{AccessPath, Path},
     chain_id::ChainId,
     contract_event::{ContractEvent, EventWithVersion},
+    indexer::indexer_db_reader::IndexerReader,
     state_store::{
         state_key::{inner::StateKeyInner, StateKey},
         table::{TableHandle, TableInfo},
         StateView,
     },
     transaction::{
-        EntryFunction, ExecutionStatus, Multisig, RawTransaction, Script, SignedTransaction,
+        BlockEndInfo, BlockEpiloguePayload, EntryFunction, ExecutionStatus, Multisig,
+        RawTransaction, Script, SignedTransaction, TransactionAuxiliaryData,
     },
     vm_status::AbortLocation,
     write_set::WriteOp,
@@ -44,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;
@@ -65,19 +67,19 @@ const OBJECT_STRUCT: &IdentStr = ident_str!("Object");
 pub struct MoveConverter<'a, S> {
     inner: AptosValueAnnotator<'a, S>,
     db: Arc<dyn DbReader>,
-    table_info_reader: Option<Arc<dyn TableInfoReader>>,
+    indexer_reader: Option<Arc<dyn IndexerReader>>,
 }
 
 impl<'a, S: StateView> MoveConverter<'a, S> {
     pub fn new(
         inner: &'a S,
         db: Arc<dyn DbReader>,
-        table_info_reader: Option<Arc<dyn TableInfoReader>>,
+        indexer_reader: Option<Arc<dyn IndexerReader>>,
     ) -> Self {
         Self {
             inner: AptosValueAnnotator::new(inner),
             db,
-            table_info_reader,
+            indexer_reader,
         }
     }
 
@@ -153,7 +155,10 @@ impl<'a, S: StateView> MoveConverter<'a, S> {
         &self,
         typ: &StructTag,
         bytes: &'_ [u8],
-    ) -> Result<Vec<(Identifier, move_core_types::value::MoveValue)>> {
+    ) -> Result<(
+        Option<Identifier>,
+        Vec<(Identifier, move_core_types::value::MoveValue)>,
+    )> {
         self.inner.view_struct_fields(typ, bytes)
     }
 
@@ -175,12 +180,19 @@ impl<'a, S: StateView> MoveConverter<'a, S> {
         timestamp: u64,
         data: TransactionOnChainData,
     ) -> Result<Transaction> {
-        use aptos_types::transaction::Transaction::*;
+        use aptos_types::transaction::Transaction::{
+            BlockEpilogue, BlockMetadata, BlockMetadataExt, GenesisTransaction, StateCheckpoint,
+            UserTransaction,
+        };
+        let aux_data = self
+            .db
+            .get_transaction_auxiliary_data_by_version(data.version)?;
         let info = self.into_transaction_info(
             data.version,
             &data.info,
             data.accumulator_root_hash,
             data.changes,
+            aux_data,
         );
         let events = self.try_into_events(&data.events)?;
         Ok(match data.transaction {
@@ -200,7 +212,32 @@ impl<'a, S: StateView> MoveConverter<'a, S> {
                     timestamp: timestamp.into(),
                 })
             },
-            ValidatorTransaction(_txn) => (info, events, timestamp).into(),
+            BlockEpilogue(block_epilogue_payload) => {
+                Transaction::BlockEpilogueTransaction(BlockEpilogueTransaction {
+                    info,
+                    timestamp: timestamp.into(),
+                    block_end_info: match block_epilogue_payload {
+                        BlockEpiloguePayload::V0 {
+                            block_end_info:
+                                BlockEndInfo::V0 {
+                                    block_gas_limit_reached,
+                                    block_output_limit_reached,
+                                    block_effective_block_gas_units,
+                                    block_approx_output_size,
+                                },
+                            ..
+                        } => Some(crate::transaction::BlockEndInfo {
+                            block_gas_limit_reached,
+                            block_output_limit_reached,
+                            block_effective_block_gas_units,
+                            block_approx_output_size,
+                        }),
+                    },
+                })
+            },
+            aptos_types::transaction::Transaction::ValidatorTransaction(txn) => {
+                Transaction::ValidatorTransaction((txn, info, events, timestamp).into())
+            },
         })
     }
 
@@ -210,6 +247,7 @@ impl<'a, S: StateView> MoveConverter<'a, S> {
         info: &aptos_types::transaction::TransactionInfo,
         accumulator_root_hash: HashValue,
         write_set: aptos_types::write_set::WriteSet,
+        txn_aux_data: Option<TransactionAuxiliaryData>,
     ) -> TransactionInfo {
         TransactionInfo {
             version: version.into(),
@@ -219,7 +257,7 @@ impl<'a, S: StateView> MoveConverter<'a, S> {
             state_checkpoint_hash: info.state_checkpoint_hash().map(|h| h.into()),
             gas_used: info.gas_used().into(),
             success: info.status().is_success(),
-            vm_status: self.explain_vm_status(info.status()),
+            vm_status: self.explain_vm_status(info.status(), txn_aux_data),
             accumulator_root_hash: accumulator_root_hash.into(),
             // TODO: the resource value is interpreted by the type definition at the version of the converter, not the version of the tx: must be fixed before we allow module updates
             changes: write_set
@@ -238,7 +276,26 @@ impl<'a, S: StateView> MoveConverter<'a, S> {
     ) -> Result<TransactionPayload> {
         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::<Result<_>>()?,
+                    Err(_e) => convert_txn_args(&args)
+                        .into_iter()
+                        .map(|arg| HexEncodedBytes::from(arg).json())
+                        .collect::<Result<_>>()?,
+                };
+                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
@@ -539,7 +596,7 @@ impl<'a, S: StateView> MoveConverter<'a, S> {
             .signature
             .clone()
             .ok_or_else(|| format_err!("missing signature"))?;
-        Ok(SignedTransaction::new_with_authenticator(
+        Ok(SignedTransaction::new_signed_transaction(
             self.try_into_raw_transaction(txn, chain_id)?,
             signature.try_into()?,
         ))
@@ -550,7 +607,7 @@ impl<'a, S: StateView> MoveConverter<'a, S> {
         submit_transaction_request: SubmitTransactionRequest,
         chain_id: ChainId,
     ) -> Result<SignedTransaction> {
-        Ok(SignedTransaction::new_with_authenticator(
+        Ok(SignedTransaction::new_signed_transaction(
             self.try_into_raw_transaction_poem(
                 submit_transaction_request.user_transaction_request,
                 chain_id,
@@ -953,9 +1010,9 @@ impl<'a, S: StateView> MoveConverter<'a, S> {
     }
 
     fn get_table_info(&self, handle: TableHandle) -> Result<Option<TableInfo>> {
-        if let Some(table_info_reader) = self.table_info_reader.as_ref() {
-            // Attempt to get table_info from the table_info_reader if it exists
-            Ok(table_info_reader.get_table_info(handle)?)
+        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)?))
@@ -964,7 +1021,11 @@ impl<'a, S: StateView> MoveConverter<'a, S> {
         }
     }
 
-    fn explain_vm_status(&self, status: &ExecutionStatus) -> String {
+    fn explain_vm_status(
+        &self,
+        status: &ExecutionStatus,
+        txn_aux_data: Option<TransactionAuxiliaryData>,
+    ) -> String {
         match status {
             ExecutionStatus::MoveAbort {
                 location,
@@ -1016,10 +1077,20 @@ impl<'a, S: StateView> MoveConverter<'a, S> {
                     func_name, code_offset
                 )
             },
-            ExecutionStatus::MiscellaneousError(code) => code.map_or(
-                "Execution failed with miscellaneous error and no status code".to_owned(),
-                |e| format!("{:#?}", e),
-            ),
+            ExecutionStatus::MiscellaneousError(code) => {
+                if txn_aux_data.is_none() && 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()),
+                    )
+                }
+            },
         }
     }
 
@@ -1045,7 +1116,7 @@ pub trait AsConverter<R> {
     fn as_converter(
         &self,
         db: Arc<dyn DbReader>,
-        table_info_reader: Option<Arc<dyn TableInfoReader>>,
+        indexer_reader: Option<Arc<dyn IndexerReader>>,
     ) -> MoveConverter<R>;
 }
 
@@ -1053,9 +1124,9 @@ impl<R: StateView> AsConverter<R> for R {
     fn as_converter(
         &self,
         db: Arc<dyn DbReader>,
-        table_info_reader: Option<Arc<dyn TableInfoReader>>,
+        indexer_reader: Option<Arc<dyn IndexerReader>>,
     ) -> MoveConverter<R> {
-        MoveConverter::new(self, db, table_info_reader)
+        MoveConverter::new(self, db, indexer_reader)
     }
 }
 
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<AnnotatedMoveStruct> for MoveStructValue {
 
     fn try_from(s: AnnotatedMoveStruct) -> anyhow::Result<Self> {
         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<TransactionArgument> 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<MoveAbility>,
     /// 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 23024fb15a2db..c11c1206498c0 100755
--- a/api/types/src/transaction.rs
+++ b/api/types/src/transaction.rs
@@ -17,9 +17,12 @@ use aptos_crypto::{
 };
 use aptos_types::{
     account_address::AccountAddress,
+    aggregate_signature::AggregateSignature,
     block_metadata::BlockMetadata,
     block_metadata_ext::BlockMetadataExt,
     contract_event::{ContractEvent, EventWithVersion},
+    dkg::{DKGTranscript, DKGTranscriptMetadata},
+    jwks::{jwk::JWK, ProviderJWKs, QuorumCertifiedUpdate},
     keyless,
     transaction::{
         authenticator::{
@@ -173,10 +176,11 @@ impl
 #[oai(one_of, discriminator_name = "type", rename_all = "snake_case")]
 pub enum Transaction {
     PendingTransaction(PendingTransaction),
-    UserTransaction(Box<UserTransaction>),
+    UserTransaction(UserTransaction),
     GenesisTransaction(GenesisTransaction),
     BlockMetadataTransaction(BlockMetadataTransaction),
     StateCheckpointTransaction(StateCheckpointTransaction),
+    BlockEpilogueTransaction(BlockEpilogueTransaction),
     ValidatorTransaction(ValidatorTransaction),
 }
 
@@ -188,7 +192,8 @@ impl Transaction {
             Transaction::PendingTransaction(_) => 0,
             Transaction::GenesisTransaction(_) => 0,
             Transaction::StateCheckpointTransaction(txn) => txn.timestamp.0,
-            Transaction::ValidatorTransaction(txn) => txn.timestamp.0,
+            Transaction::BlockEpilogueTransaction(txn) => txn.timestamp.0,
+            Transaction::ValidatorTransaction(txn) => txn.timestamp().0,
         }
     }
 
@@ -199,7 +204,8 @@ impl Transaction {
             Transaction::PendingTransaction(_) => None,
             Transaction::GenesisTransaction(txn) => Some(txn.info.version.into()),
             Transaction::StateCheckpointTransaction(txn) => Some(txn.info.version.into()),
-            Transaction::ValidatorTransaction(txn) => Some(txn.info.version.into()),
+            Transaction::BlockEpilogueTransaction(txn) => Some(txn.info.version.into()),
+            Transaction::ValidatorTransaction(txn) => Some(txn.transaction_info().version.into()),
         }
     }
 
@@ -210,7 +216,8 @@ impl Transaction {
             Transaction::PendingTransaction(_txn) => false,
             Transaction::GenesisTransaction(txn) => txn.info.success,
             Transaction::StateCheckpointTransaction(txn) => txn.info.success,
-            Transaction::ValidatorTransaction(txn) => txn.info.success,
+            Transaction::BlockEpilogueTransaction(txn) => txn.info.success,
+            Transaction::ValidatorTransaction(txn) => txn.transaction_info().success,
         }
     }
 
@@ -225,7 +232,8 @@ impl Transaction {
             Transaction::PendingTransaction(_txn) => "pending".to_owned(),
             Transaction::GenesisTransaction(txn) => txn.info.vm_status.clone(),
             Transaction::StateCheckpointTransaction(txn) => txn.info.vm_status.clone(),
-            Transaction::ValidatorTransaction(txn) => txn.info.vm_status.clone(),
+            Transaction::BlockEpilogueTransaction(txn) => txn.info.vm_status.clone(),
+            Transaction::ValidatorTransaction(txn) => txn.transaction_info().vm_status.clone(),
         }
     }
 
@@ -236,7 +244,8 @@ impl Transaction {
             Transaction::GenesisTransaction(_) => "genesis_transaction",
             Transaction::BlockMetadataTransaction(_) => "block_metadata_transaction",
             Transaction::StateCheckpointTransaction(_) => "state_checkpoint_transaction",
-            Transaction::ValidatorTransaction(_) => "validator_transaction",
+            Transaction::BlockEpilogueTransaction(_) => "block_epilogue_transaction",
+            Transaction::ValidatorTransaction(vt) => vt.type_str(),
         }
     }
 
@@ -249,7 +258,8 @@ impl Transaction {
             },
             Transaction::GenesisTransaction(txn) => &txn.info,
             Transaction::StateCheckpointTransaction(txn) => &txn.info,
-            Transaction::ValidatorTransaction(txn) => &txn.info,
+            Transaction::BlockEpilogueTransaction(txn) => &txn.info,
+            Transaction::ValidatorTransaction(txn) => txn.transaction_info(),
         })
     }
 }
@@ -282,12 +292,12 @@ impl
             u64,
         ),
     ) -> Self {
-        Transaction::UserTransaction(Box::new(UserTransaction {
+        Transaction::UserTransaction(UserTransaction {
             info,
             request: (txn, payload).into(),
             events,
             timestamp: timestamp.into(),
-        }))
+        })
     }
 }
 
@@ -347,16 +357,6 @@ impl From<(&SignedTransaction, TransactionPayload)> for UserTransactionRequest {
     }
 }
 
-impl From<(TransactionInfo, Vec<Event>, u64)> for Transaction {
-    fn from((info, events, timestamp): (TransactionInfo, Vec<Event>, u64)) -> Self {
-        Transaction::ValidatorTransaction(ValidatorTransaction {
-            info,
-            events,
-            timestamp: timestamp.into(),
-        })
-    }
-}
-
 /// Information related to how a transaction affected the state of the blockchain
 #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Object)]
 pub struct TransactionInfo {
@@ -424,6 +424,24 @@ pub struct StateCheckpointTransaction {
     pub timestamp: U64,
 }
 
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Object)]
+pub struct BlockEndInfo {
+    pub block_gas_limit_reached: bool,
+    pub block_output_limit_reached: bool,
+    pub block_effective_block_gas_units: u64,
+    pub block_approx_output_size: u64,
+}
+
+/// A block epilogue transaction
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Object)]
+pub struct BlockEpilogueTransaction {
+    #[serde(flatten)]
+    #[oai(flatten)]
+    pub info: TransactionInfo,
+    pub timestamp: U64,
+    pub block_end_info: Option<BlockEndInfo>,
+}
+
 /// A request to submit a transaction
 ///
 /// This requires a transaction and a signature of it
@@ -561,13 +579,196 @@ pub struct BlockMetadataTransaction {
     pub timestamp: U64,
 }
 
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Union)]
+#[serde(tag = "validator_transaction_type", rename_all = "snake_case")]
+#[oai(
+    one_of,
+    discriminator_name = "validator_transaction_type",
+    rename_all = "snake_case"
+)]
+pub enum ValidatorTransaction {
+    ObservedJwkUpdate(JWKUpdateTransaction),
+    DkgResult(DKGResultTransaction),
+}
+
+impl ValidatorTransaction {
+    pub fn type_str(&self) -> &'static str {
+        match self {
+            ValidatorTransaction::ObservedJwkUpdate(_) => {
+                "validator_transaction__observed_jwk_update"
+            },
+            ValidatorTransaction::DkgResult(_) => "validator_transaction__dkg_result",
+        }
+    }
+
+    pub fn transaction_info(&self) -> &TransactionInfo {
+        match self {
+            ValidatorTransaction::ObservedJwkUpdate(t) => &t.info,
+            ValidatorTransaction::DkgResult(t) => &t.info,
+        }
+    }
+
+    pub fn transaction_info_mut(&mut self) -> &mut TransactionInfo {
+        match self {
+            ValidatorTransaction::ObservedJwkUpdate(t) => &mut t.info,
+            ValidatorTransaction::DkgResult(t) => &mut t.info,
+        }
+    }
+
+    pub fn timestamp(&self) -> U64 {
+        match self {
+            ValidatorTransaction::ObservedJwkUpdate(t) => t.timestamp,
+            ValidatorTransaction::DkgResult(t) => t.timestamp,
+        }
+    }
+
+    pub fn events(&self) -> &[Event] {
+        match self {
+            ValidatorTransaction::ObservedJwkUpdate(t) => &t.events,
+            ValidatorTransaction::DkgResult(t) => &t.events,
+        }
+    }
+}
+
+impl
+    From<(
+        aptos_types::validator_txn::ValidatorTransaction,
+        TransactionInfo,
+        Vec<Event>,
+        u64,
+    )> for ValidatorTransaction
+{
+    fn from(
+        (txn, info, events, timestamp): (
+            aptos_types::validator_txn::ValidatorTransaction,
+            TransactionInfo,
+            Vec<Event>,
+            u64,
+        ),
+    ) -> Self {
+        match txn {
+            aptos_types::validator_txn::ValidatorTransaction::DKGResult(dkg_transcript) => {
+                Self::DkgResult(DKGResultTransaction {
+                    info,
+                    events,
+                    timestamp: U64::from(timestamp),
+                    dkg_transcript: dkg_transcript.into(),
+                })
+            },
+            aptos_types::validator_txn::ValidatorTransaction::ObservedJWKUpdate(
+                quorum_certified_update,
+            ) => Self::ObservedJwkUpdate(JWKUpdateTransaction {
+                info,
+                events,
+                timestamp: U64::from(timestamp),
+                quorum_certified_update: quorum_certified_update.into(),
+            }),
+        }
+    }
+}
+
 #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Object)]
-pub struct ValidatorTransaction {
+pub struct JWKUpdateTransaction {
     #[serde(flatten)]
     #[oai(flatten)]
     pub info: TransactionInfo,
     pub events: Vec<Event>,
     pub timestamp: U64,
+    pub quorum_certified_update: ExportedQuorumCertifiedUpdate,
+}
+
+/// A more API-friendly representation of the on-chain `aptos_types::jwks::QuorumCertifiedUpdate`.
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Object)]
+pub struct ExportedQuorumCertifiedUpdate {
+    pub update: ExportedProviderJWKs,
+    pub multi_sig: ExportedAggregateSignature,
+}
+
+impl From<QuorumCertifiedUpdate> for ExportedQuorumCertifiedUpdate {
+    fn from(value: QuorumCertifiedUpdate) -> Self {
+        let QuorumCertifiedUpdate { update, multi_sig } = value;
+        Self {
+            update: update.into(),
+            multi_sig: multi_sig.into(),
+        }
+    }
+}
+
+/// A more API-friendly representation of the on-chain `aptos_types::aggregate_signature::AggregateSignature`.
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Object)]
+pub struct ExportedAggregateSignature {
+    pub signer_indices: Vec<usize>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub sig: Option<HexEncodedBytes>,
+}
+
+impl From<AggregateSignature> for ExportedAggregateSignature {
+    fn from(value: AggregateSignature) -> Self {
+        Self {
+            signer_indices: value.get_signers_bitvec().iter_ones().collect(),
+            sig: value
+                .sig()
+                .as_ref()
+                .map(|s| HexEncodedBytes::from(s.to_bytes().to_vec())),
+        }
+    }
+}
+
+/// A more API-friendly representation of the on-chain `aptos_types::jwks::ProviderJWKs`.
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Object)]
+pub struct ExportedProviderJWKs {
+    pub issuer: String,
+    pub version: u64,
+    pub jwks: Vec<JWK>,
+}
+
+impl From<ProviderJWKs> for ExportedProviderJWKs {
+    fn from(value: ProviderJWKs) -> Self {
+        let ProviderJWKs {
+            issuer,
+            version,
+            jwks,
+        } = value;
+        Self {
+            issuer: String::from_utf8(issuer).unwrap_or("non_utf8_issuer".to_string()),
+            version,
+            jwks: jwks.iter().map(|on_chain_jwk|{
+                JWK::try_from(on_chain_jwk).expect("conversion from on-chain representation to human-friendly representation should work")
+            }).collect(),
+        }
+    }
+}
+
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Object)]
+pub struct DKGResultTransaction {
+    #[serde(flatten)]
+    #[oai(flatten)]
+    pub info: TransactionInfo,
+    pub events: Vec<Event>,
+    pub timestamp: U64,
+    pub dkg_transcript: ExportedDKGTranscript,
+}
+
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Object)]
+pub struct ExportedDKGTranscript {
+    pub epoch: U64,
+    pub author: Address,
+    pub payload: HexEncodedBytes,
+}
+
+impl From<DKGTranscript> for ExportedDKGTranscript {
+    fn from(value: DKGTranscript) -> Self {
+        let DKGTranscript {
+            metadata,
+            transcript_bytes,
+        } = value;
+        let DKGTranscriptMetadata { epoch, author } = metadata;
+        Self {
+            epoch: epoch.into(),
+            author: author.into(),
+            payload: HexEncodedBytes::from(transcript_bytes),
+        }
+    }
 }
 
 /// An event from a transaction
@@ -1231,10 +1432,64 @@ impl VerifyInput for KeylessSignature {
 #[serde(tag = "type", rename_all = "snake_case")]
 #[oai(one_of, discriminator_name = "type", rename_all = "snake_case")]
 pub enum Signature {
-    Ed25519(HexEncodedBytes),
-    Secp256k1Ecdsa(HexEncodedBytes),
-    WebAuthn(HexEncodedBytes),
-    Keyless(HexEncodedBytes),
+    Ed25519(Ed25519),
+    Secp256k1Ecdsa(Secp256k1Ecdsa),
+    WebAuthn(WebAuthn),
+    Keyless(Keyless),
+}
+
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Object)]
+pub struct Ed25519 {
+    pub value: HexEncodedBytes,
+}
+
+impl Ed25519 {
+    pub fn new(value: HexEncodedBytes) -> Self {
+        Self { value }
+    }
+}
+
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Object)]
+pub struct Secp256k1Ecdsa {
+    pub value: HexEncodedBytes,
+}
+
+impl Secp256k1Ecdsa {
+    pub fn new(value: HexEncodedBytes) -> Self {
+        Self { value }
+    }
+}
+
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Object)]
+pub struct Secp256r1Ecdsa {
+    pub value: HexEncodedBytes,
+}
+
+impl Secp256r1Ecdsa {
+    pub fn new(value: HexEncodedBytes) -> Self {
+        Self { value }
+    }
+}
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Object)]
+pub struct WebAuthn {
+    pub value: HexEncodedBytes,
+}
+
+impl WebAuthn {
+    pub fn new(value: HexEncodedBytes) -> Self {
+        Self { value }
+    }
+}
+
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Object)]
+pub struct Keyless {
+    pub value: HexEncodedBytes,
+}
+
+impl Keyless {
+    pub fn new(value: HexEncodedBytes) -> Self {
+        Self { value }
+    }
 }
 
 impl TryFrom<Signature> for AnySignature {
@@ -1242,10 +1497,12 @@ impl TryFrom<Signature> for AnySignature {
 
     fn try_from(signature: Signature) -> Result<Self, Self::Error> {
         Ok(match signature {
-            Signature::Ed25519(s) => AnySignature::ed25519(s.inner().try_into()?),
-            Signature::Secp256k1Ecdsa(s) => AnySignature::secp256k1_ecdsa(s.inner().try_into()?),
-            Signature::WebAuthn(s) => AnySignature::webauthn(s.inner().try_into()?),
-            Signature::Keyless(s) => AnySignature::keyless(s.inner().try_into()?),
+            Signature::Ed25519(s) => AnySignature::ed25519(s.value.inner().try_into()?),
+            Signature::Secp256k1Ecdsa(s) => {
+                AnySignature::secp256k1_ecdsa(s.value.inner().try_into()?)
+            },
+            Signature::WebAuthn(s) => AnySignature::webauthn(s.value.inner().try_into()?),
+            Signature::Keyless(s) => AnySignature::keyless(s.value.inner().try_into()?),
         })
     }
 }
@@ -1254,15 +1511,17 @@ impl From<AnySignature> for Signature {
     fn from(signature: AnySignature) -> Self {
         match signature {
             AnySignature::Ed25519 { signature } => {
-                Signature::Ed25519(signature.to_bytes().to_vec().into())
+                Signature::Ed25519(Ed25519::new(signature.to_bytes().to_vec().into()))
             },
             AnySignature::Secp256k1Ecdsa { signature } => {
-                Signature::Secp256k1Ecdsa(signature.to_bytes().to_vec().into())
+                Signature::Secp256k1Ecdsa(Secp256k1Ecdsa::new(signature.to_bytes().to_vec().into()))
             },
             AnySignature::WebAuthn { signature } => {
-                Signature::WebAuthn(signature.to_bytes().to_vec().into())
+                Signature::WebAuthn(WebAuthn::new(signature.to_bytes().to_vec().into()))
+            },
+            AnySignature::Keyless { signature } => {
+                Signature::Keyless(Keyless::new(signature.to_bytes().into()))
             },
-            AnySignature::Keyless { signature } => Signature::Keyless(signature.to_bytes().into()),
         }
     }
 }
@@ -1271,10 +1530,10 @@ impl From<AnySignature> for Signature {
 #[serde(tag = "type", rename_all = "snake_case")]
 #[oai(one_of, discriminator_name = "type", rename_all = "snake_case")]
 pub enum PublicKey {
-    Ed25519(HexEncodedBytes),
-    Secp256k1Ecdsa(HexEncodedBytes),
-    Secp256r1Ecdsa(HexEncodedBytes),
-    Keyless(HexEncodedBytes),
+    Ed25519(Ed25519),
+    Secp256k1Ecdsa(Secp256k1Ecdsa),
+    Secp256r1Ecdsa(Secp256r1Ecdsa),
+    Keyless(Keyless),
 }
 
 impl TryFrom<PublicKey> for AnyPublicKey {
@@ -1282,10 +1541,14 @@ impl TryFrom<PublicKey> for AnyPublicKey {
 
     fn try_from(public_key: PublicKey) -> Result<Self, Self::Error> {
         Ok(match public_key {
-            PublicKey::Ed25519(p) => AnyPublicKey::ed25519(p.inner().try_into()?),
-            PublicKey::Secp256k1Ecdsa(p) => AnyPublicKey::secp256k1_ecdsa(p.inner().try_into()?),
-            PublicKey::Secp256r1Ecdsa(p) => AnyPublicKey::secp256r1_ecdsa(p.inner().try_into()?),
-            PublicKey::Keyless(p) => AnyPublicKey::keyless(p.inner().try_into()?),
+            PublicKey::Ed25519(p) => AnyPublicKey::ed25519(p.value.inner().try_into()?),
+            PublicKey::Secp256k1Ecdsa(p) => {
+                AnyPublicKey::secp256k1_ecdsa(p.value.inner().try_into()?)
+            },
+            PublicKey::Secp256r1Ecdsa(p) => {
+                AnyPublicKey::secp256r1_ecdsa(p.value.inner().try_into()?)
+            },
+            PublicKey::Keyless(p) => AnyPublicKey::keyless(p.value.inner().try_into()?),
         })
     }
 }
@@ -1294,16 +1557,16 @@ impl From<AnyPublicKey> for PublicKey {
     fn from(key: AnyPublicKey) -> Self {
         match key {
             AnyPublicKey::Ed25519 { public_key } => {
-                PublicKey::Ed25519(public_key.to_bytes().to_vec().into())
-            },
-            AnyPublicKey::Secp256k1Ecdsa { public_key } => {
-                PublicKey::Secp256k1Ecdsa(public_key.to_bytes().to_vec().into())
-            },
-            AnyPublicKey::Secp256r1Ecdsa { public_key } => {
-                PublicKey::Secp256r1Ecdsa(public_key.to_bytes().to_vec().into())
+                PublicKey::Ed25519(Ed25519::new(public_key.to_bytes().to_vec().into()))
             },
+            AnyPublicKey::Secp256k1Ecdsa { public_key } => PublicKey::Secp256k1Ecdsa(
+                Secp256k1Ecdsa::new(public_key.to_bytes().to_vec().into()),
+            ),
+            AnyPublicKey::Secp256r1Ecdsa { public_key } => PublicKey::Secp256r1Ecdsa(
+                Secp256r1Ecdsa::new(public_key.to_bytes().to_vec().into()),
+            ),
             AnyPublicKey::Keyless { public_key } => {
-                PublicKey::Keyless(public_key.to_bytes().into())
+                PublicKey::Keyless(Keyless::new(public_key.to_bytes().into()))
             },
         }
     }
@@ -1320,25 +1583,25 @@ impl VerifyInput for SingleKeySignature {
     fn verify(&self) -> anyhow::Result<()> {
         match (&self.public_key, &self.signature) {
             (PublicKey::Ed25519(p), Signature::Ed25519(s)) => Ed25519Signature {
-                public_key: p.clone(),
-                signature: s.clone(),
+                public_key: p.value.clone(),
+                signature: s.value.clone(),
             }
             .verify(),
             (PublicKey::Secp256k1Ecdsa(p), Signature::Secp256k1Ecdsa(s)) => {
                 Secp256k1EcdsaSignature {
-                    public_key: p.clone(),
-                    signature: s.clone(),
+                    public_key: p.value.clone(),
+                    signature: s.value.clone(),
                 }
                 .verify()
             },
             (PublicKey::Secp256r1Ecdsa(p), Signature::WebAuthn(s)) => WebAuthnSignature {
-                public_key: p.clone(),
-                signature: s.clone(),
+                public_key: p.value.clone(),
+                signature: s.value.clone(),
             }
             .verify(),
             (PublicKey::Keyless(p), Signature::Keyless(s)) => KeylessSignature {
-                public_key: p.clone(),
-                signature: s.clone(),
+                public_key: p.value.clone(),
+                signature: s.value.clone(),
             }
             .verify(),
             _ => bail!("Invalid public key, signature match."),
@@ -1362,26 +1625,26 @@ impl TryFrom<SingleKeySignature> for AccountAuthenticator {
         let key =
             match value.public_key {
                 PublicKey::Ed25519(p) => {
-                    let key = p
-                        .inner()
-                        .try_into()
-                        .context("Failed to parse given public_key bytes as Ed25519PublicKey")?;
+                    let key =
+                        p.value.inner().try_into().context(
+                            "Failed to parse given public_key bytes as Ed25519PublicKey",
+                        )?;
                     AnyPublicKey::ed25519(key)
                 },
                 PublicKey::Secp256k1Ecdsa(p) => {
-                    let key = p.inner().try_into().context(
+                    let key = p.value.inner().try_into().context(
                         "Failed to parse given public_key bytes as Secp256k1EcdsaPublicKey",
                     )?;
                     AnyPublicKey::secp256k1_ecdsa(key)
                 },
                 PublicKey::Secp256r1Ecdsa(p) => {
-                    let key = p.inner().try_into().context(
+                    let key = p.value.inner().try_into().context(
                         "Failed to parse given public_key bytes as Secp256r1EcdsaPublicKey",
                     )?;
                     AnyPublicKey::secp256r1_ecdsa(key)
                 },
                 PublicKey::Keyless(p) => {
-                    let key = p.inner().try_into().context(
+                    let key = p.value.inner().try_into().context(
                         "Failed to parse given public_key bytes as AnyPublicKey::Keyless",
                     )?;
                     AnyPublicKey::keyless(key)
@@ -1391,30 +1654,32 @@ impl TryFrom<SingleKeySignature> for AccountAuthenticator {
         let signature = match value.signature {
             Signature::Ed25519(s) => {
                 let signature = s
+                    .value
                     .inner()
                     .try_into()
                     .context("Failed to parse given signature bytes as Ed25519Signature")?;
                 AnySignature::ed25519(signature)
             },
             Signature::Secp256k1Ecdsa(s) => {
-                let signature = s
-                    .inner()
-                    .try_into()
-                    .context("Failed to parse given signature bytes as Secp256k1EcdsaSignature")?;
+                let signature =
+                    s.value.inner().try_into().context(
+                        "Failed to parse given signature bytes as Secp256k1EcdsaSignature",
+                    )?;
                 AnySignature::secp256k1_ecdsa(signature)
             },
             Signature::WebAuthn(s) => {
                 let signature = s
+                    .value
                     .inner()
                     .try_into()
                     .context( "Failed to parse given signature bytes as PartialAuthenticatorAssertionResponse")?;
                 AnySignature::webauthn(signature)
             },
             Signature::Keyless(s) => {
-                let signature = s
-                    .inner()
-                    .try_into()
-                    .context("Failed to parse given signature bytes as AnySignature::Keyless")?;
+                let signature =
+                    s.value.inner().try_into().context(
+                        "Failed to parse given signature bytes as AnySignature::Keyless",
+                    )?;
                 AnySignature::keyless(signature)
             },
         };
@@ -1462,26 +1727,26 @@ impl TryFrom<MultiKeySignature> for AccountAuthenticator {
         for public_key in value.public_keys {
             let key = match public_key {
                 PublicKey::Ed25519(p) => {
-                    let key = p
-                        .inner()
-                        .try_into()
-                        .context("Failed to parse given public_key bytes as Ed25519PublicKey")?;
+                    let key =
+                        p.value.inner().try_into().context(
+                            "Failed to parse given public_key bytes as Ed25519PublicKey",
+                        )?;
                     AnyPublicKey::ed25519(key)
                 },
                 PublicKey::Secp256k1Ecdsa(p) => {
-                    let key = p.inner().try_into().context(
+                    let key = p.value.inner().try_into().context(
                         "Failed to parse given public_key bytes as Secp256k1EcdsaPublicKey",
                     )?;
                     AnyPublicKey::secp256k1_ecdsa(key)
                 },
                 PublicKey::Secp256r1Ecdsa(p) => {
-                    let key = p.inner().try_into().context(
+                    let key = p.value.inner().try_into().context(
                         "Failed to parse given public_key bytes as Secp256r1EcdsaPublicKey",
                     )?;
                     AnyPublicKey::secp256r1_ecdsa(key)
                 },
                 PublicKey::Keyless(p) => {
-                    let key = p.inner().try_into().context(
+                    let key = p.value.inner().try_into().context(
                         "Failed to parse given public_key bytes as AnyPublicKey::Keyless",
                     )?;
                     AnyPublicKey::keyless(key)
@@ -1495,28 +1760,28 @@ impl TryFrom<MultiKeySignature> for AccountAuthenticator {
             let signature =
                 match indexed_signature.signature {
                     Signature::Ed25519(s) => {
-                        let signature = s.inner().try_into().context(
+                        let signature = s.value.inner().try_into().context(
                             "Failed to parse given public_key bytes as Ed25519Signature",
                         )?;
                         AnySignature::ed25519(signature)
                     },
                     Signature::Secp256k1Ecdsa(s) => {
-                        let signature = s.inner().try_into().context(
+                        let signature = s.value.inner().try_into().context(
                             "Failed to parse given signature as Secp256k1EcdsaSignature",
                         )?;
                         AnySignature::secp256k1_ecdsa(signature)
                     },
                     Signature::WebAuthn(s) => {
-                        let paar = s.inner().try_into().context(
+                        let paar = s.value.inner().try_into().context(
                         "Failed to parse given signature as PartialAuthenticatorAssertionResponse",
                     )?;
                         AnySignature::webauthn(paar)
                     },
                     Signature::Keyless(s) => {
-                        let signature = s
-                            .inner()
-                            .try_into()
-                            .context("Failed to parse given signature as AnySignature::Keyless")?;
+                        let signature =
+                            s.value.inner().try_into().context(
+                                "Failed to parse given signature as AnySignature::Keyless",
+                            )?;
                         AnySignature::keyless(signature)
                     },
                 };
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-aggregator/src/delayed_field_extension.rs b/aptos-move/aptos-aggregator/src/delayed_field_extension.rs
index bd696d489fe17..9a67226fc335b 100644
--- a/aptos-move/aptos-aggregator/src/delayed_field_extension.rs
+++ b/aptos-move/aptos-aggregator/src/delayed_field_extension.rs
@@ -41,6 +41,17 @@ impl DelayedFieldData {
         max_value: u128,
         input: SignedU128,
         resolver: &dyn DelayedFieldResolver,
+    ) -> PartialVMResult<bool> {
+        self.try_add_or_check_delta(id, max_value, input, resolver, true)
+    }
+
+    pub fn try_add_or_check_delta(
+        &mut self,
+        id: DelayedFieldID,
+        max_value: u128,
+        input: SignedU128,
+        resolver: &dyn DelayedFieldResolver,
+        apply_delta: bool,
     ) -> PartialVMResult<bool> {
         // No need to record or check or try, if input value exceeds the bound.
         if input.abs() > max_value {
@@ -55,7 +66,7 @@ impl DelayedFieldData {
                     &input,
                     max_value,
                 )?;
-                if result {
+                if result && apply_delta {
                     entry.insert(DelayedChange::Apply(DelayedApplyChange::AggregatorDelta {
                         delta: DeltaWithMax::new(input, max_value),
                     }));
@@ -68,7 +79,9 @@ impl DelayedFieldData {
                     DelayedChange::Create(DelayedFieldValue::Aggregator(value)) => {
                         match math.unsigned_add_delta(*value, &input) {
                             Ok(new_value) => {
-                                *value = new_value;
+                                if apply_delta {
+                                    *value = new_value;
+                                }
                                 Ok(true)
                             },
                             Err(_) => Ok(false),
@@ -83,7 +96,7 @@ impl DelayedFieldData {
                             &input,
                             previous_delta.max_value,
                         )?;
-                        if result {
+                        if result && apply_delta {
                             *previous_delta = expect_ok(DeltaWithMax::create_merged_delta(
                                 previous_delta,
                                 &DeltaWithMax::new(input, max_value),
@@ -308,7 +321,7 @@ impl DelayedFieldData {
 mod test {
     use super::*;
     use crate::FakeAggregatorView;
-    use claims::{assert_err, assert_ok, assert_ok_eq};
+    use claims::{assert_err, assert_none, assert_ok_eq};
 
     #[test]
     fn test_aggregator_not_in_storage() {
@@ -342,28 +355,53 @@ mod test {
             get_agg(&data, &id),
             &DelayedChange::<DelayedFieldID>::Create(DelayedFieldValue::Aggregator(0))
         );
-        assert_ok!(data.try_add_delta(id, max_value, SignedU128::Positive(100), &resolver));
+        assert_ok_eq!(
+            data.try_add_or_check_delta(id, max_value, SignedU128::Positive(100), &resolver, false),
+            true
+        );
+        assert_eq!(
+            get_agg(&data, &id),
+            &DelayedChange::<DelayedFieldID>::Create(DelayedFieldValue::Aggregator(0))
+        );
+
+        assert_ok_eq!(
+            data.try_add_delta(id, max_value, SignedU128::Positive(100), &resolver),
+            true
+        );
+        assert_eq!(
+            get_agg(&data, &id),
+            &DelayedChange::<DelayedFieldID>::Create(DelayedFieldValue::Aggregator(100))
+        );
+
+        assert_ok_eq!(
+            data.try_add_or_check_delta(id, max_value, SignedU128::Positive(120), &resolver, false),
+            false
+        );
         assert_eq!(
             get_agg(&data, &id),
             &DelayedChange::<DelayedFieldID>::Create(DelayedFieldValue::Aggregator(100))
         );
-        assert!(data
-            .try_add_delta(id, max_value, SignedU128::Negative(50), &resolver)
-            .unwrap());
+
+        assert_ok_eq!(
+            data.try_add_delta(id, max_value, SignedU128::Negative(50), &resolver),
+            true
+        );
         assert_eq!(
             get_agg(&data, &id),
             &DelayedChange::<DelayedFieldID>::Create(DelayedFieldValue::Aggregator(50))
         );
-        assert!(!data
-            .try_add_delta(id, max_value, SignedU128::Negative(70), &resolver)
-            .unwrap());
+        assert_ok_eq!(
+            data.try_add_delta(id, max_value, SignedU128::Negative(70), &resolver),
+            false
+        );
         assert_eq!(
             get_agg(&data, &id),
             &DelayedChange::<DelayedFieldID>::Create(DelayedFieldValue::Aggregator(50))
         );
-        assert!(!data
-            .try_add_delta(id, max_value, SignedU128::Positive(170), &resolver)
-            .unwrap());
+        assert_ok_eq!(
+            data.try_add_delta(id, max_value, SignedU128::Positive(170), &resolver),
+            false
+        );
         assert_eq!(
             get_agg(&data, &id),
             &DelayedChange::Create(DelayedFieldValue::Aggregator(50))
@@ -393,6 +431,20 @@ mod test {
 
         resolver.set_from_aggregator_id(id, 100);
 
+        assert_ok_eq!(
+            data.try_add_or_check_delta(id, max_value, SignedU128::Positive(400), &resolver, false),
+            true
+        );
+        // checks only add to captured reads, not to writes
+        assert_none!(data.delayed_fields.get(&id));
+
+        assert_ok_eq!(
+            data.try_add_or_check_delta(id, max_value, SignedU128::Positive(550), &resolver, false),
+            false
+        );
+        // checks only add to captured reads, not to writes
+        assert_none!(data.delayed_fields.get(&id));
+
         assert_ok_eq!(
             data.try_add_delta(id, max_value, SignedU128::Positive(400), &resolver),
             true
@@ -401,6 +453,16 @@ mod test {
             get_agg(&data, &id),
             &aggregator_delta_change(400, max_value)
         );
+
+        assert_ok_eq!(
+            data.try_add_or_check_delta(id, max_value, SignedU128::Negative(100), &resolver, false),
+            true
+        );
+        assert_eq!(
+            get_agg(&data, &id),
+            &aggregator_delta_change(400, max_value)
+        );
+
         assert_ok_eq!(
             data.try_add_delta(id, max_value, SignedU128::Negative(470), &resolver),
             true
diff --git a/aptos-move/aptos-aggregator/src/delta_change_set.rs b/aptos-move/aptos-aggregator/src/delta_change_set.rs
index 06422fb82ef79..a1bea4eb752e3 100644
--- a/aptos-move/aptos-aggregator/src/delta_change_set.rs
+++ b/aptos-move/aptos-aggregator/src/delta_change_set.rs
@@ -513,10 +513,6 @@ mod test {
         type ResourceGroupTag = ();
         type ResourceKey = ();
 
-        fn is_delayed_field_optimization_capable(&self) -> bool {
-            unimplemented!("Irrelevant for the test")
-        }
-
         fn get_delayed_field_value(
             &self,
             _id: &Self::Identifier,
diff --git a/aptos-move/aptos-aggregator/src/resolver.rs b/aptos-move/aptos-aggregator/src/resolver.rs
index 1268758ac56aa..c15c6542f0517 100644
--- a/aptos-move/aptos-aggregator/src/resolver.rs
+++ b/aptos-move/aptos-aggregator/src/resolver.rs
@@ -140,8 +140,6 @@ pub trait TDelayedFieldView {
     type ResourceKey;
     type ResourceGroupTag;
 
-    fn is_delayed_field_optimization_capable(&self) -> bool;
-
     /// Fetch a value of a DelayedField.
     fn get_delayed_field_value(
         &self,
@@ -228,11 +226,6 @@ where
     type ResourceGroupTag = StructTag;
     type ResourceKey = StateKey;
 
-    fn is_delayed_field_optimization_capable(&self) -> bool {
-        // For resolvers that are not capable, it cannot be enabled
-        false
-    }
-
     fn get_delayed_field_value(
         &self,
         _id: &Self::Identifier,
diff --git a/aptos-move/aptos-aggregator/src/tests/types.rs b/aptos-move/aptos-aggregator/src/tests/types.rs
index c923f4871d4f2..6cae8d5d36fc3 100644
--- a/aptos-move/aptos-aggregator/src/tests/types.rs
+++ b/aptos-move/aptos-aggregator/src/tests/types.rs
@@ -86,10 +86,6 @@ impl TDelayedFieldView for FakeAggregatorView {
     type ResourceGroupTag = StructTag;
     type ResourceKey = StateKey;
 
-    fn is_delayed_field_optimization_capable(&self) -> bool {
-        true
-    }
-
     fn get_delayed_field_value(
         &self,
         id: &Self::Identifier,
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 c3456a1979dc0..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<dyn AptosValidatorInterface + Send>,
@@ -45,31 +55,50 @@ impl AptosDebugger {
         version: Version,
         txns: Vec<Transaction>,
         repeat_execution_times: u64,
+        concurrency_levels: &[usize],
     ) -> Result<Vec<TransactionOutput>> {
         let sig_verified_txns: Vec<SignatureVerifiedTransaction> =
             txns.into_iter().map(|x| x.into()).collect::<Vec<_>>();
         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)
     }
 
@@ -84,18 +113,14 @@ impl AptosDebugger {
             .check_signature()
             .map_err(|err| format_err!("Unexpected VM Error: {:?}", err))?;
 
-        // TODO(Gas): revisit this.
-        let resolver = state_view.as_move_resolver();
-        let vm = AptosVM::new(
-            &resolver,
-            /*override_is_delayed_field_optimization_capable=*/ Some(false),
-        );
-
         // Module bundle is deprecated!
         if let TransactionPayload::ModuleBundle(_) = txn.payload() {
-            anyhow::bail!("Module bundle payload has been removed")
+            bail!("Module bundle payload has been removed")
         }
 
+        let vm = AptosVM::new(&state_view);
+        let resolver = state_view.as_move_resolver();
+
         let (status, output, gas_profiler) = vm.execute_user_transaction_with_modified_gas_meter(
             &resolver,
             &txn,
@@ -125,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<Vec<TransactionOutput>> {
-        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::<Vec<_>>();
-            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(
@@ -190,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<Transaction>,
         repeat_execution_times: u64,
+        concurrency_levels: &[usize],
     ) -> Result<Vec<TransactionOutput>> {
-        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;
 
@@ -212,8 +249,76 @@ impl AptosDebugger {
         Ok(ret)
     }
 
-    pub async fn get_latest_version(&self) -> Result<Version> {
-        self.debugger.get_latest_version().await
+    async fn execute_transactions_by_epoch(
+        &self,
+        mut limit: u64,
+        mut begin: u64,
+        mut txns: Vec<Transaction>,
+        repeat_execution_times: u64,
+        concurrency_levels: &[usize],
+        mut txn_infos: Vec<TransactionInfo>,
+    ) -> Result<Vec<TransactionOutput>> {
+        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::<Vec<_>>();
+            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<Transaction>,
+        repeat_execution_times: u64,
+        concurrency_levels: &[usize],
+    ) -> Result<Vec<TransactionOutput>> {
+        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(
@@ -245,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::<Vec<_>>();
+    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::<Vec<_>>();
+    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
@@ -252,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<Vec<TransactionOutput>, VMStatus> {
+    BlockAptosVM::execute_block::<_, NoOpTransactionCommitHook<AptosTransactionOutput, VMStatus>>(
+        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<usize>,
 }
 
 #[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<u64>,
+
+    #[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/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<FakeDataStore>,
     data_read_state_keys: Option<Arc<Mutex<HashMap<StateKey, StateValue>>>>,
 }
-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..27838857b47e7 100644
--- a/aptos-move/aptos-e2e-comparison-testing/src/execution.rs
+++ b/aptos-move/aptos-e2e-comparison-testing/src/execution.rs
@@ -12,20 +12,19 @@ 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_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<PackageInfo, HashMap<ModuleId, Vec<u8>>>,
 ) {
@@ -34,12 +33,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<PackageInfo, HashMap<ModuleId, Vec<u8>>>,
 ) {
     for package in APTOS_PACKAGES {
@@ -48,7 +47,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);
     }
 }
 
@@ -270,9 +269,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 +299,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 +309,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 +318,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 +340,44 @@ impl Execution {
     fn execute_code(
         &self,
         version: Version,
-        state: FakeDataStore,
+        mut state: FakeDataStore,
         package_info: &PackageInfo,
         txn: &Transaction,
         compiled_package_cache: &HashMap<PackageInfo, HashMap<ModuleId, Vec<u8>>>,
         debugger_opt: Option<Arc<dyn AptosValidatorInterface + Send>>,
         v2_flag: bool,
-    ) -> Option<Result<(WriteSet, Vec<ContractEvent>), 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<ContractEvent>), 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-e2e-comparison-testing/src/lib.rs b/aptos-move/aptos-e2e-comparison-testing/src/lib.rs
index 9f672e517acc8..83dbfb1af3613 100644
--- a/aptos-move/aptos-e2e-comparison-testing/src/lib.rs
+++ b/aptos-move/aptos-e2e-comparison-testing/src/lib.rs
@@ -72,11 +72,7 @@ impl IndexWriter {
             let file = if !path.exists() {
                 File::create(path).expect("Error encountered while creating file!")
             } else {
-                OpenOptions::new()
-                    .write(true)
-                    .append(true)
-                    .open(path)
-                    .unwrap()
+                OpenOptions::new().append(true).open(path).unwrap()
             };
             file
         };
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 13efaa69f2f43..c15a243cac0f7 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/aptos_framework.rs b/aptos-move/aptos-gas-schedule/src/gas_schedule/aptos_framework.rs
index f5fe106bf2b75..801d44b6992c5 100644
--- a/aptos-move/aptos-gas-schedule/src/gas_schedule/aptos_framework.rs
+++ b/aptos-move/aptos-gas-schedule/src/gas_schedule/aptos_framework.rs
@@ -3,7 +3,11 @@
 
 //! This module defines the gas parameters for Aptos Framework & Stdlib.
 
-use crate::{gas_schedule::NativeGasParameters, ver::gas_feature_versions::RELEASE_V1_12};
+use crate::{
+    gas_feature_versions::{RELEASE_V1_14, RELEASE_V1_8, RELEASE_V1_9_SKIPPED},
+    gas_schedule::NativeGasParameters,
+    ver::gas_feature_versions::{RELEASE_V1_12, RELEASE_V1_13},
+};
 use aptos_gas_algebra::{
     InternalGas, InternalGasPerAbstractValueUnit, InternalGasPerArg, InternalGasPerByte,
 };
@@ -242,11 +246,11 @@ crate::gas_schedule::macros::define_gas_parameters!(
         [type_info_chain_id_base: InternalGas, { 4.. => "type_info.chain_id.base" }, 551],
 
         // TODO(Gas): Fix my cost
-        [function_info_check_is_identifier_base: InternalGas, { RELEASE_V1_12.. => "function_info.is_identifier.base" }, 551],
-        [function_info_check_is_identifier_per_byte: InternalGasPerByte, { RELEASE_V1_12.. => "function_info.is_identifier.per_byte" }, 3],
-        [function_info_check_dispatch_type_compatibility_impl_base: InternalGas, { RELEASE_V1_12.. => "function_info.check_dispatch_type_compatibility_impl.base" }, 1002],
-        [function_info_load_function_base: InternalGas, { RELEASE_V1_12.. => "function_info.load_function.base" }, 551],
-        [dispatchable_fungible_asset_dispatch_base: InternalGas, { RELEASE_V1_12.. => "dispatchable_fungible_asset.dispatch.base" }, 551],
+        [function_info_check_is_identifier_base: InternalGas, { RELEASE_V1_13.. => "function_info.is_identifier.base" }, 551],
+        [function_info_check_is_identifier_per_byte: InternalGasPerByte, { RELEASE_V1_13.. => "function_info.is_identifier.per_byte" }, 3],
+        [function_info_check_dispatch_type_compatibility_impl_base: InternalGas, { RELEASE_V1_13.. => "function_info.check_dispatch_type_compatibility_impl.base" }, 1002],
+        [function_info_load_function_base: InternalGas, { RELEASE_V1_13.. => "function_info.load_function.base" }, 551],
+        [dispatchable_fungible_asset_dispatch_base: InternalGas, { RELEASE_V1_13.. => "dispatchable_fungible_asset.dispatch.base" }, 551],
 
         // Reusing SHA2-512's cost from Ristretto
         [hash_sha2_512_base: InternalGas, { 4.. => "hash.sha2_512.base" }, 11910],  // 3_240 * 20
@@ -294,18 +298,20 @@ crate::gas_schedule::macros::define_gas_parameters!(
         [aggregator_destroy_base: InternalGas, "aggregator.destroy.base", 1838],
         [aggregator_factory_new_aggregator_base: InternalGas, "aggregator_factory.new_aggregator.base", 1838],
 
-        [aggregator_v2_create_aggregator_base: InternalGas, {12.. => "aggregator_v2.create_aggregator.base"}, 1838],
-        [aggregator_v2_try_add_base: InternalGas, {12.. => "aggregator_v2.try_add.base"}, 1102],
-        [aggregator_v2_try_sub_base: InternalGas, {12.. => "aggregator_v2.try_sub.base"}, 1102],
-        [aggregator_v2_read_base: InternalGas, {12.. => "aggregator_v2.read.base"}, 2205],
-        [aggregator_v2_snapshot_base: InternalGas, {12.. => "aggregator_v2.snapshot.base"}, 1102],
-
-        [aggregator_v2_create_snapshot_base: InternalGas, {11.. => "aggregator_v2.create_snapshot.base"}, 1102],
-        [aggregator_v2_create_snapshot_per_byte: InternalGasPerByte, { 12.. =>"aggregator_v2.create_snapshot.per_byte" }, 3],
-        [aggregator_v2_copy_snapshot_base: InternalGas, {11.. => "aggregator_v2.copy_snapshot.base"}, 1102],
-        [aggregator_v2_read_snapshot_base: InternalGas, {11.. => "aggregator_v2.read_snapshot.base"}, 2205],
-        [aggregator_v2_string_concat_base: InternalGas, {11.. => "aggregator_v2.string_concat.base"}, 1102],
-        [aggregator_v2_string_concat_per_byte: InternalGasPerByte, { 12.. =>"aggregator_v2.string_concat.per_byte" }, 3],
+        [aggregator_v2_create_aggregator_base: InternalGas, {RELEASE_V1_9_SKIPPED.. => "aggregator_v2.create_aggregator.base"}, 1838],
+        [aggregator_v2_try_add_base: InternalGas, {RELEASE_V1_9_SKIPPED.. => "aggregator_v2.try_add.base"}, 1102],
+        [aggregator_v2_try_sub_base: InternalGas, {RELEASE_V1_9_SKIPPED.. => "aggregator_v2.try_sub.base"}, 1102],
+        [aggregator_v2_is_at_least_base: InternalGas, {RELEASE_V1_14.. => "aggregator_v2.is_at_least.base"}, 500],
+
+        [aggregator_v2_read_base: InternalGas, {RELEASE_V1_9_SKIPPED.. => "aggregator_v2.read.base"}, 2205],
+        [aggregator_v2_snapshot_base: InternalGas, {RELEASE_V1_9_SKIPPED.. => "aggregator_v2.snapshot.base"}, 1102],
+
+        [aggregator_v2_create_snapshot_base: InternalGas, {RELEASE_V1_8.. => "aggregator_v2.create_snapshot.base"}, 1102],
+        [aggregator_v2_create_snapshot_per_byte: InternalGasPerByte, { RELEASE_V1_9_SKIPPED.. =>"aggregator_v2.create_snapshot.per_byte" }, 3],
+        [aggregator_v2_copy_snapshot_base: InternalGas, {RELEASE_V1_8.. => "aggregator_v2.copy_snapshot.base"}, 1102],
+        [aggregator_v2_read_snapshot_base: InternalGas, {RELEASE_V1_8.. => "aggregator_v2.read_snapshot.base"}, 2205],
+        [aggregator_v2_string_concat_base: InternalGas, {RELEASE_V1_8.. => "aggregator_v2.string_concat.base"}, 1102],
+        [aggregator_v2_string_concat_per_byte: InternalGasPerByte, { RELEASE_V1_9_SKIPPED.. =>"aggregator_v2.string_concat.per_byte" }, 3],
 
         [object_exists_at_base: InternalGas, { 7.. => "object.exists_at.base" }, 919],
         // Based on SHA3-256's cost
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..26557162fb157 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/gas_schedule/transaction.rs b/aptos-move/aptos-gas-schedule/src/gas_schedule/transaction.rs
index a824e5043c6f8..5c51fa9ee314b 100644
--- a/aptos-move/aptos-gas-schedule/src/gas_schedule/transaction.rs
+++ b/aptos-move/aptos-gas-schedule/src/gas_schedule/transaction.rs
@@ -6,11 +6,11 @@
 
 use crate::{
     gas_schedule::VMGasParameters,
-    ver::gas_feature_versions::{RELEASE_V1_11, RELEASE_V1_12, RELEASE_V1_13},
+    ver::gas_feature_versions::{RELEASE_V1_11, RELEASE_V1_12, RELEASE_V1_13, RELEASE_V1_15},
 };
 use aptos_gas_algebra::{
     AbstractValueSize, Fee, FeePerByte, FeePerGasUnit, FeePerSlot, Gas, GasExpression,
-    GasScalingFactor, GasUnit, NumModules, NumSlots,
+    GasScalingFactor, GasUnit, NumModules, NumSlots, NumTypeNodes,
 };
 use move_core_types::gas_algebra::{
     InternalGas, InternalGasPerArg, InternalGasPerByte, InternalGasUnit, NumBytes, ToUnitWithParams,
@@ -257,7 +257,17 @@ crate::gas_schedule::macros::define_gas_parameters!(
         [
             keyless_base_cost: InternalGas,
             { RELEASE_V1_12.. => "keyless.base" },
-            414_000_000,
+            32_000_000,
+        ],
+        [
+            max_ty_size: NumTypeNodes,
+            { RELEASE_V1_15.. => "max_ty_size" },
+            128,
+        ],
+        [
+            max_ty_depth: NumTypeNodes,
+            { RELEASE_V1_15.. => "max_ty_depth" },
+            20,
         ]
     ]
 );
diff --git a/aptos-move/aptos-gas-schedule/src/ver.rs b/aptos-move/aptos-gas-schedule/src/ver.rs
index fa1afc6d90fb1..f8b5d7617151c 100644
--- a/aptos-move/aptos-gas-schedule/src/ver.rs
+++ b/aptos-move/aptos-gas-schedule/src/ver.rs
@@ -8,8 +8,18 @@
 ///   - 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
+///   - Limits for bounding MoveVM type sizes
+/// - V19
+///   - Gas for aggregator_v2::is_at_least native function
 /// - V18
 ///   - Separate limits for governance scripts
+///   - Function info & dispatchable token gas params
 /// - V17
 ///   - Gas for keyless
 /// - V16
@@ -24,6 +34,7 @@
 /// - V12
 ///   - Added BN254 operations.
 ///   - IO gas change: 1. read bytes charged at 4KB intervals; 2. ignore free_write_bytes_quota
+///   - aggregator v2 gas charges
 /// - V11
 ///   - Ristretto255 natives (point cloning & double-scalar multiplication) and Bulletproofs natives
 ///   - Hard limit on the number of write ops per transaction
@@ -58,11 +69,21 @@
 ///       global operations.
 /// - V1
 ///   - TBA
-pub const LATEST_GAS_FEATURE_VERSION: u64 = 18;
+pub const LATEST_GAS_FEATURE_VERSION: u64 = gas_feature_versions::RELEASE_V1_18;
 
-#[allow(dead_code)]
 pub mod gas_feature_versions {
+    pub const RELEASE_V1_8: u64 = 11;
+    pub const RELEASE_V1_9_SKIPPED: u64 = 12;
+    pub const RELEASE_V1_9: u64 = 13;
+    pub const RELEASE_V1_10: u64 = 15;
     pub const RELEASE_V1_11: u64 = 16;
     pub const RELEASE_V1_12: u64 = 17;
     pub const RELEASE_V1_13: u64 = 18;
+    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-native-interface/src/builder.rs b/aptos-move/aptos-native-interface/src/builder.rs
index 6df3a3a40a9cc..140d9fbecc12d 100644
--- a/aptos-move/aptos-native-interface/src/builder.rs
+++ b/aptos-move/aptos-native-interface/src/builder.rs
@@ -45,6 +45,7 @@ impl SafeNativeBuilder {
         misc_gas_params: MiscGasParameters,
         timed_features: TimedFeatures,
         features: Features,
+        gas_hook: Option<Arc<dyn Fn(DynamicExpression) + Send + Sync>>,
     ) -> Self {
         Self {
             data: Arc::new(SharedData {
@@ -55,17 +56,10 @@ impl SafeNativeBuilder {
                 features,
             }),
             enable_incremental_gas_charging: true,
-            gas_hook: None,
+            gas_hook,
         }
     }
 
-    pub fn set_gas_hook<F>(&mut self, action: F)
-    where
-        F: Fn(DynamicExpression) + Send + Sync + 'static,
-    {
-        self.gas_hook = Some(Arc::new(action));
-    }
-
     /// Controls the default incremental gas charging behavior of the natives created from this builder.
     ///
     /// See [`SafeNativeContext::set_incremental_gas_charging()`] for details.
diff --git a/aptos-move/aptos-native-interface/src/context.rs b/aptos-move/aptos-native-interface/src/context.rs
index a3e445f423488..1e4b116b748cd 100644
--- a/aptos-move/aptos-native-interface/src/context.rs
+++ b/aptos-move/aptos-native-interface/src/context.rs
@@ -118,14 +118,4 @@ impl<'a, 'b, 'c, 'd> SafeNativeContext<'a, 'b, 'c, 'd> {
     pub fn set_incremental_gas_charging(&mut self, enable: bool) {
         self.enable_incremental_gas_charging = enable;
     }
-
-    /// Returns true if the aggregator snapshots feature is enabled.
-    pub fn aggregator_v2_api_enabled(&self) -> bool {
-        self.get_feature_flags().is_aggregator_v2_api_enabled()
-    }
-
-    pub fn aggregator_v2_delayed_fields_enabled(&self) -> bool {
-        self.get_feature_flags()
-            .is_aggregator_v2_delayed_fields_enabled()
-    }
 }
diff --git a/aptos-move/aptos-release-builder/Cargo.toml b/aptos-move/aptos-release-builder/Cargo.toml
index 41d33cd42e1cb..5b57f024147fc 100644
--- a/aptos-move/aptos-release-builder/Cargo.toml
+++ b/aptos-move/aptos-release-builder/Cargo.toml
@@ -24,25 +24,38 @@ 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 }
 serde_yaml = { workspace = true }
+sha3 = { workspace = true }
 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 365fbc1e305f2..a12d498463731 100644
--- a/aptos-move/aptos-release-builder/data/release.yaml
+++ b/aptos-move/aptos-release-builder/data/release.yaml
@@ -1,26 +1,19 @@
 ---
-remote_endpoint: ~
-name: "v1.12"
+remote_endpoint: https://fullnode.mainnet.aptoslabs.com
+name: "TBD"
 proposals:
-  - name: step_1_increase_max_txn_gas
+  - name: proposal_1_upgrade_framework
     metadata:
-      title: "Increase max txn gas temporarily for framework upgrade"
-      description: "Increase max txn gas temporarily for framework upgrade"
-    execution_mode: MultiStep
-    update_sequence:
-      - DefaultGasWithOverride:
-          feature_version: 16
-          overrides:
-            - name: "txn.max_execution_gas"
-              value: 4000000000
-  - name: step_2_upgrade_framework
-    metadata:
-      title: "Multi-step proposal to upgrade mainnet framework to v1.12"
-      description: "This includes changes in https://github.com/aptos-labs/aptos-core/commits/aptos-release-v1.12"
+      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:
+          new: current
       - Framework:
           bytecode_version: 6
           git_hash: ~
-      - DefaultGasWithOverride:
-          feature_version: 17
+      - FeatureFlag:
+          enabled:
+            - allow_serialized_script_args
+
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 b155abc4ce941..b0d7cc4c172f3 100644
--- a/aptos-move/aptos-release-builder/src/components/feature_flags.rs
+++ b/aptos-move/aptos-release-builder/src/components/feature_flags.rs
@@ -114,6 +114,19 @@ pub enum FeatureFlag {
     PrimaryAPTFungibleStoreAtUserAddress,
     ObjectNativeDerivedAddress,
     DispatchableFungibleAsset,
+    NewAccountsDefaultToFaAptStore,
+    OperationsDefaultToFaAptStore,
+    AggregatorV2IsAtLeastApi,
+    ConcurrentFungibleBalance,
+    DefaultToConcurrentFungibleBalance,
+    LimitVMTypeSize,
+    AbortIfMultisigPayloadMismatch,
+    DisallowUserNative,
+    AllowSerializedScriptArgs,
+    UseCompatibilityCheckerV2,
+    EnableEnumTypes,
+    EnableResourceAccessControl,
+    RejectUnstableBytecodeForScript,
 }
 
 fn generate_features_blob(writer: &CodeWriter, data: &[u64]) {
@@ -292,6 +305,37 @@ impl From<FeatureFlag> for AptosFeatureFlag {
                 AptosFeatureFlag::OBJECT_NATIVE_DERIVED_ADDRESS
             },
             FeatureFlag::DispatchableFungibleAsset => AptosFeatureFlag::DISPATCHABLE_FUNGIBLE_ASSET,
+            FeatureFlag::NewAccountsDefaultToFaAptStore => {
+                AptosFeatureFlag::NEW_ACCOUNTS_DEFAULT_TO_FA_APT_STORE
+            },
+            FeatureFlag::OperationsDefaultToFaAptStore => {
+                AptosFeatureFlag::OPERATIONS_DEFAULT_TO_FA_APT_STORE
+            },
+            FeatureFlag::AggregatorV2IsAtLeastApi => {
+                AptosFeatureFlag::AGGREGATOR_V2_IS_AT_LEAST_API
+            },
+            FeatureFlag::ConcurrentFungibleBalance => AptosFeatureFlag::CONCURRENT_FUNGIBLE_BALANCE,
+            FeatureFlag::DefaultToConcurrentFungibleBalance => {
+                AptosFeatureFlag::DEFAULT_TO_CONCURRENT_FUNGIBLE_BALANCE
+            },
+            FeatureFlag::LimitVMTypeSize => AptosFeatureFlag::LIMIT_VM_TYPE_SIZE,
+            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
+            },
         }
     }
 }
@@ -399,6 +443,37 @@ impl From<AptosFeatureFlag> for FeatureFlag {
                 FeatureFlag::ObjectNativeDerivedAddress
             },
             AptosFeatureFlag::DISPATCHABLE_FUNGIBLE_ASSET => FeatureFlag::DispatchableFungibleAsset,
+            AptosFeatureFlag::NEW_ACCOUNTS_DEFAULT_TO_FA_APT_STORE => {
+                FeatureFlag::NewAccountsDefaultToFaAptStore
+            },
+            AptosFeatureFlag::OPERATIONS_DEFAULT_TO_FA_APT_STORE => {
+                FeatureFlag::OperationsDefaultToFaAptStore
+            },
+            AptosFeatureFlag::AGGREGATOR_V2_IS_AT_LEAST_API => {
+                FeatureFlag::AggregatorV2IsAtLeastApi
+            },
+            AptosFeatureFlag::CONCURRENT_FUNGIBLE_BALANCE => FeatureFlag::ConcurrentFungibleBalance,
+            AptosFeatureFlag::DEFAULT_TO_CONCURRENT_FUNGIBLE_BALANCE => {
+                FeatureFlag::DefaultToConcurrentFungibleBalance
+            },
+            AptosFeatureFlag::LIMIT_VM_TYPE_SIZE => FeatureFlag::LimitVMTypeSize,
+            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
+            },
         }
     }
 }
diff --git a/aptos-move/aptos-release-builder/src/components/gas.rs b/aptos-move/aptos-release-builder/src/components/gas.rs
index 92e490609b6e0..7e247e8a402a1 100644
--- a/aptos-move/aptos-release-builder/src/components/gas.rs
+++ b/aptos-move/aptos-release-builder/src/components/gas.rs
@@ -3,35 +3,65 @@
 
 use crate::{components::get_signer_arg, utils::*};
 use anyhow::Result;
-use aptos_types::on_chain_config::GasScheduleV2;
+use aptos_types::on_chain_config::{DiffItem, GasScheduleV2};
 use move_model::{code_writer::CodeWriter, emit, emitln, model::Loc};
+use sha3::{Digest, Sha3_512};
 
-pub fn generate_gas_upgrade_proposal(
-    post_randomness_framework: bool,
-    gas_schedule: &GasScheduleV2,
-    is_testnet: bool,
-    next_execution_hash: Vec<u8>,
-) -> Result<Vec<(String, String)>> {
-    let signer_arg = get_signer_arg(is_testnet, &next_execution_hash);
-    let mut result = vec![];
-
-    let writer = CodeWriter::new(Loc::default());
+fn emit_gas_schedule_diff(
+    writer: &CodeWriter,
+    old_gas_schedule: &GasScheduleV2,
+    new_gas_schedule: &GasScheduleV2,
+) -> Result<()> {
+    emitln!(writer, "// Changes");
+    if old_gas_schedule.feature_version != new_gas_schedule.feature_version {
+        emitln!(
+            writer,
+            "//   Feature version: {} -> {}",
+            old_gas_schedule.feature_version,
+            new_gas_schedule.feature_version
+        );
+    }
+    let changes = GasScheduleV2::diff(old_gas_schedule, new_gas_schedule);
+    if !changes.is_empty() {
+        let max_len = changes
+            .iter()
+            .fold(0, |acc, (name, _)| usize::max(acc, name.len()));
 
-    emitln!(
-        writer,
-        "// source commit hash: {}\n",
-        aptos_build_info::get_git_hash()
-    );
+        emitln!(writer, "//   Parameters");
+        for (param_name, delta) in &changes {
+            let name_with_spaces =
+                format!("{}{}", param_name, " ".repeat(max_len - param_name.len()));
+            match delta {
+                DiffItem::Add { new_val } => {
+                    emitln!(writer, "//      +  {} :  {}", name_with_spaces, new_val);
+                },
+                DiffItem::Delete { old_val } => {
+                    emitln!(writer, "//      -  {} :  {}", name_with_spaces, old_val);
+                },
+                DiffItem::Modify { old_val, new_val } => {
+                    emitln!(
+                        writer,
+                        "//         {} :  {} -> {}",
+                        name_with_spaces,
+                        old_val,
+                        new_val
+                    );
+                },
+            }
+        }
+    }
 
-    emitln!(writer, "// Gas schedule upgrade proposal\n");
+    Ok(())
+}
 
+fn emit_full_gas_schedule(writer: &CodeWriter, gas_schedule: &GasScheduleV2) -> Result<()> {
+    emitln!(writer, "// Full gas schedule");
     emitln!(
         writer,
-        "// Feature version: {}",
+        "//   Feature version: {}",
         gas_schedule.feature_version
     );
-    emitln!(writer, "//");
-    emitln!(writer, "// Entries:");
+    emitln!(writer, "//   Parameters:");
     let max_len = gas_schedule
         .entries
         .iter()
@@ -42,35 +72,77 @@ pub fn generate_gas_upgrade_proposal(
     }
     emitln!(writer);
 
+    Ok(())
+}
+
+pub fn generate_gas_upgrade_proposal(
+    old_gas_schedule: Option<&GasScheduleV2>,
+    new_gas_schedule: &GasScheduleV2,
+    is_testnet: bool,
+    next_execution_hash: Vec<u8>,
+) -> Result<Vec<(String, String)>> {
+    let signer_arg = get_signer_arg(is_testnet, &next_execution_hash);
+    let mut result = vec![];
+
+    let writer = CodeWriter::new(Loc::default());
+
+    emitln!(
+        writer,
+        "// Source commit hash: {}",
+        aptos_build_info::get_git_hash()
+    );
+    emitln!(writer);
+
+    emitln!(writer, "// Gas schedule upgrade proposal");
+
+    let old_hash = match old_gas_schedule {
+        Some(old_gas_schedule) => {
+            let old_bytes = bcs::to_bytes(old_gas_schedule)?;
+            let old_hash = hex::encode(Sha3_512::digest(old_bytes.as_slice()));
+            emitln!(writer, "//");
+            emitln!(writer, "// Old Gas Schedule Hash (Sha3-512): {}", old_hash);
+
+            emit_gas_schedule_diff(&writer, old_gas_schedule, new_gas_schedule)?;
+
+            Some(old_hash)
+        },
+        None => None,
+    };
+    emitln!(writer, "//");
+    emit_full_gas_schedule(&writer, new_gas_schedule)?;
+
     let proposal = generate_governance_proposal(
         &writer,
         is_testnet,
         next_execution_hash.clone(),
         &["aptos_framework::gas_schedule"],
         |writer| {
-            let gas_schedule_blob = bcs::to_bytes(gas_schedule).unwrap();
+            let gas_schedule_blob = bcs::to_bytes(new_gas_schedule).unwrap();
             assert!(gas_schedule_blob.len() < 65536);
+
             emit!(writer, "let gas_schedule_blob: vector<u8> = ");
             generate_blob_as_hex_string(writer, &gas_schedule_blob);
-            emitln!(writer, ";\n");
-            if !post_randomness_framework {
-                emitln!(
-                    writer,
-                    "gas_schedule::set_gas_schedule({}, gas_schedule_blob)",
-                    signer_arg
-                );
-            } else {
-                // The else statement has & before the framework_signer.
-                // The testnet single-step generation had something like let framework_signer = &core_signer;
-                // so that their framework_signer is of type &signer, but for mainnet single-step and multi-step,
-                // the framework_signer is of type signer.
-                emitln!(
-                    writer,
-                    "gas_schedule::set_for_next_epoch({}, gas_schedule_blob);",
-                    signer_arg
-                );
-                emitln!(writer, "aptos_governance::reconfigure({});", signer_arg);
+            emitln!(writer, ";");
+            emitln!(writer);
+
+            match old_hash {
+                Some(old_hash) => {
+                    emitln!(
+                        writer,
+                        "gas_schedule::set_for_next_epoch_check_hash({}, x\"{}\", gas_schedule_blob);",
+                        signer_arg,
+                        old_hash,
+                    );
+                },
+                None => {
+                    emitln!(
+                        writer,
+                        "gas_schedule::set_for_next_epoch({}, gas_schedule_blob);",
+                        signer_arg
+                    );
+                },
             }
+            emitln!(writer, "aptos_governance::reconfigure({});", signer_arg);
         },
     );
 
diff --git a/aptos-move/aptos-release-builder/src/components/mod.rs b/aptos-move/aptos-release-builder/src/components/mod.rs
index de332baaf8713..95df3f824be1d 100644
--- a/aptos-move/aptos-release-builder/src/components/mod.rs
+++ b/aptos-move/aptos-release-builder/src/components/mod.rs
@@ -25,11 +25,12 @@ 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::{Deserialize, Serialize};
+use serde::{de::Visitor, Deserialize, Deserializer, Serialize, Serializer};
 use std::{
     collections::HashMap,
-    fs::File,
+    fs::{self, File},
     io::{Read, Write},
     path::{Path, PathBuf},
     thread::sleep,
@@ -73,10 +74,7 @@ impl Proposal {
                     features_diff.squash(feature_flags.clone())
                 },
                 ReleaseEntry::Framework(_)
-                | ReleaseEntry::CustomGas(_)
-                | ReleaseEntry::DefaultGas
-                | ReleaseEntry::DefaultGasWithOverride(_)
-                | ReleaseEntry::DefaultGasWithOverrideOld(_)
+                | ReleaseEntry::Gas { .. }
                 | ReleaseEntry::Version(_)
                 | ReleaseEntry::Consensus(_)
                 | ReleaseEntry::Execution(_)
@@ -116,10 +114,11 @@ pub enum ExecutionMode {
     RootSigner,
 }
 
-#[derive(Serialize, Deserialize, Debug, Clone, Eq, PartialEq)]
-pub struct GasOverrideConfig {
-    feature_version: Option<u64>,
-    overrides: Option<Vec<GasOverride>>,
+#[derive(Debug, Clone, Eq, PartialEq)]
+pub enum GasScheduleLocator {
+    LocalFile(String),
+    RemoteFile(Url),
+    Current,
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone, Eq, PartialEq)]
@@ -131,11 +130,10 @@ pub struct GasOverride {
 #[derive(Serialize, Deserialize, Debug, Clone, Eq, PartialEq)]
 pub enum ReleaseEntry {
     Framework(FrameworkReleaseConfig),
-    CustomGas(GasScheduleV2),
-    DefaultGas,
-    DefaultGasWithOverride(GasOverrideConfig),
-    /// Only used before randomness framework upgrade.
-    DefaultGasWithOverrideOld(GasOverrideConfig),
+    Gas {
+        old: Option<GasScheduleLocator>,
+        new: GasScheduleLocator,
+    },
     Version(AptosVersion),
     FeatureFlag(Features),
     Consensus(OnChainConsensusConfig),
@@ -147,8 +145,76 @@ pub enum ReleaseEntry {
     Randomness(ReleaseFriendlyRandomnessConfig),
 }
 
+impl Serialize for GasScheduleLocator {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        match self {
+            GasScheduleLocator::LocalFile(path) => serializer.serialize_str(path),
+            GasScheduleLocator::RemoteFile(url) => serializer.serialize_str(url.as_str()),
+            GasScheduleLocator::Current => serializer.serialize_str("current"),
+        }
+    }
+}
+
+impl<'de> Deserialize<'de> for GasScheduleLocator {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        struct GasScheduleLocatorVisitor;
+
+        impl<'de> Visitor<'de> for GasScheduleLocatorVisitor {
+            type Value = GasScheduleLocator;
+
+            fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
+                formatter.write_str(
+                    "a valid gas schedule locator (path to local file, url to remote file or `current`)",
+                )
+            }
+
+            fn visit_str<E>(self, value: &str) -> Result<GasScheduleLocator, E>
+            where
+                E: serde::de::Error,
+            {
+                if value == "current" {
+                    Ok(GasScheduleLocator::Current)
+                } else if let Ok(url) = Url::parse(value) {
+                    Ok(GasScheduleLocator::RemoteFile(url))
+                } else {
+                    Ok(GasScheduleLocator::LocalFile(value.to_string()))
+                }
+            }
+        }
+
+        deserializer.deserialize_str(GasScheduleLocatorVisitor)
+    }
+}
+
+impl GasScheduleLocator {
+    async fn fetch_gas_schedule(&self) -> Result<GasScheduleV2> {
+        println!("{:?}", self);
+        match self {
+            GasScheduleLocator::LocalFile(path) => {
+                let file_contents = fs::read_to_string(path)?;
+                let gas_schedule: GasScheduleV2 = serde_json::from_str(&file_contents)?;
+                Ok(gas_schedule)
+            },
+            GasScheduleLocator::RemoteFile(url) => {
+                let response = reqwest::get(url.as_str()).await?;
+                let gas_schedule: GasScheduleV2 = response.json().await?;
+                Ok(gas_schedule)
+            },
+            GasScheduleLocator::Current => Ok(aptos_gas_schedule_updator::current_gas_schedule(
+                LATEST_GAS_FEATURE_VERSION,
+            )),
+        }
+    }
+}
+
 impl ReleaseEntry {
-    pub fn generate_release_script(
+    pub async fn generate_release_script(
         &self,
         client: Option<&Client>,
         result: &mut Vec<(String, String)>,
@@ -173,77 +239,44 @@ impl ReleaseEntry {
                     .unwrap(),
                 );
             },
-            ReleaseEntry::CustomGas(gas_schedule) => {
-                if !fetch_and_equals::<GasScheduleV2>(client, gas_schedule)? {
-                    result.append(&mut gas::generate_gas_upgrade_proposal(
-                        true,
-                        gas_schedule,
-                        is_testnet,
-                        if is_multi_step {
-                            get_execution_hash(result)
-                        } else {
-                            "".to_owned().into_bytes()
-                        },
-                    )?);
-                }
-            },
-            ReleaseEntry::DefaultGas => {
-                let gas_schedule =
-                    aptos_gas_schedule_updator::current_gas_schedule(LATEST_GAS_FEATURE_VERSION);
-                if !fetch_and_equals::<GasScheduleV2>(client, &gas_schedule)? {
-                    result.append(&mut gas::generate_gas_upgrade_proposal(
-                        true,
-                        &gas_schedule,
-                        is_testnet,
-                        if is_multi_step {
-                            get_execution_hash(result)
-                        } else {
-                            "".to_owned().into_bytes()
-                        },
-                    )?);
-                }
-            },
-            ReleaseEntry::DefaultGasWithOverride(GasOverrideConfig {
-                feature_version,
-                overrides,
-            }) => {
-                let feature_version = feature_version.unwrap_or(LATEST_GAS_FEATURE_VERSION);
-                let gas_schedule = gas_override_default(
-                    feature_version,
-                    overrides
-                        .as_ref()
-                        .map(|overrides| overrides.as_slice())
-                        .unwrap_or(&[]),
-                )?;
-                if !fetch_and_equals::<GasScheduleV2>(client, &gas_schedule)? {
-                    result.append(&mut gas::generate_gas_upgrade_proposal(
-                        true,
-                        &gas_schedule,
-                        is_testnet,
-                        if is_multi_step {
-                            get_execution_hash(result)
-                        } else {
-                            "".to_owned().into_bytes()
-                        },
-                    )?);
-                }
-            },
-            ReleaseEntry::DefaultGasWithOverrideOld(GasOverrideConfig {
-                feature_version,
-                overrides,
-            }) => {
-                let feature_version = feature_version.unwrap_or(LATEST_GAS_FEATURE_VERSION);
-                let gas_schedule = gas_override_default(
-                    feature_version,
-                    overrides
-                        .as_ref()
-                        .map(|overrides| overrides.as_slice())
-                        .unwrap_or(&[]),
-                )?;
-                if !fetch_and_equals::<GasScheduleV2>(client, &gas_schedule)? {
+            ReleaseEntry::Gas { old, new } => {
+                let new_gas_schedule = new
+                    .fetch_gas_schedule()
+                    .await
+                    .map_err(|err| anyhow!("Failed to fetch new gas schedule: {}", err))?;
+                let old_gas_schedule = match old {
+                    Some(old) => Some(
+                        old.fetch_gas_schedule()
+                            .await
+                            .map_err(|err| anyhow!("Failed to fetch old gas schedule: {}", err))?,
+                    ),
+                    None => {
+                        match client {
+                            Some(_client) => {
+                                // We could return `Some(fetch_config::<GasScheduleV2>(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.");
+                                println!("It is strongly recommended you specify an old gas schedule or a remote end point where it can be fetched.");
+                                println!("!!! WARNING !!!");
+                                None
+                            },
+                        }
+                    },
+                };
+
+                if old_gas_schedule
+                    .as_ref()
+                    .map(|old| old != &new_gas_schedule)
+                    .unwrap_or(true)
+                {
                     result.append(&mut gas::generate_gas_upgrade_proposal(
-                        false,
-                        &gas_schedule,
+                        old_gas_schedule.as_ref(),
+                        &new_gas_schedule,
                         is_testnet,
                         if is_multi_step {
                             get_execution_hash(result)
@@ -404,45 +437,15 @@ impl ReleaseEntry {
         Ok(())
     }
 
-    pub fn validate_upgrade(&self, client: &Client) -> Result<()> {
+    pub async fn validate_upgrade(&self, client: &Client) -> Result<()> {
         let client_opt = Some(client);
         match self {
             ReleaseEntry::Framework(_) => (),
             ReleaseEntry::RawScript(_) => (),
-            ReleaseEntry::CustomGas(gas_schedule) => {
-                if !wait_until_equals(client_opt, gas_schedule, *MAX_ASYNC_RECONFIG_TIME) {
-                    bail!("Gas schedule config mismatch: Expected {:?}", gas_schedule);
-                }
-            },
-            ReleaseEntry::DefaultGas => {
-                if !wait_until_equals(
-                    client_opt,
-                    &aptos_gas_schedule_updator::current_gas_schedule(LATEST_GAS_FEATURE_VERSION),
-                    *MAX_ASYNC_RECONFIG_TIME,
-                ) {
-                    bail!("Gas schedule config mismatch: Expected Default");
-                }
-            },
-            ReleaseEntry::DefaultGasWithOverrideOld(config)
-            | ReleaseEntry::DefaultGasWithOverride(config) => {
-                let GasOverrideConfig {
-                    overrides,
-                    feature_version,
-                } = config;
-
-                let feature_version = feature_version.unwrap_or(LATEST_GAS_FEATURE_VERSION);
-
-                if !wait_until_equals(
-                    client_opt,
-                    &gas_override_default(
-                        feature_version,
-                        overrides
-                            .as_ref()
-                            .map(|overrides| overrides.as_slice())
-                            .unwrap_or(&[]),
-                    )?,
-                    Duration::from_secs(60),
-                ) {
+            ReleaseEntry::Gas { old: _old, new } => {
+                let new_gas_schedule = new.fetch_gas_schedule().await?;
+
+                if !wait_until_equals(client_opt, &new_gas_schedule, Duration::from_secs(60)) {
                     bail!("Gas schedule config mismatch: Expected Default");
                 }
             },
@@ -512,30 +515,6 @@ impl ReleaseEntry {
     }
 }
 
-fn gas_override_default(
-    feature_version: u64,
-    gas_overrides: &[GasOverride],
-) -> Result<GasScheduleV2> {
-    let mut gas_schedule = aptos_gas_schedule_updator::current_gas_schedule(feature_version);
-    for gas_override in gas_overrides {
-        let mut found = false;
-        for (name, value) in &mut gas_schedule.entries {
-            if name == &gas_override.name {
-                *value = gas_override.value;
-                found = true;
-                break;
-            }
-        }
-        if !found {
-            bail!(
-                "Gas override config mismatch: Expected {:?} to be in the gas schedule",
-                gas_override.name
-            );
-        }
-    }
-    Ok(gas_schedule)
-}
-
 // Compare the current on chain config with the value recorded on chain. Return false if there's a difference.
 fn fetch_and_equals<T: OnChainConfig + PartialEq>(
     client: Option<&Client>,
@@ -587,7 +566,7 @@ pub fn fetch_config<T: OnChainConfig>(client: &Client) -> Result<T> {
 }
 
 impl ReleaseConfig {
-    pub fn generate_release_proposal_scripts(&self, base_path: &Path) -> Result<()> {
+    pub async fn generate_release_proposal_scripts(&self, base_path: &Path) -> Result<()> {
         let client = self
             .remote_endpoint
             .as_ref()
@@ -640,20 +619,24 @@ impl ReleaseConfig {
             let mut result: Vec<(String, String)> = vec![];
             if let ExecutionMode::MultiStep = &proposal.execution_mode {
                 for entry in proposal.update_sequence.iter().rev() {
-                    entry.generate_release_script(
-                        client.as_ref(),
-                        &mut result,
-                        proposal.execution_mode,
-                    )?;
+                    entry
+                        .generate_release_script(
+                            client.as_ref(),
+                            &mut result,
+                            proposal.execution_mode,
+                        )
+                        .await?;
                 }
                 result.reverse();
             } else {
                 for entry in proposal.update_sequence.iter() {
-                    entry.generate_release_script(
-                        client.as_ref(),
-                        &mut result,
-                        proposal.execution_mode,
-                    )?;
+                    entry
+                        .generate_release_script(
+                            client.as_ref(),
+                            &mut result,
+                            proposal.execution_mode,
+                        )
+                        .await?;
                 }
             }
 
@@ -720,10 +703,10 @@ impl ReleaseConfig {
     }
 
     // Fetch all configs from a remote rest endpoint and assert all the configs are the same as the ones specified locally.
-    pub fn validate_upgrade(&self, endpoint: &Url, proposal: &Proposal) -> Result<()> {
+    pub async fn validate_upgrade(&self, endpoint: &Url, proposal: &Proposal) -> Result<()> {
         let client = Client::new(endpoint.clone());
         for entry in proposal.consolidated_side_effects() {
-            entry.validate_upgrade(&client)?;
+            entry.validate_upgrade(&client).await?;
         }
         Ok(())
     }
@@ -740,7 +723,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,
                     })],
                 },
@@ -748,7 +731,10 @@ impl Default for ReleaseConfig {
                     execution_mode: ExecutionMode::MultiStep,
                     metadata: ProposalMetadata::default(),
                     name: "gas".to_string(),
-                    update_sequence: vec![ReleaseEntry::DefaultGas],
+                    update_sequence: vec![ReleaseEntry::Gas {
+                        old: None,
+                        new: GasScheduleLocator::Current,
+                    }],
                 },
                 Proposal {
                     execution_mode: ExecutionMode::MultiStep,
@@ -777,7 +763,7 @@ impl Default for ReleaseConfig {
     }
 }
 
-pub fn get_execution_hash(result: &Vec<(String, String)>) -> Vec<u8> {
+pub fn get_execution_hash(result: &[(String, String)]) -> Vec<u8> {
     if result.is_empty() {
         "vector::empty<u8>()".to_owned().into_bytes()
     } else {
@@ -841,7 +827,7 @@ impl Default for ProposalMetadata {
     }
 }
 
-fn get_signer_arg(is_testnet: bool, next_execution_hash: &Vec<u8>) -> &str {
+fn get_signer_arg(is_testnet: bool, next_execution_hash: &[u8]) -> &str {
     if is_testnet && next_execution_hash.is_empty() {
         "framework_signer"
     } else {
diff --git a/aptos-move/aptos-release-builder/src/lib.rs b/aptos-move/aptos-release-builder/src/lib.rs
index b53dd7006f106..2ac6a94f9003e 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 ec1fb08c643c9..8352800e81cd7 100644
--- a/aptos-move/aptos-release-builder/src/main.rs
+++ b/aptos-move/aptos-release-builder/src/main.rs
@@ -4,9 +4,11 @@
 use anyhow::Context;
 use aptos_crypto::{ed25519::Ed25519PrivateKey, ValidCryptoMaterialStringExt};
 use aptos_framework::natives::code::PackageRegistry;
+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::{
@@ -15,7 +17,8 @@ use aptos_types::{
     jwks::{ObservedJWKs, SupportedOIDCProviders},
 };
 use clap::{Parser, Subcommand};
-use std::path::PathBuf;
+use std::{path::PathBuf, str::FromStr};
+use url::Url;
 
 #[derive(Parser)]
 pub struct Argument {
@@ -25,6 +28,43 @@ pub struct Argument {
     aptos_core_path: Option<PathBuf>,
 }
 
+// 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<Self, anyhow::Error> {
+        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<Url> {
+        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
@@ -33,6 +73,24 @@ pub enum Commands {
         release_config: PathBuf,
         #[clap(short, long)]
         output_dir: PathBuf,
+
+        #[clap(long)]
+        simulate: Option<NetworkSelection>,
+    },
+    /// 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, <url to rest endpoint>
+        #[clap(long)]
+        network: NetworkSelection,
     },
     /// Generate sets of governance proposals with default release config.
     WriteDefault {
@@ -57,6 +115,16 @@ pub enum Commands {
         #[clap(long)]
         mint_to_validator: bool,
     },
+    /// Generate a gas schedule using the current values and store it to a file.
+    GenerateGasSchedule {
+        /// The version of the gas schedule to generate.
+        #[clap(short, long)]
+        version: Option<u64>,
+
+        /// Path of the output file.
+        #[clap(short, long)]
+        output_path: Option<PathBuf>,
+    },
     /// Print out current values of on chain configs.
     PrintConfigs {
         /// Url endpoint for the desired network. e.g: https://fullnode.mainnet.aptoslabs.com/v1.
@@ -115,11 +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 } => {
@@ -201,6 +281,22 @@ async fn main() -> anyhow::Result<()> {
                 .await?;
             Ok(())
         },
+        Commands::GenerateGasSchedule {
+            version,
+            output_path,
+        } => {
+            let version = version.unwrap_or(LATEST_GAS_FEATURE_VERSION);
+            let output_path =
+                output_path.unwrap_or_else(|| PathBuf::from_str("gas_schedule.json").unwrap());
+
+            let gas_schedule = aptos_gas_schedule_updator::current_gas_schedule(version);
+            let json = serde_json::to_string_pretty(&gas_schedule)?;
+
+            std::fs::write(&output_path, json)?;
+            println!("Gas scheduled saved to {}.", output_path.display());
+
+            Ok(())
+        },
         Commands::PrintConfigs {
             endpoint,
             print_gas_schedule,
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..9478452963a27
--- /dev/null
+++ b/aptos-move/aptos-release-builder/src/simulate.rs
@@ -0,0 +1,729 @@
+// 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<T: PartialEq>(pool: &mut Vec<T>, 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<SignatureToken>) -> 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<FunctionHandleIndex> {
+    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<SignatureToken>,
+    returns: Vec<SignatureToken>,
+) -> Result<FunctionHandleIndex> {
+    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<HashMap<StateKey, Option<StateValue>>>,
+}
+
+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<C>(&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<C, F>(&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::<C>()
+            )
+        })?;
+
+        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<T: MoveResource>(&self, addr: &AccountAddress) -> T {
+        let data_blob = self
+            .get_state_value_bytes(
+                &StateKey::resource_typed::<T>(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<Option<StateValue>> {
+        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<StateStorageUsage> {
+        Ok(StateStorageUsage::Untracked)
+    }
+
+    fn as_in_memory_state_view(&self) -> InMemoryStateView {
+        panic!("not supported")
+    }
+}
+
+/***************************************************************************************************
+ * Patches
+ *
+ **************************************************************************************************/
+static MODULE_ID_APTOS_GOVERNANCE: Lazy<ModuleId> = Lazy::new(|| {
+    ModuleId::new(
+        AccountAddress::ONE,
+        Identifier::new("aptos_governance").unwrap(),
+    )
+});
+
+static FUNC_NAME_CREATE_SIGNER: Lazy<Identifier> =
+    Lazy::new(|| Identifier::new("create_signer").unwrap());
+
+static FUNC_NAME_RESOLVE_MULTI_STEP_PROPOSAL: Lazy<Identifier> =
+    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<F>(
+    state_view: &SimulationStateView<impl StateView>,
+    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<impl StateView>,
+    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<impl StateView>,
+    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<impl StateView>) -> 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,
+        )
+        .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::<Vec<_>>()
+                        .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<Vec<(PathBuf, Vec<PathBuf>)>> {
+    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/validate.rs b/aptos-move/aptos-release-builder/src/validate.rs
index 96aea9f9e9ddc..b994ef499bbc9 100644
--- a/aptos-move/aptos-release-builder/src/validate.rs
+++ b/aptos-move/aptos-release-builder/src/validate.rs
@@ -399,7 +399,9 @@ async fn execute_release(
     } else {
         scripts_path.path()
     };
-    release_config.generate_release_proposal_scripts(proposal_folder)?;
+    release_config
+        .generate_release_proposal_scripts(proposal_folder)
+        .await?;
 
     network_config.increase_lockup().await?;
 
@@ -466,7 +468,9 @@ async fn execute_release(
             },
         };
         if validate_release {
-            release_config.validate_upgrade(&network_config.endpoint, proposal)?;
+            release_config
+                .validate_upgrade(&network_config.endpoint, proposal)
+                .await?;
         }
     }
     Ok(())
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<Vec<(Identifier, MoveValue)>> {
+    ) -> anyhow::Result<(Option<Identifier>, 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<Vec<AnnotatedMoveValue>> {
+        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-resource-viewer/src/module_view.rs b/aptos-move/aptos-resource-viewer/src/module_view.rs
index 57299e5ed9761..731eae048ddba 100644
--- a/aptos-move/aptos-resource-viewer/src/module_view.rs
+++ b/aptos-move/aptos-resource-viewer/src/module_view.rs
@@ -5,10 +5,7 @@ use anyhow::anyhow;
 use aptos_types::{
     on_chain_config::{Features, OnChainConfig},
     state_store::{state_key::StateKey, StateView},
-};
-use aptos_vm::{
-    gas::get_gas_config_from_storage,
-    move_vm_ext::{get_max_binary_format_version, get_max_identifier_size},
+    vm::configs::aptos_prod_deserializer_config,
 };
 use move_binary_format::{deserializer::DeserializerConfig, CompiledModule};
 use move_bytecode_utils::compiled_module_viewer::CompiledModuleView;
@@ -24,13 +21,7 @@ pub struct ModuleView<'a, S> {
 impl<'a, S: StateView> ModuleView<'a, S> {
     pub fn new(state_view: &'a S) -> Self {
         let features = Features::fetch_config(state_view).unwrap_or_default();
-        let (_, gas_feature_version) = get_gas_config_from_storage(state_view);
-
-        let max_binary_format_version =
-            get_max_binary_format_version(&features, Some(gas_feature_version));
-        let max_identifier_size = get_max_identifier_size(&features);
-        let deserializer_config =
-            DeserializerConfig::new(max_binary_format_version, max_identifier_size);
+        let deserializer_config = aptos_prod_deserializer_config(&features);
 
         Self {
             module_cache: RefCell::new(HashMap::new()),
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<AptosTransactionOutput, VMStatus>,
         >(
-            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<AptosTransactionOutput, VMStatus>,
         >(
-            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<Arc<rayon::ThreadPool>> = 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/Cargo.toml b/aptos-move/aptos-transactional-test-harness/Cargo.toml
index 4e68441cff740..9c7b31caba129 100644
--- a/aptos-move/aptos-transactional-test-harness/Cargo.toml
+++ b/aptos-move/aptos-transactional-test-harness/Cargo.toml
@@ -27,6 +27,7 @@ aptos-vm = { workspace = true }
 aptos-vm-genesis = { workspace = true }
 bcs = { workspace = true }
 clap = { workspace = true }
+codespan-reporting = { workspace = true }
 hex = { workspace = true }
 move-binary-format = { workspace = true, features = ["fuzzing"] }
 move-bytecode-verifier = { workspace = true }
@@ -35,10 +36,12 @@ move-compiler = { workspace = true }
 move-compiler-v2 = { workspace = true }
 move-core-types = { workspace = true, features = ["fuzzing"] }
 move-model = { workspace = true }
+move-symbol-pool = { workspace = true }
 move-transactional-test-runner = { workspace = true }
 move-vm-runtime = { workspace = true }
 once_cell = { workspace = true }
 serde_json = { workspace = true }
+tempfile = { workspace = true }
 
 [dev-dependencies]
 aptos-types = { workspace = true, features = ["fuzzing"] }
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 a636da073a726..1d66cc644cf95 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
@@ -25,10 +25,12 @@ use aptos_types::{
         EntryFunction as TransactionEntryFunction, ExecutionStatus, RawTransaction,
         Script as TransactionScript, Transaction, TransactionOutput, TransactionStatus,
     },
+    vm::configs::set_paranoid_type_checks,
 };
 use aptos_vm::{AptosVM, VMExecutor};
 use aptos_vm_genesis::GENESIS_KEYPAIR;
 use clap::Parser;
+use codespan_reporting::{diagnostic::Severity, term::termcolor::Buffer};
 use move_binary_format::file_format::{CompiledModule, CompiledScript};
 use move_bytecode_verifier::verify_module;
 use move_command_line_common::{
@@ -37,7 +39,11 @@ use move_command_line_common::{
     files::verify_and_create_named_address_mapping,
     testing::{EXP_EXT, EXP_EXT_V2},
 };
-use move_compiler::{self, shared::PackagePaths, FullyCompiledProgram};
+use move_compiler::{
+    self,
+    shared::{string_packagepath_to_symbol_packagepath, NumericalAddress, PackagePaths},
+    FullyCompiledProgram,
+};
 use move_core_types::{
     account_address::AccountAddress,
     identifier::{IdentStr, Identifier},
@@ -48,6 +54,7 @@ use move_core_types::{
     value::{MoveTypeLayout, MoveValue},
 };
 use move_model::metadata::LanguageVersion;
+use move_symbol_pool::Symbol as MoveSymbol;
 use move_transactional_test_runner::{
     framework::{run_test_impl, CompiledState, MoveTestAdapter},
     tasks::{InitCommand, SyntaxChoice, TaskInput},
@@ -63,6 +70,7 @@ use std::{
     string::String,
     sync::Arc,
 };
+use tempfile::NamedTempFile;
 
 /**
  * Definitions
@@ -290,32 +298,36 @@ fn panic_missing_private_key(cmd_name: &str) -> ! {
     )
 }
 
-static PRECOMPILED_APTOS_FRAMEWORK_V1: Lazy<Option<FullyCompiledProgram>> = Lazy::new(|| {
-    if get_move_compiler_block_v1_from_env() {
-        return None;
-    }
-    let deps = vec![PackagePaths {
-        name: None,
-        paths: aptos_cached_packages::head_release_bundle()
-            .files()
-            .unwrap(),
-        named_address_map: aptos_framework::named_addresses().clone(),
-    }];
-    let program_res = move_compiler::construct_pre_compiled_lib(
-        deps,
-        None,
-        move_compiler::Flags::empty().set_sources_shadow_deps(false),
-        aptos_framework::extended_checks::get_all_attribute_names(),
-    )
-    .unwrap();
-    match program_res {
-        Ok(af) => Some(af),
-        Err((files, errors)) => {
-            eprintln!("!!!Aptos Framework failed to compile!!!");
-            move_compiler::diagnostics::report_diagnostics(&files, errors)
-        },
-    }
-});
+// PackagePaths here contains .move files only
+static PRECOMPILED_APTOS_FRAMEWORK_V1: Lazy<Option<(FullyCompiledProgram, Vec<PackagePaths>)>> =
+    Lazy::new(|| {
+        if get_move_compiler_block_v1_from_env() {
+            return None;
+        }
+        let lib_paths = PackagePaths {
+            name: None,
+            paths: aptos_cached_packages::head_release_bundle()
+                .files()
+                .unwrap(),
+            named_address_map: aptos_framework::named_addresses().clone(),
+        };
+        let lib_paths_movesym =
+            string_packagepath_to_symbol_packagepath::<NumericalAddress>(&lib_paths);
+        let program_res = move_compiler::construct_pre_compiled_lib(
+            vec![lib_paths],
+            None,
+            move_compiler::Flags::empty().set_sources_shadow_deps(false),
+            aptos_framework::extended_checks::get_all_attribute_names(),
+        )
+        .unwrap();
+        match program_res {
+            Ok(af) => Some((af, vec![lib_paths_movesym])),
+            Err((files, errors)) => {
+                eprintln!("!!!Aptos Framework failed to compile!!!");
+                move_compiler::diagnostics::report_diagnostics(&files, errors)
+            },
+        }
+    });
 
 static APTOS_FRAMEWORK_FILES: Lazy<Vec<String>> = Lazy::new(|| {
     aptos_cached_packages::head_release_bundle()
@@ -506,9 +518,10 @@ impl<'a> AptosTestAdapter<'a> {
         let sig_verified_block = into_signature_verified_block(txn_block);
         let onchain_config = BlockExecutorConfigFromOnchain {
             // TODO fetch values from state?
+            // Or should we just use execute_block_no_limit ?
             block_gas_limit_type: BlockGasLimitType::Limit(30000),
         };
-        let mut outputs =
+        let (mut outputs, _) =
             AptosVM::execute_block(&sig_verified_block, &self.storage.clone(), onchain_config)?
                 .into_inner();
 
@@ -601,11 +614,11 @@ impl<'a> MoveTestAdapter<'a> for AptosTestAdapter<'a> {
         default_syntax: SyntaxChoice,
         comparison_mode: bool,
         run_config: TestRunConfig,
-        pre_compiled_deps_v1: Option<&'a FullyCompiledProgram>,
+        pre_compiled_deps_v1: Option<&'a (FullyCompiledProgram, Vec<PackagePaths>)>,
         pre_compiled_deps_v2: Option<&'a PrecompiledFilesModules>,
         task_opt: Option<TaskInput<(InitCommand, Self::ExtraInitArgs)>>,
     ) -> (Self, Option<String>) {
-        AptosVM::set_paranoid_type_checks(true);
+        set_paranoid_type_checks(true);
         // Named address mapping
         let additional_named_address_mapping = match task_opt.as_ref().map(|t| &t.command) {
             Some((InitCommand { named_addresses }, _)) => {
@@ -680,6 +693,93 @@ impl<'a> MoveTestAdapter<'a> for AptosTestAdapter<'a> {
         (adapter, None)
     }
 
+    fn compile_module(
+        &mut self,
+        syntax: SyntaxChoice,
+        data: Option<NamedTempFile>,
+        start_line: usize,
+        command_lines_stop: usize,
+    ) -> Result<(
+        NamedTempFile,
+        Option<MoveSymbol>,
+        CompiledModule,
+        Option<String>,
+    )> {
+        let (data, named_addr_opt, module, opt_model, warnings_opt) =
+            self.compile_module_default(syntax, data, start_line, command_lines_stop, true)?;
+        let warnings_opt = match (syntax, opt_model) {
+            (SyntaxChoice::IR, _) => warnings_opt,
+            (_, Some(model)) => {
+                let _runtime_metadata =
+                    aptos_framework::extended_checks::run_extended_checks(&model);
+                // TODO(#13327): call inject_runtime_metadata in built_package.rs?  what file?
+                if model.diag_count(Severity::Warning) > 0 {
+                    let mut error_writer = Buffer::no_color();
+                    model.report_diag(&mut error_writer, Severity::Warning);
+                    let extended_warnings =
+                        String::from_utf8_lossy(&error_writer.into_inner()).to_string();
+                    if model.has_errors() {
+                        bail!("extended checks failed:\n\n{}", extended_warnings);
+                    };
+                    match warnings_opt {
+                        Some(warnings) => Some(warnings + &extended_warnings),
+                        None => Some(extended_warnings),
+                    }
+                } else {
+                    warnings_opt
+                }
+            },
+            (_, None) => {
+                bail!(
+                    "Cannot run extended checks, no model:\n\n{}",
+                    warnings_opt.unwrap_or_else(|| "No compiler warnings".to_string())
+                );
+            },
+        };
+        Ok((data, named_addr_opt, module, warnings_opt))
+    }
+
+    fn compile_script(
+        &mut self,
+        syntax: SyntaxChoice,
+        data: Option<NamedTempFile>,
+        start_line: usize,
+        command_lines_stop: usize,
+    ) -> Result<(CompiledScript, Option<String>)> {
+        let (compiled_script, opt_model, warnings_opt) =
+            self.compile_script_default(syntax, data, start_line, command_lines_stop, true)?;
+        let warnings_opt = match (syntax, opt_model) {
+            (SyntaxChoice::IR, _) => warnings_opt,
+            (_, Some(model)) => {
+                let _runtime_metadata =
+                    aptos_framework::extended_checks::run_extended_checks(&model);
+                // TODO(#13327): call inject_runtime_metadata in built_package.rs?  what file?
+                if model.diag_count(Severity::Warning) > 0 {
+                    let mut error_writer = Buffer::no_color();
+                    model.report_diag(&mut error_writer, Severity::Warning);
+                    let extended_warnings =
+                        String::from_utf8_lossy(&error_writer.into_inner()).to_string();
+                    if model.has_errors() {
+                        bail!("extended checks failed:\n\n{}", extended_warnings);
+                    };
+                    match warnings_opt {
+                        Some(warnings) => Some(warnings + &extended_warnings),
+                        None => Some(extended_warnings),
+                    }
+                } else {
+                    warnings_opt
+                }
+            },
+            (_, None) => {
+                bail!(
+                    "Cannot run extended checks, no model:\n\n{}",
+                    warnings_opt.unwrap_or_else(|| "No compiler warnings".to_string())
+                );
+            },
+        };
+        Ok((compiled_script, warnings_opt))
+    }
+
     fn publish_module(
         &mut self,
         module: CompiledModule,
@@ -706,10 +806,7 @@ impl<'a> MoveTestAdapter<'a> for AptosTestAdapter<'a> {
         // TODO: Do we still need this?
         let _private_key = match (extra_args.private_key, named_addr_opt) {
             (Some(private_key), _) => self.resolve_private_key(&private_key),
-            (None, Some(named_addr)) => match self
-                .private_key_mapping
-                .get(&named_addr.as_str().to_string())
-            {
+            (None, Some(named_addr)) => match self.private_key_mapping.get(named_addr.as_str()) {
                 Some(private_key) => private_key.clone(),
                 None => panic_missing_private_key_named("publish", named_addr.as_str()),
             },
@@ -1003,7 +1100,7 @@ fn render_events(events: &[ContractEvent]) -> Option<String> {
 
 fn precompiled_v1_stdlib_if_needed(
     config: &TestRunConfig,
-) -> Option<&'static FullyCompiledProgram> {
+) -> Option<&'static (FullyCompiledProgram, Vec<PackagePaths>)> {
     match config {
         TestRunConfig::CompilerV1 { .. } => PRECOMPILED_APTOS_FRAMEWORK_V1.as_ref(),
         TestRunConfig::ComparisonV1V2 { .. } => PRECOMPILED_APTOS_FRAMEWORK_V1.as_ref(),
@@ -1033,13 +1130,13 @@ pub fn run_aptos_test_with_config(
         if get_move_compiler_v2_from_env() && !matches!(config, TestRunConfig::CompilerV2 { .. }) {
             (Some(EXP_EXT_V2.to_owned()), TestRunConfig::CompilerV2 {
                 language_version: LanguageVersion::default(),
-                v2_experiments: vec![],
+                v2_experiments: vec![("attach-compiled-module".to_owned(), true)],
             })
         } else {
             (Some(EXP_EXT.to_owned()), config)
         };
     let v1_lib = precompiled_v1_stdlib_if_needed(&config);
     let v2_lib = precompiled_v2_stdlib_if_needed(&config);
-    AptosVM::set_paranoid_type_checks(true);
+    set_paranoid_type_checks(true);
     run_test_impl::<AptosTestAdapter>(config, path, v1_lib, v2_lib, &suffix)
 }
diff --git a/aptos-move/aptos-transactional-test-harness/tests/aptos_test_harness/bad_parameter.exp b/aptos-move/aptos-transactional-test-harness/tests/aptos_test_harness/bad_parameter.exp
new file mode 100644
index 0000000000000..91b918cbe6e2d
--- /dev/null
+++ b/aptos-move/aptos-transactional-test-harness/tests/aptos_test_harness/bad_parameter.exp
@@ -0,0 +1,30 @@
+processed 2 tasks
+
+task 1 'publish'. lines 4-10:
+Error: extended checks failed:
+
+error: `init_module` function can only take values of type `signer` or `&signer` as parameters
+  ┌─ TEMPFILE:6:16
+  │
+6 │     public fun init_module(value: u64): u64 { value }
+  │                ^^^^^^^^^^^
+
+error: `init_module` function cannot return values
+  ┌─ TEMPFILE:6:16
+  │
+6 │     public fun init_module(value: u64): u64 { value }
+  │                ^^^^^^^^^^^
+
+error: `init_module` function must be private
+  ┌─ TEMPFILE:6:16
+  │
+6 │     public fun init_module(value: u64): u64 { value }
+  │                ^^^^^^^^^^^
+
+error: type `&mut signer` is not supported as a transaction parameter type
+  ┌─ TEMPFILE:8:14
+  │
+8 │     fun view(_:&mut signer,value: u64): u64 { value }
+  │              ^
+
+
diff --git a/aptos-move/aptos-transactional-test-harness/tests/aptos_test_harness/bad_parameter.move b/aptos-move/aptos-transactional-test-harness/tests/aptos_test_harness/bad_parameter.move
new file mode 100644
index 0000000000000..251b3b44ccd99
--- /dev/null
+++ b/aptos-move/aptos-transactional-test-harness/tests/aptos_test_harness/bad_parameter.move
@@ -0,0 +1,10 @@
+//# init --addresses Alice=0xf75daa73fc071f93593335eb9033da804777eb94491650dd3f095ce6f778acb6
+//#      --private-keys Alice=56a26140eb233750cd14fb168c3eb4bd0782b099cde626ec8aff7f3cceb6364f
+
+//# publish --private-key Alice
+module Alice::M {
+    public fun init_module(value: u64): u64 { value }
+
+    #[view]
+    fun view(_:&mut signer,value: u64): u64 { value }
+}
diff --git a/aptos-move/aptos-transactional-test-harness/tests/aptos_test_harness/bad_parameter.v2_exp b/aptos-move/aptos-transactional-test-harness/tests/aptos_test_harness/bad_parameter.v2_exp
new file mode 100644
index 0000000000000..91b918cbe6e2d
--- /dev/null
+++ b/aptos-move/aptos-transactional-test-harness/tests/aptos_test_harness/bad_parameter.v2_exp
@@ -0,0 +1,30 @@
+processed 2 tasks
+
+task 1 'publish'. lines 4-10:
+Error: extended checks failed:
+
+error: `init_module` function can only take values of type `signer` or `&signer` as parameters
+  ┌─ TEMPFILE:6:16
+  │
+6 │     public fun init_module(value: u64): u64 { value }
+  │                ^^^^^^^^^^^
+
+error: `init_module` function cannot return values
+  ┌─ TEMPFILE:6:16
+  │
+6 │     public fun init_module(value: u64): u64 { value }
+  │                ^^^^^^^^^^^
+
+error: `init_module` function must be private
+  ┌─ TEMPFILE:6:16
+  │
+6 │     public fun init_module(value: u64): u64 { value }
+  │                ^^^^^^^^^^^
+
+error: type `&mut signer` is not supported as a transaction parameter type
+  ┌─ TEMPFILE:8:14
+  │
+8 │     fun view(_:&mut signer,value: u64): u64 { value }
+  │              ^
+
+
diff --git a/aptos-move/aptos-transactional-test-harness/tests/aptos_test_harness/borrow_in_loop.v2_exp b/aptos-move/aptos-transactional-test-harness/tests/aptos_test_harness/borrow_in_loop.v2_exp
index f7386474fbc02..69a5b16b8f367 100644
--- a/aptos-move/aptos-transactional-test-harness/tests/aptos_test_harness/borrow_in_loop.v2_exp
+++ b/aptos-move/aptos-transactional-test-harness/tests/aptos_test_harness/borrow_in_loop.v2_exp
@@ -4,7 +4,7 @@ task 1 'publish'. lines 4-26:
 Error: VMError with status STLOC_UNSAFE_TO_DESTROY_ERROR at location Module ModuleId { address: f75daa73fc071f93593335eb9033da804777eb94491650dd3f095ce6f778acb6, name: Identifier("m") } at index 0 for function definition at code offset 11 in function definition 0
 
 task 2 'run'. lines 28-28:
-Error: Failed to execute transaction. ExecutionStatus: MiscellaneousError(Some(LINKER_ERROR))
+Error: Failed to execute transaction. ExecutionStatus: MiscellaneousError(None)
 
 task 3 'run'. lines 30-44:
-Error: Failed to execute transaction. ExecutionStatus: MiscellaneousError(Some(STLOC_UNSAFE_TO_DESTROY_ERROR))
+Error: Failed to execute transaction. ExecutionStatus: MiscellaneousError(None)
diff --git a/aptos-move/aptos-transactional-test-harness/tests/aptos_test_harness/bug_bbb75fa.exp b/aptos-move/aptos-transactional-test-harness/tests/aptos_test_harness/bug_bbb75fa.exp
new file mode 100644
index 0000000000000..457ace9c4acb6
--- /dev/null
+++ b/aptos-move/aptos-transactional-test-harness/tests/aptos_test_harness/bug_bbb75fa.exp
@@ -0,0 +1 @@
+processed 4 tasks
diff --git a/aptos-move/aptos-transactional-test-harness/tests/aptos_test_harness/bug_bbb75fa.move b/aptos-move/aptos-transactional-test-harness/tests/aptos_test_harness/bug_bbb75fa.move
new file mode 100644
index 0000000000000..f1349fce8d561
--- /dev/null
+++ b/aptos-move/aptos-transactional-test-harness/tests/aptos_test_harness/bug_bbb75fa.move
@@ -0,0 +1,101 @@
+//# init --addresses Alice=0xbbb75fa0541df726acb791a1cf919b11ccbb31d2d0546a9df77359202aa82e69
+//#      --private-keys Alice=56a26140eb233750cd14fb168c3eb4bd0782b099cde626ec8aff7f3cceb6364f
+
+//# publish --private-key Alice
+module 0xbbb75fa0541df726acb791a1cf919b11ccbb31d2d0546a9df77359202aa82e69::keys {
+    public fun keys() : vector<address> {
+        vector[@0x6c248a37566cdaab3a277fdd8179eb41dbe39ec8bc4055e62f150856ad2386bc, @0x53b993ab4640591dbb3958e3474c10eed442d5b2a6ea648f263bbbb376972aaa, @0xcc4c748c3838298f8d606f10097f98ba95ab62a71762409aa20fd0aec9198219, @0x239589c5cfb0cc96f76fa59165a7cbb6ef99ad50d0acc34cf3a2585d861511be, @0x115599444422ac3aac53b987ecac122d0b19b70e59153e0302c93cd7f143f43d, @0xb705947cc311eaed5f67b2436b1708e2b4f16e7411ab4c5d19d2a373d9b07bcc, @0x3a853701b40317b2753b03347d90392effff4a68bb482e3362b452e28cb8b8c0, @0xff713764cce157d730042b2feb281527c9d79aa62c7f32f88cfad246f0239904, @0xc3daa734d794d7d8a60694eb8e755653c5b2f5ed4981af1c3ad6a3c93c24bbfb, @0xad9c746622f1b9ed76156f28bb7c3e8bf5241d8343723787919e8078ea043db, @0x14559337b359060b0dd181daa482cc26d6cdbde3d66e69e2aa7156008dc7e196, @0x8f661b63e73e3886307546be98d4059cce2ad6143e769f075706c6c94e049c1, @0x7cbda0b701f8f4d921d4120f782c33f115286966e87cca5244a4a4980cc78844, @0xc7b436331537eca7bf5d81cf6b242eea8a4b4cee606e96d629f7b00d0075f514, @0xf1ac91ac72292bb0296ff5bc39fa3d3adf365b7983b500aa8c72fd6ef5b15e29, @0x8bbe812044778a106056a444df92676faa6d329c78edfa6e87de2fbf557e880b, @0xf0204fc70c6d1e6a5c64bc2dfd3402adf5ad70aced216a20a3da9138d94a3087, @0xcca92a1dd6443246f22645029e78b3964dfa400e7c4644df28146054ea1b6e9e, @0x9d3985d10b89a74e2af4ac67a11d105a83de2a3aae05d705e6fc89649dca7d6a, @0x3e79b99fb982270986c5d506d1e7cc388db3bb2a8bb75744491d5992734293a0, @0x860c8d1064fe2c1d9dc33dff7bdf437d51fa3062fba17bc98a2c2b61de2fe6a2, @0x5b717715d82bd41a4b9ba3843745a1187eb7ccdd7f275d9c13f8bdfaaa596897, @0xb78ec3a31faf724f6c0072ae2b7d29db0bc4d77bb3b4693af07ab87a1005a794, @0x874102e12eb94d8ae92c19d7dc92ca95a6859eac9f6bbb99c7df2dd259485f6a, @0x27ec852ef194ab6055c237aa11f02a789264e763fc63ee58368c9ff4edd6347b, @0xadecd9aeb20144dc1472481879f159c49bdbc950d1123cd06d047c8838cefd, @0x3c06d2e19763b54183502313e1211cdca5c197e88aa7d9e614e94dd1c14cdab0, @0x7951b46c0c939a0b5736c604792ada20b3379e1f43d0721dd0a00bc48c769929, @0x22babbabf6ef7fed6cfca5e3035b12b84597dd3de34cbc8c1a924e32e7dbf92f, @0x8da605c524a50c9844e001502bcc75de20f546acdc9df1ef527122795c9907da, @0x3ec1448c961259d12bd1d52366c97e0ff43be06c98bed018b83b9f64590e397f, @0x19aa1e8111cb456d838bd36b7910b1177d7685690c3bf402cc5ab10ae544e729, @0xdc1f0e38516c930776a55b8d4c7d3f9220759b87b4642f5ee89cc0b9aed25dd8, @0x4a0be1d92d5eb04b2a721ff2ee81ee764fb27797a94f7d097bcc23172e2dd75b, @0xca89d551e36bfc035a920cf8d9a0c7b2c2955945b13e9377da4247b843d9cc83, @0xc00e21d6fadf73e36e186f8383f5ac4d25a77e0dbaa9c1a2f1ac575f5985fae8, @0x6644e436556d68f3767308e849fa53a6f0da868bdd8cba37663a313624fff31c, @0x41e8f2b99e63a59156b07ce332aea75e1d6b674b919976aa36a2fecf3d5f2370, @0x6f0a433ce13035dcb29ff5090b282d95c15cc36b8390191542228895b8dd3f81, @0xcd279a13346bc50afaeec950f9ca56ef465035a22c9fdca58373c58c5f55a8ba, @0xe7bdcbe64fcc9e94a9c22c92e2f6dda6802ffa194d79807573f45a52f489670b, @0x1234344d55d23fb5f93c72e0273c79b1b9c555481cebf519b33f252bc98f6d21, @0x372016bd5e0265541eb15d666fed2d21613744c786ac265f11a4d966c67cb809, @0xe67887104762da9084d6133d71c72264c75d60e32153f2963f9a60f6a8212f18, @0x3a471ed894b39e1cbe8ad02b659aa8fc29d22ad26137f346395db3f9f2c5d19e, @0x7edafda47989929bca0e2d2dac0773585a323732eeae8763ffb06b8a3778382d, @0x1f4eeff676eec96bffee6097c6f9b35d5eb618f3933616bd79d735b0e8f5c94e, @0xa138dd9e3257e10fcdc675ece9c54c61501c4d2d82bb3125e4f098fd3dee1190, @0xc4f3b4c1058c5493deecafc9e5fe80177ad8c5e797e087b78d777e4a12c1a53d, @0x681ec32f8c2f40b068884a969d223a1f9e11798c7c4d74776533417a475df223, @0x1eeed1a4a6e6f0a6e6761adc8eccac266b40a0f1d98612eb607acb378e94d506, @0xe94ed39cc5c0ce0891962978b582b7c5ccb324bfb6af02c18a5651a081163e73, @0x9cc33c0868023be611af58de54f8d2f2fe1cebfb457264367945f239e348f9f5, @0x594dc9c56f3032d61f71b52e322a7207fa648d6306eec3d5081b3c9e86ee1ba6, @0xe85cf2fe424c7613c733b5eca31d118f54fea0078372b967560d547566ccb188, @0x770d2cf0f4dbe4f6cb77fa1a5d736091ba2c289e159b1a9c7101db825304442b, @0xe87129fd42d25cdf6ec17c50b0c92747625dea13911a59d9683901af36f2b11d, @0x3f60f877cad632d94668228139b4ae67512c1e36dab5decb5e67ae0a44b20249, @0x8ad5c8e220b494043ee2aaeada81588e99f3224da86940b19c31869f236a5bf2, @0x41d89f96adae127108aee8803990169bc024e3f6abc326588d050d7cb3cc937a, @0x46a7b071db89137f6e54bcd0901870f1343e4979ea2513dc50fee38ebbd4f74b, @0xa3f087de0bf385600112043fb562627dca6edb857094dc5a6cf697f550b48986, @0x4617c794d2e1aa975dceb6e34f90d669fe852d11654e044bc9be1014b28c6296, @0xe7f201e3408d60b83e23272ce90e33e35b34e69145ff3fc584e2915b99d834c6, @0xff398e393f8af18506da2a9027f2481496dcd02c1f875deef4f906424faef3a5, @0x7eccb822f9e94112e4ed9b63a2368876fc327ef8e4909d88b5c67bae8838c306, @0x504b02838d114998f9c22ea5af17333f1bf065a50baf1b706efc2e1759861bfc, @0x48f5d7d40568a1a8c66460b70924648faf3cb45dbd666b10952c3ecd163ffbae, @0xe0d6a95fa3ed455e0d00c39c53da1730337898a2f4b9e460b984b302108908e4, @0x9144b5ac1ca50ab4ea5bbcf70de01d5e1c3b7f72ee46b6b213111ecc196c6bcc, @0x2c71be64437a7796a7c1f295418b2d88e208ac7fb009eaaba2ac7dc29d1dc507, @0xff49fd4809901e0c2f4d13a0857c00cbdcf46cbb71a32b3ef26372aae6ca06b, @0xb710c6ca89cff1883bccf12fb7b97d307bd103b2f21710028a9f72e1ad2c6659, @0xd2e42b54dbdc52954b69a8f8a97f29beb2f38707e9ae087b658311f4c881e274, @0xff471a7f5b4c092e7ab0cced91cea48105f721c0c91fa975b1390d9f1fc2216, @0xbe4f0a15bc8c3dde3e93634696dc0c0e99e9125c4415dc6578f11ddd3084b036, @0x4f1487072cdaf9204511b334f233f292b69b59fa244e6ee7e0399b1a9a4b62ec, @0x382b7524ee8b1dfefcb4e96a5807ec721c46bb06cba9a727cc75a077703d1c44, @0x543bbc0dcf32422e1bea9a5cc74e7c8974aab93108b011ca1e242fc6dde56d80, @0x234d3fd61afbbaed461298d7871209417f047c6c3179da7f8e741acd751d342d, @0x9b757d8cbd48128775154192f086b76aac5c5fb363b3220faac57ab0972060e6, @0xb73016d5d81ce1c46c1987acb72f0866076404b5367ec2594a0344823c09066b, @0xb79bc58e6452c94ee652d0e88802767bfdd478977ce7934099d5dac232f9c340, @0xba4ae5242dff386818302ab7e87b25fb7c5dd9c0c115ce3af1d9ea9fb99bc4, @0x50b8be74f90ba86d55a59013e654511677cfc9ee5f762f427dd8ff5da6bb89ca, @0x75860fde2fa8bb35990cb127c3812f49b2782bc1623b5bb40543e89935e805b6, @0xb5ebf3181690a8cb7c860b6f9c6f777c2f715493edd05fc1defc591e05ec055e, @0xca4e5ab9b7cb596ac1df47e3c1b06abb18b6c6483b460bb45f1b80bf78b02729, @0x634d116377fd29ec21bc4f1654a41cde82de3b497d673ac3770f968fa420cc4d, @0xfc54bb2e65f32eff8be55f9ea61f0ad030cf332a7be5442feb388911deb0b5bc, @0x6a643fab1a79b8a6b6333ae016bf1d6c856bc927ecd33fd38ef37ab8358180d9, @0x409847430956e4e15ef33c169808d353242c67124072a47cc70dd4960372047, @0x5125fe9198abdf95951e9eaca45878ef3656dca3ddd29834998cdc1c2260aba1, @0x86912e0b6b3ce3ef0c453fda4bce9899689ae9b83dc1f2255d026598ed24f5c0, @0xd14ac5c322aba5b4a1d3cf27dfddcb96d80de9413652d383d94cf783be986416, @0xdf5ced41c57ce6d9ac5cb43f9636ca33ba1defdba3effcdf0dd2893a177b465e, @0x5778c5bd71ad4d1ee2d080d4aabf73ee18fadec8fa347936375a92792299c6e9, @0x7614171c1588608a39dcd0b2a887b7b61d172997e0db80474eadd8f2e25193ca, @0x450566dfca18e136900f4e5b3a7c5762953161a6d727033d4b1eb4db371a5218, @0x2bde912e017fe542553202a8254af8802d7e86cfa8e288a72ce9b9f38f614196, @0x2ef8639f0a8707d1078e025dd3ce67264d096fa76cdfad5e2a5b61760b759386, @0x5deab63ba02215ac8b66eb91d3dc8264de67c4eff5aa8b759b829eac51f12c82, @0x7ad837d174aa5d9583a382d3185c0121442e49aac6a4c0960876db6c3af0457c, @0x5785af1674046cbbcfd7189613e761cf086495daef3b90b366b89bb305766117, @0xeb67b44bef740cdb14701b898e7cf817cebd8ed3c2714e5759f1b36ccea38f1a, @0xd6f6431f3b5ceab1dcbfaa8715b496ad8be202f79b62c7c9751140cab4911cc, @0x97a6556c9d8ad8e3d3e6ed8d8da4f5370a05be5f89fd925f38a39805691e3525, @0x490259e19fe46961b0bdcf89b16b0f41efecaefa462510b4b48a54cbb2f2d8c3, @0x73e31ff34ecfaac70e22f0bb0ffc670f923b8d305b05377bcbaca9882c3c426e, @0x56e6a11d375d84f657a1360e196a04b87076b45aaefe668e7661a4d27da78ca2, @0xa72ef7b9a25cdd5163761e52860c5d47168bb7f0d12a1cab20ee05924e27d257, @0x28b39074d526d7c1decb35aad593279000afee7768d333f16540674278ba4c66, @0x345f11b07ec75a8b1852fc9b08519e0d12b1186e69f42524a89e060fc3c7f7f, @0x386d9a78b9721bfa85946af9ee45a52a4bb667d308dcc1e219b81caf80d0bb86, @0x5bf42d4e2ae8a0d8ad70321448ff7a03d00705ea7b959cfcd083d317523ab5f4, @0x2fe2c0f12f597147e40eaa07e60d3e37510d7142dc6a7b905e6ff1a07a7d24f6, @0xddf2f77f9ccc81326c128d98e773b0fc4e9de5e14141ff73a869d5ffe284b3c, @0xd5c6319f7be5d3332cb2a3d05fa9c4f7f5c5ce33c3cca5c2b14a013bc790b1f5, @0xba371e921af5b8a79b7b91fe3efab84a840eb1a90b4f61804d6ea58e99459a8b, @0xd256722b9d9a07322e51e85aafcfa48115c18ba1e1a8b1112e8e7903c714b213, @0x3d6fdf26168b1017975b06497fe15bfdb68d608cc064fd8dafe4436788fcaf9a, @0x65f94785355181a55ebf67026790b1dc17af5abd01874e27b05d48917301fc00, @0x96efa0dd77c0c9e125575ee1148c47d280f98d83f2a8051636cadc16c4113bcc, @0x63a4e68e43f87818e8a268efa352da18f5256d500d557e66cbaa2d88e279d12e, @0x4f29767b98a3bad0eee163d0b02bc5fcf094007edcf7367fb2737edde74ba791, @0xd483dad9e42136a992a113672257f8c9dbcdaa9cb47c7c30efab39b06ab0df0e, @0xb4aec007c0dc1e5e912f51530679b6f349892d79d0913b0e34c71942972d7483, @0x67e6ff8b3bbd81828706073d263fc12d918259f9dfa996cb57696d8fde7688c0, @0x178ebe969b9ba8f3cd86d5e01d6602d144870ad32120a01ee427e4d362bdd000, @0xb2c863fc73fc9a9da374beaa93c99ba7fb2106d84dd4d55f04bbf0790c114103, @0x82971b9832420f613bd615bd901a2457b64234c0237aeada64c9fe112a78d54, @0x26429b30d71cc996a45b4990b2e04a726eb33a1e37987ee175309549315d6e6a, @0x3a00c60bbd343d54dc4bbcd8d01ba62a642e8f0330ac8cc649e7ba107ef5ae38, @0x4fc4f84812423720fe25c8d067d58b6d27f3c52fbb8bd38554bd52aba674bcba, @0xe15e39a7f3ad2e4e1981e92dad4bf6f79f0e276af6c1bf392747dead0d89bdf8, @0xabc3c62313e5eacc302aaf8b04863d07b9533961bfe2bb4f7ecdbd784dd633ce, @0xb5039ed4b874bd00f15ddf3c3597af97e7757c6df3d4f5f9940d9bc889976896, @0x68c255b35748936ea4953639be733ba782ba3755273f07f47405166e5fe7e02, @0x3878acb54b9fa67ba798505b91e148c9d0df4040d6a2e7be021ffb5607f55a2e, @0x191692a4f5ad0dbbee2658a4428adcd47f595350692886767218117635503c14, @0xa21f00e7b0ed8d44aaf280d09348d4a21239a448d934fdf26ebe386ee2748e1f, @0x850f2b42bdf046877270270b721f5c7d3550ba99445b4823cc5d568c3197833, @0x7ed2af4bac78510c03b4d90e6067261352858dc7c87c569764f00a19ab2aab8a, @0xed1b5de7df6c925b6f057ba6d15bb76ed6aec45692810fca435fe04d5f4277b0, @0x7149cbd143018179c09115eb5148f393d25bf02a9fbdda2142843916d63dd523, @0x904136896d0f64402021313caedb0b4931073309be5f48b41c7449fe37cec845, @0x61b8c8443a975130340bf0b95d7774eb730a0545967ce23c3d9847c8e733d374, @0x85c212f917f1a3e4b62f1b27fdf7a784fcb4282b39fee821e0706c8f729e2cdb, @0xf11f8e393e4e04576492d1a8b79dd6be212e6febc8bfaac7e4972d0bf7510574, @0xc6a751328fb2ecbcecb28d08d7c1927b41c20bf7a0ab29ebd58ea5db3a6a79fa, @0x5b9a7bc6d6c5063b271dedecdb36cb88d1b3b42a11e8a4b90ed86007bfad55c3, @0xe86121abf1b21222cd11d7f0475347c47c8541e16880fbe7b3aa3deec8ee5f9f, @0x45c35d49313d1ed26bec2cab4b78fd9bf84681ed3537b1c68785ac0279f0e635, @0x39230686a4201d58d999e30905bc580d59a038a5d0cf947394f8fe0db2d5a6fc, @0x3a8e3a73f4e19d36690a9a17d2b862e268cd55ddf87e16bd765f87141d8ab27c, @0xce00d4f3f5263e3a2839fb012a5ef531ea8c6cd71a2a21481b30fc3c4aa86a, @0x559771cd96f1426cebf303dfd30135c9a3590f13f276a4fff89fee4577502387, @0x881a8a6ccabdb7676f0d21b806cdd2c54742106366a3517dd0239a036029dc79, @0xdf7ef00f48625bab4edb67d0241f7b4361cd4cdf0baf05100645925032ce9dad, @0xf00d52899be2e371cccdd63951ae4ca8b8d33b30726bc327acfb8406fc188377, @0x19dab79061e6f2b6535c71a0df852b22dc2f38436659c2e3901cec75a693d676, @0x8e480e9b942e62d534e99c712aaea4e98e24ab7007626ffac7fa4a8e07eaf7af, @0x5303c27944f9b016e9846331f49b1ee98822117ce8ec4f82a23a2531b1dd7359, @0x6095e8959efed5bf0cf212c61de1ead0cac1b86b403b473689c9b39d82b3ca6b, @0xae452f9c3b19ef6fd966efd49053a0182a15471005923ab479159a7eece092df, @0xd5172b0e30c714e16a306698472755a1056a697f170378694a87b05b9872492d, @0x139eef27bfd8bab87ef85e6c797a3309bcadc4fedc7cb0f76fee7b972de96f9c, @0xeb606567ad61c5aad852a4e7219b993999d4b206a6cb33c5d622dc7661e72c0e, @0x1523dea881101c8f38c4a337cc770d8578a561080a979ce411066e4c3f2188d9, @0x7755b99be601cdabaee83a68adf5ec6b938ac71663f61e79a5271230e72e6d6, @0x94eee83f3a71c62ab936094b0e86707b844c95d67e481eedf03242b35dfd4f0e, @0xdcdd744ebb2209ac67b3eca00ee819811fc268e3e74b6f8557f2a17bba650bec, @0xaaebfcc1b4146fd19cd9a4ab4cacc299e58bd6929969a70ea5aa30a05ab03343, @0xf092a0fa02c1ff6d08839d7bbd67ae7be167ec66206edbcb3902428a2942c9bf, @0xf4c0a46507c995986678bb8a587805a34b551fd887ebf9388256ecfa8e6738e9, @0xbcd35873c2fbbf2aa04507396cc8b827915a35b5069d824aa8317c4bd3dcd481, @0xed71fde46e54def2995b9c5148c2d2c5754afd2c42f164098314aef358c26e4c, @0x576a74e7265c379e3ad054d2716ede0d54f93c18e2df9a39c9c365fd8f294051, @0x752722e3144cab6fe57b1d6bb31a7a006ab499d5c7f685d6af00860dcf5336b2, @0x8cc2c13b9e3541f3a2eb611448a600e79e673ab851816114640311b283ddd5b1, @0x3875925585453892dc8bc8d611aa46a8e78276df8ecc1bdd349085e6d8efa500, @0xc24eef9a32c0484d194da36b61ab5f842bbbec342fc30286e3e5c78ad4e6fcea, @0xcefe66384301ed236d5e59f00b3ca4d6e33877b9e94121ed8268d98778f5ad8c, @0xdd3e38bbd48cc02695cc295abe14e9abb21b4fd7be07cd7eeeeb2241af81f3b7, @0x7af8b32b83ac39f4c27c66353c55f0df3a440fa93396306da733412b06beaf4b, @0xd79f528bbef637fa12d9c0da6c9d4bc4f1d79421e33d1ff6d935951124761220, @0x913c5550c9b51ca49ecbf2fbb68c160610e83f3d8a8123b3107d1afdd6c1b018, @0xadabd7f1cab238cb43f4ab69497bc978cfa1ca7e65b30879969549484b21b29b, @0xb6d7574b2da52e7629fd91973227ba7019d3560354f049d2104bbd8ace657a1e, @0x64d0dc1aa86f088109c0b1aa49b0d211bacceef6bdf34b866f87865c7acde3d5, @0xf3fba8ff7cbdccc15feefddd4a0da73f0c786b92f6ca99844d3dcb9da198946e, @0xf8eefeaf904f6f8763c518b34e6998cf71f548db93dd40e30cad480ff0a4a76c, @0x899e5181b7adc2e034eafe2f96a2b98d7db1d2ef769a0279ddfcb731d3300184, @0x13db85d539d22a9f148be3162b7a0741d6b23e60a20d6887c80f643ca77dafd, @0x42a2d92f408acb4fea8e9f57ec479ca444978170811934187823488a83bc8123, @0x549b54c9b43bde012c7c9bfb65257b967db34815555dbe891c3dc19a2f537a31, @0xbbb8853ef6bf3d5aa04b777237ff6a6c87baa81558de7100e81a72cb492ad585, @0xcd1484d41259b0e5f9268f4ffccd479f215ec0c08c4b1f66d02f83577e93b4b, @0x70f05ddaaaa7f041f46f84cde5a58c13de509c7ed828448c56bdd35a63df2e4d, @0x49d451fd41e192ab75bc2e55a870b17149185fe5f8f98c5f5252df4fa6b3997b, @0x64e816abd71d10026cd376cf17cdadcfb60a03d5376496ccb5d6508aa3740e17, @0x73459a95f5233933a669230e2a6d78138f0d11c46acef5d4dd7429d28f9e65d2, @0x83ad21f8e5351eeb8ee455d2b70d2b3ffc918d2896c4e078717657a02a562714, @0xf97d7fa4272878e9b23f3f17b2c4c90ef687d6fea352ba63abdbf0ca54c00b5c, @0x622c0bc155590c0cd8b11928b645a7a2deabf58f2560361b9062e2303a2be85b, @0xa664fd932e71c18af30ff4057333f509b87655353a182de8d6deeb2ba8125efc, @0x6319b68ff6b151b5b8f324cd27451cb00aa81b88fe29246a4755114cd2c2f7f0, @0x3863e48681aa0c3730ab37942718f69fac4fb7c1d996a59177ebc20be1dab7ef, @0x6360ac9969e3f5b4154bea43b375d5f59818e035381424bb9d2871a699e7eae8, @0x7143fe9cfac6eba8cbf324309a9a10423a449d7fe37492bf773e8ab70ab158b3, @0x21a57508b6db68d5ce19fdbc84310444f27f48d9d70dc6e3881575c3688dc72d, @0x59e291b2babba23822bcec2ee4ca8b787e6939239fed765b2a673d3d10a3cf6f, @0x573dd3d6d6bd6bf96515e003dedbf24457d7a52b48bbb1bdeebec60301c541a, @0xfcf545e938184cb2d937ef4436b416ad292444cb2fb35ad2bd3d35f80ebcae14, @0xd344303cbdd8595cacc37ceb6abcc6d388d393ef46de22c88168d37a44844a8e, @0x910c8ad806fbaa9fc109abd0d8f2481d80a487abccb6f1cd7b531274c07b086c, @0xab2b5c03841dff59808218b0753f11abc4a094d85c944c2c886417cf92176814, @0x4a418e7dd5ca51ca6ae510d4b7026fd58dd925b9f5363ec81863d4ac36c64db3, @0x20ae4e96177026e2aa01c387a1313872eda4dad15278580caee2e9b9d11fe28b, @0x9b43a57c9d4c9f0c968bd612a30d33c5979aacbb5ee99e3e861271bc7c3e0ddd, @0xc1f0b88a9533beff18d1a4d3ab30055f1a54953a7c6fc20824959929a565d3fa, @0x2a70bdab6417e5be5d1189ba852d0735364e9e7a58f88c024d34793d89e3f84f, @0x86fd40883248e09ac4ee46dd855e3d7d3954ed3dc92fc49293e9ccdbf2c7ab13, @0xa2b37002d7dcc40141eb973776f75400eacdc5e99737d5d150988b4a470eaef7, @0x5df2e63545e63e4e27cd8eb18875aef5674a2d77623d017218f80b9e7be868d, @0x804cac7a1ef99a43033a2991bca0a953178fc2ef28c9c2245eed0d06c2238699, @0x7f188cf6d3e6478971c3d5f973d50554bd86bc8b8f89f3daa230108813e4debb, @0x5839343c6f474f1b1abe69c965b84c898b4095274e48588c3aee52679e4139b3, @0xaf3d2c4c0d013bcf91ed7ad5d9cfed9600e9c41153d8a908abfdc16db5d329d2, @0x3d723c5f3cae233c8807f603837ff676b5a249c6dd910bf2625edd15de81d763, @0xe93cb19654d00aa7d8bf467f1ea8de70cfa21026a2af6e69de67a43e667a7baa, @0x26c5db9664f77d1cd6321e656c5172d02720d7779e97a4f56ef52f3c72ea1c2f, @0xcaa517496eb48302871713ca1238a45370bb1c9535d643eba0e1e94fb3245c25, @0xb430e897785e2151245c914bc99656a9b556d7e79feb8a6ab66883227ea5cdf2, @0x3c341340afb67fde731edad0d9c1544de0d9ad00203c3e7bb02509a48e3d968b, @0xa8b37fd2ebed492de0d74e821c7c8c3f463e575b24173b740f796e38eb63eb3a, @0x2ea8299b88debcfd117ff95be23e25780a92b00fef945525b3566105afa566d3, @0x71c325c0dc5ae1d3a112c27d0ef8f02fd172350a4956094a571e8ea93af0e7, @0x1404419a6089fd85478d6b632fb6f548bdf3bd6887451c5f66637287d3e023bc, @0x49e4fbc755af98466e422c36a69f4c3bd067cd5a43d867fc4cce679b912e40bc, @0x51bc9c2eea59682dc6c84b450b69421be16246e6b4780f3fe1c9d7dc9a10cfc3, @0x52f0e3179294fb49a76b11bb625441bdd8f03077ea7f75554adbacbbf14c6355, @0x9937740dd23d3a0c3165632df55308fbc6ac19f69ed6f8e64c5e6e8bcc8c3016, @0xf5f0ea8e6c00eac499ad63a465d3718cfaed30640055e93b35a89c32fb9f105, @0x5337497b1acf63d09e58efca3072a21771a95aa6bf75b4c3df86d8a81c4363c7, @0xc81360fa0e8f7245de3e001d7b02b64fd0495a69ee2415f5a7cc070050dbb00e, @0x225660db24dbd3a23a355ccaa7e62d22e886842347272b5f07f914d99b725171, @0x984a947640b4d00b75342a3225e14e0b463065aafdd0b8f2aa33037a55d082c5, @0xa061b5fbfa2babd4226284b865d0653909dd4e91ed8a0b6b271e65125586d872, @0x12a146a5cae6eb1d5d253b8322937111c8b6282bf6207dd63317e040823fdb4c, @0xe8a117057aa096812bcde8b22c5b86998d2c18e18938868345649ac2d0d44244, @0xcdc19750ed1cbafd39c2be1a2c8a95809819d6c746fe36fa72fb12ec62e68296, @0xfe201d8136403a4931f7db24c9e15e34aa13e790b6308e851740eafaed12e725, @0xb1babe3d2365da2b2e2d3953af5b06d463be9531ec04cbb65abc85a3ee4d3a6, @0xcacb689c6f8baf55ff1cea3d152308ffd3868ff99c99b2900873530ecc8d1980, @0x2421a9ba8bc0d256a9c729865f98e9b074b63347aec661cb46e2e9fb0acce95e, @0x84118504486d35eec51ca910237845ba00e26973e65f73e828032b5a6577b421, @0x5928e9e93821d73ef7ee2e0f0f5fd0da41c9ba605b14a9201abcf1f8e93f3d46, @0x82c11f0a603408bce7e0c1ec8f9eb3dbfd4375757fca1b7d803bb1e5fa12f3fe, @0xcad3b77a16087c12e250cd2caafb6da170c339a3e2c6e59a443d6985c64b1a9d, @0x2afcab5f8c8875c62c2ddabe58a005fddd60c50792130ea6f0c9b66cb63bd7f4, @0x90fa4fd966f84544c66e592b30d71bfe23ba28c37ceed1980947eeb1875ee9ba, @0xba5a3fa173ba91f0e4d763650c67de245dc5d58a999ac2142a62b6410197ba58, @0xa69b03d2eaed4966fbc6e26369dd6a014a1a10343f7b8934e471e416f3ae17e4, @0x57a263b220c54bb88d4912706449c1e24736e21ab3f85151c44cf84025f02b6f, @0xf3ebe2a6e56675d1e4eefd4095ea652cff33dbc8809527ceec724c687015db41, @0xbdf9b227a41c02ff47b9f913218607c24b4fe6c242fbfbd34e010cb1b2ef08d0, @0xc025013a8c21caa3cb9008b7b2a097d37154b2c0a9094d24d663b485b520c706, @0xe7894146be9cc0645156ccb349a55fc722fc84461227b66a425d9181d28f49b6, @0x3f0fc037f4268e09c5669174500c278caf30769205e73226eac9a8bb44e43b5, @0xd494f9bc1323ff9a1e83e8a40bae2c5989602a62328353d38bd253e8b58d5e29, @0x471c90a1b396ee74694d0a55de139ffb457cfdf1fd2c7a2891efb03f7544c8e1, @0xef4041444d60678860be6202da8be7465ee0b3a8ebed01a643359fce54c71a94, @0xe5962b72fc3a4faef57f0ca0755885952559cb190e62d7ceebebb4a5e81fbddf, @0x80c9d00d8bc30737b347d3f30551efa0c8a39ed2bbafc84f07b6ac32534efe9e, @0xffe1e7ccd742bd7eca082eead4512f3ba6182a2594763496abb3ed11f65e90dc, @0x88f0f5ea4643aa4d9161b47bef9db82871aff197650c2a2d03279870a74c12d2, @0x3f27075d9fed6b3cafd29d2f3e0dabfd0e0d50c85b46bb5939d075b44c4e1c50, @0xbfaa9b129e5d192b0b4e30f2af63db284720908a0d983894f454c16988df3ff5, @0xef7b17c8dbb5a738bc2f28fc7b2680210b71855a1378452a5a995da1b7322846, @0x4c6f7fbd8ac15b56a6085416146e873ad70ada3a1aea51c3782313c7c0d2e38, @0x126e196444cb56abd682883711a6ba8220fbeed8a807de029ec77c36cf31df8f, @0x14cc176e0b51853367c5bc4cc2abc4a2571a73fed9294dd9e1e4237396cd17c0, @0xc7136a68113f7f9f94b319b812ae5cfad447442f00abe628bf0ed9058879199d, @0x1dd310d31ad39f1f766833d49e01ffff01209604e3f80c5cf0e082d898865c04, @0x90cebbd75f04b8a1020e8c4b1cede41e04246e901ea82402e19667af3be5acc9, @0x47b0e12c7857d857c2a1c60c26324579f6b066ee35bd42ad7fe7069a03874dd9, @0x54840465b82264b265b96a0c08a1149a99ea92a39b29ea4e5d39ba95e0c27154, @0x17807c4c0c51dc6583f8446f3c983b2d2dd46f7271bf422085e3e423368a3048, @0x46480d5c164ccabb81dd26d551a80c6f348b2080b873f3ed392f01ebbf682b4a, @0xaae51ba14cd3f396a22b898193af2bf531ea289034a5b0e44a955148df71b68c, @0x55ce6bd9961b2f5adacf459899855784f0a6573de86fa2ca202892a18e80960f, @0x4689d54b834734e51b8b01311a1bac8f2adb84d2b82d08c9cc52a6f7fcf74022, @0x45f9dae4d03116db81fea067fc763a4937df32eb6149e919ea8a11f4559befce, @0x1c05e595f6f664699d11f12f099f19c3e98b68f2219a4f103961a00420147727, @0xbcf247bfd814d7222ffddcee5cd1ce7a4665dc724add8ee0a7cacdb43aec6833, @0xcf22746e5c1bdb4a7275930d45ae29155b1a6d1e6a8f2da90a101c482222d3c3, @0x40600409af615c2881d19bc5d1bbb89eb516cb7b68661827f666a328a19070b5, @0x6e41fa84c9129e38e7b06c507997421d87f2864da7df009c217f6f5d285dae5d, @0x91d90473f8bbd7c0e9909d287e2fc955782b21614aa9fd48571c1c2c64e2bd52, @0xa6bcc8055c2b6816b7010d659bc81e82b1e2d6bd5cb829bed9dc9cb5bcc5a679, @0x28659a9f2092f2c6dd4bde38ba1857aa5da4cd7f29dd333a711577f0013de3b9, @0xc27da406f4e579c070e1b8d7c3b94e30e3c56fd6e94bce02ead227ad4ed3b43d, @0x7b10ced0a153d1eedb0d06c25892a9a7127d5194b567e100e71bc8a7e85e0e0f, @0xc19650d508d9b498748594f49b77e88f77aaf88355036ef5852a5ea1d56ae37b, @0x3b23d86bd808bd76e93016a8c81b1ec7d7970b14e85a23b9be7a0afb061a29c2, @0x8fdaf7d0486fad629a3d44d2dd7e9508fc8a6b67641db59586a1ac72a7330c7a, @0x68f5cc1e85c9af048801226507934f695f4653855ff25dfa9f7bd56b539e5e00, @0x59f5688292d68566c7064a1072ae8216ab88031eab05aad96286e9aa1a69f3aa, @0x6a15f2531ee3d2d6e3e166956243e5f2d82eaa1e6110d764566d1fff9d1869a4, @0x5335bdb733efa813b306a1c3cf3ca7e8e8f26cc575e2ffe80ae613a10a11ccb3, @0x4facce12758b3d2dfda6f0fcf5b6bf6925f6d586d8003a90f748e1dfbdf1a87a, @0xfefbfaabe158e31a70047691b86e871352c612c1567a6d0b518f5e9740e9f35a, @0xab1d5c006314f08ff4dd79471935fb64d6f41a7ffdcbf6c232d89db365fa645e, @0x577fe24489ff1eaf89fcdf68d74d34039eabbf81dc96f412895fa1e0aff01408, @0x982eef7ce5ec6f33bad5a8833432017e23f24afd1445d165417dec0d794a74e5, @0x2165cf39a8c365953948c007eb24594e317edc400a5b1a70c3cc4e95a80635bb, @0xbd2ef15150b4d2c60f6d060931fc536e14ffcbf43ee85fb1d1694cb0752315da, @0x71e0b54931ee2091d010f055d7cff56f8723ede96cee3481a7d2e5d8a48ea5f4, @0x56e0af7ab6bd8abab42883f216610d2a6589c431059c7748390874068727cece, @0xa63603832abac57a0f9674584c386b5f359ce1ecefbd51abe5366a429115ec73, @0xc9d0ef317010886343a3d5ea99a427577bf059dad70beb12f02c92240f498e0c, @0x429997598f70c6d1d8e7f439493490e16fe4df2fbb35a1a2d07268b509755dfd, @0x5f8bde2b4da04c9f7fade55181712e24cf7edbad33a8ebf43d84662d8e6f087d, @0xe5e865e8b33c00af4bcc8b5e44e26e7c5f89ae9a4a37a3740e41d43ceedba4d5, @0x30fb20997b2209e0ab5d652497bf8cd592e7a74c2cb9e863a413d8f5a3396a83, @0xafef00b0fe5a36620fc2283f8799c2f1bec872913abcff7bb08599c07c5799b1, @0xf676e329297c947ad797369e798c5cf965a0ea4c931967b4ba6f045f07e62e48, @0x8c7d2d00a518f051852c9327aa4ac671f5c68c51d0ab64508f4fdbc8321e2781, @0xba6077b820850ee90eacd7a49482e313de8fdbcc8c3922ae4c2ece04dbb19f82, @0x5415494427573cf5cd0d5c29dac0ff8871bda1a5fdd68a1d186996ac1afd0e5, @0x21d870e61acc2a174c7c719b8106c2f5e1a4c739b4692322140ae36ff7cfc778, @0x6aa14a620edac42239287f0dc4e0290d2d7eea662cd5f112a67ccb339d4fd118, @0xbaf7c6797275e8b1f3ad2cce4e989b11e08a544ea8e0367af23eda770266d976, @0xe2105ee6c37c71d285289b36adbbd3a4ee89ab66db8aaefec747b4a910f5925f, @0x3e24985f4bdbf040261b985ff3c98c766d7ded3e816d2fc7884be985de5988d7, @0xb9f1066774c295788106f0b0745865838e96cf9181172ea7ba648d4a4f21e084, @0x140aa3e8d75f3c0b0fa8cdaede7d55f59f0be24c05a81254028d7058ec396e56, @0xef63f371da54f384b3317a0153e43d405f51bb456dae92495501212e7b18cf6e, @0x376d4a444ed9c9ee8b37138d68a3705f8f81c33c66cc920702b8f4265ac094f1, @0xb4c103ec2e0c9777e63ede3d89a8b3592a9577c5bae063b85f54ec0b6da1d316, @0xa211fe81e080471c9dd02d25f707058901d236c25a1a0ed4146726ca63dc0649, @0x737be0edfdb4e09b7c7d8e58756018519f4fc058ee977fc42eb1492d57244c76, @0x60c8d62d718c8e97e730251c47cf7c3dbf08be0bae918886e367329ead65950c, @0x748d6c1d94786e27ee6030f8bcf15daea4479aac05ab32d27f8d1415a2870640, @0x2798f5803048b74c672d8511eb7bb80fef6afa08eed6bd9873a16aba637a7ab1, @0xefb266ebf63f77a9d64c59494e3015d67274d5bd1daf56e361318a64de1370c2, @0x2361919e6704948f17bf52da57c41dfafc43742b7c4f24b50295daeb02d3beb6, @0xe92f34076e00ae67c257c7f046b3dbbf1ba2473f6f1b0338a7310579855fd4d9, @0x8c657699039de7e6202572aa0733f2612bf8d2dcd7a530712cc8c15c1a5e6318, @0xf5a9369a99b1bce4916ea7bf5fec0ba866a296f36d83594dde2c198b76259621, @0xec5aeaa495bc6564bd760271f36fde4ed1589f9d33f0bcf9028c3418957da6a6, @0xd308f0d309e564898de8364deb3dfad802ca42f91fafb7ae2b10bde7e9fa5eda, @0xcba299b64bd6e2abad68d95d0a5560a3f5ea26c53993c51b9114dee3e66d09b5, @0x9cf7202b91eae86113260728568c90d08d1b0e51a28b503dd4e493cdb9ee1be9, @0xd2a3b0fc946aa8b81f2758c9c879f10459075ea423dfad7c869e48ad0fa52250, @0x9b64a360a80621b6a460d24655eed4bbb014a51b33b5efcce01b6021e22b9ea0, @0x835959b07ce5f38e5210e9f7c434d15d645c58de6782475f690079aa556feff9, @0x6a8e372397ec561724203d13d475419a6864929bd6fc456e26cef4f247c5a9fc, @0x3930f697c2906ac6650bd4d5842419ba2ac7dc5cfceccfb92fa5b53a8e1cf7bd, @0xe9ad250613876a9de4b14a016615a3e813144ec06ff8de7c5c90be193a9e3216, @0xa6fba3efef839e13d9ee85628a818d0e0b1623fb10de5d86779188d96f374f68, @0x474901c2f9c73d4356ba907fb7e26e9e8c183115e5d2c234ac35f805633d8d08, @0xe33ee4c7b9365ece0a212f6aa6644edd856f4575b01e5b9d3028087fcb5f9516, @0x1977ce508e0f898fa952b60d090bf4b45e7d53d6dac3e121e5d8a23bad024160, @0x33bf226f3fb5b9b57e3d174e3a26efb604f7a7a236070b84af0bb2267dd5857d, @0x2f0c5e2ee3e82cc05165ad803b5a0141aa9f0e10217c548d67ceed139fae63d7, @0xb422c1d084c9d775a08079bf83cfe2f4f4d44ce294f5524d34c6dcb8c10328f2, @0xec5e7f72331884a6dec774008fc6dc2f161d14afff8191943c4a45301c755b08, @0xad2bfb93c71230d98fa4a3eb93d6243627ad83e0ca5d1632f1e155906a555edc, @0xbaf4205bebc37d30088b2634a998a121dd1c090bb17d86c91a921eace6d09909, @0x7b6d7f57c689344c3e33145f4425b7314d3bad094f574f7f54c14c073bb0b5ef, @0x9d204df9aa6c89800bfb4f0d523436f6c025663730f43d4e570777f60ee9387d, @0xcc926cd066361b355af0d0445cd920dc7e92751596be6e3f3c1c255378fc0f9c, @0x5f8a2a2224e3b1d8ddebed5e4ccb8da8465d76c178199f701253dc327d41f7e8, @0xb753d512bc286fa9e7ada8df21220af1a87014a51a7ecc45c472b96fe123c75d, @0xe11dbb7052969e8895b3616654dbe864da1c672a76412bd1de8d69ebe23c3bbb, @0x8dfed39d419dc907499fd6485d3dde8df2f9169047804c52cbe3450967bc3e8e, @0x2fa5ffd9dafe33ef94b36a640d8da06100e2302283b538f3ae9d3ef330e75ece, @0x9291ca3b49282d44e30a7baf01c846b6aeae3d641881d3b46aa9e4868fc343de, @0x90185a2c8ea8a70d316c45773c70dcbaf19ae68707efd1cedde3108e3c2bf912, @0x6f213db7b4f6c2e83a24c8f896b2982d0a5baeab39deb08deb5c8e6e3bcaa96c, @0x83f1788f3deb2d1c1bbc721f1127c6caaebb682c45dac7b06936d54365287970, @0xc5a0fece21082290dd0674aa80376d2a18eb9c3bd05b0e7112b280d56b739aff, @0x3d4ec62dbae6b55fc7030b5a8bf05bc6184ea0461e2efa3ecc7b7bf3091c88fc, @0xc6cc55bd683e31548b4945bfa7f06ae64c920b2a3f760394a8744843e2141d88, @0xc8cdbfbb3c64f998d6cca51ae665c4262ab05f0935d98a24c4aa77456d40772b, @0xe12526f69d5c90f3e6cff4125cae1cf2bac00258790e4fe1d1b0ef38641df34c, @0xd19f5a8020fdb229b00c0e2b42eb68d8ff2632f72f1c9f853bd6841b5def147d, @0xbc958167937a173ef435663d774ee21103cb4155f7251bbd218f5bff7d7f4c01, @0xce5584e553c52ab09db7737233b82089297c562b39e4111a1e8cdcd2197152a2, @0x22d1f73352243ea23c2b1f4d1a8d233a9051179d4644084fb824cef6fa85a78b, @0x7cd210be40c55bdfdfaf7d0fdfc8bc526928a7db04d2534bf9a6e71d418ea9f5, @0xc2b25b18318ae3d0f159c3177db57485f56fcd13ed415c21415794a282831024, @0xad2e057ea50662d8217e9f5540da3a753af95eec3588695e6cb55f4daddf2d22, @0xf8c0b1238135efb07809299b5cfd3b632be6c1e05e0adf9f7b9f9a525f66cb45, @0x9eab75a5f7eef11c9c595b877c08f903fa44b0fda748a6c7b29d9bbc220b6c01, @0x66d9248dccc0d234852954c7f97c64f6c0134fb21d1508f3e8168c2c122d5d3b, @0x8fd9cfd9176f21f93dc8ad4c09099abf74916027ed9c1c1a719c686b6a7116d0, @0xff194802f060b03629b49825791e7c80fcf8dd2d710bfc4439caa5a74e23f55d, @0x864fa1c78ef64e0107d3a6c034e517d2115931f37e7b26adfacd7a42cfa936b1, @0x6a70e76a3a3df45b980e69935dbac8e732ea571da17c4b537cc5ab130b6011ed, @0x358e812fa83977dcd9b81c04535f566e468b6744aafd451a885db7554c5552be, @0x5452e87787f0c7139e39a38f29032fe2585f50366bc6c3cd6cdcdf91962e4620, @0xfaadac79a5b812138520381f9fc7e49c7246c2a0612bf28e1e166357ff14f748, @0x3e26ba6c0a45460fbf435b4319aecc37fad3f83616c75a70dab49b82a5d7cd5e, @0x4ea2190b899540710a3a6dfa9f4d98da2c7bc3668fb4ae3be9c929cd09c5e9d4, @0x364648756305e96eb1ca2dc8f05ccdfcb31149e123405b7937ceac9a28b4b9b1, @0xef719c4de31b0ad7241e5b472fee7f97f97c6309aaa9eb286168b62fd811a298, @0x7339a94257cc61524c8b15252f2766fbc3c2760f4d9b5dac662a9803845252a6, @0xbc17bbbbd683329d0aa1ec624688b39b641c8a690116e9464843381a20444a66, @0xafcb0c5b9f3f02e5d0475cfc62e69486e837b61b1fc23d110414779a91ed3cec, @0x17c80ddca05fdc9285123a58bee43b4cf2d52e1f976ef76bf1b509f530d4f72e, @0xf1798df0dfa75edf3170a009d1026630d63cee3c097ae2dca4d7a42ffa291545, @0xb93e388f75ce7727fa86cad2679881470847b9f2fd8b0b7f39fd235f9dac6050, @0x6eb89860558b9b5d97dc1f225b3f65e1103b249079f9b4b529369bf50b00cbd, @0x6fa7cace9b824df914fd6db406655bb59e74df6c814c88817d0716d03e0ae2c4, @0x7c1f65c5130829454a11927c113eec6000da983e0923863cf6fc525c15b84771, @0x9ce0da4f328e5ecbdfbdf89c4846096916f39716d738d43d929dc2f9f8dba5d, @0x58cadfc29fccce0150b22f3791d4ecc0b4c647629f6169c46f072a00e4fc6b21, @0x801c4ef33085244d3e49500d40b517a35179302dc0f73149837dcd9f1b5e61fd, @0x8249f42b08b34971dadbf612b5c654cac0e4fd47f6bd1798c328d65699cdcb, @0x2fffdd307c12b98020ca069e45fe82e1b7c3bdea2454e662521e6cfd5d1ae657, @0x110cef485bfba13e665a89d826c2d87935467e3b1d0ad1a7cfb807757d8282ca, @0xbfdcb5867dd8f5c947e2db3ac8da7bb9ec16bf711b35af1d30da60552e3f632f, @0x8769e6fb9c1a6af9fadd1e8a709748587f7f19a2f2dff3679898b215d053ca11, @0x31841a4d7a0019fa7b9c9168aebf61e75070a5db3c9b511b3c6dfd7d0818ef13, @0xa806145974fe3b748aa194c11baaff1d7aeb795f3754be73102bd49dccb18f7a, @0xc0882c34656dc60c180a6aa502f118cb84e1c3429f0281e7001aa3ea58235298, @0x1f910f662f5cfe6872b02b9e1a5dbc902ff8575189f61ccb7fcf91aca53fee1a, @0x14e4876f13b74312ede8fd4c9eadb02378118a24916be0fb159432db2b48a213, @0xb0cdc88effc04d8c4afcbfe3cdaf55f6b621d053a54b06b272c0b275a4e9d71e, @0x7823c6fcde7aa5c1e3c6dc9de03320a1567c8f83de630390d2da9de9caab9d9, @0xf19a3c5eabe9a1041fd17d08b0a057246648b25d26ff6e490b82e74c71711ca3, @0x1b7c12f45d72a2d1530959b6e96f304b9b683ed49a39cb24c88e4e510716a6ef, @0x5e07cf4554c915672b980a892e69c20cef2d18e8a923ff9093c0c8ea973adf99, @0xd15e84bd05ec89a486493c8b83f12b66aa431e22c2bf84346d7a5b4d401de0a1, @0x43d5ff072e4cd37b52e6fd20398b55e2e15808645a90fcd935f2d620dcb33821, @0x9a639e1131823632103cd70e4999b60f865532cc1b49f8226f17b0b5c11a58c9, @0x22a72a3e26e7fc544b8cd701fdb74be9cc0b314a839d15b0338a10123e38fba1, @0x9101d677998b91d407ef8784db0a812e1a0bb55ea93c0f5b4fbc37c5701f4b36, @0x68153179a8ab5405cde1d8c533f5db4609d4ac9725652d2e20f176808b363970, @0x18e497109bb1e401ad02c1aaa9bc63b2be99c476f0dc2ff44675e9989aabdfe, @0x81ae174d381a9d6fcb06a1aab6fae15a4792d13f3bc67b02b5efd9385eb5e878, @0xbd012c84edd50133e2b8f244e845c3e30c0b04b52312207e1da7798ddd78850f, @0xb4747755918b73c4a15f8a163600b69381b8b53fd80dcfacaf1f0c999f0ed93a, @0x55467626b01d2ece914c288d3852c674a3bbf07b2903520efc5afae30de7b03f, @0x376ffb4d087032c06308387720a0f7a48c5e3c62d8fd2493d8dea8267ac60f15, @0xc3bd0a434bffac4ed4bf39f2cae0f4d3f5125ff13c97b98c16a8dfd7b12bbc99, @0x9e1ac5042b63357e657259053b63f376091dcfb445e04d7604022c803f305c01, @0x2caa79e4524a76622036892cea75939b0a367d8491962c9a9e7704f0a769c997, @0x8c4d26e0763668bed74f8ae3eb4f00b1bc183a520bcd44d35ad4cfab9f6127e5, @0xa972379a4c2e68f8da8d7badd26dfcadbff608f282189be4b30f26f1621f3b02, @0x917895e255eff4f620f3997d540b8e36441d556aede0030e3b1812eaab6c37c7, @0xb62f0f2c60cbe9b394ebdbd104cb967e38da3e51844958a4e72b3bfe4282ab8b, @0xf410df0679fae8bc1f4a19f2f241ca2e3050cb019b8da348f2ef363383672296, @0xe68c06a5a61dfe2cbf1bbca3f465dd7fe25ae5cbc7a83faf0d358656dc74ef27, @0xd99c45307e0b7437b735b19e39c80540c36070f01abe922f78f2c9cef7809040, @0xa005b12036aba48a467f15ff26404b89e2fe2738302d1358754616524077c04d, @0xf198f46df4ab0ef1bfd76d14dbabf3d10226b5599f39f54ed3592dba7b673492, @0xd4b7776769db5468d5325ced2302732d5445e9834f62c372018e7cbd1dced0e6, @0x52aa836074a64cd6db3bbe2ea85019cdb3e7061c2f5c64cfc08b8c926b8d42f7, @0xaadaa310f4b19213fddccc9c95ac8a46efcb33f9e2389dab41cd5d8b03e84528, @0x5cdc216cf6fd9ee4ae02527cdb7144e38a5641a1ef5bac84b3434502dbb1afd8, @0x9b9f5324633bd71483f8f6aef7c0208fd29be218d8c71801859380feb02024c0, @0x7195f048913516b21408e236014f4a799e2631d09a4b213ad0a2488752e1af0a, @0xcb02d6c905568e628774efc426b84f48b7b7a5fad62397cc79d499add76384a3, @0xd77f90cb3eff2b2c35e053fafa858118f181cd4741ae6e4a6240fa4aea004a0e, @0x3f8db5abc0e1a9e08b5b47309db095197cab2c8daac76a0f6495ed4d6afba4cb, @0x70a846dec48b246660488467d2fe52af3f62066a9c056e8fb7be739931055c3b, @0x46f3c130b1ad11c0aa7e1054ab1177698cba385e8e7dd9a61b98058c8b88ea79, @0xf14d0cb7fe2b870dcb12e463bf739630b17a93dab5d90bc8260ac9fb8c59336c, @0x33804f2f8cfc4b9e198993314b960b8b7ba66a963e20e0ee2f69153c9573067f, @0xd38cca6f8968e0fa05dd85965854433830ac33a9e63e4dc6346943ed65c865b7, @0x933a37f5cbb32ad7f5f98ffdd930a77974c5cdd10e8adca311d622a8f97b99f2, @0xfd07e4b0cb6bc91d48b0ab04e3db3c3d5d38a1a9327b758a5f2c66e42b0c13d7, @0xc3fdf908ac169dc4856e50873fc96c24956f120bef5822f172fab6132d0beb5f, @0xe53bfb139f1ca127543bb7c35808831c4609a02ed23d22b06b035a335a4d940d, @0x5f59e7752cf66224bdcda20571983aafb35153dfbf7149bfba5cd981fb364428, @0xec6e7cb596bb32103045cb2936324ed775e2b1555a4534a33f64e1fd22bd6ecf, @0xa076a2e4049bd55a1c58946c7d8f9ae100b8cdaf2c9935accbf99f9da678f177, @0x1b8584cefd0fed507a168775269995407beebfafa6420eaa85582eecc6933f4f, @0x757f9315f5a3dc26e4e9349fb91b6652cd680e3b8ea5a256b6d6c169290b6d0e, @0xfa3dd7a305777271404b875b44fc3d75d68c82a3b178aab94393d2a124ec056a, @0x57ce742b99b81e72d618a6a12f594400f5af31716fa482bd9936978faafb80cd, @0x711c4b71cf8aeeef4947bd829660a287fce5555c2e7997d2bd897e5ad191563e, @0x2a384cf1a4e6743582f18a3eb8b1fb62c6f737338b9e3b03395ec8c9665efb46, @0xf6b950b422bc1ec05835c18dfb2ad5c1b115e2ff666ae60f2e7b0003ce268367, @0xf7bad200fb2b63c8cd6f0ca778772985ec9067fc131a44270840019444cd3878, @0xa214a43715af42e0b7b4b73c7b3bbf2babf489b5b0d052967bda44e5e211ef5f, @0x6d4eb648a63a41f3e255857d4cb99386cd27c08b704160e0b37ab08e7724f0c5, @0xd9045b2df55accdc1e38a4550ebbce04a132636ff9918288ffe8c9baf1ef0120, @0x65d11d9f5b90eb9f191a47ae50c73e34c7effecf8931a838e2d8ebe49a99a5d7, @0xa06efe6c721b2b7059f8ddb18802a889b2d49c72548b91d5590f819b6163515d, @0xde7f2075496f3770014d7429df45c63ac05e9c3f1b9f2f4cd435b061a4e61d48, @0xe0aa58daf94d4ca194fd4c4d9c845898c6c7c00f81e1a6f6fdc7a093d33169d4, @0x1e39979993020fa846fe8fb768cc3e1fc109d56dc27fa5765ef34e5c9d145b1a, @0xd114fb4e6bcd5b0979dcb06b7f4c3cc0d09cabe0e42491ac95a5b04bba58b70e, @0x3a71ada84d45b5ff6bc624381c8421620c2d1914ec3092ad0134b3704c600dae, @0xab1fa22241005fdb376d42bda60982ebaa8018e12a0f073b91a830e35fa4bdcc, @0xb037af0388c455d5839f4184bc42211ee06fce62a53ccda07d2287e89bc4c61e, @0x60307131ed727cba5c602125db50da0d04fede45af57975172010417659c6c35, @0x1bbcecff81b4e1699318439661510fa1b19e92d722931c3c2793021eb555b41f, @0x5d41859152179cfa5e97cfbce516270a67c54e713b7a75209700aeaab3fbdbfe, @0x84256cd20f52f98777fc448183e18e49606ce17a4e7529d0d4669c693d8b49e2, @0xaa17a780c1f36e75f266471bc82a9df6432169881637046a57a28f7096f94c3f, @0x35b175d363f694e07bfb67bb052585c1f29ecd660492c1f793042a363b09ecae, @0x739b56c3fe725fd6470259f047c3399ea368385febc8e428a6849df80a70ec54, @0x9f4876f6599750f9a2d6d34b385b048df8aac89548f4f7618163a7c2cb7374b4, @0xb89c868e4f00a2b0086db36d030f1b3a88c9a919b32e3451c43ef687784f85b3, @0x70fb519069bc98e10df70e88606295c21abff504ec7571d0f9ca7d89045583fb, @0xb8c097212150f057aa51cde1f80bce1d37f7dff5fa62ee09fcb8f80393ccf364, @0x687c05e92764bafb53282ebb558715a7275767b190d38736dd93d7558065e484, @0x69e82a385968fcdbe7a4e9243b128c4b7c2cd2e5a1b89fdd8062d3765b6c5d0d, @0xdac6cc1f22b6bc2850c07826f1224146fa9c60f7bda17805a339685bc0e91619, @0x81e4206c3b4c98f3fc670b5247c5303ae1b10722e057aa133e126858d0f9049, @0xba587ac776d81f37a4df61a65f54871151e55f41225315d41b2af2f94e5fea50, @0x9e40c01f828a85c777960d2cb71b7ecd4f9c838aafa0b8d194d16a9dc812cedb, @0xc6156578c2bf8edb1e4f624c67414088ee0e937c465b5860ded3dd944ea5d8ca, @0x8c8cbc5a6dd5b4b5270b8a5fd134a6c1a1aa9907a70e3d09eb8045968c69b47e, @0x16dedd80662d620f471831577dc2f93970bf410c2bbbc802ab419963701a6c82, @0x544acee1dd0f16f7ceaf70d98cb244b84be0fa3c7ba5f09d255e1ec49ae9d2d2, @0x4b0b246a0b4659f0fd65234690595b4be26444ec2e0f1752f4466c815766a3b6, @0x11d83b51564567473d18d7a490673b6af09622275e19ab1d8d0e16d142c4b309, @0xf90308bc57c4528fcd0576445be9a287ee7c58ceae04bac8c9befa4c3abdcdda, @0x29bad644625174c93dd4b1d4a397d8387a997f5737f7a3a2d35fcb9e8745deee, @0xfa485ec1f0d640d30dbbe83a34d5d18af6a521cc131609fe1ff4c727c52143fc, @0xd9d90df6aaceedcbdd2bb60f654fc89180cbd18cb59f79b625deb91706657f53, @0xf3331291b46e172e0a2d4ac008349f0b4eae92f774565c59e13dd45c431a730e, @0xef835b2a8d26737d97dde396f6f3b827c23c722f13aad978ab7355091d89a649, @0xfb25489f3d2c1db4f9bcdf23ad82788392e72b0a9439a3e3a154af8b66421463, @0xa338a339303a2231080dfbcbb1b0aab6507939a764a8754c53fe81e200efa88a, @0xbe97a5f7bd511021ed4b8943d03c52a768988fd521ead5c60e28f5bd0ef5120f, @0x6f3eac0353d98de520e3334f2ed76ceb2e3d46733c3f23dcfbb646427f2a7387, @0x67ffb987f426ddb85b576635b674a58c5455c69a10be8347ce6c5ac988f843bd, @0x8c6b042df468dc1c0b5cff812629de1ad7d68cb483d09a91a33c25d8bf12ea4c, @0x7d7d71386c33f11a58ae964d3364ce7a84af16f686f3b83b9154a0c41a5d72be, @0x7d780360fe1b965b38096ba0c9b7603ec1aa1e065cdd02364095aab99fc3b32a, @0x6de531cdd1901cea4fc50300b9c2405885bb64b1f2680b1c032437ed10e6d197, @0x871c79fe52f3a555a95a18861784b840d8fa082c5c376f80d3a863a18c2ab832, @0x6f6243217472067e55ce7945b52829f48bf927329e8a8121610a9288d97cc1c6, @0xf67233a1922f0edac4439e28a56d6fef1707f9d73c3fab17c7287a25000985c1, @0x373d395521f8af0c8197c7018a1eaa8a3a52f837636db9d48020d63fd8d361c5, @0x40293c9c03fcd48ff12385294e35bb7294feb934e809bcbcfd46fa2afc8cc2b8, @0xa4c83434eccf3a40ed8aad8c575343c15db64d1c81edac2ec294f9a615df6d1e, @0xb93e39945490d9c37e955c75f5a132d2a7ee8574a6db96affb3f28529b3c3097, @0xc3776bd0b1d049912d3d33c004b81afbbe24115b30cb8a9120648719a97acb6b, @0x6474114cf16bcd3b0a3e77e9504beb2cd40570bcfaa7f0ad6e53f4c788566cba, @0xe8cf80d46f0217a51d0436171b75809d115d1913baa8527fea729c82809d1a67, @0x24b19fe0e444c6b66511af5982de753c03e8030697e87fa26f6173fd19489cd1, @0x5af98aa021aee870fa9fedddb8066258a64e3ec4cf45df2a0902af3de7b5afd3, @0x36b131b4b2dac120342e8565bf22848199c906e596e2e4ef8c1e3333c305f2ca, @0xc49c11b87131f110f5be123777eb1a319a4e21cca82ecbaa82b849ea1b989eda, @0x892edfb21df4fd5b04f1a17c2ba229ecedd77f49b3419eabb1e08aaafaa1bdcd, @0xfb4fe3d07a34c3a81137b206e979d9260a22dfef5ec8921740821e30391be2af, @0x69ed91eeaff376ef4431932df9fb104a04838f353a6f57ef1e529a51809f436a, @0xcf06059641c7d9623427e6eff3723fc2d83d55661475fa45c577aa2c11d31711, @0x71896f84332c227a6317054fd6c6c2184fecf339f8d16e8c0b67fddea391170a, @0x4aa117ac5d688f36f0fabd6c96ec090fa0a583a0beeac216a626d9cf1d3d3a01, @0x80b0b52b74b983ecb20ac2fb5e54eb006e51eefad083516ed720de61804b4c99, @0x5f13c790cf38cfe95a40ffc4dc90ce754d54d826b75889d6dba9766011b40a5e, @0x64b95f7fef2c4c3b7738a73fad7a13233aebe96d283542be11cfae22185609ae, @0x7ba8a825b8388cabf47ce018da192fa5a717a968ef9843217f429b63dc120541, @0xc40c78d31960ea1d6154c523c775f6315f0002b68c8f9e43575617fd1006a7fd, @0xde8d1b6c6cdf3b87b61c99defc66187b6eeba05eed45ca3f52e7551730e24a83, @0x86ed3d11699c5c197e30fa5297bdc6c12efdf8d7dda57d9dfab9c86af77d6dec, @0x1110ba4c5ef6e247e92f4d18650f0fc8dcaf1a7a859374b702c1495f3cfa1e3c, @0x13816865e9c3fab11d77c37d3d198398ef4198aef7d2be932316993ffed50f93, @0x9d2eae8b326b6e3dae6059e98175007d8c56e46be68a529c1549dd43586506c1, @0xf32c59f8142fc5594bf052712fd184796325798ab98a8c52093699d9c549da0d, @0xba8ccfa7f6a1eb775ef5adbbc3bb1dcf74d7b44555daa6e753523325108d941a, @0x7b5661980dedfc0f5c4d87c714982b7220fb04c376b940d0bee9df6430ec3d95, @0xed1e7884ae7ff2df988cf0dfea294f39a470dbb98a9ffaf073c4876ad043e1dd, @0x212822a256664ca14ad4bce040c343bc3af1cce8f36779e505372adfffa5c52c, @0xbbe7f38ef7d23234ad7507085e681225f770b44d3382616765ec2f0ae686ac6c, @0xfd8c4ba5a46587ab818fc2bafde584a51c3b3f417c03ca87f66bc19697635677, @0x1469d06cb4ccde59b7418a84d960028f91e7691d882e0c0b699ed42cea1c84d2, @0x9ade67fc7a32a994becc5d79bc29afff3c4724b770606996483f1560ac7566d5, @0x167473043d0de498f190a616292eceef0acbdadc0355af8b09764d189ab5dfb5, @0xfba3760e5b44b69528b5b11706cf97138a8db70fe95d7d570ce3f0da19430376, @0xfe124a8342a37e972685a01ac707e902e4549a9dffaed505ddf3a7f9b0492a70, @0x24a50d6ca3a97ef62f2d607845dece75a775a9e8505fd354a28e3e6aa86c1786, @0xabb504cdfbc2b58168bbcec343f60779f43e42acb6884d788154f4d345b321b1, @0x217913f958abdce8c9de0b83c9afd99df4876aebdb5b68146849aada322a3cee, @0x2a56da73cd143d8914c01ee68288269d41b4ad74b90eec4eb841f9eeec06972, @0x113d536ff6b66a08796f2240cc7d267b54e5e9394615b47ddd971ea3aff75473, @0x78dfed6f1527e80d8e8f2aaa1fc8998e76d20095d05f59d0a21bdf87766872f4, @0x1d0165b1753a654068a3f6ab1101cd154e872e739ccce2819baf3cad5bbf952f, @0xa9b2b79685ab7630a4981981ded54ce6cdad9fa96e65865815fa3bb0c7883331, @0x20960290b4160043e29e93437a0b79dd627e45b0d9571febe42cc95e80eb743c, @0xc866571441b0b8b500b5c55a9c5276e337c5537280fca428a93b7b8ca524cdb9, @0xbd7454f5dc5fdfb4fdafc640650d632eedaeb1222128791bfa78d60966dcfdce, @0x5a1586b4b605d460994b799602d557cd655b3f72c255501bb230ba3c543c3316, @0xb76eddd7b26590152f91a82fba180f3740f02c85c5223725d14b2fed2d5cf911, @0xed1b7ed555a9bc4e9d60d23cc41bd4e0b28686e7d8d910d0c0df393ffcf574cf, @0xebfaee1a3185d2837560dca6d92e7387b21561d6f5f094505be342f270b1d5e5, @0xa20f61f9ae73326d3d30f08a6e19c823bf8e5dd7e803a394a88c0c335ff6b04b, @0x28eea09ca4ac45591063b5da4b2e94566b1516813d2619b62daa953133e07b71, @0x57576d0ecd9b8b586b95d405bbeacf98413ab7c5cb9a18e900e32af9109778a2, @0xc548d85fae7261438c71dfcaa5ea7958d6c4c82b793a92f2c0321f06e8ac55e9, @0x381ba84d1831030acd8fcaff71e534c66056e1e11ac2a3fbebabd50b18c0a45, @0xf759490a48022335d8f186a9e69b583d5f98dd4d908564d6a5aff59a75705b31, @0x8220b5ae0e93be19f399854e1b0e85f10f431f2ee68a0db966c7d61a530c99ee, @0xa1d3d9bd31d20938a4eb898a8fb52fa3ef53f2b9c52159710db0f50ebe183b2c, @0x15bb7ae071f6f10afe4e49a63416b4010dd55ea63e5b21bf4fc87d2ae3e7e2cc, @0x563fb2e29f906c78d5eabd5211ad2e1b6dff7b614389cdca136879f389669f8d, @0x964df161a8c00eb04dbfe9daa2dc025e316e0077bcf56406d51bddb69d8fe5f5, @0x381a47a012bb5413c47363f470fdc2463ff62ce0fcc631e4d0a7e10477ba33f0, @0xe7ce88bc11686eb23a4306a3dc3a125d5017fcfde1297327af289ae23073cd41, @0x3db6e0c9bcd677ccb81564c2f68d117afaa70466e41085e417bd5d93f83239a8, @0xccb6e2bd9c100ada8900e93f376992b05e0bc41f2dc95095ede04ca2bcc5babb, @0x81d16efced7f753dc8c6526468244cfa9640864a677a6927382b09f08e964ce5, @0xc762e82de9b3bf41a3d1722081d5df96c8551f197d8434e2d162de1fd5479fac, @0xe384e7dd202a599232cf89fe68890e1bcfd6c22c6de5be7f63b7784961ed58b6, @0x2fac612bc6174970d60a7eef81256bd1725ef43ec4544a60c7e10037fa23b563, @0x4fa43cd4e7662fa19fa1407584ba551517c3cde9e42e4ada7a38873b12d7bb26, @0xff1f9c7624eff84fc1f27a15260f3412b0d6ff1d79d5d3eb69338c63cbbce766, @0xf636e8c638d844cafed2ab0e9ed36f6d2e5b71689d9ef8dea7ac3b3c367b52ae, @0xdad3e3ec518a7985a538103832864d5bf33c904fb6648cf417dca7ac01f32735, @0xf9057f50548fc014b1be42fbbf76b24365cad43e7f869c458b582c873d546238, @0x1df8018dc0edb1a329e89bdb502dbfe7998ffe95b4b636efc202fff08f5f22ac, @0x22759100647834a7782df84fc14a3c29f661e7e03f6ef5ed94cd6f3405c37c53, @0x90155ea03b5df876f6f2ea899b3fa1714b8da7b131a81904f441aa938c149cab, @0x77d11ec2e08b09b3b69257b1a98d06934e5134719974422134a0a76c622dd8a1, @0xf3ebbd1a713b8c56c48bae473c473b2f3af66c5d8ceab403d13c4fcc1336862d, @0xfdfe3bf1e404c6330081aefd9feff0034957820878a917d31f8d69d2b71178f1, @0xbe0a518622859f944b41c0f87cd5c0bb51fc1f8f27b6dec85443630b46437f29, @0x92977b319cd764b107458ff8fd2924a80507f73f82021a1238865b17a0518433, @0x88ff50a98134d11784cb0233fa111d1ee5d55f0dacf133af853469b6d92aa9eb, @0x7ffc9c6e66080e7ab3aefe4284744c66a625fecb67b714a698022f4710078118, @0x7b0f263c21c1c62c06bdf409a73114afe187f07854673ff30ddcc46b12619edc, @0x18098f219928ed558541a385ed3e7f3c5cbf074d2700c38da289244e88d123d7, @0x9f88b2997d74d06ed56e3654f963afc058ebd5cc49fc2428ebf2c424d216f900, @0x744701ebd6f917c89433c6716dcf375d702e89ba85d39ca76f527224b6c586a5, @0x256fa05428de524d30fbfa43600738274af3c014775ad36c6a284e961c8a4288, @0xa93c682d8fce22068afde67f9a159f297d20c08416792efdfe3550cc858fb1f7, @0xf345d9a9d9d60729e57eeadc81bbf38bb2114ef18119a82057b072e903b3eef3, @0x7829cad804d83728dade4c0c7b749927c2423d03d18d747b212a69f5a95537ef, @0x2b70c3ab92a4cb7f1a7acc273e1e591025425cc582608220f9e0c4462a7ddd64, @0x2ce4e44567f3c79be8185e8cbf162bf082e88db5fa653a9c98b636944df41c12, @0x36bb45d4357abc5083711d6e41c6cf578e5dbde8c87783d55525fc4a46b64eae, @0x129fb3b54742d2b6c1725ef3b336841cb7c0ae0d7ad008a390b3b46f7bca6404, @0x6c15edd401ea857135c434cdbfaa112b7ab0ddcb60a2502b825b51cbf46ff237, @0xe6b671d9e4916c1f6f4e68d3450849d4c9cfd15b7778b64cd4e40da918bc3ddf, @0x203f696d743fa2c8bb79d7a8827dbf3cafb16fc1c8416c992756c2a24a21e334, @0xf7fef00f0980a9d1e867ec5e444c65b4a8cc7161f5d94de9266f2b2f9e42af5a, @0x909c50930f89f2bc899e2bd683c8b8def8cd81fe277f968eb91bd181848ed9f, @0x32ad2e0e3e9d993e44416f177903eb46f4d8b6a0479afba67419f44c8d0d029f, @0x96879db24a4e8e0ae5c1381179444ca68811be01fe00441d17d3b500b152fed1, @0xea868740da21fd7721c717660f43b4b1af458911a6c0a06709b565fb461685b9, @0xe80f0e2470b80e4bcafbab34587ccaf064e30bea78528c5e203723685fc60bb8, @0x6cdc1414747df00afc47e9697bae519b765b9857bec0ba87397b55711e99daf3, @0x7e7bf38e7b23c5cbc0762a2d27ee14a5cc6e0db01fa32bf778b0a14fa5f5cb3c, @0x33c3bb2ce96349e1ebe00bb23fca0049ababb7c13571dcf120d4782f5918c4ab, @0xf74f9a12e7d8a7b823a957bbe106e0d377c73d5c98fc0a1b6c0c705d51c2df8a, @0x142d82e216e176b7afbda8809f1edfccc84a47b096ec5ed3a97a2939fa79fa01, @0x4e552389eaf7d7232a1b7db324b3632d1f67f3f2d5061ba5136f02b032e38e51, @0x4f4ac7a17639aac4c695af7fa042ab5dbaa7653a79fccdbe852e70a1701c468c, @0x814e3bdb730b93f862d2bb44584cc75408aafda560d493f3bd64f55e509abef0, @0xd2f9cc380175eb58f80c2e0a0660b3bd0e5257b16781f7fac30ae5e0282d9034, @0xc3a31dca2b06bdeedb8ead2023bdf7ce12e0bfa8266606863ecd8366da83029c, @0x6696cbe849cf3f0cfa4b5cb0b64370de5c1fceda69474aa00ff07f9092bfeb10, @0x9450d4725ac78ac7609bd5504159195a76eb706c5925a0357b769bb7bd3a08e6, @0x6a2ad482b8098803a8ca4be8baa09adf5b8927b7efb0885486d321bda6824a23, @0xdc7786e6f37d09859612975febe82e2d5edae77e0fe4770b60913fb5df911026, @0xa3aa97905f44ecc41fd5afd95174cbe751b1034d541164a3cec36bd07894afe8, @0x4b4acce660a97e8fb16ccce98cf3abec7d90d656ae566f77ede6cb73f1026500, @0xf077c9a7edbd42a6609e7b610f25e17ba08ccfb168ec4d745e4e148a26465ac6, @0x3ebdbcdeb21262063e6c9a03dc0b1e3eced34287f8757fc889d67896c3883157, @0x888f442dbb47eb33d06d9b9cb9fc34fe403d7cf52d3df294dfaaaa6a0c33e38d, @0x8cbb33708ad85e2e7cd4f33f557a52a0b6bc64c3434aec37980b9859a45844d1, @0x4b96f5ef7fb80cbc01612ea80176d8d32b407a9b02ebf565137d53ee478e8eba, @0x7bd123bc28cfd9a414b7fdd5ff83f53fc48546d1c735c2c88acda2d86e055295, @0x9234301e20c2f939567a20bb93fd16f3d019653b7cad12b323b7fb0703327c3f, @0xbfcb01b4b2253f66da3be9089514138d12b0940b93ab6c3be040483858bdb1b4, @0xda22c32e133d84e8a27b4218b4cd1fda0974f8bb810546fb2f11c9e5b92d6c9, @0x4e7a915155d24e6c6831821aeb83edaec24f7c27a61d052559addee1fe21bc81, @0x2f3633c2135ed9590367afb66722abaa949ac008c8e5a6d8efb3bb51d5c9fe47, @0xe6c0397cbb03a596d0a77b18a085535bb17387e2bb8cf406f3dec083b780cf68, @0x58416f59afbf91d3cf4122ee1d8d17b65424344979a7420cfbb77cfa1c2c6d26, @0xf0ad81f0b87922d39c8bc50a1513f6cee702c0eb363c0283a7cf55aa28f0f195, @0x88018666fab2d51883a5f98d8e3514d96cc990a6f1c24045ebc03952dd0a97d, @0xaca57e7de716d6383a3fe11a1c3e7f5fba3a02c0a60c2271f4279fe8a6e8131, @0x5f6b5f104830a632860124594126c46f9029841732b774866561883114b559f3, @0x5f2067f8f920800e34615dd957d09a7cb80a07c14c35739845e5ccabd8782d68, @0x7b84319d01f981215718750fe97491e195e212c3608e26ea810ad335cdfc494, @0xfb2c8694be0eb6ee9b67b6314730607e81f2459f3a275484d070f7952915076, @0xaf01926e6046951aabe368836bf0a539ebf6d88804792ee45f7db80572d4094e, @0x56259f4668256f3da2e3d799ee0c6e2fa871533469b1eb1cd25640b61ecf5a43, @0xf69deb59a1a98d04a0903ca92c8dcc32bddaac2c8b3d6f89c767b4f78303dbb6, @0xa2df6161f681c8f1ec7a2f7394e8045e550634b7f11cde28a3678355b402fb9a, @0x863f2967ae11b92700d233bf1324d3e525268ec0a9095343f8af542d4b5201e5, @0x7d0822393ed81a3c23e15a9c03878e2125effea629c15f43dea13379c86e7c93, @0x769672dfd6030a15c780963186f6c092146c3a6ad66b398f88fed7061103b086, @0x8eaaa4dd52bf61b11d2c6dde1fc6b1be2ba3c29981742b87a35a5c1dc2b783ff, @0x8203bd5014c28aeff6e8bd716d8b31a72d990087973fcf6db9b01e561be215a9, @0x17ba85015ee6b1126d0c05cf559c70fe8271a63eec7e19b350365556951fe8e5, @0x5c9b0ca5542ad7de45f5d98cfdab27349923afc713ae0eaa07f6692b5553efb0, @0x4cedb4154176e5c13d195cf0ce3a08e08eca7f84c25512291095931499b9d84e, @0xe30ae5fd14552a26a6be7d1dcc0ecb7cd502ac3926632e8aa3096c43f42e9543, @0xe41a2190d441b023519f5675bdd6f9f2afbc27b674dfe0d39213bf89e68f888f, @0x562dec24a49b492602a940e58b93366879e101666875938179379c01e09c9fc9, @0xae94cc0cab4aa1e5f6f3dcb0c097ca801c0ff761a27c9f35ff612018f92b2770, @0x8a11108eb7b82e02b9412c8958065d46494eb4c0dc1372af01fdde45b4deffdb, @0x9307287f6914b8cfe61e01157b8ee007dd44e7e2c7878f70ea8dd25f27ef0793, @0x8b9e22fc1964372fd7365c03782217bedcca2fb5f410c5b7925dc7d33e0a741f, @0xd4f7fa3b9193889502bc5b6598a09e98f90d55f942670282d10bb2c92ce42aab, @0xeb61d7e0a7c605020a1d9a6c149e04ca537000ab3aefb519f52e62379fc3cdaa, @0x7afc21161fa2707180cf35cc68a021830a2a3527e21e12a3e1ec3d2cdd1d04ac, @0x555534519e4115edab30cbe1e70b36cbdf75e6ac27d887310161b9cee407b600, @0x17d78b53adf57b8653bd3035724b2a4ce6b8d0222ff9d2d58eebfcd3a9bd6c25, @0xf55798b2fdf786a931cff6992a2cd5fc1030f1cd99a86d26585f541daba54f69, @0xc99c1f5d733765cbbc65e22bf67da98929b5fdb510244bca798a1d37222b74e3, @0x474d61e10030f8820fcd1adab56855df0ab18463d65ee5f7e07eaaa678e8b4fa, @0xc7a72e270c1b69187563baa3e2e5e3677d0639a1319fbd3f00dec63d0694b1bf, @0x6d02fe654cae961da21d47302590193e09b5fafb7868bbe548d219450ebf6249, @0x7477c7db5640ef466db49d66a95f95299f0494aaa06bdbf48b23cfe3e587bbed, @0x2f11ed3b34ef2ffd9dff477886436b3d7689ed9ef65f7100e3993e34eb5ddb7a, @0xa8bc90678b9f1bda457768d80b9007c9f9c8332dcd097db3cc098c9d8c3d48a6, @0xeff8484df5f92bfa3d8ec9e41a34f268b8fb33ef46d763536f9d4325396818d9, @0xb5ba67dc003887a3ee3c77af3ca94db2d540f178916aefddaa845fc9108b94ad, @0xe26a39b41e58d057da9a72dabb29d0127cd8ef1248838038817a427d6d6ba1e2, @0x6d81207c8703d79366d0e5a1ea741f7c5dedf09f3b089786084ee071568222a9, @0xcca388afa0ab6f7cd1df568ff5c6d2b61ef02f8cdc8f5547030d1c0ceed56047, @0x91f5bdda6c4eec4644f4e181953a2f534a608ba44c5bc3128ec98a18404c22e5, @0x8b7740016aa99d0898d3f6634d0afb61f621bac05c2f6cb71c50d9aa449da4f5, @0xcc20ce9cb07f01ed442af3927ab1218aada7c9a3d0685d6562257a57279f097a, @0xb4f56c0fcfc25b8cb607d4bc364e0f0d6766f37350c4e6509dc098599e8060a5, @0xbf824efd6daeb58c7384ebbf563e6162e1c1f0a1658ee53b042d6c42aa004d5a, @0xf2b302f7d12ce701b14ebc17c75a7a23e33439d18648cdbb7675062eb237122e, @0xed0e98d146b4265c1bc15b1909f828eb1cb46b3511986f91d020602e95989c55, @0xca7cca3eb4b1b79e30e8a16b56259909bad57bb03e55682e492c6377b9c6c511, @0x7c7dc4c2a0519579ea0475bab98af253934de6fc62c039d3293f88245fe6766b, @0xe9bfbf4d24e3cdf9dc0c98c9a2ae8f5bf8d5ba9273f451c699530a76b1410781, @0xdacb1bc6262e5a488c99d87e5c7c360810761f8f01a133f3a23a6dce11b06518, @0xbf5d9c58f629b90a5f3641fa33cf744f12e2ca955f8009ddf726555e84f71507, @0xa5f978765e98993e20e9f883cce6616a3e244bd01ece0f9c9e2a5b4c06022954, @0x85ba7a7d66cc3ccc8b48deb6bba9b1d04ae60817a0238bbe87a71e046f311235, @0xd62f7e12893f5189757215266f2146340eb75657da7eea5ad6d01572491870ef, @0x943702f5e27a7e6f3cac25fe69a535b912418168cf829bf64b16a70573fbea5a, @0xd50d715475961a91f9d838f378529a76014cc227a2ac97d40ee8cf73f9c107e, @0xaea05f5fefd50e1b29813a520df13d8c1477896add050c37df55e893ec607bf7, @0xfc7bfd04718bbf26c563febbf70aa74e68ccc39a0edc4b2ac597d4e20f19e9d0, @0xc5d92956124f6111a34ee0f7c65dd34a9581533c403ba458a8261b7b0954ace7, @0xdc9dbb2794ab90a675d63805850e9cd3885c6b3a32f26fc4fb33b75987adc0d6, @0xe373bdbe35838b8b5122e1adf7be48c14bf2d69f871a7c80d0964afa476ab7b7, @0xa7a214768bb242f2b90c85e623ee0a67d6000eb1931d518f04bef1922dcaa0a3, @0x6919555971200e4779aac5a52da4d0726cbbf41e4fb8035d403c53d968f87f4f, @0xfc046050a1bedf8f32fc268e879c6dc2d23fcc8ba573eecef8c6f9dd72021fc4, @0x41c699cf004a400cb7b41f5f0c23ed6dc897a727bc7ee33c38cbcd9e6202ca4a, @0x11da686b14201359d5794b6808c3bbc6cff37b85a8662ab5554f83800dc3a80f, @0xb96fe253479b9ff30366381593ce8862bf7b370c056c409d00aa0afa70dfb2db, @0x2602f7475ff66518eb9ff54f24cd9a943fadb4f4ce9089c9ab36a364b84e418d, @0xab901393a70ba938bc603e13b8c86aa99012923adcc9c782c4b72cd6a862573, @0xa7b75a84964f218e0875c609c8160a46ba5a7a0500c48623de954cd5f06ae4f1, @0x885c5b6448a65ccd372617a65babc43688512aa489f51e7bb4c91dd39739f86, @0x96cc68a01b268eed46fa795101f27e3e73a7f6f992ec6eec8b31cec8c8cbe61a, @0xe47cd53423580fef7f899609f7f1fd1a4bce987661003d65ac7068f3274822ba, @0x604d23e1669345520b953dfbc4852dc1d390f53fc2c84988624a2ceb2ab5166b, @0xc301b5c74233f115789ae68f716b11b284f0c48d3cc8addc23d384e34ec261a3, @0x9dad9d27e5434bab729a13ea7fb59526bba6e1c87cb99c67061db87dae36b07c, @0xeeb5b76e86306830404550aff107e0bf7344fa64d5d1cd21f54d8111826139da, @0xeda3dedcebd6af9db5f96f9482aaea2851f66af8718b815b87b4f4e79ac21ebd, @0x75c6389a2f90b065391dd2531d17b43358532ee28323e4c91e7f8b68230a653a, @0x7cc045bc7e7bc22402f80331ecd4e466cca0a8d08a6d737434de8cacfe6b1209, @0x962210443526adcb99b3de70aaf4521462847074924d6ab61d80964309e0f586, @0xb2d4357964e16f24040dd982f3e2437d5b964f3af5604cd881fcc0d2b6849bcf, @0x16a82fcebfa22f202ce3b4686d337b332a0ef7b6ad2f192fc663c31eb4734d47, @0x3e5cc15058de6e378e3e080bb9a6687d86b5b5d78f87ecce8f80c8c0b85fa775, @0xa92c86357cf7bfef1d1afc1c5a39d0b3805d06e325a3ebb8432510656f695f2e, @0xacf5c314988bca4e88d5fd84fba06ca53d915d13393269102e75a1e2d63c9430, @0x684b05a42169fea695943b36d82662b99083cd3c01d632a25ccc52c2af091117, @0xdeed06cf30930aa53f5addea5f68e507bd3c2aaa993b09eae916f509915339f8, @0x544006ffbcbe93a3011f67ff57ee30e36e3b329ff1019d45bc6f0ad2865a2582, @0xffe9c5231487a54bfd246548815c6855220aec68f0cdc17d738336581abf6859, @0xf3158daecfaaebad21c1c873be3e972d007a8a1e7644fc0aaf5d5ee06f2f37c6, @0x3a7f4e4528a0fe0f2fdeb034b0d49a918935fa83cd384d43d86c36430ab6d810, @0xca0c3ce06e0fb5ff26a619856343e4c736e79086cb9eef628698e10532ee3a5a, @0x5e9b3a1289fc5dda91b35ac96dafb0de774af51a3e5f33015e1bd9eb17e4c341, @0x4267594f944dcfecd098f85b5d46b538bda19afc3954ac788e74ea450e9a701e, @0x4b926e4e88d456d235dcd8b8e14781e3171a4dc0883963e382d320da6b2da366, @0x6039a79b91ed89bbd4a7d630825ae5911ba2c18c0763520bdd6779f09d6ad4e3, @0xfb858380bcb216c525788ed0b115a6a286f76495013f0a7d0acd66fe8a82f067, @0xde002599a066a72e4c9e2d4193dd81d9e784d67f3d957e1b08bc3c84c4dfca09, @0xf42860de915f733de89dd2bef5daa71b6fa4a57d9855b96a08d1035fe094e7e5, @0xa3c454062214ea927268feff3f60782bbcb5a02469797c2cb8fc867c659fac3d, @0xfb254f9879098e15efc3760cabf76a630ea1633313eb5e1087f3cf20ea097745, @0xec98e01b9a0ea631ff2624814b26a81f33fc213f8b32dce8e9907c8467d8e78f, @0x5d8b686bed248db3358e005bc87504a983b24c3ec223c2cf0db110c8a96ff54d, @0x5394650562ded436bf65f0ddf3d5fd15411cd4212d002e0277d6fc4908577de9, @0x9f6a403bbde768d0b024ff77a5624aa9b1831d693546ddcc8ddb24c8da93cd84, @0x8a8cc705fd08d8e8f2001d91cd0ff7e658c5f94726acf45cea9ee4de20c24729, @0x89f0a4850ab5cd5c8468a86fa7b0129987e9c0e9208537095ed436a12a300e83, @0xa5cd39e317ce1a784781297ceb20d9266db03512bcbff9feae5dafa9d3863687, @0x92ff225f6690a41c5bea78e0476853c590a84a4248eb1f6fa2773e98b778266c, @0x803d33320fffb3d7c08d4578ba6caf3ac9f90ce1b2a42358f0544faf8df686c5, @0x11e5eedde46a5cca4b72964602b2de1bf9938a66ddf1d6010bfc3c2609017688, @0xdd32287d9d0224a2262b0cbbc2c8bb6a21a768ef4276949a5df0efa10a935286, @0x9216270e817f7e8a46fab469b62da3d81583216d5a826fa018f96675345fef25, @0xbd0219de64971124e5c285b749c700972fb6d0baca7381accc39e532689fac33, @0x8f9d6984d8bf1d5d72a9cfa4f938d14f3afa91d4c84a756d1ca5bfb20d024110, @0x39141537e7b29684a2214b5e89a988ca8c4460c64ba019aded7cb574124ad4e0, @0xd730056734a488e83877283629a2cbdc0bb3c5397ee82302c5eed4788d22cabf, @0x6466446182a6d062eebb26c81ad4dd8c0778ba0e70ffac4d48a2ad62b8680f79, @0x313eb4f5ffd4404b6d53c5d0b2b39d7cbb3b5f25adf5cd6f90189dac08bda3ca, @0xca60370f1d4c5d45dc9e5d6f02a2fabcfda04db3533d37a14a6f5f072f724fbb, @0xba01b1ef4fb7fb409b574d3a99e5dc4eeb5f87aaa7e7a2cb10fe7b9925edf2a7, @0xed2992b4cb22afa6702c2de35329ce6fd509d5f6de7cbb8fddaea8a07ea1db15, @0x638bfa2ba8d99ea10501187e761ffba73e547ac6332ebd3bf417a21924b9b29f, @0xfd278c04dd15ff28d51f84f2acb0dbdb60a0c767c35236377289bc6c35fefdbe, @0xf33ab9913dad2f0b6928155e176a1b30daf19d7f6000a03bdbccfe50fb1cebcb, @0x8bdc2832493a0722b1681b1010d1989d04cb9c4029c4c2d40614fe3efd188836, @0xa0f3c35d5add7a1fcabf9a803d96c2cd5e24fda0810d25df44b6abcc47c1f7e1, @0x8a172caa0c0053a98a7d9ae1b85c043fee143eada3cd7a2455f554234dc45742, @0xf308375ae0d6c8c73af07e423f20bacf7a5692ae8a7a13f51cd86479e06ab34b, @0xe38338469a9a5f15472badec93971ed7a59251b634fe51f5cbfe4a53ab428ae3, @0xffaba4a4417a93774d1761befc528405c53491929eacb810a4327b5de2a8d009, @0xcb9bf53b6217c677873155c3751bedfbfd3ef5e9d4ffd8b7cd7501227cd5d399, @0x114d1d14595358704f90ecef8f0d639812163e5cf700076923060cc27769a5b0, @0x723228f10d96e501f36e789bb6cb2eddb5c30b64d40f8062bbf34f4ddaca01d4, @0xdbf7bd89f11668b1951d3745e08538d324d1b8e64a95a56ec8ec9955ad429033, @0x4b8ce48564d559536eb2e02fd0bf935eaca61c95467c43f943ff67d564234a41, @0x38797c51f2b398c8251b4efe549890c098962fccf51f9dc21351349d38301524, @0xf93bf762ac96495404c5387cdfed1e629d5246f8c9a51088be703f63d262e174, @0x84be5670d9d5ed77f825067e78ce1f679c31e72557be5089e5eee28503df4f86, @0xf565085d529d9f32a8ce01c63babab9fb49b2beb6d06cbaaae554ee8b263ddff, @0xc97db6730c4eb9f53ee01936a49cb2c0efdc0d442d3fc8f1c89bac2cbcd8c3d6, @0xfbd6a8efec0085422b887dacffe224f8c898a5f3384b3db83acc60d01c7bac61, @0x23043c6a8c877d8838cb8ba508d686f62900028ce77ffe62f81325c797093407, @0xfddd6de669025470e2aa03fd92ecfe2e58acf40147e5568a3839607a2f32544, @0x89ff2d552c31542336580eed46045c0337d34f96b99e8e071899d4c590a30d0f, @0x3b58dcc5b44a54ddb15909852d488dbecac92f44d6dc723bc0d18be2e1300c71, @0x1a8b5804e0891245930cc37045c436697c89e79f3d964b3a9790b2f45f9a9f3b, @0xf7fcb3a9e4b43ee74a44df070c7182e104a58cac4810c6dc47e0979bfee28796, @0x287711fafd8888125e5197224abcd20fb66ec5e13c62ab5286b5697f17a66e74, @0xdc40cd98bfa6097325a89c6dc0b0582347443d7197ad2a17237f51d9cb54cbde, @0xd010d4bf4a0150f5b07bab8755b9e92057fa76c22284026f169443b60aebc384, @0xbfef1092a0294ed3897757ce1f9cf90f2c4cefc72a055a704e94a0e0b5d1d545, @0xa40e249f1ae6f0ec64d7220d21051ef12401092fde3fb167960a2d0632e9459, @0x1895133f70d799132686963d5fd51c68a12f0dfface388ed3f60566254ccc96, @0x924df7d2d7c1ac7fcc9b0817204e0d55dbc7b7e34870a29c7ec9ece76ad7ed5, @0x6a92dfce1f15e0874c04156d7eeb186a40098d636496834c2f70dd682e43a0a1, @0xe8c8a15c6a938446a9252ce3d9127772b9b7b1d51560a7374d582419b89063f, @0xfda37ed71f3cd0da380b02aa7f234ac5c286cd7f70697d7dc00fa9d76ebcc0c1, @0xa44f3f985445118a8dc566f3d850e0bbd60b884d0e65ff9fc56db7af1bd8ebd5, @0xf7713aeb729392de1c4f52456159b9e7b6aad04bcad6a6ad829b6d4bc394de43, @0xc543e875e892e270cf84e05231304dbf921f9bfb46eeb3363bb5c1c67cbc6ad6, @0xcceb2ff930ecbd7cbc2fe5e52edc6dcda944d5253fc97eba3726a729d2ca7cde, @0x43513de2c9fc8b3904d086b537d2c61b2795af729c8b5d425b74a69d2f63927d, @0x2d4354ad8944478539073cba60c0eb5729b5acf3ce5d46cda294c1e6856c0616, @0x7b988ae0b4d046db3e490185d9c531810cdfd124bb57c0bcf19761a89de66d35, @0xe4d9c5747d9de9538e5030364f4ed8616addec327f28d386719587ee90f13962, @0x37356f3b5e77d168f51fe5b6b265e53e13470002d1c586a3908b932f077de460, @0x9a65a5b9d8e96d76fba177c9d25ba7b68da0ac15f2f7502cddec821f81304cc6, @0x29433ae36f632b4c8af5b78453b572634e764d409263e9c98ed3663df6b2a136, @0x4da6f7808bdf2f9b0d07de2e70713f91ce4fcd53c2ec65cde8130597fffa584, @0x5b80c529245006b8acddc37d80e1665632481076dc88f1ee00082dc727693fee, @0xda61d2a42b3a0ce853093e93310b3af1e543a4414d71f1cdae51735f62eced31, @0x801a78a38776c8dad67da56929945baf01e8dd80cc6bae21a2e5f325d26e353b, @0x39d261550bbe30ecff5a63f7e04f9479831d480cddb7581565f8bad5e5ead5d, @0xbbb0a2060d13182b73c33028865fd25e3dfa6c918828f1d80e2dd34e8e14d102, @0x2d1762b1a3eeb2d4d590cdccb44273c587acadf0c7aa8871f760eb3a3759859c, @0x3ca4a4f2ac25d02b858e6f8a31e8918e4be40bd657b4fd00df565db890e68ca1, @0xaedf6d0b2351004e21a768ca4ff2004e81efe129f1630378ccc8cdabb7c15600, @0x2085608a095ce720ca60054f39818618ddcc5453ec69daedeefc984f9a862ede, @0x8d5260b03921bbcceed72e3db78de06477f0651e798b5a0ce010f3bea7b0a4e9, @0x2de88d780ca1bcb438585ea62c58563c385c6a59a2ee872d5d40569cd84dfdce, @0x87fd6eea3e3eaf207fa62c1be5ff34e3bd49b1e287bc9d8d2194ee69a715160a, @0x4577474bb943dfbd5c59eb7861915bc690977885d1f2790ade29406f8299e7d9, @0x241852d6398a71c155f2846565352493744c29f8d9393d1c3507c5347d78c593, @0x47febeaed417cabd60a53fec44b5d7d93c01f798657bdca0a5471075476cb80, @0xa272a14ce48edba4715498c556765f4fb5278f59a175fa50174360f4d1758444, @0x62119ecca586888858fde9996cdc0c6d95493324137717b0dabe5248f4ac1710, @0xfdd354da9920c2e080010a6ee501df336254b835810154f400d9fa3372134ccb, @0xc4145cc890b42c1f6c4be8e4350ef3b03a51d66193d9f2ea5d3eb0a63a3f81b4, @0xd0c87d31dfd3f7c4074b3ef4d254ff864d107ed6c431864d424db7b9f246a117, @0x5e13aca0149933ff29444910c2ead77a62036dc0f9de99b90dbc24a6a5a6b509, @0xe1c48fb8b7a2cfe35e9255991423452f8afdc73c3e1814a18ac70b54d796f761, @0x5d126b629c95123a6e39fa9f18dfeed7028dfa9f73d85be4aee132da9678e640, @0x40529ef6bd12c77e9bef236ab5c0762b6df2ddf93e575b5b3397e9e5666c6e53, @0x1e1cf07568b438bdb673234d4e2f971ca462bb11ba266fd2c28654ce6122d178, @0xba0d07c6b5476c4fc07f9b2c05a79f168ac0f2759efc466f869b9d3e903ac321, @0xed5b37036997cd160ebf9fa4096daedd5f08b0eb7ee6bbad81c7d875695e9c63, @0xb533af9940451684b6f8df6279f9a3f7b8fa32581c8ab27ea56e092d9bee778a, @0x7d2038c74ba7f342782bdfde9f7dc16ab50215f86fbea35804e9decb944eedd4, @0x9a49bf5bad30ef710e389cc8a1d6ce849ad36e4acba6fdebe769dd59b87fcb7e, @0xaa91ac953abceb51d9a60c63f212ab27939acab18004b96aea36185d5ff0cb05, @0x1915879874ba3f972c919333909fd512a53de55abd7ed9b1f72bdd050a9454c3, @0xcd86798d20c01806f9300e50517b6b90d5366ddaac8394f06e159cd73edbd018, @0x6cc308367c4a03319fbcce51a7caa978dc97f975f934d4a5e5ae7c528b101786, @0xccd6a345ffab38d2c3d9ea4a6ec2b735cf40e2c5ea6646ed7c89acdab09874d8, @0xd3f8ed98f4af8664c71a96df297ac938da9dcc342d9afa6a5c395555537f1119, @0x79141e33bd50c93016537c84409db0e194803deb9f1902303b976ea75d4ec648, @0x12c7b9c34a665d9d2d541ff2d6bc91200100a0173699f3d4361e59ae7a9aa61d, @0x1a8c1d4a4cdefcd23c370e28e87e92b1f1472148f11d701e0b3459d8ff9cd261, @0x816619cf9e96d313ac19262890cd2ba77358de4bc7e248b34194a79f138256d9, @0xefb630ea6b591c77c0fe728acab27d101ebc3613c36f6a3f25d75b32852d95f7, @0x3ebdfa3a64a3b92f6148ba9e8d1bb6c6bc90a210357fe78c43c55ec65fe9a7a8, @0x5120e94dc9e877a73dd02c94cf966040a1c122bd8848653a8d79d445109374c3, @0xcecd457478534631951100bd918632deb66cee07e1cfeaff3d1bef95cc5124b1, @0xbcc68cedc987b251e601900fd74bfdceb4ca835522dbcb13c81f6568fdffc670, @0x6eb051446af75a0eb911c1355f5321a8a51d1c7c093514127b1f8e3b2dc0a2b1, @0xa3f887cffe81e7a502ef996d6f0b75b36978bf8a99f38d0324c3169903ff5ef0, @0x6f768407f12b99595ec456d511d7c6525896fb2ae8029329a1e1f44718d296c1, @0x5d5bac6a8193d7f85eaba937071f0330bc9bfc806643ee7f9a26028934474de5, @0xc28816d234ff3daaa91209e8f99e3a919ff7b03c8d301f7a91ec2dd5dcae044c, @0x2a80ad07adaf8c37fe23a7c3c192055f0c359f2f2248e2a1cc3055b6db72c9e4, @0xacab6405c4782ca71a353d9a01984cbd6a615f6da2dae1afbb3b4da003df3c05, @0x806aa4c2665bbb29b9dfaf02ddd9deb6a8e961d7cbae9b47a96992f20c372e95, @0xf62d8beaf5e83cdf0807b5e4d4f14e5561635a7a237e7a0b437f240b133f005a, @0x3c6437c94577367bcb4de5bddfca7962e52fdc416d04d00ea9704e553734681f, @0x839d2c7cb25778a10d7696c5e20b06379479d9ad0767c0fc866470d01d7f4b20, @0x35df30c497815bcdfea065377b1e5f29c80f6b9b6d8b23e596bee73bc55755cf, @0xbb38f281779487c8d8c4e3d0f50f70f4f2590874f03b425b23f1ce5e07899efa, @0x1e95bb2564c1b9704b0c00b2b40429bad4c0dffeb87fe58a27ec0ee51a10095, @0xe70e822748cccb45ae16e3b02177b086f1dd9652c60a2554c2d5422dd0c509cc, @0x36d3b3682ef9cd0228f1c1220017de33f00dbf3dc5e851746d0feaf9b304e0f, @0x9b4b59b7ee72899e479ae1fbfa54d4f9b1ba0d60b66466b709a918bcc6d9194d, @0xb8bd37fe6f7997353d5a7f24e3dd8461714c42bdbd80d4672abc4fcc1b718c7f, @0x70694808c5f0f70e8cd28eb0a4b34902fe259adbacbdd703571250d2c823c82b, @0x969d8e1c08d83064aa0d8353feb90eea29ab828a881ea9c19a21d6d4b3888fe9, @0x6354227a738e59bdd59f86a598ce08b722f18ed39dae1a249a78c21d97a6920e, @0x5f902c4d90510e61697fe26d6fef1abd651e712436a5561b4d1e342f1f7b18ce, @0x808c35dfe6c60a9742b23292f858effbd7ba8018d819e3f4873cbafdb61d83f7, @0x4227e4ab62563625d10fd2decf70d01c3eb96fc6805849dfeaf27295ac00024b, @0xb1de0a55466aef7069fbcdf3445447df42a57832e13600e27ef4c9fabfdcd195, @0x646861b716e85f752b1ec7d321d1ce315a3105cccf918f35c99113529d01ad69, @0x9edc8db7d5e6407a87bd23b46cd215a887d9dbca68f8d2a169a92226884ec332, @0x2dc4ef9c39adb0039721811bf0bdee134396757c6733fb63d6e45c0215867b33, @0x468df7882c491ee2d2867c82fe1222ed8a5e348ffdd28925ecefd5618772827c, @0x5b5be6ad213588c8fe972e5ec3dca297c39ae715d9bb6a32be27a491ba14e1d9, @0xa8322d280b88efa2681bd40c801cae030de5fe5868e9bd32de9ee9255e55acd6, @0x61b2a11af1a096524174ec66dee143c8e4d2e88ebc43fd2ff03678e9f4b143ad, @0x9aae9b7abde71306995b59aab7032c91e3d732042776651c700f9b2bea5ac4c0, @0x267b9723b02d2969d567e7625855b8cf44fa63bc49045361a4c75700aff71dac, @0x9528e8651a64f300f490013eabe7f299fd19ed89473299472a7bcc661285f6d, @0x22def29da43b294640bd4229b978ecb8494b9ab9a002ce43f2de956e4ef99090, @0x671b565123c8e9eca33fd17e40e3de99a5d744c95732232c6f1b937477d37f23, @0x6e75b4a6d2fe8952ac5038cb39288a280ac2f2d57c67277602c164aa766b8942, @0xe5c1f682c7c523f3fee59cd9dcfb5c735cc7f23c29d1deda90f2ba8a2c1d9c93, @0xa917f1c86faea98682a29e3f39f3569e9e3c576819e2d80cf236cd8aeeffe487, @0xf060b5872cf3ba4fbf06a9ba3014d2a5cf52a36c901031bd1975306093f481b9, @0x5fadc4edd0be5e22aed64c4a3cccb07240a792d19b4c9015f5790a3df3b54017, @0x4f385920066ea6d0df5acdad12fdffe43db73a08856b643308bf3850cd06b15, @0xfd4b7be50c38bcdb63c373c69fa5c28ce7711df39c24edb84e4222997ce86d7e, @0xcd14e59eb73a744f995954378b56b289841a330060d025f15385440c4b44f1cf, @0xbe53adc016005eaf8897b831e1bda725e09b3a214ee00ed20fe9b0517cb54137, @0x84694d2ea27a4aac2f3852ca2c4e178d2534c29fa4ecbd40762f561cf5e9e8e7, @0x94ef0cf35d633b533a05a5ce45481b60bfe8d025e7289e14bf515c787d5103b3, @0xb38e86494a82c1f8e18f3cfa841649717a0aca0344b164974eae2354bda521bc, @0x22649ac8a9f4fc2b037a62f769ba672e34e17e698155f3c8aa58e18f389c624a, @0x2c09b4dbd2f88559cf8c04e31dd4331d7e3580c3c651ea0781df3b42a3214ce0, @0x561e6622126fc1145a9a3464cba2e19121605127edae688a001ea8d05416c2b6, @0xc44ab4979fe0a2f6f9b10bc84966a2f049dc6d26c976956a771c9a34b66ef094, @0x4195e00669adc00a43b6978ea001aa292244d6d31d446eb031e1d88253a23421, @0x73492c092829d8e594d8bfa395157cb8ad39f3b6fcd4f90879a77670f6b10553, @0xf1f25824fc59fc37c9f9d218fd70e20c038af48de331e3ea674ba76f69a6285d, @0x66c818c0f37d5b45c51444518643762dfaa96eb9e21597200a62d0beb423c6d5, @0x69a5826c3720d4950ad05eb0d225330417a9eae3359da8b30547297c4078f7b9, @0xdc246680dd817e4a0d25b4d5f461b36e18e45722d5b22ecf09030f4f11048c2e, @0x74610d409713c9c657fbec5bcb5959eebd54cf8c8112de00fcedb3aedc2f9162, @0x137166916a63af0ac0772a35b658c77a3f227002c66d57164d5fd358dd44f432, @0xb4155119d19566e8987acdfbc61de66bfdf3ef1773620d8d5af5aae2325bc8a7, @0xb3cc73ed6ae93a9d9f87f71f2c9118ab60d1d43732d338b58170e9441a70b98f, @0x182c41cdb3efdcc50567588120944cc909720c32ea9e0ba3b96a313d22309102, @0xed06dcb81495a3d2fd3c4dac13fceee34243034a78d19a989ad267ed35d6a6bf, @0x94566d2d6bc418d174985c529dc62aa120346ee1114c64be2a822ed8d29d12a, @0xc4d38e4cd94af131f89c3e901f89aef56d4109a3bfffc412dde3acd25988a5f2, @0x2efecb2d305c9b009e385b67df3a4df21e17be0a0c00c6815b7f987a411b8bbe, @0xdcce58d42df8030fb24415964eb618751ef80bbe80c28a9858c75be3955b0efb, @0x6ce840af1e2b02748a14358fc485c1c0deba98116d78ed6148e2219ba2e862, @0xb7bf34ec4f7936fb7e6b7da95ff7afa8512a0eb0ee12375096a3cc070737844d, @0x957e95c7bc62be846e818ff6cca3f9d909f93389a14c9d79802f9f92c2d5ff7c, @0x341dc84a15adbc8e98cee50f0b5086201981fcff63808af784daad0d0166d159, @0x4f041134009a67b70a5a22d2577b4305898b2663f5f7548d68705d2b8bbed616, @0xfe0dab763c3db19a507cd3ce1709afa43eefe0114a37503df9a9d58d7c0ac7cc, @0xd0b3df998b4633778613536e7ee44478f90aabb1f2d78d95592bb2ef1f70a688, @0xc4f25a610bd3cd2864557ad4850d91ec31e616bdc1bac463be520c2651b812ee, @0x455a4456864b80d51364308302ec392f98ba8b1a30dfdcd56e8856a8de188705, @0x6c9f1114861e0e2db0dc283fb6ab5c8ac9b6c43d30552e309ecc69f6f53b8bcd, @0xc7e87256ab0dda97a8b61232cf2f8fdb1141a8a87da0150741ca38a13807eb29, @0xc01a6f9d9290514fccfbdaf830f848a108b4d33ec44d73b2810dad1eb7de8c26, @0x73fd69f501e1e3011e5c9e6cd580e76366c98090b9564d79bf09117c25ca1e29, @0x81b9472c5e292bccc0a201e5f2b44f2f195d191a48f1712e910989d0d2500544, @0x3cf91110380230a88bac8bd0868f8858bc9ee919fb62f5b47f7057dbb8a140, @0xa5899e83f18501e35f52161575bb289798a0bc3b7c8ecc0d33348929f1f7135a, @0xc6164f3a3ce3b759aa287a817de5ba0e563a273fc64da33c61e07971c087abf3, @0xb4549b67ccf0920908a64f76ac9b0a3a379e9facf84ccb38d5b29d2773e2ffd, @0xa099d771977145d9fe10a78a5398a864165ad349bec24a1621f439bb4b92f542, @0x40c4db7a08dd659e4c3b7fd0bd6e4226f77a2eb1adfedff80fb1c743226da57b, @0x128a3411acccf890226bd3e253306a3be4fbc0f7c33c0ac3a331ada56bae7678, @0x8381035a134aaef2aed833576ca774f2feeb5cd987a0ce4343b66b6be137d07, @0x93fb1b44da493a861c6d437be08761533cd412cab5b903a411bbc6e5ce8dd3f1, @0xfb219715cc89ddd57cdf9182fc16351898c65f8a5f345e1eeac98ce315ca386b, @0xe9bf52b2967858a26c0f7548b5309feb0a3f4098ae8e3bc3cb497790963a347f, @0x9c59f90dea101f01abd06b3174e97098956776fb3b02472152292d31ce59fca1, @0x49f9ba19fbcf8ef1e2624ff1073aa18a1795adfd9899c4264f75394f4dc0a85b, @0xe70540b837a3924c737c192114ae6df48a4aaee17252b5e7922423a3b7d49aab, @0x1833bc50cdebb9760ddbec3cf42ac4f12f64b80ff9ca28847eeeb8ec83e5b458, @0x9bd631b289d4ee7adbfdc79b3419662b60c9c7837038b7a9341996f9e3294413, @0x97bafa788395a42c9f7f768de4d53c2a57a6955740b3b9355fe9142df4656fc1, @0x2bd7e29c413abe66ec4fff677b590718ea5eb29f954678b4d515abc2653bd3b7, @0xba53933981b8637a794ea2d94ec45a5c0f4b568db647b1e7787e340aa5d8fdf3, @0xed2f1164ebf6617de1103620c73a3429a1e1dd72786fb779a4cb0a955cf56d00, @0xe6f175a59c13f81c829aab964c92a10294dcb90468abb29e4a83276ece8b9e84, @0x9ac9ff1615b9907408f50821c841a60b2aab65675d138e725c232ea9583a5014, @0xf4acfcc8f2ccf8b07aaa57c838e594a507df53ef35f39287ae236000f0a3fe64, @0xf60dc499e69e790e4c8fe727c23c7d7584082b0fef0533fa1cb4816accadd867, @0xa5a6f3c6ba806fb1ba2d1f6331843897bb8344a9f0664617f08282e50e1ba0da, @0xf2d088885859d7abbf604f137ae347a3d1e06b3db0441c6f1c931b3e179771f9, @0x3f2b858fa16b92af716d9407972db10a60142340a77117de3745bd6b603351b7, @0x59f745b9b3c906c76c0ebb2a2a3b05b8c1d68e434193bf004beed93538c9daf, @0x23cc41f14df6da05a7f86426f66a188a05fcdda6fac5d453f249dc7acd5c7a72, @0xf902254ecd29d28918df23375dcc466eabf914aedb33dba0097b4129554530d8, @0x86e610927ead23b713cf050a3a73ad1c24ad9edf75fa702baad3f87a25a9c940, @0xcac57eb617fa08fef2d1a670bd7454879aefd58af69a115b2b4778ebdaeddedb, @0x1606235f60babed977397bff63cce4f5565fc3b5a9a28162196df180c2278738, @0xf41b1ef98a81906d65976d10cd9aa786bbb33e6df09fa00684e1a8c7aa47cfe1, @0xff64f3825c1bcecf6aa7fd12b6a3f58f0e179a39d776b6f98c8573a06f1e2837, @0x2e9d994a1bc93a8845387375f1699aab102e24c950bcad8df0f47971d9e5d746, @0xf1154db9b07a7b6183294e67ad8afda9da2a6011c2ae15b03530d7187bd67fb2, @0xcbaa4782ea943051b3aaa2a7b5f0a19514d07abd7dcee8ef6588542ecce729ca, @0x67209b8de7cf515980a15726e086bf7ac1168e471ae728bff6ac3cb4730496d6, @0xf1c7794873b3879016266797c2dea89b60bd1b70acb9631ce429cdf7e246363f, @0xfc5f04bf4bde65f72f96c807eba0b2e6dfdc32978ea9eed6505930ad73b19839, @0x59cbc4172549ee9e62c17672d10be88e8b2fadc12cde1d3305731f8f6737aef5, @0x2aee1b3b2c97faa588dea5f50e873e1f0d550ddfdd37d798de47d9e268a028ce, @0xc27d4dcd2a302d7f47972b1b480ba5d14125f31fb954faddf7dbf99fedd736e9, @0x10491fee6e4930f45b05a44aa0108fe3b7ff573fa7e59c0f148e5c52680703f0, @0x322bf202146455e4abded1858357dd0d91a1161cea536ca28f93b33cb80346b8, @0xe40b58da222caf1895ead7b68d935d706785a6a567ab460125cb8e3a4190811b, @0x8db41fe7801a0e142739393e5e1344a8a88b303679704228ab56b11d3cb6b4aa, @0xd46d77eaca9511a28e63d3fa1d1dc60ebc76128253a52762d9b8d75ec94c7d1f, @0x3bb620100d663d058e19507b5ced92899ba121d4459f34b02515423242db2a76, @0xf57069c062ec630fc1e59de20b73e8072c62b37f62bb6c5c1391e1a7ba99d4e, @0x925a3d54523bedf316da5ffdd0587a42d20f7eca17782219bfd4b96e3ffe0539, @0x920a1fdbb88847f232851b2a5ec061c428d4732f6898e91876da6ce3b3a8b521, @0x57ed06c1adc36a7fc19ee2ed17dea1516ad7e4ae847d536ff2026f5f70784c3d, @0xb4802272db9dac6146e8f8e0abdc1ebd581ce409a730860f719a338818efb1ea, @0xb32f8df6865001f9937d3e198c5668bdb954419d42f332617371acd0c9288963, @0xab4d3f86fc96446bb709e939dcab97fb7047c84feafced6f6938b2bc833707b7, @0x2a8dc49abf8d6cec9337156078f3f779a7c59ae99029af5307e549192e846e56, @0xe1b25d1d5b2691f5011fa1a6a55c34b81dec4a98c907af9bd1bbc08be40a12cd, @0x9604b5281206f87b82f1da54df7ea81e28f9b7b9c6d5099b94cf3485b9c07267, @0xf681f8314742d551ecf266241057d614755cc67672ef2274448ad394c8fc993c, @0xf9f84945ce13955966ed43431cf6785e93784e9d2f1badf3a977bd688446a938, @0x7808c46d6261c9d35ca6d7d6698cc76ba95778b780a109cf183048345c60a869, @0x4f2239399c43a026075bb291dc79bb748380af19ca0249439ff345dd5884d230, @0x735b4eb748eac0e69fd964c21af5104879f60bdc670cde84669a85fec56a01b3, @0x27664bd711cc8c09e8b24301eb905f58765bbaf54d1e89b3a3729f80d54c7b7b, @0x3d394c9da8887f52039310c0842036b541ce4657b0f5c991211bc19d901eadf8, @0xa544304d7b381416ef818899bacf58ded26c70787b6d375bd1c6ef16d62a98f1, @0x1fca440103511424392209c3bee3e03c04ab564c376839c2744584536b6ce5ff, @0x1ae5e1255430e96f9cc83da9456e0a4415b43bef15d3b8a2f095c4293f6033ff, @0xf7efe4cdf31b93ddefc6b4c9eb2b069a4b322252c2e76d483fd5b3e9cfe3d98b, @0x9d695f13801ea79d8e19a3011cbbb60d8a318fdf9d21601d1e498d72fda401a5, @0x98604792a08ecf41eecaae51c9f5ee97258bfa4dc259f72a9cfd829937b0eb87, @0x228d2205aa2577d00fd2e8e7b32ab777320fa086cc8fd105fad3977d6f72f643, @0xf2fc2315868e6bea6d621641bd236020aa7713f2399b319029158271e756007c, @0x4ec5ebe3201ef0ae1637364bc66dd93e4a8633dbb7da89e6a23a494ddc8e91f7, @0x74afd338acc7cd9cd92cdd8c2182b8f920388b8ba2b903004fd6f6c836e7d023, @0x63585c7d242d437221a00eaa0c4fed4ac94b741425d7af5d179fb57594d65424, @0x5c54985ad58b2801c4fe2fa32b4a196c3ee67f05314fa1d7f55a11de2c27ac96, @0xb3160e2b9c7628c345c5c0e8ff8413326a3245e7085efa8b58b8612e70417478, @0x273b80c25de8ec819c9170623d74692691a63b94767e600ee3035e4fcd687128, @0x626ea348f9a7f3fc9add4a62c1c121c739e7458bdc47a94faecad1c1a0e3b19e, @0xc8f05ac5d412f0b21e3e942807609379c4659ed83beb226a8bbc9c0139f13e46, @0xd461937d94cd50611e125a20f2eea0a44d13e5d08a29e07941b566b8cacc8a30, @0x92dcdf04cfee8ca0b5bf282f4eee5fc8a17535059a7a36b542d71d9877fa35af, @0x7607fc63d9211a263b1a5dcfc53767cdb582bd7ed0d055b31101b281c465bed0, @0x1e2d17925a548fa74ffd18f1937ac828ccc97f7fbf08b1f8092107236dce7c7d, @0x5898cf5328ff650dd0ad32cd96444a91f003a20ab3501fed374016960b1fe6d5, @0x3ff524f7e99dc2f4cb86603c6bfeb20dedce89ae8c14371a4d0592963027cefc, @0x847ccdaf1db89a25c0a1abf16603cba2433a9f42ccffddc9947dfb0ce810c977, @0x5beb314ec643e3a7c2f3136bdbf8db42b7afc2b6f93e38d5cecdf3a99972996c, @0x1db89c8b4a6b88ce621477bfa3f254b3e97073dc85e7ff0095f0cb3770e32abb, @0x4cc068f3f8d494fa83b5a8973ca746d2122f52dc012e88552dc52937dd7e050, @0xb3c5c4dcd9cdfa750d104de85711ad75d69141d0523a7ee33350583b7f50d177, @0xbafd3b35c011a0aa85dacb26a8c2e25afdba3356472feb8c1d76c56dd570608e, @0x587d70c945bc9a550c9842988416d640dc449c2997ac97cbfa3919ebf04209ff, @0x842697360423220a86853d7277788eab88d5c036193b82fa8643cb857fe7049d, @0x2d96c263ac7832eae63ef10a5e05c5d12cdd1671d08625b913f373e1d63cdf1b, @0x6fa0daaf8501e00a71fd279d2213d79b6d585703e0008e94be5c4fed828c4fe6, @0xb7cd03007f17648d65159027782e811acb01ed36b8b4c0cb04860cb82bf2fc1d, @0xf6212902e21e7016defc2a131accbfd17625defc08db8ee844300a523f06a8d, @0x73f4e383620986fea405d761a547ca3bd2a5ed01cd99cae9f7dbbd8465da6e62, @0xf906f9c121bbc6320797718b17482111cd59fb1bfa713d90e3a8681f22efef15, @0x9c6318294588ae776d24b75fc599d4efac95a0956324822933324b892af68574, @0x84de7f878f8e5adb08f2a510fa2c89a0eec7c0916f346c004a7862d893597bea, @0x42e599d54f4884721d72162c2f0ca49e116984b61c6a598b4fe344c6e3c2abc7, @0x8ccb92cdf43efe52a91e22978f18e3e51b6e411432b61cacc134a35d3f65870d, @0x3752d0abadd3a1ffa94595670eba47f4a05f2d7baa92d6175828e85a3950275a, @0xc6cd74db8b4fdbd175274ea89ea71aaf917147e0a81318e5a2029723ec1b2c2, @0x8a084db8fd43bd31338e3b8362ee0fad1dc1ab1773526850795852d9b9b14796, @0x12ba50779ab0d108748d4050cd0252601d58fa0c67319e32f9bea685b2d5ed27, @0x6abeb41f443aaf1c081533e2f7acc3a1364b7dee4153ec3c68d20e590c1585f9, @0xf304e6c578f9642a101270c156164501b0e9724e41312f8ff0c62c6b635ca157, @0x6c5e5029e32e816dac559825e83dd28d36d44fe6fc9702a4956cc5a98b23084c, @0xf88caeb599a9ebcaffe70d85db3883d9d74884b5d8e2378448fbfd0f5d68e0e9, @0xf5f561fac633a10b9368d629ee3b52f4201cde281f46e15555e8ce70d599b9e0, @0x8e573c05f386bafa5abc4607dd908cc9c8734777c874f45e2ad353d35182d3e0, @0x6bdf752e0025ac79dcdeb06309e4cb95f5dbd54f02a5c1686e0af32ca1c347aa, @0xb4d39c5d98c02e95c0ea0b0bb3bfb6d44b01f612d7ad7345bd959a6a9e118c65, @0xe4013e2a8b8ee2a6c9567b60dfa45560522eda73fa05c4ed0074ac3c557903b5, @0xb341d921f3bafe4d5680f82e8561089ed386e16fefd51ef4a72cfb4b2b3af8e4, @0x9f3eadf479217e405da1feb1ff195b04a0d35a5ddc7ef453be401313f5b75e7f, @0xad0abebc4eda649f1a34166ad69607d1ff539eaa52bf93ccd76d003ee6f0aaa0, @0xe372d65e0e7d86af24f1e9af227c4b4c2d3b5b6330c388c32bccab18f77c3622, @0xb4ae9bb3d9e2e055909ee24a67af6a0a216ce2c16bac7651814541a278d4cf11, @0x28a69ec680791f1f623f48d7e5d540627dca8cb6d899c2d60b522cfeb0a35e11, @0xbff404650c3221b1db560f0d1f0e06e4ed5f6b8ac15cae338594d4f0d46cc649, @0xd40b4a15b32b4a07c02ada45613b6a9517857d010de69dd9e6b03d884a208fb3, @0xbd3f0d6747fef05d4695db8fbd77b5227873a42d59bf4d2c4e7a059ee8265ac0, @0x1474dc13579fe2b0cbfb175b6872717e2a337492ed30a9e0eaed33f5a3097307, @0xeee374e7f8fa34e9423c142725755206ac49b30512355b33da80ba62da23b7dc, @0x7e9107cbcda31f935508028ca34229ee0de25ae49aead6e820f43811207330b1, @0xe3689b8a70da0dd96ba0db4d54fd01e86b282c1e4744b992e22c8a32dff76602, @0x8de42434007a74825af1045c7737f44eed4c604b112b9dea23d7aa994f3f89ec, @0x5538ec528d82dcf6419ad075286bc2e29165b7bbfeecb11d6162272284bb4281, @0x66076c8ddca65b5518acf71725ba4a1609200fa80721aa5e6e7b69d90b025ed3, @0xfd7a26ec00dfcdd75e445141e98a158f2bcaf944be3d0bb4137b5b8f4fc1d10f, @0xe928dd9b3d60c4604940233383c00c06ed6a31252cf69584a80ff4efa7f28462, @0x86cffaaf4801452a4b62d8726dc86324d9782dd0388e079bfd5f5b98030e5e29, @0x8baa351cdb425d0114f53e8e4844934d157453bc302cf9df1d6505b6bc2de65d, @0x8e4d17d99265fd09a68f207b240fe7bd4db93e03d4f3eecd8ccc83b2cbed7a35, @0xf96099ab314396bb86f6f8551e23b45bcf7b39baa7d5d98106c6110474f83f8, @0x442147f38cf2dc0e57edd8a968fcdadfa4127eac9efcea9e244292b469e5d11f, @0x2a8f6337dc36a21c0d9762bda4e659bca48ff1ee795bd5edec2c1f3ab20c14c4, @0xc6d755f3a7d26c72ef8202b411b297a66df2ef68d93496eb1711a6d653585c1c, @0x76ab95dc7e99beacada124a829060f8b007ec32173e8edfcb70fcfa3c5b62f1f, @0x351082b95706e0a6b8886128e7716b171a2eae13c7bcd4774ce6df4783324ad0, @0x15bd5b28a55450c48ceb581f49b2afdd3f3b398e47b6a23c4b6034d3c6875942, @0x8691b75d8d5139176713609e788f31bd9855a620039c9972fdd8e85c5a5a2bdd, @0xb89cc05d9cd00e9e005f90dfded284fcde04004ba85cf792118e31099279f466, @0xd337bf9ef33dde5224860bef1a4e39686a67878a7ce36025a3db26abbadea066, @0xcca6384be0bb05469d799230d2051960d4dce875a235c4b7acc6f87a3330233b, @0x7cc9e2b7975f1cef64f7e358b6a80ca0277b3fbb4cfa51e28991d88f044adcd6, @0xb03c4057c7c25df1fdb5611207ce6f9a1cf256e6cd7760016bb4b22ec37a2fef, @0xd1ff110c950e7a52ba00d2b6e0025738c69444a15285dc880ef9cb28fa046ff0, @0x729b04b9268b46e1a7e5d6c333fef205c3769a0c4e486b73f2fe82e43385c6a1, @0x48419b2ad6fa539f4dec14b2213190185f6275c7caf2d67c70e800e4cc10eb54, @0xf6de9933a701bf99e376339bcb8ca7fc1c5e7e247d412c8bd2cc9d0939e93792, @0x57ba8ad7654039bf2310d914f6040858422c01973f2776c5d7c2195f5533a745, @0x5b43190f792394033efd346e1bc5ac967a21ea039e980ad183401194efba740, @0xfaa394de306497891790586a161aac7a1735e69d4dec89c6180ca25b883fd222, @0xabd99cb96bd1e4187de8433f100618e3eb5cc59439b1c94f4a127b04841c096e, @0x2d9f3edfccbbab0f269f7dc2e90ebb3e26118c4d830a8cc48d0e62c23aebe126, @0x1d902edd4dcc24c386f205481f0b41e308505ac480cd0926402dcdd6e25f081f, @0x8257aa29546d3fb9110fdea1118d493a9c674e9286bdbb1da10b8ad0b8e07cdc, @0x956a20b7dd4404bd38c4fefd70ae93f09a5d2676d072d8ded11775b264bca091, @0xbcb9cd5c7df30d7d78b73e1c48d7c4024a4f65c71456d65926c1f209cc3f392, @0x7bbc11d27297b1c0b4479ee821cbb72e35378a20bbdbe5aadcaaa72db64410f2, @0x71230b2eef7f6f5c81171c31e94468669951191289e1002c85c72365533a7222, @0xdb08d4840cac3ecda94a124be66a1516cfbee91d860ba10be03a21154ec78bf2, @0xb135dd9bffba930ac92bf7e79b2d6e50b0bd2e3c7ed0635160b9f65eac9c8de1, @0xac6c437e2055124c4c76f403be7f44135e215d624cb720ee0845e66732257efc, @0xa5e26268c757d04beebd883a5fbea4d4b8e0d8aee00e0cfa8036b3d6dad4f035, @0x79d4f1d696dd3acb994466ba8c5b91a0ef38e1c45c23ec3628e7a35499ae940, @0xbbdd17ef55a0e371e282c370715c0e93cabf0e4d62ce28b48d5cbf3d2e96f4a4, @0x3b6785d978922e0e6d9ae91c1ab7d732139f162312c56eeefd608de14242371, @0x7c754b852a596c8c61f9b684ce9f16c5b753a26a886a53a0bfd1049ea457d15, @0x6596a20ffedc653509b1cdecafc6b8b3aa9af20e59bc8f50ee483c4a1fa4db8d, @0x69d8c920eedc4dcf91b5ab084ea07d56434dce18846767c33a3a5a186a6bd0dd, @0xc871684a72d93d9fb49b827eec88fbb7ec87d1a841769dbfc934884c56af326e, @0x4183d58810719323039efc34ef3078060b029b99286bb5dc6ad10c81f956ca67, @0x87f7839566333bf959e4bc1e8e69ae783b42dc2952f4485afbbf22306ac1236e, @0x51deae9a5ed4094a86d1953b9a86828be3fe1423af5b7ce4948051c430b6f2aa, @0xe4f54ee54e624baaa3bccebfec4d5e0650ef68a9dcdfced2034d519d90a52a67, @0x85cb3ac3ac3cfd5e10c96330c03c45c377c89fc9b5957a09924f289e6a156d42, @0x86dac4b1409b21141a30c51702b0656e7128767ce75cb7556da6e9f49c113281, @0x3186dbe256e3657c304a74118fb987c58810f4a94d4f4d701e20d2ae228d6db1, @0x18601846dbe28de2071b05c2ecd5e2cb410b57d7bbf32fa7a0a440ad1393c4ec, @0x82828b038bddab0b2af8db4644adc9e23ad600d219805a33b3d9b3cb6868495b, @0x917a50a48406cc5d5832d967aaaa7284b3cf762258fddc9810120c31342b842b, @0xbb1cf7c804e7f7901cf329ded00bd61939c1548d7ade21bf5ab8b1f563ff68fd, @0xc8a0421b69ed94feba8ed4fadada88e281e259c3c377783cdec24d4cb3c73395, @0xe2d0deccf1d84e17a8497202c3e1f5616aa7a68b679731e9a95c05734d59b864, @0x29bd68cd0b71a3019766e4c9df03309cd3061d89e250be617f0846bd1b2dde10, @0x529d21ff2d3bc458bb685c953c036be9bcf6b521cfb8b2e4ec265e13385718fd, @0x86a1848bc1fb124ae0542c03fab680dd7a0feeada0fb5b1185e92ed773107a4d, @0x830646cc3bf5a7fdf9ced93e928ca3233fe6901f5f37c5fad87c8ef9a1c6a884, @0x706adc181aa184211c020acd539d47a8a2502407fad005321f3c6c161d0d0ea2, @0xde0f3e911b34c0b231274a546265b5f593f1c7b4f54d4d4067cf94290f27653d, @0xad0e7edf41b411bb6521183a30941e860da77f4bb05ceb8a0df66b5f93c5a0d2, @0x2a64630e26784eeea6ae876a69ee99d8ca1fd9397208ec95d29f920b3325e0d5, @0x14e647501bb03c0434cc63eb8abea5faf4410a6a2da6c841c8db350913acbd4b, @0x76f77a1108a71cb3199d3d3f8e087d542ec1584675d2c641087544ec4b2734ca, @0x46637fc8547169864d9b4fb6ba439dbeb81ab2b3202ab78f8aabb6266d21b926, @0xffd2807e9fa8a45a581f48a714f141535ed50ce3e49aa31a144547de239b25a9, @0xea8fdc5ae9b7c9ab86e570cfd8fed8510c9375ddb59d3c1ba8251a7e2e23602b, @0x3d13fbe20d196345c951fe949032159a92d794c793f428fd822aeb70bf8cd89, @0xc3a9102e71ee8dbde39b7a696c6623b7dc1fb71cced65d860ca3f887e00ac27d, @0xbd248c3a87f850c72c3b2564fe4adf644fb0bd5158a864c15317470c6044a152, @0x5e3f3dbfe5dc957904d85a5050975ff158f26f9b654d63fae4ad2fa5f5164afe, @0x9e9f51aed9d22993fa3e470f9ea637a5ca936d9ba8f3f44469b395a181baf262, @0x79108ddd1485bdc79d5d7db7f21e6cbe6cf853947f94296872ef086d71e52a30, @0x9a4e2a252c3909a243ef4812f4596d88eceb0f6020933213e5b8de6f60e559de, @0x88d233155a4b788f6dafe55227c81f89f66917ff950e6f8a193f73ad8c11f015, @0xed801d70270aad8dd676f43b9dad84551b60d7da0a0045fd2627b453e3e33f36, @0x7fbb6ea760a584472cceaeae6b30343deda77f7231ec2dc2f12b6207c5b7404b, @0x1a53624155102adc8c1b8c416eed06d57ded8344c27240b7d5dc65231ddf5dd8, @0xbe1fb02dfd9b8d6e7da78e5e7051270f2b38a8f7facfe5c73e63f4dc8257c484, @0x40abfce2806e1f6cba5a65ab05b8c2f7392805e94a453fa10e4421cd165092e1, @0x9fd64a16133cb29a4d8dd572773d69ee545dbfa4d80d49369e935792723106f1, @0xdebc8aaeae87e0a027c1e633d1dd63f2ebaeb5a12f33178f2fa5af0c15d50ffd, @0x708b62cd0d08f74a072dc9f552a9f8fa24394cf93ef2608500238a437daca5cc, @0x551209d3d56e24b37edbcbe9af0adf8ebe32c23c30adc3f9ad8630c2715afc4c, @0xb30c6f05df6c5060311bd91aaeb6ddc07d5b19e3ae4e5e7f60835420035151a3, @0x7a0a0ee60c96f4f72aefbdcbaff2cdaf4adb6523cb78915df31a73cc3a386c3c, @0xdec465ddd645551fa2052ad276a71fd1b808e595bf10409604134aa80702039b, @0x7d446746b5df075bb91500dde7f923ddbf58af0e4266977ac451577964d0a452, @0x4bfcab46d82c21ba6e0b3a75308023c02e33e6fe1837ec6144174804551a7d26, @0xd78c2eb4d5c54d80956a38bd605824f610367b8f917a8c12260c224600bdd740, @0x2c5ab12c6f96c283df767f03667ad58d33aded4264b78250fcb80a88a2e63b14, @0x49edd31a0c2a6d708d25d9e2d800e4055c0933e2cbde30ba65a081bdf64c093b, @0x1348b06f1264a5fc9e5a1187779988941609fcd32136b5fdc4ee2b0f1d0d5a22, @0xafbf812959b7c6b09a43e53fc3fec44689bdc821891295b98e6146844ee9f41e, @0x4fd9c0a0f58756bc0ea863e95440d2e117b323b606fbc4f0458736c33278bbc1, @0xfb2e47cf75b6ce58666d9dd7f32cbafde5d53f634587ecf9f9da97e8bf4dbb35, @0x759a1007a07cc3a040f718e19567471d38218042526ad1f43ee2643717334e67, @0x43454fe33ecc24fa734f2a3edcde7396c66ae4fd1f69ee9cb3f1bc46b2fa7c75, @0xc224c2685a55adebd126dc82aa68d1b1223e29e5cc4756a71e63c3c874fef704, @0xf966c3d7671a5512f11d84bc3e92b2eac7479c49a7c8bc3817e142be2fb1f75b, @0x4f2ed65c0fa19f56dc90f0f1811c832207357a32525af798b5610209697d6751, @0xb59c630018dc7a384790bb2e58d84dceb51bd81b7d68a02f7254b4ba2c83760, @0xb3f30cdbaac41a8d3ffe5f1aa711614fd41196cf6c2558a9a57b68f43aec5696, @0x5e9fc86ef40d5ca81b9e719f3a7a26df87ae136e2c533bc864fb9fdc293155fa, @0x738eb6d4d0e8e79b191e8a123a71c395141089c224ed3d6a41a0f033f3fc81e4, @0xc1397ac2a2d67992eee4c04caefa29670e0a8e546f2119c7009d08c54f889e3d, @0x9ad5275f6e3b8428ec81e92e4d066f72cb4811b11a7761ef6dfc2069b220126a, @0x960881311b4c51b7a2c05aeb3b7a7b29f73329df28b62aa5e7fc2e1794673866, @0x40626f0a794d1b1ca4ab491e308406154d037a407e05b54c9fb9e60c7558304b, @0x93313e1e40513651c3d3eb81364db39a18b5a8b88b302cdbf8a497ead825be8c, @0x2503ed520ca53657492332e14ec4480d5f59f1100257b4be59fac1fc9e7a3d08, @0x9897e7639eab514e4ce35ab9b0e5ebd11980bfa5cdcdbfe67af13daf3f95799b, @0x6e2192d5bd3e18d7d03cfe2bef9c8b42fb8fb2a526ed29803c52fa378e06a37f, @0xb4458919822785ebc70946c6b1307fb16eddb2cd55bf4a815c0046a134004188, @0xa86c89b1c923eb8fabf08cc80c684be037054fcbda360e9e729a1e156fc13c0f, @0x6a573543db2c6ef14648de79760321212ea61398952103b330e3b2a2a6a11d2, @0x8f324edc4b3231ef4fff40579320b566f57e657f8a40e997e1c275a178c19ff, @0xe5c8a0e709254a062417b3fe672e3f020dbe48dc9be23d357f2e7c266b9f407b, @0xc341c0b5b6fece90782ad16a617a8464353cb2d7090f6956805d4efc0ddc7bec, @0x4c1c230275360bcfeb1454c4399d04ca5b57b390db00baeb775b8d1fc038e24, @0x52d47fa968acd8170e9ce8ebcc6b015b208d18303a4b4f5b9583fd9caac1f571, @0xb1f62ebe6b2777e700249ef8a9ad1471877898a0b74e1622a2fab00c38bbb5d9, @0x2796c14ffa4962505661ca44a8dcda7af26f65df180cf3d3dd076ca0f6b406b0, @0xa0795d7ecc75c34ee0815f0cecda136e155673c92d34f344b738fde8193f1f1e, @0xa84009a3be47ce2fe43f0f84bfa8a8ede3ecaa33d1d67db282e08f19c17a107a, @0x13092cd8626ea156ae3f41f45fb87bad78b215887cb064540224ee4bac88a508, @0x7ffc15e3a4bc00b40602aa3e0ede0b24f5c94f3530dd9c1d57cc644d5469a0d2, @0xc737ebd4233e75c57b6a5ff10fe6988af41a6a455238340ea5be506a703f2ab4, @0x49e5f45c8508be9db9d29c5dbc50a94e5dd5c0fa73b1644829fbb5e084dcceea, @0xcaa72e393c547826d1e2ca98dca3b9a93d28d73ea0a1d4dd87b0de627039e3d7, @0xc972e907ee4a5c73a6a4079660f2196e7d7a807e6d3408e72c0ecc288639530f, @0xcb3ab6914acd61b9b01da30e1ba70a92a7b5d74ff3634d4b0d2aa271f8c9211c, @0x3116522eb724a1bc8ad605b205018d024fd8b5e8f6f566c97fdb2c1d1a29bb07, @0x2bb2c62ab262257e64afe381dd28c62d655a469a99cf02a446f91a37c5dd09c7, @0xdde3d7a3f639766214bb574b986318c50585c91c9bf887bb13ed336ea092d5e8, @0x308d24dca0c18cfb6cd19229e40bf2890a6a6b19ead70dfcb9b79ca30de4a382, @0xd1d55db8f1e9b13850eb3b6f94f71647b7dabd727e66e070a146395b19f74706, @0x4508ccf3dea0af28ab4a6e759c3a4360652f34c1d8cd9121a6313a02f4c1716b, @0x826a5d9b26d81b8d911490d472a7bd473db6cf930107650e7b650b3386953e92, @0x5c083b6432d1f0587d0fdc829d80609a967e82c036fc416b2f28e4e8d68d3694, @0xbb7cf90f71901691b730aea7045feaec28c9e8a54235f0ca7c5b62aa26a7909d, @0x3ebfa64a41bf5c4b7fe0a3a7fe2092a59a7c930264c38ba444d754036fe485c2, @0xcf72a1d21d32df128f37881cca1dfb75ffad796d4bcb17141b25124f354ed5ff, @0x9fea2390e58fcf8d4525e8dcc6abe08b5c6f60ccfb65ace6f3b3a1dcfb71d9f6, @0xa4b7b084042a5caa87fe9ac8d66dbd17192a3fe5a58278bb0c360ccbc5add078, @0x698c45480dd11d34d27ea3b347f1814ca92d4ef754c21d585ffd5df05694c102, @0xb0d82c5e1ac7da9a3d14eb689b71533cc37390b6e9ba3c05aa8082b316d67967, @0xdc3b41f68e33cff9cd007a030e920cbb663b5762501f1c3339da80dfb3672078, @0x89dc163465ff018435734e055eea87dbcd7e26fb52302d1da5ab4a3b8b16d277, @0xa325094df96bc3fd0456a11df782cf5fd5ec0f422edf8e840f46568f04a6a689, @0xf663347a7095d0a094eaf1cf6d91942f83383495109f507fed9d2e50a5468a9c, @0xd821855cc4f440e1fe681d26d682be3adff2c677bfe914170e51b0e443cdeb78, @0x208c935671771188fd078c45aa5284d5a404b794a8319c3e70b4a70d1b8f444, @0x22ab032bd1fe7520a7e48afd00a09635ca67bd4c6cdc57a0467e371253c15abb, @0x7e7a086b3c73af64482b61dfb3e64a41ca4432192a021bbc40df84c5aa7bba7, @0xcc23ec403aff73795cea249646d1b081f937ade4e358566f1031eb3d32fc7a8d, @0xd47e3a91e51d76c088ecd40aa17e8c526458c28d929a5556a48ff19a8e042412, @0x5981ce1e3fba35742caacaed2e34481a0e8309e647a24060526983a2a0e33818, @0xbd407f7b0eea785c85962a02402211aae4cdea97c39c023df4a98ec75f381d25, @0x1a476ebe21763d3da39e48bc511e668bebc540e5489af7c2947d4b68f1f95980, @0xea46e9d8b1a11cc7b2091d74fa29631433cc3f5825e3797e0b87af3f4c7cf677, @0xf5f27b557dd058901d03d3096642b9cbfcce27024517d4a620a3c8561585d181, @0x5cda988329c4921c38a3a679b3dd9c631b6b41624877fb6696ac2e72d00da988, @0xd9ea7c4b3daefb5f4226d568298e3a52a7eadbcfd95917cfa87ec54e8071ce50, @0xad40c04c0f2ca71476a14a81019e1fb32377e7a60b2b564d0a3820fb06eff8be, @0x8314a97aec87855bea7703de8bd21f4009e9bce363020c57cb10b39dd87fbf44, @0x564b3839789951693843ff80cf5ff864915c2406b09d69449a1ae2d6011344fe, @0x8ad91b32cd2b2021617b85e42929cd20c27121dd0f919e37907b4f374e65f7fa, @0xc7f836860ed26e8e7413d320e270e6e4b9322c40e9705b074d65aa0ca0c6ecce, @0x25e110f82bf65c241efec9106eb1647f812e8040510606af7a441665f258887b, @0x1cc4624a2b3d626d35984cadb453846b28c720f1d53e9cccc22408d2e50c2b63, @0x3c5c6f8713fe61fc0ad706b96ebf98f5c827085d9efb86ad65c7f5eb85d792bf, @0xb8670e2ed105cc6bdd0f9f6bbfde3da794281b566e7a2446482678bdb917286f, @0x512a710ba1131e37a68c5c819f29fe9a40dd417665601ba52236373401b8b2d3, @0xae37c1ff20f3cf4eb0c847affdcfa9d0a0d6505954d8a57b8d3aec59eef06bf1, @0xdff086478834a9a313df220e6301aebe25e99efd7af158a13b1795cd63739c19, @0x2269846b7e0a68e13465de9b18800c13a62a50b98b92ca21270ba4c7f75eee22, @0x570f8b84347b692f3521767429290923a512dc830808fbd813506f1294a6a301, @0xe3ccec4da97c1c19e4bd3718091d332a18743f88e8470512d2e93390deca990e, @0xbfb99bf4bc348ad1b1223100807d876218d58e43f95b10fb91db272feccaf4d5, @0xee4ff04e54ca71cc6bf627c7ffe28105002f24d43cd561760d3ffab377490300, @0x3db881d8742411dec3821ea5768cda3e8052802a3c30e4946cd26cf888e79016, @0xfe6e6ef5a2e120248c9c5ea4eed4557604a6a3879b77c023a9ad2d86aceb62f3, @0x24eab5af0e34b9f4225761a6f855946c9384ed2e51ca5350d9a83d45f6a27ab5, @0x151feec3fad6cc53da47d3d9503359b7bfad094db19050deb228b86ae54420b, @0x167675e648b37b461582be746e7bfd592ce987037f148db655524c85eaacdbc9, @0xc4164520d11eace3faa4390c152312d781cf6ec4de9b99b4b540d13fede0a57f, @0xb3a2322bbc40e3931f2b438cf2e678ec858cdb6441b1d8b913da316ffb052e7e, @0x373b3b679dc8a8c8b366dedec883694e9c080a52be58a6aa4905b665ebfb31f6, @0xbd53aba1e0dcb611359e40b5139eef48ce67ee23cf389312841cc442dc1f258a, @0xdf46147c9a649eed61039dbb7ca9d7f90173e095fd967ca0a87542ce4b50eb4e, @0x5565cfc0eb99403249d31dd2e07ef145c7aacd3f099a1169443d025d0b2981ba, @0x9e67c7cea07317f24a91313ce3cdd69a942f325a71fdabcf1caeed93991262c0, @0x25645d8106f0ed63273e541bb47466dd20d42cc00b2de2146da00441807c66f8, @0xd44c8aedaf01faf35349425ca84e95453d94e928809a602a8068ab792d2dccd4, @0x5f9abb73c5c7409bb5a06b6277a5a38ad2a209702f7e9a7918a01da7727a5180, @0x76634408d632cc54003852294f45b64a3a4fea4e66d087869ffe15aa0481a216, @0x7375fa17eb03891bad830931b735a3b5391c359f426bd79f4f9da9132629e33d, @0xec732c44e4fb871bdbf18dd97f264d06fddea539586e7fceb6d184ed9434ea6a, @0x7ae12902f4533ae3d82a17f9b09e8abb290756b2802478f275386569ac2c4eea, @0xad9229d5cb085661b9ed6524ea766868fbb8caaf001d6d816d91236609475280, @0x9be0a1cc89c9954549a31d3d4d43bfff7709a74365fcfc241f1413dc3b091a2c, @0xd500175e188fe2a7d786e56bb19349e6b0cdd8fbd0a99c3b44984d21b8aff654, @0xc913b8997c056480514a8ec5bd6b22c05e0c2ddb72083741a1bca4f242fabfaf, @0x581bdc74de5870591a7622f9860302815933e0ffd228df3c0be5ddc44030d5ea, @0xbe605cbbb2f7d03012deaf7428bc0e93b39b5d92bc5138df5e839d2288e83933, @0x667cb34b685e684a6836e44eb6b9b9d052f3dfc81f03d25f09a34304be456baa, @0x47a9f149395d9a4c2a57454d86e98908cdfa9b74ea9c86576f16448d07b96418, @0xca3bcc36800ade779e95d360450929960eb2b3dbb8aaa8bf75f60727d84e3717, @0x74ca5830b5eeaffe1f54e388810013c0c83f44871f384b7fbd8f32e490846ff2, @0xb46196ee521410947dc38ad67c4f1b78f4a062c74a50cc4a714c1e27de7826fe, @0x647df8b1eb6cad6ef6e15f7595a54aa558002d6f44d2c9ccbe47c6ee15d086f9, @0x49322d47295b83e749e645c6e7128f8522064484b071b2fec2db6c564fc7dd96, @0x9414522d8b0232bbf5daeaeada6bd59a923317fe688b893527fb8f71485163eb, @0x9fd5c796a2eededcc64df39f7ebf222f15dbc1e933b90c1e6a089da34816bdee, @0xfe5ed10b8a213d7439a2ae43d02aade048ee4a409719785e6ebeb1423d34ae10, @0x29a3ed585f154bee23a0102becadff1397dbd469f4ee55a6577f9118603fda11, @0x2edce006a5b9ba126f8361ce74836a8edad4a29bedadc3b65cb20ca422097fd5, @0xcc921e70a89e365a62ebd79a766b4c662c1574464cdddcb3be1775719a97c751, @0x25ef3ba1121f659818765fd17e5cb5d7bc075f113feb6f89832aa4acc34fabdd, @0x6d9c2998e20bd650c8040e12bad49141843f0966823bf17f1cf6069102845cc8, @0x90ec45601977a087148964ffc0378b9b5478ab2186ccb83a41980f3edf02e5b6, @0x43e45de790d858350f89753a9025476a8d24cc8052439baa806d8df014f36862, @0xe52a1826e19d093ff219da065ad2e2cbc4c261fe180e9615b14fb41732bf33af, @0x82a51188bd31a3b73e69fad01de0b9dd6a15e814c1cb04430c6e23ea0f2d8b57, @0xea71a948d602a58c875571b71ff339230fba90d40eca4dbc0372a95add7a82b3, @0x4852ef5984c5210775d8edf4f1ea3273f01e940c615358e9ee9993a7e0ba088f, @0x57db74894031bf17dc819f611a6b7f1dc016aff697f010030d7129b4fd21d9aa, @0x9b1a3ecb76421cb008f4df2e56b754227fb97d59cf07c9188f3291f72ab83af, @0x9e4faa67f52954a11386f611f8f76da7a975207b47c0379bcdc9e669ca9cb582, @0x7dd074ff90f0ac1b1e333dd1ec4b8e83a5a51401d3ff138340235598f5b0bde4, @0x5817007831d017c1fc4270d3550f3634557e6fadbd12379744fa67839a5e9e6a, @0xf437d0b64d3ec157be86f8bdc634523e4a5a838526be0f1f005c486586c196a3, @0xb0d1388a059ce80bc0a1a313c2ef7d3fe45da0757acac504c53ff8a3a40d5bbf, @0x5dac20b7f1e1a63e4e4e618e2f2905caeed68b6d89e8ad26ca7189d2f4e07ecd, @0xd5c4f15d96d0388d2186f04e80584cf3a391e4ba1ca1b7a76bbaac105b9ee613, @0x64d47a3e87ba0341fed7ad97b9b62778d5587f21435a17cc2ea4dddfb3670648, @0x1550d2a45aa8d248e17c1fbd4f31936166f1d40813ccd0eab9772972ef879390, @0x80e868c38c274239c4d795ad0e0214e6fa63d200122a8dc68d58f7281d046d16, @0xaae41e09d96e4f06fc9a0a32f43a6120e1d74f3be23e95ea84b188c4da831a5d, @0xf6f5245f41549eb6dbd815a9269ed8fe295a3f5964450735faf02e1701b03572, @0x4f9e9be9303c0e8a95aee56ac75705bc470d219b4c99fbd4ab4179298c2f1088, @0x9f49af5d6ad070b49a881e2766a7c27f1f2f2e606445afb034f8857225bfd686, @0xae1129c4663c7ddfe28e81e3a69b2d5ae9f00aa270d389ba720e146a6c976c0, @0x5b3e2fc1bf4abce0d165b6ae1b1df13999421dc8133595abf8fd39407336f288, @0x92efa296d6c3c989f6ce8ffafae3f75d69be320deff86eedeccbd6e4181283b4, @0xd40f0881baa698a419845a604be439ec24cf914f4b30bfefee7f0166676e3e0c, @0x68438a99cd88bc9dcd5272fb1bc03dadac9fb5abef88e2077656804674058108, @0x99fdfcb6c2ebef41a5e9f19d28534f73f2fcfdbb8b3c9039bd77478ebec5a416, @0xc97c226b942245b0d84697c918659bfe3ee7c9f3c5a5a3a8bb4f4f7a9c680c15, @0x1440239c3accf218cb3a6f3974e3d818ad9341af91c6f5beccc9e1bda2422aeb, @0x1efa1f1047db20317414d472e2bc3108f20c83270fa679d56c76b8315f05013b, @0x51f2ba40a506f72fdaa8ea3c569c68d7447917caf2c1617475631b3fc0f3328f, @0xb7d1f9ef8815719902d356dd6a4cf2882d63798f2605cf3f85f338992f79988e, @0x3a3ecd6dae1e14977df108399909ba93b8ffeb05401bd88026c6af77eb1d02d2, @0xf4b96c0bcb7d4c42e7650488f0016e92d4e30aa0d761093ffb2441fed3323766, @0x80749b7f8441ad292e533ea025a8f8767cd57d13992772ac04a4c9d4465d9241, @0x4fcefbe3fc04cbc64d0172b653e60f53b25ca5d01dd70ab29eed0e48c351dcc9, @0x9a2dc44ea8a533c6ae4f15359e7a767de4c9a3c91476ee85c063d2d640cb2756, @0xeb28ce6a84021512edc4c1d7769974d2b571a0ee7befd7be30706c82d24c8254, @0x4cbfcaa75090a69941a562806e423ad51c978de18f4c6282889ebad7ab472d97, @0x646fd92bc44f4e30f223b3d34d437995df372f9f8bf4d1ff012b4d9070aca90e, @0xc8dded6eb84c97e4c69be11cbbef4eda9535ae1f9e1f69b8a3f370460d38430a, @0x36f30fca813cd214546a7abaccacd62ea9f52ced0b0e6dbc85d4a4af94b2e11a, @0xeecbfca6ae86f29af06234f829af4488b7103fbed5ed769964c84882259912f7, @0xe56912c552ea84c3aa3c5d422ae47bf166f38e643e99197524eb06865e9ca436, @0x1a7e5f77e0ee7691a2370f7c15a6062fb6237b185833554042f8efd5684bbe7a, @0x8a04b99a557e3748b78a83c0b2e7f61e8fec94ef944758ab07535084865b456b, @0xa7aef94842dea11adc0c4a5befb44ad824cc683c4aea6efe844794a25bdc5d73, @0xf6d8eb252dd7df108412ffeef7eae2b0fa54a2cc1267cc29030eeb0fb7fb9d6a, @0xbaaff461b6ee9498809845b8dc0c40fd4f279b5280c67979e5c9f936a76c201b, @0xda55b8bf106c724890bd52b80545fe995e9414cdbb6fe69965c44df4c25c82cc, @0xe412d585f69bf5bafd6a60f0ad250fc70f19214ce39d522f24bf846390499d02, @0x790cbac0ff5e27b1a416452a9f93944a13df7e9bccc2f35532842c3b11010886, @0x8ac0bde8ab8357745df4b6c83ae796e1d7066d7dad5f056fd2c585e593c883ca, @0xf1b7ec6adb8724700ab794333442ff1bb4f13dacb05d4844957936c05fb6e174, @0xd8cd8602cd31c67c14094886d9f8dc97c39ff0b9e9b7b4026089d408d7399841, @0x421f73c0bcf5d23a6ddc8a213fff46eafe6c157fb7cba7792e3e157905126405, @0x24701f12c0e01bf9125f64dab2c7bb21c1017f1de9d430b47eb4e8f32961a5a1, @0x1102267a4490f32a3ed0634bea3c47383f341d1343c399709ffe14cd9430395d, @0xbf6f1859c5f68f93fa894c1e63073f1977947fc9e057c91b7f822ba2dd5b9ac3, @0x6e6d19c815a7ef9f54cf99c367c5b9539192997947e76d8bdbf21e93a926e195, @0x73a2d7b66015debd8a1a6025933ea436f176be0d664d5686cea7beebaabcecfb, @0x6d37879cfd7626789961814b05be6f89e507a2d2ab4a8a514382aad9fd5af509, @0xef847cabfb5b55334f36786ef9dc5f2a20c9ab5b6e7d879e5e314cb5136cbf1e, @0xc9b70145b6f81784a40171bd1f883b39f3929271499599bd954dd21f8256130, @0x6b2233edde1e180a1fa6a5a2629d9e98edad11dc7f46a2eee4c2bd412556922a, @0x652fbc93377d151ff8a067c4134d6339c0108c8f0725105c2fd6204cf5d9544a, @0x4a570b7031295a2639533c0b69040f1819de95084a852c2d3fdb3ce82468f6dd, @0x1d45cff5e12c4f562f5b80ff417bff5d97c642fa80a068991acebb4cbcb90f15, @0x270f13b1238ecd16318b7ce35b228b011718c1dff7190dee76a9b3bff05fb325, @0xf9e3034fcd6282a98326910c394cf02895ac2dd0a80f3123cdb21609c2b64644, @0xc50107f91144586b1ef7f18c90272b1a5dc59145b4ff05499416f6d00c0d8067, @0x25d245a9eca7ce89aa61fd667dd13ea701b796ac956e5b96ae39fa0e39601196, @0xa54c6b606fc528a56a07d82c3ffc353467b903ac4c63b4e6959fcad2eb624c2a, @0x55c1dfdc0b3f6ab5de549e13726dc46f523838336efd589ac11775e954b90d88, @0x8cc39368b3f80784b1e1b404670362b6855abbb2999a695006d0d0b58d4b8cfa, @0xc09edb59be6198184a69404dcd364517ee79e4f4b1b1e5bbfc12d8bacf2846ab, @0x439e5061c33be403617ccc8721bddbd32950942cd64320718bb1bbc5f7089b0d, @0xf7961261756f71b64e5b0e85c99d2735c6c3af6941c0edca21171c12779b6ce7, @0x81d775dcef178ae65f7649ac3c2627c6e427c17740af9f465f627c529dd520bd, @0x7ee143a443a314b189d2d313a5fc1d47a9cd2824891b9b0eb5746b6b27b77fc7, @0x72cef87d9126f0f454368ca2f6b47e30acee9ee0b16b1e76a968c8b843ade070, @0xf30c54cc8c8e80f82127370b16fc3e8e4fc4dfc9a7d6797574cde9552d1ff3f5, @0xa4c513391c7dd1fd9d1bf7983596fcc7260cd9d74a323162995f001f0c9d6f80, @0x3e9568b657b7843b5f9a9189f96e351a25bcc49f0674822a78ece76fb499f2e5, @0x373f21aeb4e1948e2949c7a39d206b488696bbda21d090a8f5f61de74f129dd9, @0x3a8c849756375285f6a923900829941b0d4fb76bb3afcc423b6f07be0bbd7617, @0x2d424fed65a0f70c79cf63ada2ca3220158e5e1aed34be594a40683f8d0bd85d, @0x7984e58880c0a83915ffc54642b9363ed1606779500b589bc62483be4512f283, @0x7e6ddd92b5e7f4b72606e319cacb2c38e5dd58ab26b67ec50dc94f2450bf1aaf, @0x6e25b7ac98b6e7f68ec92fe5e4f8d8f950e58be2a9b2938acd4b982efff3daac, @0xb7f296a83529f757eee593c83d6a3f17c74449db02ef81acfa5688c3fa225e7a, @0x1180825567a09841421fa4fcf4abcfce9bb6791042c9141ade170aa287aeeccb, @0xa051153a736f0a4af99e7cb4158c595e44c01074377ceb42a1904c73310ededb, @0xb2cca9823a2be7ff73cd6274d54ab9e2e54814c1abc1113f5c72cf780d8be33c, @0xe791d353e6ca87162e805977c41f24b4749ed8d3b8ab63d89bc1b4dd3787b809, @0xe012b52e32c75bb970b6995787cde229f3ccf44c91c73bbd626e10c9df76a394, @0x73f6df18859e66a0861b0ea34b76efc4a0913a29001c15c7fac16ddb5eff204b, @0x638eacd48c35eacb8a70803f30265079e932e051599dbe99be62539944467dcf, @0xd5c3c994bf2a339158e31f1f3672473f023e8f69298dbb2284035d9e8c05da87, @0x505226a62d98eb2f2e4c54c7de7891e1e6898078cab5e3ada62bfa20946fe7e8, @0xde6f90d15367fa2f52416d797b970d9ecc968488b6b15ffb586fe51cf4e9f33b, @0x74ee33ea25e180a8525f2be8eb72b12a123bff297f23385f42b6bf91c2e1c42b, @0xd3e8f3ef7e2a6113542e856be2073fd5a337d2d31e507e3937f63db490afd20e, @0xe11234011b20bf13a63782a6aa4716c1394fa53f9a301190b9de3dffde3550da, @0x8376c4b132de3c136a9afeca1bc7ac616100da6c29e2c1e834258cc1c1d47327, @0x5a1049187edf71c9ae2402162afd379bc4cb67cd30ab27941ab1b4983be9088e, @0xbbb1b11805322018a0d2c16b509370c4f545f34f2c4cfa14316cfa4ae91c774d, @0xa4ed14b73939507262fc5504700ce33ea562e58a978414c585a3a4cad23033fe, @0xf068cd2f22b48713ae8662efe29cfe4e17384c5a40ff3a1b0f56186944bb18a, @0x654b8462fa7b0c88253ff9209e459dc6423fe699ee36fd96e670a77b2eed3448, @0xac462042952a9bce4b5383c3ee0e4276cc084314b2bb23576b0ac9792de49e9f, @0xd0872839a6bc309cda80dae11fe645c84bb24cb59fe3c81e29a1391ffcfc7b10, @0xb737a0cfd5f917e4af115ac83910cc2bf295c97e1f6b516289cb2a1714981ca9, @0x899dfdf8c0f7a01e76b164b4b99fb8a89cdd8fc1b350f8450b2a40ed3ef37813, @0x590f64e3c140bba379ce9faaabdcae3bb681e31b9fdc3b021bba7d252cb7b6e0, @0x856bc83ee338f36d8b247dd80887ea4cda5142a7f5c9dd4a1bd6d205e2a255c4, @0x9db4a798cd03908efec00b0c654cbff6da0254cc5d710c2f42df26c9d5f695cf, @0xa98980b1614a0584b81d14d96a0ad278b575f441d0ce81b0c1c56eecf39779f5, @0x322cc5ddf4cd01cbb463608b0e580a896f8a7f0a5405a1e1a9ae75612a343a72, @0x7a3ae18b6a64daf40d5559ba0ea28b89ddc204b327246026be0c87d1c6eb1e96, @0xb48d04c7431601e6d39f6e133331e6bb874b47d0338269d2833877fa560d253d, @0x4b15f7e75a210b1922c18f1b0dc4c4c6a6a9781a68e06a7656e00d53e8f60801, @0xa35e9eefdf90b9d0b8a2e9aedc64d9188291f2c4154c9a949c7852bcbe8e8f22, @0xb789da28e68fa86849347865c8ed897d68101383aefbae99917da8226b75d03f, @0xd4688bc7e4089630919b056b02ce85cb203da842297dddd3ba8cb84e40e9ef9, @0x312cb88f06ca174c2ea2cc6e2de3d551d0cf1fcf24a1f8afd220b45aa7e32695, @0xb5e11aa0abaff37b0e1c314bb76401d6269ed32d3d9765cf1425e7977ddb151f, @0xe1fc841c6a90eaa02a36fd45f4078df0f6ce8016ab0452d436a7f25e8f8043a9, @0x9cdb76c3751d60fa62c3acf246ad3d84c57b1e91c94577b014a8df0108238e0d, @0x7b17a3ac98180a95e6e60e7cb8ed9c83da521490087bdf991983d1c9688b6e3, @0x37374c14987dcd005fc5f6ce08522b9d79622e3f0c699ba7c88befeecd79ad, @0x493a3ca00a36493ddccb33e3b826af24b4e2f3657f7f1962e9436498bbca2b1a, @0xae00f2f2631f4c099550f12e3d37f1886224ab73f4d9803a02e4d947a7d06f6e, @0xb1516ac382854ab5aeb5d14f138f48d90bb8e3736f34a7ef46f51b58a7f193b7, @0x42ab5117ccda0baa54c0f3f3c31bff2d8092f5553e4ae49edb46b92ad6b9b72f, @0x17aabb9a2bc096603f12ea5a3001f83a6a186caada92ce23cc90bc66da5ef38e, @0x70a89ff5398f7f85597123b850f3c32bce7143c6ea051af9d6bdf8bd71216a27, @0x3d3161626981c7449d76a35f6ba3eb7be9938627a7d7ffa3af9c5f79cae19588, @0x3c25c6d5600c69950c7591227db9268ea0ff2deb204bdfd18cbdba588fc14879, @0xf973301bd9d5c30083e79724eb7197c0f8a7760285e2e289be1016122cd112b1, @0x86f25e9bb376d45366c84a43899f6ad6e71e0d0efaa0e117bfcd15353620809a, @0x38246e82e850a655cd65d241e4ca809225d76e067aa91c68bc50075fdc85cf95, @0x380aef59081b225ad59647eb134663741a3e9100f487d984b433964607f6a36d, @0xde6020d212644c5b88c4d0c944d6d5df6b2950e180b3e0607064a4cc593c21bf, @0x5c93f048da1daddd46c62c53a71b731a3dc6222a2344cf13745a6d4ef78e8ce5, @0x269e33cec3c75e01a5b49946afb1eb3be838ca0d65290c8f951fe2a8f2bde4d8, @0xc4ef5f1458eb8291e4513c0952051c06e4e2134ec9086b1b702afb3d4b5e3d8f, @0x67fa2ee3bb7f0e59b6fab1cc96e601449bfd2e1d0013bcb315fbeb9b900800ef, @0xacdb150b685f670f848b2612954dd64c3ef74d941b960a298bcac2d0d8678a39, @0xab45802155852a4fafa8575f0f4c20c511de5ebbe25e8606d9cf13496c8cbf40, @0x4a327ccab14247a4b4c44c4454b0ba62ad3f3ca707358b2cc57aca4f94944edf, @0xd1279825f5effe07f589ab1b13c5d1dcf4ba3239e42e6fac65e41342f482365e, @0xb5ab302d8d7d03351d0b02bb846d19a4a12082bb3c8c098f034e6cfb041bbeae, @0x14bc5961c9bd2a7e125d69429a7488a2f57bc0608b3c5d766095a35c41d3af41, @0x703a1cee341081aa3154897f58f80f906f0b55c0d26b48973239d0b0f8caa103, @0xe51b0ced4a5d30d4e1f1c62d5115e9daa532f275ece90aab7fa9496f9216cb72, @0x74eaf59d264794990a571fd3daffeceed5c4c00e0395304fc1cd7cefc59287e7, @0x3de34a00cb0610611242934c7fa8ee053b782d6c227665f77efb0f64dbcd319d, @0xc8944044fa9f7304606edec90cc8356472fb4644ceab219baae97d452fdaad75, @0x8463f7f8fde538a55d4771999630e8dc99c3d4ece002d0b4e88d27a5437eb38f, @0x9939e1b7e48791f1bd864414e039f8f9c81d7e4b903a302d6254f2339ce9003c, @0xc75479d995badfd4315460ad960bc720eb37af9ddb3ad8ffff854bbe13726ee8, @0xd64bf85541ab4653a245612cdd946b46d5423f8b323f8056027414c6561f7b4, @0x12a92c01b0329df3eb65587ee9cd465ce851887020f364c48bb9ce23e3af191c, @0x5e27a1c57f1a189379d9035524209561547ae1cc394a73754bef3027563c8cc6, @0x40fa964a5e36ac23827ebf4cfb3e6db670a6a9f6c85cbcbc5d2668f3fab7256f, @0x18f54d40b5d0b78ceb3bb741db968280b0f6699c0a8d6ef4ef7cf8a9d4379ed8, @0x4cc255496e35360c8011ed61e59ddd5afe48649e6343acd29674f66e00a30467, @0x6bf68bcb594b7e803b21852c779f9f318f690e0c94b9132de3f05cd0ca25a11f, @0x21addadeb4b0cd09009e381c2da0ea1b99b8dffdd3617db80224765e57f47bae, @0x9e7bd765be37edbf00a319596748626ed3893b373446d9b6469dedbc0f777147, @0x70f6a90af354cf1789d71c39f2638ec5921545a9a2f44a3446e292bdfe6e825b, @0x5c8f3fcef4b272841ef26af2842145b9df55fb4973e561fa47f91552356cd28b, @0x4b1053b9ad5f1c2465212e74312aceb8bb5282a72ba290486cc1a92fe2edcd0, @0xe6970105113c92b54ee618702feeabde46bc3cc6a1631ed731fe989a2f6e5c18, @0xd569de345c88eb7e772174a96e7d82e10ed607622f120bd3546443fe3ac81caa, @0x93315a21f98dd7a1664a4f816f1fe953a5cce2eb88984b1f0eb5f2d1bc88af86, @0xb8ff762c1130e3f90dca927b399a93ac02b6f39703e4c2a3814cd5ff765052b6, @0x31f76a3814d3e1e02ef374a406c57b52c1001bcec43f48d07ddc40a13c84e800, @0x645eeb9906595d648cbfb59ee928dfcf7b482c80411810f4e3ba2c518f1d785e, @0x86cb35b370474db42c5079db4f2c7b0f10b669e29819b13cc1c27b1b1b49a07c, @0xae999d14e6685e8b936cb3e5ff764e325d2ba1dd22e6a80af77304f56a40a00, @0x55e919362325aea9c1bd71ae612dddfc28a9bd4180728e9c669b202bf19157df, @0xf6ed7da21aa08081abb69fab35d925ef986528c1a05f0bd0cf73305623658843, @0xa034a26d8c3d5aec19a80d72267ea9b084a676677e0e8557b9e5f65ef83a68, @0x2a3f7a28a4feba7064183ca8e9af29a5e9f87a6bbd3e252555f74d77f6abb4b9, @0x782502a15036621d318b2f3c0c6662e5a9484319ea18fd9bb7ab1f5c42b2cf4e, @0x35a28810084ef3283ee3fa83c0a25fea73176112f8a989e69e28bd9c9b869b0, @0x306e80066183a072b93de9b90ea82a35233733dfcb819387ad431611fb917f07, @0x898659786b0e38dc0cf6e84167c606dfa1a4a1cc6e9dc71a2fa7f778744141ac, @0x562813375b167a5d2bc62460adfdd0eb34a322cf07583a94a60f0cde558e131f, @0xa4074850f6f1105f8f8587770fdebaa1a8522d9bd8764879e33314bb79863e37, @0x991ba48128262429c5cf2f9c9a30485e2441195eab2e854a10ad4fc118236a27, @0xf2435d042e0f824c60e6af2d1c4ba57c9e4b5f69712d8183ee13ac1032e40c24, @0xaab48f792d795939bfabfcf4fbc335a738e44b43cd0f31cf10fa2e5d0af10527, @0x2f45d44b2464f3f1dce962348f01ec990bddfef390cb3ed591aa43e2c66d4415, @0x7373dba090bd80308bb8a7acdfba26b344a77c59a104cebdc9bb3e6478ab588c, @0x675782eee8cff02a511822821d27543541d971ac2d9b2650b5d3036f9e5b0fbe, @0xeb3f626e30c96f74f5ea81ac35298eb287ea6fef77eabf43b78c7c0d26157665, @0x4954ed9206e40152b9391b7ea4878673523948e4d341e907799ff10ddbcd3556, @0xc5e3fc551e636c817a14d0355acaf7ffb7e6d6d8efde3ea2c525bdd80e5e4450, @0x2dccfe9099450a2f1c402ce6012a8cb409068670430b6e84163bf46c6be2540, @0xa941387dc4b6d085032d13dd6f9f2ff4bd2f996a21ffeeec58a724abc9af99f5, @0xb76900459f2fd5ab64779294bca3797deb19ed2ce38e1fdccf52712f982b1055, @0x728fbecf7a2e4238c32671005e55210e73373892ae27a5f27e82599f09572378, @0x37b1934f6b1b9a0a5ef931c68e2b2fd8e980fa40eab2b3abeea8dda84f8e2e78, @0x3a60fd2b137dc74ee6b91538755b7f0ba32745aa0d5a85e1522034401f5ded43, @0x9059bd662130664afb336b6cb1a4a061518f2ef1a7493fa21225004fbe7e9620, @0x9442beee4cc728beb34862fffd236210fd7a7d3aa08fa9dc67546f52150f04dd, @0x5fbb2f728d2c60f4f74593f8f31942fcdb7140166a6ce39fcdf99ded890a0d42, @0x48ec9a3500c6da3e06e5d68bbd6a9dabc85784c1751a4994a32dab154e838c4e, @0xeb86b7cab03ebc9878f1ef484c0f2f6089618b1bc6e8ed2d1b8354ff9a1d3dbd, @0xbdc572947972f0c91ea1051a1b94b2f013576ff3fb54ccf52d7e6b8e2770acce, @0xe2ce62a55fbf4e7914ae225b099eeb7b019685e0ae601af8f144ad5f521e8473, @0x9eecab1343ab3f56a6627316f3732060423aadf70b00a8d10edc8fcc1ddca6f3, @0x73927a4ce96f9b9248ecd2752ac9fc233c5772a360c9b8259d8dbe1e29d1f8e1, @0xe1346a25633c2614948d28b247cd9c88422a99696576ac8798db5a8fcb30ddac, @0xae9fe920ed24cd01a7cfb1b146341e223c032a018d21cfa064038b78c4fe36a3, @0xb93c9a752298f4e82d51b571bdb42b1dea1dab32c519ad6797c2f3147f9249ee, @0xe93439f10087f86bc1e275e2babb39bbdc866633be8ae5d0cdb4a7ff34468215, @0x1b36717eedc65154b6c65031a5065c63a5b192940c4fd90d29796bd04648f754, @0xa31d807684c003dff67e28694dcbc97036641719a36ab4fb18f2feec223412d4, @0xa57178a364d2352fda4847880e7a1ed2f405d5fa677b49a988cd656db068cd35, @0xacef722a9f7f1ce4bb020c99f876f9a4408a3fe03d7e53a2e583587f03f6a31d, @0x9bee138a72fedf17dd36abb31f7a033f8cb34e222e2f8aefa48aee934e14b6cd, @0xdd6899aed9f23f36bbb452784de1091c7edf100441dc7e48534e6aedf40483b8, @0xeb06f7c23d575167636cfe0592d7bdd9297194931978fce013146cf1e9675295, @0x9e784d423813931c41d47348f3bfb8bfa22db3937bb1e4009d80ee6fe0140b55, @0xb682a506d4ef94d274c73223d4068666721a77db022458c4e732b28b52f6b2ab, @0xfd12f481896a22b035889a52583526f840c9849d584079293927bb6accfd1df4, @0x86cc5cdaf80d4d14eedd531d65cd5f07af696a0e1335952af8c2805ca093025c, @0xe0f6b289448498e66ad022aa2d52f62421a570d159cc149fc41ea085ded6221f, @0x7012c4e59601094c82d0d695f97ef193afc823b71c2e8d03370e92766ff8c7fc, @0x440f0449b5f3c2bfc8b58edb1dade73067d2c35319cb2c66f7be1a86ce2a9727, @0x7b3f26e5238e7928255b54c0eb9b269be875a2b6c83215a8e1c6ef9c230b67d6, @0x167f41489ef083cacae4b8c3183358743ac5407dda1d28fe2e08b861f1c660da, @0x23fe432763eb4d6de0a43a97d5c257531aa64bfa06712a1ca20759ae426aef2e, @0xd44da2a2e467f5856d70213f0263919e01a309997281c44cf10a659ad22a0b7, @0x6fe24d595cfb6c1c5c3dee72dd02ce5e8e7360566c3fa3e8f18b962eab2f1474, @0xb0f43acc91ec42d225581eddc1a843ffaba0b4dc0617a4f9153c7d357e877bb, @0xacb034f04821f91a9be61ce6f17af05191122cc42268a52a4d2689013162e263, @0x860cfb994c518d6c509e6b4796dc1335d09f406ff0432c9408e7d0fa227db422, @0xb9999fb6dfef924436df7692c758b9ba82ec3a0bbc36ab34454f8ac83eb30e1d, @0x7801d0d0fd1ec7061350d324b062bdb46a37f2a277bbccd130669d3855087630, @0x26cfe302271692707850977ac3d5bfff86599befc67c18425bc1c600360e3c68, @0x36954c1b95054e214cf696cae4105e04c00843b72a7294e98f34e41c8c46e304, @0xb27c7be22b0ab3649c937e168e6fce9b6a4a768c5b17acc497179e18e563eaf1, @0xcbbae97610ac23554074e269009185a0fd2a8747a4046a38d9afb12cfcb1dc0f, @0xb6b577eb90ce195f97bf8eada9f6eb6e0bac8d92fc765e669a7fab762ccbcaa1, @0xa78252adc4791476c2ab6033e33ba3b03c897f68e3cef803f4c7e4dade8b6ceb, @0x150e4351f21492e8a07826716f24c8ef33897983ed8108e110b16491d15cbd67, @0x4ab835a80a2a82d48781072e13a0dcba14dd418d495fcbba02d51185ea46ffee, @0x80c80033948bf422b13535871680036d555c50dac9875cbb57c9f309e5017818, @0x727fa586adb9815988b03f29e71dca7b4d03e7ffcce9cabaa2aceafe36c642c8, @0x51ffda20733d6a852da7e21edb4e691ee1e63d818322298fc0a04ad5ac4826b3, @0xc0c3d9bb0d807d6ffc5b16770c747c49815e2a272130e244569a6a4f7d2d6b51, @0x31e14f1d8fd29b1cd0600b90d885ca98ec8a5ffd00e62b4f02e57fc0d65a7331, @0x35e5149652d619806aee62344bca8ecd8df830c4fc9b50d3723d5fa2c54fe265, @0xa2537d07a00e3e9959ffd075d31514864ae6d5775e64ccb9b5b9c4a5bc5b59d5, @0x59c1694f7e56270834d49002564d4cf162e815a3f63a8a17892ec84fc85c1c9b, @0x26fcf85f7e01cc62ec0c56260d7b9e78592fcdedf45e1bcae325f57d2c3afe4c, @0x513141677e6bd45784079f0564e0ffee836175c8dfc918ef962f2eee95f89ce1, @0xd2bfe42315ae52ae6af3efabbe91c0fd7d149b7fc75d43139a7049099f609b80, @0xe3856691f02ab61e7efff870a432dd45f9a38f72acb48426091d4456761799c7, @0x144f634c813272f6584d6af2fe7f5d80c2dc1c213927d50025a9672a0b6bf259, @0xdf0206fc774e2ebf44534c62f9f66e16e11bcb66321748bc426cf207eb40b073, @0xf129cedde545d14787c6ed3da2a0d585fb2052a5674d171aafdafc8f1601d8da, @0xc3a1664884d7c1b7857da0c41839558ccf881f39b6fd592ef1eeff7c54ed30b3, @0xd694761c946c5feae568329bf2259318dd8caa62de37a98cfb18b0d9d1d78704, @0x8d1d4610e80f396437992140036d2d4e339abe78bd5f1433b36bbf16a1d78cff, @0x307f6f2892edca8dfa94eec9b3da9a4764aaa33d0570973f60806a0777dfd38, @0xeeda3763f487530849e44fac6c0a3755e761543c0f69a198d011ad694fc55139, @0x9570e91efccd67798e80961e69975637b5007429889bb019b05f961a61a5790a, @0xf554f8a67f619414de49ce56d72852f012bfe2d05570597596a0c3cec4fed8df, @0x89602bc751d55fa5567262b7fbf4d1d4cb25cd4bb5f359cc4f5d164c76743cc6, @0x7a9eba6ddb7347da230a90ac93b7bd13855e6c49cb3e356c92c40320edb48bc6, @0x6d3b941ae0c1701c93d4d7edfb759038413197dfaacf0b9c1c4f1623166d4819, @0xaa885e5dc95f0abe3184055e79d9e93be618bcdfd4b48b5969f659514a69fe2b, @0xb497c8b731144824ea6edf27e05fc1c7dcbaa9a4b64321fad61d03679d0d21fb, @0x3b0a8f94e89a0c237d8611e492b22123bb6c405d99c9ff4c178a50d8beb1db02, @0xab84f08ee8c5fbff16b4d6e489aa63f52563f818b5d1f4c8cd291efcca63fb7e, @0xbef69b300fec133983b6ca712804ada9f0a67de9708a7154151f0d536bb3293d, @0x256d1a13dfa83d698558f1249d9ea9fae9bb3ee0e07ed32d62c0df678518ab1d, @0x3f11219d7858d53aed3b73443350c77750e7dde40f6a73cf4397f1795c8ecf6, @0xe20de1b7066365048048a774ce57e90307c5709505b96333869630333eb971a8, @0x623c3c070370bf6042fd2451745fbaa752863c9e4a476703a7e898ac476f2053, @0x62f6c2497d37e926d925ac84d2d3350c3d704ad50c8e48bfebb8c35dce589104, @0xaa50b5de7555a6791204b56f4f4ef6c5ff953d247fc6e07e00d7a033a4c324ae, @0xbc3625d14f09ed79c1b3080c31db5f1cea4d33f7c2fa7a8ed8e315e8474d1d13, @0x5c2a98ee052d1e18011563578c480297ead100168805b25d0c7ac2b291ed5cf8, @0x1887ff02e0544bace88c04d241677718deb16ef1b381fcecbe3778faf79db247, @0xba294132e0d884fe4620e253977b5e492fbc02a6eb1751500cacd38500abb8e3, @0xca9243f4b8a18cedd984744e752b65d4a0399556584d915bc85db3d3781d178c, @0xf4a3f94dff68e7be975b5d42f20d4797d26902ca30edd9e3ad8ec7096e4ff069, @0x1a133b1f2ba7b75bc94048d07b9af73dbab5b9ab3a9e7156681e3e0eccf8a347, @0x97a801b28f2c065502d798f2728fc7a67e4c6715b8ec564172de0bd0bf92ccc3, @0xd60aeda323595a2a07ce985c88001dd245b93b821e12de43b8e8e567cfa3d77, @0xf764e2e03662e77a7bb76eb6c20745cf15f899afffd8d4a6fc33e9f16e8ab510, @0x8c72eb02449be2fac4b6d30353c0c7851d282e46e922f1b915bbdea5d3e3ed0e, @0x7bc2f9af840dd49648d0d7910c071b6fe61ec37e377eaccc3597e8f2db5d60ba, @0x49574a8652d12b0767690548f6d8591ed1978e78e9532fd0358ec5eaa70b24a5, @0x4625605acc7311af21dcd7d8e76e93c674e292be1a3b8f6b1e921c3d1b9d2550, @0xc2d4d44f268c068cade8136bee47ddcbb89b1fe8ebb327fb252d329406ddbb22, @0xf966bf25e40ea272b6ef847c47d2f89f85ec7db5913f20d5798738806ff0d7df, @0x2c903cbed5c054b93a8fde4e4e822917b070ac9854e48d72bd528312df3f42c7, @0x7ce9ad7c551d7872e07b4b9c450f439367a17188f56d69c118bcf0a2d58a2acb, @0x656d70263ff589270930dd1715aaaefc8c08bb4f9f9d7a5796c5a224d016155a, @0xe91ef8f0e6bad4f2f9617c5d4c49c9b04e4b61c5a7e55d744a21d90193d5d7e, @0x31d861250aa6d0efa7b72b3d18b3c43a6402f63f97ff173f6c7f1da4852bbfc8, @0xa39f457a71b819257783001c7fea108353f4c041ae85fecfd5fb43b7045a384a, @0x2a78e656965b42647de465c3dded96d823d730940274053e8b6d7ef134958974, @0x18e14cc250f2776abeb88769c3407d5fe70fca03f55b1936ca49b804c8a16f2f, @0xdaa376b392c3eb7a1cf73d4600fa4f7ad08ea456067c1e3ecf42c702edf85008, @0xe96f34bd4d8483370cee48977f38714db25da230f9f78a358e6fce8cae183899, @0x915617c54401317f46f458428b797d666f8fc9e83f31fccdcd7a037444a09e4d, @0xbcb6950255fa2498ee63ffbab44474db709ddc521d0be6fccee65d3cc4176777, @0x1ae56ae14181082174069c0859792e193e69d25130a722d1c8895f50f1f2f165, @0x98edf6df6ea623831c4719b0149a52ccf714a6f699dd616b0622a30acfbd64d5, @0xfdf58ceaa1df82d0036f190c44749ea7c338e9c6e38c90a4223351fd3ba07991, @0x5276146419d08191650339db58e86d56f63a9dec2b581c05c0eb692293ff779d, @0xc7f83048c2a666c3b457329910fc01f1cc486b670018c2c8b173b631808dbbe9, @0xfa1d6ba9ad4315a3bd2b97655e1b2199a14ba968ace210f785d6bb8965ef89, @0x5f96c85da8a5d282f6141d33533ba2d5ed285d261ba5106c4cb9a0d04cb4540b, @0xe7447504b4d2fc92542a5211f425617ff284a087c9e7a81dc8c84345fc07d466, @0x4858d0cdf67365d2fddfe0b48b625c4774ac44ccd84ead7cc17a4a506c75d6f6, @0x4d7720ffa0d0c14b2b9425c80eed0b9b9c5f79e577dcabbeaf34b283429beb7b, @0x84d99a5b018a20244c8d5060f03b761a2c66580eb780b0c07ee11affc1e28fed, @0xefa802d5ebc3ac8d1019951ffa04e3084273d70347881c392eaed38ff424120a, @0x8dc1fa0a41061a299caddfaf0e647c963871e84a14a9118bc0c680460ebc10ee, @0xf1685629188d8f8eb38e1151093abc7c5c88859da1f2427f5e4e81ef5308f672, @0x84c258030e0ae85eaa5e3e16efef7e17f131c0c4abbfee45972c4fd5212db131, @0x788e1626be8c49352ba0be48f1141e8a5579a9d12f720c02a584179c73162afb, @0x44ad11a6631858c0fc94a21a6e2051e7f7e890587f37fac39921a749ff2c4cdb, @0x90ff318c1459a75fb93eca4310de0797368e1c3fdeb22d8c3c08429738b32c4e, @0x110ddacdb7337a8e2d84dc1a9b6c22971bb88aa375ae1847ded60ac7905b34b8, @0xc529a1caa3966741aab47211488516b68e19352b22550be51a44b4cb067146b8, @0xca752bcab1279a81c1295e71fdedd98a024046b9add3c4fd6d4a2b659e88047e, @0x1be843ebc8b1a868a445223ba5e87ae7c5e1be3fb46a861322dc893dec8edf75, @0x7d0cedcc666ae9238eafae805005794a673c482879cef671896c67a963daeda3, @0x96846740e5ac58d2d9dad47978b4b08dc1760094447bdda499ae58d48430a3d0, @0xe1505499996f336941537a91f6def57a4d8497ee492cc254301b3f787eda793c, @0x3f91bdd1f9d12e4598adf733bc1b60df4f44ab33eb7c12ac4ea10d46d3443f2f, @0xa96c20ca13e0fe9cf80feeffb1218c8e115b49e4a8fe877984d7d16f67e2e1ad, @0x77bfbfd7a1d138abe235a4d54d99f7c5cca993714c2a9da57a0652996a8bc845, @0xc8b012f62a769568711619ff84afdaf2c43df692b22b2863c998fb99460082b7, @0x39ede3e918c1878992caab9b7ce24cc22389d4a9e0e29ec1bbba30ed9bdc4b70, @0xdab5bc9deaf63367c6ad6fa7ec237e959b221ea1664238557354d824c91d9ce4, @0xf1b380ce5b26938294e8cd9670e567394838f8ecde8613191ec8f190f47eb6f5, @0xe5edb289313c43a95843896ea90403b1dfb6d9b7a2458279d9ce2fee6e29aba2, @0xcf5fc53c4fd89d4ec06136acfdaf0953a5ee320ed05ea34951b491ed4f3812b5, @0xc9bc8b8ccbab4aaab724b36f65d139a0cd50fa9c321b4acbc64414db8e8e1a09, @0xe076cd63601002addd8b8d460d254d47c0eaa92f9320f8dbebe6d7ac16155d17, @0xd6588421c54a5aa8ff65a0fb68818ab3d2165dacd903b047a6c5105e2e3b3261, @0xfe968db46ab5791c8b1b378ce70b3c249a43e6afab6ac3b1c40d7815431be949, @0x930130987c65555ff77d0707abff0d754d675e5986feefe0d016ce0013155591, @0xb7c3ce1d4eed095441190db77e6b6fc35e14124047b0e370ce1197044c9dd65a, @0x85af598cf452ad41057e631c3d80c1b0ff6f03392fa5dc5e0370a6b5023b5596, @0x326835c7b49df22ad824799ec7659987144961b2b6d29f9da1187f7e7d3ba3bf, @0x505e250b6a42042fc48a8ca73c2cc0488cd6fe2812216e2b71e8ede4dec4eaf7, @0xff533ae58bd574171bedd31e2c52a4076dfe3c1a4b84e3008fb4ed8bc4c7773, @0x142a064ba8affa31301953067dfbba210bd9262298a88f90e5a992fa9ac10d4e, @0xded55f517840bdaaafac8878852f193c93ddd61d4c5d7cfd44f422d97f564929, @0x4828f66fac7c6eb83979ccf97c02c15cd714b4abd151aaaa476a9e95334cae2e, @0xede1dbaf403420cbfa5f432de86c665c67816c6cb63a3c2e4fcac075a5b8b5eb, @0xb5e4dd7212e8214430b405691e44d724d80abd3c7e31f82cd0e1b24024a5b13c, @0x71c57edf794690b751dfad9754524950022dc59825ab4a1ebcee5c967651f6d6, @0xbd6aae85668a5df49d85d94cdc5c07a14aac718e443c91cdc1cbf4a62c3baefd, @0x105abf703f182e3e0b6e9527ab1eac945153ca1b1d97665645c270c83aef1ea5, @0xe95e0c0ef9f3a1b601569d112088947ee4a7f7fe9b0e1d5fec85161e67787b3d, @0x1d9b4b0f208948e07a76c5dd7644cbcaadf7b7bdcee000d07d975fb34250524b, @0x7d2e7a7e30a0b17b343866fa33c68b8424f26721759931c46c49e9dab1998e71, @0x32310c898261920f00803b6e8e21e96c81f9e7b3ff956047fc5a3eddc697ec47, @0x2084926a41a6bc9a61e8eafebeb25818ac32c2661e9cd96a41408aa882d6c344, @0x1615c15b27718fd21acfd5f31f04f6ab5b1909511e89bede7aecee3e7f9dee89, @0x16a07583f21709790b6bafd116fb1371b0123e10e08ea101e692998313b8d3e, @0xabf6cf2f22ba55483f20718d21e6c537b0f310c77c14bea51e02c9941bfa65f1, @0x772b109358ee2dc9a03cdb4729edc15d108a744350763a7648b63b205d99acad, @0x7fa1fd6c0e098e9fa33617556ce1d69e8be420f7679543baa36c0169303dc0d2, @0x7898a916be6b258d6dd89be00aa1ae29e7269898d8cad7a1e8a9edb218fb4189, @0xccf9ee12b268627159392967bd5f2722a2470f6ac940a0c55b197b031619a500, @0x42279126290adf30ebd29d37005007a39f513e63af13c79e0e1e98cc7654e4b5, @0x26614a1522df5bde45593a576ec039caaaccb870e0b237974429a0435d752016, @0xd0ef27e221c63e4d2773d90efc4af80f50f7da48c6894be551ba9732f4164f4a, @0x14fdc8a2736431fc934df58e05a8a776826cc88f5f336250054941b0c476cd0e, @0x1cc19e48bca44017a108cd16d93954c93706befdf4f3b6d70f8f74cb422f6a41, @0x42a2cadbb2ef269dce98dfd821083263ac3cce4b20143a9287afcc1fe3cab1c9, @0x82a839cb839a8003daa0a33d25bb3b816d280cb99fd648d8ff2ff1b8644545a9, @0x919ecf65695e1cb6f4b3f08dbc80c2831cf2f73aee8471a2778a011e1014a75a, @0x15b9334bb875118878febf017dcb5b7832be269e0f31233910a4126c489bd4d7, @0x5654533ea8486d56236bac3343d4b615742b27c44197498010c43f44a384644c, @0x571c77f2513bf417cea22b21f207269b70fffea4d31fa0358bef41a33cf54c7f, @0xecd7aa94bc966d16110bdc12c01ce1f3209c3fa0887aae4b877e8fa50bec7463, @0xbf543bd8e956e4ac87a9377ee7000cec70691ab55f95c5a74aa587e83a6a8db6, @0x488adea7f614ba32d99af2642dffbed73b87df48022d41f21931db8fbdfe4f8e, @0x1e044b9b912f9bff8ed8e730653063553e36c85ba916cfc33860939749a1f34c, @0x949c0894dad8f2bfc16ead1c6d845129fb585c1bf64973203be736cee674d067, @0xfe724284a430f29104a8bce5cc58d610664251f277d3a609b72d99e5fb4fcdf9, @0xbeaf821817333e96d20637f551fe68fa93b31e2c161f151bb2e95c0abf7dbc52, @0x8e607e43f9cdb4d301217ed019bc4a4ad695a12a277a8a675a9b6119702e6706, @0x4dfa7453ab2ed3dc589507348160f6961bb4c8aaaaa2b75b32a54f0e9c365cb7, @0xaa782e146dda0b80f242820f12f9b1e47e18f3436a6c1fb938e1aeb6444c928, @0xd3b1b799d2cadc30a0b60101ba9534567d49da94b99124454cd54d14bd5c0f8a, @0xccd398c7a3421700aa12fcb980702166a44bf843f1d4918f0630dbba5f7f6cb2, @0x2f6a8fddb9b17af40e6e2f865e3109e5733f0ed68f742a3defc326717b9f90f2, @0x5488842194f798277d3568a7bf65fed010f184b2cb99c48d3e61ffe402592807, @0x2b9b14922cea02174f27747351c0c29fa48b632a10c1e683ab805517923b24c2, @0x1e627417bd64b3344f3cb0adac554f83633d194bc7d87887e7924342a79070e1, @0xb04690f7fc071c294d993e17523996660fa35fe404eb42b467d900dd827fb7ad, @0x9f0371e67923b035a669ef8b2fd2398f42058a6dae555d94f8e67a1ad430400e, @0x3b4e29325042d4b519eb0ef5e5ddf7a97d39dcfc5b138607d1c0fe6a333e9b6a, @0xfa0fd0a01a55f8f531d9167a9c53667715c62100862018abe0a52109120a249d, @0x6fc28b72a3c064ec96f1e7f5a419ce6945b2511a76c369ab0fced89f618545cc, @0x918d4775c00652fadb27f7221260a1504d8f4792a918fcd0bfd11b1b8a02e0a1, @0xb98cf191f1e2430b68b7133b0614b01e8e6e7f053016dfb991721dce34831c00, @0x2363644f046134ba20c4c3acc65e7e62b36ac73fac0739ec5d9fb156e5aebb43, @0x3458ee76e26de49226bbf2894b5d39bfa83c1f55b31d9dc29b035200bb422bc5, @0x3566e1fc4c12b77497861fefa21a4dfd16ba51b538261e73ea238446bafa977b, @0x988e0e993b5ede4ac418dc403c4d5722855c1471a1c5dff3b01afe5b2aa3e3d2, @0xd860cea58a3c7b875b5421294570d93077a47b4320976a889d9a782551291b97, @0xd4931d90b86ceb6e07e287fbb596902ddef634cdcc407e64e9af05100275086f, @0x8386de734c8fd2d3650d5fff304728bbd47a30fa812327cc729ed6c12217737e, @0xea2b9b1d34eadcb87af958dd309fbcf7bf9a6a058918f69d40bc8a66ea61ca8e, @0xeee595493e9e65943c7a5fa90e836e3b68785252611b6778cc736b66fca5804c, @0xcd0f902ef08d2e0f2a5f0983f70ead8e40b2b85d73114376ab8cd5a806481e48, @0xe67c644645a017b6101b0ae5ce0937089622db8bf716d3b958343bd4d3cdaa2b, @0x6f1fb65466e4ce452ffdccfc177d86d916f09d87f21ae58f098c711ada650c3f, @0x1166e07943ac73d6d1d9e4a53afdce081a0020c9e129758ddbc2611ff818e86d, @0xd2add7bfec6f40879c20eff8a4b2a9fd4c4f9248f22515c183e61b4d08724c48, @0xab7762dfb505e7c6a2899a9a6c24897c5b953ea9b422b1f5321b584b5f466606, @0x502f80037f1df166c75c081529a22faf0f04fe11e6869ae8d85a39e48c5a2621, @0x75a224a5e68d8d34d03d6c5089f25bd428b68e841ed8cfca4dbf8c6725eb0ea0, @0x153b0d8936502d8381af054dac55bf98db7c820c4da8cefbcf7542af04225efb, @0x4a700cd1c6b0e9831f094481bbb66bb02737593a9dea866eae564ce779bb5275, @0xfcd8c390c47ff25b871a21b3e98282d98c6cafc5132a0ded9d3a9931c2a9d3b9, @0xae519eb5f669a8e09aa418d260a8454a4d2adede472aa7ca936d3c60d2d6da5b, @0xba88b628f3a0ffc9b72027d0ad8b7fce21af6134c61c29a34c614ca49e32496c, @0x4484c9d667739ee4a6e27d64836aa7f27cb0ffafc3d453017b84a0ca2aea2cbc, @0x8f1ad137ea7a987b94ffd97bbe31497670bbfcaca67af48da2bbe56eca9d4f8f, @0x3399ea893517b0a0011df7270e26d6f76880c60f374b98afe241062dea0aa662, @0x16a62650b383574bd8ee5a0f9eb7edaaa4b4537509c9d20ffe2e045be6c99c18, @0x6f2ba1a95013732752770cb60033847e3cbd9b1accc98258d5859854e504f45e, @0x92f8f5f77514aa77984a599b71e44961d3d4d989430c22628cefe9a585c6642, @0xf8a6c989b2c433af6005bcdfd90eb7c1292e8afaa61e3430dcf0dc428fcb6494, @0xfa7ae25f9a9b69413a2b7cf70a08dc8831f0780c7790585e2c566ba005f66b4a, @0x9ecd7a1300952254cec878e04265fb3ffc27bef6e69ea668a16bbceec46f491b, @0x1ee8016cc85555f5ba32a51abef52e281c385c63427dc1286490d7f2e975d1a3, @0xf347b5d2c47e5dd5326d065863cca1b122e5cf437ca728ac88a39d8d5173c512, @0x58674eb74973d64b8729a8dc8759e855af2e802b3bdcfdb35f9af375cccf9dd4, @0xdef7feb4057b681544eeb6d0484354d67e9d032019017b4f2f62c76256c9ac65, @0x2b138d48d6ae6b14b9d3e6f9cb33c8c85e1173b51b0ee9825f0b3d0d8dd1e554, @0xd9b349d0fda13c43912344a74ddeaec45fc92a9cae55ed33112538ecff0bccd1, @0xe195b219fe405ebbb19ec8bcb0b3f5a2538a8ad968748425bbded97405cd5c28, @0xbba93b52aab4e9ebcb6024a04da8db3b9fe9b9a8dab9f133aa955687e11d4b91, @0xed468215b56a42071ad7157dbb9f87688d6e326d83ffe2b9cee8843817e9f141, @0x6810dbb7c7c90b8b9a91393601fba2c20d49a772a69a106628e8907d855c5d0, @0xb6dbc3c07373756e7563c275cc49e6f790cfbafe16e534f67c359ac3c527217b, @0x78fe945fa2bef049880bf7ec47b28f3cb1143ea5fe82d1f9c6a6d33e7a7dda41, @0x9982a8611e4f728a6862e57803f8962870285c033eb460fc78bf128b82d70984, @0xebf0a3169215baf0ca1153cad727855470fab768c8cf0fdc6c7b508449ec4463, @0x396e76568a7204722ad53b90b9e0d321bbadd111781709468913036dd48bf11c, @0x40e6c74932bf612cd0bd2c6e3eeb756bf7d491ec793dd4306c84a0a9e4152b07, @0x39bb243448fdd4434d1c431acca64cbdcb9e444180b83f9667f5c6bf5bc2e55e, @0x288d13fe89f83f356e53b5bd97eb16c9b3768aad2769ada07fd4096a2afac172, @0xf77165dd89cca2d58b344aaed0473282fae0bce533114e823a0c72b1c3252b91, @0x9ae005a812d6ea39e01031593cf8a00493d20b18b0e92c89c773166266d28da4, @0x9ab49580c26f2a85eb0d6b0237c6984fe67a8da51b937ce587411203cb443546, @0xa3600300a6e6df0d3ecaafa638937c4897e370a4324906933ebd8c519962351a, @0x8b38b8b570a4f4709d46229cde14e0d140e0f9b461c88e46ba87369ad08a73a1, @0xfc53a094d68532f8a0a7cf949848791e97c68d656f9a2432d07552e91085753b, @0x598a64d325f044640a71b071850122e552fe4a5d7d68363bb55701aad4060790, @0xa6d902d91fa6441ce74d43cafa2b1439e091ddbe026339ae35f333224a81d04e, @0x6097d8b12bbd98d406b4e23c3b34458b9ce2e4b5cea238fcb92ab1f7508c5598, @0x6501738799410e38f933cd523cd0db17f5302d13e8ccfefd508e2164786e975f, @0x57c45853df31a5a3f3c8b448c01994598a64ac4efcaef6916b7da6cd16d25eb5, @0x7305cfa1510730c58f7121ca5d761ea418ba7c143ab6226636fc315f23f65702, @0xf1e33fb204fef1609d7d3d0b208cd7018e14ae3c9f8cc95bfe4b41d03c8dd4e3, @0xddafe5027c0de43142eb4fcc9d38af7f7bf9f6a8d2f9148ddbd4eb2785386cd3, @0xc2f4559742bc1a1ef58f2d3c471f4c6012c6f0dd87873ea28765e1ac6420e6f4, @0x2c48c4f204b39ad61d044453b24f4b102cb6843f1d968c8c435c0bd3d828c29c, @0x325e254122a0ea55fa9111ea896d20beaad190b83d416ce1dd2594d2446a158a, @0x91be7477fec391442d2314cd694efebe39812b0a27bf593c1385b175583151a2, @0xe055c44d06f38135536ee14aaf4e9463ea4b04ced63e2269d62d143732f126ab, @0x5054c709b67c98c57a327d8e992a870e1eed17fde50f5ce3f7754973b49484ab, @0xc4022a388b454c38269846fd92170b2977dc6015c382025bf270ce65e1b704fd, @0x6a3f7fdc525e06f2fdcffcfb7b46d4221312450e13592692b7556d40a55448b, @0xb0499eebfb5161a3075f120eed9c13f39ec3671137738821b7a544bd6425a844, @0x36434dd2e0a975c5db94081a7409d7dee7aa9421fb0b1922a34b33679b2e3821, @0x3901bab7a32be3fd75bf5cdb05cf2f64dd9229018ffd16a00e59dd1e66677e37, @0xa78e3280017e378268aa72f7b07d9776b22c4656be1d67d4b6abdc86f0585a32, @0xd43023331e9fceda4e2e5f996b584391bcae69dda6b658286ccd3e9f155f9ad4, @0x518f44484ac617e2ffb0d966a591778b7f9c33a6fa958b3e7d69b51a1e35c6a5, @0xdcaf827f75e3ebb289b23f57d834bd92e8aed60c09f2fb9159f23427bab0666b, @0x497cf4c4ae527c1027d3b2f52c013f0e11f2e9042f1e24c3e6e8d0dad0cfaae4, @0x514101f6404c2bf13da87c1cf3d148c93b0b910e7e826a14577a8696b9dbe3fe, @0xac39cd2be78f848f4dc0ef6fb5c9a5a6e78a6ce1618449eedc07712664c7f697, @0x887850e3aadbfd650d4ad2fe6b3d6b977f1c156e3f5030cb371644e706b19201, @0x4a9a37babdd1db93bfe75728190e6d93d62e5bb3936c56c272e915f52f30a5a1, @0x4700cfae994a561410f6c1f40004f41343ee44a3193c63a2f7f8ebab28bb1670, @0xe7983c5f8961d3dd746fd09b5d096dd01849322389b653f7b8212a8fd000c93c, @0x7643f969344a94cecdee046de5df40cbb4b3362e755c84ebd47398925a13c132, @0xb3fe117edffefc0883bfe22a8357ed7abeb063389c74be8a9d62acf25f9c3774]
+    }
+
+    // decompiled from Move bytecode v6
+}
+
+//# publish --private-key Alice
+module 0xbbb75fa0541df726acb791a1cf919b11ccbb31d2d0546a9df77359202aa82e69::values {
+    public fun values() : vector<u64> {
+        vector[784042861, 731703328, 627427227, 480194904, 448763913, 369639437, 368990020, 339567419, 336091097, 330368286, 309883597, 306323510, 292125283, 280873590, 260288986, 244147755, 238391109, 224585968, 221686474, 220018711, 219971903, 215156936, 208999520, 198798781, 192990411, 192053779, 178545542, 177505153, 172604485, 169135513, 166658626, 158308551, 150304204, 149315443, 143583737, 139597922, 137546241, 134251623, 131763493, 127346381, 122835822, 121832197, 121267937, 118082471, 115579423, 114769586, 107825313, 107401973, 104405621, 100675375, 99743310, 99671227, 97191797, 96329877, 96074954, 95516298, 94822007, 93797146, 91785748, 90590503, 90338021, 86875188, 86498722, 84884699, 84688241, 83771041, 83483486, 83435084, 82627936, 82330314, 81706143, 81401148, 81391185, 81100890, 80871457, 80461222, 78419324, 77511249, 77114143, 76068678, 75517688, 75487275, 74013351, 73823208, 73006507, 72071711, 71890053, 71322592, 71227218, 69612396, 67820449, 67388818, 67352028, 66860045, 66306760, 65505333, 64915825, 64841579, 64636017, 64618769, 64508697, 64447073, 63669755, 62984166, 62915002, 62484906, 61358231, 61205875, 61049648, 60904764, 60732411, 60707840, 60334649, 60152838, 59888559, 59372561, 58665964, 57493630, 56658773, 56657472, 56657451, 56657448, 56657444, 56657441, 56657438, 56657429, 56657421, 56657416, 55738560, 54729978, 54612806, 54426283, 53879520, 53573532, 53224252, 53032349, 52973993, 52636280, 51926695, 51488892, 51143392, 49540937, 49470089, 48907987, 48616218, 48326460, 47431824, 47000941, 46891507, 46831952, 46688694, 46602146, 46464095, 46053089, 45736737, 45600052, 45275857, 43796324, 43593424, 43220921, 42987658, 42542852, 42479992, 41832676, 41692703, 41066748, 41066059, 41038316, 40905173, 40761881, 40728311, 40272910, 40205861, 39584988, 39127507, 38880603, 38671775, 38266189, 37907951, 37729098, 37675831, 37618689, 37584098, 37559046, 37540201, 37462105, 37454934, 37357840, 37021382, 36727720, 36565357, 36379979, 36104340, 35802721, 35542733, 35349884, 34804051, 34686075, 34628776, 34607603, 34561502, 34417788, 34214279, 33956698, 33837347, 33822166, 33664996, 33619035, 33310262, 32919369, 32813815, 32662979, 32626701, 32546606, 32528882, 32318041, 31927035, 31867719, 31682292, 31638136, 31359300, 31271856, 31085256, 31083765, 31044367, 30959328, 30939170, 30936185, 30918017, 30816019, 30787008, 30768585, 30742052, 30538172, 30506761, 30500805, 30381477, 30331081, 30292506, 30025097, 29803907, 29662272, 29509069, 29407454, 29218440, 29110141, 28887128, 28882798, 28855824, 28809126, 28749351, 28604594, 28420032, 28318040, 28173804, 28133954, 28133952, 28130402, 28015862, 28015859, 28015858, 27995405, 27880544, 27845023, 27833081, 27832621, 27756040, 27701099, 27548474, 27295377, 27265076, 27228641, 27208031, 27202592, 27134428, 27068312, 26969528, 26955643, 26899041, 26857627, 26768154, 26622287, 26585954, 26498022, 26331149, 26262784, 26219586, 26201276, 26194452, 26161084, 25944116, 25944114, 25908581, 25885183, 25885183, 25807854, 25785774, 25769038, 25724890, 25665341, 25547911, 25526667, 25500216, 25471225, 25458068, 25331051, 25246432, 25211272, 25188884, 24965263, 24949642, 24803737, 24795447, 24783637, 24605418, 24567042, 24540121, 24480428, 24411631, 24393168, 24311287, 24305853, 24227098, 24193778, 24177897, 23978923, 23960746, 23933478, 23916422, 23741352, 23704581, 23552145, 23389588, 23378970, 23342067, 23245734, 23216302, 23204333, 23157707, 23084522, 23077354, 23061567, 23036553, 23018326, 22976230, 22955875, 22929919, 22929440, 22792932, 22792220, 22712157, 22643506, 22632017, 22622605, 22609256, 22605710, 22593502, 22581447, 22451222, 22446311, 22411798, 22179705, 22096677, 22090766, 21954972, 21777081, 21772317, 21735890, 21672331, 21655823, 21640394, 21545036, 21530743, 21514017, 21504512, 21399298, 21380058, 21336479, 21317511, 21295108, 21293318, 21235444, 21139229, 21080556, 21038333, 20962589, 20919825, 20882402, 20824579, 20818046, 20811905, 20811578, 20811346, 20790242, 20762047, 20695760, 20653439, 20636452, 20611071, 20602774, 20529115, 20516582, 20483559, 20454317, 20419142, 20350817, 20304281, 20303788, 20297069, 20296285, 20290351, 20220174, 20218314, 20157426, 20125725, 20124747, 20090354, 20049432, 20044885, 20020439, 19903013, 19902624, 19884592, 19840758, 19829410, 19785850, 19785369, 19780003, 19752298, 19723970, 19680699, 19520338, 19519482, 19518114, 19482920, 19458070, 19456708, 19394877, 19393852, 19390418, 19337693, 19336465, 19304112, 19255981, 19250928, 19248791, 19205937, 19205251, 19188711, 19072145, 18984651, 18978757, 18857931, 18850605, 18780023, 18775463, 18726440, 18723600, 18717644, 18707062, 18696718, 18579335, 18562954, 18547018, 18540137, 18518462, 18469819, 18439247, 18411641, 18375390, 18293210, 18247773, 18243250, 18152756, 18131267, 18102215, 18054771, 18051621, 17988317, 17981542, 17904723, 17900930, 17864288, 17854432, 17788719, 17788718, 17788715, 17788714, 17757495, 17742251, 17698514, 17695527, 17648900, 17580056, 17531449, 17445160, 17441512, 17247032, 17237401, 17167171, 17021588, 17015295, 17015295, 17015294, 17015294, 17015293, 17015291, 17015291, 16942385, 16911335, 16846857, 16836682, 16788624, 16787224, 16771830, 16771453, 16770590, 16769186, 16767567, 16767564, 16695826, 16688123, 16671617, 16666795, 16660533, 16629364, 16599916, 16589084, 16587650, 16581198, 16570605, 16561640, 16550518, 16499928, 16495963, 16458794, 16448567, 16410846, 16380872, 16379517, 16346146, 16334022, 16329879, 16288058, 16242269, 16242258, 16241928, 16241886, 16241885, 16241885, 16241884, 16241883, 16241882, 16241882, 16241881, 16241880, 16241880, 16241879, 16241879, 16241878, 16241878, 16241877, 16241876, 16241875, 16241875, 16187422, 16172010, 16069019, 16052273, 16038890, 15980379, 15970636, 15916381, 15901539, 15898706, 15898706, 15893453, 15885719, 15837960, 15817177, 15803158, 15772988, 15762143, 15730636, 15705905, 15705905, 15694125, 15690431, 15659910, 15652065, 15652057, 15634337, 15580478, 15572910, 15548856, 15548177, 15532503, 15515803, 15487997, 15485321, 15481256, 15480102, 15471838, 15387614, 15379289, 15327584, 15310014, 15197676, 15187311, 15171591, 15151533, 15117338, 15111347, 15104658, 15065867, 15064113, 15056467, 15035569, 15019811, 14989801, 14982498, 14967959, 14936800, 14896483, 14744053, 14724229, 14723827, 14722499, 14633713, 14608024, 14565094, 14553668, 14531833, 14478880, 14462946, 14459945, 14458254, 14458253, 14458253, 14458253, 14439665, 14439659, 14408585, 14407071, 14372213, 14317896, 14283628, 14268119, 14249053, 14248115, 14203837, 14193622, 14177347, 14144858, 14136959, 14111770, 14085048, 14080687, 14080311, 14072548, 14056515, 14040059, 14033112, 14013325, 14000016, 13949829, 13881732, 13859495, 13745900, 13743134, 13743134, 13675082, 13672625, 13668418, 13657681, 13643483, 13639236, 13601096, 13601096, 13601096, 13601095, 13575998, 13573560, 13535677, 13523925, 13511580, 13511535, 13460339, 13443579, 13436915, 13412506, 13411098, 13379972, 13378799, 13361188, 13320809, 13319656, 13317324, 13314438, 13293026, 13283418, 13255300, 13250380, 13180333, 13176070, 13143077, 13130488, 13116657, 13111040, 13091998, 13041529, 13016942, 13004930, 12997658, 12940528, 12939610, 12927792, 12926644, 12926643, 12919410, 12912368, 12884508, 12880489, 12869579, 12831234, 12799661, 12642635, 12640639, 12629952, 12609683, 12602514, 12562549, 12530611, 12524085, 12508977, 12484154, 12482608, 12481557, 12468312, 12443334, 12439664, 12437867, 12432890, 12418565, 12417744, 12412586, 12389804, 12387046, 12376996, 12355432, 12349033, 12346317, 12312365, 12306615, 12281678, 12281677, 12281410, 12278445, 12258002, 12249983, 12240921, 12217040, 12199888, 12186981, 12149046, 12100885, 12087757, 12023271, 12017688, 11987863, 11958479, 11950245, 11912558, 11911256, 11909418, 11893065, 11873705, 11854972, 11774159, 11752827, 11733793, 11681587, 11664437, 11635278, 11612546, 11597862, 11556182, 11541914, 11539166, 11495370, 11489733, 11469402, 11427204, 11414069, 11406773, 11401402, 11380488, 11378960, 11374308, 11363151, 11361688, 11353063, 11342673, 11340693, 11329164, 11311865, 11301082, 11301070, 11275593, 11265868, 11246967, 11229120, 11187289, 11146875, 11141013, 11109483, 11103643, 11082644, 11060626, 11051885, 11018270, 10941046, 10907798, 10903636, 10892412, 10829815, 10817568, 10808036, 10783247, 10777311, 10764566, 10738919, 10724379, 10715542, 10714064, 10703261, 10694660, 10630595, 10630595, 10630595, 10578815, 10568836, 10557861, 10519204, 10518652, 10499415, 10479390, 10469932, 10468593, 10444544, 10417314, 10402568, 10380663, 10372114, 10359325, 10359325, 10354773, 10343968, 10335079, 10320452, 10314439, 10303811, 10280697, 10270484, 10266721, 10258215, 10257626, 10241645, 10237612, 10236114, 10230370, 10209164, 10204001, 10196734, 10164131, 10154919, 10139252, 10109635, 10097446, 10095760, 10094495, 10038170, 9990015, 9954521, 9946209, 9944393, 9942287, 9942287, 9942286, 9942286, 9942286, 9942286, 9941812, 9933013, 9916104, 9911490, 9910079, 9900653, 9893948, 9893726, 9893726, 9893724, 9893724, 9892584, 9884637, 9883945, 9833920, 9766098, 9765017, 9762144, 9759623, 9755485, 9747830, 9744318, 9719046, 9714017, 9713802, 9712072, 9703357, 9696277, 9670861, 9667944, 9623849, 9615609, 9612486, 9607468, 9606610, 9605786, 9604036, 9602950, 9602855, 9583443, 9581941, 9580397, 9573102, 9541398, 9534430, 9501914, 9494317, 9469268, 9433912, 9432697, 9399687, 9392175, 9375720, 9373993, 9354690, 9349763, 9349763, 9349763, 9339556, 9336847, 9331760, 9299940, 9287901, 9279213, 9277868, 9251524, 9244977, 9241765, 9238293, 9210725, 9182902, 9182452, 9125806, 9114067, 9105849, 9086871, 9080924, 9071321, 9068527, 9065359, 9035890, 9034701, 9017677, 8997962, 8993786, 8986187, 8976046, 8973938, 8941317, 8938938, 8934037, 8933444, 8933168, 8932255, 8931923, 8929644, 8849083, 8849083, 8848790, 8835691, 8829064, 8797919, 8786211, 8785197, 8783642, 8747637, 8742645, 8742642, 8742641, 8742640, 8742452, 8742451, 8742449, 8741642, 8713587, 8685921, 8640467, 8630805, 8619771, 8611528, 8589490, 8563866, 8556857, 8551445, 8541120, 8533418, 8524446, 8488674, 8487418, 8461807, 8444688, 8434463, 8431480, 8403312, 8397784, 8361248, 8338063, 8327756, 8326924, 8312149, 8312149, 8291919, 8287654, 8232267, 8217089, 8216658, 8212508, 8210088, 8200259, 8197929, 8197929, 8187811, 8169927, 8169684, 8150555, 8127864, 8102947, 8072637, 8065882, 8065286, 8062605, 8062102, 8050427, 8044621, 8039178, 8037572, 8036447, 8036334, 8036294, 8036257, 8036257, 8035965, 8035965, 8022375, 7979663, 7975786, 7945797, 7884133, 7878552, 7826579, 7814886, 7791151, 7779152, 7771940, 7762721, 7757542, 7749159, 7748445, 7733367, 7718078, 7692507, 7672019, 7656276, 7631830, 7621072, 7589919, 7543010, 7530970, 7526598, 7496275, 7483798, 7458346, 7435642, 7433728, 7397979, 7395595, 7394480, 7394370, 7390719, 7385864, 7361906, 7301916, 7301092, 7301048, 7243035, 7220798, 7203094, 7150800, 7148101, 7147937, 7142407, 7127205, 7109353, 7097914, 7044326, 7042759, 6987718, 6986505, 6982205, 6978764, 6978608, 6972229, 6965185, 6960777, 6958007, 6928649, 6922477, 6899453, 6892308, 6887130, 6876278, 6875998, 6871953, 6860407, 6858660, 6843396, 6831301, 6830214, 6789606, 6789449, 6783036, 6758108, 6753894, 6749060, 6731770, 6725504, 6719039, 6701115, 6684600, 6663277, 6659986, 6646512, 6646051, 6612716, 6612187, 6610244, 6593444, 6587598, 6577408, 6574704, 6567577, 6564182, 6551480, 6529117, 6525623, 6511754, 6510774, 6499496, 6464328, 6463899, 6431299, 6421221, 6418111, 6413599, 6403103, 6386631, 6386626, 6386622, 6380074, 6379150, 6370503, 6333086, 6310245, 6296781, 6293185, 6276215, 6273467, 6268872, 6253411, 6251906, 6244147, 6226138, 6224555, 6216634, 6209978, 6209010, 6205458, 6199849, 6190818, 6186397, 6183720, 6180878, 6174731, 6163790, 6152851, 6145547, 6130967, 6127287, 6115115, 6107569, 6103563, 6097881, 6088229, 6088000, 6061827, 6032427, 6020968, 6020958, 5997766, 5976475, 5968162, 5962201, 5961321, 5946507, 5945695, 5943814, 5941851, 5937139, 5935859, 5933172, 5902505, 5873218, 5866940, 5866918, 5866914, 5849453, 5815944, 5804904, 5792385, 5779785, 5764480, 5748588, 5748450, 5748270, 5748265, 5730780, 5730779, 5725775, 5721912, 5700667, 5697607, 5690943, 5690692, 5664137, 5659582, 5658906, 5658261, 5658096, 5635713, 5630769, 5629379, 5624850, 5620625, 5620624, 5619575, 5619380, 5619284, 5607092, 5591063, 5589445, 5586137, 5586123, 5571704, 5571264, 5559196, 5554451, 5547979, 5535718, 5518701, 5518579, 5473300, 5456402, 5448277, 5442753, 5427939, 5427078, 5425904, 5418992, 5414462, 5413961, 5413862, 5412205, 5409891, 5397549, 5395799, 5379523, 5361187, 5360335, 5342595, 5331152, 5324673, 5306308, 5290478, 5284122, 5283640, 5282087, 5278577, 5274132, 5272664, 5252308, 5241359, 5241267, 5235576, 5231438, 5229201, 5213209, 5201059, 5187005, 5176039, 5163015, 5162899, 5162898, 5155236, 5149450, 5126212, 5105231, 5081557, 5066721, 5059334, 5037700, 5026685, 5010421, 5006057, 5001382, 4981913, 4974939, 4967423, 4964826, 4932004, 4925942, 4918760, 4904477, 4902395, 4901351, 4897865, 4890940, 4890575, 4887683, 4877147, 4870787, 4867329, 4853244, 4850877, 4837619, 4820997, 4818721, 4806883, 4802819, 4801640, 4797897, 4797567, 4793552, 4793200, 4773762, 4761958, 4754715, 4749240, 4745683, 4732764, 4732763, 4732656, 4717986, 4709977, 4708597, 4707223, 4706769, 4703504, 4703081, 4700747, 4694104, 4694104, 4694104, 4694104, 4694104, 4694104, 4694104, 4694104, 4694104, 4694104, 4693890, 4685172, 4684912, 4683656, 4655163, 4641073, 4612802, 4612749, 4597793, 4586207, 4585007, 4580315, 4567099, 4538907, 4533571, 4530675, 4522196, 4509400, 4500160, 4496325, 4494588, 4488151, 4482033, 4466279, 4457231, 4453749, 4404207, 4348118, 4344046, 4326829, 4322744, 4306717, 4302707, 4290933, 4260342, 4240088, 4231559, 4231260, 4227941, 4209731, 4198874, 4192195, 4179057, 4126935, 4122840, 4098961, 4095112, 4089046, 4086995, 4083372, 4070864, 4070758, 4058780, 4050596, 4030177, 4022655, 4004194, 3993199, 3992718, 3992700, 3980474, 3961713, 3959999, 3942106, 3938661, 3937505, 3921642, 3905485, 3896264, 3884878, 3878771, 3878167, 3860608, 3858950, 3857883, 3856959, 3853003, 3842998, 3841414, 3835478, 3834892, 3831986, 3831920, 3827704, 3801251, 3791406, 3768314, 3754309, 3753839, 3752164, 3723118, 3715826, 3703575, 3697591, 3682328, 3679401, 3676058, 3657799, 3650419, 3646909, 3608315, 3606913, 3601311, 3554985, 3498818, 3487603, 3487114, 3485011, 3460028, 3452887, 3436423, 3435483, 3426452, 3420931, 3416113, 3413699, 3392740, 3376883, 3347605, 3328613, 3313325, 3310288, 3309702, 3302070, 3297842, 3286190, 3278473, 3277798, 3275596, 3266307, 3245449, 3205023, 3198899, 3193327, 3176697, 3175517, 3168059, 3139777, 3112374, 3099124, 3096150, 3095673, 3078734, 3077234, 3073736, 3063398, 3059923, 3057263, 3056585, 3043732, 3039056, 3036088, 3014245, 2996468, 2993757, 2984828, 2977808, 2973594, 2968891, 2965332, 2964428, 2964214, 2964213, 2963040, 2963024, 2962985, 2949550, 2945797, 2941275, 2935903, 2934422, 2933679, 2933466, 2933456, 2929253, 2902436, 2896774, 2885108, 2882243, 2881801, 2881636, 2881613, 2881447, 2881147, 2880806, 2847378, 2829404, 2827688, 2825387, 2820787, 2819611, 2818758, 2817913, 2816348, 2816124, 2813862, 2813029, 2807548, 2795230, 2765394, 2761865, 2757949, 2741911, 2740366, 2737502, 2729761, 2698387, 2687274, 2680059, 2679176, 2671679, 2652650, 2649815, 2630891, 2589469, 2572238, 2556451, 2554699, 2543101, 2539189, 2537554, 2528835, 2525538, 2500679, 2492750, 2487576, 2484498, 2475607, 2475606, 2474692, 2462627, 2451609, 2450714, 2441153, 2429338, 2428401, 2422375, 2403122, 2400710, 2399699, 2384218, 2365865, 2360008, 2359867, 2351433, 2349718, 2346150, 2333224, 2328036, 2318923, 2313697, 2305875, 2298461, 2296805, 2282573, 2280280, 2267845, 2266680, 2266680, 2260978, 2255858, 2254816, 2251273, 2247408, 2243534, 2237155, 2216639, 2211465, 2196936, 2190012, 2183076, 2178319, 2155040, 2151512, 2151305, 2151062, 2134987, 2112177, 2109611, 2107635, 2105287, 2093320, 2092321, 2086332, 2082101, 2081015, 2078668, 2076592, 2075961, 2071727, 2056332, 2056006, 2052130, 2039638, 2039199, 2019315, 2016766, 2003930, 2000426, 1996912, 1988455, 1983212, 1982446, 1975996, 1970169, 1968262, 1966833, 1960083, 1958214, 1957343, 1951074, 1940383, 1938997, 1938725, 1934967, 1934967, 1931070, 1930762, 1929361, 1927204, 1921268, 1921163, 1920894, 1920814, 1920797, 1920572, 1920547, 1915354, 1910242, 1905617, 1889141, 1883307, 1881767, 1881220, 1881173, 1877552, 1877552, 1877375, 1874614, 1874544, 1868668, 1865815, 1862786, 1862278, 1860700, 1857215, 1856705, 1845392, 1837819, 1836586, 1830527, 1816857, 1813127, 1798040, 1793712, 1790543, 1788683, 1782889, 1780346, 1780016, 1770308, 1767243, 1757456, 1750405, 1743721, 1743640, 1741155, 1732970, 1727093, 1725946, 1718038, 1708311, 1705002, 1703822, 1682208, 1680482, 1679233, 1677376, 1670911, 1670911, 1669710, 1645139, 1644158, 1642414, 1641393, 1633480, 1589750, 1578857, 1570265, 1557005, 1556010, 1552459, 1516209, 1514629, 1514629, 1514629, 1514629, 1514629, 1514629, 1514629, 1506283, 1505879, 1501469, 1483871, 1470855, 1458702, 1456176, 1453380, 1453146, 1452532, 1451086, 1445797, 1436021, 1425324, 1422812, 1421808, 1417996, 1416343, 1414233, 1411904, 1411867, 1411216, 1410964, 1408473, 1408401, 1405364, 1400324, 1399748, 1398327, 1391354, 1390149, 1383997, 1379409, 1374180, 1369020, 1362643, 1359699, 1358554, 1343155, 1341736, 1341734, 1340575, 1338209, 1326852, 1326029, 1323337, 1319970, 1317314, 1317284, 1317217, 1317196, 1310287, 1305632, 1298623, 1298524]
+    }
+
+    // decompiled from Move bytecode v6
+}
+
+//# publish --private-key Alice
+module 0xbbb75fa0541df726acb791a1cf919b11ccbb31d2d0546a9df77359202aa82e69::distribute {
+    struct Users has store, key {
+        rewards: 0x1::table::Table<address, u64>,
+        reward_signer_cap: 0x1::account::SignerCapability,
+    }
+
+    public entry fun claim<T0>(arg0: &signer) acquires Users {
+        let v0 = exists<Users>(@0x28da323f24a624144a567d7e8d216b018ec9a03cef8e7755e766d3530f67d166);
+        assert!(v0, 0x1::error::not_found(1));
+        let v1 = 0x1::signer::address_of(arg0);
+        let v2 = borrow_global_mut<Users>(@0x28da323f24a624144a567d7e8d216b018ec9a03cef8e7755e766d3530f67d166);
+        if (!0x1::table::contains<address, u64>(&v2.rewards, v1)) {
+            abort 0x1::error::aborted(3)
+        };
+        let v3 = *0x1::table::borrow<address, u64>(&mut v2.rewards, v1);
+        *0x1::table::borrow_mut<address, u64>(&mut v2.rewards, v1) = 0;
+        let v4 = 0x1::account::create_signer_with_capability(&v2.reward_signer_cap);
+        assert!(0x1::coin::balance<T0>(0x1::signer::address_of(&v4)) >= v3, 0x1::error::invalid_state(4));
+        0x1::aptos_account::transfer_coins<T0>(&v4, v1, v3);
+    }
+
+    public entry fun initialize(arg0: &signer, arg1: vector<u8>) {
+        only_admin(arg0);
+        assert!(!exists<Users>(0x1::signer::address_of(arg0)), 0x1::error::already_exists(0));
+        let v0 = 0x1::table::new<address, u64>();
+        let v1 = 0xbbb75fa0541df726acb791a1cf919b11ccbb31d2d0546a9df77359202aa82e69::keys::keys();
+        let v2 = 0xbbb75fa0541df726acb791a1cf919b11ccbb31d2d0546a9df77359202aa82e69::values::values();
+        let v3 = 0x1::vector::length<address>(&v1);
+        assert!(v3 == 0x1::vector::length<u64>(&v2), 0x1::error::invalid_state(2));
+        let v4 = 0;
+        while (v4 < v3) {
+            let v5 = *0x1::vector::borrow<address>(&v1, v4);
+            0x1::table::add<address, u64>(&mut v0, v5, *0x1::vector::borrow<u64>(&v2, v4));
+            v4 = v4 + 1;
+        };
+        let (_, v7) = 0x1::account::create_resource_account(arg0, arg1);
+        let v8 = Users{
+            rewards           : v0,
+            reward_signer_cap : v7,
+        };
+        move_to<Users>(arg0, v8);
+    }
+
+    fun keys_test() : vector<address> {
+        vector[@0x15a45734c379753a206009781d659817b6e7113091f0be3114b67027958b321b, @0x1e9c0c43d2a7dbead06e9cc2250d1c43d5d0a120e885aa4c6a7361a8a6988f12]
+    }
+
+    fun only_admin(arg0: &signer) {
+        let v0 = 0x1::signer::address_of(arg0) == @0x28da323f24a624144a567d7e8d216b018ec9a03cef8e7755e766d3530f67d166;
+        assert!(v0, 0x1::error::permission_denied(5));
+    }
+
+    public fun user_reward(arg0: address) : u64 acquires Users {
+        let v0 = exists<Users>(@0x28da323f24a624144a567d7e8d216b018ec9a03cef8e7755e766d3530f67d166);
+        assert!(v0, 0x1::error::not_found(1));
+        let v1 = borrow_global<Users>(@0x28da323f24a624144a567d7e8d216b018ec9a03cef8e7755e766d3530f67d166);
+        if (!0x1::table::contains<address, u64>(&v1.rewards, arg0)) {
+            abort 0x1::error::aborted(3)
+        };
+        *0x1::table::borrow<address, u64>(&v1.rewards, arg0)
+    }
+
+    fun values_test() : vector<u64> {
+        vector[480194904, 17015291]
+    }
+
+    public entry fun withdraw<T0>(arg0: &signer, arg1: address) acquires Users {
+        only_admin(arg0);
+        let v0 = exists<Users>(@0x28da323f24a624144a567d7e8d216b018ec9a03cef8e7755e766d3530f67d166);
+        assert!(v0, 0x1::error::not_found(1));
+        let v1 = borrow_global<Users>(@0x28da323f24a624144a567d7e8d216b018ec9a03cef8e7755e766d3530f67d166);
+        let v2 = 0x1::account::create_signer_with_capability(&v1.reward_signer_cap);
+        let v3 = 0x1::coin::balance<T0>(0x1::signer::address_of(&v2));
+        assert!(v3 > 0, 0x1::error::invalid_state(4));
+        0x1::aptos_account::transfer_coins<T0>(&v2, arg1, v3);
+    }
+
+    // decompiled from Move bytecode v6
+}
diff --git a/aptos-move/aptos-transactional-test-harness/tests/aptos_test_harness/bug_bbb75fa.v2_exp b/aptos-move/aptos-transactional-test-harness/tests/aptos_test_harness/bug_bbb75fa.v2_exp
new file mode 100644
index 0000000000000..457ace9c4acb6
--- /dev/null
+++ b/aptos-move/aptos-transactional-test-harness/tests/aptos_test_harness/bug_bbb75fa.v2_exp
@@ -0,0 +1 @@
+processed 4 tasks
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.exp b/aptos-move/aptos-transactional-test-harness/tests/aptos_test_harness/diamond_clicker.exp
index d6b0bcb5eaf71..85b58331f150d 100644
--- a/aptos-move/aptos-transactional-test-harness/tests/aptos_test_harness/diamond_clicker.exp
+++ b/aptos-move/aptos-transactional-test-harness/tests/aptos_test_harness/diamond_clicker.exp
@@ -1,68 +1,76 @@
 processed 4 tasks
 
 task 1 'print-bytecode'. lines 4-35:
-// Move bytecode v6
-module f75daa73fc071f93593335eb9033da804777eb94491650dd3f095ce6f778acb6.game {
-use 0000000000000000000000000000000000000000000000000000000000000001::debug;
-use 0000000000000000000000000000000000000000000000000000000000000001::signer;
+Error: extended checks failed:
 
-
-struct InnerStruct has copy, store, key {
-	amount: u64
-}
-struct OuterStruct has key {
-	any_field: vector<InnerStruct>
+bug: BYTECODE VERIFICATION FAILED
+   ┌─ TEMPFILE:25:13
+   │
+25 │             debug::print(field); // INTERNAL TEST ERROR: INTERNAL VM INVARIANT VIOLATION
+   │             ^^^^^^^^^^^^^^^^^^^ ICE failed bytecode verifier: VMError {
+    major_status: CALL_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    message: None,
+    exec_state: None,
+    location: Module(
+        ModuleId {
+            address: f75daa73fc071f93593335eb9033da804777eb94491650dd3f095ce6f778acb6,
+            name: Identifier(
+                "game",
+            ),
+        },
+    ),
+    indices: [
+        (
+            FunctionDefinition,
+            0,
+        ),
+    ],
+    offsets: [
+        (
+            FunctionDefinitionIndex(0),
+            25,
+        ),
+    ],
 }
 
-entry public test_upgrade(Arg0: &signer) /* def_idx: 0 */ {
-L1:	loc0: address
-L2:	loc1: u64
-L3:	loc2: u64
-L4:	loc3: &mut vector<InnerStruct>
-B0:
-	0: CopyLoc[0](Arg0: &signer)
-	1: Call signer::address_of(&signer): address
-	2: StLoc[1](loc0: address)
-	3: MoveLoc[0](Arg0: &signer)
-	4: VecPack(4, 0)
-	5: Pack[1](OuterStruct)
-	6: MoveTo[1](OuterStruct)
-	7: MoveLoc[1](loc0: address)
-	8: MutBorrowGlobal[1](OuterStruct)
-	9: MutBorrowField[0](OuterStruct.any_field: vector<InnerStruct>)
-	10: StLoc[4](loc3: &mut vector<InnerStruct>)
-	11: LdU64(0)
-	12: StLoc[2](loc1: u64)
-	13: CopyLoc[4](loc3: &mut vector<InnerStruct>)
-	14: FreezeRef
-	15: VecLen(4)
-	16: StLoc[3](loc2: u64)
-B1:
-	17: CopyLoc[2](loc1: u64)
-	18: CopyLoc[3](loc2: u64)
-	19: Lt
-	20: BrFalse(31)
-B2:
-	21: Branch(22)
-B3:
-	22: CopyLoc[4](loc3: &mut vector<InnerStruct>)
-	23: CopyLoc[2](loc1: u64)
-	24: VecMutBorrow(4)
-	25: Call debug::print<InnerStruct>(&InnerStruct)
-	26: MoveLoc[2](loc1: u64)
-	27: LdU64(1)
-	28: Add
-	29: StLoc[2](loc1: u64)
-	30: Branch(17)
-B4:
-	31: MoveLoc[4](loc3: &mut vector<InnerStruct>)
-	32: Pop
-	33: Ret
-}
-}
+
 
 task 2 'publish'. lines 37-68:
-Error: VMError with status CALL_TYPE_MISMATCH_ERROR at location Module ModuleId { address: f75daa73fc071f93593335eb9033da804777eb94491650dd3f095ce6f778acb6, name: Identifier("game") } at index 0 for function definition at code offset 25 in function definition 0
+Error: extended checks failed:
+
+bug: BYTECODE VERIFICATION FAILED
+   ┌─ TEMPFILE1:58:13
+   │
+58 │             debug::print(field); // INTERNAL TEST ERROR: INTERNAL VM INVARIANT VIOLATION
+   │             ^^^^^^^^^^^^^^^^^^^ ICE failed bytecode verifier: VMError {
+    major_status: CALL_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    message: None,
+    exec_state: None,
+    location: Module(
+        ModuleId {
+            address: f75daa73fc071f93593335eb9033da804777eb94491650dd3f095ce6f778acb6,
+            name: Identifier(
+                "game",
+            ),
+        },
+    ),
+    indices: [
+        (
+            FunctionDefinition,
+            0,
+        ),
+    ],
+    offsets: [
+        (
+            FunctionDefinitionIndex(0),
+            25,
+        ),
+    ],
+}
+
+
 
 task 3 'run'. lines 70-70:
 Error: Failed to execute transaction. ExecutionStatus: MiscellaneousError(None)
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 6551d5d69698e..2809319d2bfaf 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
@@ -21,58 +21,49 @@ L3:	loc2: &mut vector<InnerStruct>
 L4:	loc3: u64
 L5:	loc4: u64
 L6:	loc5: &mut vector<InnerStruct>
-L7:	loc6: &InnerStruct
-L8:	loc7: u64
+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<InnerStruct>)
-	12: StLoc[3](loc2: &mut vector<InnerStruct>)
-	13: LdU64(0)
-	14: CopyLoc[3](loc2: &mut vector<InnerStruct>)
-	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[2](loc1: OuterStruct)
+	5: MoveLoc[0](Arg0: &signer)
+	6: MoveLoc[2](loc1: OuterStruct)
+	7: MoveTo[1](OuterStruct)
+	8: MutBorrowGlobal[1](OuterStruct)
+	9: MutBorrowField[0](OuterStruct.any_field: vector<InnerStruct>)
+	10: StLoc[3](loc2: &mut vector<InnerStruct>)
+	11: LdU64(0)
+	12: CopyLoc[3](loc2: &mut vector<InnerStruct>)
+	13: FreezeRef
+	14: VecLen(3)
+	15: StLoc[4](loc3: u64)
+	16: StLoc[5](loc4: u64)
 B1:
-	19: CopyLoc[5](loc4: u64)
-	20: CopyLoc[4](loc3: u64)
-	21: Lt
-	22: BrFalse(39)
+	17: CopyLoc[5](loc4: u64)
+	18: CopyLoc[4](loc3: u64)
+	19: Lt
+	20: BrFalse(31)
 B2:
-	23: CopyLoc[3](loc2: &mut vector<InnerStruct>)
-	24: StLoc[6](loc5: &mut vector<InnerStruct>)
-	25: MoveLoc[6](loc5: &mut vector<InnerStruct>)
-	26: CopyLoc[5](loc4: u64)
-	27: VecMutBorrow(3)
-	28: FreezeRef
-	29: StLoc[7](loc6: &InnerStruct)
-	30: MoveLoc[7](loc6: &InnerStruct)
-	31: Call debug::print<InnerStruct>(&InnerStruct)
-	32: LdU64(1)
-	33: StLoc[8](loc7: u64)
-	34: MoveLoc[5](loc4: u64)
-	35: MoveLoc[8](loc7: u64)
-	36: Add
-	37: StLoc[5](loc4: u64)
-	38: Branch(42)
+	21: CopyLoc[3](loc2: &mut vector<InnerStruct>)
+	22: CopyLoc[5](loc4: u64)
+	23: VecMutBorrow(3)
+	24: FreezeRef
+	25: Call debug::print<InnerStruct>(&InnerStruct)
+	26: MoveLoc[5](loc4: u64)
+	27: LdU64(1)
+	28: Add
+	29: StLoc[5](loc4: u64)
+	30: Branch(34)
 B3:
-	39: MoveLoc[3](loc2: &mut vector<InnerStruct>)
-	40: Pop
-	41: Branch(43)
+	31: MoveLoc[3](loc2: &mut vector<InnerStruct>)
+	32: Pop
+	33: Branch(35)
 B4:
-	42: Branch(19)
+	34: Branch(17)
 B5:
-	43: Ret
+	35: Ret
 }
 }
 
diff --git a/aptos-move/aptos-transactional-test-harness/tests/aptos_test_harness/randomness_safety.exp b/aptos-move/aptos-transactional-test-harness/tests/aptos_test_harness/randomness_safety.exp
new file mode 100644
index 0000000000000..7899f5002663c
--- /dev/null
+++ b/aptos-move/aptos-transactional-test-harness/tests/aptos_test_harness/randomness_safety.exp
@@ -0,0 +1,18 @@
+processed 3 tasks
+
+task 2 'publish'. lines 19-43:
+Error: extended checks failed:
+
+error: public function exposes functionality of the `randomness` module which can be unsafe. Consult the randomness documentation for an explanation of this error. To skip this check, add attribute `#[lint::allow_unsafe_randomness]`.
+   ┌─ TEMPFILE1:23:16
+   │
+23 │     public fun randomness_error(): u8 {
+   │                ^^^^^^^^^^^^^^^^
+
+error: entry function calling randomness features must use the `#[randomness]` attribute.
+   ┌─ TEMPFILE1:36:30
+   │
+36 │     public(friend) entry fun missing_randomness_attribute(_s: &signer) {
+   │                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+
diff --git a/aptos-move/aptos-transactional-test-harness/tests/aptos_test_harness/randomness_safety.move b/aptos-move/aptos-transactional-test-harness/tests/aptos_test_harness/randomness_safety.move
new file mode 100644
index 0000000000000..13b19504607bf
--- /dev/null
+++ b/aptos-move/aptos-transactional-test-harness/tests/aptos_test_harness/randomness_safety.move
@@ -0,0 +1,43 @@
+//# init --addresses alice=0xf75daa73fc071f93593335eb9033da804777eb94491650dd3f095ce6f778acb6
+//#      --private-keys alice=56a26140eb233750cd14fb168c3eb4bd0782b099cde626ec8aff7f3cceb6364f
+
+//# publish --private-key alice
+module alice::randomness_user {
+    use aptos_framework::randomness;
+
+    fun uses_randomness(): u8 {
+        randomness::u8_integer()
+    }
+
+    #[lint::allow_unsafe_randomness]
+    /// Allow to export randomness user for testing
+    public fun uses_randomness_indirect(): u8 {
+        uses_randomness()
+    }
+}
+
+//# publish --private-key alice
+module alice::randomness_test {
+    use alice::randomness_user;
+
+    // Expecting error because public function calls randomness
+    public fun randomness_error(): u8 {
+        randomness_user::uses_randomness_indirect()
+    }
+
+    // Ok because randomness caller is not public
+    public(friend) fun randomness_ok_since_not_public(): u8 {
+        randomness_user::uses_randomness_indirect()
+    }
+
+    // Ok because randomness caller is exempted
+    #[lint::allow_unsafe_randomness]
+    public fun randomness_ok_since_overridden(): u8 {
+        randomness_user::uses_randomness_indirect()
+    }
+
+    // Error because non-public entry does not have randomness attribute
+    public(friend) entry fun missing_randomness_attribute(_s: &signer) {
+        randomness_user::uses_randomness_indirect();
+    }
+}
diff --git a/aptos-move/aptos-transactional-test-harness/tests/aptos_test_harness/randomness_safety.v2_exp b/aptos-move/aptos-transactional-test-harness/tests/aptos_test_harness/randomness_safety.v2_exp
new file mode 100644
index 0000000000000..7899f5002663c
--- /dev/null
+++ b/aptos-move/aptos-transactional-test-harness/tests/aptos_test_harness/randomness_safety.v2_exp
@@ -0,0 +1,18 @@
+processed 3 tasks
+
+task 2 'publish'. lines 19-43:
+Error: extended checks failed:
+
+error: public function exposes functionality of the `randomness` module which can be unsafe. Consult the randomness documentation for an explanation of this error. To skip this check, add attribute `#[lint::allow_unsafe_randomness]`.
+   ┌─ TEMPFILE1:23:16
+   │
+23 │     public fun randomness_error(): u8 {
+   │                ^^^^^^^^^^^^^^^^
+
+error: entry function calling randomness features must use the `#[randomness]` attribute.
+   ┌─ TEMPFILE1:36:30
+   │
+36 │     public(friend) entry fun missing_randomness_attribute(_s: &signer) {
+   │                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+
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 5ece525a662c6..fa85289717c25 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
@@ -2,6 +2,10 @@ processed 8 tasks
 
 task 1 'run'. lines 6-8:
 Events:
+{
+    type:    0x3::token::CreateCollection
+    data:    "f75daa73fc071f93593335eb9033da804777eb94491650dd3f095ce6f778acb60b6170746f735f70756e6b7300006400000000000000"
+}
 {
     key:     0400000000000000f75daa73fc071f93593335eb9033da804777eb94491650dd3f095ce6f778acb6
     seq_num: 0
@@ -10,24 +14,36 @@ Events:
 }
 {
     type:    0x1::transaction_fee::FeeStatement
-    data:    "64000000000000000400000000000000020000000000000028720100000000000000000000000000"
+    data:    "65000000000000000400000000000000030000000000000028720100000000000000000000000000"
 }mutable inputs after call: local#0: 0
 return values: 0
 
 task 2 'run'. lines 9-9:
 Events:
+{
+    type:    0x3::token::CreateTokenData
+    data:    "f75daa73fc071f93593335eb9033da804777eb94491650dd3f095ce6f778acb60b6170746f735f70756e6b730a6765656b5f746f6b656e00640000000000000000f75daa73fc071f93593335eb9033da804777eb94491650dd3f095ce6f778acb6010000000000000000000000000000000a6765656b5f746f6b656e0000000000000000"
+}
 {
     key:     0500000000000000f75daa73fc071f93593335eb9033da804777eb94491650dd3f095ce6f778acb6
     seq_num: 0
     type:    0x3::token::CreateTokenDataEvent
     data:    "f75daa73fc071f93593335eb9033da804777eb94491650dd3f095ce6f778acb60b6170746f735f70756e6b730a6765656b5f746f6b656e00640000000000000000f75daa73fc071f93593335eb9033da804777eb94491650dd3f095ce6f778acb6010000000000000000000000000000000a6765656b5f746f6b656e0000000000000000"
 }
+{
+    type:    0x3::token::MintToken
+    data:    "f75daa73fc071f93593335eb9033da804777eb94491650dd3f095ce6f778acb60b6170746f735f70756e6b730a6765656b5f746f6b656e0a00000000000000"
+}
 {
     key:     0600000000000000f75daa73fc071f93593335eb9033da804777eb94491650dd3f095ce6f778acb6
     seq_num: 0
     type:    0x3::token::MintTokenEvent
     data:    "f75daa73fc071f93593335eb9033da804777eb94491650dd3f095ce6f778acb60b6170746f735f70756e6b730a6765656b5f746f6b656e0a00000000000000"
 }
+{
+    type:    0x3::token::Deposit
+    data:    "f75daa73fc071f93593335eb9033da804777eb94491650dd3f095ce6f778acb60b6170746f735f70756e6b730a6765656b5f746f6b656e00000000000000000a00000000000000"
+}
 {
     key:     0700000000000000f75daa73fc071f93593335eb9033da804777eb94491650dd3f095ce6f778acb6
     seq_num: 0
@@ -36,7 +52,7 @@ Events:
 }
 {
     type:    0x1::transaction_fee::FeeStatement
-    data:    "9b0000000000000006000000000000000300000000000000c83a0200000000000000000000000000"
+    data:    "9d0000000000000007000000000000000400000000000000c83a0200000000000000000000000000"
 }mutable inputs after call: local#0: 0
 return values: 0
 
@@ -82,12 +98,20 @@ task 4 'view_table'. lines 13-15:
 
 task 5 'run'. lines 16-18:
 Events:
+{
+    type:    0x3::token::Withdraw
+    data:    "f75daa73fc071f93593335eb9033da804777eb94491650dd3f095ce6f778acb60b6170746f735f70756e6b730a6765656b5f746f6b656e00000000000000000100000000000000"
+}
 {
     key:     0800000000000000f75daa73fc071f93593335eb9033da804777eb94491650dd3f095ce6f778acb6
     seq_num: 0
     type:    0x3::token::WithdrawEvent
     data:    "f75daa73fc071f93593335eb9033da804777eb94491650dd3f095ce6f778acb60b6170746f735f70756e6b730a6765656b5f746f6b656e00000000000000000100000000000000"
 }
+{
+    type:    0x3::token_transfers::TokenOffer
+    data:    "9c3b634ac05d0af393e0f93b9b19b61e7cac1c519f566276aa0c6fd15dac12aaf75daa73fc071f93593335eb9033da804777eb94491650dd3f095ce6f778acb60b6170746f735f70756e6b730a6765656b5f746f6b656e00000000000000000100000000000000"
+}
 {
     key:     0b00000000000000f75daa73fc071f93593335eb9033da804777eb94491650dd3f095ce6f778acb6
     seq_num: 0
@@ -96,18 +120,26 @@ Events:
 }
 {
     type:    0x1::transaction_fee::FeeStatement
-    data:    "6b000000000000000500000000000000030000000000000018820100000000000000000000000000"
+    data:    "6c000000000000000600000000000000040000000000000018820100000000000000000000000000"
 }mutable inputs after call: local#0: 0
 return values: 0
 
 task 6 'run'. lines 19-19:
 Events:
+{
+    type:    0x3::token::Deposit
+    data:    "f75daa73fc071f93593335eb9033da804777eb94491650dd3f095ce6f778acb60b6170746f735f70756e6b730a6765656b5f746f6b656e00000000000000000100000000000000"
+}
 {
     key:     04000000000000009c3b634ac05d0af393e0f93b9b19b61e7cac1c519f566276aa0c6fd15dac12aa
     seq_num: 0
     type:    0x3::token::DepositEvent
     data:    "f75daa73fc071f93593335eb9033da804777eb94491650dd3f095ce6f778acb60b6170746f735f70756e6b730a6765656b5f746f6b656e00000000000000000100000000000000"
 }
+{
+    type:    0x3::token_transfers::TokenClaim
+    data:    "9c3b634ac05d0af393e0f93b9b19b61e7cac1c519f566276aa0c6fd15dac12aaf75daa73fc071f93593335eb9033da804777eb94491650dd3f095ce6f778acb60b6170746f735f70756e6b730a6765656b5f746f6b656e00000000000000000100000000000000"
+}
 {
     key:     0d00000000000000f75daa73fc071f93593335eb9033da804777eb94491650dd3f095ce6f778acb6
     seq_num: 0
@@ -116,7 +148,7 @@ Events:
 }
 {
     type:    0x1::transaction_fee::FeeStatement
-    data:    "6b0000000000000005000000000000000300000000000000b88201000000000058bb000000000000"
+    data:    "6c0000000000000006000000000000000400000000000000b88201000000000058bb000000000000"
 }mutable inputs after call: local#0: 0
 return values: 0
 
diff --git a/aptos-move/aptos-transactional-test-harness/tests/tests.rs b/aptos-move/aptos-transactional-test-harness/tests/tests.rs
index bf56ae5ac21db..90bbd913dce1d 100644
--- a/aptos-move/aptos-transactional-test-harness/tests/tests.rs
+++ b/aptos-move/aptos-transactional-test-harness/tests/tests.rs
@@ -15,7 +15,7 @@ fn runner(path: &Path) -> anyhow::Result<(), Box<dyn std::error::Error>> {
         //    interested in debugging v2 bytecode.
         run_aptos_test_with_config(path, TestRunConfig::CompilerV2 {
             language_version: LanguageVersion::default(),
-            v2_experiments: vec![],
+            v2_experiments: vec![("attach-compiled-module".to_owned(), true)],
         })
     } else {
         run_aptos_test_with_config(path, TestRunConfig::CompilerV1)
diff --git a/aptos-move/aptos-transactional-test-harness/tests/v2-tests/bad_parameter.exp b/aptos-move/aptos-transactional-test-harness/tests/v2-tests/bad_parameter.exp
new file mode 100644
index 0000000000000..91b918cbe6e2d
--- /dev/null
+++ b/aptos-move/aptos-transactional-test-harness/tests/v2-tests/bad_parameter.exp
@@ -0,0 +1,30 @@
+processed 2 tasks
+
+task 1 'publish'. lines 4-10:
+Error: extended checks failed:
+
+error: `init_module` function can only take values of type `signer` or `&signer` as parameters
+  ┌─ TEMPFILE:6:16
+  │
+6 │     public fun init_module(value: u64): u64 { value }
+  │                ^^^^^^^^^^^
+
+error: `init_module` function cannot return values
+  ┌─ TEMPFILE:6:16
+  │
+6 │     public fun init_module(value: u64): u64 { value }
+  │                ^^^^^^^^^^^
+
+error: `init_module` function must be private
+  ┌─ TEMPFILE:6:16
+  │
+6 │     public fun init_module(value: u64): u64 { value }
+  │                ^^^^^^^^^^^
+
+error: type `&mut signer` is not supported as a transaction parameter type
+  ┌─ TEMPFILE:8:14
+  │
+8 │     fun view(_:&mut signer,value: u64): u64 { value }
+  │              ^
+
+
diff --git a/aptos-move/aptos-transactional-test-harness/tests/v2-tests/bad_parameter.move b/aptos-move/aptos-transactional-test-harness/tests/v2-tests/bad_parameter.move
new file mode 100644
index 0000000000000..251b3b44ccd99
--- /dev/null
+++ b/aptos-move/aptos-transactional-test-harness/tests/v2-tests/bad_parameter.move
@@ -0,0 +1,10 @@
+//# init --addresses Alice=0xf75daa73fc071f93593335eb9033da804777eb94491650dd3f095ce6f778acb6
+//#      --private-keys Alice=56a26140eb233750cd14fb168c3eb4bd0782b099cde626ec8aff7f3cceb6364f
+
+//# publish --private-key Alice
+module Alice::M {
+    public fun init_module(value: u64): u64 { value }
+
+    #[view]
+    fun view(_:&mut signer,value: u64): u64 { value }
+}
diff --git a/aptos-move/aptos-transactional-test-harness/tests/v2-tests/bug_bbb75fa.exp b/aptos-move/aptos-transactional-test-harness/tests/v2-tests/bug_bbb75fa.exp
new file mode 100644
index 0000000000000..457ace9c4acb6
--- /dev/null
+++ b/aptos-move/aptos-transactional-test-harness/tests/v2-tests/bug_bbb75fa.exp
@@ -0,0 +1 @@
+processed 4 tasks
diff --git a/aptos-move/aptos-transactional-test-harness/tests/v2-tests/bug_bbb75fa.move b/aptos-move/aptos-transactional-test-harness/tests/v2-tests/bug_bbb75fa.move
new file mode 100644
index 0000000000000..f1349fce8d561
--- /dev/null
+++ b/aptos-move/aptos-transactional-test-harness/tests/v2-tests/bug_bbb75fa.move
@@ -0,0 +1,101 @@
+//# init --addresses Alice=0xbbb75fa0541df726acb791a1cf919b11ccbb31d2d0546a9df77359202aa82e69
+//#      --private-keys Alice=56a26140eb233750cd14fb168c3eb4bd0782b099cde626ec8aff7f3cceb6364f
+
+//# publish --private-key Alice
+module 0xbbb75fa0541df726acb791a1cf919b11ccbb31d2d0546a9df77359202aa82e69::keys {
+    public fun keys() : vector<address> {
+        vector[@0x6c248a37566cdaab3a277fdd8179eb41dbe39ec8bc4055e62f150856ad2386bc, @0x53b993ab4640591dbb3958e3474c10eed442d5b2a6ea648f263bbbb376972aaa, @0xcc4c748c3838298f8d606f10097f98ba95ab62a71762409aa20fd0aec9198219, @0x239589c5cfb0cc96f76fa59165a7cbb6ef99ad50d0acc34cf3a2585d861511be, @0x115599444422ac3aac53b987ecac122d0b19b70e59153e0302c93cd7f143f43d, @0xb705947cc311eaed5f67b2436b1708e2b4f16e7411ab4c5d19d2a373d9b07bcc, @0x3a853701b40317b2753b03347d90392effff4a68bb482e3362b452e28cb8b8c0, @0xff713764cce157d730042b2feb281527c9d79aa62c7f32f88cfad246f0239904, @0xc3daa734d794d7d8a60694eb8e755653c5b2f5ed4981af1c3ad6a3c93c24bbfb, @0xad9c746622f1b9ed76156f28bb7c3e8bf5241d8343723787919e8078ea043db, @0x14559337b359060b0dd181daa482cc26d6cdbde3d66e69e2aa7156008dc7e196, @0x8f661b63e73e3886307546be98d4059cce2ad6143e769f075706c6c94e049c1, @0x7cbda0b701f8f4d921d4120f782c33f115286966e87cca5244a4a4980cc78844, @0xc7b436331537eca7bf5d81cf6b242eea8a4b4cee606e96d629f7b00d0075f514, @0xf1ac91ac72292bb0296ff5bc39fa3d3adf365b7983b500aa8c72fd6ef5b15e29, @0x8bbe812044778a106056a444df92676faa6d329c78edfa6e87de2fbf557e880b, @0xf0204fc70c6d1e6a5c64bc2dfd3402adf5ad70aced216a20a3da9138d94a3087, @0xcca92a1dd6443246f22645029e78b3964dfa400e7c4644df28146054ea1b6e9e, @0x9d3985d10b89a74e2af4ac67a11d105a83de2a3aae05d705e6fc89649dca7d6a, @0x3e79b99fb982270986c5d506d1e7cc388db3bb2a8bb75744491d5992734293a0, @0x860c8d1064fe2c1d9dc33dff7bdf437d51fa3062fba17bc98a2c2b61de2fe6a2, @0x5b717715d82bd41a4b9ba3843745a1187eb7ccdd7f275d9c13f8bdfaaa596897, @0xb78ec3a31faf724f6c0072ae2b7d29db0bc4d77bb3b4693af07ab87a1005a794, @0x874102e12eb94d8ae92c19d7dc92ca95a6859eac9f6bbb99c7df2dd259485f6a, @0x27ec852ef194ab6055c237aa11f02a789264e763fc63ee58368c9ff4edd6347b, @0xadecd9aeb20144dc1472481879f159c49bdbc950d1123cd06d047c8838cefd, @0x3c06d2e19763b54183502313e1211cdca5c197e88aa7d9e614e94dd1c14cdab0, @0x7951b46c0c939a0b5736c604792ada20b3379e1f43d0721dd0a00bc48c769929, @0x22babbabf6ef7fed6cfca5e3035b12b84597dd3de34cbc8c1a924e32e7dbf92f, @0x8da605c524a50c9844e001502bcc75de20f546acdc9df1ef527122795c9907da, @0x3ec1448c961259d12bd1d52366c97e0ff43be06c98bed018b83b9f64590e397f, @0x19aa1e8111cb456d838bd36b7910b1177d7685690c3bf402cc5ab10ae544e729, @0xdc1f0e38516c930776a55b8d4c7d3f9220759b87b4642f5ee89cc0b9aed25dd8, @0x4a0be1d92d5eb04b2a721ff2ee81ee764fb27797a94f7d097bcc23172e2dd75b, @0xca89d551e36bfc035a920cf8d9a0c7b2c2955945b13e9377da4247b843d9cc83, @0xc00e21d6fadf73e36e186f8383f5ac4d25a77e0dbaa9c1a2f1ac575f5985fae8, @0x6644e436556d68f3767308e849fa53a6f0da868bdd8cba37663a313624fff31c, @0x41e8f2b99e63a59156b07ce332aea75e1d6b674b919976aa36a2fecf3d5f2370, @0x6f0a433ce13035dcb29ff5090b282d95c15cc36b8390191542228895b8dd3f81, @0xcd279a13346bc50afaeec950f9ca56ef465035a22c9fdca58373c58c5f55a8ba, @0xe7bdcbe64fcc9e94a9c22c92e2f6dda6802ffa194d79807573f45a52f489670b, @0x1234344d55d23fb5f93c72e0273c79b1b9c555481cebf519b33f252bc98f6d21, @0x372016bd5e0265541eb15d666fed2d21613744c786ac265f11a4d966c67cb809, @0xe67887104762da9084d6133d71c72264c75d60e32153f2963f9a60f6a8212f18, @0x3a471ed894b39e1cbe8ad02b659aa8fc29d22ad26137f346395db3f9f2c5d19e, @0x7edafda47989929bca0e2d2dac0773585a323732eeae8763ffb06b8a3778382d, @0x1f4eeff676eec96bffee6097c6f9b35d5eb618f3933616bd79d735b0e8f5c94e, @0xa138dd9e3257e10fcdc675ece9c54c61501c4d2d82bb3125e4f098fd3dee1190, @0xc4f3b4c1058c5493deecafc9e5fe80177ad8c5e797e087b78d777e4a12c1a53d, @0x681ec32f8c2f40b068884a969d223a1f9e11798c7c4d74776533417a475df223, @0x1eeed1a4a6e6f0a6e6761adc8eccac266b40a0f1d98612eb607acb378e94d506, @0xe94ed39cc5c0ce0891962978b582b7c5ccb324bfb6af02c18a5651a081163e73, @0x9cc33c0868023be611af58de54f8d2f2fe1cebfb457264367945f239e348f9f5, @0x594dc9c56f3032d61f71b52e322a7207fa648d6306eec3d5081b3c9e86ee1ba6, @0xe85cf2fe424c7613c733b5eca31d118f54fea0078372b967560d547566ccb188, @0x770d2cf0f4dbe4f6cb77fa1a5d736091ba2c289e159b1a9c7101db825304442b, @0xe87129fd42d25cdf6ec17c50b0c92747625dea13911a59d9683901af36f2b11d, @0x3f60f877cad632d94668228139b4ae67512c1e36dab5decb5e67ae0a44b20249, @0x8ad5c8e220b494043ee2aaeada81588e99f3224da86940b19c31869f236a5bf2, @0x41d89f96adae127108aee8803990169bc024e3f6abc326588d050d7cb3cc937a, @0x46a7b071db89137f6e54bcd0901870f1343e4979ea2513dc50fee38ebbd4f74b, @0xa3f087de0bf385600112043fb562627dca6edb857094dc5a6cf697f550b48986, @0x4617c794d2e1aa975dceb6e34f90d669fe852d11654e044bc9be1014b28c6296, @0xe7f201e3408d60b83e23272ce90e33e35b34e69145ff3fc584e2915b99d834c6, @0xff398e393f8af18506da2a9027f2481496dcd02c1f875deef4f906424faef3a5, @0x7eccb822f9e94112e4ed9b63a2368876fc327ef8e4909d88b5c67bae8838c306, @0x504b02838d114998f9c22ea5af17333f1bf065a50baf1b706efc2e1759861bfc, @0x48f5d7d40568a1a8c66460b70924648faf3cb45dbd666b10952c3ecd163ffbae, @0xe0d6a95fa3ed455e0d00c39c53da1730337898a2f4b9e460b984b302108908e4, @0x9144b5ac1ca50ab4ea5bbcf70de01d5e1c3b7f72ee46b6b213111ecc196c6bcc, @0x2c71be64437a7796a7c1f295418b2d88e208ac7fb009eaaba2ac7dc29d1dc507, @0xff49fd4809901e0c2f4d13a0857c00cbdcf46cbb71a32b3ef26372aae6ca06b, @0xb710c6ca89cff1883bccf12fb7b97d307bd103b2f21710028a9f72e1ad2c6659, @0xd2e42b54dbdc52954b69a8f8a97f29beb2f38707e9ae087b658311f4c881e274, @0xff471a7f5b4c092e7ab0cced91cea48105f721c0c91fa975b1390d9f1fc2216, @0xbe4f0a15bc8c3dde3e93634696dc0c0e99e9125c4415dc6578f11ddd3084b036, @0x4f1487072cdaf9204511b334f233f292b69b59fa244e6ee7e0399b1a9a4b62ec, @0x382b7524ee8b1dfefcb4e96a5807ec721c46bb06cba9a727cc75a077703d1c44, @0x543bbc0dcf32422e1bea9a5cc74e7c8974aab93108b011ca1e242fc6dde56d80, @0x234d3fd61afbbaed461298d7871209417f047c6c3179da7f8e741acd751d342d, @0x9b757d8cbd48128775154192f086b76aac5c5fb363b3220faac57ab0972060e6, @0xb73016d5d81ce1c46c1987acb72f0866076404b5367ec2594a0344823c09066b, @0xb79bc58e6452c94ee652d0e88802767bfdd478977ce7934099d5dac232f9c340, @0xba4ae5242dff386818302ab7e87b25fb7c5dd9c0c115ce3af1d9ea9fb99bc4, @0x50b8be74f90ba86d55a59013e654511677cfc9ee5f762f427dd8ff5da6bb89ca, @0x75860fde2fa8bb35990cb127c3812f49b2782bc1623b5bb40543e89935e805b6, @0xb5ebf3181690a8cb7c860b6f9c6f777c2f715493edd05fc1defc591e05ec055e, @0xca4e5ab9b7cb596ac1df47e3c1b06abb18b6c6483b460bb45f1b80bf78b02729, @0x634d116377fd29ec21bc4f1654a41cde82de3b497d673ac3770f968fa420cc4d, @0xfc54bb2e65f32eff8be55f9ea61f0ad030cf332a7be5442feb388911deb0b5bc, @0x6a643fab1a79b8a6b6333ae016bf1d6c856bc927ecd33fd38ef37ab8358180d9, @0x409847430956e4e15ef33c169808d353242c67124072a47cc70dd4960372047, @0x5125fe9198abdf95951e9eaca45878ef3656dca3ddd29834998cdc1c2260aba1, @0x86912e0b6b3ce3ef0c453fda4bce9899689ae9b83dc1f2255d026598ed24f5c0, @0xd14ac5c322aba5b4a1d3cf27dfddcb96d80de9413652d383d94cf783be986416, @0xdf5ced41c57ce6d9ac5cb43f9636ca33ba1defdba3effcdf0dd2893a177b465e, @0x5778c5bd71ad4d1ee2d080d4aabf73ee18fadec8fa347936375a92792299c6e9, @0x7614171c1588608a39dcd0b2a887b7b61d172997e0db80474eadd8f2e25193ca, @0x450566dfca18e136900f4e5b3a7c5762953161a6d727033d4b1eb4db371a5218, @0x2bde912e017fe542553202a8254af8802d7e86cfa8e288a72ce9b9f38f614196, @0x2ef8639f0a8707d1078e025dd3ce67264d096fa76cdfad5e2a5b61760b759386, @0x5deab63ba02215ac8b66eb91d3dc8264de67c4eff5aa8b759b829eac51f12c82, @0x7ad837d174aa5d9583a382d3185c0121442e49aac6a4c0960876db6c3af0457c, @0x5785af1674046cbbcfd7189613e761cf086495daef3b90b366b89bb305766117, @0xeb67b44bef740cdb14701b898e7cf817cebd8ed3c2714e5759f1b36ccea38f1a, @0xd6f6431f3b5ceab1dcbfaa8715b496ad8be202f79b62c7c9751140cab4911cc, @0x97a6556c9d8ad8e3d3e6ed8d8da4f5370a05be5f89fd925f38a39805691e3525, @0x490259e19fe46961b0bdcf89b16b0f41efecaefa462510b4b48a54cbb2f2d8c3, @0x73e31ff34ecfaac70e22f0bb0ffc670f923b8d305b05377bcbaca9882c3c426e, @0x56e6a11d375d84f657a1360e196a04b87076b45aaefe668e7661a4d27da78ca2, @0xa72ef7b9a25cdd5163761e52860c5d47168bb7f0d12a1cab20ee05924e27d257, @0x28b39074d526d7c1decb35aad593279000afee7768d333f16540674278ba4c66, @0x345f11b07ec75a8b1852fc9b08519e0d12b1186e69f42524a89e060fc3c7f7f, @0x386d9a78b9721bfa85946af9ee45a52a4bb667d308dcc1e219b81caf80d0bb86, @0x5bf42d4e2ae8a0d8ad70321448ff7a03d00705ea7b959cfcd083d317523ab5f4, @0x2fe2c0f12f597147e40eaa07e60d3e37510d7142dc6a7b905e6ff1a07a7d24f6, @0xddf2f77f9ccc81326c128d98e773b0fc4e9de5e14141ff73a869d5ffe284b3c, @0xd5c6319f7be5d3332cb2a3d05fa9c4f7f5c5ce33c3cca5c2b14a013bc790b1f5, @0xba371e921af5b8a79b7b91fe3efab84a840eb1a90b4f61804d6ea58e99459a8b, @0xd256722b9d9a07322e51e85aafcfa48115c18ba1e1a8b1112e8e7903c714b213, @0x3d6fdf26168b1017975b06497fe15bfdb68d608cc064fd8dafe4436788fcaf9a, @0x65f94785355181a55ebf67026790b1dc17af5abd01874e27b05d48917301fc00, @0x96efa0dd77c0c9e125575ee1148c47d280f98d83f2a8051636cadc16c4113bcc, @0x63a4e68e43f87818e8a268efa352da18f5256d500d557e66cbaa2d88e279d12e, @0x4f29767b98a3bad0eee163d0b02bc5fcf094007edcf7367fb2737edde74ba791, @0xd483dad9e42136a992a113672257f8c9dbcdaa9cb47c7c30efab39b06ab0df0e, @0xb4aec007c0dc1e5e912f51530679b6f349892d79d0913b0e34c71942972d7483, @0x67e6ff8b3bbd81828706073d263fc12d918259f9dfa996cb57696d8fde7688c0, @0x178ebe969b9ba8f3cd86d5e01d6602d144870ad32120a01ee427e4d362bdd000, @0xb2c863fc73fc9a9da374beaa93c99ba7fb2106d84dd4d55f04bbf0790c114103, @0x82971b9832420f613bd615bd901a2457b64234c0237aeada64c9fe112a78d54, @0x26429b30d71cc996a45b4990b2e04a726eb33a1e37987ee175309549315d6e6a, @0x3a00c60bbd343d54dc4bbcd8d01ba62a642e8f0330ac8cc649e7ba107ef5ae38, @0x4fc4f84812423720fe25c8d067d58b6d27f3c52fbb8bd38554bd52aba674bcba, @0xe15e39a7f3ad2e4e1981e92dad4bf6f79f0e276af6c1bf392747dead0d89bdf8, @0xabc3c62313e5eacc302aaf8b04863d07b9533961bfe2bb4f7ecdbd784dd633ce, @0xb5039ed4b874bd00f15ddf3c3597af97e7757c6df3d4f5f9940d9bc889976896, @0x68c255b35748936ea4953639be733ba782ba3755273f07f47405166e5fe7e02, @0x3878acb54b9fa67ba798505b91e148c9d0df4040d6a2e7be021ffb5607f55a2e, @0x191692a4f5ad0dbbee2658a4428adcd47f595350692886767218117635503c14, @0xa21f00e7b0ed8d44aaf280d09348d4a21239a448d934fdf26ebe386ee2748e1f, @0x850f2b42bdf046877270270b721f5c7d3550ba99445b4823cc5d568c3197833, @0x7ed2af4bac78510c03b4d90e6067261352858dc7c87c569764f00a19ab2aab8a, @0xed1b5de7df6c925b6f057ba6d15bb76ed6aec45692810fca435fe04d5f4277b0, @0x7149cbd143018179c09115eb5148f393d25bf02a9fbdda2142843916d63dd523, @0x904136896d0f64402021313caedb0b4931073309be5f48b41c7449fe37cec845, @0x61b8c8443a975130340bf0b95d7774eb730a0545967ce23c3d9847c8e733d374, @0x85c212f917f1a3e4b62f1b27fdf7a784fcb4282b39fee821e0706c8f729e2cdb, @0xf11f8e393e4e04576492d1a8b79dd6be212e6febc8bfaac7e4972d0bf7510574, @0xc6a751328fb2ecbcecb28d08d7c1927b41c20bf7a0ab29ebd58ea5db3a6a79fa, @0x5b9a7bc6d6c5063b271dedecdb36cb88d1b3b42a11e8a4b90ed86007bfad55c3, @0xe86121abf1b21222cd11d7f0475347c47c8541e16880fbe7b3aa3deec8ee5f9f, @0x45c35d49313d1ed26bec2cab4b78fd9bf84681ed3537b1c68785ac0279f0e635, @0x39230686a4201d58d999e30905bc580d59a038a5d0cf947394f8fe0db2d5a6fc, @0x3a8e3a73f4e19d36690a9a17d2b862e268cd55ddf87e16bd765f87141d8ab27c, @0xce00d4f3f5263e3a2839fb012a5ef531ea8c6cd71a2a21481b30fc3c4aa86a, @0x559771cd96f1426cebf303dfd30135c9a3590f13f276a4fff89fee4577502387, @0x881a8a6ccabdb7676f0d21b806cdd2c54742106366a3517dd0239a036029dc79, @0xdf7ef00f48625bab4edb67d0241f7b4361cd4cdf0baf05100645925032ce9dad, @0xf00d52899be2e371cccdd63951ae4ca8b8d33b30726bc327acfb8406fc188377, @0x19dab79061e6f2b6535c71a0df852b22dc2f38436659c2e3901cec75a693d676, @0x8e480e9b942e62d534e99c712aaea4e98e24ab7007626ffac7fa4a8e07eaf7af, @0x5303c27944f9b016e9846331f49b1ee98822117ce8ec4f82a23a2531b1dd7359, @0x6095e8959efed5bf0cf212c61de1ead0cac1b86b403b473689c9b39d82b3ca6b, @0xae452f9c3b19ef6fd966efd49053a0182a15471005923ab479159a7eece092df, @0xd5172b0e30c714e16a306698472755a1056a697f170378694a87b05b9872492d, @0x139eef27bfd8bab87ef85e6c797a3309bcadc4fedc7cb0f76fee7b972de96f9c, @0xeb606567ad61c5aad852a4e7219b993999d4b206a6cb33c5d622dc7661e72c0e, @0x1523dea881101c8f38c4a337cc770d8578a561080a979ce411066e4c3f2188d9, @0x7755b99be601cdabaee83a68adf5ec6b938ac71663f61e79a5271230e72e6d6, @0x94eee83f3a71c62ab936094b0e86707b844c95d67e481eedf03242b35dfd4f0e, @0xdcdd744ebb2209ac67b3eca00ee819811fc268e3e74b6f8557f2a17bba650bec, @0xaaebfcc1b4146fd19cd9a4ab4cacc299e58bd6929969a70ea5aa30a05ab03343, @0xf092a0fa02c1ff6d08839d7bbd67ae7be167ec66206edbcb3902428a2942c9bf, @0xf4c0a46507c995986678bb8a587805a34b551fd887ebf9388256ecfa8e6738e9, @0xbcd35873c2fbbf2aa04507396cc8b827915a35b5069d824aa8317c4bd3dcd481, @0xed71fde46e54def2995b9c5148c2d2c5754afd2c42f164098314aef358c26e4c, @0x576a74e7265c379e3ad054d2716ede0d54f93c18e2df9a39c9c365fd8f294051, @0x752722e3144cab6fe57b1d6bb31a7a006ab499d5c7f685d6af00860dcf5336b2, @0x8cc2c13b9e3541f3a2eb611448a600e79e673ab851816114640311b283ddd5b1, @0x3875925585453892dc8bc8d611aa46a8e78276df8ecc1bdd349085e6d8efa500, @0xc24eef9a32c0484d194da36b61ab5f842bbbec342fc30286e3e5c78ad4e6fcea, @0xcefe66384301ed236d5e59f00b3ca4d6e33877b9e94121ed8268d98778f5ad8c, @0xdd3e38bbd48cc02695cc295abe14e9abb21b4fd7be07cd7eeeeb2241af81f3b7, @0x7af8b32b83ac39f4c27c66353c55f0df3a440fa93396306da733412b06beaf4b, @0xd79f528bbef637fa12d9c0da6c9d4bc4f1d79421e33d1ff6d935951124761220, @0x913c5550c9b51ca49ecbf2fbb68c160610e83f3d8a8123b3107d1afdd6c1b018, @0xadabd7f1cab238cb43f4ab69497bc978cfa1ca7e65b30879969549484b21b29b, @0xb6d7574b2da52e7629fd91973227ba7019d3560354f049d2104bbd8ace657a1e, @0x64d0dc1aa86f088109c0b1aa49b0d211bacceef6bdf34b866f87865c7acde3d5, @0xf3fba8ff7cbdccc15feefddd4a0da73f0c786b92f6ca99844d3dcb9da198946e, @0xf8eefeaf904f6f8763c518b34e6998cf71f548db93dd40e30cad480ff0a4a76c, @0x899e5181b7adc2e034eafe2f96a2b98d7db1d2ef769a0279ddfcb731d3300184, @0x13db85d539d22a9f148be3162b7a0741d6b23e60a20d6887c80f643ca77dafd, @0x42a2d92f408acb4fea8e9f57ec479ca444978170811934187823488a83bc8123, @0x549b54c9b43bde012c7c9bfb65257b967db34815555dbe891c3dc19a2f537a31, @0xbbb8853ef6bf3d5aa04b777237ff6a6c87baa81558de7100e81a72cb492ad585, @0xcd1484d41259b0e5f9268f4ffccd479f215ec0c08c4b1f66d02f83577e93b4b, @0x70f05ddaaaa7f041f46f84cde5a58c13de509c7ed828448c56bdd35a63df2e4d, @0x49d451fd41e192ab75bc2e55a870b17149185fe5f8f98c5f5252df4fa6b3997b, @0x64e816abd71d10026cd376cf17cdadcfb60a03d5376496ccb5d6508aa3740e17, @0x73459a95f5233933a669230e2a6d78138f0d11c46acef5d4dd7429d28f9e65d2, @0x83ad21f8e5351eeb8ee455d2b70d2b3ffc918d2896c4e078717657a02a562714, @0xf97d7fa4272878e9b23f3f17b2c4c90ef687d6fea352ba63abdbf0ca54c00b5c, @0x622c0bc155590c0cd8b11928b645a7a2deabf58f2560361b9062e2303a2be85b, @0xa664fd932e71c18af30ff4057333f509b87655353a182de8d6deeb2ba8125efc, @0x6319b68ff6b151b5b8f324cd27451cb00aa81b88fe29246a4755114cd2c2f7f0, @0x3863e48681aa0c3730ab37942718f69fac4fb7c1d996a59177ebc20be1dab7ef, @0x6360ac9969e3f5b4154bea43b375d5f59818e035381424bb9d2871a699e7eae8, @0x7143fe9cfac6eba8cbf324309a9a10423a449d7fe37492bf773e8ab70ab158b3, @0x21a57508b6db68d5ce19fdbc84310444f27f48d9d70dc6e3881575c3688dc72d, @0x59e291b2babba23822bcec2ee4ca8b787e6939239fed765b2a673d3d10a3cf6f, @0x573dd3d6d6bd6bf96515e003dedbf24457d7a52b48bbb1bdeebec60301c541a, @0xfcf545e938184cb2d937ef4436b416ad292444cb2fb35ad2bd3d35f80ebcae14, @0xd344303cbdd8595cacc37ceb6abcc6d388d393ef46de22c88168d37a44844a8e, @0x910c8ad806fbaa9fc109abd0d8f2481d80a487abccb6f1cd7b531274c07b086c, @0xab2b5c03841dff59808218b0753f11abc4a094d85c944c2c886417cf92176814, @0x4a418e7dd5ca51ca6ae510d4b7026fd58dd925b9f5363ec81863d4ac36c64db3, @0x20ae4e96177026e2aa01c387a1313872eda4dad15278580caee2e9b9d11fe28b, @0x9b43a57c9d4c9f0c968bd612a30d33c5979aacbb5ee99e3e861271bc7c3e0ddd, @0xc1f0b88a9533beff18d1a4d3ab30055f1a54953a7c6fc20824959929a565d3fa, @0x2a70bdab6417e5be5d1189ba852d0735364e9e7a58f88c024d34793d89e3f84f, @0x86fd40883248e09ac4ee46dd855e3d7d3954ed3dc92fc49293e9ccdbf2c7ab13, @0xa2b37002d7dcc40141eb973776f75400eacdc5e99737d5d150988b4a470eaef7, @0x5df2e63545e63e4e27cd8eb18875aef5674a2d77623d017218f80b9e7be868d, @0x804cac7a1ef99a43033a2991bca0a953178fc2ef28c9c2245eed0d06c2238699, @0x7f188cf6d3e6478971c3d5f973d50554bd86bc8b8f89f3daa230108813e4debb, @0x5839343c6f474f1b1abe69c965b84c898b4095274e48588c3aee52679e4139b3, @0xaf3d2c4c0d013bcf91ed7ad5d9cfed9600e9c41153d8a908abfdc16db5d329d2, @0x3d723c5f3cae233c8807f603837ff676b5a249c6dd910bf2625edd15de81d763, @0xe93cb19654d00aa7d8bf467f1ea8de70cfa21026a2af6e69de67a43e667a7baa, @0x26c5db9664f77d1cd6321e656c5172d02720d7779e97a4f56ef52f3c72ea1c2f, @0xcaa517496eb48302871713ca1238a45370bb1c9535d643eba0e1e94fb3245c25, @0xb430e897785e2151245c914bc99656a9b556d7e79feb8a6ab66883227ea5cdf2, @0x3c341340afb67fde731edad0d9c1544de0d9ad00203c3e7bb02509a48e3d968b, @0xa8b37fd2ebed492de0d74e821c7c8c3f463e575b24173b740f796e38eb63eb3a, @0x2ea8299b88debcfd117ff95be23e25780a92b00fef945525b3566105afa566d3, @0x71c325c0dc5ae1d3a112c27d0ef8f02fd172350a4956094a571e8ea93af0e7, @0x1404419a6089fd85478d6b632fb6f548bdf3bd6887451c5f66637287d3e023bc, @0x49e4fbc755af98466e422c36a69f4c3bd067cd5a43d867fc4cce679b912e40bc, @0x51bc9c2eea59682dc6c84b450b69421be16246e6b4780f3fe1c9d7dc9a10cfc3, @0x52f0e3179294fb49a76b11bb625441bdd8f03077ea7f75554adbacbbf14c6355, @0x9937740dd23d3a0c3165632df55308fbc6ac19f69ed6f8e64c5e6e8bcc8c3016, @0xf5f0ea8e6c00eac499ad63a465d3718cfaed30640055e93b35a89c32fb9f105, @0x5337497b1acf63d09e58efca3072a21771a95aa6bf75b4c3df86d8a81c4363c7, @0xc81360fa0e8f7245de3e001d7b02b64fd0495a69ee2415f5a7cc070050dbb00e, @0x225660db24dbd3a23a355ccaa7e62d22e886842347272b5f07f914d99b725171, @0x984a947640b4d00b75342a3225e14e0b463065aafdd0b8f2aa33037a55d082c5, @0xa061b5fbfa2babd4226284b865d0653909dd4e91ed8a0b6b271e65125586d872, @0x12a146a5cae6eb1d5d253b8322937111c8b6282bf6207dd63317e040823fdb4c, @0xe8a117057aa096812bcde8b22c5b86998d2c18e18938868345649ac2d0d44244, @0xcdc19750ed1cbafd39c2be1a2c8a95809819d6c746fe36fa72fb12ec62e68296, @0xfe201d8136403a4931f7db24c9e15e34aa13e790b6308e851740eafaed12e725, @0xb1babe3d2365da2b2e2d3953af5b06d463be9531ec04cbb65abc85a3ee4d3a6, @0xcacb689c6f8baf55ff1cea3d152308ffd3868ff99c99b2900873530ecc8d1980, @0x2421a9ba8bc0d256a9c729865f98e9b074b63347aec661cb46e2e9fb0acce95e, @0x84118504486d35eec51ca910237845ba00e26973e65f73e828032b5a6577b421, @0x5928e9e93821d73ef7ee2e0f0f5fd0da41c9ba605b14a9201abcf1f8e93f3d46, @0x82c11f0a603408bce7e0c1ec8f9eb3dbfd4375757fca1b7d803bb1e5fa12f3fe, @0xcad3b77a16087c12e250cd2caafb6da170c339a3e2c6e59a443d6985c64b1a9d, @0x2afcab5f8c8875c62c2ddabe58a005fddd60c50792130ea6f0c9b66cb63bd7f4, @0x90fa4fd966f84544c66e592b30d71bfe23ba28c37ceed1980947eeb1875ee9ba, @0xba5a3fa173ba91f0e4d763650c67de245dc5d58a999ac2142a62b6410197ba58, @0xa69b03d2eaed4966fbc6e26369dd6a014a1a10343f7b8934e471e416f3ae17e4, @0x57a263b220c54bb88d4912706449c1e24736e21ab3f85151c44cf84025f02b6f, @0xf3ebe2a6e56675d1e4eefd4095ea652cff33dbc8809527ceec724c687015db41, @0xbdf9b227a41c02ff47b9f913218607c24b4fe6c242fbfbd34e010cb1b2ef08d0, @0xc025013a8c21caa3cb9008b7b2a097d37154b2c0a9094d24d663b485b520c706, @0xe7894146be9cc0645156ccb349a55fc722fc84461227b66a425d9181d28f49b6, @0x3f0fc037f4268e09c5669174500c278caf30769205e73226eac9a8bb44e43b5, @0xd494f9bc1323ff9a1e83e8a40bae2c5989602a62328353d38bd253e8b58d5e29, @0x471c90a1b396ee74694d0a55de139ffb457cfdf1fd2c7a2891efb03f7544c8e1, @0xef4041444d60678860be6202da8be7465ee0b3a8ebed01a643359fce54c71a94, @0xe5962b72fc3a4faef57f0ca0755885952559cb190e62d7ceebebb4a5e81fbddf, @0x80c9d00d8bc30737b347d3f30551efa0c8a39ed2bbafc84f07b6ac32534efe9e, @0xffe1e7ccd742bd7eca082eead4512f3ba6182a2594763496abb3ed11f65e90dc, @0x88f0f5ea4643aa4d9161b47bef9db82871aff197650c2a2d03279870a74c12d2, @0x3f27075d9fed6b3cafd29d2f3e0dabfd0e0d50c85b46bb5939d075b44c4e1c50, @0xbfaa9b129e5d192b0b4e30f2af63db284720908a0d983894f454c16988df3ff5, @0xef7b17c8dbb5a738bc2f28fc7b2680210b71855a1378452a5a995da1b7322846, @0x4c6f7fbd8ac15b56a6085416146e873ad70ada3a1aea51c3782313c7c0d2e38, @0x126e196444cb56abd682883711a6ba8220fbeed8a807de029ec77c36cf31df8f, @0x14cc176e0b51853367c5bc4cc2abc4a2571a73fed9294dd9e1e4237396cd17c0, @0xc7136a68113f7f9f94b319b812ae5cfad447442f00abe628bf0ed9058879199d, @0x1dd310d31ad39f1f766833d49e01ffff01209604e3f80c5cf0e082d898865c04, @0x90cebbd75f04b8a1020e8c4b1cede41e04246e901ea82402e19667af3be5acc9, @0x47b0e12c7857d857c2a1c60c26324579f6b066ee35bd42ad7fe7069a03874dd9, @0x54840465b82264b265b96a0c08a1149a99ea92a39b29ea4e5d39ba95e0c27154, @0x17807c4c0c51dc6583f8446f3c983b2d2dd46f7271bf422085e3e423368a3048, @0x46480d5c164ccabb81dd26d551a80c6f348b2080b873f3ed392f01ebbf682b4a, @0xaae51ba14cd3f396a22b898193af2bf531ea289034a5b0e44a955148df71b68c, @0x55ce6bd9961b2f5adacf459899855784f0a6573de86fa2ca202892a18e80960f, @0x4689d54b834734e51b8b01311a1bac8f2adb84d2b82d08c9cc52a6f7fcf74022, @0x45f9dae4d03116db81fea067fc763a4937df32eb6149e919ea8a11f4559befce, @0x1c05e595f6f664699d11f12f099f19c3e98b68f2219a4f103961a00420147727, @0xbcf247bfd814d7222ffddcee5cd1ce7a4665dc724add8ee0a7cacdb43aec6833, @0xcf22746e5c1bdb4a7275930d45ae29155b1a6d1e6a8f2da90a101c482222d3c3, @0x40600409af615c2881d19bc5d1bbb89eb516cb7b68661827f666a328a19070b5, @0x6e41fa84c9129e38e7b06c507997421d87f2864da7df009c217f6f5d285dae5d, @0x91d90473f8bbd7c0e9909d287e2fc955782b21614aa9fd48571c1c2c64e2bd52, @0xa6bcc8055c2b6816b7010d659bc81e82b1e2d6bd5cb829bed9dc9cb5bcc5a679, @0x28659a9f2092f2c6dd4bde38ba1857aa5da4cd7f29dd333a711577f0013de3b9, @0xc27da406f4e579c070e1b8d7c3b94e30e3c56fd6e94bce02ead227ad4ed3b43d, @0x7b10ced0a153d1eedb0d06c25892a9a7127d5194b567e100e71bc8a7e85e0e0f, @0xc19650d508d9b498748594f49b77e88f77aaf88355036ef5852a5ea1d56ae37b, @0x3b23d86bd808bd76e93016a8c81b1ec7d7970b14e85a23b9be7a0afb061a29c2, @0x8fdaf7d0486fad629a3d44d2dd7e9508fc8a6b67641db59586a1ac72a7330c7a, @0x68f5cc1e85c9af048801226507934f695f4653855ff25dfa9f7bd56b539e5e00, @0x59f5688292d68566c7064a1072ae8216ab88031eab05aad96286e9aa1a69f3aa, @0x6a15f2531ee3d2d6e3e166956243e5f2d82eaa1e6110d764566d1fff9d1869a4, @0x5335bdb733efa813b306a1c3cf3ca7e8e8f26cc575e2ffe80ae613a10a11ccb3, @0x4facce12758b3d2dfda6f0fcf5b6bf6925f6d586d8003a90f748e1dfbdf1a87a, @0xfefbfaabe158e31a70047691b86e871352c612c1567a6d0b518f5e9740e9f35a, @0xab1d5c006314f08ff4dd79471935fb64d6f41a7ffdcbf6c232d89db365fa645e, @0x577fe24489ff1eaf89fcdf68d74d34039eabbf81dc96f412895fa1e0aff01408, @0x982eef7ce5ec6f33bad5a8833432017e23f24afd1445d165417dec0d794a74e5, @0x2165cf39a8c365953948c007eb24594e317edc400a5b1a70c3cc4e95a80635bb, @0xbd2ef15150b4d2c60f6d060931fc536e14ffcbf43ee85fb1d1694cb0752315da, @0x71e0b54931ee2091d010f055d7cff56f8723ede96cee3481a7d2e5d8a48ea5f4, @0x56e0af7ab6bd8abab42883f216610d2a6589c431059c7748390874068727cece, @0xa63603832abac57a0f9674584c386b5f359ce1ecefbd51abe5366a429115ec73, @0xc9d0ef317010886343a3d5ea99a427577bf059dad70beb12f02c92240f498e0c, @0x429997598f70c6d1d8e7f439493490e16fe4df2fbb35a1a2d07268b509755dfd, @0x5f8bde2b4da04c9f7fade55181712e24cf7edbad33a8ebf43d84662d8e6f087d, @0xe5e865e8b33c00af4bcc8b5e44e26e7c5f89ae9a4a37a3740e41d43ceedba4d5, @0x30fb20997b2209e0ab5d652497bf8cd592e7a74c2cb9e863a413d8f5a3396a83, @0xafef00b0fe5a36620fc2283f8799c2f1bec872913abcff7bb08599c07c5799b1, @0xf676e329297c947ad797369e798c5cf965a0ea4c931967b4ba6f045f07e62e48, @0x8c7d2d00a518f051852c9327aa4ac671f5c68c51d0ab64508f4fdbc8321e2781, @0xba6077b820850ee90eacd7a49482e313de8fdbcc8c3922ae4c2ece04dbb19f82, @0x5415494427573cf5cd0d5c29dac0ff8871bda1a5fdd68a1d186996ac1afd0e5, @0x21d870e61acc2a174c7c719b8106c2f5e1a4c739b4692322140ae36ff7cfc778, @0x6aa14a620edac42239287f0dc4e0290d2d7eea662cd5f112a67ccb339d4fd118, @0xbaf7c6797275e8b1f3ad2cce4e989b11e08a544ea8e0367af23eda770266d976, @0xe2105ee6c37c71d285289b36adbbd3a4ee89ab66db8aaefec747b4a910f5925f, @0x3e24985f4bdbf040261b985ff3c98c766d7ded3e816d2fc7884be985de5988d7, @0xb9f1066774c295788106f0b0745865838e96cf9181172ea7ba648d4a4f21e084, @0x140aa3e8d75f3c0b0fa8cdaede7d55f59f0be24c05a81254028d7058ec396e56, @0xef63f371da54f384b3317a0153e43d405f51bb456dae92495501212e7b18cf6e, @0x376d4a444ed9c9ee8b37138d68a3705f8f81c33c66cc920702b8f4265ac094f1, @0xb4c103ec2e0c9777e63ede3d89a8b3592a9577c5bae063b85f54ec0b6da1d316, @0xa211fe81e080471c9dd02d25f707058901d236c25a1a0ed4146726ca63dc0649, @0x737be0edfdb4e09b7c7d8e58756018519f4fc058ee977fc42eb1492d57244c76, @0x60c8d62d718c8e97e730251c47cf7c3dbf08be0bae918886e367329ead65950c, @0x748d6c1d94786e27ee6030f8bcf15daea4479aac05ab32d27f8d1415a2870640, @0x2798f5803048b74c672d8511eb7bb80fef6afa08eed6bd9873a16aba637a7ab1, @0xefb266ebf63f77a9d64c59494e3015d67274d5bd1daf56e361318a64de1370c2, @0x2361919e6704948f17bf52da57c41dfafc43742b7c4f24b50295daeb02d3beb6, @0xe92f34076e00ae67c257c7f046b3dbbf1ba2473f6f1b0338a7310579855fd4d9, @0x8c657699039de7e6202572aa0733f2612bf8d2dcd7a530712cc8c15c1a5e6318, @0xf5a9369a99b1bce4916ea7bf5fec0ba866a296f36d83594dde2c198b76259621, @0xec5aeaa495bc6564bd760271f36fde4ed1589f9d33f0bcf9028c3418957da6a6, @0xd308f0d309e564898de8364deb3dfad802ca42f91fafb7ae2b10bde7e9fa5eda, @0xcba299b64bd6e2abad68d95d0a5560a3f5ea26c53993c51b9114dee3e66d09b5, @0x9cf7202b91eae86113260728568c90d08d1b0e51a28b503dd4e493cdb9ee1be9, @0xd2a3b0fc946aa8b81f2758c9c879f10459075ea423dfad7c869e48ad0fa52250, @0x9b64a360a80621b6a460d24655eed4bbb014a51b33b5efcce01b6021e22b9ea0, @0x835959b07ce5f38e5210e9f7c434d15d645c58de6782475f690079aa556feff9, @0x6a8e372397ec561724203d13d475419a6864929bd6fc456e26cef4f247c5a9fc, @0x3930f697c2906ac6650bd4d5842419ba2ac7dc5cfceccfb92fa5b53a8e1cf7bd, @0xe9ad250613876a9de4b14a016615a3e813144ec06ff8de7c5c90be193a9e3216, @0xa6fba3efef839e13d9ee85628a818d0e0b1623fb10de5d86779188d96f374f68, @0x474901c2f9c73d4356ba907fb7e26e9e8c183115e5d2c234ac35f805633d8d08, @0xe33ee4c7b9365ece0a212f6aa6644edd856f4575b01e5b9d3028087fcb5f9516, @0x1977ce508e0f898fa952b60d090bf4b45e7d53d6dac3e121e5d8a23bad024160, @0x33bf226f3fb5b9b57e3d174e3a26efb604f7a7a236070b84af0bb2267dd5857d, @0x2f0c5e2ee3e82cc05165ad803b5a0141aa9f0e10217c548d67ceed139fae63d7, @0xb422c1d084c9d775a08079bf83cfe2f4f4d44ce294f5524d34c6dcb8c10328f2, @0xec5e7f72331884a6dec774008fc6dc2f161d14afff8191943c4a45301c755b08, @0xad2bfb93c71230d98fa4a3eb93d6243627ad83e0ca5d1632f1e155906a555edc, @0xbaf4205bebc37d30088b2634a998a121dd1c090bb17d86c91a921eace6d09909, @0x7b6d7f57c689344c3e33145f4425b7314d3bad094f574f7f54c14c073bb0b5ef, @0x9d204df9aa6c89800bfb4f0d523436f6c025663730f43d4e570777f60ee9387d, @0xcc926cd066361b355af0d0445cd920dc7e92751596be6e3f3c1c255378fc0f9c, @0x5f8a2a2224e3b1d8ddebed5e4ccb8da8465d76c178199f701253dc327d41f7e8, @0xb753d512bc286fa9e7ada8df21220af1a87014a51a7ecc45c472b96fe123c75d, @0xe11dbb7052969e8895b3616654dbe864da1c672a76412bd1de8d69ebe23c3bbb, @0x8dfed39d419dc907499fd6485d3dde8df2f9169047804c52cbe3450967bc3e8e, @0x2fa5ffd9dafe33ef94b36a640d8da06100e2302283b538f3ae9d3ef330e75ece, @0x9291ca3b49282d44e30a7baf01c846b6aeae3d641881d3b46aa9e4868fc343de, @0x90185a2c8ea8a70d316c45773c70dcbaf19ae68707efd1cedde3108e3c2bf912, @0x6f213db7b4f6c2e83a24c8f896b2982d0a5baeab39deb08deb5c8e6e3bcaa96c, @0x83f1788f3deb2d1c1bbc721f1127c6caaebb682c45dac7b06936d54365287970, @0xc5a0fece21082290dd0674aa80376d2a18eb9c3bd05b0e7112b280d56b739aff, @0x3d4ec62dbae6b55fc7030b5a8bf05bc6184ea0461e2efa3ecc7b7bf3091c88fc, @0xc6cc55bd683e31548b4945bfa7f06ae64c920b2a3f760394a8744843e2141d88, @0xc8cdbfbb3c64f998d6cca51ae665c4262ab05f0935d98a24c4aa77456d40772b, @0xe12526f69d5c90f3e6cff4125cae1cf2bac00258790e4fe1d1b0ef38641df34c, @0xd19f5a8020fdb229b00c0e2b42eb68d8ff2632f72f1c9f853bd6841b5def147d, @0xbc958167937a173ef435663d774ee21103cb4155f7251bbd218f5bff7d7f4c01, @0xce5584e553c52ab09db7737233b82089297c562b39e4111a1e8cdcd2197152a2, @0x22d1f73352243ea23c2b1f4d1a8d233a9051179d4644084fb824cef6fa85a78b, @0x7cd210be40c55bdfdfaf7d0fdfc8bc526928a7db04d2534bf9a6e71d418ea9f5, @0xc2b25b18318ae3d0f159c3177db57485f56fcd13ed415c21415794a282831024, @0xad2e057ea50662d8217e9f5540da3a753af95eec3588695e6cb55f4daddf2d22, @0xf8c0b1238135efb07809299b5cfd3b632be6c1e05e0adf9f7b9f9a525f66cb45, @0x9eab75a5f7eef11c9c595b877c08f903fa44b0fda748a6c7b29d9bbc220b6c01, @0x66d9248dccc0d234852954c7f97c64f6c0134fb21d1508f3e8168c2c122d5d3b, @0x8fd9cfd9176f21f93dc8ad4c09099abf74916027ed9c1c1a719c686b6a7116d0, @0xff194802f060b03629b49825791e7c80fcf8dd2d710bfc4439caa5a74e23f55d, @0x864fa1c78ef64e0107d3a6c034e517d2115931f37e7b26adfacd7a42cfa936b1, @0x6a70e76a3a3df45b980e69935dbac8e732ea571da17c4b537cc5ab130b6011ed, @0x358e812fa83977dcd9b81c04535f566e468b6744aafd451a885db7554c5552be, @0x5452e87787f0c7139e39a38f29032fe2585f50366bc6c3cd6cdcdf91962e4620, @0xfaadac79a5b812138520381f9fc7e49c7246c2a0612bf28e1e166357ff14f748, @0x3e26ba6c0a45460fbf435b4319aecc37fad3f83616c75a70dab49b82a5d7cd5e, @0x4ea2190b899540710a3a6dfa9f4d98da2c7bc3668fb4ae3be9c929cd09c5e9d4, @0x364648756305e96eb1ca2dc8f05ccdfcb31149e123405b7937ceac9a28b4b9b1, @0xef719c4de31b0ad7241e5b472fee7f97f97c6309aaa9eb286168b62fd811a298, @0x7339a94257cc61524c8b15252f2766fbc3c2760f4d9b5dac662a9803845252a6, @0xbc17bbbbd683329d0aa1ec624688b39b641c8a690116e9464843381a20444a66, @0xafcb0c5b9f3f02e5d0475cfc62e69486e837b61b1fc23d110414779a91ed3cec, @0x17c80ddca05fdc9285123a58bee43b4cf2d52e1f976ef76bf1b509f530d4f72e, @0xf1798df0dfa75edf3170a009d1026630d63cee3c097ae2dca4d7a42ffa291545, @0xb93e388f75ce7727fa86cad2679881470847b9f2fd8b0b7f39fd235f9dac6050, @0x6eb89860558b9b5d97dc1f225b3f65e1103b249079f9b4b529369bf50b00cbd, @0x6fa7cace9b824df914fd6db406655bb59e74df6c814c88817d0716d03e0ae2c4, @0x7c1f65c5130829454a11927c113eec6000da983e0923863cf6fc525c15b84771, @0x9ce0da4f328e5ecbdfbdf89c4846096916f39716d738d43d929dc2f9f8dba5d, @0x58cadfc29fccce0150b22f3791d4ecc0b4c647629f6169c46f072a00e4fc6b21, @0x801c4ef33085244d3e49500d40b517a35179302dc0f73149837dcd9f1b5e61fd, @0x8249f42b08b34971dadbf612b5c654cac0e4fd47f6bd1798c328d65699cdcb, @0x2fffdd307c12b98020ca069e45fe82e1b7c3bdea2454e662521e6cfd5d1ae657, @0x110cef485bfba13e665a89d826c2d87935467e3b1d0ad1a7cfb807757d8282ca, @0xbfdcb5867dd8f5c947e2db3ac8da7bb9ec16bf711b35af1d30da60552e3f632f, @0x8769e6fb9c1a6af9fadd1e8a709748587f7f19a2f2dff3679898b215d053ca11, @0x31841a4d7a0019fa7b9c9168aebf61e75070a5db3c9b511b3c6dfd7d0818ef13, @0xa806145974fe3b748aa194c11baaff1d7aeb795f3754be73102bd49dccb18f7a, @0xc0882c34656dc60c180a6aa502f118cb84e1c3429f0281e7001aa3ea58235298, @0x1f910f662f5cfe6872b02b9e1a5dbc902ff8575189f61ccb7fcf91aca53fee1a, @0x14e4876f13b74312ede8fd4c9eadb02378118a24916be0fb159432db2b48a213, @0xb0cdc88effc04d8c4afcbfe3cdaf55f6b621d053a54b06b272c0b275a4e9d71e, @0x7823c6fcde7aa5c1e3c6dc9de03320a1567c8f83de630390d2da9de9caab9d9, @0xf19a3c5eabe9a1041fd17d08b0a057246648b25d26ff6e490b82e74c71711ca3, @0x1b7c12f45d72a2d1530959b6e96f304b9b683ed49a39cb24c88e4e510716a6ef, @0x5e07cf4554c915672b980a892e69c20cef2d18e8a923ff9093c0c8ea973adf99, @0xd15e84bd05ec89a486493c8b83f12b66aa431e22c2bf84346d7a5b4d401de0a1, @0x43d5ff072e4cd37b52e6fd20398b55e2e15808645a90fcd935f2d620dcb33821, @0x9a639e1131823632103cd70e4999b60f865532cc1b49f8226f17b0b5c11a58c9, @0x22a72a3e26e7fc544b8cd701fdb74be9cc0b314a839d15b0338a10123e38fba1, @0x9101d677998b91d407ef8784db0a812e1a0bb55ea93c0f5b4fbc37c5701f4b36, @0x68153179a8ab5405cde1d8c533f5db4609d4ac9725652d2e20f176808b363970, @0x18e497109bb1e401ad02c1aaa9bc63b2be99c476f0dc2ff44675e9989aabdfe, @0x81ae174d381a9d6fcb06a1aab6fae15a4792d13f3bc67b02b5efd9385eb5e878, @0xbd012c84edd50133e2b8f244e845c3e30c0b04b52312207e1da7798ddd78850f, @0xb4747755918b73c4a15f8a163600b69381b8b53fd80dcfacaf1f0c999f0ed93a, @0x55467626b01d2ece914c288d3852c674a3bbf07b2903520efc5afae30de7b03f, @0x376ffb4d087032c06308387720a0f7a48c5e3c62d8fd2493d8dea8267ac60f15, @0xc3bd0a434bffac4ed4bf39f2cae0f4d3f5125ff13c97b98c16a8dfd7b12bbc99, @0x9e1ac5042b63357e657259053b63f376091dcfb445e04d7604022c803f305c01, @0x2caa79e4524a76622036892cea75939b0a367d8491962c9a9e7704f0a769c997, @0x8c4d26e0763668bed74f8ae3eb4f00b1bc183a520bcd44d35ad4cfab9f6127e5, @0xa972379a4c2e68f8da8d7badd26dfcadbff608f282189be4b30f26f1621f3b02, @0x917895e255eff4f620f3997d540b8e36441d556aede0030e3b1812eaab6c37c7, @0xb62f0f2c60cbe9b394ebdbd104cb967e38da3e51844958a4e72b3bfe4282ab8b, @0xf410df0679fae8bc1f4a19f2f241ca2e3050cb019b8da348f2ef363383672296, @0xe68c06a5a61dfe2cbf1bbca3f465dd7fe25ae5cbc7a83faf0d358656dc74ef27, @0xd99c45307e0b7437b735b19e39c80540c36070f01abe922f78f2c9cef7809040, @0xa005b12036aba48a467f15ff26404b89e2fe2738302d1358754616524077c04d, @0xf198f46df4ab0ef1bfd76d14dbabf3d10226b5599f39f54ed3592dba7b673492, @0xd4b7776769db5468d5325ced2302732d5445e9834f62c372018e7cbd1dced0e6, @0x52aa836074a64cd6db3bbe2ea85019cdb3e7061c2f5c64cfc08b8c926b8d42f7, @0xaadaa310f4b19213fddccc9c95ac8a46efcb33f9e2389dab41cd5d8b03e84528, @0x5cdc216cf6fd9ee4ae02527cdb7144e38a5641a1ef5bac84b3434502dbb1afd8, @0x9b9f5324633bd71483f8f6aef7c0208fd29be218d8c71801859380feb02024c0, @0x7195f048913516b21408e236014f4a799e2631d09a4b213ad0a2488752e1af0a, @0xcb02d6c905568e628774efc426b84f48b7b7a5fad62397cc79d499add76384a3, @0xd77f90cb3eff2b2c35e053fafa858118f181cd4741ae6e4a6240fa4aea004a0e, @0x3f8db5abc0e1a9e08b5b47309db095197cab2c8daac76a0f6495ed4d6afba4cb, @0x70a846dec48b246660488467d2fe52af3f62066a9c056e8fb7be739931055c3b, @0x46f3c130b1ad11c0aa7e1054ab1177698cba385e8e7dd9a61b98058c8b88ea79, @0xf14d0cb7fe2b870dcb12e463bf739630b17a93dab5d90bc8260ac9fb8c59336c, @0x33804f2f8cfc4b9e198993314b960b8b7ba66a963e20e0ee2f69153c9573067f, @0xd38cca6f8968e0fa05dd85965854433830ac33a9e63e4dc6346943ed65c865b7, @0x933a37f5cbb32ad7f5f98ffdd930a77974c5cdd10e8adca311d622a8f97b99f2, @0xfd07e4b0cb6bc91d48b0ab04e3db3c3d5d38a1a9327b758a5f2c66e42b0c13d7, @0xc3fdf908ac169dc4856e50873fc96c24956f120bef5822f172fab6132d0beb5f, @0xe53bfb139f1ca127543bb7c35808831c4609a02ed23d22b06b035a335a4d940d, @0x5f59e7752cf66224bdcda20571983aafb35153dfbf7149bfba5cd981fb364428, @0xec6e7cb596bb32103045cb2936324ed775e2b1555a4534a33f64e1fd22bd6ecf, @0xa076a2e4049bd55a1c58946c7d8f9ae100b8cdaf2c9935accbf99f9da678f177, @0x1b8584cefd0fed507a168775269995407beebfafa6420eaa85582eecc6933f4f, @0x757f9315f5a3dc26e4e9349fb91b6652cd680e3b8ea5a256b6d6c169290b6d0e, @0xfa3dd7a305777271404b875b44fc3d75d68c82a3b178aab94393d2a124ec056a, @0x57ce742b99b81e72d618a6a12f594400f5af31716fa482bd9936978faafb80cd, @0x711c4b71cf8aeeef4947bd829660a287fce5555c2e7997d2bd897e5ad191563e, @0x2a384cf1a4e6743582f18a3eb8b1fb62c6f737338b9e3b03395ec8c9665efb46, @0xf6b950b422bc1ec05835c18dfb2ad5c1b115e2ff666ae60f2e7b0003ce268367, @0xf7bad200fb2b63c8cd6f0ca778772985ec9067fc131a44270840019444cd3878, @0xa214a43715af42e0b7b4b73c7b3bbf2babf489b5b0d052967bda44e5e211ef5f, @0x6d4eb648a63a41f3e255857d4cb99386cd27c08b704160e0b37ab08e7724f0c5, @0xd9045b2df55accdc1e38a4550ebbce04a132636ff9918288ffe8c9baf1ef0120, @0x65d11d9f5b90eb9f191a47ae50c73e34c7effecf8931a838e2d8ebe49a99a5d7, @0xa06efe6c721b2b7059f8ddb18802a889b2d49c72548b91d5590f819b6163515d, @0xde7f2075496f3770014d7429df45c63ac05e9c3f1b9f2f4cd435b061a4e61d48, @0xe0aa58daf94d4ca194fd4c4d9c845898c6c7c00f81e1a6f6fdc7a093d33169d4, @0x1e39979993020fa846fe8fb768cc3e1fc109d56dc27fa5765ef34e5c9d145b1a, @0xd114fb4e6bcd5b0979dcb06b7f4c3cc0d09cabe0e42491ac95a5b04bba58b70e, @0x3a71ada84d45b5ff6bc624381c8421620c2d1914ec3092ad0134b3704c600dae, @0xab1fa22241005fdb376d42bda60982ebaa8018e12a0f073b91a830e35fa4bdcc, @0xb037af0388c455d5839f4184bc42211ee06fce62a53ccda07d2287e89bc4c61e, @0x60307131ed727cba5c602125db50da0d04fede45af57975172010417659c6c35, @0x1bbcecff81b4e1699318439661510fa1b19e92d722931c3c2793021eb555b41f, @0x5d41859152179cfa5e97cfbce516270a67c54e713b7a75209700aeaab3fbdbfe, @0x84256cd20f52f98777fc448183e18e49606ce17a4e7529d0d4669c693d8b49e2, @0xaa17a780c1f36e75f266471bc82a9df6432169881637046a57a28f7096f94c3f, @0x35b175d363f694e07bfb67bb052585c1f29ecd660492c1f793042a363b09ecae, @0x739b56c3fe725fd6470259f047c3399ea368385febc8e428a6849df80a70ec54, @0x9f4876f6599750f9a2d6d34b385b048df8aac89548f4f7618163a7c2cb7374b4, @0xb89c868e4f00a2b0086db36d030f1b3a88c9a919b32e3451c43ef687784f85b3, @0x70fb519069bc98e10df70e88606295c21abff504ec7571d0f9ca7d89045583fb, @0xb8c097212150f057aa51cde1f80bce1d37f7dff5fa62ee09fcb8f80393ccf364, @0x687c05e92764bafb53282ebb558715a7275767b190d38736dd93d7558065e484, @0x69e82a385968fcdbe7a4e9243b128c4b7c2cd2e5a1b89fdd8062d3765b6c5d0d, @0xdac6cc1f22b6bc2850c07826f1224146fa9c60f7bda17805a339685bc0e91619, @0x81e4206c3b4c98f3fc670b5247c5303ae1b10722e057aa133e126858d0f9049, @0xba587ac776d81f37a4df61a65f54871151e55f41225315d41b2af2f94e5fea50, @0x9e40c01f828a85c777960d2cb71b7ecd4f9c838aafa0b8d194d16a9dc812cedb, @0xc6156578c2bf8edb1e4f624c67414088ee0e937c465b5860ded3dd944ea5d8ca, @0x8c8cbc5a6dd5b4b5270b8a5fd134a6c1a1aa9907a70e3d09eb8045968c69b47e, @0x16dedd80662d620f471831577dc2f93970bf410c2bbbc802ab419963701a6c82, @0x544acee1dd0f16f7ceaf70d98cb244b84be0fa3c7ba5f09d255e1ec49ae9d2d2, @0x4b0b246a0b4659f0fd65234690595b4be26444ec2e0f1752f4466c815766a3b6, @0x11d83b51564567473d18d7a490673b6af09622275e19ab1d8d0e16d142c4b309, @0xf90308bc57c4528fcd0576445be9a287ee7c58ceae04bac8c9befa4c3abdcdda, @0x29bad644625174c93dd4b1d4a397d8387a997f5737f7a3a2d35fcb9e8745deee, @0xfa485ec1f0d640d30dbbe83a34d5d18af6a521cc131609fe1ff4c727c52143fc, @0xd9d90df6aaceedcbdd2bb60f654fc89180cbd18cb59f79b625deb91706657f53, @0xf3331291b46e172e0a2d4ac008349f0b4eae92f774565c59e13dd45c431a730e, @0xef835b2a8d26737d97dde396f6f3b827c23c722f13aad978ab7355091d89a649, @0xfb25489f3d2c1db4f9bcdf23ad82788392e72b0a9439a3e3a154af8b66421463, @0xa338a339303a2231080dfbcbb1b0aab6507939a764a8754c53fe81e200efa88a, @0xbe97a5f7bd511021ed4b8943d03c52a768988fd521ead5c60e28f5bd0ef5120f, @0x6f3eac0353d98de520e3334f2ed76ceb2e3d46733c3f23dcfbb646427f2a7387, @0x67ffb987f426ddb85b576635b674a58c5455c69a10be8347ce6c5ac988f843bd, @0x8c6b042df468dc1c0b5cff812629de1ad7d68cb483d09a91a33c25d8bf12ea4c, @0x7d7d71386c33f11a58ae964d3364ce7a84af16f686f3b83b9154a0c41a5d72be, @0x7d780360fe1b965b38096ba0c9b7603ec1aa1e065cdd02364095aab99fc3b32a, @0x6de531cdd1901cea4fc50300b9c2405885bb64b1f2680b1c032437ed10e6d197, @0x871c79fe52f3a555a95a18861784b840d8fa082c5c376f80d3a863a18c2ab832, @0x6f6243217472067e55ce7945b52829f48bf927329e8a8121610a9288d97cc1c6, @0xf67233a1922f0edac4439e28a56d6fef1707f9d73c3fab17c7287a25000985c1, @0x373d395521f8af0c8197c7018a1eaa8a3a52f837636db9d48020d63fd8d361c5, @0x40293c9c03fcd48ff12385294e35bb7294feb934e809bcbcfd46fa2afc8cc2b8, @0xa4c83434eccf3a40ed8aad8c575343c15db64d1c81edac2ec294f9a615df6d1e, @0xb93e39945490d9c37e955c75f5a132d2a7ee8574a6db96affb3f28529b3c3097, @0xc3776bd0b1d049912d3d33c004b81afbbe24115b30cb8a9120648719a97acb6b, @0x6474114cf16bcd3b0a3e77e9504beb2cd40570bcfaa7f0ad6e53f4c788566cba, @0xe8cf80d46f0217a51d0436171b75809d115d1913baa8527fea729c82809d1a67, @0x24b19fe0e444c6b66511af5982de753c03e8030697e87fa26f6173fd19489cd1, @0x5af98aa021aee870fa9fedddb8066258a64e3ec4cf45df2a0902af3de7b5afd3, @0x36b131b4b2dac120342e8565bf22848199c906e596e2e4ef8c1e3333c305f2ca, @0xc49c11b87131f110f5be123777eb1a319a4e21cca82ecbaa82b849ea1b989eda, @0x892edfb21df4fd5b04f1a17c2ba229ecedd77f49b3419eabb1e08aaafaa1bdcd, @0xfb4fe3d07a34c3a81137b206e979d9260a22dfef5ec8921740821e30391be2af, @0x69ed91eeaff376ef4431932df9fb104a04838f353a6f57ef1e529a51809f436a, @0xcf06059641c7d9623427e6eff3723fc2d83d55661475fa45c577aa2c11d31711, @0x71896f84332c227a6317054fd6c6c2184fecf339f8d16e8c0b67fddea391170a, @0x4aa117ac5d688f36f0fabd6c96ec090fa0a583a0beeac216a626d9cf1d3d3a01, @0x80b0b52b74b983ecb20ac2fb5e54eb006e51eefad083516ed720de61804b4c99, @0x5f13c790cf38cfe95a40ffc4dc90ce754d54d826b75889d6dba9766011b40a5e, @0x64b95f7fef2c4c3b7738a73fad7a13233aebe96d283542be11cfae22185609ae, @0x7ba8a825b8388cabf47ce018da192fa5a717a968ef9843217f429b63dc120541, @0xc40c78d31960ea1d6154c523c775f6315f0002b68c8f9e43575617fd1006a7fd, @0xde8d1b6c6cdf3b87b61c99defc66187b6eeba05eed45ca3f52e7551730e24a83, @0x86ed3d11699c5c197e30fa5297bdc6c12efdf8d7dda57d9dfab9c86af77d6dec, @0x1110ba4c5ef6e247e92f4d18650f0fc8dcaf1a7a859374b702c1495f3cfa1e3c, @0x13816865e9c3fab11d77c37d3d198398ef4198aef7d2be932316993ffed50f93, @0x9d2eae8b326b6e3dae6059e98175007d8c56e46be68a529c1549dd43586506c1, @0xf32c59f8142fc5594bf052712fd184796325798ab98a8c52093699d9c549da0d, @0xba8ccfa7f6a1eb775ef5adbbc3bb1dcf74d7b44555daa6e753523325108d941a, @0x7b5661980dedfc0f5c4d87c714982b7220fb04c376b940d0bee9df6430ec3d95, @0xed1e7884ae7ff2df988cf0dfea294f39a470dbb98a9ffaf073c4876ad043e1dd, @0x212822a256664ca14ad4bce040c343bc3af1cce8f36779e505372adfffa5c52c, @0xbbe7f38ef7d23234ad7507085e681225f770b44d3382616765ec2f0ae686ac6c, @0xfd8c4ba5a46587ab818fc2bafde584a51c3b3f417c03ca87f66bc19697635677, @0x1469d06cb4ccde59b7418a84d960028f91e7691d882e0c0b699ed42cea1c84d2, @0x9ade67fc7a32a994becc5d79bc29afff3c4724b770606996483f1560ac7566d5, @0x167473043d0de498f190a616292eceef0acbdadc0355af8b09764d189ab5dfb5, @0xfba3760e5b44b69528b5b11706cf97138a8db70fe95d7d570ce3f0da19430376, @0xfe124a8342a37e972685a01ac707e902e4549a9dffaed505ddf3a7f9b0492a70, @0x24a50d6ca3a97ef62f2d607845dece75a775a9e8505fd354a28e3e6aa86c1786, @0xabb504cdfbc2b58168bbcec343f60779f43e42acb6884d788154f4d345b321b1, @0x217913f958abdce8c9de0b83c9afd99df4876aebdb5b68146849aada322a3cee, @0x2a56da73cd143d8914c01ee68288269d41b4ad74b90eec4eb841f9eeec06972, @0x113d536ff6b66a08796f2240cc7d267b54e5e9394615b47ddd971ea3aff75473, @0x78dfed6f1527e80d8e8f2aaa1fc8998e76d20095d05f59d0a21bdf87766872f4, @0x1d0165b1753a654068a3f6ab1101cd154e872e739ccce2819baf3cad5bbf952f, @0xa9b2b79685ab7630a4981981ded54ce6cdad9fa96e65865815fa3bb0c7883331, @0x20960290b4160043e29e93437a0b79dd627e45b0d9571febe42cc95e80eb743c, @0xc866571441b0b8b500b5c55a9c5276e337c5537280fca428a93b7b8ca524cdb9, @0xbd7454f5dc5fdfb4fdafc640650d632eedaeb1222128791bfa78d60966dcfdce, @0x5a1586b4b605d460994b799602d557cd655b3f72c255501bb230ba3c543c3316, @0xb76eddd7b26590152f91a82fba180f3740f02c85c5223725d14b2fed2d5cf911, @0xed1b7ed555a9bc4e9d60d23cc41bd4e0b28686e7d8d910d0c0df393ffcf574cf, @0xebfaee1a3185d2837560dca6d92e7387b21561d6f5f094505be342f270b1d5e5, @0xa20f61f9ae73326d3d30f08a6e19c823bf8e5dd7e803a394a88c0c335ff6b04b, @0x28eea09ca4ac45591063b5da4b2e94566b1516813d2619b62daa953133e07b71, @0x57576d0ecd9b8b586b95d405bbeacf98413ab7c5cb9a18e900e32af9109778a2, @0xc548d85fae7261438c71dfcaa5ea7958d6c4c82b793a92f2c0321f06e8ac55e9, @0x381ba84d1831030acd8fcaff71e534c66056e1e11ac2a3fbebabd50b18c0a45, @0xf759490a48022335d8f186a9e69b583d5f98dd4d908564d6a5aff59a75705b31, @0x8220b5ae0e93be19f399854e1b0e85f10f431f2ee68a0db966c7d61a530c99ee, @0xa1d3d9bd31d20938a4eb898a8fb52fa3ef53f2b9c52159710db0f50ebe183b2c, @0x15bb7ae071f6f10afe4e49a63416b4010dd55ea63e5b21bf4fc87d2ae3e7e2cc, @0x563fb2e29f906c78d5eabd5211ad2e1b6dff7b614389cdca136879f389669f8d, @0x964df161a8c00eb04dbfe9daa2dc025e316e0077bcf56406d51bddb69d8fe5f5, @0x381a47a012bb5413c47363f470fdc2463ff62ce0fcc631e4d0a7e10477ba33f0, @0xe7ce88bc11686eb23a4306a3dc3a125d5017fcfde1297327af289ae23073cd41, @0x3db6e0c9bcd677ccb81564c2f68d117afaa70466e41085e417bd5d93f83239a8, @0xccb6e2bd9c100ada8900e93f376992b05e0bc41f2dc95095ede04ca2bcc5babb, @0x81d16efced7f753dc8c6526468244cfa9640864a677a6927382b09f08e964ce5, @0xc762e82de9b3bf41a3d1722081d5df96c8551f197d8434e2d162de1fd5479fac, @0xe384e7dd202a599232cf89fe68890e1bcfd6c22c6de5be7f63b7784961ed58b6, @0x2fac612bc6174970d60a7eef81256bd1725ef43ec4544a60c7e10037fa23b563, @0x4fa43cd4e7662fa19fa1407584ba551517c3cde9e42e4ada7a38873b12d7bb26, @0xff1f9c7624eff84fc1f27a15260f3412b0d6ff1d79d5d3eb69338c63cbbce766, @0xf636e8c638d844cafed2ab0e9ed36f6d2e5b71689d9ef8dea7ac3b3c367b52ae, @0xdad3e3ec518a7985a538103832864d5bf33c904fb6648cf417dca7ac01f32735, @0xf9057f50548fc014b1be42fbbf76b24365cad43e7f869c458b582c873d546238, @0x1df8018dc0edb1a329e89bdb502dbfe7998ffe95b4b636efc202fff08f5f22ac, @0x22759100647834a7782df84fc14a3c29f661e7e03f6ef5ed94cd6f3405c37c53, @0x90155ea03b5df876f6f2ea899b3fa1714b8da7b131a81904f441aa938c149cab, @0x77d11ec2e08b09b3b69257b1a98d06934e5134719974422134a0a76c622dd8a1, @0xf3ebbd1a713b8c56c48bae473c473b2f3af66c5d8ceab403d13c4fcc1336862d, @0xfdfe3bf1e404c6330081aefd9feff0034957820878a917d31f8d69d2b71178f1, @0xbe0a518622859f944b41c0f87cd5c0bb51fc1f8f27b6dec85443630b46437f29, @0x92977b319cd764b107458ff8fd2924a80507f73f82021a1238865b17a0518433, @0x88ff50a98134d11784cb0233fa111d1ee5d55f0dacf133af853469b6d92aa9eb, @0x7ffc9c6e66080e7ab3aefe4284744c66a625fecb67b714a698022f4710078118, @0x7b0f263c21c1c62c06bdf409a73114afe187f07854673ff30ddcc46b12619edc, @0x18098f219928ed558541a385ed3e7f3c5cbf074d2700c38da289244e88d123d7, @0x9f88b2997d74d06ed56e3654f963afc058ebd5cc49fc2428ebf2c424d216f900, @0x744701ebd6f917c89433c6716dcf375d702e89ba85d39ca76f527224b6c586a5, @0x256fa05428de524d30fbfa43600738274af3c014775ad36c6a284e961c8a4288, @0xa93c682d8fce22068afde67f9a159f297d20c08416792efdfe3550cc858fb1f7, @0xf345d9a9d9d60729e57eeadc81bbf38bb2114ef18119a82057b072e903b3eef3, @0x7829cad804d83728dade4c0c7b749927c2423d03d18d747b212a69f5a95537ef, @0x2b70c3ab92a4cb7f1a7acc273e1e591025425cc582608220f9e0c4462a7ddd64, @0x2ce4e44567f3c79be8185e8cbf162bf082e88db5fa653a9c98b636944df41c12, @0x36bb45d4357abc5083711d6e41c6cf578e5dbde8c87783d55525fc4a46b64eae, @0x129fb3b54742d2b6c1725ef3b336841cb7c0ae0d7ad008a390b3b46f7bca6404, @0x6c15edd401ea857135c434cdbfaa112b7ab0ddcb60a2502b825b51cbf46ff237, @0xe6b671d9e4916c1f6f4e68d3450849d4c9cfd15b7778b64cd4e40da918bc3ddf, @0x203f696d743fa2c8bb79d7a8827dbf3cafb16fc1c8416c992756c2a24a21e334, @0xf7fef00f0980a9d1e867ec5e444c65b4a8cc7161f5d94de9266f2b2f9e42af5a, @0x909c50930f89f2bc899e2bd683c8b8def8cd81fe277f968eb91bd181848ed9f, @0x32ad2e0e3e9d993e44416f177903eb46f4d8b6a0479afba67419f44c8d0d029f, @0x96879db24a4e8e0ae5c1381179444ca68811be01fe00441d17d3b500b152fed1, @0xea868740da21fd7721c717660f43b4b1af458911a6c0a06709b565fb461685b9, @0xe80f0e2470b80e4bcafbab34587ccaf064e30bea78528c5e203723685fc60bb8, @0x6cdc1414747df00afc47e9697bae519b765b9857bec0ba87397b55711e99daf3, @0x7e7bf38e7b23c5cbc0762a2d27ee14a5cc6e0db01fa32bf778b0a14fa5f5cb3c, @0x33c3bb2ce96349e1ebe00bb23fca0049ababb7c13571dcf120d4782f5918c4ab, @0xf74f9a12e7d8a7b823a957bbe106e0d377c73d5c98fc0a1b6c0c705d51c2df8a, @0x142d82e216e176b7afbda8809f1edfccc84a47b096ec5ed3a97a2939fa79fa01, @0x4e552389eaf7d7232a1b7db324b3632d1f67f3f2d5061ba5136f02b032e38e51, @0x4f4ac7a17639aac4c695af7fa042ab5dbaa7653a79fccdbe852e70a1701c468c, @0x814e3bdb730b93f862d2bb44584cc75408aafda560d493f3bd64f55e509abef0, @0xd2f9cc380175eb58f80c2e0a0660b3bd0e5257b16781f7fac30ae5e0282d9034, @0xc3a31dca2b06bdeedb8ead2023bdf7ce12e0bfa8266606863ecd8366da83029c, @0x6696cbe849cf3f0cfa4b5cb0b64370de5c1fceda69474aa00ff07f9092bfeb10, @0x9450d4725ac78ac7609bd5504159195a76eb706c5925a0357b769bb7bd3a08e6, @0x6a2ad482b8098803a8ca4be8baa09adf5b8927b7efb0885486d321bda6824a23, @0xdc7786e6f37d09859612975febe82e2d5edae77e0fe4770b60913fb5df911026, @0xa3aa97905f44ecc41fd5afd95174cbe751b1034d541164a3cec36bd07894afe8, @0x4b4acce660a97e8fb16ccce98cf3abec7d90d656ae566f77ede6cb73f1026500, @0xf077c9a7edbd42a6609e7b610f25e17ba08ccfb168ec4d745e4e148a26465ac6, @0x3ebdbcdeb21262063e6c9a03dc0b1e3eced34287f8757fc889d67896c3883157, @0x888f442dbb47eb33d06d9b9cb9fc34fe403d7cf52d3df294dfaaaa6a0c33e38d, @0x8cbb33708ad85e2e7cd4f33f557a52a0b6bc64c3434aec37980b9859a45844d1, @0x4b96f5ef7fb80cbc01612ea80176d8d32b407a9b02ebf565137d53ee478e8eba, @0x7bd123bc28cfd9a414b7fdd5ff83f53fc48546d1c735c2c88acda2d86e055295, @0x9234301e20c2f939567a20bb93fd16f3d019653b7cad12b323b7fb0703327c3f, @0xbfcb01b4b2253f66da3be9089514138d12b0940b93ab6c3be040483858bdb1b4, @0xda22c32e133d84e8a27b4218b4cd1fda0974f8bb810546fb2f11c9e5b92d6c9, @0x4e7a915155d24e6c6831821aeb83edaec24f7c27a61d052559addee1fe21bc81, @0x2f3633c2135ed9590367afb66722abaa949ac008c8e5a6d8efb3bb51d5c9fe47, @0xe6c0397cbb03a596d0a77b18a085535bb17387e2bb8cf406f3dec083b780cf68, @0x58416f59afbf91d3cf4122ee1d8d17b65424344979a7420cfbb77cfa1c2c6d26, @0xf0ad81f0b87922d39c8bc50a1513f6cee702c0eb363c0283a7cf55aa28f0f195, @0x88018666fab2d51883a5f98d8e3514d96cc990a6f1c24045ebc03952dd0a97d, @0xaca57e7de716d6383a3fe11a1c3e7f5fba3a02c0a60c2271f4279fe8a6e8131, @0x5f6b5f104830a632860124594126c46f9029841732b774866561883114b559f3, @0x5f2067f8f920800e34615dd957d09a7cb80a07c14c35739845e5ccabd8782d68, @0x7b84319d01f981215718750fe97491e195e212c3608e26ea810ad335cdfc494, @0xfb2c8694be0eb6ee9b67b6314730607e81f2459f3a275484d070f7952915076, @0xaf01926e6046951aabe368836bf0a539ebf6d88804792ee45f7db80572d4094e, @0x56259f4668256f3da2e3d799ee0c6e2fa871533469b1eb1cd25640b61ecf5a43, @0xf69deb59a1a98d04a0903ca92c8dcc32bddaac2c8b3d6f89c767b4f78303dbb6, @0xa2df6161f681c8f1ec7a2f7394e8045e550634b7f11cde28a3678355b402fb9a, @0x863f2967ae11b92700d233bf1324d3e525268ec0a9095343f8af542d4b5201e5, @0x7d0822393ed81a3c23e15a9c03878e2125effea629c15f43dea13379c86e7c93, @0x769672dfd6030a15c780963186f6c092146c3a6ad66b398f88fed7061103b086, @0x8eaaa4dd52bf61b11d2c6dde1fc6b1be2ba3c29981742b87a35a5c1dc2b783ff, @0x8203bd5014c28aeff6e8bd716d8b31a72d990087973fcf6db9b01e561be215a9, @0x17ba85015ee6b1126d0c05cf559c70fe8271a63eec7e19b350365556951fe8e5, @0x5c9b0ca5542ad7de45f5d98cfdab27349923afc713ae0eaa07f6692b5553efb0, @0x4cedb4154176e5c13d195cf0ce3a08e08eca7f84c25512291095931499b9d84e, @0xe30ae5fd14552a26a6be7d1dcc0ecb7cd502ac3926632e8aa3096c43f42e9543, @0xe41a2190d441b023519f5675bdd6f9f2afbc27b674dfe0d39213bf89e68f888f, @0x562dec24a49b492602a940e58b93366879e101666875938179379c01e09c9fc9, @0xae94cc0cab4aa1e5f6f3dcb0c097ca801c0ff761a27c9f35ff612018f92b2770, @0x8a11108eb7b82e02b9412c8958065d46494eb4c0dc1372af01fdde45b4deffdb, @0x9307287f6914b8cfe61e01157b8ee007dd44e7e2c7878f70ea8dd25f27ef0793, @0x8b9e22fc1964372fd7365c03782217bedcca2fb5f410c5b7925dc7d33e0a741f, @0xd4f7fa3b9193889502bc5b6598a09e98f90d55f942670282d10bb2c92ce42aab, @0xeb61d7e0a7c605020a1d9a6c149e04ca537000ab3aefb519f52e62379fc3cdaa, @0x7afc21161fa2707180cf35cc68a021830a2a3527e21e12a3e1ec3d2cdd1d04ac, @0x555534519e4115edab30cbe1e70b36cbdf75e6ac27d887310161b9cee407b600, @0x17d78b53adf57b8653bd3035724b2a4ce6b8d0222ff9d2d58eebfcd3a9bd6c25, @0xf55798b2fdf786a931cff6992a2cd5fc1030f1cd99a86d26585f541daba54f69, @0xc99c1f5d733765cbbc65e22bf67da98929b5fdb510244bca798a1d37222b74e3, @0x474d61e10030f8820fcd1adab56855df0ab18463d65ee5f7e07eaaa678e8b4fa, @0xc7a72e270c1b69187563baa3e2e5e3677d0639a1319fbd3f00dec63d0694b1bf, @0x6d02fe654cae961da21d47302590193e09b5fafb7868bbe548d219450ebf6249, @0x7477c7db5640ef466db49d66a95f95299f0494aaa06bdbf48b23cfe3e587bbed, @0x2f11ed3b34ef2ffd9dff477886436b3d7689ed9ef65f7100e3993e34eb5ddb7a, @0xa8bc90678b9f1bda457768d80b9007c9f9c8332dcd097db3cc098c9d8c3d48a6, @0xeff8484df5f92bfa3d8ec9e41a34f268b8fb33ef46d763536f9d4325396818d9, @0xb5ba67dc003887a3ee3c77af3ca94db2d540f178916aefddaa845fc9108b94ad, @0xe26a39b41e58d057da9a72dabb29d0127cd8ef1248838038817a427d6d6ba1e2, @0x6d81207c8703d79366d0e5a1ea741f7c5dedf09f3b089786084ee071568222a9, @0xcca388afa0ab6f7cd1df568ff5c6d2b61ef02f8cdc8f5547030d1c0ceed56047, @0x91f5bdda6c4eec4644f4e181953a2f534a608ba44c5bc3128ec98a18404c22e5, @0x8b7740016aa99d0898d3f6634d0afb61f621bac05c2f6cb71c50d9aa449da4f5, @0xcc20ce9cb07f01ed442af3927ab1218aada7c9a3d0685d6562257a57279f097a, @0xb4f56c0fcfc25b8cb607d4bc364e0f0d6766f37350c4e6509dc098599e8060a5, @0xbf824efd6daeb58c7384ebbf563e6162e1c1f0a1658ee53b042d6c42aa004d5a, @0xf2b302f7d12ce701b14ebc17c75a7a23e33439d18648cdbb7675062eb237122e, @0xed0e98d146b4265c1bc15b1909f828eb1cb46b3511986f91d020602e95989c55, @0xca7cca3eb4b1b79e30e8a16b56259909bad57bb03e55682e492c6377b9c6c511, @0x7c7dc4c2a0519579ea0475bab98af253934de6fc62c039d3293f88245fe6766b, @0xe9bfbf4d24e3cdf9dc0c98c9a2ae8f5bf8d5ba9273f451c699530a76b1410781, @0xdacb1bc6262e5a488c99d87e5c7c360810761f8f01a133f3a23a6dce11b06518, @0xbf5d9c58f629b90a5f3641fa33cf744f12e2ca955f8009ddf726555e84f71507, @0xa5f978765e98993e20e9f883cce6616a3e244bd01ece0f9c9e2a5b4c06022954, @0x85ba7a7d66cc3ccc8b48deb6bba9b1d04ae60817a0238bbe87a71e046f311235, @0xd62f7e12893f5189757215266f2146340eb75657da7eea5ad6d01572491870ef, @0x943702f5e27a7e6f3cac25fe69a535b912418168cf829bf64b16a70573fbea5a, @0xd50d715475961a91f9d838f378529a76014cc227a2ac97d40ee8cf73f9c107e, @0xaea05f5fefd50e1b29813a520df13d8c1477896add050c37df55e893ec607bf7, @0xfc7bfd04718bbf26c563febbf70aa74e68ccc39a0edc4b2ac597d4e20f19e9d0, @0xc5d92956124f6111a34ee0f7c65dd34a9581533c403ba458a8261b7b0954ace7, @0xdc9dbb2794ab90a675d63805850e9cd3885c6b3a32f26fc4fb33b75987adc0d6, @0xe373bdbe35838b8b5122e1adf7be48c14bf2d69f871a7c80d0964afa476ab7b7, @0xa7a214768bb242f2b90c85e623ee0a67d6000eb1931d518f04bef1922dcaa0a3, @0x6919555971200e4779aac5a52da4d0726cbbf41e4fb8035d403c53d968f87f4f, @0xfc046050a1bedf8f32fc268e879c6dc2d23fcc8ba573eecef8c6f9dd72021fc4, @0x41c699cf004a400cb7b41f5f0c23ed6dc897a727bc7ee33c38cbcd9e6202ca4a, @0x11da686b14201359d5794b6808c3bbc6cff37b85a8662ab5554f83800dc3a80f, @0xb96fe253479b9ff30366381593ce8862bf7b370c056c409d00aa0afa70dfb2db, @0x2602f7475ff66518eb9ff54f24cd9a943fadb4f4ce9089c9ab36a364b84e418d, @0xab901393a70ba938bc603e13b8c86aa99012923adcc9c782c4b72cd6a862573, @0xa7b75a84964f218e0875c609c8160a46ba5a7a0500c48623de954cd5f06ae4f1, @0x885c5b6448a65ccd372617a65babc43688512aa489f51e7bb4c91dd39739f86, @0x96cc68a01b268eed46fa795101f27e3e73a7f6f992ec6eec8b31cec8c8cbe61a, @0xe47cd53423580fef7f899609f7f1fd1a4bce987661003d65ac7068f3274822ba, @0x604d23e1669345520b953dfbc4852dc1d390f53fc2c84988624a2ceb2ab5166b, @0xc301b5c74233f115789ae68f716b11b284f0c48d3cc8addc23d384e34ec261a3, @0x9dad9d27e5434bab729a13ea7fb59526bba6e1c87cb99c67061db87dae36b07c, @0xeeb5b76e86306830404550aff107e0bf7344fa64d5d1cd21f54d8111826139da, @0xeda3dedcebd6af9db5f96f9482aaea2851f66af8718b815b87b4f4e79ac21ebd, @0x75c6389a2f90b065391dd2531d17b43358532ee28323e4c91e7f8b68230a653a, @0x7cc045bc7e7bc22402f80331ecd4e466cca0a8d08a6d737434de8cacfe6b1209, @0x962210443526adcb99b3de70aaf4521462847074924d6ab61d80964309e0f586, @0xb2d4357964e16f24040dd982f3e2437d5b964f3af5604cd881fcc0d2b6849bcf, @0x16a82fcebfa22f202ce3b4686d337b332a0ef7b6ad2f192fc663c31eb4734d47, @0x3e5cc15058de6e378e3e080bb9a6687d86b5b5d78f87ecce8f80c8c0b85fa775, @0xa92c86357cf7bfef1d1afc1c5a39d0b3805d06e325a3ebb8432510656f695f2e, @0xacf5c314988bca4e88d5fd84fba06ca53d915d13393269102e75a1e2d63c9430, @0x684b05a42169fea695943b36d82662b99083cd3c01d632a25ccc52c2af091117, @0xdeed06cf30930aa53f5addea5f68e507bd3c2aaa993b09eae916f509915339f8, @0x544006ffbcbe93a3011f67ff57ee30e36e3b329ff1019d45bc6f0ad2865a2582, @0xffe9c5231487a54bfd246548815c6855220aec68f0cdc17d738336581abf6859, @0xf3158daecfaaebad21c1c873be3e972d007a8a1e7644fc0aaf5d5ee06f2f37c6, @0x3a7f4e4528a0fe0f2fdeb034b0d49a918935fa83cd384d43d86c36430ab6d810, @0xca0c3ce06e0fb5ff26a619856343e4c736e79086cb9eef628698e10532ee3a5a, @0x5e9b3a1289fc5dda91b35ac96dafb0de774af51a3e5f33015e1bd9eb17e4c341, @0x4267594f944dcfecd098f85b5d46b538bda19afc3954ac788e74ea450e9a701e, @0x4b926e4e88d456d235dcd8b8e14781e3171a4dc0883963e382d320da6b2da366, @0x6039a79b91ed89bbd4a7d630825ae5911ba2c18c0763520bdd6779f09d6ad4e3, @0xfb858380bcb216c525788ed0b115a6a286f76495013f0a7d0acd66fe8a82f067, @0xde002599a066a72e4c9e2d4193dd81d9e784d67f3d957e1b08bc3c84c4dfca09, @0xf42860de915f733de89dd2bef5daa71b6fa4a57d9855b96a08d1035fe094e7e5, @0xa3c454062214ea927268feff3f60782bbcb5a02469797c2cb8fc867c659fac3d, @0xfb254f9879098e15efc3760cabf76a630ea1633313eb5e1087f3cf20ea097745, @0xec98e01b9a0ea631ff2624814b26a81f33fc213f8b32dce8e9907c8467d8e78f, @0x5d8b686bed248db3358e005bc87504a983b24c3ec223c2cf0db110c8a96ff54d, @0x5394650562ded436bf65f0ddf3d5fd15411cd4212d002e0277d6fc4908577de9, @0x9f6a403bbde768d0b024ff77a5624aa9b1831d693546ddcc8ddb24c8da93cd84, @0x8a8cc705fd08d8e8f2001d91cd0ff7e658c5f94726acf45cea9ee4de20c24729, @0x89f0a4850ab5cd5c8468a86fa7b0129987e9c0e9208537095ed436a12a300e83, @0xa5cd39e317ce1a784781297ceb20d9266db03512bcbff9feae5dafa9d3863687, @0x92ff225f6690a41c5bea78e0476853c590a84a4248eb1f6fa2773e98b778266c, @0x803d33320fffb3d7c08d4578ba6caf3ac9f90ce1b2a42358f0544faf8df686c5, @0x11e5eedde46a5cca4b72964602b2de1bf9938a66ddf1d6010bfc3c2609017688, @0xdd32287d9d0224a2262b0cbbc2c8bb6a21a768ef4276949a5df0efa10a935286, @0x9216270e817f7e8a46fab469b62da3d81583216d5a826fa018f96675345fef25, @0xbd0219de64971124e5c285b749c700972fb6d0baca7381accc39e532689fac33, @0x8f9d6984d8bf1d5d72a9cfa4f938d14f3afa91d4c84a756d1ca5bfb20d024110, @0x39141537e7b29684a2214b5e89a988ca8c4460c64ba019aded7cb574124ad4e0, @0xd730056734a488e83877283629a2cbdc0bb3c5397ee82302c5eed4788d22cabf, @0x6466446182a6d062eebb26c81ad4dd8c0778ba0e70ffac4d48a2ad62b8680f79, @0x313eb4f5ffd4404b6d53c5d0b2b39d7cbb3b5f25adf5cd6f90189dac08bda3ca, @0xca60370f1d4c5d45dc9e5d6f02a2fabcfda04db3533d37a14a6f5f072f724fbb, @0xba01b1ef4fb7fb409b574d3a99e5dc4eeb5f87aaa7e7a2cb10fe7b9925edf2a7, @0xed2992b4cb22afa6702c2de35329ce6fd509d5f6de7cbb8fddaea8a07ea1db15, @0x638bfa2ba8d99ea10501187e761ffba73e547ac6332ebd3bf417a21924b9b29f, @0xfd278c04dd15ff28d51f84f2acb0dbdb60a0c767c35236377289bc6c35fefdbe, @0xf33ab9913dad2f0b6928155e176a1b30daf19d7f6000a03bdbccfe50fb1cebcb, @0x8bdc2832493a0722b1681b1010d1989d04cb9c4029c4c2d40614fe3efd188836, @0xa0f3c35d5add7a1fcabf9a803d96c2cd5e24fda0810d25df44b6abcc47c1f7e1, @0x8a172caa0c0053a98a7d9ae1b85c043fee143eada3cd7a2455f554234dc45742, @0xf308375ae0d6c8c73af07e423f20bacf7a5692ae8a7a13f51cd86479e06ab34b, @0xe38338469a9a5f15472badec93971ed7a59251b634fe51f5cbfe4a53ab428ae3, @0xffaba4a4417a93774d1761befc528405c53491929eacb810a4327b5de2a8d009, @0xcb9bf53b6217c677873155c3751bedfbfd3ef5e9d4ffd8b7cd7501227cd5d399, @0x114d1d14595358704f90ecef8f0d639812163e5cf700076923060cc27769a5b0, @0x723228f10d96e501f36e789bb6cb2eddb5c30b64d40f8062bbf34f4ddaca01d4, @0xdbf7bd89f11668b1951d3745e08538d324d1b8e64a95a56ec8ec9955ad429033, @0x4b8ce48564d559536eb2e02fd0bf935eaca61c95467c43f943ff67d564234a41, @0x38797c51f2b398c8251b4efe549890c098962fccf51f9dc21351349d38301524, @0xf93bf762ac96495404c5387cdfed1e629d5246f8c9a51088be703f63d262e174, @0x84be5670d9d5ed77f825067e78ce1f679c31e72557be5089e5eee28503df4f86, @0xf565085d529d9f32a8ce01c63babab9fb49b2beb6d06cbaaae554ee8b263ddff, @0xc97db6730c4eb9f53ee01936a49cb2c0efdc0d442d3fc8f1c89bac2cbcd8c3d6, @0xfbd6a8efec0085422b887dacffe224f8c898a5f3384b3db83acc60d01c7bac61, @0x23043c6a8c877d8838cb8ba508d686f62900028ce77ffe62f81325c797093407, @0xfddd6de669025470e2aa03fd92ecfe2e58acf40147e5568a3839607a2f32544, @0x89ff2d552c31542336580eed46045c0337d34f96b99e8e071899d4c590a30d0f, @0x3b58dcc5b44a54ddb15909852d488dbecac92f44d6dc723bc0d18be2e1300c71, @0x1a8b5804e0891245930cc37045c436697c89e79f3d964b3a9790b2f45f9a9f3b, @0xf7fcb3a9e4b43ee74a44df070c7182e104a58cac4810c6dc47e0979bfee28796, @0x287711fafd8888125e5197224abcd20fb66ec5e13c62ab5286b5697f17a66e74, @0xdc40cd98bfa6097325a89c6dc0b0582347443d7197ad2a17237f51d9cb54cbde, @0xd010d4bf4a0150f5b07bab8755b9e92057fa76c22284026f169443b60aebc384, @0xbfef1092a0294ed3897757ce1f9cf90f2c4cefc72a055a704e94a0e0b5d1d545, @0xa40e249f1ae6f0ec64d7220d21051ef12401092fde3fb167960a2d0632e9459, @0x1895133f70d799132686963d5fd51c68a12f0dfface388ed3f60566254ccc96, @0x924df7d2d7c1ac7fcc9b0817204e0d55dbc7b7e34870a29c7ec9ece76ad7ed5, @0x6a92dfce1f15e0874c04156d7eeb186a40098d636496834c2f70dd682e43a0a1, @0xe8c8a15c6a938446a9252ce3d9127772b9b7b1d51560a7374d582419b89063f, @0xfda37ed71f3cd0da380b02aa7f234ac5c286cd7f70697d7dc00fa9d76ebcc0c1, @0xa44f3f985445118a8dc566f3d850e0bbd60b884d0e65ff9fc56db7af1bd8ebd5, @0xf7713aeb729392de1c4f52456159b9e7b6aad04bcad6a6ad829b6d4bc394de43, @0xc543e875e892e270cf84e05231304dbf921f9bfb46eeb3363bb5c1c67cbc6ad6, @0xcceb2ff930ecbd7cbc2fe5e52edc6dcda944d5253fc97eba3726a729d2ca7cde, @0x43513de2c9fc8b3904d086b537d2c61b2795af729c8b5d425b74a69d2f63927d, @0x2d4354ad8944478539073cba60c0eb5729b5acf3ce5d46cda294c1e6856c0616, @0x7b988ae0b4d046db3e490185d9c531810cdfd124bb57c0bcf19761a89de66d35, @0xe4d9c5747d9de9538e5030364f4ed8616addec327f28d386719587ee90f13962, @0x37356f3b5e77d168f51fe5b6b265e53e13470002d1c586a3908b932f077de460, @0x9a65a5b9d8e96d76fba177c9d25ba7b68da0ac15f2f7502cddec821f81304cc6, @0x29433ae36f632b4c8af5b78453b572634e764d409263e9c98ed3663df6b2a136, @0x4da6f7808bdf2f9b0d07de2e70713f91ce4fcd53c2ec65cde8130597fffa584, @0x5b80c529245006b8acddc37d80e1665632481076dc88f1ee00082dc727693fee, @0xda61d2a42b3a0ce853093e93310b3af1e543a4414d71f1cdae51735f62eced31, @0x801a78a38776c8dad67da56929945baf01e8dd80cc6bae21a2e5f325d26e353b, @0x39d261550bbe30ecff5a63f7e04f9479831d480cddb7581565f8bad5e5ead5d, @0xbbb0a2060d13182b73c33028865fd25e3dfa6c918828f1d80e2dd34e8e14d102, @0x2d1762b1a3eeb2d4d590cdccb44273c587acadf0c7aa8871f760eb3a3759859c, @0x3ca4a4f2ac25d02b858e6f8a31e8918e4be40bd657b4fd00df565db890e68ca1, @0xaedf6d0b2351004e21a768ca4ff2004e81efe129f1630378ccc8cdabb7c15600, @0x2085608a095ce720ca60054f39818618ddcc5453ec69daedeefc984f9a862ede, @0x8d5260b03921bbcceed72e3db78de06477f0651e798b5a0ce010f3bea7b0a4e9, @0x2de88d780ca1bcb438585ea62c58563c385c6a59a2ee872d5d40569cd84dfdce, @0x87fd6eea3e3eaf207fa62c1be5ff34e3bd49b1e287bc9d8d2194ee69a715160a, @0x4577474bb943dfbd5c59eb7861915bc690977885d1f2790ade29406f8299e7d9, @0x241852d6398a71c155f2846565352493744c29f8d9393d1c3507c5347d78c593, @0x47febeaed417cabd60a53fec44b5d7d93c01f798657bdca0a5471075476cb80, @0xa272a14ce48edba4715498c556765f4fb5278f59a175fa50174360f4d1758444, @0x62119ecca586888858fde9996cdc0c6d95493324137717b0dabe5248f4ac1710, @0xfdd354da9920c2e080010a6ee501df336254b835810154f400d9fa3372134ccb, @0xc4145cc890b42c1f6c4be8e4350ef3b03a51d66193d9f2ea5d3eb0a63a3f81b4, @0xd0c87d31dfd3f7c4074b3ef4d254ff864d107ed6c431864d424db7b9f246a117, @0x5e13aca0149933ff29444910c2ead77a62036dc0f9de99b90dbc24a6a5a6b509, @0xe1c48fb8b7a2cfe35e9255991423452f8afdc73c3e1814a18ac70b54d796f761, @0x5d126b629c95123a6e39fa9f18dfeed7028dfa9f73d85be4aee132da9678e640, @0x40529ef6bd12c77e9bef236ab5c0762b6df2ddf93e575b5b3397e9e5666c6e53, @0x1e1cf07568b438bdb673234d4e2f971ca462bb11ba266fd2c28654ce6122d178, @0xba0d07c6b5476c4fc07f9b2c05a79f168ac0f2759efc466f869b9d3e903ac321, @0xed5b37036997cd160ebf9fa4096daedd5f08b0eb7ee6bbad81c7d875695e9c63, @0xb533af9940451684b6f8df6279f9a3f7b8fa32581c8ab27ea56e092d9bee778a, @0x7d2038c74ba7f342782bdfde9f7dc16ab50215f86fbea35804e9decb944eedd4, @0x9a49bf5bad30ef710e389cc8a1d6ce849ad36e4acba6fdebe769dd59b87fcb7e, @0xaa91ac953abceb51d9a60c63f212ab27939acab18004b96aea36185d5ff0cb05, @0x1915879874ba3f972c919333909fd512a53de55abd7ed9b1f72bdd050a9454c3, @0xcd86798d20c01806f9300e50517b6b90d5366ddaac8394f06e159cd73edbd018, @0x6cc308367c4a03319fbcce51a7caa978dc97f975f934d4a5e5ae7c528b101786, @0xccd6a345ffab38d2c3d9ea4a6ec2b735cf40e2c5ea6646ed7c89acdab09874d8, @0xd3f8ed98f4af8664c71a96df297ac938da9dcc342d9afa6a5c395555537f1119, @0x79141e33bd50c93016537c84409db0e194803deb9f1902303b976ea75d4ec648, @0x12c7b9c34a665d9d2d541ff2d6bc91200100a0173699f3d4361e59ae7a9aa61d, @0x1a8c1d4a4cdefcd23c370e28e87e92b1f1472148f11d701e0b3459d8ff9cd261, @0x816619cf9e96d313ac19262890cd2ba77358de4bc7e248b34194a79f138256d9, @0xefb630ea6b591c77c0fe728acab27d101ebc3613c36f6a3f25d75b32852d95f7, @0x3ebdfa3a64a3b92f6148ba9e8d1bb6c6bc90a210357fe78c43c55ec65fe9a7a8, @0x5120e94dc9e877a73dd02c94cf966040a1c122bd8848653a8d79d445109374c3, @0xcecd457478534631951100bd918632deb66cee07e1cfeaff3d1bef95cc5124b1, @0xbcc68cedc987b251e601900fd74bfdceb4ca835522dbcb13c81f6568fdffc670, @0x6eb051446af75a0eb911c1355f5321a8a51d1c7c093514127b1f8e3b2dc0a2b1, @0xa3f887cffe81e7a502ef996d6f0b75b36978bf8a99f38d0324c3169903ff5ef0, @0x6f768407f12b99595ec456d511d7c6525896fb2ae8029329a1e1f44718d296c1, @0x5d5bac6a8193d7f85eaba937071f0330bc9bfc806643ee7f9a26028934474de5, @0xc28816d234ff3daaa91209e8f99e3a919ff7b03c8d301f7a91ec2dd5dcae044c, @0x2a80ad07adaf8c37fe23a7c3c192055f0c359f2f2248e2a1cc3055b6db72c9e4, @0xacab6405c4782ca71a353d9a01984cbd6a615f6da2dae1afbb3b4da003df3c05, @0x806aa4c2665bbb29b9dfaf02ddd9deb6a8e961d7cbae9b47a96992f20c372e95, @0xf62d8beaf5e83cdf0807b5e4d4f14e5561635a7a237e7a0b437f240b133f005a, @0x3c6437c94577367bcb4de5bddfca7962e52fdc416d04d00ea9704e553734681f, @0x839d2c7cb25778a10d7696c5e20b06379479d9ad0767c0fc866470d01d7f4b20, @0x35df30c497815bcdfea065377b1e5f29c80f6b9b6d8b23e596bee73bc55755cf, @0xbb38f281779487c8d8c4e3d0f50f70f4f2590874f03b425b23f1ce5e07899efa, @0x1e95bb2564c1b9704b0c00b2b40429bad4c0dffeb87fe58a27ec0ee51a10095, @0xe70e822748cccb45ae16e3b02177b086f1dd9652c60a2554c2d5422dd0c509cc, @0x36d3b3682ef9cd0228f1c1220017de33f00dbf3dc5e851746d0feaf9b304e0f, @0x9b4b59b7ee72899e479ae1fbfa54d4f9b1ba0d60b66466b709a918bcc6d9194d, @0xb8bd37fe6f7997353d5a7f24e3dd8461714c42bdbd80d4672abc4fcc1b718c7f, @0x70694808c5f0f70e8cd28eb0a4b34902fe259adbacbdd703571250d2c823c82b, @0x969d8e1c08d83064aa0d8353feb90eea29ab828a881ea9c19a21d6d4b3888fe9, @0x6354227a738e59bdd59f86a598ce08b722f18ed39dae1a249a78c21d97a6920e, @0x5f902c4d90510e61697fe26d6fef1abd651e712436a5561b4d1e342f1f7b18ce, @0x808c35dfe6c60a9742b23292f858effbd7ba8018d819e3f4873cbafdb61d83f7, @0x4227e4ab62563625d10fd2decf70d01c3eb96fc6805849dfeaf27295ac00024b, @0xb1de0a55466aef7069fbcdf3445447df42a57832e13600e27ef4c9fabfdcd195, @0x646861b716e85f752b1ec7d321d1ce315a3105cccf918f35c99113529d01ad69, @0x9edc8db7d5e6407a87bd23b46cd215a887d9dbca68f8d2a169a92226884ec332, @0x2dc4ef9c39adb0039721811bf0bdee134396757c6733fb63d6e45c0215867b33, @0x468df7882c491ee2d2867c82fe1222ed8a5e348ffdd28925ecefd5618772827c, @0x5b5be6ad213588c8fe972e5ec3dca297c39ae715d9bb6a32be27a491ba14e1d9, @0xa8322d280b88efa2681bd40c801cae030de5fe5868e9bd32de9ee9255e55acd6, @0x61b2a11af1a096524174ec66dee143c8e4d2e88ebc43fd2ff03678e9f4b143ad, @0x9aae9b7abde71306995b59aab7032c91e3d732042776651c700f9b2bea5ac4c0, @0x267b9723b02d2969d567e7625855b8cf44fa63bc49045361a4c75700aff71dac, @0x9528e8651a64f300f490013eabe7f299fd19ed89473299472a7bcc661285f6d, @0x22def29da43b294640bd4229b978ecb8494b9ab9a002ce43f2de956e4ef99090, @0x671b565123c8e9eca33fd17e40e3de99a5d744c95732232c6f1b937477d37f23, @0x6e75b4a6d2fe8952ac5038cb39288a280ac2f2d57c67277602c164aa766b8942, @0xe5c1f682c7c523f3fee59cd9dcfb5c735cc7f23c29d1deda90f2ba8a2c1d9c93, @0xa917f1c86faea98682a29e3f39f3569e9e3c576819e2d80cf236cd8aeeffe487, @0xf060b5872cf3ba4fbf06a9ba3014d2a5cf52a36c901031bd1975306093f481b9, @0x5fadc4edd0be5e22aed64c4a3cccb07240a792d19b4c9015f5790a3df3b54017, @0x4f385920066ea6d0df5acdad12fdffe43db73a08856b643308bf3850cd06b15, @0xfd4b7be50c38bcdb63c373c69fa5c28ce7711df39c24edb84e4222997ce86d7e, @0xcd14e59eb73a744f995954378b56b289841a330060d025f15385440c4b44f1cf, @0xbe53adc016005eaf8897b831e1bda725e09b3a214ee00ed20fe9b0517cb54137, @0x84694d2ea27a4aac2f3852ca2c4e178d2534c29fa4ecbd40762f561cf5e9e8e7, @0x94ef0cf35d633b533a05a5ce45481b60bfe8d025e7289e14bf515c787d5103b3, @0xb38e86494a82c1f8e18f3cfa841649717a0aca0344b164974eae2354bda521bc, @0x22649ac8a9f4fc2b037a62f769ba672e34e17e698155f3c8aa58e18f389c624a, @0x2c09b4dbd2f88559cf8c04e31dd4331d7e3580c3c651ea0781df3b42a3214ce0, @0x561e6622126fc1145a9a3464cba2e19121605127edae688a001ea8d05416c2b6, @0xc44ab4979fe0a2f6f9b10bc84966a2f049dc6d26c976956a771c9a34b66ef094, @0x4195e00669adc00a43b6978ea001aa292244d6d31d446eb031e1d88253a23421, @0x73492c092829d8e594d8bfa395157cb8ad39f3b6fcd4f90879a77670f6b10553, @0xf1f25824fc59fc37c9f9d218fd70e20c038af48de331e3ea674ba76f69a6285d, @0x66c818c0f37d5b45c51444518643762dfaa96eb9e21597200a62d0beb423c6d5, @0x69a5826c3720d4950ad05eb0d225330417a9eae3359da8b30547297c4078f7b9, @0xdc246680dd817e4a0d25b4d5f461b36e18e45722d5b22ecf09030f4f11048c2e, @0x74610d409713c9c657fbec5bcb5959eebd54cf8c8112de00fcedb3aedc2f9162, @0x137166916a63af0ac0772a35b658c77a3f227002c66d57164d5fd358dd44f432, @0xb4155119d19566e8987acdfbc61de66bfdf3ef1773620d8d5af5aae2325bc8a7, @0xb3cc73ed6ae93a9d9f87f71f2c9118ab60d1d43732d338b58170e9441a70b98f, @0x182c41cdb3efdcc50567588120944cc909720c32ea9e0ba3b96a313d22309102, @0xed06dcb81495a3d2fd3c4dac13fceee34243034a78d19a989ad267ed35d6a6bf, @0x94566d2d6bc418d174985c529dc62aa120346ee1114c64be2a822ed8d29d12a, @0xc4d38e4cd94af131f89c3e901f89aef56d4109a3bfffc412dde3acd25988a5f2, @0x2efecb2d305c9b009e385b67df3a4df21e17be0a0c00c6815b7f987a411b8bbe, @0xdcce58d42df8030fb24415964eb618751ef80bbe80c28a9858c75be3955b0efb, @0x6ce840af1e2b02748a14358fc485c1c0deba98116d78ed6148e2219ba2e862, @0xb7bf34ec4f7936fb7e6b7da95ff7afa8512a0eb0ee12375096a3cc070737844d, @0x957e95c7bc62be846e818ff6cca3f9d909f93389a14c9d79802f9f92c2d5ff7c, @0x341dc84a15adbc8e98cee50f0b5086201981fcff63808af784daad0d0166d159, @0x4f041134009a67b70a5a22d2577b4305898b2663f5f7548d68705d2b8bbed616, @0xfe0dab763c3db19a507cd3ce1709afa43eefe0114a37503df9a9d58d7c0ac7cc, @0xd0b3df998b4633778613536e7ee44478f90aabb1f2d78d95592bb2ef1f70a688, @0xc4f25a610bd3cd2864557ad4850d91ec31e616bdc1bac463be520c2651b812ee, @0x455a4456864b80d51364308302ec392f98ba8b1a30dfdcd56e8856a8de188705, @0x6c9f1114861e0e2db0dc283fb6ab5c8ac9b6c43d30552e309ecc69f6f53b8bcd, @0xc7e87256ab0dda97a8b61232cf2f8fdb1141a8a87da0150741ca38a13807eb29, @0xc01a6f9d9290514fccfbdaf830f848a108b4d33ec44d73b2810dad1eb7de8c26, @0x73fd69f501e1e3011e5c9e6cd580e76366c98090b9564d79bf09117c25ca1e29, @0x81b9472c5e292bccc0a201e5f2b44f2f195d191a48f1712e910989d0d2500544, @0x3cf91110380230a88bac8bd0868f8858bc9ee919fb62f5b47f7057dbb8a140, @0xa5899e83f18501e35f52161575bb289798a0bc3b7c8ecc0d33348929f1f7135a, @0xc6164f3a3ce3b759aa287a817de5ba0e563a273fc64da33c61e07971c087abf3, @0xb4549b67ccf0920908a64f76ac9b0a3a379e9facf84ccb38d5b29d2773e2ffd, @0xa099d771977145d9fe10a78a5398a864165ad349bec24a1621f439bb4b92f542, @0x40c4db7a08dd659e4c3b7fd0bd6e4226f77a2eb1adfedff80fb1c743226da57b, @0x128a3411acccf890226bd3e253306a3be4fbc0f7c33c0ac3a331ada56bae7678, @0x8381035a134aaef2aed833576ca774f2feeb5cd987a0ce4343b66b6be137d07, @0x93fb1b44da493a861c6d437be08761533cd412cab5b903a411bbc6e5ce8dd3f1, @0xfb219715cc89ddd57cdf9182fc16351898c65f8a5f345e1eeac98ce315ca386b, @0xe9bf52b2967858a26c0f7548b5309feb0a3f4098ae8e3bc3cb497790963a347f, @0x9c59f90dea101f01abd06b3174e97098956776fb3b02472152292d31ce59fca1, @0x49f9ba19fbcf8ef1e2624ff1073aa18a1795adfd9899c4264f75394f4dc0a85b, @0xe70540b837a3924c737c192114ae6df48a4aaee17252b5e7922423a3b7d49aab, @0x1833bc50cdebb9760ddbec3cf42ac4f12f64b80ff9ca28847eeeb8ec83e5b458, @0x9bd631b289d4ee7adbfdc79b3419662b60c9c7837038b7a9341996f9e3294413, @0x97bafa788395a42c9f7f768de4d53c2a57a6955740b3b9355fe9142df4656fc1, @0x2bd7e29c413abe66ec4fff677b590718ea5eb29f954678b4d515abc2653bd3b7, @0xba53933981b8637a794ea2d94ec45a5c0f4b568db647b1e7787e340aa5d8fdf3, @0xed2f1164ebf6617de1103620c73a3429a1e1dd72786fb779a4cb0a955cf56d00, @0xe6f175a59c13f81c829aab964c92a10294dcb90468abb29e4a83276ece8b9e84, @0x9ac9ff1615b9907408f50821c841a60b2aab65675d138e725c232ea9583a5014, @0xf4acfcc8f2ccf8b07aaa57c838e594a507df53ef35f39287ae236000f0a3fe64, @0xf60dc499e69e790e4c8fe727c23c7d7584082b0fef0533fa1cb4816accadd867, @0xa5a6f3c6ba806fb1ba2d1f6331843897bb8344a9f0664617f08282e50e1ba0da, @0xf2d088885859d7abbf604f137ae347a3d1e06b3db0441c6f1c931b3e179771f9, @0x3f2b858fa16b92af716d9407972db10a60142340a77117de3745bd6b603351b7, @0x59f745b9b3c906c76c0ebb2a2a3b05b8c1d68e434193bf004beed93538c9daf, @0x23cc41f14df6da05a7f86426f66a188a05fcdda6fac5d453f249dc7acd5c7a72, @0xf902254ecd29d28918df23375dcc466eabf914aedb33dba0097b4129554530d8, @0x86e610927ead23b713cf050a3a73ad1c24ad9edf75fa702baad3f87a25a9c940, @0xcac57eb617fa08fef2d1a670bd7454879aefd58af69a115b2b4778ebdaeddedb, @0x1606235f60babed977397bff63cce4f5565fc3b5a9a28162196df180c2278738, @0xf41b1ef98a81906d65976d10cd9aa786bbb33e6df09fa00684e1a8c7aa47cfe1, @0xff64f3825c1bcecf6aa7fd12b6a3f58f0e179a39d776b6f98c8573a06f1e2837, @0x2e9d994a1bc93a8845387375f1699aab102e24c950bcad8df0f47971d9e5d746, @0xf1154db9b07a7b6183294e67ad8afda9da2a6011c2ae15b03530d7187bd67fb2, @0xcbaa4782ea943051b3aaa2a7b5f0a19514d07abd7dcee8ef6588542ecce729ca, @0x67209b8de7cf515980a15726e086bf7ac1168e471ae728bff6ac3cb4730496d6, @0xf1c7794873b3879016266797c2dea89b60bd1b70acb9631ce429cdf7e246363f, @0xfc5f04bf4bde65f72f96c807eba0b2e6dfdc32978ea9eed6505930ad73b19839, @0x59cbc4172549ee9e62c17672d10be88e8b2fadc12cde1d3305731f8f6737aef5, @0x2aee1b3b2c97faa588dea5f50e873e1f0d550ddfdd37d798de47d9e268a028ce, @0xc27d4dcd2a302d7f47972b1b480ba5d14125f31fb954faddf7dbf99fedd736e9, @0x10491fee6e4930f45b05a44aa0108fe3b7ff573fa7e59c0f148e5c52680703f0, @0x322bf202146455e4abded1858357dd0d91a1161cea536ca28f93b33cb80346b8, @0xe40b58da222caf1895ead7b68d935d706785a6a567ab460125cb8e3a4190811b, @0x8db41fe7801a0e142739393e5e1344a8a88b303679704228ab56b11d3cb6b4aa, @0xd46d77eaca9511a28e63d3fa1d1dc60ebc76128253a52762d9b8d75ec94c7d1f, @0x3bb620100d663d058e19507b5ced92899ba121d4459f34b02515423242db2a76, @0xf57069c062ec630fc1e59de20b73e8072c62b37f62bb6c5c1391e1a7ba99d4e, @0x925a3d54523bedf316da5ffdd0587a42d20f7eca17782219bfd4b96e3ffe0539, @0x920a1fdbb88847f232851b2a5ec061c428d4732f6898e91876da6ce3b3a8b521, @0x57ed06c1adc36a7fc19ee2ed17dea1516ad7e4ae847d536ff2026f5f70784c3d, @0xb4802272db9dac6146e8f8e0abdc1ebd581ce409a730860f719a338818efb1ea, @0xb32f8df6865001f9937d3e198c5668bdb954419d42f332617371acd0c9288963, @0xab4d3f86fc96446bb709e939dcab97fb7047c84feafced6f6938b2bc833707b7, @0x2a8dc49abf8d6cec9337156078f3f779a7c59ae99029af5307e549192e846e56, @0xe1b25d1d5b2691f5011fa1a6a55c34b81dec4a98c907af9bd1bbc08be40a12cd, @0x9604b5281206f87b82f1da54df7ea81e28f9b7b9c6d5099b94cf3485b9c07267, @0xf681f8314742d551ecf266241057d614755cc67672ef2274448ad394c8fc993c, @0xf9f84945ce13955966ed43431cf6785e93784e9d2f1badf3a977bd688446a938, @0x7808c46d6261c9d35ca6d7d6698cc76ba95778b780a109cf183048345c60a869, @0x4f2239399c43a026075bb291dc79bb748380af19ca0249439ff345dd5884d230, @0x735b4eb748eac0e69fd964c21af5104879f60bdc670cde84669a85fec56a01b3, @0x27664bd711cc8c09e8b24301eb905f58765bbaf54d1e89b3a3729f80d54c7b7b, @0x3d394c9da8887f52039310c0842036b541ce4657b0f5c991211bc19d901eadf8, @0xa544304d7b381416ef818899bacf58ded26c70787b6d375bd1c6ef16d62a98f1, @0x1fca440103511424392209c3bee3e03c04ab564c376839c2744584536b6ce5ff, @0x1ae5e1255430e96f9cc83da9456e0a4415b43bef15d3b8a2f095c4293f6033ff, @0xf7efe4cdf31b93ddefc6b4c9eb2b069a4b322252c2e76d483fd5b3e9cfe3d98b, @0x9d695f13801ea79d8e19a3011cbbb60d8a318fdf9d21601d1e498d72fda401a5, @0x98604792a08ecf41eecaae51c9f5ee97258bfa4dc259f72a9cfd829937b0eb87, @0x228d2205aa2577d00fd2e8e7b32ab777320fa086cc8fd105fad3977d6f72f643, @0xf2fc2315868e6bea6d621641bd236020aa7713f2399b319029158271e756007c, @0x4ec5ebe3201ef0ae1637364bc66dd93e4a8633dbb7da89e6a23a494ddc8e91f7, @0x74afd338acc7cd9cd92cdd8c2182b8f920388b8ba2b903004fd6f6c836e7d023, @0x63585c7d242d437221a00eaa0c4fed4ac94b741425d7af5d179fb57594d65424, @0x5c54985ad58b2801c4fe2fa32b4a196c3ee67f05314fa1d7f55a11de2c27ac96, @0xb3160e2b9c7628c345c5c0e8ff8413326a3245e7085efa8b58b8612e70417478, @0x273b80c25de8ec819c9170623d74692691a63b94767e600ee3035e4fcd687128, @0x626ea348f9a7f3fc9add4a62c1c121c739e7458bdc47a94faecad1c1a0e3b19e, @0xc8f05ac5d412f0b21e3e942807609379c4659ed83beb226a8bbc9c0139f13e46, @0xd461937d94cd50611e125a20f2eea0a44d13e5d08a29e07941b566b8cacc8a30, @0x92dcdf04cfee8ca0b5bf282f4eee5fc8a17535059a7a36b542d71d9877fa35af, @0x7607fc63d9211a263b1a5dcfc53767cdb582bd7ed0d055b31101b281c465bed0, @0x1e2d17925a548fa74ffd18f1937ac828ccc97f7fbf08b1f8092107236dce7c7d, @0x5898cf5328ff650dd0ad32cd96444a91f003a20ab3501fed374016960b1fe6d5, @0x3ff524f7e99dc2f4cb86603c6bfeb20dedce89ae8c14371a4d0592963027cefc, @0x847ccdaf1db89a25c0a1abf16603cba2433a9f42ccffddc9947dfb0ce810c977, @0x5beb314ec643e3a7c2f3136bdbf8db42b7afc2b6f93e38d5cecdf3a99972996c, @0x1db89c8b4a6b88ce621477bfa3f254b3e97073dc85e7ff0095f0cb3770e32abb, @0x4cc068f3f8d494fa83b5a8973ca746d2122f52dc012e88552dc52937dd7e050, @0xb3c5c4dcd9cdfa750d104de85711ad75d69141d0523a7ee33350583b7f50d177, @0xbafd3b35c011a0aa85dacb26a8c2e25afdba3356472feb8c1d76c56dd570608e, @0x587d70c945bc9a550c9842988416d640dc449c2997ac97cbfa3919ebf04209ff, @0x842697360423220a86853d7277788eab88d5c036193b82fa8643cb857fe7049d, @0x2d96c263ac7832eae63ef10a5e05c5d12cdd1671d08625b913f373e1d63cdf1b, @0x6fa0daaf8501e00a71fd279d2213d79b6d585703e0008e94be5c4fed828c4fe6, @0xb7cd03007f17648d65159027782e811acb01ed36b8b4c0cb04860cb82bf2fc1d, @0xf6212902e21e7016defc2a131accbfd17625defc08db8ee844300a523f06a8d, @0x73f4e383620986fea405d761a547ca3bd2a5ed01cd99cae9f7dbbd8465da6e62, @0xf906f9c121bbc6320797718b17482111cd59fb1bfa713d90e3a8681f22efef15, @0x9c6318294588ae776d24b75fc599d4efac95a0956324822933324b892af68574, @0x84de7f878f8e5adb08f2a510fa2c89a0eec7c0916f346c004a7862d893597bea, @0x42e599d54f4884721d72162c2f0ca49e116984b61c6a598b4fe344c6e3c2abc7, @0x8ccb92cdf43efe52a91e22978f18e3e51b6e411432b61cacc134a35d3f65870d, @0x3752d0abadd3a1ffa94595670eba47f4a05f2d7baa92d6175828e85a3950275a, @0xc6cd74db8b4fdbd175274ea89ea71aaf917147e0a81318e5a2029723ec1b2c2, @0x8a084db8fd43bd31338e3b8362ee0fad1dc1ab1773526850795852d9b9b14796, @0x12ba50779ab0d108748d4050cd0252601d58fa0c67319e32f9bea685b2d5ed27, @0x6abeb41f443aaf1c081533e2f7acc3a1364b7dee4153ec3c68d20e590c1585f9, @0xf304e6c578f9642a101270c156164501b0e9724e41312f8ff0c62c6b635ca157, @0x6c5e5029e32e816dac559825e83dd28d36d44fe6fc9702a4956cc5a98b23084c, @0xf88caeb599a9ebcaffe70d85db3883d9d74884b5d8e2378448fbfd0f5d68e0e9, @0xf5f561fac633a10b9368d629ee3b52f4201cde281f46e15555e8ce70d599b9e0, @0x8e573c05f386bafa5abc4607dd908cc9c8734777c874f45e2ad353d35182d3e0, @0x6bdf752e0025ac79dcdeb06309e4cb95f5dbd54f02a5c1686e0af32ca1c347aa, @0xb4d39c5d98c02e95c0ea0b0bb3bfb6d44b01f612d7ad7345bd959a6a9e118c65, @0xe4013e2a8b8ee2a6c9567b60dfa45560522eda73fa05c4ed0074ac3c557903b5, @0xb341d921f3bafe4d5680f82e8561089ed386e16fefd51ef4a72cfb4b2b3af8e4, @0x9f3eadf479217e405da1feb1ff195b04a0d35a5ddc7ef453be401313f5b75e7f, @0xad0abebc4eda649f1a34166ad69607d1ff539eaa52bf93ccd76d003ee6f0aaa0, @0xe372d65e0e7d86af24f1e9af227c4b4c2d3b5b6330c388c32bccab18f77c3622, @0xb4ae9bb3d9e2e055909ee24a67af6a0a216ce2c16bac7651814541a278d4cf11, @0x28a69ec680791f1f623f48d7e5d540627dca8cb6d899c2d60b522cfeb0a35e11, @0xbff404650c3221b1db560f0d1f0e06e4ed5f6b8ac15cae338594d4f0d46cc649, @0xd40b4a15b32b4a07c02ada45613b6a9517857d010de69dd9e6b03d884a208fb3, @0xbd3f0d6747fef05d4695db8fbd77b5227873a42d59bf4d2c4e7a059ee8265ac0, @0x1474dc13579fe2b0cbfb175b6872717e2a337492ed30a9e0eaed33f5a3097307, @0xeee374e7f8fa34e9423c142725755206ac49b30512355b33da80ba62da23b7dc, @0x7e9107cbcda31f935508028ca34229ee0de25ae49aead6e820f43811207330b1, @0xe3689b8a70da0dd96ba0db4d54fd01e86b282c1e4744b992e22c8a32dff76602, @0x8de42434007a74825af1045c7737f44eed4c604b112b9dea23d7aa994f3f89ec, @0x5538ec528d82dcf6419ad075286bc2e29165b7bbfeecb11d6162272284bb4281, @0x66076c8ddca65b5518acf71725ba4a1609200fa80721aa5e6e7b69d90b025ed3, @0xfd7a26ec00dfcdd75e445141e98a158f2bcaf944be3d0bb4137b5b8f4fc1d10f, @0xe928dd9b3d60c4604940233383c00c06ed6a31252cf69584a80ff4efa7f28462, @0x86cffaaf4801452a4b62d8726dc86324d9782dd0388e079bfd5f5b98030e5e29, @0x8baa351cdb425d0114f53e8e4844934d157453bc302cf9df1d6505b6bc2de65d, @0x8e4d17d99265fd09a68f207b240fe7bd4db93e03d4f3eecd8ccc83b2cbed7a35, @0xf96099ab314396bb86f6f8551e23b45bcf7b39baa7d5d98106c6110474f83f8, @0x442147f38cf2dc0e57edd8a968fcdadfa4127eac9efcea9e244292b469e5d11f, @0x2a8f6337dc36a21c0d9762bda4e659bca48ff1ee795bd5edec2c1f3ab20c14c4, @0xc6d755f3a7d26c72ef8202b411b297a66df2ef68d93496eb1711a6d653585c1c, @0x76ab95dc7e99beacada124a829060f8b007ec32173e8edfcb70fcfa3c5b62f1f, @0x351082b95706e0a6b8886128e7716b171a2eae13c7bcd4774ce6df4783324ad0, @0x15bd5b28a55450c48ceb581f49b2afdd3f3b398e47b6a23c4b6034d3c6875942, @0x8691b75d8d5139176713609e788f31bd9855a620039c9972fdd8e85c5a5a2bdd, @0xb89cc05d9cd00e9e005f90dfded284fcde04004ba85cf792118e31099279f466, @0xd337bf9ef33dde5224860bef1a4e39686a67878a7ce36025a3db26abbadea066, @0xcca6384be0bb05469d799230d2051960d4dce875a235c4b7acc6f87a3330233b, @0x7cc9e2b7975f1cef64f7e358b6a80ca0277b3fbb4cfa51e28991d88f044adcd6, @0xb03c4057c7c25df1fdb5611207ce6f9a1cf256e6cd7760016bb4b22ec37a2fef, @0xd1ff110c950e7a52ba00d2b6e0025738c69444a15285dc880ef9cb28fa046ff0, @0x729b04b9268b46e1a7e5d6c333fef205c3769a0c4e486b73f2fe82e43385c6a1, @0x48419b2ad6fa539f4dec14b2213190185f6275c7caf2d67c70e800e4cc10eb54, @0xf6de9933a701bf99e376339bcb8ca7fc1c5e7e247d412c8bd2cc9d0939e93792, @0x57ba8ad7654039bf2310d914f6040858422c01973f2776c5d7c2195f5533a745, @0x5b43190f792394033efd346e1bc5ac967a21ea039e980ad183401194efba740, @0xfaa394de306497891790586a161aac7a1735e69d4dec89c6180ca25b883fd222, @0xabd99cb96bd1e4187de8433f100618e3eb5cc59439b1c94f4a127b04841c096e, @0x2d9f3edfccbbab0f269f7dc2e90ebb3e26118c4d830a8cc48d0e62c23aebe126, @0x1d902edd4dcc24c386f205481f0b41e308505ac480cd0926402dcdd6e25f081f, @0x8257aa29546d3fb9110fdea1118d493a9c674e9286bdbb1da10b8ad0b8e07cdc, @0x956a20b7dd4404bd38c4fefd70ae93f09a5d2676d072d8ded11775b264bca091, @0xbcb9cd5c7df30d7d78b73e1c48d7c4024a4f65c71456d65926c1f209cc3f392, @0x7bbc11d27297b1c0b4479ee821cbb72e35378a20bbdbe5aadcaaa72db64410f2, @0x71230b2eef7f6f5c81171c31e94468669951191289e1002c85c72365533a7222, @0xdb08d4840cac3ecda94a124be66a1516cfbee91d860ba10be03a21154ec78bf2, @0xb135dd9bffba930ac92bf7e79b2d6e50b0bd2e3c7ed0635160b9f65eac9c8de1, @0xac6c437e2055124c4c76f403be7f44135e215d624cb720ee0845e66732257efc, @0xa5e26268c757d04beebd883a5fbea4d4b8e0d8aee00e0cfa8036b3d6dad4f035, @0x79d4f1d696dd3acb994466ba8c5b91a0ef38e1c45c23ec3628e7a35499ae940, @0xbbdd17ef55a0e371e282c370715c0e93cabf0e4d62ce28b48d5cbf3d2e96f4a4, @0x3b6785d978922e0e6d9ae91c1ab7d732139f162312c56eeefd608de14242371, @0x7c754b852a596c8c61f9b684ce9f16c5b753a26a886a53a0bfd1049ea457d15, @0x6596a20ffedc653509b1cdecafc6b8b3aa9af20e59bc8f50ee483c4a1fa4db8d, @0x69d8c920eedc4dcf91b5ab084ea07d56434dce18846767c33a3a5a186a6bd0dd, @0xc871684a72d93d9fb49b827eec88fbb7ec87d1a841769dbfc934884c56af326e, @0x4183d58810719323039efc34ef3078060b029b99286bb5dc6ad10c81f956ca67, @0x87f7839566333bf959e4bc1e8e69ae783b42dc2952f4485afbbf22306ac1236e, @0x51deae9a5ed4094a86d1953b9a86828be3fe1423af5b7ce4948051c430b6f2aa, @0xe4f54ee54e624baaa3bccebfec4d5e0650ef68a9dcdfced2034d519d90a52a67, @0x85cb3ac3ac3cfd5e10c96330c03c45c377c89fc9b5957a09924f289e6a156d42, @0x86dac4b1409b21141a30c51702b0656e7128767ce75cb7556da6e9f49c113281, @0x3186dbe256e3657c304a74118fb987c58810f4a94d4f4d701e20d2ae228d6db1, @0x18601846dbe28de2071b05c2ecd5e2cb410b57d7bbf32fa7a0a440ad1393c4ec, @0x82828b038bddab0b2af8db4644adc9e23ad600d219805a33b3d9b3cb6868495b, @0x917a50a48406cc5d5832d967aaaa7284b3cf762258fddc9810120c31342b842b, @0xbb1cf7c804e7f7901cf329ded00bd61939c1548d7ade21bf5ab8b1f563ff68fd, @0xc8a0421b69ed94feba8ed4fadada88e281e259c3c377783cdec24d4cb3c73395, @0xe2d0deccf1d84e17a8497202c3e1f5616aa7a68b679731e9a95c05734d59b864, @0x29bd68cd0b71a3019766e4c9df03309cd3061d89e250be617f0846bd1b2dde10, @0x529d21ff2d3bc458bb685c953c036be9bcf6b521cfb8b2e4ec265e13385718fd, @0x86a1848bc1fb124ae0542c03fab680dd7a0feeada0fb5b1185e92ed773107a4d, @0x830646cc3bf5a7fdf9ced93e928ca3233fe6901f5f37c5fad87c8ef9a1c6a884, @0x706adc181aa184211c020acd539d47a8a2502407fad005321f3c6c161d0d0ea2, @0xde0f3e911b34c0b231274a546265b5f593f1c7b4f54d4d4067cf94290f27653d, @0xad0e7edf41b411bb6521183a30941e860da77f4bb05ceb8a0df66b5f93c5a0d2, @0x2a64630e26784eeea6ae876a69ee99d8ca1fd9397208ec95d29f920b3325e0d5, @0x14e647501bb03c0434cc63eb8abea5faf4410a6a2da6c841c8db350913acbd4b, @0x76f77a1108a71cb3199d3d3f8e087d542ec1584675d2c641087544ec4b2734ca, @0x46637fc8547169864d9b4fb6ba439dbeb81ab2b3202ab78f8aabb6266d21b926, @0xffd2807e9fa8a45a581f48a714f141535ed50ce3e49aa31a144547de239b25a9, @0xea8fdc5ae9b7c9ab86e570cfd8fed8510c9375ddb59d3c1ba8251a7e2e23602b, @0x3d13fbe20d196345c951fe949032159a92d794c793f428fd822aeb70bf8cd89, @0xc3a9102e71ee8dbde39b7a696c6623b7dc1fb71cced65d860ca3f887e00ac27d, @0xbd248c3a87f850c72c3b2564fe4adf644fb0bd5158a864c15317470c6044a152, @0x5e3f3dbfe5dc957904d85a5050975ff158f26f9b654d63fae4ad2fa5f5164afe, @0x9e9f51aed9d22993fa3e470f9ea637a5ca936d9ba8f3f44469b395a181baf262, @0x79108ddd1485bdc79d5d7db7f21e6cbe6cf853947f94296872ef086d71e52a30, @0x9a4e2a252c3909a243ef4812f4596d88eceb0f6020933213e5b8de6f60e559de, @0x88d233155a4b788f6dafe55227c81f89f66917ff950e6f8a193f73ad8c11f015, @0xed801d70270aad8dd676f43b9dad84551b60d7da0a0045fd2627b453e3e33f36, @0x7fbb6ea760a584472cceaeae6b30343deda77f7231ec2dc2f12b6207c5b7404b, @0x1a53624155102adc8c1b8c416eed06d57ded8344c27240b7d5dc65231ddf5dd8, @0xbe1fb02dfd9b8d6e7da78e5e7051270f2b38a8f7facfe5c73e63f4dc8257c484, @0x40abfce2806e1f6cba5a65ab05b8c2f7392805e94a453fa10e4421cd165092e1, @0x9fd64a16133cb29a4d8dd572773d69ee545dbfa4d80d49369e935792723106f1, @0xdebc8aaeae87e0a027c1e633d1dd63f2ebaeb5a12f33178f2fa5af0c15d50ffd, @0x708b62cd0d08f74a072dc9f552a9f8fa24394cf93ef2608500238a437daca5cc, @0x551209d3d56e24b37edbcbe9af0adf8ebe32c23c30adc3f9ad8630c2715afc4c, @0xb30c6f05df6c5060311bd91aaeb6ddc07d5b19e3ae4e5e7f60835420035151a3, @0x7a0a0ee60c96f4f72aefbdcbaff2cdaf4adb6523cb78915df31a73cc3a386c3c, @0xdec465ddd645551fa2052ad276a71fd1b808e595bf10409604134aa80702039b, @0x7d446746b5df075bb91500dde7f923ddbf58af0e4266977ac451577964d0a452, @0x4bfcab46d82c21ba6e0b3a75308023c02e33e6fe1837ec6144174804551a7d26, @0xd78c2eb4d5c54d80956a38bd605824f610367b8f917a8c12260c224600bdd740, @0x2c5ab12c6f96c283df767f03667ad58d33aded4264b78250fcb80a88a2e63b14, @0x49edd31a0c2a6d708d25d9e2d800e4055c0933e2cbde30ba65a081bdf64c093b, @0x1348b06f1264a5fc9e5a1187779988941609fcd32136b5fdc4ee2b0f1d0d5a22, @0xafbf812959b7c6b09a43e53fc3fec44689bdc821891295b98e6146844ee9f41e, @0x4fd9c0a0f58756bc0ea863e95440d2e117b323b606fbc4f0458736c33278bbc1, @0xfb2e47cf75b6ce58666d9dd7f32cbafde5d53f634587ecf9f9da97e8bf4dbb35, @0x759a1007a07cc3a040f718e19567471d38218042526ad1f43ee2643717334e67, @0x43454fe33ecc24fa734f2a3edcde7396c66ae4fd1f69ee9cb3f1bc46b2fa7c75, @0xc224c2685a55adebd126dc82aa68d1b1223e29e5cc4756a71e63c3c874fef704, @0xf966c3d7671a5512f11d84bc3e92b2eac7479c49a7c8bc3817e142be2fb1f75b, @0x4f2ed65c0fa19f56dc90f0f1811c832207357a32525af798b5610209697d6751, @0xb59c630018dc7a384790bb2e58d84dceb51bd81b7d68a02f7254b4ba2c83760, @0xb3f30cdbaac41a8d3ffe5f1aa711614fd41196cf6c2558a9a57b68f43aec5696, @0x5e9fc86ef40d5ca81b9e719f3a7a26df87ae136e2c533bc864fb9fdc293155fa, @0x738eb6d4d0e8e79b191e8a123a71c395141089c224ed3d6a41a0f033f3fc81e4, @0xc1397ac2a2d67992eee4c04caefa29670e0a8e546f2119c7009d08c54f889e3d, @0x9ad5275f6e3b8428ec81e92e4d066f72cb4811b11a7761ef6dfc2069b220126a, @0x960881311b4c51b7a2c05aeb3b7a7b29f73329df28b62aa5e7fc2e1794673866, @0x40626f0a794d1b1ca4ab491e308406154d037a407e05b54c9fb9e60c7558304b, @0x93313e1e40513651c3d3eb81364db39a18b5a8b88b302cdbf8a497ead825be8c, @0x2503ed520ca53657492332e14ec4480d5f59f1100257b4be59fac1fc9e7a3d08, @0x9897e7639eab514e4ce35ab9b0e5ebd11980bfa5cdcdbfe67af13daf3f95799b, @0x6e2192d5bd3e18d7d03cfe2bef9c8b42fb8fb2a526ed29803c52fa378e06a37f, @0xb4458919822785ebc70946c6b1307fb16eddb2cd55bf4a815c0046a134004188, @0xa86c89b1c923eb8fabf08cc80c684be037054fcbda360e9e729a1e156fc13c0f, @0x6a573543db2c6ef14648de79760321212ea61398952103b330e3b2a2a6a11d2, @0x8f324edc4b3231ef4fff40579320b566f57e657f8a40e997e1c275a178c19ff, @0xe5c8a0e709254a062417b3fe672e3f020dbe48dc9be23d357f2e7c266b9f407b, @0xc341c0b5b6fece90782ad16a617a8464353cb2d7090f6956805d4efc0ddc7bec, @0x4c1c230275360bcfeb1454c4399d04ca5b57b390db00baeb775b8d1fc038e24, @0x52d47fa968acd8170e9ce8ebcc6b015b208d18303a4b4f5b9583fd9caac1f571, @0xb1f62ebe6b2777e700249ef8a9ad1471877898a0b74e1622a2fab00c38bbb5d9, @0x2796c14ffa4962505661ca44a8dcda7af26f65df180cf3d3dd076ca0f6b406b0, @0xa0795d7ecc75c34ee0815f0cecda136e155673c92d34f344b738fde8193f1f1e, @0xa84009a3be47ce2fe43f0f84bfa8a8ede3ecaa33d1d67db282e08f19c17a107a, @0x13092cd8626ea156ae3f41f45fb87bad78b215887cb064540224ee4bac88a508, @0x7ffc15e3a4bc00b40602aa3e0ede0b24f5c94f3530dd9c1d57cc644d5469a0d2, @0xc737ebd4233e75c57b6a5ff10fe6988af41a6a455238340ea5be506a703f2ab4, @0x49e5f45c8508be9db9d29c5dbc50a94e5dd5c0fa73b1644829fbb5e084dcceea, @0xcaa72e393c547826d1e2ca98dca3b9a93d28d73ea0a1d4dd87b0de627039e3d7, @0xc972e907ee4a5c73a6a4079660f2196e7d7a807e6d3408e72c0ecc288639530f, @0xcb3ab6914acd61b9b01da30e1ba70a92a7b5d74ff3634d4b0d2aa271f8c9211c, @0x3116522eb724a1bc8ad605b205018d024fd8b5e8f6f566c97fdb2c1d1a29bb07, @0x2bb2c62ab262257e64afe381dd28c62d655a469a99cf02a446f91a37c5dd09c7, @0xdde3d7a3f639766214bb574b986318c50585c91c9bf887bb13ed336ea092d5e8, @0x308d24dca0c18cfb6cd19229e40bf2890a6a6b19ead70dfcb9b79ca30de4a382, @0xd1d55db8f1e9b13850eb3b6f94f71647b7dabd727e66e070a146395b19f74706, @0x4508ccf3dea0af28ab4a6e759c3a4360652f34c1d8cd9121a6313a02f4c1716b, @0x826a5d9b26d81b8d911490d472a7bd473db6cf930107650e7b650b3386953e92, @0x5c083b6432d1f0587d0fdc829d80609a967e82c036fc416b2f28e4e8d68d3694, @0xbb7cf90f71901691b730aea7045feaec28c9e8a54235f0ca7c5b62aa26a7909d, @0x3ebfa64a41bf5c4b7fe0a3a7fe2092a59a7c930264c38ba444d754036fe485c2, @0xcf72a1d21d32df128f37881cca1dfb75ffad796d4bcb17141b25124f354ed5ff, @0x9fea2390e58fcf8d4525e8dcc6abe08b5c6f60ccfb65ace6f3b3a1dcfb71d9f6, @0xa4b7b084042a5caa87fe9ac8d66dbd17192a3fe5a58278bb0c360ccbc5add078, @0x698c45480dd11d34d27ea3b347f1814ca92d4ef754c21d585ffd5df05694c102, @0xb0d82c5e1ac7da9a3d14eb689b71533cc37390b6e9ba3c05aa8082b316d67967, @0xdc3b41f68e33cff9cd007a030e920cbb663b5762501f1c3339da80dfb3672078, @0x89dc163465ff018435734e055eea87dbcd7e26fb52302d1da5ab4a3b8b16d277, @0xa325094df96bc3fd0456a11df782cf5fd5ec0f422edf8e840f46568f04a6a689, @0xf663347a7095d0a094eaf1cf6d91942f83383495109f507fed9d2e50a5468a9c, @0xd821855cc4f440e1fe681d26d682be3adff2c677bfe914170e51b0e443cdeb78, @0x208c935671771188fd078c45aa5284d5a404b794a8319c3e70b4a70d1b8f444, @0x22ab032bd1fe7520a7e48afd00a09635ca67bd4c6cdc57a0467e371253c15abb, @0x7e7a086b3c73af64482b61dfb3e64a41ca4432192a021bbc40df84c5aa7bba7, @0xcc23ec403aff73795cea249646d1b081f937ade4e358566f1031eb3d32fc7a8d, @0xd47e3a91e51d76c088ecd40aa17e8c526458c28d929a5556a48ff19a8e042412, @0x5981ce1e3fba35742caacaed2e34481a0e8309e647a24060526983a2a0e33818, @0xbd407f7b0eea785c85962a02402211aae4cdea97c39c023df4a98ec75f381d25, @0x1a476ebe21763d3da39e48bc511e668bebc540e5489af7c2947d4b68f1f95980, @0xea46e9d8b1a11cc7b2091d74fa29631433cc3f5825e3797e0b87af3f4c7cf677, @0xf5f27b557dd058901d03d3096642b9cbfcce27024517d4a620a3c8561585d181, @0x5cda988329c4921c38a3a679b3dd9c631b6b41624877fb6696ac2e72d00da988, @0xd9ea7c4b3daefb5f4226d568298e3a52a7eadbcfd95917cfa87ec54e8071ce50, @0xad40c04c0f2ca71476a14a81019e1fb32377e7a60b2b564d0a3820fb06eff8be, @0x8314a97aec87855bea7703de8bd21f4009e9bce363020c57cb10b39dd87fbf44, @0x564b3839789951693843ff80cf5ff864915c2406b09d69449a1ae2d6011344fe, @0x8ad91b32cd2b2021617b85e42929cd20c27121dd0f919e37907b4f374e65f7fa, @0xc7f836860ed26e8e7413d320e270e6e4b9322c40e9705b074d65aa0ca0c6ecce, @0x25e110f82bf65c241efec9106eb1647f812e8040510606af7a441665f258887b, @0x1cc4624a2b3d626d35984cadb453846b28c720f1d53e9cccc22408d2e50c2b63, @0x3c5c6f8713fe61fc0ad706b96ebf98f5c827085d9efb86ad65c7f5eb85d792bf, @0xb8670e2ed105cc6bdd0f9f6bbfde3da794281b566e7a2446482678bdb917286f, @0x512a710ba1131e37a68c5c819f29fe9a40dd417665601ba52236373401b8b2d3, @0xae37c1ff20f3cf4eb0c847affdcfa9d0a0d6505954d8a57b8d3aec59eef06bf1, @0xdff086478834a9a313df220e6301aebe25e99efd7af158a13b1795cd63739c19, @0x2269846b7e0a68e13465de9b18800c13a62a50b98b92ca21270ba4c7f75eee22, @0x570f8b84347b692f3521767429290923a512dc830808fbd813506f1294a6a301, @0xe3ccec4da97c1c19e4bd3718091d332a18743f88e8470512d2e93390deca990e, @0xbfb99bf4bc348ad1b1223100807d876218d58e43f95b10fb91db272feccaf4d5, @0xee4ff04e54ca71cc6bf627c7ffe28105002f24d43cd561760d3ffab377490300, @0x3db881d8742411dec3821ea5768cda3e8052802a3c30e4946cd26cf888e79016, @0xfe6e6ef5a2e120248c9c5ea4eed4557604a6a3879b77c023a9ad2d86aceb62f3, @0x24eab5af0e34b9f4225761a6f855946c9384ed2e51ca5350d9a83d45f6a27ab5, @0x151feec3fad6cc53da47d3d9503359b7bfad094db19050deb228b86ae54420b, @0x167675e648b37b461582be746e7bfd592ce987037f148db655524c85eaacdbc9, @0xc4164520d11eace3faa4390c152312d781cf6ec4de9b99b4b540d13fede0a57f, @0xb3a2322bbc40e3931f2b438cf2e678ec858cdb6441b1d8b913da316ffb052e7e, @0x373b3b679dc8a8c8b366dedec883694e9c080a52be58a6aa4905b665ebfb31f6, @0xbd53aba1e0dcb611359e40b5139eef48ce67ee23cf389312841cc442dc1f258a, @0xdf46147c9a649eed61039dbb7ca9d7f90173e095fd967ca0a87542ce4b50eb4e, @0x5565cfc0eb99403249d31dd2e07ef145c7aacd3f099a1169443d025d0b2981ba, @0x9e67c7cea07317f24a91313ce3cdd69a942f325a71fdabcf1caeed93991262c0, @0x25645d8106f0ed63273e541bb47466dd20d42cc00b2de2146da00441807c66f8, @0xd44c8aedaf01faf35349425ca84e95453d94e928809a602a8068ab792d2dccd4, @0x5f9abb73c5c7409bb5a06b6277a5a38ad2a209702f7e9a7918a01da7727a5180, @0x76634408d632cc54003852294f45b64a3a4fea4e66d087869ffe15aa0481a216, @0x7375fa17eb03891bad830931b735a3b5391c359f426bd79f4f9da9132629e33d, @0xec732c44e4fb871bdbf18dd97f264d06fddea539586e7fceb6d184ed9434ea6a, @0x7ae12902f4533ae3d82a17f9b09e8abb290756b2802478f275386569ac2c4eea, @0xad9229d5cb085661b9ed6524ea766868fbb8caaf001d6d816d91236609475280, @0x9be0a1cc89c9954549a31d3d4d43bfff7709a74365fcfc241f1413dc3b091a2c, @0xd500175e188fe2a7d786e56bb19349e6b0cdd8fbd0a99c3b44984d21b8aff654, @0xc913b8997c056480514a8ec5bd6b22c05e0c2ddb72083741a1bca4f242fabfaf, @0x581bdc74de5870591a7622f9860302815933e0ffd228df3c0be5ddc44030d5ea, @0xbe605cbbb2f7d03012deaf7428bc0e93b39b5d92bc5138df5e839d2288e83933, @0x667cb34b685e684a6836e44eb6b9b9d052f3dfc81f03d25f09a34304be456baa, @0x47a9f149395d9a4c2a57454d86e98908cdfa9b74ea9c86576f16448d07b96418, @0xca3bcc36800ade779e95d360450929960eb2b3dbb8aaa8bf75f60727d84e3717, @0x74ca5830b5eeaffe1f54e388810013c0c83f44871f384b7fbd8f32e490846ff2, @0xb46196ee521410947dc38ad67c4f1b78f4a062c74a50cc4a714c1e27de7826fe, @0x647df8b1eb6cad6ef6e15f7595a54aa558002d6f44d2c9ccbe47c6ee15d086f9, @0x49322d47295b83e749e645c6e7128f8522064484b071b2fec2db6c564fc7dd96, @0x9414522d8b0232bbf5daeaeada6bd59a923317fe688b893527fb8f71485163eb, @0x9fd5c796a2eededcc64df39f7ebf222f15dbc1e933b90c1e6a089da34816bdee, @0xfe5ed10b8a213d7439a2ae43d02aade048ee4a409719785e6ebeb1423d34ae10, @0x29a3ed585f154bee23a0102becadff1397dbd469f4ee55a6577f9118603fda11, @0x2edce006a5b9ba126f8361ce74836a8edad4a29bedadc3b65cb20ca422097fd5, @0xcc921e70a89e365a62ebd79a766b4c662c1574464cdddcb3be1775719a97c751, @0x25ef3ba1121f659818765fd17e5cb5d7bc075f113feb6f89832aa4acc34fabdd, @0x6d9c2998e20bd650c8040e12bad49141843f0966823bf17f1cf6069102845cc8, @0x90ec45601977a087148964ffc0378b9b5478ab2186ccb83a41980f3edf02e5b6, @0x43e45de790d858350f89753a9025476a8d24cc8052439baa806d8df014f36862, @0xe52a1826e19d093ff219da065ad2e2cbc4c261fe180e9615b14fb41732bf33af, @0x82a51188bd31a3b73e69fad01de0b9dd6a15e814c1cb04430c6e23ea0f2d8b57, @0xea71a948d602a58c875571b71ff339230fba90d40eca4dbc0372a95add7a82b3, @0x4852ef5984c5210775d8edf4f1ea3273f01e940c615358e9ee9993a7e0ba088f, @0x57db74894031bf17dc819f611a6b7f1dc016aff697f010030d7129b4fd21d9aa, @0x9b1a3ecb76421cb008f4df2e56b754227fb97d59cf07c9188f3291f72ab83af, @0x9e4faa67f52954a11386f611f8f76da7a975207b47c0379bcdc9e669ca9cb582, @0x7dd074ff90f0ac1b1e333dd1ec4b8e83a5a51401d3ff138340235598f5b0bde4, @0x5817007831d017c1fc4270d3550f3634557e6fadbd12379744fa67839a5e9e6a, @0xf437d0b64d3ec157be86f8bdc634523e4a5a838526be0f1f005c486586c196a3, @0xb0d1388a059ce80bc0a1a313c2ef7d3fe45da0757acac504c53ff8a3a40d5bbf, @0x5dac20b7f1e1a63e4e4e618e2f2905caeed68b6d89e8ad26ca7189d2f4e07ecd, @0xd5c4f15d96d0388d2186f04e80584cf3a391e4ba1ca1b7a76bbaac105b9ee613, @0x64d47a3e87ba0341fed7ad97b9b62778d5587f21435a17cc2ea4dddfb3670648, @0x1550d2a45aa8d248e17c1fbd4f31936166f1d40813ccd0eab9772972ef879390, @0x80e868c38c274239c4d795ad0e0214e6fa63d200122a8dc68d58f7281d046d16, @0xaae41e09d96e4f06fc9a0a32f43a6120e1d74f3be23e95ea84b188c4da831a5d, @0xf6f5245f41549eb6dbd815a9269ed8fe295a3f5964450735faf02e1701b03572, @0x4f9e9be9303c0e8a95aee56ac75705bc470d219b4c99fbd4ab4179298c2f1088, @0x9f49af5d6ad070b49a881e2766a7c27f1f2f2e606445afb034f8857225bfd686, @0xae1129c4663c7ddfe28e81e3a69b2d5ae9f00aa270d389ba720e146a6c976c0, @0x5b3e2fc1bf4abce0d165b6ae1b1df13999421dc8133595abf8fd39407336f288, @0x92efa296d6c3c989f6ce8ffafae3f75d69be320deff86eedeccbd6e4181283b4, @0xd40f0881baa698a419845a604be439ec24cf914f4b30bfefee7f0166676e3e0c, @0x68438a99cd88bc9dcd5272fb1bc03dadac9fb5abef88e2077656804674058108, @0x99fdfcb6c2ebef41a5e9f19d28534f73f2fcfdbb8b3c9039bd77478ebec5a416, @0xc97c226b942245b0d84697c918659bfe3ee7c9f3c5a5a3a8bb4f4f7a9c680c15, @0x1440239c3accf218cb3a6f3974e3d818ad9341af91c6f5beccc9e1bda2422aeb, @0x1efa1f1047db20317414d472e2bc3108f20c83270fa679d56c76b8315f05013b, @0x51f2ba40a506f72fdaa8ea3c569c68d7447917caf2c1617475631b3fc0f3328f, @0xb7d1f9ef8815719902d356dd6a4cf2882d63798f2605cf3f85f338992f79988e, @0x3a3ecd6dae1e14977df108399909ba93b8ffeb05401bd88026c6af77eb1d02d2, @0xf4b96c0bcb7d4c42e7650488f0016e92d4e30aa0d761093ffb2441fed3323766, @0x80749b7f8441ad292e533ea025a8f8767cd57d13992772ac04a4c9d4465d9241, @0x4fcefbe3fc04cbc64d0172b653e60f53b25ca5d01dd70ab29eed0e48c351dcc9, @0x9a2dc44ea8a533c6ae4f15359e7a767de4c9a3c91476ee85c063d2d640cb2756, @0xeb28ce6a84021512edc4c1d7769974d2b571a0ee7befd7be30706c82d24c8254, @0x4cbfcaa75090a69941a562806e423ad51c978de18f4c6282889ebad7ab472d97, @0x646fd92bc44f4e30f223b3d34d437995df372f9f8bf4d1ff012b4d9070aca90e, @0xc8dded6eb84c97e4c69be11cbbef4eda9535ae1f9e1f69b8a3f370460d38430a, @0x36f30fca813cd214546a7abaccacd62ea9f52ced0b0e6dbc85d4a4af94b2e11a, @0xeecbfca6ae86f29af06234f829af4488b7103fbed5ed769964c84882259912f7, @0xe56912c552ea84c3aa3c5d422ae47bf166f38e643e99197524eb06865e9ca436, @0x1a7e5f77e0ee7691a2370f7c15a6062fb6237b185833554042f8efd5684bbe7a, @0x8a04b99a557e3748b78a83c0b2e7f61e8fec94ef944758ab07535084865b456b, @0xa7aef94842dea11adc0c4a5befb44ad824cc683c4aea6efe844794a25bdc5d73, @0xf6d8eb252dd7df108412ffeef7eae2b0fa54a2cc1267cc29030eeb0fb7fb9d6a, @0xbaaff461b6ee9498809845b8dc0c40fd4f279b5280c67979e5c9f936a76c201b, @0xda55b8bf106c724890bd52b80545fe995e9414cdbb6fe69965c44df4c25c82cc, @0xe412d585f69bf5bafd6a60f0ad250fc70f19214ce39d522f24bf846390499d02, @0x790cbac0ff5e27b1a416452a9f93944a13df7e9bccc2f35532842c3b11010886, @0x8ac0bde8ab8357745df4b6c83ae796e1d7066d7dad5f056fd2c585e593c883ca, @0xf1b7ec6adb8724700ab794333442ff1bb4f13dacb05d4844957936c05fb6e174, @0xd8cd8602cd31c67c14094886d9f8dc97c39ff0b9e9b7b4026089d408d7399841, @0x421f73c0bcf5d23a6ddc8a213fff46eafe6c157fb7cba7792e3e157905126405, @0x24701f12c0e01bf9125f64dab2c7bb21c1017f1de9d430b47eb4e8f32961a5a1, @0x1102267a4490f32a3ed0634bea3c47383f341d1343c399709ffe14cd9430395d, @0xbf6f1859c5f68f93fa894c1e63073f1977947fc9e057c91b7f822ba2dd5b9ac3, @0x6e6d19c815a7ef9f54cf99c367c5b9539192997947e76d8bdbf21e93a926e195, @0x73a2d7b66015debd8a1a6025933ea436f176be0d664d5686cea7beebaabcecfb, @0x6d37879cfd7626789961814b05be6f89e507a2d2ab4a8a514382aad9fd5af509, @0xef847cabfb5b55334f36786ef9dc5f2a20c9ab5b6e7d879e5e314cb5136cbf1e, @0xc9b70145b6f81784a40171bd1f883b39f3929271499599bd954dd21f8256130, @0x6b2233edde1e180a1fa6a5a2629d9e98edad11dc7f46a2eee4c2bd412556922a, @0x652fbc93377d151ff8a067c4134d6339c0108c8f0725105c2fd6204cf5d9544a, @0x4a570b7031295a2639533c0b69040f1819de95084a852c2d3fdb3ce82468f6dd, @0x1d45cff5e12c4f562f5b80ff417bff5d97c642fa80a068991acebb4cbcb90f15, @0x270f13b1238ecd16318b7ce35b228b011718c1dff7190dee76a9b3bff05fb325, @0xf9e3034fcd6282a98326910c394cf02895ac2dd0a80f3123cdb21609c2b64644, @0xc50107f91144586b1ef7f18c90272b1a5dc59145b4ff05499416f6d00c0d8067, @0x25d245a9eca7ce89aa61fd667dd13ea701b796ac956e5b96ae39fa0e39601196, @0xa54c6b606fc528a56a07d82c3ffc353467b903ac4c63b4e6959fcad2eb624c2a, @0x55c1dfdc0b3f6ab5de549e13726dc46f523838336efd589ac11775e954b90d88, @0x8cc39368b3f80784b1e1b404670362b6855abbb2999a695006d0d0b58d4b8cfa, @0xc09edb59be6198184a69404dcd364517ee79e4f4b1b1e5bbfc12d8bacf2846ab, @0x439e5061c33be403617ccc8721bddbd32950942cd64320718bb1bbc5f7089b0d, @0xf7961261756f71b64e5b0e85c99d2735c6c3af6941c0edca21171c12779b6ce7, @0x81d775dcef178ae65f7649ac3c2627c6e427c17740af9f465f627c529dd520bd, @0x7ee143a443a314b189d2d313a5fc1d47a9cd2824891b9b0eb5746b6b27b77fc7, @0x72cef87d9126f0f454368ca2f6b47e30acee9ee0b16b1e76a968c8b843ade070, @0xf30c54cc8c8e80f82127370b16fc3e8e4fc4dfc9a7d6797574cde9552d1ff3f5, @0xa4c513391c7dd1fd9d1bf7983596fcc7260cd9d74a323162995f001f0c9d6f80, @0x3e9568b657b7843b5f9a9189f96e351a25bcc49f0674822a78ece76fb499f2e5, @0x373f21aeb4e1948e2949c7a39d206b488696bbda21d090a8f5f61de74f129dd9, @0x3a8c849756375285f6a923900829941b0d4fb76bb3afcc423b6f07be0bbd7617, @0x2d424fed65a0f70c79cf63ada2ca3220158e5e1aed34be594a40683f8d0bd85d, @0x7984e58880c0a83915ffc54642b9363ed1606779500b589bc62483be4512f283, @0x7e6ddd92b5e7f4b72606e319cacb2c38e5dd58ab26b67ec50dc94f2450bf1aaf, @0x6e25b7ac98b6e7f68ec92fe5e4f8d8f950e58be2a9b2938acd4b982efff3daac, @0xb7f296a83529f757eee593c83d6a3f17c74449db02ef81acfa5688c3fa225e7a, @0x1180825567a09841421fa4fcf4abcfce9bb6791042c9141ade170aa287aeeccb, @0xa051153a736f0a4af99e7cb4158c595e44c01074377ceb42a1904c73310ededb, @0xb2cca9823a2be7ff73cd6274d54ab9e2e54814c1abc1113f5c72cf780d8be33c, @0xe791d353e6ca87162e805977c41f24b4749ed8d3b8ab63d89bc1b4dd3787b809, @0xe012b52e32c75bb970b6995787cde229f3ccf44c91c73bbd626e10c9df76a394, @0x73f6df18859e66a0861b0ea34b76efc4a0913a29001c15c7fac16ddb5eff204b, @0x638eacd48c35eacb8a70803f30265079e932e051599dbe99be62539944467dcf, @0xd5c3c994bf2a339158e31f1f3672473f023e8f69298dbb2284035d9e8c05da87, @0x505226a62d98eb2f2e4c54c7de7891e1e6898078cab5e3ada62bfa20946fe7e8, @0xde6f90d15367fa2f52416d797b970d9ecc968488b6b15ffb586fe51cf4e9f33b, @0x74ee33ea25e180a8525f2be8eb72b12a123bff297f23385f42b6bf91c2e1c42b, @0xd3e8f3ef7e2a6113542e856be2073fd5a337d2d31e507e3937f63db490afd20e, @0xe11234011b20bf13a63782a6aa4716c1394fa53f9a301190b9de3dffde3550da, @0x8376c4b132de3c136a9afeca1bc7ac616100da6c29e2c1e834258cc1c1d47327, @0x5a1049187edf71c9ae2402162afd379bc4cb67cd30ab27941ab1b4983be9088e, @0xbbb1b11805322018a0d2c16b509370c4f545f34f2c4cfa14316cfa4ae91c774d, @0xa4ed14b73939507262fc5504700ce33ea562e58a978414c585a3a4cad23033fe, @0xf068cd2f22b48713ae8662efe29cfe4e17384c5a40ff3a1b0f56186944bb18a, @0x654b8462fa7b0c88253ff9209e459dc6423fe699ee36fd96e670a77b2eed3448, @0xac462042952a9bce4b5383c3ee0e4276cc084314b2bb23576b0ac9792de49e9f, @0xd0872839a6bc309cda80dae11fe645c84bb24cb59fe3c81e29a1391ffcfc7b10, @0xb737a0cfd5f917e4af115ac83910cc2bf295c97e1f6b516289cb2a1714981ca9, @0x899dfdf8c0f7a01e76b164b4b99fb8a89cdd8fc1b350f8450b2a40ed3ef37813, @0x590f64e3c140bba379ce9faaabdcae3bb681e31b9fdc3b021bba7d252cb7b6e0, @0x856bc83ee338f36d8b247dd80887ea4cda5142a7f5c9dd4a1bd6d205e2a255c4, @0x9db4a798cd03908efec00b0c654cbff6da0254cc5d710c2f42df26c9d5f695cf, @0xa98980b1614a0584b81d14d96a0ad278b575f441d0ce81b0c1c56eecf39779f5, @0x322cc5ddf4cd01cbb463608b0e580a896f8a7f0a5405a1e1a9ae75612a343a72, @0x7a3ae18b6a64daf40d5559ba0ea28b89ddc204b327246026be0c87d1c6eb1e96, @0xb48d04c7431601e6d39f6e133331e6bb874b47d0338269d2833877fa560d253d, @0x4b15f7e75a210b1922c18f1b0dc4c4c6a6a9781a68e06a7656e00d53e8f60801, @0xa35e9eefdf90b9d0b8a2e9aedc64d9188291f2c4154c9a949c7852bcbe8e8f22, @0xb789da28e68fa86849347865c8ed897d68101383aefbae99917da8226b75d03f, @0xd4688bc7e4089630919b056b02ce85cb203da842297dddd3ba8cb84e40e9ef9, @0x312cb88f06ca174c2ea2cc6e2de3d551d0cf1fcf24a1f8afd220b45aa7e32695, @0xb5e11aa0abaff37b0e1c314bb76401d6269ed32d3d9765cf1425e7977ddb151f, @0xe1fc841c6a90eaa02a36fd45f4078df0f6ce8016ab0452d436a7f25e8f8043a9, @0x9cdb76c3751d60fa62c3acf246ad3d84c57b1e91c94577b014a8df0108238e0d, @0x7b17a3ac98180a95e6e60e7cb8ed9c83da521490087bdf991983d1c9688b6e3, @0x37374c14987dcd005fc5f6ce08522b9d79622e3f0c699ba7c88befeecd79ad, @0x493a3ca00a36493ddccb33e3b826af24b4e2f3657f7f1962e9436498bbca2b1a, @0xae00f2f2631f4c099550f12e3d37f1886224ab73f4d9803a02e4d947a7d06f6e, @0xb1516ac382854ab5aeb5d14f138f48d90bb8e3736f34a7ef46f51b58a7f193b7, @0x42ab5117ccda0baa54c0f3f3c31bff2d8092f5553e4ae49edb46b92ad6b9b72f, @0x17aabb9a2bc096603f12ea5a3001f83a6a186caada92ce23cc90bc66da5ef38e, @0x70a89ff5398f7f85597123b850f3c32bce7143c6ea051af9d6bdf8bd71216a27, @0x3d3161626981c7449d76a35f6ba3eb7be9938627a7d7ffa3af9c5f79cae19588, @0x3c25c6d5600c69950c7591227db9268ea0ff2deb204bdfd18cbdba588fc14879, @0xf973301bd9d5c30083e79724eb7197c0f8a7760285e2e289be1016122cd112b1, @0x86f25e9bb376d45366c84a43899f6ad6e71e0d0efaa0e117bfcd15353620809a, @0x38246e82e850a655cd65d241e4ca809225d76e067aa91c68bc50075fdc85cf95, @0x380aef59081b225ad59647eb134663741a3e9100f487d984b433964607f6a36d, @0xde6020d212644c5b88c4d0c944d6d5df6b2950e180b3e0607064a4cc593c21bf, @0x5c93f048da1daddd46c62c53a71b731a3dc6222a2344cf13745a6d4ef78e8ce5, @0x269e33cec3c75e01a5b49946afb1eb3be838ca0d65290c8f951fe2a8f2bde4d8, @0xc4ef5f1458eb8291e4513c0952051c06e4e2134ec9086b1b702afb3d4b5e3d8f, @0x67fa2ee3bb7f0e59b6fab1cc96e601449bfd2e1d0013bcb315fbeb9b900800ef, @0xacdb150b685f670f848b2612954dd64c3ef74d941b960a298bcac2d0d8678a39, @0xab45802155852a4fafa8575f0f4c20c511de5ebbe25e8606d9cf13496c8cbf40, @0x4a327ccab14247a4b4c44c4454b0ba62ad3f3ca707358b2cc57aca4f94944edf, @0xd1279825f5effe07f589ab1b13c5d1dcf4ba3239e42e6fac65e41342f482365e, @0xb5ab302d8d7d03351d0b02bb846d19a4a12082bb3c8c098f034e6cfb041bbeae, @0x14bc5961c9bd2a7e125d69429a7488a2f57bc0608b3c5d766095a35c41d3af41, @0x703a1cee341081aa3154897f58f80f906f0b55c0d26b48973239d0b0f8caa103, @0xe51b0ced4a5d30d4e1f1c62d5115e9daa532f275ece90aab7fa9496f9216cb72, @0x74eaf59d264794990a571fd3daffeceed5c4c00e0395304fc1cd7cefc59287e7, @0x3de34a00cb0610611242934c7fa8ee053b782d6c227665f77efb0f64dbcd319d, @0xc8944044fa9f7304606edec90cc8356472fb4644ceab219baae97d452fdaad75, @0x8463f7f8fde538a55d4771999630e8dc99c3d4ece002d0b4e88d27a5437eb38f, @0x9939e1b7e48791f1bd864414e039f8f9c81d7e4b903a302d6254f2339ce9003c, @0xc75479d995badfd4315460ad960bc720eb37af9ddb3ad8ffff854bbe13726ee8, @0xd64bf85541ab4653a245612cdd946b46d5423f8b323f8056027414c6561f7b4, @0x12a92c01b0329df3eb65587ee9cd465ce851887020f364c48bb9ce23e3af191c, @0x5e27a1c57f1a189379d9035524209561547ae1cc394a73754bef3027563c8cc6, @0x40fa964a5e36ac23827ebf4cfb3e6db670a6a9f6c85cbcbc5d2668f3fab7256f, @0x18f54d40b5d0b78ceb3bb741db968280b0f6699c0a8d6ef4ef7cf8a9d4379ed8, @0x4cc255496e35360c8011ed61e59ddd5afe48649e6343acd29674f66e00a30467, @0x6bf68bcb594b7e803b21852c779f9f318f690e0c94b9132de3f05cd0ca25a11f, @0x21addadeb4b0cd09009e381c2da0ea1b99b8dffdd3617db80224765e57f47bae, @0x9e7bd765be37edbf00a319596748626ed3893b373446d9b6469dedbc0f777147, @0x70f6a90af354cf1789d71c39f2638ec5921545a9a2f44a3446e292bdfe6e825b, @0x5c8f3fcef4b272841ef26af2842145b9df55fb4973e561fa47f91552356cd28b, @0x4b1053b9ad5f1c2465212e74312aceb8bb5282a72ba290486cc1a92fe2edcd0, @0xe6970105113c92b54ee618702feeabde46bc3cc6a1631ed731fe989a2f6e5c18, @0xd569de345c88eb7e772174a96e7d82e10ed607622f120bd3546443fe3ac81caa, @0x93315a21f98dd7a1664a4f816f1fe953a5cce2eb88984b1f0eb5f2d1bc88af86, @0xb8ff762c1130e3f90dca927b399a93ac02b6f39703e4c2a3814cd5ff765052b6, @0x31f76a3814d3e1e02ef374a406c57b52c1001bcec43f48d07ddc40a13c84e800, @0x645eeb9906595d648cbfb59ee928dfcf7b482c80411810f4e3ba2c518f1d785e, @0x86cb35b370474db42c5079db4f2c7b0f10b669e29819b13cc1c27b1b1b49a07c, @0xae999d14e6685e8b936cb3e5ff764e325d2ba1dd22e6a80af77304f56a40a00, @0x55e919362325aea9c1bd71ae612dddfc28a9bd4180728e9c669b202bf19157df, @0xf6ed7da21aa08081abb69fab35d925ef986528c1a05f0bd0cf73305623658843, @0xa034a26d8c3d5aec19a80d72267ea9b084a676677e0e8557b9e5f65ef83a68, @0x2a3f7a28a4feba7064183ca8e9af29a5e9f87a6bbd3e252555f74d77f6abb4b9, @0x782502a15036621d318b2f3c0c6662e5a9484319ea18fd9bb7ab1f5c42b2cf4e, @0x35a28810084ef3283ee3fa83c0a25fea73176112f8a989e69e28bd9c9b869b0, @0x306e80066183a072b93de9b90ea82a35233733dfcb819387ad431611fb917f07, @0x898659786b0e38dc0cf6e84167c606dfa1a4a1cc6e9dc71a2fa7f778744141ac, @0x562813375b167a5d2bc62460adfdd0eb34a322cf07583a94a60f0cde558e131f, @0xa4074850f6f1105f8f8587770fdebaa1a8522d9bd8764879e33314bb79863e37, @0x991ba48128262429c5cf2f9c9a30485e2441195eab2e854a10ad4fc118236a27, @0xf2435d042e0f824c60e6af2d1c4ba57c9e4b5f69712d8183ee13ac1032e40c24, @0xaab48f792d795939bfabfcf4fbc335a738e44b43cd0f31cf10fa2e5d0af10527, @0x2f45d44b2464f3f1dce962348f01ec990bddfef390cb3ed591aa43e2c66d4415, @0x7373dba090bd80308bb8a7acdfba26b344a77c59a104cebdc9bb3e6478ab588c, @0x675782eee8cff02a511822821d27543541d971ac2d9b2650b5d3036f9e5b0fbe, @0xeb3f626e30c96f74f5ea81ac35298eb287ea6fef77eabf43b78c7c0d26157665, @0x4954ed9206e40152b9391b7ea4878673523948e4d341e907799ff10ddbcd3556, @0xc5e3fc551e636c817a14d0355acaf7ffb7e6d6d8efde3ea2c525bdd80e5e4450, @0x2dccfe9099450a2f1c402ce6012a8cb409068670430b6e84163bf46c6be2540, @0xa941387dc4b6d085032d13dd6f9f2ff4bd2f996a21ffeeec58a724abc9af99f5, @0xb76900459f2fd5ab64779294bca3797deb19ed2ce38e1fdccf52712f982b1055, @0x728fbecf7a2e4238c32671005e55210e73373892ae27a5f27e82599f09572378, @0x37b1934f6b1b9a0a5ef931c68e2b2fd8e980fa40eab2b3abeea8dda84f8e2e78, @0x3a60fd2b137dc74ee6b91538755b7f0ba32745aa0d5a85e1522034401f5ded43, @0x9059bd662130664afb336b6cb1a4a061518f2ef1a7493fa21225004fbe7e9620, @0x9442beee4cc728beb34862fffd236210fd7a7d3aa08fa9dc67546f52150f04dd, @0x5fbb2f728d2c60f4f74593f8f31942fcdb7140166a6ce39fcdf99ded890a0d42, @0x48ec9a3500c6da3e06e5d68bbd6a9dabc85784c1751a4994a32dab154e838c4e, @0xeb86b7cab03ebc9878f1ef484c0f2f6089618b1bc6e8ed2d1b8354ff9a1d3dbd, @0xbdc572947972f0c91ea1051a1b94b2f013576ff3fb54ccf52d7e6b8e2770acce, @0xe2ce62a55fbf4e7914ae225b099eeb7b019685e0ae601af8f144ad5f521e8473, @0x9eecab1343ab3f56a6627316f3732060423aadf70b00a8d10edc8fcc1ddca6f3, @0x73927a4ce96f9b9248ecd2752ac9fc233c5772a360c9b8259d8dbe1e29d1f8e1, @0xe1346a25633c2614948d28b247cd9c88422a99696576ac8798db5a8fcb30ddac, @0xae9fe920ed24cd01a7cfb1b146341e223c032a018d21cfa064038b78c4fe36a3, @0xb93c9a752298f4e82d51b571bdb42b1dea1dab32c519ad6797c2f3147f9249ee, @0xe93439f10087f86bc1e275e2babb39bbdc866633be8ae5d0cdb4a7ff34468215, @0x1b36717eedc65154b6c65031a5065c63a5b192940c4fd90d29796bd04648f754, @0xa31d807684c003dff67e28694dcbc97036641719a36ab4fb18f2feec223412d4, @0xa57178a364d2352fda4847880e7a1ed2f405d5fa677b49a988cd656db068cd35, @0xacef722a9f7f1ce4bb020c99f876f9a4408a3fe03d7e53a2e583587f03f6a31d, @0x9bee138a72fedf17dd36abb31f7a033f8cb34e222e2f8aefa48aee934e14b6cd, @0xdd6899aed9f23f36bbb452784de1091c7edf100441dc7e48534e6aedf40483b8, @0xeb06f7c23d575167636cfe0592d7bdd9297194931978fce013146cf1e9675295, @0x9e784d423813931c41d47348f3bfb8bfa22db3937bb1e4009d80ee6fe0140b55, @0xb682a506d4ef94d274c73223d4068666721a77db022458c4e732b28b52f6b2ab, @0xfd12f481896a22b035889a52583526f840c9849d584079293927bb6accfd1df4, @0x86cc5cdaf80d4d14eedd531d65cd5f07af696a0e1335952af8c2805ca093025c, @0xe0f6b289448498e66ad022aa2d52f62421a570d159cc149fc41ea085ded6221f, @0x7012c4e59601094c82d0d695f97ef193afc823b71c2e8d03370e92766ff8c7fc, @0x440f0449b5f3c2bfc8b58edb1dade73067d2c35319cb2c66f7be1a86ce2a9727, @0x7b3f26e5238e7928255b54c0eb9b269be875a2b6c83215a8e1c6ef9c230b67d6, @0x167f41489ef083cacae4b8c3183358743ac5407dda1d28fe2e08b861f1c660da, @0x23fe432763eb4d6de0a43a97d5c257531aa64bfa06712a1ca20759ae426aef2e, @0xd44da2a2e467f5856d70213f0263919e01a309997281c44cf10a659ad22a0b7, @0x6fe24d595cfb6c1c5c3dee72dd02ce5e8e7360566c3fa3e8f18b962eab2f1474, @0xb0f43acc91ec42d225581eddc1a843ffaba0b4dc0617a4f9153c7d357e877bb, @0xacb034f04821f91a9be61ce6f17af05191122cc42268a52a4d2689013162e263, @0x860cfb994c518d6c509e6b4796dc1335d09f406ff0432c9408e7d0fa227db422, @0xb9999fb6dfef924436df7692c758b9ba82ec3a0bbc36ab34454f8ac83eb30e1d, @0x7801d0d0fd1ec7061350d324b062bdb46a37f2a277bbccd130669d3855087630, @0x26cfe302271692707850977ac3d5bfff86599befc67c18425bc1c600360e3c68, @0x36954c1b95054e214cf696cae4105e04c00843b72a7294e98f34e41c8c46e304, @0xb27c7be22b0ab3649c937e168e6fce9b6a4a768c5b17acc497179e18e563eaf1, @0xcbbae97610ac23554074e269009185a0fd2a8747a4046a38d9afb12cfcb1dc0f, @0xb6b577eb90ce195f97bf8eada9f6eb6e0bac8d92fc765e669a7fab762ccbcaa1, @0xa78252adc4791476c2ab6033e33ba3b03c897f68e3cef803f4c7e4dade8b6ceb, @0x150e4351f21492e8a07826716f24c8ef33897983ed8108e110b16491d15cbd67, @0x4ab835a80a2a82d48781072e13a0dcba14dd418d495fcbba02d51185ea46ffee, @0x80c80033948bf422b13535871680036d555c50dac9875cbb57c9f309e5017818, @0x727fa586adb9815988b03f29e71dca7b4d03e7ffcce9cabaa2aceafe36c642c8, @0x51ffda20733d6a852da7e21edb4e691ee1e63d818322298fc0a04ad5ac4826b3, @0xc0c3d9bb0d807d6ffc5b16770c747c49815e2a272130e244569a6a4f7d2d6b51, @0x31e14f1d8fd29b1cd0600b90d885ca98ec8a5ffd00e62b4f02e57fc0d65a7331, @0x35e5149652d619806aee62344bca8ecd8df830c4fc9b50d3723d5fa2c54fe265, @0xa2537d07a00e3e9959ffd075d31514864ae6d5775e64ccb9b5b9c4a5bc5b59d5, @0x59c1694f7e56270834d49002564d4cf162e815a3f63a8a17892ec84fc85c1c9b, @0x26fcf85f7e01cc62ec0c56260d7b9e78592fcdedf45e1bcae325f57d2c3afe4c, @0x513141677e6bd45784079f0564e0ffee836175c8dfc918ef962f2eee95f89ce1, @0xd2bfe42315ae52ae6af3efabbe91c0fd7d149b7fc75d43139a7049099f609b80, @0xe3856691f02ab61e7efff870a432dd45f9a38f72acb48426091d4456761799c7, @0x144f634c813272f6584d6af2fe7f5d80c2dc1c213927d50025a9672a0b6bf259, @0xdf0206fc774e2ebf44534c62f9f66e16e11bcb66321748bc426cf207eb40b073, @0xf129cedde545d14787c6ed3da2a0d585fb2052a5674d171aafdafc8f1601d8da, @0xc3a1664884d7c1b7857da0c41839558ccf881f39b6fd592ef1eeff7c54ed30b3, @0xd694761c946c5feae568329bf2259318dd8caa62de37a98cfb18b0d9d1d78704, @0x8d1d4610e80f396437992140036d2d4e339abe78bd5f1433b36bbf16a1d78cff, @0x307f6f2892edca8dfa94eec9b3da9a4764aaa33d0570973f60806a0777dfd38, @0xeeda3763f487530849e44fac6c0a3755e761543c0f69a198d011ad694fc55139, @0x9570e91efccd67798e80961e69975637b5007429889bb019b05f961a61a5790a, @0xf554f8a67f619414de49ce56d72852f012bfe2d05570597596a0c3cec4fed8df, @0x89602bc751d55fa5567262b7fbf4d1d4cb25cd4bb5f359cc4f5d164c76743cc6, @0x7a9eba6ddb7347da230a90ac93b7bd13855e6c49cb3e356c92c40320edb48bc6, @0x6d3b941ae0c1701c93d4d7edfb759038413197dfaacf0b9c1c4f1623166d4819, @0xaa885e5dc95f0abe3184055e79d9e93be618bcdfd4b48b5969f659514a69fe2b, @0xb497c8b731144824ea6edf27e05fc1c7dcbaa9a4b64321fad61d03679d0d21fb, @0x3b0a8f94e89a0c237d8611e492b22123bb6c405d99c9ff4c178a50d8beb1db02, @0xab84f08ee8c5fbff16b4d6e489aa63f52563f818b5d1f4c8cd291efcca63fb7e, @0xbef69b300fec133983b6ca712804ada9f0a67de9708a7154151f0d536bb3293d, @0x256d1a13dfa83d698558f1249d9ea9fae9bb3ee0e07ed32d62c0df678518ab1d, @0x3f11219d7858d53aed3b73443350c77750e7dde40f6a73cf4397f1795c8ecf6, @0xe20de1b7066365048048a774ce57e90307c5709505b96333869630333eb971a8, @0x623c3c070370bf6042fd2451745fbaa752863c9e4a476703a7e898ac476f2053, @0x62f6c2497d37e926d925ac84d2d3350c3d704ad50c8e48bfebb8c35dce589104, @0xaa50b5de7555a6791204b56f4f4ef6c5ff953d247fc6e07e00d7a033a4c324ae, @0xbc3625d14f09ed79c1b3080c31db5f1cea4d33f7c2fa7a8ed8e315e8474d1d13, @0x5c2a98ee052d1e18011563578c480297ead100168805b25d0c7ac2b291ed5cf8, @0x1887ff02e0544bace88c04d241677718deb16ef1b381fcecbe3778faf79db247, @0xba294132e0d884fe4620e253977b5e492fbc02a6eb1751500cacd38500abb8e3, @0xca9243f4b8a18cedd984744e752b65d4a0399556584d915bc85db3d3781d178c, @0xf4a3f94dff68e7be975b5d42f20d4797d26902ca30edd9e3ad8ec7096e4ff069, @0x1a133b1f2ba7b75bc94048d07b9af73dbab5b9ab3a9e7156681e3e0eccf8a347, @0x97a801b28f2c065502d798f2728fc7a67e4c6715b8ec564172de0bd0bf92ccc3, @0xd60aeda323595a2a07ce985c88001dd245b93b821e12de43b8e8e567cfa3d77, @0xf764e2e03662e77a7bb76eb6c20745cf15f899afffd8d4a6fc33e9f16e8ab510, @0x8c72eb02449be2fac4b6d30353c0c7851d282e46e922f1b915bbdea5d3e3ed0e, @0x7bc2f9af840dd49648d0d7910c071b6fe61ec37e377eaccc3597e8f2db5d60ba, @0x49574a8652d12b0767690548f6d8591ed1978e78e9532fd0358ec5eaa70b24a5, @0x4625605acc7311af21dcd7d8e76e93c674e292be1a3b8f6b1e921c3d1b9d2550, @0xc2d4d44f268c068cade8136bee47ddcbb89b1fe8ebb327fb252d329406ddbb22, @0xf966bf25e40ea272b6ef847c47d2f89f85ec7db5913f20d5798738806ff0d7df, @0x2c903cbed5c054b93a8fde4e4e822917b070ac9854e48d72bd528312df3f42c7, @0x7ce9ad7c551d7872e07b4b9c450f439367a17188f56d69c118bcf0a2d58a2acb, @0x656d70263ff589270930dd1715aaaefc8c08bb4f9f9d7a5796c5a224d016155a, @0xe91ef8f0e6bad4f2f9617c5d4c49c9b04e4b61c5a7e55d744a21d90193d5d7e, @0x31d861250aa6d0efa7b72b3d18b3c43a6402f63f97ff173f6c7f1da4852bbfc8, @0xa39f457a71b819257783001c7fea108353f4c041ae85fecfd5fb43b7045a384a, @0x2a78e656965b42647de465c3dded96d823d730940274053e8b6d7ef134958974, @0x18e14cc250f2776abeb88769c3407d5fe70fca03f55b1936ca49b804c8a16f2f, @0xdaa376b392c3eb7a1cf73d4600fa4f7ad08ea456067c1e3ecf42c702edf85008, @0xe96f34bd4d8483370cee48977f38714db25da230f9f78a358e6fce8cae183899, @0x915617c54401317f46f458428b797d666f8fc9e83f31fccdcd7a037444a09e4d, @0xbcb6950255fa2498ee63ffbab44474db709ddc521d0be6fccee65d3cc4176777, @0x1ae56ae14181082174069c0859792e193e69d25130a722d1c8895f50f1f2f165, @0x98edf6df6ea623831c4719b0149a52ccf714a6f699dd616b0622a30acfbd64d5, @0xfdf58ceaa1df82d0036f190c44749ea7c338e9c6e38c90a4223351fd3ba07991, @0x5276146419d08191650339db58e86d56f63a9dec2b581c05c0eb692293ff779d, @0xc7f83048c2a666c3b457329910fc01f1cc486b670018c2c8b173b631808dbbe9, @0xfa1d6ba9ad4315a3bd2b97655e1b2199a14ba968ace210f785d6bb8965ef89, @0x5f96c85da8a5d282f6141d33533ba2d5ed285d261ba5106c4cb9a0d04cb4540b, @0xe7447504b4d2fc92542a5211f425617ff284a087c9e7a81dc8c84345fc07d466, @0x4858d0cdf67365d2fddfe0b48b625c4774ac44ccd84ead7cc17a4a506c75d6f6, @0x4d7720ffa0d0c14b2b9425c80eed0b9b9c5f79e577dcabbeaf34b283429beb7b, @0x84d99a5b018a20244c8d5060f03b761a2c66580eb780b0c07ee11affc1e28fed, @0xefa802d5ebc3ac8d1019951ffa04e3084273d70347881c392eaed38ff424120a, @0x8dc1fa0a41061a299caddfaf0e647c963871e84a14a9118bc0c680460ebc10ee, @0xf1685629188d8f8eb38e1151093abc7c5c88859da1f2427f5e4e81ef5308f672, @0x84c258030e0ae85eaa5e3e16efef7e17f131c0c4abbfee45972c4fd5212db131, @0x788e1626be8c49352ba0be48f1141e8a5579a9d12f720c02a584179c73162afb, @0x44ad11a6631858c0fc94a21a6e2051e7f7e890587f37fac39921a749ff2c4cdb, @0x90ff318c1459a75fb93eca4310de0797368e1c3fdeb22d8c3c08429738b32c4e, @0x110ddacdb7337a8e2d84dc1a9b6c22971bb88aa375ae1847ded60ac7905b34b8, @0xc529a1caa3966741aab47211488516b68e19352b22550be51a44b4cb067146b8, @0xca752bcab1279a81c1295e71fdedd98a024046b9add3c4fd6d4a2b659e88047e, @0x1be843ebc8b1a868a445223ba5e87ae7c5e1be3fb46a861322dc893dec8edf75, @0x7d0cedcc666ae9238eafae805005794a673c482879cef671896c67a963daeda3, @0x96846740e5ac58d2d9dad47978b4b08dc1760094447bdda499ae58d48430a3d0, @0xe1505499996f336941537a91f6def57a4d8497ee492cc254301b3f787eda793c, @0x3f91bdd1f9d12e4598adf733bc1b60df4f44ab33eb7c12ac4ea10d46d3443f2f, @0xa96c20ca13e0fe9cf80feeffb1218c8e115b49e4a8fe877984d7d16f67e2e1ad, @0x77bfbfd7a1d138abe235a4d54d99f7c5cca993714c2a9da57a0652996a8bc845, @0xc8b012f62a769568711619ff84afdaf2c43df692b22b2863c998fb99460082b7, @0x39ede3e918c1878992caab9b7ce24cc22389d4a9e0e29ec1bbba30ed9bdc4b70, @0xdab5bc9deaf63367c6ad6fa7ec237e959b221ea1664238557354d824c91d9ce4, @0xf1b380ce5b26938294e8cd9670e567394838f8ecde8613191ec8f190f47eb6f5, @0xe5edb289313c43a95843896ea90403b1dfb6d9b7a2458279d9ce2fee6e29aba2, @0xcf5fc53c4fd89d4ec06136acfdaf0953a5ee320ed05ea34951b491ed4f3812b5, @0xc9bc8b8ccbab4aaab724b36f65d139a0cd50fa9c321b4acbc64414db8e8e1a09, @0xe076cd63601002addd8b8d460d254d47c0eaa92f9320f8dbebe6d7ac16155d17, @0xd6588421c54a5aa8ff65a0fb68818ab3d2165dacd903b047a6c5105e2e3b3261, @0xfe968db46ab5791c8b1b378ce70b3c249a43e6afab6ac3b1c40d7815431be949, @0x930130987c65555ff77d0707abff0d754d675e5986feefe0d016ce0013155591, @0xb7c3ce1d4eed095441190db77e6b6fc35e14124047b0e370ce1197044c9dd65a, @0x85af598cf452ad41057e631c3d80c1b0ff6f03392fa5dc5e0370a6b5023b5596, @0x326835c7b49df22ad824799ec7659987144961b2b6d29f9da1187f7e7d3ba3bf, @0x505e250b6a42042fc48a8ca73c2cc0488cd6fe2812216e2b71e8ede4dec4eaf7, @0xff533ae58bd574171bedd31e2c52a4076dfe3c1a4b84e3008fb4ed8bc4c7773, @0x142a064ba8affa31301953067dfbba210bd9262298a88f90e5a992fa9ac10d4e, @0xded55f517840bdaaafac8878852f193c93ddd61d4c5d7cfd44f422d97f564929, @0x4828f66fac7c6eb83979ccf97c02c15cd714b4abd151aaaa476a9e95334cae2e, @0xede1dbaf403420cbfa5f432de86c665c67816c6cb63a3c2e4fcac075a5b8b5eb, @0xb5e4dd7212e8214430b405691e44d724d80abd3c7e31f82cd0e1b24024a5b13c, @0x71c57edf794690b751dfad9754524950022dc59825ab4a1ebcee5c967651f6d6, @0xbd6aae85668a5df49d85d94cdc5c07a14aac718e443c91cdc1cbf4a62c3baefd, @0x105abf703f182e3e0b6e9527ab1eac945153ca1b1d97665645c270c83aef1ea5, @0xe95e0c0ef9f3a1b601569d112088947ee4a7f7fe9b0e1d5fec85161e67787b3d, @0x1d9b4b0f208948e07a76c5dd7644cbcaadf7b7bdcee000d07d975fb34250524b, @0x7d2e7a7e30a0b17b343866fa33c68b8424f26721759931c46c49e9dab1998e71, @0x32310c898261920f00803b6e8e21e96c81f9e7b3ff956047fc5a3eddc697ec47, @0x2084926a41a6bc9a61e8eafebeb25818ac32c2661e9cd96a41408aa882d6c344, @0x1615c15b27718fd21acfd5f31f04f6ab5b1909511e89bede7aecee3e7f9dee89, @0x16a07583f21709790b6bafd116fb1371b0123e10e08ea101e692998313b8d3e, @0xabf6cf2f22ba55483f20718d21e6c537b0f310c77c14bea51e02c9941bfa65f1, @0x772b109358ee2dc9a03cdb4729edc15d108a744350763a7648b63b205d99acad, @0x7fa1fd6c0e098e9fa33617556ce1d69e8be420f7679543baa36c0169303dc0d2, @0x7898a916be6b258d6dd89be00aa1ae29e7269898d8cad7a1e8a9edb218fb4189, @0xccf9ee12b268627159392967bd5f2722a2470f6ac940a0c55b197b031619a500, @0x42279126290adf30ebd29d37005007a39f513e63af13c79e0e1e98cc7654e4b5, @0x26614a1522df5bde45593a576ec039caaaccb870e0b237974429a0435d752016, @0xd0ef27e221c63e4d2773d90efc4af80f50f7da48c6894be551ba9732f4164f4a, @0x14fdc8a2736431fc934df58e05a8a776826cc88f5f336250054941b0c476cd0e, @0x1cc19e48bca44017a108cd16d93954c93706befdf4f3b6d70f8f74cb422f6a41, @0x42a2cadbb2ef269dce98dfd821083263ac3cce4b20143a9287afcc1fe3cab1c9, @0x82a839cb839a8003daa0a33d25bb3b816d280cb99fd648d8ff2ff1b8644545a9, @0x919ecf65695e1cb6f4b3f08dbc80c2831cf2f73aee8471a2778a011e1014a75a, @0x15b9334bb875118878febf017dcb5b7832be269e0f31233910a4126c489bd4d7, @0x5654533ea8486d56236bac3343d4b615742b27c44197498010c43f44a384644c, @0x571c77f2513bf417cea22b21f207269b70fffea4d31fa0358bef41a33cf54c7f, @0xecd7aa94bc966d16110bdc12c01ce1f3209c3fa0887aae4b877e8fa50bec7463, @0xbf543bd8e956e4ac87a9377ee7000cec70691ab55f95c5a74aa587e83a6a8db6, @0x488adea7f614ba32d99af2642dffbed73b87df48022d41f21931db8fbdfe4f8e, @0x1e044b9b912f9bff8ed8e730653063553e36c85ba916cfc33860939749a1f34c, @0x949c0894dad8f2bfc16ead1c6d845129fb585c1bf64973203be736cee674d067, @0xfe724284a430f29104a8bce5cc58d610664251f277d3a609b72d99e5fb4fcdf9, @0xbeaf821817333e96d20637f551fe68fa93b31e2c161f151bb2e95c0abf7dbc52, @0x8e607e43f9cdb4d301217ed019bc4a4ad695a12a277a8a675a9b6119702e6706, @0x4dfa7453ab2ed3dc589507348160f6961bb4c8aaaaa2b75b32a54f0e9c365cb7, @0xaa782e146dda0b80f242820f12f9b1e47e18f3436a6c1fb938e1aeb6444c928, @0xd3b1b799d2cadc30a0b60101ba9534567d49da94b99124454cd54d14bd5c0f8a, @0xccd398c7a3421700aa12fcb980702166a44bf843f1d4918f0630dbba5f7f6cb2, @0x2f6a8fddb9b17af40e6e2f865e3109e5733f0ed68f742a3defc326717b9f90f2, @0x5488842194f798277d3568a7bf65fed010f184b2cb99c48d3e61ffe402592807, @0x2b9b14922cea02174f27747351c0c29fa48b632a10c1e683ab805517923b24c2, @0x1e627417bd64b3344f3cb0adac554f83633d194bc7d87887e7924342a79070e1, @0xb04690f7fc071c294d993e17523996660fa35fe404eb42b467d900dd827fb7ad, @0x9f0371e67923b035a669ef8b2fd2398f42058a6dae555d94f8e67a1ad430400e, @0x3b4e29325042d4b519eb0ef5e5ddf7a97d39dcfc5b138607d1c0fe6a333e9b6a, @0xfa0fd0a01a55f8f531d9167a9c53667715c62100862018abe0a52109120a249d, @0x6fc28b72a3c064ec96f1e7f5a419ce6945b2511a76c369ab0fced89f618545cc, @0x918d4775c00652fadb27f7221260a1504d8f4792a918fcd0bfd11b1b8a02e0a1, @0xb98cf191f1e2430b68b7133b0614b01e8e6e7f053016dfb991721dce34831c00, @0x2363644f046134ba20c4c3acc65e7e62b36ac73fac0739ec5d9fb156e5aebb43, @0x3458ee76e26de49226bbf2894b5d39bfa83c1f55b31d9dc29b035200bb422bc5, @0x3566e1fc4c12b77497861fefa21a4dfd16ba51b538261e73ea238446bafa977b, @0x988e0e993b5ede4ac418dc403c4d5722855c1471a1c5dff3b01afe5b2aa3e3d2, @0xd860cea58a3c7b875b5421294570d93077a47b4320976a889d9a782551291b97, @0xd4931d90b86ceb6e07e287fbb596902ddef634cdcc407e64e9af05100275086f, @0x8386de734c8fd2d3650d5fff304728bbd47a30fa812327cc729ed6c12217737e, @0xea2b9b1d34eadcb87af958dd309fbcf7bf9a6a058918f69d40bc8a66ea61ca8e, @0xeee595493e9e65943c7a5fa90e836e3b68785252611b6778cc736b66fca5804c, @0xcd0f902ef08d2e0f2a5f0983f70ead8e40b2b85d73114376ab8cd5a806481e48, @0xe67c644645a017b6101b0ae5ce0937089622db8bf716d3b958343bd4d3cdaa2b, @0x6f1fb65466e4ce452ffdccfc177d86d916f09d87f21ae58f098c711ada650c3f, @0x1166e07943ac73d6d1d9e4a53afdce081a0020c9e129758ddbc2611ff818e86d, @0xd2add7bfec6f40879c20eff8a4b2a9fd4c4f9248f22515c183e61b4d08724c48, @0xab7762dfb505e7c6a2899a9a6c24897c5b953ea9b422b1f5321b584b5f466606, @0x502f80037f1df166c75c081529a22faf0f04fe11e6869ae8d85a39e48c5a2621, @0x75a224a5e68d8d34d03d6c5089f25bd428b68e841ed8cfca4dbf8c6725eb0ea0, @0x153b0d8936502d8381af054dac55bf98db7c820c4da8cefbcf7542af04225efb, @0x4a700cd1c6b0e9831f094481bbb66bb02737593a9dea866eae564ce779bb5275, @0xfcd8c390c47ff25b871a21b3e98282d98c6cafc5132a0ded9d3a9931c2a9d3b9, @0xae519eb5f669a8e09aa418d260a8454a4d2adede472aa7ca936d3c60d2d6da5b, @0xba88b628f3a0ffc9b72027d0ad8b7fce21af6134c61c29a34c614ca49e32496c, @0x4484c9d667739ee4a6e27d64836aa7f27cb0ffafc3d453017b84a0ca2aea2cbc, @0x8f1ad137ea7a987b94ffd97bbe31497670bbfcaca67af48da2bbe56eca9d4f8f, @0x3399ea893517b0a0011df7270e26d6f76880c60f374b98afe241062dea0aa662, @0x16a62650b383574bd8ee5a0f9eb7edaaa4b4537509c9d20ffe2e045be6c99c18, @0x6f2ba1a95013732752770cb60033847e3cbd9b1accc98258d5859854e504f45e, @0x92f8f5f77514aa77984a599b71e44961d3d4d989430c22628cefe9a585c6642, @0xf8a6c989b2c433af6005bcdfd90eb7c1292e8afaa61e3430dcf0dc428fcb6494, @0xfa7ae25f9a9b69413a2b7cf70a08dc8831f0780c7790585e2c566ba005f66b4a, @0x9ecd7a1300952254cec878e04265fb3ffc27bef6e69ea668a16bbceec46f491b, @0x1ee8016cc85555f5ba32a51abef52e281c385c63427dc1286490d7f2e975d1a3, @0xf347b5d2c47e5dd5326d065863cca1b122e5cf437ca728ac88a39d8d5173c512, @0x58674eb74973d64b8729a8dc8759e855af2e802b3bdcfdb35f9af375cccf9dd4, @0xdef7feb4057b681544eeb6d0484354d67e9d032019017b4f2f62c76256c9ac65, @0x2b138d48d6ae6b14b9d3e6f9cb33c8c85e1173b51b0ee9825f0b3d0d8dd1e554, @0xd9b349d0fda13c43912344a74ddeaec45fc92a9cae55ed33112538ecff0bccd1, @0xe195b219fe405ebbb19ec8bcb0b3f5a2538a8ad968748425bbded97405cd5c28, @0xbba93b52aab4e9ebcb6024a04da8db3b9fe9b9a8dab9f133aa955687e11d4b91, @0xed468215b56a42071ad7157dbb9f87688d6e326d83ffe2b9cee8843817e9f141, @0x6810dbb7c7c90b8b9a91393601fba2c20d49a772a69a106628e8907d855c5d0, @0xb6dbc3c07373756e7563c275cc49e6f790cfbafe16e534f67c359ac3c527217b, @0x78fe945fa2bef049880bf7ec47b28f3cb1143ea5fe82d1f9c6a6d33e7a7dda41, @0x9982a8611e4f728a6862e57803f8962870285c033eb460fc78bf128b82d70984, @0xebf0a3169215baf0ca1153cad727855470fab768c8cf0fdc6c7b508449ec4463, @0x396e76568a7204722ad53b90b9e0d321bbadd111781709468913036dd48bf11c, @0x40e6c74932bf612cd0bd2c6e3eeb756bf7d491ec793dd4306c84a0a9e4152b07, @0x39bb243448fdd4434d1c431acca64cbdcb9e444180b83f9667f5c6bf5bc2e55e, @0x288d13fe89f83f356e53b5bd97eb16c9b3768aad2769ada07fd4096a2afac172, @0xf77165dd89cca2d58b344aaed0473282fae0bce533114e823a0c72b1c3252b91, @0x9ae005a812d6ea39e01031593cf8a00493d20b18b0e92c89c773166266d28da4, @0x9ab49580c26f2a85eb0d6b0237c6984fe67a8da51b937ce587411203cb443546, @0xa3600300a6e6df0d3ecaafa638937c4897e370a4324906933ebd8c519962351a, @0x8b38b8b570a4f4709d46229cde14e0d140e0f9b461c88e46ba87369ad08a73a1, @0xfc53a094d68532f8a0a7cf949848791e97c68d656f9a2432d07552e91085753b, @0x598a64d325f044640a71b071850122e552fe4a5d7d68363bb55701aad4060790, @0xa6d902d91fa6441ce74d43cafa2b1439e091ddbe026339ae35f333224a81d04e, @0x6097d8b12bbd98d406b4e23c3b34458b9ce2e4b5cea238fcb92ab1f7508c5598, @0x6501738799410e38f933cd523cd0db17f5302d13e8ccfefd508e2164786e975f, @0x57c45853df31a5a3f3c8b448c01994598a64ac4efcaef6916b7da6cd16d25eb5, @0x7305cfa1510730c58f7121ca5d761ea418ba7c143ab6226636fc315f23f65702, @0xf1e33fb204fef1609d7d3d0b208cd7018e14ae3c9f8cc95bfe4b41d03c8dd4e3, @0xddafe5027c0de43142eb4fcc9d38af7f7bf9f6a8d2f9148ddbd4eb2785386cd3, @0xc2f4559742bc1a1ef58f2d3c471f4c6012c6f0dd87873ea28765e1ac6420e6f4, @0x2c48c4f204b39ad61d044453b24f4b102cb6843f1d968c8c435c0bd3d828c29c, @0x325e254122a0ea55fa9111ea896d20beaad190b83d416ce1dd2594d2446a158a, @0x91be7477fec391442d2314cd694efebe39812b0a27bf593c1385b175583151a2, @0xe055c44d06f38135536ee14aaf4e9463ea4b04ced63e2269d62d143732f126ab, @0x5054c709b67c98c57a327d8e992a870e1eed17fde50f5ce3f7754973b49484ab, @0xc4022a388b454c38269846fd92170b2977dc6015c382025bf270ce65e1b704fd, @0x6a3f7fdc525e06f2fdcffcfb7b46d4221312450e13592692b7556d40a55448b, @0xb0499eebfb5161a3075f120eed9c13f39ec3671137738821b7a544bd6425a844, @0x36434dd2e0a975c5db94081a7409d7dee7aa9421fb0b1922a34b33679b2e3821, @0x3901bab7a32be3fd75bf5cdb05cf2f64dd9229018ffd16a00e59dd1e66677e37, @0xa78e3280017e378268aa72f7b07d9776b22c4656be1d67d4b6abdc86f0585a32, @0xd43023331e9fceda4e2e5f996b584391bcae69dda6b658286ccd3e9f155f9ad4, @0x518f44484ac617e2ffb0d966a591778b7f9c33a6fa958b3e7d69b51a1e35c6a5, @0xdcaf827f75e3ebb289b23f57d834bd92e8aed60c09f2fb9159f23427bab0666b, @0x497cf4c4ae527c1027d3b2f52c013f0e11f2e9042f1e24c3e6e8d0dad0cfaae4, @0x514101f6404c2bf13da87c1cf3d148c93b0b910e7e826a14577a8696b9dbe3fe, @0xac39cd2be78f848f4dc0ef6fb5c9a5a6e78a6ce1618449eedc07712664c7f697, @0x887850e3aadbfd650d4ad2fe6b3d6b977f1c156e3f5030cb371644e706b19201, @0x4a9a37babdd1db93bfe75728190e6d93d62e5bb3936c56c272e915f52f30a5a1, @0x4700cfae994a561410f6c1f40004f41343ee44a3193c63a2f7f8ebab28bb1670, @0xe7983c5f8961d3dd746fd09b5d096dd01849322389b653f7b8212a8fd000c93c, @0x7643f969344a94cecdee046de5df40cbb4b3362e755c84ebd47398925a13c132, @0xb3fe117edffefc0883bfe22a8357ed7abeb063389c74be8a9d62acf25f9c3774]
+    }
+
+    // decompiled from Move bytecode v6
+}
+
+//# publish --private-key Alice
+module 0xbbb75fa0541df726acb791a1cf919b11ccbb31d2d0546a9df77359202aa82e69::values {
+    public fun values() : vector<u64> {
+        vector[784042861, 731703328, 627427227, 480194904, 448763913, 369639437, 368990020, 339567419, 336091097, 330368286, 309883597, 306323510, 292125283, 280873590, 260288986, 244147755, 238391109, 224585968, 221686474, 220018711, 219971903, 215156936, 208999520, 198798781, 192990411, 192053779, 178545542, 177505153, 172604485, 169135513, 166658626, 158308551, 150304204, 149315443, 143583737, 139597922, 137546241, 134251623, 131763493, 127346381, 122835822, 121832197, 121267937, 118082471, 115579423, 114769586, 107825313, 107401973, 104405621, 100675375, 99743310, 99671227, 97191797, 96329877, 96074954, 95516298, 94822007, 93797146, 91785748, 90590503, 90338021, 86875188, 86498722, 84884699, 84688241, 83771041, 83483486, 83435084, 82627936, 82330314, 81706143, 81401148, 81391185, 81100890, 80871457, 80461222, 78419324, 77511249, 77114143, 76068678, 75517688, 75487275, 74013351, 73823208, 73006507, 72071711, 71890053, 71322592, 71227218, 69612396, 67820449, 67388818, 67352028, 66860045, 66306760, 65505333, 64915825, 64841579, 64636017, 64618769, 64508697, 64447073, 63669755, 62984166, 62915002, 62484906, 61358231, 61205875, 61049648, 60904764, 60732411, 60707840, 60334649, 60152838, 59888559, 59372561, 58665964, 57493630, 56658773, 56657472, 56657451, 56657448, 56657444, 56657441, 56657438, 56657429, 56657421, 56657416, 55738560, 54729978, 54612806, 54426283, 53879520, 53573532, 53224252, 53032349, 52973993, 52636280, 51926695, 51488892, 51143392, 49540937, 49470089, 48907987, 48616218, 48326460, 47431824, 47000941, 46891507, 46831952, 46688694, 46602146, 46464095, 46053089, 45736737, 45600052, 45275857, 43796324, 43593424, 43220921, 42987658, 42542852, 42479992, 41832676, 41692703, 41066748, 41066059, 41038316, 40905173, 40761881, 40728311, 40272910, 40205861, 39584988, 39127507, 38880603, 38671775, 38266189, 37907951, 37729098, 37675831, 37618689, 37584098, 37559046, 37540201, 37462105, 37454934, 37357840, 37021382, 36727720, 36565357, 36379979, 36104340, 35802721, 35542733, 35349884, 34804051, 34686075, 34628776, 34607603, 34561502, 34417788, 34214279, 33956698, 33837347, 33822166, 33664996, 33619035, 33310262, 32919369, 32813815, 32662979, 32626701, 32546606, 32528882, 32318041, 31927035, 31867719, 31682292, 31638136, 31359300, 31271856, 31085256, 31083765, 31044367, 30959328, 30939170, 30936185, 30918017, 30816019, 30787008, 30768585, 30742052, 30538172, 30506761, 30500805, 30381477, 30331081, 30292506, 30025097, 29803907, 29662272, 29509069, 29407454, 29218440, 29110141, 28887128, 28882798, 28855824, 28809126, 28749351, 28604594, 28420032, 28318040, 28173804, 28133954, 28133952, 28130402, 28015862, 28015859, 28015858, 27995405, 27880544, 27845023, 27833081, 27832621, 27756040, 27701099, 27548474, 27295377, 27265076, 27228641, 27208031, 27202592, 27134428, 27068312, 26969528, 26955643, 26899041, 26857627, 26768154, 26622287, 26585954, 26498022, 26331149, 26262784, 26219586, 26201276, 26194452, 26161084, 25944116, 25944114, 25908581, 25885183, 25885183, 25807854, 25785774, 25769038, 25724890, 25665341, 25547911, 25526667, 25500216, 25471225, 25458068, 25331051, 25246432, 25211272, 25188884, 24965263, 24949642, 24803737, 24795447, 24783637, 24605418, 24567042, 24540121, 24480428, 24411631, 24393168, 24311287, 24305853, 24227098, 24193778, 24177897, 23978923, 23960746, 23933478, 23916422, 23741352, 23704581, 23552145, 23389588, 23378970, 23342067, 23245734, 23216302, 23204333, 23157707, 23084522, 23077354, 23061567, 23036553, 23018326, 22976230, 22955875, 22929919, 22929440, 22792932, 22792220, 22712157, 22643506, 22632017, 22622605, 22609256, 22605710, 22593502, 22581447, 22451222, 22446311, 22411798, 22179705, 22096677, 22090766, 21954972, 21777081, 21772317, 21735890, 21672331, 21655823, 21640394, 21545036, 21530743, 21514017, 21504512, 21399298, 21380058, 21336479, 21317511, 21295108, 21293318, 21235444, 21139229, 21080556, 21038333, 20962589, 20919825, 20882402, 20824579, 20818046, 20811905, 20811578, 20811346, 20790242, 20762047, 20695760, 20653439, 20636452, 20611071, 20602774, 20529115, 20516582, 20483559, 20454317, 20419142, 20350817, 20304281, 20303788, 20297069, 20296285, 20290351, 20220174, 20218314, 20157426, 20125725, 20124747, 20090354, 20049432, 20044885, 20020439, 19903013, 19902624, 19884592, 19840758, 19829410, 19785850, 19785369, 19780003, 19752298, 19723970, 19680699, 19520338, 19519482, 19518114, 19482920, 19458070, 19456708, 19394877, 19393852, 19390418, 19337693, 19336465, 19304112, 19255981, 19250928, 19248791, 19205937, 19205251, 19188711, 19072145, 18984651, 18978757, 18857931, 18850605, 18780023, 18775463, 18726440, 18723600, 18717644, 18707062, 18696718, 18579335, 18562954, 18547018, 18540137, 18518462, 18469819, 18439247, 18411641, 18375390, 18293210, 18247773, 18243250, 18152756, 18131267, 18102215, 18054771, 18051621, 17988317, 17981542, 17904723, 17900930, 17864288, 17854432, 17788719, 17788718, 17788715, 17788714, 17757495, 17742251, 17698514, 17695527, 17648900, 17580056, 17531449, 17445160, 17441512, 17247032, 17237401, 17167171, 17021588, 17015295, 17015295, 17015294, 17015294, 17015293, 17015291, 17015291, 16942385, 16911335, 16846857, 16836682, 16788624, 16787224, 16771830, 16771453, 16770590, 16769186, 16767567, 16767564, 16695826, 16688123, 16671617, 16666795, 16660533, 16629364, 16599916, 16589084, 16587650, 16581198, 16570605, 16561640, 16550518, 16499928, 16495963, 16458794, 16448567, 16410846, 16380872, 16379517, 16346146, 16334022, 16329879, 16288058, 16242269, 16242258, 16241928, 16241886, 16241885, 16241885, 16241884, 16241883, 16241882, 16241882, 16241881, 16241880, 16241880, 16241879, 16241879, 16241878, 16241878, 16241877, 16241876, 16241875, 16241875, 16187422, 16172010, 16069019, 16052273, 16038890, 15980379, 15970636, 15916381, 15901539, 15898706, 15898706, 15893453, 15885719, 15837960, 15817177, 15803158, 15772988, 15762143, 15730636, 15705905, 15705905, 15694125, 15690431, 15659910, 15652065, 15652057, 15634337, 15580478, 15572910, 15548856, 15548177, 15532503, 15515803, 15487997, 15485321, 15481256, 15480102, 15471838, 15387614, 15379289, 15327584, 15310014, 15197676, 15187311, 15171591, 15151533, 15117338, 15111347, 15104658, 15065867, 15064113, 15056467, 15035569, 15019811, 14989801, 14982498, 14967959, 14936800, 14896483, 14744053, 14724229, 14723827, 14722499, 14633713, 14608024, 14565094, 14553668, 14531833, 14478880, 14462946, 14459945, 14458254, 14458253, 14458253, 14458253, 14439665, 14439659, 14408585, 14407071, 14372213, 14317896, 14283628, 14268119, 14249053, 14248115, 14203837, 14193622, 14177347, 14144858, 14136959, 14111770, 14085048, 14080687, 14080311, 14072548, 14056515, 14040059, 14033112, 14013325, 14000016, 13949829, 13881732, 13859495, 13745900, 13743134, 13743134, 13675082, 13672625, 13668418, 13657681, 13643483, 13639236, 13601096, 13601096, 13601096, 13601095, 13575998, 13573560, 13535677, 13523925, 13511580, 13511535, 13460339, 13443579, 13436915, 13412506, 13411098, 13379972, 13378799, 13361188, 13320809, 13319656, 13317324, 13314438, 13293026, 13283418, 13255300, 13250380, 13180333, 13176070, 13143077, 13130488, 13116657, 13111040, 13091998, 13041529, 13016942, 13004930, 12997658, 12940528, 12939610, 12927792, 12926644, 12926643, 12919410, 12912368, 12884508, 12880489, 12869579, 12831234, 12799661, 12642635, 12640639, 12629952, 12609683, 12602514, 12562549, 12530611, 12524085, 12508977, 12484154, 12482608, 12481557, 12468312, 12443334, 12439664, 12437867, 12432890, 12418565, 12417744, 12412586, 12389804, 12387046, 12376996, 12355432, 12349033, 12346317, 12312365, 12306615, 12281678, 12281677, 12281410, 12278445, 12258002, 12249983, 12240921, 12217040, 12199888, 12186981, 12149046, 12100885, 12087757, 12023271, 12017688, 11987863, 11958479, 11950245, 11912558, 11911256, 11909418, 11893065, 11873705, 11854972, 11774159, 11752827, 11733793, 11681587, 11664437, 11635278, 11612546, 11597862, 11556182, 11541914, 11539166, 11495370, 11489733, 11469402, 11427204, 11414069, 11406773, 11401402, 11380488, 11378960, 11374308, 11363151, 11361688, 11353063, 11342673, 11340693, 11329164, 11311865, 11301082, 11301070, 11275593, 11265868, 11246967, 11229120, 11187289, 11146875, 11141013, 11109483, 11103643, 11082644, 11060626, 11051885, 11018270, 10941046, 10907798, 10903636, 10892412, 10829815, 10817568, 10808036, 10783247, 10777311, 10764566, 10738919, 10724379, 10715542, 10714064, 10703261, 10694660, 10630595, 10630595, 10630595, 10578815, 10568836, 10557861, 10519204, 10518652, 10499415, 10479390, 10469932, 10468593, 10444544, 10417314, 10402568, 10380663, 10372114, 10359325, 10359325, 10354773, 10343968, 10335079, 10320452, 10314439, 10303811, 10280697, 10270484, 10266721, 10258215, 10257626, 10241645, 10237612, 10236114, 10230370, 10209164, 10204001, 10196734, 10164131, 10154919, 10139252, 10109635, 10097446, 10095760, 10094495, 10038170, 9990015, 9954521, 9946209, 9944393, 9942287, 9942287, 9942286, 9942286, 9942286, 9942286, 9941812, 9933013, 9916104, 9911490, 9910079, 9900653, 9893948, 9893726, 9893726, 9893724, 9893724, 9892584, 9884637, 9883945, 9833920, 9766098, 9765017, 9762144, 9759623, 9755485, 9747830, 9744318, 9719046, 9714017, 9713802, 9712072, 9703357, 9696277, 9670861, 9667944, 9623849, 9615609, 9612486, 9607468, 9606610, 9605786, 9604036, 9602950, 9602855, 9583443, 9581941, 9580397, 9573102, 9541398, 9534430, 9501914, 9494317, 9469268, 9433912, 9432697, 9399687, 9392175, 9375720, 9373993, 9354690, 9349763, 9349763, 9349763, 9339556, 9336847, 9331760, 9299940, 9287901, 9279213, 9277868, 9251524, 9244977, 9241765, 9238293, 9210725, 9182902, 9182452, 9125806, 9114067, 9105849, 9086871, 9080924, 9071321, 9068527, 9065359, 9035890, 9034701, 9017677, 8997962, 8993786, 8986187, 8976046, 8973938, 8941317, 8938938, 8934037, 8933444, 8933168, 8932255, 8931923, 8929644, 8849083, 8849083, 8848790, 8835691, 8829064, 8797919, 8786211, 8785197, 8783642, 8747637, 8742645, 8742642, 8742641, 8742640, 8742452, 8742451, 8742449, 8741642, 8713587, 8685921, 8640467, 8630805, 8619771, 8611528, 8589490, 8563866, 8556857, 8551445, 8541120, 8533418, 8524446, 8488674, 8487418, 8461807, 8444688, 8434463, 8431480, 8403312, 8397784, 8361248, 8338063, 8327756, 8326924, 8312149, 8312149, 8291919, 8287654, 8232267, 8217089, 8216658, 8212508, 8210088, 8200259, 8197929, 8197929, 8187811, 8169927, 8169684, 8150555, 8127864, 8102947, 8072637, 8065882, 8065286, 8062605, 8062102, 8050427, 8044621, 8039178, 8037572, 8036447, 8036334, 8036294, 8036257, 8036257, 8035965, 8035965, 8022375, 7979663, 7975786, 7945797, 7884133, 7878552, 7826579, 7814886, 7791151, 7779152, 7771940, 7762721, 7757542, 7749159, 7748445, 7733367, 7718078, 7692507, 7672019, 7656276, 7631830, 7621072, 7589919, 7543010, 7530970, 7526598, 7496275, 7483798, 7458346, 7435642, 7433728, 7397979, 7395595, 7394480, 7394370, 7390719, 7385864, 7361906, 7301916, 7301092, 7301048, 7243035, 7220798, 7203094, 7150800, 7148101, 7147937, 7142407, 7127205, 7109353, 7097914, 7044326, 7042759, 6987718, 6986505, 6982205, 6978764, 6978608, 6972229, 6965185, 6960777, 6958007, 6928649, 6922477, 6899453, 6892308, 6887130, 6876278, 6875998, 6871953, 6860407, 6858660, 6843396, 6831301, 6830214, 6789606, 6789449, 6783036, 6758108, 6753894, 6749060, 6731770, 6725504, 6719039, 6701115, 6684600, 6663277, 6659986, 6646512, 6646051, 6612716, 6612187, 6610244, 6593444, 6587598, 6577408, 6574704, 6567577, 6564182, 6551480, 6529117, 6525623, 6511754, 6510774, 6499496, 6464328, 6463899, 6431299, 6421221, 6418111, 6413599, 6403103, 6386631, 6386626, 6386622, 6380074, 6379150, 6370503, 6333086, 6310245, 6296781, 6293185, 6276215, 6273467, 6268872, 6253411, 6251906, 6244147, 6226138, 6224555, 6216634, 6209978, 6209010, 6205458, 6199849, 6190818, 6186397, 6183720, 6180878, 6174731, 6163790, 6152851, 6145547, 6130967, 6127287, 6115115, 6107569, 6103563, 6097881, 6088229, 6088000, 6061827, 6032427, 6020968, 6020958, 5997766, 5976475, 5968162, 5962201, 5961321, 5946507, 5945695, 5943814, 5941851, 5937139, 5935859, 5933172, 5902505, 5873218, 5866940, 5866918, 5866914, 5849453, 5815944, 5804904, 5792385, 5779785, 5764480, 5748588, 5748450, 5748270, 5748265, 5730780, 5730779, 5725775, 5721912, 5700667, 5697607, 5690943, 5690692, 5664137, 5659582, 5658906, 5658261, 5658096, 5635713, 5630769, 5629379, 5624850, 5620625, 5620624, 5619575, 5619380, 5619284, 5607092, 5591063, 5589445, 5586137, 5586123, 5571704, 5571264, 5559196, 5554451, 5547979, 5535718, 5518701, 5518579, 5473300, 5456402, 5448277, 5442753, 5427939, 5427078, 5425904, 5418992, 5414462, 5413961, 5413862, 5412205, 5409891, 5397549, 5395799, 5379523, 5361187, 5360335, 5342595, 5331152, 5324673, 5306308, 5290478, 5284122, 5283640, 5282087, 5278577, 5274132, 5272664, 5252308, 5241359, 5241267, 5235576, 5231438, 5229201, 5213209, 5201059, 5187005, 5176039, 5163015, 5162899, 5162898, 5155236, 5149450, 5126212, 5105231, 5081557, 5066721, 5059334, 5037700, 5026685, 5010421, 5006057, 5001382, 4981913, 4974939, 4967423, 4964826, 4932004, 4925942, 4918760, 4904477, 4902395, 4901351, 4897865, 4890940, 4890575, 4887683, 4877147, 4870787, 4867329, 4853244, 4850877, 4837619, 4820997, 4818721, 4806883, 4802819, 4801640, 4797897, 4797567, 4793552, 4793200, 4773762, 4761958, 4754715, 4749240, 4745683, 4732764, 4732763, 4732656, 4717986, 4709977, 4708597, 4707223, 4706769, 4703504, 4703081, 4700747, 4694104, 4694104, 4694104, 4694104, 4694104, 4694104, 4694104, 4694104, 4694104, 4694104, 4693890, 4685172, 4684912, 4683656, 4655163, 4641073, 4612802, 4612749, 4597793, 4586207, 4585007, 4580315, 4567099, 4538907, 4533571, 4530675, 4522196, 4509400, 4500160, 4496325, 4494588, 4488151, 4482033, 4466279, 4457231, 4453749, 4404207, 4348118, 4344046, 4326829, 4322744, 4306717, 4302707, 4290933, 4260342, 4240088, 4231559, 4231260, 4227941, 4209731, 4198874, 4192195, 4179057, 4126935, 4122840, 4098961, 4095112, 4089046, 4086995, 4083372, 4070864, 4070758, 4058780, 4050596, 4030177, 4022655, 4004194, 3993199, 3992718, 3992700, 3980474, 3961713, 3959999, 3942106, 3938661, 3937505, 3921642, 3905485, 3896264, 3884878, 3878771, 3878167, 3860608, 3858950, 3857883, 3856959, 3853003, 3842998, 3841414, 3835478, 3834892, 3831986, 3831920, 3827704, 3801251, 3791406, 3768314, 3754309, 3753839, 3752164, 3723118, 3715826, 3703575, 3697591, 3682328, 3679401, 3676058, 3657799, 3650419, 3646909, 3608315, 3606913, 3601311, 3554985, 3498818, 3487603, 3487114, 3485011, 3460028, 3452887, 3436423, 3435483, 3426452, 3420931, 3416113, 3413699, 3392740, 3376883, 3347605, 3328613, 3313325, 3310288, 3309702, 3302070, 3297842, 3286190, 3278473, 3277798, 3275596, 3266307, 3245449, 3205023, 3198899, 3193327, 3176697, 3175517, 3168059, 3139777, 3112374, 3099124, 3096150, 3095673, 3078734, 3077234, 3073736, 3063398, 3059923, 3057263, 3056585, 3043732, 3039056, 3036088, 3014245, 2996468, 2993757, 2984828, 2977808, 2973594, 2968891, 2965332, 2964428, 2964214, 2964213, 2963040, 2963024, 2962985, 2949550, 2945797, 2941275, 2935903, 2934422, 2933679, 2933466, 2933456, 2929253, 2902436, 2896774, 2885108, 2882243, 2881801, 2881636, 2881613, 2881447, 2881147, 2880806, 2847378, 2829404, 2827688, 2825387, 2820787, 2819611, 2818758, 2817913, 2816348, 2816124, 2813862, 2813029, 2807548, 2795230, 2765394, 2761865, 2757949, 2741911, 2740366, 2737502, 2729761, 2698387, 2687274, 2680059, 2679176, 2671679, 2652650, 2649815, 2630891, 2589469, 2572238, 2556451, 2554699, 2543101, 2539189, 2537554, 2528835, 2525538, 2500679, 2492750, 2487576, 2484498, 2475607, 2475606, 2474692, 2462627, 2451609, 2450714, 2441153, 2429338, 2428401, 2422375, 2403122, 2400710, 2399699, 2384218, 2365865, 2360008, 2359867, 2351433, 2349718, 2346150, 2333224, 2328036, 2318923, 2313697, 2305875, 2298461, 2296805, 2282573, 2280280, 2267845, 2266680, 2266680, 2260978, 2255858, 2254816, 2251273, 2247408, 2243534, 2237155, 2216639, 2211465, 2196936, 2190012, 2183076, 2178319, 2155040, 2151512, 2151305, 2151062, 2134987, 2112177, 2109611, 2107635, 2105287, 2093320, 2092321, 2086332, 2082101, 2081015, 2078668, 2076592, 2075961, 2071727, 2056332, 2056006, 2052130, 2039638, 2039199, 2019315, 2016766, 2003930, 2000426, 1996912, 1988455, 1983212, 1982446, 1975996, 1970169, 1968262, 1966833, 1960083, 1958214, 1957343, 1951074, 1940383, 1938997, 1938725, 1934967, 1934967, 1931070, 1930762, 1929361, 1927204, 1921268, 1921163, 1920894, 1920814, 1920797, 1920572, 1920547, 1915354, 1910242, 1905617, 1889141, 1883307, 1881767, 1881220, 1881173, 1877552, 1877552, 1877375, 1874614, 1874544, 1868668, 1865815, 1862786, 1862278, 1860700, 1857215, 1856705, 1845392, 1837819, 1836586, 1830527, 1816857, 1813127, 1798040, 1793712, 1790543, 1788683, 1782889, 1780346, 1780016, 1770308, 1767243, 1757456, 1750405, 1743721, 1743640, 1741155, 1732970, 1727093, 1725946, 1718038, 1708311, 1705002, 1703822, 1682208, 1680482, 1679233, 1677376, 1670911, 1670911, 1669710, 1645139, 1644158, 1642414, 1641393, 1633480, 1589750, 1578857, 1570265, 1557005, 1556010, 1552459, 1516209, 1514629, 1514629, 1514629, 1514629, 1514629, 1514629, 1514629, 1506283, 1505879, 1501469, 1483871, 1470855, 1458702, 1456176, 1453380, 1453146, 1452532, 1451086, 1445797, 1436021, 1425324, 1422812, 1421808, 1417996, 1416343, 1414233, 1411904, 1411867, 1411216, 1410964, 1408473, 1408401, 1405364, 1400324, 1399748, 1398327, 1391354, 1390149, 1383997, 1379409, 1374180, 1369020, 1362643, 1359699, 1358554, 1343155, 1341736, 1341734, 1340575, 1338209, 1326852, 1326029, 1323337, 1319970, 1317314, 1317284, 1317217, 1317196, 1310287, 1305632, 1298623, 1298524]
+    }
+
+    // decompiled from Move bytecode v6
+}
+
+//# publish --private-key Alice
+module 0xbbb75fa0541df726acb791a1cf919b11ccbb31d2d0546a9df77359202aa82e69::distribute {
+    struct Users has store, key {
+        rewards: 0x1::table::Table<address, u64>,
+        reward_signer_cap: 0x1::account::SignerCapability,
+    }
+
+    public entry fun claim<T0>(arg0: &signer) acquires Users {
+        let v0 = exists<Users>(@0x28da323f24a624144a567d7e8d216b018ec9a03cef8e7755e766d3530f67d166);
+        assert!(v0, 0x1::error::not_found(1));
+        let v1 = 0x1::signer::address_of(arg0);
+        let v2 = borrow_global_mut<Users>(@0x28da323f24a624144a567d7e8d216b018ec9a03cef8e7755e766d3530f67d166);
+        if (!0x1::table::contains<address, u64>(&v2.rewards, v1)) {
+            abort 0x1::error::aborted(3)
+        };
+        let v3 = *0x1::table::borrow<address, u64>(&mut v2.rewards, v1);
+        *0x1::table::borrow_mut<address, u64>(&mut v2.rewards, v1) = 0;
+        let v4 = 0x1::account::create_signer_with_capability(&v2.reward_signer_cap);
+        assert!(0x1::coin::balance<T0>(0x1::signer::address_of(&v4)) >= v3, 0x1::error::invalid_state(4));
+        0x1::aptos_account::transfer_coins<T0>(&v4, v1, v3);
+    }
+
+    public entry fun initialize(arg0: &signer, arg1: vector<u8>) {
+        only_admin(arg0);
+        assert!(!exists<Users>(0x1::signer::address_of(arg0)), 0x1::error::already_exists(0));
+        let v0 = 0x1::table::new<address, u64>();
+        let v1 = 0xbbb75fa0541df726acb791a1cf919b11ccbb31d2d0546a9df77359202aa82e69::keys::keys();
+        let v2 = 0xbbb75fa0541df726acb791a1cf919b11ccbb31d2d0546a9df77359202aa82e69::values::values();
+        let v3 = 0x1::vector::length<address>(&v1);
+        assert!(v3 == 0x1::vector::length<u64>(&v2), 0x1::error::invalid_state(2));
+        let v4 = 0;
+        while (v4 < v3) {
+            let v5 = *0x1::vector::borrow<address>(&v1, v4);
+            0x1::table::add<address, u64>(&mut v0, v5, *0x1::vector::borrow<u64>(&v2, v4));
+            v4 = v4 + 1;
+        };
+        let (_, v7) = 0x1::account::create_resource_account(arg0, arg1);
+        let v8 = Users{
+            rewards           : v0,
+            reward_signer_cap : v7,
+        };
+        move_to<Users>(arg0, v8);
+    }
+
+    fun keys_test() : vector<address> {
+        vector[@0x15a45734c379753a206009781d659817b6e7113091f0be3114b67027958b321b, @0x1e9c0c43d2a7dbead06e9cc2250d1c43d5d0a120e885aa4c6a7361a8a6988f12]
+    }
+
+    fun only_admin(arg0: &signer) {
+        let v0 = 0x1::signer::address_of(arg0) == @0x28da323f24a624144a567d7e8d216b018ec9a03cef8e7755e766d3530f67d166;
+        assert!(v0, 0x1::error::permission_denied(5));
+    }
+
+    public fun user_reward(arg0: address) : u64 acquires Users {
+        let v0 = exists<Users>(@0x28da323f24a624144a567d7e8d216b018ec9a03cef8e7755e766d3530f67d166);
+        assert!(v0, 0x1::error::not_found(1));
+        let v1 = borrow_global<Users>(@0x28da323f24a624144a567d7e8d216b018ec9a03cef8e7755e766d3530f67d166);
+        if (!0x1::table::contains<address, u64>(&v1.rewards, arg0)) {
+            abort 0x1::error::aborted(3)
+        };
+        *0x1::table::borrow<address, u64>(&v1.rewards, arg0)
+    }
+
+    fun values_test() : vector<u64> {
+        vector[480194904, 17015291]
+    }
+
+    public entry fun withdraw<T0>(arg0: &signer, arg1: address) acquires Users {
+        only_admin(arg0);
+        let v0 = exists<Users>(@0x28da323f24a624144a567d7e8d216b018ec9a03cef8e7755e766d3530f67d166);
+        assert!(v0, 0x1::error::not_found(1));
+        let v1 = borrow_global<Users>(@0x28da323f24a624144a567d7e8d216b018ec9a03cef8e7755e766d3530f67d166);
+        let v2 = 0x1::account::create_signer_with_capability(&v1.reward_signer_cap);
+        let v3 = 0x1::coin::balance<T0>(0x1::signer::address_of(&v2));
+        assert!(v3 > 0, 0x1::error::invalid_state(4));
+        0x1::aptos_account::transfer_coins<T0>(&v2, arg1, v3);
+    }
+
+    // decompiled from Move bytecode v6
+}
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 15f367b363a81..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},
 };
@@ -73,7 +73,7 @@ pub trait AptosValidatorInterface: Sync {
         )>,
     >;
 
-    async fn get_latest_version(&self) -> Result<Version>;
+    async fn get_latest_ledger_info_version(&self) -> Result<Version>;
 
     async fn get_version_by_account_sequence(
         &self,
@@ -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<Option<StateValue>> {
         self.get_state_value_internal(state_key, self.version)
             .map_err(Into::into)
diff --git a/aptos-move/aptos-validator-interface/src/rest_interface.rs b/aptos-move/aptos-validator-interface/src/rest_interface.rs
index 761621a2bf3cb..6bbe22df82896 100644
--- a/aptos-move/aptos-validator-interface/src/rest_interface.rs
+++ b/aptos-move/aptos-validator-interface/src/rest_interface.rs
@@ -343,7 +343,7 @@ impl AptosValidatorInterface for RestDebuggerInterface {
         return Ok(txns);
     }
 
-    async fn get_latest_version(&self) -> Result<Version> {
+    async fn get_latest_ledger_info_version(&self) -> Result<Version> {
         Ok(self.0.get_ledger_information().await?.into_inner().version)
     }
 
diff --git a/aptos-move/aptos-validator-interface/src/storage_interface.rs b/aptos-move/aptos-validator-interface/src/storage_interface.rs
index d797bbd4a7282..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)?,
         )))
@@ -94,8 +95,8 @@ impl AptosValidatorInterface for DBDebuggerInterface {
         unimplemented!();
     }
 
-    async fn get_latest_version(&self) -> Result<Version> {
-        self.0.get_latest_version().map_err(Into::into)
+    async fn get_latest_ledger_info_version(&self) -> Result<Version> {
+        self.0.get_latest_ledger_info_version().map_err(Into::into)
     }
 
     async fn get_version_by_account_sequence(
@@ -103,7 +104,7 @@ impl AptosValidatorInterface for DBDebuggerInterface {
         account: AccountAddress,
         seq: u64,
     ) -> Result<Option<Version>> {
-        let ledger_version = self.get_latest_version().await?;
+        let ledger_version = self.get_latest_ledger_info_version().await?;
         self.0
             .get_account_transaction(account, seq, false, ledger_version)
             .map_or_else(
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-profiling/src/bins/run_move.rs b/aptos-move/aptos-vm-profiling/src/bins/run_move.rs
index 795ddb2d2854c..9358930eac58e 100644
--- a/aptos-move/aptos-vm-profiling/src/bins/run_move.rs
+++ b/aptos-move/aptos-vm-profiling/src/bins/run_move.rs
@@ -135,6 +135,7 @@ fn main() -> Result<()> {
         MiscGasParameters::zeros(),
         TimedFeaturesBuilder::enable_all().build(),
         Features::default(),
+        None,
     );
 
     let stdlib_addr = AccountAddress::from_hex_literal("0x1").unwrap();
@@ -150,7 +151,7 @@ fn main() -> Result<()> {
         &mut builder,
     ));
 
-    let vm = MoveVM::new(natives).unwrap();
+    let vm = MoveVM::new(natives);
     let mut storage = InMemoryStorage::new();
 
     let test_modules = compile_test_modules();
diff --git a/aptos-move/aptos-vm-types/Cargo.toml b/aptos-move/aptos-vm-types/Cargo.toml
index 72f92e55e866b..b2c5155461224 100644
--- a/aptos-move/aptos-vm-types/Cargo.toml
+++ b/aptos-move/aptos-vm-types/Cargo.toml
@@ -24,6 +24,7 @@ claims = { workspace = true }
 either = { workspace = true }
 move-binary-format = { workspace = true }
 move-core-types = { workspace = true }
+move-vm-runtime = { workspace = true }
 move-vm-types = { workspace = true }
 rand = { workspace = true }
 serde = { workspace = true }
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<StateKey, AbstractResourceWriteOp>,
-    module_write_set: BTreeMap<StateKey, WriteOp>,
     events: Vec<(ContractEvent, Option<MoveTypeLayout>)>,
 
     // 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<StateKey, AbstractResourceWriteOp>,
-        module_write_set: BTreeMap<StateKey, WriteOp>,
         events: Vec<(ContractEvent, Option<MoveTypeLayout>)>,
         delayed_field_change_set: BTreeMap<DelayedFieldID, DelayedChange<DelayedFieldID>>,
         aggregator_v1_write_set: BTreeMap<StateKey, WriteOp>,
         aggregator_v1_delta_set: BTreeMap<StateKey, DeltaOp>,
-        checker: &dyn CheckChangeSet,
-    ) -> PartialVMResult<Self> {
-        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<StateKey, (WriteOp, Option<Arc<MoveTypeLayout>>)>,
         resource_group_write_set: BTreeMap<StateKey, GroupWrite>,
-        module_write_set: BTreeMap<StateKey, WriteOp>,
         aggregator_v1_write_set: BTreeMap<StateKey, WriteOp>,
         aggregator_v1_delta_set: BTreeMap<StateKey, DeltaOp>,
         delayed_field_change_set: BTreeMap<DelayedFieldID, DelayedChange<DelayedFieldID>>,
@@ -155,9 +145,8 @@ impl VMChangeSet {
         >,
         group_reads_needing_delayed_field_exchange: BTreeMap<StateKey, (StateValueMetadata, u64)>,
         events: Vec<(ContractEvent, Option<MoveTypeLayout>)>,
-        checker: &dyn CheckChangeSet,
     ) -> PartialVMResult<Self> {
-        Self::new(
+        Ok(Self::new(
             resource_write_set
                 .into_iter()
                 .map::<PartialVMResult<_>, _>(|(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<Self> {
-        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<StorageChangeSet, PanicError> {
+    /// In addition, the caller can include changes to published modules.
+    pub fn try_combine_into_storage_change_set(
+        self,
+        module_write_set: ModuleWriteSet,
+    ) -> Result<StorageChangeSet, PanicError> {
         // 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::<Result<Vec<_>, _>>()?,
         );
-        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<Item = (&StateKey, WriteOpSize)> {
-        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<Item = PartialVMResult<WriteOpInfo>> {
-        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<StateKey, AbstractResourceWriteOp> {
         &self.resource_write_set
     }
 
-    pub fn module_write_set(&self) -> &BTreeMap<StateKey, WriteOp> {
-        &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<StateKey, WriteOp>,
-        additional_write_set: BTreeMap<StateKey, WriteOp>,
-    ) -> 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<Item = (&StateKey, WriteOpSize)>;
+
+    fn events_iter(&self) -> impl Iterator<Item = &ContractEvent>;
+
+    fn write_op_info_iter_mut<'a>(
+        &'a mut self,
+        executor_view: &'a dyn ExecutorView,
+    ) -> impl Iterator<Item = PartialVMResult<WriteOpInfo>>;
+}
+
+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<Item = (&StateKey, WriteOpSize)> {
+        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<Item = PartialVMResult<WriteOpInfo>> {
+        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<Item = &ContractEvent> {
+        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
new file mode 100644
index 0000000000000..f4ca3ff253fa2
--- /dev/null
+++ b/aptos-move/aptos-vm-types/src/environment.rs
@@ -0,0 +1,164 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use aptos_gas_schedule::{gas_feature_versions::RELEASE_V1_15, AptosGasParameters};
+use aptos_types::{
+    chain_id::ChainId,
+    on_chain_config::{
+        ConfigurationResource, Features, OnChainConfig, TimedFeatureOverride, TimedFeatures,
+        TimedFeaturesBuilder,
+    },
+    state_store::StateView,
+    vm::configs::{aptos_prod_vm_config, get_timed_feature_override},
+};
+use move_vm_runtime::config::VMConfig;
+use move_vm_types::loaded_data::runtime_types::TypeBuilder;
+use std::sync::Arc;
+
+// TODO(George): move configs here from types crate.
+pub fn aptos_prod_ty_builder(
+    gas_feature_version: u64,
+    gas_params: &AptosGasParameters,
+) -> TypeBuilder {
+    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()
+    }
+}
+
+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.
+#[derive(Clone)]
+pub struct Environment {
+    chain_id: ChainId,
+
+    features: Features,
+    timed_features: TimedFeatures,
+
+    vm_config: VMConfig,
+}
+
+impl Environment {
+    pub fn new(state_view: &impl StateView) -> Self {
+        let features = Features::fetch_config(state_view).unwrap_or_default();
+
+        // If no chain ID is in storage, we assume we are in a testing environment.
+        let chain_id = ChainId::fetch_config(state_view).unwrap_or_else(ChainId::test);
+        let timestamp = ConfigurationResource::fetch_config(state_view)
+            .map(|config| config.last_reconfiguration_time())
+            .unwrap_or(0);
+
+        let mut timed_features_builder = TimedFeaturesBuilder::new(chain_id, timestamp);
+        if let Some(profile) = get_timed_feature_override() {
+            timed_features_builder = timed_features_builder.with_override_profile(profile)
+        }
+        let timed_features = timed_features_builder.build();
+
+        let ty_builder = aptos_default_ty_builder();
+        Self::initialize(features, timed_features, chain_id, ty_builder)
+    }
+
+    pub fn testing(chain_id: ChainId) -> Arc<Self> {
+        let features = Features::default();
+
+        // FIXME: should probably read the timestamp from storage.
+        let timed_features = TimedFeaturesBuilder::enable_all()
+            .with_override_profile(TimedFeatureOverride::Testing)
+            .build();
+
+        let ty_builder = aptos_default_ty_builder();
+        Arc::new(Self::initialize(
+            features,
+            timed_features,
+            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;
+        }
+        self
+    }
+
+    #[inline]
+    pub fn chain_id(&self) -> ChainId {
+        self.chain_id
+    }
+
+    #[inline]
+    pub fn features(&self) -> &Features {
+        &self.features
+    }
+
+    #[inline]
+    pub fn timed_features(&self) -> &TimedFeatures {
+        &self.timed_features
+    }
+
+    #[inline]
+    pub fn vm_config(&self) -> &VMConfig {
+        &self.vm_config
+    }
+
+    fn initialize(
+        features: Features,
+        timed_features: TimedFeatures,
+        chain_id: ChainId,
+        ty_builder: TypeBuilder,
+    ) -> Self {
+        let vm_config = aptos_prod_vm_config(&features, &timed_features, ty_builder);
+
+        Self {
+            chain_id,
+            features,
+            timed_features,
+            vm_config,
+        }
+    }
+}
+
+#[cfg(test)]
+pub mod test {
+    use super::*;
+    use aptos_language_e2e_tests::data_store::FakeDataStore;
+
+    #[test]
+    fn test_new_environment() {
+        // This creates an empty state.
+        let state_view = FakeDataStore::default();
+        let env = Environment::new(&state_view);
+
+        // Check default values.
+        assert_eq!(&env.features, &Features::default());
+        assert_eq!(env.chain_id.id(), ChainId::test().id());
+        assert!(!env.vm_config.delayed_field_optimization_enabled);
+
+        let env = env.try_enable_delayed_field_optimization();
+        assert!(env.vm_config.delayed_field_optimization_enabled);
+    }
+
+    #[test]
+    fn test_environment_for_testing() {
+        let env = Environment::testing(ChainId::new(55));
+
+        assert_eq!(&env.features, &Features::default());
+        assert_eq!(env.chain_id.id(), 55);
+        assert!(!env.vm_config.delayed_field_optimization_enabled);
+
+        let expected_timed_features = TimedFeaturesBuilder::enable_all()
+            .with_override_profile(TimedFeatureOverride::Testing)
+            .build();
+        assert_eq!(&env.timed_features, &expected_timed_features);
+    }
+}
diff --git a/aptos-move/aptos-vm-types/src/lib.rs b/aptos-move/aptos-vm-types/src/lib.rs
index 43a626727e742..7858bacc0d1d2 100644
--- a/aptos-move/aptos-vm-types/src/lib.rs
+++ b/aptos-move/aptos-vm-types/src/lib.rs
@@ -3,7 +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<StateKey, WriteOp>,
+}
+
+impl ModuleWriteSet {
+    pub fn empty() -> Self {
+        Self {
+            has_writes_to_special_address: false,
+            write_ops: BTreeMap::new(),
+        }
+    }
+
+    pub fn new(
+        has_writes_to_special_address: bool,
+        write_ops: BTreeMap<StateKey, WriteOp>,
+    ) -> Self {
+        Self {
+            has_writes_to_special_address,
+            write_ops,
+        }
+    }
+
+    pub fn into_write_ops(self) -> impl IntoIterator<Item = (StateKey, WriteOp)> {
+        self.write_ops.into_iter()
+    }
+
+    pub fn write_ops(&self) -> &BTreeMap<StateKey, WriteOp> {
+        &self.write_ops
+    }
+
+    pub fn num_write_ops(&self) -> usize {
+        self.write_ops.len()
+    }
+
+    pub fn write_set_size_iter(&self) -> impl Iterator<Item = (&StateKey, WriteOpSize)> {
+        self.write_ops.iter().map(|(k, v)| (k, v.write_op_size()))
+    }
+
+    pub fn write_op_info_iter_mut<'a>(
+        &'a mut self,
+        executor_view: &'a dyn ExecutorView,
+    ) -> impl Iterator<Item = PartialVMResult<WriteOpInfo>> {
+        self.write_ops.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(),
+            })
+        })
+    }
+
+    pub fn has_writes_to_special_address(&self) -> bool {
+        self.has_writes_to_special_address
+    }
+
+    pub fn is_empty_or_invariant_violation(&self) -> PartialVMResult<()> {
+        if !self.write_ops().is_empty() {
+            return Err(PartialVMError::new(
+                StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR,
+            ));
+        }
+        Ok(())
+    }
+}
diff --git a/aptos-move/aptos-vm-types/src/output.rs b/aptos-move/aptos-vm-types/src/output.rs
index 74acebfe99c88..22bf8b0af5a2a 100644
--- a/aptos-move/aptos-vm-types/src/output.rs
+++ b/aptos-move/aptos-vm-types/src/output.rs
@@ -1,17 +1,29 @@
 // Copyright © Aptos Foundation
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::change_set::VMChangeSet;
-use aptos_aggregator::{resolver::AggregatorV1Resolver, types::code_invariant_error};
-use aptos_types::fee_statement::FeeStatement;
+use crate::{
+    abstract_write_op::AbstractResourceWriteOp,
+    change_set::{ChangeSetInterface, VMChangeSet},
+    module_write_set::ModuleWriteSet,
+};
+use aptos_aggregator::{
+    delayed_change::DelayedChange, delta_change_set::DeltaOp, resolver::AggregatorV1Resolver,
+    types::code_invariant_error,
+};
 use aptos_types::{
-    contract_event::ContractEvent, //contract_event::ContractEvent,
+    contract_event::ContractEvent,
     delayed_fields::PanicError,
+    fee_statement::FeeStatement,
     state_store::state_key::StateKey,
     transaction::{TransactionAuxiliaryData, TransactionOutput, TransactionStatus},
     write_set::WriteOp,
 };
-use move_core_types::vm_status::{StatusCode, VMStatus};
+use move_core_types::{
+    value::MoveTypeLayout,
+    vm_status::{StatusCode, VMStatus},
+};
+use move_vm_types::delayed_values::delayed_field_id::DelayedFieldID;
+use std::collections::BTreeMap;
 
 /// Output produced by the VM after executing a transaction.
 ///
@@ -20,6 +32,7 @@ use move_core_types::vm_status::{StatusCode, VMStatus};
 #[derive(Debug, Clone, Eq, PartialEq)]
 pub struct VMOutput {
     change_set: VMChangeSet,
+    module_write_set: ModuleWriteSet,
     fee_statement: FeeStatement,
     status: TransactionStatus,
     auxiliary_data: TransactionAuxiliaryData,
@@ -28,12 +41,14 @@ pub struct VMOutput {
 impl VMOutput {
     pub fn new(
         change_set: VMChangeSet,
+        module_write_set: ModuleWriteSet,
         fee_statement: FeeStatement,
         status: TransactionStatus,
         auxiliary_data: TransactionAuxiliaryData,
     ) -> Self {
         Self {
             change_set,
+            module_write_set,
             fee_statement,
             status,
             auxiliary_data,
@@ -43,50 +58,37 @@ impl VMOutput {
     pub fn empty_with_status(status: TransactionStatus) -> Self {
         Self {
             change_set: VMChangeSet::empty(),
+            module_write_set: ModuleWriteSet::empty(),
             fee_statement: FeeStatement::zero(),
             status,
             auxiliary_data: TransactionAuxiliaryData::default(),
         }
     }
 
-    pub fn unpack(
-        self,
-    ) -> (
-        VMChangeSet,
-        u64,
-        TransactionStatus,
-        TransactionAuxiliaryData,
-    ) {
-        (
-            self.change_set,
-            self.fee_statement.gas_used(),
-            self.status,
-            self.auxiliary_data,
-        )
+    pub fn aggregator_v1_delta_set(&self) -> &BTreeMap<StateKey, DeltaOp> {
+        self.change_set.aggregator_v1_delta_set()
     }
 
-    pub fn unpack_with_fee_statement(
-        self,
-    ) -> (
-        VMChangeSet,
-        FeeStatement,
-        TransactionStatus,
-        TransactionAuxiliaryData,
-    ) {
-        (
-            self.change_set,
-            self.fee_statement,
-            self.status,
-            self.auxiliary_data,
-        )
+    pub fn aggregator_v1_write_set(&self) -> &BTreeMap<StateKey, WriteOp> {
+        self.change_set.aggregator_v1_write_set()
+    }
+
+    pub fn resource_write_set(&self) -> &BTreeMap<StateKey, AbstractResourceWriteOp> {
+        self.change_set.resource_write_set()
+    }
+
+    pub fn module_write_set(&self) -> &BTreeMap<StateKey, WriteOp> {
+        self.module_write_set.write_ops()
     }
 
-    pub fn change_set(&self) -> &VMChangeSet {
-        &self.change_set
+    pub fn delayed_field_change_set(
+        &self,
+    ) -> &BTreeMap<DelayedFieldID, DelayedChange<DelayedFieldID>> {
+        self.change_set.delayed_field_change_set()
     }
 
-    pub fn change_set_mut(&mut self) -> &mut VMChangeSet {
-        &mut self.change_set
+    pub fn events(&self) -> &[(ContractEvent, Option<MoveTypeLayout>)] {
+        self.change_set.events()
     }
 
     pub fn gas_used(&self) -> u64 {
@@ -105,6 +107,31 @@ impl VMOutput {
         &self.auxiliary_data
     }
 
+    pub fn materialized_size(&self) -> u64 {
+        let mut size = 0;
+        for (state_key, write_size) in self
+            .change_set
+            .write_set_size_iter()
+            .chain(self.module_write_set.write_set_size_iter())
+        {
+            size += state_key.size() as u64 + write_size.write_len().unwrap_or(0);
+        }
+
+        for event in self.change_set.events_iter() {
+            size += event.size() as u64;
+        }
+        size
+    }
+
+    pub fn concrete_write_set_iter(&self) -> impl Iterator<Item = (&StateKey, Option<&WriteOp>)> {
+        self.change_set.concrete_write_set_iter().chain(
+            self.module_write_set
+                .write_ops()
+                .iter()
+                .map(|(k, v)| (k, Some(v))),
+        )
+    }
+
     /// Materializes delta sets.
     /// Guarantees that if deltas are materialized successfully, the output
     /// has an empty delta set.
@@ -120,8 +147,8 @@ impl VMOutput {
         // change set is empty. In both cases, we do not need to apply any
         // deltas and can return immediately.
         if self.status().is_discarded()
-            || (self.change_set().aggregator_v1_delta_set().is_empty()
-                && self.change_set().delayed_field_change_set().is_empty())
+            || (self.aggregator_v1_delta_set().is_empty()
+                && self.delayed_field_change_set().is_empty())
         {
             return Ok(());
         }
@@ -138,7 +165,7 @@ impl VMOutput {
         resolver: &impl AggregatorV1Resolver,
     ) -> anyhow::Result<TransactionOutput, VMStatus> {
         self.try_materialize(resolver)?;
-        Self::convert_to_transaction_output(self).map_err(|e| {
+        self.into_transaction_output().map_err(|e| {
             VMStatus::error(
                 StatusCode::DELAYED_MATERIALIZATION_CODE_INVARIANT_ERROR,
                 Some(e.to_string()),
@@ -146,27 +173,22 @@ impl VMOutput {
         })
     }
 
-    /// Constructs `TransactionOutput`, without doing `try_materialize`
-    pub fn into_transaction_output(self) -> anyhow::Result<TransactionOutput, VMStatus> {
-        let (change_set, fee_statement, status, auxiliary_data) = self.unpack_with_fee_statement();
-        let output = VMOutput::new(change_set, fee_statement, status, auxiliary_data);
-        Self::convert_to_transaction_output(output).map_err(|e| {
-            VMStatus::error(
-                StatusCode::DELAYED_MATERIALIZATION_CODE_INVARIANT_ERROR,
-                Some(e.to_string()),
-            )
-        })
-    }
-
-    fn convert_to_transaction_output(
-        materialized_output: VMOutput,
-    ) -> Result<TransactionOutput, PanicError> {
-        let (vm_change_set, gas_used, status, auxiliary_data) = materialized_output.unpack();
-        let (write_set, events) = vm_change_set.try_into_storage_change_set()?.into_inner();
+    /// Constructs `TransactionOutput`, without doing `try_materialize`.
+    pub fn into_transaction_output(self) -> Result<TransactionOutput, PanicError> {
+        let Self {
+            change_set,
+            module_write_set,
+            fee_statement,
+            status,
+            auxiliary_data,
+        } = self;
+        let (write_set, events) = change_set
+            .try_combine_into_storage_change_set(module_write_set)?
+            .into_inner();
         Ok(TransactionOutput::new(
             write_set,
             events,
-            gas_used,
+            fee_statement.gas_used(),
             status,
             auxiliary_data,
         ))
@@ -181,16 +203,14 @@ impl VMOutput {
         patched_events: Vec<ContractEvent>,
     ) -> Result<TransactionOutput, PanicError> {
         // materialize aggregator V1 deltas into writes
-        if materialized_aggregator_v1_deltas.len()
-            != self.change_set().aggregator_v1_delta_set().len()
-        {
+        if materialized_aggregator_v1_deltas.len() != self.aggregator_v1_delta_set().len() {
             return Err(code_invariant_error(
                 "Different number of materialized deltas and deltas in the output.",
             ));
         }
         if !materialized_aggregator_v1_deltas
             .iter()
-            .all(|(k, _)| self.change_set().aggregator_v1_delta_set().contains_key(k))
+            .all(|(k, _)| self.aggregator_v1_delta_set().contains_key(k))
         {
             return Err(code_invariant_error(
                 "Materialized aggregator writes contain a key which does not exist in delta set.",
@@ -207,13 +227,13 @@ impl VMOutput {
         let _ = self.change_set.drain_delayed_field_change_set();
 
         // materialize delayed fields into events
-        if patched_events.len() != self.change_set().events().len() {
+        if patched_events.len() != self.events().len() {
             return Err(code_invariant_error(
                 "Different number of events and patched events in the output.",
             ));
         }
         self.change_set.set_events(patched_events.into_iter());
 
-        Self::convert_to_transaction_output(self)
+        self.into_transaction_output()
     }
 }
diff --git a/aptos-move/aptos-vm-types/src/storage/change_set_configs.rs b/aptos-move/aptos-vm-types/src/storage/change_set_configs.rs
index f0ee9592458e2..d3577e056f222 100644
--- a/aptos-move/aptos-vm-types/src/storage/change_set_configs.rs
+++ b/aptos-move/aptos-vm-types/src/storage/change_set_configs.rs
@@ -1,10 +1,10 @@
 // Copyright © Aptos Foundation
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::{change_set::VMChangeSet, check_change_set::CheckChangeSet};
+use crate::change_set::ChangeSetInterface;
 use aptos_gas_schedule::AptosGasParameters;
-use move_binary_format::errors::{PartialVMError, PartialVMResult};
-use move_core_types::vm_status::StatusCode;
+use move_binary_format::errors::{Location, PartialVMError};
+use move_core_types::vm_status::{StatusCode, VMStatus};
 
 #[derive(Clone, Debug)]
 pub struct ChangeSetConfigs {
@@ -82,15 +82,20 @@ impl ChangeSetConfigs {
             params.max_write_ops_per_transaction.into(),
         )
     }
-}
 
-impl CheckChangeSet for ChangeSetConfigs {
-    fn check_change_set(&self, change_set: &VMChangeSet) -> PartialVMResult<()> {
+    pub fn check_change_set(&self, change_set: &impl ChangeSetInterface) -> Result<(), VMStatus> {
+        let storage_write_limit_reached = |maybe_message: Option<&str>| {
+            let mut err = PartialVMError::new(StatusCode::STORAGE_WRITE_LIMIT_REACHED);
+            if let Some(message) = maybe_message {
+                err = err.with_message(message.to_string())
+            }
+            Err(err.finish(Location::Undefined).into_vm_status())
+        };
+
         if self.max_write_ops_per_transaction != 0
             && change_set.num_write_ops() as u64 > self.max_write_ops_per_transaction
         {
-            return Err(PartialVMError::new(StatusCode::STORAGE_WRITE_LIMIT_REACHED)
-                .with_message("Too many write ops.".to_string()));
+            return storage_write_limit_reached(Some("Too many write ops."));
         }
 
         let mut write_set_size = 0;
@@ -98,24 +103,24 @@ impl CheckChangeSet for ChangeSetConfigs {
             if let Some(len) = op_size.write_len() {
                 let write_op_size = len + (key.size() as u64);
                 if write_op_size > self.max_bytes_per_write_op {
-                    return Err(PartialVMError::new(StatusCode::STORAGE_WRITE_LIMIT_REACHED));
+                    return storage_write_limit_reached(None);
                 }
                 write_set_size += write_op_size;
             }
             if write_set_size > self.max_bytes_all_write_ops_per_transaction {
-                return Err(PartialVMError::new(StatusCode::STORAGE_WRITE_LIMIT_REACHED));
+                return storage_write_limit_reached(None);
             }
         }
 
         let mut total_event_size = 0;
-        for (event, _) in change_set.events() {
+        for event in change_set.events_iter() {
             let size = event.event_data().len() as u64;
             if size > self.max_bytes_per_event {
-                return Err(PartialVMError::new(StatusCode::STORAGE_WRITE_LIMIT_REACHED));
+                return storage_write_limit_reached(None);
             }
             total_event_size += size;
             if total_event_size > self.max_bytes_all_events_per_transaction {
-                return Err(PartialVMError::new(StatusCode::STORAGE_WRITE_LIMIT_REACHED));
+                return storage_write_limit_reached(None);
             }
         }
 
diff --git a/aptos-move/aptos-vm-types/src/tests/test_change_set.rs b/aptos-move/aptos-vm-types/src/tests/test_change_set.rs
index 7b492572b710b..af095be82cd8e 100644
--- a/aptos-move/aptos-vm-types/src/tests/test_change_set.rs
+++ b/aptos-move/aptos-vm-types/src/tests/test_change_set.rs
@@ -4,12 +4,16 @@
 use super::utils::{mock_tag_0, VMChangeSetBuilder};
 use crate::{
     abstract_write_op::{AbstractResourceWriteOp, GroupWrite},
-    change_set::VMChangeSet,
+    change_set::{
+        create_vm_change_set_with_module_write_set_when_delayed_field_optimization_disabled,
+        VMChangeSet,
+    },
+    module_write_set::ModuleWriteSet,
     resolver::ResourceGroupSize,
     tests::utils::{
         as_bytes, as_state_key, mock_add, mock_create, mock_create_with_layout, mock_delete,
         mock_delete_with_layout, mock_modify, mock_modify_with_layout, mock_tag_1, raw_metadata,
-        ExpandedVMChangeSetBuilder, MockChangeSetChecker,
+        ExpandedVMChangeSetBuilder,
     },
 };
 use aptos_aggregator::{
@@ -86,21 +90,6 @@ macro_rules! resource_write_set_1 {
     };
 }
 
-macro_rules! module_write_set_1 {
-    ($d:ident) => {
-        vec![
-            mock_create(format!("0{}", $d), 0),
-            mock_modify(format!("1{}", $d), 1),
-            mock_delete(format!("2{}", $d)),
-            mock_create(format!("7{}", $d), 7),
-            mock_create(format!("8{}", $d), 8),
-            mock_modify(format!("10{}", $d), 10),
-            mock_modify(format!("11{}", $d), 11),
-            mock_delete(format!("12{}", $d)),
-        ]
-    };
-}
-
 macro_rules! resource_write_set_2 {
     ($d:ident) => {
         vec![
@@ -116,20 +105,6 @@ macro_rules! resource_write_set_2 {
     };
 }
 
-macro_rules! module_write_set_2 {
-    ($d:ident) => {
-        vec![
-            mock_create(format!("3{}", $d), 103),
-            mock_modify(format!("4{}", $d), 104),
-            mock_delete(format!("5{}", $d)),
-            mock_modify(format!("7{}", $d), 107),
-            mock_delete(format!("8{}", $d)),
-            mock_modify(format!("10{}", $d), 110),
-            mock_delete(format!("11{}", $d)),
-            mock_create(format!("12{}", $d), 112),
-        ]
-    };
-}
 macro_rules! expected_resource_write_set {
     ($d:ident) => {
         BTreeMap::from([
@@ -147,30 +122,11 @@ macro_rules! expected_resource_write_set {
     };
 }
 
-macro_rules! expected_module_write_set {
-    ($d:ident) => {
-        BTreeMap::from([
-            mock_create(format!("0{}", $d), 0),
-            mock_modify(format!("1{}", $d), 1),
-            mock_delete(format!("2{}", $d)),
-            mock_create(format!("3{}", $d), 103),
-            mock_modify(format!("4{}", $d), 104),
-            mock_delete(format!("5{}", $d)),
-            mock_create(format!("7{}", $d), 107),
-            mock_modify(format!("10{}", $d), 110),
-            mock_delete(format!("11{}", $d)),
-            mock_modify(format!("12{}", $d), 112),
-        ])
-    };
-}
-
 // Populate sets according to the spec. Skip keys which lead to
 // errors because we test them separately.
 fn build_change_sets_for_test() -> (VMChangeSet, VMChangeSet) {
     let mut descriptor = "r";
     let resource_write_set_1 = resource_write_set_1!(descriptor);
-    descriptor = "m";
-    let module_write_set_1 = module_write_set_1!(descriptor);
     let aggregator_write_set_1 = vec![mock_create("18a", 18), mock_modify("19a", 19)];
     let aggregator_delta_set_1 = vec![
         mock_add("15a", 15),
@@ -180,15 +136,12 @@ fn build_change_sets_for_test() -> (VMChangeSet, VMChangeSet) {
     ];
     let change_set_1 = VMChangeSetBuilder::new()
         .with_resource_write_set(resource_write_set_1)
-        .with_module_write_set(module_write_set_1)
         .with_aggregator_v1_write_set(aggregator_write_set_1)
         .with_aggregator_v1_delta_set(aggregator_delta_set_1)
         .build();
 
     descriptor = "r";
     let resource_write_set_2 = resource_write_set_2!(descriptor);
-    descriptor = "m";
-    let module_write_set_2 = module_write_set_2!(descriptor);
     let aggregator_write_set_2 = vec![mock_modify("22a", 122), mock_delete("23a")];
     let aggregator_delta_set_2 = vec![
         mock_add("16a", 116),
@@ -198,7 +151,6 @@ fn build_change_sets_for_test() -> (VMChangeSet, VMChangeSet) {
     ];
     let change_set_2 = VMChangeSetBuilder::new()
         .with_resource_write_set(resource_write_set_2)
-        .with_module_write_set(module_write_set_2)
         .with_aggregator_v1_write_set(aggregator_write_set_2)
         .with_aggregator_v1_delta_set(aggregator_delta_set_2)
         .build();
@@ -209,20 +161,13 @@ fn build_change_sets_for_test() -> (VMChangeSet, VMChangeSet) {
 #[test]
 fn test_successful_squash() {
     let (mut change_set, additional_change_set) = build_change_sets_for_test();
-    assert_ok!(
-        change_set.squash_additional_change_set(additional_change_set, &MockChangeSetChecker)
-    );
+    assert_ok!(change_set.squash_additional_change_set(additional_change_set,));
 
-    let mut descriptor = "r";
+    let descriptor = "r";
     assert_eq!(
         change_set.resource_write_set(),
         &expected_resource_write_set!(descriptor)
     );
-    descriptor = "m";
-    assert_eq!(
-        change_set.module_write_set(),
-        &expected_module_write_set!(descriptor)
-    );
 
     let expected_aggregator_write_set = BTreeMap::from([
         mock_create("18a", 136),
@@ -264,15 +209,7 @@ macro_rules! assert_invariant_violation {
         let cs2 = VMChangeSetBuilder::new()
             .with_resource_write_set($w2.clone())
             .build();
-        let res = cs1.squash_additional_change_set(cs2, &MockChangeSetChecker);
-        check(res);
-        let mut cs1 = VMChangeSetBuilder::new()
-            .with_module_write_set($w3.clone())
-            .build();
-        let cs2 = VMChangeSetBuilder::new()
-            .with_module_write_set($w4.clone())
-            .build();
-        let res = cs1.squash_additional_change_set(cs2, &MockChangeSetChecker);
+        let res = cs1.squash_additional_change_set(cs2);
         check(res);
         let mut cs1 = VMChangeSetBuilder::new()
             .with_aggregator_v1_write_set($w3.clone())
@@ -280,7 +217,7 @@ macro_rules! assert_invariant_violation {
         let cs2 = VMChangeSetBuilder::new()
             .with_aggregator_v1_write_set($w4.clone())
             .build();
-        let res = cs1.squash_additional_change_set(cs2, &MockChangeSetChecker);
+        let res = cs1.squash_additional_change_set(cs2);
         check(res);
     };
 }
@@ -337,7 +274,7 @@ fn test_unsuccessful_squash_delete_delta() {
     let additional_change_set = VMChangeSetBuilder::new()
         .with_aggregator_v1_delta_set(aggregator_delta_set_2)
         .build();
-    let res = change_set.squash_additional_change_set(additional_change_set, &MockChangeSetChecker);
+    let res = change_set.squash_additional_change_set(additional_change_set);
     let err = assert_err!(res);
     assert_eq!(
         err.major_status(),
@@ -357,7 +294,7 @@ fn test_unsuccessful_squash_delta_create() {
     let additional_change_set = VMChangeSetBuilder::new()
         .with_aggregator_v1_write_set(aggregator_write_set_2)
         .build();
-    let res = change_set.squash_additional_change_set(additional_change_set, &MockChangeSetChecker);
+    let res = change_set.squash_additional_change_set(additional_change_set);
     let err = assert_err!(res);
     assert_eq!(
         err.major_status(),
@@ -385,13 +322,13 @@ fn test_roundtrip_to_storage_change_set() {
     .unwrap();
 
     let storage_change_set_before = StorageChangeSet::new(write_set, vec![]);
-    let change_set = assert_ok!(
-        VMChangeSet::try_from_storage_change_set_with_delayed_field_optimization_disabled(
+    let (change_set, module_write_set) =
+        create_vm_change_set_with_module_write_set_when_delayed_field_optimization_disabled(
             storage_change_set_before.clone(),
-            &MockChangeSetChecker,
-        )
-    );
-    let storage_change_set_after = assert_ok!(change_set.try_into_storage_change_set());
+        );
+
+    let storage_change_set_after =
+        assert_ok!(change_set.try_combine_into_storage_change_set(module_write_set));
     assert_eq!(storage_change_set_before, storage_change_set_after)
 }
 
@@ -405,7 +342,7 @@ fn test_failed_conversion_to_change_set() {
         .build();
 
     // Unchecked conversion ignores deltas.
-    let vm_status = change_set.try_into_storage_change_set();
+    let vm_status = change_set.try_combine_into_storage_change_set(ModuleWriteSet::empty());
     assert_matches!(vm_status, Err(PanicError::CodeInvariantError(_)));
 }
 
@@ -418,7 +355,9 @@ fn test_conversion_to_change_set_fails() {
         .with_aggregator_v1_delta_set(aggregator_delta_set)
         .build();
 
-    assert_err!(change_set.clone().try_into_storage_change_set());
+    assert_err!(change_set
+        .clone()
+        .try_combine_into_storage_change_set(ModuleWriteSet::empty()));
 }
 
 #[test]
@@ -465,7 +404,7 @@ fn test_aggregator_v2_snapshots_and_derived() {
         .with_delayed_field_change_set(agg_changes_2)
         .build();
 
-    assert_ok!(change_set_1.squash_additional_change_set(change_set_2, &MockChangeSetChecker));
+    assert_ok!(change_set_1.squash_additional_change_set(change_set_2,));
 
     let output_map = change_set_1.delayed_field_change_set();
     assert_eq!(output_map.len(), 3);
@@ -565,9 +504,7 @@ fn test_resource_groups_squashing() {
 
     {
         let mut change_set = create_tag_0.clone();
-        assert_ok!(
-            change_set.squash_additional_change_set(modify_tag_0.clone(), &MockChangeSetChecker)
-        );
+        assert_ok!(change_set.squash_additional_change_set(modify_tag_0.clone(),));
         assert_eq!(change_set.resource_write_set().len(), 1);
         // create(x)+modify(y) becomes create(y)
         assert_some_eq!(
@@ -583,9 +520,7 @@ fn test_resource_groups_squashing() {
 
     {
         let mut change_set = create_tag_0.clone();
-        assert_ok!(
-            change_set.squash_additional_change_set(create_tag_1.clone(), &MockChangeSetChecker)
-        );
+        assert_ok!(change_set.squash_additional_change_set(create_tag_1.clone(),));
         assert_eq!(change_set.resource_write_set().len(), 1);
         assert_some_eq!(
             change_set.resource_write_set().get(&as_state_key!("1")),
@@ -597,9 +532,7 @@ fn test_resource_groups_squashing() {
             ))
         );
 
-        assert_ok!(
-            change_set.squash_additional_change_set(modify_tag_1.clone(), &MockChangeSetChecker)
-        );
+        assert_ok!(change_set.squash_additional_change_set(modify_tag_1.clone(),));
         assert_eq!(change_set.resource_write_set().len(), 1);
         // create(x)+modify(y) becomes create(y)
         assert_some_eq!(
@@ -615,9 +548,7 @@ fn test_resource_groups_squashing() {
 
     {
         let mut change_set = create_tag_0.clone();
-        assert_ok!(
-            change_set.squash_additional_change_set(modify_tag_1.clone(), &MockChangeSetChecker)
-        );
+        assert_ok!(change_set.squash_additional_change_set(modify_tag_1.clone(),));
         assert_eq!(change_set.resource_write_set().len(), 1);
         assert_some_eq!(
             change_set.resource_write_set().get(&as_state_key!("1")),
@@ -640,7 +571,6 @@ fn test_resource_groups_squashing() {
                     (modification_metadata.metadata().clone(), 400)
                 )])
                 .build(),
-            &MockChangeSetChecker
         ));
     }
 }
diff --git a/aptos-move/aptos-vm-types/src/tests/test_output.rs b/aptos-move/aptos-vm-types/src/tests/test_output.rs
index 381a0b83404db..4b99f02053e6d 100644
--- a/aptos-move/aptos-vm-types/src/tests/test_output.rs
+++ b/aptos-move/aptos-vm-types/src/tests/test_output.rs
@@ -16,7 +16,6 @@ use std::collections::BTreeMap;
 
 fn assert_eq_outputs(vm_output: &VMOutput, txn_output: TransactionOutput) {
     let vm_output_writes = &vm_output
-        .change_set()
         .concrete_write_set_iter()
         .map(|(k, v)| {
             (
@@ -97,23 +96,18 @@ fn test_ok_output_equality_with_deltas() {
     let expected_aggregator_write_set =
         BTreeMap::from([mock_modify("2", 2), mock_modify("3", 400)]);
     assert_eq!(
-        materialized_vm_output.change_set().resource_write_set(),
-        vm_output.change_set().resource_write_set()
+        materialized_vm_output.resource_write_set(),
+        vm_output.resource_write_set()
     );
     assert_eq!(
-        materialized_vm_output.change_set().module_write_set(),
-        vm_output.change_set().module_write_set()
+        materialized_vm_output.module_write_set(),
+        vm_output.module_write_set()
     );
     assert_eq!(
-        materialized_vm_output
-            .change_set()
-            .aggregator_v1_write_set(),
+        materialized_vm_output.aggregator_v1_write_set(),
         &expected_aggregator_write_set
     );
-    assert!(materialized_vm_output
-        .change_set()
-        .aggregator_v1_delta_set()
-        .is_empty());
+    assert!(materialized_vm_output.aggregator_v1_delta_set().is_empty());
     assert_eq!(
         vm_output.fee_statement(),
         materialized_vm_output.fee_statement()
diff --git a/aptos-move/aptos-vm-types/src/tests/utils.rs b/aptos-move/aptos-vm-types/src/tests/utils.rs
index 1161ba80a814a..998c43f37a887 100644
--- a/aptos-move/aptos-vm-types/src/tests/utils.rs
+++ b/aptos-move/aptos-vm-types/src/tests/utils.rs
@@ -4,7 +4,6 @@
 use crate::{
     abstract_write_op::{AbstractResourceWriteOp, GroupWrite},
     change_set::VMChangeSet,
-    check_change_set::CheckChangeSet,
     output::VMOutput,
 };
 use aptos_aggregator::{
@@ -20,6 +19,7 @@ use aptos_types::{
     transaction::{ExecutionStatus, TransactionAuxiliaryData, TransactionStatus},
     write_set::WriteOp,
 };
+use move_binary_format::errors::PartialVMResult;
 use move_core_types::{
     identifier::Identifier,
     language_storage::{StructTag, TypeTag},
@@ -28,14 +28,6 @@ use move_core_types::{
 use move_vm_types::delayed_values::delayed_field_id::DelayedFieldID;
 use std::{collections::BTreeMap, sync::Arc};
 
-pub(crate) struct MockChangeSetChecker;
-
-impl CheckChangeSet for MockChangeSetChecker {
-    fn check_change_set(&self, _change_set: &VMChangeSet) -> PartialVMResult<()> {
-        Ok(())
-    }
-}
-
 macro_rules! as_state_key {
     ($k:ident) => {
         StateKey::raw($k.to_string().as_bytes())
@@ -55,8 +47,8 @@ macro_rules! as_bytes {
     };
 }
 
+use crate::module_write_set::ModuleWriteSet;
 pub(crate) use as_bytes;
-use move_binary_format::errors::PartialVMResult;
 
 pub(crate) fn raw_metadata(v: u64) -> StateValueMetadata {
     StateValueMetadata::legacy(v, &CurrentTimeMicroseconds { microseconds: v })
@@ -152,7 +144,6 @@ pub(crate) fn mock_tag_2() -> StructTag {
 
 pub(crate) struct VMChangeSetBuilder {
     resource_write_set: BTreeMap<StateKey, AbstractResourceWriteOp>,
-    module_write_set: BTreeMap<StateKey, WriteOp>,
     events: Vec<(ContractEvent, Option<MoveTypeLayout>)>,
     delayed_field_change_set: BTreeMap<DelayedFieldID, DelayedChange<DelayedFieldID>>,
     aggregator_v1_write_set: BTreeMap<StateKey, WriteOp>,
@@ -163,7 +154,6 @@ impl VMChangeSetBuilder {
     pub(crate) fn new() -> 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(),
@@ -180,15 +170,6 @@ impl VMChangeSetBuilder {
         self
     }
 
-    pub(crate) fn with_module_write_set(
-        mut self,
-        module_write_set: impl IntoIterator<Item = (StateKey, WriteOp)>,
-    ) -> Self {
-        assert!(self.module_write_set.is_empty());
-        self.module_write_set.extend(module_write_set);
-        self
-    }
-
     #[allow(dead_code)]
     pub(crate) fn with_events(
         mut self,
@@ -232,14 +213,11 @@ impl VMChangeSetBuilder {
     pub(crate) fn build(self) -> VMChangeSet {
         VMChangeSet::new(
             self.resource_write_set,
-            self.module_write_set,
             self.events,
             self.delayed_field_change_set,
             self.aggregator_v1_write_set,
             self.aggregator_v1_delta_set,
-            &MockChangeSetChecker,
         )
-        .unwrap()
     }
 }
 
@@ -256,11 +234,11 @@ pub(crate) fn build_vm_output(
     VMOutput::new(
         VMChangeSetBuilder::new()
             .with_resource_write_set(resource_write_set)
-            .with_module_write_set(module_write_set)
             .with_delayed_field_change_set(delayed_field_change_set)
             .with_aggregator_v1_write_set(aggregator_v1_write_set)
             .with_aggregator_v1_delta_set(aggregator_v1_delta_set)
             .build(),
+        ModuleWriteSet::new(false, module_write_set.into_iter().collect()),
         FeeStatement::new(GAS_USED, GAS_USED, 0, 0, 0),
         STATUS,
         TransactionAuxiliaryData::default(),
@@ -270,7 +248,6 @@ pub(crate) fn build_vm_output(
 pub(crate) struct ExpandedVMChangeSetBuilder {
     resource_write_set: BTreeMap<StateKey, (WriteOp, Option<Arc<MoveTypeLayout>>)>,
     resource_group_write_set: BTreeMap<StateKey, GroupWrite>,
-    module_write_set: BTreeMap<StateKey, WriteOp>,
     aggregator_v1_write_set: BTreeMap<StateKey, WriteOp>,
     aggregator_v1_delta_set: BTreeMap<StateKey, DeltaOp>,
     delayed_field_change_set: BTreeMap<DelayedFieldID, DelayedChange<DelayedFieldID>>,
@@ -286,7 +263,6 @@ impl ExpandedVMChangeSetBuilder {
         Self {
             resource_write_set: BTreeMap::new(),
             resource_group_write_set: BTreeMap::new(),
-            module_write_set: BTreeMap::new(),
             aggregator_v1_write_set: BTreeMap::new(),
             aggregator_v1_delta_set: BTreeMap::new(),
             delayed_field_change_set: BTreeMap::new(),
@@ -315,15 +291,6 @@ impl ExpandedVMChangeSetBuilder {
         self
     }
 
-    pub(crate) fn with_module_write_set(
-        mut self,
-        module_write_set: impl IntoIterator<Item = (StateKey, WriteOp)>,
-    ) -> Self {
-        assert!(self.module_write_set.is_empty());
-        self.module_write_set.extend(module_write_set);
-        self
-    }
-
     pub(crate) fn with_aggregator_v1_write_set(
         mut self,
         aggregator_v1_write_set: impl IntoIterator<Item = (StateKey, WriteOp)>,
@@ -391,14 +358,12 @@ impl ExpandedVMChangeSetBuilder {
         VMChangeSet::new_expanded(
             self.resource_write_set,
             self.resource_group_write_set,
-            self.module_write_set,
             self.aggregator_v1_write_set,
             self.aggregator_v1_delta_set,
             self.delayed_field_change_set,
             self.reads_needing_delayed_field_exchange,
             self.group_reads_needing_delayed_field_exchange,
             self.events,
-            &MockChangeSetChecker,
         )
     }
 
diff --git a/aptos-move/aptos-vm/Cargo.toml b/aptos-move/aptos-vm/Cargo.toml
index 88c9f06409540..c2755c5530282 100644
--- a/aptos-move/aptos-vm/Cargo.toml
+++ b/aptos-move/aptos-vm/Cargo.toml
@@ -47,7 +47,6 @@ fail = { workspace = true }
 futures = { workspace = true }
 hex = { workspace = true }
 move-binary-format = { workspace = true }
-move-bytecode-verifier = { workspace = true }
 move-core-types = { workspace = true }
 move-unit-test = { workspace = true, optional = true }
 move-vm-runtime = { workspace = true }
diff --git a/aptos-move/aptos-vm/src/aptos_vm.rs b/aptos-move/aptos-vm/src/aptos_vm.rs
index 6c3d41834741d..00050681bff9c 100644
--- a/aptos-move/aptos-vm/src/aptos_vm.rs
+++ b/aptos-move/aptos-vm/src/aptos_vm.rs
@@ -10,14 +10,15 @@ use crate::{
     gas::{check_gas, get_gas_parameters, make_prod_gas_meter, ProdGasMeter},
     keyless_validation,
     move_vm_ext::{
-        get_max_binary_format_version, get_max_identifier_size,
         session::user_transaction_sessions::{
-            abort_hook::AbortHookSession, epilogue::EpilogueSession, prologue::PrologueSession,
+            abort_hook::AbortHookSession,
+            epilogue::EpilogueSession,
+            prologue::PrologueSession,
+            session_change_sets::{SystemSessionChangeSet, UserSessionChangeSet},
             user::UserSession,
         },
         AptosMoveResolver, MoveVmExt, SessionExt, SessionId, UserTransactionContext,
     },
-    randomness_config::AptosVMRandomnessConfig,
     sharded_block_executor::{executor_client::ExecutorClient, ShardedBlockExecutor},
     system_module_names::*,
     transaction_metadata::TransactionMetadata,
@@ -34,7 +35,7 @@ use aptos_framework::{
 };
 use aptos_gas_algebra::{Gas, GasQuantity, NumBytes, Octa};
 use aptos_gas_meter::{AptosGasMeter, GasAlgebra};
-use aptos_gas_schedule::{AptosGasParameters, TransactionGasParameters, VMGasParameters};
+use aptos_gas_schedule::{AptosGasParameters, VMGasParameters};
 use aptos_logger::{enabled, prelude::*, Level};
 use aptos_metrics_core::TimerHelper;
 #[cfg(any(test, feature = "testing"))]
@@ -48,30 +49,34 @@ use aptos_types::{
     block_metadata::BlockMetadata,
     block_metadata_ext::{BlockMetadataExt, BlockMetadataWithRandomness},
     chain_id::ChainId,
+    contract_event::ContractEvent,
     fee_statement::FeeStatement,
-    invalid_signature,
     move_utils::as_move_value::AsMoveValue,
     on_chain_config::{
-        new_epoch_event_key, ApprovedExecutionHashes, ConfigStorage, ConfigurationResource,
-        FeatureFlag, Features, OnChainConfig, TimedFeatureOverride, TimedFeatures,
-        TimedFeaturesBuilder,
+        new_epoch_event_key, ApprovedExecutionHashes, ConfigStorage, FeatureFlag, Features,
+        OnChainConfig, TimedFeatureFlag, TimedFeatures,
     },
     randomness::Randomness,
-    state_store::{StateView, TStateView},
+    state_store::{state_key::StateKey, StateView, TStateView},
     transaction::{
         authenticator::AnySignature, signature_verified_transaction::SignatureVerifiedTransaction,
         BlockOutput, EntryFunction, ExecutionError, ExecutionStatus, ModuleBundle, Multisig,
-        MultisigTransactionPayload, Script, SignedTransaction, Transaction,
+        MultisigTransactionPayload, Script, SignedTransaction, Transaction, TransactionArgument,
         TransactionAuxiliaryData, TransactionOutput, TransactionPayload, TransactionStatus,
         VMValidatorResult, ViewFunctionOutput, WriteSetPayload,
     },
     vm_status::{AbortLocation, StatusCode, VMStatus},
 };
-use aptos_utils::{aptos_try, return_on_failure};
+use aptos_utils::aptos_try;
 use aptos_vm_logging::{log_schema::AdapterLogSchema, speculative_error, speculative_log};
 use aptos_vm_types::{
     abstract_write_op::AbstractResourceWriteOp,
-    change_set::VMChangeSet,
+    change_set::{
+        create_vm_change_set_with_module_write_set_when_delayed_field_optimization_disabled,
+        ChangeSetInterface, VMChangeSet,
+    },
+    environment::Environment,
+    module_write_set::ModuleWriteSet,
     output::VMOutput,
     resolver::{ExecutorView, ResourceGroupView},
     storage::{change_set_configs::ChangeSetConfigs, StorageGasParameters},
@@ -85,6 +90,7 @@ use move_binary_format::{
     compatibility::Compatibility,
     deserializer::DeserializerConfig,
     errors::{Location, PartialVMError, PartialVMResult, VMError, VMResult},
+    file_format::CompiledScript,
     CompiledModule,
 };
 use move_core_types::{
@@ -94,7 +100,7 @@ use move_core_types::{
     language_storage::{ModuleId, TypeTag},
     move_resource::MoveStructType,
     transaction_argument::convert_txn_args,
-    value::{serialize_values, MoveValue},
+    value::{serialize_values, MoveTypeLayout, MoveValue},
     vm_status::StatusType,
 };
 use move_vm_runtime::{
@@ -103,7 +109,7 @@ use move_vm_runtime::{
 };
 use move_vm_types::gas::{GasMeter, UnmeteredGasMeter};
 use num_cpus;
-use once_cell::sync::{Lazy, OnceCell};
+use once_cell::sync::OnceCell;
 use std::{
     cmp::{max, min},
     collections::{BTreeMap, BTreeSet},
@@ -114,21 +120,8 @@ use std::{
 static EXECUTION_CONCURRENCY_LEVEL: OnceCell<usize> = OnceCell::new();
 static NUM_EXECUTION_SHARD: OnceCell<usize> = OnceCell::new();
 static NUM_PROOF_READING_THREADS: OnceCell<usize> = OnceCell::new();
-static PARANOID_TYPE_CHECKS: OnceCell<bool> = OnceCell::new();
 static DISCARD_FAILED_BLOCKS: OnceCell<bool> = OnceCell::new();
 static PROCESSED_TRANSACTIONS_DETAILED_COUNTERS: OnceCell<bool> = OnceCell::new();
-static TIMED_FEATURE_OVERRIDE: OnceCell<TimedFeatureOverride> = OnceCell::new();
-
-// TODO: Don't expose this in AptosVM, and use only in BlockAptosVM!
-pub static RAYON_EXEC_POOL: Lazy<Arc<rayon::ThreadPool>> = Lazy::new(|| {
-    Arc::new(
-        rayon::ThreadPoolBuilder::new()
-            .num_threads(num_cpus::get())
-            .thread_name(|index| format!("par_exec-{}", index))
-            .build()
-            .unwrap(),
-    )
-});
 
 macro_rules! deprecated_module_bundle {
     () => {
@@ -156,32 +149,28 @@ macro_rules! unwrap_or_discard {
 
 pub(crate) fn get_system_transaction_output(
     session: SessionExt,
-    fee_statement: FeeStatement,
-    status: ExecutionStatus,
     change_set_configs: &ChangeSetConfigs,
 ) -> Result<VMOutput, VMStatus> {
-    get_transaction_output(
-        session,
-        fee_statement,
-        status,
-        change_set_configs,
-        TransactionAuxiliaryData::default(),
-    )
-}
+    let (change_set, empty_module_write_set) = session.finish(change_set_configs)?;
+
+    // System transactions can never publish modules! When we move publishing outside MoveVM, we do not
+    // need to have this check here, as modules will only be visible in user session.
+    empty_module_write_set
+        .is_empty_or_invariant_violation()
+        .map_err(|e| {
+            e.with_message(
+                "Non-empty module write set in when creating system transaction output".to_string(),
+            )
+            .finish(Location::Undefined)
+            .into_vm_status()
+        })?;
 
-pub(crate) fn get_transaction_output(
-    session: SessionExt,
-    fee_statement: FeeStatement,
-    status: ExecutionStatus,
-    change_set_configs: &ChangeSetConfigs,
-    auxiliary_data: TransactionAuxiliaryData,
-) -> Result<VMOutput, VMStatus> {
-    let change_set = session.finish(change_set_configs)?;
     Ok(VMOutput::new(
         change_set,
-        fee_statement,
-        TransactionStatus::Keep(status),
-        auxiliary_data,
+        ModuleWriteSet::empty(),
+        FeeStatement::zero(),
+        TransactionStatus::Keep(ExecutionStatus::Success),
+        TransactionAuxiliaryData::default(),
     ))
 }
 
@@ -223,69 +212,51 @@ pub struct AptosVM {
     pub(crate) gas_feature_version: u64,
     gas_params: Result<AptosGasParameters, String>,
     pub(crate) storage_gas_params: Result<StorageGasParameters, String>,
-    timed_features: TimedFeatures,
     /// For a new chain, or even mainnet, the VK might not necessarily be set.
     pvk: Option<PreparedVerifyingKey<Bn254>>,
-    randomness_config: AptosVMRandomnessConfig,
 }
 
 impl AptosVM {
-    pub fn new(
-        resolver: &impl AptosMoveResolver,
-        override_is_delayed_field_optimization_capable: Option<bool>,
+    /// Creates a new VM instance, initializing the runtime environment from the state.
+    pub fn new(state_view: &impl StateView) -> Self {
+        let env = Arc::new(Environment::new(state_view));
+        Self::new_with_environment(env, state_view, false)
+    }
+
+    pub fn new_for_gov_sim(state_view: &impl StateView) -> Self {
+        let env = Arc::new(Environment::new(state_view));
+        Self::new_with_environment(env, state_view, true)
+    }
+
+    /// Creates a new VM instance based on the runtime environment, and used by block
+    /// executor to create multiple tasks sharing the same execution configurations.
+    // TODO: Passing `state_view` is not needed once we move keyless and gas-related
+    //       configs to the environment.
+    pub(crate) fn new_with_environment(
+        env: Arc<Environment>,
+        state_view: &impl StateView,
+        inject_create_signer_for_gov_sim: bool,
     ) -> Self {
         let _timer = TIMER.timer_with(&["AptosVM::new"]);
-        let features = Features::fetch_config(resolver).unwrap_or_default();
-        let randomness_config = AptosVMRandomnessConfig::fetch(resolver);
-        let (
-            gas_params,
-            storage_gas_params,
-            native_gas_params,
-            misc_gas_params,
-            gas_feature_version,
-        ) = get_gas_parameters(&features, resolver);
 
-        // If no chain ID is in storage, we assume we are in a testing environment and use ChainId::TESTING
-        let chain_id = ChainId::fetch_config(resolver).unwrap_or_else(ChainId::test);
+        let (gas_params, storage_gas_params, gas_feature_version) =
+            get_gas_parameters(env.features(), state_view);
 
-        let timestamp = ConfigurationResource::fetch_config(resolver)
-            .map(|config| config.last_reconfiguration_time())
-            .unwrap_or(0);
-
-        let mut timed_features_builder = TimedFeaturesBuilder::new(chain_id, timestamp);
-        if let Some(profile) = Self::get_timed_feature_override() {
-            timed_features_builder = timed_features_builder.with_override_profile(profile)
-        }
-        let timed_features = timed_features_builder.build();
-
-        // If aggregator execution is enabled, we need to tag aggregator_v2 types,
-        // so they can be exchanged with identifiers during VM execution.
-        let override_is_delayed_field_optimization_capable =
-            override_is_delayed_field_optimization_capable
-                .unwrap_or_else(|| resolver.is_delayed_field_optimization_capable());
-        let aggregator_v2_type_tagging = override_is_delayed_field_optimization_capable
-            && features.is_aggregator_v2_delayed_fields_enabled();
-
-        let move_vm = MoveVmExt::new(
-            native_gas_params,
-            misc_gas_params,
+        let resolver = state_view.as_move_resolver();
+        let move_vm = MoveVmExt::new_with_extended_options(
             gas_feature_version,
-            chain_id.id(),
-            features,
-            timed_features.clone(),
-            resolver,
-            aggregator_v2_type_tagging,
-        )
-        .expect("should be able to create Move VM; check if there are duplicated natives");
+            gas_params.as_ref(),
+            env,
+            None,
+            inject_create_signer_for_gov_sim,
+            &resolver,
+        );
 
         // We use an `Option` to handle the VK not being set on-chain, or an incorrect VK being set
         // via governance (although, currently, we do check for that in `keyless_account.move`).
-        let pvk = keyless_validation::get_groth16_vk_onchain(resolver)
+        let pvk = keyless_validation::get_groth16_vk_onchain(&resolver)
             .ok()
-            .and_then(|vk| {
-                // println!("[aptos-vm][groth16] PVK cached in VM: {}", vk.hash());
-                vk.try_into().ok()
-            });
+            .and_then(|vk| vk.try_into().ok());
 
         Self {
             is_simulation: false,
@@ -293,9 +264,7 @@ impl AptosVM {
             gas_feature_version,
             gas_params,
             storage_gas_params,
-            timed_features,
             pvk,
-            randomness_config,
         }
     }
 
@@ -311,7 +280,22 @@ impl AptosVM {
 
     #[inline(always)]
     fn features(&self) -> &Features {
-        self.move_vm.features()
+        self.move_vm.env.features()
+    }
+
+    #[inline(always)]
+    fn timed_features(&self) -> &TimedFeatures {
+        self.move_vm.env.timed_features()
+    }
+
+    #[inline(always)]
+    fn deserializer_config(&self) -> &DeserializerConfig {
+        &self.move_vm.env.vm_config().deserializer_config
+    }
+
+    #[inline(always)]
+    fn chain_id(&self) -> ChainId {
+        self.move_vm.env.chain_id()
     }
 
     /// Sets execution concurrency level when invoked the first time.
@@ -345,20 +329,6 @@ impl AptosVM {
         }
     }
 
-    /// Sets runtime config when invoked the first time.
-    pub fn set_paranoid_type_checks(enable: bool) {
-        // Only the first call succeeds, due to OnceCell semantics.
-        PARANOID_TYPE_CHECKS.set(enable).ok();
-    }
-
-    /// Get the paranoid type check flag if already set, otherwise return default true
-    pub fn get_paranoid_checks() -> bool {
-        match PARANOID_TYPE_CHECKS.get() {
-            Some(enable) => *enable,
-            None => true,
-        }
-    }
-
     /// Sets runtime config when invoked the first time.
     pub fn set_discard_failed_blocks(enable: bool) {
         // Only the first call succeeds, due to OnceCell semantics.
@@ -373,15 +343,6 @@ impl AptosVM {
         }
     }
 
-    // Set the override profile for timed features.
-    pub fn set_timed_feature_override(profile: TimedFeatureOverride) {
-        TIMED_FEATURE_OVERRIDE.set(profile).ok();
-    }
-
-    pub fn get_timed_feature_override() -> Option<TimedFeatureOverride> {
-        TIMED_FEATURE_OVERRIDE.get().cloned()
-    }
-
     /// Sets the # of async proof reading threads.
     pub fn set_num_proof_reading_threads_once(mut num_threads: usize) {
         // TODO(grao): Do more analysis to tune this magic number.
@@ -461,7 +422,7 @@ impl AptosVM {
 
     pub(crate) fn failed_transaction_cleanup(
         &self,
-        prologue_change_set: VMChangeSet,
+        prologue_session_change_set: SystemSessionChangeSet,
         error_vm_status: VMStatus,
         gas_meter: &mut impl AptosGasMeter,
         txn_data: &TransactionMetadata,
@@ -491,6 +452,7 @@ impl AptosVM {
                 );
             }
         }
+
         let (txn_status, txn_aux_data) = TransactionStatus::from_vm_status(
             error_vm_status.clone(),
             self.features()
@@ -506,25 +468,20 @@ impl AptosVM {
                 // gas). Even if the previous failure occurred while running the epilogue, it
                 // should not fail now. If it somehow fails here, there is no choice but to
                 // discard the transaction.
-                let txn_output = match self.finish_aborted_transaction(
-                    prologue_change_set,
-                    gas_meter,
-                    txn_data,
-                    resolver,
-                    status,
-                    log_context,
-                    change_set_configs,
-                    traversal_context,
-                ) {
-                    Ok((change_set, fee_statement, status)) => VMOutput::new(
-                        change_set,
-                        fee_statement,
-                        TransactionStatus::Keep(status),
+                let output = self
+                    .finish_aborted_transaction(
+                        prologue_session_change_set,
+                        gas_meter,
+                        txn_data,
+                        resolver,
+                        status,
                         txn_aux_data,
-                    ),
-                    Err(err) => discarded_output(err.status_code()),
-                };
-                (error_vm_status, txn_output)
+                        log_context,
+                        change_set_configs,
+                        traversal_context,
+                    )
+                    .unwrap_or_else(|status| discarded_output(status.status_code()));
+                (error_vm_status, output)
             },
             TransactionStatus::Discard(status_code) => {
                 let discarded_output = discarded_output(status_code);
@@ -556,142 +513,134 @@ impl AptosVM {
 
     fn finish_aborted_transaction(
         &self,
-        prologue_change_set: VMChangeSet,
+        prologue_session_change_set: SystemSessionChangeSet,
         gas_meter: &mut impl AptosGasMeter,
         txn_data: &TransactionMetadata,
         resolver: &impl AptosMoveResolver,
         status: ExecutionStatus,
+        txn_aux_data: TransactionAuxiliaryData,
         log_context: &AdapterLogSchema,
         change_set_configs: &ChangeSetConfigs,
         traversal_context: &mut TraversalContext,
-    ) -> Result<(VMChangeSet, FeeStatement, ExecutionStatus), VMStatus> {
+    ) -> Result<VMOutput, VMStatus> {
         // Storage refund is zero since no slots are deleted in aborted transactions.
         const ZERO_STORAGE_REFUND: u64 = 0;
 
         let is_account_init_for_sponsored_transaction =
             is_account_init_for_sponsored_transaction(txn_data, self.features(), resolver)?;
 
-        if is_account_init_for_sponsored_transaction {
-            let mut abort_hook_session =
-                AbortHookSession::new(self, txn_data, resolver, prologue_change_set)?;
-            // Abort information is injected using the user defined error in the Move contract.
-            let status = self.inject_abort_info_if_available(status);
+        let (previous_session_change_set, fee_statement) =
+            if is_account_init_for_sponsored_transaction {
+                let mut abort_hook_session =
+                    AbortHookSession::new(self, txn_data, resolver, prologue_session_change_set);
 
-            abort_hook_session.execute(|session| {
-                create_account_if_does_not_exist(
-                    session,
-                    gas_meter,
-                    txn_data.sender(),
-                    traversal_context,
-                )
-                // if this fails, it is likely due to out of gas, so we try again without metering
-                // and then validate below that we charged sufficiently.
-                .or_else(|_err| {
+                abort_hook_session.execute(|session| {
                     create_account_if_does_not_exist(
                         session,
-                        &mut UnmeteredGasMeter,
+                        gas_meter,
                         txn_data.sender(),
                         traversal_context,
                     )
-                })
-                .map_err(expect_no_verification_errors)
-                .or_else(|err| {
-                    expect_only_successful_execution(
+                    // If this fails, it is likely due to out of gas, so we try again without metering
+                    // and then validate below that we charged sufficiently.
+                    .or_else(|_err| {
+                        create_account_if_does_not_exist(
+                            session,
+                            &mut UnmeteredGasMeter,
+                            txn_data.sender(),
+                            traversal_context,
+                        )
+                    })
+                    .map_err(expect_no_verification_errors)
+                    .or_else(|err| {
+                        expect_only_successful_execution(
+                            err,
+                            &format!("{:?}::{}", ACCOUNT_MODULE, CREATE_ACCOUNT_IF_DOES_NOT_EXIST),
+                            log_context,
+                        )
+                    })
+                })?;
+
+                let mut abort_hook_session_change_set =
+                    abort_hook_session.finish(change_set_configs)?;
+                if let Err(err) = self.charge_change_set(
+                    &mut abort_hook_session_change_set,
+                    gas_meter,
+                    txn_data,
+                    resolver,
+                ) {
+                    info!(
+                        *log_context,
+                        "Failed during charge_change_set: {:?}. Most likely exceeded gas limited.",
                         err,
-                        &format!("{:?}::{}", ACCOUNT_MODULE, CREATE_ACCOUNT_IF_DOES_NOT_EXIST),
-                        log_context,
-                    )
-                })
-            })?;
+                    );
+                };
 
-            let mut change_set = abort_hook_session.finish(change_set_configs)?;
-            if let Err(err) = self.charge_change_set(&mut change_set, gas_meter, txn_data, resolver)
-            {
-                info!(
-                    *log_context,
-                    "Failed during charge_change_set: {:?}. Most likely exceeded gas limited.", err,
+                let fee_statement =
+                    AptosVM::fee_statement_from_gas_meter(txn_data, gas_meter, ZERO_STORAGE_REFUND);
+
+                // Verify we charged sufficiently for creating an account slot
+                let gas_params = get_or_vm_startup_failure(&self.gas_params, log_context)?;
+                let gas_unit_price = u64::from(txn_data.gas_unit_price());
+                let gas_used = fee_statement.gas_used();
+                let storage_fee = fee_statement.storage_fee_used();
+                let storage_refund = fee_statement.storage_fee_refund();
+
+                let actual = gas_used * gas_unit_price + storage_fee - storage_refund;
+                let expected = u64::from(
+                    gas_meter
+                        .disk_space_pricing()
+                        .hack_account_creation_fee_lower_bound(&gas_params.vm.txn),
                 );
+                if actual < expected {
+                    expect_only_successful_execution(
+                        PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                            .with_message(
+                                "Insufficient fee for storing account for sponsored transaction"
+                                    .to_string(),
+                            )
+                            .finish(Location::Undefined),
+                        &format!("{:?}::{}", ACCOUNT_MODULE, CREATE_ACCOUNT_IF_DOES_NOT_EXIST),
+                        log_context,
+                    )?;
+                }
+                (abort_hook_session_change_set, fee_statement)
+            } else {
+                let fee_statement =
+                    AptosVM::fee_statement_from_gas_meter(txn_data, gas_meter, ZERO_STORAGE_REFUND);
+                (prologue_session_change_set, fee_statement)
             };
 
-            let fee_statement =
-                AptosVM::fee_statement_from_gas_meter(txn_data, gas_meter, ZERO_STORAGE_REFUND);
-
-            // Verify we charged sufficiently for creating an account slot
-            let gas_params = get_or_vm_startup_failure(&self.gas_params, log_context)?;
-            let gas_unit_price = u64::from(txn_data.gas_unit_price());
-            let gas_used = fee_statement.gas_used();
-            let storage_fee = fee_statement.storage_fee_used();
-            let storage_refund = fee_statement.storage_fee_refund();
-
-            let actual = gas_used * gas_unit_price + storage_fee - storage_refund;
-            let expected = u64::from(
-                gas_meter
-                    .disk_space_pricing()
-                    .hack_account_creation_fee_lower_bound(&gas_params.vm.txn),
-            );
-            if actual < expected {
-                expect_only_successful_execution(
-                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
-                        .with_message(
-                            "Insufficient fee for storing account for sponsored transaction"
-                                .to_string(),
-                        )
-                        .finish(Location::Undefined),
-                    &format!("{:?}::{}", ACCOUNT_MODULE, CREATE_ACCOUNT_IF_DOES_NOT_EXIST),
-                    log_context,
-                )?;
-            }
+        let mut epilogue_session = EpilogueSession::on_user_session_failure(
+            self,
+            txn_data,
+            resolver,
+            previous_session_change_set,
+        );
 
-            let mut epilogue_session = EpilogueSession::new(
-                self,
-                txn_data,
-                resolver,
-                change_set,
-                ZERO_STORAGE_REFUND.into(),
-            )?;
+        // Abort information is injected using the user defined error in the Move contract.
+        //
+        // DO NOT move abort info injection before we create an epilogue session, because if
+        // there is a code publishing transaction that fails, it will invalidate VM loader
+        // cache which is flushed ONLY WHEN THE NEXT SESSION IS CREATED!
+        // Also, do not move this after we run failure epilogue below, because this will load
+        // module, which alters abort info. We have a transaction at version 596888095 which
+        // relies on this specific behavior...
+        let status = self.inject_abort_info_if_available(status);
 
-            epilogue_session.execute(|session| {
-                transaction_validation::run_failure_epilogue(
-                    session,
-                    gas_meter.balance(),
-                    fee_statement,
-                    self.features(),
-                    txn_data,
-                    log_context,
-                    traversal_context,
-                )
-            })?;
-            epilogue_session
-                .finish(change_set_configs)
-                .map(|set| (set, fee_statement, status))
-        } else {
-            let mut epilogue_session = EpilogueSession::new(
-                self,
+        epilogue_session.execute(|session| {
+            transaction_validation::run_failure_epilogue(
+                session,
+                gas_meter.balance(),
+                fee_statement,
+                self.features(),
                 txn_data,
-                resolver,
-                prologue_change_set,
-                ZERO_STORAGE_REFUND.into(),
-            )?;
-
-            let status = self.inject_abort_info_if_available(status);
+                log_context,
+                traversal_context,
+            )
+        })?;
 
-            let fee_statement =
-                AptosVM::fee_statement_from_gas_meter(txn_data, gas_meter, ZERO_STORAGE_REFUND);
-            epilogue_session.execute(|session| {
-                transaction_validation::run_failure_epilogue(
-                    session,
-                    gas_meter.balance(),
-                    fee_statement,
-                    self.features(),
-                    txn_data,
-                    log_context,
-                    traversal_context,
-                )
-            })?;
-            epilogue_session
-                .finish(change_set_configs)
-                .map(|set| (set, fee_statement, status))
-        }
+        epilogue_session.finish(fee_statement, status, txn_aux_data, change_set_configs)
     }
 
     fn success_transaction_cleanup(
@@ -702,6 +651,7 @@ impl AptosVM {
         log_context: &AdapterLogSchema,
         change_set_configs: &ChangeSetConfigs,
         traversal_context: &mut TraversalContext,
+        has_modules_published_to_special_address: bool,
     ) -> Result<(VMStatus, VMOutput), VMStatus> {
         if self.gas_feature_version >= 12 {
             // Check if the gas meter's internal counters are consistent.
@@ -734,13 +684,21 @@ impl AptosVM {
                 traversal_context,
             )
         })?;
-        let change_set = epilogue_session.finish(change_set_configs)?;
-        let output = VMOutput::new(
-            change_set,
+        let output = epilogue_session.finish(
             fee_statement,
-            TransactionStatus::Keep(ExecutionStatus::Success),
+            ExecutionStatus::Success,
             TransactionAuxiliaryData::default(),
-        );
+            change_set_configs,
+        )?;
+
+        // We mark module cache invalid if transaction is successfully executed and has
+        // published modules. The reason is that epilogue loads the old version of code,
+        // and so we need to make sure the next transaction sees the new code.
+        // Note that we only do so for modules at special addresses - i.e., those that
+        // could have actually been loaded in the epilogue.
+        if has_modules_published_to_special_address {
+            self.move_vm.mark_loader_cache_as_invalid();
+        }
 
         Ok((VMStatus::Executed, output))
     }
@@ -755,6 +713,19 @@ impl AptosVM {
         senders: Vec<AccountAddress>,
         script: &Script,
     ) -> Result<(), VMStatus> {
+        if !self
+            .features()
+            .is_enabled(FeatureFlag::ALLOW_SERIALIZED_SCRIPT_ARGS)
+        {
+            for arg in script.args() {
+                if let TransactionArgument::Serialized(_) = arg {
+                    return Err(PartialVMError::new(StatusCode::FEATURE_UNDER_GATING)
+                        .finish(Location::Script)
+                        .into_vm_status());
+                }
+            }
+        }
+
         // Note: Feature gating is needed here because the traversal of the dependencies could
         //       result in shallow-loading of the modules and therefore subtle changes in
         //       the error semantics.
@@ -766,19 +737,38 @@ impl AptosVM {
             )?;
         }
 
-        let loaded_func = session.load_script(script.code(), script.ty_args().to_vec())?;
+        let func = session.load_script(script.code(), script.ty_args())?;
 
-        // TODO(Gerardo): consolidate the extended validation to verifier.
-        verifier::event_validation::verify_no_event_emission_in_script(
+        let compiled_script = match CompiledScript::deserialize_with_config(
             script.code(),
-            &session.get_vm_config().deserializer_config,
-        )?;
+            self.deserializer_config(),
+        ) {
+            Ok(script) => script,
+            Err(err) => {
+                let msg = format!("[VM] deserializer for script returned error: {:?}", err);
+                let partial_err = PartialVMError::new(StatusCode::CODE_DESERIALIZATION_ERROR)
+                    .with_message(msg)
+                    .finish(Location::Script);
+                return Err(partial_err.into_vm_status());
+            },
+        };
+
+        // Check that unstable bytecode cannot be executed on mainnet
+        if self
+            .features()
+            .is_enabled(FeatureFlag::REJECT_UNSTABLE_BYTECODE_FOR_SCRIPT)
+        {
+            self.reject_unstable_bytecode_for_script(&compiled_script)?;
+        }
+
+        // TODO(Gerardo): consolidate the extended validation to verifier.
+        verifier::event_validation::verify_no_event_emission_in_compiled_script(&compiled_script)?;
 
         let args = verifier::transaction_arg_validation::validate_combine_signer_and_txn_args(
             session,
             senders,
             convert_txn_args(script.args()),
-            &loaded_func,
+            &func,
             self.features().is_enabled(FeatureFlag::STRUCT_CONSTRUCTORS),
         )?;
 
@@ -815,14 +805,28 @@ impl AptosVM {
             )])?;
         }
 
-        let (function, is_friend_or_private) = session.load_function_and_is_friend_or_private_def(
-            entry_fn.module(),
-            entry_fn.function(),
-            entry_fn.ty_args(),
-        )?;
+        let function =
+            session.load_function(entry_fn.module(), entry_fn.function(), entry_fn.ty_args())?;
+
+        // Native entry function is forbidden.
+        if self
+            .features()
+            .is_enabled(FeatureFlag::DISALLOW_USER_NATIVES)
+            && function.is_native()
+        {
+            return Err(
+                PartialVMError::new(StatusCode::USER_DEFINED_NATIVE_NOT_ALLOWED)
+                    .with_message(
+                        "Executing user defined native entry function is not allowed".to_string(),
+                    )
+                    .finish(Location::Module(entry_fn.module().clone()))
+                    .into_vm_status(),
+            );
+        }
 
         // The `has_randomness_attribute()` should have been feature-gated in 1.11...
-        if is_friend_or_private && get_randomness_annotation(resolver, session, entry_fn)?.is_some()
+        if function.is_friend_or_private()
+            && get_randomness_annotation(resolver, session, entry_fn)?.is_some()
         {
             let txn_context = session
                 .get_native_extensions()
@@ -839,14 +843,7 @@ impl AptosVM {
             &function,
             struct_constructors_enabled,
         )?;
-        session.execute_entry_function(
-            entry_fn.module(),
-            entry_fn.function(),
-            entry_fn.ty_args().to_vec(),
-            args,
-            gas_meter,
-            traversal_context,
-        )?;
+        session.execute_entry_function(function, args, gas_meter, traversal_context)?;
         Ok(())
     }
 
@@ -906,20 +903,21 @@ impl AptosVM {
             _ => unreachable!("Only scripts or entry functions are executed"),
         };
 
-        session.execute(|session| {
-            self.resolve_pending_code_publish(
-                session,
-                gas_meter,
-                traversal_context,
-                new_published_modules_loaded,
-            )
-        })?;
-
-        let epilogue_session = self.charge_change_set_and_respawn_session(
+        let user_session_change_set = self.resolve_pending_code_publish_and_finish_user_session(
             session,
             resolver,
             gas_meter,
+            traversal_context,
+            new_published_modules_loaded,
             change_set_configs,
+        )?;
+        let has_modules_published_to_special_address =
+            user_session_change_set.has_modules_published_to_special_address();
+
+        let epilogue_session = self.charge_change_set_and_respawn_session(
+            user_session_change_set,
+            resolver,
+            gas_meter,
             txn_data,
         )?;
 
@@ -930,18 +928,19 @@ impl AptosVM {
             log_context,
             change_set_configs,
             traversal_context,
+            has_modules_published_to_special_address,
         )
     }
 
     fn charge_change_set(
         &self,
-        change_set: &mut VMChangeSet,
+        change_set: &mut impl ChangeSetInterface,
         gas_meter: &mut impl AptosGasMeter,
         txn_data: &TransactionMetadata,
         resolver: &impl AptosMoveResolver,
     ) -> Result<GasQuantity<Octa>, VMStatus> {
         gas_meter.charge_io_gas_for_transaction(txn_data.transaction_size())?;
-        for (event, _layout) in change_set.events() {
+        for event in change_set.events_iter() {
             gas_meter.charge_io_gas_for_event(event)?;
         }
         for (key, op_size) in change_set.write_set_size_iter() {
@@ -963,25 +962,28 @@ impl AptosVM {
 
     fn charge_change_set_and_respawn_session<'r, 'l>(
         &'l self,
-        user_session: UserSession<'r, 'l>,
+        mut user_session_change_set: UserSessionChangeSet,
         resolver: &'r impl AptosMoveResolver,
         gas_meter: &mut impl AptosGasMeter,
-        change_set_configs: &ChangeSetConfigs,
         txn_data: &'l TransactionMetadata,
     ) -> Result<EpilogueSession<'r, 'l>, VMStatus> {
-        let mut change_set = user_session.finish(change_set_configs)?;
-
         let storage_refund =
-            self.charge_change_set(&mut change_set, gas_meter, txn_data, resolver)?;
+            self.charge_change_set(&mut user_session_change_set, gas_meter, txn_data, resolver)?;
 
         // TODO[agg_v1](fix): Charge for aggregator writes
-        EpilogueSession::new(self, txn_data, resolver, change_set, storage_refund)
+        Ok(EpilogueSession::on_user_session_success(
+            self,
+            txn_data,
+            resolver,
+            user_session_change_set,
+            storage_refund,
+        ))
     }
 
     fn simulate_multisig_transaction<'a, 'r, 'l>(
         &'l self,
         resolver: &'r impl AptosMoveResolver,
-        mut session: UserSession<'r, 'l>,
+        session: UserSession<'r, 'l>,
         gas_meter: &mut impl AptosGasMeter,
         traversal_context: &mut TraversalContext<'a>,
         txn_data: &TransactionMetadata,
@@ -996,26 +998,28 @@ impl AptosVM {
                 match multisig_payload {
                     MultisigTransactionPayload::EntryFunction(entry_function) => {
                         aptos_try!({
-                            return_on_failure!(session.execute(|session| self
-                                .execute_multisig_entry_function(
-                                    resolver,
-                                    session,
-                                    gas_meter,
-                                    traversal_context,
-                                    payload.multisig_address,
-                                    entry_function,
-                                    new_published_modules_loaded,
-                                    txn_data,
-                                )));
+                            let user_session_change_set = self.execute_multisig_entry_function(
+                                resolver,
+                                session,
+                                gas_meter,
+                                traversal_context,
+                                payload.multisig_address,
+                                entry_function,
+                                new_published_modules_loaded,
+                                txn_data,
+                                change_set_configs,
+                            )?;
+                            let has_modules_published_to_special_address =
+                                user_session_change_set.has_modules_published_to_special_address();
+
                             // TODO: Deduplicate this against execute_multisig_transaction
                             // A bit tricky since we need to skip success/failure cleanups,
                             // which is in the middle. Introducing a boolean would make the code
                             // messier.
                             let epilogue_session = self.charge_change_set_and_respawn_session(
-                                session,
+                                user_session_change_set,
                                 resolver,
                                 gas_meter,
-                                change_set_configs,
                                 txn_data,
                             )?;
 
@@ -1026,6 +1030,7 @@ impl AptosVM {
                                 log_context,
                                 change_set_configs,
                                 traversal_context,
+                                has_modules_published_to_special_address,
                             )
                         })
                     },
@@ -1045,7 +1050,7 @@ impl AptosVM {
         &'l self,
         resolver: &'r impl AptosMoveResolver,
         mut session: UserSession<'r, 'l>,
-        prologue_change_set: &VMChangeSet,
+        prologue_session_change_set: &SystemSessionChangeSet,
         gas_meter: &mut impl AptosGasMeter,
         traversal_context: &mut TraversalContext,
         txn_data: &TransactionMetadata,
@@ -1076,7 +1081,14 @@ impl AptosVM {
             bcs::to_bytes(&payload).map_err(|_| invariant_violation_error())?
         } else {
             // Default to empty bytes if payload is not provided.
-            bcs::to_bytes::<Vec<u8>>(&vec![]).map_err(|_| invariant_violation_error())?
+            if self
+                .features()
+                .is_abort_if_multisig_payload_mismatch_enabled()
+            {
+                vec![]
+            } else {
+                bcs::to_bytes::<Vec<u8>>(&vec![]).map_err(|_| invariant_violation_error())?
+            }
         };
         // Failures here will be propagated back.
         let payload_bytes: Vec<Vec<u8>> = session
@@ -1123,20 +1135,18 @@ impl AptosVM {
         // changes are not persisted.
         // The multisig transaction would still be considered executed even if execution fails.
         let execution_result = match payload {
-            MultisigTransactionPayload::EntryFunction(entry_function) => {
-                session.execute(|session| {
-                    self.execute_multisig_entry_function(
-                        resolver,
-                        session,
-                        gas_meter,
-                        traversal_context,
-                        txn_payload.multisig_address,
-                        &entry_function,
-                        new_published_modules_loaded,
-                        txn_data,
-                    )
-                })
-            },
+            MultisigTransactionPayload::EntryFunction(entry_function) => self
+                .execute_multisig_entry_function(
+                    resolver,
+                    session,
+                    gas_meter,
+                    traversal_context,
+                    txn_payload.multisig_address,
+                    &entry_function,
+                    new_published_modules_loaded,
+                    txn_data,
+                    change_set_configs,
+                ),
         };
 
         // Step 3: Call post transaction cleanup function in multisig account module with the result
@@ -1148,33 +1158,54 @@ impl AptosVM {
             MoveValue::Address(txn_payload.multisig_address),
             MoveValue::vector_u8(payload_bytes),
         ]);
-        let epilogue_session = if let Err(execution_error) = execution_result {
-            // Invalidate the loader cache in case there was a new module loaded from a module
-            // publish request that failed.
-            // This is redundant with the logic in execute_user_transaction but unfortunately is
-            // necessary here as executing the underlying call can fail without this function
-            // returning an error to execute_user_transaction.
-            if *new_published_modules_loaded {
-                self.move_vm.mark_loader_cache_as_invalid();
-            };
-            self.failure_multisig_payload_cleanup(
-                resolver,
-                prologue_change_set,
-                execution_error,
-                txn_data,
-                cleanup_args,
-                traversal_context,
-            )?
-        } else {
-            self.success_multisig_payload_cleanup(
-                resolver,
-                session,
-                gas_meter,
-                txn_data,
-                cleanup_args,
-                change_set_configs,
-                traversal_context,
-            )?
+
+        let (epilogue_session, has_modules_published_to_special_address) = match execution_result {
+            Err(execution_error) => {
+                // Invalidate the loader cache in case there was a new module loaded from a module
+                // publish request that failed.
+                // This is redundant with the logic in execute_user_transaction but unfortunately is
+                // necessary here as executing the underlying call can fail without this function
+                // returning an error to execute_user_transaction.
+                if *new_published_modules_loaded {
+                    self.move_vm.mark_loader_cache_as_invalid();
+                };
+                let epilogue_session = self.failure_multisig_payload_cleanup(
+                    resolver,
+                    prologue_session_change_set,
+                    execution_error,
+                    txn_data,
+                    cleanup_args,
+                    traversal_context,
+                )?;
+                (epilogue_session, false)
+            },
+            Ok(user_session_change_set) => {
+                let has_modules_published_to_special_address =
+                    user_session_change_set.has_modules_published_to_special_address();
+
+                // Charge gas for write set before we do cleanup. This ensures we don't charge gas for
+                // cleanup write set changes, which is consistent with outer-level success cleanup
+                // flow. We also wouldn't need to worry that we run out of gas when doing cleanup.
+                let mut epilogue_session = self.charge_change_set_and_respawn_session(
+                    user_session_change_set,
+                    resolver,
+                    gas_meter,
+                    txn_data,
+                )?;
+                epilogue_session.execute(|session| {
+                    session
+                        .execute_function_bypass_visibility(
+                            &MULTISIG_ACCOUNT_MODULE,
+                            SUCCESSFUL_TRANSACTION_EXECUTION_CLEANUP,
+                            vec![],
+                            cleanup_args,
+                            &mut UnmeteredGasMeter,
+                            traversal_context,
+                        )
+                        .map_err(|e| e.into_vm_status())
+                })?;
+                (epilogue_session, has_modules_published_to_special_address)
+            },
         };
 
         // TODO(Gas): Charge for aggregator writes
@@ -1185,6 +1216,7 @@ impl AptosVM {
             log_context,
             change_set_configs,
             traversal_context,
+            has_modules_published_to_special_address,
         )
     }
 
@@ -1192,7 +1224,7 @@ impl AptosVM {
         &'l self,
         resolver: &'r impl AptosMoveResolver,
         session: UserSession<'r, 'l>,
-        proglogue_change_set: &VMChangeSet,
+        prologue_session_change_set: &SystemSessionChangeSet,
         gas_meter: &mut impl AptosGasMeter,
         traversal_context: &mut TraversalContext<'a>,
         txn_data: &TransactionMetadata,
@@ -1217,7 +1249,7 @@ impl AptosVM {
             self.execute_multisig_transaction(
                 resolver,
                 session,
-                proglogue_change_set,
+                prologue_session_change_set,
                 gas_meter,
                 traversal_context,
                 txn_data,
@@ -1232,76 +1264,45 @@ impl AptosVM {
     fn execute_multisig_entry_function(
         &self,
         resolver: &impl AptosMoveResolver,
-        session: &mut SessionExt,
+        mut session: UserSession<'_, '_>,
         gas_meter: &mut impl AptosGasMeter,
         traversal_context: &mut TraversalContext,
         multisig_address: AccountAddress,
         payload: &EntryFunction,
         new_published_modules_loaded: &mut bool,
         txn_data: &TransactionMetadata,
-    ) -> Result<(), VMStatus> {
+        change_set_configs: &ChangeSetConfigs,
+    ) -> Result<UserSessionChangeSet, VMStatus> {
         // If txn args are not valid, we'd still consider the transaction as executed but
         // failed. This is primarily because it's unrecoverable at this point.
-        self.validate_and_execute_entry_function(
-            resolver,
-            session,
-            gas_meter,
-            traversal_context,
-            vec![multisig_address],
-            payload,
-            txn_data,
-        )?;
+        session.execute(|session| {
+            self.validate_and_execute_entry_function(
+                resolver,
+                session,
+                gas_meter,
+                traversal_context,
+                vec![multisig_address],
+                payload,
+                txn_data,
+            )
+        })?;
 
         // Resolve any pending module publishes in case the multisig transaction is deploying
         // modules.
-        self.resolve_pending_code_publish(
+        self.resolve_pending_code_publish_and_finish_user_session(
             session,
+            resolver,
             gas_meter,
             traversal_context,
             new_published_modules_loaded,
-        )?;
-        Ok(())
-    }
-
-    fn success_multisig_payload_cleanup<'r, 'l>(
-        &'l self,
-        resolver: &'r impl AptosMoveResolver,
-        session: UserSession<'r, 'l>,
-        gas_meter: &mut impl AptosGasMeter,
-        txn_data: &'l TransactionMetadata,
-        cleanup_args: Vec<Vec<u8>>,
-        change_set_configs: &ChangeSetConfigs,
-        traversal_context: &mut TraversalContext,
-    ) -> Result<EpilogueSession<'r, 'l>, VMStatus> {
-        // Charge gas for write set before we do cleanup. This ensures we don't charge gas for
-        // cleanup write set changes, which is consistent with outer-level success cleanup
-        // flow. We also wouldn't need to worry that we run out of gas when doing cleanup.
-        let mut epilogue_session = self.charge_change_set_and_respawn_session(
-            session,
-            resolver,
-            gas_meter,
             change_set_configs,
-            txn_data,
-        )?;
-        epilogue_session.execute(|session| {
-            session
-                .execute_function_bypass_visibility(
-                    &MULTISIG_ACCOUNT_MODULE,
-                    SUCCESSFUL_TRANSACTION_EXECUTION_CLEANUP,
-                    vec![],
-                    cleanup_args,
-                    &mut UnmeteredGasMeter,
-                    traversal_context,
-                )
-                .map_err(|e| e.into_vm_status())
-        })?;
-        Ok(epilogue_session)
+        )
     }
 
     fn failure_multisig_payload_cleanup<'r, 'l>(
         &'l self,
         resolver: &'r impl AptosMoveResolver,
-        prologue_change_set: &VMChangeSet,
+        prologue_session_change_set: &SystemSessionChangeSet,
         execution_error: VMStatus,
         txn_data: &'l TransactionMetadata,
         mut cleanup_args: Vec<Vec<u8>>,
@@ -1309,13 +1310,12 @@ impl AptosVM {
     ) -> Result<EpilogueSession<'r, 'l>, VMStatus> {
         // Start a fresh session for running cleanup that does not contain any changes from
         // the inner function call earlier (since it failed).
-        let mut epilogue_session = EpilogueSession::new(
+        let mut epilogue_session = EpilogueSession::on_user_session_failure(
             self,
             txn_data,
             resolver,
-            prologue_change_set.clone(),
-            0.into(),
-        )?;
+            prologue_session_change_set.clone(),
+        );
         let execution_error = ExecutionError::try_from(execution_error)
             .map_err(|_| VMStatus::error(StatusCode::UNREACHABLE, None))?;
         // Serialization is not expected to fail so we're using invariant_violation error here.
@@ -1388,12 +1388,12 @@ impl AptosVM {
 
     /// Deserialize a module bundle.
     fn deserialize_module_bundle(&self, modules: &ModuleBundle) -> VMResult<Vec<CompiledModule>> {
-        let max_version = get_max_binary_format_version(self.features(), None);
-        let max_identifier_size = get_max_identifier_size(self.features());
-        let config = DeserializerConfig::new(max_version, max_identifier_size);
         let mut result = vec![];
         for module_blob in modules.iter() {
-            match CompiledModule::deserialize_with_config(module_blob.code(), &config) {
+            match CompiledModule::deserialize_with_config(
+                module_blob.code(),
+                self.deserializer_config(),
+            ) {
                 Ok(module) => {
                     result.push(module);
                 },
@@ -1407,120 +1407,155 @@ impl AptosVM {
     }
 
     /// Resolve a pending code publish request registered via the NativeCodeContext.
-    fn resolve_pending_code_publish(
+    fn resolve_pending_code_publish_and_finish_user_session(
         &self,
-        session: &mut SessionExt,
+        mut session: UserSession<'_, '_>,
+        resolver: &impl AptosMoveResolver,
         gas_meter: &mut impl AptosGasMeter,
         traversal_context: &mut TraversalContext,
         new_published_modules_loaded: &mut bool,
-    ) -> VMResult<()> {
-        if let Some(PublishRequest {
-            destination,
-            bundle,
-            expected_modules,
-            allowed_deps,
-            check_compat: _,
-        }) = session.extract_publish_request()
-        {
-            // TODO: unfortunately we need to deserialize the entire bundle here to handle
-            // `init_module` and verify some deployment conditions, while the VM need to do
-            // the deserialization again. Consider adding an API to MoveVM which allows to
-            // directly pass CompiledModule.
-            let modules = self.deserialize_module_bundle(&bundle)?;
-            let modules: &Vec<CompiledModule> =
-                traversal_context.referenced_module_bundles.alloc(modules);
-
-            // Note: Feature gating is needed here because the traversal of the dependencies could
-            //       result in shallow-loading of the modules and therefore subtle changes in
-            //       the error semantics.
-            if self.gas_feature_version >= 15 {
-                // Charge old versions of the modules, in case of upgrades.
-                session.check_dependencies_and_charge_gas_non_recursive_optional(
-                    gas_meter,
-                    traversal_context,
-                    modules
+        change_set_configs: &ChangeSetConfigs,
+    ) -> Result<UserSessionChangeSet, VMStatus> {
+        session.execute(|session| {
+            if let Some(publish_request) = session.extract_publish_request() {
+                let PublishRequest {
+                    destination,
+                    bundle,
+                    expected_modules,
+                    allowed_deps,
+                    check_compat: _,
+                } = publish_request;
+
+                let modules = self.deserialize_module_bundle(&bundle)?;
+                let modules: &Vec<CompiledModule> =
+                    traversal_context.referenced_module_bundles.alloc(modules);
+
+                // Note: Feature gating is needed here because the traversal of the dependencies could
+                //       result in shallow-loading of the modules and therefore subtle changes in
+                //       the error semantics.
+                if self.gas_feature_version >= 15 {
+                    // Charge old versions of existing modules, in case of upgrades.
+                    for module in modules.iter() {
+                        let addr = module.self_addr();
+                        let name = module.self_name();
+                        let state_key = StateKey::module(addr, name);
+
+                        // TODO: Allow the check of special addresses to be customized.
+                        if addr.is_special()
+                            || traversal_context.visited.insert((addr, name), ()).is_some()
+                        {
+                            continue;
+                        }
+
+                        let size_if_module_exists = resolver
+                            .as_executor_view()
+                            .get_module_state_value_size(&state_key)
+                            .map_err(|e| e.finish(Location::Undefined))?;
+
+                        if let Some(size) = size_if_module_exists {
+                            gas_meter
+                                .charge_dependency(false, addr, name, NumBytes::new(size))
+                                .map_err(|err| {
+                                    err.finish(Location::Module(ModuleId::new(
+                                        *addr,
+                                        name.to_owned(),
+                                    )))
+                                })?;
+                        }
+                    }
+
+                    // Charge all modules in the bundle that is about to be published.
+                    for (module, blob) in modules.iter().zip(bundle.iter()) {
+                        let module_id = &module.self_id();
+                        gas_meter
+                            .charge_dependency(
+                                true,
+                                module_id.address(),
+                                module_id.name(),
+                                NumBytes::new(blob.code().len() as u64),
+                            )
+                            .map_err(|err| err.finish(Location::Undefined))?;
+                    }
+
+                    // Charge all dependencies.
+                    //
+                    // Must exclude the ones that are in the current bundle because they have not
+                    // been published yet.
+                    let module_ids_in_bundle = modules
                         .iter()
-                        .map(|module| (module.self_addr(), module.self_name())),
-                )?;
+                        .map(|module| (module.self_addr(), module.self_name()))
+                        .collect::<BTreeSet<_>>();
 
-                // Charge all modules in the bundle that is about to be published.
-                for (module, blob) in modules.iter().zip(bundle.iter()) {
-                    let module_id = &module.self_id();
-                    gas_meter
-                        .charge_dependency(
-                            true,
-                            module_id.address(),
-                            module_id.name(),
-                            NumBytes::new(blob.code().len() as u64),
+                    session.check_dependencies_and_charge_gas(
+                        gas_meter,
+                        traversal_context,
+                        modules
+                            .iter()
+                            .flat_map(|module| {
+                                module
+                                    .immediate_dependencies_iter()
+                                    .chain(module.immediate_friends_iter())
+                            })
+                            .filter(|addr_and_name| !module_ids_in_bundle.contains(addr_and_name)),
+                    )?;
+
+                    // TODO: Revisit the order of traversal. Consider switching to alphabetical order.
+                }
+
+                if self
+                    .timed_features()
+                    .is_enabled(TimedFeatureFlag::ModuleComplexityCheck)
+                {
+                    for (module, blob) in modules.iter().zip(bundle.iter()) {
+                        // TODO(Gas): Make budget configurable.
+                        let budget = 2048 + blob.code().len() as u64 * 20;
+                        move_binary_format::check_complexity::check_module_complexity(
+                            module, budget,
                         )
                         .map_err(|err| err.finish(Location::Undefined))?;
+                    }
                 }
 
-                // Charge all dependencies.
-                //
-                // Must exclude the ones that are in the current bundle because they have not
-                // been published yet.
-                let module_ids_in_bundle = modules
-                    .iter()
-                    .map(|module| (module.self_addr(), module.self_name()))
-                    .collect::<BTreeSet<_>>();
+                // Validate the module bundle
+                self.validate_publish_request(session, modules, expected_modules, allowed_deps)?;
 
-                session.check_dependencies_and_charge_gas(
+                // Check what modules exist before publishing.
+                let mut exists = BTreeSet::new();
+                for m in modules {
+                    let id = m.self_id();
+                    if session.exists_module(&id)? {
+                        exists.insert(id);
+                    }
+                }
+
+                // Publish the bundle and execute initializers
+                // publish_module_bundle doesn't actually load the published module into
+                // the loader cache. It only puts the module data in the data cache.
+                session.publish_module_bundle_with_compat_config(
+                    bundle.into_inner(),
+                    destination,
                     gas_meter,
-                    traversal_context,
-                    modules
-                        .iter()
-                        .flat_map(|module| {
-                            module
-                                .immediate_dependencies_iter()
-                                .chain(module.immediate_friends_iter())
-                        })
-                        .filter(|addr_and_name| !module_ids_in_bundle.contains(addr_and_name)),
+                    Compatibility::new(
+                        true,
+                        !self
+                            .features()
+                            .is_enabled(FeatureFlag::TREAT_FRIEND_AS_PRIVATE),
+                    ),
                 )?;
 
-                // TODO: Revisit the order of traversal. Consider switching to alphabetical order.
-            }
-
-            // Validate the module bundle
-            self.validate_publish_request(session, modules, expected_modules, allowed_deps)?;
-
-            // Check what modules exist before publishing.
-            let mut exists = BTreeSet::new();
-            for m in modules {
-                let id = m.self_id();
-                if session.exists_module(&id)? {
-                    exists.insert(id);
-                }
+                self.execute_module_initialization(
+                    session,
+                    gas_meter,
+                    modules,
+                    exists,
+                    &[destination],
+                    new_published_modules_loaded,
+                    traversal_context,
+                )?;
             }
-
-            // Publish the bundle and execute initializers
-            // publish_module_bundle doesn't actually load the published module into
-            // the loader cache. It only puts the module data in the data cache.
-            return_on_failure!(session.publish_module_bundle_with_compat_config(
-                bundle.into_inner(),
-                destination,
-                gas_meter,
-                Compatibility::new(
-                    true,
-                    true,
-                    !self
-                        .features()
-                        .is_enabled(FeatureFlag::TREAT_FRIEND_AS_PRIVATE),
-                ),
-            ));
-
-            self.execute_module_initialization(
-                session,
-                gas_meter,
-                modules,
-                exists,
-                &[destination],
-                new_published_modules_loaded,
-                traversal_context,
-            )
-        } else {
-            Ok(())
-        }
+            Ok::<(), VMError>(())
+        })?;
+        session.finish(change_set_configs)
     }
 
     /// Validate a publish request.
@@ -1537,6 +1572,14 @@ impl AptosVM {
         {
             self.reject_unstable_bytecode(modules)?;
         }
+
+        if self
+            .features()
+            .is_enabled(FeatureFlag::DISALLOW_USER_NATIVES)
+        {
+            verifier::native_validation::validate_module_natives(modules)?;
+        }
+
         for m in modules {
             if !expected_modules.remove(m.self_id().name().as_str()) {
                 return Err(Self::metadata_validation_error(&format!(
@@ -1560,7 +1603,7 @@ impl AptosVM {
                     }
                 }
             }
-            aptos_framework::verify_module_metadata(m, self.features(), &self.timed_features)
+            aptos_framework::verify_module_metadata(m, self.features(), self.timed_features())
                 .map_err(|err| Self::metadata_validation_error(&err.to_string()))?;
         }
         verifier::resource_groups::validate_resource_groups(
@@ -1581,7 +1624,7 @@ impl AptosVM {
 
     /// Check whether the bytecode can be published to mainnet based on the unstable tag in the metadata
     fn reject_unstable_bytecode(&self, modules: &[CompiledModule]) -> VMResult<()> {
-        if self.move_vm.chain_id().is_mainnet() {
+        if self.chain_id().is_mainnet() {
             for module in modules {
                 if let Some(metadata) =
                     aptos_framework::get_compilation_metadata_from_compiled_module(module)
@@ -1599,6 +1642,22 @@ impl AptosVM {
         Ok(())
     }
 
+    /// Check whether the script can be run on mainnet based on the unstable tag in the metadata
+    pub fn reject_unstable_bytecode_for_script(&self, module: &CompiledScript) -> VMResult<()> {
+        if self.chain_id().is_mainnet() {
+            if let Some(metadata) =
+                aptos_framework::get_compilation_metadata_from_compiled_script(module)
+            {
+                if metadata.unstable {
+                    return Err(PartialVMError::new(StatusCode::UNSTABLE_BYTECODE_REJECTED)
+                        .with_message("script marked unstable cannot be run on mainnet".to_string())
+                        .finish(Location::Script));
+                }
+            }
+        }
+        Ok(())
+    }
+
     fn metadata_validation_error(msg: &str) -> VMError {
         PartialVMError::new(StatusCode::CONSTRAINT_NOT_SATISFIED)
             .with_message(format!("metadata and code bundle mismatch: {}", msg))
@@ -1627,17 +1686,9 @@ impl AptosVM {
             .map_err(|_| VMStatus::error(StatusCode::INVALID_SIGNATURE, None))?;
 
         // If there are keyless TXN authenticators, validate them all.
-        if !keyless_authenticators.is_empty() {
-            // This should only happen if we incorrectly enable the feature without setting the VK.
-            // Or, if we spawn a network without initializing the VK in genesis. Either way, it must
-            // be handled here.
-            if self.pvk.is_none() {
-                // println!("[aptos-vm][groth16] PVK has not been set on-chain");
-                return Err(invalid_signature!("Groth16 VK has not been set on-chain"));
-            }
-
+        if !keyless_authenticators.is_empty() && !self.is_simulation {
             keyless_validation::validate_authenticators(
-                self.pvk.as_ref().unwrap(),
+                &self.pvk,
                 &keyless_authenticators,
                 self.features(),
                 resolver,
@@ -1662,7 +1713,7 @@ impl AptosVM {
     // transaction, or clean up the failed state.
     fn on_user_transaction_execution_failure(
         &self,
-        prologue_change_set: VMChangeSet,
+        prologue_session_change_set: SystemSessionChangeSet,
         err: VMStatus,
         resolver: &impl AptosMoveResolver,
         txn_data: &TransactionMetadata,
@@ -1682,7 +1733,7 @@ impl AptosVM {
         };
 
         self.failed_transaction_cleanup(
-            prologue_change_set,
+            prologue_session_change_set,
             err,
             gas_meter,
             txn_data,
@@ -1697,7 +1748,7 @@ impl AptosVM {
         &self,
         resolver: &impl AptosMoveResolver,
         txn: &SignedTransaction,
-        mut txn_data: TransactionMetadata,
+        txn_data: TransactionMetadata,
         is_approved_gov_script: bool,
         gas_meter: &mut impl AptosGasMeter,
         log_context: &AdapterLogSchema,
@@ -1706,17 +1757,8 @@ impl AptosVM {
         let mut traversal_context = TraversalContext::new(&traversal_storage);
 
         // Revalidate the transaction.
-        let mut prologue_session =
-            unwrap_or_discard!(PrologueSession::new(self, &txn_data, resolver));
-        unwrap_or_discard!(prologue_session.execute(|session| {
-            let required_deposit = self.get_required_deposit(
-                session,
-                resolver,
-                &gas_meter.vm_gas_params().txn,
-                &txn_data,
-                txn.payload(),
-            )?;
-            txn_data.set_required_deposit(required_deposit);
+        let mut prologue_session = PrologueSession::new(self, &txn_data, resolver);
+        let exec_result = prologue_session.execute(|session| {
             self.validate_signed_transaction(
                 session,
                 resolver,
@@ -1726,7 +1768,8 @@ impl AptosVM {
                 is_approved_gov_script,
                 &mut traversal_context,
             )
-        }));
+        });
+        unwrap_or_discard!(exec_result);
         let storage_gas_params = unwrap_or_discard!(get_or_vm_startup_failure(
             &self.storage_gas_params,
             log_context
@@ -1916,23 +1959,19 @@ impl AptosVM {
         write_set_payload: &WriteSetPayload,
         txn_sender: Option<AccountAddress>,
         session_id: SessionId,
-    ) -> Result<VMChangeSet, VMStatus> {
-        let change_set_configs =
-            ChangeSetConfigs::unlimited_at_gas_feature_version(self.gas_feature_version);
-
+    ) -> Result<(VMChangeSet, ModuleWriteSet), VMStatus> {
         match write_set_payload {
             WriteSetPayload::Direct(change_set) => {
                 // this transaction is never delayed field capable.
                 // it requires restarting execution afterwards,
                 // which allows it to be used as last transaction in delayed_field_enabled context.
-                let change = VMChangeSet::try_from_storage_change_set_with_delayed_field_optimization_disabled(
-                    change_set.clone(),
-                    &change_set_configs,
-                )
-                .map_err(|e| e.into_vm_status())?;
+                let (change_set, module_write_set) =
+                    create_vm_change_set_with_module_write_set_when_delayed_field_optimization_disabled(
+                        change_set.clone(),
+                    );
 
                 // validate_waypoint_change_set checks that this is true, so we only log here.
-                if !Self::should_restart_execution(&change) {
+                if !Self::should_restart_execution(change_set.events()) {
                     // This invariant needs to hold irrespectively, so we log error always.
                     // but if we are in delayed_field_optimization_capable context, we cannot execute any transaction after this.
                     // as transaction afterwards would be executed assuming delayed fields are exchanged and
@@ -1942,7 +1981,7 @@ impl AptosVM {
                         "[aptos_vm] direct write set finished without requiring should_restart_execution");
                 }
 
-                Ok(change)
+                Ok((change_set, module_write_set))
             },
             WriteSetPayload::Script { script, execute_as } => {
                 let mut tmp_session = self.new_session(resolver, session_id, None);
@@ -1961,7 +2000,14 @@ impl AptosVM {
                     senders,
                     script,
                 )?;
-                Ok(tmp_session.finish(&change_set_configs)?)
+
+                let change_set_configs =
+                    ChangeSetConfigs::unlimited_at_gas_feature_version(self.gas_feature_version);
+
+                // TODO(George): This session should not publish modules, and should be using native
+                //               code context instead.
+                let (change_set, module_write_set) = tmp_session.finish(&change_set_configs)?;
+                Ok((change_set, module_write_set))
             },
         }
     }
@@ -1971,6 +2017,7 @@ impl AptosVM {
         executor_view: &dyn ExecutorView,
         resource_group_view: &dyn ResourceGroupView,
         change_set: &VMChangeSet,
+        module_write_set: &ModuleWriteSet,
     ) -> PartialVMResult<()> {
         assert!(
             change_set.aggregator_v1_write_set().is_empty(),
@@ -1979,7 +2026,7 @@ impl AptosVM {
 
         // All Move executions satisfy the read-before-write property. Thus we need to read each
         // access path that the write set is going to update.
-        for state_key in change_set.module_write_set().keys() {
+        for state_key in module_write_set.write_ops().keys() {
             executor_view.get_module_state_value(state_key)?;
         }
         for (state_key, write_op) in change_set.resource_write_set().iter() {
@@ -1999,15 +2046,13 @@ impl AptosVM {
     }
 
     fn validate_waypoint_change_set(
-        change_set: &VMChangeSet,
+        events: &[(ContractEvent, Option<MoveTypeLayout>)],
         log_context: &AdapterLogSchema,
     ) -> Result<(), VMStatus> {
-        let has_new_block_event = change_set
-            .events()
+        let has_new_block_event = events
             .iter()
             .any(|(e, _)| e.event_key() == Some(&new_block_event_key()));
-        let has_new_epoch_event = change_set
-            .events()
+        let has_new_epoch_event = events
             .iter()
             .any(|(e, _)| e.event_key() == Some(&new_epoch_event_key()));
         if has_new_block_event && has_new_epoch_event {
@@ -2029,18 +2074,19 @@ impl AptosVM {
     ) -> Result<(VMStatus, VMOutput), VMStatus> {
         // TODO: user specified genesis id to distinguish different genesis write sets
         let genesis_id = HashValue::zero();
-        let change_set = self.execute_write_set(
+        let (change_set, module_write_set) = self.execute_write_set(
             resolver,
             &write_set_payload,
-            Some(aptos_types::account_config::reserved_vm_address()),
+            Some(account_config::reserved_vm_address()),
             SessionId::genesis(genesis_id),
         )?;
 
-        Self::validate_waypoint_change_set(&change_set, log_context)?;
+        Self::validate_waypoint_change_set(change_set.events(), log_context)?;
         self.read_change_set(
             resolver.as_executor_view(),
             resolver.as_resource_group_view(),
             &change_set,
+            &module_write_set,
         )
         .map_err(|e| e.finish(Location::Undefined).into_vm_status())?;
 
@@ -2048,8 +2094,9 @@ impl AptosVM {
 
         let output = VMOutput::new(
             change_set,
+            module_write_set,
             FeeStatement::zero(),
-            TransactionStatus::from_executed_vm_status(VMStatus::Executed),
+            TransactionStatus::Keep(ExecutionStatus::Success),
             TransactionAuxiliaryData::default(),
         );
         Ok((VMStatus::Executed, output))
@@ -2093,8 +2140,6 @@ impl AptosVM {
 
         let output = get_system_transaction_output(
             session,
-            FeeStatement::zero(),
-            ExecutionStatus::Success,
             &get_or_vm_startup_failure(&self.storage_gas_params, log_context)?.change_set_configs,
         )?;
         Ok((VMStatus::Executed, output))
@@ -2174,8 +2219,6 @@ impl AptosVM {
 
         let output = get_system_transaction_output(
             session,
-            FeeStatement::zero(),
-            ExecutionStatus::Success,
             &get_or_vm_startup_failure(&self.storage_gas_params, log_context)?.change_set_configs,
         )?;
         Ok((VMStatus::Executed, output))
@@ -2197,11 +2240,7 @@ impl AptosVM {
         arguments: Vec<Vec<u8>>,
         max_gas_amount: u64,
     ) -> ViewFunctionOutput {
-        let resolver = state_view.as_move_resolver();
-        let vm = AptosVM::new(
-            &resolver,
-            /*override_is_delayed_field_optimization_capable=*/ Some(false),
-        );
+        let vm = AptosVM::new(state_view);
 
         let log_context = AdapterLogSchema::new(state_view.id(), 0);
 
@@ -2227,6 +2266,7 @@ impl AptosVM {
             max_gas_amount.into(),
         );
 
+        let resolver = state_view.as_move_resolver();
         let mut session = vm.new_session(&resolver, SessionId::Void, None);
         let execution_result = Self::execute_view_function_in_vm(
             &mut session,
@@ -2260,13 +2300,13 @@ impl AptosVM {
         arguments: Vec<Vec<u8>>,
         gas_meter: &mut impl AptosGasMeter,
     ) -> anyhow::Result<Vec<Vec<u8>>> {
-        let func_inst = session.load_function(&module_id, &func_name, &type_args)?;
+        let func = session.load_function(&module_id, &func_name, &type_args)?;
         let metadata = vm.extract_module_metadata(&module_id);
         let arguments = verifier::view_function::validate_view_function(
             session,
             arguments,
             func_name.as_ident_str(),
-            &func_inst,
+            &func,
             metadata.as_ref().map(Arc::as_ref),
             vm.features().is_enabled(FeatureFlag::STRUCT_CONSTRUCTORS),
         )?;
@@ -2336,6 +2376,7 @@ impl AptosVM {
                         session,
                         txn_data,
                         multisig_payload,
+                        self.features(),
                         log_context,
                         traversal_context,
                     )
@@ -2349,10 +2390,9 @@ impl AptosVM {
         }
     }
 
-    pub fn should_restart_execution(vm_change_set: &VMChangeSet) -> bool {
+    pub fn should_restart_execution(events: &[(ContractEvent, Option<MoveTypeLayout>)]) -> bool {
         let new_epoch_event_key = new_epoch_event_key();
-        vm_change_set
-            .events()
+        events
             .iter()
             .any(|(event, _)| event.event_key() == Some(&new_epoch_event_key))
     }
@@ -2477,6 +2517,11 @@ impl AptosVM {
                 let output = VMOutput::empty_with_status(status);
                 (VMStatus::Executed, output)
             },
+            Transaction::BlockEpilogue(_) => {
+                let status = TransactionStatus::Keep(ExecutionStatus::Success);
+                let output = VMOutput::empty_with_status(status);
+                (VMStatus::Executed, output)
+            },
             Transaction::ValidatorTransaction(txn) => {
                 let (vm_status, output) =
                     self.process_validator_transaction(resolver, txn.clone(), log_context)?;
@@ -2484,52 +2529,6 @@ impl AptosVM {
             },
         })
     }
-
-    #[allow(clippy::manual_filter)]
-    pub fn get_required_deposit(
-        &self,
-        session: &mut SessionExt,
-        resolver: &impl AptosMoveResolver,
-        _txn_gas_params: &TransactionGasParameters,
-        txn_metadata: &TransactionMetadata,
-        payload: &TransactionPayload,
-    ) -> Result<Option<u64>, VMStatus> {
-        match payload {
-            TransactionPayload::EntryFunction(entry_func) => {
-                if let Some(annotation) =
-                    get_randomness_annotation(resolver, session, entry_func).unwrap_or(None)
-                {
-                    if let Some(default_gas_amount) =
-                        self.randomness_config.randomness_api_v0_required_deposit
-                    {
-                        let required_gas_amount =
-                            if self.randomness_config.allow_rand_contract_custom_max_gas {
-                                annotation.max_gas.unwrap_or(default_gas_amount)
-                            } else {
-                                default_gas_amount
-                            };
-                        let txn_max_gas = u64::from(txn_metadata.max_gas_amount);
-                        if required_gas_amount != txn_max_gas {
-                            return Err(VMStatus::error(
-                                StatusCode::REQUIRED_DEPOSIT_INCONSISTENT_WITH_TXN_MAX_GAS,
-                                None,
-                            ));
-                        }
-                        let octa_amount =
-                            u64::from(txn_metadata.max_gas_amount * txn_metadata.gas_unit_price);
-                        Ok(Some(octa_amount))
-                    } else {
-                        Ok(None)
-                    }
-                } else {
-                    Ok(None)
-                }
-            },
-            TransactionPayload::Script(_)
-            | TransactionPayload::ModuleBundle(_)
-            | TransactionPayload::Multisig(_) => Ok(None),
-        }
-    }
 }
 
 // Executor external API
@@ -2562,7 +2561,6 @@ impl VMExecutor for AptosVM {
             _,
             NoOpTransactionCommitHook<AptosTransactionOutput, VMStatus>,
         >(
-            Arc::clone(&RAYON_EXEC_POOL),
             transactions,
             state_view,
             BlockExecutorConfig {
@@ -2610,7 +2608,6 @@ impl VMExecutor for AptosVM {
     }
 }
 
-// VMValidator external API
 impl VMValidator for AptosVM {
     /// Determine if a transaction is valid. Will return `None` if the transaction is accepted,
     /// `Some(Err)` if the VM rejects it, with `Err` as an error code. Verification performs the
@@ -2655,13 +2652,26 @@ impl VMValidator for AptosVM {
             }
         }
 
+        if !self
+            .features()
+            .is_enabled(FeatureFlag::ALLOW_SERIALIZED_SCRIPT_ARGS)
+        {
+            if let TransactionPayload::Script(script) = transaction.payload() {
+                for arg in script.args() {
+                    if let TransactionArgument::Serialized(_) = arg {
+                        return VMValidatorResult::error(StatusCode::FEATURE_UNDER_GATING);
+                    }
+                }
+            }
+        }
+
         let txn = match transaction.check_signature() {
             Ok(t) => t,
             _ => {
                 return VMValidatorResult::error(StatusCode::INVALID_SIGNATURE);
             },
         };
-        let mut txn_data = TransactionMetadata::new(&txn);
+        let txn_data = TransactionMetadata::new(&txn);
 
         let resolver = self.as_move_resolver(&state_view);
         let is_approved_gov_script = is_approved_gov_script(&resolver, &txn, &txn_data);
@@ -2671,25 +2681,6 @@ impl VMValidator for AptosVM {
             SessionId::prologue_meta(&txn_data),
             Some(txn_data.as_user_transaction_context()),
         );
-        let required_deposit = if let Ok(gas_params) = &self.gas_params {
-            let maybe_required_deposit = self.get_required_deposit(
-                &mut session,
-                &resolver,
-                &gas_params.vm.txn,
-                &txn_data,
-                txn.payload(),
-            );
-            match maybe_required_deposit {
-                Ok(required_deposit) => required_deposit,
-                Err(vm_status) => {
-                    return VMValidatorResult::error(vm_status.status_code());
-                },
-            }
-        } else {
-            return VMValidatorResult::error(StatusCode::GAS_PARAMS_MISSING);
-        };
-
-        txn_data.set_required_deposit(required_deposit);
 
         let storage = TraversalStorage::new();
 
@@ -2725,11 +2716,8 @@ impl VMValidator for AptosVM {
 pub struct AptosSimulationVM(AptosVM);
 
 impl AptosSimulationVM {
-    pub fn new(resolver: &impl AptosMoveResolver) -> Self {
-        let mut vm = AptosVM::new(
-            resolver,
-            /*override_is_delayed_field_optimization_capable=*/ Some(false),
-        );
+    pub fn new(state_view: &impl StateView) -> Self {
+        let mut vm = AptosVM::new(state_view);
         vm.is_simulation = true;
         Self(vm)
     }
@@ -2746,10 +2734,10 @@ impl AptosSimulationVM {
             "Simulated transaction should not have a valid signature"
         );
 
-        let resolver = state_view.as_move_resolver();
-        let vm = Self::new(&resolver);
+        let vm = Self::new(state_view);
         let log_context = AdapterLogSchema::new(state_view.id(), 0);
 
+        let resolver = state_view.as_move_resolver();
         let (vm_status, vm_output) =
             vm.0.execute_user_transaction(&resolver, transaction, &log_context);
         let txn_output = vm_output
@@ -2793,13 +2781,14 @@ pub(crate) fn is_account_init_for_sponsored_transaction(
             && txn_data.fee_payer.is_some()
             && txn_data.sequence_number == 0
             && resolver
-                .get_resource(&txn_data.sender(), &AccountResource::struct_tag())
-                .map(|data| data.is_none())
-                .map_err(|e| {
-                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
-                        .with_message(format!("{}", e))
-                        .finish(Location::Undefined)
-                })?,
+                .get_resource_bytes_with_metadata_and_layout(
+                    &txn_data.sender(),
+                    &AccountResource::struct_tag(),
+                    &resolver.get_module_metadata(&AccountResource::struct_tag().module_id()),
+                    None,
+                )
+                .map(|(data, _)| data.is_none())
+                .map_err(|e| e.finish(Location::Undefined))?,
     )
 }
 
diff --git a/aptos-move/aptos-vm/src/block_executor/mod.rs b/aptos-move/aptos-vm/src/block_executor/mod.rs
index 76e303eeacdfd..08f3dcd0e3ce9 100644
--- a/aptos-move/aptos-vm/src/block_executor/mod.rs
+++ b/aptos-move/aptos-vm/src/block_executor/mod.rs
@@ -31,20 +31,32 @@ use aptos_types::{
     write_set::WriteOp,
 };
 use aptos_vm_logging::{flush_speculative_logs, init_speculative_logs};
-use aptos_vm_types::{abstract_write_op::AbstractResourceWriteOp, output::VMOutput};
+use aptos_vm_types::{
+    abstract_write_op::AbstractResourceWriteOp, environment::Environment, output::VMOutput,
+};
 use move_core_types::{
     language_storage::StructTag,
     value::MoveTypeLayout,
     vm_status::{StatusCode, VMStatus},
 };
 use move_vm_types::delayed_values::delayed_field_id::DelayedFieldID;
-use once_cell::sync::OnceCell;
+use once_cell::sync::{Lazy, OnceCell};
 use rayon::ThreadPool;
 use std::{
     collections::{BTreeMap, HashSet},
     sync::Arc,
 };
 
+pub static RAYON_EXEC_POOL: Lazy<Arc<rayon::ThreadPool>> = Lazy::new(|| {
+    Arc::new(
+        rayon::ThreadPoolBuilder::new()
+            .num_threads(num_cpus::get())
+            .thread_name(|index| format!("par_exec-{}", index))
+            .build()
+            .unwrap(),
+    )
+});
+
 /// Output type wrapper used by block executor. VM output is stored first, then
 /// transformed into TransactionOutput type that is returned.
 #[derive(Debug)]
@@ -112,7 +124,6 @@ impl BlockExecutorTransactionOutput for AptosTransactionOutput {
             .lock()
             .as_ref()
             .expect("Output must be set to get resource group writes")
-            .change_set()
             .resource_write_set()
             .iter()
             .flat_map(|(key, write)| {
@@ -141,7 +152,6 @@ impl BlockExecutorTransactionOutput for AptosTransactionOutput {
             .lock()
             .as_ref()
             .expect("Output must be set to get metadata ops")
-            .change_set()
             .resource_write_set()
             .iter()
             .flat_map(|(key, write)| {
@@ -160,7 +170,6 @@ impl BlockExecutorTransactionOutput for AptosTransactionOutput {
             .lock()
             .as_ref()
             .expect("Output must be set to get resource writes")
-            .change_set()
             .resource_write_set()
             .iter()
             .flat_map(|(key, write)| match write {
@@ -183,7 +192,6 @@ impl BlockExecutorTransactionOutput for AptosTransactionOutput {
             .lock()
             .as_ref()
             .expect("Output must be set to get module writes")
-            .change_set()
             .module_write_set()
             .clone()
     }
@@ -194,7 +202,6 @@ impl BlockExecutorTransactionOutput for AptosTransactionOutput {
             .lock()
             .as_ref()
             .expect("Output must be set to get aggregator V1 writes")
-            .change_set()
             .aggregator_v1_write_set()
             .clone()
     }
@@ -205,7 +212,6 @@ impl BlockExecutorTransactionOutput for AptosTransactionOutput {
             .lock()
             .as_ref()
             .expect("Output must be set to get deltas")
-            .change_set()
             .aggregator_v1_delta_set()
             .iter()
             .map(|(key, op)| (key.clone(), *op))
@@ -218,7 +224,6 @@ impl BlockExecutorTransactionOutput for AptosTransactionOutput {
             .lock()
             .as_ref()
             .expect("Output must be set to get aggregator change set")
-            .change_set()
             .delayed_field_change_set()
             .clone()
     }
@@ -230,7 +235,6 @@ impl BlockExecutorTransactionOutput for AptosTransactionOutput {
             .lock()
             .as_ref()
             .expect("Output to be set to get reads")
-            .change_set()
             .resource_write_set()
             .iter()
             .flat_map(|(key, write)| {
@@ -248,7 +252,6 @@ impl BlockExecutorTransactionOutput for AptosTransactionOutput {
             .lock()
             .as_ref()
             .expect("Output to be set to get reads")
-            .change_set()
             .resource_write_set()
             .iter()
             .flat_map(|(key, write)| {
@@ -269,7 +272,6 @@ impl BlockExecutorTransactionOutput for AptosTransactionOutput {
             .lock()
             .as_ref()
             .expect("Output must be set to get events")
-            .change_set()
             .events()
             .to_vec()
     }
@@ -337,33 +339,21 @@ impl BlockExecutorTransactionOutput for AptosTransactionOutput {
 
     fn output_approx_size(&self) -> u64 {
         let vm_output = self.vm_output.lock();
-        let change_set = vm_output
+        vm_output
             .as_ref()
-            .expect("Output to be set to get write summary")
-            .change_set();
-
-        let mut size = 0;
-        for (state_key, write_size) in change_set.write_set_size_iter() {
-            size += state_key.size() as u64 + write_size.write_len().unwrap_or(0);
-        }
-
-        for (event, _) in change_set.events() {
-            size += event.size() as u64;
-        }
-
-        size
+            .expect("Output to be set to get approximate size")
+            .materialized_size()
     }
 
     fn get_write_summary(&self) -> HashSet<InputOutputKey<StateKey, StructTag, DelayedFieldID>> {
         let vm_output = self.vm_output.lock();
-        let change_set = vm_output
+        let output = vm_output
             .as_ref()
-            .expect("Output to be set to get write summary")
-            .change_set();
+            .expect("Output to be set to get write summary");
 
         let mut writes = HashSet::new();
 
-        for (state_key, write) in change_set.resource_write_set() {
+        for (state_key, write) in output.resource_write_set() {
             match write {
                 AbstractResourceWriteOp::Write(_)
                 | AbstractResourceWriteOp::WriteWithDelayedFields(_) => {
@@ -383,7 +373,7 @@ impl BlockExecutorTransactionOutput for AptosTransactionOutput {
             }
         }
 
-        for identifier in change_set.delayed_field_change_set().keys() {
+        for identifier in output.delayed_field_change_set().keys() {
             writes.insert(InputOutputKey::DelayedField(*identifier));
         }
 
@@ -391,10 +381,10 @@ impl BlockExecutorTransactionOutput for AptosTransactionOutput {
     }
 }
 
-pub struct BlockAptosVM();
+pub struct BlockAptosVM;
 
 impl BlockAptosVM {
-    pub fn execute_block<
+    pub fn execute_block_on_thread_pool<
         S: StateView + Sync,
         L: TransactionCommitHook<Output = AptosTransactionOutput>,
     >(
@@ -415,16 +405,18 @@ impl BlockAptosVM {
         BLOCK_EXECUTOR_CONCURRENCY.set(config.local.concurrency_level as i64);
         let executor = BlockExecutor::<
             SignatureVerifiedTransaction,
-            AptosExecutorTask<S>,
+            AptosExecutorTask,
             S,
             L,
             ExecutableTestType,
         >::new(config, executor_thread_pool, transaction_commit_listener);
 
-        let ret = executor.execute_block(state_view, signature_verified_block, state_view);
+        let environment =
+            Arc::new(Environment::new(state_view).try_enable_delayed_field_optimization());
+        let ret = executor.execute_block(environment, signature_verified_block, state_view);
         match ret {
             Ok(block_output) => {
-                let transaction_outputs = block_output.into_inner();
+                let (transaction_outputs, block_end_info) = block_output.into_inner();
                 let output_vec: Vec<_> = transaction_outputs
                     .into_iter()
                     .map(|output| output.take_output())
@@ -439,7 +431,7 @@ impl BlockAptosVM {
                     flush_speculative_logs(pos);
                 }
 
-                Ok(BlockOutput::new(output_vec))
+                Ok(BlockOutput::new(output_vec, block_end_info))
             },
             Err(BlockExecutionError::FatalBlockExecutorError(PanicError::CodeInvariantError(
                 err_msg,
@@ -451,4 +443,23 @@ impl BlockAptosVM {
             Err(BlockExecutionError::FatalVMError(err)) => Err(err),
         }
     }
+
+    /// Uses shared thread pool to execute blocks.
+    pub fn execute_block<
+        S: StateView + Sync,
+        L: TransactionCommitHook<Output = AptosTransactionOutput>,
+    >(
+        signature_verified_block: &[SignatureVerifiedTransaction],
+        state_view: &S,
+        config: BlockExecutorConfig,
+        transaction_commit_listener: Option<L>,
+    ) -> Result<BlockOutput<TransactionOutput>, VMStatus> {
+        Self::execute_block_on_thread_pool::<S, L>(
+            Arc::clone(&RAYON_EXEC_POOL),
+            signature_verified_block,
+            state_view,
+            config,
+            transaction_commit_listener,
+        )
+    }
 }
diff --git a/aptos-move/aptos-vm/src/block_executor/vm_wrapper.rs b/aptos-move/aptos-vm/src/block_executor/vm_wrapper.rs
index 3561599e0cd18..058ea9de2553d 100644
--- a/aptos-move/aptos-vm/src/block_executor/vm_wrapper.rs
+++ b/aptos-move/aptos-vm/src/block_executor/vm_wrapper.rs
@@ -2,48 +2,43 @@
 // Parts of the project are originally copyright © Meta Platforms, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::{
-    aptos_vm::AptosVM, block_executor::AptosTransactionOutput, data_cache::AsMoveResolver,
-};
+use crate::{aptos_vm::AptosVM, block_executor::AptosTransactionOutput};
 use aptos_block_executor::task::{ExecutionStatus, ExecutorTask};
 use aptos_logger::{enabled, Level};
 use aptos_mvhashmap::types::TxnIndex;
 use aptos_types::{
-    state_store::StateView,
+    state_store::{StateView, StateViewId},
     transaction::{
         signature_verified_transaction::SignatureVerifiedTransaction, Transaction, WriteSetPayload,
     },
 };
 use aptos_vm_logging::{log_schema::AdapterLogSchema, prelude::*};
-use aptos_vm_types::resolver::{ExecutorView, ResourceGroupView};
+use aptos_vm_types::{
+    environment::Environment,
+    resolver::{ExecutorView, ResourceGroupView},
+};
 use fail::fail_point;
 use move_core_types::vm_status::{StatusCode, VMStatus};
+use std::sync::Arc;
 
-pub(crate) struct AptosExecutorTask<'a, S> {
+pub(crate) struct AptosExecutorTask {
     vm: AptosVM,
-    base_view: &'a S,
+    id: StateViewId,
 }
 
-impl<'a, S: 'a + StateView + Sync> ExecutorTask for AptosExecutorTask<'a, S> {
-    type Argument = &'a S;
+impl ExecutorTask for AptosExecutorTask {
+    type Environment = Arc<Environment>;
     type Error = VMStatus;
     type Output = AptosTransactionOutput;
     type Txn = SignatureVerifiedTransaction;
 
-    fn init(argument: &'a S) -> Self {
-        // AptosVM has to be initialized using configs from storage.
-        let vm = AptosVM::new(
-            &argument.as_move_resolver(),
-            /*override_is_delayed_field_optimization_capable=*/ Some(true),
-        );
-
-        Self {
-            vm,
-            base_view: argument,
-        }
+    fn init(env: Self::Environment, state_view: &impl StateView) -> Self {
+        let vm = AptosVM::new_with_environment(env, state_view, false);
+        let id = state_view.id();
+        Self { vm, id }
     }
 
-    // This function is called by the BlockExecutor for each transaction is intends
+    // This function is called by the BlockExecutor for each transaction it intends
     // to execute (via the ExecutorTask trait). It can be as a part of sequential
     // execution, or speculatively as a part of a parallel execution.
     fn execute_transaction(
@@ -56,7 +51,7 @@ impl<'a, S: 'a + StateView + Sync> ExecutorTask for AptosExecutorTask<'a, S> {
             ExecutionStatus::DelayedFieldsCodeInvariantError("fail points error".into())
         });
 
-        let log_context = AdapterLogSchema::new(self.base_view.id(), txn_idx as usize);
+        let log_context = AdapterLogSchema::new(self.id, txn_idx as usize);
         let resolver = self
             .vm
             .as_move_resolver_with_group_view(executor_with_group_view);
@@ -81,7 +76,7 @@ impl<'a, S: 'a + StateView + Sync> ExecutorTask for AptosExecutorTask<'a, S> {
                     ExecutionStatus::DelayedFieldsCodeInvariantError(
                         vm_status.message().cloned().unwrap_or_default(),
                     )
-                } else if AptosVM::should_restart_execution(vm_output.change_set()) {
+                } else if AptosVM::should_restart_execution(vm_output.events()) {
                     speculative_info!(
                         &log_context,
                         "Reconfiguration occurred: restart required".into()
diff --git a/aptos-move/aptos-vm/src/data_cache.rs b/aptos-move/aptos-vm/src/data_cache.rs
index 71f1090c3003e..7861880b40479 100644
--- a/aptos-move/aptos-vm/src/data_cache.rs
+++ b/aptos-move/aptos-vm/src/data_cache.rs
@@ -6,8 +6,8 @@
 use crate::{
     gas::get_gas_config_from_storage,
     move_vm_ext::{
-        get_max_binary_format_version, get_max_identifier_size, resource_state_key,
-        AptosMoveResolver, AsExecutorView, AsResourceGroupView, ResourceGroupResolver,
+        resource_state_key, AptosMoveResolver, AsExecutorView, AsResourceGroupView,
+        ResourceGroupResolver,
     },
 };
 use aptos_aggregator::{
@@ -26,6 +26,7 @@ use aptos_types::{
         state_value::{StateValue, StateValueMetadata},
         StateView, StateViewId,
     },
+    vm::configs::aptos_prod_deserializer_config,
 };
 use aptos_vm_types::{
     resolver::{
@@ -39,10 +40,12 @@ use move_core_types::{
     account_address::AccountAddress,
     language_storage::{ModuleId, StructTag},
     metadata::Metadata,
-    resolver::{resource_size, ModuleResolver, ResourceResolver},
     value::MoveTypeLayout,
 };
-use move_vm_types::delayed_values::delayed_field_id::DelayedFieldID;
+use move_vm_types::{
+    delayed_values::delayed_field_id::DelayedFieldID,
+    resolver::{resource_size, ModuleResolver, ResourceResolver},
+};
 use std::{
     cell::RefCell,
     collections::{BTreeMap, HashMap, HashSet},
@@ -80,8 +83,7 @@ impl<'e, E: ExecutorView> StorageAdapter<'e, E> {
         features: &Features,
         maybe_resource_group_view: Option<&'e dyn ResourceGroupView>,
     ) -> Self {
-        let max_binary_version = get_max_binary_format_version(features, Some(gas_feature_version));
-        let max_identifier_size = get_max_identifier_size(features);
+        let deserializer_config = aptos_prod_deserializer_config(features);
         let resource_group_adapter = ResourceGroupAdapter::new(
             maybe_resource_group_view,
             executor_view,
@@ -89,26 +91,17 @@ impl<'e, E: ExecutorView> StorageAdapter<'e, E> {
             features.is_resource_groups_split_in_vm_change_set_enabled(),
         );
 
-        Self::new(
-            executor_view,
-            max_binary_version,
-            max_identifier_size,
-            resource_group_adapter,
-        )
+        Self::new(executor_view, deserializer_config, resource_group_adapter)
     }
 
     fn new(
         executor_view: &'e E,
-        max_binary_format_version: u32,
-        max_identifier_size: u64,
+        deserializer_config: DeserializerConfig,
         resource_group_view: ResourceGroupAdapter<'e>,
     ) -> Self {
         Self {
             executor_view,
-            deserializer_config: DeserializerConfig::new(
-                max_binary_format_version,
-                max_identifier_size,
-            ),
+            deserializer_config,
             resource_group_view,
             accessed_groups: RefCell::new(HashSet::new()),
         }
@@ -181,22 +174,18 @@ impl<'e, E: ExecutorView> ResourceGroupResolver for StorageAdapter<'e, E> {
 impl<'e, E: ExecutorView> AptosMoveResolver for StorageAdapter<'e, E> {}
 
 impl<'e, E: ExecutorView> ResourceResolver for StorageAdapter<'e, E> {
-    type Error = PartialVMError;
-
     fn get_resource_bytes_with_metadata_and_layout(
         &self,
         address: &AccountAddress,
         struct_tag: &StructTag,
         metadata: &[Metadata],
         maybe_layout: Option<&MoveTypeLayout>,
-    ) -> Result<(Option<Bytes>, usize), Self::Error> {
+    ) -> PartialVMResult<(Option<Bytes>, usize)> {
         self.get_any_resource_with_layout(address, struct_tag, metadata, maybe_layout)
     }
 }
 
 impl<'e, E: ExecutorView> ModuleResolver for StorageAdapter<'e, E> {
-    type Error = PartialVMError;
-
     fn get_module_metadata(&self, module_id: &ModuleId) -> Vec<Metadata> {
         let module_bytes = match self.get_module(module_id) {
             Ok(Some(bytes)) => bytes,
@@ -211,7 +200,7 @@ impl<'e, E: ExecutorView> ModuleResolver for StorageAdapter<'e, E> {
         module.metadata
     }
 
-    fn get_module(&self, module_id: &ModuleId) -> Result<Option<Bytes>, Self::Error> {
+    fn get_module(&self, module_id: &ModuleId) -> PartialVMResult<Option<Bytes>> {
         self.executor_view
             .get_module_bytes(&StateKey::module_id(module_id))
     }
@@ -246,10 +235,6 @@ impl<'e, E: ExecutorView> TDelayedFieldView for StorageAdapter<'e, E> {
     type ResourceGroupTag = StructTag;
     type ResourceKey = StateKey;
 
-    fn is_delayed_field_optimization_capable(&self) -> bool {
-        self.executor_view.is_delayed_field_optimization_capable()
-    }
-
     fn get_delayed_field_value(
         &self,
         id: &Self::Identifier,
@@ -313,23 +298,17 @@ pub trait AsMoveResolver<S> {
 
 impl<S: StateView> AsMoveResolver<S> for S {
     fn as_move_resolver(&self) -> StorageAdapter<S> {
-        let (_, gas_feature_version) = get_gas_config_from_storage(self);
         let features = Features::fetch_config(self).unwrap_or_default();
-        let max_binary_version =
-            get_max_binary_format_version(&features, Some(gas_feature_version));
+        let deserializer_config = aptos_prod_deserializer_config(&features);
+
+        let (_, gas_feature_version) = get_gas_config_from_storage(self);
         let resource_group_adapter = ResourceGroupAdapter::new(
             None,
             self,
             gas_feature_version,
             features.is_resource_groups_split_in_vm_change_set_enabled(),
         );
-        let max_identifier_size = get_max_identifier_size(&features);
-        StorageAdapter::new(
-            self,
-            max_binary_version,
-            max_identifier_size,
-            resource_group_adapter,
-        )
+        StorageAdapter::new(self, deserializer_config, resource_group_adapter)
     }
 }
 
@@ -367,7 +346,7 @@ pub(crate) mod tests {
         state_view: &S,
         group_size_kind: GroupSizeKind,
     ) -> StorageAdapter<S> {
-        assert!(group_size_kind != GroupSizeKind::AsSum, "not yet supported");
+        assert_ne!(group_size_kind, GroupSizeKind::AsSum, "not yet supported");
 
         let (gas_feature_version, resource_groups_split_in_vm_change_set_enabled) =
             match group_size_kind {
@@ -383,6 +362,9 @@ pub(crate) mod tests {
             gas_feature_version,
             resource_groups_split_in_vm_change_set_enabled,
         );
-        StorageAdapter::new(state_view, 0, 0, group_adapter)
+
+        let features = Features::fetch_config(state_view).unwrap_or_default();
+        let deserializer_config = aptos_prod_deserializer_config(&features);
+        StorageAdapter::new(state_view, deserializer_config, group_adapter)
     }
 }
diff --git a/aptos-move/aptos-vm/src/errors.rs b/aptos-move/aptos-vm/src/errors.rs
index 0b95668fb4ef5..629c576875b37 100644
--- a/aptos-move/aptos-vm/src/errors.rs
+++ b/aptos-move/aptos-vm/src/errors.rs
@@ -48,6 +48,8 @@ const EMULTISIG_TRANSACTION_NOT_FOUND: u64 = 2006;
 const EMULTISIG_PAYLOAD_DOES_NOT_MATCH_HASH: u64 = 2008;
 // Multisig transaction has not received enough approvals to be executed.
 const EMULTISIG_NOT_ENOUGH_APPROVALS: u64 = 2009;
+// Provided target function does not match the payload stored in the on-chain transaction.
+const EPAYLOAD_DOES_NOT_MATCH: u64 = 2010;
 
 const INVALID_ARGUMENT: u8 = 0x1;
 const LIMIT_EXCEEDED: u8 = 0x2;
@@ -88,6 +90,9 @@ pub fn convert_prologue_error(
                 (INVALID_ARGUMENT, EMULTISIG_PAYLOAD_DOES_NOT_MATCH_HASH) => {
                     StatusCode::MULTISIG_TRANSACTION_PAYLOAD_DOES_NOT_MATCH_HASH
                 },
+                (INVALID_ARGUMENT, EPAYLOAD_DOES_NOT_MATCH) => {
+                    StatusCode::MULTISIG_TRANSACTION_PAYLOAD_DOES_NOT_MATCH
+                },
                 (category, reason) => {
                     let err_msg = format!("[aptos_vm] Unexpected prologue Move abort: {:?}::{:?} (Category: {:?} Reason: {:?})",
                     location, code, category, reason);
diff --git a/aptos-move/aptos-vm/src/gas.rs b/aptos-move/aptos-vm/src/gas.rs
index ca56adf0cf248..619ba71f3d68e 100644
--- a/aptos-move/aptos-vm/src/gas.rs
+++ b/aptos-move/aptos-vm/src/gas.rs
@@ -6,7 +6,7 @@ use aptos_gas_algebra::{Gas, GasExpression, InternalGas};
 use aptos_gas_meter::{StandardGasAlgebra, StandardGasMeter};
 use aptos_gas_schedule::{
     gas_feature_versions::RELEASE_V1_13, gas_params::txn::KEYLESS_BASE_COST, AptosGasParameters,
-    FromOnChainGasSchedule, MiscGasParameters, NativeGasParameters, VMGasParameters,
+    FromOnChainGasSchedule, VMGasParameters,
 };
 use aptos_logger::{enabled, Level};
 use aptos_memory_usage_tracker::MemoryTrackedGasMeter;
@@ -31,7 +31,7 @@ pub fn get_gas_config_from_storage(
     match GasScheduleV2::fetch_config(config_storage) {
         Some(gas_schedule) => {
             let feature_version = gas_schedule.feature_version;
-            let map = gas_schedule.to_btree_map();
+            let map = gas_schedule.into_btree_map();
             (
                 AptosGasParameters::from_on_chain_gas_schedule(&map, feature_version),
                 feature_version,
@@ -39,7 +39,7 @@ pub fn get_gas_config_from_storage(
         },
         None => match GasSchedule::fetch_config(config_storage) {
             Some(gas_schedule) => {
-                let map = gas_schedule.to_btree_map();
+                let map = gas_schedule.into_btree_map();
                 (AptosGasParameters::from_on_chain_gas_schedule(&map, 0), 0)
             },
             None => (Err("Neither gas schedule v2 nor v1 exists.".to_string()), 0),
@@ -53,8 +53,6 @@ pub fn get_gas_parameters(
 ) -> (
     Result<AptosGasParameters, String>,
     Result<StorageGasParameters, String>,
-    NativeGasParameters,
-    MiscGasParameters,
     u64,
 ) {
     let (mut gas_params, gas_feature_version) = get_gas_config_from_storage(config_storage);
@@ -97,22 +95,7 @@ pub fn get_gas_parameters(
         Err(err) => Err(format!("Failed to initialize storage gas params due to failure to load main gas parameters: {}", err)),
     };
 
-    // TODO(Gas): Right now, we have to use some dummy values for gas parameters if they are not found on-chain.
-    //            This only happens in a edge case that is probably related to write set transactions or genesis,
-    //            which logically speaking, shouldn't be handled by the VM at all.
-    //            We should clean up the logic here once we get that refactored.
-    let (native_gas_params, misc_gas_params) = match &gas_params {
-        Ok(gas_params) => (gas_params.natives.clone(), gas_params.vm.misc.clone()),
-        Err(_) => (NativeGasParameters::zeros(), MiscGasParameters::zeros()),
-    };
-
-    (
-        gas_params,
-        storage_gas_params,
-        native_gas_params,
-        misc_gas_params,
-        gas_feature_version,
-    )
+    (gas_params, storage_gas_params, gas_feature_version)
 }
 
 /// Gas meter used in the production (validator) setup.
diff --git a/aptos-move/aptos-vm/src/keyless_validation.rs b/aptos-move/aptos-vm/src/keyless_validation.rs
index 06644bb9ff7c1..e5f19bd1a3171 100644
--- a/aptos-move/aptos-vm/src/keyless_validation.rs
+++ b/aptos-move/aptos-vm/src/keyless_validation.rs
@@ -33,9 +33,16 @@ macro_rules! value_deserialization_error {
 fn get_resource_on_chain<T: MoveStructType + for<'a> Deserialize<'a>>(
     resolver: &impl AptosMoveResolver,
 ) -> anyhow::Result<T, VMStatus> {
+    let metadata = resolver.get_module_metadata(&T::struct_tag().module_id());
     let bytes = resolver
-        .get_resource(&CORE_CODE_ADDRESS, &T::struct_tag())
+        .get_resource_bytes_with_metadata_and_layout(
+            &CORE_CODE_ADDRESS,
+            &T::struct_tag(),
+            &metadata,
+            None,
+        )
         .map_err(|e| e.finish(Location::Undefined).into_vm_status())?
+        .0
         .ok_or_else(|| {
             value_deserialization_error!(format!(
                 "get_resource failed on {}::{}::{}",
@@ -121,19 +128,21 @@ fn get_jwk_for_authenticator(
 
 /// Ensures that **all** keyless authenticators in the transaction are valid.
 pub(crate) fn validate_authenticators(
-    pvk: &PreparedVerifyingKey<Bn254>,
+    pvk: &Option<PreparedVerifyingKey<Bn254>>,
     authenticators: &Vec<(KeylessPublicKey, KeylessSignature)>,
     features: &Features,
     resolver: &impl AptosMoveResolver,
 ) -> Result<(), VMStatus> {
+    let mut with_zk = false;
     for (_, sig) in authenticators {
         // Feature-gating for keyless TXNs (whether ZK or ZKless, whether passkey-based or not)
-        if matches!(sig.cert, EphemeralCertificate::ZeroKnowledgeSig { .. })
-            && !features.is_zk_keyless_enabled()
-        {
-            return Err(VMStatus::error(StatusCode::FEATURE_UNDER_GATING, None));
-        }
+        if matches!(sig.cert, EphemeralCertificate::ZeroKnowledgeSig { .. }) {
+            if !features.is_zk_keyless_enabled() {
+                return Err(VMStatus::error(StatusCode::FEATURE_UNDER_GATING, None));
+            }
 
+            with_zk = true;
+        }
         if matches!(sig.cert, EphemeralCertificate::OpenIdSig { .. })
             && !features.is_zkless_keyless_enabled()
         {
@@ -146,6 +155,11 @@ pub(crate) fn validate_authenticators(
         }
     }
 
+    // If there are ZK authenticators, the Groth16 VK must have been set on-chain.
+    if with_zk && pvk.is_none() {
+        return Err(invalid_signature!("Groth16 VK has not been set on-chain"));
+    }
+
     let config = &get_configs_onchain(resolver)?;
     if authenticators.len() > config.max_signatures_per_txn as usize {
         // println!("[aptos-vm][groth16] Too many keyless authenticators");
@@ -234,7 +248,8 @@ pub(crate) fn validate_authenticators(
                                 }
                             }
 
-                            let result = zksig.verify_groth16_proof(public_inputs_hash, pvk);
+                            let result = zksig
+                                .verify_groth16_proof(public_inputs_hash, pvk.as_ref().unwrap());
 
                             result.map_err(|_| {
                                 // println!("[aptos-vm][groth16] ZKP verification failed");
diff --git a/aptos-move/aptos-vm/src/lib.rs b/aptos-move/aptos-vm/src/lib.rs
index 928a95e1879a0..20c3caff2dc29 100644
--- a/aptos-move/aptos-vm/src/lib.rs
+++ b/aptos-move/aptos-vm/src/lib.rs
@@ -3,6 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #![forbid(unsafe_code)]
+#![deny(deprecated)]
 
 //! # The VM runtime
 //!
@@ -115,7 +116,6 @@ mod keyless_validation;
 pub mod keyless_validation;
 pub mod move_vm_ext;
 pub mod natives;
-pub mod randomness_config;
 pub mod sharded_block_executor;
 pub mod system_module_names;
 pub mod testing;
diff --git a/aptos-move/aptos-vm/src/move_vm_ext/mod.rs b/aptos-move/aptos-vm/src/move_vm_ext/mod.rs
index 342999328bf4c..7348a280dffdf 100644
--- a/aptos-move/aptos-vm/src/move_vm_ext/mod.rs
+++ b/aptos-move/aptos-vm/src/move_vm_ext/mod.rs
@@ -12,7 +12,7 @@ pub(crate) mod write_op_converter;
 pub use crate::move_vm_ext::{
     resolver::{AptosMoveResolver, AsExecutorView, AsResourceGroupView, ResourceGroupResolver},
     session::SessionExt,
-    vm::{get_max_binary_format_version, get_max_identifier_size, verifier_config, MoveVmExt},
+    vm::{GenesisMoveVM, MoveVmExt},
 };
 use aptos_types::state_store::state_key::StateKey;
 pub use aptos_types::transaction::user_transaction_context::UserTransactionContext;
@@ -21,6 +21,7 @@ use move_core_types::{
     account_address::AccountAddress, language_storage::StructTag, vm_status::StatusCode,
 };
 pub use session::session_id::SessionId;
+pub use warm_vm_cache::flush_warm_vm_cache;
 
 pub(crate) fn resource_state_key(
     address: &AccountAddress,
diff --git a/aptos-move/aptos-vm/src/move_vm_ext/resolver.rs b/aptos-move/aptos-vm/src/move_vm_ext/resolver.rs
index 0df61e5088f17..1791a38bb08d6 100644
--- a/aptos-move/aptos-vm/src/move_vm_ext/resolver.rs
+++ b/aptos-move/aptos-vm/src/move_vm_ext/resolver.rs
@@ -8,8 +8,9 @@ use aptos_vm_types::resolver::{
     ExecutorView, ResourceGroupSize, ResourceGroupView, StateStorageView,
 };
 use bytes::Bytes;
-use move_binary_format::errors::{PartialVMError, PartialVMResult};
-use move_core_types::{language_storage::StructTag, resolver::MoveResolver};
+use move_binary_format::errors::PartialVMResult;
+use move_core_types::language_storage::StructTag;
+use move_vm_types::resolver::{ModuleResolver, ResourceResolver};
 use std::collections::{BTreeMap, HashMap};
 
 /// A general resolver used by AptosVM. Allows to implement custom hooks on
@@ -19,7 +20,8 @@ pub trait AptosMoveResolver:
     AggregatorV1Resolver
     + ConfigStorage
     + DelayedFieldResolver
-    + MoveResolver<PartialVMError>
+    + ModuleResolver
+    + ResourceResolver
     + ResourceGroupResolver
     + StateStorageView
     + TableResolver
diff --git a/aptos-move/aptos-vm/src/move_vm_ext/session/mod.rs b/aptos-move/aptos-vm/src/move_vm_ext/session/mod.rs
index b5bda793808bd..7e8b576cb1248 100644
--- a/aptos-move/aptos-vm/src/move_vm_ext/session/mod.rs
+++ b/aptos-move/aptos-vm/src/move_vm_ext/session/mod.rs
@@ -3,16 +3,30 @@
 
 use crate::{
     data_cache::get_resource_group_member_from_metadata,
-    move_vm_ext::{resource_state_key, write_op_converter::WriteOpConverter, AptosMoveResolver},
+    move_vm_ext::{
+        resource_state_key, write_op_converter::WriteOpConverter, AptosMoveResolver, SessionId,
+    },
 };
 use aptos_framework::natives::{
     aggregator_natives::{AggregatorChangeSet, AggregatorChangeV1, NativeAggregatorContext},
     code::{NativeCodeContext, PublishRequest},
+    cryptography::{algebra::AlgebraContext, ristretto255_point::NativeRistrettoPointContext},
     event::NativeEventContext,
+    object::NativeObjectContext,
+    randomness::RandomnessContext,
+    state_storage::NativeStateStorageContext,
+    transaction_context::NativeTransactionContext,
 };
 use aptos_table_natives::{NativeTableContext, TableChangeSet};
-use aptos_types::{contract_event::ContractEvent, state_store::state_key::StateKey};
-use aptos_vm_types::{change_set::VMChangeSet, storage::change_set_configs::ChangeSetConfigs};
+use aptos_types::{
+    chain_id::ChainId, contract_event::ContractEvent, on_chain_config::Features,
+    state_store::state_key::StateKey,
+    transaction::user_transaction_context::UserTransactionContext,
+};
+use aptos_vm_types::{
+    change_set::VMChangeSet, module_write_set::ModuleWriteSet,
+    storage::change_set_configs::ChangeSetConfigs,
+};
 use bytes::Bytes;
 use move_binary_format::errors::{Location, PartialVMError, PartialVMResult, VMResult};
 use move_core_types::{
@@ -21,7 +35,9 @@ use move_core_types::{
     value::MoveTypeLayout,
     vm_status::StatusCode,
 };
-use move_vm_runtime::{move_vm::MoveVM, session::Session};
+use move_vm_runtime::{
+    move_vm::MoveVM, native_extensions::NativeContextExtensions, session::Session,
+};
 use move_vm_types::{value_serde::serialize_and_allow_delayed_values, values::Value};
 use std::{
     collections::BTreeMap,
@@ -46,24 +62,60 @@ pub type BytesWithResourceLayout = (Bytes, Option<Arc<MoveTypeLayout>>);
 
 pub struct SessionExt<'r, 'l> {
     inner: Session<'r, 'l>,
-    remote: &'r dyn AptosMoveResolver,
+    resolver: &'r dyn AptosMoveResolver,
     is_storage_slot_metadata_enabled: bool,
 }
 
 impl<'r, 'l> SessionExt<'r, 'l> {
-    pub fn new(
-        inner: Session<'r, 'l>,
-        remote: &'r dyn AptosMoveResolver,
-        is_storage_slot_metadata_enabled: bool,
+    pub(crate) fn new<R: AptosMoveResolver>(
+        session_id: SessionId,
+        move_vm: &'l MoveVM,
+        chain_id: ChainId,
+        features: &Features,
+        maybe_user_transaction_context: Option<UserTransactionContext>,
+        resolver: &'r R,
     ) -> Self {
+        let mut extensions = NativeContextExtensions::default();
+        let txn_hash: [u8; 32] = session_id
+            .as_uuid()
+            .to_vec()
+            .try_into()
+            .expect("HashValue should convert to [u8; 32]");
+
+        extensions.add(NativeTableContext::new(txn_hash, resolver));
+        extensions.add(NativeRistrettoPointContext::new());
+        extensions.add(AlgebraContext::new());
+        extensions.add(NativeAggregatorContext::new(
+            txn_hash,
+            resolver,
+            move_vm.vm_config().delayed_field_optimization_enabled,
+            resolver,
+        ));
+        extensions.add(RandomnessContext::new());
+        extensions.add(NativeTransactionContext::new(
+            txn_hash.to_vec(),
+            session_id.into_script_hash(),
+            chain_id.id(),
+            maybe_user_transaction_context,
+        ));
+        extensions.add(NativeCodeContext::default());
+        extensions.add(NativeStateStorageContext::new(resolver));
+        extensions.add(NativeEventContext::default());
+        extensions.add(NativeObjectContext::default());
+
+        // The VM code loader has bugs around module upgrade. After a module upgrade, the internal
+        // cache needs to be flushed to work around those bugs.
+        move_vm.flush_loader_cache_if_invalidated();
+
+        let is_storage_slot_metadata_enabled = features.is_storage_slot_metadata_enabled();
         Self {
-            inner,
-            remote,
+            inner: move_vm.new_session_with_extensions(resolver, extensions),
+            resolver,
             is_storage_slot_metadata_enabled,
         }
     }
 
-    pub fn finish(self, configs: &ChangeSetConfigs) -> VMResult<VMChangeSet> {
+    pub fn finish(self, configs: &ChangeSetConfigs) -> VMResult<(VMChangeSet, ModuleWriteSet)> {
         let move_vm = self.inner.get_move_vm();
 
         let resource_converter = |value: Value,
@@ -94,7 +146,7 @@ impl<'r, 'l> SessionExt<'r, 'l> {
             .finish_with_extensions_with_custom_effects(&resource_converter)?;
 
         let (change_set, resource_group_change_set) =
-            Self::split_and_merge_resource_groups(move_vm, self.remote, change_set)
+            Self::split_and_merge_resource_groups(move_vm, self.resolver, change_set)
                 .map_err(|e| e.finish(Location::Undefined))?;
 
         let table_context: NativeTableContext = extensions.remove();
@@ -110,20 +162,20 @@ impl<'r, 'l> SessionExt<'r, 'l> {
         let event_context: NativeEventContext = extensions.remove();
         let events = event_context.into_events();
 
-        let woc = WriteOpConverter::new(self.remote, self.is_storage_slot_metadata_enabled);
+        let woc = WriteOpConverter::new(self.resolver, self.is_storage_slot_metadata_enabled);
 
-        let change_set = Self::convert_change_set(
+        let (change_set, module_write_set) = Self::convert_change_set(
             &woc,
             change_set,
             resource_group_change_set,
             events,
             table_change_set,
             aggregator_change_set,
-            configs,
+            configs.legacy_resource_creation_as_modification(),
         )
         .map_err(|e| e.finish(Location::Undefined))?;
 
-        Ok(change_set)
+        Ok((change_set, module_write_set))
     }
 
     pub fn extract_publish_request(&mut self) -> Option<PublishRequest> {
@@ -198,15 +250,15 @@ impl<'r, 'l> SessionExt<'r, 'l> {
     ///   * If group or data doesn't exist, Unreachable
     ///   * Otherwise modify
     /// * Delete -- remove element from container
-    ///   * If group or data does't exist, Unreachable
+    ///   * If group or data doesn't exist, Unreachable
     ///   * If elements remain, Modify
     ///   * Otherwise delete
     ///
     /// V1 Resource group change set behavior keeps ops for individual resources separate, not
-    /// merging them into the a single op corresponding to the whole resource group (V0).
+    /// merging them into a single op corresponding to the whole resource group (V0).
     fn split_and_merge_resource_groups(
         runtime: &MoveVM,
-        remote: &dyn AptosMoveResolver,
+        resolver: &dyn AptosMoveResolver,
         change_set: ChangeSet,
     ) -> PartialVMResult<(ChangeSet, ResourceGroupChangeSet)> {
         // The use of this implies that we could theoretically call unwrap with no consequences,
@@ -217,7 +269,7 @@ impl<'r, 'l> SessionExt<'r, 'l> {
         };
         let mut change_set_filtered = ChangeSet::new();
 
-        let mut maybe_resource_group_cache = remote.release_resource_group_cache().map(|v| {
+        let mut maybe_resource_group_cache = resolver.release_resource_group_cache().map(|v| {
             v.into_iter()
                 .map(|(k, v)| (k, v.into_iter().collect::<BTreeMap<_, _>>()))
                 .collect::<BTreeMap<_, _>>()
@@ -282,7 +334,8 @@ impl<'r, 'l> SessionExt<'r, 'l> {
                         // Maintain the behavior of failing the transaction on resource
                         // group member existence invariants.
                         for (struct_tag, current_op) in resources.iter() {
-                            let exists = remote.resource_exists_in_group(&state_key, struct_tag)?;
+                            let exists =
+                                resolver.resource_exists_in_group(&state_key, struct_tag)?;
                             if matches!(current_op, MoveStorageOp::New(_)) == exists {
                                 // Deletion and Modification require resource to exist,
                                 // while creation requires the resource to not exist.
@@ -298,18 +351,21 @@ impl<'r, 'l> SessionExt<'r, 'l> {
         Ok((change_set_filtered, resource_group_change_set))
     }
 
-    pub(crate) fn convert_change_set(
+    fn convert_change_set(
         woc: &WriteOpConverter,
         change_set: ChangeSet,
         resource_group_change_set: ResourceGroupChangeSet,
         events: Vec<(ContractEvent, Option<MoveTypeLayout>)>,
         table_change_set: TableChangeSet,
         aggregator_change_set: AggregatorChangeSet,
-        configs: &ChangeSetConfigs,
-    ) -> PartialVMResult<VMChangeSet> {
+        legacy_resource_creation_as_modification: bool,
+    ) -> PartialVMResult<(VMChangeSet, ModuleWriteSet)> {
         let mut resource_write_set = BTreeMap::new();
         let mut resource_group_write_set = BTreeMap::new();
-        let mut module_write_set = BTreeMap::new();
+
+        let mut has_modules_published_to_special_address = false;
+        let mut module_write_ops = BTreeMap::new();
+
         let mut aggregator_v1_write_set = BTreeMap::new();
         let mut aggregator_v1_delta_set = BTreeMap::new();
 
@@ -320,16 +376,19 @@ impl<'r, 'l> SessionExt<'r, 'l> {
                 let op = woc.convert_resource(
                     &state_key,
                     blob_and_layout_op,
-                    configs.legacy_resource_creation_as_modification(),
+                    legacy_resource_creation_as_modification,
                 )?;
 
                 resource_write_set.insert(state_key, op);
             }
 
             for (name, blob_op) in modules {
+                if addr.is_special() {
+                    has_modules_published_to_special_address = true;
+                }
                 let state_key = StateKey::module(&addr, &name);
                 let op = woc.convert_module(&state_key, blob_op, false)?;
-                module_write_set.insert(state_key, op);
+                module_write_ops.insert(state_key, op);
             }
         }
 
@@ -386,18 +445,20 @@ impl<'r, 'l> SessionExt<'r, 'l> {
             .filter(|(state_key, _)| !resource_group_write_set.contains_key(state_key))
             .collect();
 
-        VMChangeSet::new_expanded(
+        let change_set = VMChangeSet::new_expanded(
             resource_write_set,
             resource_group_write_set,
-            module_write_set,
             aggregator_v1_write_set,
             aggregator_v1_delta_set,
             aggregator_change_set.delayed_field_changes,
             reads_needing_exchange,
             group_reads_needing_change,
             events,
-            configs,
-        )
+        )?;
+        let module_write_set =
+            ModuleWriteSet::new(has_modules_published_to_special_address, module_write_ops);
+
+        Ok((change_set, module_write_set))
     }
 }
 
diff --git a/aptos-move/aptos-vm/src/move_vm_ext/session/respawned_session.rs b/aptos-move/aptos-vm/src/move_vm_ext/session/respawned_session.rs
index d8853dd0a9df6..3d06689531bb7 100644
--- a/aptos-move/aptos-vm/src/move_vm_ext/session/respawned_session.rs
+++ b/aptos-move/aptos-vm/src/move_vm_ext/session/respawned_session.rs
@@ -10,7 +10,10 @@ use crate::{
     AptosVM,
 };
 use aptos_types::transaction::user_transaction_context::UserTransactionContext;
-use aptos_vm_types::{change_set::VMChangeSet, storage::change_set_configs::ChangeSetConfigs};
+use aptos_vm_types::{
+    change_set::VMChangeSet, module_write_set::ModuleWriteSet,
+    storage::change_set_configs::ChangeSetConfigs,
+};
 use move_core_types::vm_status::{err_msg, StatusCode, VMStatus};
 
 fn unwrap_or_invariant_violation<T>(value: Option<T>, msg: &str) -> Result<T, VMStatus> {
@@ -40,21 +43,21 @@ impl<'r, 'l> RespawnedSession<'r, 'l> {
         base: &'r impl AptosMoveResolver,
         previous_session_change_set: VMChangeSet,
         user_transaction_context_opt: Option<UserTransactionContext>,
-    ) -> Result<Self, VMStatus> {
+    ) -> Self {
         let executor_view = ExecutorViewWithChangeSet::new(
             base.as_executor_view(),
             base.as_resource_group_view(),
             previous_session_change_set,
         );
 
-        Ok(RespawnedSessionBuilder {
+        RespawnedSessionBuilder {
             executor_view,
             resolver_builder: |executor_view| vm.as_move_resolver_with_group_view(executor_view),
             session_builder: |resolver| {
                 Some(vm.new_session(resolver, session_id, user_transaction_context_opt))
             },
         }
-        .build())
+        .build()
     }
 
     pub fn execute<T, E>(
@@ -72,8 +75,8 @@ impl<'r, 'l> RespawnedSession<'r, 'l> {
         mut self,
         change_set_configs: &ChangeSetConfigs,
         assert_no_additional_creation: bool,
-    ) -> Result<VMChangeSet, VMStatus> {
-        let additional_change_set = self.with_session_mut(|session| {
+    ) -> Result<(VMChangeSet, ModuleWriteSet), VMStatus> {
+        let (additional_change_set, module_write_set) = self.with_session_mut(|session| {
             unwrap_or_invariant_violation(
                 session.take(),
                 "VM session cannot be finished more than once.",
@@ -96,13 +99,13 @@ impl<'r, 'l> RespawnedSession<'r, 'l> {
         }
         let mut change_set = self.into_heads().executor_view.change_set;
         change_set
-            .squash_additional_change_set(additional_change_set, change_set_configs)
+            .squash_additional_change_set(additional_change_set)
             .map_err(|_err| {
                 VMStatus::error(
                     StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR,
                     err_msg("Failed to squash VMChangeSet"),
                 )
             })?;
-        Ok(change_set)
+        Ok((change_set, module_write_set))
     }
 }
diff --git a/aptos-move/aptos-vm/src/move_vm_ext/session/user_transaction_sessions/abort_hook.rs b/aptos-move/aptos-vm/src/move_vm_ext/session/user_transaction_sessions/abort_hook.rs
index 05581040ef17e..ecdad7704cab5 100644
--- a/aptos-move/aptos-vm/src/move_vm_ext/session/user_transaction_sessions/abort_hook.rs
+++ b/aptos-move/aptos-vm/src/move_vm_ext/session/user_transaction_sessions/abort_hook.rs
@@ -2,12 +2,19 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{
-    move_vm_ext::{session::respawned_session::RespawnedSession, AptosMoveResolver, SessionId},
+    move_vm_ext::{
+        session::{
+            respawned_session::RespawnedSession,
+            user_transaction_sessions::session_change_sets::SystemSessionChangeSet,
+        },
+        AptosMoveResolver, SessionId,
+    },
     transaction_metadata::TransactionMetadata,
     AptosVM,
 };
-use aptos_vm_types::{change_set::VMChangeSet, storage::change_set_configs::ChangeSetConfigs};
+use aptos_vm_types::storage::change_set_configs::ChangeSetConfigs;
 use derive_more::{Deref, DerefMut};
+use move_binary_format::errors::Location;
 use move_core_types::vm_status::VMStatus;
 
 #[derive(Deref, DerefMut)]
@@ -22,23 +29,41 @@ impl<'r, 'l> AbortHookSession<'r, 'l> {
         vm: &'l AptosVM,
         txn_meta: &'l TransactionMetadata,
         resolver: &'r impl AptosMoveResolver,
-        prologue_change_set: VMChangeSet,
-    ) -> Result<Self, VMStatus> {
+        prologue_session_change_set: SystemSessionChangeSet,
+    ) -> Self {
         let session_id = SessionId::run_on_abort(txn_meta);
 
         let session = RespawnedSession::spawn(
             vm,
             session_id,
             resolver,
-            prologue_change_set,
+            prologue_session_change_set.unpack(),
             Some(txn_meta.as_user_transaction_context()),
-        )?;
+        );
 
-        Ok(Self { session })
+        Self { session }
     }
 
-    pub fn finish(self, change_set_configs: &ChangeSetConfigs) -> Result<VMChangeSet, VMStatus> {
+    pub fn finish(
+        self,
+        change_set_configs: &ChangeSetConfigs,
+    ) -> Result<SystemSessionChangeSet, VMStatus> {
         let Self { session } = self;
-        session.finish_with_squashed_change_set(change_set_configs, false)
+        let (change_set, empty_module_write_set) =
+            session.finish_with_squashed_change_set(change_set_configs, false)?;
+        let abort_hook_session_change_set =
+            SystemSessionChangeSet::new(change_set, change_set_configs)?;
+
+        // Abort hook can never publish modules (just like epilogue)! When we move publishing
+        // outside MoveVM, we do not need to have a check here.
+        empty_module_write_set
+            .is_empty_or_invariant_violation()
+            .map_err(|e| {
+                e.with_message("Non-empty module write set in abort hook session".to_string())
+                    .finish(Location::Undefined)
+                    .into_vm_status()
+            })?;
+
+        Ok(abort_hook_session_change_set)
     }
 }
diff --git a/aptos-move/aptos-vm/src/move_vm_ext/session/user_transaction_sessions/epilogue.rs b/aptos-move/aptos-vm/src/move_vm_ext/session/user_transaction_sessions/epilogue.rs
index b6a217eb6d46d..0eff622833191 100644
--- a/aptos-move/aptos-vm/src/move_vm_ext/session/user_transaction_sessions/epilogue.rs
+++ b/aptos-move/aptos-vm/src/move_vm_ext/session/user_transaction_sessions/epilogue.rs
@@ -2,13 +2,29 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{
-    move_vm_ext::{session::respawned_session::RespawnedSession, AptosMoveResolver, SessionId},
+    move_vm_ext::{
+        session::{
+            respawned_session::RespawnedSession,
+            user_transaction_sessions::session_change_sets::{
+                SystemSessionChangeSet, UserSessionChangeSet,
+            },
+        },
+        AptosMoveResolver, SessionId,
+    },
     transaction_metadata::TransactionMetadata,
     AptosVM,
 };
 use aptos_gas_algebra::Fee;
-use aptos_vm_types::{change_set::VMChangeSet, storage::change_set_configs::ChangeSetConfigs};
+use aptos_types::{
+    fee_statement::FeeStatement,
+    transaction::{ExecutionStatus, TransactionAuxiliaryData, TransactionStatus},
+};
+use aptos_vm_types::{
+    change_set::VMChangeSet, module_write_set::ModuleWriteSet, output::VMOutput,
+    storage::change_set_configs::ChangeSetConfigs,
+};
 use derive_more::{Deref, DerefMut};
+use move_binary_format::errors::Location;
 use move_core_types::vm_status::VMStatus;
 
 #[derive(Deref, DerefMut)]
@@ -17,16 +33,52 @@ pub struct EpilogueSession<'r, 'l> {
     #[deref_mut]
     session: RespawnedSession<'r, 'l>,
     storage_refund: Fee,
+    module_write_set: ModuleWriteSet,
 }
 
 impl<'r, 'l> EpilogueSession<'r, 'l> {
-    pub fn new(
+    pub fn on_user_session_success(
+        vm: &'l AptosVM,
+        txn_meta: &'l TransactionMetadata,
+        resolver: &'r impl AptosMoveResolver,
+        user_session_change_set: UserSessionChangeSet,
+        storage_refund: Fee,
+    ) -> Self {
+        let (change_set, module_write_set) = user_session_change_set.unpack();
+        Self::new(
+            vm,
+            txn_meta,
+            resolver,
+            change_set,
+            module_write_set,
+            storage_refund,
+        )
+    }
+
+    pub fn on_user_session_failure(
+        vm: &'l AptosVM,
+        txn_meta: &'l TransactionMetadata,
+        resolver: &'r impl AptosMoveResolver,
+        previous_session_change_set: SystemSessionChangeSet,
+    ) -> Self {
+        Self::new(
+            vm,
+            txn_meta,
+            resolver,
+            previous_session_change_set.unpack(),
+            ModuleWriteSet::empty(),
+            0.into(),
+        )
+    }
+
+    fn new(
         vm: &'l AptosVM,
         txn_meta: &'l TransactionMetadata,
         resolver: &'r impl AptosMoveResolver,
         previous_session_change_set: VMChangeSet,
+        module_write_set: ModuleWriteSet,
         storage_refund: Fee,
-    ) -> Result<Self, VMStatus> {
+    ) -> Self {
         let session_id = SessionId::epilogue_meta(txn_meta);
         let session = RespawnedSession::spawn(
             vm,
@@ -34,23 +86,54 @@ impl<'r, 'l> EpilogueSession<'r, 'l> {
             resolver,
             previous_session_change_set,
             Some(txn_meta.as_user_transaction_context()),
-        )?;
+        );
 
-        Ok(Self {
+        Self {
             session,
             storage_refund,
-        })
+            module_write_set,
+        }
     }
 
     pub fn get_storage_fee_refund(&self) -> Fee {
         self.storage_refund
     }
 
-    pub fn finish(self, change_set_configs: &ChangeSetConfigs) -> Result<VMChangeSet, VMStatus> {
+    pub fn finish(
+        self,
+        fee_statement: FeeStatement,
+        execution_status: ExecutionStatus,
+        txn_aux_data: TransactionAuxiliaryData,
+        change_set_configs: &ChangeSetConfigs,
+    ) -> Result<VMOutput, VMStatus> {
         let Self {
             session,
             storage_refund: _,
+            module_write_set,
         } = self;
-        session.finish_with_squashed_change_set(change_set_configs, true)
+
+        let (change_set, empty_module_write_set) =
+            session.finish_with_squashed_change_set(change_set_configs, true)?;
+        let epilogue_session_change_set =
+            UserSessionChangeSet::new(change_set, module_write_set, change_set_configs)?;
+
+        // Epilogue can never publish modules! When we move publishing outside MoveVM, we do not need to have
+        // this check here, as modules will only be visible in user session.
+        empty_module_write_set
+            .is_empty_or_invariant_violation()
+            .map_err(|e| {
+                e.with_message("Non-empty module write set in epilogue session".to_string())
+                    .finish(Location::Undefined)
+                    .into_vm_status()
+            })?;
+
+        let (change_set, module_write_set) = epilogue_session_change_set.unpack();
+        Ok(VMOutput::new(
+            change_set,
+            module_write_set,
+            fee_statement,
+            TransactionStatus::Keep(execution_status),
+            txn_aux_data,
+        ))
     }
 }
diff --git a/aptos-move/aptos-vm/src/move_vm_ext/session/user_transaction_sessions/mod.rs b/aptos-move/aptos-vm/src/move_vm_ext/session/user_transaction_sessions/mod.rs
index 611a566bb5b76..666e2b22b87ae 100644
--- a/aptos-move/aptos-vm/src/move_vm_ext/session/user_transaction_sessions/mod.rs
+++ b/aptos-move/aptos-vm/src/move_vm_ext/session/user_transaction_sessions/mod.rs
@@ -4,4 +4,5 @@
 pub mod abort_hook;
 pub mod epilogue;
 pub mod prologue;
+pub mod session_change_sets;
 pub mod user;
diff --git a/aptos-move/aptos-vm/src/move_vm_ext/session/user_transaction_sessions/prologue.rs b/aptos-move/aptos-vm/src/move_vm_ext/session/user_transaction_sessions/prologue.rs
index 0a3b9467173c1..28076b1eae87f 100644
--- a/aptos-move/aptos-vm/src/move_vm_ext/session/user_transaction_sessions/prologue.rs
+++ b/aptos-move/aptos-vm/src/move_vm_ext/session/user_transaction_sessions/prologue.rs
@@ -4,7 +4,10 @@
 use crate::{
     move_vm_ext::{
         session::{
-            respawned_session::RespawnedSession, user_transaction_sessions::user::UserSession,
+            respawned_session::RespawnedSession,
+            user_transaction_sessions::{
+                session_change_sets::SystemSessionChangeSet, user::UserSession,
+            },
         },
         AptosMoveResolver, SessionId,
     },
@@ -13,6 +16,7 @@ use crate::{
 };
 use aptos_vm_types::{change_set::VMChangeSet, storage::change_set_configs::ChangeSetConfigs};
 use derive_more::{Deref, DerefMut};
+use move_binary_format::errors::Location;
 use move_core_types::vm_status::VMStatus;
 
 #[derive(Deref, DerefMut)]
@@ -27,7 +31,7 @@ impl<'r, 'l> PrologueSession<'r, 'l> {
         vm: &'l AptosVM,
         txn_meta: &'m TransactionMetadata,
         resolver: &'r impl AptosMoveResolver,
-    ) -> Result<Self, VMStatus> {
+    ) -> Self {
         let session_id = SessionId::prologue_meta(txn_meta);
         let session = RespawnedSession::spawn(
             vm,
@@ -35,9 +39,9 @@ impl<'r, 'l> PrologueSession<'r, 'l> {
             resolver,
             VMChangeSet::empty(),
             Some(txn_meta.as_user_transaction_context()),
-        )?;
+        );
 
-        Ok(Self { session })
+        Self { session }
     }
 
     pub fn into_user_session(
@@ -47,7 +51,7 @@ impl<'r, 'l> PrologueSession<'r, 'l> {
         resolver: &'r impl AptosMoveResolver,
         gas_feature_version: u64,
         change_set_configs: &ChangeSetConfigs,
-    ) -> Result<(VMChangeSet, UserSession<'r, 'l>), VMStatus> {
+    ) -> Result<(SystemSessionChangeSet, UserSession<'r, 'l>), VMStatus> {
         let Self { session } = self;
 
         if gas_feature_version >= 1 {
@@ -59,16 +63,29 @@ impl<'r, 'l> PrologueSession<'r, 'l> {
             // By releasing resource group cache, we start with a fresh slate for resource group
             // cost accounting.
 
-            let change_set = session.finish_with_squashed_change_set(change_set_configs, false)?;
-            resolver.release_resource_group_cache();
+            let (change_set, empty_module_write_set) =
+                session.finish_with_squashed_change_set(change_set_configs, false)?;
+            let prologue_session_change_set =
+                SystemSessionChangeSet::new(change_set.clone(), change_set_configs)?;
+
+            // Prologue can never publish modules! When we move publishing outside MoveVM, we do not
+            // need to have this check here, as modules will only be visible in user session.
+            empty_module_write_set
+                .is_empty_or_invariant_violation()
+                .map_err(|e| {
+                    e.with_message("Non-empty module write set in prologue session".to_string())
+                        .finish(Location::Undefined)
+                        .into_vm_status()
+                })?;
 
+            resolver.release_resource_group_cache();
             Ok((
-                change_set.clone(),
-                UserSession::new(vm, txn_meta, resolver, change_set)?,
+                prologue_session_change_set,
+                UserSession::new(vm, txn_meta, resolver, change_set),
             ))
         } else {
             Ok((
-                VMChangeSet::empty(),
+                SystemSessionChangeSet::empty(),
                 UserSession::legacy_inherit_prologue_session(session),
             ))
         }
diff --git a/aptos-move/aptos-vm/src/move_vm_ext/session/user_transaction_sessions/session_change_sets.rs b/aptos-move/aptos-vm/src/move_vm_ext/session/user_transaction_sessions/session_change_sets.rs
new file mode 100644
index 0000000000000..38b4641bc8caf
--- /dev/null
+++ b/aptos-move/aptos-vm/src/move_vm_ext/session/user_transaction_sessions/session_change_sets.rs
@@ -0,0 +1,115 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use aptos_types::{
+    contract_event::ContractEvent, state_store::state_key::StateKey, write_set::WriteOpSize,
+};
+use aptos_vm_types::{
+    change_set::{ChangeSetInterface, VMChangeSet, WriteOpInfo},
+    module_write_set::ModuleWriteSet,
+    resolver::ExecutorView,
+    storage::change_set_configs::ChangeSetConfigs,
+};
+use move_binary_format::errors::PartialVMResult;
+use move_core_types::vm_status::VMStatus;
+
+#[derive(Clone)]
+pub struct UserSessionChangeSet {
+    change_set: VMChangeSet,
+    module_write_set: ModuleWriteSet,
+}
+
+impl UserSessionChangeSet {
+    pub(crate) fn new(
+        change_set: VMChangeSet,
+        module_write_set: ModuleWriteSet,
+        change_set_configs: &ChangeSetConfigs,
+    ) -> Result<Self, VMStatus> {
+        let user_session_change_set = Self {
+            change_set,
+            module_write_set,
+        };
+        change_set_configs.check_change_set(&user_session_change_set)?;
+        Ok(user_session_change_set)
+    }
+
+    pub(crate) fn has_modules_published_to_special_address(&self) -> bool {
+        self.module_write_set.has_writes_to_special_address()
+    }
+
+    pub(crate) fn unpack(self) -> (VMChangeSet, ModuleWriteSet) {
+        (self.change_set, self.module_write_set)
+    }
+}
+
+impl ChangeSetInterface for UserSessionChangeSet {
+    fn num_write_ops(&self) -> usize {
+        self.change_set.num_write_ops() + self.module_write_set.num_write_ops()
+    }
+
+    fn write_set_size_iter(&self) -> impl Iterator<Item = (&StateKey, WriteOpSize)> {
+        self.change_set
+            .write_set_size_iter()
+            .chain(self.module_write_set.write_set_size_iter())
+    }
+
+    fn write_op_info_iter_mut<'a>(
+        &'a mut self,
+        executor_view: &'a dyn ExecutorView,
+    ) -> impl Iterator<Item = PartialVMResult<WriteOpInfo>> {
+        self.change_set
+            .write_op_info_iter_mut(executor_view)
+            .chain(self.module_write_set.write_op_info_iter_mut(executor_view))
+    }
+
+    fn events_iter(&self) -> impl Iterator<Item = &ContractEvent> {
+        self.change_set.events_iter()
+    }
+}
+
+#[derive(Clone)]
+pub struct SystemSessionChangeSet {
+    change_set: VMChangeSet,
+}
+
+impl SystemSessionChangeSet {
+    pub(crate) fn new(
+        change_set: VMChangeSet,
+        change_set_configs: &ChangeSetConfigs,
+    ) -> Result<Self, VMStatus> {
+        let system_session_change_set = Self { change_set };
+        change_set_configs.check_change_set(&system_session_change_set)?;
+        Ok(system_session_change_set)
+    }
+
+    pub(crate) fn empty() -> Self {
+        Self {
+            change_set: VMChangeSet::empty(),
+        }
+    }
+
+    pub(crate) fn unpack(self) -> VMChangeSet {
+        self.change_set
+    }
+}
+
+impl ChangeSetInterface for SystemSessionChangeSet {
+    fn num_write_ops(&self) -> usize {
+        self.change_set.num_write_ops()
+    }
+
+    fn write_set_size_iter(&self) -> impl Iterator<Item = (&StateKey, WriteOpSize)> {
+        self.change_set.write_set_size_iter()
+    }
+
+    fn write_op_info_iter_mut<'a>(
+        &'a mut self,
+        executor_view: &'a dyn ExecutorView,
+    ) -> impl Iterator<Item = PartialVMResult<WriteOpInfo>> {
+        self.change_set.write_op_info_iter_mut(executor_view)
+    }
+
+    fn events_iter(&self) -> impl Iterator<Item = &ContractEvent> {
+        self.change_set.events_iter()
+    }
+}
diff --git a/aptos-move/aptos-vm/src/move_vm_ext/session/user_transaction_sessions/user.rs b/aptos-move/aptos-vm/src/move_vm_ext/session/user_transaction_sessions/user.rs
index edccd9bde9ed0..ee018267145c1 100644
--- a/aptos-move/aptos-vm/src/move_vm_ext/session/user_transaction_sessions/user.rs
+++ b/aptos-move/aptos-vm/src/move_vm_ext/session/user_transaction_sessions/user.rs
@@ -2,7 +2,13 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{
-    move_vm_ext::{session::respawned_session::RespawnedSession, AptosMoveResolver, SessionId},
+    move_vm_ext::{
+        session::{
+            respawned_session::RespawnedSession,
+            user_transaction_sessions::session_change_sets::UserSessionChangeSet,
+        },
+        AptosMoveResolver, SessionId,
+    },
     transaction_metadata::TransactionMetadata,
     AptosVM,
 };
@@ -23,7 +29,7 @@ impl<'r, 'l> UserSession<'r, 'l> {
         txn_meta: &'l TransactionMetadata,
         resolver: &'r impl AptosMoveResolver,
         prologue_change_set: VMChangeSet,
-    ) -> Result<Self, VMStatus> {
+    ) -> Self {
         let session_id = SessionId::txn_meta(txn_meta);
 
         let session = RespawnedSession::spawn(
@@ -32,9 +38,9 @@ impl<'r, 'l> UserSession<'r, 'l> {
             resolver,
             prologue_change_set,
             Some(txn_meta.as_user_transaction_context()),
-        )?;
+        );
 
-        Ok(Self { session })
+        Self { session }
     }
 
     pub fn legacy_inherit_prologue_session(prologue_session: RespawnedSession<'r, 'l>) -> Self {
@@ -43,8 +49,13 @@ impl<'r, 'l> UserSession<'r, 'l> {
         }
     }
 
-    pub fn finish(self, change_set_configs: &ChangeSetConfigs) -> Result<VMChangeSet, VMStatus> {
+    pub fn finish(
+        self,
+        change_set_configs: &ChangeSetConfigs,
+    ) -> Result<UserSessionChangeSet, VMStatus> {
         let Self { session } = self;
-        session.finish_with_squashed_change_set(change_set_configs, false)
+        let (change_set, module_write_set) =
+            session.finish_with_squashed_change_set(change_set_configs, false)?;
+        UserSessionChangeSet::new(change_set, module_write_set, change_set_configs)
     }
 }
diff --git a/aptos-move/aptos-vm/src/move_vm_ext/session/view_with_change_set.rs b/aptos-move/aptos-vm/src/move_vm_ext/session/view_with_change_set.rs
index b766c729e2279..50e94ddba816e 100644
--- a/aptos-move/aptos-vm/src/move_vm_ext/session/view_with_change_set.rs
+++ b/aptos-move/aptos-vm/src/move_vm_ext/session/view_with_change_set.rs
@@ -84,11 +84,6 @@ impl<'r> TDelayedFieldView for ExecutorViewWithChangeSet<'r> {
     type ResourceGroupTag = StructTag;
     type ResourceKey = StateKey;
 
-    fn is_delayed_field_optimization_capable(&self) -> bool {
-        self.base_executor_view
-            .is_delayed_field_optimization_capable()
-    }
-
     fn get_delayed_field_value(
         &self,
         id: &Self::Identifier,
@@ -320,10 +315,7 @@ impl<'r> TModuleView for ExecutorViewWithChangeSet<'r> {
     type Key = StateKey;
 
     fn get_module_state_value(&self, state_key: &Self::Key) -> PartialVMResult<Option<StateValue>> {
-        match self.change_set.module_write_set().get(state_key) {
-            Some(write_op) => Ok(write_op.as_state_value()),
-            None => self.base_executor_view.get_module_state_value(state_key),
-        }
+        self.base_executor_view.get_module_state_value(state_key)
     }
 }
 
@@ -349,20 +341,12 @@ mod test {
     use aptos_aggregator::delta_change_set::{delta_add, serialize};
     use aptos_language_e2e_tests::data_store::FakeDataStore;
     use aptos_types::{account_address::AccountAddress, write_set::WriteOp};
-    use aptos_vm_types::{abstract_write_op::GroupWrite, check_change_set::CheckChangeSet};
+    use aptos_vm_types::abstract_write_op::GroupWrite;
     use move_core_types::{
         identifier::Identifier,
         language_storage::{StructTag, TypeTag},
     };
 
-    struct NoOpChangeSetChecker;
-
-    impl CheckChangeSet for NoOpChangeSetChecker {
-        fn check_change_set(&self, _change_set: &VMChangeSet) -> PartialVMResult<()> {
-            Ok(())
-        }
-    }
-
     fn key(s: impl ToString) -> StateKey {
         StateKey::raw(s.to_string().as_bytes())
     }
@@ -428,7 +412,6 @@ mod test {
     fn test_change_set_state_view() {
         let mut state_view = FakeDataStore::default();
         state_view.set_legacy(key("module_base"), serialize(&10));
-        state_view.set_legacy(key("module_both"), serialize(&20));
 
         state_view.set_legacy(key("resource_base"), serialize(&30));
         state_view.set_legacy(key("resource_both"), serialize(&40));
@@ -449,11 +432,6 @@ mod test {
             (key("resource_write_set"), (write(90), None)),
         ]);
 
-        let module_write_set = BTreeMap::from([
-            (key("module_both"), write(100)),
-            (key("module_write_set"), write(110)),
-        ]);
-
         let aggregator_v1_write_set = BTreeMap::from([
             (key("aggregator_both"), write(120)),
             (key("aggregator_write_set"), write(130)),
@@ -499,14 +477,12 @@ mod test {
         let change_set = VMChangeSet::new_expanded(
             resource_write_set,
             resource_group_write_set,
-            module_write_set,
             aggregator_v1_write_set,
             aggregator_v1_delta_set,
             BTreeMap::new(),
             BTreeMap::new(),
             BTreeMap::new(),
             vec![],
-            &NoOpChangeSetChecker,
         )
         .unwrap();
 
@@ -518,8 +494,6 @@ mod test {
         );
 
         assert_eq!(read_module(&view, "module_base"), 10);
-        assert_eq!(read_module(&view, "module_both"), 100);
-        assert_eq!(read_module(&view, "module_write_set"), 110);
 
         assert_eq!(read_resource(&view, "resource_base"), 30);
         assert_eq!(read_resource(&view, "resource_both"), 80);
diff --git a/aptos-move/aptos-vm/src/move_vm_ext/vm.rs b/aptos-move/aptos-vm/src/move_vm_ext/vm.rs
index 2d5dd366244c8..41e51b14972bd 100644
--- a/aptos-move/aptos-vm/src/move_vm_ext/vm.rs
+++ b/aptos-move/aptos-vm/src/move_vm_ext/vm.rs
@@ -1,243 +1,201 @@
 // Copyright © Aptos Foundation
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::move_vm_ext::{warm_vm_cache::WarmVmCache, AptosMoveResolver, SessionExt, SessionId};
-use aptos_framework::natives::{
-    aggregator_natives::NativeAggregatorContext,
-    code::NativeCodeContext,
-    cryptography::{algebra::AlgebraContext, ristretto255_point::NativeRistrettoPointContext},
-    event::NativeEventContext,
-    object::NativeObjectContext,
-    randomness::RandomnessContext,
-    state_storage::NativeStateStorageContext,
-    transaction_context::NativeTransactionContext,
+use crate::{
+    move_vm_ext::{warm_vm_cache::WarmVmCache, AptosMoveResolver, SessionExt, SessionId},
+    natives::aptos_natives_with_builder,
 };
+use aptos_crypto::HashValue;
 use aptos_gas_algebra::DynamicExpression;
-use aptos_gas_schedule::{MiscGasParameters, NativeGasParameters};
+use aptos_gas_schedule::{
+    AptosGasParameters, MiscGasParameters, NativeGasParameters, LATEST_GAS_FEATURE_VERSION,
+};
 use aptos_native_interface::SafeNativeBuilder;
-use aptos_table_natives::NativeTableContext;
 use aptos_types::{
     chain_id::ChainId,
-    on_chain_config::{FeatureFlag, Features, TimedFeatureFlag, TimedFeatures},
+    on_chain_config::{FeatureFlag, Features, TimedFeaturesBuilder},
     transaction::user_transaction_context::UserTransactionContext,
+    vm::configs::aptos_prod_vm_config,
 };
-use move_binary_format::{
-    deserializer::DeserializerConfig,
-    errors::VMResult,
-    file_format_common,
-    file_format_common::{IDENTIFIER_SIZE_MAX, LEGACY_IDENTIFIER_SIZE_MAX},
-};
-use move_bytecode_verifier::VerifierConfig;
-use move_vm_runtime::{
-    config::VMConfig, move_vm::MoveVM, native_extensions::NativeContextExtensions,
+use aptos_vm_types::{
+    environment::{aptos_default_ty_builder, aptos_prod_ty_builder, Environment},
+    storage::change_set_configs::ChangeSetConfigs,
 };
-use std::ops::Deref;
-
-pub struct MoveVmExt {
-    inner: MoveVM,
-    chain_id: u8,
+use move_vm_runtime::move_vm::MoveVM;
+use std::{ops::Deref, sync::Arc};
+
+/// MoveVM wrapper which is used to run genesis initializations. Designed as a
+/// stand-alone struct to ensure all genesis configurations are in one place,
+/// and are modified accordingly. The VM is initialized with default parameters,
+/// and should only be used to run genesis sessions.
+pub struct GenesisMoveVM {
+    vm: MoveVM,
+    chain_id: ChainId,
     features: Features,
 }
 
-pub fn get_max_binary_format_version(
-    features: &Features,
-    gas_feature_version_opt: Option<u64>,
-) -> u32 {
-    // For historical reasons, we support still < gas version 5, but if a new caller don't specify
-    // the gas version, we default to 5, which was introduced in late '22.
-    let gas_feature_version = gas_feature_version_opt.unwrap_or(5);
-    if gas_feature_version < 5 {
-        file_format_common::VERSION_5
-    } else if features.is_enabled(FeatureFlag::VM_BINARY_FORMAT_V7) {
-        file_format_common::VERSION_7
-    } else if features.is_enabled(FeatureFlag::VM_BINARY_FORMAT_V6) {
-        file_format_common::VERSION_6
-    } else {
-        file_format_common::VERSION_5
+impl GenesisMoveVM {
+    pub fn new(chain_id: ChainId) -> Self {
+        let features = Features::default();
+        let timed_features = TimedFeaturesBuilder::enable_all().build();
+
+        let vm_config =
+            aptos_prod_vm_config(&features, &timed_features, aptos_default_ty_builder());
+
+        // All genesis sessions run with unmetered gas meter, and here we set
+        // the gas parameters for natives as zeros (because they do not matter).
+        let mut native_builder = SafeNativeBuilder::new(
+            LATEST_GAS_FEATURE_VERSION,
+            NativeGasParameters::zeros(),
+            MiscGasParameters::zeros(),
+            timed_features.clone(),
+            features.clone(),
+            None,
+        );
+
+        let vm = MoveVM::new_with_config(
+            aptos_natives_with_builder(&mut native_builder, false),
+            vm_config.clone(),
+        );
+
+        Self {
+            vm,
+            chain_id,
+            features,
+        }
     }
-}
 
-pub fn get_max_identifier_size(features: &Features) -> u64 {
-    if features.is_enabled(FeatureFlag::LIMIT_MAX_IDENTIFIER_LENGTH) {
-        IDENTIFIER_SIZE_MAX
-    } else {
-        LEGACY_IDENTIFIER_SIZE_MAX
+    pub fn genesis_change_set_configs(&self) -> ChangeSetConfigs {
+        // Because genesis sessions are not metered, there are no change set
+        // (storage) costs as well.
+        ChangeSetConfigs::unlimited_at_gas_feature_version(LATEST_GAS_FEATURE_VERSION)
+    }
+
+    pub fn new_genesis_session<'r, R: AptosMoveResolver>(
+        &self,
+        resolver: &'r R,
+        genesis_id: HashValue,
+    ) -> SessionExt<'r, '_> {
+        let session_id = SessionId::genesis(genesis_id);
+        SessionExt::new(
+            session_id,
+            &self.vm,
+            self.chain_id,
+            &self.features,
+            None,
+            resolver,
+        )
     }
 }
 
+pub struct MoveVmExt {
+    inner: MoveVM,
+    pub(crate) env: Arc<Environment>,
+}
+
 impl MoveVmExt {
-    fn new_impl<F>(
-        native_gas_params: NativeGasParameters,
-        misc_gas_params: MiscGasParameters,
+    fn new_impl(
         gas_feature_version: u64,
-        chain_id: u8,
-        features: Features,
-        timed_features: TimedFeatures,
-        gas_hook: Option<F>,
+        gas_params: Result<&AptosGasParameters, &String>,
+        env: Arc<Environment>,
+        gas_hook: Option<Arc<dyn Fn(DynamicExpression) + Send + Sync>>,
+        inject_create_signer_for_gov_sim: bool,
         resolver: &impl AptosMoveResolver,
-        aggregator_v2_type_tagging: bool,
-    ) -> VMResult<Self>
-    where
-        F: Fn(DynamicExpression) + Send + Sync + 'static,
-    {
-        // Note: binary format v6 adds a few new integer types and their corresponding instructions.
-        //       Therefore it depends on a new version of the gas schedule and cannot be allowed if
-        //       the gas schedule hasn't been updated yet.
-        let max_binary_format_version =
-            get_max_binary_format_version(&features, Some(gas_feature_version));
-
-        let max_identifier_size = get_max_identifier_size(&features);
-
-        let enable_invariant_violation_check_in_swap_loc =
-            !timed_features.is_enabled(TimedFeatureFlag::DisableInvariantViolationCheckInSwapLoc);
-        let type_size_limit = true;
-
-        let verifier_config = verifier_config(&features, &timed_features);
-
-        let mut type_max_cost = 0;
-        let mut type_base_cost = 0;
-        let mut type_byte_cost = 0;
-        if timed_features.is_enabled(TimedFeatureFlag::LimitTypeTagSize) {
-            // 5000 limits type tag total size < 5000 bytes and < 50 nodes
-            type_max_cost = 5000;
-            type_base_cost = 100;
-            type_byte_cost = 1;
-        }
-
-        let mut builder = SafeNativeBuilder::new(
+    ) -> Self {
+        // TODO(Gas): Right now, we have to use some dummy values for gas parameters if they are not found on-chain.
+        //            This only happens in a edge case that is probably related to write set transactions or genesis,
+        //            which logically speaking, shouldn't be handled by the VM at all.
+        //            We should clean up the logic here once we get that refactored.
+        let (native_gas_params, misc_gas_params, ty_builder) = match gas_params {
+            Ok(gas_params) => {
+                let ty_builder = aptos_prod_ty_builder(gas_feature_version, gas_params);
+                (
+                    gas_params.natives.clone(),
+                    gas_params.vm.misc.clone(),
+                    ty_builder,
+                )
+            },
+            Err(_) => {
+                let ty_builder = aptos_default_ty_builder();
+                (
+                    NativeGasParameters::zeros(),
+                    MiscGasParameters::zeros(),
+                    ty_builder,
+                )
+            },
+        };
+
+        let builder = SafeNativeBuilder::new(
             gas_feature_version,
-            native_gas_params.clone(),
-            misc_gas_params.clone(),
-            timed_features.clone(),
-            features.clone(),
+            native_gas_params,
+            misc_gas_params,
+            env.timed_features().clone(),
+            env.features().clone(),
+            gas_hook,
         );
 
-        if let Some(hook) = gas_hook {
-            builder.set_gas_hook(hook);
-        }
+        // TODO(George): Move gas configs to environment to avoid this clone!
+        let mut vm_config = env.vm_config().clone();
+        vm_config.ty_builder = ty_builder;
+        vm_config.disallow_dispatch_for_native = env
+            .features()
+            .is_enabled(FeatureFlag::DISALLOW_USER_NATIVES);
 
-        Ok(Self {
+        Self {
             inner: WarmVmCache::get_warm_vm(
                 builder,
-                VMConfig {
-                    verifier: verifier_config,
-                    deserializer_config: DeserializerConfig::new(
-                        max_binary_format_version,
-                        max_identifier_size,
-                    ),
-                    paranoid_type_checks: crate::AptosVM::get_paranoid_checks(),
-                    enable_invariant_violation_check_in_swap_loc,
-                    type_size_limit,
-                    max_value_nest_depth: Some(128),
-                    type_max_cost,
-                    type_base_cost,
-                    type_byte_cost,
-                    aggregator_v2_type_tagging,
-                },
+                vm_config,
                 resolver,
-            )?,
-            chain_id,
-            features,
-        })
+                env.features().is_enabled(FeatureFlag::VM_BINARY_FORMAT_V7),
+                inject_create_signer_for_gov_sim,
+            )
+            .expect("should be able to create Move VM; check if there are duplicated natives"),
+            env,
+        }
     }
 
     pub fn new(
-        native_gas_params: NativeGasParameters,
-        misc_gas_params: MiscGasParameters,
         gas_feature_version: u64,
-        chain_id: u8,
-        features: Features,
-        timed_features: TimedFeatures,
+        gas_params: Result<&AptosGasParameters, &String>,
+        env: Arc<Environment>,
         resolver: &impl AptosMoveResolver,
-        aggregator_v2_type_tagging: bool,
-    ) -> VMResult<Self> {
-        Self::new_impl::<fn(DynamicExpression)>(
-            native_gas_params,
-            misc_gas_params,
-            gas_feature_version,
-            chain_id,
-            features,
-            timed_features,
-            None,
-            resolver,
-            aggregator_v2_type_tagging,
-        )
+    ) -> Self {
+        Self::new_impl(gas_feature_version, gas_params, env, None, false, resolver)
     }
 
-    pub fn new_with_gas_hook<F>(
-        native_gas_params: NativeGasParameters,
-        misc_gas_params: MiscGasParameters,
+    pub fn new_with_extended_options(
         gas_feature_version: u64,
-        chain_id: u8,
-        features: Features,
-        timed_features: TimedFeatures,
-        gas_hook: Option<F>,
+        gas_params: Result<&AptosGasParameters, &String>,
+        env: Arc<Environment>,
+        gas_hook: Option<Arc<dyn Fn(DynamicExpression) + Send + Sync>>,
+        inject_create_signer_for_gov_sim: bool,
         resolver: &impl AptosMoveResolver,
-        aggregator_v2_type_tagging: bool,
-    ) -> VMResult<Self>
-    where
-        F: Fn(DynamicExpression) + Send + Sync + 'static,
-    {
+    ) -> Self {
         Self::new_impl(
-            native_gas_params,
-            misc_gas_params,
             gas_feature_version,
-            chain_id,
-            features,
-            timed_features,
+            gas_params,
+            env,
             gas_hook,
+            inject_create_signer_for_gov_sim,
             resolver,
-            aggregator_v2_type_tagging,
         )
     }
 
-    pub fn new_session<'r, S: AptosMoveResolver>(
+    pub fn new_session<'r, R: AptosMoveResolver>(
         &self,
-        resolver: &'r S,
+        resolver: &'r R,
         session_id: SessionId,
-        user_transaction_context_opt: Option<UserTransactionContext>,
+        maybe_user_transaction_context: Option<UserTransactionContext>,
     ) -> SessionExt<'r, '_> {
-        let mut extensions = NativeContextExtensions::default();
-        let txn_hash: [u8; 32] = session_id
-            .as_uuid()
-            .to_vec()
-            .try_into()
-            .expect("HashValue should convert to [u8; 32]");
-
-        extensions.add(NativeTableContext::new(txn_hash, resolver));
-        extensions.add(NativeRistrettoPointContext::new());
-        extensions.add(AlgebraContext::new());
-        extensions.add(NativeAggregatorContext::new(txn_hash, resolver, resolver));
-        extensions.add(RandomnessContext::new());
-        extensions.add(NativeTransactionContext::new(
-            txn_hash.to_vec(),
-            session_id.into_script_hash(),
-            self.chain_id,
-            user_transaction_context_opt,
-        ));
-        extensions.add(NativeCodeContext::default());
-        extensions.add(NativeStateStorageContext::new(resolver));
-        extensions.add(NativeEventContext::default());
-        extensions.add(NativeObjectContext::default());
-
-        // The VM code loader has bugs around module upgrade. After a module upgrade, the internal
-        // cache needs to be flushed to work around those bugs.
-        self.inner.flush_loader_cache_if_invalidated();
-
         SessionExt::new(
-            self.inner.new_session_with_extensions(resolver, extensions),
+            session_id,
+            &self.inner,
+            self.env.chain_id(),
+            self.env.features(),
+            maybe_user_transaction_context,
             resolver,
-            self.features.is_storage_slot_metadata_enabled(),
         )
     }
-
-    pub(crate) fn features(&self) -> &Features {
-        &self.features
-    }
-
-    pub fn chain_id(&self) -> ChainId {
-        ChainId::new(self.chain_id)
-    }
 }
 
 impl Deref for MoveVmExt {
@@ -247,27 +205,3 @@ impl Deref for MoveVmExt {
         &self.inner
     }
 }
-
-pub fn verifier_config(features: &Features, _timed_features: &TimedFeatures) -> VerifierConfig {
-    VerifierConfig {
-        max_loop_depth: Some(5),
-        max_generic_instantiation_length: Some(32),
-        max_function_parameters: Some(128),
-        max_basic_blocks: Some(1024),
-        max_value_stack_size: 1024,
-        max_type_nodes: Some(256),
-        max_dependency_depth: Some(256),
-        max_push_size: Some(10000),
-        max_struct_definitions: None,
-        max_fields_in_struct: None,
-        max_function_definitions: None,
-        max_back_edges_per_function: None,
-        max_back_edges_per_module: None,
-        max_basic_blocks_in_script: None,
-        max_per_fun_meter_units: Some(1000 * 80000),
-        max_per_mod_meter_units: Some(1000 * 80000),
-        use_signature_checker_v2: features.is_enabled(FeatureFlag::SIGNATURE_CHECKER_V2),
-        sig_checker_v2_fix_script_ty_param_count: features
-            .is_enabled(FeatureFlag::SIGNATURE_CHECKER_V2_SCRIPT_FIX),
-    }
-}
diff --git a/aptos-move/aptos-vm/src/move_vm_ext/warm_vm_cache.rs b/aptos-move/aptos-vm/src/move_vm_ext/warm_vm_cache.rs
index 3d6736999849b..5f7b47ca41edc 100644
--- a/aptos-move/aptos-vm/src/move_vm_ext/warm_vm_cache.rs
+++ b/aptos-move/aptos-vm/src/move_vm_ext/warm_vm_cache.rs
@@ -8,10 +8,7 @@ use aptos_framework::natives::code::PackageRegistry;
 use aptos_infallible::RwLock;
 use aptos_metrics_core::TimerHelper;
 use aptos_native_interface::SafeNativeBuilder;
-use aptos_types::{
-    on_chain_config::{FeatureFlag, Features, OnChainConfig},
-    state_store::state_key::StateKey,
-};
+use aptos_types::{on_chain_config::OnChainConfig, state_store::state_key::StateKey};
 use bytes::Bytes;
 use move_binary_format::errors::{Location, PartialVMError, VMResult};
 use move_core_types::{
@@ -33,13 +30,25 @@ static WARM_VM_CACHE: Lazy<WarmVmCache> = Lazy::new(|| WarmVmCache {
     cache: RwLock::new(HashMap::new()),
 });
 
+pub fn flush_warm_vm_cache() {
+    WARM_VM_CACHE.cache.write().clear();
+}
+
 impl WarmVmCache {
     pub(crate) fn get_warm_vm(
         native_builder: SafeNativeBuilder,
         vm_config: VMConfig,
         resolver: &impl AptosMoveResolver,
+        bin_v7_enabled: bool,
+        inject_create_signer_for_gov_sim: bool,
     ) -> VMResult<MoveVM> {
-        WARM_VM_CACHE.get(native_builder, vm_config, resolver)
+        WARM_VM_CACHE.get(
+            native_builder,
+            vm_config,
+            resolver,
+            bin_v7_enabled,
+            inject_create_signer_for_gov_sim,
+        )
     }
 
     fn get(
@@ -47,11 +56,19 @@ impl WarmVmCache {
         mut native_builder: SafeNativeBuilder,
         vm_config: VMConfig,
         resolver: &impl AptosMoveResolver,
+        bin_v7_enabled: bool,
+        inject_create_signer_for_gov_sim: bool,
     ) -> VMResult<MoveVM> {
         let _timer = TIMER.timer_with(&["warm_vm_get"]);
         let id = {
             let _timer = TIMER.timer_with(&["get_warm_vm_id"]);
-            WarmVmId::new(&native_builder, &vm_config, resolver)?
+            WarmVmId::new(
+                &native_builder,
+                &vm_config,
+                resolver,
+                bin_v7_enabled,
+                inject_create_signer_for_gov_sim,
+            )?
         };
 
         if let Some(vm) = self.cache.read().get(&id) {
@@ -68,9 +85,9 @@ impl WarmVmCache {
             }
 
             let vm = MoveVM::new_with_config(
-                aptos_natives_with_builder(&mut native_builder),
+                aptos_natives_with_builder(&mut native_builder, inject_create_signer_for_gov_sim),
                 vm_config,
-            )?;
+            );
             Self::warm_vm_up(&vm, resolver);
 
             // Not using LruCache because its `::get()` requires &mut self
@@ -105,6 +122,7 @@ struct WarmVmId {
     vm_config: Bytes,
     core_packages_registry: Option<Bytes>,
     bin_v7_enabled: bool,
+    inject_create_signer_for_gov_sim: bool,
 }
 
 impl WarmVmId {
@@ -112,6 +130,8 @@ impl WarmVmId {
         native_builder: &SafeNativeBuilder,
         vm_config: &VMConfig,
         resolver: &impl AptosMoveResolver,
+        bin_v7_enabled: bool,
+        inject_create_signer_for_gov_sim: bool,
     ) -> VMResult<Self> {
         let natives = {
             let _timer = TIMER.timer_with(&["serialize_native_builder"]);
@@ -121,9 +141,8 @@ impl WarmVmId {
             natives,
             vm_config: Self::vm_config_bytes(vm_config),
             core_packages_registry: Self::core_packages_id_bytes(resolver)?,
-            bin_v7_enabled: Features::fetch_config(resolver)
-                .unwrap_or_default()
-                .is_enabled(FeatureFlag::VM_BINARY_FORMAT_V7),
+            bin_v7_enabled,
+            inject_create_signer_for_gov_sim,
         })
     }
 
diff --git a/aptos-move/aptos-vm/src/natives.rs b/aptos-move/aptos-vm/src/natives.rs
index 63ec675443b88..4fb5a39b11273 100644
--- a/aptos-move/aptos-vm/src/natives.rs
+++ b/aptos-move/aptos-vm/src/natives.rs
@@ -85,10 +85,6 @@ impl TDelayedFieldView for AptosBlankStorage {
     type ResourceGroupTag = StructTag;
     type ResourceKey = StateKey;
 
-    fn is_delayed_field_optimization_capable(&self) -> bool {
-        false
-    }
-
     fn get_delayed_field_value(
         &self,
         _id: &Self::Identifier,
@@ -163,12 +159,16 @@ pub fn aptos_natives(
         misc_gas_params,
         timed_features,
         features,
+        None,
     );
 
-    aptos_natives_with_builder(&mut builder)
+    aptos_natives_with_builder(&mut builder, false)
 }
 
-pub fn aptos_natives_with_builder(builder: &mut SafeNativeBuilder) -> NativeFunctionTable {
+pub fn aptos_natives_with_builder(
+    builder: &mut SafeNativeBuilder,
+    inject_create_signer_for_gov_sim: bool,
+) -> NativeFunctionTable {
     #[allow(unreachable_code)]
     aptos_move_stdlib::natives::all_natives(CORE_CODE_ADDRESS, builder)
         .into_iter()
@@ -176,6 +176,7 @@ pub fn aptos_natives_with_builder(builder: &mut SafeNativeBuilder) -> NativeFunc
         .chain(aptos_framework::natives::all_natives(
             CORE_CODE_ADDRESS,
             builder,
+            inject_create_signer_for_gov_sim,
         ))
         .chain(aptos_table_natives::table_natives(
             CORE_CODE_ADDRESS,
@@ -237,6 +238,7 @@ fn unit_test_extensions_hook(exts: &mut NativeContextExtensions) {
     exts.add(NativeAggregatorContext::new(
         [0; 32],
         &*DUMMY_RESOLVER,
+        false,
         &*DUMMY_RESOLVER,
     ));
     exts.add(NativeRistrettoPointContext::new());
diff --git a/aptos-move/aptos-vm/src/randomness_config.rs b/aptos-move/aptos-vm/src/randomness_config.rs
deleted file mode 100644
index 28a6be8e60d51..0000000000000
--- a/aptos-move/aptos-vm/src/randomness_config.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::move_vm_ext::AptosMoveResolver;
-use aptos_types::on_chain_config::{
-    randomness_api_v0_config::{AllowCustomMaxGasFlag, RequiredGasDeposit},
-    OnChainConfig,
-};
-
-/// A collection of on-chain randomness API configs that VM needs to be aware of.
-pub(crate) struct AptosVMRandomnessConfig {
-    pub(crate) randomness_api_v0_required_deposit: Option<u64>,
-    pub(crate) allow_rand_contract_custom_max_gas: bool,
-}
-
-impl AptosVMRandomnessConfig {
-    pub(crate) fn fetch(resolver: &impl AptosMoveResolver) -> Self {
-        let randomness_api_v0_required_deposit = RequiredGasDeposit::fetch_config(resolver)
-            .unwrap_or_else(RequiredGasDeposit::default_if_missing)
-            .gas_amount;
-        let allow_rand_contract_custom_max_gas = AllowCustomMaxGasFlag::fetch_config(resolver)
-            .unwrap_or_else(AllowCustomMaxGasFlag::default_if_missing)
-            .value;
-        Self {
-            randomness_api_v0_required_deposit,
-            allow_rand_contract_custom_max_gas,
-        }
-    }
-}
diff --git a/aptos-move/aptos-vm/src/sharded_block_executor/sharded_executor_service.rs b/aptos-move/aptos-vm/src/sharded_block_executor/sharded_executor_service.rs
index a2d2e76e9e6e6..e968f2416d47c 100644
--- a/aptos-move/aptos-vm/src/sharded_block_executor/sharded_executor_service.rs
+++ b/aptos-move/aptos-vm/src/sharded_block_executor/sharded_executor_service.rs
@@ -135,7 +135,7 @@ impl<S: StateView + Sync + Send + 'static> ShardedExecutorService<S> {
                 );
             });
             s.spawn(move |_| {
-                let ret = BlockAptosVM::execute_block(
+                let ret = BlockAptosVM::execute_block_on_thread_pool(
                     executor_thread_pool,
                     &signature_verified_transactions,
                     aggr_overridden_state_view.as_ref(),
diff --git a/aptos-move/aptos-vm/src/testing.rs b/aptos-move/aptos-vm/src/testing.rs
index 6a9c67fb07eb6..27edf50fa0d6c 100644
--- a/aptos-move/aptos-vm/src/testing.rs
+++ b/aptos-move/aptos-vm/src/testing.rs
@@ -5,6 +5,7 @@ use crate::AptosVM;
 #[cfg(any(test, feature = "testing"))]
 use crate::{
     aptos_vm::get_or_vm_startup_failure, data_cache::AsMoveResolver,
+    move_vm_ext::session::user_transaction_sessions::session_change_sets::SystemSessionChangeSet,
     transaction_metadata::TransactionMetadata,
 };
 #[cfg(any(test, feature = "testing"))]
@@ -12,7 +13,7 @@ use aptos_types::{state_store::StateView, transaction::SignedTransaction};
 #[cfg(any(test, feature = "testing"))]
 use aptos_vm_logging::log_schema::AdapterLogSchema;
 #[cfg(any(test, feature = "testing"))]
-use aptos_vm_types::{change_set::VMChangeSet, output::VMOutput};
+use aptos_vm_types::output::VMOutput;
 use move_binary_format::errors::VMResult;
 #[cfg(any(test, feature = "testing"))]
 use move_core_types::vm_status::VMStatus;
@@ -103,7 +104,7 @@ impl AptosVM {
         let resolver = state_view.as_move_resolver();
         let storage = TraversalStorage::new();
         self.failed_transaction_cleanup(
-            VMChangeSet::empty(),
+            SystemSessionChangeSet::empty(),
             error_vm_status,
             &mut gas_meter,
             &txn_data,
diff --git a/aptos-move/aptos-vm/src/transaction_metadata.rs b/aptos-move/aptos-vm/src/transaction_metadata.rs
index 41a3501b46b56..e73d53acc19c0 100644
--- a/aptos-move/aptos-vm/src/transaction_metadata.rs
+++ b/aptos-move/aptos-vm/src/transaction_metadata.rs
@@ -28,7 +28,6 @@ pub struct TransactionMetadata {
     pub chain_id: ChainId,
     pub script_hash: Vec<u8>,
     pub script_size: NumBytes,
-    pub required_deposit: Option<u64>,
     pub is_keyless: bool,
     pub entry_function_payload: Option<EntryFunction>,
     pub multisig_payload: Option<Multisig>,
@@ -70,7 +69,6 @@ impl TransactionMetadata {
                 TransactionPayload::Script(s) => (s.code().len() as u64).into(),
                 _ => NumBytes::zero(),
             },
-            required_deposit: None,
             is_keyless: aptos_types::keyless::get_authenticators(txn)
                 .map(|res| !res.is_empty())
                 .unwrap_or(false),
@@ -139,10 +137,6 @@ impl TransactionMetadata {
         !self.secondary_signers.is_empty() || self.fee_payer.is_some()
     }
 
-    pub fn set_required_deposit(&mut self, required_deposit: Option<u64>) {
-        self.required_deposit = required_deposit;
-    }
-
     pub fn is_keyless(&self) -> bool {
         self.is_keyless
     }
diff --git a/aptos-move/aptos-vm/src/transaction_validation.rs b/aptos-move/aptos-vm/src/transaction_validation.rs
index a45a45d757087..c90f7bd8c43e0 100644
--- a/aptos-move/aptos-vm/src/transaction_validation.rs
+++ b/aptos-move/aptos-vm/src/transaction_validation.rs
@@ -14,7 +14,7 @@ use crate::{
 use aptos_gas_algebra::Gas;
 use aptos_types::{
     account_config::constants::CORE_CODE_ADDRESS, fee_statement::FeeStatement,
-    move_utils::as_move_value::AsMoveValue, on_chain_config::Features, transaction::Multisig,
+    on_chain_config::Features, transaction::Multisig,
 };
 use aptos_vm_logging::log_schema::AdapterLogSchema;
 use fail::fail_point;
@@ -36,21 +36,10 @@ pub static APTOS_TRANSACTION_VALIDATION: Lazy<TransactionValidation> =
         module_addr: CORE_CODE_ADDRESS,
         module_name: Identifier::new("transaction_validation").unwrap(),
         fee_payer_prologue_name: Identifier::new("fee_payer_script_prologue").unwrap(),
-        fee_payer_prologue_collect_deposit_name: Identifier::new(
-            "fee_payer_script_prologue_collect_deposit",
-        )
-        .unwrap(),
         script_prologue_name: Identifier::new("script_prologue").unwrap(),
-        script_prologue_collect_deposit_name: Identifier::new("script_prologue_collect_deposit")
-            .unwrap(),
         multi_agent_prologue_name: Identifier::new("multi_agent_script_prologue").unwrap(),
         user_epilogue_name: Identifier::new("epilogue").unwrap(),
-        user_epilogue_return_deposit_name: Identifier::new("epilogue_return_deposit").unwrap(),
         user_epilogue_gas_payer_name: Identifier::new("epilogue_gas_payer").unwrap(),
-        user_epilogue_gas_payer_return_deposit_name: Identifier::new(
-            "epilogue_gas_payer_return_deposit",
-        )
-        .unwrap(),
     });
 
 /// On-chain functions used to validate transactions
@@ -59,14 +48,10 @@ pub struct TransactionValidation {
     pub module_addr: AccountAddress,
     pub module_name: Identifier,
     pub fee_payer_prologue_name: Identifier,
-    pub fee_payer_prologue_collect_deposit_name: Identifier,
     pub script_prologue_name: Identifier,
-    pub script_prologue_collect_deposit_name: Identifier,
     pub multi_agent_prologue_name: Identifier,
     pub user_epilogue_name: Identifier,
-    pub user_epilogue_return_deposit_name: Identifier,
     pub user_epilogue_gas_payer_name: Identifier,
-    pub user_epilogue_gas_payer_return_deposit_name: Identifier,
 }
 
 impl TransactionValidation {
@@ -106,7 +91,7 @@ pub(crate) fn run_script_prologue(
         txn_data.fee_payer(),
         txn_data.fee_payer_authentication_key.as_ref(),
     ) {
-        let mut args = vec![
+        let args = vec![
             MoveValue::Signer(txn_data.sender),
             MoveValue::U64(txn_sequence_number),
             MoveValue::vector_u8(txn_authentication_key),
@@ -119,15 +104,7 @@ pub(crate) fn run_script_prologue(
             MoveValue::U64(txn_expiration_timestamp_secs),
             MoveValue::U8(chain_id.id()),
         ];
-        if txn_data.required_deposit.is_some() {
-            args.push(txn_data.required_deposit.as_move_value());
-            (
-                &APTOS_TRANSACTION_VALIDATION.fee_payer_prologue_collect_deposit_name,
-                args,
-            )
-        } else {
-            (&APTOS_TRANSACTION_VALIDATION.fee_payer_prologue_name, args)
-        }
+        (&APTOS_TRANSACTION_VALIDATION.fee_payer_prologue_name, args)
     } else if txn_data.is_multi_agent() {
         let args = vec![
             MoveValue::Signer(txn_data.sender),
@@ -145,7 +122,7 @@ pub(crate) fn run_script_prologue(
             args,
         )
     } else {
-        let mut args = vec![
+        let args = vec![
             MoveValue::Signer(txn_data.sender),
             MoveValue::U64(txn_sequence_number),
             MoveValue::vector_u8(txn_authentication_key),
@@ -155,15 +132,7 @@ pub(crate) fn run_script_prologue(
             MoveValue::U8(chain_id.id()),
             MoveValue::vector_u8(txn_data.script_hash.clone()),
         ];
-        if txn_data.required_deposit.is_some() {
-            args.push(txn_data.required_deposit.as_move_value());
-            (
-                &APTOS_TRANSACTION_VALIDATION.script_prologue_collect_deposit_name,
-                args,
-            )
-        } else {
-            (&APTOS_TRANSACTION_VALIDATION.script_prologue_name, args)
-        }
+        (&APTOS_TRANSACTION_VALIDATION.script_prologue_name, args)
     };
     session
         .execute_function_bypass_visibility(
@@ -188,6 +157,7 @@ pub(crate) fn run_multisig_prologue(
     session: &mut SessionExt,
     txn_data: &TransactionMetadata,
     payload: &Multisig,
+    features: &Features,
     log_context: &AdapterLogSchema,
     traversal_context: &mut TraversalContext,
 ) -> Result<(), VMStatus> {
@@ -196,7 +166,11 @@ pub(crate) fn run_multisig_prologue(
         bcs::to_bytes(&payload).map_err(|_| unreachable_error.clone())?
     } else {
         // Default to empty bytes if payload is not provided.
-        bcs::to_bytes::<Vec<u8>>(&vec![]).map_err(|_| unreachable_error)?
+        if features.is_abort_if_multisig_payload_mismatch_enabled() {
+            vec![]
+        } else {
+            bcs::to_bytes::<Vec<u8>>(&vec![]).map_err(|_| unreachable_error)?
+        }
     };
 
     session
@@ -232,7 +206,7 @@ fn run_epilogue(
     // accepted it, in which case the gas payer feature is enabled.
     if let Some(fee_payer) = txn_data.fee_payer() {
         let (func_name, args) = {
-            let mut args = vec![
+            let args = vec![
                 MoveValue::Signer(txn_data.sender),
                 MoveValue::Address(fee_payer),
                 MoveValue::U64(fee_statement.storage_fee_refund()),
@@ -240,18 +214,10 @@ fn run_epilogue(
                 MoveValue::U64(txn_max_gas_units.into()),
                 MoveValue::U64(gas_remaining.into()),
             ];
-            if txn_data.required_deposit.is_some() {
-                args.push(txn_data.required_deposit.as_move_value());
-                (
-                    &APTOS_TRANSACTION_VALIDATION.user_epilogue_gas_payer_return_deposit_name,
-                    args,
-                )
-            } else {
-                (
-                    &APTOS_TRANSACTION_VALIDATION.user_epilogue_gas_payer_name,
-                    args,
-                )
-            }
+            (
+                &APTOS_TRANSACTION_VALIDATION.user_epilogue_gas_payer_name,
+                args,
+            )
         };
         session.execute_function_bypass_visibility(
             &APTOS_TRANSACTION_VALIDATION.module_id(),
@@ -264,22 +230,14 @@ fn run_epilogue(
     } else {
         // Regular tx, run the normal epilogue
         let (func_name, args) = {
-            let mut args = vec![
+            let args = vec![
                 MoveValue::Signer(txn_data.sender),
                 MoveValue::U64(fee_statement.storage_fee_refund()),
                 MoveValue::U64(txn_gas_price.into()),
                 MoveValue::U64(txn_max_gas_units.into()),
                 MoveValue::U64(gas_remaining.into()),
             ];
-            if txn_data.required_deposit.is_some() {
-                args.push(txn_data.required_deposit.as_move_value());
-                (
-                    &APTOS_TRANSACTION_VALIDATION.user_epilogue_return_deposit_name,
-                    args,
-                )
-            } else {
-                (&APTOS_TRANSACTION_VALIDATION.user_epilogue_name, args)
-            }
+            (&APTOS_TRANSACTION_VALIDATION.user_epilogue_name, args)
         };
         session.execute_function_bypass_visibility(
             &APTOS_TRANSACTION_VALIDATION.module_id(),
diff --git a/aptos-move/aptos-vm/src/validator_txns/dkg.rs b/aptos-move/aptos-vm/src/validator_txns/dkg.rs
index dd5f77dd174ff..a0a57cdb04bcc 100644
--- a/aptos-move/aptos-vm/src/validator_txns/dkg.rs
+++ b/aptos-move/aptos-vm/src/validator_txns/dkg.rs
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{
-    aptos_vm::get_or_vm_startup_failure,
+    aptos_vm::{get_or_vm_startup_failure, get_system_transaction_output},
     errors::expect_only_successful_execution,
     move_vm_ext::{AptosMoveResolver, SessionId},
     system_module_names::{FINISH_WITH_DKG_RESULT, RECONFIGURATION_WITH_DKG_MODULE},
@@ -14,10 +14,9 @@ use crate::{
 };
 use aptos_types::{
     dkg::{DKGState, DKGTrait, DKGTranscript, DefaultDKG},
-    fee_statement::FeeStatement,
     move_utils::as_move_value::AsMoveValue,
     on_chain_config::{ConfigurationResource, OnChainConfig},
-    transaction::{ExecutionStatus, TransactionStatus},
+    transaction::TransactionStatus,
 };
 use aptos_vm_logging::log_schema::AdapterLogSchema;
 use aptos_vm_types::output::VMOutput;
@@ -121,10 +120,8 @@ impl AptosVM {
             })
             .map_err(|r| Unexpected(r.unwrap_err()))?;
 
-        let output = crate::aptos_vm::get_system_transaction_output(
+        let output = get_system_transaction_output(
             session,
-            FeeStatement::zero(),
-            ExecutionStatus::Success,
             &get_or_vm_startup_failure(&self.storage_gas_params, log_context)
                 .map_err(Unexpected)?
                 .change_set_configs,
diff --git a/aptos-move/aptos-vm/src/validator_txns/jwk.rs b/aptos-move/aptos-vm/src/validator_txns/jwk.rs
index 9b994e911d723..1d6e80f1e5cb6 100644
--- a/aptos-move/aptos-vm/src/validator_txns/jwk.rs
+++ b/aptos-move/aptos-vm/src/validator_txns/jwk.rs
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{
-    aptos_vm::get_or_vm_startup_failure,
+    aptos_vm::{get_or_vm_startup_failure, get_system_transaction_output},
     errors::expect_only_successful_execution,
     move_vm_ext::{AptosMoveResolver, SessionId},
     system_module_names::{JWKS_MODULE, UPSERT_INTO_OBSERVED_JWKS},
@@ -17,12 +17,11 @@ use crate::{
 };
 use aptos_logger::debug;
 use aptos_types::{
-    fee_statement::FeeStatement,
     jwks,
     jwks::{Issuer, ObservedJWKs, ProviderJWKs, QuorumCertifiedUpdate},
     move_utils::as_move_value::AsMoveValue,
     on_chain_config::{OnChainConfig, ValidatorSet},
-    transaction::{ExecutionStatus, TransactionStatus},
+    transaction::TransactionStatus,
     validator_verifier::ValidatorVerifier,
 };
 use aptos_vm_logging::log_schema::AdapterLogSchema;
@@ -151,10 +150,8 @@ impl AptosVM {
             })
             .map_err(|r| Unexpected(r.unwrap_err()))?;
 
-        let output = crate::aptos_vm::get_system_transaction_output(
+        let output = get_system_transaction_output(
             session,
-            FeeStatement::zero(),
-            ExecutionStatus::Success,
             &get_or_vm_startup_failure(&self.storage_gas_params, log_context)
                 .map_err(Unexpected)?
                 .change_set_configs,
diff --git a/aptos-move/aptos-vm/src/verifier/event_validation.rs b/aptos-move/aptos-vm/src/verifier/event_validation.rs
index 6b1e2fb1e10e8..761a94bb2652d 100644
--- a/aptos-move/aptos-vm/src/verifier/event_validation.rs
+++ b/aptos-move/aptos-vm/src/verifier/event_validation.rs
@@ -5,7 +5,6 @@ use crate::move_vm_ext::SessionExt;
 use aptos_framework::RuntimeModuleMetadataV1;
 use move_binary_format::{
     access::{ModuleAccess, ScriptAccess},
-    deserializer::DeserializerConfig,
     errors::{Location, PartialVMError, VMError, VMResult},
     file_format::{
         Bytecode, CompiledScript,
@@ -151,19 +150,7 @@ pub(crate) fn extract_event_metadata(
     Ok(event_structs)
 }
 
-pub(crate) fn verify_no_event_emission_in_script(
-    script_code: &[u8],
-    config: &DeserializerConfig,
-) -> VMResult<()> {
-    let script = match CompiledScript::deserialize_with_config(script_code, config) {
-        Ok(script) => script,
-        Err(err) => {
-            let msg = format!("[VM] deserializer for script returned error: {:?}", err);
-            return Err(PartialVMError::new(StatusCode::CODE_DESERIALIZATION_ERROR)
-                .with_message(msg)
-                .finish(Location::Script));
-        },
-    };
+pub(crate) fn verify_no_event_emission_in_compiled_script(script: &CompiledScript) -> VMResult<()> {
     for bc in &script.code().code {
         if let Bytecode::CallGeneric(index) = bc {
             let func_instantiation = &script.function_instantiation_at(*index);
diff --git a/aptos-move/aptos-vm/src/verifier/mod.rs b/aptos-move/aptos-vm/src/verifier/mod.rs
index 0240e6e673ff9..9feafff4b77eb 100644
--- a/aptos-move/aptos-vm/src/verifier/mod.rs
+++ b/aptos-move/aptos-vm/src/verifier/mod.rs
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pub(crate) mod event_validation;
 pub(crate) mod module_init;
+pub(crate) mod native_validation;
 pub(crate) mod randomness;
 pub(crate) mod resource_groups;
 pub mod transaction_arg_validation;
diff --git a/aptos-move/aptos-vm/src/verifier/native_validation.rs b/aptos-move/aptos-vm/src/verifier/native_validation.rs
new file mode 100644
index 0000000000000..161361b94de7a
--- /dev/null
+++ b/aptos-move/aptos-vm/src/verifier/native_validation.rs
@@ -0,0 +1,28 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::{
+    access::ModuleAccess,
+    errors::{Location, PartialVMError, VMResult},
+    CompiledModule,
+};
+use move_core_types::vm_status::StatusCode;
+
+/// Validate that only system address can publish new natives.
+pub(crate) fn validate_module_natives(modules: &[CompiledModule]) -> VMResult<()> {
+    for module in modules {
+        let module_address = module.self_addr();
+        for def in module.function_defs() {
+            if def.is_native() && !module_address.is_special() {
+                return Err(
+                    PartialVMError::new(StatusCode::USER_DEFINED_NATIVE_NOT_ALLOWED)
+                        .with_message(
+                            "Cannot publish native function to non-special address".to_string(),
+                        )
+                        .finish(Location::Module(module.self_id())),
+                );
+            }
+        }
+    }
+    Ok(())
+}
diff --git a/aptos-move/aptos-vm/src/verifier/resource_groups.rs b/aptos-move/aptos-vm/src/verifier/resource_groups.rs
index caa90bbfaa391..a7c7e8d193682 100644
--- a/aptos-move/aptos-vm/src/verifier/resource_groups.rs
+++ b/aptos-move/aptos-vm/src/verifier/resource_groups.rs
@@ -6,7 +6,6 @@ use aptos_framework::{ResourceGroupScope, RuntimeModuleMetadataV1};
 use move_binary_format::{
     access::ModuleAccess,
     errors::{Location, PartialVMError, VMError, VMResult},
-    normalized::Struct,
     CompiledModule,
 };
 use move_core_types::{
@@ -172,7 +171,11 @@ pub(crate) fn extract_resource_group_metadata_from_module(
         let structs = module
             .struct_defs()
             .iter()
-            .map(|d| Struct::new(&module, d).0.into_string())
+            .map(|struct_def| {
+                let struct_handle = module.struct_handle_at(struct_def.struct_handle);
+                let name = module.identifier_at(struct_handle.name).to_string();
+                name
+            })
             .collect::<BTreeSet<_>>();
         Ok((groups, members, structs))
     } else {
diff --git a/aptos-move/aptos-vm/src/verifier/transaction_arg_validation.rs b/aptos-move/aptos-vm/src/verifier/transaction_arg_validation.rs
index 8a07d15c6a09f..b4be0a60880de 100644
--- a/aptos-move/aptos-vm/src/verifier/transaction_arg_validation.rs
+++ b/aptos-move/aptos-vm/src/verifier/transaction_arg_validation.rs
@@ -22,7 +22,7 @@ use move_core_types::{
 };
 use move_vm_runtime::{
     module_traversal::{TraversalContext, TraversalStorage},
-    session::LoadedFunctionInstantiation,
+    LoadedFunction,
 };
 use move_vm_types::{
     gas::{GasMeter, UnmeteredGasMeter},
@@ -105,11 +105,11 @@ pub fn validate_combine_signer_and_txn_args(
     session: &mut SessionExt,
     senders: Vec<AccountAddress>,
     args: Vec<Vec<u8>>,
-    func: &LoadedFunctionInstantiation,
+    func: &LoadedFunction,
     are_struct_constructors_enabled: bool,
 ) -> Result<Vec<Vec<u8>>, VMStatus> {
-    // entry function should not return
-    if !func.return_tys.is_empty() {
+    // Entry function should not return.
+    if !func.return_tys().is_empty() {
         return Err(VMStatus::error(
             StatusCode::INVALID_MAIN_FUNCTION_SIGNATURE,
             None,
@@ -117,7 +117,7 @@ pub fn validate_combine_signer_and_txn_args(
     }
     let mut signer_param_cnt = 0;
     // find all signer params at the beginning
-    for ty in func.param_tys.iter() {
+    for ty in func.param_tys() {
         match ty {
             Type::Signer => signer_param_cnt += 1,
             Type::Reference(inner_type) => {
@@ -130,9 +130,13 @@ pub fn validate_combine_signer_and_txn_args(
     }
 
     let allowed_structs = get_allowed_structs(are_struct_constructors_enabled);
+    let ty_builder = session.get_ty_builder();
+
     // Need to keep this here to ensure we return the historic correct error code for replay
-    for ty in func.param_tys[signer_param_cnt..].iter() {
-        let valid = is_valid_txn_arg(session, &ty.subst(&func.ty_args).unwrap(), allowed_structs);
+    for ty in func.param_tys()[signer_param_cnt..].iter() {
+        let subst_res = ty_builder.create_ty_with_subst(ty, func.ty_args());
+        let ty = subst_res.map_err(|e| e.finish(Location::Undefined).into_vm_status())?;
+        let valid = is_valid_txn_arg(session, &ty, allowed_structs);
         if !valid {
             return Err(VMStatus::error(
                 StatusCode::INVALID_MAIN_FUNCTION_SIGNATURE,
@@ -141,7 +145,7 @@ pub fn validate_combine_signer_and_txn_args(
         }
     }
 
-    if (signer_param_cnt + args.len()) != func.param_tys.len() {
+    if (signer_param_cnt + args.len()) != func.param_tys().len() {
         return Err(VMStatus::error(
             StatusCode::NUMBER_OF_ARGUMENTS_MISMATCH,
             None,
@@ -164,9 +168,9 @@ pub fn validate_combine_signer_and_txn_args(
     // FAILED_TO_DESERIALIZE_ARGUMENT error.
     let args = construct_args(
         session,
-        &func.param_tys[signer_param_cnt..],
+        &func.param_tys()[signer_param_cnt..],
         args,
-        &func.ty_args,
+        func.ty_args(),
         allowed_structs,
         false,
     )?;
@@ -187,12 +191,12 @@ pub fn validate_combine_signer_and_txn_args(
 // Return whether the argument is valid/allowed and whether it needs construction.
 pub(crate) fn is_valid_txn_arg(
     session: &SessionExt,
-    typ: &Type,
+    ty: &Type,
     allowed_structs: &ConstructorMap,
 ) -> bool {
     use move_vm_types::loaded_data::runtime_types::Type::*;
 
-    match typ {
+    match ty {
         Bool | U8 | U16 | U32 | U64 | U128 | U256 | Address => true,
         Vector(inner) => is_valid_txn_arg(session, inner, allowed_structs),
         Struct { idx, .. } | StructInstantiation { idx, .. } => {
@@ -222,15 +226,12 @@ pub(crate) fn construct_args(
     if types.len() != args.len() {
         return Err(invalid_signature());
     }
+
+    let ty_builder = session.get_ty_builder();
     for (ty, arg) in types.iter().zip(args) {
-        let arg = construct_arg(
-            session,
-            &ty.subst(ty_args).unwrap(),
-            allowed_structs,
-            arg,
-            &mut gas_meter,
-            is_view,
-        )?;
+        let subst_res = ty_builder.create_ty_with_subst(ty, ty_args);
+        let ty = subst_res.map_err(|e| e.finish(Location::Undefined).into_vm_status())?;
+        let arg = construct_arg(session, &ty, allowed_structs, arg, &mut gas_meter, is_view)?;
         res_args.push(arg);
     }
     Ok(res_args)
@@ -420,17 +421,22 @@ fn validate_and_construct(
         *max_invocations -= 1;
     }
 
-    let (function, instantiation) = session.load_function_with_type_arg_inference(
+    let function = session.load_function_with_type_arg_inference(
         &constructor.module_id,
         constructor.func_name,
         expected_type,
     )?;
     let mut args = vec![];
-    for param_type in &instantiation.param_tys {
+    let ty_builder = session.get_ty_builder();
+    for param_ty in function.param_tys() {
         let mut arg = vec![];
+        let arg_ty = ty_builder
+            .create_ty_with_subst(param_ty, function.ty_args())
+            .unwrap();
+
         recursively_construct_arg(
             session,
-            &param_type.subst(&instantiation.ty_args).unwrap(),
+            &arg_ty,
             allowed_structs,
             cursor,
             initial_cursor_len,
@@ -441,9 +447,8 @@ fn validate_and_construct(
         args.push(arg);
     }
     let storage = TraversalStorage::new();
-    let serialized_result = session.execute_instantiated_function(
+    let serialized_result = session.execute_loaded_function(
         function,
-        instantiation,
         args,
         gas_meter,
         &mut TraversalContext::new(&storage),
diff --git a/aptos-move/aptos-vm/src/verifier/view_function.rs b/aptos-move/aptos-vm/src/verifier/view_function.rs
index 608b76ac9665f..43fa613d6c95f 100644
--- a/aptos-move/aptos-vm/src/verifier/view_function.rs
+++ b/aptos-move/aptos-vm/src/verifier/view_function.rs
@@ -8,7 +8,7 @@ use crate::{
 use aptos_framework::RuntimeModuleMetadataV1;
 use move_binary_format::errors::{PartialVMError, PartialVMResult};
 use move_core_types::{identifier::IdentStr, vm_status::StatusCode};
-use move_vm_runtime::session::LoadedFunctionInstantiation;
+use move_vm_runtime::LoadedFunction;
 
 /// Based on the function attributes in the module metadata, determine whether a
 /// function is a view function.
@@ -32,11 +32,11 @@ pub(crate) fn validate_view_function(
     session: &mut SessionExt,
     args: Vec<Vec<u8>>,
     fun_name: &IdentStr,
-    fun_inst: &LoadedFunctionInstantiation,
+    func: &LoadedFunction,
     module_metadata: Option<&RuntimeModuleMetadataV1>,
     struct_constructors_feature: bool,
 ) -> PartialVMResult<Vec<Vec<u8>>> {
-    // Must be marked as view function
+    // Must be marked as view function.
     let is_view = determine_is_view(module_metadata, fun_name);
     if !is_view {
         return Err(
@@ -45,8 +45,8 @@ pub(crate) fn validate_view_function(
         );
     }
 
-    // Must return values
-    if fun_inst.return_tys.is_empty() {
+    // Must return values.
+    if func.return_tys().is_empty() {
         return Err(
             PartialVMError::new(StatusCode::INVALID_MAIN_FUNCTION_SIGNATURE)
                 .with_message("view function must return values".to_string()),
@@ -56,9 +56,9 @@ pub(crate) fn validate_view_function(
     let allowed_structs = get_allowed_structs(struct_constructors_feature);
     let args = transaction_arg_validation::construct_args(
         session,
-        &fun_inst.param_tys,
+        func.param_tys(),
         args,
-        &fun_inst.ty_args,
+        func.ty_args(),
         allowed_structs,
         true,
     )
diff --git a/aptos-move/block-executor/src/captured_reads.rs b/aptos-move/block-executor/src/captured_reads.rs
index b9c9929434c6b..aaec491043d24 100644
--- a/aptos-move/block-executor/src/captured_reads.rs
+++ b/aptos-move/block-executor/src/captured_reads.rs
@@ -597,7 +597,7 @@ impl<T: Transaction> CapturedReads<T> {
         self.group_reads.iter().all(|(key, group)| {
             let mut ret = true;
             if let Some(size) = group.collected_size {
-                ret &= Ok(size) == group_map.get_group_size(key, idx_to_validate);
+                ret &= group_map.validate_group_size(key, idx_to_validate, size);
             }
 
             ret && group.inner_reads.iter().all(|(tag, r)| {
@@ -1204,7 +1204,7 @@ mod test {
         let with_metadata_reads = with_metadata_reads_by_kind();
 
         let resolved = DataRead::Resolved::<ValueType>(200);
-        let mixed_reads = vec![
+        let mixed_reads = [
             deletion_reads[0].clone(),
             with_metadata_reads[1].clone(),
             resolved,
diff --git a/aptos-move/block-executor/src/executor.rs b/aptos-move/block-executor/src/executor.rs
index 3968a81326ce2..cde73c85b7992 100644
--- a/aptos-move/block-executor/src/executor.rs
+++ b/aptos-move/block-executor/src/executor.rs
@@ -38,7 +38,9 @@ use aptos_types::{
     executable::Executable,
     on_chain_config::BlockGasLimitType,
     state_store::{state_value::StateValue, TStateView},
-    transaction::{BlockExecutableTransaction as Transaction, BlockOutput},
+    transaction::{
+        block_epilogue::BlockEndInfo, BlockExecutableTransaction as Transaction, BlockOutput,
+    },
     write_set::{TransactionWrite, WriteOp},
 };
 use aptos_vm_logging::{alert, clear_speculative_txn_logs, init_speculative_logs, prelude::*};
@@ -64,7 +66,7 @@ pub struct BlockExecutor<T, E, S, L, X> {
     // Number of active concurrent tasks, corresponding to the maximum number of rayon
     // threads that may be concurrently participating in parallel execution.
     config: BlockExecutorConfig,
-    executor_thread_pool: Arc<ThreadPool>,
+    executor_thread_pool: Arc<rayon::ThreadPool>,
     transaction_commit_hook: Option<L>,
     phantom: PhantomData<(T, E, S, L, X)>,
 }
@@ -105,13 +107,13 @@ where
         versioned_cache: &MVHashMap<T::Key, T::Tag, T::Value, X, T::Identifier>,
         executor: &E,
         base_view: &S,
-        latest_view: ParallelState<T, X>,
+        parallel_state: ParallelState<T, X>,
     ) -> Result<bool, PanicOr<ParallelBlockExecutionError>> {
         let _timer = TASK_EXECUTE_SECONDS.start_timer();
         let txn = &signature_verified_block[idx_to_execute as usize];
 
         // VM execution.
-        let sync_view = LatestView::new(base_view, ViewState::Sync(latest_view), idx_to_execute);
+        let sync_view = LatestView::new(base_view, ViewState::Sync(parallel_state), idx_to_execute);
         let execute_result = executor.execute_transaction(&sync_view, txn, idx_to_execute);
 
         let mut prev_modified_keys = last_input_output
@@ -124,8 +126,11 @@ where
 
         let mut read_set = sync_view.take_parallel_reads();
 
-        // For tracking whether the recent execution wrote outside of the previous write/delta set.
-        let mut updates_outside = false;
+        // For tracking whether it's required to (re-)validate the suffix of transactions in the block.
+        // May happen, for instance, when the recent execution wrote outside of the previous write/delta
+        // set (vanilla Block-STM rule), or if resource group size or metadata changed from an estimate
+        // (since those resource group validations rely on estimates).
+        let mut needs_suffix_validation = false;
         let mut apply_updates = |output: &E::Output| -> Result<
             Vec<(T::Key, Arc<T::Value>, Option<Arc<MoveTypeLayout>>)>, // Cached resource writes
             PanicError,
@@ -135,25 +140,24 @@ where
             {
                 if prev_modified_keys.remove(&group_key).is_none() {
                     // Previously no write to the group at all.
-                    updates_outside = true;
+                    needs_suffix_validation = true;
                 }
 
-                versioned_cache.data().write(
+                if versioned_cache.data().write_metadata(
                     group_key.clone(),
                     idx_to_execute,
                     incarnation,
-                    // Group metadata op needs no layout (individual resources in groups do).
-                    Arc::new(group_metadata_op),
-                    None,
-                );
+                    group_metadata_op,
+                ) {
+                    needs_suffix_validation = true;
+                }
                 if versioned_cache.group_data().write(
                     group_key,
                     idx_to_execute,
                     incarnation,
                     group_ops.into_iter(),
                 ) {
-                    // Should return true if writes outside.
-                    updates_outside = true;
+                    needs_suffix_validation = true;
                 }
             }
 
@@ -167,7 +171,7 @@ where
                     .map(|(state_key, write_op)| (state_key, Arc::new(write_op), None)),
             ) {
                 if prev_modified_keys.remove(&k).is_none() {
-                    updates_outside = true;
+                    needs_suffix_validation = true;
                 }
                 versioned_cache
                     .data()
@@ -176,7 +180,7 @@ where
 
             for (k, v) in output.module_write_set().into_iter() {
                 if prev_modified_keys.remove(&k).is_none() {
-                    updates_outside = true;
+                    needs_suffix_validation = true;
                 }
                 versioned_cache.modules().write(k, idx_to_execute, v);
             }
@@ -184,7 +188,7 @@ where
             // Then, apply deltas.
             for (k, d) in output.aggregator_v1_delta_set().into_iter() {
                 if prev_modified_keys.remove(&k).is_none() {
-                    updates_outside = true;
+                    needs_suffix_validation = true;
                 }
                 versioned_cache.data().add_delta(k, idx_to_execute, d);
             }
@@ -208,7 +212,7 @@ where
 
                 let entry = change.into_entry_no_additional_history();
 
-                // TODO[agg_v2](optimize): figure out if it is useful for change to update updates_outside
+                // TODO[agg_v2](optimize): figure out if it is useful for change to update needs_suffix_validation
                 if let Err(e) =
                     versioned_cache
                         .delayed_fields()
@@ -279,6 +283,19 @@ where
                 Resource => versioned_cache.data().remove(&k, idx_to_execute),
                 Module => versioned_cache.modules().remove(&k, idx_to_execute),
                 Group => {
+                    // A change in state observable during speculative execution
+                    // (which includes group metadata and size) changes, suffix
+                    // re-validation is needed. For resources where speculative
+                    // execution waits on estimates, having a write that was there
+                    // but not anymore does not qualify, as it can only cause
+                    // additional waiting but not an incorrect speculation result.
+                    // However, a group size or metadata might be read, and then
+                    // speculative group update might be removed below. Without
+                    // triggering suffix re-validation, a later transaction might
+                    // end up with the incorrect read result (corresponding to the
+                    // removed group information from an incorrect speculative state).
+                    needs_suffix_validation = true;
+
                     versioned_cache.data().remove(&k, idx_to_execute);
                     versioned_cache.group_data().remove(&k, idx_to_execute);
                 },
@@ -297,7 +314,7 @@ where
                 ParallelBlockExecutionError::ModulePathReadWriteError,
             ));
         }
-        Ok(updates_outside)
+        Ok(needs_suffix_validation)
     }
 
     fn validate(
@@ -348,8 +365,15 @@ where
                     Resource => versioned_cache.data().mark_estimate(&k, txn_idx),
                     Module => versioned_cache.modules().mark_estimate(&k, txn_idx),
                     Group => {
-                        versioned_cache.data().mark_estimate(&k, txn_idx);
+                        // Validation for both group size and metadata is based on values.
+                        // Execution may wait for estimates.
                         versioned_cache.group_data().mark_estimate(&k, txn_idx);
+
+                        // Group metadata lives in same versioned cache as data / resources.
+                        // We are not marking metadata change as estimate, but after
+                        // a transaction execution changes metadata, suffix validation
+                        // is guaranteed to be triggered. Estimation affecting execution
+                        // behavior is left to size, which uses a heuristic approach.
                     },
                 };
             }
@@ -440,6 +464,7 @@ where
         shared_counter: &AtomicU32,
         executor: &E,
         block: &[T],
+        num_workers: usize,
     ) -> Result<(), PanicOr<ParallelBlockExecutionError>> {
         let mut block_limit_processor = shared_commit_state.acquire();
 
@@ -451,8 +476,8 @@ where
                 // We are going to skip reducing validation index here, as we
                 // are executing immediately, and will reduce it unconditionally
                 // after execution, inside finish_execution_during_commit.
-                // Because of that, we can also ignore _updates_outside result.
-                let _updates_outside = Self::execute(
+                // Because of that, we can also ignore _needs_suffix_validation result.
+                let _needs_suffix_validation = Self::execute(
                     txn_idx,
                     incarnation + 1,
                     block,
@@ -568,6 +593,7 @@ where
                     block_limit_processor.finish_parallel_update_counters_and_log_info(
                         txn_idx + 1,
                         scheduler.num_txns(),
+                        num_workers,
                     );
 
                     // failpoint triggering error at the last committed transaction,
@@ -721,7 +747,7 @@ where
 
     fn worker_loop(
         &self,
-        executor_arguments: &E::Argument,
+        env: &E::Environment,
         block: &[T],
         last_input_output: &TxnLastInputOutput<T, E::Output, E::Error>,
         versioned_cache: &MVHashMap<T::Key, T::Tag, T::Value, X, T::Identifier>,
@@ -732,10 +758,11 @@ where
         shared_counter: &AtomicU32,
         shared_commit_state: &ExplicitSyncWrapper<BlockGasLimitProcessor<T>>,
         final_results: &ExplicitSyncWrapper<Vec<E::Output>>,
+        num_workers: usize,
     ) -> Result<(), PanicOr<ParallelBlockExecutionError>> {
         // Make executor for each task. TODO: fast concurrent executor.
         let init_timer = VM_INIT_SECONDS.start_timer();
-        let executor = E::init(*executor_arguments);
+        let executor = E::init(env.clone(), base_view);
         drop(init_timer);
 
         let _timer = WORK_WITH_TASK_SECONDS.start_timer();
@@ -771,6 +798,7 @@ where
                     shared_counter,
                     &executor,
                     block,
+                    num_workers,
                 )?;
                 scheduler.queueing_commits_mark_done();
             }
@@ -795,7 +823,7 @@ where
                     incarnation,
                     ExecutionTaskType::Execution,
                 ) => {
-                    let updates_outside = Self::execute(
+                    let needs_suffix_validation = Self::execute(
                         txn_idx,
                         incarnation,
                         block,
@@ -810,7 +838,7 @@ where
                             shared_counter,
                         ),
                     )?;
-                    scheduler.finish_execution(txn_idx, incarnation, updates_outside)?
+                    scheduler.finish_execution(txn_idx, incarnation, needs_suffix_validation)?
                 },
                 SchedulerTask::ExecutionTask(_, _, ExecutionTaskType::Wakeup(condvar)) => {
                     {
@@ -836,7 +864,7 @@ where
 
     pub(crate) fn execute_transactions_parallel(
         &self,
-        executor_initial_arguments: E::Argument,
+        env: &E::Environment,
         signature_verified_block: &[T],
         base_view: &S,
     ) -> Result<BlockOutput<E::Output>, ()> {
@@ -855,10 +883,11 @@ where
         let shared_counter = AtomicU32::new(start_shared_counter);
 
         if signature_verified_block.is_empty() {
-            return Ok(BlockOutput::new(vec![]));
+            return Ok(BlockOutput::new(vec![], self.empty_block_end_info()));
         }
 
         let num_txns = signature_verified_block.len();
+        let num_workers = self.config.local.concurrency_level.min(num_txns / 2).max(2);
 
         let shared_commit_state = ExplicitSyncWrapper::new(BlockGasLimitProcessor::new(
             self.config.onchain.block_gas_limit_type.clone(),
@@ -881,10 +910,10 @@ where
 
         let timer = RAYON_EXECUTION_SECONDS.start_timer();
         self.executor_thread_pool.scope(|s| {
-            for _ in 0..self.config.local.concurrency_level {
+            for _ in 0..num_workers {
                 s.spawn(|_| {
                     if let Err(err) = self.worker_loop(
-                        &executor_initial_arguments,
+                        env,
                         signature_verified_block,
                         &last_input_output,
                         &versioned_cache,
@@ -894,9 +923,10 @@ where
                         &shared_counter,
                         &shared_commit_state,
                         &final_results,
+                        num_workers,
                     ) {
                         // If there are multiple errors, they all get logged:
-                        // ModulePathReadWriteError and FatalVMErrorvariant is logged at construction,
+                        // ModulePathReadWriteError and FatalVMError variant is logged at construction,
                         // and below we log CodeInvariantErrors.
                         if let PanicOr::CodeInvariantError(err_msg) = err {
                             alert!("[BlockSTM] worker loop: CodeInvariantError({:?})", err_msg);
@@ -916,11 +946,19 @@ where
         // Explicit async drops.
         DEFAULT_DROPPER.schedule_drop((last_input_output, scheduler, versioned_cache));
 
-        // TODO add block end info to output.
-        // block_limit_processor.is_block_limit_reached();
+        let block_end_info = if self
+            .config
+            .onchain
+            .block_gas_limit_type
+            .add_block_limit_outcome_onchain()
+        {
+            Some(shared_commit_state.into_inner().get_block_end_info())
+        } else {
+            None
+        };
 
         (!shared_maybe_error.load(Ordering::SeqCst))
-            .then(|| BlockOutput::new(final_results.into_inner()))
+            .then(|| BlockOutput::new(final_results.into_inner(), block_end_info))
             .ok_or(())
     }
 
@@ -1000,14 +1038,14 @@ where
 
     pub(crate) fn execute_transactions_sequential(
         &self,
-        executor_arguments: E::Argument,
+        env: E::Environment,
         signature_verified_block: &[T],
         base_view: &S,
         resource_group_bcs_fallback: bool,
     ) -> Result<BlockOutput<E::Output>, SequentialBlockExecutionError<E::Error>> {
         let num_txns = signature_verified_block.len();
         let init_timer = VM_INIT_SECONDS.start_timer();
-        let executor = E::init(executor_arguments);
+        let executor = E::init(env, base_view);
         drop(init_timer);
 
         let start_counter = gen_id_start_value(true);
@@ -1277,24 +1315,47 @@ where
 
         counters::update_state_counters(unsync_map.stats(), false);
 
-        // TODO add block end info to output.
-        // block_limit_processor.is_block_limit_reached();
+        let block_end_info = if self
+            .config
+            .onchain
+            .block_gas_limit_type
+            .add_block_limit_outcome_onchain()
+        {
+            Some(block_limit_processor.get_block_end_info())
+        } else {
+            None
+        };
 
-        Ok(BlockOutput::new(ret))
+        Ok(BlockOutput::new(ret, block_end_info))
+    }
+
+    fn empty_block_end_info(&self) -> Option<BlockEndInfo> {
+        if self
+            .config
+            .onchain
+            .block_gas_limit_type
+            .add_block_limit_outcome_onchain()
+        {
+            Some(BlockEndInfo::V0 {
+                block_gas_limit_reached: false,
+                block_output_limit_reached: false,
+                block_effective_block_gas_units: 0,
+                block_approx_output_size: 0,
+            })
+        } else {
+            None
+        }
     }
 
     pub fn execute_block(
         &self,
-        executor_arguments: E::Argument,
+        env: E::Environment,
         signature_verified_block: &[T],
         base_view: &S,
     ) -> BlockExecutionResult<BlockOutput<E::Output>, E::Error> {
         if self.config.local.concurrency_level > 1 {
-            let parallel_result = self.execute_transactions_parallel(
-                executor_arguments,
-                signature_verified_block,
-                base_view,
-            );
+            let parallel_result =
+                self.execute_transactions_parallel(&env, signature_verified_block, base_view);
 
             // If parallel gave us result, return it
             if let Ok(output) = parallel_result {
@@ -1312,9 +1373,9 @@ where
             info!("parallel execution requiring fallback");
         }
 
-        // If we didn't run parallel or it didn't finish successfully - run sequential
+        // If we didn't run parallel, or it didn't finish successfully - run sequential
         let sequential_result = self.execute_transactions_sequential(
-            executor_arguments,
+            env.clone(),
             signature_verified_block,
             base_view,
             false,
@@ -1337,7 +1398,7 @@ where
                 init_speculative_logs(signature_verified_block.len());
 
                 let sequential_result = self.execute_transactions_sequential(
-                    executor_arguments,
+                    env,
                     signature_verified_block,
                     base_view,
                     true,
@@ -1375,7 +1436,7 @@ where
                 .iter()
                 .map(|_| E::Output::discard_output(error_code))
                 .collect();
-            return Ok(BlockOutput::new(ret));
+            return Ok(BlockOutput::new(ret, self.empty_block_end_info()));
         }
 
         Err(sequential_error)
diff --git a/aptos-move/block-executor/src/executor_utilities.rs b/aptos-move/block-executor/src/executor_utilities.rs
index b5939c01aa505..82274f741c76b 100644
--- a/aptos-move/block-executor/src/executor_utilities.rs
+++ b/aptos-move/block-executor/src/executor_utilities.rs
@@ -169,7 +169,7 @@ pub(crate) fn map_id_to_values_in_group_writes<
 >(
     finalized_groups: Vec<(T::Key, T::Value, Vec<(T::Tag, ValueWithLayout<T::Value>)>)>,
     latest_view: &LatestView<T, S, X>,
-) -> ::std::result::Result<Vec<(T::Key, T::Value, Vec<(T::Tag, Arc<T::Value>)>)>, PanicError> {
+) -> Result<Vec<(T::Key, T::Value, Vec<(T::Tag, Arc<T::Value>)>)>, PanicError> {
     let mut patched_finalized_groups = Vec::with_capacity(finalized_groups.len());
     for (group_key, group_metadata_op, resource_vec) in finalized_groups.into_iter() {
         let mut patched_resource_vec = Vec::with_capacity(resource_vec.len());
diff --git a/aptos-move/block-executor/src/limit_processor.rs b/aptos-move/block-executor/src/limit_processor.rs
index 4f256fa57638a..b687da43e1e39 100644
--- a/aptos-move/block-executor/src/limit_processor.rs
+++ b/aptos-move/block-executor/src/limit_processor.rs
@@ -4,10 +4,12 @@
 use crate::{counters, types::ReadWriteSummary};
 use aptos_logger::info;
 use aptos_types::{
-    fee_statement::FeeStatement, on_chain_config::BlockGasLimitType,
-    transaction::BlockExecutableTransaction as Transaction,
+    fee_statement::FeeStatement,
+    on_chain_config::BlockGasLimitType,
+    transaction::{block_epilogue::BlockEndInfo, BlockExecutableTransaction as Transaction},
 };
 use claims::{assert_le, assert_none};
+use std::time::Instant;
 
 pub struct BlockGasLimitProcessor<T: Transaction> {
     block_gas_limit_type: BlockGasLimitType,
@@ -16,8 +18,8 @@ pub struct BlockGasLimitProcessor<T: Transaction> {
     accumulated_fee_statement: FeeStatement,
     txn_fee_statements: Vec<FeeStatement>,
     txn_read_write_summaries: Vec<ReadWriteSummary<T>>,
-    block_limit_reached: bool,
     module_rw_conflict: bool,
+    start_time: Instant,
 }
 
 impl<T: Transaction> BlockGasLimitProcessor<T> {
@@ -29,8 +31,8 @@ impl<T: Transaction> BlockGasLimitProcessor<T> {
             accumulated_fee_statement: FeeStatement::zero(),
             txn_fee_statements: Vec::with_capacity(init_size),
             txn_read_write_summaries: Vec::with_capacity(init_size),
-            block_limit_reached: false,
             module_rw_conflict: false,
+            start_time: Instant::now(),
         }
     }
 
@@ -130,8 +132,6 @@ impl<T: Transaction> BlockGasLimitProcessor<T> {
                     accumulated_block_gas {} >= PER_BLOCK_GAS_LIMIT {}",
                     mode, accumulated_block_gas, per_block_gas_limit,
                 );
-                self.block_limit_reached = true;
-
                 return true;
             }
         }
@@ -147,8 +147,6 @@ impl<T: Transaction> BlockGasLimitProcessor<T> {
                     accumulated_output {} >= PER_BLOCK_OUTPUT_LIMIT {}",
                     mode, accumulated_output, per_block_output_limit,
                 );
-                self.block_limit_reached = true;
-
                 return true;
             }
         }
@@ -195,6 +193,7 @@ impl<T: Transaction> BlockGasLimitProcessor<T> {
         is_parallel: bool,
         num_committed: u32,
         num_total: u32,
+        num_workers: usize,
     ) {
         let accumulated_effective_block_gas = self.get_effective_accumulated_block_gas();
         let accumulated_approx_output_size = self.get_accumulated_approx_output_size();
@@ -221,11 +220,15 @@ impl<T: Transaction> BlockGasLimitProcessor<T> {
                 .block_gas_limit_type
                 .block_output_limit()
                 .map_or(false, |limit| accumulated_approx_output_size >= limit),
+            elapsed_ms = self.start_time.elapsed().as_millis(),
+            num_committed = num_committed,
+            num_total = num_total,
+            num_workers = num_workers,
             "[BlockSTM]: {} execution completed. {} out of {} txns committed",
             if is_parallel {
-                "Parallel"
+                format!("Parallel[{}]", num_workers)
             } else {
-                "Sequential"
+                "Sequential".to_string()
             },
             num_committed,
             num_total,
@@ -236,8 +239,9 @@ impl<T: Transaction> BlockGasLimitProcessor<T> {
         &self,
         num_committed: u32,
         num_total: u32,
+        num_workers: usize,
     ) {
-        self.finish_update_counters_and_log_info(true, num_committed, num_total)
+        self.finish_update_counters_and_log_info(true, num_committed, num_total, num_workers)
     }
 
     pub(crate) fn finish_sequential_update_counters_and_log_info(
@@ -245,12 +249,28 @@ impl<T: Transaction> BlockGasLimitProcessor<T> {
         num_committed: u32,
         num_total: u32,
     ) {
-        self.finish_update_counters_and_log_info(false, num_committed, num_total)
+        self.finish_update_counters_and_log_info(false, num_committed, num_total, 1)
     }
 
-    #[allow(unused)]
-    pub(crate) fn is_block_limit_reached(&self) -> bool {
-        self.block_limit_reached
+    pub(crate) fn get_block_end_info(&self) -> BlockEndInfo {
+        BlockEndInfo::V0 {
+            block_gas_limit_reached: self
+                .block_gas_limit_type
+                .block_gas_limit()
+                .map(|per_block_gas_limit| {
+                    self.get_effective_accumulated_block_gas() >= per_block_gas_limit
+                })
+                .unwrap_or(false),
+            block_output_limit_reached: self
+                .block_gas_limit_type
+                .block_output_limit()
+                .map(|per_block_output_limit| {
+                    self.get_accumulated_approx_output_size() >= per_block_output_limit
+                })
+                .unwrap_or(false),
+            block_effective_block_gas_units: self.get_effective_accumulated_block_gas(),
+            block_approx_output_size: self.get_accumulated_approx_output_size(),
+        }
     }
 }
 
diff --git a/aptos-move/block-executor/src/proptest_types/baseline.rs b/aptos-move/block-executor/src/proptest_types/baseline.rs
index 8a2808be01545..21430370818e1 100644
--- a/aptos-move/block-executor/src/proptest_types/baseline.rs
+++ b/aptos-move/block-executor/src/proptest_types/baseline.rs
@@ -14,12 +14,14 @@
 use crate::{
     errors::{BlockExecutionError, BlockExecutionResult},
     proptest_types::types::{
-        MockOutput, MockTransaction, ValueType, RESERVED_TAG, STORAGE_AGGREGATOR_VALUE,
+        raw_metadata, GroupSizeOrMetadata, MockOutput, MockTransaction, ValueType, RESERVED_TAG,
+        STORAGE_AGGREGATOR_VALUE,
     },
 };
 use aptos_aggregator::delta_change_set::serialize;
 use aptos_types::{
-    contract_event::TransactionEvent, transaction::BlockOutput, write_set::TransactionWrite,
+    contract_event::TransactionEvent, state_store::state_value::StateValueMetadata,
+    transaction::BlockOutput, write_set::TransactionWrite,
 };
 use aptos_vm_types::resource_group_adapter::group_size_as_sum;
 use bytes::Bytes;
@@ -225,6 +227,7 @@ impl<K: Debug + Hash + Clone + Eq> BaselineOutput<K> {
     fn assert_success<E: Debug>(&self, block_output: &BlockOutput<MockOutput<K, E>>) {
         let base_map: HashMap<u32, Bytes> = HashMap::from([(RESERVED_TAG, vec![0].into())]);
         let mut group_world = HashMap::new();
+        let mut group_metadata: HashMap<K, Option<StateValueMetadata>> = HashMap::new();
 
         let results = block_output.get_transaction_outputs_forced();
         let committed = self.read_values.len();
@@ -232,12 +235,13 @@ impl<K: Debug + Hash + Clone + Eq> BaselineOutput<K> {
 
         // Check read values & delta writes.
         izip!(
+            (0..committed),
             results.iter().take(committed),
             self.read_values.iter(),
             self.resolved_deltas.iter(),
             self.group_reads.iter(),
         )
-        .for_each(|(output, reads, resolved_deltas, group_reads)| {
+        .for_each(|(idx, output, reads, resolved_deltas, group_reads)| {
             // Compute group read results.
             let group_read_results: Vec<Option<Bytes>> = group_reads
                 .as_ref()
@@ -264,15 +268,35 @@ impl<K: Debug + Hash + Clone + Eq> BaselineOutput<K> {
                 assert!(result_group_read.clone().map(Into::<Bytes>::into) == baseline_group_read);
             });
 
-            for (group_key, size) in output.read_group_sizes.iter() {
+            for (group_key, size_or_metadata) in output.read_group_size_or_metadata.iter() {
                 let group_map = group_world.entry(group_key).or_insert(base_map.clone());
 
-                assert_eq!(
-                    group_size_as_sum(group_map.iter().map(|(t, v)| (t, v.len())))
-                        .unwrap()
-                        .get(),
-                    *size
-                );
+                match size_or_metadata {
+                    GroupSizeOrMetadata::Size(size) => {
+                        let baseline_size =
+                            group_size_as_sum(group_map.iter().map(|(t, v)| (t, v.len())))
+                                .unwrap()
+                                .get();
+
+                        assert_eq!(
+                            baseline_size, *size,
+                            "ERR: idx = {} group_key {:?}, baseline size {} != output_size {}",
+                            idx, group_key, baseline_size, size
+                        );
+                    },
+                    GroupSizeOrMetadata::Metadata(metadata) => {
+                        if !group_metadata.contains_key(group_key) {
+                            assert_eq!(
+                                *metadata,
+                                Some(raw_metadata(5)) /* default metadata */
+                            );
+                        } else {
+                            let baseline_metadata =
+                                group_metadata.get(group_key).cloned().flatten();
+                            assert_eq!(*metadata, baseline_metadata);
+                        }
+                    },
+                }
             }
 
             // Test normal reads.
@@ -286,7 +310,9 @@ impl<K: Debug + Hash + Clone + Eq> BaselineOutput<K> {
             .for_each(|(baseline_read, result_read)| baseline_read.assert_read_result(result_read));
 
             // Update group world.
-            for (group_key, _, updates) in output.group_writes.iter() {
+            for (group_key, v, updates) in output.group_writes.iter() {
+                group_metadata.insert(group_key.clone(), v.as_state_value_metadata());
+
                 for (tag, v) in updates {
                     let group_map = group_world.entry(group_key).or_insert(base_map.clone());
                     if v.is_deletion() {
diff --git a/aptos-move/block-executor/src/proptest_types/bencher.rs b/aptos-move/block-executor/src/proptest_types/bencher.rs
index c3904b76b5d6b..4a3550f31afe4 100644
--- a/aptos-move/block-executor/src/proptest_types/bencher.rs
+++ b/aptos-move/block-executor/src/proptest_types/bencher.rs
@@ -136,7 +136,7 @@ where
             NoOpTransactionCommitHook<MockOutput<KeyType<K>, E>, usize>,
             ExecutableTestType,
         >::new(config, executor_thread_pool, None)
-        .execute_transactions_parallel((), &self.transactions, &data_view);
+        .execute_transactions_parallel(&(), &self.transactions, &data_view);
 
         self.baseline_output.assert_parallel_output(&output);
     }
diff --git a/aptos-move/block-executor/src/proptest_types/tests.rs b/aptos-move/block-executor/src/proptest_types/tests.rs
index 259ab3c337c8c..85a6f65d4cc3f 100644
--- a/aptos-move/block-executor/src/proptest_types/tests.rs
+++ b/aptos-move/block-executor/src/proptest_types/tests.rs
@@ -82,7 +82,7 @@ fn run_transactions<K, V, E>(
             executor_thread_pool.clone(),
             None,
         )
-        .execute_transactions_parallel((), &transactions, &data_view);
+        .execute_transactions_parallel(&(), &transactions, &data_view);
 
         if module_access.0 && module_access.1 {
             assert_matches!(output, Err(()));
@@ -217,7 +217,7 @@ fn deltas_writes_mixed_with_block_gas_limit(num_txns: usize, maybe_block_gas_lim
             executor_thread_pool.clone(),
             None,
         )
-        .execute_transactions_parallel((), &transactions, &data_view);
+        .execute_transactions_parallel(&(), &transactions, &data_view);
 
         BaselineOutput::generate(&transactions, maybe_block_gas_limit)
             .assert_parallel_output(&output);
@@ -268,7 +268,7 @@ fn deltas_resolver_with_block_gas_limit(num_txns: usize, maybe_block_gas_limit:
             executor_thread_pool.clone(),
             None,
         )
-        .execute_transactions_parallel((), &transactions, &data_view);
+        .execute_transactions_parallel(&(), &transactions, &data_view);
 
         BaselineOutput::generate(&transactions, maybe_block_gas_limit)
             .assert_parallel_output(&output);
@@ -424,7 +424,7 @@ fn publishing_fixed_params_with_block_gas_limit(
         executor_thread_pool,
         None,
     )
-    .execute_transactions_parallel((), &transactions, &data_view);
+    .execute_transactions_parallel(&(), &transactions, &data_view);
     assert_ok!(output);
 
     // Adjust the reads of txn indices[2] to contain module read to key 42.
@@ -469,7 +469,7 @@ fn publishing_fixed_params_with_block_gas_limit(
             executor_thread_pool.clone(),
             None,
         ) // Ensure enough gas limit to commit the module txns (4 is maximum gas per txn)
-        .execute_transactions_parallel((), &transactions, &data_view);
+        .execute_transactions_parallel(&(), &transactions, &data_view);
 
         assert_matches!(output, Err(()));
     }
@@ -548,7 +548,7 @@ fn non_empty_group(
             executor_thread_pool.clone(),
             None,
         )
-        .execute_transactions_parallel((), &transactions, &data_view);
+        .execute_transactions_parallel(&(), &transactions, &data_view);
 
         BaselineOutput::generate(&transactions, None).assert_parallel_output(&output);
     }
diff --git a/aptos-move/block-executor/src/proptest_types/types.rs b/aptos-move/block-executor/src/proptest_types/types.rs
index 9dd3c1fd2d205..f6d5de2dd1b39 100644
--- a/aptos-move/block-executor/src/proptest_types/types.rs
+++ b/aptos-move/block-executor/src/proptest_types/types.rs
@@ -2,10 +2,7 @@
 // Parts of the project are originally copyright © Meta Platforms, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::{
-    explicit_sync_wrapper::ExplicitSyncWrapper,
-    task::{ExecutionStatus, ExecutorTask, TransactionOutput},
-};
+use crate::task::{ExecutionStatus, ExecutorTask, TransactionOutput};
 use aptos_aggregator::{
     delayed_change::DelayedChange,
     delta_change_set::{delta_add, delta_sub, serialize, DeltaOp},
@@ -13,7 +10,6 @@ use aptos_aggregator::{
 };
 use aptos_mvhashmap::types::TxnIndex;
 use aptos_types::{
-    access_path::AccessPath,
     account_address::AccountAddress,
     contract_event::TransactionEvent,
     delayed_fields::PanicError,
@@ -32,14 +28,13 @@ use aptos_types::{
 use aptos_vm_types::resolver::{TExecutorView, TResourceGroupView};
 use bytes::Bytes;
 use claims::{assert_ge, assert_le, assert_ok};
-use move_core_types::value::MoveTypeLayout;
+use move_core_types::{identifier::IdentStr, value::MoveTypeLayout};
 use move_vm_types::delayed_values::delayed_field_id::DelayedFieldID;
 use once_cell::sync::OnceCell;
 use proptest::{arbitrary::Arbitrary, collection::vec, prelude::*, proptest, sample::Index};
 use proptest_derive::Arbitrary;
 use std::{
     collections::{hash_map::DefaultHasher, BTreeMap, BTreeSet, HashMap, HashSet},
-    convert::TryInto,
     fmt::Debug,
     hash::{Hash, Hasher},
     marker::PhantomData,
@@ -99,7 +94,10 @@ where
             let group: BTreeMap<u32, Bytes> = BTreeMap::from([(RESERVED_TAG, vec![0].into())]);
 
             let bytes = bcs::to_bytes(&group).unwrap();
-            Ok(Some(StateValue::new_legacy(bytes.into())))
+            Ok(Some(StateValue::new_with_metadata(
+                bytes.into(),
+                raw_metadata(5),
+            )))
         } else {
             Ok(None)
         }
@@ -154,30 +152,22 @@ pub(crate) struct KeyType<K: Hash + Clone + Debug + PartialOrd + Ord + Eq>(
 );
 
 impl<K: Hash + Clone + Debug + Eq + PartialOrd + Ord> ModulePath for KeyType<K> {
-    fn module_path(&self) -> Option<AccessPath> {
-        // Since K is generic, use its hash to assign addresses.
-        let mut hasher = DefaultHasher::new();
-        self.0.hash(&mut hasher);
-        let mut hashed_address = vec![1u8; AccountAddress::LENGTH - 8];
-        hashed_address.extend_from_slice(&hasher.finish().to_ne_bytes());
-
-        if self.1 {
-            Some(AccessPath {
-                address: AccountAddress::new(hashed_address.try_into().unwrap()),
-                path: b"/foo/b".to_vec(),
-            })
-        } else {
-            None
-        }
+    fn is_module_path(&self) -> bool {
+        self.1
+    }
+
+    fn from_address_and_module_name(_address: &AccountAddress, _module_name: &IdentStr) -> Self {
+        unimplemented!()
     }
 }
 
+// TODO: this is now very similar to WriteOp, should be a wrapper and remove boilerplate below.
 #[derive(Debug)]
 pub(crate) struct ValueType {
     /// Wrapping the types used for testing to add TransactionWrite trait implementation (below).
     bytes: Option<Bytes>,
     metadata: StateValueMetadata,
-    write_op_kind: ExplicitSyncWrapper<WriteOpKind>,
+    write_op_kind: WriteOpKind,
 }
 
 impl Clone for ValueType {
@@ -214,7 +204,7 @@ impl ValueType {
         Self {
             bytes,
             metadata,
-            write_op_kind: ExplicitSyncWrapper::new(kind),
+            write_op_kind: kind,
         }
     }
 
@@ -232,13 +222,11 @@ impl ValueType {
                 v.into()
             }),
             metadata: StateValueMetadata::none(),
-            write_op_kind: ExplicitSyncWrapper::new(
-                if !use_value {
-                    WriteOpKind::Deletion
-                } else {
-                    WriteOpKind::Creation
-                },
-            ),
+            write_op_kind: if !use_value {
+                WriteOpKind::Deletion
+            } else {
+                WriteOpKind::Creation
+            },
         }
     }
 
@@ -247,13 +235,11 @@ impl ValueType {
         Self {
             bytes: (len > 0).then_some(vec![100_u8; len].into()),
             metadata,
-            write_op_kind: ExplicitSyncWrapper::new(
-                if len == 0 {
-                    WriteOpKind::Deletion
-                } else {
-                    WriteOpKind::Creation
-                },
-            ),
+            write_op_kind: if len == 0 {
+                WriteOpKind::Deletion
+            } else {
+                WriteOpKind::Creation
+            },
         }
     }
 }
@@ -275,18 +261,16 @@ impl TransactionWrite for ValueType {
         Self {
             bytes: maybe_bytes,
             metadata: maybe_metadata,
-            write_op_kind: ExplicitSyncWrapper::new(
-                if empty {
-                    WriteOpKind::Deletion
-                } else {
-                    WriteOpKind::Creation
-                },
-            ),
+            write_op_kind: if empty {
+                WriteOpKind::Deletion
+            } else {
+                WriteOpKind::Creation
+            },
         }
     }
 
     fn write_op_kind(&self) -> WriteOpKind {
-        self.write_op_kind.dereference().clone()
+        self.write_op_kind.clone()
     }
 
     fn as_state_value(&self) -> Option<StateValue> {
@@ -330,6 +314,9 @@ pub(crate) struct TransactionGen<V: Into<Vec<u8>> + Arbitrary + Clone + Debug +
     /// Generate gas for different incarnations of the transactions.
     #[proptest(strategy = "vec(any::<Index>(), params.incarnation_alternatives)")]
     gas: Vec<Index>,
+    /// Generate seeds for group metadata.
+    #[proptest(strategy = "vec(vec(any::<Index>(), 3), params.incarnation_alternatives)")]
+    metadata_seeds: Vec<Vec<Index>>,
     /// Generate indices to derive random behavior for querying resource group sizes.
     /// For now hardcoding 3 resource groups.
     #[proptest(
@@ -354,21 +341,43 @@ pub(crate) struct MockIncarnation<K, E> {
     /// A vector of keys and corresponding values to be written during mock incarnation execution.
     pub(crate) writes: Vec<(K, ValueType)>,
     pub(crate) group_reads: Vec<(K, u32)>,
-    pub(crate) group_writes: Vec<(K, HashMap<u32, ValueType>)>,
-    /// Keys to query group size for
-    pub(crate) group_sizes: Vec<K>,
+    pub(crate) group_writes: Vec<(K, StateValueMetadata, HashMap<u32, ValueType>)>,
+    /// Keys to query group size for - false is querying size, true is querying metadata.
+    pub(crate) group_queries: Vec<(K, bool)>,
     /// A vector of keys and corresponding deltas to be produced during mock incarnation execution.
     pub(crate) deltas: Vec<(K, DeltaOp)>,
     /// A vector of events.
     pub(crate) events: Vec<E>,
+    metadata_seeds: [u64; 3],
     /// total execution gas to be charged for mock incarnation execution.
     pub(crate) gas: u64,
 }
 
 impl<K, E> MockIncarnation<K, E> {
     /// Group writes are derived from normal transaction behavior, transforming one MockIncarnation
-    /// into another one with group_reads / group_writes / group_sizes set. Hence, the constructor
+    /// into another one with group_reads / group_writes / group_queries set. Hence, the constructor
     /// here always sets it to an empty vector.
+    pub(crate) fn new_with_metadata_seeds(
+        reads: Vec<K>,
+        writes: Vec<(K, ValueType)>,
+        deltas: Vec<(K, DeltaOp)>,
+        events: Vec<E>,
+        metadata_seeds: [u64; 3],
+        gas: u64,
+    ) -> Self {
+        Self {
+            reads,
+            writes,
+            group_reads: vec![],
+            group_writes: vec![],
+            group_queries: vec![],
+            deltas,
+            events,
+            metadata_seeds,
+            gas,
+        }
+    }
+
     pub(crate) fn new(
         reads: Vec<K>,
         writes: Vec<(K, ValueType)>,
@@ -381,9 +390,10 @@ impl<K, E> MockIncarnation<K, E> {
             writes,
             group_reads: vec![],
             group_writes: vec![],
-            group_sizes: vec![],
+            group_queries: vec![],
             deltas,
             events,
+            metadata_seeds: [0; 3],
             gas,
         }
     }
@@ -504,17 +514,14 @@ impl<V: Into<Vec<u8>> + Arbitrary + Clone + Debug + Eq + Sync + Send> Transactio
                         Some(delta) => incarnation_deltas.push((KeyType(key, false), delta)),
                         None => {
                             // One out of 23 writes will be a deletion
-                            let is_deletion = allow_deletes
-                                && ValueType::from_value(value.clone(), true)
-                                    .as_u128()
-                                    .unwrap()
-                                    .unwrap()
-                                    % 23
-                                    == 0;
-                            incarnation_writes.push((
-                                KeyType(key, module_write_fn(i)),
-                                ValueType::from_value(value.clone(), !is_deletion),
-                            ));
+                            let val_u128 = ValueType::from_value(value.clone(), true)
+                                .as_u128()
+                                .unwrap()
+                                .unwrap();
+                            let is_deletion = allow_deletes && val_u128 % 23 == 0;
+                            let mut value = ValueType::from_value(value.clone(), !is_deletion);
+                            value.metadata = raw_metadata((val_u128 >> 64) as u64);
+                            incarnation_writes.push((KeyType(key, module_write_fn(i)), value));
                         },
                     }
                 }
@@ -589,12 +596,25 @@ impl<V: Into<Vec<u8>> + Arbitrary + Clone + Debug + Eq + Sync + Send> Transactio
         .into_iter()
         .zip(reads)
         .zip(gas)
-        .map(|(((writes, deltas), reads), gas)| {
-            MockIncarnation::new(
+        .zip(
+            self.metadata_seeds
+                .into_iter()
+                .map(|vec| {
+                    [
+                        vec[0].index(100000) as u64,
+                        vec[1].index(100000) as u64,
+                        vec[2].index(100000) as u64,
+                    ]
+                })
+                .collect::<Vec<_>>(),
+        )
+        .map(|((((writes, deltas), reads), gas), metadata_seeds)| {
+            MockIncarnation::new_with_metadata_seeds(
                 reads,
                 writes,
                 deltas,
                 vec![], // events
+                metadata_seeds,
                 gas,
             )
         })
@@ -701,6 +721,7 @@ impl<V: Into<Vec<u8>> + Arbitrary + Clone + Debug + Eq + Sync + Send> Transactio
                 if !inner_ops.is_empty() {
                     group_writes.push((
                         KeyType(universe[universe_len - 1 - idx].clone(), false),
+                        raw_metadata(behavior.metadata_seeds[idx]),
                         inner_ops,
                     ));
                 }
@@ -713,7 +734,7 @@ impl<V: Into<Vec<u8>> + Arbitrary + Clone + Debug + Eq + Sync + Send> Transactio
             behavior.group_reads = group_reads;
             behavior.group_writes = group_writes;
 
-            behavior.group_sizes = group_size_query_pcts
+            behavior.group_queries = group_size_query_pcts
                 .iter()
                 .enumerate()
                 .filter_map(|(idx, size_query_pct)| match size_query_pct {
@@ -725,8 +746,13 @@ impl<V: Into<Vec<u8>> + Arbitrary + Clone + Debug + Eq + Sync + Send> Transactio
                             2 => group_size_query_indicators[behavior_idx].2,
                             _ => unreachable!("Test uses 3 groups"),
                         };
-                        (indicator < *size_query_pct)
-                            .then(|| KeyType(universe[universe_len - 1 - idx].clone(), false))
+                        (indicator < *size_query_pct).then(|| {
+                            (
+                                KeyType(universe[universe_len - 1 - idx].clone(), false),
+                                // TODO: handle metadata queries more uniformly w. size.
+                                indicator % 2 == 0,
+                            )
+                        })
                     },
                     None => None,
                 })
@@ -823,12 +849,12 @@ where
     K: PartialOrd + Ord + Send + Sync + Clone + Hash + Eq + ModulePath + Debug + 'static,
     E: Send + Sync + Debug + Clone + TransactionEvent + 'static,
 {
-    type Argument = ();
+    type Environment = ();
     type Error = usize;
     type Output = MockOutput<K, E>;
     type Txn = MockTransaction<K, E>;
 
-    fn init(_argument: Self::Argument) -> Self {
+    fn init(_env: Self::Environment, _state_view: &impl TStateView<Key = K>) -> Self {
         Self::new()
     }
 
@@ -857,15 +883,16 @@ where
                 for k in behavior.reads.iter() {
                     // TODO: later test errors as well? (by fixing state_view behavior).
                     // TODO: test aggregator reads.
-                    match k.module_path() {
-                        Some(_) => match view.get_module_bytes(k) {
+                    if k.is_module_path() {
+                        match view.get_module_bytes(k) {
                             Ok(v) => read_results.push(v.map(Into::into)),
                             Err(_) => read_results.push(None),
-                        },
-                        None => match view.get_resource_bytes(k, None) {
+                        }
+                    } else {
+                        match view.get_resource_bytes(k, None) {
                             Ok(v) => read_results.push(v.map(Into::into)),
                             Err(_) => read_results.push(None),
-                        },
+                        }
                     }
                 }
                 // Read from groups.
@@ -877,27 +904,39 @@ where
                     }
                 }
 
-                let read_group_sizes = behavior
-                    .group_sizes
+                let read_group_size_or_metadata = behavior
+                    .group_queries
                     .iter()
-                    .map(|group_key| {
-                        (
-                            group_key.clone(),
-                            view.resource_group_size(group_key)
-                                .expect("Group must exist and size computation must succeed")
-                                .get(),
-                        )
+                    .map(|(group_key, query_metadata)| {
+                        let res = if *query_metadata {
+                            GroupSizeOrMetadata::Metadata(
+                                view.get_resource_state_value_metadata(group_key)
+                                    .expect("Group must exist and size computation must succeed"),
+                            )
+                        } else {
+                            GroupSizeOrMetadata::Size(
+                                view.resource_group_size(group_key)
+                                    .expect("Group must exist and size computation must succeed")
+                                    .get(),
+                            )
+                        };
+
+                        (group_key.clone(), res)
                     })
                     .collect();
 
                 let mut group_writes = vec![];
-                for (key, inner_ops) in behavior.group_writes.iter() {
+                for (key, metadata, inner_ops) in behavior.group_writes.iter() {
                     let mut new_inner_ops = HashMap::new();
                     for (tag, inner_op) in inner_ops.iter() {
                         let exists = view
                             .get_resource_from_group(key, tag, None)
                             .unwrap()
                             .is_some();
+                        assert!(
+                            *tag != RESERVED_TAG || exists,
+                            "RESERVED_TAG must always be present in groups in tests"
+                        );
 
                         // inner op is either deletion or creation.
                         assert!(!inner_op.is_modification());
@@ -906,11 +945,6 @@ where
                             new_inner_ops.insert(*tag, inner_op.clone());
                         }
 
-                        assert!(
-                            *tag != RESERVED_TAG || exists,
-                            "RESERVED_TAG must always be present in groups in tests"
-                        );
-
                         if exists && inner_op.is_creation() {
                             // Adjust the type, otherwise executor will assert.
                             if inner_op.bytes().unwrap()[0] % 4 < 3 || *tag == RESERVED_TAG {
@@ -918,7 +952,7 @@ where
                                     *tag,
                                     ValueType::new(
                                         inner_op.bytes.clone(),
-                                        inner_op.metadata.clone(),
+                                        StateValueMetadata::none(),
                                         WriteOpKind::Modification,
                                     ),
                                 );
@@ -941,7 +975,7 @@ where
                             key.clone(),
                             ValueType::new(
                                 Some(Bytes::new()),
-                                raw_metadata(5),
+                                metadata.clone(),
                                 WriteOpKind::Modification,
                             ),
                             new_inner_ops,
@@ -956,7 +990,7 @@ where
                     deltas: behavior.deltas.clone(),
                     events: behavior.events.to_vec(),
                     read_results,
-                    read_group_sizes,
+                    read_group_size_or_metadata,
                     materialized_delta_writes: OnceCell::new(),
                     total_gas: behavior.gas,
                     skipped: false,
@@ -980,6 +1014,12 @@ pub(crate) fn raw_metadata(v: u64) -> StateValueMetadata {
     StateValueMetadata::legacy(v, &CurrentTimeMicroseconds { microseconds: v })
 }
 
+#[derive(Debug)]
+pub(crate) enum GroupSizeOrMetadata {
+    Size(u64),
+    Metadata(Option<StateValueMetadata>),
+}
+
 #[derive(Debug)]
 pub(crate) struct MockOutput<K, E> {
     pub(crate) writes: Vec<(K, ValueType)>,
@@ -988,7 +1028,7 @@ pub(crate) struct MockOutput<K, E> {
     pub(crate) deltas: Vec<(K, DeltaOp)>,
     pub(crate) events: Vec<E>,
     pub(crate) read_results: Vec<Option<Vec<u8>>>,
-    pub(crate) read_group_sizes: Vec<(K, u64)>,
+    pub(crate) read_group_size_or_metadata: Vec<(K, GroupSizeOrMetadata)>,
     pub(crate) materialized_delta_writes: OnceCell<Vec<(K, WriteOp)>>,
     pub(crate) total_gas: u64,
     pub(crate) skipped: bool,
@@ -1007,7 +1047,7 @@ where
     fn resource_write_set(&self) -> Vec<(K, Arc<ValueType>, Option<Arc<MoveTypeLayout>>)> {
         self.writes
             .iter()
-            .filter(|(k, _)| k.module_path().is_none())
+            .filter(|(k, _)| !k.is_module_path())
             .cloned()
             .map(|(k, v)| (k, Arc::new(v), None))
             .collect()
@@ -1016,7 +1056,7 @@ where
     fn module_write_set(&self) -> BTreeMap<K, ValueType> {
         self.writes
             .iter()
-            .filter(|(k, _)| k.module_path().is_some())
+            .filter(|(k, _)| k.is_module_path())
             .cloned()
             .collect()
     }
@@ -1093,7 +1133,7 @@ where
             deltas: vec![],
             events: vec![],
             read_results: vec![],
-            read_group_sizes: vec![],
+            read_group_size_or_metadata: vec![],
             materialized_delta_writes: OnceCell::new(),
             total_gas: 0,
             skipped: true,
@@ -1107,7 +1147,7 @@ where
             deltas: vec![],
             events: vec![],
             read_results: vec![],
-            read_group_sizes: vec![],
+            read_group_size_or_metadata: vec![],
             materialized_delta_writes: OnceCell::new(),
             total_gas: 0,
             skipped: true,
diff --git a/aptos-move/block-executor/src/task.rs b/aptos-move/block-executor/src/task.rs
index 2653da650728d..350b566175924 100644
--- a/aptos-move/block-executor/src/task.rs
+++ b/aptos-move/block-executor/src/task.rs
@@ -8,9 +8,11 @@ use aptos_aggregator::{
 };
 use aptos_mvhashmap::types::TxnIndex;
 use aptos_types::{
-    delayed_fields::PanicError, fee_statement::FeeStatement,
-    state_store::state_value::StateValueMetadata,
-    transaction::BlockExecutableTransaction as Transaction, write_set::WriteOp,
+    delayed_fields::PanicError,
+    fee_statement::FeeStatement,
+    state_store::{state_value::StateValueMetadata, TStateView},
+    transaction::BlockExecutableTransaction as Transaction,
+    write_set::WriteOp,
 };
 use aptos_vm_types::resolver::{TExecutorView, TResourceGroupView};
 use move_core_types::{value::MoveTypeLayout, vm_status::StatusCode};
@@ -57,12 +59,15 @@ pub trait ExecutorTask: Sync {
     /// Type of error when the executor failed to process a transaction and needs to abort.
     type Error: Debug + Clone + Send + Sync + Eq + 'static;
 
-    /// Type to initialize the single thread transaction executor. Copy and Sync are required because
+    /// Type to initialize the single thread transaction executor. Clone and Sync are required because
     /// we will create an instance of executor on each individual thread.
-    type Argument: Sync + Copy;
+    type Environment: Sync + Clone;
 
     /// Create an instance of the transaction executor.
-    fn init(args: Self::Argument) -> Self;
+    fn init(
+        env: Self::Environment,
+        state_view: &impl TStateView<Key = <Self::Txn as Transaction>::Key>,
+    ) -> Self;
 
     /// Execute a single transaction given the view of the current state.
     fn execute_transaction(
diff --git a/aptos-move/block-executor/src/unit_tests/mod.rs b/aptos-move/block-executor/src/unit_tests/mod.rs
index 75a9503490742..82472dd15aad5 100644
--- a/aptos-move/block-executor/src/unit_tests/mod.rs
+++ b/aptos-move/block-executor/src/unit_tests/mod.rs
@@ -27,6 +27,7 @@ use aptos_types::{
     block_executor::config::BlockExecutorConfig,
     contract_event::TransactionEvent,
     executable::{ExecutableTestType, ModulePath},
+    state_store::state_value::StateValueMetadata,
 };
 use claims::assert_matches;
 use fail::FailScenario;
@@ -69,6 +70,7 @@ fn resource_group_bcs_fallback() {
         MockIncarnation::new(vec![KeyType::<u32>(1, false)], vec![], vec![], vec![], 10);
     group_incarnation.group_writes.push((
         KeyType::<u32>(100, false),
+        StateValueMetadata::none(),
         HashMap::from([(101, ValueType::from_value(vec![5], true))]),
     ));
     let t_2 = MockTransaction::from_behavior(group_incarnation);
@@ -96,7 +98,7 @@ fn resource_group_bcs_fallback() {
     );
 
     // Execute the block normally.
-    let output = block_executor.execute_transactions_parallel((), &transactions, &data_view);
+    let output = block_executor.execute_transactions_parallel(&(), &transactions, &data_view);
     match output {
         Ok(block_output) => {
             let txn_outputs = block_output.into_transaction_outputs_forced();
@@ -114,7 +116,7 @@ fn resource_group_bcs_fallback() {
     fail::cfg("fail-point-resource-group-serialization", "return()").unwrap();
     assert!(!fail::list().is_empty());
 
-    let par_output = block_executor.execute_transactions_parallel((), &transactions, &data_view);
+    let par_output = block_executor.execute_transactions_parallel(&(), &transactions, &data_view);
     assert_matches!(par_output, Err(()));
 
     let seq_output =
@@ -194,7 +196,7 @@ fn block_output_err_precedence() {
     assert!(!fail::list().is_empty());
     // Pause the thread that processes the aborting txn1, so txn2 can halt the scheduler first.
     // Confirm that the fatal VM error is still detected and sequential fallback triggered.
-    let output = block_executor.execute_transactions_parallel((), &transactions, &data_view);
+    let output = block_executor.execute_transactions_parallel(&(), &transactions, &data_view);
     assert_matches!(output, Err(()));
     scenario.teardown();
 }
@@ -227,7 +229,7 @@ fn skip_rest_gas_limit() {
     );
 
     // Should hit block limit on the skip transaction.
-    let _ = block_executor.execute_transactions_parallel((), &transactions, &data_view);
+    let _ = block_executor.execute_transactions_parallel(&(), &transactions, &data_view);
 }
 
 // TODO: add unit test for block gas limit!
@@ -258,7 +260,7 @@ where
         executor_thread_pool,
         None,
     )
-    .execute_transactions_parallel((), &transactions, &data_view);
+    .execute_transactions_parallel(&(), &transactions, &data_view);
 
     let baseline = BaselineOutput::generate(&transactions, None);
     baseline.assert_parallel_output(&output);
diff --git a/aptos-move/block-executor/src/view.rs b/aptos-move/block-executor/src/view.rs
index 2e13168ec6ddb..837a47d419ed9 100644
--- a/aptos-move/block-executor/src/view.rs
+++ b/aptos-move/block-executor/src/view.rs
@@ -1296,20 +1296,11 @@ impl<'a, T: Transaction, S: TStateView<Key = T::Key>, X: Executable> LatestView<
         kind: ReadKind,
     ) -> PartialVMResult<ReadResult> {
         debug_assert!(
-            state_key.module_path().is_none(),
+            !state_key.is_module_path(),
             "Reading a module {:?} using ResourceView",
             state_key,
         );
 
-        let layout = if self.is_delayed_field_optimization_capable() {
-            layout
-        } else {
-            match layout {
-                UnknownOrLayout::Known(_) => UnknownOrLayout::Known(None),
-                UnknownOrLayout::Unknown => UnknownOrLayout::Unknown,
-            }
-        };
-
         let state = self.latest_view.get_resource_state();
 
         let mut ret = state.read_cached_data_by_kind(
@@ -1472,8 +1463,6 @@ impl<'a, T: Transaction, S: TStateView<Key = T::Key>, X: Executable> TResourceGr
         resource_tag: &Self::ResourceTag,
         maybe_layout: Option<&Self::Layout>,
     ) -> PartialVMResult<Option<Bytes>> {
-        let maybe_layout = maybe_layout.filter(|_| self.is_delayed_field_optimization_capable());
-
         let mut group_read = self
             .latest_view
             .get_resource_group_state()
@@ -1540,7 +1529,7 @@ impl<'a, T: Transaction, S: TStateView<Key = T::Key>, X: Executable> TModuleView
 
     fn get_module_state_value(&self, state_key: &Self::Key) -> PartialVMResult<Option<StateValue>> {
         debug_assert!(
-            state_key.module_path().is_some(),
+            state_key.is_module_path(),
             "Reading a resource {:?} using ModuleView",
             state_key,
         );
@@ -1613,13 +1602,6 @@ impl<'a, T: Transaction, S: TStateView<Key = T::Key>, X: Executable> TDelayedFie
     type ResourceGroupTag = T::Tag;
     type ResourceKey = T::Key;
 
-    fn is_delayed_field_optimization_capable(&self) -> bool {
-        match &self.latest_view {
-            ViewState::Sync(_) => true,
-            ViewState::Unsync(_) => true,
-        }
-    }
-
     fn get_delayed_field_value(
         &self,
         id: &Self::Identifier,
diff --git a/aptos-move/e2e-benchmark/src/main.rs b/aptos-move/e2e-benchmark/src/main.rs
index 3036441b0f558..a00e511eaea89 100644
--- a/aptos-move/e2e-benchmark/src/main.rs
+++ b/aptos-move/e2e-benchmark/src/main.rs
@@ -105,7 +105,7 @@ fn main() {
             num_objects: 10,
             object_payload_size: 0,
         }),
-        (7130, EntryPoints::CreateObjects {
+        (7800, EntryPoints::CreateObjects {
             num_objects: 10,
             object_payload_size: 10 * 1024,
         }),
@@ -113,18 +113,18 @@ fn main() {
             num_objects: 100,
             object_payload_size: 0,
         }),
-        (8570, EntryPoints::CreateObjects {
+        (9000, EntryPoints::CreateObjects {
             num_objects: 100,
             object_payload_size: 10 * 1024,
         }),
         (65, EntryPoints::InitializeVectorPicture { length: 40 }),
         (14, EntryPoints::VectorPicture { length: 40 }),
         (14, EntryPoints::VectorPictureRead { length: 40 }),
-        (27180, EntryPoints::InitializeVectorPicture {
+        (29000, EntryPoints::InitializeVectorPicture {
             length: 30 * 1024,
         }),
-        (4510, EntryPoints::VectorPicture { length: 30 * 1024 }),
-        (4400, EntryPoints::VectorPictureRead { length: 30 * 1024 }),
+        (5900, EntryPoints::VectorPicture { length: 30 * 1024 }),
+        (5870, EntryPoints::VectorPictureRead { length: 30 * 1024 }),
         (33580, EntryPoints::SmartTablePicture {
             length: 30 * 1024,
             num_points_per_txn: 200,
diff --git a/aptos-move/e2e-move-tests/Cargo.toml b/aptos-move/e2e-move-tests/Cargo.toml
index b795c55795071..c8c59e87b4756 100644
--- a/aptos-move/e2e-move-tests/Cargo.toml
+++ b/aptos-move/e2e-move-tests/Cargo.toml
@@ -22,6 +22,7 @@ aptos-gas-profiling = { workspace = true }
 aptos-gas-schedule = { workspace = true, features = ["testing"] }
 aptos-language-e2e-tests = { workspace = true }
 aptos-package-builder = { workspace = true }
+aptos-transaction-generator-lib = { workspace = true }
 aptos-types = { workspace = true }
 aptos-vm = { workspace = true, features = ["testing"] }
 bcs = { workspace = true }
@@ -39,6 +40,7 @@ proptest = { workspace = true }
 rand = { workspace = true }
 rstest = { workspace = true }
 serde = { workspace = true }
+sha3 = { workspace = true }
 test-case = { workspace = true }
 
 [dev-dependencies]
diff --git a/aptos-move/e2e-move-tests/proptest-regressions/tests/aggregator_v2.txt b/aptos-move/e2e-move-tests/proptest-regressions/tests/aggregator_v2.txt
new file mode 100644
index 0000000000000..1bb78427cbd61
--- /dev/null
+++ b/aptos-move/e2e-move-tests/proptest-regressions/tests/aggregator_v2.txt
@@ -0,0 +1,7 @@
+# Seeds for failure cases proptest has generated in the past. It is
+# automatically read and these particular cases re-run before any
+# novel cases are generated.
+#
+# It is recommended to check this file in to source control so that
+# everyone who runs the test benefits from these saved cases.
+cc a8f570394fd4cd6dccbec4f0f8a866f365ac76eac32cb0e8a1665f3d09f06c80 # shrinks to test_env = TestEnvConfig { executor_mode: BothComparison, aggregator_execution_mode: DisabledOnly, block_split: Whole }
diff --git a/aptos-move/e2e-move-tests/src/aggregator_v2.rs b/aptos-move/e2e-move-tests/src/aggregator_v2.rs
index 47d8319070a43..de32570c756ef 100644
--- a/aptos-move/e2e-move-tests/src/aggregator_v2.rs
+++ b/aptos-move/e2e-move-tests/src/aggregator_v2.rs
@@ -371,6 +371,19 @@ impl AggV2TestHarness {
         self.create_entry_agg_func_with_args("0x1::aggregator_v2_test::add_sub", agg_loc, &[a, b])
     }
 
+    pub fn add_if_at_least(
+        &mut self,
+        agg_loc: &AggregatorLocation,
+        min_value: u128,
+        delta: u128,
+    ) -> SignedTransaction {
+        self.create_entry_agg_func_with_args(
+            "0x1::aggregator_v2_test::add_if_at_least",
+            agg_loc,
+            &[min_value, delta],
+        )
+    }
+
     pub fn add_delete(&mut self, agg_loc: &AggregatorLocation, value: u128) -> SignedTransaction {
         self.create_entry_agg_func_with_args("0x1::aggregator_v2_test::add_delete", agg_loc, &[
             value,
diff --git a/aptos-move/e2e-move-tests/src/harness.rs b/aptos-move/e2e-move-tests/src/harness.rs
index 8cfd9f4ad5fb3..709f2b884b09b 100644
--- a/aptos-move/e2e-move-tests/src/harness.rs
+++ b/aptos-move/e2e-move-tests/src/harness.rs
@@ -20,6 +20,7 @@ use aptos_types::{
     },
     chain_id::ChainId,
     contract_event::ContractEvent,
+    fee_statement::FeeStatement,
     move_utils::MemberId,
     on_chain_config::{FeatureFlag, GasScheduleV2, OnChainConfig},
     state_store::{
@@ -32,7 +33,6 @@ use aptos_types::{
         ViewFunctionOutput,
     },
 };
-use aptos_vm::{data_cache::AsMoveResolver, AptosVM};
 use claims::assert_ok;
 use move_core_types::{
     language_storage::{StructTag, TypeTag},
@@ -322,7 +322,7 @@ impl MoveHarness {
         &mut self,
         account: &Account,
         payload: TransactionPayload,
-    ) -> (TransactionGasLog, u64) {
+    ) -> (TransactionGasLog, u64, Option<FeeStatement>) {
         let txn = self.create_transaction_payload(account, payload);
         let (output, gas_log) = self
             .executor
@@ -331,7 +331,11 @@ impl MoveHarness {
         if matches!(output.status(), TransactionStatus::Keep(_)) {
             self.executor.apply_write_set(output.write_set());
         }
-        (gas_log, output.gas_used())
+        (
+            gas_log,
+            output.gas_used(),
+            output.try_extract_fee_statement().unwrap(),
+        )
     }
 
     /// Creates a transaction which runs the specified entry point `fun`. Arguments need to be
@@ -631,7 +635,7 @@ impl MoveHarness {
         &mut self,
         account: &Account,
         path: &Path,
-    ) -> (TransactionGasLog, u64) {
+    ) -> (TransactionGasLog, u64, Option<FeeStatement>) {
         let txn = self.create_publish_package(account, path, None, |_| {});
         let (output, gas_log) = self
             .executor
@@ -640,7 +644,11 @@ impl MoveHarness {
         if matches!(output.status(), TransactionStatus::Keep(_)) {
             self.executor.apply_write_set(output.write_set());
         }
-        (gas_log, output.gas_used())
+        (
+            gas_log,
+            output.gas_used(),
+            output.try_extract_fee_statement().unwrap(),
+        )
     }
 
     /// Runs transaction which publishes the Move Package.
@@ -908,7 +916,7 @@ impl MoveHarness {
         let gas_schedule: GasScheduleV2 = self.get_gas_schedule();
         let feature_version = gas_schedule.feature_version;
         let params = AptosGasParameters::from_on_chain_gas_schedule(
-            &gas_schedule.to_btree_map(),
+            &gas_schedule.into_btree_map(),
             feature_version,
         )
         .unwrap();
@@ -920,13 +928,6 @@ impl MoveHarness {
             .unwrap()
     }
 
-    pub fn new_vm(&self) -> AptosVM {
-        AptosVM::new(
-            &self.executor.data_store().as_move_resolver(),
-            /*override_is_delayed_field_optimization_capable=*/ None,
-        )
-    }
-
     pub fn set_default_gas_unit_price(&mut self, gas_unit_price: u64) {
         self.default_gas_unit_price = gas_unit_price;
     }
diff --git a/aptos-move/e2e-move-tests/src/tests/access_path_test.rs b/aptos-move/e2e-move-tests/src/tests/access_path_test.rs
index 895c38c1c52ba..40fd2e9f5d08c 100644
--- a/aptos-move/e2e-move-tests/src/tests/access_path_test.rs
+++ b/aptos-move/e2e-move-tests/src/tests/access_path_test.rs
@@ -22,7 +22,7 @@ use move_core_types::{identifier::Identifier, vm_status::StatusCode};
 fn access_path_panic() {
     // github.com/aptos-labs/aptos-core/security/advisories/GHSA-rpw2-84hq-48jj
     let mut ty = SignatureToken::Bool;
-    for _ in 0..20 {
+    for _ in 0..18 {
         ty = SignatureToken::StructInstantiation(StructHandleIndex(0), vec![ty]);
     }
 
@@ -90,6 +90,10 @@ fn access_path_panic() {
                 ],
             }),
         }],
+        struct_variant_handles: vec![],
+        struct_variant_instantiations: vec![],
+        variant_field_handles: vec![],
+        variant_field_instantiations: vec![],
     };
 
     let mut module_bytes = vec![];
diff --git a/aptos-move/e2e-move-tests/src/tests/aggregator_v2.data/pack/sources/aggregator_v2_test.move b/aptos-move/e2e-move-tests/src/tests/aggregator_v2.data/pack/sources/aggregator_v2_test.move
index d854475a1a135..4a5c12ce8e2a7 100644
--- a/aptos-move/e2e-move-tests/src/tests/aggregator_v2.data/pack/sources/aggregator_v2_test.move
+++ b/aptos-move/e2e-move-tests/src/tests/aggregator_v2.data/pack/sources/aggregator_v2_test.move
@@ -184,7 +184,7 @@ module 0x1::aggregator_v2_test {
         f(value)
     }
 
-    public entry fun new<Element: drop + copy + store>(_account: &signer, addr: address, use_type: u32, i: u64, limit: Element) acquires AggregatorInResource, AggregatorInTable, AggregatorInResourceGroup {
+    public entry fun new<Element: drop + copy + store>(addr: address, use_type: u32, i: u64, limit: Element) acquires AggregatorInResource, AggregatorInTable, AggregatorInResourceGroup {
         insert<Aggregator<Element>>(addr, use_type, i, aggregator_v2::create_aggregator(limit));
     }
 
@@ -192,45 +192,45 @@ module 0x1::aggregator_v2_test {
         for_element_ref<Aggregator<Element>, Element>(addr, use_type, i, |aggregator| aggregator_v2::read(aggregator))
     }
 
-    public entry fun try_add<Element: store + drop>(_account: &signer, addr: address, use_type: u32, i: u64, value: Element) acquires AggregatorInResource, AggregatorInTable, AggregatorInResourceGroup {
+    public entry fun try_add<Element: store + drop>(addr: address, use_type: u32, i: u64, value: Element) acquires AggregatorInResource, AggregatorInTable, AggregatorInResourceGroup {
         for_element_mut<Aggregator<Element>, bool>(addr, use_type, i, |aggregator| aggregator_v2::try_add(aggregator, value));
     }
 
-    public entry fun add<Element: store + drop>(_account: &signer, addr: address, use_type: u32, i: u64, value: Element) acquires AggregatorInResource, AggregatorInTable, AggregatorInResourceGroup {
+    public entry fun add<Element: store + drop>(addr: address, use_type: u32, i: u64, value: Element) acquires AggregatorInResource, AggregatorInTable, AggregatorInResourceGroup {
         for_element_mut<Aggregator<Element>, bool>(addr, use_type, i, |aggregator| {
             aggregator_v2::add(aggregator, value);
             true
         });
     }
 
-    public entry fun try_sub<Element: store + drop>(_account: &signer, addr: address, use_type: u32, i: u64, value: Element) acquires AggregatorInResource, AggregatorInTable, AggregatorInResourceGroup {
+    public entry fun try_sub<Element: store + drop>(addr: address, use_type: u32, i: u64, value: Element) acquires AggregatorInResource, AggregatorInTable, AggregatorInResourceGroup {
         for_element_mut<Aggregator<Element>, bool>(addr, use_type, i, |aggregator| aggregator_v2::try_sub(aggregator, value));
     }
 
-    public entry fun sub<Element: store + drop>(_account: &signer, addr: address, use_type: u32, i: u64, value: Element) acquires AggregatorInResource, AggregatorInTable, AggregatorInResourceGroup {
+    public entry fun sub<Element: store + drop>(addr: address, use_type: u32, i: u64, value: Element) acquires AggregatorInResource, AggregatorInTable, AggregatorInResourceGroup {
         for_element_mut<Aggregator<Element>, bool>(addr, use_type, i, |aggregator| {
             aggregator_v2::sub(aggregator, value);
             true
         });
     }
 
-    public entry fun materialize<Element: store + drop>(_account: &signer, addr: address, use_type: u32, i: u64) acquires AggregatorInResource, AggregatorInTable, AggregatorInResourceGroup {
+    public entry fun materialize<Element: store + drop>(addr: address, use_type: u32, i: u64) acquires AggregatorInResource, AggregatorInTable, AggregatorInResourceGroup {
         call_read<Element>(addr, use_type, i);
     }
 
     /// Checks that the ith aggregator has expected value. Useful to inject into
     /// transaction block to verify successful and correct execution.
-    public entry fun check<Element: store + drop>(_account: &signer, addr: address, use_type: u32, i: u64, expected: Element) acquires AggregatorInResource, AggregatorInTable, AggregatorInResourceGroup {
+    public entry fun check<Element: store + drop>(addr: address, use_type: u32, i: u64, expected: Element) acquires AggregatorInResource, AggregatorInTable, AggregatorInResourceGroup {
         let actual = call_read<Element>(addr, use_type, i);
         assert!(actual == expected, ENOT_EQUAL)
     }
 
-    public entry fun new_add<Element: drop + copy + store>(account: &signer, addr: address, use_type: u32, i: u64, limit: Element, a: Element) acquires AggregatorInResource, AggregatorInTable, AggregatorInResourceGroup {
-        new(account, addr, use_type, i, limit);
-        add(account, addr, use_type, i, a);
+    public entry fun new_add<Element: drop + copy + store>(addr: address, use_type: u32, i: u64, limit: Element, a: Element) acquires AggregatorInResource, AggregatorInTable, AggregatorInResourceGroup {
+        new(addr, use_type, i, limit);
+        add(addr, use_type, i, a);
     }
 
-    public entry fun sub_add<Element: store + drop>(_account: &signer, addr: address, use_type: u32, i: u64, a: Element, b: Element) acquires AggregatorInResource, AggregatorInTable, AggregatorInResourceGroup {
+    public entry fun sub_add<Element: store + drop>(addr: address, use_type: u32, i: u64, a: Element, b: Element) acquires AggregatorInResource, AggregatorInTable, AggregatorInResourceGroup {
         for_element_mut<Aggregator<Element>, bool>(addr, use_type, i, |aggregator| {
             aggregator_v2::sub(aggregator, a);
             aggregator_v2::add(aggregator, b);
@@ -238,7 +238,25 @@ module 0x1::aggregator_v2_test {
         });
     }
 
-    public entry fun add_sub<Element: store + drop>(_account: &signer, addr: address, use_type: u32, i: u64, a: Element, b: Element) acquires AggregatorInResource, AggregatorInTable, AggregatorInResourceGroup {
+    public entry fun add_if_at_least<Element: store + drop>(addr: address, use_type: u32, i: u64, a: Element, b: Element) acquires AggregatorInResource, AggregatorInTable, AggregatorInResourceGroup {
+        let is_at_least = for_element_ref<Aggregator<Element>, bool>(addr, use_type, i, |aggregator| {
+            aggregator_v2::is_at_least(aggregator, a)
+        });
+
+        if (is_at_least) {
+            add<Element>(addr, use_type, i, b);
+        }
+
+        // issue with type inference of lambda or downcasting from mut to non-mut?
+        // for_element_mut<Aggregator<Element>, bool>(addr, use_type, i, |aggregator| {
+        //     if (aggregator_v2::is_at_least(aggregator, a)) {
+        //         aggregator_v2::add(aggregator, b);
+        //     };
+        //     true
+        // });
+    }
+
+    public entry fun add_sub<Element: store + drop>(addr: address, use_type: u32, i: u64, a: Element, b: Element) acquires AggregatorInResource, AggregatorInTable, AggregatorInResourceGroup {
         for_element_mut<Aggregator<Element>, bool>(addr, use_type, i, |aggregator| {
             aggregator_v2::add(aggregator, b);
             aggregator_v2::sub(aggregator, a);
@@ -246,14 +264,14 @@ module 0x1::aggregator_v2_test {
         });
     }
 
-    public entry fun add_delete<Element: drop + copy + store>(account: &signer, addr: address, use_type: u32, i: u64, a: Element) acquires AggregatorInResource, AggregatorInTable, AggregatorInResourceGroup {
-        add(account, addr, use_type, i, a);
+    public entry fun add_delete<Element: drop + copy + store>(addr: address, use_type: u32, i: u64, a: Element) acquires AggregatorInResource, AggregatorInTable, AggregatorInResourceGroup {
+        add(addr, use_type, i, a);
         delete_aggregator<Element>(addr, use_type);
     }
 
-    public entry fun materialize_and_add<Element: store + drop>(account: &signer, addr: address, use_type: u32, i: u64, value: Element) acquires AggregatorInResource, AggregatorInTable, AggregatorInResourceGroup {
+    public entry fun materialize_and_add<Element: store + drop>(addr: address, use_type: u32, i: u64, value: Element) acquires AggregatorInResource, AggregatorInTable, AggregatorInResourceGroup {
         call_read<Element>(addr, use_type, i);
-        add<Element>(account, addr, use_type, i, value);
+        add<Element>(addr, use_type, i, value);
 
         // issue with type inference of lambda?
         // for_element_mut<Aggregator<u128>, bool>(account, use_type, i, |aggregator| {
@@ -262,9 +280,9 @@ module 0x1::aggregator_v2_test {
         // });
     }
 
-    public entry fun materialize_and_sub<Element: store + drop>(account: &signer, addr: address, use_type: u32, i: u64, value: Element) acquires AggregatorInResource, AggregatorInTable, AggregatorInResourceGroup {
+    public entry fun materialize_and_sub<Element: store + drop>(addr: address, use_type: u32, i: u64, value: Element) acquires AggregatorInResource, AggregatorInTable, AggregatorInResourceGroup {
         call_read<Element>(addr, use_type, i);
-        sub<Element>(account, addr, use_type, i, value);
+        sub<Element>(addr, use_type, i, value);
 
         // issue with type inference of lambda?
         // for_element_mut<Aggregator<u128>, bool>(account, use_type, i, |aggregator| {
@@ -273,54 +291,54 @@ module 0x1::aggregator_v2_test {
         // });
     }
 
-    public entry fun add_and_materialize<Element: store + drop>(_account: &signer, addr: address, use_type: u32, i: u64, value: Element) acquires AggregatorInResource, AggregatorInTable, AggregatorInResourceGroup {
+    public entry fun add_and_materialize<Element: store + drop>(addr: address, use_type: u32, i: u64, value: Element) acquires AggregatorInResource, AggregatorInTable, AggregatorInResourceGroup {
         for_element_mut<Aggregator<Element>, Element>(addr, use_type, i, |aggregator| {
             aggregator_v2::add(aggregator, value);
             aggregator_v2::read(aggregator)
         });
     }
 
-    public entry fun sub_and_materialize<Element: store + drop>(_account: &signer, addr: address, use_type: u32, i: u64, value: Element) acquires AggregatorInResource, AggregatorInTable, AggregatorInResourceGroup {
+    public entry fun sub_and_materialize<Element: store + drop>(addr: address, use_type: u32, i: u64, value: Element) acquires AggregatorInResource, AggregatorInTable, AggregatorInResourceGroup {
         for_element_mut<Aggregator<Element>, Element>(addr, use_type, i, |aggregator| {
             aggregator_v2::sub(aggregator, value);
             aggregator_v2::read(aggregator)
         });
     }
 
-    public entry fun add_2<A: store + drop, B: store + drop>(account: &signer, addr_a: address, use_type_a: u32, i_a: u64, a: A, addr_b: address, use_type_b: u32, i_b: u64, b: B) acquires AggregatorInResource, AggregatorInTable, AggregatorInResourceGroup {
-        add<A>(account, addr_a, use_type_a, i_a, a);
-        add<B>(account, addr_b, use_type_b, i_b, b);
+    public entry fun add_2<A: store + drop, B: store + drop>(addr_a: address, use_type_a: u32, i_a: u64, a: A, addr_b: address, use_type_b: u32, i_b: u64, b: B) acquires AggregatorInResource, AggregatorInTable, AggregatorInResourceGroup {
+        add<A>(addr_a, use_type_a, i_a, a);
+        add<B>(addr_b, use_type_b, i_b, b);
     }
 
-    public entry fun snapshot<Element: store + drop>(_account: &signer, addr_i: address, use_type_i: u32, i: u64, addr_j: address, use_type_j: u32, j: u64) acquires AggregatorInResource, AggregatorInTable, AggregatorInResourceGroup {
+    public entry fun snapshot<Element: store + drop>(addr_i: address, use_type_i: u32, i: u64, addr_j: address, use_type_j: u32, j: u64) acquires AggregatorInResource, AggregatorInTable, AggregatorInResourceGroup {
         let snapshot = for_element_ref<Aggregator<Element>, AggregatorSnapshot<Element>>(addr_i, use_type_i, i, |aggregator| {
             aggregator_v2::snapshot<Element>(aggregator)
         });
         insert<AggregatorSnapshot<Element>>(addr_j, use_type_j, j, snapshot);
     }
 
-    public entry fun concat<Element: store + drop>(_account: &signer, addr_i: address, use_type_i: u32, i: u64, addr_j: address, use_type_j: u32, j: u64, prefix: String, suffix: String) acquires AggregatorInResource, AggregatorInTable, AggregatorInResourceGroup {
+    public entry fun concat<Element: store + drop>(addr_i: address, use_type_i: u32, i: u64, addr_j: address, use_type_j: u32, j: u64, prefix: String, suffix: String) acquires AggregatorInResource, AggregatorInTable, AggregatorInResourceGroup {
         let snapshot = for_element_ref<AggregatorSnapshot<Element>, DerivedStringSnapshot>(addr_i, use_type_i, i, |snapshot| {
             aggregator_v2::derive_string_concat<Element>(prefix, snapshot, suffix)
         });
         insert<DerivedStringSnapshot>(addr_j, use_type_j, j, snapshot);
     }
 
-    public entry fun read_snapshot<Element: store + drop>(_account: &signer, addr: address, use_type: u32, i: u64) acquires AggregatorInResource, AggregatorInTable, AggregatorInResourceGroup {
+    public entry fun read_snapshot<Element: store + drop>(addr: address, use_type: u32, i: u64) acquires AggregatorInResource, AggregatorInTable, AggregatorInResourceGroup {
         for_element_ref<AggregatorSnapshot<Element>, Element>(addr, use_type, i, |snapshot| aggregator_v2::read_snapshot(snapshot));
     }
 
-    public entry fun check_snapshot<Element: store + drop>(_account: &signer, addr: address, use_type: u32, i: u64, expected: Element) acquires AggregatorInResource, AggregatorInTable, AggregatorInResourceGroup {
+    public entry fun check_snapshot<Element: store + drop>(addr: address, use_type: u32, i: u64, expected: Element) acquires AggregatorInResource, AggregatorInTable, AggregatorInResourceGroup {
         let actual = for_element_ref<AggregatorSnapshot<Element>, Element>(addr, use_type, i, |snapshot| aggregator_v2::read_snapshot(snapshot));
         assert!(actual == expected, ENOT_EQUAL)
     }
 
-    public entry fun check_derived<Element: store + drop>(_account: &signer, addr: address, use_type: u32, i: u64, expected: String) acquires AggregatorInResource, AggregatorInTable, AggregatorInResourceGroup {
+    public entry fun check_derived<Element: store + drop>(addr: address, use_type: u32, i: u64, expected: String) acquires AggregatorInResource, AggregatorInTable, AggregatorInResourceGroup {
         let actual = for_element_ref<DerivedStringSnapshot, String>(addr, use_type, i, |snapshot| aggregator_v2::read_derived_string(snapshot));
         assert!(actual == expected, ENOT_EQUAL)
     }
 
-    public entry fun add_and_read_snapshot<Element: copy + store + drop>(_account: &signer, addr: address, use_type: u32, i: u64, value: Element) acquires AggregatorInResource, AggregatorInTable, AggregatorInResourceGroup {
+    public entry fun add_and_read_snapshot<Element: copy + store + drop>(addr: address, use_type: u32, i: u64, value: Element) acquires AggregatorInResource, AggregatorInTable, AggregatorInResourceGroup {
         for_element_mut<Aggregator<Element>, Element>(addr, use_type, i, |aggregator| {
             aggregator_v2::add(aggregator, value);
             aggregator_v2::sub(aggregator, value);
diff --git a/aptos-move/e2e-move-tests/src/tests/aggregator_v2.data/pack/sources/runtime_checks.move b/aptos-move/e2e-move-tests/src/tests/aggregator_v2.data/pack/sources/runtime_checks.move
index 5202e2677360e..2ac1e3bcf6129 100644
--- a/aptos-move/e2e-move-tests/src/tests/aggregator_v2.data/pack/sources/runtime_checks.move
+++ b/aptos-move/e2e-move-tests/src/tests/aggregator_v2.data/pack/sources/runtime_checks.move
@@ -118,6 +118,21 @@ module 0x1::runtime_checks {
         let _ = bcs::to_bytes(&a);
     }
 
+    public entry fun test_serialized_size_with_aggregators() {
+        let a = with_aggregator<u64>();
+        let _ = bcs::serialized_size(&a);
+    }
+
+    public entry fun test_serialized_size_with_snapshots() {
+        let a = with_snapshot<u128>(0);
+        let _ = bcs::serialized_size(&a);
+    }
+
+    public entry fun test_serialized_size_with_derived_string_snapshots() {
+        let a = with_derived_string_snapshot(b"aaa");
+        let _ = bcs::serialized_size(&a);
+    }
+
     //
     // String utils:
     //   - to_string
diff --git a/aptos-move/e2e-move-tests/src/tests/aggregator_v2.rs b/aptos-move/e2e-move-tests/src/tests/aggregator_v2.rs
index 92153bb360deb..d24c681d7381d 100644
--- a/aptos-move/e2e-move-tests/src/tests/aggregator_v2.rs
+++ b/aptos-move/e2e-move-tests/src/tests/aggregator_v2.rs
@@ -530,6 +530,35 @@ proptest! {
             txns,
         );
     }
+
+    #[test]
+    fn test_aggregator_is_at_least(test_env in arb_test_env_non_equivalent(10)) {
+        println!("Testing test_aggregator_is_at_least {:?}", test_env);
+        let element_type = ElementType::U64;
+        let use_type = UseType::UseResourceType;
+
+        let mut h = setup(test_env.executor_mode, test_env.aggregator_execution_mode, 10);
+
+        let agg_loc = AggregatorLocation::new(*h.account.address(), element_type, use_type, 0);
+
+        let txns = vec![
+            (SUCCESS, h.init(None, use_type, element_type, StructType::Aggregator)),
+            (SUCCESS, h.init(None, use_type, element_type, StructType::Snapshot)),
+            (SUCCESS, h.init(None, use_type, ElementType::String, StructType::DerivedString)),
+            (SUCCESS, h.new_add(&agg_loc, 400, 100)),
+            (SUCCESS, h.add(&agg_loc, 50)),
+            (SUCCESS, h.add(&agg_loc, 50)),
+            (SUCCESS, h.add_if_at_least(&agg_loc, 180, 50)),
+            (SUCCESS, h.sub(&agg_loc, 50)),
+            (SUCCESS, h.add_if_at_least(&agg_loc, 220, 50)),
+            (SUCCESS, h.check(&agg_loc, 200)),
+        ];
+
+        h.run_block_in_parts_and_check(
+            test_env.block_split,
+            txns,
+        );
+    }
 }
 
 #[test]
diff --git a/aptos-move/e2e-move-tests/src/tests/aggregator_v2_runtime_checks.rs b/aptos-move/e2e-move-tests/src/tests/aggregator_v2_runtime_checks.rs
index 9f9cb001d8dc3..2fb694ac99c14 100644
--- a/aptos-move/e2e-move-tests/src/tests/aggregator_v2_runtime_checks.rs
+++ b/aptos-move/e2e-move-tests/src/tests/aggregator_v2_runtime_checks.rs
@@ -101,6 +101,21 @@ fn test_serialization() {
     });
 }
 
+#[test]
+fn test_serialized_size() {
+    let func_names = vec![
+        "0x1::runtime_checks::test_serialized_size_with_aggregators",
+        "0x1::runtime_checks::test_serialized_size_with_snapshots",
+        "0x1::runtime_checks::test_serialized_size_with_derived_string_snapshots",
+    ];
+
+    // Serialized size of delayed values is deterministic and fixed, so running
+    // these functions should succeed, unlike regular serialization.
+    run_entry_functions(func_names, |status: ExecutionStatus| {
+        assert_eq!(status, ExecutionStatus::Success);
+    });
+}
+
 #[test]
 fn test_string_utils() {
     let func_names = vec![
diff --git a/aptos-move/e2e-move-tests/src/tests/code_publishing.data/pack_native/Move.toml b/aptos-move/e2e-move-tests/src/tests/code_publishing.data/pack_native/Move.toml
new file mode 100644
index 0000000000000..9cc318d4debab
--- /dev/null
+++ b/aptos-move/e2e-move-tests/src/tests/code_publishing.data/pack_native/Move.toml
@@ -0,0 +1,7 @@
+[package]
+name = "test_package"
+version = "0.0.0"
+upgrade_policy = "compatible"
+
+[dependencies]
+AptosFramework = { local = "../../../../../framework/aptos-framework" }
diff --git a/aptos-move/e2e-move-tests/src/tests/code_publishing.data/pack_native/sources/test.move b/aptos-move/e2e-move-tests/src/tests/code_publishing.data/pack_native/sources/test.move
new file mode 100644
index 0000000000000..5a81004d6ed82
--- /dev/null
+++ b/aptos-move/e2e-move-tests/src/tests/code_publishing.data/pack_native/sources/test.move
@@ -0,0 +1,3 @@
+module 0xcafe::test {
+    public entry native fun hello(s: &signer, value: u64);
+}
diff --git a/aptos-move/e2e-move-tests/src/tests/code_publishing.data/pack_native_system/Move.toml b/aptos-move/e2e-move-tests/src/tests/code_publishing.data/pack_native_system/Move.toml
new file mode 100644
index 0000000000000..9cc318d4debab
--- /dev/null
+++ b/aptos-move/e2e-move-tests/src/tests/code_publishing.data/pack_native_system/Move.toml
@@ -0,0 +1,7 @@
+[package]
+name = "test_package"
+version = "0.0.0"
+upgrade_policy = "compatible"
+
+[dependencies]
+AptosFramework = { local = "../../../../../framework/aptos-framework" }
diff --git a/aptos-move/e2e-move-tests/src/tests/code_publishing.data/pack_native_system/sources/test.move b/aptos-move/e2e-move-tests/src/tests/code_publishing.data/pack_native_system/sources/test.move
new file mode 100644
index 0000000000000..e6c5adf4bb2e3
--- /dev/null
+++ b/aptos-move/e2e-move-tests/src/tests/code_publishing.data/pack_native_system/sources/test.move
@@ -0,0 +1,3 @@
+module 0x1::test {
+    public entry native fun hello(s: &signer, value: u64);
+}
diff --git a/aptos-move/e2e-move-tests/src/tests/code_publishing.rs b/aptos-move/e2e-move-tests/src/tests/code_publishing.rs
index 7aecb842bdc94..1aaf533ccdb91 100644
--- a/aptos-move/e2e-move-tests/src/tests/code_publishing.rs
+++ b/aptos-move/e2e-move-tests/src/tests/code_publishing.rs
@@ -91,6 +91,56 @@ fn code_publishing_upgrade_success_compat() {
     ));
 }
 
+#[test]
+fn code_publishing_disallow_native() {
+    let mut h = MoveHarness::new();
+    let acc = h.new_account_at(AccountAddress::from_hex_literal("0xcafe").unwrap());
+
+    assert_vm_status!(
+        h.publish_package_cache_building(
+            &acc,
+            &common::test_dir_path("code_publishing.data/pack_native"),
+        ),
+        StatusCode::USER_DEFINED_NATIVE_NOT_ALLOWED
+    );
+}
+
+#[test]
+fn code_publishing_disallow_native_entry_func() {
+    let mut h = MoveHarness::new();
+    // Disable feature for now to publish the package.
+    h.enable_features(vec![], vec![FeatureFlag::DISALLOW_USER_NATIVES]);
+    let acc = h.new_account_at(AccountAddress::from_hex_literal("0xcafe").unwrap());
+
+    assert_success!(h.publish_package_cache_building(
+        &acc,
+        &common::test_dir_path("code_publishing.data/pack_native"),
+    ));
+
+    // Re-enable the flag to test the behavior for this entry native
+    h.enable_features(vec![FeatureFlag::DISALLOW_USER_NATIVES], vec![]);
+    assert_vm_status!(
+        h.run_entry_function(
+            &acc,
+            str::parse("0xcafe::test::hello").unwrap(),
+            vec![],
+            vec![]
+        ),
+        StatusCode::USER_DEFINED_NATIVE_NOT_ALLOWED
+    );
+}
+
+#[test]
+fn code_publishing_allow_system_native() {
+    let mut h = MoveHarness::new();
+    let acc = h.new_account_at(AccountAddress::from_hex_literal("0x1").unwrap());
+
+    assert_success!(h.publish_package_cache_building(
+        &acc,
+        &common::test_dir_path("code_publishing.data/pack_native_system"),
+    ));
+}
+
 #[test]
 fn code_publishing_upgrade_fail_compat() {
     let mut h = MoveHarness::new();
diff --git a/aptos-move/e2e-move-tests/src/tests/enum_upgrade.rs b/aptos-move/e2e-move-tests/src/tests/enum_upgrade.rs
new file mode 100644
index 0000000000000..998fafd118eea
--- /dev/null
+++ b/aptos-move/e2e-move-tests/src/tests/enum_upgrade.rs
@@ -0,0 +1,112 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+//! Tests for enum type upgrade compatibility
+
+use crate::{assert_success, assert_vm_status, MoveHarness};
+use aptos_framework::BuildOptions;
+use aptos_language_e2e_tests::account::Account;
+use aptos_package_builder::PackageBuilder;
+use aptos_types::{account_address::AccountAddress, transaction::TransactionStatus};
+use move_core_types::vm_status::StatusCode;
+
+#[test]
+fn enum_upgrade() {
+    let mut h = MoveHarness::new();
+    let acc = h.new_account_at(AccountAddress::from_hex_literal("0x815").unwrap());
+
+    // Initial publish
+    let result = publish(
+        &mut h,
+        &acc,
+        r#"
+        module 0x815::m {
+            enum Data {
+               V1{x: u64}
+            }
+        }
+    "#,
+    );
+    assert_success!(result);
+
+    // Add a compatible variant
+    let result = publish(
+        &mut h,
+        &acc,
+        r#"
+        module 0x815::m {
+            enum Data {
+               V1{x: u64},
+               V2{x: u64, y: u8},
+            }
+        }
+    "#,
+    );
+    assert_success!(result);
+
+    // Upgrade identity
+    let result = publish(
+        &mut h,
+        &acc,
+        r#"
+        module 0x815::m {
+            enum Data {
+               V1{x: u64},
+               V2{x: u64, y: u8},
+            }
+        }
+    "#,
+    );
+    assert_success!(result);
+
+    // Incompatible because of modification
+    let result = publish(
+        &mut h,
+        &acc,
+        r#"
+        module 0x815::m {
+            enum Data {
+               V1{x: u64, z: u32},
+               V2{x: u64, y: u8},
+            }
+        }
+    "#,
+    );
+    assert_vm_status!(result, StatusCode::BACKWARD_INCOMPATIBLE_MODULE_UPDATE);
+
+    // Incompatible because of removal
+    let result = publish(
+        &mut h,
+        &acc,
+        r#"
+        module 0x815::m {
+            enum Data {
+               V2{x: u64, y: u8},
+            }
+        }
+    "#,
+    );
+    assert_vm_status!(result, StatusCode::BACKWARD_INCOMPATIBLE_MODULE_UPDATE);
+
+    // Incompatible because of renaming
+    let result = publish(
+        &mut h,
+        &acc,
+        r#"
+        module 0x815::m {
+           enum Data {
+               V1{x: u64},
+               V2a{x: u64, y: u8},
+           }
+        }
+    "#,
+    );
+    assert_vm_status!(result, StatusCode::BACKWARD_INCOMPATIBLE_MODULE_UPDATE);
+}
+
+fn publish(h: &mut MoveHarness, account: &Account, source: &str) -> TransactionStatus {
+    let mut builder = PackageBuilder::new("Package");
+    builder.add_source("m.move", source);
+    let path = builder.write_to_temp().unwrap();
+    h.publish_package_with_options(account, path.path(), BuildOptions::move_2())
+}
diff --git a/aptos-move/e2e-move-tests/src/tests/gas.rs b/aptos-move/e2e-move-tests/src/tests/gas.rs
index 3b542a2614c97..4ccbeb674171e 100644
--- a/aptos-move/e2e-move-tests/src/tests/gas.rs
+++ b/aptos-move/e2e-move-tests/src/tests/gas.rs
@@ -13,21 +13,160 @@ use crate::{
 };
 use aptos_cached_packages::{aptos_stdlib, aptos_token_sdk_builder};
 use aptos_crypto::{bls12381, PrivateKey, Uniform};
+use aptos_gas_algebra::GasQuantity;
 use aptos_gas_profiling::TransactionGasLog;
+use aptos_language_e2e_tests::account::Account;
+use aptos_transaction_generator_lib::{
+    publishing::{
+        module_simple::{LoopType, MultiSigConfig},
+        publish_util::PackageHandler,
+    },
+    EntryPoints,
+};
 use aptos_types::{
     account_address::{default_stake_pool_address, AccountAddress},
+    account_config::CORE_CODE_ADDRESS,
+    fee_statement::FeeStatement,
     transaction::{EntryFunction, TransactionPayload},
+    vm::configs::set_paranoid_type_checks,
 };
-use aptos_vm::AptosVM;
 use move_core_types::{identifier::Identifier, language_storage::ModuleId};
+use rand::{rngs::StdRng, SeedableRng};
+use sha3::{Digest, Sha3_512};
 use std::path::Path;
 
+#[test]
+fn test_modify_gas_schedule_check_hash() {
+    let mut harness = MoveHarness::new();
+
+    let mut gas_schedule = harness.get_gas_schedule();
+    let old_hash = Sha3_512::digest(&bcs::to_bytes(&gas_schedule).unwrap()).to_vec();
+
+    const MAGIC: u64 = 42424242;
+
+    let (_, val) = gas_schedule
+        .entries
+        .iter_mut()
+        .find(|(name, _)| name == "instr.nop")
+        .unwrap();
+    assert_ne!(*val, MAGIC);
+    *val = MAGIC;
+
+    harness.executor.exec(
+        "gas_schedule",
+        "set_for_next_epoch_check_hash",
+        vec![],
+        vec![
+            bcs::to_bytes(&CORE_CODE_ADDRESS).unwrap(),
+            bcs::to_bytes(&old_hash).unwrap(),
+            bcs::to_bytes(&bcs::to_bytes(&gas_schedule).unwrap()).unwrap(),
+        ],
+    );
+
+    harness
+        .executor
+        .exec("reconfiguration_with_dkg", "finish", vec![], vec![
+            bcs::to_bytes(&CORE_CODE_ADDRESS).unwrap(),
+        ]);
+
+    let (_, gas_params) = harness.get_gas_params();
+    assert_eq!(gas_params.vm.instr.nop, MAGIC.into());
+}
+
 fn save_profiling_results(name: &str, log: &TransactionGasLog) {
     let path = Path::new("gas-profiling").join(name);
     log.generate_html_report(path, format!("Gas Report - {}", name))
         .unwrap();
 }
 
+pub struct SummaryExeAndIO {
+    pub intrinsic_cost: f64,
+    pub execution_cost: f64,
+    pub read_cost: f64,
+    pub write_cost: f64,
+}
+
+fn summarize_exe_and_io(log: TransactionGasLog) -> SummaryExeAndIO {
+    fn cast<T>(gas: GasQuantity<T>) -> f64 {
+        u64::from(gas) as f64
+    }
+
+    let scale = cast(log.exec_io.gas_scaling_factor);
+
+    let aggregated = log.exec_io.aggregate_gas_events();
+
+    let execution = aggregated.ops.iter().map(|(_, _, v)| cast(*v)).sum::<f64>();
+    let read = aggregated
+        .storage_reads
+        .iter()
+        .map(|(_, _, v)| cast(*v))
+        .sum::<f64>();
+    let write = aggregated
+        .storage_writes
+        .iter()
+        .map(|(_, _, v)| cast(*v))
+        .sum::<f64>();
+    SummaryExeAndIO {
+        intrinsic_cost: cast(log.exec_io.intrinsic_cost) / scale,
+        execution_cost: execution / scale,
+        read_cost: read / scale,
+        write_cost: write / scale,
+    }
+}
+
+struct Runner {
+    pub harness: MoveHarness,
+    profile_gas: bool,
+}
+
+impl Runner {
+    pub fn run(&mut self, function: &str, account: &Account, payload: TransactionPayload) {
+        if !self.profile_gas {
+            print_gas_cost(function, self.harness.evaluate_gas(account, payload));
+        } else {
+            let (log, gas_used, fee_statement) =
+                self.harness.evaluate_gas_with_profiler(account, payload);
+            save_profiling_results(function, &log);
+            print_gas_cost_with_statement(function, gas_used, fee_statement);
+        }
+    }
+
+    pub fn run_with_tps_estimate(
+        &mut self,
+        function: &str,
+        account: &Account,
+        payload: TransactionPayload,
+        tps: f64,
+    ) {
+        if !self.profile_gas {
+            print_gas_cost(function, self.harness.evaluate_gas(account, payload));
+        } else {
+            let (log, gas_used, fee_statement) =
+                self.harness.evaluate_gas_with_profiler(account, payload);
+            save_profiling_results(function, &log);
+            print_gas_cost_with_statement_and_tps(
+                function,
+                gas_used,
+                fee_statement,
+                summarize_exe_and_io(log),
+                tps,
+            );
+        }
+    }
+
+    pub fn publish(&mut self, name: &str, account: &Account, path: &Path) {
+        if !self.profile_gas {
+            print_gas_cost(name, self.harness.evaluate_publish_gas(account, path));
+        } else {
+            let (log, gas_used, fee_statement) = self
+                .harness
+                .evaluate_publish_gas_with_profiler(account, path);
+            save_profiling_results(name, &log);
+            print_gas_cost_with_statement(name, gas_used, fee_statement);
+        }
+    }
+}
+
 /// Run with `cargo test test_gas -- --nocapture` to see output.
 #[test]
 fn test_gas() {
@@ -51,52 +190,34 @@ fn test_gas() {
         Err(_) => true,
     };
 
-    let run = |harness: &mut MoveHarness, function, account, payload| {
-        if !profile_gas {
-            print_gas_cost(function, harness.evaluate_gas(account, payload));
-        } else {
-            let (log, gas_used) = harness.evaluate_gas_with_profiler(account, payload);
-            save_profiling_results(function, &log);
-            print_gas_cost(function, gas_used);
-        }
+    let mut runner = Runner {
+        harness,
+        profile_gas,
     };
 
-    let publish = |harness: &mut MoveHarness, name, account, path: &Path| {
-        if !profile_gas {
-            print_gas_cost(name, harness.evaluate_publish_gas(account, path));
-        } else {
-            let (log, gas_used) = harness.evaluate_publish_gas_with_profiler(account, path);
-            save_profiling_results(name, &log);
-            print_gas_cost(name, gas_used);
-        }
-    };
-
-    AptosVM::set_paranoid_type_checks(true);
+    set_paranoid_type_checks(true);
 
-    run(
-        &mut harness,
+    runner.run(
         "Transfer",
         account_1,
         aptos_stdlib::aptos_coin_transfer(account_2_address, 1000),
     );
 
-    run(
-        &mut harness,
+    runner.run(
         "2ndTransfer",
         account_1,
         aptos_stdlib::aptos_coin_transfer(account_2_address, 1000),
     );
 
-    run(
-        &mut harness,
+    runner.run(
         "CreateAccount",
         account_1,
         aptos_stdlib::aptos_account_create_account(
             AccountAddress::from_hex_literal("0xcafe1").unwrap(),
         ),
     );
-    run(
-        &mut harness,
+
+    runner.run(
         "CreateTransfer",
         account_1,
         aptos_stdlib::aptos_account_transfer(
@@ -105,35 +226,30 @@ fn test_gas() {
         ),
     );
 
-    publish_object_token_example(&mut harness, account_1_address, account_1);
-    run(
-        &mut harness,
+    publish_object_token_example(&mut runner.harness, account_1_address, account_1);
+    runner.run(
         "MintTokenV2",
         account_1,
         create_mint_hero_payload(&account_1_address, SHORT_STR),
     );
-    run(
-        &mut harness,
+    runner.run(
         "MutateTokenV2",
         account_1,
         create_set_hero_description_payload(&account_1_address, SHORT_STR),
     );
-    publish_object_token_example(&mut harness, account_2_address, account_2);
-    run(
-        &mut harness,
+    publish_object_token_example(&mut runner.harness, account_2_address, account_2);
+    runner.run(
         "MintLargeTokenV2",
         account_2,
         create_mint_hero_payload(&account_2_address, LONG_STR),
     );
-    run(
-        &mut harness,
+    runner.run(
         "MutateLargeTokenV2",
         account_2,
         create_set_hero_description_payload(&account_2_address, LONG_STR),
     );
 
-    run(
-        &mut harness,
+    runner.run(
         "CreateStakePool",
         account_1,
         aptos_stdlib::staking_contract_create_staking_contract(
@@ -150,8 +266,7 @@ fn test_gas() {
     let proof_of_possession = bls12381::ProofOfPossession::create(&consensus_key)
         .to_bytes()
         .to_vec();
-    run(
-        &mut harness,
+    runner.run(
         "RotateConsensusKey",
         account_2,
         aptos_stdlib::stake_rotate_consensus_key(
@@ -160,42 +275,36 @@ fn test_gas() {
             proof_of_possession,
         ),
     );
-    run(
-        &mut harness,
+    runner.run(
         "JoinValidator100",
         account_2,
         aptos_stdlib::stake_join_validator_set(pool_address),
     );
-    run(
-        &mut harness,
+    runner.run(
         "AddStake",
         account_1,
         aptos_stdlib::staking_contract_add_stake(account_2_address, 1000),
     );
-    run(
-        &mut harness,
+    runner.run(
         "UnlockStake",
         account_1,
         aptos_stdlib::staking_contract_unlock_stake(account_2_address, 1000),
     );
-    harness.fast_forward(7200);
-    harness.new_epoch();
-    run(
-        &mut harness,
+    runner.harness.fast_forward(7200);
+    runner.harness.new_epoch();
+    runner.run(
         "WithdrawStake",
         account_1,
         aptos_stdlib::staking_contract_distribute(account_1_address, account_2_address),
     );
-    run(
-        &mut harness,
+    runner.run(
         "LeaveValidatorSet100",
         account_2,
         aptos_stdlib::stake_leave_validator_set(pool_address),
     );
     let collection_name = "collection name".to_owned().into_bytes();
     let token_name = "token name".to_owned().into_bytes();
-    run(
-        &mut harness,
+    runner.run(
         "CreateCollection",
         account_1,
         aptos_token_sdk_builder::token_create_collection_script(
@@ -206,8 +315,7 @@ fn test_gas() {
             vec![false, false, false],
         ),
     );
-    run(
-        &mut harness,
+    runner.run(
         "CreateTokenFirstTime",
         account_1,
         aptos_token_sdk_builder::token_create_token_script(
@@ -226,8 +334,7 @@ fn test_gas() {
             vec!["int".as_bytes().to_vec()],
         ),
     );
-    run(
-        &mut harness,
+    runner.run(
         "MintTokenV1",
         account_1,
         aptos_token_sdk_builder::token_mint_script(
@@ -237,8 +344,7 @@ fn test_gas() {
             1,
         ),
     );
-    run(
-        &mut harness,
+    runner.run(
         "MutateTokenV1",
         account_1,
         aptos_token_sdk_builder::token_mutate_token_properties(
@@ -253,9 +359,8 @@ fn test_gas() {
             vec!["int".as_bytes().to_vec()],
         ),
     );
-    run(
-        &mut harness,
-        "MutateTokenV12ndTime",
+    runner.run(
+        "MutateToken2ndTime",
         account_1,
         aptos_token_sdk_builder::token_mutate_token_properties(
             account_1_address,
@@ -278,8 +383,7 @@ fn test_gas() {
         vals.push(format!("{}", i).as_bytes().to_vec());
         typs.push("u64".as_bytes().to_vec());
     }
-    run(
-        &mut harness,
+    runner.run(
         "MutateTokenAdd10NewProperties",
         account_1,
         aptos_token_sdk_builder::token_mutate_token_properties(
@@ -294,8 +398,7 @@ fn test_gas() {
             typs.clone(),
         ),
     );
-    run(
-        &mut harness,
+    runner.run(
         "MutateTokenMutate10ExistingProperties",
         account_1,
         aptos_token_sdk_builder::token_mutate_token_properties(
@@ -311,51 +414,46 @@ fn test_gas() {
         ),
     );
 
-    let publisher = &harness.new_account_at(AccountAddress::from_hex_literal("0xcafe").unwrap());
-    publish(
-        &mut harness,
+    let publisher = &runner
+        .harness
+        .new_account_at(AccountAddress::from_hex_literal("0xcafe").unwrap());
+    runner.publish(
         "PublishSmall",
         publisher,
         &test_dir_path("code_publishing.data/pack_initial"),
     );
-    publish(
-        &mut harness,
+    runner.publish(
         "UpgradeSmall",
         publisher,
         &test_dir_path("code_publishing.data/pack_upgrade_compat"),
     );
-    publish(
-        &mut harness,
+    let publisher = &runner.harness.aptos_framework_account();
+    runner.publish(
         "PublishLarge",
         publisher,
         &test_dir_path("code_publishing.data/pack_large"),
     );
-    publish(
-        &mut harness,
+    runner.publish(
         "UpgradeLarge",
         publisher,
         &test_dir_path("code_publishing.data/pack_large_upgrade"),
     );
-    publish(
-        &mut harness,
+    runner.publish(
         "PublishDependencyChain-1",
         publisher,
         &test_dir_path("dependencies.data/p1"),
     );
-    publish(
-        &mut harness,
+    runner.publish(
         "PublishDependencyChain-2",
         publisher,
         &test_dir_path("dependencies.data/p2"),
     );
-    publish(
-        &mut harness,
+    runner.publish(
         "PublishDependencyChain-3",
         publisher,
         &test_dir_path("dependencies.data/p3"),
     );
-    run(
-        &mut harness,
+    runner.run(
         "UseDependencyChain-1",
         publisher,
         TransactionPayload::EntryFunction(EntryFunction::new(
@@ -368,8 +466,7 @@ fn test_gas() {
             vec![],
         )),
     );
-    run(
-        &mut harness,
+    runner.run(
         "UseDependencyChain-2",
         publisher,
         TransactionPayload::EntryFunction(EntryFunction::new(
@@ -382,8 +479,7 @@ fn test_gas() {
             vec![],
         )),
     );
-    run(
-        &mut harness,
+    runner.run(
         "UseDependencyChain-3",
         publisher,
         TransactionPayload::EntryFunction(EntryFunction::new(
@@ -404,12 +500,240 @@ fn dollar_cost(gas_units: u64, price: u64) -> f64 {
 
 pub fn print_gas_cost(function: &str, gas_units: u64) {
     println!(
-        "{:20} | {:8} | {:.6} | {:.6} | {:.6}",
+        "{:8} | {:.6} | {:.6} | {:.6} | {}",
+        gas_units,
+        dollar_cost(gas_units, 5),
+        dollar_cost(gas_units, 15),
+        dollar_cost(gas_units, 30),
         function,
+    );
+}
+
+pub fn print_gas_cost_with_statement(
+    function: &str,
+    gas_units: u64,
+    fee_statement: Option<FeeStatement>,
+) {
+    println!(
+        "{:8} | {:.6} | {:.6} | {:.6} | {:8} | {:8} | {:8} | {}",
         gas_units,
         dollar_cost(gas_units, 5),
         dollar_cost(gas_units, 15),
-        dollar_cost(gas_units, 30)
+        dollar_cost(gas_units, 30),
+        fee_statement.unwrap().execution_gas_used() + fee_statement.unwrap().io_gas_used(),
+        fee_statement.unwrap().execution_gas_used(),
+        fee_statement.unwrap().io_gas_used(),
+        function,
+    );
+}
+
+pub fn print_gas_cost_with_statement_and_tps_header() {
+    println!(
+        "{:9} | {:9.6} | {:9.6} | {:9.6} | {:8} | {:8} | {:8} | {:8} | {:8} | {:8} | {:10}",
+        "gas units",
+        "$ at 5",
+        "$ at 15",
+        "$ at 30",
+        "exe+io g",
+        // "exe gas",
+        // "io gas",
+        "intrins",
+        "execut",
+        "read",
+        "write",
+        "gas / s",
+        "function",
+    );
+}
+
+pub fn print_gas_cost_with_statement_and_tps(
+    function: &str,
+    gas_units: u64,
+    fee_statement: Option<FeeStatement>,
+    summary: SummaryExeAndIO,
+    tps: f64,
+) {
+    println!(
+        "{:9} | {:9.6} | {:9.6} | {:9.6} | {:8} | {:8.2} | {:8.2} | {:8.2} | {:8.2} | {:8.0} | {}",
+        gas_units,
+        dollar_cost(gas_units, 5),
+        dollar_cost(gas_units, 15),
+        dollar_cost(gas_units, 30),
+        fee_statement.unwrap().execution_gas_used() + fee_statement.unwrap().io_gas_used(),
+        // fee_statement.unwrap().execution_gas_used(),
+        // fee_statement.unwrap().io_gas_used(),
+        summary.intrinsic_cost,
+        summary.execution_cost,
+        summary.read_cost,
+        summary.write_cost,
+        (fee_statement.unwrap().execution_gas_used() + fee_statement.unwrap().io_gas_used()) as f64
+            * tps,
+        function,
+    );
+}
+
+#[test]
+#[ignore]
+fn test_txn_generator_workloads_calibrate_gas() {
+    // Start with 100 validators.
+    let mut harness = MoveHarness::new_with_validators(100);
+    let account_1 = &harness.new_account_at(AccountAddress::from_hex_literal("0x121").unwrap());
+    let account_2 = &harness.new_account_at(AccountAddress::from_hex_literal("0x122").unwrap());
+    let account_2_address = *account_2.address();
+
+    // Use the gas profiler unless explicitly disabled by the user.
+    //
+    // This is to give us some basic code coverage on the gas profile.
+    let profile_gas = match std::env::var("PROFILE_GAS") {
+        Ok(s) => {
+            let s = s.to_lowercase();
+            s == "1" && s == "true" && s == "yes"
+        },
+        Err(_) => true,
+    };
+
+    let mut runner = Runner {
+        harness,
+        profile_gas,
+    };
+
+    set_paranoid_type_checks(true);
+
+    print_gas_cost_with_statement_and_tps_header();
+
+    let use_large_db_numbers = true;
+
+    // Constants here are produced from running
+    //   NUMBER_OF_EXECUTION_THREADS=1 testsuite/single_node_performance.py
+    // on a prod-spec'd machine.
+    let entry_points = vec![
+        (2963., 4103., EntryPoints::Nop),
+        (2426., 3411., EntryPoints::BytesMakeOrChange {
+            data_length: Some(32),
+        }),
+        (2388., 3270., EntryPoints::IncGlobal),
+        (27., 28., EntryPoints::Loop {
+            loop_count: Some(100000),
+            loop_type: LoopType::NoOp,
+        }),
+        (44., 42., EntryPoints::Loop {
+            loop_count: Some(10000),
+            loop_type: LoopType::Arithmetic,
+        }),
+        // This is a cheap bcs (serializing vec<u8>), so not representative of what BCS native call should cost.
+        // (175., EntryPoints::Loop { loop_count: Some(1000), loop_type: LoopType::BCS { len: 1024 }}),
+        (666., 1031., EntryPoints::CreateObjects {
+            num_objects: 10,
+            object_payload_size: 0,
+        }),
+        (103., 108., EntryPoints::CreateObjects {
+            num_objects: 10,
+            object_payload_size: 10 * 1024,
+        }),
+        (93., 148., EntryPoints::CreateObjects {
+            num_objects: 100,
+            object_payload_size: 0,
+        }),
+        (43., 50., EntryPoints::CreateObjects {
+            num_objects: 100,
+            object_payload_size: 10 * 1024,
+        }),
+        (1605., 2100., EntryPoints::InitializeVectorPicture {
+            length: 40,
+        }),
+        (2850., 3400., EntryPoints::VectorPicture { length: 40 }),
+        (2900., 3480., EntryPoints::VectorPictureRead { length: 40 }),
+        (30., 31., EntryPoints::InitializeVectorPicture {
+            length: 30 * 1024,
+        }),
+        (169., 180., EntryPoints::VectorPicture { length: 30 * 1024 }),
+        (189., 200., EntryPoints::VectorPictureRead {
+            length: 30 * 1024,
+        }),
+        (22., 17.8, EntryPoints::SmartTablePicture {
+            length: 30 * 1024,
+            num_points_per_txn: 200,
+        }),
+        (3., 2.75, EntryPoints::SmartTablePicture {
+            length: 1024 * 1024,
+            num_points_per_txn: 1024,
+        }),
+        (1351., 1719., EntryPoints::TokenV1MintAndTransferFT),
+        (
+            971.,
+            1150.,
+            EntryPoints::TokenV1MintAndTransferNFTSequential,
+        ),
+        (1077., 1274., EntryPoints::TokenV2AmbassadorMint {
+            numbered: true,
+        }),
+    ];
+
+    for (large_db_tps, small_db_tps, entry_point) in &entry_points {
+        if let MultiSigConfig::None = entry_point.multi_sig_additional_num() {
+            let publisher = runner.harness.new_account_with_key_pair();
+            let user = runner.harness.new_account_with_key_pair();
+
+            let mut package_handler = PackageHandler::new(entry_point.package_name());
+            let mut rng = StdRng::seed_from_u64(14);
+            let package = package_handler.pick_package(&mut rng, *publisher.address());
+            runner
+                .harness
+                .run_transaction_payload(&publisher, package.publish_transaction_payload());
+            if let Some(init_entry_point) = entry_point.initialize_entry_point() {
+                runner.harness.run_transaction_payload(
+                    &publisher,
+                    init_entry_point.create_payload(
+                        package.get_module_id(init_entry_point.module_name()),
+                        Some(&mut rng),
+                        Some(publisher.address()),
+                    ),
+                );
+            }
+
+            runner.run_with_tps_estimate(
+                &format!("entry_point_{entry_point:?}"),
+                &user,
+                entry_point.create_payload(
+                    package.get_module_id(entry_point.module_name()),
+                    Some(&mut rng),
+                    Some(publisher.address()),
+                ),
+                if use_large_db_numbers {
+                    *large_db_tps
+                } else {
+                    *small_db_tps
+                },
+            );
+        } else {
+            println!("Skipping multisig {entry_point:?}");
+        }
+    }
+
+    runner.run_with_tps_estimate(
+        "Transfer",
+        account_1,
+        aptos_stdlib::aptos_coin_transfer(account_2_address, 1000),
+        if use_large_db_numbers { 2032. } else { 2791. },
+    );
+
+    runner.run_with_tps_estimate(
+        "CreateAccount",
+        account_1,
+        aptos_stdlib::aptos_account_create_account(
+            AccountAddress::from_hex_literal("0xcafe1").unwrap(),
+        ),
+        if use_large_db_numbers { 1583.0 } else { 2215. },
+    );
+
+    let mut package_handler = PackageHandler::new("simple");
+    let mut rng = StdRng::seed_from_u64(14);
+    let package = package_handler.pick_package(&mut rng, *account_1.address());
+    runner.run_with_tps_estimate(
+        "PublishModule",
+        account_1,
+        package.publish_transaction_payload(),
+        if use_large_db_numbers { 138.0 } else { 148. },
     );
 }
 
diff --git a/aptos-move/e2e-move-tests/src/tests/lazy_natives.rs b/aptos-move/e2e-move-tests/src/tests/lazy_natives.rs
index 6910f79b48754..4e78b63085c02 100644
--- a/aptos-move/e2e-move-tests/src/tests/lazy_natives.rs
+++ b/aptos-move/e2e-move-tests/src/tests/lazy_natives.rs
@@ -3,14 +3,15 @@
 
 use crate::{assert_success, assert_vm_status, MoveHarness};
 use aptos_package_builder::PackageBuilder;
-use aptos_types::account_address::AccountAddress;
+use aptos_types::{account_address::AccountAddress, on_chain_config::FeatureFlag};
 use move_core_types::vm_status::StatusCode;
 
 #[test]
 fn lazy_natives() {
     let mut h = MoveHarness::new();
     let acc = h.new_account_at(AccountAddress::from_hex_literal("0xcafe").unwrap());
-
+    // Set flag to publish the package.
+    h.enable_features(vec![], vec![FeatureFlag::DISALLOW_USER_NATIVES]);
     let mut builder = PackageBuilder::new("LazyNatives");
     builder.add_source(
         "test",
@@ -28,6 +29,7 @@ module 0xcafe::test {
     // Should be able to publish with unbound native.
     assert_success!(h.publish_package(&acc, dir.path()));
 
+    h.enable_features(vec![], vec![FeatureFlag::DISALLOW_USER_NATIVES]);
     // Should be able to call nothing entry
     assert_success!(h.run_entry_function(
         &acc,
diff --git a/aptos-move/e2e-move-tests/src/tests/metadata.rs b/aptos-move/e2e-move-tests/src/tests/metadata.rs
index 7c499fe762bcd..60037dbb08518 100644
--- a/aptos-move/e2e-move-tests/src/tests/metadata.rs
+++ b/aptos-move/e2e-move-tests/src/tests/metadata.rs
@@ -14,7 +14,7 @@ use aptos_package_builder::PackageBuilder;
 use aptos_types::{
     chain_id::ChainId,
     on_chain_config::{FeatureFlag, OnChainConfig},
-    transaction::TransactionStatus,
+    transaction::{Script, TransactionPayload, TransactionStatus},
 };
 use move_binary_format::CompiledModule;
 use move_core_types::{
@@ -269,6 +269,118 @@ fn test_compilation_metadata_internal(
     }
 }
 
+fn test_compilation_metadata_script_internal(
+    mainnet_flag: bool,
+    v2_flag: bool,
+    feature_enabled: bool,
+) -> TransactionStatus {
+    let mut h = MoveHarness::new();
+    if feature_enabled {
+        h.enable_features(
+            vec![FeatureFlag::REJECT_UNSTABLE_BYTECODE_FOR_SCRIPT],
+            vec![],
+        );
+    } else {
+        h.enable_features(vec![], vec![
+            FeatureFlag::REJECT_UNSTABLE_BYTECODE_FOR_SCRIPT,
+        ]);
+    }
+    let account = h.new_account_at(AccountAddress::from_hex_literal("0xf00d").unwrap());
+    let mut builder = PackageBuilder::new("Package");
+    builder.add_source(
+        "m.move",
+        r#"
+        script {
+            fun main() { }
+        }
+        "#,
+    );
+    let path = builder.write_to_temp().unwrap();
+
+    let compiler_version = if v2_flag {
+        CompilerVersion::V2_0
+    } else {
+        CompilerVersion::V1
+    };
+    let package = build_package_with_compiler_version(
+        path.path().to_path_buf(),
+        BuildOptions::default(),
+        compiler_version,
+    )
+    .expect("building package must succeed");
+
+    let code = package.extract_script_code().into_iter().next().unwrap();
+
+    let script = TransactionPayload::Script(Script::new(code, vec![], vec![]));
+
+    if mainnet_flag {
+        h.set_resource(
+            CORE_CODE_ADDRESS,
+            ChainId::struct_tag(),
+            &ChainId::mainnet().id(),
+        );
+        h.run_transaction_payload_mainnet(&account, script)
+    } else {
+        h.run_transaction_payload(&account, script)
+    }
+}
+
+#[test]
+fn test_compilation_metadata_for_script() {
+    let mut enable_check = true;
+    // run compiler v2 code to mainnet
+    assert_vm_status!(
+        test_compilation_metadata_script_internal(true, true, enable_check),
+        StatusCode::UNSTABLE_BYTECODE_REJECTED
+    );
+    // run compiler v1 code to mainnet
+    assert_success!(test_compilation_metadata_script_internal(
+        true,
+        false,
+        enable_check
+    ));
+    // run compiler v2 code to test
+    assert_success!(test_compilation_metadata_script_internal(
+        false,
+        true,
+        enable_check
+    ));
+    // run compiler v1 code to test
+    assert_success!(test_compilation_metadata_script_internal(
+        false,
+        false,
+        enable_check
+    ));
+
+    enable_check = false;
+    // run compiler v2 code to mainnet
+    // success because the feature flag is turned off
+    assert_success!(test_compilation_metadata_script_internal(
+        true,
+        true,
+        enable_check
+    ),);
+    // run compiler v1 code to mainnet
+    assert_success!(test_compilation_metadata_script_internal(
+        true,
+        false,
+        enable_check
+    ));
+    // run compiler v2 code to test
+    // success because the feature flag is turned off
+    assert_success!(test_compilation_metadata_script_internal(
+        false,
+        true,
+        enable_check
+    ),);
+    // run compiler v1 code to test
+    assert_success!(test_compilation_metadata_script_internal(
+        false,
+        false,
+        enable_check
+    ));
+}
+
 #[test]
 fn test_compilation_metadata() {
     let mut enable_check = true;
diff --git a/aptos-move/e2e-move-tests/src/tests/mod.rs b/aptos-move/e2e-move-tests/src/tests/mod.rs
index c407d74e82e47..bf9fcc708bf2c 100644
--- a/aptos-move/e2e-move-tests/src/tests/mod.rs
+++ b/aptos-move/e2e-move-tests/src/tests/mod.rs
@@ -13,6 +13,7 @@ mod code_publishing;
 mod common;
 mod constructor_args;
 mod dependencies;
+mod enum_upgrade;
 mod error_map;
 mod fee_payer;
 mod fungible_asset;
@@ -29,6 +30,7 @@ mod metadata;
 mod mint_nft;
 mod missing_gas_parameter;
 mod module_event;
+mod move_feature_gating;
 mod new_integer_types;
 mod nft_dao;
 mod object_code_deployment;
diff --git a/aptos-move/e2e-move-tests/src/tests/move_feature_gating.rs b/aptos-move/e2e-move-tests/src/tests/move_feature_gating.rs
new file mode 100644
index 0000000000000..0445fcc1a05ee
--- /dev/null
+++ b/aptos-move/e2e-move-tests/src/tests/move_feature_gating.rs
@@ -0,0 +1,78 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+//! Tests for gating of Move language features
+
+// Note: this module uses parameterized tests via the
+// [`rstest` crate](https://crates.io/crates/rstest)
+// to test for multiple feature combinations.
+
+use crate::{assert_success, assert_vm_status, MoveHarness};
+use aptos_framework::BuildOptions;
+use aptos_package_builder::PackageBuilder;
+use aptos_types::{account_address::AccountAddress, on_chain_config::FeatureFlag};
+use move_core_types::vm_status::StatusCode;
+use rstest::rstest;
+
+#[rstest(enabled, disabled,
+    case(vec![], vec![FeatureFlag::ENABLE_ENUM_TYPES]),
+    case(vec![FeatureFlag::ENABLE_ENUM_TYPES], vec![]),
+)]
+fn enum_types(enabled: Vec<FeatureFlag>, disabled: Vec<FeatureFlag>) {
+    let positive_test = !enabled.is_empty();
+    let mut h = MoveHarness::new_with_features(enabled, disabled);
+    let acc = h.new_account_at(AccountAddress::from_hex_literal("0x815").unwrap());
+
+    let mut builder = PackageBuilder::new("Package");
+    let source = r#"
+        module 0x815::m {
+            enum E { Black, White }
+            fun dark(e: E): bool {
+                match (e) {
+                    Black => true,
+                    White => false
+                }
+            }
+        }
+    "#;
+    builder.add_source("m.move", source);
+    let path = builder.write_to_temp().unwrap();
+    let result = h.publish_package_with_options(&acc, path.path(), BuildOptions::move_2());
+    if positive_test {
+        assert_success!(result);
+    } else {
+        assert_vm_status!(result, StatusCode::FEATURE_NOT_ENABLED)
+    }
+}
+
+#[rstest(enabled, disabled,
+    case(vec![], vec![FeatureFlag::ENABLE_RESOURCE_ACCESS_CONTROL]),
+    case(vec![FeatureFlag::ENABLE_RESOURCE_ACCESS_CONTROL], vec![]),
+)]
+fn resource_access_control(enabled: Vec<FeatureFlag>, disabled: Vec<FeatureFlag>) {
+    let positive_test = !enabled.is_empty();
+    let mut h = MoveHarness::new_with_features(enabled, disabled);
+    let acc = h.new_account_at(AccountAddress::from_hex_literal("0x815").unwrap());
+
+    let mut builder = PackageBuilder::new("Package");
+    let source = r#"
+        module 0x815::m {
+            struct R has key, copy {}
+            fun read(a: address): R reads R {
+                *borrow_global<R>(a)
+            }
+        }
+    "#;
+    builder.add_source("m.move", source);
+    let path = builder.write_to_temp().unwrap();
+    let result = h.publish_package_with_options(
+        &acc,
+        path.path(),
+        BuildOptions::move_2().with_experiment("gen-access-specifiers"),
+    );
+    if positive_test {
+        assert_success!(result);
+    } else {
+        assert_vm_status!(result, StatusCode::FEATURE_NOT_ENABLED);
+    }
+}
diff --git a/aptos-move/e2e-move-tests/src/tests/object_code_deployment.data/pack_immutable_deps/Move.toml b/aptos-move/e2e-move-tests/src/tests/object_code_deployment.data/pack_immutable_deps/Move.toml
new file mode 100644
index 0000000000000..4186d0d8aeb38
--- /dev/null
+++ b/aptos-move/e2e-move-tests/src/tests/object_code_deployment.data/pack_immutable_deps/Move.toml
@@ -0,0 +1,7 @@
+[package]
+name = "test_immutable_deps"
+version = "0.0.0"
+upgrade_policy = "compatible"
+
+[dependencies]
+test_package = { local = "../pack_initial_immutable" }
diff --git a/aptos-move/e2e-move-tests/src/tests/object_code_deployment.data/pack_immutable_deps/sources/test_immutable_deps.move b/aptos-move/e2e-move-tests/src/tests/object_code_deployment.data/pack_immutable_deps/sources/test_immutable_deps.move
new file mode 100644
index 0000000000000..201f5199b3cb6
--- /dev/null
+++ b/aptos-move/e2e-move-tests/src/tests/object_code_deployment.data/pack_immutable_deps/sources/test_immutable_deps.move
@@ -0,0 +1,10 @@
+module object_immutable_deps::test_immutable_deps {
+
+    struct State has key {
+        value: u64
+    }
+
+    public entry fun hello(s: &signer, value: u64) {
+        move_to(s, State { value })
+    }
+}
diff --git a/aptos-move/e2e-move-tests/src/tests/object_code_deployment.data/pack_mutable_deps/Move.toml b/aptos-move/e2e-move-tests/src/tests/object_code_deployment.data/pack_mutable_deps/Move.toml
new file mode 100644
index 0000000000000..4ea15e9ab2128
--- /dev/null
+++ b/aptos-move/e2e-move-tests/src/tests/object_code_deployment.data/pack_mutable_deps/Move.toml
@@ -0,0 +1,8 @@
+[package]
+name = "test_mutable_deps"
+version = "0.0.0"
+upgrade_policy = "compatible"
+
+[dependencies]
+AptosFramework = { local = "../../../../../framework/aptos-framework" }
+test_package = { local = "../pack_upgrade_compat" }
diff --git a/aptos-move/e2e-move-tests/src/tests/object_code_deployment.data/pack_mutable_deps/sources/test_mutable_deps.move b/aptos-move/e2e-move-tests/src/tests/object_code_deployment.data/pack_mutable_deps/sources/test_mutable_deps.move
new file mode 100644
index 0000000000000..14b5e20965ed3
--- /dev/null
+++ b/aptos-move/e2e-move-tests/src/tests/object_code_deployment.data/pack_mutable_deps/sources/test_mutable_deps.move
@@ -0,0 +1,10 @@
+module object_mutable_deps::test_mutable_deps {
+
+    struct State has key {
+        value: u64
+    }
+
+    public entry fun hello(s: &signer, value: u64) {
+        move_to(s, State { value })
+    }
+}
diff --git a/aptos-move/e2e-move-tests/src/tests/object_code_deployment.rs b/aptos-move/e2e-move-tests/src/tests/object_code_deployment.rs
index 4193816148e9e..b6677c5272e8d 100644
--- a/aptos-move/e2e-move-tests/src/tests/object_code_deployment.rs
+++ b/aptos-move/e2e-move-tests/src/tests/object_code_deployment.rs
@@ -74,7 +74,16 @@ impl TestContext {
         options
             .named_addresses
             .insert(MODULE_ADDRESS_NAME.to_string(), self.object_address);
+        self.execute_object_code_action_with_options(account, path, action, options)
+    }
 
+    fn execute_object_code_action_with_options(
+        &mut self,
+        account: &Account,
+        path: &str,
+        action: ObjectCodeAction,
+        options: BuildOptions,
+    ) -> TransactionStatus {
         match action {
             ObjectCodeAction::Deploy => self.harness.object_code_deployment_package(
                 account,
@@ -118,10 +127,13 @@ impl TestContext {
 }
 
 const MODULE_ADDRESS_NAME: &str = "object";
+const MUT_DEPS_MODULE_ADDRESS_NAME: &str = "object_mutable_deps";
+const IMMUT_DEPS_MODULE_ADDRESS_NAME: &str = "object_immutable_deps";
 const PACKAGE_REGISTRY_ACCESS_PATH: &str = "0x1::code::PackageRegistry";
 const EOBJECT_CODE_DEPLOYMENT_NOT_SUPPORTED: &str = "EOBJECT_CODE_DEPLOYMENT_NOT_SUPPORTED";
 const ENOT_CODE_OBJECT_OWNER: &str = "ENOT_CODE_OBJECT_OWNER";
 const ENOT_PACKAGE_OWNER: &str = "ENOT_PACKAGE_OWNER";
+const EDEP_WEAKER_POLICY: &str = "EDEP_WEAKER_POLICY";
 
 /// Tests the `publish` object code deployment function with feature flags enabled/disabled.
 /// Deployment should only happen when feature is enabled.
@@ -362,6 +374,75 @@ fn freeze_code_object_fail_when_not_owner() {
     context.assert_feature_flag_error(status, ENOT_PACKAGE_OWNER);
 }
 
+#[test]
+fn freeze_code_object_fail_when_having_mutable_dependency() {
+    let mut context = TestContext::new(None, None);
+    let acc = context.account.clone();
+
+    assert_success!(context.execute_object_code_action(
+        &acc,
+        "object_code_deployment.data/pack_upgrade_compat",
+        ObjectCodeAction::Deploy,
+    ));
+    let mut options = BuildOptions::default();
+    options
+        .named_addresses
+        .insert(MODULE_ADDRESS_NAME.to_string(), context.object_address);
+    let sequence_number = context.harness.sequence_number(acc.address());
+    context.object_address =
+        create_object_code_deployment_address(*acc.address(), sequence_number + 1);
+    options.named_addresses.insert(
+        MUT_DEPS_MODULE_ADDRESS_NAME.to_string(),
+        context.object_address,
+    );
+    assert_success!(context.execute_object_code_action_with_options(
+        &acc,
+        "object_code_deployment.data/pack_mutable_deps",
+        ObjectCodeAction::Deploy,
+        options
+    ));
+
+    // Freezing a package with upgradeable dependencies is not allowed.
+    let status = context.execute_object_code_action(&acc, "", ObjectCodeAction::Freeze);
+    context.assert_feature_flag_error(status, EDEP_WEAKER_POLICY);
+}
+
+#[test]
+fn freeze_code_object_succeeds_when_all_dependencies_immutable() {
+    let mut context = TestContext::new(None, None);
+    let acc = context.account.clone();
+
+    // Deploy immutable dependency package
+    assert_success!(context.execute_object_code_action(
+        &acc,
+        "object_code_deployment.data/pack_initial_immutable",
+        ObjectCodeAction::Deploy,
+    ));
+    let mut options = BuildOptions::default();
+    options
+        .named_addresses
+        .insert(MODULE_ADDRESS_NAME.to_string(), context.object_address);
+    let sequence_number = context.harness.sequence_number(acc.address());
+    context.object_address =
+        create_object_code_deployment_address(*acc.address(), sequence_number + 1);
+    options.named_addresses.insert(
+        IMMUT_DEPS_MODULE_ADDRESS_NAME.to_string(),
+        context.object_address,
+    );
+
+    // Deploy mutable package with immutable dependency
+    assert_success!(context.execute_object_code_action_with_options(
+        &acc,
+        "object_code_deployment.data/pack_immutable_deps",
+        ObjectCodeAction::Deploy,
+        options
+    ));
+
+    // Attempt to freeze the initial package
+    let status = context.execute_object_code_action(&acc, "", ObjectCodeAction::Freeze);
+    assert_success!(status);
+}
+
 #[test]
 fn freeze_code_object_fail_when_package_registry_does_not_exist() {
     let mut context = TestContext::new(None, None);
diff --git a/aptos-move/e2e-move-tests/src/tests/randomness.data/pack/sources/test.move b/aptos-move/e2e-move-tests/src/tests/randomness.data/pack/sources/test.move
index 463f9b000fc37..c78b7a686c789 100644
--- a/aptos-move/e2e-move-tests/src/tests/randomness.data/pack/sources/test.move
+++ b/aptos-move/e2e-move-tests/src/tests/randomness.data/pack/sources/test.move
@@ -17,7 +17,8 @@ module 0x1::test {
         let _ = randomness::u64_integer();
     }
 
-    entry fun fail_if_not_annotated_and_using_randomness() {
+    #[lint::allow_unsafe_randomness]
+    public entry fun fail_if_not_annotated_and_using_randomness() {
         let _ = randomness::u64_integer();
     }
 
diff --git a/aptos-move/e2e-move-tests/src/tests/randomness_test_and_abort.rs b/aptos-move/e2e-move-tests/src/tests/randomness_test_and_abort.rs
index 66317a136b737..7bba640e25add 100644
--- a/aptos-move/e2e-move-tests/src/tests/randomness_test_and_abort.rs
+++ b/aptos-move/e2e-move-tests/src/tests/randomness_test_and_abort.rs
@@ -6,18 +6,12 @@ use aptos_framework::BuiltPackage;
 use aptos_language_e2e_tests::account::{Account, TransactionBuilder};
 use aptos_types::{
     account_address::AccountAddress,
-    move_utils::{as_move_value::AsMoveValue, MemberId},
     on_chain_config::OnChainConfig,
     randomness::PerBlockRandomness,
     transaction::{ExecutionStatus, Script, TransactionStatus},
 };
-use claims::{assert_gt, assert_lt, assert_ok};
-use move_core_types::{
-    ident_str,
-    language_storage::ModuleId,
-    value::{serialize_values, MoveValue},
-    vm_status::AbortLocation,
-};
+use claims::assert_ok;
+use move_core_types::{ident_str, language_storage::ModuleId, vm_status::AbortLocation};
 
 // Error codes from randomness module.
 const E_API_USE_SUSCEPTIBLE_TO_TEST_AND_ABORT: u64 = 1;
@@ -129,70 +123,6 @@ fn test_unbiasable_annotation() {
     }
 }
 
-#[test]
-fn test_undergas_attack_prevention() {
-    let mut h = MoveHarness::new();
-    deploy_code(AccountAddress::ONE, "randomness.data/pack", &mut h)
-        .expect("building package must succeed");
-    set_randomness_seed(&mut h);
-
-    h.set_default_gas_unit_price(100);
-    h.set_max_gas_per_txn(10000); // Should match the default required gas amount.
-
-    // A function to send some amount to 2 people where how to split between the 2 is randomized.
-    let func: MemberId = str::parse("0x1::test::transfer_lucky_money").unwrap();
-    let recipient_0 = h.new_account_with_balance_and_sequence_number(0, 11);
-    let recipient_1 = h.new_account_with_balance_and_sequence_number(0, 12);
-
-    // A txn should be discarded if the sender balance is not enough to pay required deposit: 0.01 APT or 1_000_000 octa.
-    let sender = h.new_account_with_balance_and_sequence_number(999_999, 123);
-    let args = vec![
-        1000_u64.as_move_value(),
-        MoveValue::Address(*recipient_0.address()),
-        MoveValue::Address(*recipient_1.address()),
-    ];
-    println!("3 max_gas_per_txn={}", h.max_gas_per_txn);
-    let status = h.run_entry_function(&sender, func.clone(), vec![], serialize_values(&args));
-    assert!(status.is_discarded());
-    assert_eq!(999_999_u64, h.read_aptos_balance(sender.address()));
-    assert_eq!(0, h.read_aptos_balance(recipient_0.address()));
-    assert_eq!(0, h.read_aptos_balance(recipient_1.address()));
-
-    // A txn should abort but be kept if the sender doesn't have enough balance to complete the transfer.
-    let sender = h.new_account_with_balance_and_sequence_number(1_001_000_000, 456);
-    let args = vec![
-        1_000_000_999_u64.as_move_value(), // 999 more than what sender has after prologue.
-        MoveValue::Address(*recipient_0.address()),
-        MoveValue::Address(*recipient_1.address()),
-    ];
-    let status = h.run_entry_function(&sender, func.clone(), vec![], serialize_values(&args));
-    let status = assert_ok!(status.as_kept_status());
-    assert!(matches!(status, ExecutionStatus::MoveAbort { .. }));
-    let sender_balance = h.read_aptos_balance(sender.address());
-    assert_gt!(sender_balance, 1_000_000); // At least the locked amount will be returned.
-    assert_lt!(sender_balance, 1_001_000_000); // Sender lost gas fee.
-    assert_eq!(0, h.read_aptos_balance(recipient_0.address()));
-    assert_eq!(0, h.read_aptos_balance(recipient_1.address()));
-
-    // Otherwise, the txn should finish normally.
-    let sender = h.new_account_with_balance_and_sequence_number(1_001_000_000, 789);
-    let args = vec![
-        500_000_000_u64.as_move_value(), // half of what sender has after prologue.
-        MoveValue::Address(*recipient_0.address()),
-        MoveValue::Address(*recipient_1.address()),
-    ];
-    let status = h.run_entry_function(&sender, func.clone(), vec![], serialize_values(&args));
-    let status = assert_ok!(status.as_kept_status());
-    assert!(matches!(status, ExecutionStatus::Success));
-    let sender_balance = h.read_aptos_balance(sender.address());
-    assert_gt!(sender_balance, 1_000_000); // At least the locked amount will be returned.
-    assert_lt!(sender_balance, 501_000_000); // Sender lost 500_000_000 + gas fee.
-    assert_eq!(
-        500_000_000,
-        h.read_aptos_balance(recipient_0.address()) + h.read_aptos_balance(recipient_1.address())
-    );
-}
-
 fn set_randomness_seed(h: &mut MoveHarness) {
     let fx = h.aptos_framework_account();
     let mut pbr = h
diff --git a/aptos-move/e2e-move-tests/src/tests/script_with_object_param.data/pack/Move.toml b/aptos-move/e2e-move-tests/src/tests/script_with_object_param.data/pack/Move.toml
new file mode 100644
index 0000000000000..a0d65dc6e9aad
--- /dev/null
+++ b/aptos-move/e2e-move-tests/src/tests/script_with_object_param.data/pack/Move.toml
@@ -0,0 +1,10 @@
+[package]
+name = "test"
+version = "0.0.0"
+
+[addresses]
+example_addr = "_"
+
+[dependencies]
+AptosFramework = { local = "../../../../../framework/aptos-framework" }
+ManagedFungibleAsset =  { local = "../../../../../move-examples/fungible_asset/managed_fungible_asset" }
\ No newline at end of file
diff --git a/aptos-move/e2e-move-tests/src/tests/script_with_object_param.data/pack/sources/test.move b/aptos-move/e2e-move-tests/src/tests/script_with_object_param.data/pack/sources/test.move
new file mode 100644
index 0000000000000..ebdf472b0b190
--- /dev/null
+++ b/aptos-move/e2e-move-tests/src/tests/script_with_object_param.data/pack/sources/test.move
@@ -0,0 +1,15 @@
+script {
+    use aptos_framework::fungible_asset::Metadata;
+    use aptos_framework::object::Object;
+    use example_addr::managed_fungible_asset::transfer_between_primary_stores;
+
+    fun main(
+        admin: &signer,
+        asset: Object<Metadata>,
+        from: vector<address>,
+        to: vector<address>,
+        amounts: vector<u64>,
+    ) {
+        transfer_between_primary_stores(admin, asset, from, to, amounts);
+    }
+}
diff --git a/aptos-move/e2e-move-tests/src/tests/scripts.rs b/aptos-move/e2e-move-tests/src/tests/scripts.rs
index fa8c8d392420e..40395dba22ea4 100644
--- a/aptos-move/e2e-move-tests/src/tests/scripts.rs
+++ b/aptos-move/e2e-move-tests/src/tests/scripts.rs
@@ -5,10 +5,118 @@ use crate::{assert_success, build_package, tests::common, MoveHarness};
 use aptos_language_e2e_tests::account::TransactionBuilder;
 use aptos_types::{
     account_address::AccountAddress,
+    on_chain_config::FeatureFlag,
     transaction::{Script, TransactionArgument},
 };
 use move_core_types::language_storage::TypeTag;
 
+#[test]
+fn test_script_with_object_parameter() {
+    let mut h = MoveHarness::new();
+
+    let alice = h.new_account_at(AccountAddress::from_hex_literal("0xcafe").unwrap());
+    let bob = h.new_account_at(AccountAddress::from_hex_literal("0xface").unwrap());
+    let root = h.aptos_framework_account();
+
+    let mut build_options = aptos_framework::BuildOptions::default();
+    build_options
+        .named_addresses
+        .insert("example_addr".to_string(), *alice.address());
+
+    let result = h.publish_package_with_options(
+        &alice,
+        &common::test_dir_path("../../../move-examples/fungible_asset/managed_fungible_asset"),
+        build_options.clone(),
+    );
+
+    assert_success!(result);
+    let result = h.publish_package_with_options(
+        &alice,
+        &common::test_dir_path("../../../move-examples/fungible_asset/managed_fungible_token"),
+        build_options.clone(),
+    );
+    assert_success!(result);
+
+    assert_success!(h.run_entry_function(
+        &root,
+        str::parse(&format!(
+            "0x{}::coin::create_coin_conversion_map",
+            (*root.address()).to_hex()
+        ))
+        .unwrap(),
+        vec![],
+        vec![],
+    ));
+
+    let metadata = h
+        .execute_view_function(
+            str::parse(&format!(
+                "0x{}::managed_fungible_token::get_metadata",
+                (*alice.address()).to_hex()
+            ))
+            .unwrap(),
+            vec![],
+            vec![],
+        )
+        .values
+        .unwrap()
+        .pop()
+        .unwrap();
+    let metadata = bcs::from_bytes::<AccountAddress>(metadata.as_slice()).unwrap();
+
+    let result = h.run_entry_function(
+        &alice,
+        str::parse(&format!(
+            "0x{}::managed_fungible_asset::mint_to_primary_stores",
+            (*alice.address()).to_hex()
+        ))
+        .unwrap(),
+        vec![],
+        vec![
+            bcs::to_bytes(&metadata).unwrap(),
+            bcs::to_bytes(&vec![alice.address()]).unwrap(),
+            bcs::to_bytes(&vec![100u64]).unwrap(), // amount
+        ],
+    );
+    assert_success!(result);
+
+    let package = build_package(
+        common::test_dir_path("script_with_object_param.data/pack"),
+        build_options,
+    )
+    .expect("building package must succeed");
+
+    let code = package.extract_script_code().into_iter().next().unwrap();
+    let script = Script::new(code, vec![], vec![
+        TransactionArgument::Serialized(bcs::to_bytes(&metadata).unwrap()),
+        TransactionArgument::Serialized(bcs::to_bytes(&vec![alice.address()]).unwrap()),
+        TransactionArgument::Serialized(bcs::to_bytes(&vec![bob.address()]).unwrap()),
+        TransactionArgument::Serialized(bcs::to_bytes(&vec![30u64]).unwrap()),
+    ]);
+
+    let txn = TransactionBuilder::new(alice.clone())
+        .script(script.clone())
+        .sequence_number(13)
+        .max_gas_amount(1_000_000)
+        .gas_unit_price(1)
+        .sign();
+
+    let status = h.run(txn);
+    assert_success!(status);
+
+    h.enable_features(vec![], vec![FeatureFlag::ALLOW_SERIALIZED_SCRIPT_ARGS]);
+
+    let txn = TransactionBuilder::new(alice.clone())
+        .script(script.clone())
+        .sequence_number(14)
+        .max_gas_amount(1_000_000)
+        .gas_unit_price(1)
+        .sign();
+
+    let status = h.run(txn);
+    assert!(status.is_discarded());
+}
+
 #[test]
 fn test_script_with_type_parameter() {
     let mut h = MoveHarness::new();
diff --git a/aptos-move/e2e-move-tests/src/tests/storage_refund.rs b/aptos-move/e2e-move-tests/src/tests/storage_refund.rs
index c0925645e88ea..ff510308a8b6b 100644
--- a/aptos-move/e2e-move-tests/src/tests/storage_refund.rs
+++ b/aptos-move/e2e-move-tests/src/tests/storage_refund.rs
@@ -97,9 +97,8 @@ const LEEWAY: u64 = 2000;
 
 fn read_slot_fee_from_gas_schedule(h: &MoveHarness) -> u64 {
     let slot_fee = h
-        .new_vm()
-        .gas_params()
-        .unwrap()
+        .get_gas_params()
+        .1
         .vm
         .txn
         .storage_fee_per_state_slot
diff --git a/aptos-move/e2e-move-tests/src/tests/vm.rs b/aptos-move/e2e-move-tests/src/tests/vm.rs
index 7dafd13a3cd71..199bd04f6c5ea 100644
--- a/aptos-move/e2e-move-tests/src/tests/vm.rs
+++ b/aptos-move/e2e-move-tests/src/tests/vm.rs
@@ -6,7 +6,7 @@ use aptos_cached_packages::aptos_stdlib::aptos_account_transfer;
 use aptos_types::{
     state_store::state_key::StateKey, transaction::ExecutionStatus, write_set::WriteOp,
 };
-use aptos_vm::{data_cache::AsMoveResolver, AptosVM};
+use aptos_vm::AptosVM;
 use claims::{assert_ok_eq, assert_some};
 use move_core_types::vm_status::{StatusCode, VMStatus};
 use test_case::test_case;
@@ -28,10 +28,7 @@ fn failed_transaction_cleanup_charges_gas(status_code: StatusCode) {
         .sign();
 
     let state_view = h.executor.get_state_view();
-    let vm = AptosVM::new(
-        &state_view.as_move_resolver(),
-        /*override_is_delayed_field_optimization_capable=*/ Some(false),
-    );
+    let vm = AptosVM::new(state_view);
 
     let balance = 10_000;
     let output = vm
@@ -52,7 +49,6 @@ fn failed_transaction_cleanup_charges_gas(status_code: StatusCode) {
         status_code
     );
     let write_set: Vec<(&StateKey, &WriteOp)> = output
-        .change_set()
         .concrete_write_set_iter()
         .map(|(k, v)| (k, assert_some!(v)))
         .collect();
diff --git a/aptos-move/e2e-tests/Cargo.toml b/aptos-move/e2e-tests/Cargo.toml
index 859110fee4302..d19a2b61d2a94 100644
--- a/aptos-move/e2e-tests/Cargo.toml
+++ b/aptos-move/e2e-tests/Cargo.toml
@@ -51,6 +51,9 @@ rand = { workspace = true }
 rayon = { workspace = true }
 serde = { workspace = true }
 
+[dev-dependencies]
+claims = { workspace = true }
+
 [features]
 default = []
 fuzzing = []
diff --git a/aptos-move/e2e-tests/src/data_store.rs b/aptos-move/e2e-tests/src/data_store.rs
index 7113f7b704b4b..8013243ca36b2 100644
--- a/aptos-move/e2e-tests/src/data_store.rs
+++ b/aptos-move/e2e-tests/src/data_store.rs
@@ -7,6 +7,7 @@
 use crate::account::AccountData;
 use aptos_types::{
     account_config::CoinInfoResource,
+    on_chain_config::{Features, OnChainConfig},
     state_store::{
         errors::StateviewError, in_memory_state_view::InMemoryStateView, state_key::StateKey,
         state_storage_usage::StateStorageUsage, state_value::StateValue, TStateView,
@@ -118,6 +119,14 @@ impl FakeDataStore {
             StateValue::new_legacy(blob.into()),
         );
     }
+
+    pub fn set_features(&mut self, features: Features) {
+        let bytes = bcs::to_bytes(&features).expect("Features should always be serializable");
+        self.set(
+            StateKey::resource(Features::address(), &Features::struct_tag()).unwrap(),
+            StateValue::new_legacy(bytes.into()),
+        );
+    }
 }
 
 // This is used by the `execute_block` API.
@@ -140,3 +149,38 @@ impl TStateView for FakeDataStore {
         InMemoryStateView::new(self.state_data.clone())
     }
 }
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use aptos_types::on_chain_config::{FeatureFlag, Features};
+    use claims::*;
+
+    #[test]
+    fn test_features_can_be_set() {
+        let mut data_store = FakeDataStore::default();
+        assert_none!(Features::fetch_config(&data_store));
+
+        data_store.set_features(Features::default());
+        let features = assert_some!(Features::fetch_config(&data_store));
+        assert_eq!(features, Features::default())
+    }
+
+    #[test]
+    fn test_features_can_be_reset() {
+        use claims::*;
+
+        let mut data_store = FakeDataStore::default();
+        data_store.add_write_set(GENESIS_CHANGE_SET_HEAD.write_set());
+
+        // Reset the feature.
+        let mut features = assert_some!(Features::fetch_config(&data_store));
+        assert!(features.is_enabled(FeatureFlag::STORAGE_SLOT_METADATA));
+        features.disable(FeatureFlag::STORAGE_SLOT_METADATA);
+        data_store.set_features(features.clone());
+
+        let reset_features = assert_some!(Features::fetch_config(&data_store));
+        assert!(!reset_features.is_enabled(FeatureFlag::STORAGE_SLOT_METADATA));
+        assert_eq!(reset_features, features)
+    }
+}
diff --git a/aptos-move/e2e-tests/src/executor.rs b/aptos-move/e2e-tests/src/executor.rs
index ac6c305ee32d8..3ef32daeba35b 100644
--- a/aptos-move/e2e-tests/src/executor.rs
+++ b/aptos-move/e2e-tests/src/executor.rs
@@ -20,10 +20,7 @@ use aptos_framework::ReleaseBundle;
 use aptos_gas_algebra::DynamicExpression;
 use aptos_gas_meter::{StandardGasAlgebra, StandardGasMeter};
 use aptos_gas_profiling::{GasProfiler, TransactionGasLog};
-use aptos_gas_schedule::{
-    AptosGasParameters, InitialGasSchedule, MiscGasParameters, NativeGasParameters,
-    LATEST_GAS_FEATURE_VERSION,
-};
+use aptos_gas_schedule::{AptosGasParameters, InitialGasSchedule, LATEST_GAS_FEATURE_VERSION};
 use aptos_keygen::KeyGen;
 use aptos_types::{
     account_config::{
@@ -37,18 +34,14 @@ use aptos_types::{
     chain_id::ChainId,
     contract_event::ContractEvent,
     move_utils::MemberId,
-    on_chain_config::{
-        AptosVersion, FeatureFlag, Features, OnChainConfig, TimedFeatureOverride,
-        TimedFeaturesBuilder, ValidatorSet,
-    },
+    on_chain_config::{AptosVersion, OnChainConfig, ValidatorSet},
     state_store::{state_key::StateKey, state_value::StateValue, StateView, TStateView},
     transaction::{
         signature_verified_transaction::{
             into_signature_verified_block, SignatureVerifiedTransaction,
         },
-        BlockOutput, EntryFunction, ExecutionStatus, SignedTransaction, Transaction,
-        TransactionOutput, TransactionPayload, TransactionStatus, VMValidatorResult,
-        ViewFunctionOutput,
+        BlockOutput, ExecutionStatus, SignedTransaction, Transaction, TransactionOutput,
+        TransactionPayload, TransactionStatus, VMValidatorResult, ViewFunctionOutput,
     },
     vm_status::VMStatus,
     write_set::WriteSet,
@@ -56,13 +49,16 @@ use aptos_types::{
 use aptos_vm::{
     block_executor::{AptosTransactionOutput, BlockAptosVM},
     data_cache::AsMoveResolver,
-    gas::{get_gas_parameters, make_prod_gas_meter},
-    move_vm_ext::{AptosMoveResolver, MoveVmExt, SessionId},
-    verifier, AptosVM, VMValidator,
+    gas::make_prod_gas_meter,
+    move_vm_ext::{MoveVmExt, SessionId},
+    AptosVM, VMValidator,
 };
 use aptos_vm_genesis::{generate_genesis_change_set_for_testing_with_count, GenesisOptions};
 use aptos_vm_logging::log_schema::AdapterLogSchema;
-use aptos_vm_types::storage::{change_set_configs::ChangeSetConfigs, StorageGasParameters};
+use aptos_vm_types::{
+    environment::Environment,
+    storage::{change_set_configs::ChangeSetConfigs, StorageGasParameters},
+};
 use bytes::Bytes;
 use move_core_types::{
     account_address::AccountAddress,
@@ -72,8 +68,6 @@ use move_core_types::{
 };
 use move_vm_runtime::module_traversal::{TraversalContext, TraversalStorage};
 use move_vm_types::gas::UnmeteredGasMeter;
-#[cfg(any(test, feature = "fuzzing"))]
-use rayon::ThreadPool;
 use serde::Serialize;
 use std::{
     collections::BTreeSet,
@@ -126,13 +120,11 @@ pub struct FakeExecutor {
     executed_output: Option<GoldenOutputs>,
     trace_dir: Option<PathBuf>,
     rng: KeyGen,
-    /// If set, determines whether or not to execute a comparison test with the parallel
-    /// block executor.
+    /// If set, determines whether to execute a comparison test with the parallel block executor.
     /// If not set, environment variable E2E_PARALLEL_EXEC must be set
     /// s.t. the comparison test is executed (BothComparison).
     executor_mode: Option<ExecutorMode>,
-    features: Features,
-    chain_id: u8,
+    env: Arc<Environment>,
     allow_block_executor_fallback: bool,
 }
 
@@ -165,8 +157,7 @@ impl FakeExecutor {
             trace_dir: None,
             rng: KeyGen::from_seed(RNG_SEED),
             executor_mode: None,
-            features: Features::default(),
-            chain_id: chain_id.id(),
+            env: Environment::testing(chain_id),
             allow_block_executor_fallback: true,
         };
         executor.apply_write_set(write_set);
@@ -177,7 +168,7 @@ impl FakeExecutor {
     pub fn from_genesis_with_existing_thread_pool(
         write_set: &WriteSet,
         chain_id: ChainId,
-        executor_thread_pool: Arc<ThreadPool>,
+        executor_thread_pool: Arc<rayon::ThreadPool>,
     ) -> Self {
         let mut executor = FakeExecutor {
             data_store: FakeDataStore::default(),
@@ -188,8 +179,7 @@ impl FakeExecutor {
             trace_dir: None,
             rng: KeyGen::from_seed(RNG_SEED),
             executor_mode: None,
-            features: Features::default(),
-            chain_id: chain_id.id(),
+            env: Environment::testing(chain_id),
             allow_block_executor_fallback: true,
         };
         executor.apply_write_set(write_set);
@@ -272,8 +262,7 @@ impl FakeExecutor {
             trace_dir: None,
             rng: KeyGen::from_seed(RNG_SEED),
             executor_mode: None,
-            features: Features::default(),
-            chain_id: ChainId::test().id(),
+            env: Environment::testing(ChainId::test()),
             allow_block_executor_fallback: true,
         }
     }
@@ -543,7 +532,7 @@ impl FakeExecutor {
             },
             onchain: onchain_config,
         };
-        BlockAptosVM::execute_block::<
+        BlockAptosVM::execute_block_on_thread_pool::<
             _,
             NoOpTransactionCommitHook<AptosTransactionOutput, VMStatus>,
         >(
@@ -684,11 +673,9 @@ impl FakeExecutor {
         let log_context = AdapterLogSchema::new(self.data_store.id(), 0);
 
         // TODO(Gas): revisit this.
-        let resolver = self.data_store.as_move_resolver();
-        let vm = AptosVM::new(
-            &resolver, /*override_is_delayed_field_optimization_capable=*/ None,
-        );
+        let vm = AptosVM::new(self.get_state_view());
 
+        let resolver = self.data_store.as_move_resolver();
         let (_status, output, gas_profiler) = vm.execute_user_transaction_with_modified_gas_meter(
             &resolver,
             &txn,
@@ -755,10 +742,7 @@ impl FakeExecutor {
 
     /// Verifies the given transaction by running it through the VM verifier.
     pub fn validate_transaction(&self, txn: SignedTransaction) -> VMValidatorResult {
-        let vm = AptosVM::new(
-            &self.get_state_view().as_move_resolver(),
-            /*override_is_delayed_field_optimization_capable=*/ None,
-        );
+        let vm = AptosVM::new(self.get_state_view());
         vm.validate_transaction(txn, &self.data_store)
     }
 
@@ -864,11 +848,6 @@ impl FakeExecutor {
         dynamic_args: ExecFuncTimerDynamicArgs,
         gas_meter_type: GasMeterType,
     ) -> u128 {
-        // FIXME: should probably read the timestamp from storage.
-        let timed_features = TimedFeaturesBuilder::enable_all()
-            .with_override_profile(TimedFeatureOverride::Testing)
-            .build();
-
         let mut extra_accounts = match &dynamic_args {
             ExecFuncTimerDynamicArgs::DistinctSigners
             | ExecFuncTimerDynamicArgs::DistinctSignersAndFixed(_) => (0..iterations)
@@ -885,22 +864,18 @@ impl FakeExecutor {
                 StorageGasParameters::latest(),
             ),
             GasMeterType::UnmeteredGasMeter => (
-                AptosGasParameters::zeros(),
+                // In case of unmetered execution, we still want to enforce limits.
+                AptosGasParameters::initial(),
                 StorageGasParameters::unlimited(),
             ),
         };
 
         let vm = MoveVmExt::new(
-            gas_params.natives.clone(),
-            gas_params.vm.misc.clone(),
             LATEST_GAS_FEATURE_VERSION,
-            self.chain_id,
-            self.features.clone(),
-            timed_features,
+            Ok(&gas_params),
+            self.env.clone(),
             &resolver,
-            false,
-        )
-        .unwrap();
+        );
 
         // start measuring here to reduce measurement errors (i.e., the time taken to load vm, module, etc.)
         let mut i = 0;
@@ -999,28 +974,19 @@ impl FakeExecutor {
         let a2 = Arc::clone(&a1);
 
         let (write_set, _events) = {
-            // FIXME: should probably read the timestamp from storage.
-            let timed_features = TimedFeaturesBuilder::enable_all()
-                .with_override_profile(TimedFeatureOverride::Testing)
-                .build();
-
             let resolver = self.data_store.as_move_resolver();
 
             // TODO(Gas): we probably want to switch to non-zero costs in the future
-            let vm = MoveVmExt::new_with_gas_hook(
-                NativeGasParameters::zeros(),
-                MiscGasParameters::zeros(),
+            let vm = MoveVmExt::new_with_extended_options(
                 LATEST_GAS_FEATURE_VERSION,
-                self.chain_id,
-                self.features.clone(),
-                timed_features,
-                Some(move |expression| {
+                Ok(&AptosGasParameters::zeros()),
+                self.env.clone(),
+                Some(Arc::new(move |expression| {
                     a2.lock().unwrap().push(expression);
-                }),
+                })),
+                false,
                 &resolver,
-                /*aggregator_v2_type_tagging=*/ false,
-            )
-            .unwrap();
+            );
             let mut session = vm.new_session(&resolver, SessionId::void(), None);
 
             let fun_name = Self::name(function_name);
@@ -1041,7 +1007,6 @@ impl FakeExecutor {
                         false,
                         10000000000000,
                     ),
-                    // coeff_buffer: BTreeMap::new(),
                     shared_buffer: Arc::clone(&a1),
                 }),
                 &mut TraversalContext::new(&storage),
@@ -1051,14 +1016,14 @@ impl FakeExecutor {
                     println!("Should error, but ignoring for now... {}", err);
                 }
             }
-            let change_set = session
+            let (change_set, module_write_set) = session
                 .finish(&ChangeSetConfigs::unlimited_at_gas_feature_version(
                     LATEST_GAS_FEATURE_VERSION,
                 ))
                 .expect("Failed to generate txn effects");
             change_set
-                .try_into_storage_change_set()
-                .expect("Failed to convert to ChangeSet")
+                .try_combine_into_storage_change_set(module_write_set)
+                .expect("Failed to convert to storage ChangeSet")
                 .into_inner()
         };
         self.data_store.add_write_set(&write_set);
@@ -1079,25 +1044,14 @@ impl FakeExecutor {
         args: Vec<Vec<u8>>,
     ) {
         let (write_set, events) = {
-            // FIXME: should probably read the timestamp from storage.
-            let timed_features = TimedFeaturesBuilder::enable_all()
-                .with_override_profile(TimedFeatureOverride::Testing)
-                .build();
-
             let resolver = self.data_store.as_move_resolver();
 
-            // TODO(Gas): we probably want to switch to non-zero costs in the future
             let vm = MoveVmExt::new(
-                NativeGasParameters::zeros(),
-                MiscGasParameters::zeros(),
                 LATEST_GAS_FEATURE_VERSION,
-                self.chain_id,
-                self.features.clone(),
-                timed_features,
+                Ok(&AptosGasParameters::initial()),
+                self.env.clone(),
                 &resolver,
-                false,
-            )
-            .unwrap();
+            );
             let mut session = vm.new_session(&resolver, SessionId::void(), None);
             let storage = TraversalStorage::new();
             session
@@ -1106,6 +1060,7 @@ impl FakeExecutor {
                     &Self::name(function_name),
                     type_params,
                     args,
+                    // TODO(Gas): we probably want to switch to metered execution in the future
                     &mut UnmeteredGasMeter,
                     &mut TraversalContext::new(&storage),
                 )
@@ -1117,14 +1072,14 @@ impl FakeExecutor {
                         e.into_vm_status()
                     )
                 });
-            let change_set = session
+            let (change_set, module_write_set) = session
                 .finish(&ChangeSetConfigs::unlimited_at_gas_feature_version(
                     LATEST_GAS_FEATURE_VERSION,
                 ))
                 .expect("Failed to generate txn effects");
             change_set
-                .try_into_storage_change_set()
-                .expect("Failed to convert to ChangeSet")
+                .try_combine_into_storage_change_set(module_write_set)
+                .expect("Failed to convert to storage ChangeSet")
                 .into_inner()
         };
         self.data_store.add_write_set(&write_set);
@@ -1141,80 +1096,6 @@ impl FakeExecutor {
         self.exec_module(&Self::module(module_name), function_name, type_params, args)
     }
 
-    pub fn try_exec_entry_with_state_view(
-        &mut self,
-        senders: Vec<AccountAddress>,
-        entry_fn: &EntryFunction,
-        state_view: &impl AptosMoveResolver,
-        features: Features,
-    ) -> Result<(WriteSet, Vec<ContractEvent>), VMStatus> {
-        let (
-            gas_params_res,
-            storage_gas_params,
-            native_gas_params,
-            misc_gas_params,
-            gas_feature_version,
-        ) = get_gas_parameters(&features, state_view);
-
-        let gas_params = gas_params_res.unwrap();
-        let mut gas_meter = make_prod_gas_meter(
-            gas_feature_version,
-            gas_params.clone().vm,
-            storage_gas_params.unwrap(),
-            false,
-            10000000000000.into(),
-        );
-
-        let timed_features = TimedFeaturesBuilder::enable_all()
-            .with_override_profile(TimedFeatureOverride::Testing)
-            .build();
-        let struct_constructors = features.is_enabled(FeatureFlag::STRUCT_CONSTRUCTORS);
-        let vm = MoveVmExt::new(
-            native_gas_params,
-            misc_gas_params,
-            LATEST_GAS_FEATURE_VERSION,
-            self.chain_id,
-            features,
-            timed_features,
-            state_view,
-            false,
-        )
-        .unwrap();
-        let mut session = vm.new_session(state_view, SessionId::void(), None);
-        let function =
-            session.load_function(entry_fn.module(), entry_fn.function(), entry_fn.ty_args())?;
-        let args = verifier::transaction_arg_validation::validate_combine_signer_and_txn_args(
-            &mut session,
-            senders,
-            entry_fn.args().to_vec(),
-            &function,
-            struct_constructors,
-        )?;
-        let storage = TraversalStorage::new();
-        session
-            .execute_entry_function(
-                entry_fn.module(),
-                entry_fn.function(),
-                entry_fn.ty_args().to_vec(),
-                args,
-                &mut gas_meter,
-                &mut TraversalContext::new(&storage),
-            )
-            .map_err(|e| e.into_vm_status())?;
-
-        let mut change_set = session
-            .finish(&ChangeSetConfigs::unlimited_at_gas_feature_version(
-                LATEST_GAS_FEATURE_VERSION,
-            ))
-            .expect("Failed to generate txn effects");
-        change_set.try_materialize_aggregator_v1_delta_set(state_view)?;
-        let (write_set, events) = change_set
-            .try_into_storage_change_set()
-            .expect("Failed to convert to ChangeSet")
-            .into_inner();
-        Ok((write_set, events))
-    }
-
     pub fn try_exec(
         &mut self,
         module_name: &str,
@@ -1223,20 +1104,12 @@ impl FakeExecutor {
         args: Vec<Vec<u8>>,
     ) -> Result<(WriteSet, Vec<ContractEvent>), VMStatus> {
         let resolver = self.data_store.as_move_resolver();
-
-        // TODO(Gas): we probably want to switch to non-zero costs in the future
         let vm = MoveVmExt::new(
-            NativeGasParameters::zeros(),
-            MiscGasParameters::zeros(),
             LATEST_GAS_FEATURE_VERSION,
-            self.chain_id,
-            self.features.clone(),
-            // FIXME: should probably read the timestamp from storage.
-            TimedFeaturesBuilder::enable_all().build(),
+            Ok(&AptosGasParameters::initial()),
+            self.env.clone(),
             &resolver,
-            false,
-        )
-        .unwrap();
+        );
         let mut session = vm.new_session(&resolver, SessionId::void(), None);
         let storage = TraversalStorage::new();
         session
@@ -1245,20 +1118,20 @@ impl FakeExecutor {
                 &Self::name(function_name),
                 type_params,
                 args,
+                // TODO(Gas): we probably want to switch to metered execution in the future
                 &mut UnmeteredGasMeter,
                 &mut TraversalContext::new(&storage),
             )
             .map_err(|e| e.into_vm_status())?;
 
-        let change_set = session
+        let (change_set, module_write_set) = session
             .finish(&ChangeSetConfigs::unlimited_at_gas_feature_version(
                 LATEST_GAS_FEATURE_VERSION,
             ))
             .expect("Failed to generate txn effects");
-        // TODO: Support deltas in fake executor.
         let (write_set, events) = change_set
-            .try_into_storage_change_set()
-            .expect("Failed to convert to ChangeSet")
+            .try_combine_into_storage_change_set(module_write_set)
+            .expect("Failed to convert to storage ChangeSet")
             .into_inner();
         Ok((write_set, events))
     }
@@ -1269,22 +1142,22 @@ impl FakeExecutor {
         type_args: Vec<TypeTag>,
         arguments: Vec<Vec<u8>>,
     ) -> ViewFunctionOutput {
-        // No gas limit
+        let max_gas_amount = u64::MAX;
         AptosVM::execute_view_function(
             self.get_state_view(),
             fun.module_id,
             fun.member_id,
             type_args,
             arguments,
-            u64::MAX,
+            max_gas_amount,
         )
     }
 }
 
 pub fn assert_outputs_equal(
-    txns_output_1: &Vec<TransactionOutput>,
+    txns_output_1: &[TransactionOutput],
     name1: &str,
-    txns_output_2: &Vec<TransactionOutput>,
+    txns_output_2: &[TransactionOutput],
     name2: &str,
 ) {
     assert_eq!(
diff --git a/aptos-move/e2e-tests/src/golden_outputs.rs b/aptos-move/e2e-tests/src/golden_outputs.rs
index 323f780e02743..a928fa57baca9 100644
--- a/aptos-move/e2e-tests/src/golden_outputs.rs
+++ b/aptos-move/e2e-tests/src/golden_outputs.rs
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use goldenfile::Mint;
-use move_command_line_common::testing::EXP_EXT;
+use move_command_line_common::testing::get_compiler_exp_extension;
 use std::{cell::RefCell, fmt::Debug, fs::File, io::Write, path::PathBuf};
 
 pub const GOLDEN_DIR_PATH: &str = "goldens";
@@ -30,7 +30,7 @@ impl GoldenOutputs {
         let mut file_path = PathBuf::new();
         file_path.push(name);
         let file = RefCell::new(
-            mint.new_goldenfile(file_path.with_extension(EXP_EXT))
+            mint.new_goldenfile(file_path.with_extension(get_compiler_exp_extension()))
                 .unwrap(),
         );
         Self { mint, file }
diff --git a/aptos-move/e2e-testsuite/proptest-regressions/tests/account_universe/mod.txt b/aptos-move/e2e-testsuite/proptest-regressions/tests/account_universe/mod.txt
deleted file mode 100644
index 2a365fabf2d47..0000000000000
--- a/aptos-move/e2e-testsuite/proptest-regressions/tests/account_universe/mod.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# Seeds for failure cases proptest has generated in the past. It is
-# automatically read and these particular cases re-run before any
-# novel cases are generated.
-#
-# It is recommended to check this file in to source control so that
-# everyone who runs the test benefits from these saved cases.
-cc 7ee0e575ce7cba9ee8477363ae596f284a93cd0960e5e81ccc15aaeb1538dcd6 # shrinks to universe = AccountUniverseGen { accounts: [AccountData { account: Account { addr: 2866a6829c34f66fe36c477b6c80e6f8f59d138326bddce1df54fc80f047a83d, privkey: <elided secret for Ed25519PrivateKey>, pubkey: Ed25519PublicKey(3d82f697edfb34c4ddccce2104dbffa848e2b71ffb931e4cca019be286bf4bc0) }, sequence_number: 606642865, coin_register_events: EventHandle { count: 0, key: EventKey { creation_number: 0, account_address: 2866a6829c34f66fe36c477b6c80e6f8f59d138326bddce1df54fc80f047a83d } }, key_rotation_events: EventHandle { count: 0, key: EventKey { creation_number: 1, account_address: 2866a6829c34f66fe36c477b6c80e6f8f59d138326bddce1df54fc80f047a83d } }, coin_store: CoinStore { coin: 1, frozen: false, deposit_events: EventHandle { count: 0, key: EventKey { creation_number: 1077018124, account_address: 2866a6829c34f66fe36c477b6c80e6f8f59d138326bddce1df54fc80f047a83d } }, withdraw_events: EventHandle { count: 0, key: EventKey { creation_number: 3658751953, account_address: 2866a6829c34f66fe36c477b6c80e6f8f59d138326bddce1df54fc80f047a83d } } } }, AccountData { account: Account { addr: a2b110cd4d6df6b723a2e743cc0b590dead69b112f0d0e80bfea265117a4cd18, privkey: <elided secret for Ed25519PrivateKey>, pubkey: Ed25519PublicKey(5f4aa996bb53df1b689fe66d52b41aec19e46615f3af7b74e8bedcb877875dbe) }, sequence_number: 2730855357, coin_register_events: EventHandle { count: 0, key: EventKey { creation_number: 0, account_address: a2b110cd4d6df6b723a2e743cc0b590dead69b112f0d0e80bfea265117a4cd18 } }, key_rotation_events: EventHandle { count: 0, key: EventKey { creation_number: 1, account_address: a2b110cd4d6df6b723a2e743cc0b590dead69b112f0d0e80bfea265117a4cd18 } }, coin_store: CoinStore { coin: 204620, frozen: false, deposit_events: EventHandle { count: 0, key: EventKey { creation_number: 3112617151, account_address: a2b110cd4d6df6b723a2e743cc0b590dead69b112f0d0e80bfea265117a4cd18 } }, withdraw_events: EventHandle { count: 0, key: EventKey { creation_number: 1599182211, account_address: a2b110cd4d6df6b723a2e743cc0b590dead69b112f0d0e80bfea265117a4cd18 } } } }], pick_style: Unlimited }, transactions = [P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(18068952282389464661)), Index(Index(15636715275587880232))], reverse: true }, amount: 800125 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(2137065313893786516)), Index(Index(6808130997211442165))], reverse: false }, amount: 90039 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(5766335582987324319)), Index(Index(13524526291119501320))], reverse: true }, amount: 209356 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(8149250090604393087)), Index(Index(7924510731549600149))], reverse: true }, amount: 57595 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(15955573661757442756)), Index(Index(801017120963950483))], reverse: true }, amount: 818231 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(8706898196137406912)), Index(Index(7984716181449879581))], reverse: true }, amount: 2889 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(9221009638442663001)), Index(Index(16859699412486621359))], reverse: false }, amount: 332658 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(7104779947563880714)), Index(Index(10260412958816341171))], reverse: true }, amount: 902615 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(1824506071372157774)), Index(Index(2188636986972126212))], reverse: false }, amount: 645911 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(11268113830813949983)), Index(Index(4528596457336110769))], reverse: true }, amount: 48541 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(5959430581203290632)), Index(Index(7774166360799194168))], reverse: true }, amount: 802626 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(13665409622969398365)), Index(Index(14993389175521541693))], reverse: false }, amount: 471364 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(13776859996444077986)), Index(Index(8225970834486425194))], reverse: false }, amount: 607782 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(9441967139183516702)), Index(Index(10848037596942736153))], reverse: false }, amount: 905947 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(14109944496739425968)), Index(Index(17901411669793163600))], reverse: true }, amount: 456519 }, InsufficientBalanceGen { sender: Index(Index(1016935048984894283)), gas_unit_price: 18396 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(13420541903671149348)), Index(Index(5219829307710880815))], reverse: false }, amount: 65992 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(6349538048425779356)), Index(Index(13163590192322839792))], reverse: true }, amount: 550591 }, SequenceNumberMismatchGen { sender: Index(Index(14015259431305191553)), seq: 3104 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(10459117548221712859)), Index(Index(898489728684787326))], reverse: false }, amount: 325253 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(14896392736646697502)), Index(Index(14784677491728253275))], reverse: false }, amount: 578626 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(1504324881704254964)), Index(Index(16205507912378453094))], reverse: true }, amount: 759950 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(16414332968622451489)), Index(Index(4287150049923649974))], reverse: true }, amount: 191267 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(9779826457712755357)), Index(Index(12639352180579439030))], reverse: true }, amount: 148429 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(1714003098667390328)), Index(Index(4045702677049461111))], reverse: true }, amount: 583562 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(3501580896444528739)), Index(Index(3178820656387921814))], reverse: false }, amount: 926470 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(15106864890424837548)), Index(Index(8241443532952266687))], reverse: false }, amount: 333094 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(16563483748505779395)), Index(Index(16126755393517894764))], reverse: true }, amount: 359948 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(9992768330353585190)), Index(Index(4066521618294284176))], reverse: true }, amount: 873785 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(7857806165859786063)), Index(Index(14705345162681450085))], reverse: true }, amount: 831155 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(13593956539618366797)), Index(Index(15150528133078627395))], reverse: true }, amount: 178723 }]
diff --git a/aptos-move/framework/aptos-framework/doc/account.md b/aptos-move/framework/aptos-framework/doc/account.md
index 2244ba8a0e247..2a45490a386f4 100644
--- a/aptos-move/framework/aptos-framework/doc/account.md
+++ b/aptos-move/framework/aptos-framework/doc/account.md
@@ -901,7 +901,7 @@ Only called during genesis to initialize system resources for this module.
 
 
 
-<pre><code><b>fun</b> <a href="account.md#0x1_account_create_account_if_does_not_exist">create_account_if_does_not_exist</a>(account_address: <b>address</b>)
+<pre><code><b>public</b> <b>fun</b> <a href="account.md#0x1_account_create_account_if_does_not_exist">create_account_if_does_not_exist</a>(account_address: <b>address</b>)
 </code></pre>
 
 
@@ -910,7 +910,7 @@ Only called during genesis to initialize system resources for this module.
 <summary>Implementation</summary>
 
 
-<pre><code><b>fun</b> <a href="account.md#0x1_account_create_account_if_does_not_exist">create_account_if_does_not_exist</a>(account_address: <b>address</b>) {
+<pre><code><b>public</b> <b>fun</b> <a href="account.md#0x1_account_create_account_if_does_not_exist">create_account_if_does_not_exist</a>(account_address: <b>address</b>) {
     <b>if</b> (!<b>exists</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(account_address)) {
         <a href="account.md#0x1_account_create_account">create_account</a>(account_address);
     }
@@ -2386,7 +2386,7 @@ OriginatingAddress does not exist under <code>@aptos_framework</code> before the
 ### Function `create_account_if_does_not_exist`
 
 
-<pre><code><b>fun</b> <a href="account.md#0x1_account_create_account_if_does_not_exist">create_account_if_does_not_exist</a>(account_address: <b>address</b>)
+<pre><code><b>public</b> <b>fun</b> <a href="account.md#0x1_account_create_account_if_does_not_exist">create_account_if_does_not_exist</a>(account_address: <b>address</b>)
 </code></pre>
 
 
@@ -3040,7 +3040,7 @@ The value of signer_capability_offer.for of Account resource under the signer is
     <b>let</b> addr = <a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>);
     <b>let</b> account_resource = <b>global</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(<b>address</b>);
     <b>aborts_if</b> !<b>exists</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(<b>address</b>);
-    // This enforces <a id="high-level-spec-3" href="create_signer.md#high-level-req">high-level requirement 3</a> of the <a href=create_signer.md>create_signer</a> module:
+    // This enforces <a id="high-level-spec-3" href="create_signer.md#high-level-req">high-level requirement 3</a> of the <a href="create_signer.md">create_signer</a> module:
     <b>aborts_if</b> !<a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_spec_contains">option::spec_contains</a>(account_resource.signer_capability_offer.for,addr);
 }
 </code></pre>
diff --git a/aptos-move/framework/aptos-framework/doc/aggregator_v2.md b/aptos-move/framework/aptos-framework/doc/aggregator_v2.md
index 787882cd4179e..38704a60e34f2 100644
--- a/aptos-move/framework/aptos-framework/doc/aggregator_v2.md
+++ b/aptos-move/framework/aptos-framework/doc/aggregator_v2.md
@@ -13,6 +13,16 @@ doing <code><a href="aggregator_v2.md#0x1_aggregator_v2_try_sub">try_sub</a>(X,3
 dependency.
 However, reading the aggregator value (i.e. calling <code><a href="aggregator_v2.md#0x1_aggregator_v2_read">read</a>(X)</code>) is a resource-intensive
 operation that also reduced parallelism, and should be avoided as much as possible.
+If you need to capture the value, without revealing it, use snapshot function instead,
+which has no parallelism impact.
+
+From parallelism considerations, there are three different levels of effects:
+* enable full parallelism (cannot create conflicts):
+max_value, create_*, snapshot, derive_string_concat
+* enable speculative parallelism (generally parallel via branch prediction)
+try_add, add, try_sub, sub, is_at_least
+* create read/write conflicts, as if you were using a regular field
+read, read_snapshot, read_derived_string
 
 
 -  [Struct `Aggregator`](#0x1_aggregator_v2_Aggregator)
@@ -21,11 +31,15 @@ operation that also reduced parallelism, and should be avoided as much as possib
 -  [Constants](#@Constants_0)
 -  [Function `max_value`](#0x1_aggregator_v2_max_value)
 -  [Function `create_aggregator`](#0x1_aggregator_v2_create_aggregator)
+-  [Function `create_aggregator_with_value`](#0x1_aggregator_v2_create_aggregator_with_value)
 -  [Function `create_unbounded_aggregator`](#0x1_aggregator_v2_create_unbounded_aggregator)
+-  [Function `create_unbounded_aggregator_with_value`](#0x1_aggregator_v2_create_unbounded_aggregator_with_value)
 -  [Function `try_add`](#0x1_aggregator_v2_try_add)
 -  [Function `add`](#0x1_aggregator_v2_add)
 -  [Function `try_sub`](#0x1_aggregator_v2_try_sub)
 -  [Function `sub`](#0x1_aggregator_v2_sub)
+-  [Function `is_at_least_impl`](#0x1_aggregator_v2_is_at_least_impl)
+-  [Function `is_at_least`](#0x1_aggregator_v2_is_at_least)
 -  [Function `read`](#0x1_aggregator_v2_read)
 -  [Function `snapshot`](#0x1_aggregator_v2_snapshot)
 -  [Function `create_snapshot`](#0x1_aggregator_v2_create_snapshot)
@@ -40,14 +54,20 @@ operation that also reduced parallelism, and should be avoided as much as possib
     -  [Function `create_unbounded_aggregator`](#@Specification_1_create_unbounded_aggregator)
     -  [Function `try_add`](#@Specification_1_try_add)
     -  [Function `try_sub`](#@Specification_1_try_sub)
+    -  [Function `is_at_least_impl`](#@Specification_1_is_at_least_impl)
     -  [Function `read`](#@Specification_1_read)
     -  [Function `snapshot`](#@Specification_1_snapshot)
     -  [Function `create_snapshot`](#@Specification_1_create_snapshot)
+    -  [Function `read_snapshot`](#@Specification_1_read_snapshot)
+    -  [Function `read_derived_string`](#@Specification_1_read_derived_string)
+    -  [Function `create_derived_string`](#@Specification_1_create_derived_string)
+    -  [Function `derive_string_concat`](#@Specification_1_derive_string_concat)
     -  [Function `copy_snapshot`](#@Specification_1_copy_snapshot)
     -  [Function `string_concat`](#@Specification_1_string_concat)
 
 
 <pre><code><b>use</b> <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="../../aptos-stdlib/../move-stdlib/doc/features.md#0x1_features">0x1::features</a>;
 <b>use</b> <a href="../../aptos-stdlib/../move-stdlib/doc/string.md#0x1_string">0x1::string</a>;
 </code></pre>
 
@@ -278,6 +298,32 @@ EAGGREGATOR_ELEMENT_TYPE_NOT_SUPPORTED raised if called with a different type.
 
 
 
+</details>
+
+<a id="0x1_aggregator_v2_create_aggregator_with_value"></a>
+
+## Function `create_aggregator_with_value`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_create_aggregator_with_value">create_aggregator_with_value</a>&lt;IntElement: <b>copy</b>, drop&gt;(start_value: IntElement, max_value: IntElement): <a href="aggregator_v2.md#0x1_aggregator_v2_Aggregator">aggregator_v2::Aggregator</a>&lt;IntElement&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_create_aggregator_with_value">create_aggregator_with_value</a>&lt;IntElement: <b>copy</b> + drop&gt;(start_value: IntElement, max_value: IntElement): <a href="aggregator_v2.md#0x1_aggregator_v2_Aggregator">Aggregator</a>&lt;IntElement&gt; {
+    <b>let</b> <a href="aggregator.md#0x1_aggregator">aggregator</a> = <a href="aggregator_v2.md#0x1_aggregator_v2_create_aggregator">create_aggregator</a>(max_value);
+    <a href="aggregator_v2.md#0x1_aggregator_v2_add">add</a>(&<b>mut</b> <a href="aggregator.md#0x1_aggregator">aggregator</a>, start_value);
+    <a href="aggregator.md#0x1_aggregator">aggregator</a>
+}
+</code></pre>
+
+
+
 </details>
 
 <a id="0x1_aggregator_v2_create_unbounded_aggregator"></a>
@@ -305,6 +351,32 @@ EAGGREGATOR_ELEMENT_TYPE_NOT_SUPPORTED raised if called with a different type.
 
 
 
+</details>
+
+<a id="0x1_aggregator_v2_create_unbounded_aggregator_with_value"></a>
+
+## Function `create_unbounded_aggregator_with_value`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_create_unbounded_aggregator_with_value">create_unbounded_aggregator_with_value</a>&lt;IntElement: <b>copy</b>, drop&gt;(start_value: IntElement): <a href="aggregator_v2.md#0x1_aggregator_v2_Aggregator">aggregator_v2::Aggregator</a>&lt;IntElement&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_create_unbounded_aggregator_with_value">create_unbounded_aggregator_with_value</a>&lt;IntElement: <b>copy</b> + drop&gt;(start_value: IntElement): <a href="aggregator_v2.md#0x1_aggregator_v2_Aggregator">Aggregator</a>&lt;IntElement&gt; {
+    <b>let</b> <a href="aggregator.md#0x1_aggregator">aggregator</a> = <a href="aggregator_v2.md#0x1_aggregator_v2_create_unbounded_aggregator">create_unbounded_aggregator</a>();
+    <a href="aggregator_v2.md#0x1_aggregator_v2_add">add</a>(&<b>mut</b> <a href="aggregator.md#0x1_aggregator">aggregator</a>, start_value);
+    <a href="aggregator.md#0x1_aggregator">aggregator</a>
+}
+</code></pre>
+
+
+
 </details>
 
 <a id="0x1_aggregator_v2_try_add"></a>
@@ -314,6 +386,8 @@ EAGGREGATOR_ELEMENT_TYPE_NOT_SUPPORTED raised if called with a different type.
 Adds <code>value</code> to aggregator.
 If addition would exceed the max_value, <code><b>false</b></code> is returned, and aggregator value is left unchanged.
 
+Parallelism info: This operation enables speculative parallelism.
+
 
 <pre><code><b>public</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_try_add">try_add</a>&lt;IntElement&gt;(<a href="aggregator.md#0x1_aggregator">aggregator</a>: &<b>mut</b> <a href="aggregator_v2.md#0x1_aggregator_v2_Aggregator">aggregator_v2::Aggregator</a>&lt;IntElement&gt;, value: IntElement): bool
 </code></pre>
@@ -335,6 +409,10 @@ If addition would exceed the max_value, <code><b>false</b></code> is returned, a
 
 ## Function `add`
 
+Adds <code>value</code> to aggregator, unconditionally.
+If addition would exceed the max_value, EAGGREGATOR_OVERFLOW exception will be thrown.
+
+Parallelism info: This operation enables speculative parallelism.
 
 
 <pre><code><b>public</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_add">add</a>&lt;IntElement&gt;(<a href="aggregator.md#0x1_aggregator">aggregator</a>: &<b>mut</b> <a href="aggregator_v2.md#0x1_aggregator_v2_Aggregator">aggregator_v2::Aggregator</a>&lt;IntElement&gt;, value: IntElement)
@@ -362,6 +440,8 @@ If addition would exceed the max_value, <code><b>false</b></code> is returned, a
 Subtracts <code>value</code> from aggregator.
 If subtraction would result in a negative value, <code><b>false</b></code> is returned, and aggregator value is left unchanged.
 
+Parallelism info: This operation enables speculative parallelism.
+
 
 <pre><code><b>public</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_try_sub">try_sub</a>&lt;IntElement&gt;(<a href="aggregator.md#0x1_aggregator">aggregator</a>: &<b>mut</b> <a href="aggregator_v2.md#0x1_aggregator_v2_Aggregator">aggregator_v2::Aggregator</a>&lt;IntElement&gt;, value: IntElement): bool
 </code></pre>
@@ -384,6 +464,8 @@ If subtraction would result in a negative value, <code><b>false</b></code> is re
 ## Function `sub`
 
 
+Parallelism info: This operation enables speculative parallelism.
+
 
 <pre><code><b>public</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_sub">sub</a>&lt;IntElement&gt;(<a href="aggregator.md#0x1_aggregator">aggregator</a>: &<b>mut</b> <a href="aggregator_v2.md#0x1_aggregator_v2_Aggregator">aggregator_v2::Aggregator</a>&lt;IntElement&gt;, value: IntElement)
 </code></pre>
@@ -401,6 +483,61 @@ If subtraction would result in a negative value, <code><b>false</b></code> is re
 
 
 
+</details>
+
+<a id="0x1_aggregator_v2_is_at_least_impl"></a>
+
+## Function `is_at_least_impl`
+
+
+
+<pre><code><b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_is_at_least_impl">is_at_least_impl</a>&lt;IntElement&gt;(<a href="aggregator.md#0x1_aggregator">aggregator</a>: &<a href="aggregator_v2.md#0x1_aggregator_v2_Aggregator">aggregator_v2::Aggregator</a>&lt;IntElement&gt;, min_amount: IntElement): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_is_at_least_impl">is_at_least_impl</a>&lt;IntElement&gt;(<a href="aggregator.md#0x1_aggregator">aggregator</a>: &<a href="aggregator_v2.md#0x1_aggregator_v2_Aggregator">Aggregator</a>&lt;IntElement&gt;, min_amount: IntElement): bool;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aggregator_v2_is_at_least"></a>
+
+## Function `is_at_least`
+
+Returns true if aggregator value is larger than or equal to the given <code>min_amount</code>, false otherwise.
+
+This operation is more efficient and much more parallelization friendly than calling <code><a href="aggregator_v2.md#0x1_aggregator_v2_read">read</a>(agg) &gt; min_amount</code>.
+Until traits are deployed, <code>is_at_most</code>/<code>is_equal</code> utility methods can be derived from this one (assuming +1 doesn't overflow):
+- for <code>is_at_most(agg, max_amount)</code>, you can do <code>!<a href="aggregator_v2.md#0x1_aggregator_v2_is_at_least">is_at_least</a>(max_amount + 1)</code>
+- for <code>is_equal(agg, value)</code>, you can do <code><a href="aggregator_v2.md#0x1_aggregator_v2_is_at_least">is_at_least</a>(value) && !<a href="aggregator_v2.md#0x1_aggregator_v2_is_at_least">is_at_least</a>(value + 1)</code>
+
+Parallelism info: This operation enables speculative parallelism.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_is_at_least">is_at_least</a>&lt;IntElement&gt;(<a href="aggregator.md#0x1_aggregator">aggregator</a>: &<a href="aggregator_v2.md#0x1_aggregator_v2_Aggregator">aggregator_v2::Aggregator</a>&lt;IntElement&gt;, min_amount: IntElement): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_is_at_least">is_at_least</a>&lt;IntElement&gt;(<a href="aggregator.md#0x1_aggregator">aggregator</a>: &<a href="aggregator_v2.md#0x1_aggregator_v2_Aggregator">Aggregator</a>&lt;IntElement&gt;, min_amount: IntElement): bool {
+    <b>assert</b>!(<a href="../../aptos-stdlib/../move-stdlib/doc/features.md#0x1_features_aggregator_v2_is_at_least_api_enabled">features::aggregator_v2_is_at_least_api_enabled</a>(), <a href="aggregator_v2.md#0x1_aggregator_v2_EAGGREGATOR_API_V2_NOT_ENABLED">EAGGREGATOR_API_V2_NOT_ENABLED</a>);
+    <a href="aggregator_v2.md#0x1_aggregator_v2_is_at_least_impl">is_at_least_impl</a>(<a href="aggregator.md#0x1_aggregator">aggregator</a>, min_amount)
+}
+</code></pre>
+
+
+
 </details>
 
 <a id="0x1_aggregator_v2_read"></a>
@@ -409,8 +546,14 @@ If subtraction would result in a negative value, <code><b>false</b></code> is re
 
 Returns a value stored in this aggregator.
 Note: This operation is resource-intensive, and reduces parallelism.
-(Especially if called in a transaction that also modifies the aggregator,
-or has other read/write conflicts)
+If you need to capture the value, without revealing it, use snapshot function instead,
+which has no parallelism impact.
+If called in a transaction that also modifies the aggregator, or has other read/write conflicts,
+it will sequentialize that transaction. (i.e. up to concurrency_level times slower)
+If called in a separate transaction (i.e. after transaction that modifies aggregator), it might be
+up to two times slower.
+
+Parallelism info: This operation *prevents* speculative parallelism.
 
 
 <pre><code><b>public</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_read">read</a>&lt;IntElement&gt;(<a href="aggregator.md#0x1_aggregator">aggregator</a>: &<a href="aggregator_v2.md#0x1_aggregator_v2_Aggregator">aggregator_v2::Aggregator</a>&lt;IntElement&gt;): IntElement
@@ -436,6 +579,8 @@ or has other read/write conflicts)
 Returns a wrapper of a current value of an aggregator
 Unlike read(), it is fast and avoids sequential dependencies.
 
+Parallelism info: This operation enables parallelism.
+
 
 <pre><code><b>public</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_snapshot">snapshot</a>&lt;IntElement&gt;(<a href="aggregator.md#0x1_aggregator">aggregator</a>: &<a href="aggregator_v2.md#0x1_aggregator_v2_Aggregator">aggregator_v2::Aggregator</a>&lt;IntElement&gt;): <a href="aggregator_v2.md#0x1_aggregator_v2_AggregatorSnapshot">aggregator_v2::AggregatorSnapshot</a>&lt;IntElement&gt;
 </code></pre>
@@ -486,6 +631,8 @@ Note: This operation is resource-intensive, and reduces parallelism.
 (Especially if called in a transaction that also modifies the aggregator,
 or has other read/write conflicts)
 
+Parallelism info: This operation *prevents* speculative parallelism.
+
 
 <pre><code><b>public</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_read_snapshot">read_snapshot</a>&lt;IntElement&gt;(snapshot: &<a href="aggregator_v2.md#0x1_aggregator_v2_AggregatorSnapshot">aggregator_v2::AggregatorSnapshot</a>&lt;IntElement&gt;): IntElement
 </code></pre>
@@ -512,6 +659,8 @@ Note: This operation is resource-intensive, and reduces parallelism.
 (Especially if called in a transaction that also modifies the aggregator,
 or has other read/write conflicts)
 
+Parallelism info: This operation *prevents* speculative parallelism.
+
 
 <pre><code><b>public</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_read_derived_string">read_derived_string</a>(snapshot: &<a href="aggregator_v2.md#0x1_aggregator_v2_DerivedStringSnapshot">aggregator_v2::DerivedStringSnapshot</a>): <a href="../../aptos-stdlib/../move-stdlib/doc/string.md#0x1_string_String">string::String</a>
 </code></pre>
@@ -562,6 +711,8 @@ snapshot passed needs to have integer type - currently supported types are u64 a
 Raises EUNSUPPORTED_AGGREGATOR_SNAPSHOT_TYPE if called with another type.
 If length of prefix and suffix together exceed 256 bytes, ECONCAT_STRING_LENGTH_TOO_LARGE is raised.
 
+Parallelism info: This operation enables parallelism.
+
 
 <pre><code><b>public</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_derive_string_concat">derive_string_concat</a>&lt;IntElement&gt;(before: <a href="../../aptos-stdlib/../move-stdlib/doc/string.md#0x1_string_String">string::String</a>, snapshot: &<a href="aggregator_v2.md#0x1_aggregator_v2_AggregatorSnapshot">aggregator_v2::AggregatorSnapshot</a>&lt;IntElement&gt;, after: <a href="../../aptos-stdlib/../move-stdlib/doc/string.md#0x1_string_String">string::String</a>): <a href="aggregator_v2.md#0x1_aggregator_v2_DerivedStringSnapshot">aggregator_v2::DerivedStringSnapshot</a>
 </code></pre>
@@ -691,6 +842,22 @@ DEPRECATED, use derive_string_concat() instead. always raises EAGGREGATOR_FUNCTI
 
 
 
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_is_at_least_impl"></a>
+
+### Function `is_at_least_impl`
+
+
+<pre><code><b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_is_at_least_impl">is_at_least_impl</a>&lt;IntElement&gt;(<a href="aggregator.md#0x1_aggregator">aggregator</a>: &<a href="aggregator_v2.md#0x1_aggregator_v2_Aggregator">aggregator_v2::Aggregator</a>&lt;IntElement&gt;, min_amount: IntElement): bool
+</code></pre>
+
+
+
+
 <pre><code><b>pragma</b> opaque;
 </code></pre>
 
@@ -739,6 +906,70 @@ DEPRECATED, use derive_string_concat() instead. always raises EAGGREGATOR_FUNCTI
 
 
 
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_read_snapshot"></a>
+
+### Function `read_snapshot`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_read_snapshot">read_snapshot</a>&lt;IntElement&gt;(snapshot: &<a href="aggregator_v2.md#0x1_aggregator_v2_AggregatorSnapshot">aggregator_v2::AggregatorSnapshot</a>&lt;IntElement&gt;): IntElement
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_read_derived_string"></a>
+
+### Function `read_derived_string`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_read_derived_string">read_derived_string</a>(snapshot: &<a href="aggregator_v2.md#0x1_aggregator_v2_DerivedStringSnapshot">aggregator_v2::DerivedStringSnapshot</a>): <a href="../../aptos-stdlib/../move-stdlib/doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_create_derived_string"></a>
+
+### Function `create_derived_string`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_create_derived_string">create_derived_string</a>(value: <a href="../../aptos-stdlib/../move-stdlib/doc/string.md#0x1_string_String">string::String</a>): <a href="aggregator_v2.md#0x1_aggregator_v2_DerivedStringSnapshot">aggregator_v2::DerivedStringSnapshot</a>
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_derive_string_concat"></a>
+
+### Function `derive_string_concat`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_derive_string_concat">derive_string_concat</a>&lt;IntElement&gt;(before: <a href="../../aptos-stdlib/../move-stdlib/doc/string.md#0x1_string_String">string::String</a>, snapshot: &<a href="aggregator_v2.md#0x1_aggregator_v2_AggregatorSnapshot">aggregator_v2::AggregatorSnapshot</a>&lt;IntElement&gt;, after: <a href="../../aptos-stdlib/../move-stdlib/doc/string.md#0x1_string_String">string::String</a>): <a href="aggregator_v2.md#0x1_aggregator_v2_DerivedStringSnapshot">aggregator_v2::DerivedStringSnapshot</a>
+</code></pre>
+
+
+
+
 <pre><code><b>pragma</b> opaque;
 </code></pre>
 
diff --git a/aptos-move/framework/aptos-framework/doc/apt_primary_fungible_store.md b/aptos-move/framework/aptos-framework/doc/apt_primary_fungible_store.md
new file mode 100644
index 0000000000000..14dbc467f92f2
--- /dev/null
+++ b/aptos-move/framework/aptos-framework/doc/apt_primary_fungible_store.md
@@ -0,0 +1,170 @@
+
+<a id="0x1_apt_primary_fungible_store"></a>
+
+# Module `0x1::apt_primary_fungible_store`
+
+
+
+-  [Function `store_address`](#0x1_apt_primary_fungible_store_store_address)
+-  [Function `is_balance_at_least`](#0x1_apt_primary_fungible_store_is_balance_at_least)
+-  [Function `burn_from`](#0x1_apt_primary_fungible_store_burn_from)
+-  [Function `ensure_primary_store_exists`](#0x1_apt_primary_fungible_store_ensure_primary_store_exists)
+-  [Function `transfer`](#0x1_apt_primary_fungible_store_transfer)
+
+
+<pre><code><b>use</b> <a href="fungible_asset.md#0x1_fungible_asset">0x1::fungible_asset</a>;
+<b>use</b> <a href="object.md#0x1_object">0x1::object</a>;
+<b>use</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store">0x1::primary_fungible_store</a>;
+<b>use</b> <a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer">0x1::signer</a>;
+</code></pre>
+
+
+
+<a id="0x1_apt_primary_fungible_store_store_address"></a>
+
+## Function `store_address`
+
+
+
+<pre><code><b>fun</b> <a href="apt_primary_fungible_store.md#0x1_apt_primary_fungible_store_store_address">store_address</a>(<a href="account.md#0x1_account">account</a>: <b>address</b>): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="apt_primary_fungible_store.md#0x1_apt_primary_fungible_store_store_address">store_address</a>(<a href="account.md#0x1_account">account</a>: <b>address</b>): <b>address</b> {
+    <a href="object.md#0x1_object_create_user_derived_object_address">object::create_user_derived_object_address</a>(<a href="account.md#0x1_account">account</a>, @aptos_fungible_asset)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_apt_primary_fungible_store_is_balance_at_least"></a>
+
+## Function `is_balance_at_least`
+
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="apt_primary_fungible_store.md#0x1_apt_primary_fungible_store_is_balance_at_least">is_balance_at_least</a>(<a href="account.md#0x1_account">account</a>: <b>address</b>, amount: u64): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="apt_primary_fungible_store.md#0x1_apt_primary_fungible_store_is_balance_at_least">is_balance_at_least</a>(<a href="account.md#0x1_account">account</a>: <b>address</b>, amount: u64): bool {
+    <b>let</b> store_addr = <a href="apt_primary_fungible_store.md#0x1_apt_primary_fungible_store_store_address">store_address</a>(<a href="account.md#0x1_account">account</a>);
+    <a href="fungible_asset.md#0x1_fungible_asset_is_address_balance_at_least">fungible_asset::is_address_balance_at_least</a>(store_addr, amount)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_apt_primary_fungible_store_burn_from"></a>
+
+## Function `burn_from`
+
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="apt_primary_fungible_store.md#0x1_apt_primary_fungible_store_burn_from">burn_from</a>(ref: &<a href="fungible_asset.md#0x1_fungible_asset_BurnRef">fungible_asset::BurnRef</a>, <a href="account.md#0x1_account">account</a>: <b>address</b>, amount: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="apt_primary_fungible_store.md#0x1_apt_primary_fungible_store_burn_from">burn_from</a>(
+    ref: &BurnRef,
+    <a href="account.md#0x1_account">account</a>: <b>address</b>,
+    amount: u64,
+) {
+    // Skip burning <b>if</b> amount is zero. This shouldn't <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error">error</a> out <b>as</b> it's called <b>as</b> part of transaction fee burning.
+    <b>if</b> (amount != 0) {
+        <b>let</b> store_addr = <a href="apt_primary_fungible_store.md#0x1_apt_primary_fungible_store_store_address">store_address</a>(<a href="account.md#0x1_account">account</a>);
+        <a href="fungible_asset.md#0x1_fungible_asset_address_burn_from">fungible_asset::address_burn_from</a>(ref, store_addr, amount);
+    };
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_apt_primary_fungible_store_ensure_primary_store_exists"></a>
+
+## Function `ensure_primary_store_exists`
+
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="apt_primary_fungible_store.md#0x1_apt_primary_fungible_store_ensure_primary_store_exists">ensure_primary_store_exists</a>(owner: <b>address</b>): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) inline <b>fun</b> <a href="apt_primary_fungible_store.md#0x1_apt_primary_fungible_store_ensure_primary_store_exists">ensure_primary_store_exists</a>(owner: <b>address</b>): <b>address</b> {
+    <b>let</b> store_addr = <a href="apt_primary_fungible_store.md#0x1_apt_primary_fungible_store_store_address">store_address</a>(owner);
+    <b>if</b> (<a href="fungible_asset.md#0x1_fungible_asset_store_exists">fungible_asset::store_exists</a>(store_addr)) {
+        store_addr
+    } <b>else</b> {
+        <a href="object.md#0x1_object_object_address">object::object_address</a>(&<a href="primary_fungible_store.md#0x1_primary_fungible_store_create_primary_store">primary_fungible_store::create_primary_store</a>(owner, <a href="object.md#0x1_object_address_to_object">object::address_to_object</a>&lt;Metadata&gt;(@aptos_fungible_asset)))
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_apt_primary_fungible_store_transfer"></a>
+
+## Function `transfer`
+
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="apt_primary_fungible_store.md#0x1_apt_primary_fungible_store_transfer">transfer</a>(sender: &<a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer">signer</a>, recipient: <b>address</b>, amount: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="apt_primary_fungible_store.md#0x1_apt_primary_fungible_store_transfer">transfer</a>(
+    sender: &<a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer">signer</a>,
+    recipient: <b>address</b>,
+    amount: u64,
+) {
+    <b>let</b> sender_store = <a href="apt_primary_fungible_store.md#0x1_apt_primary_fungible_store_ensure_primary_store_exists">ensure_primary_store_exists</a>(<a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer_address_of">signer::address_of</a>(sender));
+    <b>let</b> recipient_store = <a href="apt_primary_fungible_store.md#0x1_apt_primary_fungible_store_ensure_primary_store_exists">ensure_primary_store_exists</a>(recipient);
+
+    // <b>use</b> <b>internal</b> APIs, <b>as</b> they skip:
+    // - owner, frozen and dispatchable checks
+    // <b>as</b> APT cannot be frozen or have dispatch, and PFS cannot be transfered
+    // (PFS could potentially be burned. regular transfer would permanently unburn the store.
+    // Ignoring the check here <b>has</b> the equivalent of unburning, transfers, and then burning again)
+    <a href="fungible_asset.md#0x1_fungible_asset_deposit_internal">fungible_asset::deposit_internal</a>(recipient_store, <a href="fungible_asset.md#0x1_fungible_asset_withdraw_internal">fungible_asset::withdraw_internal</a>(sender_store, amount));
+}
+</code></pre>
+
+
+
+</details>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-framework/doc/aptos_account.md b/aptos-move/framework/aptos-framework/doc/aptos_account.md
index 6ca7144fe7065..33cd0ff87e5a1 100644
--- a/aptos-move/framework/aptos-framework/doc/aptos_account.md
+++ b/aptos-move/framework/aptos-framework/doc/aptos_account.md
@@ -19,6 +19,12 @@
 -  [Function `assert_account_is_registered_for_apt`](#0x1_aptos_account_assert_account_is_registered_for_apt)
 -  [Function `set_allow_direct_coin_transfers`](#0x1_aptos_account_set_allow_direct_coin_transfers)
 -  [Function `can_receive_direct_coin_transfers`](#0x1_aptos_account_can_receive_direct_coin_transfers)
+-  [Function `register_apt`](#0x1_aptos_account_register_apt)
+-  [Function `fungible_transfer_only`](#0x1_aptos_account_fungible_transfer_only)
+-  [Function `is_fungible_balance_at_least`](#0x1_aptos_account_is_fungible_balance_at_least)
+-  [Function `burn_from_fungible_store`](#0x1_aptos_account_burn_from_fungible_store)
+-  [Function `ensure_primary_fungible_store_exists`](#0x1_aptos_account_ensure_primary_fungible_store_exists)
+-  [Function `primary_fungible_store_address`](#0x1_aptos_account_primary_fungible_store_address)
 -  [Specification](#@Specification_1)
     -  [High-level Requirements](#high-level-req)
     -  [Module-level Specification](#module-level-spec)
@@ -32,6 +38,10 @@
     -  [Function `assert_account_is_registered_for_apt`](#@Specification_1_assert_account_is_registered_for_apt)
     -  [Function `set_allow_direct_coin_transfers`](#@Specification_1_set_allow_direct_coin_transfers)
     -  [Function `can_receive_direct_coin_transfers`](#@Specification_1_can_receive_direct_coin_transfers)
+    -  [Function `register_apt`](#@Specification_1_register_apt)
+    -  [Function `fungible_transfer_only`](#@Specification_1_fungible_transfer_only)
+    -  [Function `is_fungible_balance_at_least`](#@Specification_1_is_fungible_balance_at_least)
+    -  [Function `burn_from_fungible_store`](#@Specification_1_burn_from_fungible_store)
 
 
 <pre><code><b>use</b> <a href="account.md#0x1_account">0x1::account</a>;
@@ -41,6 +51,9 @@
 <b>use</b> <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error">0x1::error</a>;
 <b>use</b> <a href="event.md#0x1_event">0x1::event</a>;
 <b>use</b> <a href="../../aptos-stdlib/../move-stdlib/doc/features.md#0x1_features">0x1::features</a>;
+<b>use</b> <a href="fungible_asset.md#0x1_fungible_asset">0x1::fungible_asset</a>;
+<b>use</b> <a href="object.md#0x1_object">0x1::object</a>;
+<b>use</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store">0x1::primary_fungible_store</a>;
 <b>use</b> <a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer">0x1::signer</a>;
 </code></pre>
 
@@ -216,8 +229,8 @@ Basic account creation methods.
 
 
 <pre><code><b>public</b> entry <b>fun</b> <a href="aptos_account.md#0x1_aptos_account_create_account">create_account</a>(auth_key: <b>address</b>) {
-    <b>let</b> <a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer">signer</a> = <a href="account.md#0x1_account_create_account">account::create_account</a>(auth_key);
-    <a href="coin.md#0x1_coin_register">coin::register</a>&lt;AptosCoin&gt;(&<a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer">signer</a>);
+    <b>let</b> account_signer = <a href="account.md#0x1_account_create_account">account::create_account</a>(auth_key);
+    <a href="aptos_account.md#0x1_aptos_account_register_apt">register_apt</a>(&account_signer);
 }
 </code></pre>
 
@@ -280,12 +293,17 @@ This would create the recipient account first, which also registers it to receiv
     <b>if</b> (!<a href="account.md#0x1_account_exists_at">account::exists_at</a>(<b>to</b>)) {
         <a href="aptos_account.md#0x1_aptos_account_create_account">create_account</a>(<b>to</b>)
     };
-    // Resource accounts can be created without registering them <b>to</b> receive APT.
-    // This conveniently does the registration <b>if</b> necessary.
-    <b>if</b> (!<a href="coin.md#0x1_coin_is_account_registered">coin::is_account_registered</a>&lt;AptosCoin&gt;(<b>to</b>)) {
-        <a href="coin.md#0x1_coin_register">coin::register</a>&lt;AptosCoin&gt;(&<a href="create_signer.md#0x1_create_signer">create_signer</a>(<b>to</b>));
-    };
-    <a href="coin.md#0x1_coin_transfer">coin::transfer</a>&lt;AptosCoin&gt;(source, <b>to</b>, amount)
+
+    <b>if</b> (<a href="../../aptos-stdlib/../move-stdlib/doc/features.md#0x1_features_operations_default_to_fa_apt_store_enabled">features::operations_default_to_fa_apt_store_enabled</a>()) {
+        <a href="aptos_account.md#0x1_aptos_account_fungible_transfer_only">fungible_transfer_only</a>(source, <b>to</b>, amount)
+    } <b>else</b> {
+        // Resource accounts can be created without registering them <b>to</b> receive APT.
+        // This conveniently does the registration <b>if</b> necessary.
+        <b>if</b> (!<a href="coin.md#0x1_coin_is_account_registered">coin::is_account_registered</a>&lt;AptosCoin&gt;(<b>to</b>)) {
+            <a href="coin.md#0x1_coin_register">coin::register</a>&lt;AptosCoin&gt;(&<a href="create_signer.md#0x1_create_signer">create_signer</a>(<b>to</b>));
+        };
+        <a href="coin.md#0x1_coin_transfer">coin::transfer</a>&lt;AptosCoin&gt;(source, <b>to</b>, amount)
+    }
 }
 </code></pre>
 
@@ -525,6 +543,188 @@ By default, this returns true if an account has not explicitly set whether the c
 
 
 
+</details>
+
+<a id="0x1_aptos_account_register_apt"></a>
+
+## Function `register_apt`
+
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="aptos_account.md#0x1_aptos_account_register_apt">register_apt</a>(account_signer: &<a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="aptos_account.md#0x1_aptos_account_register_apt">register_apt</a>(account_signer: &<a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer">signer</a>) {
+    <b>if</b> (<a href="../../aptos-stdlib/../move-stdlib/doc/features.md#0x1_features_new_accounts_default_to_fa_apt_store_enabled">features::new_accounts_default_to_fa_apt_store_enabled</a>()) {
+        <a href="aptos_account.md#0x1_aptos_account_ensure_primary_fungible_store_exists">ensure_primary_fungible_store_exists</a>(<a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer_address_of">signer::address_of</a>(account_signer));
+    } <b>else</b> {
+        <a href="coin.md#0x1_coin_register">coin::register</a>&lt;AptosCoin&gt;(account_signer);
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_account_fungible_transfer_only"></a>
+
+## Function `fungible_transfer_only`
+
+APT Primary Fungible Store specific specialized functions,
+Utilized internally once migration of APT to FungibleAsset is complete.
+Convenient function to transfer APT to a recipient account that might not exist.
+This would create the recipient APT PFS first, which also registers it to receive APT, before transferring.
+TODO: once migration is complete, rename to just "transfer_only" and make it an entry function (for cheapest way
+to transfer APT) - if we want to allow APT PFS without account itself
+
+
+<pre><code><b>public</b>(<b>friend</b>) entry <b>fun</b> <a href="aptos_account.md#0x1_aptos_account_fungible_transfer_only">fungible_transfer_only</a>(source: &<a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer">signer</a>, <b>to</b>: <b>address</b>, amount: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) entry <b>fun</b> <a href="aptos_account.md#0x1_aptos_account_fungible_transfer_only">fungible_transfer_only</a>(
+    source: &<a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer">signer</a>, <b>to</b>: <b>address</b>, amount: u64
+) {
+    <b>let</b> sender_store = <a href="aptos_account.md#0x1_aptos_account_ensure_primary_fungible_store_exists">ensure_primary_fungible_store_exists</a>(<a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer_address_of">signer::address_of</a>(source));
+    <b>let</b> recipient_store = <a href="aptos_account.md#0x1_aptos_account_ensure_primary_fungible_store_exists">ensure_primary_fungible_store_exists</a>(<b>to</b>);
+
+    // <b>use</b> <b>internal</b> APIs, <b>as</b> they skip:
+    // - owner, frozen and dispatchable checks
+    // <b>as</b> APT cannot be frozen or have dispatch, and PFS cannot be transfered
+    // (PFS could potentially be burned. regular transfer would permanently unburn the store.
+    // Ignoring the check here <b>has</b> the equivalent of unburning, transfers, and then burning again)
+    <a href="fungible_asset.md#0x1_fungible_asset_deposit_internal">fungible_asset::deposit_internal</a>(recipient_store, <a href="fungible_asset.md#0x1_fungible_asset_withdraw_internal">fungible_asset::withdraw_internal</a>(sender_store, amount));
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_account_is_fungible_balance_at_least"></a>
+
+## Function `is_fungible_balance_at_least`
+
+Is balance from APT Primary FungibleStore at least the given amount
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="aptos_account.md#0x1_aptos_account_is_fungible_balance_at_least">is_fungible_balance_at_least</a>(<a href="account.md#0x1_account">account</a>: <b>address</b>, amount: u64): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="aptos_account.md#0x1_aptos_account_is_fungible_balance_at_least">is_fungible_balance_at_least</a>(<a href="account.md#0x1_account">account</a>: <b>address</b>, amount: u64): bool {
+    <b>let</b> store_addr = <a href="aptos_account.md#0x1_aptos_account_primary_fungible_store_address">primary_fungible_store_address</a>(<a href="account.md#0x1_account">account</a>);
+    <a href="fungible_asset.md#0x1_fungible_asset_is_address_balance_at_least">fungible_asset::is_address_balance_at_least</a>(store_addr, amount)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_account_burn_from_fungible_store"></a>
+
+## Function `burn_from_fungible_store`
+
+Burn from APT Primary FungibleStore
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="aptos_account.md#0x1_aptos_account_burn_from_fungible_store">burn_from_fungible_store</a>(ref: &<a href="fungible_asset.md#0x1_fungible_asset_BurnRef">fungible_asset::BurnRef</a>, <a href="account.md#0x1_account">account</a>: <b>address</b>, amount: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="aptos_account.md#0x1_aptos_account_burn_from_fungible_store">burn_from_fungible_store</a>(
+    ref: &BurnRef,
+    <a href="account.md#0x1_account">account</a>: <b>address</b>,
+    amount: u64,
+) {
+    // Skip burning <b>if</b> amount is zero. This shouldn't <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error">error</a> out <b>as</b> it's called <b>as</b> part of transaction fee burning.
+    <b>if</b> (amount != 0) {
+        <b>let</b> store_addr = <a href="aptos_account.md#0x1_aptos_account_primary_fungible_store_address">primary_fungible_store_address</a>(<a href="account.md#0x1_account">account</a>);
+        <a href="fungible_asset.md#0x1_fungible_asset_address_burn_from">fungible_asset::address_burn_from</a>(ref, store_addr, amount);
+    };
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_account_ensure_primary_fungible_store_exists"></a>
+
+## Function `ensure_primary_fungible_store_exists`
+
+Ensure that APT Primary FungibleStore exists (and create if it doesn't)
+
+
+<pre><code><b>fun</b> <a href="aptos_account.md#0x1_aptos_account_ensure_primary_fungible_store_exists">ensure_primary_fungible_store_exists</a>(owner: <b>address</b>): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="aptos_account.md#0x1_aptos_account_ensure_primary_fungible_store_exists">ensure_primary_fungible_store_exists</a>(owner: <b>address</b>): <b>address</b> {
+    <b>let</b> store_addr = <a href="aptos_account.md#0x1_aptos_account_primary_fungible_store_address">primary_fungible_store_address</a>(owner);
+    <b>if</b> (<a href="fungible_asset.md#0x1_fungible_asset_store_exists">fungible_asset::store_exists</a>(store_addr)) {
+        store_addr
+    } <b>else</b> {
+        <a href="object.md#0x1_object_object_address">object::object_address</a>(&<a href="primary_fungible_store.md#0x1_primary_fungible_store_create_primary_store">primary_fungible_store::create_primary_store</a>(owner, <a href="object.md#0x1_object_address_to_object">object::address_to_object</a>&lt;Metadata&gt;(@aptos_fungible_asset)))
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_account_primary_fungible_store_address"></a>
+
+## Function `primary_fungible_store_address`
+
+Address of APT Primary Fungible Store
+
+
+<pre><code><b>fun</b> <a href="aptos_account.md#0x1_aptos_account_primary_fungible_store_address">primary_fungible_store_address</a>(<a href="account.md#0x1_account">account</a>: <b>address</b>): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="aptos_account.md#0x1_aptos_account_primary_fungible_store_address">primary_fungible_store_address</a>(<a href="account.md#0x1_account">account</a>: <b>address</b>): <b>address</b> {
+    <a href="object.md#0x1_object_create_user_derived_object_address">object::create_user_derived_object_address</a>(<a href="account.md#0x1_account">account</a>, @aptos_fungible_asset)
+}
+</code></pre>
+
+
+
 </details>
 
 <a id="@Specification_1"></a>
@@ -805,86 +1005,6 @@ Limit the address of auth_key is not @vm_reserved / @aptos_framework / @aptos_to
 
 
 
-
-<a id="0x1_aptos_account_CreateAccountTransferAbortsIf"></a>
-
-
-<pre><code><b>schema</b> <a href="aptos_account.md#0x1_aptos_account_CreateAccountTransferAbortsIf">CreateAccountTransferAbortsIf</a> {
-    <b>to</b>: <b>address</b>;
-    <b>aborts_if</b> !<a href="account.md#0x1_account_exists_at">account::exists_at</a>(<b>to</b>) && <a href="aptos_account.md#0x1_aptos_account_length_judgment">length_judgment</a>(<b>to</b>);
-    <b>aborts_if</b> !<a href="account.md#0x1_account_exists_at">account::exists_at</a>(<b>to</b>) && (<b>to</b> == @vm_reserved || <b>to</b> == @aptos_framework || <b>to</b> == @aptos_token);
-}
-</code></pre>
-
-
-
-
-<a id="0x1_aptos_account_WithdrawAbortsIf"></a>
-
-
-<pre><code><b>schema</b> <a href="aptos_account.md#0x1_aptos_account_WithdrawAbortsIf">WithdrawAbortsIf</a>&lt;CoinType&gt; {
-    from: &<a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer">signer</a>;
-    amount: u64;
-    <b>let</b> account_addr_source = <a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer_address_of">signer::address_of</a>(from);
-    <b>let</b> coin_store_source = <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;CoinType&gt;&gt;(account_addr_source);
-    <b>let</b> balance_source = coin_store_source.<a href="coin.md#0x1_coin">coin</a>.value;
-    <b>aborts_if</b> !<b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;CoinType&gt;&gt;(account_addr_source);
-    <b>aborts_if</b> coin_store_source.frozen;
-    <b>aborts_if</b> balance_source &lt; amount;
-}
-</code></pre>
-
-
-
-
-<a id="0x1_aptos_account_GuidAbortsIf"></a>
-
-
-<pre><code><b>schema</b> <a href="aptos_account.md#0x1_aptos_account_GuidAbortsIf">GuidAbortsIf</a>&lt;CoinType&gt; {
-    <b>to</b>: <b>address</b>;
-    <b>let</b> acc = <b>global</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(<b>to</b>);
-    <b>aborts_if</b> <a href="account.md#0x1_account_exists_at">account::exists_at</a>(<b>to</b>) && !<b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;CoinType&gt;&gt;(<b>to</b>) && acc.guid_creation_num + 2 &gt;= <a href="account.md#0x1_account_MAX_GUID_CREATION_NUM">account::MAX_GUID_CREATION_NUM</a>;
-    <b>aborts_if</b> <a href="account.md#0x1_account_exists_at">account::exists_at</a>(<b>to</b>) && !<b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;CoinType&gt;&gt;(<b>to</b>) && acc.guid_creation_num + 2 &gt; MAX_U64;
-}
-</code></pre>
-
-
-
-
-<a id="0x1_aptos_account_RegistCoinAbortsIf"></a>
-
-
-<pre><code><b>schema</b> <a href="aptos_account.md#0x1_aptos_account_RegistCoinAbortsIf">RegistCoinAbortsIf</a>&lt;CoinType&gt; {
-    <b>to</b>: <b>address</b>;
-    <b>aborts_if</b> !<a href="coin.md#0x1_coin_spec_is_account_registered">coin::spec_is_account_registered</a>&lt;CoinType&gt;(<b>to</b>) && !<a href="../../aptos-stdlib/doc/type_info.md#0x1_type_info_spec_is_struct">type_info::spec_is_struct</a>&lt;CoinType&gt;();
-    <b>aborts_if</b> <b>exists</b>&lt;aptos_framework::account::Account&gt;(<b>to</b>);
-    <b>aborts_if</b> <a href="../../aptos-stdlib/doc/type_info.md#0x1_type_info_type_of">type_info::type_of</a>&lt;CoinType&gt;() != <a href="../../aptos-stdlib/doc/type_info.md#0x1_type_info_type_of">type_info::type_of</a>&lt;AptosCoin&gt;();
-}
-</code></pre>
-
-
-
-
-<a id="0x1_aptos_account_TransferEnsures"></a>
-
-
-<pre><code><b>schema</b> <a href="aptos_account.md#0x1_aptos_account_TransferEnsures">TransferEnsures</a>&lt;CoinType&gt; {
-    <b>to</b>: <b>address</b>;
-    account_addr_source: <b>address</b>;
-    amount: u64;
-    <b>let</b> if_exist_account = <b>exists</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(<b>to</b>);
-    <b>let</b> if_exist_coin = <b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;CoinType&gt;&gt;(<b>to</b>);
-    <b>let</b> coin_store_to = <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;CoinType&gt;&gt;(<b>to</b>);
-    <b>let</b> coin_store_source = <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;CoinType&gt;&gt;(account_addr_source);
-    <b>let</b> <b>post</b> p_coin_store_to = <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;CoinType&gt;&gt;(<b>to</b>);
-    <b>let</b> <b>post</b> p_coin_store_source = <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;CoinType&gt;&gt;(account_addr_source);
-    <b>ensures</b> coin_store_source.<a href="coin.md#0x1_coin">coin</a>.value - amount == p_coin_store_source.<a href="coin.md#0x1_coin">coin</a>.value;
-    <b>ensures</b> if_exist_account && if_exist_coin ==&gt; coin_store_to.<a href="coin.md#0x1_coin">coin</a>.value + amount == p_coin_store_to.<a href="coin.md#0x1_coin">coin</a>.value;
-}
-</code></pre>
-
-
-
 <a id="@Specification_1_deposit_coins"></a>
 
 ### Function `deposit_coins`
@@ -985,4 +1105,148 @@ Check if the AptosCoin under the address existed.
 </code></pre>
 
 
+
+<a id="@Specification_1_register_apt"></a>
+
+### Function `register_apt`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="aptos_account.md#0x1_aptos_account_register_apt">register_apt</a>(account_signer: &<a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_fungible_transfer_only"></a>
+
+### Function `fungible_transfer_only`
+
+
+<pre><code><b>public</b>(<b>friend</b>) entry <b>fun</b> <a href="aptos_account.md#0x1_aptos_account_fungible_transfer_only">fungible_transfer_only</a>(source: &<a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer">signer</a>, <b>to</b>: <b>address</b>, amount: u64)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_is_fungible_balance_at_least"></a>
+
+### Function `is_fungible_balance_at_least`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="aptos_account.md#0x1_aptos_account_is_fungible_balance_at_least">is_fungible_balance_at_least</a>(<a href="account.md#0x1_account">account</a>: <b>address</b>, amount: u64): bool
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_burn_from_fungible_store"></a>
+
+### Function `burn_from_fungible_store`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="aptos_account.md#0x1_aptos_account_burn_from_fungible_store">burn_from_fungible_store</a>(ref: &<a href="fungible_asset.md#0x1_fungible_asset_BurnRef">fungible_asset::BurnRef</a>, <a href="account.md#0x1_account">account</a>: <b>address</b>, amount: u64)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+
+<a id="0x1_aptos_account_CreateAccountTransferAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="aptos_account.md#0x1_aptos_account_CreateAccountTransferAbortsIf">CreateAccountTransferAbortsIf</a> {
+    <b>to</b>: <b>address</b>;
+    <b>aborts_if</b> !<a href="account.md#0x1_account_exists_at">account::exists_at</a>(<b>to</b>) && <a href="aptos_account.md#0x1_aptos_account_length_judgment">length_judgment</a>(<b>to</b>);
+    <b>aborts_if</b> !<a href="account.md#0x1_account_exists_at">account::exists_at</a>(<b>to</b>) && (<b>to</b> == @vm_reserved || <b>to</b> == @aptos_framework || <b>to</b> == @aptos_token);
+}
+</code></pre>
+
+
+
+
+<a id="0x1_aptos_account_WithdrawAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="aptos_account.md#0x1_aptos_account_WithdrawAbortsIf">WithdrawAbortsIf</a>&lt;CoinType&gt; {
+    from: &<a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer">signer</a>;
+    amount: u64;
+    <b>let</b> account_addr_source = <a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer_address_of">signer::address_of</a>(from);
+    <b>let</b> coin_store_source = <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;CoinType&gt;&gt;(account_addr_source);
+    <b>let</b> balance_source = coin_store_source.<a href="coin.md#0x1_coin">coin</a>.value;
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;CoinType&gt;&gt;(account_addr_source);
+    <b>aborts_if</b> coin_store_source.frozen;
+    <b>aborts_if</b> balance_source &lt; amount;
+}
+</code></pre>
+
+
+
+
+<a id="0x1_aptos_account_GuidAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="aptos_account.md#0x1_aptos_account_GuidAbortsIf">GuidAbortsIf</a>&lt;CoinType&gt; {
+    <b>to</b>: <b>address</b>;
+    <b>let</b> acc = <b>global</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(<b>to</b>);
+    <b>aborts_if</b> <a href="account.md#0x1_account_exists_at">account::exists_at</a>(<b>to</b>) && !<b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;CoinType&gt;&gt;(<b>to</b>) && acc.guid_creation_num + 2 &gt;= <a href="account.md#0x1_account_MAX_GUID_CREATION_NUM">account::MAX_GUID_CREATION_NUM</a>;
+    <b>aborts_if</b> <a href="account.md#0x1_account_exists_at">account::exists_at</a>(<b>to</b>) && !<b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;CoinType&gt;&gt;(<b>to</b>) && acc.guid_creation_num + 2 &gt; MAX_U64;
+}
+</code></pre>
+
+
+
+
+<a id="0x1_aptos_account_RegistCoinAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="aptos_account.md#0x1_aptos_account_RegistCoinAbortsIf">RegistCoinAbortsIf</a>&lt;CoinType&gt; {
+    <b>to</b>: <b>address</b>;
+    <b>aborts_if</b> !<a href="coin.md#0x1_coin_spec_is_account_registered">coin::spec_is_account_registered</a>&lt;CoinType&gt;(<b>to</b>) && !<a href="../../aptos-stdlib/doc/type_info.md#0x1_type_info_spec_is_struct">type_info::spec_is_struct</a>&lt;CoinType&gt;();
+    <b>aborts_if</b> <b>exists</b>&lt;aptos_framework::account::Account&gt;(<b>to</b>);
+    <b>aborts_if</b> <a href="../../aptos-stdlib/doc/type_info.md#0x1_type_info_type_of">type_info::type_of</a>&lt;CoinType&gt;() != <a href="../../aptos-stdlib/doc/type_info.md#0x1_type_info_type_of">type_info::type_of</a>&lt;AptosCoin&gt;();
+}
+</code></pre>
+
+
+
+
+<a id="0x1_aptos_account_TransferEnsures"></a>
+
+
+<pre><code><b>schema</b> <a href="aptos_account.md#0x1_aptos_account_TransferEnsures">TransferEnsures</a>&lt;CoinType&gt; {
+    <b>to</b>: <b>address</b>;
+    account_addr_source: <b>address</b>;
+    amount: u64;
+    <b>let</b> if_exist_account = <b>exists</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(<b>to</b>);
+    <b>let</b> if_exist_coin = <b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;CoinType&gt;&gt;(<b>to</b>);
+    <b>let</b> coin_store_to = <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;CoinType&gt;&gt;(<b>to</b>);
+    <b>let</b> coin_store_source = <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;CoinType&gt;&gt;(account_addr_source);
+    <b>let</b> <b>post</b> p_coin_store_to = <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;CoinType&gt;&gt;(<b>to</b>);
+    <b>let</b> <b>post</b> p_coin_store_source = <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;CoinType&gt;&gt;(account_addr_source);
+    <b>ensures</b> coin_store_source.<a href="coin.md#0x1_coin">coin</a>.value - amount == p_coin_store_source.<a href="coin.md#0x1_coin">coin</a>.value;
+    <b>ensures</b> if_exist_account && if_exist_coin ==&gt; coin_store_to.<a href="coin.md#0x1_coin">coin</a>.value + amount == p_coin_store_to.<a href="coin.md#0x1_coin">coin</a>.value;
+}
+</code></pre>
+
+
 [move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-framework/doc/aptos_coin.md b/aptos-move/framework/aptos-framework/doc/aptos_coin.md
index 172f2f2ce4178..30f3eae067ed8 100644
--- a/aptos-move/framework/aptos-framework/doc/aptos_coin.md
+++ b/aptos-move/framework/aptos-framework/doc/aptos_coin.md
@@ -286,6 +286,7 @@ and accounts have been initialized during genesis.
 
 Can only be called during genesis for tests to grant mint capability to aptos framework and core resources
 accounts.
+Expects account and APT store to be registered before calling.
 
 
 <pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="aptos_coin.md#0x1_aptos_coin_configure_accounts_for_test">configure_accounts_for_test</a>(aptos_framework: &<a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer">signer</a>, core_resources: &<a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer">signer</a>, mint_cap: <a href="coin.md#0x1_coin_MintCapability">coin::MintCapability</a>&lt;<a href="aptos_coin.md#0x1_aptos_coin_AptosCoin">aptos_coin::AptosCoin</a>&gt;)
@@ -305,7 +306,6 @@ accounts.
     <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(aptos_framework);
 
     // Mint the core resource <a href="account.md#0x1_account">account</a> <a href="aptos_coin.md#0x1_aptos_coin_AptosCoin">AptosCoin</a> for gas so it can execute system transactions.
-    <a href="coin.md#0x1_coin_register">coin::register</a>&lt;<a href="aptos_coin.md#0x1_aptos_coin_AptosCoin">AptosCoin</a>&gt;(core_resources);
     <b>let</b> coins = <a href="coin.md#0x1_coin_mint">coin::mint</a>&lt;<a href="aptos_coin.md#0x1_aptos_coin_AptosCoin">AptosCoin</a>&gt;(
         18446744073709551615,
         &mint_cap,
diff --git a/aptos-move/framework/aptos-framework/doc/aptos_governance.md b/aptos-move/framework/aptos-framework/doc/aptos_governance.md
index 820c973dba875..4daf73a12bded 100644
--- a/aptos-move/framework/aptos-framework/doc/aptos_governance.md
+++ b/aptos-move/framework/aptos-framework/doc/aptos_governance.md
@@ -42,6 +42,8 @@ on a proposal multiple times as long as the total voting power of these votes do
 -  [Function `create_proposal`](#0x1_aptos_governance_create_proposal)
 -  [Function `create_proposal_v2`](#0x1_aptos_governance_create_proposal_v2)
 -  [Function `create_proposal_v2_impl`](#0x1_aptos_governance_create_proposal_v2_impl)
+-  [Function `batch_vote`](#0x1_aptos_governance_batch_vote)
+-  [Function `batch_partial_vote`](#0x1_aptos_governance_batch_partial_vote)
 -  [Function `vote`](#0x1_aptos_governance_vote)
 -  [Function `partial_vote`](#0x1_aptos_governance_partial_vote)
 -  [Function `vote_internal`](#0x1_aptos_governance_vote_internal)
@@ -75,6 +77,8 @@ on a proposal multiple times as long as the total voting power of these votes do
     -  [Function `create_proposal`](#@Specification_1_create_proposal)
     -  [Function `create_proposal_v2`](#@Specification_1_create_proposal_v2)
     -  [Function `create_proposal_v2_impl`](#@Specification_1_create_proposal_v2_impl)
+    -  [Function `batch_vote`](#@Specification_1_batch_vote)
+    -  [Function `batch_partial_vote`](#@Specification_1_batch_partial_vote)
     -  [Function `vote`](#@Specification_1_vote)
     -  [Function `partial_vote`](#@Specification_1_partial_vote)
     -  [Function `vote_internal`](#@Specification_1_vote_internal)
@@ -116,6 +120,7 @@ on a proposal multiple times as long as the total voting power of these votes do
 <b>use</b> <a href="system_addresses.md#0x1_system_addresses">0x1::system_addresses</a>;
 <b>use</b> <a href="../../aptos-stdlib/doc/table.md#0x1_table">0x1::table</a>;
 <b>use</b> <a href="timestamp.md#0x1_timestamp">0x1::timestamp</a>;
+<b>use</b> <a href="../../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector">0x1::vector</a>;
 <b>use</b> <a href="voting.md#0x1_voting">0x1::voting</a>;
 </code></pre>
 
@@ -1333,6 +1338,71 @@ Return proposal_id when a proposal is successfully created.
 
 
 
+</details>
+
+<a id="0x1_aptos_governance_batch_vote"></a>
+
+## Function `batch_vote`
+
+Vote on proposal with proposal_id and all voting power from multiple stake_pools.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_batch_vote">batch_vote</a>(voter: &<a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer">signer</a>, stake_pools: <a href="../../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;, proposal_id: u64, should_pass: bool)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_batch_vote">batch_vote</a>(
+    voter: &<a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer">signer</a>,
+    stake_pools: <a href="../../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;,
+    proposal_id: u64,
+    should_pass: bool,
+) <b>acquires</b> <a href="aptos_governance.md#0x1_aptos_governance_ApprovedExecutionHashes">ApprovedExecutionHashes</a>, <a href="aptos_governance.md#0x1_aptos_governance_VotingRecords">VotingRecords</a>, <a href="aptos_governance.md#0x1_aptos_governance_VotingRecordsV2">VotingRecordsV2</a>, <a href="aptos_governance.md#0x1_aptos_governance_GovernanceEvents">GovernanceEvents</a> {
+    <a href="../../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector_for_each">vector::for_each</a>(stake_pools, |stake_pool| {
+        <a href="aptos_governance.md#0x1_aptos_governance_vote_internal">vote_internal</a>(voter, stake_pool, proposal_id, <a href="aptos_governance.md#0x1_aptos_governance_MAX_U64">MAX_U64</a>, should_pass);
+    });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_governance_batch_partial_vote"></a>
+
+## Function `batch_partial_vote`
+
+Batch vote on proposal with proposal_id and specified voting power from multiple stake_pools.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_batch_partial_vote">batch_partial_vote</a>(voter: &<a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer">signer</a>, stake_pools: <a href="../../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;, proposal_id: u64, voting_power: u64, should_pass: bool)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_batch_partial_vote">batch_partial_vote</a>(
+    voter: &<a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer">signer</a>,
+    stake_pools: <a href="../../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;,
+    proposal_id: u64,
+    voting_power: u64,
+    should_pass: bool,
+) <b>acquires</b> <a href="aptos_governance.md#0x1_aptos_governance_ApprovedExecutionHashes">ApprovedExecutionHashes</a>, <a href="aptos_governance.md#0x1_aptos_governance_VotingRecords">VotingRecords</a>, <a href="aptos_governance.md#0x1_aptos_governance_VotingRecordsV2">VotingRecordsV2</a>, <a href="aptos_governance.md#0x1_aptos_governance_GovernanceEvents">GovernanceEvents</a> {
+    <a href="../../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector_for_each">vector::for_each</a>(stake_pools, |stake_pool| {
+        <a href="aptos_governance.md#0x1_aptos_governance_vote_internal">vote_internal</a>(voter, stake_pool, proposal_id, voting_power, should_pass);
+    });
+}
+</code></pre>
+
+
+
 </details>
 
 <a id="0x1_aptos_governance_vote"></a>
@@ -2412,6 +2482,38 @@ The same as spec of <code><a href="aptos_governance.md#0x1_aptos_governance_crea
 
 
 
+<a id="@Specification_1_batch_vote"></a>
+
+### Function `batch_vote`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_batch_vote">batch_vote</a>(voter: &<a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer">signer</a>, stake_pools: <a href="../../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;, proposal_id: u64, should_pass: bool)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_batch_partial_vote"></a>
+
+### Function `batch_partial_vote`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_batch_partial_vote">batch_partial_vote</a>(voter: &<a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer">signer</a>, stake_pools: <a href="../../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;, proposal_id: u64, voting_power: u64, should_pass: bool)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
 <a id="@Specification_1_vote"></a>
 
 ### Function `vote`
diff --git a/aptos-move/framework/aptos-framework/doc/aptos_primary_fungible_store.md b/aptos-move/framework/aptos-framework/doc/aptos_primary_fungible_store.md
new file mode 100644
index 0000000000000..4b7016bd45f47
--- /dev/null
+++ b/aptos-move/framework/aptos-framework/doc/aptos_primary_fungible_store.md
@@ -0,0 +1,170 @@
+
+<a id="0x1_aptos_primary_fungible_store"></a>
+
+# Module `0x1::apt_primary_fungible_store`
+
+
+
+-  [Function `store_address`](#0x1_aptos_primary_fungible_store_store_address)
+-  [Function `is_balance_at_least`](#0x1_aptos_primary_fungible_store_is_balance_at_least)
+-  [Function `burn_from`](#0x1_aptos_primary_fungible_store_burn_from)
+-  [Function `ensure_primary_store_exists`](#0x1_aptos_primary_fungible_store_ensure_primary_store_exists)
+-  [Function `transfer`](#0x1_aptos_primary_fungible_store_transfer)
+
+
+<pre><code><b>use</b> <a href="fungible_asset.md#0x1_fungible_asset">0x1::fungible_asset</a>;
+<b>use</b> <a href="object.md#0x1_object">0x1::object</a>;
+<b>use</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store">0x1::primary_fungible_store</a>;
+<b>use</b> <a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer">0x1::signer</a>;
+</code></pre>
+
+
+
+<a id="0x1_aptos_primary_fungible_store_store_address"></a>
+
+## Function `store_address`
+
+
+
+<pre><code><b>fun</b> <a href="apt_primary_fungible_store.md#0x1_aptos_primary_fungible_store_store_address">store_address</a>(<a href="account.md#0x1_account">account</a>: <b>address</b>): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="apt_primary_fungible_store.md#0x1_aptos_primary_fungible_store_store_address">store_address</a>(<a href="account.md#0x1_account">account</a>: <b>address</b>): <b>address</b> {
+    <a href="object.md#0x1_object_create_user_derived_object_address">object::create_user_derived_object_address</a>(<a href="account.md#0x1_account">account</a>, @aptos_fungible_asset)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_primary_fungible_store_is_balance_at_least"></a>
+
+## Function `is_balance_at_least`
+
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="apt_primary_fungible_store.md#0x1_aptos_primary_fungible_store_is_balance_at_least">is_balance_at_least</a>(<a href="account.md#0x1_account">account</a>: <b>address</b>, amount: u64): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="apt_primary_fungible_store.md#0x1_aptos_primary_fungible_store_is_balance_at_least">is_balance_at_least</a>(<a href="account.md#0x1_account">account</a>: <b>address</b>, amount: u64): bool {
+    <b>let</b> store_addr = <a href="apt_primary_fungible_store.md#0x1_aptos_primary_fungible_store_store_address">store_address</a>(<a href="account.md#0x1_account">account</a>);
+    <a href="fungible_asset.md#0x1_fungible_asset_is_address_balance_at_least">fungible_asset::is_address_balance_at_least</a>(store_addr, amount)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_primary_fungible_store_burn_from"></a>
+
+## Function `burn_from`
+
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="apt_primary_fungible_store.md#0x1_aptos_primary_fungible_store_burn_from">burn_from</a>(ref: &<a href="fungible_asset.md#0x1_fungible_asset_BurnRef">fungible_asset::BurnRef</a>, <a href="account.md#0x1_account">account</a>: <b>address</b>, amount: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="apt_primary_fungible_store.md#0x1_aptos_primary_fungible_store_burn_from">burn_from</a>(
+    ref: &BurnRef,
+    <a href="account.md#0x1_account">account</a>: <b>address</b>,
+    amount: u64,
+) {
+    // Skip burning <b>if</b> amount is zero. This shouldn't <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error">error</a> out <b>as</b> it's called <b>as</b> part of transaction fee burning.
+    <b>if</b> (amount != 0) {
+        <b>let</b> store_addr = <a href="apt_primary_fungible_store.md#0x1_aptos_primary_fungible_store_store_address">store_address</a>(<a href="account.md#0x1_account">account</a>);
+        <a href="fungible_asset.md#0x1_fungible_asset_address_burn_from">fungible_asset::address_burn_from</a>(ref, store_addr, amount);
+    };
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_primary_fungible_store_ensure_primary_store_exists"></a>
+
+## Function `ensure_primary_store_exists`
+
+
+
+<pre><code><b>fun</b> <a href="apt_primary_fungible_store.md#0x1_aptos_primary_fungible_store_ensure_primary_store_exists">ensure_primary_store_exists</a>(owner: <b>address</b>): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="apt_primary_fungible_store.md#0x1_aptos_primary_fungible_store_ensure_primary_store_exists">ensure_primary_store_exists</a>(owner: <b>address</b>): <b>address</b> {
+    <b>let</b> store_addr = <a href="apt_primary_fungible_store.md#0x1_aptos_primary_fungible_store_store_address">store_address</a>(owner);
+    <b>if</b> (<a href="fungible_asset.md#0x1_fungible_asset_store_exists">fungible_asset::store_exists</a>(store_addr)) {
+        store_addr
+    } <b>else</b> {
+        <a href="object.md#0x1_object_object_address">object::object_address</a>(&<a href="primary_fungible_store.md#0x1_primary_fungible_store_create_primary_store">primary_fungible_store::create_primary_store</a>(owner, <a href="object.md#0x1_object_address_to_object">object::address_to_object</a>&lt;Metadata&gt;(@aptos_fungible_asset)))
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_primary_fungible_store_transfer"></a>
+
+## Function `transfer`
+
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="apt_primary_fungible_store.md#0x1_aptos_primary_fungible_store_transfer">transfer</a>(sender: &<a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer">signer</a>, recipient: <b>address</b>, amount: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="apt_primary_fungible_store.md#0x1_aptos_primary_fungible_store_transfer">transfer</a>(
+    sender: &<a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer">signer</a>,
+    recipient: <b>address</b>,
+    amount: u64,
+) {
+    <b>let</b> sender_store = <a href="apt_primary_fungible_store.md#0x1_aptos_primary_fungible_store_ensure_primary_store_exists">ensure_primary_store_exists</a>(<a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer_address_of">signer::address_of</a>(sender));
+    <b>let</b> recipient_store = <a href="apt_primary_fungible_store.md#0x1_aptos_primary_fungible_store_ensure_primary_store_exists">ensure_primary_store_exists</a>(recipient);
+
+    // <b>use</b> <b>internal</b> APIs, <b>as</b> they skip:
+    // - owner, frozen and dispatchable checks
+    // <b>as</b> APT cannot be frozen or have dispatch, and PFS cannot be transfered
+    // (PFS could potentially be burned. regular transfer would permanently unburn the store.
+    // Ignoring the check here <b>has</b> the equivalent of unburning, transfers, and then burning again)
+    <a href="fungible_asset.md#0x1_fungible_asset_deposit_internal">fungible_asset::deposit_internal</a>(recipient_store, <a href="fungible_asset.md#0x1_fungible_asset_withdraw_internal">fungible_asset::withdraw_internal</a>(sender_store, amount));
+}
+</code></pre>
+
+
+
+</details>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-framework/doc/code.md b/aptos-move/framework/aptos-framework/doc/code.md
index 9eced3743699d..ce18af9e16fbc 100644
--- a/aptos-move/framework/aptos-framework/doc/code.md
+++ b/aptos-move/framework/aptos-framework/doc/code.md
@@ -94,7 +94,7 @@ The package registry at the given address.
 Metadata for a package. All byte blobs are represented as base64-of-gzipped-bytes
 
 
-<pre><code><b>struct</b> <a href="code.md#0x1_code_PackageMetadata">PackageMetadata</a> <b>has</b> drop, store
+<pre><code><b>struct</b> <a href="code.md#0x1_code_PackageMetadata">PackageMetadata</a> <b>has</b> <b>copy</b>, drop, store
 </code></pre>
 
 
@@ -200,7 +200,7 @@ A dependency to a package published at address
 Metadata about a module in a package.
 
 
-<pre><code><b>struct</b> <a href="code.md#0x1_code_ModuleMetadata">ModuleMetadata</a> <b>has</b> drop, store
+<pre><code><b>struct</b> <a href="code.md#0x1_code_ModuleMetadata">ModuleMetadata</a> <b>has</b> <b>copy</b>, drop, store
 </code></pre>
 
 
@@ -612,9 +612,9 @@ package.
     // Checks for valid dependencies <b>to</b> other packages
     <b>let</b> allowed_deps = <a href="code.md#0x1_code_check_dependencies">check_dependencies</a>(addr, &pack);
 
-    // Check package against conflicts
+    // Check <b>package</b> against conflicts
     // To avoid prover compiler <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error">error</a> on <b>spec</b>
-    // the package need <b>to</b> be an immutable variable
+    // the <b>package</b> need <b>to</b> be an immutable variable
     <b>let</b> module_names = <a href="code.md#0x1_code_get_module_names">get_module_names</a>(&pack);
     <b>let</b> package_immutable = &<b>borrow_global</b>&lt;<a href="code.md#0x1_code_PackageRegistry">PackageRegistry</a>&gt;(addr).packages;
     <b>let</b> len = <a href="../../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector_length">vector::length</a>(package_immutable);
@@ -687,9 +687,17 @@ package.
     );
 
     <b>let</b> registry = <b>borrow_global_mut</b>&lt;<a href="code.md#0x1_code_PackageRegistry">PackageRegistry</a>&gt;(code_object_addr);
-    <a href="../../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector_for_each_mut">vector::for_each_mut</a>&lt;<a href="code.md#0x1_code_PackageMetadata">PackageMetadata</a>&gt;(&<b>mut</b> registry.packages, |pack| {
-        <b>let</b> package: &<b>mut</b> <a href="code.md#0x1_code_PackageMetadata">PackageMetadata</a> = pack;
-        package.upgrade_policy = <a href="code.md#0x1_code_upgrade_policy_immutable">upgrade_policy_immutable</a>();
+    <a href="../../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector_for_each_mut">vector::for_each_mut</a>(&<b>mut</b> registry.packages, |pack| {
+        <b>let</b> <b>package</b>: &<b>mut</b> <a href="code.md#0x1_code_PackageMetadata">PackageMetadata</a> = pack;
+        <b>package</b>.upgrade_policy = <a href="code.md#0x1_code_upgrade_policy_immutable">upgrade_policy_immutable</a>();
+    });
+
+    // We unfortunately have <b>to</b> make a <b>copy</b> of each <b>package</b> <b>to</b> avoid borrow checker issues <b>as</b> check_dependencies
+    // needs <b>to</b> borrow <a href="code.md#0x1_code_PackageRegistry">PackageRegistry</a> from the dependency packages.
+    // This would increase the amount of gas used, but this is a rare operation and it's rare <b>to</b> have many packages
+    // in a single <a href="code.md#0x1_code">code</a> <a href="object.md#0x1_object">object</a>.
+    <a href="../../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector_for_each">vector::for_each</a>(registry.packages, |pack| {
+        <a href="code.md#0x1_code_check_dependencies">check_dependencies</a>(code_object_addr, &pack);
     });
 }
 </code></pre>
@@ -779,7 +787,7 @@ Checks whether a new package with given names can co-exist with old package.
 
 
 <pre><code><b>fun</b> <a href="code.md#0x1_code_check_coexistence">check_coexistence</a>(old_pack: &<a href="code.md#0x1_code_PackageMetadata">PackageMetadata</a>, new_modules: &<a href="../../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector">vector</a>&lt;String&gt;) {
-    // The modules introduced by each package must not overlap <b>with</b> `names`.
+    // The modules introduced by each <b>package</b> must not overlap <b>with</b> `names`.
     <a href="../../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector_for_each_ref">vector::for_each_ref</a>(&old_pack.modules, |old_mod| {
         <b>let</b> old_mod: &<a href="code.md#0x1_code_ModuleMetadata">ModuleMetadata</a> = old_mod;
         <b>let</b> j = 0;
diff --git a/aptos-move/framework/aptos-framework/doc/coin.md b/aptos-move/framework/aptos-framework/doc/coin.md
index 67c417c3fce82..07e97171f99b1 100644
--- a/aptos-move/framework/aptos-framework/doc/coin.md
+++ b/aptos-move/framework/aptos-framework/doc/coin.md
@@ -11,10 +11,12 @@ This module provides the foundation for typesafe Coins.
 -  [Resource `CoinStore`](#0x1_coin_CoinStore)
 -  [Resource `SupplyConfig`](#0x1_coin_SupplyConfig)
 -  [Resource `CoinInfo`](#0x1_coin_CoinInfo)
--  [Struct `DepositEvent`](#0x1_coin_DepositEvent)
+-  [Struct `CoinDeposit`](#0x1_coin_CoinDeposit)
+-  [Struct `CoinWithdraw`](#0x1_coin_CoinWithdraw)
 -  [Struct `Deposit`](#0x1_coin_Deposit)
--  [Struct `WithdrawEvent`](#0x1_coin_WithdrawEvent)
 -  [Struct `Withdraw`](#0x1_coin_Withdraw)
+-  [Struct `DepositEvent`](#0x1_coin_DepositEvent)
+-  [Struct `WithdrawEvent`](#0x1_coin_WithdrawEvent)
 -  [Struct `CoinEventHandleDeletion`](#0x1_coin_CoinEventHandleDeletion)
 -  [Struct `PairCreation`](#0x1_coin_PairCreation)
 -  [Resource `MigrationFlag`](#0x1_coin_MigrationFlag)
@@ -48,6 +50,7 @@ This module provides the foundation for typesafe Coins.
 -  [Function `return_paired_transfer_ref`](#0x1_coin_return_paired_transfer_ref)
 -  [Function `paired_burn_ref_exists`](#0x1_coin_paired_burn_ref_exists)
 -  [Function `get_paired_burn_ref`](#0x1_coin_get_paired_burn_ref)
+-  [Function `convert_and_take_paired_burn_ref`](#0x1_coin_convert_and_take_paired_burn_ref)
 -  [Function `return_paired_burn_ref`](#0x1_coin_return_paired_burn_ref)
 -  [Function `borrow_paired_burn_ref`](#0x1_coin_borrow_paired_burn_ref)
 -  [Function `initialize_supply_config`](#0x1_coin_initialize_supply_config)
@@ -349,14 +352,15 @@ Information about a specific coin type. Stored on the creator of the coin's acco
 
 </details>
 
-<a id="0x1_coin_DepositEvent"></a>
+<a id="0x1_coin_CoinDeposit"></a>
 
-## Struct `DepositEvent`
+## Struct `CoinDeposit`
 
-Event emitted when some amount of a coin is deposited into an account.
+Module event emitted when some amount of a coin is deposited into an account.
 
 
-<pre><code><b>struct</b> <a href="coin.md#0x1_coin_DepositEvent">DepositEvent</a> <b>has</b> drop, store
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="coin.md#0x1_coin_CoinDeposit">CoinDeposit</a> <b>has</b> drop, store
 </code></pre>
 
 
@@ -367,6 +371,18 @@ Event emitted when some amount of a coin is deposited into an account.
 
 <dl>
 <dt>
+<code>coin_type: <a href="../../aptos-stdlib/../move-stdlib/doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code><a href="account.md#0x1_account">account</a>: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
 <code>amount: u64</code>
 </dt>
 <dd>
@@ -377,15 +393,15 @@ Event emitted when some amount of a coin is deposited into an account.
 
 </details>
 
-<a id="0x1_coin_Deposit"></a>
+<a id="0x1_coin_CoinWithdraw"></a>
 
-## Struct `Deposit`
+## Struct `CoinWithdraw`
 
-Module event emitted when some amount of a coin is deposited into an account.
+Module event emitted when some amount of a coin is withdrawn from an account.
 
 
 <pre><code>#[<a href="event.md#0x1_event">event</a>]
-<b>struct</b> <a href="coin.md#0x1_coin_Deposit">Deposit</a>&lt;CoinType&gt; <b>has</b> drop, store
+<b>struct</b> <a href="coin.md#0x1_coin_CoinWithdraw">CoinWithdraw</a> <b>has</b> drop, store
 </code></pre>
 
 
@@ -396,6 +412,12 @@ Module event emitted when some amount of a coin is deposited into an account.
 
 <dl>
 <dt>
+<code>coin_type: <a href="../../aptos-stdlib/../move-stdlib/doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
 <code><a href="account.md#0x1_account">account</a>: <b>address</b></code>
 </dt>
 <dd>
@@ -412,14 +434,15 @@ Module event emitted when some amount of a coin is deposited into an account.
 
 </details>
 
-<a id="0x1_coin_WithdrawEvent"></a>
+<a id="0x1_coin_Deposit"></a>
 
-## Struct `WithdrawEvent`
+## Struct `Deposit`
 
-Event emitted when some amount of a coin is withdrawn from an account.
 
 
-<pre><code><b>struct</b> <a href="coin.md#0x1_coin_WithdrawEvent">WithdrawEvent</a> <b>has</b> drop, store
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+#[deprecated]
+<b>struct</b> <a href="coin.md#0x1_coin_Deposit">Deposit</a>&lt;CoinType&gt; <b>has</b> drop, store
 </code></pre>
 
 
@@ -430,6 +453,12 @@ Event emitted when some amount of a coin is withdrawn from an account.
 
 <dl>
 <dt>
+<code><a href="account.md#0x1_account">account</a>: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
 <code>amount: u64</code>
 </dt>
 <dd>
@@ -444,10 +473,10 @@ Event emitted when some amount of a coin is withdrawn from an account.
 
 ## Struct `Withdraw`
 
-Module event emitted when some amount of a coin is withdrawn from an account.
 
 
 <pre><code>#[<a href="event.md#0x1_event">event</a>]
+#[deprecated]
 <b>struct</b> <a href="coin.md#0x1_coin_Withdraw">Withdraw</a>&lt;CoinType&gt; <b>has</b> drop, store
 </code></pre>
 
@@ -473,6 +502,62 @@ Module event emitted when some amount of a coin is withdrawn from an account.
 </dl>
 
 
+</details>
+
+<a id="0x1_coin_DepositEvent"></a>
+
+## Struct `DepositEvent`
+
+Event emitted when some amount of a coin is deposited into an account.
+
+
+<pre><code><b>struct</b> <a href="coin.md#0x1_coin_DepositEvent">DepositEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>amount: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_coin_WithdrawEvent"></a>
+
+## Struct `WithdrawEvent`
+
+Event emitted when some amount of a coin is withdrawn from an account.
+
+
+<pre><code><b>struct</b> <a href="coin.md#0x1_coin_WithdrawEvent">WithdrawEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>amount: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
 </details>
 
 <a id="0x1_coin_CoinEventHandleDeletion"></a>
@@ -1355,7 +1440,7 @@ Create APT pairing by passing <code>AptosCoin</code>.
             };
         <a href="primary_fungible_store.md#0x1_primary_fungible_store_create_primary_store_enabled_fungible_asset">primary_fungible_store::create_primary_store_enabled_fungible_asset</a>(
             &metadata_object_cref,
-            <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_map">option::map</a>(<a href="coin.md#0x1_coin_coin_supply">coin_supply</a>&lt;CoinType&gt;(), |_| <a href="coin.md#0x1_coin_MAX_U128">MAX_U128</a>),
+            <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_none">option::none</a>(),
             <a href="coin.md#0x1_coin_name">name</a>&lt;CoinType&gt;(),
             <a href="coin.md#0x1_coin_symbol">symbol</a>&lt;CoinType&gt;(),
             <a href="coin.md#0x1_coin_decimals">decimals</a>&lt;CoinType&gt;(),
@@ -1788,6 +1873,38 @@ Get the <code>BurnRef</code> of paired fungible asset of a coin type from <code>
 
 
 
+</details>
+
+<a id="0x1_coin_convert_and_take_paired_burn_ref"></a>
+
+## Function `convert_and_take_paired_burn_ref`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_convert_and_take_paired_burn_ref">convert_and_take_paired_burn_ref</a>&lt;CoinType&gt;(burn_cap: <a href="coin.md#0x1_coin_BurnCapability">coin::BurnCapability</a>&lt;CoinType&gt;): <a href="fungible_asset.md#0x1_fungible_asset_BurnRef">fungible_asset::BurnRef</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_convert_and_take_paired_burn_ref">convert_and_take_paired_burn_ref</a>&lt;CoinType&gt;(
+    burn_cap: <a href="coin.md#0x1_coin_BurnCapability">BurnCapability</a>&lt;CoinType&gt;
+): BurnRef <b>acquires</b> <a href="coin.md#0x1_coin_CoinConversionMap">CoinConversionMap</a>, <a href="coin.md#0x1_coin_PairedFungibleAssetRefs">PairedFungibleAssetRefs</a> {
+    <a href="coin.md#0x1_coin_destroy_burn_cap">destroy_burn_cap</a>(burn_cap);
+    <b>let</b> metadata = <a href="coin.md#0x1_coin_assert_paired_metadata_exists">assert_paired_metadata_exists</a>&lt;CoinType&gt;();
+    <b>let</b> metadata_addr = object_address(&metadata);
+    <b>assert</b>!(<b>exists</b>&lt;<a href="coin.md#0x1_coin_PairedFungibleAssetRefs">PairedFungibleAssetRefs</a>&gt;(metadata_addr), <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_internal">error::internal</a>(<a href="coin.md#0x1_coin_EPAIRED_FUNGIBLE_ASSET_REFS_NOT_FOUND">EPAIRED_FUNGIBLE_ASSET_REFS_NOT_FOUND</a>));
+    <b>let</b> burn_ref_opt = &<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="coin.md#0x1_coin_PairedFungibleAssetRefs">PairedFungibleAssetRefs</a>&gt;(metadata_addr).burn_ref_opt;
+    <b>assert</b>!(<a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_is_some">option::is_some</a>(burn_ref_opt), <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="coin.md#0x1_coin_EBURN_REF_NOT_FOUND">EBURN_REF_NOT_FOUND</a>));
+    <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_extract">option::extract</a>(burn_ref_opt)
+}
+</code></pre>
+
+
+
 </details>
 
 <a id="0x1_coin_return_paired_burn_ref"></a>
@@ -2695,7 +2812,9 @@ Deposit the coin balance into the recipient's account and emit an event.
             <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="coin.md#0x1_coin_EFROZEN">EFROZEN</a>),
         );
         <b>if</b> (std::features::module_event_migration_enabled()) {
-            <a href="event.md#0x1_event_emit">event::emit</a>(<a href="coin.md#0x1_coin_Deposit">Deposit</a>&lt;CoinType&gt; { <a href="account.md#0x1_account">account</a>: account_addr, amount: <a href="coin.md#0x1_coin">coin</a>.value });
+            <a href="event.md#0x1_event_emit">event::emit</a>(
+                <a href="coin.md#0x1_coin_CoinDeposit">CoinDeposit</a> { coin_type: type_name&lt;CoinType&gt;(), <a href="account.md#0x1_account">account</a>: account_addr, amount: <a href="coin.md#0x1_coin">coin</a>.value }
+            );
         };
         <a href="event.md#0x1_event_emit_event">event::emit_event</a>&lt;<a href="coin.md#0x1_coin_DepositEvent">DepositEvent</a>&gt;(
             &<b>mut</b> coin_store.deposit_events,
@@ -2740,7 +2859,10 @@ Deposit the coin balance into the recipient's account and emit an event.
     metadata: Object&lt;Metadata&gt;
 ): bool {
     <b>let</b> primary_store_address = <a href="primary_fungible_store.md#0x1_primary_fungible_store_primary_store_address">primary_fungible_store::primary_store_address</a>&lt;Metadata&gt;(account_address, metadata);
-    <a href="fungible_asset.md#0x1_fungible_asset_store_exists">fungible_asset::store_exists</a>(primary_store_address) && <b>exists</b>&lt;<a href="coin.md#0x1_coin_MigrationFlag">MigrationFlag</a>&gt;(primary_store_address)
+    <a href="fungible_asset.md#0x1_fungible_asset_store_exists">fungible_asset::store_exists</a>(primary_store_address) && (
+        // migration flag is needed, until we start defaulting new accounts <b>to</b> APT PFS
+        <a href="../../aptos-stdlib/../move-stdlib/doc/features.md#0x1_features_new_accounts_default_to_fa_apt_store_enabled">features::new_accounts_default_to_fa_apt_store_enabled</a>() || <b>exists</b>&lt;<a href="coin.md#0x1_coin_MigrationFlag">MigrationFlag</a>&gt;(primary_store_address)
+    )
 }
 </code></pre>
 
@@ -2781,7 +2903,7 @@ This is for internal use only and doesn't emit an DepositEvent.
             <b>let</b> fa = <a href="coin.md#0x1_coin_coin_to_fungible_asset">coin_to_fungible_asset</a>(<a href="coin.md#0x1_coin">coin</a>);
             <b>let</b> metadata = <a href="fungible_asset.md#0x1_fungible_asset_asset_metadata">fungible_asset::asset_metadata</a>(&fa);
             <b>let</b> store = <a href="primary_fungible_store.md#0x1_primary_fungible_store_primary_store">primary_fungible_store::primary_store</a>(account_addr, metadata);
-            <a href="fungible_asset.md#0x1_fungible_asset_deposit_internal">fungible_asset::deposit_internal</a>(store, fa);
+            <a href="fungible_asset.md#0x1_fungible_asset_deposit_internal">fungible_asset::deposit_internal</a>(<a href="object.md#0x1_object_object_address">object::object_address</a>(&store), fa);
         } <b>else</b> {
             <b>abort</b> <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="coin.md#0x1_coin_ECOIN_STORE_NOT_PUBLISHED">ECOIN_STORE_NOT_PUBLISHED</a>)
         }
@@ -3312,7 +3434,11 @@ Withdraw specified <code>amount</code> of coin <code>CoinType</code> from the si
             <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="coin.md#0x1_coin_EFROZEN">EFROZEN</a>),
         );
         <b>if</b> (std::features::module_event_migration_enabled()) {
-            <a href="event.md#0x1_event_emit">event::emit</a>(<a href="coin.md#0x1_coin_Withdraw">Withdraw</a>&lt;CoinType&gt; { <a href="account.md#0x1_account">account</a>: account_addr, amount: coin_amount_to_withdraw });
+            <a href="event.md#0x1_event_emit">event::emit</a>(
+                <a href="coin.md#0x1_coin_CoinWithdraw">CoinWithdraw</a> {
+                    coin_type: type_name&lt;CoinType&gt;(), <a href="account.md#0x1_account">account</a>: account_addr, amount: coin_amount_to_withdraw
+                }
+            );
         };
         <a href="event.md#0x1_event_emit_event">event::emit_event</a>&lt;<a href="coin.md#0x1_coin_WithdrawEvent">WithdrawEvent</a>&gt;(
             &<b>mut</b> coin_store.withdraw_events,
@@ -3688,6 +3814,64 @@ initialize, initialize_internal, initialize_with_parallelizable_supply;
 
 
 
+
+<a id="0x1_coin_spec_is_account_registered"></a>
+
+
+<pre><code><b>fun</b> <a href="coin.md#0x1_coin_spec_is_account_registered">spec_is_account_registered</a>&lt;CoinType&gt;(account_addr: <b>address</b>): bool {
+   <b>let</b> paired_metadata_opt = <a href="coin.md#0x1_coin_spec_paired_metadata">spec_paired_metadata</a>&lt;CoinType&gt;();
+   <b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinStore">CoinStore</a>&lt;CoinType&gt;&gt;(account_addr) || (<a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_spec_is_some">option::spec_is_some</a>(
+       paired_metadata_opt
+   ) && <a href="primary_fungible_store.md#0x1_primary_fungible_store_spec_primary_store_exists">primary_fungible_store::spec_primary_store_exists</a>(account_addr, <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_spec_borrow">option::spec_borrow</a>(paired_metadata_opt)))
+}
+</code></pre>
+
+
+
+
+<a id="0x1_coin_CoinSubAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="coin.md#0x1_coin_CoinSubAbortsIf">CoinSubAbortsIf</a>&lt;CoinType&gt; {
+    amount: u64;
+    <b>let</b> addr = <a href="../../aptos-stdlib/doc/type_info.md#0x1_type_info_type_of">type_info::type_of</a>&lt;CoinType&gt;().account_address;
+    <b>let</b> maybe_supply = <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a>&lt;CoinType&gt;&gt;(addr).<a href="coin.md#0x1_coin_supply">supply</a>;
+    <b>include</b> (<a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_is_some">option::is_some</a>(
+        maybe_supply
+    )) ==&gt; <a href="optional_aggregator.md#0x1_optional_aggregator_SubAbortsIf">optional_aggregator::SubAbortsIf</a> { <a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>: <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_borrow">option::borrow</a>(maybe_supply), value: amount };
+}
+</code></pre>
+
+
+
+
+<a id="0x1_coin_CoinAddAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="coin.md#0x1_coin_CoinAddAbortsIf">CoinAddAbortsIf</a>&lt;CoinType&gt; {
+    amount: u64;
+    <b>let</b> addr = <a href="../../aptos-stdlib/doc/type_info.md#0x1_type_info_type_of">type_info::type_of</a>&lt;CoinType&gt;().account_address;
+    <b>let</b> maybe_supply = <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a>&lt;CoinType&gt;&gt;(addr).<a href="coin.md#0x1_coin_supply">supply</a>;
+    <b>include</b> (<a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_is_some">option::is_some</a>(
+        maybe_supply
+    )) ==&gt; <a href="optional_aggregator.md#0x1_optional_aggregator_AddAbortsIf">optional_aggregator::AddAbortsIf</a> { <a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>: <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_borrow">option::borrow</a>(maybe_supply), value: amount };
+}
+</code></pre>
+
+
+
+
+<a id="0x1_coin_AbortsIfNotExistCoinInfo"></a>
+
+
+<pre><code><b>schema</b> <a href="coin.md#0x1_coin_AbortsIfNotExistCoinInfo">AbortsIfNotExistCoinInfo</a>&lt;CoinType&gt; {
+    <b>let</b> addr = <a href="../../aptos-stdlib/doc/type_info.md#0x1_type_info_type_of">type_info::type_of</a>&lt;CoinType&gt;().account_address;
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a>&lt;CoinType&gt;&gt;(addr);
+}
+</code></pre>
+
+
+
 <a id="@Specification_1_AggregatableCoin"></a>
 
 ### Struct `AggregatableCoin`
@@ -4031,64 +4215,6 @@ Get address by reflection.
 
 
 
-
-<a id="0x1_coin_spec_is_account_registered"></a>
-
-
-<pre><code><b>fun</b> <a href="coin.md#0x1_coin_spec_is_account_registered">spec_is_account_registered</a>&lt;CoinType&gt;(account_addr: <b>address</b>): bool {
-   <b>let</b> paired_metadata_opt = <a href="coin.md#0x1_coin_spec_paired_metadata">spec_paired_metadata</a>&lt;CoinType&gt;();
-   <b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinStore">CoinStore</a>&lt;CoinType&gt;&gt;(account_addr) || (<a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_spec_is_some">option::spec_is_some</a>(
-       paired_metadata_opt
-   ) && <a href="primary_fungible_store.md#0x1_primary_fungible_store_spec_primary_store_exists">primary_fungible_store::spec_primary_store_exists</a>(account_addr, <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_spec_borrow">option::spec_borrow</a>(paired_metadata_opt)))
-}
-</code></pre>
-
-
-
-
-<a id="0x1_coin_CoinSubAbortsIf"></a>
-
-
-<pre><code><b>schema</b> <a href="coin.md#0x1_coin_CoinSubAbortsIf">CoinSubAbortsIf</a>&lt;CoinType&gt; {
-    amount: u64;
-    <b>let</b> addr = <a href="../../aptos-stdlib/doc/type_info.md#0x1_type_info_type_of">type_info::type_of</a>&lt;CoinType&gt;().account_address;
-    <b>let</b> maybe_supply = <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a>&lt;CoinType&gt;&gt;(addr).<a href="coin.md#0x1_coin_supply">supply</a>;
-    <b>include</b> (<a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_is_some">option::is_some</a>(
-        maybe_supply
-    )) ==&gt; <a href="optional_aggregator.md#0x1_optional_aggregator_SubAbortsIf">optional_aggregator::SubAbortsIf</a> { <a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>: <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_borrow">option::borrow</a>(maybe_supply), value: amount };
-}
-</code></pre>
-
-
-
-
-<a id="0x1_coin_CoinAddAbortsIf"></a>
-
-
-<pre><code><b>schema</b> <a href="coin.md#0x1_coin_CoinAddAbortsIf">CoinAddAbortsIf</a>&lt;CoinType&gt; {
-    amount: u64;
-    <b>let</b> addr = <a href="../../aptos-stdlib/doc/type_info.md#0x1_type_info_type_of">type_info::type_of</a>&lt;CoinType&gt;().account_address;
-    <b>let</b> maybe_supply = <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a>&lt;CoinType&gt;&gt;(addr).<a href="coin.md#0x1_coin_supply">supply</a>;
-    <b>include</b> (<a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_is_some">option::is_some</a>(
-        maybe_supply
-    )) ==&gt; <a href="optional_aggregator.md#0x1_optional_aggregator_AddAbortsIf">optional_aggregator::AddAbortsIf</a> { <a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>: <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_borrow">option::borrow</a>(maybe_supply), value: amount };
-}
-</code></pre>
-
-
-
-
-<a id="0x1_coin_AbortsIfNotExistCoinInfo"></a>
-
-
-<pre><code><b>schema</b> <a href="coin.md#0x1_coin_AbortsIfNotExistCoinInfo">AbortsIfNotExistCoinInfo</a>&lt;CoinType&gt; {
-    <b>let</b> addr = <a href="../../aptos-stdlib/doc/type_info.md#0x1_type_info_type_of">type_info::type_of</a>&lt;CoinType&gt;().account_address;
-    <b>aborts_if</b> !<b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a>&lt;CoinType&gt;&gt;(addr);
-}
-</code></pre>
-
-
-
 <a id="@Specification_1_name"></a>
 
 ### Function `name`
@@ -4237,7 +4363,7 @@ Get address by reflection.
 <b>let</b> <b>post</b> post_value = <a href="optional_aggregator.md#0x1_optional_aggregator_optional_aggregator_value">optional_aggregator::optional_aggregator_value</a>(post_supply);
 <b>aborts_if</b> <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_spec_is_some">option::spec_is_some</a>(maybe_supply) && <a href="coin.md#0x1_coin_value">value</a> &lt; amount;
 <b>ensures</b> post_coin_store.<a href="coin.md#0x1_coin">coin</a>.value == coin_store.<a href="coin.md#0x1_coin">coin</a>.value - amount;
-// This enforces <a id="high-level-req-5" href="managed_coin.md#high-level-req">high-level requirement 5</a> of the <a href=managed_coin.md>managed_coin</a> module:
+// This enforces <a id="high-level-req-5" href="managed_coin.md#high-level-req">high-level requirement 5</a> of the <a href="managed_coin.md">managed_coin</a> module:
 <b>ensures</b> <b>if</b> (<a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_spec_is_some">option::spec_is_some</a>(maybe_supply)) {
     post_value == value - amount
 } <b>else</b> {
@@ -4514,7 +4640,7 @@ Only the creator of <code>CoinType</code> can initialize.
 <b>modifies</b> <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a>&lt;CoinType&gt;&gt;(account_addr);
 <b>aborts_if</b> monitor_supply && parallelizable
     && !<b>exists</b>&lt;<a href="aggregator_factory.md#0x1_aggregator_factory_AggregatorFactory">aggregator_factory::AggregatorFactory</a>&gt;(@aptos_framework);
-// This enforces <a id="high-level-req-2" href="managed_coin.md#high-level-req">high-level requirement 2</a> of the <a href=managed_coin.md>managed_coin</a> module:
+// This enforces <a id="high-level-req-2" href="managed_coin.md#high-level-req">high-level requirement 2</a> of the <a href="managed_coin.md">managed_coin</a> module:
 <b>ensures</b> <b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a>&lt;CoinType&gt;&gt;(account_addr)
     && coin_info.name == name
     && coin_info.symbol == symbol
diff --git a/aptos-move/framework/aptos-framework/doc/dispatchable_fungible_asset.md b/aptos-move/framework/aptos-framework/doc/dispatchable_fungible_asset.md
index 48107a5ce7256..b3b76f108128c 100644
--- a/aptos-move/framework/aptos-framework/doc/dispatchable_fungible_asset.md
+++ b/aptos-move/framework/aptos-framework/doc/dispatchable_fungible_asset.md
@@ -23,19 +23,23 @@ See AIP-73 for further discussion
 -  [Resource `TransferRefStore`](#0x1_dispatchable_fungible_asset_TransferRefStore)
 -  [Constants](#@Constants_0)
 -  [Function `register_dispatch_functions`](#0x1_dispatchable_fungible_asset_register_dispatch_functions)
+-  [Function `register_derive_supply_dispatch_function`](#0x1_dispatchable_fungible_asset_register_derive_supply_dispatch_function)
 -  [Function `withdraw`](#0x1_dispatchable_fungible_asset_withdraw)
 -  [Function `deposit`](#0x1_dispatchable_fungible_asset_deposit)
 -  [Function `transfer`](#0x1_dispatchable_fungible_asset_transfer)
 -  [Function `transfer_assert_minimum_deposit`](#0x1_dispatchable_fungible_asset_transfer_assert_minimum_deposit)
 -  [Function `derived_balance`](#0x1_dispatchable_fungible_asset_derived_balance)
+-  [Function `derived_supply`](#0x1_dispatchable_fungible_asset_derived_supply)
 -  [Function `borrow_transfer_ref`](#0x1_dispatchable_fungible_asset_borrow_transfer_ref)
 -  [Function `dispatchable_withdraw`](#0x1_dispatchable_fungible_asset_dispatchable_withdraw)
 -  [Function `dispatchable_deposit`](#0x1_dispatchable_fungible_asset_dispatchable_deposit)
 -  [Function `dispatchable_derived_balance`](#0x1_dispatchable_fungible_asset_dispatchable_derived_balance)
+-  [Function `dispatchable_derived_supply`](#0x1_dispatchable_fungible_asset_dispatchable_derived_supply)
 -  [Specification](#@Specification_1)
     -  [Function `dispatchable_withdraw`](#@Specification_1_dispatchable_withdraw)
     -  [Function `dispatchable_deposit`](#@Specification_1_dispatchable_deposit)
     -  [Function `dispatchable_derived_balance`](#@Specification_1_dispatchable_derived_balance)
+    -  [Function `dispatchable_derived_supply`](#@Specification_1_dispatchable_derived_supply)
 
 
 <pre><code><b>use</b> <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error">0x1::error</a>;
@@ -160,6 +164,36 @@ TransferRefStore doesn't exist on the fungible asset type.
 
 
 
+</details>
+
+<a id="0x1_dispatchable_fungible_asset_register_derive_supply_dispatch_function"></a>
+
+## Function `register_derive_supply_dispatch_function`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_register_derive_supply_dispatch_function">register_derive_supply_dispatch_function</a>(constructor_ref: &<a href="object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>, dispatch_function: <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="function_info.md#0x1_function_info_FunctionInfo">function_info::FunctionInfo</a>&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_register_derive_supply_dispatch_function">register_derive_supply_dispatch_function</a>(
+    constructor_ref: &ConstructorRef,
+    dispatch_function: Option&lt;FunctionInfo&gt;
+) {
+    <a href="fungible_asset.md#0x1_fungible_asset_register_derive_supply_dispatch_function">fungible_asset::register_derive_supply_dispatch_function</a>(
+        constructor_ref,
+        dispatch_function
+    );
+}
+</code></pre>
+
+
+
 </details>
 
 <a id="0x1_dispatchable_fungible_asset_withdraw"></a>
@@ -249,7 +283,7 @@ The semantics of deposit will be governed by the function specified in DispatchF
             func
         )
     } <b>else</b> {
-        <a href="fungible_asset.md#0x1_fungible_asset_deposit_internal">fungible_asset::deposit_internal</a>(store, fa)
+        <a href="fungible_asset.md#0x1_fungible_asset_deposit_internal">fungible_asset::deposit_internal</a>(<a href="object.md#0x1_object_object_address">object::object_address</a>(&store), fa)
     }
 }
 </code></pre>
@@ -364,6 +398,45 @@ The semantics of value will be governed by the function specified in DispatchFun
 
 
 
+</details>
+
+<a id="0x1_dispatchable_fungible_asset_derived_supply"></a>
+
+## Function `derived_supply`
+
+Get the derived supply of the fungible asset using the overloaded hook.
+
+The semantics of supply will be governed by the function specified in DeriveSupplyDispatch.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_derived_supply">derived_supply</a>&lt;T: key&gt;(metadata: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_Option">option::Option</a>&lt;u128&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_derived_supply">derived_supply</a>&lt;T: key&gt;(metadata: Object&lt;T&gt;): Option&lt;u128&gt; {
+    <b>let</b> func_opt = <a href="fungible_asset.md#0x1_fungible_asset_derived_supply_dispatch_function">fungible_asset::derived_supply_dispatch_function</a>(metadata);
+    <b>if</b> (<a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_is_some">option::is_some</a>(&func_opt)) {
+        <b>assert</b>!(
+            <a href="../../aptos-stdlib/../move-stdlib/doc/features.md#0x1_features_dispatchable_fungible_asset_enabled">features::dispatchable_fungible_asset_enabled</a>(),
+            <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_aborted">error::aborted</a>(<a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_ENOT_ACTIVATED">ENOT_ACTIVATED</a>)
+        );
+        <b>let</b> func = <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_borrow">option::borrow</a>(&func_opt);
+        <a href="function_info.md#0x1_function_info_load_module_from_function">function_info::load_module_from_function</a>(func);
+        <a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_dispatchable_derived_supply">dispatchable_derived_supply</a>(metadata, func)
+    } <b>else</b> {
+        <a href="fungible_asset.md#0x1_fungible_asset_supply">fungible_asset::supply</a>(metadata)
+    }
+}
+</code></pre>
+
+
+
 </details>
 
 <a id="0x1_dispatchable_fungible_asset_borrow_transfer_ref"></a>
@@ -474,6 +547,31 @@ The semantics of value will be governed by the function specified in DispatchFun
 
 
 
+</details>
+
+<a id="0x1_dispatchable_fungible_asset_dispatchable_derived_supply"></a>
+
+## Function `dispatchable_derived_supply`
+
+
+
+<pre><code><b>fun</b> <a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_dispatchable_derived_supply">dispatchable_derived_supply</a>&lt;T: key&gt;(store: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, function: &<a href="function_info.md#0x1_function_info_FunctionInfo">function_info::FunctionInfo</a>): <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_Option">option::Option</a>&lt;u128&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_dispatchable_derived_supply">dispatchable_derived_supply</a>&lt;T: key&gt;(
+    store: Object&lt;T&gt;,
+    function: &FunctionInfo,
+): Option&lt;u128&gt;;
+</code></pre>
+
+
+
 </details>
 
 <a id="@Specification_1"></a>
@@ -530,6 +628,22 @@ The semantics of value will be governed by the function specified in DispatchFun
 
 
 
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_dispatchable_derived_supply"></a>
+
+### Function `dispatchable_derived_supply`
+
+
+<pre><code><b>fun</b> <a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_dispatchable_derived_supply">dispatchable_derived_supply</a>&lt;T: key&gt;(store: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, function: &<a href="function_info.md#0x1_function_info_FunctionInfo">function_info::FunctionInfo</a>): <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_Option">option::Option</a>&lt;u128&gt;
+</code></pre>
+
+
+
+
 <pre><code><b>pragma</b> opaque;
 </code></pre>
 
diff --git a/aptos-move/framework/aptos-framework/doc/fungible_asset.md b/aptos-move/framework/aptos-framework/doc/fungible_asset.md
index a924d0f5edde7..f12ee14942b4f 100644
--- a/aptos-move/framework/aptos-framework/doc/fungible_asset.md
+++ b/aptos-move/framework/aptos-framework/doc/fungible_asset.md
@@ -13,10 +13,13 @@ metadata object can be any object that equipped with <code><a href="fungible_ass
 -  [Resource `Untransferable`](#0x1_fungible_asset_Untransferable)
 -  [Resource `FungibleStore`](#0x1_fungible_asset_FungibleStore)
 -  [Resource `DispatchFunctionStore`](#0x1_fungible_asset_DispatchFunctionStore)
+-  [Resource `DeriveSupply`](#0x1_fungible_asset_DeriveSupply)
+-  [Resource `ConcurrentFungibleBalance`](#0x1_fungible_asset_ConcurrentFungibleBalance)
 -  [Struct `FungibleAsset`](#0x1_fungible_asset_FungibleAsset)
 -  [Struct `MintRef`](#0x1_fungible_asset_MintRef)
 -  [Struct `TransferRef`](#0x1_fungible_asset_TransferRef)
 -  [Struct `BurnRef`](#0x1_fungible_asset_BurnRef)
+-  [Struct `MutateMetadataRef`](#0x1_fungible_asset_MutateMetadataRef)
 -  [Struct `Deposit`](#0x1_fungible_asset_Deposit)
 -  [Struct `Withdraw`](#0x1_fungible_asset_Withdraw)
 -  [Struct `Frozen`](#0x1_fungible_asset_Frozen)
@@ -25,24 +28,36 @@ metadata object can be any object that equipped with <code><a href="fungible_ass
 -  [Struct `WithdrawEvent`](#0x1_fungible_asset_WithdrawEvent)
 -  [Struct `FrozenEvent`](#0x1_fungible_asset_FrozenEvent)
 -  [Constants](#@Constants_0)
+-  [Function `default_to_concurrent_fungible_supply`](#0x1_fungible_asset_default_to_concurrent_fungible_supply)
+-  [Function `allow_upgrade_to_concurrent_fungible_balance`](#0x1_fungible_asset_allow_upgrade_to_concurrent_fungible_balance)
+-  [Function `default_to_concurrent_fungible_balance`](#0x1_fungible_asset_default_to_concurrent_fungible_balance)
 -  [Function `add_fungibility`](#0x1_fungible_asset_add_fungibility)
 -  [Function `set_untransferable`](#0x1_fungible_asset_set_untransferable)
 -  [Function `is_untransferable`](#0x1_fungible_asset_is_untransferable)
 -  [Function `register_dispatch_functions`](#0x1_fungible_asset_register_dispatch_functions)
+-  [Function `register_derive_supply_dispatch_function`](#0x1_fungible_asset_register_derive_supply_dispatch_function)
+-  [Function `register_dispatch_function_sanity_check`](#0x1_fungible_asset_register_dispatch_function_sanity_check)
 -  [Function `generate_mint_ref`](#0x1_fungible_asset_generate_mint_ref)
 -  [Function `generate_burn_ref`](#0x1_fungible_asset_generate_burn_ref)
 -  [Function `generate_transfer_ref`](#0x1_fungible_asset_generate_transfer_ref)
+-  [Function `generate_mutate_metadata_ref`](#0x1_fungible_asset_generate_mutate_metadata_ref)
 -  [Function `supply`](#0x1_fungible_asset_supply)
 -  [Function `maximum`](#0x1_fungible_asset_maximum)
 -  [Function `name`](#0x1_fungible_asset_name)
 -  [Function `symbol`](#0x1_fungible_asset_symbol)
 -  [Function `decimals`](#0x1_fungible_asset_decimals)
+-  [Function `icon_uri`](#0x1_fungible_asset_icon_uri)
+-  [Function `project_uri`](#0x1_fungible_asset_project_uri)
+-  [Function `metadata`](#0x1_fungible_asset_metadata)
 -  [Function `store_exists`](#0x1_fungible_asset_store_exists)
+-  [Function `store_exists_inline`](#0x1_fungible_asset_store_exists_inline)
+-  [Function `concurrent_fungible_balance_exists_inline`](#0x1_fungible_asset_concurrent_fungible_balance_exists_inline)
 -  [Function `metadata_from_asset`](#0x1_fungible_asset_metadata_from_asset)
 -  [Function `store_metadata`](#0x1_fungible_asset_store_metadata)
 -  [Function `amount`](#0x1_fungible_asset_amount)
 -  [Function `balance`](#0x1_fungible_asset_balance)
 -  [Function `is_balance_at_least`](#0x1_fungible_asset_is_balance_at_least)
+-  [Function `is_address_balance_at_least`](#0x1_fungible_asset_is_address_balance_at_least)
 -  [Function `is_frozen`](#0x1_fungible_asset_is_frozen)
 -  [Function `is_store_dispatchable`](#0x1_fungible_asset_is_store_dispatchable)
 -  [Function `deposit_dispatch_function`](#0x1_fungible_asset_deposit_dispatch_function)
@@ -50,10 +65,12 @@ metadata object can be any object that equipped with <code><a href="fungible_ass
 -  [Function `withdraw_dispatch_function`](#0x1_fungible_asset_withdraw_dispatch_function)
 -  [Function `has_withdraw_dispatch_function`](#0x1_fungible_asset_has_withdraw_dispatch_function)
 -  [Function `derived_balance_dispatch_function`](#0x1_fungible_asset_derived_balance_dispatch_function)
+-  [Function `derived_supply_dispatch_function`](#0x1_fungible_asset_derived_supply_dispatch_function)
 -  [Function `asset_metadata`](#0x1_fungible_asset_asset_metadata)
 -  [Function `mint_ref_metadata`](#0x1_fungible_asset_mint_ref_metadata)
 -  [Function `transfer_ref_metadata`](#0x1_fungible_asset_transfer_ref_metadata)
 -  [Function `burn_ref_metadata`](#0x1_fungible_asset_burn_ref_metadata)
+-  [Function `object_from_metadata_ref`](#0x1_fungible_asset_object_from_metadata_ref)
 -  [Function `transfer`](#0x1_fungible_asset_transfer)
 -  [Function `create_store`](#0x1_fungible_asset_create_store)
 -  [Function `remove_store`](#0x1_fungible_asset_remove_store)
@@ -69,9 +86,11 @@ metadata object can be any object that equipped with <code><a href="fungible_ass
 -  [Function `burn`](#0x1_fungible_asset_burn)
 -  [Function `burn_internal`](#0x1_fungible_asset_burn_internal)
 -  [Function `burn_from`](#0x1_fungible_asset_burn_from)
+-  [Function `address_burn_from`](#0x1_fungible_asset_address_burn_from)
 -  [Function `withdraw_with_ref`](#0x1_fungible_asset_withdraw_with_ref)
 -  [Function `deposit_with_ref`](#0x1_fungible_asset_deposit_with_ref)
 -  [Function `transfer_with_ref`](#0x1_fungible_asset_transfer_with_ref)
+-  [Function `mutate_metadata`](#0x1_fungible_asset_mutate_metadata)
 -  [Function `zero`](#0x1_fungible_asset_zero)
 -  [Function `extract`](#0x1_fungible_asset_extract)
 -  [Function `merge`](#0x1_fungible_asset_merge)
@@ -84,12 +103,15 @@ metadata object can be any object that equipped with <code><a href="fungible_ass
 -  [Function `borrow_fungible_metadata_mut`](#0x1_fungible_asset_borrow_fungible_metadata_mut)
 -  [Function `borrow_store_resource`](#0x1_fungible_asset_borrow_store_resource)
 -  [Function `upgrade_to_concurrent`](#0x1_fungible_asset_upgrade_to_concurrent)
+-  [Function `upgrade_store_to_concurrent`](#0x1_fungible_asset_upgrade_store_to_concurrent)
+-  [Function `ensure_store_upgraded_to_concurrent_internal`](#0x1_fungible_asset_ensure_store_upgraded_to_concurrent_internal)
 -  [Specification](#@Specification_1)
     -  [High-level Requirements](#high-level-req)
     -  [Module-level Specification](#module-level-spec)
 
 
 <pre><code><b>use</b> <a href="aggregator_v2.md#0x1_aggregator_v2">0x1::aggregator_v2</a>;
+<b>use</b> <a href="create_signer.md#0x1_create_signer">0x1::create_signer</a>;
 <b>use</b> <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error">0x1::error</a>;
 <b>use</b> <a href="event.md#0x1_event">0x1::event</a>;
 <b>use</b> <a href="../../aptos-stdlib/../move-stdlib/doc/features.md#0x1_features">0x1::features</a>;
@@ -172,7 +194,7 @@ Metadata of a Fungible asset
 
 
 <pre><code>#[resource_group_member(#[group = <a href="object.md#0x1_object_ObjectGroup">0x1::object::ObjectGroup</a>])]
-<b>struct</b> <a href="fungible_asset.md#0x1_fungible_asset_Metadata">Metadata</a> <b>has</b> key
+<b>struct</b> <a href="fungible_asset.md#0x1_fungible_asset_Metadata">Metadata</a> <b>has</b> <b>copy</b>, drop, key
 </code></pre>
 
 
@@ -330,6 +352,63 @@ The store object that holds fungible assets of a specific type associated with a
 </dl>
 
 
+</details>
+
+<a id="0x1_fungible_asset_DeriveSupply"></a>
+
+## Resource `DeriveSupply`
+
+
+
+<pre><code>#[resource_group_member(#[group = <a href="object.md#0x1_object_ObjectGroup">0x1::object::ObjectGroup</a>])]
+<b>struct</b> <a href="fungible_asset.md#0x1_fungible_asset_DeriveSupply">DeriveSupply</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>dispatch_function: <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="function_info.md#0x1_function_info_FunctionInfo">function_info::FunctionInfo</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_fungible_asset_ConcurrentFungibleBalance"></a>
+
+## Resource `ConcurrentFungibleBalance`
+
+The store object that holds concurrent fungible asset balance.
+
+
+<pre><code>#[resource_group_member(#[group = <a href="object.md#0x1_object_ObjectGroup">0x1::object::ObjectGroup</a>])]
+<b>struct</b> <a href="fungible_asset.md#0x1_fungible_asset_ConcurrentFungibleBalance">ConcurrentFungibleBalance</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>balance: <a href="aggregator_v2.md#0x1_aggregator_v2_Aggregator">aggregator_v2::Aggregator</a>&lt;u64&gt;</code>
+</dt>
+<dd>
+ The balance of the fungible metadata.
+</dd>
+</dl>
+
+
 </details>
 
 <a id="0x1_fungible_asset_FungibleAsset"></a>
@@ -436,6 +515,34 @@ BurnRef can be used to burn fungible assets from a given holder account.
 
 
 
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>metadata: <a href="object.md#0x1_object_Object">object::Object</a>&lt;<a href="fungible_asset.md#0x1_fungible_asset_Metadata">fungible_asset::Metadata</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_fungible_asset_MutateMetadataRef"></a>
+
+## Struct `MutateMetadataRef`
+
+MutateMetadataRef can be used to directly modify the fungible asset's Metadata.
+
+
+<pre><code><b>struct</b> <a href="fungible_asset.md#0x1_fungible_asset_MutateMetadataRef">MutateMetadataRef</a> <b>has</b> drop, store
+</code></pre>
+
+
+
 <details>
 <summary>Fields</summary>
 
@@ -767,6 +874,16 @@ Burn ref and store do not match.
 
 
 
+<a id="0x1_fungible_asset_ECONCURRENT_BALANCE_NOT_ENABLED"></a>
+
+Flag for Concurrent Supply not enabled
+
+
+<pre><code><b>const</b> <a href="fungible_asset.md#0x1_fungible_asset_ECONCURRENT_BALANCE_NOT_ENABLED">ECONCURRENT_BALANCE_NOT_ENABLED</a>: u64 = 32;
+</code></pre>
+
+
+
 <a id="0x1_fungible_asset_ECONCURRENT_SUPPLY_NOT_ENABLED"></a>
 
 Flag for Concurrent Supply not enabled
@@ -807,6 +924,16 @@ Provided derived_balance function type doesn't meet the signature requirement.
 
 
 
+<a id="0x1_fungible_asset_EDERIVED_SUPPLY_FUNCTION_SIGNATURE_MISMATCH"></a>
+
+Provided derived_supply function type doesn't meet the signature requirement.
+
+
+<pre><code><b>const</b> <a href="fungible_asset.md#0x1_fungible_asset_EDERIVED_SUPPLY_FUNCTION_SIGNATURE_MISMATCH">EDERIVED_SUPPLY_FUNCTION_SIGNATURE_MISMATCH</a>: u64 = 33;
+</code></pre>
+
+
+
 <a id="0x1_fungible_asset_EFUNGIBLE_ASSET_AND_STORE_MISMATCH"></a>
 
 Fungible asset and store do not match.
@@ -1044,6 +1171,78 @@ Provided withdraw function type doesn't meet the signature requirement.
 
 
 
+<a id="0x1_fungible_asset_default_to_concurrent_fungible_supply"></a>
+
+## Function `default_to_concurrent_fungible_supply`
+
+
+
+<pre><code><b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_default_to_concurrent_fungible_supply">default_to_concurrent_fungible_supply</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_default_to_concurrent_fungible_supply">default_to_concurrent_fungible_supply</a>(): bool {
+    <a href="../../aptos-stdlib/../move-stdlib/doc/features.md#0x1_features_concurrent_fungible_assets_enabled">features::concurrent_fungible_assets_enabled</a>()
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_allow_upgrade_to_concurrent_fungible_balance"></a>
+
+## Function `allow_upgrade_to_concurrent_fungible_balance`
+
+
+
+<pre><code><b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_allow_upgrade_to_concurrent_fungible_balance">allow_upgrade_to_concurrent_fungible_balance</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_allow_upgrade_to_concurrent_fungible_balance">allow_upgrade_to_concurrent_fungible_balance</a>(): bool {
+    <a href="../../aptos-stdlib/../move-stdlib/doc/features.md#0x1_features_concurrent_fungible_balance_enabled">features::concurrent_fungible_balance_enabled</a>()
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_default_to_concurrent_fungible_balance"></a>
+
+## Function `default_to_concurrent_fungible_balance`
+
+
+
+<pre><code><b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_default_to_concurrent_fungible_balance">default_to_concurrent_fungible_balance</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_default_to_concurrent_fungible_balance">default_to_concurrent_fungible_balance</a>(): bool {
+    <a href="../../aptos-stdlib/../move-stdlib/doc/features.md#0x1_features_default_to_concurrent_fungible_balance_enabled">features::default_to_concurrent_fungible_balance_enabled</a>()
+}
+</code></pre>
+
+
+
+</details>
+
 <a id="0x1_fungible_asset_add_fungibility"></a>
 
 ## Function `add_fungibility`
@@ -1092,7 +1291,7 @@ if option::some(MAX_U128) is used, it is treated as unlimited supply.
         }
     );
 
-    <b>if</b> (<a href="../../aptos-stdlib/../move-stdlib/doc/features.md#0x1_features_concurrent_fungible_assets_enabled">features::concurrent_fungible_assets_enabled</a>()) {
+    <b>if</b> (<a href="fungible_asset.md#0x1_fungible_asset_default_to_concurrent_fungible_supply">default_to_concurrent_fungible_supply</a>()) {
         <b>let</b> unlimited = <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_is_none">option::is_none</a>(&maximum_supply);
         <b>move_to</b>(metadata_object_signer, <a href="fungible_asset.md#0x1_fungible_asset_ConcurrentSupply">ConcurrentSupply</a> {
             current: <b>if</b> (unlimited) {
@@ -1246,28 +1445,13 @@ Create a fungible asset store whose transfer rule would be overloaded by the pro
             )
         );
     });
-
-    // Cannot register hook for APT.
-    <b>assert</b>!(
-        <a href="object.md#0x1_object_address_from_constructor_ref">object::address_from_constructor_ref</a>(constructor_ref) != @aptos_fungible_asset,
-        <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="fungible_asset.md#0x1_fungible_asset_EAPT_NOT_DISPATCHABLE">EAPT_NOT_DISPATCHABLE</a>)
-    );
-    <b>assert</b>!(
-        !<a href="object.md#0x1_object_can_generate_delete_ref">object::can_generate_delete_ref</a>(constructor_ref),
-        <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="fungible_asset.md#0x1_fungible_asset_EOBJECT_IS_DELETABLE">EOBJECT_IS_DELETABLE</a>)
-    );
+    <a href="fungible_asset.md#0x1_fungible_asset_register_dispatch_function_sanity_check">register_dispatch_function_sanity_check</a>(constructor_ref);
     <b>assert</b>!(
         !<b>exists</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_DispatchFunctionStore">DispatchFunctionStore</a>&gt;(
             <a href="object.md#0x1_object_address_from_constructor_ref">object::address_from_constructor_ref</a>(constructor_ref)
         ),
         <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_already_exists">error::already_exists</a>(<a href="fungible_asset.md#0x1_fungible_asset_EALREADY_REGISTERED">EALREADY_REGISTERED</a>)
     );
-    <b>assert</b>!(
-        <b>exists</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_Metadata">Metadata</a>&gt;(
-            <a href="object.md#0x1_object_address_from_constructor_ref">object::address_from_constructor_ref</a>(constructor_ref)
-        ),
-        <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="fungible_asset.md#0x1_fungible_asset_EFUNGIBLE_METADATA_EXISTENCE">EFUNGIBLE_METADATA_EXISTENCE</a>),
-    );
 
     <b>let</b> store_obj = &<a href="object.md#0x1_object_generate_signer">object::generate_signer</a>(constructor_ref);
 
@@ -1285,6 +1469,110 @@ Create a fungible asset store whose transfer rule would be overloaded by the pro
 
 
 
+</details>
+
+<a id="0x1_fungible_asset_register_derive_supply_dispatch_function"></a>
+
+## Function `register_derive_supply_dispatch_function`
+
+Define the derived supply dispatch with the provided function.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_register_derive_supply_dispatch_function">register_derive_supply_dispatch_function</a>(constructor_ref: &<a href="object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>, dispatch_function: <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="function_info.md#0x1_function_info_FunctionInfo">function_info::FunctionInfo</a>&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_register_derive_supply_dispatch_function">register_derive_supply_dispatch_function</a>(
+    constructor_ref: &ConstructorRef,
+    dispatch_function: Option&lt;FunctionInfo&gt;
+) {
+    // Verify that caller type matches callee type so wrongly typed function cannot be registered.
+    <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_for_each_ref">option::for_each_ref</a>(&dispatch_function, |supply_function| {
+        <b>let</b> <a href="function_info.md#0x1_function_info">function_info</a> = <a href="function_info.md#0x1_function_info_new_function_info_from_address">function_info::new_function_info_from_address</a>(
+            @aptos_framework,
+            <a href="../../aptos-stdlib/../move-stdlib/doc/string.md#0x1_string_utf8">string::utf8</a>(b"<a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset">dispatchable_fungible_asset</a>"),
+            <a href="../../aptos-stdlib/../move-stdlib/doc/string.md#0x1_string_utf8">string::utf8</a>(b"dispatchable_derived_supply"),
+        );
+        // Verify that caller type matches callee type so wrongly typed function cannot be registered.
+        <b>assert</b>!(
+            <a href="function_info.md#0x1_function_info_check_dispatch_type_compatibility">function_info::check_dispatch_type_compatibility</a>(
+                &<a href="function_info.md#0x1_function_info">function_info</a>,
+                supply_function
+            ),
+            <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(
+                <a href="fungible_asset.md#0x1_fungible_asset_EDERIVED_SUPPLY_FUNCTION_SIGNATURE_MISMATCH">EDERIVED_SUPPLY_FUNCTION_SIGNATURE_MISMATCH</a>
+            )
+        );
+    });
+    <a href="fungible_asset.md#0x1_fungible_asset_register_dispatch_function_sanity_check">register_dispatch_function_sanity_check</a>(constructor_ref);
+    <b>assert</b>!(
+        !<b>exists</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_DeriveSupply">DeriveSupply</a>&gt;(
+            <a href="object.md#0x1_object_address_from_constructor_ref">object::address_from_constructor_ref</a>(constructor_ref)
+        ),
+        <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_already_exists">error::already_exists</a>(<a href="fungible_asset.md#0x1_fungible_asset_EALREADY_REGISTERED">EALREADY_REGISTERED</a>)
+    );
+
+
+    <b>let</b> store_obj = &<a href="object.md#0x1_object_generate_signer">object::generate_signer</a>(constructor_ref);
+
+    // Store the overload function hook.
+    <b>move_to</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_DeriveSupply">DeriveSupply</a>&gt;(
+        store_obj,
+        <a href="fungible_asset.md#0x1_fungible_asset_DeriveSupply">DeriveSupply</a> {
+            dispatch_function
+        }
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_register_dispatch_function_sanity_check"></a>
+
+## Function `register_dispatch_function_sanity_check`
+
+Check the requirements for registering a dispatchable function.
+
+
+<pre><code><b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_register_dispatch_function_sanity_check">register_dispatch_function_sanity_check</a>(constructor_ref: &<a href="object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_register_dispatch_function_sanity_check">register_dispatch_function_sanity_check</a>(
+    constructor_ref: &ConstructorRef,
+)  {
+    // Cannot register hook for APT.
+    <b>assert</b>!(
+        <a href="object.md#0x1_object_address_from_constructor_ref">object::address_from_constructor_ref</a>(constructor_ref) != @aptos_fungible_asset,
+        <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="fungible_asset.md#0x1_fungible_asset_EAPT_NOT_DISPATCHABLE">EAPT_NOT_DISPATCHABLE</a>)
+    );
+    <b>assert</b>!(
+        !<a href="object.md#0x1_object_can_generate_delete_ref">object::can_generate_delete_ref</a>(constructor_ref),
+        <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="fungible_asset.md#0x1_fungible_asset_EOBJECT_IS_DELETABLE">EOBJECT_IS_DELETABLE</a>)
+    );
+    <b>assert</b>!(
+        <b>exists</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_Metadata">Metadata</a>&gt;(
+            <a href="object.md#0x1_object_address_from_constructor_ref">object::address_from_constructor_ref</a>(constructor_ref)
+        ),
+        <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="fungible_asset.md#0x1_fungible_asset_EFUNGIBLE_METADATA_EXISTENCE">EFUNGIBLE_METADATA_EXISTENCE</a>),
+    );
+}
+</code></pre>
+
+
+
 </details>
 
 <a id="0x1_fungible_asset_generate_mint_ref"></a>
@@ -1367,17 +1655,199 @@ This can only be called at object creation time as constructor_ref is only avail
 
 
 
+</details>
+
+<a id="0x1_fungible_asset_generate_mutate_metadata_ref"></a>
+
+## Function `generate_mutate_metadata_ref`
+
+Creates a mutate metadata ref that can be used to change the metadata information of fungible assets from the
+given fungible object's constructor ref.
+This can only be called at object creation time as constructor_ref is only available then.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_generate_mutate_metadata_ref">generate_mutate_metadata_ref</a>(constructor_ref: &<a href="object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>): <a href="fungible_asset.md#0x1_fungible_asset_MutateMetadataRef">fungible_asset::MutateMetadataRef</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_generate_mutate_metadata_ref">generate_mutate_metadata_ref</a>(constructor_ref: &ConstructorRef): <a href="fungible_asset.md#0x1_fungible_asset_MutateMetadataRef">MutateMetadataRef</a> {
+    <b>let</b> metadata = <a href="object.md#0x1_object_object_from_constructor_ref">object::object_from_constructor_ref</a>&lt;<a href="fungible_asset.md#0x1_fungible_asset_Metadata">Metadata</a>&gt;(constructor_ref);
+    <a href="fungible_asset.md#0x1_fungible_asset_MutateMetadataRef">MutateMetadataRef</a> { metadata }
+}
+</code></pre>
+
+
+
 </details>
 
 <a id="0x1_fungible_asset_supply"></a>
 
-## Function `supply`
+## Function `supply`
+
+Get the current supply from the <code>metadata</code> object.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_supply">supply</a>&lt;T: key&gt;(metadata: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_Option">option::Option</a>&lt;u128&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_supply">supply</a>&lt;T: key&gt;(metadata: Object&lt;T&gt;): Option&lt;u128&gt; <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_Supply">Supply</a>, <a href="fungible_asset.md#0x1_fungible_asset_ConcurrentSupply">ConcurrentSupply</a> {
+    <b>let</b> metadata_address = <a href="object.md#0x1_object_object_address">object::object_address</a>(&metadata);
+    <b>if</b> (<b>exists</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_ConcurrentSupply">ConcurrentSupply</a>&gt;(metadata_address)) {
+        <b>let</b> supply = <b>borrow_global</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_ConcurrentSupply">ConcurrentSupply</a>&gt;(metadata_address);
+        <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_some">option::some</a>(<a href="aggregator_v2.md#0x1_aggregator_v2_read">aggregator_v2::read</a>(&supply.current))
+    } <b>else</b> <b>if</b> (<b>exists</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_Supply">Supply</a>&gt;(metadata_address)) {
+        <b>let</b> supply = <b>borrow_global</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_Supply">Supply</a>&gt;(metadata_address);
+        <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_some">option::some</a>(supply.current)
+    } <b>else</b> {
+        <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_none">option::none</a>()
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_maximum"></a>
+
+## Function `maximum`
+
+Get the maximum supply from the <code>metadata</code> object.
+If supply is unlimited (or set explicitly to MAX_U128), none is returned
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_maximum">maximum</a>&lt;T: key&gt;(metadata: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_Option">option::Option</a>&lt;u128&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_maximum">maximum</a>&lt;T: key&gt;(metadata: Object&lt;T&gt;): Option&lt;u128&gt; <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_Supply">Supply</a>, <a href="fungible_asset.md#0x1_fungible_asset_ConcurrentSupply">ConcurrentSupply</a> {
+    <b>let</b> metadata_address = <a href="object.md#0x1_object_object_address">object::object_address</a>(&metadata);
+    <b>if</b> (<b>exists</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_ConcurrentSupply">ConcurrentSupply</a>&gt;(metadata_address)) {
+        <b>let</b> supply = <b>borrow_global</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_ConcurrentSupply">ConcurrentSupply</a>&gt;(metadata_address);
+        <b>let</b> max_value = <a href="aggregator_v2.md#0x1_aggregator_v2_max_value">aggregator_v2::max_value</a>(&supply.current);
+        <b>if</b> (max_value == <a href="fungible_asset.md#0x1_fungible_asset_MAX_U128">MAX_U128</a>) {
+            <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_none">option::none</a>()
+        } <b>else</b> {
+            <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_some">option::some</a>(max_value)
+        }
+    } <b>else</b> <b>if</b> (<b>exists</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_Supply">Supply</a>&gt;(metadata_address)) {
+        <b>let</b> supply = <b>borrow_global</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_Supply">Supply</a>&gt;(metadata_address);
+        supply.maximum
+    } <b>else</b> {
+        <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_none">option::none</a>()
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_name"></a>
+
+## Function `name`
+
+Get the name of the fungible asset from the <code>metadata</code> object.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_name">name</a>&lt;T: key&gt;(metadata: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): <a href="../../aptos-stdlib/../move-stdlib/doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_name">name</a>&lt;T: key&gt;(metadata: Object&lt;T&gt;): String <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_Metadata">Metadata</a> {
+    <a href="fungible_asset.md#0x1_fungible_asset_borrow_fungible_metadata">borrow_fungible_metadata</a>(&metadata).name
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_symbol"></a>
+
+## Function `symbol`
+
+Get the symbol of the fungible asset from the <code>metadata</code> object.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_symbol">symbol</a>&lt;T: key&gt;(metadata: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): <a href="../../aptos-stdlib/../move-stdlib/doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_symbol">symbol</a>&lt;T: key&gt;(metadata: Object&lt;T&gt;): String <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_Metadata">Metadata</a> {
+    <a href="fungible_asset.md#0x1_fungible_asset_borrow_fungible_metadata">borrow_fungible_metadata</a>(&metadata).symbol
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_decimals"></a>
+
+## Function `decimals`
+
+Get the decimals from the <code>metadata</code> object.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_decimals">decimals</a>&lt;T: key&gt;(metadata: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): u8
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_decimals">decimals</a>&lt;T: key&gt;(metadata: Object&lt;T&gt;): u8 <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_Metadata">Metadata</a> {
+    <a href="fungible_asset.md#0x1_fungible_asset_borrow_fungible_metadata">borrow_fungible_metadata</a>(&metadata).decimals
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_icon_uri"></a>
+
+## Function `icon_uri`
 
-Get the current supply from the <code>metadata</code> object.
+Get the icon uri from the <code>metadata</code> object.
 
 
 <pre><code>#[view]
-<b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_supply">supply</a>&lt;T: key&gt;(metadata: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_Option">option::Option</a>&lt;u128&gt;
+<b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_icon_uri">icon_uri</a>&lt;T: key&gt;(metadata: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): <a href="../../aptos-stdlib/../move-stdlib/doc/string.md#0x1_string_String">string::String</a>
 </code></pre>
 
 
@@ -1386,17 +1856,8 @@ Get the current supply from the <code>metadata</code> object.
 <summary>Implementation</summary>
 
 
-<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_supply">supply</a>&lt;T: key&gt;(metadata: Object&lt;T&gt;): Option&lt;u128&gt; <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_Supply">Supply</a>, <a href="fungible_asset.md#0x1_fungible_asset_ConcurrentSupply">ConcurrentSupply</a> {
-    <b>let</b> metadata_address = <a href="object.md#0x1_object_object_address">object::object_address</a>(&metadata);
-    <b>if</b> (<b>exists</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_ConcurrentSupply">ConcurrentSupply</a>&gt;(metadata_address)) {
-        <b>let</b> supply = <b>borrow_global</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_ConcurrentSupply">ConcurrentSupply</a>&gt;(metadata_address);
-        <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_some">option::some</a>(<a href="aggregator_v2.md#0x1_aggregator_v2_read">aggregator_v2::read</a>(&supply.current))
-    } <b>else</b> <b>if</b> (<b>exists</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_Supply">Supply</a>&gt;(metadata_address)) {
-        <b>let</b> supply = <b>borrow_global</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_Supply">Supply</a>&gt;(metadata_address);
-        <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_some">option::some</a>(supply.current)
-    } <b>else</b> {
-        <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_none">option::none</a>()
-    }
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_icon_uri">icon_uri</a>&lt;T: key&gt;(metadata: Object&lt;T&gt;): String <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_Metadata">Metadata</a> {
+    <a href="fungible_asset.md#0x1_fungible_asset_borrow_fungible_metadata">borrow_fungible_metadata</a>(&metadata).icon_uri
 }
 </code></pre>
 
@@ -1404,16 +1865,15 @@ Get the current supply from the <code>metadata</code> object.
 
 </details>
 
-<a id="0x1_fungible_asset_maximum"></a>
+<a id="0x1_fungible_asset_project_uri"></a>
 
-## Function `maximum`
+## Function `project_uri`
 
-Get the maximum supply from the <code>metadata</code> object.
-If supply is unlimited (or set explicitly to MAX_U128), none is returned
+Get the project uri from the <code>metadata</code> object.
 
 
 <pre><code>#[view]
-<b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_maximum">maximum</a>&lt;T: key&gt;(metadata: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_Option">option::Option</a>&lt;u128&gt;
+<b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_project_uri">project_uri</a>&lt;T: key&gt;(metadata: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): <a href="../../aptos-stdlib/../move-stdlib/doc/string.md#0x1_string_String">string::String</a>
 </code></pre>
 
 
@@ -1422,22 +1882,8 @@ If supply is unlimited (or set explicitly to MAX_U128), none is returned
 <summary>Implementation</summary>
 
 
-<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_maximum">maximum</a>&lt;T: key&gt;(metadata: Object&lt;T&gt;): Option&lt;u128&gt; <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_Supply">Supply</a>, <a href="fungible_asset.md#0x1_fungible_asset_ConcurrentSupply">ConcurrentSupply</a> {
-    <b>let</b> metadata_address = <a href="object.md#0x1_object_object_address">object::object_address</a>(&metadata);
-    <b>if</b> (<b>exists</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_ConcurrentSupply">ConcurrentSupply</a>&gt;(metadata_address)) {
-        <b>let</b> supply = <b>borrow_global</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_ConcurrentSupply">ConcurrentSupply</a>&gt;(metadata_address);
-        <b>let</b> max_value = <a href="aggregator_v2.md#0x1_aggregator_v2_max_value">aggregator_v2::max_value</a>(&supply.current);
-        <b>if</b> (max_value == <a href="fungible_asset.md#0x1_fungible_asset_MAX_U128">MAX_U128</a>) {
-            <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_none">option::none</a>()
-        } <b>else</b> {
-            <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_some">option::some</a>(max_value)
-        }
-    } <b>else</b> <b>if</b> (<b>exists</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_Supply">Supply</a>&gt;(metadata_address)) {
-        <b>let</b> supply = <b>borrow_global</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_Supply">Supply</a>&gt;(metadata_address);
-        supply.maximum
-    } <b>else</b> {
-        <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_none">option::none</a>()
-    }
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_project_uri">project_uri</a>&lt;T: key&gt;(metadata: Object&lt;T&gt;): String <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_Metadata">Metadata</a> {
+    <a href="fungible_asset.md#0x1_fungible_asset_borrow_fungible_metadata">borrow_fungible_metadata</a>(&metadata).project_uri
 }
 </code></pre>
 
@@ -1445,15 +1891,15 @@ If supply is unlimited (or set explicitly to MAX_U128), none is returned
 
 </details>
 
-<a id="0x1_fungible_asset_name"></a>
+<a id="0x1_fungible_asset_metadata"></a>
 
-## Function `name`
+## Function `metadata`
 
-Get the name of the fungible asset from the <code>metadata</code> object.
+Get the metadata struct from the <code>metadata</code> object.
 
 
 <pre><code>#[view]
-<b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_name">name</a>&lt;T: key&gt;(metadata: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): <a href="../../aptos-stdlib/../move-stdlib/doc/string.md#0x1_string_String">string::String</a>
+<b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_metadata">metadata</a>&lt;T: key&gt;(metadata: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): <a href="fungible_asset.md#0x1_fungible_asset_Metadata">fungible_asset::Metadata</a>
 </code></pre>
 
 
@@ -1462,8 +1908,8 @@ Get the name of the fungible asset from the <code>metadata</code> object.
 <summary>Implementation</summary>
 
 
-<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_name">name</a>&lt;T: key&gt;(metadata: Object&lt;T&gt;): String <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_Metadata">Metadata</a> {
-    <a href="fungible_asset.md#0x1_fungible_asset_borrow_fungible_metadata">borrow_fungible_metadata</a>(&metadata).name
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_metadata">metadata</a>&lt;T: key&gt;(metadata: Object&lt;T&gt;): <a href="fungible_asset.md#0x1_fungible_asset_Metadata">Metadata</a> <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_Metadata">Metadata</a> {
+    *<a href="fungible_asset.md#0x1_fungible_asset_borrow_fungible_metadata">borrow_fungible_metadata</a>(&metadata)
 }
 </code></pre>
 
@@ -1471,15 +1917,15 @@ Get the name of the fungible asset from the <code>metadata</code> object.
 
 </details>
 
-<a id="0x1_fungible_asset_symbol"></a>
+<a id="0x1_fungible_asset_store_exists"></a>
 
-## Function `symbol`
+## Function `store_exists`
 
-Get the symbol of the fungible asset from the <code>metadata</code> object.
+Return whether the provided address has a store initialized.
 
 
 <pre><code>#[view]
-<b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_symbol">symbol</a>&lt;T: key&gt;(metadata: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): <a href="../../aptos-stdlib/../move-stdlib/doc/string.md#0x1_string_String">string::String</a>
+<b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_store_exists">store_exists</a>(store: <b>address</b>): bool
 </code></pre>
 
 
@@ -1488,8 +1934,8 @@ Get the symbol of the fungible asset from the <code>metadata</code> object.
 <summary>Implementation</summary>
 
 
-<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_symbol">symbol</a>&lt;T: key&gt;(metadata: Object&lt;T&gt;): String <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_Metadata">Metadata</a> {
-    <a href="fungible_asset.md#0x1_fungible_asset_borrow_fungible_metadata">borrow_fungible_metadata</a>(&metadata).symbol
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_store_exists">store_exists</a>(store: <b>address</b>): bool {
+    <a href="fungible_asset.md#0x1_fungible_asset_store_exists_inline">store_exists_inline</a>(store)
 }
 </code></pre>
 
@@ -1497,15 +1943,14 @@ Get the symbol of the fungible asset from the <code>metadata</code> object.
 
 </details>
 
-<a id="0x1_fungible_asset_decimals"></a>
+<a id="0x1_fungible_asset_store_exists_inline"></a>
 
-## Function `decimals`
+## Function `store_exists_inline`
 
-Get the decimals from the <code>metadata</code> object.
+Return whether the provided address has a store initialized.
 
 
-<pre><code>#[view]
-<b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_decimals">decimals</a>&lt;T: key&gt;(metadata: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): u8
+<pre><code><b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_store_exists_inline">store_exists_inline</a>(store: <b>address</b>): bool
 </code></pre>
 
 
@@ -1514,8 +1959,8 @@ Get the decimals from the <code>metadata</code> object.
 <summary>Implementation</summary>
 
 
-<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_decimals">decimals</a>&lt;T: key&gt;(metadata: Object&lt;T&gt;): u8 <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_Metadata">Metadata</a> {
-    <a href="fungible_asset.md#0x1_fungible_asset_borrow_fungible_metadata">borrow_fungible_metadata</a>(&metadata).decimals
+<pre><code>inline <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_store_exists_inline">store_exists_inline</a>(store: <b>address</b>): bool {
+    <b>exists</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>&gt;(store)
 }
 </code></pre>
 
@@ -1523,15 +1968,15 @@ Get the decimals from the <code>metadata</code> object.
 
 </details>
 
-<a id="0x1_fungible_asset_store_exists"></a>
+<a id="0x1_fungible_asset_concurrent_fungible_balance_exists_inline"></a>
 
-## Function `store_exists`
+## Function `concurrent_fungible_balance_exists_inline`
 
-Return whether the provided address has a store initialized.
+Return whether the provided address has a concurrent fungible balance initialized,
+at the fungible store address.
 
 
-<pre><code>#[view]
-<b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_store_exists">store_exists</a>(store: <b>address</b>): bool
+<pre><code><b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_concurrent_fungible_balance_exists_inline">concurrent_fungible_balance_exists_inline</a>(store: <b>address</b>): bool
 </code></pre>
 
 
@@ -1540,8 +1985,8 @@ Return whether the provided address has a store initialized.
 <summary>Implementation</summary>
 
 
-<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_store_exists">store_exists</a>(store: <b>address</b>): bool {
-    <b>exists</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>&gt;(store)
+<pre><code>inline <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_concurrent_fungible_balance_exists_inline">concurrent_fungible_balance_exists_inline</a>(store: <b>address</b>): bool {
+    <b>exists</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_ConcurrentFungibleBalance">ConcurrentFungibleBalance</a>&gt;(store)
 }
 </code></pre>
 
@@ -1642,9 +2087,16 @@ Get the balance of a given store.
 <summary>Implementation</summary>
 
 
-<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_balance">balance</a>&lt;T: key&gt;(store: Object&lt;T&gt;): u64 <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a> {
-    <b>if</b> (<a href="fungible_asset.md#0x1_fungible_asset_store_exists">store_exists</a>(<a href="object.md#0x1_object_object_address">object::object_address</a>(&store))) {
-        <a href="fungible_asset.md#0x1_fungible_asset_borrow_store_resource">borrow_store_resource</a>(&store).balance
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_balance">balance</a>&lt;T: key&gt;(store: Object&lt;T&gt;): u64 <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>, <a href="fungible_asset.md#0x1_fungible_asset_ConcurrentFungibleBalance">ConcurrentFungibleBalance</a> {
+    <b>let</b> store_addr = <a href="object.md#0x1_object_object_address">object::object_address</a>(&store);
+    <b>if</b> (<a href="fungible_asset.md#0x1_fungible_asset_store_exists_inline">store_exists_inline</a>(store_addr)) {
+        <b>let</b> store_balance = <a href="fungible_asset.md#0x1_fungible_asset_borrow_store_resource">borrow_store_resource</a>(&store).balance;
+        <b>if</b> (store_balance == 0 && <a href="fungible_asset.md#0x1_fungible_asset_concurrent_fungible_balance_exists_inline">concurrent_fungible_balance_exists_inline</a>(store_addr)) {
+            <b>let</b> balance_resource = <b>borrow_global</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_ConcurrentFungibleBalance">ConcurrentFungibleBalance</a>&gt;(store_addr);
+            <a href="aggregator_v2.md#0x1_aggregator_v2_read">aggregator_v2::read</a>(&balance_resource.balance)
+        } <b>else</b> {
+            store_balance
+        }
     } <b>else</b> {
         0
     }
@@ -1672,10 +2124,41 @@ Check whether the balance of a given store is >= <code>amount</code>.
 <summary>Implementation</summary>
 
 
-<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_is_balance_at_least">is_balance_at_least</a>&lt;T: key&gt;(store: Object&lt;T&gt;, amount: u64): bool <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a> {
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_is_balance_at_least">is_balance_at_least</a>&lt;T: key&gt;(store: Object&lt;T&gt;, amount: u64): bool <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>, <a href="fungible_asset.md#0x1_fungible_asset_ConcurrentFungibleBalance">ConcurrentFungibleBalance</a> {
     <b>let</b> store_addr = <a href="object.md#0x1_object_object_address">object::object_address</a>(&store);
-    <b>if</b> (<a href="fungible_asset.md#0x1_fungible_asset_store_exists">store_exists</a>(store_addr)) {
-        <a href="fungible_asset.md#0x1_fungible_asset_borrow_store_resource">borrow_store_resource</a>(&store).balance &gt;= amount
+    <a href="fungible_asset.md#0x1_fungible_asset_is_address_balance_at_least">is_address_balance_at_least</a>(store_addr, amount)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_is_address_balance_at_least"></a>
+
+## Function `is_address_balance_at_least`
+
+Check whether the balance of a given store is >= <code>amount</code>.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_is_address_balance_at_least">is_address_balance_at_least</a>(store_addr: <b>address</b>, amount: u64): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_is_address_balance_at_least">is_address_balance_at_least</a>(store_addr: <b>address</b>, amount: u64): bool <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>, <a href="fungible_asset.md#0x1_fungible_asset_ConcurrentFungibleBalance">ConcurrentFungibleBalance</a> {
+    <b>if</b> (<a href="fungible_asset.md#0x1_fungible_asset_store_exists_inline">store_exists_inline</a>(store_addr)) {
+        <b>let</b> store_balance = <b>borrow_global</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>&gt;(store_addr).balance;
+        <b>if</b> (store_balance == 0 && <a href="fungible_asset.md#0x1_fungible_asset_concurrent_fungible_balance_exists_inline">concurrent_fungible_balance_exists_inline</a>(store_addr)) {
+            <b>let</b> balance_resource = <b>borrow_global</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_ConcurrentFungibleBalance">ConcurrentFungibleBalance</a>&gt;(store_addr);
+            <a href="aggregator_v2.md#0x1_aggregator_v2_is_at_least">aggregator_v2::is_at_least</a>(&balance_resource.balance, amount)
+        } <b>else</b> {
+            store_balance &gt;= amount
+        }
     } <b>else</b> {
         amount == 0
     }
@@ -1706,7 +2189,8 @@ If the store has not been created, we default to returning false so deposits can
 
 
 <pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_is_frozen">is_frozen</a>&lt;T: key&gt;(store: Object&lt;T&gt;): bool <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a> {
-    <a href="fungible_asset.md#0x1_fungible_asset_store_exists">store_exists</a>(<a href="object.md#0x1_object_object_address">object::object_address</a>(&store)) && <a href="fungible_asset.md#0x1_fungible_asset_borrow_store_resource">borrow_store_resource</a>(&store).frozen
+    <b>let</b> store_addr = <a href="object.md#0x1_object_object_address">object::object_address</a>(&store);
+    <a href="fungible_asset.md#0x1_fungible_asset_store_exists_inline">store_exists_inline</a>(store_addr) && <b>borrow_global</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>&gt;(store_addr).frozen
 }
 </code></pre>
 
@@ -1890,6 +2374,35 @@ Return whether a fungible asset type is dispatchable.
 
 
 
+</details>
+
+<a id="0x1_fungible_asset_derived_supply_dispatch_function"></a>
+
+## Function `derived_supply_dispatch_function`
+
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_derived_supply_dispatch_function">derived_supply_dispatch_function</a>&lt;T: key&gt;(metadata: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="function_info.md#0x1_function_info_FunctionInfo">function_info::FunctionInfo</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_derived_supply_dispatch_function">derived_supply_dispatch_function</a>&lt;T: key&gt;(metadata: Object&lt;T&gt;): Option&lt;FunctionInfo&gt; <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_DeriveSupply">DeriveSupply</a> {
+    <b>let</b> metadata_addr = <a href="object.md#0x1_object_object_address">object::object_address</a>(&metadata);
+    <b>if</b> (<b>exists</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_DeriveSupply">DeriveSupply</a>&gt;(metadata_addr)) {
+        <b>borrow_global</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_DeriveSupply">DeriveSupply</a>&gt;(metadata_addr).dispatch_function
+    } <b>else</b> {
+        <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_none">option::none</a>()
+    }
+}
+</code></pre>
+
+
+
 </details>
 
 <a id="0x1_fungible_asset_asset_metadata"></a>
@@ -1989,6 +2502,31 @@ Get the underlying metadata object from the <code><a href="fungible_asset.md#0x1
 
 
 
+</details>
+
+<a id="0x1_fungible_asset_object_from_metadata_ref"></a>
+
+## Function `object_from_metadata_ref`
+
+Get the underlying metadata object from the <code><a href="fungible_asset.md#0x1_fungible_asset_MutateMetadataRef">MutateMetadataRef</a></code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_object_from_metadata_ref">object_from_metadata_ref</a>(ref: &<a href="fungible_asset.md#0x1_fungible_asset_MutateMetadataRef">fungible_asset::MutateMetadataRef</a>): <a href="object.md#0x1_object_Object">object::Object</a>&lt;<a href="fungible_asset.md#0x1_fungible_asset_Metadata">fungible_asset::Metadata</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_object_from_metadata_ref">object_from_metadata_ref</a>(ref: &<a href="fungible_asset.md#0x1_fungible_asset_MutateMetadataRef">MutateMetadataRef</a>): Object&lt;<a href="fungible_asset.md#0x1_fungible_asset_Metadata">Metadata</a>&gt; {
+    ref.metadata
+}
+</code></pre>
+
+
+
 </details>
 
 <a id="0x1_fungible_asset_transfer"></a>
@@ -2013,7 +2551,7 @@ Note: it does not move the underlying object.
     from: Object&lt;T&gt;,
     <b>to</b>: Object&lt;T&gt;,
     amount: u64,
-) <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>, <a href="fungible_asset.md#0x1_fungible_asset_DispatchFunctionStore">DispatchFunctionStore</a> {
+) <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>, <a href="fungible_asset.md#0x1_fungible_asset_DispatchFunctionStore">DispatchFunctionStore</a>, <a href="fungible_asset.md#0x1_fungible_asset_ConcurrentFungibleBalance">ConcurrentFungibleBalance</a> {
     <b>let</b> fa = <a href="fungible_asset.md#0x1_fungible_asset_withdraw">withdraw</a>(sender, from, amount);
     <a href="fungible_asset.md#0x1_fungible_asset_deposit">deposit</a>(<b>to</b>, fa);
 }
@@ -2050,9 +2588,17 @@ Applications can use this to create multiple stores for isolating fungible asset
         balance: 0,
         frozen: <b>false</b>,
     });
+
     <b>if</b> (<a href="fungible_asset.md#0x1_fungible_asset_is_untransferable">is_untransferable</a>(metadata)) {
         <a href="object.md#0x1_object_set_untransferable">object::set_untransferable</a>(constructor_ref);
     };
+
+    <b>if</b> (<a href="fungible_asset.md#0x1_fungible_asset_default_to_concurrent_fungible_balance">default_to_concurrent_fungible_balance</a>()) {
+        <b>move_to</b>(store_obj, <a href="fungible_asset.md#0x1_fungible_asset_ConcurrentFungibleBalance">ConcurrentFungibleBalance</a> {
+            balance: <a href="aggregator_v2.md#0x1_aggregator_v2_create_unbounded_aggregator">aggregator_v2::create_unbounded_aggregator</a>(),
+        });
+    };
+
     <a href="object.md#0x1_object_object_from_constructor_ref">object::object_from_constructor_ref</a>&lt;<a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>&gt;(constructor_ref)
 }
 </code></pre>
@@ -2077,12 +2623,18 @@ Used to delete a store.  Requires the store to be completely empty prior to remo
 <summary>Implementation</summary>
 
 
-<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_remove_store">remove_store</a>(delete_ref: &DeleteRef) <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>, <a href="fungible_asset.md#0x1_fungible_asset_FungibleAssetEvents">FungibleAssetEvents</a> {
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_remove_store">remove_store</a>(delete_ref: &DeleteRef) <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>, <a href="fungible_asset.md#0x1_fungible_asset_FungibleAssetEvents">FungibleAssetEvents</a>, <a href="fungible_asset.md#0x1_fungible_asset_ConcurrentFungibleBalance">ConcurrentFungibleBalance</a> {
     <b>let</b> store = &<a href="object.md#0x1_object_object_from_delete_ref">object::object_from_delete_ref</a>&lt;<a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>&gt;(delete_ref);
     <b>let</b> addr = <a href="object.md#0x1_object_object_address">object::object_address</a>(store);
     <b>let</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a> { metadata: _, balance, frozen: _ }
         = <b>move_from</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>&gt;(addr);
     <b>assert</b>!(balance == 0, <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="fungible_asset.md#0x1_fungible_asset_EBALANCE_IS_NOT_ZERO">EBALANCE_IS_NOT_ZERO</a>));
+
+    <b>if</b> (<a href="fungible_asset.md#0x1_fungible_asset_concurrent_fungible_balance_exists_inline">concurrent_fungible_balance_exists_inline</a>(addr)) {
+        <b>let</b> <a href="fungible_asset.md#0x1_fungible_asset_ConcurrentFungibleBalance">ConcurrentFungibleBalance</a> { balance } = <b>move_from</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_ConcurrentFungibleBalance">ConcurrentFungibleBalance</a>&gt;(addr);
+        <b>assert</b>!(<a href="aggregator_v2.md#0x1_aggregator_v2_read">aggregator_v2::read</a>(&balance) == 0, <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="fungible_asset.md#0x1_fungible_asset_EBALANCE_IS_NOT_ZERO">EBALANCE_IS_NOT_ZERO</a>));
+    };
+
     // Cleanup deprecated <a href="event.md#0x1_event">event</a> handles <b>if</b> exist.
     <b>if</b> (<b>exists</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_FungibleAssetEvents">FungibleAssetEvents</a>&gt;(addr)) {
         <b>let</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleAssetEvents">FungibleAssetEvents</a> {
@@ -2093,7 +2645,7 @@ Used to delete a store.  Requires the store to be completely empty prior to remo
         <a href="event.md#0x1_event_destroy_handle">event::destroy_handle</a>(deposit_events);
         <a href="event.md#0x1_event_destroy_handle">event::destroy_handle</a>(withdraw_events);
         <a href="event.md#0x1_event_destroy_handle">event::destroy_handle</a>(frozen_events);
-    }
+    };
 }
 </code></pre>
 
@@ -2121,7 +2673,7 @@ Withdraw <code>amount</code> of the fungible asset from <code>store</code> by th
     owner: &<a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer">signer</a>,
     store: Object&lt;T&gt;,
     amount: u64,
-): <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">FungibleAsset</a> <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>, <a href="fungible_asset.md#0x1_fungible_asset_DispatchFunctionStore">DispatchFunctionStore</a> {
+): <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">FungibleAsset</a> <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>, <a href="fungible_asset.md#0x1_fungible_asset_DispatchFunctionStore">DispatchFunctionStore</a>, <a href="fungible_asset.md#0x1_fungible_asset_ConcurrentFungibleBalance">ConcurrentFungibleBalance</a> {
     <a href="fungible_asset.md#0x1_fungible_asset_withdraw_sanity_check">withdraw_sanity_check</a>(owner, store, <b>true</b>);
     <a href="fungible_asset.md#0x1_fungible_asset_withdraw_internal">withdraw_internal</a>(<a href="object.md#0x1_object_object_address">object::object_address</a>(&store), amount)
 }
@@ -2215,9 +2767,9 @@ Deposit <code>amount</code> of the fungible asset to <code>store</code>.
 <summary>Implementation</summary>
 
 
-<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_deposit">deposit</a>&lt;T: key&gt;(store: Object&lt;T&gt;, fa: <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">FungibleAsset</a>) <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>, <a href="fungible_asset.md#0x1_fungible_asset_DispatchFunctionStore">DispatchFunctionStore</a> {
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_deposit">deposit</a>&lt;T: key&gt;(store: Object&lt;T&gt;, fa: <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">FungibleAsset</a>) <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>, <a href="fungible_asset.md#0x1_fungible_asset_DispatchFunctionStore">DispatchFunctionStore</a>, <a href="fungible_asset.md#0x1_fungible_asset_ConcurrentFungibleBalance">ConcurrentFungibleBalance</a> {
     <a href="fungible_asset.md#0x1_fungible_asset_deposit_sanity_check">deposit_sanity_check</a>(store, <b>true</b>);
-    <a href="fungible_asset.md#0x1_fungible_asset_deposit_internal">deposit_internal</a>(store, fa);
+    <a href="fungible_asset.md#0x1_fungible_asset_deposit_internal">deposit_internal</a>(<a href="object.md#0x1_object_object_address">object::object_address</a>(&store), fa);
 }
 </code></pre>
 
@@ -2300,9 +2852,9 @@ Mint the specified <code>amount</code> of the fungible asset to a destination st
 
 
 <pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_mint_to">mint_to</a>&lt;T: key&gt;(ref: &<a href="fungible_asset.md#0x1_fungible_asset_MintRef">MintRef</a>, store: Object&lt;T&gt;, amount: u64)
-<b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>, <a href="fungible_asset.md#0x1_fungible_asset_Supply">Supply</a>, <a href="fungible_asset.md#0x1_fungible_asset_ConcurrentSupply">ConcurrentSupply</a>, <a href="fungible_asset.md#0x1_fungible_asset_DispatchFunctionStore">DispatchFunctionStore</a> {
+<b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>, <a href="fungible_asset.md#0x1_fungible_asset_Supply">Supply</a>, <a href="fungible_asset.md#0x1_fungible_asset_ConcurrentSupply">ConcurrentSupply</a>, <a href="fungible_asset.md#0x1_fungible_asset_DispatchFunctionStore">DispatchFunctionStore</a>, <a href="fungible_asset.md#0x1_fungible_asset_ConcurrentFungibleBalance">ConcurrentFungibleBalance</a> {
     <a href="fungible_asset.md#0x1_fungible_asset_deposit_sanity_check">deposit_sanity_check</a>(store, <b>false</b>);
-    <a href="fungible_asset.md#0x1_fungible_asset_deposit_internal">deposit_internal</a>(store, <a href="fungible_asset.md#0x1_fungible_asset_mint">mint</a>(ref, amount));
+    <a href="fungible_asset.md#0x1_fungible_asset_deposit_internal">deposit_internal</a>(<a href="object.md#0x1_object_object_address">object::object_address</a>(&store), <a href="fungible_asset.md#0x1_fungible_asset_mint">mint</a>(ref, amount));
 }
 </code></pre>
 
@@ -2454,10 +3006,37 @@ Burn the <code>amount</code> of the fungible asset from the given store.
     ref: &<a href="fungible_asset.md#0x1_fungible_asset_BurnRef">BurnRef</a>,
     store: Object&lt;T&gt;,
     amount: u64
-) <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>, <a href="fungible_asset.md#0x1_fungible_asset_Supply">Supply</a>, <a href="fungible_asset.md#0x1_fungible_asset_ConcurrentSupply">ConcurrentSupply</a> {
-    <b>let</b> metadata = ref.metadata;
-    <b>assert</b>!(metadata == <a href="fungible_asset.md#0x1_fungible_asset_store_metadata">store_metadata</a>(store), <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="fungible_asset.md#0x1_fungible_asset_EBURN_REF_AND_STORE_MISMATCH">EBURN_REF_AND_STORE_MISMATCH</a>));
-    <b>let</b> store_addr = <a href="object.md#0x1_object_object_address">object::object_address</a>(&store);
+) <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>, <a href="fungible_asset.md#0x1_fungible_asset_Supply">Supply</a>, <a href="fungible_asset.md#0x1_fungible_asset_ConcurrentSupply">ConcurrentSupply</a>, <a href="fungible_asset.md#0x1_fungible_asset_ConcurrentFungibleBalance">ConcurrentFungibleBalance</a> {
+    // ref metadata match is checked in <a href="fungible_asset.md#0x1_fungible_asset_burn">burn</a>() call
+    <a href="fungible_asset.md#0x1_fungible_asset_burn">burn</a>(ref, <a href="fungible_asset.md#0x1_fungible_asset_withdraw_internal">withdraw_internal</a>(<a href="object.md#0x1_object_object_address">object::object_address</a>(&store), amount));
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_address_burn_from"></a>
+
+## Function `address_burn_from`
+
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_address_burn_from">address_burn_from</a>(ref: &<a href="fungible_asset.md#0x1_fungible_asset_BurnRef">fungible_asset::BurnRef</a>, store_addr: <b>address</b>, amount: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_address_burn_from">address_burn_from</a>(
+    ref: &<a href="fungible_asset.md#0x1_fungible_asset_BurnRef">BurnRef</a>,
+    store_addr: <b>address</b>,
+    amount: u64
+) <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>, <a href="fungible_asset.md#0x1_fungible_asset_Supply">Supply</a>, <a href="fungible_asset.md#0x1_fungible_asset_ConcurrentSupply">ConcurrentSupply</a>, <a href="fungible_asset.md#0x1_fungible_asset_ConcurrentFungibleBalance">ConcurrentFungibleBalance</a> {
+    // ref metadata match is checked in <a href="fungible_asset.md#0x1_fungible_asset_burn">burn</a>() call
     <a href="fungible_asset.md#0x1_fungible_asset_burn">burn</a>(ref, <a href="fungible_asset.md#0x1_fungible_asset_withdraw_internal">withdraw_internal</a>(store_addr, amount));
 }
 </code></pre>
@@ -2486,7 +3065,7 @@ Withdraw <code>amount</code> of the fungible asset from the <code>store</code> i
     ref: &<a href="fungible_asset.md#0x1_fungible_asset_TransferRef">TransferRef</a>,
     store: Object&lt;T&gt;,
     amount: u64
-): <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">FungibleAsset</a> <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a> {
+): <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">FungibleAsset</a> <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>, <a href="fungible_asset.md#0x1_fungible_asset_ConcurrentFungibleBalance">ConcurrentFungibleBalance</a> {
     <b>assert</b>!(
         ref.metadata == <a href="fungible_asset.md#0x1_fungible_asset_store_metadata">store_metadata</a>(store),
         <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="fungible_asset.md#0x1_fungible_asset_ETRANSFER_REF_AND_STORE_MISMATCH">ETRANSFER_REF_AND_STORE_MISMATCH</a>),
@@ -2519,12 +3098,12 @@ Deposit the fungible asset into the <code>store</code> ignoring <code>frozen</co
     ref: &<a href="fungible_asset.md#0x1_fungible_asset_TransferRef">TransferRef</a>,
     store: Object&lt;T&gt;,
     fa: <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">FungibleAsset</a>
-) <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a> {
+) <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>, <a href="fungible_asset.md#0x1_fungible_asset_ConcurrentFungibleBalance">ConcurrentFungibleBalance</a> {
     <b>assert</b>!(
         ref.metadata == fa.metadata,
         <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="fungible_asset.md#0x1_fungible_asset_ETRANSFER_REF_AND_FUNGIBLE_ASSET_MISMATCH">ETRANSFER_REF_AND_FUNGIBLE_ASSET_MISMATCH</a>)
     );
-    <a href="fungible_asset.md#0x1_fungible_asset_deposit_internal">deposit_internal</a>(store, fa);
+    <a href="fungible_asset.md#0x1_fungible_asset_deposit_internal">deposit_internal</a>(<a href="object.md#0x1_object_object_address">object::object_address</a>(&store), fa);
 }
 </code></pre>
 
@@ -2553,7 +3132,7 @@ Transfer <code>amount</code> of the fungible asset with <code><a href="fungible_
     from: Object&lt;T&gt;,
     <b>to</b>: Object&lt;T&gt;,
     amount: u64,
-) <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a> {
+) <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>, <a href="fungible_asset.md#0x1_fungible_asset_ConcurrentFungibleBalance">ConcurrentFungibleBalance</a> {
     <b>let</b> fa = <a href="fungible_asset.md#0x1_fungible_asset_withdraw_with_ref">withdraw_with_ref</a>(transfer_ref, from, amount);
     <a href="fungible_asset.md#0x1_fungible_asset_deposit_with_ref">deposit_with_ref</a>(transfer_ref, <b>to</b>, fa);
 }
@@ -2561,6 +3140,55 @@ Transfer <code>amount</code> of the fungible asset with <code><a href="fungible_
 
 
 
+</details>
+
+<a id="0x1_fungible_asset_mutate_metadata"></a>
+
+## Function `mutate_metadata`
+
+Mutate specified fields of the fungible asset's <code><a href="fungible_asset.md#0x1_fungible_asset_Metadata">Metadata</a></code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_mutate_metadata">mutate_metadata</a>(metadata_ref: &<a href="fungible_asset.md#0x1_fungible_asset_MutateMetadataRef">fungible_asset::MutateMetadataRef</a>, name: <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="../../aptos-stdlib/../move-stdlib/doc/string.md#0x1_string_String">string::String</a>&gt;, symbol: <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="../../aptos-stdlib/../move-stdlib/doc/string.md#0x1_string_String">string::String</a>&gt;, decimals: <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_Option">option::Option</a>&lt;u8&gt;, icon_uri: <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="../../aptos-stdlib/../move-stdlib/doc/string.md#0x1_string_String">string::String</a>&gt;, project_uri: <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="../../aptos-stdlib/../move-stdlib/doc/string.md#0x1_string_String">string::String</a>&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_mutate_metadata">mutate_metadata</a>(
+    metadata_ref: &<a href="fungible_asset.md#0x1_fungible_asset_MutateMetadataRef">MutateMetadataRef</a>,
+    name: Option&lt;String&gt;,
+    symbol: Option&lt;String&gt;,
+    decimals: Option&lt;u8&gt;,
+    icon_uri: Option&lt;String&gt;,
+    project_uri: Option&lt;String&gt;,
+) <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_Metadata">Metadata</a> {
+    <b>let</b> metadata_address = <a href="object.md#0x1_object_object_address">object::object_address</a>(&metadata_ref.metadata);
+    <b>let</b> mutable_metadata = <b>borrow_global_mut</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_Metadata">Metadata</a>&gt;(metadata_address);
+
+    <b>if</b> (<a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_is_some">option::is_some</a>(&name)){
+        mutable_metadata.name = <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_extract">option::extract</a>(&<b>mut</b> name);
+    };
+    <b>if</b> (<a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_is_some">option::is_some</a>(&symbol)){
+        mutable_metadata.symbol = <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_extract">option::extract</a>(&<b>mut</b> symbol);
+    };
+    <b>if</b> (<a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_is_some">option::is_some</a>(&decimals)){
+        mutable_metadata.decimals = <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_extract">option::extract</a>(&<b>mut</b> decimals);
+    };
+    <b>if</b> (<a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_is_some">option::is_some</a>(&icon_uri)){
+        mutable_metadata.icon_uri = <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_extract">option::extract</a>(&<b>mut</b> icon_uri);
+    };
+    <b>if</b> (<a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_is_some">option::is_some</a>(&project_uri)){
+        mutable_metadata.project_uri = <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_extract">option::extract</a>(&<b>mut</b> project_uri);
+    };
+}
+</code></pre>
+
+
+
 </details>
 
 <a id="0x1_fungible_asset_zero"></a>
@@ -2682,7 +3310,7 @@ Destroy an empty fungible asset.
 
 
 
-<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_deposit_internal">deposit_internal</a>&lt;T: key&gt;(store: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, fa: <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">fungible_asset::FungibleAsset</a>)
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_deposit_internal">deposit_internal</a>(store_addr: <b>address</b>, fa: <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">fungible_asset::FungibleAsset</a>)
 </code></pre>
 
 
@@ -2691,15 +3319,20 @@ Destroy an empty fungible asset.
 <summary>Implementation</summary>
 
 
-<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_deposit_internal">deposit_internal</a>&lt;T: key&gt;(store: Object&lt;T&gt;, fa: <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">FungibleAsset</a>) <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a> {
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_deposit_internal">deposit_internal</a>(store_addr: <b>address</b>, fa: <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">FungibleAsset</a>) <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>, <a href="fungible_asset.md#0x1_fungible_asset_ConcurrentFungibleBalance">ConcurrentFungibleBalance</a> {
     <b>let</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">FungibleAsset</a> { metadata, amount } = fa;
+    <b>assert</b>!(<b>exists</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>&gt;(store_addr), <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="fungible_asset.md#0x1_fungible_asset_EFUNGIBLE_STORE_EXISTENCE">EFUNGIBLE_STORE_EXISTENCE</a>));
+    <b>let</b> store = <b>borrow_global_mut</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>&gt;(store_addr);
+    <b>assert</b>!(metadata == store.metadata, <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="fungible_asset.md#0x1_fungible_asset_EFUNGIBLE_ASSET_AND_STORE_MISMATCH">EFUNGIBLE_ASSET_AND_STORE_MISMATCH</a>));
+
     <b>if</b> (amount == 0) <b>return</b>;
 
-    <b>let</b> store_metadata = <a href="fungible_asset.md#0x1_fungible_asset_store_metadata">store_metadata</a>(store);
-    <b>assert</b>!(metadata == store_metadata, <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="fungible_asset.md#0x1_fungible_asset_EFUNGIBLE_ASSET_AND_STORE_MISMATCH">EFUNGIBLE_ASSET_AND_STORE_MISMATCH</a>));
-    <b>let</b> store_addr = <a href="object.md#0x1_object_object_address">object::object_address</a>(&store);
-    <b>let</b> store = <b>borrow_global_mut</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>&gt;(store_addr);
-    store.balance = store.balance + amount;
+    <b>if</b> (store.balance == 0 && <a href="fungible_asset.md#0x1_fungible_asset_concurrent_fungible_balance_exists_inline">concurrent_fungible_balance_exists_inline</a>(store_addr)) {
+        <b>let</b> balance_resource = <b>borrow_global_mut</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_ConcurrentFungibleBalance">ConcurrentFungibleBalance</a>&gt;(store_addr);
+        <a href="aggregator_v2.md#0x1_aggregator_v2_add">aggregator_v2::add</a>(&<b>mut</b> balance_resource.balance, amount);
+    } <b>else</b> {
+        store.balance = store.balance + amount;
+    };
 
     <a href="event.md#0x1_event_emit">event::emit</a>(<a href="fungible_asset.md#0x1_fungible_asset_Deposit">Deposit</a> { store: store_addr, amount });
 }
@@ -2728,13 +3361,23 @@ Extract <code>amount</code> of the fungible asset from <code>store</code>.
 <pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_withdraw_internal">withdraw_internal</a>(
     store_addr: <b>address</b>,
     amount: u64,
-): <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">FungibleAsset</a> <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a> {
+): <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">FungibleAsset</a> <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>, <a href="fungible_asset.md#0x1_fungible_asset_ConcurrentFungibleBalance">ConcurrentFungibleBalance</a> {
     <b>assert</b>!(<b>exists</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>&gt;(store_addr), <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="fungible_asset.md#0x1_fungible_asset_EFUNGIBLE_STORE_EXISTENCE">EFUNGIBLE_STORE_EXISTENCE</a>));
+
     <b>let</b> store = <b>borrow_global_mut</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>&gt;(store_addr);
     <b>let</b> metadata = store.metadata;
     <b>if</b> (amount != 0) {
-        <b>assert</b>!(store.balance &gt;= amount, <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="fungible_asset.md#0x1_fungible_asset_EINSUFFICIENT_BALANCE">EINSUFFICIENT_BALANCE</a>));
-        store.balance = store.balance - amount;
+        <b>if</b> (store.balance == 0 && <a href="fungible_asset.md#0x1_fungible_asset_concurrent_fungible_balance_exists_inline">concurrent_fungible_balance_exists_inline</a>(store_addr)) {
+            <b>let</b> balance_resource = <b>borrow_global_mut</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_ConcurrentFungibleBalance">ConcurrentFungibleBalance</a>&gt;(store_addr);
+            <b>assert</b>!(
+                <a href="aggregator_v2.md#0x1_aggregator_v2_try_sub">aggregator_v2::try_sub</a>(&<b>mut</b> balance_resource.balance, amount),
+                <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="fungible_asset.md#0x1_fungible_asset_EINSUFFICIENT_BALANCE">EINSUFFICIENT_BALANCE</a>)
+            );
+        } <b>else</b> {
+            <b>assert</b>!(store.balance &gt;= amount, <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="fungible_asset.md#0x1_fungible_asset_EINSUFFICIENT_BALANCE">EINSUFFICIENT_BALANCE</a>));
+            store.balance = store.balance - amount;
+        };
+
         <a href="event.md#0x1_event_emit">event::emit</a>&lt;<a href="fungible_asset.md#0x1_fungible_asset_Withdraw">Withdraw</a>&gt;(<a href="fungible_asset.md#0x1_fungible_asset_Withdraw">Withdraw</a> { store: store_addr, amount });
     };
     <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">FungibleAsset</a> { metadata, amount }
@@ -2953,20 +3596,82 @@ Decrease the supply of a fungible asset by burning.
     <b>let</b> unlimited = <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_is_none">option::is_none</a>(&maximum);
     <b>let</b> supply = <a href="fungible_asset.md#0x1_fungible_asset_ConcurrentSupply">ConcurrentSupply</a> {
         current: <b>if</b> (unlimited) {
-            <a href="aggregator_v2.md#0x1_aggregator_v2_create_unbounded_aggregator">aggregator_v2::create_unbounded_aggregator</a>()
+            <a href="aggregator_v2.md#0x1_aggregator_v2_create_unbounded_aggregator_with_value">aggregator_v2::create_unbounded_aggregator_with_value</a>(current)
         }
         <b>else</b> {
-            <a href="aggregator_v2.md#0x1_aggregator_v2_create_aggregator">aggregator_v2::create_aggregator</a>(<a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_extract">option::extract</a>(&<b>mut</b> maximum))
+            <a href="aggregator_v2.md#0x1_aggregator_v2_create_aggregator_with_value">aggregator_v2::create_aggregator_with_value</a>(current, <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_extract">option::extract</a>(&<b>mut</b> maximum))
         },
     };
-    // <b>update</b> current state:
-    <a href="aggregator_v2.md#0x1_aggregator_v2_add">aggregator_v2::add</a>(&<b>mut</b> supply.current, current);
     <b>move_to</b>(&metadata_object_signer, supply);
 }
 </code></pre>
 
 
 
+</details>
+
+<a id="0x1_fungible_asset_upgrade_store_to_concurrent"></a>
+
+## Function `upgrade_store_to_concurrent`
+
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_upgrade_store_to_concurrent">upgrade_store_to_concurrent</a>&lt;T: key&gt;(owner: &<a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer">signer</a>, store: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_upgrade_store_to_concurrent">upgrade_store_to_concurrent</a>&lt;T: key&gt;(
+    owner: &<a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer">signer</a>,
+    store: Object&lt;T&gt;,
+) <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a> {
+    <b>assert</b>!(<a href="object.md#0x1_object_owns">object::owns</a>(store, <a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer_address_of">signer::address_of</a>(owner)), <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="fungible_asset.md#0x1_fungible_asset_ENOT_STORE_OWNER">ENOT_STORE_OWNER</a>));
+    <b>assert</b>!(!<a href="fungible_asset.md#0x1_fungible_asset_is_frozen">is_frozen</a>(store), <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="fungible_asset.md#0x1_fungible_asset_ESTORE_IS_FROZEN">ESTORE_IS_FROZEN</a>));
+    <b>assert</b>!(<a href="fungible_asset.md#0x1_fungible_asset_allow_upgrade_to_concurrent_fungible_balance">allow_upgrade_to_concurrent_fungible_balance</a>(), <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="fungible_asset.md#0x1_fungible_asset_ECONCURRENT_BALANCE_NOT_ENABLED">ECONCURRENT_BALANCE_NOT_ENABLED</a>));
+    <a href="fungible_asset.md#0x1_fungible_asset_ensure_store_upgraded_to_concurrent_internal">ensure_store_upgraded_to_concurrent_internal</a>(<a href="object.md#0x1_object_object_address">object::object_address</a>(&store));
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_ensure_store_upgraded_to_concurrent_internal"></a>
+
+## Function `ensure_store_upgraded_to_concurrent_internal`
+
+Ensure a known <code><a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a></code> has <code><a href="fungible_asset.md#0x1_fungible_asset_ConcurrentFungibleBalance">ConcurrentFungibleBalance</a></code>.
+
+
+<pre><code><b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_ensure_store_upgraded_to_concurrent_internal">ensure_store_upgraded_to_concurrent_internal</a>(fungible_store_address: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_ensure_store_upgraded_to_concurrent_internal">ensure_store_upgraded_to_concurrent_internal</a>(
+    fungible_store_address: <b>address</b>,
+) <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a> {
+    <b>if</b> (<b>exists</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_ConcurrentFungibleBalance">ConcurrentFungibleBalance</a>&gt;(fungible_store_address)) {
+        <b>return</b>
+    };
+    <b>let</b> store = <b>borrow_global_mut</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>&gt;(fungible_store_address);
+    <b>let</b> balance = <a href="aggregator_v2.md#0x1_aggregator_v2_create_unbounded_aggregator_with_value">aggregator_v2::create_unbounded_aggregator_with_value</a>(store.balance);
+    store.balance = 0;
+    <b>let</b> object_signer = <a href="create_signer.md#0x1_create_signer_create_signer">create_signer::create_signer</a>(fungible_store_address);
+    <b>move_to</b>(&object_signer, <a href="fungible_asset.md#0x1_fungible_asset_ConcurrentFungibleBalance">ConcurrentFungibleBalance</a> { balance });
+}
+</code></pre>
+
+
+
 </details>
 
 <a id="@Specification_1"></a>
diff --git a/aptos-move/framework/aptos-framework/doc/gas_schedule.md b/aptos-move/framework/aptos-framework/doc/gas_schedule.md
index 102058589b5eb..ea4a92886698f 100644
--- a/aptos-move/framework/aptos-framework/doc/gas_schedule.md
+++ b/aptos-move/framework/aptos-framework/doc/gas_schedule.md
@@ -14,6 +14,7 @@ it costs to execute Move on the network.
 -  [Function `initialize`](#0x1_gas_schedule_initialize)
 -  [Function `set_gas_schedule`](#0x1_gas_schedule_set_gas_schedule)
 -  [Function `set_for_next_epoch`](#0x1_gas_schedule_set_for_next_epoch)
+-  [Function `set_for_next_epoch_check_hash`](#0x1_gas_schedule_set_for_next_epoch_check_hash)
 -  [Function `on_new_epoch`](#0x1_gas_schedule_on_new_epoch)
 -  [Function `set_storage_gas_config`](#0x1_gas_schedule_set_storage_gas_config)
 -  [Function `set_storage_gas_config_for_next_epoch`](#0x1_gas_schedule_set_storage_gas_config_for_next_epoch)
@@ -23,12 +24,15 @@ it costs to execute Move on the network.
     -  [Function `initialize`](#@Specification_1_initialize)
     -  [Function `set_gas_schedule`](#@Specification_1_set_gas_schedule)
     -  [Function `set_for_next_epoch`](#@Specification_1_set_for_next_epoch)
+    -  [Function `set_for_next_epoch_check_hash`](#@Specification_1_set_for_next_epoch_check_hash)
     -  [Function `on_new_epoch`](#@Specification_1_on_new_epoch)
     -  [Function `set_storage_gas_config`](#@Specification_1_set_storage_gas_config)
     -  [Function `set_storage_gas_config_for_next_epoch`](#@Specification_1_set_storage_gas_config_for_next_epoch)
 
 
-<pre><code><b>use</b> <a href="chain_status.md#0x1_chain_status">0x1::chain_status</a>;
+<pre><code><b>use</b> <a href="../../aptos-stdlib/../move-stdlib/doc/hash.md#0x1_aptos_hash">0x1::aptos_hash</a>;
+<b>use</b> <a href="../../aptos-stdlib/../move-stdlib/doc/bcs.md#0x1_bcs">0x1::bcs</a>;
+<b>use</b> <a href="chain_status.md#0x1_chain_status">0x1::chain_status</a>;
 <b>use</b> <a href="config_buffer.md#0x1_config_buffer">0x1::config_buffer</a>;
 <b>use</b> <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error">0x1::error</a>;
 <b>use</b> <a href="reconfiguration.md#0x1_reconfiguration">0x1::reconfiguration</a>;
@@ -158,6 +162,15 @@ The provided gas schedule bytes are empty or invalid
 
 
 
+<a id="0x1_gas_schedule_EINVALID_GAS_SCHEDULE_HASH"></a>
+
+
+
+<pre><code><b>const</b> <a href="gas_schedule.md#0x1_gas_schedule_EINVALID_GAS_SCHEDULE_HASH">EINVALID_GAS_SCHEDULE_HASH</a>: u64 = 3;
+</code></pre>
+
+
+
 <a id="0x1_gas_schedule_initialize"></a>
 
 ## Function `initialize`
@@ -279,6 +292,55 @@ aptos_framework::aptos_governance::reconfigure(&framework_signer);
 
 
 
+</details>
+
+<a id="0x1_gas_schedule_set_for_next_epoch_check_hash"></a>
+
+## Function `set_for_next_epoch_check_hash`
+
+Set the gas schedule for the next epoch, typically called by on-chain governance.
+Abort if the version of the given schedule is lower than the current version.
+Require a hash of the old gas schedule to be provided and will abort if the hashes mismatch.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="gas_schedule.md#0x1_gas_schedule_set_for_next_epoch_check_hash">set_for_next_epoch_check_hash</a>(aptos_framework: &<a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer">signer</a>, old_gas_schedule_hash: <a href="../../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, new_gas_schedule_blob: <a href="../../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="gas_schedule.md#0x1_gas_schedule_set_for_next_epoch_check_hash">set_for_next_epoch_check_hash</a>(
+    aptos_framework: &<a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer">signer</a>,
+    old_gas_schedule_hash: <a href="../../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    new_gas_schedule_blob: <a href="../../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+) <b>acquires</b> <a href="gas_schedule.md#0x1_gas_schedule_GasScheduleV2">GasScheduleV2</a> {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(aptos_framework);
+    <b>assert</b>!(!<a href="../../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector_is_empty">vector::is_empty</a>(&new_gas_schedule_blob), <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="gas_schedule.md#0x1_gas_schedule_EINVALID_GAS_SCHEDULE">EINVALID_GAS_SCHEDULE</a>));
+
+    <b>let</b> new_gas_schedule: <a href="gas_schedule.md#0x1_gas_schedule_GasScheduleV2">GasScheduleV2</a> = from_bytes(new_gas_schedule_blob);
+    <b>if</b> (<b>exists</b>&lt;<a href="gas_schedule.md#0x1_gas_schedule_GasScheduleV2">GasScheduleV2</a>&gt;(@aptos_framework)) {
+        <b>let</b> cur_gas_schedule = <b>borrow_global</b>&lt;<a href="gas_schedule.md#0x1_gas_schedule_GasScheduleV2">GasScheduleV2</a>&gt;(@aptos_framework);
+        <b>assert</b>!(
+            new_gas_schedule.feature_version &gt;= cur_gas_schedule.feature_version,
+            <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="gas_schedule.md#0x1_gas_schedule_EINVALID_GAS_FEATURE_VERSION">EINVALID_GAS_FEATURE_VERSION</a>)
+        );
+        <b>let</b> cur_gas_schedule_bytes = <a href="../../aptos-stdlib/../move-stdlib/doc/bcs.md#0x1_bcs_to_bytes">bcs::to_bytes</a>(cur_gas_schedule);
+        <b>let</b> cur_gas_schedule_hash = <a href="../../aptos-stdlib/../move-stdlib/doc/hash.md#0x1_aptos_hash_sha3_512">aptos_hash::sha3_512</a>(cur_gas_schedule_bytes);
+        <b>assert</b>!(
+            cur_gas_schedule_hash == old_gas_schedule_hash,
+            <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="gas_schedule.md#0x1_gas_schedule_EINVALID_GAS_SCHEDULE_HASH">EINVALID_GAS_SCHEDULE_HASH</a>)
+        );
+    };
+
+    <a href="config_buffer.md#0x1_config_buffer_upsert">config_buffer::upsert</a>(new_gas_schedule);
+}
+</code></pre>
+
+
+
 </details>
 
 <a id="0x1_gas_schedule_on_new_epoch"></a>
@@ -505,6 +567,30 @@ Only used in reconfigurations to apply the pending <code><a href="gas_schedule.m
 
 
 
+<a id="@Specification_1_set_for_next_epoch_check_hash"></a>
+
+### Function `set_for_next_epoch_check_hash`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="gas_schedule.md#0x1_gas_schedule_set_for_next_epoch_check_hash">set_for_next_epoch_check_hash</a>(aptos_framework: &<a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer">signer</a>, old_gas_schedule_hash: <a href="../../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, new_gas_schedule_blob: <a href="../../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="system_addresses.md#0x1_system_addresses_AbortsIfNotAptosFramework">system_addresses::AbortsIfNotAptosFramework</a>{ <a href="account.md#0x1_account">account</a>: aptos_framework };
+<b>include</b> <a href="config_buffer.md#0x1_config_buffer_SetForNextEpochAbortsIf">config_buffer::SetForNextEpochAbortsIf</a> {
+    <a href="account.md#0x1_account">account</a>: aptos_framework,
+    config: new_gas_schedule_blob
+};
+<b>let</b> new_gas_schedule = <a href="util.md#0x1_util_spec_from_bytes">util::spec_from_bytes</a>&lt;<a href="gas_schedule.md#0x1_gas_schedule_GasScheduleV2">GasScheduleV2</a>&gt;(new_gas_schedule_blob);
+<b>let</b> cur_gas_schedule = <b>global</b>&lt;<a href="gas_schedule.md#0x1_gas_schedule_GasScheduleV2">GasScheduleV2</a>&gt;(@aptos_framework);
+<b>aborts_if</b> <b>exists</b>&lt;<a href="gas_schedule.md#0x1_gas_schedule_GasScheduleV2">GasScheduleV2</a>&gt;(@aptos_framework) && new_gas_schedule.feature_version &lt; cur_gas_schedule.feature_version;
+<b>aborts_if</b> <b>exists</b>&lt;<a href="gas_schedule.md#0x1_gas_schedule_GasScheduleV2">GasScheduleV2</a>&gt;(@aptos_framework) && (!<a href="../../aptos-stdlib/../move-stdlib/doc/features.md#0x1_features_spec_sha_512_and_ripemd_160_enabled">features::spec_sha_512_and_ripemd_160_enabled</a>() || <a href="../../aptos-stdlib/../move-stdlib/doc/hash.md#0x1_aptos_hash_spec_sha3_512_internal">aptos_hash::spec_sha3_512_internal</a>(<a href="../../aptos-stdlib/../move-stdlib/doc/bcs.md#0x1_bcs_serialize">bcs::serialize</a>(cur_gas_schedule)) != old_gas_schedule_hash);
+</code></pre>
+
+
+
 <a id="@Specification_1_on_new_epoch"></a>
 
 ### Function `on_new_epoch`
diff --git a/aptos-move/framework/aptos-framework/doc/genesis.md b/aptos-move/framework/aptos-framework/doc/genesis.md
index e3b00b12bf37b..5fcac753d7489 100644
--- a/aptos-move/framework/aptos-framework/doc/genesis.md
+++ b/aptos-move/framework/aptos-framework/doc/genesis.md
@@ -36,6 +36,7 @@
 
 <pre><code><b>use</b> <a href="account.md#0x1_account">0x1::account</a>;
 <b>use</b> <a href="aggregator_factory.md#0x1_aggregator_factory">0x1::aggregator_factory</a>;
+<b>use</b> <a href="aptos_account.md#0x1_aptos_account">0x1::aptos_account</a>;
 <b>use</b> <a href="aptos_coin.md#0x1_aptos_coin">0x1::aptos_coin</a>;
 <b>use</b> <a href="aptos_governance.md#0x1_aptos_governance">0x1::aptos_governance</a>;
 <b>use</b> <a href="block.md#0x1_block">0x1::block</a>;
@@ -440,6 +441,7 @@ Only called for testnets and e2e tests.
 
     <b>let</b> core_resources = <a href="account.md#0x1_account_create_account">account::create_account</a>(@core_resources);
     <a href="account.md#0x1_account_rotate_authentication_key_internal">account::rotate_authentication_key_internal</a>(&core_resources, core_resources_auth_key);
+    <a href="aptos_account.md#0x1_aptos_account_register_apt">aptos_account::register_apt</a>(&core_resources); // registers APT store
     <a href="aptos_coin.md#0x1_aptos_coin_configure_accounts_for_test">aptos_coin::configure_accounts_for_test</a>(aptos_framework, &core_resources, mint_cap);
 }
 </code></pre>
diff --git a/aptos-move/framework/aptos-framework/doc/keyless_account.md b/aptos-move/framework/aptos-framework/doc/keyless_account.md
index 0afb88331c19b..6a5ec753b84b3 100644
--- a/aptos-move/framework/aptos-framework/doc/keyless_account.md
+++ b/aptos-move/framework/aptos-framework/doc/keyless_account.md
@@ -332,7 +332,7 @@ Pre-validate the VK to actively-prevent incorrect VKs from being set on-chain.
     <b>assert</b>!(<a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_is_some">option::is_some</a>(&<a href="../../aptos-stdlib/doc/crypto_algebra.md#0x1_crypto_algebra_deserialize">crypto_algebra::deserialize</a>&lt;<a href="../../aptos-stdlib/doc/bn254_algebra.md#0x1_bn254_algebra_G2">bn254_algebra::G2</a>, <a href="../../aptos-stdlib/doc/bn254_algebra.md#0x1_bn254_algebra_FormatG2Compr">bn254_algebra::FormatG2Compr</a>&gt;(&vk.beta_g2)), <a href="keyless_account.md#0x1_keyless_account_E_INVALID_BN254_G2_SERIALIZATION">E_INVALID_BN254_G2_SERIALIZATION</a>);
     <b>assert</b>!(<a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_is_some">option::is_some</a>(&<a href="../../aptos-stdlib/doc/crypto_algebra.md#0x1_crypto_algebra_deserialize">crypto_algebra::deserialize</a>&lt;<a href="../../aptos-stdlib/doc/bn254_algebra.md#0x1_bn254_algebra_G2">bn254_algebra::G2</a>, <a href="../../aptos-stdlib/doc/bn254_algebra.md#0x1_bn254_algebra_FormatG2Compr">bn254_algebra::FormatG2Compr</a>&gt;(&vk.gamma_g2)), <a href="keyless_account.md#0x1_keyless_account_E_INVALID_BN254_G2_SERIALIZATION">E_INVALID_BN254_G2_SERIALIZATION</a>);
     <b>assert</b>!(<a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_is_some">option::is_some</a>(&<a href="../../aptos-stdlib/doc/crypto_algebra.md#0x1_crypto_algebra_deserialize">crypto_algebra::deserialize</a>&lt;<a href="../../aptos-stdlib/doc/bn254_algebra.md#0x1_bn254_algebra_G2">bn254_algebra::G2</a>, <a href="../../aptos-stdlib/doc/bn254_algebra.md#0x1_bn254_algebra_FormatG2Compr">bn254_algebra::FormatG2Compr</a>&gt;(&vk.delta_g2)), <a href="keyless_account.md#0x1_keyless_account_E_INVALID_BN254_G2_SERIALIZATION">E_INVALID_BN254_G2_SERIALIZATION</a>);
-    for(i in 0..<a href="../../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector_length">vector::length</a>(&vk.gamma_abc_g1)) {
+    for (i in 0..<a href="../../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector_length">vector::length</a>(&vk.gamma_abc_g1)) {
         <b>assert</b>!(<a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_is_some">option::is_some</a>(&<a href="../../aptos-stdlib/doc/crypto_algebra.md#0x1_crypto_algebra_deserialize">crypto_algebra::deserialize</a>&lt;<a href="../../aptos-stdlib/doc/bn254_algebra.md#0x1_bn254_algebra_G1">bn254_algebra::G1</a>, <a href="../../aptos-stdlib/doc/bn254_algebra.md#0x1_bn254_algebra_FormatG1Compr">bn254_algebra::FormatG1Compr</a>&gt;(<a href="../../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector_borrow">vector::borrow</a>(&vk.gamma_abc_g1, i))), <a href="keyless_account.md#0x1_keyless_account_E_INVALID_BN254_G1_SERIALIZATION">E_INVALID_BN254_G1_SERIALIZATION</a>);
     };
 }
@@ -548,7 +548,6 @@ WARNING: If a malicious key is set, this would lead to stolen funds.
 
 <pre><code><b>public</b> <b>fun</b> <a href="keyless_account.md#0x1_keyless_account_set_groth16_verification_key_for_next_epoch">set_groth16_verification_key_for_next_epoch</a>(fx: &<a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer">signer</a>, vk: <a href="keyless_account.md#0x1_keyless_account_Groth16VerificationKey">Groth16VerificationKey</a>) {
     <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(fx);
-    <a href="keyless_account.md#0x1_keyless_account_validate_groth16_vk">validate_groth16_vk</a>(&vk);
     <a href="config_buffer.md#0x1_config_buffer_upsert">config_buffer::upsert</a>&lt;<a href="keyless_account.md#0x1_keyless_account_Groth16VerificationKey">Groth16VerificationKey</a>&gt;(vk);
 }
 </code></pre>
@@ -773,7 +772,7 @@ Only used in reconfigurations to apply the queued up configuration changes, if t
         }
     };
 
-    <b>if</b>(<a href="config_buffer.md#0x1_config_buffer_does_exist">config_buffer::does_exist</a>&lt;<a href="keyless_account.md#0x1_keyless_account_Configuration">Configuration</a>&gt;()) {
+    <b>if</b> (<a href="config_buffer.md#0x1_config_buffer_does_exist">config_buffer::does_exist</a>&lt;<a href="keyless_account.md#0x1_keyless_account_Configuration">Configuration</a>&gt;()) {
         <b>let</b> config = <a href="config_buffer.md#0x1_config_buffer_extract">config_buffer::extract</a>();
         <b>if</b> (<b>exists</b>&lt;<a href="keyless_account.md#0x1_keyless_account_Configuration">Configuration</a>&gt;(@aptos_framework)) {
             *<b>borrow_global_mut</b>&lt;<a href="keyless_account.md#0x1_keyless_account_Configuration">Configuration</a>&gt;(@aptos_framework) = config;
diff --git a/aptos-move/framework/aptos-framework/doc/multisig_account.md b/aptos-move/framework/aptos-framework/doc/multisig_account.md
index ad1a376c19d47..a5fcc8ab9b835 100644
--- a/aptos-move/framework/aptos-framework/doc/multisig_account.md
+++ b/aptos-move/framework/aptos-framework/doc/multisig_account.md
@@ -1413,6 +1413,16 @@ Transaction payload cannot be empty.
 
 
 
+<a id="0x1_multisig_account_EPAYLOAD_DOES_NOT_MATCH"></a>
+
+Provided target function does not match the payload stored in the on-chain transaction.
+
+
+<pre><code><b>const</b> <a href="multisig_account.md#0x1_multisig_account_EPAYLOAD_DOES_NOT_MATCH">EPAYLOAD_DOES_NOT_MATCH</a>: u64 = 2010;
+</code></pre>
+
+
+
 <a id="0x1_multisig_account_EPAYLOAD_DOES_NOT_MATCH_HASH"></a>
 
 Provided target function does not match the hash stored in the on-chain transaction.
@@ -2938,7 +2948,7 @@ Remove the next transaction if it has sufficient owner rejections.
 
     <b>let</b> sequence_number = <a href="multisig_account.md#0x1_multisig_account_last_resolved_sequence_number">last_resolved_sequence_number</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>) + 1;
     <b>let</b> owner_addr = address_of(owner);
-    <b>if</b>(<a href="../../aptos-stdlib/../move-stdlib/doc/features.md#0x1_features_multisig_v2_enhancement_feature_enabled">features::multisig_v2_enhancement_feature_enabled</a>()) {
+    <b>if</b> (<a href="../../aptos-stdlib/../move-stdlib/doc/features.md#0x1_features_multisig_v2_enhancement_feature_enabled">features::multisig_v2_enhancement_feature_enabled</a>()) {
         // Implicitly vote for rejection <b>if</b> the owner <b>has</b> not voted for rejection yet.
         <b>if</b> (!<a href="multisig_account.md#0x1_multisig_account_has_voted_for_rejection">has_voted_for_rejection</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>, sequence_number, owner_addr)) {
             <a href="multisig_account.md#0x1_multisig_account_reject_transaction">reject_transaction</a>(owner, <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>, sequence_number);
@@ -3037,7 +3047,7 @@ Transaction payload is optional if it's already stored on chain for the transact
     <b>let</b> sequence_number = <a href="multisig_account.md#0x1_multisig_account_last_resolved_sequence_number">last_resolved_sequence_number</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>) + 1;
     <a href="multisig_account.md#0x1_multisig_account_assert_transaction_exists">assert_transaction_exists</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>, sequence_number);
 
-    <b>if</b>(<a href="../../aptos-stdlib/../move-stdlib/doc/features.md#0x1_features_multisig_v2_enhancement_feature_enabled">features::multisig_v2_enhancement_feature_enabled</a>()) {
+    <b>if</b> (<a href="../../aptos-stdlib/../move-stdlib/doc/features.md#0x1_features_multisig_v2_enhancement_feature_enabled">features::multisig_v2_enhancement_feature_enabled</a>()) {
         <b>assert</b>!(
             <a href="multisig_account.md#0x1_multisig_account_can_execute">can_execute</a>(address_of(owner), <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>, sequence_number),
             <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="multisig_account.md#0x1_multisig_account_ENOT_ENOUGH_APPROVALS">ENOT_ENOUGH_APPROVALS</a>),
@@ -3061,6 +3071,19 @@ Transaction payload is optional if it's already stored on chain for the transact
             <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="multisig_account.md#0x1_multisig_account_EPAYLOAD_DOES_NOT_MATCH_HASH">EPAYLOAD_DOES_NOT_MATCH_HASH</a>),
         );
     };
+
+    // If the transaction payload is stored on chain and there is a provided payload,
+    // verify that the provided payload matches the stored payload.
+    <b>if</b> (<a href="../../aptos-stdlib/../move-stdlib/doc/features.md#0x1_features_abort_if_multisig_payload_mismatch_enabled">features::abort_if_multisig_payload_mismatch_enabled</a>()
+        && <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_is_some">option::is_some</a>(&transaction.payload)
+        && !<a href="../../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector_is_empty">vector::is_empty</a>(&payload)
+    ) {
+        <b>let</b> stored_payload = <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_borrow">option::borrow</a>(&transaction.payload);
+        <b>assert</b>!(
+            payload == *stored_payload,
+            <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="multisig_account.md#0x1_multisig_account_EPAYLOAD_DOES_NOT_MATCH">EPAYLOAD_DOES_NOT_MATCH</a>),
+        );
+    }
 }
 </code></pre>
 
@@ -3195,7 +3218,7 @@ This function is private so no other code can call this beside the VM itself as
     <b>let</b> multisig_account_resource = <b>borrow_global_mut</b>&lt;<a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a>&gt;(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>);
     <b>let</b> (num_approvals, _) = <a href="multisig_account.md#0x1_multisig_account_remove_executed_transaction">remove_executed_transaction</a>(multisig_account_resource);
 
-    <b>if</b>(<a href="../../aptos-stdlib/../move-stdlib/doc/features.md#0x1_features_multisig_v2_enhancement_feature_enabled">features::multisig_v2_enhancement_feature_enabled</a>() && implicit_approval) {
+    <b>if</b> (<a href="../../aptos-stdlib/../move-stdlib/doc/features.md#0x1_features_multisig_v2_enhancement_feature_enabled">features::multisig_v2_enhancement_feature_enabled</a>() && implicit_approval) {
         <b>if</b> (std::features::module_event_migration_enabled()) {
             emit(
                 <a href="multisig_account.md#0x1_multisig_account_Vote">Vote</a> {
@@ -3272,7 +3295,7 @@ This function is private so no other code can call this beside the VM itself as
     <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>,
     transaction: <a href="multisig_account.md#0x1_multisig_account_MultisigTransaction">MultisigTransaction</a>
 ) {
-    <b>if</b>(<a href="../../aptos-stdlib/../move-stdlib/doc/features.md#0x1_features_multisig_v2_enhancement_feature_enabled">features::multisig_v2_enhancement_feature_enabled</a>()) {
+    <b>if</b> (<a href="../../aptos-stdlib/../move-stdlib/doc/features.md#0x1_features_multisig_v2_enhancement_feature_enabled">features::multisig_v2_enhancement_feature_enabled</a>()) {
         <b>assert</b>!(
             <a href="multisig_account.md#0x1_multisig_account_available_transaction_queue_capacity">available_transaction_queue_capacity</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>) &gt; 0,
             <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="multisig_account.md#0x1_multisig_account_EMAX_PENDING_TRANSACTIONS_EXCEEDED">EMAX_PENDING_TRANSACTIONS_EXCEEDED</a>)
diff --git a/aptos-move/framework/aptos-framework/doc/object.md b/aptos-move/framework/aptos-framework/doc/object.md
index d51f3cac2cc2b..bba128592ff31 100644
--- a/aptos-move/framework/aptos-framework/doc/object.md
+++ b/aptos-move/framework/aptos-framework/doc/object.md
@@ -624,16 +624,6 @@ Exceeds maximum nesting for an object transfer.
 
 
 
-<a id="0x1_object_ENOT_MOVABLE"></a>
-
-Object is untransferable any operations that might result in a transfer are disallowed.
-
-
-<pre><code><b>const</b> <a href="object.md#0x1_object_ENOT_MOVABLE">ENOT_MOVABLE</a>: u64 = 9;
-</code></pre>
-
-
-
 <a id="0x1_object_ENOT_OBJECT_OWNER"></a>
 
 The caller does not have ownership permissions
@@ -684,6 +674,16 @@ Cannot reclaim objects that weren't burnt.
 
 
 
+<a id="0x1_object_EOBJECT_NOT_TRANSFERRABLE"></a>
+
+Object is untransferable any operations that might result in a transfer are disallowed.
+
+
+<pre><code><b>const</b> <a href="object.md#0x1_object_EOBJECT_NOT_TRANSFERRABLE">EOBJECT_NOT_TRANSFERRABLE</a>: u64 = 9;
+</code></pre>
+
+
+
 <a id="0x1_object_ERESOURCE_DOES_NOT_EXIST"></a>
 
 The resource is not stored at the specified address.
@@ -1413,7 +1413,7 @@ Generates the TransferRef, which can be used to manage object transfers.
 
 
 <pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_generate_transfer_ref">generate_transfer_ref</a>(ref: &<a href="object.md#0x1_object_ConstructorRef">ConstructorRef</a>): <a href="object.md#0x1_object_TransferRef">TransferRef</a> {
-    <b>assert</b>!(!<b>exists</b>&lt;<a href="object.md#0x1_object_Untransferable">Untransferable</a>&gt;(ref.self), <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="object.md#0x1_object_ENOT_MOVABLE">ENOT_MOVABLE</a>));
+    <b>assert</b>!(!<b>exists</b>&lt;<a href="object.md#0x1_object_Untransferable">Untransferable</a>&gt;(ref.self), <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="object.md#0x1_object_EOBJECT_NOT_TRANSFERRABLE">EOBJECT_NOT_TRANSFERRABLE</a>));
     <a href="object.md#0x1_object_TransferRef">TransferRef</a> { self: ref.self }
 }
 </code></pre>
@@ -1809,7 +1809,7 @@ Enable direct transfer.
 
 
 <pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_enable_ungated_transfer">enable_ungated_transfer</a>(ref: &<a href="object.md#0x1_object_TransferRef">TransferRef</a>) <b>acquires</b> <a href="object.md#0x1_object_ObjectCore">ObjectCore</a> {
-    <b>assert</b>!(!<b>exists</b>&lt;<a href="object.md#0x1_object_Untransferable">Untransferable</a>&gt;(ref.self), <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="object.md#0x1_object_ENOT_MOVABLE">ENOT_MOVABLE</a>));
+    <b>assert</b>!(!<b>exists</b>&lt;<a href="object.md#0x1_object_Untransferable">Untransferable</a>&gt;(ref.self), <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="object.md#0x1_object_EOBJECT_NOT_TRANSFERRABLE">EOBJECT_NOT_TRANSFERRABLE</a>));
     <b>let</b> <a href="object.md#0x1_object">object</a> = <b>borrow_global_mut</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(ref.self);
     <a href="object.md#0x1_object">object</a>.allow_ungated_transfer = <b>true</b>;
 }
@@ -1837,7 +1837,7 @@ time of generation is the owner at the time of transferring.
 
 
 <pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_generate_linear_transfer_ref">generate_linear_transfer_ref</a>(ref: &<a href="object.md#0x1_object_TransferRef">TransferRef</a>): <a href="object.md#0x1_object_LinearTransferRef">LinearTransferRef</a> <b>acquires</b> <a href="object.md#0x1_object_ObjectCore">ObjectCore</a> {
-    <b>assert</b>!(!<b>exists</b>&lt;<a href="object.md#0x1_object_Untransferable">Untransferable</a>&gt;(ref.self), <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="object.md#0x1_object_ENOT_MOVABLE">ENOT_MOVABLE</a>));
+    <b>assert</b>!(!<b>exists</b>&lt;<a href="object.md#0x1_object_Untransferable">Untransferable</a>&gt;(ref.self), <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="object.md#0x1_object_EOBJECT_NOT_TRANSFERRABLE">EOBJECT_NOT_TRANSFERRABLE</a>));
     <b>let</b> owner = <a href="object.md#0x1_object_owner">owner</a>(<a href="object.md#0x1_object_Object">Object</a>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt; { inner: ref.self });
     <a href="object.md#0x1_object_LinearTransferRef">LinearTransferRef</a> {
         self: ref.self,
@@ -1866,8 +1866,14 @@ Transfer to the destination address using a LinearTransferRef.
 <summary>Implementation</summary>
 
 
-<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_transfer_with_ref">transfer_with_ref</a>(ref: <a href="object.md#0x1_object_LinearTransferRef">LinearTransferRef</a>, <b>to</b>: <b>address</b>) <b>acquires</b> <a href="object.md#0x1_object_ObjectCore">ObjectCore</a> {
-    <b>assert</b>!(!<b>exists</b>&lt;<a href="object.md#0x1_object_Untransferable">Untransferable</a>&gt;(ref.self), <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="object.md#0x1_object_ENOT_MOVABLE">ENOT_MOVABLE</a>));
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_transfer_with_ref">transfer_with_ref</a>(ref: <a href="object.md#0x1_object_LinearTransferRef">LinearTransferRef</a>, <b>to</b>: <b>address</b>) <b>acquires</b> <a href="object.md#0x1_object_ObjectCore">ObjectCore</a>, <a href="object.md#0x1_object_TombStone">TombStone</a> {
+    <b>assert</b>!(!<b>exists</b>&lt;<a href="object.md#0x1_object_Untransferable">Untransferable</a>&gt;(ref.self), <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="object.md#0x1_object_EOBJECT_NOT_TRANSFERRABLE">EOBJECT_NOT_TRANSFERRABLE</a>));
+
+    // Undo soft burn <b>if</b> present <b>as</b> we don't want the original owner <b>to</b> be able <b>to</b> reclaim by calling unburn later.
+    <b>if</b> (<b>exists</b>&lt;<a href="object.md#0x1_object_TombStone">TombStone</a>&gt;(ref.self)) {
+        <b>let</b> <a href="object.md#0x1_object_TombStone">TombStone</a> { original_owner: _ } = <b>move_from</b>&lt;<a href="object.md#0x1_object_TombStone">TombStone</a>&gt;(ref.self);
+    };
+
     <b>let</b> <a href="object.md#0x1_object">object</a> = <b>borrow_global_mut</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(ref.self);
     <b>assert</b>!(
         <a href="object.md#0x1_object">object</a>.owner == ref.owner,
@@ -2099,9 +2105,7 @@ objects may have cyclic dependencies.
     <b>let</b> count = 0;
     <b>while</b> (owner != current_address) {
         count = count + 1;
-        <b>if</b> (std::features::max_object_nesting_check_enabled()) {
-            <b>assert</b>!(count &lt; <a href="object.md#0x1_object_MAXIMUM_OBJECT_NESTING">MAXIMUM_OBJECT_NESTING</a>, <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_out_of_range">error::out_of_range</a>(<a href="object.md#0x1_object_EMAXIMUM_NESTING">EMAXIMUM_NESTING</a>))
-        };
+        <b>assert</b>!(count &lt; <a href="object.md#0x1_object_MAXIMUM_OBJECT_NESTING">MAXIMUM_OBJECT_NESTING</a>, <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_out_of_range">error::out_of_range</a>(<a href="object.md#0x1_object_EMAXIMUM_NESTING">EMAXIMUM_NESTING</a>));
         // At this point, the first <a href="object.md#0x1_object">object</a> <b>exists</b> and so the more likely case is that the
         // <a href="object.md#0x1_object">object</a>'s owner is not an <a href="object.md#0x1_object">object</a>. So we <b>return</b> a more sensible <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error">error</a>.
         <b>assert</b>!(
@@ -2303,9 +2307,7 @@ Return true if the provided address has indirect or direct ownership of the prov
     <b>let</b> count = 0;
     <b>while</b> (owner != current_address) {
         count = count + 1;
-        <b>if</b> (std::features::max_object_nesting_check_enabled()) {
-            <b>assert</b>!(count &lt; <a href="object.md#0x1_object_MAXIMUM_OBJECT_NESTING">MAXIMUM_OBJECT_NESTING</a>, <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_out_of_range">error::out_of_range</a>(<a href="object.md#0x1_object_EMAXIMUM_NESTING">EMAXIMUM_NESTING</a>))
-        };
+        <b>assert</b>!(count &lt; <a href="object.md#0x1_object_MAXIMUM_OBJECT_NESTING">MAXIMUM_OBJECT_NESTING</a>, <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_out_of_range">error::out_of_range</a>(<a href="object.md#0x1_object_EMAXIMUM_NESTING">EMAXIMUM_NESTING</a>));
         <b>if</b> (!<b>exists</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(current_address)) {
             <b>return</b> <b>false</b>
         };
diff --git a/aptos-move/framework/aptos-framework/doc/primary_fungible_store.md b/aptos-move/framework/aptos-framework/doc/primary_fungible_store.md
index 600a6ee0ccd28..28b1374e4f850 100644
--- a/aptos-move/framework/aptos-framework/doc/primary_fungible_store.md
+++ b/aptos-move/framework/aptos-framework/doc/primary_fungible_store.md
@@ -25,6 +25,9 @@ fungible asset to it. This emits an deposit event.
 -  [Function `primary_store_address`](#0x1_primary_fungible_store_primary_store_address)
 -  [Function `primary_store`](#0x1_primary_fungible_store_primary_store)
 -  [Function `primary_store_exists`](#0x1_primary_fungible_store_primary_store_exists)
+-  [Function `primary_store_address_inlined`](#0x1_primary_fungible_store_primary_store_address_inlined)
+-  [Function `primary_store_inlined`](#0x1_primary_fungible_store_primary_store_inlined)
+-  [Function `primary_store_exists_inlined`](#0x1_primary_fungible_store_primary_store_exists_inlined)
 -  [Function `balance`](#0x1_primary_fungible_store_balance)
 -  [Function `is_balance_at_least`](#0x1_primary_fungible_store_is_balance_at_least)
 -  [Function `is_frozen`](#0x1_primary_fungible_store_is_frozen)
@@ -46,7 +49,6 @@ fungible asset to it. This emits an deposit event.
 
 
 <pre><code><b>use</b> <a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset">0x1::dispatchable_fungible_asset</a>;
-<b>use</b> <a href="../../aptos-stdlib/../move-stdlib/doc/features.md#0x1_features">0x1::features</a>;
 <b>use</b> <a href="fungible_asset.md#0x1_fungible_asset">0x1::fungible_asset</a>;
 <b>use</b> <a href="object.md#0x1_object">0x1::object</a>;
 <b>use</b> <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option">0x1::option</a>;
@@ -154,10 +156,11 @@ Ensure that the primary store object for the given address exists. If it doesn't
     owner: <b>address</b>,
     metadata: Object&lt;T&gt;,
 ): Object&lt;FungibleStore&gt; <b>acquires</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_DeriveRefPod">DeriveRefPod</a> {
-    <b>if</b> (!<a href="primary_fungible_store.md#0x1_primary_fungible_store_primary_store_exists">primary_store_exists</a>(owner, metadata)) {
-        <a href="primary_fungible_store.md#0x1_primary_fungible_store_create_primary_store">create_primary_store</a>(owner, metadata)
+    <b>let</b> store_addr = <a href="primary_fungible_store.md#0x1_primary_fungible_store_primary_store_address">primary_store_address</a>(owner, metadata);
+    <b>if</b> (<a href="fungible_asset.md#0x1_fungible_asset_store_exists">fungible_asset::store_exists</a>(store_addr)) {
+        <a href="object.md#0x1_object_address_to_object">object::address_to_object</a>(store_addr)
     } <b>else</b> {
-        <a href="primary_fungible_store.md#0x1_primary_fungible_store_primary_store">primary_store</a>(owner, metadata)
+        <a href="primary_fungible_store.md#0x1_primary_fungible_store_create_primary_store">create_primary_store</a>(owner, metadata)
     }
 }
 </code></pre>
@@ -189,12 +192,7 @@ Create a primary store object to hold fungible asset for the given address.
     <b>let</b> metadata_addr = <a href="object.md#0x1_object_object_address">object::object_address</a>(&metadata);
     <a href="object.md#0x1_object_address_to_object">object::address_to_object</a>&lt;Metadata&gt;(metadata_addr);
     <b>let</b> derive_ref = &<b>borrow_global</b>&lt;<a href="primary_fungible_store.md#0x1_primary_fungible_store_DeriveRefPod">DeriveRefPod</a>&gt;(metadata_addr).metadata_derive_ref;
-    <b>let</b> constructor_ref = <b>if</b> (metadata_addr == @aptos_fungible_asset && <a href="../../aptos-stdlib/../move-stdlib/doc/features.md#0x1_features_primary_apt_fungible_store_at_user_address_enabled">features::primary_apt_fungible_store_at_user_address_enabled</a>(
-    )) {
-        &<a href="object.md#0x1_object_create_sticky_object_at_address">object::create_sticky_object_at_address</a>(owner_addr, owner_addr)
-    } <b>else</b> {
-        &<a href="object.md#0x1_object_create_user_derived_object">object::create_user_derived_object</a>(owner_addr, derive_ref)
-    };
+    <b>let</b> constructor_ref = &<a href="object.md#0x1_object_create_user_derived_object">object::create_user_derived_object</a>(owner_addr, derive_ref);
     // Disable ungated transfer <b>as</b> deterministic stores shouldn't be transferrable.
     <b>let</b> transfer_ref = &<a href="object.md#0x1_object_generate_transfer_ref">object::generate_transfer_ref</a>(constructor_ref);
     <a href="object.md#0x1_object_disable_ungated_transfer">object::disable_ungated_transfer</a>(transfer_ref);
@@ -226,11 +224,7 @@ Get the address of the primary store for the given account.
 
 <pre><code><b>public</b> <b>fun</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_primary_store_address">primary_store_address</a>&lt;T: key&gt;(owner: <b>address</b>, metadata: Object&lt;T&gt;): <b>address</b> {
     <b>let</b> metadata_addr = <a href="object.md#0x1_object_object_address">object::object_address</a>(&metadata);
-    <b>if</b> (metadata_addr == @aptos_fungible_asset && <a href="../../aptos-stdlib/../move-stdlib/doc/features.md#0x1_features_primary_apt_fungible_store_at_user_address_enabled">features::primary_apt_fungible_store_at_user_address_enabled</a>()) {
-        owner
-    } <b>else</b> {
-        <a href="object.md#0x1_object_create_user_derived_object_address">object::create_user_derived_object_address</a>(owner, metadata_addr)
-    }
+    <a href="object.md#0x1_object_create_user_derived_object_address">object::create_user_derived_object_address</a>(owner, metadata_addr)
 }
 </code></pre>
 
@@ -289,6 +283,86 @@ Return whether the given account's primary store exists.
 
 
 
+</details>
+
+<a id="0x1_primary_fungible_store_primary_store_address_inlined"></a>
+
+## Function `primary_store_address_inlined`
+
+Get the address of the primary store for the given account.
+Use instead of the corresponding view functions for dispatchable hooks to avoid circular dependencies of modules.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_primary_store_address_inlined">primary_store_address_inlined</a>&lt;T: key&gt;(owner: <b>address</b>, metadata: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_primary_store_address_inlined">primary_store_address_inlined</a>&lt;T: key&gt;(owner: <b>address</b>, metadata: Object&lt;T&gt;): <b>address</b> {
+    <b>let</b> metadata_addr = <a href="object.md#0x1_object_object_address">object::object_address</a>(&metadata);
+    <a href="object.md#0x1_object_create_user_derived_object_address">object::create_user_derived_object_address</a>(owner, metadata_addr)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_primary_fungible_store_primary_store_inlined"></a>
+
+## Function `primary_store_inlined`
+
+Get the primary store object for the given account.
+Use instead of the corresponding view functions for dispatchable hooks to avoid circular dependencies of modules.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_primary_store_inlined">primary_store_inlined</a>&lt;T: key&gt;(owner: <b>address</b>, metadata: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): <a href="object.md#0x1_object_Object">object::Object</a>&lt;<a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">fungible_asset::FungibleStore</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_primary_store_inlined">primary_store_inlined</a>&lt;T: key&gt;(owner: <b>address</b>, metadata: Object&lt;T&gt;): Object&lt;FungibleStore&gt; {
+    <b>let</b> store = <a href="primary_fungible_store.md#0x1_primary_fungible_store_primary_store_address_inlined">primary_store_address_inlined</a>(owner, metadata);
+    <a href="object.md#0x1_object_address_to_object">object::address_to_object</a>(store)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_primary_fungible_store_primary_store_exists_inlined"></a>
+
+## Function `primary_store_exists_inlined`
+
+Return whether the given account's primary store exists.
+Use instead of the corresponding view functions for dispatchable hooks to avoid circular dependencies of modules.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_primary_store_exists_inlined">primary_store_exists_inlined</a>&lt;T: key&gt;(<a href="account.md#0x1_account">account</a>: <b>address</b>, metadata: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_primary_store_exists_inlined">primary_store_exists_inlined</a>&lt;T: key&gt;(<a href="account.md#0x1_account">account</a>: <b>address</b>, metadata: Object&lt;T&gt;): bool {
+    <a href="fungible_asset.md#0x1_fungible_asset_store_exists">fungible_asset::store_exists</a>(<a href="primary_fungible_store.md#0x1_primary_fungible_store_primary_store_address_inlined">primary_store_address_inlined</a>(<a href="account.md#0x1_account">account</a>, metadata))
+}
+</code></pre>
+
+
+
 </details>
 
 <a id="0x1_primary_fungible_store_balance"></a>
@@ -454,7 +528,7 @@ Deposit fungible asset <code>fa</code> to the given account's primary store.
 <pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_force_deposit">force_deposit</a>(owner: <b>address</b>, fa: FungibleAsset) <b>acquires</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_DeriveRefPod">DeriveRefPod</a> {
     <b>let</b> metadata = <a href="fungible_asset.md#0x1_fungible_asset_asset_metadata">fungible_asset::asset_metadata</a>(&fa);
     <b>let</b> store = <a href="primary_fungible_store.md#0x1_primary_fungible_store_ensure_primary_store_exists">ensure_primary_store_exists</a>(owner, metadata);
-    <a href="fungible_asset.md#0x1_fungible_asset_deposit_internal">fungible_asset::deposit_internal</a>(store, fa);
+    <a href="fungible_asset.md#0x1_fungible_asset_deposit_internal">fungible_asset::deposit_internal</a>(<a href="object.md#0x1_object_object_address">object::object_address</a>(&store), fa);
 }
 </code></pre>
 
@@ -873,13 +947,7 @@ Transfer <code>amount</code> of FA from the primary store of <code>from</code> t
 
 <pre><code><b>fun</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_spec_primary_store_address">spec_primary_store_address</a>&lt;T: key&gt;(owner: <b>address</b>, metadata: Object&lt;T&gt;): <b>address</b> {
    <b>let</b> metadata_addr = <a href="object.md#0x1_object_object_address">object::object_address</a>(metadata);
-   <b>if</b> (metadata_addr == @aptos_fungible_asset && <a href="../../aptos-stdlib/../move-stdlib/doc/features.md#0x1_features_spec_is_enabled">features::spec_is_enabled</a>(
-       <a href="../../aptos-stdlib/../move-stdlib/doc/features.md#0x1_features_PRIMARY_APT_FUNGIBLE_STORE_AT_USER_ADDRESS">features::PRIMARY_APT_FUNGIBLE_STORE_AT_USER_ADDRESS</a>
-   )) {
-       owner
-   } <b>else</b> {
-       <a href="object.md#0x1_object_spec_create_user_derived_object_address">object::spec_create_user_derived_object_address</a>(owner, metadata_addr)
-   }
+   <a href="object.md#0x1_object_spec_create_user_derived_object_address">object::spec_create_user_derived_object_address</a>(owner, metadata_addr)
 }
 </code></pre>
 
diff --git a/aptos-move/framework/aptos-framework/doc/randomness.md b/aptos-move/framework/aptos-framework/doc/randomness.md
index a0a73e8d7ca33..fa210cfb1023a 100644
--- a/aptos-move/framework/aptos-framework/doc/randomness.md
+++ b/aptos-move/framework/aptos-framework/doc/randomness.md
@@ -36,6 +36,7 @@ Security holds under the same proof-of-stake assumption that secures the Aptos n
 -  [Function `u256_range`](#0x1_randomness_u256_range)
 -  [Function `permutation`](#0x1_randomness_permutation)
 -  [Function `safe_add_mod`](#0x1_randomness_safe_add_mod)
+-  [Function `take_first`](#0x1_randomness_take_first)
 -  [Function `safe_add_mod_for_verification`](#0x1_randomness_safe_add_mod_for_verification)
 -  [Function `fetch_and_increment_txn_counter`](#0x1_randomness_fetch_and_increment_txn_counter)
 -  [Function `is_unbiasable`](#0x1_randomness_is_unbiasable)
@@ -320,7 +321,7 @@ Generates a sequence of bytes uniformly at random
     <b>let</b> c = 0;
     <b>while</b> (c &lt; n) {
         <b>let</b> blob = <a href="randomness.md#0x1_randomness_next_32_bytes">next_32_bytes</a>();
-        <a href="../../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector_append">vector::append</a>(&<b>mut</b> v, blob);
+        <a href="../../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector_reverse_append">vector::reverse_append</a>(&<b>mut</b> v, blob);
 
         c = c + 32;
     };
@@ -827,6 +828,8 @@ If n is 0, returns the empty vector.
 
 
 <pre><code><b>public</b> <b>fun</b> <a href="randomness.md#0x1_randomness_permutation">permutation</a>(n: u64): <a href="../../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector">vector</a>&lt;u64&gt; <b>acquires</b> <a href="randomness.md#0x1_randomness_PerBlockRandomness">PerBlockRandomness</a> {
+    <a href="event.md#0x1_event_emit">event::emit</a>(<a href="randomness.md#0x1_randomness_RandomnessGeneratedEvent">RandomnessGeneratedEvent</a> {});
+
     <b>let</b> values = <a href="../../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector">vector</a>[];
 
     <b>if</b>(n == 0) {
@@ -865,8 +868,6 @@ If n is 0, returns the empty vector.
         tail = tail - 1;
     };
 
-    <a href="event.md#0x1_event_emit">event::emit</a>(<a href="randomness.md#0x1_randomness_RandomnessGeneratedEvent">RandomnessGeneratedEvent</a> {});
-
     values
 }
 </code></pre>
@@ -891,18 +892,38 @@ Compute <code>(a + b) % m</code>, assuming <code>m &gt;= 1, 0 &lt;= a &lt; m, 0&
 <summary>Implementation</summary>
 
 
-<pre><code>inline <b>fun</b> <a href="randomness.md#0x1_randomness_safe_add_mod">safe_add_mod</a>(a: u256, b: u256, m: u256): u256 {
+<pre><code><b>fun</b> <a href="randomness.md#0x1_randomness_safe_add_mod">safe_add_mod</a>(a: u256, b: u256, m: u256): u256 {
+    <b>let</b> a_clone = a;
     <b>let</b> neg_b = m - b;
-    <b>if</b> (a &lt; neg_b) {
-        a + b
-    } <b>else</b> {
-        a - neg_b
-    }
+    <b>let</b> a_less = a &lt; neg_b;
+    <a href="randomness.md#0x1_randomness_take_first">take_first</a>(<b>if</b> (a_less) { a + b } <b>else</b> { a_clone - neg_b }, <b>if</b> (!a_less) { a_clone - neg_b } <b>else</b> { a + b })
 }
 </code></pre>
 
 
 
+</details>
+
+<a id="0x1_randomness_take_first"></a>
+
+## Function `take_first`
+
+
+
+<pre><code><b>fun</b> <a href="randomness.md#0x1_randomness_take_first">take_first</a>(x: u256, _y: u256): u256
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="randomness.md#0x1_randomness_take_first">take_first</a>(x: u256, _y: u256 ): u256 { x }
+</code></pre>
+
+
+
 </details>
 
 <a id="0x1_randomness_safe_add_mod_for_verification"></a>
@@ -1186,7 +1207,8 @@ function as its payload.
 
 
 
-<pre><code><b>pragma</b> unroll = 32;
+<pre><code><b>pragma</b> verify_duration_estimate = 300;
+<b>pragma</b> unroll = 32;
 <b>include</b> <a href="randomness.md#0x1_randomness_NextBlobAbortsIf">NextBlobAbortsIf</a>;
 </code></pre>
 
diff --git a/aptos-move/framework/aptos-framework/doc/stake.md b/aptos-move/framework/aptos-framework/doc/stake.md
index 27b9ef365c3dc..5a199ef91f69d 100644
--- a/aptos-move/framework/aptos-framework/doc/stake.md
+++ b/aptos-move/framework/aptos-framework/doc/stake.md
@@ -4911,7 +4911,8 @@ Returns validator's next epoch voting power, including pending_active, active, a
 
 
 
-<pre><code><b>include</b> <a href="stake.md#0x1_stake_ResourceRequirement">ResourceRequirement</a>;
+<pre><code><b>pragma</b> verify_duration_estimate = 120;
+<b>include</b> <a href="stake.md#0x1_stake_ResourceRequirement">ResourceRequirement</a>;
 <b>let</b> addr = <a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer_address_of">signer::address_of</a>(owner);
 <b>ensures</b> <b>global</b>&lt;<a href="stake.md#0x1_stake_ValidatorConfig">ValidatorConfig</a>&gt;(addr) == <a href="stake.md#0x1_stake_ValidatorConfig">ValidatorConfig</a> {
     consensus_pubkey: <a href="../../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector_empty">vector::empty</a>(),
diff --git a/aptos-move/framework/aptos-framework/doc/staking_config.md b/aptos-move/framework/aptos-framework/doc/staking_config.md
index 7bc727d1b9691..244ed0c23647e 100644
--- a/aptos-move/framework/aptos-framework/doc/staking_config.md
+++ b/aptos-move/framework/aptos-framework/doc/staking_config.md
@@ -10,6 +10,7 @@ Provides the configuration for staking and rewards
 -  [Resource `StakingRewardsConfig`](#0x1_staking_config_StakingRewardsConfig)
 -  [Constants](#@Constants_0)
 -  [Function `initialize`](#0x1_staking_config_initialize)
+-  [Function `reward_rate`](#0x1_staking_config_reward_rate)
 -  [Function `initialize_rewards`](#0x1_staking_config_initialize_rewards)
 -  [Function `get`](#0x1_staking_config_get)
 -  [Function `get_allow_validator_set_change`](#0x1_staking_config_get_allow_validator_set_change)
@@ -32,6 +33,7 @@ Provides the configuration for staking and rewards
     -  [Resource `StakingConfig`](#@Specification_1_StakingConfig)
     -  [Resource `StakingRewardsConfig`](#@Specification_1_StakingRewardsConfig)
     -  [Function `initialize`](#@Specification_1_initialize)
+    -  [Function `reward_rate`](#@Specification_1_reward_rate)
     -  [Function `initialize_rewards`](#@Specification_1_initialize_rewards)
     -  [Function `get`](#@Specification_1_get)
     -  [Function `get_reward_rate`](#@Specification_1_get_reward_rate)
@@ -389,6 +391,32 @@ Only called during genesis.
 
 
 
+</details>
+
+<a id="0x1_staking_config_reward_rate"></a>
+
+## Function `reward_rate`
+
+Return the reward rate of this epoch as a tuple (numerator, denominator).
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="staking_config.md#0x1_staking_config_reward_rate">reward_rate</a>(): (u64, u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="staking_config.md#0x1_staking_config_reward_rate">reward_rate</a>(): (u64, u64) <b>acquires</b> <a href="staking_config.md#0x1_staking_config_StakingRewardsConfig">StakingRewardsConfig</a>, <a href="staking_config.md#0x1_staking_config_StakingConfig">StakingConfig</a> {
+    <a href="staking_config.md#0x1_staking_config_get_reward_rate">get_reward_rate</a>(<b>borrow_global</b>&lt;<a href="staking_config.md#0x1_staking_config_StakingConfig">StakingConfig</a>&gt;(@aptos_framework))
+}
+</code></pre>
+
+
+
 </details>
 
 <a id="0x1_staking_config_initialize_rewards"></a>
@@ -1211,6 +1239,28 @@ StakingConfig does not exist under the aptos_framework before creating it.
 
 
 
+<a id="@Specification_1_reward_rate"></a>
+
+### Function `reward_rate`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="staking_config.md#0x1_staking_config_reward_rate">reward_rate</a>(): (u64, u64)
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> config = <b>global</b>&lt;<a href="staking_config.md#0x1_staking_config_StakingConfig">StakingConfig</a>&gt;(@aptos_framework);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="staking_config.md#0x1_staking_config_StakingConfig">StakingConfig</a>&gt;(@aptos_framework);
+<b>include</b> <a href="staking_config.md#0x1_staking_config_StakingRewardsConfigRequirement">StakingRewardsConfigRequirement</a>;
+<b>ensures</b> (<a href="../../aptos-stdlib/../move-stdlib/doc/features.md#0x1_features_spec_periodical_reward_rate_decrease_enabled">features::spec_periodical_reward_rate_decrease_enabled</a>() &&
+    (<b>global</b>&lt;<a href="staking_config.md#0x1_staking_config_StakingRewardsConfig">StakingRewardsConfig</a>&gt;(@aptos_framework).rewards_rate.value <b>as</b> u64) != 0) ==&gt;
+    result_1 &lt;= <a href="staking_config.md#0x1_staking_config_MAX_REWARDS_RATE">MAX_REWARDS_RATE</a> && result_2 &lt;= <a href="staking_config.md#0x1_staking_config_MAX_U64">MAX_U64</a>;
+</code></pre>
+
+
+
 <a id="@Specification_1_initialize_rewards"></a>
 
 ### Function `initialize_rewards`
diff --git a/aptos-move/framework/aptos-framework/doc/staking_contract.md b/aptos-move/framework/aptos-framework/doc/staking_contract.md
index 0a97d91ee44e5..c2d9178ff06fc 100644
--- a/aptos-move/framework/aptos-framework/doc/staking_contract.md
+++ b/aptos-move/framework/aptos-framework/doc/staking_contract.md
@@ -3293,7 +3293,8 @@ Staking_contract exists the stacker/operator pair.
 The StakePool exists under the pool_address of StakingContract.
 
 
-<pre><code><b>include</b> <a href="staking_contract.md#0x1_staking_contract_GetStakingContractAmountsAbortsIf">GetStakingContractAmountsAbortsIf</a>;
+<pre><code><b>pragma</b> verify_duration_estimate = 120;
+<b>include</b> <a href="staking_contract.md#0x1_staking_contract_GetStakingContractAmountsAbortsIf">GetStakingContractAmountsAbortsIf</a>;
 <b>let</b> pool_address = <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.pool_address;
 <b>let</b> stake_pool = <b>global</b>&lt;<a href="stake.md#0x1_stake_StakePool">stake::StakePool</a>&gt;(pool_address);
 <b>let</b> active = <a href="coin.md#0x1_coin_value">coin::value</a>(stake_pool.active);
diff --git a/aptos-move/framework/aptos-framework/doc/transaction_fee.md b/aptos-move/framework/aptos-framework/doc/transaction_fee.md
index 11a3e38a95c57..09e76f34e14db 100644
--- a/aptos-move/framework/aptos-framework/doc/transaction_fee.md
+++ b/aptos-move/framework/aptos-framework/doc/transaction_fee.md
@@ -7,6 +7,7 @@ This module provides an interface to burn or collect and redistribute transactio
 
 
 -  [Resource `AptosCoinCapabilities`](#0x1_transaction_fee_AptosCoinCapabilities)
+-  [Resource `AptosFABurnCapabilities`](#0x1_transaction_fee_AptosFABurnCapabilities)
 -  [Resource `AptosCoinMintCapability`](#0x1_transaction_fee_AptosCoinMintCapability)
 -  [Resource `CollectedFeesPerBlock`](#0x1_transaction_fee_CollectedFeesPerBlock)
 -  [Struct `FeeStatement`](#0x1_transaction_fee_FeeStatement)
@@ -21,6 +22,7 @@ This module provides an interface to burn or collect and redistribute transactio
 -  [Function `mint_and_refund`](#0x1_transaction_fee_mint_and_refund)
 -  [Function `collect_fee`](#0x1_transaction_fee_collect_fee)
 -  [Function `store_aptos_coin_burn_cap`](#0x1_transaction_fee_store_aptos_coin_burn_cap)
+-  [Function `convert_to_aptos_fa_burn_ref`](#0x1_transaction_fee_convert_to_aptos_fa_burn_ref)
 -  [Function `store_aptos_coin_mint_cap`](#0x1_transaction_fee_store_aptos_coin_mint_cap)
 -  [Function `initialize_storage_refund`](#0x1_transaction_fee_initialize_storage_refund)
 -  [Function `emit_fee_statement`](#0x1_transaction_fee_emit_fee_statement)
@@ -42,11 +44,15 @@ This module provides an interface to burn or collect and redistribute transactio
     -  [Function `emit_fee_statement`](#@Specification_1_emit_fee_statement)
 
 
-<pre><code><b>use</b> <a href="aptos_coin.md#0x1_aptos_coin">0x1::aptos_coin</a>;
+<pre><code><b>use</b> <a href="aptos_account.md#0x1_aptos_account">0x1::aptos_account</a>;
+<b>use</b> <a href="aptos_coin.md#0x1_aptos_coin">0x1::aptos_coin</a>;
 <b>use</b> <a href="coin.md#0x1_coin">0x1::coin</a>;
 <b>use</b> <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error">0x1::error</a>;
 <b>use</b> <a href="event.md#0x1_event">0x1::event</a>;
+<b>use</b> <a href="../../aptos-stdlib/../move-stdlib/doc/features.md#0x1_features">0x1::features</a>;
+<b>use</b> <a href="fungible_asset.md#0x1_fungible_asset">0x1::fungible_asset</a>;
 <b>use</b> <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option">0x1::option</a>;
+<b>use</b> <a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer">0x1::signer</a>;
 <b>use</b> <a href="stake.md#0x1_stake">0x1::stake</a>;
 <b>use</b> <a href="system_addresses.md#0x1_system_addresses">0x1::system_addresses</a>;
 </code></pre>
@@ -79,6 +85,34 @@ Stores burn capability to burn the gas fees.
 </dl>
 
 
+</details>
+
+<a id="0x1_transaction_fee_AptosFABurnCapabilities"></a>
+
+## Resource `AptosFABurnCapabilities`
+
+Stores burn capability to burn the gas fees.
+
+
+<pre><code><b>struct</b> <a href="transaction_fee.md#0x1_transaction_fee_AptosFABurnCapabilities">AptosFABurnCapabilities</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>burn_ref: <a href="fungible_asset.md#0x1_fungible_asset_BurnRef">fungible_asset::BurnRef</a></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
 </details>
 
 <a id="0x1_transaction_fee_AptosCoinMintCapability"></a>
@@ -237,6 +271,15 @@ information about collected amounts is already published.
 
 
 
+<a id="0x1_transaction_fee_EFA_GAS_CHARGING_NOT_ENABLED"></a>
+
+
+
+<pre><code><b>const</b> <a href="transaction_fee.md#0x1_transaction_fee_EFA_GAS_CHARGING_NOT_ENABLED">EFA_GAS_CHARGING_NOT_ENABLED</a>: u64 = 5;
+</code></pre>
+
+
+
 <a id="0x1_transaction_fee_EINVALID_BURN_PERCENTAGE"></a>
 
 The burn percentage is out of range [0, 100].
@@ -515,12 +558,24 @@ Burn transaction fees in epilogue.
 <summary>Implementation</summary>
 
 
-<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="transaction_fee.md#0x1_transaction_fee_burn_fee">burn_fee</a>(<a href="account.md#0x1_account">account</a>: <b>address</b>, fee: u64) <b>acquires</b> <a href="transaction_fee.md#0x1_transaction_fee_AptosCoinCapabilities">AptosCoinCapabilities</a> {
-    <a href="coin.md#0x1_coin_burn_from">coin::burn_from</a>&lt;AptosCoin&gt;(
-        <a href="account.md#0x1_account">account</a>,
-        fee,
-        &<b>borrow_global</b>&lt;<a href="transaction_fee.md#0x1_transaction_fee_AptosCoinCapabilities">AptosCoinCapabilities</a>&gt;(@aptos_framework).burn_cap,
-    );
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="transaction_fee.md#0x1_transaction_fee_burn_fee">burn_fee</a>(<a href="account.md#0x1_account">account</a>: <b>address</b>, fee: u64) <b>acquires</b> <a href="transaction_fee.md#0x1_transaction_fee_AptosFABurnCapabilities">AptosFABurnCapabilities</a>, <a href="transaction_fee.md#0x1_transaction_fee_AptosCoinCapabilities">AptosCoinCapabilities</a> {
+    <b>if</b> (<b>exists</b>&lt;<a href="transaction_fee.md#0x1_transaction_fee_AptosFABurnCapabilities">AptosFABurnCapabilities</a>&gt;(@aptos_framework)) {
+        <b>let</b> burn_ref = &<b>borrow_global</b>&lt;<a href="transaction_fee.md#0x1_transaction_fee_AptosFABurnCapabilities">AptosFABurnCapabilities</a>&gt;(@aptos_framework).burn_ref;
+        <a href="aptos_account.md#0x1_aptos_account_burn_from_fungible_store">aptos_account::burn_from_fungible_store</a>(burn_ref, <a href="account.md#0x1_account">account</a>, fee);
+    } <b>else</b> {
+        <b>let</b> burn_cap = &<b>borrow_global</b>&lt;<a href="transaction_fee.md#0x1_transaction_fee_AptosCoinCapabilities">AptosCoinCapabilities</a>&gt;(@aptos_framework).burn_cap;
+        <b>if</b> (<a href="../../aptos-stdlib/../move-stdlib/doc/features.md#0x1_features_operations_default_to_fa_apt_store_enabled">features::operations_default_to_fa_apt_store_enabled</a>()) {
+            <b>let</b> (burn_ref, burn_receipt) = <a href="coin.md#0x1_coin_get_paired_burn_ref">coin::get_paired_burn_ref</a>(burn_cap);
+            <a href="aptos_account.md#0x1_aptos_account_burn_from_fungible_store">aptos_account::burn_from_fungible_store</a>(&burn_ref, <a href="account.md#0x1_account">account</a>, fee);
+            <a href="coin.md#0x1_coin_return_paired_burn_ref">coin::return_paired_burn_ref</a>(burn_ref, burn_receipt);
+        } <b>else</b> {
+            <a href="coin.md#0x1_coin_burn_from">coin::burn_from</a>&lt;AptosCoin&gt;(
+                <a href="account.md#0x1_account">account</a>,
+                fee,
+                burn_cap,
+            );
+        };
+    };
 }
 </code></pre>
 
@@ -604,7 +659,43 @@ Only called during genesis.
 
 <pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="transaction_fee.md#0x1_transaction_fee_store_aptos_coin_burn_cap">store_aptos_coin_burn_cap</a>(aptos_framework: &<a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer">signer</a>, burn_cap: BurnCapability&lt;AptosCoin&gt;) {
     <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(aptos_framework);
-    <b>move_to</b>(aptos_framework, <a href="transaction_fee.md#0x1_transaction_fee_AptosCoinCapabilities">AptosCoinCapabilities</a> { burn_cap })
+
+    <b>if</b> (<a href="../../aptos-stdlib/../move-stdlib/doc/features.md#0x1_features_operations_default_to_fa_apt_store_enabled">features::operations_default_to_fa_apt_store_enabled</a>()) {
+        <b>let</b> burn_ref = <a href="coin.md#0x1_coin_convert_and_take_paired_burn_ref">coin::convert_and_take_paired_burn_ref</a>(burn_cap);
+        <b>move_to</b>(aptos_framework, <a href="transaction_fee.md#0x1_transaction_fee_AptosFABurnCapabilities">AptosFABurnCapabilities</a> { burn_ref });
+    } <b>else</b> {
+        <b>move_to</b>(aptos_framework, <a href="transaction_fee.md#0x1_transaction_fee_AptosCoinCapabilities">AptosCoinCapabilities</a> { burn_cap })
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_transaction_fee_convert_to_aptos_fa_burn_ref"></a>
+
+## Function `convert_to_aptos_fa_burn_ref`
+
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="transaction_fee.md#0x1_transaction_fee_convert_to_aptos_fa_burn_ref">convert_to_aptos_fa_burn_ref</a>(aptos_framework: &<a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="transaction_fee.md#0x1_transaction_fee_convert_to_aptos_fa_burn_ref">convert_to_aptos_fa_burn_ref</a>(aptos_framework: &<a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer">signer</a>) <b>acquires</b> <a href="transaction_fee.md#0x1_transaction_fee_AptosCoinCapabilities">AptosCoinCapabilities</a> {
+    <b>assert</b>!(<a href="../../aptos-stdlib/../move-stdlib/doc/features.md#0x1_features_operations_default_to_fa_apt_store_enabled">features::operations_default_to_fa_apt_store_enabled</a>(), <a href="transaction_fee.md#0x1_transaction_fee_EFA_GAS_CHARGING_NOT_ENABLED">EFA_GAS_CHARGING_NOT_ENABLED</a>);
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(aptos_framework);
+    <b>let</b> <a href="transaction_fee.md#0x1_transaction_fee_AptosCoinCapabilities">AptosCoinCapabilities</a> {
+        burn_cap,
+    } = <b>move_from</b>&lt;<a href="transaction_fee.md#0x1_transaction_fee_AptosCoinCapabilities">AptosCoinCapabilities</a>&gt;(<a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer_address_of">signer::address_of</a>(aptos_framework));
+    <b>let</b> burn_ref = <a href="coin.md#0x1_coin_convert_and_take_paired_burn_ref">coin::convert_and_take_paired_burn_ref</a>(burn_cap);
+    <b>move_to</b>(aptos_framework, <a href="transaction_fee.md#0x1_transaction_fee_AptosFABurnCapabilities">AptosFABurnCapabilities</a> { burn_ref });
 }
 </code></pre>
 
@@ -761,10 +852,10 @@ Only called during genesis.
 ### Module-level Specification
 
 
-<pre><code><b>pragma</b> verify = <b>true</b>;
+<pre><code><b>pragma</b> verify = <b>false</b>;
 <b>pragma</b> aborts_if_is_strict;
 // This enforces <a id="high-level-req-1" href="#high-level-req">high-level requirement 1</a>:
-<b>invariant</b> [suspendable] <a href="chain_status.md#0x1_chain_status_is_operating">chain_status::is_operating</a>() ==&gt; <b>exists</b>&lt;<a href="transaction_fee.md#0x1_transaction_fee_AptosCoinCapabilities">AptosCoinCapabilities</a>&gt;(@aptos_framework);
+<b>invariant</b> [suspendable] <a href="chain_status.md#0x1_chain_status_is_operating">chain_status::is_operating</a>() ==&gt; <b>exists</b>&lt;<a href="transaction_fee.md#0x1_transaction_fee_AptosCoinCapabilities">AptosCoinCapabilities</a>&gt;(@aptos_framework) || <b>exists</b>&lt;<a href="transaction_fee.md#0x1_transaction_fee_AptosFABurnCapabilities">AptosFABurnCapabilities</a>&gt;(@aptos_framework);
 </code></pre>
 
 
@@ -1090,10 +1181,12 @@ Ensure caller is admin.
 Aborts if <code><a href="transaction_fee.md#0x1_transaction_fee_AptosCoinCapabilities">AptosCoinCapabilities</a></code> already exists.
 
 
-<pre><code><b>let</b> addr = <a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer_address_of">signer::address_of</a>(aptos_framework);
+<pre><code><b>pragma</b> verify = <b>false</b>;
+<b>let</b> addr = <a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer_address_of">signer::address_of</a>(aptos_framework);
 <b>aborts_if</b> !<a href="system_addresses.md#0x1_system_addresses_is_aptos_framework_address">system_addresses::is_aptos_framework_address</a>(addr);
+<b>aborts_if</b> <b>exists</b>&lt;<a href="transaction_fee.md#0x1_transaction_fee_AptosFABurnCapabilities">AptosFABurnCapabilities</a>&gt;(addr);
 <b>aborts_if</b> <b>exists</b>&lt;<a href="transaction_fee.md#0x1_transaction_fee_AptosCoinCapabilities">AptosCoinCapabilities</a>&gt;(addr);
-<b>ensures</b> <b>exists</b>&lt;<a href="transaction_fee.md#0x1_transaction_fee_AptosCoinCapabilities">AptosCoinCapabilities</a>&gt;(addr);
+<b>ensures</b> <b>exists</b>&lt;<a href="transaction_fee.md#0x1_transaction_fee_AptosFABurnCapabilities">AptosFABurnCapabilities</a>&gt;(addr) || <b>exists</b>&lt;<a href="transaction_fee.md#0x1_transaction_fee_AptosCoinCapabilities">AptosCoinCapabilities</a>&gt;(addr);
 </code></pre>
 
 
diff --git a/aptos-move/framework/aptos-framework/doc/transaction_validation.md b/aptos-move/framework/aptos-framework/doc/transaction_validation.md
index 2d8db158686fc..8f1a41d972c96 100644
--- a/aptos-move/framework/aptos-framework/doc/transaction_validation.md
+++ b/aptos-move/framework/aptos-framework/doc/transaction_validation.md
@@ -8,46 +8,34 @@
 -  [Resource `TransactionValidation`](#0x1_transaction_validation_TransactionValidation)
 -  [Constants](#@Constants_0)
 -  [Function `initialize`](#0x1_transaction_validation_initialize)
--  [Function `collect_deposit`](#0x1_transaction_validation_collect_deposit)
--  [Function `return_deposit`](#0x1_transaction_validation_return_deposit)
 -  [Function `prologue_common`](#0x1_transaction_validation_prologue_common)
 -  [Function `script_prologue`](#0x1_transaction_validation_script_prologue)
--  [Function `script_prologue_collect_deposit`](#0x1_transaction_validation_script_prologue_collect_deposit)
 -  [Function `multi_agent_script_prologue`](#0x1_transaction_validation_multi_agent_script_prologue)
 -  [Function `multi_agent_common_prologue`](#0x1_transaction_validation_multi_agent_common_prologue)
 -  [Function `fee_payer_script_prologue`](#0x1_transaction_validation_fee_payer_script_prologue)
--  [Function `fee_payer_script_prologue_collect_deposit`](#0x1_transaction_validation_fee_payer_script_prologue_collect_deposit)
 -  [Function `epilogue`](#0x1_transaction_validation_epilogue)
--  [Function `epilogue_return_deposit`](#0x1_transaction_validation_epilogue_return_deposit)
 -  [Function `epilogue_gas_payer`](#0x1_transaction_validation_epilogue_gas_payer)
--  [Function `epilogue_gas_payer_return_deposit`](#0x1_transaction_validation_epilogue_gas_payer_return_deposit)
 -  [Specification](#@Specification_1)
     -  [High-level Requirements](#high-level-req)
     -  [Module-level Specification](#module-level-spec)
     -  [Function `initialize`](#@Specification_1_initialize)
-    -  [Function `collect_deposit`](#@Specification_1_collect_deposit)
-    -  [Function `return_deposit`](#@Specification_1_return_deposit)
     -  [Function `prologue_common`](#@Specification_1_prologue_common)
     -  [Function `script_prologue`](#@Specification_1_script_prologue)
-    -  [Function `script_prologue_collect_deposit`](#@Specification_1_script_prologue_collect_deposit)
     -  [Function `multi_agent_script_prologue`](#@Specification_1_multi_agent_script_prologue)
     -  [Function `multi_agent_common_prologue`](#@Specification_1_multi_agent_common_prologue)
     -  [Function `fee_payer_script_prologue`](#@Specification_1_fee_payer_script_prologue)
-    -  [Function `fee_payer_script_prologue_collect_deposit`](#@Specification_1_fee_payer_script_prologue_collect_deposit)
     -  [Function `epilogue`](#@Specification_1_epilogue)
-    -  [Function `epilogue_return_deposit`](#@Specification_1_epilogue_return_deposit)
     -  [Function `epilogue_gas_payer`](#@Specification_1_epilogue_gas_payer)
-    -  [Function `epilogue_gas_payer_return_deposit`](#@Specification_1_epilogue_gas_payer_return_deposit)
 
 
 <pre><code><b>use</b> <a href="account.md#0x1_account">0x1::account</a>;
+<b>use</b> <a href="aptos_account.md#0x1_aptos_account">0x1::aptos_account</a>;
 <b>use</b> <a href="aptos_coin.md#0x1_aptos_coin">0x1::aptos_coin</a>;
 <b>use</b> <a href="../../aptos-stdlib/../move-stdlib/doc/bcs.md#0x1_bcs">0x1::bcs</a>;
 <b>use</b> <a href="chain_id.md#0x1_chain_id">0x1::chain_id</a>;
 <b>use</b> <a href="coin.md#0x1_coin">0x1::coin</a>;
 <b>use</b> <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error">0x1::error</a>;
 <b>use</b> <a href="../../aptos-stdlib/../move-stdlib/doc/features.md#0x1_features">0x1::features</a>;
-<b>use</b> <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option">0x1::option</a>;
 <b>use</b> <a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer">0x1::signer</a>;
 <b>use</b> <a href="system_addresses.md#0x1_system_addresses">0x1::system_addresses</a>;
 <b>use</b> <a href="timestamp.md#0x1_timestamp">0x1::timestamp</a>;
@@ -176,15 +164,6 @@ Transaction exceeded its allocated max gas
 
 
 
-<a id="0x1_transaction_validation_PROLOGUE_EINSUFFICIENT_BALANCE_FOR_REQUIRED_DEPOSIT"></a>
-
-
-
-<pre><code><b>const</b> <a href="transaction_validation.md#0x1_transaction_validation_PROLOGUE_EINSUFFICIENT_BALANCE_FOR_REQUIRED_DEPOSIT">PROLOGUE_EINSUFFICIENT_BALANCE_FOR_REQUIRED_DEPOSIT</a>: u64 = 1011;
-</code></pre>
-
-
-
 <a id="0x1_transaction_validation_PROLOGUE_EINVALID_ACCOUNT_AUTH_KEY"></a>
 
 Prologue errors. These are separated out from the other errors in this
@@ -282,65 +261,6 @@ Only called during genesis to initialize system resources for this module.
 
 
 
-</details>
-
-<a id="0x1_transaction_validation_collect_deposit"></a>
-
-## Function `collect_deposit`
-
-Called in prologue to optionally hold some amount for special txns (e.g. randomness txns).
-<code><a href="transaction_validation.md#0x1_transaction_validation_return_deposit">return_deposit</a>()</code> should be invoked in the corresponding epilogue with the same arguments.
-
-
-<pre><code><b>fun</b> <a href="transaction_validation.md#0x1_transaction_validation_collect_deposit">collect_deposit</a>(gas_payer: <b>address</b>, amount: <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_Option">option::Option</a>&lt;u64&gt;)
-</code></pre>
-
-
-
-<details>
-<summary>Implementation</summary>
-
-
-<pre><code><b>fun</b> <a href="transaction_validation.md#0x1_transaction_validation_collect_deposit">collect_deposit</a>(gas_payer: <b>address</b>, amount: Option&lt;u64&gt;) {
-    <b>if</b> (<a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_is_some">option::is_some</a>(&amount)) {
-        <b>let</b> amount = <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_extract">option::extract</a>(&<b>mut</b> amount);
-        <b>let</b> balance = <a href="coin.md#0x1_coin_balance">coin::balance</a>&lt;AptosCoin&gt;(gas_payer);
-        <b>assert</b>!(balance &gt;= amount, <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="transaction_validation.md#0x1_transaction_validation_PROLOGUE_EINSUFFICIENT_BALANCE_FOR_REQUIRED_DEPOSIT">PROLOGUE_EINSUFFICIENT_BALANCE_FOR_REQUIRED_DEPOSIT</a>));
-        <a href="transaction_fee.md#0x1_transaction_fee_burn_fee">transaction_fee::burn_fee</a>(gas_payer, amount);
-    }
-}
-</code></pre>
-
-
-
-</details>
-
-<a id="0x1_transaction_validation_return_deposit"></a>
-
-## Function `return_deposit`
-
-Called in epilogue to optionally released the amount held in prologue for special txns (e.g. randomness txns).
-
-
-<pre><code><b>fun</b> <a href="transaction_validation.md#0x1_transaction_validation_return_deposit">return_deposit</a>(gas_payer: <b>address</b>, amount: <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_Option">option::Option</a>&lt;u64&gt;)
-</code></pre>
-
-
-
-<details>
-<summary>Implementation</summary>
-
-
-<pre><code><b>fun</b> <a href="transaction_validation.md#0x1_transaction_validation_return_deposit">return_deposit</a>(gas_payer: <b>address</b>, amount: Option&lt;u64&gt;) {
-    <b>if</b> (<a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_is_some">option::is_some</a>(&amount)) {
-        <b>let</b> amount = <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_extract">option::extract</a>(&<b>mut</b> amount);
-        <a href="transaction_fee.md#0x1_transaction_fee_mint_and_refund">transaction_fee::mint_and_refund</a>(gas_payer, amount);
-    }
-}
-</code></pre>
-
-
-
 </details>
 
 <a id="0x1_transaction_validation_prologue_common"></a>
@@ -378,9 +298,9 @@ Called in epilogue to optionally released the amount held in prologue for specia
 
     <b>if</b> (
         transaction_sender == gas_payer
-        || <a href="account.md#0x1_account_exists_at">account::exists_at</a>(transaction_sender)
-        || !<a href="../../aptos-stdlib/../move-stdlib/doc/features.md#0x1_features_sponsored_automatic_account_creation_enabled">features::sponsored_automatic_account_creation_enabled</a>()
-        || txn_sequence_number &gt; 0
+            || <a href="account.md#0x1_account_exists_at">account::exists_at</a>(transaction_sender)
+            || !<a href="../../aptos-stdlib/../move-stdlib/doc/features.md#0x1_features_sponsored_automatic_account_creation_enabled">features::sponsored_automatic_account_creation_enabled</a>()
+            || txn_sequence_number &gt; 0
     ) {
         <b>assert</b>!(<a href="account.md#0x1_account_exists_at">account::exists_at</a>(transaction_sender), <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="transaction_validation.md#0x1_transaction_validation_PROLOGUE_EACCOUNT_DOES_NOT_EXIST">PROLOGUE_EACCOUNT_DOES_NOT_EXIST</a>));
         <b>assert</b>!(
@@ -418,14 +338,18 @@ Called in epilogue to optionally released the amount held in prologue for specia
     };
 
     <b>let</b> max_transaction_fee = txn_gas_price * txn_max_gas_units;
-    <b>assert</b>!(
-        <a href="coin.md#0x1_coin_is_account_registered">coin::is_account_registered</a>&lt;AptosCoin&gt;(gas_payer),
-        <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="transaction_validation.md#0x1_transaction_validation_PROLOGUE_ECANT_PAY_GAS_DEPOSIT">PROLOGUE_ECANT_PAY_GAS_DEPOSIT</a>),
-    );
-    <b>assert</b>!(
-        <a href="coin.md#0x1_coin_is_balance_at_least">coin::is_balance_at_least</a>&lt;AptosCoin&gt;(gas_payer, max_transaction_fee),
-        <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="transaction_validation.md#0x1_transaction_validation_PROLOGUE_ECANT_PAY_GAS_DEPOSIT">PROLOGUE_ECANT_PAY_GAS_DEPOSIT</a>)
-    );
+
+    <b>if</b> (<a href="../../aptos-stdlib/../move-stdlib/doc/features.md#0x1_features_operations_default_to_fa_apt_store_enabled">features::operations_default_to_fa_apt_store_enabled</a>()) {
+        <b>assert</b>!(
+            <a href="aptos_account.md#0x1_aptos_account_is_fungible_balance_at_least">aptos_account::is_fungible_balance_at_least</a>(gas_payer, max_transaction_fee),
+            <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="transaction_validation.md#0x1_transaction_validation_PROLOGUE_ECANT_PAY_GAS_DEPOSIT">PROLOGUE_ECANT_PAY_GAS_DEPOSIT</a>)
+        );
+    } <b>else</b> {
+        <b>assert</b>!(
+            <a href="coin.md#0x1_coin_is_balance_at_least">coin::is_balance_at_least</a>&lt;AptosCoin&gt;(gas_payer, max_transaction_fee),
+            <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="transaction_validation.md#0x1_transaction_validation_PROLOGUE_ECANT_PAY_GAS_DEPOSIT">PROLOGUE_ECANT_PAY_GAS_DEPOSIT</a>)
+        );
+    }
 }
 </code></pre>
 
@@ -459,46 +383,16 @@ Called in epilogue to optionally released the amount held in prologue for specia
     _script_hash: <a href="../../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
 ) {
     <b>let</b> gas_payer = <a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer_address_of">signer::address_of</a>(&sender);
-    <a href="transaction_validation.md#0x1_transaction_validation_prologue_common">prologue_common</a>(sender, gas_payer, txn_sequence_number, txn_public_key, txn_gas_price, txn_max_gas_units, txn_expiration_time, <a href="chain_id.md#0x1_chain_id">chain_id</a>)
-}
-</code></pre>
-
-
-
-</details>
-
-<a id="0x1_transaction_validation_script_prologue_collect_deposit"></a>
-
-## Function `script_prologue_collect_deposit`
-
-<code><a href="transaction_validation.md#0x1_transaction_validation_script_prologue">script_prologue</a>()</code> then collect an optional deposit depending on the txn.
-
-Deposit collection goes last so <code><a href="transaction_validation.md#0x1_transaction_validation_script_prologue">script_prologue</a>()</code> doesn't have to be aware of the deposit logic.
-
-
-<pre><code><b>fun</b> <a href="transaction_validation.md#0x1_transaction_validation_script_prologue_collect_deposit">script_prologue_collect_deposit</a>(sender: <a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer">signer</a>, txn_sequence_number: u64, txn_public_key: <a href="../../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, txn_gas_price: u64, txn_max_gas_units: u64, txn_expiration_time: u64, <a href="chain_id.md#0x1_chain_id">chain_id</a>: u8, script_hash: <a href="../../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, required_deposit: <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_Option">option::Option</a>&lt;u64&gt;)
-</code></pre>
-
-
-
-<details>
-<summary>Implementation</summary>
-
-
-<pre><code><b>fun</b> <a href="transaction_validation.md#0x1_transaction_validation_script_prologue_collect_deposit">script_prologue_collect_deposit</a>(
-    sender: <a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer">signer</a>,
-    txn_sequence_number: u64,
-    txn_public_key: <a href="../../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
-    txn_gas_price: u64,
-    txn_max_gas_units: u64,
-    txn_expiration_time: u64,
-    <a href="chain_id.md#0x1_chain_id">chain_id</a>: u8,
-    script_hash: <a href="../../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
-    required_deposit: Option&lt;u64&gt;,
-) {
-    <b>let</b> gas_payer = <a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer_address_of">signer::address_of</a>(&sender);
-    <a href="transaction_validation.md#0x1_transaction_validation_script_prologue">script_prologue</a>(sender, txn_sequence_number, txn_public_key, txn_gas_price, txn_max_gas_units, txn_expiration_time, <a href="chain_id.md#0x1_chain_id">chain_id</a>, script_hash);
-    <a href="transaction_validation.md#0x1_transaction_validation_collect_deposit">collect_deposit</a>(gas_payer, required_deposit);
+    <a href="transaction_validation.md#0x1_transaction_validation_prologue_common">prologue_common</a>(
+        sender,
+        gas_payer,
+        txn_sequence_number,
+        txn_public_key,
+        txn_gas_price,
+        txn_max_gas_units,
+        txn_expiration_time,
+        <a href="chain_id.md#0x1_chain_id">chain_id</a>
+    )
 }
 </code></pre>
 
@@ -582,8 +476,8 @@ Deposit collection goes last so <code><a href="transaction_validation.md#0x1_tra
             <b>invariant</b> i &lt;= num_secondary_signers;
             <b>invariant</b> <b>forall</b> j in 0..i:
                 <a href="account.md#0x1_account_exists_at">account::exists_at</a>(secondary_signer_addresses[j])
-                && secondary_signer_public_key_hashes[j]
-                   == <a href="account.md#0x1_account_get_authentication_key">account::get_authentication_key</a>(secondary_signer_addresses[j]);
+                    && secondary_signer_public_key_hashes[j]
+                    == <a href="account.md#0x1_account_get_authentication_key">account::get_authentication_key</a>(secondary_signer_addresses[j]);
         };
         (i &lt; num_secondary_signers)
     }) {
@@ -653,59 +547,6 @@ Deposit collection goes last so <code><a href="transaction_validation.md#0x1_tra
 
 
 
-</details>
-
-<a id="0x1_transaction_validation_fee_payer_script_prologue_collect_deposit"></a>
-
-## Function `fee_payer_script_prologue_collect_deposit`
-
-<code><a href="transaction_validation.md#0x1_transaction_validation_fee_payer_script_prologue">fee_payer_script_prologue</a>()</code> then collect an optional deposit depending on the txn.
-
-Deposit collection goes last so <code><a href="transaction_validation.md#0x1_transaction_validation_fee_payer_script_prologue">fee_payer_script_prologue</a>()</code> doesn't have to be aware of the deposit logic.
-
-
-<pre><code><b>fun</b> <a href="transaction_validation.md#0x1_transaction_validation_fee_payer_script_prologue_collect_deposit">fee_payer_script_prologue_collect_deposit</a>(sender: <a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer">signer</a>, txn_sequence_number: u64, txn_sender_public_key: <a href="../../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, secondary_signer_addresses: <a href="../../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;, secondary_signer_public_key_hashes: <a href="../../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;, fee_payer_address: <b>address</b>, fee_payer_public_key_hash: <a href="../../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, txn_gas_price: u64, txn_max_gas_units: u64, txn_expiration_time: u64, <a href="chain_id.md#0x1_chain_id">chain_id</a>: u8, required_deposit: <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_Option">option::Option</a>&lt;u64&gt;)
-</code></pre>
-
-
-
-<details>
-<summary>Implementation</summary>
-
-
-<pre><code><b>fun</b> <a href="transaction_validation.md#0x1_transaction_validation_fee_payer_script_prologue_collect_deposit">fee_payer_script_prologue_collect_deposit</a>(
-    sender: <a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer">signer</a>,
-    txn_sequence_number: u64,
-    txn_sender_public_key: <a href="../../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
-    secondary_signer_addresses: <a href="../../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;,
-    secondary_signer_public_key_hashes: <a href="../../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;,
-    fee_payer_address: <b>address</b>,
-    fee_payer_public_key_hash: <a href="../../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
-    txn_gas_price: u64,
-    txn_max_gas_units: u64,
-    txn_expiration_time: u64,
-    <a href="chain_id.md#0x1_chain_id">chain_id</a>: u8,
-    required_deposit: Option&lt;u64&gt;,
-) {
-    <a href="transaction_validation.md#0x1_transaction_validation_fee_payer_script_prologue">fee_payer_script_prologue</a>(
-        sender,
-        txn_sequence_number,
-        txn_sender_public_key,
-        secondary_signer_addresses,
-        secondary_signer_public_key_hashes,
-        fee_payer_address,
-        fee_payer_public_key_hash,
-        txn_gas_price,
-        txn_max_gas_units,
-        txn_expiration_time,
-        <a href="chain_id.md#0x1_chain_id">chain_id</a>,
-    );
-    <a href="transaction_validation.md#0x1_transaction_validation_collect_deposit">collect_deposit</a>(fee_payer_address, required_deposit);
-}
-</code></pre>
-
-
-
 </details>
 
 <a id="0x1_transaction_validation_epilogue"></a>
@@ -739,48 +580,6 @@ Called by the Adapter
 
 
 
-</details>
-
-<a id="0x1_transaction_validation_epilogue_return_deposit"></a>
-
-## Function `epilogue_return_deposit`
-
-Return the deposit held in prologue, then <code><a href="transaction_validation.md#0x1_transaction_validation_epilogue">epilogue</a>()</code>.
-
-Deposit return goes first so <code><a href="transaction_validation.md#0x1_transaction_validation_epilogue">epilogue</a>()</code> doesn't have to be aware of this change.
-
-
-<pre><code><b>fun</b> <a href="transaction_validation.md#0x1_transaction_validation_epilogue_return_deposit">epilogue_return_deposit</a>(<a href="account.md#0x1_account">account</a>: <a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer">signer</a>, storage_fee_refunded: u64, txn_gas_price: u64, txn_max_gas_units: u64, gas_units_remaining: u64, required_deposit: <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_Option">option::Option</a>&lt;u64&gt;)
-</code></pre>
-
-
-
-<details>
-<summary>Implementation</summary>
-
-
-<pre><code><b>fun</b> <a href="transaction_validation.md#0x1_transaction_validation_epilogue_return_deposit">epilogue_return_deposit</a>(
-    <a href="account.md#0x1_account">account</a>: <a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer">signer</a>,
-    storage_fee_refunded: u64,
-    txn_gas_price: u64,
-    txn_max_gas_units: u64,
-    gas_units_remaining: u64,
-    required_deposit: Option&lt;u64&gt;,
-) {
-    <b>let</b> gas_payer = <a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer_address_of">signer::address_of</a>(&<a href="account.md#0x1_account">account</a>);
-    <a href="transaction_validation.md#0x1_transaction_validation_return_deposit">return_deposit</a>(gas_payer, required_deposit);
-    <a href="transaction_validation.md#0x1_transaction_validation_epilogue">epilogue</a>(
-        <a href="account.md#0x1_account">account</a>,
-        storage_fee_refunded,
-        txn_gas_price,
-        txn_max_gas_units,
-        gas_units_remaining,
-    );
-}
-</code></pre>
-
-
-
 </details>
 
 <a id="0x1_transaction_validation_epilogue_gas_payer"></a>
@@ -816,12 +615,20 @@ Called by the Adapter
         <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_out_of_range">error::out_of_range</a>(<a href="transaction_validation.md#0x1_transaction_validation_EOUT_OF_GAS">EOUT_OF_GAS</a>)
     );
     <b>let</b> transaction_fee_amount = txn_gas_price * gas_used;
+
     // it's important <b>to</b> maintain the <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error">error</a> <a href="code.md#0x1_code">code</a> consistent <b>with</b> vm
     // <b>to</b> do failed transaction cleanup.
-    <b>assert</b>!(
-        <a href="coin.md#0x1_coin_is_balance_at_least">coin::is_balance_at_least</a>&lt;AptosCoin&gt;(gas_payer, transaction_fee_amount),
-        <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_out_of_range">error::out_of_range</a>(<a href="transaction_validation.md#0x1_transaction_validation_PROLOGUE_ECANT_PAY_GAS_DEPOSIT">PROLOGUE_ECANT_PAY_GAS_DEPOSIT</a>),
-    );
+    <b>if</b> (<a href="../../aptos-stdlib/../move-stdlib/doc/features.md#0x1_features_operations_default_to_fa_apt_store_enabled">features::operations_default_to_fa_apt_store_enabled</a>()) {
+        <b>assert</b>!(
+            <a href="aptos_account.md#0x1_aptos_account_is_fungible_balance_at_least">aptos_account::is_fungible_balance_at_least</a>(gas_payer, transaction_fee_amount),
+            <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_out_of_range">error::out_of_range</a>(<a href="transaction_validation.md#0x1_transaction_validation_PROLOGUE_ECANT_PAY_GAS_DEPOSIT">PROLOGUE_ECANT_PAY_GAS_DEPOSIT</a>),
+        );
+    } <b>else</b> {
+        <b>assert</b>!(
+            <a href="coin.md#0x1_coin_is_balance_at_least">coin::is_balance_at_least</a>&lt;AptosCoin&gt;(gas_payer, transaction_fee_amount),
+            <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_out_of_range">error::out_of_range</a>(<a href="transaction_validation.md#0x1_transaction_validation_PROLOGUE_ECANT_PAY_GAS_DEPOSIT">PROLOGUE_ECANT_PAY_GAS_DEPOSIT</a>),
+        );
+    };
 
     <b>let</b> amount_to_burn = <b>if</b> (<a href="../../aptos-stdlib/../move-stdlib/doc/features.md#0x1_features_collect_and_distribute_gas_fees">features::collect_and_distribute_gas_fees</a>()) {
         // TODO(gas): We might want <b>to</b> distinguish the refundable part of the charge and burn it or track
@@ -854,49 +661,6 @@ Called by the Adapter
 
 
 
-</details>
-
-<a id="0x1_transaction_validation_epilogue_gas_payer_return_deposit"></a>
-
-## Function `epilogue_gas_payer_return_deposit`
-
-Return the deposit held in prologue to the gas payer, then <code><a href="transaction_validation.md#0x1_transaction_validation_epilogue_gas_payer">epilogue_gas_payer</a>()</code>.
-
-Deposit return should go first so <code><a href="transaction_validation.md#0x1_transaction_validation_epilogue_gas_payer">epilogue_gas_payer</a>()</code> doesn't have to be aware of this change.
-
-
-<pre><code><b>fun</b> <a href="transaction_validation.md#0x1_transaction_validation_epilogue_gas_payer_return_deposit">epilogue_gas_payer_return_deposit</a>(<a href="account.md#0x1_account">account</a>: <a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer">signer</a>, gas_payer: <b>address</b>, storage_fee_refunded: u64, txn_gas_price: u64, txn_max_gas_units: u64, gas_units_remaining: u64, required_deposit: <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_Option">option::Option</a>&lt;u64&gt;)
-</code></pre>
-
-
-
-<details>
-<summary>Implementation</summary>
-
-
-<pre><code><b>fun</b> <a href="transaction_validation.md#0x1_transaction_validation_epilogue_gas_payer_return_deposit">epilogue_gas_payer_return_deposit</a>(
-    <a href="account.md#0x1_account">account</a>: <a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer">signer</a>,
-    gas_payer: <b>address</b>,
-    storage_fee_refunded: u64,
-    txn_gas_price: u64,
-    txn_max_gas_units: u64,
-    gas_units_remaining: u64,
-    required_deposit: Option&lt;u64&gt;,
-) {
-    <a href="transaction_validation.md#0x1_transaction_validation_return_deposit">return_deposit</a>(gas_payer, required_deposit);
-    <a href="transaction_validation.md#0x1_transaction_validation_epilogue_gas_payer">epilogue_gas_payer</a>(
-        <a href="account.md#0x1_account">account</a>,
-        gas_payer,
-        storage_fee_refunded,
-        txn_gas_price,
-        txn_max_gas_units,
-        gas_units_remaining,
-    );
-}
-</code></pre>
-
-
-
 </details>
 
 <a id="@Specification_1"></a>
@@ -998,14 +762,14 @@ Give some constraints that may abort according to the conditions.
     <b>let</b> transaction_sender = <a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer_address_of">signer::address_of</a>(sender);
     <b>aborts_if</b> (
         !<a href="../../aptos-stdlib/../move-stdlib/doc/features.md#0x1_features_spec_is_enabled">features::spec_is_enabled</a>(<a href="../../aptos-stdlib/../move-stdlib/doc/features.md#0x1_features_SPONSORED_AUTOMATIC_ACCOUNT_CREATION">features::SPONSORED_AUTOMATIC_ACCOUNT_CREATION</a>)
-        || <a href="account.md#0x1_account_exists_at">account::exists_at</a>(transaction_sender)
-        || transaction_sender == gas_payer
-        || txn_sequence_number &gt; 0
+            || <a href="account.md#0x1_account_exists_at">account::exists_at</a>(transaction_sender)
+            || transaction_sender == gas_payer
+            || txn_sequence_number &gt; 0
     ) && (
         !(txn_sequence_number &gt;= <b>global</b>&lt;Account&gt;(transaction_sender).sequence_number)
-        || !(txn_authentication_key == <b>global</b>&lt;Account&gt;(transaction_sender).authentication_key)
-        || !<a href="account.md#0x1_account_exists_at">account::exists_at</a>(transaction_sender)
-        || !(txn_sequence_number == <b>global</b>&lt;Account&gt;(transaction_sender).sequence_number)
+            || !(txn_authentication_key == <b>global</b>&lt;Account&gt;(transaction_sender).authentication_key)
+            || !<a href="account.md#0x1_account_exists_at">account::exists_at</a>(transaction_sender)
+            || !(txn_sequence_number == <b>global</b>&lt;Account&gt;(transaction_sender).sequence_number)
     );
     <b>aborts_if</b> <a href="../../aptos-stdlib/../move-stdlib/doc/features.md#0x1_features_spec_is_enabled">features::spec_is_enabled</a>(<a href="../../aptos-stdlib/../move-stdlib/doc/features.md#0x1_features_SPONSORED_AUTOMATIC_ACCOUNT_CREATION">features::SPONSORED_AUTOMATIC_ACCOUNT_CREATION</a>)
         && transaction_sender != gas_payer
@@ -1023,38 +787,6 @@ Give some constraints that may abort according to the conditions.
 
 
 
-<a id="@Specification_1_collect_deposit"></a>
-
-### Function `collect_deposit`
-
-
-<pre><code><b>fun</b> <a href="transaction_validation.md#0x1_transaction_validation_collect_deposit">collect_deposit</a>(gas_payer: <b>address</b>, amount: <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_Option">option::Option</a>&lt;u64&gt;)
-</code></pre>
-
-
-
-
-<pre><code><b>pragma</b> verify = <b>false</b>;
-</code></pre>
-
-
-
-<a id="@Specification_1_return_deposit"></a>
-
-### Function `return_deposit`
-
-
-<pre><code><b>fun</b> <a href="transaction_validation.md#0x1_transaction_validation_return_deposit">return_deposit</a>(gas_payer: <b>address</b>, amount: <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_Option">option::Option</a>&lt;u64&gt;)
-</code></pre>
-
-
-
-
-<pre><code><b>pragma</b> verify = <b>false</b>;
-</code></pre>
-
-
-
 <a id="@Specification_1_prologue_common"></a>
 
 ### Function `prologue_common`
@@ -1109,28 +841,12 @@ Give some constraints that may abort according to the conditions.
     <b>ensures</b> <b>forall</b> i in 0..num_secondary_signers:
         <a href="account.md#0x1_account_exists_at">account::exists_at</a>(secondary_signer_addresses[i])
             && secondary_signer_public_key_hashes[i] ==
-                <a href="account.md#0x1_account_get_authentication_key">account::get_authentication_key</a>(secondary_signer_addresses[i]);
+            <a href="account.md#0x1_account_get_authentication_key">account::get_authentication_key</a>(secondary_signer_addresses[i]);
 }
 </code></pre>
 
 
 
-<a id="@Specification_1_script_prologue_collect_deposit"></a>
-
-### Function `script_prologue_collect_deposit`
-
-
-<pre><code><b>fun</b> <a href="transaction_validation.md#0x1_transaction_validation_script_prologue_collect_deposit">script_prologue_collect_deposit</a>(sender: <a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer">signer</a>, txn_sequence_number: u64, txn_public_key: <a href="../../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, txn_gas_price: u64, txn_max_gas_units: u64, txn_expiration_time: u64, <a href="chain_id.md#0x1_chain_id">chain_id</a>: u8, script_hash: <a href="../../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, required_deposit: <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_Option">option::Option</a>&lt;u64&gt;)
-</code></pre>
-
-
-
-
-<pre><code><b>pragma</b> verify = <b>false</b>;
-</code></pre>
-
-
-
 <a id="@Specification_1_multi_agent_script_prologue"></a>
 
 ### Function `multi_agent_script_prologue`
@@ -1209,22 +925,6 @@ not equal the number of singers.
 
 
 
-<a id="@Specification_1_fee_payer_script_prologue_collect_deposit"></a>
-
-### Function `fee_payer_script_prologue_collect_deposit`
-
-
-<pre><code><b>fun</b> <a href="transaction_validation.md#0x1_transaction_validation_fee_payer_script_prologue_collect_deposit">fee_payer_script_prologue_collect_deposit</a>(sender: <a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer">signer</a>, txn_sequence_number: u64, txn_sender_public_key: <a href="../../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, secondary_signer_addresses: <a href="../../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;, secondary_signer_public_key_hashes: <a href="../../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;, fee_payer_address: <b>address</b>, fee_payer_public_key_hash: <a href="../../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, txn_gas_price: u64, txn_max_gas_units: u64, txn_expiration_time: u64, <a href="chain_id.md#0x1_chain_id">chain_id</a>: u8, required_deposit: <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_Option">option::Option</a>&lt;u64&gt;)
-</code></pre>
-
-
-
-
-<pre><code><b>pragma</b> verify = <b>false</b>;
-</code></pre>
-
-
-
 <a id="@Specification_1_epilogue"></a>
 
 ### Function `epilogue`
@@ -1245,22 +945,6 @@ Skip transaction_fee::burn_fee verification.
 
 
 
-<a id="@Specification_1_epilogue_return_deposit"></a>
-
-### Function `epilogue_return_deposit`
-
-
-<pre><code><b>fun</b> <a href="transaction_validation.md#0x1_transaction_validation_epilogue_return_deposit">epilogue_return_deposit</a>(<a href="account.md#0x1_account">account</a>: <a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer">signer</a>, storage_fee_refunded: u64, txn_gas_price: u64, txn_max_gas_units: u64, gas_units_remaining: u64, required_deposit: <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_Option">option::Option</a>&lt;u64&gt;)
-</code></pre>
-
-
-
-
-<pre><code><b>pragma</b> verify = <b>false</b>;
-</code></pre>
-
-
-
 <a id="@Specification_1_epilogue_gas_payer"></a>
 
 ### Function `epilogue_gas_payer`
@@ -1311,7 +995,7 @@ Skip transaction_fee::burn_fee verification.
     // This enforces <a id="high-level-req-3" href="#high-level-req">high-level requirement 3</a>:
     <b>aborts_if</b> collect_fee_enabled && !<b>exists</b>&lt;CollectedFeesPerBlock&gt;(@aptos_framework);
     <b>aborts_if</b> collect_fee_enabled && transaction_fee_amount &gt; 0 && aggr_val + transaction_fee_amount &gt; aggr_lim;
-    <b>let</b> amount_to_burn= <b>if</b> (collect_fee_enabled) {
+    <b>let</b> amount_to_burn = <b>if</b> (collect_fee_enabled) {
         0
     } <b>else</b> {
         transaction_fee_amount - storage_fee_refunded
@@ -1346,20 +1030,4 @@ Skip transaction_fee::burn_fee verification.
 </code></pre>
 
 
-
-<a id="@Specification_1_epilogue_gas_payer_return_deposit"></a>
-
-### Function `epilogue_gas_payer_return_deposit`
-
-
-<pre><code><b>fun</b> <a href="transaction_validation.md#0x1_transaction_validation_epilogue_gas_payer_return_deposit">epilogue_gas_payer_return_deposit</a>(<a href="account.md#0x1_account">account</a>: <a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer">signer</a>, gas_payer: <b>address</b>, storage_fee_refunded: u64, txn_gas_price: u64, txn_max_gas_units: u64, gas_units_remaining: u64, required_deposit: <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_Option">option::Option</a>&lt;u64&gt;)
-</code></pre>
-
-
-
-
-<pre><code><b>pragma</b> verify = <b>false</b>;
-</code></pre>
-
-
 [move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-framework/sources/account.move b/aptos-move/framework/aptos-framework/sources/account.move
index cfdf8577fb304..3c3c49fe5b28c 100644
--- a/aptos-move/framework/aptos-framework/sources/account.move
+++ b/aptos-move/framework/aptos-framework/sources/account.move
@@ -185,7 +185,7 @@ module aptos_framework::account {
         });
     }
 
-    fun create_account_if_does_not_exist(account_address: address) {
+    public fun create_account_if_does_not_exist(account_address: address) {
         if (!exists<Account>(account_address)) {
             create_account(account_address);
         }
diff --git a/aptos-move/framework/aptos-framework/sources/aggregator_v2/aggregator_v2.move b/aptos-move/framework/aptos-framework/sources/aggregator_v2/aggregator_v2.move
index c3fd48d2cae8f..7e26548bc0abd 100644
--- a/aptos-move/framework/aptos-framework/sources/aggregator_v2/aggregator_v2.move
+++ b/aptos-move/framework/aptos-framework/sources/aggregator_v2/aggregator_v2.move
@@ -8,8 +8,19 @@
 /// dependency.
 /// However, reading the aggregator value (i.e. calling `read(X)`) is a resource-intensive
 /// operation that also reduced parallelism, and should be avoided as much as possible.
+/// If you need to capture the value, without revealing it, use snapshot function instead,
+/// which has no parallelism impact.
+///
+/// From parallelism considerations, there are three different levels of effects:
+/// * enable full parallelism (cannot create conflicts):
+///     max_value, create_*, snapshot, derive_string_concat
+/// * enable speculative parallelism (generally parallel via branch prediction)
+///     try_add, add, try_sub, sub, is_at_least
+/// * create read/write conflicts, as if you were using a regular field
+///     read, read_snapshot, read_derived_string
 module aptos_framework::aggregator_v2 {
     use std::error;
+    use std::features;
     use std::string::String;
 
     /// The value of aggregator overflows. Raised by uncoditional add() call
@@ -66,6 +77,12 @@ module aptos_framework::aggregator_v2 {
     /// EAGGREGATOR_ELEMENT_TYPE_NOT_SUPPORTED raised if called with a different type.
     public native fun create_aggregator<IntElement: copy + drop>(max_value: IntElement): Aggregator<IntElement>;
 
+    public fun create_aggregator_with_value<IntElement: copy + drop>(start_value: IntElement, max_value: IntElement): Aggregator<IntElement> {
+        let aggregator = create_aggregator(max_value);
+        add(&mut aggregator, start_value);
+        aggregator
+    }
+
     /// Creates new aggregator, without any 'max_value' on top of the implicit bound restriction
     /// due to the width of the type (i.e. MAX_U64 for u64, MAX_U128 for u128).
     ///
@@ -73,34 +90,81 @@ module aptos_framework::aggregator_v2 {
     /// EAGGREGATOR_ELEMENT_TYPE_NOT_SUPPORTED raised if called with a different type.
     public native fun create_unbounded_aggregator<IntElement: copy + drop>(): Aggregator<IntElement>;
 
+    public fun create_unbounded_aggregator_with_value<IntElement: copy + drop>(start_value: IntElement): Aggregator<IntElement> {
+        let aggregator = create_unbounded_aggregator();
+        add(&mut aggregator, start_value);
+        aggregator
+    }
+
     /// Adds `value` to aggregator.
     /// If addition would exceed the max_value, `false` is returned, and aggregator value is left unchanged.
+    ///
+    /// Parallelism info: This operation enables speculative parallelism.
     public native fun try_add<IntElement>(aggregator: &mut Aggregator<IntElement>, value: IntElement): bool;
 
-    // Adds `value` to aggregator, uncoditionally.
-    // If addition would exceed the max_value, EAGGREGATOR_OVERFLOW exception will be thrown.
+    /// Adds `value` to aggregator, unconditionally.
+    /// If addition would exceed the max_value, EAGGREGATOR_OVERFLOW exception will be thrown.
+    ///
+    /// Parallelism info: This operation enables speculative parallelism.
     public fun add<IntElement>(aggregator: &mut Aggregator<IntElement>, value: IntElement) {
         assert!(try_add(aggregator, value), error::out_of_range(EAGGREGATOR_OVERFLOW));
     }
 
     /// Subtracts `value` from aggregator.
     /// If subtraction would result in a negative value, `false` is returned, and aggregator value is left unchanged.
+    ///
+    /// Parallelism info: This operation enables speculative parallelism.
     public native fun try_sub<IntElement>(aggregator: &mut Aggregator<IntElement>, value: IntElement): bool;
 
-    // Subtracts `value` to aggregator, uncoditionally.
+    // Subtracts `value` to aggregator, unconditionally.
     // If subtraction would result in a negative value, EAGGREGATOR_UNDERFLOW exception will be thrown.
+    ///
+    /// Parallelism info: This operation enables speculative parallelism.
     public fun sub<IntElement>(aggregator: &mut Aggregator<IntElement>, value: IntElement) {
         assert!(try_sub(aggregator, value), error::out_of_range(EAGGREGATOR_UNDERFLOW));
     }
 
+    native fun is_at_least_impl<IntElement>(aggregator: &Aggregator<IntElement>, min_amount: IntElement): bool;
+
+    /// Returns true if aggregator value is larger than or equal to the given `min_amount`, false otherwise.
+    ///
+    /// This operation is more efficient and much more parallelization friendly than calling `read(agg) > min_amount`.
+    /// Until traits are deployed, `is_at_most`/`is_equal` utility methods can be derived from this one (assuming +1 doesn't overflow):
+    /// - for `is_at_most(agg, max_amount)`, you can do `!is_at_least(max_amount + 1)`
+    /// - for `is_equal(agg, value)`, you can do `is_at_least(value) && !is_at_least(value + 1)`
+    ///
+    /// Parallelism info: This operation enables speculative parallelism.
+    public fun is_at_least<IntElement>(aggregator: &Aggregator<IntElement>, min_amount: IntElement): bool {
+        assert!(features::aggregator_v2_is_at_least_api_enabled(), EAGGREGATOR_API_V2_NOT_ENABLED);
+        is_at_least_impl(aggregator, min_amount)
+    }
+
+    // TODO waiting for integer traits
+    // public fun is_at_most<IntElement>(aggregator: &Aggregator<IntElement>, max_amount: IntElement): bool {
+    //     !is_at_least(max_amount + 1)
+    // }
+
+    // TODO waiting for integer traits
+    // public fun is_equal<IntElement>(aggregator: &Aggregator<IntElement>, value: IntElement): bool {
+    //     is_at_least(value) && !is_at_least(value + 1)
+    // }
+
     /// Returns a value stored in this aggregator.
     /// Note: This operation is resource-intensive, and reduces parallelism.
-    /// (Especially if called in a transaction that also modifies the aggregator,
-    /// or has other read/write conflicts)
+    /// If you need to capture the value, without revealing it, use snapshot function instead,
+    /// which has no parallelism impact.
+    /// If called in a transaction that also modifies the aggregator, or has other read/write conflicts,
+    /// it will sequentialize that transaction. (i.e. up to concurrency_level times slower)
+    /// If called in a separate transaction (i.e. after transaction that modifies aggregator), it might be
+    /// up to two times slower.
+    ///
+    /// Parallelism info: This operation *prevents* speculative parallelism.
     public native fun read<IntElement>(aggregator: &Aggregator<IntElement>): IntElement;
 
     /// Returns a wrapper of a current value of an aggregator
     /// Unlike read(), it is fast and avoids sequential dependencies.
+    ///
+    /// Parallelism info: This operation enables parallelism.
     public native fun snapshot<IntElement>(aggregator: &Aggregator<IntElement>): AggregatorSnapshot<IntElement>;
 
     /// Creates a snapshot of a given value.
@@ -111,12 +175,16 @@ module aptos_framework::aggregator_v2 {
     /// Note: This operation is resource-intensive, and reduces parallelism.
     /// (Especially if called in a transaction that also modifies the aggregator,
     /// or has other read/write conflicts)
+    ///
+    /// Parallelism info: This operation *prevents* speculative parallelism.
     public native fun read_snapshot<IntElement>(snapshot: &AggregatorSnapshot<IntElement>): IntElement;
 
     /// Returns a value stored in this DerivedStringSnapshot.
     /// Note: This operation is resource-intensive, and reduces parallelism.
     /// (Especially if called in a transaction that also modifies the aggregator,
     /// or has other read/write conflicts)
+    ///
+    /// Parallelism info: This operation *prevents* speculative parallelism.
     public native fun read_derived_string(snapshot: &DerivedStringSnapshot): String;
 
     /// Creates a DerivedStringSnapshot of a given value.
@@ -127,6 +195,8 @@ module aptos_framework::aggregator_v2 {
     /// snapshot passed needs to have integer type - currently supported types are u64 and u128.
     /// Raises EUNSUPPORTED_AGGREGATOR_SNAPSHOT_TYPE if called with another type.
     /// If length of prefix and suffix together exceed 256 bytes, ECONCAT_STRING_LENGTH_TOO_LARGE is raised.
+    ///
+    /// Parallelism info: This operation enables parallelism.
     public native fun derive_string_concat<IntElement>(before: String, snapshot: &AggregatorSnapshot<IntElement>, after: String): DerivedStringSnapshot;
 
     // ===== DEPRECATE/NOT YET IMPLEMENTED ====
@@ -181,30 +251,6 @@ module aptos_framework::aggregator_v2 {
         assert!(read_derived_string(&derived) == std::string::utf8(b"before42after"), 0);
     }
 
-    // Tests commented out, as flag used in rust cannot be disabled.
-
-    // #[test(fx = @std)]
-    // #[expected_failure(abort_code = 0x030006, location = Self)]
-    // fun test_snapshot_feature_not_enabled(fx: &signer) {
-    //     use std::features;
-    //     use aptos_framework::reconfiguration;
-    //     let feature = features::get_aggregator_v2_api_feature();
-    //     features::change_feature_flags(fx, vector[], vector[feature]);
-    //     reconfiguration::reconfigure_for_test();
-    //     create_snapshot(42);
-    // }
-
-    // #[test(fx = @std)]
-    // #[expected_failure(abort_code = 0x030006, location = Self)]
-    // fun test_aggregator_feature_not_enabled(fx: &signer) {
-    //     use std::features;
-    //     use aptos_framework::reconfiguration;
-    //     let feature = features::get_aggregator_v2_api_feature();
-    //     features::change_feature_flags(fx, vector[], vector[feature]);
-    //     reconfiguration::reconfigure_for_test();
-    //     create_aggregator(42);
-    // }
-
     #[test]
     #[expected_failure(abort_code = 0x030007, location = Self)]
     fun test_aggregator_invalid_type1() {
diff --git a/aptos-move/framework/aptos-framework/sources/aggregator_v2/aggregator_v2.spec.move b/aptos-move/framework/aptos-framework/sources/aggregator_v2/aggregator_v2.spec.move
index 459978eaa7186..2395ebed63388 100644
--- a/aptos-move/framework/aptos-framework/sources/aggregator_v2/aggregator_v2.spec.move
+++ b/aptos-move/framework/aptos-framework/sources/aggregator_v2/aggregator_v2.spec.move
@@ -19,6 +19,11 @@ spec aptos_framework::aggregator_v2 {
         pragma opaque;
     }
 
+    spec is_at_least_impl {
+        // TODO: temporary mockup.
+        pragma opaque;
+    }
+
     spec read {
         // TODO: temporary mockup.
         pragma opaque;
@@ -34,11 +39,33 @@ spec aptos_framework::aggregator_v2 {
         pragma opaque;
     }
 
+    spec read_snapshot {
+        // TODO: temporary mockup.
+        pragma opaque;
+    }
+
+    spec read_derived_string {
+        // TODO: temporary mockup.
+        pragma opaque;
+    }
+
+    spec create_derived_string {
+        // TODO: temporary mockup.
+        pragma opaque;
+    }
+
+    spec derive_string_concat {
+        // TODO: temporary mockup.
+        pragma opaque;
+    }
+
+    // deprecated
     spec copy_snapshot {
         // TODO: temporary mockup.
         pragma opaque;
     }
 
+    // deprecated
     spec string_concat {
         // TODO: temporary mockup.
         pragma opaque;
diff --git a/aptos-move/framework/aptos-framework/sources/aptos_account.move b/aptos-move/framework/aptos-framework/sources/aptos_account.move
index 5e407d4e11377..34addca77cf28 100644
--- a/aptos-move/framework/aptos-framework/sources/aptos_account.move
+++ b/aptos-move/framework/aptos-framework/sources/aptos_account.move
@@ -4,12 +4,19 @@ module aptos_framework::aptos_account {
     use aptos_framework::coin::{Self, Coin};
     use aptos_framework::create_signer::create_signer;
     use aptos_framework::event::{EventHandle, emit_event, emit};
+    use aptos_framework::fungible_asset::{Self, Metadata, BurnRef};
+    use aptos_framework::primary_fungible_store;
+    use aptos_framework::object;
+
     use std::error;
+    use std::features;
     use std::signer;
     use std::vector;
 
     friend aptos_framework::genesis;
     friend aptos_framework::resource_account;
+    friend aptos_framework::transaction_fee;
+    friend aptos_framework::transaction_validation;
 
     /// Account does not exist.
     const EACCOUNT_NOT_FOUND: u64 = 1;
@@ -46,8 +53,8 @@ module aptos_framework::aptos_account {
     ///////////////////////////////////////////////////////////////////////////
 
     public entry fun create_account(auth_key: address) {
-        let signer = account::create_account(auth_key);
-        coin::register<AptosCoin>(&signer);
+        let account_signer = account::create_account(auth_key);
+        register_apt(&account_signer);
     }
 
     /// Batch version of APT transfer.
@@ -70,12 +77,17 @@ module aptos_framework::aptos_account {
         if (!account::exists_at(to)) {
             create_account(to)
         };
-        // Resource accounts can be created without registering them to receive APT.
-        // This conveniently does the registration if necessary.
-        if (!coin::is_account_registered<AptosCoin>(to)) {
-            coin::register<AptosCoin>(&create_signer(to));
-        };
-        coin::transfer<AptosCoin>(source, to, amount)
+
+        if (features::operations_default_to_fa_apt_store_enabled()) {
+            fungible_transfer_only(source, to, amount)
+        } else {
+            // Resource accounts can be created without registering them to receive APT.
+            // This conveniently does the registration if necessary.
+            if (!coin::is_account_registered<AptosCoin>(to)) {
+                coin::register<AptosCoin>(&create_signer(to));
+            };
+            coin::transfer<AptosCoin>(source, to, amount)
+        }
     }
 
     /// Batch version of transfer_coins.
@@ -172,6 +184,71 @@ module aptos_framework::aptos_account {
             borrow_global<DirectTransferConfig>(account).allow_arbitrary_coin_transfers
     }
 
+    public(friend) fun register_apt(account_signer: &signer) {
+        if (features::new_accounts_default_to_fa_apt_store_enabled()) {
+            ensure_primary_fungible_store_exists(signer::address_of(account_signer));
+        } else {
+            coin::register<AptosCoin>(account_signer);
+        }
+    }
+
+    /// APT Primary Fungible Store specific specialized functions,
+    /// Utilized internally once migration of APT to FungibleAsset is complete.
+
+    /// Convenient function to transfer APT to a recipient account that might not exist.
+    /// This would create the recipient APT PFS first, which also registers it to receive APT, before transferring.
+    /// TODO: once migration is complete, rename to just "transfer_only" and make it an entry function (for cheapest way
+    /// to transfer APT) - if we want to allow APT PFS without account itself
+    public(friend) entry fun fungible_transfer_only(
+        source: &signer, to: address, amount: u64
+    ) {
+        let sender_store = ensure_primary_fungible_store_exists(signer::address_of(source));
+        let recipient_store = ensure_primary_fungible_store_exists(to);
+
+        // use internal APIs, as they skip:
+        // - owner, frozen and dispatchable checks
+        // as APT cannot be frozen or have dispatch, and PFS cannot be transfered
+        // (PFS could potentially be burned. regular transfer would permanently unburn the store.
+        // Ignoring the check here has the equivalent of unburning, transfers, and then burning again)
+        fungible_asset::deposit_internal(recipient_store, fungible_asset::withdraw_internal(sender_store, amount));
+    }
+
+    /// Is balance from APT Primary FungibleStore at least the given amount
+    public(friend) fun is_fungible_balance_at_least(account: address, amount: u64): bool {
+        let store_addr = primary_fungible_store_address(account);
+        fungible_asset::is_address_balance_at_least(store_addr, amount)
+    }
+
+    /// Burn from APT Primary FungibleStore
+    public(friend) fun burn_from_fungible_store(
+        ref: &BurnRef,
+        account: address,
+        amount: u64,
+    ) {
+        // Skip burning if amount is zero. This shouldn't error out as it's called as part of transaction fee burning.
+        if (amount != 0) {
+            let store_addr = primary_fungible_store_address(account);
+            fungible_asset::address_burn_from(ref, store_addr, amount);
+        };
+    }
+
+    /// Ensure that APT Primary FungibleStore exists (and create if it doesn't)
+    inline fun ensure_primary_fungible_store_exists(owner: address): address {
+        let store_addr = primary_fungible_store_address(owner);
+        if (fungible_asset::store_exists(store_addr)) {
+            store_addr
+        } else {
+            object::object_address(&primary_fungible_store::create_primary_store(owner, object::address_to_object<Metadata>(@aptos_fungible_asset)))
+        }
+    }
+
+    /// Address of APT Primary Fungible Store
+    inline fun primary_fungible_store_address(account: address): address {
+        object::create_user_derived_object_address(account, @aptos_fungible_asset)
+    }
+
+    // tests
+
     #[test_only]
     use aptos_std::from_bcs;
     #[test_only]
@@ -346,4 +423,21 @@ module aptos_framework::aptos_account {
         coin::destroy_mint_cap(mint_cap);
         coin::destroy_freeze_cap(freeze_cap);
     }
+
+    #[test(user = @0xcafe)]
+    fun test_primary_fungible_store_address(
+        user: &signer,
+    ) {
+        use aptos_framework::fungible_asset::Metadata;
+        use aptos_framework::aptos_coin;
+
+        aptos_coin::ensure_initialized_with_apt_fa_metadata_for_test();
+
+        let apt_metadata = object::address_to_object<Metadata>(@aptos_fungible_asset);
+        let user_addr = signer::address_of(user);
+        assert!(primary_fungible_store_address(user_addr) == primary_fungible_store::primary_store_address(user_addr, apt_metadata), 1);
+
+        ensure_primary_fungible_store_exists(user_addr);
+        assert!(primary_fungible_store::primary_store_exists(user_addr, apt_metadata), 2);
+    }
 }
diff --git a/aptos-move/framework/aptos-framework/sources/aptos_account.spec.move b/aptos-move/framework/aptos-framework/sources/aptos_account.spec.move
index acc8bf6f0a6d1..ff6faa22ac640 100644
--- a/aptos-move/framework/aptos-framework/sources/aptos_account.spec.move
+++ b/aptos-move/framework/aptos-framework/sources/aptos_account.spec.move
@@ -260,6 +260,30 @@ spec aptos_framework::aptos_account {
         ensures exists<aptos_framework::coin::CoinStore<CoinType>>(to);
     }
 
+    spec register_apt(account_signer: &signer) {
+        // TODO: temporary mockup.
+        pragma verify = false;
+    }
+
+    spec fungible_transfer_only(source: &signer, to: address, amount: u64) {
+        // TODO: temporary mockup.
+        pragma verify = false;
+    }
+
+    spec is_fungible_balance_at_least(account: address, amount: u64): bool {
+        // TODO: temporary mockup.
+        pragma verify = false;
+    }
+
+    spec burn_from_fungible_store(
+        ref: &BurnRef,
+        account: address,
+        amount: u64,
+    ) {
+        // TODO: temporary mockup.
+        pragma verify = false;
+    }
+
     spec schema CreateAccountTransferAbortsIf {
         to: address;
         aborts_if !account::exists_at(to) && length_judgment(to);
diff --git a/aptos-move/framework/aptos-framework/sources/aptos_coin.move b/aptos-move/framework/aptos-framework/sources/aptos_coin.move
index 18efcb49382e9..cff0f86f85664 100644
--- a/aptos-move/framework/aptos-framework/sources/aptos_coin.move
+++ b/aptos-move/framework/aptos-framework/sources/aptos_coin.move
@@ -1,9 +1,9 @@
 /// This module defines a minimal and generic Coin and Balance.
 /// modified from https://github.com/move-language/move/tree/main/language/documentation/tutorial
 module aptos_framework::aptos_coin {
-    use std::string;
     use std::error;
     use std::signer;
+    use std::string;
     use std::vector;
     use std::option::{Self, Option};
 
@@ -69,6 +69,7 @@ module aptos_framework::aptos_coin {
 
     /// Can only be called during genesis for tests to grant mint capability to aptos framework and core resources
     /// accounts.
+    /// Expects account and APT store to be registered before calling.
     public(friend) fun configure_accounts_for_test(
         aptos_framework: &signer,
         core_resources: &signer,
@@ -77,7 +78,6 @@ module aptos_framework::aptos_coin {
         system_addresses::assert_aptos_framework(aptos_framework);
 
         // Mint the core resource account AptosCoin for gas so it can execute system transactions.
-        coin::register<AptosCoin>(core_resources);
         let coins = coin::mint<AptosCoin>(
             18446744073709551615,
             &mint_cap,
diff --git a/aptos-move/framework/aptos-framework/sources/aptos_governance.move b/aptos-move/framework/aptos-framework/sources/aptos_governance.move
index e6826633c556c..19c8d45c92753 100644
--- a/aptos-move/framework/aptos-framework/sources/aptos_governance.move
+++ b/aptos-move/framework/aptos-framework/sources/aptos_governance.move
@@ -449,6 +449,31 @@ module aptos_framework::aptos_governance {
         proposal_id
     }
 
+    /// Vote on proposal with proposal_id and all voting power from multiple stake_pools.
+    public entry fun batch_vote(
+        voter: &signer,
+        stake_pools: vector<address>,
+        proposal_id: u64,
+        should_pass: bool,
+    ) acquires ApprovedExecutionHashes, VotingRecords, VotingRecordsV2, GovernanceEvents {
+        vector::for_each(stake_pools, |stake_pool| {
+            vote_internal(voter, stake_pool, proposal_id, MAX_U64, should_pass);
+        });
+    }
+
+    /// Batch vote on proposal with proposal_id and specified voting power from multiple stake_pools.
+    public entry fun batch_partial_vote(
+        voter: &signer,
+        stake_pools: vector<address>,
+        proposal_id: u64,
+        voting_power: u64,
+        should_pass: bool,
+    ) acquires ApprovedExecutionHashes, VotingRecords, VotingRecordsV2, GovernanceEvents {
+        vector::for_each(stake_pools, |stake_pool| {
+            vote_internal(voter, stake_pool, proposal_id, voting_power, should_pass);
+        });
+    }
+
     /// Vote on proposal with `proposal_id` and all voting power from `stake_pool`.
     public entry fun vote(
         voter: &signer,
@@ -1034,6 +1059,44 @@ module aptos_framework::aptos_governance {
         test_resolving_proposal_generic(aptos_framework, true, execution_hash);
     }
 
+    #[test(aptos_framework = @aptos_framework, proposer = @0x123, voter_1 = @0x234, voter_2 = @345)]
+    public entry fun test_batch_vote(
+        aptos_framework: signer,
+        proposer: signer,
+        voter_1: signer,
+        voter_2: signer,
+    ) acquires ApprovedExecutionHashes, GovernanceConfig, GovernanceResponsbility, VotingRecords, VotingRecordsV2, GovernanceEvents {
+        features::change_feature_flags_for_testing(&aptos_framework, vector[features::get_coin_to_fungible_asset_migration_feature()], vector[]);
+        setup_partial_voting(&aptos_framework, &proposer, &voter_1, &voter_2);
+        let execution_hash = vector::empty<u8>();
+        vector::push_back(&mut execution_hash, 1);
+        let voter_1_addr = signer::address_of(&voter_1);
+        let voter_2_addr = signer::address_of(&voter_2);
+        stake::set_delegated_voter(&voter_2, voter_1_addr);
+        create_proposal_for_test(&proposer, true);
+        batch_vote(&voter_1, vector[voter_1_addr, voter_2_addr], 0, true);
+        test_resolving_proposal_generic(aptos_framework, true, execution_hash);
+    }
+
+    #[test(aptos_framework = @aptos_framework, proposer = @0x123, voter_1 = @0x234, voter_2 = @345)]
+    public entry fun test_batch_partial_vote(
+        aptos_framework: signer,
+        proposer: signer,
+        voter_1: signer,
+        voter_2: signer,
+    ) acquires ApprovedExecutionHashes, GovernanceConfig, GovernanceResponsbility, VotingRecords, VotingRecordsV2, GovernanceEvents {
+        features::change_feature_flags_for_testing(&aptos_framework, vector[features::get_coin_to_fungible_asset_migration_feature()], vector[]);
+        setup_partial_voting(&aptos_framework, &proposer, &voter_1, &voter_2);
+        let execution_hash = vector::empty<u8>();
+        vector::push_back(&mut execution_hash, 1);
+        let voter_1_addr = signer::address_of(&voter_1);
+        let voter_2_addr = signer::address_of(&voter_2);
+        stake::set_delegated_voter(&voter_2, voter_1_addr);
+        create_proposal_for_test(&proposer, true);
+        batch_partial_vote(&voter_1, vector[voter_1_addr, voter_2_addr], 0, 9, true);
+        test_resolving_proposal_generic(aptos_framework, true, execution_hash);
+    }
+
     #[test(aptos_framework = @aptos_framework, proposer = @0x123, voter_1 = @0x234, voter_2 = @345)]
     public entry fun test_stake_pool_can_vote_only_with_its_own_voting_power(
         aptos_framework: signer,
diff --git a/aptos-move/framework/aptos-framework/sources/aptos_governance.spec.move b/aptos-move/framework/aptos-framework/sources/aptos_governance.spec.move
index e7f493cee7bb4..4c0189023816c 100644
--- a/aptos-move/framework/aptos-framework/sources/aptos_governance.spec.move
+++ b/aptos-move/framework/aptos-framework/sources/aptos_governance.spec.move
@@ -851,4 +851,25 @@ spec aptos_framework::aptos_governance {
     spec force_end_epoch_test_only {
         pragma verify = false;
     }
+
+    spec batch_vote(
+        voter: &signer,
+        stake_pools: vector<address>,
+        proposal_id: u64,
+        should_pass: bool,
+    ) {
+        // TODO: Temporary mockup. Specify the `for_each` statement.
+        pragma verify = false;
+    }
+
+    spec batch_partial_vote(
+        voter: &signer,
+        stake_pools: vector<address>,
+        proposal_id: u64,
+        voting_power: u64,
+        should_pass: bool,
+    ) {
+        // TODO: Temporary mockup. Specify the `for_each` statement.
+        pragma verify = false;
+    }
 }
diff --git a/aptos-move/framework/aptos-framework/sources/code.move b/aptos-move/framework/aptos-framework/sources/code.move
index 181c12b94625f..ef884c9695d1c 100644
--- a/aptos-move/framework/aptos-framework/sources/code.move
+++ b/aptos-move/framework/aptos-framework/sources/code.move
@@ -24,7 +24,7 @@ module aptos_framework::code {
     }
 
     /// Metadata for a package. All byte blobs are represented as base64-of-gzipped-bytes
-    struct PackageMetadata has store, drop {
+    struct PackageMetadata has copy, drop, store {
         /// Name of this package.
         name: String,
         /// The upgrade policy of this package.
@@ -52,7 +52,7 @@ module aptos_framework::code {
     }
 
     /// Metadata about a module in a package.
-    struct ModuleMetadata has store, drop {
+    struct ModuleMetadata has copy, drop, store {
         /// Name of the module.
         name: String,
         /// Source text, gzipped String. Empty if not provided.
@@ -214,10 +214,18 @@ module aptos_framework::code {
         );
 
         let registry = borrow_global_mut<PackageRegistry>(code_object_addr);
-        vector::for_each_mut<PackageMetadata>(&mut registry.packages, |pack| {
+        vector::for_each_mut(&mut registry.packages, |pack| {
             let package: &mut PackageMetadata = pack;
             package.upgrade_policy = upgrade_policy_immutable();
         });
+
+        // We unfortunately have to make a copy of each package to avoid borrow checker issues as check_dependencies
+        // needs to borrow PackageRegistry from the dependency packages.
+        // This would increase the amount of gas used, but this is a rare operation and it's rare to have many packages
+        // in a single code object.
+        vector::for_each(registry.packages, |pack| {
+            check_dependencies(code_object_addr, &pack);
+        });
     }
 
     /// Same as `publish_package` but as an entry function which can be called as a transaction. Because
diff --git a/aptos-move/framework/aptos-framework/sources/coin.move b/aptos-move/framework/aptos-framework/sources/coin.move
index 9988f467cbde9..91a54edb7fddd 100644
--- a/aptos-move/framework/aptos-framework/sources/coin.move
+++ b/aptos-move/framework/aptos-framework/sources/coin.move
@@ -1,10 +1,10 @@
 /// This module provides the foundation for typesafe Coins.
 module aptos_framework::coin {
-    use std::string;
     use std::error;
     use std::features;
     use std::option::{Self, Option};
     use std::signer;
+    use std::string::{Self, String};
     use aptos_std::table::{Self, Table};
 
     use aptos_framework::account;
@@ -18,10 +18,8 @@ module aptos_framework::coin {
     use aptos_framework::fungible_asset::{Self, FungibleAsset, Metadata, MintRef, TransferRef, BurnRef};
     use aptos_framework::object::{Self, Object, object_address};
     use aptos_framework::primary_fungible_store;
-    use aptos_std::type_info::{Self, TypeInfo};
+    use aptos_std::type_info::{Self, TypeInfo, type_name};
     use aptos_framework::create_signer;
-    #[test_only]
-    use std::string::String;
 
     friend aptos_framework::aptos_coin;
     friend aptos_framework::genesis;
@@ -155,10 +153,10 @@ module aptos_framework::coin {
 
     /// Information about a specific coin type. Stored on the creator of the coin's account.
     struct CoinInfo<phantom CoinType> has key {
-        name: string::String,
+        name: String,
         /// Symbol of the coin, usually a shorter version of the name.
         /// For example, Singapore Dollar is SGD.
-        symbol: string::String,
+        symbol: String,
         /// Number of decimals used to get its user representation.
         /// For example, if `decimals` equals `2`, a balance of `505` coins should
         /// be displayed to a user as `5.05` (`505 / 10 ** 2`).
@@ -167,30 +165,50 @@ module aptos_framework::coin {
         supply: Option<OptionalAggregator>,
     }
 
-    /// Event emitted when some amount of a coin is deposited into an account.
-    struct DepositEvent has drop, store {
+
+    #[event]
+    /// Module event emitted when some amount of a coin is deposited into an account.
+    struct CoinDeposit has drop, store {
+        coin_type: String,
+        account: address,
         amount: u64,
     }
 
     #[event]
-    /// Module event emitted when some amount of a coin is deposited into an account.
-    struct Deposit<phantom CoinType> has drop, store {
+    /// Module event emitted when some amount of a coin is withdrawn from an account.
+    struct CoinWithdraw has drop, store {
+        coin_type: String,
         account: address,
         amount: u64,
     }
 
-    /// Event emitted when some amount of a coin is withdrawn from an account.
-    struct WithdrawEvent has drop, store {
+    // DEPRECATED, NEVER USED
+    #[deprecated]
+    #[event]
+    struct Deposit<phantom CoinType> has drop, store {
+        account: address,
         amount: u64,
     }
 
+    // DEPRECATED, NEVER USED
+    #[deprecated]
     #[event]
-    /// Module event emitted when some amount of a coin is withdrawn from an account.
     struct Withdraw<phantom CoinType> has drop, store {
         account: address,
         amount: u64,
     }
 
+    /// Event emitted when some amount of a coin is deposited into an account.
+    struct DepositEvent has drop, store {
+        amount: u64,
+    }
+
+    /// Event emitted when some amount of a coin is withdrawn from an account.
+    struct WithdrawEvent has drop, store {
+        amount: u64,
+    }
+
+
     #[event]
     /// Module event emitted when the event handles related to coin store is deleted.
     struct CoinEventHandleDeletion has drop, store {
@@ -310,7 +328,7 @@ module aptos_framework::coin {
                 };
             primary_fungible_store::create_primary_store_enabled_fungible_asset(
                 &metadata_object_cref,
-                option::map(coin_supply<CoinType>(), |_| MAX_U128),
+                option::none(),
                 name<CoinType>(),
                 symbol<CoinType>(),
                 decimals<CoinType>(),
@@ -480,6 +498,20 @@ module aptos_framework::coin {
         (option::extract(burn_ref_opt), BurnRefReceipt { metadata })
     }
 
+    // Permanently convert to BurnRef, and take it from the pairing.
+    // (i.e. future calls to borrow/convert BurnRef will fail)
+    public fun convert_and_take_paired_burn_ref<CoinType>(
+        burn_cap: BurnCapability<CoinType>
+    ): BurnRef acquires CoinConversionMap, PairedFungibleAssetRefs {
+        destroy_burn_cap(burn_cap);
+        let metadata = assert_paired_metadata_exists<CoinType>();
+        let metadata_addr = object_address(&metadata);
+        assert!(exists<PairedFungibleAssetRefs>(metadata_addr), error::internal(EPAIRED_FUNGIBLE_ASSET_REFS_NOT_FOUND));
+        let burn_ref_opt = &mut borrow_global_mut<PairedFungibleAssetRefs>(metadata_addr).burn_ref_opt;
+        assert!(option::is_some(burn_ref_opt), error::not_found(EBURN_REF_NOT_FOUND));
+        option::extract(burn_ref_opt)
+    }
+
     /// Return the `BurnRef` with the hot potato receipt.
     public fun return_paired_burn_ref(
         burn_ref: BurnRef,
@@ -865,7 +897,9 @@ module aptos_framework::coin {
                 error::permission_denied(EFROZEN),
             );
             if (std::features::module_event_migration_enabled()) {
-                event::emit(Deposit<CoinType> { account: account_addr, amount: coin.value });
+                event::emit(
+                    CoinDeposit { coin_type: type_name<CoinType>(), account: account_addr, amount: coin.value }
+                );
             };
             event::emit_event<DepositEvent>(
                 &mut coin_store.deposit_events,
@@ -890,7 +924,10 @@ module aptos_framework::coin {
         metadata: Object<Metadata>
     ): bool {
         let primary_store_address = primary_fungible_store::primary_store_address<Metadata>(account_address, metadata);
-        fungible_asset::store_exists(primary_store_address) && exists<MigrationFlag>(primary_store_address)
+        fungible_asset::store_exists(primary_store_address) && (
+            // migration flag is needed, until we start defaulting new accounts to APT PFS
+            features::new_accounts_default_to_fa_apt_store_enabled() || exists<MigrationFlag>(primary_store_address)
+        )
     }
 
     /// Deposit the coin balance into the recipient's account without checking if the account is frozen.
@@ -911,7 +948,7 @@ module aptos_framework::coin {
                 let fa = coin_to_fungible_asset(coin);
                 let metadata = fungible_asset::asset_metadata(&fa);
                 let store = primary_fungible_store::primary_store(account_addr, metadata);
-                fungible_asset::deposit_internal(store, fa);
+                fungible_asset::deposit_internal(object::object_address(&store), fa);
             } else {
                 abort error::not_found(ECOIN_STORE_NOT_PUBLISHED)
             }
@@ -1142,7 +1179,11 @@ module aptos_framework::coin {
                 error::permission_denied(EFROZEN),
             );
             if (std::features::module_event_migration_enabled()) {
-                event::emit(Withdraw<CoinType> { account: account_addr, amount: coin_amount_to_withdraw });
+                event::emit(
+                    CoinWithdraw {
+                        coin_type: type_name<CoinType>(), account: account_addr, amount: coin_amount_to_withdraw
+                    }
+                );
             };
             event::emit_event<WithdrawEvent>(
                 &mut coin_store.withdraw_events,
@@ -2039,6 +2080,7 @@ module aptos_framework::coin {
         let (mint_ref, mint_ref_receipt) = get_paired_mint_ref(&mint_cap);
         let (burn_ref, burn_ref_receipt) = get_paired_burn_ref(&burn_cap);
         let fungible_asset = fungible_asset::mint(&mint_ref, 50);
+        assert!(option::is_none(&fungible_asset::maximum(ensure_paired_metadata<FakeMoney>())), 0);
         assert!(supply<FakeMoney>() == option::some(150), 0);
         assert!(coin_supply<FakeMoney>() == option::some(100), 0);
         assert!(fungible_asset::supply(ensure_paired_metadata<FakeMoney>()) == option::some(50), 0);
diff --git a/aptos-move/framework/aptos-framework/sources/configs/gas_schedule.move b/aptos-move/framework/aptos-framework/sources/configs/gas_schedule.move
index 87d6cf4c72adc..9156c1ae2574e 100644
--- a/aptos-move/framework/aptos-framework/sources/configs/gas_schedule.move
+++ b/aptos-move/framework/aptos-framework/sources/configs/gas_schedule.move
@@ -1,9 +1,11 @@
 /// This module defines structs and methods to initialize the gas schedule, which dictates how much
 /// it costs to execute Move on the network.
 module aptos_framework::gas_schedule {
+    use std::bcs;
     use std::error;
     use std::string::String;
     use std::vector;
+    use aptos_std::aptos_hash;
     use aptos_framework::chain_status;
     use aptos_framework::config_buffer;
 
@@ -21,6 +23,7 @@ module aptos_framework::gas_schedule {
     /// The provided gas schedule bytes are empty or invalid
     const EINVALID_GAS_SCHEDULE: u64 = 1;
     const EINVALID_GAS_FEATURE_VERSION: u64 = 2;
+    const EINVALID_GAS_SCHEDULE_HASH: u64 = 3;
 
     struct GasEntry has store, copy, drop {
         key: String,
@@ -99,6 +102,35 @@ module aptos_framework::gas_schedule {
         config_buffer::upsert(new_gas_schedule);
     }
 
+    /// Set the gas schedule for the next epoch, typically called by on-chain governance.
+    /// Abort if the version of the given schedule is lower than the current version.
+    /// Require a hash of the old gas schedule to be provided and will abort if the hashes mismatch.
+    public fun set_for_next_epoch_check_hash(
+        aptos_framework: &signer,
+        old_gas_schedule_hash: vector<u8>,
+        new_gas_schedule_blob: vector<u8>
+    ) acquires GasScheduleV2 {
+        system_addresses::assert_aptos_framework(aptos_framework);
+        assert!(!vector::is_empty(&new_gas_schedule_blob), error::invalid_argument(EINVALID_GAS_SCHEDULE));
+
+        let new_gas_schedule: GasScheduleV2 = from_bytes(new_gas_schedule_blob);
+        if (exists<GasScheduleV2>(@aptos_framework)) {
+            let cur_gas_schedule = borrow_global<GasScheduleV2>(@aptos_framework);
+            assert!(
+                new_gas_schedule.feature_version >= cur_gas_schedule.feature_version,
+                error::invalid_argument(EINVALID_GAS_FEATURE_VERSION)
+            );
+            let cur_gas_schedule_bytes = bcs::to_bytes(cur_gas_schedule);
+            let cur_gas_schedule_hash = aptos_hash::sha3_512(cur_gas_schedule_bytes);
+            assert!(
+                cur_gas_schedule_hash == old_gas_schedule_hash,
+                error::invalid_argument(EINVALID_GAS_SCHEDULE_HASH)
+            );
+        };
+
+        config_buffer::upsert(new_gas_schedule);
+    }
+
     /// Only used in reconfigurations to apply the pending `GasScheduleV2`, if there is any.
     public(friend) fun on_new_epoch(framework: &signer) acquires GasScheduleV2 {
         system_addresses::assert_aptos_framework(framework);
diff --git a/aptos-move/framework/aptos-framework/sources/configs/gas_schedule.spec.move b/aptos-move/framework/aptos-framework/sources/configs/gas_schedule.spec.move
index 1d59784d22504..7ce238f7b9959 100644
--- a/aptos-move/framework/aptos-framework/sources/configs/gas_schedule.spec.move
+++ b/aptos-move/framework/aptos-framework/sources/configs/gas_schedule.spec.move
@@ -107,6 +107,23 @@ spec aptos_framework::gas_schedule {
         aborts_if exists<GasScheduleV2>(@aptos_framework) && new_gas_schedule.feature_version < cur_gas_schedule.feature_version;
     }
 
+    spec set_for_next_epoch_check_hash(aptos_framework: &signer, old_gas_schedule_hash: vector<u8>, new_gas_schedule_blob: vector<u8>) {
+        use aptos_std::aptos_hash;
+        use std::bcs;
+        use std::features;
+        use aptos_framework::util;
+
+        include system_addresses::AbortsIfNotAptosFramework{ account: aptos_framework };
+        include config_buffer::SetForNextEpochAbortsIf {
+            account: aptos_framework,
+            config: new_gas_schedule_blob
+        };
+        let new_gas_schedule = util::spec_from_bytes<GasScheduleV2>(new_gas_schedule_blob);
+        let cur_gas_schedule = global<GasScheduleV2>(@aptos_framework);
+        aborts_if exists<GasScheduleV2>(@aptos_framework) && new_gas_schedule.feature_version < cur_gas_schedule.feature_version;
+        aborts_if exists<GasScheduleV2>(@aptos_framework) && (!features::spec_sha_512_and_ripemd_160_enabled() || aptos_hash::spec_sha3_512_internal(bcs::serialize(cur_gas_schedule)) != old_gas_schedule_hash);
+    }
+
     spec on_new_epoch(framework: &signer) {
         requires @aptos_framework == std::signer::address_of(framework);
         include config_buffer::OnNewEpochRequirement<GasScheduleV2>;
diff --git a/aptos-move/framework/aptos-framework/sources/configs/staking_config.move b/aptos-move/framework/aptos-framework/sources/configs/staking_config.move
index bf0b1ed7fcf3d..aff41b494f8c9 100644
--- a/aptos-move/framework/aptos-framework/sources/configs/staking_config.move
+++ b/aptos-move/framework/aptos-framework/sources/configs/staking_config.move
@@ -134,6 +134,12 @@ module aptos_framework::staking_config {
         });
     }
 
+    #[view]
+    /// Return the reward rate of this epoch as a tuple (numerator, denominator).
+    public fun reward_rate(): (u64, u64) acquires StakingRewardsConfig, StakingConfig {
+        get_reward_rate(borrow_global<StakingConfig>(@aptos_framework))
+    }
+
     /// Initialize rewards configurations.
     /// Can only be called as part of the Aptos governance proposal process established by the AptosGovernance module.
     public fun initialize_rewards(
diff --git a/aptos-move/framework/aptos-framework/sources/configs/staking_config.spec.move b/aptos-move/framework/aptos-framework/sources/configs/staking_config.spec.move
index a150e401db9ce..270abef9cec86 100644
--- a/aptos-move/framework/aptos-framework/sources/configs/staking_config.spec.move
+++ b/aptos-move/framework/aptos-framework/sources/configs/staking_config.spec.move
@@ -155,6 +155,15 @@ spec aptos_framework::staking_config {
                 result_1 <= MAX_REWARDS_RATE && result_2 <= MAX_U64;
     }
 
+    spec reward_rate(): (u64, u64) {
+        let config = global<StakingConfig>(@aptos_framework);
+        aborts_if !exists<StakingConfig>(@aptos_framework);
+        include StakingRewardsConfigRequirement;
+        ensures (features::spec_periodical_reward_rate_decrease_enabled() &&
+            (global<StakingRewardsConfig>(@aptos_framework).rewards_rate.value as u64) != 0) ==>
+            result_1 <= MAX_REWARDS_RATE && result_2 <= MAX_U64;
+    }
+
     spec calculate_and_save_latest_epoch_rewards_rate(): FixedPoint64 {
         pragma verify_duration_estimate = 120;
         aborts_if !exists<StakingRewardsConfig>(@aptos_framework);
diff --git a/aptos-move/framework/aptos-framework/sources/create_signer.move b/aptos-move/framework/aptos-framework/sources/create_signer.move
index 7aa57733f62aa..3da0c50c904f0 100644
--- a/aptos-move/framework/aptos-framework/sources/create_signer.move
+++ b/aptos-move/framework/aptos-framework/sources/create_signer.move
@@ -12,6 +12,7 @@ module aptos_framework::create_signer {
     friend aptos_framework::account;
     friend aptos_framework::aptos_account;
     friend aptos_framework::coin;
+    friend aptos_framework::fungible_asset;
     friend aptos_framework::genesis;
     friend aptos_framework::multisig_account;
     friend aptos_framework::object;
diff --git a/aptos-move/framework/aptos-framework/sources/dispatchable_fungible_asset.move b/aptos-move/framework/aptos-framework/sources/dispatchable_fungible_asset.move
index df56bc053c095..5a70aff95d2c1 100644
--- a/aptos-move/framework/aptos-framework/sources/dispatchable_fungible_asset.move
+++ b/aptos-move/framework/aptos-framework/sources/dispatchable_fungible_asset.move
@@ -58,6 +58,16 @@ module aptos_framework::dispatchable_fungible_asset {
         );
     }
 
+    public fun register_derive_supply_dispatch_function(
+        constructor_ref: &ConstructorRef,
+        dispatch_function: Option<FunctionInfo>
+    ) {
+        fungible_asset::register_derive_supply_dispatch_function(
+            constructor_ref,
+            dispatch_function
+        );
+    }
+
     /// Withdraw `amount` of the fungible asset from `store` by the owner.
     ///
     /// The semantics of deposit will be governed by the function specified in DispatchFunctionStore.
@@ -110,7 +120,7 @@ module aptos_framework::dispatchable_fungible_asset {
                 func
             )
         } else {
-            fungible_asset::deposit_internal(store, fa)
+            fungible_asset::deposit_internal(object::object_address(&store), fa)
         }
     }
 
@@ -162,6 +172,25 @@ module aptos_framework::dispatchable_fungible_asset {
         }
     }
 
+    #[view]
+    /// Get the derived supply of the fungible asset using the overloaded hook.
+    ///
+    /// The semantics of supply will be governed by the function specified in DeriveSupplyDispatch.
+    public fun derived_supply<T: key>(metadata: Object<T>): Option<u128> {
+        let func_opt = fungible_asset::derived_supply_dispatch_function(metadata);
+        if (option::is_some(&func_opt)) {
+            assert!(
+                features::dispatchable_fungible_asset_enabled(),
+                error::aborted(ENOT_ACTIVATED)
+            );
+            let func = option::borrow(&func_opt);
+            function_info::load_module_from_function(func);
+            dispatchable_derived_supply(metadata, func)
+        } else {
+            fungible_asset::supply(metadata)
+        }
+    }
+
     inline fun borrow_transfer_ref<T: key>(metadata: Object<T>): &TransferRef acquires TransferRefStore {
         let metadata_addr = object::object_address(
             &fungible_asset::store_metadata(metadata)
@@ -191,4 +220,9 @@ module aptos_framework::dispatchable_fungible_asset {
         store: Object<T>,
         function: &FunctionInfo,
     ): u64;
+
+    native fun dispatchable_derived_supply<T: key>(
+        store: Object<T>,
+        function: &FunctionInfo,
+    ): Option<u128>;
 }
diff --git a/aptos-move/framework/aptos-framework/sources/dispatchable_fungible_asset.spec.move b/aptos-move/framework/aptos-framework/sources/dispatchable_fungible_asset.spec.move
index 5932673f6041c..744faced798ac 100644
--- a/aptos-move/framework/aptos-framework/sources/dispatchable_fungible_asset.spec.move
+++ b/aptos-move/framework/aptos-framework/sources/dispatchable_fungible_asset.spec.move
@@ -14,4 +14,8 @@ spec aptos_framework::dispatchable_fungible_asset {
     spec dispatchable_derived_balance{
         pragma opaque;
     }
+
+    spec dispatchable_derived_supply{
+        pragma opaque;
+    }
 }
diff --git a/aptos-move/framework/aptos-framework/sources/fungible_asset.move b/aptos-move/framework/aptos-framework/sources/fungible_asset.move
index 8c0df05bcefca..946d7b05eb415 100644
--- a/aptos-move/framework/aptos-framework/sources/fungible_asset.move
+++ b/aptos-move/framework/aptos-framework/sources/fungible_asset.move
@@ -2,6 +2,7 @@
 /// metadata object can be any object that equipped with `Metadata` resource.
 module aptos_framework::fungible_asset {
     use aptos_framework::aggregator_v2::{Self, Aggregator};
+    use aptos_framework::create_signer;
     use aptos_framework::event;
     use aptos_framework::function_info::{Self, FunctionInfo};
     use aptos_framework::object::{Self, Object, ConstructorRef, DeleteRef, ExtendRef};
@@ -15,6 +16,7 @@ module aptos_framework::fungible_asset {
 
     friend aptos_framework::coin;
     friend aptos_framework::primary_fungible_store;
+    friend aptos_framework::aptos_account;
 
     friend aptos_framework::dispatchable_fungible_asset;
 
@@ -81,6 +83,10 @@ module aptos_framework::fungible_asset {
     const EFUNGIBLE_METADATA_EXISTENCE: u64 = 30;
     /// Cannot register dispatch hook for APT.
     const EAPT_NOT_DISPATCHABLE: u64 = 31;
+    /// Flag for Concurrent Supply not enabled
+    const ECONCURRENT_BALANCE_NOT_ENABLED: u64 = 32;
+    /// Provided derived_supply function type doesn't meet the signature requirement.
+    const EDERIVED_SUPPLY_FUNCTION_SIGNATURE_MISMATCH: u64 = 33;
 
     //
     // Constants
@@ -108,7 +114,7 @@ module aptos_framework::fungible_asset {
 
     #[resource_group_member(group = aptos_framework::object::ObjectGroup)]
     /// Metadata of a Fungible asset
-    struct Metadata has key {
+    struct Metadata has key, copy, drop {
         /// Name of the fungible metadata, i.e., "USDT".
         name: String,
         /// Symbol of the fungible metadata, usually a shorter version of the name.
@@ -148,6 +154,18 @@ module aptos_framework::fungible_asset {
         derived_balance_function: Option<FunctionInfo>,
     }
 
+    #[resource_group_member(group = aptos_framework::object::ObjectGroup)]
+    struct DeriveSupply has key {
+        dispatch_function: Option<FunctionInfo>
+    }
+
+    #[resource_group_member(group = aptos_framework::object::ObjectGroup)]
+    /// The store object that holds concurrent fungible asset balance.
+    struct ConcurrentFungibleBalance has key {
+        /// The balance of the fungible metadata.
+        balance: Aggregator<u64>,
+    }
+
     /// FungibleAsset can be passed into function for type safety and to guarantee a specific amount.
     /// FungibleAsset is ephemeral and cannot be stored directly. It must be deposited back into a store.
     struct FungibleAsset {
@@ -171,6 +189,11 @@ module aptos_framework::fungible_asset {
         metadata: Object<Metadata>
     }
 
+    /// MutateMetadataRef can be used to directly modify the fungible asset's Metadata.
+    struct MutateMetadataRef has drop, store {
+        metadata: Object<Metadata>
+    }
+
     #[event]
     /// Emitted when fungible assets are deposited into a store.
     struct Deposit has drop, store {
@@ -192,6 +215,18 @@ module aptos_framework::fungible_asset {
         frozen: bool,
     }
 
+    inline fun default_to_concurrent_fungible_supply(): bool {
+        features::concurrent_fungible_assets_enabled()
+    }
+
+    inline fun allow_upgrade_to_concurrent_fungible_balance(): bool {
+        features::concurrent_fungible_balance_enabled()
+    }
+
+    inline fun default_to_concurrent_fungible_balance(): bool {
+        features::default_to_concurrent_fungible_balance_enabled()
+    }
+
     /// Make an existing object fungible by adding the Metadata resource.
     /// This returns the capabilities to mint, burn, and transfer.
     /// maximum_supply defines the behavior of maximum supply when monitoring:
@@ -225,7 +260,7 @@ module aptos_framework::fungible_asset {
             }
         );
 
-        if (features::concurrent_fungible_assets_enabled()) {
+        if (default_to_concurrent_fungible_supply()) {
             let unlimited = option::is_none(&maximum_supply);
             move_to(metadata_object_signer, ConcurrentSupply {
                 current: if (unlimited) {
@@ -320,28 +355,13 @@ module aptos_framework::fungible_asset {
                 )
             );
         });
-
-        // Cannot register hook for APT.
-        assert!(
-            object::address_from_constructor_ref(constructor_ref) != @aptos_fungible_asset,
-            error::permission_denied(EAPT_NOT_DISPATCHABLE)
-        );
-        assert!(
-            !object::can_generate_delete_ref(constructor_ref),
-            error::invalid_argument(EOBJECT_IS_DELETABLE)
-        );
+        register_dispatch_function_sanity_check(constructor_ref);
         assert!(
             !exists<DispatchFunctionStore>(
                 object::address_from_constructor_ref(constructor_ref)
             ),
             error::already_exists(EALREADY_REGISTERED)
         );
-        assert!(
-            exists<Metadata>(
-                object::address_from_constructor_ref(constructor_ref)
-            ),
-            error::not_found(EFUNGIBLE_METADATA_EXISTENCE),
-        );
 
         let store_obj = &object::generate_signer(constructor_ref);
 
@@ -356,6 +376,70 @@ module aptos_framework::fungible_asset {
         );
     }
 
+    /// Define the derived supply dispatch with the provided function.
+    public(friend) fun register_derive_supply_dispatch_function(
+        constructor_ref: &ConstructorRef,
+        dispatch_function: Option<FunctionInfo>
+    ) {
+        // Verify that caller type matches callee type so wrongly typed function cannot be registered.
+        option::for_each_ref(&dispatch_function, |supply_function| {
+            let function_info = function_info::new_function_info_from_address(
+                @aptos_framework,
+                string::utf8(b"dispatchable_fungible_asset"),
+                string::utf8(b"dispatchable_derived_supply"),
+            );
+            // Verify that caller type matches callee type so wrongly typed function cannot be registered.
+            assert!(
+                function_info::check_dispatch_type_compatibility(
+                    &function_info,
+                    supply_function
+                ),
+                error::invalid_argument(
+                    EDERIVED_SUPPLY_FUNCTION_SIGNATURE_MISMATCH
+                )
+            );
+        });
+        register_dispatch_function_sanity_check(constructor_ref);
+        assert!(
+            !exists<DeriveSupply>(
+                object::address_from_constructor_ref(constructor_ref)
+            ),
+            error::already_exists(EALREADY_REGISTERED)
+        );
+
+
+        let store_obj = &object::generate_signer(constructor_ref);
+
+        // Store the overload function hook.
+        move_to<DeriveSupply>(
+            store_obj,
+            DeriveSupply {
+                dispatch_function
+            }
+        );
+    }
+
+    /// Check the requirements for registering a dispatchable function.
+    inline fun register_dispatch_function_sanity_check(
+        constructor_ref: &ConstructorRef,
+    )  {
+        // Cannot register hook for APT.
+        assert!(
+            object::address_from_constructor_ref(constructor_ref) != @aptos_fungible_asset,
+            error::permission_denied(EAPT_NOT_DISPATCHABLE)
+        );
+        assert!(
+            !object::can_generate_delete_ref(constructor_ref),
+            error::invalid_argument(EOBJECT_IS_DELETABLE)
+        );
+        assert!(
+            exists<Metadata>(
+                object::address_from_constructor_ref(constructor_ref)
+            ),
+            error::not_found(EFUNGIBLE_METADATA_EXISTENCE),
+        );
+    }
+
     /// Creates a mint ref that can be used to mint fungible assets from the given fungible object's constructor ref.
     /// This can only be called at object creation time as constructor_ref is only available then.
     public fun generate_mint_ref(constructor_ref: &ConstructorRef): MintRef {
@@ -378,6 +462,14 @@ module aptos_framework::fungible_asset {
         TransferRef { metadata }
     }
 
+    /// Creates a mutate metadata ref that can be used to change the metadata information of fungible assets from the
+    /// given fungible object's constructor ref.
+    /// This can only be called at object creation time as constructor_ref is only available then.
+    public fun generate_mutate_metadata_ref(constructor_ref: &ConstructorRef): MutateMetadataRef {
+        let metadata = object::object_from_constructor_ref<Metadata>(constructor_ref);
+        MutateMetadataRef { metadata }
+    }
+
     #[view]
     /// Get the current supply from the `metadata` object.
     public fun supply<T: key>(metadata: Object<T>): Option<u128> acquires Supply, ConcurrentSupply {
@@ -432,12 +524,41 @@ module aptos_framework::fungible_asset {
         borrow_fungible_metadata(&metadata).decimals
     }
 
+    #[view]
+    /// Get the icon uri from the `metadata` object.
+    public fun icon_uri<T: key>(metadata: Object<T>): String acquires Metadata {
+        borrow_fungible_metadata(&metadata).icon_uri
+    }
+
+    #[view]
+    /// Get the project uri from the `metadata` object.
+    public fun project_uri<T: key>(metadata: Object<T>): String acquires Metadata {
+        borrow_fungible_metadata(&metadata).project_uri
+    }
+
+    #[view]
+    /// Get the metadata struct from the `metadata` object.
+    public fun metadata<T: key>(metadata: Object<T>): Metadata acquires Metadata {
+        *borrow_fungible_metadata(&metadata)
+    }
+
     #[view]
     /// Return whether the provided address has a store initialized.
     public fun store_exists(store: address): bool {
+        store_exists_inline(store)
+    }
+
+    /// Return whether the provided address has a store initialized.
+    inline fun store_exists_inline(store: address): bool {
         exists<FungibleStore>(store)
     }
 
+    /// Return whether the provided address has a concurrent fungible balance initialized,
+    /// at the fungible store address.
+    inline fun concurrent_fungible_balance_exists_inline(store: address): bool {
+        exists<ConcurrentFungibleBalance>(store)
+    }
+
     /// Return the underlying metadata object
     public fun metadata_from_asset(fa: &FungibleAsset): Object<Metadata> {
         fa.metadata
@@ -456,9 +577,16 @@ module aptos_framework::fungible_asset {
 
     #[view]
     /// Get the balance of a given store.
-    public fun balance<T: key>(store: Object<T>): u64 acquires FungibleStore {
-        if (store_exists(object::object_address(&store))) {
-            borrow_store_resource(&store).balance
+    public fun balance<T: key>(store: Object<T>): u64 acquires FungibleStore, ConcurrentFungibleBalance {
+        let store_addr = object::object_address(&store);
+        if (store_exists_inline(store_addr)) {
+            let store_balance = borrow_store_resource(&store).balance;
+            if (store_balance == 0 && concurrent_fungible_balance_exists_inline(store_addr)) {
+                let balance_resource = borrow_global<ConcurrentFungibleBalance>(store_addr);
+                aggregator_v2::read(&balance_resource.balance)
+            } else {
+                store_balance
+            }
         } else {
             0
         }
@@ -466,10 +594,21 @@ module aptos_framework::fungible_asset {
 
     #[view]
     /// Check whether the balance of a given store is >= `amount`.
-    public fun is_balance_at_least<T: key>(store: Object<T>, amount: u64): bool acquires FungibleStore {
+    public fun is_balance_at_least<T: key>(store: Object<T>, amount: u64): bool acquires FungibleStore, ConcurrentFungibleBalance {
         let store_addr = object::object_address(&store);
-        if (store_exists(store_addr)) {
-            borrow_store_resource(&store).balance >= amount
+        is_address_balance_at_least(store_addr, amount)
+    }
+
+    /// Check whether the balance of a given store is >= `amount`.
+    public(friend) fun is_address_balance_at_least(store_addr: address, amount: u64): bool acquires FungibleStore, ConcurrentFungibleBalance {
+        if (store_exists_inline(store_addr)) {
+            let store_balance = borrow_global<FungibleStore>(store_addr).balance;
+            if (store_balance == 0 && concurrent_fungible_balance_exists_inline(store_addr)) {
+                let balance_resource = borrow_global<ConcurrentFungibleBalance>(store_addr);
+                aggregator_v2::is_at_least(&balance_resource.balance, amount)
+            } else {
+                store_balance >= amount
+            }
         } else {
             amount == 0
         }
@@ -480,7 +619,8 @@ module aptos_framework::fungible_asset {
     ///
     /// If the store has not been created, we default to returning false so deposits can be sent to it.
     public fun is_frozen<T: key>(store: Object<T>): bool acquires FungibleStore {
-        store_exists(object::object_address(&store)) && borrow_store_resource(&store).frozen
+        let store_addr = object::object_address(&store);
+        store_exists_inline(store_addr) && borrow_global<FungibleStore>(store_addr).frozen
     }
 
     #[view]
@@ -541,6 +681,15 @@ module aptos_framework::fungible_asset {
         }
     }
 
+    public(friend) fun derived_supply_dispatch_function<T: key>(metadata: Object<T>): Option<FunctionInfo> acquires DeriveSupply {
+        let metadata_addr = object::object_address(&metadata);
+        if (exists<DeriveSupply>(metadata_addr)) {
+            borrow_global<DeriveSupply>(metadata_addr).dispatch_function
+        } else {
+            option::none()
+        }
+    }
+
     public fun asset_metadata(fa: &FungibleAsset): Object<Metadata> {
         fa.metadata
     }
@@ -560,6 +709,11 @@ module aptos_framework::fungible_asset {
         ref.metadata
     }
 
+    /// Get the underlying metadata object from the `MutateMetadataRef`.
+    public fun object_from_metadata_ref(ref: &MutateMetadataRef): Object<Metadata> {
+        ref.metadata
+    }
+
     /// Transfer an `amount` of fungible asset from `from_store`, which should be owned by `sender`, to `receiver`.
     /// Note: it does not move the underlying object.
     public entry fun transfer<T: key>(
@@ -567,7 +721,7 @@ module aptos_framework::fungible_asset {
         from: Object<T>,
         to: Object<T>,
         amount: u64,
-    ) acquires FungibleStore, DispatchFunctionStore {
+    ) acquires FungibleStore, DispatchFunctionStore, ConcurrentFungibleBalance {
         let fa = withdraw(sender, from, amount);
         deposit(to, fa);
     }
@@ -584,19 +738,33 @@ module aptos_framework::fungible_asset {
             balance: 0,
             frozen: false,
         });
+
         if (is_untransferable(metadata)) {
             object::set_untransferable(constructor_ref);
         };
+
+        if (default_to_concurrent_fungible_balance()) {
+            move_to(store_obj, ConcurrentFungibleBalance {
+                balance: aggregator_v2::create_unbounded_aggregator(),
+            });
+        };
+
         object::object_from_constructor_ref<FungibleStore>(constructor_ref)
     }
 
     /// Used to delete a store.  Requires the store to be completely empty prior to removing it
-    public fun remove_store(delete_ref: &DeleteRef) acquires FungibleStore, FungibleAssetEvents {
+    public fun remove_store(delete_ref: &DeleteRef) acquires FungibleStore, FungibleAssetEvents, ConcurrentFungibleBalance {
         let store = &object::object_from_delete_ref<FungibleStore>(delete_ref);
         let addr = object::object_address(store);
         let FungibleStore { metadata: _, balance, frozen: _ }
             = move_from<FungibleStore>(addr);
         assert!(balance == 0, error::permission_denied(EBALANCE_IS_NOT_ZERO));
+
+        if (concurrent_fungible_balance_exists_inline(addr)) {
+            let ConcurrentFungibleBalance { balance } = move_from<ConcurrentFungibleBalance>(addr);
+            assert!(aggregator_v2::read(&balance) == 0, error::permission_denied(EBALANCE_IS_NOT_ZERO));
+        };
+
         // Cleanup deprecated event handles if exist.
         if (exists<FungibleAssetEvents>(addr)) {
             let FungibleAssetEvents {
@@ -607,7 +775,7 @@ module aptos_framework::fungible_asset {
             event::destroy_handle(deposit_events);
             event::destroy_handle(withdraw_events);
             event::destroy_handle(frozen_events);
-        }
+        };
     }
 
     /// Withdraw `amount` of the fungible asset from `store` by the owner.
@@ -615,7 +783,7 @@ module aptos_framework::fungible_asset {
         owner: &signer,
         store: Object<T>,
         amount: u64,
-    ): FungibleAsset acquires FungibleStore, DispatchFunctionStore {
+    ): FungibleAsset acquires FungibleStore, DispatchFunctionStore, ConcurrentFungibleBalance {
         withdraw_sanity_check(owner, store, true);
         withdraw_internal(object::object_address(&store), amount)
     }
@@ -649,9 +817,9 @@ module aptos_framework::fungible_asset {
     }
 
     /// Deposit `amount` of the fungible asset to `store`.
-    public fun deposit<T: key>(store: Object<T>, fa: FungibleAsset) acquires FungibleStore, DispatchFunctionStore {
+    public fun deposit<T: key>(store: Object<T>, fa: FungibleAsset) acquires FungibleStore, DispatchFunctionStore, ConcurrentFungibleBalance {
         deposit_sanity_check(store, true);
-        deposit_internal(store, fa);
+        deposit_internal(object::object_address(&store), fa);
     }
 
     /// Mint the specified `amount` of the fungible asset.
@@ -674,9 +842,9 @@ module aptos_framework::fungible_asset {
 
     /// Mint the specified `amount` of the fungible asset to a destination store.
     public fun mint_to<T: key>(ref: &MintRef, store: Object<T>, amount: u64)
-    acquires FungibleStore, Supply, ConcurrentSupply, DispatchFunctionStore {
+    acquires FungibleStore, Supply, ConcurrentSupply, DispatchFunctionStore, ConcurrentFungibleBalance {
         deposit_sanity_check(store, false);
-        deposit_internal(store, mint(ref, amount));
+        deposit_internal(object::object_address(&store), mint(ref, amount));
     }
 
     /// Enable/disable a store's ability to do direct transfers of the fungible asset.
@@ -728,10 +896,17 @@ module aptos_framework::fungible_asset {
         ref: &BurnRef,
         store: Object<T>,
         amount: u64
-    ) acquires FungibleStore, Supply, ConcurrentSupply {
-        let metadata = ref.metadata;
-        assert!(metadata == store_metadata(store), error::invalid_argument(EBURN_REF_AND_STORE_MISMATCH));
-        let store_addr = object::object_address(&store);
+    ) acquires FungibleStore, Supply, ConcurrentSupply, ConcurrentFungibleBalance {
+        // ref metadata match is checked in burn() call
+        burn(ref, withdraw_internal(object::object_address(&store), amount));
+    }
+
+    public(friend) fun address_burn_from(
+        ref: &BurnRef,
+        store_addr: address,
+        amount: u64
+    ) acquires FungibleStore, Supply, ConcurrentSupply, ConcurrentFungibleBalance {
+        // ref metadata match is checked in burn() call
         burn(ref, withdraw_internal(store_addr, amount));
     }
 
@@ -740,7 +915,7 @@ module aptos_framework::fungible_asset {
         ref: &TransferRef,
         store: Object<T>,
         amount: u64
-    ): FungibleAsset acquires FungibleStore {
+    ): FungibleAsset acquires FungibleStore, ConcurrentFungibleBalance {
         assert!(
             ref.metadata == store_metadata(store),
             error::invalid_argument(ETRANSFER_REF_AND_STORE_MISMATCH),
@@ -753,12 +928,12 @@ module aptos_framework::fungible_asset {
         ref: &TransferRef,
         store: Object<T>,
         fa: FungibleAsset
-    ) acquires FungibleStore {
+    ) acquires FungibleStore, ConcurrentFungibleBalance {
         assert!(
             ref.metadata == fa.metadata,
             error::invalid_argument(ETRANSFER_REF_AND_FUNGIBLE_ASSET_MISMATCH)
         );
-        deposit_internal(store, fa);
+        deposit_internal(object::object_address(&store), fa);
     }
 
     /// Transfer `amount` of the fungible asset with `TransferRef` even it is frozen.
@@ -767,11 +942,40 @@ module aptos_framework::fungible_asset {
         from: Object<T>,
         to: Object<T>,
         amount: u64,
-    ) acquires FungibleStore {
+    ) acquires FungibleStore, ConcurrentFungibleBalance {
         let fa = withdraw_with_ref(transfer_ref, from, amount);
         deposit_with_ref(transfer_ref, to, fa);
     }
 
+    /// Mutate specified fields of the fungible asset's `Metadata`.
+    public fun mutate_metadata(
+        metadata_ref: &MutateMetadataRef,
+        name: Option<String>,
+        symbol: Option<String>,
+        decimals: Option<u8>,
+        icon_uri: Option<String>,
+        project_uri: Option<String>,
+    ) acquires Metadata {
+        let metadata_address = object::object_address(&metadata_ref.metadata);
+        let mutable_metadata = borrow_global_mut<Metadata>(metadata_address);
+
+        if (option::is_some(&name)){
+            mutable_metadata.name = option::extract(&mut name);
+        };
+        if (option::is_some(&symbol)){
+            mutable_metadata.symbol = option::extract(&mut symbol);
+        };
+        if (option::is_some(&decimals)){
+            mutable_metadata.decimals = option::extract(&mut decimals);
+        };
+        if (option::is_some(&icon_uri)){
+            mutable_metadata.icon_uri = option::extract(&mut icon_uri);
+        };
+        if (option::is_some(&project_uri)){
+            mutable_metadata.project_uri = option::extract(&mut project_uri);
+        };
+    }
+
     /// Create a fungible asset with zero amount.
     /// This can be useful when starting a series of computations where the initial value is 0.
     public fun zero<T: key>(metadata: Object<T>): FungibleAsset {
@@ -805,15 +1009,20 @@ module aptos_framework::fungible_asset {
         assert!(amount == 0, error::invalid_argument(EAMOUNT_IS_NOT_ZERO));
     }
 
-    public(friend) fun deposit_internal<T: key>(store: Object<T>, fa: FungibleAsset) acquires FungibleStore {
+    public(friend) fun deposit_internal(store_addr: address, fa: FungibleAsset) acquires FungibleStore, ConcurrentFungibleBalance {
         let FungibleAsset { metadata, amount } = fa;
+        assert!(exists<FungibleStore>(store_addr), error::not_found(EFUNGIBLE_STORE_EXISTENCE));
+        let store = borrow_global_mut<FungibleStore>(store_addr);
+        assert!(metadata == store.metadata, error::invalid_argument(EFUNGIBLE_ASSET_AND_STORE_MISMATCH));
+
         if (amount == 0) return;
 
-        let store_metadata = store_metadata(store);
-        assert!(metadata == store_metadata, error::invalid_argument(EFUNGIBLE_ASSET_AND_STORE_MISMATCH));
-        let store_addr = object::object_address(&store);
-        let store = borrow_global_mut<FungibleStore>(store_addr);
-        store.balance = store.balance + amount;
+        if (store.balance == 0 && concurrent_fungible_balance_exists_inline(store_addr)) {
+            let balance_resource = borrow_global_mut<ConcurrentFungibleBalance>(store_addr);
+            aggregator_v2::add(&mut balance_resource.balance, amount);
+        } else {
+            store.balance = store.balance + amount;
+        };
 
         event::emit(Deposit { store: store_addr, amount });
     }
@@ -822,13 +1031,23 @@ module aptos_framework::fungible_asset {
     public(friend) fun withdraw_internal(
         store_addr: address,
         amount: u64,
-    ): FungibleAsset acquires FungibleStore {
+    ): FungibleAsset acquires FungibleStore, ConcurrentFungibleBalance {
         assert!(exists<FungibleStore>(store_addr), error::not_found(EFUNGIBLE_STORE_EXISTENCE));
+
         let store = borrow_global_mut<FungibleStore>(store_addr);
         let metadata = store.metadata;
         if (amount != 0) {
-            assert!(store.balance >= amount, error::invalid_argument(EINSUFFICIENT_BALANCE));
-            store.balance = store.balance - amount;
+            if (store.balance == 0 && concurrent_fungible_balance_exists_inline(store_addr)) {
+                let balance_resource = borrow_global_mut<ConcurrentFungibleBalance>(store_addr);
+                assert!(
+                    aggregator_v2::try_sub(&mut balance_resource.balance, amount),
+                    error::invalid_argument(EINSUFFICIENT_BALANCE)
+                );
+            } else {
+                assert!(store.balance >= amount, error::invalid_argument(EINSUFFICIENT_BALANCE));
+                store.balance = store.balance - amount;
+            };
+
             event::emit<Withdraw>(Withdraw { store: store_addr, amount });
         };
         FungibleAsset { metadata, amount }
@@ -927,17 +1146,39 @@ module aptos_framework::fungible_asset {
         let unlimited = option::is_none(&maximum);
         let supply = ConcurrentSupply {
             current: if (unlimited) {
-                aggregator_v2::create_unbounded_aggregator()
+                aggregator_v2::create_unbounded_aggregator_with_value(current)
             }
             else {
-                aggregator_v2::create_aggregator(option::extract(&mut maximum))
+                aggregator_v2::create_aggregator_with_value(current, option::extract(&mut maximum))
             },
         };
-        // update current state:
-        aggregator_v2::add(&mut supply.current, current);
         move_to(&metadata_object_signer, supply);
     }
 
+    public entry fun upgrade_store_to_concurrent<T: key>(
+        owner: &signer,
+        store: Object<T>,
+    ) acquires FungibleStore {
+        assert!(object::owns(store, signer::address_of(owner)), error::permission_denied(ENOT_STORE_OWNER));
+        assert!(!is_frozen(store), error::invalid_argument(ESTORE_IS_FROZEN));
+        assert!(allow_upgrade_to_concurrent_fungible_balance(), error::invalid_argument(ECONCURRENT_BALANCE_NOT_ENABLED));
+        ensure_store_upgraded_to_concurrent_internal(object::object_address(&store));
+    }
+
+    /// Ensure a known `FungibleStore` has `ConcurrentFungibleBalance`.
+    fun ensure_store_upgraded_to_concurrent_internal(
+        fungible_store_address: address,
+    ) acquires FungibleStore {
+        if (exists<ConcurrentFungibleBalance>(fungible_store_address)) {
+            return
+        };
+        let store = borrow_global_mut<FungibleStore>(fungible_store_address);
+        let balance = aggregator_v2::create_unbounded_aggregator_with_value(store.balance);
+        store.balance = 0;
+        let object_signer = create_signer::create_signer(fungible_store_address);
+        move_to(&object_signer, ConcurrentFungibleBalance { balance });
+    }
+
     #[test_only]
     use aptos_framework::account;
 
@@ -958,7 +1199,7 @@ module aptos_framework::fungible_asset {
     }
 
     #[test_only]
-    public fun init_test_metadata(constructor_ref: &ConstructorRef): (MintRef, TransferRef, BurnRef) {
+    public fun init_test_metadata(constructor_ref: &ConstructorRef): (MintRef, TransferRef, BurnRef, MutateMetadataRef) {
         add_fungibility(
             constructor_ref,
             option::some(100) /* max supply */,
@@ -971,16 +1212,17 @@ module aptos_framework::fungible_asset {
         let mint_ref = generate_mint_ref(constructor_ref);
         let burn_ref = generate_burn_ref(constructor_ref);
         let transfer_ref = generate_transfer_ref(constructor_ref);
-        (mint_ref, transfer_ref, burn_ref)
+        let mutate_metadata_ref= generate_mutate_metadata_ref(constructor_ref);
+        (mint_ref, transfer_ref, burn_ref, mutate_metadata_ref)
     }
 
     #[test_only]
     public fun create_fungible_asset(
         creator: &signer
-    ): (MintRef, TransferRef, BurnRef, Object<Metadata>) {
+    ): (MintRef, TransferRef, BurnRef, MutateMetadataRef, Object<Metadata>) {
         let (creator_ref, token_object) = create_test_token(creator);
-        let (mint, transfer, burn) = init_test_metadata(&creator_ref);
-        (mint, transfer, burn, object::convert(token_object))
+        let (mint, transfer, burn, mutate_metadata) = init_test_metadata(&creator_ref);
+        (mint, transfer, burn, mutate_metadata, object::convert(token_object))
     }
 
     #[test_only]
@@ -1001,11 +1243,21 @@ module aptos_framework::fungible_asset {
         assert!(name(metadata) == string::utf8(b"TEST"), 3);
         assert!(symbol(metadata) == string::utf8(b"@@"), 4);
         assert!(decimals(metadata) == 0, 5);
+        assert!(icon_uri(metadata) == string::utf8(b"http://www.example.com/favicon.ico"), 6);
+        assert!(project_uri(metadata) == string::utf8(b"http://www.example.com"), 7);
+
+        assert!(metadata(metadata) == Metadata {
+            name: string::utf8(b"TEST"),
+            symbol: string::utf8(b"@@"),
+            decimals: 0,
+            icon_uri: string::utf8(b"http://www.example.com/favicon.ico"),
+            project_uri: string::utf8(b"http://www.example.com"),
+        }, 8);
 
         increase_supply(&metadata, 50);
-        assert!(supply(metadata) == option::some(50), 6);
+        assert!(supply(metadata) == option::some(50), 9);
         decrease_supply(&metadata, 30);
-        assert!(supply(metadata) == option::some(20), 7);
+        assert!(supply(metadata) == option::some(20), 10);
     }
 
     #[test(creator = @0xcafe)]
@@ -1017,8 +1269,8 @@ module aptos_framework::fungible_asset {
     }
 
     #[test(creator = @0xcafe)]
-    fun test_create_and_remove_store(creator: &signer) acquires FungibleStore, FungibleAssetEvents {
-        let (_, _, _, metadata) = create_fungible_asset(creator);
+    fun test_create_and_remove_store(creator: &signer) acquires FungibleStore, FungibleAssetEvents, ConcurrentFungibleBalance {
+        let (_, _, _, _, metadata) = create_fungible_asset(creator);
         let creator_ref = object::create_object_from_account(creator);
         create_store(&creator_ref, metadata);
         let delete_ref = object::generate_delete_ref(&creator_ref);
@@ -1029,8 +1281,8 @@ module aptos_framework::fungible_asset {
     fun test_e2e_basic_flow(
         creator: &signer,
         aaron: &signer,
-    ) acquires FungibleStore, Supply, ConcurrentSupply, DispatchFunctionStore {
-        let (mint_ref, transfer_ref, burn_ref, test_token) = create_fungible_asset(creator);
+    ) acquires FungibleStore, Supply, ConcurrentSupply, DispatchFunctionStore, ConcurrentFungibleBalance, Metadata {
+        let (mint_ref, transfer_ref, burn_ref, mutate_metadata_ref, test_token) = create_fungible_asset(creator);
         let metadata = mint_ref.metadata;
         let creator_store = create_test_store(creator, metadata);
         let aaron_store = create_test_store(aaron, metadata);
@@ -1055,14 +1307,28 @@ module aptos_framework::fungible_asset {
 
         set_frozen_flag(&transfer_ref, aaron_store, true);
         assert!(is_frozen(aaron_store), 7);
+        // Mutate Metadata
+        mutate_metadata(
+            &mutate_metadata_ref,
+            option::some(string::utf8(b"mutated_name")),
+            option::some(string::utf8(b"mutated_symbol")),
+            option::none(),
+            option::none(),
+            option::none()
+        );
+        assert!(name(metadata) == string::utf8(b"mutated_name"), 8);
+        assert!(symbol(metadata) == string::utf8(b"mutated_symbol"), 9);
+        assert!(decimals(metadata) == 0, 10);
+        assert!(icon_uri(metadata) == string::utf8(b"http://www.example.com/favicon.ico"), 11);
+        assert!(project_uri(metadata) == string::utf8(b"http://www.example.com"), 12);
     }
 
     #[test(creator = @0xcafe)]
     #[expected_failure(abort_code = 0x50003, location = Self)]
     fun test_frozen(
         creator: &signer
-    ) acquires FungibleStore, Supply, ConcurrentSupply, DispatchFunctionStore {
-        let (mint_ref, transfer_ref, _burn_ref, _) = create_fungible_asset(creator);
+    ) acquires FungibleStore, Supply, ConcurrentSupply, DispatchFunctionStore, ConcurrentFungibleBalance {
+        let (mint_ref, transfer_ref, _burn_ref, _mutate_metadata_ref,  _) = create_fungible_asset(creator);
 
         let creator_store = create_test_store(creator, mint_ref.metadata);
         let fa = mint(&mint_ref, 100);
@@ -1074,8 +1340,8 @@ module aptos_framework::fungible_asset {
     #[expected_failure(abort_code = 0x50003, location = Self)]
     fun test_mint_to_frozen(
         creator: &signer
-    ) acquires FungibleStore, Supply, ConcurrentSupply, DispatchFunctionStore {
-        let (mint_ref, transfer_ref, _burn_ref, _) = create_fungible_asset(creator);
+    ) acquires FungibleStore, ConcurrentFungibleBalance, Supply, ConcurrentSupply, DispatchFunctionStore {
+        let (mint_ref, transfer_ref, _burn_ref, _mutate_metadata_ref, _) = create_fungible_asset(creator);
 
         let creator_store = create_test_store(creator, mint_ref.metadata);
         set_frozen_flag(&transfer_ref, creator_store, true);
@@ -1088,7 +1354,7 @@ module aptos_framework::fungible_asset {
         creator: &signer
     ) {
         let (creator_ref, _) = create_test_token(creator);
-        let (mint_ref, _, _) = init_test_metadata(&creator_ref);
+        let (mint_ref, _, _, _) = init_test_metadata(&creator_ref);
         set_untransferable(&creator_ref);
 
         let creator_store = create_test_store(creator, mint_ref.metadata);
@@ -1099,8 +1365,8 @@ module aptos_framework::fungible_asset {
     fun test_transfer_with_ref(
         creator: &signer,
         aaron: &signer,
-    ) acquires FungibleStore, Supply, ConcurrentSupply {
-        let (mint_ref, transfer_ref, _burn_ref, _) = create_fungible_asset(creator);
+    ) acquires FungibleStore, Supply, ConcurrentSupply, ConcurrentFungibleBalance {
+        let (mint_ref, transfer_ref, _burn_ref, _mutate_metadata_ref, _) = create_fungible_asset(creator);
         let metadata = mint_ref.metadata;
         let creator_store = create_test_store(creator, metadata);
         let aaron_store = create_test_store(aaron, metadata);
@@ -1116,9 +1382,53 @@ module aptos_framework::fungible_asset {
         assert!(!!is_frozen(aaron_store), 4);
     }
 
+    #[test(creator = @0xcafe)]
+    fun test_mutate_metadata(
+        creator: &signer
+    ) acquires Metadata {
+        let (mint_ref, _transfer_ref, _burn_ref, mutate_metadata_ref, _) = create_fungible_asset(creator);
+        let metadata = mint_ref.metadata;
+
+        mutate_metadata(
+            &mutate_metadata_ref,
+            option::some(string::utf8(b"mutated_name")),
+            option::some(string::utf8(b"mutated_symbol")),
+            option::some(10),
+            option::some(string::utf8(b"http://www.mutated-example.com/favicon.ico")),
+            option::some(string::utf8(b"http://www.mutated-example.com"))
+        );
+        assert!(name(metadata) == string::utf8(b"mutated_name"), 1);
+        assert!(symbol(metadata) == string::utf8(b"mutated_symbol"), 2);
+        assert!(decimals(metadata) == 10, 3);
+        assert!(icon_uri(metadata) == string::utf8(b"http://www.mutated-example.com/favicon.ico"), 4);
+        assert!(project_uri(metadata) == string::utf8(b"http://www.mutated-example.com"), 5);
+    }
+
+    #[test(creator = @0xcafe)]
+    fun test_partial_mutate_metadata(
+        creator: &signer
+    ) acquires Metadata {
+        let (mint_ref, _transfer_ref, _burn_ref, mutate_metadata_ref, _) = create_fungible_asset(creator);
+        let metadata = mint_ref.metadata;
+
+        mutate_metadata(
+            &mutate_metadata_ref,
+            option::some(string::utf8(b"mutated_name")),
+            option::some(string::utf8(b"mutated_symbol")),
+            option::none(),
+            option::none(),
+            option::none()
+        );
+        assert!(name(metadata) == string::utf8(b"mutated_name"), 8);
+        assert!(symbol(metadata) == string::utf8(b"mutated_symbol"), 9);
+        assert!(decimals(metadata) == 0, 10);
+        assert!(icon_uri(metadata) == string::utf8(b"http://www.example.com/favicon.ico"), 11);
+        assert!(project_uri(metadata) == string::utf8(b"http://www.example.com"), 12);
+    }
+
     #[test(creator = @0xcafe)]
     fun test_merge_and_exact(creator: &signer) acquires Supply, ConcurrentSupply {
-        let (mint_ref, _transfer_ref, burn_ref, _) = create_fungible_asset(creator);
+        let (mint_ref, _transfer_ref, burn_ref, _mutate_metadata_ref, _) = create_fungible_asset(creator);
         let fa = mint(&mint_ref, 100);
         let cash = extract(&mut fa, 80);
         assert!(fa.amount == 20, 1);
@@ -1141,8 +1451,8 @@ module aptos_framework::fungible_asset {
     #[test(creator = @0xcafe, aaron = @0xface)]
     #[expected_failure(abort_code = 0x10006, location = Self)]
     fun test_fungible_asset_mismatch_when_merge(creator: &signer, aaron: &signer) {
-        let (_, _, _, metadata1) = create_fungible_asset(creator);
-        let (_, _, _, metadata2) = create_fungible_asset(aaron);
+        let (_, _, _, _, metadata1) = create_fungible_asset(creator);
+        let (_, _, _, _, metadata2) = create_fungible_asset(aaron);
         let base = FungibleAsset {
             metadata: metadata1,
             amount: 1,
@@ -1159,35 +1469,78 @@ module aptos_framework::fungible_asset {
     }
 
     #[test(fx = @aptos_framework, creator = @0xcafe)]
-    fun test_fungible_asset_upgrade(
-        fx: &signer,
-        creator: &signer
-    ) acquires Supply, ConcurrentSupply, FungibleStore {
-        let feature = features::get_concurrent_fungible_assets_feature();
-        let agg_feature = features::get_aggregator_v2_api_feature();
-        features::change_feature_flags_for_testing(fx, vector[], vector[feature, agg_feature]);
+    fun test_fungible_asset_upgrade(fx: &signer, creator: &signer) acquires Supply, ConcurrentSupply, FungibleStore, ConcurrentFungibleBalance {
+        let supply_feature = features::get_concurrent_fungible_assets_feature();
+        let balance_feature = features::get_concurrent_fungible_balance_feature();
+        let default_balance_feature = features::get_default_to_concurrent_fungible_balance_feature();
+
+        features::change_feature_flags_for_testing(fx, vector[], vector[supply_feature, balance_feature, default_balance_feature]);
 
         let (creator_ref, token_object) = create_test_token(creator);
-        let (mint_ref, transfer_ref, _burn) = init_test_metadata(&creator_ref);
+        let (mint_ref, transfer_ref, _burn, _mutate_metadata_ref) = init_test_metadata(&creator_ref);
         let test_token = object::convert<TestToken, Metadata>(token_object);
+        assert!(exists<Supply>(object::object_address(&test_token)), 1);
+        assert!(!exists<ConcurrentSupply>(object::object_address(&test_token)), 2);
         let creator_store = create_test_store(creator, test_token);
+        assert!(exists<FungibleStore>(object::object_address(&creator_store)), 3);
+        assert!(!exists<ConcurrentFungibleBalance>(object::object_address(&creator_store)), 4);
 
         let fa = mint(&mint_ref, 30);
-        assert!(supply(test_token) == option::some(30), 2);
+        assert!(supply(test_token) == option::some(30), 5);
 
         deposit_with_ref(&transfer_ref, creator_store, fa);
+        assert!(exists<FungibleStore>(object::object_address(&creator_store)), 13);
+        assert!(borrow_store_resource(&creator_store).balance == 30, 14);
+        assert!(!exists<ConcurrentFungibleBalance>(object::object_address(&creator_store)), 15);
 
-        features::change_feature_flags_for_testing(fx, vector[feature, agg_feature], vector[]);
+        features::change_feature_flags_for_testing(fx, vector[supply_feature, balance_feature], vector[default_balance_feature]);
 
         let extend_ref = object::generate_extend_ref(&creator_ref);
+        // manual conversion of supply
         upgrade_to_concurrent(&extend_ref);
-
-        let fb = mint(&mint_ref, 20);
-        assert!(supply(test_token) == option::some(50), 3);
+        assert!(!exists<Supply>(object::object_address(&test_token)), 6);
+        assert!(exists<ConcurrentSupply>(object::object_address(&test_token)), 7);
+
+        // assert conversion of balance
+        upgrade_store_to_concurrent(creator, creator_store);
+        let fb = withdraw_with_ref(&transfer_ref, creator_store, 20);
+        // both store and new balance need to exist. Old balance should be 0.
+        assert!(exists<FungibleStore>(object::object_address(&creator_store)), 9);
+        assert!(borrow_store_resource(&creator_store).balance == 0, 10);
+        assert!(exists<ConcurrentFungibleBalance>(object::object_address(&creator_store)), 11);
+        assert!(aggregator_v2::read(&borrow_global<ConcurrentFungibleBalance>(object::object_address(&creator_store)).balance) == 10, 12);
 
         deposit_with_ref(&transfer_ref, creator_store, fb);
     }
 
+    #[test(fx = @aptos_framework, creator = @0xcafe)]
+    fun test_fungible_asset_default_concurrent(fx: &signer, creator: &signer) acquires Supply, ConcurrentSupply, FungibleStore, ConcurrentFungibleBalance {
+        let supply_feature = features::get_concurrent_fungible_assets_feature();
+        let balance_feature = features::get_concurrent_fungible_balance_feature();
+        let default_balance_feature = features::get_default_to_concurrent_fungible_balance_feature();
+
+        features::change_feature_flags_for_testing(fx, vector[supply_feature, balance_feature, default_balance_feature], vector[]);
+
+        let (creator_ref, token_object) = create_test_token(creator);
+        let (mint_ref, transfer_ref, _burn, _mutate_metadata_ref) = init_test_metadata(&creator_ref);
+        let test_token = object::convert<TestToken, Metadata>(token_object);
+        assert!(!exists<Supply>(object::object_address(&test_token)), 1);
+        assert!(exists<ConcurrentSupply>(object::object_address(&test_token)), 2);
+        let creator_store = create_test_store(creator, test_token);
+        assert!(exists<FungibleStore>(object::object_address(&creator_store)), 3);
+        assert!(exists<ConcurrentFungibleBalance>(object::object_address(&creator_store)), 4);
+
+        let fa = mint(&mint_ref, 30);
+        assert!(supply(test_token) == option::some(30), 5);
+
+        deposit_with_ref(&transfer_ref, creator_store, fa);
+
+        assert!(exists<FungibleStore>(object::object_address(&creator_store)), 9);
+        assert!(borrow_store_resource(&creator_store).balance == 0, 10);
+        assert!(exists<ConcurrentFungibleBalance>(object::object_address(&creator_store)), 11);
+        assert!(aggregator_v2::read(&borrow_global<ConcurrentFungibleBalance>(object::object_address(&creator_store)).balance) == 30, 12);
+    }
+
     #[deprecated]
     #[resource_group_member(group = aptos_framework::object::ObjectGroup)]
     struct FungibleAssetEvents has key {
diff --git a/aptos-move/framework/aptos-framework/sources/genesis.move b/aptos-move/framework/aptos-framework/sources/genesis.move
index 4077a097a5d87..dde48974bc06b 100644
--- a/aptos-move/framework/aptos-framework/sources/genesis.move
+++ b/aptos-move/framework/aptos-framework/sources/genesis.move
@@ -7,6 +7,7 @@ module aptos_framework::genesis {
 
     use aptos_framework::account;
     use aptos_framework::aggregator_factory;
+    use aptos_framework::aptos_account;
     use aptos_framework::aptos_coin::{Self, AptosCoin};
     use aptos_framework::aptos_governance;
     use aptos_framework::block;
@@ -166,6 +167,7 @@ module aptos_framework::genesis {
 
         let core_resources = account::create_account(@core_resources);
         account::rotate_authentication_key_internal(&core_resources, core_resources_auth_key);
+        aptos_account::register_apt(&core_resources); // registers APT store
         aptos_coin::configure_accounts_for_test(aptos_framework, &core_resources, mint_cap);
     }
 
@@ -517,4 +519,32 @@ module aptos_framework::genesis {
         create_account(aptos_framework, addr0, 23456);
         assert!(coin::balance<AptosCoin>(addr0) == 12345, 2);
     }
+
+    #[test(aptos_framework = @0x1, root = @0xabcd)]
+    fun test_create_root_account(aptos_framework: &signer) {
+        use aptos_framework::aggregator_factory;
+        use aptos_framework::object;
+        use aptos_framework::primary_fungible_store;
+        use aptos_framework::fungible_asset::Metadata;
+        use std::features;
+
+        let feature = features::get_new_accounts_default_to_fa_apt_store_feature();
+        features::change_feature_flags_for_testing(aptos_framework, vector[feature], vector[]);
+
+        aggregator_factory::initialize_aggregator_factory_for_test(aptos_framework);
+
+        let (burn_cap, mint_cap) = aptos_coin::initialize(aptos_framework);
+        aptos_coin::ensure_initialized_with_apt_fa_metadata_for_test();
+
+        let core_resources = account::create_account(@core_resources);
+        aptos_account::register_apt(&core_resources); // registers APT store
+
+        let apt_metadata = object::address_to_object<Metadata>(@aptos_fungible_asset);
+        assert!(primary_fungible_store::primary_store_exists(@core_resources, apt_metadata), 2);
+
+        aptos_coin::configure_accounts_for_test(aptos_framework, &core_resources, mint_cap);
+
+        coin::destroy_burn_cap(burn_cap);
+        coin::destroy_mint_cap(mint_cap);
+    }
 }
diff --git a/aptos-move/framework/aptos-framework/sources/jwks.move b/aptos-move/framework/aptos-framework/sources/jwks.move
index febdccc2858d9..c0bcdc7468250 100644
--- a/aptos-move/framework/aptos-framework/sources/jwks.move
+++ b/aptos-move/framework/aptos-framework/sources/jwks.move
@@ -581,7 +581,7 @@ module aptos_framework::jwks {
         let jwk_2 = new_unsupported_jwk(b"key_id_2", b"key_payload_2");
         let jwk_3 = new_unsupported_jwk(b"key_id_3", b"key_payload_3");
         let jwk_4 = new_unsupported_jwk(b"key_id_4", b"key_payload_4");
-        let expected = AllProvidersJWKs{ entries: vector[] };
+        let expected = AllProvidersJWKs { entries: vector[] };
         assert!(expected == borrow_global<ObservedJWKs>(@aptos_framework).jwks, 1);
 
         let alice_jwks_v1 = ProviderJWKs {
@@ -596,7 +596,7 @@ module aptos_framework::jwks {
         };
         upsert_into_observed_jwks(fx, vector[bob_jwks_v1]);
         upsert_into_observed_jwks(fx, vector[alice_jwks_v1]);
-        let expected = AllProvidersJWKs{ entries: vector[
+        let expected = AllProvidersJWKs { entries: vector[
             alice_jwks_v1,
             bob_jwks_v1,
         ] };
@@ -608,14 +608,14 @@ module aptos_framework::jwks {
             jwks: vector[jwk_1, jwk_4],
         };
         upsert_into_observed_jwks(fx, vector[alice_jwks_v2]);
-        let expected = AllProvidersJWKs{ entries: vector[
+        let expected = AllProvidersJWKs { entries: vector[
             alice_jwks_v2,
             bob_jwks_v1,
         ] };
         assert!(expected == borrow_global<ObservedJWKs>(@aptos_framework).jwks, 3);
 
         remove_issuer_from_observed_jwks(fx, b"alice");
-        let expected = AllProvidersJWKs{ entries: vector[bob_jwks_v1] };
+        let expected = AllProvidersJWKs { entries: vector[bob_jwks_v1] };
         assert!(expected == borrow_global<ObservedJWKs>(@aptos_framework).jwks, 4);
     }
 
diff --git a/aptos-move/framework/aptos-framework/sources/keyless_account.move b/aptos-move/framework/aptos-framework/sources/keyless_account.move
index ad217a313f38a..269c209b228b9 100644
--- a/aptos-move/framework/aptos-framework/sources/keyless_account.move
+++ b/aptos-move/framework/aptos-framework/sources/keyless_account.move
@@ -119,7 +119,7 @@ module aptos_framework::keyless_account {
         assert!(option::is_some(&crypto_algebra::deserialize<bn254_algebra::G2, bn254_algebra::FormatG2Compr>(&vk.beta_g2)), E_INVALID_BN254_G2_SERIALIZATION);
         assert!(option::is_some(&crypto_algebra::deserialize<bn254_algebra::G2, bn254_algebra::FormatG2Compr>(&vk.gamma_g2)), E_INVALID_BN254_G2_SERIALIZATION);
         assert!(option::is_some(&crypto_algebra::deserialize<bn254_algebra::G2, bn254_algebra::FormatG2Compr>(&vk.delta_g2)), E_INVALID_BN254_G2_SERIALIZATION);
-        for(i in 0..vector::length(&vk.gamma_abc_g1)) {
+        for (i in 0..vector::length(&vk.gamma_abc_g1)) {
             assert!(option::is_some(&crypto_algebra::deserialize<bn254_algebra::G1, bn254_algebra::FormatG1Compr>(vector::borrow(&vk.gamma_abc_g1, i))), E_INVALID_BN254_G1_SERIALIZATION);
         };
     }
@@ -185,6 +185,7 @@ module aptos_framework::keyless_account {
         let config = borrow_global_mut<Configuration>(signer::address_of(fx));
         vector::push_back(&mut config.override_aud_vals, aud);
     }
+
     /// Queues up a change to the Groth16 verification key. The change will only be effective after reconfiguration.
     /// Only callable via governance proposal.
     ///
@@ -194,7 +195,6 @@ module aptos_framework::keyless_account {
     /// WARNING: If a malicious key is set, this would lead to stolen funds.
     public fun set_groth16_verification_key_for_next_epoch(fx: &signer, vk: Groth16VerificationKey) {
         system_addresses::assert_aptos_framework(fx);
-        validate_groth16_vk(&vk);
         config_buffer::upsert<Groth16VerificationKey>(vk);
     }
 
@@ -300,7 +300,7 @@ module aptos_framework::keyless_account {
             }
         };
 
-        if(config_buffer::does_exist<Configuration>()) {
+        if (config_buffer::does_exist<Configuration>()) {
             let config = config_buffer::extract();
             if (exists<Configuration>(@aptos_framework)) {
                 *borrow_global_mut<Configuration>(@aptos_framework) = config;
diff --git a/aptos-move/framework/aptos-framework/sources/multisig_account.move b/aptos-move/framework/aptos-framework/sources/multisig_account.move
index c2b2484f49ad0..6ea72d7e0ed0d 100644
--- a/aptos-move/framework/aptos-framework/sources/multisig_account.move
+++ b/aptos-move/framework/aptos-framework/sources/multisig_account.move
@@ -75,6 +75,8 @@ module aptos_framework::multisig_account {
     const EPAYLOAD_DOES_NOT_MATCH_HASH: u64 = 2008;
     /// Transaction has not received enough approvals to be executed.
     const ENOT_ENOUGH_APPROVALS: u64 = 2009;
+    /// Provided target function does not match the payload stored in the on-chain transaction.
+    const EPAYLOAD_DOES_NOT_MATCH: u64 = 2010;
     /// Transaction has not received enough rejections to be officially rejected.
     const ENOT_ENOUGH_REJECTIONS: u64 = 10;
     /// Number of signatures required must be more than zero and at most the total number of owners.
@@ -1018,7 +1020,7 @@ module aptos_framework::multisig_account {
 
         let sequence_number = last_resolved_sequence_number(multisig_account) + 1;
         let owner_addr = address_of(owner);
-        if(features::multisig_v2_enhancement_feature_enabled()) {
+        if (features::multisig_v2_enhancement_feature_enabled()) {
             // Implicitly vote for rejection if the owner has not voted for rejection yet.
             if (!has_voted_for_rejection(multisig_account, sequence_number, owner_addr)) {
                 reject_transaction(owner, multisig_account, sequence_number);
@@ -1079,7 +1081,7 @@ module aptos_framework::multisig_account {
         let sequence_number = last_resolved_sequence_number(multisig_account) + 1;
         assert_transaction_exists(multisig_account, sequence_number);
 
-        if(features::multisig_v2_enhancement_feature_enabled()) {
+        if (features::multisig_v2_enhancement_feature_enabled()) {
             assert!(
                 can_execute(address_of(owner), multisig_account, sequence_number),
                 error::invalid_argument(ENOT_ENOUGH_APPROVALS),
@@ -1103,6 +1105,19 @@ module aptos_framework::multisig_account {
                 error::invalid_argument(EPAYLOAD_DOES_NOT_MATCH_HASH),
             );
         };
+
+        // If the transaction payload is stored on chain and there is a provided payload,
+        // verify that the provided payload matches the stored payload.
+        if (features::abort_if_multisig_payload_mismatch_enabled()
+            && option::is_some(&transaction.payload)
+            && !vector::is_empty(&payload)
+        ) {
+            let stored_payload = option::borrow(&transaction.payload);
+            assert!(
+                payload == *stored_payload,
+                error::invalid_argument(EPAYLOAD_DOES_NOT_MATCH),
+            );
+        }
     }
 
     /// Post-execution cleanup for a successful multisig transaction execution.
@@ -1179,7 +1194,7 @@ module aptos_framework::multisig_account {
         let multisig_account_resource = borrow_global_mut<MultisigAccount>(multisig_account);
         let (num_approvals, _) = remove_executed_transaction(multisig_account_resource);
 
-        if(features::multisig_v2_enhancement_feature_enabled() && implicit_approval) {
+        if (features::multisig_v2_enhancement_feature_enabled() && implicit_approval) {
             if (std::features::module_event_migration_enabled()) {
                 emit(
                     Vote {
@@ -1217,7 +1232,7 @@ module aptos_framework::multisig_account {
         multisig_account: address,
         transaction: MultisigTransaction
     ) {
-        if(features::multisig_v2_enhancement_feature_enabled()) {
+        if (features::multisig_v2_enhancement_feature_enabled()) {
             assert!(
                 available_transaction_queue_capacity(multisig_account) > 0,
                 error::invalid_state(EMAX_PENDING_TRANSACTIONS_EXCEEDED)
@@ -1481,7 +1496,7 @@ module aptos_framework::multisig_account {
     fun setup() {
         let framework_signer = &create_signer(@0x1);
         features::change_feature_flags_for_testing(
-            framework_signer, vector[features::get_multisig_accounts_feature(), features::get_multisig_v2_enhancement_feature()], vector[]);
+            framework_signer, vector[features::get_multisig_accounts_feature(), features::get_multisig_v2_enhancement_feature(), features::get_abort_if_multisig_payload_mismatch_feature()], vector[]);
         timestamp::set_time_has_started_for_testing(framework_signer);
         chain_id::initialize_for_test(framework_signer, 1);
         let (burn, mint) = aptos_coin::initialize_for_test(framework_signer);
diff --git a/aptos-move/framework/aptos-framework/sources/object.move b/aptos-move/framework/aptos-framework/sources/object.move
index 930cd81340bbb..6e809e87e8736 100644
--- a/aptos-move/framework/aptos-framework/sources/object.move
+++ b/aptos-move/framework/aptos-framework/sources/object.move
@@ -49,7 +49,7 @@ module aptos_framework::object {
     /// Cannot reclaim objects that weren't burnt.
     const EOBJECT_NOT_BURNT: u64 = 8;
     /// Object is untransferable any operations that might result in a transfer are disallowed.
-    const ENOT_MOVABLE: u64 = 9;
+    const EOBJECT_NOT_TRANSFERRABLE: u64 = 9;
 
     /// Explicitly separate the GUID space between Object and Account to prevent accidental overlap.
     const INIT_GUID_CREATION_NUM: u64 = 0x4000000000000;
@@ -354,7 +354,7 @@ module aptos_framework::object {
 
     /// Generates the TransferRef, which can be used to manage object transfers.
     public fun generate_transfer_ref(ref: &ConstructorRef): TransferRef {
-        assert!(!exists<Untransferable>(ref.self), error::permission_denied(ENOT_MOVABLE));
+        assert!(!exists<Untransferable>(ref.self), error::permission_denied(EOBJECT_NOT_TRANSFERRABLE));
         TransferRef { self: ref.self }
     }
 
@@ -458,7 +458,7 @@ module aptos_framework::object {
 
     /// Enable direct transfer.
     public fun enable_ungated_transfer(ref: &TransferRef) acquires ObjectCore {
-        assert!(!exists<Untransferable>(ref.self), error::permission_denied(ENOT_MOVABLE));
+        assert!(!exists<Untransferable>(ref.self), error::permission_denied(EOBJECT_NOT_TRANSFERRABLE));
         let object = borrow_global_mut<ObjectCore>(ref.self);
         object.allow_ungated_transfer = true;
     }
@@ -466,7 +466,7 @@ module aptos_framework::object {
     /// Create a LinearTransferRef for a one-time transfer. This requires that the owner at the
     /// time of generation is the owner at the time of transferring.
     public fun generate_linear_transfer_ref(ref: &TransferRef): LinearTransferRef acquires ObjectCore {
-        assert!(!exists<Untransferable>(ref.self), error::permission_denied(ENOT_MOVABLE));
+        assert!(!exists<Untransferable>(ref.self), error::permission_denied(EOBJECT_NOT_TRANSFERRABLE));
         let owner = owner(Object<ObjectCore> { inner: ref.self });
         LinearTransferRef {
             self: ref.self,
@@ -475,8 +475,14 @@ module aptos_framework::object {
     }
 
     /// Transfer to the destination address using a LinearTransferRef.
-    public fun transfer_with_ref(ref: LinearTransferRef, to: address) acquires ObjectCore {
-        assert!(!exists<Untransferable>(ref.self), error::permission_denied(ENOT_MOVABLE));
+    public fun transfer_with_ref(ref: LinearTransferRef, to: address) acquires ObjectCore, TombStone {
+        assert!(!exists<Untransferable>(ref.self), error::permission_denied(EOBJECT_NOT_TRANSFERRABLE));
+
+        // Undo soft burn if present as we don't want the original owner to be able to reclaim by calling unburn later.
+        if (exists<TombStone>(ref.self)) {
+            let TombStone { original_owner: _ } = move_from<TombStone>(ref.self);
+        };
+
         let object = borrow_global_mut<ObjectCore>(ref.self);
         assert!(
             object.owner == ref.owner,
@@ -588,9 +594,7 @@ module aptos_framework::object {
         let count = 0;
         while (owner != current_address) {
             count = count + 1;
-            if (std::features::max_object_nesting_check_enabled()) {
-                assert!(count < MAXIMUM_OBJECT_NESTING, error::out_of_range(EMAXIMUM_NESTING))
-            };
+            assert!(count < MAXIMUM_OBJECT_NESTING, error::out_of_range(EMAXIMUM_NESTING));
             // At this point, the first object exists and so the more likely case is that the
             // object's owner is not an object. So we return a more sensible error.
             assert!(
@@ -672,9 +676,7 @@ module aptos_framework::object {
         let count = 0;
         while (owner != current_address) {
             count = count + 1;
-            if (std::features::max_object_nesting_check_enabled()) {
-                assert!(count < MAXIMUM_OBJECT_NESTING, error::out_of_range(EMAXIMUM_NESTING))
-            };
+            assert!(count < MAXIMUM_OBJECT_NESTING, error::out_of_range(EMAXIMUM_NESTING));
             if (!exists<ObjectCore>(current_address)) {
                 return false
             };
@@ -789,7 +791,7 @@ module aptos_framework::object {
     }
 
     #[test(creator = @0x123)]
-    fun test_linear_transfer(creator: &signer) acquires ObjectCore {
+    fun test_linear_transfer(creator: &signer) acquires ObjectCore, TombStone {
         let (hero_constructor, hero) = create_hero(creator);
         assert!(root_owner(hero) == @0x123, 0);
 
@@ -803,7 +805,7 @@ module aptos_framework::object {
 
     #[test(creator = @0x123)]
     #[expected_failure(abort_code = 0x50004, location = Self)]
-    fun test_bad_linear_transfer(creator: &signer) acquires ObjectCore {
+    fun test_bad_linear_transfer(creator: &signer) acquires ObjectCore, TombStone {
         let (hero_constructor, hero) = create_hero(creator);
         let transfer_ref = generate_transfer_ref(&hero_constructor);
         let linear_transfer_ref_good = generate_linear_transfer_ref(&transfer_ref);
@@ -814,12 +816,18 @@ module aptos_framework::object {
         transfer_with_ref(linear_transfer_ref_bad, @0x789);
     }
 
-    #[test(fx = @std)]
-    fun test_correct_auid(fx: signer) {
-        use std::features;
-        let feature = features::get_auids();
-        features::change_feature_flags_for_testing(&fx, vector[feature], vector[]);
+    #[test(creator = @0x123)]
+    #[expected_failure(abort_code = 0x10008, location = Self)]
+    fun test_cannot_unburn_after_transfer_with_ref(creator: &signer) acquires ObjectCore, TombStone {
+        let (hero_constructor, hero) = create_hero(creator);
+        burn(creator, hero);
+        let transfer_ref = generate_transfer_ref(&hero_constructor);
+        transfer_with_ref(generate_linear_transfer_ref(&transfer_ref), @0x456);
+        unburn(creator, hero);
+    }
 
+    #[test(fx = @std)]
+    fun test_correct_auid() {
         let auid1 = aptos_framework::transaction_context::generate_auid_address();
         let bytes = aptos_framework::transaction_context::get_transaction_hash();
         std::vector::push_back(&mut bytes, 1);
@@ -907,11 +915,6 @@ module aptos_framework::object {
     #[test(creator = @0x123)]
     #[expected_failure(abort_code = 131078, location = Self)]
     fun test_exceeding_maximum_object_nesting_owns_should_fail(creator: &signer) acquires ObjectCore {
-        use std::features;
-        let feature = features::get_max_object_nesting_check_feature();
-        let fx = account::create_signer_for_test(@0x1);
-        features::change_feature_flags_for_testing(&fx, vector[feature], vector[]);
-
         let obj1 = create_simple_object(creator, b"1");
         let obj2 = create_simple_object(creator, b"2");
         let obj3 = create_simple_object(creator, b"3");
@@ -947,11 +950,6 @@ module aptos_framework::object {
     #[test(creator = @0x123)]
     #[expected_failure(abort_code = 131078, location = Self)]
     fun test_exceeding_maximum_object_nesting_transfer_should_fail(creator: &signer) acquires ObjectCore {
-        use std::features;
-        let feature = features::get_max_object_nesting_check_feature();
-        let fx = account::create_signer_for_test(@0x1);
-        features::change_feature_flags_for_testing(&fx, vector[feature], vector[]);
-
         let obj1 = create_simple_object(creator, b"1");
         let obj2 = create_simple_object(creator, b"2");
         let obj3 = create_simple_object(creator, b"3");
@@ -978,11 +976,6 @@ module aptos_framework::object {
     #[test(creator = @0x123)]
     #[expected_failure(abort_code = 131078, location = Self)]
     fun test_cyclic_ownership_transfer_should_fail(creator: &signer) acquires ObjectCore {
-        use std::features;
-        let feature = features::get_max_object_nesting_check_feature();
-        let fx = account::create_signer_for_test(@0x1);
-        features::change_feature_flags_for_testing(&fx, vector[feature], vector[]);
-
         let obj1 = create_simple_object(creator, b"1");
         // This creates a cycle (self-loop) in ownership.
         transfer(creator, obj1, object_address(&obj1));
@@ -993,11 +986,6 @@ module aptos_framework::object {
     #[test(creator = @0x123)]
     #[expected_failure(abort_code = 131078, location = Self)]
     fun test_cyclic_ownership_owns_should_fail(creator: &signer) acquires ObjectCore {
-        use std::features;
-        let feature = features::get_max_object_nesting_check_feature();
-        let fx = account::create_signer_for_test(@0x1);
-        features::change_feature_flags_for_testing(&fx, vector[feature], vector[]);
-
         let obj1 = create_simple_object(creator, b"1");
         // This creates a cycle (self-loop) in ownership.
         transfer(creator, obj1, object_address(&obj1));
@@ -1032,7 +1020,7 @@ module aptos_framework::object {
 
     #[test(creator = @0x123)]
     #[expected_failure(abort_code = 327689, location = Self)]
-    fun test_untransferable_direct_ownership_with_linear_transfer_ref(creator: &signer) acquires ObjectCore {
+    fun test_untransferable_direct_ownership_with_linear_transfer_ref(creator: &signer) acquires ObjectCore, TombStone {
         let (hero_constructor_ref, _) = create_hero(creator);
         let transfer_ref = generate_transfer_ref(&hero_constructor_ref);
         let linear_transfer_ref = generate_linear_transfer_ref(&transfer_ref);
@@ -1073,7 +1061,7 @@ module aptos_framework::object {
 
     #[test(creator = @0x123)]
     #[expected_failure(abort_code = 327689, location = Self)]
-    fun test_untransferable_indirect_ownership_with_linear_transfer_ref(creator: &signer) acquires ObjectCore {
+    fun test_untransferable_indirect_ownership_with_linear_transfer_ref(creator: &signer) acquires ObjectCore, TombStone {
         let (_, hero) = create_hero(creator);
         let (weapon_constructor_ref, weapon) = create_weapon(creator);
         transfer_to_object(creator, weapon, hero);
diff --git a/aptos-move/framework/aptos-framework/sources/primary_fungible_store.move b/aptos-move/framework/aptos-framework/sources/primary_fungible_store.move
index d8e7a43458824..fc20e1cf311a6 100644
--- a/aptos-move/framework/aptos-framework/sources/primary_fungible_store.move
+++ b/aptos-move/framework/aptos-framework/sources/primary_fungible_store.move
@@ -16,7 +16,6 @@ module aptos_framework::primary_fungible_store {
     use aptos_framework::fungible_asset::{Self, FungibleAsset, FungibleStore, Metadata, MintRef, TransferRef, BurnRef};
     use aptos_framework::object::{Self, Object, ConstructorRef, DeriveRef};
 
-    use std::features;
     use std::option::Option;
     use std::signer;
     use std::string::String;
@@ -61,10 +60,11 @@ module aptos_framework::primary_fungible_store {
         owner: address,
         metadata: Object<T>,
     ): Object<FungibleStore> acquires DeriveRefPod {
-        if (!primary_store_exists(owner, metadata)) {
-            create_primary_store(owner, metadata)
+        let store_addr = primary_store_address(owner, metadata);
+        if (fungible_asset::store_exists(store_addr)) {
+            object::address_to_object(store_addr)
         } else {
-            primary_store(owner, metadata)
+            create_primary_store(owner, metadata)
         }
     }
 
@@ -76,12 +76,7 @@ module aptos_framework::primary_fungible_store {
         let metadata_addr = object::object_address(&metadata);
         object::address_to_object<Metadata>(metadata_addr);
         let derive_ref = &borrow_global<DeriveRefPod>(metadata_addr).metadata_derive_ref;
-        let constructor_ref = if (metadata_addr == @aptos_fungible_asset && features::primary_apt_fungible_store_at_user_address_enabled(
-        )) {
-            &object::create_sticky_object_at_address(owner_addr, owner_addr)
-        } else {
-            &object::create_user_derived_object(owner_addr, derive_ref)
-        };
+        let constructor_ref = &object::create_user_derived_object(owner_addr, derive_ref);
         // Disable ungated transfer as deterministic stores shouldn't be transferrable.
         let transfer_ref = &object::generate_transfer_ref(constructor_ref);
         object::disable_ungated_transfer(transfer_ref);
@@ -93,11 +88,7 @@ module aptos_framework::primary_fungible_store {
     /// Get the address of the primary store for the given account.
     public fun primary_store_address<T: key>(owner: address, metadata: Object<T>): address {
         let metadata_addr = object::object_address(&metadata);
-        if (metadata_addr == @aptos_fungible_asset && features::primary_apt_fungible_store_at_user_address_enabled()) {
-            owner
-        } else {
-            object::create_user_derived_object_address(owner, metadata_addr)
-        }
+        object::create_user_derived_object_address(owner, metadata_addr)
     }
 
     #[view]
@@ -113,6 +104,26 @@ module aptos_framework::primary_fungible_store {
         fungible_asset::store_exists(primary_store_address(account, metadata))
     }
 
+    /// Get the address of the primary store for the given account.
+    /// Use instead of the corresponding view functions for dispatchable hooks to avoid circular dependencies of modules.
+    public inline fun primary_store_address_inlined<T: key>(owner: address, metadata: Object<T>): address {
+        let metadata_addr = object::object_address(&metadata);
+        object::create_user_derived_object_address(owner, metadata_addr)
+    }
+
+    /// Get the primary store object for the given account.
+    /// Use instead of the corresponding view functions for dispatchable hooks to avoid circular dependencies of modules.
+    public inline fun primary_store_inlined<T: key>(owner: address, metadata: Object<T>): Object<FungibleStore> {
+        let store = primary_store_address_inlined(owner, metadata);
+        object::address_to_object(store)
+    }
+
+    /// Return whether the given account's primary store exists.
+    /// Use instead of the corresponding view functions for dispatchable hooks to avoid circular dependencies of modules.
+    public inline fun primary_store_exists_inlined<T: key>(account: address, metadata: Object<T>): bool {
+        fungible_asset::store_exists(primary_store_address_inlined(account, metadata))
+    }
+
     #[view]
     /// Get the balance of `account`'s primary store.
     public fun balance<T: key>(account: address, metadata: Object<T>): u64 {
@@ -161,7 +172,7 @@ module aptos_framework::primary_fungible_store {
     public(friend) fun force_deposit(owner: address, fa: FungibleAsset) acquires DeriveRefPod {
         let metadata = fungible_asset::asset_metadata(&fa);
         let store = ensure_primary_store_exists(owner, metadata);
-        fungible_asset::deposit_internal(store, fa);
+        fungible_asset::deposit_internal(object::object_address(&store), fa);
     }
 
     /// Transfer `amount` of fungible asset from sender's primary store to receiver's primary store.
diff --git a/aptos-move/framework/aptos-framework/sources/primary_fungible_store.spec.move b/aptos-move/framework/aptos-framework/sources/primary_fungible_store.spec.move
index 7d1448a3a54f7..e0b74e03def30 100644
--- a/aptos-move/framework/aptos-framework/sources/primary_fungible_store.spec.move
+++ b/aptos-move/framework/aptos-framework/sources/primary_fungible_store.spec.move
@@ -135,12 +135,6 @@ spec aptos_framework::primary_fungible_store {
 
     spec fun spec_primary_store_address<T: key>(owner: address, metadata: Object<T>): address {
         let metadata_addr = object::object_address(metadata);
-        if (metadata_addr == @aptos_fungible_asset && features::spec_is_enabled(
-            features::PRIMARY_APT_FUNGIBLE_STORE_AT_USER_ADDRESS
-        )) {
-            owner
-        } else {
-            object::spec_create_user_derived_object_address(owner, metadata_addr)
-        }
+        object::spec_create_user_derived_object_address(owner, metadata_addr)
     }
 }
diff --git a/aptos-move/framework/aptos-framework/sources/randomness.move b/aptos-move/framework/aptos-framework/sources/randomness.move
index e479b6e30c84b..cde8328e67795 100644
--- a/aptos-move/framework/aptos-framework/sources/randomness.move
+++ b/aptos-move/framework/aptos-framework/sources/randomness.move
@@ -92,7 +92,7 @@ module aptos_framework::randomness {
         let c = 0;
         while (c < n) {
             let blob = next_32_bytes();
-            vector::append(&mut v, blob);
+            vector::reverse_append(&mut v, blob);
 
             c = c + 32;
         };
@@ -299,6 +299,8 @@ module aptos_framework::randomness {
     /// Generate a permutation of `[0, 1, ..., n-1]` uniformly at random.
     /// If n is 0, returns the empty vector.
     public fun permutation(n: u64): vector<u64> acquires PerBlockRandomness {
+        event::emit(RandomnessGeneratedEvent {});
+
         let values = vector[];
 
         if(n == 0) {
@@ -337,8 +339,6 @@ module aptos_framework::randomness {
             tail = tail - 1;
         };
 
-        event::emit(RandomnessGeneratedEvent {});
-
         values
     }
 
@@ -350,15 +350,15 @@ module aptos_framework::randomness {
     }
 
     /// Compute `(a + b) % m`, assuming `m >= 1, 0 <= a < m, 0<= b < m`.
-    inline fun safe_add_mod(a: u256, b: u256, m: u256): u256 {
+    fun safe_add_mod(a: u256, b: u256, m: u256): u256 {
+        let a_clone = a;
         let neg_b = m - b;
-        if (a < neg_b) {
-            a + b
-        } else {
-            a - neg_b
-        }
+        let a_less = a < neg_b;
+        take_first(if (a_less) { a + b } else { a_clone - neg_b }, if (!a_less) { a_clone - neg_b } else { a + b })
     }
 
+    fun take_first(x: u256, _y: u256 ): u256 { x }
+
     #[verify_only]
     fun safe_add_mod_for_verification(a: u256, b: u256, m: u256): u256 {
         let neg_b = m - b;
diff --git a/aptos-move/framework/aptos-framework/sources/randomness.spec.move b/aptos-move/framework/aptos-framework/sources/randomness.spec.move
index 3b4cf85ecbb1c..23c75bef3167e 100644
--- a/aptos-move/framework/aptos-framework/sources/randomness.spec.move
+++ b/aptos-move/framework/aptos-framework/sources/randomness.spec.move
@@ -89,6 +89,8 @@ spec aptos_framework::randomness {
     }
 
     spec u256_integer_internal(): u256 {
+        // TODO: set because of timeout (property proved)
+        pragma verify_duration_estimate = 300;
         pragma unroll = 32;
         include NextBlobAbortsIf;
     }
diff --git a/aptos-move/framework/aptos-framework/sources/stake.spec.move b/aptos-move/framework/aptos-framework/sources/stake.spec.move
index 5d023400860bb..44101fbcb134c 100644
--- a/aptos-move/framework/aptos-framework/sources/stake.spec.move
+++ b/aptos-move/framework/aptos-framework/sources/stake.spec.move
@@ -705,6 +705,9 @@ spec aptos_framework::stake {
         operator: address,
         voter: address,
     ) {
+        // TODO: These function failed in github CI
+        pragma verify_duration_estimate = 120;
+
         include ResourceRequirement;
         let addr = signer::address_of(owner);
         ensures global<ValidatorConfig>(addr) == ValidatorConfig {
diff --git a/aptos-move/framework/aptos-framework/sources/staking_contract.spec.move b/aptos-move/framework/aptos-framework/sources/staking_contract.spec.move
index 0f7caf7af2aa4..fa6f54b391ba6 100644
--- a/aptos-move/framework/aptos-framework/sources/staking_contract.spec.move
+++ b/aptos-move/framework/aptos-framework/sources/staking_contract.spec.move
@@ -380,6 +380,7 @@ spec aptos_framework::staking_contract {
 
     /// The StakePool exists under the pool_address of StakingContract.
     spec get_staking_contract_amounts_internal(staking_contract: &StakingContract): (u64, u64, u64) {
+        pragma verify_duration_estimate = 120;
         include GetStakingContractAmountsAbortsIf;
 
         let pool_address = staking_contract.pool_address;
diff --git a/aptos-move/framework/aptos-framework/sources/transaction_context.move b/aptos-move/framework/aptos-framework/sources/transaction_context.move
index a88e12d373416..c3bad25371cdc 100644
--- a/aptos-move/framework/aptos-framework/sources/transaction_context.move
+++ b/aptos-move/framework/aptos-framework/sources/transaction_context.move
@@ -182,14 +182,10 @@ module aptos_framework::transaction_context {
         payload.entry_function_payload
     }
 
-    #[test(fx = @std)]
-    fun test_auid_uniquess(fx: signer) {
-        use std::features;
+    #[test()]
+    fun test_auid_uniquess() {
         use std::vector;
 
-        let feature = features::get_auids();
-        features::change_feature_flags_for_testing(&fx, vector[feature], vector[]);
-
         let auids: vector<address> = vector<address>[];
         let i: u64 = 0;
         let count: u64 = 50;
diff --git a/aptos-move/framework/aptos-framework/sources/transaction_fee.move b/aptos-move/framework/aptos-framework/sources/transaction_fee.move
index 239a45b9babf0..55eb05c85b659 100644
--- a/aptos-move/framework/aptos-framework/sources/transaction_fee.move
+++ b/aptos-move/framework/aptos-framework/sources/transaction_fee.move
@@ -1,11 +1,15 @@
 /// This module provides an interface to burn or collect and redistribute transaction fees.
 module aptos_framework::transaction_fee {
     use aptos_framework::coin::{Self, AggregatableCoin, BurnCapability, Coin, MintCapability};
+    use aptos_framework::aptos_account;
     use aptos_framework::aptos_coin::AptosCoin;
     use aptos_framework::stake;
+    use aptos_framework::fungible_asset::BurnRef;
     use aptos_framework::system_addresses;
     use std::error;
+    use std::features;
     use std::option::{Self, Option};
+    use std::signer;
     use aptos_framework::event;
 
     friend aptos_framework::block;
@@ -23,11 +27,18 @@ module aptos_framework::transaction_fee {
     /// No longer supported.
     const ENO_LONGER_SUPPORTED: u64 = 4;
 
+    const EFA_GAS_CHARGING_NOT_ENABLED: u64 = 5;
+
     /// Stores burn capability to burn the gas fees.
     struct AptosCoinCapabilities has key {
         burn_cap: BurnCapability<AptosCoin>,
     }
 
+    /// Stores burn capability to burn the gas fees.
+    struct AptosFABurnCapabilities has key {
+        burn_ref: BurnRef,
+    }
+
     /// Stores mint capability to mint the refunds.
     struct AptosCoinMintCapability has key {
         mint_cap: MintCapability<AptosCoin>,
@@ -197,12 +208,24 @@ module aptos_framework::transaction_fee {
     }
 
     /// Burn transaction fees in epilogue.
-    public(friend) fun burn_fee(account: address, fee: u64) acquires AptosCoinCapabilities {
-        coin::burn_from<AptosCoin>(
-            account,
-            fee,
-            &borrow_global<AptosCoinCapabilities>(@aptos_framework).burn_cap,
-        );
+    public(friend) fun burn_fee(account: address, fee: u64) acquires AptosFABurnCapabilities, AptosCoinCapabilities {
+        if (exists<AptosFABurnCapabilities>(@aptos_framework)) {
+            let burn_ref = &borrow_global<AptosFABurnCapabilities>(@aptos_framework).burn_ref;
+            aptos_account::burn_from_fungible_store(burn_ref, account, fee);
+        } else {
+            let burn_cap = &borrow_global<AptosCoinCapabilities>(@aptos_framework).burn_cap;
+            if (features::operations_default_to_fa_apt_store_enabled()) {
+                let (burn_ref, burn_receipt) = coin::get_paired_burn_ref(burn_cap);
+                aptos_account::burn_from_fungible_store(&burn_ref, account, fee);
+                coin::return_paired_burn_ref(burn_ref, burn_receipt);
+            } else {
+                coin::burn_from<AptosCoin>(
+                    account,
+                    fee,
+                    burn_cap,
+                );
+            };
+        };
     }
 
     /// Mint refund in epilogue.
@@ -226,7 +249,23 @@ module aptos_framework::transaction_fee {
     /// Only called during genesis.
     public(friend) fun store_aptos_coin_burn_cap(aptos_framework: &signer, burn_cap: BurnCapability<AptosCoin>) {
         system_addresses::assert_aptos_framework(aptos_framework);
-        move_to(aptos_framework, AptosCoinCapabilities { burn_cap })
+
+        if (features::operations_default_to_fa_apt_store_enabled()) {
+            let burn_ref = coin::convert_and_take_paired_burn_ref(burn_cap);
+            move_to(aptos_framework, AptosFABurnCapabilities { burn_ref });
+        } else {
+            move_to(aptos_framework, AptosCoinCapabilities { burn_cap })
+        }
+    }
+
+    public entry fun convert_to_aptos_fa_burn_ref(aptos_framework: &signer) acquires AptosCoinCapabilities {
+        assert!(features::operations_default_to_fa_apt_store_enabled(), EFA_GAS_CHARGING_NOT_ENABLED);
+        system_addresses::assert_aptos_framework(aptos_framework);
+        let AptosCoinCapabilities {
+            burn_cap,
+        } = move_from<AptosCoinCapabilities>(signer::address_of(aptos_framework));
+        let burn_ref = coin::convert_and_take_paired_burn_ref(burn_cap);
+        move_to(aptos_framework, AptosFABurnCapabilities { burn_ref });
     }
 
     /// Only called during genesis.
diff --git a/aptos-move/framework/aptos-framework/sources/transaction_fee.spec.move b/aptos-move/framework/aptos-framework/sources/transaction_fee.spec.move
index dbdacb60260df..e11883f480788 100644
--- a/aptos-move/framework/aptos-framework/sources/transaction_fee.spec.move
+++ b/aptos-move/framework/aptos-framework/sources/transaction_fee.spec.move
@@ -51,11 +51,14 @@ spec aptos_framework::transaction_fee {
     ///
     spec module {
         use aptos_framework::chain_status;
-        pragma verify = true;
+
+        // TODO(fa_migration)
+        pragma verify = false;
+
         pragma aborts_if_is_strict;
         // property 1: Given the blockchain is in an operating state, it guarantees that the Aptos framework signer may burn Aptos coins.
         /// [high-level-req-1]
-        invariant [suspendable] chain_status::is_operating() ==> exists<AptosCoinCapabilities>(@aptos_framework);
+        invariant [suspendable] chain_status::is_operating() ==> exists<AptosCoinCapabilities>(@aptos_framework) || exists<AptosFABurnCapabilities>(@aptos_framework);
     }
 
     spec CollectedFeesPerBlock {
@@ -289,10 +292,17 @@ spec aptos_framework::transaction_fee {
     /// Aborts if `AptosCoinCapabilities` already exists.
     spec store_aptos_coin_burn_cap(aptos_framework: &signer, burn_cap: BurnCapability<AptosCoin>) {
         use std::signer;
+
+        // TODO(fa_migration)
+        pragma verify = false;
+
         let addr = signer::address_of(aptos_framework);
         aborts_if !system_addresses::is_aptos_framework_address(addr);
+
+        aborts_if exists<AptosFABurnCapabilities>(addr);
         aborts_if exists<AptosCoinCapabilities>(addr);
-        ensures exists<AptosCoinCapabilities>(addr);
+
+        ensures exists<AptosFABurnCapabilities>(addr) || exists<AptosCoinCapabilities>(addr);
     }
 
     /// Ensure caller is admin.
diff --git a/aptos-move/framework/aptos-framework/sources/transaction_validation.move b/aptos-move/framework/aptos-framework/sources/transaction_validation.move
index acd2fc809dd27..5949c93bf18e0 100644
--- a/aptos-move/framework/aptos-framework/sources/transaction_validation.move
+++ b/aptos-move/framework/aptos-framework/sources/transaction_validation.move
@@ -2,12 +2,11 @@ module aptos_framework::transaction_validation {
     use std::bcs;
     use std::error;
     use std::features;
-    use std::option;
-    use std::option::Option;
     use std::signer;
     use std::vector;
 
     use aptos_framework::account;
+    use aptos_framework::aptos_account;
     use aptos_framework::aptos_coin::AptosCoin;
     use aptos_framework::chain_id;
     use aptos_framework::coin;
@@ -48,7 +47,6 @@ module aptos_framework::transaction_validation {
     const PROLOGUE_ESEQUENCE_NUMBER_TOO_BIG: u64 = 1008;
     const PROLOGUE_ESECONDARY_KEYS_ADDRESSES_COUNT_MISMATCH: u64 = 1009;
     const PROLOGUE_EFEE_PAYER_NOT_ENABLED: u64 = 1010;
-    const PROLOGUE_EINSUFFICIENT_BALANCE_FOR_REQUIRED_DEPOSIT: u64 = 1011;
 
     /// Only called during genesis to initialize system resources for this module.
     public(friend) fun initialize(
@@ -72,25 +70,6 @@ module aptos_framework::transaction_validation {
         });
     }
 
-    /// Called in prologue to optionally hold some amount for special txns (e.g. randomness txns).
-    /// `return_deposit()` should be invoked in the corresponding epilogue with the same arguments.
-    fun collect_deposit(gas_payer: address, amount: Option<u64>) {
-        if (option::is_some(&amount)) {
-            let amount = option::extract(&mut amount);
-            let balance = coin::balance<AptosCoin>(gas_payer);
-            assert!(balance >= amount, error::invalid_state(PROLOGUE_EINSUFFICIENT_BALANCE_FOR_REQUIRED_DEPOSIT));
-            transaction_fee::burn_fee(gas_payer, amount);
-        }
-    }
-
-    /// Called in epilogue to optionally released the amount held in prologue for special txns (e.g. randomness txns).
-    fun return_deposit(gas_payer: address, amount: Option<u64>) {
-        if (option::is_some(&amount)) {
-            let amount = option::extract(&mut amount);
-            transaction_fee::mint_and_refund(gas_payer, amount);
-        }
-    }
-
     fun prologue_common(
         sender: signer,
         gas_payer: address,
@@ -111,9 +90,9 @@ module aptos_framework::transaction_validation {
 
         if (
             transaction_sender == gas_payer
-            || account::exists_at(transaction_sender)
-            || !features::sponsored_automatic_account_creation_enabled()
-            || txn_sequence_number > 0
+                || account::exists_at(transaction_sender)
+                || !features::sponsored_automatic_account_creation_enabled()
+                || txn_sequence_number > 0
         ) {
             assert!(account::exists_at(transaction_sender), error::invalid_argument(PROLOGUE_EACCOUNT_DOES_NOT_EXIST));
             assert!(
@@ -151,14 +130,18 @@ module aptos_framework::transaction_validation {
         };
 
         let max_transaction_fee = txn_gas_price * txn_max_gas_units;
-        assert!(
-            coin::is_account_registered<AptosCoin>(gas_payer),
-            error::invalid_argument(PROLOGUE_ECANT_PAY_GAS_DEPOSIT),
-        );
-        assert!(
-            coin::is_balance_at_least<AptosCoin>(gas_payer, max_transaction_fee),
-            error::invalid_argument(PROLOGUE_ECANT_PAY_GAS_DEPOSIT)
-        );
+
+        if (features::operations_default_to_fa_apt_store_enabled()) {
+            assert!(
+                aptos_account::is_fungible_balance_at_least(gas_payer, max_transaction_fee),
+                error::invalid_argument(PROLOGUE_ECANT_PAY_GAS_DEPOSIT)
+            );
+        } else {
+            assert!(
+                coin::is_balance_at_least<AptosCoin>(gas_payer, max_transaction_fee),
+                error::invalid_argument(PROLOGUE_ECANT_PAY_GAS_DEPOSIT)
+            );
+        }
     }
 
     fun script_prologue(
@@ -172,26 +155,16 @@ module aptos_framework::transaction_validation {
         _script_hash: vector<u8>,
     ) {
         let gas_payer = signer::address_of(&sender);
-        prologue_common(sender, gas_payer, txn_sequence_number, txn_public_key, txn_gas_price, txn_max_gas_units, txn_expiration_time, chain_id)
-    }
-
-    /// `script_prologue()` then collect an optional deposit depending on the txn.
-    ///
-    /// Deposit collection goes last so `script_prologue()` doesn't have to be aware of the deposit logic.
-    fun script_prologue_collect_deposit(
-        sender: signer,
-        txn_sequence_number: u64,
-        txn_public_key: vector<u8>,
-        txn_gas_price: u64,
-        txn_max_gas_units: u64,
-        txn_expiration_time: u64,
-        chain_id: u8,
-        script_hash: vector<u8>,
-        required_deposit: Option<u64>,
-    ) {
-        let gas_payer = signer::address_of(&sender);
-        script_prologue(sender, txn_sequence_number, txn_public_key, txn_gas_price, txn_max_gas_units, txn_expiration_time, chain_id, script_hash);
-        collect_deposit(gas_payer, required_deposit);
+        prologue_common(
+            sender,
+            gas_payer,
+            txn_sequence_number,
+            txn_public_key,
+            txn_gas_price,
+            txn_max_gas_units,
+            txn_expiration_time,
+            chain_id
+        )
     }
 
     fun multi_agent_script_prologue(
@@ -235,8 +208,8 @@ module aptos_framework::transaction_validation {
                 invariant i <= num_secondary_signers;
                 invariant forall j in 0..i:
                     account::exists_at(secondary_signer_addresses[j])
-                    && secondary_signer_public_key_hashes[j]
-                       == account::get_authentication_key(secondary_signer_addresses[j]);
+                        && secondary_signer_public_key_hashes[j]
+                        == account::get_authentication_key(secondary_signer_addresses[j]);
             };
             (i < num_secondary_signers)
         }) {
@@ -283,39 +256,6 @@ module aptos_framework::transaction_validation {
         );
     }
 
-    /// `fee_payer_script_prologue()` then collect an optional deposit depending on the txn.
-    ///
-    /// Deposit collection goes last so `fee_payer_script_prologue()` doesn't have to be aware of the deposit logic.
-    fun fee_payer_script_prologue_collect_deposit(
-        sender: signer,
-        txn_sequence_number: u64,
-        txn_sender_public_key: vector<u8>,
-        secondary_signer_addresses: vector<address>,
-        secondary_signer_public_key_hashes: vector<vector<u8>>,
-        fee_payer_address: address,
-        fee_payer_public_key_hash: vector<u8>,
-        txn_gas_price: u64,
-        txn_max_gas_units: u64,
-        txn_expiration_time: u64,
-        chain_id: u8,
-        required_deposit: Option<u64>,
-    ) {
-        fee_payer_script_prologue(
-            sender,
-            txn_sequence_number,
-            txn_sender_public_key,
-            secondary_signer_addresses,
-            secondary_signer_public_key_hashes,
-            fee_payer_address,
-            fee_payer_public_key_hash,
-            txn_gas_price,
-            txn_max_gas_units,
-            txn_expiration_time,
-            chain_id,
-        );
-        collect_deposit(fee_payer_address, required_deposit);
-    }
-
     /// Epilogue function is run after a transaction is successfully executed.
     /// Called by the Adapter
     fun epilogue(
@@ -329,28 +269,6 @@ module aptos_framework::transaction_validation {
         epilogue_gas_payer(account, addr, storage_fee_refunded, txn_gas_price, txn_max_gas_units, gas_units_remaining);
     }
 
-    /// Return the deposit held in prologue, then `epilogue()`.
-    ///
-    /// Deposit return goes first so `epilogue()` doesn't have to be aware of this change.
-    fun epilogue_return_deposit(
-        account: signer,
-        storage_fee_refunded: u64,
-        txn_gas_price: u64,
-        txn_max_gas_units: u64,
-        gas_units_remaining: u64,
-        required_deposit: Option<u64>,
-    ) {
-        let gas_payer = signer::address_of(&account);
-        return_deposit(gas_payer, required_deposit);
-        epilogue(
-            account,
-            storage_fee_refunded,
-            txn_gas_price,
-            txn_max_gas_units,
-            gas_units_remaining,
-        );
-    }
-
     /// Epilogue function with explicit gas payer specified, is run after a transaction is successfully executed.
     /// Called by the Adapter
     fun epilogue_gas_payer(
@@ -369,12 +287,20 @@ module aptos_framework::transaction_validation {
             error::out_of_range(EOUT_OF_GAS)
         );
         let transaction_fee_amount = txn_gas_price * gas_used;
+
         // it's important to maintain the error code consistent with vm
         // to do failed transaction cleanup.
-        assert!(
-            coin::is_balance_at_least<AptosCoin>(gas_payer, transaction_fee_amount),
-            error::out_of_range(PROLOGUE_ECANT_PAY_GAS_DEPOSIT),
-        );
+        if (features::operations_default_to_fa_apt_store_enabled()) {
+            assert!(
+                aptos_account::is_fungible_balance_at_least(gas_payer, transaction_fee_amount),
+                error::out_of_range(PROLOGUE_ECANT_PAY_GAS_DEPOSIT),
+            );
+        } else {
+            assert!(
+                coin::is_balance_at_least<AptosCoin>(gas_payer, transaction_fee_amount),
+                error::out_of_range(PROLOGUE_ECANT_PAY_GAS_DEPOSIT),
+            );
+        };
 
         let amount_to_burn = if (features::collect_and_distribute_gas_fees()) {
             // TODO(gas): We might want to distinguish the refundable part of the charge and burn it or track
@@ -403,27 +329,4 @@ module aptos_framework::transaction_validation {
         let addr = signer::address_of(&account);
         account::increment_sequence_number(addr);
     }
-
-    /// Return the deposit held in prologue to the gas payer, then `epilogue_gas_payer()`.
-    ///
-    /// Deposit return should go first so `epilogue_gas_payer()` doesn't have to be aware of this change.
-    fun epilogue_gas_payer_return_deposit(
-        account: signer,
-        gas_payer: address,
-        storage_fee_refunded: u64,
-        txn_gas_price: u64,
-        txn_max_gas_units: u64,
-        gas_units_remaining: u64,
-        required_deposit: Option<u64>,
-    ) {
-        return_deposit(gas_payer, required_deposit);
-        epilogue_gas_payer(
-            account,
-            gas_payer,
-            storage_fee_refunded,
-            txn_gas_price,
-            txn_max_gas_units,
-            gas_units_remaining,
-        );
-    }
 }
diff --git a/aptos-move/framework/aptos-framework/sources/transaction_validation.spec.move b/aptos-move/framework/aptos-framework/sources/transaction_validation.spec.move
index f50b7b7b0dc15..c0349586e5aef 100644
--- a/aptos-move/framework/aptos-framework/sources/transaction_validation.spec.move
+++ b/aptos-move/framework/aptos-framework/sources/transaction_validation.spec.move
@@ -31,19 +31,19 @@ spec aptos_framework::transaction_validation {
     /// Ensure caller is `aptos_framework`.
     /// Aborts if TransactionValidation already exists.
     spec initialize(
-        aptos_framework: &signer,
-        script_prologue_name: vector<u8>,
-        module_prologue_name: vector<u8>,
-        multi_agent_prologue_name: vector<u8>,
-        user_epilogue_name: vector<u8>,
-   ) {
+    aptos_framework: &signer,
+    script_prologue_name: vector<u8>,
+    module_prologue_name: vector<u8>,
+    multi_agent_prologue_name: vector<u8>,
+    user_epilogue_name: vector<u8>,
+    ) {
         use std::signer;
         let addr = signer::address_of(aptos_framework);
         aborts_if !system_addresses::is_aptos_framework_address(addr);
         aborts_if exists<TransactionValidation>(addr);
 
         ensures exists<TransactionValidation>(addr);
-   }
+    }
 
     /// Create a schema to reuse some code.
     /// Give some constraints that may abort according to the conditions.
@@ -71,14 +71,14 @@ spec aptos_framework::transaction_validation {
 
         aborts_if (
             !features::spec_is_enabled(features::SPONSORED_AUTOMATIC_ACCOUNT_CREATION)
-            || account::exists_at(transaction_sender)
-            || transaction_sender == gas_payer
-            || txn_sequence_number > 0
+                || account::exists_at(transaction_sender)
+                || transaction_sender == gas_payer
+                || txn_sequence_number > 0
         ) && (
             !(txn_sequence_number >= global<Account>(transaction_sender).sequence_number)
-            || !(txn_authentication_key == global<Account>(transaction_sender).authentication_key)
-            || !account::exists_at(transaction_sender)
-            || !(txn_sequence_number == global<Account>(transaction_sender).sequence_number)
+                || !(txn_authentication_key == global<Account>(transaction_sender).authentication_key)
+                || !account::exists_at(transaction_sender)
+                || !(txn_sequence_number == global<Account>(transaction_sender).sequence_number)
         );
 
         aborts_if features::spec_is_enabled(features::SPONSORED_AUTOMATIC_ACCOUNT_CREATION)
@@ -98,14 +98,14 @@ spec aptos_framework::transaction_validation {
     }
 
     spec prologue_common(
-        sender: signer,
-        gas_payer: address,
-        txn_sequence_number: u64,
-        txn_authentication_key: vector<u8>,
-        txn_gas_price: u64,
-        txn_max_gas_units: u64,
-        txn_expiration_time: u64,
-        chain_id: u8,
+    sender: signer,
+    gas_payer: address,
+    txn_sequence_number: u64,
+    txn_authentication_key: vector<u8>,
+    txn_gas_price: u64,
+    txn_max_gas_units: u64,
+    txn_expiration_time: u64,
+    chain_id: u8,
     ) {
         // TODO(fa_migration)
         pragma verify = false;
@@ -113,14 +113,14 @@ spec aptos_framework::transaction_validation {
     }
 
     spec script_prologue(
-        sender: signer,
-        txn_sequence_number: u64,
-        txn_public_key: vector<u8>,
-        txn_gas_price: u64,
-        txn_max_gas_units: u64,
-        txn_expiration_time: u64,
-        chain_id: u8,
-        _script_hash: vector<u8>,
+    sender: signer,
+    txn_sequence_number: u64,
+    txn_public_key: vector<u8>,
+    txn_gas_price: u64,
+    txn_max_gas_units: u64,
+    txn_expiration_time: u64,
+    chain_id: u8,
+    _script_hash: vector<u8>,
     ) {
         // TODO(fa_migration)
         pragma verify = false;
@@ -150,12 +150,12 @@ spec aptos_framework::transaction_validation {
         ensures forall i in 0..num_secondary_signers:
             account::exists_at(secondary_signer_addresses[i])
                 && secondary_signer_public_key_hashes[i] ==
-                    account::get_authentication_key(secondary_signer_addresses[i]);
+                account::get_authentication_key(secondary_signer_addresses[i]);
     }
 
     spec multi_agent_common_prologue(
-        secondary_signer_addresses: vector<address>,
-        secondary_signer_public_key_hashes: vector<vector<u8>>,
+    secondary_signer_addresses: vector<address>,
+    secondary_signer_public_key_hashes: vector<vector<u8>>,
     ) {
         include MultiAgentPrologueCommonAbortsIf {
             secondary_signer_addresses,
@@ -166,15 +166,15 @@ spec aptos_framework::transaction_validation {
     /// Aborts if length of public key hashed vector
     /// not equal the number of singers.
     spec multi_agent_script_prologue (
-        sender: signer,
-        txn_sequence_number: u64,
-        txn_sender_public_key: vector<u8>,
-        secondary_signer_addresses: vector<address>,
-        secondary_signer_public_key_hashes: vector<vector<u8>>,
-        txn_gas_price: u64,
-        txn_max_gas_units: u64,
-        txn_expiration_time: u64,
-        chain_id: u8,
+    sender: signer,
+    txn_sequence_number: u64,
+    txn_sender_public_key: vector<u8>,
+    secondary_signer_addresses: vector<address>,
+    secondary_signer_public_key_hashes: vector<vector<u8>>,
+    txn_gas_price: u64,
+    txn_max_gas_units: u64,
+    txn_expiration_time: u64,
+    chain_id: u8,
     ) {
         pragma verify_duration_estimate = 120;
         let gas_payer = signer::address_of(sender);
@@ -192,17 +192,17 @@ spec aptos_framework::transaction_validation {
     }
 
     spec fee_payer_script_prologue(
-        sender: signer,
-        txn_sequence_number: u64,
-        txn_sender_public_key: vector<u8>,
-        secondary_signer_addresses: vector<address>,
-        secondary_signer_public_key_hashes: vector<vector<u8>>,
-        fee_payer_address: address,
-        fee_payer_public_key_hash: vector<u8>,
-        txn_gas_price: u64,
-        txn_max_gas_units: u64,
-        txn_expiration_time: u64,
-        chain_id: u8,
+    sender: signer,
+    txn_sequence_number: u64,
+    txn_sender_public_key: vector<u8>,
+    secondary_signer_addresses: vector<address>,
+    secondary_signer_public_key_hashes: vector<vector<u8>>,
+    fee_payer_address: address,
+    fee_payer_public_key_hash: vector<u8>,
+    txn_gas_price: u64,
+    txn_max_gas_units: u64,
+    txn_expiration_time: u64,
+    chain_id: u8,
     ) {
         pragma verify_duration_estimate = 120;
 
@@ -223,15 +223,15 @@ spec aptos_framework::transaction_validation {
         aborts_if !features::spec_fee_payer_enabled();
     }
 
-        /// Abort according to the conditions.
+    /// Abort according to the conditions.
     /// `AptosCoinCapabilities` and `CoinInfo` should exists.
     /// Skip transaction_fee::burn_fee verification.
     spec epilogue(
-        account: signer,
-        storage_fee_refunded: u64,
-        txn_gas_price: u64,
-        txn_max_gas_units: u64,
-        gas_units_remaining: u64
+    account: signer,
+    storage_fee_refunded: u64,
+    txn_gas_price: u64,
+    txn_max_gas_units: u64,
+    gas_units_remaining: u64
     ) {
         // TODO(fa_migration)
         pragma verify = false;
@@ -242,12 +242,12 @@ spec aptos_framework::transaction_validation {
     /// `AptosCoinCapabilities` and `CoinInfo` should exist.
     /// Skip transaction_fee::burn_fee verification.
     spec epilogue_gas_payer(
-        account: signer,
-        gas_payer: address,
-        storage_fee_refunded: u64,
-        txn_gas_price: u64,
-        txn_max_gas_units: u64,
-        gas_units_remaining: u64
+    account: signer,
+    gas_payer: address,
+    storage_fee_refunded: u64,
+    txn_gas_price: u64,
+    txn_max_gas_units: u64,
+    gas_units_remaining: u64
     ) {
         // TODO(fa_migration)
         pragma verify = false;
@@ -307,7 +307,7 @@ spec aptos_framework::transaction_validation {
 
         // Check burning.
         //   (Check the total supply aggregator when enabled.)
-        let amount_to_burn= if (collect_fee_enabled) {
+        let amount_to_burn = if (collect_fee_enabled) {
             0
         } else {
             transaction_fee_amount - storage_fee_refunded
@@ -344,28 +344,4 @@ spec aptos_framework::transaction_validation {
         aborts_if (amount_to_mint != 0) && !exists<coin::CoinInfo<AptosCoin>>(aptos_addr);
         include coin::CoinAddAbortsIf<AptosCoin> { amount: amount_to_mint };
     }
-
-    spec collect_deposit {
-        pragma verify = false;
-    }
-
-    spec return_deposit {
-        pragma verify = false;
-    }
-
-    spec fee_payer_script_prologue_collect_deposit {
-        pragma verify = false;
-    }
-
-    spec script_prologue_collect_deposit {
-        pragma verify = false;
-    }
-
-    spec epilogue_gas_payer_return_deposit {
-        pragma verify = false;
-    }
-
-    spec epilogue_return_deposit {
-        pragma verify = false;
-    }
 }
diff --git a/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/account.md b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/account.md
new file mode 100644
index 0000000000000..de6eaf2b2afe6
--- /dev/null
+++ b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/account.md
@@ -0,0 +1,3371 @@
+
+<a id="0x1_account"></a>
+
+# Module `0x1::account`
+
+
+
+-  [Struct `KeyRotation`](#0x1_account_KeyRotation)
+-  [Resource `Account`](#0x1_account_Account)
+-  [Struct `KeyRotationEvent`](#0x1_account_KeyRotationEvent)
+-  [Struct `CoinRegisterEvent`](#0x1_account_CoinRegisterEvent)
+-  [Struct `CapabilityOffer`](#0x1_account_CapabilityOffer)
+-  [Struct `RotationCapability`](#0x1_account_RotationCapability)
+-  [Struct `SignerCapability`](#0x1_account_SignerCapability)
+-  [Resource `OriginatingAddress`](#0x1_account_OriginatingAddress)
+-  [Struct `RotationProofChallenge`](#0x1_account_RotationProofChallenge)
+-  [Struct `RotationCapabilityOfferProofChallenge`](#0x1_account_RotationCapabilityOfferProofChallenge)
+-  [Struct `SignerCapabilityOfferProofChallenge`](#0x1_account_SignerCapabilityOfferProofChallenge)
+-  [Struct `RotationCapabilityOfferProofChallengeV2`](#0x1_account_RotationCapabilityOfferProofChallengeV2)
+-  [Struct `SignerCapabilityOfferProofChallengeV2`](#0x1_account_SignerCapabilityOfferProofChallengeV2)
+-  [Constants](#@Constants_0)
+-  [Function `initialize`](#0x1_account_initialize)
+-  [Function `create_account_if_does_not_exist`](#0x1_account_create_account_if_does_not_exist)
+-  [Function `create_account`](#0x1_account_create_account)
+-  [Function `create_account_unchecked`](#0x1_account_create_account_unchecked)
+-  [Function `exists_at`](#0x1_account_exists_at)
+-  [Function `get_guid_next_creation_num`](#0x1_account_get_guid_next_creation_num)
+-  [Function `get_sequence_number`](#0x1_account_get_sequence_number)
+-  [Function `increment_sequence_number`](#0x1_account_increment_sequence_number)
+-  [Function `get_authentication_key`](#0x1_account_get_authentication_key)
+-  [Function `rotate_authentication_key_internal`](#0x1_account_rotate_authentication_key_internal)
+-  [Function `rotate_authentication_key_call`](#0x1_account_rotate_authentication_key_call)
+-  [Function `rotate_authentication_key`](#0x1_account_rotate_authentication_key)
+-  [Function `rotate_authentication_key_with_rotation_capability`](#0x1_account_rotate_authentication_key_with_rotation_capability)
+-  [Function `offer_rotation_capability`](#0x1_account_offer_rotation_capability)
+-  [Function `is_rotation_capability_offered`](#0x1_account_is_rotation_capability_offered)
+-  [Function `get_rotation_capability_offer_for`](#0x1_account_get_rotation_capability_offer_for)
+-  [Function `revoke_rotation_capability`](#0x1_account_revoke_rotation_capability)
+-  [Function `revoke_any_rotation_capability`](#0x1_account_revoke_any_rotation_capability)
+-  [Function `offer_signer_capability`](#0x1_account_offer_signer_capability)
+-  [Function `is_signer_capability_offered`](#0x1_account_is_signer_capability_offered)
+-  [Function `get_signer_capability_offer_for`](#0x1_account_get_signer_capability_offer_for)
+-  [Function `revoke_signer_capability`](#0x1_account_revoke_signer_capability)
+-  [Function `revoke_any_signer_capability`](#0x1_account_revoke_any_signer_capability)
+-  [Function `create_authorized_signer`](#0x1_account_create_authorized_signer)
+-  [Function `assert_valid_rotation_proof_signature_and_get_auth_key`](#0x1_account_assert_valid_rotation_proof_signature_and_get_auth_key)
+-  [Function `update_auth_key_and_originating_address_table`](#0x1_account_update_auth_key_and_originating_address_table)
+-  [Function `create_resource_address`](#0x1_account_create_resource_address)
+-  [Function `create_resource_account`](#0x1_account_create_resource_account)
+-  [Function `create_framework_reserved_account`](#0x1_account_create_framework_reserved_account)
+-  [Function `create_guid`](#0x1_account_create_guid)
+-  [Function `new_event_handle`](#0x1_account_new_event_handle)
+-  [Function `register_coin`](#0x1_account_register_coin)
+-  [Function `create_signer_with_capability`](#0x1_account_create_signer_with_capability)
+-  [Function `get_signer_capability_address`](#0x1_account_get_signer_capability_address)
+-  [Function `verify_signed_message`](#0x1_account_verify_signed_message)
+-  [Specification](#@Specification_1)
+    -  [High-level Requirements](#high-level-req)
+    -  [Module-level Specification](#module-level-spec)
+    -  [Function `initialize`](#@Specification_1_initialize)
+    -  [Function `create_account_if_does_not_exist`](#@Specification_1_create_account_if_does_not_exist)
+    -  [Function `create_account`](#@Specification_1_create_account)
+    -  [Function `create_account_unchecked`](#@Specification_1_create_account_unchecked)
+    -  [Function `exists_at`](#@Specification_1_exists_at)
+    -  [Function `get_guid_next_creation_num`](#@Specification_1_get_guid_next_creation_num)
+    -  [Function `get_sequence_number`](#@Specification_1_get_sequence_number)
+    -  [Function `increment_sequence_number`](#@Specification_1_increment_sequence_number)
+    -  [Function `get_authentication_key`](#@Specification_1_get_authentication_key)
+    -  [Function `rotate_authentication_key_internal`](#@Specification_1_rotate_authentication_key_internal)
+    -  [Function `rotate_authentication_key_call`](#@Specification_1_rotate_authentication_key_call)
+    -  [Function `rotate_authentication_key`](#@Specification_1_rotate_authentication_key)
+    -  [Function `rotate_authentication_key_with_rotation_capability`](#@Specification_1_rotate_authentication_key_with_rotation_capability)
+    -  [Function `offer_rotation_capability`](#@Specification_1_offer_rotation_capability)
+    -  [Function `is_rotation_capability_offered`](#@Specification_1_is_rotation_capability_offered)
+    -  [Function `get_rotation_capability_offer_for`](#@Specification_1_get_rotation_capability_offer_for)
+    -  [Function `revoke_rotation_capability`](#@Specification_1_revoke_rotation_capability)
+    -  [Function `revoke_any_rotation_capability`](#@Specification_1_revoke_any_rotation_capability)
+    -  [Function `offer_signer_capability`](#@Specification_1_offer_signer_capability)
+    -  [Function `is_signer_capability_offered`](#@Specification_1_is_signer_capability_offered)
+    -  [Function `get_signer_capability_offer_for`](#@Specification_1_get_signer_capability_offer_for)
+    -  [Function `revoke_signer_capability`](#@Specification_1_revoke_signer_capability)
+    -  [Function `revoke_any_signer_capability`](#@Specification_1_revoke_any_signer_capability)
+    -  [Function `create_authorized_signer`](#@Specification_1_create_authorized_signer)
+    -  [Function `assert_valid_rotation_proof_signature_and_get_auth_key`](#@Specification_1_assert_valid_rotation_proof_signature_and_get_auth_key)
+    -  [Function `update_auth_key_and_originating_address_table`](#@Specification_1_update_auth_key_and_originating_address_table)
+    -  [Function `create_resource_address`](#@Specification_1_create_resource_address)
+    -  [Function `create_resource_account`](#@Specification_1_create_resource_account)
+    -  [Function `create_framework_reserved_account`](#@Specification_1_create_framework_reserved_account)
+    -  [Function `create_guid`](#@Specification_1_create_guid)
+    -  [Function `new_event_handle`](#@Specification_1_new_event_handle)
+    -  [Function `register_coin`](#@Specification_1_register_coin)
+    -  [Function `create_signer_with_capability`](#@Specification_1_create_signer_with_capability)
+    -  [Function `verify_signed_message`](#@Specification_1_verify_signed_message)
+
+
+<pre><code><b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs">0x1::bcs</a>;
+<b>use</b> <a href="chain_id.md#0x1_chain_id">0x1::chain_id</a>;
+<b>use</b> <a href="create_signer.md#0x1_create_signer">0x1::create_signer</a>;
+<b>use</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/ed25519.md#0x1_ed25519">0x1::ed25519</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="event.md#0x1_event">0x1::event</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features">0x1::features</a>;
+<b>use</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs">0x1::from_bcs</a>;
+<b>use</b> <a href="guid.md#0x1_guid">0x1::guid</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/hash.md#0x1_hash">0x1::hash</a>;
+<b>use</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/multi_ed25519.md#0x1_multi_ed25519">0x1::multi_ed25519</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option">0x1::option</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">0x1::signer</a>;
+<b>use</b> <a href="system_addresses.md#0x1_system_addresses">0x1::system_addresses</a>;
+<b>use</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table">0x1::table</a>;
+<b>use</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info">0x1::type_info</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">0x1::vector</a>;
+</code></pre>
+
+
+
+<a id="0x1_account_KeyRotation"></a>
+
+## Struct `KeyRotation`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="account.md#0x1_account_KeyRotation">KeyRotation</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code><a href="account.md#0x1_account">account</a>: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>old_authentication_key: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>new_authentication_key: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_account_Account"></a>
+
+## Resource `Account`
+
+Resource representing an account.
+
+
+<pre><code><b>struct</b> <a href="account.md#0x1_account_Account">Account</a> <b>has</b> store, key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>authentication_key: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>sequence_number: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>guid_creation_num: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>coin_register_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="account.md#0x1_account_CoinRegisterEvent">account::CoinRegisterEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>key_rotation_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="account.md#0x1_account_KeyRotationEvent">account::KeyRotationEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>rotation_capability_offer: <a href="account.md#0x1_account_CapabilityOffer">account::CapabilityOffer</a>&lt;<a href="account.md#0x1_account_RotationCapability">account::RotationCapability</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>signer_capability_offer: <a href="account.md#0x1_account_CapabilityOffer">account::CapabilityOffer</a>&lt;<a href="account.md#0x1_account_SignerCapability">account::SignerCapability</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_account_KeyRotationEvent"></a>
+
+## Struct `KeyRotationEvent`
+
+
+
+<pre><code><b>struct</b> <a href="account.md#0x1_account_KeyRotationEvent">KeyRotationEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>old_authentication_key: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>new_authentication_key: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_account_CoinRegisterEvent"></a>
+
+## Struct `CoinRegisterEvent`
+
+
+
+<pre><code><b>struct</b> <a href="account.md#0x1_account_CoinRegisterEvent">CoinRegisterEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code><a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info">type_info</a>: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_TypeInfo">type_info::TypeInfo</a></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_account_CapabilityOffer"></a>
+
+## Struct `CapabilityOffer`
+
+
+
+<pre><code><b>struct</b> <a href="account.md#0x1_account_CapabilityOffer">CapabilityOffer</a>&lt;T&gt; <b>has</b> store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>for: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<b>address</b>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_account_RotationCapability"></a>
+
+## Struct `RotationCapability`
+
+
+
+<pre><code><b>struct</b> <a href="account.md#0x1_account_RotationCapability">RotationCapability</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code><a href="account.md#0x1_account">account</a>: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_account_SignerCapability"></a>
+
+## Struct `SignerCapability`
+
+
+
+<pre><code><b>struct</b> <a href="account.md#0x1_account_SignerCapability">SignerCapability</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code><a href="account.md#0x1_account">account</a>: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_account_OriginatingAddress"></a>
+
+## Resource `OriginatingAddress`
+
+It is easy to fetch the authentication key of an address by simply reading it from the <code><a href="account.md#0x1_account_Account">Account</a></code> struct at that address.
+The table in this struct makes it possible to do a reverse lookup: it maps an authentication key, to the address of the account which has that authentication key set.
+
+This mapping is needed when recovering wallets for accounts whose authentication key has been rotated.
+
+For example, imagine a freshly-created wallet with address <code>a</code> and thus also with authentication key <code>a</code>, derived from a PK <code>pk_a</code> with corresponding SK <code>sk_a</code>.
+It is easy to recover such a wallet given just the secret key <code>sk_a</code>, since the PK can be derived from the SK, the authentication key can then be derived from the PK, and the address equals the authentication key (since there was no key rotation).
+
+However, if such a wallet rotates its authentication key to <code>b</code> derived from a different PK <code>pk_b</code> with SK <code>sk_b</code>, how would account recovery work?
+The recovered address would no longer be 'a'; it would be <code>b</code>, which is incorrect.
+This struct solves this problem by mapping the new authentication key <code>b</code> to the original address <code>a</code> and thus helping the wallet software during recovery find the correct address.
+
+
+<pre><code><b>struct</b> <a href="account.md#0x1_account_OriginatingAddress">OriginatingAddress</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>address_map: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_Table">table::Table</a>&lt;<b>address</b>, <b>address</b>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_account_RotationProofChallenge"></a>
+
+## Struct `RotationProofChallenge`
+
+This structs stores the challenge message that should be signed during key rotation. First, this struct is
+signed by the account owner's current public key, which proves possession of a capability to rotate the key.
+Second, this struct is signed by the new public key that the account owner wants to rotate to, which proves
+knowledge of this new public key's associated secret key. These two signatures cannot be replayed in another
+context because they include the TXN's unique sequence number.
+
+
+<pre><code><b>struct</b> <a href="account.md#0x1_account_RotationProofChallenge">RotationProofChallenge</a> <b>has</b> <b>copy</b>, drop
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>sequence_number: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>originator: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>current_auth_key: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>new_public_key: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_account_RotationCapabilityOfferProofChallenge"></a>
+
+## Struct `RotationCapabilityOfferProofChallenge`
+
+Deprecated struct - newest version is <code><a href="account.md#0x1_account_RotationCapabilityOfferProofChallengeV2">RotationCapabilityOfferProofChallengeV2</a></code>
+
+
+<pre><code><b>struct</b> <a href="account.md#0x1_account_RotationCapabilityOfferProofChallenge">RotationCapabilityOfferProofChallenge</a> <b>has</b> drop
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>sequence_number: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>recipient_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_account_SignerCapabilityOfferProofChallenge"></a>
+
+## Struct `SignerCapabilityOfferProofChallenge`
+
+Deprecated struct - newest version is <code><a href="account.md#0x1_account_SignerCapabilityOfferProofChallengeV2">SignerCapabilityOfferProofChallengeV2</a></code>
+
+
+<pre><code><b>struct</b> <a href="account.md#0x1_account_SignerCapabilityOfferProofChallenge">SignerCapabilityOfferProofChallenge</a> <b>has</b> drop
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>sequence_number: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>recipient_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_account_RotationCapabilityOfferProofChallengeV2"></a>
+
+## Struct `RotationCapabilityOfferProofChallengeV2`
+
+This struct stores the challenge message that should be signed by the source account, when the source account
+is delegating its rotation capability to the <code>recipient_address</code>.
+This V2 struct adds the <code><a href="chain_id.md#0x1_chain_id">chain_id</a></code> and <code>source_address</code> to the challenge message, which prevents replaying the challenge message.
+
+
+<pre><code><b>struct</b> <a href="account.md#0x1_account_RotationCapabilityOfferProofChallengeV2">RotationCapabilityOfferProofChallengeV2</a> <b>has</b> drop
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code><a href="chain_id.md#0x1_chain_id">chain_id</a>: u8</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>sequence_number: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>source_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>recipient_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_account_SignerCapabilityOfferProofChallengeV2"></a>
+
+## Struct `SignerCapabilityOfferProofChallengeV2`
+
+
+
+<pre><code><b>struct</b> <a href="account.md#0x1_account_SignerCapabilityOfferProofChallengeV2">SignerCapabilityOfferProofChallengeV2</a> <b>has</b> <b>copy</b>, drop
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>sequence_number: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>source_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>recipient_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_account_MAX_U64"></a>
+
+
+
+<pre><code><b>const</b> <a href="account.md#0x1_account_MAX_U64">MAX_U64</a>: u128 = 18446744073709551615;
+</code></pre>
+
+
+
+<a id="0x1_account_DERIVE_RESOURCE_ACCOUNT_SCHEME"></a>
+
+Scheme identifier used when hashing an account's address together with a seed to derive the address (not the
+authentication key) of a resource account. This is an abuse of the notion of a scheme identifier which, for now,
+serves to domain separate hashes used to derive resource account addresses from hashes used to derive
+authentication keys. Without such separation, an adversary could create (and get a signer for) a resource account
+whose address matches an existing address of a MultiEd25519 wallet.
+
+
+<pre><code><b>const</b> <a href="account.md#0x1_account_DERIVE_RESOURCE_ACCOUNT_SCHEME">DERIVE_RESOURCE_ACCOUNT_SCHEME</a>: u8 = 255;
+</code></pre>
+
+
+
+<a id="0x1_account_EACCOUNT_ALREADY_EXISTS"></a>
+
+Account already exists
+
+
+<pre><code><b>const</b> <a href="account.md#0x1_account_EACCOUNT_ALREADY_EXISTS">EACCOUNT_ALREADY_EXISTS</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_account_EACCOUNT_ALREADY_USED"></a>
+
+An attempt to create a resource account on an account that has a committed transaction
+
+
+<pre><code><b>const</b> <a href="account.md#0x1_account_EACCOUNT_ALREADY_USED">EACCOUNT_ALREADY_USED</a>: u64 = 16;
+</code></pre>
+
+
+
+<a id="0x1_account_EACCOUNT_DOES_NOT_EXIST"></a>
+
+Account does not exist
+
+
+<pre><code><b>const</b> <a href="account.md#0x1_account_EACCOUNT_DOES_NOT_EXIST">EACCOUNT_DOES_NOT_EXIST</a>: u64 = 2;
+</code></pre>
+
+
+
+<a id="0x1_account_ECANNOT_RESERVED_ADDRESS"></a>
+
+Cannot create account because address is reserved
+
+
+<pre><code><b>const</b> <a href="account.md#0x1_account_ECANNOT_RESERVED_ADDRESS">ECANNOT_RESERVED_ADDRESS</a>: u64 = 5;
+</code></pre>
+
+
+
+<a id="0x1_account_ED25519_SCHEME"></a>
+
+Scheme identifier for Ed25519 signatures used to derive authentication keys for Ed25519 public keys.
+
+
+<pre><code><b>const</b> <a href="account.md#0x1_account_ED25519_SCHEME">ED25519_SCHEME</a>: u8 = 0;
+</code></pre>
+
+
+
+<a id="0x1_account_EEXCEEDED_MAX_GUID_CREATION_NUM"></a>
+
+
+
+<pre><code><b>const</b> <a href="account.md#0x1_account_EEXCEEDED_MAX_GUID_CREATION_NUM">EEXCEEDED_MAX_GUID_CREATION_NUM</a>: u64 = 20;
+</code></pre>
+
+
+
+<a id="0x1_account_EINVALID_ACCEPT_ROTATION_CAPABILITY"></a>
+
+The caller does not have a valid rotation capability offer from the other account
+
+
+<pre><code><b>const</b> <a href="account.md#0x1_account_EINVALID_ACCEPT_ROTATION_CAPABILITY">EINVALID_ACCEPT_ROTATION_CAPABILITY</a>: u64 = 10;
+</code></pre>
+
+
+
+<a id="0x1_account_EINVALID_ORIGINATING_ADDRESS"></a>
+
+Abort the transaction if the expected originating address is different from the originating address on-chain
+
+
+<pre><code><b>const</b> <a href="account.md#0x1_account_EINVALID_ORIGINATING_ADDRESS">EINVALID_ORIGINATING_ADDRESS</a>: u64 = 13;
+</code></pre>
+
+
+
+<a id="0x1_account_EINVALID_PROOF_OF_KNOWLEDGE"></a>
+
+Specified proof of knowledge required to prove ownership of a public key is invalid
+
+
+<pre><code><b>const</b> <a href="account.md#0x1_account_EINVALID_PROOF_OF_KNOWLEDGE">EINVALID_PROOF_OF_KNOWLEDGE</a>: u64 = 8;
+</code></pre>
+
+
+
+<a id="0x1_account_EINVALID_SCHEME"></a>
+
+Specified scheme required to proceed with the smart contract operation - can only be ED25519_SCHEME(0) OR MULTI_ED25519_SCHEME(1)
+
+
+<pre><code><b>const</b> <a href="account.md#0x1_account_EINVALID_SCHEME">EINVALID_SCHEME</a>: u64 = 12;
+</code></pre>
+
+
+
+<a id="0x1_account_EMALFORMED_AUTHENTICATION_KEY"></a>
+
+The provided authentication key has an invalid length
+
+
+<pre><code><b>const</b> <a href="account.md#0x1_account_EMALFORMED_AUTHENTICATION_KEY">EMALFORMED_AUTHENTICATION_KEY</a>: u64 = 4;
+</code></pre>
+
+
+
+<a id="0x1_account_ENO_CAPABILITY"></a>
+
+The caller does not have a digital-signature-based capability to call this function
+
+
+<pre><code><b>const</b> <a href="account.md#0x1_account_ENO_CAPABILITY">ENO_CAPABILITY</a>: u64 = 9;
+</code></pre>
+
+
+
+<a id="0x1_account_ENO_SIGNER_CAPABILITY_OFFERED"></a>
+
+
+
+<pre><code><b>const</b> <a href="account.md#0x1_account_ENO_SIGNER_CAPABILITY_OFFERED">ENO_SIGNER_CAPABILITY_OFFERED</a>: u64 = 19;
+</code></pre>
+
+
+
+<a id="0x1_account_ENO_SUCH_ROTATION_CAPABILITY_OFFER"></a>
+
+The specified rotation capablity offer does not exist at the specified offerer address
+
+
+<pre><code><b>const</b> <a href="account.md#0x1_account_ENO_SUCH_ROTATION_CAPABILITY_OFFER">ENO_SUCH_ROTATION_CAPABILITY_OFFER</a>: u64 = 18;
+</code></pre>
+
+
+
+<a id="0x1_account_ENO_SUCH_SIGNER_CAPABILITY"></a>
+
+The signer capability offer doesn't exist at the given address
+
+
+<pre><code><b>const</b> <a href="account.md#0x1_account_ENO_SUCH_SIGNER_CAPABILITY">ENO_SUCH_SIGNER_CAPABILITY</a>: u64 = 14;
+</code></pre>
+
+
+
+<a id="0x1_account_ENO_VALID_FRAMEWORK_RESERVED_ADDRESS"></a>
+
+Address to create is not a valid reserved address for Aptos framework
+
+
+<pre><code><b>const</b> <a href="account.md#0x1_account_ENO_VALID_FRAMEWORK_RESERVED_ADDRESS">ENO_VALID_FRAMEWORK_RESERVED_ADDRESS</a>: u64 = 11;
+</code></pre>
+
+
+
+<a id="0x1_account_EOFFERER_ADDRESS_DOES_NOT_EXIST"></a>
+
+Offerer address doesn't exist
+
+
+<pre><code><b>const</b> <a href="account.md#0x1_account_EOFFERER_ADDRESS_DOES_NOT_EXIST">EOFFERER_ADDRESS_DOES_NOT_EXIST</a>: u64 = 17;
+</code></pre>
+
+
+
+<a id="0x1_account_EOUT_OF_GAS"></a>
+
+Transaction exceeded its allocated max gas
+
+
+<pre><code><b>const</b> <a href="account.md#0x1_account_EOUT_OF_GAS">EOUT_OF_GAS</a>: u64 = 6;
+</code></pre>
+
+
+
+<a id="0x1_account_ERESOURCE_ACCCOUNT_EXISTS"></a>
+
+An attempt to create a resource account on a claimed account
+
+
+<pre><code><b>const</b> <a href="account.md#0x1_account_ERESOURCE_ACCCOUNT_EXISTS">ERESOURCE_ACCCOUNT_EXISTS</a>: u64 = 15;
+</code></pre>
+
+
+
+<a id="0x1_account_ESEQUENCE_NUMBER_TOO_BIG"></a>
+
+Sequence number exceeds the maximum value for a u64
+
+
+<pre><code><b>const</b> <a href="account.md#0x1_account_ESEQUENCE_NUMBER_TOO_BIG">ESEQUENCE_NUMBER_TOO_BIG</a>: u64 = 3;
+</code></pre>
+
+
+
+<a id="0x1_account_EWRONG_CURRENT_PUBLIC_KEY"></a>
+
+Specified current public key is not correct
+
+
+<pre><code><b>const</b> <a href="account.md#0x1_account_EWRONG_CURRENT_PUBLIC_KEY">EWRONG_CURRENT_PUBLIC_KEY</a>: u64 = 7;
+</code></pre>
+
+
+
+<a id="0x1_account_MAX_GUID_CREATION_NUM"></a>
+
+Explicitly separate the GUID space between Object and Account to prevent accidental overlap.
+
+
+<pre><code><b>const</b> <a href="account.md#0x1_account_MAX_GUID_CREATION_NUM">MAX_GUID_CREATION_NUM</a>: u64 = 1125899906842624;
+</code></pre>
+
+
+
+<a id="0x1_account_MULTI_ED25519_SCHEME"></a>
+
+Scheme identifier for MultiEd25519 signatures used to derive authentication keys for MultiEd25519 public keys.
+
+
+<pre><code><b>const</b> <a href="account.md#0x1_account_MULTI_ED25519_SCHEME">MULTI_ED25519_SCHEME</a>: u8 = 1;
+</code></pre>
+
+
+
+<a id="0x1_account_ZERO_AUTH_KEY"></a>
+
+
+
+<pre><code><b>const</b> <a href="account.md#0x1_account_ZERO_AUTH_KEY">ZERO_AUTH_KEY</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
+</code></pre>
+
+
+
+<a id="0x1_account_initialize"></a>
+
+## Function `initialize`
+
+Only called during genesis to initialize system resources for this module.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="account.md#0x1_account_initialize">initialize</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="account.md#0x1_account_initialize">initialize</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>) {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(aptos_framework);
+    <b>move_to</b>(aptos_framework, <a href="account.md#0x1_account_OriginatingAddress">OriginatingAddress</a> {
+        address_map: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_new">table::new</a>(),
+    });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_account_create_account_if_does_not_exist"></a>
+
+## Function `create_account_if_does_not_exist`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="account.md#0x1_account_create_account_if_does_not_exist">create_account_if_does_not_exist</a>(account_address: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="account.md#0x1_account_create_account_if_does_not_exist">create_account_if_does_not_exist</a>(account_address: <b>address</b>) {
+    <b>if</b> (!<b>exists</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(account_address)) {
+        <a href="account.md#0x1_account_create_account">create_account</a>(account_address);
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_account_create_account"></a>
+
+## Function `create_account`
+
+Publishes a new <code><a href="account.md#0x1_account_Account">Account</a></code> resource under <code>new_address</code>. A signer representing <code>new_address</code>
+is returned. This way, the caller of this function can publish additional resources under
+<code>new_address</code>.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="account.md#0x1_account_create_account">create_account</a>(new_address: <b>address</b>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="account.md#0x1_account_create_account">create_account</a>(new_address: <b>address</b>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a> {
+    // there cannot be an <a href="account.md#0x1_account_Account">Account</a> resource under new_addr already.
+    <b>assert</b>!(!<b>exists</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(new_address), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_already_exists">error::already_exists</a>(<a href="account.md#0x1_account_EACCOUNT_ALREADY_EXISTS">EACCOUNT_ALREADY_EXISTS</a>));
+
+    // NOTE: @core_resources gets created via a `create_account` call, so we do not <b>include</b> it below.
+    <b>assert</b>!(
+        new_address != @vm_reserved && new_address != @aptos_framework && new_address != @aptos_token,
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="account.md#0x1_account_ECANNOT_RESERVED_ADDRESS">ECANNOT_RESERVED_ADDRESS</a>)
+    );
+
+    <a href="account.md#0x1_account_create_account_unchecked">create_account_unchecked</a>(new_address)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_account_create_account_unchecked"></a>
+
+## Function `create_account_unchecked`
+
+
+
+<pre><code><b>fun</b> <a href="account.md#0x1_account_create_account_unchecked">create_account_unchecked</a>(new_address: <b>address</b>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="account.md#0x1_account_create_account_unchecked">create_account_unchecked</a>(new_address: <b>address</b>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a> {
+    <b>let</b> new_account = <a href="create_signer.md#0x1_create_signer">create_signer</a>(new_address);
+    <b>let</b> authentication_key = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs_to_bytes">bcs::to_bytes</a>(&new_address);
+    <b>assert</b>!(
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&authentication_key) == 32,
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="account.md#0x1_account_EMALFORMED_AUTHENTICATION_KEY">EMALFORMED_AUTHENTICATION_KEY</a>)
+    );
+
+    <b>let</b> guid_creation_num = 0;
+
+    <b>let</b> guid_for_coin = <a href="guid.md#0x1_guid_create">guid::create</a>(new_address, &<b>mut</b> guid_creation_num);
+    <b>let</b> coin_register_events = <a href="event.md#0x1_event_new_event_handle">event::new_event_handle</a>&lt;<a href="account.md#0x1_account_CoinRegisterEvent">CoinRegisterEvent</a>&gt;(guid_for_coin);
+
+    <b>let</b> guid_for_rotation = <a href="guid.md#0x1_guid_create">guid::create</a>(new_address, &<b>mut</b> guid_creation_num);
+    <b>let</b> key_rotation_events = <a href="event.md#0x1_event_new_event_handle">event::new_event_handle</a>&lt;<a href="account.md#0x1_account_KeyRotationEvent">KeyRotationEvent</a>&gt;(guid_for_rotation);
+
+    <b>move_to</b>(
+        &new_account,
+        <a href="account.md#0x1_account_Account">Account</a> {
+            authentication_key,
+            sequence_number: 0,
+            guid_creation_num,
+            coin_register_events,
+            key_rotation_events,
+            rotation_capability_offer: <a href="account.md#0x1_account_CapabilityOffer">CapabilityOffer</a> { for: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>() },
+            signer_capability_offer: <a href="account.md#0x1_account_CapabilityOffer">CapabilityOffer</a> { for: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>() },
+        }
+    );
+
+    new_account
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_account_exists_at"></a>
+
+## Function `exists_at`
+
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="account.md#0x1_account_exists_at">exists_at</a>(addr: <b>address</b>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="account.md#0x1_account_exists_at">exists_at</a>(addr: <b>address</b>): bool {
+    <b>exists</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(addr)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_account_get_guid_next_creation_num"></a>
+
+## Function `get_guid_next_creation_num`
+
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="account.md#0x1_account_get_guid_next_creation_num">get_guid_next_creation_num</a>(addr: <b>address</b>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="account.md#0x1_account_get_guid_next_creation_num">get_guid_next_creation_num</a>(addr: <b>address</b>): u64 <b>acquires</b> <a href="account.md#0x1_account_Account">Account</a> {
+    <b>borrow_global</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(addr).guid_creation_num
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_account_get_sequence_number"></a>
+
+## Function `get_sequence_number`
+
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="account.md#0x1_account_get_sequence_number">get_sequence_number</a>(addr: <b>address</b>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="account.md#0x1_account_get_sequence_number">get_sequence_number</a>(addr: <b>address</b>): u64 <b>acquires</b> <a href="account.md#0x1_account_Account">Account</a> {
+    <b>borrow_global</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(addr).sequence_number
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_account_increment_sequence_number"></a>
+
+## Function `increment_sequence_number`
+
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="account.md#0x1_account_increment_sequence_number">increment_sequence_number</a>(addr: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="account.md#0x1_account_increment_sequence_number">increment_sequence_number</a>(addr: <b>address</b>) <b>acquires</b> <a href="account.md#0x1_account_Account">Account</a> {
+    <b>let</b> sequence_number = &<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(addr).sequence_number;
+
+    <b>assert</b>!(
+        (*sequence_number <b>as</b> u128) &lt; <a href="account.md#0x1_account_MAX_U64">MAX_U64</a>,
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_out_of_range">error::out_of_range</a>(<a href="account.md#0x1_account_ESEQUENCE_NUMBER_TOO_BIG">ESEQUENCE_NUMBER_TOO_BIG</a>)
+    );
+
+    *sequence_number = *sequence_number + 1;
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_account_get_authentication_key"></a>
+
+## Function `get_authentication_key`
+
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="account.md#0x1_account_get_authentication_key">get_authentication_key</a>(addr: <b>address</b>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="account.md#0x1_account_get_authentication_key">get_authentication_key</a>(addr: <b>address</b>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; <b>acquires</b> <a href="account.md#0x1_account_Account">Account</a> {
+    <b>borrow_global</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(addr).authentication_key
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_account_rotate_authentication_key_internal"></a>
+
+## Function `rotate_authentication_key_internal`
+
+This function is used to rotate a resource account's authentication key to <code>new_auth_key</code>. This is done in
+many contexts:
+1. During normal key rotation via <code>rotate_authentication_key</code> or <code>rotate_authentication_key_call</code>
+2. During resource account initialization so that no private key can control the resource account
+3. During multisig_v2 account creation
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="account.md#0x1_account_rotate_authentication_key_internal">rotate_authentication_key_internal</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, new_auth_key: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="account.md#0x1_account_rotate_authentication_key_internal">rotate_authentication_key_internal</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, new_auth_key: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;) <b>acquires</b> <a href="account.md#0x1_account_Account">Account</a> {
+    <b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>);
+    <b>assert</b>!(<a href="account.md#0x1_account_exists_at">exists_at</a>(addr), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="account.md#0x1_account_EACCOUNT_DOES_NOT_EXIST">EACCOUNT_DOES_NOT_EXIST</a>));
+    <b>assert</b>!(
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&new_auth_key) == 32,
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="account.md#0x1_account_EMALFORMED_AUTHENTICATION_KEY">EMALFORMED_AUTHENTICATION_KEY</a>)
+    );
+    <b>let</b> account_resource = <b>borrow_global_mut</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(addr);
+    account_resource.authentication_key = new_auth_key;
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_account_rotate_authentication_key_call"></a>
+
+## Function `rotate_authentication_key_call`
+
+Private entry function for key rotation that allows the signer to update their authentication key.
+Note that this does not update the <code><a href="account.md#0x1_account_OriginatingAddress">OriginatingAddress</a></code> table because the <code>new_auth_key</code> is not "verified": it
+does not come with a proof-of-knowledge of the underlying SK. Nonetheless, we need this functionality due to
+the introduction of non-standard key algorithms, such as passkeys, which cannot produce proofs-of-knowledge in
+the format expected in <code>rotate_authentication_key</code>.
+
+
+<pre><code>entry <b>fun</b> <a href="account.md#0x1_account_rotate_authentication_key_call">rotate_authentication_key_call</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, new_auth_key: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>entry <b>fun</b> <a href="account.md#0x1_account_rotate_authentication_key_call">rotate_authentication_key_call</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, new_auth_key: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;) <b>acquires</b> <a href="account.md#0x1_account_Account">Account</a> {
+    <a href="account.md#0x1_account_rotate_authentication_key_internal">rotate_authentication_key_internal</a>(<a href="account.md#0x1_account">account</a>, new_auth_key);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_account_rotate_authentication_key"></a>
+
+## Function `rotate_authentication_key`
+
+Generic authentication key rotation function that allows the user to rotate their authentication key from any scheme to any scheme.
+To authorize the rotation, we need two signatures:
+- the first signature <code>cap_rotate_key</code> refers to the signature by the account owner's current key on a valid <code><a href="account.md#0x1_account_RotationProofChallenge">RotationProofChallenge</a></code>,
+demonstrating that the user intends to and has the capability to rotate the authentication key of this account;
+- the second signature <code>cap_update_table</code> refers to the signature by the new key (that the account owner wants to rotate to) on a
+valid <code><a href="account.md#0x1_account_RotationProofChallenge">RotationProofChallenge</a></code>, demonstrating that the user owns the new private key, and has the authority to update the
+<code><a href="account.md#0x1_account_OriginatingAddress">OriginatingAddress</a></code> map with the new address mapping <code>&lt;new_address, originating_address&gt;</code>.
+To verify these two signatures, we need their corresponding public key and public key scheme: we use <code>from_scheme</code> and <code>from_public_key_bytes</code>
+to verify <code>cap_rotate_key</code>, and <code>to_scheme</code> and <code>to_public_key_bytes</code> to verify <code>cap_update_table</code>.
+A scheme of 0 refers to an Ed25519 key and a scheme of 1 refers to Multi-Ed25519 keys.
+<code>originating <b>address</b></code> refers to an account's original/first address.
+
+Here is an example attack if we don't ask for the second signature <code>cap_update_table</code>:
+Alice has rotated her account <code>addr_a</code> to <code>new_addr_a</code>. As a result, the following entry is created, to help Alice when recovering her wallet:
+<code><a href="account.md#0x1_account_OriginatingAddress">OriginatingAddress</a>[new_addr_a]</code> -> <code>addr_a</code>
+Alice has had bad day: her laptop blew up and she needs to reset her account on a new one.
+(Fortunately, she still has her secret key <code>new_sk_a</code> associated with her new address <code>new_addr_a</code>, so she can do this.)
+
+But Bob likes to mess with Alice.
+Bob creates an account <code>addr_b</code> and maliciously rotates it to Alice's new address <code>new_addr_a</code>. Since we are no longer checking a PoK,
+Bob can easily do this.
+
+Now, the table will be updated to make Alice's new address point to Bob's address: <code><a href="account.md#0x1_account_OriginatingAddress">OriginatingAddress</a>[new_addr_a]</code> -> <code>addr_b</code>.
+When Alice recovers her account, her wallet will display the attacker's address (Bob's) <code>addr_b</code> as her address.
+Now Alice will give <code>addr_b</code> to everyone to pay her, but the money will go to Bob.
+
+Because we ask for a valid <code>cap_update_table</code>, this kind of attack is not possible. Bob would not have the secret key of Alice's address
+to rotate his address to Alice's address in the first place.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="account.md#0x1_account_rotate_authentication_key">rotate_authentication_key</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, from_scheme: u8, from_public_key_bytes: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, to_scheme: u8, to_public_key_bytes: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, cap_rotate_key: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, cap_update_table: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="account.md#0x1_account_rotate_authentication_key">rotate_authentication_key</a>(
+    <a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    from_scheme: u8,
+    from_public_key_bytes: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    to_scheme: u8,
+    to_public_key_bytes: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    cap_rotate_key: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    cap_update_table: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+) <b>acquires</b> <a href="account.md#0x1_account_Account">Account</a>, <a href="account.md#0x1_account_OriginatingAddress">OriginatingAddress</a> {
+    <b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>);
+    <b>assert</b>!(<a href="account.md#0x1_account_exists_at">exists_at</a>(addr), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="account.md#0x1_account_EACCOUNT_DOES_NOT_EXIST">EACCOUNT_DOES_NOT_EXIST</a>));
+    <b>let</b> account_resource = <b>borrow_global_mut</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(addr);
+
+    // Verify the given `from_public_key_bytes` matches this <a href="account.md#0x1_account">account</a>'s current authentication key.
+    <b>if</b> (from_scheme == <a href="account.md#0x1_account_ED25519_SCHEME">ED25519_SCHEME</a>) {
+        <b>let</b> from_pk = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/ed25519.md#0x1_ed25519_new_unvalidated_public_key_from_bytes">ed25519::new_unvalidated_public_key_from_bytes</a>(from_public_key_bytes);
+        <b>let</b> from_auth_key = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/ed25519.md#0x1_ed25519_unvalidated_public_key_to_authentication_key">ed25519::unvalidated_public_key_to_authentication_key</a>(&from_pk);
+        <b>assert</b>!(
+            account_resource.authentication_key == from_auth_key,
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_unauthenticated">error::unauthenticated</a>(<a href="account.md#0x1_account_EWRONG_CURRENT_PUBLIC_KEY">EWRONG_CURRENT_PUBLIC_KEY</a>)
+        );
+    } <b>else</b> <b>if</b> (from_scheme == <a href="account.md#0x1_account_MULTI_ED25519_SCHEME">MULTI_ED25519_SCHEME</a>) {
+        <b>let</b> from_pk = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/multi_ed25519.md#0x1_multi_ed25519_new_unvalidated_public_key_from_bytes">multi_ed25519::new_unvalidated_public_key_from_bytes</a>(from_public_key_bytes);
+        <b>let</b> from_auth_key = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/multi_ed25519.md#0x1_multi_ed25519_unvalidated_public_key_to_authentication_key">multi_ed25519::unvalidated_public_key_to_authentication_key</a>(&from_pk);
+        <b>assert</b>!(
+            account_resource.authentication_key == from_auth_key,
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_unauthenticated">error::unauthenticated</a>(<a href="account.md#0x1_account_EWRONG_CURRENT_PUBLIC_KEY">EWRONG_CURRENT_PUBLIC_KEY</a>)
+        );
+    } <b>else</b> {
+        <b>abort</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="account.md#0x1_account_EINVALID_SCHEME">EINVALID_SCHEME</a>)
+    };
+
+    // Construct a valid `<a href="account.md#0x1_account_RotationProofChallenge">RotationProofChallenge</a>` that `cap_rotate_key` and `cap_update_table` will validate against.
+    <b>let</b> curr_auth_key_as_address = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_to_address">from_bcs::to_address</a>(account_resource.authentication_key);
+    <b>let</b> challenge = <a href="account.md#0x1_account_RotationProofChallenge">RotationProofChallenge</a> {
+        sequence_number: account_resource.sequence_number,
+        originator: addr,
+        current_auth_key: curr_auth_key_as_address,
+        new_public_key: to_public_key_bytes,
+    };
+
+    // Assert the challenges signed by the current and new keys are valid
+    <a href="account.md#0x1_account_assert_valid_rotation_proof_signature_and_get_auth_key">assert_valid_rotation_proof_signature_and_get_auth_key</a>(
+        from_scheme,
+        from_public_key_bytes,
+        cap_rotate_key,
+        &challenge
+    );
+    <b>let</b> new_auth_key = <a href="account.md#0x1_account_assert_valid_rotation_proof_signature_and_get_auth_key">assert_valid_rotation_proof_signature_and_get_auth_key</a>(
+        to_scheme,
+        to_public_key_bytes,
+        cap_update_table,
+        &challenge
+    );
+
+    // Update the `<a href="account.md#0x1_account_OriginatingAddress">OriginatingAddress</a>` <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table">table</a>.
+    <a href="account.md#0x1_account_update_auth_key_and_originating_address_table">update_auth_key_and_originating_address_table</a>(addr, account_resource, new_auth_key);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_account_rotate_authentication_key_with_rotation_capability"></a>
+
+## Function `rotate_authentication_key_with_rotation_capability`
+
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="account.md#0x1_account_rotate_authentication_key_with_rotation_capability">rotate_authentication_key_with_rotation_capability</a>(delegate_signer: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, rotation_cap_offerer_address: <b>address</b>, new_scheme: u8, new_public_key_bytes: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, cap_update_table: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="account.md#0x1_account_rotate_authentication_key_with_rotation_capability">rotate_authentication_key_with_rotation_capability</a>(
+    delegate_signer: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    rotation_cap_offerer_address: <b>address</b>,
+    new_scheme: u8,
+    new_public_key_bytes: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    cap_update_table: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+) <b>acquires</b> <a href="account.md#0x1_account_Account">Account</a>, <a href="account.md#0x1_account_OriginatingAddress">OriginatingAddress</a> {
+    <b>assert</b>!(<a href="account.md#0x1_account_exists_at">exists_at</a>(rotation_cap_offerer_address), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="account.md#0x1_account_EOFFERER_ADDRESS_DOES_NOT_EXIST">EOFFERER_ADDRESS_DOES_NOT_EXIST</a>));
+
+    // Check that there <b>exists</b> a rotation <a href="../../../aptos-stdlib/tests/compiler-v2-doc/capability.md#0x1_capability">capability</a> offer at the offerer's <a href="account.md#0x1_account">account</a> resource for the delegate.
+    <b>let</b> delegate_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(delegate_signer);
+    <b>let</b> offerer_account_resource = <b>borrow_global</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(rotation_cap_offerer_address);
+    <b>assert</b>!(
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_contains">option::contains</a>(&offerer_account_resource.rotation_capability_offer.for, &delegate_address),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="account.md#0x1_account_ENO_SUCH_ROTATION_CAPABILITY_OFFER">ENO_SUCH_ROTATION_CAPABILITY_OFFER</a>)
+    );
+
+    <b>let</b> curr_auth_key = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_to_address">from_bcs::to_address</a>(offerer_account_resource.authentication_key);
+    <b>let</b> challenge = <a href="account.md#0x1_account_RotationProofChallenge">RotationProofChallenge</a> {
+        sequence_number: <a href="account.md#0x1_account_get_sequence_number">get_sequence_number</a>(delegate_address),
+        originator: rotation_cap_offerer_address,
+        current_auth_key: curr_auth_key,
+        new_public_key: new_public_key_bytes,
+    };
+
+    // Verifies that the `<a href="account.md#0x1_account_RotationProofChallenge">RotationProofChallenge</a>` from above is signed under the new <b>public</b> key that we are rotating <b>to</b>.        l
+    <b>let</b> new_auth_key = <a href="account.md#0x1_account_assert_valid_rotation_proof_signature_and_get_auth_key">assert_valid_rotation_proof_signature_and_get_auth_key</a>(
+        new_scheme,
+        new_public_key_bytes,
+        cap_update_table,
+        &challenge
+    );
+
+    // Update the `<a href="account.md#0x1_account_OriginatingAddress">OriginatingAddress</a>` <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table">table</a>, so we can find the originating <b>address</b> using the new <b>address</b>.
+    <b>let</b> offerer_account_resource = <b>borrow_global_mut</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(rotation_cap_offerer_address);
+    <a href="account.md#0x1_account_update_auth_key_and_originating_address_table">update_auth_key_and_originating_address_table</a>(
+        rotation_cap_offerer_address,
+        offerer_account_resource,
+        new_auth_key
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_account_offer_rotation_capability"></a>
+
+## Function `offer_rotation_capability`
+
+Offers rotation capability on behalf of <code><a href="account.md#0x1_account">account</a></code> to the account at address <code>recipient_address</code>.
+An account can delegate its rotation capability to only one other address at one time. If the account
+has an existing rotation capability offer, calling this function will update the rotation capability offer with
+the new <code>recipient_address</code>.
+Here, <code>rotation_capability_sig_bytes</code> signature indicates that this key rotation is authorized by the account owner,
+and prevents the classic "time-of-check time-of-use" attack.
+For example, users usually rely on what the wallet displays to them as the transaction's outcome. Consider a contract that with 50% probability
+(based on the current timestamp in Move), rotates somebody's key. The wallet might be unlucky and get an outcome where nothing is rotated,
+incorrectly telling the user nothing bad will happen. But when the transaction actually gets executed, the attacker gets lucky and
+the execution path triggers the account key rotation.
+We prevent such attacks by asking for this extra signature authorizing the key rotation.
+
+@param rotation_capability_sig_bytes is the signature by the account owner's key on <code><a href="account.md#0x1_account_RotationCapabilityOfferProofChallengeV2">RotationCapabilityOfferProofChallengeV2</a></code>.
+@param account_scheme is the scheme of the account (ed25519 or multi_ed25519).
+@param account_public_key_bytes is the public key of the account owner.
+@param recipient_address is the address of the recipient of the rotation capability - note that if there's an existing rotation capability
+offer, calling this function will replace the previous <code>recipient_address</code> upon successful verification.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="account.md#0x1_account_offer_rotation_capability">offer_rotation_capability</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, rotation_capability_sig_bytes: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, account_scheme: u8, account_public_key_bytes: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, recipient_address: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="account.md#0x1_account_offer_rotation_capability">offer_rotation_capability</a>(
+    <a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    rotation_capability_sig_bytes: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    account_scheme: u8,
+    account_public_key_bytes: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    recipient_address: <b>address</b>,
+) <b>acquires</b> <a href="account.md#0x1_account_Account">Account</a> {
+    <b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>);
+    <b>assert</b>!(<a href="account.md#0x1_account_exists_at">exists_at</a>(recipient_address), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="account.md#0x1_account_EACCOUNT_DOES_NOT_EXIST">EACCOUNT_DOES_NOT_EXIST</a>));
+
+    // proof that this <a href="account.md#0x1_account">account</a> intends <b>to</b> delegate its rotation <a href="../../../aptos-stdlib/tests/compiler-v2-doc/capability.md#0x1_capability">capability</a> <b>to</b> another <a href="account.md#0x1_account">account</a>
+    <b>let</b> account_resource = <b>borrow_global_mut</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(addr);
+    <b>let</b> proof_challenge = <a href="account.md#0x1_account_RotationCapabilityOfferProofChallengeV2">RotationCapabilityOfferProofChallengeV2</a> {
+        <a href="chain_id.md#0x1_chain_id">chain_id</a>: <a href="chain_id.md#0x1_chain_id_get">chain_id::get</a>(),
+        sequence_number: account_resource.sequence_number,
+        source_address: addr,
+        recipient_address,
+    };
+
+    // verify the signature on `<a href="account.md#0x1_account_RotationCapabilityOfferProofChallengeV2">RotationCapabilityOfferProofChallengeV2</a>` by the <a href="account.md#0x1_account">account</a> owner
+    <b>if</b> (account_scheme == <a href="account.md#0x1_account_ED25519_SCHEME">ED25519_SCHEME</a>) {
+        <b>let</b> pubkey = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/ed25519.md#0x1_ed25519_new_unvalidated_public_key_from_bytes">ed25519::new_unvalidated_public_key_from_bytes</a>(account_public_key_bytes);
+        <b>let</b> expected_auth_key = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/ed25519.md#0x1_ed25519_unvalidated_public_key_to_authentication_key">ed25519::unvalidated_public_key_to_authentication_key</a>(&pubkey);
+        <b>assert</b>!(
+            account_resource.authentication_key == expected_auth_key,
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="account.md#0x1_account_EWRONG_CURRENT_PUBLIC_KEY">EWRONG_CURRENT_PUBLIC_KEY</a>)
+        );
+
+        <b>let</b> rotation_capability_sig = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/ed25519.md#0x1_ed25519_new_signature_from_bytes">ed25519::new_signature_from_bytes</a>(rotation_capability_sig_bytes);
+        <b>assert</b>!(
+            <a href="../../../aptos-stdlib/tests/compiler-v2-doc/ed25519.md#0x1_ed25519_signature_verify_strict_t">ed25519::signature_verify_strict_t</a>(&rotation_capability_sig, &pubkey, proof_challenge),
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="account.md#0x1_account_EINVALID_PROOF_OF_KNOWLEDGE">EINVALID_PROOF_OF_KNOWLEDGE</a>)
+        );
+    } <b>else</b> <b>if</b> (account_scheme == <a href="account.md#0x1_account_MULTI_ED25519_SCHEME">MULTI_ED25519_SCHEME</a>) {
+        <b>let</b> pubkey = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/multi_ed25519.md#0x1_multi_ed25519_new_unvalidated_public_key_from_bytes">multi_ed25519::new_unvalidated_public_key_from_bytes</a>(account_public_key_bytes);
+        <b>let</b> expected_auth_key = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/multi_ed25519.md#0x1_multi_ed25519_unvalidated_public_key_to_authentication_key">multi_ed25519::unvalidated_public_key_to_authentication_key</a>(&pubkey);
+        <b>assert</b>!(
+            account_resource.authentication_key == expected_auth_key,
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="account.md#0x1_account_EWRONG_CURRENT_PUBLIC_KEY">EWRONG_CURRENT_PUBLIC_KEY</a>)
+        );
+
+        <b>let</b> rotation_capability_sig = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/multi_ed25519.md#0x1_multi_ed25519_new_signature_from_bytes">multi_ed25519::new_signature_from_bytes</a>(rotation_capability_sig_bytes);
+        <b>assert</b>!(
+            <a href="../../../aptos-stdlib/tests/compiler-v2-doc/multi_ed25519.md#0x1_multi_ed25519_signature_verify_strict_t">multi_ed25519::signature_verify_strict_t</a>(&rotation_capability_sig, &pubkey, proof_challenge),
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="account.md#0x1_account_EINVALID_PROOF_OF_KNOWLEDGE">EINVALID_PROOF_OF_KNOWLEDGE</a>)
+        );
+    } <b>else</b> {
+        <b>abort</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="account.md#0x1_account_EINVALID_SCHEME">EINVALID_SCHEME</a>)
+    };
+
+    // <b>update</b> the existing rotation <a href="../../../aptos-stdlib/tests/compiler-v2-doc/capability.md#0x1_capability">capability</a> offer or put in a new rotation <a href="../../../aptos-stdlib/tests/compiler-v2-doc/capability.md#0x1_capability">capability</a> offer for the current <a href="account.md#0x1_account">account</a>
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_swap_or_fill">option::swap_or_fill</a>(&<b>mut</b> account_resource.rotation_capability_offer.for, recipient_address);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_account_is_rotation_capability_offered"></a>
+
+## Function `is_rotation_capability_offered`
+
+Returns true if the account at <code>account_addr</code> has a rotation capability offer.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="account.md#0x1_account_is_rotation_capability_offered">is_rotation_capability_offered</a>(account_addr: <b>address</b>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="account.md#0x1_account_is_rotation_capability_offered">is_rotation_capability_offered</a>(account_addr: <b>address</b>): bool <b>acquires</b> <a href="account.md#0x1_account_Account">Account</a> {
+    <b>let</b> account_resource = <b>borrow_global</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(account_addr);
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&account_resource.rotation_capability_offer.for)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_account_get_rotation_capability_offer_for"></a>
+
+## Function `get_rotation_capability_offer_for`
+
+Returns the address of the account that has a rotation capability offer from the account at <code>account_addr</code>.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="account.md#0x1_account_get_rotation_capability_offer_for">get_rotation_capability_offer_for</a>(account_addr: <b>address</b>): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="account.md#0x1_account_get_rotation_capability_offer_for">get_rotation_capability_offer_for</a>(account_addr: <b>address</b>): <b>address</b> <b>acquires</b> <a href="account.md#0x1_account_Account">Account</a> {
+    <b>let</b> account_resource = <b>borrow_global</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(account_addr);
+    <b>assert</b>!(
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&account_resource.rotation_capability_offer.for),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="account.md#0x1_account_ENO_SIGNER_CAPABILITY_OFFERED">ENO_SIGNER_CAPABILITY_OFFERED</a>),
+    );
+    *<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(&account_resource.rotation_capability_offer.for)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_account_revoke_rotation_capability"></a>
+
+## Function `revoke_rotation_capability`
+
+Revoke the rotation capability offer given to <code>to_be_revoked_recipient_address</code> from <code><a href="account.md#0x1_account">account</a></code>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="account.md#0x1_account_revoke_rotation_capability">revoke_rotation_capability</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, to_be_revoked_address: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="account.md#0x1_account_revoke_rotation_capability">revoke_rotation_capability</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, to_be_revoked_address: <b>address</b>) <b>acquires</b> <a href="account.md#0x1_account_Account">Account</a> {
+    <b>assert</b>!(<a href="account.md#0x1_account_exists_at">exists_at</a>(to_be_revoked_address), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="account.md#0x1_account_EACCOUNT_DOES_NOT_EXIST">EACCOUNT_DOES_NOT_EXIST</a>));
+    <b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>);
+    <b>let</b> account_resource = <b>borrow_global_mut</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(addr);
+    <b>assert</b>!(
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_contains">option::contains</a>(&account_resource.rotation_capability_offer.for, &to_be_revoked_address),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="account.md#0x1_account_ENO_SUCH_ROTATION_CAPABILITY_OFFER">ENO_SUCH_ROTATION_CAPABILITY_OFFER</a>)
+    );
+    <a href="account.md#0x1_account_revoke_any_rotation_capability">revoke_any_rotation_capability</a>(<a href="account.md#0x1_account">account</a>);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_account_revoke_any_rotation_capability"></a>
+
+## Function `revoke_any_rotation_capability`
+
+Revoke any rotation capability offer in the specified account.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="account.md#0x1_account_revoke_any_rotation_capability">revoke_any_rotation_capability</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="account.md#0x1_account_revoke_any_rotation_capability">revoke_any_rotation_capability</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>) <b>acquires</b> <a href="account.md#0x1_account_Account">Account</a> {
+    <b>let</b> account_resource = <b>borrow_global_mut</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>));
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_extract">option::extract</a>(&<b>mut</b> account_resource.rotation_capability_offer.for);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_account_offer_signer_capability"></a>
+
+## Function `offer_signer_capability`
+
+Offers signer capability on behalf of <code><a href="account.md#0x1_account">account</a></code> to the account at address <code>recipient_address</code>.
+An account can delegate its signer capability to only one other address at one time.
+<code>signer_capability_key_bytes</code> is the <code><a href="account.md#0x1_account_SignerCapabilityOfferProofChallengeV2">SignerCapabilityOfferProofChallengeV2</a></code> signed by the account owner's key
+<code>account_scheme</code> is the scheme of the account (ed25519 or multi_ed25519).
+<code>account_public_key_bytes</code> is the public key of the account owner.
+<code>recipient_address</code> is the address of the recipient of the signer capability - note that if there's an existing
+<code>recipient_address</code> in the account owner's <code>SignerCapabilityOffer</code>, this will replace the
+previous <code>recipient_address</code> upon successful verification (the previous recipient will no longer have access
+to the account owner's signer capability).
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="account.md#0x1_account_offer_signer_capability">offer_signer_capability</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, signer_capability_sig_bytes: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, account_scheme: u8, account_public_key_bytes: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, recipient_address: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="account.md#0x1_account_offer_signer_capability">offer_signer_capability</a>(
+    <a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    signer_capability_sig_bytes: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    account_scheme: u8,
+    account_public_key_bytes: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    recipient_address: <b>address</b>
+) <b>acquires</b> <a href="account.md#0x1_account_Account">Account</a> {
+    <b>let</b> source_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>);
+    <b>assert</b>!(<a href="account.md#0x1_account_exists_at">exists_at</a>(recipient_address), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="account.md#0x1_account_EACCOUNT_DOES_NOT_EXIST">EACCOUNT_DOES_NOT_EXIST</a>));
+
+    // Proof that this <a href="account.md#0x1_account">account</a> intends <b>to</b> delegate its <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/capability.md#0x1_capability">capability</a> <b>to</b> another <a href="account.md#0x1_account">account</a>.
+    <b>let</b> proof_challenge = <a href="account.md#0x1_account_SignerCapabilityOfferProofChallengeV2">SignerCapabilityOfferProofChallengeV2</a> {
+        sequence_number: <a href="account.md#0x1_account_get_sequence_number">get_sequence_number</a>(source_address),
+        source_address,
+        recipient_address,
+    };
+    <a href="account.md#0x1_account_verify_signed_message">verify_signed_message</a>(
+        source_address, account_scheme, account_public_key_bytes, signer_capability_sig_bytes, proof_challenge);
+
+    // Update the existing <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/capability.md#0x1_capability">capability</a> offer or put in a new <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/capability.md#0x1_capability">capability</a> offer for the recipient.
+    <b>let</b> account_resource = <b>borrow_global_mut</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(source_address);
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_swap_or_fill">option::swap_or_fill</a>(&<b>mut</b> account_resource.signer_capability_offer.for, recipient_address);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_account_is_signer_capability_offered"></a>
+
+## Function `is_signer_capability_offered`
+
+Returns true if the account at <code>account_addr</code> has a signer capability offer.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="account.md#0x1_account_is_signer_capability_offered">is_signer_capability_offered</a>(account_addr: <b>address</b>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="account.md#0x1_account_is_signer_capability_offered">is_signer_capability_offered</a>(account_addr: <b>address</b>): bool <b>acquires</b> <a href="account.md#0x1_account_Account">Account</a> {
+    <b>let</b> account_resource = <b>borrow_global</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(account_addr);
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&account_resource.signer_capability_offer.for)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_account_get_signer_capability_offer_for"></a>
+
+## Function `get_signer_capability_offer_for`
+
+Returns the address of the account that has a signer capability offer from the account at <code>account_addr</code>.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="account.md#0x1_account_get_signer_capability_offer_for">get_signer_capability_offer_for</a>(account_addr: <b>address</b>): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="account.md#0x1_account_get_signer_capability_offer_for">get_signer_capability_offer_for</a>(account_addr: <b>address</b>): <b>address</b> <b>acquires</b> <a href="account.md#0x1_account_Account">Account</a> {
+    <b>let</b> account_resource = <b>borrow_global</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(account_addr);
+    <b>assert</b>!(
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&account_resource.signer_capability_offer.for),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="account.md#0x1_account_ENO_SIGNER_CAPABILITY_OFFERED">ENO_SIGNER_CAPABILITY_OFFERED</a>),
+    );
+    *<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(&account_resource.signer_capability_offer.for)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_account_revoke_signer_capability"></a>
+
+## Function `revoke_signer_capability`
+
+Revoke the account owner's signer capability offer for <code>to_be_revoked_address</code> (i.e., the address that
+has a signer capability offer from <code><a href="account.md#0x1_account">account</a></code> but will be revoked in this function).
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="account.md#0x1_account_revoke_signer_capability">revoke_signer_capability</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, to_be_revoked_address: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="account.md#0x1_account_revoke_signer_capability">revoke_signer_capability</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, to_be_revoked_address: <b>address</b>) <b>acquires</b> <a href="account.md#0x1_account_Account">Account</a> {
+    <b>assert</b>!(<a href="account.md#0x1_account_exists_at">exists_at</a>(to_be_revoked_address), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="account.md#0x1_account_EACCOUNT_DOES_NOT_EXIST">EACCOUNT_DOES_NOT_EXIST</a>));
+    <b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>);
+    <b>let</b> account_resource = <b>borrow_global_mut</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(addr);
+    <b>assert</b>!(
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_contains">option::contains</a>(&account_resource.signer_capability_offer.for, &to_be_revoked_address),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="account.md#0x1_account_ENO_SUCH_SIGNER_CAPABILITY">ENO_SUCH_SIGNER_CAPABILITY</a>)
+    );
+    <a href="account.md#0x1_account_revoke_any_signer_capability">revoke_any_signer_capability</a>(<a href="account.md#0x1_account">account</a>);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_account_revoke_any_signer_capability"></a>
+
+## Function `revoke_any_signer_capability`
+
+Revoke any signer capability offer in the specified account.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="account.md#0x1_account_revoke_any_signer_capability">revoke_any_signer_capability</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="account.md#0x1_account_revoke_any_signer_capability">revoke_any_signer_capability</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>) <b>acquires</b> <a href="account.md#0x1_account_Account">Account</a> {
+    <b>let</b> account_resource = <b>borrow_global_mut</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>));
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_extract">option::extract</a>(&<b>mut</b> account_resource.signer_capability_offer.for);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_account_create_authorized_signer"></a>
+
+## Function `create_authorized_signer`
+
+Return an authorized signer of the offerer, if there's an existing signer capability offer for <code><a href="account.md#0x1_account">account</a></code>
+at the offerer's address.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="account.md#0x1_account_create_authorized_signer">create_authorized_signer</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, offerer_address: <b>address</b>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="account.md#0x1_account_create_authorized_signer">create_authorized_signer</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, offerer_address: <b>address</b>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a> <b>acquires</b> <a href="account.md#0x1_account_Account">Account</a> {
+    <b>assert</b>!(<a href="account.md#0x1_account_exists_at">exists_at</a>(offerer_address), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="account.md#0x1_account_EOFFERER_ADDRESS_DOES_NOT_EXIST">EOFFERER_ADDRESS_DOES_NOT_EXIST</a>));
+
+    // Check <b>if</b> there's an existing <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/capability.md#0x1_capability">capability</a> offer from the offerer.
+    <b>let</b> account_resource = <b>borrow_global</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(offerer_address);
+    <b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>);
+    <b>assert</b>!(
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_contains">option::contains</a>(&account_resource.signer_capability_offer.for, &addr),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="account.md#0x1_account_ENO_SUCH_SIGNER_CAPABILITY">ENO_SUCH_SIGNER_CAPABILITY</a>)
+    );
+
+    <a href="create_signer.md#0x1_create_signer">create_signer</a>(offerer_address)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_account_assert_valid_rotation_proof_signature_and_get_auth_key"></a>
+
+## Function `assert_valid_rotation_proof_signature_and_get_auth_key`
+
+Helper functions for authentication key rotation.
+
+
+<pre><code><b>fun</b> <a href="account.md#0x1_account_assert_valid_rotation_proof_signature_and_get_auth_key">assert_valid_rotation_proof_signature_and_get_auth_key</a>(scheme: u8, public_key_bytes: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, signature: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, challenge: &<a href="account.md#0x1_account_RotationProofChallenge">account::RotationProofChallenge</a>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="account.md#0x1_account_assert_valid_rotation_proof_signature_and_get_auth_key">assert_valid_rotation_proof_signature_and_get_auth_key</a>(
+    scheme: u8,
+    public_key_bytes: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    signature: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    challenge: &<a href="account.md#0x1_account_RotationProofChallenge">RotationProofChallenge</a>
+): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; {
+    <b>if</b> (scheme == <a href="account.md#0x1_account_ED25519_SCHEME">ED25519_SCHEME</a>) {
+        <b>let</b> pk = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/ed25519.md#0x1_ed25519_new_unvalidated_public_key_from_bytes">ed25519::new_unvalidated_public_key_from_bytes</a>(public_key_bytes);
+        <b>let</b> sig = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/ed25519.md#0x1_ed25519_new_signature_from_bytes">ed25519::new_signature_from_bytes</a>(signature);
+        <b>assert</b>!(
+            <a href="../../../aptos-stdlib/tests/compiler-v2-doc/ed25519.md#0x1_ed25519_signature_verify_strict_t">ed25519::signature_verify_strict_t</a>(&sig, &pk, *challenge),
+            std::error::invalid_argument(<a href="account.md#0x1_account_EINVALID_PROOF_OF_KNOWLEDGE">EINVALID_PROOF_OF_KNOWLEDGE</a>)
+        );
+        <a href="../../../aptos-stdlib/tests/compiler-v2-doc/ed25519.md#0x1_ed25519_unvalidated_public_key_to_authentication_key">ed25519::unvalidated_public_key_to_authentication_key</a>(&pk)
+    } <b>else</b> <b>if</b> (scheme == <a href="account.md#0x1_account_MULTI_ED25519_SCHEME">MULTI_ED25519_SCHEME</a>) {
+        <b>let</b> pk = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/multi_ed25519.md#0x1_multi_ed25519_new_unvalidated_public_key_from_bytes">multi_ed25519::new_unvalidated_public_key_from_bytes</a>(public_key_bytes);
+        <b>let</b> sig = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/multi_ed25519.md#0x1_multi_ed25519_new_signature_from_bytes">multi_ed25519::new_signature_from_bytes</a>(signature);
+        <b>assert</b>!(
+            <a href="../../../aptos-stdlib/tests/compiler-v2-doc/multi_ed25519.md#0x1_multi_ed25519_signature_verify_strict_t">multi_ed25519::signature_verify_strict_t</a>(&sig, &pk, *challenge),
+            std::error::invalid_argument(<a href="account.md#0x1_account_EINVALID_PROOF_OF_KNOWLEDGE">EINVALID_PROOF_OF_KNOWLEDGE</a>)
+        );
+        <a href="../../../aptos-stdlib/tests/compiler-v2-doc/multi_ed25519.md#0x1_multi_ed25519_unvalidated_public_key_to_authentication_key">multi_ed25519::unvalidated_public_key_to_authentication_key</a>(&pk)
+    } <b>else</b> {
+        <b>abort</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="account.md#0x1_account_EINVALID_SCHEME">EINVALID_SCHEME</a>)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_account_update_auth_key_and_originating_address_table"></a>
+
+## Function `update_auth_key_and_originating_address_table`
+
+Update the <code><a href="account.md#0x1_account_OriginatingAddress">OriginatingAddress</a></code> table, so that we can find the originating address using the latest address
+in the event of key recovery.
+
+
+<pre><code><b>fun</b> <a href="account.md#0x1_account_update_auth_key_and_originating_address_table">update_auth_key_and_originating_address_table</a>(originating_addr: <b>address</b>, account_resource: &<b>mut</b> <a href="account.md#0x1_account_Account">account::Account</a>, new_auth_key_vector: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="account.md#0x1_account_update_auth_key_and_originating_address_table">update_auth_key_and_originating_address_table</a>(
+    originating_addr: <b>address</b>,
+    account_resource: &<b>mut</b> <a href="account.md#0x1_account_Account">Account</a>,
+    new_auth_key_vector: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+) <b>acquires</b> <a href="account.md#0x1_account_OriginatingAddress">OriginatingAddress</a> {
+    <b>let</b> address_map = &<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="account.md#0x1_account_OriginatingAddress">OriginatingAddress</a>&gt;(@aptos_framework).address_map;
+    <b>let</b> curr_auth_key = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_to_address">from_bcs::to_address</a>(account_resource.authentication_key);
+
+    // Checks `<a href="account.md#0x1_account_OriginatingAddress">OriginatingAddress</a>[curr_auth_key]` is either unmapped, or mapped <b>to</b> `originating_address`.
+    // If it's mapped <b>to</b> the originating <b>address</b>, removes that mapping.
+    // Otherwise, <b>abort</b> <b>if</b> it's mapped <b>to</b> a different <b>address</b>.
+    <b>if</b> (<a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_contains">table::contains</a>(address_map, curr_auth_key)) {
+        // If account_a <b>with</b> address_a is rotating its keypair from keypair_a <b>to</b> keypair_b, we expect
+        // the <b>address</b> of the <a href="account.md#0x1_account">account</a> <b>to</b> stay the same, <b>while</b> its keypair updates <b>to</b> keypair_b.
+        // Here, by asserting that we're calling from the <a href="account.md#0x1_account">account</a> <b>with</b> the originating <b>address</b>, we enforce
+        // the standard of keeping the same <b>address</b> and updating the keypair at the contract level.
+        // Without this assertion, the dapps could also <b>update</b> the <a href="account.md#0x1_account">account</a>'s <b>address</b> <b>to</b> address_b (the <b>address</b> that
+        // is programmatically related <b>to</b> keypaier_b) and <b>update</b> the keypair <b>to</b> keypair_b. This causes problems
+        // for interoperability because different dapps can implement this in different ways.
+        // If the <a href="account.md#0x1_account">account</a> <b>with</b> <b>address</b> b calls this function <b>with</b> two valid signatures, it will <b>abort</b> at this step,
+        // because <b>address</b> b is not the <a href="account.md#0x1_account">account</a>'s originating <b>address</b>.
+        <b>assert</b>!(
+            originating_addr == <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_remove">table::remove</a>(address_map, curr_auth_key),
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="account.md#0x1_account_EINVALID_ORIGINATING_ADDRESS">EINVALID_ORIGINATING_ADDRESS</a>)
+        );
+    };
+
+    // Set `<a href="account.md#0x1_account_OriginatingAddress">OriginatingAddress</a>[new_auth_key] = originating_address`.
+    <b>let</b> new_auth_key = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_to_address">from_bcs::to_address</a>(new_auth_key_vector);
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_add">table::add</a>(address_map, new_auth_key, originating_addr);
+
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        <a href="event.md#0x1_event_emit">event::emit</a>(<a href="account.md#0x1_account_KeyRotation">KeyRotation</a> {
+            <a href="account.md#0x1_account">account</a>: originating_addr,
+            old_authentication_key: account_resource.authentication_key,
+            new_authentication_key: new_auth_key_vector,
+        });
+    };
+    <a href="event.md#0x1_event_emit_event">event::emit_event</a>&lt;<a href="account.md#0x1_account_KeyRotationEvent">KeyRotationEvent</a>&gt;(
+        &<b>mut</b> account_resource.key_rotation_events,
+        <a href="account.md#0x1_account_KeyRotationEvent">KeyRotationEvent</a> {
+            old_authentication_key: account_resource.authentication_key,
+            new_authentication_key: new_auth_key_vector,
+        }
+    );
+
+    // Update the <a href="account.md#0x1_account">account</a> resource's authentication key.
+    account_resource.authentication_key = new_auth_key_vector;
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_account_create_resource_address"></a>
+
+## Function `create_resource_address`
+
+Basic account creation methods.
+This is a helper function to compute resource addresses. Computation of the address
+involves the use of a cryptographic hash operation and should be use thoughtfully.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="account.md#0x1_account_create_resource_address">create_resource_address</a>(source: &<b>address</b>, seed: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="account.md#0x1_account_create_resource_address">create_resource_address</a>(source: &<b>address</b>, seed: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <b>address</b> {
+    <b>let</b> bytes = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs_to_bytes">bcs::to_bytes</a>(source);
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_append">vector::append</a>(&<b>mut</b> bytes, seed);
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_push_back">vector::push_back</a>(&<b>mut</b> bytes, <a href="account.md#0x1_account_DERIVE_RESOURCE_ACCOUNT_SCHEME">DERIVE_RESOURCE_ACCOUNT_SCHEME</a>);
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_to_address">from_bcs::to_address</a>(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/hash.md#0x1_hash_sha3_256">hash::sha3_256</a>(bytes))
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_account_create_resource_account"></a>
+
+## Function `create_resource_account`
+
+A resource account is used to manage resources independent of an account managed by a user.
+In Aptos a resource account is created based upon the sha3 256 of the source's address and additional seed data.
+A resource account can only be created once, this is designated by setting the
+<code>Account::signer_capability_offer::for</code> to the address of the resource account. While an entity may call
+<code>create_account</code> to attempt to claim an account ahead of the creation of a resource account, if found Aptos will
+transition ownership of the account over to the resource account. This is done by validating that the account has
+yet to execute any transactions and that the <code>Account::signer_capability_offer::for</code> is none. The probability of a
+collision where someone has legitimately produced a private key that maps to a resource account address is less
+than <code>(1/2)^(256)</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="account.md#0x1_account_create_resource_account">create_resource_account</a>(source: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, seed: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="account.md#0x1_account_SignerCapability">account::SignerCapability</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="account.md#0x1_account_create_resource_account">create_resource_account</a>(source: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, seed: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="account.md#0x1_account_SignerCapability">SignerCapability</a>) <b>acquires</b> <a href="account.md#0x1_account_Account">Account</a> {
+    <b>let</b> resource_addr = <a href="account.md#0x1_account_create_resource_address">create_resource_address</a>(&<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(source), seed);
+    <b>let</b> resource = <b>if</b> (<a href="account.md#0x1_account_exists_at">exists_at</a>(resource_addr)) {
+        <b>let</b> <a href="account.md#0x1_account">account</a> = <b>borrow_global</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(resource_addr);
+        <b>assert</b>!(
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_none">option::is_none</a>(&<a href="account.md#0x1_account">account</a>.signer_capability_offer.for),
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_already_exists">error::already_exists</a>(<a href="account.md#0x1_account_ERESOURCE_ACCCOUNT_EXISTS">ERESOURCE_ACCCOUNT_EXISTS</a>),
+        );
+        <b>assert</b>!(
+            <a href="account.md#0x1_account">account</a>.sequence_number == 0,
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="account.md#0x1_account_EACCOUNT_ALREADY_USED">EACCOUNT_ALREADY_USED</a>),
+        );
+        <a href="create_signer.md#0x1_create_signer">create_signer</a>(resource_addr)
+    } <b>else</b> {
+        <a href="account.md#0x1_account_create_account_unchecked">create_account_unchecked</a>(resource_addr)
+    };
+
+    // By default, only the <a href="account.md#0x1_account_SignerCapability">SignerCapability</a> should have control over the resource <a href="account.md#0x1_account">account</a> and not the auth key.
+    // If the source <a href="account.md#0x1_account">account</a> wants direct control via auth key, they would need <b>to</b> explicitly rotate the auth key
+    // of the resource <a href="account.md#0x1_account">account</a> using the <a href="account.md#0x1_account_SignerCapability">SignerCapability</a>.
+    <a href="account.md#0x1_account_rotate_authentication_key_internal">rotate_authentication_key_internal</a>(&resource, <a href="account.md#0x1_account_ZERO_AUTH_KEY">ZERO_AUTH_KEY</a>);
+
+    <b>let</b> <a href="account.md#0x1_account">account</a> = <b>borrow_global_mut</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(resource_addr);
+    <a href="account.md#0x1_account">account</a>.signer_capability_offer.for = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(resource_addr);
+    <b>let</b> signer_cap = <a href="account.md#0x1_account_SignerCapability">SignerCapability</a> { <a href="account.md#0x1_account">account</a>: resource_addr };
+    (resource, signer_cap)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_account_create_framework_reserved_account"></a>
+
+## Function `create_framework_reserved_account`
+
+create the account for system reserved addresses
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="account.md#0x1_account_create_framework_reserved_account">create_framework_reserved_account</a>(addr: <b>address</b>): (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="account.md#0x1_account_SignerCapability">account::SignerCapability</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="account.md#0x1_account_create_framework_reserved_account">create_framework_reserved_account</a>(addr: <b>address</b>): (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="account.md#0x1_account_SignerCapability">SignerCapability</a>) {
+    <b>assert</b>!(
+        addr == @0x1 ||
+            addr == @0x2 ||
+            addr == @0x3 ||
+            addr == @0x4 ||
+            addr == @0x5 ||
+            addr == @0x6 ||
+            addr == @0x7 ||
+            addr == @0x8 ||
+            addr == @0x9 ||
+            addr == @0xa,
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="account.md#0x1_account_ENO_VALID_FRAMEWORK_RESERVED_ADDRESS">ENO_VALID_FRAMEWORK_RESERVED_ADDRESS</a>),
+    );
+    <b>let</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a> = <a href="account.md#0x1_account_create_account_unchecked">create_account_unchecked</a>(addr);
+    <b>let</b> signer_cap = <a href="account.md#0x1_account_SignerCapability">SignerCapability</a> { <a href="account.md#0x1_account">account</a>: addr };
+    (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, signer_cap)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_account_create_guid"></a>
+
+## Function `create_guid`
+
+GUID management methods.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="account.md#0x1_account_create_guid">create_guid</a>(account_signer: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>): <a href="guid.md#0x1_guid_GUID">guid::GUID</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="account.md#0x1_account_create_guid">create_guid</a>(account_signer: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>): <a href="guid.md#0x1_guid_GUID">guid::GUID</a> <b>acquires</b> <a href="account.md#0x1_account_Account">Account</a> {
+    <b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(account_signer);
+    <b>let</b> <a href="account.md#0x1_account">account</a> = <b>borrow_global_mut</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(addr);
+    <b>let</b> <a href="guid.md#0x1_guid">guid</a> = <a href="guid.md#0x1_guid_create">guid::create</a>(addr, &<b>mut</b> <a href="account.md#0x1_account">account</a>.guid_creation_num);
+    <b>assert</b>!(
+        <a href="account.md#0x1_account">account</a>.guid_creation_num &lt; <a href="account.md#0x1_account_MAX_GUID_CREATION_NUM">MAX_GUID_CREATION_NUM</a>,
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_out_of_range">error::out_of_range</a>(<a href="account.md#0x1_account_EEXCEEDED_MAX_GUID_CREATION_NUM">EEXCEEDED_MAX_GUID_CREATION_NUM</a>),
+    );
+    <a href="guid.md#0x1_guid">guid</a>
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_account_new_event_handle"></a>
+
+## Function `new_event_handle`
+
+GUID management methods.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="account.md#0x1_account_new_event_handle">new_event_handle</a>&lt;T: drop, store&gt;(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>): <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;T&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="account.md#0x1_account_new_event_handle">new_event_handle</a>&lt;T: drop + store&gt;(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>): EventHandle&lt;T&gt; <b>acquires</b> <a href="account.md#0x1_account_Account">Account</a> {
+    <a href="event.md#0x1_event_new_event_handle">event::new_event_handle</a>(<a href="account.md#0x1_account_create_guid">create_guid</a>(<a href="account.md#0x1_account">account</a>))
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_account_register_coin"></a>
+
+## Function `register_coin`
+
+Coin management methods.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="account.md#0x1_account_register_coin">register_coin</a>&lt;CoinType&gt;(account_addr: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="account.md#0x1_account_register_coin">register_coin</a>&lt;CoinType&gt;(account_addr: <b>address</b>) <b>acquires</b> <a href="account.md#0x1_account_Account">Account</a> {
+    <b>let</b> <a href="account.md#0x1_account">account</a> = <b>borrow_global_mut</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(account_addr);
+    <a href="event.md#0x1_event_emit_event">event::emit_event</a>&lt;<a href="account.md#0x1_account_CoinRegisterEvent">CoinRegisterEvent</a>&gt;(
+        &<b>mut</b> <a href="account.md#0x1_account">account</a>.coin_register_events,
+        <a href="account.md#0x1_account_CoinRegisterEvent">CoinRegisterEvent</a> {
+            <a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info">type_info</a>: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_type_of">type_info::type_of</a>&lt;CoinType&gt;(),
+        },
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_account_create_signer_with_capability"></a>
+
+## Function `create_signer_with_capability`
+
+Capability based functions for efficient use.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="account.md#0x1_account_create_signer_with_capability">create_signer_with_capability</a>(<a href="../../../aptos-stdlib/tests/compiler-v2-doc/capability.md#0x1_capability">capability</a>: &<a href="account.md#0x1_account_SignerCapability">account::SignerCapability</a>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="account.md#0x1_account_create_signer_with_capability">create_signer_with_capability</a>(<a href="../../../aptos-stdlib/tests/compiler-v2-doc/capability.md#0x1_capability">capability</a>: &<a href="account.md#0x1_account_SignerCapability">SignerCapability</a>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a> {
+    <b>let</b> addr = &<a href="../../../aptos-stdlib/tests/compiler-v2-doc/capability.md#0x1_capability">capability</a>.<a href="account.md#0x1_account">account</a>;
+    <a href="create_signer.md#0x1_create_signer">create_signer</a>(*addr)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_account_get_signer_capability_address"></a>
+
+## Function `get_signer_capability_address`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="account.md#0x1_account_get_signer_capability_address">get_signer_capability_address</a>(<a href="../../../aptos-stdlib/tests/compiler-v2-doc/capability.md#0x1_capability">capability</a>: &<a href="account.md#0x1_account_SignerCapability">account::SignerCapability</a>): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="account.md#0x1_account_get_signer_capability_address">get_signer_capability_address</a>(<a href="../../../aptos-stdlib/tests/compiler-v2-doc/capability.md#0x1_capability">capability</a>: &<a href="account.md#0x1_account_SignerCapability">SignerCapability</a>): <b>address</b> {
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/capability.md#0x1_capability">capability</a>.<a href="account.md#0x1_account">account</a>
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_account_verify_signed_message"></a>
+
+## Function `verify_signed_message`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="account.md#0x1_account_verify_signed_message">verify_signed_message</a>&lt;T: drop&gt;(<a href="account.md#0x1_account">account</a>: <b>address</b>, account_scheme: u8, account_public_key: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, signed_message_bytes: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, message: T)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="account.md#0x1_account_verify_signed_message">verify_signed_message</a>&lt;T: drop&gt;(
+    <a href="account.md#0x1_account">account</a>: <b>address</b>,
+    account_scheme: u8,
+    account_public_key: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    signed_message_bytes: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    message: T,
+) <b>acquires</b> <a href="account.md#0x1_account_Account">Account</a> {
+    <b>let</b> account_resource = <b>borrow_global_mut</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(<a href="account.md#0x1_account">account</a>);
+    // Verify that the `<a href="account.md#0x1_account_SignerCapabilityOfferProofChallengeV2">SignerCapabilityOfferProofChallengeV2</a>` <b>has</b> the right information and is signed by the <a href="account.md#0x1_account">account</a> owner's key
+    <b>if</b> (account_scheme == <a href="account.md#0x1_account_ED25519_SCHEME">ED25519_SCHEME</a>) {
+        <b>let</b> pubkey = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/ed25519.md#0x1_ed25519_new_unvalidated_public_key_from_bytes">ed25519::new_unvalidated_public_key_from_bytes</a>(account_public_key);
+        <b>let</b> expected_auth_key = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/ed25519.md#0x1_ed25519_unvalidated_public_key_to_authentication_key">ed25519::unvalidated_public_key_to_authentication_key</a>(&pubkey);
+        <b>assert</b>!(
+            account_resource.authentication_key == expected_auth_key,
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="account.md#0x1_account_EWRONG_CURRENT_PUBLIC_KEY">EWRONG_CURRENT_PUBLIC_KEY</a>),
+        );
+
+        <b>let</b> signer_capability_sig = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/ed25519.md#0x1_ed25519_new_signature_from_bytes">ed25519::new_signature_from_bytes</a>(signed_message_bytes);
+        <b>assert</b>!(
+            <a href="../../../aptos-stdlib/tests/compiler-v2-doc/ed25519.md#0x1_ed25519_signature_verify_strict_t">ed25519::signature_verify_strict_t</a>(&signer_capability_sig, &pubkey, message),
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="account.md#0x1_account_EINVALID_PROOF_OF_KNOWLEDGE">EINVALID_PROOF_OF_KNOWLEDGE</a>),
+        );
+    } <b>else</b> <b>if</b> (account_scheme == <a href="account.md#0x1_account_MULTI_ED25519_SCHEME">MULTI_ED25519_SCHEME</a>) {
+        <b>let</b> pubkey = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/multi_ed25519.md#0x1_multi_ed25519_new_unvalidated_public_key_from_bytes">multi_ed25519::new_unvalidated_public_key_from_bytes</a>(account_public_key);
+        <b>let</b> expected_auth_key = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/multi_ed25519.md#0x1_multi_ed25519_unvalidated_public_key_to_authentication_key">multi_ed25519::unvalidated_public_key_to_authentication_key</a>(&pubkey);
+        <b>assert</b>!(
+            account_resource.authentication_key == expected_auth_key,
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="account.md#0x1_account_EWRONG_CURRENT_PUBLIC_KEY">EWRONG_CURRENT_PUBLIC_KEY</a>),
+        );
+
+        <b>let</b> signer_capability_sig = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/multi_ed25519.md#0x1_multi_ed25519_new_signature_from_bytes">multi_ed25519::new_signature_from_bytes</a>(signed_message_bytes);
+        <b>assert</b>!(
+            <a href="../../../aptos-stdlib/tests/compiler-v2-doc/multi_ed25519.md#0x1_multi_ed25519_signature_verify_strict_t">multi_ed25519::signature_verify_strict_t</a>(&signer_capability_sig, &pubkey, message),
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="account.md#0x1_account_EINVALID_PROOF_OF_KNOWLEDGE">EINVALID_PROOF_OF_KNOWLEDGE</a>),
+        );
+    } <b>else</b> {
+        <b>abort</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="account.md#0x1_account_EINVALID_SCHEME">EINVALID_SCHEME</a>)
+    };
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+
+
+<a id="high-level-req"></a>
+
+### High-level Requirements
+
+<table>
+<tr>
+<th>No.</th><th>Requirement</th><th>Criticality</th><th>Implementation</th><th>Enforcement</th>
+</tr>
+
+<tr>
+<td>1</td>
+<td>The initialization of the account module should result in the proper system initialization with valid and consistent resources.</td>
+<td>High</td>
+<td>Initialization of the account module creates a valid address_map table and moves the resources to the OriginatingAddress under the aptos_framework account.</td>
+<td>Audited that the address_map table is created and populated correctly with the expected initial values.</td>
+</tr>
+
+<tr>
+<td>2</td>
+<td>After successfully creating an account, the account resources should initialize with the default data, ensuring the proper initialization of the account state.</td>
+<td>High</td>
+<td>Creating an account via the create_account function validates the state and moves a new account resource under new_address.</td>
+<td>Formally verified via <a href="#high-level-req-2">create_account</a>.</td>
+</tr>
+
+<tr>
+<td>3</td>
+<td>Checking the existence of an account under a given address never results in an abort.</td>
+<td>Low</td>
+<td>The exists_at function returns a boolean value indicating the existence of an account under the given address.</td>
+<td>Formally verified by the <a href="#high-level-req-3">aborts_if</a> condition.</td>
+</tr>
+
+<tr>
+<td>4</td>
+<td>The account module maintains bounded sequence numbers for all accounts, guaranteeing they remain within the specified limit.</td>
+<td>Medium</td>
+<td>The sequence number of an account may only increase up to MAX_U64 in a succeeding manner.</td>
+<td>Formally verified via <a href="#high-level-req-4">increment_sequence_number</a> that it remains within the defined boundary of MAX_U64.</td>
+</tr>
+
+<tr>
+<td>5</td>
+<td>Only the ed25519 and multied25519 signature schemes are permissible.</td>
+<td>Low</td>
+<td>Exclusively perform key rotation using either the ed25519 or multied25519 signature schemes. Currently restricts the offering of rotation/signing capabilities to the ed25519 or multied25519 schemes.</td>
+<td>Formally Verified: <a href="#high-level-req-5.1">rotate_authentication_key</a>, <a href="#high-level-req-5.2">offer_rotation_capability</a>, and <a href="#high-level-req-5.3">offer_signer_capability</a>. Verified that it aborts if the account_scheme is not ED25519_SCHEME and not MULTI_ED25519_SCHEME. Audited that the scheme enums correspond correctly to signature logic.</td>
+</tr>
+
+<tr>
+<td>6</td>
+<td>Exclusively permit the rotation of the authentication key of an account for the account owner or any user who possesses rotation capabilities associated with that account.</td>
+<td>Critical</td>
+<td>In the rotate_authentication_key function, the authentication key derived from the from_public_key_bytes should match the signer's current authentication key. Only the delegate_signer granted the rotation capabilities may invoke the rotate_authentication_key_with_rotation_capability function.</td>
+<td>Formally Verified via <a href="#high-level-req-6.1">rotate_authentication_key</a> and <a href="#high-level-req-6.2">rotate_authentication_key_with_rotation_capability</a>.</td>
+</tr>
+
+<tr>
+<td>7</td>
+<td>Only the owner of an account may offer or revoke the following capabilities: (1) offer_rotation_capability, (2) offer_signer_capability, (3) revoke_rotation_capability, and (4) revoke_signer_capability.</td>
+<td>Critical</td>
+<td>An account resource may only be modified by the owner of the account utilizing: rotation_capability_offer, signer_capability_offer.</td>
+<td>Formally verified via <a href="#high-level-req-7.1">offer_rotation_capability</a>, <a href="#high-level-req-7.2">offer_signer_capability</a>, and <a href="#high-level-req-7.3">revoke_rotation_capability</a>. and <a href="#high-level-req-7.4">revoke_signer_capability</a>.</td>
+</tr>
+
+<tr>
+<td>8</td>
+<td>The capability to create a signer for the account is exclusively reserved for either the account owner or the account that has been granted the signing capabilities.</td>
+<td>Critical</td>
+<td>Signer creation for the account may only be successfully executed by explicitly granting the signing capabilities with the create_authorized_signer function.</td>
+<td>Formally verified via <a href="#high-level-req-8">create_authorized_signer</a>.</td>
+</tr>
+
+<tr>
+<td>9</td>
+<td>Rotating the authentication key requires two valid signatures. With the private key of the current authentication key. With the private key of the new authentication key.</td>
+<td>Critical</td>
+<td>The rotate_authentication_key verifies two signatures (current and new) before rotating to the new key. The first signature ensures the user has the intended capability, and the second signature ensures that the user owns the new key.</td>
+<td>Formally verified via <a href="#high-level-req-9.1">rotate_authentication_key</a> and <a href="#high-level-req-9.2">rotate_authentication_key_with_rotation_capability</a>.</td>
+</tr>
+
+<tr>
+<td>10</td>
+<td>The rotation of the authentication key updates the account's authentication key with the newly supplied one.</td>
+<td>High</td>
+<td>The auth_key may only update to the provided new_auth_key after verifying the signature.</td>
+<td>Formally Verified in <a href="#high-level-req-10">rotate_authentication_key_internal</a> that the authentication key of an account is modified to the provided authentication key if the signature verification was successful.</td>
+</tr>
+
+<tr>
+<td>11</td>
+<td>The creation number is monotonically increasing.</td>
+<td>Low</td>
+<td>The guid_creation_num in the Account structure is monotonically increasing.</td>
+<td>Formally Verified via <a href="#high-level-req-11">guid_creation_num</a>.</td>
+</tr>
+
+<tr>
+<td>12</td>
+<td>The Account resource is persistent.</td>
+<td>Low</td>
+<td>The Account structure assigned to the address should be persistent.</td>
+<td>Audited that the Account structure is persistent.</td>
+</tr>
+
+</table>
+
+
+
+
+<a id="module-level-spec"></a>
+
+### Module-level Specification
+
+
+<pre><code><b>pragma</b> verify = <b>true</b>;
+<b>pragma</b> aborts_if_is_strict;
+</code></pre>
+
+
+
+<a id="@Specification_1_initialize"></a>
+
+### Function `initialize`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="account.md#0x1_account_initialize">initialize</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+Only the address <code>@aptos_framework</code> can call.
+OriginatingAddress does not exist under <code>@aptos_framework</code> before the call.
+
+
+<pre><code><b>let</b> aptos_addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(aptos_framework);
+<b>aborts_if</b> !<a href="system_addresses.md#0x1_system_addresses_is_aptos_framework_address">system_addresses::is_aptos_framework_address</a>(aptos_addr);
+<b>aborts_if</b> <b>exists</b>&lt;<a href="account.md#0x1_account_OriginatingAddress">OriginatingAddress</a>&gt;(aptos_addr);
+<b>ensures</b> <b>exists</b>&lt;<a href="account.md#0x1_account_OriginatingAddress">OriginatingAddress</a>&gt;(aptos_addr);
+</code></pre>
+
+
+
+<a id="@Specification_1_create_account_if_does_not_exist"></a>
+
+### Function `create_account_if_does_not_exist`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="account.md#0x1_account_create_account_if_does_not_exist">create_account_if_does_not_exist</a>(account_address: <b>address</b>)
+</code></pre>
+
+
+Ensure that the account exists at the end of the call.
+
+
+<pre><code><b>let</b> authentication_key = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs_to_bytes">bcs::to_bytes</a>(account_address);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(account_address) && (
+    account_address == @vm_reserved
+    || account_address == @aptos_framework
+    || account_address == @aptos_token
+    || !(len(authentication_key) == 32)
+);
+<b>ensures</b> <b>exists</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(account_address);
+</code></pre>
+
+
+
+<a id="@Specification_1_create_account"></a>
+
+### Function `create_account`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="account.md#0x1_account_create_account">create_account</a>(new_address: <b>address</b>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>
+</code></pre>
+
+
+Check if the bytes of the new address is 32.
+The Account does not exist under the new address before creating the account.
+Limit the new account address is not @vm_reserved / @aptos_framework / @aptos_toke.
+
+
+<pre><code><b>include</b> <a href="account.md#0x1_account_CreateAccountAbortsIf">CreateAccountAbortsIf</a> {addr: new_address};
+<b>aborts_if</b> new_address == @vm_reserved || new_address == @aptos_framework || new_address == @aptos_token;
+<b>ensures</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(result) == new_address;
+// This enforces <a id="high-level-req-2" href="#high-level-req">high-level requirement 2</a>:
+<b>ensures</b> <b>exists</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(new_address);
+</code></pre>
+
+
+
+<a id="@Specification_1_create_account_unchecked"></a>
+
+### Function `create_account_unchecked`
+
+
+<pre><code><b>fun</b> <a href="account.md#0x1_account_create_account_unchecked">create_account_unchecked</a>(new_address: <b>address</b>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>
+</code></pre>
+
+
+Check if the bytes of the new address is 32.
+The Account does not exist under the new address before creating the account.
+
+
+<pre><code><b>include</b> <a href="account.md#0x1_account_CreateAccountAbortsIf">CreateAccountAbortsIf</a> {addr: new_address};
+<b>ensures</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(result) == new_address;
+<b>ensures</b> <b>exists</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(new_address);
+</code></pre>
+
+
+
+<a id="@Specification_1_exists_at"></a>
+
+### Function `exists_at`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="account.md#0x1_account_exists_at">exists_at</a>(addr: <b>address</b>): bool
+</code></pre>
+
+
+
+
+<pre><code>// This enforces <a id="high-level-req-3" href="#high-level-req">high-level requirement 3</a>:
+<b>aborts_if</b> <b>false</b>;
+</code></pre>
+
+
+
+
+<a id="0x1_account_CreateAccountAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="account.md#0x1_account_CreateAccountAbortsIf">CreateAccountAbortsIf</a> {
+    addr: <b>address</b>;
+    <b>let</b> authentication_key = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs_to_bytes">bcs::to_bytes</a>(addr);
+    <b>aborts_if</b> len(authentication_key) != 32;
+    <b>aborts_if</b> <b>exists</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(addr);
+    <b>ensures</b> len(authentication_key) == 32;
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_get_guid_next_creation_num"></a>
+
+### Function `get_guid_next_creation_num`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="account.md#0x1_account_get_guid_next_creation_num">get_guid_next_creation_num</a>(addr: <b>address</b>): u64
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(addr);
+<b>ensures</b> result == <b>global</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(addr).guid_creation_num;
+</code></pre>
+
+
+
+<a id="@Specification_1_get_sequence_number"></a>
+
+### Function `get_sequence_number`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="account.md#0x1_account_get_sequence_number">get_sequence_number</a>(addr: <b>address</b>): u64
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(addr);
+<b>ensures</b> result == <b>global</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(addr).sequence_number;
+</code></pre>
+
+
+
+<a id="@Specification_1_increment_sequence_number"></a>
+
+### Function `increment_sequence_number`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="account.md#0x1_account_increment_sequence_number">increment_sequence_number</a>(addr: <b>address</b>)
+</code></pre>
+
+
+The Account existed under the address.
+The sequence_number of the Account is up to MAX_U64.
+
+
+<pre><code><b>let</b> sequence_number = <b>global</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(addr).sequence_number;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(addr);
+// This enforces <a id="high-level-req-4" href="#high-level-req">high-level requirement 4</a>:
+<b>aborts_if</b> sequence_number == <a href="account.md#0x1_account_MAX_U64">MAX_U64</a>;
+<b>modifies</b> <b>global</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(addr);
+<b>let</b> <b>post</b> post_sequence_number = <b>global</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(addr).sequence_number;
+<b>ensures</b> post_sequence_number == sequence_number + 1;
+</code></pre>
+
+
+
+<a id="@Specification_1_get_authentication_key"></a>
+
+### Function `get_authentication_key`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="account.md#0x1_account_get_authentication_key">get_authentication_key</a>(addr: <b>address</b>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(addr);
+<b>ensures</b> result == <b>global</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(addr).authentication_key;
+</code></pre>
+
+
+
+<a id="@Specification_1_rotate_authentication_key_internal"></a>
+
+### Function `rotate_authentication_key_internal`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="account.md#0x1_account_rotate_authentication_key_internal">rotate_authentication_key_internal</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, new_auth_key: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+The Account existed under the signer before the call.
+The length of new_auth_key is 32.
+
+
+<pre><code><b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>);
+// This enforces <a id="high-level-req-10" href="#high-level-req">high-level requirement 10</a>:
+<b>let</b> <b>post</b> account_resource = <b>global</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(addr);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(addr);
+<b>aborts_if</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(new_auth_key) != 32;
+<b>modifies</b> <b>global</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(addr);
+<b>ensures</b> account_resource.authentication_key == new_auth_key;
+</code></pre>
+
+
+
+<a id="@Specification_1_rotate_authentication_key_call"></a>
+
+### Function `rotate_authentication_key_call`
+
+
+<pre><code>entry <b>fun</b> <a href="account.md#0x1_account_rotate_authentication_key_call">rotate_authentication_key_call</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, new_auth_key: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>);
+// This enforces <a id="high-level-req-10" href="#high-level-req">high-level requirement 10</a>:
+<b>let</b> <b>post</b> account_resource = <b>global</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(addr);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(addr);
+<b>aborts_if</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(new_auth_key) != 32;
+<b>modifies</b> <b>global</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(addr);
+<b>ensures</b> account_resource.authentication_key == new_auth_key;
+</code></pre>
+
+
+
+
+<a id="0x1_account_spec_assert_valid_rotation_proof_signature_and_get_auth_key"></a>
+
+
+<pre><code><b>fun</b> <a href="account.md#0x1_account_spec_assert_valid_rotation_proof_signature_and_get_auth_key">spec_assert_valid_rotation_proof_signature_and_get_auth_key</a>(scheme: u8, public_key_bytes: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, signature: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, challenge: <a href="account.md#0x1_account_RotationProofChallenge">RotationProofChallenge</a>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+</code></pre>
+
+
+
+<a id="@Specification_1_rotate_authentication_key"></a>
+
+### Function `rotate_authentication_key`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="account.md#0x1_account_rotate_authentication_key">rotate_authentication_key</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, from_scheme: u8, from_public_key_bytes: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, to_scheme: u8, to_public_key_bytes: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, cap_rotate_key: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, cap_update_table: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+The Account existed under the signer
+The authentication scheme is ED25519_SCHEME and MULTI_ED25519_SCHEME
+
+
+<pre><code><b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>);
+<b>let</b> account_resource = <b>global</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(addr);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(addr);
+// This enforces <a id="high-level-req-6.1" href="#high-level-req">high-level requirement 6</a>:
+<b>include</b> from_scheme == <a href="account.md#0x1_account_ED25519_SCHEME">ED25519_SCHEME</a> ==&gt; <a href="../../../aptos-stdlib/tests/compiler-v2-doc/ed25519.md#0x1_ed25519_NewUnvalidatedPublicKeyFromBytesAbortsIf">ed25519::NewUnvalidatedPublicKeyFromBytesAbortsIf</a> { bytes: from_public_key_bytes };
+<b>aborts_if</b> from_scheme == <a href="account.md#0x1_account_ED25519_SCHEME">ED25519_SCHEME</a> && ({
+    <b>let</b> expected_auth_key = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/ed25519.md#0x1_ed25519_spec_public_key_bytes_to_authentication_key">ed25519::spec_public_key_bytes_to_authentication_key</a>(from_public_key_bytes);
+    account_resource.authentication_key != expected_auth_key
+});
+<b>include</b> from_scheme == <a href="account.md#0x1_account_MULTI_ED25519_SCHEME">MULTI_ED25519_SCHEME</a> ==&gt; <a href="../../../aptos-stdlib/tests/compiler-v2-doc/multi_ed25519.md#0x1_multi_ed25519_NewUnvalidatedPublicKeyFromBytesAbortsIf">multi_ed25519::NewUnvalidatedPublicKeyFromBytesAbortsIf</a> { bytes: from_public_key_bytes };
+<b>aborts_if</b> from_scheme == <a href="account.md#0x1_account_MULTI_ED25519_SCHEME">MULTI_ED25519_SCHEME</a> && ({
+    <b>let</b> from_auth_key = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/multi_ed25519.md#0x1_multi_ed25519_spec_public_key_bytes_to_authentication_key">multi_ed25519::spec_public_key_bytes_to_authentication_key</a>(from_public_key_bytes);
+    account_resource.authentication_key != from_auth_key
+});
+// This enforces <a id="high-level-req-5.1" href="#high-level-req">high-level requirement 5</a>:
+<b>aborts_if</b> from_scheme != <a href="account.md#0x1_account_ED25519_SCHEME">ED25519_SCHEME</a> && from_scheme != <a href="account.md#0x1_account_MULTI_ED25519_SCHEME">MULTI_ED25519_SCHEME</a>;
+<b>let</b> curr_auth_key = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_deserialize">from_bcs::deserialize</a>&lt;<b>address</b>&gt;(account_resource.authentication_key);
+<b>aborts_if</b> !<a href="../../../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_deserializable">from_bcs::deserializable</a>&lt;<b>address</b>&gt;(account_resource.authentication_key);
+<b>let</b> challenge = <a href="account.md#0x1_account_RotationProofChallenge">RotationProofChallenge</a> {
+    sequence_number: account_resource.sequence_number,
+    originator: addr,
+    current_auth_key: curr_auth_key,
+    new_public_key: to_public_key_bytes,
+};
+// This enforces <a id="high-level-req-9.1" href="#high-level-req">high-level requirement 9</a>:
+<b>include</b> <a href="account.md#0x1_account_AssertValidRotationProofSignatureAndGetAuthKeyAbortsIf">AssertValidRotationProofSignatureAndGetAuthKeyAbortsIf</a> {
+    scheme: from_scheme,
+    public_key_bytes: from_public_key_bytes,
+    signature: cap_rotate_key,
+    challenge,
+};
+<b>include</b> <a href="account.md#0x1_account_AssertValidRotationProofSignatureAndGetAuthKeyAbortsIf">AssertValidRotationProofSignatureAndGetAuthKeyAbortsIf</a> {
+    scheme: to_scheme,
+    public_key_bytes: to_public_key_bytes,
+    signature: cap_update_table,
+    challenge,
+};
+<b>let</b> originating_addr = addr;
+<b>let</b> new_auth_key_vector = <a href="account.md#0x1_account_spec_assert_valid_rotation_proof_signature_and_get_auth_key">spec_assert_valid_rotation_proof_signature_and_get_auth_key</a>(to_scheme, to_public_key_bytes, cap_update_table, challenge);
+<b>let</b> address_map = <b>global</b>&lt;<a href="account.md#0x1_account_OriginatingAddress">OriginatingAddress</a>&gt;(@aptos_framework).address_map;
+<b>let</b> new_auth_key = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_deserialize">from_bcs::deserialize</a>&lt;<b>address</b>&gt;(new_auth_key_vector);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="account.md#0x1_account_OriginatingAddress">OriginatingAddress</a>&gt;(@aptos_framework);
+<b>aborts_if</b> !<a href="../../../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_deserializable">from_bcs::deserializable</a>&lt;<b>address</b>&gt;(account_resource.authentication_key);
+<b>aborts_if</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_contains">table::spec_contains</a>(address_map, curr_auth_key) &&
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(address_map, curr_auth_key) != originating_addr;
+<b>aborts_if</b> !<a href="../../../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_deserializable">from_bcs::deserializable</a>&lt;<b>address</b>&gt;(new_auth_key_vector);
+<b>aborts_if</b> curr_auth_key != new_auth_key && <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_contains">table::spec_contains</a>(address_map, new_auth_key);
+<b>include</b> <a href="account.md#0x1_account_UpdateAuthKeyAndOriginatingAddressTableAbortsIf">UpdateAuthKeyAndOriginatingAddressTableAbortsIf</a> {
+    originating_addr: addr,
+};
+<b>let</b> <b>post</b> auth_key = <b>global</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(addr).authentication_key;
+<b>ensures</b> auth_key == new_auth_key_vector;
+</code></pre>
+
+
+
+<a id="@Specification_1_rotate_authentication_key_with_rotation_capability"></a>
+
+### Function `rotate_authentication_key_with_rotation_capability`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="account.md#0x1_account_rotate_authentication_key_with_rotation_capability">rotate_authentication_key_with_rotation_capability</a>(delegate_signer: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, rotation_cap_offerer_address: <b>address</b>, new_scheme: u8, new_public_key_bytes: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, cap_update_table: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(rotation_cap_offerer_address);
+<b>let</b> delegate_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(delegate_signer);
+<b>let</b> offerer_account_resource = <b>global</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(rotation_cap_offerer_address);
+<b>aborts_if</b> !<a href="../../../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_deserializable">from_bcs::deserializable</a>&lt;<b>address</b>&gt;(offerer_account_resource.authentication_key);
+<b>let</b> curr_auth_key = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_deserialize">from_bcs::deserialize</a>&lt;<b>address</b>&gt;(offerer_account_resource.authentication_key);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(delegate_address);
+<b>let</b> challenge = <a href="account.md#0x1_account_RotationProofChallenge">RotationProofChallenge</a> {
+    sequence_number: <b>global</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(delegate_address).sequence_number,
+    originator: rotation_cap_offerer_address,
+    current_auth_key: curr_auth_key,
+    new_public_key: new_public_key_bytes,
+};
+// This enforces <a id="high-level-req-6.2" href="#high-level-req">high-level requirement 6</a>:
+<b>aborts_if</b> !<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_contains">option::spec_contains</a>(offerer_account_resource.rotation_capability_offer.for, delegate_address);
+// This enforces <a id="high-level-req-9.1" href="#high-level-req">high-level requirement 9</a>:
+<b>include</b> <a href="account.md#0x1_account_AssertValidRotationProofSignatureAndGetAuthKeyAbortsIf">AssertValidRotationProofSignatureAndGetAuthKeyAbortsIf</a> {
+    scheme: new_scheme,
+    public_key_bytes: new_public_key_bytes,
+    signature: cap_update_table,
+    challenge,
+};
+<b>let</b> new_auth_key_vector = <a href="account.md#0x1_account_spec_assert_valid_rotation_proof_signature_and_get_auth_key">spec_assert_valid_rotation_proof_signature_and_get_auth_key</a>(new_scheme, new_public_key_bytes, cap_update_table, challenge);
+<b>let</b> address_map = <b>global</b>&lt;<a href="account.md#0x1_account_OriginatingAddress">OriginatingAddress</a>&gt;(@aptos_framework).address_map;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="account.md#0x1_account_OriginatingAddress">OriginatingAddress</a>&gt;(@aptos_framework);
+<b>aborts_if</b> !<a href="../../../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_deserializable">from_bcs::deserializable</a>&lt;<b>address</b>&gt;(offerer_account_resource.authentication_key);
+<b>aborts_if</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_contains">table::spec_contains</a>(address_map, curr_auth_key) &&
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(address_map, curr_auth_key) != rotation_cap_offerer_address;
+<b>aborts_if</b> !<a href="../../../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_deserializable">from_bcs::deserializable</a>&lt;<b>address</b>&gt;(new_auth_key_vector);
+<b>let</b> new_auth_key = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_deserialize">from_bcs::deserialize</a>&lt;<b>address</b>&gt;(new_auth_key_vector);
+<b>aborts_if</b> curr_auth_key != new_auth_key && <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_contains">table::spec_contains</a>(address_map, new_auth_key);
+<b>include</b> <a href="account.md#0x1_account_UpdateAuthKeyAndOriginatingAddressTableAbortsIf">UpdateAuthKeyAndOriginatingAddressTableAbortsIf</a> {
+    originating_addr: rotation_cap_offerer_address,
+    account_resource: offerer_account_resource,
+};
+<b>let</b> <b>post</b> auth_key = <b>global</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(rotation_cap_offerer_address).authentication_key;
+<b>ensures</b> auth_key == new_auth_key_vector;
+</code></pre>
+
+
+
+<a id="@Specification_1_offer_rotation_capability"></a>
+
+### Function `offer_rotation_capability`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="account.md#0x1_account_offer_rotation_capability">offer_rotation_capability</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, rotation_capability_sig_bytes: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, account_scheme: u8, account_public_key_bytes: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, recipient_address: <b>address</b>)
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> source_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>);
+<b>let</b> account_resource = <b>global</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(source_address);
+<b>let</b> proof_challenge = <a href="account.md#0x1_account_RotationCapabilityOfferProofChallengeV2">RotationCapabilityOfferProofChallengeV2</a> {
+    <a href="chain_id.md#0x1_chain_id">chain_id</a>: <b>global</b>&lt;<a href="chain_id.md#0x1_chain_id_ChainId">chain_id::ChainId</a>&gt;(@aptos_framework).id,
+    sequence_number: account_resource.sequence_number,
+    source_address,
+    recipient_address,
+};
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="chain_id.md#0x1_chain_id_ChainId">chain_id::ChainId</a>&gt;(@aptos_framework);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(recipient_address);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(source_address);
+<b>include</b> account_scheme == <a href="account.md#0x1_account_ED25519_SCHEME">ED25519_SCHEME</a> ==&gt; <a href="../../../aptos-stdlib/tests/compiler-v2-doc/ed25519.md#0x1_ed25519_NewUnvalidatedPublicKeyFromBytesAbortsIf">ed25519::NewUnvalidatedPublicKeyFromBytesAbortsIf</a> { bytes: account_public_key_bytes };
+<b>aborts_if</b> account_scheme == <a href="account.md#0x1_account_ED25519_SCHEME">ED25519_SCHEME</a> && ({
+    <b>let</b> expected_auth_key = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/ed25519.md#0x1_ed25519_spec_public_key_bytes_to_authentication_key">ed25519::spec_public_key_bytes_to_authentication_key</a>(account_public_key_bytes);
+    account_resource.authentication_key != expected_auth_key
+});
+<b>include</b> account_scheme == <a href="account.md#0x1_account_ED25519_SCHEME">ED25519_SCHEME</a> ==&gt; <a href="../../../aptos-stdlib/tests/compiler-v2-doc/ed25519.md#0x1_ed25519_NewSignatureFromBytesAbortsIf">ed25519::NewSignatureFromBytesAbortsIf</a> { bytes: rotation_capability_sig_bytes };
+<b>aborts_if</b> account_scheme == <a href="account.md#0x1_account_ED25519_SCHEME">ED25519_SCHEME</a> && !<a href="../../../aptos-stdlib/tests/compiler-v2-doc/ed25519.md#0x1_ed25519_spec_signature_verify_strict_t">ed25519::spec_signature_verify_strict_t</a>(
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/ed25519.md#0x1_ed25519_Signature">ed25519::Signature</a> { bytes: rotation_capability_sig_bytes },
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/ed25519.md#0x1_ed25519_UnvalidatedPublicKey">ed25519::UnvalidatedPublicKey</a> { bytes: account_public_key_bytes },
+    proof_challenge
+);
+<b>include</b> account_scheme == <a href="account.md#0x1_account_MULTI_ED25519_SCHEME">MULTI_ED25519_SCHEME</a> ==&gt; <a href="../../../aptos-stdlib/tests/compiler-v2-doc/multi_ed25519.md#0x1_multi_ed25519_NewUnvalidatedPublicKeyFromBytesAbortsIf">multi_ed25519::NewUnvalidatedPublicKeyFromBytesAbortsIf</a> { bytes: account_public_key_bytes };
+<b>aborts_if</b> account_scheme == <a href="account.md#0x1_account_MULTI_ED25519_SCHEME">MULTI_ED25519_SCHEME</a> && ({
+    <b>let</b> expected_auth_key = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/multi_ed25519.md#0x1_multi_ed25519_spec_public_key_bytes_to_authentication_key">multi_ed25519::spec_public_key_bytes_to_authentication_key</a>(account_public_key_bytes);
+    account_resource.authentication_key != expected_auth_key
+});
+<b>include</b> account_scheme == <a href="account.md#0x1_account_MULTI_ED25519_SCHEME">MULTI_ED25519_SCHEME</a> ==&gt; <a href="../../../aptos-stdlib/tests/compiler-v2-doc/multi_ed25519.md#0x1_multi_ed25519_NewSignatureFromBytesAbortsIf">multi_ed25519::NewSignatureFromBytesAbortsIf</a> { bytes: rotation_capability_sig_bytes };
+<b>aborts_if</b> account_scheme == <a href="account.md#0x1_account_MULTI_ED25519_SCHEME">MULTI_ED25519_SCHEME</a> && !<a href="../../../aptos-stdlib/tests/compiler-v2-doc/multi_ed25519.md#0x1_multi_ed25519_spec_signature_verify_strict_t">multi_ed25519::spec_signature_verify_strict_t</a>(
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/multi_ed25519.md#0x1_multi_ed25519_Signature">multi_ed25519::Signature</a> { bytes: rotation_capability_sig_bytes },
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/multi_ed25519.md#0x1_multi_ed25519_UnvalidatedPublicKey">multi_ed25519::UnvalidatedPublicKey</a> { bytes: account_public_key_bytes },
+    proof_challenge
+);
+// This enforces <a id="high-level-req-5.2" href="#high-level-req">high-level requirement 5</a>:
+<b>aborts_if</b> account_scheme != <a href="account.md#0x1_account_ED25519_SCHEME">ED25519_SCHEME</a> && account_scheme != <a href="account.md#0x1_account_MULTI_ED25519_SCHEME">MULTI_ED25519_SCHEME</a>;
+// This enforces <a id="high-level-req-7.1" href="#high-level-req">high-level requirement 7</a>:
+<b>modifies</b> <b>global</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(source_address);
+<b>let</b> <b>post</b> offer_for = <b>global</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(source_address).rotation_capability_offer.for;
+<b>ensures</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_borrow">option::spec_borrow</a>(offer_for) == recipient_address;
+</code></pre>
+
+
+
+<a id="@Specification_1_is_rotation_capability_offered"></a>
+
+### Function `is_rotation_capability_offered`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="account.md#0x1_account_is_rotation_capability_offered">is_rotation_capability_offered</a>(account_addr: <b>address</b>): bool
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(account_addr);
+</code></pre>
+
+
+
+<a id="@Specification_1_get_rotation_capability_offer_for"></a>
+
+### Function `get_rotation_capability_offer_for`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="account.md#0x1_account_get_rotation_capability_offer_for">get_rotation_capability_offer_for</a>(account_addr: <b>address</b>): <b>address</b>
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(account_addr);
+<b>let</b> account_resource = <b>global</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(account_addr);
+<b>aborts_if</b> len(account_resource.rotation_capability_offer.for.vec) == 0;
+</code></pre>
+
+
+
+<a id="@Specification_1_revoke_rotation_capability"></a>
+
+### Function `revoke_rotation_capability`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="account.md#0x1_account_revoke_rotation_capability">revoke_rotation_capability</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, to_be_revoked_address: <b>address</b>)
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(to_be_revoked_address);
+<b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>);
+<b>let</b> account_resource = <b>global</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(addr);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(addr);
+<b>aborts_if</b> !<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_contains">option::spec_contains</a>(account_resource.rotation_capability_offer.for,to_be_revoked_address);
+<b>modifies</b> <b>global</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(addr);
+<b>ensures</b> <b>exists</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(to_be_revoked_address);
+<b>let</b> <b>post</b> offer_for = <b>global</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(addr).rotation_capability_offer.for;
+<b>ensures</b> !<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_is_some">option::spec_is_some</a>(offer_for);
+</code></pre>
+
+
+
+<a id="@Specification_1_revoke_any_rotation_capability"></a>
+
+### Function `revoke_any_rotation_capability`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="account.md#0x1_account_revoke_any_rotation_capability">revoke_any_rotation_capability</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>);
+<b>modifies</b> <b>global</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(addr);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(addr);
+<b>let</b> account_resource = <b>global</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(addr);
+// This enforces <a id="high-level-req-7.3" href="#high-level-req">high-level requirement 7</a>:
+<b>aborts_if</b> !<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(account_resource.rotation_capability_offer.for);
+<b>let</b> <b>post</b> offer_for = <b>global</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(addr).rotation_capability_offer.for;
+<b>ensures</b> !<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_is_some">option::spec_is_some</a>(offer_for);
+</code></pre>
+
+
+
+<a id="@Specification_1_offer_signer_capability"></a>
+
+### Function `offer_signer_capability`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="account.md#0x1_account_offer_signer_capability">offer_signer_capability</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, signer_capability_sig_bytes: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, account_scheme: u8, account_public_key_bytes: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, recipient_address: <b>address</b>)
+</code></pre>
+
+
+The Account existed under the signer.
+The authentication scheme is ED25519_SCHEME and MULTI_ED25519_SCHEME.
+
+
+<pre><code><b>let</b> source_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>);
+<b>let</b> account_resource = <b>global</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(source_address);
+<b>let</b> proof_challenge = <a href="account.md#0x1_account_SignerCapabilityOfferProofChallengeV2">SignerCapabilityOfferProofChallengeV2</a> {
+    sequence_number: account_resource.sequence_number,
+    source_address,
+    recipient_address,
+};
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(recipient_address);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(source_address);
+<b>include</b> account_scheme == <a href="account.md#0x1_account_ED25519_SCHEME">ED25519_SCHEME</a> ==&gt; <a href="../../../aptos-stdlib/tests/compiler-v2-doc/ed25519.md#0x1_ed25519_NewUnvalidatedPublicKeyFromBytesAbortsIf">ed25519::NewUnvalidatedPublicKeyFromBytesAbortsIf</a> { bytes: account_public_key_bytes };
+<b>aborts_if</b> account_scheme == <a href="account.md#0x1_account_ED25519_SCHEME">ED25519_SCHEME</a> && ({
+    <b>let</b> expected_auth_key = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/ed25519.md#0x1_ed25519_spec_public_key_bytes_to_authentication_key">ed25519::spec_public_key_bytes_to_authentication_key</a>(account_public_key_bytes);
+    account_resource.authentication_key != expected_auth_key
+});
+<b>include</b> account_scheme == <a href="account.md#0x1_account_ED25519_SCHEME">ED25519_SCHEME</a> ==&gt; <a href="../../../aptos-stdlib/tests/compiler-v2-doc/ed25519.md#0x1_ed25519_NewSignatureFromBytesAbortsIf">ed25519::NewSignatureFromBytesAbortsIf</a> { bytes: signer_capability_sig_bytes };
+<b>aborts_if</b> account_scheme == <a href="account.md#0x1_account_ED25519_SCHEME">ED25519_SCHEME</a> && !<a href="../../../aptos-stdlib/tests/compiler-v2-doc/ed25519.md#0x1_ed25519_spec_signature_verify_strict_t">ed25519::spec_signature_verify_strict_t</a>(
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/ed25519.md#0x1_ed25519_Signature">ed25519::Signature</a> { bytes: signer_capability_sig_bytes },
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/ed25519.md#0x1_ed25519_UnvalidatedPublicKey">ed25519::UnvalidatedPublicKey</a> { bytes: account_public_key_bytes },
+    proof_challenge
+);
+<b>include</b> account_scheme == <a href="account.md#0x1_account_MULTI_ED25519_SCHEME">MULTI_ED25519_SCHEME</a> ==&gt; <a href="../../../aptos-stdlib/tests/compiler-v2-doc/multi_ed25519.md#0x1_multi_ed25519_NewUnvalidatedPublicKeyFromBytesAbortsIf">multi_ed25519::NewUnvalidatedPublicKeyFromBytesAbortsIf</a> { bytes: account_public_key_bytes };
+<b>aborts_if</b> account_scheme == <a href="account.md#0x1_account_MULTI_ED25519_SCHEME">MULTI_ED25519_SCHEME</a> && ({
+    <b>let</b> expected_auth_key = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/multi_ed25519.md#0x1_multi_ed25519_spec_public_key_bytes_to_authentication_key">multi_ed25519::spec_public_key_bytes_to_authentication_key</a>(account_public_key_bytes);
+    account_resource.authentication_key != expected_auth_key
+});
+<b>include</b> account_scheme == <a href="account.md#0x1_account_MULTI_ED25519_SCHEME">MULTI_ED25519_SCHEME</a> ==&gt; <a href="../../../aptos-stdlib/tests/compiler-v2-doc/multi_ed25519.md#0x1_multi_ed25519_NewSignatureFromBytesAbortsIf">multi_ed25519::NewSignatureFromBytesAbortsIf</a> { bytes: signer_capability_sig_bytes };
+<b>aborts_if</b> account_scheme == <a href="account.md#0x1_account_MULTI_ED25519_SCHEME">MULTI_ED25519_SCHEME</a> && !<a href="../../../aptos-stdlib/tests/compiler-v2-doc/multi_ed25519.md#0x1_multi_ed25519_spec_signature_verify_strict_t">multi_ed25519::spec_signature_verify_strict_t</a>(
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/multi_ed25519.md#0x1_multi_ed25519_Signature">multi_ed25519::Signature</a> { bytes: signer_capability_sig_bytes },
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/multi_ed25519.md#0x1_multi_ed25519_UnvalidatedPublicKey">multi_ed25519::UnvalidatedPublicKey</a> { bytes: account_public_key_bytes },
+    proof_challenge
+);
+// This enforces <a id="high-level-req-5.3" href="#high-level-req">high-level requirement 5</a>:
+<b>aborts_if</b> account_scheme != <a href="account.md#0x1_account_ED25519_SCHEME">ED25519_SCHEME</a> && account_scheme != <a href="account.md#0x1_account_MULTI_ED25519_SCHEME">MULTI_ED25519_SCHEME</a>;
+// This enforces <a id="high-level-req-7.2" href="#high-level-req">high-level requirement 7</a>:
+<b>modifies</b> <b>global</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(source_address);
+<b>let</b> <b>post</b> offer_for = <b>global</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(source_address).signer_capability_offer.for;
+<b>ensures</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_borrow">option::spec_borrow</a>(offer_for) == recipient_address;
+</code></pre>
+
+
+
+<a id="@Specification_1_is_signer_capability_offered"></a>
+
+### Function `is_signer_capability_offered`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="account.md#0x1_account_is_signer_capability_offered">is_signer_capability_offered</a>(account_addr: <b>address</b>): bool
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(account_addr);
+</code></pre>
+
+
+
+<a id="@Specification_1_get_signer_capability_offer_for"></a>
+
+### Function `get_signer_capability_offer_for`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="account.md#0x1_account_get_signer_capability_offer_for">get_signer_capability_offer_for</a>(account_addr: <b>address</b>): <b>address</b>
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(account_addr);
+<b>let</b> account_resource = <b>global</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(account_addr);
+<b>aborts_if</b> len(account_resource.signer_capability_offer.for.vec) == 0;
+</code></pre>
+
+
+
+<a id="@Specification_1_revoke_signer_capability"></a>
+
+### Function `revoke_signer_capability`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="account.md#0x1_account_revoke_signer_capability">revoke_signer_capability</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, to_be_revoked_address: <b>address</b>)
+</code></pre>
+
+
+The Account existed under the signer.
+The value of signer_capability_offer.for of Account resource under the signer is to_be_revoked_address.
+
+
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(to_be_revoked_address);
+<b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>);
+<b>let</b> account_resource = <b>global</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(addr);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(addr);
+<b>aborts_if</b> !<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_contains">option::spec_contains</a>(account_resource.signer_capability_offer.for,to_be_revoked_address);
+<b>modifies</b> <b>global</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(addr);
+<b>ensures</b> <b>exists</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(to_be_revoked_address);
+</code></pre>
+
+
+
+<a id="@Specification_1_revoke_any_signer_capability"></a>
+
+### Function `revoke_any_signer_capability`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="account.md#0x1_account_revoke_any_signer_capability">revoke_any_signer_capability</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>modifies</b> <b>global</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>));
+// This enforces <a id="high-level-req-7.4" href="#high-level-req">high-level requirement 7</a>:
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>));
+<b>let</b> account_resource = <b>global</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>));
+<b>aborts_if</b> !<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(account_resource.signer_capability_offer.for);
+</code></pre>
+
+
+
+<a id="@Specification_1_create_authorized_signer"></a>
+
+### Function `create_authorized_signer`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="account.md#0x1_account_create_authorized_signer">create_authorized_signer</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, offerer_address: <b>address</b>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>
+</code></pre>
+
+
+The Account existed under the signer.
+The value of signer_capability_offer.for of Account resource under the signer is offerer_address.
+
+
+<pre><code>// This enforces <a id="high-level-req-8" href="#high-level-req">high-level requirement 8</a>:
+<b>include</b> <a href="account.md#0x1_account_AccountContainsAddr">AccountContainsAddr</a>{
+    <a href="account.md#0x1_account">account</a>,
+    <b>address</b>: offerer_address,
+};
+<b>modifies</b> <b>global</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(offerer_address);
+<b>ensures</b> <b>exists</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(offerer_address);
+<b>ensures</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(result) == offerer_address;
+</code></pre>
+
+
+
+
+<a id="0x1_account_AccountContainsAddr"></a>
+
+
+<pre><code><b>schema</b> <a href="account.md#0x1_account_AccountContainsAddr">AccountContainsAddr</a> {
+    <a href="account.md#0x1_account">account</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>;
+    <b>address</b>: <b>address</b>;
+    <b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>);
+    <b>let</b> account_resource = <b>global</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(<b>address</b>);
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(<b>address</b>);
+    // This enforces <a id="high-level-spec-3" href="create_signer.md#high-level-req">high-level requirement 3</a> of the <a href="create_signer.md">create_signer</a> module:
+    <b>aborts_if</b> !<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_contains">option::spec_contains</a>(account_resource.signer_capability_offer.for,addr);
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_assert_valid_rotation_proof_signature_and_get_auth_key"></a>
+
+### Function `assert_valid_rotation_proof_signature_and_get_auth_key`
+
+
+<pre><code><b>fun</b> <a href="account.md#0x1_account_assert_valid_rotation_proof_signature_and_get_auth_key">assert_valid_rotation_proof_signature_and_get_auth_key</a>(scheme: u8, public_key_bytes: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, signature: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, challenge: &<a href="account.md#0x1_account_RotationProofChallenge">account::RotationProofChallenge</a>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>include</b> <a href="account.md#0x1_account_AssertValidRotationProofSignatureAndGetAuthKeyAbortsIf">AssertValidRotationProofSignatureAndGetAuthKeyAbortsIf</a>;
+<b>ensures</b> [abstract] result == <a href="account.md#0x1_account_spec_assert_valid_rotation_proof_signature_and_get_auth_key">spec_assert_valid_rotation_proof_signature_and_get_auth_key</a>(scheme, public_key_bytes, signature, challenge);
+</code></pre>
+
+
+
+
+<a id="0x1_account_AssertValidRotationProofSignatureAndGetAuthKeyAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="account.md#0x1_account_AssertValidRotationProofSignatureAndGetAuthKeyAbortsIf">AssertValidRotationProofSignatureAndGetAuthKeyAbortsIf</a> {
+    scheme: u8;
+    public_key_bytes: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+    signature: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+    challenge: <a href="account.md#0x1_account_RotationProofChallenge">RotationProofChallenge</a>;
+    <b>include</b> scheme == <a href="account.md#0x1_account_ED25519_SCHEME">ED25519_SCHEME</a> ==&gt; <a href="../../../aptos-stdlib/tests/compiler-v2-doc/ed25519.md#0x1_ed25519_NewUnvalidatedPublicKeyFromBytesAbortsIf">ed25519::NewUnvalidatedPublicKeyFromBytesAbortsIf</a> { bytes: public_key_bytes };
+    <b>include</b> scheme == <a href="account.md#0x1_account_ED25519_SCHEME">ED25519_SCHEME</a> ==&gt; <a href="../../../aptos-stdlib/tests/compiler-v2-doc/ed25519.md#0x1_ed25519_NewSignatureFromBytesAbortsIf">ed25519::NewSignatureFromBytesAbortsIf</a> { bytes: signature };
+    <b>aborts_if</b> scheme == <a href="account.md#0x1_account_ED25519_SCHEME">ED25519_SCHEME</a> && !<a href="../../../aptos-stdlib/tests/compiler-v2-doc/ed25519.md#0x1_ed25519_spec_signature_verify_strict_t">ed25519::spec_signature_verify_strict_t</a>(
+        <a href="../../../aptos-stdlib/tests/compiler-v2-doc/ed25519.md#0x1_ed25519_Signature">ed25519::Signature</a> { bytes: signature },
+        <a href="../../../aptos-stdlib/tests/compiler-v2-doc/ed25519.md#0x1_ed25519_UnvalidatedPublicKey">ed25519::UnvalidatedPublicKey</a> { bytes: public_key_bytes },
+        challenge
+    );
+    <b>include</b> scheme == <a href="account.md#0x1_account_MULTI_ED25519_SCHEME">MULTI_ED25519_SCHEME</a> ==&gt; <a href="../../../aptos-stdlib/tests/compiler-v2-doc/multi_ed25519.md#0x1_multi_ed25519_NewUnvalidatedPublicKeyFromBytesAbortsIf">multi_ed25519::NewUnvalidatedPublicKeyFromBytesAbortsIf</a> { bytes: public_key_bytes };
+    <b>include</b> scheme == <a href="account.md#0x1_account_MULTI_ED25519_SCHEME">MULTI_ED25519_SCHEME</a> ==&gt; <a href="../../../aptos-stdlib/tests/compiler-v2-doc/multi_ed25519.md#0x1_multi_ed25519_NewSignatureFromBytesAbortsIf">multi_ed25519::NewSignatureFromBytesAbortsIf</a> { bytes: signature };
+    <b>aborts_if</b> scheme == <a href="account.md#0x1_account_MULTI_ED25519_SCHEME">MULTI_ED25519_SCHEME</a> && !<a href="../../../aptos-stdlib/tests/compiler-v2-doc/multi_ed25519.md#0x1_multi_ed25519_spec_signature_verify_strict_t">multi_ed25519::spec_signature_verify_strict_t</a>(
+        <a href="../../../aptos-stdlib/tests/compiler-v2-doc/multi_ed25519.md#0x1_multi_ed25519_Signature">multi_ed25519::Signature</a> { bytes: signature },
+        <a href="../../../aptos-stdlib/tests/compiler-v2-doc/multi_ed25519.md#0x1_multi_ed25519_UnvalidatedPublicKey">multi_ed25519::UnvalidatedPublicKey</a> { bytes: public_key_bytes },
+        challenge
+    );
+    <b>aborts_if</b> scheme != <a href="account.md#0x1_account_ED25519_SCHEME">ED25519_SCHEME</a> && scheme != <a href="account.md#0x1_account_MULTI_ED25519_SCHEME">MULTI_ED25519_SCHEME</a>;
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_update_auth_key_and_originating_address_table"></a>
+
+### Function `update_auth_key_and_originating_address_table`
+
+
+<pre><code><b>fun</b> <a href="account.md#0x1_account_update_auth_key_and_originating_address_table">update_auth_key_and_originating_address_table</a>(originating_addr: <b>address</b>, account_resource: &<b>mut</b> <a href="account.md#0x1_account_Account">account::Account</a>, new_auth_key_vector: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>modifies</b> <b>global</b>&lt;<a href="account.md#0x1_account_OriginatingAddress">OriginatingAddress</a>&gt;(@aptos_framework);
+<b>include</b> <a href="account.md#0x1_account_UpdateAuthKeyAndOriginatingAddressTableAbortsIf">UpdateAuthKeyAndOriginatingAddressTableAbortsIf</a>;
+</code></pre>
+
+
+
+
+<a id="0x1_account_UpdateAuthKeyAndOriginatingAddressTableAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="account.md#0x1_account_UpdateAuthKeyAndOriginatingAddressTableAbortsIf">UpdateAuthKeyAndOriginatingAddressTableAbortsIf</a> {
+    originating_addr: <b>address</b>;
+    account_resource: <a href="account.md#0x1_account_Account">Account</a>;
+    new_auth_key_vector: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+    <b>let</b> address_map = <b>global</b>&lt;<a href="account.md#0x1_account_OriginatingAddress">OriginatingAddress</a>&gt;(@aptos_framework).address_map;
+    <b>let</b> curr_auth_key = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_deserialize">from_bcs::deserialize</a>&lt;<b>address</b>&gt;(account_resource.authentication_key);
+    <b>let</b> new_auth_key = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_deserialize">from_bcs::deserialize</a>&lt;<b>address</b>&gt;(new_auth_key_vector);
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="account.md#0x1_account_OriginatingAddress">OriginatingAddress</a>&gt;(@aptos_framework);
+    <b>aborts_if</b> !<a href="../../../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_deserializable">from_bcs::deserializable</a>&lt;<b>address</b>&gt;(account_resource.authentication_key);
+    <b>aborts_if</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_contains">table::spec_contains</a>(address_map, curr_auth_key) &&
+        <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(address_map, curr_auth_key) != originating_addr;
+    <b>aborts_if</b> !<a href="../../../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_deserializable">from_bcs::deserializable</a>&lt;<b>address</b>&gt;(new_auth_key_vector);
+    <b>aborts_if</b> curr_auth_key != new_auth_key && <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_contains">table::spec_contains</a>(address_map, new_auth_key);
+    <b>ensures</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_contains">table::spec_contains</a>(<b>global</b>&lt;<a href="account.md#0x1_account_OriginatingAddress">OriginatingAddress</a>&gt;(@aptos_framework).address_map, <a href="../../../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_deserialize">from_bcs::deserialize</a>&lt;<b>address</b>&gt;(new_auth_key_vector));
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_create_resource_address"></a>
+
+### Function `create_resource_address`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="account.md#0x1_account_create_resource_address">create_resource_address</a>(source: &<b>address</b>, seed: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <b>address</b>
+</code></pre>
+
+
+The Account existed under the signer
+The value of signer_capability_offer.for of Account resource under the signer is to_be_revoked_address
+
+
+<pre><code><b>pragma</b> opaque;
+<b>pragma</b> aborts_if_is_strict = <b>false</b>;
+<b>aborts_if</b> [abstract] <b>false</b>;
+<b>ensures</b> [abstract] result == <a href="account.md#0x1_account_spec_create_resource_address">spec_create_resource_address</a>(source, seed);
+</code></pre>
+
+
+
+
+<a id="0x1_account_spec_create_resource_address"></a>
+
+
+<pre><code><b>fun</b> <a href="account.md#0x1_account_spec_create_resource_address">spec_create_resource_address</a>(source: <b>address</b>, seed: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <b>address</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_create_resource_account"></a>
+
+### Function `create_resource_account`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="account.md#0x1_account_create_resource_account">create_resource_account</a>(source: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, seed: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="account.md#0x1_account_SignerCapability">account::SignerCapability</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> source_addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(source);
+<b>let</b> resource_addr = <a href="account.md#0x1_account_spec_create_resource_address">spec_create_resource_address</a>(source_addr, seed);
+<b>aborts_if</b> len(<a href="account.md#0x1_account_ZERO_AUTH_KEY">ZERO_AUTH_KEY</a>) != 32;
+<b>include</b> <a href="account.md#0x1_account_exists_at">exists_at</a>(resource_addr) ==&gt; <a href="account.md#0x1_account_CreateResourceAccountAbortsIf">CreateResourceAccountAbortsIf</a>;
+<b>include</b> !<a href="account.md#0x1_account_exists_at">exists_at</a>(resource_addr) ==&gt; <a href="account.md#0x1_account_CreateAccountAbortsIf">CreateAccountAbortsIf</a> {addr: resource_addr};
+<b>ensures</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(result_1) == resource_addr;
+<b>let</b> <b>post</b> offer_for = <b>global</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(resource_addr).signer_capability_offer.for;
+<b>ensures</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_borrow">option::spec_borrow</a>(offer_for) == resource_addr;
+<b>ensures</b> result_2 == <a href="account.md#0x1_account_SignerCapability">SignerCapability</a> { <a href="account.md#0x1_account">account</a>: resource_addr };
+</code></pre>
+
+
+
+<a id="@Specification_1_create_framework_reserved_account"></a>
+
+### Function `create_framework_reserved_account`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="account.md#0x1_account_create_framework_reserved_account">create_framework_reserved_account</a>(addr: <b>address</b>): (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="account.md#0x1_account_SignerCapability">account::SignerCapability</a>)
+</code></pre>
+
+
+Check if the bytes of the new address is 32.
+The Account does not exist under the new address before creating the account.
+The system reserved addresses is @0x1 / @0x2 / @0x3 / @0x4 / @0x5  / @0x6 / @0x7 / @0x8 / @0x9 / @0xa.
+
+
+<pre><code><b>aborts_if</b> <a href="account.md#0x1_account_spec_is_framework_address">spec_is_framework_address</a>(addr);
+<b>include</b> <a href="account.md#0x1_account_CreateAccountAbortsIf">CreateAccountAbortsIf</a> {addr};
+<b>ensures</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(result_1) == addr;
+<b>ensures</b> result_2 == <a href="account.md#0x1_account_SignerCapability">SignerCapability</a> { <a href="account.md#0x1_account">account</a>: addr };
+</code></pre>
+
+
+
+
+<a id="0x1_account_spec_is_framework_address"></a>
+
+
+<pre><code><b>fun</b> <a href="account.md#0x1_account_spec_is_framework_address">spec_is_framework_address</a>(addr: <b>address</b>): bool{
+   addr != @0x1 &&
+   addr != @0x2 &&
+   addr != @0x3 &&
+   addr != @0x4 &&
+   addr != @0x5 &&
+   addr != @0x6 &&
+   addr != @0x7 &&
+   addr != @0x8 &&
+   addr != @0x9 &&
+   addr != @0xa
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_create_guid"></a>
+
+### Function `create_guid`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="account.md#0x1_account_create_guid">create_guid</a>(account_signer: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>): <a href="guid.md#0x1_guid_GUID">guid::GUID</a>
+</code></pre>
+
+
+The Account existed under the signer.
+The guid_creation_num of the ccount resource is up to MAX_U64.
+
+
+<pre><code><b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(account_signer);
+<b>include</b> <a href="account.md#0x1_account_NewEventHandleAbortsIf">NewEventHandleAbortsIf</a> {
+    <a href="account.md#0x1_account">account</a>: account_signer,
+};
+<b>modifies</b> <b>global</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(addr);
+// This enforces <a id="high-level-req-11" href="#high-level-req">high-level requirement 11</a>:
+<b>ensures</b> <b>global</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(addr).guid_creation_num == <b>old</b>(<b>global</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(addr).guid_creation_num) + 1;
+</code></pre>
+
+
+
+<a id="@Specification_1_new_event_handle"></a>
+
+### Function `new_event_handle`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="account.md#0x1_account_new_event_handle">new_event_handle</a>&lt;T: drop, store&gt;(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>): <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;T&gt;
+</code></pre>
+
+
+The Account existed under the signer.
+The guid_creation_num of the Account is up to MAX_U64.
+
+
+<pre><code><b>include</b> <a href="account.md#0x1_account_NewEventHandleAbortsIf">NewEventHandleAbortsIf</a>;
+</code></pre>
+
+
+
+
+<a id="0x1_account_NewEventHandleAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="account.md#0x1_account_NewEventHandleAbortsIf">NewEventHandleAbortsIf</a> {
+    <a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>;
+    <b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>);
+    <b>let</b> <a href="account.md#0x1_account">account</a> = <b>global</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(addr);
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(addr);
+    <b>aborts_if</b> <a href="account.md#0x1_account">account</a>.guid_creation_num + 1 &gt; <a href="account.md#0x1_account_MAX_U64">MAX_U64</a>;
+    <b>aborts_if</b> <a href="account.md#0x1_account">account</a>.guid_creation_num + 1 &gt;= <a href="account.md#0x1_account_MAX_GUID_CREATION_NUM">MAX_GUID_CREATION_NUM</a>;
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_register_coin"></a>
+
+### Function `register_coin`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="account.md#0x1_account_register_coin">register_coin</a>&lt;CoinType&gt;(account_addr: <b>address</b>)
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(account_addr);
+<b>aborts_if</b> !<a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_spec_is_struct">type_info::spec_is_struct</a>&lt;CoinType&gt;();
+<b>modifies</b> <b>global</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(account_addr);
+</code></pre>
+
+
+
+<a id="@Specification_1_create_signer_with_capability"></a>
+
+### Function `create_signer_with_capability`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="account.md#0x1_account_create_signer_with_capability">create_signer_with_capability</a>(<a href="../../../aptos-stdlib/tests/compiler-v2-doc/capability.md#0x1_capability">capability</a>: &<a href="account.md#0x1_account_SignerCapability">account::SignerCapability</a>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> addr = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/capability.md#0x1_capability">capability</a>.<a href="account.md#0x1_account">account</a>;
+<b>ensures</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(result) == addr;
+</code></pre>
+
+
+
+
+<a id="0x1_account_CreateResourceAccountAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="account.md#0x1_account_CreateResourceAccountAbortsIf">CreateResourceAccountAbortsIf</a> {
+    resource_addr: <b>address</b>;
+    <b>let</b> <a href="account.md#0x1_account">account</a> = <b>global</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(resource_addr);
+    <b>aborts_if</b> len(<a href="account.md#0x1_account">account</a>.signer_capability_offer.for.vec) != 0;
+    <b>aborts_if</b> <a href="account.md#0x1_account">account</a>.sequence_number != 0;
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_verify_signed_message"></a>
+
+### Function `verify_signed_message`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="account.md#0x1_account_verify_signed_message">verify_signed_message</a>&lt;T: drop&gt;(<a href="account.md#0x1_account">account</a>: <b>address</b>, account_scheme: u8, account_public_key: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, signed_message_bytes: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, message: T)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> aborts_if_is_partial;
+<b>modifies</b> <b>global</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(<a href="account.md#0x1_account">account</a>);
+<b>let</b> account_resource = <b>global</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(<a href="account.md#0x1_account">account</a>);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="account.md#0x1_account_Account">Account</a>&gt;(<a href="account.md#0x1_account">account</a>);
+<b>include</b> account_scheme == <a href="account.md#0x1_account_ED25519_SCHEME">ED25519_SCHEME</a> ==&gt; <a href="../../../aptos-stdlib/tests/compiler-v2-doc/ed25519.md#0x1_ed25519_NewUnvalidatedPublicKeyFromBytesAbortsIf">ed25519::NewUnvalidatedPublicKeyFromBytesAbortsIf</a> { bytes: account_public_key };
+<b>aborts_if</b> account_scheme == <a href="account.md#0x1_account_ED25519_SCHEME">ED25519_SCHEME</a> && ({
+    <b>let</b> expected_auth_key = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/ed25519.md#0x1_ed25519_spec_public_key_bytes_to_authentication_key">ed25519::spec_public_key_bytes_to_authentication_key</a>(account_public_key);
+    account_resource.authentication_key != expected_auth_key
+});
+<b>include</b> account_scheme == <a href="account.md#0x1_account_MULTI_ED25519_SCHEME">MULTI_ED25519_SCHEME</a> ==&gt; <a href="../../../aptos-stdlib/tests/compiler-v2-doc/multi_ed25519.md#0x1_multi_ed25519_NewUnvalidatedPublicKeyFromBytesAbortsIf">multi_ed25519::NewUnvalidatedPublicKeyFromBytesAbortsIf</a> { bytes: account_public_key };
+<b>aborts_if</b> account_scheme == <a href="account.md#0x1_account_MULTI_ED25519_SCHEME">MULTI_ED25519_SCHEME</a> && ({
+    <b>let</b> expected_auth_key = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/multi_ed25519.md#0x1_multi_ed25519_spec_public_key_bytes_to_authentication_key">multi_ed25519::spec_public_key_bytes_to_authentication_key</a>(account_public_key);
+    account_resource.authentication_key != expected_auth_key
+});
+<b>include</b> account_scheme == <a href="account.md#0x1_account_ED25519_SCHEME">ED25519_SCHEME</a> ==&gt; <a href="../../../aptos-stdlib/tests/compiler-v2-doc/ed25519.md#0x1_ed25519_NewSignatureFromBytesAbortsIf">ed25519::NewSignatureFromBytesAbortsIf</a> { bytes: signed_message_bytes };
+<b>include</b> account_scheme == <a href="account.md#0x1_account_MULTI_ED25519_SCHEME">MULTI_ED25519_SCHEME</a> ==&gt; <a href="../../../aptos-stdlib/tests/compiler-v2-doc/multi_ed25519.md#0x1_multi_ed25519_NewSignatureFromBytesAbortsIf">multi_ed25519::NewSignatureFromBytesAbortsIf</a> { bytes: signed_message_bytes };
+<b>aborts_if</b> account_scheme != <a href="account.md#0x1_account_ED25519_SCHEME">ED25519_SCHEME</a> && account_scheme != <a href="account.md#0x1_account_MULTI_ED25519_SCHEME">MULTI_ED25519_SCHEME</a>;
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/aggregator.md b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/aggregator.md
new file mode 100644
index 0000000000000..4d2bfca013199
--- /dev/null
+++ b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/aggregator.md
@@ -0,0 +1,474 @@
+
+<a id="0x1_aggregator"></a>
+
+# Module `0x1::aggregator`
+
+This module provides an interface for aggregators. Aggregators are similar to
+unsigned integers and support addition and subtraction (aborting on underflow
+or on overflowing a custom upper limit). The difference from integers is that
+aggregators allow to perform both additions and subtractions in parallel across
+multiple transactions, enabling parallel execution. For example, if the first
+transaction is doing <code><a href="aggregator.md#0x1_aggregator_add">add</a>(X, 1)</code> for aggregator resource <code>X</code>, and the second
+is doing <code><a href="aggregator.md#0x1_aggregator_sub">sub</a>(X,3)</code>, they can be executed in parallel avoiding a read-modify-write
+dependency.
+However, reading the aggregator value (i.e. calling <code><a href="aggregator.md#0x1_aggregator_read">read</a>(X)</code>) is an expensive
+operation and should be avoided as much as possible because it reduces the
+parallelism. Moreover, **aggregators can only be created by Aptos Framework (0x1)
+at the moment.**
+
+
+-  [Struct `Aggregator`](#0x1_aggregator_Aggregator)
+-  [Constants](#@Constants_0)
+-  [Function `limit`](#0x1_aggregator_limit)
+-  [Function `add`](#0x1_aggregator_add)
+-  [Function `sub`](#0x1_aggregator_sub)
+-  [Function `read`](#0x1_aggregator_read)
+-  [Function `destroy`](#0x1_aggregator_destroy)
+-  [Specification](#@Specification_1)
+    -  [Struct `Aggregator`](#@Specification_1_Aggregator)
+    -  [High-level Requirements](#high-level-req)
+    -  [Module-level Specification](#module-level-spec)
+    -  [Function `limit`](#@Specification_1_limit)
+    -  [Function `add`](#@Specification_1_add)
+    -  [Function `sub`](#@Specification_1_sub)
+    -  [Function `read`](#@Specification_1_read)
+    -  [Function `destroy`](#@Specification_1_destroy)
+
+
+<pre><code></code></pre>
+
+
+
+<a id="0x1_aggregator_Aggregator"></a>
+
+## Struct `Aggregator`
+
+Represents an integer which supports parallel additions and subtractions
+across multiple transactions. See the module description for more details.
+
+
+<pre><code><b>struct</b> <a href="aggregator.md#0x1_aggregator_Aggregator">Aggregator</a> <b>has</b> store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>handle: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>key: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>limit: u128</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_aggregator_EAGGREGATOR_OVERFLOW"></a>
+
+The value of aggregator overflows. Raised by native code.
+
+
+<pre><code><b>const</b> <a href="aggregator.md#0x1_aggregator_EAGGREGATOR_OVERFLOW">EAGGREGATOR_OVERFLOW</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_aggregator_EAGGREGATOR_UNDERFLOW"></a>
+
+The value of aggregator underflows (goes below zero). Raised by native code.
+
+
+<pre><code><b>const</b> <a href="aggregator.md#0x1_aggregator_EAGGREGATOR_UNDERFLOW">EAGGREGATOR_UNDERFLOW</a>: u64 = 2;
+</code></pre>
+
+
+
+<a id="0x1_aggregator_ENOT_SUPPORTED"></a>
+
+Aggregator feature is not supported. Raised by native code.
+
+
+<pre><code><b>const</b> <a href="aggregator.md#0x1_aggregator_ENOT_SUPPORTED">ENOT_SUPPORTED</a>: u64 = 3;
+</code></pre>
+
+
+
+<a id="0x1_aggregator_limit"></a>
+
+## Function `limit`
+
+Returns <code>limit</code> exceeding which aggregator overflows.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aggregator.md#0x1_aggregator_limit">limit</a>(<a href="aggregator.md#0x1_aggregator">aggregator</a>: &<a href="aggregator.md#0x1_aggregator_Aggregator">aggregator::Aggregator</a>): u128
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aggregator.md#0x1_aggregator_limit">limit</a>(<a href="aggregator.md#0x1_aggregator">aggregator</a>: &<a href="aggregator.md#0x1_aggregator_Aggregator">Aggregator</a>): u128 {
+    <a href="aggregator.md#0x1_aggregator">aggregator</a>.limit
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aggregator_add"></a>
+
+## Function `add`
+
+Adds <code>value</code> to aggregator. Aborts on overflowing the limit.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aggregator.md#0x1_aggregator_add">add</a>(<a href="aggregator.md#0x1_aggregator">aggregator</a>: &<b>mut</b> <a href="aggregator.md#0x1_aggregator_Aggregator">aggregator::Aggregator</a>, value: u128)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>native</b> <b>fun</b> <a href="aggregator.md#0x1_aggregator_add">add</a>(<a href="aggregator.md#0x1_aggregator">aggregator</a>: &<b>mut</b> <a href="aggregator.md#0x1_aggregator_Aggregator">Aggregator</a>, value: u128);
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aggregator_sub"></a>
+
+## Function `sub`
+
+Subtracts <code>value</code> from aggregator. Aborts on going below zero.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aggregator.md#0x1_aggregator_sub">sub</a>(<a href="aggregator.md#0x1_aggregator">aggregator</a>: &<b>mut</b> <a href="aggregator.md#0x1_aggregator_Aggregator">aggregator::Aggregator</a>, value: u128)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>native</b> <b>fun</b> <a href="aggregator.md#0x1_aggregator_sub">sub</a>(<a href="aggregator.md#0x1_aggregator">aggregator</a>: &<b>mut</b> <a href="aggregator.md#0x1_aggregator_Aggregator">Aggregator</a>, value: u128);
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aggregator_read"></a>
+
+## Function `read`
+
+Returns a value stored in this aggregator.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aggregator.md#0x1_aggregator_read">read</a>(<a href="aggregator.md#0x1_aggregator">aggregator</a>: &<a href="aggregator.md#0x1_aggregator_Aggregator">aggregator::Aggregator</a>): u128
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>native</b> <b>fun</b> <a href="aggregator.md#0x1_aggregator_read">read</a>(<a href="aggregator.md#0x1_aggregator">aggregator</a>: &<a href="aggregator.md#0x1_aggregator_Aggregator">Aggregator</a>): u128;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aggregator_destroy"></a>
+
+## Function `destroy`
+
+Destroys an aggregator and removes it from its <code>AggregatorFactory</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aggregator.md#0x1_aggregator_destroy">destroy</a>(<a href="aggregator.md#0x1_aggregator">aggregator</a>: <a href="aggregator.md#0x1_aggregator_Aggregator">aggregator::Aggregator</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>native</b> <b>fun</b> <a href="aggregator.md#0x1_aggregator_destroy">destroy</a>(<a href="aggregator.md#0x1_aggregator">aggregator</a>: <a href="aggregator.md#0x1_aggregator_Aggregator">Aggregator</a>);
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+<a id="@Specification_1_Aggregator"></a>
+
+### Struct `Aggregator`
+
+
+<pre><code><b>struct</b> <a href="aggregator.md#0x1_aggregator_Aggregator">Aggregator</a> <b>has</b> store
+</code></pre>
+
+
+
+<dl>
+<dt>
+<code>handle: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>key: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>limit: u128</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+
+
+<a id="high-level-req"></a>
+
+### High-level Requirements
+
+<table>
+<tr>
+<th>No.</th><th>Requirement</th><th>Criticality</th><th>Implementation</th><th>Enforcement</th>
+</tr>
+
+<tr>
+<td>1</td>
+<td>For a given aggregator, it should always be possible to: Return the limit value of the aggregator. Return the current value stored in the aggregator. Destroy an aggregator, removing it from its AggregatorFactory.</td>
+<td>Low</td>
+<td>The following functions should not abort if EventHandle exists: limit(), read(), destroy().</td>
+<td>Formally verified via <a href="#high-level-req-1.1">read</a>, <a href="#high-level-req-1.2">destroy</a>, and <a href="#high-level-req-1.3">limit</a>.</td>
+</tr>
+
+<tr>
+<td>2</td>
+<td>If the value during addition exceeds the limit, an overflow occurs.</td>
+<td>High</td>
+<td>The native add() function checks the value of the addition to ensure it does not pass the defined limit and results in aggregator overflow.</td>
+<td>Formally verified via <a href="#high-level-req-2">add</a>.</td>
+</tr>
+
+<tr>
+<td>3</td>
+<td>Operations over aggregators should be correct.</td>
+<td>High</td>
+<td>The implementation of the add, sub, read and destroy functions is correct.</td>
+<td>The native implementation of the add, sub, read and destroy functions have been manually audited.</td>
+</tr>
+
+</table>
+
+
+
+
+<a id="module-level-spec"></a>
+
+### Module-level Specification
+
+
+<pre><code><b>pragma</b> intrinsic;
+</code></pre>
+
+
+
+<a id="@Specification_1_limit"></a>
+
+### Function `limit`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aggregator.md#0x1_aggregator_limit">limit</a>(<a href="aggregator.md#0x1_aggregator">aggregator</a>: &<a href="aggregator.md#0x1_aggregator_Aggregator">aggregator::Aggregator</a>): u128
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+// This enforces <a id="high-level-req-1.2" href="#high-level-req">high-level requirement 1</a>:
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> [abstract] result == <a href="aggregator.md#0x1_aggregator_spec_get_limit">spec_get_limit</a>(<a href="aggregator.md#0x1_aggregator">aggregator</a>);
+</code></pre>
+
+
+
+
+<a id="0x1_aggregator_spec_read"></a>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="aggregator.md#0x1_aggregator_spec_read">spec_read</a>(<a href="aggregator.md#0x1_aggregator">aggregator</a>: <a href="aggregator.md#0x1_aggregator_Aggregator">Aggregator</a>): u128;
+</code></pre>
+
+
+
+
+<a id="0x1_aggregator_spec_get_limit"></a>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="aggregator.md#0x1_aggregator_spec_get_limit">spec_get_limit</a>(a: <a href="aggregator.md#0x1_aggregator_Aggregator">Aggregator</a>): u128;
+</code></pre>
+
+
+
+
+<a id="0x1_aggregator_spec_get_handle"></a>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="aggregator.md#0x1_aggregator_spec_get_handle">spec_get_handle</a>(a: <a href="aggregator.md#0x1_aggregator_Aggregator">Aggregator</a>): u128;
+</code></pre>
+
+
+
+
+<a id="0x1_aggregator_spec_get_key"></a>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="aggregator.md#0x1_aggregator_spec_get_key">spec_get_key</a>(a: <a href="aggregator.md#0x1_aggregator_Aggregator">Aggregator</a>): u128;
+</code></pre>
+
+
+
+
+<a id="0x1_aggregator_spec_aggregator_set_val"></a>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="aggregator.md#0x1_aggregator_spec_aggregator_set_val">spec_aggregator_set_val</a>(a: <a href="aggregator.md#0x1_aggregator_Aggregator">Aggregator</a>, v: u128): <a href="aggregator.md#0x1_aggregator_Aggregator">Aggregator</a>;
+</code></pre>
+
+
+
+
+<a id="0x1_aggregator_spec_aggregator_get_val"></a>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="aggregator.md#0x1_aggregator_spec_aggregator_get_val">spec_aggregator_get_val</a>(a: <a href="aggregator.md#0x1_aggregator_Aggregator">Aggregator</a>): u128;
+</code></pre>
+
+
+
+<a id="@Specification_1_add"></a>
+
+### Function `add`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aggregator.md#0x1_aggregator_add">add</a>(<a href="aggregator.md#0x1_aggregator">aggregator</a>: &<b>mut</b> <a href="aggregator.md#0x1_aggregator_Aggregator">aggregator::Aggregator</a>, value: u128)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <a href="aggregator.md#0x1_aggregator_spec_aggregator_get_val">spec_aggregator_get_val</a>(<a href="aggregator.md#0x1_aggregator">aggregator</a>) + value &gt; <a href="aggregator.md#0x1_aggregator_spec_get_limit">spec_get_limit</a>(<a href="aggregator.md#0x1_aggregator">aggregator</a>);
+// This enforces <a id="high-level-req-2" href="#high-level-req">high-level requirement 2</a>:
+<b>aborts_if</b> <a href="aggregator.md#0x1_aggregator_spec_aggregator_get_val">spec_aggregator_get_val</a>(<a href="aggregator.md#0x1_aggregator">aggregator</a>) + value &gt; MAX_U128;
+<b>ensures</b> <a href="aggregator.md#0x1_aggregator_spec_get_limit">spec_get_limit</a>(<a href="aggregator.md#0x1_aggregator">aggregator</a>) == <a href="aggregator.md#0x1_aggregator_spec_get_limit">spec_get_limit</a>(<b>old</b>(<a href="aggregator.md#0x1_aggregator">aggregator</a>));
+<b>ensures</b> <a href="aggregator.md#0x1_aggregator">aggregator</a> == <a href="aggregator.md#0x1_aggregator_spec_aggregator_set_val">spec_aggregator_set_val</a>(<b>old</b>(<a href="aggregator.md#0x1_aggregator">aggregator</a>),
+    <a href="aggregator.md#0x1_aggregator_spec_aggregator_get_val">spec_aggregator_get_val</a>(<b>old</b>(<a href="aggregator.md#0x1_aggregator">aggregator</a>)) + value);
+</code></pre>
+
+
+
+<a id="@Specification_1_sub"></a>
+
+### Function `sub`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aggregator.md#0x1_aggregator_sub">sub</a>(<a href="aggregator.md#0x1_aggregator">aggregator</a>: &<b>mut</b> <a href="aggregator.md#0x1_aggregator_Aggregator">aggregator::Aggregator</a>, value: u128)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <a href="aggregator.md#0x1_aggregator_spec_aggregator_get_val">spec_aggregator_get_val</a>(<a href="aggregator.md#0x1_aggregator">aggregator</a>) &lt; value;
+<b>ensures</b> <a href="aggregator.md#0x1_aggregator_spec_get_limit">spec_get_limit</a>(<a href="aggregator.md#0x1_aggregator">aggregator</a>) == <a href="aggregator.md#0x1_aggregator_spec_get_limit">spec_get_limit</a>(<b>old</b>(<a href="aggregator.md#0x1_aggregator">aggregator</a>));
+<b>ensures</b> <a href="aggregator.md#0x1_aggregator">aggregator</a> == <a href="aggregator.md#0x1_aggregator_spec_aggregator_set_val">spec_aggregator_set_val</a>(<b>old</b>(<a href="aggregator.md#0x1_aggregator">aggregator</a>),
+    <a href="aggregator.md#0x1_aggregator_spec_aggregator_get_val">spec_aggregator_get_val</a>(<b>old</b>(<a href="aggregator.md#0x1_aggregator">aggregator</a>)) - value);
+</code></pre>
+
+
+
+<a id="@Specification_1_read"></a>
+
+### Function `read`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aggregator.md#0x1_aggregator_read">read</a>(<a href="aggregator.md#0x1_aggregator">aggregator</a>: &<a href="aggregator.md#0x1_aggregator_Aggregator">aggregator::Aggregator</a>): u128
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+// This enforces <a id="high-level-req-1.1" href="#high-level-req">high-level requirement 1</a>:
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="aggregator.md#0x1_aggregator_spec_read">spec_read</a>(<a href="aggregator.md#0x1_aggregator">aggregator</a>);
+<b>ensures</b> result &lt;= <a href="aggregator.md#0x1_aggregator_spec_get_limit">spec_get_limit</a>(<a href="aggregator.md#0x1_aggregator">aggregator</a>);
+</code></pre>
+
+
+
+<a id="@Specification_1_destroy"></a>
+
+### Function `destroy`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aggregator.md#0x1_aggregator_destroy">destroy</a>(<a href="aggregator.md#0x1_aggregator">aggregator</a>: <a href="aggregator.md#0x1_aggregator_Aggregator">aggregator::Aggregator</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+// This enforces <a id="high-level-req-1.2" href="#high-level-req">high-level requirement 1</a>:
+<b>aborts_if</b> <b>false</b>;
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/aggregator_factory.md b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/aggregator_factory.md
new file mode 100644
index 0000000000000..7f92cf43addf1
--- /dev/null
+++ b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/aggregator_factory.md
@@ -0,0 +1,355 @@
+
+<a id="0x1_aggregator_factory"></a>
+
+# Module `0x1::aggregator_factory`
+
+This module provides foundations to create aggregators. Currently only
+Aptos Framework (0x1) can create them, so this module helps to wrap
+the constructor of <code>Aggregator</code> struct so that only a system account
+can initialize one. In the future, this might change and aggregators
+can be enabled for the public.
+
+
+-  [Resource `AggregatorFactory`](#0x1_aggregator_factory_AggregatorFactory)
+-  [Constants](#@Constants_0)
+-  [Function `initialize_aggregator_factory`](#0x1_aggregator_factory_initialize_aggregator_factory)
+-  [Function `create_aggregator_internal`](#0x1_aggregator_factory_create_aggregator_internal)
+-  [Function `create_aggregator`](#0x1_aggregator_factory_create_aggregator)
+-  [Function `new_aggregator`](#0x1_aggregator_factory_new_aggregator)
+-  [Specification](#@Specification_1)
+    -  [High-level Requirements](#high-level-req)
+    -  [Module-level Specification](#module-level-spec)
+    -  [Function `initialize_aggregator_factory`](#@Specification_1_initialize_aggregator_factory)
+    -  [Function `create_aggregator_internal`](#@Specification_1_create_aggregator_internal)
+    -  [Function `create_aggregator`](#@Specification_1_create_aggregator)
+    -  [Function `new_aggregator`](#@Specification_1_new_aggregator)
+
+
+<pre><code><b>use</b> <a href="aggregator.md#0x1_aggregator">0x1::aggregator</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="system_addresses.md#0x1_system_addresses">0x1::system_addresses</a>;
+<b>use</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table">0x1::table</a>;
+</code></pre>
+
+
+
+<a id="0x1_aggregator_factory_AggregatorFactory"></a>
+
+## Resource `AggregatorFactory`
+
+Creates new aggregators. Used to control the numbers of aggregators in the
+system and who can create them. At the moment, only Aptos Framework (0x1)
+account can.
+
+
+<pre><code><b>struct</b> <a href="aggregator_factory.md#0x1_aggregator_factory_AggregatorFactory">AggregatorFactory</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>phantom_table: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_Table">table::Table</a>&lt;<b>address</b>, u128&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_aggregator_factory_EAGGREGATOR_FACTORY_NOT_FOUND"></a>
+
+Aggregator factory is not published yet.
+
+
+<pre><code><b>const</b> <a href="aggregator_factory.md#0x1_aggregator_factory_EAGGREGATOR_FACTORY_NOT_FOUND">EAGGREGATOR_FACTORY_NOT_FOUND</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_aggregator_factory_initialize_aggregator_factory"></a>
+
+## Function `initialize_aggregator_factory`
+
+Creates a new factory for aggregators. Can only be called during genesis.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="aggregator_factory.md#0x1_aggregator_factory_initialize_aggregator_factory">initialize_aggregator_factory</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="aggregator_factory.md#0x1_aggregator_factory_initialize_aggregator_factory">initialize_aggregator_factory</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>) {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(aptos_framework);
+    <b>let</b> <a href="aggregator_factory.md#0x1_aggregator_factory">aggregator_factory</a> = <a href="aggregator_factory.md#0x1_aggregator_factory_AggregatorFactory">AggregatorFactory</a> {
+        phantom_table: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_new">table::new</a>()
+    };
+    <b>move_to</b>(aptos_framework, <a href="aggregator_factory.md#0x1_aggregator_factory">aggregator_factory</a>);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aggregator_factory_create_aggregator_internal"></a>
+
+## Function `create_aggregator_internal`
+
+Creates a new aggregator instance which overflows on exceeding a <code>limit</code>.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="aggregator_factory.md#0x1_aggregator_factory_create_aggregator_internal">create_aggregator_internal</a>(limit: u128): <a href="aggregator.md#0x1_aggregator_Aggregator">aggregator::Aggregator</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="aggregator_factory.md#0x1_aggregator_factory_create_aggregator_internal">create_aggregator_internal</a>(limit: u128): Aggregator <b>acquires</b> <a href="aggregator_factory.md#0x1_aggregator_factory_AggregatorFactory">AggregatorFactory</a> {
+    <b>assert</b>!(
+        <b>exists</b>&lt;<a href="aggregator_factory.md#0x1_aggregator_factory_AggregatorFactory">AggregatorFactory</a>&gt;(@aptos_framework),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="aggregator_factory.md#0x1_aggregator_factory_EAGGREGATOR_FACTORY_NOT_FOUND">EAGGREGATOR_FACTORY_NOT_FOUND</a>)
+    );
+
+    <b>let</b> <a href="aggregator_factory.md#0x1_aggregator_factory">aggregator_factory</a> = <b>borrow_global_mut</b>&lt;<a href="aggregator_factory.md#0x1_aggregator_factory_AggregatorFactory">AggregatorFactory</a>&gt;(@aptos_framework);
+    <a href="aggregator_factory.md#0x1_aggregator_factory_new_aggregator">new_aggregator</a>(<a href="aggregator_factory.md#0x1_aggregator_factory">aggregator_factory</a>, limit)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aggregator_factory_create_aggregator"></a>
+
+## Function `create_aggregator`
+
+This is currently a function closed for public. This can be updated in the future by on-chain governance
+to allow any signer to call.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aggregator_factory.md#0x1_aggregator_factory_create_aggregator">create_aggregator</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, limit: u128): <a href="aggregator.md#0x1_aggregator_Aggregator">aggregator::Aggregator</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aggregator_factory.md#0x1_aggregator_factory_create_aggregator">create_aggregator</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, limit: u128): Aggregator <b>acquires</b> <a href="aggregator_factory.md#0x1_aggregator_factory_AggregatorFactory">AggregatorFactory</a> {
+    // Only Aptos Framework (0x1) <a href="account.md#0x1_account">account</a> can call this for now.
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(<a href="account.md#0x1_account">account</a>);
+    <a href="aggregator_factory.md#0x1_aggregator_factory_create_aggregator_internal">create_aggregator_internal</a>(limit)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aggregator_factory_new_aggregator"></a>
+
+## Function `new_aggregator`
+
+Returns a new aggregator.
+
+
+<pre><code><b>fun</b> <a href="aggregator_factory.md#0x1_aggregator_factory_new_aggregator">new_aggregator</a>(<a href="aggregator_factory.md#0x1_aggregator_factory">aggregator_factory</a>: &<b>mut</b> <a href="aggregator_factory.md#0x1_aggregator_factory_AggregatorFactory">aggregator_factory::AggregatorFactory</a>, limit: u128): <a href="aggregator.md#0x1_aggregator_Aggregator">aggregator::Aggregator</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="aggregator_factory.md#0x1_aggregator_factory_new_aggregator">new_aggregator</a>(<a href="aggregator_factory.md#0x1_aggregator_factory">aggregator_factory</a>: &<b>mut</b> <a href="aggregator_factory.md#0x1_aggregator_factory_AggregatorFactory">AggregatorFactory</a>, limit: u128): Aggregator;
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+
+
+<a id="high-level-req"></a>
+
+### High-level Requirements
+
+<table>
+<tr>
+<th>No.</th><th>Requirement</th><th>Criticality</th><th>Implementation</th><th>Enforcement</th>
+</tr>
+
+<tr>
+<td>1</td>
+<td>During the module's initialization, it guarantees that the Aptos framework is the caller and that the AggregatorFactory resource will move under the Aptos framework account.</td>
+<td>High</td>
+<td>The initialize function is responsible for establishing the initial state of the module by creating the AggregatorFactory resource, indicating its presence within the module's context. Subsequently, the resource transfers to the Aptos framework account.</td>
+<td>Formally verified via <a href="#high-level-req-1">initialize_aggregator_factory</a>.</td>
+</tr>
+
+<tr>
+<td>2</td>
+<td>To create a new aggregator instance, the aggregator factory must already be initialized and exist under the Aptos account.</td>
+<td>High</td>
+<td>The create_aggregator_internal function asserts that AggregatorFactory exists for the Aptos account.</td>
+<td>Formally verified via <a href="#high-level-req-2">CreateAggregatorInternalAbortsIf</a>.</td>
+</tr>
+
+<tr>
+<td>3</td>
+<td>Only the Aptos framework address may create an aggregator instance currently.</td>
+<td>Low</td>
+<td>The create_aggregator function ensures that the address calling it is the Aptos framework address.</td>
+<td>Formally verified via <a href="#high-level-req-3">create_aggregator</a>.</td>
+</tr>
+
+<tr>
+<td>4</td>
+<td>The creation of new aggregators should be done correctly.</td>
+<td>High</td>
+<td>The native new_aggregator function correctly creates a new aggregator.</td>
+<td>The new_aggregator native function has been manually audited.</td>
+</tr>
+
+</table>
+
+
+
+
+<a id="module-level-spec"></a>
+
+### Module-level Specification
+
+
+<pre><code><b>pragma</b> aborts_if_is_strict;
+</code></pre>
+
+
+
+<a id="@Specification_1_initialize_aggregator_factory"></a>
+
+### Function `initialize_aggregator_factory`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="aggregator_factory.md#0x1_aggregator_factory_initialize_aggregator_factory">initialize_aggregator_factory</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+Make sure the caller is @aptos_framework.
+AggregatorFactory is not under the caller before creating the resource.
+
+
+<pre><code><b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(aptos_framework);
+<b>aborts_if</b> addr != @aptos_framework;
+<b>aborts_if</b> <b>exists</b>&lt;<a href="aggregator_factory.md#0x1_aggregator_factory_AggregatorFactory">AggregatorFactory</a>&gt;(addr);
+// This enforces <a id="high-level-req-1" href="#high-level-req">high-level requirement 1</a>:
+<b>ensures</b> <b>exists</b>&lt;<a href="aggregator_factory.md#0x1_aggregator_factory_AggregatorFactory">AggregatorFactory</a>&gt;(addr);
+</code></pre>
+
+
+
+<a id="@Specification_1_create_aggregator_internal"></a>
+
+### Function `create_aggregator_internal`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="aggregator_factory.md#0x1_aggregator_factory_create_aggregator_internal">create_aggregator_internal</a>(limit: u128): <a href="aggregator.md#0x1_aggregator_Aggregator">aggregator::Aggregator</a>
+</code></pre>
+
+
+
+
+<pre><code>// This enforces <a id="high-level-req-2" href="#high-level-req">high-level requirement 2</a>:
+<b>include</b> <a href="aggregator_factory.md#0x1_aggregator_factory_CreateAggregatorInternalAbortsIf">CreateAggregatorInternalAbortsIf</a>;
+<b>ensures</b> <a href="aggregator.md#0x1_aggregator_spec_get_limit">aggregator::spec_get_limit</a>(result) == limit;
+<b>ensures</b> <a href="aggregator.md#0x1_aggregator_spec_aggregator_get_val">aggregator::spec_aggregator_get_val</a>(result) == 0;
+</code></pre>
+
+
+
+
+<a id="0x1_aggregator_factory_CreateAggregatorInternalAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="aggregator_factory.md#0x1_aggregator_factory_CreateAggregatorInternalAbortsIf">CreateAggregatorInternalAbortsIf</a> {
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="aggregator_factory.md#0x1_aggregator_factory_AggregatorFactory">AggregatorFactory</a>&gt;(@aptos_framework);
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_create_aggregator"></a>
+
+### Function `create_aggregator`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aggregator_factory.md#0x1_aggregator_factory_create_aggregator">create_aggregator</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, limit: u128): <a href="aggregator.md#0x1_aggregator_Aggregator">aggregator::Aggregator</a>
+</code></pre>
+
+
+Make sure the caller is @aptos_framework.
+AggregatorFactory existed under the @aptos_framework when Creating a new aggregator.
+
+
+<pre><code><b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>);
+// This enforces <a id="high-level-req-3" href="#high-level-req">high-level requirement 3</a>:
+<b>aborts_if</b> addr != @aptos_framework;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="aggregator_factory.md#0x1_aggregator_factory_AggregatorFactory">AggregatorFactory</a>&gt;(@aptos_framework);
+</code></pre>
+
+
+
+
+<a id="0x1_aggregator_factory_spec_new_aggregator"></a>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="aggregator_factory.md#0x1_aggregator_factory_spec_new_aggregator">spec_new_aggregator</a>(limit: u128): Aggregator;
+</code></pre>
+
+
+
+<a id="@Specification_1_new_aggregator"></a>
+
+### Function `new_aggregator`
+
+
+<pre><code><b>fun</b> <a href="aggregator_factory.md#0x1_aggregator_factory_new_aggregator">new_aggregator</a>(<a href="aggregator_factory.md#0x1_aggregator_factory">aggregator_factory</a>: &<b>mut</b> <a href="aggregator_factory.md#0x1_aggregator_factory_AggregatorFactory">aggregator_factory::AggregatorFactory</a>, limit: u128): <a href="aggregator.md#0x1_aggregator_Aggregator">aggregator::Aggregator</a>
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="aggregator_factory.md#0x1_aggregator_factory_spec_new_aggregator">spec_new_aggregator</a>(limit);
+<b>ensures</b> <a href="aggregator.md#0x1_aggregator_spec_get_limit">aggregator::spec_get_limit</a>(result) == limit;
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/aggregator_v2.md b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/aggregator_v2.md
new file mode 100644
index 0000000000000..70e859a72b509
--- /dev/null
+++ b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/aggregator_v2.md
@@ -0,0 +1,1011 @@
+
+<a id="0x1_aggregator_v2"></a>
+
+# Module `0x1::aggregator_v2`
+
+This module provides an interface for aggregators (version 2). Aggregators are
+similar to unsigned integers and support addition and subtraction (aborting on
+underflow or on overflowing a custom upper limit). The difference from integers
+is that aggregators allow to perform both additions and subtractions in parallel
+across multiple transactions, enabling parallel execution. For example, if the
+first transaction is doing <code><a href="aggregator_v2.md#0x1_aggregator_v2_try_add">try_add</a>(X, 1)</code> for aggregator <code>X</code>, and the second is
+doing <code><a href="aggregator_v2.md#0x1_aggregator_v2_try_sub">try_sub</a>(X,3)</code>, they can be executed in parallel avoiding a read-modify-write
+dependency.
+However, reading the aggregator value (i.e. calling <code><a href="aggregator_v2.md#0x1_aggregator_v2_read">read</a>(X)</code>) is a resource-intensive
+operation that also reduced parallelism, and should be avoided as much as possible.
+If you need to capture the value, without revealing it, use snapshot function instead,
+which has no parallelism impact.
+
+From parallelism considerations, there are three different levels of effects:
+* enable full parallelism (cannot create conflicts):
+max_value, create_*, snapshot, derive_string_concat
+* enable speculative parallelism (generally parallel via branch prediction)
+try_add, add, try_sub, sub, is_at_least
+* create read/write conflicts, as if you were using a regular field
+read, read_snapshot, read_derived_string
+
+
+-  [Struct `Aggregator`](#0x1_aggregator_v2_Aggregator)
+-  [Struct `AggregatorSnapshot`](#0x1_aggregator_v2_AggregatorSnapshot)
+-  [Struct `DerivedStringSnapshot`](#0x1_aggregator_v2_DerivedStringSnapshot)
+-  [Constants](#@Constants_0)
+-  [Function `max_value`](#0x1_aggregator_v2_max_value)
+-  [Function `create_aggregator`](#0x1_aggregator_v2_create_aggregator)
+-  [Function `create_aggregator_with_value`](#0x1_aggregator_v2_create_aggregator_with_value)
+-  [Function `create_unbounded_aggregator`](#0x1_aggregator_v2_create_unbounded_aggregator)
+-  [Function `create_unbounded_aggregator_with_value`](#0x1_aggregator_v2_create_unbounded_aggregator_with_value)
+-  [Function `try_add`](#0x1_aggregator_v2_try_add)
+-  [Function `add`](#0x1_aggregator_v2_add)
+-  [Function `try_sub`](#0x1_aggregator_v2_try_sub)
+-  [Function `sub`](#0x1_aggregator_v2_sub)
+-  [Function `is_at_least_impl`](#0x1_aggregator_v2_is_at_least_impl)
+-  [Function `is_at_least`](#0x1_aggregator_v2_is_at_least)
+-  [Function `read`](#0x1_aggregator_v2_read)
+-  [Function `snapshot`](#0x1_aggregator_v2_snapshot)
+-  [Function `create_snapshot`](#0x1_aggregator_v2_create_snapshot)
+-  [Function `read_snapshot`](#0x1_aggregator_v2_read_snapshot)
+-  [Function `read_derived_string`](#0x1_aggregator_v2_read_derived_string)
+-  [Function `create_derived_string`](#0x1_aggregator_v2_create_derived_string)
+-  [Function `derive_string_concat`](#0x1_aggregator_v2_derive_string_concat)
+-  [Function `copy_snapshot`](#0x1_aggregator_v2_copy_snapshot)
+-  [Function `string_concat`](#0x1_aggregator_v2_string_concat)
+-  [Specification](#@Specification_1)
+    -  [Function `create_aggregator`](#@Specification_1_create_aggregator)
+    -  [Function `create_unbounded_aggregator`](#@Specification_1_create_unbounded_aggregator)
+    -  [Function `try_add`](#@Specification_1_try_add)
+    -  [Function `try_sub`](#@Specification_1_try_sub)
+    -  [Function `is_at_least_impl`](#@Specification_1_is_at_least_impl)
+    -  [Function `read`](#@Specification_1_read)
+    -  [Function `snapshot`](#@Specification_1_snapshot)
+    -  [Function `create_snapshot`](#@Specification_1_create_snapshot)
+    -  [Function `read_snapshot`](#@Specification_1_read_snapshot)
+    -  [Function `read_derived_string`](#@Specification_1_read_derived_string)
+    -  [Function `create_derived_string`](#@Specification_1_create_derived_string)
+    -  [Function `derive_string_concat`](#@Specification_1_derive_string_concat)
+    -  [Function `copy_snapshot`](#@Specification_1_copy_snapshot)
+    -  [Function `string_concat`](#@Specification_1_string_concat)
+
+
+<pre><code><b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features">0x1::features</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string">0x1::string</a>;
+</code></pre>
+
+
+
+<a id="0x1_aggregator_v2_Aggregator"></a>
+
+## Struct `Aggregator`
+
+Represents an integer which supports parallel additions and subtractions
+across multiple transactions. See the module description for more details.
+
+Currently supported types for IntElement are u64 and u128.
+
+
+<pre><code><b>struct</b> <a href="aggregator_v2.md#0x1_aggregator_v2_Aggregator">Aggregator</a>&lt;IntElement&gt; <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>value: IntElement</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>max_value: IntElement</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_aggregator_v2_AggregatorSnapshot"></a>
+
+## Struct `AggregatorSnapshot`
+
+Represents a constant value, that was derived from an aggregator at given instant in time.
+Unlike read() and storing the value directly, this enables parallel execution of transactions,
+while storing snapshot of aggregator state elsewhere.
+
+
+<pre><code><b>struct</b> <a href="aggregator_v2.md#0x1_aggregator_v2_AggregatorSnapshot">AggregatorSnapshot</a>&lt;IntElement&gt; <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>value: IntElement</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_aggregator_v2_DerivedStringSnapshot"></a>
+
+## Struct `DerivedStringSnapshot`
+
+
+
+<pre><code><b>struct</b> <a href="aggregator_v2.md#0x1_aggregator_v2_DerivedStringSnapshot">DerivedStringSnapshot</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>value: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>padding: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_aggregator_v2_EAGGREGATOR_OVERFLOW"></a>
+
+The value of aggregator overflows. Raised by uncoditional add() call
+
+
+<pre><code><b>const</b> <a href="aggregator_v2.md#0x1_aggregator_v2_EAGGREGATOR_OVERFLOW">EAGGREGATOR_OVERFLOW</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_aggregator_v2_EAGGREGATOR_UNDERFLOW"></a>
+
+The value of aggregator underflows (goes below zero). Raised by uncoditional sub() call
+
+
+<pre><code><b>const</b> <a href="aggregator_v2.md#0x1_aggregator_v2_EAGGREGATOR_UNDERFLOW">EAGGREGATOR_UNDERFLOW</a>: u64 = 2;
+</code></pre>
+
+
+
+<a id="0x1_aggregator_v2_EAGGREGATOR_API_V2_NOT_ENABLED"></a>
+
+The aggregator api v2 feature flag is not enabled.
+
+
+<pre><code><b>const</b> <a href="aggregator_v2.md#0x1_aggregator_v2_EAGGREGATOR_API_V2_NOT_ENABLED">EAGGREGATOR_API_V2_NOT_ENABLED</a>: u64 = 6;
+</code></pre>
+
+
+
+<a id="0x1_aggregator_v2_EAGGREGATOR_FUNCTION_NOT_YET_SUPPORTED"></a>
+
+The native aggregator function, that is in the move file, is not yet supported.
+and any calls will raise this error.
+
+
+<pre><code><b>const</b> <a href="aggregator_v2.md#0x1_aggregator_v2_EAGGREGATOR_FUNCTION_NOT_YET_SUPPORTED">EAGGREGATOR_FUNCTION_NOT_YET_SUPPORTED</a>: u64 = 9;
+</code></pre>
+
+
+
+<a id="0x1_aggregator_v2_ECONCAT_STRING_LENGTH_TOO_LARGE"></a>
+
+Arguments passed to concat exceed max limit of 256 bytes (for prefix and suffix together).
+
+
+<pre><code><b>const</b> <a href="aggregator_v2.md#0x1_aggregator_v2_ECONCAT_STRING_LENGTH_TOO_LARGE">ECONCAT_STRING_LENGTH_TOO_LARGE</a>: u64 = 8;
+</code></pre>
+
+
+
+<a id="0x1_aggregator_v2_EUNSUPPORTED_AGGREGATOR_SNAPSHOT_TYPE"></a>
+
+The generic type supplied to the aggregator snapshot is not supported.
+
+
+<pre><code><b>const</b> <a href="aggregator_v2.md#0x1_aggregator_v2_EUNSUPPORTED_AGGREGATOR_SNAPSHOT_TYPE">EUNSUPPORTED_AGGREGATOR_SNAPSHOT_TYPE</a>: u64 = 5;
+</code></pre>
+
+
+
+<a id="0x1_aggregator_v2_EUNSUPPORTED_AGGREGATOR_TYPE"></a>
+
+The generic type supplied to the aggregator is not supported.
+
+
+<pre><code><b>const</b> <a href="aggregator_v2.md#0x1_aggregator_v2_EUNSUPPORTED_AGGREGATOR_TYPE">EUNSUPPORTED_AGGREGATOR_TYPE</a>: u64 = 7;
+</code></pre>
+
+
+
+<a id="0x1_aggregator_v2_max_value"></a>
+
+## Function `max_value`
+
+Returns <code>max_value</code> exceeding which aggregator overflows.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_max_value">max_value</a>&lt;IntElement: <b>copy</b>, drop&gt;(<a href="aggregator.md#0x1_aggregator">aggregator</a>: &<a href="aggregator_v2.md#0x1_aggregator_v2_Aggregator">aggregator_v2::Aggregator</a>&lt;IntElement&gt;): IntElement
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_max_value">max_value</a>&lt;IntElement: <b>copy</b> + drop&gt;(<a href="aggregator.md#0x1_aggregator">aggregator</a>: &<a href="aggregator_v2.md#0x1_aggregator_v2_Aggregator">Aggregator</a>&lt;IntElement&gt;): IntElement {
+    <a href="aggregator.md#0x1_aggregator">aggregator</a>.max_value
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aggregator_v2_create_aggregator"></a>
+
+## Function `create_aggregator`
+
+Creates new aggregator, with given 'max_value'.
+
+Currently supported types for IntElement are u64 and u128.
+EAGGREGATOR_ELEMENT_TYPE_NOT_SUPPORTED raised if called with a different type.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_create_aggregator">create_aggregator</a>&lt;IntElement: <b>copy</b>, drop&gt;(max_value: IntElement): <a href="aggregator_v2.md#0x1_aggregator_v2_Aggregator">aggregator_v2::Aggregator</a>&lt;IntElement&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>native</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_create_aggregator">create_aggregator</a>&lt;IntElement: <b>copy</b> + drop&gt;(max_value: IntElement): <a href="aggregator_v2.md#0x1_aggregator_v2_Aggregator">Aggregator</a>&lt;IntElement&gt;;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aggregator_v2_create_aggregator_with_value"></a>
+
+## Function `create_aggregator_with_value`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_create_aggregator_with_value">create_aggregator_with_value</a>&lt;IntElement: <b>copy</b>, drop&gt;(start_value: IntElement, max_value: IntElement): <a href="aggregator_v2.md#0x1_aggregator_v2_Aggregator">aggregator_v2::Aggregator</a>&lt;IntElement&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_create_aggregator_with_value">create_aggregator_with_value</a>&lt;IntElement: <b>copy</b> + drop&gt;(start_value: IntElement, max_value: IntElement): <a href="aggregator_v2.md#0x1_aggregator_v2_Aggregator">Aggregator</a>&lt;IntElement&gt; {
+    <b>let</b> <a href="aggregator.md#0x1_aggregator">aggregator</a> = <a href="aggregator_v2.md#0x1_aggregator_v2_create_aggregator">create_aggregator</a>(max_value);
+    <a href="aggregator_v2.md#0x1_aggregator_v2_add">add</a>(&<b>mut</b> <a href="aggregator.md#0x1_aggregator">aggregator</a>, start_value);
+    <a href="aggregator.md#0x1_aggregator">aggregator</a>
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aggregator_v2_create_unbounded_aggregator"></a>
+
+## Function `create_unbounded_aggregator`
+
+Creates new aggregator, without any 'max_value' on top of the implicit bound restriction
+due to the width of the type (i.e. MAX_U64 for u64, MAX_U128 for u128).
+
+Currently supported types for IntElement are u64 and u128.
+EAGGREGATOR_ELEMENT_TYPE_NOT_SUPPORTED raised if called with a different type.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_create_unbounded_aggregator">create_unbounded_aggregator</a>&lt;IntElement: <b>copy</b>, drop&gt;(): <a href="aggregator_v2.md#0x1_aggregator_v2_Aggregator">aggregator_v2::Aggregator</a>&lt;IntElement&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>native</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_create_unbounded_aggregator">create_unbounded_aggregator</a>&lt;IntElement: <b>copy</b> + drop&gt;(): <a href="aggregator_v2.md#0x1_aggregator_v2_Aggregator">Aggregator</a>&lt;IntElement&gt;;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aggregator_v2_create_unbounded_aggregator_with_value"></a>
+
+## Function `create_unbounded_aggregator_with_value`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_create_unbounded_aggregator_with_value">create_unbounded_aggregator_with_value</a>&lt;IntElement: <b>copy</b>, drop&gt;(start_value: IntElement): <a href="aggregator_v2.md#0x1_aggregator_v2_Aggregator">aggregator_v2::Aggregator</a>&lt;IntElement&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_create_unbounded_aggregator_with_value">create_unbounded_aggregator_with_value</a>&lt;IntElement: <b>copy</b> + drop&gt;(start_value: IntElement): <a href="aggregator_v2.md#0x1_aggregator_v2_Aggregator">Aggregator</a>&lt;IntElement&gt; {
+    <b>let</b> <a href="aggregator.md#0x1_aggregator">aggregator</a> = <a href="aggregator_v2.md#0x1_aggregator_v2_create_unbounded_aggregator">create_unbounded_aggregator</a>();
+    <a href="aggregator_v2.md#0x1_aggregator_v2_add">add</a>(&<b>mut</b> <a href="aggregator.md#0x1_aggregator">aggregator</a>, start_value);
+    <a href="aggregator.md#0x1_aggregator">aggregator</a>
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aggregator_v2_try_add"></a>
+
+## Function `try_add`
+
+Adds <code>value</code> to aggregator.
+If addition would exceed the max_value, <code><b>false</b></code> is returned, and aggregator value is left unchanged.
+
+Parallelism info: This operation enables speculative parallelism.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_try_add">try_add</a>&lt;IntElement&gt;(<a href="aggregator.md#0x1_aggregator">aggregator</a>: &<b>mut</b> <a href="aggregator_v2.md#0x1_aggregator_v2_Aggregator">aggregator_v2::Aggregator</a>&lt;IntElement&gt;, value: IntElement): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>native</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_try_add">try_add</a>&lt;IntElement&gt;(<a href="aggregator.md#0x1_aggregator">aggregator</a>: &<b>mut</b> <a href="aggregator_v2.md#0x1_aggregator_v2_Aggregator">Aggregator</a>&lt;IntElement&gt;, value: IntElement): bool;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aggregator_v2_add"></a>
+
+## Function `add`
+
+Adds <code>value</code> to aggregator, unconditionally.
+If addition would exceed the max_value, EAGGREGATOR_OVERFLOW exception will be thrown.
+
+Parallelism info: This operation enables speculative parallelism.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_add">add</a>&lt;IntElement&gt;(<a href="aggregator.md#0x1_aggregator">aggregator</a>: &<b>mut</b> <a href="aggregator_v2.md#0x1_aggregator_v2_Aggregator">aggregator_v2::Aggregator</a>&lt;IntElement&gt;, value: IntElement)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_add">add</a>&lt;IntElement&gt;(<a href="aggregator.md#0x1_aggregator">aggregator</a>: &<b>mut</b> <a href="aggregator_v2.md#0x1_aggregator_v2_Aggregator">Aggregator</a>&lt;IntElement&gt;, value: IntElement) {
+    <b>assert</b>!(<a href="aggregator_v2.md#0x1_aggregator_v2_try_add">try_add</a>(<a href="aggregator.md#0x1_aggregator">aggregator</a>, value), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_out_of_range">error::out_of_range</a>(<a href="aggregator_v2.md#0x1_aggregator_v2_EAGGREGATOR_OVERFLOW">EAGGREGATOR_OVERFLOW</a>));
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aggregator_v2_try_sub"></a>
+
+## Function `try_sub`
+
+Subtracts <code>value</code> from aggregator.
+If subtraction would result in a negative value, <code><b>false</b></code> is returned, and aggregator value is left unchanged.
+
+Parallelism info: This operation enables speculative parallelism.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_try_sub">try_sub</a>&lt;IntElement&gt;(<a href="aggregator.md#0x1_aggregator">aggregator</a>: &<b>mut</b> <a href="aggregator_v2.md#0x1_aggregator_v2_Aggregator">aggregator_v2::Aggregator</a>&lt;IntElement&gt;, value: IntElement): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>native</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_try_sub">try_sub</a>&lt;IntElement&gt;(<a href="aggregator.md#0x1_aggregator">aggregator</a>: &<b>mut</b> <a href="aggregator_v2.md#0x1_aggregator_v2_Aggregator">Aggregator</a>&lt;IntElement&gt;, value: IntElement): bool;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aggregator_v2_sub"></a>
+
+## Function `sub`
+
+
+Parallelism info: This operation enables speculative parallelism.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_sub">sub</a>&lt;IntElement&gt;(<a href="aggregator.md#0x1_aggregator">aggregator</a>: &<b>mut</b> <a href="aggregator_v2.md#0x1_aggregator_v2_Aggregator">aggregator_v2::Aggregator</a>&lt;IntElement&gt;, value: IntElement)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_sub">sub</a>&lt;IntElement&gt;(<a href="aggregator.md#0x1_aggregator">aggregator</a>: &<b>mut</b> <a href="aggregator_v2.md#0x1_aggregator_v2_Aggregator">Aggregator</a>&lt;IntElement&gt;, value: IntElement) {
+    <b>assert</b>!(<a href="aggregator_v2.md#0x1_aggregator_v2_try_sub">try_sub</a>(<a href="aggregator.md#0x1_aggregator">aggregator</a>, value), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_out_of_range">error::out_of_range</a>(<a href="aggregator_v2.md#0x1_aggregator_v2_EAGGREGATOR_UNDERFLOW">EAGGREGATOR_UNDERFLOW</a>));
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aggregator_v2_is_at_least_impl"></a>
+
+## Function `is_at_least_impl`
+
+
+
+<pre><code><b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_is_at_least_impl">is_at_least_impl</a>&lt;IntElement&gt;(<a href="aggregator.md#0x1_aggregator">aggregator</a>: &<a href="aggregator_v2.md#0x1_aggregator_v2_Aggregator">aggregator_v2::Aggregator</a>&lt;IntElement&gt;, min_amount: IntElement): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_is_at_least_impl">is_at_least_impl</a>&lt;IntElement&gt;(<a href="aggregator.md#0x1_aggregator">aggregator</a>: &<a href="aggregator_v2.md#0x1_aggregator_v2_Aggregator">Aggregator</a>&lt;IntElement&gt;, min_amount: IntElement): bool;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aggregator_v2_is_at_least"></a>
+
+## Function `is_at_least`
+
+Returns true if aggregator value is larger than or equal to the given <code>min_amount</code>, false otherwise.
+
+This operation is more efficient and much more parallelization friendly than calling <code><a href="aggregator_v2.md#0x1_aggregator_v2_read">read</a>(agg) &gt; min_amount</code>.
+Until traits are deployed, <code>is_at_most</code>/<code>is_equal</code> utility methods can be derived from this one (assuming +1 doesn't overflow):
+- for <code>is_at_most(agg, max_amount)</code>, you can do <code>!<a href="aggregator_v2.md#0x1_aggregator_v2_is_at_least">is_at_least</a>(max_amount + 1)</code>
+- for <code>is_equal(agg, value)</code>, you can do <code><a href="aggregator_v2.md#0x1_aggregator_v2_is_at_least">is_at_least</a>(value) && !<a href="aggregator_v2.md#0x1_aggregator_v2_is_at_least">is_at_least</a>(value + 1)</code>
+
+Parallelism info: This operation enables speculative parallelism.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_is_at_least">is_at_least</a>&lt;IntElement&gt;(<a href="aggregator.md#0x1_aggregator">aggregator</a>: &<a href="aggregator_v2.md#0x1_aggregator_v2_Aggregator">aggregator_v2::Aggregator</a>&lt;IntElement&gt;, min_amount: IntElement): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_is_at_least">is_at_least</a>&lt;IntElement&gt;(<a href="aggregator.md#0x1_aggregator">aggregator</a>: &<a href="aggregator_v2.md#0x1_aggregator_v2_Aggregator">Aggregator</a>&lt;IntElement&gt;, min_amount: IntElement): bool {
+    <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_aggregator_v2_is_at_least_api_enabled">features::aggregator_v2_is_at_least_api_enabled</a>(), <a href="aggregator_v2.md#0x1_aggregator_v2_EAGGREGATOR_API_V2_NOT_ENABLED">EAGGREGATOR_API_V2_NOT_ENABLED</a>);
+    <a href="aggregator_v2.md#0x1_aggregator_v2_is_at_least_impl">is_at_least_impl</a>(<a href="aggregator.md#0x1_aggregator">aggregator</a>, min_amount)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aggregator_v2_read"></a>
+
+## Function `read`
+
+Returns a value stored in this aggregator.
+Note: This operation is resource-intensive, and reduces parallelism.
+If you need to capture the value, without revealing it, use snapshot function instead,
+which has no parallelism impact.
+If called in a transaction that also modifies the aggregator, or has other read/write conflicts,
+it will sequentialize that transaction. (i.e. up to concurrency_level times slower)
+If called in a separate transaction (i.e. after transaction that modifies aggregator), it might be
+up to two times slower.
+
+Parallelism info: This operation *prevents* speculative parallelism.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_read">read</a>&lt;IntElement&gt;(<a href="aggregator.md#0x1_aggregator">aggregator</a>: &<a href="aggregator_v2.md#0x1_aggregator_v2_Aggregator">aggregator_v2::Aggregator</a>&lt;IntElement&gt;): IntElement
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>native</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_read">read</a>&lt;IntElement&gt;(<a href="aggregator.md#0x1_aggregator">aggregator</a>: &<a href="aggregator_v2.md#0x1_aggregator_v2_Aggregator">Aggregator</a>&lt;IntElement&gt;): IntElement;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aggregator_v2_snapshot"></a>
+
+## Function `snapshot`
+
+Returns a wrapper of a current value of an aggregator
+Unlike read(), it is fast and avoids sequential dependencies.
+
+Parallelism info: This operation enables parallelism.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_snapshot">snapshot</a>&lt;IntElement&gt;(<a href="aggregator.md#0x1_aggregator">aggregator</a>: &<a href="aggregator_v2.md#0x1_aggregator_v2_Aggregator">aggregator_v2::Aggregator</a>&lt;IntElement&gt;): <a href="aggregator_v2.md#0x1_aggregator_v2_AggregatorSnapshot">aggregator_v2::AggregatorSnapshot</a>&lt;IntElement&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>native</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_snapshot">snapshot</a>&lt;IntElement&gt;(<a href="aggregator.md#0x1_aggregator">aggregator</a>: &<a href="aggregator_v2.md#0x1_aggregator_v2_Aggregator">Aggregator</a>&lt;IntElement&gt;): <a href="aggregator_v2.md#0x1_aggregator_v2_AggregatorSnapshot">AggregatorSnapshot</a>&lt;IntElement&gt;;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aggregator_v2_create_snapshot"></a>
+
+## Function `create_snapshot`
+
+Creates a snapshot of a given value.
+Useful for when object is sometimes created via snapshot() or string_concat(), and sometimes directly.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_create_snapshot">create_snapshot</a>&lt;IntElement: <b>copy</b>, drop&gt;(value: IntElement): <a href="aggregator_v2.md#0x1_aggregator_v2_AggregatorSnapshot">aggregator_v2::AggregatorSnapshot</a>&lt;IntElement&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>native</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_create_snapshot">create_snapshot</a>&lt;IntElement: <b>copy</b> + drop&gt;(value: IntElement): <a href="aggregator_v2.md#0x1_aggregator_v2_AggregatorSnapshot">AggregatorSnapshot</a>&lt;IntElement&gt;;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aggregator_v2_read_snapshot"></a>
+
+## Function `read_snapshot`
+
+Returns a value stored in this snapshot.
+Note: This operation is resource-intensive, and reduces parallelism.
+(Especially if called in a transaction that also modifies the aggregator,
+or has other read/write conflicts)
+
+Parallelism info: This operation *prevents* speculative parallelism.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_read_snapshot">read_snapshot</a>&lt;IntElement&gt;(snapshot: &<a href="aggregator_v2.md#0x1_aggregator_v2_AggregatorSnapshot">aggregator_v2::AggregatorSnapshot</a>&lt;IntElement&gt;): IntElement
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>native</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_read_snapshot">read_snapshot</a>&lt;IntElement&gt;(snapshot: &<a href="aggregator_v2.md#0x1_aggregator_v2_AggregatorSnapshot">AggregatorSnapshot</a>&lt;IntElement&gt;): IntElement;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aggregator_v2_read_derived_string"></a>
+
+## Function `read_derived_string`
+
+Returns a value stored in this DerivedStringSnapshot.
+Note: This operation is resource-intensive, and reduces parallelism.
+(Especially if called in a transaction that also modifies the aggregator,
+or has other read/write conflicts)
+
+Parallelism info: This operation *prevents* speculative parallelism.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_read_derived_string">read_derived_string</a>(snapshot: &<a href="aggregator_v2.md#0x1_aggregator_v2_DerivedStringSnapshot">aggregator_v2::DerivedStringSnapshot</a>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>native</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_read_derived_string">read_derived_string</a>(snapshot: &<a href="aggregator_v2.md#0x1_aggregator_v2_DerivedStringSnapshot">DerivedStringSnapshot</a>): String;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aggregator_v2_create_derived_string"></a>
+
+## Function `create_derived_string`
+
+Creates a DerivedStringSnapshot of a given value.
+Useful for when object is sometimes created via string_concat(), and sometimes directly.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_create_derived_string">create_derived_string</a>(value: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): <a href="aggregator_v2.md#0x1_aggregator_v2_DerivedStringSnapshot">aggregator_v2::DerivedStringSnapshot</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>native</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_create_derived_string">create_derived_string</a>(value: String): <a href="aggregator_v2.md#0x1_aggregator_v2_DerivedStringSnapshot">DerivedStringSnapshot</a>;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aggregator_v2_derive_string_concat"></a>
+
+## Function `derive_string_concat`
+
+Concatenates <code>before</code>, <code>snapshot</code> and <code>after</code> into a single string.
+snapshot passed needs to have integer type - currently supported types are u64 and u128.
+Raises EUNSUPPORTED_AGGREGATOR_SNAPSHOT_TYPE if called with another type.
+If length of prefix and suffix together exceed 256 bytes, ECONCAT_STRING_LENGTH_TOO_LARGE is raised.
+
+Parallelism info: This operation enables parallelism.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_derive_string_concat">derive_string_concat</a>&lt;IntElement&gt;(before: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, snapshot: &<a href="aggregator_v2.md#0x1_aggregator_v2_AggregatorSnapshot">aggregator_v2::AggregatorSnapshot</a>&lt;IntElement&gt;, after: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): <a href="aggregator_v2.md#0x1_aggregator_v2_DerivedStringSnapshot">aggregator_v2::DerivedStringSnapshot</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>native</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_derive_string_concat">derive_string_concat</a>&lt;IntElement&gt;(before: String, snapshot: &<a href="aggregator_v2.md#0x1_aggregator_v2_AggregatorSnapshot">AggregatorSnapshot</a>&lt;IntElement&gt;, after: String): <a href="aggregator_v2.md#0x1_aggregator_v2_DerivedStringSnapshot">DerivedStringSnapshot</a>;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aggregator_v2_copy_snapshot"></a>
+
+## Function `copy_snapshot`
+
+NOT YET IMPLEMENTED, always raises EAGGREGATOR_FUNCTION_NOT_YET_SUPPORTED.
+
+
+<pre><code>#[deprecated]
+<b>public</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_copy_snapshot">copy_snapshot</a>&lt;IntElement: <b>copy</b>, drop&gt;(snapshot: &<a href="aggregator_v2.md#0x1_aggregator_v2_AggregatorSnapshot">aggregator_v2::AggregatorSnapshot</a>&lt;IntElement&gt;): <a href="aggregator_v2.md#0x1_aggregator_v2_AggregatorSnapshot">aggregator_v2::AggregatorSnapshot</a>&lt;IntElement&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>native</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_copy_snapshot">copy_snapshot</a>&lt;IntElement: <b>copy</b> + drop&gt;(snapshot: &<a href="aggregator_v2.md#0x1_aggregator_v2_AggregatorSnapshot">AggregatorSnapshot</a>&lt;IntElement&gt;): <a href="aggregator_v2.md#0x1_aggregator_v2_AggregatorSnapshot">AggregatorSnapshot</a>&lt;IntElement&gt;;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aggregator_v2_string_concat"></a>
+
+## Function `string_concat`
+
+DEPRECATED, use derive_string_concat() instead. always raises EAGGREGATOR_FUNCTION_NOT_YET_SUPPORTED.
+
+
+<pre><code>#[deprecated]
+<b>public</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_string_concat">string_concat</a>&lt;IntElement&gt;(before: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, snapshot: &<a href="aggregator_v2.md#0x1_aggregator_v2_AggregatorSnapshot">aggregator_v2::AggregatorSnapshot</a>&lt;IntElement&gt;, after: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): <a href="aggregator_v2.md#0x1_aggregator_v2_AggregatorSnapshot">aggregator_v2::AggregatorSnapshot</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>native</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_string_concat">string_concat</a>&lt;IntElement&gt;(before: String, snapshot: &<a href="aggregator_v2.md#0x1_aggregator_v2_AggregatorSnapshot">AggregatorSnapshot</a>&lt;IntElement&gt;, after: String): <a href="aggregator_v2.md#0x1_aggregator_v2_AggregatorSnapshot">AggregatorSnapshot</a>&lt;String&gt;;
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+<a id="@Specification_1_create_aggregator"></a>
+
+### Function `create_aggregator`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_create_aggregator">create_aggregator</a>&lt;IntElement: <b>copy</b>, drop&gt;(max_value: IntElement): <a href="aggregator_v2.md#0x1_aggregator_v2_Aggregator">aggregator_v2::Aggregator</a>&lt;IntElement&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_create_unbounded_aggregator"></a>
+
+### Function `create_unbounded_aggregator`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_create_unbounded_aggregator">create_unbounded_aggregator</a>&lt;IntElement: <b>copy</b>, drop&gt;(): <a href="aggregator_v2.md#0x1_aggregator_v2_Aggregator">aggregator_v2::Aggregator</a>&lt;IntElement&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_try_add"></a>
+
+### Function `try_add`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_try_add">try_add</a>&lt;IntElement&gt;(<a href="aggregator.md#0x1_aggregator">aggregator</a>: &<b>mut</b> <a href="aggregator_v2.md#0x1_aggregator_v2_Aggregator">aggregator_v2::Aggregator</a>&lt;IntElement&gt;, value: IntElement): bool
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_try_sub"></a>
+
+### Function `try_sub`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_try_sub">try_sub</a>&lt;IntElement&gt;(<a href="aggregator.md#0x1_aggregator">aggregator</a>: &<b>mut</b> <a href="aggregator_v2.md#0x1_aggregator_v2_Aggregator">aggregator_v2::Aggregator</a>&lt;IntElement&gt;, value: IntElement): bool
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_is_at_least_impl"></a>
+
+### Function `is_at_least_impl`
+
+
+<pre><code><b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_is_at_least_impl">is_at_least_impl</a>&lt;IntElement&gt;(<a href="aggregator.md#0x1_aggregator">aggregator</a>: &<a href="aggregator_v2.md#0x1_aggregator_v2_Aggregator">aggregator_v2::Aggregator</a>&lt;IntElement&gt;, min_amount: IntElement): bool
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_read"></a>
+
+### Function `read`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_read">read</a>&lt;IntElement&gt;(<a href="aggregator.md#0x1_aggregator">aggregator</a>: &<a href="aggregator_v2.md#0x1_aggregator_v2_Aggregator">aggregator_v2::Aggregator</a>&lt;IntElement&gt;): IntElement
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_snapshot"></a>
+
+### Function `snapshot`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_snapshot">snapshot</a>&lt;IntElement&gt;(<a href="aggregator.md#0x1_aggregator">aggregator</a>: &<a href="aggregator_v2.md#0x1_aggregator_v2_Aggregator">aggregator_v2::Aggregator</a>&lt;IntElement&gt;): <a href="aggregator_v2.md#0x1_aggregator_v2_AggregatorSnapshot">aggregator_v2::AggregatorSnapshot</a>&lt;IntElement&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_create_snapshot"></a>
+
+### Function `create_snapshot`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_create_snapshot">create_snapshot</a>&lt;IntElement: <b>copy</b>, drop&gt;(value: IntElement): <a href="aggregator_v2.md#0x1_aggregator_v2_AggregatorSnapshot">aggregator_v2::AggregatorSnapshot</a>&lt;IntElement&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_read_snapshot"></a>
+
+### Function `read_snapshot`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_read_snapshot">read_snapshot</a>&lt;IntElement&gt;(snapshot: &<a href="aggregator_v2.md#0x1_aggregator_v2_AggregatorSnapshot">aggregator_v2::AggregatorSnapshot</a>&lt;IntElement&gt;): IntElement
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_read_derived_string"></a>
+
+### Function `read_derived_string`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_read_derived_string">read_derived_string</a>(snapshot: &<a href="aggregator_v2.md#0x1_aggregator_v2_DerivedStringSnapshot">aggregator_v2::DerivedStringSnapshot</a>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_create_derived_string"></a>
+
+### Function `create_derived_string`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_create_derived_string">create_derived_string</a>(value: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): <a href="aggregator_v2.md#0x1_aggregator_v2_DerivedStringSnapshot">aggregator_v2::DerivedStringSnapshot</a>
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_derive_string_concat"></a>
+
+### Function `derive_string_concat`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_derive_string_concat">derive_string_concat</a>&lt;IntElement&gt;(before: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, snapshot: &<a href="aggregator_v2.md#0x1_aggregator_v2_AggregatorSnapshot">aggregator_v2::AggregatorSnapshot</a>&lt;IntElement&gt;, after: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): <a href="aggregator_v2.md#0x1_aggregator_v2_DerivedStringSnapshot">aggregator_v2::DerivedStringSnapshot</a>
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_copy_snapshot"></a>
+
+### Function `copy_snapshot`
+
+
+<pre><code>#[deprecated]
+<b>public</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_copy_snapshot">copy_snapshot</a>&lt;IntElement: <b>copy</b>, drop&gt;(snapshot: &<a href="aggregator_v2.md#0x1_aggregator_v2_AggregatorSnapshot">aggregator_v2::AggregatorSnapshot</a>&lt;IntElement&gt;): <a href="aggregator_v2.md#0x1_aggregator_v2_AggregatorSnapshot">aggregator_v2::AggregatorSnapshot</a>&lt;IntElement&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_string_concat"></a>
+
+### Function `string_concat`
+
+
+<pre><code>#[deprecated]
+<b>public</b> <b>fun</b> <a href="aggregator_v2.md#0x1_aggregator_v2_string_concat">string_concat</a>&lt;IntElement&gt;(before: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, snapshot: &<a href="aggregator_v2.md#0x1_aggregator_v2_AggregatorSnapshot">aggregator_v2::AggregatorSnapshot</a>&lt;IntElement&gt;, after: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): <a href="aggregator_v2.md#0x1_aggregator_v2_AggregatorSnapshot">aggregator_v2::AggregatorSnapshot</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/aptos_account.md b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/aptos_account.md
new file mode 100644
index 0000000000000..3c0bd1d9d9152
--- /dev/null
+++ b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/aptos_account.md
@@ -0,0 +1,1252 @@
+
+<a id="0x1_aptos_account"></a>
+
+# Module `0x1::aptos_account`
+
+
+
+-  [Resource `DirectTransferConfig`](#0x1_aptos_account_DirectTransferConfig)
+-  [Struct `DirectCoinTransferConfigUpdatedEvent`](#0x1_aptos_account_DirectCoinTransferConfigUpdatedEvent)
+-  [Struct `DirectCoinTransferConfigUpdated`](#0x1_aptos_account_DirectCoinTransferConfigUpdated)
+-  [Constants](#@Constants_0)
+-  [Function `create_account`](#0x1_aptos_account_create_account)
+-  [Function `batch_transfer`](#0x1_aptos_account_batch_transfer)
+-  [Function `transfer`](#0x1_aptos_account_transfer)
+-  [Function `batch_transfer_coins`](#0x1_aptos_account_batch_transfer_coins)
+-  [Function `transfer_coins`](#0x1_aptos_account_transfer_coins)
+-  [Function `deposit_coins`](#0x1_aptos_account_deposit_coins)
+-  [Function `assert_account_exists`](#0x1_aptos_account_assert_account_exists)
+-  [Function `assert_account_is_registered_for_apt`](#0x1_aptos_account_assert_account_is_registered_for_apt)
+-  [Function `set_allow_direct_coin_transfers`](#0x1_aptos_account_set_allow_direct_coin_transfers)
+-  [Function `can_receive_direct_coin_transfers`](#0x1_aptos_account_can_receive_direct_coin_transfers)
+-  [Function `register_apt`](#0x1_aptos_account_register_apt)
+-  [Function `fungible_transfer_only`](#0x1_aptos_account_fungible_transfer_only)
+-  [Function `is_fungible_balance_at_least`](#0x1_aptos_account_is_fungible_balance_at_least)
+-  [Function `burn_from_fungible_store`](#0x1_aptos_account_burn_from_fungible_store)
+-  [Function `ensure_primary_fungible_store_exists`](#0x1_aptos_account_ensure_primary_fungible_store_exists)
+-  [Function `primary_fungible_store_address`](#0x1_aptos_account_primary_fungible_store_address)
+-  [Specification](#@Specification_1)
+    -  [High-level Requirements](#high-level-req)
+    -  [Module-level Specification](#module-level-spec)
+    -  [Function `create_account`](#@Specification_1_create_account)
+    -  [Function `batch_transfer`](#@Specification_1_batch_transfer)
+    -  [Function `transfer`](#@Specification_1_transfer)
+    -  [Function `batch_transfer_coins`](#@Specification_1_batch_transfer_coins)
+    -  [Function `transfer_coins`](#@Specification_1_transfer_coins)
+    -  [Function `deposit_coins`](#@Specification_1_deposit_coins)
+    -  [Function `assert_account_exists`](#@Specification_1_assert_account_exists)
+    -  [Function `assert_account_is_registered_for_apt`](#@Specification_1_assert_account_is_registered_for_apt)
+    -  [Function `set_allow_direct_coin_transfers`](#@Specification_1_set_allow_direct_coin_transfers)
+    -  [Function `can_receive_direct_coin_transfers`](#@Specification_1_can_receive_direct_coin_transfers)
+    -  [Function `register_apt`](#@Specification_1_register_apt)
+    -  [Function `fungible_transfer_only`](#@Specification_1_fungible_transfer_only)
+    -  [Function `is_fungible_balance_at_least`](#@Specification_1_is_fungible_balance_at_least)
+    -  [Function `burn_from_fungible_store`](#@Specification_1_burn_from_fungible_store)
+
+
+<pre><code><b>use</b> <a href="account.md#0x1_account">0x1::account</a>;
+<b>use</b> <a href="aptos_coin.md#0x1_aptos_coin">0x1::aptos_coin</a>;
+<b>use</b> <a href="coin.md#0x1_coin">0x1::coin</a>;
+<b>use</b> <a href="create_signer.md#0x1_create_signer">0x1::create_signer</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="event.md#0x1_event">0x1::event</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features">0x1::features</a>;
+<b>use</b> <a href="fungible_asset.md#0x1_fungible_asset">0x1::fungible_asset</a>;
+<b>use</b> <a href="object.md#0x1_object">0x1::object</a>;
+<b>use</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store">0x1::primary_fungible_store</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">0x1::signer</a>;
+</code></pre>
+
+
+
+<a id="0x1_aptos_account_DirectTransferConfig"></a>
+
+## Resource `DirectTransferConfig`
+
+Configuration for whether an account can receive direct transfers of coins that they have not registered.
+
+By default, this is enabled. Users can opt-out by disabling at any time.
+
+
+<pre><code><b>struct</b> <a href="aptos_account.md#0x1_aptos_account_DirectTransferConfig">DirectTransferConfig</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>allow_arbitrary_coin_transfers: bool</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>update_coin_transfer_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="aptos_account.md#0x1_aptos_account_DirectCoinTransferConfigUpdatedEvent">aptos_account::DirectCoinTransferConfigUpdatedEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_aptos_account_DirectCoinTransferConfigUpdatedEvent"></a>
+
+## Struct `DirectCoinTransferConfigUpdatedEvent`
+
+Event emitted when an account's direct coins transfer config is updated.
+
+
+<pre><code><b>struct</b> <a href="aptos_account.md#0x1_aptos_account_DirectCoinTransferConfigUpdatedEvent">DirectCoinTransferConfigUpdatedEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>new_allow_direct_transfers: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_aptos_account_DirectCoinTransferConfigUpdated"></a>
+
+## Struct `DirectCoinTransferConfigUpdated`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="aptos_account.md#0x1_aptos_account_DirectCoinTransferConfigUpdated">DirectCoinTransferConfigUpdated</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code><a href="account.md#0x1_account">account</a>: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>new_allow_direct_transfers: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_aptos_account_EACCOUNT_DOES_NOT_ACCEPT_DIRECT_COIN_TRANSFERS"></a>
+
+Account opted out of receiving coins that they did not register to receive.
+
+
+<pre><code><b>const</b> <a href="aptos_account.md#0x1_aptos_account_EACCOUNT_DOES_NOT_ACCEPT_DIRECT_COIN_TRANSFERS">EACCOUNT_DOES_NOT_ACCEPT_DIRECT_COIN_TRANSFERS</a>: u64 = 3;
+</code></pre>
+
+
+
+<a id="0x1_aptos_account_EACCOUNT_DOES_NOT_ACCEPT_DIRECT_TOKEN_TRANSFERS"></a>
+
+Account opted out of directly receiving NFT tokens.
+
+
+<pre><code><b>const</b> <a href="aptos_account.md#0x1_aptos_account_EACCOUNT_DOES_NOT_ACCEPT_DIRECT_TOKEN_TRANSFERS">EACCOUNT_DOES_NOT_ACCEPT_DIRECT_TOKEN_TRANSFERS</a>: u64 = 4;
+</code></pre>
+
+
+
+<a id="0x1_aptos_account_EACCOUNT_NOT_FOUND"></a>
+
+Account does not exist.
+
+
+<pre><code><b>const</b> <a href="aptos_account.md#0x1_aptos_account_EACCOUNT_NOT_FOUND">EACCOUNT_NOT_FOUND</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_aptos_account_EACCOUNT_NOT_REGISTERED_FOR_APT"></a>
+
+Account is not registered to receive APT.
+
+
+<pre><code><b>const</b> <a href="aptos_account.md#0x1_aptos_account_EACCOUNT_NOT_REGISTERED_FOR_APT">EACCOUNT_NOT_REGISTERED_FOR_APT</a>: u64 = 2;
+</code></pre>
+
+
+
+<a id="0x1_aptos_account_EMISMATCHING_RECIPIENTS_AND_AMOUNTS_LENGTH"></a>
+
+The lengths of the recipients and amounts lists don't match.
+
+
+<pre><code><b>const</b> <a href="aptos_account.md#0x1_aptos_account_EMISMATCHING_RECIPIENTS_AND_AMOUNTS_LENGTH">EMISMATCHING_RECIPIENTS_AND_AMOUNTS_LENGTH</a>: u64 = 5;
+</code></pre>
+
+
+
+<a id="0x1_aptos_account_create_account"></a>
+
+## Function `create_account`
+
+Basic account creation methods.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_account.md#0x1_aptos_account_create_account">create_account</a>(auth_key: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_account.md#0x1_aptos_account_create_account">create_account</a>(auth_key: <b>address</b>) {
+    <b>let</b> account_signer = <a href="account.md#0x1_account_create_account">account::create_account</a>(auth_key);
+    <a href="aptos_account.md#0x1_aptos_account_register_apt">register_apt</a>(&account_signer);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_account_batch_transfer"></a>
+
+## Function `batch_transfer`
+
+Batch version of APT transfer.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_account.md#0x1_aptos_account_batch_transfer">batch_transfer</a>(source: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, recipients: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;, amounts: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u64&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_account.md#0x1_aptos_account_batch_transfer">batch_transfer</a>(source: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, recipients: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;, amounts: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u64&gt;) {
+    <b>let</b> recipients_len = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&recipients);
+    <b>assert</b>!(
+        recipients_len == <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&amounts),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="aptos_account.md#0x1_aptos_account_EMISMATCHING_RECIPIENTS_AND_AMOUNTS_LENGTH">EMISMATCHING_RECIPIENTS_AND_AMOUNTS_LENGTH</a>),
+    );
+
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_enumerate_ref">vector::enumerate_ref</a>(&recipients, |i, <b>to</b>| {
+        <b>let</b> amount = *<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(&amounts, i);
+        <a href="aptos_account.md#0x1_aptos_account_transfer">transfer</a>(source, *<b>to</b>, amount);
+    });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_account_transfer"></a>
+
+## Function `transfer`
+
+Convenient function to transfer APT to a recipient account that might not exist.
+This would create the recipient account first, which also registers it to receive APT, before transferring.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_account.md#0x1_aptos_account_transfer">transfer</a>(source: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <b>to</b>: <b>address</b>, amount: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_account.md#0x1_aptos_account_transfer">transfer</a>(source: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <b>to</b>: <b>address</b>, amount: u64) {
+    <b>if</b> (!<a href="account.md#0x1_account_exists_at">account::exists_at</a>(<b>to</b>)) {
+        <a href="aptos_account.md#0x1_aptos_account_create_account">create_account</a>(<b>to</b>)
+    };
+
+    <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_operations_default_to_fa_apt_store_enabled">features::operations_default_to_fa_apt_store_enabled</a>()) {
+        <a href="aptos_account.md#0x1_aptos_account_fungible_transfer_only">fungible_transfer_only</a>(source, <b>to</b>, amount)
+    } <b>else</b> {
+        // Resource accounts can be created without registering them <b>to</b> receive APT.
+        // This conveniently does the registration <b>if</b> necessary.
+        <b>if</b> (!<a href="coin.md#0x1_coin_is_account_registered">coin::is_account_registered</a>&lt;AptosCoin&gt;(<b>to</b>)) {
+            <a href="coin.md#0x1_coin_register">coin::register</a>&lt;AptosCoin&gt;(&<a href="create_signer.md#0x1_create_signer">create_signer</a>(<b>to</b>));
+        };
+        <a href="coin.md#0x1_coin_transfer">coin::transfer</a>&lt;AptosCoin&gt;(source, <b>to</b>, amount)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_account_batch_transfer_coins"></a>
+
+## Function `batch_transfer_coins`
+
+Batch version of transfer_coins.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_account.md#0x1_aptos_account_batch_transfer_coins">batch_transfer_coins</a>&lt;CoinType&gt;(from: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, recipients: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;, amounts: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u64&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_account.md#0x1_aptos_account_batch_transfer_coins">batch_transfer_coins</a>&lt;CoinType&gt;(
+    from: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, recipients: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;, amounts: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u64&gt;) <b>acquires</b> <a href="aptos_account.md#0x1_aptos_account_DirectTransferConfig">DirectTransferConfig</a> {
+    <b>let</b> recipients_len = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&recipients);
+    <b>assert</b>!(
+        recipients_len == <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&amounts),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="aptos_account.md#0x1_aptos_account_EMISMATCHING_RECIPIENTS_AND_AMOUNTS_LENGTH">EMISMATCHING_RECIPIENTS_AND_AMOUNTS_LENGTH</a>),
+    );
+
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_enumerate_ref">vector::enumerate_ref</a>(&recipients, |i, <b>to</b>| {
+        <b>let</b> amount = *<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(&amounts, i);
+        <a href="aptos_account.md#0x1_aptos_account_transfer_coins">transfer_coins</a>&lt;CoinType&gt;(from, *<b>to</b>, amount);
+    });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_account_transfer_coins"></a>
+
+## Function `transfer_coins`
+
+Convenient function to transfer a custom CoinType to a recipient account that might not exist.
+This would create the recipient account first and register it to receive the CoinType, before transferring.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_account.md#0x1_aptos_account_transfer_coins">transfer_coins</a>&lt;CoinType&gt;(from: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <b>to</b>: <b>address</b>, amount: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_account.md#0x1_aptos_account_transfer_coins">transfer_coins</a>&lt;CoinType&gt;(from: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <b>to</b>: <b>address</b>, amount: u64) <b>acquires</b> <a href="aptos_account.md#0x1_aptos_account_DirectTransferConfig">DirectTransferConfig</a> {
+    <a href="aptos_account.md#0x1_aptos_account_deposit_coins">deposit_coins</a>(<b>to</b>, <a href="coin.md#0x1_coin_withdraw">coin::withdraw</a>&lt;CoinType&gt;(from, amount));
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_account_deposit_coins"></a>
+
+## Function `deposit_coins`
+
+Convenient function to deposit a custom CoinType into a recipient account that might not exist.
+This would create the recipient account first and register it to receive the CoinType, before transferring.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_account.md#0x1_aptos_account_deposit_coins">deposit_coins</a>&lt;CoinType&gt;(<b>to</b>: <b>address</b>, coins: <a href="coin.md#0x1_coin_Coin">coin::Coin</a>&lt;CoinType&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_account.md#0x1_aptos_account_deposit_coins">deposit_coins</a>&lt;CoinType&gt;(<b>to</b>: <b>address</b>, coins: Coin&lt;CoinType&gt;) <b>acquires</b> <a href="aptos_account.md#0x1_aptos_account_DirectTransferConfig">DirectTransferConfig</a> {
+    <b>if</b> (!<a href="account.md#0x1_account_exists_at">account::exists_at</a>(<b>to</b>)) {
+        <a href="aptos_account.md#0x1_aptos_account_create_account">create_account</a>(<b>to</b>);
+        <b>spec</b> {
+            <b>assert</b> <a href="coin.md#0x1_coin_spec_is_account_registered">coin::spec_is_account_registered</a>&lt;AptosCoin&gt;(<b>to</b>);
+            <b>assume</b> aptos_std::type_info::type_of&lt;CoinType&gt;() == aptos_std::type_info::type_of&lt;AptosCoin&gt;() ==&gt;
+                <a href="coin.md#0x1_coin_spec_is_account_registered">coin::spec_is_account_registered</a>&lt;CoinType&gt;(<b>to</b>);
+        };
+    };
+    <b>if</b> (!<a href="coin.md#0x1_coin_is_account_registered">coin::is_account_registered</a>&lt;CoinType&gt;(<b>to</b>)) {
+        <b>assert</b>!(
+            <a href="aptos_account.md#0x1_aptos_account_can_receive_direct_coin_transfers">can_receive_direct_coin_transfers</a>(<b>to</b>),
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="aptos_account.md#0x1_aptos_account_EACCOUNT_DOES_NOT_ACCEPT_DIRECT_COIN_TRANSFERS">EACCOUNT_DOES_NOT_ACCEPT_DIRECT_COIN_TRANSFERS</a>),
+        );
+        <a href="coin.md#0x1_coin_register">coin::register</a>&lt;CoinType&gt;(&<a href="create_signer.md#0x1_create_signer">create_signer</a>(<b>to</b>));
+    };
+    <a href="coin.md#0x1_coin_deposit">coin::deposit</a>&lt;CoinType&gt;(<b>to</b>, coins)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_account_assert_account_exists"></a>
+
+## Function `assert_account_exists`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_account.md#0x1_aptos_account_assert_account_exists">assert_account_exists</a>(addr: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_account.md#0x1_aptos_account_assert_account_exists">assert_account_exists</a>(addr: <b>address</b>) {
+    <b>assert</b>!(<a href="account.md#0x1_account_exists_at">account::exists_at</a>(addr), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="aptos_account.md#0x1_aptos_account_EACCOUNT_NOT_FOUND">EACCOUNT_NOT_FOUND</a>));
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_account_assert_account_is_registered_for_apt"></a>
+
+## Function `assert_account_is_registered_for_apt`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_account.md#0x1_aptos_account_assert_account_is_registered_for_apt">assert_account_is_registered_for_apt</a>(addr: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_account.md#0x1_aptos_account_assert_account_is_registered_for_apt">assert_account_is_registered_for_apt</a>(addr: <b>address</b>) {
+    <a href="aptos_account.md#0x1_aptos_account_assert_account_exists">assert_account_exists</a>(addr);
+    <b>assert</b>!(<a href="coin.md#0x1_coin_is_account_registered">coin::is_account_registered</a>&lt;AptosCoin&gt;(addr), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="aptos_account.md#0x1_aptos_account_EACCOUNT_NOT_REGISTERED_FOR_APT">EACCOUNT_NOT_REGISTERED_FOR_APT</a>));
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_account_set_allow_direct_coin_transfers"></a>
+
+## Function `set_allow_direct_coin_transfers`
+
+Set whether <code><a href="account.md#0x1_account">account</a></code> can receive direct transfers of coins that they have not explicitly registered to receive.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_account.md#0x1_aptos_account_set_allow_direct_coin_transfers">set_allow_direct_coin_transfers</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, allow: bool)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_account.md#0x1_aptos_account_set_allow_direct_coin_transfers">set_allow_direct_coin_transfers</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, allow: bool) <b>acquires</b> <a href="aptos_account.md#0x1_aptos_account_DirectTransferConfig">DirectTransferConfig</a> {
+    <b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>);
+    <b>if</b> (<b>exists</b>&lt;<a href="aptos_account.md#0x1_aptos_account_DirectTransferConfig">DirectTransferConfig</a>&gt;(addr)) {
+        <b>let</b> direct_transfer_config = <b>borrow_global_mut</b>&lt;<a href="aptos_account.md#0x1_aptos_account_DirectTransferConfig">DirectTransferConfig</a>&gt;(addr);
+        // Short-circuit <b>to</b> avoid emitting an <a href="event.md#0x1_event">event</a> <b>if</b> direct transfer config is not changing.
+        <b>if</b> (direct_transfer_config.allow_arbitrary_coin_transfers == allow) {
+            <b>return</b>
+        };
+
+        direct_transfer_config.allow_arbitrary_coin_transfers = allow;
+
+        <b>if</b> (std::features::module_event_migration_enabled()) {
+            emit(<a href="aptos_account.md#0x1_aptos_account_DirectCoinTransferConfigUpdated">DirectCoinTransferConfigUpdated</a> { <a href="account.md#0x1_account">account</a>: addr, new_allow_direct_transfers: allow });
+        };
+        emit_event(
+            &<b>mut</b> direct_transfer_config.update_coin_transfer_events,
+            <a href="aptos_account.md#0x1_aptos_account_DirectCoinTransferConfigUpdatedEvent">DirectCoinTransferConfigUpdatedEvent</a> { new_allow_direct_transfers: allow });
+    } <b>else</b> {
+        <b>let</b> direct_transfer_config = <a href="aptos_account.md#0x1_aptos_account_DirectTransferConfig">DirectTransferConfig</a> {
+            allow_arbitrary_coin_transfers: allow,
+            update_coin_transfer_events: new_event_handle&lt;<a href="aptos_account.md#0x1_aptos_account_DirectCoinTransferConfigUpdatedEvent">DirectCoinTransferConfigUpdatedEvent</a>&gt;(<a href="account.md#0x1_account">account</a>),
+        };
+        <b>if</b> (std::features::module_event_migration_enabled()) {
+            emit(<a href="aptos_account.md#0x1_aptos_account_DirectCoinTransferConfigUpdated">DirectCoinTransferConfigUpdated</a> { <a href="account.md#0x1_account">account</a>: addr, new_allow_direct_transfers: allow });
+        };
+        emit_event(
+            &<b>mut</b> direct_transfer_config.update_coin_transfer_events,
+            <a href="aptos_account.md#0x1_aptos_account_DirectCoinTransferConfigUpdatedEvent">DirectCoinTransferConfigUpdatedEvent</a> { new_allow_direct_transfers: allow });
+        <b>move_to</b>(<a href="account.md#0x1_account">account</a>, direct_transfer_config);
+    };
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_account_can_receive_direct_coin_transfers"></a>
+
+## Function `can_receive_direct_coin_transfers`
+
+Return true if <code><a href="account.md#0x1_account">account</a></code> can receive direct transfers of coins that they have not explicitly registered to
+receive.
+
+By default, this returns true if an account has not explicitly set whether the can receive direct transfers.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="aptos_account.md#0x1_aptos_account_can_receive_direct_coin_transfers">can_receive_direct_coin_transfers</a>(<a href="account.md#0x1_account">account</a>: <b>address</b>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_account.md#0x1_aptos_account_can_receive_direct_coin_transfers">can_receive_direct_coin_transfers</a>(<a href="account.md#0x1_account">account</a>: <b>address</b>): bool <b>acquires</b> <a href="aptos_account.md#0x1_aptos_account_DirectTransferConfig">DirectTransferConfig</a> {
+    !<b>exists</b>&lt;<a href="aptos_account.md#0x1_aptos_account_DirectTransferConfig">DirectTransferConfig</a>&gt;(<a href="account.md#0x1_account">account</a>) ||
+        <b>borrow_global</b>&lt;<a href="aptos_account.md#0x1_aptos_account_DirectTransferConfig">DirectTransferConfig</a>&gt;(<a href="account.md#0x1_account">account</a>).allow_arbitrary_coin_transfers
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_account_register_apt"></a>
+
+## Function `register_apt`
+
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="aptos_account.md#0x1_aptos_account_register_apt">register_apt</a>(account_signer: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="aptos_account.md#0x1_aptos_account_register_apt">register_apt</a>(account_signer: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>) {
+    <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_new_accounts_default_to_fa_apt_store_enabled">features::new_accounts_default_to_fa_apt_store_enabled</a>()) {
+        <a href="aptos_account.md#0x1_aptos_account_ensure_primary_fungible_store_exists">ensure_primary_fungible_store_exists</a>(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(account_signer));
+    } <b>else</b> {
+        <a href="coin.md#0x1_coin_register">coin::register</a>&lt;AptosCoin&gt;(account_signer);
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_account_fungible_transfer_only"></a>
+
+## Function `fungible_transfer_only`
+
+APT Primary Fungible Store specific specialized functions,
+Utilized internally once migration of APT to FungibleAsset is complete.
+Convenient function to transfer APT to a recipient account that might not exist.
+This would create the recipient APT PFS first, which also registers it to receive APT, before transferring.
+TODO: once migration is complete, rename to just "transfer_only" and make it an entry function (for cheapest way
+to transfer APT) - if we want to allow APT PFS without account itself
+
+
+<pre><code><b>fun</b> <a href="aptos_account.md#0x1_aptos_account_fungible_transfer_only">fungible_transfer_only</a>(source: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <b>to</b>: <b>address</b>, amount: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="aptos_account.md#0x1_aptos_account_fungible_transfer_only">fungible_transfer_only</a>(
+    source: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <b>to</b>: <b>address</b>, amount: u64
+) {
+    <b>let</b> sender_store = <a href="aptos_account.md#0x1_aptos_account_ensure_primary_fungible_store_exists">ensure_primary_fungible_store_exists</a>(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(source));
+    <b>let</b> recipient_store = <a href="aptos_account.md#0x1_aptos_account_ensure_primary_fungible_store_exists">ensure_primary_fungible_store_exists</a>(<b>to</b>);
+
+    // <b>use</b> <b>internal</b> APIs, <b>as</b> they skip:
+    // - owner, frozen and dispatchable checks
+    // <b>as</b> APT cannot be frozen or have dispatch, and PFS cannot be transfered
+    // (PFS could potentially be burned. regular transfer would permanently unburn the store.
+    // Ignoring the check here <b>has</b> the equivalent of unburning, transfers, and then burning again)
+    <a href="fungible_asset.md#0x1_fungible_asset_deposit_internal">fungible_asset::deposit_internal</a>(recipient_store, <a href="fungible_asset.md#0x1_fungible_asset_withdraw_internal">fungible_asset::withdraw_internal</a>(sender_store, amount));
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_account_is_fungible_balance_at_least"></a>
+
+## Function `is_fungible_balance_at_least`
+
+Is balance from APT Primary FungibleStore at least the given amount
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="aptos_account.md#0x1_aptos_account_is_fungible_balance_at_least">is_fungible_balance_at_least</a>(<a href="account.md#0x1_account">account</a>: <b>address</b>, amount: u64): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="aptos_account.md#0x1_aptos_account_is_fungible_balance_at_least">is_fungible_balance_at_least</a>(<a href="account.md#0x1_account">account</a>: <b>address</b>, amount: u64): bool {
+    <b>let</b> store_addr = <a href="aptos_account.md#0x1_aptos_account_primary_fungible_store_address">primary_fungible_store_address</a>(<a href="account.md#0x1_account">account</a>);
+    <a href="fungible_asset.md#0x1_fungible_asset_is_address_balance_at_least">fungible_asset::is_address_balance_at_least</a>(store_addr, amount)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_account_burn_from_fungible_store"></a>
+
+## Function `burn_from_fungible_store`
+
+Burn from APT Primary FungibleStore
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="aptos_account.md#0x1_aptos_account_burn_from_fungible_store">burn_from_fungible_store</a>(ref: &<a href="fungible_asset.md#0x1_fungible_asset_BurnRef">fungible_asset::BurnRef</a>, <a href="account.md#0x1_account">account</a>: <b>address</b>, amount: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="aptos_account.md#0x1_aptos_account_burn_from_fungible_store">burn_from_fungible_store</a>(
+    ref: &BurnRef,
+    <a href="account.md#0x1_account">account</a>: <b>address</b>,
+    amount: u64,
+) {
+    // Skip burning <b>if</b> amount is zero. This shouldn't <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">error</a> out <b>as</b> it's called <b>as</b> part of transaction fee burning.
+    <b>if</b> (amount != 0) {
+        <b>let</b> store_addr = <a href="aptos_account.md#0x1_aptos_account_primary_fungible_store_address">primary_fungible_store_address</a>(<a href="account.md#0x1_account">account</a>);
+        <a href="fungible_asset.md#0x1_fungible_asset_address_burn_from">fungible_asset::address_burn_from</a>(ref, store_addr, amount);
+    };
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_account_ensure_primary_fungible_store_exists"></a>
+
+## Function `ensure_primary_fungible_store_exists`
+
+Ensure that APT Primary FungibleStore exists (and create if it doesn't)
+
+
+<pre><code><b>fun</b> <a href="aptos_account.md#0x1_aptos_account_ensure_primary_fungible_store_exists">ensure_primary_fungible_store_exists</a>(owner: <b>address</b>): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="aptos_account.md#0x1_aptos_account_ensure_primary_fungible_store_exists">ensure_primary_fungible_store_exists</a>(owner: <b>address</b>): <b>address</b> {
+    <b>let</b> store_addr = <a href="aptos_account.md#0x1_aptos_account_primary_fungible_store_address">primary_fungible_store_address</a>(owner);
+    <b>if</b> (<a href="fungible_asset.md#0x1_fungible_asset_store_exists">fungible_asset::store_exists</a>(store_addr)) {
+        store_addr
+    } <b>else</b> {
+        <a href="object.md#0x1_object_object_address">object::object_address</a>(&<a href="primary_fungible_store.md#0x1_primary_fungible_store_create_primary_store">primary_fungible_store::create_primary_store</a>(owner, <a href="object.md#0x1_object_address_to_object">object::address_to_object</a>&lt;Metadata&gt;(@aptos_fungible_asset)))
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_account_primary_fungible_store_address"></a>
+
+## Function `primary_fungible_store_address`
+
+Address of APT Primary Fungible Store
+
+
+<pre><code><b>fun</b> <a href="aptos_account.md#0x1_aptos_account_primary_fungible_store_address">primary_fungible_store_address</a>(<a href="account.md#0x1_account">account</a>: <b>address</b>): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="aptos_account.md#0x1_aptos_account_primary_fungible_store_address">primary_fungible_store_address</a>(<a href="account.md#0x1_account">account</a>: <b>address</b>): <b>address</b> {
+    <a href="object.md#0x1_object_create_user_derived_object_address">object::create_user_derived_object_address</a>(<a href="account.md#0x1_account">account</a>, @aptos_fungible_asset)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+
+
+<a id="high-level-req"></a>
+
+### High-level Requirements
+
+<table>
+<tr>
+<th>No.</th><th>Requirement</th><th>Criticality</th><th>Implementation</th><th>Enforcement</th>
+</tr>
+
+<tr>
+<td>1</td>
+<td>During the creation of an Aptos account the following rules should hold: (1) the authentication key should be 32 bytes in length, (2) an Aptos account should not already exist for that authentication key, and (3) the address of the authentication key should not be equal to a reserved address (0x0, 0x1, or 0x3).</td>
+<td>Critical</td>
+<td>The authentication key which is passed in as an argument to create_account should satisfy all necessary conditions.</td>
+<td>Formally verified via <a href="#high-level-req-1">CreateAccountAbortsIf</a>.</td>
+</tr>
+
+<tr>
+<td>2</td>
+<td>After creating an Aptos account, the account should become registered to receive AptosCoin.</td>
+<td>Critical</td>
+<td>The create_account function creates a new account for the particular address and registers AptosCoin.</td>
+<td>Formally verified via <a href="#high-level-req-2">create_account</a>.</td>
+</tr>
+
+<tr>
+<td>3</td>
+<td>An account may receive a direct transfer of coins they have not registered for if and only if the transfer of arbitrary coins is enabled. By default the option should always set to be enabled for an account.</td>
+<td>Low</td>
+<td>Transfers of a coin to an account that has not yet registered for that coin should abort if and only if the allow_arbitrary_coin_transfers flag is explicitly set to false.</td>
+<td>Formally verified via <a href="#high-level-req-3">can_receive_direct_coin_transfers</a>.</td>
+</tr>
+
+<tr>
+<td>4</td>
+<td>Setting direct coin transfers may only occur if and only if a direct transfer config is associated with the provided account address.</td>
+<td>Low</td>
+<td>The set_allow_direct_coin_transfers function ensures the DirectTransferConfig structure exists for the signer.</td>
+<td>Formally verified via <a href="#high-level-req-4">set_allow_direct_coin_transfers</a>.</td>
+</tr>
+
+<tr>
+<td>5</td>
+<td>The transfer function should ensure an account is created for the provided destination if one does not exist; then, register AptosCoin for that account if a particular is unregistered before transferring the amount.</td>
+<td>Critical</td>
+<td>The transfer function checks if the recipient account exists. If the account does not exist, the function creates one and registers the account to AptosCoin if not registered.</td>
+<td>Formally verified via <a href="#high-level-req-5">transfer</a>.</td>
+</tr>
+
+<tr>
+<td>6</td>
+<td>Creating an account for the provided destination and registering it for that particular CoinType should be the only way to enable depositing coins, provided the account does not already exist.</td>
+<td>Critical</td>
+<td>The deposit_coins function verifies if the recipient account exists. If the account does not exist, the function creates one and ensures that the account becomes registered for the specified CointType.</td>
+<td>Formally verified via <a href="#high-level-req-6">deposit_coins</a>.</td>
+</tr>
+
+<tr>
+<td>7</td>
+<td>When performing a batch transfer of Aptos Coin and/or a batch transfer of a custom coin type, it should ensure that the vector containing destination addresses and the vector containing the corresponding amounts are equal in length.</td>
+<td>Low</td>
+<td>The batch_transfer and batch_transfer_coins functions verify that the length of the recipient addresses vector matches the length of the amount vector through an assertion.</td>
+<td>Formally verified via <a href="#high-level-req-7">batch_transfer_coins</a>.</td>
+</tr>
+
+</table>
+
+
+
+
+<a id="module-level-spec"></a>
+
+### Module-level Specification
+
+
+<pre><code><b>pragma</b> aborts_if_is_strict;
+</code></pre>
+
+
+
+<a id="@Specification_1_create_account"></a>
+
+### Function `create_account`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_account.md#0x1_aptos_account_create_account">create_account</a>(auth_key: <b>address</b>)
+</code></pre>
+
+
+Check if the bytes of the auth_key is 32.
+The Account does not exist under the auth_key before creating the account.
+Limit the address of auth_key is not @vm_reserved / @aptos_framework / @aptos_toke.
+
+
+<pre><code>// This enforces <a id="high-level-req-1" href="#high-level-req">high-level requirement 1</a>:
+<b>pragma</b> aborts_if_is_partial;
+<b>include</b> <a href="aptos_account.md#0x1_aptos_account_CreateAccountAbortsIf">CreateAccountAbortsIf</a>;
+<b>ensures</b> <b>exists</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(auth_key);
+</code></pre>
+
+
+
+
+<a id="0x1_aptos_account_CreateAccountAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="aptos_account.md#0x1_aptos_account_CreateAccountAbortsIf">CreateAccountAbortsIf</a> {
+    auth_key: <b>address</b>;
+    <b>aborts_if</b> <b>exists</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(auth_key);
+    <b>aborts_if</b> <a href="aptos_account.md#0x1_aptos_account_length_judgment">length_judgment</a>(auth_key);
+    <b>aborts_if</b> auth_key == @vm_reserved || auth_key == @aptos_framework || auth_key == @aptos_token;
+}
+</code></pre>
+
+
+
+
+<a id="0x1_aptos_account_length_judgment"></a>
+
+
+<pre><code><b>fun</b> <a href="aptos_account.md#0x1_aptos_account_length_judgment">length_judgment</a>(auth_key: <b>address</b>): bool {
+   <b>use</b> std::bcs;
+
+   <b>let</b> authentication_key = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs_to_bytes">bcs::to_bytes</a>(auth_key);
+   len(authentication_key) != 32
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_batch_transfer"></a>
+
+### Function `batch_transfer`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_account.md#0x1_aptos_account_batch_transfer">batch_transfer</a>(source: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, recipients: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;, amounts: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u64&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+<b>let</b> account_addr_source = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(source);
+<b>let</b> coin_store_source = <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;AptosCoin&gt;&gt;(account_addr_source);
+<b>let</b> balance_source = coin_store_source.<a href="coin.md#0x1_coin">coin</a>.value;
+<b>requires</b> <b>forall</b> i in 0..len(recipients):
+    recipients[i] != account_addr_source;
+<b>requires</b> <b>exists</b> i in 0..len(recipients):
+    amounts[i] &gt; 0;
+<b>aborts_if</b> len(recipients) != len(amounts);
+<b>aborts_if</b> <b>exists</b> i in 0..len(recipients):
+        !<a href="account.md#0x1_account_exists_at">account::exists_at</a>(recipients[i]) && <a href="aptos_account.md#0x1_aptos_account_length_judgment">length_judgment</a>(recipients[i]);
+<b>aborts_if</b> <b>exists</b> i in 0..len(recipients):
+        !<a href="account.md#0x1_account_exists_at">account::exists_at</a>(recipients[i]) && (recipients[i] == @vm_reserved || recipients[i] == @aptos_framework || recipients[i] == @aptos_token);
+<b>ensures</b> <b>forall</b> i in 0..len(recipients):
+        (!<a href="account.md#0x1_account_exists_at">account::exists_at</a>(recipients[i]) ==&gt; !<a href="aptos_account.md#0x1_aptos_account_length_judgment">length_judgment</a>(recipients[i])) &&
+            (!<a href="account.md#0x1_account_exists_at">account::exists_at</a>(recipients[i]) ==&gt; (recipients[i] != @vm_reserved && recipients[i] != @aptos_framework && recipients[i] != @aptos_token));
+<b>aborts_if</b> <b>exists</b> i in 0..len(recipients):
+    !<b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;AptosCoin&gt;&gt;(account_addr_source);
+<b>aborts_if</b> <b>exists</b> i in 0..len(recipients):
+    coin_store_source.frozen;
+<b>aborts_if</b> <b>exists</b> i in 0..len(recipients):
+    <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;AptosCoin&gt;&gt;(account_addr_source).<a href="coin.md#0x1_coin">coin</a>.value &lt; amounts[i];
+<b>aborts_if</b> <b>exists</b> i in 0..len(recipients):
+    <b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;AptosCoin&gt;&gt;(recipients[i]) && <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;AptosCoin&gt;&gt;(recipients[i]).frozen;
+<b>aborts_if</b> <b>exists</b> i in 0..len(recipients):
+    <a href="account.md#0x1_account_exists_at">account::exists_at</a>(recipients[i]) && !<b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;AptosCoin&gt;&gt;(recipients[i]) && <b>global</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(recipients[i]).guid_creation_num + 2 &gt;= <a href="account.md#0x1_account_MAX_GUID_CREATION_NUM">account::MAX_GUID_CREATION_NUM</a>;
+<b>aborts_if</b> <b>exists</b> i in 0..len(recipients):
+    <a href="account.md#0x1_account_exists_at">account::exists_at</a>(recipients[i]) && !<b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;AptosCoin&gt;&gt;(recipients[i]) && <b>global</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(recipients[i]).guid_creation_num + 2 &gt; MAX_U64;
+</code></pre>
+
+
+
+<a id="@Specification_1_transfer"></a>
+
+### Function `transfer`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_account.md#0x1_aptos_account_transfer">transfer</a>(source: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <b>to</b>: <b>address</b>, amount: u64)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+<b>let</b> account_addr_source = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(source);
+<b>requires</b> account_addr_source != <b>to</b>;
+<b>include</b> <a href="aptos_account.md#0x1_aptos_account_CreateAccountTransferAbortsIf">CreateAccountTransferAbortsIf</a>;
+<b>include</b> <a href="aptos_account.md#0x1_aptos_account_GuidAbortsIf">GuidAbortsIf</a>&lt;AptosCoin&gt;;
+<b>include</b> <a href="aptos_account.md#0x1_aptos_account_WithdrawAbortsIf">WithdrawAbortsIf</a>&lt;AptosCoin&gt;{from: source};
+<b>include</b> <a href="aptos_account.md#0x1_aptos_account_TransferEnsures">TransferEnsures</a>&lt;AptosCoin&gt;;
+<b>aborts_if</b> <b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;AptosCoin&gt;&gt;(<b>to</b>) && <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;AptosCoin&gt;&gt;(<b>to</b>).frozen;
+// This enforces <a id="high-level-req-5" href="#high-level-req">high-level requirement 5</a>:
+<b>ensures</b> <b>exists</b>&lt;aptos_framework::account::Account&gt;(<b>to</b>);
+<b>ensures</b> <b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;AptosCoin&gt;&gt;(<b>to</b>);
+</code></pre>
+
+
+
+<a id="@Specification_1_batch_transfer_coins"></a>
+
+### Function `batch_transfer_coins`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_account.md#0x1_aptos_account_batch_transfer_coins">batch_transfer_coins</a>&lt;CoinType&gt;(from: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, recipients: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;, amounts: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u64&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+<b>let</b> account_addr_source = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(from);
+<b>let</b> coin_store_source = <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;CoinType&gt;&gt;(account_addr_source);
+<b>let</b> balance_source = coin_store_source.<a href="coin.md#0x1_coin">coin</a>.value;
+<b>requires</b> <b>forall</b> i in 0..len(recipients):
+    recipients[i] != account_addr_source;
+<b>requires</b> <b>exists</b> i in 0..len(recipients):
+    amounts[i] &gt; 0;
+// This enforces <a id="high-level-req-7" href="#high-level-req">high-level requirement 7</a>:
+<b>aborts_if</b> len(recipients) != len(amounts);
+<b>aborts_if</b> <b>exists</b> i in 0..len(recipients):
+        !<a href="account.md#0x1_account_exists_at">account::exists_at</a>(recipients[i]) && <a href="aptos_account.md#0x1_aptos_account_length_judgment">length_judgment</a>(recipients[i]);
+<b>aborts_if</b> <b>exists</b> i in 0..len(recipients):
+        !<a href="account.md#0x1_account_exists_at">account::exists_at</a>(recipients[i]) && (recipients[i] == @vm_reserved || recipients[i] == @aptos_framework || recipients[i] == @aptos_token);
+<b>ensures</b> <b>forall</b> i in 0..len(recipients):
+        (!<a href="account.md#0x1_account_exists_at">account::exists_at</a>(recipients[i]) ==&gt; !<a href="aptos_account.md#0x1_aptos_account_length_judgment">length_judgment</a>(recipients[i])) &&
+            (!<a href="account.md#0x1_account_exists_at">account::exists_at</a>(recipients[i]) ==&gt; (recipients[i] != @vm_reserved && recipients[i] != @aptos_framework && recipients[i] != @aptos_token));
+<b>aborts_if</b> <b>exists</b> i in 0..len(recipients):
+    !<b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;CoinType&gt;&gt;(account_addr_source);
+<b>aborts_if</b> <b>exists</b> i in 0..len(recipients):
+    coin_store_source.frozen;
+<b>aborts_if</b> <b>exists</b> i in 0..len(recipients):
+    <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;CoinType&gt;&gt;(account_addr_source).<a href="coin.md#0x1_coin">coin</a>.value &lt; amounts[i];
+<b>aborts_if</b> <b>exists</b> i in 0..len(recipients):
+    <b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;CoinType&gt;&gt;(recipients[i]) && <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;CoinType&gt;&gt;(recipients[i]).frozen;
+<b>aborts_if</b> <b>exists</b> i in 0..len(recipients):
+    <a href="account.md#0x1_account_exists_at">account::exists_at</a>(recipients[i]) && !<b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;CoinType&gt;&gt;(recipients[i]) && <b>global</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(recipients[i]).guid_creation_num + 2 &gt;= <a href="account.md#0x1_account_MAX_GUID_CREATION_NUM">account::MAX_GUID_CREATION_NUM</a>;
+<b>aborts_if</b> <b>exists</b> i in 0..len(recipients):
+    <a href="account.md#0x1_account_exists_at">account::exists_at</a>(recipients[i]) && !<b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;CoinType&gt;&gt;(recipients[i]) && <b>global</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(recipients[i]).guid_creation_num + 2 &gt; MAX_U64;
+<b>aborts_if</b> <b>exists</b> i in 0..len(recipients):
+    !<a href="coin.md#0x1_coin_spec_is_account_registered">coin::spec_is_account_registered</a>&lt;CoinType&gt;(recipients[i]) && !<a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_spec_is_struct">type_info::spec_is_struct</a>&lt;CoinType&gt;();
+</code></pre>
+
+
+
+<a id="@Specification_1_transfer_coins"></a>
+
+### Function `transfer_coins`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_account.md#0x1_aptos_account_transfer_coins">transfer_coins</a>&lt;CoinType&gt;(from: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <b>to</b>: <b>address</b>, amount: u64)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+<b>let</b> account_addr_source = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(from);
+<b>requires</b> account_addr_source != <b>to</b>;
+<b>include</b> <a href="aptos_account.md#0x1_aptos_account_CreateAccountTransferAbortsIf">CreateAccountTransferAbortsIf</a>;
+<b>include</b> <a href="aptos_account.md#0x1_aptos_account_WithdrawAbortsIf">WithdrawAbortsIf</a>&lt;CoinType&gt;;
+<b>include</b> <a href="aptos_account.md#0x1_aptos_account_GuidAbortsIf">GuidAbortsIf</a>&lt;CoinType&gt;;
+<b>include</b> <a href="aptos_account.md#0x1_aptos_account_RegistCoinAbortsIf">RegistCoinAbortsIf</a>&lt;CoinType&gt;;
+<b>include</b> <a href="aptos_account.md#0x1_aptos_account_TransferEnsures">TransferEnsures</a>&lt;CoinType&gt;;
+<b>aborts_if</b> <b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;CoinType&gt;&gt;(<b>to</b>) && <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;CoinType&gt;&gt;(<b>to</b>).frozen;
+<b>ensures</b> <b>exists</b>&lt;aptos_framework::account::Account&gt;(<b>to</b>);
+<b>ensures</b> <b>exists</b>&lt;aptos_framework::coin::CoinStore&lt;CoinType&gt;&gt;(<b>to</b>);
+</code></pre>
+
+
+
+<a id="@Specification_1_deposit_coins"></a>
+
+### Function `deposit_coins`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_account.md#0x1_aptos_account_deposit_coins">deposit_coins</a>&lt;CoinType&gt;(<b>to</b>: <b>address</b>, coins: <a href="coin.md#0x1_coin_Coin">coin::Coin</a>&lt;CoinType&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+<b>include</b> <a href="aptos_account.md#0x1_aptos_account_CreateAccountTransferAbortsIf">CreateAccountTransferAbortsIf</a>;
+<b>include</b> <a href="aptos_account.md#0x1_aptos_account_GuidAbortsIf">GuidAbortsIf</a>&lt;CoinType&gt;;
+<b>include</b> <a href="aptos_account.md#0x1_aptos_account_RegistCoinAbortsIf">RegistCoinAbortsIf</a>&lt;CoinType&gt;;
+<b>let</b> if_exist_coin = <b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;CoinType&gt;&gt;(<b>to</b>);
+<b>aborts_if</b> if_exist_coin && <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;CoinType&gt;&gt;(<b>to</b>).frozen;
+// This enforces <a id="high-level-spec-6" href="#high-level-req">high-level requirement 6</a>:
+<b>ensures</b> <b>exists</b>&lt;aptos_framework::account::Account&gt;(<b>to</b>);
+<b>ensures</b> <b>exists</b>&lt;aptos_framework::coin::CoinStore&lt;CoinType&gt;&gt;(<b>to</b>);
+<b>let</b> coin_store_to = <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;CoinType&gt;&gt;(<b>to</b>).<a href="coin.md#0x1_coin">coin</a>.value;
+<b>let</b> <b>post</b> post_coin_store_to = <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;CoinType&gt;&gt;(<b>to</b>).<a href="coin.md#0x1_coin">coin</a>.value;
+<b>ensures</b> if_exist_coin ==&gt; post_coin_store_to == coin_store_to + coins.value;
+</code></pre>
+
+
+
+<a id="@Specification_1_assert_account_exists"></a>
+
+### Function `assert_account_exists`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_account.md#0x1_aptos_account_assert_account_exists">assert_account_exists</a>(addr: <b>address</b>)
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<a href="account.md#0x1_account_exists_at">account::exists_at</a>(addr);
+</code></pre>
+
+
+
+<a id="@Specification_1_assert_account_is_registered_for_apt"></a>
+
+### Function `assert_account_is_registered_for_apt`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_account.md#0x1_aptos_account_assert_account_is_registered_for_apt">assert_account_is_registered_for_apt</a>(addr: <b>address</b>)
+</code></pre>
+
+
+Check if the address existed.
+Check if the AptosCoin under the address existed.
+
+
+<pre><code><b>pragma</b> aborts_if_is_partial;
+<b>aborts_if</b> !<a href="account.md#0x1_account_exists_at">account::exists_at</a>(addr);
+<b>aborts_if</b> !<a href="coin.md#0x1_coin_spec_is_account_registered">coin::spec_is_account_registered</a>&lt;AptosCoin&gt;(addr);
+</code></pre>
+
+
+
+<a id="@Specification_1_set_allow_direct_coin_transfers"></a>
+
+### Function `set_allow_direct_coin_transfers`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_account.md#0x1_aptos_account_set_allow_direct_coin_transfers">set_allow_direct_coin_transfers</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, allow: bool)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_can_receive_direct_coin_transfers"></a>
+
+### Function `can_receive_direct_coin_transfers`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="aptos_account.md#0x1_aptos_account_can_receive_direct_coin_transfers">can_receive_direct_coin_transfers</a>(<a href="account.md#0x1_account">account</a>: <b>address</b>): bool
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+// This enforces <a id="high-level-req-3" href="#high-level-req">high-level requirement 3</a>:
+<b>ensures</b> result == (
+    !<b>exists</b>&lt;<a href="aptos_account.md#0x1_aptos_account_DirectTransferConfig">DirectTransferConfig</a>&gt;(<a href="account.md#0x1_account">account</a>) ||
+        <b>global</b>&lt;<a href="aptos_account.md#0x1_aptos_account_DirectTransferConfig">DirectTransferConfig</a>&gt;(<a href="account.md#0x1_account">account</a>).allow_arbitrary_coin_transfers
+);
+</code></pre>
+
+
+
+<a id="@Specification_1_register_apt"></a>
+
+### Function `register_apt`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="aptos_account.md#0x1_aptos_account_register_apt">register_apt</a>(account_signer: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_fungible_transfer_only"></a>
+
+### Function `fungible_transfer_only`
+
+
+<pre><code><b>fun</b> <a href="aptos_account.md#0x1_aptos_account_fungible_transfer_only">fungible_transfer_only</a>(source: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <b>to</b>: <b>address</b>, amount: u64)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_is_fungible_balance_at_least"></a>
+
+### Function `is_fungible_balance_at_least`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="aptos_account.md#0x1_aptos_account_is_fungible_balance_at_least">is_fungible_balance_at_least</a>(<a href="account.md#0x1_account">account</a>: <b>address</b>, amount: u64): bool
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_burn_from_fungible_store"></a>
+
+### Function `burn_from_fungible_store`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="aptos_account.md#0x1_aptos_account_burn_from_fungible_store">burn_from_fungible_store</a>(ref: &<a href="fungible_asset.md#0x1_fungible_asset_BurnRef">fungible_asset::BurnRef</a>, <a href="account.md#0x1_account">account</a>: <b>address</b>, amount: u64)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+
+<a id="0x1_aptos_account_CreateAccountTransferAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="aptos_account.md#0x1_aptos_account_CreateAccountTransferAbortsIf">CreateAccountTransferAbortsIf</a> {
+    <b>to</b>: <b>address</b>;
+    <b>aborts_if</b> !<a href="account.md#0x1_account_exists_at">account::exists_at</a>(<b>to</b>) && <a href="aptos_account.md#0x1_aptos_account_length_judgment">length_judgment</a>(<b>to</b>);
+    <b>aborts_if</b> !<a href="account.md#0x1_account_exists_at">account::exists_at</a>(<b>to</b>) && (<b>to</b> == @vm_reserved || <b>to</b> == @aptos_framework || <b>to</b> == @aptos_token);
+}
+</code></pre>
+
+
+
+
+<a id="0x1_aptos_account_WithdrawAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="aptos_account.md#0x1_aptos_account_WithdrawAbortsIf">WithdrawAbortsIf</a>&lt;CoinType&gt; {
+    from: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>;
+    amount: u64;
+    <b>let</b> account_addr_source = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(from);
+    <b>let</b> coin_store_source = <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;CoinType&gt;&gt;(account_addr_source);
+    <b>let</b> balance_source = coin_store_source.<a href="coin.md#0x1_coin">coin</a>.value;
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;CoinType&gt;&gt;(account_addr_source);
+    <b>aborts_if</b> coin_store_source.frozen;
+    <b>aborts_if</b> balance_source &lt; amount;
+}
+</code></pre>
+
+
+
+
+<a id="0x1_aptos_account_GuidAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="aptos_account.md#0x1_aptos_account_GuidAbortsIf">GuidAbortsIf</a>&lt;CoinType&gt; {
+    <b>to</b>: <b>address</b>;
+    <b>let</b> acc = <b>global</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(<b>to</b>);
+    <b>aborts_if</b> <a href="account.md#0x1_account_exists_at">account::exists_at</a>(<b>to</b>) && !<b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;CoinType&gt;&gt;(<b>to</b>) && acc.guid_creation_num + 2 &gt;= <a href="account.md#0x1_account_MAX_GUID_CREATION_NUM">account::MAX_GUID_CREATION_NUM</a>;
+    <b>aborts_if</b> <a href="account.md#0x1_account_exists_at">account::exists_at</a>(<b>to</b>) && !<b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;CoinType&gt;&gt;(<b>to</b>) && acc.guid_creation_num + 2 &gt; MAX_U64;
+}
+</code></pre>
+
+
+
+
+<a id="0x1_aptos_account_RegistCoinAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="aptos_account.md#0x1_aptos_account_RegistCoinAbortsIf">RegistCoinAbortsIf</a>&lt;CoinType&gt; {
+    <b>to</b>: <b>address</b>;
+    <b>aborts_if</b> !<a href="coin.md#0x1_coin_spec_is_account_registered">coin::spec_is_account_registered</a>&lt;CoinType&gt;(<b>to</b>) && !<a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_spec_is_struct">type_info::spec_is_struct</a>&lt;CoinType&gt;();
+    <b>aborts_if</b> <b>exists</b>&lt;aptos_framework::account::Account&gt;(<b>to</b>);
+    <b>aborts_if</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_type_of">type_info::type_of</a>&lt;CoinType&gt;() != <a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_type_of">type_info::type_of</a>&lt;AptosCoin&gt;();
+}
+</code></pre>
+
+
+
+
+<a id="0x1_aptos_account_TransferEnsures"></a>
+
+
+<pre><code><b>schema</b> <a href="aptos_account.md#0x1_aptos_account_TransferEnsures">TransferEnsures</a>&lt;CoinType&gt; {
+    <b>to</b>: <b>address</b>;
+    account_addr_source: <b>address</b>;
+    amount: u64;
+    <b>let</b> if_exist_account = <b>exists</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(<b>to</b>);
+    <b>let</b> if_exist_coin = <b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;CoinType&gt;&gt;(<b>to</b>);
+    <b>let</b> coin_store_to = <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;CoinType&gt;&gt;(<b>to</b>);
+    <b>let</b> coin_store_source = <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;CoinType&gt;&gt;(account_addr_source);
+    <b>let</b> <b>post</b> p_coin_store_to = <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;CoinType&gt;&gt;(<b>to</b>);
+    <b>let</b> <b>post</b> p_coin_store_source = <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;CoinType&gt;&gt;(account_addr_source);
+    <b>ensures</b> coin_store_source.<a href="coin.md#0x1_coin">coin</a>.value - amount == p_coin_store_source.<a href="coin.md#0x1_coin">coin</a>.value;
+    <b>ensures</b> if_exist_account && if_exist_coin ==&gt; coin_store_to.<a href="coin.md#0x1_coin">coin</a>.value + amount == p_coin_store_to.<a href="coin.md#0x1_coin">coin</a>.value;
+}
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/aptos_coin.md b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/aptos_coin.md
new file mode 100644
index 0000000000000..5f8c7c73e1502
--- /dev/null
+++ b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/aptos_coin.md
@@ -0,0 +1,658 @@
+
+<a id="0x1_aptos_coin"></a>
+
+# Module `0x1::aptos_coin`
+
+This module defines a minimal and generic Coin and Balance.
+modified from https://github.com/move-language/move/tree/main/language/documentation/tutorial
+
+
+-  [Resource `AptosCoin`](#0x1_aptos_coin_AptosCoin)
+-  [Resource `MintCapStore`](#0x1_aptos_coin_MintCapStore)
+-  [Struct `DelegatedMintCapability`](#0x1_aptos_coin_DelegatedMintCapability)
+-  [Resource `Delegations`](#0x1_aptos_coin_Delegations)
+-  [Constants](#@Constants_0)
+-  [Function `initialize`](#0x1_aptos_coin_initialize)
+-  [Function `has_mint_capability`](#0x1_aptos_coin_has_mint_capability)
+-  [Function `destroy_mint_cap`](#0x1_aptos_coin_destroy_mint_cap)
+-  [Function `configure_accounts_for_test`](#0x1_aptos_coin_configure_accounts_for_test)
+-  [Function `mint`](#0x1_aptos_coin_mint)
+-  [Function `delegate_mint_capability`](#0x1_aptos_coin_delegate_mint_capability)
+-  [Function `claim_mint_capability`](#0x1_aptos_coin_claim_mint_capability)
+-  [Function `find_delegation`](#0x1_aptos_coin_find_delegation)
+-  [Specification](#@Specification_1)
+    -  [High-level Requirements](#high-level-req)
+    -  [Module-level Specification](#module-level-spec)
+    -  [Function `initialize`](#@Specification_1_initialize)
+    -  [Function `destroy_mint_cap`](#@Specification_1_destroy_mint_cap)
+    -  [Function `configure_accounts_for_test`](#@Specification_1_configure_accounts_for_test)
+    -  [Function `mint`](#@Specification_1_mint)
+    -  [Function `delegate_mint_capability`](#@Specification_1_delegate_mint_capability)
+    -  [Function `claim_mint_capability`](#@Specification_1_claim_mint_capability)
+    -  [Function `find_delegation`](#@Specification_1_find_delegation)
+
+
+<pre><code><b>use</b> <a href="coin.md#0x1_coin">0x1::coin</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option">0x1::option</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">0x1::signer</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string">0x1::string</a>;
+<b>use</b> <a href="system_addresses.md#0x1_system_addresses">0x1::system_addresses</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">0x1::vector</a>;
+</code></pre>
+
+
+
+<a id="0x1_aptos_coin_AptosCoin"></a>
+
+## Resource `AptosCoin`
+
+
+
+<pre><code><b>struct</b> <a href="aptos_coin.md#0x1_aptos_coin_AptosCoin">AptosCoin</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>dummy_field: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_aptos_coin_MintCapStore"></a>
+
+## Resource `MintCapStore`
+
+
+
+<pre><code><b>struct</b> <a href="aptos_coin.md#0x1_aptos_coin_MintCapStore">MintCapStore</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>mint_cap: <a href="coin.md#0x1_coin_MintCapability">coin::MintCapability</a>&lt;<a href="aptos_coin.md#0x1_aptos_coin_AptosCoin">aptos_coin::AptosCoin</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_aptos_coin_DelegatedMintCapability"></a>
+
+## Struct `DelegatedMintCapability`
+
+Delegation token created by delegator and can be claimed by the delegatee as MintCapability.
+
+
+<pre><code><b>struct</b> <a href="aptos_coin.md#0x1_aptos_coin_DelegatedMintCapability">DelegatedMintCapability</a> <b>has</b> store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code><b>to</b>: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_aptos_coin_Delegations"></a>
+
+## Resource `Delegations`
+
+The container stores the current pending delegations.
+
+
+<pre><code><b>struct</b> <a href="aptos_coin.md#0x1_aptos_coin_Delegations">Delegations</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>inner: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="aptos_coin.md#0x1_aptos_coin_DelegatedMintCapability">aptos_coin::DelegatedMintCapability</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_aptos_coin_EALREADY_DELEGATED"></a>
+
+Mint capability has already been delegated to this specified address
+
+
+<pre><code><b>const</b> <a href="aptos_coin.md#0x1_aptos_coin_EALREADY_DELEGATED">EALREADY_DELEGATED</a>: u64 = 2;
+</code></pre>
+
+
+
+<a id="0x1_aptos_coin_EDELEGATION_NOT_FOUND"></a>
+
+Cannot find delegation of mint capability to this account
+
+
+<pre><code><b>const</b> <a href="aptos_coin.md#0x1_aptos_coin_EDELEGATION_NOT_FOUND">EDELEGATION_NOT_FOUND</a>: u64 = 3;
+</code></pre>
+
+
+
+<a id="0x1_aptos_coin_ENO_CAPABILITIES"></a>
+
+Account does not have mint capability
+
+
+<pre><code><b>const</b> <a href="aptos_coin.md#0x1_aptos_coin_ENO_CAPABILITIES">ENO_CAPABILITIES</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_aptos_coin_initialize"></a>
+
+## Function `initialize`
+
+Can only called during genesis to initialize the Aptos coin.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="aptos_coin.md#0x1_aptos_coin_initialize">initialize</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>): (<a href="coin.md#0x1_coin_BurnCapability">coin::BurnCapability</a>&lt;<a href="aptos_coin.md#0x1_aptos_coin_AptosCoin">aptos_coin::AptosCoin</a>&gt;, <a href="coin.md#0x1_coin_MintCapability">coin::MintCapability</a>&lt;<a href="aptos_coin.md#0x1_aptos_coin_AptosCoin">aptos_coin::AptosCoin</a>&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="aptos_coin.md#0x1_aptos_coin_initialize">initialize</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>): (BurnCapability&lt;<a href="aptos_coin.md#0x1_aptos_coin_AptosCoin">AptosCoin</a>&gt;, MintCapability&lt;<a href="aptos_coin.md#0x1_aptos_coin_AptosCoin">AptosCoin</a>&gt;) {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(aptos_framework);
+
+    <b>let</b> (burn_cap, freeze_cap, mint_cap) = <a href="coin.md#0x1_coin_initialize_with_parallelizable_supply">coin::initialize_with_parallelizable_supply</a>&lt;<a href="aptos_coin.md#0x1_aptos_coin_AptosCoin">AptosCoin</a>&gt;(
+        aptos_framework,
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"Aptos Coin"),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"APT"),
+        8, // decimals
+        <b>true</b>, // monitor_supply
+    );
+
+    // Aptos framework needs mint cap <b>to</b> mint coins <b>to</b> initial validators. This will be revoked once the validators
+    // have been initialized.
+    <b>move_to</b>(aptos_framework, <a href="aptos_coin.md#0x1_aptos_coin_MintCapStore">MintCapStore</a> { mint_cap });
+
+    <a href="coin.md#0x1_coin_destroy_freeze_cap">coin::destroy_freeze_cap</a>(freeze_cap);
+    (burn_cap, mint_cap)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_coin_has_mint_capability"></a>
+
+## Function `has_mint_capability`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_coin.md#0x1_aptos_coin_has_mint_capability">has_mint_capability</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_coin.md#0x1_aptos_coin_has_mint_capability">has_mint_capability</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>): bool {
+    <b>exists</b>&lt;<a href="aptos_coin.md#0x1_aptos_coin_MintCapStore">MintCapStore</a>&gt;(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>))
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_coin_destroy_mint_cap"></a>
+
+## Function `destroy_mint_cap`
+
+Only called during genesis to destroy the aptos framework account's mint capability once all initial validators
+and accounts have been initialized during genesis.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="aptos_coin.md#0x1_aptos_coin_destroy_mint_cap">destroy_mint_cap</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="aptos_coin.md#0x1_aptos_coin_destroy_mint_cap">destroy_mint_cap</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>) <b>acquires</b> <a href="aptos_coin.md#0x1_aptos_coin_MintCapStore">MintCapStore</a> {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(aptos_framework);
+    <b>let</b> <a href="aptos_coin.md#0x1_aptos_coin_MintCapStore">MintCapStore</a> { mint_cap } = <b>move_from</b>&lt;<a href="aptos_coin.md#0x1_aptos_coin_MintCapStore">MintCapStore</a>&gt;(@aptos_framework);
+    <a href="coin.md#0x1_coin_destroy_mint_cap">coin::destroy_mint_cap</a>(mint_cap);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_coin_configure_accounts_for_test"></a>
+
+## Function `configure_accounts_for_test`
+
+Can only be called during genesis for tests to grant mint capability to aptos framework and core resources
+accounts.
+Expects account and APT store to be registered before calling.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="aptos_coin.md#0x1_aptos_coin_configure_accounts_for_test">configure_accounts_for_test</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, core_resources: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, mint_cap: <a href="coin.md#0x1_coin_MintCapability">coin::MintCapability</a>&lt;<a href="aptos_coin.md#0x1_aptos_coin_AptosCoin">aptos_coin::AptosCoin</a>&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="aptos_coin.md#0x1_aptos_coin_configure_accounts_for_test">configure_accounts_for_test</a>(
+    aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    core_resources: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    mint_cap: MintCapability&lt;<a href="aptos_coin.md#0x1_aptos_coin_AptosCoin">AptosCoin</a>&gt;,
+) {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(aptos_framework);
+
+    // Mint the core resource <a href="account.md#0x1_account">account</a> <a href="aptos_coin.md#0x1_aptos_coin_AptosCoin">AptosCoin</a> for gas so it can execute system transactions.
+    <b>let</b> coins = <a href="coin.md#0x1_coin_mint">coin::mint</a>&lt;<a href="aptos_coin.md#0x1_aptos_coin_AptosCoin">AptosCoin</a>&gt;(
+        18446744073709551615,
+        &mint_cap,
+    );
+    <a href="coin.md#0x1_coin_deposit">coin::deposit</a>&lt;<a href="aptos_coin.md#0x1_aptos_coin_AptosCoin">AptosCoin</a>&gt;(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(core_resources), coins);
+
+    <b>move_to</b>(core_resources, <a href="aptos_coin.md#0x1_aptos_coin_MintCapStore">MintCapStore</a> { mint_cap });
+    <b>move_to</b>(core_resources, <a href="aptos_coin.md#0x1_aptos_coin_Delegations">Delegations</a> { inner: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_empty">vector::empty</a>() });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_coin_mint"></a>
+
+## Function `mint`
+
+Only callable in tests and testnets where the core resources account exists.
+Create new coins and deposit them into dst_addr's account.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_coin.md#0x1_aptos_coin_mint">mint</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, dst_addr: <b>address</b>, amount: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_coin.md#0x1_aptos_coin_mint">mint</a>(
+    <a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    dst_addr: <b>address</b>,
+    amount: u64,
+) <b>acquires</b> <a href="aptos_coin.md#0x1_aptos_coin_MintCapStore">MintCapStore</a> {
+    <b>let</b> account_addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>);
+
+    <b>assert</b>!(
+        <b>exists</b>&lt;<a href="aptos_coin.md#0x1_aptos_coin_MintCapStore">MintCapStore</a>&gt;(account_addr),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="aptos_coin.md#0x1_aptos_coin_ENO_CAPABILITIES">ENO_CAPABILITIES</a>),
+    );
+
+    <b>let</b> mint_cap = &<b>borrow_global</b>&lt;<a href="aptos_coin.md#0x1_aptos_coin_MintCapStore">MintCapStore</a>&gt;(account_addr).mint_cap;
+    <b>let</b> coins_minted = <a href="coin.md#0x1_coin_mint">coin::mint</a>&lt;<a href="aptos_coin.md#0x1_aptos_coin_AptosCoin">AptosCoin</a>&gt;(amount, mint_cap);
+    <a href="coin.md#0x1_coin_deposit">coin::deposit</a>&lt;<a href="aptos_coin.md#0x1_aptos_coin_AptosCoin">AptosCoin</a>&gt;(dst_addr, coins_minted);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_coin_delegate_mint_capability"></a>
+
+## Function `delegate_mint_capability`
+
+Only callable in tests and testnets where the core resources account exists.
+Create delegated token for the address so the account could claim MintCapability later.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_coin.md#0x1_aptos_coin_delegate_mint_capability">delegate_mint_capability</a>(<a href="account.md#0x1_account">account</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <b>to</b>: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_coin.md#0x1_aptos_coin_delegate_mint_capability">delegate_mint_capability</a>(<a href="account.md#0x1_account">account</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <b>to</b>: <b>address</b>) <b>acquires</b> <a href="aptos_coin.md#0x1_aptos_coin_Delegations">Delegations</a> {
+    <a href="system_addresses.md#0x1_system_addresses_assert_core_resource">system_addresses::assert_core_resource</a>(&<a href="account.md#0x1_account">account</a>);
+    <b>let</b> delegations = &<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="aptos_coin.md#0x1_aptos_coin_Delegations">Delegations</a>&gt;(@core_resources).inner;
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_for_each_ref">vector::for_each_ref</a>(delegations, |element| {
+        <b>let</b> element: &<a href="aptos_coin.md#0x1_aptos_coin_DelegatedMintCapability">DelegatedMintCapability</a> = element;
+        <b>assert</b>!(element.<b>to</b> != <b>to</b>, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="aptos_coin.md#0x1_aptos_coin_EALREADY_DELEGATED">EALREADY_DELEGATED</a>));
+    });
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_push_back">vector::push_back</a>(delegations, <a href="aptos_coin.md#0x1_aptos_coin_DelegatedMintCapability">DelegatedMintCapability</a> { <b>to</b> });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_coin_claim_mint_capability"></a>
+
+## Function `claim_mint_capability`
+
+Only callable in tests and testnets where the core resources account exists.
+Claim the delegated mint capability and destroy the delegated token.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_coin.md#0x1_aptos_coin_claim_mint_capability">claim_mint_capability</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_coin.md#0x1_aptos_coin_claim_mint_capability">claim_mint_capability</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>) <b>acquires</b> <a href="aptos_coin.md#0x1_aptos_coin_Delegations">Delegations</a>, <a href="aptos_coin.md#0x1_aptos_coin_MintCapStore">MintCapStore</a> {
+    <b>let</b> maybe_index = <a href="aptos_coin.md#0x1_aptos_coin_find_delegation">find_delegation</a>(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>));
+    <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&maybe_index), <a href="aptos_coin.md#0x1_aptos_coin_EDELEGATION_NOT_FOUND">EDELEGATION_NOT_FOUND</a>);
+    <b>let</b> idx = *<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(&maybe_index);
+    <b>let</b> delegations = &<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="aptos_coin.md#0x1_aptos_coin_Delegations">Delegations</a>&gt;(@core_resources).inner;
+    <b>let</b> <a href="aptos_coin.md#0x1_aptos_coin_DelegatedMintCapability">DelegatedMintCapability</a> { <b>to</b>: _ } = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_swap_remove">vector::swap_remove</a>(delegations, idx);
+
+    // Make a <b>copy</b> of mint cap and give it <b>to</b> the specified <a href="account.md#0x1_account">account</a>.
+    <b>let</b> mint_cap = <b>borrow_global</b>&lt;<a href="aptos_coin.md#0x1_aptos_coin_MintCapStore">MintCapStore</a>&gt;(@core_resources).mint_cap;
+    <b>move_to</b>(<a href="account.md#0x1_account">account</a>, <a href="aptos_coin.md#0x1_aptos_coin_MintCapStore">MintCapStore</a> { mint_cap });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_coin_find_delegation"></a>
+
+## Function `find_delegation`
+
+
+
+<pre><code><b>fun</b> <a href="aptos_coin.md#0x1_aptos_coin_find_delegation">find_delegation</a>(addr: <b>address</b>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;u64&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="aptos_coin.md#0x1_aptos_coin_find_delegation">find_delegation</a>(addr: <b>address</b>): Option&lt;u64&gt; <b>acquires</b> <a href="aptos_coin.md#0x1_aptos_coin_Delegations">Delegations</a> {
+    <b>let</b> delegations = &<b>borrow_global</b>&lt;<a href="aptos_coin.md#0x1_aptos_coin_Delegations">Delegations</a>&gt;(@core_resources).inner;
+    <b>let</b> i = 0;
+    <b>let</b> len = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(delegations);
+    <b>let</b> index = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>();
+    <b>while</b> (i &lt; len) {
+        <b>let</b> element = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(delegations, i);
+        <b>if</b> (element.<b>to</b> == addr) {
+            index = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(i);
+            <b>break</b>
+        };
+        i = i + 1;
+    };
+    index
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+
+
+<a id="high-level-req"></a>
+
+### High-level Requirements
+
+<table>
+<tr>
+<th>No.</th><th>Requirement</th><th>Criticality</th><th>Implementation</th><th>Enforcement</th>
+</tr>
+
+<tr>
+<td>1</td>
+<td>The native token, APT, must be initialized during genesis.</td>
+<td>Medium</td>
+<td>The initialize function is only called once, during genesis.</td>
+<td>Formally verified via <a href="#high-level-req-1">initialize</a>.</td>
+</tr>
+
+<tr>
+<td>2</td>
+<td>The APT coin may only be created exactly once.</td>
+<td>Medium</td>
+<td>The initialization function may only be called once.</td>
+<td>Enforced through the <a href="https://github.com/aptos-labs/aptos-core/blob/main/aptos-move/framework/aptos-framework/sources/coin.move">coin</a> module, which has been audited.</td>
+</tr>
+
+<tr>
+<td>4</td>
+<td>Any type of operation on the APT coin should fail if the user has not registered for the coin.</td>
+<td>Medium</td>
+<td>Coin operations may succeed only on valid user coin registration.</td>
+<td>Enforced through the <a href="https://github.com/aptos-labs/aptos-core/blob/main/aptos-move/framework/aptos-framework/sources/coin.move">coin</a> module, which has been audited.</td>
+</tr>
+
+</table>
+
+
+
+
+<a id="module-level-spec"></a>
+
+### Module-level Specification
+
+
+<pre><code><b>pragma</b> verify = <b>true</b>;
+<b>pragma</b> aborts_if_is_strict;
+</code></pre>
+
+
+
+<a id="@Specification_1_initialize"></a>
+
+### Function `initialize`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="aptos_coin.md#0x1_aptos_coin_initialize">initialize</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>): (<a href="coin.md#0x1_coin_BurnCapability">coin::BurnCapability</a>&lt;<a href="aptos_coin.md#0x1_aptos_coin_AptosCoin">aptos_coin::AptosCoin</a>&gt;, <a href="coin.md#0x1_coin_MintCapability">coin::MintCapability</a>&lt;<a href="aptos_coin.md#0x1_aptos_coin_AptosCoin">aptos_coin::AptosCoin</a>&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(aptos_framework);
+<b>aborts_if</b> addr != @aptos_framework;
+<b>aborts_if</b> !<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_spec_internal_check_utf8">string::spec_internal_check_utf8</a>(b"Aptos Coin");
+<b>aborts_if</b> !<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_spec_internal_check_utf8">string::spec_internal_check_utf8</a>(b"APT");
+<b>aborts_if</b> <b>exists</b>&lt;<a href="aptos_coin.md#0x1_aptos_coin_MintCapStore">MintCapStore</a>&gt;(addr);
+<b>aborts_if</b> <b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinInfo">coin::CoinInfo</a>&lt;<a href="aptos_coin.md#0x1_aptos_coin_AptosCoin">AptosCoin</a>&gt;&gt;(addr);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="aggregator_factory.md#0x1_aggregator_factory_AggregatorFactory">aggregator_factory::AggregatorFactory</a>&gt;(addr);
+// This enforces <a id="high-level-req-1" href="#high-level-req">high-level requirement 1</a>:
+<b>ensures</b> <b>exists</b>&lt;<a href="aptos_coin.md#0x1_aptos_coin_MintCapStore">MintCapStore</a>&gt;(addr);
+// This enforces <a id="high-level-req-3" href="#high-level-req">high-level requirement 3</a>:
+<b>ensures</b> <b>global</b>&lt;<a href="aptos_coin.md#0x1_aptos_coin_MintCapStore">MintCapStore</a>&gt;(addr).mint_cap ==  MintCapability&lt;<a href="aptos_coin.md#0x1_aptos_coin_AptosCoin">AptosCoin</a>&gt; {};
+<b>ensures</b> <b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinInfo">coin::CoinInfo</a>&lt;<a href="aptos_coin.md#0x1_aptos_coin_AptosCoin">AptosCoin</a>&gt;&gt;(addr);
+<b>ensures</b> result_1 == BurnCapability&lt;<a href="aptos_coin.md#0x1_aptos_coin_AptosCoin">AptosCoin</a>&gt; {};
+<b>ensures</b> result_2 == MintCapability&lt;<a href="aptos_coin.md#0x1_aptos_coin_AptosCoin">AptosCoin</a>&gt; {};
+</code></pre>
+
+
+
+<a id="@Specification_1_destroy_mint_cap"></a>
+
+### Function `destroy_mint_cap`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="aptos_coin.md#0x1_aptos_coin_destroy_mint_cap">destroy_mint_cap</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(aptos_framework);
+<b>aborts_if</b> addr != @aptos_framework;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="aptos_coin.md#0x1_aptos_coin_MintCapStore">MintCapStore</a>&gt;(@aptos_framework);
+</code></pre>
+
+
+
+<a id="@Specification_1_configure_accounts_for_test"></a>
+
+### Function `configure_accounts_for_test`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="aptos_coin.md#0x1_aptos_coin_configure_accounts_for_test">configure_accounts_for_test</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, core_resources: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, mint_cap: <a href="coin.md#0x1_coin_MintCapability">coin::MintCapability</a>&lt;<a href="aptos_coin.md#0x1_aptos_coin_AptosCoin">aptos_coin::AptosCoin</a>&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_mint"></a>
+
+### Function `mint`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_coin.md#0x1_aptos_coin_mint">mint</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, dst_addr: <b>address</b>, amount: u64)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_delegate_mint_capability"></a>
+
+### Function `delegate_mint_capability`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_coin.md#0x1_aptos_coin_delegate_mint_capability">delegate_mint_capability</a>(<a href="account.md#0x1_account">account</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <b>to</b>: <b>address</b>)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_claim_mint_capability"></a>
+
+### Function `claim_mint_capability`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_coin.md#0x1_aptos_coin_claim_mint_capability">claim_mint_capability</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_find_delegation"></a>
+
+### Function `find_delegation`
+
+
+<pre><code><b>fun</b> <a href="aptos_coin.md#0x1_aptos_coin_find_delegation">find_delegation</a>(addr: <b>address</b>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;u64&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="aptos_coin.md#0x1_aptos_coin_Delegations">Delegations</a>&gt;(@core_resources);
+</code></pre>
+
+
+
+
+<a id="0x1_aptos_coin_ExistsAptosCoin"></a>
+
+
+<pre><code><b>schema</b> <a href="aptos_coin.md#0x1_aptos_coin_ExistsAptosCoin">ExistsAptosCoin</a> {
+    <b>requires</b> <b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinInfo">coin::CoinInfo</a>&lt;<a href="aptos_coin.md#0x1_aptos_coin_AptosCoin">AptosCoin</a>&gt;&gt;(@aptos_framework);
+}
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/aptos_governance.md b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/aptos_governance.md
new file mode 100644
index 0000000000000..1a666013b1907
--- /dev/null
+++ b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/aptos_governance.md
@@ -0,0 +1,3136 @@
+
+<a id="0x1_aptos_governance"></a>
+
+# Module `0x1::aptos_governance`
+
+
+AptosGovernance represents the on-chain governance of the Aptos network. Voting power is calculated based on the
+current epoch's voting power of the proposer or voter's backing stake pool. In addition, for it to count,
+the stake pool's lockup needs to be at least as long as the proposal's duration.
+
+It provides the following flow:
+1. Proposers can create a proposal by calling AptosGovernance::create_proposal. The proposer's backing stake pool
+needs to have the minimum proposer stake required. Off-chain components can subscribe to CreateProposalEvent to
+track proposal creation and proposal ids.
+2. Voters can vote on a proposal. Their voting power is derived from the backing stake pool. A stake pool can vote
+on a proposal multiple times as long as the total voting power of these votes doesn't exceed its total voting power.
+
+
+-  [Resource `GovernanceResponsbility`](#0x1_aptos_governance_GovernanceResponsbility)
+-  [Resource `GovernanceConfig`](#0x1_aptos_governance_GovernanceConfig)
+-  [Struct `RecordKey`](#0x1_aptos_governance_RecordKey)
+-  [Resource `VotingRecords`](#0x1_aptos_governance_VotingRecords)
+-  [Resource `VotingRecordsV2`](#0x1_aptos_governance_VotingRecordsV2)
+-  [Resource `ApprovedExecutionHashes`](#0x1_aptos_governance_ApprovedExecutionHashes)
+-  [Resource `GovernanceEvents`](#0x1_aptos_governance_GovernanceEvents)
+-  [Struct `CreateProposalEvent`](#0x1_aptos_governance_CreateProposalEvent)
+-  [Struct `VoteEvent`](#0x1_aptos_governance_VoteEvent)
+-  [Struct `UpdateConfigEvent`](#0x1_aptos_governance_UpdateConfigEvent)
+-  [Struct `CreateProposal`](#0x1_aptos_governance_CreateProposal)
+-  [Struct `Vote`](#0x1_aptos_governance_Vote)
+-  [Struct `UpdateConfig`](#0x1_aptos_governance_UpdateConfig)
+-  [Constants](#@Constants_0)
+-  [Function `store_signer_cap`](#0x1_aptos_governance_store_signer_cap)
+-  [Function `initialize`](#0x1_aptos_governance_initialize)
+-  [Function `update_governance_config`](#0x1_aptos_governance_update_governance_config)
+-  [Function `initialize_partial_voting`](#0x1_aptos_governance_initialize_partial_voting)
+-  [Function `get_voting_duration_secs`](#0x1_aptos_governance_get_voting_duration_secs)
+-  [Function `get_min_voting_threshold`](#0x1_aptos_governance_get_min_voting_threshold)
+-  [Function `get_required_proposer_stake`](#0x1_aptos_governance_get_required_proposer_stake)
+-  [Function `has_entirely_voted`](#0x1_aptos_governance_has_entirely_voted)
+-  [Function `get_remaining_voting_power`](#0x1_aptos_governance_get_remaining_voting_power)
+-  [Function `create_proposal`](#0x1_aptos_governance_create_proposal)
+-  [Function `create_proposal_v2`](#0x1_aptos_governance_create_proposal_v2)
+-  [Function `create_proposal_v2_impl`](#0x1_aptos_governance_create_proposal_v2_impl)
+-  [Function `batch_vote`](#0x1_aptos_governance_batch_vote)
+-  [Function `batch_partial_vote`](#0x1_aptos_governance_batch_partial_vote)
+-  [Function `vote`](#0x1_aptos_governance_vote)
+-  [Function `partial_vote`](#0x1_aptos_governance_partial_vote)
+-  [Function `vote_internal`](#0x1_aptos_governance_vote_internal)
+-  [Function `add_approved_script_hash_script`](#0x1_aptos_governance_add_approved_script_hash_script)
+-  [Function `add_approved_script_hash`](#0x1_aptos_governance_add_approved_script_hash)
+-  [Function `resolve`](#0x1_aptos_governance_resolve)
+-  [Function `resolve_multi_step_proposal`](#0x1_aptos_governance_resolve_multi_step_proposal)
+-  [Function `remove_approved_hash`](#0x1_aptos_governance_remove_approved_hash)
+-  [Function `reconfigure`](#0x1_aptos_governance_reconfigure)
+-  [Function `force_end_epoch`](#0x1_aptos_governance_force_end_epoch)
+-  [Function `force_end_epoch_test_only`](#0x1_aptos_governance_force_end_epoch_test_only)
+-  [Function `toggle_features`](#0x1_aptos_governance_toggle_features)
+-  [Function `get_signer_testnet_only`](#0x1_aptos_governance_get_signer_testnet_only)
+-  [Function `get_voting_power`](#0x1_aptos_governance_get_voting_power)
+-  [Function `get_signer`](#0x1_aptos_governance_get_signer)
+-  [Function `create_proposal_metadata`](#0x1_aptos_governance_create_proposal_metadata)
+-  [Function `assert_voting_initialization`](#0x1_aptos_governance_assert_voting_initialization)
+-  [Specification](#@Specification_1)
+    -  [High-level Requirements](#high-level-req)
+    -  [Module-level Specification](#module-level-spec)
+    -  [Function `store_signer_cap`](#@Specification_1_store_signer_cap)
+    -  [Function `initialize`](#@Specification_1_initialize)
+    -  [Function `update_governance_config`](#@Specification_1_update_governance_config)
+    -  [Function `initialize_partial_voting`](#@Specification_1_initialize_partial_voting)
+    -  [Function `get_voting_duration_secs`](#@Specification_1_get_voting_duration_secs)
+    -  [Function `get_min_voting_threshold`](#@Specification_1_get_min_voting_threshold)
+    -  [Function `get_required_proposer_stake`](#@Specification_1_get_required_proposer_stake)
+    -  [Function `has_entirely_voted`](#@Specification_1_has_entirely_voted)
+    -  [Function `get_remaining_voting_power`](#@Specification_1_get_remaining_voting_power)
+    -  [Function `create_proposal`](#@Specification_1_create_proposal)
+    -  [Function `create_proposal_v2`](#@Specification_1_create_proposal_v2)
+    -  [Function `create_proposal_v2_impl`](#@Specification_1_create_proposal_v2_impl)
+    -  [Function `batch_vote`](#@Specification_1_batch_vote)
+    -  [Function `batch_partial_vote`](#@Specification_1_batch_partial_vote)
+    -  [Function `vote`](#@Specification_1_vote)
+    -  [Function `partial_vote`](#@Specification_1_partial_vote)
+    -  [Function `vote_internal`](#@Specification_1_vote_internal)
+    -  [Function `add_approved_script_hash_script`](#@Specification_1_add_approved_script_hash_script)
+    -  [Function `add_approved_script_hash`](#@Specification_1_add_approved_script_hash)
+    -  [Function `resolve`](#@Specification_1_resolve)
+    -  [Function `resolve_multi_step_proposal`](#@Specification_1_resolve_multi_step_proposal)
+    -  [Function `remove_approved_hash`](#@Specification_1_remove_approved_hash)
+    -  [Function `reconfigure`](#@Specification_1_reconfigure)
+    -  [Function `force_end_epoch`](#@Specification_1_force_end_epoch)
+    -  [Function `force_end_epoch_test_only`](#@Specification_1_force_end_epoch_test_only)
+    -  [Function `toggle_features`](#@Specification_1_toggle_features)
+    -  [Function `get_signer_testnet_only`](#@Specification_1_get_signer_testnet_only)
+    -  [Function `get_voting_power`](#@Specification_1_get_voting_power)
+    -  [Function `get_signer`](#@Specification_1_get_signer)
+    -  [Function `create_proposal_metadata`](#@Specification_1_create_proposal_metadata)
+    -  [Function `assert_voting_initialization`](#@Specification_1_assert_voting_initialization)
+
+
+<pre><code><b>use</b> <a href="account.md#0x1_account">0x1::account</a>;
+<b>use</b> <a href="aptos_coin.md#0x1_aptos_coin">0x1::aptos_coin</a>;
+<b>use</b> <a href="coin.md#0x1_coin">0x1::coin</a>;
+<b>use</b> <a href="consensus_config.md#0x1_consensus_config">0x1::consensus_config</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="event.md#0x1_event">0x1::event</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features">0x1::features</a>;
+<b>use</b> <a href="governance_proposal.md#0x1_governance_proposal">0x1::governance_proposal</a>;
+<b>use</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/math64.md#0x1_math64">0x1::math64</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option">0x1::option</a>;
+<b>use</b> <a href="randomness_config.md#0x1_randomness_config">0x1::randomness_config</a>;
+<b>use</b> <a href="reconfiguration_with_dkg.md#0x1_reconfiguration_with_dkg">0x1::reconfiguration_with_dkg</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">0x1::signer</a>;
+<b>use</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map">0x1::simple_map</a>;
+<b>use</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/smart_table.md#0x1_smart_table">0x1::smart_table</a>;
+<b>use</b> <a href="stake.md#0x1_stake">0x1::stake</a>;
+<b>use</b> <a href="staking_config.md#0x1_staking_config">0x1::staking_config</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string">0x1::string</a>;
+<b>use</b> <a href="system_addresses.md#0x1_system_addresses">0x1::system_addresses</a>;
+<b>use</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table">0x1::table</a>;
+<b>use</b> <a href="timestamp.md#0x1_timestamp">0x1::timestamp</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">0x1::vector</a>;
+<b>use</b> <a href="voting.md#0x1_voting">0x1::voting</a>;
+</code></pre>
+
+
+
+<a id="0x1_aptos_governance_GovernanceResponsbility"></a>
+
+## Resource `GovernanceResponsbility`
+
+Store the SignerCapabilities of accounts under the on-chain governance's control.
+
+
+<pre><code><b>struct</b> <a href="aptos_governance.md#0x1_aptos_governance_GovernanceResponsbility">GovernanceResponsbility</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>signer_caps: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;<b>address</b>, <a href="account.md#0x1_account_SignerCapability">account::SignerCapability</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_aptos_governance_GovernanceConfig"></a>
+
+## Resource `GovernanceConfig`
+
+Configurations of the AptosGovernance, set during Genesis and can be updated by the same process offered
+by this AptosGovernance module.
+
+
+<pre><code><b>struct</b> <a href="aptos_governance.md#0x1_aptos_governance_GovernanceConfig">GovernanceConfig</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>min_voting_threshold: u128</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>required_proposer_stake: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>voting_duration_secs: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_aptos_governance_RecordKey"></a>
+
+## Struct `RecordKey`
+
+
+
+<pre><code><b>struct</b> <a href="aptos_governance.md#0x1_aptos_governance_RecordKey">RecordKey</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>stake_pool: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>proposal_id: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_aptos_governance_VotingRecords"></a>
+
+## Resource `VotingRecords`
+
+Records to track the proposals each stake pool has been used to vote on.
+
+
+<pre><code><b>struct</b> <a href="aptos_governance.md#0x1_aptos_governance_VotingRecords">VotingRecords</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>votes: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_Table">table::Table</a>&lt;<a href="aptos_governance.md#0x1_aptos_governance_RecordKey">aptos_governance::RecordKey</a>, bool&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_aptos_governance_VotingRecordsV2"></a>
+
+## Resource `VotingRecordsV2`
+
+Records to track the voting power usage of each stake pool on each proposal.
+
+
+<pre><code><b>struct</b> <a href="aptos_governance.md#0x1_aptos_governance_VotingRecordsV2">VotingRecordsV2</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>votes: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/smart_table.md#0x1_smart_table_SmartTable">smart_table::SmartTable</a>&lt;<a href="aptos_governance.md#0x1_aptos_governance_RecordKey">aptos_governance::RecordKey</a>, u64&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_aptos_governance_ApprovedExecutionHashes"></a>
+
+## Resource `ApprovedExecutionHashes`
+
+Used to track which execution script hashes have been approved by governance.
+This is required to bypass cases where the execution scripts exceed the size limit imposed by mempool.
+
+
+<pre><code><b>struct</b> <a href="aptos_governance.md#0x1_aptos_governance_ApprovedExecutionHashes">ApprovedExecutionHashes</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>hashes: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;u64, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_aptos_governance_GovernanceEvents"></a>
+
+## Resource `GovernanceEvents`
+
+Events generated by interactions with the AptosGovernance module.
+
+
+<pre><code><b>struct</b> <a href="aptos_governance.md#0x1_aptos_governance_GovernanceEvents">GovernanceEvents</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>create_proposal_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="aptos_governance.md#0x1_aptos_governance_CreateProposalEvent">aptos_governance::CreateProposalEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>update_config_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="aptos_governance.md#0x1_aptos_governance_UpdateConfigEvent">aptos_governance::UpdateConfigEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>vote_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="aptos_governance.md#0x1_aptos_governance_VoteEvent">aptos_governance::VoteEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_aptos_governance_CreateProposalEvent"></a>
+
+## Struct `CreateProposalEvent`
+
+Event emitted when a proposal is created.
+
+
+<pre><code><b>struct</b> <a href="aptos_governance.md#0x1_aptos_governance_CreateProposalEvent">CreateProposalEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>proposer: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>stake_pool: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>proposal_id: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>execution_hash: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>proposal_metadata: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_aptos_governance_VoteEvent"></a>
+
+## Struct `VoteEvent`
+
+Event emitted when there's a vote on a proposa;
+
+
+<pre><code><b>struct</b> <a href="aptos_governance.md#0x1_aptos_governance_VoteEvent">VoteEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>proposal_id: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>voter: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>stake_pool: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>num_votes: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>should_pass: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_aptos_governance_UpdateConfigEvent"></a>
+
+## Struct `UpdateConfigEvent`
+
+Event emitted when the governance configs are updated.
+
+
+<pre><code><b>struct</b> <a href="aptos_governance.md#0x1_aptos_governance_UpdateConfigEvent">UpdateConfigEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>min_voting_threshold: u128</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>required_proposer_stake: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>voting_duration_secs: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_aptos_governance_CreateProposal"></a>
+
+## Struct `CreateProposal`
+
+Event emitted when a proposal is created.
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="aptos_governance.md#0x1_aptos_governance_CreateProposal">CreateProposal</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>proposer: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>stake_pool: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>proposal_id: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>execution_hash: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>proposal_metadata: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_aptos_governance_Vote"></a>
+
+## Struct `Vote`
+
+Event emitted when there's a vote on a proposa;
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="aptos_governance.md#0x1_aptos_governance_Vote">Vote</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>proposal_id: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>voter: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>stake_pool: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>num_votes: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>should_pass: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_aptos_governance_UpdateConfig"></a>
+
+## Struct `UpdateConfig`
+
+Event emitted when the governance configs are updated.
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="aptos_governance.md#0x1_aptos_governance_UpdateConfig">UpdateConfig</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>min_voting_threshold: u128</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>required_proposer_stake: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>voting_duration_secs: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_aptos_governance_MAX_U64"></a>
+
+
+
+<pre><code><b>const</b> <a href="aptos_governance.md#0x1_aptos_governance_MAX_U64">MAX_U64</a>: u64 = 18446744073709551615;
+</code></pre>
+
+
+
+<a id="0x1_aptos_governance_PROPOSAL_STATE_SUCCEEDED"></a>
+
+This matches the same enum const in voting. We have to duplicate it as Move doesn't have support for enums yet.
+
+
+<pre><code><b>const</b> <a href="aptos_governance.md#0x1_aptos_governance_PROPOSAL_STATE_SUCCEEDED">PROPOSAL_STATE_SUCCEEDED</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_aptos_governance_EALREADY_VOTED"></a>
+
+The specified stake pool has already been used to vote on the same proposal
+
+
+<pre><code><b>const</b> <a href="aptos_governance.md#0x1_aptos_governance_EALREADY_VOTED">EALREADY_VOTED</a>: u64 = 4;
+</code></pre>
+
+
+
+<a id="0x1_aptos_governance_EINSUFFICIENT_PROPOSER_STAKE"></a>
+
+The specified stake pool does not have sufficient stake to create a proposal
+
+
+<pre><code><b>const</b> <a href="aptos_governance.md#0x1_aptos_governance_EINSUFFICIENT_PROPOSER_STAKE">EINSUFFICIENT_PROPOSER_STAKE</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_aptos_governance_EINSUFFICIENT_STAKE_LOCKUP"></a>
+
+The specified stake pool does not have long enough remaining lockup to create a proposal or vote
+
+
+<pre><code><b>const</b> <a href="aptos_governance.md#0x1_aptos_governance_EINSUFFICIENT_STAKE_LOCKUP">EINSUFFICIENT_STAKE_LOCKUP</a>: u64 = 3;
+</code></pre>
+
+
+
+<a id="0x1_aptos_governance_EMETADATA_HASH_TOO_LONG"></a>
+
+Metadata hash cannot be longer than 256 chars
+
+
+<pre><code><b>const</b> <a href="aptos_governance.md#0x1_aptos_governance_EMETADATA_HASH_TOO_LONG">EMETADATA_HASH_TOO_LONG</a>: u64 = 10;
+</code></pre>
+
+
+
+<a id="0x1_aptos_governance_EMETADATA_LOCATION_TOO_LONG"></a>
+
+Metadata location cannot be longer than 256 chars
+
+
+<pre><code><b>const</b> <a href="aptos_governance.md#0x1_aptos_governance_EMETADATA_LOCATION_TOO_LONG">EMETADATA_LOCATION_TOO_LONG</a>: u64 = 9;
+</code></pre>
+
+
+
+<a id="0x1_aptos_governance_ENOT_DELEGATED_VOTER"></a>
+
+This account is not the designated voter of the specified stake pool
+
+
+<pre><code><b>const</b> <a href="aptos_governance.md#0x1_aptos_governance_ENOT_DELEGATED_VOTER">ENOT_DELEGATED_VOTER</a>: u64 = 2;
+</code></pre>
+
+
+
+<a id="0x1_aptos_governance_ENOT_PARTIAL_VOTING_PROPOSAL"></a>
+
+The proposal in the argument is not a partial voting proposal.
+
+
+<pre><code><b>const</b> <a href="aptos_governance.md#0x1_aptos_governance_ENOT_PARTIAL_VOTING_PROPOSAL">ENOT_PARTIAL_VOTING_PROPOSAL</a>: u64 = 14;
+</code></pre>
+
+
+
+<a id="0x1_aptos_governance_ENO_VOTING_POWER"></a>
+
+The specified stake pool must be part of the validator set
+
+
+<pre><code><b>const</b> <a href="aptos_governance.md#0x1_aptos_governance_ENO_VOTING_POWER">ENO_VOTING_POWER</a>: u64 = 5;
+</code></pre>
+
+
+
+<a id="0x1_aptos_governance_EPARTIAL_VOTING_NOT_INITIALIZED"></a>
+
+Partial voting feature hasn't been properly initialized.
+
+
+<pre><code><b>const</b> <a href="aptos_governance.md#0x1_aptos_governance_EPARTIAL_VOTING_NOT_INITIALIZED">EPARTIAL_VOTING_NOT_INITIALIZED</a>: u64 = 13;
+</code></pre>
+
+
+
+<a id="0x1_aptos_governance_EPROPOSAL_NOT_RESOLVABLE_YET"></a>
+
+Proposal is not ready to be resolved. Waiting on time or votes
+
+
+<pre><code><b>const</b> <a href="aptos_governance.md#0x1_aptos_governance_EPROPOSAL_NOT_RESOLVABLE_YET">EPROPOSAL_NOT_RESOLVABLE_YET</a>: u64 = 6;
+</code></pre>
+
+
+
+<a id="0x1_aptos_governance_EPROPOSAL_NOT_RESOLVED_YET"></a>
+
+The proposal has not been resolved yet
+
+
+<pre><code><b>const</b> <a href="aptos_governance.md#0x1_aptos_governance_EPROPOSAL_NOT_RESOLVED_YET">EPROPOSAL_NOT_RESOLVED_YET</a>: u64 = 8;
+</code></pre>
+
+
+
+<a id="0x1_aptos_governance_EUNAUTHORIZED"></a>
+
+Account is not authorized to call this function.
+
+
+<pre><code><b>const</b> <a href="aptos_governance.md#0x1_aptos_governance_EUNAUTHORIZED">EUNAUTHORIZED</a>: u64 = 11;
+</code></pre>
+
+
+
+<a id="0x1_aptos_governance_EVOTING_POWER_OVERFLOW"></a>
+
+The stake pool is using voting power more than it has.
+
+
+<pre><code><b>const</b> <a href="aptos_governance.md#0x1_aptos_governance_EVOTING_POWER_OVERFLOW">EVOTING_POWER_OVERFLOW</a>: u64 = 12;
+</code></pre>
+
+
+
+<a id="0x1_aptos_governance_METADATA_HASH_KEY"></a>
+
+
+
+<pre><code><b>const</b> <a href="aptos_governance.md#0x1_aptos_governance_METADATA_HASH_KEY">METADATA_HASH_KEY</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; = [109, 101, 116, 97, 100, 97, 116, 97, 95, 104, 97, 115, 104];
+</code></pre>
+
+
+
+<a id="0x1_aptos_governance_METADATA_LOCATION_KEY"></a>
+
+Proposal metadata attribute keys.
+
+
+<pre><code><b>const</b> <a href="aptos_governance.md#0x1_aptos_governance_METADATA_LOCATION_KEY">METADATA_LOCATION_KEY</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; = [109, 101, 116, 97, 100, 97, 116, 97, 95, 108, 111, 99, 97, 116, 105, 111, 110];
+</code></pre>
+
+
+
+<a id="0x1_aptos_governance_store_signer_cap"></a>
+
+## Function `store_signer_cap`
+
+Can be called during genesis or by the governance itself.
+Stores the signer capability for a given address.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_store_signer_cap">store_signer_cap</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, signer_address: <b>address</b>, signer_cap: <a href="account.md#0x1_account_SignerCapability">account::SignerCapability</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_store_signer_cap">store_signer_cap</a>(
+    aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    signer_address: <b>address</b>,
+    signer_cap: SignerCapability,
+) <b>acquires</b> <a href="aptos_governance.md#0x1_aptos_governance_GovernanceResponsbility">GovernanceResponsbility</a> {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(aptos_framework);
+    <a href="system_addresses.md#0x1_system_addresses_assert_framework_reserved">system_addresses::assert_framework_reserved</a>(signer_address);
+
+    <b>if</b> (!<b>exists</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_GovernanceResponsbility">GovernanceResponsbility</a>&gt;(@aptos_framework)) {
+        <b>move_to</b>(
+            aptos_framework,
+            <a href="aptos_governance.md#0x1_aptos_governance_GovernanceResponsbility">GovernanceResponsbility</a> { signer_caps: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_create">simple_map::create</a>&lt;<b>address</b>, SignerCapability&gt;() }
+        );
+    };
+
+    <b>let</b> signer_caps = &<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_GovernanceResponsbility">GovernanceResponsbility</a>&gt;(@aptos_framework).signer_caps;
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_add">simple_map::add</a>(signer_caps, signer_address, signer_cap);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_governance_initialize"></a>
+
+## Function `initialize`
+
+Initializes the state for Aptos Governance. Can only be called during Genesis with a signer
+for the aptos_framework (0x1) account.
+This function is private because it's called directly from the vm.
+
+
+<pre><code><b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_initialize">initialize</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, min_voting_threshold: u128, required_proposer_stake: u64, voting_duration_secs: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_initialize">initialize</a>(
+    aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    min_voting_threshold: u128,
+    required_proposer_stake: u64,
+    voting_duration_secs: u64,
+) {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(aptos_framework);
+
+    <a href="voting.md#0x1_voting_register">voting::register</a>&lt;GovernanceProposal&gt;(aptos_framework);
+    <b>move_to</b>(aptos_framework, <a href="aptos_governance.md#0x1_aptos_governance_GovernanceConfig">GovernanceConfig</a> {
+        voting_duration_secs,
+        min_voting_threshold,
+        required_proposer_stake,
+    });
+    <b>move_to</b>(aptos_framework, <a href="aptos_governance.md#0x1_aptos_governance_GovernanceEvents">GovernanceEvents</a> {
+        create_proposal_events: <a href="account.md#0x1_account_new_event_handle">account::new_event_handle</a>&lt;<a href="aptos_governance.md#0x1_aptos_governance_CreateProposalEvent">CreateProposalEvent</a>&gt;(aptos_framework),
+        update_config_events: <a href="account.md#0x1_account_new_event_handle">account::new_event_handle</a>&lt;<a href="aptos_governance.md#0x1_aptos_governance_UpdateConfigEvent">UpdateConfigEvent</a>&gt;(aptos_framework),
+        vote_events: <a href="account.md#0x1_account_new_event_handle">account::new_event_handle</a>&lt;<a href="aptos_governance.md#0x1_aptos_governance_VoteEvent">VoteEvent</a>&gt;(aptos_framework),
+    });
+    <b>move_to</b>(aptos_framework, <a href="aptos_governance.md#0x1_aptos_governance_VotingRecords">VotingRecords</a> {
+        votes: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_new">table::new</a>(),
+    });
+    <b>move_to</b>(aptos_framework, <a href="aptos_governance.md#0x1_aptos_governance_ApprovedExecutionHashes">ApprovedExecutionHashes</a> {
+        hashes: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_create">simple_map::create</a>&lt;u64, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;(),
+    })
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_governance_update_governance_config"></a>
+
+## Function `update_governance_config`
+
+Update the governance configurations. This can only be called as part of resolving a proposal in this same
+AptosGovernance.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_update_governance_config">update_governance_config</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, min_voting_threshold: u128, required_proposer_stake: u64, voting_duration_secs: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_update_governance_config">update_governance_config</a>(
+    aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    min_voting_threshold: u128,
+    required_proposer_stake: u64,
+    voting_duration_secs: u64,
+) <b>acquires</b> <a href="aptos_governance.md#0x1_aptos_governance_GovernanceConfig">GovernanceConfig</a>, <a href="aptos_governance.md#0x1_aptos_governance_GovernanceEvents">GovernanceEvents</a> {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(aptos_framework);
+
+    <b>let</b> governance_config = <b>borrow_global_mut</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_GovernanceConfig">GovernanceConfig</a>&gt;(@aptos_framework);
+    governance_config.voting_duration_secs = voting_duration_secs;
+    governance_config.min_voting_threshold = min_voting_threshold;
+    governance_config.required_proposer_stake = required_proposer_stake;
+
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        <a href="event.md#0x1_event_emit">event::emit</a>(
+            <a href="aptos_governance.md#0x1_aptos_governance_UpdateConfig">UpdateConfig</a> {
+                min_voting_threshold,
+                required_proposer_stake,
+                voting_duration_secs
+            },
+        )
+    };
+    <b>let</b> events = <b>borrow_global_mut</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_GovernanceEvents">GovernanceEvents</a>&gt;(@aptos_framework);
+    <a href="event.md#0x1_event_emit_event">event::emit_event</a>&lt;<a href="aptos_governance.md#0x1_aptos_governance_UpdateConfigEvent">UpdateConfigEvent</a>&gt;(
+        &<b>mut</b> events.update_config_events,
+        <a href="aptos_governance.md#0x1_aptos_governance_UpdateConfigEvent">UpdateConfigEvent</a> {
+            min_voting_threshold,
+            required_proposer_stake,
+            voting_duration_secs
+        },
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_governance_initialize_partial_voting"></a>
+
+## Function `initialize_partial_voting`
+
+Initializes the state for Aptos Governance partial voting. Can only be called through Aptos governance
+proposals with a signer for the aptos_framework (0x1) account.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_initialize_partial_voting">initialize_partial_voting</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_initialize_partial_voting">initialize_partial_voting</a>(
+    aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+) {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(aptos_framework);
+
+    <b>move_to</b>(aptos_framework, <a href="aptos_governance.md#0x1_aptos_governance_VotingRecordsV2">VotingRecordsV2</a> {
+        votes: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/smart_table.md#0x1_smart_table_new">smart_table::new</a>(),
+    });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_governance_get_voting_duration_secs"></a>
+
+## Function `get_voting_duration_secs`
+
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_get_voting_duration_secs">get_voting_duration_secs</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_get_voting_duration_secs">get_voting_duration_secs</a>(): u64 <b>acquires</b> <a href="aptos_governance.md#0x1_aptos_governance_GovernanceConfig">GovernanceConfig</a> {
+    <b>borrow_global</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_GovernanceConfig">GovernanceConfig</a>&gt;(@aptos_framework).voting_duration_secs
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_governance_get_min_voting_threshold"></a>
+
+## Function `get_min_voting_threshold`
+
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_get_min_voting_threshold">get_min_voting_threshold</a>(): u128
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_get_min_voting_threshold">get_min_voting_threshold</a>(): u128 <b>acquires</b> <a href="aptos_governance.md#0x1_aptos_governance_GovernanceConfig">GovernanceConfig</a> {
+    <b>borrow_global</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_GovernanceConfig">GovernanceConfig</a>&gt;(@aptos_framework).min_voting_threshold
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_governance_get_required_proposer_stake"></a>
+
+## Function `get_required_proposer_stake`
+
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_get_required_proposer_stake">get_required_proposer_stake</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_get_required_proposer_stake">get_required_proposer_stake</a>(): u64 <b>acquires</b> <a href="aptos_governance.md#0x1_aptos_governance_GovernanceConfig">GovernanceConfig</a> {
+    <b>borrow_global</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_GovernanceConfig">GovernanceConfig</a>&gt;(@aptos_framework).required_proposer_stake
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_governance_has_entirely_voted"></a>
+
+## Function `has_entirely_voted`
+
+Return true if a stake pool has already voted on a proposal before partial governance voting is enabled.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_has_entirely_voted">has_entirely_voted</a>(stake_pool: <b>address</b>, proposal_id: u64): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_has_entirely_voted">has_entirely_voted</a>(stake_pool: <b>address</b>, proposal_id: u64): bool <b>acquires</b> <a href="aptos_governance.md#0x1_aptos_governance_VotingRecords">VotingRecords</a> {
+    <b>let</b> record_key = <a href="aptos_governance.md#0x1_aptos_governance_RecordKey">RecordKey</a> {
+        stake_pool,
+        proposal_id,
+    };
+    // If a <a href="stake.md#0x1_stake">stake</a> pool <b>has</b> already voted on a proposal before partial governance <a href="voting.md#0x1_voting">voting</a> is enabled,
+    // there is a record in <a href="aptos_governance.md#0x1_aptos_governance_VotingRecords">VotingRecords</a>.
+    <b>let</b> voting_records = <b>borrow_global</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_VotingRecords">VotingRecords</a>&gt;(@aptos_framework);
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_contains">table::contains</a>(&voting_records.votes, record_key)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_governance_get_remaining_voting_power"></a>
+
+## Function `get_remaining_voting_power`
+
+Return remaining voting power of a stake pool on a proposal.
+Note: a stake pool's voting power on a proposal could increase over time(e.g. rewards/new stake).
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_get_remaining_voting_power">get_remaining_voting_power</a>(stake_pool: <b>address</b>, proposal_id: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_get_remaining_voting_power">get_remaining_voting_power</a>(
+    stake_pool: <b>address</b>,
+    proposal_id: u64
+): u64 <b>acquires</b> <a href="aptos_governance.md#0x1_aptos_governance_VotingRecords">VotingRecords</a>, <a href="aptos_governance.md#0x1_aptos_governance_VotingRecordsV2">VotingRecordsV2</a> {
+    <a href="aptos_governance.md#0x1_aptos_governance_assert_voting_initialization">assert_voting_initialization</a>();
+
+    <b>let</b> proposal_expiration = <a href="voting.md#0x1_voting_get_proposal_expiration_secs">voting::get_proposal_expiration_secs</a>&lt;GovernanceProposal&gt;(
+        @aptos_framework,
+        proposal_id
+    );
+    <b>let</b> lockup_until = <a href="stake.md#0x1_stake_get_lockup_secs">stake::get_lockup_secs</a>(stake_pool);
+    // The voter's <a href="stake.md#0x1_stake">stake</a> needs <b>to</b> be locked up at least <b>as</b> long <b>as</b> the proposal's expiration.
+    // Also no one can vote on a expired proposal.
+    <b>if</b> (proposal_expiration &gt; lockup_until || <a href="timestamp.md#0x1_timestamp_now_seconds">timestamp::now_seconds</a>() &gt; proposal_expiration) {
+        <b>return</b> 0
+    };
+
+    // If a <a href="stake.md#0x1_stake">stake</a> pool <b>has</b> already voted on a proposal before partial governance <a href="voting.md#0x1_voting">voting</a> is enabled, the <a href="stake.md#0x1_stake">stake</a> pool
+    // cannot vote on the proposal even after partial governance <a href="voting.md#0x1_voting">voting</a> is enabled.
+    <b>if</b> (<a href="aptos_governance.md#0x1_aptos_governance_has_entirely_voted">has_entirely_voted</a>(stake_pool, proposal_id)) {
+        <b>return</b> 0
+    };
+    <b>let</b> record_key = <a href="aptos_governance.md#0x1_aptos_governance_RecordKey">RecordKey</a> {
+        stake_pool,
+        proposal_id,
+    };
+    <b>let</b> used_voting_power = 0u64;
+    <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_partial_governance_voting_enabled">features::partial_governance_voting_enabled</a>()) {
+        <b>let</b> voting_records_v2 = <b>borrow_global</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_VotingRecordsV2">VotingRecordsV2</a>&gt;(@aptos_framework);
+        used_voting_power = *<a href="../../../aptos-stdlib/tests/compiler-v2-doc/smart_table.md#0x1_smart_table_borrow_with_default">smart_table::borrow_with_default</a>(&voting_records_v2.votes, record_key, &0);
+    };
+    <a href="aptos_governance.md#0x1_aptos_governance_get_voting_power">get_voting_power</a>(stake_pool) - used_voting_power
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_governance_create_proposal"></a>
+
+## Function `create_proposal`
+
+Create a single-step proposal with the backing <code>stake_pool</code>.
+@param execution_hash Required. This is the hash of the resolution script. When the proposal is resolved,
+only the exact script with matching hash can be successfully executed.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_create_proposal">create_proposal</a>(proposer: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, stake_pool: <b>address</b>, execution_hash: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, metadata_location: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, metadata_hash: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_create_proposal">create_proposal</a>(
+    proposer: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    stake_pool: <b>address</b>,
+    execution_hash: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    metadata_location: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    metadata_hash: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+) <b>acquires</b> <a href="aptos_governance.md#0x1_aptos_governance_GovernanceConfig">GovernanceConfig</a>, <a href="aptos_governance.md#0x1_aptos_governance_GovernanceEvents">GovernanceEvents</a> {
+    <a href="aptos_governance.md#0x1_aptos_governance_create_proposal_v2">create_proposal_v2</a>(proposer, stake_pool, execution_hash, metadata_location, metadata_hash, <b>false</b>);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_governance_create_proposal_v2"></a>
+
+## Function `create_proposal_v2`
+
+Create a single-step or multi-step proposal with the backing <code>stake_pool</code>.
+@param execution_hash Required. This is the hash of the resolution script. When the proposal is resolved,
+only the exact script with matching hash can be successfully executed.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_create_proposal_v2">create_proposal_v2</a>(proposer: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, stake_pool: <b>address</b>, execution_hash: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, metadata_location: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, metadata_hash: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, is_multi_step_proposal: bool)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_create_proposal_v2">create_proposal_v2</a>(
+    proposer: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    stake_pool: <b>address</b>,
+    execution_hash: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    metadata_location: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    metadata_hash: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    is_multi_step_proposal: bool,
+) <b>acquires</b> <a href="aptos_governance.md#0x1_aptos_governance_GovernanceConfig">GovernanceConfig</a>, <a href="aptos_governance.md#0x1_aptos_governance_GovernanceEvents">GovernanceEvents</a> {
+    <a href="aptos_governance.md#0x1_aptos_governance_create_proposal_v2_impl">create_proposal_v2_impl</a>(
+        proposer,
+        stake_pool,
+        execution_hash,
+        metadata_location,
+        metadata_hash,
+        is_multi_step_proposal
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_governance_create_proposal_v2_impl"></a>
+
+## Function `create_proposal_v2_impl`
+
+Create a single-step or multi-step proposal with the backing <code>stake_pool</code>.
+@param execution_hash Required. This is the hash of the resolution script. When the proposal is resolved,
+only the exact script with matching hash can be successfully executed.
+Return proposal_id when a proposal is successfully created.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_create_proposal_v2_impl">create_proposal_v2_impl</a>(proposer: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, stake_pool: <b>address</b>, execution_hash: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, metadata_location: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, metadata_hash: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, is_multi_step_proposal: bool): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_create_proposal_v2_impl">create_proposal_v2_impl</a>(
+    proposer: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    stake_pool: <b>address</b>,
+    execution_hash: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    metadata_location: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    metadata_hash: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    is_multi_step_proposal: bool,
+): u64 <b>acquires</b> <a href="aptos_governance.md#0x1_aptos_governance_GovernanceConfig">GovernanceConfig</a>, <a href="aptos_governance.md#0x1_aptos_governance_GovernanceEvents">GovernanceEvents</a> {
+    <b>let</b> proposer_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(proposer);
+    <b>assert</b>!(
+        <a href="stake.md#0x1_stake_get_delegated_voter">stake::get_delegated_voter</a>(stake_pool) == proposer_address,
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="aptos_governance.md#0x1_aptos_governance_ENOT_DELEGATED_VOTER">ENOT_DELEGATED_VOTER</a>)
+    );
+
+    // The proposer's <a href="stake.md#0x1_stake">stake</a> needs <b>to</b> be at least the required bond amount.
+    <b>let</b> governance_config = <b>borrow_global</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_GovernanceConfig">GovernanceConfig</a>&gt;(@aptos_framework);
+    <b>let</b> stake_balance = <a href="aptos_governance.md#0x1_aptos_governance_get_voting_power">get_voting_power</a>(stake_pool);
+    <b>assert</b>!(
+        stake_balance &gt;= governance_config.required_proposer_stake,
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="aptos_governance.md#0x1_aptos_governance_EINSUFFICIENT_PROPOSER_STAKE">EINSUFFICIENT_PROPOSER_STAKE</a>),
+    );
+
+    // The proposer's <a href="stake.md#0x1_stake">stake</a> needs <b>to</b> be locked up at least <b>as</b> long <b>as</b> the proposal's <a href="voting.md#0x1_voting">voting</a> period.
+    <b>let</b> current_time = <a href="timestamp.md#0x1_timestamp_now_seconds">timestamp::now_seconds</a>();
+    <b>let</b> proposal_expiration = current_time + governance_config.voting_duration_secs;
+    <b>assert</b>!(
+        <a href="stake.md#0x1_stake_get_lockup_secs">stake::get_lockup_secs</a>(stake_pool) &gt;= proposal_expiration,
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="aptos_governance.md#0x1_aptos_governance_EINSUFFICIENT_STAKE_LOCKUP">EINSUFFICIENT_STAKE_LOCKUP</a>),
+    );
+
+    // Create and validate proposal metadata.
+    <b>let</b> proposal_metadata = <a href="aptos_governance.md#0x1_aptos_governance_create_proposal_metadata">create_proposal_metadata</a>(metadata_location, metadata_hash);
+
+    // We want <b>to</b> allow early resolution of proposals <b>if</b> more than 50% of the total supply of the network coins
+    // <b>has</b> voted. This doesn't take into subsequent inflation/deflation (rewards are issued every epoch and gas fees
+    // are burnt after every transaction), but inflation/delation is very unlikely <b>to</b> have a major impact on total
+    // supply during the <a href="voting.md#0x1_voting">voting</a> period.
+    <b>let</b> total_voting_token_supply = <a href="coin.md#0x1_coin_supply">coin::supply</a>&lt;AptosCoin&gt;();
+    <b>let</b> early_resolution_vote_threshold = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>&lt;u128&gt;();
+    <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&total_voting_token_supply)) {
+        <b>let</b> total_supply = *<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(&total_voting_token_supply);
+        // 50% + 1 <b>to</b> avoid rounding errors.
+        early_resolution_vote_threshold = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(total_supply / 2 + 1);
+    };
+
+    <b>let</b> proposal_id = <a href="voting.md#0x1_voting_create_proposal_v2">voting::create_proposal_v2</a>(
+        proposer_address,
+        @aptos_framework,
+        <a href="governance_proposal.md#0x1_governance_proposal_create_proposal">governance_proposal::create_proposal</a>(),
+        execution_hash,
+        governance_config.min_voting_threshold,
+        proposal_expiration,
+        early_resolution_vote_threshold,
+        proposal_metadata,
+        is_multi_step_proposal,
+    );
+
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        <a href="event.md#0x1_event_emit">event::emit</a>(
+            <a href="aptos_governance.md#0x1_aptos_governance_CreateProposal">CreateProposal</a> {
+                proposal_id,
+                proposer: proposer_address,
+                stake_pool,
+                execution_hash,
+                proposal_metadata,
+            },
+        );
+    };
+    <b>let</b> events = <b>borrow_global_mut</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_GovernanceEvents">GovernanceEvents</a>&gt;(@aptos_framework);
+    <a href="event.md#0x1_event_emit_event">event::emit_event</a>&lt;<a href="aptos_governance.md#0x1_aptos_governance_CreateProposalEvent">CreateProposalEvent</a>&gt;(
+        &<b>mut</b> events.create_proposal_events,
+        <a href="aptos_governance.md#0x1_aptos_governance_CreateProposalEvent">CreateProposalEvent</a> {
+            proposal_id,
+            proposer: proposer_address,
+            stake_pool,
+            execution_hash,
+            proposal_metadata,
+        },
+    );
+    proposal_id
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_governance_batch_vote"></a>
+
+## Function `batch_vote`
+
+Vote on proposal with proposal_id and all voting power from multiple stake_pools.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_batch_vote">batch_vote</a>(voter: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, stake_pools: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;, proposal_id: u64, should_pass: bool)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_batch_vote">batch_vote</a>(
+    voter: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    stake_pools: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;,
+    proposal_id: u64,
+    should_pass: bool,
+) <b>acquires</b> <a href="aptos_governance.md#0x1_aptos_governance_ApprovedExecutionHashes">ApprovedExecutionHashes</a>, <a href="aptos_governance.md#0x1_aptos_governance_VotingRecords">VotingRecords</a>, <a href="aptos_governance.md#0x1_aptos_governance_VotingRecordsV2">VotingRecordsV2</a>, <a href="aptos_governance.md#0x1_aptos_governance_GovernanceEvents">GovernanceEvents</a> {
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_for_each">vector::for_each</a>(stake_pools, |stake_pool| {
+        <a href="aptos_governance.md#0x1_aptos_governance_vote_internal">vote_internal</a>(voter, stake_pool, proposal_id, <a href="aptos_governance.md#0x1_aptos_governance_MAX_U64">MAX_U64</a>, should_pass);
+    });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_governance_batch_partial_vote"></a>
+
+## Function `batch_partial_vote`
+
+Batch vote on proposal with proposal_id and specified voting power from multiple stake_pools.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_batch_partial_vote">batch_partial_vote</a>(voter: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, stake_pools: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;, proposal_id: u64, voting_power: u64, should_pass: bool)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_batch_partial_vote">batch_partial_vote</a>(
+    voter: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    stake_pools: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;,
+    proposal_id: u64,
+    voting_power: u64,
+    should_pass: bool,
+) <b>acquires</b> <a href="aptos_governance.md#0x1_aptos_governance_ApprovedExecutionHashes">ApprovedExecutionHashes</a>, <a href="aptos_governance.md#0x1_aptos_governance_VotingRecords">VotingRecords</a>, <a href="aptos_governance.md#0x1_aptos_governance_VotingRecordsV2">VotingRecordsV2</a>, <a href="aptos_governance.md#0x1_aptos_governance_GovernanceEvents">GovernanceEvents</a> {
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_for_each">vector::for_each</a>(stake_pools, |stake_pool| {
+        <a href="aptos_governance.md#0x1_aptos_governance_vote_internal">vote_internal</a>(voter, stake_pool, proposal_id, voting_power, should_pass);
+    });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_governance_vote"></a>
+
+## Function `vote`
+
+Vote on proposal with <code>proposal_id</code> and all voting power from <code>stake_pool</code>.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_vote">vote</a>(voter: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, stake_pool: <b>address</b>, proposal_id: u64, should_pass: bool)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_vote">vote</a>(
+    voter: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    stake_pool: <b>address</b>,
+    proposal_id: u64,
+    should_pass: bool,
+) <b>acquires</b> <a href="aptos_governance.md#0x1_aptos_governance_ApprovedExecutionHashes">ApprovedExecutionHashes</a>, <a href="aptos_governance.md#0x1_aptos_governance_VotingRecords">VotingRecords</a>, <a href="aptos_governance.md#0x1_aptos_governance_VotingRecordsV2">VotingRecordsV2</a>, <a href="aptos_governance.md#0x1_aptos_governance_GovernanceEvents">GovernanceEvents</a> {
+    <a href="aptos_governance.md#0x1_aptos_governance_vote_internal">vote_internal</a>(voter, stake_pool, proposal_id, <a href="aptos_governance.md#0x1_aptos_governance_MAX_U64">MAX_U64</a>, should_pass);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_governance_partial_vote"></a>
+
+## Function `partial_vote`
+
+Vote on proposal with <code>proposal_id</code> and specified voting power from <code>stake_pool</code>.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_partial_vote">partial_vote</a>(voter: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, stake_pool: <b>address</b>, proposal_id: u64, voting_power: u64, should_pass: bool)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_partial_vote">partial_vote</a>(
+    voter: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    stake_pool: <b>address</b>,
+    proposal_id: u64,
+    voting_power: u64,
+    should_pass: bool,
+) <b>acquires</b> <a href="aptos_governance.md#0x1_aptos_governance_ApprovedExecutionHashes">ApprovedExecutionHashes</a>, <a href="aptos_governance.md#0x1_aptos_governance_VotingRecords">VotingRecords</a>, <a href="aptos_governance.md#0x1_aptos_governance_VotingRecordsV2">VotingRecordsV2</a>, <a href="aptos_governance.md#0x1_aptos_governance_GovernanceEvents">GovernanceEvents</a> {
+    <a href="aptos_governance.md#0x1_aptos_governance_vote_internal">vote_internal</a>(voter, stake_pool, proposal_id, voting_power, should_pass);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_governance_vote_internal"></a>
+
+## Function `vote_internal`
+
+Vote on proposal with <code>proposal_id</code> and specified voting_power from <code>stake_pool</code>.
+If voting_power is more than all the left voting power of <code>stake_pool</code>, use all the left voting power.
+If a stake pool has already voted on a proposal before partial governance voting is enabled, the stake pool
+cannot vote on the proposal even after partial governance voting is enabled.
+
+
+<pre><code><b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_vote_internal">vote_internal</a>(voter: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, stake_pool: <b>address</b>, proposal_id: u64, voting_power: u64, should_pass: bool)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_vote_internal">vote_internal</a>(
+    voter: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    stake_pool: <b>address</b>,
+    proposal_id: u64,
+    voting_power: u64,
+    should_pass: bool,
+) <b>acquires</b> <a href="aptos_governance.md#0x1_aptos_governance_ApprovedExecutionHashes">ApprovedExecutionHashes</a>, <a href="aptos_governance.md#0x1_aptos_governance_VotingRecords">VotingRecords</a>, <a href="aptos_governance.md#0x1_aptos_governance_VotingRecordsV2">VotingRecordsV2</a>, <a href="aptos_governance.md#0x1_aptos_governance_GovernanceEvents">GovernanceEvents</a> {
+    <b>let</b> voter_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(voter);
+    <b>assert</b>!(<a href="stake.md#0x1_stake_get_delegated_voter">stake::get_delegated_voter</a>(stake_pool) == voter_address, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="aptos_governance.md#0x1_aptos_governance_ENOT_DELEGATED_VOTER">ENOT_DELEGATED_VOTER</a>));
+
+    // The voter's <a href="stake.md#0x1_stake">stake</a> needs <b>to</b> be locked up at least <b>as</b> long <b>as</b> the proposal's expiration.
+    <b>let</b> proposal_expiration = <a href="voting.md#0x1_voting_get_proposal_expiration_secs">voting::get_proposal_expiration_secs</a>&lt;GovernanceProposal&gt;(
+        @aptos_framework,
+        proposal_id
+    );
+    <b>assert</b>!(
+        <a href="stake.md#0x1_stake_get_lockup_secs">stake::get_lockup_secs</a>(stake_pool) &gt;= proposal_expiration,
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="aptos_governance.md#0x1_aptos_governance_EINSUFFICIENT_STAKE_LOCKUP">EINSUFFICIENT_STAKE_LOCKUP</a>),
+    );
+
+    // If a <a href="stake.md#0x1_stake">stake</a> pool <b>has</b> already voted on a proposal before partial governance <a href="voting.md#0x1_voting">voting</a> is enabled,
+    // `get_remaining_voting_power` returns 0.
+    <b>let</b> staking_pool_voting_power = <a href="aptos_governance.md#0x1_aptos_governance_get_remaining_voting_power">get_remaining_voting_power</a>(stake_pool, proposal_id);
+    voting_power = <b>min</b>(voting_power, staking_pool_voting_power);
+
+    // Short-circuit <b>if</b> the voter <b>has</b> no <a href="voting.md#0x1_voting">voting</a> power.
+    <b>assert</b>!(voting_power &gt; 0, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="aptos_governance.md#0x1_aptos_governance_ENO_VOTING_POWER">ENO_VOTING_POWER</a>));
+
+    <a href="voting.md#0x1_voting_vote">voting::vote</a>&lt;GovernanceProposal&gt;(
+        &<a href="governance_proposal.md#0x1_governance_proposal_create_empty_proposal">governance_proposal::create_empty_proposal</a>(),
+        @aptos_framework,
+        proposal_id,
+        voting_power,
+        should_pass,
+    );
+
+    <b>let</b> record_key = <a href="aptos_governance.md#0x1_aptos_governance_RecordKey">RecordKey</a> {
+        stake_pool,
+        proposal_id,
+    };
+    <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_partial_governance_voting_enabled">features::partial_governance_voting_enabled</a>()) {
+        <b>let</b> voting_records_v2 = <b>borrow_global_mut</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_VotingRecordsV2">VotingRecordsV2</a>&gt;(@aptos_framework);
+        <b>let</b> used_voting_power = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/smart_table.md#0x1_smart_table_borrow_mut_with_default">smart_table::borrow_mut_with_default</a>(&<b>mut</b> voting_records_v2.votes, record_key, 0);
+        // This calculation should never overflow because the used <a href="voting.md#0x1_voting">voting</a> cannot exceed the total <a href="voting.md#0x1_voting">voting</a> power of this <a href="stake.md#0x1_stake">stake</a> pool.
+        *used_voting_power = *used_voting_power + voting_power;
+    } <b>else</b> {
+        <b>let</b> voting_records = <b>borrow_global_mut</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_VotingRecords">VotingRecords</a>&gt;(@aptos_framework);
+        <b>assert</b>!(
+            !<a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_contains">table::contains</a>(&voting_records.votes, record_key),
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="aptos_governance.md#0x1_aptos_governance_EALREADY_VOTED">EALREADY_VOTED</a>));
+        <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_add">table::add</a>(&<b>mut</b> voting_records.votes, record_key, <b>true</b>);
+    };
+
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        <a href="event.md#0x1_event_emit">event::emit</a>(
+            <a href="aptos_governance.md#0x1_aptos_governance_Vote">Vote</a> {
+                proposal_id,
+                voter: voter_address,
+                stake_pool,
+                num_votes: voting_power,
+                should_pass,
+            },
+        );
+    };
+    <b>let</b> events = <b>borrow_global_mut</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_GovernanceEvents">GovernanceEvents</a>&gt;(@aptos_framework);
+    <a href="event.md#0x1_event_emit_event">event::emit_event</a>&lt;<a href="aptos_governance.md#0x1_aptos_governance_VoteEvent">VoteEvent</a>&gt;(
+        &<b>mut</b> events.vote_events,
+        <a href="aptos_governance.md#0x1_aptos_governance_VoteEvent">VoteEvent</a> {
+            proposal_id,
+            voter: voter_address,
+            stake_pool,
+            num_votes: voting_power,
+            should_pass,
+        },
+    );
+
+    <b>let</b> proposal_state = <a href="voting.md#0x1_voting_get_proposal_state">voting::get_proposal_state</a>&lt;GovernanceProposal&gt;(@aptos_framework, proposal_id);
+    <b>if</b> (proposal_state == <a href="aptos_governance.md#0x1_aptos_governance_PROPOSAL_STATE_SUCCEEDED">PROPOSAL_STATE_SUCCEEDED</a>) {
+        <a href="aptos_governance.md#0x1_aptos_governance_add_approved_script_hash">add_approved_script_hash</a>(proposal_id);
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_governance_add_approved_script_hash_script"></a>
+
+## Function `add_approved_script_hash_script`
+
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_add_approved_script_hash_script">add_approved_script_hash_script</a>(proposal_id: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_add_approved_script_hash_script">add_approved_script_hash_script</a>(proposal_id: u64) <b>acquires</b> <a href="aptos_governance.md#0x1_aptos_governance_ApprovedExecutionHashes">ApprovedExecutionHashes</a> {
+    <a href="aptos_governance.md#0x1_aptos_governance_add_approved_script_hash">add_approved_script_hash</a>(proposal_id)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_governance_add_approved_script_hash"></a>
+
+## Function `add_approved_script_hash`
+
+Add the execution script hash of a successful governance proposal to the approved list.
+This is needed to bypass the mempool transaction size limit for approved governance proposal transactions that
+are too large (e.g. module upgrades).
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_add_approved_script_hash">add_approved_script_hash</a>(proposal_id: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_add_approved_script_hash">add_approved_script_hash</a>(proposal_id: u64) <b>acquires</b> <a href="aptos_governance.md#0x1_aptos_governance_ApprovedExecutionHashes">ApprovedExecutionHashes</a> {
+    <b>let</b> approved_hashes = <b>borrow_global_mut</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_ApprovedExecutionHashes">ApprovedExecutionHashes</a>&gt;(@aptos_framework);
+
+    // Ensure the proposal can be resolved.
+    <b>let</b> proposal_state = <a href="voting.md#0x1_voting_get_proposal_state">voting::get_proposal_state</a>&lt;GovernanceProposal&gt;(@aptos_framework, proposal_id);
+    <b>assert</b>!(proposal_state == <a href="aptos_governance.md#0x1_aptos_governance_PROPOSAL_STATE_SUCCEEDED">PROPOSAL_STATE_SUCCEEDED</a>, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="aptos_governance.md#0x1_aptos_governance_EPROPOSAL_NOT_RESOLVABLE_YET">EPROPOSAL_NOT_RESOLVABLE_YET</a>));
+
+    <b>let</b> execution_hash = <a href="voting.md#0x1_voting_get_execution_hash">voting::get_execution_hash</a>&lt;GovernanceProposal&gt;(@aptos_framework, proposal_id);
+
+    // If this is a multi-step proposal, the proposal id will already exist in the <a href="aptos_governance.md#0x1_aptos_governance_ApprovedExecutionHashes">ApprovedExecutionHashes</a> map.
+    // We will <b>update</b> execution <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/hash.md#0x1_hash">hash</a> in <a href="aptos_governance.md#0x1_aptos_governance_ApprovedExecutionHashes">ApprovedExecutionHashes</a> <b>to</b> be the next_execution_hash.
+    <b>if</b> (<a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_contains_key">simple_map::contains_key</a>(&approved_hashes.hashes, &proposal_id)) {
+        <b>let</b> current_execution_hash = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_borrow_mut">simple_map::borrow_mut</a>(&<b>mut</b> approved_hashes.hashes, &proposal_id);
+        *current_execution_hash = execution_hash;
+    } <b>else</b> {
+        <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_add">simple_map::add</a>(&<b>mut</b> approved_hashes.hashes, proposal_id, execution_hash);
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_governance_resolve"></a>
+
+## Function `resolve`
+
+Resolve a successful single-step proposal. This would fail if the proposal is not successful (not enough votes or more no
+than yes).
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_resolve">resolve</a>(proposal_id: u64, signer_address: <b>address</b>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_resolve">resolve</a>(
+    proposal_id: u64,
+    signer_address: <b>address</b>
+): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a> <b>acquires</b> <a href="aptos_governance.md#0x1_aptos_governance_ApprovedExecutionHashes">ApprovedExecutionHashes</a>, <a href="aptos_governance.md#0x1_aptos_governance_GovernanceResponsbility">GovernanceResponsbility</a> {
+    <a href="voting.md#0x1_voting_resolve">voting::resolve</a>&lt;GovernanceProposal&gt;(@aptos_framework, proposal_id);
+    <a href="aptos_governance.md#0x1_aptos_governance_remove_approved_hash">remove_approved_hash</a>(proposal_id);
+    <a href="aptos_governance.md#0x1_aptos_governance_get_signer">get_signer</a>(signer_address)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_governance_resolve_multi_step_proposal"></a>
+
+## Function `resolve_multi_step_proposal`
+
+Resolve a successful multi-step proposal. This would fail if the proposal is not successful.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_resolve_multi_step_proposal">resolve_multi_step_proposal</a>(proposal_id: u64, signer_address: <b>address</b>, next_execution_hash: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_resolve_multi_step_proposal">resolve_multi_step_proposal</a>(
+    proposal_id: u64,
+    signer_address: <b>address</b>,
+    next_execution_hash: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a> <b>acquires</b> <a href="aptos_governance.md#0x1_aptos_governance_GovernanceResponsbility">GovernanceResponsbility</a>, <a href="aptos_governance.md#0x1_aptos_governance_ApprovedExecutionHashes">ApprovedExecutionHashes</a> {
+    <a href="voting.md#0x1_voting_resolve_proposal_v2">voting::resolve_proposal_v2</a>&lt;GovernanceProposal&gt;(@aptos_framework, proposal_id, next_execution_hash);
+    // If the current step is the last step of this multi-step proposal,
+    // we will remove the execution <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/hash.md#0x1_hash">hash</a> from the <a href="aptos_governance.md#0x1_aptos_governance_ApprovedExecutionHashes">ApprovedExecutionHashes</a> map.
+    <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&next_execution_hash) == 0) {
+        <a href="aptos_governance.md#0x1_aptos_governance_remove_approved_hash">remove_approved_hash</a>(proposal_id);
+    } <b>else</b> {
+        // If the current step is not the last step of this proposal,
+        // we replace the current execution <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/hash.md#0x1_hash">hash</a> <b>with</b> the next execution <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/hash.md#0x1_hash">hash</a>
+        // in the <a href="aptos_governance.md#0x1_aptos_governance_ApprovedExecutionHashes">ApprovedExecutionHashes</a> map.
+        <a href="aptos_governance.md#0x1_aptos_governance_add_approved_script_hash">add_approved_script_hash</a>(proposal_id)
+    };
+    <a href="aptos_governance.md#0x1_aptos_governance_get_signer">get_signer</a>(signer_address)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_governance_remove_approved_hash"></a>
+
+## Function `remove_approved_hash`
+
+Remove an approved proposal's execution script hash.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_remove_approved_hash">remove_approved_hash</a>(proposal_id: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_remove_approved_hash">remove_approved_hash</a>(proposal_id: u64) <b>acquires</b> <a href="aptos_governance.md#0x1_aptos_governance_ApprovedExecutionHashes">ApprovedExecutionHashes</a> {
+    <b>assert</b>!(
+        <a href="voting.md#0x1_voting_is_resolved">voting::is_resolved</a>&lt;GovernanceProposal&gt;(@aptos_framework, proposal_id),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="aptos_governance.md#0x1_aptos_governance_EPROPOSAL_NOT_RESOLVED_YET">EPROPOSAL_NOT_RESOLVED_YET</a>),
+    );
+
+    <b>let</b> approved_hashes = &<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_ApprovedExecutionHashes">ApprovedExecutionHashes</a>&gt;(@aptos_framework).hashes;
+    <b>if</b> (<a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_contains_key">simple_map::contains_key</a>(approved_hashes, &proposal_id)) {
+        <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_remove">simple_map::remove</a>(approved_hashes, &proposal_id);
+    };
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_governance_reconfigure"></a>
+
+## Function `reconfigure`
+
+Manually reconfigure. Called at the end of a governance txn that alters on-chain configs.
+
+WARNING: this function always ensures a reconfiguration starts, but when the reconfiguration finishes depends.
+- If feature <code>RECONFIGURE_WITH_DKG</code> is disabled, it finishes immediately.
+- At the end of the calling transaction, we will be in a new epoch.
+- If feature <code>RECONFIGURE_WITH_DKG</code> is enabled, it starts DKG, and the new epoch will start in a block prologue after DKG finishes.
+
+This behavior affects when an update of an on-chain config (e.g. <code>ConsensusConfig</code>, <code>Features</code>) takes effect,
+since such updates are applied whenever we enter an new epoch.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_reconfigure">reconfigure</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_reconfigure">reconfigure</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>) {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(aptos_framework);
+    <b>if</b> (<a href="consensus_config.md#0x1_consensus_config_validator_txn_enabled">consensus_config::validator_txn_enabled</a>() && <a href="randomness_config.md#0x1_randomness_config_enabled">randomness_config::enabled</a>()) {
+        <a href="reconfiguration_with_dkg.md#0x1_reconfiguration_with_dkg_try_start">reconfiguration_with_dkg::try_start</a>();
+    } <b>else</b> {
+        <a href="reconfiguration_with_dkg.md#0x1_reconfiguration_with_dkg_finish">reconfiguration_with_dkg::finish</a>(aptos_framework);
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_governance_force_end_epoch"></a>
+
+## Function `force_end_epoch`
+
+Change epoch immediately.
+If <code>RECONFIGURE_WITH_DKG</code> is enabled and we are in the middle of a DKG,
+stop waiting for DKG and enter the new epoch without randomness.
+
+WARNING: currently only used by tests. In most cases you should use <code><a href="aptos_governance.md#0x1_aptos_governance_reconfigure">reconfigure</a>()</code> instead.
+TODO: migrate these tests to be aware of async reconfiguration.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_force_end_epoch">force_end_epoch</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_force_end_epoch">force_end_epoch</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>) {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(aptos_framework);
+    <a href="reconfiguration_with_dkg.md#0x1_reconfiguration_with_dkg_finish">reconfiguration_with_dkg::finish</a>(aptos_framework);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_governance_force_end_epoch_test_only"></a>
+
+## Function `force_end_epoch_test_only`
+
+<code><a href="aptos_governance.md#0x1_aptos_governance_force_end_epoch">force_end_epoch</a>()</code> equivalent but only called in testnet,
+where the core resources account exists and has been granted power to mint Aptos coins.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_force_end_epoch_test_only">force_end_epoch_test_only</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_force_end_epoch_test_only">force_end_epoch_test_only</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>) <b>acquires</b> <a href="aptos_governance.md#0x1_aptos_governance_GovernanceResponsbility">GovernanceResponsbility</a> {
+    <b>let</b> core_signer = <a href="aptos_governance.md#0x1_aptos_governance_get_signer_testnet_only">get_signer_testnet_only</a>(aptos_framework, @0x1);
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(&core_signer);
+    <a href="reconfiguration_with_dkg.md#0x1_reconfiguration_with_dkg_finish">reconfiguration_with_dkg::finish</a>(&core_signer);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_governance_toggle_features"></a>
+
+## Function `toggle_features`
+
+Update feature flags and also trigger reconfiguration.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_toggle_features">toggle_features</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, enable: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u64&gt;, disable: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u64&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_toggle_features">toggle_features</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, enable: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u64&gt;, disable: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u64&gt;) {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(aptos_framework);
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_change_feature_flags_for_next_epoch">features::change_feature_flags_for_next_epoch</a>(aptos_framework, enable, disable);
+    <a href="aptos_governance.md#0x1_aptos_governance_reconfigure">reconfigure</a>(aptos_framework);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_governance_get_signer_testnet_only"></a>
+
+## Function `get_signer_testnet_only`
+
+Only called in testnet where the core resources account exists and has been granted power to mint Aptos coins.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_get_signer_testnet_only">get_signer_testnet_only</a>(core_resources: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, signer_address: <b>address</b>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_get_signer_testnet_only">get_signer_testnet_only</a>(
+    core_resources: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, signer_address: <b>address</b>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a> <b>acquires</b> <a href="aptos_governance.md#0x1_aptos_governance_GovernanceResponsbility">GovernanceResponsbility</a> {
+    <a href="system_addresses.md#0x1_system_addresses_assert_core_resource">system_addresses::assert_core_resource</a>(core_resources);
+    // Core resources <a href="account.md#0x1_account">account</a> only <b>has</b> mint <a href="../../../aptos-stdlib/tests/compiler-v2-doc/capability.md#0x1_capability">capability</a> in tests/testnets.
+    <b>assert</b>!(<a href="aptos_coin.md#0x1_aptos_coin_has_mint_capability">aptos_coin::has_mint_capability</a>(core_resources), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_unauthenticated">error::unauthenticated</a>(<a href="aptos_governance.md#0x1_aptos_governance_EUNAUTHORIZED">EUNAUTHORIZED</a>));
+    <a href="aptos_governance.md#0x1_aptos_governance_get_signer">get_signer</a>(signer_address)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_governance_get_voting_power"></a>
+
+## Function `get_voting_power`
+
+Return the voting power a stake pool has with respect to governance proposals.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_get_voting_power">get_voting_power</a>(pool_address: <b>address</b>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_get_voting_power">get_voting_power</a>(pool_address: <b>address</b>): u64 {
+    <b>let</b> allow_validator_set_change = <a href="staking_config.md#0x1_staking_config_get_allow_validator_set_change">staking_config::get_allow_validator_set_change</a>(&<a href="staking_config.md#0x1_staking_config_get">staking_config::get</a>());
+    <b>if</b> (allow_validator_set_change) {
+        <b>let</b> (active, _, pending_active, pending_inactive) = <a href="stake.md#0x1_stake_get_stake">stake::get_stake</a>(pool_address);
+        // We calculate the <a href="voting.md#0x1_voting">voting</a> power <b>as</b> total non-inactive stakes of the pool. Even <b>if</b> the validator is not in the
+        // active validator set, <b>as</b> long <b>as</b> they have a lockup (separately checked in create_proposal and <a href="voting.md#0x1_voting">voting</a>), their
+        // <a href="stake.md#0x1_stake">stake</a> would still count in their <a href="voting.md#0x1_voting">voting</a> power for governance proposals.
+        active + pending_active + pending_inactive
+    } <b>else</b> {
+        <a href="stake.md#0x1_stake_get_current_epoch_voting_power">stake::get_current_epoch_voting_power</a>(pool_address)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_governance_get_signer"></a>
+
+## Function `get_signer`
+
+Return a signer for making changes to 0x1 as part of on-chain governance proposal process.
+
+
+<pre><code><b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_get_signer">get_signer</a>(signer_address: <b>address</b>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_get_signer">get_signer</a>(signer_address: <b>address</b>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a> <b>acquires</b> <a href="aptos_governance.md#0x1_aptos_governance_GovernanceResponsbility">GovernanceResponsbility</a> {
+    <b>let</b> governance_responsibility = <b>borrow_global</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_GovernanceResponsbility">GovernanceResponsbility</a>&gt;(@aptos_framework);
+    <b>let</b> signer_cap = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_borrow">simple_map::borrow</a>(&governance_responsibility.signer_caps, &signer_address);
+    create_signer_with_capability(signer_cap)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_governance_create_proposal_metadata"></a>
+
+## Function `create_proposal_metadata`
+
+
+
+<pre><code><b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_create_proposal_metadata">create_proposal_metadata</a>(metadata_location: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, metadata_hash: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_create_proposal_metadata">create_proposal_metadata</a>(
+    metadata_location: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    metadata_hash: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+): SimpleMap&lt;String, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt; {
+    <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_length">string::length</a>(&utf8(metadata_location)) &lt;= 256, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="aptos_governance.md#0x1_aptos_governance_EMETADATA_LOCATION_TOO_LONG">EMETADATA_LOCATION_TOO_LONG</a>));
+    <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_length">string::length</a>(&utf8(metadata_hash)) &lt;= 256, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="aptos_governance.md#0x1_aptos_governance_EMETADATA_HASH_TOO_LONG">EMETADATA_HASH_TOO_LONG</a>));
+
+    <b>let</b> metadata = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_create">simple_map::create</a>&lt;String, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;();
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_add">simple_map::add</a>(&<b>mut</b> metadata, utf8(<a href="aptos_governance.md#0x1_aptos_governance_METADATA_LOCATION_KEY">METADATA_LOCATION_KEY</a>), metadata_location);
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_add">simple_map::add</a>(&<b>mut</b> metadata, utf8(<a href="aptos_governance.md#0x1_aptos_governance_METADATA_HASH_KEY">METADATA_HASH_KEY</a>), metadata_hash);
+    metadata
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_governance_assert_voting_initialization"></a>
+
+## Function `assert_voting_initialization`
+
+
+
+<pre><code><b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_assert_voting_initialization">assert_voting_initialization</a>()
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_assert_voting_initialization">assert_voting_initialization</a>() {
+    <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_partial_governance_voting_enabled">features::partial_governance_voting_enabled</a>()) {
+        <b>assert</b>!(<b>exists</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_VotingRecordsV2">VotingRecordsV2</a>&gt;(@aptos_framework), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="aptos_governance.md#0x1_aptos_governance_EPARTIAL_VOTING_NOT_INITIALIZED">EPARTIAL_VOTING_NOT_INITIALIZED</a>));
+    };
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+
+
+<a id="high-level-req"></a>
+
+### High-level Requirements
+
+<table>
+<tr>
+<th>No.</th><th>Requirement</th><th>Criticality</th><th>Implementation</th><th>Enforcement</th>
+</tr>
+
+<tr>
+<td>1</td>
+<td>The create proposal function calls create proposal v2.</td>
+<td>Low</td>
+<td>The create_proposal function internally calls create_proposal_v2.</td>
+<td>This is manually audited to ensure create_proposal_v2 is called in create_proposal.</td>
+</tr>
+
+<tr>
+<td>2</td>
+<td>The proposer must have a stake equal to or greater than the required bond amount.</td>
+<td>High</td>
+<td>The create_proposal_v2 function verifies that the stake balance equals or exceeds the required proposer stake amount.</td>
+<td>Formally verified in <a href="#high-level-req-2">CreateProposalAbortsIf</a>.</td>
+</tr>
+
+<tr>
+<td>3</td>
+<td>The Approved execution hashes resources that exist when the vote function is called.</td>
+<td>Low</td>
+<td>The Vote function acquires the Approved execution hashes resources.</td>
+<td>Formally verified in <a href="#high-level-req-3">VoteAbortIf</a>.</td>
+</tr>
+
+<tr>
+<td>4</td>
+<td>The execution script hash of a successful governance proposal is added to the approved list if the proposal can be resolved.</td>
+<td>Medium</td>
+<td>The add_approved_script_hash function asserts that proposal_state == PROPOSAL_STATE_SUCCEEDED.</td>
+<td>Formally verified in <a href="#high-level-req-4">AddApprovedScriptHash</a>.</td>
+</tr>
+
+</table>
+
+
+
+
+<a id="module-level-spec"></a>
+
+### Module-level Specification
+
+
+<pre><code><b>pragma</b> verify = <b>true</b>;
+<b>pragma</b> aborts_if_is_strict;
+</code></pre>
+
+
+
+<a id="@Specification_1_store_signer_cap"></a>
+
+### Function `store_signer_cap`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_store_signer_cap">store_signer_cap</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, signer_address: <b>address</b>, signer_cap: <a href="account.md#0x1_account_SignerCapability">account::SignerCapability</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<a href="system_addresses.md#0x1_system_addresses_is_aptos_framework_address">system_addresses::is_aptos_framework_address</a>(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(aptos_framework));
+<b>aborts_if</b> !<a href="system_addresses.md#0x1_system_addresses_is_framework_reserved_address">system_addresses::is_framework_reserved_address</a>(signer_address);
+<b>let</b> signer_caps = <b>global</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_GovernanceResponsbility">GovernanceResponsbility</a>&gt;(@aptos_framework).signer_caps;
+<b>aborts_if</b> <b>exists</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_GovernanceResponsbility">GovernanceResponsbility</a>&gt;(@aptos_framework) &&
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(signer_caps, signer_address);
+<b>ensures</b> <b>exists</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_GovernanceResponsbility">GovernanceResponsbility</a>&gt;(@aptos_framework);
+<b>let</b> <b>post</b> post_signer_caps = <b>global</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_GovernanceResponsbility">GovernanceResponsbility</a>&gt;(@aptos_framework).signer_caps;
+<b>ensures</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(post_signer_caps, signer_address);
+</code></pre>
+
+
+
+<a id="@Specification_1_initialize"></a>
+
+### Function `initialize`
+
+
+<pre><code><b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_initialize">initialize</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, min_voting_threshold: u128, required_proposer_stake: u64, voting_duration_secs: u64)
+</code></pre>
+
+
+Signer address must be @aptos_framework.
+The signer does not allow these resources (GovernanceProposal, GovernanceConfig, GovernanceEvents, VotingRecords, ApprovedExecutionHashes) to exist.
+The signer must have an Account.
+Limit addition overflow.
+
+
+<pre><code><b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(aptos_framework);
+<b>let</b> register_account = <b>global</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(addr);
+<b>aborts_if</b> <b>exists</b>&lt;<a href="voting.md#0x1_voting_VotingForum">voting::VotingForum</a>&lt;GovernanceProposal&gt;&gt;(addr);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(addr);
+<b>aborts_if</b> register_account.guid_creation_num + 7 &gt; <a href="aptos_governance.md#0x1_aptos_governance_MAX_U64">MAX_U64</a>;
+<b>aborts_if</b> register_account.guid_creation_num + 7 &gt;= <a href="account.md#0x1_account_MAX_GUID_CREATION_NUM">account::MAX_GUID_CREATION_NUM</a>;
+<b>aborts_if</b> !<a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_spec_is_struct">type_info::spec_is_struct</a>&lt;GovernanceProposal&gt;();
+<b>include</b> <a href="aptos_governance.md#0x1_aptos_governance_InitializeAbortIf">InitializeAbortIf</a>;
+<b>ensures</b> <b>exists</b>&lt;<a href="voting.md#0x1_voting_VotingForum">voting::VotingForum</a>&lt;<a href="governance_proposal.md#0x1_governance_proposal_GovernanceProposal">governance_proposal::GovernanceProposal</a>&gt;&gt;(addr);
+<b>ensures</b> <b>exists</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_GovernanceConfig">GovernanceConfig</a>&gt;(addr);
+<b>ensures</b> <b>exists</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_GovernanceEvents">GovernanceEvents</a>&gt;(addr);
+<b>ensures</b> <b>exists</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_VotingRecords">VotingRecords</a>&gt;(addr);
+<b>ensures</b> <b>exists</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_ApprovedExecutionHashes">ApprovedExecutionHashes</a>&gt;(addr);
+</code></pre>
+
+
+
+<a id="@Specification_1_update_governance_config"></a>
+
+### Function `update_governance_config`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_update_governance_config">update_governance_config</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, min_voting_threshold: u128, required_proposer_stake: u64, voting_duration_secs: u64)
+</code></pre>
+
+
+Signer address must be @aptos_framework.
+Address @aptos_framework must exist GovernanceConfig and GovernanceEvents.
+
+
+<pre><code><b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(aptos_framework);
+<b>let</b> governance_config = <b>global</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_GovernanceConfig">GovernanceConfig</a>&gt;(@aptos_framework);
+<b>let</b> <b>post</b> new_governance_config = <b>global</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_GovernanceConfig">GovernanceConfig</a>&gt;(@aptos_framework);
+<b>aborts_if</b> addr != @aptos_framework;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_GovernanceConfig">GovernanceConfig</a>&gt;(@aptos_framework);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_GovernanceEvents">GovernanceEvents</a>&gt;(@aptos_framework);
+<b>modifies</b> <b>global</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_GovernanceConfig">GovernanceConfig</a>&gt;(addr);
+<b>ensures</b> new_governance_config.voting_duration_secs == voting_duration_secs;
+<b>ensures</b> new_governance_config.min_voting_threshold == min_voting_threshold;
+<b>ensures</b> new_governance_config.required_proposer_stake == required_proposer_stake;
+</code></pre>
+
+
+
+<a id="@Specification_1_initialize_partial_voting"></a>
+
+### Function `initialize_partial_voting`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_initialize_partial_voting">initialize_partial_voting</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+Signer address must be @aptos_framework.
+Abort if structs have already been created.
+
+
+<pre><code><b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(aptos_framework);
+<b>aborts_if</b> addr != @aptos_framework;
+<b>aborts_if</b> <b>exists</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_VotingRecordsV2">VotingRecordsV2</a>&gt;(@aptos_framework);
+<b>ensures</b> <b>exists</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_VotingRecordsV2">VotingRecordsV2</a>&gt;(@aptos_framework);
+</code></pre>
+
+
+
+
+<a id="0x1_aptos_governance_InitializeAbortIf"></a>
+
+
+<pre><code><b>schema</b> <a href="aptos_governance.md#0x1_aptos_governance_InitializeAbortIf">InitializeAbortIf</a> {
+    aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>;
+    min_voting_threshold: u128;
+    required_proposer_stake: u64;
+    voting_duration_secs: u64;
+    <b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(aptos_framework);
+    <b>let</b> <a href="account.md#0x1_account">account</a> = <b>global</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(addr);
+    <b>aborts_if</b> addr != @aptos_framework;
+    <b>aborts_if</b> <b>exists</b>&lt;<a href="voting.md#0x1_voting_VotingForum">voting::VotingForum</a>&lt;<a href="governance_proposal.md#0x1_governance_proposal_GovernanceProposal">governance_proposal::GovernanceProposal</a>&gt;&gt;(addr);
+    <b>aborts_if</b> <b>exists</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_GovernanceConfig">GovernanceConfig</a>&gt;(addr);
+    <b>aborts_if</b> <b>exists</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_GovernanceEvents">GovernanceEvents</a>&gt;(addr);
+    <b>aborts_if</b> <b>exists</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_VotingRecords">VotingRecords</a>&gt;(addr);
+    <b>aborts_if</b> <b>exists</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_ApprovedExecutionHashes">ApprovedExecutionHashes</a>&gt;(addr);
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(addr);
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_get_voting_duration_secs"></a>
+
+### Function `get_voting_duration_secs`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_get_voting_duration_secs">get_voting_duration_secs</a>(): u64
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="aptos_governance.md#0x1_aptos_governance_AbortsIfNotGovernanceConfig">AbortsIfNotGovernanceConfig</a>;
+</code></pre>
+
+
+
+<a id="@Specification_1_get_min_voting_threshold"></a>
+
+### Function `get_min_voting_threshold`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_get_min_voting_threshold">get_min_voting_threshold</a>(): u128
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="aptos_governance.md#0x1_aptos_governance_AbortsIfNotGovernanceConfig">AbortsIfNotGovernanceConfig</a>;
+</code></pre>
+
+
+
+<a id="@Specification_1_get_required_proposer_stake"></a>
+
+### Function `get_required_proposer_stake`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_get_required_proposer_stake">get_required_proposer_stake</a>(): u64
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="aptos_governance.md#0x1_aptos_governance_AbortsIfNotGovernanceConfig">AbortsIfNotGovernanceConfig</a>;
+</code></pre>
+
+
+
+
+<a id="0x1_aptos_governance_AbortsIfNotGovernanceConfig"></a>
+
+
+<pre><code><b>schema</b> <a href="aptos_governance.md#0x1_aptos_governance_AbortsIfNotGovernanceConfig">AbortsIfNotGovernanceConfig</a> {
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_GovernanceConfig">GovernanceConfig</a>&gt;(@aptos_framework);
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_has_entirely_voted"></a>
+
+### Function `has_entirely_voted`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_has_entirely_voted">has_entirely_voted</a>(stake_pool: <b>address</b>, proposal_id: u64): bool
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_VotingRecords">VotingRecords</a>&gt;(@aptos_framework);
+</code></pre>
+
+
+
+<a id="@Specification_1_get_remaining_voting_power"></a>
+
+### Function `get_remaining_voting_power`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_get_remaining_voting_power">get_remaining_voting_power</a>(stake_pool: <b>address</b>, proposal_id: u64): u64
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_spec_partial_governance_voting_enabled">features::spec_partial_governance_voting_enabled</a>() && !<b>exists</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_VotingRecordsV2">VotingRecordsV2</a>&gt;(@aptos_framework);
+<b>include</b> <a href="voting.md#0x1_voting_AbortsIfNotContainProposalID">voting::AbortsIfNotContainProposalID</a>&lt;GovernanceProposal&gt; {
+    voting_forum_address: @aptos_framework
+};
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="stake.md#0x1_stake_StakePool">stake::StakePool</a>&gt;(stake_pool);
+<b>aborts_if</b> spec_proposal_expiration &lt;= locked_until && !<b>exists</b>&lt;<a href="timestamp.md#0x1_timestamp_CurrentTimeMicroseconds">timestamp::CurrentTimeMicroseconds</a>&gt;(@aptos_framework);
+<b>let</b> spec_proposal_expiration = <a href="voting.md#0x1_voting_spec_get_proposal_expiration_secs">voting::spec_get_proposal_expiration_secs</a>&lt;GovernanceProposal&gt;(@aptos_framework, proposal_id);
+<b>let</b> locked_until = <b>global</b>&lt;<a href="stake.md#0x1_stake_StakePool">stake::StakePool</a>&gt;(stake_pool).locked_until_secs;
+<b>let</b> remain_zero_1_cond = (spec_proposal_expiration &gt; locked_until || <a href="timestamp.md#0x1_timestamp_spec_now_seconds">timestamp::spec_now_seconds</a>() &gt; spec_proposal_expiration);
+<b>ensures</b> remain_zero_1_cond ==&gt; result == 0;
+<b>let</b> record_key = <a href="aptos_governance.md#0x1_aptos_governance_RecordKey">RecordKey</a> {
+    stake_pool,
+    proposal_id,
+};
+<b>let</b> entirely_voted = <a href="aptos_governance.md#0x1_aptos_governance_spec_has_entirely_voted">spec_has_entirely_voted</a>(stake_pool, proposal_id, record_key);
+<b>aborts_if</b> !remain_zero_1_cond && !<b>exists</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_VotingRecords">VotingRecords</a>&gt;(@aptos_framework);
+<b>include</b> !remain_zero_1_cond && !entirely_voted ==&gt; <a href="aptos_governance.md#0x1_aptos_governance_GetVotingPowerAbortsIf">GetVotingPowerAbortsIf</a> {
+    pool_address: stake_pool
+};
+<b>let</b> <a href="staking_config.md#0x1_staking_config">staking_config</a> = <b>global</b>&lt;<a href="staking_config.md#0x1_staking_config_StakingConfig">staking_config::StakingConfig</a>&gt;(@aptos_framework);
+<b>let</b> voting_power = <a href="aptos_governance.md#0x1_aptos_governance_spec_get_voting_power">spec_get_voting_power</a>(stake_pool, <a href="staking_config.md#0x1_staking_config">staking_config</a>);
+<b>let</b> voting_records_v2 = <b>borrow_global</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_VotingRecordsV2">VotingRecordsV2</a>&gt;(@aptos_framework);
+<b>let</b> used_voting_power = <b>if</b> (<a href="../../../aptos-stdlib/tests/compiler-v2-doc/smart_table.md#0x1_smart_table_spec_contains">smart_table::spec_contains</a>(voting_records_v2.votes, record_key)) {
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/smart_table.md#0x1_smart_table_spec_get">smart_table::spec_get</a>(voting_records_v2.votes, record_key)
+} <b>else</b> {
+    0
+};
+<b>aborts_if</b> !remain_zero_1_cond && !entirely_voted && <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_spec_partial_governance_voting_enabled">features::spec_partial_governance_voting_enabled</a>() &&
+    used_voting_power &gt; 0 && voting_power &lt; used_voting_power;
+<b>ensures</b> result == <a href="aptos_governance.md#0x1_aptos_governance_spec_get_remaining_voting_power">spec_get_remaining_voting_power</a>(stake_pool, proposal_id);
+</code></pre>
+
+
+
+
+<a id="0x1_aptos_governance_spec_get_remaining_voting_power"></a>
+
+
+<pre><code><b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_spec_get_remaining_voting_power">spec_get_remaining_voting_power</a>(stake_pool: <b>address</b>, proposal_id: u64): u64 {
+   <b>let</b> spec_proposal_expiration = <a href="voting.md#0x1_voting_spec_get_proposal_expiration_secs">voting::spec_get_proposal_expiration_secs</a>&lt;GovernanceProposal&gt;(@aptos_framework, proposal_id);
+   <b>let</b> locked_until = <b>global</b>&lt;<a href="stake.md#0x1_stake_StakePool">stake::StakePool</a>&gt;(stake_pool).locked_until_secs;
+   <b>let</b> remain_zero_1_cond = (spec_proposal_expiration &gt; locked_until || <a href="timestamp.md#0x1_timestamp_spec_now_seconds">timestamp::spec_now_seconds</a>() &gt; spec_proposal_expiration);
+   <b>let</b> <a href="staking_config.md#0x1_staking_config">staking_config</a> = <b>global</b>&lt;<a href="staking_config.md#0x1_staking_config_StakingConfig">staking_config::StakingConfig</a>&gt;(@aptos_framework);
+   <b>let</b> voting_records_v2 = <b>borrow_global</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_VotingRecordsV2">VotingRecordsV2</a>&gt;(@aptos_framework);
+   <b>let</b> record_key = <a href="aptos_governance.md#0x1_aptos_governance_RecordKey">RecordKey</a> {
+       stake_pool,
+       proposal_id,
+   };
+   <b>let</b> entirely_voted = <a href="aptos_governance.md#0x1_aptos_governance_spec_has_entirely_voted">spec_has_entirely_voted</a>(stake_pool, proposal_id, record_key);
+   <b>let</b> voting_power = <a href="aptos_governance.md#0x1_aptos_governance_spec_get_voting_power">spec_get_voting_power</a>(stake_pool, <a href="staking_config.md#0x1_staking_config">staking_config</a>);
+   <b>let</b> used_voting_power = <b>if</b> (<a href="../../../aptos-stdlib/tests/compiler-v2-doc/smart_table.md#0x1_smart_table_spec_contains">smart_table::spec_contains</a>(voting_records_v2.votes, record_key)) {
+       <a href="../../../aptos-stdlib/tests/compiler-v2-doc/smart_table.md#0x1_smart_table_spec_get">smart_table::spec_get</a>(voting_records_v2.votes, record_key)
+   } <b>else</b> {
+       0
+   };
+   <b>if</b> (remain_zero_1_cond) {
+       0
+   } <b>else</b> <b>if</b> (entirely_voted) {
+       0
+   } <b>else</b> <b>if</b> (!<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_spec_partial_governance_voting_enabled">features::spec_partial_governance_voting_enabled</a>()) {
+       voting_power
+   } <b>else</b> {
+       voting_power - used_voting_power
+   }
+}
+</code></pre>
+
+
+
+
+<a id="0x1_aptos_governance_spec_has_entirely_voted"></a>
+
+
+<pre><code><b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_spec_has_entirely_voted">spec_has_entirely_voted</a>(stake_pool: <b>address</b>, proposal_id: u64, record_key: <a href="aptos_governance.md#0x1_aptos_governance_RecordKey">RecordKey</a>): bool {
+   <b>let</b> voting_records = <b>global</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_VotingRecords">VotingRecords</a>&gt;(@aptos_framework);
+   <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_contains">table::spec_contains</a>(voting_records.votes, record_key)
+}
+</code></pre>
+
+
+
+
+<a id="0x1_aptos_governance_GetVotingPowerAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="aptos_governance.md#0x1_aptos_governance_GetVotingPowerAbortsIf">GetVotingPowerAbortsIf</a> {
+    pool_address: <b>address</b>;
+    <b>let</b> <a href="staking_config.md#0x1_staking_config">staking_config</a> = <b>global</b>&lt;<a href="staking_config.md#0x1_staking_config_StakingConfig">staking_config::StakingConfig</a>&gt;(@aptos_framework);
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="staking_config.md#0x1_staking_config_StakingConfig">staking_config::StakingConfig</a>&gt;(@aptos_framework);
+    <b>let</b> allow_validator_set_change = <a href="staking_config.md#0x1_staking_config">staking_config</a>.allow_validator_set_change;
+    <b>let</b> stake_pool_res = <b>global</b>&lt;<a href="stake.md#0x1_stake_StakePool">stake::StakePool</a>&gt;(pool_address);
+    <b>aborts_if</b> allow_validator_set_change && (stake_pool_res.active.value + stake_pool_res.pending_active.value + stake_pool_res.pending_inactive.value) &gt; <a href="aptos_governance.md#0x1_aptos_governance_MAX_U64">MAX_U64</a>;
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="stake.md#0x1_stake_StakePool">stake::StakePool</a>&gt;(pool_address);
+    <b>aborts_if</b> !allow_validator_set_change && !<b>exists</b>&lt;<a href="stake.md#0x1_stake_ValidatorSet">stake::ValidatorSet</a>&gt;(@aptos_framework);
+    <b>aborts_if</b> !allow_validator_set_change && <a href="stake.md#0x1_stake_spec_is_current_epoch_validator">stake::spec_is_current_epoch_validator</a>(pool_address) && stake_pool_res.active.value + stake_pool_res.pending_inactive.value &gt; <a href="aptos_governance.md#0x1_aptos_governance_MAX_U64">MAX_U64</a>;
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_create_proposal"></a>
+
+### Function `create_proposal`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_create_proposal">create_proposal</a>(proposer: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, stake_pool: <b>address</b>, execution_hash: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, metadata_location: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, metadata_hash: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+The same as spec of <code><a href="aptos_governance.md#0x1_aptos_governance_create_proposal_v2">create_proposal_v2</a>()</code>.
+
+
+<pre><code><b>pragma</b> verify_duration_estimate = 60;
+<b>requires</b> <a href="chain_status.md#0x1_chain_status_is_operating">chain_status::is_operating</a>();
+<b>include</b> <a href="aptos_governance.md#0x1_aptos_governance_CreateProposalAbortsIf">CreateProposalAbortsIf</a>;
+</code></pre>
+
+
+
+<a id="@Specification_1_create_proposal_v2"></a>
+
+### Function `create_proposal_v2`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_create_proposal_v2">create_proposal_v2</a>(proposer: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, stake_pool: <b>address</b>, execution_hash: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, metadata_location: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, metadata_hash: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, is_multi_step_proposal: bool)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify_duration_estimate = 60;
+<b>requires</b> <a href="chain_status.md#0x1_chain_status_is_operating">chain_status::is_operating</a>();
+<b>include</b> <a href="aptos_governance.md#0x1_aptos_governance_CreateProposalAbortsIf">CreateProposalAbortsIf</a>;
+</code></pre>
+
+
+
+<a id="@Specification_1_create_proposal_v2_impl"></a>
+
+### Function `create_proposal_v2_impl`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_create_proposal_v2_impl">create_proposal_v2_impl</a>(proposer: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, stake_pool: <b>address</b>, execution_hash: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, metadata_location: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, metadata_hash: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, is_multi_step_proposal: bool): u64
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify_duration_estimate = 60;
+<b>requires</b> <a href="chain_status.md#0x1_chain_status_is_operating">chain_status::is_operating</a>();
+<b>include</b> <a href="aptos_governance.md#0x1_aptos_governance_CreateProposalAbortsIf">CreateProposalAbortsIf</a>;
+</code></pre>
+
+
+
+<a id="@Specification_1_batch_vote"></a>
+
+### Function `batch_vote`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_batch_vote">batch_vote</a>(voter: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, stake_pools: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;, proposal_id: u64, should_pass: bool)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_batch_partial_vote"></a>
+
+### Function `batch_partial_vote`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_batch_partial_vote">batch_partial_vote</a>(voter: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, stake_pools: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;, proposal_id: u64, voting_power: u64, should_pass: bool)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_vote"></a>
+
+### Function `vote`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_vote">vote</a>(voter: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, stake_pool: <b>address</b>, proposal_id: u64, should_pass: bool)
+</code></pre>
+
+
+stake_pool must exist StakePool.
+The delegated voter under the resource StakePool of the stake_pool must be the voter address.
+Address @aptos_framework must exist VotingRecords and GovernanceProposal.
+
+
+<pre><code><b>pragma</b> verify_duration_estimate = 60;
+<b>requires</b> <a href="chain_status.md#0x1_chain_status_is_operating">chain_status::is_operating</a>();
+<b>include</b> <a href="aptos_governance.md#0x1_aptos_governance_VoteAbortIf">VoteAbortIf</a>  {
+    voting_power: <a href="aptos_governance.md#0x1_aptos_governance_MAX_U64">MAX_U64</a>
+};
+</code></pre>
+
+
+
+<a id="@Specification_1_partial_vote"></a>
+
+### Function `partial_vote`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_partial_vote">partial_vote</a>(voter: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, stake_pool: <b>address</b>, proposal_id: u64, voting_power: u64, should_pass: bool)
+</code></pre>
+
+
+stake_pool must exist StakePool.
+The delegated voter under the resource StakePool of the stake_pool must be the voter address.
+Address @aptos_framework must exist VotingRecords and GovernanceProposal.
+Address @aptos_framework must exist VotingRecordsV2 if partial_governance_voting flag is enabled.
+
+
+<pre><code><b>pragma</b> verify_duration_estimate = 60;
+<b>requires</b> <a href="chain_status.md#0x1_chain_status_is_operating">chain_status::is_operating</a>();
+<b>include</b> <a href="aptos_governance.md#0x1_aptos_governance_VoteAbortIf">VoteAbortIf</a>;
+</code></pre>
+
+
+
+<a id="@Specification_1_vote_internal"></a>
+
+### Function `vote_internal`
+
+
+<pre><code><b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_vote_internal">vote_internal</a>(voter: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, stake_pool: <b>address</b>, proposal_id: u64, voting_power: u64, should_pass: bool)
+</code></pre>
+
+
+stake_pool must exist StakePool.
+The delegated voter under the resource StakePool of the stake_pool must be the voter address.
+Address @aptos_framework must exist VotingRecords and GovernanceProposal.
+Address @aptos_framework must exist VotingRecordsV2 if partial_governance_voting flag is enabled.
+
+
+<pre><code><b>pragma</b> verify_duration_estimate = 60;
+<b>requires</b> <a href="chain_status.md#0x1_chain_status_is_operating">chain_status::is_operating</a>();
+<b>include</b> <a href="aptos_governance.md#0x1_aptos_governance_VoteAbortIf">VoteAbortIf</a>;
+</code></pre>
+
+
+
+
+<a id="0x1_aptos_governance_VoteAbortIf"></a>
+
+
+<pre><code><b>schema</b> <a href="aptos_governance.md#0x1_aptos_governance_VoteAbortIf">VoteAbortIf</a> {
+    voter: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>;
+    stake_pool: <b>address</b>;
+    proposal_id: u64;
+    should_pass: bool;
+    voting_power: u64;
+    <b>include</b> <a href="aptos_governance.md#0x1_aptos_governance_VotingGetDelegatedVoterAbortsIf">VotingGetDelegatedVoterAbortsIf</a> { sign: voter };
+    <b>aborts_if</b> spec_proposal_expiration &lt;= locked_until && !<b>exists</b>&lt;<a href="timestamp.md#0x1_timestamp_CurrentTimeMicroseconds">timestamp::CurrentTimeMicroseconds</a>&gt;(@aptos_framework);
+    <b>let</b> spec_proposal_expiration = <a href="voting.md#0x1_voting_spec_get_proposal_expiration_secs">voting::spec_get_proposal_expiration_secs</a>&lt;GovernanceProposal&gt;(@aptos_framework, proposal_id);
+    <b>let</b> locked_until = <b>global</b>&lt;<a href="stake.md#0x1_stake_StakePool">stake::StakePool</a>&gt;(stake_pool).locked_until_secs;
+    <b>let</b> remain_zero_1_cond = (spec_proposal_expiration &gt; locked_until || <a href="timestamp.md#0x1_timestamp_spec_now_seconds">timestamp::spec_now_seconds</a>() &gt; spec_proposal_expiration);
+    <b>let</b> record_key = <a href="aptos_governance.md#0x1_aptos_governance_RecordKey">RecordKey</a> {
+        stake_pool,
+        proposal_id,
+    };
+    <b>let</b> entirely_voted = <a href="aptos_governance.md#0x1_aptos_governance_spec_has_entirely_voted">spec_has_entirely_voted</a>(stake_pool, proposal_id, record_key);
+    <b>aborts_if</b> !remain_zero_1_cond && !<b>exists</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_VotingRecords">VotingRecords</a>&gt;(@aptos_framework);
+    <b>include</b> !remain_zero_1_cond && !entirely_voted ==&gt; <a href="aptos_governance.md#0x1_aptos_governance_GetVotingPowerAbortsIf">GetVotingPowerAbortsIf</a> {
+        pool_address: stake_pool
+    };
+    <b>let</b> <a href="staking_config.md#0x1_staking_config">staking_config</a> = <b>global</b>&lt;<a href="staking_config.md#0x1_staking_config_StakingConfig">staking_config::StakingConfig</a>&gt;(@aptos_framework);
+    <b>let</b> spec_voting_power = <a href="aptos_governance.md#0x1_aptos_governance_spec_get_voting_power">spec_get_voting_power</a>(stake_pool, <a href="staking_config.md#0x1_staking_config">staking_config</a>);
+    <b>let</b> voting_records_v2 = <b>borrow_global</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_VotingRecordsV2">VotingRecordsV2</a>&gt;(@aptos_framework);
+    <b>let</b> used_voting_power = <b>if</b> (<a href="../../../aptos-stdlib/tests/compiler-v2-doc/smart_table.md#0x1_smart_table_spec_contains">smart_table::spec_contains</a>(voting_records_v2.votes, record_key)) {
+        <a href="../../../aptos-stdlib/tests/compiler-v2-doc/smart_table.md#0x1_smart_table_spec_get">smart_table::spec_get</a>(voting_records_v2.votes, record_key)
+    } <b>else</b> {
+        0
+    };
+    <b>aborts_if</b> !remain_zero_1_cond && !entirely_voted && <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_spec_partial_governance_voting_enabled">features::spec_partial_governance_voting_enabled</a>() &&
+        used_voting_power &gt; 0 && spec_voting_power &lt; used_voting_power;
+    <b>let</b> remaining_power = <a href="aptos_governance.md#0x1_aptos_governance_spec_get_remaining_voting_power">spec_get_remaining_voting_power</a>(stake_pool, proposal_id);
+    <b>let</b> real_voting_power =  <b>min</b>(voting_power, remaining_power);
+    <b>aborts_if</b> !(real_voting_power &gt; 0);
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_VotingRecords">VotingRecords</a>&gt;(@aptos_framework);
+    <b>let</b> voting_records = <b>global</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_VotingRecords">VotingRecords</a>&gt;(@aptos_framework);
+    <b>let</b> allow_validator_set_change = <b>global</b>&lt;<a href="staking_config.md#0x1_staking_config_StakingConfig">staking_config::StakingConfig</a>&gt;(@aptos_framework).allow_validator_set_change;
+    <b>let</b> stake_pool_res = <b>global</b>&lt;<a href="stake.md#0x1_stake_StakePool">stake::StakePool</a>&gt;(stake_pool);
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="voting.md#0x1_voting_VotingForum">voting::VotingForum</a>&lt;GovernanceProposal&gt;&gt;(@aptos_framework);
+    <b>let</b> voting_forum = <b>global</b>&lt;<a href="voting.md#0x1_voting_VotingForum">voting::VotingForum</a>&lt;GovernanceProposal&gt;&gt;(@aptos_framework);
+    <b>let</b> proposal = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(voting_forum.proposals, proposal_id);
+    <b>aborts_if</b> !<a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_contains">table::spec_contains</a>(voting_forum.proposals, proposal_id);
+    <b>let</b> proposal_expiration = proposal.expiration_secs;
+    <b>let</b> locked_until_secs = <b>global</b>&lt;<a href="stake.md#0x1_stake_StakePool">stake::StakePool</a>&gt;(stake_pool).locked_until_secs;
+    <b>aborts_if</b> proposal_expiration &gt; locked_until_secs;
+    <b>aborts_if</b> <a href="timestamp.md#0x1_timestamp_now_seconds">timestamp::now_seconds</a>() &gt; proposal_expiration;
+    <b>aborts_if</b> proposal.is_resolved;
+    <b>aborts_if</b> !<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_spec_internal_check_utf8">string::spec_internal_check_utf8</a>(<a href="voting.md#0x1_voting_IS_MULTI_STEP_PROPOSAL_IN_EXECUTION_KEY">voting::IS_MULTI_STEP_PROPOSAL_IN_EXECUTION_KEY</a>);
+    <b>let</b> execution_key = utf8(<a href="voting.md#0x1_voting_IS_MULTI_STEP_PROPOSAL_IN_EXECUTION_KEY">voting::IS_MULTI_STEP_PROPOSAL_IN_EXECUTION_KEY</a>);
+    <b>aborts_if</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(proposal.metadata, execution_key) &&
+              <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(proposal.metadata, execution_key) != std::bcs::to_bytes(<b>false</b>);
+    <b>aborts_if</b>
+        <b>if</b> (should_pass) { proposal.yes_votes + real_voting_power &gt; MAX_U128 } <b>else</b> { proposal.no_votes + real_voting_power &gt; MAX_U128 };
+    <b>let</b> <b>post</b> post_voting_forum = <b>global</b>&lt;<a href="voting.md#0x1_voting_VotingForum">voting::VotingForum</a>&lt;GovernanceProposal&gt;&gt;(@aptos_framework);
+    <b>let</b> <b>post</b> post_proposal = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(post_voting_forum.proposals, proposal_id);
+    <b>aborts_if</b> !<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_spec_internal_check_utf8">string::spec_internal_check_utf8</a>(<a href="voting.md#0x1_voting_RESOLVABLE_TIME_METADATA_KEY">voting::RESOLVABLE_TIME_METADATA_KEY</a>);
+    <b>let</b> key = utf8(<a href="voting.md#0x1_voting_RESOLVABLE_TIME_METADATA_KEY">voting::RESOLVABLE_TIME_METADATA_KEY</a>);
+    <b>ensures</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(post_proposal.metadata, key);
+    <b>ensures</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(post_proposal.metadata, key) == std::bcs::to_bytes(<a href="timestamp.md#0x1_timestamp_now_seconds">timestamp::now_seconds</a>());
+    <b>aborts_if</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_spec_partial_governance_voting_enabled">features::spec_partial_governance_voting_enabled</a>() && used_voting_power + real_voting_power &gt; <a href="aptos_governance.md#0x1_aptos_governance_MAX_U64">MAX_U64</a>;
+    <b>aborts_if</b> !<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_spec_partial_governance_voting_enabled">features::spec_partial_governance_voting_enabled</a>() && <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_contains">table::spec_contains</a>(voting_records.votes, record_key);
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_GovernanceEvents">GovernanceEvents</a>&gt;(@aptos_framework);
+    <b>let</b> early_resolution_threshold = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_borrow">option::spec_borrow</a>(proposal.early_resolution_vote_threshold);
+    <b>let</b> is_voting_period_over = <a href="timestamp.md#0x1_timestamp_spec_now_seconds">timestamp::spec_now_seconds</a>() &gt; proposal_expiration;
+    <b>let</b> new_proposal_yes_votes_0 = proposal.yes_votes + real_voting_power;
+    <b>let</b> can_be_resolved_early_0 = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_is_some">option::spec_is_some</a>(proposal.early_resolution_vote_threshold) &&
+                                (new_proposal_yes_votes_0 &gt;= early_resolution_threshold ||
+                                 proposal.no_votes &gt;= early_resolution_threshold);
+    <b>let</b> is_voting_closed_0 = is_voting_period_over || can_be_resolved_early_0;
+    <b>let</b> proposal_state_successed_0 = is_voting_closed_0 && new_proposal_yes_votes_0 &gt; proposal.no_votes &&
+                                     new_proposal_yes_votes_0 + proposal.no_votes &gt;= proposal.min_vote_threshold;
+    <b>let</b> new_proposal_no_votes_0 = proposal.no_votes + real_voting_power;
+    <b>let</b> can_be_resolved_early_1 = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_is_some">option::spec_is_some</a>(proposal.early_resolution_vote_threshold) &&
+                                (proposal.yes_votes &gt;= early_resolution_threshold ||
+                                 new_proposal_no_votes_0 &gt;= early_resolution_threshold);
+    <b>let</b> is_voting_closed_1 = is_voting_period_over || can_be_resolved_early_1;
+    <b>let</b> proposal_state_successed_1 = is_voting_closed_1 && proposal.yes_votes &gt; new_proposal_no_votes_0 &&
+                                     proposal.yes_votes + new_proposal_no_votes_0 &gt;= proposal.min_vote_threshold;
+    <b>let</b> new_proposal_yes_votes_1 = proposal.yes_votes + real_voting_power;
+    <b>let</b> can_be_resolved_early_2 = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_is_some">option::spec_is_some</a>(proposal.early_resolution_vote_threshold) &&
+                                (new_proposal_yes_votes_1 &gt;= early_resolution_threshold ||
+                                 proposal.no_votes &gt;= early_resolution_threshold);
+    <b>let</b> is_voting_closed_2 = is_voting_period_over || can_be_resolved_early_2;
+    <b>let</b> proposal_state_successed_2 = is_voting_closed_2 && new_proposal_yes_votes_1 &gt; proposal.no_votes &&
+                                     new_proposal_yes_votes_1 + proposal.no_votes &gt;= proposal.min_vote_threshold;
+    <b>let</b> new_proposal_no_votes_1 = proposal.no_votes + real_voting_power;
+    <b>let</b> can_be_resolved_early_3 = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_is_some">option::spec_is_some</a>(proposal.early_resolution_vote_threshold) &&
+                                (proposal.yes_votes &gt;= early_resolution_threshold ||
+                                 new_proposal_no_votes_1 &gt;= early_resolution_threshold);
+    <b>let</b> is_voting_closed_3 = is_voting_period_over || can_be_resolved_early_3;
+    <b>let</b> proposal_state_successed_3 = is_voting_closed_3 && proposal.yes_votes &gt; new_proposal_no_votes_1 &&
+                                     proposal.yes_votes + new_proposal_no_votes_1 &gt;= proposal.min_vote_threshold;
+    <b>let</b> <b>post</b> can_be_resolved_early = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_is_some">option::spec_is_some</a>(proposal.early_resolution_vote_threshold) &&
+                                (post_proposal.yes_votes &gt;= early_resolution_threshold ||
+                                 post_proposal.no_votes &gt;= early_resolution_threshold);
+    <b>let</b> <b>post</b> is_voting_closed = is_voting_period_over || can_be_resolved_early;
+    <b>let</b> <b>post</b> proposal_state_successed = is_voting_closed && post_proposal.yes_votes &gt; post_proposal.no_votes &&
+                                     post_proposal.yes_votes + post_proposal.no_votes &gt;= proposal.min_vote_threshold;
+    <b>let</b> execution_hash = proposal.execution_hash;
+    <b>let</b> <b>post</b> post_approved_hashes = <b>global</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_ApprovedExecutionHashes">ApprovedExecutionHashes</a>&gt;(@aptos_framework);
+    // This enforces <a id="high-level-req-3" href="#high-level-req">high-level requirement 3</a>:
+    <b>aborts_if</b>
+        <b>if</b> (should_pass) {
+            proposal_state_successed_0 && !<b>exists</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_ApprovedExecutionHashes">ApprovedExecutionHashes</a>&gt;(@aptos_framework)
+        } <b>else</b> {
+            proposal_state_successed_1 && !<b>exists</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_ApprovedExecutionHashes">ApprovedExecutionHashes</a>&gt;(@aptos_framework)
+        };
+    <b>aborts_if</b>
+        <b>if</b> (should_pass) {
+            proposal_state_successed_2 && !<b>exists</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_ApprovedExecutionHashes">ApprovedExecutionHashes</a>&gt;(@aptos_framework)
+        } <b>else</b> {
+            proposal_state_successed_3 && !<b>exists</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_ApprovedExecutionHashes">ApprovedExecutionHashes</a>&gt;(@aptos_framework)
+        };
+    <b>ensures</b> proposal_state_successed ==&gt; <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(post_approved_hashes.hashes, proposal_id) &&
+                                         <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(post_approved_hashes.hashes, proposal_id) == execution_hash;
+    <b>aborts_if</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_spec_partial_governance_voting_enabled">features::spec_partial_governance_voting_enabled</a>() && !<b>exists</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_VotingRecordsV2">VotingRecordsV2</a>&gt;(@aptos_framework);
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_add_approved_script_hash_script"></a>
+
+### Function `add_approved_script_hash_script`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_add_approved_script_hash_script">add_approved_script_hash_script</a>(proposal_id: u64)
+</code></pre>
+
+
+
+
+<pre><code><b>requires</b> <a href="chain_status.md#0x1_chain_status_is_operating">chain_status::is_operating</a>();
+<b>include</b> <a href="aptos_governance.md#0x1_aptos_governance_AddApprovedScriptHash">AddApprovedScriptHash</a>;
+</code></pre>
+
+
+
+
+<a id="0x1_aptos_governance_AddApprovedScriptHash"></a>
+
+
+<pre><code><b>schema</b> <a href="aptos_governance.md#0x1_aptos_governance_AddApprovedScriptHash">AddApprovedScriptHash</a> {
+    proposal_id: u64;
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_ApprovedExecutionHashes">ApprovedExecutionHashes</a>&gt;(@aptos_framework);
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="voting.md#0x1_voting_VotingForum">voting::VotingForum</a>&lt;GovernanceProposal&gt;&gt;(@aptos_framework);
+    <b>let</b> voting_forum = <b>global</b>&lt;<a href="voting.md#0x1_voting_VotingForum">voting::VotingForum</a>&lt;GovernanceProposal&gt;&gt;(@aptos_framework);
+    <b>let</b> proposal = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(voting_forum.proposals, proposal_id);
+    <b>aborts_if</b> !<a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_contains">table::spec_contains</a>(voting_forum.proposals, proposal_id);
+    <b>let</b> early_resolution_threshold = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_borrow">option::spec_borrow</a>(proposal.early_resolution_vote_threshold);
+    <b>aborts_if</b> <a href="timestamp.md#0x1_timestamp_now_seconds">timestamp::now_seconds</a>() &lt;= proposal.expiration_secs &&
+        (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_is_none">option::spec_is_none</a>(proposal.early_resolution_vote_threshold) ||
+        proposal.yes_votes &lt; early_resolution_threshold && proposal.no_votes &lt; early_resolution_threshold);
+    <b>aborts_if</b> (<a href="timestamp.md#0x1_timestamp_now_seconds">timestamp::now_seconds</a>() &gt; proposal.expiration_secs ||
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_is_some">option::spec_is_some</a>(proposal.early_resolution_vote_threshold) && (proposal.yes_votes &gt;= early_resolution_threshold ||
+                                                                           proposal.no_votes &gt;= early_resolution_threshold)) &&
+        (proposal.yes_votes &lt;= proposal.no_votes || proposal.yes_votes + proposal.no_votes &lt; proposal.min_vote_threshold);
+    <b>let</b> <b>post</b> post_approved_hashes = <b>global</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_ApprovedExecutionHashes">ApprovedExecutionHashes</a>&gt;(@aptos_framework);
+    // This enforces <a id="high-level-req-4" href="#high-level-req">high-level requirement 4</a>:
+    <b>ensures</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(post_approved_hashes.hashes, proposal_id) &&
+        <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(post_approved_hashes.hashes, proposal_id) == proposal.execution_hash;
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_add_approved_script_hash"></a>
+
+### Function `add_approved_script_hash`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_add_approved_script_hash">add_approved_script_hash</a>(proposal_id: u64)
+</code></pre>
+
+
+
+
+<pre><code><b>requires</b> <a href="chain_status.md#0x1_chain_status_is_operating">chain_status::is_operating</a>();
+<b>include</b> <a href="aptos_governance.md#0x1_aptos_governance_AddApprovedScriptHash">AddApprovedScriptHash</a>;
+</code></pre>
+
+
+
+<a id="@Specification_1_resolve"></a>
+
+### Function `resolve`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_resolve">resolve</a>(proposal_id: u64, signer_address: <b>address</b>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>
+</code></pre>
+
+
+Address @aptos_framework must exist ApprovedExecutionHashes and GovernanceProposal and GovernanceResponsbility.
+
+
+<pre><code><b>requires</b> <a href="chain_status.md#0x1_chain_status_is_operating">chain_status::is_operating</a>();
+<b>include</b> <a href="aptos_governance.md#0x1_aptos_governance_VotingIsProposalResolvableAbortsif">VotingIsProposalResolvableAbortsif</a>;
+<b>let</b> voting_forum = <b>global</b>&lt;<a href="voting.md#0x1_voting_VotingForum">voting::VotingForum</a>&lt;GovernanceProposal&gt;&gt;(@aptos_framework);
+<b>let</b> proposal = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(voting_forum.proposals, proposal_id);
+<b>let</b> multi_step_key = utf8(<a href="voting.md#0x1_voting_IS_MULTI_STEP_PROPOSAL_KEY">voting::IS_MULTI_STEP_PROPOSAL_KEY</a>);
+<b>let</b> has_multi_step_key = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(proposal.metadata, multi_step_key);
+<b>let</b> is_multi_step_proposal = aptos_std::from_bcs::deserialize&lt;bool&gt;(<a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(proposal.metadata, multi_step_key));
+<b>aborts_if</b> has_multi_step_key && !aptos_std::from_bcs::deserializable&lt;bool&gt;(<a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(proposal.metadata, multi_step_key));
+<b>aborts_if</b> !<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_spec_internal_check_utf8">string::spec_internal_check_utf8</a>(<a href="voting.md#0x1_voting_IS_MULTI_STEP_PROPOSAL_KEY">voting::IS_MULTI_STEP_PROPOSAL_KEY</a>);
+<b>aborts_if</b> has_multi_step_key && is_multi_step_proposal;
+<b>let</b> <b>post</b> post_voting_forum = <b>global</b>&lt;<a href="voting.md#0x1_voting_VotingForum">voting::VotingForum</a>&lt;GovernanceProposal&gt;&gt;(@aptos_framework);
+<b>let</b> <b>post</b> post_proposal = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(post_voting_forum.proposals, proposal_id);
+<b>ensures</b> post_proposal.is_resolved == <b>true</b> && post_proposal.resolution_time_secs == <a href="timestamp.md#0x1_timestamp_now_seconds">timestamp::now_seconds</a>();
+<b>aborts_if</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_is_none">option::spec_is_none</a>(proposal.execution_content);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_ApprovedExecutionHashes">ApprovedExecutionHashes</a>&gt;(@aptos_framework);
+<b>let</b> <b>post</b> post_approved_hashes = <b>global</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_ApprovedExecutionHashes">ApprovedExecutionHashes</a>&gt;(@aptos_framework).hashes;
+<b>ensures</b> !<a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(post_approved_hashes, proposal_id);
+<b>include</b> <a href="aptos_governance.md#0x1_aptos_governance_GetSignerAbortsIf">GetSignerAbortsIf</a>;
+<b>let</b> governance_responsibility = <b>global</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_GovernanceResponsbility">GovernanceResponsbility</a>&gt;(@aptos_framework);
+<b>let</b> signer_cap = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(governance_responsibility.signer_caps, signer_address);
+<b>let</b> addr = signer_cap.<a href="account.md#0x1_account">account</a>;
+<b>ensures</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(result) == addr;
+</code></pre>
+
+
+
+<a id="@Specification_1_resolve_multi_step_proposal"></a>
+
+### Function `resolve_multi_step_proposal`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_resolve_multi_step_proposal">resolve_multi_step_proposal</a>(proposal_id: u64, signer_address: <b>address</b>, next_execution_hash: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>
+</code></pre>
+
+
+
+
+<pre><code><b>requires</b> <a href="chain_status.md#0x1_chain_status_is_operating">chain_status::is_operating</a>();
+<b>pragma</b> verify_duration_estimate = 120;
+<b>include</b> <a href="aptos_governance.md#0x1_aptos_governance_VotingIsProposalResolvableAbortsif">VotingIsProposalResolvableAbortsif</a>;
+<b>let</b> voting_forum = <b>global</b>&lt;<a href="voting.md#0x1_voting_VotingForum">voting::VotingForum</a>&lt;GovernanceProposal&gt;&gt;(@aptos_framework);
+<b>let</b> proposal = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(voting_forum.proposals, proposal_id);
+<b>let</b> <b>post</b> post_voting_forum = <b>global</b>&lt;<a href="voting.md#0x1_voting_VotingForum">voting::VotingForum</a>&lt;GovernanceProposal&gt;&gt;(@aptos_framework);
+<b>let</b> <b>post</b> post_proposal = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(post_voting_forum.proposals, proposal_id);
+<b>aborts_if</b> !<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_spec_internal_check_utf8">string::spec_internal_check_utf8</a>(<a href="voting.md#0x1_voting_IS_MULTI_STEP_PROPOSAL_IN_EXECUTION_KEY">voting::IS_MULTI_STEP_PROPOSAL_IN_EXECUTION_KEY</a>);
+<b>let</b> multi_step_in_execution_key = utf8(<a href="voting.md#0x1_voting_IS_MULTI_STEP_PROPOSAL_IN_EXECUTION_KEY">voting::IS_MULTI_STEP_PROPOSAL_IN_EXECUTION_KEY</a>);
+<b>let</b> <b>post</b> is_multi_step_proposal_in_execution_value = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(post_proposal.metadata, multi_step_in_execution_key);
+<b>aborts_if</b> !<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_spec_internal_check_utf8">string::spec_internal_check_utf8</a>(<a href="voting.md#0x1_voting_IS_MULTI_STEP_PROPOSAL_KEY">voting::IS_MULTI_STEP_PROPOSAL_KEY</a>);
+<b>let</b> multi_step_key = utf8(<a href="voting.md#0x1_voting_IS_MULTI_STEP_PROPOSAL_KEY">voting::IS_MULTI_STEP_PROPOSAL_KEY</a>);
+<b>aborts_if</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(proposal.metadata, multi_step_key) &&
+    !aptos_std::from_bcs::deserializable&lt;bool&gt;(<a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(proposal.metadata, multi_step_key));
+<b>let</b> is_multi_step = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(proposal.metadata, multi_step_key) &&
+                    aptos_std::from_bcs::deserialize&lt;bool&gt;(<a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(proposal.metadata, multi_step_key));
+<b>let</b> next_execution_hash_is_empty = len(next_execution_hash) == 0;
+<b>aborts_if</b> !is_multi_step && !next_execution_hash_is_empty;
+<b>aborts_if</b> next_execution_hash_is_empty && is_multi_step && !<a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(proposal.metadata, multi_step_in_execution_key);
+<b>ensures</b> next_execution_hash_is_empty ==&gt; post_proposal.is_resolved == <b>true</b> && post_proposal.resolution_time_secs == <a href="timestamp.md#0x1_timestamp_spec_now_seconds">timestamp::spec_now_seconds</a>() &&
+    <b>if</b> (is_multi_step) {
+        is_multi_step_proposal_in_execution_value == std::bcs::serialize(<b>false</b>)
+    } <b>else</b> {
+        <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(proposal.metadata, multi_step_in_execution_key) ==&gt;
+            is_multi_step_proposal_in_execution_value == std::bcs::serialize(<b>true</b>)
+    };
+<b>ensures</b> !next_execution_hash_is_empty ==&gt; post_proposal.execution_hash == next_execution_hash;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_ApprovedExecutionHashes">ApprovedExecutionHashes</a>&gt;(@aptos_framework);
+<b>let</b> <b>post</b> post_approved_hashes = <b>global</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_ApprovedExecutionHashes">ApprovedExecutionHashes</a>&gt;(@aptos_framework).hashes;
+<b>ensures</b> next_execution_hash_is_empty ==&gt; !<a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(post_approved_hashes, proposal_id);
+<b>ensures</b> !next_execution_hash_is_empty ==&gt;
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(post_approved_hashes, proposal_id) == next_execution_hash;
+<b>include</b> <a href="aptos_governance.md#0x1_aptos_governance_GetSignerAbortsIf">GetSignerAbortsIf</a>;
+<b>let</b> governance_responsibility = <b>global</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_GovernanceResponsbility">GovernanceResponsbility</a>&gt;(@aptos_framework);
+<b>let</b> signer_cap = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(governance_responsibility.signer_caps, signer_address);
+<b>let</b> addr = signer_cap.<a href="account.md#0x1_account">account</a>;
+<b>ensures</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(result) == addr;
+</code></pre>
+
+
+
+
+<a id="0x1_aptos_governance_VotingIsProposalResolvableAbortsif"></a>
+
+
+<pre><code><b>schema</b> <a href="aptos_governance.md#0x1_aptos_governance_VotingIsProposalResolvableAbortsif">VotingIsProposalResolvableAbortsif</a> {
+    proposal_id: u64;
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="voting.md#0x1_voting_VotingForum">voting::VotingForum</a>&lt;GovernanceProposal&gt;&gt;(@aptos_framework);
+    <b>let</b> voting_forum = <b>global</b>&lt;<a href="voting.md#0x1_voting_VotingForum">voting::VotingForum</a>&lt;GovernanceProposal&gt;&gt;(@aptos_framework);
+    <b>let</b> proposal = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(voting_forum.proposals, proposal_id);
+    <b>aborts_if</b> !<a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_contains">table::spec_contains</a>(voting_forum.proposals, proposal_id);
+    <b>let</b> early_resolution_threshold = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_borrow">option::spec_borrow</a>(proposal.early_resolution_vote_threshold);
+    <b>let</b> voting_period_over = <a href="timestamp.md#0x1_timestamp_now_seconds">timestamp::now_seconds</a>() &gt; proposal.expiration_secs;
+    <b>let</b> be_resolved_early = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_is_some">option::spec_is_some</a>(proposal.early_resolution_vote_threshold) &&
+                                (proposal.yes_votes &gt;= early_resolution_threshold ||
+                                 proposal.no_votes &gt;= early_resolution_threshold);
+    <b>let</b> voting_closed = voting_period_over || be_resolved_early;
+    <b>aborts_if</b> voting_closed && (proposal.yes_votes &lt;= proposal.no_votes || proposal.yes_votes + proposal.no_votes &lt; proposal.min_vote_threshold);
+    <b>aborts_if</b> !voting_closed;
+    <b>aborts_if</b> proposal.is_resolved;
+    <b>aborts_if</b> !<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_spec_internal_check_utf8">string::spec_internal_check_utf8</a>(<a href="voting.md#0x1_voting_RESOLVABLE_TIME_METADATA_KEY">voting::RESOLVABLE_TIME_METADATA_KEY</a>);
+    <b>aborts_if</b> !<a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(proposal.metadata, utf8(<a href="voting.md#0x1_voting_RESOLVABLE_TIME_METADATA_KEY">voting::RESOLVABLE_TIME_METADATA_KEY</a>));
+    <b>let</b> resolvable_time = aptos_std::from_bcs::deserialize&lt;u64&gt;(<a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(proposal.metadata, utf8(<a href="voting.md#0x1_voting_RESOLVABLE_TIME_METADATA_KEY">voting::RESOLVABLE_TIME_METADATA_KEY</a>)));
+    <b>aborts_if</b> !aptos_std::from_bcs::deserializable&lt;u64&gt;(<a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(proposal.metadata, utf8(<a href="voting.md#0x1_voting_RESOLVABLE_TIME_METADATA_KEY">voting::RESOLVABLE_TIME_METADATA_KEY</a>)));
+    <b>aborts_if</b> <a href="timestamp.md#0x1_timestamp_now_seconds">timestamp::now_seconds</a>() &lt;= resolvable_time;
+    <b>aborts_if</b> aptos_framework::transaction_context::spec_get_script_hash() != proposal.execution_hash;
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_remove_approved_hash"></a>
+
+### Function `remove_approved_hash`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_remove_approved_hash">remove_approved_hash</a>(proposal_id: u64)
+</code></pre>
+
+
+Address @aptos_framework must exist ApprovedExecutionHashes and GovernanceProposal.
+
+
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="voting.md#0x1_voting_VotingForum">voting::VotingForum</a>&lt;GovernanceProposal&gt;&gt;(@aptos_framework);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_ApprovedExecutionHashes">ApprovedExecutionHashes</a>&gt;(@aptos_framework);
+<b>let</b> voting_forum = <b>global</b>&lt;<a href="voting.md#0x1_voting_VotingForum">voting::VotingForum</a>&lt;GovernanceProposal&gt;&gt;(@aptos_framework);
+<b>aborts_if</b> !<a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_contains">table::spec_contains</a>(voting_forum.proposals, proposal_id);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="voting.md#0x1_voting_VotingForum">voting::VotingForum</a>&lt;GovernanceProposal&gt;&gt;(@aptos_framework);
+<b>let</b> proposal = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(voting_forum.proposals, proposal_id);
+<b>aborts_if</b> !proposal.is_resolved;
+<b>let</b> <b>post</b> approved_hashes = <b>global</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_ApprovedExecutionHashes">ApprovedExecutionHashes</a>&gt;(@aptos_framework).hashes;
+<b>ensures</b> !<a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(approved_hashes, proposal_id);
+</code></pre>
+
+
+
+<a id="@Specification_1_reconfigure"></a>
+
+### Function `reconfigure`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_reconfigure">reconfigure</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+<b>aborts_if</b> !<a href="system_addresses.md#0x1_system_addresses_is_aptos_framework_address">system_addresses::is_aptos_framework_address</a>(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(aptos_framework));
+<b>include</b> <a href="reconfiguration_with_dkg.md#0x1_reconfiguration_with_dkg_FinishRequirement">reconfiguration_with_dkg::FinishRequirement</a> {
+    framework: aptos_framework
+};
+<b>include</b> <a href="stake.md#0x1_stake_GetReconfigStartTimeRequirement">stake::GetReconfigStartTimeRequirement</a>;
+<b>include</b> <a href="transaction_fee.md#0x1_transaction_fee_RequiresCollectedFeesPerValueLeqBlockAptosSupply">transaction_fee::RequiresCollectedFeesPerValueLeqBlockAptosSupply</a>;
+<b>requires</b> <a href="chain_status.md#0x1_chain_status_is_operating">chain_status::is_operating</a>();
+<b>requires</b> <b>exists</b>&lt;<a href="stake.md#0x1_stake_ValidatorFees">stake::ValidatorFees</a>&gt;(@aptos_framework);
+<b>requires</b> <b>exists</b>&lt;CoinInfo&lt;AptosCoin&gt;&gt;(@aptos_framework);
+<b>requires</b> <b>exists</b>&lt;<a href="staking_config.md#0x1_staking_config_StakingRewardsConfig">staking_config::StakingRewardsConfig</a>&gt;(@aptos_framework);
+<b>include</b> <a href="staking_config.md#0x1_staking_config_StakingRewardsConfigRequirement">staking_config::StakingRewardsConfigRequirement</a>;
+</code></pre>
+
+
+
+<a id="@Specification_1_force_end_epoch"></a>
+
+### Function `force_end_epoch`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_force_end_epoch">force_end_epoch</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+<b>let</b> <b>address</b> = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(aptos_framework);
+<b>include</b> <a href="reconfiguration_with_dkg.md#0x1_reconfiguration_with_dkg_FinishRequirement">reconfiguration_with_dkg::FinishRequirement</a> {
+    framework: aptos_framework
+};
+</code></pre>
+
+
+
+
+<a id="0x1_aptos_governance_VotingInitializationAbortIfs"></a>
+
+
+<pre><code><b>schema</b> <a href="aptos_governance.md#0x1_aptos_governance_VotingInitializationAbortIfs">VotingInitializationAbortIfs</a> {
+    <b>aborts_if</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_spec_partial_governance_voting_enabled">features::spec_partial_governance_voting_enabled</a>() && !<b>exists</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_VotingRecordsV2">VotingRecordsV2</a>&gt;(@aptos_framework);
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_force_end_epoch_test_only"></a>
+
+### Function `force_end_epoch_test_only`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_force_end_epoch_test_only">force_end_epoch_test_only</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_toggle_features"></a>
+
+### Function `toggle_features`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_toggle_features">toggle_features</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, enable: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u64&gt;, disable: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u64&gt;)
+</code></pre>
+
+
+Signer address must be @aptos_framework.
+Address @aptos_framework must exist GovernanceConfig and GovernanceEvents.
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+<b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(aptos_framework);
+<b>aborts_if</b> addr != @aptos_framework;
+<b>include</b> <a href="reconfiguration_with_dkg.md#0x1_reconfiguration_with_dkg_FinishRequirement">reconfiguration_with_dkg::FinishRequirement</a> {
+    framework: aptos_framework
+};
+<b>include</b> <a href="stake.md#0x1_stake_GetReconfigStartTimeRequirement">stake::GetReconfigStartTimeRequirement</a>;
+<b>include</b> <a href="transaction_fee.md#0x1_transaction_fee_RequiresCollectedFeesPerValueLeqBlockAptosSupply">transaction_fee::RequiresCollectedFeesPerValueLeqBlockAptosSupply</a>;
+<b>requires</b> <a href="chain_status.md#0x1_chain_status_is_operating">chain_status::is_operating</a>();
+<b>requires</b> <b>exists</b>&lt;<a href="stake.md#0x1_stake_ValidatorFees">stake::ValidatorFees</a>&gt;(@aptos_framework);
+<b>requires</b> <b>exists</b>&lt;CoinInfo&lt;AptosCoin&gt;&gt;(@aptos_framework);
+<b>requires</b> <b>exists</b>&lt;<a href="staking_config.md#0x1_staking_config_StakingRewardsConfig">staking_config::StakingRewardsConfig</a>&gt;(@aptos_framework);
+<b>include</b> <a href="staking_config.md#0x1_staking_config_StakingRewardsConfigRequirement">staking_config::StakingRewardsConfigRequirement</a>;
+</code></pre>
+
+
+
+<a id="@Specification_1_get_signer_testnet_only"></a>
+
+### Function `get_signer_testnet_only`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_get_signer_testnet_only">get_signer_testnet_only</a>(core_resources: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, signer_address: <b>address</b>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>
+</code></pre>
+
+
+Signer address must be @core_resources.
+signer must exist in MintCapStore.
+Address @aptos_framework must exist GovernanceResponsbility.
+
+
+<pre><code><b>aborts_if</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(core_resources) != @core_resources;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="aptos_coin.md#0x1_aptos_coin_MintCapStore">aptos_coin::MintCapStore</a>&gt;(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(core_resources));
+<b>include</b> <a href="aptos_governance.md#0x1_aptos_governance_GetSignerAbortsIf">GetSignerAbortsIf</a>;
+</code></pre>
+
+
+
+<a id="@Specification_1_get_voting_power"></a>
+
+### Function `get_voting_power`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_get_voting_power">get_voting_power</a>(pool_address: <b>address</b>): u64
+</code></pre>
+
+
+Address @aptos_framework must exist StakingConfig.
+limit addition overflow.
+pool_address must exist in StakePool.
+
+
+<pre><code><b>include</b> <a href="aptos_governance.md#0x1_aptos_governance_GetVotingPowerAbortsIf">GetVotingPowerAbortsIf</a>;
+<b>let</b> <a href="staking_config.md#0x1_staking_config">staking_config</a> = <b>global</b>&lt;<a href="staking_config.md#0x1_staking_config_StakingConfig">staking_config::StakingConfig</a>&gt;(@aptos_framework);
+<b>let</b> allow_validator_set_change = <a href="staking_config.md#0x1_staking_config">staking_config</a>.allow_validator_set_change;
+<b>let</b> stake_pool_res = <b>global</b>&lt;<a href="stake.md#0x1_stake_StakePool">stake::StakePool</a>&gt;(pool_address);
+<b>ensures</b> allow_validator_set_change ==&gt; result == stake_pool_res.active.value + stake_pool_res.pending_active.value + stake_pool_res.pending_inactive.value;
+<b>ensures</b> !allow_validator_set_change ==&gt; <b>if</b> (<a href="stake.md#0x1_stake_spec_is_current_epoch_validator">stake::spec_is_current_epoch_validator</a>(pool_address)) {
+    result == stake_pool_res.active.value + stake_pool_res.pending_inactive.value
+} <b>else</b> {
+    result == 0
+};
+<b>ensures</b> result == <a href="aptos_governance.md#0x1_aptos_governance_spec_get_voting_power">spec_get_voting_power</a>(pool_address, <a href="staking_config.md#0x1_staking_config">staking_config</a>);
+</code></pre>
+
+
+
+
+<a id="0x1_aptos_governance_spec_get_voting_power"></a>
+
+
+<pre><code><b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_spec_get_voting_power">spec_get_voting_power</a>(pool_address: <b>address</b>, <a href="staking_config.md#0x1_staking_config">staking_config</a>: <a href="staking_config.md#0x1_staking_config_StakingConfig">staking_config::StakingConfig</a>): u64 {
+   <b>let</b> allow_validator_set_change = <a href="staking_config.md#0x1_staking_config">staking_config</a>.allow_validator_set_change;
+   <b>let</b> stake_pool_res = <b>global</b>&lt;<a href="stake.md#0x1_stake_StakePool">stake::StakePool</a>&gt;(pool_address);
+   <b>if</b> (allow_validator_set_change) {
+       stake_pool_res.active.value + stake_pool_res.pending_active.value + stake_pool_res.pending_inactive.value
+   } <b>else</b> <b>if</b> (!allow_validator_set_change && (<a href="stake.md#0x1_stake_spec_is_current_epoch_validator">stake::spec_is_current_epoch_validator</a>(pool_address))) {
+       stake_pool_res.active.value + stake_pool_res.pending_inactive.value
+   } <b>else</b> {
+       0
+   }
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_get_signer"></a>
+
+### Function `get_signer`
+
+
+<pre><code><b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_get_signer">get_signer</a>(signer_address: <b>address</b>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="aptos_governance.md#0x1_aptos_governance_GetSignerAbortsIf">GetSignerAbortsIf</a>;
+</code></pre>
+
+
+
+
+<a id="0x1_aptos_governance_GetSignerAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="aptos_governance.md#0x1_aptos_governance_GetSignerAbortsIf">GetSignerAbortsIf</a> {
+    signer_address: <b>address</b>;
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_GovernanceResponsbility">GovernanceResponsbility</a>&gt;(@aptos_framework);
+    <b>let</b> cap_map = <b>global</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_GovernanceResponsbility">GovernanceResponsbility</a>&gt;(@aptos_framework).signer_caps;
+    <b>aborts_if</b> !<a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(cap_map, signer_address);
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_create_proposal_metadata"></a>
+
+### Function `create_proposal_metadata`
+
+
+<pre><code><b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_create_proposal_metadata">create_proposal_metadata</a>(metadata_location: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, metadata_hash: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="aptos_governance.md#0x1_aptos_governance_CreateProposalMetadataAbortsIf">CreateProposalMetadataAbortsIf</a>;
+</code></pre>
+
+
+
+
+<a id="0x1_aptos_governance_CreateProposalMetadataAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="aptos_governance.md#0x1_aptos_governance_CreateProposalMetadataAbortsIf">CreateProposalMetadataAbortsIf</a> {
+    metadata_location: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+    metadata_hash: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+    <b>aborts_if</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_length">string::length</a>(utf8(metadata_location)) &gt; 256;
+    <b>aborts_if</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_length">string::length</a>(utf8(metadata_hash)) &gt; 256;
+    <b>aborts_if</b> !<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_spec_internal_check_utf8">string::spec_internal_check_utf8</a>(metadata_location);
+    <b>aborts_if</b> !<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_spec_internal_check_utf8">string::spec_internal_check_utf8</a>(metadata_hash);
+    <b>aborts_if</b> !<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_spec_internal_check_utf8">string::spec_internal_check_utf8</a>(<a href="aptos_governance.md#0x1_aptos_governance_METADATA_LOCATION_KEY">METADATA_LOCATION_KEY</a>);
+    <b>aborts_if</b> !<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_spec_internal_check_utf8">string::spec_internal_check_utf8</a>(<a href="aptos_governance.md#0x1_aptos_governance_METADATA_HASH_KEY">METADATA_HASH_KEY</a>);
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_assert_voting_initialization"></a>
+
+### Function `assert_voting_initialization`
+
+
+<pre><code><b>fun</b> <a href="aptos_governance.md#0x1_aptos_governance_assert_voting_initialization">assert_voting_initialization</a>()
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="aptos_governance.md#0x1_aptos_governance_VotingInitializationAbortIfs">VotingInitializationAbortIfs</a>;
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/block.md b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/block.md
new file mode 100644
index 0000000000000..5e56a8eac0dc7
--- /dev/null
+++ b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/block.md
@@ -0,0 +1,1302 @@
+
+<a id="0x1_block"></a>
+
+# Module `0x1::block`
+
+This module defines a struct storing the metadata of the block and new block events.
+
+
+-  [Resource `BlockResource`](#0x1_block_BlockResource)
+-  [Resource `CommitHistory`](#0x1_block_CommitHistory)
+-  [Struct `NewBlockEvent`](#0x1_block_NewBlockEvent)
+-  [Struct `UpdateEpochIntervalEvent`](#0x1_block_UpdateEpochIntervalEvent)
+-  [Struct `NewBlock`](#0x1_block_NewBlock)
+-  [Struct `UpdateEpochInterval`](#0x1_block_UpdateEpochInterval)
+-  [Constants](#@Constants_0)
+-  [Function `initialize`](#0x1_block_initialize)
+-  [Function `initialize_commit_history`](#0x1_block_initialize_commit_history)
+-  [Function `update_epoch_interval_microsecs`](#0x1_block_update_epoch_interval_microsecs)
+-  [Function `get_epoch_interval_secs`](#0x1_block_get_epoch_interval_secs)
+-  [Function `block_prologue_common`](#0x1_block_block_prologue_common)
+-  [Function `block_prologue`](#0x1_block_block_prologue)
+-  [Function `block_prologue_ext`](#0x1_block_block_prologue_ext)
+-  [Function `get_current_block_height`](#0x1_block_get_current_block_height)
+-  [Function `emit_new_block_event`](#0x1_block_emit_new_block_event)
+-  [Function `emit_genesis_block_event`](#0x1_block_emit_genesis_block_event)
+-  [Function `emit_writeset_block_event`](#0x1_block_emit_writeset_block_event)
+-  [Specification](#@Specification_1)
+    -  [High-level Requirements](#high-level-req)
+    -  [Module-level Specification](#module-level-spec)
+    -  [Resource `BlockResource`](#@Specification_1_BlockResource)
+    -  [Resource `CommitHistory`](#@Specification_1_CommitHistory)
+    -  [Function `initialize`](#@Specification_1_initialize)
+    -  [Function `update_epoch_interval_microsecs`](#@Specification_1_update_epoch_interval_microsecs)
+    -  [Function `get_epoch_interval_secs`](#@Specification_1_get_epoch_interval_secs)
+    -  [Function `block_prologue_common`](#@Specification_1_block_prologue_common)
+    -  [Function `block_prologue`](#@Specification_1_block_prologue)
+    -  [Function `block_prologue_ext`](#@Specification_1_block_prologue_ext)
+    -  [Function `get_current_block_height`](#@Specification_1_get_current_block_height)
+    -  [Function `emit_new_block_event`](#@Specification_1_emit_new_block_event)
+    -  [Function `emit_genesis_block_event`](#@Specification_1_emit_genesis_block_event)
+    -  [Function `emit_writeset_block_event`](#@Specification_1_emit_writeset_block_event)
+
+
+<pre><code><b>use</b> <a href="account.md#0x1_account">0x1::account</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="event.md#0x1_event">0x1::event</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features">0x1::features</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option">0x1::option</a>;
+<b>use</b> <a href="randomness.md#0x1_randomness">0x1::randomness</a>;
+<b>use</b> <a href="reconfiguration.md#0x1_reconfiguration">0x1::reconfiguration</a>;
+<b>use</b> <a href="reconfiguration_with_dkg.md#0x1_reconfiguration_with_dkg">0x1::reconfiguration_with_dkg</a>;
+<b>use</b> <a href="stake.md#0x1_stake">0x1::stake</a>;
+<b>use</b> <a href="state_storage.md#0x1_state_storage">0x1::state_storage</a>;
+<b>use</b> <a href="system_addresses.md#0x1_system_addresses">0x1::system_addresses</a>;
+<b>use</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table_with_length.md#0x1_table_with_length">0x1::table_with_length</a>;
+<b>use</b> <a href="timestamp.md#0x1_timestamp">0x1::timestamp</a>;
+<b>use</b> <a href="transaction_fee.md#0x1_transaction_fee">0x1::transaction_fee</a>;
+</code></pre>
+
+
+
+<a id="0x1_block_BlockResource"></a>
+
+## Resource `BlockResource`
+
+Should be in-sync with BlockResource rust struct in new_block.rs
+
+
+<pre><code><b>struct</b> <a href="block.md#0x1_block_BlockResource">BlockResource</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>height: u64</code>
+</dt>
+<dd>
+ Height of the current block
+</dd>
+<dt>
+<code>epoch_interval: u64</code>
+</dt>
+<dd>
+ Time period between epochs.
+</dd>
+<dt>
+<code>new_block_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="block.md#0x1_block_NewBlockEvent">block::NewBlockEvent</a>&gt;</code>
+</dt>
+<dd>
+ Handle where events with the time of new blocks are emitted
+</dd>
+<dt>
+<code>update_epoch_interval_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="block.md#0x1_block_UpdateEpochIntervalEvent">block::UpdateEpochIntervalEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_block_CommitHistory"></a>
+
+## Resource `CommitHistory`
+
+Store new block events as a move resource, internally using a circular buffer.
+
+
+<pre><code><b>struct</b> <a href="block.md#0x1_block_CommitHistory">CommitHistory</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>max_capacity: u32</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>next_idx: u32</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code><a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table">table</a>: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table_with_length.md#0x1_table_with_length_TableWithLength">table_with_length::TableWithLength</a>&lt;u32, <a href="block.md#0x1_block_NewBlockEvent">block::NewBlockEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_block_NewBlockEvent"></a>
+
+## Struct `NewBlockEvent`
+
+Should be in-sync with NewBlockEvent rust struct in new_block.rs
+
+
+<pre><code><b>struct</b> <a href="block.md#0x1_block_NewBlockEvent">NewBlockEvent</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code><a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/hash.md#0x1_hash">hash</a>: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>epoch: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>round: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>height: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>previous_block_votes_bitvec: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>proposer: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>failed_proposer_indices: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u64&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>time_microseconds: u64</code>
+</dt>
+<dd>
+ On-chain time during the block at the given height
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_block_UpdateEpochIntervalEvent"></a>
+
+## Struct `UpdateEpochIntervalEvent`
+
+Event emitted when a proposal is created.
+
+
+<pre><code><b>struct</b> <a href="block.md#0x1_block_UpdateEpochIntervalEvent">UpdateEpochIntervalEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>old_epoch_interval: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>new_epoch_interval: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_block_NewBlock"></a>
+
+## Struct `NewBlock`
+
+Should be in-sync with NewBlockEvent rust struct in new_block.rs
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="block.md#0x1_block_NewBlock">NewBlock</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code><a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/hash.md#0x1_hash">hash</a>: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>epoch: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>round: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>height: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>previous_block_votes_bitvec: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>proposer: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>failed_proposer_indices: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u64&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>time_microseconds: u64</code>
+</dt>
+<dd>
+ On-chain time during the block at the given height
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_block_UpdateEpochInterval"></a>
+
+## Struct `UpdateEpochInterval`
+
+Event emitted when a proposal is created.
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="block.md#0x1_block_UpdateEpochInterval">UpdateEpochInterval</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>old_epoch_interval: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>new_epoch_interval: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_block_MAX_U64"></a>
+
+
+
+<pre><code><b>const</b> <a href="block.md#0x1_block_MAX_U64">MAX_U64</a>: u64 = 18446744073709551615;
+</code></pre>
+
+
+
+<a id="0x1_block_EINVALID_PROPOSER"></a>
+
+An invalid proposer was provided. Expected the proposer to be the VM or an active validator.
+
+
+<pre><code><b>const</b> <a href="block.md#0x1_block_EINVALID_PROPOSER">EINVALID_PROPOSER</a>: u64 = 2;
+</code></pre>
+
+
+
+<a id="0x1_block_ENUM_NEW_BLOCK_EVENTS_DOES_NOT_MATCH_BLOCK_HEIGHT"></a>
+
+The number of new block events does not equal the current block height.
+
+
+<pre><code><b>const</b> <a href="block.md#0x1_block_ENUM_NEW_BLOCK_EVENTS_DOES_NOT_MATCH_BLOCK_HEIGHT">ENUM_NEW_BLOCK_EVENTS_DOES_NOT_MATCH_BLOCK_HEIGHT</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_block_EZERO_EPOCH_INTERVAL"></a>
+
+Epoch interval cannot be 0.
+
+
+<pre><code><b>const</b> <a href="block.md#0x1_block_EZERO_EPOCH_INTERVAL">EZERO_EPOCH_INTERVAL</a>: u64 = 3;
+</code></pre>
+
+
+
+<a id="0x1_block_EZERO_MAX_CAPACITY"></a>
+
+The maximum capacity of the commit history cannot be 0.
+
+
+<pre><code><b>const</b> <a href="block.md#0x1_block_EZERO_MAX_CAPACITY">EZERO_MAX_CAPACITY</a>: u64 = 3;
+</code></pre>
+
+
+
+<a id="0x1_block_initialize"></a>
+
+## Function `initialize`
+
+This can only be called during Genesis.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="block.md#0x1_block_initialize">initialize</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, epoch_interval_microsecs: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="block.md#0x1_block_initialize">initialize</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, epoch_interval_microsecs: u64) {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(aptos_framework);
+    <b>assert</b>!(epoch_interval_microsecs &gt; 0, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="block.md#0x1_block_EZERO_EPOCH_INTERVAL">EZERO_EPOCH_INTERVAL</a>));
+
+    <b>move_to</b>&lt;<a href="block.md#0x1_block_CommitHistory">CommitHistory</a>&gt;(aptos_framework, <a href="block.md#0x1_block_CommitHistory">CommitHistory</a> {
+        max_capacity: 2000,
+        next_idx: 0,
+        <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table">table</a>: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table_with_length.md#0x1_table_with_length_new">table_with_length::new</a>(),
+    });
+
+    <b>move_to</b>&lt;<a href="block.md#0x1_block_BlockResource">BlockResource</a>&gt;(
+        aptos_framework,
+        <a href="block.md#0x1_block_BlockResource">BlockResource</a> {
+            height: 0,
+            epoch_interval: epoch_interval_microsecs,
+            new_block_events: <a href="account.md#0x1_account_new_event_handle">account::new_event_handle</a>&lt;<a href="block.md#0x1_block_NewBlockEvent">NewBlockEvent</a>&gt;(aptos_framework),
+            update_epoch_interval_events: <a href="account.md#0x1_account_new_event_handle">account::new_event_handle</a>&lt;<a href="block.md#0x1_block_UpdateEpochIntervalEvent">UpdateEpochIntervalEvent</a>&gt;(aptos_framework),
+        }
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_block_initialize_commit_history"></a>
+
+## Function `initialize_commit_history`
+
+Initialize the commit history resource if it's not in genesis.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="block.md#0x1_block_initialize_commit_history">initialize_commit_history</a>(fx: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, max_capacity: u32)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="block.md#0x1_block_initialize_commit_history">initialize_commit_history</a>(fx: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, max_capacity: u32) {
+    <b>assert</b>!(max_capacity &gt; 0, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="block.md#0x1_block_EZERO_MAX_CAPACITY">EZERO_MAX_CAPACITY</a>));
+    <b>move_to</b>&lt;<a href="block.md#0x1_block_CommitHistory">CommitHistory</a>&gt;(fx, <a href="block.md#0x1_block_CommitHistory">CommitHistory</a> {
+        max_capacity,
+        next_idx: 0,
+        <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table">table</a>: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table_with_length.md#0x1_table_with_length_new">table_with_length::new</a>(),
+    });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_block_update_epoch_interval_microsecs"></a>
+
+## Function `update_epoch_interval_microsecs`
+
+Update the epoch interval.
+Can only be called as part of the Aptos governance proposal process established by the AptosGovernance module.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="block.md#0x1_block_update_epoch_interval_microsecs">update_epoch_interval_microsecs</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, new_epoch_interval: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="block.md#0x1_block_update_epoch_interval_microsecs">update_epoch_interval_microsecs</a>(
+    aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    new_epoch_interval: u64,
+) <b>acquires</b> <a href="block.md#0x1_block_BlockResource">BlockResource</a> {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(aptos_framework);
+    <b>assert</b>!(new_epoch_interval &gt; 0, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="block.md#0x1_block_EZERO_EPOCH_INTERVAL">EZERO_EPOCH_INTERVAL</a>));
+
+    <b>let</b> block_resource = <b>borrow_global_mut</b>&lt;<a href="block.md#0x1_block_BlockResource">BlockResource</a>&gt;(@aptos_framework);
+    <b>let</b> old_epoch_interval = block_resource.epoch_interval;
+    block_resource.epoch_interval = new_epoch_interval;
+
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        <a href="event.md#0x1_event_emit">event::emit</a>(
+            <a href="block.md#0x1_block_UpdateEpochInterval">UpdateEpochInterval</a> { old_epoch_interval, new_epoch_interval },
+        );
+    };
+    <a href="event.md#0x1_event_emit_event">event::emit_event</a>&lt;<a href="block.md#0x1_block_UpdateEpochIntervalEvent">UpdateEpochIntervalEvent</a>&gt;(
+        &<b>mut</b> block_resource.update_epoch_interval_events,
+        <a href="block.md#0x1_block_UpdateEpochIntervalEvent">UpdateEpochIntervalEvent</a> { old_epoch_interval, new_epoch_interval },
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_block_get_epoch_interval_secs"></a>
+
+## Function `get_epoch_interval_secs`
+
+Return epoch interval in seconds.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="block.md#0x1_block_get_epoch_interval_secs">get_epoch_interval_secs</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="block.md#0x1_block_get_epoch_interval_secs">get_epoch_interval_secs</a>(): u64 <b>acquires</b> <a href="block.md#0x1_block_BlockResource">BlockResource</a> {
+    <b>borrow_global</b>&lt;<a href="block.md#0x1_block_BlockResource">BlockResource</a>&gt;(@aptos_framework).epoch_interval / 1000000
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_block_block_prologue_common"></a>
+
+## Function `block_prologue_common`
+
+
+
+<pre><code><b>fun</b> <a href="block.md#0x1_block_block_prologue_common">block_prologue_common</a>(vm: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/hash.md#0x1_hash">hash</a>: <b>address</b>, epoch: u64, round: u64, proposer: <b>address</b>, failed_proposer_indices: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u64&gt;, previous_block_votes_bitvec: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, <a href="timestamp.md#0x1_timestamp">timestamp</a>: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="block.md#0x1_block_block_prologue_common">block_prologue_common</a>(
+    vm: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/hash.md#0x1_hash">hash</a>: <b>address</b>,
+    epoch: u64,
+    round: u64,
+    proposer: <b>address</b>,
+    failed_proposer_indices: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u64&gt;,
+    previous_block_votes_bitvec: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    <a href="timestamp.md#0x1_timestamp">timestamp</a>: u64
+): u64 <b>acquires</b> <a href="block.md#0x1_block_BlockResource">BlockResource</a>, <a href="block.md#0x1_block_CommitHistory">CommitHistory</a> {
+    // Operational constraint: can only be invoked by the VM.
+    <a href="system_addresses.md#0x1_system_addresses_assert_vm">system_addresses::assert_vm</a>(vm);
+
+    // Blocks can only be produced by a valid proposer or by the VM itself for Nil blocks (no user txs).
+    <b>assert</b>!(
+        proposer == @vm_reserved || <a href="stake.md#0x1_stake_is_current_epoch_validator">stake::is_current_epoch_validator</a>(proposer),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="block.md#0x1_block_EINVALID_PROPOSER">EINVALID_PROPOSER</a>),
+    );
+
+    <b>let</b> proposer_index = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>();
+    <b>if</b> (proposer != @vm_reserved) {
+        proposer_index = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(<a href="stake.md#0x1_stake_get_validator_index">stake::get_validator_index</a>(proposer));
+    };
+
+    <b>let</b> block_metadata_ref = <b>borrow_global_mut</b>&lt;<a href="block.md#0x1_block_BlockResource">BlockResource</a>&gt;(@aptos_framework);
+    block_metadata_ref.height = <a href="event.md#0x1_event_counter">event::counter</a>(&block_metadata_ref.new_block_events);
+
+    // Emit both <a href="event.md#0x1_event">event</a> v1 and v2 for compatibility. Eventually only <b>module</b> events will be kept.
+    <b>let</b> new_block_event = <a href="block.md#0x1_block_NewBlockEvent">NewBlockEvent</a> {
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/hash.md#0x1_hash">hash</a>,
+        epoch,
+        round,
+        height: block_metadata_ref.height,
+        previous_block_votes_bitvec,
+        proposer,
+        failed_proposer_indices,
+        time_microseconds: <a href="timestamp.md#0x1_timestamp">timestamp</a>,
+    };
+    <b>let</b> new_block_event_v2 = <a href="block.md#0x1_block_NewBlock">NewBlock</a> {
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/hash.md#0x1_hash">hash</a>,
+        epoch,
+        round,
+        height: block_metadata_ref.height,
+        previous_block_votes_bitvec,
+        proposer,
+        failed_proposer_indices,
+        time_microseconds: <a href="timestamp.md#0x1_timestamp">timestamp</a>,
+    };
+    <a href="block.md#0x1_block_emit_new_block_event">emit_new_block_event</a>(vm, &<b>mut</b> block_metadata_ref.new_block_events, new_block_event, new_block_event_v2);
+
+    <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_collect_and_distribute_gas_fees">features::collect_and_distribute_gas_fees</a>()) {
+        // Assign the fees collected from the previous <a href="block.md#0x1_block">block</a> <b>to</b> the previous <a href="block.md#0x1_block">block</a> proposer.
+        // If for <a href="../../../aptos-stdlib/tests/compiler-v2-doc/any.md#0x1_any">any</a> reason the fees cannot be assigned, this function burns the collected coins.
+        <a href="transaction_fee.md#0x1_transaction_fee_process_collected_fees">transaction_fee::process_collected_fees</a>();
+        // Set the proposer of this <a href="block.md#0x1_block">block</a> <b>as</b> the receiver of the fees, so that the fees for this
+        // <a href="block.md#0x1_block">block</a> are assigned <b>to</b> the right <a href="account.md#0x1_account">account</a>.
+        <a href="transaction_fee.md#0x1_transaction_fee_register_proposer_for_fee_collection">transaction_fee::register_proposer_for_fee_collection</a>(proposer);
+    };
+
+    // Performance scores have <b>to</b> be updated before the epoch transition <b>as</b> the transaction that triggers the
+    // transition is the last <a href="block.md#0x1_block">block</a> in the previous epoch.
+    <a href="stake.md#0x1_stake_update_performance_statistics">stake::update_performance_statistics</a>(proposer_index, failed_proposer_indices);
+    <a href="state_storage.md#0x1_state_storage_on_new_block">state_storage::on_new_block</a>(<a href="reconfiguration.md#0x1_reconfiguration_current_epoch">reconfiguration::current_epoch</a>());
+
+    block_metadata_ref.epoch_interval
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_block_block_prologue"></a>
+
+## Function `block_prologue`
+
+Set the metadata for the current block.
+The runtime always runs this before executing the transactions in a block.
+
+
+<pre><code><b>fun</b> <a href="block.md#0x1_block_block_prologue">block_prologue</a>(vm: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/hash.md#0x1_hash">hash</a>: <b>address</b>, epoch: u64, round: u64, proposer: <b>address</b>, failed_proposer_indices: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u64&gt;, previous_block_votes_bitvec: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, <a href="timestamp.md#0x1_timestamp">timestamp</a>: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="block.md#0x1_block_block_prologue">block_prologue</a>(
+    vm: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/hash.md#0x1_hash">hash</a>: <b>address</b>,
+    epoch: u64,
+    round: u64,
+    proposer: <b>address</b>,
+    failed_proposer_indices: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u64&gt;,
+    previous_block_votes_bitvec: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    <a href="timestamp.md#0x1_timestamp">timestamp</a>: u64
+) <b>acquires</b> <a href="block.md#0x1_block_BlockResource">BlockResource</a>, <a href="block.md#0x1_block_CommitHistory">CommitHistory</a> {
+    <b>let</b> epoch_interval = <a href="block.md#0x1_block_block_prologue_common">block_prologue_common</a>(&vm, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/hash.md#0x1_hash">hash</a>, epoch, round, proposer, failed_proposer_indices, previous_block_votes_bitvec, <a href="timestamp.md#0x1_timestamp">timestamp</a>);
+    <a href="randomness.md#0x1_randomness_on_new_block">randomness::on_new_block</a>(&vm, epoch, round, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>());
+    <b>if</b> (<a href="timestamp.md#0x1_timestamp">timestamp</a> - <a href="reconfiguration.md#0x1_reconfiguration_last_reconfiguration_time">reconfiguration::last_reconfiguration_time</a>() &gt;= epoch_interval) {
+        <a href="reconfiguration.md#0x1_reconfiguration_reconfigure">reconfiguration::reconfigure</a>();
+    };
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_block_block_prologue_ext"></a>
+
+## Function `block_prologue_ext`
+
+<code><a href="block.md#0x1_block_block_prologue">block_prologue</a>()</code> but trigger reconfiguration with DKG after epoch timed out.
+
+
+<pre><code><b>fun</b> <a href="block.md#0x1_block_block_prologue_ext">block_prologue_ext</a>(vm: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/hash.md#0x1_hash">hash</a>: <b>address</b>, epoch: u64, round: u64, proposer: <b>address</b>, failed_proposer_indices: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u64&gt;, previous_block_votes_bitvec: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, <a href="timestamp.md#0x1_timestamp">timestamp</a>: u64, randomness_seed: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="block.md#0x1_block_block_prologue_ext">block_prologue_ext</a>(
+    vm: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/hash.md#0x1_hash">hash</a>: <b>address</b>,
+    epoch: u64,
+    round: u64,
+    proposer: <b>address</b>,
+    failed_proposer_indices: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u64&gt;,
+    previous_block_votes_bitvec: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    <a href="timestamp.md#0x1_timestamp">timestamp</a>: u64,
+    randomness_seed: Option&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;,
+) <b>acquires</b> <a href="block.md#0x1_block_BlockResource">BlockResource</a>, <a href="block.md#0x1_block_CommitHistory">CommitHistory</a> {
+    <b>let</b> epoch_interval = <a href="block.md#0x1_block_block_prologue_common">block_prologue_common</a>(
+        &vm,
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/hash.md#0x1_hash">hash</a>,
+        epoch,
+        round,
+        proposer,
+        failed_proposer_indices,
+        previous_block_votes_bitvec,
+        <a href="timestamp.md#0x1_timestamp">timestamp</a>
+    );
+    <a href="randomness.md#0x1_randomness_on_new_block">randomness::on_new_block</a>(&vm, epoch, round, randomness_seed);
+
+    <b>if</b> (<a href="timestamp.md#0x1_timestamp">timestamp</a> - <a href="reconfiguration.md#0x1_reconfiguration_last_reconfiguration_time">reconfiguration::last_reconfiguration_time</a>() &gt;= epoch_interval) {
+        <a href="reconfiguration_with_dkg.md#0x1_reconfiguration_with_dkg_try_start">reconfiguration_with_dkg::try_start</a>();
+    };
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_block_get_current_block_height"></a>
+
+## Function `get_current_block_height`
+
+Get the current block height
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="block.md#0x1_block_get_current_block_height">get_current_block_height</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="block.md#0x1_block_get_current_block_height">get_current_block_height</a>(): u64 <b>acquires</b> <a href="block.md#0x1_block_BlockResource">BlockResource</a> {
+    <b>borrow_global</b>&lt;<a href="block.md#0x1_block_BlockResource">BlockResource</a>&gt;(@aptos_framework).height
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_block_emit_new_block_event"></a>
+
+## Function `emit_new_block_event`
+
+Emit the event and update height and global timestamp
+
+
+<pre><code><b>fun</b> <a href="block.md#0x1_block_emit_new_block_event">emit_new_block_event</a>(vm: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, event_handle: &<b>mut</b> <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="block.md#0x1_block_NewBlockEvent">block::NewBlockEvent</a>&gt;, new_block_event: <a href="block.md#0x1_block_NewBlockEvent">block::NewBlockEvent</a>, new_block_event_v2: <a href="block.md#0x1_block_NewBlock">block::NewBlock</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="block.md#0x1_block_emit_new_block_event">emit_new_block_event</a>(
+    vm: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    event_handle: &<b>mut</b> EventHandle&lt;<a href="block.md#0x1_block_NewBlockEvent">NewBlockEvent</a>&gt;,
+    new_block_event: <a href="block.md#0x1_block_NewBlockEvent">NewBlockEvent</a>,
+    new_block_event_v2: <a href="block.md#0x1_block_NewBlock">NewBlock</a>
+) <b>acquires</b> <a href="block.md#0x1_block_CommitHistory">CommitHistory</a> {
+    <b>if</b> (<b>exists</b>&lt;<a href="block.md#0x1_block_CommitHistory">CommitHistory</a>&gt;(@aptos_framework)) {
+        <b>let</b> commit_history_ref = <b>borrow_global_mut</b>&lt;<a href="block.md#0x1_block_CommitHistory">CommitHistory</a>&gt;(@aptos_framework);
+        <b>let</b> idx = commit_history_ref.next_idx;
+        <b>if</b> (<a href="../../../aptos-stdlib/tests/compiler-v2-doc/table_with_length.md#0x1_table_with_length_contains">table_with_length::contains</a>(&commit_history_ref.<a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table">table</a>, idx)) {
+            <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table_with_length.md#0x1_table_with_length_remove">table_with_length::remove</a>(&<b>mut</b> commit_history_ref.<a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table">table</a>, idx);
+        };
+        <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table_with_length.md#0x1_table_with_length_add">table_with_length::add</a>(&<b>mut</b> commit_history_ref.<a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table">table</a>, idx, <b>copy</b> new_block_event);
+        <b>spec</b> {
+            <b>assume</b> idx + 1 &lt;= MAX_U32;
+        };
+        commit_history_ref.next_idx = (idx + 1) % commit_history_ref.max_capacity;
+    };
+    <a href="timestamp.md#0x1_timestamp_update_global_time">timestamp::update_global_time</a>(vm, new_block_event.proposer, new_block_event.time_microseconds);
+    <b>assert</b>!(
+        <a href="event.md#0x1_event_counter">event::counter</a>(event_handle) == new_block_event.height,
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="block.md#0x1_block_ENUM_NEW_BLOCK_EVENTS_DOES_NOT_MATCH_BLOCK_HEIGHT">ENUM_NEW_BLOCK_EVENTS_DOES_NOT_MATCH_BLOCK_HEIGHT</a>),
+    );
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        <a href="event.md#0x1_event_emit">event::emit</a>(new_block_event_v2);
+    };
+    <a href="event.md#0x1_event_emit_event">event::emit_event</a>&lt;<a href="block.md#0x1_block_NewBlockEvent">NewBlockEvent</a>&gt;(event_handle, new_block_event);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_block_emit_genesis_block_event"></a>
+
+## Function `emit_genesis_block_event`
+
+Emit a <code><a href="block.md#0x1_block_NewBlockEvent">NewBlockEvent</a></code> event. This function will be invoked by genesis directly to generate the very first
+reconfiguration event.
+
+
+<pre><code><b>fun</b> <a href="block.md#0x1_block_emit_genesis_block_event">emit_genesis_block_event</a>(vm: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="block.md#0x1_block_emit_genesis_block_event">emit_genesis_block_event</a>(vm: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>) <b>acquires</b> <a href="block.md#0x1_block_BlockResource">BlockResource</a>, <a href="block.md#0x1_block_CommitHistory">CommitHistory</a> {
+    <b>let</b> block_metadata_ref = <b>borrow_global_mut</b>&lt;<a href="block.md#0x1_block_BlockResource">BlockResource</a>&gt;(@aptos_framework);
+    <b>let</b> genesis_id = @0x0;
+    <a href="block.md#0x1_block_emit_new_block_event">emit_new_block_event</a>(
+        &vm,
+        &<b>mut</b> block_metadata_ref.new_block_events,
+        <a href="block.md#0x1_block_NewBlockEvent">NewBlockEvent</a> {
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/hash.md#0x1_hash">hash</a>: genesis_id,
+            epoch: 0,
+            round: 0,
+            height: 0,
+            previous_block_votes_bitvec: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_empty">vector::empty</a>(),
+            proposer: @vm_reserved,
+            failed_proposer_indices: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_empty">vector::empty</a>(),
+            time_microseconds: 0,
+        },
+        <a href="block.md#0x1_block_NewBlock">NewBlock</a> {
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/hash.md#0x1_hash">hash</a>: genesis_id,
+            epoch: 0,
+            round: 0,
+            height: 0,
+            previous_block_votes_bitvec: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_empty">vector::empty</a>(),
+            proposer: @vm_reserved,
+            failed_proposer_indices: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_empty">vector::empty</a>(),
+            time_microseconds: 0,
+        }
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_block_emit_writeset_block_event"></a>
+
+## Function `emit_writeset_block_event`
+
+Emit a <code><a href="block.md#0x1_block_NewBlockEvent">NewBlockEvent</a></code> event. This function will be invoked by write set script directly to generate the
+new block event for WriteSetPayload.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="block.md#0x1_block_emit_writeset_block_event">emit_writeset_block_event</a>(vm_signer: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, fake_block_hash: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="block.md#0x1_block_emit_writeset_block_event">emit_writeset_block_event</a>(vm_signer: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, fake_block_hash: <b>address</b>) <b>acquires</b> <a href="block.md#0x1_block_BlockResource">BlockResource</a>, <a href="block.md#0x1_block_CommitHistory">CommitHistory</a> {
+    <a href="system_addresses.md#0x1_system_addresses_assert_vm">system_addresses::assert_vm</a>(vm_signer);
+    <b>let</b> block_metadata_ref = <b>borrow_global_mut</b>&lt;<a href="block.md#0x1_block_BlockResource">BlockResource</a>&gt;(@aptos_framework);
+    block_metadata_ref.height = <a href="event.md#0x1_event_counter">event::counter</a>(&block_metadata_ref.new_block_events);
+
+    <a href="block.md#0x1_block_emit_new_block_event">emit_new_block_event</a>(
+        vm_signer,
+        &<b>mut</b> block_metadata_ref.new_block_events,
+        <a href="block.md#0x1_block_NewBlockEvent">NewBlockEvent</a> {
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/hash.md#0x1_hash">hash</a>: fake_block_hash,
+            epoch: <a href="reconfiguration.md#0x1_reconfiguration_current_epoch">reconfiguration::current_epoch</a>(),
+            round: <a href="block.md#0x1_block_MAX_U64">MAX_U64</a>,
+            height: block_metadata_ref.height,
+            previous_block_votes_bitvec: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_empty">vector::empty</a>(),
+            proposer: @vm_reserved,
+            failed_proposer_indices: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_empty">vector::empty</a>(),
+            time_microseconds: <a href="timestamp.md#0x1_timestamp_now_microseconds">timestamp::now_microseconds</a>(),
+        },
+        <a href="block.md#0x1_block_NewBlock">NewBlock</a> {
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/hash.md#0x1_hash">hash</a>: fake_block_hash,
+            epoch: <a href="reconfiguration.md#0x1_reconfiguration_current_epoch">reconfiguration::current_epoch</a>(),
+            round: <a href="block.md#0x1_block_MAX_U64">MAX_U64</a>,
+            height: block_metadata_ref.height,
+            previous_block_votes_bitvec: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_empty">vector::empty</a>(),
+            proposer: @vm_reserved,
+            failed_proposer_indices: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_empty">vector::empty</a>(),
+            time_microseconds: <a href="timestamp.md#0x1_timestamp_now_microseconds">timestamp::now_microseconds</a>(),
+        }
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+
+
+<a id="high-level-req"></a>
+
+### High-level Requirements
+
+<table>
+<tr>
+<th>No.</th><th>Requirement</th><th>Criticality</th><th>Implementation</th><th>Enforcement</th>
+</tr>
+
+<tr>
+<td>1</td>
+<td>During the module's initialization, it guarantees that the BlockResource resource moves under the Aptos framework account with initial values.</td>
+<td>High</td>
+<td>The initialize function is responsible for setting up the initial state of the module, ensuring that the following conditions are met (1) the BlockResource resource is created, indicating its existence within the module's context, and moved under the Aptos framework account, (2) the block height is set to zero during initialization, and (3) the epoch interval is greater than zero.</td>
+<td>Formally Verified via <a href="#high-level-req-1">Initialize</a>.</td>
+</tr>
+
+<tr>
+<td>2</td>
+<td>Only the Aptos framework address may execute the following functionalities: (1) initialize BlockResource, and (2) update the epoch interval.</td>
+<td>Critical</td>
+<td>The initialize and  update_epoch_interval_microsecs functions ensure that only aptos_framework can call them.</td>
+<td>Formally Verified via <a href="#high-level-req-2.1">Initialize</a> and <a href="#high-level-req-2.2">update_epoch_interval_microsecs</a>.</td>
+</tr>
+
+<tr>
+<td>3</td>
+<td>When updating the epoch interval, its value must be greater than zero and BlockResource must exist.</td>
+<td>High</td>
+<td>The update_epoch_interval_microsecs function asserts that new_epoch_interval is greater than zero and updates BlockResource's state.</td>
+<td>Formally verified via <a href="#high-level-req-3.1">UpdateEpochIntervalMicrosecs</a> and <a href="#high-level-req-3.2">epoch_interval</a>.</td>
+</tr>
+
+<tr>
+<td>4</td>
+<td>Only a valid proposer or the virtual machine is authorized to produce blocks.</td>
+<td>Critical</td>
+<td>During the execution of the block_prologue function, the validity of the proposer address is verified when setting the metadata for the current block.</td>
+<td>Formally Verified via <a href="#high-level-req-4">block_prologue</a>.</td>
+</tr>
+
+<tr>
+<td>5</td>
+<td>While emitting a new block event, the number of them is equal to the current block height.</td>
+<td>Medium</td>
+<td>The emit_new_block_event function asserts that the number of new block events equals the current block height.</td>
+<td>Formally Verified via <a href="#high-level-req-5">emit_new_block_event</a>.</td>
+</tr>
+
+</table>
+
+
+
+
+<a id="module-level-spec"></a>
+
+### Module-level Specification
+
+
+<pre><code><b>invariant</b> [suspendable] <a href="chain_status.md#0x1_chain_status_is_operating">chain_status::is_operating</a>() ==&gt; <b>exists</b>&lt;<a href="block.md#0x1_block_BlockResource">BlockResource</a>&gt;(@aptos_framework);
+<b>invariant</b> [suspendable] <a href="chain_status.md#0x1_chain_status_is_operating">chain_status::is_operating</a>() ==&gt; <b>exists</b>&lt;<a href="block.md#0x1_block_CommitHistory">CommitHistory</a>&gt;(@aptos_framework);
+</code></pre>
+
+
+
+<a id="@Specification_1_BlockResource"></a>
+
+### Resource `BlockResource`
+
+
+<pre><code><b>struct</b> <a href="block.md#0x1_block_BlockResource">BlockResource</a> <b>has</b> key
+</code></pre>
+
+
+
+<dl>
+<dt>
+<code>height: u64</code>
+</dt>
+<dd>
+ Height of the current block
+</dd>
+<dt>
+<code>epoch_interval: u64</code>
+</dt>
+<dd>
+ Time period between epochs.
+</dd>
+<dt>
+<code>new_block_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="block.md#0x1_block_NewBlockEvent">block::NewBlockEvent</a>&gt;</code>
+</dt>
+<dd>
+ Handle where events with the time of new blocks are emitted
+</dd>
+<dt>
+<code>update_epoch_interval_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="block.md#0x1_block_UpdateEpochIntervalEvent">block::UpdateEpochIntervalEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+
+<pre><code>// This enforces <a id="high-level-req-3.2" href="#high-level-req">high-level requirement 3</a>:
+<b>invariant</b> epoch_interval &gt; 0;
+</code></pre>
+
+
+
+<a id="@Specification_1_CommitHistory"></a>
+
+### Resource `CommitHistory`
+
+
+<pre><code><b>struct</b> <a href="block.md#0x1_block_CommitHistory">CommitHistory</a> <b>has</b> key
+</code></pre>
+
+
+
+<dl>
+<dt>
+<code>max_capacity: u32</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>next_idx: u32</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code><a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table">table</a>: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table_with_length.md#0x1_table_with_length_TableWithLength">table_with_length::TableWithLength</a>&lt;u32, <a href="block.md#0x1_block_NewBlockEvent">block::NewBlockEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+
+<pre><code><b>invariant</b> max_capacity &gt; 0;
+</code></pre>
+
+
+
+<a id="@Specification_1_initialize"></a>
+
+### Function `initialize`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="block.md#0x1_block_initialize">initialize</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, epoch_interval_microsecs: u64)
+</code></pre>
+
+
+The caller is aptos_framework.
+The new_epoch_interval must be greater than 0.
+The BlockResource is not under the caller before initializing.
+The Account is not under the caller until the BlockResource is created for the caller.
+Make sure The BlockResource under the caller existed after initializing.
+The number of new events created does not exceed MAX_U64.
+
+
+<pre><code>// This enforces <a id="high-level-req-1" href="#high-level-req">high-level requirement 1</a>:
+<b>include</b> <a href="block.md#0x1_block_Initialize">Initialize</a>;
+<b>include</b> <a href="block.md#0x1_block_NewEventHandle">NewEventHandle</a>;
+<b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(aptos_framework);
+<b>let</b> <a href="account.md#0x1_account">account</a> = <b>global</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(addr);
+<b>aborts_if</b> <a href="account.md#0x1_account">account</a>.guid_creation_num + 2 &gt;= <a href="account.md#0x1_account_MAX_GUID_CREATION_NUM">account::MAX_GUID_CREATION_NUM</a>;
+</code></pre>
+
+
+
+<a id="@Specification_1_update_epoch_interval_microsecs"></a>
+
+### Function `update_epoch_interval_microsecs`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="block.md#0x1_block_update_epoch_interval_microsecs">update_epoch_interval_microsecs</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, new_epoch_interval: u64)
+</code></pre>
+
+
+The caller is @aptos_framework.
+The new_epoch_interval must be greater than 0.
+The BlockResource existed under the @aptos_framework.
+
+
+<pre><code>// This enforces <a id="high-level-req-3.1" href="#high-level-req">high-level requirement 3</a>:
+<b>include</b> <a href="block.md#0x1_block_UpdateEpochIntervalMicrosecs">UpdateEpochIntervalMicrosecs</a>;
+</code></pre>
+
+
+
+
+<a id="0x1_block_UpdateEpochIntervalMicrosecs"></a>
+
+
+<pre><code><b>schema</b> <a href="block.md#0x1_block_UpdateEpochIntervalMicrosecs">UpdateEpochIntervalMicrosecs</a> {
+    aptos_framework: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>;
+    new_epoch_interval: u64;
+    <b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(aptos_framework);
+    // This enforces <a id="high-level-req-2.2" href="#high-level-req">high-level requirement 2</a>:
+    <b>aborts_if</b> addr != @aptos_framework;
+    <b>aborts_if</b> new_epoch_interval == 0;
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="block.md#0x1_block_BlockResource">BlockResource</a>&gt;(addr);
+    <b>let</b> <b>post</b> block_resource = <b>global</b>&lt;<a href="block.md#0x1_block_BlockResource">BlockResource</a>&gt;(addr);
+    <b>ensures</b> block_resource.epoch_interval == new_epoch_interval;
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_get_epoch_interval_secs"></a>
+
+### Function `get_epoch_interval_secs`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="block.md#0x1_block_get_epoch_interval_secs">get_epoch_interval_secs</a>(): u64
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="block.md#0x1_block_BlockResource">BlockResource</a>&gt;(@aptos_framework);
+</code></pre>
+
+
+
+<a id="@Specification_1_block_prologue_common"></a>
+
+### Function `block_prologue_common`
+
+
+<pre><code><b>fun</b> <a href="block.md#0x1_block_block_prologue_common">block_prologue_common</a>(vm: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/hash.md#0x1_hash">hash</a>: <b>address</b>, epoch: u64, round: u64, proposer: <b>address</b>, failed_proposer_indices: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u64&gt;, previous_block_votes_bitvec: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, <a href="timestamp.md#0x1_timestamp">timestamp</a>: u64): u64
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify_duration_estimate = 1000;
+<b>include</b> <a href="block.md#0x1_block_BlockRequirement">BlockRequirement</a>;
+<b>aborts_if</b> <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_block_prologue"></a>
+
+### Function `block_prologue`
+
+
+<pre><code><b>fun</b> <a href="block.md#0x1_block_block_prologue">block_prologue</a>(vm: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/hash.md#0x1_hash">hash</a>: <b>address</b>, epoch: u64, round: u64, proposer: <b>address</b>, failed_proposer_indices: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u64&gt;, previous_block_votes_bitvec: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, <a href="timestamp.md#0x1_timestamp">timestamp</a>: u64)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify_duration_estimate = 1000;
+<b>requires</b> <a href="timestamp.md#0x1_timestamp">timestamp</a> &gt;= <a href="reconfiguration.md#0x1_reconfiguration_last_reconfiguration_time">reconfiguration::last_reconfiguration_time</a>();
+<b>include</b> <a href="block.md#0x1_block_BlockRequirement">BlockRequirement</a>;
+<b>aborts_if</b> <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_block_prologue_ext"></a>
+
+### Function `block_prologue_ext`
+
+
+<pre><code><b>fun</b> <a href="block.md#0x1_block_block_prologue_ext">block_prologue_ext</a>(vm: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/hash.md#0x1_hash">hash</a>: <b>address</b>, epoch: u64, round: u64, proposer: <b>address</b>, failed_proposer_indices: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u64&gt;, previous_block_votes_bitvec: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, <a href="timestamp.md#0x1_timestamp">timestamp</a>: u64, randomness_seed: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify_duration_estimate = 1000;
+<b>requires</b> <a href="timestamp.md#0x1_timestamp">timestamp</a> &gt;= <a href="reconfiguration.md#0x1_reconfiguration_last_reconfiguration_time">reconfiguration::last_reconfiguration_time</a>();
+<b>include</b> <a href="block.md#0x1_block_BlockRequirement">BlockRequirement</a>;
+<b>include</b> <a href="stake.md#0x1_stake_ResourceRequirement">stake::ResourceRequirement</a>;
+<b>include</b> <a href="stake.md#0x1_stake_GetReconfigStartTimeRequirement">stake::GetReconfigStartTimeRequirement</a>;
+<b>aborts_if</b> <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_get_current_block_height"></a>
+
+### Function `get_current_block_height`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="block.md#0x1_block_get_current_block_height">get_current_block_height</a>(): u64
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="block.md#0x1_block_BlockResource">BlockResource</a>&gt;(@aptos_framework);
+</code></pre>
+
+
+
+<a id="@Specification_1_emit_new_block_event"></a>
+
+### Function `emit_new_block_event`
+
+
+<pre><code><b>fun</b> <a href="block.md#0x1_block_emit_new_block_event">emit_new_block_event</a>(vm: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, event_handle: &<b>mut</b> <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="block.md#0x1_block_NewBlockEvent">block::NewBlockEvent</a>&gt;, new_block_event: <a href="block.md#0x1_block_NewBlockEvent">block::NewBlockEvent</a>, new_block_event_v2: <a href="block.md#0x1_block_NewBlock">block::NewBlock</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> proposer = new_block_event.proposer;
+<b>let</b> <a href="timestamp.md#0x1_timestamp">timestamp</a> = new_block_event.time_microseconds;
+<b>requires</b> <a href="chain_status.md#0x1_chain_status_is_operating">chain_status::is_operating</a>();
+<b>requires</b> <a href="system_addresses.md#0x1_system_addresses_is_vm">system_addresses::is_vm</a>(vm);
+<b>requires</b> (proposer == @vm_reserved) ==&gt; (<a href="timestamp.md#0x1_timestamp_spec_now_microseconds">timestamp::spec_now_microseconds</a>() == <a href="timestamp.md#0x1_timestamp">timestamp</a>);
+<b>requires</b> (proposer != @vm_reserved) ==&gt; (<a href="timestamp.md#0x1_timestamp_spec_now_microseconds">timestamp::spec_now_microseconds</a>() &lt; <a href="timestamp.md#0x1_timestamp">timestamp</a>);
+// This enforces <a id="high-level-req-5" href="#high-level-req">high-level requirement 5</a>:
+<b>requires</b> <a href="event.md#0x1_event_counter">event::counter</a>(event_handle) == new_block_event.height;
+<b>aborts_if</b> <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_emit_genesis_block_event"></a>
+
+### Function `emit_genesis_block_event`
+
+
+<pre><code><b>fun</b> <a href="block.md#0x1_block_emit_genesis_block_event">emit_genesis_block_event</a>(vm: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>requires</b> <a href="chain_status.md#0x1_chain_status_is_operating">chain_status::is_operating</a>();
+<b>requires</b> <a href="system_addresses.md#0x1_system_addresses_is_vm">system_addresses::is_vm</a>(vm);
+<b>requires</b> <a href="event.md#0x1_event_counter">event::counter</a>(<b>global</b>&lt;<a href="block.md#0x1_block_BlockResource">BlockResource</a>&gt;(@aptos_framework).new_block_events) == 0;
+<b>requires</b> (<a href="timestamp.md#0x1_timestamp_spec_now_microseconds">timestamp::spec_now_microseconds</a>() == 0);
+<b>aborts_if</b> <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_emit_writeset_block_event"></a>
+
+### Function `emit_writeset_block_event`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="block.md#0x1_block_emit_writeset_block_event">emit_writeset_block_event</a>(vm_signer: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, fake_block_hash: <b>address</b>)
+</code></pre>
+
+
+The caller is @vm_reserved.
+The BlockResource existed under the @aptos_framework.
+The Configuration existed under the @aptos_framework.
+The CurrentTimeMicroseconds existed under the @aptos_framework.
+
+
+<pre><code><b>requires</b> <a href="chain_status.md#0x1_chain_status_is_operating">chain_status::is_operating</a>();
+<b>include</b> <a href="block.md#0x1_block_EmitWritesetBlockEvent">EmitWritesetBlockEvent</a>;
+</code></pre>
+
+
+
+
+<a id="0x1_block_EmitWritesetBlockEvent"></a>
+
+
+<pre><code><b>schema</b> <a href="block.md#0x1_block_EmitWritesetBlockEvent">EmitWritesetBlockEvent</a> {
+    vm_signer: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>;
+    <b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(vm_signer);
+    <b>aborts_if</b> addr != @vm_reserved;
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="block.md#0x1_block_BlockResource">BlockResource</a>&gt;(@aptos_framework);
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="reconfiguration.md#0x1_reconfiguration_Configuration">reconfiguration::Configuration</a>&gt;(@aptos_framework);
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="timestamp.md#0x1_timestamp_CurrentTimeMicroseconds">timestamp::CurrentTimeMicroseconds</a>&gt;(@aptos_framework);
+}
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/chain_id.md b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/chain_id.md
new file mode 100644
index 0000000000000..7a40b807b0418
--- /dev/null
+++ b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/chain_id.md
@@ -0,0 +1,192 @@
+
+<a id="0x1_chain_id"></a>
+
+# Module `0x1::chain_id`
+
+The chain id distinguishes between different chains (e.g., testnet and the main network).
+One important role is to prevent transactions intended for one chain from being executed on another.
+This code provides a container for storing a chain id and functions to initialize and get it.
+
+
+-  [Resource `ChainId`](#0x1_chain_id_ChainId)
+-  [Function `initialize`](#0x1_chain_id_initialize)
+-  [Function `get`](#0x1_chain_id_get)
+-  [Specification](#@Specification_0)
+    -  [High-level Requirements](#high-level-req)
+    -  [Module-level Specification](#module-level-spec)
+    -  [Function `initialize`](#@Specification_0_initialize)
+    -  [Function `get`](#@Specification_0_get)
+
+
+<pre><code><b>use</b> <a href="system_addresses.md#0x1_system_addresses">0x1::system_addresses</a>;
+</code></pre>
+
+
+
+<a id="0x1_chain_id_ChainId"></a>
+
+## Resource `ChainId`
+
+
+
+<pre><code><b>struct</b> <a href="chain_id.md#0x1_chain_id_ChainId">ChainId</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>id: u8</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_chain_id_initialize"></a>
+
+## Function `initialize`
+
+Only called during genesis.
+Publish the chain ID <code>id</code> of this instance under the SystemAddresses address
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="chain_id.md#0x1_chain_id_initialize">initialize</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, id: u8)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="chain_id.md#0x1_chain_id_initialize">initialize</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, id: u8) {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(aptos_framework);
+    <b>move_to</b>(aptos_framework, <a href="chain_id.md#0x1_chain_id_ChainId">ChainId</a> { id })
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_chain_id_get"></a>
+
+## Function `get`
+
+Return the chain ID of this instance.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="chain_id.md#0x1_chain_id_get">get</a>(): u8
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="chain_id.md#0x1_chain_id_get">get</a>(): u8 <b>acquires</b> <a href="chain_id.md#0x1_chain_id_ChainId">ChainId</a> {
+    <b>borrow_global</b>&lt;<a href="chain_id.md#0x1_chain_id_ChainId">ChainId</a>&gt;(@aptos_framework).id
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_0"></a>
+
+## Specification
+
+
+
+
+<a id="high-level-req"></a>
+
+### High-level Requirements
+
+<table>
+<tr>
+<th>No.</th><th>Requirement</th><th>Criticality</th><th>Implementation</th><th>Enforcement</th>
+</tr>
+
+<tr>
+<td>1</td>
+<td>During genesis, the ChainId resource should be created and moved under the Aptos framework account with the specified chain id.</td>
+<td>Medium</td>
+<td>The chain_id::initialize function is responsible for generating the ChainId resource and then storing it under the aptos_framework account.</td>
+<td>Formally verified via <a href="#high-level-req-1">initialize</a>.</td>
+</tr>
+
+<tr>
+<td>2</td>
+<td>The chain id can only be fetched if the chain id resource exists under the Aptos framework account.</td>
+<td>Low</td>
+<td>The chain_id::get function fetches the chain id by borrowing the ChainId resource from the aptos_framework account.</td>
+<td>Formally verified via <a href="#high-level-req-2">get</a>.</td>
+</tr>
+
+</table>
+
+
+
+
+<a id="module-level-spec"></a>
+
+### Module-level Specification
+
+
+<pre><code><b>pragma</b> verify = <b>true</b>;
+<b>pragma</b> aborts_if_is_strict;
+</code></pre>
+
+
+
+<a id="@Specification_0_initialize"></a>
+
+### Function `initialize`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="chain_id.md#0x1_chain_id_initialize">initialize</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, id: u8)
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(aptos_framework);
+<b>aborts_if</b> addr != @aptos_framework;
+<b>aborts_if</b> <b>exists</b>&lt;<a href="chain_id.md#0x1_chain_id_ChainId">ChainId</a>&gt;(@aptos_framework);
+// This enforces <a id="high-level-req-1" href="#high-level-req">high-level requirement 1</a>:
+<b>ensures</b> <b>exists</b>&lt;<a href="chain_id.md#0x1_chain_id_ChainId">ChainId</a>&gt;(addr);
+<b>ensures</b> <b>global</b>&lt;<a href="chain_id.md#0x1_chain_id_ChainId">ChainId</a>&gt;(addr).id == id;
+</code></pre>
+
+
+
+<a id="@Specification_0_get"></a>
+
+### Function `get`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="chain_id.md#0x1_chain_id_get">get</a>(): u8
+</code></pre>
+
+
+
+
+<pre><code>// This enforces <a id="high-level-req-2" href="#high-level-req">high-level requirement 2</a>:
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="chain_id.md#0x1_chain_id_ChainId">ChainId</a>&gt;(@aptos_framework);
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/chain_status.md b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/chain_status.md
new file mode 100644
index 0000000000000..a8230b3f81b99
--- /dev/null
+++ b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/chain_status.md
@@ -0,0 +1,339 @@
+
+<a id="0x1_chain_status"></a>
+
+# Module `0x1::chain_status`
+
+This module code to assert that it is running in genesis (<code><a href="chain_status.md#0x1_chain_status_assert_genesis">Self::assert_genesis</a></code>) or after
+genesis (<code><a href="chain_status.md#0x1_chain_status_assert_operating">Self::assert_operating</a></code>). These are essentially distinct states of the system. Specifically,
+if <code><a href="chain_status.md#0x1_chain_status_assert_operating">Self::assert_operating</a></code> succeeds, assumptions about invariants over the global state can be made
+which reflect that the system has been successfully initialized.
+
+
+-  [Resource `GenesisEndMarker`](#0x1_chain_status_GenesisEndMarker)
+-  [Constants](#@Constants_0)
+-  [Function `set_genesis_end`](#0x1_chain_status_set_genesis_end)
+-  [Function `is_genesis`](#0x1_chain_status_is_genesis)
+-  [Function `is_operating`](#0x1_chain_status_is_operating)
+-  [Function `assert_operating`](#0x1_chain_status_assert_operating)
+-  [Function `assert_genesis`](#0x1_chain_status_assert_genesis)
+-  [Specification](#@Specification_1)
+    -  [High-level Requirements](#high-level-req)
+    -  [Module-level Specification](#module-level-spec)
+    -  [Function `set_genesis_end`](#@Specification_1_set_genesis_end)
+    -  [Function `assert_operating`](#@Specification_1_assert_operating)
+    -  [Function `assert_genesis`](#@Specification_1_assert_genesis)
+
+
+<pre><code><b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="system_addresses.md#0x1_system_addresses">0x1::system_addresses</a>;
+</code></pre>
+
+
+
+<a id="0x1_chain_status_GenesisEndMarker"></a>
+
+## Resource `GenesisEndMarker`
+
+Marker to publish at the end of genesis.
+
+
+<pre><code><b>struct</b> <a href="chain_status.md#0x1_chain_status_GenesisEndMarker">GenesisEndMarker</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>dummy_field: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_chain_status_ENOT_GENESIS"></a>
+
+The blockchain is not in the genesis status.
+
+
+<pre><code><b>const</b> <a href="chain_status.md#0x1_chain_status_ENOT_GENESIS">ENOT_GENESIS</a>: u64 = 2;
+</code></pre>
+
+
+
+<a id="0x1_chain_status_ENOT_OPERATING"></a>
+
+The blockchain is not in the operating status.
+
+
+<pre><code><b>const</b> <a href="chain_status.md#0x1_chain_status_ENOT_OPERATING">ENOT_OPERATING</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_chain_status_set_genesis_end"></a>
+
+## Function `set_genesis_end`
+
+Marks that genesis has finished.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="chain_status.md#0x1_chain_status_set_genesis_end">set_genesis_end</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="chain_status.md#0x1_chain_status_set_genesis_end">set_genesis_end</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>) {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(aptos_framework);
+    <b>move_to</b>(aptos_framework, <a href="chain_status.md#0x1_chain_status_GenesisEndMarker">GenesisEndMarker</a> {});
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_chain_status_is_genesis"></a>
+
+## Function `is_genesis`
+
+Helper function to determine if Aptos is in genesis state.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="chain_status.md#0x1_chain_status_is_genesis">is_genesis</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="chain_status.md#0x1_chain_status_is_genesis">is_genesis</a>(): bool {
+    !<b>exists</b>&lt;<a href="chain_status.md#0x1_chain_status_GenesisEndMarker">GenesisEndMarker</a>&gt;(@aptos_framework)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_chain_status_is_operating"></a>
+
+## Function `is_operating`
+
+Helper function to determine if Aptos is operating. This is
+the same as <code>!<a href="chain_status.md#0x1_chain_status_is_genesis">is_genesis</a>()</code> and is provided for convenience.
+Testing <code><a href="chain_status.md#0x1_chain_status_is_operating">is_operating</a>()</code> is more frequent than <code><a href="chain_status.md#0x1_chain_status_is_genesis">is_genesis</a>()</code>.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="chain_status.md#0x1_chain_status_is_operating">is_operating</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="chain_status.md#0x1_chain_status_is_operating">is_operating</a>(): bool {
+    <b>exists</b>&lt;<a href="chain_status.md#0x1_chain_status_GenesisEndMarker">GenesisEndMarker</a>&gt;(@aptos_framework)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_chain_status_assert_operating"></a>
+
+## Function `assert_operating`
+
+Helper function to assert operating (not genesis) state.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="chain_status.md#0x1_chain_status_assert_operating">assert_operating</a>()
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="chain_status.md#0x1_chain_status_assert_operating">assert_operating</a>() {
+    <b>assert</b>!(<a href="chain_status.md#0x1_chain_status_is_operating">is_operating</a>(), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="chain_status.md#0x1_chain_status_ENOT_OPERATING">ENOT_OPERATING</a>));
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_chain_status_assert_genesis"></a>
+
+## Function `assert_genesis`
+
+Helper function to assert genesis state.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="chain_status.md#0x1_chain_status_assert_genesis">assert_genesis</a>()
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="chain_status.md#0x1_chain_status_assert_genesis">assert_genesis</a>() {
+    <b>assert</b>!(<a href="chain_status.md#0x1_chain_status_is_genesis">is_genesis</a>(), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="chain_status.md#0x1_chain_status_ENOT_OPERATING">ENOT_OPERATING</a>));
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+
+
+<a id="high-level-req"></a>
+
+### High-level Requirements
+
+<table>
+<tr>
+<th>No.</th><th>Requirement</th><th>Criticality</th><th>Implementation</th><th>Enforcement</th>
+</tr>
+
+<tr>
+<td>1</td>
+<td>The end of genesis mark should persist throughout the entire life of the chain.</td>
+<td>Medium</td>
+<td>The Aptos framework account should never drop the GenesisEndMarker resource.</td>
+<td>Audited that GenesisEndMarker is published at the end of genesis and never removed. Formally verified via <a href="#high-level-req-1">set_genesis_end</a> that GenesisEndMarker is published.</td>
+</tr>
+
+<tr>
+<td>2</td>
+<td>The status of the chain should never be genesis and operating at the same time.</td>
+<td>Low</td>
+<td>The status of the chain is determined by the GenesisEndMarker resource.</td>
+<td>Formally verified via <a href="#high-level-req-2">global invariant</a>.</td>
+</tr>
+
+<tr>
+<td>3</td>
+<td>The status of the chain should only be changed once, from genesis to operating.</td>
+<td>Low</td>
+<td>Attempting to assign a resource type more than once will abort.</td>
+<td>Formally verified via <a href="#high-level-req-3">set_genesis_end</a>.</td>
+</tr>
+
+</table>
+
+
+
+
+<a id="module-level-spec"></a>
+
+### Module-level Specification
+
+
+<pre><code><b>pragma</b> verify = <b>true</b>;
+<b>pragma</b> aborts_if_is_strict;
+// This enforces <a id="high-level-req-2" href="#high-level-req">high-level requirement 2</a>:
+<b>invariant</b> <a href="chain_status.md#0x1_chain_status_is_genesis">is_genesis</a>() == !<a href="chain_status.md#0x1_chain_status_is_operating">is_operating</a>();
+</code></pre>
+
+
+
+<a id="@Specification_1_set_genesis_end"></a>
+
+### Function `set_genesis_end`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="chain_status.md#0x1_chain_status_set_genesis_end">set_genesis_end</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>true</b>;
+<b>pragma</b> delegate_invariants_to_caller;
+<b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(aptos_framework);
+<b>aborts_if</b> addr != @aptos_framework;
+// This enforces <a id="high-level-req-3" href="#high-level-req">high-level requirement 3</a>:
+<b>aborts_if</b> <b>exists</b>&lt;<a href="chain_status.md#0x1_chain_status_GenesisEndMarker">GenesisEndMarker</a>&gt;(@aptos_framework);
+// This enforces <a id="high-level-req-1" href="#high-level-req">high-level requirement 1</a>:
+<b>ensures</b> <b>global</b>&lt;<a href="chain_status.md#0x1_chain_status_GenesisEndMarker">GenesisEndMarker</a>&gt;(@aptos_framework) == <a href="chain_status.md#0x1_chain_status_GenesisEndMarker">GenesisEndMarker</a> {};
+</code></pre>
+
+
+
+
+<a id="0x1_chain_status_RequiresIsOperating"></a>
+
+
+<pre><code><b>schema</b> <a href="chain_status.md#0x1_chain_status_RequiresIsOperating">RequiresIsOperating</a> {
+    <b>requires</b> <a href="chain_status.md#0x1_chain_status_is_operating">is_operating</a>();
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_assert_operating"></a>
+
+### Function `assert_operating`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="chain_status.md#0x1_chain_status_assert_operating">assert_operating</a>()
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<a href="chain_status.md#0x1_chain_status_is_operating">is_operating</a>();
+</code></pre>
+
+
+
+<a id="@Specification_1_assert_genesis"></a>
+
+### Function `assert_genesis`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="chain_status.md#0x1_chain_status_assert_genesis">assert_genesis</a>()
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<a href="chain_status.md#0x1_chain_status_is_genesis">is_genesis</a>();
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/code.md b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/code.md
new file mode 100644
index 0000000000000..2f51dad607837
--- /dev/null
+++ b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/code.md
@@ -0,0 +1,1256 @@
+
+<a id="0x1_code"></a>
+
+# Module `0x1::code`
+
+This module supports functionality related to code management.
+
+
+-  [Resource `PackageRegistry`](#0x1_code_PackageRegistry)
+-  [Struct `PackageMetadata`](#0x1_code_PackageMetadata)
+-  [Struct `PackageDep`](#0x1_code_PackageDep)
+-  [Struct `ModuleMetadata`](#0x1_code_ModuleMetadata)
+-  [Struct `UpgradePolicy`](#0x1_code_UpgradePolicy)
+-  [Struct `PublishPackage`](#0x1_code_PublishPackage)
+-  [Struct `AllowedDep`](#0x1_code_AllowedDep)
+-  [Constants](#@Constants_0)
+-  [Function `upgrade_policy_arbitrary`](#0x1_code_upgrade_policy_arbitrary)
+-  [Function `upgrade_policy_compat`](#0x1_code_upgrade_policy_compat)
+-  [Function `upgrade_policy_immutable`](#0x1_code_upgrade_policy_immutable)
+-  [Function `can_change_upgrade_policy_to`](#0x1_code_can_change_upgrade_policy_to)
+-  [Function `initialize`](#0x1_code_initialize)
+-  [Function `publish_package`](#0x1_code_publish_package)
+-  [Function `freeze_code_object`](#0x1_code_freeze_code_object)
+-  [Function `publish_package_txn`](#0x1_code_publish_package_txn)
+-  [Function `check_upgradability`](#0x1_code_check_upgradability)
+-  [Function `check_coexistence`](#0x1_code_check_coexistence)
+-  [Function `check_dependencies`](#0x1_code_check_dependencies)
+-  [Function `is_policy_exempted_address`](#0x1_code_is_policy_exempted_address)
+-  [Function `get_module_names`](#0x1_code_get_module_names)
+-  [Function `request_publish`](#0x1_code_request_publish)
+-  [Function `request_publish_with_allowed_deps`](#0x1_code_request_publish_with_allowed_deps)
+-  [Specification](#@Specification_1)
+    -  [High-level Requirements](#high-level-req)
+    -  [Module-level Specification](#module-level-spec)
+    -  [Function `initialize`](#@Specification_1_initialize)
+    -  [Function `publish_package`](#@Specification_1_publish_package)
+    -  [Function `freeze_code_object`](#@Specification_1_freeze_code_object)
+    -  [Function `publish_package_txn`](#@Specification_1_publish_package_txn)
+    -  [Function `check_upgradability`](#@Specification_1_check_upgradability)
+    -  [Function `check_coexistence`](#@Specification_1_check_coexistence)
+    -  [Function `check_dependencies`](#@Specification_1_check_dependencies)
+    -  [Function `get_module_names`](#@Specification_1_get_module_names)
+    -  [Function `request_publish`](#@Specification_1_request_publish)
+    -  [Function `request_publish_with_allowed_deps`](#@Specification_1_request_publish_with_allowed_deps)
+
+
+<pre><code><b>use</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/copyable_any.md#0x1_copyable_any">0x1::copyable_any</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="event.md#0x1_event">0x1::event</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features">0x1::features</a>;
+<b>use</b> <a href="object.md#0x1_object">0x1::object</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option">0x1::option</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">0x1::signer</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string">0x1::string</a>;
+<b>use</b> <a href="system_addresses.md#0x1_system_addresses">0x1::system_addresses</a>;
+<b>use</b> <a href="util.md#0x1_util">0x1::util</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">0x1::vector</a>;
+</code></pre>
+
+
+
+<a id="0x1_code_PackageRegistry"></a>
+
+## Resource `PackageRegistry`
+
+The package registry at the given address.
+
+
+<pre><code><b>struct</b> <a href="code.md#0x1_code_PackageRegistry">PackageRegistry</a> <b>has</b> drop, store, key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>packages: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="code.md#0x1_code_PackageMetadata">code::PackageMetadata</a>&gt;</code>
+</dt>
+<dd>
+ Packages installed at this address.
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_code_PackageMetadata"></a>
+
+## Struct `PackageMetadata`
+
+Metadata for a package. All byte blobs are represented as base64-of-gzipped-bytes
+
+
+<pre><code><b>struct</b> <a href="code.md#0x1_code_PackageMetadata">PackageMetadata</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>name: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+ Name of this package.
+</dd>
+<dt>
+<code>upgrade_policy: <a href="code.md#0x1_code_UpgradePolicy">code::UpgradePolicy</a></code>
+</dt>
+<dd>
+ The upgrade policy of this package.
+</dd>
+<dt>
+<code>upgrade_number: u64</code>
+</dt>
+<dd>
+ The numbers of times this module has been upgraded. Also serves as the on-chain version.
+ This field will be automatically assigned on successful upgrade.
+</dd>
+<dt>
+<code>source_digest: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+ The source digest of the sources in the package. This is constructed by first building the
+ sha256 of each individual source, than sorting them alphabetically, and sha256 them again.
+</dd>
+<dt>
+<code>manifest: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+ The package manifest, in the Move.toml format. Gzipped text.
+</dd>
+<dt>
+<code>modules: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="code.md#0x1_code_ModuleMetadata">code::ModuleMetadata</a>&gt;</code>
+</dt>
+<dd>
+ The list of modules installed by this package.
+</dd>
+<dt>
+<code>deps: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="code.md#0x1_code_PackageDep">code::PackageDep</a>&gt;</code>
+</dt>
+<dd>
+ Holds PackageDeps.
+</dd>
+<dt>
+<code>extension: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="../../../aptos-stdlib/tests/compiler-v2-doc/copyable_any.md#0x1_copyable_any_Any">copyable_any::Any</a>&gt;</code>
+</dt>
+<dd>
+ For future extension
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_code_PackageDep"></a>
+
+## Struct `PackageDep`
+
+A dependency to a package published at address
+
+
+<pre><code><b>struct</b> <a href="code.md#0x1_code_PackageDep">PackageDep</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code><a href="account.md#0x1_account">account</a>: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>package_name: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_code_ModuleMetadata"></a>
+
+## Struct `ModuleMetadata`
+
+Metadata about a module in a package.
+
+
+<pre><code><b>struct</b> <a href="code.md#0x1_code_ModuleMetadata">ModuleMetadata</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>name: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+ Name of the module.
+</dd>
+<dt>
+<code>source: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+ Source text, gzipped String. Empty if not provided.
+</dd>
+<dt>
+<code>source_map: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+ Source map, in compressed BCS. Empty if not provided.
+</dd>
+<dt>
+<code>extension: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="../../../aptos-stdlib/tests/compiler-v2-doc/copyable_any.md#0x1_copyable_any_Any">copyable_any::Any</a>&gt;</code>
+</dt>
+<dd>
+ For future extensions.
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_code_UpgradePolicy"></a>
+
+## Struct `UpgradePolicy`
+
+Describes an upgrade policy
+
+
+<pre><code><b>struct</b> <a href="code.md#0x1_code_UpgradePolicy">UpgradePolicy</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>policy: u8</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_code_PublishPackage"></a>
+
+## Struct `PublishPackage`
+
+Event emitted when code is published to an address.
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="code.md#0x1_code_PublishPackage">PublishPackage</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>code_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>is_upgrade: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_code_AllowedDep"></a>
+
+## Struct `AllowedDep`
+
+A helper type for request_publish_with_allowed_deps
+
+
+<pre><code><b>struct</b> <a href="code.md#0x1_code_AllowedDep">AllowedDep</a> <b>has</b> drop
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code><a href="account.md#0x1_account">account</a>: <b>address</b></code>
+</dt>
+<dd>
+ Address of the module.
+</dd>
+<dt>
+<code>module_name: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+ Name of the module. If this is the empty string, then this serves as a wildcard for
+ all modules from this address. This is used for speeding up dependency checking for packages from
+ well-known framework addresses, where we can assume that there are no malicious packages.
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_code_ECODE_OBJECT_DOES_NOT_EXIST"></a>
+
+<code>code_object</code> does not exist.
+
+
+<pre><code><b>const</b> <a href="code.md#0x1_code_ECODE_OBJECT_DOES_NOT_EXIST">ECODE_OBJECT_DOES_NOT_EXIST</a>: u64 = 10;
+</code></pre>
+
+
+
+<a id="0x1_code_EDEP_ARBITRARY_NOT_SAME_ADDRESS"></a>
+
+A dependency to an <code>arbitrary</code> package must be on the same address.
+
+
+<pre><code><b>const</b> <a href="code.md#0x1_code_EDEP_ARBITRARY_NOT_SAME_ADDRESS">EDEP_ARBITRARY_NOT_SAME_ADDRESS</a>: u64 = 7;
+</code></pre>
+
+
+
+<a id="0x1_code_EDEP_WEAKER_POLICY"></a>
+
+A dependency cannot have a weaker upgrade policy.
+
+
+<pre><code><b>const</b> <a href="code.md#0x1_code_EDEP_WEAKER_POLICY">EDEP_WEAKER_POLICY</a>: u64 = 6;
+</code></pre>
+
+
+
+<a id="0x1_code_EINCOMPATIBLE_POLICY_DISABLED"></a>
+
+Creating a package with incompatible upgrade policy is disabled.
+
+
+<pre><code><b>const</b> <a href="code.md#0x1_code_EINCOMPATIBLE_POLICY_DISABLED">EINCOMPATIBLE_POLICY_DISABLED</a>: u64 = 8;
+</code></pre>
+
+
+
+<a id="0x1_code_EMODULE_MISSING"></a>
+
+Cannot delete a module that was published in the same package
+
+
+<pre><code><b>const</b> <a href="code.md#0x1_code_EMODULE_MISSING">EMODULE_MISSING</a>: u64 = 4;
+</code></pre>
+
+
+
+<a id="0x1_code_EMODULE_NAME_CLASH"></a>
+
+Package contains duplicate module names with existing modules publised in other packages on this address
+
+
+<pre><code><b>const</b> <a href="code.md#0x1_code_EMODULE_NAME_CLASH">EMODULE_NAME_CLASH</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_code_ENOT_PACKAGE_OWNER"></a>
+
+Not the owner of the package registry.
+
+
+<pre><code><b>const</b> <a href="code.md#0x1_code_ENOT_PACKAGE_OWNER">ENOT_PACKAGE_OWNER</a>: u64 = 9;
+</code></pre>
+
+
+
+<a id="0x1_code_EPACKAGE_DEP_MISSING"></a>
+
+Dependency could not be resolved to any published package.
+
+
+<pre><code><b>const</b> <a href="code.md#0x1_code_EPACKAGE_DEP_MISSING">EPACKAGE_DEP_MISSING</a>: u64 = 5;
+</code></pre>
+
+
+
+<a id="0x1_code_EUPGRADE_IMMUTABLE"></a>
+
+Cannot upgrade an immutable package
+
+
+<pre><code><b>const</b> <a href="code.md#0x1_code_EUPGRADE_IMMUTABLE">EUPGRADE_IMMUTABLE</a>: u64 = 2;
+</code></pre>
+
+
+
+<a id="0x1_code_EUPGRADE_WEAKER_POLICY"></a>
+
+Cannot downgrade a package's upgradability policy
+
+
+<pre><code><b>const</b> <a href="code.md#0x1_code_EUPGRADE_WEAKER_POLICY">EUPGRADE_WEAKER_POLICY</a>: u64 = 3;
+</code></pre>
+
+
+
+<a id="0x1_code_upgrade_policy_arbitrary"></a>
+
+## Function `upgrade_policy_arbitrary`
+
+Whether unconditional code upgrade with no compatibility check is allowed. This
+publication mode should only be used for modules which aren't shared with user others.
+The developer is responsible for not breaking memory layout of any resources he already
+stored on chain.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="code.md#0x1_code_upgrade_policy_arbitrary">upgrade_policy_arbitrary</a>(): <a href="code.md#0x1_code_UpgradePolicy">code::UpgradePolicy</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="code.md#0x1_code_upgrade_policy_arbitrary">upgrade_policy_arbitrary</a>(): <a href="code.md#0x1_code_UpgradePolicy">UpgradePolicy</a> {
+    <a href="code.md#0x1_code_UpgradePolicy">UpgradePolicy</a> { policy: 0 }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_code_upgrade_policy_compat"></a>
+
+## Function `upgrade_policy_compat`
+
+Whether a compatibility check should be performed for upgrades. The check only passes if
+a new module has (a) the same public functions (b) for existing resources, no layout change.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="code.md#0x1_code_upgrade_policy_compat">upgrade_policy_compat</a>(): <a href="code.md#0x1_code_UpgradePolicy">code::UpgradePolicy</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="code.md#0x1_code_upgrade_policy_compat">upgrade_policy_compat</a>(): <a href="code.md#0x1_code_UpgradePolicy">UpgradePolicy</a> {
+    <a href="code.md#0x1_code_UpgradePolicy">UpgradePolicy</a> { policy: 1 }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_code_upgrade_policy_immutable"></a>
+
+## Function `upgrade_policy_immutable`
+
+Whether the modules in the package are immutable and cannot be upgraded.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="code.md#0x1_code_upgrade_policy_immutable">upgrade_policy_immutable</a>(): <a href="code.md#0x1_code_UpgradePolicy">code::UpgradePolicy</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="code.md#0x1_code_upgrade_policy_immutable">upgrade_policy_immutable</a>(): <a href="code.md#0x1_code_UpgradePolicy">UpgradePolicy</a> {
+    <a href="code.md#0x1_code_UpgradePolicy">UpgradePolicy</a> { policy: 2 }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_code_can_change_upgrade_policy_to"></a>
+
+## Function `can_change_upgrade_policy_to`
+
+Whether the upgrade policy can be changed. In general, the policy can be only
+strengthened but not weakened.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="code.md#0x1_code_can_change_upgrade_policy_to">can_change_upgrade_policy_to</a>(from: <a href="code.md#0x1_code_UpgradePolicy">code::UpgradePolicy</a>, <b>to</b>: <a href="code.md#0x1_code_UpgradePolicy">code::UpgradePolicy</a>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="code.md#0x1_code_can_change_upgrade_policy_to">can_change_upgrade_policy_to</a>(from: <a href="code.md#0x1_code_UpgradePolicy">UpgradePolicy</a>, <b>to</b>: <a href="code.md#0x1_code_UpgradePolicy">UpgradePolicy</a>): bool {
+    from.policy &lt;= <b>to</b>.policy
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_code_initialize"></a>
+
+## Function `initialize`
+
+Initialize package metadata for Genesis.
+
+
+<pre><code><b>fun</b> <a href="code.md#0x1_code_initialize">initialize</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, package_owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, metadata: <a href="code.md#0x1_code_PackageMetadata">code::PackageMetadata</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="code.md#0x1_code_initialize">initialize</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, package_owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, metadata: <a href="code.md#0x1_code_PackageMetadata">PackageMetadata</a>)
+<b>acquires</b> <a href="code.md#0x1_code_PackageRegistry">PackageRegistry</a> {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(aptos_framework);
+    <b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(package_owner);
+    <b>if</b> (!<b>exists</b>&lt;<a href="code.md#0x1_code_PackageRegistry">PackageRegistry</a>&gt;(addr)) {
+        <b>move_to</b>(package_owner, <a href="code.md#0x1_code_PackageRegistry">PackageRegistry</a> { packages: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>[metadata] })
+    } <b>else</b> {
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_push_back">vector::push_back</a>(&<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="code.md#0x1_code_PackageRegistry">PackageRegistry</a>&gt;(addr).packages, metadata)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_code_publish_package"></a>
+
+## Function `publish_package`
+
+Publishes a package at the given signer's address. The caller must provide package metadata describing the
+package.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="code.md#0x1_code_publish_package">publish_package</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, pack: <a href="code.md#0x1_code_PackageMetadata">code::PackageMetadata</a>, <a href="code.md#0x1_code">code</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="code.md#0x1_code_publish_package">publish_package</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, pack: <a href="code.md#0x1_code_PackageMetadata">PackageMetadata</a>, <a href="code.md#0x1_code">code</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;) <b>acquires</b> <a href="code.md#0x1_code_PackageRegistry">PackageRegistry</a> {
+    // Disallow incompatible upgrade mode. Governance can decide later <b>if</b> this should be reconsidered.
+    <b>assert</b>!(
+        pack.upgrade_policy.policy &gt; <a href="code.md#0x1_code_upgrade_policy_arbitrary">upgrade_policy_arbitrary</a>().policy,
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="code.md#0x1_code_EINCOMPATIBLE_POLICY_DISABLED">EINCOMPATIBLE_POLICY_DISABLED</a>),
+    );
+
+    <b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(owner);
+    <b>if</b> (!<b>exists</b>&lt;<a href="code.md#0x1_code_PackageRegistry">PackageRegistry</a>&gt;(addr)) {
+        <b>move_to</b>(owner, <a href="code.md#0x1_code_PackageRegistry">PackageRegistry</a> { packages: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_empty">vector::empty</a>() })
+    };
+
+    // Checks for valid dependencies <b>to</b> other packages
+    <b>let</b> allowed_deps = <a href="code.md#0x1_code_check_dependencies">check_dependencies</a>(addr, &pack);
+
+    // Check <b>package</b> against conflicts
+    // To avoid prover compiler <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">error</a> on <b>spec</b>
+    // the <b>package</b> need <b>to</b> be an immutable variable
+    <b>let</b> module_names = <a href="code.md#0x1_code_get_module_names">get_module_names</a>(&pack);
+    <b>let</b> package_immutable = &<b>borrow_global</b>&lt;<a href="code.md#0x1_code_PackageRegistry">PackageRegistry</a>&gt;(addr).packages;
+    <b>let</b> len = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(package_immutable);
+    <b>let</b> index = len;
+    <b>let</b> upgrade_number = 0;
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_enumerate_ref">vector::enumerate_ref</a>(package_immutable
+    , |i, <b>old</b>| {
+        <b>let</b> <b>old</b>: &<a href="code.md#0x1_code_PackageMetadata">PackageMetadata</a> = <b>old</b>;
+        <b>if</b> (<b>old</b>.name == pack.name) {
+            upgrade_number = <b>old</b>.upgrade_number + 1;
+            <a href="code.md#0x1_code_check_upgradability">check_upgradability</a>(<b>old</b>, &pack, &module_names);
+            index = i;
+        } <b>else</b> {
+            <a href="code.md#0x1_code_check_coexistence">check_coexistence</a>(<b>old</b>, &module_names)
+        };
+    });
+
+    // Assign the upgrade counter.
+    pack.upgrade_number = upgrade_number;
+
+    <b>let</b> packages = &<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="code.md#0x1_code_PackageRegistry">PackageRegistry</a>&gt;(addr).packages;
+    // Update registry
+    <b>let</b> policy = pack.upgrade_policy;
+    <b>if</b> (index &lt; len) {
+        *<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow_mut">vector::borrow_mut</a>(packages, index) = pack
+    } <b>else</b> {
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_push_back">vector::push_back</a>(packages, pack)
+    };
+
+    <a href="event.md#0x1_event_emit">event::emit</a>(<a href="code.md#0x1_code_PublishPackage">PublishPackage</a> {
+        code_address: addr,
+        is_upgrade: upgrade_number &gt; 0
+    });
+
+    // Request publish
+    <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_code_dependency_check_enabled">features::code_dependency_check_enabled</a>())
+        <a href="code.md#0x1_code_request_publish_with_allowed_deps">request_publish_with_allowed_deps</a>(addr, module_names, allowed_deps, <a href="code.md#0x1_code">code</a>, policy.policy)
+    <b>else</b>
+    // The new `request_publish_with_allowed_deps` <b>has</b> not yet rolled out, so call downwards
+    // compatible <a href="code.md#0x1_code">code</a>.
+        <a href="code.md#0x1_code_request_publish">request_publish</a>(addr, module_names, <a href="code.md#0x1_code">code</a>, policy.policy)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_code_freeze_code_object"></a>
+
+## Function `freeze_code_object`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="code.md#0x1_code_freeze_code_object">freeze_code_object</a>(publisher: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, code_object: <a href="object.md#0x1_object_Object">object::Object</a>&lt;<a href="code.md#0x1_code_PackageRegistry">code::PackageRegistry</a>&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="code.md#0x1_code_freeze_code_object">freeze_code_object</a>(publisher: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, code_object: Object&lt;<a href="code.md#0x1_code_PackageRegistry">PackageRegistry</a>&gt;) <b>acquires</b> <a href="code.md#0x1_code_PackageRegistry">PackageRegistry</a> {
+    <b>let</b> code_object_addr = <a href="object.md#0x1_object_object_address">object::object_address</a>(&code_object);
+    <b>assert</b>!(<b>exists</b>&lt;<a href="code.md#0x1_code_PackageRegistry">PackageRegistry</a>&gt;(code_object_addr), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="code.md#0x1_code_ECODE_OBJECT_DOES_NOT_EXIST">ECODE_OBJECT_DOES_NOT_EXIST</a>));
+    <b>assert</b>!(
+        <a href="object.md#0x1_object_is_owner">object::is_owner</a>(code_object, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(publisher)),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="code.md#0x1_code_ENOT_PACKAGE_OWNER">ENOT_PACKAGE_OWNER</a>)
+    );
+
+    <b>let</b> registry = <b>borrow_global_mut</b>&lt;<a href="code.md#0x1_code_PackageRegistry">PackageRegistry</a>&gt;(code_object_addr);
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_for_each_mut">vector::for_each_mut</a>(&<b>mut</b> registry.packages, |pack| {
+        <b>let</b> <b>package</b>: &<b>mut</b> <a href="code.md#0x1_code_PackageMetadata">PackageMetadata</a> = pack;
+        <b>package</b>.upgrade_policy = <a href="code.md#0x1_code_upgrade_policy_immutable">upgrade_policy_immutable</a>();
+    });
+
+    // We unfortunately have <b>to</b> make a <b>copy</b> of each <b>package</b> <b>to</b> avoid borrow checker issues <b>as</b> check_dependencies
+    // needs <b>to</b> borrow <a href="code.md#0x1_code_PackageRegistry">PackageRegistry</a> from the dependency packages.
+    // This would increase the amount of gas used, but this is a rare operation and it's rare <b>to</b> have many packages
+    // in a single <a href="code.md#0x1_code">code</a> <a href="object.md#0x1_object">object</a>.
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_for_each">vector::for_each</a>(registry.packages, |pack| {
+        <a href="code.md#0x1_code_check_dependencies">check_dependencies</a>(code_object_addr, &pack);
+    });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_code_publish_package_txn"></a>
+
+## Function `publish_package_txn`
+
+Same as <code>publish_package</code> but as an entry function which can be called as a transaction. Because
+of current restrictions for txn parameters, the metadata needs to be passed in serialized form.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="code.md#0x1_code_publish_package_txn">publish_package_txn</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, metadata_serialized: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, <a href="code.md#0x1_code">code</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="code.md#0x1_code_publish_package_txn">publish_package_txn</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, metadata_serialized: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, <a href="code.md#0x1_code">code</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;)
+<b>acquires</b> <a href="code.md#0x1_code_PackageRegistry">PackageRegistry</a> {
+    <a href="code.md#0x1_code_publish_package">publish_package</a>(owner, <a href="util.md#0x1_util_from_bytes">util::from_bytes</a>&lt;<a href="code.md#0x1_code_PackageMetadata">PackageMetadata</a>&gt;(metadata_serialized), <a href="code.md#0x1_code">code</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_code_check_upgradability"></a>
+
+## Function `check_upgradability`
+
+Checks whether the given package is upgradable, and returns true if a compatibility check is needed.
+
+
+<pre><code><b>fun</b> <a href="code.md#0x1_code_check_upgradability">check_upgradability</a>(old_pack: &<a href="code.md#0x1_code_PackageMetadata">code::PackageMetadata</a>, new_pack: &<a href="code.md#0x1_code_PackageMetadata">code::PackageMetadata</a>, new_modules: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="code.md#0x1_code_check_upgradability">check_upgradability</a>(
+    old_pack: &<a href="code.md#0x1_code_PackageMetadata">PackageMetadata</a>, new_pack: &<a href="code.md#0x1_code_PackageMetadata">PackageMetadata</a>, new_modules: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;String&gt;) {
+    <b>assert</b>!(old_pack.upgrade_policy.policy &lt; <a href="code.md#0x1_code_upgrade_policy_immutable">upgrade_policy_immutable</a>().policy,
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="code.md#0x1_code_EUPGRADE_IMMUTABLE">EUPGRADE_IMMUTABLE</a>));
+    <b>assert</b>!(<a href="code.md#0x1_code_can_change_upgrade_policy_to">can_change_upgrade_policy_to</a>(old_pack.upgrade_policy, new_pack.upgrade_policy),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="code.md#0x1_code_EUPGRADE_WEAKER_POLICY">EUPGRADE_WEAKER_POLICY</a>));
+    <b>let</b> old_modules = <a href="code.md#0x1_code_get_module_names">get_module_names</a>(old_pack);
+
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_for_each_ref">vector::for_each_ref</a>(&old_modules, |old_module| {
+        <b>assert</b>!(
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_contains">vector::contains</a>(new_modules, old_module),
+            <a href="code.md#0x1_code_EMODULE_MISSING">EMODULE_MISSING</a>
+        );
+    });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_code_check_coexistence"></a>
+
+## Function `check_coexistence`
+
+Checks whether a new package with given names can co-exist with old package.
+
+
+<pre><code><b>fun</b> <a href="code.md#0x1_code_check_coexistence">check_coexistence</a>(old_pack: &<a href="code.md#0x1_code_PackageMetadata">code::PackageMetadata</a>, new_modules: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="code.md#0x1_code_check_coexistence">check_coexistence</a>(old_pack: &<a href="code.md#0x1_code_PackageMetadata">PackageMetadata</a>, new_modules: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;String&gt;) {
+    // The modules introduced by each <b>package</b> must not overlap <b>with</b> `names`.
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_for_each_ref">vector::for_each_ref</a>(&old_pack.modules, |old_mod| {
+        <b>let</b> old_mod: &<a href="code.md#0x1_code_ModuleMetadata">ModuleMetadata</a> = old_mod;
+        <b>let</b> j = 0;
+        <b>while</b> (j &lt; <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(new_modules)) {
+            <b>let</b> name = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(new_modules, j);
+            <b>assert</b>!(&old_mod.name != name, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_already_exists">error::already_exists</a>(<a href="code.md#0x1_code_EMODULE_NAME_CLASH">EMODULE_NAME_CLASH</a>));
+            j = j + 1;
+        };
+    });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_code_check_dependencies"></a>
+
+## Function `check_dependencies`
+
+Check that the upgrade policies of all packages are equal or higher quality than this package. Also
+compute the list of module dependencies which are allowed by the package metadata. The later
+is passed on to the native layer to verify that bytecode dependencies are actually what is pretended here.
+
+
+<pre><code><b>fun</b> <a href="code.md#0x1_code_check_dependencies">check_dependencies</a>(publish_address: <b>address</b>, pack: &<a href="code.md#0x1_code_PackageMetadata">code::PackageMetadata</a>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="code.md#0x1_code_AllowedDep">code::AllowedDep</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="code.md#0x1_code_check_dependencies">check_dependencies</a>(publish_address: <b>address</b>, pack: &<a href="code.md#0x1_code_PackageMetadata">PackageMetadata</a>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="code.md#0x1_code_AllowedDep">AllowedDep</a>&gt;
+<b>acquires</b> <a href="code.md#0x1_code_PackageRegistry">PackageRegistry</a> {
+    <b>let</b> allowed_module_deps = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_empty">vector::empty</a>();
+    <b>let</b> deps = &pack.deps;
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_for_each_ref">vector::for_each_ref</a>(deps, |dep| {
+        <b>let</b> dep: &<a href="code.md#0x1_code_PackageDep">PackageDep</a> = dep;
+        <b>assert</b>!(<b>exists</b>&lt;<a href="code.md#0x1_code_PackageRegistry">PackageRegistry</a>&gt;(dep.<a href="account.md#0x1_account">account</a>), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="code.md#0x1_code_EPACKAGE_DEP_MISSING">EPACKAGE_DEP_MISSING</a>));
+        <b>if</b> (<a href="code.md#0x1_code_is_policy_exempted_address">is_policy_exempted_address</a>(dep.<a href="account.md#0x1_account">account</a>)) {
+            // Allow all modules from this <b>address</b>, by using "" <b>as</b> a wildcard in the <a href="code.md#0x1_code_AllowedDep">AllowedDep</a>
+            <b>let</b> <a href="account.md#0x1_account">account</a>: <b>address</b> = dep.<a href="account.md#0x1_account">account</a>;
+            <b>let</b> module_name = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"");
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_push_back">vector::push_back</a>(&<b>mut</b> allowed_module_deps, <a href="code.md#0x1_code_AllowedDep">AllowedDep</a> { <a href="account.md#0x1_account">account</a>, module_name });
+        } <b>else</b> {
+            <b>let</b> registry = <b>borrow_global</b>&lt;<a href="code.md#0x1_code_PackageRegistry">PackageRegistry</a>&gt;(dep.<a href="account.md#0x1_account">account</a>);
+            <b>let</b> found = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_any">vector::any</a>(&registry.packages, |dep_pack| {
+                <b>let</b> dep_pack: &<a href="code.md#0x1_code_PackageMetadata">PackageMetadata</a> = dep_pack;
+                <b>if</b> (dep_pack.name == dep.package_name) {
+                    // Check policy
+                    <b>assert</b>!(
+                        dep_pack.upgrade_policy.policy &gt;= pack.upgrade_policy.policy,
+                        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="code.md#0x1_code_EDEP_WEAKER_POLICY">EDEP_WEAKER_POLICY</a>)
+                    );
+                    <b>if</b> (dep_pack.upgrade_policy == <a href="code.md#0x1_code_upgrade_policy_arbitrary">upgrade_policy_arbitrary</a>()) {
+                        <b>assert</b>!(
+                            dep.<a href="account.md#0x1_account">account</a> == publish_address,
+                            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="code.md#0x1_code_EDEP_ARBITRARY_NOT_SAME_ADDRESS">EDEP_ARBITRARY_NOT_SAME_ADDRESS</a>)
+                        )
+                    };
+                    // Add allowed deps
+                    <b>let</b> <a href="account.md#0x1_account">account</a> = dep.<a href="account.md#0x1_account">account</a>;
+                    <b>let</b> k = 0;
+                    <b>let</b> r = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&dep_pack.modules);
+                    <b>while</b> (k &lt; r) {
+                        <b>let</b> module_name = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(&dep_pack.modules, k).name;
+                        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_push_back">vector::push_back</a>(&<b>mut</b> allowed_module_deps, <a href="code.md#0x1_code_AllowedDep">AllowedDep</a> { <a href="account.md#0x1_account">account</a>, module_name });
+                        k = k + 1;
+                    };
+                    <b>true</b>
+                } <b>else</b> {
+                    <b>false</b>
+                }
+            });
+            <b>assert</b>!(found, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="code.md#0x1_code_EPACKAGE_DEP_MISSING">EPACKAGE_DEP_MISSING</a>));
+        };
+    });
+    allowed_module_deps
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_code_is_policy_exempted_address"></a>
+
+## Function `is_policy_exempted_address`
+
+Core addresses which are exempted from the check that their policy matches the referring package. Without
+this exemption, it would not be possible to define an immutable package based on the core system, which
+requires to be upgradable for maintenance and evolution, and is configured to be <code>compatible</code>.
+
+
+<pre><code><b>fun</b> <a href="code.md#0x1_code_is_policy_exempted_address">is_policy_exempted_address</a>(addr: <b>address</b>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="code.md#0x1_code_is_policy_exempted_address">is_policy_exempted_address</a>(addr: <b>address</b>): bool {
+    addr == @1 || addr == @2 || addr == @3 || addr == @4 || addr == @5 ||
+        addr == @6 || addr == @7 || addr == @8 || addr == @9 || addr == @10
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_code_get_module_names"></a>
+
+## Function `get_module_names`
+
+Get the names of the modules in a package.
+
+
+<pre><code><b>fun</b> <a href="code.md#0x1_code_get_module_names">get_module_names</a>(pack: &<a href="code.md#0x1_code_PackageMetadata">code::PackageMetadata</a>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="code.md#0x1_code_get_module_names">get_module_names</a>(pack: &<a href="code.md#0x1_code_PackageMetadata">PackageMetadata</a>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;String&gt; {
+    <b>let</b> module_names = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_empty">vector::empty</a>();
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_for_each_ref">vector::for_each_ref</a>(&pack.modules, |pack_module| {
+        <b>let</b> pack_module: &<a href="code.md#0x1_code_ModuleMetadata">ModuleMetadata</a> = pack_module;
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_push_back">vector::push_back</a>(&<b>mut</b> module_names, pack_module.name);
+    });
+    module_names
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_code_request_publish"></a>
+
+## Function `request_publish`
+
+Native function to initiate module loading
+
+
+<pre><code><b>fun</b> <a href="code.md#0x1_code_request_publish">request_publish</a>(owner: <b>address</b>, expected_modules: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;, bundle: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;, policy: u8)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="code.md#0x1_code_request_publish">request_publish</a>(
+    owner: <b>address</b>,
+    expected_modules: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;String&gt;,
+    bundle: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;,
+    policy: u8
+);
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_code_request_publish_with_allowed_deps"></a>
+
+## Function `request_publish_with_allowed_deps`
+
+Native function to initiate module loading, including a list of allowed dependencies.
+
+
+<pre><code><b>fun</b> <a href="code.md#0x1_code_request_publish_with_allowed_deps">request_publish_with_allowed_deps</a>(owner: <b>address</b>, expected_modules: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;, allowed_deps: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="code.md#0x1_code_AllowedDep">code::AllowedDep</a>&gt;, bundle: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;, policy: u8)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="code.md#0x1_code_request_publish_with_allowed_deps">request_publish_with_allowed_deps</a>(
+    owner: <b>address</b>,
+    expected_modules: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;String&gt;,
+    allowed_deps: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="code.md#0x1_code_AllowedDep">AllowedDep</a>&gt;,
+    bundle: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;,
+    policy: u8
+);
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+
+
+<a id="high-level-req"></a>
+
+### High-level Requirements
+
+<table>
+<tr>
+<th>No.</th><th>Requirement</th><th>Criticality</th><th>Implementation</th><th>Enforcement</th>
+</tr>
+
+<tr>
+<td>1</td>
+<td>Updating a package should fail if the user is not the owner of it.</td>
+<td>Critical</td>
+<td>The publish_package function may only be able to update the package if the signer is the actual owner of the package.</td>
+<td>The Aptos upgrade native functions have been manually audited.</td>
+</tr>
+
+<tr>
+<td>2</td>
+<td>The arbitrary upgrade policy should never be used.</td>
+<td>Critical</td>
+<td>There should never be a pass of an arbitrary upgrade policy to the request_publish native function.</td>
+<td>Manually audited that it aborts if package.upgrade_policy.policy == 0.</td>
+</tr>
+
+<tr>
+<td>3</td>
+<td>Should perform accurate compatibility checks when the policy indicates compatibility, ensuring it meets the required conditions.</td>
+<td>Critical</td>
+<td>Specifies if it should perform compatibility checks for upgrades. The check only passes if a new module has (a) the same public functions, and (b) for existing resources, no layout change.</td>
+<td>The Move upgradability patterns have been manually audited.</td>
+</tr>
+
+<tr>
+<td>4</td>
+<td>Package upgrades should abide by policy change rules. In particular, The new upgrade policy must be equal to or stricter when compared to the old one. The original upgrade policy must not be immutable. The new package must contain all modules contained in the old package.</td>
+<td>Medium</td>
+<td>A package may only be updated using the publish_package function when the check_upgradability function returns true.</td>
+<td>This is audited by a manual review of the check_upgradability patterns.</td>
+</tr>
+
+<tr>
+<td>5</td>
+<td>The upgrade policy of a package must not exceed the strictness level imposed by its dependencies.</td>
+<td>Medium</td>
+<td>The upgrade_policy of a package may only be less than its dependencies throughout the upgrades. In addition, the native code properly restricts the use of dependencies outside the passed-in metadata.</td>
+<td>This has been manually audited.</td>
+</tr>
+
+<tr>
+<td>6</td>
+<td>The extension for package metadata is currently unused.</td>
+<td>Medium</td>
+<td>The extension field in PackageMetadata should be unused.</td>
+<td>Data invariant on the extension field has been manually audited.</td>
+</tr>
+
+<tr>
+<td>7</td>
+<td>The upgrade number of a package increases incrementally in a monotonic manner with each subsequent upgrade.</td>
+<td>Low</td>
+<td>On each upgrade of a particular package, the publish_package function updates the upgrade_number for that package.</td>
+<td>Post condition on upgrade_number has been manually audited.</td>
+</tr>
+
+</table>
+
+
+
+
+<a id="module-level-spec"></a>
+
+### Module-level Specification
+
+
+<pre><code><b>pragma</b> verify = <b>true</b>;
+<b>pragma</b> aborts_if_is_strict;
+</code></pre>
+
+
+
+<a id="@Specification_1_initialize"></a>
+
+### Function `initialize`
+
+
+<pre><code><b>fun</b> <a href="code.md#0x1_code_initialize">initialize</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, package_owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, metadata: <a href="code.md#0x1_code_PackageMetadata">code::PackageMetadata</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> aptos_addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(aptos_framework);
+<b>let</b> owner_addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(package_owner);
+<b>aborts_if</b> !<a href="system_addresses.md#0x1_system_addresses_is_aptos_framework_address">system_addresses::is_aptos_framework_address</a>(aptos_addr);
+<b>ensures</b> <b>exists</b>&lt;<a href="code.md#0x1_code_PackageRegistry">PackageRegistry</a>&gt;(owner_addr);
+</code></pre>
+
+
+
+<a id="@Specification_1_publish_package"></a>
+
+### Function `publish_package`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="code.md#0x1_code_publish_package">publish_package</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, pack: <a href="code.md#0x1_code_PackageMetadata">code::PackageMetadata</a>, <a href="code.md#0x1_code">code</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> aborts_if_is_partial;
+<b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(owner);
+<b>modifies</b> <b>global</b>&lt;<a href="code.md#0x1_code_PackageRegistry">PackageRegistry</a>&gt;(addr);
+<b>aborts_if</b> pack.upgrade_policy.policy &lt;= <a href="code.md#0x1_code_upgrade_policy_arbitrary">upgrade_policy_arbitrary</a>().policy;
+</code></pre>
+
+
+
+<a id="@Specification_1_freeze_code_object"></a>
+
+### Function `freeze_code_object`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="code.md#0x1_code_freeze_code_object">freeze_code_object</a>(publisher: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, code_object: <a href="object.md#0x1_object_Object">object::Object</a>&lt;<a href="code.md#0x1_code_PackageRegistry">code::PackageRegistry</a>&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> aborts_if_is_partial;
+<b>let</b> code_object_addr = code_object.inner;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="object.md#0x1_object_ObjectCore">object::ObjectCore</a>&gt;(code_object_addr);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="code.md#0x1_code_PackageRegistry">PackageRegistry</a>&gt;(code_object_addr);
+<b>aborts_if</b> !<a href="object.md#0x1_object_is_owner">object::is_owner</a>(code_object, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(publisher));
+<b>modifies</b> <b>global</b>&lt;<a href="code.md#0x1_code_PackageRegistry">PackageRegistry</a>&gt;(code_object_addr);
+</code></pre>
+
+
+
+<a id="@Specification_1_publish_package_txn"></a>
+
+### Function `publish_package_txn`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="code.md#0x1_code_publish_package_txn">publish_package_txn</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, metadata_serialized: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, <a href="code.md#0x1_code">code</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_check_upgradability"></a>
+
+### Function `check_upgradability`
+
+
+<pre><code><b>fun</b> <a href="code.md#0x1_code_check_upgradability">check_upgradability</a>(old_pack: &<a href="code.md#0x1_code_PackageMetadata">code::PackageMetadata</a>, new_pack: &<a href="code.md#0x1_code_PackageMetadata">code::PackageMetadata</a>, new_modules: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> aborts_if_is_partial;
+<b>aborts_if</b> old_pack.upgrade_policy.policy &gt;= <a href="code.md#0x1_code_upgrade_policy_immutable">upgrade_policy_immutable</a>().policy;
+<b>aborts_if</b> !<a href="code.md#0x1_code_can_change_upgrade_policy_to">can_change_upgrade_policy_to</a>(old_pack.upgrade_policy, new_pack.upgrade_policy);
+</code></pre>
+
+
+
+<a id="@Specification_1_check_coexistence"></a>
+
+### Function `check_coexistence`
+
+
+<pre><code><b>fun</b> <a href="code.md#0x1_code_check_coexistence">check_coexistence</a>(old_pack: &<a href="code.md#0x1_code_PackageMetadata">code::PackageMetadata</a>, new_modules: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_check_dependencies"></a>
+
+### Function `check_dependencies`
+
+
+<pre><code><b>fun</b> <a href="code.md#0x1_code_check_dependencies">check_dependencies</a>(publish_address: <b>address</b>, pack: &<a href="code.md#0x1_code_PackageMetadata">code::PackageMetadata</a>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="code.md#0x1_code_AllowedDep">code::AllowedDep</a>&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_get_module_names"></a>
+
+### Function `get_module_names`
+
+
+<pre><code><b>fun</b> <a href="code.md#0x1_code_get_module_names">get_module_names</a>(pack: &<a href="code.md#0x1_code_PackageMetadata">code::PackageMetadata</a>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> [abstract] <b>false</b>;
+<b>ensures</b> [abstract] len(result) == len(pack.modules);
+<b>ensures</b> [abstract] <b>forall</b> i in 0..len(result): result[i] == pack.modules[i].name;
+</code></pre>
+
+
+
+<a id="@Specification_1_request_publish"></a>
+
+### Function `request_publish`
+
+
+<pre><code><b>fun</b> <a href="code.md#0x1_code_request_publish">request_publish</a>(owner: <b>address</b>, expected_modules: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;, bundle: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;, policy: u8)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_request_publish_with_allowed_deps"></a>
+
+### Function `request_publish_with_allowed_deps`
+
+
+<pre><code><b>fun</b> <a href="code.md#0x1_code_request_publish_with_allowed_deps">request_publish_with_allowed_deps</a>(owner: <b>address</b>, expected_modules: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;, allowed_deps: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="code.md#0x1_code_AllowedDep">code::AllowedDep</a>&gt;, bundle: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;, policy: u8)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/coin.md b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/coin.md
new file mode 100644
index 0000000000000..f232014d2925e
--- /dev/null
+++ b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/coin.md
@@ -0,0 +1,4830 @@
+
+<a id="0x1_coin"></a>
+
+# Module `0x1::coin`
+
+This module provides the foundation for typesafe Coins.
+
+
+-  [Struct `Coin`](#0x1_coin_Coin)
+-  [Struct `AggregatableCoin`](#0x1_coin_AggregatableCoin)
+-  [Resource `CoinStore`](#0x1_coin_CoinStore)
+-  [Resource `SupplyConfig`](#0x1_coin_SupplyConfig)
+-  [Resource `CoinInfo`](#0x1_coin_CoinInfo)
+-  [Struct `CoinDeposit`](#0x1_coin_CoinDeposit)
+-  [Struct `CoinWithdraw`](#0x1_coin_CoinWithdraw)
+-  [Struct `Deposit`](#0x1_coin_Deposit)
+-  [Struct `Withdraw`](#0x1_coin_Withdraw)
+-  [Struct `DepositEvent`](#0x1_coin_DepositEvent)
+-  [Struct `WithdrawEvent`](#0x1_coin_WithdrawEvent)
+-  [Struct `CoinEventHandleDeletion`](#0x1_coin_CoinEventHandleDeletion)
+-  [Struct `PairCreation`](#0x1_coin_PairCreation)
+-  [Resource `MigrationFlag`](#0x1_coin_MigrationFlag)
+-  [Struct `MintCapability`](#0x1_coin_MintCapability)
+-  [Struct `FreezeCapability`](#0x1_coin_FreezeCapability)
+-  [Struct `BurnCapability`](#0x1_coin_BurnCapability)
+-  [Resource `CoinConversionMap`](#0x1_coin_CoinConversionMap)
+-  [Resource `PairedCoinType`](#0x1_coin_PairedCoinType)
+-  [Resource `PairedFungibleAssetRefs`](#0x1_coin_PairedFungibleAssetRefs)
+-  [Struct `MintRefReceipt`](#0x1_coin_MintRefReceipt)
+-  [Struct `TransferRefReceipt`](#0x1_coin_TransferRefReceipt)
+-  [Struct `BurnRefReceipt`](#0x1_coin_BurnRefReceipt)
+-  [Resource `Ghost$supply`](#0x1_coin_Ghost$supply)
+-  [Resource `Ghost$aggregate_supply`](#0x1_coin_Ghost$aggregate_supply)
+-  [Constants](#@Constants_0)
+-  [Function `paired_metadata`](#0x1_coin_paired_metadata)
+-  [Function `create_coin_conversion_map`](#0x1_coin_create_coin_conversion_map)
+-  [Function `create_pairing`](#0x1_coin_create_pairing)
+-  [Function `is_apt`](#0x1_coin_is_apt)
+-  [Function `create_and_return_paired_metadata_if_not_exist`](#0x1_coin_create_and_return_paired_metadata_if_not_exist)
+-  [Function `ensure_paired_metadata`](#0x1_coin_ensure_paired_metadata)
+-  [Function `paired_coin`](#0x1_coin_paired_coin)
+-  [Function `coin_to_fungible_asset`](#0x1_coin_coin_to_fungible_asset)
+-  [Function `fungible_asset_to_coin`](#0x1_coin_fungible_asset_to_coin)
+-  [Function `assert_paired_metadata_exists`](#0x1_coin_assert_paired_metadata_exists)
+-  [Function `paired_mint_ref_exists`](#0x1_coin_paired_mint_ref_exists)
+-  [Function `get_paired_mint_ref`](#0x1_coin_get_paired_mint_ref)
+-  [Function `return_paired_mint_ref`](#0x1_coin_return_paired_mint_ref)
+-  [Function `paired_transfer_ref_exists`](#0x1_coin_paired_transfer_ref_exists)
+-  [Function `get_paired_transfer_ref`](#0x1_coin_get_paired_transfer_ref)
+-  [Function `return_paired_transfer_ref`](#0x1_coin_return_paired_transfer_ref)
+-  [Function `paired_burn_ref_exists`](#0x1_coin_paired_burn_ref_exists)
+-  [Function `get_paired_burn_ref`](#0x1_coin_get_paired_burn_ref)
+-  [Function `convert_and_take_paired_burn_ref`](#0x1_coin_convert_and_take_paired_burn_ref)
+-  [Function `return_paired_burn_ref`](#0x1_coin_return_paired_burn_ref)
+-  [Function `borrow_paired_burn_ref`](#0x1_coin_borrow_paired_burn_ref)
+-  [Function `initialize_supply_config`](#0x1_coin_initialize_supply_config)
+-  [Function `allow_supply_upgrades`](#0x1_coin_allow_supply_upgrades)
+-  [Function `initialize_aggregatable_coin`](#0x1_coin_initialize_aggregatable_coin)
+-  [Function `is_aggregatable_coin_zero`](#0x1_coin_is_aggregatable_coin_zero)
+-  [Function `drain_aggregatable_coin`](#0x1_coin_drain_aggregatable_coin)
+-  [Function `merge_aggregatable_coin`](#0x1_coin_merge_aggregatable_coin)
+-  [Function `collect_into_aggregatable_coin`](#0x1_coin_collect_into_aggregatable_coin)
+-  [Function `calculate_amount_to_withdraw`](#0x1_coin_calculate_amount_to_withdraw)
+-  [Function `maybe_convert_to_fungible_store`](#0x1_coin_maybe_convert_to_fungible_store)
+-  [Function `migrate_to_fungible_store`](#0x1_coin_migrate_to_fungible_store)
+-  [Function `coin_address`](#0x1_coin_coin_address)
+-  [Function `balance`](#0x1_coin_balance)
+-  [Function `is_balance_at_least`](#0x1_coin_is_balance_at_least)
+-  [Function `coin_balance`](#0x1_coin_coin_balance)
+-  [Function `is_coin_initialized`](#0x1_coin_is_coin_initialized)
+-  [Function `is_coin_store_frozen`](#0x1_coin_is_coin_store_frozen)
+-  [Function `is_account_registered`](#0x1_coin_is_account_registered)
+-  [Function `name`](#0x1_coin_name)
+-  [Function `symbol`](#0x1_coin_symbol)
+-  [Function `decimals`](#0x1_coin_decimals)
+-  [Function `supply`](#0x1_coin_supply)
+-  [Function `coin_supply`](#0x1_coin_coin_supply)
+-  [Function `burn`](#0x1_coin_burn)
+-  [Function `burn_from`](#0x1_coin_burn_from)
+-  [Function `deposit`](#0x1_coin_deposit)
+-  [Function `migrated_primary_fungible_store_exists`](#0x1_coin_migrated_primary_fungible_store_exists)
+-  [Function `force_deposit`](#0x1_coin_force_deposit)
+-  [Function `destroy_zero`](#0x1_coin_destroy_zero)
+-  [Function `extract`](#0x1_coin_extract)
+-  [Function `extract_all`](#0x1_coin_extract_all)
+-  [Function `freeze_coin_store`](#0x1_coin_freeze_coin_store)
+-  [Function `unfreeze_coin_store`](#0x1_coin_unfreeze_coin_store)
+-  [Function `upgrade_supply`](#0x1_coin_upgrade_supply)
+-  [Function `initialize`](#0x1_coin_initialize)
+-  [Function `initialize_with_parallelizable_supply`](#0x1_coin_initialize_with_parallelizable_supply)
+-  [Function `initialize_internal`](#0x1_coin_initialize_internal)
+-  [Function `merge`](#0x1_coin_merge)
+-  [Function `mint`](#0x1_coin_mint)
+-  [Function `register`](#0x1_coin_register)
+-  [Function `transfer`](#0x1_coin_transfer)
+-  [Function `value`](#0x1_coin_value)
+-  [Function `withdraw`](#0x1_coin_withdraw)
+-  [Function `zero`](#0x1_coin_zero)
+-  [Function `destroy_freeze_cap`](#0x1_coin_destroy_freeze_cap)
+-  [Function `destroy_mint_cap`](#0x1_coin_destroy_mint_cap)
+-  [Function `destroy_burn_cap`](#0x1_coin_destroy_burn_cap)
+-  [Function `mint_internal`](#0x1_coin_mint_internal)
+-  [Function `burn_internal`](#0x1_coin_burn_internal)
+-  [Specification](#@Specification_1)
+    -  [High-level Requirements](#high-level-req)
+    -  [Module-level Specification](#module-level-spec)
+    -  [Struct `AggregatableCoin`](#@Specification_1_AggregatableCoin)
+    -  [Function `coin_to_fungible_asset`](#@Specification_1_coin_to_fungible_asset)
+    -  [Function `fungible_asset_to_coin`](#@Specification_1_fungible_asset_to_coin)
+    -  [Function `initialize_supply_config`](#@Specification_1_initialize_supply_config)
+    -  [Function `allow_supply_upgrades`](#@Specification_1_allow_supply_upgrades)
+    -  [Function `initialize_aggregatable_coin`](#@Specification_1_initialize_aggregatable_coin)
+    -  [Function `is_aggregatable_coin_zero`](#@Specification_1_is_aggregatable_coin_zero)
+    -  [Function `drain_aggregatable_coin`](#@Specification_1_drain_aggregatable_coin)
+    -  [Function `merge_aggregatable_coin`](#@Specification_1_merge_aggregatable_coin)
+    -  [Function `collect_into_aggregatable_coin`](#@Specification_1_collect_into_aggregatable_coin)
+    -  [Function `maybe_convert_to_fungible_store`](#@Specification_1_maybe_convert_to_fungible_store)
+    -  [Function `coin_address`](#@Specification_1_coin_address)
+    -  [Function `balance`](#@Specification_1_balance)
+    -  [Function `is_coin_initialized`](#@Specification_1_is_coin_initialized)
+    -  [Function `is_account_registered`](#@Specification_1_is_account_registered)
+    -  [Function `name`](#@Specification_1_name)
+    -  [Function `symbol`](#@Specification_1_symbol)
+    -  [Function `decimals`](#@Specification_1_decimals)
+    -  [Function `supply`](#@Specification_1_supply)
+    -  [Function `coin_supply`](#@Specification_1_coin_supply)
+    -  [Function `burn`](#@Specification_1_burn)
+    -  [Function `burn_from`](#@Specification_1_burn_from)
+    -  [Function `deposit`](#@Specification_1_deposit)
+    -  [Function `force_deposit`](#@Specification_1_force_deposit)
+    -  [Function `destroy_zero`](#@Specification_1_destroy_zero)
+    -  [Function `extract`](#@Specification_1_extract)
+    -  [Function `extract_all`](#@Specification_1_extract_all)
+    -  [Function `freeze_coin_store`](#@Specification_1_freeze_coin_store)
+    -  [Function `unfreeze_coin_store`](#@Specification_1_unfreeze_coin_store)
+    -  [Function `upgrade_supply`](#@Specification_1_upgrade_supply)
+    -  [Function `initialize`](#@Specification_1_initialize)
+    -  [Function `initialize_with_parallelizable_supply`](#@Specification_1_initialize_with_parallelizable_supply)
+    -  [Function `initialize_internal`](#@Specification_1_initialize_internal)
+    -  [Function `merge`](#@Specification_1_merge)
+    -  [Function `mint`](#@Specification_1_mint)
+    -  [Function `register`](#@Specification_1_register)
+    -  [Function `transfer`](#@Specification_1_transfer)
+    -  [Function `withdraw`](#@Specification_1_withdraw)
+    -  [Function `mint_internal`](#@Specification_1_mint_internal)
+    -  [Function `burn_internal`](#@Specification_1_burn_internal)
+
+
+<pre><code><b>use</b> <a href="account.md#0x1_account">0x1::account</a>;
+<b>use</b> <a href="aggregator.md#0x1_aggregator">0x1::aggregator</a>;
+<b>use</b> <a href="aggregator_factory.md#0x1_aggregator_factory">0x1::aggregator_factory</a>;
+<b>use</b> <a href="create_signer.md#0x1_create_signer">0x1::create_signer</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="event.md#0x1_event">0x1::event</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features">0x1::features</a>;
+<b>use</b> <a href="fungible_asset.md#0x1_fungible_asset">0x1::fungible_asset</a>;
+<b>use</b> <a href="guid.md#0x1_guid">0x1::guid</a>;
+<b>use</b> <a href="object.md#0x1_object">0x1::object</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option">0x1::option</a>;
+<b>use</b> <a href="optional_aggregator.md#0x1_optional_aggregator">0x1::optional_aggregator</a>;
+<b>use</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store">0x1::primary_fungible_store</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">0x1::signer</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string">0x1::string</a>;
+<b>use</b> <a href="system_addresses.md#0x1_system_addresses">0x1::system_addresses</a>;
+<b>use</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table">0x1::table</a>;
+<b>use</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info">0x1::type_info</a>;
+</code></pre>
+
+
+
+<a id="0x1_coin_Coin"></a>
+
+## Struct `Coin`
+
+Core data structures
+Main structure representing a coin/token in an account's custody.
+
+
+<pre><code><b>struct</b> <a href="coin.md#0x1_coin_Coin">Coin</a>&lt;CoinType&gt; <b>has</b> store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>value: u64</code>
+</dt>
+<dd>
+ Amount of coin this address has.
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_coin_AggregatableCoin"></a>
+
+## Struct `AggregatableCoin`
+
+Represents a coin with aggregator as its value. This allows to update
+the coin in every transaction avoiding read-modify-write conflicts. Only
+used for gas fees distribution by Aptos Framework (0x1).
+
+
+<pre><code><b>struct</b> <a href="coin.md#0x1_coin_AggregatableCoin">AggregatableCoin</a>&lt;CoinType&gt; <b>has</b> store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>value: <a href="aggregator.md#0x1_aggregator_Aggregator">aggregator::Aggregator</a></code>
+</dt>
+<dd>
+ Amount of aggregatable coin this address has.
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_coin_CoinStore"></a>
+
+## Resource `CoinStore`
+
+A holder of a specific coin types and associated event handles.
+These are kept in a single resource to ensure locality of data.
+
+
+<pre><code><b>struct</b> <a href="coin.md#0x1_coin_CoinStore">CoinStore</a>&lt;CoinType&gt; <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code><a href="coin.md#0x1_coin">coin</a>: <a href="coin.md#0x1_coin_Coin">coin::Coin</a>&lt;CoinType&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>frozen: bool</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>deposit_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="coin.md#0x1_coin_DepositEvent">coin::DepositEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>withdraw_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="coin.md#0x1_coin_WithdrawEvent">coin::WithdrawEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_coin_SupplyConfig"></a>
+
+## Resource `SupplyConfig`
+
+Configuration that controls the behavior of total coin supply. If the field
+is set, coin creators are allowed to upgrade to parallelizable implementations.
+
+
+<pre><code><b>struct</b> <a href="coin.md#0x1_coin_SupplyConfig">SupplyConfig</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>allow_upgrades: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_coin_CoinInfo"></a>
+
+## Resource `CoinInfo`
+
+Information about a specific coin type. Stored on the creator of the coin's account.
+
+
+<pre><code><b>struct</b> <a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a>&lt;CoinType&gt; <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>name: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>symbol: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+ Symbol of the coin, usually a shorter version of the name.
+ For example, Singapore Dollar is SGD.
+</dd>
+<dt>
+<code>decimals: u8</code>
+</dt>
+<dd>
+ Number of decimals used to get its user representation.
+ For example, if <code>decimals</code> equals <code>2</code>, a balance of <code>505</code> coins should
+ be displayed to a user as <code>5.05</code> (<code>505 / 10 ** 2</code>).
+</dd>
+<dt>
+<code><a href="coin.md#0x1_coin_supply">supply</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="optional_aggregator.md#0x1_optional_aggregator_OptionalAggregator">optional_aggregator::OptionalAggregator</a>&gt;</code>
+</dt>
+<dd>
+ Amount of this coin type in existence.
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_coin_CoinDeposit"></a>
+
+## Struct `CoinDeposit`
+
+Module event emitted when some amount of a coin is deposited into an account.
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="coin.md#0x1_coin_CoinDeposit">CoinDeposit</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>coin_type: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code><a href="account.md#0x1_account">account</a>: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>amount: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_coin_CoinWithdraw"></a>
+
+## Struct `CoinWithdraw`
+
+Module event emitted when some amount of a coin is withdrawn from an account.
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="coin.md#0x1_coin_CoinWithdraw">CoinWithdraw</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>coin_type: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code><a href="account.md#0x1_account">account</a>: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>amount: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_coin_Deposit"></a>
+
+## Struct `Deposit`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+#[deprecated]
+<b>struct</b> <a href="coin.md#0x1_coin_Deposit">Deposit</a>&lt;CoinType&gt; <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code><a href="account.md#0x1_account">account</a>: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>amount: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_coin_Withdraw"></a>
+
+## Struct `Withdraw`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+#[deprecated]
+<b>struct</b> <a href="coin.md#0x1_coin_Withdraw">Withdraw</a>&lt;CoinType&gt; <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code><a href="account.md#0x1_account">account</a>: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>amount: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_coin_DepositEvent"></a>
+
+## Struct `DepositEvent`
+
+Event emitted when some amount of a coin is deposited into an account.
+
+
+<pre><code><b>struct</b> <a href="coin.md#0x1_coin_DepositEvent">DepositEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>amount: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_coin_WithdrawEvent"></a>
+
+## Struct `WithdrawEvent`
+
+Event emitted when some amount of a coin is withdrawn from an account.
+
+
+<pre><code><b>struct</b> <a href="coin.md#0x1_coin_WithdrawEvent">WithdrawEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>amount: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_coin_CoinEventHandleDeletion"></a>
+
+## Struct `CoinEventHandleDeletion`
+
+Module event emitted when the event handles related to coin store is deleted.
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="coin.md#0x1_coin_CoinEventHandleDeletion">CoinEventHandleDeletion</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>event_handle_creation_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>deleted_deposit_event_handle_creation_number: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>deleted_withdraw_event_handle_creation_number: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_coin_PairCreation"></a>
+
+## Struct `PairCreation`
+
+Module event emitted when a new pair of coin and fungible asset is created.
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="coin.md#0x1_coin_PairCreation">PairCreation</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>coin_type: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_TypeInfo">type_info::TypeInfo</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>fungible_asset_metadata_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_coin_MigrationFlag"></a>
+
+## Resource `MigrationFlag`
+
+The flag the existence of which indicates the primary fungible store is created by the migration from CoinStore.
+
+
+<pre><code>#[resource_group_member(#[group = <a href="object.md#0x1_object_ObjectGroup">0x1::object::ObjectGroup</a>])]
+<b>struct</b> <a href="coin.md#0x1_coin_MigrationFlag">MigrationFlag</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>dummy_field: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_coin_MintCapability"></a>
+
+## Struct `MintCapability`
+
+Capability required to mint coins.
+
+
+<pre><code><b>struct</b> <a href="coin.md#0x1_coin_MintCapability">MintCapability</a>&lt;CoinType&gt; <b>has</b> <b>copy</b>, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>dummy_field: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_coin_FreezeCapability"></a>
+
+## Struct `FreezeCapability`
+
+Capability required to freeze a coin store.
+
+
+<pre><code><b>struct</b> <a href="coin.md#0x1_coin_FreezeCapability">FreezeCapability</a>&lt;CoinType&gt; <b>has</b> <b>copy</b>, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>dummy_field: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_coin_BurnCapability"></a>
+
+## Struct `BurnCapability`
+
+Capability required to burn coins.
+
+
+<pre><code><b>struct</b> <a href="coin.md#0x1_coin_BurnCapability">BurnCapability</a>&lt;CoinType&gt; <b>has</b> <b>copy</b>, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>dummy_field: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_coin_CoinConversionMap"></a>
+
+## Resource `CoinConversionMap`
+
+The mapping between coin and fungible asset.
+
+
+<pre><code><b>struct</b> <a href="coin.md#0x1_coin_CoinConversionMap">CoinConversionMap</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>coin_to_fungible_asset_map: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_Table">table::Table</a>&lt;<a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_TypeInfo">type_info::TypeInfo</a>, <a href="object.md#0x1_object_Object">object::Object</a>&lt;<a href="fungible_asset.md#0x1_fungible_asset_Metadata">fungible_asset::Metadata</a>&gt;&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_coin_PairedCoinType"></a>
+
+## Resource `PairedCoinType`
+
+The paired coin type info stored in fungible asset metadata object.
+
+
+<pre><code>#[resource_group_member(#[group = <a href="object.md#0x1_object_ObjectGroup">0x1::object::ObjectGroup</a>])]
+<b>struct</b> <a href="coin.md#0x1_coin_PairedCoinType">PairedCoinType</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>type: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_TypeInfo">type_info::TypeInfo</a></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_coin_PairedFungibleAssetRefs"></a>
+
+## Resource `PairedFungibleAssetRefs`
+
+The refs of the paired fungible asset.
+
+
+<pre><code>#[resource_group_member(#[group = <a href="object.md#0x1_object_ObjectGroup">0x1::object::ObjectGroup</a>])]
+<b>struct</b> <a href="coin.md#0x1_coin_PairedFungibleAssetRefs">PairedFungibleAssetRefs</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>mint_ref_opt: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="fungible_asset.md#0x1_fungible_asset_MintRef">fungible_asset::MintRef</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>transfer_ref_opt: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="fungible_asset.md#0x1_fungible_asset_TransferRef">fungible_asset::TransferRef</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>burn_ref_opt: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="fungible_asset.md#0x1_fungible_asset_BurnRef">fungible_asset::BurnRef</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_coin_MintRefReceipt"></a>
+
+## Struct `MintRefReceipt`
+
+The hot potato receipt for flash borrowing MintRef.
+
+
+<pre><code><b>struct</b> <a href="coin.md#0x1_coin_MintRefReceipt">MintRefReceipt</a>
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>metadata: <a href="object.md#0x1_object_Object">object::Object</a>&lt;<a href="fungible_asset.md#0x1_fungible_asset_Metadata">fungible_asset::Metadata</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_coin_TransferRefReceipt"></a>
+
+## Struct `TransferRefReceipt`
+
+The hot potato receipt for flash borrowing TransferRef.
+
+
+<pre><code><b>struct</b> <a href="coin.md#0x1_coin_TransferRefReceipt">TransferRefReceipt</a>
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>metadata: <a href="object.md#0x1_object_Object">object::Object</a>&lt;<a href="fungible_asset.md#0x1_fungible_asset_Metadata">fungible_asset::Metadata</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_coin_BurnRefReceipt"></a>
+
+## Struct `BurnRefReceipt`
+
+The hot potato receipt for flash borrowing BurnRef.
+
+
+<pre><code><b>struct</b> <a href="coin.md#0x1_coin_BurnRefReceipt">BurnRefReceipt</a>
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>metadata: <a href="object.md#0x1_object_Object">object::Object</a>&lt;<a href="fungible_asset.md#0x1_fungible_asset_Metadata">fungible_asset::Metadata</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_coin_Ghost$supply"></a>
+
+## Resource `Ghost$supply`
+
+
+
+<pre><code><b>struct</b> Ghost$<a href="coin.md#0x1_coin_supply">supply</a>&lt;CoinType&gt; <b>has</b> <b>copy</b>, drop, store, key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>v: num</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_coin_Ghost$aggregate_supply"></a>
+
+## Resource `Ghost$aggregate_supply`
+
+
+
+<pre><code><b>struct</b> Ghost$<a href="coin.md#0x1_coin_aggregate_supply">aggregate_supply</a>&lt;CoinType&gt; <b>has</b> <b>copy</b>, drop, store, key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>v: num</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_coin_MAX_U64"></a>
+
+Maximum possible aggregatable coin value.
+
+
+<pre><code><b>const</b> <a href="coin.md#0x1_coin_MAX_U64">MAX_U64</a>: u128 = 18446744073709551615;
+</code></pre>
+
+
+
+<a id="0x1_coin_MAX_U128"></a>
+
+Maximum possible coin supply.
+
+
+<pre><code><b>const</b> <a href="coin.md#0x1_coin_MAX_U128">MAX_U128</a>: u128 = 340282366920938463463374607431768211455;
+</code></pre>
+
+
+
+<a id="0x1_coin_EINSUFFICIENT_BALANCE"></a>
+
+Not enough coins to complete transaction
+
+
+<pre><code><b>const</b> <a href="coin.md#0x1_coin_EINSUFFICIENT_BALANCE">EINSUFFICIENT_BALANCE</a>: u64 = 6;
+</code></pre>
+
+
+
+<a id="0x1_coin_EAGGREGATABLE_COIN_VALUE_TOO_LARGE"></a>
+
+The value of aggregatable coin used for transaction fees redistribution does not fit in u64.
+
+
+<pre><code><b>const</b> <a href="coin.md#0x1_coin_EAGGREGATABLE_COIN_VALUE_TOO_LARGE">EAGGREGATABLE_COIN_VALUE_TOO_LARGE</a>: u64 = 14;
+</code></pre>
+
+
+
+<a id="0x1_coin_EAPT_PAIRING_IS_NOT_ENABLED"></a>
+
+APT pairing is not eanbled yet.
+
+
+<pre><code><b>const</b> <a href="coin.md#0x1_coin_EAPT_PAIRING_IS_NOT_ENABLED">EAPT_PAIRING_IS_NOT_ENABLED</a>: u64 = 28;
+</code></pre>
+
+
+
+<a id="0x1_coin_EBURN_REF_NOT_FOUND"></a>
+
+The BurnRef does not exist.
+
+
+<pre><code><b>const</b> <a href="coin.md#0x1_coin_EBURN_REF_NOT_FOUND">EBURN_REF_NOT_FOUND</a>: u64 = 25;
+</code></pre>
+
+
+
+<a id="0x1_coin_EBURN_REF_RECEIPT_MISMATCH"></a>
+
+The BurnRefReceipt does not match the BurnRef to be returned.
+
+
+<pre><code><b>const</b> <a href="coin.md#0x1_coin_EBURN_REF_RECEIPT_MISMATCH">EBURN_REF_RECEIPT_MISMATCH</a>: u64 = 24;
+</code></pre>
+
+
+
+<a id="0x1_coin_ECOIN_CONVERSION_MAP_NOT_FOUND"></a>
+
+The coin converison map is not created yet.
+
+
+<pre><code><b>const</b> <a href="coin.md#0x1_coin_ECOIN_CONVERSION_MAP_NOT_FOUND">ECOIN_CONVERSION_MAP_NOT_FOUND</a>: u64 = 27;
+</code></pre>
+
+
+
+<a id="0x1_coin_ECOIN_INFO_ADDRESS_MISMATCH"></a>
+
+Address of account which is used to initialize a coin <code>CoinType</code> doesn't match the deployer of module
+
+
+<pre><code><b>const</b> <a href="coin.md#0x1_coin_ECOIN_INFO_ADDRESS_MISMATCH">ECOIN_INFO_ADDRESS_MISMATCH</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_coin_ECOIN_INFO_ALREADY_PUBLISHED"></a>
+
+<code>CoinType</code> is already initialized as a coin
+
+
+<pre><code><b>const</b> <a href="coin.md#0x1_coin_ECOIN_INFO_ALREADY_PUBLISHED">ECOIN_INFO_ALREADY_PUBLISHED</a>: u64 = 2;
+</code></pre>
+
+
+
+<a id="0x1_coin_ECOIN_INFO_NOT_PUBLISHED"></a>
+
+<code>CoinType</code> hasn't been initialized as a coin
+
+
+<pre><code><b>const</b> <a href="coin.md#0x1_coin_ECOIN_INFO_NOT_PUBLISHED">ECOIN_INFO_NOT_PUBLISHED</a>: u64 = 3;
+</code></pre>
+
+
+
+<a id="0x1_coin_ECOIN_NAME_TOO_LONG"></a>
+
+Name of the coin is too long
+
+
+<pre><code><b>const</b> <a href="coin.md#0x1_coin_ECOIN_NAME_TOO_LONG">ECOIN_NAME_TOO_LONG</a>: u64 = 12;
+</code></pre>
+
+
+
+<a id="0x1_coin_ECOIN_STORE_ALREADY_PUBLISHED"></a>
+
+Deprecated. Account already has <code><a href="coin.md#0x1_coin_CoinStore">CoinStore</a></code> registered for <code>CoinType</code>
+
+
+<pre><code><b>const</b> <a href="coin.md#0x1_coin_ECOIN_STORE_ALREADY_PUBLISHED">ECOIN_STORE_ALREADY_PUBLISHED</a>: u64 = 4;
+</code></pre>
+
+
+
+<a id="0x1_coin_ECOIN_STORE_NOT_PUBLISHED"></a>
+
+Account hasn't registered <code><a href="coin.md#0x1_coin_CoinStore">CoinStore</a></code> for <code>CoinType</code>
+
+
+<pre><code><b>const</b> <a href="coin.md#0x1_coin_ECOIN_STORE_NOT_PUBLISHED">ECOIN_STORE_NOT_PUBLISHED</a>: u64 = 5;
+</code></pre>
+
+
+
+<a id="0x1_coin_ECOIN_SUPPLY_UPGRADE_NOT_SUPPORTED"></a>
+
+Cannot upgrade the total supply of coins to different implementation.
+
+
+<pre><code><b>const</b> <a href="coin.md#0x1_coin_ECOIN_SUPPLY_UPGRADE_NOT_SUPPORTED">ECOIN_SUPPLY_UPGRADE_NOT_SUPPORTED</a>: u64 = 11;
+</code></pre>
+
+
+
+<a id="0x1_coin_ECOIN_SYMBOL_TOO_LONG"></a>
+
+Symbol of the coin is too long
+
+
+<pre><code><b>const</b> <a href="coin.md#0x1_coin_ECOIN_SYMBOL_TOO_LONG">ECOIN_SYMBOL_TOO_LONG</a>: u64 = 13;
+</code></pre>
+
+
+
+<a id="0x1_coin_ECOIN_TO_FUNGIBLE_ASSET_FEATURE_NOT_ENABLED"></a>
+
+The feature of migration from coin to fungible asset is not enabled.
+
+
+<pre><code><b>const</b> <a href="coin.md#0x1_coin_ECOIN_TO_FUNGIBLE_ASSET_FEATURE_NOT_ENABLED">ECOIN_TO_FUNGIBLE_ASSET_FEATURE_NOT_ENABLED</a>: u64 = 18;
+</code></pre>
+
+
+
+<a id="0x1_coin_ECOIN_TYPE_MISMATCH"></a>
+
+The coin type from the map does not match the calling function type argument.
+
+
+<pre><code><b>const</b> <a href="coin.md#0x1_coin_ECOIN_TYPE_MISMATCH">ECOIN_TYPE_MISMATCH</a>: u64 = 17;
+</code></pre>
+
+
+
+<a id="0x1_coin_EDESTRUCTION_OF_NONZERO_TOKEN"></a>
+
+Cannot destroy non-zero coins
+
+
+<pre><code><b>const</b> <a href="coin.md#0x1_coin_EDESTRUCTION_OF_NONZERO_TOKEN">EDESTRUCTION_OF_NONZERO_TOKEN</a>: u64 = 7;
+</code></pre>
+
+
+
+<a id="0x1_coin_EFROZEN"></a>
+
+CoinStore is frozen. Coins cannot be deposited or withdrawn
+
+
+<pre><code><b>const</b> <a href="coin.md#0x1_coin_EFROZEN">EFROZEN</a>: u64 = 10;
+</code></pre>
+
+
+
+<a id="0x1_coin_EMIGRATION_FRAMEWORK_NOT_ENABLED"></a>
+
+The migration process from coin to fungible asset is not enabled yet.
+
+
+<pre><code><b>const</b> <a href="coin.md#0x1_coin_EMIGRATION_FRAMEWORK_NOT_ENABLED">EMIGRATION_FRAMEWORK_NOT_ENABLED</a>: u64 = 26;
+</code></pre>
+
+
+
+<a id="0x1_coin_EMINT_REF_NOT_FOUND"></a>
+
+The MintRef does not exist.
+
+
+<pre><code><b>const</b> <a href="coin.md#0x1_coin_EMINT_REF_NOT_FOUND">EMINT_REF_NOT_FOUND</a>: u64 = 21;
+</code></pre>
+
+
+
+<a id="0x1_coin_EMINT_REF_RECEIPT_MISMATCH"></a>
+
+The MintRefReceipt does not match the MintRef to be returned.
+
+
+<pre><code><b>const</b> <a href="coin.md#0x1_coin_EMINT_REF_RECEIPT_MISMATCH">EMINT_REF_RECEIPT_MISMATCH</a>: u64 = 20;
+</code></pre>
+
+
+
+<a id="0x1_coin_EPAIRED_COIN"></a>
+
+Error regarding paired coin type of the fungible asset metadata.
+
+
+<pre><code><b>const</b> <a href="coin.md#0x1_coin_EPAIRED_COIN">EPAIRED_COIN</a>: u64 = 15;
+</code></pre>
+
+
+
+<a id="0x1_coin_EPAIRED_FUNGIBLE_ASSET"></a>
+
+Error regarding paired fungible asset metadata of a coin type.
+
+
+<pre><code><b>const</b> <a href="coin.md#0x1_coin_EPAIRED_FUNGIBLE_ASSET">EPAIRED_FUNGIBLE_ASSET</a>: u64 = 16;
+</code></pre>
+
+
+
+<a id="0x1_coin_EPAIRED_FUNGIBLE_ASSET_REFS_NOT_FOUND"></a>
+
+PairedFungibleAssetRefs resource does not exist.
+
+
+<pre><code><b>const</b> <a href="coin.md#0x1_coin_EPAIRED_FUNGIBLE_ASSET_REFS_NOT_FOUND">EPAIRED_FUNGIBLE_ASSET_REFS_NOT_FOUND</a>: u64 = 19;
+</code></pre>
+
+
+
+<a id="0x1_coin_ETRANSFER_REF_NOT_FOUND"></a>
+
+The TransferRef does not exist.
+
+
+<pre><code><b>const</b> <a href="coin.md#0x1_coin_ETRANSFER_REF_NOT_FOUND">ETRANSFER_REF_NOT_FOUND</a>: u64 = 23;
+</code></pre>
+
+
+
+<a id="0x1_coin_ETRANSFER_REF_RECEIPT_MISMATCH"></a>
+
+The TransferRefReceipt does not match the TransferRef to be returned.
+
+
+<pre><code><b>const</b> <a href="coin.md#0x1_coin_ETRANSFER_REF_RECEIPT_MISMATCH">ETRANSFER_REF_RECEIPT_MISMATCH</a>: u64 = 22;
+</code></pre>
+
+
+
+<a id="0x1_coin_MAX_COIN_NAME_LENGTH"></a>
+
+
+
+<pre><code><b>const</b> <a href="coin.md#0x1_coin_MAX_COIN_NAME_LENGTH">MAX_COIN_NAME_LENGTH</a>: u64 = 32;
+</code></pre>
+
+
+
+<a id="0x1_coin_MAX_COIN_SYMBOL_LENGTH"></a>
+
+
+
+<pre><code><b>const</b> <a href="coin.md#0x1_coin_MAX_COIN_SYMBOL_LENGTH">MAX_COIN_SYMBOL_LENGTH</a>: u64 = 10;
+</code></pre>
+
+
+
+<a id="0x1_coin_paired_metadata"></a>
+
+## Function `paired_metadata`
+
+Get the paired fungible asset metadata object of a coin type. If not exist, return option::none().
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_paired_metadata">paired_metadata</a>&lt;CoinType&gt;(): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="object.md#0x1_object_Object">object::Object</a>&lt;<a href="fungible_asset.md#0x1_fungible_asset_Metadata">fungible_asset::Metadata</a>&gt;&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_paired_metadata">paired_metadata</a>&lt;CoinType&gt;(): Option&lt;Object&lt;Metadata&gt;&gt; <b>acquires</b> <a href="coin.md#0x1_coin_CoinConversionMap">CoinConversionMap</a> {
+    <b>if</b> (<b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinConversionMap">CoinConversionMap</a>&gt;(@aptos_framework) && <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_coin_to_fungible_asset_migration_feature_enabled">features::coin_to_fungible_asset_migration_feature_enabled</a>(
+    )) {
+        <b>let</b> map = &<b>borrow_global</b>&lt;<a href="coin.md#0x1_coin_CoinConversionMap">CoinConversionMap</a>&gt;(@aptos_framework).coin_to_fungible_asset_map;
+        <b>let</b> type = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_type_of">type_info::type_of</a>&lt;CoinType&gt;();
+        <b>if</b> (<a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_contains">table::contains</a>(map, type)) {
+            <b>return</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(*<a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_borrow">table::borrow</a>(map, type))
+        }
+    };
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>()
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_create_coin_conversion_map"></a>
+
+## Function `create_coin_conversion_map`
+
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="coin.md#0x1_coin_create_coin_conversion_map">create_coin_conversion_map</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="coin.md#0x1_coin_create_coin_conversion_map">create_coin_conversion_map</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>) {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(aptos_framework);
+    <b>if</b> (!<b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinConversionMap">CoinConversionMap</a>&gt;(@aptos_framework)) {
+        <b>move_to</b>(aptos_framework, <a href="coin.md#0x1_coin_CoinConversionMap">CoinConversionMap</a> {
+            coin_to_fungible_asset_map: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_new">table::new</a>(),
+        })
+    };
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_create_pairing"></a>
+
+## Function `create_pairing`
+
+Create APT pairing by passing <code>AptosCoin</code>.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="coin.md#0x1_coin_create_pairing">create_pairing</a>&lt;CoinType&gt;(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="coin.md#0x1_coin_create_pairing">create_pairing</a>&lt;CoinType&gt;(
+    aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>
+) <b>acquires</b> <a href="coin.md#0x1_coin_CoinConversionMap">CoinConversionMap</a>, <a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a> {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(aptos_framework);
+    <a href="coin.md#0x1_coin_create_and_return_paired_metadata_if_not_exist">create_and_return_paired_metadata_if_not_exist</a>&lt;CoinType&gt;(<b>true</b>);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_is_apt"></a>
+
+## Function `is_apt`
+
+
+
+<pre><code><b>fun</b> <a href="coin.md#0x1_coin_is_apt">is_apt</a>&lt;CoinType&gt;(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="coin.md#0x1_coin_is_apt">is_apt</a>&lt;CoinType&gt;(): bool {
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_type_name">type_info::type_name</a>&lt;CoinType&gt;() == <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"<a href="aptos_coin.md#0x1_aptos_coin_AptosCoin">0x1::aptos_coin::AptosCoin</a>")
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_create_and_return_paired_metadata_if_not_exist"></a>
+
+## Function `create_and_return_paired_metadata_if_not_exist`
+
+
+
+<pre><code><b>fun</b> <a href="coin.md#0x1_coin_create_and_return_paired_metadata_if_not_exist">create_and_return_paired_metadata_if_not_exist</a>&lt;CoinType&gt;(allow_apt_creation: bool): <a href="object.md#0x1_object_Object">object::Object</a>&lt;<a href="fungible_asset.md#0x1_fungible_asset_Metadata">fungible_asset::Metadata</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="coin.md#0x1_coin_create_and_return_paired_metadata_if_not_exist">create_and_return_paired_metadata_if_not_exist</a>&lt;CoinType&gt;(allow_apt_creation: bool): Object&lt;Metadata&gt; {
+    <b>assert</b>!(
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_coin_to_fungible_asset_migration_feature_enabled">features::coin_to_fungible_asset_migration_feature_enabled</a>(),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="coin.md#0x1_coin_EMIGRATION_FRAMEWORK_NOT_ENABLED">EMIGRATION_FRAMEWORK_NOT_ENABLED</a>)
+    );
+    <b>assert</b>!(<b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinConversionMap">CoinConversionMap</a>&gt;(@aptos_framework), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="coin.md#0x1_coin_ECOIN_CONVERSION_MAP_NOT_FOUND">ECOIN_CONVERSION_MAP_NOT_FOUND</a>));
+    <b>let</b> map = <b>borrow_global_mut</b>&lt;<a href="coin.md#0x1_coin_CoinConversionMap">CoinConversionMap</a>&gt;(@aptos_framework);
+    <b>let</b> type = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_type_of">type_info::type_of</a>&lt;CoinType&gt;();
+    <b>if</b> (!<a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_contains">table::contains</a>(&map.coin_to_fungible_asset_map, type)) {
+        <b>let</b> is_apt = <a href="coin.md#0x1_coin_is_apt">is_apt</a>&lt;CoinType&gt;();
+        <b>assert</b>!(!is_apt || allow_apt_creation, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="coin.md#0x1_coin_EAPT_PAIRING_IS_NOT_ENABLED">EAPT_PAIRING_IS_NOT_ENABLED</a>));
+        <b>let</b> metadata_object_cref =
+            <b>if</b> (is_apt) {
+                <a href="object.md#0x1_object_create_sticky_object_at_address">object::create_sticky_object_at_address</a>(@aptos_framework, @aptos_fungible_asset)
+            } <b>else</b> {
+                <a href="object.md#0x1_object_create_named_object">object::create_named_object</a>(
+                    &<a href="create_signer.md#0x1_create_signer_create_signer">create_signer::create_signer</a>(@aptos_fungible_asset),
+                    *<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_bytes">string::bytes</a>(&<a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_type_name">type_info::type_name</a>&lt;CoinType&gt;())
+                )
+            };
+        <a href="primary_fungible_store.md#0x1_primary_fungible_store_create_primary_store_enabled_fungible_asset">primary_fungible_store::create_primary_store_enabled_fungible_asset</a>(
+            &metadata_object_cref,
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>(),
+            <a href="coin.md#0x1_coin_name">name</a>&lt;CoinType&gt;(),
+            <a href="coin.md#0x1_coin_symbol">symbol</a>&lt;CoinType&gt;(),
+            <a href="coin.md#0x1_coin_decimals">decimals</a>&lt;CoinType&gt;(),
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b""),
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b""),
+        );
+
+        <b>let</b> metadata_object_signer = &<a href="object.md#0x1_object_generate_signer">object::generate_signer</a>(&metadata_object_cref);
+        <b>let</b> type = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_type_of">type_info::type_of</a>&lt;CoinType&gt;();
+        <b>move_to</b>(metadata_object_signer, <a href="coin.md#0x1_coin_PairedCoinType">PairedCoinType</a> { type });
+        <b>let</b> metadata_obj = <a href="object.md#0x1_object_object_from_constructor_ref">object::object_from_constructor_ref</a>(&metadata_object_cref);
+
+        <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_add">table::add</a>(&<b>mut</b> map.coin_to_fungible_asset_map, type, metadata_obj);
+        <a href="event.md#0x1_event_emit">event::emit</a>(<a href="coin.md#0x1_coin_PairCreation">PairCreation</a> {
+            coin_type: type,
+            fungible_asset_metadata_address: object_address(&metadata_obj)
+        });
+
+        // Generates all three refs
+        <b>let</b> mint_ref = <a href="fungible_asset.md#0x1_fungible_asset_generate_mint_ref">fungible_asset::generate_mint_ref</a>(&metadata_object_cref);
+        <b>let</b> transfer_ref = <a href="fungible_asset.md#0x1_fungible_asset_generate_transfer_ref">fungible_asset::generate_transfer_ref</a>(&metadata_object_cref);
+        <b>let</b> burn_ref = <a href="fungible_asset.md#0x1_fungible_asset_generate_burn_ref">fungible_asset::generate_burn_ref</a>(&metadata_object_cref);
+        <b>move_to</b>(metadata_object_signer,
+            <a href="coin.md#0x1_coin_PairedFungibleAssetRefs">PairedFungibleAssetRefs</a> {
+                mint_ref_opt: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(mint_ref),
+                transfer_ref_opt: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(transfer_ref),
+                burn_ref_opt: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(burn_ref),
+            }
+        );
+    };
+    *<a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_borrow">table::borrow</a>(&map.coin_to_fungible_asset_map, type)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_ensure_paired_metadata"></a>
+
+## Function `ensure_paired_metadata`
+
+Get the paired fungible asset metadata object of a coin type, create if not exist.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="coin.md#0x1_coin_ensure_paired_metadata">ensure_paired_metadata</a>&lt;CoinType&gt;(): <a href="object.md#0x1_object_Object">object::Object</a>&lt;<a href="fungible_asset.md#0x1_fungible_asset_Metadata">fungible_asset::Metadata</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="coin.md#0x1_coin_ensure_paired_metadata">ensure_paired_metadata</a>&lt;CoinType&gt;(): Object&lt;Metadata&gt; <b>acquires</b> <a href="coin.md#0x1_coin_CoinConversionMap">CoinConversionMap</a>, <a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a> {
+    <a href="coin.md#0x1_coin_create_and_return_paired_metadata_if_not_exist">create_and_return_paired_metadata_if_not_exist</a>&lt;CoinType&gt;(<b>false</b>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_paired_coin"></a>
+
+## Function `paired_coin`
+
+Get the paired coin type of a fungible asset metadata object.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_paired_coin">paired_coin</a>(metadata: <a href="object.md#0x1_object_Object">object::Object</a>&lt;<a href="fungible_asset.md#0x1_fungible_asset_Metadata">fungible_asset::Metadata</a>&gt;): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_TypeInfo">type_info::TypeInfo</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_paired_coin">paired_coin</a>(metadata: Object&lt;Metadata&gt;): Option&lt;TypeInfo&gt; <b>acquires</b> <a href="coin.md#0x1_coin_PairedCoinType">PairedCoinType</a> {
+    <b>let</b> metadata_addr = <a href="object.md#0x1_object_object_address">object::object_address</a>(&metadata);
+    <b>if</b> (<b>exists</b>&lt;<a href="coin.md#0x1_coin_PairedCoinType">PairedCoinType</a>&gt;(metadata_addr)) {
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(<b>borrow_global</b>&lt;<a href="coin.md#0x1_coin_PairedCoinType">PairedCoinType</a>&gt;(metadata_addr).type)
+    } <b>else</b> {
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>()
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_coin_to_fungible_asset"></a>
+
+## Function `coin_to_fungible_asset`
+
+Conversion from coin to fungible asset
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_coin_to_fungible_asset">coin_to_fungible_asset</a>&lt;CoinType&gt;(<a href="coin.md#0x1_coin">coin</a>: <a href="coin.md#0x1_coin_Coin">coin::Coin</a>&lt;CoinType&gt;): <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">fungible_asset::FungibleAsset</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_coin_to_fungible_asset">coin_to_fungible_asset</a>&lt;CoinType&gt;(
+    <a href="coin.md#0x1_coin">coin</a>: <a href="coin.md#0x1_coin_Coin">Coin</a>&lt;CoinType&gt;
+): FungibleAsset <b>acquires</b> <a href="coin.md#0x1_coin_CoinConversionMap">CoinConversionMap</a>, <a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a> {
+    <b>let</b> metadata = <a href="coin.md#0x1_coin_ensure_paired_metadata">ensure_paired_metadata</a>&lt;CoinType&gt;();
+    <b>let</b> amount = <a href="coin.md#0x1_coin_burn_internal">burn_internal</a>(<a href="coin.md#0x1_coin">coin</a>);
+    <a href="fungible_asset.md#0x1_fungible_asset_mint_internal">fungible_asset::mint_internal</a>(metadata, amount)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_fungible_asset_to_coin"></a>
+
+## Function `fungible_asset_to_coin`
+
+Conversion from fungible asset to coin. Not public to push the migration to FA.
+
+
+<pre><code><b>fun</b> <a href="coin.md#0x1_coin_fungible_asset_to_coin">fungible_asset_to_coin</a>&lt;CoinType&gt;(<a href="fungible_asset.md#0x1_fungible_asset">fungible_asset</a>: <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">fungible_asset::FungibleAsset</a>): <a href="coin.md#0x1_coin_Coin">coin::Coin</a>&lt;CoinType&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="coin.md#0x1_coin_fungible_asset_to_coin">fungible_asset_to_coin</a>&lt;CoinType&gt;(
+    <a href="fungible_asset.md#0x1_fungible_asset">fungible_asset</a>: FungibleAsset
+): <a href="coin.md#0x1_coin_Coin">Coin</a>&lt;CoinType&gt; <b>acquires</b> <a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a>, <a href="coin.md#0x1_coin_PairedCoinType">PairedCoinType</a> {
+    <b>let</b> metadata_addr = <a href="object.md#0x1_object_object_address">object::object_address</a>(&<a href="fungible_asset.md#0x1_fungible_asset_metadata_from_asset">fungible_asset::metadata_from_asset</a>(&<a href="fungible_asset.md#0x1_fungible_asset">fungible_asset</a>));
+    <b>assert</b>!(
+        <a href="object.md#0x1_object_object_exists">object::object_exists</a>&lt;<a href="coin.md#0x1_coin_PairedCoinType">PairedCoinType</a>&gt;(metadata_addr),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="coin.md#0x1_coin_EPAIRED_COIN">EPAIRED_COIN</a>)
+    );
+    <b>let</b> coin_type_info = <b>borrow_global</b>&lt;<a href="coin.md#0x1_coin_PairedCoinType">PairedCoinType</a>&gt;(metadata_addr).type;
+    <b>assert</b>!(coin_type_info == <a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_type_of">type_info::type_of</a>&lt;CoinType&gt;(), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="coin.md#0x1_coin_ECOIN_TYPE_MISMATCH">ECOIN_TYPE_MISMATCH</a>));
+    <b>let</b> amount = <a href="fungible_asset.md#0x1_fungible_asset_burn_internal">fungible_asset::burn_internal</a>(<a href="fungible_asset.md#0x1_fungible_asset">fungible_asset</a>);
+    <a href="coin.md#0x1_coin_mint_internal">mint_internal</a>&lt;CoinType&gt;(amount)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_assert_paired_metadata_exists"></a>
+
+## Function `assert_paired_metadata_exists`
+
+
+
+<pre><code><b>fun</b> <a href="coin.md#0x1_coin_assert_paired_metadata_exists">assert_paired_metadata_exists</a>&lt;CoinType&gt;(): <a href="object.md#0x1_object_Object">object::Object</a>&lt;<a href="fungible_asset.md#0x1_fungible_asset_Metadata">fungible_asset::Metadata</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="coin.md#0x1_coin_assert_paired_metadata_exists">assert_paired_metadata_exists</a>&lt;CoinType&gt;(): Object&lt;Metadata&gt; {
+    <b>let</b> metadata_opt = <a href="coin.md#0x1_coin_paired_metadata">paired_metadata</a>&lt;CoinType&gt;();
+    <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&metadata_opt), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="coin.md#0x1_coin_EPAIRED_FUNGIBLE_ASSET">EPAIRED_FUNGIBLE_ASSET</a>));
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_destroy_some">option::destroy_some</a>(metadata_opt)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_paired_mint_ref_exists"></a>
+
+## Function `paired_mint_ref_exists`
+
+Check whether <code>MintRef</code> has not been taken.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_paired_mint_ref_exists">paired_mint_ref_exists</a>&lt;CoinType&gt;(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_paired_mint_ref_exists">paired_mint_ref_exists</a>&lt;CoinType&gt;(): bool <b>acquires</b> <a href="coin.md#0x1_coin_CoinConversionMap">CoinConversionMap</a>, <a href="coin.md#0x1_coin_PairedFungibleAssetRefs">PairedFungibleAssetRefs</a> {
+    <b>let</b> metadata = <a href="coin.md#0x1_coin_assert_paired_metadata_exists">assert_paired_metadata_exists</a>&lt;CoinType&gt;();
+    <b>let</b> metadata_addr = object_address(&metadata);
+    <b>assert</b>!(<b>exists</b>&lt;<a href="coin.md#0x1_coin_PairedFungibleAssetRefs">PairedFungibleAssetRefs</a>&gt;(metadata_addr), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_internal">error::internal</a>(<a href="coin.md#0x1_coin_EPAIRED_FUNGIBLE_ASSET_REFS_NOT_FOUND">EPAIRED_FUNGIBLE_ASSET_REFS_NOT_FOUND</a>));
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&<b>borrow_global</b>&lt;<a href="coin.md#0x1_coin_PairedFungibleAssetRefs">PairedFungibleAssetRefs</a>&gt;(metadata_addr).mint_ref_opt)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_get_paired_mint_ref"></a>
+
+## Function `get_paired_mint_ref`
+
+Get the <code>MintRef</code> of paired fungible asset of a coin type from <code><a href="coin.md#0x1_coin_MintCapability">MintCapability</a></code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_get_paired_mint_ref">get_paired_mint_ref</a>&lt;CoinType&gt;(_: &<a href="coin.md#0x1_coin_MintCapability">coin::MintCapability</a>&lt;CoinType&gt;): (<a href="fungible_asset.md#0x1_fungible_asset_MintRef">fungible_asset::MintRef</a>, <a href="coin.md#0x1_coin_MintRefReceipt">coin::MintRefReceipt</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_get_paired_mint_ref">get_paired_mint_ref</a>&lt;CoinType&gt;(
+    _: &<a href="coin.md#0x1_coin_MintCapability">MintCapability</a>&lt;CoinType&gt;
+): (MintRef, <a href="coin.md#0x1_coin_MintRefReceipt">MintRefReceipt</a>) <b>acquires</b> <a href="coin.md#0x1_coin_CoinConversionMap">CoinConversionMap</a>, <a href="coin.md#0x1_coin_PairedFungibleAssetRefs">PairedFungibleAssetRefs</a> {
+    <b>let</b> metadata = <a href="coin.md#0x1_coin_assert_paired_metadata_exists">assert_paired_metadata_exists</a>&lt;CoinType&gt;();
+    <b>let</b> metadata_addr = object_address(&metadata);
+    <b>assert</b>!(<b>exists</b>&lt;<a href="coin.md#0x1_coin_PairedFungibleAssetRefs">PairedFungibleAssetRefs</a>&gt;(metadata_addr), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_internal">error::internal</a>(<a href="coin.md#0x1_coin_EPAIRED_FUNGIBLE_ASSET_REFS_NOT_FOUND">EPAIRED_FUNGIBLE_ASSET_REFS_NOT_FOUND</a>));
+    <b>let</b> mint_ref_opt = &<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="coin.md#0x1_coin_PairedFungibleAssetRefs">PairedFungibleAssetRefs</a>&gt;(metadata_addr).mint_ref_opt;
+    <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(mint_ref_opt), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="coin.md#0x1_coin_EMINT_REF_NOT_FOUND">EMINT_REF_NOT_FOUND</a>));
+    (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_extract">option::extract</a>(mint_ref_opt), <a href="coin.md#0x1_coin_MintRefReceipt">MintRefReceipt</a> { metadata })
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_return_paired_mint_ref"></a>
+
+## Function `return_paired_mint_ref`
+
+Return the <code>MintRef</code> with the hot potato receipt.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_return_paired_mint_ref">return_paired_mint_ref</a>(mint_ref: <a href="fungible_asset.md#0x1_fungible_asset_MintRef">fungible_asset::MintRef</a>, receipt: <a href="coin.md#0x1_coin_MintRefReceipt">coin::MintRefReceipt</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_return_paired_mint_ref">return_paired_mint_ref</a>(mint_ref: MintRef, receipt: <a href="coin.md#0x1_coin_MintRefReceipt">MintRefReceipt</a>) <b>acquires</b> <a href="coin.md#0x1_coin_PairedFungibleAssetRefs">PairedFungibleAssetRefs</a> {
+    <b>let</b> <a href="coin.md#0x1_coin_MintRefReceipt">MintRefReceipt</a> { metadata } = receipt;
+    <b>assert</b>!(
+        <a href="fungible_asset.md#0x1_fungible_asset_mint_ref_metadata">fungible_asset::mint_ref_metadata</a>(&mint_ref) == metadata,
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="coin.md#0x1_coin_EMINT_REF_RECEIPT_MISMATCH">EMINT_REF_RECEIPT_MISMATCH</a>)
+    );
+    <b>let</b> metadata_addr = object_address(&metadata);
+    <b>let</b> mint_ref_opt = &<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="coin.md#0x1_coin_PairedFungibleAssetRefs">PairedFungibleAssetRefs</a>&gt;(metadata_addr).mint_ref_opt;
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_fill">option::fill</a>(mint_ref_opt, mint_ref);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_paired_transfer_ref_exists"></a>
+
+## Function `paired_transfer_ref_exists`
+
+Check whether <code>TransferRef</code> still exists.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_paired_transfer_ref_exists">paired_transfer_ref_exists</a>&lt;CoinType&gt;(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_paired_transfer_ref_exists">paired_transfer_ref_exists</a>&lt;CoinType&gt;(): bool <b>acquires</b> <a href="coin.md#0x1_coin_CoinConversionMap">CoinConversionMap</a>, <a href="coin.md#0x1_coin_PairedFungibleAssetRefs">PairedFungibleAssetRefs</a> {
+    <b>let</b> metadata = <a href="coin.md#0x1_coin_assert_paired_metadata_exists">assert_paired_metadata_exists</a>&lt;CoinType&gt;();
+    <b>let</b> metadata_addr = object_address(&metadata);
+    <b>assert</b>!(<b>exists</b>&lt;<a href="coin.md#0x1_coin_PairedFungibleAssetRefs">PairedFungibleAssetRefs</a>&gt;(metadata_addr), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_internal">error::internal</a>(<a href="coin.md#0x1_coin_EPAIRED_FUNGIBLE_ASSET_REFS_NOT_FOUND">EPAIRED_FUNGIBLE_ASSET_REFS_NOT_FOUND</a>));
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&<b>borrow_global</b>&lt;<a href="coin.md#0x1_coin_PairedFungibleAssetRefs">PairedFungibleAssetRefs</a>&gt;(metadata_addr).transfer_ref_opt)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_get_paired_transfer_ref"></a>
+
+## Function `get_paired_transfer_ref`
+
+Get the TransferRef of paired fungible asset of a coin type from <code><a href="coin.md#0x1_coin_FreezeCapability">FreezeCapability</a></code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_get_paired_transfer_ref">get_paired_transfer_ref</a>&lt;CoinType&gt;(_: &<a href="coin.md#0x1_coin_FreezeCapability">coin::FreezeCapability</a>&lt;CoinType&gt;): (<a href="fungible_asset.md#0x1_fungible_asset_TransferRef">fungible_asset::TransferRef</a>, <a href="coin.md#0x1_coin_TransferRefReceipt">coin::TransferRefReceipt</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_get_paired_transfer_ref">get_paired_transfer_ref</a>&lt;CoinType&gt;(
+    _: &<a href="coin.md#0x1_coin_FreezeCapability">FreezeCapability</a>&lt;CoinType&gt;
+): (TransferRef, <a href="coin.md#0x1_coin_TransferRefReceipt">TransferRefReceipt</a>) <b>acquires</b> <a href="coin.md#0x1_coin_CoinConversionMap">CoinConversionMap</a>, <a href="coin.md#0x1_coin_PairedFungibleAssetRefs">PairedFungibleAssetRefs</a> {
+    <b>let</b> metadata = <a href="coin.md#0x1_coin_assert_paired_metadata_exists">assert_paired_metadata_exists</a>&lt;CoinType&gt;();
+    <b>let</b> metadata_addr = object_address(&metadata);
+    <b>assert</b>!(<b>exists</b>&lt;<a href="coin.md#0x1_coin_PairedFungibleAssetRefs">PairedFungibleAssetRefs</a>&gt;(metadata_addr), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_internal">error::internal</a>(<a href="coin.md#0x1_coin_EPAIRED_FUNGIBLE_ASSET_REFS_NOT_FOUND">EPAIRED_FUNGIBLE_ASSET_REFS_NOT_FOUND</a>));
+    <b>let</b> transfer_ref_opt = &<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="coin.md#0x1_coin_PairedFungibleAssetRefs">PairedFungibleAssetRefs</a>&gt;(metadata_addr).transfer_ref_opt;
+    <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(transfer_ref_opt), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="coin.md#0x1_coin_ETRANSFER_REF_NOT_FOUND">ETRANSFER_REF_NOT_FOUND</a>));
+    (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_extract">option::extract</a>(transfer_ref_opt), <a href="coin.md#0x1_coin_TransferRefReceipt">TransferRefReceipt</a> { metadata })
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_return_paired_transfer_ref"></a>
+
+## Function `return_paired_transfer_ref`
+
+Return the <code>TransferRef</code> with the hot potato receipt.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_return_paired_transfer_ref">return_paired_transfer_ref</a>(transfer_ref: <a href="fungible_asset.md#0x1_fungible_asset_TransferRef">fungible_asset::TransferRef</a>, receipt: <a href="coin.md#0x1_coin_TransferRefReceipt">coin::TransferRefReceipt</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_return_paired_transfer_ref">return_paired_transfer_ref</a>(
+    transfer_ref: TransferRef,
+    receipt: <a href="coin.md#0x1_coin_TransferRefReceipt">TransferRefReceipt</a>
+) <b>acquires</b> <a href="coin.md#0x1_coin_PairedFungibleAssetRefs">PairedFungibleAssetRefs</a> {
+    <b>let</b> <a href="coin.md#0x1_coin_TransferRefReceipt">TransferRefReceipt</a> { metadata } = receipt;
+    <b>assert</b>!(
+        <a href="fungible_asset.md#0x1_fungible_asset_transfer_ref_metadata">fungible_asset::transfer_ref_metadata</a>(&transfer_ref) == metadata,
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="coin.md#0x1_coin_ETRANSFER_REF_RECEIPT_MISMATCH">ETRANSFER_REF_RECEIPT_MISMATCH</a>)
+    );
+    <b>let</b> metadata_addr = object_address(&metadata);
+    <b>let</b> transfer_ref_opt = &<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="coin.md#0x1_coin_PairedFungibleAssetRefs">PairedFungibleAssetRefs</a>&gt;(metadata_addr).transfer_ref_opt;
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_fill">option::fill</a>(transfer_ref_opt, transfer_ref);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_paired_burn_ref_exists"></a>
+
+## Function `paired_burn_ref_exists`
+
+Check whether <code>BurnRef</code> has not been taken.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_paired_burn_ref_exists">paired_burn_ref_exists</a>&lt;CoinType&gt;(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_paired_burn_ref_exists">paired_burn_ref_exists</a>&lt;CoinType&gt;(): bool <b>acquires</b> <a href="coin.md#0x1_coin_CoinConversionMap">CoinConversionMap</a>, <a href="coin.md#0x1_coin_PairedFungibleAssetRefs">PairedFungibleAssetRefs</a> {
+    <b>let</b> metadata = <a href="coin.md#0x1_coin_assert_paired_metadata_exists">assert_paired_metadata_exists</a>&lt;CoinType&gt;();
+    <b>let</b> metadata_addr = object_address(&metadata);
+    <b>assert</b>!(<b>exists</b>&lt;<a href="coin.md#0x1_coin_PairedFungibleAssetRefs">PairedFungibleAssetRefs</a>&gt;(metadata_addr), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_internal">error::internal</a>(<a href="coin.md#0x1_coin_EPAIRED_FUNGIBLE_ASSET_REFS_NOT_FOUND">EPAIRED_FUNGIBLE_ASSET_REFS_NOT_FOUND</a>));
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&<b>borrow_global</b>&lt;<a href="coin.md#0x1_coin_PairedFungibleAssetRefs">PairedFungibleAssetRefs</a>&gt;(metadata_addr).burn_ref_opt)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_get_paired_burn_ref"></a>
+
+## Function `get_paired_burn_ref`
+
+Get the <code>BurnRef</code> of paired fungible asset of a coin type from <code><a href="coin.md#0x1_coin_BurnCapability">BurnCapability</a></code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_get_paired_burn_ref">get_paired_burn_ref</a>&lt;CoinType&gt;(_: &<a href="coin.md#0x1_coin_BurnCapability">coin::BurnCapability</a>&lt;CoinType&gt;): (<a href="fungible_asset.md#0x1_fungible_asset_BurnRef">fungible_asset::BurnRef</a>, <a href="coin.md#0x1_coin_BurnRefReceipt">coin::BurnRefReceipt</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_get_paired_burn_ref">get_paired_burn_ref</a>&lt;CoinType&gt;(
+    _: &<a href="coin.md#0x1_coin_BurnCapability">BurnCapability</a>&lt;CoinType&gt;
+): (BurnRef, <a href="coin.md#0x1_coin_BurnRefReceipt">BurnRefReceipt</a>) <b>acquires</b> <a href="coin.md#0x1_coin_CoinConversionMap">CoinConversionMap</a>, <a href="coin.md#0x1_coin_PairedFungibleAssetRefs">PairedFungibleAssetRefs</a> {
+    <b>let</b> metadata = <a href="coin.md#0x1_coin_assert_paired_metadata_exists">assert_paired_metadata_exists</a>&lt;CoinType&gt;();
+    <b>let</b> metadata_addr = object_address(&metadata);
+    <b>assert</b>!(<b>exists</b>&lt;<a href="coin.md#0x1_coin_PairedFungibleAssetRefs">PairedFungibleAssetRefs</a>&gt;(metadata_addr), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_internal">error::internal</a>(<a href="coin.md#0x1_coin_EPAIRED_FUNGIBLE_ASSET_REFS_NOT_FOUND">EPAIRED_FUNGIBLE_ASSET_REFS_NOT_FOUND</a>));
+    <b>let</b> burn_ref_opt = &<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="coin.md#0x1_coin_PairedFungibleAssetRefs">PairedFungibleAssetRefs</a>&gt;(metadata_addr).burn_ref_opt;
+    <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(burn_ref_opt), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="coin.md#0x1_coin_EBURN_REF_NOT_FOUND">EBURN_REF_NOT_FOUND</a>));
+    (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_extract">option::extract</a>(burn_ref_opt), <a href="coin.md#0x1_coin_BurnRefReceipt">BurnRefReceipt</a> { metadata })
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_convert_and_take_paired_burn_ref"></a>
+
+## Function `convert_and_take_paired_burn_ref`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_convert_and_take_paired_burn_ref">convert_and_take_paired_burn_ref</a>&lt;CoinType&gt;(burn_cap: <a href="coin.md#0x1_coin_BurnCapability">coin::BurnCapability</a>&lt;CoinType&gt;): <a href="fungible_asset.md#0x1_fungible_asset_BurnRef">fungible_asset::BurnRef</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_convert_and_take_paired_burn_ref">convert_and_take_paired_burn_ref</a>&lt;CoinType&gt;(
+    burn_cap: <a href="coin.md#0x1_coin_BurnCapability">BurnCapability</a>&lt;CoinType&gt;
+): BurnRef <b>acquires</b> <a href="coin.md#0x1_coin_CoinConversionMap">CoinConversionMap</a>, <a href="coin.md#0x1_coin_PairedFungibleAssetRefs">PairedFungibleAssetRefs</a> {
+    <a href="coin.md#0x1_coin_destroy_burn_cap">destroy_burn_cap</a>(burn_cap);
+    <b>let</b> metadata = <a href="coin.md#0x1_coin_assert_paired_metadata_exists">assert_paired_metadata_exists</a>&lt;CoinType&gt;();
+    <b>let</b> metadata_addr = object_address(&metadata);
+    <b>assert</b>!(<b>exists</b>&lt;<a href="coin.md#0x1_coin_PairedFungibleAssetRefs">PairedFungibleAssetRefs</a>&gt;(metadata_addr), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_internal">error::internal</a>(<a href="coin.md#0x1_coin_EPAIRED_FUNGIBLE_ASSET_REFS_NOT_FOUND">EPAIRED_FUNGIBLE_ASSET_REFS_NOT_FOUND</a>));
+    <b>let</b> burn_ref_opt = &<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="coin.md#0x1_coin_PairedFungibleAssetRefs">PairedFungibleAssetRefs</a>&gt;(metadata_addr).burn_ref_opt;
+    <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(burn_ref_opt), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="coin.md#0x1_coin_EBURN_REF_NOT_FOUND">EBURN_REF_NOT_FOUND</a>));
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_extract">option::extract</a>(burn_ref_opt)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_return_paired_burn_ref"></a>
+
+## Function `return_paired_burn_ref`
+
+Return the <code>BurnRef</code> with the hot potato receipt.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_return_paired_burn_ref">return_paired_burn_ref</a>(burn_ref: <a href="fungible_asset.md#0x1_fungible_asset_BurnRef">fungible_asset::BurnRef</a>, receipt: <a href="coin.md#0x1_coin_BurnRefReceipt">coin::BurnRefReceipt</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_return_paired_burn_ref">return_paired_burn_ref</a>(
+    burn_ref: BurnRef,
+    receipt: <a href="coin.md#0x1_coin_BurnRefReceipt">BurnRefReceipt</a>
+) <b>acquires</b> <a href="coin.md#0x1_coin_PairedFungibleAssetRefs">PairedFungibleAssetRefs</a> {
+    <b>let</b> <a href="coin.md#0x1_coin_BurnRefReceipt">BurnRefReceipt</a> { metadata } = receipt;
+    <b>assert</b>!(
+        <a href="fungible_asset.md#0x1_fungible_asset_burn_ref_metadata">fungible_asset::burn_ref_metadata</a>(&burn_ref) == metadata,
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="coin.md#0x1_coin_EBURN_REF_RECEIPT_MISMATCH">EBURN_REF_RECEIPT_MISMATCH</a>)
+    );
+    <b>let</b> metadata_addr = object_address(&metadata);
+    <b>let</b> burn_ref_opt = &<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="coin.md#0x1_coin_PairedFungibleAssetRefs">PairedFungibleAssetRefs</a>&gt;(metadata_addr).burn_ref_opt;
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_fill">option::fill</a>(burn_ref_opt, burn_ref);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_borrow_paired_burn_ref"></a>
+
+## Function `borrow_paired_burn_ref`
+
+
+
+<pre><code><b>fun</b> <a href="coin.md#0x1_coin_borrow_paired_burn_ref">borrow_paired_burn_ref</a>&lt;CoinType&gt;(_: &<a href="coin.md#0x1_coin_BurnCapability">coin::BurnCapability</a>&lt;CoinType&gt;): &<a href="fungible_asset.md#0x1_fungible_asset_BurnRef">fungible_asset::BurnRef</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="coin.md#0x1_coin_borrow_paired_burn_ref">borrow_paired_burn_ref</a>&lt;CoinType&gt;(
+    _: &<a href="coin.md#0x1_coin_BurnCapability">BurnCapability</a>&lt;CoinType&gt;
+): &BurnRef <b>acquires</b> <a href="coin.md#0x1_coin_CoinConversionMap">CoinConversionMap</a>, <a href="coin.md#0x1_coin_PairedFungibleAssetRefs">PairedFungibleAssetRefs</a> {
+    <b>let</b> metadata = <a href="coin.md#0x1_coin_assert_paired_metadata_exists">assert_paired_metadata_exists</a>&lt;CoinType&gt;();
+    <b>let</b> metadata_addr = object_address(&metadata);
+    <b>assert</b>!(<b>exists</b>&lt;<a href="coin.md#0x1_coin_PairedFungibleAssetRefs">PairedFungibleAssetRefs</a>&gt;(metadata_addr), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_internal">error::internal</a>(<a href="coin.md#0x1_coin_EPAIRED_FUNGIBLE_ASSET_REFS_NOT_FOUND">EPAIRED_FUNGIBLE_ASSET_REFS_NOT_FOUND</a>));
+    <b>let</b> burn_ref_opt = &<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="coin.md#0x1_coin_PairedFungibleAssetRefs">PairedFungibleAssetRefs</a>&gt;(metadata_addr).burn_ref_opt;
+    <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(burn_ref_opt), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="coin.md#0x1_coin_EBURN_REF_NOT_FOUND">EBURN_REF_NOT_FOUND</a>));
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(burn_ref_opt)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_initialize_supply_config"></a>
+
+## Function `initialize_supply_config`
+
+Publishes supply configuration. Initially, upgrading is not allowed.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="coin.md#0x1_coin_initialize_supply_config">initialize_supply_config</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="coin.md#0x1_coin_initialize_supply_config">initialize_supply_config</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>) {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(aptos_framework);
+    <b>move_to</b>(aptos_framework, <a href="coin.md#0x1_coin_SupplyConfig">SupplyConfig</a> { allow_upgrades: <b>false</b> });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_allow_supply_upgrades"></a>
+
+## Function `allow_supply_upgrades`
+
+This should be called by on-chain governance to update the config and allow
+or disallow upgradability of total supply.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_allow_supply_upgrades">allow_supply_upgrades</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, allowed: bool)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_allow_supply_upgrades">allow_supply_upgrades</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, allowed: bool) <b>acquires</b> <a href="coin.md#0x1_coin_SupplyConfig">SupplyConfig</a> {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(aptos_framework);
+    <b>let</b> allow_upgrades = &<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="coin.md#0x1_coin_SupplyConfig">SupplyConfig</a>&gt;(@aptos_framework).allow_upgrades;
+    *allow_upgrades = allowed;
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_initialize_aggregatable_coin"></a>
+
+## Function `initialize_aggregatable_coin`
+
+Creates a new aggregatable coin with value overflowing on <code>limit</code>. Note that this function can
+only be called by Aptos Framework (0x1) account for now because of <code>create_aggregator</code>.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="coin.md#0x1_coin_initialize_aggregatable_coin">initialize_aggregatable_coin</a>&lt;CoinType&gt;(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>): <a href="coin.md#0x1_coin_AggregatableCoin">coin::AggregatableCoin</a>&lt;CoinType&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="coin.md#0x1_coin_initialize_aggregatable_coin">initialize_aggregatable_coin</a>&lt;CoinType&gt;(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>): <a href="coin.md#0x1_coin_AggregatableCoin">AggregatableCoin</a>&lt;CoinType&gt; {
+    <b>let</b> <a href="aggregator.md#0x1_aggregator">aggregator</a> = <a href="aggregator_factory.md#0x1_aggregator_factory_create_aggregator">aggregator_factory::create_aggregator</a>(aptos_framework, <a href="coin.md#0x1_coin_MAX_U64">MAX_U64</a>);
+    <a href="coin.md#0x1_coin_AggregatableCoin">AggregatableCoin</a>&lt;CoinType&gt; {
+        value: <a href="aggregator.md#0x1_aggregator">aggregator</a>,
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_is_aggregatable_coin_zero"></a>
+
+## Function `is_aggregatable_coin_zero`
+
+Returns true if the value of aggregatable coin is zero.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="coin.md#0x1_coin_is_aggregatable_coin_zero">is_aggregatable_coin_zero</a>&lt;CoinType&gt;(<a href="coin.md#0x1_coin">coin</a>: &<a href="coin.md#0x1_coin_AggregatableCoin">coin::AggregatableCoin</a>&lt;CoinType&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="coin.md#0x1_coin_is_aggregatable_coin_zero">is_aggregatable_coin_zero</a>&lt;CoinType&gt;(<a href="coin.md#0x1_coin">coin</a>: &<a href="coin.md#0x1_coin_AggregatableCoin">AggregatableCoin</a>&lt;CoinType&gt;): bool {
+    <b>let</b> amount = <a href="aggregator.md#0x1_aggregator_read">aggregator::read</a>(&<a href="coin.md#0x1_coin">coin</a>.value);
+    amount == 0
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_drain_aggregatable_coin"></a>
+
+## Function `drain_aggregatable_coin`
+
+Drains the aggregatable coin, setting it to zero and returning a standard coin.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="coin.md#0x1_coin_drain_aggregatable_coin">drain_aggregatable_coin</a>&lt;CoinType&gt;(<a href="coin.md#0x1_coin">coin</a>: &<b>mut</b> <a href="coin.md#0x1_coin_AggregatableCoin">coin::AggregatableCoin</a>&lt;CoinType&gt;): <a href="coin.md#0x1_coin_Coin">coin::Coin</a>&lt;CoinType&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="coin.md#0x1_coin_drain_aggregatable_coin">drain_aggregatable_coin</a>&lt;CoinType&gt;(<a href="coin.md#0x1_coin">coin</a>: &<b>mut</b> <a href="coin.md#0x1_coin_AggregatableCoin">AggregatableCoin</a>&lt;CoinType&gt;): <a href="coin.md#0x1_coin_Coin">Coin</a>&lt;CoinType&gt; {
+    <b>spec</b> {
+        // TODO: The data <b>invariant</b> is not properly assumed from CollectedFeesPerBlock.
+        <b>assume</b> <a href="aggregator.md#0x1_aggregator_spec_get_limit">aggregator::spec_get_limit</a>(<a href="coin.md#0x1_coin">coin</a>.value) == <a href="coin.md#0x1_coin_MAX_U64">MAX_U64</a>;
+    };
+    <b>let</b> amount = <a href="aggregator.md#0x1_aggregator_read">aggregator::read</a>(&<a href="coin.md#0x1_coin">coin</a>.value);
+    <b>assert</b>!(amount &lt;= <a href="coin.md#0x1_coin_MAX_U64">MAX_U64</a>, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_out_of_range">error::out_of_range</a>(<a href="coin.md#0x1_coin_EAGGREGATABLE_COIN_VALUE_TOO_LARGE">EAGGREGATABLE_COIN_VALUE_TOO_LARGE</a>));
+    <b>spec</b> {
+        <b>update</b> <a href="coin.md#0x1_coin_aggregate_supply">aggregate_supply</a>&lt;CoinType&gt; = <a href="coin.md#0x1_coin_aggregate_supply">aggregate_supply</a>&lt;CoinType&gt; - amount;
+    };
+    <a href="aggregator.md#0x1_aggregator_sub">aggregator::sub</a>(&<b>mut</b> <a href="coin.md#0x1_coin">coin</a>.value, amount);
+    <b>spec</b> {
+        <b>update</b> <a href="coin.md#0x1_coin_supply">supply</a>&lt;CoinType&gt; = <a href="coin.md#0x1_coin_supply">supply</a>&lt;CoinType&gt; + amount;
+    };
+    <a href="coin.md#0x1_coin_Coin">Coin</a>&lt;CoinType&gt; {
+        value: (amount <b>as</b> u64),
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_merge_aggregatable_coin"></a>
+
+## Function `merge_aggregatable_coin`
+
+Merges <code><a href="coin.md#0x1_coin">coin</a></code> into aggregatable coin (<code>dst_coin</code>).
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="coin.md#0x1_coin_merge_aggregatable_coin">merge_aggregatable_coin</a>&lt;CoinType&gt;(dst_coin: &<b>mut</b> <a href="coin.md#0x1_coin_AggregatableCoin">coin::AggregatableCoin</a>&lt;CoinType&gt;, <a href="coin.md#0x1_coin">coin</a>: <a href="coin.md#0x1_coin_Coin">coin::Coin</a>&lt;CoinType&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="coin.md#0x1_coin_merge_aggregatable_coin">merge_aggregatable_coin</a>&lt;CoinType&gt;(
+    dst_coin: &<b>mut</b> <a href="coin.md#0x1_coin_AggregatableCoin">AggregatableCoin</a>&lt;CoinType&gt;,
+    <a href="coin.md#0x1_coin">coin</a>: <a href="coin.md#0x1_coin_Coin">Coin</a>&lt;CoinType&gt;
+) {
+    <b>spec</b> {
+        <b>update</b> <a href="coin.md#0x1_coin_supply">supply</a>&lt;CoinType&gt; = <a href="coin.md#0x1_coin_supply">supply</a>&lt;CoinType&gt; - <a href="coin.md#0x1_coin">coin</a>.value;
+    };
+    <b>let</b> <a href="coin.md#0x1_coin_Coin">Coin</a> { value } = <a href="coin.md#0x1_coin">coin</a>;
+    <b>let</b> amount = (value <b>as</b> u128);
+    <b>spec</b> {
+        <b>update</b> <a href="coin.md#0x1_coin_aggregate_supply">aggregate_supply</a>&lt;CoinType&gt; = <a href="coin.md#0x1_coin_aggregate_supply">aggregate_supply</a>&lt;CoinType&gt; + amount;
+    };
+    <a href="aggregator.md#0x1_aggregator_add">aggregator::add</a>(&<b>mut</b> dst_coin.value, amount);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_collect_into_aggregatable_coin"></a>
+
+## Function `collect_into_aggregatable_coin`
+
+Collects a specified amount of coin form an account into aggregatable coin.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="coin.md#0x1_coin_collect_into_aggregatable_coin">collect_into_aggregatable_coin</a>&lt;CoinType&gt;(account_addr: <b>address</b>, amount: u64, dst_coin: &<b>mut</b> <a href="coin.md#0x1_coin_AggregatableCoin">coin::AggregatableCoin</a>&lt;CoinType&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="coin.md#0x1_coin_collect_into_aggregatable_coin">collect_into_aggregatable_coin</a>&lt;CoinType&gt;(
+    account_addr: <b>address</b>,
+    amount: u64,
+    dst_coin: &<b>mut</b> <a href="coin.md#0x1_coin_AggregatableCoin">AggregatableCoin</a>&lt;CoinType&gt;,
+) <b>acquires</b> <a href="coin.md#0x1_coin_CoinStore">CoinStore</a>, <a href="coin.md#0x1_coin_CoinConversionMap">CoinConversionMap</a>, <a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a>, <a href="coin.md#0x1_coin_PairedCoinType">PairedCoinType</a> {
+    // Skip collecting <b>if</b> amount is zero.
+    <b>if</b> (amount == 0) {
+        <b>return</b>
+    };
+
+    <b>let</b> (coin_amount_to_collect, fa_amount_to_collect) = <a href="coin.md#0x1_coin_calculate_amount_to_withdraw">calculate_amount_to_withdraw</a>&lt;CoinType&gt;(
+        account_addr,
+        amount
+    );
+    <b>let</b> <a href="coin.md#0x1_coin">coin</a> = <b>if</b> (coin_amount_to_collect &gt; 0) {
+        <b>let</b> coin_store = <b>borrow_global_mut</b>&lt;<a href="coin.md#0x1_coin_CoinStore">CoinStore</a>&lt;CoinType&gt;&gt;(account_addr);
+        <a href="coin.md#0x1_coin_extract">extract</a>(&<b>mut</b> coin_store.<a href="coin.md#0x1_coin">coin</a>, coin_amount_to_collect)
+    } <b>else</b> {
+        <a href="coin.md#0x1_coin_zero">zero</a>()
+    };
+    <b>if</b> (fa_amount_to_collect &gt; 0) {
+        <b>let</b> store_addr = <a href="primary_fungible_store.md#0x1_primary_fungible_store_primary_store_address">primary_fungible_store::primary_store_address</a>(
+            account_addr,
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_destroy_some">option::destroy_some</a>(<a href="coin.md#0x1_coin_paired_metadata">paired_metadata</a>&lt;CoinType&gt;())
+        );
+        <b>let</b> fa = <a href="fungible_asset.md#0x1_fungible_asset_withdraw_internal">fungible_asset::withdraw_internal</a>(store_addr, fa_amount_to_collect);
+        <a href="coin.md#0x1_coin_merge">merge</a>(&<b>mut</b> <a href="coin.md#0x1_coin">coin</a>, <a href="coin.md#0x1_coin_fungible_asset_to_coin">fungible_asset_to_coin</a>&lt;CoinType&gt;(fa));
+    };
+    <a href="coin.md#0x1_coin_merge_aggregatable_coin">merge_aggregatable_coin</a>(dst_coin, <a href="coin.md#0x1_coin">coin</a>);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_calculate_amount_to_withdraw"></a>
+
+## Function `calculate_amount_to_withdraw`
+
+
+
+<pre><code><b>fun</b> <a href="coin.md#0x1_coin_calculate_amount_to_withdraw">calculate_amount_to_withdraw</a>&lt;CoinType&gt;(account_addr: <b>address</b>, amount: u64): (u64, u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="coin.md#0x1_coin_calculate_amount_to_withdraw">calculate_amount_to_withdraw</a>&lt;CoinType&gt;(
+    account_addr: <b>address</b>,
+    amount: u64
+): (u64, u64) {
+    <b>let</b> coin_balance = <a href="coin.md#0x1_coin_coin_balance">coin_balance</a>&lt;CoinType&gt;(account_addr);
+    <b>if</b> (coin_balance &gt;= amount) {
+        (amount, 0)
+    } <b>else</b> {
+        <b>let</b> metadata = <a href="coin.md#0x1_coin_paired_metadata">paired_metadata</a>&lt;CoinType&gt;();
+        <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&metadata) && <a href="primary_fungible_store.md#0x1_primary_fungible_store_primary_store_exists">primary_fungible_store::primary_store_exists</a>(
+            account_addr,
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_destroy_some">option::destroy_some</a>(metadata)
+        ))
+            (coin_balance, amount - coin_balance)
+        <b>else</b>
+            <b>abort</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="coin.md#0x1_coin_EINSUFFICIENT_BALANCE">EINSUFFICIENT_BALANCE</a>)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_maybe_convert_to_fungible_store"></a>
+
+## Function `maybe_convert_to_fungible_store`
+
+
+
+<pre><code><b>fun</b> <a href="coin.md#0x1_coin_maybe_convert_to_fungible_store">maybe_convert_to_fungible_store</a>&lt;CoinType&gt;(<a href="account.md#0x1_account">account</a>: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="coin.md#0x1_coin_maybe_convert_to_fungible_store">maybe_convert_to_fungible_store</a>&lt;CoinType&gt;(<a href="account.md#0x1_account">account</a>: <b>address</b>) <b>acquires</b> <a href="coin.md#0x1_coin_CoinStore">CoinStore</a>, <a href="coin.md#0x1_coin_CoinConversionMap">CoinConversionMap</a>, <a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a> {
+    <b>if</b> (!<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_coin_to_fungible_asset_migration_feature_enabled">features::coin_to_fungible_asset_migration_feature_enabled</a>()) {
+        <b>abort</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_unavailable">error::unavailable</a>(<a href="coin.md#0x1_coin_ECOIN_TO_FUNGIBLE_ASSET_FEATURE_NOT_ENABLED">ECOIN_TO_FUNGIBLE_ASSET_FEATURE_NOT_ENABLED</a>)
+    };
+    <b>assert</b>!(<a href="coin.md#0x1_coin_is_coin_initialized">is_coin_initialized</a>&lt;CoinType&gt;(), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="coin.md#0x1_coin_ECOIN_INFO_NOT_PUBLISHED">ECOIN_INFO_NOT_PUBLISHED</a>));
+
+    <b>let</b> metadata = <a href="coin.md#0x1_coin_ensure_paired_metadata">ensure_paired_metadata</a>&lt;CoinType&gt;();
+    <b>let</b> store = <a href="primary_fungible_store.md#0x1_primary_fungible_store_ensure_primary_store_exists">primary_fungible_store::ensure_primary_store_exists</a>(<a href="account.md#0x1_account">account</a>, metadata);
+    <b>let</b> store_address = <a href="object.md#0x1_object_object_address">object::object_address</a>(&store);
+    <b>if</b> (<b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinStore">CoinStore</a>&lt;CoinType&gt;&gt;(<a href="account.md#0x1_account">account</a>)) {
+        <b>let</b> <a href="coin.md#0x1_coin_CoinStore">CoinStore</a>&lt;CoinType&gt; { <a href="coin.md#0x1_coin">coin</a>, frozen, deposit_events, withdraw_events } = <b>move_from</b>&lt;<a href="coin.md#0x1_coin_CoinStore">CoinStore</a>&lt;CoinType&gt;&gt;(
+            <a href="account.md#0x1_account">account</a>
+        );
+        <a href="event.md#0x1_event_emit">event::emit</a>(
+            <a href="coin.md#0x1_coin_CoinEventHandleDeletion">CoinEventHandleDeletion</a> {
+                event_handle_creation_address: <a href="guid.md#0x1_guid_creator_address">guid::creator_address</a>(
+                    <a href="event.md#0x1_event_guid">event::guid</a>(&deposit_events)
+                ),
+                deleted_deposit_event_handle_creation_number: <a href="guid.md#0x1_guid_creation_num">guid::creation_num</a>(<a href="event.md#0x1_event_guid">event::guid</a>(&deposit_events)),
+                deleted_withdraw_event_handle_creation_number: <a href="guid.md#0x1_guid_creation_num">guid::creation_num</a>(<a href="event.md#0x1_event_guid">event::guid</a>(&withdraw_events))
+            }
+        );
+        <a href="event.md#0x1_event_destroy_handle">event::destroy_handle</a>(deposit_events);
+        <a href="event.md#0x1_event_destroy_handle">event::destroy_handle</a>(withdraw_events);
+        <b>if</b> (<a href="coin.md#0x1_coin">coin</a>.value == 0) {
+            <a href="coin.md#0x1_coin_destroy_zero">destroy_zero</a>(<a href="coin.md#0x1_coin">coin</a>);
+        } <b>else</b> {
+            <a href="fungible_asset.md#0x1_fungible_asset_deposit">fungible_asset::deposit</a>(store, <a href="coin.md#0x1_coin_coin_to_fungible_asset">coin_to_fungible_asset</a>(<a href="coin.md#0x1_coin">coin</a>));
+        };
+        // Note:
+        // It is possible the primary fungible store may already exist before this function call.
+        // In this case, <b>if</b> the <a href="account.md#0x1_account">account</a> owns a frozen <a href="coin.md#0x1_coin_CoinStore">CoinStore</a> and an unfrozen primary fungible store, this
+        // function would convert and deposit the rest <a href="coin.md#0x1_coin">coin</a> into the primary store and <b>freeze</b> it <b>to</b> make the
+        // `frozen` semantic <b>as</b> consistent <b>as</b> possible.
+        <b>if</b> (frozen != <a href="fungible_asset.md#0x1_fungible_asset_is_frozen">fungible_asset::is_frozen</a>(store)) {
+            <a href="fungible_asset.md#0x1_fungible_asset_set_frozen_flag_internal">fungible_asset::set_frozen_flag_internal</a>(store, frozen);
+        }
+    };
+    <b>if</b> (!<b>exists</b>&lt;<a href="coin.md#0x1_coin_MigrationFlag">MigrationFlag</a>&gt;(store_address)) {
+        <b>move_to</b>(&<a href="create_signer.md#0x1_create_signer_create_signer">create_signer::create_signer</a>(store_address), <a href="coin.md#0x1_coin_MigrationFlag">MigrationFlag</a> {});
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_migrate_to_fungible_store"></a>
+
+## Function `migrate_to_fungible_store`
+
+Voluntarily migrate to fungible store for <code>CoinType</code> if not yet.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="coin.md#0x1_coin_migrate_to_fungible_store">migrate_to_fungible_store</a>&lt;CoinType&gt;(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="coin.md#0x1_coin_migrate_to_fungible_store">migrate_to_fungible_store</a>&lt;CoinType&gt;(
+    <a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>
+) <b>acquires</b> <a href="coin.md#0x1_coin_CoinStore">CoinStore</a>, <a href="coin.md#0x1_coin_CoinConversionMap">CoinConversionMap</a>, <a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a> {
+    <a href="coin.md#0x1_coin_maybe_convert_to_fungible_store">maybe_convert_to_fungible_store</a>&lt;CoinType&gt;(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>));
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_coin_address"></a>
+
+## Function `coin_address`
+
+A helper function that returns the address of CoinType.
+
+
+<pre><code><b>fun</b> <a href="coin.md#0x1_coin_coin_address">coin_address</a>&lt;CoinType&gt;(): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="coin.md#0x1_coin_coin_address">coin_address</a>&lt;CoinType&gt;(): <b>address</b> {
+    <b>let</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info">type_info</a> = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_type_of">type_info::type_of</a>&lt;CoinType&gt;();
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_account_address">type_info::account_address</a>(&<a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info">type_info</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_balance"></a>
+
+## Function `balance`
+
+Returns the balance of <code>owner</code> for provided <code>CoinType</code> and its paired FA if exists.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_balance">balance</a>&lt;CoinType&gt;(owner: <b>address</b>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_balance">balance</a>&lt;CoinType&gt;(owner: <b>address</b>): u64 <b>acquires</b> <a href="coin.md#0x1_coin_CoinConversionMap">CoinConversionMap</a>, <a href="coin.md#0x1_coin_CoinStore">CoinStore</a> {
+    <b>let</b> paired_metadata = <a href="coin.md#0x1_coin_paired_metadata">paired_metadata</a>&lt;CoinType&gt;();
+    <a href="coin.md#0x1_coin_coin_balance">coin_balance</a>&lt;CoinType&gt;(owner) + <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&paired_metadata)) {
+        <a href="primary_fungible_store.md#0x1_primary_fungible_store_balance">primary_fungible_store::balance</a>(
+            owner,
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_extract">option::extract</a>(&<b>mut</b> paired_metadata)
+        )
+    } <b>else</b> { 0 }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_is_balance_at_least"></a>
+
+## Function `is_balance_at_least`
+
+Returns whether the balance of <code>owner</code> for provided <code>CoinType</code> and its paired FA is >= <code>amount</code>.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_is_balance_at_least">is_balance_at_least</a>&lt;CoinType&gt;(owner: <b>address</b>, amount: u64): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_is_balance_at_least">is_balance_at_least</a>&lt;CoinType&gt;(owner: <b>address</b>, amount: u64): bool <b>acquires</b> <a href="coin.md#0x1_coin_CoinConversionMap">CoinConversionMap</a>, <a href="coin.md#0x1_coin_CoinStore">CoinStore</a> {
+    <b>let</b> coin_balance = <a href="coin.md#0x1_coin_coin_balance">coin_balance</a>&lt;CoinType&gt;(owner);
+    <b>if</b> (coin_balance &gt;= amount) {
+        <b>return</b> <b>true</b>
+    };
+
+    <b>let</b> paired_metadata = <a href="coin.md#0x1_coin_paired_metadata">paired_metadata</a>&lt;CoinType&gt;();
+    <b>let</b> left_amount = amount - coin_balance;
+    <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&paired_metadata)) {
+        <a href="primary_fungible_store.md#0x1_primary_fungible_store_is_balance_at_least">primary_fungible_store::is_balance_at_least</a>(
+            owner,
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_extract">option::extract</a>(&<b>mut</b> paired_metadata),
+            left_amount
+        )
+    } <b>else</b> { <b>false</b> }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_coin_balance"></a>
+
+## Function `coin_balance`
+
+
+
+<pre><code><b>fun</b> <a href="coin.md#0x1_coin_coin_balance">coin_balance</a>&lt;CoinType&gt;(owner: <b>address</b>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="coin.md#0x1_coin_coin_balance">coin_balance</a>&lt;CoinType&gt;(owner: <b>address</b>): u64 {
+    <b>if</b> (<b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinStore">CoinStore</a>&lt;CoinType&gt;&gt;(owner)) {
+        <b>borrow_global</b>&lt;<a href="coin.md#0x1_coin_CoinStore">CoinStore</a>&lt;CoinType&gt;&gt;(owner).<a href="coin.md#0x1_coin">coin</a>.value
+    } <b>else</b> {
+        0
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_is_coin_initialized"></a>
+
+## Function `is_coin_initialized`
+
+Returns <code><b>true</b></code> if the type <code>CoinType</code> is an initialized coin.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_is_coin_initialized">is_coin_initialized</a>&lt;CoinType&gt;(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_is_coin_initialized">is_coin_initialized</a>&lt;CoinType&gt;(): bool {
+    <b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a>&lt;CoinType&gt;&gt;(<a href="coin.md#0x1_coin_coin_address">coin_address</a>&lt;CoinType&gt;())
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_is_coin_store_frozen"></a>
+
+## Function `is_coin_store_frozen`
+
+Returns <code><b>true</b></code> is account_addr has frozen the CoinStore or if it's not registered at all
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_is_coin_store_frozen">is_coin_store_frozen</a>&lt;CoinType&gt;(account_addr: <b>address</b>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_is_coin_store_frozen">is_coin_store_frozen</a>&lt;CoinType&gt;(
+    account_addr: <b>address</b>
+): bool <b>acquires</b> <a href="coin.md#0x1_coin_CoinStore">CoinStore</a>, <a href="coin.md#0x1_coin_CoinConversionMap">CoinConversionMap</a> {
+    <b>if</b> (!<a href="coin.md#0x1_coin_is_account_registered">is_account_registered</a>&lt;CoinType&gt;(account_addr)) {
+        <b>return</b> <b>true</b>
+    };
+
+    <b>let</b> coin_store = <b>borrow_global</b>&lt;<a href="coin.md#0x1_coin_CoinStore">CoinStore</a>&lt;CoinType&gt;&gt;(account_addr);
+    coin_store.frozen
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_is_account_registered"></a>
+
+## Function `is_account_registered`
+
+Returns <code><b>true</b></code> if <code>account_addr</code> is registered to receive <code>CoinType</code>.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_is_account_registered">is_account_registered</a>&lt;CoinType&gt;(account_addr: <b>address</b>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_is_account_registered">is_account_registered</a>&lt;CoinType&gt;(account_addr: <b>address</b>): bool <b>acquires</b> <a href="coin.md#0x1_coin_CoinConversionMap">CoinConversionMap</a> {
+    <b>assert</b>!(<a href="coin.md#0x1_coin_is_coin_initialized">is_coin_initialized</a>&lt;CoinType&gt;(), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="coin.md#0x1_coin_ECOIN_INFO_NOT_PUBLISHED">ECOIN_INFO_NOT_PUBLISHED</a>));
+    <b>if</b> (<b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinStore">CoinStore</a>&lt;CoinType&gt;&gt;(account_addr)) {
+        <b>true</b>
+    } <b>else</b> {
+        <b>let</b> paired_metadata_opt = <a href="coin.md#0x1_coin_paired_metadata">paired_metadata</a>&lt;CoinType&gt;();
+        (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(
+            &paired_metadata_opt
+        ) && <a href="coin.md#0x1_coin_migrated_primary_fungible_store_exists">migrated_primary_fungible_store_exists</a>(account_addr, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_destroy_some">option::destroy_some</a>(paired_metadata_opt)))
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_name"></a>
+
+## Function `name`
+
+Returns the name of the coin.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_name">name</a>&lt;CoinType&gt;(): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_name">name</a>&lt;CoinType&gt;(): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a> <b>acquires</b> <a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a> {
+    <b>borrow_global</b>&lt;<a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a>&lt;CoinType&gt;&gt;(<a href="coin.md#0x1_coin_coin_address">coin_address</a>&lt;CoinType&gt;()).name
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_symbol"></a>
+
+## Function `symbol`
+
+Returns the symbol of the coin, usually a shorter version of the name.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_symbol">symbol</a>&lt;CoinType&gt;(): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_symbol">symbol</a>&lt;CoinType&gt;(): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a> <b>acquires</b> <a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a> {
+    <b>borrow_global</b>&lt;<a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a>&lt;CoinType&gt;&gt;(<a href="coin.md#0x1_coin_coin_address">coin_address</a>&lt;CoinType&gt;()).symbol
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_decimals"></a>
+
+## Function `decimals`
+
+Returns the number of decimals used to get its user representation.
+For example, if <code>decimals</code> equals <code>2</code>, a balance of <code>505</code> coins should
+be displayed to a user as <code>5.05</code> (<code>505 / 10 ** 2</code>).
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_decimals">decimals</a>&lt;CoinType&gt;(): u8
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_decimals">decimals</a>&lt;CoinType&gt;(): u8 <b>acquires</b> <a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a> {
+    <b>borrow_global</b>&lt;<a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a>&lt;CoinType&gt;&gt;(<a href="coin.md#0x1_coin_coin_address">coin_address</a>&lt;CoinType&gt;()).decimals
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_supply"></a>
+
+## Function `supply`
+
+Returns the amount of coin in existence.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_supply">supply</a>&lt;CoinType&gt;(): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;u128&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_supply">supply</a>&lt;CoinType&gt;(): Option&lt;u128&gt; <b>acquires</b> <a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a>, <a href="coin.md#0x1_coin_CoinConversionMap">CoinConversionMap</a> {
+    <b>let</b> coin_supply = <a href="coin.md#0x1_coin_coin_supply">coin_supply</a>&lt;CoinType&gt;();
+    <b>let</b> metadata = <a href="coin.md#0x1_coin_paired_metadata">paired_metadata</a>&lt;CoinType&gt;();
+    <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&metadata)) {
+        <b>let</b> fungible_asset_supply = <a href="fungible_asset.md#0x1_fungible_asset_supply">fungible_asset::supply</a>(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_extract">option::extract</a>(&<b>mut</b> metadata));
+        <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&coin_supply)) {
+            <b>let</b> <a href="coin.md#0x1_coin_supply">supply</a> = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow_mut">option::borrow_mut</a>(&<b>mut</b> coin_supply);
+            *<a href="coin.md#0x1_coin_supply">supply</a> = *<a href="coin.md#0x1_coin_supply">supply</a> + <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_destroy_some">option::destroy_some</a>(fungible_asset_supply);
+        };
+    };
+    coin_supply
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_coin_supply"></a>
+
+## Function `coin_supply`
+
+Returns the amount of coin in existence.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_coin_supply">coin_supply</a>&lt;CoinType&gt;(): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;u128&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_coin_supply">coin_supply</a>&lt;CoinType&gt;(): Option&lt;u128&gt; <b>acquires</b> <a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a> {
+    <b>let</b> maybe_supply = &<b>borrow_global</b>&lt;<a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a>&lt;CoinType&gt;&gt;(<a href="coin.md#0x1_coin_coin_address">coin_address</a>&lt;CoinType&gt;()).<a href="coin.md#0x1_coin_supply">supply</a>;
+    <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(maybe_supply)) {
+        // We do track <a href="coin.md#0x1_coin_supply">supply</a>, in this case read from optional <a href="aggregator.md#0x1_aggregator">aggregator</a>.
+        <b>let</b> <a href="coin.md#0x1_coin_supply">supply</a> = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(maybe_supply);
+        <b>let</b> value = <a href="optional_aggregator.md#0x1_optional_aggregator_read">optional_aggregator::read</a>(<a href="coin.md#0x1_coin_supply">supply</a>);
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(value)
+    } <b>else</b> {
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>()
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_burn"></a>
+
+## Function `burn`
+
+Burn <code><a href="coin.md#0x1_coin">coin</a></code> with capability.
+The capability <code>_cap</code> should be passed as a reference to <code><a href="coin.md#0x1_coin_BurnCapability">BurnCapability</a>&lt;CoinType&gt;</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_burn">burn</a>&lt;CoinType&gt;(<a href="coin.md#0x1_coin">coin</a>: <a href="coin.md#0x1_coin_Coin">coin::Coin</a>&lt;CoinType&gt;, _cap: &<a href="coin.md#0x1_coin_BurnCapability">coin::BurnCapability</a>&lt;CoinType&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_burn">burn</a>&lt;CoinType&gt;(<a href="coin.md#0x1_coin">coin</a>: <a href="coin.md#0x1_coin_Coin">Coin</a>&lt;CoinType&gt;, _cap: &<a href="coin.md#0x1_coin_BurnCapability">BurnCapability</a>&lt;CoinType&gt;) <b>acquires</b> <a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a> {
+    <a href="coin.md#0x1_coin_burn_internal">burn_internal</a>(<a href="coin.md#0x1_coin">coin</a>);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_burn_from"></a>
+
+## Function `burn_from`
+
+Burn <code><a href="coin.md#0x1_coin">coin</a></code> from the specified <code><a href="account.md#0x1_account">account</a></code> with capability.
+The capability <code>burn_cap</code> should be passed as a reference to <code><a href="coin.md#0x1_coin_BurnCapability">BurnCapability</a>&lt;CoinType&gt;</code>.
+This function shouldn't fail as it's called as part of transaction fee burning.
+
+Note: This bypasses CoinStore::frozen -- coins within a frozen CoinStore can be burned.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_burn_from">burn_from</a>&lt;CoinType&gt;(account_addr: <b>address</b>, amount: u64, burn_cap: &<a href="coin.md#0x1_coin_BurnCapability">coin::BurnCapability</a>&lt;CoinType&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_burn_from">burn_from</a>&lt;CoinType&gt;(
+    account_addr: <b>address</b>,
+    amount: u64,
+    burn_cap: &<a href="coin.md#0x1_coin_BurnCapability">BurnCapability</a>&lt;CoinType&gt;,
+) <b>acquires</b> <a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a>, <a href="coin.md#0x1_coin_CoinStore">CoinStore</a>, <a href="coin.md#0x1_coin_CoinConversionMap">CoinConversionMap</a>, <a href="coin.md#0x1_coin_PairedFungibleAssetRefs">PairedFungibleAssetRefs</a> {
+    // Skip burning <b>if</b> amount is zero. This shouldn't <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">error</a> out <b>as</b> it's called <b>as</b> part of transaction fee burning.
+    <b>if</b> (amount == 0) {
+        <b>return</b>
+    };
+
+    <b>let</b> (coin_amount_to_burn, fa_amount_to_burn) = <a href="coin.md#0x1_coin_calculate_amount_to_withdraw">calculate_amount_to_withdraw</a>&lt;CoinType&gt;(
+        account_addr,
+        amount
+    );
+    <b>if</b> (coin_amount_to_burn &gt; 0) {
+        <b>let</b> coin_store = <b>borrow_global_mut</b>&lt;<a href="coin.md#0x1_coin_CoinStore">CoinStore</a>&lt;CoinType&gt;&gt;(account_addr);
+        <b>let</b> coin_to_burn = <a href="coin.md#0x1_coin_extract">extract</a>(&<b>mut</b> coin_store.<a href="coin.md#0x1_coin">coin</a>, coin_amount_to_burn);
+        <a href="coin.md#0x1_coin_burn">burn</a>(coin_to_burn, burn_cap);
+    };
+    <b>if</b> (fa_amount_to_burn &gt; 0) {
+        <a href="fungible_asset.md#0x1_fungible_asset_burn_from">fungible_asset::burn_from</a>(
+            <a href="coin.md#0x1_coin_borrow_paired_burn_ref">borrow_paired_burn_ref</a>(burn_cap),
+            <a href="primary_fungible_store.md#0x1_primary_fungible_store_primary_store">primary_fungible_store::primary_store</a>(account_addr, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_destroy_some">option::destroy_some</a>(<a href="coin.md#0x1_coin_paired_metadata">paired_metadata</a>&lt;CoinType&gt;())),
+            fa_amount_to_burn
+        );
+    };
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_deposit"></a>
+
+## Function `deposit`
+
+Deposit the coin balance into the recipient's account and emit an event.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_deposit">deposit</a>&lt;CoinType&gt;(account_addr: <b>address</b>, <a href="coin.md#0x1_coin">coin</a>: <a href="coin.md#0x1_coin_Coin">coin::Coin</a>&lt;CoinType&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_deposit">deposit</a>&lt;CoinType&gt;(
+    account_addr: <b>address</b>,
+    <a href="coin.md#0x1_coin">coin</a>: <a href="coin.md#0x1_coin_Coin">Coin</a>&lt;CoinType&gt;
+) <b>acquires</b> <a href="coin.md#0x1_coin_CoinStore">CoinStore</a>, <a href="coin.md#0x1_coin_CoinConversionMap">CoinConversionMap</a>, <a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a> {
+    <b>if</b> (<b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinStore">CoinStore</a>&lt;CoinType&gt;&gt;(account_addr)) {
+        <b>let</b> coin_store = <b>borrow_global_mut</b>&lt;<a href="coin.md#0x1_coin_CoinStore">CoinStore</a>&lt;CoinType&gt;&gt;(account_addr);
+        <b>assert</b>!(
+            !coin_store.frozen,
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="coin.md#0x1_coin_EFROZEN">EFROZEN</a>),
+        );
+        <b>if</b> (std::features::module_event_migration_enabled()) {
+            <a href="event.md#0x1_event_emit">event::emit</a>(
+                <a href="coin.md#0x1_coin_CoinDeposit">CoinDeposit</a> { coin_type: type_name&lt;CoinType&gt;(), <a href="account.md#0x1_account">account</a>: account_addr, amount: <a href="coin.md#0x1_coin">coin</a>.value }
+            );
+        };
+        <a href="event.md#0x1_event_emit_event">event::emit_event</a>&lt;<a href="coin.md#0x1_coin_DepositEvent">DepositEvent</a>&gt;(
+            &<b>mut</b> coin_store.deposit_events,
+            <a href="coin.md#0x1_coin_DepositEvent">DepositEvent</a> { amount: <a href="coin.md#0x1_coin">coin</a>.value },
+        );
+        <a href="coin.md#0x1_coin_merge">merge</a>(&<b>mut</b> coin_store.<a href="coin.md#0x1_coin">coin</a>, <a href="coin.md#0x1_coin">coin</a>);
+    } <b>else</b> {
+        <b>let</b> metadata = <a href="coin.md#0x1_coin_paired_metadata">paired_metadata</a>&lt;CoinType&gt;();
+        <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&metadata) && <a href="coin.md#0x1_coin_migrated_primary_fungible_store_exists">migrated_primary_fungible_store_exists</a>(
+            account_addr,
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_destroy_some">option::destroy_some</a>(metadata)
+        )) {
+            <a href="primary_fungible_store.md#0x1_primary_fungible_store_deposit">primary_fungible_store::deposit</a>(account_addr, <a href="coin.md#0x1_coin_coin_to_fungible_asset">coin_to_fungible_asset</a>(<a href="coin.md#0x1_coin">coin</a>));
+        } <b>else</b> {
+            <b>abort</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="coin.md#0x1_coin_ECOIN_STORE_NOT_PUBLISHED">ECOIN_STORE_NOT_PUBLISHED</a>)
+        };
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_migrated_primary_fungible_store_exists"></a>
+
+## Function `migrated_primary_fungible_store_exists`
+
+
+
+<pre><code><b>fun</b> <a href="coin.md#0x1_coin_migrated_primary_fungible_store_exists">migrated_primary_fungible_store_exists</a>(account_address: <b>address</b>, metadata: <a href="object.md#0x1_object_Object">object::Object</a>&lt;<a href="fungible_asset.md#0x1_fungible_asset_Metadata">fungible_asset::Metadata</a>&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="coin.md#0x1_coin_migrated_primary_fungible_store_exists">migrated_primary_fungible_store_exists</a>(
+    account_address: <b>address</b>,
+    metadata: Object&lt;Metadata&gt;
+): bool {
+    <b>let</b> primary_store_address = <a href="primary_fungible_store.md#0x1_primary_fungible_store_primary_store_address">primary_fungible_store::primary_store_address</a>&lt;Metadata&gt;(account_address, metadata);
+    <a href="fungible_asset.md#0x1_fungible_asset_store_exists">fungible_asset::store_exists</a>(primary_store_address) && (
+        // migration flag is needed, until we start defaulting new accounts <b>to</b> APT PFS
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_new_accounts_default_to_fa_apt_store_enabled">features::new_accounts_default_to_fa_apt_store_enabled</a>() || <b>exists</b>&lt;<a href="coin.md#0x1_coin_MigrationFlag">MigrationFlag</a>&gt;(primary_store_address)
+    )
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_force_deposit"></a>
+
+## Function `force_deposit`
+
+Deposit the coin balance into the recipient's account without checking if the account is frozen.
+This is for internal use only and doesn't emit an DepositEvent.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="coin.md#0x1_coin_force_deposit">force_deposit</a>&lt;CoinType&gt;(account_addr: <b>address</b>, <a href="coin.md#0x1_coin">coin</a>: <a href="coin.md#0x1_coin_Coin">coin::Coin</a>&lt;CoinType&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="coin.md#0x1_coin_force_deposit">force_deposit</a>&lt;CoinType&gt;(
+    account_addr: <b>address</b>,
+    <a href="coin.md#0x1_coin">coin</a>: <a href="coin.md#0x1_coin_Coin">Coin</a>&lt;CoinType&gt;
+) <b>acquires</b> <a href="coin.md#0x1_coin_CoinStore">CoinStore</a>, <a href="coin.md#0x1_coin_CoinConversionMap">CoinConversionMap</a>, <a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a> {
+    <b>if</b> (<b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinStore">CoinStore</a>&lt;CoinType&gt;&gt;(account_addr)) {
+        <b>let</b> coin_store = <b>borrow_global_mut</b>&lt;<a href="coin.md#0x1_coin_CoinStore">CoinStore</a>&lt;CoinType&gt;&gt;(account_addr);
+        <a href="coin.md#0x1_coin_merge">merge</a>(&<b>mut</b> coin_store.<a href="coin.md#0x1_coin">coin</a>, <a href="coin.md#0x1_coin">coin</a>);
+    } <b>else</b> {
+        <b>let</b> metadata = <a href="coin.md#0x1_coin_paired_metadata">paired_metadata</a>&lt;CoinType&gt;();
+        <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&metadata) && <a href="coin.md#0x1_coin_migrated_primary_fungible_store_exists">migrated_primary_fungible_store_exists</a>(
+            account_addr,
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_destroy_some">option::destroy_some</a>(metadata)
+        )) {
+            <b>let</b> fa = <a href="coin.md#0x1_coin_coin_to_fungible_asset">coin_to_fungible_asset</a>(<a href="coin.md#0x1_coin">coin</a>);
+            <b>let</b> metadata = <a href="fungible_asset.md#0x1_fungible_asset_asset_metadata">fungible_asset::asset_metadata</a>(&fa);
+            <b>let</b> store = <a href="primary_fungible_store.md#0x1_primary_fungible_store_primary_store">primary_fungible_store::primary_store</a>(account_addr, metadata);
+            <a href="fungible_asset.md#0x1_fungible_asset_deposit_internal">fungible_asset::deposit_internal</a>(<a href="object.md#0x1_object_object_address">object::object_address</a>(&store), fa);
+        } <b>else</b> {
+            <b>abort</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="coin.md#0x1_coin_ECOIN_STORE_NOT_PUBLISHED">ECOIN_STORE_NOT_PUBLISHED</a>)
+        }
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_destroy_zero"></a>
+
+## Function `destroy_zero`
+
+Destroys a zero-value coin. Calls will fail if the <code>value</code> in the passed-in <code>token</code> is non-zero
+so it is impossible to "burn" any non-zero amount of <code><a href="coin.md#0x1_coin_Coin">Coin</a></code> without having
+a <code><a href="coin.md#0x1_coin_BurnCapability">BurnCapability</a></code> for the specific <code>CoinType</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_destroy_zero">destroy_zero</a>&lt;CoinType&gt;(zero_coin: <a href="coin.md#0x1_coin_Coin">coin::Coin</a>&lt;CoinType&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_destroy_zero">destroy_zero</a>&lt;CoinType&gt;(zero_coin: <a href="coin.md#0x1_coin_Coin">Coin</a>&lt;CoinType&gt;) {
+    <b>spec</b> {
+        <b>update</b> <a href="coin.md#0x1_coin_supply">supply</a>&lt;CoinType&gt; = <a href="coin.md#0x1_coin_supply">supply</a>&lt;CoinType&gt; - zero_coin.value;
+    };
+    <b>let</b> <a href="coin.md#0x1_coin_Coin">Coin</a> { value } = zero_coin;
+    <b>assert</b>!(value == 0, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="coin.md#0x1_coin_EDESTRUCTION_OF_NONZERO_TOKEN">EDESTRUCTION_OF_NONZERO_TOKEN</a>))
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_extract"></a>
+
+## Function `extract`
+
+Extracts <code>amount</code> from the passed-in <code><a href="coin.md#0x1_coin">coin</a></code>, where the original token is modified in place.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_extract">extract</a>&lt;CoinType&gt;(<a href="coin.md#0x1_coin">coin</a>: &<b>mut</b> <a href="coin.md#0x1_coin_Coin">coin::Coin</a>&lt;CoinType&gt;, amount: u64): <a href="coin.md#0x1_coin_Coin">coin::Coin</a>&lt;CoinType&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_extract">extract</a>&lt;CoinType&gt;(<a href="coin.md#0x1_coin">coin</a>: &<b>mut</b> <a href="coin.md#0x1_coin_Coin">Coin</a>&lt;CoinType&gt;, amount: u64): <a href="coin.md#0x1_coin_Coin">Coin</a>&lt;CoinType&gt; {
+    <b>assert</b>!(<a href="coin.md#0x1_coin">coin</a>.value &gt;= amount, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="coin.md#0x1_coin_EINSUFFICIENT_BALANCE">EINSUFFICIENT_BALANCE</a>));
+    <b>spec</b> {
+        <b>update</b> <a href="coin.md#0x1_coin_supply">supply</a>&lt;CoinType&gt; = <a href="coin.md#0x1_coin_supply">supply</a>&lt;CoinType&gt; - amount;
+    };
+    <a href="coin.md#0x1_coin">coin</a>.value = <a href="coin.md#0x1_coin">coin</a>.value - amount;
+    <b>spec</b> {
+        <b>update</b> <a href="coin.md#0x1_coin_supply">supply</a>&lt;CoinType&gt; = <a href="coin.md#0x1_coin_supply">supply</a>&lt;CoinType&gt; + amount;
+    };
+    <a href="coin.md#0x1_coin_Coin">Coin</a> { value: amount }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_extract_all"></a>
+
+## Function `extract_all`
+
+Extracts the entire amount from the passed-in <code><a href="coin.md#0x1_coin">coin</a></code>, where the original token is modified in place.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_extract_all">extract_all</a>&lt;CoinType&gt;(<a href="coin.md#0x1_coin">coin</a>: &<b>mut</b> <a href="coin.md#0x1_coin_Coin">coin::Coin</a>&lt;CoinType&gt;): <a href="coin.md#0x1_coin_Coin">coin::Coin</a>&lt;CoinType&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_extract_all">extract_all</a>&lt;CoinType&gt;(<a href="coin.md#0x1_coin">coin</a>: &<b>mut</b> <a href="coin.md#0x1_coin_Coin">Coin</a>&lt;CoinType&gt;): <a href="coin.md#0x1_coin_Coin">Coin</a>&lt;CoinType&gt; {
+    <b>let</b> total_value = <a href="coin.md#0x1_coin">coin</a>.value;
+    <b>spec</b> {
+        <b>update</b> <a href="coin.md#0x1_coin_supply">supply</a>&lt;CoinType&gt; = <a href="coin.md#0x1_coin_supply">supply</a>&lt;CoinType&gt; - <a href="coin.md#0x1_coin">coin</a>.value;
+    };
+    <a href="coin.md#0x1_coin">coin</a>.value = 0;
+    <b>spec</b> {
+        <b>update</b> <a href="coin.md#0x1_coin_supply">supply</a>&lt;CoinType&gt; = <a href="coin.md#0x1_coin_supply">supply</a>&lt;CoinType&gt; + total_value;
+    };
+    <a href="coin.md#0x1_coin_Coin">Coin</a> { value: total_value }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_freeze_coin_store"></a>
+
+## Function `freeze_coin_store`
+
+Freeze a CoinStore to prevent transfers
+
+
+<pre><code>#[legacy_entry_fun]
+<b>public</b> entry <b>fun</b> <a href="coin.md#0x1_coin_freeze_coin_store">freeze_coin_store</a>&lt;CoinType&gt;(account_addr: <b>address</b>, _freeze_cap: &<a href="coin.md#0x1_coin_FreezeCapability">coin::FreezeCapability</a>&lt;CoinType&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="coin.md#0x1_coin_freeze_coin_store">freeze_coin_store</a>&lt;CoinType&gt;(
+    account_addr: <b>address</b>,
+    _freeze_cap: &<a href="coin.md#0x1_coin_FreezeCapability">FreezeCapability</a>&lt;CoinType&gt;,
+) <b>acquires</b> <a href="coin.md#0x1_coin_CoinStore">CoinStore</a> {
+    <b>let</b> coin_store = <b>borrow_global_mut</b>&lt;<a href="coin.md#0x1_coin_CoinStore">CoinStore</a>&lt;CoinType&gt;&gt;(account_addr);
+    coin_store.frozen = <b>true</b>;
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_unfreeze_coin_store"></a>
+
+## Function `unfreeze_coin_store`
+
+Unfreeze a CoinStore to allow transfers
+
+
+<pre><code>#[legacy_entry_fun]
+<b>public</b> entry <b>fun</b> <a href="coin.md#0x1_coin_unfreeze_coin_store">unfreeze_coin_store</a>&lt;CoinType&gt;(account_addr: <b>address</b>, _freeze_cap: &<a href="coin.md#0x1_coin_FreezeCapability">coin::FreezeCapability</a>&lt;CoinType&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="coin.md#0x1_coin_unfreeze_coin_store">unfreeze_coin_store</a>&lt;CoinType&gt;(
+    account_addr: <b>address</b>,
+    _freeze_cap: &<a href="coin.md#0x1_coin_FreezeCapability">FreezeCapability</a>&lt;CoinType&gt;,
+) <b>acquires</b> <a href="coin.md#0x1_coin_CoinStore">CoinStore</a> {
+    <b>let</b> coin_store = <b>borrow_global_mut</b>&lt;<a href="coin.md#0x1_coin_CoinStore">CoinStore</a>&lt;CoinType&gt;&gt;(account_addr);
+    coin_store.frozen = <b>false</b>;
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_upgrade_supply"></a>
+
+## Function `upgrade_supply`
+
+Upgrade total supply to use a parallelizable implementation if it is
+available.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="coin.md#0x1_coin_upgrade_supply">upgrade_supply</a>&lt;CoinType&gt;(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="coin.md#0x1_coin_upgrade_supply">upgrade_supply</a>&lt;CoinType&gt;(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>) <b>acquires</b> <a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a>, <a href="coin.md#0x1_coin_SupplyConfig">SupplyConfig</a> {
+    <b>let</b> account_addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>);
+
+    // Only <a href="coin.md#0x1_coin">coin</a> creators can upgrade total <a href="coin.md#0x1_coin_supply">supply</a>.
+    <b>assert</b>!(
+        <a href="coin.md#0x1_coin_coin_address">coin_address</a>&lt;CoinType&gt;() == account_addr,
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="coin.md#0x1_coin_ECOIN_INFO_ADDRESS_MISMATCH">ECOIN_INFO_ADDRESS_MISMATCH</a>),
+    );
+
+    // Can only succeed once on-chain governance agreed on the upgrade.
+    <b>assert</b>!(
+        <b>borrow_global_mut</b>&lt;<a href="coin.md#0x1_coin_SupplyConfig">SupplyConfig</a>&gt;(@aptos_framework).allow_upgrades,
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="coin.md#0x1_coin_ECOIN_SUPPLY_UPGRADE_NOT_SUPPORTED">ECOIN_SUPPLY_UPGRADE_NOT_SUPPORTED</a>)
+    );
+
+    <b>let</b> maybe_supply = &<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a>&lt;CoinType&gt;&gt;(account_addr).<a href="coin.md#0x1_coin_supply">supply</a>;
+    <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(maybe_supply)) {
+        <b>let</b> <a href="coin.md#0x1_coin_supply">supply</a> = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow_mut">option::borrow_mut</a>(maybe_supply);
+
+        // If <a href="coin.md#0x1_coin_supply">supply</a> is tracked and the current implementation uses an integer - upgrade.
+        <b>if</b> (!<a href="optional_aggregator.md#0x1_optional_aggregator_is_parallelizable">optional_aggregator::is_parallelizable</a>(<a href="coin.md#0x1_coin_supply">supply</a>)) {
+            <a href="optional_aggregator.md#0x1_optional_aggregator_switch">optional_aggregator::switch</a>(<a href="coin.md#0x1_coin_supply">supply</a>);
+        }
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_initialize"></a>
+
+## Function `initialize`
+
+Creates a new Coin with given <code>CoinType</code> and returns minting/freezing/burning capabilities.
+The given signer also becomes the account hosting the information  about the coin
+(name, supply, etc.). Supply is initialized as non-parallelizable integer.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_initialize">initialize</a>&lt;CoinType&gt;(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, name: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, symbol: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, decimals: u8, monitor_supply: bool): (<a href="coin.md#0x1_coin_BurnCapability">coin::BurnCapability</a>&lt;CoinType&gt;, <a href="coin.md#0x1_coin_FreezeCapability">coin::FreezeCapability</a>&lt;CoinType&gt;, <a href="coin.md#0x1_coin_MintCapability">coin::MintCapability</a>&lt;CoinType&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_initialize">initialize</a>&lt;CoinType&gt;(
+    <a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    name: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>,
+    symbol: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>,
+    decimals: u8,
+    monitor_supply: bool,
+): (<a href="coin.md#0x1_coin_BurnCapability">BurnCapability</a>&lt;CoinType&gt;, <a href="coin.md#0x1_coin_FreezeCapability">FreezeCapability</a>&lt;CoinType&gt;, <a href="coin.md#0x1_coin_MintCapability">MintCapability</a>&lt;CoinType&gt;) {
+    <a href="coin.md#0x1_coin_initialize_internal">initialize_internal</a>(<a href="account.md#0x1_account">account</a>, name, symbol, decimals, monitor_supply, <b>false</b>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_initialize_with_parallelizable_supply"></a>
+
+## Function `initialize_with_parallelizable_supply`
+
+Same as <code>initialize</code> but supply can be initialized to parallelizable aggregator.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="coin.md#0x1_coin_initialize_with_parallelizable_supply">initialize_with_parallelizable_supply</a>&lt;CoinType&gt;(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, name: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, symbol: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, decimals: u8, monitor_supply: bool): (<a href="coin.md#0x1_coin_BurnCapability">coin::BurnCapability</a>&lt;CoinType&gt;, <a href="coin.md#0x1_coin_FreezeCapability">coin::FreezeCapability</a>&lt;CoinType&gt;, <a href="coin.md#0x1_coin_MintCapability">coin::MintCapability</a>&lt;CoinType&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="coin.md#0x1_coin_initialize_with_parallelizable_supply">initialize_with_parallelizable_supply</a>&lt;CoinType&gt;(
+    <a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    name: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>,
+    symbol: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>,
+    decimals: u8,
+    monitor_supply: bool,
+): (<a href="coin.md#0x1_coin_BurnCapability">BurnCapability</a>&lt;CoinType&gt;, <a href="coin.md#0x1_coin_FreezeCapability">FreezeCapability</a>&lt;CoinType&gt;, <a href="coin.md#0x1_coin_MintCapability">MintCapability</a>&lt;CoinType&gt;) {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(<a href="account.md#0x1_account">account</a>);
+    <a href="coin.md#0x1_coin_initialize_internal">initialize_internal</a>(<a href="account.md#0x1_account">account</a>, name, symbol, decimals, monitor_supply, <b>true</b>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_initialize_internal"></a>
+
+## Function `initialize_internal`
+
+
+
+<pre><code><b>fun</b> <a href="coin.md#0x1_coin_initialize_internal">initialize_internal</a>&lt;CoinType&gt;(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, name: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, symbol: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, decimals: u8, monitor_supply: bool, parallelizable: bool): (<a href="coin.md#0x1_coin_BurnCapability">coin::BurnCapability</a>&lt;CoinType&gt;, <a href="coin.md#0x1_coin_FreezeCapability">coin::FreezeCapability</a>&lt;CoinType&gt;, <a href="coin.md#0x1_coin_MintCapability">coin::MintCapability</a>&lt;CoinType&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="coin.md#0x1_coin_initialize_internal">initialize_internal</a>&lt;CoinType&gt;(
+    <a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    name: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>,
+    symbol: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>,
+    decimals: u8,
+    monitor_supply: bool,
+    parallelizable: bool,
+): (<a href="coin.md#0x1_coin_BurnCapability">BurnCapability</a>&lt;CoinType&gt;, <a href="coin.md#0x1_coin_FreezeCapability">FreezeCapability</a>&lt;CoinType&gt;, <a href="coin.md#0x1_coin_MintCapability">MintCapability</a>&lt;CoinType&gt;) {
+    <b>let</b> account_addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>);
+
+    <b>assert</b>!(
+        <a href="coin.md#0x1_coin_coin_address">coin_address</a>&lt;CoinType&gt;() == account_addr,
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="coin.md#0x1_coin_ECOIN_INFO_ADDRESS_MISMATCH">ECOIN_INFO_ADDRESS_MISMATCH</a>),
+    );
+
+    <b>assert</b>!(
+        !<b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a>&lt;CoinType&gt;&gt;(account_addr),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_already_exists">error::already_exists</a>(<a href="coin.md#0x1_coin_ECOIN_INFO_ALREADY_PUBLISHED">ECOIN_INFO_ALREADY_PUBLISHED</a>),
+    );
+
+    <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_length">string::length</a>(&name) &lt;= <a href="coin.md#0x1_coin_MAX_COIN_NAME_LENGTH">MAX_COIN_NAME_LENGTH</a>, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="coin.md#0x1_coin_ECOIN_NAME_TOO_LONG">ECOIN_NAME_TOO_LONG</a>));
+    <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_length">string::length</a>(&symbol) &lt;= <a href="coin.md#0x1_coin_MAX_COIN_SYMBOL_LENGTH">MAX_COIN_SYMBOL_LENGTH</a>, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="coin.md#0x1_coin_ECOIN_SYMBOL_TOO_LONG">ECOIN_SYMBOL_TOO_LONG</a>));
+
+    <b>let</b> coin_info = <a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a>&lt;CoinType&gt; {
+        name,
+        symbol,
+        decimals,
+        <a href="coin.md#0x1_coin_supply">supply</a>: <b>if</b> (monitor_supply) {
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(
+                <a href="optional_aggregator.md#0x1_optional_aggregator_new">optional_aggregator::new</a>(<a href="coin.md#0x1_coin_MAX_U128">MAX_U128</a>, parallelizable)
+            )
+        } <b>else</b> { <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>() },
+    };
+    <b>move_to</b>(<a href="account.md#0x1_account">account</a>, coin_info);
+
+    (<a href="coin.md#0x1_coin_BurnCapability">BurnCapability</a>&lt;CoinType&gt; {}, <a href="coin.md#0x1_coin_FreezeCapability">FreezeCapability</a>&lt;CoinType&gt; {}, <a href="coin.md#0x1_coin_MintCapability">MintCapability</a>&lt;CoinType&gt; {})
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_merge"></a>
+
+## Function `merge`
+
+"Merges" the two given coins.  The coin passed in as <code>dst_coin</code> will have a value equal
+to the sum of the two tokens (<code>dst_coin</code> and <code>source_coin</code>).
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_merge">merge</a>&lt;CoinType&gt;(dst_coin: &<b>mut</b> <a href="coin.md#0x1_coin_Coin">coin::Coin</a>&lt;CoinType&gt;, source_coin: <a href="coin.md#0x1_coin_Coin">coin::Coin</a>&lt;CoinType&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_merge">merge</a>&lt;CoinType&gt;(dst_coin: &<b>mut</b> <a href="coin.md#0x1_coin_Coin">Coin</a>&lt;CoinType&gt;, source_coin: <a href="coin.md#0x1_coin_Coin">Coin</a>&lt;CoinType&gt;) {
+    <b>spec</b> {
+        <b>assume</b> dst_coin.value + source_coin.<a href="coin.md#0x1_coin_value">value</a> &lt;= <a href="coin.md#0x1_coin_MAX_U64">MAX_U64</a>;
+    };
+    <b>spec</b> {
+        <b>update</b> <a href="coin.md#0x1_coin_supply">supply</a>&lt;CoinType&gt; = <a href="coin.md#0x1_coin_supply">supply</a>&lt;CoinType&gt; - source_coin.value;
+    };
+    <b>let</b> <a href="coin.md#0x1_coin_Coin">Coin</a> { value } = source_coin;
+    <b>spec</b> {
+        <b>update</b> <a href="coin.md#0x1_coin_supply">supply</a>&lt;CoinType&gt; = <a href="coin.md#0x1_coin_supply">supply</a>&lt;CoinType&gt; + value;
+    };
+    dst_coin.value = dst_coin.value + value;
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_mint"></a>
+
+## Function `mint`
+
+Mint new <code><a href="coin.md#0x1_coin_Coin">Coin</a></code> with capability.
+The capability <code>_cap</code> should be passed as reference to <code><a href="coin.md#0x1_coin_MintCapability">MintCapability</a>&lt;CoinType&gt;</code>.
+Returns minted <code><a href="coin.md#0x1_coin_Coin">Coin</a></code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_mint">mint</a>&lt;CoinType&gt;(amount: u64, _cap: &<a href="coin.md#0x1_coin_MintCapability">coin::MintCapability</a>&lt;CoinType&gt;): <a href="coin.md#0x1_coin_Coin">coin::Coin</a>&lt;CoinType&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_mint">mint</a>&lt;CoinType&gt;(
+    amount: u64,
+    _cap: &<a href="coin.md#0x1_coin_MintCapability">MintCapability</a>&lt;CoinType&gt;,
+): <a href="coin.md#0x1_coin_Coin">Coin</a>&lt;CoinType&gt; <b>acquires</b> <a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a> {
+    <a href="coin.md#0x1_coin_mint_internal">mint_internal</a>&lt;CoinType&gt;(amount)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_register"></a>
+
+## Function `register`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_register">register</a>&lt;CoinType&gt;(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_register">register</a>&lt;CoinType&gt;(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>) <b>acquires</b> <a href="coin.md#0x1_coin_CoinConversionMap">CoinConversionMap</a> {
+    <b>let</b> account_addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>);
+    // Short-circuit and do nothing <b>if</b> <a href="account.md#0x1_account">account</a> is already registered for CoinType.
+    <b>if</b> (<a href="coin.md#0x1_coin_is_account_registered">is_account_registered</a>&lt;CoinType&gt;(account_addr)) {
+        <b>return</b>
+    };
+
+    <a href="account.md#0x1_account_register_coin">account::register_coin</a>&lt;CoinType&gt;(account_addr);
+    <b>let</b> coin_store = <a href="coin.md#0x1_coin_CoinStore">CoinStore</a>&lt;CoinType&gt; {
+        <a href="coin.md#0x1_coin">coin</a>: <a href="coin.md#0x1_coin_Coin">Coin</a> { value: 0 },
+        frozen: <b>false</b>,
+        deposit_events: <a href="account.md#0x1_account_new_event_handle">account::new_event_handle</a>&lt;<a href="coin.md#0x1_coin_DepositEvent">DepositEvent</a>&gt;(<a href="account.md#0x1_account">account</a>),
+        withdraw_events: <a href="account.md#0x1_account_new_event_handle">account::new_event_handle</a>&lt;<a href="coin.md#0x1_coin_WithdrawEvent">WithdrawEvent</a>&gt;(<a href="account.md#0x1_account">account</a>),
+    };
+    <b>move_to</b>(<a href="account.md#0x1_account">account</a>, coin_store);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_transfer"></a>
+
+## Function `transfer`
+
+Transfers <code>amount</code> of coins <code>CoinType</code> from <code>from</code> to <code><b>to</b></code>.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="coin.md#0x1_coin_transfer">transfer</a>&lt;CoinType&gt;(from: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <b>to</b>: <b>address</b>, amount: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="coin.md#0x1_coin_transfer">transfer</a>&lt;CoinType&gt;(
+    from: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    <b>to</b>: <b>address</b>,
+    amount: u64,
+) <b>acquires</b> <a href="coin.md#0x1_coin_CoinStore">CoinStore</a>, <a href="coin.md#0x1_coin_CoinConversionMap">CoinConversionMap</a>, <a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a>, <a href="coin.md#0x1_coin_PairedCoinType">PairedCoinType</a> {
+    <b>let</b> <a href="coin.md#0x1_coin">coin</a> = <a href="coin.md#0x1_coin_withdraw">withdraw</a>&lt;CoinType&gt;(from, amount);
+    <a href="coin.md#0x1_coin_deposit">deposit</a>(<b>to</b>, <a href="coin.md#0x1_coin">coin</a>);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_value"></a>
+
+## Function `value`
+
+Returns the <code>value</code> passed in <code><a href="coin.md#0x1_coin">coin</a></code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_value">value</a>&lt;CoinType&gt;(<a href="coin.md#0x1_coin">coin</a>: &<a href="coin.md#0x1_coin_Coin">coin::Coin</a>&lt;CoinType&gt;): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_value">value</a>&lt;CoinType&gt;(<a href="coin.md#0x1_coin">coin</a>: &<a href="coin.md#0x1_coin_Coin">Coin</a>&lt;CoinType&gt;): u64 {
+    <a href="coin.md#0x1_coin">coin</a>.value
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_withdraw"></a>
+
+## Function `withdraw`
+
+Withdraw specified <code>amount</code> of coin <code>CoinType</code> from the signing account.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_withdraw">withdraw</a>&lt;CoinType&gt;(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, amount: u64): <a href="coin.md#0x1_coin_Coin">coin::Coin</a>&lt;CoinType&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_withdraw">withdraw</a>&lt;CoinType&gt;(
+    <a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    amount: u64,
+): <a href="coin.md#0x1_coin_Coin">Coin</a>&lt;CoinType&gt; <b>acquires</b> <a href="coin.md#0x1_coin_CoinStore">CoinStore</a>, <a href="coin.md#0x1_coin_CoinConversionMap">CoinConversionMap</a>, <a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a>, <a href="coin.md#0x1_coin_PairedCoinType">PairedCoinType</a> {
+    <b>let</b> account_addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>);
+
+    <b>let</b> (coin_amount_to_withdraw, fa_amount_to_withdraw) = <a href="coin.md#0x1_coin_calculate_amount_to_withdraw">calculate_amount_to_withdraw</a>&lt;CoinType&gt;(
+        account_addr,
+        amount
+    );
+    <b>let</b> withdrawn_coin = <b>if</b> (coin_amount_to_withdraw &gt; 0) {
+        <b>let</b> coin_store = <b>borrow_global_mut</b>&lt;<a href="coin.md#0x1_coin_CoinStore">CoinStore</a>&lt;CoinType&gt;&gt;(account_addr);
+        <b>assert</b>!(
+            !coin_store.frozen,
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="coin.md#0x1_coin_EFROZEN">EFROZEN</a>),
+        );
+        <b>if</b> (std::features::module_event_migration_enabled()) {
+            <a href="event.md#0x1_event_emit">event::emit</a>(
+                <a href="coin.md#0x1_coin_CoinWithdraw">CoinWithdraw</a> {
+                    coin_type: type_name&lt;CoinType&gt;(), <a href="account.md#0x1_account">account</a>: account_addr, amount: coin_amount_to_withdraw
+                }
+            );
+        };
+        <a href="event.md#0x1_event_emit_event">event::emit_event</a>&lt;<a href="coin.md#0x1_coin_WithdrawEvent">WithdrawEvent</a>&gt;(
+            &<b>mut</b> coin_store.withdraw_events,
+            <a href="coin.md#0x1_coin_WithdrawEvent">WithdrawEvent</a> { amount: coin_amount_to_withdraw },
+        );
+        <a href="coin.md#0x1_coin_extract">extract</a>(&<b>mut</b> coin_store.<a href="coin.md#0x1_coin">coin</a>, coin_amount_to_withdraw)
+    } <b>else</b> {
+        <a href="coin.md#0x1_coin_zero">zero</a>()
+    };
+    <b>if</b> (fa_amount_to_withdraw &gt; 0) {
+        <b>let</b> fa = <a href="primary_fungible_store.md#0x1_primary_fungible_store_withdraw">primary_fungible_store::withdraw</a>(
+            <a href="account.md#0x1_account">account</a>,
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_destroy_some">option::destroy_some</a>(<a href="coin.md#0x1_coin_paired_metadata">paired_metadata</a>&lt;CoinType&gt;()),
+            fa_amount_to_withdraw
+        );
+        <a href="coin.md#0x1_coin_merge">merge</a>(&<b>mut</b> withdrawn_coin, <a href="coin.md#0x1_coin_fungible_asset_to_coin">fungible_asset_to_coin</a>(fa));
+    };
+    withdrawn_coin
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_zero"></a>
+
+## Function `zero`
+
+Create a new <code><a href="coin.md#0x1_coin_Coin">Coin</a>&lt;CoinType&gt;</code> with a value of <code>0</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_zero">zero</a>&lt;CoinType&gt;(): <a href="coin.md#0x1_coin_Coin">coin::Coin</a>&lt;CoinType&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_zero">zero</a>&lt;CoinType&gt;(): <a href="coin.md#0x1_coin_Coin">Coin</a>&lt;CoinType&gt; {
+    <b>spec</b> {
+        <b>update</b> <a href="coin.md#0x1_coin_supply">supply</a>&lt;CoinType&gt; = <a href="coin.md#0x1_coin_supply">supply</a>&lt;CoinType&gt; + 0;
+    };
+    <a href="coin.md#0x1_coin_Coin">Coin</a>&lt;CoinType&gt; {
+        value: 0
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_destroy_freeze_cap"></a>
+
+## Function `destroy_freeze_cap`
+
+Destroy a freeze capability. Freeze capability is dangerous and therefore should be destroyed if not used.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_destroy_freeze_cap">destroy_freeze_cap</a>&lt;CoinType&gt;(freeze_cap: <a href="coin.md#0x1_coin_FreezeCapability">coin::FreezeCapability</a>&lt;CoinType&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_destroy_freeze_cap">destroy_freeze_cap</a>&lt;CoinType&gt;(freeze_cap: <a href="coin.md#0x1_coin_FreezeCapability">FreezeCapability</a>&lt;CoinType&gt;) {
+    <b>let</b> <a href="coin.md#0x1_coin_FreezeCapability">FreezeCapability</a>&lt;CoinType&gt; {} = freeze_cap;
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_destroy_mint_cap"></a>
+
+## Function `destroy_mint_cap`
+
+Destroy a mint capability.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_destroy_mint_cap">destroy_mint_cap</a>&lt;CoinType&gt;(mint_cap: <a href="coin.md#0x1_coin_MintCapability">coin::MintCapability</a>&lt;CoinType&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_destroy_mint_cap">destroy_mint_cap</a>&lt;CoinType&gt;(mint_cap: <a href="coin.md#0x1_coin_MintCapability">MintCapability</a>&lt;CoinType&gt;) {
+    <b>let</b> <a href="coin.md#0x1_coin_MintCapability">MintCapability</a>&lt;CoinType&gt; {} = mint_cap;
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_destroy_burn_cap"></a>
+
+## Function `destroy_burn_cap`
+
+Destroy a burn capability.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_destroy_burn_cap">destroy_burn_cap</a>&lt;CoinType&gt;(burn_cap: <a href="coin.md#0x1_coin_BurnCapability">coin::BurnCapability</a>&lt;CoinType&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_destroy_burn_cap">destroy_burn_cap</a>&lt;CoinType&gt;(burn_cap: <a href="coin.md#0x1_coin_BurnCapability">BurnCapability</a>&lt;CoinType&gt;) {
+    <b>let</b> <a href="coin.md#0x1_coin_BurnCapability">BurnCapability</a>&lt;CoinType&gt; {} = burn_cap;
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_mint_internal"></a>
+
+## Function `mint_internal`
+
+
+
+<pre><code><b>fun</b> <a href="coin.md#0x1_coin_mint_internal">mint_internal</a>&lt;CoinType&gt;(amount: u64): <a href="coin.md#0x1_coin_Coin">coin::Coin</a>&lt;CoinType&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="coin.md#0x1_coin_mint_internal">mint_internal</a>&lt;CoinType&gt;(amount: u64): <a href="coin.md#0x1_coin_Coin">Coin</a>&lt;CoinType&gt; <b>acquires</b> <a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a> {
+    <b>if</b> (amount == 0) {
+        <b>return</b> <a href="coin.md#0x1_coin_Coin">Coin</a>&lt;CoinType&gt; {
+            value: 0
+        }
+    };
+
+    <b>let</b> maybe_supply = &<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a>&lt;CoinType&gt;&gt;(<a href="coin.md#0x1_coin_coin_address">coin_address</a>&lt;CoinType&gt;()).<a href="coin.md#0x1_coin_supply">supply</a>;
+    <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(maybe_supply)) {
+        <b>let</b> <a href="coin.md#0x1_coin_supply">supply</a> = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow_mut">option::borrow_mut</a>(maybe_supply);
+        <b>spec</b> {
+            <b>use</b> aptos_framework::optional_aggregator;
+            <b>use</b> aptos_framework::aggregator;
+            <b>assume</b> <a href="optional_aggregator.md#0x1_optional_aggregator_is_parallelizable">optional_aggregator::is_parallelizable</a>(<a href="coin.md#0x1_coin_supply">supply</a>) ==&gt; (<a href="aggregator.md#0x1_aggregator_spec_aggregator_get_val">aggregator::spec_aggregator_get_val</a>(
+                <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(<a href="coin.md#0x1_coin_supply">supply</a>.<a href="aggregator.md#0x1_aggregator">aggregator</a>)
+            )
+                + amount &lt;= <a href="aggregator.md#0x1_aggregator_spec_get_limit">aggregator::spec_get_limit</a>(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(<a href="coin.md#0x1_coin_supply">supply</a>.<a href="aggregator.md#0x1_aggregator">aggregator</a>)));
+            <b>assume</b> !<a href="optional_aggregator.md#0x1_optional_aggregator_is_parallelizable">optional_aggregator::is_parallelizable</a>(<a href="coin.md#0x1_coin_supply">supply</a>) ==&gt;
+                (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(<a href="coin.md#0x1_coin_supply">supply</a>.integer).value + amount &lt;= <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(<a href="coin.md#0x1_coin_supply">supply</a>.integer).limit);
+        };
+        <a href="optional_aggregator.md#0x1_optional_aggregator_add">optional_aggregator::add</a>(<a href="coin.md#0x1_coin_supply">supply</a>, (amount <b>as</b> u128));
+    };
+    <b>spec</b> {
+        <b>update</b> <a href="coin.md#0x1_coin_supply">supply</a>&lt;CoinType&gt; = <a href="coin.md#0x1_coin_supply">supply</a>&lt;CoinType&gt; + amount;
+    };
+    <a href="coin.md#0x1_coin_Coin">Coin</a>&lt;CoinType&gt; { value: amount }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_coin_burn_internal"></a>
+
+## Function `burn_internal`
+
+
+
+<pre><code><b>fun</b> <a href="coin.md#0x1_coin_burn_internal">burn_internal</a>&lt;CoinType&gt;(<a href="coin.md#0x1_coin">coin</a>: <a href="coin.md#0x1_coin_Coin">coin::Coin</a>&lt;CoinType&gt;): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="coin.md#0x1_coin_burn_internal">burn_internal</a>&lt;CoinType&gt;(<a href="coin.md#0x1_coin">coin</a>: <a href="coin.md#0x1_coin_Coin">Coin</a>&lt;CoinType&gt;): u64 <b>acquires</b> <a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a> {
+    <b>spec</b> {
+        <b>update</b> <a href="coin.md#0x1_coin_supply">supply</a>&lt;CoinType&gt; = <a href="coin.md#0x1_coin_supply">supply</a>&lt;CoinType&gt; - <a href="coin.md#0x1_coin">coin</a>.value;
+    };
+    <b>let</b> <a href="coin.md#0x1_coin_Coin">Coin</a> { value: amount } = <a href="coin.md#0x1_coin">coin</a>;
+    <b>if</b> (amount != 0) {
+        <b>let</b> maybe_supply = &<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a>&lt;CoinType&gt;&gt;(<a href="coin.md#0x1_coin_coin_address">coin_address</a>&lt;CoinType&gt;()).<a href="coin.md#0x1_coin_supply">supply</a>;
+        <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(maybe_supply)) {
+            <b>let</b> <a href="coin.md#0x1_coin_supply">supply</a> = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow_mut">option::borrow_mut</a>(maybe_supply);
+            <a href="optional_aggregator.md#0x1_optional_aggregator_sub">optional_aggregator::sub</a>(<a href="coin.md#0x1_coin_supply">supply</a>, (amount <b>as</b> u128));
+        };
+    };
+    amount
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+
+
+<a id="high-level-req"></a>
+
+### High-level Requirements
+
+<table>
+<tr>
+<th>No.</th><th>Requirement</th><th>Criticality</th><th>Implementation</th><th>Enforcement</th>
+</tr>
+
+<tr>
+<td>1</td>
+<td>Only the owner of a coin may mint, burn or freeze coins.</td>
+<td>Critical</td>
+<td>Acquiring capabilities for a particular CoinType may only occur if the caller has a signer for the module declaring that type. The initialize function returns these capabilities to the caller.</td>
+<td>Formally Verified via <a href="#high-level-req-1.1">upgrade_supply</a> and <a href="#high-level-req-1.2">initialize</a>.</td>
+</tr>
+
+<tr>
+<td>2</td>
+<td>Each coin may only be created exactly once.</td>
+<td>Medium</td>
+<td>The initialization function may only be called once.</td>
+<td>Formally Verified via <a href="#high-level-req-2">initialize</a>.</td>
+</tr>
+
+<tr>
+<td>3</td>
+<td>The merging of coins may only be done on coins of the same type.</td>
+<td>Critical</td>
+<td>The merge function is limited to merging coins of the same type only.</td>
+<td>Formally Verified via <a href="#high-level-req-3">merge</a>.</td>
+</tr>
+
+<tr>
+<td>4</td>
+<td>The supply of a coin is only affected by burn and mint operations.</td>
+<td>High</td>
+<td>Only mint and burn operations on a coin alter the total supply of coins.</td>
+<td>Formally Verified via <a href="#high-level-req-4">TotalSupplyNoChange</a>.</td>
+</tr>
+
+<tr>
+<td>5</td>
+<td>Users may register an account for a coin multiple times idempotently.</td>
+<td>Medium</td>
+<td>The register function should work idempotently. Importantly, it should not abort if the coin is already registered.</td>
+<td>Formally verified via aborts_if on <a href="#high-level-req-5">register</a>.</td>
+</tr>
+
+<tr>
+<td>6</td>
+<td>Coin operations should fail if the user has not registered for the coin.</td>
+<td>Medium</td>
+<td>Coin operations may succeed only on valid user coin registration.</td>
+<td>Formally Verified via <a href="#high-level-req-6.1">balance</a>, <a href="#high-level-req-6.2">burn_from</a>, <a href="#high-level-req-6.3">freeze</a>, <a href="#high-level-req-6.4">unfreeze</a>, <a href="#high-level-req-6.5">transfer</a> and <a href="#high-level-req-6.6">withdraw</a>.</td>
+</tr>
+
+<tr>
+<td>7</td>
+<td>It should always be possible to (1) determine if a coin exists, and (2) determine if a user registered an account with a particular coin. If a coin exists, it should always be possible to request the following information of the coin: (1) Name, (2) Symbol, and (3) Supply.</td>
+<td>Low</td>
+<td>The following functions should never abort: (1) is_coin_initialized, and (2) is_account_registered. The following functions should not abort if the coin exists: (1) name, (2) symbol, and (3) supply.</td>
+<td>Formally Verified in corresponding functions: <a href="#high-level-req-7.1">is_coin_initialized</a>, <a href="#high-level-req-7.2">is_account_registered</a>, <a href="#high-level-req-7.3">name</a>, <a href="#high-level-req-7.4">symbol</a> and <a href="#high-level-req-7.5">supply</a>.</td>
+</tr>
+
+<tr>
+<td>8</td>
+<td>Coin operations should fail if the user's CoinStore is frozen.</td>
+<td>Medium</td>
+<td>If the CoinStore of an address is frozen, coin operations are disallowed.</td>
+<td>Formally Verified via <a href="#high-level-req-8.1">withdraw</a>, <a href="#high-level-req-8.2">transfer</a> and <a href="#high-level-req-8.3">deposit</a>.</td>
+</tr>
+
+<tr>
+<td>9</td>
+<td>Utilizing AggregatableCoins does not violate other critical invariants, such as (4).</td>
+<td>High</td>
+<td>Utilizing AggregatableCoin does not change the real-supply of any token.</td>
+<td>Formally Verified via <a href="#high-level-req-9">TotalSupplyNoChange</a>.</td>
+</tr>
+
+</table>
+
+
+
+
+<a id="module-level-spec"></a>
+
+### Module-level Specification
+
+
+<pre><code><b>pragma</b> verify = <b>true</b>;
+<a id="0x1_coin_supply"></a>
+<b>global</b> <a href="coin.md#0x1_coin_supply">supply</a>&lt;CoinType&gt;: num;
+<a id="0x1_coin_aggregate_supply"></a>
+<b>global</b> <a href="coin.md#0x1_coin_aggregate_supply">aggregate_supply</a>&lt;CoinType&gt;: num;
+<b>apply</b> <a href="coin.md#0x1_coin_TotalSupplyTracked">TotalSupplyTracked</a>&lt;CoinType&gt; <b>to</b> *&lt;CoinType&gt; <b>except</b>
+initialize, initialize_internal, initialize_with_parallelizable_supply;
+</code></pre>
+
+
+
+
+<a id="0x1_coin_spec_fun_supply_tracked"></a>
+
+
+<pre><code><b>fun</b> <a href="coin.md#0x1_coin_spec_fun_supply_tracked">spec_fun_supply_tracked</a>&lt;CoinType&gt;(val: u64, <a href="coin.md#0x1_coin_supply">supply</a>: Option&lt;OptionalAggregator&gt;): bool {
+   <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_is_some">option::spec_is_some</a>(<a href="coin.md#0x1_coin_supply">supply</a>) ==&gt; val == <a href="optional_aggregator.md#0x1_optional_aggregator_optional_aggregator_value">optional_aggregator::optional_aggregator_value</a>
+       (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_borrow">option::spec_borrow</a>(<a href="coin.md#0x1_coin_supply">supply</a>))
+}
+</code></pre>
+
+
+
+
+<a id="0x1_coin_TotalSupplyTracked"></a>
+
+
+<pre><code><b>schema</b> <a href="coin.md#0x1_coin_TotalSupplyTracked">TotalSupplyTracked</a>&lt;CoinType&gt; {
+    <b>ensures</b> <b>old</b>(<a href="coin.md#0x1_coin_spec_fun_supply_tracked">spec_fun_supply_tracked</a>&lt;CoinType&gt;(<a href="coin.md#0x1_coin_supply">supply</a>&lt;CoinType&gt; + <a href="coin.md#0x1_coin_aggregate_supply">aggregate_supply</a>&lt;CoinType&gt;,
+        <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a>&lt;CoinType&gt;&gt;(<a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_type_of">type_info::type_of</a>&lt;CoinType&gt;().account_address).<a href="coin.md#0x1_coin_supply">supply</a>)) ==&gt;
+        <a href="coin.md#0x1_coin_spec_fun_supply_tracked">spec_fun_supply_tracked</a>&lt;CoinType&gt;(<a href="coin.md#0x1_coin_supply">supply</a>&lt;CoinType&gt; + <a href="coin.md#0x1_coin_aggregate_supply">aggregate_supply</a>&lt;CoinType&gt;,
+            <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a>&lt;CoinType&gt;&gt;(<a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_type_of">type_info::type_of</a>&lt;CoinType&gt;().account_address).<a href="coin.md#0x1_coin_supply">supply</a>);
+}
+</code></pre>
+
+
+
+
+<a id="0x1_coin_spec_fun_supply_no_change"></a>
+
+
+<pre><code><b>fun</b> <a href="coin.md#0x1_coin_spec_fun_supply_no_change">spec_fun_supply_no_change</a>&lt;CoinType&gt;(old_supply: Option&lt;OptionalAggregator&gt;,
+                                            <a href="coin.md#0x1_coin_supply">supply</a>: Option&lt;OptionalAggregator&gt;): bool {
+   <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_is_some">option::spec_is_some</a>(old_supply) ==&gt; <a href="optional_aggregator.md#0x1_optional_aggregator_optional_aggregator_value">optional_aggregator::optional_aggregator_value</a>
+       (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_borrow">option::spec_borrow</a>(old_supply)) == <a href="optional_aggregator.md#0x1_optional_aggregator_optional_aggregator_value">optional_aggregator::optional_aggregator_value</a>
+       (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_borrow">option::spec_borrow</a>(<a href="coin.md#0x1_coin_supply">supply</a>))
+}
+</code></pre>
+
+
+
+
+<a id="0x1_coin_TotalSupplyNoChange"></a>
+
+
+<pre><code><b>schema</b> <a href="coin.md#0x1_coin_TotalSupplyNoChange">TotalSupplyNoChange</a>&lt;CoinType&gt; {
+    <b>let</b> old_supply = <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a>&lt;CoinType&gt;&gt;(<a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_type_of">type_info::type_of</a>&lt;CoinType&gt;().account_address).<a href="coin.md#0x1_coin_supply">supply</a>;
+    <b>let</b> <b>post</b> <a href="coin.md#0x1_coin_supply">supply</a> = <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a>&lt;CoinType&gt;&gt;(<a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_type_of">type_info::type_of</a>&lt;CoinType&gt;().account_address).<a href="coin.md#0x1_coin_supply">supply</a>;
+    <b>ensures</b> <a href="coin.md#0x1_coin_spec_fun_supply_no_change">spec_fun_supply_no_change</a>&lt;CoinType&gt;(old_supply, <a href="coin.md#0x1_coin_supply">supply</a>);
+}
+</code></pre>
+
+
+
+
+<a id="0x1_coin_spec_is_account_registered"></a>
+
+
+<pre><code><b>fun</b> <a href="coin.md#0x1_coin_spec_is_account_registered">spec_is_account_registered</a>&lt;CoinType&gt;(account_addr: <b>address</b>): bool {
+   <b>let</b> paired_metadata_opt = <a href="coin.md#0x1_coin_spec_paired_metadata">spec_paired_metadata</a>&lt;CoinType&gt;();
+   <b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinStore">CoinStore</a>&lt;CoinType&gt;&gt;(account_addr) || (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_is_some">option::spec_is_some</a>(
+       paired_metadata_opt
+   ) && <a href="primary_fungible_store.md#0x1_primary_fungible_store_spec_primary_store_exists">primary_fungible_store::spec_primary_store_exists</a>(account_addr, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_borrow">option::spec_borrow</a>(paired_metadata_opt)))
+}
+</code></pre>
+
+
+
+
+<a id="0x1_coin_CoinSubAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="coin.md#0x1_coin_CoinSubAbortsIf">CoinSubAbortsIf</a>&lt;CoinType&gt; {
+    amount: u64;
+    <b>let</b> addr = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_type_of">type_info::type_of</a>&lt;CoinType&gt;().account_address;
+    <b>let</b> maybe_supply = <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a>&lt;CoinType&gt;&gt;(addr).<a href="coin.md#0x1_coin_supply">supply</a>;
+    <b>include</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(
+        maybe_supply
+    )) ==&gt; <a href="optional_aggregator.md#0x1_optional_aggregator_SubAbortsIf">optional_aggregator::SubAbortsIf</a> { <a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(maybe_supply), value: amount };
+}
+</code></pre>
+
+
+
+
+<a id="0x1_coin_CoinAddAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="coin.md#0x1_coin_CoinAddAbortsIf">CoinAddAbortsIf</a>&lt;CoinType&gt; {
+    amount: u64;
+    <b>let</b> addr = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_type_of">type_info::type_of</a>&lt;CoinType&gt;().account_address;
+    <b>let</b> maybe_supply = <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a>&lt;CoinType&gt;&gt;(addr).<a href="coin.md#0x1_coin_supply">supply</a>;
+    <b>include</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(
+        maybe_supply
+    )) ==&gt; <a href="optional_aggregator.md#0x1_optional_aggregator_AddAbortsIf">optional_aggregator::AddAbortsIf</a> { <a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(maybe_supply), value: amount };
+}
+</code></pre>
+
+
+
+
+<a id="0x1_coin_AbortsIfNotExistCoinInfo"></a>
+
+
+<pre><code><b>schema</b> <a href="coin.md#0x1_coin_AbortsIfNotExistCoinInfo">AbortsIfNotExistCoinInfo</a>&lt;CoinType&gt; {
+    <b>let</b> addr = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_type_of">type_info::type_of</a>&lt;CoinType&gt;().account_address;
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a>&lt;CoinType&gt;&gt;(addr);
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_AggregatableCoin"></a>
+
+### Struct `AggregatableCoin`
+
+
+<pre><code><b>struct</b> <a href="coin.md#0x1_coin_AggregatableCoin">AggregatableCoin</a>&lt;CoinType&gt; <b>has</b> store
+</code></pre>
+
+
+
+<dl>
+<dt>
+<code>value: <a href="aggregator.md#0x1_aggregator_Aggregator">aggregator::Aggregator</a></code>
+</dt>
+<dd>
+ Amount of aggregatable coin this address has.
+</dd>
+</dl>
+
+
+
+<pre><code><b>invariant</b> <a href="aggregator.md#0x1_aggregator_spec_get_limit">aggregator::spec_get_limit</a>(value) == <a href="coin.md#0x1_coin_MAX_U64">MAX_U64</a>;
+</code></pre>
+
+
+
+<a id="@Specification_1_coin_to_fungible_asset"></a>
+
+### Function `coin_to_fungible_asset`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_coin_to_fungible_asset">coin_to_fungible_asset</a>&lt;CoinType&gt;(<a href="coin.md#0x1_coin">coin</a>: <a href="coin.md#0x1_coin_Coin">coin::Coin</a>&lt;CoinType&gt;): <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">fungible_asset::FungibleAsset</a>
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+<b>let</b> addr = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_type_of">type_info::type_of</a>&lt;CoinType&gt;().account_address;
+<b>modifies</b> <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a>&lt;CoinType&gt;&gt;(addr);
+</code></pre>
+
+
+
+<a id="@Specification_1_fungible_asset_to_coin"></a>
+
+### Function `fungible_asset_to_coin`
+
+
+<pre><code><b>fun</b> <a href="coin.md#0x1_coin_fungible_asset_to_coin">fungible_asset_to_coin</a>&lt;CoinType&gt;(<a href="fungible_asset.md#0x1_fungible_asset">fungible_asset</a>: <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">fungible_asset::FungibleAsset</a>): <a href="coin.md#0x1_coin_Coin">coin::Coin</a>&lt;CoinType&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_initialize_supply_config"></a>
+
+### Function `initialize_supply_config`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="coin.md#0x1_coin_initialize_supply_config">initialize_supply_config</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+Can only be initialized once.
+Can only be published by reserved addresses.
+
+
+<pre><code><b>let</b> aptos_addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(aptos_framework);
+<b>aborts_if</b> !<a href="system_addresses.md#0x1_system_addresses_is_aptos_framework_address">system_addresses::is_aptos_framework_address</a>(aptos_addr);
+<b>aborts_if</b> <b>exists</b>&lt;<a href="coin.md#0x1_coin_SupplyConfig">SupplyConfig</a>&gt;(aptos_addr);
+<b>ensures</b> !<b>global</b>&lt;<a href="coin.md#0x1_coin_SupplyConfig">SupplyConfig</a>&gt;(aptos_addr).allow_upgrades;
+<b>ensures</b> <b>exists</b>&lt;<a href="coin.md#0x1_coin_SupplyConfig">SupplyConfig</a>&gt;(aptos_addr);
+</code></pre>
+
+
+
+<a id="@Specification_1_allow_supply_upgrades"></a>
+
+### Function `allow_supply_upgrades`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_allow_supply_upgrades">allow_supply_upgrades</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, allowed: bool)
+</code></pre>
+
+
+Can only be updated by <code>@aptos_framework</code>.
+
+
+<pre><code><b>modifies</b> <b>global</b>&lt;<a href="coin.md#0x1_coin_SupplyConfig">SupplyConfig</a>&gt;(@aptos_framework);
+<b>let</b> aptos_addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(aptos_framework);
+<b>aborts_if</b> !<a href="system_addresses.md#0x1_system_addresses_is_aptos_framework_address">system_addresses::is_aptos_framework_address</a>(aptos_addr);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="coin.md#0x1_coin_SupplyConfig">SupplyConfig</a>&gt;(aptos_addr);
+<b>let</b> <b>post</b> allow_upgrades_post = <b>global</b>&lt;<a href="coin.md#0x1_coin_SupplyConfig">SupplyConfig</a>&gt;(@aptos_framework);
+<b>ensures</b> allow_upgrades_post.allow_upgrades == allowed;
+</code></pre>
+
+
+
+<a id="@Specification_1_initialize_aggregatable_coin"></a>
+
+### Function `initialize_aggregatable_coin`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="coin.md#0x1_coin_initialize_aggregatable_coin">initialize_aggregatable_coin</a>&lt;CoinType&gt;(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>): <a href="coin.md#0x1_coin_AggregatableCoin">coin::AggregatableCoin</a>&lt;CoinType&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="system_addresses.md#0x1_system_addresses_AbortsIfNotAptosFramework">system_addresses::AbortsIfNotAptosFramework</a> { <a href="account.md#0x1_account">account</a>: aptos_framework };
+<b>include</b> <a href="aggregator_factory.md#0x1_aggregator_factory_CreateAggregatorInternalAbortsIf">aggregator_factory::CreateAggregatorInternalAbortsIf</a>;
+</code></pre>
+
+
+
+<a id="@Specification_1_is_aggregatable_coin_zero"></a>
+
+### Function `is_aggregatable_coin_zero`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="coin.md#0x1_coin_is_aggregatable_coin_zero">is_aggregatable_coin_zero</a>&lt;CoinType&gt;(<a href="coin.md#0x1_coin">coin</a>: &<a href="coin.md#0x1_coin_AggregatableCoin">coin::AggregatableCoin</a>&lt;CoinType&gt;): bool
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == (<a href="aggregator.md#0x1_aggregator_spec_read">aggregator::spec_read</a>(<a href="coin.md#0x1_coin">coin</a>.value) == 0);
+</code></pre>
+
+
+
+<a id="@Specification_1_drain_aggregatable_coin"></a>
+
+### Function `drain_aggregatable_coin`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="coin.md#0x1_coin_drain_aggregatable_coin">drain_aggregatable_coin</a>&lt;CoinType&gt;(<a href="coin.md#0x1_coin">coin</a>: &<b>mut</b> <a href="coin.md#0x1_coin_AggregatableCoin">coin::AggregatableCoin</a>&lt;CoinType&gt;): <a href="coin.md#0x1_coin_Coin">coin::Coin</a>&lt;CoinType&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <a href="aggregator.md#0x1_aggregator_spec_read">aggregator::spec_read</a>(<a href="coin.md#0x1_coin">coin</a>.value) &gt; <a href="coin.md#0x1_coin_MAX_U64">MAX_U64</a>;
+<b>ensures</b> result.value == <a href="aggregator.md#0x1_aggregator_spec_aggregator_get_val">aggregator::spec_aggregator_get_val</a>(<b>old</b>(<a href="coin.md#0x1_coin">coin</a>).value);
+</code></pre>
+
+
+
+<a id="@Specification_1_merge_aggregatable_coin"></a>
+
+### Function `merge_aggregatable_coin`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="coin.md#0x1_coin_merge_aggregatable_coin">merge_aggregatable_coin</a>&lt;CoinType&gt;(dst_coin: &<b>mut</b> <a href="coin.md#0x1_coin_AggregatableCoin">coin::AggregatableCoin</a>&lt;CoinType&gt;, <a href="coin.md#0x1_coin">coin</a>: <a href="coin.md#0x1_coin_Coin">coin::Coin</a>&lt;CoinType&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> aggr = dst_coin.value;
+<b>let</b> <b>post</b> p_aggr = dst_coin.value;
+<b>aborts_if</b> <a href="aggregator.md#0x1_aggregator_spec_aggregator_get_val">aggregator::spec_aggregator_get_val</a>(aggr)
+    + <a href="coin.md#0x1_coin">coin</a>.value &gt; <a href="aggregator.md#0x1_aggregator_spec_get_limit">aggregator::spec_get_limit</a>(aggr);
+<b>aborts_if</b> <a href="aggregator.md#0x1_aggregator_spec_aggregator_get_val">aggregator::spec_aggregator_get_val</a>(aggr)
+    + <a href="coin.md#0x1_coin">coin</a>.value &gt; <a href="coin.md#0x1_coin_MAX_U128">MAX_U128</a>;
+<b>ensures</b> <a href="aggregator.md#0x1_aggregator_spec_aggregator_get_val">aggregator::spec_aggregator_get_val</a>(aggr) + <a href="coin.md#0x1_coin">coin</a>.value == <a href="aggregator.md#0x1_aggregator_spec_aggregator_get_val">aggregator::spec_aggregator_get_val</a>(p_aggr);
+</code></pre>
+
+
+
+<a id="@Specification_1_collect_into_aggregatable_coin"></a>
+
+### Function `collect_into_aggregatable_coin`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="coin.md#0x1_coin_collect_into_aggregatable_coin">collect_into_aggregatable_coin</a>&lt;CoinType&gt;(account_addr: <b>address</b>, amount: u64, dst_coin: &<b>mut</b> <a href="coin.md#0x1_coin_AggregatableCoin">coin::AggregatableCoin</a>&lt;CoinType&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+<b>let</b> aggr = dst_coin.value;
+<b>let</b> <b>post</b> p_aggr = dst_coin.value;
+<b>let</b> coin_store = <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinStore">CoinStore</a>&lt;CoinType&gt;&gt;(account_addr);
+<b>let</b> <b>post</b> p_coin_store = <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinStore">CoinStore</a>&lt;CoinType&gt;&gt;(account_addr);
+<b>aborts_if</b> amount &gt; 0 && !<b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinStore">CoinStore</a>&lt;CoinType&gt;&gt;(account_addr);
+<b>aborts_if</b> amount &gt; 0 && coin_store.<a href="coin.md#0x1_coin">coin</a>.<a href="coin.md#0x1_coin_value">value</a> &lt; amount;
+<b>aborts_if</b> amount &gt; 0 && <a href="aggregator.md#0x1_aggregator_spec_aggregator_get_val">aggregator::spec_aggregator_get_val</a>(aggr)
+    + amount &gt; <a href="aggregator.md#0x1_aggregator_spec_get_limit">aggregator::spec_get_limit</a>(aggr);
+<b>aborts_if</b> amount &gt; 0 && <a href="aggregator.md#0x1_aggregator_spec_aggregator_get_val">aggregator::spec_aggregator_get_val</a>(aggr)
+    + amount &gt; <a href="coin.md#0x1_coin_MAX_U128">MAX_U128</a>;
+<b>ensures</b> <a href="aggregator.md#0x1_aggregator_spec_aggregator_get_val">aggregator::spec_aggregator_get_val</a>(aggr) + amount == <a href="aggregator.md#0x1_aggregator_spec_aggregator_get_val">aggregator::spec_aggregator_get_val</a>(p_aggr);
+<b>ensures</b> coin_store.<a href="coin.md#0x1_coin">coin</a>.value - amount == p_coin_store.<a href="coin.md#0x1_coin">coin</a>.value;
+</code></pre>
+
+
+
+<a id="@Specification_1_maybe_convert_to_fungible_store"></a>
+
+### Function `maybe_convert_to_fungible_store`
+
+
+<pre><code><b>fun</b> <a href="coin.md#0x1_coin_maybe_convert_to_fungible_store">maybe_convert_to_fungible_store</a>&lt;CoinType&gt;(<a href="account.md#0x1_account">account</a>: <b>address</b>)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+<b>modifies</b> <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a>&lt;CoinType&gt;&gt;(<a href="account.md#0x1_account">account</a>);
+<b>modifies</b> <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinStore">CoinStore</a>&lt;CoinType&gt;&gt;(<a href="account.md#0x1_account">account</a>);
+</code></pre>
+
+
+
+
+<a id="0x1_coin_DepositAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="coin.md#0x1_coin_DepositAbortsIf">DepositAbortsIf</a>&lt;CoinType&gt; {
+    account_addr: <b>address</b>;
+    <b>let</b> coin_store = <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinStore">CoinStore</a>&lt;CoinType&gt;&gt;(account_addr);
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinStore">CoinStore</a>&lt;CoinType&gt;&gt;(account_addr);
+    <b>aborts_if</b> coin_store.frozen;
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_coin_address"></a>
+
+### Function `coin_address`
+
+
+<pre><code><b>fun</b> <a href="coin.md#0x1_coin_coin_address">coin_address</a>&lt;CoinType&gt;(): <b>address</b>
+</code></pre>
+
+
+Get address by reflection.
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> [abstract] <b>false</b>;
+<b>ensures</b> [abstract] result == <a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_type_of">type_info::type_of</a>&lt;CoinType&gt;().account_address;
+</code></pre>
+
+
+
+<a id="@Specification_1_balance"></a>
+
+### Function `balance`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_balance">balance</a>&lt;CoinType&gt;(owner: <b>address</b>): u64
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinStore">CoinStore</a>&lt;CoinType&gt;&gt;(owner);
+<b>ensures</b> result == <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinStore">CoinStore</a>&lt;CoinType&gt;&gt;(owner).<a href="coin.md#0x1_coin">coin</a>.value;
+</code></pre>
+
+
+
+<a id="@Specification_1_is_coin_initialized"></a>
+
+### Function `is_coin_initialized`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_is_coin_initialized">is_coin_initialized</a>&lt;CoinType&gt;(): bool
+</code></pre>
+
+
+
+
+<pre><code>// This enforces <a id="high-level-req-7.1" href="#high-level-req">high-level requirement 7</a>:
+<b>aborts_if</b> <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_is_account_registered"></a>
+
+### Function `is_account_registered`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_is_account_registered">is_account_registered</a>&lt;CoinType&gt;(account_addr: <b>address</b>): bool
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> aborts_if_is_partial;
+<b>aborts_if</b> <b>false</b>;
+</code></pre>
+
+
+
+
+<a id="0x1_coin_get_coin_supply_opt"></a>
+
+
+<pre><code><b>fun</b> <a href="coin.md#0x1_coin_get_coin_supply_opt">get_coin_supply_opt</a>&lt;CoinType&gt;(): Option&lt;OptionalAggregator&gt; {
+   <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a>&lt;CoinType&gt;&gt;(<a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_type_of">type_info::type_of</a>&lt;CoinType&gt;().account_address).<a href="coin.md#0x1_coin_supply">supply</a>
+}
+</code></pre>
+
+
+
+
+<a id="0x1_coin_spec_paired_metadata"></a>
+
+
+<pre><code><b>fun</b> <a href="coin.md#0x1_coin_spec_paired_metadata">spec_paired_metadata</a>&lt;CoinType&gt;(): Option&lt;Object&lt;Metadata&gt;&gt; {
+   <b>if</b> (<b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinConversionMap">CoinConversionMap</a>&gt;(@aptos_framework)) {
+       <b>let</b> map = <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinConversionMap">CoinConversionMap</a>&gt;(@aptos_framework).coin_to_fungible_asset_map;
+       <b>if</b> (<a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_contains">table::spec_contains</a>(map, <a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_type_of">type_info::type_of</a>&lt;CoinType&gt;())) {
+           <b>let</b> metadata = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(map, <a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_type_of">type_info::type_of</a>&lt;CoinType&gt;());
+           <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_some">option::spec_some</a>(metadata)
+       } <b>else</b> {
+           <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_none">option::spec_none</a>()
+       }
+   } <b>else</b> {
+       <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_none">option::spec_none</a>()
+   }
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_name"></a>
+
+### Function `name`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_name">name</a>&lt;CoinType&gt;(): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+
+<pre><code>// This enforces <a id="high-level-req-7.3" href="#high-level-req">high-level requirement 7</a>:
+<b>include</b> <a href="coin.md#0x1_coin_AbortsIfNotExistCoinInfo">AbortsIfNotExistCoinInfo</a>&lt;CoinType&gt;;
+</code></pre>
+
+
+
+<a id="@Specification_1_symbol"></a>
+
+### Function `symbol`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_symbol">symbol</a>&lt;CoinType&gt;(): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+
+<pre><code>// This enforces <a id="high-level-req-7.4" href="#high-level-req">high-level requirement 7</a>:
+<b>include</b> <a href="coin.md#0x1_coin_AbortsIfNotExistCoinInfo">AbortsIfNotExistCoinInfo</a>&lt;CoinType&gt;;
+</code></pre>
+
+
+
+<a id="@Specification_1_decimals"></a>
+
+### Function `decimals`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_decimals">decimals</a>&lt;CoinType&gt;(): u8
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="coin.md#0x1_coin_AbortsIfNotExistCoinInfo">AbortsIfNotExistCoinInfo</a>&lt;CoinType&gt;;
+</code></pre>
+
+
+
+<a id="@Specification_1_supply"></a>
+
+### Function `supply`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_supply">supply</a>&lt;CoinType&gt;(): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;u128&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_coin_supply"></a>
+
+### Function `coin_supply`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_coin_supply">coin_supply</a>&lt;CoinType&gt;(): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;u128&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> coin_addr = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_type_of">type_info::type_of</a>&lt;CoinType&gt;().account_address;
+// This enforces <a id="high-level-req-7.5" href="#high-level-req">high-level requirement 7</a>:
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a>&lt;CoinType&gt;&gt;(coin_addr);
+<b>let</b> maybe_supply = <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a>&lt;CoinType&gt;&gt;(coin_addr).<a href="coin.md#0x1_coin_supply">supply</a>;
+<b>let</b> <a href="coin.md#0x1_coin_supply">supply</a> = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_borrow">option::spec_borrow</a>(maybe_supply);
+<b>let</b> value = <a href="optional_aggregator.md#0x1_optional_aggregator_optional_aggregator_value">optional_aggregator::optional_aggregator_value</a>(<a href="coin.md#0x1_coin_supply">supply</a>);
+<b>ensures</b> <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_is_some">option::spec_is_some</a>(maybe_supply)) {
+    result == <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_some">option::spec_some</a>(value)
+} <b>else</b> {
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_is_none">option::spec_is_none</a>(result)
+};
+</code></pre>
+
+
+
+<a id="@Specification_1_burn"></a>
+
+### Function `burn`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_burn">burn</a>&lt;CoinType&gt;(<a href="coin.md#0x1_coin">coin</a>: <a href="coin.md#0x1_coin_Coin">coin::Coin</a>&lt;CoinType&gt;, _cap: &<a href="coin.md#0x1_coin_BurnCapability">coin::BurnCapability</a>&lt;CoinType&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+<b>let</b> addr = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_type_of">type_info::type_of</a>&lt;CoinType&gt;().account_address;
+<b>modifies</b> <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a>&lt;CoinType&gt;&gt;(addr);
+<b>include</b> <a href="coin.md#0x1_coin_AbortsIfNotExistCoinInfo">AbortsIfNotExistCoinInfo</a>&lt;CoinType&gt;;
+<b>aborts_if</b> <a href="coin.md#0x1_coin">coin</a>.value == 0;
+<b>include</b> <a href="coin.md#0x1_coin_CoinSubAbortsIf">CoinSubAbortsIf</a>&lt;CoinType&gt; { amount: <a href="coin.md#0x1_coin">coin</a>.value };
+<b>ensures</b> <a href="coin.md#0x1_coin_supply">supply</a>&lt;CoinType&gt; == <b>old</b>(<a href="coin.md#0x1_coin_supply">supply</a>&lt;CoinType&gt;) - <a href="coin.md#0x1_coin">coin</a>.value;
+</code></pre>
+
+
+
+<a id="@Specification_1_burn_from"></a>
+
+### Function `burn_from`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_burn_from">burn_from</a>&lt;CoinType&gt;(account_addr: <b>address</b>, amount: u64, burn_cap: &<a href="coin.md#0x1_coin_BurnCapability">coin::BurnCapability</a>&lt;CoinType&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+<b>let</b> addr = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_type_of">type_info::type_of</a>&lt;CoinType&gt;().account_address;
+<b>let</b> coin_store = <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinStore">CoinStore</a>&lt;CoinType&gt;&gt;(account_addr);
+<b>let</b> <b>post</b> post_coin_store = <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinStore">CoinStore</a>&lt;CoinType&gt;&gt;(account_addr);
+<b>modifies</b> <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a>&lt;CoinType&gt;&gt;(addr);
+<b>modifies</b> <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinStore">CoinStore</a>&lt;CoinType&gt;&gt;(account_addr);
+// This enforces <a id="high-level-req-6.2" href="#high-level-req">high-level requirement 6</a>:
+<b>aborts_if</b> amount != 0 && !<b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a>&lt;CoinType&gt;&gt;(addr);
+<b>aborts_if</b> amount != 0 && !<b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinStore">CoinStore</a>&lt;CoinType&gt;&gt;(account_addr);
+<b>aborts_if</b> coin_store.<a href="coin.md#0x1_coin">coin</a>.<a href="coin.md#0x1_coin_value">value</a> &lt; amount;
+<b>let</b> maybe_supply = <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a>&lt;CoinType&gt;&gt;(addr).<a href="coin.md#0x1_coin_supply">supply</a>;
+<b>let</b> supply_aggr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_borrow">option::spec_borrow</a>(maybe_supply);
+<b>let</b> value = <a href="optional_aggregator.md#0x1_optional_aggregator_optional_aggregator_value">optional_aggregator::optional_aggregator_value</a>(supply_aggr);
+<b>let</b> <b>post</b> post_maybe_supply = <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a>&lt;CoinType&gt;&gt;(addr).<a href="coin.md#0x1_coin_supply">supply</a>;
+<b>let</b> <b>post</b> post_supply = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_borrow">option::spec_borrow</a>(post_maybe_supply);
+<b>let</b> <b>post</b> post_value = <a href="optional_aggregator.md#0x1_optional_aggregator_optional_aggregator_value">optional_aggregator::optional_aggregator_value</a>(post_supply);
+<b>aborts_if</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_is_some">option::spec_is_some</a>(maybe_supply) && <a href="coin.md#0x1_coin_value">value</a> &lt; amount;
+<b>ensures</b> post_coin_store.<a href="coin.md#0x1_coin">coin</a>.value == coin_store.<a href="coin.md#0x1_coin">coin</a>.value - amount;
+// This enforces <a id="high-level-req-5" href="managed_coin.md#high-level-req">high-level requirement 5</a> of the <a href="managed_coin.md">managed_coin</a> module:
+<b>ensures</b> <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_is_some">option::spec_is_some</a>(maybe_supply)) {
+    post_value == value - amount
+} <b>else</b> {
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_is_none">option::spec_is_none</a>(post_maybe_supply)
+};
+<b>ensures</b> <a href="coin.md#0x1_coin_supply">supply</a>&lt;CoinType&gt; == <b>old</b>(<a href="coin.md#0x1_coin_supply">supply</a>&lt;CoinType&gt;) - amount;
+</code></pre>
+
+
+
+<a id="@Specification_1_deposit"></a>
+
+### Function `deposit`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_deposit">deposit</a>&lt;CoinType&gt;(account_addr: <b>address</b>, <a href="coin.md#0x1_coin">coin</a>: <a href="coin.md#0x1_coin_Coin">coin::Coin</a>&lt;CoinType&gt;)
+</code></pre>
+
+
+<code>account_addr</code> is not frozen.
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+<b>modifies</b> <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a>&lt;CoinType&gt;&gt;(account_addr);
+// This enforces <a id="high-level-req-8.3" href="#high-level-req">high-level requirement 8</a>:
+<b>include</b> <a href="coin.md#0x1_coin_DepositAbortsIf">DepositAbortsIf</a>&lt;CoinType&gt;;
+<b>ensures</b> <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinStore">CoinStore</a>&lt;CoinType&gt;&gt;(account_addr).<a href="coin.md#0x1_coin">coin</a>.value == <b>old</b>(
+    <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinStore">CoinStore</a>&lt;CoinType&gt;&gt;(account_addr)
+).<a href="coin.md#0x1_coin">coin</a>.value + <a href="coin.md#0x1_coin">coin</a>.value;
+</code></pre>
+
+
+
+<a id="@Specification_1_force_deposit"></a>
+
+### Function `force_deposit`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="coin.md#0x1_coin_force_deposit">force_deposit</a>&lt;CoinType&gt;(account_addr: <b>address</b>, <a href="coin.md#0x1_coin">coin</a>: <a href="coin.md#0x1_coin_Coin">coin::Coin</a>&lt;CoinType&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+<b>modifies</b> <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinStore">CoinStore</a>&lt;CoinType&gt;&gt;(account_addr);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinStore">CoinStore</a>&lt;CoinType&gt;&gt;(account_addr);
+<b>ensures</b> <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinStore">CoinStore</a>&lt;CoinType&gt;&gt;(account_addr).<a href="coin.md#0x1_coin">coin</a>.value == <b>old</b>(
+    <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinStore">CoinStore</a>&lt;CoinType&gt;&gt;(account_addr)
+).<a href="coin.md#0x1_coin">coin</a>.value + <a href="coin.md#0x1_coin">coin</a>.value;
+</code></pre>
+
+
+
+<a id="@Specification_1_destroy_zero"></a>
+
+### Function `destroy_zero`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_destroy_zero">destroy_zero</a>&lt;CoinType&gt;(zero_coin: <a href="coin.md#0x1_coin_Coin">coin::Coin</a>&lt;CoinType&gt;)
+</code></pre>
+
+
+The value of <code>zero_coin</code> must be 0.
+
+
+<pre><code><b>aborts_if</b> zero_coin.value &gt; 0;
+</code></pre>
+
+
+
+<a id="@Specification_1_extract"></a>
+
+### Function `extract`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_extract">extract</a>&lt;CoinType&gt;(<a href="coin.md#0x1_coin">coin</a>: &<b>mut</b> <a href="coin.md#0x1_coin_Coin">coin::Coin</a>&lt;CoinType&gt;, amount: u64): <a href="coin.md#0x1_coin_Coin">coin::Coin</a>&lt;CoinType&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <a href="coin.md#0x1_coin">coin</a>.<a href="coin.md#0x1_coin_value">value</a> &lt; amount;
+<b>ensures</b> result.value == amount;
+<b>ensures</b> <a href="coin.md#0x1_coin">coin</a>.value == <b>old</b>(<a href="coin.md#0x1_coin">coin</a>.value) - amount;
+</code></pre>
+
+
+
+<a id="@Specification_1_extract_all"></a>
+
+### Function `extract_all`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_extract_all">extract_all</a>&lt;CoinType&gt;(<a href="coin.md#0x1_coin">coin</a>: &<b>mut</b> <a href="coin.md#0x1_coin_Coin">coin::Coin</a>&lt;CoinType&gt;): <a href="coin.md#0x1_coin_Coin">coin::Coin</a>&lt;CoinType&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>ensures</b> result.value == <b>old</b>(<a href="coin.md#0x1_coin">coin</a>).value;
+<b>ensures</b> <a href="coin.md#0x1_coin">coin</a>.value == 0;
+</code></pre>
+
+
+
+<a id="@Specification_1_freeze_coin_store"></a>
+
+### Function `freeze_coin_store`
+
+
+<pre><code>#[legacy_entry_fun]
+<b>public</b> entry <b>fun</b> <a href="coin.md#0x1_coin_freeze_coin_store">freeze_coin_store</a>&lt;CoinType&gt;(account_addr: <b>address</b>, _freeze_cap: &<a href="coin.md#0x1_coin_FreezeCapability">coin::FreezeCapability</a>&lt;CoinType&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+<b>modifies</b> <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinStore">CoinStore</a>&lt;CoinType&gt;&gt;(account_addr);
+// This enforces <a id="high-level-req-6.3" href="#high-level-req">high-level requirement 6</a>:
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinStore">CoinStore</a>&lt;CoinType&gt;&gt;(account_addr);
+<b>let</b> <b>post</b> coin_store = <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinStore">CoinStore</a>&lt;CoinType&gt;&gt;(account_addr);
+<b>ensures</b> coin_store.frozen;
+</code></pre>
+
+
+
+<a id="@Specification_1_unfreeze_coin_store"></a>
+
+### Function `unfreeze_coin_store`
+
+
+<pre><code>#[legacy_entry_fun]
+<b>public</b> entry <b>fun</b> <a href="coin.md#0x1_coin_unfreeze_coin_store">unfreeze_coin_store</a>&lt;CoinType&gt;(account_addr: <b>address</b>, _freeze_cap: &<a href="coin.md#0x1_coin_FreezeCapability">coin::FreezeCapability</a>&lt;CoinType&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+<b>modifies</b> <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinStore">CoinStore</a>&lt;CoinType&gt;&gt;(account_addr);
+// This enforces <a id="high-level-req-6.4" href="#high-level-req">high-level requirement 6</a>:
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinStore">CoinStore</a>&lt;CoinType&gt;&gt;(account_addr);
+<b>let</b> <b>post</b> coin_store = <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinStore">CoinStore</a>&lt;CoinType&gt;&gt;(account_addr);
+<b>ensures</b> !coin_store.frozen;
+</code></pre>
+
+
+
+<a id="@Specification_1_upgrade_supply"></a>
+
+### Function `upgrade_supply`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="coin.md#0x1_coin_upgrade_supply">upgrade_supply</a>&lt;CoinType&gt;(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+The creator of <code>CoinType</code> must be <code>@aptos_framework</code>.
+<code><a href="coin.md#0x1_coin_SupplyConfig">SupplyConfig</a></code> allow upgrade.
+
+
+<pre><code><b>let</b> account_addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>);
+<b>let</b> coin_address = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_type_of">type_info::type_of</a>&lt;CoinType&gt;().account_address;
+<b>aborts_if</b> coin_address != account_addr;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="coin.md#0x1_coin_SupplyConfig">SupplyConfig</a>&gt;(@aptos_framework);
+// This enforces <a id="high-level-req-1.1" href="#high-level-req">high-level requirement 1</a>:
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a>&lt;CoinType&gt;&gt;(account_addr);
+<b>let</b> supply_config = <b>global</b>&lt;<a href="coin.md#0x1_coin_SupplyConfig">SupplyConfig</a>&gt;(@aptos_framework);
+<b>aborts_if</b> !supply_config.allow_upgrades;
+<b>modifies</b> <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a>&lt;CoinType&gt;&gt;(account_addr);
+<b>let</b> maybe_supply = <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a>&lt;CoinType&gt;&gt;(account_addr).<a href="coin.md#0x1_coin_supply">supply</a>;
+<b>let</b> <a href="coin.md#0x1_coin_supply">supply</a> = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_borrow">option::spec_borrow</a>(maybe_supply);
+<b>let</b> value = <a href="optional_aggregator.md#0x1_optional_aggregator_optional_aggregator_value">optional_aggregator::optional_aggregator_value</a>(<a href="coin.md#0x1_coin_supply">supply</a>);
+<b>let</b> <b>post</b> post_maybe_supply = <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a>&lt;CoinType&gt;&gt;(account_addr).<a href="coin.md#0x1_coin_supply">supply</a>;
+<b>let</b> <b>post</b> post_supply = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_borrow">option::spec_borrow</a>(post_maybe_supply);
+<b>let</b> <b>post</b> post_value = <a href="optional_aggregator.md#0x1_optional_aggregator_optional_aggregator_value">optional_aggregator::optional_aggregator_value</a>(post_supply);
+<b>let</b> supply_no_parallel = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_is_some">option::spec_is_some</a>(maybe_supply) &&
+    !<a href="optional_aggregator.md#0x1_optional_aggregator_is_parallelizable">optional_aggregator::is_parallelizable</a>(<a href="coin.md#0x1_coin_supply">supply</a>);
+<b>aborts_if</b> supply_no_parallel && !<b>exists</b>&lt;<a href="aggregator_factory.md#0x1_aggregator_factory_AggregatorFactory">aggregator_factory::AggregatorFactory</a>&gt;(@aptos_framework);
+<b>ensures</b> supply_no_parallel ==&gt;
+    <a href="optional_aggregator.md#0x1_optional_aggregator_is_parallelizable">optional_aggregator::is_parallelizable</a>(post_supply) && post_value == value;
+</code></pre>
+
+
+
+<a id="@Specification_1_initialize"></a>
+
+### Function `initialize`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_initialize">initialize</a>&lt;CoinType&gt;(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, name: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, symbol: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, decimals: u8, monitor_supply: bool): (<a href="coin.md#0x1_coin_BurnCapability">coin::BurnCapability</a>&lt;CoinType&gt;, <a href="coin.md#0x1_coin_FreezeCapability">coin::FreezeCapability</a>&lt;CoinType&gt;, <a href="coin.md#0x1_coin_MintCapability">coin::MintCapability</a>&lt;CoinType&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> account_addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>);
+// This enforces <a id="high-level-req-1.2" href="#high-level-req">high-level requirement 1</a>:
+<b>aborts_if</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_type_of">type_info::type_of</a>&lt;CoinType&gt;().account_address != account_addr;
+// This enforces <a id="high-level-req-2" href="#high-level-req">high-level requirement 2</a>:
+<b>aborts_if</b> <b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a>&lt;CoinType&gt;&gt;(account_addr);
+<b>aborts_if</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_length">string::length</a>(name) &gt; <a href="coin.md#0x1_coin_MAX_COIN_NAME_LENGTH">MAX_COIN_NAME_LENGTH</a>;
+<b>aborts_if</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_length">string::length</a>(symbol) &gt; <a href="coin.md#0x1_coin_MAX_COIN_SYMBOL_LENGTH">MAX_COIN_SYMBOL_LENGTH</a>;
+</code></pre>
+
+
+
+<a id="@Specification_1_initialize_with_parallelizable_supply"></a>
+
+### Function `initialize_with_parallelizable_supply`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="coin.md#0x1_coin_initialize_with_parallelizable_supply">initialize_with_parallelizable_supply</a>&lt;CoinType&gt;(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, name: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, symbol: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, decimals: u8, monitor_supply: bool): (<a href="coin.md#0x1_coin_BurnCapability">coin::BurnCapability</a>&lt;CoinType&gt;, <a href="coin.md#0x1_coin_FreezeCapability">coin::FreezeCapability</a>&lt;CoinType&gt;, <a href="coin.md#0x1_coin_MintCapability">coin::MintCapability</a>&lt;CoinType&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>);
+<b>aborts_if</b> addr != @aptos_framework;
+<b>aborts_if</b> monitor_supply && !<b>exists</b>&lt;<a href="aggregator_factory.md#0x1_aggregator_factory_AggregatorFactory">aggregator_factory::AggregatorFactory</a>&gt;(@aptos_framework);
+<b>include</b> <a href="coin.md#0x1_coin_InitializeInternalSchema">InitializeInternalSchema</a>&lt;CoinType&gt; {
+    name: name.bytes,
+    symbol: symbol.bytes
+};
+<b>ensures</b> <b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a>&lt;CoinType&gt;&gt;(addr);
+</code></pre>
+
+
+Make sure <code>name</code> and <code>symbol</code> are legal length.
+Only the creator of <code>CoinType</code> can initialize.
+
+
+<a id="0x1_coin_InitializeInternalSchema"></a>
+
+
+<pre><code><b>schema</b> <a href="coin.md#0x1_coin_InitializeInternalSchema">InitializeInternalSchema</a>&lt;CoinType&gt; {
+    <a href="account.md#0x1_account">account</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>;
+    name: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+    symbol: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+    <b>let</b> account_addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>);
+    <b>let</b> coin_address = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_type_of">type_info::type_of</a>&lt;CoinType&gt;().account_address;
+    <b>aborts_if</b> coin_address != account_addr;
+    <b>aborts_if</b> <b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a>&lt;CoinType&gt;&gt;(account_addr);
+    <b>aborts_if</b> len(name) &gt; <a href="coin.md#0x1_coin_MAX_COIN_NAME_LENGTH">MAX_COIN_NAME_LENGTH</a>;
+    <b>aborts_if</b> len(symbol) &gt; <a href="coin.md#0x1_coin_MAX_COIN_SYMBOL_LENGTH">MAX_COIN_SYMBOL_LENGTH</a>;
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_initialize_internal"></a>
+
+### Function `initialize_internal`
+
+
+<pre><code><b>fun</b> <a href="coin.md#0x1_coin_initialize_internal">initialize_internal</a>&lt;CoinType&gt;(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, name: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, symbol: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, decimals: u8, monitor_supply: bool, parallelizable: bool): (<a href="coin.md#0x1_coin_BurnCapability">coin::BurnCapability</a>&lt;CoinType&gt;, <a href="coin.md#0x1_coin_FreezeCapability">coin::FreezeCapability</a>&lt;CoinType&gt;, <a href="coin.md#0x1_coin_MintCapability">coin::MintCapability</a>&lt;CoinType&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="coin.md#0x1_coin_InitializeInternalSchema">InitializeInternalSchema</a>&lt;CoinType&gt; {
+    name: name.bytes,
+    symbol: symbol.bytes
+};
+<b>let</b> account_addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>);
+<b>let</b> <b>post</b> coin_info = <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a>&lt;CoinType&gt;&gt;(account_addr);
+<b>let</b> <b>post</b> <a href="coin.md#0x1_coin_supply">supply</a> = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_borrow">option::spec_borrow</a>(coin_info.<a href="coin.md#0x1_coin_supply">supply</a>);
+<b>let</b> <b>post</b> value = <a href="optional_aggregator.md#0x1_optional_aggregator_optional_aggregator_value">optional_aggregator::optional_aggregator_value</a>(<a href="coin.md#0x1_coin_supply">supply</a>);
+<b>let</b> <b>post</b> limit = <a href="optional_aggregator.md#0x1_optional_aggregator_optional_aggregator_limit">optional_aggregator::optional_aggregator_limit</a>(<a href="coin.md#0x1_coin_supply">supply</a>);
+<b>modifies</b> <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a>&lt;CoinType&gt;&gt;(account_addr);
+<b>aborts_if</b> monitor_supply && parallelizable
+    && !<b>exists</b>&lt;<a href="aggregator_factory.md#0x1_aggregator_factory_AggregatorFactory">aggregator_factory::AggregatorFactory</a>&gt;(@aptos_framework);
+// This enforces <a id="high-level-req-2" href="managed_coin.md#high-level-req">high-level requirement 2</a> of the <a href="managed_coin.md">managed_coin</a> module:
+<b>ensures</b> <b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a>&lt;CoinType&gt;&gt;(account_addr)
+    && coin_info.name == name
+    && coin_info.symbol == symbol
+    && coin_info.decimals == decimals;
+<b>ensures</b> <b>if</b> (monitor_supply) {
+    value == 0 && limit == <a href="coin.md#0x1_coin_MAX_U128">MAX_U128</a>
+        && (parallelizable == <a href="optional_aggregator.md#0x1_optional_aggregator_is_parallelizable">optional_aggregator::is_parallelizable</a>(<a href="coin.md#0x1_coin_supply">supply</a>))
+} <b>else</b> {
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_is_none">option::spec_is_none</a>(coin_info.<a href="coin.md#0x1_coin_supply">supply</a>)
+};
+<b>ensures</b> result_1 == <a href="coin.md#0x1_coin_BurnCapability">BurnCapability</a>&lt;CoinType&gt; {};
+<b>ensures</b> result_2 == <a href="coin.md#0x1_coin_FreezeCapability">FreezeCapability</a>&lt;CoinType&gt; {};
+<b>ensures</b> result_3 == <a href="coin.md#0x1_coin_MintCapability">MintCapability</a>&lt;CoinType&gt; {};
+</code></pre>
+
+
+
+<a id="@Specification_1_merge"></a>
+
+### Function `merge`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_merge">merge</a>&lt;CoinType&gt;(dst_coin: &<b>mut</b> <a href="coin.md#0x1_coin_Coin">coin::Coin</a>&lt;CoinType&gt;, source_coin: <a href="coin.md#0x1_coin_Coin">coin::Coin</a>&lt;CoinType&gt;)
+</code></pre>
+
+
+
+
+<pre><code>// This enforces <a id="high-level-req-3" href="#high-level-req">high-level requirement 3</a>:
+<b>ensures</b> dst_coin.value == <b>old</b>(dst_coin.value) + source_coin.value;
+</code></pre>
+
+
+
+<a id="@Specification_1_mint"></a>
+
+### Function `mint`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_mint">mint</a>&lt;CoinType&gt;(amount: u64, _cap: &<a href="coin.md#0x1_coin_MintCapability">coin::MintCapability</a>&lt;CoinType&gt;): <a href="coin.md#0x1_coin_Coin">coin::Coin</a>&lt;CoinType&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> addr = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_type_of">type_info::type_of</a>&lt;CoinType&gt;().account_address;
+<b>modifies</b> <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a>&lt;CoinType&gt;&gt;(addr);
+</code></pre>
+
+
+
+<a id="@Specification_1_register"></a>
+
+### Function `register`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_register">register</a>&lt;CoinType&gt;(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+An account can only be registered once.
+Updating <code>Account.guid_creation_num</code> will not overflow.
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_transfer"></a>
+
+### Function `transfer`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="coin.md#0x1_coin_transfer">transfer</a>&lt;CoinType&gt;(from: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <b>to</b>: <b>address</b>, amount: u64)
+</code></pre>
+
+
+<code>from</code> and <code><b>to</b></code> account not frozen.
+<code>from</code> and <code><b>to</b></code> not the same address.
+<code>from</code> account sufficient balance.
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+<b>let</b> account_addr_from = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(from);
+<b>let</b> coin_store_from = <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinStore">CoinStore</a>&lt;CoinType&gt;&gt;(account_addr_from);
+<b>let</b> <b>post</b> coin_store_post_from = <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinStore">CoinStore</a>&lt;CoinType&gt;&gt;(account_addr_from);
+<b>let</b> coin_store_to = <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinStore">CoinStore</a>&lt;CoinType&gt;&gt;(<b>to</b>);
+<b>let</b> <b>post</b> coin_store_post_to = <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinStore">CoinStore</a>&lt;CoinType&gt;&gt;(<b>to</b>);
+// This enforces <a id="high-level-req-6.5" href="#high-level-req">high-level requirement 6</a>:
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinStore">CoinStore</a>&lt;CoinType&gt;&gt;(account_addr_from);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinStore">CoinStore</a>&lt;CoinType&gt;&gt;(<b>to</b>);
+// This enforces <a id="high-level-req-8.2" href="#high-level-req">high-level requirement 8</a>:
+<b>aborts_if</b> coin_store_from.frozen;
+<b>aborts_if</b> coin_store_to.frozen;
+<b>aborts_if</b> coin_store_from.<a href="coin.md#0x1_coin">coin</a>.<a href="coin.md#0x1_coin_value">value</a> &lt; amount;
+<b>ensures</b> account_addr_from != <b>to</b> ==&gt; coin_store_post_from.<a href="coin.md#0x1_coin">coin</a>.value ==
+    coin_store_from.<a href="coin.md#0x1_coin">coin</a>.value - amount;
+<b>ensures</b> account_addr_from != <b>to</b> ==&gt; coin_store_post_to.<a href="coin.md#0x1_coin">coin</a>.value == coin_store_to.<a href="coin.md#0x1_coin">coin</a>.value + amount;
+<b>ensures</b> account_addr_from == <b>to</b> ==&gt; coin_store_post_from.<a href="coin.md#0x1_coin">coin</a>.value == coin_store_from.<a href="coin.md#0x1_coin">coin</a>.value;
+</code></pre>
+
+
+
+<a id="@Specification_1_withdraw"></a>
+
+### Function `withdraw`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="coin.md#0x1_coin_withdraw">withdraw</a>&lt;CoinType&gt;(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, amount: u64): <a href="coin.md#0x1_coin_Coin">coin::Coin</a>&lt;CoinType&gt;
+</code></pre>
+
+
+Account is not frozen and sufficient balance.
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+<b>include</b> <a href="coin.md#0x1_coin_WithdrawAbortsIf">WithdrawAbortsIf</a>&lt;CoinType&gt;;
+<b>modifies</b> <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinStore">CoinStore</a>&lt;CoinType&gt;&gt;(account_addr);
+<b>let</b> account_addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>);
+<b>let</b> coin_store = <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinStore">CoinStore</a>&lt;CoinType&gt;&gt;(account_addr);
+<b>let</b> balance = coin_store.<a href="coin.md#0x1_coin">coin</a>.value;
+<b>let</b> <b>post</b> coin_post = <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinStore">CoinStore</a>&lt;CoinType&gt;&gt;(account_addr).<a href="coin.md#0x1_coin">coin</a>.value;
+<b>ensures</b> coin_post == balance - amount;
+<b>ensures</b> result == <a href="coin.md#0x1_coin_Coin">Coin</a>&lt;CoinType&gt; { value: amount };
+</code></pre>
+
+
+
+
+<a id="0x1_coin_WithdrawAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="coin.md#0x1_coin_WithdrawAbortsIf">WithdrawAbortsIf</a>&lt;CoinType&gt; {
+    <a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>;
+    amount: u64;
+    <b>let</b> account_addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>);
+    <b>let</b> coin_store = <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinStore">CoinStore</a>&lt;CoinType&gt;&gt;(account_addr);
+    <b>let</b> balance = coin_store.<a href="coin.md#0x1_coin">coin</a>.value;
+    // This enforces <a id="high-level-req-6.6" href="#high-level-req">high-level requirement 6</a>:
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinStore">CoinStore</a>&lt;CoinType&gt;&gt;(account_addr);
+    // This enforces <a id="high-level-req-8.1" href="#high-level-req">high-level requirement 8</a>:
+    <b>aborts_if</b> coin_store.frozen;
+    <b>aborts_if</b> <a href="coin.md#0x1_coin_balance">balance</a> &lt; amount;
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_mint_internal"></a>
+
+### Function `mint_internal`
+
+
+<pre><code><b>fun</b> <a href="coin.md#0x1_coin_mint_internal">mint_internal</a>&lt;CoinType&gt;(amount: u64): <a href="coin.md#0x1_coin_Coin">coin::Coin</a>&lt;CoinType&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> addr = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_type_of">type_info::type_of</a>&lt;CoinType&gt;().account_address;
+<b>modifies</b> <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a>&lt;CoinType&gt;&gt;(addr);
+<b>aborts_if</b> (amount != 0) && !<b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a>&lt;CoinType&gt;&gt;(addr);
+<b>ensures</b> <a href="coin.md#0x1_coin_supply">supply</a>&lt;CoinType&gt; == <b>old</b>(<a href="coin.md#0x1_coin_supply">supply</a>&lt;CoinType&gt;) + amount;
+<b>ensures</b> result.value == amount;
+</code></pre>
+
+
+
+<a id="@Specification_1_burn_internal"></a>
+
+### Function `burn_internal`
+
+
+<pre><code><b>fun</b> <a href="coin.md#0x1_coin_burn_internal">burn_internal</a>&lt;CoinType&gt;(<a href="coin.md#0x1_coin">coin</a>: <a href="coin.md#0x1_coin_Coin">coin::Coin</a>&lt;CoinType&gt;): u64
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+<b>let</b> addr = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_type_of">type_info::type_of</a>&lt;CoinType&gt;().account_address;
+<b>modifies</b> <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinInfo">CoinInfo</a>&lt;CoinType&gt;&gt;(addr);
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/config_buffer.md b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/config_buffer.md
new file mode 100644
index 0000000000000..714bc07f1e101
--- /dev/null
+++ b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/config_buffer.md
@@ -0,0 +1,342 @@
+
+<a id="0x1_config_buffer"></a>
+
+# Module `0x1::config_buffer`
+
+This wrapper helps store an on-chain config for the next epoch.
+
+Once reconfigure with DKG is introduced, every on-chain config <code>C</code> should do the following.
+- Support async update when DKG is enabled. This is typically done by 3 steps below.
+- Implement <code>C::set_for_next_epoch()</code> using <code><a href="config_buffer.md#0x1_config_buffer_upsert">upsert</a>()</code> function in this module.
+- Implement <code>C::on_new_epoch()</code> using <code><a href="config_buffer.md#0x1_config_buffer_extract">extract</a>()</code> function in this module.
+- Update <code><a href="reconfiguration_with_dkg.md#0x1_reconfiguration_with_dkg_finish">0x1::reconfiguration_with_dkg::finish</a>()</code> to call <code>C::on_new_epoch()</code>.
+- Support sychronous update when DKG is disabled.
+This is typically done by implementing <code>C::set()</code> to update the config resource directly.
+
+NOTE: on-chain config <code>0x1::state::ValidatorSet</code> implemented its own buffer.
+
+
+-  [Resource `PendingConfigs`](#0x1_config_buffer_PendingConfigs)
+-  [Constants](#@Constants_0)
+-  [Function `initialize`](#0x1_config_buffer_initialize)
+-  [Function `does_exist`](#0x1_config_buffer_does_exist)
+-  [Function `upsert`](#0x1_config_buffer_upsert)
+-  [Function `extract`](#0x1_config_buffer_extract)
+-  [Specification](#@Specification_1)
+    -  [Function `does_exist`](#@Specification_1_does_exist)
+    -  [Function `upsert`](#@Specification_1_upsert)
+    -  [Function `extract`](#@Specification_1_extract)
+
+
+<pre><code><b>use</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/any.md#0x1_any">0x1::any</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option">0x1::option</a>;
+<b>use</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map">0x1::simple_map</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string">0x1::string</a>;
+<b>use</b> <a href="system_addresses.md#0x1_system_addresses">0x1::system_addresses</a>;
+<b>use</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info">0x1::type_info</a>;
+</code></pre>
+
+
+
+<a id="0x1_config_buffer_PendingConfigs"></a>
+
+## Resource `PendingConfigs`
+
+
+
+<pre><code><b>struct</b> <a href="config_buffer.md#0x1_config_buffer_PendingConfigs">PendingConfigs</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>configs: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, <a href="../../../aptos-stdlib/tests/compiler-v2-doc/any.md#0x1_any_Any">any::Any</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_config_buffer_ESTD_SIGNER_NEEDED"></a>
+
+Config buffer operations failed with permission denied.
+
+
+<pre><code><b>const</b> <a href="config_buffer.md#0x1_config_buffer_ESTD_SIGNER_NEEDED">ESTD_SIGNER_NEEDED</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_config_buffer_initialize"></a>
+
+## Function `initialize`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="config_buffer.md#0x1_config_buffer_initialize">initialize</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="config_buffer.md#0x1_config_buffer_initialize">initialize</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>) {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(aptos_framework);
+    <b>if</b> (!<b>exists</b>&lt;<a href="config_buffer.md#0x1_config_buffer_PendingConfigs">PendingConfigs</a>&gt;(@aptos_framework)) {
+        <b>move_to</b>(aptos_framework, <a href="config_buffer.md#0x1_config_buffer_PendingConfigs">PendingConfigs</a> {
+            configs: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_new">simple_map::new</a>(),
+        })
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_config_buffer_does_exist"></a>
+
+## Function `does_exist`
+
+Check whether there is a pending config payload for <code>T</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="config_buffer.md#0x1_config_buffer_does_exist">does_exist</a>&lt;T: store&gt;(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="config_buffer.md#0x1_config_buffer_does_exist">does_exist</a>&lt;T: store&gt;(): bool <b>acquires</b> <a href="config_buffer.md#0x1_config_buffer_PendingConfigs">PendingConfigs</a> {
+    <b>if</b> (<b>exists</b>&lt;<a href="config_buffer.md#0x1_config_buffer_PendingConfigs">PendingConfigs</a>&gt;(@aptos_framework)) {
+        <b>let</b> config = <b>borrow_global</b>&lt;<a href="config_buffer.md#0x1_config_buffer_PendingConfigs">PendingConfigs</a>&gt;(@aptos_framework);
+        <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_contains_key">simple_map::contains_key</a>(&config.configs, &<a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_type_name">type_info::type_name</a>&lt;T&gt;())
+    } <b>else</b> {
+        <b>false</b>
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_config_buffer_upsert"></a>
+
+## Function `upsert`
+
+Upsert an on-chain config to the buffer for the next epoch.
+
+Typically used in <code>X::set_for_next_epoch()</code> where X is an on-chain config.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="config_buffer.md#0x1_config_buffer_upsert">upsert</a>&lt;T: drop, store&gt;(config: T)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="config_buffer.md#0x1_config_buffer_upsert">upsert</a>&lt;T: drop + store&gt;(config: T) <b>acquires</b> <a href="config_buffer.md#0x1_config_buffer_PendingConfigs">PendingConfigs</a> {
+    <b>let</b> configs = <b>borrow_global_mut</b>&lt;<a href="config_buffer.md#0x1_config_buffer_PendingConfigs">PendingConfigs</a>&gt;(@aptos_framework);
+    <b>let</b> key = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_type_name">type_info::type_name</a>&lt;T&gt;();
+    <b>let</b> value = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/any.md#0x1_any_pack">any::pack</a>(config);
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_upsert">simple_map::upsert</a>(&<b>mut</b> configs.configs, key, value);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_config_buffer_extract"></a>
+
+## Function `extract`
+
+Take the buffered config <code>T</code> out (buffer cleared). Abort if the buffer is empty.
+Should only be used at the end of a reconfiguration.
+
+Typically used in <code>X::on_new_epoch()</code> where X is an on-chaon config.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="config_buffer.md#0x1_config_buffer_extract">extract</a>&lt;T: store&gt;(): T
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="config_buffer.md#0x1_config_buffer_extract">extract</a>&lt;T: store&gt;(): T <b>acquires</b> <a href="config_buffer.md#0x1_config_buffer_PendingConfigs">PendingConfigs</a> {
+    <b>let</b> configs = <b>borrow_global_mut</b>&lt;<a href="config_buffer.md#0x1_config_buffer_PendingConfigs">PendingConfigs</a>&gt;(@aptos_framework);
+    <b>let</b> key = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_type_name">type_info::type_name</a>&lt;T&gt;();
+    <b>let</b> (_, value_packed) = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_remove">simple_map::remove</a>(&<b>mut</b> configs.configs, &key);
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/any.md#0x1_any_unpack">any::unpack</a>(value_packed)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+
+<pre><code><b>pragma</b> verify = <b>true</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_does_exist"></a>
+
+### Function `does_exist`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="config_buffer.md#0x1_config_buffer_does_exist">does_exist</a>&lt;T: store&gt;(): bool
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+<b>let</b> type_name = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_type_name">type_info::type_name</a>&lt;T&gt;();
+<b>ensures</b> result == <a href="config_buffer.md#0x1_config_buffer_spec_fun_does_exist">spec_fun_does_exist</a>&lt;T&gt;(type_name);
+</code></pre>
+
+
+
+
+<a id="0x1_config_buffer_spec_fun_does_exist"></a>
+
+
+<pre><code><b>fun</b> <a href="config_buffer.md#0x1_config_buffer_spec_fun_does_exist">spec_fun_does_exist</a>&lt;T: store&gt;(type_name: String): bool {
+   <b>if</b> (<b>exists</b>&lt;<a href="config_buffer.md#0x1_config_buffer_PendingConfigs">PendingConfigs</a>&gt;(@aptos_framework)) {
+       <b>let</b> config = <b>global</b>&lt;<a href="config_buffer.md#0x1_config_buffer_PendingConfigs">PendingConfigs</a>&gt;(@aptos_framework);
+       <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(config.configs, type_name)
+   } <b>else</b> {
+       <b>false</b>
+   }
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_upsert"></a>
+
+### Function `upsert`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="config_buffer.md#0x1_config_buffer_upsert">upsert</a>&lt;T: drop, store&gt;(config: T)
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="config_buffer.md#0x1_config_buffer_PendingConfigs">PendingConfigs</a>&gt;(@aptos_framework);
+</code></pre>
+
+
+
+<a id="@Specification_1_extract"></a>
+
+### Function `extract`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="config_buffer.md#0x1_config_buffer_extract">extract</a>&lt;T: store&gt;(): T
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="config_buffer.md#0x1_config_buffer_PendingConfigs">PendingConfigs</a>&gt;(@aptos_framework);
+<b>include</b> <a href="config_buffer.md#0x1_config_buffer_ExtractAbortsIf">ExtractAbortsIf</a>&lt;T&gt;;
+</code></pre>
+
+
+
+
+<a id="0x1_config_buffer_ExtractAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="config_buffer.md#0x1_config_buffer_ExtractAbortsIf">ExtractAbortsIf</a>&lt;T&gt; {
+    <b>let</b> configs = <b>global</b>&lt;<a href="config_buffer.md#0x1_config_buffer_PendingConfigs">PendingConfigs</a>&gt;(@aptos_framework);
+    <b>let</b> key = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_type_name">type_info::type_name</a>&lt;T&gt;();
+    <b>aborts_if</b> !<a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(configs.configs, key);
+    <b>include</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/any.md#0x1_any_UnpackAbortsIf">any::UnpackAbortsIf</a>&lt;T&gt; {
+        x: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(configs.configs, key)
+    };
+}
+</code></pre>
+
+
+
+
+<a id="0x1_config_buffer_SetForNextEpochAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="config_buffer.md#0x1_config_buffer_SetForNextEpochAbortsIf">SetForNextEpochAbortsIf</a> {
+    <a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>;
+    config: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+    <b>let</b> account_addr = std::signer::address_of(<a href="account.md#0x1_account">account</a>);
+    <b>aborts_if</b> account_addr != @aptos_framework;
+    <b>aborts_if</b> len(config) == 0;
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="config_buffer.md#0x1_config_buffer_PendingConfigs">PendingConfigs</a>&gt;(@aptos_framework);
+}
+</code></pre>
+
+
+
+
+<a id="0x1_config_buffer_OnNewEpochAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="config_buffer.md#0x1_config_buffer_OnNewEpochAbortsIf">OnNewEpochAbortsIf</a>&lt;T&gt; {
+    <b>let</b> type_name = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_type_name">type_info::type_name</a>&lt;T&gt;();
+    <b>let</b> configs = <b>global</b>&lt;<a href="config_buffer.md#0x1_config_buffer_PendingConfigs">PendingConfigs</a>&gt;(@aptos_framework);
+    <b>include</b> <a href="config_buffer.md#0x1_config_buffer_spec_fun_does_exist">spec_fun_does_exist</a>&lt;T&gt;(type_name) ==&gt; <a href="../../../aptos-stdlib/tests/compiler-v2-doc/any.md#0x1_any_UnpackAbortsIf">any::UnpackAbortsIf</a>&lt;T&gt; {
+        x: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(configs.configs, type_name)
+    };
+}
+</code></pre>
+
+
+
+
+<a id="0x1_config_buffer_OnNewEpochRequirement"></a>
+
+
+<pre><code><b>schema</b> <a href="config_buffer.md#0x1_config_buffer_OnNewEpochRequirement">OnNewEpochRequirement</a>&lt;T&gt; {
+    <b>let</b> type_name = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_type_name">type_info::type_name</a>&lt;T&gt;();
+    <b>let</b> configs = <b>global</b>&lt;<a href="config_buffer.md#0x1_config_buffer_PendingConfigs">PendingConfigs</a>&gt;(@aptos_framework);
+    <b>include</b> <a href="config_buffer.md#0x1_config_buffer_spec_fun_does_exist">spec_fun_does_exist</a>&lt;T&gt;(type_name) ==&gt; <a href="../../../aptos-stdlib/tests/compiler-v2-doc/any.md#0x1_any_UnpackRequirement">any::UnpackRequirement</a>&lt;T&gt; {
+        x: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(configs.configs, type_name)
+    };
+}
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/consensus_config.md b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/consensus_config.md
new file mode 100644
index 0000000000000..d8f4179edd006
--- /dev/null
+++ b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/consensus_config.md
@@ -0,0 +1,445 @@
+
+<a id="0x1_consensus_config"></a>
+
+# Module `0x1::consensus_config`
+
+Maintains the consensus config for the blockchain. The config is stored in a
+Reconfiguration, and may be updated by root.
+
+
+-  [Resource `ConsensusConfig`](#0x1_consensus_config_ConsensusConfig)
+-  [Constants](#@Constants_0)
+-  [Function `initialize`](#0x1_consensus_config_initialize)
+-  [Function `set`](#0x1_consensus_config_set)
+-  [Function `set_for_next_epoch`](#0x1_consensus_config_set_for_next_epoch)
+-  [Function `on_new_epoch`](#0x1_consensus_config_on_new_epoch)
+-  [Function `validator_txn_enabled`](#0x1_consensus_config_validator_txn_enabled)
+-  [Function `validator_txn_enabled_internal`](#0x1_consensus_config_validator_txn_enabled_internal)
+-  [Specification](#@Specification_1)
+    -  [High-level Requirements](#high-level-req)
+    -  [Module-level Specification](#module-level-spec)
+    -  [Function `initialize`](#@Specification_1_initialize)
+    -  [Function `set`](#@Specification_1_set)
+    -  [Function `set_for_next_epoch`](#@Specification_1_set_for_next_epoch)
+    -  [Function `on_new_epoch`](#@Specification_1_on_new_epoch)
+    -  [Function `validator_txn_enabled`](#@Specification_1_validator_txn_enabled)
+    -  [Function `validator_txn_enabled_internal`](#@Specification_1_validator_txn_enabled_internal)
+
+
+<pre><code><b>use</b> <a href="chain_status.md#0x1_chain_status">0x1::chain_status</a>;
+<b>use</b> <a href="config_buffer.md#0x1_config_buffer">0x1::config_buffer</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="reconfiguration.md#0x1_reconfiguration">0x1::reconfiguration</a>;
+<b>use</b> <a href="system_addresses.md#0x1_system_addresses">0x1::system_addresses</a>;
+</code></pre>
+
+
+
+<a id="0x1_consensus_config_ConsensusConfig"></a>
+
+## Resource `ConsensusConfig`
+
+
+
+<pre><code><b>struct</b> <a href="consensus_config.md#0x1_consensus_config_ConsensusConfig">ConsensusConfig</a> <b>has</b> drop, store, key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>config: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_consensus_config_EINVALID_CONFIG"></a>
+
+The provided on chain config bytes are empty or invalid
+
+
+<pre><code><b>const</b> <a href="consensus_config.md#0x1_consensus_config_EINVALID_CONFIG">EINVALID_CONFIG</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_consensus_config_initialize"></a>
+
+## Function `initialize`
+
+Publishes the ConsensusConfig config.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="consensus_config.md#0x1_consensus_config_initialize">initialize</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, config: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="consensus_config.md#0x1_consensus_config_initialize">initialize</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, config: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;) {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(aptos_framework);
+    <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&config) &gt; 0, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="consensus_config.md#0x1_consensus_config_EINVALID_CONFIG">EINVALID_CONFIG</a>));
+    <b>move_to</b>(aptos_framework, <a href="consensus_config.md#0x1_consensus_config_ConsensusConfig">ConsensusConfig</a> { config });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_consensus_config_set"></a>
+
+## Function `set`
+
+Deprecated by <code><a href="consensus_config.md#0x1_consensus_config_set_for_next_epoch">set_for_next_epoch</a>()</code>.
+
+WARNING: calling this while randomness is enabled will trigger a new epoch without randomness!
+
+TODO: update all the tests that reference this function, then disable this function.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="consensus_config.md#0x1_consensus_config_set">set</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, config: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="consensus_config.md#0x1_consensus_config_set">set</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, config: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;) <b>acquires</b> <a href="consensus_config.md#0x1_consensus_config_ConsensusConfig">ConsensusConfig</a> {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(<a href="account.md#0x1_account">account</a>);
+    <a href="chain_status.md#0x1_chain_status_assert_genesis">chain_status::assert_genesis</a>();
+    <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&config) &gt; 0, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="consensus_config.md#0x1_consensus_config_EINVALID_CONFIG">EINVALID_CONFIG</a>));
+
+    <b>let</b> config_ref = &<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="consensus_config.md#0x1_consensus_config_ConsensusConfig">ConsensusConfig</a>&gt;(@aptos_framework).config;
+    *config_ref = config;
+
+    // Need <b>to</b> trigger <a href="reconfiguration.md#0x1_reconfiguration">reconfiguration</a> so validator nodes can sync on the updated configs.
+    <a href="reconfiguration.md#0x1_reconfiguration_reconfigure">reconfiguration::reconfigure</a>();
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_consensus_config_set_for_next_epoch"></a>
+
+## Function `set_for_next_epoch`
+
+This can be called by on-chain governance to update on-chain consensus configs for the next epoch.
+Example usage:
+```
+aptos_framework::consensus_config::set_for_next_epoch(&framework_signer, some_config_bytes);
+aptos_framework::aptos_governance::reconfigure(&framework_signer);
+```
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="consensus_config.md#0x1_consensus_config_set_for_next_epoch">set_for_next_epoch</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, config: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="consensus_config.md#0x1_consensus_config_set_for_next_epoch">set_for_next_epoch</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, config: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;) {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(<a href="account.md#0x1_account">account</a>);
+    <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&config) &gt; 0, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="consensus_config.md#0x1_consensus_config_EINVALID_CONFIG">EINVALID_CONFIG</a>));
+    std::config_buffer::upsert&lt;<a href="consensus_config.md#0x1_consensus_config_ConsensusConfig">ConsensusConfig</a>&gt;(<a href="consensus_config.md#0x1_consensus_config_ConsensusConfig">ConsensusConfig</a> {config});
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_consensus_config_on_new_epoch"></a>
+
+## Function `on_new_epoch`
+
+Only used in reconfigurations to apply the pending <code><a href="consensus_config.md#0x1_consensus_config_ConsensusConfig">ConsensusConfig</a></code>, if there is any.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="consensus_config.md#0x1_consensus_config_on_new_epoch">on_new_epoch</a>(framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="consensus_config.md#0x1_consensus_config_on_new_epoch">on_new_epoch</a>(framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>) <b>acquires</b> <a href="consensus_config.md#0x1_consensus_config_ConsensusConfig">ConsensusConfig</a> {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(framework);
+    <b>if</b> (<a href="config_buffer.md#0x1_config_buffer_does_exist">config_buffer::does_exist</a>&lt;<a href="consensus_config.md#0x1_consensus_config_ConsensusConfig">ConsensusConfig</a>&gt;()) {
+        <b>let</b> new_config = <a href="config_buffer.md#0x1_config_buffer_extract">config_buffer::extract</a>&lt;<a href="consensus_config.md#0x1_consensus_config_ConsensusConfig">ConsensusConfig</a>&gt;();
+        <b>if</b> (<b>exists</b>&lt;<a href="consensus_config.md#0x1_consensus_config_ConsensusConfig">ConsensusConfig</a>&gt;(@aptos_framework)) {
+            *<b>borrow_global_mut</b>&lt;<a href="consensus_config.md#0x1_consensus_config_ConsensusConfig">ConsensusConfig</a>&gt;(@aptos_framework) = new_config;
+        } <b>else</b> {
+            <b>move_to</b>(framework, new_config);
+        };
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_consensus_config_validator_txn_enabled"></a>
+
+## Function `validator_txn_enabled`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="consensus_config.md#0x1_consensus_config_validator_txn_enabled">validator_txn_enabled</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="consensus_config.md#0x1_consensus_config_validator_txn_enabled">validator_txn_enabled</a>(): bool <b>acquires</b> <a href="consensus_config.md#0x1_consensus_config_ConsensusConfig">ConsensusConfig</a> {
+    <b>let</b> config_bytes = <b>borrow_global</b>&lt;<a href="consensus_config.md#0x1_consensus_config_ConsensusConfig">ConsensusConfig</a>&gt;(@aptos_framework).config;
+    <a href="consensus_config.md#0x1_consensus_config_validator_txn_enabled_internal">validator_txn_enabled_internal</a>(config_bytes)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_consensus_config_validator_txn_enabled_internal"></a>
+
+## Function `validator_txn_enabled_internal`
+
+
+
+<pre><code><b>fun</b> <a href="consensus_config.md#0x1_consensus_config_validator_txn_enabled_internal">validator_txn_enabled_internal</a>(config_bytes: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="consensus_config.md#0x1_consensus_config_validator_txn_enabled_internal">validator_txn_enabled_internal</a>(config_bytes: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool;
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+
+
+<a id="high-level-req"></a>
+
+### High-level Requirements
+
+<table>
+<tr>
+<th>No.</th><th>Requirement</th><th>Criticality</th><th>Implementation</th><th>Enforcement</th>
+</tr>
+
+<tr>
+<td>1</td>
+<td>During genesis, the Aptos framework account should be assigned the consensus config resource.</td>
+<td>Medium</td>
+<td>The consensus_config::initialize function calls the assert_aptos_framework function to ensure that the signer is the aptos_framework and then assigns the ConsensusConfig resource to it.</td>
+<td>Formally verified via <a href="#high-level-req-1">initialize</a>.</td>
+</tr>
+
+<tr>
+<td>2</td>
+<td>Only aptos framework account is allowed to update the consensus configuration.</td>
+<td>Medium</td>
+<td>The consensus_config::set function ensures that the signer is aptos_framework.</td>
+<td>Formally verified via <a href="#high-level-req-2">set</a>.</td>
+</tr>
+
+<tr>
+<td>3</td>
+<td>Only a valid configuration can be used during initialization and update.</td>
+<td>Medium</td>
+<td>Both the initialize and set functions validate the config by ensuring its length to be greater than 0.</td>
+<td>Formally verified via <a href="#high-level-req-3.1">initialize</a> and <a href="#high-level-req-3.2">set</a>.</td>
+</tr>
+
+</table>
+
+
+
+
+<a id="module-level-spec"></a>
+
+### Module-level Specification
+
+
+<pre><code><b>pragma</b> verify = <b>true</b>;
+<b>pragma</b> aborts_if_is_strict;
+<b>invariant</b> [suspendable] <a href="chain_status.md#0x1_chain_status_is_operating">chain_status::is_operating</a>() ==&gt; <b>exists</b>&lt;<a href="consensus_config.md#0x1_consensus_config_ConsensusConfig">ConsensusConfig</a>&gt;(@aptos_framework);
+</code></pre>
+
+
+
+<a id="@Specification_1_initialize"></a>
+
+### Function `initialize`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="consensus_config.md#0x1_consensus_config_initialize">initialize</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, config: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+Ensure caller is admin.
+Aborts if StateStorageUsage already exists.
+
+
+<pre><code><b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(aptos_framework);
+// This enforces <a id="high-level-req-1" href="#high-level-req">high-level requirement 1</a>:
+<b>aborts_if</b> !<a href="system_addresses.md#0x1_system_addresses_is_aptos_framework_address">system_addresses::is_aptos_framework_address</a>(addr);
+<b>aborts_if</b> <b>exists</b>&lt;<a href="consensus_config.md#0x1_consensus_config_ConsensusConfig">ConsensusConfig</a>&gt;(@aptos_framework);
+// This enforces <a id="high-level-req-3.1" href="#high-level-req">high-level requirement 3</a>:
+<b>aborts_if</b> !(len(config) &gt; 0);
+<b>ensures</b> <b>global</b>&lt;<a href="consensus_config.md#0x1_consensus_config_ConsensusConfig">ConsensusConfig</a>&gt;(addr) == <a href="consensus_config.md#0x1_consensus_config_ConsensusConfig">ConsensusConfig</a> { config };
+</code></pre>
+
+
+
+<a id="@Specification_1_set"></a>
+
+### Function `set`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="consensus_config.md#0x1_consensus_config_set">set</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, config: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+Ensure the caller is admin and <code><a href="consensus_config.md#0x1_consensus_config_ConsensusConfig">ConsensusConfig</a></code> should be existed.
+When setting now time must be later than last_reconfiguration_time.
+
+
+<pre><code><b>pragma</b> verify_duration_estimate = 600;
+<b>include</b> <a href="transaction_fee.md#0x1_transaction_fee_RequiresCollectedFeesPerValueLeqBlockAptosSupply">transaction_fee::RequiresCollectedFeesPerValueLeqBlockAptosSupply</a>;
+<b>include</b> <a href="staking_config.md#0x1_staking_config_StakingRewardsConfigRequirement">staking_config::StakingRewardsConfigRequirement</a>;
+<b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>);
+// This enforces <a id="high-level-req-2" href="#high-level-req">high-level requirement 2</a>:
+<b>aborts_if</b> !<a href="system_addresses.md#0x1_system_addresses_is_aptos_framework_address">system_addresses::is_aptos_framework_address</a>(addr);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="consensus_config.md#0x1_consensus_config_ConsensusConfig">ConsensusConfig</a>&gt;(@aptos_framework);
+// This enforces <a id="high-level-req-3.2" href="#high-level-req">high-level requirement 3</a>:
+<b>aborts_if</b> !(len(config) &gt; 0);
+<b>requires</b> <a href="chain_status.md#0x1_chain_status_is_genesis">chain_status::is_genesis</a>();
+<b>requires</b> <a href="timestamp.md#0x1_timestamp_spec_now_microseconds">timestamp::spec_now_microseconds</a>() &gt;= <a href="reconfiguration.md#0x1_reconfiguration_last_reconfiguration_time">reconfiguration::last_reconfiguration_time</a>();
+<b>requires</b> <b>exists</b>&lt;<a href="stake.md#0x1_stake_ValidatorFees">stake::ValidatorFees</a>&gt;(@aptos_framework);
+<b>requires</b> <b>exists</b>&lt;CoinInfo&lt;AptosCoin&gt;&gt;(@aptos_framework);
+<b>ensures</b> <b>global</b>&lt;<a href="consensus_config.md#0x1_consensus_config_ConsensusConfig">ConsensusConfig</a>&gt;(@aptos_framework).config == config;
+</code></pre>
+
+
+
+<a id="@Specification_1_set_for_next_epoch"></a>
+
+### Function `set_for_next_epoch`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="consensus_config.md#0x1_consensus_config_set_for_next_epoch">set_for_next_epoch</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, config: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="config_buffer.md#0x1_config_buffer_SetForNextEpochAbortsIf">config_buffer::SetForNextEpochAbortsIf</a>;
+</code></pre>
+
+
+
+<a id="@Specification_1_on_new_epoch"></a>
+
+### Function `on_new_epoch`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="consensus_config.md#0x1_consensus_config_on_new_epoch">on_new_epoch</a>(framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>requires</b> @aptos_framework == std::signer::address_of(framework);
+<b>include</b> <a href="config_buffer.md#0x1_config_buffer_OnNewEpochRequirement">config_buffer::OnNewEpochRequirement</a>&lt;<a href="consensus_config.md#0x1_consensus_config_ConsensusConfig">ConsensusConfig</a>&gt;;
+<b>aborts_if</b> <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_validator_txn_enabled"></a>
+
+### Function `validator_txn_enabled`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="consensus_config.md#0x1_consensus_config_validator_txn_enabled">validator_txn_enabled</a>(): bool
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="consensus_config.md#0x1_consensus_config_ConsensusConfig">ConsensusConfig</a>&gt;(@aptos_framework);
+<b>ensures</b> [abstract] result == <a href="consensus_config.md#0x1_consensus_config_spec_validator_txn_enabled_internal">spec_validator_txn_enabled_internal</a>(<b>global</b>&lt;<a href="consensus_config.md#0x1_consensus_config_ConsensusConfig">ConsensusConfig</a>&gt;(@aptos_framework).config);
+</code></pre>
+
+
+
+<a id="@Specification_1_validator_txn_enabled_internal"></a>
+
+### Function `validator_txn_enabled_internal`
+
+
+<pre><code><b>fun</b> <a href="consensus_config.md#0x1_consensus_config_validator_txn_enabled_internal">validator_txn_enabled_internal</a>(config_bytes: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>ensures</b> [abstract] result == <a href="consensus_config.md#0x1_consensus_config_spec_validator_txn_enabled_internal">spec_validator_txn_enabled_internal</a>(config_bytes);
+</code></pre>
+
+
+
+
+<a id="0x1_consensus_config_spec_validator_txn_enabled_internal"></a>
+
+
+<pre><code><b>fun</b> <a href="consensus_config.md#0x1_consensus_config_spec_validator_txn_enabled_internal">spec_validator_txn_enabled_internal</a>(config_bytes: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool;
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/create_signer.md b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/create_signer.md
new file mode 100644
index 0000000000000..4f1bb93d57071
--- /dev/null
+++ b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/create_signer.md
@@ -0,0 +1,133 @@
+
+<a id="0x1_create_signer"></a>
+
+# Module `0x1::create_signer`
+
+Provides a common place for exporting <code><a href="create_signer.md#0x1_create_signer">create_signer</a></code> across the Aptos Framework.
+
+To use create_signer, add the module below, such that:
+<code><b>friend</b> aptos_framework::friend_wants_create_signer</code>
+where <code>friend_wants_create_signer</code> is the module that needs <code><a href="create_signer.md#0x1_create_signer">create_signer</a></code>.
+
+Note, that this is only available within the Aptos Framework.
+
+This exists to make auditing straight forward and to limit the need to depend
+on account to have access to this.
+
+
+-  [Function `create_signer`](#0x1_create_signer_create_signer)
+-  [Specification](#@Specification_0)
+    -  [High-level Requirements](#high-level-req)
+    -  [Module-level Specification](#module-level-spec)
+    -  [Function `create_signer`](#@Specification_0_create_signer)
+
+
+<pre><code></code></pre>
+
+
+
+<a id="0x1_create_signer_create_signer"></a>
+
+## Function `create_signer`
+
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="create_signer.md#0x1_create_signer">create_signer</a>(addr: <b>address</b>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>native</b> <b>fun</b> <a href="create_signer.md#0x1_create_signer">create_signer</a>(addr: <b>address</b>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>;
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_0"></a>
+
+## Specification
+
+
+
+
+<a id="high-level-req"></a>
+
+### High-level Requirements
+
+<table>
+<tr>
+<th>No.</th><th>Requirement</th><th>Criticality</th><th>Implementation</th><th>Enforcement</th>
+</tr>
+
+<tr>
+<td>1</td>
+<td>Obtaining a signer for an arbitrary account should only be available within the Aptos Framework.</td>
+<td>Critical</td>
+<td>The create_signer::create_signer function only allows friend modules to retrieve the signer for an arbitrarily address.</td>
+<td>Enforced through function visibility.</td>
+</tr>
+
+<tr>
+<td>2</td>
+<td>The account owner should have the ability to create a signer for their account.</td>
+<td>Medium</td>
+<td>Before an Account resource is created, a signer is created for the specified new_address, and later, the Account resource is assigned to this signer.</td>
+<td>Enforced by the <a href="https://github.com/aptos-labs/aptos-core/blob/main/third_party/move/move-vm/types/src/values/values_impl.rs#L1129">move vm</a>.</td>
+</tr>
+
+<tr>
+<td>3</td>
+<td>An account should only be able to create a signer for another account if that account has granted it signing capabilities.</td>
+<td>Critical</td>
+<td>The Account resource holds a signer_capability_offer field which allows the owner to share the signer capability with other accounts.</td>
+<td>Formally verified via <a href="account.md#high-level-spec-3">AccountContainsAddr</a>.</td>
+</tr>
+
+<tr>
+<td>4</td>
+<td>A signer should be returned for addresses that are not registered as accounts.</td>
+<td>Low</td>
+<td>The signer is just a struct that wraps an address, allows for non-accounts to have a signer.</td>
+<td>Formally verified via <a href="#0x1_create_signer_create_signer">create_signer</a>.</td>
+</tr>
+
+</table>
+
+
+
+
+<a id="module-level-spec"></a>
+
+### Module-level Specification
+
+
+<pre><code><b>pragma</b> verify = <b>true</b>;
+<b>pragma</b> aborts_if_is_strict;
+</code></pre>
+
+
+
+<a id="@Specification_0_create_signer"></a>
+
+### Function `create_signer`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="create_signer.md#0x1_create_signer">create_signer</a>(addr: <b>address</b>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>
+</code></pre>
+
+
+Convert address to singer and return.
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> [abstract] <b>false</b>;
+<b>ensures</b> [abstract] <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(result) == addr;
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/delegation_pool.md b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/delegation_pool.md
new file mode 100644
index 0000000000000..01029999242fe
--- /dev/null
+++ b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/delegation_pool.md
@@ -0,0 +1,5479 @@
+
+<a id="0x1_delegation_pool"></a>
+
+# Module `0x1::delegation_pool`
+
+
+Allow multiple delegators to participate in the same stake pool in order to collect the minimum
+stake required to join the validator set. Delegators are rewarded out of the validator rewards
+proportionally to their stake and provided the same stake-management API as the stake pool owner.
+
+The main accounting logic in the delegation pool contract handles the following:
+1. Tracks how much stake each delegator owns, privately deposited as well as earned.
+Accounting individual delegator stakes is achieved through the shares-based pool defined at
+<code>aptos_std::pool_u64</code>, hence delegators own shares rather than absolute stakes into the delegation pool.
+2. Tracks rewards earned by the stake pool, implicitly by the delegation one, in the meantime
+and distribute them accordingly.
+3. Tracks lockup cycles on the stake pool in order to separate inactive stake (not earning rewards)
+from pending_inactive stake (earning rewards) and allow its delegators to withdraw the former.
+4. Tracks how much commission fee has to be paid to the operator out of incoming rewards before
+distributing them to the internal pool_u64 pools.
+
+In order to distinguish between stakes in different states and route rewards accordingly,
+separate pool_u64 pools are used for individual stake states:
+1. one of <code>active</code> + <code>pending_active</code> stake
+2. one of <code>inactive</code> stake FOR each past observed lockup cycle (OLC) on the stake pool
+3. one of <code>pending_inactive</code> stake scheduled during this ongoing OLC
+
+As stake-state transitions and rewards are computed only at the stake pool level, the delegation pool
+gets outdated. To mitigate this, at any interaction with the delegation pool, a process of synchronization
+to the underlying stake pool is executed before the requested operation itself.
+
+At synchronization:
+- stake deviations between the two pools are actually the rewards produced in the meantime.
+- the commission fee is extracted from the rewards, the remaining stake is distributed to the internal
+pool_u64 pools and then the commission stake used to buy shares for operator.
+- if detecting that the lockup expired on the stake pool, the delegation pool will isolate its
+pending_inactive stake (now inactive) and create a new pool_u64 to host future pending_inactive stake
+scheduled this newly started lockup.
+Detecting a lockup expiration on the stake pool resumes to detecting new inactive stake.
+
+Accounting main invariants:
+- each stake-management operation (add/unlock/reactivate/withdraw) and operator change triggers
+the synchronization process before executing its own function.
+- each OLC maps to one or more real lockups on the stake pool, but not the opposite. Actually, only a real
+lockup with 'activity' (which inactivated some unlocking stake) triggers the creation of a new OLC.
+- unlocking and/or unlocked stake originating from different real lockups are never mixed together into
+the same pool_u64. This invalidates the accounting of which rewards belong to whom.
+- no delegator can have unlocking and/or unlocked stake (pending withdrawals) in different OLCs. This ensures
+delegators do not have to keep track of the OLCs when they unlocked. When creating a new pending withdrawal,
+the existing one is executed (withdrawn) if is already inactive.
+- <code>add_stake</code> fees are always refunded, but only after the epoch when they have been charged ends.
+- withdrawing pending_inactive stake (when validator had gone inactive before its lockup expired)
+does not inactivate any stake additional to the requested one to ensure OLC would not advance indefinitely.
+- the pending withdrawal exists at an OLC iff delegator owns some shares within the shares pool of that OLC.
+
+Example flow:
+<ol>
+<li>A node operator creates a delegation pool by calling
+<code>initialize_delegation_pool</code> and sets
+its commission fee to 0% (for simplicity). A stake pool is created with no initial stake and owned by
+a resource account controlled by the delegation pool.</li>
+<li>Delegator A adds 100 stake which is converted to 100 shares into the active pool_u64</li>
+<li>Operator joins the validator set as the stake pool has now the minimum stake</li>
+<li>The stake pool earned rewards and now has 200 active stake. A's active shares are worth 200 coins as
+the commission fee is 0%.</li>
+<li></li>
+<ol>
+<li>A requests <code>unlock</code> for 100 stake</li>
+<li>Synchronization detects 200 - 100 active rewards which are entirely (0% commission) added to the active pool.</li>
+<li>100 coins = (100 * 100) / 200 = 50 shares are redeemed from the active pool and exchanged for 100 shares
+into the pending_inactive one on A's behalf</li>
+</ol>
+<li>Delegator B adds 200 stake which is converted to (200 * 50) / 100 = 100 shares into the active pool</li>
+<li>The stake pool earned rewards and now has 600 active and 200 pending_inactive stake.</li>
+<li></li>
+<ol>
+<li>A requests <code>reactivate_stake</code> for 100 stake</li>
+<li>
+Synchronization detects 600 - 300 active and 200 - 100 pending_inactive rewards which are both entirely
+distributed to their corresponding pools
+</li>
+<li>
+100 coins = (100 * 100) / 200 = 50 shares are redeemed from the pending_inactive pool and exchanged for
+(100 * 150) / 600 = 25 shares into the active one on A's behalf
+</li>
+</ol>
+<li>The lockup expires on the stake pool, inactivating the entire pending_inactive stake</li>
+<li></li>
+<ol>
+<li>B requests <code>unlock</code> for 100 stake</li>
+<li>
+Synchronization detects no active or pending_inactive rewards, but 0 -> 100 inactive stake on the stake pool,
+so it advances the observed lockup cycle and creates a pool_u64 for the new lockup, hence allowing previous
+pending_inactive shares to be redeemed</li>
+<li>
+100 coins = (100 * 175) / 700 = 25 shares are redeemed from the active pool and exchanged for 100 shares
+into the new pending_inactive one on B's behalf
+</li>
+</ol>
+<li>The stake pool earned rewards and now has some pending_inactive rewards.</li>
+<li></li>
+<ol>
+<li>A requests <code>withdraw</code> for its entire inactive stake</li>
+<li>
+Synchronization detects no new inactive stake, but some pending_inactive rewards which are distributed
+to the (2nd) pending_inactive pool
+</li>
+<li>
+A's 50 shares = (50 * 100) / 50 = 100 coins are redeemed from the (1st) inactive pool and 100 stake is
+transferred to A
+</li>
+</ol>
+</ol>
+
+
+
+-  [Resource `DelegationPoolOwnership`](#0x1_delegation_pool_DelegationPoolOwnership)
+-  [Struct `ObservedLockupCycle`](#0x1_delegation_pool_ObservedLockupCycle)
+-  [Resource `DelegationPool`](#0x1_delegation_pool_DelegationPool)
+-  [Struct `VotingRecordKey`](#0x1_delegation_pool_VotingRecordKey)
+-  [Struct `VoteDelegation`](#0x1_delegation_pool_VoteDelegation)
+-  [Struct `DelegatedVotes`](#0x1_delegation_pool_DelegatedVotes)
+-  [Resource `GovernanceRecords`](#0x1_delegation_pool_GovernanceRecords)
+-  [Resource `BeneficiaryForOperator`](#0x1_delegation_pool_BeneficiaryForOperator)
+-  [Resource `NextCommissionPercentage`](#0x1_delegation_pool_NextCommissionPercentage)
+-  [Resource `DelegationPoolAllowlisting`](#0x1_delegation_pool_DelegationPoolAllowlisting)
+-  [Struct `AddStake`](#0x1_delegation_pool_AddStake)
+-  [Struct `AddStakeEvent`](#0x1_delegation_pool_AddStakeEvent)
+-  [Struct `ReactivateStake`](#0x1_delegation_pool_ReactivateStake)
+-  [Struct `ReactivateStakeEvent`](#0x1_delegation_pool_ReactivateStakeEvent)
+-  [Struct `UnlockStake`](#0x1_delegation_pool_UnlockStake)
+-  [Struct `UnlockStakeEvent`](#0x1_delegation_pool_UnlockStakeEvent)
+-  [Struct `WithdrawStake`](#0x1_delegation_pool_WithdrawStake)
+-  [Struct `WithdrawStakeEvent`](#0x1_delegation_pool_WithdrawStakeEvent)
+-  [Struct `DistributeCommissionEvent`](#0x1_delegation_pool_DistributeCommissionEvent)
+-  [Struct `DistributeCommission`](#0x1_delegation_pool_DistributeCommission)
+-  [Struct `Vote`](#0x1_delegation_pool_Vote)
+-  [Struct `VoteEvent`](#0x1_delegation_pool_VoteEvent)
+-  [Struct `CreateProposal`](#0x1_delegation_pool_CreateProposal)
+-  [Struct `CreateProposalEvent`](#0x1_delegation_pool_CreateProposalEvent)
+-  [Struct `DelegateVotingPower`](#0x1_delegation_pool_DelegateVotingPower)
+-  [Struct `DelegateVotingPowerEvent`](#0x1_delegation_pool_DelegateVotingPowerEvent)
+-  [Struct `SetBeneficiaryForOperator`](#0x1_delegation_pool_SetBeneficiaryForOperator)
+-  [Struct `CommissionPercentageChange`](#0x1_delegation_pool_CommissionPercentageChange)
+-  [Struct `EnableDelegatorsAllowlisting`](#0x1_delegation_pool_EnableDelegatorsAllowlisting)
+-  [Struct `DisableDelegatorsAllowlisting`](#0x1_delegation_pool_DisableDelegatorsAllowlisting)
+-  [Struct `AllowlistDelegator`](#0x1_delegation_pool_AllowlistDelegator)
+-  [Struct `RemoveDelegatorFromAllowlist`](#0x1_delegation_pool_RemoveDelegatorFromAllowlist)
+-  [Struct `EvictDelegator`](#0x1_delegation_pool_EvictDelegator)
+-  [Constants](#@Constants_0)
+-  [Function `owner_cap_exists`](#0x1_delegation_pool_owner_cap_exists)
+-  [Function `get_owned_pool_address`](#0x1_delegation_pool_get_owned_pool_address)
+-  [Function `delegation_pool_exists`](#0x1_delegation_pool_delegation_pool_exists)
+-  [Function `partial_governance_voting_enabled`](#0x1_delegation_pool_partial_governance_voting_enabled)
+-  [Function `observed_lockup_cycle`](#0x1_delegation_pool_observed_lockup_cycle)
+-  [Function `is_next_commission_percentage_effective`](#0x1_delegation_pool_is_next_commission_percentage_effective)
+-  [Function `operator_commission_percentage`](#0x1_delegation_pool_operator_commission_percentage)
+-  [Function `operator_commission_percentage_next_lockup_cycle`](#0x1_delegation_pool_operator_commission_percentage_next_lockup_cycle)
+-  [Function `shareholders_count_active_pool`](#0x1_delegation_pool_shareholders_count_active_pool)
+-  [Function `get_delegation_pool_stake`](#0x1_delegation_pool_get_delegation_pool_stake)
+-  [Function `get_pending_withdrawal`](#0x1_delegation_pool_get_pending_withdrawal)
+-  [Function `get_stake`](#0x1_delegation_pool_get_stake)
+-  [Function `get_add_stake_fee`](#0x1_delegation_pool_get_add_stake_fee)
+-  [Function `can_withdraw_pending_inactive`](#0x1_delegation_pool_can_withdraw_pending_inactive)
+-  [Function `calculate_and_update_voter_total_voting_power`](#0x1_delegation_pool_calculate_and_update_voter_total_voting_power)
+-  [Function `calculate_and_update_remaining_voting_power`](#0x1_delegation_pool_calculate_and_update_remaining_voting_power)
+-  [Function `calculate_and_update_delegator_voter`](#0x1_delegation_pool_calculate_and_update_delegator_voter)
+-  [Function `calculate_and_update_voting_delegation`](#0x1_delegation_pool_calculate_and_update_voting_delegation)
+-  [Function `get_expected_stake_pool_address`](#0x1_delegation_pool_get_expected_stake_pool_address)
+-  [Function `min_remaining_secs_for_commission_change`](#0x1_delegation_pool_min_remaining_secs_for_commission_change)
+-  [Function `allowlisting_enabled`](#0x1_delegation_pool_allowlisting_enabled)
+-  [Function `delegator_allowlisted`](#0x1_delegation_pool_delegator_allowlisted)
+-  [Function `get_delegators_allowlist`](#0x1_delegation_pool_get_delegators_allowlist)
+-  [Function `initialize_delegation_pool`](#0x1_delegation_pool_initialize_delegation_pool)
+-  [Function `beneficiary_for_operator`](#0x1_delegation_pool_beneficiary_for_operator)
+-  [Function `enable_partial_governance_voting`](#0x1_delegation_pool_enable_partial_governance_voting)
+-  [Function `vote`](#0x1_delegation_pool_vote)
+-  [Function `create_proposal`](#0x1_delegation_pool_create_proposal)
+-  [Function `assert_owner_cap_exists`](#0x1_delegation_pool_assert_owner_cap_exists)
+-  [Function `assert_delegation_pool_exists`](#0x1_delegation_pool_assert_delegation_pool_exists)
+-  [Function `assert_min_active_balance`](#0x1_delegation_pool_assert_min_active_balance)
+-  [Function `assert_min_pending_inactive_balance`](#0x1_delegation_pool_assert_min_pending_inactive_balance)
+-  [Function `assert_partial_governance_voting_enabled`](#0x1_delegation_pool_assert_partial_governance_voting_enabled)
+-  [Function `assert_allowlisting_enabled`](#0x1_delegation_pool_assert_allowlisting_enabled)
+-  [Function `assert_delegator_allowlisted`](#0x1_delegation_pool_assert_delegator_allowlisted)
+-  [Function `coins_to_redeem_to_ensure_min_stake`](#0x1_delegation_pool_coins_to_redeem_to_ensure_min_stake)
+-  [Function `coins_to_transfer_to_ensure_min_stake`](#0x1_delegation_pool_coins_to_transfer_to_ensure_min_stake)
+-  [Function `retrieve_stake_pool_owner`](#0x1_delegation_pool_retrieve_stake_pool_owner)
+-  [Function `get_pool_address`](#0x1_delegation_pool_get_pool_address)
+-  [Function `get_delegator_active_shares`](#0x1_delegation_pool_get_delegator_active_shares)
+-  [Function `get_delegator_pending_inactive_shares`](#0x1_delegation_pool_get_delegator_pending_inactive_shares)
+-  [Function `get_used_voting_power`](#0x1_delegation_pool_get_used_voting_power)
+-  [Function `create_resource_account_seed`](#0x1_delegation_pool_create_resource_account_seed)
+-  [Function `borrow_mut_used_voting_power`](#0x1_delegation_pool_borrow_mut_used_voting_power)
+-  [Function `update_and_borrow_mut_delegator_vote_delegation`](#0x1_delegation_pool_update_and_borrow_mut_delegator_vote_delegation)
+-  [Function `update_and_borrow_mut_delegated_votes`](#0x1_delegation_pool_update_and_borrow_mut_delegated_votes)
+-  [Function `olc_with_index`](#0x1_delegation_pool_olc_with_index)
+-  [Function `calculate_total_voting_power`](#0x1_delegation_pool_calculate_total_voting_power)
+-  [Function `calculate_and_update_delegator_voter_internal`](#0x1_delegation_pool_calculate_and_update_delegator_voter_internal)
+-  [Function `calculate_and_update_delegated_votes`](#0x1_delegation_pool_calculate_and_update_delegated_votes)
+-  [Function `borrow_mut_delegators_allowlist`](#0x1_delegation_pool_borrow_mut_delegators_allowlist)
+-  [Function `set_operator`](#0x1_delegation_pool_set_operator)
+-  [Function `set_beneficiary_for_operator`](#0x1_delegation_pool_set_beneficiary_for_operator)
+-  [Function `update_commission_percentage`](#0x1_delegation_pool_update_commission_percentage)
+-  [Function `set_delegated_voter`](#0x1_delegation_pool_set_delegated_voter)
+-  [Function `delegate_voting_power`](#0x1_delegation_pool_delegate_voting_power)
+-  [Function `enable_delegators_allowlisting`](#0x1_delegation_pool_enable_delegators_allowlisting)
+-  [Function `disable_delegators_allowlisting`](#0x1_delegation_pool_disable_delegators_allowlisting)
+-  [Function `allowlist_delegator`](#0x1_delegation_pool_allowlist_delegator)
+-  [Function `remove_delegator_from_allowlist`](#0x1_delegation_pool_remove_delegator_from_allowlist)
+-  [Function `evict_delegator`](#0x1_delegation_pool_evict_delegator)
+-  [Function `add_stake`](#0x1_delegation_pool_add_stake)
+-  [Function `unlock`](#0x1_delegation_pool_unlock)
+-  [Function `unlock_internal`](#0x1_delegation_pool_unlock_internal)
+-  [Function `reactivate_stake`](#0x1_delegation_pool_reactivate_stake)
+-  [Function `withdraw`](#0x1_delegation_pool_withdraw)
+-  [Function `withdraw_internal`](#0x1_delegation_pool_withdraw_internal)
+-  [Function `pending_withdrawal_exists`](#0x1_delegation_pool_pending_withdrawal_exists)
+-  [Function `pending_inactive_shares_pool_mut`](#0x1_delegation_pool_pending_inactive_shares_pool_mut)
+-  [Function `pending_inactive_shares_pool`](#0x1_delegation_pool_pending_inactive_shares_pool)
+-  [Function `execute_pending_withdrawal`](#0x1_delegation_pool_execute_pending_withdrawal)
+-  [Function `buy_in_active_shares`](#0x1_delegation_pool_buy_in_active_shares)
+-  [Function `buy_in_pending_inactive_shares`](#0x1_delegation_pool_buy_in_pending_inactive_shares)
+-  [Function `amount_to_shares_to_redeem`](#0x1_delegation_pool_amount_to_shares_to_redeem)
+-  [Function `redeem_active_shares`](#0x1_delegation_pool_redeem_active_shares)
+-  [Function `redeem_inactive_shares`](#0x1_delegation_pool_redeem_inactive_shares)
+-  [Function `calculate_stake_pool_drift`](#0x1_delegation_pool_calculate_stake_pool_drift)
+-  [Function `synchronize_delegation_pool`](#0x1_delegation_pool_synchronize_delegation_pool)
+-  [Function `assert_and_update_proposal_used_voting_power`](#0x1_delegation_pool_assert_and_update_proposal_used_voting_power)
+-  [Function `update_governance_records_for_buy_in_active_shares`](#0x1_delegation_pool_update_governance_records_for_buy_in_active_shares)
+-  [Function `update_governance_records_for_buy_in_pending_inactive_shares`](#0x1_delegation_pool_update_governance_records_for_buy_in_pending_inactive_shares)
+-  [Function `update_governanace_records_for_redeem_active_shares`](#0x1_delegation_pool_update_governanace_records_for_redeem_active_shares)
+-  [Function `update_governanace_records_for_redeem_pending_inactive_shares`](#0x1_delegation_pool_update_governanace_records_for_redeem_pending_inactive_shares)
+-  [Function `multiply_then_divide`](#0x1_delegation_pool_multiply_then_divide)
+-  [Specification](#@Specification_1)
+    -  [High-level Requirements](#high-level-req)
+    -  [Module-level Specification](#module-level-spec)
+
+
+<pre><code><b>use</b> <a href="account.md#0x1_account">0x1::account</a>;
+<b>use</b> <a href="aptos_account.md#0x1_aptos_account">0x1::aptos_account</a>;
+<b>use</b> <a href="aptos_coin.md#0x1_aptos_coin">0x1::aptos_coin</a>;
+<b>use</b> <a href="aptos_governance.md#0x1_aptos_governance">0x1::aptos_governance</a>;
+<b>use</b> <a href="coin.md#0x1_coin">0x1::coin</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="event.md#0x1_event">0x1::event</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features">0x1::features</a>;
+<b>use</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64_unbound.md#0x1_pool_u64_unbound">0x1::pool_u64_unbound</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">0x1::signer</a>;
+<b>use</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/smart_table.md#0x1_smart_table">0x1::smart_table</a>;
+<b>use</b> <a href="stake.md#0x1_stake">0x1::stake</a>;
+<b>use</b> <a href="staking_config.md#0x1_staking_config">0x1::staking_config</a>;
+<b>use</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table">0x1::table</a>;
+<b>use</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table_with_length.md#0x1_table_with_length">0x1::table_with_length</a>;
+<b>use</b> <a href="timestamp.md#0x1_timestamp">0x1::timestamp</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">0x1::vector</a>;
+</code></pre>
+
+
+
+<a id="0x1_delegation_pool_DelegationPoolOwnership"></a>
+
+## Resource `DelegationPoolOwnership`
+
+Capability that represents ownership over privileged operations on the underlying stake pool.
+
+
+<pre><code><b>struct</b> <a href="delegation_pool.md#0x1_delegation_pool_DelegationPoolOwnership">DelegationPoolOwnership</a> <b>has</b> store, key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>pool_address: <b>address</b></code>
+</dt>
+<dd>
+ equal to address of the resource account owning the stake pool
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_delegation_pool_ObservedLockupCycle"></a>
+
+## Struct `ObservedLockupCycle`
+
+
+
+<pre><code><b>struct</b> <a href="delegation_pool.md#0x1_delegation_pool_ObservedLockupCycle">ObservedLockupCycle</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>index: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_delegation_pool_DelegationPool"></a>
+
+## Resource `DelegationPool`
+
+
+
+<pre><code><b>struct</b> <a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>active_shares: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">pool_u64_unbound::Pool</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>observed_lockup_cycle: <a href="delegation_pool.md#0x1_delegation_pool_ObservedLockupCycle">delegation_pool::ObservedLockupCycle</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>inactive_shares: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_Table">table::Table</a>&lt;<a href="delegation_pool.md#0x1_delegation_pool_ObservedLockupCycle">delegation_pool::ObservedLockupCycle</a>, <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">pool_u64_unbound::Pool</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>pending_withdrawals: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_Table">table::Table</a>&lt;<b>address</b>, <a href="delegation_pool.md#0x1_delegation_pool_ObservedLockupCycle">delegation_pool::ObservedLockupCycle</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>stake_pool_signer_cap: <a href="account.md#0x1_account_SignerCapability">account::SignerCapability</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>total_coins_inactive: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>operator_commission_percentage: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>add_stake_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="delegation_pool.md#0x1_delegation_pool_AddStakeEvent">delegation_pool::AddStakeEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>reactivate_stake_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="delegation_pool.md#0x1_delegation_pool_ReactivateStakeEvent">delegation_pool::ReactivateStakeEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>unlock_stake_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="delegation_pool.md#0x1_delegation_pool_UnlockStakeEvent">delegation_pool::UnlockStakeEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>withdraw_stake_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="delegation_pool.md#0x1_delegation_pool_WithdrawStakeEvent">delegation_pool::WithdrawStakeEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>distribute_commission_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="delegation_pool.md#0x1_delegation_pool_DistributeCommissionEvent">delegation_pool::DistributeCommissionEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_delegation_pool_VotingRecordKey"></a>
+
+## Struct `VotingRecordKey`
+
+
+
+<pre><code><b>struct</b> <a href="delegation_pool.md#0x1_delegation_pool_VotingRecordKey">VotingRecordKey</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>voter: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>proposal_id: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_delegation_pool_VoteDelegation"></a>
+
+## Struct `VoteDelegation`
+
+Track delegated voter of each delegator.
+
+
+<pre><code><b>struct</b> <a href="delegation_pool.md#0x1_delegation_pool_VoteDelegation">VoteDelegation</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>voter: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>pending_voter: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>last_locked_until_secs: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_delegation_pool_DelegatedVotes"></a>
+
+## Struct `DelegatedVotes`
+
+Track total voting power of each voter.
+
+
+<pre><code><b>struct</b> <a href="delegation_pool.md#0x1_delegation_pool_DelegatedVotes">DelegatedVotes</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>active_shares: u128</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>pending_inactive_shares: u128</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>active_shares_next_lockup: u128</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>last_locked_until_secs: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_delegation_pool_GovernanceRecords"></a>
+
+## Resource `GovernanceRecords`
+
+Track governance information of a delegation(e.g. voter delegation/voting power calculation).
+This struct should be stored in the delegation pool resource account.
+
+
+<pre><code><b>struct</b> <a href="delegation_pool.md#0x1_delegation_pool_GovernanceRecords">GovernanceRecords</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>votes: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/smart_table.md#0x1_smart_table_SmartTable">smart_table::SmartTable</a>&lt;<a href="delegation_pool.md#0x1_delegation_pool_VotingRecordKey">delegation_pool::VotingRecordKey</a>, u64&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>votes_per_proposal: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/smart_table.md#0x1_smart_table_SmartTable">smart_table::SmartTable</a>&lt;u64, u64&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>vote_delegation: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/smart_table.md#0x1_smart_table_SmartTable">smart_table::SmartTable</a>&lt;<b>address</b>, <a href="delegation_pool.md#0x1_delegation_pool_VoteDelegation">delegation_pool::VoteDelegation</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>delegated_votes: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/smart_table.md#0x1_smart_table_SmartTable">smart_table::SmartTable</a>&lt;<b>address</b>, <a href="delegation_pool.md#0x1_delegation_pool_DelegatedVotes">delegation_pool::DelegatedVotes</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>vote_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="delegation_pool.md#0x1_delegation_pool_VoteEvent">delegation_pool::VoteEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>create_proposal_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="delegation_pool.md#0x1_delegation_pool_CreateProposalEvent">delegation_pool::CreateProposalEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>delegate_voting_power_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="delegation_pool.md#0x1_delegation_pool_DelegateVotingPowerEvent">delegation_pool::DelegateVotingPowerEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_delegation_pool_BeneficiaryForOperator"></a>
+
+## Resource `BeneficiaryForOperator`
+
+
+
+<pre><code><b>struct</b> <a href="delegation_pool.md#0x1_delegation_pool_BeneficiaryForOperator">BeneficiaryForOperator</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>beneficiary_for_operator: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_delegation_pool_NextCommissionPercentage"></a>
+
+## Resource `NextCommissionPercentage`
+
+
+
+<pre><code><b>struct</b> <a href="delegation_pool.md#0x1_delegation_pool_NextCommissionPercentage">NextCommissionPercentage</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>commission_percentage_next_lockup_cycle: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>effective_after_secs: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_delegation_pool_DelegationPoolAllowlisting"></a>
+
+## Resource `DelegationPoolAllowlisting`
+
+Tracks a delegation pool's allowlist of delegators.
+If allowlisting is enabled, existing delegators are not implicitly allowlisted and they can be individually
+evicted later by the pool owner.
+
+
+<pre><code><b>struct</b> <a href="delegation_pool.md#0x1_delegation_pool_DelegationPoolAllowlisting">DelegationPoolAllowlisting</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>allowlist: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/smart_table.md#0x1_smart_table_SmartTable">smart_table::SmartTable</a>&lt;<b>address</b>, bool&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_delegation_pool_AddStake"></a>
+
+## Struct `AddStake`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="delegation_pool.md#0x1_delegation_pool_AddStake">AddStake</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>delegator_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>amount_added: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>add_stake_fee: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_delegation_pool_AddStakeEvent"></a>
+
+## Struct `AddStakeEvent`
+
+
+
+<pre><code><b>struct</b> <a href="delegation_pool.md#0x1_delegation_pool_AddStakeEvent">AddStakeEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>delegator_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>amount_added: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>add_stake_fee: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_delegation_pool_ReactivateStake"></a>
+
+## Struct `ReactivateStake`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="delegation_pool.md#0x1_delegation_pool_ReactivateStake">ReactivateStake</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>delegator_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>amount_reactivated: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_delegation_pool_ReactivateStakeEvent"></a>
+
+## Struct `ReactivateStakeEvent`
+
+
+
+<pre><code><b>struct</b> <a href="delegation_pool.md#0x1_delegation_pool_ReactivateStakeEvent">ReactivateStakeEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>delegator_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>amount_reactivated: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_delegation_pool_UnlockStake"></a>
+
+## Struct `UnlockStake`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="delegation_pool.md#0x1_delegation_pool_UnlockStake">UnlockStake</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>delegator_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>amount_unlocked: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_delegation_pool_UnlockStakeEvent"></a>
+
+## Struct `UnlockStakeEvent`
+
+
+
+<pre><code><b>struct</b> <a href="delegation_pool.md#0x1_delegation_pool_UnlockStakeEvent">UnlockStakeEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>delegator_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>amount_unlocked: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_delegation_pool_WithdrawStake"></a>
+
+## Struct `WithdrawStake`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="delegation_pool.md#0x1_delegation_pool_WithdrawStake">WithdrawStake</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>delegator_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>amount_withdrawn: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_delegation_pool_WithdrawStakeEvent"></a>
+
+## Struct `WithdrawStakeEvent`
+
+
+
+<pre><code><b>struct</b> <a href="delegation_pool.md#0x1_delegation_pool_WithdrawStakeEvent">WithdrawStakeEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>delegator_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>amount_withdrawn: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_delegation_pool_DistributeCommissionEvent"></a>
+
+## Struct `DistributeCommissionEvent`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="delegation_pool.md#0x1_delegation_pool_DistributeCommissionEvent">DistributeCommissionEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>operator: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>commission_active: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>commission_pending_inactive: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_delegation_pool_DistributeCommission"></a>
+
+## Struct `DistributeCommission`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="delegation_pool.md#0x1_delegation_pool_DistributeCommission">DistributeCommission</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>operator: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>beneficiary: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>commission_active: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>commission_pending_inactive: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_delegation_pool_Vote"></a>
+
+## Struct `Vote`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="delegation_pool.md#0x1_delegation_pool_Vote">Vote</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>voter: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>proposal_id: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code><a href="delegation_pool.md#0x1_delegation_pool">delegation_pool</a>: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>num_votes: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>should_pass: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_delegation_pool_VoteEvent"></a>
+
+## Struct `VoteEvent`
+
+
+
+<pre><code><b>struct</b> <a href="delegation_pool.md#0x1_delegation_pool_VoteEvent">VoteEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>voter: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>proposal_id: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code><a href="delegation_pool.md#0x1_delegation_pool">delegation_pool</a>: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>num_votes: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>should_pass: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_delegation_pool_CreateProposal"></a>
+
+## Struct `CreateProposal`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="delegation_pool.md#0x1_delegation_pool_CreateProposal">CreateProposal</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>proposal_id: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>voter: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code><a href="delegation_pool.md#0x1_delegation_pool">delegation_pool</a>: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_delegation_pool_CreateProposalEvent"></a>
+
+## Struct `CreateProposalEvent`
+
+
+
+<pre><code><b>struct</b> <a href="delegation_pool.md#0x1_delegation_pool_CreateProposalEvent">CreateProposalEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>proposal_id: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>voter: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code><a href="delegation_pool.md#0x1_delegation_pool">delegation_pool</a>: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_delegation_pool_DelegateVotingPower"></a>
+
+## Struct `DelegateVotingPower`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="delegation_pool.md#0x1_delegation_pool_DelegateVotingPower">DelegateVotingPower</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>delegator: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>voter: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_delegation_pool_DelegateVotingPowerEvent"></a>
+
+## Struct `DelegateVotingPowerEvent`
+
+
+
+<pre><code><b>struct</b> <a href="delegation_pool.md#0x1_delegation_pool_DelegateVotingPowerEvent">DelegateVotingPowerEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>delegator: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>voter: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_delegation_pool_SetBeneficiaryForOperator"></a>
+
+## Struct `SetBeneficiaryForOperator`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="delegation_pool.md#0x1_delegation_pool_SetBeneficiaryForOperator">SetBeneficiaryForOperator</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>operator: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>old_beneficiary: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>new_beneficiary: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_delegation_pool_CommissionPercentageChange"></a>
+
+## Struct `CommissionPercentageChange`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="delegation_pool.md#0x1_delegation_pool_CommissionPercentageChange">CommissionPercentageChange</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>owner: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>commission_percentage_next_lockup_cycle: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_delegation_pool_EnableDelegatorsAllowlisting"></a>
+
+## Struct `EnableDelegatorsAllowlisting`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="delegation_pool.md#0x1_delegation_pool_EnableDelegatorsAllowlisting">EnableDelegatorsAllowlisting</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_delegation_pool_DisableDelegatorsAllowlisting"></a>
+
+## Struct `DisableDelegatorsAllowlisting`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="delegation_pool.md#0x1_delegation_pool_DisableDelegatorsAllowlisting">DisableDelegatorsAllowlisting</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_delegation_pool_AllowlistDelegator"></a>
+
+## Struct `AllowlistDelegator`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="delegation_pool.md#0x1_delegation_pool_AllowlistDelegator">AllowlistDelegator</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>delegator_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_delegation_pool_RemoveDelegatorFromAllowlist"></a>
+
+## Struct `RemoveDelegatorFromAllowlist`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="delegation_pool.md#0x1_delegation_pool_RemoveDelegatorFromAllowlist">RemoveDelegatorFromAllowlist</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>delegator_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_delegation_pool_EvictDelegator"></a>
+
+## Struct `EvictDelegator`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="delegation_pool.md#0x1_delegation_pool_EvictDelegator">EvictDelegator</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>delegator_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_delegation_pool_MAX_U64"></a>
+
+
+
+<pre><code><b>const</b> <a href="delegation_pool.md#0x1_delegation_pool_MAX_U64">MAX_U64</a>: u64 = 18446744073709551615;
+</code></pre>
+
+
+
+<a id="0x1_delegation_pool_EDEPRECATED_FUNCTION"></a>
+
+Function is deprecated.
+
+
+<pre><code><b>const</b> <a href="delegation_pool.md#0x1_delegation_pool_EDEPRECATED_FUNCTION">EDEPRECATED_FUNCTION</a>: u64 = 12;
+</code></pre>
+
+
+
+<a id="0x1_delegation_pool_EDISABLED_FUNCTION"></a>
+
+The function is disabled or hasn't been enabled.
+
+
+<pre><code><b>const</b> <a href="delegation_pool.md#0x1_delegation_pool_EDISABLED_FUNCTION">EDISABLED_FUNCTION</a>: u64 = 13;
+</code></pre>
+
+
+
+<a id="0x1_delegation_pool_ENOT_OPERATOR"></a>
+
+The account is not the operator of the stake pool.
+
+
+<pre><code><b>const</b> <a href="delegation_pool.md#0x1_delegation_pool_ENOT_OPERATOR">ENOT_OPERATOR</a>: u64 = 18;
+</code></pre>
+
+
+
+<a id="0x1_delegation_pool_EOWNER_CAP_ALREADY_EXISTS"></a>
+
+Account is already owning a delegation pool.
+
+
+<pre><code><b>const</b> <a href="delegation_pool.md#0x1_delegation_pool_EOWNER_CAP_ALREADY_EXISTS">EOWNER_CAP_ALREADY_EXISTS</a>: u64 = 2;
+</code></pre>
+
+
+
+<a id="0x1_delegation_pool_EOWNER_CAP_NOT_FOUND"></a>
+
+Delegation pool owner capability does not exist at the provided account.
+
+
+<pre><code><b>const</b> <a href="delegation_pool.md#0x1_delegation_pool_EOWNER_CAP_NOT_FOUND">EOWNER_CAP_NOT_FOUND</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_delegation_pool_VALIDATOR_STATUS_INACTIVE"></a>
+
+
+
+<pre><code><b>const</b> <a href="delegation_pool.md#0x1_delegation_pool_VALIDATOR_STATUS_INACTIVE">VALIDATOR_STATUS_INACTIVE</a>: u64 = 4;
+</code></pre>
+
+
+
+<a id="0x1_delegation_pool_EINSUFFICIENT_PROPOSER_STAKE"></a>
+
+The voter does not have sufficient stake to create a proposal.
+
+
+<pre><code><b>const</b> <a href="delegation_pool.md#0x1_delegation_pool_EINSUFFICIENT_PROPOSER_STAKE">EINSUFFICIENT_PROPOSER_STAKE</a>: u64 = 15;
+</code></pre>
+
+
+
+<a id="0x1_delegation_pool_ENO_VOTING_POWER"></a>
+
+The voter does not have any voting power on this proposal.
+
+
+<pre><code><b>const</b> <a href="delegation_pool.md#0x1_delegation_pool_ENO_VOTING_POWER">ENO_VOTING_POWER</a>: u64 = 16;
+</code></pre>
+
+
+
+<a id="0x1_delegation_pool_EALREADY_VOTED_BEFORE_ENABLE_PARTIAL_VOTING"></a>
+
+The stake pool has already voted on the proposal before enabling partial governance voting on this delegation pool.
+
+
+<pre><code><b>const</b> <a href="delegation_pool.md#0x1_delegation_pool_EALREADY_VOTED_BEFORE_ENABLE_PARTIAL_VOTING">EALREADY_VOTED_BEFORE_ENABLE_PARTIAL_VOTING</a>: u64 = 17;
+</code></pre>
+
+
+
+<a id="0x1_delegation_pool_ECANNOT_EVICT_ALLOWLISTED_DELEGATOR"></a>
+
+Cannot evict an allowlisted delegator, should remove them from the allowlist first.
+
+
+<pre><code><b>const</b> <a href="delegation_pool.md#0x1_delegation_pool_ECANNOT_EVICT_ALLOWLISTED_DELEGATOR">ECANNOT_EVICT_ALLOWLISTED_DELEGATOR</a>: u64 = 26;
+</code></pre>
+
+
+
+<a id="0x1_delegation_pool_ECANNOT_UNLOCK_NULL_SHAREHOLDER"></a>
+
+Cannot unlock the accumulated active stake of NULL_SHAREHOLDER(0x0).
+
+
+<pre><code><b>const</b> <a href="delegation_pool.md#0x1_delegation_pool_ECANNOT_UNLOCK_NULL_SHAREHOLDER">ECANNOT_UNLOCK_NULL_SHAREHOLDER</a>: u64 = 27;
+</code></pre>
+
+
+
+<a id="0x1_delegation_pool_ECOMMISSION_RATE_CHANGE_NOT_SUPPORTED"></a>
+
+Changing operator commission rate in delegation pool is not supported.
+
+
+<pre><code><b>const</b> <a href="delegation_pool.md#0x1_delegation_pool_ECOMMISSION_RATE_CHANGE_NOT_SUPPORTED">ECOMMISSION_RATE_CHANGE_NOT_SUPPORTED</a>: u64 = 22;
+</code></pre>
+
+
+
+<a id="0x1_delegation_pool_EDELEGATION_POOLS_DISABLED"></a>
+
+Creating delegation pools is not enabled yet.
+
+
+<pre><code><b>const</b> <a href="delegation_pool.md#0x1_delegation_pool_EDELEGATION_POOLS_DISABLED">EDELEGATION_POOLS_DISABLED</a>: u64 = 10;
+</code></pre>
+
+
+
+<a id="0x1_delegation_pool_EDELEGATION_POOL_DOES_NOT_EXIST"></a>
+
+Delegation pool does not exist at the provided pool address.
+
+
+<pre><code><b>const</b> <a href="delegation_pool.md#0x1_delegation_pool_EDELEGATION_POOL_DOES_NOT_EXIST">EDELEGATION_POOL_DOES_NOT_EXIST</a>: u64 = 3;
+</code></pre>
+
+
+
+<a id="0x1_delegation_pool_EDELEGATORS_ALLOWLISTING_NOT_ENABLED"></a>
+
+Delegators allowlisting should be enabled to perform this operation.
+
+
+<pre><code><b>const</b> <a href="delegation_pool.md#0x1_delegation_pool_EDELEGATORS_ALLOWLISTING_NOT_ENABLED">EDELEGATORS_ALLOWLISTING_NOT_ENABLED</a>: u64 = 24;
+</code></pre>
+
+
+
+<a id="0x1_delegation_pool_EDELEGATORS_ALLOWLISTING_NOT_SUPPORTED"></a>
+
+Delegators allowlisting is not supported.
+
+
+<pre><code><b>const</b> <a href="delegation_pool.md#0x1_delegation_pool_EDELEGATORS_ALLOWLISTING_NOT_SUPPORTED">EDELEGATORS_ALLOWLISTING_NOT_SUPPORTED</a>: u64 = 23;
+</code></pre>
+
+
+
+<a id="0x1_delegation_pool_EDELEGATOR_ACTIVE_BALANCE_TOO_LOW"></a>
+
+Delegator's active balance cannot be less than <code><a href="delegation_pool.md#0x1_delegation_pool_MIN_COINS_ON_SHARES_POOL">MIN_COINS_ON_SHARES_POOL</a></code>.
+
+
+<pre><code><b>const</b> <a href="delegation_pool.md#0x1_delegation_pool_EDELEGATOR_ACTIVE_BALANCE_TOO_LOW">EDELEGATOR_ACTIVE_BALANCE_TOO_LOW</a>: u64 = 8;
+</code></pre>
+
+
+
+<a id="0x1_delegation_pool_EDELEGATOR_NOT_ALLOWLISTED"></a>
+
+Cannot add/reactivate stake unless being allowlisted by the pool owner.
+
+
+<pre><code><b>const</b> <a href="delegation_pool.md#0x1_delegation_pool_EDELEGATOR_NOT_ALLOWLISTED">EDELEGATOR_NOT_ALLOWLISTED</a>: u64 = 25;
+</code></pre>
+
+
+
+<a id="0x1_delegation_pool_EDELEGATOR_PENDING_INACTIVE_BALANCE_TOO_LOW"></a>
+
+Delegator's pending_inactive balance cannot be less than <code><a href="delegation_pool.md#0x1_delegation_pool_MIN_COINS_ON_SHARES_POOL">MIN_COINS_ON_SHARES_POOL</a></code>.
+
+
+<pre><code><b>const</b> <a href="delegation_pool.md#0x1_delegation_pool_EDELEGATOR_PENDING_INACTIVE_BALANCE_TOO_LOW">EDELEGATOR_PENDING_INACTIVE_BALANCE_TOO_LOW</a>: u64 = 9;
+</code></pre>
+
+
+
+<a id="0x1_delegation_pool_EINVALID_COMMISSION_PERCENTAGE"></a>
+
+Commission percentage has to be between 0 and <code><a href="delegation_pool.md#0x1_delegation_pool_MAX_FEE">MAX_FEE</a></code> - 100%.
+
+
+<pre><code><b>const</b> <a href="delegation_pool.md#0x1_delegation_pool_EINVALID_COMMISSION_PERCENTAGE">EINVALID_COMMISSION_PERCENTAGE</a>: u64 = 5;
+</code></pre>
+
+
+
+<a id="0x1_delegation_pool_ENOT_ENOUGH_ACTIVE_STAKE_TO_UNLOCK"></a>
+
+There is not enough <code>active</code> stake on the stake pool to <code>unlock</code>.
+
+
+<pre><code><b>const</b> <a href="delegation_pool.md#0x1_delegation_pool_ENOT_ENOUGH_ACTIVE_STAKE_TO_UNLOCK">ENOT_ENOUGH_ACTIVE_STAKE_TO_UNLOCK</a>: u64 = 6;
+</code></pre>
+
+
+
+<a id="0x1_delegation_pool_EOPERATOR_BENEFICIARY_CHANGE_NOT_SUPPORTED"></a>
+
+Changing beneficiaries for operators is not supported.
+
+
+<pre><code><b>const</b> <a href="delegation_pool.md#0x1_delegation_pool_EOPERATOR_BENEFICIARY_CHANGE_NOT_SUPPORTED">EOPERATOR_BENEFICIARY_CHANGE_NOT_SUPPORTED</a>: u64 = 19;
+</code></pre>
+
+
+
+<a id="0x1_delegation_pool_EPARTIAL_GOVERNANCE_VOTING_NOT_ENABLED"></a>
+
+Partial governance voting hasn't been enabled on this delegation pool.
+
+
+<pre><code><b>const</b> <a href="delegation_pool.md#0x1_delegation_pool_EPARTIAL_GOVERNANCE_VOTING_NOT_ENABLED">EPARTIAL_GOVERNANCE_VOTING_NOT_ENABLED</a>: u64 = 14;
+</code></pre>
+
+
+
+<a id="0x1_delegation_pool_EPENDING_WITHDRAWAL_EXISTS"></a>
+
+There is a pending withdrawal to be executed before <code>unlock</code>ing any new stake.
+
+
+<pre><code><b>const</b> <a href="delegation_pool.md#0x1_delegation_pool_EPENDING_WITHDRAWAL_EXISTS">EPENDING_WITHDRAWAL_EXISTS</a>: u64 = 4;
+</code></pre>
+
+
+
+<a id="0x1_delegation_pool_ESLASHED_INACTIVE_STAKE_ON_PAST_OLC"></a>
+
+Slashing (if implemented) should not be applied to already <code>inactive</code> stake.
+Not only it invalidates the accounting of past observed lockup cycles (OLC),
+but is also unfair to delegators whose stake has been inactive before validator started misbehaving.
+Additionally, the inactive stake does not count on the voting power of validator.
+
+
+<pre><code><b>const</b> <a href="delegation_pool.md#0x1_delegation_pool_ESLASHED_INACTIVE_STAKE_ON_PAST_OLC">ESLASHED_INACTIVE_STAKE_ON_PAST_OLC</a>: u64 = 7;
+</code></pre>
+
+
+
+<a id="0x1_delegation_pool_ETOO_LARGE_COMMISSION_INCREASE"></a>
+
+Commission percentage increase is too large.
+
+
+<pre><code><b>const</b> <a href="delegation_pool.md#0x1_delegation_pool_ETOO_LARGE_COMMISSION_INCREASE">ETOO_LARGE_COMMISSION_INCREASE</a>: u64 = 20;
+</code></pre>
+
+
+
+<a id="0x1_delegation_pool_ETOO_LATE_COMMISSION_CHANGE"></a>
+
+Commission percentage change is too late in this lockup period, and should be done at least a quarter (1/4) of the lockup duration before the lockup cycle ends.
+
+
+<pre><code><b>const</b> <a href="delegation_pool.md#0x1_delegation_pool_ETOO_LATE_COMMISSION_CHANGE">ETOO_LATE_COMMISSION_CHANGE</a>: u64 = 21;
+</code></pre>
+
+
+
+<a id="0x1_delegation_pool_EWITHDRAW_ZERO_STAKE"></a>
+
+Cannot request to withdraw zero stake.
+
+
+<pre><code><b>const</b> <a href="delegation_pool.md#0x1_delegation_pool_EWITHDRAW_ZERO_STAKE">EWITHDRAW_ZERO_STAKE</a>: u64 = 11;
+</code></pre>
+
+
+
+<a id="0x1_delegation_pool_MAX_COMMISSION_INCREASE"></a>
+
+Maximum commission percentage increase per lockup cycle. 10% is represented as 1000.
+
+
+<pre><code><b>const</b> <a href="delegation_pool.md#0x1_delegation_pool_MAX_COMMISSION_INCREASE">MAX_COMMISSION_INCREASE</a>: u64 = 1000;
+</code></pre>
+
+
+
+<a id="0x1_delegation_pool_MAX_FEE"></a>
+
+Maximum operator percentage fee(of double digit precision): 22.85% is represented as 2285
+
+
+<pre><code><b>const</b> <a href="delegation_pool.md#0x1_delegation_pool_MAX_FEE">MAX_FEE</a>: u64 = 10000;
+</code></pre>
+
+
+
+<a id="0x1_delegation_pool_MIN_COINS_ON_SHARES_POOL"></a>
+
+Minimum coins to exist on a shares pool at all times.
+Enforced per delegator for both active and pending_inactive pools.
+This constraint ensures the share price cannot overly increase and lead to
+substantial losses when buying shares (can lose at most 1 share which may
+be worth a lot if current share price is high).
+This constraint is not enforced on inactive pools as they only allow redeems
+(can lose at most 1 coin regardless of current share price).
+
+
+<pre><code><b>const</b> <a href="delegation_pool.md#0x1_delegation_pool_MIN_COINS_ON_SHARES_POOL">MIN_COINS_ON_SHARES_POOL</a>: u64 = 1000000000;
+</code></pre>
+
+
+
+<a id="0x1_delegation_pool_MODULE_SALT"></a>
+
+
+
+<pre><code><b>const</b> <a href="delegation_pool.md#0x1_delegation_pool_MODULE_SALT">MODULE_SALT</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; = [97, 112, 116, 111, 115, 95, 102, 114, 97, 109, 101, 119, 111, 114, 107, 58, 58, 100, 101, 108, 101, 103, 97, 116, 105, 111, 110, 95, 112, 111, 111, 108];
+</code></pre>
+
+
+
+<a id="0x1_delegation_pool_NULL_SHAREHOLDER"></a>
+
+Special shareholder temporarily owning the <code>add_stake</code> fees charged during this epoch.
+On each <code>add_stake</code> operation any resulted fee is used to buy active shares for this shareholder.
+First synchronization after this epoch ends will distribute accumulated fees to the rest of the pool as refunds.
+
+
+<pre><code><b>const</b> <a href="delegation_pool.md#0x1_delegation_pool_NULL_SHAREHOLDER">NULL_SHAREHOLDER</a>: <b>address</b> = 0x0;
+</code></pre>
+
+
+
+<a id="0x1_delegation_pool_SHARES_SCALING_FACTOR"></a>
+
+Scaling factor of shares pools used within the delegation pool
+
+
+<pre><code><b>const</b> <a href="delegation_pool.md#0x1_delegation_pool_SHARES_SCALING_FACTOR">SHARES_SCALING_FACTOR</a>: u64 = 10000000000000000;
+</code></pre>
+
+
+
+<a id="0x1_delegation_pool_owner_cap_exists"></a>
+
+## Function `owner_cap_exists`
+
+Return whether supplied address <code>addr</code> is owner of a delegation pool.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_owner_cap_exists">owner_cap_exists</a>(addr: <b>address</b>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_owner_cap_exists">owner_cap_exists</a>(addr: <b>address</b>): bool {
+    <b>exists</b>&lt;<a href="delegation_pool.md#0x1_delegation_pool_DelegationPoolOwnership">DelegationPoolOwnership</a>&gt;(addr)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_get_owned_pool_address"></a>
+
+## Function `get_owned_pool_address`
+
+Return address of the delegation pool owned by <code>owner</code> or fail if there is none.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_get_owned_pool_address">get_owned_pool_address</a>(owner: <b>address</b>): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_get_owned_pool_address">get_owned_pool_address</a>(owner: <b>address</b>): <b>address</b> <b>acquires</b> <a href="delegation_pool.md#0x1_delegation_pool_DelegationPoolOwnership">DelegationPoolOwnership</a> {
+    <a href="delegation_pool.md#0x1_delegation_pool_assert_owner_cap_exists">assert_owner_cap_exists</a>(owner);
+    <b>borrow_global</b>&lt;<a href="delegation_pool.md#0x1_delegation_pool_DelegationPoolOwnership">DelegationPoolOwnership</a>&gt;(owner).pool_address
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_delegation_pool_exists"></a>
+
+## Function `delegation_pool_exists`
+
+Return whether a delegation pool exists at supplied address <code>addr</code>.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_delegation_pool_exists">delegation_pool_exists</a>(addr: <b>address</b>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_delegation_pool_exists">delegation_pool_exists</a>(addr: <b>address</b>): bool {
+    <b>exists</b>&lt;<a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>&gt;(addr)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_partial_governance_voting_enabled"></a>
+
+## Function `partial_governance_voting_enabled`
+
+Return whether a delegation pool has already enabled partial governance voting.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_partial_governance_voting_enabled">partial_governance_voting_enabled</a>(pool_address: <b>address</b>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_partial_governance_voting_enabled">partial_governance_voting_enabled</a>(pool_address: <b>address</b>): bool {
+    <b>exists</b>&lt;<a href="delegation_pool.md#0x1_delegation_pool_GovernanceRecords">GovernanceRecords</a>&gt;(pool_address) && <a href="stake.md#0x1_stake_get_delegated_voter">stake::get_delegated_voter</a>(pool_address) == pool_address
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_observed_lockup_cycle"></a>
+
+## Function `observed_lockup_cycle`
+
+Return the index of current observed lockup cycle on delegation pool <code>pool_address</code>.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_observed_lockup_cycle">observed_lockup_cycle</a>(pool_address: <b>address</b>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_observed_lockup_cycle">observed_lockup_cycle</a>(pool_address: <b>address</b>): u64 <b>acquires</b> <a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a> {
+    <a href="delegation_pool.md#0x1_delegation_pool_assert_delegation_pool_exists">assert_delegation_pool_exists</a>(pool_address);
+    <b>borrow_global</b>&lt;<a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>&gt;(pool_address).observed_lockup_cycle.index
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_is_next_commission_percentage_effective"></a>
+
+## Function `is_next_commission_percentage_effective`
+
+Return whether the commission percentage for the next lockup cycle is effective.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_is_next_commission_percentage_effective">is_next_commission_percentage_effective</a>(pool_address: <b>address</b>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_is_next_commission_percentage_effective">is_next_commission_percentage_effective</a>(pool_address: <b>address</b>): bool <b>acquires</b> <a href="delegation_pool.md#0x1_delegation_pool_NextCommissionPercentage">NextCommissionPercentage</a> {
+    <b>exists</b>&lt;<a href="delegation_pool.md#0x1_delegation_pool_NextCommissionPercentage">NextCommissionPercentage</a>&gt;(pool_address) &&
+        <a href="timestamp.md#0x1_timestamp_now_seconds">timestamp::now_seconds</a>() &gt;= <b>borrow_global</b>&lt;<a href="delegation_pool.md#0x1_delegation_pool_NextCommissionPercentage">NextCommissionPercentage</a>&gt;(pool_address).effective_after_secs
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_operator_commission_percentage"></a>
+
+## Function `operator_commission_percentage`
+
+Return the operator commission percentage set on the delegation pool <code>pool_address</code>.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_operator_commission_percentage">operator_commission_percentage</a>(pool_address: <b>address</b>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_operator_commission_percentage">operator_commission_percentage</a>(
+    pool_address: <b>address</b>
+): u64 <b>acquires</b> <a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>, <a href="delegation_pool.md#0x1_delegation_pool_NextCommissionPercentage">NextCommissionPercentage</a> {
+    <a href="delegation_pool.md#0x1_delegation_pool_assert_delegation_pool_exists">assert_delegation_pool_exists</a>(pool_address);
+    <b>if</b> (<a href="delegation_pool.md#0x1_delegation_pool_is_next_commission_percentage_effective">is_next_commission_percentage_effective</a>(pool_address)) {
+        <a href="delegation_pool.md#0x1_delegation_pool_operator_commission_percentage_next_lockup_cycle">operator_commission_percentage_next_lockup_cycle</a>(pool_address)
+    } <b>else</b> {
+        <b>borrow_global</b>&lt;<a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>&gt;(pool_address).operator_commission_percentage
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_operator_commission_percentage_next_lockup_cycle"></a>
+
+## Function `operator_commission_percentage_next_lockup_cycle`
+
+Return the operator commission percentage for the next lockup cycle.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_operator_commission_percentage_next_lockup_cycle">operator_commission_percentage_next_lockup_cycle</a>(pool_address: <b>address</b>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_operator_commission_percentage_next_lockup_cycle">operator_commission_percentage_next_lockup_cycle</a>(
+    pool_address: <b>address</b>
+): u64 <b>acquires</b> <a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>, <a href="delegation_pool.md#0x1_delegation_pool_NextCommissionPercentage">NextCommissionPercentage</a> {
+    <a href="delegation_pool.md#0x1_delegation_pool_assert_delegation_pool_exists">assert_delegation_pool_exists</a>(pool_address);
+    <b>if</b> (<b>exists</b>&lt;<a href="delegation_pool.md#0x1_delegation_pool_NextCommissionPercentage">NextCommissionPercentage</a>&gt;(pool_address)) {
+        <b>borrow_global</b>&lt;<a href="delegation_pool.md#0x1_delegation_pool_NextCommissionPercentage">NextCommissionPercentage</a>&gt;(pool_address).commission_percentage_next_lockup_cycle
+    } <b>else</b> {
+        <b>borrow_global</b>&lt;<a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>&gt;(pool_address).operator_commission_percentage
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_shareholders_count_active_pool"></a>
+
+## Function `shareholders_count_active_pool`
+
+Return the number of delegators owning active stake within <code>pool_address</code>.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_shareholders_count_active_pool">shareholders_count_active_pool</a>(pool_address: <b>address</b>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_shareholders_count_active_pool">shareholders_count_active_pool</a>(pool_address: <b>address</b>): u64 <b>acquires</b> <a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a> {
+    <a href="delegation_pool.md#0x1_delegation_pool_assert_delegation_pool_exists">assert_delegation_pool_exists</a>(pool_address);
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_shareholders_count">pool_u64::shareholders_count</a>(&<b>borrow_global</b>&lt;<a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>&gt;(pool_address).active_shares)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_get_delegation_pool_stake"></a>
+
+## Function `get_delegation_pool_stake`
+
+Return the stake amounts on <code>pool_address</code> in the different states:
+(<code>active</code>,<code>inactive</code>,<code>pending_active</code>,<code>pending_inactive</code>)
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_get_delegation_pool_stake">get_delegation_pool_stake</a>(pool_address: <b>address</b>): (u64, u64, u64, u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_get_delegation_pool_stake">get_delegation_pool_stake</a>(pool_address: <b>address</b>): (u64, u64, u64, u64) {
+    <a href="delegation_pool.md#0x1_delegation_pool_assert_delegation_pool_exists">assert_delegation_pool_exists</a>(pool_address);
+    <a href="stake.md#0x1_stake_get_stake">stake::get_stake</a>(pool_address)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_get_pending_withdrawal"></a>
+
+## Function `get_pending_withdrawal`
+
+Return whether the given delegator has any withdrawable stake. If they recently requested to unlock
+some stake and the stake pool's lockup cycle has not ended, their coins are not withdrawable yet.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_get_pending_withdrawal">get_pending_withdrawal</a>(pool_address: <b>address</b>, delegator_address: <b>address</b>): (bool, u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_get_pending_withdrawal">get_pending_withdrawal</a>(
+    pool_address: <b>address</b>,
+    delegator_address: <b>address</b>
+): (bool, u64) <b>acquires</b> <a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a> {
+    <a href="delegation_pool.md#0x1_delegation_pool_assert_delegation_pool_exists">assert_delegation_pool_exists</a>(pool_address);
+    <b>let</b> pool = <b>borrow_global</b>&lt;<a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>&gt;(pool_address);
+    <b>let</b> (
+        lockup_cycle_ended,
+        _,
+        pending_inactive,
+        _,
+        commission_pending_inactive
+    ) = <a href="delegation_pool.md#0x1_delegation_pool_calculate_stake_pool_drift">calculate_stake_pool_drift</a>(pool);
+
+    <b>let</b> (withdrawal_exists, withdrawal_olc) = <a href="delegation_pool.md#0x1_delegation_pool_pending_withdrawal_exists">pending_withdrawal_exists</a>(pool, delegator_address);
+    <b>if</b> (!withdrawal_exists) {
+        // <b>if</b> no pending withdrawal, there is neither inactive nor pending_inactive <a href="stake.md#0x1_stake">stake</a>
+        (<b>false</b>, 0)
+    } <b>else</b> {
+        // delegator <b>has</b> either inactive or pending_inactive <a href="stake.md#0x1_stake">stake</a> due <b>to</b> automatic withdrawals
+        <b>let</b> inactive_shares = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_borrow">table::borrow</a>(&pool.inactive_shares, withdrawal_olc);
+        <b>if</b> (withdrawal_olc.index &lt; pool.observed_lockup_cycle.index) {
+            // <b>if</b> withdrawal's lockup cycle ended on delegation pool then it is inactive
+            (<b>true</b>, <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_balance">pool_u64::balance</a>(inactive_shares, delegator_address))
+        } <b>else</b> {
+            pending_inactive = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_shares_to_amount_with_total_coins">pool_u64::shares_to_amount_with_total_coins</a>(
+                inactive_shares,
+                <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_shares">pool_u64::shares</a>(inactive_shares, delegator_address),
+                // exclude operator pending_inactive rewards not converted <b>to</b> shares yet
+                pending_inactive - commission_pending_inactive
+            );
+            // <b>if</b> withdrawal's lockup cycle ended ONLY on <a href="stake.md#0x1_stake">stake</a> pool then it is also inactive
+            (lockup_cycle_ended, pending_inactive)
+        }
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_get_stake"></a>
+
+## Function `get_stake`
+
+Return total stake owned by <code>delegator_address</code> within delegation pool <code>pool_address</code>
+in each of its individual states: (<code>active</code>,<code>inactive</code>,<code>pending_inactive</code>)
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_get_stake">get_stake</a>(pool_address: <b>address</b>, delegator_address: <b>address</b>): (u64, u64, u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_get_stake">get_stake</a>(
+    pool_address: <b>address</b>,
+    delegator_address: <b>address</b>
+): (u64, u64, u64) <b>acquires</b> <a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>, <a href="delegation_pool.md#0x1_delegation_pool_BeneficiaryForOperator">BeneficiaryForOperator</a> {
+    <a href="delegation_pool.md#0x1_delegation_pool_assert_delegation_pool_exists">assert_delegation_pool_exists</a>(pool_address);
+    <b>let</b> pool = <b>borrow_global</b>&lt;<a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>&gt;(pool_address);
+    <b>let</b> (
+        lockup_cycle_ended,
+        active,
+        _,
+        commission_active,
+        commission_pending_inactive
+    ) = <a href="delegation_pool.md#0x1_delegation_pool_calculate_stake_pool_drift">calculate_stake_pool_drift</a>(pool);
+
+    <b>let</b> total_active_shares = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_total_shares">pool_u64::total_shares</a>(&pool.active_shares);
+    <b>let</b> delegator_active_shares = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_shares">pool_u64::shares</a>(&pool.active_shares, delegator_address);
+
+    <b>let</b> (_, _, pending_active, _) = <a href="stake.md#0x1_stake_get_stake">stake::get_stake</a>(pool_address);
+    <b>if</b> (pending_active == 0) {
+        // zero `pending_active` <a href="stake.md#0x1_stake">stake</a> indicates that either there are no `add_stake` fees or
+        // previous epoch <b>has</b> ended and should identify shares owning these fees <b>as</b> released
+        total_active_shares = total_active_shares - <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_shares">pool_u64::shares</a>(&pool.active_shares, <a href="delegation_pool.md#0x1_delegation_pool_NULL_SHAREHOLDER">NULL_SHAREHOLDER</a>);
+        <b>if</b> (delegator_address == <a href="delegation_pool.md#0x1_delegation_pool_NULL_SHAREHOLDER">NULL_SHAREHOLDER</a>) {
+            delegator_active_shares = 0
+        }
+    };
+    active = pool_u64::shares_to_amount_with_total_stats(
+        &pool.active_shares,
+        delegator_active_shares,
+        // exclude operator active rewards not converted <b>to</b> shares yet
+        active - commission_active,
+        total_active_shares
+    );
+
+    // get state and <a href="stake.md#0x1_stake">stake</a> (0 <b>if</b> there is none) of the pending withdrawal
+    <b>let</b> (withdrawal_inactive, withdrawal_stake) = <a href="delegation_pool.md#0x1_delegation_pool_get_pending_withdrawal">get_pending_withdrawal</a>(pool_address, delegator_address);
+    // report non-active stakes accordingly <b>to</b> the state of the pending withdrawal
+    <b>let</b> (inactive, pending_inactive) = <b>if</b> (withdrawal_inactive) (withdrawal_stake, 0) <b>else</b> (0, withdrawal_stake);
+
+    // should also <b>include</b> commission rewards in case of the operator <a href="account.md#0x1_account">account</a>
+    // operator rewards are actually used <b>to</b> buy shares which is introducing
+    // some imprecision (received <a href="stake.md#0x1_stake">stake</a> would be slightly less)
+    // but adding rewards onto the existing <a href="stake.md#0x1_stake">stake</a> is still a good approximation
+    <b>if</b> (delegator_address == <a href="delegation_pool.md#0x1_delegation_pool_beneficiary_for_operator">beneficiary_for_operator</a>(get_operator(pool_address))) {
+        active = active + commission_active;
+        // in-flight pending_inactive commission can coexist <b>with</b> already inactive withdrawal
+        <b>if</b> (lockup_cycle_ended) {
+            inactive = inactive + commission_pending_inactive
+        } <b>else</b> {
+            pending_inactive = pending_inactive + commission_pending_inactive
+        }
+    };
+
+    (active, inactive, pending_inactive)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_get_add_stake_fee"></a>
+
+## Function `get_add_stake_fee`
+
+Return refundable stake to be extracted from added <code>amount</code> at <code>add_stake</code> operation on pool <code>pool_address</code>.
+If the validator produces rewards this epoch, added stake goes directly to <code>pending_active</code> and
+does not earn rewards. However, all shares within a pool appreciate uniformly and when this epoch ends:
+- either added shares are still <code>pending_active</code> and steal from rewards of existing <code>active</code> stake
+- or have moved to <code>pending_inactive</code> and get full rewards (they displaced <code>active</code> stake at <code>unlock</code>)
+To mitigate this, some of the added stake is extracted and fed back into the pool as placeholder
+for the rewards the remaining stake would have earned if active:
+extracted-fee = (amount - extracted-fee) * reward-rate% * (100% - operator-commission%)
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_get_add_stake_fee">get_add_stake_fee</a>(pool_address: <b>address</b>, amount: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_get_add_stake_fee">get_add_stake_fee</a>(
+    pool_address: <b>address</b>,
+    amount: u64
+): u64 <b>acquires</b> <a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>, <a href="delegation_pool.md#0x1_delegation_pool_NextCommissionPercentage">NextCommissionPercentage</a> {
+    <b>if</b> (<a href="stake.md#0x1_stake_is_current_epoch_validator">stake::is_current_epoch_validator</a>(pool_address)) {
+        <b>let</b> (rewards_rate, rewards_rate_denominator) = <a href="staking_config.md#0x1_staking_config_get_reward_rate">staking_config::get_reward_rate</a>(&<a href="staking_config.md#0x1_staking_config_get">staking_config::get</a>());
+        <b>if</b> (rewards_rate_denominator &gt; 0) {
+            <a href="delegation_pool.md#0x1_delegation_pool_assert_delegation_pool_exists">assert_delegation_pool_exists</a>(pool_address);
+
+            rewards_rate = rewards_rate * (<a href="delegation_pool.md#0x1_delegation_pool_MAX_FEE">MAX_FEE</a> - <a href="delegation_pool.md#0x1_delegation_pool_operator_commission_percentage">operator_commission_percentage</a>(pool_address));
+            rewards_rate_denominator = rewards_rate_denominator * <a href="delegation_pool.md#0x1_delegation_pool_MAX_FEE">MAX_FEE</a>;
+            ((((amount <b>as</b> u128) * (rewards_rate <b>as</b> u128)) / ((rewards_rate <b>as</b> u128) + (rewards_rate_denominator <b>as</b> u128))) <b>as</b> u64)
+        } <b>else</b> { 0 }
+    } <b>else</b> { 0 }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_can_withdraw_pending_inactive"></a>
+
+## Function `can_withdraw_pending_inactive`
+
+Return whether <code>pending_inactive</code> stake can be directly withdrawn from
+the delegation pool, implicitly its stake pool, in the special case
+the validator had gone inactive before its lockup expired.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_can_withdraw_pending_inactive">can_withdraw_pending_inactive</a>(pool_address: <b>address</b>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_can_withdraw_pending_inactive">can_withdraw_pending_inactive</a>(pool_address: <b>address</b>): bool {
+    <a href="stake.md#0x1_stake_get_validator_state">stake::get_validator_state</a>(pool_address) == <a href="delegation_pool.md#0x1_delegation_pool_VALIDATOR_STATUS_INACTIVE">VALIDATOR_STATUS_INACTIVE</a> &&
+        <a href="timestamp.md#0x1_timestamp_now_seconds">timestamp::now_seconds</a>() &gt;= <a href="stake.md#0x1_stake_get_lockup_secs">stake::get_lockup_secs</a>(pool_address)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_calculate_and_update_voter_total_voting_power"></a>
+
+## Function `calculate_and_update_voter_total_voting_power`
+
+Return the total voting power of a delegator in a delegation pool. This function syncs DelegationPool to the
+latest state.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_calculate_and_update_voter_total_voting_power">calculate_and_update_voter_total_voting_power</a>(pool_address: <b>address</b>, voter: <b>address</b>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_calculate_and_update_voter_total_voting_power">calculate_and_update_voter_total_voting_power</a>(
+    pool_address: <b>address</b>,
+    voter: <b>address</b>
+): u64 <b>acquires</b> <a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>, <a href="delegation_pool.md#0x1_delegation_pool_GovernanceRecords">GovernanceRecords</a>, <a href="delegation_pool.md#0x1_delegation_pool_BeneficiaryForOperator">BeneficiaryForOperator</a>, <a href="delegation_pool.md#0x1_delegation_pool_NextCommissionPercentage">NextCommissionPercentage</a> {
+    <a href="delegation_pool.md#0x1_delegation_pool_assert_partial_governance_voting_enabled">assert_partial_governance_voting_enabled</a>(pool_address);
+    // Delegation pool need <b>to</b> be synced <b>to</b> explain rewards(which could change the <a href="coin.md#0x1_coin">coin</a> amount) and
+    // commission(which could cause share transfer).
+    <a href="delegation_pool.md#0x1_delegation_pool_synchronize_delegation_pool">synchronize_delegation_pool</a>(pool_address);
+    <b>let</b> pool = <b>borrow_global</b>&lt;<a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>&gt;(pool_address);
+    <b>let</b> governance_records = <b>borrow_global_mut</b>&lt;<a href="delegation_pool.md#0x1_delegation_pool_GovernanceRecords">GovernanceRecords</a>&gt;(pool_address);
+    <b>let</b> latest_delegated_votes = <a href="delegation_pool.md#0x1_delegation_pool_update_and_borrow_mut_delegated_votes">update_and_borrow_mut_delegated_votes</a>(pool, governance_records, voter);
+    <a href="delegation_pool.md#0x1_delegation_pool_calculate_total_voting_power">calculate_total_voting_power</a>(pool, latest_delegated_votes)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_calculate_and_update_remaining_voting_power"></a>
+
+## Function `calculate_and_update_remaining_voting_power`
+
+Return the remaining voting power of a delegator in a delegation pool on a proposal. This function syncs DelegationPool to the
+latest state.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_calculate_and_update_remaining_voting_power">calculate_and_update_remaining_voting_power</a>(pool_address: <b>address</b>, voter_address: <b>address</b>, proposal_id: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_calculate_and_update_remaining_voting_power">calculate_and_update_remaining_voting_power</a>(
+    pool_address: <b>address</b>,
+    voter_address: <b>address</b>,
+    proposal_id: u64
+): u64 <b>acquires</b> <a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>, <a href="delegation_pool.md#0x1_delegation_pool_GovernanceRecords">GovernanceRecords</a>, <a href="delegation_pool.md#0x1_delegation_pool_BeneficiaryForOperator">BeneficiaryForOperator</a>, <a href="delegation_pool.md#0x1_delegation_pool_NextCommissionPercentage">NextCommissionPercentage</a> {
+    <a href="delegation_pool.md#0x1_delegation_pool_assert_partial_governance_voting_enabled">assert_partial_governance_voting_enabled</a>(pool_address);
+    // If the whole <a href="stake.md#0x1_stake">stake</a> pool <b>has</b> no <a href="voting.md#0x1_voting">voting</a> power(e.g. it <b>has</b> already voted before partial
+    // governance <a href="voting.md#0x1_voting">voting</a> flag is enabled), the delegator also <b>has</b> no <a href="voting.md#0x1_voting">voting</a> power.
+    <b>if</b> (<a href="aptos_governance.md#0x1_aptos_governance_get_remaining_voting_power">aptos_governance::get_remaining_voting_power</a>(pool_address, proposal_id) == 0) {
+        <b>return</b> 0
+    };
+
+    <b>let</b> total_voting_power = <a href="delegation_pool.md#0x1_delegation_pool_calculate_and_update_voter_total_voting_power">calculate_and_update_voter_total_voting_power</a>(pool_address, voter_address);
+    <b>let</b> governance_records = <b>borrow_global</b>&lt;<a href="delegation_pool.md#0x1_delegation_pool_GovernanceRecords">GovernanceRecords</a>&gt;(pool_address);
+    total_voting_power - <a href="delegation_pool.md#0x1_delegation_pool_get_used_voting_power">get_used_voting_power</a>(governance_records, voter_address, proposal_id)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_calculate_and_update_delegator_voter"></a>
+
+## Function `calculate_and_update_delegator_voter`
+
+Return the latest delegated voter of a delegator in a delegation pool. This function syncs DelegationPool to the
+latest state.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_calculate_and_update_delegator_voter">calculate_and_update_delegator_voter</a>(pool_address: <b>address</b>, delegator_address: <b>address</b>): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_calculate_and_update_delegator_voter">calculate_and_update_delegator_voter</a>(
+    pool_address: <b>address</b>,
+    delegator_address: <b>address</b>
+): <b>address</b> <b>acquires</b> <a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>, <a href="delegation_pool.md#0x1_delegation_pool_GovernanceRecords">GovernanceRecords</a> {
+    <a href="delegation_pool.md#0x1_delegation_pool_assert_partial_governance_voting_enabled">assert_partial_governance_voting_enabled</a>(pool_address);
+    <a href="delegation_pool.md#0x1_delegation_pool_calculate_and_update_delegator_voter_internal">calculate_and_update_delegator_voter_internal</a>(
+        <b>borrow_global</b>&lt;<a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>&gt;(pool_address),
+        <b>borrow_global_mut</b>&lt;<a href="delegation_pool.md#0x1_delegation_pool_GovernanceRecords">GovernanceRecords</a>&gt;(pool_address),
+        delegator_address
+    )
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_calculate_and_update_voting_delegation"></a>
+
+## Function `calculate_and_update_voting_delegation`
+
+Return the current state of a voting delegation of a delegator in a delegation pool.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_calculate_and_update_voting_delegation">calculate_and_update_voting_delegation</a>(pool_address: <b>address</b>, delegator_address: <b>address</b>): (<b>address</b>, <b>address</b>, u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_calculate_and_update_voting_delegation">calculate_and_update_voting_delegation</a>(
+    pool_address: <b>address</b>,
+    delegator_address: <b>address</b>
+): (<b>address</b>, <b>address</b>, u64) <b>acquires</b> <a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>, <a href="delegation_pool.md#0x1_delegation_pool_GovernanceRecords">GovernanceRecords</a> {
+    <a href="delegation_pool.md#0x1_delegation_pool_assert_partial_governance_voting_enabled">assert_partial_governance_voting_enabled</a>(pool_address);
+    <b>let</b> vote_delegation = <a href="delegation_pool.md#0x1_delegation_pool_update_and_borrow_mut_delegator_vote_delegation">update_and_borrow_mut_delegator_vote_delegation</a>(
+        <b>borrow_global</b>&lt;<a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>&gt;(pool_address),
+        <b>borrow_global_mut</b>&lt;<a href="delegation_pool.md#0x1_delegation_pool_GovernanceRecords">GovernanceRecords</a>&gt;(pool_address),
+        delegator_address
+    );
+
+    (vote_delegation.voter, vote_delegation.pending_voter, vote_delegation.last_locked_until_secs)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_get_expected_stake_pool_address"></a>
+
+## Function `get_expected_stake_pool_address`
+
+Return the address of the stake pool to be created with the provided owner, and seed.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_get_expected_stake_pool_address">get_expected_stake_pool_address</a>(owner: <b>address</b>, delegation_pool_creation_seed: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_get_expected_stake_pool_address">get_expected_stake_pool_address</a>(owner: <b>address</b>, delegation_pool_creation_seed: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+): <b>address</b> {
+    <b>let</b> seed = <a href="delegation_pool.md#0x1_delegation_pool_create_resource_account_seed">create_resource_account_seed</a>(delegation_pool_creation_seed);
+    <a href="account.md#0x1_account_create_resource_address">account::create_resource_address</a>(&owner, seed)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_min_remaining_secs_for_commission_change"></a>
+
+## Function `min_remaining_secs_for_commission_change`
+
+Return the minimum remaining time in seconds for commission change, which is one fourth of the lockup duration.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_min_remaining_secs_for_commission_change">min_remaining_secs_for_commission_change</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_min_remaining_secs_for_commission_change">min_remaining_secs_for_commission_change</a>(): u64 {
+    <b>let</b> config = <a href="staking_config.md#0x1_staking_config_get">staking_config::get</a>();
+    <a href="staking_config.md#0x1_staking_config_get_recurring_lockup_duration">staking_config::get_recurring_lockup_duration</a>(&config) / 4
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_allowlisting_enabled"></a>
+
+## Function `allowlisting_enabled`
+
+Return whether allowlisting is enabled for the provided delegation pool.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_allowlisting_enabled">allowlisting_enabled</a>(pool_address: <b>address</b>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_allowlisting_enabled">allowlisting_enabled</a>(pool_address: <b>address</b>): bool {
+    <a href="delegation_pool.md#0x1_delegation_pool_assert_delegation_pool_exists">assert_delegation_pool_exists</a>(pool_address);
+    <b>exists</b>&lt;<a href="delegation_pool.md#0x1_delegation_pool_DelegationPoolAllowlisting">DelegationPoolAllowlisting</a>&gt;(pool_address)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_delegator_allowlisted"></a>
+
+## Function `delegator_allowlisted`
+
+Return whether the provided delegator is allowlisted.
+A delegator is allowlisted if:
+- allowlisting is disabled on the pool
+- delegator is part of the allowlist
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_delegator_allowlisted">delegator_allowlisted</a>(pool_address: <b>address</b>, delegator_address: <b>address</b>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_delegator_allowlisted">delegator_allowlisted</a>(
+    pool_address: <b>address</b>,
+    delegator_address: <b>address</b>,
+): bool <b>acquires</b> <a href="delegation_pool.md#0x1_delegation_pool_DelegationPoolAllowlisting">DelegationPoolAllowlisting</a> {
+    <b>if</b> (!<a href="delegation_pool.md#0x1_delegation_pool_allowlisting_enabled">allowlisting_enabled</a>(pool_address)) { <b>return</b> <b>true</b> };
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/smart_table.md#0x1_smart_table_contains">smart_table::contains</a>(<b>freeze</b>(<a href="delegation_pool.md#0x1_delegation_pool_borrow_mut_delegators_allowlist">borrow_mut_delegators_allowlist</a>(pool_address)), delegator_address)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_get_delegators_allowlist"></a>
+
+## Function `get_delegators_allowlist`
+
+Return allowlist or revert if allowlisting is not enabled for the provided delegation pool.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_get_delegators_allowlist">get_delegators_allowlist</a>(pool_address: <b>address</b>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_get_delegators_allowlist">get_delegators_allowlist</a>(
+    pool_address: <b>address</b>,
+): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt; <b>acquires</b> <a href="delegation_pool.md#0x1_delegation_pool_DelegationPoolAllowlisting">DelegationPoolAllowlisting</a> {
+    <a href="delegation_pool.md#0x1_delegation_pool_assert_allowlisting_enabled">assert_allowlisting_enabled</a>(pool_address);
+
+    <b>let</b> allowlist = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>[];
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/smart_table.md#0x1_smart_table_for_each_ref">smart_table::for_each_ref</a>(<b>freeze</b>(<a href="delegation_pool.md#0x1_delegation_pool_borrow_mut_delegators_allowlist">borrow_mut_delegators_allowlist</a>(pool_address)), |delegator, _v| {
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_push_back">vector::push_back</a>(&<b>mut</b> allowlist, *delegator);
+    });
+    allowlist
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_initialize_delegation_pool"></a>
+
+## Function `initialize_delegation_pool`
+
+Initialize a delegation pool of custom fixed <code>operator_commission_percentage</code>.
+A resource account is created from <code>owner</code> signer and its supplied <code>delegation_pool_creation_seed</code>
+to host the delegation pool resource and own the underlying stake pool.
+Ownership over setting the operator/voter is granted to <code>owner</code> who has both roles initially.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_initialize_delegation_pool">initialize_delegation_pool</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, operator_commission_percentage: u64, delegation_pool_creation_seed: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_initialize_delegation_pool">initialize_delegation_pool</a>(
+    owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    operator_commission_percentage: u64,
+    delegation_pool_creation_seed: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+) <b>acquires</b> <a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>, <a href="delegation_pool.md#0x1_delegation_pool_GovernanceRecords">GovernanceRecords</a>, <a href="delegation_pool.md#0x1_delegation_pool_BeneficiaryForOperator">BeneficiaryForOperator</a>, <a href="delegation_pool.md#0x1_delegation_pool_NextCommissionPercentage">NextCommissionPercentage</a> {
+    <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_delegation_pools_enabled">features::delegation_pools_enabled</a>(), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="delegation_pool.md#0x1_delegation_pool_EDELEGATION_POOLS_DISABLED">EDELEGATION_POOLS_DISABLED</a>));
+    <b>let</b> owner_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(owner);
+    <b>assert</b>!(!<a href="delegation_pool.md#0x1_delegation_pool_owner_cap_exists">owner_cap_exists</a>(owner_address), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_already_exists">error::already_exists</a>(<a href="delegation_pool.md#0x1_delegation_pool_EOWNER_CAP_ALREADY_EXISTS">EOWNER_CAP_ALREADY_EXISTS</a>));
+    <b>assert</b>!(<a href="delegation_pool.md#0x1_delegation_pool_operator_commission_percentage">operator_commission_percentage</a> &lt;= <a href="delegation_pool.md#0x1_delegation_pool_MAX_FEE">MAX_FEE</a>, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="delegation_pool.md#0x1_delegation_pool_EINVALID_COMMISSION_PERCENTAGE">EINVALID_COMMISSION_PERCENTAGE</a>));
+
+    // generate a seed <b>to</b> be used <b>to</b> create the resource <a href="account.md#0x1_account">account</a> hosting the delegation pool
+    <b>let</b> seed = <a href="delegation_pool.md#0x1_delegation_pool_create_resource_account_seed">create_resource_account_seed</a>(delegation_pool_creation_seed);
+
+    <b>let</b> (stake_pool_signer, stake_pool_signer_cap) = <a href="account.md#0x1_account_create_resource_account">account::create_resource_account</a>(owner, seed);
+    <a href="coin.md#0x1_coin_register">coin::register</a>&lt;AptosCoin&gt;(&stake_pool_signer);
+
+    // stake_pool_signer will be owner of the <a href="stake.md#0x1_stake">stake</a> pool and have its `<a href="stake.md#0x1_stake_OwnerCapability">stake::OwnerCapability</a>`
+    <b>let</b> pool_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(&stake_pool_signer);
+    <a href="stake.md#0x1_stake_initialize_stake_owner">stake::initialize_stake_owner</a>(&stake_pool_signer, 0, owner_address, owner_address);
+
+    <b>let</b> inactive_shares = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_new">table::new</a>&lt;<a href="delegation_pool.md#0x1_delegation_pool_ObservedLockupCycle">ObservedLockupCycle</a>, <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_Pool">pool_u64::Pool</a>&gt;();
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_add">table::add</a>(
+        &<b>mut</b> inactive_shares,
+        <a href="delegation_pool.md#0x1_delegation_pool_olc_with_index">olc_with_index</a>(0),
+        <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_create_with_scaling_factor">pool_u64::create_with_scaling_factor</a>(<a href="delegation_pool.md#0x1_delegation_pool_SHARES_SCALING_FACTOR">SHARES_SCALING_FACTOR</a>)
+    );
+
+    <b>move_to</b>(&stake_pool_signer, <a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a> {
+        active_shares: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_create_with_scaling_factor">pool_u64::create_with_scaling_factor</a>(<a href="delegation_pool.md#0x1_delegation_pool_SHARES_SCALING_FACTOR">SHARES_SCALING_FACTOR</a>),
+        observed_lockup_cycle: <a href="delegation_pool.md#0x1_delegation_pool_olc_with_index">olc_with_index</a>(0),
+        inactive_shares,
+        pending_withdrawals: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_new">table::new</a>&lt;<b>address</b>, <a href="delegation_pool.md#0x1_delegation_pool_ObservedLockupCycle">ObservedLockupCycle</a>&gt;(),
+        stake_pool_signer_cap,
+        total_coins_inactive: 0,
+        operator_commission_percentage,
+        add_stake_events: <a href="account.md#0x1_account_new_event_handle">account::new_event_handle</a>&lt;<a href="delegation_pool.md#0x1_delegation_pool_AddStakeEvent">AddStakeEvent</a>&gt;(&stake_pool_signer),
+        reactivate_stake_events: <a href="account.md#0x1_account_new_event_handle">account::new_event_handle</a>&lt;<a href="delegation_pool.md#0x1_delegation_pool_ReactivateStakeEvent">ReactivateStakeEvent</a>&gt;(&stake_pool_signer),
+        unlock_stake_events: <a href="account.md#0x1_account_new_event_handle">account::new_event_handle</a>&lt;<a href="delegation_pool.md#0x1_delegation_pool_UnlockStakeEvent">UnlockStakeEvent</a>&gt;(&stake_pool_signer),
+        withdraw_stake_events: <a href="account.md#0x1_account_new_event_handle">account::new_event_handle</a>&lt;<a href="delegation_pool.md#0x1_delegation_pool_WithdrawStakeEvent">WithdrawStakeEvent</a>&gt;(&stake_pool_signer),
+        distribute_commission_events: <a href="account.md#0x1_account_new_event_handle">account::new_event_handle</a>&lt;<a href="delegation_pool.md#0x1_delegation_pool_DistributeCommissionEvent">DistributeCommissionEvent</a>&gt;(&stake_pool_signer),
+    });
+
+    // save delegation pool ownership and resource <a href="account.md#0x1_account">account</a> <b>address</b> (inner <a href="stake.md#0x1_stake">stake</a> pool <b>address</b>) on `owner`
+    <b>move_to</b>(owner, <a href="delegation_pool.md#0x1_delegation_pool_DelegationPoolOwnership">DelegationPoolOwnership</a> { pool_address });
+
+    // All delegation pool enable partial governance <a href="voting.md#0x1_voting">voting</a> by default once the feature flag is enabled.
+    <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_partial_governance_voting_enabled">features::partial_governance_voting_enabled</a>(
+    ) && <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_delegation_pool_partial_governance_voting_enabled">features::delegation_pool_partial_governance_voting_enabled</a>()) {
+        <a href="delegation_pool.md#0x1_delegation_pool_enable_partial_governance_voting">enable_partial_governance_voting</a>(pool_address);
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_beneficiary_for_operator"></a>
+
+## Function `beneficiary_for_operator`
+
+Return the beneficiary address of the operator.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_beneficiary_for_operator">beneficiary_for_operator</a>(operator: <b>address</b>): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_beneficiary_for_operator">beneficiary_for_operator</a>(operator: <b>address</b>): <b>address</b> <b>acquires</b> <a href="delegation_pool.md#0x1_delegation_pool_BeneficiaryForOperator">BeneficiaryForOperator</a> {
+    <b>if</b> (<b>exists</b>&lt;<a href="delegation_pool.md#0x1_delegation_pool_BeneficiaryForOperator">BeneficiaryForOperator</a>&gt;(operator)) {
+        <b>return</b> <b>borrow_global</b>&lt;<a href="delegation_pool.md#0x1_delegation_pool_BeneficiaryForOperator">BeneficiaryForOperator</a>&gt;(operator).beneficiary_for_operator
+    } <b>else</b> {
+        operator
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_enable_partial_governance_voting"></a>
+
+## Function `enable_partial_governance_voting`
+
+Enable partial governance voting on a stake pool. The voter of this stake pool will be managed by this module.
+The existing voter will be replaced. The function is permissionless.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_enable_partial_governance_voting">enable_partial_governance_voting</a>(pool_address: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_enable_partial_governance_voting">enable_partial_governance_voting</a>(
+    pool_address: <b>address</b>,
+) <b>acquires</b> <a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>, <a href="delegation_pool.md#0x1_delegation_pool_GovernanceRecords">GovernanceRecords</a>, <a href="delegation_pool.md#0x1_delegation_pool_BeneficiaryForOperator">BeneficiaryForOperator</a>, <a href="delegation_pool.md#0x1_delegation_pool_NextCommissionPercentage">NextCommissionPercentage</a> {
+    <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_partial_governance_voting_enabled">features::partial_governance_voting_enabled</a>(), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="delegation_pool.md#0x1_delegation_pool_EDISABLED_FUNCTION">EDISABLED_FUNCTION</a>));
+    <b>assert</b>!(
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_delegation_pool_partial_governance_voting_enabled">features::delegation_pool_partial_governance_voting_enabled</a>(),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="delegation_pool.md#0x1_delegation_pool_EDISABLED_FUNCTION">EDISABLED_FUNCTION</a>)
+    );
+    <a href="delegation_pool.md#0x1_delegation_pool_assert_delegation_pool_exists">assert_delegation_pool_exists</a>(pool_address);
+    // synchronize delegation and <a href="stake.md#0x1_stake">stake</a> pools before <a href="../../../aptos-stdlib/tests/compiler-v2-doc/any.md#0x1_any">any</a> user operation.
+    <a href="delegation_pool.md#0x1_delegation_pool_synchronize_delegation_pool">synchronize_delegation_pool</a>(pool_address);
+
+    <b>let</b> <a href="delegation_pool.md#0x1_delegation_pool">delegation_pool</a> = <b>borrow_global</b>&lt;<a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>&gt;(pool_address);
+    <b>let</b> stake_pool_signer = <a href="delegation_pool.md#0x1_delegation_pool_retrieve_stake_pool_owner">retrieve_stake_pool_owner</a>(<a href="delegation_pool.md#0x1_delegation_pool">delegation_pool</a>);
+    // delegated_voter is managed by the <a href="stake.md#0x1_stake">stake</a> pool itself, which <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/capability.md#0x1_capability">capability</a> is managed by <a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>.
+    // So <a href="voting.md#0x1_voting">voting</a> power of this <a href="stake.md#0x1_stake">stake</a> pool can only be used through this <b>module</b>.
+    <a href="stake.md#0x1_stake_set_delegated_voter">stake::set_delegated_voter</a>(&stake_pool_signer, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(&stake_pool_signer));
+
+    <b>move_to</b>(&stake_pool_signer, <a href="delegation_pool.md#0x1_delegation_pool_GovernanceRecords">GovernanceRecords</a> {
+        votes: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/smart_table.md#0x1_smart_table_new">smart_table::new</a>(),
+        votes_per_proposal: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/smart_table.md#0x1_smart_table_new">smart_table::new</a>(),
+        vote_delegation: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/smart_table.md#0x1_smart_table_new">smart_table::new</a>(),
+        delegated_votes: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/smart_table.md#0x1_smart_table_new">smart_table::new</a>(),
+        vote_events: <a href="account.md#0x1_account_new_event_handle">account::new_event_handle</a>&lt;<a href="delegation_pool.md#0x1_delegation_pool_VoteEvent">VoteEvent</a>&gt;(&stake_pool_signer),
+        create_proposal_events: <a href="account.md#0x1_account_new_event_handle">account::new_event_handle</a>&lt;<a href="delegation_pool.md#0x1_delegation_pool_CreateProposalEvent">CreateProposalEvent</a>&gt;(&stake_pool_signer),
+        delegate_voting_power_events: <a href="account.md#0x1_account_new_event_handle">account::new_event_handle</a>&lt;<a href="delegation_pool.md#0x1_delegation_pool_DelegateVotingPowerEvent">DelegateVotingPowerEvent</a>&gt;(&stake_pool_signer),
+    });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_vote"></a>
+
+## Function `vote`
+
+Vote on a proposal with a voter's voting power. To successfully vote, the following conditions must be met:
+1. The voting period of the proposal hasn't ended.
+2. The delegation pool's lockup period ends after the voting period of the proposal.
+3. The voter still has spare voting power on this proposal.
+4. The delegation pool never votes on the proposal before enabling partial governance voting.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_vote">vote</a>(voter: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, pool_address: <b>address</b>, proposal_id: u64, voting_power: u64, should_pass: bool)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_vote">vote</a>(
+    voter: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    pool_address: <b>address</b>,
+    proposal_id: u64,
+    voting_power: u64,
+    should_pass: bool
+) <b>acquires</b> <a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>, <a href="delegation_pool.md#0x1_delegation_pool_GovernanceRecords">GovernanceRecords</a>, <a href="delegation_pool.md#0x1_delegation_pool_BeneficiaryForOperator">BeneficiaryForOperator</a>, <a href="delegation_pool.md#0x1_delegation_pool_NextCommissionPercentage">NextCommissionPercentage</a> {
+    <a href="delegation_pool.md#0x1_delegation_pool_assert_partial_governance_voting_enabled">assert_partial_governance_voting_enabled</a>(pool_address);
+    // synchronize delegation and <a href="stake.md#0x1_stake">stake</a> pools before <a href="../../../aptos-stdlib/tests/compiler-v2-doc/any.md#0x1_any">any</a> user operation.
+    <a href="delegation_pool.md#0x1_delegation_pool_synchronize_delegation_pool">synchronize_delegation_pool</a>(pool_address);
+
+    <b>let</b> voter_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(voter);
+    <b>let</b> remaining_voting_power = <a href="delegation_pool.md#0x1_delegation_pool_calculate_and_update_remaining_voting_power">calculate_and_update_remaining_voting_power</a>(
+        pool_address,
+        voter_address,
+        proposal_id
+    );
+    <b>if</b> (voting_power &gt; remaining_voting_power) {
+        voting_power = remaining_voting_power;
+    };
+    <b>assert</b>!(voting_power &gt; 0, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="delegation_pool.md#0x1_delegation_pool_ENO_VOTING_POWER">ENO_VOTING_POWER</a>));
+
+    <b>let</b> governance_records = <b>borrow_global_mut</b>&lt;<a href="delegation_pool.md#0x1_delegation_pool_GovernanceRecords">GovernanceRecords</a>&gt;(pool_address);
+    // Check a edge case during the transient period of enabling partial governance <a href="voting.md#0x1_voting">voting</a>.
+    <a href="delegation_pool.md#0x1_delegation_pool_assert_and_update_proposal_used_voting_power">assert_and_update_proposal_used_voting_power</a>(governance_records, pool_address, proposal_id, voting_power);
+    <b>let</b> used_voting_power = <a href="delegation_pool.md#0x1_delegation_pool_borrow_mut_used_voting_power">borrow_mut_used_voting_power</a>(governance_records, voter_address, proposal_id);
+    *used_voting_power = *used_voting_power + voting_power;
+
+    <b>let</b> pool_signer = <a href="delegation_pool.md#0x1_delegation_pool_retrieve_stake_pool_owner">retrieve_stake_pool_owner</a>(<b>borrow_global</b>&lt;<a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>&gt;(pool_address));
+    <a href="aptos_governance.md#0x1_aptos_governance_partial_vote">aptos_governance::partial_vote</a>(&pool_signer, pool_address, proposal_id, voting_power, should_pass);
+
+    <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_module_event_migration_enabled">features::module_event_migration_enabled</a>()) {
+        <a href="event.md#0x1_event_emit">event::emit</a>(
+            <a href="delegation_pool.md#0x1_delegation_pool_Vote">Vote</a> {
+                voter: voter_address,
+                proposal_id,
+                <a href="delegation_pool.md#0x1_delegation_pool">delegation_pool</a>: pool_address,
+                num_votes: voting_power,
+                should_pass,
+            }
+        );
+    };
+
+    <a href="event.md#0x1_event_emit_event">event::emit_event</a>(
+        &<b>mut</b> governance_records.vote_events,
+        <a href="delegation_pool.md#0x1_delegation_pool_VoteEvent">VoteEvent</a> {
+            voter: voter_address,
+            proposal_id,
+            <a href="delegation_pool.md#0x1_delegation_pool">delegation_pool</a>: pool_address,
+            num_votes: voting_power,
+            should_pass,
+        }
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_create_proposal"></a>
+
+## Function `create_proposal`
+
+A voter could create a governance proposal by this function. To successfully create a proposal, the voter's
+voting power in THIS delegation pool must be not less than the minimum required voting power specified in
+<code><a href="aptos_governance.md#0x1_aptos_governance">aptos_governance</a>.<b>move</b></code>.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_create_proposal">create_proposal</a>(voter: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, pool_address: <b>address</b>, execution_hash: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, metadata_location: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, metadata_hash: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, is_multi_step_proposal: bool)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_create_proposal">create_proposal</a>(
+    voter: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    pool_address: <b>address</b>,
+    execution_hash: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    metadata_location: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    metadata_hash: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    is_multi_step_proposal: bool,
+) <b>acquires</b> <a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>, <a href="delegation_pool.md#0x1_delegation_pool_GovernanceRecords">GovernanceRecords</a>, <a href="delegation_pool.md#0x1_delegation_pool_BeneficiaryForOperator">BeneficiaryForOperator</a>, <a href="delegation_pool.md#0x1_delegation_pool_NextCommissionPercentage">NextCommissionPercentage</a> {
+    <a href="delegation_pool.md#0x1_delegation_pool_assert_partial_governance_voting_enabled">assert_partial_governance_voting_enabled</a>(pool_address);
+
+    // synchronize delegation and <a href="stake.md#0x1_stake">stake</a> pools before <a href="../../../aptos-stdlib/tests/compiler-v2-doc/any.md#0x1_any">any</a> user operation
+    <a href="delegation_pool.md#0x1_delegation_pool_synchronize_delegation_pool">synchronize_delegation_pool</a>(pool_address);
+
+    <b>let</b> voter_addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(voter);
+    <b>let</b> pool = <b>borrow_global</b>&lt;<a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>&gt;(pool_address);
+    <b>let</b> governance_records = <b>borrow_global_mut</b>&lt;<a href="delegation_pool.md#0x1_delegation_pool_GovernanceRecords">GovernanceRecords</a>&gt;(pool_address);
+    <b>let</b> total_voting_power = <a href="delegation_pool.md#0x1_delegation_pool_calculate_and_update_delegated_votes">calculate_and_update_delegated_votes</a>(pool, governance_records, voter_addr);
+    <b>assert</b>!(
+        total_voting_power &gt;= <a href="aptos_governance.md#0x1_aptos_governance_get_required_proposer_stake">aptos_governance::get_required_proposer_stake</a>(),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="delegation_pool.md#0x1_delegation_pool_EINSUFFICIENT_PROPOSER_STAKE">EINSUFFICIENT_PROPOSER_STAKE</a>));
+    <b>let</b> pool_signer = <a href="delegation_pool.md#0x1_delegation_pool_retrieve_stake_pool_owner">retrieve_stake_pool_owner</a>(<b>borrow_global</b>&lt;<a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>&gt;(pool_address));
+    <b>let</b> proposal_id = <a href="aptos_governance.md#0x1_aptos_governance_create_proposal_v2_impl">aptos_governance::create_proposal_v2_impl</a>(
+        &pool_signer,
+        pool_address,
+        execution_hash,
+        metadata_location,
+        metadata_hash,
+        is_multi_step_proposal,
+    );
+
+    <b>let</b> governance_records = <b>borrow_global_mut</b>&lt;<a href="delegation_pool.md#0x1_delegation_pool_GovernanceRecords">GovernanceRecords</a>&gt;(pool_address);
+
+    <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_module_event_migration_enabled">features::module_event_migration_enabled</a>()) {
+        <a href="event.md#0x1_event_emit">event::emit</a>(
+            <a href="delegation_pool.md#0x1_delegation_pool_CreateProposal">CreateProposal</a> {
+                proposal_id,
+                voter: voter_addr,
+                <a href="delegation_pool.md#0x1_delegation_pool">delegation_pool</a>: pool_address,
+            }
+        );
+    };
+
+    <a href="event.md#0x1_event_emit_event">event::emit_event</a>(
+        &<b>mut</b> governance_records.create_proposal_events,
+        <a href="delegation_pool.md#0x1_delegation_pool_CreateProposalEvent">CreateProposalEvent</a> {
+            proposal_id,
+            voter: voter_addr,
+            <a href="delegation_pool.md#0x1_delegation_pool">delegation_pool</a>: pool_address,
+        }
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_assert_owner_cap_exists"></a>
+
+## Function `assert_owner_cap_exists`
+
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_assert_owner_cap_exists">assert_owner_cap_exists</a>(owner: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_assert_owner_cap_exists">assert_owner_cap_exists</a>(owner: <b>address</b>) {
+    <b>assert</b>!(<a href="delegation_pool.md#0x1_delegation_pool_owner_cap_exists">owner_cap_exists</a>(owner), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="delegation_pool.md#0x1_delegation_pool_EOWNER_CAP_NOT_FOUND">EOWNER_CAP_NOT_FOUND</a>));
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_assert_delegation_pool_exists"></a>
+
+## Function `assert_delegation_pool_exists`
+
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_assert_delegation_pool_exists">assert_delegation_pool_exists</a>(pool_address: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_assert_delegation_pool_exists">assert_delegation_pool_exists</a>(pool_address: <b>address</b>) {
+    <b>assert</b>!(<a href="delegation_pool.md#0x1_delegation_pool_delegation_pool_exists">delegation_pool_exists</a>(pool_address), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="delegation_pool.md#0x1_delegation_pool_EDELEGATION_POOL_DOES_NOT_EXIST">EDELEGATION_POOL_DOES_NOT_EXIST</a>));
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_assert_min_active_balance"></a>
+
+## Function `assert_min_active_balance`
+
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_assert_min_active_balance">assert_min_active_balance</a>(pool: &<a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">delegation_pool::DelegationPool</a>, delegator_address: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_assert_min_active_balance">assert_min_active_balance</a>(pool: &<a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>, delegator_address: <b>address</b>) {
+    <b>let</b> balance = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_balance">pool_u64::balance</a>(&pool.active_shares, delegator_address);
+    <b>assert</b>!(balance &gt;= <a href="delegation_pool.md#0x1_delegation_pool_MIN_COINS_ON_SHARES_POOL">MIN_COINS_ON_SHARES_POOL</a>, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="delegation_pool.md#0x1_delegation_pool_EDELEGATOR_ACTIVE_BALANCE_TOO_LOW">EDELEGATOR_ACTIVE_BALANCE_TOO_LOW</a>));
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_assert_min_pending_inactive_balance"></a>
+
+## Function `assert_min_pending_inactive_balance`
+
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_assert_min_pending_inactive_balance">assert_min_pending_inactive_balance</a>(pool: &<a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">delegation_pool::DelegationPool</a>, delegator_address: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_assert_min_pending_inactive_balance">assert_min_pending_inactive_balance</a>(pool: &<a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>, delegator_address: <b>address</b>) {
+    <b>let</b> balance = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_balance">pool_u64::balance</a>(<a href="delegation_pool.md#0x1_delegation_pool_pending_inactive_shares_pool">pending_inactive_shares_pool</a>(pool), delegator_address);
+    <b>assert</b>!(
+        balance &gt;= <a href="delegation_pool.md#0x1_delegation_pool_MIN_COINS_ON_SHARES_POOL">MIN_COINS_ON_SHARES_POOL</a>,
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="delegation_pool.md#0x1_delegation_pool_EDELEGATOR_PENDING_INACTIVE_BALANCE_TOO_LOW">EDELEGATOR_PENDING_INACTIVE_BALANCE_TOO_LOW</a>)
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_assert_partial_governance_voting_enabled"></a>
+
+## Function `assert_partial_governance_voting_enabled`
+
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_assert_partial_governance_voting_enabled">assert_partial_governance_voting_enabled</a>(pool_address: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_assert_partial_governance_voting_enabled">assert_partial_governance_voting_enabled</a>(pool_address: <b>address</b>) {
+    <a href="delegation_pool.md#0x1_delegation_pool_assert_delegation_pool_exists">assert_delegation_pool_exists</a>(pool_address);
+    <b>assert</b>!(
+        <a href="delegation_pool.md#0x1_delegation_pool_partial_governance_voting_enabled">partial_governance_voting_enabled</a>(pool_address),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="delegation_pool.md#0x1_delegation_pool_EPARTIAL_GOVERNANCE_VOTING_NOT_ENABLED">EPARTIAL_GOVERNANCE_VOTING_NOT_ENABLED</a>)
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_assert_allowlisting_enabled"></a>
+
+## Function `assert_allowlisting_enabled`
+
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_assert_allowlisting_enabled">assert_allowlisting_enabled</a>(pool_address: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_assert_allowlisting_enabled">assert_allowlisting_enabled</a>(pool_address: <b>address</b>) {
+    <b>assert</b>!(<a href="delegation_pool.md#0x1_delegation_pool_allowlisting_enabled">allowlisting_enabled</a>(pool_address), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="delegation_pool.md#0x1_delegation_pool_EDELEGATORS_ALLOWLISTING_NOT_ENABLED">EDELEGATORS_ALLOWLISTING_NOT_ENABLED</a>));
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_assert_delegator_allowlisted"></a>
+
+## Function `assert_delegator_allowlisted`
+
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_assert_delegator_allowlisted">assert_delegator_allowlisted</a>(pool_address: <b>address</b>, delegator_address: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_assert_delegator_allowlisted">assert_delegator_allowlisted</a>(
+    pool_address: <b>address</b>,
+    delegator_address: <b>address</b>,
+) <b>acquires</b> <a href="delegation_pool.md#0x1_delegation_pool_DelegationPoolAllowlisting">DelegationPoolAllowlisting</a> {
+    <b>assert</b>!(
+        <a href="delegation_pool.md#0x1_delegation_pool_delegator_allowlisted">delegator_allowlisted</a>(pool_address, delegator_address),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="delegation_pool.md#0x1_delegation_pool_EDELEGATOR_NOT_ALLOWLISTED">EDELEGATOR_NOT_ALLOWLISTED</a>)
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_coins_to_redeem_to_ensure_min_stake"></a>
+
+## Function `coins_to_redeem_to_ensure_min_stake`
+
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_coins_to_redeem_to_ensure_min_stake">coins_to_redeem_to_ensure_min_stake</a>(src_shares_pool: &<a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">pool_u64_unbound::Pool</a>, shareholder: <b>address</b>, amount: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_coins_to_redeem_to_ensure_min_stake">coins_to_redeem_to_ensure_min_stake</a>(
+    src_shares_pool: &<a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_Pool">pool_u64::Pool</a>,
+    shareholder: <b>address</b>,
+    amount: u64,
+): u64 {
+    // find how many coins would be redeemed <b>if</b> supplying `amount`
+    <b>let</b> redeemed_coins = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_shares_to_amount">pool_u64::shares_to_amount</a>(
+        src_shares_pool,
+        <a href="delegation_pool.md#0x1_delegation_pool_amount_to_shares_to_redeem">amount_to_shares_to_redeem</a>(src_shares_pool, shareholder, amount)
+    );
+    // <b>if</b> balance drops under threshold then redeem it entirely
+    <b>let</b> src_balance = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_balance">pool_u64::balance</a>(src_shares_pool, shareholder);
+    <b>if</b> (src_balance - redeemed_coins &lt; <a href="delegation_pool.md#0x1_delegation_pool_MIN_COINS_ON_SHARES_POOL">MIN_COINS_ON_SHARES_POOL</a>) {
+        amount = src_balance;
+    };
+    amount
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_coins_to_transfer_to_ensure_min_stake"></a>
+
+## Function `coins_to_transfer_to_ensure_min_stake`
+
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_coins_to_transfer_to_ensure_min_stake">coins_to_transfer_to_ensure_min_stake</a>(src_shares_pool: &<a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">pool_u64_unbound::Pool</a>, dst_shares_pool: &<a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">pool_u64_unbound::Pool</a>, shareholder: <b>address</b>, amount: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_coins_to_transfer_to_ensure_min_stake">coins_to_transfer_to_ensure_min_stake</a>(
+    src_shares_pool: &<a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_Pool">pool_u64::Pool</a>,
+    dst_shares_pool: &<a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_Pool">pool_u64::Pool</a>,
+    shareholder: <b>address</b>,
+    amount: u64,
+): u64 {
+    // find how many coins would be redeemed from source <b>if</b> supplying `amount`
+    <b>let</b> redeemed_coins = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_shares_to_amount">pool_u64::shares_to_amount</a>(
+        src_shares_pool,
+        <a href="delegation_pool.md#0x1_delegation_pool_amount_to_shares_to_redeem">amount_to_shares_to_redeem</a>(src_shares_pool, shareholder, amount)
+    );
+    // <b>if</b> balance on destination would be less than threshold then redeem difference <b>to</b> threshold
+    <b>let</b> dst_balance = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_balance">pool_u64::balance</a>(dst_shares_pool, shareholder);
+    <b>if</b> (dst_balance + redeemed_coins &lt; <a href="delegation_pool.md#0x1_delegation_pool_MIN_COINS_ON_SHARES_POOL">MIN_COINS_ON_SHARES_POOL</a>) {
+        // `redeemed_coins` &gt;= `amount` - 1 <b>as</b> redeem can lose at most 1 <a href="coin.md#0x1_coin">coin</a>
+        amount = <a href="delegation_pool.md#0x1_delegation_pool_MIN_COINS_ON_SHARES_POOL">MIN_COINS_ON_SHARES_POOL</a> - dst_balance + 1;
+    };
+    // check <b>if</b> new `amount` drops balance on source under threshold and adjust
+    <a href="delegation_pool.md#0x1_delegation_pool_coins_to_redeem_to_ensure_min_stake">coins_to_redeem_to_ensure_min_stake</a>(src_shares_pool, shareholder, amount)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_retrieve_stake_pool_owner"></a>
+
+## Function `retrieve_stake_pool_owner`
+
+Retrieves the shared resource account owning the stake pool in order
+to forward a stake-management operation to this underlying pool.
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_retrieve_stake_pool_owner">retrieve_stake_pool_owner</a>(pool: &<a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">delegation_pool::DelegationPool</a>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_retrieve_stake_pool_owner">retrieve_stake_pool_owner</a>(pool: &<a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a> {
+    <a href="account.md#0x1_account_create_signer_with_capability">account::create_signer_with_capability</a>(&pool.stake_pool_signer_cap)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_get_pool_address"></a>
+
+## Function `get_pool_address`
+
+Get the address of delegation pool reference <code>pool</code>.
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_get_pool_address">get_pool_address</a>(pool: &<a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">delegation_pool::DelegationPool</a>): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_get_pool_address">get_pool_address</a>(pool: &<a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>): <b>address</b> {
+    <a href="account.md#0x1_account_get_signer_capability_address">account::get_signer_capability_address</a>(&pool.stake_pool_signer_cap)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_get_delegator_active_shares"></a>
+
+## Function `get_delegator_active_shares`
+
+Get the active share amount of the delegator.
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_get_delegator_active_shares">get_delegator_active_shares</a>(pool: &<a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">delegation_pool::DelegationPool</a>, delegator: <b>address</b>): u128
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_get_delegator_active_shares">get_delegator_active_shares</a>(pool: &<a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>, delegator: <b>address</b>): u128 {
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_shares">pool_u64::shares</a>(&pool.active_shares, delegator)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_get_delegator_pending_inactive_shares"></a>
+
+## Function `get_delegator_pending_inactive_shares`
+
+Get the pending inactive share amount of the delegator.
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_get_delegator_pending_inactive_shares">get_delegator_pending_inactive_shares</a>(pool: &<a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">delegation_pool::DelegationPool</a>, delegator: <b>address</b>): u128
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_get_delegator_pending_inactive_shares">get_delegator_pending_inactive_shares</a>(pool: &<a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>, delegator: <b>address</b>): u128 {
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_shares">pool_u64::shares</a>(<a href="delegation_pool.md#0x1_delegation_pool_pending_inactive_shares_pool">pending_inactive_shares_pool</a>(pool), delegator)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_get_used_voting_power"></a>
+
+## Function `get_used_voting_power`
+
+Get the used voting power of a voter on a proposal.
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_get_used_voting_power">get_used_voting_power</a>(governance_records: &<a href="delegation_pool.md#0x1_delegation_pool_GovernanceRecords">delegation_pool::GovernanceRecords</a>, voter: <b>address</b>, proposal_id: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_get_used_voting_power">get_used_voting_power</a>(governance_records: &<a href="delegation_pool.md#0x1_delegation_pool_GovernanceRecords">GovernanceRecords</a>, voter: <b>address</b>, proposal_id: u64): u64 {
+    <b>let</b> votes = &governance_records.votes;
+    <b>let</b> key = <a href="delegation_pool.md#0x1_delegation_pool_VotingRecordKey">VotingRecordKey</a> {
+        voter,
+        proposal_id,
+    };
+    *<a href="../../../aptos-stdlib/tests/compiler-v2-doc/smart_table.md#0x1_smart_table_borrow_with_default">smart_table::borrow_with_default</a>(votes, key, &0)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_create_resource_account_seed"></a>
+
+## Function `create_resource_account_seed`
+
+Create the seed to derive the resource account address.
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_create_resource_account_seed">create_resource_account_seed</a>(delegation_pool_creation_seed: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_create_resource_account_seed">create_resource_account_seed</a>(
+    delegation_pool_creation_seed: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; {
+    <b>let</b> seed = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_empty">vector::empty</a>&lt;u8&gt;();
+    // <b>include</b> <b>module</b> salt (before <a href="../../../aptos-stdlib/tests/compiler-v2-doc/any.md#0x1_any">any</a> subseeds) <b>to</b> avoid conflicts <b>with</b> other modules creating resource accounts
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_append">vector::append</a>(&<b>mut</b> seed, <a href="delegation_pool.md#0x1_delegation_pool_MODULE_SALT">MODULE_SALT</a>);
+    // <b>include</b> an additional salt in case the same resource <a href="account.md#0x1_account">account</a> <b>has</b> already been created
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_append">vector::append</a>(&<b>mut</b> seed, delegation_pool_creation_seed);
+    seed
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_borrow_mut_used_voting_power"></a>
+
+## Function `borrow_mut_used_voting_power`
+
+Borrow the mutable used voting power of a voter on a proposal.
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_borrow_mut_used_voting_power">borrow_mut_used_voting_power</a>(governance_records: &<b>mut</b> <a href="delegation_pool.md#0x1_delegation_pool_GovernanceRecords">delegation_pool::GovernanceRecords</a>, voter: <b>address</b>, proposal_id: u64): &<b>mut</b> u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_borrow_mut_used_voting_power">borrow_mut_used_voting_power</a>(
+    governance_records: &<b>mut</b> <a href="delegation_pool.md#0x1_delegation_pool_GovernanceRecords">GovernanceRecords</a>,
+    voter: <b>address</b>,
+    proposal_id: u64
+): &<b>mut</b> u64 {
+    <b>let</b> votes = &<b>mut</b> governance_records.votes;
+    <b>let</b> key = <a href="delegation_pool.md#0x1_delegation_pool_VotingRecordKey">VotingRecordKey</a> {
+        proposal_id,
+        voter,
+    };
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/smart_table.md#0x1_smart_table_borrow_mut_with_default">smart_table::borrow_mut_with_default</a>(votes, key, 0)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_update_and_borrow_mut_delegator_vote_delegation"></a>
+
+## Function `update_and_borrow_mut_delegator_vote_delegation`
+
+Update VoteDelegation of a delegator to up-to-date then borrow_mut it.
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_update_and_borrow_mut_delegator_vote_delegation">update_and_borrow_mut_delegator_vote_delegation</a>(pool: &<a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">delegation_pool::DelegationPool</a>, governance_records: &<b>mut</b> <a href="delegation_pool.md#0x1_delegation_pool_GovernanceRecords">delegation_pool::GovernanceRecords</a>, delegator: <b>address</b>): &<b>mut</b> <a href="delegation_pool.md#0x1_delegation_pool_VoteDelegation">delegation_pool::VoteDelegation</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_update_and_borrow_mut_delegator_vote_delegation">update_and_borrow_mut_delegator_vote_delegation</a>(
+    pool: &<a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>,
+    governance_records: &<b>mut</b> <a href="delegation_pool.md#0x1_delegation_pool_GovernanceRecords">GovernanceRecords</a>,
+    delegator: <b>address</b>
+): &<b>mut</b> <a href="delegation_pool.md#0x1_delegation_pool_VoteDelegation">VoteDelegation</a> {
+    <b>let</b> pool_address = <a href="delegation_pool.md#0x1_delegation_pool_get_pool_address">get_pool_address</a>(pool);
+    <b>let</b> locked_until_secs = <a href="stake.md#0x1_stake_get_lockup_secs">stake::get_lockup_secs</a>(pool_address);
+
+    <b>let</b> vote_delegation_table = &<b>mut</b> governance_records.vote_delegation;
+    // By default, a delegator's delegated voter is itself.
+    // TODO: recycle storage when <a href="delegation_pool.md#0x1_delegation_pool_VoteDelegation">VoteDelegation</a> equals <b>to</b> default value.
+    <b>if</b> (!<a href="../../../aptos-stdlib/tests/compiler-v2-doc/smart_table.md#0x1_smart_table_contains">smart_table::contains</a>(vote_delegation_table, delegator)) {
+        <b>return</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/smart_table.md#0x1_smart_table_borrow_mut_with_default">smart_table::borrow_mut_with_default</a>(vote_delegation_table, delegator, <a href="delegation_pool.md#0x1_delegation_pool_VoteDelegation">VoteDelegation</a> {
+            voter: delegator,
+            last_locked_until_secs: locked_until_secs,
+            pending_voter: delegator,
+        })
+    };
+
+    <b>let</b> vote_delegation = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/smart_table.md#0x1_smart_table_borrow_mut">smart_table::borrow_mut</a>(vote_delegation_table, delegator);
+    // A lockup period <b>has</b> passed since last time `vote_delegation` was updated. Pending voter takes effect.
+    <b>if</b> (vote_delegation.last_locked_until_secs &lt; locked_until_secs) {
+        vote_delegation.voter = vote_delegation.pending_voter;
+        vote_delegation.last_locked_until_secs = locked_until_secs;
+    };
+    vote_delegation
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_update_and_borrow_mut_delegated_votes"></a>
+
+## Function `update_and_borrow_mut_delegated_votes`
+
+Update DelegatedVotes of a voter to up-to-date then borrow_mut it.
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_update_and_borrow_mut_delegated_votes">update_and_borrow_mut_delegated_votes</a>(pool: &<a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">delegation_pool::DelegationPool</a>, governance_records: &<b>mut</b> <a href="delegation_pool.md#0x1_delegation_pool_GovernanceRecords">delegation_pool::GovernanceRecords</a>, voter: <b>address</b>): &<b>mut</b> <a href="delegation_pool.md#0x1_delegation_pool_DelegatedVotes">delegation_pool::DelegatedVotes</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_update_and_borrow_mut_delegated_votes">update_and_borrow_mut_delegated_votes</a>(
+    pool: &<a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>,
+    governance_records: &<b>mut</b> <a href="delegation_pool.md#0x1_delegation_pool_GovernanceRecords">GovernanceRecords</a>,
+    voter: <b>address</b>
+): &<b>mut</b> <a href="delegation_pool.md#0x1_delegation_pool_DelegatedVotes">DelegatedVotes</a> {
+    <b>let</b> pool_address = <a href="delegation_pool.md#0x1_delegation_pool_get_pool_address">get_pool_address</a>(pool);
+    <b>let</b> locked_until_secs = <a href="stake.md#0x1_stake_get_lockup_secs">stake::get_lockup_secs</a>(pool_address);
+
+    <b>let</b> delegated_votes_per_voter = &<b>mut</b> governance_records.delegated_votes;
+    // By default, a delegator's voter is itself.
+    // TODO: recycle storage when <a href="delegation_pool.md#0x1_delegation_pool_DelegatedVotes">DelegatedVotes</a> equals <b>to</b> default value.
+    <b>if</b> (!<a href="../../../aptos-stdlib/tests/compiler-v2-doc/smart_table.md#0x1_smart_table_contains">smart_table::contains</a>(delegated_votes_per_voter, voter)) {
+        <b>let</b> active_shares = <a href="delegation_pool.md#0x1_delegation_pool_get_delegator_active_shares">get_delegator_active_shares</a>(pool, voter);
+        <b>let</b> inactive_shares = <a href="delegation_pool.md#0x1_delegation_pool_get_delegator_pending_inactive_shares">get_delegator_pending_inactive_shares</a>(pool, voter);
+        <b>return</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/smart_table.md#0x1_smart_table_borrow_mut_with_default">smart_table::borrow_mut_with_default</a>(delegated_votes_per_voter, voter, <a href="delegation_pool.md#0x1_delegation_pool_DelegatedVotes">DelegatedVotes</a> {
+            active_shares,
+            pending_inactive_shares: inactive_shares,
+            active_shares_next_lockup: active_shares,
+            last_locked_until_secs: locked_until_secs,
+        })
+    };
+
+    <b>let</b> delegated_votes = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/smart_table.md#0x1_smart_table_borrow_mut">smart_table::borrow_mut</a>(delegated_votes_per_voter, voter);
+    // A lockup period <b>has</b> passed since last time `delegated_votes` was updated. Pending voter takes effect.
+    <b>if</b> (delegated_votes.last_locked_until_secs &lt; locked_until_secs) {
+        delegated_votes.active_shares = delegated_votes.active_shares_next_lockup;
+        delegated_votes.pending_inactive_shares = 0;
+        delegated_votes.last_locked_until_secs = locked_until_secs;
+    };
+    delegated_votes
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_olc_with_index"></a>
+
+## Function `olc_with_index`
+
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_olc_with_index">olc_with_index</a>(index: u64): <a href="delegation_pool.md#0x1_delegation_pool_ObservedLockupCycle">delegation_pool::ObservedLockupCycle</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_olc_with_index">olc_with_index</a>(index: u64): <a href="delegation_pool.md#0x1_delegation_pool_ObservedLockupCycle">ObservedLockupCycle</a> {
+    <a href="delegation_pool.md#0x1_delegation_pool_ObservedLockupCycle">ObservedLockupCycle</a> { index }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_calculate_total_voting_power"></a>
+
+## Function `calculate_total_voting_power`
+
+Given the amounts of shares in <code>active_shares</code> pool and <code>inactive_shares</code> pool, calculate the total voting
+power, which equals to the sum of the coin amounts.
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_calculate_total_voting_power">calculate_total_voting_power</a>(<a href="delegation_pool.md#0x1_delegation_pool">delegation_pool</a>: &<a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">delegation_pool::DelegationPool</a>, latest_delegated_votes: &<a href="delegation_pool.md#0x1_delegation_pool_DelegatedVotes">delegation_pool::DelegatedVotes</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_calculate_total_voting_power">calculate_total_voting_power</a>(<a href="delegation_pool.md#0x1_delegation_pool">delegation_pool</a>: &<a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>, latest_delegated_votes: &<a href="delegation_pool.md#0x1_delegation_pool_DelegatedVotes">DelegatedVotes</a>): u64 {
+    <b>let</b> active_amount = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_shares_to_amount">pool_u64::shares_to_amount</a>(
+        &<a href="delegation_pool.md#0x1_delegation_pool">delegation_pool</a>.active_shares,
+        latest_delegated_votes.active_shares);
+    <b>let</b> pending_inactive_amount = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_shares_to_amount">pool_u64::shares_to_amount</a>(
+        <a href="delegation_pool.md#0x1_delegation_pool_pending_inactive_shares_pool">pending_inactive_shares_pool</a>(<a href="delegation_pool.md#0x1_delegation_pool">delegation_pool</a>),
+        latest_delegated_votes.pending_inactive_shares);
+    active_amount + pending_inactive_amount
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_calculate_and_update_delegator_voter_internal"></a>
+
+## Function `calculate_and_update_delegator_voter_internal`
+
+Update VoteDelegation of a delegator to up-to-date then return the latest voter.
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_calculate_and_update_delegator_voter_internal">calculate_and_update_delegator_voter_internal</a>(pool: &<a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">delegation_pool::DelegationPool</a>, governance_records: &<b>mut</b> <a href="delegation_pool.md#0x1_delegation_pool_GovernanceRecords">delegation_pool::GovernanceRecords</a>, delegator: <b>address</b>): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_calculate_and_update_delegator_voter_internal">calculate_and_update_delegator_voter_internal</a>(
+    pool: &<a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>,
+    governance_records: &<b>mut</b> <a href="delegation_pool.md#0x1_delegation_pool_GovernanceRecords">GovernanceRecords</a>,
+    delegator: <b>address</b>
+): <b>address</b> {
+    <b>let</b> vote_delegation = <a href="delegation_pool.md#0x1_delegation_pool_update_and_borrow_mut_delegator_vote_delegation">update_and_borrow_mut_delegator_vote_delegation</a>(pool, governance_records, delegator);
+    vote_delegation.voter
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_calculate_and_update_delegated_votes"></a>
+
+## Function `calculate_and_update_delegated_votes`
+
+Update DelegatedVotes of a voter to up-to-date then return the total voting power of this voter.
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_calculate_and_update_delegated_votes">calculate_and_update_delegated_votes</a>(pool: &<a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">delegation_pool::DelegationPool</a>, governance_records: &<b>mut</b> <a href="delegation_pool.md#0x1_delegation_pool_GovernanceRecords">delegation_pool::GovernanceRecords</a>, voter: <b>address</b>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_calculate_and_update_delegated_votes">calculate_and_update_delegated_votes</a>(
+    pool: &<a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>,
+    governance_records: &<b>mut</b> <a href="delegation_pool.md#0x1_delegation_pool_GovernanceRecords">GovernanceRecords</a>,
+    voter: <b>address</b>
+): u64 {
+    <b>let</b> delegated_votes = <a href="delegation_pool.md#0x1_delegation_pool_update_and_borrow_mut_delegated_votes">update_and_borrow_mut_delegated_votes</a>(pool, governance_records, voter);
+    <a href="delegation_pool.md#0x1_delegation_pool_calculate_total_voting_power">calculate_total_voting_power</a>(pool, delegated_votes)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_borrow_mut_delegators_allowlist"></a>
+
+## Function `borrow_mut_delegators_allowlist`
+
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_borrow_mut_delegators_allowlist">borrow_mut_delegators_allowlist</a>(pool_address: <b>address</b>): &<b>mut</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/smart_table.md#0x1_smart_table_SmartTable">smart_table::SmartTable</a>&lt;<b>address</b>, bool&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_borrow_mut_delegators_allowlist">borrow_mut_delegators_allowlist</a>(
+    pool_address: <b>address</b>
+): &<b>mut</b> SmartTable&lt;<b>address</b>, bool&gt; <b>acquires</b> <a href="delegation_pool.md#0x1_delegation_pool_DelegationPoolAllowlisting">DelegationPoolAllowlisting</a> {
+    &<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="delegation_pool.md#0x1_delegation_pool_DelegationPoolAllowlisting">DelegationPoolAllowlisting</a>&gt;(pool_address).allowlist
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_set_operator"></a>
+
+## Function `set_operator`
+
+Allows an owner to change the operator of the underlying stake pool.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_set_operator">set_operator</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, new_operator: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_set_operator">set_operator</a>(
+    owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    new_operator: <b>address</b>
+) <b>acquires</b> <a href="delegation_pool.md#0x1_delegation_pool_DelegationPoolOwnership">DelegationPoolOwnership</a>, <a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>, <a href="delegation_pool.md#0x1_delegation_pool_GovernanceRecords">GovernanceRecords</a>, <a href="delegation_pool.md#0x1_delegation_pool_BeneficiaryForOperator">BeneficiaryForOperator</a>, <a href="delegation_pool.md#0x1_delegation_pool_NextCommissionPercentage">NextCommissionPercentage</a> {
+    <b>let</b> pool_address = <a href="delegation_pool.md#0x1_delegation_pool_get_owned_pool_address">get_owned_pool_address</a>(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(owner));
+    // synchronize delegation and <a href="stake.md#0x1_stake">stake</a> pools before <a href="../../../aptos-stdlib/tests/compiler-v2-doc/any.md#0x1_any">any</a> user operation
+    // ensure the <b>old</b> operator is paid its uncommitted commission rewards
+    <a href="delegation_pool.md#0x1_delegation_pool_synchronize_delegation_pool">synchronize_delegation_pool</a>(pool_address);
+    <a href="stake.md#0x1_stake_set_operator">stake::set_operator</a>(&<a href="delegation_pool.md#0x1_delegation_pool_retrieve_stake_pool_owner">retrieve_stake_pool_owner</a>(<b>borrow_global</b>&lt;<a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>&gt;(pool_address)), new_operator);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_set_beneficiary_for_operator"></a>
+
+## Function `set_beneficiary_for_operator`
+
+Allows an operator to change its beneficiary. Any existing unpaid commission rewards will be paid to the new
+beneficiary. To ensure payment to the current beneficiary, one should first call <code>synchronize_delegation_pool</code>
+before switching the beneficiary. An operator can set one beneficiary for delegation pools, not a separate
+one for each pool.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_set_beneficiary_for_operator">set_beneficiary_for_operator</a>(operator: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, new_beneficiary: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_set_beneficiary_for_operator">set_beneficiary_for_operator</a>(
+    operator: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    new_beneficiary: <b>address</b>
+) <b>acquires</b> <a href="delegation_pool.md#0x1_delegation_pool_BeneficiaryForOperator">BeneficiaryForOperator</a> {
+    <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_operator_beneficiary_change_enabled">features::operator_beneficiary_change_enabled</a>(), std::error::invalid_state(
+        <a href="delegation_pool.md#0x1_delegation_pool_EOPERATOR_BENEFICIARY_CHANGE_NOT_SUPPORTED">EOPERATOR_BENEFICIARY_CHANGE_NOT_SUPPORTED</a>
+    ));
+    // The beneficiay <b>address</b> of an operator is stored under the operator's <b>address</b>.
+    // So, the operator does not need <b>to</b> be validated <b>with</b> respect <b>to</b> a staking pool.
+    <b>let</b> operator_addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(operator);
+    <b>let</b> old_beneficiary = <a href="delegation_pool.md#0x1_delegation_pool_beneficiary_for_operator">beneficiary_for_operator</a>(operator_addr);
+    <b>if</b> (<b>exists</b>&lt;<a href="delegation_pool.md#0x1_delegation_pool_BeneficiaryForOperator">BeneficiaryForOperator</a>&gt;(operator_addr)) {
+        <b>borrow_global_mut</b>&lt;<a href="delegation_pool.md#0x1_delegation_pool_BeneficiaryForOperator">BeneficiaryForOperator</a>&gt;(operator_addr).beneficiary_for_operator = new_beneficiary;
+    } <b>else</b> {
+        <b>move_to</b>(operator, <a href="delegation_pool.md#0x1_delegation_pool_BeneficiaryForOperator">BeneficiaryForOperator</a> { beneficiary_for_operator: new_beneficiary });
+    };
+
+    emit(<a href="delegation_pool.md#0x1_delegation_pool_SetBeneficiaryForOperator">SetBeneficiaryForOperator</a> {
+        operator: operator_addr,
+        old_beneficiary,
+        new_beneficiary,
+    });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_update_commission_percentage"></a>
+
+## Function `update_commission_percentage`
+
+Allows an owner to update the commission percentage for the operator of the underlying stake pool.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_update_commission_percentage">update_commission_percentage</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, new_commission_percentage: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_update_commission_percentage">update_commission_percentage</a>(
+    owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    new_commission_percentage: u64
+) <b>acquires</b> <a href="delegation_pool.md#0x1_delegation_pool_DelegationPoolOwnership">DelegationPoolOwnership</a>, <a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>, <a href="delegation_pool.md#0x1_delegation_pool_GovernanceRecords">GovernanceRecords</a>, <a href="delegation_pool.md#0x1_delegation_pool_BeneficiaryForOperator">BeneficiaryForOperator</a>, <a href="delegation_pool.md#0x1_delegation_pool_NextCommissionPercentage">NextCommissionPercentage</a> {
+    <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_commission_change_delegation_pool_enabled">features::commission_change_delegation_pool_enabled</a>(), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(
+        <a href="delegation_pool.md#0x1_delegation_pool_ECOMMISSION_RATE_CHANGE_NOT_SUPPORTED">ECOMMISSION_RATE_CHANGE_NOT_SUPPORTED</a>
+    ));
+    <b>assert</b>!(new_commission_percentage &lt;= <a href="delegation_pool.md#0x1_delegation_pool_MAX_FEE">MAX_FEE</a>, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="delegation_pool.md#0x1_delegation_pool_EINVALID_COMMISSION_PERCENTAGE">EINVALID_COMMISSION_PERCENTAGE</a>));
+    <b>let</b> owner_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(owner);
+    <b>let</b> pool_address = <a href="delegation_pool.md#0x1_delegation_pool_get_owned_pool_address">get_owned_pool_address</a>(owner_address);
+    <b>assert</b>!(
+        <a href="delegation_pool.md#0x1_delegation_pool_operator_commission_percentage">operator_commission_percentage</a>(pool_address) + <a href="delegation_pool.md#0x1_delegation_pool_MAX_COMMISSION_INCREASE">MAX_COMMISSION_INCREASE</a> &gt;= new_commission_percentage,
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="delegation_pool.md#0x1_delegation_pool_ETOO_LARGE_COMMISSION_INCREASE">ETOO_LARGE_COMMISSION_INCREASE</a>)
+    );
+    <b>assert</b>!(
+        <a href="stake.md#0x1_stake_get_remaining_lockup_secs">stake::get_remaining_lockup_secs</a>(pool_address) &gt;= <a href="delegation_pool.md#0x1_delegation_pool_min_remaining_secs_for_commission_change">min_remaining_secs_for_commission_change</a>(),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="delegation_pool.md#0x1_delegation_pool_ETOO_LATE_COMMISSION_CHANGE">ETOO_LATE_COMMISSION_CHANGE</a>)
+    );
+
+    // synchronize delegation and <a href="stake.md#0x1_stake">stake</a> pools before <a href="../../../aptos-stdlib/tests/compiler-v2-doc/any.md#0x1_any">any</a> user operation. this <b>ensures</b>:
+    // (1) the operator is paid its uncommitted commission rewards <b>with</b> the <b>old</b> commission percentage, and
+    // (2) <a href="../../../aptos-stdlib/tests/compiler-v2-doc/any.md#0x1_any">any</a> pending commission percentage change is applied before the new commission percentage is set.
+    <a href="delegation_pool.md#0x1_delegation_pool_synchronize_delegation_pool">synchronize_delegation_pool</a>(pool_address);
+
+    <b>if</b> (<b>exists</b>&lt;<a href="delegation_pool.md#0x1_delegation_pool_NextCommissionPercentage">NextCommissionPercentage</a>&gt;(pool_address)) {
+        <b>let</b> commission_percentage = <b>borrow_global_mut</b>&lt;<a href="delegation_pool.md#0x1_delegation_pool_NextCommissionPercentage">NextCommissionPercentage</a>&gt;(pool_address);
+        commission_percentage.commission_percentage_next_lockup_cycle = new_commission_percentage;
+        commission_percentage.effective_after_secs = <a href="stake.md#0x1_stake_get_lockup_secs">stake::get_lockup_secs</a>(pool_address);
+    } <b>else</b> {
+        <b>let</b> <a href="delegation_pool.md#0x1_delegation_pool">delegation_pool</a> = <b>borrow_global</b>&lt;<a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>&gt;(pool_address);
+        <b>let</b> pool_signer = <a href="account.md#0x1_account_create_signer_with_capability">account::create_signer_with_capability</a>(&<a href="delegation_pool.md#0x1_delegation_pool">delegation_pool</a>.stake_pool_signer_cap);
+        <b>move_to</b>(&pool_signer, <a href="delegation_pool.md#0x1_delegation_pool_NextCommissionPercentage">NextCommissionPercentage</a> {
+            commission_percentage_next_lockup_cycle: new_commission_percentage,
+            effective_after_secs: <a href="stake.md#0x1_stake_get_lockup_secs">stake::get_lockup_secs</a>(pool_address),
+        });
+    };
+
+    <a href="event.md#0x1_event_emit">event::emit</a>(<a href="delegation_pool.md#0x1_delegation_pool_CommissionPercentageChange">CommissionPercentageChange</a> {
+        pool_address,
+        owner: owner_address,
+        commission_percentage_next_lockup_cycle: new_commission_percentage,
+    });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_set_delegated_voter"></a>
+
+## Function `set_delegated_voter`
+
+Allows an owner to change the delegated voter of the underlying stake pool.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_set_delegated_voter">set_delegated_voter</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, new_voter: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_set_delegated_voter">set_delegated_voter</a>(
+    owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    new_voter: <b>address</b>
+) <b>acquires</b> <a href="delegation_pool.md#0x1_delegation_pool_DelegationPoolOwnership">DelegationPoolOwnership</a>, <a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>, <a href="delegation_pool.md#0x1_delegation_pool_GovernanceRecords">GovernanceRecords</a>, <a href="delegation_pool.md#0x1_delegation_pool_BeneficiaryForOperator">BeneficiaryForOperator</a>, <a href="delegation_pool.md#0x1_delegation_pool_NextCommissionPercentage">NextCommissionPercentage</a> {
+    // No one can change delegated_voter once the partial governance <a href="voting.md#0x1_voting">voting</a> feature is enabled.
+    <b>assert</b>!(
+        !<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_delegation_pool_partial_governance_voting_enabled">features::delegation_pool_partial_governance_voting_enabled</a>(),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="delegation_pool.md#0x1_delegation_pool_EDEPRECATED_FUNCTION">EDEPRECATED_FUNCTION</a>)
+    );
+    <b>let</b> pool_address = <a href="delegation_pool.md#0x1_delegation_pool_get_owned_pool_address">get_owned_pool_address</a>(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(owner));
+    // synchronize delegation and <a href="stake.md#0x1_stake">stake</a> pools before <a href="../../../aptos-stdlib/tests/compiler-v2-doc/any.md#0x1_any">any</a> user operation
+    <a href="delegation_pool.md#0x1_delegation_pool_synchronize_delegation_pool">synchronize_delegation_pool</a>(pool_address);
+    <a href="stake.md#0x1_stake_set_delegated_voter">stake::set_delegated_voter</a>(&<a href="delegation_pool.md#0x1_delegation_pool_retrieve_stake_pool_owner">retrieve_stake_pool_owner</a>(<b>borrow_global</b>&lt;<a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>&gt;(pool_address)), new_voter);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_delegate_voting_power"></a>
+
+## Function `delegate_voting_power`
+
+Allows a delegator to delegate its voting power to a voter. If this delegator already has a delegated voter,
+this change won't take effects until the next lockup period.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_delegate_voting_power">delegate_voting_power</a>(delegator: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, pool_address: <b>address</b>, new_voter: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_delegate_voting_power">delegate_voting_power</a>(
+    delegator: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    pool_address: <b>address</b>,
+    new_voter: <b>address</b>
+) <b>acquires</b> <a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>, <a href="delegation_pool.md#0x1_delegation_pool_GovernanceRecords">GovernanceRecords</a>, <a href="delegation_pool.md#0x1_delegation_pool_BeneficiaryForOperator">BeneficiaryForOperator</a>, <a href="delegation_pool.md#0x1_delegation_pool_NextCommissionPercentage">NextCommissionPercentage</a> {
+    <a href="delegation_pool.md#0x1_delegation_pool_assert_partial_governance_voting_enabled">assert_partial_governance_voting_enabled</a>(pool_address);
+
+    // synchronize delegation and <a href="stake.md#0x1_stake">stake</a> pools before <a href="../../../aptos-stdlib/tests/compiler-v2-doc/any.md#0x1_any">any</a> user operation
+    <a href="delegation_pool.md#0x1_delegation_pool_synchronize_delegation_pool">synchronize_delegation_pool</a>(pool_address);
+
+    <b>let</b> delegator_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(delegator);
+    <b>let</b> <a href="delegation_pool.md#0x1_delegation_pool">delegation_pool</a> = <b>borrow_global</b>&lt;<a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>&gt;(pool_address);
+    <b>let</b> governance_records = <b>borrow_global_mut</b>&lt;<a href="delegation_pool.md#0x1_delegation_pool_GovernanceRecords">GovernanceRecords</a>&gt;(pool_address);
+    <b>let</b> delegator_vote_delegation = <a href="delegation_pool.md#0x1_delegation_pool_update_and_borrow_mut_delegator_vote_delegation">update_and_borrow_mut_delegator_vote_delegation</a>(
+        <a href="delegation_pool.md#0x1_delegation_pool">delegation_pool</a>,
+        governance_records,
+        delegator_address
+    );
+    <b>let</b> pending_voter: <b>address</b> = delegator_vote_delegation.pending_voter;
+
+    // No need <b>to</b> <b>update</b> <b>if</b> the voter doesn't really change.
+    <b>if</b> (pending_voter != new_voter) {
+        delegator_vote_delegation.pending_voter = new_voter;
+        <b>let</b> active_shares = <a href="delegation_pool.md#0x1_delegation_pool_get_delegator_active_shares">get_delegator_active_shares</a>(<a href="delegation_pool.md#0x1_delegation_pool">delegation_pool</a>, delegator_address);
+        // &lt;active shares&gt; of &lt;pending voter of shareholder&gt; -= &lt;active_shares&gt;
+        // &lt;active shares&gt; of &lt;new voter of shareholder&gt; += &lt;active_shares&gt;
+        <b>let</b> pending_delegated_votes = <a href="delegation_pool.md#0x1_delegation_pool_update_and_borrow_mut_delegated_votes">update_and_borrow_mut_delegated_votes</a>(
+            <a href="delegation_pool.md#0x1_delegation_pool">delegation_pool</a>,
+            governance_records,
+            pending_voter
+        );
+        pending_delegated_votes.active_shares_next_lockup =
+            pending_delegated_votes.active_shares_next_lockup - active_shares;
+
+        <b>let</b> new_delegated_votes = <a href="delegation_pool.md#0x1_delegation_pool_update_and_borrow_mut_delegated_votes">update_and_borrow_mut_delegated_votes</a>(
+            <a href="delegation_pool.md#0x1_delegation_pool">delegation_pool</a>,
+            governance_records,
+            new_voter
+        );
+        new_delegated_votes.active_shares_next_lockup =
+            new_delegated_votes.active_shares_next_lockup + active_shares;
+    };
+
+    <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_module_event_migration_enabled">features::module_event_migration_enabled</a>()) {
+        <a href="event.md#0x1_event_emit">event::emit</a>(<a href="delegation_pool.md#0x1_delegation_pool_DelegateVotingPower">DelegateVotingPower</a> {
+            pool_address,
+            delegator: delegator_address,
+            voter: new_voter,
+        })
+    };
+
+    <a href="event.md#0x1_event_emit_event">event::emit_event</a>(&<b>mut</b> governance_records.delegate_voting_power_events, <a href="delegation_pool.md#0x1_delegation_pool_DelegateVotingPowerEvent">DelegateVotingPowerEvent</a> {
+        pool_address,
+        delegator: delegator_address,
+        voter: new_voter,
+    });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_enable_delegators_allowlisting"></a>
+
+## Function `enable_delegators_allowlisting`
+
+Enable delegators allowlisting as the pool owner.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_enable_delegators_allowlisting">enable_delegators_allowlisting</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_enable_delegators_allowlisting">enable_delegators_allowlisting</a>(
+    owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+) <b>acquires</b> <a href="delegation_pool.md#0x1_delegation_pool_DelegationPoolOwnership">DelegationPoolOwnership</a>, <a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a> {
+    <b>assert</b>!(
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_delegation_pool_allowlisting_enabled">features::delegation_pool_allowlisting_enabled</a>(),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="delegation_pool.md#0x1_delegation_pool_EDELEGATORS_ALLOWLISTING_NOT_SUPPORTED">EDELEGATORS_ALLOWLISTING_NOT_SUPPORTED</a>)
+    );
+
+    <b>let</b> pool_address = <a href="delegation_pool.md#0x1_delegation_pool_get_owned_pool_address">get_owned_pool_address</a>(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(owner));
+    <b>if</b> (<a href="delegation_pool.md#0x1_delegation_pool_allowlisting_enabled">allowlisting_enabled</a>(pool_address)) { <b>return</b> };
+
+    <b>let</b> pool_signer = <a href="delegation_pool.md#0x1_delegation_pool_retrieve_stake_pool_owner">retrieve_stake_pool_owner</a>(<b>borrow_global</b>&lt;<a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>&gt;(pool_address));
+    <b>move_to</b>(&pool_signer, <a href="delegation_pool.md#0x1_delegation_pool_DelegationPoolAllowlisting">DelegationPoolAllowlisting</a> { allowlist: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/smart_table.md#0x1_smart_table_new">smart_table::new</a>&lt;<b>address</b>, bool&gt;() });
+
+    <a href="event.md#0x1_event_emit">event::emit</a>(<a href="delegation_pool.md#0x1_delegation_pool_EnableDelegatorsAllowlisting">EnableDelegatorsAllowlisting</a> { pool_address });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_disable_delegators_allowlisting"></a>
+
+## Function `disable_delegators_allowlisting`
+
+Disable delegators allowlisting as the pool owner. The existing allowlist will be emptied.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_disable_delegators_allowlisting">disable_delegators_allowlisting</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_disable_delegators_allowlisting">disable_delegators_allowlisting</a>(
+    owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+) <b>acquires</b> <a href="delegation_pool.md#0x1_delegation_pool_DelegationPoolOwnership">DelegationPoolOwnership</a>, <a href="delegation_pool.md#0x1_delegation_pool_DelegationPoolAllowlisting">DelegationPoolAllowlisting</a> {
+    <b>let</b> pool_address = <a href="delegation_pool.md#0x1_delegation_pool_get_owned_pool_address">get_owned_pool_address</a>(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(owner));
+    <a href="delegation_pool.md#0x1_delegation_pool_assert_allowlisting_enabled">assert_allowlisting_enabled</a>(pool_address);
+
+    <b>let</b> <a href="delegation_pool.md#0x1_delegation_pool_DelegationPoolAllowlisting">DelegationPoolAllowlisting</a> { allowlist } = <b>move_from</b>&lt;<a href="delegation_pool.md#0x1_delegation_pool_DelegationPoolAllowlisting">DelegationPoolAllowlisting</a>&gt;(pool_address);
+    // <b>if</b> the allowlist becomes too large, the owner can always remove some delegators
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/smart_table.md#0x1_smart_table_destroy">smart_table::destroy</a>(allowlist);
+
+    <a href="event.md#0x1_event_emit">event::emit</a>(<a href="delegation_pool.md#0x1_delegation_pool_DisableDelegatorsAllowlisting">DisableDelegatorsAllowlisting</a> { pool_address });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_allowlist_delegator"></a>
+
+## Function `allowlist_delegator`
+
+Allowlist a delegator as the pool owner.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_allowlist_delegator">allowlist_delegator</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, delegator_address: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_allowlist_delegator">allowlist_delegator</a>(
+    owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    delegator_address: <b>address</b>,
+) <b>acquires</b> <a href="delegation_pool.md#0x1_delegation_pool_DelegationPoolOwnership">DelegationPoolOwnership</a>, <a href="delegation_pool.md#0x1_delegation_pool_DelegationPoolAllowlisting">DelegationPoolAllowlisting</a> {
+    <b>let</b> pool_address = <a href="delegation_pool.md#0x1_delegation_pool_get_owned_pool_address">get_owned_pool_address</a>(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(owner));
+    <a href="delegation_pool.md#0x1_delegation_pool_assert_allowlisting_enabled">assert_allowlisting_enabled</a>(pool_address);
+
+    <b>if</b> (<a href="delegation_pool.md#0x1_delegation_pool_delegator_allowlisted">delegator_allowlisted</a>(pool_address, delegator_address)) { <b>return</b> };
+
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/smart_table.md#0x1_smart_table_add">smart_table::add</a>(<a href="delegation_pool.md#0x1_delegation_pool_borrow_mut_delegators_allowlist">borrow_mut_delegators_allowlist</a>(pool_address), delegator_address, <b>true</b>);
+
+    <a href="event.md#0x1_event_emit">event::emit</a>(<a href="delegation_pool.md#0x1_delegation_pool_AllowlistDelegator">AllowlistDelegator</a> { pool_address, delegator_address });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_remove_delegator_from_allowlist"></a>
+
+## Function `remove_delegator_from_allowlist`
+
+Remove a delegator from the allowlist as the pool owner, but do not unlock their stake.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_remove_delegator_from_allowlist">remove_delegator_from_allowlist</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, delegator_address: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_remove_delegator_from_allowlist">remove_delegator_from_allowlist</a>(
+    owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    delegator_address: <b>address</b>,
+) <b>acquires</b> <a href="delegation_pool.md#0x1_delegation_pool_DelegationPoolOwnership">DelegationPoolOwnership</a>, <a href="delegation_pool.md#0x1_delegation_pool_DelegationPoolAllowlisting">DelegationPoolAllowlisting</a> {
+    <b>let</b> pool_address = <a href="delegation_pool.md#0x1_delegation_pool_get_owned_pool_address">get_owned_pool_address</a>(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(owner));
+    <a href="delegation_pool.md#0x1_delegation_pool_assert_allowlisting_enabled">assert_allowlisting_enabled</a>(pool_address);
+
+    <b>if</b> (!<a href="delegation_pool.md#0x1_delegation_pool_delegator_allowlisted">delegator_allowlisted</a>(pool_address, delegator_address)) { <b>return</b> };
+
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/smart_table.md#0x1_smart_table_remove">smart_table::remove</a>(<a href="delegation_pool.md#0x1_delegation_pool_borrow_mut_delegators_allowlist">borrow_mut_delegators_allowlist</a>(pool_address), delegator_address);
+
+    <a href="event.md#0x1_event_emit">event::emit</a>(<a href="delegation_pool.md#0x1_delegation_pool_RemoveDelegatorFromAllowlist">RemoveDelegatorFromAllowlist</a> { pool_address, delegator_address });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_evict_delegator"></a>
+
+## Function `evict_delegator`
+
+Evict a delegator that is not allowlisted by unlocking their entire stake.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_evict_delegator">evict_delegator</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, delegator_address: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_evict_delegator">evict_delegator</a>(
+    owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    delegator_address: <b>address</b>,
+) <b>acquires</b> <a href="delegation_pool.md#0x1_delegation_pool_DelegationPoolOwnership">DelegationPoolOwnership</a>, <a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>, <a href="delegation_pool.md#0x1_delegation_pool_GovernanceRecords">GovernanceRecords</a>, <a href="delegation_pool.md#0x1_delegation_pool_BeneficiaryForOperator">BeneficiaryForOperator</a>, <a href="delegation_pool.md#0x1_delegation_pool_NextCommissionPercentage">NextCommissionPercentage</a>, <a href="delegation_pool.md#0x1_delegation_pool_DelegationPoolAllowlisting">DelegationPoolAllowlisting</a> {
+    <b>let</b> pool_address = <a href="delegation_pool.md#0x1_delegation_pool_get_owned_pool_address">get_owned_pool_address</a>(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(owner));
+    <a href="delegation_pool.md#0x1_delegation_pool_assert_allowlisting_enabled">assert_allowlisting_enabled</a>(pool_address);
+    <b>assert</b>!(
+        !<a href="delegation_pool.md#0x1_delegation_pool_delegator_allowlisted">delegator_allowlisted</a>(pool_address, delegator_address),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="delegation_pool.md#0x1_delegation_pool_ECANNOT_EVICT_ALLOWLISTED_DELEGATOR">ECANNOT_EVICT_ALLOWLISTED_DELEGATOR</a>)
+    );
+
+    // synchronize pool in order <b>to</b> query latest balance of delegator
+    <a href="delegation_pool.md#0x1_delegation_pool_synchronize_delegation_pool">synchronize_delegation_pool</a>(pool_address);
+
+    <b>let</b> pool = <b>borrow_global</b>&lt;<a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>&gt;(pool_address);
+    <b>if</b> (<a href="delegation_pool.md#0x1_delegation_pool_get_delegator_active_shares">get_delegator_active_shares</a>(pool, delegator_address) == 0) { <b>return</b> };
+
+    <a href="delegation_pool.md#0x1_delegation_pool_unlock_internal">unlock_internal</a>(delegator_address, pool_address, <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_balance">pool_u64::balance</a>(&pool.active_shares, delegator_address));
+
+    <a href="event.md#0x1_event_emit">event::emit</a>(<a href="delegation_pool.md#0x1_delegation_pool_EvictDelegator">EvictDelegator</a> { pool_address, delegator_address });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_add_stake"></a>
+
+## Function `add_stake`
+
+Add <code>amount</code> of coins to the delegation pool <code>pool_address</code>.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_add_stake">add_stake</a>(delegator: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, pool_address: <b>address</b>, amount: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_add_stake">add_stake</a>(
+    delegator: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    pool_address: <b>address</b>,
+    amount: u64
+) <b>acquires</b> <a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>, <a href="delegation_pool.md#0x1_delegation_pool_GovernanceRecords">GovernanceRecords</a>, <a href="delegation_pool.md#0x1_delegation_pool_BeneficiaryForOperator">BeneficiaryForOperator</a>, <a href="delegation_pool.md#0x1_delegation_pool_NextCommissionPercentage">NextCommissionPercentage</a>, <a href="delegation_pool.md#0x1_delegation_pool_DelegationPoolAllowlisting">DelegationPoolAllowlisting</a> {
+    // short-circuit <b>if</b> amount <b>to</b> add is 0 so no <a href="event.md#0x1_event">event</a> is emitted
+    <b>if</b> (amount == 0) { <b>return</b> };
+
+    <b>let</b> delegator_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(delegator);
+    <a href="delegation_pool.md#0x1_delegation_pool_assert_delegator_allowlisted">assert_delegator_allowlisted</a>(pool_address, delegator_address);
+
+    // synchronize delegation and <a href="stake.md#0x1_stake">stake</a> pools before <a href="../../../aptos-stdlib/tests/compiler-v2-doc/any.md#0x1_any">any</a> user operation
+    <a href="delegation_pool.md#0x1_delegation_pool_synchronize_delegation_pool">synchronize_delegation_pool</a>(pool_address);
+
+    // fee <b>to</b> be charged for adding `amount` <a href="stake.md#0x1_stake">stake</a> on this delegation pool at this epoch
+    <b>let</b> add_stake_fee = <a href="delegation_pool.md#0x1_delegation_pool_get_add_stake_fee">get_add_stake_fee</a>(pool_address, amount);
+
+    <b>let</b> pool = <b>borrow_global_mut</b>&lt;<a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>&gt;(pool_address);
+
+    // <a href="stake.md#0x1_stake">stake</a> the entire amount <b>to</b> the <a href="stake.md#0x1_stake">stake</a> pool
+    <a href="aptos_account.md#0x1_aptos_account_transfer">aptos_account::transfer</a>(delegator, pool_address, amount);
+    <a href="stake.md#0x1_stake_add_stake">stake::add_stake</a>(&<a href="delegation_pool.md#0x1_delegation_pool_retrieve_stake_pool_owner">retrieve_stake_pool_owner</a>(pool), amount);
+
+    // but buy shares for delegator just for the remaining amount after fee
+    <a href="delegation_pool.md#0x1_delegation_pool_buy_in_active_shares">buy_in_active_shares</a>(pool, delegator_address, amount - add_stake_fee);
+    <a href="delegation_pool.md#0x1_delegation_pool_assert_min_active_balance">assert_min_active_balance</a>(pool, delegator_address);
+
+    // grant temporary ownership over `add_stake` fees <b>to</b> a separate shareholder in order <b>to</b>:
+    // - not mistake them for rewards <b>to</b> pay the operator from
+    // - distribute them together <b>with</b> the `active` rewards when this epoch ends
+    // in order <b>to</b> appreciate all shares on the active pool atomically
+    <a href="delegation_pool.md#0x1_delegation_pool_buy_in_active_shares">buy_in_active_shares</a>(pool, <a href="delegation_pool.md#0x1_delegation_pool_NULL_SHAREHOLDER">NULL_SHAREHOLDER</a>, add_stake_fee);
+
+    <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_module_event_migration_enabled">features::module_event_migration_enabled</a>()) {
+        <a href="event.md#0x1_event_emit">event::emit</a>(
+            <a href="delegation_pool.md#0x1_delegation_pool_AddStake">AddStake</a> {
+                pool_address,
+                delegator_address,
+                amount_added: amount,
+                add_stake_fee,
+            },
+        );
+    };
+
+    <a href="event.md#0x1_event_emit_event">event::emit_event</a>(
+        &<b>mut</b> pool.add_stake_events,
+        <a href="delegation_pool.md#0x1_delegation_pool_AddStakeEvent">AddStakeEvent</a> {
+            pool_address,
+            delegator_address,
+            amount_added: amount,
+            add_stake_fee,
+        },
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_unlock"></a>
+
+## Function `unlock`
+
+Unlock <code>amount</code> from the active + pending_active stake of <code>delegator</code> or
+at most how much active stake there is on the stake pool.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_unlock">unlock</a>(delegator: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, pool_address: <b>address</b>, amount: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_unlock">unlock</a>(
+    delegator: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    pool_address: <b>address</b>,
+    amount: u64
+) <b>acquires</b> <a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>, <a href="delegation_pool.md#0x1_delegation_pool_GovernanceRecords">GovernanceRecords</a>, <a href="delegation_pool.md#0x1_delegation_pool_BeneficiaryForOperator">BeneficiaryForOperator</a>, <a href="delegation_pool.md#0x1_delegation_pool_NextCommissionPercentage">NextCommissionPercentage</a> {
+    // short-circuit <b>if</b> amount <b>to</b> unlock is 0 so no <a href="event.md#0x1_event">event</a> is emitted
+    <b>if</b> (amount == 0) { <b>return</b> };
+
+    // synchronize delegation and <a href="stake.md#0x1_stake">stake</a> pools before <a href="../../../aptos-stdlib/tests/compiler-v2-doc/any.md#0x1_any">any</a> user operation
+    <a href="delegation_pool.md#0x1_delegation_pool_synchronize_delegation_pool">synchronize_delegation_pool</a>(pool_address);
+
+    <b>let</b> delegator_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(delegator);
+    <a href="delegation_pool.md#0x1_delegation_pool_unlock_internal">unlock_internal</a>(delegator_address, pool_address, amount);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_unlock_internal"></a>
+
+## Function `unlock_internal`
+
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_unlock_internal">unlock_internal</a>(delegator_address: <b>address</b>, pool_address: <b>address</b>, amount: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_unlock_internal">unlock_internal</a>(
+    delegator_address: <b>address</b>,
+    pool_address: <b>address</b>,
+    amount: u64
+) <b>acquires</b> <a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>, <a href="delegation_pool.md#0x1_delegation_pool_GovernanceRecords">GovernanceRecords</a> {
+    <b>assert</b>!(delegator_address != <a href="delegation_pool.md#0x1_delegation_pool_NULL_SHAREHOLDER">NULL_SHAREHOLDER</a>, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="delegation_pool.md#0x1_delegation_pool_ECANNOT_UNLOCK_NULL_SHAREHOLDER">ECANNOT_UNLOCK_NULL_SHAREHOLDER</a>));
+
+    // fail unlock of more <a href="stake.md#0x1_stake">stake</a> than `active` on the <a href="stake.md#0x1_stake">stake</a> pool
+    <b>let</b> (active, _, _, _) = <a href="stake.md#0x1_stake_get_stake">stake::get_stake</a>(pool_address);
+    <b>assert</b>!(amount &lt;= active, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="delegation_pool.md#0x1_delegation_pool_ENOT_ENOUGH_ACTIVE_STAKE_TO_UNLOCK">ENOT_ENOUGH_ACTIVE_STAKE_TO_UNLOCK</a>));
+
+    <b>let</b> pool = <b>borrow_global_mut</b>&lt;<a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>&gt;(pool_address);
+    amount = <a href="delegation_pool.md#0x1_delegation_pool_coins_to_transfer_to_ensure_min_stake">coins_to_transfer_to_ensure_min_stake</a>(
+        &pool.active_shares,
+        <a href="delegation_pool.md#0x1_delegation_pool_pending_inactive_shares_pool">pending_inactive_shares_pool</a>(pool),
+        delegator_address,
+        amount,
+    );
+    amount = <a href="delegation_pool.md#0x1_delegation_pool_redeem_active_shares">redeem_active_shares</a>(pool, delegator_address, amount);
+
+    <a href="stake.md#0x1_stake_unlock">stake::unlock</a>(&<a href="delegation_pool.md#0x1_delegation_pool_retrieve_stake_pool_owner">retrieve_stake_pool_owner</a>(pool), amount);
+
+    <a href="delegation_pool.md#0x1_delegation_pool_buy_in_pending_inactive_shares">buy_in_pending_inactive_shares</a>(pool, delegator_address, amount);
+    <a href="delegation_pool.md#0x1_delegation_pool_assert_min_pending_inactive_balance">assert_min_pending_inactive_balance</a>(pool, delegator_address);
+
+    <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_module_event_migration_enabled">features::module_event_migration_enabled</a>()) {
+        <a href="event.md#0x1_event_emit">event::emit</a>(
+            <a href="delegation_pool.md#0x1_delegation_pool_UnlockStake">UnlockStake</a> {
+                pool_address,
+                delegator_address,
+                amount_unlocked: amount,
+            },
+        );
+    };
+
+    <a href="event.md#0x1_event_emit_event">event::emit_event</a>(
+        &<b>mut</b> pool.unlock_stake_events,
+        <a href="delegation_pool.md#0x1_delegation_pool_UnlockStakeEvent">UnlockStakeEvent</a> {
+            pool_address,
+            delegator_address,
+            amount_unlocked: amount,
+        },
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_reactivate_stake"></a>
+
+## Function `reactivate_stake`
+
+Move <code>amount</code> of coins from pending_inactive to active.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_reactivate_stake">reactivate_stake</a>(delegator: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, pool_address: <b>address</b>, amount: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_reactivate_stake">reactivate_stake</a>(
+    delegator: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    pool_address: <b>address</b>,
+    amount: u64
+) <b>acquires</b> <a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>, <a href="delegation_pool.md#0x1_delegation_pool_GovernanceRecords">GovernanceRecords</a>, <a href="delegation_pool.md#0x1_delegation_pool_BeneficiaryForOperator">BeneficiaryForOperator</a>, <a href="delegation_pool.md#0x1_delegation_pool_NextCommissionPercentage">NextCommissionPercentage</a>, <a href="delegation_pool.md#0x1_delegation_pool_DelegationPoolAllowlisting">DelegationPoolAllowlisting</a> {
+    // short-circuit <b>if</b> amount <b>to</b> reactivate is 0 so no <a href="event.md#0x1_event">event</a> is emitted
+    <b>if</b> (amount == 0) { <b>return</b> };
+
+    <b>let</b> delegator_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(delegator);
+    <a href="delegation_pool.md#0x1_delegation_pool_assert_delegator_allowlisted">assert_delegator_allowlisted</a>(pool_address, delegator_address);
+
+    // synchronize delegation and <a href="stake.md#0x1_stake">stake</a> pools before <a href="../../../aptos-stdlib/tests/compiler-v2-doc/any.md#0x1_any">any</a> user operation
+    <a href="delegation_pool.md#0x1_delegation_pool_synchronize_delegation_pool">synchronize_delegation_pool</a>(pool_address);
+
+    <b>let</b> pool = <b>borrow_global_mut</b>&lt;<a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>&gt;(pool_address);
+    amount = <a href="delegation_pool.md#0x1_delegation_pool_coins_to_transfer_to_ensure_min_stake">coins_to_transfer_to_ensure_min_stake</a>(
+        <a href="delegation_pool.md#0x1_delegation_pool_pending_inactive_shares_pool">pending_inactive_shares_pool</a>(pool),
+        &pool.active_shares,
+        delegator_address,
+        amount,
+    );
+    <b>let</b> observed_lockup_cycle = pool.observed_lockup_cycle;
+    amount = <a href="delegation_pool.md#0x1_delegation_pool_redeem_inactive_shares">redeem_inactive_shares</a>(pool, delegator_address, amount, observed_lockup_cycle);
+
+    <a href="stake.md#0x1_stake_reactivate_stake">stake::reactivate_stake</a>(&<a href="delegation_pool.md#0x1_delegation_pool_retrieve_stake_pool_owner">retrieve_stake_pool_owner</a>(pool), amount);
+
+    <a href="delegation_pool.md#0x1_delegation_pool_buy_in_active_shares">buy_in_active_shares</a>(pool, delegator_address, amount);
+    <a href="delegation_pool.md#0x1_delegation_pool_assert_min_active_balance">assert_min_active_balance</a>(pool, delegator_address);
+
+    <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_module_event_migration_enabled">features::module_event_migration_enabled</a>()) {
+        <a href="event.md#0x1_event_emit">event::emit</a>(
+            <a href="delegation_pool.md#0x1_delegation_pool_ReactivateStake">ReactivateStake</a> {
+                pool_address,
+                delegator_address,
+                amount_reactivated: amount,
+            },
+        );
+    };
+
+    <a href="event.md#0x1_event_emit_event">event::emit_event</a>(
+        &<b>mut</b> pool.reactivate_stake_events,
+        <a href="delegation_pool.md#0x1_delegation_pool_ReactivateStakeEvent">ReactivateStakeEvent</a> {
+            pool_address,
+            delegator_address,
+            amount_reactivated: amount,
+        },
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_withdraw"></a>
+
+## Function `withdraw`
+
+Withdraw <code>amount</code> of owned inactive stake from the delegation pool at <code>pool_address</code>.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_withdraw">withdraw</a>(delegator: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, pool_address: <b>address</b>, amount: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_withdraw">withdraw</a>(
+    delegator: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    pool_address: <b>address</b>,
+    amount: u64
+) <b>acquires</b> <a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>, <a href="delegation_pool.md#0x1_delegation_pool_GovernanceRecords">GovernanceRecords</a>, <a href="delegation_pool.md#0x1_delegation_pool_BeneficiaryForOperator">BeneficiaryForOperator</a>, <a href="delegation_pool.md#0x1_delegation_pool_NextCommissionPercentage">NextCommissionPercentage</a> {
+    <b>assert</b>!(amount &gt; 0, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="delegation_pool.md#0x1_delegation_pool_EWITHDRAW_ZERO_STAKE">EWITHDRAW_ZERO_STAKE</a>));
+    // synchronize delegation and <a href="stake.md#0x1_stake">stake</a> pools before <a href="../../../aptos-stdlib/tests/compiler-v2-doc/any.md#0x1_any">any</a> user operation
+    <a href="delegation_pool.md#0x1_delegation_pool_synchronize_delegation_pool">synchronize_delegation_pool</a>(pool_address);
+    <a href="delegation_pool.md#0x1_delegation_pool_withdraw_internal">withdraw_internal</a>(<b>borrow_global_mut</b>&lt;<a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>&gt;(pool_address), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(delegator), amount);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_withdraw_internal"></a>
+
+## Function `withdraw_internal`
+
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_withdraw_internal">withdraw_internal</a>(pool: &<b>mut</b> <a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">delegation_pool::DelegationPool</a>, delegator_address: <b>address</b>, amount: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_withdraw_internal">withdraw_internal</a>(
+    pool: &<b>mut</b> <a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>,
+    delegator_address: <b>address</b>,
+    amount: u64
+) <b>acquires</b> <a href="delegation_pool.md#0x1_delegation_pool_GovernanceRecords">GovernanceRecords</a> {
+    // TODO: recycle storage when a delegator fully exits the delegation pool.
+    // short-circuit <b>if</b> amount <b>to</b> withdraw is 0 so no <a href="event.md#0x1_event">event</a> is emitted
+    <b>if</b> (amount == 0) { <b>return</b> };
+
+    <b>let</b> pool_address = <a href="delegation_pool.md#0x1_delegation_pool_get_pool_address">get_pool_address</a>(pool);
+    <b>let</b> (withdrawal_exists, withdrawal_olc) = <a href="delegation_pool.md#0x1_delegation_pool_pending_withdrawal_exists">pending_withdrawal_exists</a>(pool, delegator_address);
+    // exit <b>if</b> no withdrawal or (it is pending and cannot withdraw pending_inactive <a href="stake.md#0x1_stake">stake</a> from <a href="stake.md#0x1_stake">stake</a> pool)
+    <b>if</b> (!(
+        withdrawal_exists &&
+            (withdrawal_olc.index &lt; pool.observed_lockup_cycle.index || <a href="delegation_pool.md#0x1_delegation_pool_can_withdraw_pending_inactive">can_withdraw_pending_inactive</a>(pool_address))
+    )) { <b>return</b> };
+
+    <b>if</b> (withdrawal_olc.index == pool.observed_lockup_cycle.index) {
+        amount = <a href="delegation_pool.md#0x1_delegation_pool_coins_to_redeem_to_ensure_min_stake">coins_to_redeem_to_ensure_min_stake</a>(
+            <a href="delegation_pool.md#0x1_delegation_pool_pending_inactive_shares_pool">pending_inactive_shares_pool</a>(pool),
+            delegator_address,
+            amount,
+        )
+    };
+    amount = <a href="delegation_pool.md#0x1_delegation_pool_redeem_inactive_shares">redeem_inactive_shares</a>(pool, delegator_address, amount, withdrawal_olc);
+
+    <b>let</b> stake_pool_owner = &<a href="delegation_pool.md#0x1_delegation_pool_retrieve_stake_pool_owner">retrieve_stake_pool_owner</a>(pool);
+    // <a href="stake.md#0x1_stake">stake</a> pool will inactivate entire pending_inactive <a href="stake.md#0x1_stake">stake</a> at `<a href="stake.md#0x1_stake_withdraw">stake::withdraw</a>` <b>to</b> make it withdrawable
+    // however, bypassing the inactivation of excess <a href="stake.md#0x1_stake">stake</a> (inactivated but not withdrawn) <b>ensures</b>
+    // the OLC is not advanced indefinitely on `unlock`-`withdraw` paired calls
+    <b>if</b> (<a href="delegation_pool.md#0x1_delegation_pool_can_withdraw_pending_inactive">can_withdraw_pending_inactive</a>(pool_address)) {
+        // get excess <a href="stake.md#0x1_stake">stake</a> before being entirely inactivated
+        <b>let</b> (_, _, _, pending_inactive) = <a href="stake.md#0x1_stake_get_stake">stake::get_stake</a>(pool_address);
+        <b>if</b> (withdrawal_olc.index == pool.observed_lockup_cycle.index) {
+            // `amount` less excess <b>if</b> withdrawing pending_inactive <a href="stake.md#0x1_stake">stake</a>
+            pending_inactive = pending_inactive - amount
+        };
+        // escape excess <a href="stake.md#0x1_stake">stake</a> from inactivation
+        <a href="stake.md#0x1_stake_reactivate_stake">stake::reactivate_stake</a>(stake_pool_owner, pending_inactive);
+        <a href="stake.md#0x1_stake_withdraw">stake::withdraw</a>(stake_pool_owner, amount);
+        // restore excess <a href="stake.md#0x1_stake">stake</a> <b>to</b> the pending_inactive state
+        <a href="stake.md#0x1_stake_unlock">stake::unlock</a>(stake_pool_owner, pending_inactive);
+    } <b>else</b> {
+        // no excess <a href="stake.md#0x1_stake">stake</a> <b>if</b> `<a href="stake.md#0x1_stake_withdraw">stake::withdraw</a>` does not inactivate at all
+        <a href="stake.md#0x1_stake_withdraw">stake::withdraw</a>(stake_pool_owner, amount);
+    };
+    <a href="aptos_account.md#0x1_aptos_account_transfer">aptos_account::transfer</a>(stake_pool_owner, delegator_address, amount);
+
+    // commit withdrawal of possibly inactive <a href="stake.md#0x1_stake">stake</a> <b>to</b> the `total_coins_inactive`
+    // known by the delegation pool in order <b>to</b> not mistake it for slashing at next synchronization
+    <b>let</b> (_, inactive, _, _) = <a href="stake.md#0x1_stake_get_stake">stake::get_stake</a>(pool_address);
+    pool.total_coins_inactive = inactive;
+
+    <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_module_event_migration_enabled">features::module_event_migration_enabled</a>()) {
+        <a href="event.md#0x1_event_emit">event::emit</a>(
+            <a href="delegation_pool.md#0x1_delegation_pool_WithdrawStake">WithdrawStake</a> {
+                pool_address,
+                delegator_address,
+                amount_withdrawn: amount,
+            },
+        );
+    };
+
+    <a href="event.md#0x1_event_emit_event">event::emit_event</a>(
+        &<b>mut</b> pool.withdraw_stake_events,
+        <a href="delegation_pool.md#0x1_delegation_pool_WithdrawStakeEvent">WithdrawStakeEvent</a> {
+            pool_address,
+            delegator_address,
+            amount_withdrawn: amount,
+        },
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_pending_withdrawal_exists"></a>
+
+## Function `pending_withdrawal_exists`
+
+Return the unique observed lockup cycle where delegator <code>delegator_address</code> may have
+unlocking (or already unlocked) stake to be withdrawn from delegation pool <code>pool</code>.
+A bool is returned to signal if a pending withdrawal exists at all.
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_pending_withdrawal_exists">pending_withdrawal_exists</a>(pool: &<a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">delegation_pool::DelegationPool</a>, delegator_address: <b>address</b>): (bool, <a href="delegation_pool.md#0x1_delegation_pool_ObservedLockupCycle">delegation_pool::ObservedLockupCycle</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_pending_withdrawal_exists">pending_withdrawal_exists</a>(pool: &<a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>, delegator_address: <b>address</b>): (bool, <a href="delegation_pool.md#0x1_delegation_pool_ObservedLockupCycle">ObservedLockupCycle</a>) {
+    <b>if</b> (<a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_contains">table::contains</a>(&pool.pending_withdrawals, delegator_address)) {
+        (<b>true</b>, *<a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_borrow">table::borrow</a>(&pool.pending_withdrawals, delegator_address))
+    } <b>else</b> {
+        (<b>false</b>, <a href="delegation_pool.md#0x1_delegation_pool_olc_with_index">olc_with_index</a>(0))
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_pending_inactive_shares_pool_mut"></a>
+
+## Function `pending_inactive_shares_pool_mut`
+
+Return a mutable reference to the shares pool of <code>pending_inactive</code> stake on the
+delegation pool, always the last item in <code>inactive_shares</code>.
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_pending_inactive_shares_pool_mut">pending_inactive_shares_pool_mut</a>(pool: &<b>mut</b> <a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">delegation_pool::DelegationPool</a>): &<b>mut</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">pool_u64_unbound::Pool</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_pending_inactive_shares_pool_mut">pending_inactive_shares_pool_mut</a>(pool: &<b>mut</b> <a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>): &<b>mut</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_Pool">pool_u64::Pool</a> {
+    <b>let</b> observed_lockup_cycle = pool.observed_lockup_cycle;
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_borrow_mut">table::borrow_mut</a>(&<b>mut</b> pool.inactive_shares, observed_lockup_cycle)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_pending_inactive_shares_pool"></a>
+
+## Function `pending_inactive_shares_pool`
+
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_pending_inactive_shares_pool">pending_inactive_shares_pool</a>(pool: &<a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">delegation_pool::DelegationPool</a>): &<a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">pool_u64_unbound::Pool</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_pending_inactive_shares_pool">pending_inactive_shares_pool</a>(pool: &<a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>): &<a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_Pool">pool_u64::Pool</a> {
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_borrow">table::borrow</a>(&pool.inactive_shares, pool.observed_lockup_cycle)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_execute_pending_withdrawal"></a>
+
+## Function `execute_pending_withdrawal`
+
+Execute the pending withdrawal of <code>delegator_address</code> on delegation pool <code>pool</code>
+if existing and already inactive to allow the creation of a new one.
+<code>pending_inactive</code> stake would be left untouched even if withdrawable and should
+be explicitly withdrawn by delegator
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_execute_pending_withdrawal">execute_pending_withdrawal</a>(pool: &<b>mut</b> <a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">delegation_pool::DelegationPool</a>, delegator_address: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_execute_pending_withdrawal">execute_pending_withdrawal</a>(pool: &<b>mut</b> <a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>, delegator_address: <b>address</b>) <b>acquires</b> <a href="delegation_pool.md#0x1_delegation_pool_GovernanceRecords">GovernanceRecords</a> {
+    <b>let</b> (withdrawal_exists, withdrawal_olc) = <a href="delegation_pool.md#0x1_delegation_pool_pending_withdrawal_exists">pending_withdrawal_exists</a>(pool, delegator_address);
+    <b>if</b> (withdrawal_exists && withdrawal_olc.index &lt; pool.observed_lockup_cycle.index) {
+        <a href="delegation_pool.md#0x1_delegation_pool_withdraw_internal">withdraw_internal</a>(pool, delegator_address, <a href="delegation_pool.md#0x1_delegation_pool_MAX_U64">MAX_U64</a>);
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_buy_in_active_shares"></a>
+
+## Function `buy_in_active_shares`
+
+Buy shares into the active pool on behalf of delegator <code>shareholder</code> who
+deposited <code>coins_amount</code>. This function doesn't make any coin transfer.
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_buy_in_active_shares">buy_in_active_shares</a>(pool: &<b>mut</b> <a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">delegation_pool::DelegationPool</a>, shareholder: <b>address</b>, coins_amount: u64): u128
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_buy_in_active_shares">buy_in_active_shares</a>(
+    pool: &<b>mut</b> <a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>,
+    shareholder: <b>address</b>,
+    coins_amount: u64,
+): u128 <b>acquires</b> <a href="delegation_pool.md#0x1_delegation_pool_GovernanceRecords">GovernanceRecords</a> {
+    <b>let</b> new_shares = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_amount_to_shares">pool_u64::amount_to_shares</a>(&pool.active_shares, coins_amount);
+    // No need <b>to</b> buy 0 shares.
+    <b>if</b> (new_shares == 0) { <b>return</b> 0 };
+
+    // Always <b>update</b> governance records before <a href="../../../aptos-stdlib/tests/compiler-v2-doc/any.md#0x1_any">any</a> change <b>to</b> the shares pool.
+    <b>let</b> pool_address = <a href="delegation_pool.md#0x1_delegation_pool_get_pool_address">get_pool_address</a>(pool);
+    <b>if</b> (<a href="delegation_pool.md#0x1_delegation_pool_partial_governance_voting_enabled">partial_governance_voting_enabled</a>(pool_address)) {
+        <a href="delegation_pool.md#0x1_delegation_pool_update_governance_records_for_buy_in_active_shares">update_governance_records_for_buy_in_active_shares</a>(pool, pool_address, new_shares, shareholder);
+    };
+
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_buy_in">pool_u64::buy_in</a>(&<b>mut</b> pool.active_shares, shareholder, coins_amount);
+    new_shares
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_buy_in_pending_inactive_shares"></a>
+
+## Function `buy_in_pending_inactive_shares`
+
+Buy shares into the pending_inactive pool on behalf of delegator <code>shareholder</code> who
+redeemed <code>coins_amount</code> from the active pool to schedule it for unlocking.
+If delegator's pending withdrawal exists and has been inactivated, execute it firstly
+to ensure there is always only one withdrawal request.
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_buy_in_pending_inactive_shares">buy_in_pending_inactive_shares</a>(pool: &<b>mut</b> <a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">delegation_pool::DelegationPool</a>, shareholder: <b>address</b>, coins_amount: u64): u128
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_buy_in_pending_inactive_shares">buy_in_pending_inactive_shares</a>(
+    pool: &<b>mut</b> <a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>,
+    shareholder: <b>address</b>,
+    coins_amount: u64,
+): u128 <b>acquires</b> <a href="delegation_pool.md#0x1_delegation_pool_GovernanceRecords">GovernanceRecords</a> {
+    <b>let</b> new_shares = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_amount_to_shares">pool_u64::amount_to_shares</a>(<a href="delegation_pool.md#0x1_delegation_pool_pending_inactive_shares_pool">pending_inactive_shares_pool</a>(pool), coins_amount);
+    // never create a new pending withdrawal unless delegator owns some pending_inactive shares
+    <b>if</b> (new_shares == 0) { <b>return</b> 0 };
+
+    // Always <b>update</b> governance records before <a href="../../../aptos-stdlib/tests/compiler-v2-doc/any.md#0x1_any">any</a> change <b>to</b> the shares pool.
+    <b>let</b> pool_address = <a href="delegation_pool.md#0x1_delegation_pool_get_pool_address">get_pool_address</a>(pool);
+    <b>if</b> (<a href="delegation_pool.md#0x1_delegation_pool_partial_governance_voting_enabled">partial_governance_voting_enabled</a>(pool_address)) {
+        <a href="delegation_pool.md#0x1_delegation_pool_update_governance_records_for_buy_in_pending_inactive_shares">update_governance_records_for_buy_in_pending_inactive_shares</a>(pool, pool_address, new_shares, shareholder);
+    };
+
+    // cannot buy inactive shares, only pending_inactive at current lockup cycle
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_buy_in">pool_u64::buy_in</a>(<a href="delegation_pool.md#0x1_delegation_pool_pending_inactive_shares_pool_mut">pending_inactive_shares_pool_mut</a>(pool), shareholder, coins_amount);
+
+    // execute the pending withdrawal <b>if</b> <b>exists</b> and is inactive before creating a new one
+    <a href="delegation_pool.md#0x1_delegation_pool_execute_pending_withdrawal">execute_pending_withdrawal</a>(pool, shareholder);
+
+    // save observed lockup cycle for the new pending withdrawal
+    <b>let</b> observed_lockup_cycle = pool.observed_lockup_cycle;
+    <b>assert</b>!(*<a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_borrow_mut_with_default">table::borrow_mut_with_default</a>(
+        &<b>mut</b> pool.pending_withdrawals,
+        shareholder,
+        observed_lockup_cycle
+    ) == observed_lockup_cycle,
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="delegation_pool.md#0x1_delegation_pool_EPENDING_WITHDRAWAL_EXISTS">EPENDING_WITHDRAWAL_EXISTS</a>)
+    );
+
+    new_shares
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_amount_to_shares_to_redeem"></a>
+
+## Function `amount_to_shares_to_redeem`
+
+Convert <code>coins_amount</code> of coins to be redeemed from shares pool <code>shares_pool</code>
+to the exact number of shares to redeem in order to achieve this.
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_amount_to_shares_to_redeem">amount_to_shares_to_redeem</a>(shares_pool: &<a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">pool_u64_unbound::Pool</a>, shareholder: <b>address</b>, coins_amount: u64): u128
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_amount_to_shares_to_redeem">amount_to_shares_to_redeem</a>(
+    shares_pool: &<a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_Pool">pool_u64::Pool</a>,
+    shareholder: <b>address</b>,
+    coins_amount: u64,
+): u128 {
+    <b>if</b> (coins_amount &gt;= <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_balance">pool_u64::balance</a>(shares_pool, shareholder)) {
+        // cap result at total shares of shareholder <b>to</b> pass `EINSUFFICIENT_SHARES` on subsequent redeem
+        <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_shares">pool_u64::shares</a>(shares_pool, shareholder)
+    } <b>else</b> {
+        <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_amount_to_shares">pool_u64::amount_to_shares</a>(shares_pool, coins_amount)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_redeem_active_shares"></a>
+
+## Function `redeem_active_shares`
+
+Redeem shares from the active pool on behalf of delegator <code>shareholder</code> who
+wants to unlock <code>coins_amount</code> of its active stake.
+Extracted coins will be used to buy shares into the pending_inactive pool and
+be available for withdrawal when current OLC ends.
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_redeem_active_shares">redeem_active_shares</a>(pool: &<b>mut</b> <a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">delegation_pool::DelegationPool</a>, shareholder: <b>address</b>, coins_amount: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_redeem_active_shares">redeem_active_shares</a>(
+    pool: &<b>mut</b> <a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>,
+    shareholder: <b>address</b>,
+    coins_amount: u64,
+): u64 <b>acquires</b> <a href="delegation_pool.md#0x1_delegation_pool_GovernanceRecords">GovernanceRecords</a> {
+    <b>let</b> shares_to_redeem = <a href="delegation_pool.md#0x1_delegation_pool_amount_to_shares_to_redeem">amount_to_shares_to_redeem</a>(&pool.active_shares, shareholder, coins_amount);
+    // silently exit <b>if</b> not a shareholder otherwise redeem would fail <b>with</b> `ESHAREHOLDER_NOT_FOUND`
+    <b>if</b> (shares_to_redeem == 0) <b>return</b> 0;
+
+    // Always <b>update</b> governance records before <a href="../../../aptos-stdlib/tests/compiler-v2-doc/any.md#0x1_any">any</a> change <b>to</b> the shares pool.
+    <b>let</b> pool_address = <a href="delegation_pool.md#0x1_delegation_pool_get_pool_address">get_pool_address</a>(pool);
+    <b>if</b> (<a href="delegation_pool.md#0x1_delegation_pool_partial_governance_voting_enabled">partial_governance_voting_enabled</a>(pool_address)) {
+        <a href="delegation_pool.md#0x1_delegation_pool_update_governanace_records_for_redeem_active_shares">update_governanace_records_for_redeem_active_shares</a>(pool, pool_address, shares_to_redeem, shareholder);
+    };
+
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_redeem_shares">pool_u64::redeem_shares</a>(&<b>mut</b> pool.active_shares, shareholder, shares_to_redeem)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_redeem_inactive_shares"></a>
+
+## Function `redeem_inactive_shares`
+
+Redeem shares from the inactive pool at <code>lockup_cycle</code> < current OLC on behalf of
+delegator <code>shareholder</code> who wants to withdraw <code>coins_amount</code> of its unlocked stake.
+Redeem shares from the pending_inactive pool at <code>lockup_cycle</code> == current OLC on behalf of
+delegator <code>shareholder</code> who wants to reactivate <code>coins_amount</code> of its unlocking stake.
+For latter case, extracted coins will be used to buy shares into the active pool and
+escape inactivation when current lockup ends.
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_redeem_inactive_shares">redeem_inactive_shares</a>(pool: &<b>mut</b> <a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">delegation_pool::DelegationPool</a>, shareholder: <b>address</b>, coins_amount: u64, lockup_cycle: <a href="delegation_pool.md#0x1_delegation_pool_ObservedLockupCycle">delegation_pool::ObservedLockupCycle</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_redeem_inactive_shares">redeem_inactive_shares</a>(
+    pool: &<b>mut</b> <a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>,
+    shareholder: <b>address</b>,
+    coins_amount: u64,
+    lockup_cycle: <a href="delegation_pool.md#0x1_delegation_pool_ObservedLockupCycle">ObservedLockupCycle</a>,
+): u64 <b>acquires</b> <a href="delegation_pool.md#0x1_delegation_pool_GovernanceRecords">GovernanceRecords</a> {
+    <b>let</b> shares_to_redeem = <a href="delegation_pool.md#0x1_delegation_pool_amount_to_shares_to_redeem">amount_to_shares_to_redeem</a>(
+        <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_borrow">table::borrow</a>(&pool.inactive_shares, lockup_cycle),
+        shareholder,
+        coins_amount);
+    // silently exit <b>if</b> not a shareholder otherwise redeem would fail <b>with</b> `ESHAREHOLDER_NOT_FOUND`
+    <b>if</b> (shares_to_redeem == 0) <b>return</b> 0;
+
+    // Always <b>update</b> governance records before <a href="../../../aptos-stdlib/tests/compiler-v2-doc/any.md#0x1_any">any</a> change <b>to</b> the shares pool.
+    <b>let</b> pool_address = <a href="delegation_pool.md#0x1_delegation_pool_get_pool_address">get_pool_address</a>(pool);
+    // Only redeem shares from the pending_inactive pool at `lockup_cycle` == current OLC.
+    <b>if</b> (<a href="delegation_pool.md#0x1_delegation_pool_partial_governance_voting_enabled">partial_governance_voting_enabled</a>(pool_address) && lockup_cycle.index == pool.observed_lockup_cycle.index) {
+        <a href="delegation_pool.md#0x1_delegation_pool_update_governanace_records_for_redeem_pending_inactive_shares">update_governanace_records_for_redeem_pending_inactive_shares</a>(
+            pool,
+            pool_address,
+            shares_to_redeem,
+            shareholder
+        );
+    };
+
+    <b>let</b> inactive_shares = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_borrow_mut">table::borrow_mut</a>(&<b>mut</b> pool.inactive_shares, lockup_cycle);
+    // 1. reaching here means delegator owns inactive/pending_inactive shares at OLC `lockup_cycle`
+    <b>let</b> redeemed_coins = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_redeem_shares">pool_u64::redeem_shares</a>(inactive_shares, shareholder, shares_to_redeem);
+
+    // <b>if</b> entirely reactivated pending_inactive <a href="stake.md#0x1_stake">stake</a> or withdrawn inactive one,
+    // re-enable unlocking for delegator by deleting this pending withdrawal
+    <b>if</b> (<a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_shares">pool_u64::shares</a>(inactive_shares, shareholder) == 0) {
+        // 2. a delegator owns inactive/pending_inactive shares only at the OLC of its pending withdrawal
+        // 1 & 2: the pending withdrawal itself <b>has</b> been emptied of shares and can be safely deleted
+        <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_remove">table::remove</a>(&<b>mut</b> pool.pending_withdrawals, shareholder);
+    };
+    // destroy inactive shares pool of past OLC <b>if</b> all its <a href="stake.md#0x1_stake">stake</a> <b>has</b> been withdrawn
+    <b>if</b> (lockup_cycle.index &lt; pool.observed_lockup_cycle.index && total_coins(inactive_shares) == 0) {
+        <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_destroy_empty">pool_u64::destroy_empty</a>(<a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_remove">table::remove</a>(&<b>mut</b> pool.inactive_shares, lockup_cycle));
+    };
+
+    redeemed_coins
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_calculate_stake_pool_drift"></a>
+
+## Function `calculate_stake_pool_drift`
+
+Calculate stake deviations between the delegation and stake pools in order to
+capture the rewards earned in the meantime, resulted operator commission and
+whether the lockup expired on the stake pool.
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_calculate_stake_pool_drift">calculate_stake_pool_drift</a>(pool: &<a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">delegation_pool::DelegationPool</a>): (bool, u64, u64, u64, u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_calculate_stake_pool_drift">calculate_stake_pool_drift</a>(pool: &<a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>): (bool, u64, u64, u64, u64) {
+    <b>let</b> (active, inactive, pending_active, pending_inactive) = <a href="stake.md#0x1_stake_get_stake">stake::get_stake</a>(<a href="delegation_pool.md#0x1_delegation_pool_get_pool_address">get_pool_address</a>(pool));
+    <b>assert</b>!(
+        inactive &gt;= pool.total_coins_inactive,
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="delegation_pool.md#0x1_delegation_pool_ESLASHED_INACTIVE_STAKE_ON_PAST_OLC">ESLASHED_INACTIVE_STAKE_ON_PAST_OLC</a>)
+    );
+    // determine whether a new lockup cycle <b>has</b> been ended on the <a href="stake.md#0x1_stake">stake</a> pool and
+    // inactivated SOME `pending_inactive` <a href="stake.md#0x1_stake">stake</a> which should stop earning rewards now,
+    // thus requiring separation of the `pending_inactive` <a href="stake.md#0x1_stake">stake</a> on current observed lockup
+    // and the future one on the newly started lockup
+    <b>let</b> lockup_cycle_ended = inactive &gt; pool.total_coins_inactive;
+
+    // actual coins on <a href="stake.md#0x1_stake">stake</a> pool belonging <b>to</b> the active shares pool
+    active = active + pending_active;
+    // actual coins on <a href="stake.md#0x1_stake">stake</a> pool belonging <b>to</b> the shares pool hosting `pending_inactive` <a href="stake.md#0x1_stake">stake</a>
+    // at current observed lockup cycle, either pending: `pending_inactive` or already inactivated:
+    <b>if</b> (lockup_cycle_ended) {
+        // `inactive` on <a href="stake.md#0x1_stake">stake</a> pool = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/any.md#0x1_any">any</a> previous `inactive` <a href="stake.md#0x1_stake">stake</a> +
+        // <a href="../../../aptos-stdlib/tests/compiler-v2-doc/any.md#0x1_any">any</a> previous `pending_inactive` <a href="stake.md#0x1_stake">stake</a> and its rewards (both inactivated)
+        pending_inactive = inactive - pool.total_coins_inactive
+    };
+
+    // on <a href="stake.md#0x1_stake">stake</a>-management operations, total coins on the <b>internal</b> shares pools and individual
+    // stakes on the <a href="stake.md#0x1_stake">stake</a> pool are updated simultaneously, thus the only stakes becoming
+    // unsynced are rewards and slashes routed exclusively <b>to</b>/out the <a href="stake.md#0x1_stake">stake</a> pool
+
+    // operator `active` rewards not persisted yet <b>to</b> the active shares pool
+    <b>let</b> pool_active = total_coins(&pool.active_shares);
+    <b>let</b> commission_active = <b>if</b> (active &gt; pool_active) {
+        <a href="../../../aptos-stdlib/tests/compiler-v2-doc/math64.md#0x1_math64_mul_div">math64::mul_div</a>(active - pool_active, pool.operator_commission_percentage, <a href="delegation_pool.md#0x1_delegation_pool_MAX_FEE">MAX_FEE</a>)
+    } <b>else</b> {
+        // handle <a href="../../../aptos-stdlib/tests/compiler-v2-doc/any.md#0x1_any">any</a> slashing applied <b>to</b> `active` <a href="stake.md#0x1_stake">stake</a>
+        0
+    };
+    // operator `pending_inactive` rewards not persisted yet <b>to</b> the pending_inactive shares pool
+    <b>let</b> pool_pending_inactive = total_coins(<a href="delegation_pool.md#0x1_delegation_pool_pending_inactive_shares_pool">pending_inactive_shares_pool</a>(pool));
+    <b>let</b> commission_pending_inactive = <b>if</b> (pending_inactive &gt; pool_pending_inactive) {
+        <a href="../../../aptos-stdlib/tests/compiler-v2-doc/math64.md#0x1_math64_mul_div">math64::mul_div</a>(
+            pending_inactive - pool_pending_inactive,
+            pool.operator_commission_percentage,
+            <a href="delegation_pool.md#0x1_delegation_pool_MAX_FEE">MAX_FEE</a>
+        )
+    } <b>else</b> {
+        // handle <a href="../../../aptos-stdlib/tests/compiler-v2-doc/any.md#0x1_any">any</a> slashing applied <b>to</b> `pending_inactive` <a href="stake.md#0x1_stake">stake</a>
+        0
+    };
+
+    (lockup_cycle_ended, active, pending_inactive, commission_active, commission_pending_inactive)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_synchronize_delegation_pool"></a>
+
+## Function `synchronize_delegation_pool`
+
+Synchronize delegation and stake pools: distribute yet-undetected rewards to the corresponding internal
+shares pools, assign commission to operator and eventually prepare delegation pool for a new lockup cycle.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_synchronize_delegation_pool">synchronize_delegation_pool</a>(pool_address: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_synchronize_delegation_pool">synchronize_delegation_pool</a>(
+    pool_address: <b>address</b>
+) <b>acquires</b> <a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>, <a href="delegation_pool.md#0x1_delegation_pool_GovernanceRecords">GovernanceRecords</a>, <a href="delegation_pool.md#0x1_delegation_pool_BeneficiaryForOperator">BeneficiaryForOperator</a>, <a href="delegation_pool.md#0x1_delegation_pool_NextCommissionPercentage">NextCommissionPercentage</a> {
+    <a href="delegation_pool.md#0x1_delegation_pool_assert_delegation_pool_exists">assert_delegation_pool_exists</a>(pool_address);
+    <b>let</b> pool = <b>borrow_global_mut</b>&lt;<a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>&gt;(pool_address);
+    <b>let</b> (
+        lockup_cycle_ended,
+        active,
+        pending_inactive,
+        commission_active,
+        commission_pending_inactive
+    ) = <a href="delegation_pool.md#0x1_delegation_pool_calculate_stake_pool_drift">calculate_stake_pool_drift</a>(pool);
+
+    // zero `pending_active` <a href="stake.md#0x1_stake">stake</a> indicates that either there are no `add_stake` fees or
+    // previous epoch <b>has</b> ended and should release the shares owning the existing fees
+    <b>let</b> (_, _, pending_active, _) = <a href="stake.md#0x1_stake_get_stake">stake::get_stake</a>(pool_address);
+    <b>if</b> (pending_active == 0) {
+        // renounce ownership over the `add_stake` fees by redeeming all shares of
+        // the special shareholder, implicitly their equivalent coins, out of the active shares pool
+        <a href="delegation_pool.md#0x1_delegation_pool_redeem_active_shares">redeem_active_shares</a>(pool, <a href="delegation_pool.md#0x1_delegation_pool_NULL_SHAREHOLDER">NULL_SHAREHOLDER</a>, <a href="delegation_pool.md#0x1_delegation_pool_MAX_U64">MAX_U64</a>);
+    };
+
+    // distribute rewards remaining after commission, <b>to</b> delegators (<b>to</b> already existing shares)
+    // before buying shares for the operator for its entire commission fee
+    // otherwise, operator's new shares would additionally appreciate from rewards it does not own
+
+    // <b>update</b> total coins accumulated by `active` + `pending_active` shares
+    // redeemed `add_stake` fees are restored and distributed <b>to</b> the rest of the pool <b>as</b> rewards
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_update_total_coins">pool_u64::update_total_coins</a>(&<b>mut</b> pool.active_shares, active - commission_active);
+    // <b>update</b> total coins accumulated by `pending_inactive` shares at current observed lockup cycle
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_update_total_coins">pool_u64::update_total_coins</a>(
+        <a href="delegation_pool.md#0x1_delegation_pool_pending_inactive_shares_pool_mut">pending_inactive_shares_pool_mut</a>(pool),
+        pending_inactive - commission_pending_inactive
+    );
+
+    // reward operator its commission out of uncommitted active rewards (`add_stake` fees already excluded)
+    <a href="delegation_pool.md#0x1_delegation_pool_buy_in_active_shares">buy_in_active_shares</a>(pool, <a href="delegation_pool.md#0x1_delegation_pool_beneficiary_for_operator">beneficiary_for_operator</a>(<a href="stake.md#0x1_stake_get_operator">stake::get_operator</a>(pool_address)), commission_active);
+    // reward operator its commission out of uncommitted pending_inactive rewards
+    <a href="delegation_pool.md#0x1_delegation_pool_buy_in_pending_inactive_shares">buy_in_pending_inactive_shares</a>(
+        pool,
+        <a href="delegation_pool.md#0x1_delegation_pool_beneficiary_for_operator">beneficiary_for_operator</a>(<a href="stake.md#0x1_stake_get_operator">stake::get_operator</a>(pool_address)),
+        commission_pending_inactive
+    );
+
+    <a href="event.md#0x1_event_emit_event">event::emit_event</a>(
+        &<b>mut</b> pool.distribute_commission_events,
+        <a href="delegation_pool.md#0x1_delegation_pool_DistributeCommissionEvent">DistributeCommissionEvent</a> {
+            pool_address,
+            operator: <a href="stake.md#0x1_stake_get_operator">stake::get_operator</a>(pool_address),
+            commission_active,
+            commission_pending_inactive,
+        },
+    );
+
+    <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_operator_beneficiary_change_enabled">features::operator_beneficiary_change_enabled</a>()) {
+        emit(<a href="delegation_pool.md#0x1_delegation_pool_DistributeCommission">DistributeCommission</a> {
+            pool_address,
+            operator: <a href="stake.md#0x1_stake_get_operator">stake::get_operator</a>(pool_address),
+            beneficiary: <a href="delegation_pool.md#0x1_delegation_pool_beneficiary_for_operator">beneficiary_for_operator</a>(<a href="stake.md#0x1_stake_get_operator">stake::get_operator</a>(pool_address)),
+            commission_active,
+            commission_pending_inactive,
+        })
+    };
+
+    // advance lockup cycle on delegation pool <b>if</b> already ended on <a href="stake.md#0x1_stake">stake</a> pool (AND <a href="stake.md#0x1_stake">stake</a> explicitly inactivated)
+    <b>if</b> (lockup_cycle_ended) {
+        // capture inactive coins over all ended lockup cycles (including this ending one)
+        <b>let</b> (_, inactive, _, _) = <a href="stake.md#0x1_stake_get_stake">stake::get_stake</a>(pool_address);
+        pool.total_coins_inactive = inactive;
+
+        // advance lockup cycle on the delegation pool
+        pool.observed_lockup_cycle.index = pool.observed_lockup_cycle.index + 1;
+        // start new lockup cycle <b>with</b> a fresh shares pool for `pending_inactive` <a href="stake.md#0x1_stake">stake</a>
+        <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_add">table::add</a>(
+            &<b>mut</b> pool.inactive_shares,
+            pool.observed_lockup_cycle,
+            <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_create_with_scaling_factor">pool_u64::create_with_scaling_factor</a>(<a href="delegation_pool.md#0x1_delegation_pool_SHARES_SCALING_FACTOR">SHARES_SCALING_FACTOR</a>)
+        );
+    };
+
+    <b>if</b> (<a href="delegation_pool.md#0x1_delegation_pool_is_next_commission_percentage_effective">is_next_commission_percentage_effective</a>(pool_address)) {
+        pool.operator_commission_percentage = <b>borrow_global</b>&lt;<a href="delegation_pool.md#0x1_delegation_pool_NextCommissionPercentage">NextCommissionPercentage</a>&gt;(
+            pool_address
+        ).commission_percentage_next_lockup_cycle;
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_assert_and_update_proposal_used_voting_power"></a>
+
+## Function `assert_and_update_proposal_used_voting_power`
+
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_assert_and_update_proposal_used_voting_power">assert_and_update_proposal_used_voting_power</a>(governance_records: &<b>mut</b> <a href="delegation_pool.md#0x1_delegation_pool_GovernanceRecords">delegation_pool::GovernanceRecords</a>, pool_address: <b>address</b>, proposal_id: u64, voting_power: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_assert_and_update_proposal_used_voting_power">assert_and_update_proposal_used_voting_power</a>(
+    governance_records: &<b>mut</b> <a href="delegation_pool.md#0x1_delegation_pool_GovernanceRecords">GovernanceRecords</a>, pool_address: <b>address</b>, proposal_id: u64, voting_power: u64
+) {
+    <b>let</b> stake_pool_remaining_voting_power = <a href="aptos_governance.md#0x1_aptos_governance_get_remaining_voting_power">aptos_governance::get_remaining_voting_power</a>(pool_address, proposal_id);
+    <b>let</b> stake_pool_used_voting_power = <a href="aptos_governance.md#0x1_aptos_governance_get_voting_power">aptos_governance::get_voting_power</a>(
+        pool_address
+    ) - stake_pool_remaining_voting_power;
+    <b>let</b> proposal_used_voting_power = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/smart_table.md#0x1_smart_table_borrow_mut_with_default">smart_table::borrow_mut_with_default</a>(
+        &<b>mut</b> governance_records.votes_per_proposal,
+        proposal_id,
+        0
+    );
+    // A edge case: Before enabling partial governance <a href="voting.md#0x1_voting">voting</a> on a delegation pool, the delegation pool <b>has</b>
+    // a voter which can vote <b>with</b> all <a href="voting.md#0x1_voting">voting</a> power of this delegation pool. If the voter votes on a proposal after
+    // partial governance <a href="voting.md#0x1_voting">voting</a> flag is enabled, the delegation pool doesn't have enough <a href="voting.md#0x1_voting">voting</a> power on this
+    // proposal for all the delegators. To be fair, no one can vote on this proposal through this delegation pool.
+    // To detect this case, check <b>if</b> the <a href="stake.md#0x1_stake">stake</a> pool had used <a href="voting.md#0x1_voting">voting</a> power not through <a href="delegation_pool.md#0x1_delegation_pool">delegation_pool</a> <b>module</b>.
+    <b>assert</b>!(
+        stake_pool_used_voting_power == *proposal_used_voting_power,
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="delegation_pool.md#0x1_delegation_pool_EALREADY_VOTED_BEFORE_ENABLE_PARTIAL_VOTING">EALREADY_VOTED_BEFORE_ENABLE_PARTIAL_VOTING</a>)
+    );
+    *proposal_used_voting_power = *proposal_used_voting_power + voting_power;
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_update_governance_records_for_buy_in_active_shares"></a>
+
+## Function `update_governance_records_for_buy_in_active_shares`
+
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_update_governance_records_for_buy_in_active_shares">update_governance_records_for_buy_in_active_shares</a>(pool: &<a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">delegation_pool::DelegationPool</a>, pool_address: <b>address</b>, new_shares: u128, shareholder: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_update_governance_records_for_buy_in_active_shares">update_governance_records_for_buy_in_active_shares</a>(
+    pool: &<a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>, pool_address: <b>address</b>, new_shares: u128, shareholder: <b>address</b>
+) <b>acquires</b> <a href="delegation_pool.md#0x1_delegation_pool_GovernanceRecords">GovernanceRecords</a> {
+    // &lt;active shares&gt; of &lt;shareholder&gt; += &lt;new_shares&gt; ----&gt;
+    // &lt;active shares&gt; of &lt;current voter of shareholder&gt; += &lt;new_shares&gt;
+    // &lt;active shares&gt; of &lt;next voter of shareholder&gt; += &lt;new_shares&gt;
+    <b>let</b> governance_records = <b>borrow_global_mut</b>&lt;<a href="delegation_pool.md#0x1_delegation_pool_GovernanceRecords">GovernanceRecords</a>&gt;(pool_address);
+    <b>let</b> vote_delegation = <a href="delegation_pool.md#0x1_delegation_pool_update_and_borrow_mut_delegator_vote_delegation">update_and_borrow_mut_delegator_vote_delegation</a>(pool, governance_records, shareholder);
+    <b>let</b> current_voter = vote_delegation.voter;
+    <b>let</b> pending_voter = vote_delegation.pending_voter;
+    <b>let</b> current_delegated_votes =
+        <a href="delegation_pool.md#0x1_delegation_pool_update_and_borrow_mut_delegated_votes">update_and_borrow_mut_delegated_votes</a>(pool, governance_records, current_voter);
+    current_delegated_votes.active_shares = current_delegated_votes.active_shares + new_shares;
+    <b>if</b> (pending_voter == current_voter) {
+        current_delegated_votes.active_shares_next_lockup =
+            current_delegated_votes.active_shares_next_lockup + new_shares;
+    } <b>else</b> {
+        <b>let</b> pending_delegated_votes =
+            <a href="delegation_pool.md#0x1_delegation_pool_update_and_borrow_mut_delegated_votes">update_and_borrow_mut_delegated_votes</a>(pool, governance_records, pending_voter);
+        pending_delegated_votes.active_shares_next_lockup =
+            pending_delegated_votes.active_shares_next_lockup + new_shares;
+    };
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_update_governance_records_for_buy_in_pending_inactive_shares"></a>
+
+## Function `update_governance_records_for_buy_in_pending_inactive_shares`
+
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_update_governance_records_for_buy_in_pending_inactive_shares">update_governance_records_for_buy_in_pending_inactive_shares</a>(pool: &<a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">delegation_pool::DelegationPool</a>, pool_address: <b>address</b>, new_shares: u128, shareholder: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_update_governance_records_for_buy_in_pending_inactive_shares">update_governance_records_for_buy_in_pending_inactive_shares</a>(
+    pool: &<a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>, pool_address: <b>address</b>, new_shares: u128, shareholder: <b>address</b>
+) <b>acquires</b> <a href="delegation_pool.md#0x1_delegation_pool_GovernanceRecords">GovernanceRecords</a> {
+    // &lt;pending inactive shares&gt; of &lt;shareholder&gt; += &lt;new_shares&gt;   ----&gt;
+    // &lt;pending inactive shares&gt; of &lt;current voter of shareholder&gt; += &lt;new_shares&gt;
+    // no impact on &lt;pending inactive shares&gt; of &lt;next voter of shareholder&gt;
+    <b>let</b> governance_records = <b>borrow_global_mut</b>&lt;<a href="delegation_pool.md#0x1_delegation_pool_GovernanceRecords">GovernanceRecords</a>&gt;(pool_address);
+    <b>let</b> current_voter = <a href="delegation_pool.md#0x1_delegation_pool_calculate_and_update_delegator_voter_internal">calculate_and_update_delegator_voter_internal</a>(pool, governance_records, shareholder);
+    <b>let</b> current_delegated_votes = <a href="delegation_pool.md#0x1_delegation_pool_update_and_borrow_mut_delegated_votes">update_and_borrow_mut_delegated_votes</a>(pool, governance_records, current_voter);
+    current_delegated_votes.pending_inactive_shares = current_delegated_votes.pending_inactive_shares + new_shares;
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_update_governanace_records_for_redeem_active_shares"></a>
+
+## Function `update_governanace_records_for_redeem_active_shares`
+
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_update_governanace_records_for_redeem_active_shares">update_governanace_records_for_redeem_active_shares</a>(pool: &<a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">delegation_pool::DelegationPool</a>, pool_address: <b>address</b>, shares_to_redeem: u128, shareholder: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_update_governanace_records_for_redeem_active_shares">update_governanace_records_for_redeem_active_shares</a>(
+    pool: &<a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>, pool_address: <b>address</b>, shares_to_redeem: u128, shareholder: <b>address</b>
+) <b>acquires</b> <a href="delegation_pool.md#0x1_delegation_pool_GovernanceRecords">GovernanceRecords</a> {
+    // &lt;active shares&gt; of &lt;shareholder&gt; -= &lt;shares_to_redeem&gt; ----&gt;
+    // &lt;active shares&gt; of &lt;current voter of shareholder&gt; -= &lt;shares_to_redeem&gt;
+    // &lt;active shares&gt; of &lt;next voter of shareholder&gt; -= &lt;shares_to_redeem&gt;
+    <b>let</b> governance_records = <b>borrow_global_mut</b>&lt;<a href="delegation_pool.md#0x1_delegation_pool_GovernanceRecords">GovernanceRecords</a>&gt;(pool_address);
+    <b>let</b> vote_delegation = <a href="delegation_pool.md#0x1_delegation_pool_update_and_borrow_mut_delegator_vote_delegation">update_and_borrow_mut_delegator_vote_delegation</a>(
+        pool,
+        governance_records,
+        shareholder
+    );
+    <b>let</b> current_voter = vote_delegation.voter;
+    <b>let</b> pending_voter = vote_delegation.pending_voter;
+    <b>let</b> current_delegated_votes = <a href="delegation_pool.md#0x1_delegation_pool_update_and_borrow_mut_delegated_votes">update_and_borrow_mut_delegated_votes</a>(pool, governance_records, current_voter);
+    current_delegated_votes.active_shares = current_delegated_votes.active_shares - shares_to_redeem;
+    <b>if</b> (current_voter == pending_voter) {
+        current_delegated_votes.active_shares_next_lockup =
+            current_delegated_votes.active_shares_next_lockup - shares_to_redeem;
+    } <b>else</b> {
+        <b>let</b> pending_delegated_votes =
+            <a href="delegation_pool.md#0x1_delegation_pool_update_and_borrow_mut_delegated_votes">update_and_borrow_mut_delegated_votes</a>(pool, governance_records, pending_voter);
+        pending_delegated_votes.active_shares_next_lockup =
+            pending_delegated_votes.active_shares_next_lockup - shares_to_redeem;
+    };
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_update_governanace_records_for_redeem_pending_inactive_shares"></a>
+
+## Function `update_governanace_records_for_redeem_pending_inactive_shares`
+
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_update_governanace_records_for_redeem_pending_inactive_shares">update_governanace_records_for_redeem_pending_inactive_shares</a>(pool: &<a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">delegation_pool::DelegationPool</a>, pool_address: <b>address</b>, shares_to_redeem: u128, shareholder: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_update_governanace_records_for_redeem_pending_inactive_shares">update_governanace_records_for_redeem_pending_inactive_shares</a>(
+    pool: &<a href="delegation_pool.md#0x1_delegation_pool_DelegationPool">DelegationPool</a>, pool_address: <b>address</b>, shares_to_redeem: u128, shareholder: <b>address</b>
+) <b>acquires</b> <a href="delegation_pool.md#0x1_delegation_pool_GovernanceRecords">GovernanceRecords</a> {
+    // &lt;pending inactive shares&gt; of &lt;shareholder&gt; -= &lt;shares_to_redeem&gt;  ----&gt;
+    // &lt;pending inactive shares&gt; of &lt;current voter of shareholder&gt; -= &lt;shares_to_redeem&gt;
+    // no impact on &lt;pending inactive shares&gt; of &lt;next voter of shareholder&gt;
+    <b>let</b> governance_records = <b>borrow_global_mut</b>&lt;<a href="delegation_pool.md#0x1_delegation_pool_GovernanceRecords">GovernanceRecords</a>&gt;(pool_address);
+    <b>let</b> current_voter = <a href="delegation_pool.md#0x1_delegation_pool_calculate_and_update_delegator_voter_internal">calculate_and_update_delegator_voter_internal</a>(pool, governance_records, shareholder);
+    <b>let</b> current_delegated_votes = <a href="delegation_pool.md#0x1_delegation_pool_update_and_borrow_mut_delegated_votes">update_and_borrow_mut_delegated_votes</a>(pool, governance_records, current_voter);
+    current_delegated_votes.pending_inactive_shares = current_delegated_votes.pending_inactive_shares - shares_to_redeem;
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_delegation_pool_multiply_then_divide"></a>
+
+## Function `multiply_then_divide`
+
+Deprecated, prefer math64::mul_div
+
+
+<pre><code>#[deprecated]
+<b>public</b> <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_multiply_then_divide">multiply_then_divide</a>(x: u64, y: u64, z: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="delegation_pool.md#0x1_delegation_pool_multiply_then_divide">multiply_then_divide</a>(x: u64, y: u64, z: u64): u64 {
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/math64.md#0x1_math64_mul_div">math64::mul_div</a>(x, y, z)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+
+
+<a id="high-level-req"></a>
+
+### High-level Requirements
+
+<table>
+<tr>
+<th>No.</th><th>Requirement</th><th>Criticality</th><th>Implementation</th><th>Enforcement</th>
+</tr>
+
+<tr>
+<td>1</td>
+<td>Every DelegationPool has only one corresponding StakePool stored at the same address.</td>
+<td>Critical</td>
+<td>Upon calling the initialize_delegation_pool function, a resource account is created from the "owner" signer to host the delegation pool resource and own the underlying stake pool.</td>
+<td>Audited that the address of StakePool equals address of DelegationPool and the data invariant on the DelegationPool.</td>
+</tr>
+
+<tr>
+<td>2</td>
+<td>The signer capability within the delegation pool has an address equal to the address of the delegation pool.</td>
+<td>Critical</td>
+<td>The initialize_delegation_pool function moves the DelegationPool resource to the address associated with stake_pool_signer, which also possesses the signer capability.</td>
+<td>Audited that the address of signer cap equals address of DelegationPool.</td>
+</tr>
+
+<tr>
+<td>3</td>
+<td>A delegator holds shares exclusively in one inactive shares pool, which could either be an already inactive pool or the pending_inactive pool.</td>
+<td>High</td>
+<td>The get_stake function returns the inactive stake owned by a delegator and checks which state the shares are in via the get_pending_withdrawal function.</td>
+<td>Audited that either inactive or pending_inactive stake after invoking the get_stake function is zero and both are never non-zero.</td>
+</tr>
+
+<tr>
+<td>4</td>
+<td>The specific pool in which the delegator possesses inactive shares becomes designated as the pending withdrawal pool for that delegator.</td>
+<td>Medium</td>
+<td>The get_pending_withdrawal function checks if any pending withdrawal exists for a delegate address and if there is neither inactive nor pending_inactive stake, the pending_withdrawal_exists returns false.</td>
+<td>This has been audited.</td>
+</tr>
+
+<tr>
+<td>5</td>
+<td>The existence of a pending withdrawal implies that it is associated with a pool where the delegator possesses inactive shares.</td>
+<td>Medium</td>
+<td>In the get_pending_withdrawal function, if withdrawal_exists is true, the function returns true and a non-zero amount</td>
+<td>get_pending_withdrawal has been audited.</td>
+</tr>
+
+<tr>
+<td>6</td>
+<td>An inactive shares pool should have coins allocated to it; otherwise, it should become deleted.</td>
+<td>Medium</td>
+<td>The redeem_inactive_shares function has a check that destroys the inactive shares pool, given that it is empty.</td>
+<td>shares pools have been audited.</td>
+</tr>
+
+<tr>
+<td>7</td>
+<td>The index of the pending withdrawal will not exceed the current OLC on DelegationPool.</td>
+<td>High</td>
+<td>The get_pending_withdrawal function has a check which ensures that withdrawal_olc.index < pool.observed_lockup_cycle.index.</td>
+<td>This has been audited.</td>
+</tr>
+
+<tr>
+<td>8</td>
+<td>Slashing is not possible for inactive stakes.</td>
+<td>Critical</td>
+<td>The number of inactive staked coins must be greater than or equal to the total_coins_inactive of the pool.</td>
+<td>This has been audited.</td>
+</tr>
+
+<tr>
+<td>9</td>
+<td>The delegator's active or pending inactive stake will always meet or exceed the minimum allowed value.</td>
+<td>Medium</td>
+<td>The add_stake, unlock and reactivate_stake functions ensure the active_shares or pending_inactive_shares balance for the delegator is greater than or equal to the MIN_COINS_ON_SHARES_POOL value.</td>
+<td>Audited the comparison of active_shares or inactive_shares balance for the delegator with the MIN_COINS_ON_SHARES_POOL value.</td>
+</tr>
+
+<tr>
+<td>10</td>
+<td>The delegation pool exists at a given address.</td>
+<td>Low</td>
+<td>Functions that operate on the DelegationPool abort if there is no DelegationPool struct under the given pool_address.</td>
+<td>Audited that there is no DelegationPool structure assigned to the pool_address given as a parameter.</td>
+</tr>
+
+<tr>
+<td>11</td>
+<td>The initialization of the delegation pool is contingent upon enabling the delegation pools feature.</td>
+<td>Critical</td>
+<td>The initialize_delegation_pool function should proceed if the DELEGATION_POOLS feature is enabled.</td>
+<td>This has been audited.</td>
+</tr>
+
+</table>
+
+
+
+
+<a id="module-level-spec"></a>
+
+### Module-level Specification
+
+
+<pre><code><b>pragma</b> verify=<b>false</b>;
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/dispatchable_fungible_asset.md b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/dispatchable_fungible_asset.md
new file mode 100644
index 0000000000000..dca680da9e6bc
--- /dev/null
+++ b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/dispatchable_fungible_asset.md
@@ -0,0 +1,651 @@
+
+<a id="0x1_dispatchable_fungible_asset"></a>
+
+# Module `0x1::dispatchable_fungible_asset`
+
+This defines the fungible asset module that can issue fungible asset of any <code>Metadata</code> object. The
+metadata object can be any object that equipped with <code>Metadata</code> resource.
+
+The dispatchable_fungible_asset wraps the existing fungible_asset module and adds the ability for token issuer
+to customize the logic for withdraw and deposit operations. For example:
+
+- Deflation token: a fixed percentage of token will be destructed upon transfer.
+- Transfer allowlist: token can only be transfered to addresses in the allow list.
+- Predicated transfer: transfer can only happen when some certain predicate has been met.
+- Loyalty token: a fixed loyalty will be paid to a designated address when a fungible asset transfer happens
+
+The api listed here intended to be an in-place replacement for defi applications that uses fungible_asset api directly
+and is safe for non-dispatchable (aka vanilla) fungible assets as well.
+
+See AIP-73 for further discussion
+
+
+-  [Resource `TransferRefStore`](#0x1_dispatchable_fungible_asset_TransferRefStore)
+-  [Constants](#@Constants_0)
+-  [Function `register_dispatch_functions`](#0x1_dispatchable_fungible_asset_register_dispatch_functions)
+-  [Function `register_derive_supply_dispatch_function`](#0x1_dispatchable_fungible_asset_register_derive_supply_dispatch_function)
+-  [Function `withdraw`](#0x1_dispatchable_fungible_asset_withdraw)
+-  [Function `deposit`](#0x1_dispatchable_fungible_asset_deposit)
+-  [Function `transfer`](#0x1_dispatchable_fungible_asset_transfer)
+-  [Function `transfer_assert_minimum_deposit`](#0x1_dispatchable_fungible_asset_transfer_assert_minimum_deposit)
+-  [Function `derived_balance`](#0x1_dispatchable_fungible_asset_derived_balance)
+-  [Function `derived_supply`](#0x1_dispatchable_fungible_asset_derived_supply)
+-  [Function `borrow_transfer_ref`](#0x1_dispatchable_fungible_asset_borrow_transfer_ref)
+-  [Function `dispatchable_withdraw`](#0x1_dispatchable_fungible_asset_dispatchable_withdraw)
+-  [Function `dispatchable_deposit`](#0x1_dispatchable_fungible_asset_dispatchable_deposit)
+-  [Function `dispatchable_derived_balance`](#0x1_dispatchable_fungible_asset_dispatchable_derived_balance)
+-  [Function `dispatchable_derived_supply`](#0x1_dispatchable_fungible_asset_dispatchable_derived_supply)
+-  [Specification](#@Specification_1)
+    -  [Function `dispatchable_withdraw`](#@Specification_1_dispatchable_withdraw)
+    -  [Function `dispatchable_deposit`](#@Specification_1_dispatchable_deposit)
+    -  [Function `dispatchable_derived_balance`](#@Specification_1_dispatchable_derived_balance)
+    -  [Function `dispatchable_derived_supply`](#@Specification_1_dispatchable_derived_supply)
+
+
+<pre><code><b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features">0x1::features</a>;
+<b>use</b> <a href="function_info.md#0x1_function_info">0x1::function_info</a>;
+<b>use</b> <a href="fungible_asset.md#0x1_fungible_asset">0x1::fungible_asset</a>;
+<b>use</b> <a href="object.md#0x1_object">0x1::object</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option">0x1::option</a>;
+</code></pre>
+
+
+
+<a id="0x1_dispatchable_fungible_asset_TransferRefStore"></a>
+
+## Resource `TransferRefStore`
+
+
+
+<pre><code>#[resource_group_member(#[group = <a href="object.md#0x1_object_ObjectGroup">0x1::object::ObjectGroup</a>])]
+<b>struct</b> <a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_TransferRefStore">TransferRefStore</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>transfer_ref: <a href="fungible_asset.md#0x1_fungible_asset_TransferRef">fungible_asset::TransferRef</a></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_dispatchable_fungible_asset_ENOT_ACTIVATED"></a>
+
+Feature is not activated yet on the network.
+
+
+<pre><code><b>const</b> <a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_ENOT_ACTIVATED">ENOT_ACTIVATED</a>: u64 = 3;
+</code></pre>
+
+
+
+<a id="0x1_dispatchable_fungible_asset_EAMOUNT_MISMATCH"></a>
+
+Recipient is not getting the guaranteed value;
+
+
+<pre><code><b>const</b> <a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_EAMOUNT_MISMATCH">EAMOUNT_MISMATCH</a>: u64 = 2;
+</code></pre>
+
+
+
+<a id="0x1_dispatchable_fungible_asset_ENOT_LOADED"></a>
+
+Dispatch target is not loaded.
+
+
+<pre><code><b>const</b> <a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_ENOT_LOADED">ENOT_LOADED</a>: u64 = 4;
+</code></pre>
+
+
+
+<a id="0x1_dispatchable_fungible_asset_ESTORE_NOT_FOUND"></a>
+
+TransferRefStore doesn't exist on the fungible asset type.
+
+
+<pre><code><b>const</b> <a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_ESTORE_NOT_FOUND">ESTORE_NOT_FOUND</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_dispatchable_fungible_asset_register_dispatch_functions"></a>
+
+## Function `register_dispatch_functions`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_register_dispatch_functions">register_dispatch_functions</a>(constructor_ref: &<a href="object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>, withdraw_function: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="function_info.md#0x1_function_info_FunctionInfo">function_info::FunctionInfo</a>&gt;, deposit_function: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="function_info.md#0x1_function_info_FunctionInfo">function_info::FunctionInfo</a>&gt;, derived_balance_function: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="function_info.md#0x1_function_info_FunctionInfo">function_info::FunctionInfo</a>&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_register_dispatch_functions">register_dispatch_functions</a>(
+    constructor_ref: &ConstructorRef,
+    withdraw_function: Option&lt;FunctionInfo&gt;,
+    deposit_function: Option&lt;FunctionInfo&gt;,
+    derived_balance_function: Option&lt;FunctionInfo&gt;,
+) {
+    <a href="fungible_asset.md#0x1_fungible_asset_register_dispatch_functions">fungible_asset::register_dispatch_functions</a>(
+        constructor_ref,
+        withdraw_function,
+        deposit_function,
+        derived_balance_function,
+    );
+    <b>let</b> store_obj = &<a href="object.md#0x1_object_generate_signer">object::generate_signer</a>(constructor_ref);
+    <b>move_to</b>&lt;<a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_TransferRefStore">TransferRefStore</a>&gt;(
+        store_obj,
+        <a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_TransferRefStore">TransferRefStore</a> {
+            transfer_ref: <a href="fungible_asset.md#0x1_fungible_asset_generate_transfer_ref">fungible_asset::generate_transfer_ref</a>(constructor_ref),
+        }
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_dispatchable_fungible_asset_register_derive_supply_dispatch_function"></a>
+
+## Function `register_derive_supply_dispatch_function`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_register_derive_supply_dispatch_function">register_derive_supply_dispatch_function</a>(constructor_ref: &<a href="object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>, dispatch_function: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="function_info.md#0x1_function_info_FunctionInfo">function_info::FunctionInfo</a>&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_register_derive_supply_dispatch_function">register_derive_supply_dispatch_function</a>(
+    constructor_ref: &ConstructorRef,
+    dispatch_function: Option&lt;FunctionInfo&gt;
+) {
+    <a href="fungible_asset.md#0x1_fungible_asset_register_derive_supply_dispatch_function">fungible_asset::register_derive_supply_dispatch_function</a>(
+        constructor_ref,
+        dispatch_function
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_dispatchable_fungible_asset_withdraw"></a>
+
+## Function `withdraw`
+
+Withdraw <code>amount</code> of the fungible asset from <code>store</code> by the owner.
+
+The semantics of deposit will be governed by the function specified in DispatchFunctionStore.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_withdraw">withdraw</a>&lt;T: key&gt;(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, store: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, amount: u64): <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">fungible_asset::FungibleAsset</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_withdraw">withdraw</a>&lt;T: key&gt;(
+    owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    store: Object&lt;T&gt;,
+    amount: u64,
+): FungibleAsset <b>acquires</b> <a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_TransferRefStore">TransferRefStore</a> {
+    <a href="fungible_asset.md#0x1_fungible_asset_withdraw_sanity_check">fungible_asset::withdraw_sanity_check</a>(owner, store, <b>false</b>);
+    <b>let</b> func_opt = <a href="fungible_asset.md#0x1_fungible_asset_withdraw_dispatch_function">fungible_asset::withdraw_dispatch_function</a>(store);
+    <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&func_opt)) {
+        <b>assert</b>!(
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_dispatchable_fungible_asset_enabled">features::dispatchable_fungible_asset_enabled</a>(),
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_aborted">error::aborted</a>(<a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_ENOT_ACTIVATED">ENOT_ACTIVATED</a>)
+        );
+        <b>let</b> start_balance = <a href="fungible_asset.md#0x1_fungible_asset_balance">fungible_asset::balance</a>(store);
+        <b>let</b> func = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(&func_opt);
+        <a href="function_info.md#0x1_function_info_load_module_from_function">function_info::load_module_from_function</a>(func);
+        <b>let</b> fa = <a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_dispatchable_withdraw">dispatchable_withdraw</a>(
+            store,
+            amount,
+            <a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_borrow_transfer_ref">borrow_transfer_ref</a>(store),
+            func,
+        );
+        <b>let</b> end_balance = <a href="fungible_asset.md#0x1_fungible_asset_balance">fungible_asset::balance</a>(store);
+        <b>assert</b>!(amount &lt;= start_balance - end_balance, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_aborted">error::aborted</a>(<a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_EAMOUNT_MISMATCH">EAMOUNT_MISMATCH</a>));
+        fa
+    } <b>else</b> {
+        <a href="fungible_asset.md#0x1_fungible_asset_withdraw_internal">fungible_asset::withdraw_internal</a>(<a href="object.md#0x1_object_object_address">object::object_address</a>(&store), amount)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_dispatchable_fungible_asset_deposit"></a>
+
+## Function `deposit`
+
+Deposit <code>amount</code> of the fungible asset to <code>store</code>.
+
+The semantics of deposit will be governed by the function specified in DispatchFunctionStore.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_deposit">deposit</a>&lt;T: key&gt;(store: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, fa: <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">fungible_asset::FungibleAsset</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_deposit">deposit</a>&lt;T: key&gt;(store: Object&lt;T&gt;, fa: FungibleAsset) <b>acquires</b> <a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_TransferRefStore">TransferRefStore</a> {
+    <a href="fungible_asset.md#0x1_fungible_asset_deposit_sanity_check">fungible_asset::deposit_sanity_check</a>(store, <b>false</b>);
+    <b>let</b> func_opt = <a href="fungible_asset.md#0x1_fungible_asset_deposit_dispatch_function">fungible_asset::deposit_dispatch_function</a>(store);
+    <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&func_opt)) {
+        <b>assert</b>!(
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_dispatchable_fungible_asset_enabled">features::dispatchable_fungible_asset_enabled</a>(),
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_aborted">error::aborted</a>(<a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_ENOT_ACTIVATED">ENOT_ACTIVATED</a>)
+        );
+        <b>let</b> func = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(&func_opt);
+        <a href="function_info.md#0x1_function_info_load_module_from_function">function_info::load_module_from_function</a>(func);
+        <a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_dispatchable_deposit">dispatchable_deposit</a>(
+            store,
+            fa,
+            <a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_borrow_transfer_ref">borrow_transfer_ref</a>(store),
+            func
+        )
+    } <b>else</b> {
+        <a href="fungible_asset.md#0x1_fungible_asset_deposit_internal">fungible_asset::deposit_internal</a>(<a href="object.md#0x1_object_object_address">object::object_address</a>(&store), fa)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_dispatchable_fungible_asset_transfer"></a>
+
+## Function `transfer`
+
+Transfer an <code>amount</code> of fungible asset from <code>from_store</code>, which should be owned by <code>sender</code>, to <code>receiver</code>.
+Note: it does not move the underlying object.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_transfer">transfer</a>&lt;T: key&gt;(sender: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, from: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, <b>to</b>: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, amount: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_transfer">transfer</a>&lt;T: key&gt;(
+    sender: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    from: Object&lt;T&gt;,
+    <b>to</b>: Object&lt;T&gt;,
+    amount: u64,
+) <b>acquires</b> <a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_TransferRefStore">TransferRefStore</a> {
+    <b>let</b> fa = <a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_withdraw">withdraw</a>(sender, from, amount);
+    <a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_deposit">deposit</a>(<b>to</b>, fa);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_dispatchable_fungible_asset_transfer_assert_minimum_deposit"></a>
+
+## Function `transfer_assert_minimum_deposit`
+
+Transfer an <code>amount</code> of fungible asset from <code>from_store</code>, which should be owned by <code>sender</code>, to <code>receiver</code>.
+The recipient is guranteed to receive asset greater than the expected amount.
+Note: it does not move the underlying object.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_transfer_assert_minimum_deposit">transfer_assert_minimum_deposit</a>&lt;T: key&gt;(sender: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, from: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, <b>to</b>: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, amount: u64, expected: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_transfer_assert_minimum_deposit">transfer_assert_minimum_deposit</a>&lt;T: key&gt;(
+    sender: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    from: Object&lt;T&gt;,
+    <b>to</b>: Object&lt;T&gt;,
+    amount: u64,
+    expected: u64
+) <b>acquires</b> <a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_TransferRefStore">TransferRefStore</a> {
+    <b>let</b> start = <a href="fungible_asset.md#0x1_fungible_asset_balance">fungible_asset::balance</a>(<b>to</b>);
+    <b>let</b> fa = <a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_withdraw">withdraw</a>(sender, from, amount);
+    <a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_deposit">deposit</a>(<b>to</b>, fa);
+    <b>let</b> end = <a href="fungible_asset.md#0x1_fungible_asset_balance">fungible_asset::balance</a>(<b>to</b>);
+    <b>assert</b>!(end - start &gt;= expected, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_aborted">error::aborted</a>(<a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_EAMOUNT_MISMATCH">EAMOUNT_MISMATCH</a>));
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_dispatchable_fungible_asset_derived_balance"></a>
+
+## Function `derived_balance`
+
+Get the derived value of store using the overloaded hook.
+
+The semantics of value will be governed by the function specified in DispatchFunctionStore.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_derived_balance">derived_balance</a>&lt;T: key&gt;(store: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_derived_balance">derived_balance</a>&lt;T: key&gt;(store: Object&lt;T&gt;): u64 {
+    <b>let</b> func_opt = <a href="fungible_asset.md#0x1_fungible_asset_derived_balance_dispatch_function">fungible_asset::derived_balance_dispatch_function</a>(store);
+    <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&func_opt)) {
+        <b>assert</b>!(
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_dispatchable_fungible_asset_enabled">features::dispatchable_fungible_asset_enabled</a>(),
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_aborted">error::aborted</a>(<a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_ENOT_ACTIVATED">ENOT_ACTIVATED</a>)
+        );
+        <b>let</b> func = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(&func_opt);
+        <a href="function_info.md#0x1_function_info_load_module_from_function">function_info::load_module_from_function</a>(func);
+        <a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_dispatchable_derived_balance">dispatchable_derived_balance</a>(store, func)
+    } <b>else</b> {
+        <a href="fungible_asset.md#0x1_fungible_asset_balance">fungible_asset::balance</a>(store)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_dispatchable_fungible_asset_derived_supply"></a>
+
+## Function `derived_supply`
+
+Get the derived supply of the fungible asset using the overloaded hook.
+
+The semantics of supply will be governed by the function specified in DeriveSupplyDispatch.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_derived_supply">derived_supply</a>&lt;T: key&gt;(metadata: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;u128&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_derived_supply">derived_supply</a>&lt;T: key&gt;(metadata: Object&lt;T&gt;): Option&lt;u128&gt; {
+    <b>let</b> func_opt = <a href="fungible_asset.md#0x1_fungible_asset_derived_supply_dispatch_function">fungible_asset::derived_supply_dispatch_function</a>(metadata);
+    <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&func_opt)) {
+        <b>assert</b>!(
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_dispatchable_fungible_asset_enabled">features::dispatchable_fungible_asset_enabled</a>(),
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_aborted">error::aborted</a>(<a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_ENOT_ACTIVATED">ENOT_ACTIVATED</a>)
+        );
+        <b>let</b> func = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(&func_opt);
+        <a href="function_info.md#0x1_function_info_load_module_from_function">function_info::load_module_from_function</a>(func);
+        <a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_dispatchable_derived_supply">dispatchable_derived_supply</a>(metadata, func)
+    } <b>else</b> {
+        <a href="fungible_asset.md#0x1_fungible_asset_supply">fungible_asset::supply</a>(metadata)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_dispatchable_fungible_asset_borrow_transfer_ref"></a>
+
+## Function `borrow_transfer_ref`
+
+
+
+<pre><code><b>fun</b> <a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_borrow_transfer_ref">borrow_transfer_ref</a>&lt;T: key&gt;(metadata: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): &<a href="fungible_asset.md#0x1_fungible_asset_TransferRef">fungible_asset::TransferRef</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_borrow_transfer_ref">borrow_transfer_ref</a>&lt;T: key&gt;(metadata: Object&lt;T&gt;): &TransferRef <b>acquires</b> <a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_TransferRefStore">TransferRefStore</a> {
+    <b>let</b> metadata_addr = <a href="object.md#0x1_object_object_address">object::object_address</a>(
+        &<a href="fungible_asset.md#0x1_fungible_asset_store_metadata">fungible_asset::store_metadata</a>(metadata)
+    );
+    <b>assert</b>!(
+        <b>exists</b>&lt;<a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_TransferRefStore">TransferRefStore</a>&gt;(metadata_addr),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_ESTORE_NOT_FOUND">ESTORE_NOT_FOUND</a>)
+    );
+    &<b>borrow_global</b>&lt;<a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_TransferRefStore">TransferRefStore</a>&gt;(metadata_addr).transfer_ref
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_dispatchable_fungible_asset_dispatchable_withdraw"></a>
+
+## Function `dispatchable_withdraw`
+
+
+
+<pre><code><b>fun</b> <a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_dispatchable_withdraw">dispatchable_withdraw</a>&lt;T: key&gt;(store: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, amount: u64, transfer_ref: &<a href="fungible_asset.md#0x1_fungible_asset_TransferRef">fungible_asset::TransferRef</a>, function: &<a href="function_info.md#0x1_function_info_FunctionInfo">function_info::FunctionInfo</a>): <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">fungible_asset::FungibleAsset</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_dispatchable_withdraw">dispatchable_withdraw</a>&lt;T: key&gt;(
+    store: Object&lt;T&gt;,
+    amount: u64,
+    transfer_ref: &TransferRef,
+    function: &FunctionInfo,
+): FungibleAsset;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_dispatchable_fungible_asset_dispatchable_deposit"></a>
+
+## Function `dispatchable_deposit`
+
+
+
+<pre><code><b>fun</b> <a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_dispatchable_deposit">dispatchable_deposit</a>&lt;T: key&gt;(store: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, fa: <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">fungible_asset::FungibleAsset</a>, transfer_ref: &<a href="fungible_asset.md#0x1_fungible_asset_TransferRef">fungible_asset::TransferRef</a>, function: &<a href="function_info.md#0x1_function_info_FunctionInfo">function_info::FunctionInfo</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_dispatchable_deposit">dispatchable_deposit</a>&lt;T: key&gt;(
+    store: Object&lt;T&gt;,
+    fa: FungibleAsset,
+    transfer_ref: &TransferRef,
+    function: &FunctionInfo,
+);
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_dispatchable_fungible_asset_dispatchable_derived_balance"></a>
+
+## Function `dispatchable_derived_balance`
+
+
+
+<pre><code><b>fun</b> <a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_dispatchable_derived_balance">dispatchable_derived_balance</a>&lt;T: key&gt;(store: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, function: &<a href="function_info.md#0x1_function_info_FunctionInfo">function_info::FunctionInfo</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_dispatchable_derived_balance">dispatchable_derived_balance</a>&lt;T: key&gt;(
+    store: Object&lt;T&gt;,
+    function: &FunctionInfo,
+): u64;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_dispatchable_fungible_asset_dispatchable_derived_supply"></a>
+
+## Function `dispatchable_derived_supply`
+
+
+
+<pre><code><b>fun</b> <a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_dispatchable_derived_supply">dispatchable_derived_supply</a>&lt;T: key&gt;(store: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, function: &<a href="function_info.md#0x1_function_info_FunctionInfo">function_info::FunctionInfo</a>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;u128&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_dispatchable_derived_supply">dispatchable_derived_supply</a>&lt;T: key&gt;(
+    store: Object&lt;T&gt;,
+    function: &FunctionInfo,
+): Option&lt;u128&gt;;
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_dispatchable_withdraw"></a>
+
+### Function `dispatchable_withdraw`
+
+
+<pre><code><b>fun</b> <a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_dispatchable_withdraw">dispatchable_withdraw</a>&lt;T: key&gt;(store: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, amount: u64, transfer_ref: &<a href="fungible_asset.md#0x1_fungible_asset_TransferRef">fungible_asset::TransferRef</a>, function: &<a href="function_info.md#0x1_function_info_FunctionInfo">function_info::FunctionInfo</a>): <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">fungible_asset::FungibleAsset</a>
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_dispatchable_deposit"></a>
+
+### Function `dispatchable_deposit`
+
+
+<pre><code><b>fun</b> <a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_dispatchable_deposit">dispatchable_deposit</a>&lt;T: key&gt;(store: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, fa: <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">fungible_asset::FungibleAsset</a>, transfer_ref: &<a href="fungible_asset.md#0x1_fungible_asset_TransferRef">fungible_asset::TransferRef</a>, function: &<a href="function_info.md#0x1_function_info_FunctionInfo">function_info::FunctionInfo</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_dispatchable_derived_balance"></a>
+
+### Function `dispatchable_derived_balance`
+
+
+<pre><code><b>fun</b> <a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_dispatchable_derived_balance">dispatchable_derived_balance</a>&lt;T: key&gt;(store: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, function: &<a href="function_info.md#0x1_function_info_FunctionInfo">function_info::FunctionInfo</a>): u64
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_dispatchable_derived_supply"></a>
+
+### Function `dispatchable_derived_supply`
+
+
+<pre><code><b>fun</b> <a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_dispatchable_derived_supply">dispatchable_derived_supply</a>&lt;T: key&gt;(store: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, function: &<a href="function_info.md#0x1_function_info_FunctionInfo">function_info::FunctionInfo</a>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;u128&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/dkg.md b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/dkg.md
new file mode 100644
index 0000000000000..fde1df92a990e
--- /dev/null
+++ b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/dkg.md
@@ -0,0 +1,524 @@
+
+<a id="0x1_dkg"></a>
+
+# Module `0x1::dkg`
+
+DKG on-chain states and helper functions.
+
+
+-  [Struct `DKGSessionMetadata`](#0x1_dkg_DKGSessionMetadata)
+-  [Struct `DKGStartEvent`](#0x1_dkg_DKGStartEvent)
+-  [Struct `DKGSessionState`](#0x1_dkg_DKGSessionState)
+-  [Resource `DKGState`](#0x1_dkg_DKGState)
+-  [Constants](#@Constants_0)
+-  [Function `initialize`](#0x1_dkg_initialize)
+-  [Function `start`](#0x1_dkg_start)
+-  [Function `finish`](#0x1_dkg_finish)
+-  [Function `try_clear_incomplete_session`](#0x1_dkg_try_clear_incomplete_session)
+-  [Function `incomplete_session`](#0x1_dkg_incomplete_session)
+-  [Function `session_dealer_epoch`](#0x1_dkg_session_dealer_epoch)
+-  [Specification](#@Specification_1)
+    -  [Function `initialize`](#@Specification_1_initialize)
+    -  [Function `start`](#@Specification_1_start)
+    -  [Function `finish`](#@Specification_1_finish)
+    -  [Function `try_clear_incomplete_session`](#@Specification_1_try_clear_incomplete_session)
+    -  [Function `incomplete_session`](#@Specification_1_incomplete_session)
+
+
+<pre><code><b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="event.md#0x1_event">0x1::event</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option">0x1::option</a>;
+<b>use</b> <a href="randomness_config.md#0x1_randomness_config">0x1::randomness_config</a>;
+<b>use</b> <a href="system_addresses.md#0x1_system_addresses">0x1::system_addresses</a>;
+<b>use</b> <a href="timestamp.md#0x1_timestamp">0x1::timestamp</a>;
+<b>use</b> <a href="validator_consensus_info.md#0x1_validator_consensus_info">0x1::validator_consensus_info</a>;
+</code></pre>
+
+
+
+<a id="0x1_dkg_DKGSessionMetadata"></a>
+
+## Struct `DKGSessionMetadata`
+
+This can be considered as the public input of DKG.
+
+
+<pre><code><b>struct</b> <a href="dkg.md#0x1_dkg_DKGSessionMetadata">DKGSessionMetadata</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>dealer_epoch: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code><a href="randomness_config.md#0x1_randomness_config">randomness_config</a>: <a href="randomness_config.md#0x1_randomness_config_RandomnessConfig">randomness_config::RandomnessConfig</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>dealer_validator_set: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="validator_consensus_info.md#0x1_validator_consensus_info_ValidatorConsensusInfo">validator_consensus_info::ValidatorConsensusInfo</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>target_validator_set: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="validator_consensus_info.md#0x1_validator_consensus_info_ValidatorConsensusInfo">validator_consensus_info::ValidatorConsensusInfo</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_dkg_DKGStartEvent"></a>
+
+## Struct `DKGStartEvent`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="dkg.md#0x1_dkg_DKGStartEvent">DKGStartEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>session_metadata: <a href="dkg.md#0x1_dkg_DKGSessionMetadata">dkg::DKGSessionMetadata</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>start_time_us: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_dkg_DKGSessionState"></a>
+
+## Struct `DKGSessionState`
+
+The input and output of a DKG session.
+The validator set of epoch <code>x</code> works together for an DKG output for the target validator set of epoch <code>x+1</code>.
+
+
+<pre><code><b>struct</b> <a href="dkg.md#0x1_dkg_DKGSessionState">DKGSessionState</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>metadata: <a href="dkg.md#0x1_dkg_DKGSessionMetadata">dkg::DKGSessionMetadata</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>start_time_us: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>transcript: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_dkg_DKGState"></a>
+
+## Resource `DKGState`
+
+The completed and in-progress DKG sessions.
+
+
+<pre><code><b>struct</b> <a href="dkg.md#0x1_dkg_DKGState">DKGState</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>last_completed: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="dkg.md#0x1_dkg_DKGSessionState">dkg::DKGSessionState</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>in_progress: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="dkg.md#0x1_dkg_DKGSessionState">dkg::DKGSessionState</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_dkg_EDKG_IN_PROGRESS"></a>
+
+
+
+<pre><code><b>const</b> <a href="dkg.md#0x1_dkg_EDKG_IN_PROGRESS">EDKG_IN_PROGRESS</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_dkg_EDKG_NOT_IN_PROGRESS"></a>
+
+
+
+<pre><code><b>const</b> <a href="dkg.md#0x1_dkg_EDKG_NOT_IN_PROGRESS">EDKG_NOT_IN_PROGRESS</a>: u64 = 2;
+</code></pre>
+
+
+
+<a id="0x1_dkg_initialize"></a>
+
+## Function `initialize`
+
+Called in genesis to initialize on-chain states.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="dkg.md#0x1_dkg_initialize">initialize</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="dkg.md#0x1_dkg_initialize">initialize</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>) {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(aptos_framework);
+    <b>if</b> (!<b>exists</b>&lt;<a href="dkg.md#0x1_dkg_DKGState">DKGState</a>&gt;(@aptos_framework)) {
+        <b>move_to</b>&lt;<a href="dkg.md#0x1_dkg_DKGState">DKGState</a>&gt;(
+            aptos_framework,
+            <a href="dkg.md#0x1_dkg_DKGState">DKGState</a> {
+                last_completed: std::option::none(),
+                in_progress: std::option::none(),
+            }
+        );
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_dkg_start"></a>
+
+## Function `start`
+
+Mark on-chain DKG state as in-progress. Notify validators to start DKG.
+Abort if a DKG is already in progress.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="dkg.md#0x1_dkg_start">start</a>(dealer_epoch: u64, <a href="randomness_config.md#0x1_randomness_config">randomness_config</a>: <a href="randomness_config.md#0x1_randomness_config_RandomnessConfig">randomness_config::RandomnessConfig</a>, dealer_validator_set: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="validator_consensus_info.md#0x1_validator_consensus_info_ValidatorConsensusInfo">validator_consensus_info::ValidatorConsensusInfo</a>&gt;, target_validator_set: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="validator_consensus_info.md#0x1_validator_consensus_info_ValidatorConsensusInfo">validator_consensus_info::ValidatorConsensusInfo</a>&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="dkg.md#0x1_dkg_start">start</a>(
+    dealer_epoch: u64,
+    <a href="randomness_config.md#0x1_randomness_config">randomness_config</a>: RandomnessConfig,
+    dealer_validator_set: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;ValidatorConsensusInfo&gt;,
+    target_validator_set: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;ValidatorConsensusInfo&gt;,
+) <b>acquires</b> <a href="dkg.md#0x1_dkg_DKGState">DKGState</a> {
+    <b>let</b> dkg_state = <b>borrow_global_mut</b>&lt;<a href="dkg.md#0x1_dkg_DKGState">DKGState</a>&gt;(@aptos_framework);
+    <b>let</b> new_session_metadata = <a href="dkg.md#0x1_dkg_DKGSessionMetadata">DKGSessionMetadata</a> {
+        dealer_epoch,
+        <a href="randomness_config.md#0x1_randomness_config">randomness_config</a>,
+        dealer_validator_set,
+        target_validator_set,
+    };
+    <b>let</b> start_time_us = <a href="timestamp.md#0x1_timestamp_now_microseconds">timestamp::now_microseconds</a>();
+    dkg_state.in_progress = std::option::some(<a href="dkg.md#0x1_dkg_DKGSessionState">DKGSessionState</a> {
+        metadata: new_session_metadata,
+        start_time_us,
+        transcript: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>[],
+    });
+
+    emit(<a href="dkg.md#0x1_dkg_DKGStartEvent">DKGStartEvent</a> {
+        start_time_us,
+        session_metadata: new_session_metadata,
+    });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_dkg_finish"></a>
+
+## Function `finish`
+
+Put a transcript into the currently incomplete DKG session, then mark it completed.
+
+Abort if DKG is not in progress.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="dkg.md#0x1_dkg_finish">finish</a>(transcript: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="dkg.md#0x1_dkg_finish">finish</a>(transcript: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;) <b>acquires</b> <a href="dkg.md#0x1_dkg_DKGState">DKGState</a> {
+    <b>let</b> dkg_state = <b>borrow_global_mut</b>&lt;<a href="dkg.md#0x1_dkg_DKGState">DKGState</a>&gt;(@aptos_framework);
+    <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&dkg_state.in_progress), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="dkg.md#0x1_dkg_EDKG_NOT_IN_PROGRESS">EDKG_NOT_IN_PROGRESS</a>));
+    <b>let</b> session = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_extract">option::extract</a>(&<b>mut</b> dkg_state.in_progress);
+    session.transcript = transcript;
+    dkg_state.last_completed = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(session);
+    dkg_state.in_progress = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>();
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_dkg_try_clear_incomplete_session"></a>
+
+## Function `try_clear_incomplete_session`
+
+Delete the currently incomplete session, if it exists.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="dkg.md#0x1_dkg_try_clear_incomplete_session">try_clear_incomplete_session</a>(fx: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="dkg.md#0x1_dkg_try_clear_incomplete_session">try_clear_incomplete_session</a>(fx: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>) <b>acquires</b> <a href="dkg.md#0x1_dkg_DKGState">DKGState</a> {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(fx);
+    <b>if</b> (<b>exists</b>&lt;<a href="dkg.md#0x1_dkg_DKGState">DKGState</a>&gt;(@aptos_framework)) {
+        <b>let</b> dkg_state = <b>borrow_global_mut</b>&lt;<a href="dkg.md#0x1_dkg_DKGState">DKGState</a>&gt;(@aptos_framework);
+        dkg_state.in_progress = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>();
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_dkg_incomplete_session"></a>
+
+## Function `incomplete_session`
+
+Return the incomplete DKG session state, if it exists.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="dkg.md#0x1_dkg_incomplete_session">incomplete_session</a>(): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="dkg.md#0x1_dkg_DKGSessionState">dkg::DKGSessionState</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="dkg.md#0x1_dkg_incomplete_session">incomplete_session</a>(): Option&lt;<a href="dkg.md#0x1_dkg_DKGSessionState">DKGSessionState</a>&gt; <b>acquires</b> <a href="dkg.md#0x1_dkg_DKGState">DKGState</a> {
+    <b>if</b> (<b>exists</b>&lt;<a href="dkg.md#0x1_dkg_DKGState">DKGState</a>&gt;(@aptos_framework)) {
+        <b>borrow_global</b>&lt;<a href="dkg.md#0x1_dkg_DKGState">DKGState</a>&gt;(@aptos_framework).in_progress
+    } <b>else</b> {
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>()
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_dkg_session_dealer_epoch"></a>
+
+## Function `session_dealer_epoch`
+
+Return the dealer epoch of a <code><a href="dkg.md#0x1_dkg_DKGSessionState">DKGSessionState</a></code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="dkg.md#0x1_dkg_session_dealer_epoch">session_dealer_epoch</a>(session: &<a href="dkg.md#0x1_dkg_DKGSessionState">dkg::DKGSessionState</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="dkg.md#0x1_dkg_session_dealer_epoch">session_dealer_epoch</a>(session: &<a href="dkg.md#0x1_dkg_DKGSessionState">DKGSessionState</a>): u64 {
+    session.metadata.dealer_epoch
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+
+<pre><code><b>invariant</b> [suspendable] <a href="chain_status.md#0x1_chain_status_is_operating">chain_status::is_operating</a>() ==&gt; <b>exists</b>&lt;<a href="dkg.md#0x1_dkg_DKGState">DKGState</a>&gt;(@aptos_framework);
+</code></pre>
+
+
+
+<a id="@Specification_1_initialize"></a>
+
+### Function `initialize`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="dkg.md#0x1_dkg_initialize">initialize</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> aptos_framework_addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(aptos_framework);
+<b>aborts_if</b> aptos_framework_addr != @aptos_framework;
+</code></pre>
+
+
+
+<a id="@Specification_1_start"></a>
+
+### Function `start`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="dkg.md#0x1_dkg_start">start</a>(dealer_epoch: u64, <a href="randomness_config.md#0x1_randomness_config">randomness_config</a>: <a href="randomness_config.md#0x1_randomness_config_RandomnessConfig">randomness_config::RandomnessConfig</a>, dealer_validator_set: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="validator_consensus_info.md#0x1_validator_consensus_info_ValidatorConsensusInfo">validator_consensus_info::ValidatorConsensusInfo</a>&gt;, target_validator_set: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="validator_consensus_info.md#0x1_validator_consensus_info_ValidatorConsensusInfo">validator_consensus_info::ValidatorConsensusInfo</a>&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="dkg.md#0x1_dkg_DKGState">DKGState</a>&gt;(@aptos_framework);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="timestamp.md#0x1_timestamp_CurrentTimeMicroseconds">timestamp::CurrentTimeMicroseconds</a>&gt;(@aptos_framework);
+</code></pre>
+
+
+
+<a id="@Specification_1_finish"></a>
+
+### Function `finish`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="dkg.md#0x1_dkg_finish">finish</a>(transcript: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>requires</b> <b>exists</b>&lt;<a href="dkg.md#0x1_dkg_DKGState">DKGState</a>&gt;(@aptos_framework);
+<b>requires</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(<b>global</b>&lt;<a href="dkg.md#0x1_dkg_DKGState">DKGState</a>&gt;(@aptos_framework).in_progress);
+<b>aborts_if</b> <b>false</b>;
+</code></pre>
+
+
+
+
+<a id="0x1_dkg_has_incomplete_session"></a>
+
+
+<pre><code><b>fun</b> <a href="dkg.md#0x1_dkg_has_incomplete_session">has_incomplete_session</a>(): bool {
+   <b>if</b> (<b>exists</b>&lt;<a href="dkg.md#0x1_dkg_DKGState">DKGState</a>&gt;(@aptos_framework)) {
+       <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_is_some">option::spec_is_some</a>(<b>global</b>&lt;<a href="dkg.md#0x1_dkg_DKGState">DKGState</a>&gt;(@aptos_framework).in_progress)
+   } <b>else</b> {
+       <b>false</b>
+   }
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_try_clear_incomplete_session"></a>
+
+### Function `try_clear_incomplete_session`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="dkg.md#0x1_dkg_try_clear_incomplete_session">try_clear_incomplete_session</a>(fx: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(fx);
+<b>aborts_if</b> addr != @aptos_framework;
+</code></pre>
+
+
+
+<a id="@Specification_1_incomplete_session"></a>
+
+### Function `incomplete_session`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="dkg.md#0x1_dkg_incomplete_session">incomplete_session</a>(): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="dkg.md#0x1_dkg_DKGSessionState">dkg::DKGSessionState</a>&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/event.md b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/event.md
new file mode 100644
index 0000000000000..89fcbb69e6279
--- /dev/null
+++ b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/event.md
@@ -0,0 +1,480 @@
+
+<a id="0x1_event"></a>
+
+# Module `0x1::event`
+
+The Event module defines an <code>EventHandleGenerator</code> that is used to create
+<code><a href="event.md#0x1_event_EventHandle">EventHandle</a></code>s with unique GUIDs. It contains a counter for the number
+of <code><a href="event.md#0x1_event_EventHandle">EventHandle</a></code>s it generates. An <code><a href="event.md#0x1_event_EventHandle">EventHandle</a></code> is used to count the number of
+events emitted to a handle and emit events to the event store.
+
+
+-  [Struct `EventHandle`](#0x1_event_EventHandle)
+-  [Function `emit`](#0x1_event_emit)
+-  [Function `write_module_event_to_store`](#0x1_event_write_module_event_to_store)
+-  [Function `new_event_handle`](#0x1_event_new_event_handle)
+-  [Function `emit_event`](#0x1_event_emit_event)
+-  [Function `guid`](#0x1_event_guid)
+-  [Function `counter`](#0x1_event_counter)
+-  [Function `write_to_event_store`](#0x1_event_write_to_event_store)
+-  [Function `destroy_handle`](#0x1_event_destroy_handle)
+-  [Specification](#@Specification_0)
+    -  [High-level Requirements](#high-level-req)
+    -  [Module-level Specification](#module-level-spec)
+    -  [Function `emit`](#@Specification_0_emit)
+    -  [Function `write_module_event_to_store`](#@Specification_0_write_module_event_to_store)
+    -  [Function `emit_event`](#@Specification_0_emit_event)
+    -  [Function `guid`](#@Specification_0_guid)
+    -  [Function `counter`](#@Specification_0_counter)
+    -  [Function `write_to_event_store`](#@Specification_0_write_to_event_store)
+    -  [Function `destroy_handle`](#@Specification_0_destroy_handle)
+
+
+<pre><code><b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs">0x1::bcs</a>;
+<b>use</b> <a href="guid.md#0x1_guid">0x1::guid</a>;
+</code></pre>
+
+
+
+<a id="0x1_event_EventHandle"></a>
+
+## Struct `EventHandle`
+
+A handle for an event such that:
+1. Other modules can emit events to this handle.
+2. Storage can use this handle to prove the total number of events that happened in the past.
+
+
+<pre><code>#[deprecated]
+<b>struct</b> <a href="event.md#0x1_event_EventHandle">EventHandle</a>&lt;T: drop, store&gt; <b>has</b> store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>counter: u64</code>
+</dt>
+<dd>
+ Total number of events emitted to this event stream.
+</dd>
+<dt>
+<code><a href="guid.md#0x1_guid">guid</a>: <a href="guid.md#0x1_guid_GUID">guid::GUID</a></code>
+</dt>
+<dd>
+ A globally unique ID for this event stream.
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_event_emit"></a>
+
+## Function `emit`
+
+Emit a module event with payload <code>msg</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="event.md#0x1_event_emit">emit</a>&lt;T: drop, store&gt;(msg: T)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="event.md#0x1_event_emit">emit</a>&lt;T: store + drop&gt;(msg: T) {
+    <a href="event.md#0x1_event_write_module_event_to_store">write_module_event_to_store</a>&lt;T&gt;(msg);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_event_write_module_event_to_store"></a>
+
+## Function `write_module_event_to_store`
+
+Log <code>msg</code> with the event stream identified by <code>T</code>
+
+
+<pre><code><b>fun</b> <a href="event.md#0x1_event_write_module_event_to_store">write_module_event_to_store</a>&lt;T: drop, store&gt;(msg: T)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="event.md#0x1_event_write_module_event_to_store">write_module_event_to_store</a>&lt;T: drop + store&gt;(msg: T);
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_event_new_event_handle"></a>
+
+## Function `new_event_handle`
+
+Use EventHandleGenerator to generate a unique event handle for <code>sig</code>
+
+
+<pre><code>#[deprecated]
+<b>public</b>(<b>friend</b>) <b>fun</b> <a href="event.md#0x1_event_new_event_handle">new_event_handle</a>&lt;T: drop, store&gt;(<a href="guid.md#0x1_guid">guid</a>: <a href="guid.md#0x1_guid_GUID">guid::GUID</a>): <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;T&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="event.md#0x1_event_new_event_handle">new_event_handle</a>&lt;T: drop + store&gt;(<a href="guid.md#0x1_guid">guid</a>: GUID): <a href="event.md#0x1_event_EventHandle">EventHandle</a>&lt;T&gt; {
+    <a href="event.md#0x1_event_EventHandle">EventHandle</a>&lt;T&gt; {
+        counter: 0,
+        <a href="guid.md#0x1_guid">guid</a>,
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_event_emit_event"></a>
+
+## Function `emit_event`
+
+Emit an event with payload <code>msg</code> by using <code>handle_ref</code>'s key and counter.
+
+
+<pre><code>#[deprecated]
+<b>public</b> <b>fun</b> <a href="event.md#0x1_event_emit_event">emit_event</a>&lt;T: drop, store&gt;(handle_ref: &<b>mut</b> <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;T&gt;, msg: T)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="event.md#0x1_event_emit_event">emit_event</a>&lt;T: drop + store&gt;(handle_ref: &<b>mut</b> <a href="event.md#0x1_event_EventHandle">EventHandle</a>&lt;T&gt;, msg: T) {
+    <a href="event.md#0x1_event_write_to_event_store">write_to_event_store</a>&lt;T&gt;(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs_to_bytes">bcs::to_bytes</a>(&handle_ref.<a href="guid.md#0x1_guid">guid</a>), handle_ref.counter, msg);
+    <b>spec</b> {
+        <b>assume</b> handle_ref.counter + 1 &lt;= MAX_U64;
+    };
+    handle_ref.counter = handle_ref.counter + 1;
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_event_guid"></a>
+
+## Function `guid`
+
+Return the GUID associated with this EventHandle
+
+
+<pre><code>#[deprecated]
+<b>public</b> <b>fun</b> <a href="guid.md#0x1_guid">guid</a>&lt;T: drop, store&gt;(handle_ref: &<a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;T&gt;): &<a href="guid.md#0x1_guid_GUID">guid::GUID</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="guid.md#0x1_guid">guid</a>&lt;T: drop + store&gt;(handle_ref: &<a href="event.md#0x1_event_EventHandle">EventHandle</a>&lt;T&gt;): &GUID {
+    &handle_ref.<a href="guid.md#0x1_guid">guid</a>
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_event_counter"></a>
+
+## Function `counter`
+
+Return the current counter associated with this EventHandle
+
+
+<pre><code>#[deprecated]
+<b>public</b> <b>fun</b> <a href="event.md#0x1_event_counter">counter</a>&lt;T: drop, store&gt;(handle_ref: &<a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;T&gt;): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="event.md#0x1_event_counter">counter</a>&lt;T: drop + store&gt;(handle_ref: &<a href="event.md#0x1_event_EventHandle">EventHandle</a>&lt;T&gt;): u64 {
+    handle_ref.counter
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_event_write_to_event_store"></a>
+
+## Function `write_to_event_store`
+
+Log <code>msg</code> as the <code>count</code>th event associated with the event stream identified by <code><a href="guid.md#0x1_guid">guid</a></code>
+
+
+<pre><code>#[deprecated]
+<b>fun</b> <a href="event.md#0x1_event_write_to_event_store">write_to_event_store</a>&lt;T: drop, store&gt;(<a href="guid.md#0x1_guid">guid</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, count: u64, msg: T)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="event.md#0x1_event_write_to_event_store">write_to_event_store</a>&lt;T: drop + store&gt;(<a href="guid.md#0x1_guid">guid</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, count: u64, msg: T);
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_event_destroy_handle"></a>
+
+## Function `destroy_handle`
+
+Destroy a unique handle.
+
+
+<pre><code>#[deprecated]
+<b>public</b> <b>fun</b> <a href="event.md#0x1_event_destroy_handle">destroy_handle</a>&lt;T: drop, store&gt;(handle: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;T&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="event.md#0x1_event_destroy_handle">destroy_handle</a>&lt;T: drop + store&gt;(handle: <a href="event.md#0x1_event_EventHandle">EventHandle</a>&lt;T&gt;) {
+    <a href="event.md#0x1_event_EventHandle">EventHandle</a>&lt;T&gt; { counter: _, <a href="guid.md#0x1_guid">guid</a>: _ } = handle;
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_0"></a>
+
+## Specification
+
+
+
+
+<a id="high-level-req"></a>
+
+### High-level Requirements
+
+<table>
+<tr>
+<th>No.</th><th>Requirement</th><th>Criticality</th><th>Implementation</th><th>Enforcement</th>
+</tr>
+
+<tr>
+<td>1</td>
+<td>Each event handle possesses a distinct and unique GUID.</td>
+<td>Critical</td>
+<td>The new_event_handle function creates an EventHandle object with a unique GUID, ensuring distinct identification.</td>
+<td>Audited: GUIDs are created in guid::create. Each time the function is called, it increments creation_num_ref. Multiple calls to the function will result in distinct GUID values.</td>
+</tr>
+
+<tr>
+<td>2</td>
+<td>Unable to publish two events with the same GUID & sequence number.</td>
+<td>Critical</td>
+<td>Two events may either have the same GUID with a different counter or the same counter with a different GUID.</td>
+<td>This is implied by <a href="#high-level-req">high-level requirement 1</a>.</td>
+</tr>
+
+<tr>
+<td>3</td>
+<td>Event native functions respect normal Move rules around object creation and destruction.</td>
+<td>Critical</td>
+<td>Must follow the same rules and principles that apply to object creation and destruction in Move when using event native functions.</td>
+<td>The native functions of this module have been manually audited.</td>
+</tr>
+
+<tr>
+<td>4</td>
+<td>Counter increases monotonically between event emissions</td>
+<td>Medium</td>
+<td>With each event emission, the emit_event function increments the counter of the EventHandle by one.</td>
+<td>Formally verified in the post condition of <a href="#high-level-req-4">emit_event</a>.</td>
+</tr>
+
+<tr>
+<td>5</td>
+<td>For a given EventHandle, it should always be possible to: (1) return the GUID associated with this EventHandle, (2) return the current counter associated with this EventHandle, and (3) destroy the handle.</td>
+<td>Low</td>
+<td>The following functions should not abort if EventHandle exists: guid(), counter(), destroy_handle().</td>
+<td>Formally verified via <a href="#high-level-req-5.1">guid</a>, <a href="#high-level-req-5.2">counter</a> and <a href="#high-level-req-5.3">destroy_handle</a>.</td>
+</tr>
+
+</table>
+
+
+
+<a id="module-level-spec"></a>
+
+### Module-level Specification
+
+
+<pre><code><b>pragma</b> verify = <b>true</b>;
+<b>pragma</b> aborts_if_is_strict;
+</code></pre>
+
+
+
+<a id="@Specification_0_emit"></a>
+
+### Function `emit`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="event.md#0x1_event_emit">emit</a>&lt;T: drop, store&gt;(msg: T)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_0_write_module_event_to_store"></a>
+
+### Function `write_module_event_to_store`
+
+
+<pre><code><b>fun</b> <a href="event.md#0x1_event_write_module_event_to_store">write_module_event_to_store</a>&lt;T: drop, store&gt;(msg: T)
+</code></pre>
+
+
+Native function use opaque.
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_0_emit_event"></a>
+
+### Function `emit_event`
+
+
+<pre><code>#[deprecated]
+<b>public</b> <b>fun</b> <a href="event.md#0x1_event_emit_event">emit_event</a>&lt;T: drop, store&gt;(handle_ref: &<b>mut</b> <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;T&gt;, msg: T)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> [abstract] <b>false</b>;
+// This enforces <a id="high-level-req-4" href="#high-level-req">high-level requirement 4</a>:
+<b>ensures</b> [concrete] handle_ref.counter == <b>old</b>(handle_ref.counter) + 1;
+</code></pre>
+
+
+
+<a id="@Specification_0_guid"></a>
+
+### Function `guid`
+
+
+<pre><code>#[deprecated]
+<b>public</b> <b>fun</b> <a href="guid.md#0x1_guid">guid</a>&lt;T: drop, store&gt;(handle_ref: &<a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;T&gt;): &<a href="guid.md#0x1_guid_GUID">guid::GUID</a>
+</code></pre>
+
+
+
+
+<pre><code>// This enforces <a id="high-level-req-5.1" href="#high-level-req">high-level requirement 5</a>:
+<b>aborts_if</b> <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_0_counter"></a>
+
+### Function `counter`
+
+
+<pre><code>#[deprecated]
+<b>public</b> <b>fun</b> <a href="event.md#0x1_event_counter">counter</a>&lt;T: drop, store&gt;(handle_ref: &<a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;T&gt;): u64
+</code></pre>
+
+
+
+
+<pre><code>// This enforces <a id="high-level-req-5.2" href="#high-level-req">high-level requirement 5</a>:
+<b>aborts_if</b> <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_0_write_to_event_store"></a>
+
+### Function `write_to_event_store`
+
+
+<pre><code>#[deprecated]
+<b>fun</b> <a href="event.md#0x1_event_write_to_event_store">write_to_event_store</a>&lt;T: drop, store&gt;(<a href="guid.md#0x1_guid">guid</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, count: u64, msg: T)
+</code></pre>
+
+
+Native function use opaque.
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_0_destroy_handle"></a>
+
+### Function `destroy_handle`
+
+
+<pre><code>#[deprecated]
+<b>public</b> <b>fun</b> <a href="event.md#0x1_event_destroy_handle">destroy_handle</a>&lt;T: drop, store&gt;(handle: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;T&gt;)
+</code></pre>
+
+
+
+
+<pre><code>// This enforces <a id="high-level-req-5.3" href="#high-level-req">high-level requirement 5</a>:
+<b>aborts_if</b> <b>false</b>;
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/execution_config.md b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/execution_config.md
new file mode 100644
index 0000000000000..27d894d51a795
--- /dev/null
+++ b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/execution_config.md
@@ -0,0 +1,252 @@
+
+<a id="0x1_execution_config"></a>
+
+# Module `0x1::execution_config`
+
+Maintains the execution config for the blockchain. The config is stored in a
+Reconfiguration, and may be updated by root.
+
+
+-  [Resource `ExecutionConfig`](#0x1_execution_config_ExecutionConfig)
+-  [Constants](#@Constants_0)
+-  [Function `set`](#0x1_execution_config_set)
+-  [Function `set_for_next_epoch`](#0x1_execution_config_set_for_next_epoch)
+-  [Function `on_new_epoch`](#0x1_execution_config_on_new_epoch)
+-  [Specification](#@Specification_1)
+    -  [Function `set`](#@Specification_1_set)
+    -  [Function `set_for_next_epoch`](#@Specification_1_set_for_next_epoch)
+    -  [Function `on_new_epoch`](#@Specification_1_on_new_epoch)
+
+
+<pre><code><b>use</b> <a href="chain_status.md#0x1_chain_status">0x1::chain_status</a>;
+<b>use</b> <a href="config_buffer.md#0x1_config_buffer">0x1::config_buffer</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="reconfiguration.md#0x1_reconfiguration">0x1::reconfiguration</a>;
+<b>use</b> <a href="system_addresses.md#0x1_system_addresses">0x1::system_addresses</a>;
+</code></pre>
+
+
+
+<a id="0x1_execution_config_ExecutionConfig"></a>
+
+## Resource `ExecutionConfig`
+
+
+
+<pre><code><b>struct</b> <a href="execution_config.md#0x1_execution_config_ExecutionConfig">ExecutionConfig</a> <b>has</b> drop, store, key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>config: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_execution_config_EINVALID_CONFIG"></a>
+
+The provided on chain config bytes are empty or invalid
+
+
+<pre><code><b>const</b> <a href="execution_config.md#0x1_execution_config_EINVALID_CONFIG">EINVALID_CONFIG</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_execution_config_set"></a>
+
+## Function `set`
+
+Deprecated by <code><a href="execution_config.md#0x1_execution_config_set_for_next_epoch">set_for_next_epoch</a>()</code>.
+
+WARNING: calling this while randomness is enabled will trigger a new epoch without randomness!
+
+TODO: update all the tests that reference this function, then disable this function.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="execution_config.md#0x1_execution_config_set">set</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, config: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="execution_config.md#0x1_execution_config_set">set</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, config: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;) <b>acquires</b> <a href="execution_config.md#0x1_execution_config_ExecutionConfig">ExecutionConfig</a> {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(<a href="account.md#0x1_account">account</a>);
+    <a href="chain_status.md#0x1_chain_status_assert_genesis">chain_status::assert_genesis</a>();
+
+    <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&config) &gt; 0, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="execution_config.md#0x1_execution_config_EINVALID_CONFIG">EINVALID_CONFIG</a>));
+
+    <b>if</b> (<b>exists</b>&lt;<a href="execution_config.md#0x1_execution_config_ExecutionConfig">ExecutionConfig</a>&gt;(@aptos_framework)) {
+        <b>let</b> config_ref = &<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="execution_config.md#0x1_execution_config_ExecutionConfig">ExecutionConfig</a>&gt;(@aptos_framework).config;
+        *config_ref = config;
+    } <b>else</b> {
+        <b>move_to</b>(<a href="account.md#0x1_account">account</a>, <a href="execution_config.md#0x1_execution_config_ExecutionConfig">ExecutionConfig</a> { config });
+    };
+    // Need <b>to</b> trigger <a href="reconfiguration.md#0x1_reconfiguration">reconfiguration</a> so validator nodes can sync on the updated configs.
+    <a href="reconfiguration.md#0x1_reconfiguration_reconfigure">reconfiguration::reconfigure</a>();
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_execution_config_set_for_next_epoch"></a>
+
+## Function `set_for_next_epoch`
+
+This can be called by on-chain governance to update on-chain execution configs for the next epoch.
+Example usage:
+```
+aptos_framework::execution_config::set_for_next_epoch(&framework_signer, some_config_bytes);
+aptos_framework::aptos_governance::reconfigure(&framework_signer);
+```
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="execution_config.md#0x1_execution_config_set_for_next_epoch">set_for_next_epoch</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, config: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="execution_config.md#0x1_execution_config_set_for_next_epoch">set_for_next_epoch</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, config: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;) {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(<a href="account.md#0x1_account">account</a>);
+    <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&config) &gt; 0, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="execution_config.md#0x1_execution_config_EINVALID_CONFIG">EINVALID_CONFIG</a>));
+    <a href="config_buffer.md#0x1_config_buffer_upsert">config_buffer::upsert</a>(<a href="execution_config.md#0x1_execution_config_ExecutionConfig">ExecutionConfig</a> { config });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_execution_config_on_new_epoch"></a>
+
+## Function `on_new_epoch`
+
+Only used in reconfigurations to apply the pending <code><a href="execution_config.md#0x1_execution_config_ExecutionConfig">ExecutionConfig</a></code>, if there is any.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="execution_config.md#0x1_execution_config_on_new_epoch">on_new_epoch</a>(framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="execution_config.md#0x1_execution_config_on_new_epoch">on_new_epoch</a>(framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>) <b>acquires</b> <a href="execution_config.md#0x1_execution_config_ExecutionConfig">ExecutionConfig</a> {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(framework);
+    <b>if</b> (<a href="config_buffer.md#0x1_config_buffer_does_exist">config_buffer::does_exist</a>&lt;<a href="execution_config.md#0x1_execution_config_ExecutionConfig">ExecutionConfig</a>&gt;()) {
+        <b>let</b> config = <a href="config_buffer.md#0x1_config_buffer_extract">config_buffer::extract</a>&lt;<a href="execution_config.md#0x1_execution_config_ExecutionConfig">ExecutionConfig</a>&gt;();
+        <b>if</b> (<b>exists</b>&lt;<a href="execution_config.md#0x1_execution_config_ExecutionConfig">ExecutionConfig</a>&gt;(@aptos_framework)) {
+            *<b>borrow_global_mut</b>&lt;<a href="execution_config.md#0x1_execution_config_ExecutionConfig">ExecutionConfig</a>&gt;(@aptos_framework) = config;
+        } <b>else</b> {
+            <b>move_to</b>(framework, config);
+        };
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+
+<pre><code><b>pragma</b> verify = <b>true</b>;
+<b>pragma</b> aborts_if_is_strict;
+</code></pre>
+
+
+
+<a id="@Specification_1_set"></a>
+
+### Function `set`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="execution_config.md#0x1_execution_config_set">set</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, config: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+Ensure the caller is admin
+When setting now time must be later than last_reconfiguration_time.
+
+
+<pre><code><b>pragma</b> verify_duration_estimate = 600;
+<b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>);
+<b>include</b> <a href="transaction_fee.md#0x1_transaction_fee_RequiresCollectedFeesPerValueLeqBlockAptosSupply">transaction_fee::RequiresCollectedFeesPerValueLeqBlockAptosSupply</a>;
+<b>requires</b> <a href="chain_status.md#0x1_chain_status_is_genesis">chain_status::is_genesis</a>();
+<b>requires</b> <b>exists</b>&lt;<a href="stake.md#0x1_stake_ValidatorFees">stake::ValidatorFees</a>&gt;(@aptos_framework);
+<b>requires</b> <b>exists</b>&lt;<a href="staking_config.md#0x1_staking_config_StakingRewardsConfig">staking_config::StakingRewardsConfig</a>&gt;(@aptos_framework);
+<b>requires</b> len(config) &gt; 0;
+<b>include</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_spec_periodical_reward_rate_decrease_enabled">features::spec_periodical_reward_rate_decrease_enabled</a>() ==&gt; <a href="staking_config.md#0x1_staking_config_StakingRewardsConfigEnabledRequirement">staking_config::StakingRewardsConfigEnabledRequirement</a>;
+<b>include</b> <a href="aptos_coin.md#0x1_aptos_coin_ExistsAptosCoin">aptos_coin::ExistsAptosCoin</a>;
+<b>requires</b> <a href="system_addresses.md#0x1_system_addresses_is_aptos_framework_address">system_addresses::is_aptos_framework_address</a>(addr);
+<b>requires</b> <a href="timestamp.md#0x1_timestamp_spec_now_microseconds">timestamp::spec_now_microseconds</a>() &gt;= <a href="reconfiguration.md#0x1_reconfiguration_last_reconfiguration_time">reconfiguration::last_reconfiguration_time</a>();
+<b>ensures</b> <b>exists</b>&lt;<a href="execution_config.md#0x1_execution_config_ExecutionConfig">ExecutionConfig</a>&gt;(@aptos_framework);
+</code></pre>
+
+
+
+<a id="@Specification_1_set_for_next_epoch"></a>
+
+### Function `set_for_next_epoch`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="execution_config.md#0x1_execution_config_set_for_next_epoch">set_for_next_epoch</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, config: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="config_buffer.md#0x1_config_buffer_SetForNextEpochAbortsIf">config_buffer::SetForNextEpochAbortsIf</a>;
+</code></pre>
+
+
+
+<a id="@Specification_1_on_new_epoch"></a>
+
+### Function `on_new_epoch`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="execution_config.md#0x1_execution_config_on_new_epoch">on_new_epoch</a>(framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>requires</b> @aptos_framework == std::signer::address_of(framework);
+<b>include</b> <a href="config_buffer.md#0x1_config_buffer_OnNewEpochRequirement">config_buffer::OnNewEpochRequirement</a>&lt;<a href="execution_config.md#0x1_execution_config_ExecutionConfig">ExecutionConfig</a>&gt;;
+<b>aborts_if</b> <b>false</b>;
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/function_info.md b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/function_info.md
new file mode 100644
index 0000000000000..95e8a6710a7d6
--- /dev/null
+++ b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/function_info.md
@@ -0,0 +1,362 @@
+
+<a id="0x1_function_info"></a>
+
+# Module `0x1::function_info`
+
+The <code><a href="function_info.md#0x1_function_info">function_info</a></code> module defines the <code><a href="function_info.md#0x1_function_info_FunctionInfo">FunctionInfo</a></code> type which simulates a function pointer.
+
+
+-  [Struct `FunctionInfo`](#0x1_function_info_FunctionInfo)
+-  [Constants](#@Constants_0)
+-  [Function `new_function_info`](#0x1_function_info_new_function_info)
+-  [Function `new_function_info_from_address`](#0x1_function_info_new_function_info_from_address)
+-  [Function `check_dispatch_type_compatibility`](#0x1_function_info_check_dispatch_type_compatibility)
+-  [Function `load_module_from_function`](#0x1_function_info_load_module_from_function)
+-  [Function `check_dispatch_type_compatibility_impl`](#0x1_function_info_check_dispatch_type_compatibility_impl)
+-  [Function `is_identifier`](#0x1_function_info_is_identifier)
+-  [Function `load_function_impl`](#0x1_function_info_load_function_impl)
+-  [Specification](#@Specification_1)
+    -  [Function `check_dispatch_type_compatibility_impl`](#@Specification_1_check_dispatch_type_compatibility_impl)
+    -  [Function `load_function_impl`](#@Specification_1_load_function_impl)
+
+
+<pre><code><b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features">0x1::features</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">0x1::signer</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string">0x1::string</a>;
+</code></pre>
+
+
+
+<a id="0x1_function_info_FunctionInfo"></a>
+
+## Struct `FunctionInfo`
+
+A <code>String</code> holds a sequence of bytes which is guaranteed to be in utf8 format.
+
+
+<pre><code><b>struct</b> <a href="function_info.md#0x1_function_info_FunctionInfo">FunctionInfo</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>module_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>module_name: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>function_name: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_function_info_EINVALID_FUNCTION"></a>
+
+Function specified in the FunctionInfo doesn't exist on chain.
+
+
+<pre><code><b>const</b> <a href="function_info.md#0x1_function_info_EINVALID_FUNCTION">EINVALID_FUNCTION</a>: u64 = 2;
+</code></pre>
+
+
+
+<a id="0x1_function_info_EINVALID_IDENTIFIER"></a>
+
+String is not a valid Move identifier
+
+
+<pre><code><b>const</b> <a href="function_info.md#0x1_function_info_EINVALID_IDENTIFIER">EINVALID_IDENTIFIER</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_function_info_ENOT_ACTIVATED"></a>
+
+Feature hasn't been activated yet.
+
+
+<pre><code><b>const</b> <a href="function_info.md#0x1_function_info_ENOT_ACTIVATED">ENOT_ACTIVATED</a>: u64 = 3;
+</code></pre>
+
+
+
+<a id="0x1_function_info_new_function_info"></a>
+
+## Function `new_function_info`
+
+Creates a new function info from names.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="function_info.md#0x1_function_info_new_function_info">new_function_info</a>(module_signer: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, module_name: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, function_name: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): <a href="function_info.md#0x1_function_info_FunctionInfo">function_info::FunctionInfo</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="function_info.md#0x1_function_info_new_function_info">new_function_info</a>(
+    module_signer: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    module_name: String,
+    function_name: String,
+): <a href="function_info.md#0x1_function_info_FunctionInfo">FunctionInfo</a> {
+    <a href="function_info.md#0x1_function_info_new_function_info_from_address">new_function_info_from_address</a>(
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(module_signer),
+        module_name,
+        function_name,
+    )
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_function_info_new_function_info_from_address"></a>
+
+## Function `new_function_info_from_address`
+
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="function_info.md#0x1_function_info_new_function_info_from_address">new_function_info_from_address</a>(module_address: <b>address</b>, module_name: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, function_name: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): <a href="function_info.md#0x1_function_info_FunctionInfo">function_info::FunctionInfo</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="function_info.md#0x1_function_info_new_function_info_from_address">new_function_info_from_address</a>(
+    module_address: <b>address</b>,
+    module_name: String,
+    function_name: String,
+): <a href="function_info.md#0x1_function_info_FunctionInfo">FunctionInfo</a> {
+    <b>assert</b>!(
+        <a href="function_info.md#0x1_function_info_is_identifier">is_identifier</a>(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_bytes">string::bytes</a>(&module_name)),
+        <a href="function_info.md#0x1_function_info_EINVALID_IDENTIFIER">EINVALID_IDENTIFIER</a>
+    );
+    <b>assert</b>!(
+        <a href="function_info.md#0x1_function_info_is_identifier">is_identifier</a>(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_bytes">string::bytes</a>(&function_name)),
+        <a href="function_info.md#0x1_function_info_EINVALID_IDENTIFIER">EINVALID_IDENTIFIER</a>
+    );
+    <a href="function_info.md#0x1_function_info_FunctionInfo">FunctionInfo</a> {
+        module_address,
+        module_name,
+        function_name,
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_function_info_check_dispatch_type_compatibility"></a>
+
+## Function `check_dispatch_type_compatibility`
+
+Check if the dispatch target function meets the type requirements of the disptach entry point.
+
+framework_function is the dispatch native function defined in the aptos_framework.
+dispatch_target is the function passed in by the user.
+
+dispatch_target should have the same signature (same argument type, same generics constraint) except
+that the framework_function will have a <code>&<a href="function_info.md#0x1_function_info_FunctionInfo">FunctionInfo</a></code> in the last argument that will instruct the VM which
+function to jump to.
+
+dispatch_target also needs to be public so the type signature will remain unchanged.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="function_info.md#0x1_function_info_check_dispatch_type_compatibility">check_dispatch_type_compatibility</a>(framework_function: &<a href="function_info.md#0x1_function_info_FunctionInfo">function_info::FunctionInfo</a>, dispatch_target: &<a href="function_info.md#0x1_function_info_FunctionInfo">function_info::FunctionInfo</a>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="function_info.md#0x1_function_info_check_dispatch_type_compatibility">check_dispatch_type_compatibility</a>(
+    framework_function: &<a href="function_info.md#0x1_function_info_FunctionInfo">FunctionInfo</a>,
+    dispatch_target: &<a href="function_info.md#0x1_function_info_FunctionInfo">FunctionInfo</a>,
+): bool {
+    <b>assert</b>!(
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_dispatchable_fungible_asset_enabled">features::dispatchable_fungible_asset_enabled</a>(),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_aborted">error::aborted</a>(<a href="function_info.md#0x1_function_info_ENOT_ACTIVATED">ENOT_ACTIVATED</a>)
+    );
+    <a href="function_info.md#0x1_function_info_load_function_impl">load_function_impl</a>(dispatch_target);
+    <a href="function_info.md#0x1_function_info_check_dispatch_type_compatibility_impl">check_dispatch_type_compatibility_impl</a>(framework_function, dispatch_target)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_function_info_load_module_from_function"></a>
+
+## Function `load_module_from_function`
+
+Load up a function into VM's loader and charge for its dependencies
+
+It is **critical** to make sure that this function is invoked before <code>check_dispatch_type_compatibility</code>
+or performing any other dispatching logic to ensure:
+1. We properly charge gas for the function to dispatch.
+2. The function is loaded in the cache so that we can perform further type checking/dispatching logic.
+
+Calling <code>check_dispatch_type_compatibility_impl</code> or dispatch without loading up the module would yield an error
+if such module isn't accessed previously in the transaction.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="function_info.md#0x1_function_info_load_module_from_function">load_module_from_function</a>(f: &<a href="function_info.md#0x1_function_info_FunctionInfo">function_info::FunctionInfo</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="function_info.md#0x1_function_info_load_module_from_function">load_module_from_function</a>(f: &<a href="function_info.md#0x1_function_info_FunctionInfo">FunctionInfo</a>) {
+    <a href="function_info.md#0x1_function_info_load_function_impl">load_function_impl</a>(f)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_function_info_check_dispatch_type_compatibility_impl"></a>
+
+## Function `check_dispatch_type_compatibility_impl`
+
+
+
+<pre><code><b>fun</b> <a href="function_info.md#0x1_function_info_check_dispatch_type_compatibility_impl">check_dispatch_type_compatibility_impl</a>(lhs: &<a href="function_info.md#0x1_function_info_FunctionInfo">function_info::FunctionInfo</a>, r: &<a href="function_info.md#0x1_function_info_FunctionInfo">function_info::FunctionInfo</a>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="function_info.md#0x1_function_info_check_dispatch_type_compatibility_impl">check_dispatch_type_compatibility_impl</a>(lhs: &<a href="function_info.md#0x1_function_info_FunctionInfo">FunctionInfo</a>, r: &<a href="function_info.md#0x1_function_info_FunctionInfo">FunctionInfo</a>): bool;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_function_info_is_identifier"></a>
+
+## Function `is_identifier`
+
+
+
+<pre><code><b>fun</b> <a href="function_info.md#0x1_function_info_is_identifier">is_identifier</a>(s: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="function_info.md#0x1_function_info_is_identifier">is_identifier</a>(s: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_function_info_load_function_impl"></a>
+
+## Function `load_function_impl`
+
+
+
+<pre><code><b>fun</b> <a href="function_info.md#0x1_function_info_load_function_impl">load_function_impl</a>(f: &<a href="function_info.md#0x1_function_info_FunctionInfo">function_info::FunctionInfo</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="function_info.md#0x1_function_info_load_function_impl">load_function_impl</a>(f: &<a href="function_info.md#0x1_function_info_FunctionInfo">FunctionInfo</a>);
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_check_dispatch_type_compatibility_impl"></a>
+
+### Function `check_dispatch_type_compatibility_impl`
+
+
+<pre><code><b>fun</b> <a href="function_info.md#0x1_function_info_check_dispatch_type_compatibility_impl">check_dispatch_type_compatibility_impl</a>(lhs: &<a href="function_info.md#0x1_function_info_FunctionInfo">function_info::FunctionInfo</a>, r: &<a href="function_info.md#0x1_function_info_FunctionInfo">function_info::FunctionInfo</a>): bool
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_load_function_impl"></a>
+
+### Function `load_function_impl`
+
+
+<pre><code><b>fun</b> <a href="function_info.md#0x1_function_info_load_function_impl">load_function_impl</a>(f: &<a href="function_info.md#0x1_function_info_FunctionInfo">function_info::FunctionInfo</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/fungible_asset.md b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/fungible_asset.md
new file mode 100644
index 0000000000000..0cac9507ce215
--- /dev/null
+++ b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/fungible_asset.md
@@ -0,0 +1,3843 @@
+
+<a id="0x1_fungible_asset"></a>
+
+# Module `0x1::fungible_asset`
+
+This defines the fungible asset module that can issue fungible asset of any <code><a href="fungible_asset.md#0x1_fungible_asset_Metadata">Metadata</a></code> object. The
+metadata object can be any object that equipped with <code><a href="fungible_asset.md#0x1_fungible_asset_Metadata">Metadata</a></code> resource.
+
+
+-  [Resource `Supply`](#0x1_fungible_asset_Supply)
+-  [Resource `ConcurrentSupply`](#0x1_fungible_asset_ConcurrentSupply)
+-  [Resource `Metadata`](#0x1_fungible_asset_Metadata)
+-  [Resource `Untransferable`](#0x1_fungible_asset_Untransferable)
+-  [Resource `FungibleStore`](#0x1_fungible_asset_FungibleStore)
+-  [Resource `DispatchFunctionStore`](#0x1_fungible_asset_DispatchFunctionStore)
+-  [Resource `DeriveSupply`](#0x1_fungible_asset_DeriveSupply)
+-  [Resource `ConcurrentFungibleBalance`](#0x1_fungible_asset_ConcurrentFungibleBalance)
+-  [Struct `FungibleAsset`](#0x1_fungible_asset_FungibleAsset)
+-  [Struct `MintRef`](#0x1_fungible_asset_MintRef)
+-  [Struct `TransferRef`](#0x1_fungible_asset_TransferRef)
+-  [Struct `BurnRef`](#0x1_fungible_asset_BurnRef)
+-  [Struct `MutateMetadataRef`](#0x1_fungible_asset_MutateMetadataRef)
+-  [Struct `Deposit`](#0x1_fungible_asset_Deposit)
+-  [Struct `Withdraw`](#0x1_fungible_asset_Withdraw)
+-  [Struct `Frozen`](#0x1_fungible_asset_Frozen)
+-  [Resource `FungibleAssetEvents`](#0x1_fungible_asset_FungibleAssetEvents)
+-  [Struct `DepositEvent`](#0x1_fungible_asset_DepositEvent)
+-  [Struct `WithdrawEvent`](#0x1_fungible_asset_WithdrawEvent)
+-  [Struct `FrozenEvent`](#0x1_fungible_asset_FrozenEvent)
+-  [Constants](#@Constants_0)
+-  [Function `default_to_concurrent_fungible_supply`](#0x1_fungible_asset_default_to_concurrent_fungible_supply)
+-  [Function `allow_upgrade_to_concurrent_fungible_balance`](#0x1_fungible_asset_allow_upgrade_to_concurrent_fungible_balance)
+-  [Function `default_to_concurrent_fungible_balance`](#0x1_fungible_asset_default_to_concurrent_fungible_balance)
+-  [Function `add_fungibility`](#0x1_fungible_asset_add_fungibility)
+-  [Function `set_untransferable`](#0x1_fungible_asset_set_untransferable)
+-  [Function `is_untransferable`](#0x1_fungible_asset_is_untransferable)
+-  [Function `register_dispatch_functions`](#0x1_fungible_asset_register_dispatch_functions)
+-  [Function `register_derive_supply_dispatch_function`](#0x1_fungible_asset_register_derive_supply_dispatch_function)
+-  [Function `register_dispatch_function_sanity_check`](#0x1_fungible_asset_register_dispatch_function_sanity_check)
+-  [Function `generate_mint_ref`](#0x1_fungible_asset_generate_mint_ref)
+-  [Function `generate_burn_ref`](#0x1_fungible_asset_generate_burn_ref)
+-  [Function `generate_transfer_ref`](#0x1_fungible_asset_generate_transfer_ref)
+-  [Function `generate_mutate_metadata_ref`](#0x1_fungible_asset_generate_mutate_metadata_ref)
+-  [Function `supply`](#0x1_fungible_asset_supply)
+-  [Function `maximum`](#0x1_fungible_asset_maximum)
+-  [Function `name`](#0x1_fungible_asset_name)
+-  [Function `symbol`](#0x1_fungible_asset_symbol)
+-  [Function `decimals`](#0x1_fungible_asset_decimals)
+-  [Function `icon_uri`](#0x1_fungible_asset_icon_uri)
+-  [Function `project_uri`](#0x1_fungible_asset_project_uri)
+-  [Function `metadata`](#0x1_fungible_asset_metadata)
+-  [Function `store_exists`](#0x1_fungible_asset_store_exists)
+-  [Function `store_exists_inline`](#0x1_fungible_asset_store_exists_inline)
+-  [Function `concurrent_fungible_balance_exists_inline`](#0x1_fungible_asset_concurrent_fungible_balance_exists_inline)
+-  [Function `metadata_from_asset`](#0x1_fungible_asset_metadata_from_asset)
+-  [Function `store_metadata`](#0x1_fungible_asset_store_metadata)
+-  [Function `amount`](#0x1_fungible_asset_amount)
+-  [Function `balance`](#0x1_fungible_asset_balance)
+-  [Function `is_balance_at_least`](#0x1_fungible_asset_is_balance_at_least)
+-  [Function `is_address_balance_at_least`](#0x1_fungible_asset_is_address_balance_at_least)
+-  [Function `is_frozen`](#0x1_fungible_asset_is_frozen)
+-  [Function `is_store_dispatchable`](#0x1_fungible_asset_is_store_dispatchable)
+-  [Function `deposit_dispatch_function`](#0x1_fungible_asset_deposit_dispatch_function)
+-  [Function `has_deposit_dispatch_function`](#0x1_fungible_asset_has_deposit_dispatch_function)
+-  [Function `withdraw_dispatch_function`](#0x1_fungible_asset_withdraw_dispatch_function)
+-  [Function `has_withdraw_dispatch_function`](#0x1_fungible_asset_has_withdraw_dispatch_function)
+-  [Function `derived_balance_dispatch_function`](#0x1_fungible_asset_derived_balance_dispatch_function)
+-  [Function `derived_supply_dispatch_function`](#0x1_fungible_asset_derived_supply_dispatch_function)
+-  [Function `asset_metadata`](#0x1_fungible_asset_asset_metadata)
+-  [Function `mint_ref_metadata`](#0x1_fungible_asset_mint_ref_metadata)
+-  [Function `transfer_ref_metadata`](#0x1_fungible_asset_transfer_ref_metadata)
+-  [Function `burn_ref_metadata`](#0x1_fungible_asset_burn_ref_metadata)
+-  [Function `object_from_metadata_ref`](#0x1_fungible_asset_object_from_metadata_ref)
+-  [Function `transfer`](#0x1_fungible_asset_transfer)
+-  [Function `create_store`](#0x1_fungible_asset_create_store)
+-  [Function `remove_store`](#0x1_fungible_asset_remove_store)
+-  [Function `withdraw`](#0x1_fungible_asset_withdraw)
+-  [Function `withdraw_sanity_check`](#0x1_fungible_asset_withdraw_sanity_check)
+-  [Function `deposit_sanity_check`](#0x1_fungible_asset_deposit_sanity_check)
+-  [Function `deposit`](#0x1_fungible_asset_deposit)
+-  [Function `mint`](#0x1_fungible_asset_mint)
+-  [Function `mint_internal`](#0x1_fungible_asset_mint_internal)
+-  [Function `mint_to`](#0x1_fungible_asset_mint_to)
+-  [Function `set_frozen_flag`](#0x1_fungible_asset_set_frozen_flag)
+-  [Function `set_frozen_flag_internal`](#0x1_fungible_asset_set_frozen_flag_internal)
+-  [Function `burn`](#0x1_fungible_asset_burn)
+-  [Function `burn_internal`](#0x1_fungible_asset_burn_internal)
+-  [Function `burn_from`](#0x1_fungible_asset_burn_from)
+-  [Function `address_burn_from`](#0x1_fungible_asset_address_burn_from)
+-  [Function `withdraw_with_ref`](#0x1_fungible_asset_withdraw_with_ref)
+-  [Function `deposit_with_ref`](#0x1_fungible_asset_deposit_with_ref)
+-  [Function `transfer_with_ref`](#0x1_fungible_asset_transfer_with_ref)
+-  [Function `mutate_metadata`](#0x1_fungible_asset_mutate_metadata)
+-  [Function `zero`](#0x1_fungible_asset_zero)
+-  [Function `extract`](#0x1_fungible_asset_extract)
+-  [Function `merge`](#0x1_fungible_asset_merge)
+-  [Function `destroy_zero`](#0x1_fungible_asset_destroy_zero)
+-  [Function `deposit_internal`](#0x1_fungible_asset_deposit_internal)
+-  [Function `withdraw_internal`](#0x1_fungible_asset_withdraw_internal)
+-  [Function `increase_supply`](#0x1_fungible_asset_increase_supply)
+-  [Function `decrease_supply`](#0x1_fungible_asset_decrease_supply)
+-  [Function `borrow_fungible_metadata`](#0x1_fungible_asset_borrow_fungible_metadata)
+-  [Function `borrow_fungible_metadata_mut`](#0x1_fungible_asset_borrow_fungible_metadata_mut)
+-  [Function `borrow_store_resource`](#0x1_fungible_asset_borrow_store_resource)
+-  [Function `upgrade_to_concurrent`](#0x1_fungible_asset_upgrade_to_concurrent)
+-  [Function `upgrade_store_to_concurrent`](#0x1_fungible_asset_upgrade_store_to_concurrent)
+-  [Function `ensure_store_upgraded_to_concurrent_internal`](#0x1_fungible_asset_ensure_store_upgraded_to_concurrent_internal)
+-  [Specification](#@Specification_1)
+    -  [High-level Requirements](#high-level-req)
+    -  [Module-level Specification](#module-level-spec)
+
+
+<pre><code><b>use</b> <a href="aggregator_v2.md#0x1_aggregator_v2">0x1::aggregator_v2</a>;
+<b>use</b> <a href="create_signer.md#0x1_create_signer">0x1::create_signer</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="event.md#0x1_event">0x1::event</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features">0x1::features</a>;
+<b>use</b> <a href="function_info.md#0x1_function_info">0x1::function_info</a>;
+<b>use</b> <a href="object.md#0x1_object">0x1::object</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option">0x1::option</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">0x1::signer</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string">0x1::string</a>;
+</code></pre>
+
+
+
+<a id="0x1_fungible_asset_Supply"></a>
+
+## Resource `Supply`
+
+
+
+<pre><code>#[resource_group_member(#[group = <a href="object.md#0x1_object_ObjectGroup">0x1::object::ObjectGroup</a>])]
+<b>struct</b> <a href="fungible_asset.md#0x1_fungible_asset_Supply">Supply</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>current: u128</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>maximum: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;u128&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_fungible_asset_ConcurrentSupply"></a>
+
+## Resource `ConcurrentSupply`
+
+
+
+<pre><code>#[resource_group_member(#[group = <a href="object.md#0x1_object_ObjectGroup">0x1::object::ObjectGroup</a>])]
+<b>struct</b> <a href="fungible_asset.md#0x1_fungible_asset_ConcurrentSupply">ConcurrentSupply</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>current: <a href="aggregator_v2.md#0x1_aggregator_v2_Aggregator">aggregator_v2::Aggregator</a>&lt;u128&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_fungible_asset_Metadata"></a>
+
+## Resource `Metadata`
+
+Metadata of a Fungible asset
+
+
+<pre><code>#[resource_group_member(#[group = <a href="object.md#0x1_object_ObjectGroup">0x1::object::ObjectGroup</a>])]
+<b>struct</b> <a href="fungible_asset.md#0x1_fungible_asset_Metadata">Metadata</a> <b>has</b> <b>copy</b>, drop, key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>name: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+ Name of the fungible metadata, i.e., "USDT".
+</dd>
+<dt>
+<code>symbol: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+ Symbol of the fungible metadata, usually a shorter version of the name.
+ For example, Singapore Dollar is SGD.
+</dd>
+<dt>
+<code>decimals: u8</code>
+</dt>
+<dd>
+ Number of decimals used for display purposes.
+ For example, if <code>decimals</code> equals <code>2</code>, a balance of <code>505</code> coins should
+ be displayed to a user as <code>5.05</code> (<code>505 / 10 ** 2</code>).
+</dd>
+<dt>
+<code>icon_uri: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+ The Uniform Resource Identifier (uri) pointing to an image that can be used as the icon for this fungible
+ asset.
+</dd>
+<dt>
+<code>project_uri: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+ The Uniform Resource Identifier (uri) pointing to the website for the fungible asset.
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_fungible_asset_Untransferable"></a>
+
+## Resource `Untransferable`
+
+Defines a <code><a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">FungibleAsset</a></code>, such that all <code><a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a></code>s stores are untransferable at
+the object layer.
+
+
+<pre><code>#[resource_group_member(#[group = <a href="object.md#0x1_object_ObjectGroup">0x1::object::ObjectGroup</a>])]
+<b>struct</b> <a href="fungible_asset.md#0x1_fungible_asset_Untransferable">Untransferable</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>dummy_field: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_fungible_asset_FungibleStore"></a>
+
+## Resource `FungibleStore`
+
+The store object that holds fungible assets of a specific type associated with an account.
+
+
+<pre><code>#[resource_group_member(#[group = <a href="object.md#0x1_object_ObjectGroup">0x1::object::ObjectGroup</a>])]
+<b>struct</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>metadata: <a href="object.md#0x1_object_Object">object::Object</a>&lt;<a href="fungible_asset.md#0x1_fungible_asset_Metadata">fungible_asset::Metadata</a>&gt;</code>
+</dt>
+<dd>
+ The address of the base metadata object.
+</dd>
+<dt>
+<code>balance: u64</code>
+</dt>
+<dd>
+ The balance of the fungible metadata.
+</dd>
+<dt>
+<code>frozen: bool</code>
+</dt>
+<dd>
+ If true, owner transfer is disabled that only <code><a href="fungible_asset.md#0x1_fungible_asset_TransferRef">TransferRef</a></code> can move in/out from this store.
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_fungible_asset_DispatchFunctionStore"></a>
+
+## Resource `DispatchFunctionStore`
+
+
+
+<pre><code>#[resource_group_member(#[group = <a href="object.md#0x1_object_ObjectGroup">0x1::object::ObjectGroup</a>])]
+<b>struct</b> <a href="fungible_asset.md#0x1_fungible_asset_DispatchFunctionStore">DispatchFunctionStore</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>withdraw_function: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="function_info.md#0x1_function_info_FunctionInfo">function_info::FunctionInfo</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>deposit_function: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="function_info.md#0x1_function_info_FunctionInfo">function_info::FunctionInfo</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>derived_balance_function: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="function_info.md#0x1_function_info_FunctionInfo">function_info::FunctionInfo</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_fungible_asset_DeriveSupply"></a>
+
+## Resource `DeriveSupply`
+
+
+
+<pre><code>#[resource_group_member(#[group = <a href="object.md#0x1_object_ObjectGroup">0x1::object::ObjectGroup</a>])]
+<b>struct</b> <a href="fungible_asset.md#0x1_fungible_asset_DeriveSupply">DeriveSupply</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>dispatch_function: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="function_info.md#0x1_function_info_FunctionInfo">function_info::FunctionInfo</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_fungible_asset_ConcurrentFungibleBalance"></a>
+
+## Resource `ConcurrentFungibleBalance`
+
+The store object that holds concurrent fungible asset balance.
+
+
+<pre><code>#[resource_group_member(#[group = <a href="object.md#0x1_object_ObjectGroup">0x1::object::ObjectGroup</a>])]
+<b>struct</b> <a href="fungible_asset.md#0x1_fungible_asset_ConcurrentFungibleBalance">ConcurrentFungibleBalance</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>balance: <a href="aggregator_v2.md#0x1_aggregator_v2_Aggregator">aggregator_v2::Aggregator</a>&lt;u64&gt;</code>
+</dt>
+<dd>
+ The balance of the fungible metadata.
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_fungible_asset_FungibleAsset"></a>
+
+## Struct `FungibleAsset`
+
+FungibleAsset can be passed into function for type safety and to guarantee a specific amount.
+FungibleAsset is ephemeral and cannot be stored directly. It must be deposited back into a store.
+
+
+<pre><code><b>struct</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">FungibleAsset</a>
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>metadata: <a href="object.md#0x1_object_Object">object::Object</a>&lt;<a href="fungible_asset.md#0x1_fungible_asset_Metadata">fungible_asset::Metadata</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>amount: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_fungible_asset_MintRef"></a>
+
+## Struct `MintRef`
+
+MintRef can be used to mint the fungible asset into an account's store.
+
+
+<pre><code><b>struct</b> <a href="fungible_asset.md#0x1_fungible_asset_MintRef">MintRef</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>metadata: <a href="object.md#0x1_object_Object">object::Object</a>&lt;<a href="fungible_asset.md#0x1_fungible_asset_Metadata">fungible_asset::Metadata</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_fungible_asset_TransferRef"></a>
+
+## Struct `TransferRef`
+
+TransferRef can be used to allow or disallow the owner of fungible assets from transferring the asset
+and allow the holder of TransferRef to transfer fungible assets from any account.
+
+
+<pre><code><b>struct</b> <a href="fungible_asset.md#0x1_fungible_asset_TransferRef">TransferRef</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>metadata: <a href="object.md#0x1_object_Object">object::Object</a>&lt;<a href="fungible_asset.md#0x1_fungible_asset_Metadata">fungible_asset::Metadata</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_fungible_asset_BurnRef"></a>
+
+## Struct `BurnRef`
+
+BurnRef can be used to burn fungible assets from a given holder account.
+
+
+<pre><code><b>struct</b> <a href="fungible_asset.md#0x1_fungible_asset_BurnRef">BurnRef</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>metadata: <a href="object.md#0x1_object_Object">object::Object</a>&lt;<a href="fungible_asset.md#0x1_fungible_asset_Metadata">fungible_asset::Metadata</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_fungible_asset_MutateMetadataRef"></a>
+
+## Struct `MutateMetadataRef`
+
+MutateMetadataRef can be used to directly modify the fungible asset's Metadata.
+
+
+<pre><code><b>struct</b> <a href="fungible_asset.md#0x1_fungible_asset_MutateMetadataRef">MutateMetadataRef</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>metadata: <a href="object.md#0x1_object_Object">object::Object</a>&lt;<a href="fungible_asset.md#0x1_fungible_asset_Metadata">fungible_asset::Metadata</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_fungible_asset_Deposit"></a>
+
+## Struct `Deposit`
+
+Emitted when fungible assets are deposited into a store.
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="fungible_asset.md#0x1_fungible_asset_Deposit">Deposit</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>store: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>amount: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_fungible_asset_Withdraw"></a>
+
+## Struct `Withdraw`
+
+Emitted when fungible assets are withdrawn from a store.
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="fungible_asset.md#0x1_fungible_asset_Withdraw">Withdraw</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>store: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>amount: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_fungible_asset_Frozen"></a>
+
+## Struct `Frozen`
+
+Emitted when a store's frozen status is updated.
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="fungible_asset.md#0x1_fungible_asset_Frozen">Frozen</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>store: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>frozen: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_fungible_asset_FungibleAssetEvents"></a>
+
+## Resource `FungibleAssetEvents`
+
+
+
+<pre><code>#[resource_group_member(#[group = <a href="object.md#0x1_object_ObjectGroup">0x1::object::ObjectGroup</a>])]
+#[deprecated]
+<b>struct</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleAssetEvents">FungibleAssetEvents</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>deposit_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="fungible_asset.md#0x1_fungible_asset_DepositEvent">fungible_asset::DepositEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>withdraw_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="fungible_asset.md#0x1_fungible_asset_WithdrawEvent">fungible_asset::WithdrawEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>frozen_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="fungible_asset.md#0x1_fungible_asset_FrozenEvent">fungible_asset::FrozenEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_fungible_asset_DepositEvent"></a>
+
+## Struct `DepositEvent`
+
+
+
+<pre><code>#[deprecated]
+<b>struct</b> <a href="fungible_asset.md#0x1_fungible_asset_DepositEvent">DepositEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>amount: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_fungible_asset_WithdrawEvent"></a>
+
+## Struct `WithdrawEvent`
+
+
+
+<pre><code>#[deprecated]
+<b>struct</b> <a href="fungible_asset.md#0x1_fungible_asset_WithdrawEvent">WithdrawEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>amount: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_fungible_asset_FrozenEvent"></a>
+
+## Struct `FrozenEvent`
+
+
+
+<pre><code>#[deprecated]
+<b>struct</b> <a href="fungible_asset.md#0x1_fungible_asset_FrozenEvent">FrozenEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>frozen: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_fungible_asset_MAX_U128"></a>
+
+Maximum possible coin supply.
+
+
+<pre><code><b>const</b> <a href="fungible_asset.md#0x1_fungible_asset_MAX_U128">MAX_U128</a>: u128 = 340282366920938463463374607431768211455;
+</code></pre>
+
+
+
+<a id="0x1_fungible_asset_EALREADY_REGISTERED"></a>
+
+Trying to re-register dispatch hook on a fungible asset.
+
+
+<pre><code><b>const</b> <a href="fungible_asset.md#0x1_fungible_asset_EALREADY_REGISTERED">EALREADY_REGISTERED</a>: u64 = 29;
+</code></pre>
+
+
+
+<a id="0x1_fungible_asset_EAMOUNT_CANNOT_BE_ZERO"></a>
+
+Amount cannot be zero.
+
+
+<pre><code><b>const</b> <a href="fungible_asset.md#0x1_fungible_asset_EAMOUNT_CANNOT_BE_ZERO">EAMOUNT_CANNOT_BE_ZERO</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_fungible_asset_EAMOUNT_IS_NOT_ZERO"></a>
+
+Cannot destroy non-empty fungible assets.
+
+
+<pre><code><b>const</b> <a href="fungible_asset.md#0x1_fungible_asset_EAMOUNT_IS_NOT_ZERO">EAMOUNT_IS_NOT_ZERO</a>: u64 = 12;
+</code></pre>
+
+
+
+<a id="0x1_fungible_asset_EAPT_NOT_DISPATCHABLE"></a>
+
+Cannot register dispatch hook for APT.
+
+
+<pre><code><b>const</b> <a href="fungible_asset.md#0x1_fungible_asset_EAPT_NOT_DISPATCHABLE">EAPT_NOT_DISPATCHABLE</a>: u64 = 31;
+</code></pre>
+
+
+
+<a id="0x1_fungible_asset_EBALANCE_IS_NOT_ZERO"></a>
+
+Cannot destroy fungible stores with a non-zero balance.
+
+
+<pre><code><b>const</b> <a href="fungible_asset.md#0x1_fungible_asset_EBALANCE_IS_NOT_ZERO">EBALANCE_IS_NOT_ZERO</a>: u64 = 14;
+</code></pre>
+
+
+
+<a id="0x1_fungible_asset_EBURN_REF_AND_FUNGIBLE_ASSET_MISMATCH"></a>
+
+Burn ref and fungible asset do not match.
+
+
+<pre><code><b>const</b> <a href="fungible_asset.md#0x1_fungible_asset_EBURN_REF_AND_FUNGIBLE_ASSET_MISMATCH">EBURN_REF_AND_FUNGIBLE_ASSET_MISMATCH</a>: u64 = 13;
+</code></pre>
+
+
+
+<a id="0x1_fungible_asset_EBURN_REF_AND_STORE_MISMATCH"></a>
+
+Burn ref and store do not match.
+
+
+<pre><code><b>const</b> <a href="fungible_asset.md#0x1_fungible_asset_EBURN_REF_AND_STORE_MISMATCH">EBURN_REF_AND_STORE_MISMATCH</a>: u64 = 10;
+</code></pre>
+
+
+
+<a id="0x1_fungible_asset_ECONCURRENT_BALANCE_NOT_ENABLED"></a>
+
+Flag for Concurrent Supply not enabled
+
+
+<pre><code><b>const</b> <a href="fungible_asset.md#0x1_fungible_asset_ECONCURRENT_BALANCE_NOT_ENABLED">ECONCURRENT_BALANCE_NOT_ENABLED</a>: u64 = 32;
+</code></pre>
+
+
+
+<a id="0x1_fungible_asset_ECONCURRENT_SUPPLY_NOT_ENABLED"></a>
+
+Flag for Concurrent Supply not enabled
+
+
+<pre><code><b>const</b> <a href="fungible_asset.md#0x1_fungible_asset_ECONCURRENT_SUPPLY_NOT_ENABLED">ECONCURRENT_SUPPLY_NOT_ENABLED</a>: u64 = 22;
+</code></pre>
+
+
+
+<a id="0x1_fungible_asset_EDECIMALS_TOO_LARGE"></a>
+
+Decimals is over the maximum of 32
+
+
+<pre><code><b>const</b> <a href="fungible_asset.md#0x1_fungible_asset_EDECIMALS_TOO_LARGE">EDECIMALS_TOO_LARGE</a>: u64 = 17;
+</code></pre>
+
+
+
+<a id="0x1_fungible_asset_EDEPOSIT_FUNCTION_SIGNATURE_MISMATCH"></a>
+
+Provided deposit function type doesn't meet the signature requirement.
+
+
+<pre><code><b>const</b> <a href="fungible_asset.md#0x1_fungible_asset_EDEPOSIT_FUNCTION_SIGNATURE_MISMATCH">EDEPOSIT_FUNCTION_SIGNATURE_MISMATCH</a>: u64 = 26;
+</code></pre>
+
+
+
+<a id="0x1_fungible_asset_EDERIVED_BALANCE_FUNCTION_SIGNATURE_MISMATCH"></a>
+
+Provided derived_balance function type doesn't meet the signature requirement.
+
+
+<pre><code><b>const</b> <a href="fungible_asset.md#0x1_fungible_asset_EDERIVED_BALANCE_FUNCTION_SIGNATURE_MISMATCH">EDERIVED_BALANCE_FUNCTION_SIGNATURE_MISMATCH</a>: u64 = 27;
+</code></pre>
+
+
+
+<a id="0x1_fungible_asset_EDERIVED_SUPPLY_FUNCTION_SIGNATURE_MISMATCH"></a>
+
+Provided derived_supply function type doesn't meet the signature requirement.
+
+
+<pre><code><b>const</b> <a href="fungible_asset.md#0x1_fungible_asset_EDERIVED_SUPPLY_FUNCTION_SIGNATURE_MISMATCH">EDERIVED_SUPPLY_FUNCTION_SIGNATURE_MISMATCH</a>: u64 = 33;
+</code></pre>
+
+
+
+<a id="0x1_fungible_asset_EFUNGIBLE_ASSET_AND_STORE_MISMATCH"></a>
+
+Fungible asset and store do not match.
+
+
+<pre><code><b>const</b> <a href="fungible_asset.md#0x1_fungible_asset_EFUNGIBLE_ASSET_AND_STORE_MISMATCH">EFUNGIBLE_ASSET_AND_STORE_MISMATCH</a>: u64 = 11;
+</code></pre>
+
+
+
+<a id="0x1_fungible_asset_EFUNGIBLE_ASSET_MISMATCH"></a>
+
+Fungible asset do not match when merging.
+
+
+<pre><code><b>const</b> <a href="fungible_asset.md#0x1_fungible_asset_EFUNGIBLE_ASSET_MISMATCH">EFUNGIBLE_ASSET_MISMATCH</a>: u64 = 6;
+</code></pre>
+
+
+
+<a id="0x1_fungible_asset_EFUNGIBLE_METADATA_EXISTENCE"></a>
+
+Fungible metadata does not exist on this account.
+
+
+<pre><code><b>const</b> <a href="fungible_asset.md#0x1_fungible_asset_EFUNGIBLE_METADATA_EXISTENCE">EFUNGIBLE_METADATA_EXISTENCE</a>: u64 = 30;
+</code></pre>
+
+
+
+<a id="0x1_fungible_asset_EFUNGIBLE_STORE_EXISTENCE"></a>
+
+Flag for the existence of fungible store.
+
+
+<pre><code><b>const</b> <a href="fungible_asset.md#0x1_fungible_asset_EFUNGIBLE_STORE_EXISTENCE">EFUNGIBLE_STORE_EXISTENCE</a>: u64 = 23;
+</code></pre>
+
+
+
+<a id="0x1_fungible_asset_EINSUFFICIENT_BALANCE"></a>
+
+Insufficient balance to withdraw or transfer.
+
+
+<pre><code><b>const</b> <a href="fungible_asset.md#0x1_fungible_asset_EINSUFFICIENT_BALANCE">EINSUFFICIENT_BALANCE</a>: u64 = 4;
+</code></pre>
+
+
+
+<a id="0x1_fungible_asset_EINVALID_DISPATCHABLE_OPERATIONS"></a>
+
+Invalid withdraw/deposit on dispatchable token. The specified token has a dispatchable function hook.
+Need to invoke dispatchable_fungible_asset::withdraw/deposit to perform transfer.
+
+
+<pre><code><b>const</b> <a href="fungible_asset.md#0x1_fungible_asset_EINVALID_DISPATCHABLE_OPERATIONS">EINVALID_DISPATCHABLE_OPERATIONS</a>: u64 = 28;
+</code></pre>
+
+
+
+<a id="0x1_fungible_asset_EMAX_SUPPLY_EXCEEDED"></a>
+
+The fungible asset's supply has exceeded maximum.
+
+
+<pre><code><b>const</b> <a href="fungible_asset.md#0x1_fungible_asset_EMAX_SUPPLY_EXCEEDED">EMAX_SUPPLY_EXCEEDED</a>: u64 = 5;
+</code></pre>
+
+
+
+<a id="0x1_fungible_asset_EMINT_REF_AND_STORE_MISMATCH"></a>
+
+The mint ref and the store do not match.
+
+
+<pre><code><b>const</b> <a href="fungible_asset.md#0x1_fungible_asset_EMINT_REF_AND_STORE_MISMATCH">EMINT_REF_AND_STORE_MISMATCH</a>: u64 = 7;
+</code></pre>
+
+
+
+<a id="0x1_fungible_asset_ENAME_TOO_LONG"></a>
+
+Name of the fungible asset metadata is too long
+
+
+<pre><code><b>const</b> <a href="fungible_asset.md#0x1_fungible_asset_ENAME_TOO_LONG">ENAME_TOO_LONG</a>: u64 = 15;
+</code></pre>
+
+
+
+<a id="0x1_fungible_asset_ENOT_METADATA_OWNER"></a>
+
+Account is not the owner of metadata object.
+
+
+<pre><code><b>const</b> <a href="fungible_asset.md#0x1_fungible_asset_ENOT_METADATA_OWNER">ENOT_METADATA_OWNER</a>: u64 = 24;
+</code></pre>
+
+
+
+<a id="0x1_fungible_asset_ENOT_STORE_OWNER"></a>
+
+Account is not the store's owner.
+
+
+<pre><code><b>const</b> <a href="fungible_asset.md#0x1_fungible_asset_ENOT_STORE_OWNER">ENOT_STORE_OWNER</a>: u64 = 8;
+</code></pre>
+
+
+
+<a id="0x1_fungible_asset_EOBJECT_IS_DELETABLE"></a>
+
+Fungibility is only available for non-deletable objects.
+
+
+<pre><code><b>const</b> <a href="fungible_asset.md#0x1_fungible_asset_EOBJECT_IS_DELETABLE">EOBJECT_IS_DELETABLE</a>: u64 = 18;
+</code></pre>
+
+
+
+<a id="0x1_fungible_asset_ESTORE_IS_FROZEN"></a>
+
+Store is disabled from sending and receiving this fungible asset.
+
+
+<pre><code><b>const</b> <a href="fungible_asset.md#0x1_fungible_asset_ESTORE_IS_FROZEN">ESTORE_IS_FROZEN</a>: u64 = 3;
+</code></pre>
+
+
+
+<a id="0x1_fungible_asset_ESUPPLY_NOT_FOUND"></a>
+
+Supply resource is not found for a metadata object.
+
+
+<pre><code><b>const</b> <a href="fungible_asset.md#0x1_fungible_asset_ESUPPLY_NOT_FOUND">ESUPPLY_NOT_FOUND</a>: u64 = 21;
+</code></pre>
+
+
+
+<a id="0x1_fungible_asset_ESUPPLY_UNDERFLOW"></a>
+
+The fungible asset's supply will be negative which should be impossible.
+
+
+<pre><code><b>const</b> <a href="fungible_asset.md#0x1_fungible_asset_ESUPPLY_UNDERFLOW">ESUPPLY_UNDERFLOW</a>: u64 = 20;
+</code></pre>
+
+
+
+<a id="0x1_fungible_asset_ESYMBOL_TOO_LONG"></a>
+
+Symbol of the fungible asset metadata is too long
+
+
+<pre><code><b>const</b> <a href="fungible_asset.md#0x1_fungible_asset_ESYMBOL_TOO_LONG">ESYMBOL_TOO_LONG</a>: u64 = 16;
+</code></pre>
+
+
+
+<a id="0x1_fungible_asset_ETRANSFER_REF_AND_FUNGIBLE_ASSET_MISMATCH"></a>
+
+The transfer ref and the fungible asset do not match.
+
+
+<pre><code><b>const</b> <a href="fungible_asset.md#0x1_fungible_asset_ETRANSFER_REF_AND_FUNGIBLE_ASSET_MISMATCH">ETRANSFER_REF_AND_FUNGIBLE_ASSET_MISMATCH</a>: u64 = 2;
+</code></pre>
+
+
+
+<a id="0x1_fungible_asset_ETRANSFER_REF_AND_STORE_MISMATCH"></a>
+
+Transfer ref and store do not match.
+
+
+<pre><code><b>const</b> <a href="fungible_asset.md#0x1_fungible_asset_ETRANSFER_REF_AND_STORE_MISMATCH">ETRANSFER_REF_AND_STORE_MISMATCH</a>: u64 = 9;
+</code></pre>
+
+
+
+<a id="0x1_fungible_asset_EURI_TOO_LONG"></a>
+
+URI for the icon of the fungible asset metadata is too long
+
+
+<pre><code><b>const</b> <a href="fungible_asset.md#0x1_fungible_asset_EURI_TOO_LONG">EURI_TOO_LONG</a>: u64 = 19;
+</code></pre>
+
+
+
+<a id="0x1_fungible_asset_EWITHDRAW_FUNCTION_SIGNATURE_MISMATCH"></a>
+
+Provided withdraw function type doesn't meet the signature requirement.
+
+
+<pre><code><b>const</b> <a href="fungible_asset.md#0x1_fungible_asset_EWITHDRAW_FUNCTION_SIGNATURE_MISMATCH">EWITHDRAW_FUNCTION_SIGNATURE_MISMATCH</a>: u64 = 25;
+</code></pre>
+
+
+
+<a id="0x1_fungible_asset_MAX_DECIMALS"></a>
+
+
+
+<pre><code><b>const</b> <a href="fungible_asset.md#0x1_fungible_asset_MAX_DECIMALS">MAX_DECIMALS</a>: u8 = 32;
+</code></pre>
+
+
+
+<a id="0x1_fungible_asset_MAX_NAME_LENGTH"></a>
+
+
+
+<pre><code><b>const</b> <a href="fungible_asset.md#0x1_fungible_asset_MAX_NAME_LENGTH">MAX_NAME_LENGTH</a>: u64 = 32;
+</code></pre>
+
+
+
+<a id="0x1_fungible_asset_MAX_SYMBOL_LENGTH"></a>
+
+
+
+<pre><code><b>const</b> <a href="fungible_asset.md#0x1_fungible_asset_MAX_SYMBOL_LENGTH">MAX_SYMBOL_LENGTH</a>: u64 = 10;
+</code></pre>
+
+
+
+<a id="0x1_fungible_asset_MAX_URI_LENGTH"></a>
+
+
+
+<pre><code><b>const</b> <a href="fungible_asset.md#0x1_fungible_asset_MAX_URI_LENGTH">MAX_URI_LENGTH</a>: u64 = 512;
+</code></pre>
+
+
+
+<a id="0x1_fungible_asset_default_to_concurrent_fungible_supply"></a>
+
+## Function `default_to_concurrent_fungible_supply`
+
+
+
+<pre><code><b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_default_to_concurrent_fungible_supply">default_to_concurrent_fungible_supply</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_default_to_concurrent_fungible_supply">default_to_concurrent_fungible_supply</a>(): bool {
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_concurrent_fungible_assets_enabled">features::concurrent_fungible_assets_enabled</a>()
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_allow_upgrade_to_concurrent_fungible_balance"></a>
+
+## Function `allow_upgrade_to_concurrent_fungible_balance`
+
+
+
+<pre><code><b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_allow_upgrade_to_concurrent_fungible_balance">allow_upgrade_to_concurrent_fungible_balance</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_allow_upgrade_to_concurrent_fungible_balance">allow_upgrade_to_concurrent_fungible_balance</a>(): bool {
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_concurrent_fungible_balance_enabled">features::concurrent_fungible_balance_enabled</a>()
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_default_to_concurrent_fungible_balance"></a>
+
+## Function `default_to_concurrent_fungible_balance`
+
+
+
+<pre><code><b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_default_to_concurrent_fungible_balance">default_to_concurrent_fungible_balance</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_default_to_concurrent_fungible_balance">default_to_concurrent_fungible_balance</a>(): bool {
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_default_to_concurrent_fungible_balance_enabled">features::default_to_concurrent_fungible_balance_enabled</a>()
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_add_fungibility"></a>
+
+## Function `add_fungibility`
+
+Make an existing object fungible by adding the Metadata resource.
+This returns the capabilities to mint, burn, and transfer.
+maximum_supply defines the behavior of maximum supply when monitoring:
+- option::none(): Monitoring unlimited supply
+(width of the field - MAX_U128 is the implicit maximum supply)
+if option::some(MAX_U128) is used, it is treated as unlimited supply.
+- option::some(max): Monitoring fixed supply with <code>max</code> as the maximum supply.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_add_fungibility">add_fungibility</a>(constructor_ref: &<a href="object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>, maximum_supply: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;u128&gt;, name: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, symbol: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, decimals: u8, icon_uri: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, project_uri: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): <a href="object.md#0x1_object_Object">object::Object</a>&lt;<a href="fungible_asset.md#0x1_fungible_asset_Metadata">fungible_asset::Metadata</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_add_fungibility">add_fungibility</a>(
+    constructor_ref: &ConstructorRef,
+    maximum_supply: Option&lt;u128&gt;,
+    name: String,
+    symbol: String,
+    decimals: u8,
+    icon_uri: String,
+    project_uri: String,
+): Object&lt;<a href="fungible_asset.md#0x1_fungible_asset_Metadata">Metadata</a>&gt; {
+    <b>assert</b>!(!<a href="object.md#0x1_object_can_generate_delete_ref">object::can_generate_delete_ref</a>(constructor_ref), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="fungible_asset.md#0x1_fungible_asset_EOBJECT_IS_DELETABLE">EOBJECT_IS_DELETABLE</a>));
+    <b>let</b> metadata_object_signer = &<a href="object.md#0x1_object_generate_signer">object::generate_signer</a>(constructor_ref);
+    <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_length">string::length</a>(&name) &lt;= <a href="fungible_asset.md#0x1_fungible_asset_MAX_NAME_LENGTH">MAX_NAME_LENGTH</a>, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_out_of_range">error::out_of_range</a>(<a href="fungible_asset.md#0x1_fungible_asset_ENAME_TOO_LONG">ENAME_TOO_LONG</a>));
+    <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_length">string::length</a>(&symbol) &lt;= <a href="fungible_asset.md#0x1_fungible_asset_MAX_SYMBOL_LENGTH">MAX_SYMBOL_LENGTH</a>, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_out_of_range">error::out_of_range</a>(<a href="fungible_asset.md#0x1_fungible_asset_ESYMBOL_TOO_LONG">ESYMBOL_TOO_LONG</a>));
+    <b>assert</b>!(<a href="fungible_asset.md#0x1_fungible_asset_decimals">decimals</a> &lt;= <a href="fungible_asset.md#0x1_fungible_asset_MAX_DECIMALS">MAX_DECIMALS</a>, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_out_of_range">error::out_of_range</a>(<a href="fungible_asset.md#0x1_fungible_asset_EDECIMALS_TOO_LARGE">EDECIMALS_TOO_LARGE</a>));
+    <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_length">string::length</a>(&icon_uri) &lt;= <a href="fungible_asset.md#0x1_fungible_asset_MAX_URI_LENGTH">MAX_URI_LENGTH</a>, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_out_of_range">error::out_of_range</a>(<a href="fungible_asset.md#0x1_fungible_asset_EURI_TOO_LONG">EURI_TOO_LONG</a>));
+    <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_length">string::length</a>(&project_uri) &lt;= <a href="fungible_asset.md#0x1_fungible_asset_MAX_URI_LENGTH">MAX_URI_LENGTH</a>, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_out_of_range">error::out_of_range</a>(<a href="fungible_asset.md#0x1_fungible_asset_EURI_TOO_LONG">EURI_TOO_LONG</a>));
+    <b>move_to</b>(metadata_object_signer,
+        <a href="fungible_asset.md#0x1_fungible_asset_Metadata">Metadata</a> {
+            name,
+            symbol,
+            decimals,
+            icon_uri,
+            project_uri,
+        }
+    );
+
+    <b>if</b> (<a href="fungible_asset.md#0x1_fungible_asset_default_to_concurrent_fungible_supply">default_to_concurrent_fungible_supply</a>()) {
+        <b>let</b> unlimited = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_none">option::is_none</a>(&maximum_supply);
+        <b>move_to</b>(metadata_object_signer, <a href="fungible_asset.md#0x1_fungible_asset_ConcurrentSupply">ConcurrentSupply</a> {
+            current: <b>if</b> (unlimited) {
+                <a href="aggregator_v2.md#0x1_aggregator_v2_create_unbounded_aggregator">aggregator_v2::create_unbounded_aggregator</a>()
+            } <b>else</b> {
+                <a href="aggregator_v2.md#0x1_aggregator_v2_create_aggregator">aggregator_v2::create_aggregator</a>(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_extract">option::extract</a>(&<b>mut</b> maximum_supply))
+            },
+        });
+    } <b>else</b> {
+        <b>move_to</b>(metadata_object_signer, <a href="fungible_asset.md#0x1_fungible_asset_Supply">Supply</a> {
+            current: 0,
+            maximum: maximum_supply
+        });
+    };
+
+    <a href="object.md#0x1_object_object_from_constructor_ref">object::object_from_constructor_ref</a>&lt;<a href="fungible_asset.md#0x1_fungible_asset_Metadata">Metadata</a>&gt;(constructor_ref)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_set_untransferable"></a>
+
+## Function `set_untransferable`
+
+Set that only untransferable stores can be created for this fungible asset.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_set_untransferable">set_untransferable</a>(constructor_ref: &<a href="object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_set_untransferable">set_untransferable</a>(constructor_ref: &ConstructorRef) {
+    <b>let</b> metadata_addr = <a href="object.md#0x1_object_address_from_constructor_ref">object::address_from_constructor_ref</a>(constructor_ref);
+    <b>assert</b>!(<b>exists</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_Metadata">Metadata</a>&gt;(metadata_addr), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="fungible_asset.md#0x1_fungible_asset_EFUNGIBLE_METADATA_EXISTENCE">EFUNGIBLE_METADATA_EXISTENCE</a>));
+    <b>let</b> metadata_signer = &<a href="object.md#0x1_object_generate_signer">object::generate_signer</a>(constructor_ref);
+    <b>move_to</b>(metadata_signer, <a href="fungible_asset.md#0x1_fungible_asset_Untransferable">Untransferable</a> {});
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_is_untransferable"></a>
+
+## Function `is_untransferable`
+
+Returns true if the FA is untransferable.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_is_untransferable">is_untransferable</a>&lt;T: key&gt;(metadata: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_is_untransferable">is_untransferable</a>&lt;T: key&gt;(metadata: Object&lt;T&gt;): bool {
+    <b>exists</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_Untransferable">Untransferable</a>&gt;(<a href="object.md#0x1_object_object_address">object::object_address</a>(&metadata))
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_register_dispatch_functions"></a>
+
+## Function `register_dispatch_functions`
+
+Create a fungible asset store whose transfer rule would be overloaded by the provided function.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_register_dispatch_functions">register_dispatch_functions</a>(constructor_ref: &<a href="object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>, withdraw_function: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="function_info.md#0x1_function_info_FunctionInfo">function_info::FunctionInfo</a>&gt;, deposit_function: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="function_info.md#0x1_function_info_FunctionInfo">function_info::FunctionInfo</a>&gt;, derived_balance_function: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="function_info.md#0x1_function_info_FunctionInfo">function_info::FunctionInfo</a>&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_register_dispatch_functions">register_dispatch_functions</a>(
+    constructor_ref: &ConstructorRef,
+    withdraw_function: Option&lt;FunctionInfo&gt;,
+    deposit_function: Option&lt;FunctionInfo&gt;,
+    derived_balance_function: Option&lt;FunctionInfo&gt;,
+) {
+    // Verify that caller type matches callee type so wrongly typed function cannot be registered.
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_for_each_ref">option::for_each_ref</a>(&withdraw_function, |withdraw_function| {
+        <b>let</b> dispatcher_withdraw_function_info = <a href="function_info.md#0x1_function_info_new_function_info_from_address">function_info::new_function_info_from_address</a>(
+            @aptos_framework,
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"<a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset">dispatchable_fungible_asset</a>"),
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"dispatchable_withdraw"),
+        );
+
+        <b>assert</b>!(
+            <a href="function_info.md#0x1_function_info_check_dispatch_type_compatibility">function_info::check_dispatch_type_compatibility</a>(
+                &dispatcher_withdraw_function_info,
+                withdraw_function
+            ),
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(
+                <a href="fungible_asset.md#0x1_fungible_asset_EWITHDRAW_FUNCTION_SIGNATURE_MISMATCH">EWITHDRAW_FUNCTION_SIGNATURE_MISMATCH</a>
+            )
+        );
+    });
+
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_for_each_ref">option::for_each_ref</a>(&deposit_function, |deposit_function| {
+        <b>let</b> dispatcher_deposit_function_info = <a href="function_info.md#0x1_function_info_new_function_info_from_address">function_info::new_function_info_from_address</a>(
+            @aptos_framework,
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"<a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset">dispatchable_fungible_asset</a>"),
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"dispatchable_deposit"),
+        );
+        // Verify that caller type matches callee type so wrongly typed function cannot be registered.
+        <b>assert</b>!(
+            <a href="function_info.md#0x1_function_info_check_dispatch_type_compatibility">function_info::check_dispatch_type_compatibility</a>(
+                &dispatcher_deposit_function_info,
+                deposit_function
+            ),
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(
+                <a href="fungible_asset.md#0x1_fungible_asset_EDEPOSIT_FUNCTION_SIGNATURE_MISMATCH">EDEPOSIT_FUNCTION_SIGNATURE_MISMATCH</a>
+            )
+        );
+    });
+
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_for_each_ref">option::for_each_ref</a>(&derived_balance_function, |balance_function| {
+        <b>let</b> dispatcher_derived_balance_function_info = <a href="function_info.md#0x1_function_info_new_function_info_from_address">function_info::new_function_info_from_address</a>(
+            @aptos_framework,
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"<a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset">dispatchable_fungible_asset</a>"),
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"dispatchable_derived_balance"),
+        );
+        // Verify that caller type matches callee type so wrongly typed function cannot be registered.
+        <b>assert</b>!(
+            <a href="function_info.md#0x1_function_info_check_dispatch_type_compatibility">function_info::check_dispatch_type_compatibility</a>(
+                &dispatcher_derived_balance_function_info,
+                balance_function
+            ),
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(
+                <a href="fungible_asset.md#0x1_fungible_asset_EDERIVED_BALANCE_FUNCTION_SIGNATURE_MISMATCH">EDERIVED_BALANCE_FUNCTION_SIGNATURE_MISMATCH</a>
+            )
+        );
+    });
+    <a href="fungible_asset.md#0x1_fungible_asset_register_dispatch_function_sanity_check">register_dispatch_function_sanity_check</a>(constructor_ref);
+    <b>assert</b>!(
+        !<b>exists</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_DispatchFunctionStore">DispatchFunctionStore</a>&gt;(
+            <a href="object.md#0x1_object_address_from_constructor_ref">object::address_from_constructor_ref</a>(constructor_ref)
+        ),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_already_exists">error::already_exists</a>(<a href="fungible_asset.md#0x1_fungible_asset_EALREADY_REGISTERED">EALREADY_REGISTERED</a>)
+    );
+
+    <b>let</b> store_obj = &<a href="object.md#0x1_object_generate_signer">object::generate_signer</a>(constructor_ref);
+
+    // Store the overload function hook.
+    <b>move_to</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_DispatchFunctionStore">DispatchFunctionStore</a>&gt;(
+        store_obj,
+        <a href="fungible_asset.md#0x1_fungible_asset_DispatchFunctionStore">DispatchFunctionStore</a> {
+            withdraw_function,
+            deposit_function,
+            derived_balance_function,
+        }
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_register_derive_supply_dispatch_function"></a>
+
+## Function `register_derive_supply_dispatch_function`
+
+Define the derived supply dispatch with the provided function.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_register_derive_supply_dispatch_function">register_derive_supply_dispatch_function</a>(constructor_ref: &<a href="object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>, dispatch_function: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="function_info.md#0x1_function_info_FunctionInfo">function_info::FunctionInfo</a>&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_register_derive_supply_dispatch_function">register_derive_supply_dispatch_function</a>(
+    constructor_ref: &ConstructorRef,
+    dispatch_function: Option&lt;FunctionInfo&gt;
+) {
+    // Verify that caller type matches callee type so wrongly typed function cannot be registered.
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_for_each_ref">option::for_each_ref</a>(&dispatch_function, |supply_function| {
+        <b>let</b> <a href="function_info.md#0x1_function_info">function_info</a> = <a href="function_info.md#0x1_function_info_new_function_info_from_address">function_info::new_function_info_from_address</a>(
+            @aptos_framework,
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"<a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset">dispatchable_fungible_asset</a>"),
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"dispatchable_derived_supply"),
+        );
+        // Verify that caller type matches callee type so wrongly typed function cannot be registered.
+        <b>assert</b>!(
+            <a href="function_info.md#0x1_function_info_check_dispatch_type_compatibility">function_info::check_dispatch_type_compatibility</a>(
+                &<a href="function_info.md#0x1_function_info">function_info</a>,
+                supply_function
+            ),
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(
+                <a href="fungible_asset.md#0x1_fungible_asset_EDERIVED_SUPPLY_FUNCTION_SIGNATURE_MISMATCH">EDERIVED_SUPPLY_FUNCTION_SIGNATURE_MISMATCH</a>
+            )
+        );
+    });
+    <a href="fungible_asset.md#0x1_fungible_asset_register_dispatch_function_sanity_check">register_dispatch_function_sanity_check</a>(constructor_ref);
+    <b>assert</b>!(
+        !<b>exists</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_DeriveSupply">DeriveSupply</a>&gt;(
+            <a href="object.md#0x1_object_address_from_constructor_ref">object::address_from_constructor_ref</a>(constructor_ref)
+        ),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_already_exists">error::already_exists</a>(<a href="fungible_asset.md#0x1_fungible_asset_EALREADY_REGISTERED">EALREADY_REGISTERED</a>)
+    );
+
+
+    <b>let</b> store_obj = &<a href="object.md#0x1_object_generate_signer">object::generate_signer</a>(constructor_ref);
+
+    // Store the overload function hook.
+    <b>move_to</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_DeriveSupply">DeriveSupply</a>&gt;(
+        store_obj,
+        <a href="fungible_asset.md#0x1_fungible_asset_DeriveSupply">DeriveSupply</a> {
+            dispatch_function
+        }
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_register_dispatch_function_sanity_check"></a>
+
+## Function `register_dispatch_function_sanity_check`
+
+Check the requirements for registering a dispatchable function.
+
+
+<pre><code><b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_register_dispatch_function_sanity_check">register_dispatch_function_sanity_check</a>(constructor_ref: &<a href="object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_register_dispatch_function_sanity_check">register_dispatch_function_sanity_check</a>(
+    constructor_ref: &ConstructorRef,
+)  {
+    // Cannot register hook for APT.
+    <b>assert</b>!(
+        <a href="object.md#0x1_object_address_from_constructor_ref">object::address_from_constructor_ref</a>(constructor_ref) != @aptos_fungible_asset,
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="fungible_asset.md#0x1_fungible_asset_EAPT_NOT_DISPATCHABLE">EAPT_NOT_DISPATCHABLE</a>)
+    );
+    <b>assert</b>!(
+        !<a href="object.md#0x1_object_can_generate_delete_ref">object::can_generate_delete_ref</a>(constructor_ref),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="fungible_asset.md#0x1_fungible_asset_EOBJECT_IS_DELETABLE">EOBJECT_IS_DELETABLE</a>)
+    );
+    <b>assert</b>!(
+        <b>exists</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_Metadata">Metadata</a>&gt;(
+            <a href="object.md#0x1_object_address_from_constructor_ref">object::address_from_constructor_ref</a>(constructor_ref)
+        ),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="fungible_asset.md#0x1_fungible_asset_EFUNGIBLE_METADATA_EXISTENCE">EFUNGIBLE_METADATA_EXISTENCE</a>),
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_generate_mint_ref"></a>
+
+## Function `generate_mint_ref`
+
+Creates a mint ref that can be used to mint fungible assets from the given fungible object's constructor ref.
+This can only be called at object creation time as constructor_ref is only available then.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_generate_mint_ref">generate_mint_ref</a>(constructor_ref: &<a href="object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>): <a href="fungible_asset.md#0x1_fungible_asset_MintRef">fungible_asset::MintRef</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_generate_mint_ref">generate_mint_ref</a>(constructor_ref: &ConstructorRef): <a href="fungible_asset.md#0x1_fungible_asset_MintRef">MintRef</a> {
+    <b>let</b> metadata = <a href="object.md#0x1_object_object_from_constructor_ref">object::object_from_constructor_ref</a>&lt;<a href="fungible_asset.md#0x1_fungible_asset_Metadata">Metadata</a>&gt;(constructor_ref);
+    <a href="fungible_asset.md#0x1_fungible_asset_MintRef">MintRef</a> { metadata }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_generate_burn_ref"></a>
+
+## Function `generate_burn_ref`
+
+Creates a burn ref that can be used to burn fungible assets from the given fungible object's constructor ref.
+This can only be called at object creation time as constructor_ref is only available then.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_generate_burn_ref">generate_burn_ref</a>(constructor_ref: &<a href="object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>): <a href="fungible_asset.md#0x1_fungible_asset_BurnRef">fungible_asset::BurnRef</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_generate_burn_ref">generate_burn_ref</a>(constructor_ref: &ConstructorRef): <a href="fungible_asset.md#0x1_fungible_asset_BurnRef">BurnRef</a> {
+    <b>let</b> metadata = <a href="object.md#0x1_object_object_from_constructor_ref">object::object_from_constructor_ref</a>&lt;<a href="fungible_asset.md#0x1_fungible_asset_Metadata">Metadata</a>&gt;(constructor_ref);
+    <a href="fungible_asset.md#0x1_fungible_asset_BurnRef">BurnRef</a> { metadata }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_generate_transfer_ref"></a>
+
+## Function `generate_transfer_ref`
+
+Creates a transfer ref that can be used to freeze/unfreeze/transfer fungible assets from the given fungible
+object's constructor ref.
+This can only be called at object creation time as constructor_ref is only available then.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_generate_transfer_ref">generate_transfer_ref</a>(constructor_ref: &<a href="object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>): <a href="fungible_asset.md#0x1_fungible_asset_TransferRef">fungible_asset::TransferRef</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_generate_transfer_ref">generate_transfer_ref</a>(constructor_ref: &ConstructorRef): <a href="fungible_asset.md#0x1_fungible_asset_TransferRef">TransferRef</a> {
+    <b>let</b> metadata = <a href="object.md#0x1_object_object_from_constructor_ref">object::object_from_constructor_ref</a>&lt;<a href="fungible_asset.md#0x1_fungible_asset_Metadata">Metadata</a>&gt;(constructor_ref);
+    <a href="fungible_asset.md#0x1_fungible_asset_TransferRef">TransferRef</a> { metadata }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_generate_mutate_metadata_ref"></a>
+
+## Function `generate_mutate_metadata_ref`
+
+Creates a mutate metadata ref that can be used to change the metadata information of fungible assets from the
+given fungible object's constructor ref.
+This can only be called at object creation time as constructor_ref is only available then.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_generate_mutate_metadata_ref">generate_mutate_metadata_ref</a>(constructor_ref: &<a href="object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>): <a href="fungible_asset.md#0x1_fungible_asset_MutateMetadataRef">fungible_asset::MutateMetadataRef</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_generate_mutate_metadata_ref">generate_mutate_metadata_ref</a>(constructor_ref: &ConstructorRef): <a href="fungible_asset.md#0x1_fungible_asset_MutateMetadataRef">MutateMetadataRef</a> {
+    <b>let</b> metadata = <a href="object.md#0x1_object_object_from_constructor_ref">object::object_from_constructor_ref</a>&lt;<a href="fungible_asset.md#0x1_fungible_asset_Metadata">Metadata</a>&gt;(constructor_ref);
+    <a href="fungible_asset.md#0x1_fungible_asset_MutateMetadataRef">MutateMetadataRef</a> { metadata }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_supply"></a>
+
+## Function `supply`
+
+Get the current supply from the <code>metadata</code> object.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_supply">supply</a>&lt;T: key&gt;(metadata: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;u128&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_supply">supply</a>&lt;T: key&gt;(metadata: Object&lt;T&gt;): Option&lt;u128&gt; <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_Supply">Supply</a>, <a href="fungible_asset.md#0x1_fungible_asset_ConcurrentSupply">ConcurrentSupply</a> {
+    <b>let</b> metadata_address = <a href="object.md#0x1_object_object_address">object::object_address</a>(&metadata);
+    <b>if</b> (<b>exists</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_ConcurrentSupply">ConcurrentSupply</a>&gt;(metadata_address)) {
+        <b>let</b> supply = <b>borrow_global</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_ConcurrentSupply">ConcurrentSupply</a>&gt;(metadata_address);
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(<a href="aggregator_v2.md#0x1_aggregator_v2_read">aggregator_v2::read</a>(&supply.current))
+    } <b>else</b> <b>if</b> (<b>exists</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_Supply">Supply</a>&gt;(metadata_address)) {
+        <b>let</b> supply = <b>borrow_global</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_Supply">Supply</a>&gt;(metadata_address);
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(supply.current)
+    } <b>else</b> {
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>()
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_maximum"></a>
+
+## Function `maximum`
+
+Get the maximum supply from the <code>metadata</code> object.
+If supply is unlimited (or set explicitly to MAX_U128), none is returned
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_maximum">maximum</a>&lt;T: key&gt;(metadata: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;u128&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_maximum">maximum</a>&lt;T: key&gt;(metadata: Object&lt;T&gt;): Option&lt;u128&gt; <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_Supply">Supply</a>, <a href="fungible_asset.md#0x1_fungible_asset_ConcurrentSupply">ConcurrentSupply</a> {
+    <b>let</b> metadata_address = <a href="object.md#0x1_object_object_address">object::object_address</a>(&metadata);
+    <b>if</b> (<b>exists</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_ConcurrentSupply">ConcurrentSupply</a>&gt;(metadata_address)) {
+        <b>let</b> supply = <b>borrow_global</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_ConcurrentSupply">ConcurrentSupply</a>&gt;(metadata_address);
+        <b>let</b> max_value = <a href="aggregator_v2.md#0x1_aggregator_v2_max_value">aggregator_v2::max_value</a>(&supply.current);
+        <b>if</b> (max_value == <a href="fungible_asset.md#0x1_fungible_asset_MAX_U128">MAX_U128</a>) {
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>()
+        } <b>else</b> {
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(max_value)
+        }
+    } <b>else</b> <b>if</b> (<b>exists</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_Supply">Supply</a>&gt;(metadata_address)) {
+        <b>let</b> supply = <b>borrow_global</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_Supply">Supply</a>&gt;(metadata_address);
+        supply.maximum
+    } <b>else</b> {
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>()
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_name"></a>
+
+## Function `name`
+
+Get the name of the fungible asset from the <code>metadata</code> object.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_name">name</a>&lt;T: key&gt;(metadata: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_name">name</a>&lt;T: key&gt;(metadata: Object&lt;T&gt;): String <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_Metadata">Metadata</a> {
+    <a href="fungible_asset.md#0x1_fungible_asset_borrow_fungible_metadata">borrow_fungible_metadata</a>(&metadata).name
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_symbol"></a>
+
+## Function `symbol`
+
+Get the symbol of the fungible asset from the <code>metadata</code> object.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_symbol">symbol</a>&lt;T: key&gt;(metadata: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_symbol">symbol</a>&lt;T: key&gt;(metadata: Object&lt;T&gt;): String <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_Metadata">Metadata</a> {
+    <a href="fungible_asset.md#0x1_fungible_asset_borrow_fungible_metadata">borrow_fungible_metadata</a>(&metadata).symbol
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_decimals"></a>
+
+## Function `decimals`
+
+Get the decimals from the <code>metadata</code> object.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_decimals">decimals</a>&lt;T: key&gt;(metadata: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): u8
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_decimals">decimals</a>&lt;T: key&gt;(metadata: Object&lt;T&gt;): u8 <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_Metadata">Metadata</a> {
+    <a href="fungible_asset.md#0x1_fungible_asset_borrow_fungible_metadata">borrow_fungible_metadata</a>(&metadata).decimals
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_icon_uri"></a>
+
+## Function `icon_uri`
+
+Get the icon uri from the <code>metadata</code> object.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_icon_uri">icon_uri</a>&lt;T: key&gt;(metadata: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_icon_uri">icon_uri</a>&lt;T: key&gt;(metadata: Object&lt;T&gt;): String <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_Metadata">Metadata</a> {
+    <a href="fungible_asset.md#0x1_fungible_asset_borrow_fungible_metadata">borrow_fungible_metadata</a>(&metadata).icon_uri
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_project_uri"></a>
+
+## Function `project_uri`
+
+Get the project uri from the <code>metadata</code> object.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_project_uri">project_uri</a>&lt;T: key&gt;(metadata: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_project_uri">project_uri</a>&lt;T: key&gt;(metadata: Object&lt;T&gt;): String <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_Metadata">Metadata</a> {
+    <a href="fungible_asset.md#0x1_fungible_asset_borrow_fungible_metadata">borrow_fungible_metadata</a>(&metadata).project_uri
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_metadata"></a>
+
+## Function `metadata`
+
+Get the metadata struct from the <code>metadata</code> object.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_metadata">metadata</a>&lt;T: key&gt;(metadata: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): <a href="fungible_asset.md#0x1_fungible_asset_Metadata">fungible_asset::Metadata</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_metadata">metadata</a>&lt;T: key&gt;(metadata: Object&lt;T&gt;): <a href="fungible_asset.md#0x1_fungible_asset_Metadata">Metadata</a> <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_Metadata">Metadata</a> {
+    *<a href="fungible_asset.md#0x1_fungible_asset_borrow_fungible_metadata">borrow_fungible_metadata</a>(&metadata)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_store_exists"></a>
+
+## Function `store_exists`
+
+Return whether the provided address has a store initialized.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_store_exists">store_exists</a>(store: <b>address</b>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_store_exists">store_exists</a>(store: <b>address</b>): bool {
+    <a href="fungible_asset.md#0x1_fungible_asset_store_exists_inline">store_exists_inline</a>(store)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_store_exists_inline"></a>
+
+## Function `store_exists_inline`
+
+Return whether the provided address has a store initialized.
+
+
+<pre><code><b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_store_exists_inline">store_exists_inline</a>(store: <b>address</b>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_store_exists_inline">store_exists_inline</a>(store: <b>address</b>): bool {
+    <b>exists</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>&gt;(store)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_concurrent_fungible_balance_exists_inline"></a>
+
+## Function `concurrent_fungible_balance_exists_inline`
+
+Return whether the provided address has a concurrent fungible balance initialized,
+at the fungible store address.
+
+
+<pre><code><b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_concurrent_fungible_balance_exists_inline">concurrent_fungible_balance_exists_inline</a>(store: <b>address</b>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_concurrent_fungible_balance_exists_inline">concurrent_fungible_balance_exists_inline</a>(store: <b>address</b>): bool {
+    <b>exists</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_ConcurrentFungibleBalance">ConcurrentFungibleBalance</a>&gt;(store)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_metadata_from_asset"></a>
+
+## Function `metadata_from_asset`
+
+Return the underlying metadata object
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_metadata_from_asset">metadata_from_asset</a>(fa: &<a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">fungible_asset::FungibleAsset</a>): <a href="object.md#0x1_object_Object">object::Object</a>&lt;<a href="fungible_asset.md#0x1_fungible_asset_Metadata">fungible_asset::Metadata</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_metadata_from_asset">metadata_from_asset</a>(fa: &<a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">FungibleAsset</a>): Object&lt;<a href="fungible_asset.md#0x1_fungible_asset_Metadata">Metadata</a>&gt; {
+    fa.metadata
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_store_metadata"></a>
+
+## Function `store_metadata`
+
+Return the underlying metadata object.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_store_metadata">store_metadata</a>&lt;T: key&gt;(store: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): <a href="object.md#0x1_object_Object">object::Object</a>&lt;<a href="fungible_asset.md#0x1_fungible_asset_Metadata">fungible_asset::Metadata</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_store_metadata">store_metadata</a>&lt;T: key&gt;(store: Object&lt;T&gt;): Object&lt;<a href="fungible_asset.md#0x1_fungible_asset_Metadata">Metadata</a>&gt; <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a> {
+    <a href="fungible_asset.md#0x1_fungible_asset_borrow_store_resource">borrow_store_resource</a>(&store).metadata
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_amount"></a>
+
+## Function `amount`
+
+Return the <code>amount</code> of a given fungible asset.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_amount">amount</a>(fa: &<a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">fungible_asset::FungibleAsset</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_amount">amount</a>(fa: &<a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">FungibleAsset</a>): u64 {
+    fa.amount
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_balance"></a>
+
+## Function `balance`
+
+Get the balance of a given store.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_balance">balance</a>&lt;T: key&gt;(store: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_balance">balance</a>&lt;T: key&gt;(store: Object&lt;T&gt;): u64 <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>, <a href="fungible_asset.md#0x1_fungible_asset_ConcurrentFungibleBalance">ConcurrentFungibleBalance</a> {
+    <b>let</b> store_addr = <a href="object.md#0x1_object_object_address">object::object_address</a>(&store);
+    <b>if</b> (<a href="fungible_asset.md#0x1_fungible_asset_store_exists_inline">store_exists_inline</a>(store_addr)) {
+        <b>let</b> store_balance = <a href="fungible_asset.md#0x1_fungible_asset_borrow_store_resource">borrow_store_resource</a>(&store).balance;
+        <b>if</b> (store_balance == 0 && <a href="fungible_asset.md#0x1_fungible_asset_concurrent_fungible_balance_exists_inline">concurrent_fungible_balance_exists_inline</a>(store_addr)) {
+            <b>let</b> balance_resource = <b>borrow_global</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_ConcurrentFungibleBalance">ConcurrentFungibleBalance</a>&gt;(store_addr);
+            <a href="aggregator_v2.md#0x1_aggregator_v2_read">aggregator_v2::read</a>(&balance_resource.balance)
+        } <b>else</b> {
+            store_balance
+        }
+    } <b>else</b> {
+        0
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_is_balance_at_least"></a>
+
+## Function `is_balance_at_least`
+
+Check whether the balance of a given store is >= <code>amount</code>.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_is_balance_at_least">is_balance_at_least</a>&lt;T: key&gt;(store: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, amount: u64): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_is_balance_at_least">is_balance_at_least</a>&lt;T: key&gt;(store: Object&lt;T&gt;, amount: u64): bool <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>, <a href="fungible_asset.md#0x1_fungible_asset_ConcurrentFungibleBalance">ConcurrentFungibleBalance</a> {
+    <b>let</b> store_addr = <a href="object.md#0x1_object_object_address">object::object_address</a>(&store);
+    <a href="fungible_asset.md#0x1_fungible_asset_is_address_balance_at_least">is_address_balance_at_least</a>(store_addr, amount)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_is_address_balance_at_least"></a>
+
+## Function `is_address_balance_at_least`
+
+Check whether the balance of a given store is >= <code>amount</code>.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_is_address_balance_at_least">is_address_balance_at_least</a>(store_addr: <b>address</b>, amount: u64): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_is_address_balance_at_least">is_address_balance_at_least</a>(store_addr: <b>address</b>, amount: u64): bool <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>, <a href="fungible_asset.md#0x1_fungible_asset_ConcurrentFungibleBalance">ConcurrentFungibleBalance</a> {
+    <b>if</b> (<a href="fungible_asset.md#0x1_fungible_asset_store_exists_inline">store_exists_inline</a>(store_addr)) {
+        <b>let</b> store_balance = <b>borrow_global</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>&gt;(store_addr).balance;
+        <b>if</b> (store_balance == 0 && <a href="fungible_asset.md#0x1_fungible_asset_concurrent_fungible_balance_exists_inline">concurrent_fungible_balance_exists_inline</a>(store_addr)) {
+            <b>let</b> balance_resource = <b>borrow_global</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_ConcurrentFungibleBalance">ConcurrentFungibleBalance</a>&gt;(store_addr);
+            <a href="aggregator_v2.md#0x1_aggregator_v2_is_at_least">aggregator_v2::is_at_least</a>(&balance_resource.balance, amount)
+        } <b>else</b> {
+            store_balance &gt;= amount
+        }
+    } <b>else</b> {
+        amount == 0
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_is_frozen"></a>
+
+## Function `is_frozen`
+
+Return whether a store is frozen.
+
+If the store has not been created, we default to returning false so deposits can be sent to it.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_is_frozen">is_frozen</a>&lt;T: key&gt;(store: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_is_frozen">is_frozen</a>&lt;T: key&gt;(store: Object&lt;T&gt;): bool <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a> {
+    <b>let</b> store_addr = <a href="object.md#0x1_object_object_address">object::object_address</a>(&store);
+    <a href="fungible_asset.md#0x1_fungible_asset_store_exists_inline">store_exists_inline</a>(store_addr) && <b>borrow_global</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>&gt;(store_addr).frozen
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_is_store_dispatchable"></a>
+
+## Function `is_store_dispatchable`
+
+Return whether a fungible asset type is dispatchable.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_is_store_dispatchable">is_store_dispatchable</a>&lt;T: key&gt;(store: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_is_store_dispatchable">is_store_dispatchable</a>&lt;T: key&gt;(store: Object&lt;T&gt;): bool <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a> {
+    <b>let</b> fa_store = <a href="fungible_asset.md#0x1_fungible_asset_borrow_store_resource">borrow_store_resource</a>(&store);
+    <b>let</b> metadata_addr = <a href="object.md#0x1_object_object_address">object::object_address</a>(&fa_store.metadata);
+    <b>exists</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_DispatchFunctionStore">DispatchFunctionStore</a>&gt;(metadata_addr)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_deposit_dispatch_function"></a>
+
+## Function `deposit_dispatch_function`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_deposit_dispatch_function">deposit_dispatch_function</a>&lt;T: key&gt;(store: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="function_info.md#0x1_function_info_FunctionInfo">function_info::FunctionInfo</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_deposit_dispatch_function">deposit_dispatch_function</a>&lt;T: key&gt;(store: Object&lt;T&gt;): Option&lt;FunctionInfo&gt; <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>, <a href="fungible_asset.md#0x1_fungible_asset_DispatchFunctionStore">DispatchFunctionStore</a> {
+    <b>let</b> fa_store = <a href="fungible_asset.md#0x1_fungible_asset_borrow_store_resource">borrow_store_resource</a>(&store);
+    <b>let</b> metadata_addr = <a href="object.md#0x1_object_object_address">object::object_address</a>(&fa_store.metadata);
+    <b>if</b>(<b>exists</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_DispatchFunctionStore">DispatchFunctionStore</a>&gt;(metadata_addr)) {
+        <b>borrow_global</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_DispatchFunctionStore">DispatchFunctionStore</a>&gt;(metadata_addr).deposit_function
+    } <b>else</b> {
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>()
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_has_deposit_dispatch_function"></a>
+
+## Function `has_deposit_dispatch_function`
+
+
+
+<pre><code><b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_has_deposit_dispatch_function">has_deposit_dispatch_function</a>(metadata: <a href="object.md#0x1_object_Object">object::Object</a>&lt;<a href="fungible_asset.md#0x1_fungible_asset_Metadata">fungible_asset::Metadata</a>&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_has_deposit_dispatch_function">has_deposit_dispatch_function</a>(metadata: Object&lt;<a href="fungible_asset.md#0x1_fungible_asset_Metadata">Metadata</a>&gt;): bool <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_DispatchFunctionStore">DispatchFunctionStore</a> {
+    <b>let</b> metadata_addr = <a href="object.md#0x1_object_object_address">object::object_address</a>(&metadata);
+    // Short circuit on APT for better perf
+    <b>if</b>(metadata_addr != @aptos_fungible_asset && <b>exists</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_DispatchFunctionStore">DispatchFunctionStore</a>&gt;(metadata_addr)) {
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&<b>borrow_global</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_DispatchFunctionStore">DispatchFunctionStore</a>&gt;(metadata_addr).deposit_function)
+    } <b>else</b> {
+        <b>false</b>
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_withdraw_dispatch_function"></a>
+
+## Function `withdraw_dispatch_function`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_withdraw_dispatch_function">withdraw_dispatch_function</a>&lt;T: key&gt;(store: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="function_info.md#0x1_function_info_FunctionInfo">function_info::FunctionInfo</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_withdraw_dispatch_function">withdraw_dispatch_function</a>&lt;T: key&gt;(store: Object&lt;T&gt;): Option&lt;FunctionInfo&gt; <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>, <a href="fungible_asset.md#0x1_fungible_asset_DispatchFunctionStore">DispatchFunctionStore</a> {
+    <b>let</b> fa_store = <a href="fungible_asset.md#0x1_fungible_asset_borrow_store_resource">borrow_store_resource</a>(&store);
+    <b>let</b> metadata_addr = <a href="object.md#0x1_object_object_address">object::object_address</a>(&fa_store.metadata);
+    <b>if</b>(<b>exists</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_DispatchFunctionStore">DispatchFunctionStore</a>&gt;(metadata_addr)) {
+        <b>borrow_global</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_DispatchFunctionStore">DispatchFunctionStore</a>&gt;(metadata_addr).withdraw_function
+    } <b>else</b> {
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>()
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_has_withdraw_dispatch_function"></a>
+
+## Function `has_withdraw_dispatch_function`
+
+
+
+<pre><code><b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_has_withdraw_dispatch_function">has_withdraw_dispatch_function</a>(metadata: <a href="object.md#0x1_object_Object">object::Object</a>&lt;<a href="fungible_asset.md#0x1_fungible_asset_Metadata">fungible_asset::Metadata</a>&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_has_withdraw_dispatch_function">has_withdraw_dispatch_function</a>(metadata: Object&lt;<a href="fungible_asset.md#0x1_fungible_asset_Metadata">Metadata</a>&gt;): bool <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_DispatchFunctionStore">DispatchFunctionStore</a> {
+    <b>let</b> metadata_addr = <a href="object.md#0x1_object_object_address">object::object_address</a>(&metadata);
+    // Short circuit on APT for better perf
+    <b>if</b> (metadata_addr != @aptos_fungible_asset && <b>exists</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_DispatchFunctionStore">DispatchFunctionStore</a>&gt;(metadata_addr)) {
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&<b>borrow_global</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_DispatchFunctionStore">DispatchFunctionStore</a>&gt;(metadata_addr).withdraw_function)
+    } <b>else</b> {
+        <b>false</b>
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_derived_balance_dispatch_function"></a>
+
+## Function `derived_balance_dispatch_function`
+
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_derived_balance_dispatch_function">derived_balance_dispatch_function</a>&lt;T: key&gt;(store: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="function_info.md#0x1_function_info_FunctionInfo">function_info::FunctionInfo</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_derived_balance_dispatch_function">derived_balance_dispatch_function</a>&lt;T: key&gt;(store: Object&lt;T&gt;): Option&lt;FunctionInfo&gt; <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>, <a href="fungible_asset.md#0x1_fungible_asset_DispatchFunctionStore">DispatchFunctionStore</a> {
+    <b>let</b> fa_store = <a href="fungible_asset.md#0x1_fungible_asset_borrow_store_resource">borrow_store_resource</a>(&store);
+    <b>let</b> metadata_addr = <a href="object.md#0x1_object_object_address">object::object_address</a>(&fa_store.metadata);
+    <b>if</b> (<b>exists</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_DispatchFunctionStore">DispatchFunctionStore</a>&gt;(metadata_addr)) {
+        <b>borrow_global</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_DispatchFunctionStore">DispatchFunctionStore</a>&gt;(metadata_addr).derived_balance_function
+    } <b>else</b> {
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>()
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_derived_supply_dispatch_function"></a>
+
+## Function `derived_supply_dispatch_function`
+
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_derived_supply_dispatch_function">derived_supply_dispatch_function</a>&lt;T: key&gt;(metadata: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="function_info.md#0x1_function_info_FunctionInfo">function_info::FunctionInfo</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_derived_supply_dispatch_function">derived_supply_dispatch_function</a>&lt;T: key&gt;(metadata: Object&lt;T&gt;): Option&lt;FunctionInfo&gt; <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_DeriveSupply">DeriveSupply</a> {
+    <b>let</b> metadata_addr = <a href="object.md#0x1_object_object_address">object::object_address</a>(&metadata);
+    <b>if</b> (<b>exists</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_DeriveSupply">DeriveSupply</a>&gt;(metadata_addr)) {
+        <b>borrow_global</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_DeriveSupply">DeriveSupply</a>&gt;(metadata_addr).dispatch_function
+    } <b>else</b> {
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>()
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_asset_metadata"></a>
+
+## Function `asset_metadata`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_asset_metadata">asset_metadata</a>(fa: &<a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">fungible_asset::FungibleAsset</a>): <a href="object.md#0x1_object_Object">object::Object</a>&lt;<a href="fungible_asset.md#0x1_fungible_asset_Metadata">fungible_asset::Metadata</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_asset_metadata">asset_metadata</a>(fa: &<a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">FungibleAsset</a>): Object&lt;<a href="fungible_asset.md#0x1_fungible_asset_Metadata">Metadata</a>&gt; {
+    fa.metadata
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_mint_ref_metadata"></a>
+
+## Function `mint_ref_metadata`
+
+Get the underlying metadata object from the <code><a href="fungible_asset.md#0x1_fungible_asset_MintRef">MintRef</a></code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_mint_ref_metadata">mint_ref_metadata</a>(ref: &<a href="fungible_asset.md#0x1_fungible_asset_MintRef">fungible_asset::MintRef</a>): <a href="object.md#0x1_object_Object">object::Object</a>&lt;<a href="fungible_asset.md#0x1_fungible_asset_Metadata">fungible_asset::Metadata</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_mint_ref_metadata">mint_ref_metadata</a>(ref: &<a href="fungible_asset.md#0x1_fungible_asset_MintRef">MintRef</a>): Object&lt;<a href="fungible_asset.md#0x1_fungible_asset_Metadata">Metadata</a>&gt; {
+    ref.metadata
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_transfer_ref_metadata"></a>
+
+## Function `transfer_ref_metadata`
+
+Get the underlying metadata object from the <code><a href="fungible_asset.md#0x1_fungible_asset_TransferRef">TransferRef</a></code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_transfer_ref_metadata">transfer_ref_metadata</a>(ref: &<a href="fungible_asset.md#0x1_fungible_asset_TransferRef">fungible_asset::TransferRef</a>): <a href="object.md#0x1_object_Object">object::Object</a>&lt;<a href="fungible_asset.md#0x1_fungible_asset_Metadata">fungible_asset::Metadata</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_transfer_ref_metadata">transfer_ref_metadata</a>(ref: &<a href="fungible_asset.md#0x1_fungible_asset_TransferRef">TransferRef</a>): Object&lt;<a href="fungible_asset.md#0x1_fungible_asset_Metadata">Metadata</a>&gt; {
+    ref.metadata
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_burn_ref_metadata"></a>
+
+## Function `burn_ref_metadata`
+
+Get the underlying metadata object from the <code><a href="fungible_asset.md#0x1_fungible_asset_BurnRef">BurnRef</a></code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_burn_ref_metadata">burn_ref_metadata</a>(ref: &<a href="fungible_asset.md#0x1_fungible_asset_BurnRef">fungible_asset::BurnRef</a>): <a href="object.md#0x1_object_Object">object::Object</a>&lt;<a href="fungible_asset.md#0x1_fungible_asset_Metadata">fungible_asset::Metadata</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_burn_ref_metadata">burn_ref_metadata</a>(ref: &<a href="fungible_asset.md#0x1_fungible_asset_BurnRef">BurnRef</a>): Object&lt;<a href="fungible_asset.md#0x1_fungible_asset_Metadata">Metadata</a>&gt; {
+    ref.metadata
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_object_from_metadata_ref"></a>
+
+## Function `object_from_metadata_ref`
+
+Get the underlying metadata object from the <code><a href="fungible_asset.md#0x1_fungible_asset_MutateMetadataRef">MutateMetadataRef</a></code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_object_from_metadata_ref">object_from_metadata_ref</a>(ref: &<a href="fungible_asset.md#0x1_fungible_asset_MutateMetadataRef">fungible_asset::MutateMetadataRef</a>): <a href="object.md#0x1_object_Object">object::Object</a>&lt;<a href="fungible_asset.md#0x1_fungible_asset_Metadata">fungible_asset::Metadata</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_object_from_metadata_ref">object_from_metadata_ref</a>(ref: &<a href="fungible_asset.md#0x1_fungible_asset_MutateMetadataRef">MutateMetadataRef</a>): Object&lt;<a href="fungible_asset.md#0x1_fungible_asset_Metadata">Metadata</a>&gt; {
+    ref.metadata
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_transfer"></a>
+
+## Function `transfer`
+
+Transfer an <code>amount</code> of fungible asset from <code>from_store</code>, which should be owned by <code>sender</code>, to <code>receiver</code>.
+Note: it does not move the underlying object.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_transfer">transfer</a>&lt;T: key&gt;(sender: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, from: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, <b>to</b>: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, amount: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_transfer">transfer</a>&lt;T: key&gt;(
+    sender: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    from: Object&lt;T&gt;,
+    <b>to</b>: Object&lt;T&gt;,
+    amount: u64,
+) <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>, <a href="fungible_asset.md#0x1_fungible_asset_DispatchFunctionStore">DispatchFunctionStore</a>, <a href="fungible_asset.md#0x1_fungible_asset_ConcurrentFungibleBalance">ConcurrentFungibleBalance</a> {
+    <b>let</b> fa = <a href="fungible_asset.md#0x1_fungible_asset_withdraw">withdraw</a>(sender, from, amount);
+    <a href="fungible_asset.md#0x1_fungible_asset_deposit">deposit</a>(<b>to</b>, fa);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_create_store"></a>
+
+## Function `create_store`
+
+Allow an object to hold a store for fungible assets.
+Applications can use this to create multiple stores for isolating fungible assets for different purposes.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_create_store">create_store</a>&lt;T: key&gt;(constructor_ref: &<a href="object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>, metadata: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): <a href="object.md#0x1_object_Object">object::Object</a>&lt;<a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">fungible_asset::FungibleStore</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_create_store">create_store</a>&lt;T: key&gt;(
+    constructor_ref: &ConstructorRef,
+    metadata: Object&lt;T&gt;,
+): Object&lt;<a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>&gt; {
+    <b>let</b> store_obj = &<a href="object.md#0x1_object_generate_signer">object::generate_signer</a>(constructor_ref);
+    <b>move_to</b>(store_obj, <a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a> {
+        metadata: <a href="object.md#0x1_object_convert">object::convert</a>(metadata),
+        balance: 0,
+        frozen: <b>false</b>,
+    });
+
+    <b>if</b> (<a href="fungible_asset.md#0x1_fungible_asset_is_untransferable">is_untransferable</a>(metadata)) {
+        <a href="object.md#0x1_object_set_untransferable">object::set_untransferable</a>(constructor_ref);
+    };
+
+    <b>if</b> (<a href="fungible_asset.md#0x1_fungible_asset_default_to_concurrent_fungible_balance">default_to_concurrent_fungible_balance</a>()) {
+        <b>move_to</b>(store_obj, <a href="fungible_asset.md#0x1_fungible_asset_ConcurrentFungibleBalance">ConcurrentFungibleBalance</a> {
+            balance: <a href="aggregator_v2.md#0x1_aggregator_v2_create_unbounded_aggregator">aggregator_v2::create_unbounded_aggregator</a>(),
+        });
+    };
+
+    <a href="object.md#0x1_object_object_from_constructor_ref">object::object_from_constructor_ref</a>&lt;<a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>&gt;(constructor_ref)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_remove_store"></a>
+
+## Function `remove_store`
+
+Used to delete a store.  Requires the store to be completely empty prior to removing it
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_remove_store">remove_store</a>(delete_ref: &<a href="object.md#0x1_object_DeleteRef">object::DeleteRef</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_remove_store">remove_store</a>(delete_ref: &DeleteRef) <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>, <a href="fungible_asset.md#0x1_fungible_asset_FungibleAssetEvents">FungibleAssetEvents</a>, <a href="fungible_asset.md#0x1_fungible_asset_ConcurrentFungibleBalance">ConcurrentFungibleBalance</a> {
+    <b>let</b> store = &<a href="object.md#0x1_object_object_from_delete_ref">object::object_from_delete_ref</a>&lt;<a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>&gt;(delete_ref);
+    <b>let</b> addr = <a href="object.md#0x1_object_object_address">object::object_address</a>(store);
+    <b>let</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a> { metadata: _, balance, frozen: _ }
+        = <b>move_from</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>&gt;(addr);
+    <b>assert</b>!(balance == 0, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="fungible_asset.md#0x1_fungible_asset_EBALANCE_IS_NOT_ZERO">EBALANCE_IS_NOT_ZERO</a>));
+
+    <b>if</b> (<a href="fungible_asset.md#0x1_fungible_asset_concurrent_fungible_balance_exists_inline">concurrent_fungible_balance_exists_inline</a>(addr)) {
+        <b>let</b> <a href="fungible_asset.md#0x1_fungible_asset_ConcurrentFungibleBalance">ConcurrentFungibleBalance</a> { balance } = <b>move_from</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_ConcurrentFungibleBalance">ConcurrentFungibleBalance</a>&gt;(addr);
+        <b>assert</b>!(<a href="aggregator_v2.md#0x1_aggregator_v2_read">aggregator_v2::read</a>(&balance) == 0, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="fungible_asset.md#0x1_fungible_asset_EBALANCE_IS_NOT_ZERO">EBALANCE_IS_NOT_ZERO</a>));
+    };
+
+    // Cleanup deprecated <a href="event.md#0x1_event">event</a> handles <b>if</b> exist.
+    <b>if</b> (<b>exists</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_FungibleAssetEvents">FungibleAssetEvents</a>&gt;(addr)) {
+        <b>let</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleAssetEvents">FungibleAssetEvents</a> {
+            deposit_events,
+            withdraw_events,
+            frozen_events,
+        } = <b>move_from</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_FungibleAssetEvents">FungibleAssetEvents</a>&gt;(addr);
+        <a href="event.md#0x1_event_destroy_handle">event::destroy_handle</a>(deposit_events);
+        <a href="event.md#0x1_event_destroy_handle">event::destroy_handle</a>(withdraw_events);
+        <a href="event.md#0x1_event_destroy_handle">event::destroy_handle</a>(frozen_events);
+    };
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_withdraw"></a>
+
+## Function `withdraw`
+
+Withdraw <code>amount</code> of the fungible asset from <code>store</code> by the owner.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_withdraw">withdraw</a>&lt;T: key&gt;(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, store: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, amount: u64): <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">fungible_asset::FungibleAsset</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_withdraw">withdraw</a>&lt;T: key&gt;(
+    owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    store: Object&lt;T&gt;,
+    amount: u64,
+): <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">FungibleAsset</a> <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>, <a href="fungible_asset.md#0x1_fungible_asset_DispatchFunctionStore">DispatchFunctionStore</a>, <a href="fungible_asset.md#0x1_fungible_asset_ConcurrentFungibleBalance">ConcurrentFungibleBalance</a> {
+    <a href="fungible_asset.md#0x1_fungible_asset_withdraw_sanity_check">withdraw_sanity_check</a>(owner, store, <b>true</b>);
+    <a href="fungible_asset.md#0x1_fungible_asset_withdraw_internal">withdraw_internal</a>(<a href="object.md#0x1_object_object_address">object::object_address</a>(&store), amount)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_withdraw_sanity_check"></a>
+
+## Function `withdraw_sanity_check`
+
+Check the permission for withdraw operation.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_withdraw_sanity_check">withdraw_sanity_check</a>&lt;T: key&gt;(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, store: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, abort_on_dispatch: bool)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_withdraw_sanity_check">withdraw_sanity_check</a>&lt;T: key&gt;(
+    owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    store: Object&lt;T&gt;,
+    abort_on_dispatch: bool,
+) <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>, <a href="fungible_asset.md#0x1_fungible_asset_DispatchFunctionStore">DispatchFunctionStore</a> {
+    <b>assert</b>!(<a href="object.md#0x1_object_owns">object::owns</a>(store, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(owner)), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="fungible_asset.md#0x1_fungible_asset_ENOT_STORE_OWNER">ENOT_STORE_OWNER</a>));
+    <b>let</b> fa_store = <a href="fungible_asset.md#0x1_fungible_asset_borrow_store_resource">borrow_store_resource</a>(&store);
+    <b>assert</b>!(
+        !abort_on_dispatch || !<a href="fungible_asset.md#0x1_fungible_asset_has_withdraw_dispatch_function">has_withdraw_dispatch_function</a>(fa_store.metadata),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="fungible_asset.md#0x1_fungible_asset_EINVALID_DISPATCHABLE_OPERATIONS">EINVALID_DISPATCHABLE_OPERATIONS</a>)
+    );
+    <b>assert</b>!(!fa_store.frozen, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="fungible_asset.md#0x1_fungible_asset_ESTORE_IS_FROZEN">ESTORE_IS_FROZEN</a>));
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_deposit_sanity_check"></a>
+
+## Function `deposit_sanity_check`
+
+Deposit <code>amount</code> of the fungible asset to <code>store</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_deposit_sanity_check">deposit_sanity_check</a>&lt;T: key&gt;(store: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, abort_on_dispatch: bool)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_deposit_sanity_check">deposit_sanity_check</a>&lt;T: key&gt;(
+    store: Object&lt;T&gt;,
+    abort_on_dispatch: bool
+) <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>, <a href="fungible_asset.md#0x1_fungible_asset_DispatchFunctionStore">DispatchFunctionStore</a> {
+    <b>let</b> fa_store = <a href="fungible_asset.md#0x1_fungible_asset_borrow_store_resource">borrow_store_resource</a>(&store);
+    <b>assert</b>!(
+        !abort_on_dispatch || !<a href="fungible_asset.md#0x1_fungible_asset_has_deposit_dispatch_function">has_deposit_dispatch_function</a>(fa_store.metadata),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="fungible_asset.md#0x1_fungible_asset_EINVALID_DISPATCHABLE_OPERATIONS">EINVALID_DISPATCHABLE_OPERATIONS</a>)
+    );
+    <b>assert</b>!(!fa_store.frozen, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="fungible_asset.md#0x1_fungible_asset_ESTORE_IS_FROZEN">ESTORE_IS_FROZEN</a>));
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_deposit"></a>
+
+## Function `deposit`
+
+Deposit <code>amount</code> of the fungible asset to <code>store</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_deposit">deposit</a>&lt;T: key&gt;(store: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, fa: <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">fungible_asset::FungibleAsset</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_deposit">deposit</a>&lt;T: key&gt;(store: Object&lt;T&gt;, fa: <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">FungibleAsset</a>) <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>, <a href="fungible_asset.md#0x1_fungible_asset_DispatchFunctionStore">DispatchFunctionStore</a>, <a href="fungible_asset.md#0x1_fungible_asset_ConcurrentFungibleBalance">ConcurrentFungibleBalance</a> {
+    <a href="fungible_asset.md#0x1_fungible_asset_deposit_sanity_check">deposit_sanity_check</a>(store, <b>true</b>);
+    <a href="fungible_asset.md#0x1_fungible_asset_deposit_internal">deposit_internal</a>(<a href="object.md#0x1_object_object_address">object::object_address</a>(&store), fa);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_mint"></a>
+
+## Function `mint`
+
+Mint the specified <code>amount</code> of the fungible asset.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_mint">mint</a>(ref: &<a href="fungible_asset.md#0x1_fungible_asset_MintRef">fungible_asset::MintRef</a>, amount: u64): <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">fungible_asset::FungibleAsset</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_mint">mint</a>(ref: &<a href="fungible_asset.md#0x1_fungible_asset_MintRef">MintRef</a>, amount: u64): <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">FungibleAsset</a> <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_Supply">Supply</a>, <a href="fungible_asset.md#0x1_fungible_asset_ConcurrentSupply">ConcurrentSupply</a> {
+    <b>let</b> metadata = ref.metadata;
+    <a href="fungible_asset.md#0x1_fungible_asset_mint_internal">mint_internal</a>(metadata, amount)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_mint_internal"></a>
+
+## Function `mint_internal`
+
+CAN ONLY BE CALLED BY coin.move for migration.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_mint_internal">mint_internal</a>(metadata: <a href="object.md#0x1_object_Object">object::Object</a>&lt;<a href="fungible_asset.md#0x1_fungible_asset_Metadata">fungible_asset::Metadata</a>&gt;, amount: u64): <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">fungible_asset::FungibleAsset</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_mint_internal">mint_internal</a>(
+    metadata: Object&lt;<a href="fungible_asset.md#0x1_fungible_asset_Metadata">Metadata</a>&gt;,
+    amount: u64
+): <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">FungibleAsset</a> <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_Supply">Supply</a>, <a href="fungible_asset.md#0x1_fungible_asset_ConcurrentSupply">ConcurrentSupply</a> {
+    <a href="fungible_asset.md#0x1_fungible_asset_increase_supply">increase_supply</a>(&metadata, amount);
+    <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">FungibleAsset</a> {
+        metadata,
+        amount
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_mint_to"></a>
+
+## Function `mint_to`
+
+Mint the specified <code>amount</code> of the fungible asset to a destination store.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_mint_to">mint_to</a>&lt;T: key&gt;(ref: &<a href="fungible_asset.md#0x1_fungible_asset_MintRef">fungible_asset::MintRef</a>, store: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, amount: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_mint_to">mint_to</a>&lt;T: key&gt;(ref: &<a href="fungible_asset.md#0x1_fungible_asset_MintRef">MintRef</a>, store: Object&lt;T&gt;, amount: u64)
+<b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>, <a href="fungible_asset.md#0x1_fungible_asset_Supply">Supply</a>, <a href="fungible_asset.md#0x1_fungible_asset_ConcurrentSupply">ConcurrentSupply</a>, <a href="fungible_asset.md#0x1_fungible_asset_DispatchFunctionStore">DispatchFunctionStore</a>, <a href="fungible_asset.md#0x1_fungible_asset_ConcurrentFungibleBalance">ConcurrentFungibleBalance</a> {
+    <a href="fungible_asset.md#0x1_fungible_asset_deposit_sanity_check">deposit_sanity_check</a>(store, <b>false</b>);
+    <a href="fungible_asset.md#0x1_fungible_asset_deposit_internal">deposit_internal</a>(<a href="object.md#0x1_object_object_address">object::object_address</a>(&store), <a href="fungible_asset.md#0x1_fungible_asset_mint">mint</a>(ref, amount));
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_set_frozen_flag"></a>
+
+## Function `set_frozen_flag`
+
+Enable/disable a store's ability to do direct transfers of the fungible asset.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_set_frozen_flag">set_frozen_flag</a>&lt;T: key&gt;(ref: &<a href="fungible_asset.md#0x1_fungible_asset_TransferRef">fungible_asset::TransferRef</a>, store: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, frozen: bool)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_set_frozen_flag">set_frozen_flag</a>&lt;T: key&gt;(
+    ref: &<a href="fungible_asset.md#0x1_fungible_asset_TransferRef">TransferRef</a>,
+    store: Object&lt;T&gt;,
+    frozen: bool,
+) <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a> {
+    <b>assert</b>!(
+        ref.metadata == <a href="fungible_asset.md#0x1_fungible_asset_store_metadata">store_metadata</a>(store),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="fungible_asset.md#0x1_fungible_asset_ETRANSFER_REF_AND_STORE_MISMATCH">ETRANSFER_REF_AND_STORE_MISMATCH</a>),
+    );
+    <a href="fungible_asset.md#0x1_fungible_asset_set_frozen_flag_internal">set_frozen_flag_internal</a>(store, frozen)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_set_frozen_flag_internal"></a>
+
+## Function `set_frozen_flag_internal`
+
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_set_frozen_flag_internal">set_frozen_flag_internal</a>&lt;T: key&gt;(store: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, frozen: bool)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_set_frozen_flag_internal">set_frozen_flag_internal</a>&lt;T: key&gt;(
+    store: Object&lt;T&gt;,
+    frozen: bool
+) <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a> {
+    <b>let</b> store_addr = <a href="object.md#0x1_object_object_address">object::object_address</a>(&store);
+    <b>borrow_global_mut</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>&gt;(store_addr).frozen = frozen;
+
+    <a href="event.md#0x1_event_emit">event::emit</a>(<a href="fungible_asset.md#0x1_fungible_asset_Frozen">Frozen</a> { store: store_addr, frozen });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_burn"></a>
+
+## Function `burn`
+
+Burns a fungible asset
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_burn">burn</a>(ref: &<a href="fungible_asset.md#0x1_fungible_asset_BurnRef">fungible_asset::BurnRef</a>, fa: <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">fungible_asset::FungibleAsset</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_burn">burn</a>(ref: &<a href="fungible_asset.md#0x1_fungible_asset_BurnRef">BurnRef</a>, fa: <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">FungibleAsset</a>) <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_Supply">Supply</a>, <a href="fungible_asset.md#0x1_fungible_asset_ConcurrentSupply">ConcurrentSupply</a> {
+    <b>assert</b>!(
+        ref.metadata == <a href="fungible_asset.md#0x1_fungible_asset_metadata_from_asset">metadata_from_asset</a>(&fa),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="fungible_asset.md#0x1_fungible_asset_EBURN_REF_AND_FUNGIBLE_ASSET_MISMATCH">EBURN_REF_AND_FUNGIBLE_ASSET_MISMATCH</a>)
+    );
+    <a href="fungible_asset.md#0x1_fungible_asset_burn_internal">burn_internal</a>(fa);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_burn_internal"></a>
+
+## Function `burn_internal`
+
+CAN ONLY BE CALLED BY coin.move for migration.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_burn_internal">burn_internal</a>(fa: <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">fungible_asset::FungibleAsset</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_burn_internal">burn_internal</a>(
+    fa: <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">FungibleAsset</a>
+): u64 <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_Supply">Supply</a>, <a href="fungible_asset.md#0x1_fungible_asset_ConcurrentSupply">ConcurrentSupply</a> {
+    <b>let</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">FungibleAsset</a> {
+        metadata,
+        amount
+    } = fa;
+    <a href="fungible_asset.md#0x1_fungible_asset_decrease_supply">decrease_supply</a>(&metadata, amount);
+    amount
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_burn_from"></a>
+
+## Function `burn_from`
+
+Burn the <code>amount</code> of the fungible asset from the given store.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_burn_from">burn_from</a>&lt;T: key&gt;(ref: &<a href="fungible_asset.md#0x1_fungible_asset_BurnRef">fungible_asset::BurnRef</a>, store: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, amount: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_burn_from">burn_from</a>&lt;T: key&gt;(
+    ref: &<a href="fungible_asset.md#0x1_fungible_asset_BurnRef">BurnRef</a>,
+    store: Object&lt;T&gt;,
+    amount: u64
+) <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>, <a href="fungible_asset.md#0x1_fungible_asset_Supply">Supply</a>, <a href="fungible_asset.md#0x1_fungible_asset_ConcurrentSupply">ConcurrentSupply</a>, <a href="fungible_asset.md#0x1_fungible_asset_ConcurrentFungibleBalance">ConcurrentFungibleBalance</a> {
+    // ref metadata match is checked in <a href="fungible_asset.md#0x1_fungible_asset_burn">burn</a>() call
+    <a href="fungible_asset.md#0x1_fungible_asset_burn">burn</a>(ref, <a href="fungible_asset.md#0x1_fungible_asset_withdraw_internal">withdraw_internal</a>(<a href="object.md#0x1_object_object_address">object::object_address</a>(&store), amount));
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_address_burn_from"></a>
+
+## Function `address_burn_from`
+
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_address_burn_from">address_burn_from</a>(ref: &<a href="fungible_asset.md#0x1_fungible_asset_BurnRef">fungible_asset::BurnRef</a>, store_addr: <b>address</b>, amount: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_address_burn_from">address_burn_from</a>(
+    ref: &<a href="fungible_asset.md#0x1_fungible_asset_BurnRef">BurnRef</a>,
+    store_addr: <b>address</b>,
+    amount: u64
+) <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>, <a href="fungible_asset.md#0x1_fungible_asset_Supply">Supply</a>, <a href="fungible_asset.md#0x1_fungible_asset_ConcurrentSupply">ConcurrentSupply</a>, <a href="fungible_asset.md#0x1_fungible_asset_ConcurrentFungibleBalance">ConcurrentFungibleBalance</a> {
+    // ref metadata match is checked in <a href="fungible_asset.md#0x1_fungible_asset_burn">burn</a>() call
+    <a href="fungible_asset.md#0x1_fungible_asset_burn">burn</a>(ref, <a href="fungible_asset.md#0x1_fungible_asset_withdraw_internal">withdraw_internal</a>(store_addr, amount));
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_withdraw_with_ref"></a>
+
+## Function `withdraw_with_ref`
+
+Withdraw <code>amount</code> of the fungible asset from the <code>store</code> ignoring <code>frozen</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_withdraw_with_ref">withdraw_with_ref</a>&lt;T: key&gt;(ref: &<a href="fungible_asset.md#0x1_fungible_asset_TransferRef">fungible_asset::TransferRef</a>, store: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, amount: u64): <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">fungible_asset::FungibleAsset</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_withdraw_with_ref">withdraw_with_ref</a>&lt;T: key&gt;(
+    ref: &<a href="fungible_asset.md#0x1_fungible_asset_TransferRef">TransferRef</a>,
+    store: Object&lt;T&gt;,
+    amount: u64
+): <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">FungibleAsset</a> <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>, <a href="fungible_asset.md#0x1_fungible_asset_ConcurrentFungibleBalance">ConcurrentFungibleBalance</a> {
+    <b>assert</b>!(
+        ref.metadata == <a href="fungible_asset.md#0x1_fungible_asset_store_metadata">store_metadata</a>(store),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="fungible_asset.md#0x1_fungible_asset_ETRANSFER_REF_AND_STORE_MISMATCH">ETRANSFER_REF_AND_STORE_MISMATCH</a>),
+    );
+    <a href="fungible_asset.md#0x1_fungible_asset_withdraw_internal">withdraw_internal</a>(<a href="object.md#0x1_object_object_address">object::object_address</a>(&store), amount)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_deposit_with_ref"></a>
+
+## Function `deposit_with_ref`
+
+Deposit the fungible asset into the <code>store</code> ignoring <code>frozen</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_deposit_with_ref">deposit_with_ref</a>&lt;T: key&gt;(ref: &<a href="fungible_asset.md#0x1_fungible_asset_TransferRef">fungible_asset::TransferRef</a>, store: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, fa: <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">fungible_asset::FungibleAsset</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_deposit_with_ref">deposit_with_ref</a>&lt;T: key&gt;(
+    ref: &<a href="fungible_asset.md#0x1_fungible_asset_TransferRef">TransferRef</a>,
+    store: Object&lt;T&gt;,
+    fa: <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">FungibleAsset</a>
+) <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>, <a href="fungible_asset.md#0x1_fungible_asset_ConcurrentFungibleBalance">ConcurrentFungibleBalance</a> {
+    <b>assert</b>!(
+        ref.metadata == fa.metadata,
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="fungible_asset.md#0x1_fungible_asset_ETRANSFER_REF_AND_FUNGIBLE_ASSET_MISMATCH">ETRANSFER_REF_AND_FUNGIBLE_ASSET_MISMATCH</a>)
+    );
+    <a href="fungible_asset.md#0x1_fungible_asset_deposit_internal">deposit_internal</a>(<a href="object.md#0x1_object_object_address">object::object_address</a>(&store), fa);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_transfer_with_ref"></a>
+
+## Function `transfer_with_ref`
+
+Transfer <code>amount</code> of the fungible asset with <code><a href="fungible_asset.md#0x1_fungible_asset_TransferRef">TransferRef</a></code> even it is frozen.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_transfer_with_ref">transfer_with_ref</a>&lt;T: key&gt;(transfer_ref: &<a href="fungible_asset.md#0x1_fungible_asset_TransferRef">fungible_asset::TransferRef</a>, from: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, <b>to</b>: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, amount: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_transfer_with_ref">transfer_with_ref</a>&lt;T: key&gt;(
+    transfer_ref: &<a href="fungible_asset.md#0x1_fungible_asset_TransferRef">TransferRef</a>,
+    from: Object&lt;T&gt;,
+    <b>to</b>: Object&lt;T&gt;,
+    amount: u64,
+) <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>, <a href="fungible_asset.md#0x1_fungible_asset_ConcurrentFungibleBalance">ConcurrentFungibleBalance</a> {
+    <b>let</b> fa = <a href="fungible_asset.md#0x1_fungible_asset_withdraw_with_ref">withdraw_with_ref</a>(transfer_ref, from, amount);
+    <a href="fungible_asset.md#0x1_fungible_asset_deposit_with_ref">deposit_with_ref</a>(transfer_ref, <b>to</b>, fa);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_mutate_metadata"></a>
+
+## Function `mutate_metadata`
+
+Mutate specified fields of the fungible asset's <code><a href="fungible_asset.md#0x1_fungible_asset_Metadata">Metadata</a></code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_mutate_metadata">mutate_metadata</a>(metadata_ref: &<a href="fungible_asset.md#0x1_fungible_asset_MutateMetadataRef">fungible_asset::MutateMetadataRef</a>, name: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;, symbol: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;, decimals: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;u8&gt;, icon_uri: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;, project_uri: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_mutate_metadata">mutate_metadata</a>(
+    metadata_ref: &<a href="fungible_asset.md#0x1_fungible_asset_MutateMetadataRef">MutateMetadataRef</a>,
+    name: Option&lt;String&gt;,
+    symbol: Option&lt;String&gt;,
+    decimals: Option&lt;u8&gt;,
+    icon_uri: Option&lt;String&gt;,
+    project_uri: Option&lt;String&gt;,
+) <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_Metadata">Metadata</a> {
+    <b>let</b> metadata_address = <a href="object.md#0x1_object_object_address">object::object_address</a>(&metadata_ref.metadata);
+    <b>let</b> mutable_metadata = <b>borrow_global_mut</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_Metadata">Metadata</a>&gt;(metadata_address);
+
+    <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&name)){
+        mutable_metadata.name = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_extract">option::extract</a>(&<b>mut</b> name);
+    };
+    <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&symbol)){
+        mutable_metadata.symbol = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_extract">option::extract</a>(&<b>mut</b> symbol);
+    };
+    <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&decimals)){
+        mutable_metadata.decimals = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_extract">option::extract</a>(&<b>mut</b> decimals);
+    };
+    <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&icon_uri)){
+        mutable_metadata.icon_uri = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_extract">option::extract</a>(&<b>mut</b> icon_uri);
+    };
+    <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&project_uri)){
+        mutable_metadata.project_uri = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_extract">option::extract</a>(&<b>mut</b> project_uri);
+    };
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_zero"></a>
+
+## Function `zero`
+
+Create a fungible asset with zero amount.
+This can be useful when starting a series of computations where the initial value is 0.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_zero">zero</a>&lt;T: key&gt;(metadata: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">fungible_asset::FungibleAsset</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_zero">zero</a>&lt;T: key&gt;(metadata: Object&lt;T&gt;): <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">FungibleAsset</a> {
+    <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">FungibleAsset</a> {
+        metadata: <a href="object.md#0x1_object_convert">object::convert</a>(metadata),
+        amount: 0,
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_extract"></a>
+
+## Function `extract`
+
+Extract a given amount from the given fungible asset and return a new one.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_extract">extract</a>(<a href="fungible_asset.md#0x1_fungible_asset">fungible_asset</a>: &<b>mut</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">fungible_asset::FungibleAsset</a>, amount: u64): <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">fungible_asset::FungibleAsset</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_extract">extract</a>(<a href="fungible_asset.md#0x1_fungible_asset">fungible_asset</a>: &<b>mut</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">FungibleAsset</a>, amount: u64): <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">FungibleAsset</a> {
+    <b>assert</b>!(<a href="fungible_asset.md#0x1_fungible_asset">fungible_asset</a>.amount &gt;= amount, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="fungible_asset.md#0x1_fungible_asset_EINSUFFICIENT_BALANCE">EINSUFFICIENT_BALANCE</a>));
+    <a href="fungible_asset.md#0x1_fungible_asset">fungible_asset</a>.amount = <a href="fungible_asset.md#0x1_fungible_asset">fungible_asset</a>.amount - amount;
+    <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">FungibleAsset</a> {
+        metadata: <a href="fungible_asset.md#0x1_fungible_asset">fungible_asset</a>.metadata,
+        amount,
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_merge"></a>
+
+## Function `merge`
+
+"Merges" the two given fungible assets. The fungible asset passed in as <code>dst_fungible_asset</code> will have a value
+equal to the sum of the two (<code>dst_fungible_asset</code> and <code>src_fungible_asset</code>).
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_merge">merge</a>(dst_fungible_asset: &<b>mut</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">fungible_asset::FungibleAsset</a>, src_fungible_asset: <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">fungible_asset::FungibleAsset</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_merge">merge</a>(dst_fungible_asset: &<b>mut</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">FungibleAsset</a>, src_fungible_asset: <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">FungibleAsset</a>) {
+    <b>let</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">FungibleAsset</a> { metadata, amount } = src_fungible_asset;
+    <b>assert</b>!(metadata == dst_fungible_asset.metadata, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="fungible_asset.md#0x1_fungible_asset_EFUNGIBLE_ASSET_MISMATCH">EFUNGIBLE_ASSET_MISMATCH</a>));
+    dst_fungible_asset.amount = dst_fungible_asset.amount + amount;
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_destroy_zero"></a>
+
+## Function `destroy_zero`
+
+Destroy an empty fungible asset.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_destroy_zero">destroy_zero</a>(<a href="fungible_asset.md#0x1_fungible_asset">fungible_asset</a>: <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">fungible_asset::FungibleAsset</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_destroy_zero">destroy_zero</a>(<a href="fungible_asset.md#0x1_fungible_asset">fungible_asset</a>: <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">FungibleAsset</a>) {
+    <b>let</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">FungibleAsset</a> { amount, metadata: _ } = <a href="fungible_asset.md#0x1_fungible_asset">fungible_asset</a>;
+    <b>assert</b>!(amount == 0, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="fungible_asset.md#0x1_fungible_asset_EAMOUNT_IS_NOT_ZERO">EAMOUNT_IS_NOT_ZERO</a>));
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_deposit_internal"></a>
+
+## Function `deposit_internal`
+
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_deposit_internal">deposit_internal</a>(store_addr: <b>address</b>, fa: <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">fungible_asset::FungibleAsset</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_deposit_internal">deposit_internal</a>(store_addr: <b>address</b>, fa: <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">FungibleAsset</a>) <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>, <a href="fungible_asset.md#0x1_fungible_asset_ConcurrentFungibleBalance">ConcurrentFungibleBalance</a> {
+    <b>let</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">FungibleAsset</a> { metadata, amount } = fa;
+    <b>assert</b>!(<b>exists</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>&gt;(store_addr), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="fungible_asset.md#0x1_fungible_asset_EFUNGIBLE_STORE_EXISTENCE">EFUNGIBLE_STORE_EXISTENCE</a>));
+    <b>let</b> store = <b>borrow_global_mut</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>&gt;(store_addr);
+    <b>assert</b>!(metadata == store.metadata, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="fungible_asset.md#0x1_fungible_asset_EFUNGIBLE_ASSET_AND_STORE_MISMATCH">EFUNGIBLE_ASSET_AND_STORE_MISMATCH</a>));
+
+    <b>if</b> (amount == 0) <b>return</b>;
+
+    <b>if</b> (store.balance == 0 && <a href="fungible_asset.md#0x1_fungible_asset_concurrent_fungible_balance_exists_inline">concurrent_fungible_balance_exists_inline</a>(store_addr)) {
+        <b>let</b> balance_resource = <b>borrow_global_mut</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_ConcurrentFungibleBalance">ConcurrentFungibleBalance</a>&gt;(store_addr);
+        <a href="aggregator_v2.md#0x1_aggregator_v2_add">aggregator_v2::add</a>(&<b>mut</b> balance_resource.balance, amount);
+    } <b>else</b> {
+        store.balance = store.balance + amount;
+    };
+
+    <a href="event.md#0x1_event_emit">event::emit</a>(<a href="fungible_asset.md#0x1_fungible_asset_Deposit">Deposit</a> { store: store_addr, amount });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_withdraw_internal"></a>
+
+## Function `withdraw_internal`
+
+Extract <code>amount</code> of the fungible asset from <code>store</code>.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_withdraw_internal">withdraw_internal</a>(store_addr: <b>address</b>, amount: u64): <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">fungible_asset::FungibleAsset</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_withdraw_internal">withdraw_internal</a>(
+    store_addr: <b>address</b>,
+    amount: u64,
+): <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">FungibleAsset</a> <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>, <a href="fungible_asset.md#0x1_fungible_asset_ConcurrentFungibleBalance">ConcurrentFungibleBalance</a> {
+    <b>assert</b>!(<b>exists</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>&gt;(store_addr), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="fungible_asset.md#0x1_fungible_asset_EFUNGIBLE_STORE_EXISTENCE">EFUNGIBLE_STORE_EXISTENCE</a>));
+
+    <b>let</b> store = <b>borrow_global_mut</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>&gt;(store_addr);
+    <b>let</b> metadata = store.metadata;
+    <b>if</b> (amount != 0) {
+        <b>if</b> (store.balance == 0 && <a href="fungible_asset.md#0x1_fungible_asset_concurrent_fungible_balance_exists_inline">concurrent_fungible_balance_exists_inline</a>(store_addr)) {
+            <b>let</b> balance_resource = <b>borrow_global_mut</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_ConcurrentFungibleBalance">ConcurrentFungibleBalance</a>&gt;(store_addr);
+            <b>assert</b>!(
+                <a href="aggregator_v2.md#0x1_aggregator_v2_try_sub">aggregator_v2::try_sub</a>(&<b>mut</b> balance_resource.balance, amount),
+                <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="fungible_asset.md#0x1_fungible_asset_EINSUFFICIENT_BALANCE">EINSUFFICIENT_BALANCE</a>)
+            );
+        } <b>else</b> {
+            <b>assert</b>!(store.balance &gt;= amount, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="fungible_asset.md#0x1_fungible_asset_EINSUFFICIENT_BALANCE">EINSUFFICIENT_BALANCE</a>));
+            store.balance = store.balance - amount;
+        };
+
+        <a href="event.md#0x1_event_emit">event::emit</a>&lt;<a href="fungible_asset.md#0x1_fungible_asset_Withdraw">Withdraw</a>&gt;(<a href="fungible_asset.md#0x1_fungible_asset_Withdraw">Withdraw</a> { store: store_addr, amount });
+    };
+    <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">FungibleAsset</a> { metadata, amount }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_increase_supply"></a>
+
+## Function `increase_supply`
+
+Increase the supply of a fungible asset by minting.
+
+
+<pre><code><b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_increase_supply">increase_supply</a>&lt;T: key&gt;(metadata: &<a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, amount: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_increase_supply">increase_supply</a>&lt;T: key&gt;(metadata: &Object&lt;T&gt;, amount: u64) <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_Supply">Supply</a>, <a href="fungible_asset.md#0x1_fungible_asset_ConcurrentSupply">ConcurrentSupply</a> {
+    <b>if</b> (amount == 0) {
+        <b>return</b>
+    };
+    <b>let</b> metadata_address = <a href="object.md#0x1_object_object_address">object::object_address</a>(metadata);
+
+    <b>if</b> (<b>exists</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_ConcurrentSupply">ConcurrentSupply</a>&gt;(metadata_address)) {
+        <b>let</b> supply = <b>borrow_global_mut</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_ConcurrentSupply">ConcurrentSupply</a>&gt;(metadata_address);
+        <b>assert</b>!(
+            <a href="aggregator_v2.md#0x1_aggregator_v2_try_add">aggregator_v2::try_add</a>(&<b>mut</b> supply.current, (amount <b>as</b> u128)),
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_out_of_range">error::out_of_range</a>(<a href="fungible_asset.md#0x1_fungible_asset_EMAX_SUPPLY_EXCEEDED">EMAX_SUPPLY_EXCEEDED</a>)
+        );
+    } <b>else</b> <b>if</b> (<b>exists</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_Supply">Supply</a>&gt;(metadata_address)) {
+        <b>let</b> supply = <b>borrow_global_mut</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_Supply">Supply</a>&gt;(metadata_address);
+        <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&supply.maximum)) {
+            <b>let</b> max = *<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow_mut">option::borrow_mut</a>(&<b>mut</b> supply.maximum);
+            <b>assert</b>!(
+                max - supply.current &gt;= (amount <b>as</b> u128),
+                <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_out_of_range">error::out_of_range</a>(<a href="fungible_asset.md#0x1_fungible_asset_EMAX_SUPPLY_EXCEEDED">EMAX_SUPPLY_EXCEEDED</a>)
+            )
+        };
+        supply.current = supply.current + (amount <b>as</b> u128);
+    } <b>else</b> {
+        <b>abort</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="fungible_asset.md#0x1_fungible_asset_ESUPPLY_NOT_FOUND">ESUPPLY_NOT_FOUND</a>)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_decrease_supply"></a>
+
+## Function `decrease_supply`
+
+Decrease the supply of a fungible asset by burning.
+
+
+<pre><code><b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_decrease_supply">decrease_supply</a>&lt;T: key&gt;(metadata: &<a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, amount: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_decrease_supply">decrease_supply</a>&lt;T: key&gt;(metadata: &Object&lt;T&gt;, amount: u64) <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_Supply">Supply</a>, <a href="fungible_asset.md#0x1_fungible_asset_ConcurrentSupply">ConcurrentSupply</a> {
+    <b>if</b> (amount == 0) {
+        <b>return</b>
+    };
+    <b>let</b> metadata_address = <a href="object.md#0x1_object_object_address">object::object_address</a>(metadata);
+
+    <b>if</b> (<b>exists</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_ConcurrentSupply">ConcurrentSupply</a>&gt;(metadata_address)) {
+        <b>let</b> supply = <b>borrow_global_mut</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_ConcurrentSupply">ConcurrentSupply</a>&gt;(metadata_address);
+
+        <b>assert</b>!(
+            <a href="aggregator_v2.md#0x1_aggregator_v2_try_sub">aggregator_v2::try_sub</a>(&<b>mut</b> supply.current, (amount <b>as</b> u128)),
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_out_of_range">error::out_of_range</a>(<a href="fungible_asset.md#0x1_fungible_asset_ESUPPLY_UNDERFLOW">ESUPPLY_UNDERFLOW</a>)
+        );
+    } <b>else</b> <b>if</b> (<b>exists</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_Supply">Supply</a>&gt;(metadata_address)) {
+        <b>assert</b>!(<b>exists</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_Supply">Supply</a>&gt;(metadata_address), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="fungible_asset.md#0x1_fungible_asset_ESUPPLY_NOT_FOUND">ESUPPLY_NOT_FOUND</a>));
+        <b>let</b> supply = <b>borrow_global_mut</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_Supply">Supply</a>&gt;(metadata_address);
+        <b>assert</b>!(
+            supply.current &gt;= (amount <b>as</b> u128),
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="fungible_asset.md#0x1_fungible_asset_ESUPPLY_UNDERFLOW">ESUPPLY_UNDERFLOW</a>)
+        );
+        supply.current = supply.current - (amount <b>as</b> u128);
+    } <b>else</b> {
+        <b>assert</b>!(<b>false</b>, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="fungible_asset.md#0x1_fungible_asset_ESUPPLY_NOT_FOUND">ESUPPLY_NOT_FOUND</a>));
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_borrow_fungible_metadata"></a>
+
+## Function `borrow_fungible_metadata`
+
+
+
+<pre><code><b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_borrow_fungible_metadata">borrow_fungible_metadata</a>&lt;T: key&gt;(metadata: &<a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): &<a href="fungible_asset.md#0x1_fungible_asset_Metadata">fungible_asset::Metadata</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_borrow_fungible_metadata">borrow_fungible_metadata</a>&lt;T: key&gt;(
+    metadata: &Object&lt;T&gt;
+): &<a href="fungible_asset.md#0x1_fungible_asset_Metadata">Metadata</a> <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_Metadata">Metadata</a> {
+    <b>let</b> addr = <a href="object.md#0x1_object_object_address">object::object_address</a>(metadata);
+    <b>borrow_global</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_Metadata">Metadata</a>&gt;(addr)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_borrow_fungible_metadata_mut"></a>
+
+## Function `borrow_fungible_metadata_mut`
+
+
+
+<pre><code><b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_borrow_fungible_metadata_mut">borrow_fungible_metadata_mut</a>&lt;T: key&gt;(metadata: &<a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): &<b>mut</b> <a href="fungible_asset.md#0x1_fungible_asset_Metadata">fungible_asset::Metadata</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_borrow_fungible_metadata_mut">borrow_fungible_metadata_mut</a>&lt;T: key&gt;(
+    metadata: &Object&lt;T&gt;
+): &<b>mut</b> <a href="fungible_asset.md#0x1_fungible_asset_Metadata">Metadata</a> <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_Metadata">Metadata</a> {
+    <b>let</b> addr = <a href="object.md#0x1_object_object_address">object::object_address</a>(metadata);
+    <b>borrow_global_mut</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_Metadata">Metadata</a>&gt;(addr)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_borrow_store_resource"></a>
+
+## Function `borrow_store_resource`
+
+
+
+<pre><code><b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_borrow_store_resource">borrow_store_resource</a>&lt;T: key&gt;(store: &<a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): &<a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">fungible_asset::FungibleStore</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_borrow_store_resource">borrow_store_resource</a>&lt;T: key&gt;(store: &Object&lt;T&gt;): &<a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a> <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a> {
+    <b>let</b> store_addr = <a href="object.md#0x1_object_object_address">object::object_address</a>(store);
+    <b>assert</b>!(<b>exists</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>&gt;(store_addr), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="fungible_asset.md#0x1_fungible_asset_EFUNGIBLE_STORE_EXISTENCE">EFUNGIBLE_STORE_EXISTENCE</a>));
+    <b>borrow_global</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>&gt;(store_addr)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_upgrade_to_concurrent"></a>
+
+## Function `upgrade_to_concurrent`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_upgrade_to_concurrent">upgrade_to_concurrent</a>(ref: &<a href="object.md#0x1_object_ExtendRef">object::ExtendRef</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_upgrade_to_concurrent">upgrade_to_concurrent</a>(
+    ref: &ExtendRef,
+) <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_Supply">Supply</a> {
+    <b>let</b> metadata_object_address = <a href="object.md#0x1_object_address_from_extend_ref">object::address_from_extend_ref</a>(ref);
+    <b>let</b> metadata_object_signer = <a href="object.md#0x1_object_generate_signer_for_extending">object::generate_signer_for_extending</a>(ref);
+    <b>assert</b>!(
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_concurrent_fungible_assets_enabled">features::concurrent_fungible_assets_enabled</a>(),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="fungible_asset.md#0x1_fungible_asset_ECONCURRENT_SUPPLY_NOT_ENABLED">ECONCURRENT_SUPPLY_NOT_ENABLED</a>)
+    );
+    <b>assert</b>!(<b>exists</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_Supply">Supply</a>&gt;(metadata_object_address), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="fungible_asset.md#0x1_fungible_asset_ESUPPLY_NOT_FOUND">ESUPPLY_NOT_FOUND</a>));
+    <b>let</b> <a href="fungible_asset.md#0x1_fungible_asset_Supply">Supply</a> {
+        current,
+        maximum,
+    } = <b>move_from</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_Supply">Supply</a>&gt;(metadata_object_address);
+
+    <b>let</b> unlimited = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_none">option::is_none</a>(&maximum);
+    <b>let</b> supply = <a href="fungible_asset.md#0x1_fungible_asset_ConcurrentSupply">ConcurrentSupply</a> {
+        current: <b>if</b> (unlimited) {
+            <a href="aggregator_v2.md#0x1_aggregator_v2_create_unbounded_aggregator_with_value">aggregator_v2::create_unbounded_aggregator_with_value</a>(current)
+        }
+        <b>else</b> {
+            <a href="aggregator_v2.md#0x1_aggregator_v2_create_aggregator_with_value">aggregator_v2::create_aggregator_with_value</a>(current, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_extract">option::extract</a>(&<b>mut</b> maximum))
+        },
+    };
+    <b>move_to</b>(&metadata_object_signer, supply);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_upgrade_store_to_concurrent"></a>
+
+## Function `upgrade_store_to_concurrent`
+
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_upgrade_store_to_concurrent">upgrade_store_to_concurrent</a>&lt;T: key&gt;(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, store: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_upgrade_store_to_concurrent">upgrade_store_to_concurrent</a>&lt;T: key&gt;(
+    owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    store: Object&lt;T&gt;,
+) <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a> {
+    <b>assert</b>!(<a href="object.md#0x1_object_owns">object::owns</a>(store, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(owner)), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="fungible_asset.md#0x1_fungible_asset_ENOT_STORE_OWNER">ENOT_STORE_OWNER</a>));
+    <b>assert</b>!(!<a href="fungible_asset.md#0x1_fungible_asset_is_frozen">is_frozen</a>(store), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="fungible_asset.md#0x1_fungible_asset_ESTORE_IS_FROZEN">ESTORE_IS_FROZEN</a>));
+    <b>assert</b>!(<a href="fungible_asset.md#0x1_fungible_asset_allow_upgrade_to_concurrent_fungible_balance">allow_upgrade_to_concurrent_fungible_balance</a>(), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="fungible_asset.md#0x1_fungible_asset_ECONCURRENT_BALANCE_NOT_ENABLED">ECONCURRENT_BALANCE_NOT_ENABLED</a>));
+    <a href="fungible_asset.md#0x1_fungible_asset_ensure_store_upgraded_to_concurrent_internal">ensure_store_upgraded_to_concurrent_internal</a>(<a href="object.md#0x1_object_object_address">object::object_address</a>(&store));
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fungible_asset_ensure_store_upgraded_to_concurrent_internal"></a>
+
+## Function `ensure_store_upgraded_to_concurrent_internal`
+
+Ensure a known <code><a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a></code> has <code><a href="fungible_asset.md#0x1_fungible_asset_ConcurrentFungibleBalance">ConcurrentFungibleBalance</a></code>.
+
+
+<pre><code><b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_ensure_store_upgraded_to_concurrent_internal">ensure_store_upgraded_to_concurrent_internal</a>(fungible_store_address: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="fungible_asset.md#0x1_fungible_asset_ensure_store_upgraded_to_concurrent_internal">ensure_store_upgraded_to_concurrent_internal</a>(
+    fungible_store_address: <b>address</b>,
+) <b>acquires</b> <a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a> {
+    <b>if</b> (<b>exists</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_ConcurrentFungibleBalance">ConcurrentFungibleBalance</a>&gt;(fungible_store_address)) {
+        <b>return</b>
+    };
+    <b>let</b> store = <b>borrow_global_mut</b>&lt;<a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">FungibleStore</a>&gt;(fungible_store_address);
+    <b>let</b> balance = <a href="aggregator_v2.md#0x1_aggregator_v2_create_unbounded_aggregator_with_value">aggregator_v2::create_unbounded_aggregator_with_value</a>(store.balance);
+    store.balance = 0;
+    <b>let</b> object_signer = <a href="create_signer.md#0x1_create_signer_create_signer">create_signer::create_signer</a>(fungible_store_address);
+    <b>move_to</b>(&object_signer, <a href="fungible_asset.md#0x1_fungible_asset_ConcurrentFungibleBalance">ConcurrentFungibleBalance</a> { balance });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+
+
+<a id="high-level-req"></a>
+
+### High-level Requirements
+
+<table>
+<tr>
+<th>No.</th><th>Requirement</th><th>Criticality</th><th>Implementation</th><th>Enforcement</th>
+</tr>
+
+<tr>
+<td>1</td>
+<td>The metadata associated with the fungible asset is subject to precise size constraints.</td>
+<td>Medium</td>
+<td>The add_fungibility function has size limitations for the name, symbol, number of decimals, icon_uri, and project_uri field of the Metadata resource.</td>
+<td>This has been audited.</td>
+</tr>
+
+<tr>
+<td>2</td>
+<td>Adding fungibility to an existing object should initialize the metadata and supply resources and store them under the metadata object address.</td>
+<td>Low</td>
+<td>The add_fungibility function initializes the Metadata and Supply resources and moves them under the metadata object.</td>
+<td>Audited that the Metadata and Supply resources are initialized properly.</td>
+</tr>
+
+<tr>
+<td>3</td>
+<td>Generating mint, burn and transfer references can only be done at object creation time and if the object was added fungibility.</td>
+<td>Low</td>
+<td>The following functions generate the related references of the Metadata object: 1. generate_mint_ref 2. generate_burn_ref 3. generate_transfer_ref</td>
+<td>Audited that the Metadata object exists within the constructor ref.</td>
+</tr>
+
+<tr>
+<td>4</td>
+<td>Only the owner of a store should be allowed to withdraw fungible assets from it.</td>
+<td>High</td>
+<td>The fungible_asset::withdraw function ensures that the signer owns the store by asserting that the object address matches the address of the signer.</td>
+<td>Audited that the address of the signer owns the object.</td>
+</tr>
+
+<tr>
+<td>5</td>
+<td>The transfer, withdrawal and deposit operation should never change the current supply of the fungible asset.</td>
+<td>High</td>
+<td>The transfer function withdraws the fungible assets from the store and deposits them to the receiver. The withdraw function extracts the fungible asset from the fungible asset store. The deposit function adds the balance to the fungible asset store.</td>
+<td>Audited that the supply before and after the operation remains constant.</td>
+</tr>
+
+<tr>
+<td>6</td>
+<td>The owner of the store should only be able to withdraw a certain amount if its store has sufficient balance and is not frozen, unless the withdrawal is performed with a reference, and afterwards the store balance should be decreased.</td>
+<td>High</td>
+<td>The withdraw function ensures that the store is not frozen before calling withdraw_internal which ensures that the withdrawing amount is greater than 0 and less than the total balance from the store. The withdraw_with_ref ensures that the reference's metadata matches the store metadata.</td>
+<td>Audited that it aborts if the withdrawing store is frozen. Audited that it aborts if the store doesn't have sufficient balance. Audited that the balance of the withdrawing store is reduced by amount.</td>
+</tr>
+
+<tr>
+<td>7</td>
+<td>Only the same type of fungible assets should be deposited in a fungible asset store, if the store is not frozen, unless the deposit is performed with a reference, and afterwards the store balance should be increased.</td>
+<td>High</td>
+<td>The deposit function ensures that store is not frozen and proceeds to call the deposit_internal function which validates the store's metadata and the depositing asset's metadata followed by increasing the store balance by the given amount. The deposit_with_ref ensures that the reference's metadata matches the depositing asset's metadata.</td>
+<td>Audited that it aborts if the store is frozen. Audited that it aborts if the asset and asset store are different. Audited that the store's balance is increased by the deposited amount.</td>
+</tr>
+
+<tr>
+<td>8</td>
+<td>An object should only be allowed to hold one store for fungible assets.</td>
+<td>Medium</td>
+<td>The create_store function initializes a new FungibleStore resource and moves it under the object address.</td>
+<td>Audited that the resource was moved under the object.</td>
+</tr>
+
+<tr>
+<td>9</td>
+<td>When a new store is created, the balance should be set by default to the value zero.</td>
+<td>High</td>
+<td>The create_store function initializes a new fungible asset store with zero balance and stores it under the given construtorRef object.</td>
+<td>Audited that the store is properly initialized with zero balance.</td>
+</tr>
+
+<tr>
+<td>10</td>
+<td>A store should only be deleted if its balance is zero.</td>
+<td>Medium</td>
+<td>The remove_store function validates the store's balance and removes the store under the object address.</td>
+<td>Audited that aborts if the balance of the store is not zero. Audited that store is removed from the object address.</td>
+</tr>
+
+<tr>
+<td>11</td>
+<td>Minting and burning should alter the total supply value, and the store balances.</td>
+<td>High</td>
+<td>The mint process increases the total supply by the amount minted using the increase_supply function. The burn process withdraws the burn amount from the given store and decreases the total supply by the amount burned using the decrease_supply function.</td>
+<td>Audited the mint and burn functions that the supply was adjusted accordingly.</td>
+</tr>
+
+<tr>
+<td>12</td>
+<td>It must not be possible to burn an amount of fungible assets larger than their current supply.</td>
+<td>High</td>
+<td>The burn process ensures that the store has enough balance to burn, by asserting that the supply.current >= amount inside the decrease_supply function.</td>
+<td>Audited that it aborts if the provided store doesn't have sufficient balance.</td>
+</tr>
+
+<tr>
+<td>13</td>
+<td>Enabling or disabling store's frozen status should only be done with a valid transfer reference.</td>
+<td>High</td>
+<td>The set_frozen_flag function ensures that the TransferRef is provided via function argument and that the store's metadata matches the metadata from the reference. It then proceeds to update the frozen flag of the store.</td>
+<td>Audited that it aborts if the metadata doesn't match. Audited that the frozen flag is updated properly.</td>
+</tr>
+
+<tr>
+<td>14</td>
+<td>Extracting a specific amount from the fungible asset should be possible only if the total amount that it holds is greater or equal to the provided amount.</td>
+<td>High</td>
+<td>The extract function validates that the fungible asset has enough balance to extract and then updates it by subtracting the extracted amount.</td>
+<td>Audited that it aborts if the asset didn't have sufficient balance. Audited that the balance of the asset is updated. Audited that the extract function returns the extracted asset.</td>
+</tr>
+
+<tr>
+<td>15</td>
+<td>Merging two fungible assets should only be possible if both share the same metadata.</td>
+<td>Medium</td>
+<td>The merge function validates the metadata of the src and dst asset.</td>
+<td>Audited that it aborts if the metadata of the src and dst are not the same.</td>
+</tr>
+
+<tr>
+<td>16</td>
+<td>Post merging two fungible assets, the source asset should have the amount value equal to the sum of the two.</td>
+<td>High</td>
+<td>The merge function increases dst_fungible_asset.amount by src_fungible_asset.amount.</td>
+<td>Audited that the dst_fungible_asset balance is increased by amount.</td>
+</tr>
+
+<tr>
+<td>17</td>
+<td>Fungible assets with zero balance should be destroyed when the amount reaches value 0.</td>
+<td>Medium</td>
+<td>The destroy_zero ensures that the balance of the asset has the value 0 and destroy the asset.</td>
+<td>Audited that it aborts if the balance of the asset is non zero.</td>
+</tr>
+
+</table>
+
+
+
+
+<a id="module-level-spec"></a>
+
+### Module-level Specification
+
+
+<pre><code><b>pragma</b> verify=<b>false</b>;
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/gas_schedule.md b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/gas_schedule.md
new file mode 100644
index 0000000000000..5ff6876819e9e
--- /dev/null
+++ b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/gas_schedule.md
@@ -0,0 +1,658 @@
+
+<a id="0x1_gas_schedule"></a>
+
+# Module `0x1::gas_schedule`
+
+This module defines structs and methods to initialize the gas schedule, which dictates how much
+it costs to execute Move on the network.
+
+
+-  [Struct `GasEntry`](#0x1_gas_schedule_GasEntry)
+-  [Resource `GasSchedule`](#0x1_gas_schedule_GasSchedule)
+-  [Resource `GasScheduleV2`](#0x1_gas_schedule_GasScheduleV2)
+-  [Constants](#@Constants_0)
+-  [Function `initialize`](#0x1_gas_schedule_initialize)
+-  [Function `set_gas_schedule`](#0x1_gas_schedule_set_gas_schedule)
+-  [Function `set_for_next_epoch`](#0x1_gas_schedule_set_for_next_epoch)
+-  [Function `set_for_next_epoch_check_hash`](#0x1_gas_schedule_set_for_next_epoch_check_hash)
+-  [Function `on_new_epoch`](#0x1_gas_schedule_on_new_epoch)
+-  [Function `set_storage_gas_config`](#0x1_gas_schedule_set_storage_gas_config)
+-  [Function `set_storage_gas_config_for_next_epoch`](#0x1_gas_schedule_set_storage_gas_config_for_next_epoch)
+-  [Specification](#@Specification_1)
+    -  [High-level Requirements](#high-level-req)
+    -  [Module-level Specification](#module-level-spec)
+    -  [Function `initialize`](#@Specification_1_initialize)
+    -  [Function `set_gas_schedule`](#@Specification_1_set_gas_schedule)
+    -  [Function `set_for_next_epoch`](#@Specification_1_set_for_next_epoch)
+    -  [Function `set_for_next_epoch_check_hash`](#@Specification_1_set_for_next_epoch_check_hash)
+    -  [Function `on_new_epoch`](#@Specification_1_on_new_epoch)
+    -  [Function `set_storage_gas_config`](#@Specification_1_set_storage_gas_config)
+    -  [Function `set_storage_gas_config_for_next_epoch`](#@Specification_1_set_storage_gas_config_for_next_epoch)
+
+
+<pre><code><b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/hash.md#0x1_aptos_hash">0x1::aptos_hash</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs">0x1::bcs</a>;
+<b>use</b> <a href="chain_status.md#0x1_chain_status">0x1::chain_status</a>;
+<b>use</b> <a href="config_buffer.md#0x1_config_buffer">0x1::config_buffer</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="reconfiguration.md#0x1_reconfiguration">0x1::reconfiguration</a>;
+<b>use</b> <a href="storage_gas.md#0x1_storage_gas">0x1::storage_gas</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string">0x1::string</a>;
+<b>use</b> <a href="system_addresses.md#0x1_system_addresses">0x1::system_addresses</a>;
+<b>use</b> <a href="util.md#0x1_util">0x1::util</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">0x1::vector</a>;
+</code></pre>
+
+
+
+<a id="0x1_gas_schedule_GasEntry"></a>
+
+## Struct `GasEntry`
+
+
+
+<pre><code><b>struct</b> <a href="gas_schedule.md#0x1_gas_schedule_GasEntry">GasEntry</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>key: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>val: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_gas_schedule_GasSchedule"></a>
+
+## Resource `GasSchedule`
+
+
+
+<pre><code><b>struct</b> <a href="gas_schedule.md#0x1_gas_schedule_GasSchedule">GasSchedule</a> <b>has</b> <b>copy</b>, drop, key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>entries: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="gas_schedule.md#0x1_gas_schedule_GasEntry">gas_schedule::GasEntry</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_gas_schedule_GasScheduleV2"></a>
+
+## Resource `GasScheduleV2`
+
+
+
+<pre><code><b>struct</b> <a href="gas_schedule.md#0x1_gas_schedule_GasScheduleV2">GasScheduleV2</a> <b>has</b> <b>copy</b>, drop, store, key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>feature_version: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>entries: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="gas_schedule.md#0x1_gas_schedule_GasEntry">gas_schedule::GasEntry</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_gas_schedule_EINVALID_GAS_FEATURE_VERSION"></a>
+
+
+
+<pre><code><b>const</b> <a href="gas_schedule.md#0x1_gas_schedule_EINVALID_GAS_FEATURE_VERSION">EINVALID_GAS_FEATURE_VERSION</a>: u64 = 2;
+</code></pre>
+
+
+
+<a id="0x1_gas_schedule_EINVALID_GAS_SCHEDULE"></a>
+
+The provided gas schedule bytes are empty or invalid
+
+
+<pre><code><b>const</b> <a href="gas_schedule.md#0x1_gas_schedule_EINVALID_GAS_SCHEDULE">EINVALID_GAS_SCHEDULE</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_gas_schedule_EINVALID_GAS_SCHEDULE_HASH"></a>
+
+
+
+<pre><code><b>const</b> <a href="gas_schedule.md#0x1_gas_schedule_EINVALID_GAS_SCHEDULE_HASH">EINVALID_GAS_SCHEDULE_HASH</a>: u64 = 3;
+</code></pre>
+
+
+
+<a id="0x1_gas_schedule_initialize"></a>
+
+## Function `initialize`
+
+Only called during genesis.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="gas_schedule.md#0x1_gas_schedule_initialize">initialize</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, gas_schedule_blob: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="gas_schedule.md#0x1_gas_schedule_initialize">initialize</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, gas_schedule_blob: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;) {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(aptos_framework);
+    <b>assert</b>!(!<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_is_empty">vector::is_empty</a>(&gas_schedule_blob), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="gas_schedule.md#0x1_gas_schedule_EINVALID_GAS_SCHEDULE">EINVALID_GAS_SCHEDULE</a>));
+
+    // TODO(Gas): check <b>if</b> gas schedule is consistent
+    <b>let</b> <a href="gas_schedule.md#0x1_gas_schedule">gas_schedule</a>: <a href="gas_schedule.md#0x1_gas_schedule_GasScheduleV2">GasScheduleV2</a> = from_bytes(gas_schedule_blob);
+    <b>move_to</b>&lt;<a href="gas_schedule.md#0x1_gas_schedule_GasScheduleV2">GasScheduleV2</a>&gt;(aptos_framework, <a href="gas_schedule.md#0x1_gas_schedule">gas_schedule</a>);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_gas_schedule_set_gas_schedule"></a>
+
+## Function `set_gas_schedule`
+
+Deprecated by <code><a href="gas_schedule.md#0x1_gas_schedule_set_for_next_epoch">set_for_next_epoch</a>()</code>.
+
+WARNING: calling this while randomness is enabled will trigger a new epoch without randomness!
+
+TODO: update all the tests that reference this function, then disable this function.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="gas_schedule.md#0x1_gas_schedule_set_gas_schedule">set_gas_schedule</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, gas_schedule_blob: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="gas_schedule.md#0x1_gas_schedule_set_gas_schedule">set_gas_schedule</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, gas_schedule_blob: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;) <b>acquires</b> <a href="gas_schedule.md#0x1_gas_schedule_GasSchedule">GasSchedule</a>, <a href="gas_schedule.md#0x1_gas_schedule_GasScheduleV2">GasScheduleV2</a> {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(aptos_framework);
+    <b>assert</b>!(!<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_is_empty">vector::is_empty</a>(&gas_schedule_blob), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="gas_schedule.md#0x1_gas_schedule_EINVALID_GAS_SCHEDULE">EINVALID_GAS_SCHEDULE</a>));
+    <a href="chain_status.md#0x1_chain_status_assert_genesis">chain_status::assert_genesis</a>();
+
+    <b>if</b> (<b>exists</b>&lt;<a href="gas_schedule.md#0x1_gas_schedule_GasScheduleV2">GasScheduleV2</a>&gt;(@aptos_framework)) {
+        <b>let</b> <a href="gas_schedule.md#0x1_gas_schedule">gas_schedule</a> = <b>borrow_global_mut</b>&lt;<a href="gas_schedule.md#0x1_gas_schedule_GasScheduleV2">GasScheduleV2</a>&gt;(@aptos_framework);
+        <b>let</b> new_gas_schedule: <a href="gas_schedule.md#0x1_gas_schedule_GasScheduleV2">GasScheduleV2</a> = from_bytes(gas_schedule_blob);
+        <b>assert</b>!(new_gas_schedule.feature_version &gt;= <a href="gas_schedule.md#0x1_gas_schedule">gas_schedule</a>.feature_version,
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="gas_schedule.md#0x1_gas_schedule_EINVALID_GAS_FEATURE_VERSION">EINVALID_GAS_FEATURE_VERSION</a>));
+        // TODO(Gas): check <b>if</b> gas schedule is consistent
+        *<a href="gas_schedule.md#0x1_gas_schedule">gas_schedule</a> = new_gas_schedule;
+    }
+    <b>else</b> {
+        <b>if</b> (<b>exists</b>&lt;<a href="gas_schedule.md#0x1_gas_schedule_GasSchedule">GasSchedule</a>&gt;(@aptos_framework)) {
+            _ = <b>move_from</b>&lt;<a href="gas_schedule.md#0x1_gas_schedule_GasSchedule">GasSchedule</a>&gt;(@aptos_framework);
+        };
+        <b>let</b> new_gas_schedule: <a href="gas_schedule.md#0x1_gas_schedule_GasScheduleV2">GasScheduleV2</a> = from_bytes(gas_schedule_blob);
+        // TODO(Gas): check <b>if</b> gas schedule is consistent
+        <b>move_to</b>&lt;<a href="gas_schedule.md#0x1_gas_schedule_GasScheduleV2">GasScheduleV2</a>&gt;(aptos_framework, new_gas_schedule);
+    };
+
+    // Need <b>to</b> trigger <a href="reconfiguration.md#0x1_reconfiguration">reconfiguration</a> so validator nodes can sync on the updated gas schedule.
+    <a href="reconfiguration.md#0x1_reconfiguration_reconfigure">reconfiguration::reconfigure</a>();
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_gas_schedule_set_for_next_epoch"></a>
+
+## Function `set_for_next_epoch`
+
+Set the gas schedule for the next epoch, typically called by on-chain governance.
+Abort if the version of the given schedule is lower than the current version.
+
+Example usage:
+```
+aptos_framework::gas_schedule::set_for_next_epoch(&framework_signer, some_gas_schedule_blob);
+aptos_framework::aptos_governance::reconfigure(&framework_signer);
+```
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="gas_schedule.md#0x1_gas_schedule_set_for_next_epoch">set_for_next_epoch</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, gas_schedule_blob: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="gas_schedule.md#0x1_gas_schedule_set_for_next_epoch">set_for_next_epoch</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, gas_schedule_blob: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;) <b>acquires</b> <a href="gas_schedule.md#0x1_gas_schedule_GasScheduleV2">GasScheduleV2</a> {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(aptos_framework);
+    <b>assert</b>!(!<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_is_empty">vector::is_empty</a>(&gas_schedule_blob), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="gas_schedule.md#0x1_gas_schedule_EINVALID_GAS_SCHEDULE">EINVALID_GAS_SCHEDULE</a>));
+    <b>let</b> new_gas_schedule: <a href="gas_schedule.md#0x1_gas_schedule_GasScheduleV2">GasScheduleV2</a> = from_bytes(gas_schedule_blob);
+    <b>if</b> (<b>exists</b>&lt;<a href="gas_schedule.md#0x1_gas_schedule_GasScheduleV2">GasScheduleV2</a>&gt;(@aptos_framework)) {
+        <b>let</b> cur_gas_schedule = <b>borrow_global</b>&lt;<a href="gas_schedule.md#0x1_gas_schedule_GasScheduleV2">GasScheduleV2</a>&gt;(@aptos_framework);
+        <b>assert</b>!(
+            new_gas_schedule.feature_version &gt;= cur_gas_schedule.feature_version,
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="gas_schedule.md#0x1_gas_schedule_EINVALID_GAS_FEATURE_VERSION">EINVALID_GAS_FEATURE_VERSION</a>)
+        );
+    };
+    <a href="config_buffer.md#0x1_config_buffer_upsert">config_buffer::upsert</a>(new_gas_schedule);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_gas_schedule_set_for_next_epoch_check_hash"></a>
+
+## Function `set_for_next_epoch_check_hash`
+
+Set the gas schedule for the next epoch, typically called by on-chain governance.
+Abort if the version of the given schedule is lower than the current version.
+Require a hash of the old gas schedule to be provided and will abort if the hashes mismatch.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="gas_schedule.md#0x1_gas_schedule_set_for_next_epoch_check_hash">set_for_next_epoch_check_hash</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, old_gas_schedule_hash: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, new_gas_schedule_blob: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="gas_schedule.md#0x1_gas_schedule_set_for_next_epoch_check_hash">set_for_next_epoch_check_hash</a>(
+    aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    old_gas_schedule_hash: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    new_gas_schedule_blob: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+) <b>acquires</b> <a href="gas_schedule.md#0x1_gas_schedule_GasScheduleV2">GasScheduleV2</a> {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(aptos_framework);
+    <b>assert</b>!(!<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_is_empty">vector::is_empty</a>(&new_gas_schedule_blob), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="gas_schedule.md#0x1_gas_schedule_EINVALID_GAS_SCHEDULE">EINVALID_GAS_SCHEDULE</a>));
+
+    <b>let</b> new_gas_schedule: <a href="gas_schedule.md#0x1_gas_schedule_GasScheduleV2">GasScheduleV2</a> = from_bytes(new_gas_schedule_blob);
+    <b>if</b> (<b>exists</b>&lt;<a href="gas_schedule.md#0x1_gas_schedule_GasScheduleV2">GasScheduleV2</a>&gt;(@aptos_framework)) {
+        <b>let</b> cur_gas_schedule = <b>borrow_global</b>&lt;<a href="gas_schedule.md#0x1_gas_schedule_GasScheduleV2">GasScheduleV2</a>&gt;(@aptos_framework);
+        <b>assert</b>!(
+            new_gas_schedule.feature_version &gt;= cur_gas_schedule.feature_version,
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="gas_schedule.md#0x1_gas_schedule_EINVALID_GAS_FEATURE_VERSION">EINVALID_GAS_FEATURE_VERSION</a>)
+        );
+        <b>let</b> cur_gas_schedule_bytes = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs_to_bytes">bcs::to_bytes</a>(cur_gas_schedule);
+        <b>let</b> cur_gas_schedule_hash = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/hash.md#0x1_aptos_hash_sha3_512">aptos_hash::sha3_512</a>(cur_gas_schedule_bytes);
+        <b>assert</b>!(
+            cur_gas_schedule_hash == old_gas_schedule_hash,
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="gas_schedule.md#0x1_gas_schedule_EINVALID_GAS_SCHEDULE_HASH">EINVALID_GAS_SCHEDULE_HASH</a>)
+        );
+    };
+
+    <a href="config_buffer.md#0x1_config_buffer_upsert">config_buffer::upsert</a>(new_gas_schedule);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_gas_schedule_on_new_epoch"></a>
+
+## Function `on_new_epoch`
+
+Only used in reconfigurations to apply the pending <code><a href="gas_schedule.md#0x1_gas_schedule_GasScheduleV2">GasScheduleV2</a></code>, if there is any.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="gas_schedule.md#0x1_gas_schedule_on_new_epoch">on_new_epoch</a>(framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="gas_schedule.md#0x1_gas_schedule_on_new_epoch">on_new_epoch</a>(framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>) <b>acquires</b> <a href="gas_schedule.md#0x1_gas_schedule_GasScheduleV2">GasScheduleV2</a> {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(framework);
+    <b>if</b> (<a href="config_buffer.md#0x1_config_buffer_does_exist">config_buffer::does_exist</a>&lt;<a href="gas_schedule.md#0x1_gas_schedule_GasScheduleV2">GasScheduleV2</a>&gt;()) {
+        <b>let</b> new_gas_schedule = <a href="config_buffer.md#0x1_config_buffer_extract">config_buffer::extract</a>&lt;<a href="gas_schedule.md#0x1_gas_schedule_GasScheduleV2">GasScheduleV2</a>&gt;();
+        <b>if</b> (<b>exists</b>&lt;<a href="gas_schedule.md#0x1_gas_schedule_GasScheduleV2">GasScheduleV2</a>&gt;(@aptos_framework)) {
+            *<b>borrow_global_mut</b>&lt;<a href="gas_schedule.md#0x1_gas_schedule_GasScheduleV2">GasScheduleV2</a>&gt;(@aptos_framework) = new_gas_schedule;
+        } <b>else</b> {
+            <b>move_to</b>(framework, new_gas_schedule);
+        }
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_gas_schedule_set_storage_gas_config"></a>
+
+## Function `set_storage_gas_config`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="gas_schedule.md#0x1_gas_schedule_set_storage_gas_config">set_storage_gas_config</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, config: <a href="storage_gas.md#0x1_storage_gas_StorageGasConfig">storage_gas::StorageGasConfig</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="gas_schedule.md#0x1_gas_schedule_set_storage_gas_config">set_storage_gas_config</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, config: StorageGasConfig) {
+    <a href="storage_gas.md#0x1_storage_gas_set_config">storage_gas::set_config</a>(aptos_framework, config);
+    // Need <b>to</b> trigger <a href="reconfiguration.md#0x1_reconfiguration">reconfiguration</a> so the VM is guaranteed <b>to</b> load the new gas fee starting from the next
+    // transaction.
+    <a href="reconfiguration.md#0x1_reconfiguration_reconfigure">reconfiguration::reconfigure</a>();
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_gas_schedule_set_storage_gas_config_for_next_epoch"></a>
+
+## Function `set_storage_gas_config_for_next_epoch`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="gas_schedule.md#0x1_gas_schedule_set_storage_gas_config_for_next_epoch">set_storage_gas_config_for_next_epoch</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, config: <a href="storage_gas.md#0x1_storage_gas_StorageGasConfig">storage_gas::StorageGasConfig</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="gas_schedule.md#0x1_gas_schedule_set_storage_gas_config_for_next_epoch">set_storage_gas_config_for_next_epoch</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, config: StorageGasConfig) {
+    <a href="storage_gas.md#0x1_storage_gas_set_config">storage_gas::set_config</a>(aptos_framework, config);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+
+
+<a id="high-level-req"></a>
+
+### High-level Requirements
+
+<table>
+<tr>
+<th>No.</th><th>Requirement</th><th>Criticality</th><th>Implementation</th><th>Enforcement</th>
+</tr>
+
+<tr>
+<td>1</td>
+<td>During genesis, the Aptos framework account should be assigned the gas schedule resource.</td>
+<td>Medium</td>
+<td>The gas_schedule::initialize function calls the assert_aptos_framework function to ensure that the signer is the aptos_framework and then assigns the GasScheduleV2 resource to it.</td>
+<td>Formally verified via <a href="#high-level-req-1">initialize</a>.</td>
+</tr>
+
+<tr>
+<td>2</td>
+<td>Only the Aptos framework account should be allowed to update the gas schedule resource.</td>
+<td>Critical</td>
+<td>The gas_schedule::set_gas_schedule function calls the assert_aptos_framework function to ensure that the signer is the aptos framework account.</td>
+<td>Formally verified via <a href="#high-level-req-2">set_gas_schedule</a>.</td>
+</tr>
+
+<tr>
+<td>3</td>
+<td>Only valid gas schedule should be allowed for initialization and update.</td>
+<td>Medium</td>
+<td>The initialize and set_gas_schedule functions ensures that the gas_schedule_blob is not empty.</td>
+<td>Formally verified via <a href="#high-level-req-3.3">initialize</a> and <a href="#high-level-req-3.2">set_gas_schedule</a>.</td>
+</tr>
+
+<tr>
+<td>4</td>
+<td>Only a gas schedule with the feature version greater or equal than the current feature version is allowed to be provided when performing an update operation.</td>
+<td>Medium</td>
+<td>The set_gas_schedule function validates the feature_version of the new_gas_schedule by ensuring that it is greater or equal than the current gas_schedule.feature_version.</td>
+<td>Formally verified via <a href="#high-level-req-4">set_gas_schedule</a>.</td>
+</tr>
+
+</table>
+
+
+
+
+<a id="module-level-spec"></a>
+
+### Module-level Specification
+
+
+<pre><code><b>pragma</b> verify = <b>true</b>;
+<b>pragma</b> aborts_if_is_strict;
+</code></pre>
+
+
+
+<a id="@Specification_1_initialize"></a>
+
+### Function `initialize`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="gas_schedule.md#0x1_gas_schedule_initialize">initialize</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, gas_schedule_blob: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(aptos_framework);
+// This enforces <a id="high-level-req-1" href="#high-level-req">high-level requirement 1</a>:
+<b>include</b> <a href="system_addresses.md#0x1_system_addresses_AbortsIfNotAptosFramework">system_addresses::AbortsIfNotAptosFramework</a>{ <a href="account.md#0x1_account">account</a>: aptos_framework };
+// This enforces <a id="high-level-req-3.3" href="#high-level-req">high-level requirement 3</a>:
+<b>aborts_if</b> len(gas_schedule_blob) == 0;
+<b>aborts_if</b> <b>exists</b>&lt;<a href="gas_schedule.md#0x1_gas_schedule_GasScheduleV2">GasScheduleV2</a>&gt;(addr);
+<b>ensures</b> <b>exists</b>&lt;<a href="gas_schedule.md#0x1_gas_schedule_GasScheduleV2">GasScheduleV2</a>&gt;(addr);
+</code></pre>
+
+
+
+<a id="@Specification_1_set_gas_schedule"></a>
+
+### Function `set_gas_schedule`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="gas_schedule.md#0x1_gas_schedule_set_gas_schedule">set_gas_schedule</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, gas_schedule_blob: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify_duration_estimate = 600;
+<b>requires</b> <b>exists</b>&lt;<a href="stake.md#0x1_stake_ValidatorFees">stake::ValidatorFees</a>&gt;(@aptos_framework);
+<b>requires</b> <b>exists</b>&lt;CoinInfo&lt;AptosCoin&gt;&gt;(@aptos_framework);
+<b>requires</b> <a href="chain_status.md#0x1_chain_status_is_genesis">chain_status::is_genesis</a>();
+<b>include</b> <a href="transaction_fee.md#0x1_transaction_fee_RequiresCollectedFeesPerValueLeqBlockAptosSupply">transaction_fee::RequiresCollectedFeesPerValueLeqBlockAptosSupply</a>;
+<b>include</b> <a href="staking_config.md#0x1_staking_config_StakingRewardsConfigRequirement">staking_config::StakingRewardsConfigRequirement</a>;
+// This enforces <a id="high-level-req-2" href="#high-level-req">high-level requirement 2</a>:
+<b>include</b> <a href="system_addresses.md#0x1_system_addresses_AbortsIfNotAptosFramework">system_addresses::AbortsIfNotAptosFramework</a>{ <a href="account.md#0x1_account">account</a>: aptos_framework };
+// This enforces <a id="high-level-req-3.2" href="#high-level-req">high-level requirement 3</a>:
+<b>aborts_if</b> len(gas_schedule_blob) == 0;
+<b>let</b> new_gas_schedule = <a href="util.md#0x1_util_spec_from_bytes">util::spec_from_bytes</a>&lt;<a href="gas_schedule.md#0x1_gas_schedule_GasScheduleV2">GasScheduleV2</a>&gt;(gas_schedule_blob);
+<b>let</b> <a href="gas_schedule.md#0x1_gas_schedule">gas_schedule</a> = <b>global</b>&lt;<a href="gas_schedule.md#0x1_gas_schedule_GasScheduleV2">GasScheduleV2</a>&gt;(@aptos_framework);
+// This enforces <a id="high-level-req-4" href="#high-level-req">high-level requirement 4</a>:
+<b>aborts_if</b> <b>exists</b>&lt;<a href="gas_schedule.md#0x1_gas_schedule_GasScheduleV2">GasScheduleV2</a>&gt;(@aptos_framework) && new_gas_schedule.feature_version &lt; <a href="gas_schedule.md#0x1_gas_schedule">gas_schedule</a>.feature_version;
+<b>ensures</b> <b>exists</b>&lt;<a href="gas_schedule.md#0x1_gas_schedule_GasScheduleV2">GasScheduleV2</a>&gt;(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(aptos_framework));
+<b>ensures</b> <b>global</b>&lt;<a href="gas_schedule.md#0x1_gas_schedule_GasScheduleV2">GasScheduleV2</a>&gt;(@aptos_framework) == new_gas_schedule;
+</code></pre>
+
+
+
+<a id="@Specification_1_set_for_next_epoch"></a>
+
+### Function `set_for_next_epoch`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="gas_schedule.md#0x1_gas_schedule_set_for_next_epoch">set_for_next_epoch</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, gas_schedule_blob: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="system_addresses.md#0x1_system_addresses_AbortsIfNotAptosFramework">system_addresses::AbortsIfNotAptosFramework</a>{ <a href="account.md#0x1_account">account</a>: aptos_framework };
+<b>include</b> <a href="config_buffer.md#0x1_config_buffer_SetForNextEpochAbortsIf">config_buffer::SetForNextEpochAbortsIf</a> {
+    <a href="account.md#0x1_account">account</a>: aptos_framework,
+    config: gas_schedule_blob
+};
+<b>let</b> new_gas_schedule = <a href="util.md#0x1_util_spec_from_bytes">util::spec_from_bytes</a>&lt;<a href="gas_schedule.md#0x1_gas_schedule_GasScheduleV2">GasScheduleV2</a>&gt;(gas_schedule_blob);
+<b>let</b> cur_gas_schedule = <b>global</b>&lt;<a href="gas_schedule.md#0x1_gas_schedule_GasScheduleV2">GasScheduleV2</a>&gt;(@aptos_framework);
+<b>aborts_if</b> <b>exists</b>&lt;<a href="gas_schedule.md#0x1_gas_schedule_GasScheduleV2">GasScheduleV2</a>&gt;(@aptos_framework) && new_gas_schedule.feature_version &lt; cur_gas_schedule.feature_version;
+</code></pre>
+
+
+
+<a id="@Specification_1_set_for_next_epoch_check_hash"></a>
+
+### Function `set_for_next_epoch_check_hash`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="gas_schedule.md#0x1_gas_schedule_set_for_next_epoch_check_hash">set_for_next_epoch_check_hash</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, old_gas_schedule_hash: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, new_gas_schedule_blob: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="system_addresses.md#0x1_system_addresses_AbortsIfNotAptosFramework">system_addresses::AbortsIfNotAptosFramework</a>{ <a href="account.md#0x1_account">account</a>: aptos_framework };
+<b>include</b> <a href="config_buffer.md#0x1_config_buffer_SetForNextEpochAbortsIf">config_buffer::SetForNextEpochAbortsIf</a> {
+    <a href="account.md#0x1_account">account</a>: aptos_framework,
+    config: new_gas_schedule_blob
+};
+<b>let</b> new_gas_schedule = <a href="util.md#0x1_util_spec_from_bytes">util::spec_from_bytes</a>&lt;<a href="gas_schedule.md#0x1_gas_schedule_GasScheduleV2">GasScheduleV2</a>&gt;(new_gas_schedule_blob);
+<b>let</b> cur_gas_schedule = <b>global</b>&lt;<a href="gas_schedule.md#0x1_gas_schedule_GasScheduleV2">GasScheduleV2</a>&gt;(@aptos_framework);
+<b>aborts_if</b> <b>exists</b>&lt;<a href="gas_schedule.md#0x1_gas_schedule_GasScheduleV2">GasScheduleV2</a>&gt;(@aptos_framework) && new_gas_schedule.feature_version &lt; cur_gas_schedule.feature_version;
+<b>aborts_if</b> <b>exists</b>&lt;<a href="gas_schedule.md#0x1_gas_schedule_GasScheduleV2">GasScheduleV2</a>&gt;(@aptos_framework) && (!<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_spec_sha_512_and_ripemd_160_enabled">features::spec_sha_512_and_ripemd_160_enabled</a>() || <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/hash.md#0x1_aptos_hash_spec_sha3_512_internal">aptos_hash::spec_sha3_512_internal</a>(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs_serialize">bcs::serialize</a>(cur_gas_schedule)) != old_gas_schedule_hash);
+</code></pre>
+
+
+
+<a id="@Specification_1_on_new_epoch"></a>
+
+### Function `on_new_epoch`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="gas_schedule.md#0x1_gas_schedule_on_new_epoch">on_new_epoch</a>(framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>requires</b> @aptos_framework == std::signer::address_of(framework);
+<b>include</b> <a href="config_buffer.md#0x1_config_buffer_OnNewEpochRequirement">config_buffer::OnNewEpochRequirement</a>&lt;<a href="gas_schedule.md#0x1_gas_schedule_GasScheduleV2">GasScheduleV2</a>&gt;;
+<b>aborts_if</b> <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_set_storage_gas_config"></a>
+
+### Function `set_storage_gas_config`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="gas_schedule.md#0x1_gas_schedule_set_storage_gas_config">set_storage_gas_config</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, config: <a href="storage_gas.md#0x1_storage_gas_StorageGasConfig">storage_gas::StorageGasConfig</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify_duration_estimate = 600;
+<b>requires</b> <b>exists</b>&lt;<a href="stake.md#0x1_stake_ValidatorFees">stake::ValidatorFees</a>&gt;(@aptos_framework);
+<b>requires</b> <b>exists</b>&lt;CoinInfo&lt;AptosCoin&gt;&gt;(@aptos_framework);
+<b>include</b> <a href="system_addresses.md#0x1_system_addresses_AbortsIfNotAptosFramework">system_addresses::AbortsIfNotAptosFramework</a>{ <a href="account.md#0x1_account">account</a>: aptos_framework };
+<b>include</b> <a href="transaction_fee.md#0x1_transaction_fee_RequiresCollectedFeesPerValueLeqBlockAptosSupply">transaction_fee::RequiresCollectedFeesPerValueLeqBlockAptosSupply</a>;
+<b>include</b> <a href="staking_config.md#0x1_staking_config_StakingRewardsConfigRequirement">staking_config::StakingRewardsConfigRequirement</a>;
+<b>aborts_if</b> !<b>exists</b>&lt;StorageGasConfig&gt;(@aptos_framework);
+<b>ensures</b> <b>global</b>&lt;StorageGasConfig&gt;(@aptos_framework) == config;
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="system_addresses.md#0x1_system_addresses_AbortsIfNotAptosFramework">system_addresses::AbortsIfNotAptosFramework</a>{ <a href="account.md#0x1_account">account</a>: aptos_framework };
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="storage_gas.md#0x1_storage_gas_StorageGasConfig">storage_gas::StorageGasConfig</a>&gt;(@aptos_framework);
+</code></pre>
+
+
+
+<a id="@Specification_1_set_storage_gas_config_for_next_epoch"></a>
+
+### Function `set_storage_gas_config_for_next_epoch`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="gas_schedule.md#0x1_gas_schedule_set_storage_gas_config_for_next_epoch">set_storage_gas_config_for_next_epoch</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, config: <a href="storage_gas.md#0x1_storage_gas_StorageGasConfig">storage_gas::StorageGasConfig</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="system_addresses.md#0x1_system_addresses_AbortsIfNotAptosFramework">system_addresses::AbortsIfNotAptosFramework</a>{ <a href="account.md#0x1_account">account</a>: aptos_framework };
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="storage_gas.md#0x1_storage_gas_StorageGasConfig">storage_gas::StorageGasConfig</a>&gt;(@aptos_framework);
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/genesis.md b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/genesis.md
new file mode 100644
index 0000000000000..3136d00fa3994
--- /dev/null
+++ b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/genesis.md
@@ -0,0 +1,1085 @@
+
+<a id="0x1_genesis"></a>
+
+# Module `0x1::genesis`
+
+
+
+-  [Struct `AccountMap`](#0x1_genesis_AccountMap)
+-  [Struct `EmployeeAccountMap`](#0x1_genesis_EmployeeAccountMap)
+-  [Struct `ValidatorConfiguration`](#0x1_genesis_ValidatorConfiguration)
+-  [Struct `ValidatorConfigurationWithCommission`](#0x1_genesis_ValidatorConfigurationWithCommission)
+-  [Constants](#@Constants_0)
+-  [Function `initialize`](#0x1_genesis_initialize)
+-  [Function `initialize_aptos_coin`](#0x1_genesis_initialize_aptos_coin)
+-  [Function `initialize_core_resources_and_aptos_coin`](#0x1_genesis_initialize_core_resources_and_aptos_coin)
+-  [Function `create_accounts`](#0x1_genesis_create_accounts)
+-  [Function `create_account`](#0x1_genesis_create_account)
+-  [Function `create_employee_validators`](#0x1_genesis_create_employee_validators)
+-  [Function `create_initialize_validators_with_commission`](#0x1_genesis_create_initialize_validators_with_commission)
+-  [Function `create_initialize_validators`](#0x1_genesis_create_initialize_validators)
+-  [Function `create_initialize_validator`](#0x1_genesis_create_initialize_validator)
+-  [Function `initialize_validator`](#0x1_genesis_initialize_validator)
+-  [Function `set_genesis_end`](#0x1_genesis_set_genesis_end)
+-  [Specification](#@Specification_1)
+    -  [High-level Requirements](#high-level-req)
+    -  [Module-level Specification](#module-level-spec)
+    -  [Function `initialize`](#@Specification_1_initialize)
+    -  [Function `initialize_aptos_coin`](#@Specification_1_initialize_aptos_coin)
+    -  [Function `create_initialize_validators_with_commission`](#@Specification_1_create_initialize_validators_with_commission)
+    -  [Function `create_initialize_validators`](#@Specification_1_create_initialize_validators)
+    -  [Function `create_initialize_validator`](#@Specification_1_create_initialize_validator)
+    -  [Function `set_genesis_end`](#@Specification_1_set_genesis_end)
+
+
+<pre><code><b>use</b> <a href="account.md#0x1_account">0x1::account</a>;
+<b>use</b> <a href="aggregator_factory.md#0x1_aggregator_factory">0x1::aggregator_factory</a>;
+<b>use</b> <a href="aptos_account.md#0x1_aptos_account">0x1::aptos_account</a>;
+<b>use</b> <a href="aptos_coin.md#0x1_aptos_coin">0x1::aptos_coin</a>;
+<b>use</b> <a href="aptos_governance.md#0x1_aptos_governance">0x1::aptos_governance</a>;
+<b>use</b> <a href="block.md#0x1_block">0x1::block</a>;
+<b>use</b> <a href="chain_id.md#0x1_chain_id">0x1::chain_id</a>;
+<b>use</b> <a href="chain_status.md#0x1_chain_status">0x1::chain_status</a>;
+<b>use</b> <a href="coin.md#0x1_coin">0x1::coin</a>;
+<b>use</b> <a href="consensus_config.md#0x1_consensus_config">0x1::consensus_config</a>;
+<b>use</b> <a href="create_signer.md#0x1_create_signer">0x1::create_signer</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="execution_config.md#0x1_execution_config">0x1::execution_config</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/fixed_point32.md#0x1_fixed_point32">0x1::fixed_point32</a>;
+<b>use</b> <a href="gas_schedule.md#0x1_gas_schedule">0x1::gas_schedule</a>;
+<b>use</b> <a href="reconfiguration.md#0x1_reconfiguration">0x1::reconfiguration</a>;
+<b>use</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map">0x1::simple_map</a>;
+<b>use</b> <a href="stake.md#0x1_stake">0x1::stake</a>;
+<b>use</b> <a href="staking_config.md#0x1_staking_config">0x1::staking_config</a>;
+<b>use</b> <a href="staking_contract.md#0x1_staking_contract">0x1::staking_contract</a>;
+<b>use</b> <a href="state_storage.md#0x1_state_storage">0x1::state_storage</a>;
+<b>use</b> <a href="storage_gas.md#0x1_storage_gas">0x1::storage_gas</a>;
+<b>use</b> <a href="timestamp.md#0x1_timestamp">0x1::timestamp</a>;
+<b>use</b> <a href="transaction_fee.md#0x1_transaction_fee">0x1::transaction_fee</a>;
+<b>use</b> <a href="transaction_validation.md#0x1_transaction_validation">0x1::transaction_validation</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">0x1::vector</a>;
+<b>use</b> <a href="version.md#0x1_version">0x1::version</a>;
+<b>use</b> <a href="vesting.md#0x1_vesting">0x1::vesting</a>;
+</code></pre>
+
+
+
+<a id="0x1_genesis_AccountMap"></a>
+
+## Struct `AccountMap`
+
+
+
+<pre><code><b>struct</b> <a href="genesis.md#0x1_genesis_AccountMap">AccountMap</a> <b>has</b> drop
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>account_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>balance: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_genesis_EmployeeAccountMap"></a>
+
+## Struct `EmployeeAccountMap`
+
+
+
+<pre><code><b>struct</b> <a href="genesis.md#0x1_genesis_EmployeeAccountMap">EmployeeAccountMap</a> <b>has</b> <b>copy</b>, drop
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>accounts: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>validator: <a href="genesis.md#0x1_genesis_ValidatorConfigurationWithCommission">genesis::ValidatorConfigurationWithCommission</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>vesting_schedule_numerator: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u64&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>vesting_schedule_denominator: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>beneficiary_resetter: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_genesis_ValidatorConfiguration"></a>
+
+## Struct `ValidatorConfiguration`
+
+
+
+<pre><code><b>struct</b> <a href="genesis.md#0x1_genesis_ValidatorConfiguration">ValidatorConfiguration</a> <b>has</b> <b>copy</b>, drop
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>owner_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>operator_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>voter_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>stake_amount: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>consensus_pubkey: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>proof_of_possession: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>network_addresses: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>full_node_network_addresses: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_genesis_ValidatorConfigurationWithCommission"></a>
+
+## Struct `ValidatorConfigurationWithCommission`
+
+
+
+<pre><code><b>struct</b> <a href="genesis.md#0x1_genesis_ValidatorConfigurationWithCommission">ValidatorConfigurationWithCommission</a> <b>has</b> <b>copy</b>, drop
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>validator_config: <a href="genesis.md#0x1_genesis_ValidatorConfiguration">genesis::ValidatorConfiguration</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>commission_percentage: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>join_during_genesis: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_genesis_EACCOUNT_DOES_NOT_EXIST"></a>
+
+
+
+<pre><code><b>const</b> <a href="genesis.md#0x1_genesis_EACCOUNT_DOES_NOT_EXIST">EACCOUNT_DOES_NOT_EXIST</a>: u64 = 2;
+</code></pre>
+
+
+
+<a id="0x1_genesis_EDUPLICATE_ACCOUNT"></a>
+
+
+
+<pre><code><b>const</b> <a href="genesis.md#0x1_genesis_EDUPLICATE_ACCOUNT">EDUPLICATE_ACCOUNT</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_genesis_initialize"></a>
+
+## Function `initialize`
+
+Genesis step 1: Initialize aptos framework account and core modules on chain.
+
+
+<pre><code><b>fun</b> <a href="genesis.md#0x1_genesis_initialize">initialize</a>(<a href="gas_schedule.md#0x1_gas_schedule">gas_schedule</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, <a href="chain_id.md#0x1_chain_id">chain_id</a>: u8, initial_version: u64, <a href="consensus_config.md#0x1_consensus_config">consensus_config</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, <a href="execution_config.md#0x1_execution_config">execution_config</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, epoch_interval_microsecs: u64, minimum_stake: u64, maximum_stake: u64, recurring_lockup_duration_secs: u64, allow_validator_set_change: bool, rewards_rate: u64, rewards_rate_denominator: u64, voting_power_increase_limit: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="genesis.md#0x1_genesis_initialize">initialize</a>(
+    <a href="gas_schedule.md#0x1_gas_schedule">gas_schedule</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    <a href="chain_id.md#0x1_chain_id">chain_id</a>: u8,
+    initial_version: u64,
+    <a href="consensus_config.md#0x1_consensus_config">consensus_config</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    <a href="execution_config.md#0x1_execution_config">execution_config</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    epoch_interval_microsecs: u64,
+    minimum_stake: u64,
+    maximum_stake: u64,
+    recurring_lockup_duration_secs: u64,
+    allow_validator_set_change: bool,
+    rewards_rate: u64,
+    rewards_rate_denominator: u64,
+    voting_power_increase_limit: u64,
+) {
+    // Initialize the aptos framework <a href="account.md#0x1_account">account</a>. This is the <a href="account.md#0x1_account">account</a> <b>where</b> system resources and modules will be
+    // deployed <b>to</b>. This will be entirely managed by on-chain governance and no entities have the key or privileges
+    // <b>to</b> <b>use</b> this <a href="account.md#0x1_account">account</a>.
+    <b>let</b> (aptos_framework_account, aptos_framework_signer_cap) = <a href="account.md#0x1_account_create_framework_reserved_account">account::create_framework_reserved_account</a>(@aptos_framework);
+    // Initialize <a href="account.md#0x1_account">account</a> configs on aptos framework <a href="account.md#0x1_account">account</a>.
+    <a href="account.md#0x1_account_initialize">account::initialize</a>(&aptos_framework_account);
+
+    <a href="transaction_validation.md#0x1_transaction_validation_initialize">transaction_validation::initialize</a>(
+        &aptos_framework_account,
+        b"script_prologue",
+        b"module_prologue",
+        b"multi_agent_script_prologue",
+        b"epilogue",
+    );
+
+    // Give the decentralized on-chain governance control over the core framework <a href="account.md#0x1_account">account</a>.
+    <a href="aptos_governance.md#0x1_aptos_governance_store_signer_cap">aptos_governance::store_signer_cap</a>(&aptos_framework_account, @aptos_framework, aptos_framework_signer_cap);
+
+    // put reserved framework reserved accounts under aptos governance
+    <b>let</b> framework_reserved_addresses = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;[@0x2, @0x3, @0x4, @0x5, @0x6, @0x7, @0x8, @0x9, @0xa];
+    <b>while</b> (!<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_is_empty">vector::is_empty</a>(&framework_reserved_addresses)) {
+        <b>let</b> <b>address</b> = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_pop_back">vector::pop_back</a>&lt;<b>address</b>&gt;(&<b>mut</b> framework_reserved_addresses);
+        <b>let</b> (_, framework_signer_cap) = <a href="account.md#0x1_account_create_framework_reserved_account">account::create_framework_reserved_account</a>(<b>address</b>);
+        <a href="aptos_governance.md#0x1_aptos_governance_store_signer_cap">aptos_governance::store_signer_cap</a>(&aptos_framework_account, <b>address</b>, framework_signer_cap);
+    };
+
+    <a href="consensus_config.md#0x1_consensus_config_initialize">consensus_config::initialize</a>(&aptos_framework_account, <a href="consensus_config.md#0x1_consensus_config">consensus_config</a>);
+    <a href="execution_config.md#0x1_execution_config_set">execution_config::set</a>(&aptos_framework_account, <a href="execution_config.md#0x1_execution_config">execution_config</a>);
+    <a href="version.md#0x1_version_initialize">version::initialize</a>(&aptos_framework_account, initial_version);
+    <a href="stake.md#0x1_stake_initialize">stake::initialize</a>(&aptos_framework_account);
+    <a href="staking_config.md#0x1_staking_config_initialize">staking_config::initialize</a>(
+        &aptos_framework_account,
+        minimum_stake,
+        maximum_stake,
+        recurring_lockup_duration_secs,
+        allow_validator_set_change,
+        rewards_rate,
+        rewards_rate_denominator,
+        voting_power_increase_limit,
+    );
+    <a href="storage_gas.md#0x1_storage_gas_initialize">storage_gas::initialize</a>(&aptos_framework_account);
+    <a href="gas_schedule.md#0x1_gas_schedule_initialize">gas_schedule::initialize</a>(&aptos_framework_account, <a href="gas_schedule.md#0x1_gas_schedule">gas_schedule</a>);
+
+    // Ensure we can create aggregators for supply, but not enable it for common <b>use</b> just yet.
+    <a href="aggregator_factory.md#0x1_aggregator_factory_initialize_aggregator_factory">aggregator_factory::initialize_aggregator_factory</a>(&aptos_framework_account);
+    <a href="coin.md#0x1_coin_initialize_supply_config">coin::initialize_supply_config</a>(&aptos_framework_account);
+
+    <a href="chain_id.md#0x1_chain_id_initialize">chain_id::initialize</a>(&aptos_framework_account, <a href="chain_id.md#0x1_chain_id">chain_id</a>);
+    <a href="reconfiguration.md#0x1_reconfiguration_initialize">reconfiguration::initialize</a>(&aptos_framework_account);
+    <a href="block.md#0x1_block_initialize">block::initialize</a>(&aptos_framework_account, epoch_interval_microsecs);
+    <a href="state_storage.md#0x1_state_storage_initialize">state_storage::initialize</a>(&aptos_framework_account);
+    <a href="timestamp.md#0x1_timestamp_set_time_has_started">timestamp::set_time_has_started</a>(&aptos_framework_account);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_genesis_initialize_aptos_coin"></a>
+
+## Function `initialize_aptos_coin`
+
+Genesis step 2: Initialize Aptos coin.
+
+
+<pre><code><b>fun</b> <a href="genesis.md#0x1_genesis_initialize_aptos_coin">initialize_aptos_coin</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="genesis.md#0x1_genesis_initialize_aptos_coin">initialize_aptos_coin</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>) {
+    <b>let</b> (burn_cap, mint_cap) = <a href="aptos_coin.md#0x1_aptos_coin_initialize">aptos_coin::initialize</a>(aptos_framework);
+
+    <a href="coin.md#0x1_coin_create_coin_conversion_map">coin::create_coin_conversion_map</a>(aptos_framework);
+    <a href="coin.md#0x1_coin_create_pairing">coin::create_pairing</a>&lt;AptosCoin&gt;(aptos_framework);
+
+    // Give <a href="stake.md#0x1_stake">stake</a> <b>module</b> MintCapability&lt;AptosCoin&gt; so it can mint rewards.
+    <a href="stake.md#0x1_stake_store_aptos_coin_mint_cap">stake::store_aptos_coin_mint_cap</a>(aptos_framework, mint_cap);
+    // Give <a href="transaction_fee.md#0x1_transaction_fee">transaction_fee</a> <b>module</b> BurnCapability&lt;AptosCoin&gt; so it can burn gas.
+    <a href="transaction_fee.md#0x1_transaction_fee_store_aptos_coin_burn_cap">transaction_fee::store_aptos_coin_burn_cap</a>(aptos_framework, burn_cap);
+    // Give <a href="transaction_fee.md#0x1_transaction_fee">transaction_fee</a> <b>module</b> MintCapability&lt;AptosCoin&gt; so it can mint refunds.
+    <a href="transaction_fee.md#0x1_transaction_fee_store_aptos_coin_mint_cap">transaction_fee::store_aptos_coin_mint_cap</a>(aptos_framework, mint_cap);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_genesis_initialize_core_resources_and_aptos_coin"></a>
+
+## Function `initialize_core_resources_and_aptos_coin`
+
+Only called for testnets and e2e tests.
+
+
+<pre><code><b>fun</b> <a href="genesis.md#0x1_genesis_initialize_core_resources_and_aptos_coin">initialize_core_resources_and_aptos_coin</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, core_resources_auth_key: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="genesis.md#0x1_genesis_initialize_core_resources_and_aptos_coin">initialize_core_resources_and_aptos_coin</a>(
+    aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    core_resources_auth_key: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+) {
+    <b>let</b> (burn_cap, mint_cap) = <a href="aptos_coin.md#0x1_aptos_coin_initialize">aptos_coin::initialize</a>(aptos_framework);
+
+    <a href="coin.md#0x1_coin_create_coin_conversion_map">coin::create_coin_conversion_map</a>(aptos_framework);
+    <a href="coin.md#0x1_coin_create_pairing">coin::create_pairing</a>&lt;AptosCoin&gt;(aptos_framework);
+
+    // Give <a href="stake.md#0x1_stake">stake</a> <b>module</b> MintCapability&lt;AptosCoin&gt; so it can mint rewards.
+    <a href="stake.md#0x1_stake_store_aptos_coin_mint_cap">stake::store_aptos_coin_mint_cap</a>(aptos_framework, mint_cap);
+    // Give <a href="transaction_fee.md#0x1_transaction_fee">transaction_fee</a> <b>module</b> BurnCapability&lt;AptosCoin&gt; so it can burn gas.
+    <a href="transaction_fee.md#0x1_transaction_fee_store_aptos_coin_burn_cap">transaction_fee::store_aptos_coin_burn_cap</a>(aptos_framework, burn_cap);
+    // Give <a href="transaction_fee.md#0x1_transaction_fee">transaction_fee</a> <b>module</b> MintCapability&lt;AptosCoin&gt; so it can mint refunds.
+    <a href="transaction_fee.md#0x1_transaction_fee_store_aptos_coin_mint_cap">transaction_fee::store_aptos_coin_mint_cap</a>(aptos_framework, mint_cap);
+
+    <b>let</b> core_resources = <a href="account.md#0x1_account_create_account">account::create_account</a>(@core_resources);
+    <a href="account.md#0x1_account_rotate_authentication_key_internal">account::rotate_authentication_key_internal</a>(&core_resources, core_resources_auth_key);
+    <a href="aptos_account.md#0x1_aptos_account_register_apt">aptos_account::register_apt</a>(&core_resources); // registers APT store
+    <a href="aptos_coin.md#0x1_aptos_coin_configure_accounts_for_test">aptos_coin::configure_accounts_for_test</a>(aptos_framework, &core_resources, mint_cap);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_genesis_create_accounts"></a>
+
+## Function `create_accounts`
+
+
+
+<pre><code><b>fun</b> <a href="genesis.md#0x1_genesis_create_accounts">create_accounts</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, accounts: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="genesis.md#0x1_genesis_AccountMap">genesis::AccountMap</a>&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="genesis.md#0x1_genesis_create_accounts">create_accounts</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, accounts: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="genesis.md#0x1_genesis_AccountMap">AccountMap</a>&gt;) {
+    <b>let</b> unique_accounts = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_empty">vector::empty</a>();
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_for_each_ref">vector::for_each_ref</a>(&accounts, |account_map| {
+        <b>let</b> account_map: &<a href="genesis.md#0x1_genesis_AccountMap">AccountMap</a> = account_map;
+        <b>assert</b>!(
+            !<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_contains">vector::contains</a>(&unique_accounts, &account_map.account_address),
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_already_exists">error::already_exists</a>(<a href="genesis.md#0x1_genesis_EDUPLICATE_ACCOUNT">EDUPLICATE_ACCOUNT</a>),
+        );
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_push_back">vector::push_back</a>(&<b>mut</b> unique_accounts, account_map.account_address);
+
+        <a href="genesis.md#0x1_genesis_create_account">create_account</a>(
+            aptos_framework,
+            account_map.account_address,
+            account_map.balance,
+        );
+    });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_genesis_create_account"></a>
+
+## Function `create_account`
+
+This creates an funds an account if it doesn't exist.
+If it exists, it just returns the signer.
+
+
+<pre><code><b>fun</b> <a href="genesis.md#0x1_genesis_create_account">create_account</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, account_address: <b>address</b>, balance: u64): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="genesis.md#0x1_genesis_create_account">create_account</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, account_address: <b>address</b>, balance: u64): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a> {
+    <b>if</b> (<a href="account.md#0x1_account_exists_at">account::exists_at</a>(account_address)) {
+        <a href="create_signer.md#0x1_create_signer">create_signer</a>(account_address)
+    } <b>else</b> {
+        <b>let</b> <a href="account.md#0x1_account">account</a> = <a href="account.md#0x1_account_create_account">account::create_account</a>(account_address);
+        <a href="coin.md#0x1_coin_register">coin::register</a>&lt;AptosCoin&gt;(&<a href="account.md#0x1_account">account</a>);
+        <a href="aptos_coin.md#0x1_aptos_coin_mint">aptos_coin::mint</a>(aptos_framework, account_address, balance);
+        <a href="account.md#0x1_account">account</a>
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_genesis_create_employee_validators"></a>
+
+## Function `create_employee_validators`
+
+
+
+<pre><code><b>fun</b> <a href="genesis.md#0x1_genesis_create_employee_validators">create_employee_validators</a>(employee_vesting_start: u64, employee_vesting_period_duration: u64, employees: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="genesis.md#0x1_genesis_EmployeeAccountMap">genesis::EmployeeAccountMap</a>&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="genesis.md#0x1_genesis_create_employee_validators">create_employee_validators</a>(
+    employee_vesting_start: u64,
+    employee_vesting_period_duration: u64,
+    employees: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="genesis.md#0x1_genesis_EmployeeAccountMap">EmployeeAccountMap</a>&gt;,
+) {
+    <b>let</b> unique_accounts = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_empty">vector::empty</a>();
+
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_for_each_ref">vector::for_each_ref</a>(&employees, |employee_group| {
+        <b>let</b> j = 0;
+        <b>let</b> employee_group: &<a href="genesis.md#0x1_genesis_EmployeeAccountMap">EmployeeAccountMap</a> = employee_group;
+        <b>let</b> num_employees_in_group = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&employee_group.accounts);
+
+        <b>let</b> buy_ins = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_create">simple_map::create</a>();
+
+        <b>while</b> (j &lt; num_employees_in_group) {
+            <b>let</b> <a href="account.md#0x1_account">account</a> = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(&employee_group.accounts, j);
+            <b>assert</b>!(
+                !<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_contains">vector::contains</a>(&unique_accounts, <a href="account.md#0x1_account">account</a>),
+                <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_already_exists">error::already_exists</a>(<a href="genesis.md#0x1_genesis_EDUPLICATE_ACCOUNT">EDUPLICATE_ACCOUNT</a>),
+            );
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_push_back">vector::push_back</a>(&<b>mut</b> unique_accounts, *<a href="account.md#0x1_account">account</a>);
+
+            <b>let</b> employee = <a href="create_signer.md#0x1_create_signer">create_signer</a>(*<a href="account.md#0x1_account">account</a>);
+            <b>let</b> total = <a href="coin.md#0x1_coin_balance">coin::balance</a>&lt;AptosCoin&gt;(*<a href="account.md#0x1_account">account</a>);
+            <b>let</b> coins = <a href="coin.md#0x1_coin_withdraw">coin::withdraw</a>&lt;AptosCoin&gt;(&employee, total);
+            <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_add">simple_map::add</a>(&<b>mut</b> buy_ins, *<a href="account.md#0x1_account">account</a>, coins);
+
+            j = j + 1;
+        };
+
+        <b>let</b> j = 0;
+        <b>let</b> num_vesting_events = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&employee_group.vesting_schedule_numerator);
+        <b>let</b> schedule = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_empty">vector::empty</a>();
+
+        <b>while</b> (j &lt; num_vesting_events) {
+            <b>let</b> numerator = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(&employee_group.vesting_schedule_numerator, j);
+            <b>let</b> <a href="event.md#0x1_event">event</a> = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/fixed_point32.md#0x1_fixed_point32_create_from_rational">fixed_point32::create_from_rational</a>(*numerator, employee_group.vesting_schedule_denominator);
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_push_back">vector::push_back</a>(&<b>mut</b> schedule, <a href="event.md#0x1_event">event</a>);
+
+            j = j + 1;
+        };
+
+        <b>let</b> vesting_schedule = <a href="vesting.md#0x1_vesting_create_vesting_schedule">vesting::create_vesting_schedule</a>(
+            schedule,
+            employee_vesting_start,
+            employee_vesting_period_duration,
+        );
+
+        <b>let</b> admin = employee_group.validator.validator_config.owner_address;
+        <b>let</b> admin_signer = &<a href="create_signer.md#0x1_create_signer">create_signer</a>(admin);
+        <b>let</b> contract_address = <a href="vesting.md#0x1_vesting_create_vesting_contract">vesting::create_vesting_contract</a>(
+            admin_signer,
+            &employee_group.accounts,
+            buy_ins,
+            vesting_schedule,
+            admin,
+            employee_group.validator.validator_config.operator_address,
+            employee_group.validator.validator_config.voter_address,
+            employee_group.validator.commission_percentage,
+            x"",
+        );
+        <b>let</b> pool_address = <a href="vesting.md#0x1_vesting_stake_pool_address">vesting::stake_pool_address</a>(contract_address);
+
+        <b>if</b> (employee_group.beneficiary_resetter != @0x0) {
+            <a href="vesting.md#0x1_vesting_set_beneficiary_resetter">vesting::set_beneficiary_resetter</a>(admin_signer, contract_address, employee_group.beneficiary_resetter);
+        };
+
+        <b>let</b> validator = &employee_group.validator.validator_config;
+        <b>assert</b>!(
+            <a href="account.md#0x1_account_exists_at">account::exists_at</a>(validator.owner_address),
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="genesis.md#0x1_genesis_EACCOUNT_DOES_NOT_EXIST">EACCOUNT_DOES_NOT_EXIST</a>),
+        );
+        <b>assert</b>!(
+            <a href="account.md#0x1_account_exists_at">account::exists_at</a>(validator.operator_address),
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="genesis.md#0x1_genesis_EACCOUNT_DOES_NOT_EXIST">EACCOUNT_DOES_NOT_EXIST</a>),
+        );
+        <b>assert</b>!(
+            <a href="account.md#0x1_account_exists_at">account::exists_at</a>(validator.voter_address),
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="genesis.md#0x1_genesis_EACCOUNT_DOES_NOT_EXIST">EACCOUNT_DOES_NOT_EXIST</a>),
+        );
+        <b>if</b> (employee_group.validator.join_during_genesis) {
+            <a href="genesis.md#0x1_genesis_initialize_validator">initialize_validator</a>(pool_address, validator);
+        };
+    });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_genesis_create_initialize_validators_with_commission"></a>
+
+## Function `create_initialize_validators_with_commission`
+
+
+
+<pre><code><b>fun</b> <a href="genesis.md#0x1_genesis_create_initialize_validators_with_commission">create_initialize_validators_with_commission</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, use_staking_contract: bool, validators: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="genesis.md#0x1_genesis_ValidatorConfigurationWithCommission">genesis::ValidatorConfigurationWithCommission</a>&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="genesis.md#0x1_genesis_create_initialize_validators_with_commission">create_initialize_validators_with_commission</a>(
+    aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    use_staking_contract: bool,
+    validators: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="genesis.md#0x1_genesis_ValidatorConfigurationWithCommission">ValidatorConfigurationWithCommission</a>&gt;,
+) {
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_for_each_ref">vector::for_each_ref</a>(&validators, |validator| {
+        <b>let</b> validator: &<a href="genesis.md#0x1_genesis_ValidatorConfigurationWithCommission">ValidatorConfigurationWithCommission</a> = validator;
+        <a href="genesis.md#0x1_genesis_create_initialize_validator">create_initialize_validator</a>(aptos_framework, validator, use_staking_contract);
+    });
+
+    // Destroy the aptos framework <a href="account.md#0x1_account">account</a>'s ability <b>to</b> mint coins now that we're done <b>with</b> setting up the initial
+    // validators.
+    <a href="aptos_coin.md#0x1_aptos_coin_destroy_mint_cap">aptos_coin::destroy_mint_cap</a>(aptos_framework);
+
+    <a href="stake.md#0x1_stake_on_new_epoch">stake::on_new_epoch</a>();
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_genesis_create_initialize_validators"></a>
+
+## Function `create_initialize_validators`
+
+Sets up the initial validator set for the network.
+The validator "owner" accounts, and their authentication
+Addresses (and keys) are encoded in the <code>owners</code>
+Each validator signs consensus messages with the private key corresponding to the Ed25519
+public key in <code>consensus_pubkeys</code>.
+Finally, each validator must specify the network address
+(see types/src/network_address/mod.rs) for itself and its full nodes.
+
+Network address fields are a vector per account, where each entry is a vector of addresses
+encoded in a single BCS byte array.
+
+
+<pre><code><b>fun</b> <a href="genesis.md#0x1_genesis_create_initialize_validators">create_initialize_validators</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, validators: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="genesis.md#0x1_genesis_ValidatorConfiguration">genesis::ValidatorConfiguration</a>&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="genesis.md#0x1_genesis_create_initialize_validators">create_initialize_validators</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, validators: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="genesis.md#0x1_genesis_ValidatorConfiguration">ValidatorConfiguration</a>&gt;) {
+    <b>let</b> validators_with_commission = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_empty">vector::empty</a>();
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_for_each_reverse">vector::for_each_reverse</a>(validators, |validator| {
+        <b>let</b> validator_with_commission = <a href="genesis.md#0x1_genesis_ValidatorConfigurationWithCommission">ValidatorConfigurationWithCommission</a> {
+            validator_config: validator,
+            commission_percentage: 0,
+            join_during_genesis: <b>true</b>,
+        };
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_push_back">vector::push_back</a>(&<b>mut</b> validators_with_commission, validator_with_commission);
+    });
+
+    <a href="genesis.md#0x1_genesis_create_initialize_validators_with_commission">create_initialize_validators_with_commission</a>(aptos_framework, <b>false</b>, validators_with_commission);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_genesis_create_initialize_validator"></a>
+
+## Function `create_initialize_validator`
+
+
+
+<pre><code><b>fun</b> <a href="genesis.md#0x1_genesis_create_initialize_validator">create_initialize_validator</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, commission_config: &<a href="genesis.md#0x1_genesis_ValidatorConfigurationWithCommission">genesis::ValidatorConfigurationWithCommission</a>, use_staking_contract: bool)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="genesis.md#0x1_genesis_create_initialize_validator">create_initialize_validator</a>(
+    aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    commission_config: &<a href="genesis.md#0x1_genesis_ValidatorConfigurationWithCommission">ValidatorConfigurationWithCommission</a>,
+    use_staking_contract: bool,
+) {
+    <b>let</b> validator = &commission_config.validator_config;
+
+    <b>let</b> owner = &<a href="genesis.md#0x1_genesis_create_account">create_account</a>(aptos_framework, validator.owner_address, validator.stake_amount);
+    <a href="genesis.md#0x1_genesis_create_account">create_account</a>(aptos_framework, validator.operator_address, 0);
+    <a href="genesis.md#0x1_genesis_create_account">create_account</a>(aptos_framework, validator.voter_address, 0);
+
+    // Initialize the <a href="stake.md#0x1_stake">stake</a> pool and join the validator set.
+    <b>let</b> pool_address = <b>if</b> (use_staking_contract) {
+        <a href="staking_contract.md#0x1_staking_contract_create_staking_contract">staking_contract::create_staking_contract</a>(
+            owner,
+            validator.operator_address,
+            validator.voter_address,
+            validator.stake_amount,
+            commission_config.commission_percentage,
+            x"",
+        );
+        <a href="staking_contract.md#0x1_staking_contract_stake_pool_address">staking_contract::stake_pool_address</a>(validator.owner_address, validator.operator_address)
+    } <b>else</b> {
+        <a href="stake.md#0x1_stake_initialize_stake_owner">stake::initialize_stake_owner</a>(
+            owner,
+            validator.stake_amount,
+            validator.operator_address,
+            validator.voter_address,
+        );
+        validator.owner_address
+    };
+
+    <b>if</b> (commission_config.join_during_genesis) {
+        <a href="genesis.md#0x1_genesis_initialize_validator">initialize_validator</a>(pool_address, validator);
+    };
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_genesis_initialize_validator"></a>
+
+## Function `initialize_validator`
+
+
+
+<pre><code><b>fun</b> <a href="genesis.md#0x1_genesis_initialize_validator">initialize_validator</a>(pool_address: <b>address</b>, validator: &<a href="genesis.md#0x1_genesis_ValidatorConfiguration">genesis::ValidatorConfiguration</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="genesis.md#0x1_genesis_initialize_validator">initialize_validator</a>(pool_address: <b>address</b>, validator: &<a href="genesis.md#0x1_genesis_ValidatorConfiguration">ValidatorConfiguration</a>) {
+    <b>let</b> operator = &<a href="create_signer.md#0x1_create_signer">create_signer</a>(validator.operator_address);
+
+    <a href="stake.md#0x1_stake_rotate_consensus_key">stake::rotate_consensus_key</a>(
+        operator,
+        pool_address,
+        validator.consensus_pubkey,
+        validator.proof_of_possession,
+    );
+    <a href="stake.md#0x1_stake_update_network_and_fullnode_addresses">stake::update_network_and_fullnode_addresses</a>(
+        operator,
+        pool_address,
+        validator.network_addresses,
+        validator.full_node_network_addresses,
+    );
+    <a href="stake.md#0x1_stake_join_validator_set_internal">stake::join_validator_set_internal</a>(operator, pool_address);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_genesis_set_genesis_end"></a>
+
+## Function `set_genesis_end`
+
+The last step of genesis.
+
+
+<pre><code><b>fun</b> <a href="genesis.md#0x1_genesis_set_genesis_end">set_genesis_end</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="genesis.md#0x1_genesis_set_genesis_end">set_genesis_end</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>) {
+    <a href="chain_status.md#0x1_chain_status_set_genesis_end">chain_status::set_genesis_end</a>(aptos_framework);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+
+
+<a id="high-level-req"></a>
+
+### High-level Requirements
+
+<table>
+<tr>
+<th>No.</th><th>Requirement</th><th>Criticality</th><th>Implementation</th><th>Enforcement</th>
+</tr>
+
+<tr>
+<td>1</td>
+<td>All the core resources and modules should be created during genesis and owned by the Aptos framework account.</td>
+<td>Critical</td>
+<td>Resources created during genesis initialization: GovernanceResponsbility, ConsensusConfig, ExecutionConfig, Version, SetVersionCapability, ValidatorSet, ValidatorPerformance, StakingConfig, StorageGasConfig, StorageGas, GasScheduleV2, AggregatorFactory, SupplyConfig, ChainId, Configuration, BlockResource, StateStorageUsage, CurrentTimeMicroseconds. If some of the resources were to be owned by a malicious account, it could lead to the compromise of the chain, as these are core resources. It should be formally verified by a post condition to ensure that all the critical resources are owned by the Aptos framework.</td>
+<td>Formally verified via <a href="#high-level-req-1">initialize</a>.</td>
+</tr>
+
+<tr>
+<td>2</td>
+<td>Addresses ranging from 0x0 - 0xa should be reserved for the framework and part of aptos governance.</td>
+<td>Critical</td>
+<td>The function genesis::initialize calls account::create_framework_reserved_account for addresses 0x0, 0x2, 0x3, 0x4, ..., 0xa which creates an account and authentication_key for them. This should be formally verified by ensuring that at the beginning of the genesis::initialize function no Account resource exists for the reserved addresses, and at the end of the function, an Account resource exists.</td>
+<td>Formally verified via <a href="#high-level-req-2">initialize</a>.</td>
+</tr>
+
+<tr>
+<td>3</td>
+<td>The Aptos coin should be initialized during genesis and only the Aptos framework account should own the mint and burn capabilities for the APT token.</td>
+<td>Critical</td>
+<td>Both mint and burn capabilities are wrapped inside the stake::AptosCoinCapabilities and transaction_fee::AptosCoinCapabilities resources which are stored under the aptos framework account.</td>
+<td>Formally verified via <a href="#high-level-req-3">initialize_aptos_coin</a>.</td>
+</tr>
+
+<tr>
+<td>4</td>
+<td>An initial set of validators should exist before the end of genesis.</td>
+<td>Low</td>
+<td>To ensure that there will be a set of validators available to validate the genesis block, the length of the ValidatorSet.active_validators vector should be > 0.</td>
+<td>Formally verified via <a href="#high-level-req-4">set_genesis_end</a>.</td>
+</tr>
+
+<tr>
+<td>5</td>
+<td>The end of genesis should be marked on chain.</td>
+<td>Low</td>
+<td>The end of genesis is marked, on chain, via the chain_status::GenesisEndMarker resource. The ownership of this resource marks the operating state of the chain.</td>
+<td>Formally verified via <a href="#high-level-req-5">set_genesis_end</a>.</td>
+</tr>
+
+</table>
+
+
+
+<a id="module-level-spec"></a>
+
+### Module-level Specification
+
+
+<pre><code><b>pragma</b> verify = <b>true</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_initialize"></a>
+
+### Function `initialize`
+
+
+<pre><code><b>fun</b> <a href="genesis.md#0x1_genesis_initialize">initialize</a>(<a href="gas_schedule.md#0x1_gas_schedule">gas_schedule</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, <a href="chain_id.md#0x1_chain_id">chain_id</a>: u8, initial_version: u64, <a href="consensus_config.md#0x1_consensus_config">consensus_config</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, <a href="execution_config.md#0x1_execution_config">execution_config</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, epoch_interval_microsecs: u64, minimum_stake: u64, maximum_stake: u64, recurring_lockup_duration_secs: u64, allow_validator_set_change: bool, rewards_rate: u64, rewards_rate_denominator: u64, voting_power_increase_limit: u64)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> aborts_if_is_partial;
+<b>include</b> <a href="genesis.md#0x1_genesis_InitalizeRequires">InitalizeRequires</a>;
+// This enforces <a id="high-level-req-2" href="#high-level-req">high-level requirement 2</a>:
+<b>aborts_if</b> <b>exists</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(@0x0);
+<b>aborts_if</b> <b>exists</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(@0x2);
+<b>aborts_if</b> <b>exists</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(@0x3);
+<b>aborts_if</b> <b>exists</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(@0x4);
+<b>aborts_if</b> <b>exists</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(@0x5);
+<b>aborts_if</b> <b>exists</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(@0x6);
+<b>aborts_if</b> <b>exists</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(@0x7);
+<b>aborts_if</b> <b>exists</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(@0x8);
+<b>aborts_if</b> <b>exists</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(@0x9);
+<b>aborts_if</b> <b>exists</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(@0xa);
+<b>ensures</b> <b>exists</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(@0x0);
+<b>ensures</b> <b>exists</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(@0x2);
+<b>ensures</b> <b>exists</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(@0x3);
+<b>ensures</b> <b>exists</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(@0x4);
+<b>ensures</b> <b>exists</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(@0x5);
+<b>ensures</b> <b>exists</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(@0x6);
+<b>ensures</b> <b>exists</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(@0x7);
+<b>ensures</b> <b>exists</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(@0x8);
+<b>ensures</b> <b>exists</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(@0x9);
+<b>ensures</b> <b>exists</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(@0xa);
+// This enforces <a id="high-level-req-1" href="#high-level-req">high-level requirement 1</a>:
+<b>ensures</b> <b>exists</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_GovernanceResponsbility">aptos_governance::GovernanceResponsbility</a>&gt;(@aptos_framework);
+<b>ensures</b> <b>exists</b>&lt;<a href="consensus_config.md#0x1_consensus_config_ConsensusConfig">consensus_config::ConsensusConfig</a>&gt;(@aptos_framework);
+<b>ensures</b> <b>exists</b>&lt;<a href="execution_config.md#0x1_execution_config_ExecutionConfig">execution_config::ExecutionConfig</a>&gt;(@aptos_framework);
+<b>ensures</b> <b>exists</b>&lt;<a href="version.md#0x1_version_Version">version::Version</a>&gt;(@aptos_framework);
+<b>ensures</b> <b>exists</b>&lt;<a href="stake.md#0x1_stake_ValidatorSet">stake::ValidatorSet</a>&gt;(@aptos_framework);
+<b>ensures</b> <b>exists</b>&lt;<a href="stake.md#0x1_stake_ValidatorPerformance">stake::ValidatorPerformance</a>&gt;(@aptos_framework);
+<b>ensures</b> <b>exists</b>&lt;<a href="storage_gas.md#0x1_storage_gas_StorageGasConfig">storage_gas::StorageGasConfig</a>&gt;(@aptos_framework);
+<b>ensures</b> <b>exists</b>&lt;<a href="storage_gas.md#0x1_storage_gas_StorageGas">storage_gas::StorageGas</a>&gt;(@aptos_framework);
+<b>ensures</b> <b>exists</b>&lt;<a href="gas_schedule.md#0x1_gas_schedule_GasScheduleV2">gas_schedule::GasScheduleV2</a>&gt;(@aptos_framework);
+<b>ensures</b> <b>exists</b>&lt;<a href="aggregator_factory.md#0x1_aggregator_factory_AggregatorFactory">aggregator_factory::AggregatorFactory</a>&gt;(@aptos_framework);
+<b>ensures</b> <b>exists</b>&lt;<a href="coin.md#0x1_coin_SupplyConfig">coin::SupplyConfig</a>&gt;(@aptos_framework);
+<b>ensures</b> <b>exists</b>&lt;<a href="chain_id.md#0x1_chain_id_ChainId">chain_id::ChainId</a>&gt;(@aptos_framework);
+<b>ensures</b> <b>exists</b>&lt;<a href="reconfiguration.md#0x1_reconfiguration_Configuration">reconfiguration::Configuration</a>&gt;(@aptos_framework);
+<b>ensures</b> <b>exists</b>&lt;<a href="block.md#0x1_block_BlockResource">block::BlockResource</a>&gt;(@aptos_framework);
+<b>ensures</b> <b>exists</b>&lt;<a href="state_storage.md#0x1_state_storage_StateStorageUsage">state_storage::StateStorageUsage</a>&gt;(@aptos_framework);
+<b>ensures</b> <b>exists</b>&lt;<a href="timestamp.md#0x1_timestamp_CurrentTimeMicroseconds">timestamp::CurrentTimeMicroseconds</a>&gt;(@aptos_framework);
+<b>ensures</b> <b>exists</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(@aptos_framework);
+<b>ensures</b> <b>exists</b>&lt;<a href="version.md#0x1_version_SetVersionCapability">version::SetVersionCapability</a>&gt;(@aptos_framework);
+<b>ensures</b> <b>exists</b>&lt;<a href="staking_config.md#0x1_staking_config_StakingConfig">staking_config::StakingConfig</a>&gt;(@aptos_framework);
+</code></pre>
+
+
+
+<a id="@Specification_1_initialize_aptos_coin"></a>
+
+### Function `initialize_aptos_coin`
+
+
+<pre><code><b>fun</b> <a href="genesis.md#0x1_genesis_initialize_aptos_coin">initialize_aptos_coin</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+
+<pre><code>// This enforces <a id="high-level-req-3" href="#high-level-req">high-level requirement 3</a>:
+<b>requires</b> !<b>exists</b>&lt;<a href="stake.md#0x1_stake_AptosCoinCapabilities">stake::AptosCoinCapabilities</a>&gt;(@aptos_framework);
+<b>ensures</b> <b>exists</b>&lt;<a href="stake.md#0x1_stake_AptosCoinCapabilities">stake::AptosCoinCapabilities</a>&gt;(@aptos_framework);
+<b>requires</b> <b>exists</b>&lt;<a href="transaction_fee.md#0x1_transaction_fee_AptosCoinCapabilities">transaction_fee::AptosCoinCapabilities</a>&gt;(@aptos_framework);
+<b>ensures</b> <b>exists</b>&lt;<a href="transaction_fee.md#0x1_transaction_fee_AptosCoinCapabilities">transaction_fee::AptosCoinCapabilities</a>&gt;(@aptos_framework);
+</code></pre>
+
+
+
+<a id="@Specification_1_create_initialize_validators_with_commission"></a>
+
+### Function `create_initialize_validators_with_commission`
+
+
+<pre><code><b>fun</b> <a href="genesis.md#0x1_genesis_create_initialize_validators_with_commission">create_initialize_validators_with_commission</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, use_staking_contract: bool, validators: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="genesis.md#0x1_genesis_ValidatorConfigurationWithCommission">genesis::ValidatorConfigurationWithCommission</a>&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify_duration_estimate = 120;
+<b>include</b> <a href="stake.md#0x1_stake_ResourceRequirement">stake::ResourceRequirement</a>;
+<b>include</b> <a href="stake.md#0x1_stake_GetReconfigStartTimeRequirement">stake::GetReconfigStartTimeRequirement</a>;
+<b>include</b> <a href="genesis.md#0x1_genesis_CompareTimeRequires">CompareTimeRequires</a>;
+<b>include</b> <a href="aptos_coin.md#0x1_aptos_coin_ExistsAptosCoin">aptos_coin::ExistsAptosCoin</a>;
+</code></pre>
+
+
+
+<a id="@Specification_1_create_initialize_validators"></a>
+
+### Function `create_initialize_validators`
+
+
+<pre><code><b>fun</b> <a href="genesis.md#0x1_genesis_create_initialize_validators">create_initialize_validators</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, validators: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="genesis.md#0x1_genesis_ValidatorConfiguration">genesis::ValidatorConfiguration</a>&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify_duration_estimate = 120;
+<b>include</b> <a href="stake.md#0x1_stake_ResourceRequirement">stake::ResourceRequirement</a>;
+<b>include</b> <a href="stake.md#0x1_stake_GetReconfigStartTimeRequirement">stake::GetReconfigStartTimeRequirement</a>;
+<b>include</b> <a href="genesis.md#0x1_genesis_CompareTimeRequires">CompareTimeRequires</a>;
+<b>include</b> <a href="aptos_coin.md#0x1_aptos_coin_ExistsAptosCoin">aptos_coin::ExistsAptosCoin</a>;
+</code></pre>
+
+
+
+<a id="@Specification_1_create_initialize_validator"></a>
+
+### Function `create_initialize_validator`
+
+
+<pre><code><b>fun</b> <a href="genesis.md#0x1_genesis_create_initialize_validator">create_initialize_validator</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, commission_config: &<a href="genesis.md#0x1_genesis_ValidatorConfigurationWithCommission">genesis::ValidatorConfigurationWithCommission</a>, use_staking_contract: bool)
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="stake.md#0x1_stake_ResourceRequirement">stake::ResourceRequirement</a>;
+</code></pre>
+
+
+
+<a id="@Specification_1_set_genesis_end"></a>
+
+### Function `set_genesis_end`
+
+
+<pre><code><b>fun</b> <a href="genesis.md#0x1_genesis_set_genesis_end">set_genesis_end</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> delegate_invariants_to_caller;
+// This enforces <a id="high-level-req-4" href="#high-level-req">high-level requirement 4</a>:
+<b>requires</b> len(<b>global</b>&lt;<a href="stake.md#0x1_stake_ValidatorSet">stake::ValidatorSet</a>&gt;(@aptos_framework).active_validators) &gt;= 1;
+// This enforces <a id="high-level-req-5" href="#high-level-req">high-level requirement 5</a>:
+<b>let</b> addr = std::signer::address_of(aptos_framework);
+<b>aborts_if</b> addr != @aptos_framework;
+<b>aborts_if</b> <b>exists</b>&lt;<a href="chain_status.md#0x1_chain_status_GenesisEndMarker">chain_status::GenesisEndMarker</a>&gt;(@aptos_framework);
+<b>ensures</b> <b>global</b>&lt;<a href="chain_status.md#0x1_chain_status_GenesisEndMarker">chain_status::GenesisEndMarker</a>&gt;(@aptos_framework) == <a href="chain_status.md#0x1_chain_status_GenesisEndMarker">chain_status::GenesisEndMarker</a> {};
+</code></pre>
+
+
+
+
+<a id="0x1_genesis_InitalizeRequires"></a>
+
+
+<pre><code><b>schema</b> <a href="genesis.md#0x1_genesis_InitalizeRequires">InitalizeRequires</a> {
+    <a href="execution_config.md#0x1_execution_config">execution_config</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+    <b>requires</b> !<b>exists</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(@aptos_framework);
+    <b>requires</b> <a href="chain_status.md#0x1_chain_status_is_operating">chain_status::is_operating</a>();
+    <b>requires</b> len(<a href="execution_config.md#0x1_execution_config">execution_config</a>) &gt; 0;
+    <b>requires</b> <b>exists</b>&lt;<a href="staking_config.md#0x1_staking_config_StakingRewardsConfig">staking_config::StakingRewardsConfig</a>&gt;(@aptos_framework);
+    <b>requires</b> <b>exists</b>&lt;<a href="stake.md#0x1_stake_ValidatorFees">stake::ValidatorFees</a>&gt;(@aptos_framework);
+    <b>requires</b> <b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinInfo">coin::CoinInfo</a>&lt;AptosCoin&gt;&gt;(@aptos_framework);
+    <b>include</b> <a href="genesis.md#0x1_genesis_CompareTimeRequires">CompareTimeRequires</a>;
+    <b>include</b> <a href="transaction_fee.md#0x1_transaction_fee_RequiresCollectedFeesPerValueLeqBlockAptosSupply">transaction_fee::RequiresCollectedFeesPerValueLeqBlockAptosSupply</a>;
+}
+</code></pre>
+
+
+
+
+<a id="0x1_genesis_CompareTimeRequires"></a>
+
+
+<pre><code><b>schema</b> <a href="genesis.md#0x1_genesis_CompareTimeRequires">CompareTimeRequires</a> {
+    <b>let</b> staking_rewards_config = <b>global</b>&lt;<a href="staking_config.md#0x1_staking_config_StakingRewardsConfig">staking_config::StakingRewardsConfig</a>&gt;(@aptos_framework);
+    <b>requires</b> staking_rewards_config.last_rewards_rate_period_start_in_secs &lt;= <a href="timestamp.md#0x1_timestamp_spec_now_seconds">timestamp::spec_now_seconds</a>();
+}
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/governance_proposal.md b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/governance_proposal.md
new file mode 100644
index 0000000000000..e67b67aad759d
--- /dev/null
+++ b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/governance_proposal.md
@@ -0,0 +1,178 @@
+
+<a id="0x1_governance_proposal"></a>
+
+# Module `0x1::governance_proposal`
+
+Define the GovernanceProposal that will be used as part of on-chain governance by AptosGovernance.
+
+This is separate from the AptosGovernance module to avoid circular dependency between AptosGovernance and Stake.
+
+
+-  [Struct `GovernanceProposal`](#0x1_governance_proposal_GovernanceProposal)
+-  [Function `create_proposal`](#0x1_governance_proposal_create_proposal)
+-  [Function `create_empty_proposal`](#0x1_governance_proposal_create_empty_proposal)
+-  [Specification](#@Specification_0)
+    -  [Function `create_proposal`](#@Specification_0_create_proposal)
+    -  [High-level Requirements](#high-level-req)
+    -  [Module-level Specification](#module-level-spec)
+    -  [Function `create_empty_proposal`](#@Specification_0_create_empty_proposal)
+
+
+<pre><code></code></pre>
+
+
+
+<a id="0x1_governance_proposal_GovernanceProposal"></a>
+
+## Struct `GovernanceProposal`
+
+
+
+<pre><code><b>struct</b> <a href="governance_proposal.md#0x1_governance_proposal_GovernanceProposal">GovernanceProposal</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>dummy_field: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_governance_proposal_create_proposal"></a>
+
+## Function `create_proposal`
+
+Create and return a GovernanceProposal resource. Can only be called by AptosGovernance
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="governance_proposal.md#0x1_governance_proposal_create_proposal">create_proposal</a>(): <a href="governance_proposal.md#0x1_governance_proposal_GovernanceProposal">governance_proposal::GovernanceProposal</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="governance_proposal.md#0x1_governance_proposal_create_proposal">create_proposal</a>(): <a href="governance_proposal.md#0x1_governance_proposal_GovernanceProposal">GovernanceProposal</a> {
+    <a href="governance_proposal.md#0x1_governance_proposal_GovernanceProposal">GovernanceProposal</a> {}
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_governance_proposal_create_empty_proposal"></a>
+
+## Function `create_empty_proposal`
+
+Useful for AptosGovernance to create an empty proposal as proof.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="governance_proposal.md#0x1_governance_proposal_create_empty_proposal">create_empty_proposal</a>(): <a href="governance_proposal.md#0x1_governance_proposal_GovernanceProposal">governance_proposal::GovernanceProposal</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="governance_proposal.md#0x1_governance_proposal_create_empty_proposal">create_empty_proposal</a>(): <a href="governance_proposal.md#0x1_governance_proposal_GovernanceProposal">GovernanceProposal</a> {
+    <a href="governance_proposal.md#0x1_governance_proposal_create_proposal">create_proposal</a>()
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_0"></a>
+
+## Specification
+
+
+<a id="@Specification_0_create_proposal"></a>
+
+### Function `create_proposal`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="governance_proposal.md#0x1_governance_proposal_create_proposal">create_proposal</a>(): <a href="governance_proposal.md#0x1_governance_proposal_GovernanceProposal">governance_proposal::GovernanceProposal</a>
+</code></pre>
+
+
+
+
+
+<a id="high-level-req"></a>
+
+### High-level Requirements
+
+<table>
+<tr>
+<th>No.</th><th>Requirement</th><th>Criticality</th><th>Implementation</th><th>Enforcement</th>
+</tr>
+
+<tr>
+<td>1</td>
+<td>Creating a proposal should never abort but should always return a governance proposal resource.</td>
+<td>Medium</td>
+<td>Both create_proposal and create_empty_proposal functions return a GovernanceProposal resource.</td>
+<td>Enforced via <a href="#high-level-req-1.1">create_proposal</a> and <a href="#high-level-req-1.2">create_empty_proposal</a>.</td>
+</tr>
+
+<tr>
+<td>2</td>
+<td>The governance proposal module should only be accessible to the aptos governance.</td>
+<td>Medium</td>
+<td>Both create_proposal and create_empty_proposal functions are only available to the friend module aptos_framework::aptos_governance.</td>
+<td>Enforced via friend module relationship.</td>
+</tr>
+
+</table>
+
+
+
+
+<a id="module-level-spec"></a>
+
+### Module-level Specification
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+// This enforces <a id="high-level-req-1.1" href="#high-level-req">high-level requirement 1</a>:
+<b>ensures</b> result == <a href="governance_proposal.md#0x1_governance_proposal_GovernanceProposal">GovernanceProposal</a> {};
+</code></pre>
+
+
+
+<a id="@Specification_0_create_empty_proposal"></a>
+
+### Function `create_empty_proposal`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="governance_proposal.md#0x1_governance_proposal_create_empty_proposal">create_empty_proposal</a>(): <a href="governance_proposal.md#0x1_governance_proposal_GovernanceProposal">governance_proposal::GovernanceProposal</a>
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+// This enforces <a id="high-level-req-1.2" href="#high-level-req">high-level requirement 1</a>:
+<b>ensures</b> result == <a href="governance_proposal.md#0x1_governance_proposal_GovernanceProposal">GovernanceProposal</a> {};
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/guid.md b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/guid.md
new file mode 100644
index 0000000000000..de8f0986edfd6
--- /dev/null
+++ b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/guid.md
@@ -0,0 +1,522 @@
+
+<a id="0x1_guid"></a>
+
+# Module `0x1::guid`
+
+A module for generating globally unique identifiers
+
+
+-  [Struct `GUID`](#0x1_guid_GUID)
+-  [Struct `ID`](#0x1_guid_ID)
+-  [Constants](#@Constants_0)
+-  [Function `create`](#0x1_guid_create)
+-  [Function `create_id`](#0x1_guid_create_id)
+-  [Function `id`](#0x1_guid_id)
+-  [Function `creator_address`](#0x1_guid_creator_address)
+-  [Function `id_creator_address`](#0x1_guid_id_creator_address)
+-  [Function `creation_num`](#0x1_guid_creation_num)
+-  [Function `id_creation_num`](#0x1_guid_id_creation_num)
+-  [Function `eq_id`](#0x1_guid_eq_id)
+-  [Specification](#@Specification_1)
+    -  [High-level Requirements](#high-level-req)
+    -  [Module-level Specification](#module-level-spec)
+    -  [Function `create`](#@Specification_1_create)
+    -  [Function `create_id`](#@Specification_1_create_id)
+    -  [Function `id`](#@Specification_1_id)
+    -  [Function `creator_address`](#@Specification_1_creator_address)
+    -  [Function `id_creator_address`](#@Specification_1_id_creator_address)
+    -  [Function `creation_num`](#@Specification_1_creation_num)
+    -  [Function `id_creation_num`](#@Specification_1_id_creation_num)
+    -  [Function `eq_id`](#@Specification_1_eq_id)
+
+
+<pre><code></code></pre>
+
+
+
+<a id="0x1_guid_GUID"></a>
+
+## Struct `GUID`
+
+A globally unique identifier derived from the sender's address and a counter
+
+
+<pre><code><b>struct</b> <a href="guid.md#0x1_guid_GUID">GUID</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>id: <a href="guid.md#0x1_guid_ID">guid::ID</a></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_guid_ID"></a>
+
+## Struct `ID`
+
+A non-privileged identifier that can be freely created by anyone. Useful for looking up GUID's.
+
+
+<pre><code><b>struct</b> <a href="guid.md#0x1_guid_ID">ID</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>creation_num: u64</code>
+</dt>
+<dd>
+ If creation_num is <code>i</code>, this is the <code>i+1</code>th GUID created by <code>addr</code>
+</dd>
+<dt>
+<code>addr: <b>address</b></code>
+</dt>
+<dd>
+ Address that created the GUID
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_guid_EGUID_GENERATOR_NOT_PUBLISHED"></a>
+
+GUID generator must be published ahead of first usage of <code>create_with_capability</code> function.
+
+
+<pre><code><b>const</b> <a href="guid.md#0x1_guid_EGUID_GENERATOR_NOT_PUBLISHED">EGUID_GENERATOR_NOT_PUBLISHED</a>: u64 = 0;
+</code></pre>
+
+
+
+<a id="0x1_guid_create"></a>
+
+## Function `create`
+
+Create and return a new GUID from a trusted module.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="guid.md#0x1_guid_create">create</a>(addr: <b>address</b>, creation_num_ref: &<b>mut</b> u64): <a href="guid.md#0x1_guid_GUID">guid::GUID</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="guid.md#0x1_guid_create">create</a>(addr: <b>address</b>, creation_num_ref: &<b>mut</b> u64): <a href="guid.md#0x1_guid_GUID">GUID</a> {
+    <b>let</b> creation_num = *creation_num_ref;
+    *creation_num_ref = creation_num + 1;
+    <a href="guid.md#0x1_guid_GUID">GUID</a> {
+        id: <a href="guid.md#0x1_guid_ID">ID</a> {
+            creation_num,
+            addr,
+        }
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_guid_create_id"></a>
+
+## Function `create_id`
+
+Create a non-privileged id from <code>addr</code> and <code>creation_num</code>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="guid.md#0x1_guid_create_id">create_id</a>(addr: <b>address</b>, creation_num: u64): <a href="guid.md#0x1_guid_ID">guid::ID</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="guid.md#0x1_guid_create_id">create_id</a>(addr: <b>address</b>, creation_num: u64): <a href="guid.md#0x1_guid_ID">ID</a> {
+    <a href="guid.md#0x1_guid_ID">ID</a> { creation_num, addr }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_guid_id"></a>
+
+## Function `id`
+
+Get the non-privileged ID associated with a GUID
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="guid.md#0x1_guid_id">id</a>(<a href="guid.md#0x1_guid">guid</a>: &<a href="guid.md#0x1_guid_GUID">guid::GUID</a>): <a href="guid.md#0x1_guid_ID">guid::ID</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="guid.md#0x1_guid_id">id</a>(<a href="guid.md#0x1_guid">guid</a>: &<a href="guid.md#0x1_guid_GUID">GUID</a>): <a href="guid.md#0x1_guid_ID">ID</a> {
+    <a href="guid.md#0x1_guid">guid</a>.id
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_guid_creator_address"></a>
+
+## Function `creator_address`
+
+Return the account address that created the GUID
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="guid.md#0x1_guid_creator_address">creator_address</a>(<a href="guid.md#0x1_guid">guid</a>: &<a href="guid.md#0x1_guid_GUID">guid::GUID</a>): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="guid.md#0x1_guid_creator_address">creator_address</a>(<a href="guid.md#0x1_guid">guid</a>: &<a href="guid.md#0x1_guid_GUID">GUID</a>): <b>address</b> {
+    <a href="guid.md#0x1_guid">guid</a>.id.addr
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_guid_id_creator_address"></a>
+
+## Function `id_creator_address`
+
+Return the account address that created the guid::ID
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="guid.md#0x1_guid_id_creator_address">id_creator_address</a>(id: &<a href="guid.md#0x1_guid_ID">guid::ID</a>): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="guid.md#0x1_guid_id_creator_address">id_creator_address</a>(id: &<a href="guid.md#0x1_guid_ID">ID</a>): <b>address</b> {
+    id.addr
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_guid_creation_num"></a>
+
+## Function `creation_num`
+
+Return the creation number associated with the GUID
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="guid.md#0x1_guid_creation_num">creation_num</a>(<a href="guid.md#0x1_guid">guid</a>: &<a href="guid.md#0x1_guid_GUID">guid::GUID</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="guid.md#0x1_guid_creation_num">creation_num</a>(<a href="guid.md#0x1_guid">guid</a>: &<a href="guid.md#0x1_guid_GUID">GUID</a>): u64 {
+    <a href="guid.md#0x1_guid">guid</a>.id.creation_num
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_guid_id_creation_num"></a>
+
+## Function `id_creation_num`
+
+Return the creation number associated with the guid::ID
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="guid.md#0x1_guid_id_creation_num">id_creation_num</a>(id: &<a href="guid.md#0x1_guid_ID">guid::ID</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="guid.md#0x1_guid_id_creation_num">id_creation_num</a>(id: &<a href="guid.md#0x1_guid_ID">ID</a>): u64 {
+    id.creation_num
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_guid_eq_id"></a>
+
+## Function `eq_id`
+
+Return true if the GUID's ID is <code>id</code>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="guid.md#0x1_guid_eq_id">eq_id</a>(<a href="guid.md#0x1_guid">guid</a>: &<a href="guid.md#0x1_guid_GUID">guid::GUID</a>, id: &<a href="guid.md#0x1_guid_ID">guid::ID</a>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="guid.md#0x1_guid_eq_id">eq_id</a>(<a href="guid.md#0x1_guid">guid</a>: &<a href="guid.md#0x1_guid_GUID">GUID</a>, id: &<a href="guid.md#0x1_guid_ID">ID</a>): bool {
+    &<a href="guid.md#0x1_guid">guid</a>.id == id
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+
+
+<a id="high-level-req"></a>
+
+### High-level Requirements
+
+<table>
+<tr>
+<th>No.</th><th>Requirement</th><th>Criticality</th><th>Implementation</th><th>Enforcement</th>
+</tr>
+
+<tr>
+<td>1</td>
+<td>The creation of GUID constructs a unique GUID by combining an address with an incremented creation number.</td>
+<td>Low</td>
+<td>The create function generates a new GUID by combining an address with an incremented creation number, effectively creating a unique identifier.</td>
+<td>Enforced via <a href="#high-level-req-1">create</a>.</td>
+</tr>
+
+<tr>
+<td>2</td>
+<td>The operations on GUID and ID, such as construction, field access, and equality comparison, should not abort.</td>
+<td>Low</td>
+<td>The following functions will never abort: (1) create_id, (2) id, (3) creator_address, (4) id_creator_address, (5) creation_num, (6) id_creation_num, and (7) eq_id.</td>
+<td>Verified via <a href="#high-level-req-2.1">create_id</a>, <a href="#high-level-req-2.2">id</a>, <a href="#high-level-req-2.3">creator_address</a>, <a href="#high-level-req-2.4">id_creator_address</a>, <a href="#high-level-req-2.5">creation_num</a>, <a href="#high-level-req-2.6">id_creation_num</a>, and <a href="#high-level-req-2.7">eq_id</a>.</td>
+</tr>
+
+<tr>
+<td>3</td>
+<td>The creation number should increment by 1 with each new creation.</td>
+<td>Low</td>
+<td>An account can only own up to MAX_U64 resources. Not incrementing the guid_creation_num constantly could lead to shrinking the space for new resources.</td>
+<td>Enforced via <a href="#high-level-req-3">create</a>.</td>
+</tr>
+
+<tr>
+<td>4</td>
+<td>The creation number and address of an ID / GUID must be immutable.</td>
+<td>Medium</td>
+<td>The addr and creation_num values are meant to be constant and never updated as they are unique and used for identification.</td>
+<td>Audited: This is enforced through missing functionality to update the creation_num or addr.</td>
+</tr>
+
+</table>
+
+
+
+<a id="module-level-spec"></a>
+
+### Module-level Specification
+
+
+<pre><code><b>pragma</b> verify = <b>true</b>;
+<b>pragma</b> aborts_if_is_strict;
+</code></pre>
+
+
+
+<a id="@Specification_1_create"></a>
+
+### Function `create`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="guid.md#0x1_guid_create">create</a>(addr: <b>address</b>, creation_num_ref: &<b>mut</b> u64): <a href="guid.md#0x1_guid_GUID">guid::GUID</a>
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> creation_num_ref + 1 &gt; MAX_U64;
+// This enforces <a id="high-level-req-1" href="#high-level-req">high-level requirement 1</a>:
+<b>ensures</b> result.id.creation_num == <b>old</b>(creation_num_ref);
+// This enforces <a id="high-level-req-3" href="#high-level-req">high-level requirement 3</a>:
+<b>ensures</b> creation_num_ref == <b>old</b>(creation_num_ref) + 1;
+</code></pre>
+
+
+
+<a id="@Specification_1_create_id"></a>
+
+### Function `create_id`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="guid.md#0x1_guid_create_id">create_id</a>(addr: <b>address</b>, creation_num: u64): <a href="guid.md#0x1_guid_ID">guid::ID</a>
+</code></pre>
+
+
+
+
+<pre><code>// This enforces <a id="high-level-req-2.1" href="#high-level-req">high-level requirement 2</a>:
+<b>aborts_if</b> <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_id"></a>
+
+### Function `id`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="guid.md#0x1_guid_id">id</a>(<a href="guid.md#0x1_guid">guid</a>: &<a href="guid.md#0x1_guid_GUID">guid::GUID</a>): <a href="guid.md#0x1_guid_ID">guid::ID</a>
+</code></pre>
+
+
+
+
+<pre><code>// This enforces <a id="high-level-req-2.2" href="#high-level-req">high-level requirement 2</a>:
+<b>aborts_if</b> <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_creator_address"></a>
+
+### Function `creator_address`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="guid.md#0x1_guid_creator_address">creator_address</a>(<a href="guid.md#0x1_guid">guid</a>: &<a href="guid.md#0x1_guid_GUID">guid::GUID</a>): <b>address</b>
+</code></pre>
+
+
+
+
+<pre><code>// This enforces <a id="high-level-req-2.3" href="#high-level-req">high-level requirement 2</a>:
+<b>aborts_if</b> <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_id_creator_address"></a>
+
+### Function `id_creator_address`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="guid.md#0x1_guid_id_creator_address">id_creator_address</a>(id: &<a href="guid.md#0x1_guid_ID">guid::ID</a>): <b>address</b>
+</code></pre>
+
+
+
+
+<pre><code>// This enforces <a id="high-level-req-2.4" href="#high-level-req">high-level requirement 2</a>:
+<b>aborts_if</b> <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_creation_num"></a>
+
+### Function `creation_num`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="guid.md#0x1_guid_creation_num">creation_num</a>(<a href="guid.md#0x1_guid">guid</a>: &<a href="guid.md#0x1_guid_GUID">guid::GUID</a>): u64
+</code></pre>
+
+
+
+
+<pre><code>// This enforces <a id="high-level-req-2.5" href="#high-level-req">high-level requirement 2</a>:
+<b>aborts_if</b> <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_id_creation_num"></a>
+
+### Function `id_creation_num`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="guid.md#0x1_guid_id_creation_num">id_creation_num</a>(id: &<a href="guid.md#0x1_guid_ID">guid::ID</a>): u64
+</code></pre>
+
+
+
+
+<pre><code>// This enforces <a id="high-level-req-2.6" href="#high-level-req">high-level requirement 2</a>:
+<b>aborts_if</b> <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_eq_id"></a>
+
+### Function `eq_id`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="guid.md#0x1_guid_eq_id">eq_id</a>(<a href="guid.md#0x1_guid">guid</a>: &<a href="guid.md#0x1_guid_GUID">guid::GUID</a>, id: &<a href="guid.md#0x1_guid_ID">guid::ID</a>): bool
+</code></pre>
+
+
+
+
+<pre><code>// This enforces <a id="high-level-req-2.7" href="#high-level-req">high-level requirement 2</a>:
+<b>aborts_if</b> <b>false</b>;
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/jwk_consensus_config.md b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/jwk_consensus_config.md
new file mode 100644
index 0000000000000..69e93270bcdf3
--- /dev/null
+++ b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/jwk_consensus_config.md
@@ -0,0 +1,377 @@
+
+<a id="0x1_jwk_consensus_config"></a>
+
+# Module `0x1::jwk_consensus_config`
+
+Structs and functions related to JWK consensus configurations.
+
+
+-  [Resource `JWKConsensusConfig`](#0x1_jwk_consensus_config_JWKConsensusConfig)
+-  [Struct `ConfigOff`](#0x1_jwk_consensus_config_ConfigOff)
+-  [Struct `OIDCProvider`](#0x1_jwk_consensus_config_OIDCProvider)
+-  [Struct `ConfigV1`](#0x1_jwk_consensus_config_ConfigV1)
+-  [Constants](#@Constants_0)
+-  [Function `initialize`](#0x1_jwk_consensus_config_initialize)
+-  [Function `set_for_next_epoch`](#0x1_jwk_consensus_config_set_for_next_epoch)
+-  [Function `on_new_epoch`](#0x1_jwk_consensus_config_on_new_epoch)
+-  [Function `new_off`](#0x1_jwk_consensus_config_new_off)
+-  [Function `new_v1`](#0x1_jwk_consensus_config_new_v1)
+-  [Function `new_oidc_provider`](#0x1_jwk_consensus_config_new_oidc_provider)
+-  [Specification](#@Specification_1)
+    -  [Function `on_new_epoch`](#@Specification_1_on_new_epoch)
+
+
+<pre><code><b>use</b> <a href="config_buffer.md#0x1_config_buffer">0x1::config_buffer</a>;
+<b>use</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/copyable_any.md#0x1_copyable_any">0x1::copyable_any</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option">0x1::option</a>;
+<b>use</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map">0x1::simple_map</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string">0x1::string</a>;
+<b>use</b> <a href="system_addresses.md#0x1_system_addresses">0x1::system_addresses</a>;
+</code></pre>
+
+
+
+<a id="0x1_jwk_consensus_config_JWKConsensusConfig"></a>
+
+## Resource `JWKConsensusConfig`
+
+The configuration of the JWK consensus feature.
+
+
+<pre><code><b>struct</b> <a href="jwk_consensus_config.md#0x1_jwk_consensus_config_JWKConsensusConfig">JWKConsensusConfig</a> <b>has</b> drop, store, key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>variant: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/copyable_any.md#0x1_copyable_any_Any">copyable_any::Any</a></code>
+</dt>
+<dd>
+ A config variant packed as an <code>Any</code>.
+ Currently the variant type is one of the following.
+ - <code><a href="jwk_consensus_config.md#0x1_jwk_consensus_config_ConfigOff">ConfigOff</a></code>
+ - <code><a href="jwk_consensus_config.md#0x1_jwk_consensus_config_ConfigV1">ConfigV1</a></code>
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_jwk_consensus_config_ConfigOff"></a>
+
+## Struct `ConfigOff`
+
+A JWK consensus config variant indicating JWK consensus should not run.
+
+
+<pre><code><b>struct</b> <a href="jwk_consensus_config.md#0x1_jwk_consensus_config_ConfigOff">ConfigOff</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>dummy_field: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_jwk_consensus_config_OIDCProvider"></a>
+
+## Struct `OIDCProvider`
+
+
+
+<pre><code><b>struct</b> <a href="jwk_consensus_config.md#0x1_jwk_consensus_config_OIDCProvider">OIDCProvider</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>name: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>config_url: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_jwk_consensus_config_ConfigV1"></a>
+
+## Struct `ConfigV1`
+
+A JWK consensus config variant indicating JWK consensus should run to watch a given list of OIDC providers.
+
+
+<pre><code><b>struct</b> <a href="jwk_consensus_config.md#0x1_jwk_consensus_config_ConfigV1">ConfigV1</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>oidc_providers: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="jwk_consensus_config.md#0x1_jwk_consensus_config_OIDCProvider">jwk_consensus_config::OIDCProvider</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_jwk_consensus_config_EDUPLICATE_PROVIDERS"></a>
+
+<code><a href="jwk_consensus_config.md#0x1_jwk_consensus_config_ConfigV1">ConfigV1</a></code> creation failed with duplicated providers given.
+
+
+<pre><code><b>const</b> <a href="jwk_consensus_config.md#0x1_jwk_consensus_config_EDUPLICATE_PROVIDERS">EDUPLICATE_PROVIDERS</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_jwk_consensus_config_initialize"></a>
+
+## Function `initialize`
+
+Initialize the configuration. Used in genesis or governance.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="jwk_consensus_config.md#0x1_jwk_consensus_config_initialize">initialize</a>(framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, config: <a href="jwk_consensus_config.md#0x1_jwk_consensus_config_JWKConsensusConfig">jwk_consensus_config::JWKConsensusConfig</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="jwk_consensus_config.md#0x1_jwk_consensus_config_initialize">initialize</a>(framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, config: <a href="jwk_consensus_config.md#0x1_jwk_consensus_config_JWKConsensusConfig">JWKConsensusConfig</a>) {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(framework);
+    <b>if</b> (!<b>exists</b>&lt;<a href="jwk_consensus_config.md#0x1_jwk_consensus_config_JWKConsensusConfig">JWKConsensusConfig</a>&gt;(@aptos_framework)) {
+        <b>move_to</b>(framework, config);
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_jwk_consensus_config_set_for_next_epoch"></a>
+
+## Function `set_for_next_epoch`
+
+This can be called by on-chain governance to update JWK consensus configs for the next epoch.
+Example usage:
+```
+use aptos_framework::jwk_consensus_config;
+use aptos_framework::aptos_governance;
+// ...
+let config = jwk_consensus_config::new_v1(vector[]);
+jwk_consensus_config::set_for_next_epoch(&framework_signer, config);
+aptos_governance::reconfigure(&framework_signer);
+```
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="jwk_consensus_config.md#0x1_jwk_consensus_config_set_for_next_epoch">set_for_next_epoch</a>(framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, config: <a href="jwk_consensus_config.md#0x1_jwk_consensus_config_JWKConsensusConfig">jwk_consensus_config::JWKConsensusConfig</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="jwk_consensus_config.md#0x1_jwk_consensus_config_set_for_next_epoch">set_for_next_epoch</a>(framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, config: <a href="jwk_consensus_config.md#0x1_jwk_consensus_config_JWKConsensusConfig">JWKConsensusConfig</a>) {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(framework);
+    <a href="config_buffer.md#0x1_config_buffer_upsert">config_buffer::upsert</a>(config);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_jwk_consensus_config_on_new_epoch"></a>
+
+## Function `on_new_epoch`
+
+Only used in reconfigurations to apply the pending <code><a href="jwk_consensus_config.md#0x1_jwk_consensus_config_JWKConsensusConfig">JWKConsensusConfig</a></code>, if there is any.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="jwk_consensus_config.md#0x1_jwk_consensus_config_on_new_epoch">on_new_epoch</a>(framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="jwk_consensus_config.md#0x1_jwk_consensus_config_on_new_epoch">on_new_epoch</a>(framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>) <b>acquires</b> <a href="jwk_consensus_config.md#0x1_jwk_consensus_config_JWKConsensusConfig">JWKConsensusConfig</a> {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(framework);
+    <b>if</b> (<a href="config_buffer.md#0x1_config_buffer_does_exist">config_buffer::does_exist</a>&lt;<a href="jwk_consensus_config.md#0x1_jwk_consensus_config_JWKConsensusConfig">JWKConsensusConfig</a>&gt;()) {
+        <b>let</b> new_config = <a href="config_buffer.md#0x1_config_buffer_extract">config_buffer::extract</a>&lt;<a href="jwk_consensus_config.md#0x1_jwk_consensus_config_JWKConsensusConfig">JWKConsensusConfig</a>&gt;();
+        <b>if</b> (<b>exists</b>&lt;<a href="jwk_consensus_config.md#0x1_jwk_consensus_config_JWKConsensusConfig">JWKConsensusConfig</a>&gt;(@aptos_framework)) {
+            *<b>borrow_global_mut</b>&lt;<a href="jwk_consensus_config.md#0x1_jwk_consensus_config_JWKConsensusConfig">JWKConsensusConfig</a>&gt;(@aptos_framework) = new_config;
+        } <b>else</b> {
+            <b>move_to</b>(framework, new_config);
+        };
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_jwk_consensus_config_new_off"></a>
+
+## Function `new_off`
+
+Construct a <code><a href="jwk_consensus_config.md#0x1_jwk_consensus_config_JWKConsensusConfig">JWKConsensusConfig</a></code> of variant <code><a href="jwk_consensus_config.md#0x1_jwk_consensus_config_ConfigOff">ConfigOff</a></code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="jwk_consensus_config.md#0x1_jwk_consensus_config_new_off">new_off</a>(): <a href="jwk_consensus_config.md#0x1_jwk_consensus_config_JWKConsensusConfig">jwk_consensus_config::JWKConsensusConfig</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="jwk_consensus_config.md#0x1_jwk_consensus_config_new_off">new_off</a>(): <a href="jwk_consensus_config.md#0x1_jwk_consensus_config_JWKConsensusConfig">JWKConsensusConfig</a> {
+    <a href="jwk_consensus_config.md#0x1_jwk_consensus_config_JWKConsensusConfig">JWKConsensusConfig</a> {
+        variant: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/copyable_any.md#0x1_copyable_any_pack">copyable_any::pack</a>( <a href="jwk_consensus_config.md#0x1_jwk_consensus_config_ConfigOff">ConfigOff</a> {} )
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_jwk_consensus_config_new_v1"></a>
+
+## Function `new_v1`
+
+Construct a <code><a href="jwk_consensus_config.md#0x1_jwk_consensus_config_JWKConsensusConfig">JWKConsensusConfig</a></code> of variant <code><a href="jwk_consensus_config.md#0x1_jwk_consensus_config_ConfigV1">ConfigV1</a></code>.
+
+Abort if the given provider list contains duplicated provider names.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="jwk_consensus_config.md#0x1_jwk_consensus_config_new_v1">new_v1</a>(oidc_providers: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="jwk_consensus_config.md#0x1_jwk_consensus_config_OIDCProvider">jwk_consensus_config::OIDCProvider</a>&gt;): <a href="jwk_consensus_config.md#0x1_jwk_consensus_config_JWKConsensusConfig">jwk_consensus_config::JWKConsensusConfig</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="jwk_consensus_config.md#0x1_jwk_consensus_config_new_v1">new_v1</a>(oidc_providers: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="jwk_consensus_config.md#0x1_jwk_consensus_config_OIDCProvider">OIDCProvider</a>&gt;): <a href="jwk_consensus_config.md#0x1_jwk_consensus_config_JWKConsensusConfig">JWKConsensusConfig</a> {
+    <b>let</b> name_set = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_new">simple_map::new</a>&lt;String, u64&gt;();
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_for_each_ref">vector::for_each_ref</a>(&oidc_providers, |provider| {
+        <b>let</b> provider: &<a href="jwk_consensus_config.md#0x1_jwk_consensus_config_OIDCProvider">OIDCProvider</a> = provider;
+        <b>let</b> (_, old_value) = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_upsert">simple_map::upsert</a>(&<b>mut</b> name_set, provider.name, 0);
+        <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&old_value)) {
+            <b>abort</b>(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="jwk_consensus_config.md#0x1_jwk_consensus_config_EDUPLICATE_PROVIDERS">EDUPLICATE_PROVIDERS</a>))
+        }
+    });
+    <a href="jwk_consensus_config.md#0x1_jwk_consensus_config_JWKConsensusConfig">JWKConsensusConfig</a> {
+        variant: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/copyable_any.md#0x1_copyable_any_pack">copyable_any::pack</a>( <a href="jwk_consensus_config.md#0x1_jwk_consensus_config_ConfigV1">ConfigV1</a> { oidc_providers } )
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_jwk_consensus_config_new_oidc_provider"></a>
+
+## Function `new_oidc_provider`
+
+Construct an <code><a href="jwk_consensus_config.md#0x1_jwk_consensus_config_OIDCProvider">OIDCProvider</a></code> object.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="jwk_consensus_config.md#0x1_jwk_consensus_config_new_oidc_provider">new_oidc_provider</a>(name: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, config_url: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): <a href="jwk_consensus_config.md#0x1_jwk_consensus_config_OIDCProvider">jwk_consensus_config::OIDCProvider</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="jwk_consensus_config.md#0x1_jwk_consensus_config_new_oidc_provider">new_oidc_provider</a>(name: String, config_url: String): <a href="jwk_consensus_config.md#0x1_jwk_consensus_config_OIDCProvider">OIDCProvider</a> {
+    <a href="jwk_consensus_config.md#0x1_jwk_consensus_config_OIDCProvider">OIDCProvider</a> { name, config_url }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+<a id="@Specification_1_on_new_epoch"></a>
+
+### Function `on_new_epoch`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="jwk_consensus_config.md#0x1_jwk_consensus_config_on_new_epoch">on_new_epoch</a>(framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>requires</b> @aptos_framework == std::signer::address_of(framework);
+<b>include</b> <a href="config_buffer.md#0x1_config_buffer_OnNewEpochRequirement">config_buffer::OnNewEpochRequirement</a>&lt;<a href="jwk_consensus_config.md#0x1_jwk_consensus_config_JWKConsensusConfig">JWKConsensusConfig</a>&gt;;
+<b>aborts_if</b> <b>false</b>;
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/jwks.md b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/jwks.md
new file mode 100644
index 0000000000000..7554e55e99f41
--- /dev/null
+++ b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/jwks.md
@@ -0,0 +1,1675 @@
+
+<a id="0x1_jwks"></a>
+
+# Module `0x1::jwks`
+
+JWK functions and structs.
+
+Note: An important design constraint for this module is that the JWK consensus Rust code is unable to
+spawn a VM and make a Move function call. Instead, the JWK consensus Rust code will have to directly
+write some of the resources in this file. As a result, the structs in this file are declared so as to
+have a simple layout which is easily accessible in Rust.
+
+
+-  [Struct `OIDCProvider`](#0x1_jwks_OIDCProvider)
+-  [Resource `SupportedOIDCProviders`](#0x1_jwks_SupportedOIDCProviders)
+-  [Struct `UnsupportedJWK`](#0x1_jwks_UnsupportedJWK)
+-  [Struct `RSA_JWK`](#0x1_jwks_RSA_JWK)
+-  [Struct `JWK`](#0x1_jwks_JWK)
+-  [Struct `ProviderJWKs`](#0x1_jwks_ProviderJWKs)
+-  [Struct `AllProvidersJWKs`](#0x1_jwks_AllProvidersJWKs)
+-  [Resource `ObservedJWKs`](#0x1_jwks_ObservedJWKs)
+-  [Struct `ObservedJWKsUpdated`](#0x1_jwks_ObservedJWKsUpdated)
+-  [Struct `Patch`](#0x1_jwks_Patch)
+-  [Struct `PatchRemoveAll`](#0x1_jwks_PatchRemoveAll)
+-  [Struct `PatchRemoveIssuer`](#0x1_jwks_PatchRemoveIssuer)
+-  [Struct `PatchRemoveJWK`](#0x1_jwks_PatchRemoveJWK)
+-  [Struct `PatchUpsertJWK`](#0x1_jwks_PatchUpsertJWK)
+-  [Resource `Patches`](#0x1_jwks_Patches)
+-  [Resource `PatchedJWKs`](#0x1_jwks_PatchedJWKs)
+-  [Constants](#@Constants_0)
+-  [Function `get_patched_jwk`](#0x1_jwks_get_patched_jwk)
+-  [Function `try_get_patched_jwk`](#0x1_jwks_try_get_patched_jwk)
+-  [Function `upsert_oidc_provider`](#0x1_jwks_upsert_oidc_provider)
+-  [Function `upsert_oidc_provider_for_next_epoch`](#0x1_jwks_upsert_oidc_provider_for_next_epoch)
+-  [Function `remove_oidc_provider`](#0x1_jwks_remove_oidc_provider)
+-  [Function `remove_oidc_provider_for_next_epoch`](#0x1_jwks_remove_oidc_provider_for_next_epoch)
+-  [Function `on_new_epoch`](#0x1_jwks_on_new_epoch)
+-  [Function `set_patches`](#0x1_jwks_set_patches)
+-  [Function `new_patch_remove_all`](#0x1_jwks_new_patch_remove_all)
+-  [Function `new_patch_remove_issuer`](#0x1_jwks_new_patch_remove_issuer)
+-  [Function `new_patch_remove_jwk`](#0x1_jwks_new_patch_remove_jwk)
+-  [Function `new_patch_upsert_jwk`](#0x1_jwks_new_patch_upsert_jwk)
+-  [Function `new_rsa_jwk`](#0x1_jwks_new_rsa_jwk)
+-  [Function `new_unsupported_jwk`](#0x1_jwks_new_unsupported_jwk)
+-  [Function `initialize`](#0x1_jwks_initialize)
+-  [Function `remove_oidc_provider_internal`](#0x1_jwks_remove_oidc_provider_internal)
+-  [Function `upsert_into_observed_jwks`](#0x1_jwks_upsert_into_observed_jwks)
+-  [Function `remove_issuer_from_observed_jwks`](#0x1_jwks_remove_issuer_from_observed_jwks)
+-  [Function `regenerate_patched_jwks`](#0x1_jwks_regenerate_patched_jwks)
+-  [Function `try_get_jwk_by_issuer`](#0x1_jwks_try_get_jwk_by_issuer)
+-  [Function `try_get_jwk_by_id`](#0x1_jwks_try_get_jwk_by_id)
+-  [Function `get_jwk_id`](#0x1_jwks_get_jwk_id)
+-  [Function `upsert_provider_jwks`](#0x1_jwks_upsert_provider_jwks)
+-  [Function `remove_issuer`](#0x1_jwks_remove_issuer)
+-  [Function `upsert_jwk`](#0x1_jwks_upsert_jwk)
+-  [Function `remove_jwk`](#0x1_jwks_remove_jwk)
+-  [Function `apply_patch`](#0x1_jwks_apply_patch)
+-  [Specification](#@Specification_1)
+    -  [Function `on_new_epoch`](#@Specification_1_on_new_epoch)
+
+
+<pre><code><b>use</b> <a href="chain_status.md#0x1_chain_status">0x1::chain_status</a>;
+<b>use</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/comparator.md#0x1_comparator">0x1::comparator</a>;
+<b>use</b> <a href="config_buffer.md#0x1_config_buffer">0x1::config_buffer</a>;
+<b>use</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/copyable_any.md#0x1_copyable_any">0x1::copyable_any</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="event.md#0x1_event">0x1::event</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option">0x1::option</a>;
+<b>use</b> <a href="reconfiguration.md#0x1_reconfiguration">0x1::reconfiguration</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string">0x1::string</a>;
+<b>use</b> <a href="system_addresses.md#0x1_system_addresses">0x1::system_addresses</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">0x1::vector</a>;
+</code></pre>
+
+
+
+<a id="0x1_jwks_OIDCProvider"></a>
+
+## Struct `OIDCProvider`
+
+An OIDC provider.
+
+
+<pre><code><b>struct</b> <a href="jwks.md#0x1_jwks_OIDCProvider">OIDCProvider</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>name: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+ The utf-8 encoded issuer string. E.g., b"https://www.facebook.com".
+</dd>
+<dt>
+<code>config_url: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+ The ut8-8 encoded OpenID configuration URL of the provider.
+ E.g., b"https://www.facebook.com/.well-known/openid-configuration/".
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_jwks_SupportedOIDCProviders"></a>
+
+## Resource `SupportedOIDCProviders`
+
+A list of OIDC providers whose JWKs should be watched by validators. Maintained by governance proposals.
+
+
+<pre><code><b>struct</b> <a href="jwks.md#0x1_jwks_SupportedOIDCProviders">SupportedOIDCProviders</a> <b>has</b> <b>copy</b>, drop, store, key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>providers: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="jwks.md#0x1_jwks_OIDCProvider">jwks::OIDCProvider</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_jwks_UnsupportedJWK"></a>
+
+## Struct `UnsupportedJWK`
+
+An JWK variant that represents the JWKs which were observed but not yet supported by Aptos.
+Observing <code><a href="jwks.md#0x1_jwks_UnsupportedJWK">UnsupportedJWK</a></code>s means the providers adopted a new key type/format, and the system should be updated.
+
+
+<pre><code><b>struct</b> <a href="jwks.md#0x1_jwks_UnsupportedJWK">UnsupportedJWK</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>id: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>payload: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_jwks_RSA_JWK"></a>
+
+## Struct `RSA_JWK`
+
+A JWK variant where <code>kty</code> is <code>RSA</code>.
+
+
+<pre><code><b>struct</b> <a href="jwks.md#0x1_jwks_RSA_JWK">RSA_JWK</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>kid: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>kty: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>alg: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>e: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>n: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_jwks_JWK"></a>
+
+## Struct `JWK`
+
+A JSON web key.
+
+
+<pre><code><b>struct</b> <a href="jwks.md#0x1_jwks_JWK">JWK</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>variant: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/copyable_any.md#0x1_copyable_any_Any">copyable_any::Any</a></code>
+</dt>
+<dd>
+ A <code><a href="jwks.md#0x1_jwks_JWK">JWK</a></code> variant packed as an <code>Any</code>.
+ Currently the variant type is one of the following.
+ - <code><a href="jwks.md#0x1_jwks_RSA_JWK">RSA_JWK</a></code>
+ - <code><a href="jwks.md#0x1_jwks_UnsupportedJWK">UnsupportedJWK</a></code>
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_jwks_ProviderJWKs"></a>
+
+## Struct `ProviderJWKs`
+
+A provider and its <code><a href="jwks.md#0x1_jwks_JWK">JWK</a></code>s.
+
+
+<pre><code><b>struct</b> <a href="jwks.md#0x1_jwks_ProviderJWKs">ProviderJWKs</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>issuer: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+ The utf-8 encoding of the issuer string (e.g., "https://www.facebook.com").
+</dd>
+<dt>
+<code><a href="version.md#0x1_version">version</a>: u64</code>
+</dt>
+<dd>
+ A version number is needed by JWK consensus to dedup the updates.
+ e.g, when on chain version = 5, multiple nodes can propose an update with version = 6.
+ Bumped every time the JWKs for the current issuer is updated.
+ The Rust authenticator only uses the latest version.
+</dd>
+<dt>
+<code><a href="jwks.md#0x1_jwks">jwks</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="jwks.md#0x1_jwks_JWK">jwks::JWK</a>&gt;</code>
+</dt>
+<dd>
+ Vector of <code><a href="jwks.md#0x1_jwks_JWK">JWK</a></code>'s sorted by their unique ID (from <code>get_jwk_id</code>) in dictionary order.
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_jwks_AllProvidersJWKs"></a>
+
+## Struct `AllProvidersJWKs`
+
+Multiple <code><a href="jwks.md#0x1_jwks_ProviderJWKs">ProviderJWKs</a></code> objects, indexed by issuer and key ID.
+
+
+<pre><code><b>struct</b> <a href="jwks.md#0x1_jwks_AllProvidersJWKs">AllProvidersJWKs</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>entries: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="jwks.md#0x1_jwks_ProviderJWKs">jwks::ProviderJWKs</a>&gt;</code>
+</dt>
+<dd>
+ Vector of <code><a href="jwks.md#0x1_jwks_ProviderJWKs">ProviderJWKs</a></code> sorted by <code>ProviderJWKs::issuer</code> in dictionary order.
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_jwks_ObservedJWKs"></a>
+
+## Resource `ObservedJWKs`
+
+The <code><a href="jwks.md#0x1_jwks_AllProvidersJWKs">AllProvidersJWKs</a></code> that validators observed and agreed on.
+
+
+<pre><code><b>struct</b> <a href="jwks.md#0x1_jwks_ObservedJWKs">ObservedJWKs</a> <b>has</b> <b>copy</b>, drop, store, key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code><a href="jwks.md#0x1_jwks">jwks</a>: <a href="jwks.md#0x1_jwks_AllProvidersJWKs">jwks::AllProvidersJWKs</a></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_jwks_ObservedJWKsUpdated"></a>
+
+## Struct `ObservedJWKsUpdated`
+
+When <code><a href="jwks.md#0x1_jwks_ObservedJWKs">ObservedJWKs</a></code> is updated, this event is sent to resync the JWK consensus state in all validators.
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="jwks.md#0x1_jwks_ObservedJWKsUpdated">ObservedJWKsUpdated</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>epoch: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code><a href="jwks.md#0x1_jwks">jwks</a>: <a href="jwks.md#0x1_jwks_AllProvidersJWKs">jwks::AllProvidersJWKs</a></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_jwks_Patch"></a>
+
+## Struct `Patch`
+
+A small edit or patch that is applied to a <code><a href="jwks.md#0x1_jwks_AllProvidersJWKs">AllProvidersJWKs</a></code> to obtain <code><a href="jwks.md#0x1_jwks_PatchedJWKs">PatchedJWKs</a></code>.
+
+
+<pre><code><b>struct</b> <a href="jwks.md#0x1_jwks_Patch">Patch</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>variant: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/copyable_any.md#0x1_copyable_any_Any">copyable_any::Any</a></code>
+</dt>
+<dd>
+ A <code><a href="jwks.md#0x1_jwks_Patch">Patch</a></code> variant packed as an <code>Any</code>.
+ Currently the variant type is one of the following.
+ - <code><a href="jwks.md#0x1_jwks_PatchRemoveAll">PatchRemoveAll</a></code>
+ - <code><a href="jwks.md#0x1_jwks_PatchRemoveIssuer">PatchRemoveIssuer</a></code>
+ - <code><a href="jwks.md#0x1_jwks_PatchRemoveJWK">PatchRemoveJWK</a></code>
+ - <code><a href="jwks.md#0x1_jwks_PatchUpsertJWK">PatchUpsertJWK</a></code>
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_jwks_PatchRemoveAll"></a>
+
+## Struct `PatchRemoveAll`
+
+A <code><a href="jwks.md#0x1_jwks_Patch">Patch</a></code> variant to remove all JWKs.
+
+
+<pre><code><b>struct</b> <a href="jwks.md#0x1_jwks_PatchRemoveAll">PatchRemoveAll</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>dummy_field: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_jwks_PatchRemoveIssuer"></a>
+
+## Struct `PatchRemoveIssuer`
+
+A <code><a href="jwks.md#0x1_jwks_Patch">Patch</a></code> variant to remove an issuer and all its JWKs.
+
+
+<pre><code><b>struct</b> <a href="jwks.md#0x1_jwks_PatchRemoveIssuer">PatchRemoveIssuer</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>issuer: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_jwks_PatchRemoveJWK"></a>
+
+## Struct `PatchRemoveJWK`
+
+A <code><a href="jwks.md#0x1_jwks_Patch">Patch</a></code> variant to remove a specific JWK of an issuer.
+
+
+<pre><code><b>struct</b> <a href="jwks.md#0x1_jwks_PatchRemoveJWK">PatchRemoveJWK</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>issuer: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>jwk_id: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_jwks_PatchUpsertJWK"></a>
+
+## Struct `PatchUpsertJWK`
+
+A <code><a href="jwks.md#0x1_jwks_Patch">Patch</a></code> variant to upsert a JWK for an issuer.
+
+
+<pre><code><b>struct</b> <a href="jwks.md#0x1_jwks_PatchUpsertJWK">PatchUpsertJWK</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>issuer: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>jwk: <a href="jwks.md#0x1_jwks_JWK">jwks::JWK</a></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_jwks_Patches"></a>
+
+## Resource `Patches`
+
+A sequence of <code><a href="jwks.md#0x1_jwks_Patch">Patch</a></code> objects that are applied *one by one* to the <code><a href="jwks.md#0x1_jwks_ObservedJWKs">ObservedJWKs</a></code>.
+
+Maintained by governance proposals.
+
+
+<pre><code><b>struct</b> <a href="jwks.md#0x1_jwks_Patches">Patches</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>patches: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="jwks.md#0x1_jwks_Patch">jwks::Patch</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_jwks_PatchedJWKs"></a>
+
+## Resource `PatchedJWKs`
+
+The result of applying the <code><a href="jwks.md#0x1_jwks_Patches">Patches</a></code> to the <code><a href="jwks.md#0x1_jwks_ObservedJWKs">ObservedJWKs</a></code>.
+This is what applications should consume.
+
+
+<pre><code><b>struct</b> <a href="jwks.md#0x1_jwks_PatchedJWKs">PatchedJWKs</a> <b>has</b> drop, key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code><a href="jwks.md#0x1_jwks">jwks</a>: <a href="jwks.md#0x1_jwks_AllProvidersJWKs">jwks::AllProvidersJWKs</a></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_jwks_EISSUER_NOT_FOUND"></a>
+
+
+
+<pre><code><b>const</b> <a href="jwks.md#0x1_jwks_EISSUER_NOT_FOUND">EISSUER_NOT_FOUND</a>: u64 = 5;
+</code></pre>
+
+
+
+<a id="0x1_jwks_EJWK_ID_NOT_FOUND"></a>
+
+
+
+<pre><code><b>const</b> <a href="jwks.md#0x1_jwks_EJWK_ID_NOT_FOUND">EJWK_ID_NOT_FOUND</a>: u64 = 6;
+</code></pre>
+
+
+
+<a id="0x1_jwks_ENATIVE_INCORRECT_VERSION"></a>
+
+
+
+<pre><code><b>const</b> <a href="jwks.md#0x1_jwks_ENATIVE_INCORRECT_VERSION">ENATIVE_INCORRECT_VERSION</a>: u64 = 259;
+</code></pre>
+
+
+
+<a id="0x1_jwks_ENATIVE_MISSING_RESOURCE_OBSERVED_JWKS"></a>
+
+
+
+<pre><code><b>const</b> <a href="jwks.md#0x1_jwks_ENATIVE_MISSING_RESOURCE_OBSERVED_JWKS">ENATIVE_MISSING_RESOURCE_OBSERVED_JWKS</a>: u64 = 258;
+</code></pre>
+
+
+
+<a id="0x1_jwks_ENATIVE_MISSING_RESOURCE_VALIDATOR_SET"></a>
+
+
+
+<pre><code><b>const</b> <a href="jwks.md#0x1_jwks_ENATIVE_MISSING_RESOURCE_VALIDATOR_SET">ENATIVE_MISSING_RESOURCE_VALIDATOR_SET</a>: u64 = 257;
+</code></pre>
+
+
+
+<a id="0x1_jwks_ENATIVE_MULTISIG_VERIFICATION_FAILED"></a>
+
+
+
+<pre><code><b>const</b> <a href="jwks.md#0x1_jwks_ENATIVE_MULTISIG_VERIFICATION_FAILED">ENATIVE_MULTISIG_VERIFICATION_FAILED</a>: u64 = 260;
+</code></pre>
+
+
+
+<a id="0x1_jwks_ENATIVE_NOT_ENOUGH_VOTING_POWER"></a>
+
+
+
+<pre><code><b>const</b> <a href="jwks.md#0x1_jwks_ENATIVE_NOT_ENOUGH_VOTING_POWER">ENATIVE_NOT_ENOUGH_VOTING_POWER</a>: u64 = 261;
+</code></pre>
+
+
+
+<a id="0x1_jwks_EUNEXPECTED_EPOCH"></a>
+
+
+
+<pre><code><b>const</b> <a href="jwks.md#0x1_jwks_EUNEXPECTED_EPOCH">EUNEXPECTED_EPOCH</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_jwks_EUNEXPECTED_VERSION"></a>
+
+
+
+<pre><code><b>const</b> <a href="jwks.md#0x1_jwks_EUNEXPECTED_VERSION">EUNEXPECTED_VERSION</a>: u64 = 2;
+</code></pre>
+
+
+
+<a id="0x1_jwks_EUNKNOWN_JWK_VARIANT"></a>
+
+
+
+<pre><code><b>const</b> <a href="jwks.md#0x1_jwks_EUNKNOWN_JWK_VARIANT">EUNKNOWN_JWK_VARIANT</a>: u64 = 4;
+</code></pre>
+
+
+
+<a id="0x1_jwks_EUNKNOWN_PATCH_VARIANT"></a>
+
+
+
+<pre><code><b>const</b> <a href="jwks.md#0x1_jwks_EUNKNOWN_PATCH_VARIANT">EUNKNOWN_PATCH_VARIANT</a>: u64 = 3;
+</code></pre>
+
+
+
+<a id="0x1_jwks_get_patched_jwk"></a>
+
+## Function `get_patched_jwk`
+
+Get a JWK by issuer and key ID from the <code><a href="jwks.md#0x1_jwks_PatchedJWKs">PatchedJWKs</a></code>.
+Abort if such a JWK does not exist.
+More convenient to call from Rust, since it does not wrap the JWK in an <code>Option</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="jwks.md#0x1_jwks_get_patched_jwk">get_patched_jwk</a>(issuer: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, jwk_id: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="jwks.md#0x1_jwks_JWK">jwks::JWK</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="jwks.md#0x1_jwks_get_patched_jwk">get_patched_jwk</a>(issuer: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, jwk_id: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="jwks.md#0x1_jwks_JWK">JWK</a> <b>acquires</b> <a href="jwks.md#0x1_jwks_PatchedJWKs">PatchedJWKs</a> {
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_extract">option::extract</a>(&<b>mut</b> <a href="jwks.md#0x1_jwks_try_get_patched_jwk">try_get_patched_jwk</a>(issuer, jwk_id))
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_jwks_try_get_patched_jwk"></a>
+
+## Function `try_get_patched_jwk`
+
+Get a JWK by issuer and key ID from the <code><a href="jwks.md#0x1_jwks_PatchedJWKs">PatchedJWKs</a></code>, if it exists.
+More convenient to call from Move, since it does not abort.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="jwks.md#0x1_jwks_try_get_patched_jwk">try_get_patched_jwk</a>(issuer: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, jwk_id: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="jwks.md#0x1_jwks_JWK">jwks::JWK</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="jwks.md#0x1_jwks_try_get_patched_jwk">try_get_patched_jwk</a>(issuer: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, jwk_id: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): Option&lt;<a href="jwks.md#0x1_jwks_JWK">JWK</a>&gt; <b>acquires</b> <a href="jwks.md#0x1_jwks_PatchedJWKs">PatchedJWKs</a> {
+    <b>let</b> <a href="jwks.md#0x1_jwks">jwks</a> = &<b>borrow_global</b>&lt;<a href="jwks.md#0x1_jwks_PatchedJWKs">PatchedJWKs</a>&gt;(@aptos_framework).<a href="jwks.md#0x1_jwks">jwks</a>;
+    <a href="jwks.md#0x1_jwks_try_get_jwk_by_issuer">try_get_jwk_by_issuer</a>(<a href="jwks.md#0x1_jwks">jwks</a>, issuer, jwk_id)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_jwks_upsert_oidc_provider"></a>
+
+## Function `upsert_oidc_provider`
+
+Deprecated by <code><a href="jwks.md#0x1_jwks_upsert_oidc_provider_for_next_epoch">upsert_oidc_provider_for_next_epoch</a>()</code>.
+
+TODO: update all the tests that reference this function, then disable this function.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="jwks.md#0x1_jwks_upsert_oidc_provider">upsert_oidc_provider</a>(fx: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, name: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, config_url: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="jwks.md#0x1_jwks_upsert_oidc_provider">upsert_oidc_provider</a>(fx: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, name: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, config_url: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): Option&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt; <b>acquires</b> <a href="jwks.md#0x1_jwks_SupportedOIDCProviders">SupportedOIDCProviders</a> {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(fx);
+    <a href="chain_status.md#0x1_chain_status_assert_genesis">chain_status::assert_genesis</a>();
+
+    <b>let</b> provider_set = <b>borrow_global_mut</b>&lt;<a href="jwks.md#0x1_jwks_SupportedOIDCProviders">SupportedOIDCProviders</a>&gt;(@aptos_framework);
+
+    <b>let</b> old_config_url= <a href="jwks.md#0x1_jwks_remove_oidc_provider_internal">remove_oidc_provider_internal</a>(provider_set, name);
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_push_back">vector::push_back</a>(&<b>mut</b> provider_set.providers, <a href="jwks.md#0x1_jwks_OIDCProvider">OIDCProvider</a> { name, config_url });
+    old_config_url
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_jwks_upsert_oidc_provider_for_next_epoch"></a>
+
+## Function `upsert_oidc_provider_for_next_epoch`
+
+Used in on-chain governances to update the supported OIDC providers, effective starting next epoch.
+Example usage:
+```
+aptos_framework::jwks::upsert_oidc_provider_for_next_epoch(
+&framework_signer,
+b"https://accounts.google.com",
+b"https://accounts.google.com/.well-known/openid-configuration"
+);
+aptos_framework::aptos_governance::reconfigure(&framework_signer);
+```
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="jwks.md#0x1_jwks_upsert_oidc_provider_for_next_epoch">upsert_oidc_provider_for_next_epoch</a>(fx: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, name: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, config_url: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="jwks.md#0x1_jwks_upsert_oidc_provider_for_next_epoch">upsert_oidc_provider_for_next_epoch</a>(fx: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, name: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, config_url: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): Option&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt; <b>acquires</b> <a href="jwks.md#0x1_jwks_SupportedOIDCProviders">SupportedOIDCProviders</a> {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(fx);
+
+    <b>let</b> provider_set = <b>if</b> (<a href="config_buffer.md#0x1_config_buffer_does_exist">config_buffer::does_exist</a>&lt;<a href="jwks.md#0x1_jwks_SupportedOIDCProviders">SupportedOIDCProviders</a>&gt;()) {
+        <a href="config_buffer.md#0x1_config_buffer_extract">config_buffer::extract</a>&lt;<a href="jwks.md#0x1_jwks_SupportedOIDCProviders">SupportedOIDCProviders</a>&gt;()
+    } <b>else</b> {
+        *<b>borrow_global_mut</b>&lt;<a href="jwks.md#0x1_jwks_SupportedOIDCProviders">SupportedOIDCProviders</a>&gt;(@aptos_framework)
+    };
+
+    <b>let</b> old_config_url = <a href="jwks.md#0x1_jwks_remove_oidc_provider_internal">remove_oidc_provider_internal</a>(&<b>mut</b> provider_set, name);
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_push_back">vector::push_back</a>(&<b>mut</b> provider_set.providers, <a href="jwks.md#0x1_jwks_OIDCProvider">OIDCProvider</a> { name, config_url });
+    <a href="config_buffer.md#0x1_config_buffer_upsert">config_buffer::upsert</a>(provider_set);
+    old_config_url
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_jwks_remove_oidc_provider"></a>
+
+## Function `remove_oidc_provider`
+
+Deprecated by <code><a href="jwks.md#0x1_jwks_remove_oidc_provider_for_next_epoch">remove_oidc_provider_for_next_epoch</a>()</code>.
+
+TODO: update all the tests that reference this function, then disable this function.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="jwks.md#0x1_jwks_remove_oidc_provider">remove_oidc_provider</a>(fx: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, name: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="jwks.md#0x1_jwks_remove_oidc_provider">remove_oidc_provider</a>(fx: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, name: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): Option&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt; <b>acquires</b> <a href="jwks.md#0x1_jwks_SupportedOIDCProviders">SupportedOIDCProviders</a> {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(fx);
+    <a href="chain_status.md#0x1_chain_status_assert_genesis">chain_status::assert_genesis</a>();
+
+    <b>let</b> provider_set = <b>borrow_global_mut</b>&lt;<a href="jwks.md#0x1_jwks_SupportedOIDCProviders">SupportedOIDCProviders</a>&gt;(@aptos_framework);
+    <a href="jwks.md#0x1_jwks_remove_oidc_provider_internal">remove_oidc_provider_internal</a>(provider_set, name)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_jwks_remove_oidc_provider_for_next_epoch"></a>
+
+## Function `remove_oidc_provider_for_next_epoch`
+
+Used in on-chain governances to update the supported OIDC providers, effective starting next epoch.
+Example usage:
+```
+aptos_framework::jwks::remove_oidc_provider_for_next_epoch(
+&framework_signer,
+b"https://accounts.google.com",
+);
+aptos_framework::aptos_governance::reconfigure(&framework_signer);
+```
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="jwks.md#0x1_jwks_remove_oidc_provider_for_next_epoch">remove_oidc_provider_for_next_epoch</a>(fx: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, name: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="jwks.md#0x1_jwks_remove_oidc_provider_for_next_epoch">remove_oidc_provider_for_next_epoch</a>(fx: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, name: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): Option&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt; <b>acquires</b> <a href="jwks.md#0x1_jwks_SupportedOIDCProviders">SupportedOIDCProviders</a> {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(fx);
+
+    <b>let</b> provider_set = <b>if</b> (<a href="config_buffer.md#0x1_config_buffer_does_exist">config_buffer::does_exist</a>&lt;<a href="jwks.md#0x1_jwks_SupportedOIDCProviders">SupportedOIDCProviders</a>&gt;()) {
+        <a href="config_buffer.md#0x1_config_buffer_extract">config_buffer::extract</a>&lt;<a href="jwks.md#0x1_jwks_SupportedOIDCProviders">SupportedOIDCProviders</a>&gt;()
+    } <b>else</b> {
+        *<b>borrow_global_mut</b>&lt;<a href="jwks.md#0x1_jwks_SupportedOIDCProviders">SupportedOIDCProviders</a>&gt;(@aptos_framework)
+    };
+    <b>let</b> ret = <a href="jwks.md#0x1_jwks_remove_oidc_provider_internal">remove_oidc_provider_internal</a>(&<b>mut</b> provider_set, name);
+    <a href="config_buffer.md#0x1_config_buffer_upsert">config_buffer::upsert</a>(provider_set);
+    ret
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_jwks_on_new_epoch"></a>
+
+## Function `on_new_epoch`
+
+Only used in reconfigurations to apply the pending <code><a href="jwks.md#0x1_jwks_SupportedOIDCProviders">SupportedOIDCProviders</a></code>, if there is any.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="jwks.md#0x1_jwks_on_new_epoch">on_new_epoch</a>(framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="jwks.md#0x1_jwks_on_new_epoch">on_new_epoch</a>(framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>) <b>acquires</b> <a href="jwks.md#0x1_jwks_SupportedOIDCProviders">SupportedOIDCProviders</a> {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(framework);
+    <b>if</b> (<a href="config_buffer.md#0x1_config_buffer_does_exist">config_buffer::does_exist</a>&lt;<a href="jwks.md#0x1_jwks_SupportedOIDCProviders">SupportedOIDCProviders</a>&gt;()) {
+        <b>let</b> new_config = <a href="config_buffer.md#0x1_config_buffer_extract">config_buffer::extract</a>&lt;<a href="jwks.md#0x1_jwks_SupportedOIDCProviders">SupportedOIDCProviders</a>&gt;();
+        <b>if</b> (<b>exists</b>&lt;<a href="jwks.md#0x1_jwks_SupportedOIDCProviders">SupportedOIDCProviders</a>&gt;(@aptos_framework)) {
+            *<b>borrow_global_mut</b>&lt;<a href="jwks.md#0x1_jwks_SupportedOIDCProviders">SupportedOIDCProviders</a>&gt;(@aptos_framework) = new_config;
+        } <b>else</b> {
+            <b>move_to</b>(framework, new_config);
+        }
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_jwks_set_patches"></a>
+
+## Function `set_patches`
+
+Set the <code><a href="jwks.md#0x1_jwks_Patches">Patches</a></code>. Only called in governance proposals.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="jwks.md#0x1_jwks_set_patches">set_patches</a>(fx: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, patches: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="jwks.md#0x1_jwks_Patch">jwks::Patch</a>&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="jwks.md#0x1_jwks_set_patches">set_patches</a>(fx: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, patches: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="jwks.md#0x1_jwks_Patch">Patch</a>&gt;) <b>acquires</b> <a href="jwks.md#0x1_jwks_Patches">Patches</a>, <a href="jwks.md#0x1_jwks_PatchedJWKs">PatchedJWKs</a>, <a href="jwks.md#0x1_jwks_ObservedJWKs">ObservedJWKs</a> {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(fx);
+    <b>borrow_global_mut</b>&lt;<a href="jwks.md#0x1_jwks_Patches">Patches</a>&gt;(@aptos_framework).patches = patches;
+    <a href="jwks.md#0x1_jwks_regenerate_patched_jwks">regenerate_patched_jwks</a>();
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_jwks_new_patch_remove_all"></a>
+
+## Function `new_patch_remove_all`
+
+Create a <code><a href="jwks.md#0x1_jwks_Patch">Patch</a></code> that removes all entries.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="jwks.md#0x1_jwks_new_patch_remove_all">new_patch_remove_all</a>(): <a href="jwks.md#0x1_jwks_Patch">jwks::Patch</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="jwks.md#0x1_jwks_new_patch_remove_all">new_patch_remove_all</a>(): <a href="jwks.md#0x1_jwks_Patch">Patch</a> {
+    <a href="jwks.md#0x1_jwks_Patch">Patch</a> {
+        variant: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/copyable_any.md#0x1_copyable_any_pack">copyable_any::pack</a>(<a href="jwks.md#0x1_jwks_PatchRemoveAll">PatchRemoveAll</a> {}),
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_jwks_new_patch_remove_issuer"></a>
+
+## Function `new_patch_remove_issuer`
+
+Create a <code><a href="jwks.md#0x1_jwks_Patch">Patch</a></code> that removes the entry of a given issuer, if exists.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="jwks.md#0x1_jwks_new_patch_remove_issuer">new_patch_remove_issuer</a>(issuer: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="jwks.md#0x1_jwks_Patch">jwks::Patch</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="jwks.md#0x1_jwks_new_patch_remove_issuer">new_patch_remove_issuer</a>(issuer: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="jwks.md#0x1_jwks_Patch">Patch</a> {
+    <a href="jwks.md#0x1_jwks_Patch">Patch</a> {
+        variant: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/copyable_any.md#0x1_copyable_any_pack">copyable_any::pack</a>(<a href="jwks.md#0x1_jwks_PatchRemoveIssuer">PatchRemoveIssuer</a> { issuer }),
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_jwks_new_patch_remove_jwk"></a>
+
+## Function `new_patch_remove_jwk`
+
+Create a <code><a href="jwks.md#0x1_jwks_Patch">Patch</a></code> that removes the entry of a given issuer, if exists.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="jwks.md#0x1_jwks_new_patch_remove_jwk">new_patch_remove_jwk</a>(issuer: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, jwk_id: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="jwks.md#0x1_jwks_Patch">jwks::Patch</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="jwks.md#0x1_jwks_new_patch_remove_jwk">new_patch_remove_jwk</a>(issuer: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, jwk_id: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="jwks.md#0x1_jwks_Patch">Patch</a> {
+    <a href="jwks.md#0x1_jwks_Patch">Patch</a> {
+        variant: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/copyable_any.md#0x1_copyable_any_pack">copyable_any::pack</a>(<a href="jwks.md#0x1_jwks_PatchRemoveJWK">PatchRemoveJWK</a> { issuer, jwk_id })
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_jwks_new_patch_upsert_jwk"></a>
+
+## Function `new_patch_upsert_jwk`
+
+Create a <code><a href="jwks.md#0x1_jwks_Patch">Patch</a></code> that upserts a JWK into an issuer's JWK set.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="jwks.md#0x1_jwks_new_patch_upsert_jwk">new_patch_upsert_jwk</a>(issuer: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, jwk: <a href="jwks.md#0x1_jwks_JWK">jwks::JWK</a>): <a href="jwks.md#0x1_jwks_Patch">jwks::Patch</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="jwks.md#0x1_jwks_new_patch_upsert_jwk">new_patch_upsert_jwk</a>(issuer: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, jwk: <a href="jwks.md#0x1_jwks_JWK">JWK</a>): <a href="jwks.md#0x1_jwks_Patch">Patch</a> {
+    <a href="jwks.md#0x1_jwks_Patch">Patch</a> {
+        variant: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/copyable_any.md#0x1_copyable_any_pack">copyable_any::pack</a>(<a href="jwks.md#0x1_jwks_PatchUpsertJWK">PatchUpsertJWK</a> { issuer, jwk })
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_jwks_new_rsa_jwk"></a>
+
+## Function `new_rsa_jwk`
+
+Create a <code><a href="jwks.md#0x1_jwks_JWK">JWK</a></code> of variant <code><a href="jwks.md#0x1_jwks_RSA_JWK">RSA_JWK</a></code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="jwks.md#0x1_jwks_new_rsa_jwk">new_rsa_jwk</a>(kid: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, alg: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, e: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, n: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): <a href="jwks.md#0x1_jwks_JWK">jwks::JWK</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="jwks.md#0x1_jwks_new_rsa_jwk">new_rsa_jwk</a>(kid: String, alg: String, e: String, n: String): <a href="jwks.md#0x1_jwks_JWK">JWK</a> {
+    <a href="jwks.md#0x1_jwks_JWK">JWK</a> {
+        variant: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/copyable_any.md#0x1_copyable_any_pack">copyable_any::pack</a>(<a href="jwks.md#0x1_jwks_RSA_JWK">RSA_JWK</a> {
+            kid,
+            kty: utf8(b"RSA"),
+            e,
+            n,
+            alg,
+        }),
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_jwks_new_unsupported_jwk"></a>
+
+## Function `new_unsupported_jwk`
+
+Create a <code><a href="jwks.md#0x1_jwks_JWK">JWK</a></code> of variant <code><a href="jwks.md#0x1_jwks_UnsupportedJWK">UnsupportedJWK</a></code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="jwks.md#0x1_jwks_new_unsupported_jwk">new_unsupported_jwk</a>(id: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, payload: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="jwks.md#0x1_jwks_JWK">jwks::JWK</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="jwks.md#0x1_jwks_new_unsupported_jwk">new_unsupported_jwk</a>(id: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, payload: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="jwks.md#0x1_jwks_JWK">JWK</a> {
+    <a href="jwks.md#0x1_jwks_JWK">JWK</a> {
+        variant: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/copyable_any.md#0x1_copyable_any_pack">copyable_any::pack</a>(<a href="jwks.md#0x1_jwks_UnsupportedJWK">UnsupportedJWK</a> { id, payload })
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_jwks_initialize"></a>
+
+## Function `initialize`
+
+Initialize some JWK resources. Should only be invoked by genesis.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="jwks.md#0x1_jwks_initialize">initialize</a>(fx: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="jwks.md#0x1_jwks_initialize">initialize</a>(fx: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>) {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(fx);
+    <b>move_to</b>(fx, <a href="jwks.md#0x1_jwks_SupportedOIDCProviders">SupportedOIDCProviders</a> { providers: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>[] });
+    <b>move_to</b>(fx, <a href="jwks.md#0x1_jwks_ObservedJWKs">ObservedJWKs</a> { <a href="jwks.md#0x1_jwks">jwks</a>: <a href="jwks.md#0x1_jwks_AllProvidersJWKs">AllProvidersJWKs</a> { entries: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>[] } });
+    <b>move_to</b>(fx, <a href="jwks.md#0x1_jwks_Patches">Patches</a> { patches: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>[] });
+    <b>move_to</b>(fx, <a href="jwks.md#0x1_jwks_PatchedJWKs">PatchedJWKs</a> { <a href="jwks.md#0x1_jwks">jwks</a>: <a href="jwks.md#0x1_jwks_AllProvidersJWKs">AllProvidersJWKs</a> { entries: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>[] } });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_jwks_remove_oidc_provider_internal"></a>
+
+## Function `remove_oidc_provider_internal`
+
+Helper function that removes an OIDC provider from the <code><a href="jwks.md#0x1_jwks_SupportedOIDCProviders">SupportedOIDCProviders</a></code>.
+Returns the old config URL of the provider, if any, as an <code>Option</code>.
+
+
+<pre><code><b>fun</b> <a href="jwks.md#0x1_jwks_remove_oidc_provider_internal">remove_oidc_provider_internal</a>(provider_set: &<b>mut</b> <a href="jwks.md#0x1_jwks_SupportedOIDCProviders">jwks::SupportedOIDCProviders</a>, name: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="jwks.md#0x1_jwks_remove_oidc_provider_internal">remove_oidc_provider_internal</a>(provider_set: &<b>mut</b> <a href="jwks.md#0x1_jwks_SupportedOIDCProviders">SupportedOIDCProviders</a>, name: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): Option&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt; {
+    <b>let</b> (name_exists, idx) = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_find">vector::find</a>(&provider_set.providers, |obj| {
+        <b>let</b> provider: &<a href="jwks.md#0x1_jwks_OIDCProvider">OIDCProvider</a> = obj;
+        provider.name == name
+    });
+
+    <b>if</b> (name_exists) {
+        <b>let</b> old_provider = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_swap_remove">vector::swap_remove</a>(&<b>mut</b> provider_set.providers, idx);
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(old_provider.config_url)
+    } <b>else</b> {
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>()
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_jwks_upsert_into_observed_jwks"></a>
+
+## Function `upsert_into_observed_jwks`
+
+Only used by validators to publish their observed JWK update.
+
+NOTE: It is assumed verification has been done to ensure each update is quorum-certified,
+and its <code><a href="version.md#0x1_version">version</a></code> equals to the on-chain version + 1.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="jwks.md#0x1_jwks_upsert_into_observed_jwks">upsert_into_observed_jwks</a>(fx: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, provider_jwks_vec: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="jwks.md#0x1_jwks_ProviderJWKs">jwks::ProviderJWKs</a>&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="jwks.md#0x1_jwks_upsert_into_observed_jwks">upsert_into_observed_jwks</a>(fx: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, provider_jwks_vec: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="jwks.md#0x1_jwks_ProviderJWKs">ProviderJWKs</a>&gt;) <b>acquires</b> <a href="jwks.md#0x1_jwks_ObservedJWKs">ObservedJWKs</a>, <a href="jwks.md#0x1_jwks_PatchedJWKs">PatchedJWKs</a>, <a href="jwks.md#0x1_jwks_Patches">Patches</a> {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(fx);
+    <b>let</b> observed_jwks = <b>borrow_global_mut</b>&lt;<a href="jwks.md#0x1_jwks_ObservedJWKs">ObservedJWKs</a>&gt;(@aptos_framework);
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_for_each">vector::for_each</a>(provider_jwks_vec, |obj| {
+        <b>let</b> provider_jwks: <a href="jwks.md#0x1_jwks_ProviderJWKs">ProviderJWKs</a> = obj;
+        <a href="jwks.md#0x1_jwks_upsert_provider_jwks">upsert_provider_jwks</a>(&<b>mut</b> observed_jwks.<a href="jwks.md#0x1_jwks">jwks</a>, provider_jwks);
+    });
+
+    <b>let</b> epoch = <a href="reconfiguration.md#0x1_reconfiguration_current_epoch">reconfiguration::current_epoch</a>();
+    emit(<a href="jwks.md#0x1_jwks_ObservedJWKsUpdated">ObservedJWKsUpdated</a> { epoch, <a href="jwks.md#0x1_jwks">jwks</a>: observed_jwks.<a href="jwks.md#0x1_jwks">jwks</a> });
+    <a href="jwks.md#0x1_jwks_regenerate_patched_jwks">regenerate_patched_jwks</a>();
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_jwks_remove_issuer_from_observed_jwks"></a>
+
+## Function `remove_issuer_from_observed_jwks`
+
+Only used by governance to delete an issuer from <code><a href="jwks.md#0x1_jwks_ObservedJWKs">ObservedJWKs</a></code>, if it exists.
+
+Return the potentially existing <code><a href="jwks.md#0x1_jwks_ProviderJWKs">ProviderJWKs</a></code> of the given issuer.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="jwks.md#0x1_jwks_remove_issuer_from_observed_jwks">remove_issuer_from_observed_jwks</a>(fx: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, issuer: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="jwks.md#0x1_jwks_ProviderJWKs">jwks::ProviderJWKs</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="jwks.md#0x1_jwks_remove_issuer_from_observed_jwks">remove_issuer_from_observed_jwks</a>(fx: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, issuer: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): Option&lt;<a href="jwks.md#0x1_jwks_ProviderJWKs">ProviderJWKs</a>&gt; <b>acquires</b> <a href="jwks.md#0x1_jwks_ObservedJWKs">ObservedJWKs</a>, <a href="jwks.md#0x1_jwks_PatchedJWKs">PatchedJWKs</a>, <a href="jwks.md#0x1_jwks_Patches">Patches</a> {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(fx);
+    <b>let</b> observed_jwks = <b>borrow_global_mut</b>&lt;<a href="jwks.md#0x1_jwks_ObservedJWKs">ObservedJWKs</a>&gt;(@aptos_framework);
+    <b>let</b> old_value = <a href="jwks.md#0x1_jwks_remove_issuer">remove_issuer</a>(&<b>mut</b> observed_jwks.<a href="jwks.md#0x1_jwks">jwks</a>, issuer);
+
+    <b>let</b> epoch = <a href="reconfiguration.md#0x1_reconfiguration_current_epoch">reconfiguration::current_epoch</a>();
+    emit(<a href="jwks.md#0x1_jwks_ObservedJWKsUpdated">ObservedJWKsUpdated</a> { epoch, <a href="jwks.md#0x1_jwks">jwks</a>: observed_jwks.<a href="jwks.md#0x1_jwks">jwks</a> });
+    <a href="jwks.md#0x1_jwks_regenerate_patched_jwks">regenerate_patched_jwks</a>();
+
+    old_value
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_jwks_regenerate_patched_jwks"></a>
+
+## Function `regenerate_patched_jwks`
+
+Regenerate <code><a href="jwks.md#0x1_jwks_PatchedJWKs">PatchedJWKs</a></code> from <code><a href="jwks.md#0x1_jwks_ObservedJWKs">ObservedJWKs</a></code> and <code><a href="jwks.md#0x1_jwks_Patches">Patches</a></code> and save the result.
+
+
+<pre><code><b>fun</b> <a href="jwks.md#0x1_jwks_regenerate_patched_jwks">regenerate_patched_jwks</a>()
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="jwks.md#0x1_jwks_regenerate_patched_jwks">regenerate_patched_jwks</a>() <b>acquires</b> <a href="jwks.md#0x1_jwks_PatchedJWKs">PatchedJWKs</a>, <a href="jwks.md#0x1_jwks_Patches">Patches</a>, <a href="jwks.md#0x1_jwks_ObservedJWKs">ObservedJWKs</a> {
+    <b>let</b> <a href="jwks.md#0x1_jwks">jwks</a> = <b>borrow_global</b>&lt;<a href="jwks.md#0x1_jwks_ObservedJWKs">ObservedJWKs</a>&gt;(@aptos_framework).<a href="jwks.md#0x1_jwks">jwks</a>;
+    <b>let</b> patches = <b>borrow_global</b>&lt;<a href="jwks.md#0x1_jwks_Patches">Patches</a>&gt;(@aptos_framework);
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_for_each_ref">vector::for_each_ref</a>(&patches.patches, |obj|{
+        <b>let</b> patch: &<a href="jwks.md#0x1_jwks_Patch">Patch</a> = obj;
+        <a href="jwks.md#0x1_jwks_apply_patch">apply_patch</a>(&<b>mut</b> <a href="jwks.md#0x1_jwks">jwks</a>, *patch);
+    });
+    *<b>borrow_global_mut</b>&lt;<a href="jwks.md#0x1_jwks_PatchedJWKs">PatchedJWKs</a>&gt;(@aptos_framework) = <a href="jwks.md#0x1_jwks_PatchedJWKs">PatchedJWKs</a> { <a href="jwks.md#0x1_jwks">jwks</a> };
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_jwks_try_get_jwk_by_issuer"></a>
+
+## Function `try_get_jwk_by_issuer`
+
+Get a JWK by issuer and key ID from a <code><a href="jwks.md#0x1_jwks_AllProvidersJWKs">AllProvidersJWKs</a></code>, if it exists.
+
+
+<pre><code><b>fun</b> <a href="jwks.md#0x1_jwks_try_get_jwk_by_issuer">try_get_jwk_by_issuer</a>(<a href="jwks.md#0x1_jwks">jwks</a>: &<a href="jwks.md#0x1_jwks_AllProvidersJWKs">jwks::AllProvidersJWKs</a>, issuer: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, jwk_id: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="jwks.md#0x1_jwks_JWK">jwks::JWK</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="jwks.md#0x1_jwks_try_get_jwk_by_issuer">try_get_jwk_by_issuer</a>(<a href="jwks.md#0x1_jwks">jwks</a>: &<a href="jwks.md#0x1_jwks_AllProvidersJWKs">AllProvidersJWKs</a>, issuer: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, jwk_id: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): Option&lt;<a href="jwks.md#0x1_jwks_JWK">JWK</a>&gt; {
+    <b>let</b> (issuer_found, index) = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_find">vector::find</a>(&<a href="jwks.md#0x1_jwks">jwks</a>.entries, |obj| {
+        <b>let</b> provider_jwks: &<a href="jwks.md#0x1_jwks_ProviderJWKs">ProviderJWKs</a> = obj;
+        issuer == provider_jwks.issuer
+    });
+
+    <b>if</b> (issuer_found) {
+        <a href="jwks.md#0x1_jwks_try_get_jwk_by_id">try_get_jwk_by_id</a>(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(&<a href="jwks.md#0x1_jwks">jwks</a>.entries, index), jwk_id)
+    } <b>else</b> {
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>()
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_jwks_try_get_jwk_by_id"></a>
+
+## Function `try_get_jwk_by_id`
+
+Get a JWK by key ID from a <code><a href="jwks.md#0x1_jwks_ProviderJWKs">ProviderJWKs</a></code>, if it exists.
+
+
+<pre><code><b>fun</b> <a href="jwks.md#0x1_jwks_try_get_jwk_by_id">try_get_jwk_by_id</a>(provider_jwks: &<a href="jwks.md#0x1_jwks_ProviderJWKs">jwks::ProviderJWKs</a>, jwk_id: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="jwks.md#0x1_jwks_JWK">jwks::JWK</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="jwks.md#0x1_jwks_try_get_jwk_by_id">try_get_jwk_by_id</a>(provider_jwks: &<a href="jwks.md#0x1_jwks_ProviderJWKs">ProviderJWKs</a>, jwk_id: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): Option&lt;<a href="jwks.md#0x1_jwks_JWK">JWK</a>&gt; {
+    <b>let</b> (jwk_id_found, index) = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_find">vector::find</a>(&provider_jwks.<a href="jwks.md#0x1_jwks">jwks</a>, |obj|{
+        <b>let</b> jwk: &<a href="jwks.md#0x1_jwks_JWK">JWK</a> = obj;
+        jwk_id == <a href="jwks.md#0x1_jwks_get_jwk_id">get_jwk_id</a>(jwk)
+    });
+
+    <b>if</b> (jwk_id_found) {
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(*<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(&provider_jwks.<a href="jwks.md#0x1_jwks">jwks</a>, index))
+    } <b>else</b> {
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>()
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_jwks_get_jwk_id"></a>
+
+## Function `get_jwk_id`
+
+Get the ID of a JWK.
+
+
+<pre><code><b>fun</b> <a href="jwks.md#0x1_jwks_get_jwk_id">get_jwk_id</a>(jwk: &<a href="jwks.md#0x1_jwks_JWK">jwks::JWK</a>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="jwks.md#0x1_jwks_get_jwk_id">get_jwk_id</a>(jwk: &<a href="jwks.md#0x1_jwks_JWK">JWK</a>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; {
+    <b>let</b> variant_type_name = *<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_bytes">string::bytes</a>(<a href="../../../aptos-stdlib/tests/compiler-v2-doc/copyable_any.md#0x1_copyable_any_type_name">copyable_any::type_name</a>(&jwk.variant));
+    <b>if</b> (variant_type_name == b"<a href="jwks.md#0x1_jwks_RSA_JWK">0x1::jwks::RSA_JWK</a>") {
+        <b>let</b> rsa = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/copyable_any.md#0x1_copyable_any_unpack">copyable_any::unpack</a>&lt;<a href="jwks.md#0x1_jwks_RSA_JWK">RSA_JWK</a>&gt;(jwk.variant);
+        *<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_bytes">string::bytes</a>(&rsa.kid)
+    } <b>else</b> <b>if</b> (variant_type_name == b"<a href="jwks.md#0x1_jwks_UnsupportedJWK">0x1::jwks::UnsupportedJWK</a>") {
+        <b>let</b> unsupported = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/copyable_any.md#0x1_copyable_any_unpack">copyable_any::unpack</a>&lt;<a href="jwks.md#0x1_jwks_UnsupportedJWK">UnsupportedJWK</a>&gt;(jwk.variant);
+        unsupported.id
+    } <b>else</b> {
+        <b>abort</b>(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="jwks.md#0x1_jwks_EUNKNOWN_JWK_VARIANT">EUNKNOWN_JWK_VARIANT</a>))
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_jwks_upsert_provider_jwks"></a>
+
+## Function `upsert_provider_jwks`
+
+Upsert a <code><a href="jwks.md#0x1_jwks_ProviderJWKs">ProviderJWKs</a></code> into an <code><a href="jwks.md#0x1_jwks_AllProvidersJWKs">AllProvidersJWKs</a></code>. If this upsert replaced an existing entry, return it.
+Maintains the sorted-by-issuer invariant in <code><a href="jwks.md#0x1_jwks_AllProvidersJWKs">AllProvidersJWKs</a></code>.
+
+
+<pre><code><b>fun</b> <a href="jwks.md#0x1_jwks_upsert_provider_jwks">upsert_provider_jwks</a>(<a href="jwks.md#0x1_jwks">jwks</a>: &<b>mut</b> <a href="jwks.md#0x1_jwks_AllProvidersJWKs">jwks::AllProvidersJWKs</a>, provider_jwks: <a href="jwks.md#0x1_jwks_ProviderJWKs">jwks::ProviderJWKs</a>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="jwks.md#0x1_jwks_ProviderJWKs">jwks::ProviderJWKs</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="jwks.md#0x1_jwks_upsert_provider_jwks">upsert_provider_jwks</a>(<a href="jwks.md#0x1_jwks">jwks</a>: &<b>mut</b> <a href="jwks.md#0x1_jwks_AllProvidersJWKs">AllProvidersJWKs</a>, provider_jwks: <a href="jwks.md#0x1_jwks_ProviderJWKs">ProviderJWKs</a>): Option&lt;<a href="jwks.md#0x1_jwks_ProviderJWKs">ProviderJWKs</a>&gt; {
+    // NOTE: Using a linear-time search here because we do not expect too many providers.
+    <b>let</b> found = <b>false</b>;
+    <b>let</b> index = 0;
+    <b>let</b> num_entries = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&<a href="jwks.md#0x1_jwks">jwks</a>.entries);
+    <b>while</b> (index &lt; num_entries) {
+        <b>let</b> cur_entry = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(&<a href="jwks.md#0x1_jwks">jwks</a>.entries, index);
+        <b>let</b> comparison = compare_u8_vector(provider_jwks.issuer, cur_entry.issuer);
+        <b>if</b> (is_greater_than(&comparison)) {
+            index = index + 1;
+        } <b>else</b> {
+            found = is_equal(&comparison);
+            <b>break</b>
+        }
+    };
+
+    // Now <b>if</b> `found == <b>true</b>`, `index` points <b>to</b> the <a href="jwks.md#0x1_jwks_JWK">JWK</a> we want <b>to</b> <b>update</b>/remove; otherwise, `index` points <b>to</b>
+    // <b>where</b> we want <b>to</b> insert.
+    <b>let</b> ret = <b>if</b> (found) {
+        <b>let</b> entry = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow_mut">vector::borrow_mut</a>(&<b>mut</b> <a href="jwks.md#0x1_jwks">jwks</a>.entries, index);
+        <b>let</b> old_entry = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(*entry);
+        *entry = provider_jwks;
+        old_entry
+    } <b>else</b> {
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_insert">vector::insert</a>(&<b>mut</b> <a href="jwks.md#0x1_jwks">jwks</a>.entries, index, provider_jwks);
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>()
+    };
+
+    ret
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_jwks_remove_issuer"></a>
+
+## Function `remove_issuer`
+
+Remove the entry of an issuer from a <code><a href="jwks.md#0x1_jwks_AllProvidersJWKs">AllProvidersJWKs</a></code> and return the entry, if exists.
+Maintains the sorted-by-issuer invariant in <code><a href="jwks.md#0x1_jwks_AllProvidersJWKs">AllProvidersJWKs</a></code>.
+
+
+<pre><code><b>fun</b> <a href="jwks.md#0x1_jwks_remove_issuer">remove_issuer</a>(<a href="jwks.md#0x1_jwks">jwks</a>: &<b>mut</b> <a href="jwks.md#0x1_jwks_AllProvidersJWKs">jwks::AllProvidersJWKs</a>, issuer: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="jwks.md#0x1_jwks_ProviderJWKs">jwks::ProviderJWKs</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="jwks.md#0x1_jwks_remove_issuer">remove_issuer</a>(<a href="jwks.md#0x1_jwks">jwks</a>: &<b>mut</b> <a href="jwks.md#0x1_jwks_AllProvidersJWKs">AllProvidersJWKs</a>, issuer: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): Option&lt;<a href="jwks.md#0x1_jwks_ProviderJWKs">ProviderJWKs</a>&gt; {
+    <b>let</b> (found, index) = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_find">vector::find</a>(&<a href="jwks.md#0x1_jwks">jwks</a>.entries, |obj| {
+        <b>let</b> provider_jwk_set: &<a href="jwks.md#0x1_jwks_ProviderJWKs">ProviderJWKs</a> = obj;
+        provider_jwk_set.issuer == issuer
+    });
+
+    <b>let</b> ret = <b>if</b> (found) {
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_remove">vector::remove</a>(&<b>mut</b> <a href="jwks.md#0x1_jwks">jwks</a>.entries, index))
+    } <b>else</b> {
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>()
+    };
+
+    ret
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_jwks_upsert_jwk"></a>
+
+## Function `upsert_jwk`
+
+Upsert a <code><a href="jwks.md#0x1_jwks_JWK">JWK</a></code> into a <code><a href="jwks.md#0x1_jwks_ProviderJWKs">ProviderJWKs</a></code>. If this upsert replaced an existing entry, return it.
+
+
+<pre><code><b>fun</b> <a href="jwks.md#0x1_jwks_upsert_jwk">upsert_jwk</a>(set: &<b>mut</b> <a href="jwks.md#0x1_jwks_ProviderJWKs">jwks::ProviderJWKs</a>, jwk: <a href="jwks.md#0x1_jwks_JWK">jwks::JWK</a>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="jwks.md#0x1_jwks_JWK">jwks::JWK</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="jwks.md#0x1_jwks_upsert_jwk">upsert_jwk</a>(set: &<b>mut</b> <a href="jwks.md#0x1_jwks_ProviderJWKs">ProviderJWKs</a>, jwk: <a href="jwks.md#0x1_jwks_JWK">JWK</a>): Option&lt;<a href="jwks.md#0x1_jwks_JWK">JWK</a>&gt; {
+    <b>let</b> found = <b>false</b>;
+    <b>let</b> index = 0;
+    <b>let</b> num_entries = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&set.<a href="jwks.md#0x1_jwks">jwks</a>);
+    <b>while</b> (index &lt; num_entries) {
+        <b>let</b> cur_entry = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(&set.<a href="jwks.md#0x1_jwks">jwks</a>, index);
+        <b>let</b> comparison = compare_u8_vector(<a href="jwks.md#0x1_jwks_get_jwk_id">get_jwk_id</a>(&jwk), <a href="jwks.md#0x1_jwks_get_jwk_id">get_jwk_id</a>(cur_entry));
+        <b>if</b> (is_greater_than(&comparison)) {
+            index = index + 1;
+        } <b>else</b> {
+            found = is_equal(&comparison);
+            <b>break</b>
+        }
+    };
+
+    // Now <b>if</b> `found == <b>true</b>`, `index` points <b>to</b> the <a href="jwks.md#0x1_jwks_JWK">JWK</a> we want <b>to</b> <b>update</b>/remove; otherwise, `index` points <b>to</b>
+    // <b>where</b> we want <b>to</b> insert.
+    <b>let</b> ret = <b>if</b> (found) {
+        <b>let</b> entry = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow_mut">vector::borrow_mut</a>(&<b>mut</b> set.<a href="jwks.md#0x1_jwks">jwks</a>, index);
+        <b>let</b> old_entry = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(*entry);
+        *entry = jwk;
+        old_entry
+    } <b>else</b> {
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_insert">vector::insert</a>(&<b>mut</b> set.<a href="jwks.md#0x1_jwks">jwks</a>, index, jwk);
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>()
+    };
+
+    ret
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_jwks_remove_jwk"></a>
+
+## Function `remove_jwk`
+
+Remove the entry of a key ID from a <code><a href="jwks.md#0x1_jwks_ProviderJWKs">ProviderJWKs</a></code> and return the entry, if exists.
+
+
+<pre><code><b>fun</b> <a href="jwks.md#0x1_jwks_remove_jwk">remove_jwk</a>(<a href="jwks.md#0x1_jwks">jwks</a>: &<b>mut</b> <a href="jwks.md#0x1_jwks_ProviderJWKs">jwks::ProviderJWKs</a>, jwk_id: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="jwks.md#0x1_jwks_JWK">jwks::JWK</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="jwks.md#0x1_jwks_remove_jwk">remove_jwk</a>(<a href="jwks.md#0x1_jwks">jwks</a>: &<b>mut</b> <a href="jwks.md#0x1_jwks_ProviderJWKs">ProviderJWKs</a>, jwk_id: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): Option&lt;<a href="jwks.md#0x1_jwks_JWK">JWK</a>&gt; {
+    <b>let</b> (found, index) = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_find">vector::find</a>(&<a href="jwks.md#0x1_jwks">jwks</a>.<a href="jwks.md#0x1_jwks">jwks</a>, |obj| {
+        <b>let</b> jwk: &<a href="jwks.md#0x1_jwks_JWK">JWK</a> = obj;
+        jwk_id == <a href="jwks.md#0x1_jwks_get_jwk_id">get_jwk_id</a>(jwk)
+    });
+
+    <b>let</b> ret = <b>if</b> (found) {
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_remove">vector::remove</a>(&<b>mut</b> <a href="jwks.md#0x1_jwks">jwks</a>.<a href="jwks.md#0x1_jwks">jwks</a>, index))
+    } <b>else</b> {
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>()
+    };
+
+    ret
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_jwks_apply_patch"></a>
+
+## Function `apply_patch`
+
+Modify an <code><a href="jwks.md#0x1_jwks_AllProvidersJWKs">AllProvidersJWKs</a></code> object with a <code><a href="jwks.md#0x1_jwks_Patch">Patch</a></code>.
+Maintains the sorted-by-issuer invariant in <code><a href="jwks.md#0x1_jwks_AllProvidersJWKs">AllProvidersJWKs</a></code>.
+
+
+<pre><code><b>fun</b> <a href="jwks.md#0x1_jwks_apply_patch">apply_patch</a>(<a href="jwks.md#0x1_jwks">jwks</a>: &<b>mut</b> <a href="jwks.md#0x1_jwks_AllProvidersJWKs">jwks::AllProvidersJWKs</a>, patch: <a href="jwks.md#0x1_jwks_Patch">jwks::Patch</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="jwks.md#0x1_jwks_apply_patch">apply_patch</a>(<a href="jwks.md#0x1_jwks">jwks</a>: &<b>mut</b> <a href="jwks.md#0x1_jwks_AllProvidersJWKs">AllProvidersJWKs</a>, patch: <a href="jwks.md#0x1_jwks_Patch">Patch</a>) {
+    <b>let</b> variant_type_name = *<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_bytes">string::bytes</a>(<a href="../../../aptos-stdlib/tests/compiler-v2-doc/copyable_any.md#0x1_copyable_any_type_name">copyable_any::type_name</a>(&patch.variant));
+    <b>if</b> (variant_type_name == b"<a href="jwks.md#0x1_jwks_PatchRemoveAll">0x1::jwks::PatchRemoveAll</a>") {
+        <a href="jwks.md#0x1_jwks">jwks</a>.entries = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>[];
+    } <b>else</b> <b>if</b> (variant_type_name == b"<a href="jwks.md#0x1_jwks_PatchRemoveIssuer">0x1::jwks::PatchRemoveIssuer</a>") {
+        <b>let</b> cmd = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/copyable_any.md#0x1_copyable_any_unpack">copyable_any::unpack</a>&lt;<a href="jwks.md#0x1_jwks_PatchRemoveIssuer">PatchRemoveIssuer</a>&gt;(patch.variant);
+        <a href="jwks.md#0x1_jwks_remove_issuer">remove_issuer</a>(<a href="jwks.md#0x1_jwks">jwks</a>, cmd.issuer);
+    } <b>else</b> <b>if</b> (variant_type_name == b"<a href="jwks.md#0x1_jwks_PatchRemoveJWK">0x1::jwks::PatchRemoveJWK</a>") {
+        <b>let</b> cmd = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/copyable_any.md#0x1_copyable_any_unpack">copyable_any::unpack</a>&lt;<a href="jwks.md#0x1_jwks_PatchRemoveJWK">PatchRemoveJWK</a>&gt;(patch.variant);
+        // TODO: This is inefficient: we remove the issuer, modify its JWKs & and reinsert the updated issuer. Why
+        // not just <b>update</b> it in place?
+        <b>let</b> existing_jwk_set = <a href="jwks.md#0x1_jwks_remove_issuer">remove_issuer</a>(<a href="jwks.md#0x1_jwks">jwks</a>, cmd.issuer);
+        <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&existing_jwk_set)) {
+            <b>let</b> jwk_set = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_extract">option::extract</a>(&<b>mut</b> existing_jwk_set);
+            <a href="jwks.md#0x1_jwks_remove_jwk">remove_jwk</a>(&<b>mut</b> jwk_set, cmd.jwk_id);
+            <a href="jwks.md#0x1_jwks_upsert_provider_jwks">upsert_provider_jwks</a>(<a href="jwks.md#0x1_jwks">jwks</a>, jwk_set);
+        };
+    } <b>else</b> <b>if</b> (variant_type_name == b"<a href="jwks.md#0x1_jwks_PatchUpsertJWK">0x1::jwks::PatchUpsertJWK</a>") {
+        <b>let</b> cmd = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/copyable_any.md#0x1_copyable_any_unpack">copyable_any::unpack</a>&lt;<a href="jwks.md#0x1_jwks_PatchUpsertJWK">PatchUpsertJWK</a>&gt;(patch.variant);
+        // TODO: This is inefficient: we remove the issuer, modify its JWKs & and reinsert the updated issuer. Why
+        // not just <b>update</b> it in place?
+        <b>let</b> existing_jwk_set = <a href="jwks.md#0x1_jwks_remove_issuer">remove_issuer</a>(<a href="jwks.md#0x1_jwks">jwks</a>, cmd.issuer);
+        <b>let</b> jwk_set = <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&existing_jwk_set)) {
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_extract">option::extract</a>(&<b>mut</b> existing_jwk_set)
+        } <b>else</b> {
+            <a href="jwks.md#0x1_jwks_ProviderJWKs">ProviderJWKs</a> {
+                <a href="version.md#0x1_version">version</a>: 0,
+                issuer: cmd.issuer,
+                <a href="jwks.md#0x1_jwks">jwks</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>[],
+            }
+        };
+        <a href="jwks.md#0x1_jwks_upsert_jwk">upsert_jwk</a>(&<b>mut</b> jwk_set, cmd.jwk);
+        <a href="jwks.md#0x1_jwks_upsert_provider_jwks">upsert_provider_jwks</a>(<a href="jwks.md#0x1_jwks">jwks</a>, jwk_set);
+    } <b>else</b> {
+        <b>abort</b>(std::error::invalid_argument(<a href="jwks.md#0x1_jwks_EUNKNOWN_PATCH_VARIANT">EUNKNOWN_PATCH_VARIANT</a>))
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+<a id="@Specification_1_on_new_epoch"></a>
+
+### Function `on_new_epoch`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="jwks.md#0x1_jwks_on_new_epoch">on_new_epoch</a>(framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>requires</b> @aptos_framework == std::signer::address_of(framework);
+<b>include</b> <a href="config_buffer.md#0x1_config_buffer_OnNewEpochRequirement">config_buffer::OnNewEpochRequirement</a>&lt;<a href="jwks.md#0x1_jwks_SupportedOIDCProviders">SupportedOIDCProviders</a>&gt;;
+<b>aborts_if</b> <b>false</b>;
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/keyless_account.md b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/keyless_account.md
new file mode 100644
index 0000000000000..d3d37f1abce46
--- /dev/null
+++ b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/keyless_account.md
@@ -0,0 +1,800 @@
+
+<a id="0x1_keyless_account"></a>
+
+# Module `0x1::keyless_account`
+
+This module is responsible for configuring keyless blockchain accounts which were introduced in
+[AIP-61](https://github.com/aptos-foundation/AIPs/blob/main/aips/aip-61.md).
+
+
+-  [Struct `Group`](#0x1_keyless_account_Group)
+-  [Resource `Groth16VerificationKey`](#0x1_keyless_account_Groth16VerificationKey)
+-  [Resource `Configuration`](#0x1_keyless_account_Configuration)
+-  [Constants](#@Constants_0)
+-  [Function `new_groth16_verification_key`](#0x1_keyless_account_new_groth16_verification_key)
+-  [Function `new_configuration`](#0x1_keyless_account_new_configuration)
+-  [Function `validate_groth16_vk`](#0x1_keyless_account_validate_groth16_vk)
+-  [Function `update_groth16_verification_key`](#0x1_keyless_account_update_groth16_verification_key)
+-  [Function `update_configuration`](#0x1_keyless_account_update_configuration)
+-  [Function `update_training_wheels`](#0x1_keyless_account_update_training_wheels)
+-  [Function `update_max_exp_horizon`](#0x1_keyless_account_update_max_exp_horizon)
+-  [Function `remove_all_override_auds`](#0x1_keyless_account_remove_all_override_auds)
+-  [Function `add_override_aud`](#0x1_keyless_account_add_override_aud)
+-  [Function `set_groth16_verification_key_for_next_epoch`](#0x1_keyless_account_set_groth16_verification_key_for_next_epoch)
+-  [Function `set_configuration_for_next_epoch`](#0x1_keyless_account_set_configuration_for_next_epoch)
+-  [Function `update_training_wheels_for_next_epoch`](#0x1_keyless_account_update_training_wheels_for_next_epoch)
+-  [Function `update_max_exp_horizon_for_next_epoch`](#0x1_keyless_account_update_max_exp_horizon_for_next_epoch)
+-  [Function `remove_all_override_auds_for_next_epoch`](#0x1_keyless_account_remove_all_override_auds_for_next_epoch)
+-  [Function `add_override_aud_for_next_epoch`](#0x1_keyless_account_add_override_aud_for_next_epoch)
+-  [Function `on_new_epoch`](#0x1_keyless_account_on_new_epoch)
+-  [Specification](#@Specification_1)
+
+
+<pre><code><b>use</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/bn254_algebra.md#0x1_bn254_algebra">0x1::bn254_algebra</a>;
+<b>use</b> <a href="chain_status.md#0x1_chain_status">0x1::chain_status</a>;
+<b>use</b> <a href="config_buffer.md#0x1_config_buffer">0x1::config_buffer</a>;
+<b>use</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/crypto_algebra.md#0x1_crypto_algebra">0x1::crypto_algebra</a>;
+<b>use</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/ed25519.md#0x1_ed25519">0x1::ed25519</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option">0x1::option</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">0x1::signer</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string">0x1::string</a>;
+<b>use</b> <a href="system_addresses.md#0x1_system_addresses">0x1::system_addresses</a>;
+</code></pre>
+
+
+
+<a id="0x1_keyless_account_Group"></a>
+
+## Struct `Group`
+
+
+
+<pre><code>#[resource_group(#[scope = <b>global</b>])]
+<b>struct</b> <a href="keyless_account.md#0x1_keyless_account_Group">Group</a>
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>dummy_field: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_keyless_account_Groth16VerificationKey"></a>
+
+## Resource `Groth16VerificationKey`
+
+The 288-byte Groth16 verification key (VK) for the ZK relation that implements keyless accounts
+
+
+<pre><code>#[resource_group_member(#[group = <a href="keyless_account.md#0x1_keyless_account_Group">0x1::keyless_account::Group</a>])]
+<b>struct</b> <a href="keyless_account.md#0x1_keyless_account_Groth16VerificationKey">Groth16VerificationKey</a> <b>has</b> drop, store, key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>alpha_g1: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+ 32-byte serialization of <code>alpha * G</code>, where <code>G</code> is the generator of <code>G1</code>.
+</dd>
+<dt>
+<code>beta_g2: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+ 64-byte serialization of <code>alpha * H</code>, where <code>H</code> is the generator of <code>G2</code>.
+</dd>
+<dt>
+<code>gamma_g2: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+ 64-byte serialization of <code>gamma * H</code>, where <code>H</code> is the generator of <code>G2</code>.
+</dd>
+<dt>
+<code>delta_g2: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+ 64-byte serialization of <code>delta * H</code>, where <code>H</code> is the generator of <code>G2</code>.
+</dd>
+<dt>
+<code>gamma_abc_g1: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;</code>
+</dt>
+<dd>
+ <code>\<b>forall</b> i \in {0, ..., \ell}, 64-byte serialization of gamma^{-1} * (beta * a_i + alpha * b_i + c_i) * H</code>, where
+ <code>H</code> is the generator of <code>G1</code> and <code>\ell</code> is 1 for the ZK relation.
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_keyless_account_Configuration"></a>
+
+## Resource `Configuration`
+
+
+
+<pre><code>#[resource_group_member(#[group = <a href="keyless_account.md#0x1_keyless_account_Group">0x1::keyless_account::Group</a>])]
+<b>struct</b> <a href="keyless_account.md#0x1_keyless_account_Configuration">Configuration</a> <b>has</b> <b>copy</b>, drop, store, key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>override_aud_vals: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;</code>
+</dt>
+<dd>
+ An override <code>aud</code> for the identity of a recovery service, which will help users recover their keyless accounts
+ associated with dapps or wallets that have disappeared.
+ IMPORTANT: This recovery service **cannot** on its own take over user accounts; a user must first sign in
+ via OAuth in the recovery service in order to allow it to rotate any of that user's keyless accounts.
+</dd>
+<dt>
+<code>max_signatures_per_txn: u16</code>
+</dt>
+<dd>
+ No transaction can have more than this many keyless signatures.
+</dd>
+<dt>
+<code>max_exp_horizon_secs: u64</code>
+</dt>
+<dd>
+ How far in the future from the JWT issued at time the EPK expiry can be set.
+</dd>
+<dt>
+<code>training_wheels_pubkey: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;</code>
+</dt>
+<dd>
+ The training wheels PK, if training wheels are on
+</dd>
+<dt>
+<code>max_commited_epk_bytes: u16</code>
+</dt>
+<dd>
+ The max length of an ephemeral public key supported in our circuit (93 bytes)
+</dd>
+<dt>
+<code>max_iss_val_bytes: u16</code>
+</dt>
+<dd>
+ The max length of the value of the JWT's <code>iss</code> field supported in our circuit (e.g., <code>"https://accounts.google.com"</code>)
+</dd>
+<dt>
+<code>max_extra_field_bytes: u16</code>
+</dt>
+<dd>
+ The max length of the JWT field name and value (e.g., <code>"max_age":"18"</code>) supported in our circuit
+</dd>
+<dt>
+<code>max_jwt_header_b64_bytes: u32</code>
+</dt>
+<dd>
+ The max length of the base64url-encoded JWT header in bytes supported in our circuit
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_keyless_account_E_INVALID_BN254_G1_SERIALIZATION"></a>
+
+A serialized BN254 G1 point is invalid.
+
+
+<pre><code><b>const</b> <a href="keyless_account.md#0x1_keyless_account_E_INVALID_BN254_G1_SERIALIZATION">E_INVALID_BN254_G1_SERIALIZATION</a>: u64 = 2;
+</code></pre>
+
+
+
+<a id="0x1_keyless_account_E_INVALID_BN254_G2_SERIALIZATION"></a>
+
+A serialized BN254 G2 point is invalid.
+
+
+<pre><code><b>const</b> <a href="keyless_account.md#0x1_keyless_account_E_INVALID_BN254_G2_SERIALIZATION">E_INVALID_BN254_G2_SERIALIZATION</a>: u64 = 3;
+</code></pre>
+
+
+
+<a id="0x1_keyless_account_E_TRAINING_WHEELS_PK_WRONG_SIZE"></a>
+
+The training wheels PK needs to be 32 bytes long.
+
+
+<pre><code><b>const</b> <a href="keyless_account.md#0x1_keyless_account_E_TRAINING_WHEELS_PK_WRONG_SIZE">E_TRAINING_WHEELS_PK_WRONG_SIZE</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_keyless_account_new_groth16_verification_key"></a>
+
+## Function `new_groth16_verification_key`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="keyless_account.md#0x1_keyless_account_new_groth16_verification_key">new_groth16_verification_key</a>(alpha_g1: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, beta_g2: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, gamma_g2: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, delta_g2: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, gamma_abc_g1: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;): <a href="keyless_account.md#0x1_keyless_account_Groth16VerificationKey">keyless_account::Groth16VerificationKey</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="keyless_account.md#0x1_keyless_account_new_groth16_verification_key">new_groth16_verification_key</a>(alpha_g1: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+                                        beta_g2: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+                                        gamma_g2: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+                                        delta_g2: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+                                        gamma_abc_g1: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;
+): <a href="keyless_account.md#0x1_keyless_account_Groth16VerificationKey">Groth16VerificationKey</a> {
+    <a href="keyless_account.md#0x1_keyless_account_Groth16VerificationKey">Groth16VerificationKey</a> {
+        alpha_g1,
+        beta_g2,
+        gamma_g2,
+        delta_g2,
+        gamma_abc_g1,
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_keyless_account_new_configuration"></a>
+
+## Function `new_configuration`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="keyless_account.md#0x1_keyless_account_new_configuration">new_configuration</a>(override_aud_val: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;, max_signatures_per_txn: u16, max_exp_horizon_secs: u64, training_wheels_pubkey: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;, max_commited_epk_bytes: u16, max_iss_val_bytes: u16, max_extra_field_bytes: u16, max_jwt_header_b64_bytes: u32): <a href="keyless_account.md#0x1_keyless_account_Configuration">keyless_account::Configuration</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="keyless_account.md#0x1_keyless_account_new_configuration">new_configuration</a>(
+    override_aud_val: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;String&gt;,
+    max_signatures_per_txn: u16,
+    max_exp_horizon_secs: u64,
+    training_wheels_pubkey: Option&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;,
+    max_commited_epk_bytes: u16,
+    max_iss_val_bytes: u16,
+    max_extra_field_bytes: u16,
+    max_jwt_header_b64_bytes: u32
+): <a href="keyless_account.md#0x1_keyless_account_Configuration">Configuration</a> {
+    <a href="keyless_account.md#0x1_keyless_account_Configuration">Configuration</a> {
+        override_aud_vals: override_aud_val,
+        max_signatures_per_txn,
+        max_exp_horizon_secs,
+        training_wheels_pubkey,
+        max_commited_epk_bytes,
+        max_iss_val_bytes,
+        max_extra_field_bytes,
+        max_jwt_header_b64_bytes,
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_keyless_account_validate_groth16_vk"></a>
+
+## Function `validate_groth16_vk`
+
+Pre-validate the VK to actively-prevent incorrect VKs from being set on-chain.
+
+
+<pre><code><b>fun</b> <a href="keyless_account.md#0x1_keyless_account_validate_groth16_vk">validate_groth16_vk</a>(vk: &<a href="keyless_account.md#0x1_keyless_account_Groth16VerificationKey">keyless_account::Groth16VerificationKey</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="keyless_account.md#0x1_keyless_account_validate_groth16_vk">validate_groth16_vk</a>(vk: &<a href="keyless_account.md#0x1_keyless_account_Groth16VerificationKey">Groth16VerificationKey</a>) {
+    // Could be leveraged <b>to</b> speed up the VM deserialization of the VK by 2x, since it can <b>assume</b> the points are valid.
+    <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&<a href="../../../aptos-stdlib/tests/compiler-v2-doc/crypto_algebra.md#0x1_crypto_algebra_deserialize">crypto_algebra::deserialize</a>&lt;<a href="../../../aptos-stdlib/tests/compiler-v2-doc/bn254_algebra.md#0x1_bn254_algebra_G1">bn254_algebra::G1</a>, <a href="../../../aptos-stdlib/tests/compiler-v2-doc/bn254_algebra.md#0x1_bn254_algebra_FormatG1Compr">bn254_algebra::FormatG1Compr</a>&gt;(&vk.alpha_g1)), <a href="keyless_account.md#0x1_keyless_account_E_INVALID_BN254_G1_SERIALIZATION">E_INVALID_BN254_G1_SERIALIZATION</a>);
+    <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&<a href="../../../aptos-stdlib/tests/compiler-v2-doc/crypto_algebra.md#0x1_crypto_algebra_deserialize">crypto_algebra::deserialize</a>&lt;<a href="../../../aptos-stdlib/tests/compiler-v2-doc/bn254_algebra.md#0x1_bn254_algebra_G2">bn254_algebra::G2</a>, <a href="../../../aptos-stdlib/tests/compiler-v2-doc/bn254_algebra.md#0x1_bn254_algebra_FormatG2Compr">bn254_algebra::FormatG2Compr</a>&gt;(&vk.beta_g2)), <a href="keyless_account.md#0x1_keyless_account_E_INVALID_BN254_G2_SERIALIZATION">E_INVALID_BN254_G2_SERIALIZATION</a>);
+    <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&<a href="../../../aptos-stdlib/tests/compiler-v2-doc/crypto_algebra.md#0x1_crypto_algebra_deserialize">crypto_algebra::deserialize</a>&lt;<a href="../../../aptos-stdlib/tests/compiler-v2-doc/bn254_algebra.md#0x1_bn254_algebra_G2">bn254_algebra::G2</a>, <a href="../../../aptos-stdlib/tests/compiler-v2-doc/bn254_algebra.md#0x1_bn254_algebra_FormatG2Compr">bn254_algebra::FormatG2Compr</a>&gt;(&vk.gamma_g2)), <a href="keyless_account.md#0x1_keyless_account_E_INVALID_BN254_G2_SERIALIZATION">E_INVALID_BN254_G2_SERIALIZATION</a>);
+    <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&<a href="../../../aptos-stdlib/tests/compiler-v2-doc/crypto_algebra.md#0x1_crypto_algebra_deserialize">crypto_algebra::deserialize</a>&lt;<a href="../../../aptos-stdlib/tests/compiler-v2-doc/bn254_algebra.md#0x1_bn254_algebra_G2">bn254_algebra::G2</a>, <a href="../../../aptos-stdlib/tests/compiler-v2-doc/bn254_algebra.md#0x1_bn254_algebra_FormatG2Compr">bn254_algebra::FormatG2Compr</a>&gt;(&vk.delta_g2)), <a href="keyless_account.md#0x1_keyless_account_E_INVALID_BN254_G2_SERIALIZATION">E_INVALID_BN254_G2_SERIALIZATION</a>);
+    for (i in 0..<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&vk.gamma_abc_g1)) {
+        <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&<a href="../../../aptos-stdlib/tests/compiler-v2-doc/crypto_algebra.md#0x1_crypto_algebra_deserialize">crypto_algebra::deserialize</a>&lt;<a href="../../../aptos-stdlib/tests/compiler-v2-doc/bn254_algebra.md#0x1_bn254_algebra_G1">bn254_algebra::G1</a>, <a href="../../../aptos-stdlib/tests/compiler-v2-doc/bn254_algebra.md#0x1_bn254_algebra_FormatG1Compr">bn254_algebra::FormatG1Compr</a>&gt;(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(&vk.gamma_abc_g1, i))), <a href="keyless_account.md#0x1_keyless_account_E_INVALID_BN254_G1_SERIALIZATION">E_INVALID_BN254_G1_SERIALIZATION</a>);
+    };
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_keyless_account_update_groth16_verification_key"></a>
+
+## Function `update_groth16_verification_key`
+
+Sets the Groth16 verification key, only callable during genesis. To call during governance proposals, use
+<code>set_groth16_verification_key_for_next_epoch</code>.
+
+WARNING: See <code>set_groth16_verification_key_for_next_epoch</code> for caveats.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="keyless_account.md#0x1_keyless_account_update_groth16_verification_key">update_groth16_verification_key</a>(fx: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, vk: <a href="keyless_account.md#0x1_keyless_account_Groth16VerificationKey">keyless_account::Groth16VerificationKey</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="keyless_account.md#0x1_keyless_account_update_groth16_verification_key">update_groth16_verification_key</a>(fx: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, vk: <a href="keyless_account.md#0x1_keyless_account_Groth16VerificationKey">Groth16VerificationKey</a>) {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(fx);
+    <a href="chain_status.md#0x1_chain_status_assert_genesis">chain_status::assert_genesis</a>();
+    // There should not be a previous resource set here.
+    <b>move_to</b>(fx, vk);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_keyless_account_update_configuration"></a>
+
+## Function `update_configuration`
+
+Sets the keyless configuration, only callable during genesis. To call during governance proposals, use
+<code>set_configuration_for_next_epoch</code>.
+
+WARNING: See <code>set_configuration_for_next_epoch</code> for caveats.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="keyless_account.md#0x1_keyless_account_update_configuration">update_configuration</a>(fx: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, config: <a href="keyless_account.md#0x1_keyless_account_Configuration">keyless_account::Configuration</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="keyless_account.md#0x1_keyless_account_update_configuration">update_configuration</a>(fx: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, config: <a href="keyless_account.md#0x1_keyless_account_Configuration">Configuration</a>) {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(fx);
+    <a href="chain_status.md#0x1_chain_status_assert_genesis">chain_status::assert_genesis</a>();
+    // There should not be a previous resource set here.
+    <b>move_to</b>(fx, config);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_keyless_account_update_training_wheels"></a>
+
+## Function `update_training_wheels`
+
+
+
+<pre><code>#[deprecated]
+<b>public</b> <b>fun</b> <a href="keyless_account.md#0x1_keyless_account_update_training_wheels">update_training_wheels</a>(fx: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, pk: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="keyless_account.md#0x1_keyless_account_update_training_wheels">update_training_wheels</a>(fx: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, pk: Option&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;) <b>acquires</b> <a href="keyless_account.md#0x1_keyless_account_Configuration">Configuration</a> {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(fx);
+    <a href="chain_status.md#0x1_chain_status_assert_genesis">chain_status::assert_genesis</a>();
+
+    <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&pk)) {
+        <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(&pk)) == 32, <a href="keyless_account.md#0x1_keyless_account_E_TRAINING_WHEELS_PK_WRONG_SIZE">E_TRAINING_WHEELS_PK_WRONG_SIZE</a>)
+    };
+
+    <b>let</b> config = <b>borrow_global_mut</b>&lt;<a href="keyless_account.md#0x1_keyless_account_Configuration">Configuration</a>&gt;(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(fx));
+    config.training_wheels_pubkey = pk;
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_keyless_account_update_max_exp_horizon"></a>
+
+## Function `update_max_exp_horizon`
+
+
+
+<pre><code>#[deprecated]
+<b>public</b> <b>fun</b> <a href="keyless_account.md#0x1_keyless_account_update_max_exp_horizon">update_max_exp_horizon</a>(fx: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, max_exp_horizon_secs: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="keyless_account.md#0x1_keyless_account_update_max_exp_horizon">update_max_exp_horizon</a>(fx: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, max_exp_horizon_secs: u64) <b>acquires</b> <a href="keyless_account.md#0x1_keyless_account_Configuration">Configuration</a> {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(fx);
+    <a href="chain_status.md#0x1_chain_status_assert_genesis">chain_status::assert_genesis</a>();
+
+    <b>let</b> config = <b>borrow_global_mut</b>&lt;<a href="keyless_account.md#0x1_keyless_account_Configuration">Configuration</a>&gt;(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(fx));
+    config.max_exp_horizon_secs = max_exp_horizon_secs;
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_keyless_account_remove_all_override_auds"></a>
+
+## Function `remove_all_override_auds`
+
+
+
+<pre><code>#[deprecated]
+<b>public</b> <b>fun</b> <a href="keyless_account.md#0x1_keyless_account_remove_all_override_auds">remove_all_override_auds</a>(fx: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="keyless_account.md#0x1_keyless_account_remove_all_override_auds">remove_all_override_auds</a>(fx: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>) <b>acquires</b> <a href="keyless_account.md#0x1_keyless_account_Configuration">Configuration</a> {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(fx);
+    <a href="chain_status.md#0x1_chain_status_assert_genesis">chain_status::assert_genesis</a>();
+
+    <b>let</b> config = <b>borrow_global_mut</b>&lt;<a href="keyless_account.md#0x1_keyless_account_Configuration">Configuration</a>&gt;(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(fx));
+    config.override_aud_vals = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>[];
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_keyless_account_add_override_aud"></a>
+
+## Function `add_override_aud`
+
+
+
+<pre><code>#[deprecated]
+<b>public</b> <b>fun</b> <a href="keyless_account.md#0x1_keyless_account_add_override_aud">add_override_aud</a>(fx: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, aud: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="keyless_account.md#0x1_keyless_account_add_override_aud">add_override_aud</a>(fx: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, aud: String) <b>acquires</b> <a href="keyless_account.md#0x1_keyless_account_Configuration">Configuration</a> {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(fx);
+    <a href="chain_status.md#0x1_chain_status_assert_genesis">chain_status::assert_genesis</a>();
+
+    <b>let</b> config = <b>borrow_global_mut</b>&lt;<a href="keyless_account.md#0x1_keyless_account_Configuration">Configuration</a>&gt;(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(fx));
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_push_back">vector::push_back</a>(&<b>mut</b> config.override_aud_vals, aud);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_keyless_account_set_groth16_verification_key_for_next_epoch"></a>
+
+## Function `set_groth16_verification_key_for_next_epoch`
+
+Queues up a change to the Groth16 verification key. The change will only be effective after reconfiguration.
+Only callable via governance proposal.
+
+WARNING: To mitigate against DoS attacks, a VK change should be done together with a training wheels PK change,
+so that old ZKPs for the old VK cannot be replayed as potentially-valid ZKPs.
+
+WARNING: If a malicious key is set, this would lead to stolen funds.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="keyless_account.md#0x1_keyless_account_set_groth16_verification_key_for_next_epoch">set_groth16_verification_key_for_next_epoch</a>(fx: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, vk: <a href="keyless_account.md#0x1_keyless_account_Groth16VerificationKey">keyless_account::Groth16VerificationKey</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="keyless_account.md#0x1_keyless_account_set_groth16_verification_key_for_next_epoch">set_groth16_verification_key_for_next_epoch</a>(fx: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, vk: <a href="keyless_account.md#0x1_keyless_account_Groth16VerificationKey">Groth16VerificationKey</a>) {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(fx);
+    <a href="config_buffer.md#0x1_config_buffer_upsert">config_buffer::upsert</a>&lt;<a href="keyless_account.md#0x1_keyless_account_Groth16VerificationKey">Groth16VerificationKey</a>&gt;(vk);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_keyless_account_set_configuration_for_next_epoch"></a>
+
+## Function `set_configuration_for_next_epoch`
+
+Queues up a change to the keyless configuration. The change will only be effective after reconfiguration. Only
+callable via governance proposal.
+
+WARNING: A malicious <code><a href="keyless_account.md#0x1_keyless_account_Configuration">Configuration</a></code> could lead to DoS attacks, create liveness issues, or enable a malicious
+recovery service provider to phish users' accounts.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="keyless_account.md#0x1_keyless_account_set_configuration_for_next_epoch">set_configuration_for_next_epoch</a>(fx: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, config: <a href="keyless_account.md#0x1_keyless_account_Configuration">keyless_account::Configuration</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="keyless_account.md#0x1_keyless_account_set_configuration_for_next_epoch">set_configuration_for_next_epoch</a>(fx: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, config: <a href="keyless_account.md#0x1_keyless_account_Configuration">Configuration</a>) {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(fx);
+    <a href="config_buffer.md#0x1_config_buffer_upsert">config_buffer::upsert</a>&lt;<a href="keyless_account.md#0x1_keyless_account_Configuration">Configuration</a>&gt;(config);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_keyless_account_update_training_wheels_for_next_epoch"></a>
+
+## Function `update_training_wheels_for_next_epoch`
+
+Convenience method to queue up a change to the training wheels PK. The change will only be effective after
+reconfiguration. Only callable via governance proposal.
+
+WARNING: If a malicious key is set, this *could* lead to stolen funds.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="keyless_account.md#0x1_keyless_account_update_training_wheels_for_next_epoch">update_training_wheels_for_next_epoch</a>(fx: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, pk: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="keyless_account.md#0x1_keyless_account_update_training_wheels_for_next_epoch">update_training_wheels_for_next_epoch</a>(fx: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, pk: Option&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;) <b>acquires</b> <a href="keyless_account.md#0x1_keyless_account_Configuration">Configuration</a> {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(fx);
+
+    // If a PK is being set, validate it first.
+    <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&pk)) {
+        <b>let</b> bytes = *<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(&pk);
+        <b>let</b> vpk = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/ed25519.md#0x1_ed25519_new_validated_public_key_from_bytes">ed25519::new_validated_public_key_from_bytes</a>(bytes);
+        <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&vpk), <a href="keyless_account.md#0x1_keyless_account_E_TRAINING_WHEELS_PK_WRONG_SIZE">E_TRAINING_WHEELS_PK_WRONG_SIZE</a>)
+    };
+
+    <b>let</b> config = <b>if</b> (<a href="config_buffer.md#0x1_config_buffer_does_exist">config_buffer::does_exist</a>&lt;<a href="keyless_account.md#0x1_keyless_account_Configuration">Configuration</a>&gt;()) {
+        <a href="config_buffer.md#0x1_config_buffer_extract">config_buffer::extract</a>&lt;<a href="keyless_account.md#0x1_keyless_account_Configuration">Configuration</a>&gt;()
+    } <b>else</b> {
+        *<b>borrow_global</b>&lt;<a href="keyless_account.md#0x1_keyless_account_Configuration">Configuration</a>&gt;(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(fx))
+    };
+
+    config.training_wheels_pubkey = pk;
+
+    <a href="keyless_account.md#0x1_keyless_account_set_configuration_for_next_epoch">set_configuration_for_next_epoch</a>(fx, config);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_keyless_account_update_max_exp_horizon_for_next_epoch"></a>
+
+## Function `update_max_exp_horizon_for_next_epoch`
+
+Convenience method to queues up a change to the max expiration horizon. The change will only be effective after
+reconfiguration. Only callable via governance proposal.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="keyless_account.md#0x1_keyless_account_update_max_exp_horizon_for_next_epoch">update_max_exp_horizon_for_next_epoch</a>(fx: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, max_exp_horizon_secs: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="keyless_account.md#0x1_keyless_account_update_max_exp_horizon_for_next_epoch">update_max_exp_horizon_for_next_epoch</a>(fx: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, max_exp_horizon_secs: u64) <b>acquires</b> <a href="keyless_account.md#0x1_keyless_account_Configuration">Configuration</a> {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(fx);
+
+    <b>let</b> config = <b>if</b> (<a href="config_buffer.md#0x1_config_buffer_does_exist">config_buffer::does_exist</a>&lt;<a href="keyless_account.md#0x1_keyless_account_Configuration">Configuration</a>&gt;()) {
+        <a href="config_buffer.md#0x1_config_buffer_extract">config_buffer::extract</a>&lt;<a href="keyless_account.md#0x1_keyless_account_Configuration">Configuration</a>&gt;()
+    } <b>else</b> {
+        *<b>borrow_global</b>&lt;<a href="keyless_account.md#0x1_keyless_account_Configuration">Configuration</a>&gt;(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(fx))
+    };
+
+    config.max_exp_horizon_secs = max_exp_horizon_secs;
+
+    <a href="keyless_account.md#0x1_keyless_account_set_configuration_for_next_epoch">set_configuration_for_next_epoch</a>(fx, config);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_keyless_account_remove_all_override_auds_for_next_epoch"></a>
+
+## Function `remove_all_override_auds_for_next_epoch`
+
+Convenience method to queue up clearing the set of override <code>aud</code>'s. The change will only be effective after
+reconfiguration. Only callable via governance proposal.
+
+WARNING: When no override <code>aud</code> is set, recovery of keyless accounts associated with applications that disappeared
+is no longer possible.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="keyless_account.md#0x1_keyless_account_remove_all_override_auds_for_next_epoch">remove_all_override_auds_for_next_epoch</a>(fx: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="keyless_account.md#0x1_keyless_account_remove_all_override_auds_for_next_epoch">remove_all_override_auds_for_next_epoch</a>(fx: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>) <b>acquires</b> <a href="keyless_account.md#0x1_keyless_account_Configuration">Configuration</a> {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(fx);
+
+    <b>let</b> config = <b>if</b> (<a href="config_buffer.md#0x1_config_buffer_does_exist">config_buffer::does_exist</a>&lt;<a href="keyless_account.md#0x1_keyless_account_Configuration">Configuration</a>&gt;()) {
+        <a href="config_buffer.md#0x1_config_buffer_extract">config_buffer::extract</a>&lt;<a href="keyless_account.md#0x1_keyless_account_Configuration">Configuration</a>&gt;()
+    } <b>else</b> {
+        *<b>borrow_global</b>&lt;<a href="keyless_account.md#0x1_keyless_account_Configuration">Configuration</a>&gt;(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(fx))
+    };
+
+    config.override_aud_vals = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>[];
+
+    <a href="keyless_account.md#0x1_keyless_account_set_configuration_for_next_epoch">set_configuration_for_next_epoch</a>(fx, config);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_keyless_account_add_override_aud_for_next_epoch"></a>
+
+## Function `add_override_aud_for_next_epoch`
+
+Convenience method to queue up an append to to the set of override <code>aud</code>'s. The change will only be effective
+after reconfiguration. Only callable via governance proposal.
+
+WARNING: If a malicious override <code>aud</code> is set, this *could* lead to stolen funds.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="keyless_account.md#0x1_keyless_account_add_override_aud_for_next_epoch">add_override_aud_for_next_epoch</a>(fx: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, aud: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="keyless_account.md#0x1_keyless_account_add_override_aud_for_next_epoch">add_override_aud_for_next_epoch</a>(fx: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, aud: String) <b>acquires</b> <a href="keyless_account.md#0x1_keyless_account_Configuration">Configuration</a> {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(fx);
+
+    <b>let</b> config = <b>if</b> (<a href="config_buffer.md#0x1_config_buffer_does_exist">config_buffer::does_exist</a>&lt;<a href="keyless_account.md#0x1_keyless_account_Configuration">Configuration</a>&gt;()) {
+        <a href="config_buffer.md#0x1_config_buffer_extract">config_buffer::extract</a>&lt;<a href="keyless_account.md#0x1_keyless_account_Configuration">Configuration</a>&gt;()
+    } <b>else</b> {
+        *<b>borrow_global</b>&lt;<a href="keyless_account.md#0x1_keyless_account_Configuration">Configuration</a>&gt;(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(fx))
+    };
+
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_push_back">vector::push_back</a>(&<b>mut</b> config.override_aud_vals, aud);
+
+    <a href="keyless_account.md#0x1_keyless_account_set_configuration_for_next_epoch">set_configuration_for_next_epoch</a>(fx, config);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_keyless_account_on_new_epoch"></a>
+
+## Function `on_new_epoch`
+
+Only used in reconfigurations to apply the queued up configuration changes, if there are any.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="keyless_account.md#0x1_keyless_account_on_new_epoch">on_new_epoch</a>(fx: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="keyless_account.md#0x1_keyless_account_on_new_epoch">on_new_epoch</a>(fx: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>) <b>acquires</b> <a href="keyless_account.md#0x1_keyless_account_Groth16VerificationKey">Groth16VerificationKey</a>, <a href="keyless_account.md#0x1_keyless_account_Configuration">Configuration</a> {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(fx);
+
+    <b>if</b> (<a href="config_buffer.md#0x1_config_buffer_does_exist">config_buffer::does_exist</a>&lt;<a href="keyless_account.md#0x1_keyless_account_Groth16VerificationKey">Groth16VerificationKey</a>&gt;()) {
+        <b>let</b> vk = <a href="config_buffer.md#0x1_config_buffer_extract">config_buffer::extract</a>();
+        <b>if</b> (<b>exists</b>&lt;<a href="keyless_account.md#0x1_keyless_account_Groth16VerificationKey">Groth16VerificationKey</a>&gt;(@aptos_framework)) {
+            *<b>borrow_global_mut</b>&lt;<a href="keyless_account.md#0x1_keyless_account_Groth16VerificationKey">Groth16VerificationKey</a>&gt;(@aptos_framework) = vk;
+        } <b>else</b> {
+            <b>move_to</b>(fx, vk);
+        }
+    };
+
+    <b>if</b> (<a href="config_buffer.md#0x1_config_buffer_does_exist">config_buffer::does_exist</a>&lt;<a href="keyless_account.md#0x1_keyless_account_Configuration">Configuration</a>&gt;()) {
+        <b>let</b> config = <a href="config_buffer.md#0x1_config_buffer_extract">config_buffer::extract</a>();
+        <b>if</b> (<b>exists</b>&lt;<a href="keyless_account.md#0x1_keyless_account_Configuration">Configuration</a>&gt;(@aptos_framework)) {
+            *<b>borrow_global_mut</b>&lt;<a href="keyless_account.md#0x1_keyless_account_Configuration">Configuration</a>&gt;(@aptos_framework) = config;
+        } <b>else</b> {
+            <b>move_to</b>(fx, config);
+        }
+    };
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+
+<pre><code><b>pragma</b> verify=<b>false</b>;
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/managed_coin.md b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/managed_coin.md
new file mode 100644
index 0000000000000..b6d1c90017f0f
--- /dev/null
+++ b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/managed_coin.md
@@ -0,0 +1,426 @@
+
+<a id="0x1_managed_coin"></a>
+
+# Module `0x1::managed_coin`
+
+ManagedCoin is built to make a simple walkthrough of the Coins module.
+It contains scripts you will need to initialize, mint, burn, transfer coins.
+By utilizing this current module, a developer can create his own coin and care less about mint and burn capabilities,
+
+
+-  [Resource `Capabilities`](#0x1_managed_coin_Capabilities)
+-  [Constants](#@Constants_0)
+-  [Function `burn`](#0x1_managed_coin_burn)
+-  [Function `initialize`](#0x1_managed_coin_initialize)
+-  [Function `mint`](#0x1_managed_coin_mint)
+-  [Function `register`](#0x1_managed_coin_register)
+-  [Specification](#@Specification_1)
+    -  [High-level Requirements](#high-level-req)
+    -  [Module-level Specification](#module-level-spec)
+    -  [Function `burn`](#@Specification_1_burn)
+    -  [Function `initialize`](#@Specification_1_initialize)
+    -  [Function `mint`](#@Specification_1_mint)
+    -  [Function `register`](#@Specification_1_register)
+
+
+<pre><code><b>use</b> <a href="coin.md#0x1_coin">0x1::coin</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">0x1::signer</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string">0x1::string</a>;
+</code></pre>
+
+
+
+<a id="0x1_managed_coin_Capabilities"></a>
+
+## Resource `Capabilities`
+
+Capabilities resource storing mint and burn capabilities.
+The resource is stored on the account that initialized coin <code>CoinType</code>.
+
+
+<pre><code><b>struct</b> <a href="managed_coin.md#0x1_managed_coin_Capabilities">Capabilities</a>&lt;CoinType&gt; <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>burn_cap: <a href="coin.md#0x1_coin_BurnCapability">coin::BurnCapability</a>&lt;CoinType&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>freeze_cap: <a href="coin.md#0x1_coin_FreezeCapability">coin::FreezeCapability</a>&lt;CoinType&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>mint_cap: <a href="coin.md#0x1_coin_MintCapability">coin::MintCapability</a>&lt;CoinType&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_managed_coin_ENO_CAPABILITIES"></a>
+
+Account has no capabilities (burn/mint).
+
+
+<pre><code><b>const</b> <a href="managed_coin.md#0x1_managed_coin_ENO_CAPABILITIES">ENO_CAPABILITIES</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_managed_coin_burn"></a>
+
+## Function `burn`
+
+Withdraw an <code>amount</code> of coin <code>CoinType</code> from <code><a href="account.md#0x1_account">account</a></code> and burn it.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="managed_coin.md#0x1_managed_coin_burn">burn</a>&lt;CoinType&gt;(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, amount: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="managed_coin.md#0x1_managed_coin_burn">burn</a>&lt;CoinType&gt;(
+    <a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    amount: u64,
+) <b>acquires</b> <a href="managed_coin.md#0x1_managed_coin_Capabilities">Capabilities</a> {
+    <b>let</b> account_addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>);
+
+    <b>assert</b>!(
+        <b>exists</b>&lt;<a href="managed_coin.md#0x1_managed_coin_Capabilities">Capabilities</a>&lt;CoinType&gt;&gt;(account_addr),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="managed_coin.md#0x1_managed_coin_ENO_CAPABILITIES">ENO_CAPABILITIES</a>),
+    );
+
+    <b>let</b> capabilities = <b>borrow_global</b>&lt;<a href="managed_coin.md#0x1_managed_coin_Capabilities">Capabilities</a>&lt;CoinType&gt;&gt;(account_addr);
+
+    <b>let</b> to_burn = <a href="coin.md#0x1_coin_withdraw">coin::withdraw</a>&lt;CoinType&gt;(<a href="account.md#0x1_account">account</a>, amount);
+    <a href="coin.md#0x1_coin_burn">coin::burn</a>(to_burn, &capabilities.burn_cap);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_managed_coin_initialize"></a>
+
+## Function `initialize`
+
+Initialize new coin <code>CoinType</code> in Aptos Blockchain.
+Mint and Burn Capabilities will be stored under <code><a href="account.md#0x1_account">account</a></code> in <code><a href="managed_coin.md#0x1_managed_coin_Capabilities">Capabilities</a></code> resource.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="managed_coin.md#0x1_managed_coin_initialize">initialize</a>&lt;CoinType&gt;(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, name: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, symbol: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, decimals: u8, monitor_supply: bool)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="managed_coin.md#0x1_managed_coin_initialize">initialize</a>&lt;CoinType&gt;(
+    <a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    name: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    symbol: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    decimals: u8,
+    monitor_supply: bool,
+) {
+    <b>let</b> (burn_cap, freeze_cap, mint_cap) = <a href="coin.md#0x1_coin_initialize">coin::initialize</a>&lt;CoinType&gt;(
+        <a href="account.md#0x1_account">account</a>,
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(name),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(symbol),
+        decimals,
+        monitor_supply,
+    );
+
+    <b>move_to</b>(<a href="account.md#0x1_account">account</a>, <a href="managed_coin.md#0x1_managed_coin_Capabilities">Capabilities</a>&lt;CoinType&gt; {
+        burn_cap,
+        freeze_cap,
+        mint_cap,
+    });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_managed_coin_mint"></a>
+
+## Function `mint`
+
+Create new coins <code>CoinType</code> and deposit them into dst_addr's account.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="managed_coin.md#0x1_managed_coin_mint">mint</a>&lt;CoinType&gt;(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, dst_addr: <b>address</b>, amount: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="managed_coin.md#0x1_managed_coin_mint">mint</a>&lt;CoinType&gt;(
+    <a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    dst_addr: <b>address</b>,
+    amount: u64,
+) <b>acquires</b> <a href="managed_coin.md#0x1_managed_coin_Capabilities">Capabilities</a> {
+    <b>let</b> account_addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>);
+
+    <b>assert</b>!(
+        <b>exists</b>&lt;<a href="managed_coin.md#0x1_managed_coin_Capabilities">Capabilities</a>&lt;CoinType&gt;&gt;(account_addr),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="managed_coin.md#0x1_managed_coin_ENO_CAPABILITIES">ENO_CAPABILITIES</a>),
+    );
+
+    <b>let</b> capabilities = <b>borrow_global</b>&lt;<a href="managed_coin.md#0x1_managed_coin_Capabilities">Capabilities</a>&lt;CoinType&gt;&gt;(account_addr);
+    <b>let</b> coins_minted = <a href="coin.md#0x1_coin_mint">coin::mint</a>(amount, &capabilities.mint_cap);
+    <a href="coin.md#0x1_coin_deposit">coin::deposit</a>(dst_addr, coins_minted);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_managed_coin_register"></a>
+
+## Function `register`
+
+Creating a resource that stores balance of <code>CoinType</code> on user's account, withdraw and deposit event handlers.
+Required if user wants to start accepting deposits of <code>CoinType</code> in his account.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="managed_coin.md#0x1_managed_coin_register">register</a>&lt;CoinType&gt;(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="managed_coin.md#0x1_managed_coin_register">register</a>&lt;CoinType&gt;(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>) {
+    <a href="coin.md#0x1_coin_register">coin::register</a>&lt;CoinType&gt;(<a href="account.md#0x1_account">account</a>);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+
+
+<a id="high-level-req"></a>
+
+### High-level Requirements
+
+<table>
+<tr>
+<th>No.</th><th>Requirement</th><th>Criticality</th><th>Implementation</th><th>Enforcement</th>
+</tr>
+
+<tr>
+<td>1</td>
+<td>The initializing account should hold the capabilities to operate the coin.</td>
+<td>Critical</td>
+<td>The capabilities are stored under the initializing account under the Capabilities resource, which is distinct for a distinct type of coin.</td>
+<td>Enforced via <a href="#high-level-req-1">initialize</a>.</td>
+</tr>
+
+<tr>
+<td>2</td>
+<td>A new coin should be properly initialized.</td>
+<td>High</td>
+<td>In the initialize function, a new coin is initialized via the coin module with the specified properties.</td>
+<td>Enforced via <a href="coin.md#high-level-req-2">initialize_internal</a>.</td>
+</tr>
+
+<tr>
+<td>3</td>
+<td>Minting/Burning should only be done by the account who hold the valid capabilities.</td>
+<td>High</td>
+<td>The mint and burn capabilities are moved under the initializing account and retrieved, while minting/burning</td>
+<td>Enforced via: <a href="#high-level-req-3.1">initialize</a>, <a href="#high-level-req-3.2">burn</a>, <a href="#high-level-req-3.3">mint</a>.</td>
+</tr>
+
+<tr>
+<td>4</td>
+<td>If the total supply of coins is being monitored, burn and mint operations will appropriately adjust the total supply.</td>
+<td>High</td>
+<td>The coin::burn and coin::mint functions, when tracking the supply, adjusts the total coin supply accordingly.</td>
+<td>Enforced via <a href="coin.md#high-level-req-4">TotalSupplyNoChange</a>.</td>
+</tr>
+
+<tr>
+<td>5</td>
+<td>Before burning coins, exact amount of coins are withdrawn.</td>
+<td>High</td>
+<td>After utilizing the coin::withdraw function to withdraw coins, they are then burned, and the function ensures the precise return of the initially specified coin amount.</td>
+<td>Enforced via <a href="coin.md#high-level-req-5">burn_from</a>.</td>
+</tr>
+
+<tr>
+<td>6</td>
+<td>Minted coins are deposited to the provided destination address.</td>
+<td>High</td>
+<td>After the coins are minted via coin::mint they are deposited into the coinstore of the destination address.</td>
+<td>Enforced via <a href="#high-level-req-6">mint</a>.</td>
+</tr>
+
+</table>
+
+
+
+
+<a id="module-level-spec"></a>
+
+### Module-level Specification
+
+
+<pre><code><b>pragma</b> verify = <b>true</b>;
+<b>pragma</b> aborts_if_is_strict;
+</code></pre>
+
+
+
+<a id="@Specification_1_burn"></a>
+
+### Function `burn`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="managed_coin.md#0x1_managed_coin_burn">burn</a>&lt;CoinType&gt;(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, amount: u64)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+<b>let</b> account_addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="managed_coin.md#0x1_managed_coin_Capabilities">Capabilities</a>&lt;CoinType&gt;&gt;(account_addr);
+<b>let</b> coin_store = <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;CoinType&gt;&gt;(account_addr);
+<b>let</b> balance = coin_store.<a href="coin.md#0x1_coin">coin</a>.value;
+// This enforces <a id="high-level-req-3.2" href="#high-level-req">high-level requirement 3</a> and <a id="high-level-req-4.1" href="#high-level-req">high-level requirement 4</a>:
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;CoinType&gt;&gt;(account_addr);
+<b>aborts_if</b> coin_store.frozen;
+<b>aborts_if</b> balance &lt; amount;
+<b>let</b> addr =  <a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_type_of">type_info::type_of</a>&lt;CoinType&gt;().account_address;
+<b>let</b> maybe_supply = <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinInfo">coin::CoinInfo</a>&lt;CoinType&gt;&gt;(addr).supply;
+<b>aborts_if</b> amount == 0;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinInfo">coin::CoinInfo</a>&lt;CoinType&gt;&gt;(addr);
+<b>include</b> <a href="coin.md#0x1_coin_CoinSubAbortsIf">coin::CoinSubAbortsIf</a>&lt;CoinType&gt; { amount:amount };
+<b>ensures</b> <a href="coin.md#0x1_coin_supply">coin::supply</a>&lt;CoinType&gt; == <b>old</b>(<a href="coin.md#0x1_coin_supply">coin::supply</a>&lt;CoinType&gt;) - amount;
+</code></pre>
+
+
+
+<a id="@Specification_1_initialize"></a>
+
+### Function `initialize`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="managed_coin.md#0x1_managed_coin_initialize">initialize</a>&lt;CoinType&gt;(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, name: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, symbol: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, decimals: u8, monitor_supply: bool)
+</code></pre>
+
+
+Make sure <code>name</code> and <code>symbol</code> are legal length.
+Only the creator of <code>CoinType</code> can initialize.
+The 'name' and 'symbol' should be valid utf8 bytes
+The Capabilities<CoinType> should not be under the signer before creating;
+The Capabilities<CoinType> should be under the signer after creating;
+
+
+<pre><code><b>include</b> <a href="coin.md#0x1_coin_InitializeInternalSchema">coin::InitializeInternalSchema</a>&lt;CoinType&gt;;
+<b>aborts_if</b> !<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_spec_internal_check_utf8">string::spec_internal_check_utf8</a>(name);
+<b>aborts_if</b> !<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_spec_internal_check_utf8">string::spec_internal_check_utf8</a>(symbol);
+<b>aborts_if</b> <b>exists</b>&lt;<a href="managed_coin.md#0x1_managed_coin_Capabilities">Capabilities</a>&lt;CoinType&gt;&gt;(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>));
+// This enforces <a id="high-level-req-1" href="#high-level-req">high-level requirement 1</a> and <a id="high-level-req-3.1" href="#high-level-req">high-level requirement 3</a>:
+<b>ensures</b> <b>exists</b>&lt;<a href="managed_coin.md#0x1_managed_coin_Capabilities">Capabilities</a>&lt;CoinType&gt;&gt;(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>));
+</code></pre>
+
+
+
+<a id="@Specification_1_mint"></a>
+
+### Function `mint`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="managed_coin.md#0x1_managed_coin_mint">mint</a>&lt;CoinType&gt;(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, dst_addr: <b>address</b>, amount: u64)
+</code></pre>
+
+
+The Capabilities<CoinType> should not exist in the signer address.
+The <code>dst_addr</code> should not be frozen.
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+<b>let</b> account_addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>);
+// This enforces <a id="high-level-req-3.3" href="#high-level-req">high-level requirement 3</a>:
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="managed_coin.md#0x1_managed_coin_Capabilities">Capabilities</a>&lt;CoinType&gt;&gt;(account_addr);
+<b>let</b> addr = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_type_of">type_info::type_of</a>&lt;CoinType&gt;().account_address;
+<b>aborts_if</b> (amount != 0) && !<b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinInfo">coin::CoinInfo</a>&lt;CoinType&gt;&gt;(addr);
+<b>let</b> coin_store = <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;CoinType&gt;&gt;(dst_addr);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;CoinType&gt;&gt;(dst_addr);
+<b>aborts_if</b> coin_store.frozen;
+<b>include</b> <a href="coin.md#0x1_coin_CoinAddAbortsIf">coin::CoinAddAbortsIf</a>&lt;CoinType&gt;;
+<b>ensures</b> <a href="coin.md#0x1_coin_supply">coin::supply</a>&lt;CoinType&gt; == <b>old</b>(<a href="coin.md#0x1_coin_supply">coin::supply</a>&lt;CoinType&gt;) + amount;
+// This enforces <a id="high-level-req-6" href="#high-level-req">high-level requirement 6</a>:
+<b>ensures</b> <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;CoinType&gt;&gt;(dst_addr).<a href="coin.md#0x1_coin">coin</a>.value == <b>old</b>(<b>global</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;CoinType&gt;&gt;(dst_addr)).<a href="coin.md#0x1_coin">coin</a>.value + amount;
+</code></pre>
+
+
+
+<a id="@Specification_1_register"></a>
+
+### Function `register`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="managed_coin.md#0x1_managed_coin_register">register</a>&lt;CoinType&gt;(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+An account can only be registered once.
+Updating <code>Account.guid_creation_num</code> will not overflow.
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+<b>let</b> account_addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>);
+<b>let</b> acc = <b>global</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(account_addr);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;CoinType&gt;&gt;(account_addr) && acc.guid_creation_num + 2 &gt;= <a href="account.md#0x1_account_MAX_GUID_CREATION_NUM">account::MAX_GUID_CREATION_NUM</a>;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;CoinType&gt;&gt;(account_addr) && acc.guid_creation_num + 2 &gt; MAX_U64;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;CoinType&gt;&gt;(account_addr) && !<b>exists</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(account_addr);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;CoinType&gt;&gt;(account_addr) && !<a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_spec_is_struct">type_info::spec_is_struct</a>&lt;CoinType&gt;();
+<b>ensures</b> <b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;CoinType&gt;&gt;(account_addr);
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/multisig_account.md b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/multisig_account.md
new file mode 100644
index 0000000000000..601d661ed1af5
--- /dev/null
+++ b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/multisig_account.md
@@ -0,0 +1,4127 @@
+
+<a id="0x1_multisig_account"></a>
+
+# Module `0x1::multisig_account`
+
+Enhanced multisig account standard on Aptos. This is different from the native multisig scheme support enforced via
+the account's auth key.
+
+This module allows creating a flexible and powerful multisig account with seamless support for updating owners
+without changing the auth key. Users can choose to store transaction payloads waiting for owner signatures on chain
+or off chain (primary consideration is decentralization/transparency vs gas cost).
+
+The multisig account is a resource account underneath. By default, it has no auth key and can only be controlled via
+the special multisig transaction flow. However, owners can create a transaction to change the auth key to match a
+private key off chain if so desired.
+
+Transactions need to be executed in order of creation, similar to transactions for a normal Aptos account (enforced
+with account nonce).
+
+The flow is like below:
+1. Owners can create a new multisig account by calling create (signer is default single owner) or with
+create_with_owners where multiple initial owner addresses can be specified. This is different (and easier) from
+the native multisig scheme where the owners' public keys have to be specified. Here, only addresses are needed.
+2. Owners can be added/removed any time by calling add_owners or remove_owners. The transactions to do still need
+to follow the k-of-n scheme specified for the multisig account.
+3. To create a new transaction, an owner can call create_transaction with the transaction payload. This will store
+the full transaction payload on chain, which adds decentralization (censorship is not possible as the data is
+available on chain) and makes it easier to fetch all transactions waiting for execution. If saving gas is desired,
+an owner can alternatively call create_transaction_with_hash where only the payload hash is stored. Later execution
+will be verified using the hash. Only owners can create transactions and a transaction id (incremeting id) will be
+assigned.
+4. To approve or reject a transaction, other owners can call approve() or reject() with the transaction id.
+5. If there are enough approvals, any owner can execute the transaction using the special MultisigTransaction type
+with the transaction id if the full payload is already stored on chain or with the transaction payload if only a
+hash is stored. Transaction execution will first check with this module that the transaction payload has gotten
+enough signatures. If so, it will be executed as the multisig account. The owner who executes will pay for gas.
+6. If there are enough rejections, any owner can finalize the rejection by calling execute_rejected_transaction().
+
+Note that this multisig account model is not designed to use with a large number of owners. The more owners there
+are, the more expensive voting on transactions will become. If a large number of owners is designed, such as in a
+flat governance structure, clients are encouraged to write their own modules on top of this multisig account module
+and implement the governance voting logic on top.
+
+
+-  [Resource `MultisigAccount`](#0x1_multisig_account_MultisigAccount)
+-  [Struct `MultisigTransaction`](#0x1_multisig_account_MultisigTransaction)
+-  [Struct `ExecutionError`](#0x1_multisig_account_ExecutionError)
+-  [Struct `MultisigAccountCreationMessage`](#0x1_multisig_account_MultisigAccountCreationMessage)
+-  [Struct `MultisigAccountCreationWithAuthKeyRevocationMessage`](#0x1_multisig_account_MultisigAccountCreationWithAuthKeyRevocationMessage)
+-  [Struct `AddOwnersEvent`](#0x1_multisig_account_AddOwnersEvent)
+-  [Struct `AddOwners`](#0x1_multisig_account_AddOwners)
+-  [Struct `RemoveOwnersEvent`](#0x1_multisig_account_RemoveOwnersEvent)
+-  [Struct `RemoveOwners`](#0x1_multisig_account_RemoveOwners)
+-  [Struct `UpdateSignaturesRequiredEvent`](#0x1_multisig_account_UpdateSignaturesRequiredEvent)
+-  [Struct `UpdateSignaturesRequired`](#0x1_multisig_account_UpdateSignaturesRequired)
+-  [Struct `CreateTransactionEvent`](#0x1_multisig_account_CreateTransactionEvent)
+-  [Struct `CreateTransaction`](#0x1_multisig_account_CreateTransaction)
+-  [Struct `VoteEvent`](#0x1_multisig_account_VoteEvent)
+-  [Struct `Vote`](#0x1_multisig_account_Vote)
+-  [Struct `ExecuteRejectedTransactionEvent`](#0x1_multisig_account_ExecuteRejectedTransactionEvent)
+-  [Struct `ExecuteRejectedTransaction`](#0x1_multisig_account_ExecuteRejectedTransaction)
+-  [Struct `TransactionExecutionSucceededEvent`](#0x1_multisig_account_TransactionExecutionSucceededEvent)
+-  [Struct `TransactionExecutionSucceeded`](#0x1_multisig_account_TransactionExecutionSucceeded)
+-  [Struct `TransactionExecutionFailedEvent`](#0x1_multisig_account_TransactionExecutionFailedEvent)
+-  [Struct `TransactionExecutionFailed`](#0x1_multisig_account_TransactionExecutionFailed)
+-  [Struct `MetadataUpdatedEvent`](#0x1_multisig_account_MetadataUpdatedEvent)
+-  [Struct `MetadataUpdated`](#0x1_multisig_account_MetadataUpdated)
+-  [Constants](#@Constants_0)
+-  [Function `metadata`](#0x1_multisig_account_metadata)
+-  [Function `num_signatures_required`](#0x1_multisig_account_num_signatures_required)
+-  [Function `owners`](#0x1_multisig_account_owners)
+-  [Function `is_owner`](#0x1_multisig_account_is_owner)
+-  [Function `get_transaction`](#0x1_multisig_account_get_transaction)
+-  [Function `get_pending_transactions`](#0x1_multisig_account_get_pending_transactions)
+-  [Function `get_next_transaction_payload`](#0x1_multisig_account_get_next_transaction_payload)
+-  [Function `can_be_executed`](#0x1_multisig_account_can_be_executed)
+-  [Function `can_execute`](#0x1_multisig_account_can_execute)
+-  [Function `can_be_rejected`](#0x1_multisig_account_can_be_rejected)
+-  [Function `can_reject`](#0x1_multisig_account_can_reject)
+-  [Function `get_next_multisig_account_address`](#0x1_multisig_account_get_next_multisig_account_address)
+-  [Function `last_resolved_sequence_number`](#0x1_multisig_account_last_resolved_sequence_number)
+-  [Function `next_sequence_number`](#0x1_multisig_account_next_sequence_number)
+-  [Function `vote`](#0x1_multisig_account_vote)
+-  [Function `available_transaction_queue_capacity`](#0x1_multisig_account_available_transaction_queue_capacity)
+-  [Function `create_with_existing_account`](#0x1_multisig_account_create_with_existing_account)
+-  [Function `create_with_existing_account_and_revoke_auth_key`](#0x1_multisig_account_create_with_existing_account_and_revoke_auth_key)
+-  [Function `create`](#0x1_multisig_account_create)
+-  [Function `create_with_owners`](#0x1_multisig_account_create_with_owners)
+-  [Function `create_with_owners_then_remove_bootstrapper`](#0x1_multisig_account_create_with_owners_then_remove_bootstrapper)
+-  [Function `create_with_owners_internal`](#0x1_multisig_account_create_with_owners_internal)
+-  [Function `add_owner`](#0x1_multisig_account_add_owner)
+-  [Function `add_owners`](#0x1_multisig_account_add_owners)
+-  [Function `add_owners_and_update_signatures_required`](#0x1_multisig_account_add_owners_and_update_signatures_required)
+-  [Function `remove_owner`](#0x1_multisig_account_remove_owner)
+-  [Function `remove_owners`](#0x1_multisig_account_remove_owners)
+-  [Function `swap_owner`](#0x1_multisig_account_swap_owner)
+-  [Function `swap_owners`](#0x1_multisig_account_swap_owners)
+-  [Function `swap_owners_and_update_signatures_required`](#0x1_multisig_account_swap_owners_and_update_signatures_required)
+-  [Function `update_signatures_required`](#0x1_multisig_account_update_signatures_required)
+-  [Function `update_metadata`](#0x1_multisig_account_update_metadata)
+-  [Function `update_metadata_internal`](#0x1_multisig_account_update_metadata_internal)
+-  [Function `create_transaction`](#0x1_multisig_account_create_transaction)
+-  [Function `create_transaction_with_hash`](#0x1_multisig_account_create_transaction_with_hash)
+-  [Function `approve_transaction`](#0x1_multisig_account_approve_transaction)
+-  [Function `reject_transaction`](#0x1_multisig_account_reject_transaction)
+-  [Function `vote_transanction`](#0x1_multisig_account_vote_transanction)
+-  [Function `vote_transaction`](#0x1_multisig_account_vote_transaction)
+-  [Function `vote_transactions`](#0x1_multisig_account_vote_transactions)
+-  [Function `execute_rejected_transaction`](#0x1_multisig_account_execute_rejected_transaction)
+-  [Function `execute_rejected_transactions`](#0x1_multisig_account_execute_rejected_transactions)
+-  [Function `validate_multisig_transaction`](#0x1_multisig_account_validate_multisig_transaction)
+-  [Function `successful_transaction_execution_cleanup`](#0x1_multisig_account_successful_transaction_execution_cleanup)
+-  [Function `failed_transaction_execution_cleanup`](#0x1_multisig_account_failed_transaction_execution_cleanup)
+-  [Function `transaction_execution_cleanup_common`](#0x1_multisig_account_transaction_execution_cleanup_common)
+-  [Function `remove_executed_transaction`](#0x1_multisig_account_remove_executed_transaction)
+-  [Function `add_transaction`](#0x1_multisig_account_add_transaction)
+-  [Function `create_multisig_account`](#0x1_multisig_account_create_multisig_account)
+-  [Function `create_multisig_account_seed`](#0x1_multisig_account_create_multisig_account_seed)
+-  [Function `validate_owners`](#0x1_multisig_account_validate_owners)
+-  [Function `assert_is_owner_internal`](#0x1_multisig_account_assert_is_owner_internal)
+-  [Function `assert_is_owner`](#0x1_multisig_account_assert_is_owner)
+-  [Function `num_approvals_and_rejections_internal`](#0x1_multisig_account_num_approvals_and_rejections_internal)
+-  [Function `num_approvals_and_rejections`](#0x1_multisig_account_num_approvals_and_rejections)
+-  [Function `has_voted_for_approval`](#0x1_multisig_account_has_voted_for_approval)
+-  [Function `has_voted_for_rejection`](#0x1_multisig_account_has_voted_for_rejection)
+-  [Function `assert_multisig_account_exists`](#0x1_multisig_account_assert_multisig_account_exists)
+-  [Function `assert_valid_sequence_number`](#0x1_multisig_account_assert_valid_sequence_number)
+-  [Function `assert_transaction_exists`](#0x1_multisig_account_assert_transaction_exists)
+-  [Function `update_owner_schema`](#0x1_multisig_account_update_owner_schema)
+-  [Specification](#@Specification_1)
+    -  [High-level Requirements](#high-level-req)
+    -  [Module-level Specification](#module-level-spec)
+    -  [Function `metadata`](#@Specification_1_metadata)
+    -  [Function `num_signatures_required`](#@Specification_1_num_signatures_required)
+    -  [Function `owners`](#@Specification_1_owners)
+    -  [Function `get_transaction`](#@Specification_1_get_transaction)
+    -  [Function `get_next_transaction_payload`](#@Specification_1_get_next_transaction_payload)
+    -  [Function `get_next_multisig_account_address`](#@Specification_1_get_next_multisig_account_address)
+    -  [Function `last_resolved_sequence_number`](#@Specification_1_last_resolved_sequence_number)
+    -  [Function `next_sequence_number`](#@Specification_1_next_sequence_number)
+    -  [Function `vote`](#@Specification_1_vote)
+
+
+<pre><code><b>use</b> <a href="account.md#0x1_account">0x1::account</a>;
+<b>use</b> <a href="aptos_coin.md#0x1_aptos_coin">0x1::aptos_coin</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs">0x1::bcs</a>;
+<b>use</b> <a href="chain_id.md#0x1_chain_id">0x1::chain_id</a>;
+<b>use</b> <a href="coin.md#0x1_coin">0x1::coin</a>;
+<b>use</b> <a href="create_signer.md#0x1_create_signer">0x1::create_signer</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="event.md#0x1_event">0x1::event</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features">0x1::features</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/hash.md#0x1_hash">0x1::hash</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option">0x1::option</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">0x1::signer</a>;
+<b>use</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map">0x1::simple_map</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string">0x1::string</a>;
+<b>use</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table">0x1::table</a>;
+<b>use</b> <a href="timestamp.md#0x1_timestamp">0x1::timestamp</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">0x1::vector</a>;
+</code></pre>
+
+
+
+<a id="0x1_multisig_account_MultisigAccount"></a>
+
+## Resource `MultisigAccount`
+
+Represents a multisig account's configurations and transactions.
+This will be stored in the multisig account (created as a resource account separate from any owner accounts).
+
+
+<pre><code><b>struct</b> <a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>owners: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>num_signatures_required: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>transactions: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_Table">table::Table</a>&lt;u64, <a href="multisig_account.md#0x1_multisig_account_MultisigTransaction">multisig_account::MultisigTransaction</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>last_executed_sequence_number: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>next_sequence_number: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>signer_cap: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="account.md#0x1_account_SignerCapability">account::SignerCapability</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>metadata: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>add_owners_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="multisig_account.md#0x1_multisig_account_AddOwnersEvent">multisig_account::AddOwnersEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>remove_owners_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="multisig_account.md#0x1_multisig_account_RemoveOwnersEvent">multisig_account::RemoveOwnersEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>update_signature_required_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="multisig_account.md#0x1_multisig_account_UpdateSignaturesRequiredEvent">multisig_account::UpdateSignaturesRequiredEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>create_transaction_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="multisig_account.md#0x1_multisig_account_CreateTransactionEvent">multisig_account::CreateTransactionEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>vote_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="multisig_account.md#0x1_multisig_account_VoteEvent">multisig_account::VoteEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>execute_rejected_transaction_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="multisig_account.md#0x1_multisig_account_ExecuteRejectedTransactionEvent">multisig_account::ExecuteRejectedTransactionEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>execute_transaction_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="multisig_account.md#0x1_multisig_account_TransactionExecutionSucceededEvent">multisig_account::TransactionExecutionSucceededEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>transaction_execution_failed_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="multisig_account.md#0x1_multisig_account_TransactionExecutionFailedEvent">multisig_account::TransactionExecutionFailedEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>metadata_updated_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="multisig_account.md#0x1_multisig_account_MetadataUpdatedEvent">multisig_account::MetadataUpdatedEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_multisig_account_MultisigTransaction"></a>
+
+## Struct `MultisigTransaction`
+
+A transaction to be executed in a multisig account.
+This must contain either the full transaction payload or its hash (stored as bytes).
+
+
+<pre><code><b>struct</b> <a href="multisig_account.md#0x1_multisig_account_MultisigTransaction">MultisigTransaction</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>payload: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>payload_hash: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>votes: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;<b>address</b>, bool&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>creator: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>creation_time_secs: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_multisig_account_ExecutionError"></a>
+
+## Struct `ExecutionError`
+
+Contains information about execution failure.
+
+
+<pre><code><b>struct</b> <a href="multisig_account.md#0x1_multisig_account_ExecutionError">ExecutionError</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>abort_location: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>error_type: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>error_code: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_multisig_account_MultisigAccountCreationMessage"></a>
+
+## Struct `MultisigAccountCreationMessage`
+
+Used only for verifying multisig account creation on top of existing accounts.
+
+
+<pre><code><b>struct</b> <a href="multisig_account.md#0x1_multisig_account_MultisigAccountCreationMessage">MultisigAccountCreationMessage</a> <b>has</b> <b>copy</b>, drop
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code><a href="chain_id.md#0x1_chain_id">chain_id</a>: u8</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>account_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>sequence_number: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>owners: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>num_signatures_required: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_multisig_account_MultisigAccountCreationWithAuthKeyRevocationMessage"></a>
+
+## Struct `MultisigAccountCreationWithAuthKeyRevocationMessage`
+
+Used only for verifying multisig account creation on top of existing accounts and rotating the auth key to 0x0.
+
+
+<pre><code><b>struct</b> <a href="multisig_account.md#0x1_multisig_account_MultisigAccountCreationWithAuthKeyRevocationMessage">MultisigAccountCreationWithAuthKeyRevocationMessage</a> <b>has</b> <b>copy</b>, drop
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code><a href="chain_id.md#0x1_chain_id">chain_id</a>: u8</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>account_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>sequence_number: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>owners: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>num_signatures_required: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_multisig_account_AddOwnersEvent"></a>
+
+## Struct `AddOwnersEvent`
+
+Event emitted when new owners are added to the multisig account.
+
+
+<pre><code><b>struct</b> <a href="multisig_account.md#0x1_multisig_account_AddOwnersEvent">AddOwnersEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>owners_added: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_multisig_account_AddOwners"></a>
+
+## Struct `AddOwners`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="multisig_account.md#0x1_multisig_account_AddOwners">AddOwners</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code><a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>owners_added: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_multisig_account_RemoveOwnersEvent"></a>
+
+## Struct `RemoveOwnersEvent`
+
+Event emitted when new owners are removed from the multisig account.
+
+
+<pre><code><b>struct</b> <a href="multisig_account.md#0x1_multisig_account_RemoveOwnersEvent">RemoveOwnersEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>owners_removed: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_multisig_account_RemoveOwners"></a>
+
+## Struct `RemoveOwners`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="multisig_account.md#0x1_multisig_account_RemoveOwners">RemoveOwners</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code><a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>owners_removed: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_multisig_account_UpdateSignaturesRequiredEvent"></a>
+
+## Struct `UpdateSignaturesRequiredEvent`
+
+Event emitted when the number of signatures required is updated.
+
+
+<pre><code><b>struct</b> <a href="multisig_account.md#0x1_multisig_account_UpdateSignaturesRequiredEvent">UpdateSignaturesRequiredEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>old_num_signatures_required: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>new_num_signatures_required: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_multisig_account_UpdateSignaturesRequired"></a>
+
+## Struct `UpdateSignaturesRequired`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="multisig_account.md#0x1_multisig_account_UpdateSignaturesRequired">UpdateSignaturesRequired</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code><a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>old_num_signatures_required: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>new_num_signatures_required: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_multisig_account_CreateTransactionEvent"></a>
+
+## Struct `CreateTransactionEvent`
+
+Event emitted when a transaction is created.
+
+
+<pre><code><b>struct</b> <a href="multisig_account.md#0x1_multisig_account_CreateTransactionEvent">CreateTransactionEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>creator: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>sequence_number: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>transaction: <a href="multisig_account.md#0x1_multisig_account_MultisigTransaction">multisig_account::MultisigTransaction</a></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_multisig_account_CreateTransaction"></a>
+
+## Struct `CreateTransaction`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="multisig_account.md#0x1_multisig_account_CreateTransaction">CreateTransaction</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code><a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>creator: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>sequence_number: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>transaction: <a href="multisig_account.md#0x1_multisig_account_MultisigTransaction">multisig_account::MultisigTransaction</a></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_multisig_account_VoteEvent"></a>
+
+## Struct `VoteEvent`
+
+Event emitted when an owner approves or rejects a transaction.
+
+
+<pre><code><b>struct</b> <a href="multisig_account.md#0x1_multisig_account_VoteEvent">VoteEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>owner: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>sequence_number: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>approved: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_multisig_account_Vote"></a>
+
+## Struct `Vote`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="multisig_account.md#0x1_multisig_account_Vote">Vote</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code><a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>owner: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>sequence_number: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>approved: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_multisig_account_ExecuteRejectedTransactionEvent"></a>
+
+## Struct `ExecuteRejectedTransactionEvent`
+
+Event emitted when a transaction is officially rejected because the number of rejections has reached the
+number of signatures required.
+
+
+<pre><code><b>struct</b> <a href="multisig_account.md#0x1_multisig_account_ExecuteRejectedTransactionEvent">ExecuteRejectedTransactionEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>sequence_number: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>num_rejections: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>executor: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_multisig_account_ExecuteRejectedTransaction"></a>
+
+## Struct `ExecuteRejectedTransaction`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="multisig_account.md#0x1_multisig_account_ExecuteRejectedTransaction">ExecuteRejectedTransaction</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code><a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>sequence_number: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>num_rejections: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>executor: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_multisig_account_TransactionExecutionSucceededEvent"></a>
+
+## Struct `TransactionExecutionSucceededEvent`
+
+Event emitted when a transaction is executed.
+
+
+<pre><code><b>struct</b> <a href="multisig_account.md#0x1_multisig_account_TransactionExecutionSucceededEvent">TransactionExecutionSucceededEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>executor: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>sequence_number: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>transaction_payload: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>num_approvals: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_multisig_account_TransactionExecutionSucceeded"></a>
+
+## Struct `TransactionExecutionSucceeded`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="multisig_account.md#0x1_multisig_account_TransactionExecutionSucceeded">TransactionExecutionSucceeded</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code><a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>executor: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>sequence_number: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>transaction_payload: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>num_approvals: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_multisig_account_TransactionExecutionFailedEvent"></a>
+
+## Struct `TransactionExecutionFailedEvent`
+
+Event emitted when a transaction's execution failed.
+
+
+<pre><code><b>struct</b> <a href="multisig_account.md#0x1_multisig_account_TransactionExecutionFailedEvent">TransactionExecutionFailedEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>executor: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>sequence_number: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>transaction_payload: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>num_approvals: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>execution_error: <a href="multisig_account.md#0x1_multisig_account_ExecutionError">multisig_account::ExecutionError</a></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_multisig_account_TransactionExecutionFailed"></a>
+
+## Struct `TransactionExecutionFailed`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="multisig_account.md#0x1_multisig_account_TransactionExecutionFailed">TransactionExecutionFailed</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code><a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>executor: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>sequence_number: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>transaction_payload: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>num_approvals: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>execution_error: <a href="multisig_account.md#0x1_multisig_account_ExecutionError">multisig_account::ExecutionError</a></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_multisig_account_MetadataUpdatedEvent"></a>
+
+## Struct `MetadataUpdatedEvent`
+
+Event emitted when a transaction's metadata is updated.
+
+
+<pre><code><b>struct</b> <a href="multisig_account.md#0x1_multisig_account_MetadataUpdatedEvent">MetadataUpdatedEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>old_metadata: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>new_metadata: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_multisig_account_MetadataUpdated"></a>
+
+## Struct `MetadataUpdated`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="multisig_account.md#0x1_multisig_account_MetadataUpdated">MetadataUpdated</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code><a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>old_metadata: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>new_metadata: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_multisig_account_ZERO_AUTH_KEY"></a>
+
+
+
+<pre><code><b>const</b> <a href="multisig_account.md#0x1_multisig_account_ZERO_AUTH_KEY">ZERO_AUTH_KEY</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
+</code></pre>
+
+
+
+<a id="0x1_multisig_account_DOMAIN_SEPARATOR"></a>
+
+The salt used to create a resource account during multisig account creation.
+This is used to avoid conflicts with other modules that also create resource accounts with the same owner
+account.
+
+
+<pre><code><b>const</b> <a href="multisig_account.md#0x1_multisig_account_DOMAIN_SEPARATOR">DOMAIN_SEPARATOR</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; = [97, 112, 116, 111, 115, 95, 102, 114, 97, 109, 101, 119, 111, 114, 107, 58, 58, 109, 117, 108, 116, 105, 115, 105, 103, 95, 97, 99, 99, 111, 117, 110, 116];
+</code></pre>
+
+
+
+<a id="0x1_multisig_account_EACCOUNT_NOT_MULTISIG"></a>
+
+Specified account is not a multisig account.
+
+
+<pre><code><b>const</b> <a href="multisig_account.md#0x1_multisig_account_EACCOUNT_NOT_MULTISIG">EACCOUNT_NOT_MULTISIG</a>: u64 = 2002;
+</code></pre>
+
+
+
+<a id="0x1_multisig_account_EDUPLICATE_METADATA_KEY"></a>
+
+The specified metadata contains duplicate attributes (keys).
+
+
+<pre><code><b>const</b> <a href="multisig_account.md#0x1_multisig_account_EDUPLICATE_METADATA_KEY">EDUPLICATE_METADATA_KEY</a>: u64 = 16;
+</code></pre>
+
+
+
+<a id="0x1_multisig_account_EDUPLICATE_OWNER"></a>
+
+Owner list cannot contain the same address more than once.
+
+
+<pre><code><b>const</b> <a href="multisig_account.md#0x1_multisig_account_EDUPLICATE_OWNER">EDUPLICATE_OWNER</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_multisig_account_EINVALID_PAYLOAD_HASH"></a>
+
+Payload hash must be exactly 32 bytes (sha3-256).
+
+
+<pre><code><b>const</b> <a href="multisig_account.md#0x1_multisig_account_EINVALID_PAYLOAD_HASH">EINVALID_PAYLOAD_HASH</a>: u64 = 12;
+</code></pre>
+
+
+
+<a id="0x1_multisig_account_EINVALID_SEQUENCE_NUMBER"></a>
+
+The sequence number provided is invalid. It must be between [1, next pending transaction - 1].
+
+
+<pre><code><b>const</b> <a href="multisig_account.md#0x1_multisig_account_EINVALID_SEQUENCE_NUMBER">EINVALID_SEQUENCE_NUMBER</a>: u64 = 17;
+</code></pre>
+
+
+
+<a id="0x1_multisig_account_EINVALID_SIGNATURES_REQUIRED"></a>
+
+Number of signatures required must be more than zero and at most the total number of owners.
+
+
+<pre><code><b>const</b> <a href="multisig_account.md#0x1_multisig_account_EINVALID_SIGNATURES_REQUIRED">EINVALID_SIGNATURES_REQUIRED</a>: u64 = 11;
+</code></pre>
+
+
+
+<a id="0x1_multisig_account_EMAX_PENDING_TRANSACTIONS_EXCEEDED"></a>
+
+The number of pending transactions has exceeded the maximum allowed.
+
+
+<pre><code><b>const</b> <a href="multisig_account.md#0x1_multisig_account_EMAX_PENDING_TRANSACTIONS_EXCEEDED">EMAX_PENDING_TRANSACTIONS_EXCEEDED</a>: u64 = 19;
+</code></pre>
+
+
+
+<a id="0x1_multisig_account_EMULTISIG_ACCOUNTS_NOT_ENABLED_YET"></a>
+
+Multisig accounts has not been enabled on this current network yet.
+
+
+<pre><code><b>const</b> <a href="multisig_account.md#0x1_multisig_account_EMULTISIG_ACCOUNTS_NOT_ENABLED_YET">EMULTISIG_ACCOUNTS_NOT_ENABLED_YET</a>: u64 = 14;
+</code></pre>
+
+
+
+<a id="0x1_multisig_account_EMULTISIG_V2_ENHANCEMENT_NOT_ENABLED"></a>
+
+The multisig v2 enhancement feature is not enabled.
+
+
+<pre><code><b>const</b> <a href="multisig_account.md#0x1_multisig_account_EMULTISIG_V2_ENHANCEMENT_NOT_ENABLED">EMULTISIG_V2_ENHANCEMENT_NOT_ENABLED</a>: u64 = 20;
+</code></pre>
+
+
+
+<a id="0x1_multisig_account_ENOT_ENOUGH_APPROVALS"></a>
+
+Transaction has not received enough approvals to be executed.
+
+
+<pre><code><b>const</b> <a href="multisig_account.md#0x1_multisig_account_ENOT_ENOUGH_APPROVALS">ENOT_ENOUGH_APPROVALS</a>: u64 = 2009;
+</code></pre>
+
+
+
+<a id="0x1_multisig_account_ENOT_ENOUGH_OWNERS"></a>
+
+Multisig account must have at least one owner.
+
+
+<pre><code><b>const</b> <a href="multisig_account.md#0x1_multisig_account_ENOT_ENOUGH_OWNERS">ENOT_ENOUGH_OWNERS</a>: u64 = 5;
+</code></pre>
+
+
+
+<a id="0x1_multisig_account_ENOT_ENOUGH_REJECTIONS"></a>
+
+Transaction has not received enough rejections to be officially rejected.
+
+
+<pre><code><b>const</b> <a href="multisig_account.md#0x1_multisig_account_ENOT_ENOUGH_REJECTIONS">ENOT_ENOUGH_REJECTIONS</a>: u64 = 10;
+</code></pre>
+
+
+
+<a id="0x1_multisig_account_ENOT_OWNER"></a>
+
+Account executing this operation is not an owner of the multisig account.
+
+
+<pre><code><b>const</b> <a href="multisig_account.md#0x1_multisig_account_ENOT_OWNER">ENOT_OWNER</a>: u64 = 2003;
+</code></pre>
+
+
+
+<a id="0x1_multisig_account_ENUMBER_OF_METADATA_KEYS_AND_VALUES_DONT_MATCH"></a>
+
+The number of metadata keys and values don't match.
+
+
+<pre><code><b>const</b> <a href="multisig_account.md#0x1_multisig_account_ENUMBER_OF_METADATA_KEYS_AND_VALUES_DONT_MATCH">ENUMBER_OF_METADATA_KEYS_AND_VALUES_DONT_MATCH</a>: u64 = 15;
+</code></pre>
+
+
+
+<a id="0x1_multisig_account_EOWNERS_TO_REMOVE_NEW_OWNERS_OVERLAP"></a>
+
+Provided owners to remove and new owners overlap.
+
+
+<pre><code><b>const</b> <a href="multisig_account.md#0x1_multisig_account_EOWNERS_TO_REMOVE_NEW_OWNERS_OVERLAP">EOWNERS_TO_REMOVE_NEW_OWNERS_OVERLAP</a>: u64 = 18;
+</code></pre>
+
+
+
+<a id="0x1_multisig_account_EOWNER_CANNOT_BE_MULTISIG_ACCOUNT_ITSELF"></a>
+
+The multisig account itself cannot be an owner.
+
+
+<pre><code><b>const</b> <a href="multisig_account.md#0x1_multisig_account_EOWNER_CANNOT_BE_MULTISIG_ACCOUNT_ITSELF">EOWNER_CANNOT_BE_MULTISIG_ACCOUNT_ITSELF</a>: u64 = 13;
+</code></pre>
+
+
+
+<a id="0x1_multisig_account_EPAYLOAD_CANNOT_BE_EMPTY"></a>
+
+Transaction payload cannot be empty.
+
+
+<pre><code><b>const</b> <a href="multisig_account.md#0x1_multisig_account_EPAYLOAD_CANNOT_BE_EMPTY">EPAYLOAD_CANNOT_BE_EMPTY</a>: u64 = 4;
+</code></pre>
+
+
+
+<a id="0x1_multisig_account_EPAYLOAD_DOES_NOT_MATCH"></a>
+
+Provided target function does not match the payload stored in the on-chain transaction.
+
+
+<pre><code><b>const</b> <a href="multisig_account.md#0x1_multisig_account_EPAYLOAD_DOES_NOT_MATCH">EPAYLOAD_DOES_NOT_MATCH</a>: u64 = 2010;
+</code></pre>
+
+
+
+<a id="0x1_multisig_account_EPAYLOAD_DOES_NOT_MATCH_HASH"></a>
+
+Provided target function does not match the hash stored in the on-chain transaction.
+
+
+<pre><code><b>const</b> <a href="multisig_account.md#0x1_multisig_account_EPAYLOAD_DOES_NOT_MATCH_HASH">EPAYLOAD_DOES_NOT_MATCH_HASH</a>: u64 = 2008;
+</code></pre>
+
+
+
+<a id="0x1_multisig_account_ETRANSACTION_NOT_FOUND"></a>
+
+Transaction with specified id cannot be found.
+
+
+<pre><code><b>const</b> <a href="multisig_account.md#0x1_multisig_account_ETRANSACTION_NOT_FOUND">ETRANSACTION_NOT_FOUND</a>: u64 = 2006;
+</code></pre>
+
+
+
+<a id="0x1_multisig_account_MAX_PENDING_TRANSACTIONS"></a>
+
+
+
+<pre><code><b>const</b> <a href="multisig_account.md#0x1_multisig_account_MAX_PENDING_TRANSACTIONS">MAX_PENDING_TRANSACTIONS</a>: u64 = 20;
+</code></pre>
+
+
+
+<a id="0x1_multisig_account_metadata"></a>
+
+## Function `metadata`
+
+Return the multisig account's metadata.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_metadata">metadata</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>): <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_metadata">metadata</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>): SimpleMap&lt;String, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt; <b>acquires</b> <a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a> {
+    <b>borrow_global</b>&lt;<a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a>&gt;(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>).metadata
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multisig_account_num_signatures_required"></a>
+
+## Function `num_signatures_required`
+
+Return the number of signatures required to execute or execute-reject a transaction in the provided
+multisig account.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_num_signatures_required">num_signatures_required</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_num_signatures_required">num_signatures_required</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>): u64 <b>acquires</b> <a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a> {
+    <b>borrow_global</b>&lt;<a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a>&gt;(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>).num_signatures_required
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multisig_account_owners"></a>
+
+## Function `owners`
+
+Return a vector of all of the provided multisig account's owners.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_owners">owners</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_owners">owners</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt; <b>acquires</b> <a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a> {
+    <b>borrow_global</b>&lt;<a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a>&gt;(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>).owners
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multisig_account_is_owner"></a>
+
+## Function `is_owner`
+
+Return true if the provided owner is an owner of the provided multisig account.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_is_owner">is_owner</a>(owner: <b>address</b>, <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_is_owner">is_owner</a>(owner: <b>address</b>, <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>): bool <b>acquires</b> <a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a> {
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_contains">vector::contains</a>(&<b>borrow_global</b>&lt;<a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a>&gt;(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>).owners, &owner)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multisig_account_get_transaction"></a>
+
+## Function `get_transaction`
+
+Return the transaction with the given transaction id.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_get_transaction">get_transaction</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>, sequence_number: u64): <a href="multisig_account.md#0x1_multisig_account_MultisigTransaction">multisig_account::MultisigTransaction</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_get_transaction">get_transaction</a>(
+    <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>,
+    sequence_number: u64,
+): <a href="multisig_account.md#0x1_multisig_account_MultisigTransaction">MultisigTransaction</a> <b>acquires</b> <a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a> {
+    <b>let</b> multisig_account_resource = <b>borrow_global</b>&lt;<a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a>&gt;(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>);
+    <b>assert</b>!(
+        sequence_number &gt; 0 && sequence_number &lt; multisig_account_resource.next_sequence_number,
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="multisig_account.md#0x1_multisig_account_EINVALID_SEQUENCE_NUMBER">EINVALID_SEQUENCE_NUMBER</a>),
+    );
+    *<a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_borrow">table::borrow</a>(&multisig_account_resource.transactions, sequence_number)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multisig_account_get_pending_transactions"></a>
+
+## Function `get_pending_transactions`
+
+Return all pending transactions.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_get_pending_transactions">get_pending_transactions</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="multisig_account.md#0x1_multisig_account_MultisigTransaction">multisig_account::MultisigTransaction</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_get_pending_transactions">get_pending_transactions</a>(
+    <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>
+): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="multisig_account.md#0x1_multisig_account_MultisigTransaction">MultisigTransaction</a>&gt; <b>acquires</b> <a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a> {
+    <b>let</b> pending_transactions: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="multisig_account.md#0x1_multisig_account_MultisigTransaction">MultisigTransaction</a>&gt; = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>[];
+    <b>let</b> <a href="multisig_account.md#0x1_multisig_account">multisig_account</a> = <b>borrow_global</b>&lt;<a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a>&gt;(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>);
+    <b>let</b> i = <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>.last_executed_sequence_number + 1;
+    <b>let</b> next_sequence_number = <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>.next_sequence_number;
+    <b>while</b> (i &lt; next_sequence_number) {
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_push_back">vector::push_back</a>(&<b>mut</b> pending_transactions, *<a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_borrow">table::borrow</a>(&<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>.transactions, i));
+        i = i + 1;
+    };
+    pending_transactions
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multisig_account_get_next_transaction_payload"></a>
+
+## Function `get_next_transaction_payload`
+
+Return the payload for the next transaction in the queue.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_get_next_transaction_payload">get_next_transaction_payload</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>, provided_payload: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_get_next_transaction_payload">get_next_transaction_payload</a>(
+    <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>, provided_payload: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; <b>acquires</b> <a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a> {
+    <b>let</b> multisig_account_resource = <b>borrow_global</b>&lt;<a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a>&gt;(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>);
+    <b>let</b> sequence_number = multisig_account_resource.last_executed_sequence_number + 1;
+    <b>let</b> transaction = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_borrow">table::borrow</a>(&multisig_account_resource.transactions, sequence_number);
+
+    <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&transaction.payload)) {
+        *<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(&transaction.payload)
+    } <b>else</b> {
+        provided_payload
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multisig_account_can_be_executed"></a>
+
+## Function `can_be_executed`
+
+Return true if the transaction with given transaction id can be executed now.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_can_be_executed">can_be_executed</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>, sequence_number: u64): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_can_be_executed">can_be_executed</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>, sequence_number: u64): bool <b>acquires</b> <a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a> {
+    <a href="multisig_account.md#0x1_multisig_account_assert_valid_sequence_number">assert_valid_sequence_number</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>, sequence_number);
+    <b>let</b> (num_approvals, _) = <a href="multisig_account.md#0x1_multisig_account_num_approvals_and_rejections">num_approvals_and_rejections</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>, sequence_number);
+    sequence_number == <a href="multisig_account.md#0x1_multisig_account_last_resolved_sequence_number">last_resolved_sequence_number</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>) + 1 &&
+        num_approvals &gt;= <a href="multisig_account.md#0x1_multisig_account_num_signatures_required">num_signatures_required</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multisig_account_can_execute"></a>
+
+## Function `can_execute`
+
+Return true if the owner can execute the transaction with given transaction id now.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_can_execute">can_execute</a>(owner: <b>address</b>, <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>, sequence_number: u64): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_can_execute">can_execute</a>(owner: <b>address</b>, <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>, sequence_number: u64): bool <b>acquires</b> <a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a> {
+    <a href="multisig_account.md#0x1_multisig_account_assert_valid_sequence_number">assert_valid_sequence_number</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>, sequence_number);
+    <b>let</b> (num_approvals, _) = <a href="multisig_account.md#0x1_multisig_account_num_approvals_and_rejections">num_approvals_and_rejections</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>, sequence_number);
+    <b>if</b> (!<a href="multisig_account.md#0x1_multisig_account_has_voted_for_approval">has_voted_for_approval</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>, sequence_number, owner)) {
+        num_approvals = num_approvals + 1;
+    };
+    <a href="multisig_account.md#0x1_multisig_account_is_owner">is_owner</a>(owner, <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>) &&
+        sequence_number == <a href="multisig_account.md#0x1_multisig_account_last_resolved_sequence_number">last_resolved_sequence_number</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>) + 1 &&
+        num_approvals &gt;= <a href="multisig_account.md#0x1_multisig_account_num_signatures_required">num_signatures_required</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multisig_account_can_be_rejected"></a>
+
+## Function `can_be_rejected`
+
+Return true if the transaction with given transaction id can be officially rejected.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_can_be_rejected">can_be_rejected</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>, sequence_number: u64): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_can_be_rejected">can_be_rejected</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>, sequence_number: u64): bool <b>acquires</b> <a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a> {
+    <a href="multisig_account.md#0x1_multisig_account_assert_valid_sequence_number">assert_valid_sequence_number</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>, sequence_number);
+    <b>let</b> (_, num_rejections) = <a href="multisig_account.md#0x1_multisig_account_num_approvals_and_rejections">num_approvals_and_rejections</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>, sequence_number);
+    sequence_number == <a href="multisig_account.md#0x1_multisig_account_last_resolved_sequence_number">last_resolved_sequence_number</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>) + 1 &&
+        num_rejections &gt;= <a href="multisig_account.md#0x1_multisig_account_num_signatures_required">num_signatures_required</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multisig_account_can_reject"></a>
+
+## Function `can_reject`
+
+Return true if the owner can execute the "rejected" transaction with given transaction id now.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_can_reject">can_reject</a>(owner: <b>address</b>, <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>, sequence_number: u64): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_can_reject">can_reject</a>(owner: <b>address</b>, <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>, sequence_number: u64): bool <b>acquires</b> <a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a> {
+    <a href="multisig_account.md#0x1_multisig_account_assert_valid_sequence_number">assert_valid_sequence_number</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>, sequence_number);
+    <b>let</b> (_, num_rejections) = <a href="multisig_account.md#0x1_multisig_account_num_approvals_and_rejections">num_approvals_and_rejections</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>, sequence_number);
+    <b>if</b> (!<a href="multisig_account.md#0x1_multisig_account_has_voted_for_rejection">has_voted_for_rejection</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>, sequence_number, owner)) {
+        num_rejections = num_rejections + 1;
+    };
+    <a href="multisig_account.md#0x1_multisig_account_is_owner">is_owner</a>(owner, <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>) &&
+        sequence_number == <a href="multisig_account.md#0x1_multisig_account_last_resolved_sequence_number">last_resolved_sequence_number</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>) + 1 &&
+        num_rejections &gt;= <a href="multisig_account.md#0x1_multisig_account_num_signatures_required">num_signatures_required</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multisig_account_get_next_multisig_account_address"></a>
+
+## Function `get_next_multisig_account_address`
+
+Return the predicted address for the next multisig account if created from the given creator address.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_get_next_multisig_account_address">get_next_multisig_account_address</a>(creator: <b>address</b>): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_get_next_multisig_account_address">get_next_multisig_account_address</a>(creator: <b>address</b>): <b>address</b> {
+    <b>let</b> owner_nonce = <a href="account.md#0x1_account_get_sequence_number">account::get_sequence_number</a>(creator);
+    create_resource_address(&creator, <a href="multisig_account.md#0x1_multisig_account_create_multisig_account_seed">create_multisig_account_seed</a>(to_bytes(&owner_nonce)))
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multisig_account_last_resolved_sequence_number"></a>
+
+## Function `last_resolved_sequence_number`
+
+Return the id of the last transaction that was executed (successful or failed) or removed.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_last_resolved_sequence_number">last_resolved_sequence_number</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_last_resolved_sequence_number">last_resolved_sequence_number</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>): u64 <b>acquires</b> <a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a> {
+    <b>let</b> multisig_account_resource = <b>borrow_global_mut</b>&lt;<a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a>&gt;(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>);
+    multisig_account_resource.last_executed_sequence_number
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multisig_account_next_sequence_number"></a>
+
+## Function `next_sequence_number`
+
+Return the id of the next transaction created.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_next_sequence_number">next_sequence_number</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_next_sequence_number">next_sequence_number</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>): u64 <b>acquires</b> <a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a> {
+    <b>let</b> multisig_account_resource = <b>borrow_global_mut</b>&lt;<a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a>&gt;(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>);
+    multisig_account_resource.next_sequence_number
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multisig_account_vote"></a>
+
+## Function `vote`
+
+Return a bool tuple indicating whether an owner has voted and if so, whether they voted yes or no.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_vote">vote</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>, sequence_number: u64, owner: <b>address</b>): (bool, bool)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_vote">vote</a>(
+    <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>, sequence_number: u64, owner: <b>address</b>): (bool, bool) <b>acquires</b> <a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a> {
+    <b>let</b> multisig_account_resource = <b>borrow_global_mut</b>&lt;<a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a>&gt;(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>);
+    <b>assert</b>!(
+        sequence_number &gt; 0 && sequence_number &lt; multisig_account_resource.next_sequence_number,
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="multisig_account.md#0x1_multisig_account_EINVALID_SEQUENCE_NUMBER">EINVALID_SEQUENCE_NUMBER</a>),
+    );
+    <b>let</b> transaction = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_borrow">table::borrow</a>(&multisig_account_resource.transactions, sequence_number);
+    <b>let</b> votes = &transaction.votes;
+    <b>let</b> voted = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_contains_key">simple_map::contains_key</a>(votes, &owner);
+    <b>let</b> vote = voted && *<a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_borrow">simple_map::borrow</a>(votes, &owner);
+    (voted, vote)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multisig_account_available_transaction_queue_capacity"></a>
+
+## Function `available_transaction_queue_capacity`
+
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_available_transaction_queue_capacity">available_transaction_queue_capacity</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_available_transaction_queue_capacity">available_transaction_queue_capacity</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>): u64 <b>acquires</b> <a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a> {
+    <b>let</b> multisig_account_resource = <b>borrow_global_mut</b>&lt;<a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a>&gt;(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>);
+    <b>let</b> num_pending_transactions = multisig_account_resource.next_sequence_number - multisig_account_resource.last_executed_sequence_number - 1;
+    <b>if</b> (num_pending_transactions &gt; <a href="multisig_account.md#0x1_multisig_account_MAX_PENDING_TRANSACTIONS">MAX_PENDING_TRANSACTIONS</a>) {
+        0
+    } <b>else</b> {
+        <a href="multisig_account.md#0x1_multisig_account_MAX_PENDING_TRANSACTIONS">MAX_PENDING_TRANSACTIONS</a> - num_pending_transactions
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multisig_account_create_with_existing_account"></a>
+
+## Function `create_with_existing_account`
+
+Creates a new multisig account on top of an existing account.
+
+This offers a migration path for an existing account with a multi-ed25519 auth key (native multisig account).
+In order to ensure a malicious module cannot obtain backdoor control over an existing account, a signed message
+with a valid signature from the account's auth key is required.
+
+Note that this does not revoke auth key-based control over the account. Owners should separately rotate the auth
+key after they are fully migrated to the new multisig account. Alternatively, they can call
+create_with_existing_account_and_revoke_auth_key instead.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_create_with_existing_account">create_with_existing_account</a>(multisig_address: <b>address</b>, owners: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;, num_signatures_required: u64, account_scheme: u8, account_public_key: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, create_multisig_account_signed_message: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, metadata_keys: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;, metadata_values: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_create_with_existing_account">create_with_existing_account</a>(
+    multisig_address: <b>address</b>,
+    owners: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;,
+    num_signatures_required: u64,
+    account_scheme: u8,
+    account_public_key: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    create_multisig_account_signed_message: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    metadata_keys: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;String&gt;,
+    metadata_values: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;,
+) <b>acquires</b> <a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a> {
+    // Verify that the `<a href="multisig_account.md#0x1_multisig_account_MultisigAccountCreationMessage">MultisigAccountCreationMessage</a>` <b>has</b> the right information and is signed by the <a href="account.md#0x1_account">account</a>
+    // owner's key.
+    <b>let</b> proof_challenge = <a href="multisig_account.md#0x1_multisig_account_MultisigAccountCreationMessage">MultisigAccountCreationMessage</a> {
+        <a href="chain_id.md#0x1_chain_id">chain_id</a>: <a href="chain_id.md#0x1_chain_id_get">chain_id::get</a>(),
+        account_address: multisig_address,
+        sequence_number: <a href="account.md#0x1_account_get_sequence_number">account::get_sequence_number</a>(multisig_address),
+        owners,
+        num_signatures_required,
+    };
+    <a href="account.md#0x1_account_verify_signed_message">account::verify_signed_message</a>(
+        multisig_address,
+        account_scheme,
+        account_public_key,
+        create_multisig_account_signed_message,
+        proof_challenge,
+    );
+
+    // We create the <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a> for the multisig <a href="account.md#0x1_account">account</a> here since this is required <b>to</b> add the <a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a> resource
+    // This should be safe and authorized because we have verified the signed message from the existing <a href="account.md#0x1_account">account</a>
+    // that authorizes creating a multisig <a href="account.md#0x1_account">account</a> <b>with</b> the specified owners and signature threshold.
+    <b>let</b> <a href="multisig_account.md#0x1_multisig_account">multisig_account</a> = &<a href="create_signer.md#0x1_create_signer">create_signer</a>(multisig_address);
+    <a href="multisig_account.md#0x1_multisig_account_create_with_owners_internal">create_with_owners_internal</a>(
+        <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>,
+        owners,
+        num_signatures_required,
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>&lt;SignerCapability&gt;(),
+        metadata_keys,
+        metadata_values,
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multisig_account_create_with_existing_account_and_revoke_auth_key"></a>
+
+## Function `create_with_existing_account_and_revoke_auth_key`
+
+Creates a new multisig account on top of an existing account and immediately rotate the origin auth key to 0x0.
+
+Note: If the original account is a resource account, this does not revoke all control over it as if any
+SignerCapability of the resource account still exists, it can still be used to generate the signer for the
+account.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_create_with_existing_account_and_revoke_auth_key">create_with_existing_account_and_revoke_auth_key</a>(multisig_address: <b>address</b>, owners: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;, num_signatures_required: u64, account_scheme: u8, account_public_key: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, create_multisig_account_signed_message: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, metadata_keys: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;, metadata_values: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_create_with_existing_account_and_revoke_auth_key">create_with_existing_account_and_revoke_auth_key</a>(
+    multisig_address: <b>address</b>,
+    owners: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;,
+    num_signatures_required: u64,
+    account_scheme: u8,
+    account_public_key: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    create_multisig_account_signed_message: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    metadata_keys: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;String&gt;,
+    metadata_values: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;,
+) <b>acquires</b> <a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a> {
+    // Verify that the `<a href="multisig_account.md#0x1_multisig_account_MultisigAccountCreationMessage">MultisigAccountCreationMessage</a>` <b>has</b> the right information and is signed by the <a href="account.md#0x1_account">account</a>
+    // owner's key.
+    <b>let</b> proof_challenge = <a href="multisig_account.md#0x1_multisig_account_MultisigAccountCreationWithAuthKeyRevocationMessage">MultisigAccountCreationWithAuthKeyRevocationMessage</a> {
+        <a href="chain_id.md#0x1_chain_id">chain_id</a>: <a href="chain_id.md#0x1_chain_id_get">chain_id::get</a>(),
+        account_address: multisig_address,
+        sequence_number: <a href="account.md#0x1_account_get_sequence_number">account::get_sequence_number</a>(multisig_address),
+        owners,
+        num_signatures_required,
+    };
+    <a href="account.md#0x1_account_verify_signed_message">account::verify_signed_message</a>(
+        multisig_address,
+        account_scheme,
+        account_public_key,
+        create_multisig_account_signed_message,
+        proof_challenge,
+    );
+
+    // We create the <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a> for the multisig <a href="account.md#0x1_account">account</a> here since this is required <b>to</b> add the <a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a> resource
+    // This should be safe and authorized because we have verified the signed message from the existing <a href="account.md#0x1_account">account</a>
+    // that authorizes creating a multisig <a href="account.md#0x1_account">account</a> <b>with</b> the specified owners and signature threshold.
+    <b>let</b> <a href="multisig_account.md#0x1_multisig_account">multisig_account</a> = &<a href="create_signer.md#0x1_create_signer">create_signer</a>(multisig_address);
+    <a href="multisig_account.md#0x1_multisig_account_create_with_owners_internal">create_with_owners_internal</a>(
+        <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>,
+        owners,
+        num_signatures_required,
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>&lt;SignerCapability&gt;(),
+        metadata_keys,
+        metadata_values,
+    );
+
+    // Rotate the <a href="account.md#0x1_account">account</a>'s auth key <b>to</b> 0x0, which effectively revokes control via auth key.
+    <b>let</b> multisig_address = address_of(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>);
+    <a href="account.md#0x1_account_rotate_authentication_key_internal">account::rotate_authentication_key_internal</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>, <a href="multisig_account.md#0x1_multisig_account_ZERO_AUTH_KEY">ZERO_AUTH_KEY</a>);
+    // This also needs <b>to</b> revoke <a href="../../../aptos-stdlib/tests/compiler-v2-doc/any.md#0x1_any">any</a> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/capability.md#0x1_capability">capability</a> or rotation <a href="../../../aptos-stdlib/tests/compiler-v2-doc/capability.md#0x1_capability">capability</a> that <b>exists</b> for the <a href="account.md#0x1_account">account</a> <b>to</b>
+    // completely remove all access <b>to</b> the <a href="account.md#0x1_account">account</a>.
+    <b>if</b> (<a href="account.md#0x1_account_is_signer_capability_offered">account::is_signer_capability_offered</a>(multisig_address)) {
+        <a href="account.md#0x1_account_revoke_any_signer_capability">account::revoke_any_signer_capability</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>);
+    };
+    <b>if</b> (<a href="account.md#0x1_account_is_rotation_capability_offered">account::is_rotation_capability_offered</a>(multisig_address)) {
+        <a href="account.md#0x1_account_revoke_any_rotation_capability">account::revoke_any_rotation_capability</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>);
+    };
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multisig_account_create"></a>
+
+## Function `create`
+
+Creates a new multisig account and add the signer as a single owner.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_create">create</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, num_signatures_required: u64, metadata_keys: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;, metadata_values: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_create">create</a>(
+    owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    num_signatures_required: u64,
+    metadata_keys: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;String&gt;,
+    metadata_values: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;,
+) <b>acquires</b> <a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a> {
+    <a href="multisig_account.md#0x1_multisig_account_create_with_owners">create_with_owners</a>(owner, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>[], num_signatures_required, metadata_keys, metadata_values);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multisig_account_create_with_owners"></a>
+
+## Function `create_with_owners`
+
+Creates a new multisig account with the specified additional owner list and signatures required.
+
+@param additional_owners The owner account who calls this function cannot be in the additional_owners and there
+cannot be any duplicate owners in the list.
+@param num_signatures_required The number of signatures required to execute a transaction. Must be at least 1 and
+at most the total number of owners.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_create_with_owners">create_with_owners</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, additional_owners: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;, num_signatures_required: u64, metadata_keys: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;, metadata_values: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_create_with_owners">create_with_owners</a>(
+    owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    additional_owners: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;,
+    num_signatures_required: u64,
+    metadata_keys: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;String&gt;,
+    metadata_values: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;,
+) <b>acquires</b> <a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a> {
+    <b>let</b> (<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>, multisig_signer_cap) = <a href="multisig_account.md#0x1_multisig_account_create_multisig_account">create_multisig_account</a>(owner);
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_push_back">vector::push_back</a>(&<b>mut</b> additional_owners, address_of(owner));
+    <a href="multisig_account.md#0x1_multisig_account_create_with_owners_internal">create_with_owners_internal</a>(
+        &<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>,
+        additional_owners,
+        num_signatures_required,
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(multisig_signer_cap),
+        metadata_keys,
+        metadata_values,
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multisig_account_create_with_owners_then_remove_bootstrapper"></a>
+
+## Function `create_with_owners_then_remove_bootstrapper`
+
+Like <code>create_with_owners</code>, but removes the calling account after creation.
+
+This is for creating a vanity multisig account from a bootstrapping account that should not
+be an owner after the vanity multisig address has been secured.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_create_with_owners_then_remove_bootstrapper">create_with_owners_then_remove_bootstrapper</a>(bootstrapper: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, owners: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;, num_signatures_required: u64, metadata_keys: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;, metadata_values: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_create_with_owners_then_remove_bootstrapper">create_with_owners_then_remove_bootstrapper</a>(
+    bootstrapper: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    owners: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;,
+    num_signatures_required: u64,
+    metadata_keys: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;String&gt;,
+    metadata_values: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;,
+) <b>acquires</b> <a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a> {
+    <b>let</b> bootstrapper_address = address_of(bootstrapper);
+    <a href="multisig_account.md#0x1_multisig_account_create_with_owners">create_with_owners</a>(
+        bootstrapper,
+        owners,
+        num_signatures_required,
+        metadata_keys,
+        metadata_values
+    );
+    <a href="multisig_account.md#0x1_multisig_account_update_owner_schema">update_owner_schema</a>(
+        <a href="multisig_account.md#0x1_multisig_account_get_next_multisig_account_address">get_next_multisig_account_address</a>(bootstrapper_address),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>[],
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>[bootstrapper_address],
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>()
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multisig_account_create_with_owners_internal"></a>
+
+## Function `create_with_owners_internal`
+
+
+
+<pre><code><b>fun</b> <a href="multisig_account.md#0x1_multisig_account_create_with_owners_internal">create_with_owners_internal</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, owners: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;, num_signatures_required: u64, multisig_account_signer_cap: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="account.md#0x1_account_SignerCapability">account::SignerCapability</a>&gt;, metadata_keys: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;, metadata_values: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="multisig_account.md#0x1_multisig_account_create_with_owners_internal">create_with_owners_internal</a>(
+    <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    owners: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;,
+    num_signatures_required: u64,
+    multisig_account_signer_cap: Option&lt;SignerCapability&gt;,
+    metadata_keys: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;String&gt;,
+    metadata_values: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;,
+) <b>acquires</b> <a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a> {
+    <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_multisig_accounts_enabled">features::multisig_accounts_enabled</a>(), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_unavailable">error::unavailable</a>(<a href="multisig_account.md#0x1_multisig_account_EMULTISIG_ACCOUNTS_NOT_ENABLED_YET">EMULTISIG_ACCOUNTS_NOT_ENABLED_YET</a>));
+    <b>assert</b>!(
+        num_signatures_required &gt; 0 && <a href="multisig_account.md#0x1_multisig_account_num_signatures_required">num_signatures_required</a> &lt;= <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&owners),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="multisig_account.md#0x1_multisig_account_EINVALID_SIGNATURES_REQUIRED">EINVALID_SIGNATURES_REQUIRED</a>),
+    );
+
+    <b>let</b> multisig_address = address_of(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>);
+    <a href="multisig_account.md#0x1_multisig_account_validate_owners">validate_owners</a>(&owners, multisig_address);
+    <b>move_to</b>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>, <a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a> {
+        owners,
+        num_signatures_required,
+        transactions: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_new">table::new</a>&lt;u64, <a href="multisig_account.md#0x1_multisig_account_MultisigTransaction">MultisigTransaction</a>&gt;(),
+        metadata: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_create">simple_map::create</a>&lt;String, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;(),
+        // First transaction will start at id 1 instead of 0.
+        last_executed_sequence_number: 0,
+        next_sequence_number: 1,
+        signer_cap: multisig_account_signer_cap,
+        add_owners_events: new_event_handle&lt;<a href="multisig_account.md#0x1_multisig_account_AddOwnersEvent">AddOwnersEvent</a>&gt;(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>),
+        remove_owners_events: new_event_handle&lt;<a href="multisig_account.md#0x1_multisig_account_RemoveOwnersEvent">RemoveOwnersEvent</a>&gt;(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>),
+        update_signature_required_events: new_event_handle&lt;<a href="multisig_account.md#0x1_multisig_account_UpdateSignaturesRequiredEvent">UpdateSignaturesRequiredEvent</a>&gt;(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>),
+        create_transaction_events: new_event_handle&lt;<a href="multisig_account.md#0x1_multisig_account_CreateTransactionEvent">CreateTransactionEvent</a>&gt;(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>),
+        vote_events: new_event_handle&lt;<a href="multisig_account.md#0x1_multisig_account_VoteEvent">VoteEvent</a>&gt;(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>),
+        execute_rejected_transaction_events: new_event_handle&lt;<a href="multisig_account.md#0x1_multisig_account_ExecuteRejectedTransactionEvent">ExecuteRejectedTransactionEvent</a>&gt;(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>),
+        execute_transaction_events: new_event_handle&lt;<a href="multisig_account.md#0x1_multisig_account_TransactionExecutionSucceededEvent">TransactionExecutionSucceededEvent</a>&gt;(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>),
+        transaction_execution_failed_events: new_event_handle&lt;<a href="multisig_account.md#0x1_multisig_account_TransactionExecutionFailedEvent">TransactionExecutionFailedEvent</a>&gt;(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>),
+        metadata_updated_events: new_event_handle&lt;<a href="multisig_account.md#0x1_multisig_account_MetadataUpdatedEvent">MetadataUpdatedEvent</a>&gt;(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>),
+    });
+
+    <a href="multisig_account.md#0x1_multisig_account_update_metadata_internal">update_metadata_internal</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>, metadata_keys, metadata_values, <b>false</b>);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multisig_account_add_owner"></a>
+
+## Function `add_owner`
+
+Similar to add_owners, but only allow adding one owner.
+
+
+<pre><code>entry <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_add_owner">add_owner</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, new_owner: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>entry <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_add_owner">add_owner</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, new_owner: <b>address</b>) <b>acquires</b> <a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a> {
+    <a href="multisig_account.md#0x1_multisig_account_add_owners">add_owners</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>[new_owner]);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multisig_account_add_owners"></a>
+
+## Function `add_owners`
+
+Add new owners to the multisig account. This can only be invoked by the multisig account itself, through the
+proposal flow.
+
+Note that this function is not public so it can only be invoked directly instead of via a module or script. This
+ensures that a multisig transaction cannot lead to another module obtaining the multisig signer and using it to
+maliciously alter the owners list.
+
+
+<pre><code>entry <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_add_owners">add_owners</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, new_owners: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>entry <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_add_owners">add_owners</a>(
+    <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, new_owners: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;) <b>acquires</b> <a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a> {
+    <a href="multisig_account.md#0x1_multisig_account_update_owner_schema">update_owner_schema</a>(
+        address_of(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>),
+        new_owners,
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>[],
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>()
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multisig_account_add_owners_and_update_signatures_required"></a>
+
+## Function `add_owners_and_update_signatures_required`
+
+Add owners then update number of signatures required, in a single operation.
+
+
+<pre><code>entry <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_add_owners_and_update_signatures_required">add_owners_and_update_signatures_required</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, new_owners: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;, new_num_signatures_required: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>entry <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_add_owners_and_update_signatures_required">add_owners_and_update_signatures_required</a>(
+    <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    new_owners: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;,
+    new_num_signatures_required: u64
+) <b>acquires</b> <a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a> {
+    <a href="multisig_account.md#0x1_multisig_account_update_owner_schema">update_owner_schema</a>(
+        address_of(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>),
+        new_owners,
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>[],
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(new_num_signatures_required)
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multisig_account_remove_owner"></a>
+
+## Function `remove_owner`
+
+Similar to remove_owners, but only allow removing one owner.
+
+
+<pre><code>entry <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_remove_owner">remove_owner</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, owner_to_remove: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>entry <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_remove_owner">remove_owner</a>(
+    <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, owner_to_remove: <b>address</b>) <b>acquires</b> <a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a> {
+    <a href="multisig_account.md#0x1_multisig_account_remove_owners">remove_owners</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>[owner_to_remove]);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multisig_account_remove_owners"></a>
+
+## Function `remove_owners`
+
+Remove owners from the multisig account. This can only be invoked by the multisig account itself, through the
+proposal flow.
+
+This function skips any owners who are not in the multisig account's list of owners.
+Note that this function is not public so it can only be invoked directly instead of via a module or script. This
+ensures that a multisig transaction cannot lead to another module obtaining the multisig signer and using it to
+maliciously alter the owners list.
+
+
+<pre><code>entry <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_remove_owners">remove_owners</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, owners_to_remove: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>entry <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_remove_owners">remove_owners</a>(
+    <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, owners_to_remove: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;) <b>acquires</b> <a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a> {
+    <a href="multisig_account.md#0x1_multisig_account_update_owner_schema">update_owner_schema</a>(
+        address_of(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>[],
+        owners_to_remove,
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>()
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multisig_account_swap_owner"></a>
+
+## Function `swap_owner`
+
+Swap an owner in for an old one, without changing required signatures.
+
+
+<pre><code>entry <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_swap_owner">swap_owner</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, to_swap_in: <b>address</b>, to_swap_out: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>entry <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_swap_owner">swap_owner</a>(
+    <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    to_swap_in: <b>address</b>,
+    to_swap_out: <b>address</b>
+) <b>acquires</b> <a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a> {
+    <a href="multisig_account.md#0x1_multisig_account_update_owner_schema">update_owner_schema</a>(
+        address_of(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>[to_swap_in],
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>[to_swap_out],
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>()
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multisig_account_swap_owners"></a>
+
+## Function `swap_owners`
+
+Swap owners in and out, without changing required signatures.
+
+
+<pre><code>entry <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_swap_owners">swap_owners</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, to_swap_in: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;, to_swap_out: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>entry <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_swap_owners">swap_owners</a>(
+    <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    to_swap_in: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;,
+    to_swap_out: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;
+) <b>acquires</b> <a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a> {
+    <a href="multisig_account.md#0x1_multisig_account_update_owner_schema">update_owner_schema</a>(
+        address_of(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>),
+        to_swap_in,
+        to_swap_out,
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>()
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multisig_account_swap_owners_and_update_signatures_required"></a>
+
+## Function `swap_owners_and_update_signatures_required`
+
+Swap owners in and out, updating number of required signatures.
+
+
+<pre><code>entry <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_swap_owners_and_update_signatures_required">swap_owners_and_update_signatures_required</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, new_owners: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;, owners_to_remove: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;, new_num_signatures_required: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>entry <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_swap_owners_and_update_signatures_required">swap_owners_and_update_signatures_required</a>(
+    <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    new_owners: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;,
+    owners_to_remove: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;,
+    new_num_signatures_required: u64
+) <b>acquires</b> <a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a> {
+    <a href="multisig_account.md#0x1_multisig_account_update_owner_schema">update_owner_schema</a>(
+        address_of(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>),
+        new_owners,
+        owners_to_remove,
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(new_num_signatures_required)
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multisig_account_update_signatures_required"></a>
+
+## Function `update_signatures_required`
+
+Update the number of signatures required to execute transaction in the specified multisig account.
+
+This can only be invoked by the multisig account itself, through the proposal flow.
+Note that this function is not public so it can only be invoked directly instead of via a module or script. This
+ensures that a multisig transaction cannot lead to another module obtaining the multisig signer and using it to
+maliciously alter the number of signatures required.
+
+
+<pre><code>entry <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_update_signatures_required">update_signatures_required</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, new_num_signatures_required: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>entry <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_update_signatures_required">update_signatures_required</a>(
+    <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, new_num_signatures_required: u64) <b>acquires</b> <a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a> {
+    <a href="multisig_account.md#0x1_multisig_account_update_owner_schema">update_owner_schema</a>(
+        address_of(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>[],
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>[],
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(new_num_signatures_required)
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multisig_account_update_metadata"></a>
+
+## Function `update_metadata`
+
+Allow the multisig account to update its own metadata. Note that this overrides the entire existing metadata.
+If any attributes are not specified in the metadata, they will be removed!
+
+This can only be invoked by the multisig account itself, through the proposal flow.
+Note that this function is not public so it can only be invoked directly instead of via a module or script. This
+ensures that a multisig transaction cannot lead to another module obtaining the multisig signer and using it to
+maliciously alter the number of signatures required.
+
+
+<pre><code>entry <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_update_metadata">update_metadata</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, keys: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;, values: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>entry <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_update_metadata">update_metadata</a>(
+    <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, keys: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;String&gt;, values: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;) <b>acquires</b> <a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a> {
+    <a href="multisig_account.md#0x1_multisig_account_update_metadata_internal">update_metadata_internal</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>, keys, values, <b>true</b>);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multisig_account_update_metadata_internal"></a>
+
+## Function `update_metadata_internal`
+
+
+
+<pre><code><b>fun</b> <a href="multisig_account.md#0x1_multisig_account_update_metadata_internal">update_metadata_internal</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, keys: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;, values: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;, emit_event: bool)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="multisig_account.md#0x1_multisig_account_update_metadata_internal">update_metadata_internal</a>(
+    <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    keys: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;String&gt;,
+    values: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;,
+    emit_event: bool,
+) <b>acquires</b> <a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a> {
+    <b>let</b> num_attributes = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&keys);
+    <b>assert</b>!(
+        num_attributes == <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&values),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="multisig_account.md#0x1_multisig_account_ENUMBER_OF_METADATA_KEYS_AND_VALUES_DONT_MATCH">ENUMBER_OF_METADATA_KEYS_AND_VALUES_DONT_MATCH</a>),
+    );
+
+    <b>let</b> multisig_address = address_of(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>);
+    <a href="multisig_account.md#0x1_multisig_account_assert_multisig_account_exists">assert_multisig_account_exists</a>(multisig_address);
+    <b>let</b> multisig_account_resource = <b>borrow_global_mut</b>&lt;<a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a>&gt;(multisig_address);
+    <b>let</b> old_metadata = multisig_account_resource.metadata;
+    multisig_account_resource.metadata = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_create">simple_map::create</a>&lt;String, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;();
+    <b>let</b> metadata = &<b>mut</b> multisig_account_resource.metadata;
+    <b>let</b> i = 0;
+    <b>while</b> (i &lt; num_attributes) {
+        <b>let</b> key = *<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(&keys, i);
+        <b>let</b> value = *<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(&values, i);
+        <b>assert</b>!(
+            !<a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_contains_key">simple_map::contains_key</a>(metadata, &key),
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="multisig_account.md#0x1_multisig_account_EDUPLICATE_METADATA_KEY">EDUPLICATE_METADATA_KEY</a>),
+        );
+
+        <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_add">simple_map::add</a>(metadata, key, value);
+        i = i + 1;
+    };
+
+    <b>if</b> (emit_event) {
+        <b>if</b> (std::features::module_event_migration_enabled()) {
+            emit(
+                <a href="multisig_account.md#0x1_multisig_account_MetadataUpdated">MetadataUpdated</a> {
+                    <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: multisig_address,
+                    old_metadata,
+                    new_metadata: multisig_account_resource.metadata,
+                }
+            )
+        };
+        emit_event(
+            &<b>mut</b> multisig_account_resource.metadata_updated_events,
+            <a href="multisig_account.md#0x1_multisig_account_MetadataUpdatedEvent">MetadataUpdatedEvent</a> {
+                old_metadata,
+                new_metadata: multisig_account_resource.metadata,
+            }
+        );
+    };
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multisig_account_create_transaction"></a>
+
+## Function `create_transaction`
+
+Create a multisig transaction, which will have one approval initially (from the creator).
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_create_transaction">create_transaction</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>, payload: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_create_transaction">create_transaction</a>(
+    owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>,
+    payload: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+) <b>acquires</b> <a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a> {
+    <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&payload) &gt; 0, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="multisig_account.md#0x1_multisig_account_EPAYLOAD_CANNOT_BE_EMPTY">EPAYLOAD_CANNOT_BE_EMPTY</a>));
+
+    <a href="multisig_account.md#0x1_multisig_account_assert_multisig_account_exists">assert_multisig_account_exists</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>);
+    <a href="multisig_account.md#0x1_multisig_account_assert_is_owner">assert_is_owner</a>(owner, <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>);
+
+    <b>let</b> creator = address_of(owner);
+    <b>let</b> transaction = <a href="multisig_account.md#0x1_multisig_account_MultisigTransaction">MultisigTransaction</a> {
+        payload: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(payload),
+        payload_hash: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;(),
+        votes: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_create">simple_map::create</a>&lt;<b>address</b>, bool&gt;(),
+        creator,
+        creation_time_secs: now_seconds(),
+    };
+    <a href="multisig_account.md#0x1_multisig_account_add_transaction">add_transaction</a>(creator, <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>, transaction);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multisig_account_create_transaction_with_hash"></a>
+
+## Function `create_transaction_with_hash`
+
+Create a multisig transaction with a transaction hash instead of the full payload.
+This means the payload will be stored off chain for gas saving. Later, during execution, the executor will need
+to provide the full payload, which will be validated against the hash stored on-chain.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_create_transaction_with_hash">create_transaction_with_hash</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>, payload_hash: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_create_transaction_with_hash">create_transaction_with_hash</a>(
+    owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>,
+    payload_hash: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+) <b>acquires</b> <a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a> {
+    // Payload <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/hash.md#0x1_hash">hash</a> is a sha3-256 <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/hash.md#0x1_hash">hash</a>, so it must be exactly 32 bytes.
+    <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&payload_hash) == 32, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="multisig_account.md#0x1_multisig_account_EINVALID_PAYLOAD_HASH">EINVALID_PAYLOAD_HASH</a>));
+
+    <a href="multisig_account.md#0x1_multisig_account_assert_multisig_account_exists">assert_multisig_account_exists</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>);
+    <a href="multisig_account.md#0x1_multisig_account_assert_is_owner">assert_is_owner</a>(owner, <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>);
+
+    <b>let</b> creator = address_of(owner);
+    <b>let</b> transaction = <a href="multisig_account.md#0x1_multisig_account_MultisigTransaction">MultisigTransaction</a> {
+        payload: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;(),
+        payload_hash: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(payload_hash),
+        votes: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_create">simple_map::create</a>&lt;<b>address</b>, bool&gt;(),
+        creator,
+        creation_time_secs: now_seconds(),
+    };
+    <a href="multisig_account.md#0x1_multisig_account_add_transaction">add_transaction</a>(creator, <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>, transaction);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multisig_account_approve_transaction"></a>
+
+## Function `approve_transaction`
+
+Approve a multisig transaction.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_approve_transaction">approve_transaction</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>, sequence_number: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_approve_transaction">approve_transaction</a>(
+    owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>, sequence_number: u64) <b>acquires</b> <a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a> {
+    <a href="multisig_account.md#0x1_multisig_account_vote_transanction">vote_transanction</a>(owner, <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>, sequence_number, <b>true</b>);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multisig_account_reject_transaction"></a>
+
+## Function `reject_transaction`
+
+Reject a multisig transaction.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_reject_transaction">reject_transaction</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>, sequence_number: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_reject_transaction">reject_transaction</a>(
+    owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>, sequence_number: u64) <b>acquires</b> <a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a> {
+    <a href="multisig_account.md#0x1_multisig_account_vote_transanction">vote_transanction</a>(owner, <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>, sequence_number, <b>false</b>);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multisig_account_vote_transanction"></a>
+
+## Function `vote_transanction`
+
+Generic function that can be used to either approve or reject a multisig transaction
+Retained for backward compatibility: the function with the typographical error in its name
+will continue to be an accessible entry point.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_vote_transanction">vote_transanction</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>, sequence_number: u64, approved: bool)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_vote_transanction">vote_transanction</a>(
+    owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>, sequence_number: u64, approved: bool) <b>acquires</b> <a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a> {
+    <a href="multisig_account.md#0x1_multisig_account_assert_multisig_account_exists">assert_multisig_account_exists</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>);
+    <b>let</b> multisig_account_resource = <b>borrow_global_mut</b>&lt;<a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a>&gt;(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>);
+    <a href="multisig_account.md#0x1_multisig_account_assert_is_owner_internal">assert_is_owner_internal</a>(owner, multisig_account_resource);
+
+    <b>assert</b>!(
+        <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_contains">table::contains</a>(&multisig_account_resource.transactions, sequence_number),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="multisig_account.md#0x1_multisig_account_ETRANSACTION_NOT_FOUND">ETRANSACTION_NOT_FOUND</a>),
+    );
+    <b>let</b> transaction = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_borrow_mut">table::borrow_mut</a>(&<b>mut</b> multisig_account_resource.transactions, sequence_number);
+    <b>let</b> votes = &<b>mut</b> transaction.votes;
+    <b>let</b> owner_addr = address_of(owner);
+
+    <b>if</b> (<a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_contains_key">simple_map::contains_key</a>(votes, &owner_addr)) {
+        *<a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_borrow_mut">simple_map::borrow_mut</a>(votes, &owner_addr) = approved;
+    } <b>else</b> {
+        <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_add">simple_map::add</a>(votes, owner_addr, approved);
+    };
+
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        emit(
+            <a href="multisig_account.md#0x1_multisig_account_Vote">Vote</a> {
+                <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>,
+                owner: owner_addr,
+                sequence_number,
+                approved,
+            }
+        );
+    };
+    emit_event(
+        &<b>mut</b> multisig_account_resource.vote_events,
+        <a href="multisig_account.md#0x1_multisig_account_VoteEvent">VoteEvent</a> {
+            owner: owner_addr,
+            sequence_number,
+            approved,
+        }
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multisig_account_vote_transaction"></a>
+
+## Function `vote_transaction`
+
+Generic function that can be used to either approve or reject a multisig transaction
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_vote_transaction">vote_transaction</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>, sequence_number: u64, approved: bool)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_vote_transaction">vote_transaction</a>(
+    owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>, sequence_number: u64, approved: bool) <b>acquires</b> <a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a> {
+    <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_multisig_v2_enhancement_feature_enabled">features::multisig_v2_enhancement_feature_enabled</a>(), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="multisig_account.md#0x1_multisig_account_EMULTISIG_V2_ENHANCEMENT_NOT_ENABLED">EMULTISIG_V2_ENHANCEMENT_NOT_ENABLED</a>));
+    <a href="multisig_account.md#0x1_multisig_account_vote_transanction">vote_transanction</a>(owner, <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>, sequence_number, approved);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multisig_account_vote_transactions"></a>
+
+## Function `vote_transactions`
+
+Generic function that can be used to either approve or reject a batch of transactions within a specified range.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_vote_transactions">vote_transactions</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>, starting_sequence_number: u64, final_sequence_number: u64, approved: bool)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_vote_transactions">vote_transactions</a>(
+    owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>, starting_sequence_number: u64, final_sequence_number: u64, approved: bool) <b>acquires</b> <a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a> {
+    <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_multisig_v2_enhancement_feature_enabled">features::multisig_v2_enhancement_feature_enabled</a>(), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="multisig_account.md#0x1_multisig_account_EMULTISIG_V2_ENHANCEMENT_NOT_ENABLED">EMULTISIG_V2_ENHANCEMENT_NOT_ENABLED</a>));
+    <b>let</b> sequence_number = starting_sequence_number;
+    <b>while</b>(sequence_number &lt;= final_sequence_number) {
+        <a href="multisig_account.md#0x1_multisig_account_vote_transanction">vote_transanction</a>(owner, <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>, sequence_number, approved);
+        sequence_number = sequence_number + 1;
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multisig_account_execute_rejected_transaction"></a>
+
+## Function `execute_rejected_transaction`
+
+Remove the next transaction if it has sufficient owner rejections.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_execute_rejected_transaction">execute_rejected_transaction</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_execute_rejected_transaction">execute_rejected_transaction</a>(
+    owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>,
+) <b>acquires</b> <a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a> {
+    <a href="multisig_account.md#0x1_multisig_account_assert_multisig_account_exists">assert_multisig_account_exists</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>);
+    <a href="multisig_account.md#0x1_multisig_account_assert_is_owner">assert_is_owner</a>(owner, <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>);
+
+    <b>let</b> sequence_number = <a href="multisig_account.md#0x1_multisig_account_last_resolved_sequence_number">last_resolved_sequence_number</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>) + 1;
+    <b>let</b> owner_addr = address_of(owner);
+    <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_multisig_v2_enhancement_feature_enabled">features::multisig_v2_enhancement_feature_enabled</a>()) {
+        // Implicitly vote for rejection <b>if</b> the owner <b>has</b> not voted for rejection yet.
+        <b>if</b> (!<a href="multisig_account.md#0x1_multisig_account_has_voted_for_rejection">has_voted_for_rejection</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>, sequence_number, owner_addr)) {
+            <a href="multisig_account.md#0x1_multisig_account_reject_transaction">reject_transaction</a>(owner, <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>, sequence_number);
+        }
+    };
+
+    <b>let</b> multisig_account_resource = <b>borrow_global_mut</b>&lt;<a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a>&gt;(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>);
+    <b>let</b> (_, num_rejections) = <a href="multisig_account.md#0x1_multisig_account_remove_executed_transaction">remove_executed_transaction</a>(multisig_account_resource);
+    <b>assert</b>!(
+        num_rejections &gt;= multisig_account_resource.num_signatures_required,
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="multisig_account.md#0x1_multisig_account_ENOT_ENOUGH_REJECTIONS">ENOT_ENOUGH_REJECTIONS</a>),
+    );
+
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        emit(
+            <a href="multisig_account.md#0x1_multisig_account_ExecuteRejectedTransaction">ExecuteRejectedTransaction</a> {
+                <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>,
+                sequence_number,
+                num_rejections,
+                executor: address_of(owner),
+            }
+        );
+    };
+    emit_event(
+        &<b>mut</b> multisig_account_resource.execute_rejected_transaction_events,
+        <a href="multisig_account.md#0x1_multisig_account_ExecuteRejectedTransactionEvent">ExecuteRejectedTransactionEvent</a> {
+            sequence_number,
+            num_rejections,
+            executor: owner_addr,
+        }
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multisig_account_execute_rejected_transactions"></a>
+
+## Function `execute_rejected_transactions`
+
+Remove the next transactions until the final_sequence_number if they have sufficient owner rejections.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_execute_rejected_transactions">execute_rejected_transactions</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>, final_sequence_number: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_execute_rejected_transactions">execute_rejected_transactions</a>(
+    owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>,
+    final_sequence_number: u64,
+) <b>acquires</b> <a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a> {
+    <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_multisig_v2_enhancement_feature_enabled">features::multisig_v2_enhancement_feature_enabled</a>(), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="multisig_account.md#0x1_multisig_account_EMULTISIG_V2_ENHANCEMENT_NOT_ENABLED">EMULTISIG_V2_ENHANCEMENT_NOT_ENABLED</a>));
+    <b>assert</b>!(<a href="multisig_account.md#0x1_multisig_account_last_resolved_sequence_number">last_resolved_sequence_number</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>) &lt; final_sequence_number, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="multisig_account.md#0x1_multisig_account_EINVALID_SEQUENCE_NUMBER">EINVALID_SEQUENCE_NUMBER</a>));
+    <b>assert</b>!(final_sequence_number &lt; <a href="multisig_account.md#0x1_multisig_account_next_sequence_number">next_sequence_number</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="multisig_account.md#0x1_multisig_account_EINVALID_SEQUENCE_NUMBER">EINVALID_SEQUENCE_NUMBER</a>));
+    <b>while</b>(<a href="multisig_account.md#0x1_multisig_account_last_resolved_sequence_number">last_resolved_sequence_number</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>) &lt; final_sequence_number) {
+        <a href="multisig_account.md#0x1_multisig_account_execute_rejected_transaction">execute_rejected_transaction</a>(owner, <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>);
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multisig_account_validate_multisig_transaction"></a>
+
+## Function `validate_multisig_transaction`
+
+Called by the VM as part of transaction prologue, which is invoked during mempool transaction validation and as
+the first step of transaction execution.
+
+Transaction payload is optional if it's already stored on chain for the transaction.
+
+
+<pre><code><b>fun</b> <a href="multisig_account.md#0x1_multisig_account_validate_multisig_transaction">validate_multisig_transaction</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>, payload: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="multisig_account.md#0x1_multisig_account_validate_multisig_transaction">validate_multisig_transaction</a>(
+    owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>, payload: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;) <b>acquires</b> <a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a> {
+    <a href="multisig_account.md#0x1_multisig_account_assert_multisig_account_exists">assert_multisig_account_exists</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>);
+    <a href="multisig_account.md#0x1_multisig_account_assert_is_owner">assert_is_owner</a>(owner, <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>);
+    <b>let</b> sequence_number = <a href="multisig_account.md#0x1_multisig_account_last_resolved_sequence_number">last_resolved_sequence_number</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>) + 1;
+    <a href="multisig_account.md#0x1_multisig_account_assert_transaction_exists">assert_transaction_exists</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>, sequence_number);
+
+    <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_multisig_v2_enhancement_feature_enabled">features::multisig_v2_enhancement_feature_enabled</a>()) {
+        <b>assert</b>!(
+            <a href="multisig_account.md#0x1_multisig_account_can_execute">can_execute</a>(address_of(owner), <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>, sequence_number),
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="multisig_account.md#0x1_multisig_account_ENOT_ENOUGH_APPROVALS">ENOT_ENOUGH_APPROVALS</a>),
+        );
+    }
+    <b>else</b> {
+        <b>assert</b>!(
+            <a href="multisig_account.md#0x1_multisig_account_can_be_executed">can_be_executed</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>, sequence_number),
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="multisig_account.md#0x1_multisig_account_ENOT_ENOUGH_APPROVALS">ENOT_ENOUGH_APPROVALS</a>),
+        );
+    };
+
+    // If the transaction payload is not stored on chain, verify that the provided payload matches the hashes stored
+    // on chain.
+    <b>let</b> multisig_account_resource = <b>borrow_global</b>&lt;<a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a>&gt;(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>);
+    <b>let</b> transaction = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_borrow">table::borrow</a>(&multisig_account_resource.transactions, sequence_number);
+    <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&transaction.payload_hash)) {
+        <b>let</b> payload_hash = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(&transaction.payload_hash);
+        <b>assert</b>!(
+            sha3_256(payload) == *payload_hash,
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="multisig_account.md#0x1_multisig_account_EPAYLOAD_DOES_NOT_MATCH_HASH">EPAYLOAD_DOES_NOT_MATCH_HASH</a>),
+        );
+    };
+
+    // If the transaction payload is stored on chain and there is a provided payload,
+    // verify that the provided payload matches the stored payload.
+    <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_abort_if_multisig_payload_mismatch_enabled">features::abort_if_multisig_payload_mismatch_enabled</a>()
+        && <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&transaction.payload)
+        && !<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_is_empty">vector::is_empty</a>(&payload)
+    ) {
+        <b>let</b> stored_payload = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(&transaction.payload);
+        <b>assert</b>!(
+            payload == *stored_payload,
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="multisig_account.md#0x1_multisig_account_EPAYLOAD_DOES_NOT_MATCH">EPAYLOAD_DOES_NOT_MATCH</a>),
+        );
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multisig_account_successful_transaction_execution_cleanup"></a>
+
+## Function `successful_transaction_execution_cleanup`
+
+Post-execution cleanup for a successful multisig transaction execution.
+This function is private so no other code can call this beside the VM itself as part of MultisigTransaction.
+
+
+<pre><code><b>fun</b> <a href="multisig_account.md#0x1_multisig_account_successful_transaction_execution_cleanup">successful_transaction_execution_cleanup</a>(executor: <b>address</b>, <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>, transaction_payload: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="multisig_account.md#0x1_multisig_account_successful_transaction_execution_cleanup">successful_transaction_execution_cleanup</a>(
+    executor: <b>address</b>,
+    <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>,
+    transaction_payload: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+) <b>acquires</b> <a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a> {
+    <b>let</b> num_approvals = <a href="multisig_account.md#0x1_multisig_account_transaction_execution_cleanup_common">transaction_execution_cleanup_common</a>(executor, <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>);
+    <b>let</b> multisig_account_resource = <b>borrow_global_mut</b>&lt;<a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a>&gt;(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>);
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        emit(
+            <a href="multisig_account.md#0x1_multisig_account_TransactionExecutionSucceeded">TransactionExecutionSucceeded</a> {
+                <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>,
+                sequence_number: multisig_account_resource.last_executed_sequence_number,
+                transaction_payload,
+                num_approvals,
+                executor,
+            }
+        );
+    };
+    emit_event(
+        &<b>mut</b> multisig_account_resource.execute_transaction_events,
+        <a href="multisig_account.md#0x1_multisig_account_TransactionExecutionSucceededEvent">TransactionExecutionSucceededEvent</a> {
+            sequence_number: multisig_account_resource.last_executed_sequence_number,
+            transaction_payload,
+            num_approvals,
+            executor,
+        }
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multisig_account_failed_transaction_execution_cleanup"></a>
+
+## Function `failed_transaction_execution_cleanup`
+
+Post-execution cleanup for a failed multisig transaction execution.
+This function is private so no other code can call this beside the VM itself as part of MultisigTransaction.
+
+
+<pre><code><b>fun</b> <a href="multisig_account.md#0x1_multisig_account_failed_transaction_execution_cleanup">failed_transaction_execution_cleanup</a>(executor: <b>address</b>, <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>, transaction_payload: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, execution_error: <a href="multisig_account.md#0x1_multisig_account_ExecutionError">multisig_account::ExecutionError</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="multisig_account.md#0x1_multisig_account_failed_transaction_execution_cleanup">failed_transaction_execution_cleanup</a>(
+    executor: <b>address</b>,
+    <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>,
+    transaction_payload: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    execution_error: <a href="multisig_account.md#0x1_multisig_account_ExecutionError">ExecutionError</a>,
+) <b>acquires</b> <a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a> {
+    <b>let</b> num_approvals = <a href="multisig_account.md#0x1_multisig_account_transaction_execution_cleanup_common">transaction_execution_cleanup_common</a>(executor, <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>);
+    <b>let</b> multisig_account_resource = <b>borrow_global_mut</b>&lt;<a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a>&gt;(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>);
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        emit(
+            <a href="multisig_account.md#0x1_multisig_account_TransactionExecutionFailed">TransactionExecutionFailed</a> {
+                <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>,
+                executor,
+                sequence_number: multisig_account_resource.last_executed_sequence_number,
+                transaction_payload,
+                num_approvals,
+                execution_error,
+            }
+        );
+    };
+    emit_event(
+        &<b>mut</b> multisig_account_resource.transaction_execution_failed_events,
+        <a href="multisig_account.md#0x1_multisig_account_TransactionExecutionFailedEvent">TransactionExecutionFailedEvent</a> {
+            executor,
+            sequence_number: multisig_account_resource.last_executed_sequence_number,
+            transaction_payload,
+            num_approvals,
+            execution_error,
+        }
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multisig_account_transaction_execution_cleanup_common"></a>
+
+## Function `transaction_execution_cleanup_common`
+
+
+
+<pre><code><b>fun</b> <a href="multisig_account.md#0x1_multisig_account_transaction_execution_cleanup_common">transaction_execution_cleanup_common</a>(executor: <b>address</b>, <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_transaction_execution_cleanup_common">transaction_execution_cleanup_common</a>(executor: <b>address</b>, <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>): u64 <b>acquires</b> <a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a> {
+    <b>let</b> sequence_number = <a href="multisig_account.md#0x1_multisig_account_last_resolved_sequence_number">last_resolved_sequence_number</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>) + 1;
+    <b>let</b> implicit_approval = !<a href="multisig_account.md#0x1_multisig_account_has_voted_for_approval">has_voted_for_approval</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>, sequence_number, executor);
+
+    <b>let</b> multisig_account_resource = <b>borrow_global_mut</b>&lt;<a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a>&gt;(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>);
+    <b>let</b> (num_approvals, _) = <a href="multisig_account.md#0x1_multisig_account_remove_executed_transaction">remove_executed_transaction</a>(multisig_account_resource);
+
+    <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_multisig_v2_enhancement_feature_enabled">features::multisig_v2_enhancement_feature_enabled</a>() && implicit_approval) {
+        <b>if</b> (std::features::module_event_migration_enabled()) {
+            emit(
+                <a href="multisig_account.md#0x1_multisig_account_Vote">Vote</a> {
+                    <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>,
+                    owner: executor,
+                    sequence_number,
+                    approved: <b>true</b>,
+                }
+            );
+        };
+        num_approvals = num_approvals + 1;
+        emit_event(
+            &<b>mut</b> multisig_account_resource.vote_events,
+            <a href="multisig_account.md#0x1_multisig_account_VoteEvent">VoteEvent</a> {
+                owner: executor,
+                sequence_number,
+                approved: <b>true</b>,
+            }
+        );
+    };
+
+    num_approvals
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multisig_account_remove_executed_transaction"></a>
+
+## Function `remove_executed_transaction`
+
+
+
+<pre><code><b>fun</b> <a href="multisig_account.md#0x1_multisig_account_remove_executed_transaction">remove_executed_transaction</a>(multisig_account_resource: &<b>mut</b> <a href="multisig_account.md#0x1_multisig_account_MultisigAccount">multisig_account::MultisigAccount</a>): (u64, u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="multisig_account.md#0x1_multisig_account_remove_executed_transaction">remove_executed_transaction</a>(multisig_account_resource: &<b>mut</b> <a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a>): (u64, u64) {
+    <b>let</b> sequence_number = multisig_account_resource.last_executed_sequence_number + 1;
+    <b>let</b> transaction = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_remove">table::remove</a>(&<b>mut</b> multisig_account_resource.transactions, sequence_number);
+    multisig_account_resource.last_executed_sequence_number = sequence_number;
+    <a href="multisig_account.md#0x1_multisig_account_num_approvals_and_rejections_internal">num_approvals_and_rejections_internal</a>(&multisig_account_resource.owners, &transaction)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multisig_account_add_transaction"></a>
+
+## Function `add_transaction`
+
+
+
+<pre><code><b>fun</b> <a href="multisig_account.md#0x1_multisig_account_add_transaction">add_transaction</a>(creator: <b>address</b>, <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>, transaction: <a href="multisig_account.md#0x1_multisig_account_MultisigTransaction">multisig_account::MultisigTransaction</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_add_transaction">add_transaction</a>(
+    creator: <b>address</b>,
+    <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>,
+    transaction: <a href="multisig_account.md#0x1_multisig_account_MultisigTransaction">MultisigTransaction</a>
+) {
+    <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_multisig_v2_enhancement_feature_enabled">features::multisig_v2_enhancement_feature_enabled</a>()) {
+        <b>assert</b>!(
+            <a href="multisig_account.md#0x1_multisig_account_available_transaction_queue_capacity">available_transaction_queue_capacity</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>) &gt; 0,
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="multisig_account.md#0x1_multisig_account_EMAX_PENDING_TRANSACTIONS_EXCEEDED">EMAX_PENDING_TRANSACTIONS_EXCEEDED</a>)
+        );
+    };
+
+    <b>let</b> multisig_account_resource = <b>borrow_global_mut</b>&lt;<a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a>&gt;(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>);
+
+    // The transaction creator also automatically votes for the transaction.
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_add">simple_map::add</a>(&<b>mut</b> transaction.votes, creator, <b>true</b>);
+
+    <b>let</b> sequence_number = multisig_account_resource.next_sequence_number;
+    multisig_account_resource.next_sequence_number = sequence_number + 1;
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_add">table::add</a>(&<b>mut</b> multisig_account_resource.transactions, sequence_number, transaction);
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        emit(
+            <a href="multisig_account.md#0x1_multisig_account_CreateTransaction">CreateTransaction</a> { <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>, creator, sequence_number, transaction }
+        );
+    };
+    emit_event(
+        &<b>mut</b> multisig_account_resource.create_transaction_events,
+        <a href="multisig_account.md#0x1_multisig_account_CreateTransactionEvent">CreateTransactionEvent</a> { creator, sequence_number, transaction },
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multisig_account_create_multisig_account"></a>
+
+## Function `create_multisig_account`
+
+
+
+<pre><code><b>fun</b> <a href="multisig_account.md#0x1_multisig_account_create_multisig_account">create_multisig_account</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>): (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="account.md#0x1_account_SignerCapability">account::SignerCapability</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="multisig_account.md#0x1_multisig_account_create_multisig_account">create_multisig_account</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>): (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, SignerCapability) {
+    <b>let</b> owner_nonce = <a href="account.md#0x1_account_get_sequence_number">account::get_sequence_number</a>(address_of(owner));
+    <b>let</b> (multisig_signer, multisig_signer_cap) =
+        <a href="account.md#0x1_account_create_resource_account">account::create_resource_account</a>(owner, <a href="multisig_account.md#0x1_multisig_account_create_multisig_account_seed">create_multisig_account_seed</a>(to_bytes(&owner_nonce)));
+    // Register the <a href="account.md#0x1_account">account</a> <b>to</b> receive APT <b>as</b> this is not done by default <b>as</b> part of the resource <a href="account.md#0x1_account">account</a> creation
+    // flow.
+    <b>if</b> (!<a href="coin.md#0x1_coin_is_account_registered">coin::is_account_registered</a>&lt;AptosCoin&gt;(address_of(&multisig_signer))) {
+        <a href="coin.md#0x1_coin_register">coin::register</a>&lt;AptosCoin&gt;(&multisig_signer);
+    };
+
+    (multisig_signer, multisig_signer_cap)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multisig_account_create_multisig_account_seed"></a>
+
+## Function `create_multisig_account_seed`
+
+
+
+<pre><code><b>fun</b> <a href="multisig_account.md#0x1_multisig_account_create_multisig_account_seed">create_multisig_account_seed</a>(seed: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="multisig_account.md#0x1_multisig_account_create_multisig_account_seed">create_multisig_account_seed</a>(seed: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; {
+    // Generate a seed that will be used <b>to</b> create the resource <a href="account.md#0x1_account">account</a> that hosts the multisig <a href="account.md#0x1_account">account</a>.
+    <b>let</b> multisig_account_seed = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_empty">vector::empty</a>&lt;u8&gt;();
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_append">vector::append</a>(&<b>mut</b> multisig_account_seed, <a href="multisig_account.md#0x1_multisig_account_DOMAIN_SEPARATOR">DOMAIN_SEPARATOR</a>);
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_append">vector::append</a>(&<b>mut</b> multisig_account_seed, seed);
+
+    multisig_account_seed
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multisig_account_validate_owners"></a>
+
+## Function `validate_owners`
+
+
+
+<pre><code><b>fun</b> <a href="multisig_account.md#0x1_multisig_account_validate_owners">validate_owners</a>(owners: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;, <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="multisig_account.md#0x1_multisig_account_validate_owners">validate_owners</a>(owners: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;, <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>) {
+    <b>let</b> distinct_owners: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt; = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>[];
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_for_each_ref">vector::for_each_ref</a>(owners, |owner| {
+        <b>let</b> owner = *owner;
+        <b>assert</b>!(owner != <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="multisig_account.md#0x1_multisig_account_EOWNER_CANNOT_BE_MULTISIG_ACCOUNT_ITSELF">EOWNER_CANNOT_BE_MULTISIG_ACCOUNT_ITSELF</a>));
+        <b>let</b> (found, _) = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_index_of">vector::index_of</a>(&distinct_owners, &owner);
+        <b>assert</b>!(!found, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="multisig_account.md#0x1_multisig_account_EDUPLICATE_OWNER">EDUPLICATE_OWNER</a>));
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_push_back">vector::push_back</a>(&<b>mut</b> distinct_owners, owner);
+    });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multisig_account_assert_is_owner_internal"></a>
+
+## Function `assert_is_owner_internal`
+
+
+
+<pre><code><b>fun</b> <a href="multisig_account.md#0x1_multisig_account_assert_is_owner_internal">assert_is_owner_internal</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: &<a href="multisig_account.md#0x1_multisig_account_MultisigAccount">multisig_account::MultisigAccount</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_assert_is_owner_internal">assert_is_owner_internal</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: &<a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a>) {
+    <b>assert</b>!(
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_contains">vector::contains</a>(&<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>.owners, &address_of(owner)),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="multisig_account.md#0x1_multisig_account_ENOT_OWNER">ENOT_OWNER</a>),
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multisig_account_assert_is_owner"></a>
+
+## Function `assert_is_owner`
+
+
+
+<pre><code><b>fun</b> <a href="multisig_account.md#0x1_multisig_account_assert_is_owner">assert_is_owner</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_assert_is_owner">assert_is_owner</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>) <b>acquires</b> <a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a> {
+    <b>let</b> multisig_account_resource = <b>borrow_global</b>&lt;<a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a>&gt;(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>);
+    <a href="multisig_account.md#0x1_multisig_account_assert_is_owner_internal">assert_is_owner_internal</a>(owner, multisig_account_resource);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multisig_account_num_approvals_and_rejections_internal"></a>
+
+## Function `num_approvals_and_rejections_internal`
+
+
+
+<pre><code><b>fun</b> <a href="multisig_account.md#0x1_multisig_account_num_approvals_and_rejections_internal">num_approvals_and_rejections_internal</a>(owners: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;, transaction: &<a href="multisig_account.md#0x1_multisig_account_MultisigTransaction">multisig_account::MultisigTransaction</a>): (u64, u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_num_approvals_and_rejections_internal">num_approvals_and_rejections_internal</a>(owners: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;, transaction: &<a href="multisig_account.md#0x1_multisig_account_MultisigTransaction">MultisigTransaction</a>): (u64, u64) {
+    <b>let</b> num_approvals = 0;
+    <b>let</b> num_rejections = 0;
+
+    <b>let</b> votes = &transaction.votes;
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_for_each_ref">vector::for_each_ref</a>(owners, |owner| {
+        <b>if</b> (<a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_contains_key">simple_map::contains_key</a>(votes, owner)) {
+            <b>if</b> (*<a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_borrow">simple_map::borrow</a>(votes, owner)) {
+                num_approvals = num_approvals + 1;
+            } <b>else</b> {
+                num_rejections = num_rejections + 1;
+            };
+        }
+    });
+
+    (num_approvals, num_rejections)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multisig_account_num_approvals_and_rejections"></a>
+
+## Function `num_approvals_and_rejections`
+
+
+
+<pre><code><b>fun</b> <a href="multisig_account.md#0x1_multisig_account_num_approvals_and_rejections">num_approvals_and_rejections</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>, sequence_number: u64): (u64, u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_num_approvals_and_rejections">num_approvals_and_rejections</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>, sequence_number: u64): (u64, u64) <b>acquires</b> <a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a> {
+    <b>let</b> multisig_account_resource = <b>borrow_global</b>&lt;<a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a>&gt;(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>);
+    <b>let</b> transaction = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_borrow">table::borrow</a>(&multisig_account_resource.transactions, sequence_number);
+    <a href="multisig_account.md#0x1_multisig_account_num_approvals_and_rejections_internal">num_approvals_and_rejections_internal</a>(&multisig_account_resource.owners, transaction)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multisig_account_has_voted_for_approval"></a>
+
+## Function `has_voted_for_approval`
+
+
+
+<pre><code><b>fun</b> <a href="multisig_account.md#0x1_multisig_account_has_voted_for_approval">has_voted_for_approval</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>, sequence_number: u64, owner: <b>address</b>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_has_voted_for_approval">has_voted_for_approval</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>, sequence_number: u64, owner: <b>address</b>): bool <b>acquires</b> <a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a> {
+    <b>let</b> (voted, vote) = <a href="multisig_account.md#0x1_multisig_account_vote">vote</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>, sequence_number, owner);
+    voted && vote
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multisig_account_has_voted_for_rejection"></a>
+
+## Function `has_voted_for_rejection`
+
+
+
+<pre><code><b>fun</b> <a href="multisig_account.md#0x1_multisig_account_has_voted_for_rejection">has_voted_for_rejection</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>, sequence_number: u64, owner: <b>address</b>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_has_voted_for_rejection">has_voted_for_rejection</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>, sequence_number: u64, owner: <b>address</b>): bool <b>acquires</b> <a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a> {
+    <b>let</b> (voted, vote) = <a href="multisig_account.md#0x1_multisig_account_vote">vote</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>, sequence_number, owner);
+    voted && !vote
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multisig_account_assert_multisig_account_exists"></a>
+
+## Function `assert_multisig_account_exists`
+
+
+
+<pre><code><b>fun</b> <a href="multisig_account.md#0x1_multisig_account_assert_multisig_account_exists">assert_multisig_account_exists</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_assert_multisig_account_exists">assert_multisig_account_exists</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>) {
+    <b>assert</b>!(<b>exists</b>&lt;<a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a>&gt;(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="multisig_account.md#0x1_multisig_account_EACCOUNT_NOT_MULTISIG">EACCOUNT_NOT_MULTISIG</a>));
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multisig_account_assert_valid_sequence_number"></a>
+
+## Function `assert_valid_sequence_number`
+
+
+
+<pre><code><b>fun</b> <a href="multisig_account.md#0x1_multisig_account_assert_valid_sequence_number">assert_valid_sequence_number</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>, sequence_number: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_assert_valid_sequence_number">assert_valid_sequence_number</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>, sequence_number: u64) <b>acquires</b> <a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a> {
+    <b>let</b> multisig_account_resource = <b>borrow_global</b>&lt;<a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a>&gt;(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>);
+    <b>assert</b>!(
+        sequence_number &gt; 0 && sequence_number &lt; multisig_account_resource.next_sequence_number,
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="multisig_account.md#0x1_multisig_account_EINVALID_SEQUENCE_NUMBER">EINVALID_SEQUENCE_NUMBER</a>),
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multisig_account_assert_transaction_exists"></a>
+
+## Function `assert_transaction_exists`
+
+
+
+<pre><code><b>fun</b> <a href="multisig_account.md#0x1_multisig_account_assert_transaction_exists">assert_transaction_exists</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>, sequence_number: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_assert_transaction_exists">assert_transaction_exists</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>, sequence_number: u64) <b>acquires</b> <a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a> {
+    <b>let</b> multisig_account_resource = <b>borrow_global</b>&lt;<a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a>&gt;(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>);
+    <b>assert</b>!(
+        <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_contains">table::contains</a>(&multisig_account_resource.transactions, sequence_number),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="multisig_account.md#0x1_multisig_account_ETRANSACTION_NOT_FOUND">ETRANSACTION_NOT_FOUND</a>),
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multisig_account_update_owner_schema"></a>
+
+## Function `update_owner_schema`
+
+Add new owners, remove owners to remove, update signatures required.
+
+
+<pre><code><b>fun</b> <a href="multisig_account.md#0x1_multisig_account_update_owner_schema">update_owner_schema</a>(multisig_address: <b>address</b>, new_owners: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;, owners_to_remove: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;, optional_new_num_signatures_required: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;u64&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="multisig_account.md#0x1_multisig_account_update_owner_schema">update_owner_schema</a>(
+    multisig_address: <b>address</b>,
+    new_owners: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;,
+    owners_to_remove: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;,
+    optional_new_num_signatures_required: Option&lt;u64&gt;,
+) <b>acquires</b> <a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a> {
+    <a href="multisig_account.md#0x1_multisig_account_assert_multisig_account_exists">assert_multisig_account_exists</a>(multisig_address);
+    <b>let</b> multisig_account_ref_mut =
+        <b>borrow_global_mut</b>&lt;<a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a>&gt;(multisig_address);
+    // Verify no overlap between new owners and owners <b>to</b> remove.
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_for_each_ref">vector::for_each_ref</a>(&new_owners, |new_owner_ref| {
+        <b>assert</b>!(
+            !<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_contains">vector::contains</a>(&owners_to_remove, new_owner_ref),
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="multisig_account.md#0x1_multisig_account_EOWNERS_TO_REMOVE_NEW_OWNERS_OVERLAP">EOWNERS_TO_REMOVE_NEW_OWNERS_OVERLAP</a>)
+        )
+    });
+    // If new owners provided, try <b>to</b> add them and emit an <a href="event.md#0x1_event">event</a>.
+    <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&new_owners) &gt; 0) {
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_append">vector::append</a>(&<b>mut</b> multisig_account_ref_mut.owners, new_owners);
+        <a href="multisig_account.md#0x1_multisig_account_validate_owners">validate_owners</a>(
+            &multisig_account_ref_mut.owners,
+            multisig_address
+        );
+        <b>if</b> (std::features::module_event_migration_enabled()) {
+            emit(<a href="multisig_account.md#0x1_multisig_account_AddOwners">AddOwners</a> { <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: multisig_address, owners_added: new_owners });
+        };
+        emit_event(
+            &<b>mut</b> multisig_account_ref_mut.add_owners_events,
+            <a href="multisig_account.md#0x1_multisig_account_AddOwnersEvent">AddOwnersEvent</a> { owners_added: new_owners }
+        );
+    };
+    // If owners <b>to</b> remove provided, try <b>to</b> remove them.
+    <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&owners_to_remove) &gt; 0) {
+        <b>let</b> owners_ref_mut = &<b>mut</b> multisig_account_ref_mut.owners;
+        <b>let</b> owners_removed = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>[];
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_for_each_ref">vector::for_each_ref</a>(&owners_to_remove, |owner_to_remove_ref| {
+            <b>let</b> (found, index) =
+                <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_index_of">vector::index_of</a>(owners_ref_mut, owner_to_remove_ref);
+            <b>if</b> (found) {
+                <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_push_back">vector::push_back</a>(
+                    &<b>mut</b> owners_removed,
+                    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_swap_remove">vector::swap_remove</a>(owners_ref_mut, index)
+                );
+            }
+        });
+        // Only emit <a href="event.md#0x1_event">event</a> <b>if</b> owner(s) actually removed.
+        <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&owners_removed) &gt; 0) {
+            <b>if</b> (std::features::module_event_migration_enabled()) {
+                emit(
+                    <a href="multisig_account.md#0x1_multisig_account_RemoveOwners">RemoveOwners</a> { <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: multisig_address, owners_removed }
+                );
+            };
+            emit_event(
+                &<b>mut</b> multisig_account_ref_mut.remove_owners_events,
+                <a href="multisig_account.md#0x1_multisig_account_RemoveOwnersEvent">RemoveOwnersEvent</a> { owners_removed }
+            );
+        }
+    };
+    // If new signature count provided, try <b>to</b> <b>update</b> count.
+    <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&optional_new_num_signatures_required)) {
+        <b>let</b> new_num_signatures_required =
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_extract">option::extract</a>(&<b>mut</b> optional_new_num_signatures_required);
+        <b>assert</b>!(
+            new_num_signatures_required &gt; 0,
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="multisig_account.md#0x1_multisig_account_EINVALID_SIGNATURES_REQUIRED">EINVALID_SIGNATURES_REQUIRED</a>)
+        );
+        <b>let</b> old_num_signatures_required =
+            multisig_account_ref_mut.num_signatures_required;
+        // Only <b>apply</b> <b>update</b> and emit <a href="event.md#0x1_event">event</a> <b>if</b> a change indicated.
+        <b>if</b> (new_num_signatures_required != old_num_signatures_required) {
+            multisig_account_ref_mut.num_signatures_required =
+                new_num_signatures_required;
+            <b>if</b> (std::features::module_event_migration_enabled()) {
+                emit(
+                    <a href="multisig_account.md#0x1_multisig_account_UpdateSignaturesRequired">UpdateSignaturesRequired</a> {
+                        <a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: multisig_address,
+                        old_num_signatures_required,
+                        new_num_signatures_required,
+                    }
+                );
+            };
+            emit_event(
+                &<b>mut</b> multisig_account_ref_mut.update_signature_required_events,
+                <a href="multisig_account.md#0x1_multisig_account_UpdateSignaturesRequiredEvent">UpdateSignaturesRequiredEvent</a> {
+                    old_num_signatures_required,
+                    new_num_signatures_required,
+                }
+            );
+        }
+    };
+    // Verify number of owners.
+    <b>let</b> num_owners = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&multisig_account_ref_mut.owners);
+    <b>assert</b>!(
+        num_owners &gt;= multisig_account_ref_mut.num_signatures_required,
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="multisig_account.md#0x1_multisig_account_ENOT_ENOUGH_OWNERS">ENOT_ENOUGH_OWNERS</a>)
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+
+
+<a id="high-level-req"></a>
+
+### High-level Requirements
+
+<table>
+<tr>
+<th>No.</th><th>Requirement</th><th>Criticality</th><th>Implementation</th><th>Enforcement</th>
+</tr>
+
+<tr>
+<td>1</td>
+<td>For every multi-signature account, the range of required signatures should always be in the range of one to the total number of owners.</td>
+<td>Critical</td>
+<td>While creating a MultisigAccount, the function create_with_owners_internal checks that num_signatures_required is in the span from 1 to total count of owners.</td>
+<td>This has been audited.</td>
+</tr>
+
+<tr>
+<td>2</td>
+<td>The list of owners for a multi-signature account should not contain any duplicate owners, and the multi-signature account itself cannot be listed as one of its owners.</td>
+<td>Critical</td>
+<td>The function validate_owners validates the owner vector that no duplicate entries exists.</td>
+<td>This has been audited.</td>
+</tr>
+
+<tr>
+<td>3</td>
+<td>The current value of the next sequence number should not be present in the transaction table, until the next sequence number gets increased.</td>
+<td>Medium</td>
+<td>The add_transaction function increases the next sequence number and only then adds the transaction with the old next sequence number to the transaction table.</td>
+<td>This has been audited.</td>
+</tr>
+
+<tr>
+<td>4</td>
+<td>When the last executed sequence number is smaller than the next sequence number by only one unit, no transactions should exist in the multi-signature account's transactions list.</td>
+<td>High</td>
+<td>The get_pending_transactions function retrieves pending transactions by iterating through the transactions table, starting from the last_executed_sequence_number + 1 to the next_sequence_number.</td>
+<td>Audited that MultisigAccount.transactions is empty when last_executed_sequence_number == next_sequence_number -1</td>
+</tr>
+
+<tr>
+<td>5</td>
+<td>The last executed sequence number is always smaller than the next sequence number.</td>
+<td>Medium</td>
+<td>When creating a new MultisigAccount, the last_executed_sequence_number and next_sequence_number are assigned with 0 and 1 respectively, and from there both these values increase monotonically when a transaction is executed and removed from the table and when new transaction are added respectively.</td>
+<td>This has been audited.</td>
+</tr>
+
+<tr>
+<td>6</td>
+<td>The number of pending transactions should be equal to the difference between the next sequence number and the last executed sequence number.</td>
+<td>High</td>
+<td>When a transaction is added, next_sequence_number is incremented. And when a transaction is removed after execution, last_executed_sequence_number is incremented.</td>
+<td>This has been audited.</td>
+</tr>
+
+<tr>
+<td>7</td>
+<td>Only transactions with valid sequence number should be fetched.</td>
+<td>Medium</td>
+<td>Functions such as: 1. get_transaction 2. can_be_executed 3. can_be_rejected 4. vote always validate the given sequence number and only then fetch the associated transaction.</td>
+<td>Audited that it aborts if the sequence number is not valid.</td>
+</tr>
+
+<tr>
+<td>8</td>
+<td>The execution or rejection of a transaction should enforce that the minimum number of required signatures is less or equal to the total number of approvals.</td>
+<td>Critical</td>
+<td>The functions can_be_executed and can_be_rejected perform validation on the number of votes required for execution or rejection.</td>
+<td>Audited that these functions return the correct value.</td>
+</tr>
+
+<tr>
+<td>9</td>
+<td>The creation of a multi-signature account properly initializes the resources and then it gets published under the corresponding account.</td>
+<td>Medium</td>
+<td>When creating a MultisigAccount via one of the functions: create_with_existing_account, create_with_existing_account_and_revoke_auth_key, create_with_owners, create, the MultisigAccount data is initialized properly and published to the multisig_account (new or existing).</td>
+<td>Audited that the MultisigAccount is initialized properly.</td>
+</tr>
+
+<tr>
+<td>10</td>
+<td>Creation of a multi-signature account on top of an existing account should revoke auth key and any previous offered capabilities or control.</td>
+<td>Critical</td>
+<td>The function create_with_existing_account_and_revoke_auth_key, after successfully creating the MultisigAccount, rotates the account to ZeroAuthKey and revokes any offered capabilities of that account.</td>
+<td>Audited that the account's auth key and the offered capabilities are revoked.</td>
+</tr>
+
+<tr>
+<td>11</td>
+<td>Upon the creation of a multi-signature account from a bootstrapping account, the ownership of the resultant account should not pertain to the bootstrapping account.</td>
+<td>High</td>
+<td>In create_with_owners_then_remove_bootstrapper function after successful creation of the account the bootstrapping account is removed from the owner vector of the account.</td>
+<td>Audited that the bootstrapping account is not in the owners list.</td>
+</tr>
+
+<tr>
+<td>12</td>
+<td>Performing any changes on the list of owners such as adding new owners, removing owners, swapping owners should ensure that the number of required signature, for the multi-signature account remains valid.</td>
+<td>Critical</td>
+<td>The following function as used to modify the owners list and the required signature of the account: add_owner, add_owners, add_owners_and_update_signatures_required, remove_owner, remove_owners, swap_owner, swap_owners, swap_owners_and_update_signatures_required, update_signatures_required. All of these functions use update_owner_schema function to process these changes, the function validates the owner list while adding and verifies that the account has enough required signatures and updates the owner's schema.</td>
+<td>Audited that the owners are added successfully. (add_owner, add_owners, add_owners_and_update_signatures_required, swap_owner, swap_owners, swap_owners_and_update_signatures_required, update_owner_schema) Audited that the owners are removed successfully. (remove_owner, remove_owners, swap_owner, swap_owners, swap_owners_and_update_signatures_required, update_owner_schema) Audited that the num_signatures_required is updated successfully. (add_owners_and_update_signatures_required, swap_owners_and_update_signatures_required, update_signatures_required, update_owner_schema)</td>
+</tr>
+
+<tr>
+<td>13</td>
+<td>The creation of a transaction should be limited to an account owner, which should be automatically considered a voter; additionally, the account's sequence should increase monotonically.</td>
+<td>Critical</td>
+<td>The following functions can only be called by the owners of the account and create a transaction and uses add_transaction function to gives approval on behalf of the creator and increments the next_sequence_number and finally adds the transaction to the MultsigAccount: create_transaction_with_hash, create_transaction.</td>
+<td>Audited it aborts if the caller is not in the owner's list of the account. (create_transaction_with_hash, create_transaction) Audited that the transaction is successfully stored in the MultisigAccount.(create_transaction_with_hash, create_transaction, add_transaction) Audited that the creators voted to approve the transaction. (create_transaction_with_hash, create_transaction, add_transaction) Audited that the next_sequence_number increases monotonically. (create_transaction_with_hash, create_transaction, add_transaction)</td>
+</tr>
+
+<tr>
+<td>14</td>
+<td>Only owners are allowed to vote for a valid transaction.</td>
+<td>Critical</td>
+<td>Any owner of the MultisigAccount can either approve (approve_transaction) or reject (reject_transaction) a transaction. Both these functions use a generic function to vote for the transaction which validates the caller and the transaction id and adds/updates the vote.</td>
+<td>Audited that it aborts if the caller is not in the owner's list (approve_transaction, reject_transaction, vote_transaction, assert_is_owner). Audited that it aborts if the transaction with the given sequence number doesn't exist in the account (approve_transaction, reject_transaction, vote_transaction). Audited that the vote is recorded as intended.</td>
+</tr>
+
+<tr>
+<td>15</td>
+<td>Only owners are allowed to execute a valid transaction, if the number of approvals meets the k-of-n criteria, finally the executed transaction should be removed.</td>
+<td>Critical</td>
+<td>Functions execute_rejected_transaction and validate_multisig_transaction can only be called by the owner which validates the transaction and based on the number of approvals and rejections it proceeds to execute the transactions. For rejected transaction, the transactions are immediately removed from the MultisigAccount via remove_executed_transaction. VM validates the transaction via validate_multisig_transaction and cleans up the transaction via successful_transaction_execution_cleanup and failed_transaction_execution_cleanup.</td>
+<td>Audited that it aborts if the caller is not in the owner's list (execute_rejected_transaction, validate_multisig_transaction). Audited that it aborts if the transaction with the given sequence number doesn't exist in the account (execute_rejected_transaction, validate_multisig_transaction). Audited that it aborts if the votes (approvals or rejections) are less than num_signatures_required (execute_rejected_transaction, validate_multisig_transaction). Audited that the transaction is removed from the MultisigAccount (execute_rejected_transaction, remove_executed_transaction, successful_transaction_execution_cleanup, failed_transaction_execution_cleanup).</td>
+</tr>
+
+<tr>
+<td>16</td>
+<td>Removing an executed transaction from the transactions list should increase the last sequence number monotonically.</td>
+<td>High</td>
+<td>When transactions are removed via remove_executed_transaction (maybe called by VM cleanup or execute_rejected_transaction), the last_executed_sequence_number increases by 1.</td>
+<td>Audited that last_executed_sequence_number is incremented.</td>
+</tr>
+
+<tr>
+<td>17</td>
+<td>The voting and transaction creation operations should only be available if a multi-signature account exists.</td>
+<td>Low</td>
+<td>The function assert_multisig_account_exists validates the existence of MultisigAccount under the account.</td>
+<td>Audited that it aborts if the MultisigAccount doesn't exist on the account.</td>
+</tr>
+
+</table>
+
+
+
+<a id="module-level-spec"></a>
+
+### Module-level Specification
+
+
+<a id="@Specification_1_metadata"></a>
+
+### Function `metadata`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_metadata">metadata</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>): <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a>&gt;(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>);
+<b>ensures</b> result == <b>global</b>&lt;<a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a>&gt;(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>).metadata;
+</code></pre>
+
+
+
+<a id="@Specification_1_num_signatures_required"></a>
+
+### Function `num_signatures_required`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_num_signatures_required">num_signatures_required</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>): u64
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a>&gt;(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>);
+<b>ensures</b> result == <b>global</b>&lt;<a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a>&gt;(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>).num_signatures_required;
+</code></pre>
+
+
+
+<a id="@Specification_1_owners"></a>
+
+### Function `owners`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_owners">owners</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a>&gt;(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>);
+<b>ensures</b> result == <b>global</b>&lt;<a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a>&gt;(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>).owners;
+</code></pre>
+
+
+
+<a id="@Specification_1_get_transaction"></a>
+
+### Function `get_transaction`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_get_transaction">get_transaction</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>, sequence_number: u64): <a href="multisig_account.md#0x1_multisig_account_MultisigTransaction">multisig_account::MultisigTransaction</a>
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> multisig_account_resource = <b>global</b>&lt;<a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a>&gt;(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a>&gt;(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>);
+<b>aborts_if</b> sequence_number == 0 || sequence_number &gt;= multisig_account_resource.next_sequence_number;
+<b>aborts_if</b> !<a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_contains">table::spec_contains</a>(multisig_account_resource.transactions, sequence_number);
+<b>ensures</b> result == <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(multisig_account_resource.transactions, sequence_number);
+</code></pre>
+
+
+
+<a id="@Specification_1_get_next_transaction_payload"></a>
+
+### Function `get_next_transaction_payload`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_get_next_transaction_payload">get_next_transaction_payload</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>, provided_payload: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> multisig_account_resource = <b>global</b>&lt;<a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a>&gt;(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>);
+<b>let</b> sequence_number = multisig_account_resource.last_executed_sequence_number + 1;
+<b>let</b> transaction = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(multisig_account_resource.transactions, sequence_number);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a>&gt;(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>);
+<b>aborts_if</b> multisig_account_resource.last_executed_sequence_number + 1 &gt; MAX_U64;
+<b>aborts_if</b> !<a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_contains">table::spec_contains</a>(multisig_account_resource.transactions, sequence_number);
+<b>ensures</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_is_none">option::spec_is_none</a>(transaction.payload) ==&gt; result == provided_payload;
+</code></pre>
+
+
+
+<a id="@Specification_1_get_next_multisig_account_address"></a>
+
+### Function `get_next_multisig_account_address`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_get_next_multisig_account_address">get_next_multisig_account_address</a>(creator: <b>address</b>): <b>address</b>
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(creator);
+<b>let</b> owner_nonce = <b>global</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(creator).sequence_number;
+</code></pre>
+
+
+
+<a id="@Specification_1_last_resolved_sequence_number"></a>
+
+### Function `last_resolved_sequence_number`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_last_resolved_sequence_number">last_resolved_sequence_number</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>): u64
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> multisig_account_resource = <b>global</b>&lt;<a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a>&gt;(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a>&gt;(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>);
+<b>ensures</b> result == multisig_account_resource.last_executed_sequence_number;
+</code></pre>
+
+
+
+<a id="@Specification_1_next_sequence_number"></a>
+
+### Function `next_sequence_number`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_next_sequence_number">next_sequence_number</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>): u64
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> multisig_account_resource = <b>global</b>&lt;<a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a>&gt;(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a>&gt;(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>);
+<b>ensures</b> result == multisig_account_resource.next_sequence_number;
+</code></pre>
+
+
+
+<a id="@Specification_1_vote"></a>
+
+### Function `vote`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="multisig_account.md#0x1_multisig_account_vote">vote</a>(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>: <b>address</b>, sequence_number: u64, owner: <b>address</b>): (bool, bool)
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> multisig_account_resource = <b>global</b>&lt;<a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a>&gt;(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="multisig_account.md#0x1_multisig_account_MultisigAccount">MultisigAccount</a>&gt;(<a href="multisig_account.md#0x1_multisig_account">multisig_account</a>);
+<b>aborts_if</b> sequence_number == 0 || sequence_number &gt;= multisig_account_resource.next_sequence_number;
+<b>aborts_if</b> !<a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_contains">table::spec_contains</a>(multisig_account_resource.transactions, sequence_number);
+<b>let</b> transaction = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(multisig_account_resource.transactions, sequence_number);
+<b>let</b> votes = transaction.votes;
+<b>let</b> voted = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(votes, owner);
+<b>let</b> vote = voted && <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(votes, owner);
+<b>ensures</b> result_1 == voted;
+<b>ensures</b> result_2 == vote;
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/object.md b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/object.md
new file mode 100644
index 0000000000000..7a5f1c49ba86e
--- /dev/null
+++ b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/object.md
@@ -0,0 +1,3398 @@
+
+<a id="0x1_object"></a>
+
+# Module `0x1::object`
+
+This defines the Move object model with the following properties:
+- Simplified storage interface that supports a heterogeneous collection of resources to be
+stored together. This enables data types to share a common core data layer (e.g., tokens),
+while having richer extensions (e.g., concert ticket, sword).
+- Globally accessible data and ownership model that enables creators and developers to dictate
+the application and lifetime of data.
+- Extensible programming model that supports individualization of user applications that
+leverage the core framework including tokens.
+- Support emitting events directly, thus improving discoverability of events associated with
+objects.
+- Considerate of the underlying system by leveraging resource groups for gas efficiency,
+avoiding costly deserialization and serialization costs, and supporting deletability.
+
+TODO:
+* There is no means to borrow an object or a reference to an object. We are exploring how to
+make it so that a reference to a global object can be returned from a function.
+
+
+-  [Resource `ObjectCore`](#0x1_object_ObjectCore)
+-  [Resource `TombStone`](#0x1_object_TombStone)
+-  [Resource `Untransferable`](#0x1_object_Untransferable)
+-  [Struct `ObjectGroup`](#0x1_object_ObjectGroup)
+-  [Struct `Object`](#0x1_object_Object)
+-  [Struct `ConstructorRef`](#0x1_object_ConstructorRef)
+-  [Struct `DeleteRef`](#0x1_object_DeleteRef)
+-  [Struct `ExtendRef`](#0x1_object_ExtendRef)
+-  [Struct `TransferRef`](#0x1_object_TransferRef)
+-  [Struct `LinearTransferRef`](#0x1_object_LinearTransferRef)
+-  [Struct `DeriveRef`](#0x1_object_DeriveRef)
+-  [Struct `TransferEvent`](#0x1_object_TransferEvent)
+-  [Struct `Transfer`](#0x1_object_Transfer)
+-  [Constants](#@Constants_0)
+-  [Function `is_untransferable`](#0x1_object_is_untransferable)
+-  [Function `is_burnt`](#0x1_object_is_burnt)
+-  [Function `address_to_object`](#0x1_object_address_to_object)
+-  [Function `is_object`](#0x1_object_is_object)
+-  [Function `object_exists`](#0x1_object_object_exists)
+-  [Function `create_object_address`](#0x1_object_create_object_address)
+-  [Function `create_user_derived_object_address_impl`](#0x1_object_create_user_derived_object_address_impl)
+-  [Function `create_user_derived_object_address`](#0x1_object_create_user_derived_object_address)
+-  [Function `create_guid_object_address`](#0x1_object_create_guid_object_address)
+-  [Function `exists_at`](#0x1_object_exists_at)
+-  [Function `object_address`](#0x1_object_object_address)
+-  [Function `convert`](#0x1_object_convert)
+-  [Function `create_named_object`](#0x1_object_create_named_object)
+-  [Function `create_user_derived_object`](#0x1_object_create_user_derived_object)
+-  [Function `create_object`](#0x1_object_create_object)
+-  [Function `create_sticky_object`](#0x1_object_create_sticky_object)
+-  [Function `create_sticky_object_at_address`](#0x1_object_create_sticky_object_at_address)
+-  [Function `create_object_from_account`](#0x1_object_create_object_from_account)
+-  [Function `create_object_from_object`](#0x1_object_create_object_from_object)
+-  [Function `create_object_from_guid`](#0x1_object_create_object_from_guid)
+-  [Function `create_object_internal`](#0x1_object_create_object_internal)
+-  [Function `generate_delete_ref`](#0x1_object_generate_delete_ref)
+-  [Function `generate_extend_ref`](#0x1_object_generate_extend_ref)
+-  [Function `generate_transfer_ref`](#0x1_object_generate_transfer_ref)
+-  [Function `generate_derive_ref`](#0x1_object_generate_derive_ref)
+-  [Function `generate_signer`](#0x1_object_generate_signer)
+-  [Function `address_from_constructor_ref`](#0x1_object_address_from_constructor_ref)
+-  [Function `object_from_constructor_ref`](#0x1_object_object_from_constructor_ref)
+-  [Function `can_generate_delete_ref`](#0x1_object_can_generate_delete_ref)
+-  [Function `create_guid`](#0x1_object_create_guid)
+-  [Function `new_event_handle`](#0x1_object_new_event_handle)
+-  [Function `address_from_delete_ref`](#0x1_object_address_from_delete_ref)
+-  [Function `object_from_delete_ref`](#0x1_object_object_from_delete_ref)
+-  [Function `delete`](#0x1_object_delete)
+-  [Function `generate_signer_for_extending`](#0x1_object_generate_signer_for_extending)
+-  [Function `address_from_extend_ref`](#0x1_object_address_from_extend_ref)
+-  [Function `disable_ungated_transfer`](#0x1_object_disable_ungated_transfer)
+-  [Function `set_untransferable`](#0x1_object_set_untransferable)
+-  [Function `enable_ungated_transfer`](#0x1_object_enable_ungated_transfer)
+-  [Function `generate_linear_transfer_ref`](#0x1_object_generate_linear_transfer_ref)
+-  [Function `transfer_with_ref`](#0x1_object_transfer_with_ref)
+-  [Function `transfer_call`](#0x1_object_transfer_call)
+-  [Function `transfer`](#0x1_object_transfer)
+-  [Function `transfer_raw`](#0x1_object_transfer_raw)
+-  [Function `transfer_raw_inner`](#0x1_object_transfer_raw_inner)
+-  [Function `transfer_to_object`](#0x1_object_transfer_to_object)
+-  [Function `verify_ungated_and_descendant`](#0x1_object_verify_ungated_and_descendant)
+-  [Function `burn`](#0x1_object_burn)
+-  [Function `unburn`](#0x1_object_unburn)
+-  [Function `ungated_transfer_allowed`](#0x1_object_ungated_transfer_allowed)
+-  [Function `owner`](#0x1_object_owner)
+-  [Function `is_owner`](#0x1_object_is_owner)
+-  [Function `owns`](#0x1_object_owns)
+-  [Function `root_owner`](#0x1_object_root_owner)
+-  [Specification](#@Specification_1)
+    -  [High-level Requirements](#high-level-req)
+    -  [Module-level Specification](#module-level-spec)
+    -  [Function `address_to_object`](#@Specification_1_address_to_object)
+    -  [Function `create_object_address`](#@Specification_1_create_object_address)
+    -  [Function `create_user_derived_object_address_impl`](#@Specification_1_create_user_derived_object_address_impl)
+    -  [Function `create_user_derived_object_address`](#@Specification_1_create_user_derived_object_address)
+    -  [Function `create_guid_object_address`](#@Specification_1_create_guid_object_address)
+    -  [Function `exists_at`](#@Specification_1_exists_at)
+    -  [Function `object_address`](#@Specification_1_object_address)
+    -  [Function `convert`](#@Specification_1_convert)
+    -  [Function `create_named_object`](#@Specification_1_create_named_object)
+    -  [Function `create_user_derived_object`](#@Specification_1_create_user_derived_object)
+    -  [Function `create_object`](#@Specification_1_create_object)
+    -  [Function `create_sticky_object`](#@Specification_1_create_sticky_object)
+    -  [Function `create_sticky_object_at_address`](#@Specification_1_create_sticky_object_at_address)
+    -  [Function `create_object_from_account`](#@Specification_1_create_object_from_account)
+    -  [Function `create_object_from_object`](#@Specification_1_create_object_from_object)
+    -  [Function `create_object_from_guid`](#@Specification_1_create_object_from_guid)
+    -  [Function `create_object_internal`](#@Specification_1_create_object_internal)
+    -  [Function `generate_delete_ref`](#@Specification_1_generate_delete_ref)
+    -  [Function `generate_transfer_ref`](#@Specification_1_generate_transfer_ref)
+    -  [Function `object_from_constructor_ref`](#@Specification_1_object_from_constructor_ref)
+    -  [Function `create_guid`](#@Specification_1_create_guid)
+    -  [Function `new_event_handle`](#@Specification_1_new_event_handle)
+    -  [Function `object_from_delete_ref`](#@Specification_1_object_from_delete_ref)
+    -  [Function `delete`](#@Specification_1_delete)
+    -  [Function `disable_ungated_transfer`](#@Specification_1_disable_ungated_transfer)
+    -  [Function `set_untransferable`](#@Specification_1_set_untransferable)
+    -  [Function `enable_ungated_transfer`](#@Specification_1_enable_ungated_transfer)
+    -  [Function `generate_linear_transfer_ref`](#@Specification_1_generate_linear_transfer_ref)
+    -  [Function `transfer_with_ref`](#@Specification_1_transfer_with_ref)
+    -  [Function `transfer_call`](#@Specification_1_transfer_call)
+    -  [Function `transfer`](#@Specification_1_transfer)
+    -  [Function `transfer_raw`](#@Specification_1_transfer_raw)
+    -  [Function `transfer_to_object`](#@Specification_1_transfer_to_object)
+    -  [Function `verify_ungated_and_descendant`](#@Specification_1_verify_ungated_and_descendant)
+    -  [Function `burn`](#@Specification_1_burn)
+    -  [Function `unburn`](#@Specification_1_unburn)
+    -  [Function `ungated_transfer_allowed`](#@Specification_1_ungated_transfer_allowed)
+    -  [Function `owner`](#@Specification_1_owner)
+    -  [Function `is_owner`](#@Specification_1_is_owner)
+    -  [Function `owns`](#@Specification_1_owns)
+    -  [Function `root_owner`](#@Specification_1_root_owner)
+
+
+<pre><code><b>use</b> <a href="account.md#0x1_account">0x1::account</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs">0x1::bcs</a>;
+<b>use</b> <a href="create_signer.md#0x1_create_signer">0x1::create_signer</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="event.md#0x1_event">0x1::event</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features">0x1::features</a>;
+<b>use</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs">0x1::from_bcs</a>;
+<b>use</b> <a href="guid.md#0x1_guid">0x1::guid</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/hash.md#0x1_hash">0x1::hash</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">0x1::signer</a>;
+<b>use</b> <a href="transaction_context.md#0x1_transaction_context">0x1::transaction_context</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">0x1::vector</a>;
+</code></pre>
+
+
+
+<a id="0x1_object_ObjectCore"></a>
+
+## Resource `ObjectCore`
+
+The core of the object model that defines ownership, transferability, and events.
+
+
+<pre><code>#[resource_group_member(#[group = <a href="object.md#0x1_object_ObjectGroup">0x1::object::ObjectGroup</a>])]
+<b>struct</b> <a href="object.md#0x1_object_ObjectCore">ObjectCore</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>guid_creation_num: u64</code>
+</dt>
+<dd>
+ Used by guid to guarantee globally unique objects and create event streams
+</dd>
+<dt>
+<code>owner: <b>address</b></code>
+</dt>
+<dd>
+ The address (object or account) that owns this object
+</dd>
+<dt>
+<code>allow_ungated_transfer: bool</code>
+</dt>
+<dd>
+ Object transferring is a common operation, this allows for disabling and enabling
+ transfers bypassing the use of a TransferRef.
+</dd>
+<dt>
+<code>transfer_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="object.md#0x1_object_TransferEvent">object::TransferEvent</a>&gt;</code>
+</dt>
+<dd>
+ Emitted events upon transferring of ownership.
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_object_TombStone"></a>
+
+## Resource `TombStone`
+
+This is added to objects that are burnt (ownership transferred to BURN_ADDRESS).
+
+
+<pre><code>#[resource_group_member(#[group = <a href="object.md#0x1_object_ObjectGroup">0x1::object::ObjectGroup</a>])]
+<b>struct</b> <a href="object.md#0x1_object_TombStone">TombStone</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>original_owner: <b>address</b></code>
+</dt>
+<dd>
+ Track the previous owner before the object is burnt so they can reclaim later if so desired.
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_object_Untransferable"></a>
+
+## Resource `Untransferable`
+
+The existence of this renders all <code><a href="object.md#0x1_object_TransferRef">TransferRef</a></code>s irrelevant. The object cannot be moved.
+
+
+<pre><code>#[resource_group_member(#[group = <a href="object.md#0x1_object_ObjectGroup">0x1::object::ObjectGroup</a>])]
+<b>struct</b> <a href="object.md#0x1_object_Untransferable">Untransferable</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>dummy_field: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_object_ObjectGroup"></a>
+
+## Struct `ObjectGroup`
+
+A shared resource group for storing object resources together in storage.
+
+
+<pre><code>#[resource_group(#[scope = <b>global</b>])]
+<b>struct</b> <a href="object.md#0x1_object_ObjectGroup">ObjectGroup</a>
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>dummy_field: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_object_Object"></a>
+
+## Struct `Object`
+
+A pointer to an object -- these can only provide guarantees based upon the underlying data
+type, that is the validity of T existing at an address is something that cannot be verified
+by any other module than the module that defined T. Similarly, the module that defines T
+can remove it from storage at any point in time.
+
+
+<pre><code><b>struct</b> <a href="object.md#0x1_object_Object">Object</a>&lt;T&gt; <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>inner: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_object_ConstructorRef"></a>
+
+## Struct `ConstructorRef`
+
+This is a one time ability given to the creator to configure the object as necessary
+
+
+<pre><code><b>struct</b> <a href="object.md#0x1_object_ConstructorRef">ConstructorRef</a> <b>has</b> drop
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>self: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>can_delete: bool</code>
+</dt>
+<dd>
+ True if the object can be deleted. Named objects are not deletable.
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_object_DeleteRef"></a>
+
+## Struct `DeleteRef`
+
+Used to remove an object from storage.
+
+
+<pre><code><b>struct</b> <a href="object.md#0x1_object_DeleteRef">DeleteRef</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>self: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_object_ExtendRef"></a>
+
+## Struct `ExtendRef`
+
+Used to create events or move additional resources into object storage.
+
+
+<pre><code><b>struct</b> <a href="object.md#0x1_object_ExtendRef">ExtendRef</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>self: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_object_TransferRef"></a>
+
+## Struct `TransferRef`
+
+Used to create LinearTransferRef, hence ownership transfer.
+
+
+<pre><code><b>struct</b> <a href="object.md#0x1_object_TransferRef">TransferRef</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>self: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_object_LinearTransferRef"></a>
+
+## Struct `LinearTransferRef`
+
+Used to perform transfers. This locks transferring ability to a single time use bound to
+the current owner.
+
+
+<pre><code><b>struct</b> <a href="object.md#0x1_object_LinearTransferRef">LinearTransferRef</a> <b>has</b> drop
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>self: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>owner: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_object_DeriveRef"></a>
+
+## Struct `DeriveRef`
+
+Used to create derived objects from a given objects.
+
+
+<pre><code><b>struct</b> <a href="object.md#0x1_object_DeriveRef">DeriveRef</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>self: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_object_TransferEvent"></a>
+
+## Struct `TransferEvent`
+
+Emitted whenever the object's owner field is changed.
+
+
+<pre><code><b>struct</b> <a href="object.md#0x1_object_TransferEvent">TransferEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code><a href="object.md#0x1_object">object</a>: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>from: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code><b>to</b>: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_object_Transfer"></a>
+
+## Struct `Transfer`
+
+Emitted whenever the object's owner field is changed.
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="object.md#0x1_object_Transfer">Transfer</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code><a href="object.md#0x1_object">object</a>: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>from: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code><b>to</b>: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_object_BURN_ADDRESS"></a>
+
+Address where unwanted objects can be forcefully transferred to.
+
+
+<pre><code><b>const</b> <a href="object.md#0x1_object_BURN_ADDRESS">BURN_ADDRESS</a>: <b>address</b> = 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff;
+</code></pre>
+
+
+
+<a id="0x1_object_DERIVE_AUID_ADDRESS_SCHEME"></a>
+
+generate_unique_address uses this for domain separation within its native implementation
+
+
+<pre><code><b>const</b> <a href="object.md#0x1_object_DERIVE_AUID_ADDRESS_SCHEME">DERIVE_AUID_ADDRESS_SCHEME</a>: u8 = 251;
+</code></pre>
+
+
+
+<a id="0x1_object_ECANNOT_DELETE"></a>
+
+The object does not allow for deletion
+
+
+<pre><code><b>const</b> <a href="object.md#0x1_object_ECANNOT_DELETE">ECANNOT_DELETE</a>: u64 = 5;
+</code></pre>
+
+
+
+<a id="0x1_object_EMAXIMUM_NESTING"></a>
+
+Exceeds maximum nesting for an object transfer.
+
+
+<pre><code><b>const</b> <a href="object.md#0x1_object_EMAXIMUM_NESTING">EMAXIMUM_NESTING</a>: u64 = 6;
+</code></pre>
+
+
+
+<a id="0x1_object_ENOT_OBJECT_OWNER"></a>
+
+The caller does not have ownership permissions
+
+
+<pre><code><b>const</b> <a href="object.md#0x1_object_ENOT_OBJECT_OWNER">ENOT_OBJECT_OWNER</a>: u64 = 4;
+</code></pre>
+
+
+
+<a id="0x1_object_ENO_UNGATED_TRANSFERS"></a>
+
+The object does not have ungated transfers enabled
+
+
+<pre><code><b>const</b> <a href="object.md#0x1_object_ENO_UNGATED_TRANSFERS">ENO_UNGATED_TRANSFERS</a>: u64 = 3;
+</code></pre>
+
+
+
+<a id="0x1_object_EOBJECT_DOES_NOT_EXIST"></a>
+
+An object does not exist at this address
+
+
+<pre><code><b>const</b> <a href="object.md#0x1_object_EOBJECT_DOES_NOT_EXIST">EOBJECT_DOES_NOT_EXIST</a>: u64 = 2;
+</code></pre>
+
+
+
+<a id="0x1_object_EOBJECT_EXISTS"></a>
+
+An object already exists at this address
+
+
+<pre><code><b>const</b> <a href="object.md#0x1_object_EOBJECT_EXISTS">EOBJECT_EXISTS</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_object_EOBJECT_NOT_BURNT"></a>
+
+Cannot reclaim objects that weren't burnt.
+
+
+<pre><code><b>const</b> <a href="object.md#0x1_object_EOBJECT_NOT_BURNT">EOBJECT_NOT_BURNT</a>: u64 = 8;
+</code></pre>
+
+
+
+<a id="0x1_object_EOBJECT_NOT_TRANSFERRABLE"></a>
+
+Object is untransferable any operations that might result in a transfer are disallowed.
+
+
+<pre><code><b>const</b> <a href="object.md#0x1_object_EOBJECT_NOT_TRANSFERRABLE">EOBJECT_NOT_TRANSFERRABLE</a>: u64 = 9;
+</code></pre>
+
+
+
+<a id="0x1_object_ERESOURCE_DOES_NOT_EXIST"></a>
+
+The resource is not stored at the specified address.
+
+
+<pre><code><b>const</b> <a href="object.md#0x1_object_ERESOURCE_DOES_NOT_EXIST">ERESOURCE_DOES_NOT_EXIST</a>: u64 = 7;
+</code></pre>
+
+
+
+<a id="0x1_object_INIT_GUID_CREATION_NUM"></a>
+
+Explicitly separate the GUID space between Object and Account to prevent accidental overlap.
+
+
+<pre><code><b>const</b> <a href="object.md#0x1_object_INIT_GUID_CREATION_NUM">INIT_GUID_CREATION_NUM</a>: u64 = 1125899906842624;
+</code></pre>
+
+
+
+<a id="0x1_object_MAXIMUM_OBJECT_NESTING"></a>
+
+Maximum nesting from one object to another. That is objects can technically have infinte
+nesting, but any checks such as transfer will only be evaluated this deep.
+
+
+<pre><code><b>const</b> <a href="object.md#0x1_object_MAXIMUM_OBJECT_NESTING">MAXIMUM_OBJECT_NESTING</a>: u8 = 8;
+</code></pre>
+
+
+
+<a id="0x1_object_OBJECT_DERIVED_SCHEME"></a>
+
+Scheme identifier used to generate an object's address <code>obj_addr</code> as derived from another object.
+The object's address is generated as:
+```
+obj_addr = sha3_256(account addr | derived from object's address | 0xFC)
+```
+
+This 0xFC constant serves as a domain separation tag to prevent existing authentication key and resource account
+derivation to produce an object address.
+
+
+<pre><code><b>const</b> <a href="object.md#0x1_object_OBJECT_DERIVED_SCHEME">OBJECT_DERIVED_SCHEME</a>: u8 = 252;
+</code></pre>
+
+
+
+<a id="0x1_object_OBJECT_FROM_GUID_ADDRESS_SCHEME"></a>
+
+Scheme identifier used to generate an object's address <code>obj_addr</code> via a fresh GUID generated by the creator at
+<code>source_addr</code>. The object's address is generated as:
+```
+obj_addr = sha3_256(guid | 0xFD)
+```
+where <code><a href="guid.md#0x1_guid">guid</a> = <a href="account.md#0x1_account_create_guid">account::create_guid</a>(<a href="create_signer.md#0x1_create_signer">create_signer</a>(source_addr))</code>
+
+This 0xFD constant serves as a domain separation tag to prevent existing authentication key and resource account
+derivation to produce an object address.
+
+
+<pre><code><b>const</b> <a href="object.md#0x1_object_OBJECT_FROM_GUID_ADDRESS_SCHEME">OBJECT_FROM_GUID_ADDRESS_SCHEME</a>: u8 = 253;
+</code></pre>
+
+
+
+<a id="0x1_object_OBJECT_FROM_SEED_ADDRESS_SCHEME"></a>
+
+Scheme identifier used to generate an object's address <code>obj_addr</code> from the creator's <code>source_addr</code> and a <code>seed</code> as:
+obj_addr = sha3_256(source_addr | seed | 0xFE).
+
+This 0xFE constant serves as a domain separation tag to prevent existing authentication key and resource account
+derivation to produce an object address.
+
+
+<pre><code><b>const</b> <a href="object.md#0x1_object_OBJECT_FROM_SEED_ADDRESS_SCHEME">OBJECT_FROM_SEED_ADDRESS_SCHEME</a>: u8 = 254;
+</code></pre>
+
+
+
+<a id="0x1_object_is_untransferable"></a>
+
+## Function `is_untransferable`
+
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="object.md#0x1_object_is_untransferable">is_untransferable</a>&lt;T: key&gt;(<a href="object.md#0x1_object">object</a>: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_is_untransferable">is_untransferable</a>&lt;T: key&gt;(<a href="object.md#0x1_object">object</a>: <a href="object.md#0x1_object_Object">Object</a>&lt;T&gt;): bool {
+    <b>exists</b>&lt;<a href="object.md#0x1_object_Untransferable">Untransferable</a>&gt;(<a href="object.md#0x1_object">object</a>.inner)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_object_is_burnt"></a>
+
+## Function `is_burnt`
+
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="object.md#0x1_object_is_burnt">is_burnt</a>&lt;T: key&gt;(<a href="object.md#0x1_object">object</a>: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_is_burnt">is_burnt</a>&lt;T: key&gt;(<a href="object.md#0x1_object">object</a>: <a href="object.md#0x1_object_Object">Object</a>&lt;T&gt;): bool {
+    <b>exists</b>&lt;<a href="object.md#0x1_object_TombStone">TombStone</a>&gt;(<a href="object.md#0x1_object">object</a>.inner)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_object_address_to_object"></a>
+
+## Function `address_to_object`
+
+Produces an ObjectId from the given address. This is not verified.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_address_to_object">address_to_object</a>&lt;T: key&gt;(<a href="object.md#0x1_object">object</a>: <b>address</b>): <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_address_to_object">address_to_object</a>&lt;T: key&gt;(<a href="object.md#0x1_object">object</a>: <b>address</b>): <a href="object.md#0x1_object_Object">Object</a>&lt;T&gt; {
+    <b>assert</b>!(<b>exists</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(<a href="object.md#0x1_object">object</a>), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="object.md#0x1_object_EOBJECT_DOES_NOT_EXIST">EOBJECT_DOES_NOT_EXIST</a>));
+    <b>assert</b>!(<a href="object.md#0x1_object_exists_at">exists_at</a>&lt;T&gt;(<a href="object.md#0x1_object">object</a>), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="object.md#0x1_object_ERESOURCE_DOES_NOT_EXIST">ERESOURCE_DOES_NOT_EXIST</a>));
+    <a href="object.md#0x1_object_Object">Object</a>&lt;T&gt; { inner: <a href="object.md#0x1_object">object</a> }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_object_is_object"></a>
+
+## Function `is_object`
+
+Returns true if there exists an object or the remnants of an object.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_is_object">is_object</a>(<a href="object.md#0x1_object">object</a>: <b>address</b>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_is_object">is_object</a>(<a href="object.md#0x1_object">object</a>: <b>address</b>): bool {
+    <b>exists</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(<a href="object.md#0x1_object">object</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_object_object_exists"></a>
+
+## Function `object_exists`
+
+Returns true if there exists an object with resource T.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_object_exists">object_exists</a>&lt;T: key&gt;(<a href="object.md#0x1_object">object</a>: <b>address</b>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_object_exists">object_exists</a>&lt;T: key&gt;(<a href="object.md#0x1_object">object</a>: <b>address</b>): bool {
+    <b>exists</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(<a href="object.md#0x1_object">object</a>) && <a href="object.md#0x1_object_exists_at">exists_at</a>&lt;T&gt;(<a href="object.md#0x1_object">object</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_object_create_object_address"></a>
+
+## Function `create_object_address`
+
+Derives an object address from source material: sha3_256([creator address | seed | 0xFE]).
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_create_object_address">create_object_address</a>(source: &<b>address</b>, seed: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_create_object_address">create_object_address</a>(source: &<b>address</b>, seed: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <b>address</b> {
+    <b>let</b> bytes = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs_to_bytes">bcs::to_bytes</a>(source);
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_append">vector::append</a>(&<b>mut</b> bytes, seed);
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_push_back">vector::push_back</a>(&<b>mut</b> bytes, <a href="object.md#0x1_object_OBJECT_FROM_SEED_ADDRESS_SCHEME">OBJECT_FROM_SEED_ADDRESS_SCHEME</a>);
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_to_address">from_bcs::to_address</a>(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/hash.md#0x1_hash_sha3_256">hash::sha3_256</a>(bytes))
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_object_create_user_derived_object_address_impl"></a>
+
+## Function `create_user_derived_object_address_impl`
+
+
+
+<pre><code><b>fun</b> <a href="object.md#0x1_object_create_user_derived_object_address_impl">create_user_derived_object_address_impl</a>(source: <b>address</b>, derive_from: <b>address</b>): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="object.md#0x1_object_create_user_derived_object_address_impl">create_user_derived_object_address_impl</a>(source: <b>address</b>, derive_from: <b>address</b>): <b>address</b>;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_object_create_user_derived_object_address"></a>
+
+## Function `create_user_derived_object_address`
+
+Derives an object address from the source address and an object: sha3_256([source | object addr | 0xFC]).
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_create_user_derived_object_address">create_user_derived_object_address</a>(source: <b>address</b>, derive_from: <b>address</b>): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_create_user_derived_object_address">create_user_derived_object_address</a>(source: <b>address</b>, derive_from: <b>address</b>): <b>address</b> {
+    <b>if</b> (std::features::object_native_derived_address_enabled()) {
+        <a href="object.md#0x1_object_create_user_derived_object_address_impl">create_user_derived_object_address_impl</a>(source, derive_from)
+    } <b>else</b> {
+        <b>let</b> bytes = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs_to_bytes">bcs::to_bytes</a>(&source);
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_append">vector::append</a>(&<b>mut</b> bytes, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs_to_bytes">bcs::to_bytes</a>(&derive_from));
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_push_back">vector::push_back</a>(&<b>mut</b> bytes, <a href="object.md#0x1_object_OBJECT_DERIVED_SCHEME">OBJECT_DERIVED_SCHEME</a>);
+        <a href="../../../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_to_address">from_bcs::to_address</a>(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/hash.md#0x1_hash_sha3_256">hash::sha3_256</a>(bytes))
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_object_create_guid_object_address"></a>
+
+## Function `create_guid_object_address`
+
+Derives an object from an Account GUID.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_create_guid_object_address">create_guid_object_address</a>(source: <b>address</b>, creation_num: u64): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_create_guid_object_address">create_guid_object_address</a>(source: <b>address</b>, creation_num: u64): <b>address</b> {
+    <b>let</b> id = <a href="guid.md#0x1_guid_create_id">guid::create_id</a>(source, creation_num);
+    <b>let</b> bytes = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs_to_bytes">bcs::to_bytes</a>(&id);
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_push_back">vector::push_back</a>(&<b>mut</b> bytes, <a href="object.md#0x1_object_OBJECT_FROM_GUID_ADDRESS_SCHEME">OBJECT_FROM_GUID_ADDRESS_SCHEME</a>);
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_to_address">from_bcs::to_address</a>(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/hash.md#0x1_hash_sha3_256">hash::sha3_256</a>(bytes))
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_object_exists_at"></a>
+
+## Function `exists_at`
+
+
+
+<pre><code><b>fun</b> <a href="object.md#0x1_object_exists_at">exists_at</a>&lt;T: key&gt;(<a href="object.md#0x1_object">object</a>: <b>address</b>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="object.md#0x1_object_exists_at">exists_at</a>&lt;T: key&gt;(<a href="object.md#0x1_object">object</a>: <b>address</b>): bool;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_object_object_address"></a>
+
+## Function `object_address`
+
+Returns the address of within an ObjectId.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_object_address">object_address</a>&lt;T: key&gt;(<a href="object.md#0x1_object">object</a>: &<a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_object_address">object_address</a>&lt;T: key&gt;(<a href="object.md#0x1_object">object</a>: &<a href="object.md#0x1_object_Object">Object</a>&lt;T&gt;): <b>address</b> {
+    <a href="object.md#0x1_object">object</a>.inner
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_object_convert"></a>
+
+## Function `convert`
+
+Convert Object<X> to Object<Y>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_convert">convert</a>&lt;X: key, Y: key&gt;(<a href="object.md#0x1_object">object</a>: <a href="object.md#0x1_object_Object">object::Object</a>&lt;X&gt;): <a href="object.md#0x1_object_Object">object::Object</a>&lt;Y&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_convert">convert</a>&lt;X: key, Y: key&gt;(<a href="object.md#0x1_object">object</a>: <a href="object.md#0x1_object_Object">Object</a>&lt;X&gt;): <a href="object.md#0x1_object_Object">Object</a>&lt;Y&gt; {
+    <a href="object.md#0x1_object_address_to_object">address_to_object</a>&lt;Y&gt;(<a href="object.md#0x1_object">object</a>.inner)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_object_create_named_object"></a>
+
+## Function `create_named_object`
+
+Create a new named object and return the ConstructorRef. Named objects can be queried globally
+by knowing the user generated seed used to create them. Named objects cannot be deleted.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_create_named_object">create_named_object</a>(creator: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, seed: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_create_named_object">create_named_object</a>(creator: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, seed: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="object.md#0x1_object_ConstructorRef">ConstructorRef</a> {
+    <b>let</b> creator_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(creator);
+    <b>let</b> obj_addr = <a href="object.md#0x1_object_create_object_address">create_object_address</a>(&creator_address, seed);
+    <a href="object.md#0x1_object_create_object_internal">create_object_internal</a>(creator_address, obj_addr, <b>false</b>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_object_create_user_derived_object"></a>
+
+## Function `create_user_derived_object`
+
+Create a new object whose address is derived based on the creator account address and another object.
+Derivde objects, similar to named objects, cannot be deleted.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="object.md#0x1_object_create_user_derived_object">create_user_derived_object</a>(creator_address: <b>address</b>, derive_ref: &<a href="object.md#0x1_object_DeriveRef">object::DeriveRef</a>): <a href="object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="object.md#0x1_object_create_user_derived_object">create_user_derived_object</a>(creator_address: <b>address</b>, derive_ref: &<a href="object.md#0x1_object_DeriveRef">DeriveRef</a>): <a href="object.md#0x1_object_ConstructorRef">ConstructorRef</a> {
+    <b>let</b> obj_addr = <a href="object.md#0x1_object_create_user_derived_object_address">create_user_derived_object_address</a>(creator_address, derive_ref.self);
+    <a href="object.md#0x1_object_create_object_internal">create_object_internal</a>(creator_address, obj_addr, <b>false</b>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_object_create_object"></a>
+
+## Function `create_object`
+
+Create a new object by generating a random unique address based on transaction hash.
+The unique address is computed sha3_256([transaction hash | auid counter | 0xFB]).
+The created object is deletable as we can guarantee the same unique address can
+never be regenerated with future txs.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_create_object">create_object</a>(owner_address: <b>address</b>): <a href="object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_create_object">create_object</a>(owner_address: <b>address</b>): <a href="object.md#0x1_object_ConstructorRef">ConstructorRef</a> {
+    <b>let</b> unique_address = <a href="transaction_context.md#0x1_transaction_context_generate_auid_address">transaction_context::generate_auid_address</a>();
+    <a href="object.md#0x1_object_create_object_internal">create_object_internal</a>(owner_address, unique_address, <b>true</b>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_object_create_sticky_object"></a>
+
+## Function `create_sticky_object`
+
+Same as <code>create_object</code> except the object to be created will be undeletable.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_create_sticky_object">create_sticky_object</a>(owner_address: <b>address</b>): <a href="object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_create_sticky_object">create_sticky_object</a>(owner_address: <b>address</b>): <a href="object.md#0x1_object_ConstructorRef">ConstructorRef</a> {
+    <b>let</b> unique_address = <a href="transaction_context.md#0x1_transaction_context_generate_auid_address">transaction_context::generate_auid_address</a>();
+    <a href="object.md#0x1_object_create_object_internal">create_object_internal</a>(owner_address, unique_address, <b>false</b>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_object_create_sticky_object_at_address"></a>
+
+## Function `create_sticky_object_at_address`
+
+Create a sticky object at a specific address. Only used by aptos_framework::coin.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="object.md#0x1_object_create_sticky_object_at_address">create_sticky_object_at_address</a>(owner_address: <b>address</b>, object_address: <b>address</b>): <a href="object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="object.md#0x1_object_create_sticky_object_at_address">create_sticky_object_at_address</a>(
+    owner_address: <b>address</b>,
+    object_address: <b>address</b>,
+): <a href="object.md#0x1_object_ConstructorRef">ConstructorRef</a> {
+    <a href="object.md#0x1_object_create_object_internal">create_object_internal</a>(owner_address, object_address, <b>false</b>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_object_create_object_from_account"></a>
+
+## Function `create_object_from_account`
+
+Use <code>create_object</code> instead.
+Create a new object from a GUID generated by an account.
+As the GUID creation internally increments a counter, two transactions that executes
+<code>create_object_from_account</code> function for the same creator run sequentially.
+Therefore, using <code>create_object</code> method for creating objects is preferrable as it
+doesn't have the same bottlenecks.
+
+
+<pre><code>#[deprecated]
+<b>public</b> <b>fun</b> <a href="object.md#0x1_object_create_object_from_account">create_object_from_account</a>(creator: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>): <a href="object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_create_object_from_account">create_object_from_account</a>(creator: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>): <a href="object.md#0x1_object_ConstructorRef">ConstructorRef</a> {
+    <b>let</b> <a href="guid.md#0x1_guid">guid</a> = <a href="account.md#0x1_account_create_guid">account::create_guid</a>(creator);
+    <a href="object.md#0x1_object_create_object_from_guid">create_object_from_guid</a>(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(creator), <a href="guid.md#0x1_guid">guid</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_object_create_object_from_object"></a>
+
+## Function `create_object_from_object`
+
+Use <code>create_object</code> instead.
+Create a new object from a GUID generated by an object.
+As the GUID creation internally increments a counter, two transactions that executes
+<code>create_object_from_object</code> function for the same creator run sequentially.
+Therefore, using <code>create_object</code> method for creating objects is preferrable as it
+doesn't have the same bottlenecks.
+
+
+<pre><code>#[deprecated]
+<b>public</b> <b>fun</b> <a href="object.md#0x1_object_create_object_from_object">create_object_from_object</a>(creator: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>): <a href="object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_create_object_from_object">create_object_from_object</a>(creator: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>): <a href="object.md#0x1_object_ConstructorRef">ConstructorRef</a> <b>acquires</b> <a href="object.md#0x1_object_ObjectCore">ObjectCore</a> {
+    <b>let</b> <a href="guid.md#0x1_guid">guid</a> = <a href="object.md#0x1_object_create_guid">create_guid</a>(creator);
+    <a href="object.md#0x1_object_create_object_from_guid">create_object_from_guid</a>(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(creator), <a href="guid.md#0x1_guid">guid</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_object_create_object_from_guid"></a>
+
+## Function `create_object_from_guid`
+
+
+
+<pre><code><b>fun</b> <a href="object.md#0x1_object_create_object_from_guid">create_object_from_guid</a>(creator_address: <b>address</b>, <a href="guid.md#0x1_guid">guid</a>: <a href="guid.md#0x1_guid_GUID">guid::GUID</a>): <a href="object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="object.md#0x1_object_create_object_from_guid">create_object_from_guid</a>(creator_address: <b>address</b>, <a href="guid.md#0x1_guid">guid</a>: <a href="guid.md#0x1_guid_GUID">guid::GUID</a>): <a href="object.md#0x1_object_ConstructorRef">ConstructorRef</a> {
+    <b>let</b> bytes = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs_to_bytes">bcs::to_bytes</a>(&<a href="guid.md#0x1_guid">guid</a>);
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_push_back">vector::push_back</a>(&<b>mut</b> bytes, <a href="object.md#0x1_object_OBJECT_FROM_GUID_ADDRESS_SCHEME">OBJECT_FROM_GUID_ADDRESS_SCHEME</a>);
+    <b>let</b> obj_addr = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_to_address">from_bcs::to_address</a>(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/hash.md#0x1_hash_sha3_256">hash::sha3_256</a>(bytes));
+    <a href="object.md#0x1_object_create_object_internal">create_object_internal</a>(creator_address, obj_addr, <b>true</b>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_object_create_object_internal"></a>
+
+## Function `create_object_internal`
+
+
+
+<pre><code><b>fun</b> <a href="object.md#0x1_object_create_object_internal">create_object_internal</a>(creator_address: <b>address</b>, <a href="object.md#0x1_object">object</a>: <b>address</b>, can_delete: bool): <a href="object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="object.md#0x1_object_create_object_internal">create_object_internal</a>(
+    creator_address: <b>address</b>,
+    <a href="object.md#0x1_object">object</a>: <b>address</b>,
+    can_delete: bool,
+): <a href="object.md#0x1_object_ConstructorRef">ConstructorRef</a> {
+    <b>assert</b>!(!<b>exists</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(<a href="object.md#0x1_object">object</a>), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_already_exists">error::already_exists</a>(<a href="object.md#0x1_object_EOBJECT_EXISTS">EOBJECT_EXISTS</a>));
+
+    <b>let</b> object_signer = <a href="create_signer.md#0x1_create_signer">create_signer</a>(<a href="object.md#0x1_object">object</a>);
+    <b>let</b> guid_creation_num = <a href="object.md#0x1_object_INIT_GUID_CREATION_NUM">INIT_GUID_CREATION_NUM</a>;
+    <b>let</b> transfer_events_guid = <a href="guid.md#0x1_guid_create">guid::create</a>(<a href="object.md#0x1_object">object</a>, &<b>mut</b> guid_creation_num);
+
+    <b>move_to</b>(
+        &object_signer,
+        <a href="object.md#0x1_object_ObjectCore">ObjectCore</a> {
+            guid_creation_num,
+            owner: creator_address,
+            allow_ungated_transfer: <b>true</b>,
+            transfer_events: <a href="event.md#0x1_event_new_event_handle">event::new_event_handle</a>(transfer_events_guid),
+        },
+    );
+    <a href="object.md#0x1_object_ConstructorRef">ConstructorRef</a> { self: <a href="object.md#0x1_object">object</a>, can_delete }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_object_generate_delete_ref"></a>
+
+## Function `generate_delete_ref`
+
+Generates the DeleteRef, which can be used to remove ObjectCore from global storage.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_generate_delete_ref">generate_delete_ref</a>(ref: &<a href="object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>): <a href="object.md#0x1_object_DeleteRef">object::DeleteRef</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_generate_delete_ref">generate_delete_ref</a>(ref: &<a href="object.md#0x1_object_ConstructorRef">ConstructorRef</a>): <a href="object.md#0x1_object_DeleteRef">DeleteRef</a> {
+    <b>assert</b>!(ref.can_delete, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="object.md#0x1_object_ECANNOT_DELETE">ECANNOT_DELETE</a>));
+    <a href="object.md#0x1_object_DeleteRef">DeleteRef</a> { self: ref.self }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_object_generate_extend_ref"></a>
+
+## Function `generate_extend_ref`
+
+Generates the ExtendRef, which can be used to add new events and resources to the object.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_generate_extend_ref">generate_extend_ref</a>(ref: &<a href="object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>): <a href="object.md#0x1_object_ExtendRef">object::ExtendRef</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_generate_extend_ref">generate_extend_ref</a>(ref: &<a href="object.md#0x1_object_ConstructorRef">ConstructorRef</a>): <a href="object.md#0x1_object_ExtendRef">ExtendRef</a> {
+    <a href="object.md#0x1_object_ExtendRef">ExtendRef</a> { self: ref.self }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_object_generate_transfer_ref"></a>
+
+## Function `generate_transfer_ref`
+
+Generates the TransferRef, which can be used to manage object transfers.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_generate_transfer_ref">generate_transfer_ref</a>(ref: &<a href="object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>): <a href="object.md#0x1_object_TransferRef">object::TransferRef</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_generate_transfer_ref">generate_transfer_ref</a>(ref: &<a href="object.md#0x1_object_ConstructorRef">ConstructorRef</a>): <a href="object.md#0x1_object_TransferRef">TransferRef</a> {
+    <b>assert</b>!(!<b>exists</b>&lt;<a href="object.md#0x1_object_Untransferable">Untransferable</a>&gt;(ref.self), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="object.md#0x1_object_EOBJECT_NOT_TRANSFERRABLE">EOBJECT_NOT_TRANSFERRABLE</a>));
+    <a href="object.md#0x1_object_TransferRef">TransferRef</a> { self: ref.self }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_object_generate_derive_ref"></a>
+
+## Function `generate_derive_ref`
+
+Generates the DeriveRef, which can be used to create determnistic derived objects from the current object.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_generate_derive_ref">generate_derive_ref</a>(ref: &<a href="object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>): <a href="object.md#0x1_object_DeriveRef">object::DeriveRef</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_generate_derive_ref">generate_derive_ref</a>(ref: &<a href="object.md#0x1_object_ConstructorRef">ConstructorRef</a>): <a href="object.md#0x1_object_DeriveRef">DeriveRef</a> {
+    <a href="object.md#0x1_object_DeriveRef">DeriveRef</a> { self: ref.self }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_object_generate_signer"></a>
+
+## Function `generate_signer`
+
+Create a signer for the ConstructorRef
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_generate_signer">generate_signer</a>(ref: &<a href="object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_generate_signer">generate_signer</a>(ref: &<a href="object.md#0x1_object_ConstructorRef">ConstructorRef</a>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a> {
+    <a href="create_signer.md#0x1_create_signer">create_signer</a>(ref.self)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_object_address_from_constructor_ref"></a>
+
+## Function `address_from_constructor_ref`
+
+Returns the address associated with the constructor
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_address_from_constructor_ref">address_from_constructor_ref</a>(ref: &<a href="object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_address_from_constructor_ref">address_from_constructor_ref</a>(ref: &<a href="object.md#0x1_object_ConstructorRef">ConstructorRef</a>): <b>address</b> {
+    ref.self
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_object_object_from_constructor_ref"></a>
+
+## Function `object_from_constructor_ref`
+
+Returns an Object<T> from within a ConstructorRef
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_object_from_constructor_ref">object_from_constructor_ref</a>&lt;T: key&gt;(ref: &<a href="object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>): <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_object_from_constructor_ref">object_from_constructor_ref</a>&lt;T: key&gt;(ref: &<a href="object.md#0x1_object_ConstructorRef">ConstructorRef</a>): <a href="object.md#0x1_object_Object">Object</a>&lt;T&gt; {
+    <a href="object.md#0x1_object_address_to_object">address_to_object</a>&lt;T&gt;(ref.self)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_object_can_generate_delete_ref"></a>
+
+## Function `can_generate_delete_ref`
+
+Returns whether or not the ConstructorRef can be used to create DeleteRef
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_can_generate_delete_ref">can_generate_delete_ref</a>(ref: &<a href="object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_can_generate_delete_ref">can_generate_delete_ref</a>(ref: &<a href="object.md#0x1_object_ConstructorRef">ConstructorRef</a>): bool {
+    ref.can_delete
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_object_create_guid"></a>
+
+## Function `create_guid`
+
+Create a guid for the object, typically used for events
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_create_guid">create_guid</a>(<a href="object.md#0x1_object">object</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>): <a href="guid.md#0x1_guid_GUID">guid::GUID</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_create_guid">create_guid</a>(<a href="object.md#0x1_object">object</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>): <a href="guid.md#0x1_guid_GUID">guid::GUID</a> <b>acquires</b> <a href="object.md#0x1_object_ObjectCore">ObjectCore</a> {
+    <b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="object.md#0x1_object">object</a>);
+    <b>let</b> object_data = <b>borrow_global_mut</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(addr);
+    <a href="guid.md#0x1_guid_create">guid::create</a>(addr, &<b>mut</b> object_data.guid_creation_num)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_object_new_event_handle"></a>
+
+## Function `new_event_handle`
+
+Generate a new event handle.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_new_event_handle">new_event_handle</a>&lt;T: drop, store&gt;(<a href="object.md#0x1_object">object</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>): <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;T&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_new_event_handle">new_event_handle</a>&lt;T: drop + store&gt;(
+    <a href="object.md#0x1_object">object</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+): <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;T&gt; <b>acquires</b> <a href="object.md#0x1_object_ObjectCore">ObjectCore</a> {
+    <a href="event.md#0x1_event_new_event_handle">event::new_event_handle</a>(<a href="object.md#0x1_object_create_guid">create_guid</a>(<a href="object.md#0x1_object">object</a>))
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_object_address_from_delete_ref"></a>
+
+## Function `address_from_delete_ref`
+
+Returns the address associated with the constructor
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_address_from_delete_ref">address_from_delete_ref</a>(ref: &<a href="object.md#0x1_object_DeleteRef">object::DeleteRef</a>): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_address_from_delete_ref">address_from_delete_ref</a>(ref: &<a href="object.md#0x1_object_DeleteRef">DeleteRef</a>): <b>address</b> {
+    ref.self
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_object_object_from_delete_ref"></a>
+
+## Function `object_from_delete_ref`
+
+Returns an Object<T> from within a DeleteRef.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_object_from_delete_ref">object_from_delete_ref</a>&lt;T: key&gt;(ref: &<a href="object.md#0x1_object_DeleteRef">object::DeleteRef</a>): <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_object_from_delete_ref">object_from_delete_ref</a>&lt;T: key&gt;(ref: &<a href="object.md#0x1_object_DeleteRef">DeleteRef</a>): <a href="object.md#0x1_object_Object">Object</a>&lt;T&gt; {
+    <a href="object.md#0x1_object_address_to_object">address_to_object</a>&lt;T&gt;(ref.self)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_object_delete"></a>
+
+## Function `delete`
+
+Removes from the specified Object from global storage.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_delete">delete</a>(ref: <a href="object.md#0x1_object_DeleteRef">object::DeleteRef</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_delete">delete</a>(ref: <a href="object.md#0x1_object_DeleteRef">DeleteRef</a>) <b>acquires</b> <a href="object.md#0x1_object_Untransferable">Untransferable</a>, <a href="object.md#0x1_object_ObjectCore">ObjectCore</a> {
+    <b>let</b> object_core = <b>move_from</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(ref.self);
+    <b>let</b> <a href="object.md#0x1_object_ObjectCore">ObjectCore</a> {
+        guid_creation_num: _,
+        owner: _,
+        allow_ungated_transfer: _,
+        transfer_events,
+    } = object_core;
+
+    <b>if</b> (<b>exists</b>&lt;<a href="object.md#0x1_object_Untransferable">Untransferable</a>&gt;(ref.self)) {
+      <b>let</b> <a href="object.md#0x1_object_Untransferable">Untransferable</a> {} = <b>move_from</b>&lt;<a href="object.md#0x1_object_Untransferable">Untransferable</a>&gt;(ref.self);
+    };
+
+    <a href="event.md#0x1_event_destroy_handle">event::destroy_handle</a>(transfer_events);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_object_generate_signer_for_extending"></a>
+
+## Function `generate_signer_for_extending`
+
+Create a signer for the ExtendRef
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_generate_signer_for_extending">generate_signer_for_extending</a>(ref: &<a href="object.md#0x1_object_ExtendRef">object::ExtendRef</a>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_generate_signer_for_extending">generate_signer_for_extending</a>(ref: &<a href="object.md#0x1_object_ExtendRef">ExtendRef</a>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a> {
+    <a href="create_signer.md#0x1_create_signer">create_signer</a>(ref.self)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_object_address_from_extend_ref"></a>
+
+## Function `address_from_extend_ref`
+
+Returns an address from within a ExtendRef.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_address_from_extend_ref">address_from_extend_ref</a>(ref: &<a href="object.md#0x1_object_ExtendRef">object::ExtendRef</a>): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_address_from_extend_ref">address_from_extend_ref</a>(ref: &<a href="object.md#0x1_object_ExtendRef">ExtendRef</a>): <b>address</b> {
+    ref.self
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_object_disable_ungated_transfer"></a>
+
+## Function `disable_ungated_transfer`
+
+Disable direct transfer, transfers can only be triggered via a TransferRef
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_disable_ungated_transfer">disable_ungated_transfer</a>(ref: &<a href="object.md#0x1_object_TransferRef">object::TransferRef</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_disable_ungated_transfer">disable_ungated_transfer</a>(ref: &<a href="object.md#0x1_object_TransferRef">TransferRef</a>) <b>acquires</b> <a href="object.md#0x1_object_ObjectCore">ObjectCore</a> {
+    <b>let</b> <a href="object.md#0x1_object">object</a> = <b>borrow_global_mut</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(ref.self);
+    <a href="object.md#0x1_object">object</a>.allow_ungated_transfer = <b>false</b>;
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_object_set_untransferable"></a>
+
+## Function `set_untransferable`
+
+Prevent moving of the object
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_set_untransferable">set_untransferable</a>(ref: &<a href="object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_set_untransferable">set_untransferable</a>(ref: &<a href="object.md#0x1_object_ConstructorRef">ConstructorRef</a>) <b>acquires</b> <a href="object.md#0x1_object_ObjectCore">ObjectCore</a> {
+    <b>let</b> <a href="object.md#0x1_object">object</a> = <b>borrow_global_mut</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(ref.self);
+    <a href="object.md#0x1_object">object</a>.allow_ungated_transfer = <b>false</b>;
+    <b>let</b> object_signer = <a href="object.md#0x1_object_generate_signer">generate_signer</a>(ref);
+    <b>move_to</b>(&object_signer, <a href="object.md#0x1_object_Untransferable">Untransferable</a> {});
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_object_enable_ungated_transfer"></a>
+
+## Function `enable_ungated_transfer`
+
+Enable direct transfer.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_enable_ungated_transfer">enable_ungated_transfer</a>(ref: &<a href="object.md#0x1_object_TransferRef">object::TransferRef</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_enable_ungated_transfer">enable_ungated_transfer</a>(ref: &<a href="object.md#0x1_object_TransferRef">TransferRef</a>) <b>acquires</b> <a href="object.md#0x1_object_ObjectCore">ObjectCore</a> {
+    <b>assert</b>!(!<b>exists</b>&lt;<a href="object.md#0x1_object_Untransferable">Untransferable</a>&gt;(ref.self), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="object.md#0x1_object_EOBJECT_NOT_TRANSFERRABLE">EOBJECT_NOT_TRANSFERRABLE</a>));
+    <b>let</b> <a href="object.md#0x1_object">object</a> = <b>borrow_global_mut</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(ref.self);
+    <a href="object.md#0x1_object">object</a>.allow_ungated_transfer = <b>true</b>;
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_object_generate_linear_transfer_ref"></a>
+
+## Function `generate_linear_transfer_ref`
+
+Create a LinearTransferRef for a one-time transfer. This requires that the owner at the
+time of generation is the owner at the time of transferring.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_generate_linear_transfer_ref">generate_linear_transfer_ref</a>(ref: &<a href="object.md#0x1_object_TransferRef">object::TransferRef</a>): <a href="object.md#0x1_object_LinearTransferRef">object::LinearTransferRef</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_generate_linear_transfer_ref">generate_linear_transfer_ref</a>(ref: &<a href="object.md#0x1_object_TransferRef">TransferRef</a>): <a href="object.md#0x1_object_LinearTransferRef">LinearTransferRef</a> <b>acquires</b> <a href="object.md#0x1_object_ObjectCore">ObjectCore</a> {
+    <b>assert</b>!(!<b>exists</b>&lt;<a href="object.md#0x1_object_Untransferable">Untransferable</a>&gt;(ref.self), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="object.md#0x1_object_EOBJECT_NOT_TRANSFERRABLE">EOBJECT_NOT_TRANSFERRABLE</a>));
+    <b>let</b> owner = <a href="object.md#0x1_object_owner">owner</a>(<a href="object.md#0x1_object_Object">Object</a>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt; { inner: ref.self });
+    <a href="object.md#0x1_object_LinearTransferRef">LinearTransferRef</a> {
+        self: ref.self,
+        owner,
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_object_transfer_with_ref"></a>
+
+## Function `transfer_with_ref`
+
+Transfer to the destination address using a LinearTransferRef.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_transfer_with_ref">transfer_with_ref</a>(ref: <a href="object.md#0x1_object_LinearTransferRef">object::LinearTransferRef</a>, <b>to</b>: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_transfer_with_ref">transfer_with_ref</a>(ref: <a href="object.md#0x1_object_LinearTransferRef">LinearTransferRef</a>, <b>to</b>: <b>address</b>) <b>acquires</b> <a href="object.md#0x1_object_ObjectCore">ObjectCore</a>, <a href="object.md#0x1_object_TombStone">TombStone</a> {
+    <b>assert</b>!(!<b>exists</b>&lt;<a href="object.md#0x1_object_Untransferable">Untransferable</a>&gt;(ref.self), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="object.md#0x1_object_EOBJECT_NOT_TRANSFERRABLE">EOBJECT_NOT_TRANSFERRABLE</a>));
+
+    // Undo soft burn <b>if</b> present <b>as</b> we don't want the original owner <b>to</b> be able <b>to</b> reclaim by calling unburn later.
+    <b>if</b> (<b>exists</b>&lt;<a href="object.md#0x1_object_TombStone">TombStone</a>&gt;(ref.self)) {
+        <b>let</b> <a href="object.md#0x1_object_TombStone">TombStone</a> { original_owner: _ } = <b>move_from</b>&lt;<a href="object.md#0x1_object_TombStone">TombStone</a>&gt;(ref.self);
+    };
+
+    <b>let</b> <a href="object.md#0x1_object">object</a> = <b>borrow_global_mut</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(ref.self);
+    <b>assert</b>!(
+        <a href="object.md#0x1_object">object</a>.owner == ref.owner,
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="object.md#0x1_object_ENOT_OBJECT_OWNER">ENOT_OBJECT_OWNER</a>),
+    );
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        <a href="event.md#0x1_event_emit">event::emit</a>(
+            <a href="object.md#0x1_object_Transfer">Transfer</a> {
+                <a href="object.md#0x1_object">object</a>: ref.self,
+                from: <a href="object.md#0x1_object">object</a>.owner,
+                <b>to</b>,
+            },
+        );
+    };
+    <a href="event.md#0x1_event_emit_event">event::emit_event</a>(
+        &<b>mut</b> <a href="object.md#0x1_object">object</a>.transfer_events,
+        <a href="object.md#0x1_object_TransferEvent">TransferEvent</a> {
+            <a href="object.md#0x1_object">object</a>: ref.self,
+            from: <a href="object.md#0x1_object">object</a>.owner,
+            <b>to</b>,
+        },
+    );
+    <a href="object.md#0x1_object">object</a>.owner = <b>to</b>;
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_object_transfer_call"></a>
+
+## Function `transfer_call`
+
+Entry function that can be used to transfer, if allow_ungated_transfer is set true.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="object.md#0x1_object_transfer_call">transfer_call</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="object.md#0x1_object">object</a>: <b>address</b>, <b>to</b>: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="object.md#0x1_object_transfer_call">transfer_call</a>(
+    owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    <a href="object.md#0x1_object">object</a>: <b>address</b>,
+    <b>to</b>: <b>address</b>,
+) <b>acquires</b> <a href="object.md#0x1_object_ObjectCore">ObjectCore</a> {
+    <a href="object.md#0x1_object_transfer_raw">transfer_raw</a>(owner, <a href="object.md#0x1_object">object</a>, <b>to</b>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_object_transfer"></a>
+
+## Function `transfer`
+
+Transfers ownership of the object (and all associated resources) at the specified address
+for Object<T> to the "to" address.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="object.md#0x1_object_transfer">transfer</a>&lt;T: key&gt;(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="object.md#0x1_object">object</a>: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, <b>to</b>: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="object.md#0x1_object_transfer">transfer</a>&lt;T: key&gt;(
+    owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    <a href="object.md#0x1_object">object</a>: <a href="object.md#0x1_object_Object">Object</a>&lt;T&gt;,
+    <b>to</b>: <b>address</b>,
+) <b>acquires</b> <a href="object.md#0x1_object_ObjectCore">ObjectCore</a> {
+    <a href="object.md#0x1_object_transfer_raw">transfer_raw</a>(owner, <a href="object.md#0x1_object">object</a>.inner, <b>to</b>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_object_transfer_raw"></a>
+
+## Function `transfer_raw`
+
+Attempts to transfer using addresses only. Transfers the given object if
+allow_ungated_transfer is set true. Note, that this allows the owner of a nested object to
+transfer that object, so long as allow_ungated_transfer is enabled at each stage in the
+hierarchy.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_transfer_raw">transfer_raw</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="object.md#0x1_object">object</a>: <b>address</b>, <b>to</b>: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_transfer_raw">transfer_raw</a>(
+    owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    <a href="object.md#0x1_object">object</a>: <b>address</b>,
+    <b>to</b>: <b>address</b>,
+) <b>acquires</b> <a href="object.md#0x1_object_ObjectCore">ObjectCore</a> {
+    <b>let</b> owner_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(owner);
+    <a href="object.md#0x1_object_verify_ungated_and_descendant">verify_ungated_and_descendant</a>(owner_address, <a href="object.md#0x1_object">object</a>);
+    <a href="object.md#0x1_object_transfer_raw_inner">transfer_raw_inner</a>(<a href="object.md#0x1_object">object</a>, <b>to</b>);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_object_transfer_raw_inner"></a>
+
+## Function `transfer_raw_inner`
+
+
+
+<pre><code><b>fun</b> <a href="object.md#0x1_object_transfer_raw_inner">transfer_raw_inner</a>(<a href="object.md#0x1_object">object</a>: <b>address</b>, <b>to</b>: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="object.md#0x1_object_transfer_raw_inner">transfer_raw_inner</a>(<a href="object.md#0x1_object">object</a>: <b>address</b>, <b>to</b>: <b>address</b>) <b>acquires</b> <a href="object.md#0x1_object_ObjectCore">ObjectCore</a> {
+    <b>let</b> object_core = <b>borrow_global_mut</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(<a href="object.md#0x1_object">object</a>);
+    <b>if</b> (object_core.owner != <b>to</b>) {
+        <b>if</b> (std::features::module_event_migration_enabled()) {
+            <a href="event.md#0x1_event_emit">event::emit</a>(
+                <a href="object.md#0x1_object_Transfer">Transfer</a> {
+                    <a href="object.md#0x1_object">object</a>,
+                    from: object_core.owner,
+                    <b>to</b>,
+                },
+            );
+        };
+        <a href="event.md#0x1_event_emit_event">event::emit_event</a>(
+            &<b>mut</b> object_core.transfer_events,
+            <a href="object.md#0x1_object_TransferEvent">TransferEvent</a> {
+                <a href="object.md#0x1_object">object</a>,
+                from: object_core.owner,
+                <b>to</b>,
+            },
+        );
+        object_core.owner = <b>to</b>;
+    };
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_object_transfer_to_object"></a>
+
+## Function `transfer_to_object`
+
+Transfer the given object to another object. See <code>transfer</code> for more information.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="object.md#0x1_object_transfer_to_object">transfer_to_object</a>&lt;O: key, T: key&gt;(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="object.md#0x1_object">object</a>: <a href="object.md#0x1_object_Object">object::Object</a>&lt;O&gt;, <b>to</b>: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="object.md#0x1_object_transfer_to_object">transfer_to_object</a>&lt;O: key, T: key&gt;(
+    owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    <a href="object.md#0x1_object">object</a>: <a href="object.md#0x1_object_Object">Object</a>&lt;O&gt;,
+    <b>to</b>: <a href="object.md#0x1_object_Object">Object</a>&lt;T&gt;,
+) <b>acquires</b> <a href="object.md#0x1_object_ObjectCore">ObjectCore</a> {
+    <a href="object.md#0x1_object_transfer">transfer</a>(owner, <a href="object.md#0x1_object">object</a>, <b>to</b>.inner)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_object_verify_ungated_and_descendant"></a>
+
+## Function `verify_ungated_and_descendant`
+
+This checks that the destination address is eventually owned by the owner and that each
+object between the two allows for ungated transfers. Note, this is limited to a depth of 8
+objects may have cyclic dependencies.
+
+
+<pre><code><b>fun</b> <a href="object.md#0x1_object_verify_ungated_and_descendant">verify_ungated_and_descendant</a>(owner: <b>address</b>, destination: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="object.md#0x1_object_verify_ungated_and_descendant">verify_ungated_and_descendant</a>(owner: <b>address</b>, destination: <b>address</b>) <b>acquires</b> <a href="object.md#0x1_object_ObjectCore">ObjectCore</a> {
+    <b>let</b> current_address = destination;
+    <b>assert</b>!(
+        <b>exists</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(current_address),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="object.md#0x1_object_EOBJECT_DOES_NOT_EXIST">EOBJECT_DOES_NOT_EXIST</a>),
+    );
+
+    <b>let</b> <a href="object.md#0x1_object">object</a> = <b>borrow_global</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(current_address);
+    <b>assert</b>!(
+        <a href="object.md#0x1_object">object</a>.allow_ungated_transfer,
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="object.md#0x1_object_ENO_UNGATED_TRANSFERS">ENO_UNGATED_TRANSFERS</a>),
+    );
+
+    <b>let</b> current_address = <a href="object.md#0x1_object">object</a>.owner;
+    <b>let</b> count = 0;
+    <b>while</b> (owner != current_address) {
+        count = count + 1;
+        <b>assert</b>!(count &lt; <a href="object.md#0x1_object_MAXIMUM_OBJECT_NESTING">MAXIMUM_OBJECT_NESTING</a>, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_out_of_range">error::out_of_range</a>(<a href="object.md#0x1_object_EMAXIMUM_NESTING">EMAXIMUM_NESTING</a>));
+        // At this point, the first <a href="object.md#0x1_object">object</a> <b>exists</b> and so the more likely case is that the
+        // <a href="object.md#0x1_object">object</a>'s owner is not an <a href="object.md#0x1_object">object</a>. So we <b>return</b> a more sensible <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">error</a>.
+        <b>assert</b>!(
+            <b>exists</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(current_address),
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="object.md#0x1_object_ENOT_OBJECT_OWNER">ENOT_OBJECT_OWNER</a>),
+        );
+        <b>let</b> <a href="object.md#0x1_object">object</a> = <b>borrow_global</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(current_address);
+        <b>assert</b>!(
+            <a href="object.md#0x1_object">object</a>.allow_ungated_transfer,
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="object.md#0x1_object_ENO_UNGATED_TRANSFERS">ENO_UNGATED_TRANSFERS</a>),
+        );
+        current_address = <a href="object.md#0x1_object">object</a>.owner;
+    };
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_object_burn"></a>
+
+## Function `burn`
+
+Forcefully transfer an unwanted object to BURN_ADDRESS, ignoring whether ungated_transfer is allowed.
+This only works for objects directly owned and for simplicity does not apply to indirectly owned objects.
+Original owners can reclaim burnt objects any time in the future by calling unburn.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="object.md#0x1_object_burn">burn</a>&lt;T: key&gt;(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="object.md#0x1_object">object</a>: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="object.md#0x1_object_burn">burn</a>&lt;T: key&gt;(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="object.md#0x1_object">object</a>: <a href="object.md#0x1_object_Object">Object</a>&lt;T&gt;) <b>acquires</b> <a href="object.md#0x1_object_ObjectCore">ObjectCore</a> {
+    <b>let</b> original_owner = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(owner);
+    <b>assert</b>!(<a href="object.md#0x1_object_is_owner">is_owner</a>(<a href="object.md#0x1_object">object</a>, original_owner), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="object.md#0x1_object_ENOT_OBJECT_OWNER">ENOT_OBJECT_OWNER</a>));
+    <b>let</b> object_addr = <a href="object.md#0x1_object">object</a>.inner;
+    <b>move_to</b>(&<a href="create_signer.md#0x1_create_signer">create_signer</a>(object_addr), <a href="object.md#0x1_object_TombStone">TombStone</a> { original_owner });
+    <a href="object.md#0x1_object_transfer_raw_inner">transfer_raw_inner</a>(object_addr, <a href="object.md#0x1_object_BURN_ADDRESS">BURN_ADDRESS</a>);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_object_unburn"></a>
+
+## Function `unburn`
+
+Allow origin owners to reclaim any objects they previous burnt.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="object.md#0x1_object_unburn">unburn</a>&lt;T: key&gt;(original_owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="object.md#0x1_object">object</a>: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="object.md#0x1_object_unburn">unburn</a>&lt;T: key&gt;(
+    original_owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    <a href="object.md#0x1_object">object</a>: <a href="object.md#0x1_object_Object">Object</a>&lt;T&gt;,
+) <b>acquires</b> <a href="object.md#0x1_object_TombStone">TombStone</a>, <a href="object.md#0x1_object_ObjectCore">ObjectCore</a> {
+    <b>let</b> object_addr = <a href="object.md#0x1_object">object</a>.inner;
+    <b>assert</b>!(<b>exists</b>&lt;<a href="object.md#0x1_object_TombStone">TombStone</a>&gt;(object_addr), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="object.md#0x1_object_EOBJECT_NOT_BURNT">EOBJECT_NOT_BURNT</a>));
+
+    <b>let</b> <a href="object.md#0x1_object_TombStone">TombStone</a> { original_owner: original_owner_addr } = <b>move_from</b>&lt;<a href="object.md#0x1_object_TombStone">TombStone</a>&gt;(object_addr);
+    <b>assert</b>!(original_owner_addr == <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(original_owner), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="object.md#0x1_object_ENOT_OBJECT_OWNER">ENOT_OBJECT_OWNER</a>));
+    <a href="object.md#0x1_object_transfer_raw_inner">transfer_raw_inner</a>(object_addr, original_owner_addr);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_object_ungated_transfer_allowed"></a>
+
+## Function `ungated_transfer_allowed`
+
+Accessors
+Return true if ungated transfer is allowed.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_ungated_transfer_allowed">ungated_transfer_allowed</a>&lt;T: key&gt;(<a href="object.md#0x1_object">object</a>: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_ungated_transfer_allowed">ungated_transfer_allowed</a>&lt;T: key&gt;(<a href="object.md#0x1_object">object</a>: <a href="object.md#0x1_object_Object">Object</a>&lt;T&gt;): bool <b>acquires</b> <a href="object.md#0x1_object_ObjectCore">ObjectCore</a> {
+    <b>assert</b>!(
+        <b>exists</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(<a href="object.md#0x1_object">object</a>.inner),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="object.md#0x1_object_EOBJECT_DOES_NOT_EXIST">EOBJECT_DOES_NOT_EXIST</a>),
+    );
+    <b>borrow_global</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(<a href="object.md#0x1_object">object</a>.inner).allow_ungated_transfer
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_object_owner"></a>
+
+## Function `owner`
+
+Return the current owner.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_owner">owner</a>&lt;T: key&gt;(<a href="object.md#0x1_object">object</a>: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_owner">owner</a>&lt;T: key&gt;(<a href="object.md#0x1_object">object</a>: <a href="object.md#0x1_object_Object">Object</a>&lt;T&gt;): <b>address</b> <b>acquires</b> <a href="object.md#0x1_object_ObjectCore">ObjectCore</a> {
+    <b>assert</b>!(
+        <b>exists</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(<a href="object.md#0x1_object">object</a>.inner),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="object.md#0x1_object_EOBJECT_DOES_NOT_EXIST">EOBJECT_DOES_NOT_EXIST</a>),
+    );
+    <b>borrow_global</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(<a href="object.md#0x1_object">object</a>.inner).owner
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_object_is_owner"></a>
+
+## Function `is_owner`
+
+Return true if the provided address is the current owner.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_is_owner">is_owner</a>&lt;T: key&gt;(<a href="object.md#0x1_object">object</a>: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, owner: <b>address</b>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_is_owner">is_owner</a>&lt;T: key&gt;(<a href="object.md#0x1_object">object</a>: <a href="object.md#0x1_object_Object">Object</a>&lt;T&gt;, owner: <b>address</b>): bool <b>acquires</b> <a href="object.md#0x1_object_ObjectCore">ObjectCore</a> {
+    <a href="object.md#0x1_object_owner">owner</a>(<a href="object.md#0x1_object">object</a>) == owner
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_object_owns"></a>
+
+## Function `owns`
+
+Return true if the provided address has indirect or direct ownership of the provided object.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_owns">owns</a>&lt;T: key&gt;(<a href="object.md#0x1_object">object</a>: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, owner: <b>address</b>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_owns">owns</a>&lt;T: key&gt;(<a href="object.md#0x1_object">object</a>: <a href="object.md#0x1_object_Object">Object</a>&lt;T&gt;, owner: <b>address</b>): bool <b>acquires</b> <a href="object.md#0x1_object_ObjectCore">ObjectCore</a> {
+    <b>let</b> current_address = <a href="object.md#0x1_object_object_address">object_address</a>(&<a href="object.md#0x1_object">object</a>);
+    <b>if</b> (current_address == owner) {
+        <b>return</b> <b>true</b>
+    };
+
+    <b>assert</b>!(
+        <b>exists</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(current_address),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="object.md#0x1_object_EOBJECT_DOES_NOT_EXIST">EOBJECT_DOES_NOT_EXIST</a>),
+    );
+
+    <b>let</b> <a href="object.md#0x1_object">object</a> = <b>borrow_global</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(current_address);
+    <b>let</b> current_address = <a href="object.md#0x1_object">object</a>.owner;
+
+    <b>let</b> count = 0;
+    <b>while</b> (owner != current_address) {
+        count = count + 1;
+        <b>assert</b>!(count &lt; <a href="object.md#0x1_object_MAXIMUM_OBJECT_NESTING">MAXIMUM_OBJECT_NESTING</a>, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_out_of_range">error::out_of_range</a>(<a href="object.md#0x1_object_EMAXIMUM_NESTING">EMAXIMUM_NESTING</a>));
+        <b>if</b> (!<b>exists</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(current_address)) {
+            <b>return</b> <b>false</b>
+        };
+
+        <b>let</b> <a href="object.md#0x1_object">object</a> = <b>borrow_global</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(current_address);
+        current_address = <a href="object.md#0x1_object">object</a>.owner;
+    };
+    <b>true</b>
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_object_root_owner"></a>
+
+## Function `root_owner`
+
+Returns the root owner of an object. As objects support nested ownership, it can be useful
+to determine the identity of the starting point of ownership.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_root_owner">root_owner</a>&lt;T: key&gt;(<a href="object.md#0x1_object">object</a>: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_root_owner">root_owner</a>&lt;T: key&gt;(<a href="object.md#0x1_object">object</a>: <a href="object.md#0x1_object_Object">Object</a>&lt;T&gt;): <b>address</b> <b>acquires</b> <a href="object.md#0x1_object_ObjectCore">ObjectCore</a> {
+    <b>let</b> obj_owner = <a href="object.md#0x1_object_owner">owner</a>(<a href="object.md#0x1_object">object</a>);
+    <b>while</b> (<a href="object.md#0x1_object_is_object">is_object</a>(obj_owner)) {
+        obj_owner = <a href="object.md#0x1_object_owner">owner</a>(<a href="object.md#0x1_object_address_to_object">address_to_object</a>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(obj_owner));
+    };
+    obj_owner
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+
+
+<a id="high-level-req"></a>
+
+### High-level Requirements
+
+<table>
+<tr>
+<th>No.</th><th>Requirement</th><th>Criticality</th><th>Implementation</th><th>Enforcement</th>
+</tr>
+
+<tr>
+<td>1</td>
+<td>It's not possible to create an object twice on the same address.</td>
+<td>Critical</td>
+<td>The create_object_internal function includes an assertion to ensure that the object being created does not already exist at the specified address.</td>
+<td>Formally verified via <a href="#high-level-req-1">create_object_internal</a>.</td>
+</tr>
+
+<tr>
+<td>2</td>
+<td>Only its owner may transfer an object.</td>
+<td>Critical</td>
+<td>The transfer function mandates that the transaction be signed by the owner's address, ensuring that only the rightful owner may initiate the object transfer.</td>
+<td>Audited that it aborts if anyone other than the owner attempts to transfer.</td>
+</tr>
+
+<tr>
+<td>3</td>
+<td>The indirect owner of an object may transfer the object.</td>
+<td>Medium</td>
+<td>The owns function evaluates to true when the given address possesses either direct or indirect ownership of the specified object.</td>
+<td>Audited that it aborts if address transferring is not indirect owner.</td>
+</tr>
+
+<tr>
+<td>4</td>
+<td>Objects may never change the address which houses them.</td>
+<td>Low</td>
+<td>After creating an object, transfers to another owner may occur. However, the address which stores the object may not be changed.</td>
+<td>This is implied by <a href="#high-level-req">high-level requirement 1</a>.</td>
+</tr>
+
+<tr>
+<td>5</td>
+<td>If an ungated transfer is disabled on an object in an indirect ownership chain, a transfer should not occur.</td>
+<td>Medium</td>
+<td>Calling disable_ungated_transfer disables direct transfer, and only TransferRef may trigger transfers. The transfer_with_ref function is called.</td>
+<td>Formally verified via <a href="#high-level-req-5">transfer_with_ref</a>.</td>
+</tr>
+
+<tr>
+<td>6</td>
+<td>Object addresses must not overlap with other addresses in different domains.</td>
+<td>Critical</td>
+<td>The current addressing scheme with suffixes does not conflict with any existing addresses, such as resource accounts. The GUID space is explicitly separated to ensure this doesn't happen.</td>
+<td>This is true by construction if one correctly ensures the usage of INIT_GUID_CREATION_NUM during the creation of GUID.</td>
+</tr>
+
+</table>
+
+
+
+
+<a id="module-level-spec"></a>
+
+### Module-level Specification
+
+
+<pre><code><b>pragma</b> aborts_if_is_strict;
+</code></pre>
+
+
+
+
+<a id="0x1_object_spec_exists_at"></a>
+
+
+<pre><code><b>fun</b> <a href="object.md#0x1_object_spec_exists_at">spec_exists_at</a>&lt;T: key&gt;(<a href="object.md#0x1_object">object</a>: <b>address</b>): bool;
+</code></pre>
+
+
+
+<a id="@Specification_1_address_to_object"></a>
+
+### Function `address_to_object`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_address_to_object">address_to_object</a>&lt;T: key&gt;(<a href="object.md#0x1_object">object</a>: <b>address</b>): <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(<a href="object.md#0x1_object">object</a>);
+<b>aborts_if</b> !<a href="object.md#0x1_object_spec_exists_at">spec_exists_at</a>&lt;T&gt;(<a href="object.md#0x1_object">object</a>);
+<b>ensures</b> result == <a href="object.md#0x1_object_Object">Object</a>&lt;T&gt; { inner: <a href="object.md#0x1_object">object</a> };
+</code></pre>
+
+
+
+<a id="@Specification_1_create_object_address"></a>
+
+### Function `create_object_address`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_create_object_address">create_object_address</a>(source: &<b>address</b>, seed: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <b>address</b>
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>pragma</b> aborts_if_is_strict = <b>false</b>;
+<b>aborts_if</b> [abstract] <b>false</b>;
+<b>ensures</b> [abstract] result == <a href="object.md#0x1_object_spec_create_object_address">spec_create_object_address</a>(source, seed);
+</code></pre>
+
+
+
+
+<a id="0x1_object_spec_create_user_derived_object_address_impl"></a>
+
+
+<pre><code><b>fun</b> <a href="object.md#0x1_object_spec_create_user_derived_object_address_impl">spec_create_user_derived_object_address_impl</a>(source: <b>address</b>, derive_from: <b>address</b>): <b>address</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_create_user_derived_object_address_impl"></a>
+
+### Function `create_user_derived_object_address_impl`
+
+
+<pre><code><b>fun</b> <a href="object.md#0x1_object_create_user_derived_object_address_impl">create_user_derived_object_address_impl</a>(source: <b>address</b>, derive_from: <b>address</b>): <b>address</b>
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>ensures</b> [abstract] result == <a href="object.md#0x1_object_spec_create_user_derived_object_address_impl">spec_create_user_derived_object_address_impl</a>(source, derive_from);
+</code></pre>
+
+
+
+<a id="@Specification_1_create_user_derived_object_address"></a>
+
+### Function `create_user_derived_object_address`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_create_user_derived_object_address">create_user_derived_object_address</a>(source: <b>address</b>, derive_from: <b>address</b>): <b>address</b>
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>pragma</b> aborts_if_is_strict = <b>false</b>;
+<b>aborts_if</b> [abstract] <b>false</b>;
+<b>ensures</b> [abstract] result == <a href="object.md#0x1_object_spec_create_user_derived_object_address">spec_create_user_derived_object_address</a>(source, derive_from);
+</code></pre>
+
+
+
+<a id="@Specification_1_create_guid_object_address"></a>
+
+### Function `create_guid_object_address`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_create_guid_object_address">create_guid_object_address</a>(source: <b>address</b>, creation_num: u64): <b>address</b>
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>pragma</b> aborts_if_is_strict = <b>false</b>;
+<b>aborts_if</b> [abstract] <b>false</b>;
+<b>ensures</b> [abstract] result == <a href="object.md#0x1_object_spec_create_guid_object_address">spec_create_guid_object_address</a>(source, creation_num);
+</code></pre>
+
+
+
+<a id="@Specification_1_exists_at"></a>
+
+### Function `exists_at`
+
+
+<pre><code><b>fun</b> <a href="object.md#0x1_object_exists_at">exists_at</a>&lt;T: key&gt;(<a href="object.md#0x1_object">object</a>: <b>address</b>): bool
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>ensures</b> [abstract] result == <a href="object.md#0x1_object_spec_exists_at">spec_exists_at</a>&lt;T&gt;(<a href="object.md#0x1_object">object</a>);
+</code></pre>
+
+
+
+<a id="@Specification_1_object_address"></a>
+
+### Function `object_address`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_object_address">object_address</a>&lt;T: key&gt;(<a href="object.md#0x1_object">object</a>: &<a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): <b>address</b>
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="object.md#0x1_object">object</a>.inner;
+</code></pre>
+
+
+
+<a id="@Specification_1_convert"></a>
+
+### Function `convert`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_convert">convert</a>&lt;X: key, Y: key&gt;(<a href="object.md#0x1_object">object</a>: <a href="object.md#0x1_object_Object">object::Object</a>&lt;X&gt;): <a href="object.md#0x1_object_Object">object::Object</a>&lt;Y&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(<a href="object.md#0x1_object">object</a>.inner);
+<b>aborts_if</b> !<a href="object.md#0x1_object_spec_exists_at">spec_exists_at</a>&lt;Y&gt;(<a href="object.md#0x1_object">object</a>.inner);
+<b>ensures</b> result == <a href="object.md#0x1_object_Object">Object</a>&lt;Y&gt; { inner: <a href="object.md#0x1_object">object</a>.inner };
+</code></pre>
+
+
+
+<a id="@Specification_1_create_named_object"></a>
+
+### Function `create_named_object`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_create_named_object">create_named_object</a>(creator: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, seed: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> creator_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(creator);
+<b>let</b> obj_addr = <a href="object.md#0x1_object_spec_create_object_address">spec_create_object_address</a>(creator_address, seed);
+<b>aborts_if</b> <b>exists</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(obj_addr);
+<b>ensures</b> <b>exists</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(obj_addr);
+<b>ensures</b> <b>global</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(obj_addr) == <a href="object.md#0x1_object_ObjectCore">ObjectCore</a> {
+    guid_creation_num: <a href="object.md#0x1_object_INIT_GUID_CREATION_NUM">INIT_GUID_CREATION_NUM</a> + 1,
+    owner: creator_address,
+    allow_ungated_transfer: <b>true</b>,
+    transfer_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a> {
+        counter: 0,
+        <a href="guid.md#0x1_guid">guid</a>: <a href="guid.md#0x1_guid_GUID">guid::GUID</a> {
+            id: <a href="guid.md#0x1_guid_ID">guid::ID</a> {
+                creation_num: <a href="object.md#0x1_object_INIT_GUID_CREATION_NUM">INIT_GUID_CREATION_NUM</a>,
+                addr: obj_addr,
+            }
+        }
+    }
+};
+<b>ensures</b> result == <a href="object.md#0x1_object_ConstructorRef">ConstructorRef</a> { self: obj_addr, can_delete: <b>false</b> };
+</code></pre>
+
+
+
+<a id="@Specification_1_create_user_derived_object"></a>
+
+### Function `create_user_derived_object`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="object.md#0x1_object_create_user_derived_object">create_user_derived_object</a>(creator_address: <b>address</b>, derive_ref: &<a href="object.md#0x1_object_DeriveRef">object::DeriveRef</a>): <a href="object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> obj_addr = <a href="object.md#0x1_object_spec_create_user_derived_object_address">spec_create_user_derived_object_address</a>(creator_address, derive_ref.self);
+<b>aborts_if</b> <b>exists</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(obj_addr);
+<b>ensures</b> <b>exists</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(obj_addr);
+<b>ensures</b> <b>global</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(obj_addr) == <a href="object.md#0x1_object_ObjectCore">ObjectCore</a> {
+    guid_creation_num: <a href="object.md#0x1_object_INIT_GUID_CREATION_NUM">INIT_GUID_CREATION_NUM</a> + 1,
+    owner: creator_address,
+    allow_ungated_transfer: <b>true</b>,
+    transfer_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a> {
+        counter: 0,
+        <a href="guid.md#0x1_guid">guid</a>: <a href="guid.md#0x1_guid_GUID">guid::GUID</a> {
+            id: <a href="guid.md#0x1_guid_ID">guid::ID</a> {
+                creation_num: <a href="object.md#0x1_object_INIT_GUID_CREATION_NUM">INIT_GUID_CREATION_NUM</a>,
+                addr: obj_addr,
+            }
+        }
+    }
+};
+<b>ensures</b> result == <a href="object.md#0x1_object_ConstructorRef">ConstructorRef</a> { self: obj_addr, can_delete: <b>false</b> };
+</code></pre>
+
+
+
+<a id="@Specification_1_create_object"></a>
+
+### Function `create_object`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_create_object">create_object</a>(owner_address: <b>address</b>): <a href="object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> aborts_if_is_partial;
+<b>let</b> unique_address = <a href="transaction_context.md#0x1_transaction_context_spec_generate_unique_address">transaction_context::spec_generate_unique_address</a>();
+<b>aborts_if</b> <b>exists</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(unique_address);
+<b>ensures</b> <b>exists</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(unique_address);
+<b>ensures</b> <b>global</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(unique_address) == <a href="object.md#0x1_object_ObjectCore">ObjectCore</a> {
+    guid_creation_num: <a href="object.md#0x1_object_INIT_GUID_CREATION_NUM">INIT_GUID_CREATION_NUM</a> + 1,
+    owner: owner_address,
+    allow_ungated_transfer: <b>true</b>,
+    transfer_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a> {
+        counter: 0,
+        <a href="guid.md#0x1_guid">guid</a>: <a href="guid.md#0x1_guid_GUID">guid::GUID</a> {
+            id: <a href="guid.md#0x1_guid_ID">guid::ID</a> {
+                creation_num: <a href="object.md#0x1_object_INIT_GUID_CREATION_NUM">INIT_GUID_CREATION_NUM</a>,
+                addr: unique_address,
+            }
+        }
+    }
+};
+<b>ensures</b> result == <a href="object.md#0x1_object_ConstructorRef">ConstructorRef</a> { self: unique_address, can_delete: <b>true</b> };
+</code></pre>
+
+
+
+<a id="@Specification_1_create_sticky_object"></a>
+
+### Function `create_sticky_object`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_create_sticky_object">create_sticky_object</a>(owner_address: <b>address</b>): <a href="object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> aborts_if_is_partial;
+<b>let</b> unique_address = <a href="transaction_context.md#0x1_transaction_context_spec_generate_unique_address">transaction_context::spec_generate_unique_address</a>();
+<b>aborts_if</b> <b>exists</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(unique_address);
+<b>ensures</b> <b>exists</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(unique_address);
+<b>ensures</b> <b>global</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(unique_address) == <a href="object.md#0x1_object_ObjectCore">ObjectCore</a> {
+    guid_creation_num: <a href="object.md#0x1_object_INIT_GUID_CREATION_NUM">INIT_GUID_CREATION_NUM</a> + 1,
+    owner: owner_address,
+    allow_ungated_transfer: <b>true</b>,
+    transfer_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a> {
+        counter: 0,
+        <a href="guid.md#0x1_guid">guid</a>: <a href="guid.md#0x1_guid_GUID">guid::GUID</a> {
+            id: <a href="guid.md#0x1_guid_ID">guid::ID</a> {
+                creation_num: <a href="object.md#0x1_object_INIT_GUID_CREATION_NUM">INIT_GUID_CREATION_NUM</a>,
+                addr: unique_address,
+            }
+        }
+    }
+};
+<b>ensures</b> result == <a href="object.md#0x1_object_ConstructorRef">ConstructorRef</a> { self: unique_address, can_delete: <b>false</b> };
+</code></pre>
+
+
+
+<a id="@Specification_1_create_sticky_object_at_address"></a>
+
+### Function `create_sticky_object_at_address`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="object.md#0x1_object_create_sticky_object_at_address">create_sticky_object_at_address</a>(owner_address: <b>address</b>, object_address: <b>address</b>): <a href="object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_create_object_from_account"></a>
+
+### Function `create_object_from_account`
+
+
+<pre><code>#[deprecated]
+<b>public</b> <b>fun</b> <a href="object.md#0x1_object_create_object_from_account">create_object_from_account</a>(creator: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>): <a href="object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(creator));
+<b>let</b> object_data = <b>global</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(creator));
+<b>aborts_if</b> object_data.guid_creation_num + 1 &gt; MAX_U64;
+<b>aborts_if</b> object_data.guid_creation_num + 1 &gt;= <a href="account.md#0x1_account_MAX_GUID_CREATION_NUM">account::MAX_GUID_CREATION_NUM</a>;
+<b>let</b> creation_num = object_data.guid_creation_num;
+<b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(creator);
+<b>let</b> <a href="guid.md#0x1_guid">guid</a> = <a href="guid.md#0x1_guid_GUID">guid::GUID</a> {
+    id: <a href="guid.md#0x1_guid_ID">guid::ID</a> {
+        creation_num,
+        addr,
+    }
+};
+<b>let</b> bytes_spec = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs_to_bytes">bcs::to_bytes</a>(<a href="guid.md#0x1_guid">guid</a>);
+<b>let</b> bytes = concat(bytes_spec, vec&lt;u8&gt;(<a href="object.md#0x1_object_OBJECT_FROM_GUID_ADDRESS_SCHEME">OBJECT_FROM_GUID_ADDRESS_SCHEME</a>));
+<b>let</b> hash_bytes = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/hash.md#0x1_hash_sha3_256">hash::sha3_256</a>(bytes);
+<b>let</b> obj_addr = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_deserialize">from_bcs::deserialize</a>&lt;<b>address</b>&gt;(hash_bytes);
+<b>aborts_if</b> <b>exists</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(obj_addr);
+<b>aborts_if</b> !<a href="../../../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_deserializable">from_bcs::deserializable</a>&lt;<b>address</b>&gt;(hash_bytes);
+<b>ensures</b> <b>global</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(addr).guid_creation_num == <b>old</b>(
+    <b>global</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(addr)
+).guid_creation_num + 1;
+<b>ensures</b> <b>exists</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(obj_addr);
+<b>ensures</b> <b>global</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(obj_addr) == <a href="object.md#0x1_object_ObjectCore">ObjectCore</a> {
+    guid_creation_num: <a href="object.md#0x1_object_INIT_GUID_CREATION_NUM">INIT_GUID_CREATION_NUM</a> + 1,
+    owner: addr,
+    allow_ungated_transfer: <b>true</b>,
+    transfer_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a> {
+        counter: 0,
+        <a href="guid.md#0x1_guid">guid</a>: <a href="guid.md#0x1_guid_GUID">guid::GUID</a> {
+            id: <a href="guid.md#0x1_guid_ID">guid::ID</a> {
+                creation_num: <a href="object.md#0x1_object_INIT_GUID_CREATION_NUM">INIT_GUID_CREATION_NUM</a>,
+                addr: obj_addr,
+            }
+        }
+    }
+};
+<b>ensures</b> result == <a href="object.md#0x1_object_ConstructorRef">ConstructorRef</a> { self: obj_addr, can_delete: <b>true</b> };
+</code></pre>
+
+
+
+<a id="@Specification_1_create_object_from_object"></a>
+
+### Function `create_object_from_object`
+
+
+<pre><code>#[deprecated]
+<b>public</b> <b>fun</b> <a href="object.md#0x1_object_create_object_from_object">create_object_from_object</a>(creator: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>): <a href="object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(creator));
+<b>let</b> object_data = <b>global</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(creator));
+<b>aborts_if</b> object_data.guid_creation_num + 1 &gt; MAX_U64;
+<b>let</b> creation_num = object_data.guid_creation_num;
+<b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(creator);
+<b>let</b> <a href="guid.md#0x1_guid">guid</a> = <a href="guid.md#0x1_guid_GUID">guid::GUID</a> {
+    id: <a href="guid.md#0x1_guid_ID">guid::ID</a> {
+        creation_num,
+        addr,
+    }
+};
+<b>let</b> bytes_spec = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs_to_bytes">bcs::to_bytes</a>(<a href="guid.md#0x1_guid">guid</a>);
+<b>let</b> bytes = concat(bytes_spec, vec&lt;u8&gt;(<a href="object.md#0x1_object_OBJECT_FROM_GUID_ADDRESS_SCHEME">OBJECT_FROM_GUID_ADDRESS_SCHEME</a>));
+<b>let</b> hash_bytes = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/hash.md#0x1_hash_sha3_256">hash::sha3_256</a>(bytes);
+<b>let</b> obj_addr = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_deserialize">from_bcs::deserialize</a>&lt;<b>address</b>&gt;(hash_bytes);
+<b>aborts_if</b> <b>exists</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(obj_addr);
+<b>aborts_if</b> !<a href="../../../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_deserializable">from_bcs::deserializable</a>&lt;<b>address</b>&gt;(hash_bytes);
+<b>ensures</b> <b>global</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(addr).guid_creation_num == <b>old</b>(<b>global</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(addr)).guid_creation_num + 1;
+<b>ensures</b> <b>exists</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(obj_addr);
+<b>ensures</b> <b>global</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(obj_addr) == <a href="object.md#0x1_object_ObjectCore">ObjectCore</a> {
+    guid_creation_num: <a href="object.md#0x1_object_INIT_GUID_CREATION_NUM">INIT_GUID_CREATION_NUM</a> + 1,
+    owner: addr,
+    allow_ungated_transfer: <b>true</b>,
+    transfer_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a> {
+        counter: 0,
+        <a href="guid.md#0x1_guid">guid</a>: <a href="guid.md#0x1_guid_GUID">guid::GUID</a> {
+            id: <a href="guid.md#0x1_guid_ID">guid::ID</a> {
+                creation_num: <a href="object.md#0x1_object_INIT_GUID_CREATION_NUM">INIT_GUID_CREATION_NUM</a>,
+                addr: obj_addr,
+            }
+        }
+    }
+};
+<b>ensures</b> result == <a href="object.md#0x1_object_ConstructorRef">ConstructorRef</a> { self: obj_addr, can_delete: <b>true</b> };
+</code></pre>
+
+
+
+<a id="@Specification_1_create_object_from_guid"></a>
+
+### Function `create_object_from_guid`
+
+
+<pre><code><b>fun</b> <a href="object.md#0x1_object_create_object_from_guid">create_object_from_guid</a>(creator_address: <b>address</b>, <a href="guid.md#0x1_guid">guid</a>: <a href="guid.md#0x1_guid_GUID">guid::GUID</a>): <a href="object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> bytes_spec = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs_to_bytes">bcs::to_bytes</a>(<a href="guid.md#0x1_guid">guid</a>);
+<b>let</b> bytes = concat(bytes_spec, vec&lt;u8&gt;(<a href="object.md#0x1_object_OBJECT_FROM_GUID_ADDRESS_SCHEME">OBJECT_FROM_GUID_ADDRESS_SCHEME</a>));
+<b>let</b> hash_bytes = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/hash.md#0x1_hash_sha3_256">hash::sha3_256</a>(bytes);
+<b>let</b> obj_addr = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_deserialize">from_bcs::deserialize</a>&lt;<b>address</b>&gt;(hash_bytes);
+<b>aborts_if</b> <b>exists</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(obj_addr);
+<b>aborts_if</b> !<a href="../../../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_deserializable">from_bcs::deserializable</a>&lt;<b>address</b>&gt;(hash_bytes);
+<b>ensures</b> <b>exists</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(obj_addr);
+<b>ensures</b> <b>global</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(obj_addr) == <a href="object.md#0x1_object_ObjectCore">ObjectCore</a> {
+    guid_creation_num: <a href="object.md#0x1_object_INIT_GUID_CREATION_NUM">INIT_GUID_CREATION_NUM</a> + 1,
+    owner: creator_address,
+    allow_ungated_transfer: <b>true</b>,
+    transfer_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a> {
+        counter: 0,
+        <a href="guid.md#0x1_guid">guid</a>: <a href="guid.md#0x1_guid_GUID">guid::GUID</a> {
+            id: <a href="guid.md#0x1_guid_ID">guid::ID</a> {
+                creation_num: <a href="object.md#0x1_object_INIT_GUID_CREATION_NUM">INIT_GUID_CREATION_NUM</a>,
+                addr: obj_addr,
+            }
+        }
+    }
+};
+<b>ensures</b> result == <a href="object.md#0x1_object_ConstructorRef">ConstructorRef</a> { self: obj_addr, can_delete: <b>true</b> };
+</code></pre>
+
+
+
+<a id="@Specification_1_create_object_internal"></a>
+
+### Function `create_object_internal`
+
+
+<pre><code><b>fun</b> <a href="object.md#0x1_object_create_object_internal">create_object_internal</a>(creator_address: <b>address</b>, <a href="object.md#0x1_object">object</a>: <b>address</b>, can_delete: bool): <a href="object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>
+</code></pre>
+
+
+
+
+<pre><code>// This enforces <a id="high-level-req-1" href="#high-level-req">high-level requirement 1</a>:
+<b>aborts_if</b> <b>exists</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(<a href="object.md#0x1_object">object</a>);
+<b>ensures</b> <b>exists</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(<a href="object.md#0x1_object">object</a>);
+<b>ensures</b> <b>global</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(<a href="object.md#0x1_object">object</a>).guid_creation_num == <a href="object.md#0x1_object_INIT_GUID_CREATION_NUM">INIT_GUID_CREATION_NUM</a> + 1;
+<b>ensures</b> result == <a href="object.md#0x1_object_ConstructorRef">ConstructorRef</a> { self: <a href="object.md#0x1_object">object</a>, can_delete };
+</code></pre>
+
+
+
+<a id="@Specification_1_generate_delete_ref"></a>
+
+### Function `generate_delete_ref`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_generate_delete_ref">generate_delete_ref</a>(ref: &<a href="object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>): <a href="object.md#0x1_object_DeleteRef">object::DeleteRef</a>
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !ref.can_delete;
+<b>ensures</b> result == <a href="object.md#0x1_object_DeleteRef">DeleteRef</a> { self: ref.self };
+</code></pre>
+
+
+
+<a id="@Specification_1_generate_transfer_ref"></a>
+
+### Function `generate_transfer_ref`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_generate_transfer_ref">generate_transfer_ref</a>(ref: &<a href="object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>): <a href="object.md#0x1_object_TransferRef">object::TransferRef</a>
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>exists</b>&lt;<a href="object.md#0x1_object_Untransferable">Untransferable</a>&gt;(ref.self);
+<b>ensures</b> result == <a href="object.md#0x1_object_TransferRef">TransferRef</a> {
+    self: ref.self,
+};
+</code></pre>
+
+
+
+<a id="@Specification_1_object_from_constructor_ref"></a>
+
+### Function `object_from_constructor_ref`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_object_from_constructor_ref">object_from_constructor_ref</a>&lt;T: key&gt;(ref: &<a href="object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>): <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(ref.self);
+<b>aborts_if</b> !<a href="object.md#0x1_object_spec_exists_at">spec_exists_at</a>&lt;T&gt;(ref.self);
+<b>ensures</b> result == <a href="object.md#0x1_object_Object">Object</a>&lt;T&gt; { inner: ref.self };
+</code></pre>
+
+
+
+<a id="@Specification_1_create_guid"></a>
+
+### Function `create_guid`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_create_guid">create_guid</a>(<a href="object.md#0x1_object">object</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>): <a href="guid.md#0x1_guid_GUID">guid::GUID</a>
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="object.md#0x1_object">object</a>));
+<b>let</b> object_data = <b>global</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="object.md#0x1_object">object</a>));
+<b>aborts_if</b> object_data.guid_creation_num + 1 &gt; MAX_U64;
+<b>ensures</b> result == <a href="guid.md#0x1_guid_GUID">guid::GUID</a> {
+    id: <a href="guid.md#0x1_guid_ID">guid::ID</a> {
+        creation_num: object_data.guid_creation_num,
+        addr: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="object.md#0x1_object">object</a>)
+    }
+};
+</code></pre>
+
+
+
+<a id="@Specification_1_new_event_handle"></a>
+
+### Function `new_event_handle`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_new_event_handle">new_event_handle</a>&lt;T: drop, store&gt;(<a href="object.md#0x1_object">object</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>): <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;T&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="object.md#0x1_object">object</a>));
+<b>let</b> object_data = <b>global</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="object.md#0x1_object">object</a>));
+<b>aborts_if</b> object_data.guid_creation_num + 1 &gt; MAX_U64;
+<b>let</b> <a href="guid.md#0x1_guid">guid</a> = <a href="guid.md#0x1_guid_GUID">guid::GUID</a> {
+    id: <a href="guid.md#0x1_guid_ID">guid::ID</a> {
+        creation_num: object_data.guid_creation_num,
+        addr: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="object.md#0x1_object">object</a>)
+    }
+};
+<b>ensures</b> result == <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;T&gt; {
+    counter: 0,
+    <a href="guid.md#0x1_guid">guid</a>,
+};
+</code></pre>
+
+
+
+<a id="@Specification_1_object_from_delete_ref"></a>
+
+### Function `object_from_delete_ref`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_object_from_delete_ref">object_from_delete_ref</a>&lt;T: key&gt;(ref: &<a href="object.md#0x1_object_DeleteRef">object::DeleteRef</a>): <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(ref.self);
+<b>aborts_if</b> !<a href="object.md#0x1_object_spec_exists_at">spec_exists_at</a>&lt;T&gt;(ref.self);
+<b>ensures</b> result == <a href="object.md#0x1_object_Object">Object</a>&lt;T&gt; { inner: ref.self };
+</code></pre>
+
+
+
+<a id="@Specification_1_delete"></a>
+
+### Function `delete`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_delete">delete</a>(ref: <a href="object.md#0x1_object_DeleteRef">object::DeleteRef</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(ref.self);
+<b>ensures</b> !<b>exists</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(ref.self);
+</code></pre>
+
+
+
+<a id="@Specification_1_disable_ungated_transfer"></a>
+
+### Function `disable_ungated_transfer`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_disable_ungated_transfer">disable_ungated_transfer</a>(ref: &<a href="object.md#0x1_object_TransferRef">object::TransferRef</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(ref.self);
+<b>ensures</b> <b>global</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(ref.self).allow_ungated_transfer == <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_set_untransferable"></a>
+
+### Function `set_untransferable`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_set_untransferable">set_untransferable</a>(ref: &<a href="object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(ref.self);
+<b>aborts_if</b> <b>exists</b>&lt;<a href="object.md#0x1_object_Untransferable">Untransferable</a>&gt;(ref.self);
+<b>ensures</b> <b>exists</b>&lt;<a href="object.md#0x1_object_Untransferable">Untransferable</a>&gt;(ref.self);
+<b>ensures</b> <b>global</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(ref.self).allow_ungated_transfer == <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_enable_ungated_transfer"></a>
+
+### Function `enable_ungated_transfer`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_enable_ungated_transfer">enable_ungated_transfer</a>(ref: &<a href="object.md#0x1_object_TransferRef">object::TransferRef</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>exists</b>&lt;<a href="object.md#0x1_object_Untransferable">Untransferable</a>&gt;(ref.self);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(ref.self);
+<b>ensures</b> <b>global</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(ref.self).allow_ungated_transfer == <b>true</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_generate_linear_transfer_ref"></a>
+
+### Function `generate_linear_transfer_ref`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_generate_linear_transfer_ref">generate_linear_transfer_ref</a>(ref: &<a href="object.md#0x1_object_TransferRef">object::TransferRef</a>): <a href="object.md#0x1_object_LinearTransferRef">object::LinearTransferRef</a>
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>exists</b>&lt;<a href="object.md#0x1_object_Untransferable">Untransferable</a>&gt;(ref.self);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(ref.self);
+<b>let</b> owner = <b>global</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(ref.self).owner;
+<b>ensures</b> result == <a href="object.md#0x1_object_LinearTransferRef">LinearTransferRef</a> {
+    self: ref.self,
+    owner,
+};
+</code></pre>
+
+
+
+<a id="@Specification_1_transfer_with_ref"></a>
+
+### Function `transfer_with_ref`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_transfer_with_ref">transfer_with_ref</a>(ref: <a href="object.md#0x1_object_LinearTransferRef">object::LinearTransferRef</a>, <b>to</b>: <b>address</b>)
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>exists</b>&lt;<a href="object.md#0x1_object_Untransferable">Untransferable</a>&gt;(ref.self);
+<b>let</b> <a href="object.md#0x1_object">object</a> = <b>global</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(ref.self);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(ref.self);
+// This enforces <a id="high-level-req-5" href="#high-level-req">high-level requirement 5</a>:
+<b>aborts_if</b> <a href="object.md#0x1_object">object</a>.owner != ref.owner;
+<b>ensures</b> <b>global</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(ref.self).owner == <b>to</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_transfer_call"></a>
+
+### Function `transfer_call`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="object.md#0x1_object_transfer_call">transfer_call</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="object.md#0x1_object">object</a>: <b>address</b>, <b>to</b>: <b>address</b>)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> aborts_if_is_partial;
+<b>let</b> owner_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(owner);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(<a href="object.md#0x1_object">object</a>);
+<b>aborts_if</b> !<b>global</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(<a href="object.md#0x1_object">object</a>).allow_ungated_transfer;
+</code></pre>
+
+
+
+<a id="@Specification_1_transfer"></a>
+
+### Function `transfer`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="object.md#0x1_object_transfer">transfer</a>&lt;T: key&gt;(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="object.md#0x1_object">object</a>: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, <b>to</b>: <b>address</b>)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> aborts_if_is_partial;
+<b>let</b> owner_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(owner);
+<b>let</b> object_address = <a href="object.md#0x1_object">object</a>.inner;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(object_address);
+<b>aborts_if</b> !<b>global</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(object_address).allow_ungated_transfer;
+</code></pre>
+
+
+
+<a id="@Specification_1_transfer_raw"></a>
+
+### Function `transfer_raw`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_transfer_raw">transfer_raw</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="object.md#0x1_object">object</a>: <b>address</b>, <b>to</b>: <b>address</b>)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> aborts_if_is_partial;
+<b>let</b> owner_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(owner);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(<a href="object.md#0x1_object">object</a>);
+<b>aborts_if</b> !<b>global</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(<a href="object.md#0x1_object">object</a>).allow_ungated_transfer;
+</code></pre>
+
+
+
+<a id="@Specification_1_transfer_to_object"></a>
+
+### Function `transfer_to_object`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="object.md#0x1_object_transfer_to_object">transfer_to_object</a>&lt;O: key, T: key&gt;(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="object.md#0x1_object">object</a>: <a href="object.md#0x1_object_Object">object::Object</a>&lt;O&gt;, <b>to</b>: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> aborts_if_is_partial;
+<b>let</b> owner_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(owner);
+<b>let</b> object_address = <a href="object.md#0x1_object">object</a>.inner;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(object_address);
+<b>aborts_if</b> !<b>global</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(object_address).allow_ungated_transfer;
+</code></pre>
+
+
+
+<a id="@Specification_1_verify_ungated_and_descendant"></a>
+
+### Function `verify_ungated_and_descendant`
+
+
+<pre><code><b>fun</b> <a href="object.md#0x1_object_verify_ungated_and_descendant">verify_ungated_and_descendant</a>(owner: <b>address</b>, destination: <b>address</b>)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> aborts_if_is_partial;
+<b>pragma</b> unroll = <a href="object.md#0x1_object_MAXIMUM_OBJECT_NESTING">MAXIMUM_OBJECT_NESTING</a>;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(destination);
+<b>aborts_if</b> !<b>global</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(destination).allow_ungated_transfer;
+</code></pre>
+
+
+
+<a id="@Specification_1_burn"></a>
+
+### Function `burn`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="object.md#0x1_object_burn">burn</a>&lt;T: key&gt;(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="object.md#0x1_object">object</a>: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> aborts_if_is_partial;
+<b>let</b> object_address = <a href="object.md#0x1_object">object</a>.inner;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(object_address);
+<b>aborts_if</b> <a href="object.md#0x1_object_owner">owner</a>(<a href="object.md#0x1_object">object</a>) != <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(owner);
+<b>aborts_if</b> <a href="object.md#0x1_object_is_burnt">is_burnt</a>(<a href="object.md#0x1_object">object</a>);
+</code></pre>
+
+
+
+<a id="@Specification_1_unburn"></a>
+
+### Function `unburn`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="object.md#0x1_object_unburn">unburn</a>&lt;T: key&gt;(original_owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="object.md#0x1_object">object</a>: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> aborts_if_is_partial;
+<b>let</b> object_address = <a href="object.md#0x1_object">object</a>.inner;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(object_address);
+<b>aborts_if</b> !<a href="object.md#0x1_object_is_burnt">is_burnt</a>(<a href="object.md#0x1_object">object</a>);
+<b>let</b> tomb_stone = <b>borrow_global</b>&lt;<a href="object.md#0x1_object_TombStone">TombStone</a>&gt;(object_address);
+<b>aborts_if</b> tomb_stone.original_owner != <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(original_owner);
+</code></pre>
+
+
+
+<a id="@Specification_1_ungated_transfer_allowed"></a>
+
+### Function `ungated_transfer_allowed`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_ungated_transfer_allowed">ungated_transfer_allowed</a>&lt;T: key&gt;(<a href="object.md#0x1_object">object</a>: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): bool
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(<a href="object.md#0x1_object">object</a>.inner);
+<b>ensures</b> result == <b>global</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(<a href="object.md#0x1_object">object</a>.inner).allow_ungated_transfer;
+</code></pre>
+
+
+
+<a id="@Specification_1_owner"></a>
+
+### Function `owner`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_owner">owner</a>&lt;T: key&gt;(<a href="object.md#0x1_object">object</a>: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): <b>address</b>
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(<a href="object.md#0x1_object">object</a>.inner);
+<b>ensures</b> result == <b>global</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(<a href="object.md#0x1_object">object</a>.inner).owner;
+</code></pre>
+
+
+
+<a id="@Specification_1_is_owner"></a>
+
+### Function `is_owner`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_is_owner">is_owner</a>&lt;T: key&gt;(<a href="object.md#0x1_object">object</a>: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, owner: <b>address</b>): bool
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(<a href="object.md#0x1_object">object</a>.inner);
+<b>ensures</b> result == (<b>global</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(<a href="object.md#0x1_object">object</a>.inner).owner == owner);
+</code></pre>
+
+
+
+<a id="@Specification_1_owns"></a>
+
+### Function `owns`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_owns">owns</a>&lt;T: key&gt;(<a href="object.md#0x1_object">object</a>: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, owner: <b>address</b>): bool
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> aborts_if_is_partial;
+<b>let</b> current_address_0 = <a href="object.md#0x1_object">object</a>.inner;
+<b>let</b> object_0 = <b>global</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(current_address_0);
+<b>let</b> current_address = object_0.owner;
+<b>aborts_if</b> <a href="object.md#0x1_object">object</a>.inner != owner && !<b>exists</b>&lt;<a href="object.md#0x1_object_ObjectCore">ObjectCore</a>&gt;(<a href="object.md#0x1_object">object</a>.inner);
+<b>ensures</b> current_address_0 == owner ==&gt; result == <b>true</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_root_owner"></a>
+
+### Function `root_owner`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="object.md#0x1_object_root_owner">root_owner</a>&lt;T: key&gt;(<a href="object.md#0x1_object">object</a>: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): <b>address</b>
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> aborts_if_is_partial;
+</code></pre>
+
+
+
+
+<a id="0x1_object_spec_create_object_address"></a>
+
+
+<pre><code><b>fun</b> <a href="object.md#0x1_object_spec_create_object_address">spec_create_object_address</a>(source: <b>address</b>, seed: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <b>address</b>;
+</code></pre>
+
+
+
+
+<a id="0x1_object_spec_create_user_derived_object_address"></a>
+
+
+<pre><code><b>fun</b> <a href="object.md#0x1_object_spec_create_user_derived_object_address">spec_create_user_derived_object_address</a>(source: <b>address</b>, derive_from: <b>address</b>): <b>address</b>;
+</code></pre>
+
+
+
+
+<a id="0x1_object_spec_create_guid_object_address"></a>
+
+
+<pre><code><b>fun</b> <a href="object.md#0x1_object_spec_create_guid_object_address">spec_create_guid_object_address</a>(source: <b>address</b>, creation_num: u64): <b>address</b>;
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/object_code_deployment.md b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/object_code_deployment.md
new file mode 100644
index 0000000000000..210d0a1e6b892
--- /dev/null
+++ b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/object_code_deployment.md
@@ -0,0 +1,373 @@
+
+<a id="0x1_object_code_deployment"></a>
+
+# Module `0x1::object_code_deployment`
+
+This module allows users to deploy, upgrade and freeze modules deployed to objects on-chain.
+This enables users to deploy modules to an object with a unique address each time they are published.
+This modules provides an alternative method to publish code on-chain, where code is deployed to objects rather than accounts.
+This is encouraged as it abstracts the necessary resources needed for deploying modules,
+along with the required authorization to upgrade and freeze modules.
+
+The functionalities of this module are as follows.
+
+Publishing modules flow:
+1. Create a new object with the address derived from the publisher address and the object seed.
+2. Publish the module passed in the function via <code>metadata_serialized</code> and <code><a href="code.md#0x1_code">code</a></code> to the newly created object.
+3. Emits 'Publish' event with the address of the newly created object.
+4. Create a <code><a href="object_code_deployment.md#0x1_object_code_deployment_ManagingRefs">ManagingRefs</a></code> which stores the extend ref of the newly created object.
+Note: This is needed to upgrade the code as the signer must be generated to upgrade the existing code in an object.
+
+Upgrading modules flow:
+1. Assert the <code>code_object</code> passed in the function is owned by the <code>publisher</code>.
+2. Assert the <code>code_object</code> passed in the function exists in global storage.
+2. Retrieve the <code>ExtendRef</code> from the <code>code_object</code> and generate the signer from this.
+3. Upgrade the module with the <code>metadata_serialized</code> and <code><a href="code.md#0x1_code">code</a></code> passed in the function.
+4. Emits 'Upgrade' event with the address of the object with the upgraded code.
+Note: If the modules were deployed as immutable when calling <code>publish</code>, the upgrade will fail.
+
+Freezing modules flow:
+1. Assert the <code>code_object</code> passed in the function exists in global storage.
+2. Assert the <code>code_object</code> passed in the function is owned by the <code>publisher</code>.
+3. Mark all the modules in the <code>code_object</code> as immutable.
+4. Emits 'Freeze' event with the address of the object with the frozen code.
+Note: There is no unfreeze function as this gives no benefit if the user can freeze/unfreeze modules at will.
+Once modules are marked as immutable, they cannot be made mutable again.
+
+
+-  [Resource `ManagingRefs`](#0x1_object_code_deployment_ManagingRefs)
+-  [Struct `Publish`](#0x1_object_code_deployment_Publish)
+-  [Struct `Upgrade`](#0x1_object_code_deployment_Upgrade)
+-  [Struct `Freeze`](#0x1_object_code_deployment_Freeze)
+-  [Constants](#@Constants_0)
+-  [Function `publish`](#0x1_object_code_deployment_publish)
+-  [Function `object_seed`](#0x1_object_code_deployment_object_seed)
+-  [Function `upgrade`](#0x1_object_code_deployment_upgrade)
+-  [Function `freeze_code_object`](#0x1_object_code_deployment_freeze_code_object)
+
+
+<pre><code><b>use</b> <a href="account.md#0x1_account">0x1::account</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs">0x1::bcs</a>;
+<b>use</b> <a href="code.md#0x1_code">0x1::code</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="event.md#0x1_event">0x1::event</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features">0x1::features</a>;
+<b>use</b> <a href="object.md#0x1_object">0x1::object</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">0x1::signer</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">0x1::vector</a>;
+</code></pre>
+
+
+
+<a id="0x1_object_code_deployment_ManagingRefs"></a>
+
+## Resource `ManagingRefs`
+
+Internal struct, attached to the object, that holds Refs we need to manage the code deployment (i.e. upgrades).
+
+
+<pre><code>#[resource_group_member(#[group = <a href="object.md#0x1_object_ObjectGroup">0x1::object::ObjectGroup</a>])]
+<b>struct</b> <a href="object_code_deployment.md#0x1_object_code_deployment_ManagingRefs">ManagingRefs</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>extend_ref: <a href="object.md#0x1_object_ExtendRef">object::ExtendRef</a></code>
+</dt>
+<dd>
+ We need to keep the extend ref to be able to generate the signer to upgrade existing code.
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_object_code_deployment_Publish"></a>
+
+## Struct `Publish`
+
+Event emitted when code is published to an object.
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="object_code_deployment.md#0x1_object_code_deployment_Publish">Publish</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>object_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_object_code_deployment_Upgrade"></a>
+
+## Struct `Upgrade`
+
+Event emitted when code in an existing object is upgraded.
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="object_code_deployment.md#0x1_object_code_deployment_Upgrade">Upgrade</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>object_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_object_code_deployment_Freeze"></a>
+
+## Struct `Freeze`
+
+Event emitted when code in an existing object is made immutable.
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="object_code_deployment.md#0x1_object_code_deployment_Freeze">Freeze</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>object_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_object_code_deployment_ECODE_OBJECT_DOES_NOT_EXIST"></a>
+
+<code>code_object</code> does not exist.
+
+
+<pre><code><b>const</b> <a href="object_code_deployment.md#0x1_object_code_deployment_ECODE_OBJECT_DOES_NOT_EXIST">ECODE_OBJECT_DOES_NOT_EXIST</a>: u64 = 3;
+</code></pre>
+
+
+
+<a id="0x1_object_code_deployment_ENOT_CODE_OBJECT_OWNER"></a>
+
+Not the owner of the <code>code_object</code>
+
+
+<pre><code><b>const</b> <a href="object_code_deployment.md#0x1_object_code_deployment_ENOT_CODE_OBJECT_OWNER">ENOT_CODE_OBJECT_OWNER</a>: u64 = 2;
+</code></pre>
+
+
+
+<a id="0x1_object_code_deployment_EOBJECT_CODE_DEPLOYMENT_NOT_SUPPORTED"></a>
+
+Object code deployment feature not supported.
+
+
+<pre><code><b>const</b> <a href="object_code_deployment.md#0x1_object_code_deployment_EOBJECT_CODE_DEPLOYMENT_NOT_SUPPORTED">EOBJECT_CODE_DEPLOYMENT_NOT_SUPPORTED</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_object_code_deployment_OBJECT_CODE_DEPLOYMENT_DOMAIN_SEPARATOR"></a>
+
+
+
+<pre><code><b>const</b> <a href="object_code_deployment.md#0x1_object_code_deployment_OBJECT_CODE_DEPLOYMENT_DOMAIN_SEPARATOR">OBJECT_CODE_DEPLOYMENT_DOMAIN_SEPARATOR</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; = [97, 112, 116, 111, 115, 95, 102, 114, 97, 109, 101, 119, 111, 114, 107, 58, 58, 111, 98, 106, 101, 99, 116, 95, 99, 111, 100, 101, 95, 100, 101, 112, 108, 111, 121, 109, 101, 110, 116];
+</code></pre>
+
+
+
+<a id="0x1_object_code_deployment_publish"></a>
+
+## Function `publish`
+
+Creates a new object with a unique address derived from the publisher address and the object seed.
+Publishes the code passed in the function to the newly created object.
+The caller must provide package metadata describing the package via <code>metadata_serialized</code> and
+the code to be published via <code><a href="code.md#0x1_code">code</a></code>. This contains a vector of modules to be deployed on-chain.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="object_code_deployment.md#0x1_object_code_deployment_publish">publish</a>(publisher: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, metadata_serialized: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, <a href="code.md#0x1_code">code</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="object_code_deployment.md#0x1_object_code_deployment_publish">publish</a>(
+    publisher: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    metadata_serialized: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    <a href="code.md#0x1_code">code</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;,
+) {
+    <b>assert</b>!(
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_is_object_code_deployment_enabled">features::is_object_code_deployment_enabled</a>(),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_unavailable">error::unavailable</a>(<a href="object_code_deployment.md#0x1_object_code_deployment_EOBJECT_CODE_DEPLOYMENT_NOT_SUPPORTED">EOBJECT_CODE_DEPLOYMENT_NOT_SUPPORTED</a>),
+    );
+
+    <b>let</b> publisher_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(publisher);
+    <b>let</b> object_seed = <a href="object_code_deployment.md#0x1_object_code_deployment_object_seed">object_seed</a>(publisher_address);
+    <b>let</b> constructor_ref = &<a href="object.md#0x1_object_create_named_object">object::create_named_object</a>(publisher, object_seed);
+    <b>let</b> code_signer = &<a href="object.md#0x1_object_generate_signer">object::generate_signer</a>(constructor_ref);
+    <a href="code.md#0x1_code_publish_package_txn">code::publish_package_txn</a>(code_signer, metadata_serialized, <a href="code.md#0x1_code">code</a>);
+
+    <a href="event.md#0x1_event_emit">event::emit</a>(<a href="object_code_deployment.md#0x1_object_code_deployment_Publish">Publish</a> { object_address: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(code_signer), });
+
+    <b>move_to</b>(code_signer, <a href="object_code_deployment.md#0x1_object_code_deployment_ManagingRefs">ManagingRefs</a> {
+        extend_ref: <a href="object.md#0x1_object_generate_extend_ref">object::generate_extend_ref</a>(constructor_ref),
+    });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_object_code_deployment_object_seed"></a>
+
+## Function `object_seed`
+
+
+
+<pre><code><b>fun</b> <a href="object_code_deployment.md#0x1_object_code_deployment_object_seed">object_seed</a>(publisher: <b>address</b>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="object_code_deployment.md#0x1_object_code_deployment_object_seed">object_seed</a>(publisher: <b>address</b>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; {
+    <b>let</b> sequence_number = <a href="account.md#0x1_account_get_sequence_number">account::get_sequence_number</a>(publisher) + 1;
+    <b>let</b> seeds = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>[];
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_append">vector::append</a>(&<b>mut</b> seeds, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs_to_bytes">bcs::to_bytes</a>(&<a href="object_code_deployment.md#0x1_object_code_deployment_OBJECT_CODE_DEPLOYMENT_DOMAIN_SEPARATOR">OBJECT_CODE_DEPLOYMENT_DOMAIN_SEPARATOR</a>));
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_append">vector::append</a>(&<b>mut</b> seeds, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs_to_bytes">bcs::to_bytes</a>(&sequence_number));
+    seeds
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_object_code_deployment_upgrade"></a>
+
+## Function `upgrade`
+
+Upgrades the existing modules at the <code>code_object</code> address with the new modules passed in <code><a href="code.md#0x1_code">code</a></code>,
+along with the metadata <code>metadata_serialized</code>.
+Note: If the modules were deployed as immutable when calling <code>publish</code>, the upgrade will fail.
+Requires the publisher to be the owner of the <code>code_object</code>.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="object_code_deployment.md#0x1_object_code_deployment_upgrade">upgrade</a>(publisher: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, metadata_serialized: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, <a href="code.md#0x1_code">code</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;, code_object: <a href="object.md#0x1_object_Object">object::Object</a>&lt;<a href="code.md#0x1_code_PackageRegistry">code::PackageRegistry</a>&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="object_code_deployment.md#0x1_object_code_deployment_upgrade">upgrade</a>(
+    publisher: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    metadata_serialized: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    <a href="code.md#0x1_code">code</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;,
+    code_object: Object&lt;PackageRegistry&gt;,
+) <b>acquires</b> <a href="object_code_deployment.md#0x1_object_code_deployment_ManagingRefs">ManagingRefs</a> {
+    <b>let</b> publisher_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(publisher);
+    <b>assert</b>!(
+        <a href="object.md#0x1_object_is_owner">object::is_owner</a>(code_object, publisher_address),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="object_code_deployment.md#0x1_object_code_deployment_ENOT_CODE_OBJECT_OWNER">ENOT_CODE_OBJECT_OWNER</a>),
+    );
+
+    <b>let</b> code_object_address = <a href="object.md#0x1_object_object_address">object::object_address</a>(&code_object);
+    <b>assert</b>!(<b>exists</b>&lt;<a href="object_code_deployment.md#0x1_object_code_deployment_ManagingRefs">ManagingRefs</a>&gt;(code_object_address), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="object_code_deployment.md#0x1_object_code_deployment_ECODE_OBJECT_DOES_NOT_EXIST">ECODE_OBJECT_DOES_NOT_EXIST</a>));
+
+    <b>let</b> extend_ref = &<b>borrow_global</b>&lt;<a href="object_code_deployment.md#0x1_object_code_deployment_ManagingRefs">ManagingRefs</a>&gt;(code_object_address).extend_ref;
+    <b>let</b> code_signer = &<a href="object.md#0x1_object_generate_signer_for_extending">object::generate_signer_for_extending</a>(extend_ref);
+    <a href="code.md#0x1_code_publish_package_txn">code::publish_package_txn</a>(code_signer, metadata_serialized, <a href="code.md#0x1_code">code</a>);
+
+    <a href="event.md#0x1_event_emit">event::emit</a>(<a href="object_code_deployment.md#0x1_object_code_deployment_Upgrade">Upgrade</a> { object_address: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(code_signer), });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_object_code_deployment_freeze_code_object"></a>
+
+## Function `freeze_code_object`
+
+Make an existing upgradable package immutable. Once this is called, the package cannot be made upgradable again.
+Each <code>code_object</code> should only have one package, as one package is deployed per object in this module.
+Requires the <code>publisher</code> to be the owner of the <code>code_object</code>.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="object_code_deployment.md#0x1_object_code_deployment_freeze_code_object">freeze_code_object</a>(publisher: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, code_object: <a href="object.md#0x1_object_Object">object::Object</a>&lt;<a href="code.md#0x1_code_PackageRegistry">code::PackageRegistry</a>&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="object_code_deployment.md#0x1_object_code_deployment_freeze_code_object">freeze_code_object</a>(publisher: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, code_object: Object&lt;PackageRegistry&gt;) {
+    <a href="code.md#0x1_code_freeze_code_object">code::freeze_code_object</a>(publisher, code_object);
+
+    <a href="event.md#0x1_event_emit">event::emit</a>(<a href="object_code_deployment.md#0x1_object_code_deployment_Freeze">Freeze</a> { object_address: <a href="object.md#0x1_object_object_address">object::object_address</a>(&code_object), });
+}
+</code></pre>
+
+
+
+</details>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/optional_aggregator.md b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/optional_aggregator.md
new file mode 100644
index 0000000000000..cd2d4ad5bfb7a
--- /dev/null
+++ b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/optional_aggregator.md
@@ -0,0 +1,1158 @@
+
+<a id="0x1_optional_aggregator"></a>
+
+# Module `0x1::optional_aggregator`
+
+This module provides an interface to aggregate integers either via
+aggregator (parallelizable) or via normal integers.
+
+
+-  [Struct `Integer`](#0x1_optional_aggregator_Integer)
+-  [Struct `OptionalAggregator`](#0x1_optional_aggregator_OptionalAggregator)
+-  [Constants](#@Constants_0)
+-  [Function `new_integer`](#0x1_optional_aggregator_new_integer)
+-  [Function `add_integer`](#0x1_optional_aggregator_add_integer)
+-  [Function `sub_integer`](#0x1_optional_aggregator_sub_integer)
+-  [Function `limit`](#0x1_optional_aggregator_limit)
+-  [Function `read_integer`](#0x1_optional_aggregator_read_integer)
+-  [Function `destroy_integer`](#0x1_optional_aggregator_destroy_integer)
+-  [Function `new`](#0x1_optional_aggregator_new)
+-  [Function `switch`](#0x1_optional_aggregator_switch)
+-  [Function `switch_and_zero_out`](#0x1_optional_aggregator_switch_and_zero_out)
+-  [Function `switch_to_integer_and_zero_out`](#0x1_optional_aggregator_switch_to_integer_and_zero_out)
+-  [Function `switch_to_aggregator_and_zero_out`](#0x1_optional_aggregator_switch_to_aggregator_and_zero_out)
+-  [Function `destroy`](#0x1_optional_aggregator_destroy)
+-  [Function `destroy_optional_aggregator`](#0x1_optional_aggregator_destroy_optional_aggregator)
+-  [Function `destroy_optional_integer`](#0x1_optional_aggregator_destroy_optional_integer)
+-  [Function `add`](#0x1_optional_aggregator_add)
+-  [Function `sub`](#0x1_optional_aggregator_sub)
+-  [Function `read`](#0x1_optional_aggregator_read)
+-  [Function `is_parallelizable`](#0x1_optional_aggregator_is_parallelizable)
+-  [Specification](#@Specification_1)
+    -  [High-level Requirements](#high-level-req)
+    -  [Module-level Specification](#module-level-spec)
+    -  [Struct `OptionalAggregator`](#@Specification_1_OptionalAggregator)
+    -  [Function `new_integer`](#@Specification_1_new_integer)
+    -  [Function `add_integer`](#@Specification_1_add_integer)
+    -  [Function `sub_integer`](#@Specification_1_sub_integer)
+    -  [Function `limit`](#@Specification_1_limit)
+    -  [Function `read_integer`](#@Specification_1_read_integer)
+    -  [Function `destroy_integer`](#@Specification_1_destroy_integer)
+    -  [Function `new`](#@Specification_1_new)
+    -  [Function `switch`](#@Specification_1_switch)
+    -  [Function `switch_and_zero_out`](#@Specification_1_switch_and_zero_out)
+    -  [Function `switch_to_integer_and_zero_out`](#@Specification_1_switch_to_integer_and_zero_out)
+    -  [Function `switch_to_aggregator_and_zero_out`](#@Specification_1_switch_to_aggregator_and_zero_out)
+    -  [Function `destroy`](#@Specification_1_destroy)
+    -  [Function `destroy_optional_aggregator`](#@Specification_1_destroy_optional_aggregator)
+    -  [Function `destroy_optional_integer`](#@Specification_1_destroy_optional_integer)
+    -  [Function `add`](#@Specification_1_add)
+    -  [Function `sub`](#@Specification_1_sub)
+    -  [Function `read`](#@Specification_1_read)
+
+
+<pre><code><b>use</b> <a href="aggregator.md#0x1_aggregator">0x1::aggregator</a>;
+<b>use</b> <a href="aggregator_factory.md#0x1_aggregator_factory">0x1::aggregator_factory</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option">0x1::option</a>;
+</code></pre>
+
+
+
+<a id="0x1_optional_aggregator_Integer"></a>
+
+## Struct `Integer`
+
+Wrapper around integer with a custom overflow limit. Supports add, subtract and read just like <code>Aggregator</code>.
+
+
+<pre><code><b>struct</b> <a href="optional_aggregator.md#0x1_optional_aggregator_Integer">Integer</a> <b>has</b> store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>value: u128</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>limit: u128</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_optional_aggregator_OptionalAggregator"></a>
+
+## Struct `OptionalAggregator`
+
+Contains either an aggregator or a normal integer, both overflowing on limit.
+
+
+<pre><code><b>struct</b> <a href="optional_aggregator.md#0x1_optional_aggregator_OptionalAggregator">OptionalAggregator</a> <b>has</b> store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code><a href="aggregator.md#0x1_aggregator">aggregator</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="aggregator.md#0x1_aggregator_Aggregator">aggregator::Aggregator</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>integer: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="optional_aggregator.md#0x1_optional_aggregator_Integer">optional_aggregator::Integer</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_optional_aggregator_EAGGREGATOR_OVERFLOW"></a>
+
+The value of aggregator underflows (goes below zero). Raised by native code.
+
+
+<pre><code><b>const</b> <a href="optional_aggregator.md#0x1_optional_aggregator_EAGGREGATOR_OVERFLOW">EAGGREGATOR_OVERFLOW</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_optional_aggregator_EAGGREGATOR_UNDERFLOW"></a>
+
+Aggregator feature is not supported. Raised by native code.
+
+
+<pre><code><b>const</b> <a href="optional_aggregator.md#0x1_optional_aggregator_EAGGREGATOR_UNDERFLOW">EAGGREGATOR_UNDERFLOW</a>: u64 = 2;
+</code></pre>
+
+
+
+<a id="0x1_optional_aggregator_new_integer"></a>
+
+## Function `new_integer`
+
+Creates a new integer which overflows on exceeding a <code>limit</code>.
+
+
+<pre><code><b>fun</b> <a href="optional_aggregator.md#0x1_optional_aggregator_new_integer">new_integer</a>(limit: u128): <a href="optional_aggregator.md#0x1_optional_aggregator_Integer">optional_aggregator::Integer</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="optional_aggregator.md#0x1_optional_aggregator_new_integer">new_integer</a>(limit: u128): <a href="optional_aggregator.md#0x1_optional_aggregator_Integer">Integer</a> {
+    <a href="optional_aggregator.md#0x1_optional_aggregator_Integer">Integer</a> {
+        value: 0,
+        limit,
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_optional_aggregator_add_integer"></a>
+
+## Function `add_integer`
+
+Adds <code>value</code> to integer. Aborts on overflowing the limit.
+
+
+<pre><code><b>fun</b> <a href="optional_aggregator.md#0x1_optional_aggregator_add_integer">add_integer</a>(integer: &<b>mut</b> <a href="optional_aggregator.md#0x1_optional_aggregator_Integer">optional_aggregator::Integer</a>, value: u128)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="optional_aggregator.md#0x1_optional_aggregator_add_integer">add_integer</a>(integer: &<b>mut</b> <a href="optional_aggregator.md#0x1_optional_aggregator_Integer">Integer</a>, value: u128) {
+    <b>assert</b>!(
+        value &lt;= (integer.limit - integer.value),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_out_of_range">error::out_of_range</a>(<a href="optional_aggregator.md#0x1_optional_aggregator_EAGGREGATOR_OVERFLOW">EAGGREGATOR_OVERFLOW</a>)
+    );
+    integer.value = integer.value + value;
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_optional_aggregator_sub_integer"></a>
+
+## Function `sub_integer`
+
+Subtracts <code>value</code> from integer. Aborts on going below zero.
+
+
+<pre><code><b>fun</b> <a href="optional_aggregator.md#0x1_optional_aggregator_sub_integer">sub_integer</a>(integer: &<b>mut</b> <a href="optional_aggregator.md#0x1_optional_aggregator_Integer">optional_aggregator::Integer</a>, value: u128)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="optional_aggregator.md#0x1_optional_aggregator_sub_integer">sub_integer</a>(integer: &<b>mut</b> <a href="optional_aggregator.md#0x1_optional_aggregator_Integer">Integer</a>, value: u128) {
+    <b>assert</b>!(value &lt;= integer.value, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_out_of_range">error::out_of_range</a>(<a href="optional_aggregator.md#0x1_optional_aggregator_EAGGREGATOR_UNDERFLOW">EAGGREGATOR_UNDERFLOW</a>));
+    integer.value = integer.value - value;
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_optional_aggregator_limit"></a>
+
+## Function `limit`
+
+Returns an overflow limit of integer.
+
+
+<pre><code><b>fun</b> <a href="optional_aggregator.md#0x1_optional_aggregator_limit">limit</a>(integer: &<a href="optional_aggregator.md#0x1_optional_aggregator_Integer">optional_aggregator::Integer</a>): u128
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="optional_aggregator.md#0x1_optional_aggregator_limit">limit</a>(integer: &<a href="optional_aggregator.md#0x1_optional_aggregator_Integer">Integer</a>): u128 {
+    integer.limit
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_optional_aggregator_read_integer"></a>
+
+## Function `read_integer`
+
+Returns a value stored in this integer.
+
+
+<pre><code><b>fun</b> <a href="optional_aggregator.md#0x1_optional_aggregator_read_integer">read_integer</a>(integer: &<a href="optional_aggregator.md#0x1_optional_aggregator_Integer">optional_aggregator::Integer</a>): u128
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="optional_aggregator.md#0x1_optional_aggregator_read_integer">read_integer</a>(integer: &<a href="optional_aggregator.md#0x1_optional_aggregator_Integer">Integer</a>): u128 {
+    integer.value
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_optional_aggregator_destroy_integer"></a>
+
+## Function `destroy_integer`
+
+Destroys an integer.
+
+
+<pre><code><b>fun</b> <a href="optional_aggregator.md#0x1_optional_aggregator_destroy_integer">destroy_integer</a>(integer: <a href="optional_aggregator.md#0x1_optional_aggregator_Integer">optional_aggregator::Integer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="optional_aggregator.md#0x1_optional_aggregator_destroy_integer">destroy_integer</a>(integer: <a href="optional_aggregator.md#0x1_optional_aggregator_Integer">Integer</a>) {
+    <b>let</b> <a href="optional_aggregator.md#0x1_optional_aggregator_Integer">Integer</a> { value: _, limit: _ } = integer;
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_optional_aggregator_new"></a>
+
+## Function `new`
+
+Creates a new optional aggregator.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="optional_aggregator.md#0x1_optional_aggregator_new">new</a>(limit: u128, parallelizable: bool): <a href="optional_aggregator.md#0x1_optional_aggregator_OptionalAggregator">optional_aggregator::OptionalAggregator</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="optional_aggregator.md#0x1_optional_aggregator_new">new</a>(limit: u128, parallelizable: bool): <a href="optional_aggregator.md#0x1_optional_aggregator_OptionalAggregator">OptionalAggregator</a> {
+    <b>if</b> (parallelizable) {
+        <a href="optional_aggregator.md#0x1_optional_aggregator_OptionalAggregator">OptionalAggregator</a> {
+            <a href="aggregator.md#0x1_aggregator">aggregator</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(<a href="aggregator_factory.md#0x1_aggregator_factory_create_aggregator_internal">aggregator_factory::create_aggregator_internal</a>(limit)),
+            integer: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>(),
+        }
+    } <b>else</b> {
+        <a href="optional_aggregator.md#0x1_optional_aggregator_OptionalAggregator">OptionalAggregator</a> {
+            <a href="aggregator.md#0x1_aggregator">aggregator</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>(),
+            integer: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(<a href="optional_aggregator.md#0x1_optional_aggregator_new_integer">new_integer</a>(limit)),
+        }
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_optional_aggregator_switch"></a>
+
+## Function `switch`
+
+Switches between parallelizable and non-parallelizable implementations.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="optional_aggregator.md#0x1_optional_aggregator_switch">switch</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>: &<b>mut</b> <a href="optional_aggregator.md#0x1_optional_aggregator_OptionalAggregator">optional_aggregator::OptionalAggregator</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="optional_aggregator.md#0x1_optional_aggregator_switch">switch</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>: &<b>mut</b> <a href="optional_aggregator.md#0x1_optional_aggregator_OptionalAggregator">OptionalAggregator</a>) {
+    <b>let</b> value = <a href="optional_aggregator.md#0x1_optional_aggregator_read">read</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>);
+    <a href="optional_aggregator.md#0x1_optional_aggregator_switch_and_zero_out">switch_and_zero_out</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>);
+    <a href="optional_aggregator.md#0x1_optional_aggregator_add">add</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>, value);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_optional_aggregator_switch_and_zero_out"></a>
+
+## Function `switch_and_zero_out`
+
+Switches between parallelizable and non-parallelizable implementations, setting
+the value of the new optional aggregator to zero.
+
+
+<pre><code><b>fun</b> <a href="optional_aggregator.md#0x1_optional_aggregator_switch_and_zero_out">switch_and_zero_out</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>: &<b>mut</b> <a href="optional_aggregator.md#0x1_optional_aggregator_OptionalAggregator">optional_aggregator::OptionalAggregator</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="optional_aggregator.md#0x1_optional_aggregator_switch_and_zero_out">switch_and_zero_out</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>: &<b>mut</b> <a href="optional_aggregator.md#0x1_optional_aggregator_OptionalAggregator">OptionalAggregator</a>) {
+    <b>if</b> (<a href="optional_aggregator.md#0x1_optional_aggregator_is_parallelizable">is_parallelizable</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>)) {
+        <a href="optional_aggregator.md#0x1_optional_aggregator_switch_to_integer_and_zero_out">switch_to_integer_and_zero_out</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>);
+    } <b>else</b> {
+        <a href="optional_aggregator.md#0x1_optional_aggregator_switch_to_aggregator_and_zero_out">switch_to_aggregator_and_zero_out</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>);
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_optional_aggregator_switch_to_integer_and_zero_out"></a>
+
+## Function `switch_to_integer_and_zero_out`
+
+Switches from parallelizable to non-parallelizable implementation, zero-initializing
+the value.
+
+
+<pre><code><b>fun</b> <a href="optional_aggregator.md#0x1_optional_aggregator_switch_to_integer_and_zero_out">switch_to_integer_and_zero_out</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>: &<b>mut</b> <a href="optional_aggregator.md#0x1_optional_aggregator_OptionalAggregator">optional_aggregator::OptionalAggregator</a>): u128
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="optional_aggregator.md#0x1_optional_aggregator_switch_to_integer_and_zero_out">switch_to_integer_and_zero_out</a>(
+    <a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>: &<b>mut</b> <a href="optional_aggregator.md#0x1_optional_aggregator_OptionalAggregator">OptionalAggregator</a>
+): u128 {
+    <b>let</b> <a href="aggregator.md#0x1_aggregator">aggregator</a> = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_extract">option::extract</a>(&<b>mut</b> <a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>.<a href="aggregator.md#0x1_aggregator">aggregator</a>);
+    <b>let</b> limit = <a href="aggregator.md#0x1_aggregator_limit">aggregator::limit</a>(&<a href="aggregator.md#0x1_aggregator">aggregator</a>);
+    <a href="aggregator.md#0x1_aggregator_destroy">aggregator::destroy</a>(<a href="aggregator.md#0x1_aggregator">aggregator</a>);
+    <b>let</b> integer = <a href="optional_aggregator.md#0x1_optional_aggregator_new_integer">new_integer</a>(limit);
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_fill">option::fill</a>(&<b>mut</b> <a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>.integer, integer);
+    limit
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_optional_aggregator_switch_to_aggregator_and_zero_out"></a>
+
+## Function `switch_to_aggregator_and_zero_out`
+
+Switches from non-parallelizable to parallelizable implementation, zero-initializing
+the value.
+
+
+<pre><code><b>fun</b> <a href="optional_aggregator.md#0x1_optional_aggregator_switch_to_aggregator_and_zero_out">switch_to_aggregator_and_zero_out</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>: &<b>mut</b> <a href="optional_aggregator.md#0x1_optional_aggregator_OptionalAggregator">optional_aggregator::OptionalAggregator</a>): u128
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="optional_aggregator.md#0x1_optional_aggregator_switch_to_aggregator_and_zero_out">switch_to_aggregator_and_zero_out</a>(
+    <a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>: &<b>mut</b> <a href="optional_aggregator.md#0x1_optional_aggregator_OptionalAggregator">OptionalAggregator</a>
+): u128 {
+    <b>let</b> integer = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_extract">option::extract</a>(&<b>mut</b> <a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>.integer);
+    <b>let</b> limit = <a href="optional_aggregator.md#0x1_optional_aggregator_limit">limit</a>(&integer);
+    <a href="optional_aggregator.md#0x1_optional_aggregator_destroy_integer">destroy_integer</a>(integer);
+    <b>let</b> <a href="aggregator.md#0x1_aggregator">aggregator</a> = <a href="aggregator_factory.md#0x1_aggregator_factory_create_aggregator_internal">aggregator_factory::create_aggregator_internal</a>(limit);
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_fill">option::fill</a>(&<b>mut</b> <a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>.<a href="aggregator.md#0x1_aggregator">aggregator</a>, <a href="aggregator.md#0x1_aggregator">aggregator</a>);
+    limit
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_optional_aggregator_destroy"></a>
+
+## Function `destroy`
+
+Destroys optional aggregator.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="optional_aggregator.md#0x1_optional_aggregator_destroy">destroy</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>: <a href="optional_aggregator.md#0x1_optional_aggregator_OptionalAggregator">optional_aggregator::OptionalAggregator</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="optional_aggregator.md#0x1_optional_aggregator_destroy">destroy</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>: <a href="optional_aggregator.md#0x1_optional_aggregator_OptionalAggregator">OptionalAggregator</a>) {
+    <b>if</b> (<a href="optional_aggregator.md#0x1_optional_aggregator_is_parallelizable">is_parallelizable</a>(&<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>)) {
+        <a href="optional_aggregator.md#0x1_optional_aggregator_destroy_optional_aggregator">destroy_optional_aggregator</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>);
+    } <b>else</b> {
+        <a href="optional_aggregator.md#0x1_optional_aggregator_destroy_optional_integer">destroy_optional_integer</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>);
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_optional_aggregator_destroy_optional_aggregator"></a>
+
+## Function `destroy_optional_aggregator`
+
+Destroys parallelizable optional aggregator and returns its limit.
+
+
+<pre><code><b>fun</b> <a href="optional_aggregator.md#0x1_optional_aggregator_destroy_optional_aggregator">destroy_optional_aggregator</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>: <a href="optional_aggregator.md#0x1_optional_aggregator_OptionalAggregator">optional_aggregator::OptionalAggregator</a>): u128
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="optional_aggregator.md#0x1_optional_aggregator_destroy_optional_aggregator">destroy_optional_aggregator</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>: <a href="optional_aggregator.md#0x1_optional_aggregator_OptionalAggregator">OptionalAggregator</a>): u128 {
+    <b>let</b> <a href="optional_aggregator.md#0x1_optional_aggregator_OptionalAggregator">OptionalAggregator</a> { <a href="aggregator.md#0x1_aggregator">aggregator</a>, integer } = <a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>;
+    <b>let</b> limit = <a href="aggregator.md#0x1_aggregator_limit">aggregator::limit</a>(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(&<a href="aggregator.md#0x1_aggregator">aggregator</a>));
+    <a href="aggregator.md#0x1_aggregator_destroy">aggregator::destroy</a>(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_destroy_some">option::destroy_some</a>(<a href="aggregator.md#0x1_aggregator">aggregator</a>));
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_destroy_none">option::destroy_none</a>(integer);
+    limit
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_optional_aggregator_destroy_optional_integer"></a>
+
+## Function `destroy_optional_integer`
+
+Destroys non-parallelizable optional aggregator and returns its limit.
+
+
+<pre><code><b>fun</b> <a href="optional_aggregator.md#0x1_optional_aggregator_destroy_optional_integer">destroy_optional_integer</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>: <a href="optional_aggregator.md#0x1_optional_aggregator_OptionalAggregator">optional_aggregator::OptionalAggregator</a>): u128
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="optional_aggregator.md#0x1_optional_aggregator_destroy_optional_integer">destroy_optional_integer</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>: <a href="optional_aggregator.md#0x1_optional_aggregator_OptionalAggregator">OptionalAggregator</a>): u128 {
+    <b>let</b> <a href="optional_aggregator.md#0x1_optional_aggregator_OptionalAggregator">OptionalAggregator</a> { <a href="aggregator.md#0x1_aggregator">aggregator</a>, integer } = <a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>;
+    <b>let</b> limit = <a href="optional_aggregator.md#0x1_optional_aggregator_limit">limit</a>(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(&integer));
+    <a href="optional_aggregator.md#0x1_optional_aggregator_destroy_integer">destroy_integer</a>(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_destroy_some">option::destroy_some</a>(integer));
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_destroy_none">option::destroy_none</a>(<a href="aggregator.md#0x1_aggregator">aggregator</a>);
+    limit
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_optional_aggregator_add"></a>
+
+## Function `add`
+
+Adds <code>value</code> to optional aggregator, aborting on exceeding the <code>limit</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="optional_aggregator.md#0x1_optional_aggregator_add">add</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>: &<b>mut</b> <a href="optional_aggregator.md#0x1_optional_aggregator_OptionalAggregator">optional_aggregator::OptionalAggregator</a>, value: u128)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="optional_aggregator.md#0x1_optional_aggregator_add">add</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>: &<b>mut</b> <a href="optional_aggregator.md#0x1_optional_aggregator_OptionalAggregator">OptionalAggregator</a>, value: u128) {
+    <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>.<a href="aggregator.md#0x1_aggregator">aggregator</a>)) {
+        <b>let</b> <a href="aggregator.md#0x1_aggregator">aggregator</a> = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow_mut">option::borrow_mut</a>(&<b>mut</b> <a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>.<a href="aggregator.md#0x1_aggregator">aggregator</a>);
+        <a href="aggregator.md#0x1_aggregator_add">aggregator::add</a>(<a href="aggregator.md#0x1_aggregator">aggregator</a>, value);
+    } <b>else</b> {
+        <b>let</b> integer = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow_mut">option::borrow_mut</a>(&<b>mut</b> <a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>.integer);
+        <a href="optional_aggregator.md#0x1_optional_aggregator_add_integer">add_integer</a>(integer, value);
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_optional_aggregator_sub"></a>
+
+## Function `sub`
+
+Subtracts <code>value</code> from optional aggregator, aborting on going below zero.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="optional_aggregator.md#0x1_optional_aggregator_sub">sub</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>: &<b>mut</b> <a href="optional_aggregator.md#0x1_optional_aggregator_OptionalAggregator">optional_aggregator::OptionalAggregator</a>, value: u128)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="optional_aggregator.md#0x1_optional_aggregator_sub">sub</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>: &<b>mut</b> <a href="optional_aggregator.md#0x1_optional_aggregator_OptionalAggregator">OptionalAggregator</a>, value: u128) {
+    <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>.<a href="aggregator.md#0x1_aggregator">aggregator</a>)) {
+        <b>let</b> <a href="aggregator.md#0x1_aggregator">aggregator</a> = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow_mut">option::borrow_mut</a>(&<b>mut</b> <a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>.<a href="aggregator.md#0x1_aggregator">aggregator</a>);
+        <a href="aggregator.md#0x1_aggregator_sub">aggregator::sub</a>(<a href="aggregator.md#0x1_aggregator">aggregator</a>, value);
+    } <b>else</b> {
+        <b>let</b> integer = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow_mut">option::borrow_mut</a>(&<b>mut</b> <a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>.integer);
+        <a href="optional_aggregator.md#0x1_optional_aggregator_sub_integer">sub_integer</a>(integer, value);
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_optional_aggregator_read"></a>
+
+## Function `read`
+
+Returns the value stored in optional aggregator.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="optional_aggregator.md#0x1_optional_aggregator_read">read</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>: &<a href="optional_aggregator.md#0x1_optional_aggregator_OptionalAggregator">optional_aggregator::OptionalAggregator</a>): u128
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="optional_aggregator.md#0x1_optional_aggregator_read">read</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>: &<a href="optional_aggregator.md#0x1_optional_aggregator_OptionalAggregator">OptionalAggregator</a>): u128 {
+    <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>.<a href="aggregator.md#0x1_aggregator">aggregator</a>)) {
+        <b>let</b> <a href="aggregator.md#0x1_aggregator">aggregator</a> = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(&<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>.<a href="aggregator.md#0x1_aggregator">aggregator</a>);
+        <a href="aggregator.md#0x1_aggregator_read">aggregator::read</a>(<a href="aggregator.md#0x1_aggregator">aggregator</a>)
+    } <b>else</b> {
+        <b>let</b> integer = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(&<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>.integer);
+        <a href="optional_aggregator.md#0x1_optional_aggregator_read_integer">read_integer</a>(integer)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_optional_aggregator_is_parallelizable"></a>
+
+## Function `is_parallelizable`
+
+Returns true if optional aggregator uses parallelizable implementation.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="optional_aggregator.md#0x1_optional_aggregator_is_parallelizable">is_parallelizable</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>: &<a href="optional_aggregator.md#0x1_optional_aggregator_OptionalAggregator">optional_aggregator::OptionalAggregator</a>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="optional_aggregator.md#0x1_optional_aggregator_is_parallelizable">is_parallelizable</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>: &<a href="optional_aggregator.md#0x1_optional_aggregator_OptionalAggregator">OptionalAggregator</a>): bool {
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>.<a href="aggregator.md#0x1_aggregator">aggregator</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+
+
+<a id="high-level-req"></a>
+
+### High-level Requirements
+
+<table>
+<tr>
+<th>No.</th><th>Requirement</th><th>Criticality</th><th>Implementation</th><th>Enforcement</th>
+</tr>
+
+<tr>
+<td>1</td>
+<td>When creating a new integer instance, it guarantees that the limit assigned is a value passed into the function as an argument, and the value field becomes zero.</td>
+<td>High</td>
+<td>The new_integer function sets the limit field to the argument passed in, and the value field is set to zero.</td>
+<td>Formally verified via <a href="#high-level-req-1">new_integer</a>.</td>
+</tr>
+
+<tr>
+<td>2</td>
+<td>For a given integer instance it should always be possible to: (1) return the limit value of the integer resource, (2) return the current value stored in that particular instance, and (3) destroy the integer instance.</td>
+<td>Low</td>
+<td>The following functions should not abort if the Integer instance exists: limit(), read_integer(), destroy_integer().</td>
+<td>Formally verified via: <a href="#high-level-req-2.1">read_integer</a>, <a href="#high-level-req-2.2">limit</a>, and <a href="#high-level-req-2.3">destroy_integer</a>.</td>
+</tr>
+
+<tr>
+<td>3</td>
+<td>Every successful switch must end with the aggregator type changed from non-parallelizable to parallelizable or vice versa.</td>
+<td>High</td>
+<td>The switch function run, if successful, should always change the aggregator type.</td>
+<td>Formally verified via <a href="#high-level-req-3">switch_and_zero_out</a>.</td>
+</tr>
+
+</table>
+
+
+
+<a id="module-level-spec"></a>
+
+### Module-level Specification
+
+
+<pre><code><b>pragma</b> verify = <b>true</b>;
+<b>pragma</b> aborts_if_is_strict;
+</code></pre>
+
+
+
+<a id="@Specification_1_OptionalAggregator"></a>
+
+### Struct `OptionalAggregator`
+
+
+<pre><code><b>struct</b> <a href="optional_aggregator.md#0x1_optional_aggregator_OptionalAggregator">OptionalAggregator</a> <b>has</b> store
+</code></pre>
+
+
+
+<dl>
+<dt>
+<code><a href="aggregator.md#0x1_aggregator">aggregator</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="aggregator.md#0x1_aggregator_Aggregator">aggregator::Aggregator</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>integer: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="optional_aggregator.md#0x1_optional_aggregator_Integer">optional_aggregator::Integer</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+
+<pre><code><b>invariant</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(<a href="aggregator.md#0x1_aggregator">aggregator</a>) &lt;==&gt; <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_none">option::is_none</a>(integer);
+<b>invariant</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(integer) &lt;==&gt; <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_none">option::is_none</a>(<a href="aggregator.md#0x1_aggregator">aggregator</a>);
+<b>invariant</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(integer) ==&gt; <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(integer).value &lt;= <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(integer).limit;
+<b>invariant</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(<a href="aggregator.md#0x1_aggregator">aggregator</a>) ==&gt; <a href="aggregator.md#0x1_aggregator_spec_aggregator_get_val">aggregator::spec_aggregator_get_val</a>(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(<a href="aggregator.md#0x1_aggregator">aggregator</a>)) &lt;=
+    <a href="aggregator.md#0x1_aggregator_spec_get_limit">aggregator::spec_get_limit</a>(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(<a href="aggregator.md#0x1_aggregator">aggregator</a>));
+</code></pre>
+
+
+
+<a id="@Specification_1_new_integer"></a>
+
+### Function `new_integer`
+
+
+<pre><code><b>fun</b> <a href="optional_aggregator.md#0x1_optional_aggregator_new_integer">new_integer</a>(limit: u128): <a href="optional_aggregator.md#0x1_optional_aggregator_Integer">optional_aggregator::Integer</a>
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result.limit == limit;
+// This enforces <a id="high-level-req-1" href="#high-level-req">high-level requirement 1</a>:
+<b>ensures</b> result.value == 0;
+</code></pre>
+
+
+
+<a id="@Specification_1_add_integer"></a>
+
+### Function `add_integer`
+
+
+<pre><code><b>fun</b> <a href="optional_aggregator.md#0x1_optional_aggregator_add_integer">add_integer</a>(integer: &<b>mut</b> <a href="optional_aggregator.md#0x1_optional_aggregator_Integer">optional_aggregator::Integer</a>, value: u128)
+</code></pre>
+
+
+Check for overflow.
+
+
+<pre><code><b>aborts_if</b> value &gt; (integer.limit - integer.value);
+<b>aborts_if</b> integer.value + value &gt; MAX_U128;
+<b>ensures</b> integer.value &lt;= integer.limit;
+<b>ensures</b> integer.value == <b>old</b>(integer.value) + value;
+</code></pre>
+
+
+
+<a id="@Specification_1_sub_integer"></a>
+
+### Function `sub_integer`
+
+
+<pre><code><b>fun</b> <a href="optional_aggregator.md#0x1_optional_aggregator_sub_integer">sub_integer</a>(integer: &<b>mut</b> <a href="optional_aggregator.md#0x1_optional_aggregator_Integer">optional_aggregator::Integer</a>, value: u128)
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> value &gt; integer.value;
+<b>ensures</b> integer.value == <b>old</b>(integer.value) - value;
+</code></pre>
+
+
+
+<a id="@Specification_1_limit"></a>
+
+### Function `limit`
+
+
+<pre><code><b>fun</b> <a href="optional_aggregator.md#0x1_optional_aggregator_limit">limit</a>(integer: &<a href="optional_aggregator.md#0x1_optional_aggregator_Integer">optional_aggregator::Integer</a>): u128
+</code></pre>
+
+
+
+
+<pre><code>// This enforces <a id="high-level-req-2.2" href="#high-level-req">high-level requirement 2</a>:
+<b>aborts_if</b> <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_read_integer"></a>
+
+### Function `read_integer`
+
+
+<pre><code><b>fun</b> <a href="optional_aggregator.md#0x1_optional_aggregator_read_integer">read_integer</a>(integer: &<a href="optional_aggregator.md#0x1_optional_aggregator_Integer">optional_aggregator::Integer</a>): u128
+</code></pre>
+
+
+
+
+<pre><code>// This enforces <a id="high-level-req-2.1" href="#high-level-req">high-level requirement 2</a>:
+<b>aborts_if</b> <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_destroy_integer"></a>
+
+### Function `destroy_integer`
+
+
+<pre><code><b>fun</b> <a href="optional_aggregator.md#0x1_optional_aggregator_destroy_integer">destroy_integer</a>(integer: <a href="optional_aggregator.md#0x1_optional_aggregator_Integer">optional_aggregator::Integer</a>)
+</code></pre>
+
+
+
+
+<pre><code>// This enforces <a id="high-level-req-2.3" href="#high-level-req">high-level requirement 2</a>:
+<b>aborts_if</b> <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_new"></a>
+
+### Function `new`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="optional_aggregator.md#0x1_optional_aggregator_new">new</a>(limit: u128, parallelizable: bool): <a href="optional_aggregator.md#0x1_optional_aggregator_OptionalAggregator">optional_aggregator::OptionalAggregator</a>
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> parallelizable && !<b>exists</b>&lt;<a href="aggregator_factory.md#0x1_aggregator_factory_AggregatorFactory">aggregator_factory::AggregatorFactory</a>&gt;(@aptos_framework);
+<b>ensures</b> parallelizable ==&gt; <a href="optional_aggregator.md#0x1_optional_aggregator_is_parallelizable">is_parallelizable</a>(result);
+<b>ensures</b> !parallelizable ==&gt; !<a href="optional_aggregator.md#0x1_optional_aggregator_is_parallelizable">is_parallelizable</a>(result);
+<b>ensures</b> <a href="optional_aggregator.md#0x1_optional_aggregator_optional_aggregator_value">optional_aggregator_value</a>(result) == 0;
+<b>ensures</b> <a href="optional_aggregator.md#0x1_optional_aggregator_optional_aggregator_value">optional_aggregator_value</a>(result) &lt;= <a href="optional_aggregator.md#0x1_optional_aggregator_optional_aggregator_limit">optional_aggregator_limit</a>(result);
+</code></pre>
+
+
+
+<a id="@Specification_1_switch"></a>
+
+### Function `switch`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="optional_aggregator.md#0x1_optional_aggregator_switch">switch</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>: &<b>mut</b> <a href="optional_aggregator.md#0x1_optional_aggregator_OptionalAggregator">optional_aggregator::OptionalAggregator</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> vec_ref = <a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>.integer.vec;
+<b>aborts_if</b> <a href="optional_aggregator.md#0x1_optional_aggregator_is_parallelizable">is_parallelizable</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>) && len(vec_ref) != 0;
+<b>aborts_if</b> !<a href="optional_aggregator.md#0x1_optional_aggregator_is_parallelizable">is_parallelizable</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>) && len(vec_ref) == 0;
+<b>aborts_if</b> !<a href="optional_aggregator.md#0x1_optional_aggregator_is_parallelizable">is_parallelizable</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>) && !<b>exists</b>&lt;<a href="aggregator_factory.md#0x1_aggregator_factory_AggregatorFactory">aggregator_factory::AggregatorFactory</a>&gt;(@aptos_framework);
+<b>ensures</b> <a href="optional_aggregator.md#0x1_optional_aggregator_optional_aggregator_value">optional_aggregator_value</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>) == <a href="optional_aggregator.md#0x1_optional_aggregator_optional_aggregator_value">optional_aggregator_value</a>(<b>old</b>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>));
+</code></pre>
+
+
+
+<a id="@Specification_1_switch_and_zero_out"></a>
+
+### Function `switch_and_zero_out`
+
+
+<pre><code><b>fun</b> <a href="optional_aggregator.md#0x1_optional_aggregator_switch_and_zero_out">switch_and_zero_out</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>: &<b>mut</b> <a href="optional_aggregator.md#0x1_optional_aggregator_OptionalAggregator">optional_aggregator::OptionalAggregator</a>)
+</code></pre>
+
+
+Option<Integer> does not exist When Option<Aggregator> exists.
+Option<Integer> exists when Option<Aggregator> does not exist.
+The AggregatorFactory is under the @aptos_framework when Option<Aggregator> does not exist.
+
+
+<pre><code><b>let</b> vec_ref = <a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>.integer.vec;
+<b>aborts_if</b> <a href="optional_aggregator.md#0x1_optional_aggregator_is_parallelizable">is_parallelizable</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>) && len(vec_ref) != 0;
+<b>aborts_if</b> !<a href="optional_aggregator.md#0x1_optional_aggregator_is_parallelizable">is_parallelizable</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>) && len(vec_ref) == 0;
+<b>aborts_if</b> !<a href="optional_aggregator.md#0x1_optional_aggregator_is_parallelizable">is_parallelizable</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>) && !<b>exists</b>&lt;<a href="aggregator_factory.md#0x1_aggregator_factory_AggregatorFactory">aggregator_factory::AggregatorFactory</a>&gt;(@aptos_framework);
+// This enforces <a id="high-level-req-3" href="#high-level-req">high-level requirement 3</a>:
+<b>ensures</b> <a href="optional_aggregator.md#0x1_optional_aggregator_is_parallelizable">is_parallelizable</a>(<b>old</b>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>)) ==&gt; !<a href="optional_aggregator.md#0x1_optional_aggregator_is_parallelizable">is_parallelizable</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>);
+<b>ensures</b> !<a href="optional_aggregator.md#0x1_optional_aggregator_is_parallelizable">is_parallelizable</a>(<b>old</b>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>)) ==&gt; <a href="optional_aggregator.md#0x1_optional_aggregator_is_parallelizable">is_parallelizable</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>);
+<b>ensures</b> <a href="optional_aggregator.md#0x1_optional_aggregator_optional_aggregator_value">optional_aggregator_value</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>) == 0;
+</code></pre>
+
+
+
+<a id="@Specification_1_switch_to_integer_and_zero_out"></a>
+
+### Function `switch_to_integer_and_zero_out`
+
+
+<pre><code><b>fun</b> <a href="optional_aggregator.md#0x1_optional_aggregator_switch_to_integer_and_zero_out">switch_to_integer_and_zero_out</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>: &<b>mut</b> <a href="optional_aggregator.md#0x1_optional_aggregator_OptionalAggregator">optional_aggregator::OptionalAggregator</a>): u128
+</code></pre>
+
+
+The aggregator exists and the integer dosex not exist when Switches from parallelizable to non-parallelizable implementation.
+
+
+<pre><code><b>let</b> limit = <a href="aggregator.md#0x1_aggregator_spec_get_limit">aggregator::spec_get_limit</a>(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>.<a href="aggregator.md#0x1_aggregator">aggregator</a>));
+<b>aborts_if</b> len(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>.<a href="aggregator.md#0x1_aggregator">aggregator</a>.vec) == 0;
+<b>aborts_if</b> len(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>.integer.vec) != 0;
+<b>ensures</b> !<a href="optional_aggregator.md#0x1_optional_aggregator_is_parallelizable">is_parallelizable</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>);
+<b>ensures</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>.integer).limit == limit;
+<b>ensures</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>.integer).value == 0;
+</code></pre>
+
+
+
+<a id="@Specification_1_switch_to_aggregator_and_zero_out"></a>
+
+### Function `switch_to_aggregator_and_zero_out`
+
+
+<pre><code><b>fun</b> <a href="optional_aggregator.md#0x1_optional_aggregator_switch_to_aggregator_and_zero_out">switch_to_aggregator_and_zero_out</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>: &<b>mut</b> <a href="optional_aggregator.md#0x1_optional_aggregator_OptionalAggregator">optional_aggregator::OptionalAggregator</a>): u128
+</code></pre>
+
+
+The integer exists and the aggregator does not exist when Switches from non-parallelizable to parallelizable implementation.
+The AggregatorFactory is under the @aptos_framework.
+
+
+<pre><code><b>let</b> limit = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>.integer).limit;
+<b>aborts_if</b> len(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>.integer.vec) == 0;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="aggregator_factory.md#0x1_aggregator_factory_AggregatorFactory">aggregator_factory::AggregatorFactory</a>&gt;(@aptos_framework);
+<b>aborts_if</b> len(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>.<a href="aggregator.md#0x1_aggregator">aggregator</a>.vec) != 0;
+<b>ensures</b> <a href="optional_aggregator.md#0x1_optional_aggregator_is_parallelizable">is_parallelizable</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>);
+<b>ensures</b> <a href="aggregator.md#0x1_aggregator_spec_get_limit">aggregator::spec_get_limit</a>(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>.<a href="aggregator.md#0x1_aggregator">aggregator</a>)) == limit;
+<b>ensures</b> <a href="aggregator.md#0x1_aggregator_spec_aggregator_get_val">aggregator::spec_aggregator_get_val</a>(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>.<a href="aggregator.md#0x1_aggregator">aggregator</a>)) == 0;
+</code></pre>
+
+
+
+<a id="@Specification_1_destroy"></a>
+
+### Function `destroy`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="optional_aggregator.md#0x1_optional_aggregator_destroy">destroy</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>: <a href="optional_aggregator.md#0x1_optional_aggregator_OptionalAggregator">optional_aggregator::OptionalAggregator</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <a href="optional_aggregator.md#0x1_optional_aggregator_is_parallelizable">is_parallelizable</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>) && len(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>.integer.vec) != 0;
+<b>aborts_if</b> !<a href="optional_aggregator.md#0x1_optional_aggregator_is_parallelizable">is_parallelizable</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>) && len(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>.integer.vec) == 0;
+</code></pre>
+
+
+
+<a id="@Specification_1_destroy_optional_aggregator"></a>
+
+### Function `destroy_optional_aggregator`
+
+
+<pre><code><b>fun</b> <a href="optional_aggregator.md#0x1_optional_aggregator_destroy_optional_aggregator">destroy_optional_aggregator</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>: <a href="optional_aggregator.md#0x1_optional_aggregator_OptionalAggregator">optional_aggregator::OptionalAggregator</a>): u128
+</code></pre>
+
+
+The aggregator exists and the integer does not exist when destroy the aggregator.
+
+
+<pre><code><b>aborts_if</b> len(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>.<a href="aggregator.md#0x1_aggregator">aggregator</a>.vec) == 0;
+<b>aborts_if</b> len(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>.integer.vec) != 0;
+<b>ensures</b> result == <a href="aggregator.md#0x1_aggregator_spec_get_limit">aggregator::spec_get_limit</a>(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>.<a href="aggregator.md#0x1_aggregator">aggregator</a>));
+</code></pre>
+
+
+
+<a id="@Specification_1_destroy_optional_integer"></a>
+
+### Function `destroy_optional_integer`
+
+
+<pre><code><b>fun</b> <a href="optional_aggregator.md#0x1_optional_aggregator_destroy_optional_integer">destroy_optional_integer</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>: <a href="optional_aggregator.md#0x1_optional_aggregator_OptionalAggregator">optional_aggregator::OptionalAggregator</a>): u128
+</code></pre>
+
+
+The integer exists and the aggregator does not exist when destroy the integer.
+
+
+<pre><code><b>aborts_if</b> len(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>.integer.vec) == 0;
+<b>aborts_if</b> len(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>.<a href="aggregator.md#0x1_aggregator">aggregator</a>.vec) != 0;
+<b>ensures</b> result == <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>.integer).limit;
+</code></pre>
+
+
+
+
+<a id="0x1_optional_aggregator_optional_aggregator_value"></a>
+
+
+<pre><code><b>fun</b> <a href="optional_aggregator.md#0x1_optional_aggregator_optional_aggregator_value">optional_aggregator_value</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>: <a href="optional_aggregator.md#0x1_optional_aggregator_OptionalAggregator">OptionalAggregator</a>): u128 {
+   <b>if</b> (<a href="optional_aggregator.md#0x1_optional_aggregator_is_parallelizable">is_parallelizable</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>)) {
+       <a href="aggregator.md#0x1_aggregator_spec_aggregator_get_val">aggregator::spec_aggregator_get_val</a>(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>.<a href="aggregator.md#0x1_aggregator">aggregator</a>))
+   } <b>else</b> {
+       <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>.integer).value
+   }
+}
+</code></pre>
+
+
+
+
+<a id="0x1_optional_aggregator_optional_aggregator_limit"></a>
+
+
+<pre><code><b>fun</b> <a href="optional_aggregator.md#0x1_optional_aggregator_optional_aggregator_limit">optional_aggregator_limit</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>: <a href="optional_aggregator.md#0x1_optional_aggregator_OptionalAggregator">OptionalAggregator</a>): u128 {
+   <b>if</b> (<a href="optional_aggregator.md#0x1_optional_aggregator_is_parallelizable">is_parallelizable</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>)) {
+       <a href="aggregator.md#0x1_aggregator_spec_get_limit">aggregator::spec_get_limit</a>(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>.<a href="aggregator.md#0x1_aggregator">aggregator</a>))
+   } <b>else</b> {
+       <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>.integer).limit
+   }
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_add"></a>
+
+### Function `add`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="optional_aggregator.md#0x1_optional_aggregator_add">add</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>: &<b>mut</b> <a href="optional_aggregator.md#0x1_optional_aggregator_OptionalAggregator">optional_aggregator::OptionalAggregator</a>, value: u128)
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="optional_aggregator.md#0x1_optional_aggregator_AddAbortsIf">AddAbortsIf</a>;
+<b>ensures</b> ((<a href="optional_aggregator.md#0x1_optional_aggregator_optional_aggregator_value">optional_aggregator_value</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>) == <a href="optional_aggregator.md#0x1_optional_aggregator_optional_aggregator_value">optional_aggregator_value</a>(<b>old</b>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>)) + value));
+</code></pre>
+
+
+
+
+<a id="0x1_optional_aggregator_AddAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="optional_aggregator.md#0x1_optional_aggregator_AddAbortsIf">AddAbortsIf</a> {
+    <a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>: <a href="optional_aggregator.md#0x1_optional_aggregator_OptionalAggregator">OptionalAggregator</a>;
+    value: u128;
+    <b>aborts_if</b> <a href="optional_aggregator.md#0x1_optional_aggregator_is_parallelizable">is_parallelizable</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>) && (<a href="aggregator.md#0x1_aggregator_spec_aggregator_get_val">aggregator::spec_aggregator_get_val</a>(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>.<a href="aggregator.md#0x1_aggregator">aggregator</a>))
+        + value &gt; <a href="aggregator.md#0x1_aggregator_spec_get_limit">aggregator::spec_get_limit</a>(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>.<a href="aggregator.md#0x1_aggregator">aggregator</a>)));
+    <b>aborts_if</b> <a href="optional_aggregator.md#0x1_optional_aggregator_is_parallelizable">is_parallelizable</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>) && (<a href="aggregator.md#0x1_aggregator_spec_aggregator_get_val">aggregator::spec_aggregator_get_val</a>(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>.<a href="aggregator.md#0x1_aggregator">aggregator</a>))
+        + value &gt; MAX_U128);
+    <b>aborts_if</b> !<a href="optional_aggregator.md#0x1_optional_aggregator_is_parallelizable">is_parallelizable</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>) &&
+        (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>.integer).value + value &gt; MAX_U128);
+    <b>aborts_if</b> !<a href="optional_aggregator.md#0x1_optional_aggregator_is_parallelizable">is_parallelizable</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>) &&
+        (value &gt; (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>.integer).limit - <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>.integer).value));
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_sub"></a>
+
+### Function `sub`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="optional_aggregator.md#0x1_optional_aggregator_sub">sub</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>: &<b>mut</b> <a href="optional_aggregator.md#0x1_optional_aggregator_OptionalAggregator">optional_aggregator::OptionalAggregator</a>, value: u128)
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="optional_aggregator.md#0x1_optional_aggregator_SubAbortsIf">SubAbortsIf</a>;
+<b>ensures</b> ((<a href="optional_aggregator.md#0x1_optional_aggregator_optional_aggregator_value">optional_aggregator_value</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>) == <a href="optional_aggregator.md#0x1_optional_aggregator_optional_aggregator_value">optional_aggregator_value</a>(<b>old</b>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>)) - value));
+</code></pre>
+
+
+
+
+<a id="0x1_optional_aggregator_SubAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="optional_aggregator.md#0x1_optional_aggregator_SubAbortsIf">SubAbortsIf</a> {
+    <a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>: <a href="optional_aggregator.md#0x1_optional_aggregator_OptionalAggregator">OptionalAggregator</a>;
+    value: u128;
+    <b>aborts_if</b> <a href="optional_aggregator.md#0x1_optional_aggregator_is_parallelizable">is_parallelizable</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>) && (<a href="aggregator.md#0x1_aggregator_spec_aggregator_get_val">aggregator::spec_aggregator_get_val</a>(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>.<a href="aggregator.md#0x1_aggregator">aggregator</a>))
+        &lt; value);
+    <b>aborts_if</b> !<a href="optional_aggregator.md#0x1_optional_aggregator_is_parallelizable">is_parallelizable</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>) &&
+        (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>.integer).value &lt; value);
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_read"></a>
+
+### Function `read`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="optional_aggregator.md#0x1_optional_aggregator_read">read</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>: &<a href="optional_aggregator.md#0x1_optional_aggregator_OptionalAggregator">optional_aggregator::OptionalAggregator</a>): u128
+</code></pre>
+
+
+
+
+<pre><code><b>ensures</b> !<a href="optional_aggregator.md#0x1_optional_aggregator_is_parallelizable">is_parallelizable</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>) ==&gt; result == <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>.integer).value;
+<b>ensures</b> <a href="optional_aggregator.md#0x1_optional_aggregator_is_parallelizable">is_parallelizable</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>) ==&gt;
+    result == <a href="aggregator.md#0x1_aggregator_spec_read">aggregator::spec_read</a>(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(<a href="optional_aggregator.md#0x1_optional_aggregator">optional_aggregator</a>.<a href="aggregator.md#0x1_aggregator">aggregator</a>));
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/overview.md b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/overview.md
new file mode 100644
index 0000000000000..314baa3612ba9
--- /dev/null
+++ b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/overview.md
@@ -0,0 +1,76 @@
+
+<a id="@Aptos_Framework_0"></a>
+
+# Aptos Framework
+
+
+This is the reference documentation of the Aptos framework.
+
+
+<a id="@Index_1"></a>
+
+## Index
+
+
+-  [`0x1::account`](account.md#0x1_account)
+-  [`0x1::aggregator`](aggregator.md#0x1_aggregator)
+-  [`0x1::aggregator_factory`](aggregator_factory.md#0x1_aggregator_factory)
+-  [`0x1::aggregator_v2`](aggregator_v2.md#0x1_aggregator_v2)
+-  [`0x1::aptos_account`](aptos_account.md#0x1_aptos_account)
+-  [`0x1::aptos_coin`](aptos_coin.md#0x1_aptos_coin)
+-  [`0x1::aptos_governance`](aptos_governance.md#0x1_aptos_governance)
+-  [`0x1::block`](block.md#0x1_block)
+-  [`0x1::chain_id`](chain_id.md#0x1_chain_id)
+-  [`0x1::chain_status`](chain_status.md#0x1_chain_status)
+-  [`0x1::code`](code.md#0x1_code)
+-  [`0x1::coin`](coin.md#0x1_coin)
+-  [`0x1::config_buffer`](config_buffer.md#0x1_config_buffer)
+-  [`0x1::consensus_config`](consensus_config.md#0x1_consensus_config)
+-  [`0x1::create_signer`](create_signer.md#0x1_create_signer)
+-  [`0x1::delegation_pool`](delegation_pool.md#0x1_delegation_pool)
+-  [`0x1::dispatchable_fungible_asset`](dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset)
+-  [`0x1::dkg`](dkg.md#0x1_dkg)
+-  [`0x1::event`](event.md#0x1_event)
+-  [`0x1::execution_config`](execution_config.md#0x1_execution_config)
+-  [`0x1::function_info`](function_info.md#0x1_function_info)
+-  [`0x1::fungible_asset`](fungible_asset.md#0x1_fungible_asset)
+-  [`0x1::gas_schedule`](gas_schedule.md#0x1_gas_schedule)
+-  [`0x1::genesis`](genesis.md#0x1_genesis)
+-  [`0x1::governance_proposal`](governance_proposal.md#0x1_governance_proposal)
+-  [`0x1::guid`](guid.md#0x1_guid)
+-  [`0x1::jwk_consensus_config`](jwk_consensus_config.md#0x1_jwk_consensus_config)
+-  [`0x1::jwks`](jwks.md#0x1_jwks)
+-  [`0x1::keyless_account`](keyless_account.md#0x1_keyless_account)
+-  [`0x1::managed_coin`](managed_coin.md#0x1_managed_coin)
+-  [`0x1::multisig_account`](multisig_account.md#0x1_multisig_account)
+-  [`0x1::object`](object.md#0x1_object)
+-  [`0x1::object_code_deployment`](object_code_deployment.md#0x1_object_code_deployment)
+-  [`0x1::optional_aggregator`](optional_aggregator.md#0x1_optional_aggregator)
+-  [`0x1::primary_fungible_store`](primary_fungible_store.md#0x1_primary_fungible_store)
+-  [`0x1::randomness`](randomness.md#0x1_randomness)
+-  [`0x1::randomness_api_v0_config`](randomness_api_v0_config.md#0x1_randomness_api_v0_config)
+-  [`0x1::randomness_config`](randomness_config.md#0x1_randomness_config)
+-  [`0x1::randomness_config_seqnum`](randomness_config_seqnum.md#0x1_randomness_config_seqnum)
+-  [`0x1::reconfiguration`](reconfiguration.md#0x1_reconfiguration)
+-  [`0x1::reconfiguration_state`](reconfiguration_state.md#0x1_reconfiguration_state)
+-  [`0x1::reconfiguration_with_dkg`](reconfiguration_with_dkg.md#0x1_reconfiguration_with_dkg)
+-  [`0x1::resource_account`](resource_account.md#0x1_resource_account)
+-  [`0x1::stake`](stake.md#0x1_stake)
+-  [`0x1::staking_config`](staking_config.md#0x1_staking_config)
+-  [`0x1::staking_contract`](staking_contract.md#0x1_staking_contract)
+-  [`0x1::staking_proxy`](staking_proxy.md#0x1_staking_proxy)
+-  [`0x1::state_storage`](state_storage.md#0x1_state_storage)
+-  [`0x1::storage_gas`](storage_gas.md#0x1_storage_gas)
+-  [`0x1::system_addresses`](system_addresses.md#0x1_system_addresses)
+-  [`0x1::timestamp`](timestamp.md#0x1_timestamp)
+-  [`0x1::transaction_context`](transaction_context.md#0x1_transaction_context)
+-  [`0x1::transaction_fee`](transaction_fee.md#0x1_transaction_fee)
+-  [`0x1::transaction_validation`](transaction_validation.md#0x1_transaction_validation)
+-  [`0x1::util`](util.md#0x1_util)
+-  [`0x1::validator_consensus_info`](validator_consensus_info.md#0x1_validator_consensus_info)
+-  [`0x1::version`](version.md#0x1_version)
+-  [`0x1::vesting`](vesting.md#0x1_vesting)
+-  [`0x1::voting`](voting.md#0x1_voting)
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/primary_fungible_store.md b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/primary_fungible_store.md
new file mode 100644
index 0000000000000..0ebfb73e5d659
--- /dev/null
+++ b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/primary_fungible_store.md
@@ -0,0 +1,955 @@
+
+<a id="0x1_primary_fungible_store"></a>
+
+# Module `0x1::primary_fungible_store`
+
+This module provides a way for creators of fungible assets to enable support for creating primary (deterministic)
+stores for their users. This is useful for assets that are meant to be used as a currency, as it allows users to
+easily create a store for their account and deposit/withdraw/transfer fungible assets to/from it.
+
+The transfer flow works as below:
+1. The sender calls <code>transfer</code> on the fungible asset metadata object to transfer <code>amount</code> of fungible asset to
+<code>recipient</code>.
+2. The fungible asset metadata object calls <code>ensure_primary_store_exists</code> to ensure that both the sender's and the
+recipient's primary stores exist. If either doesn't, it will be created.
+3. The fungible asset metadata object calls <code>withdraw</code> on the sender's primary store to withdraw <code>amount</code> of
+fungible asset from it. This emits a withdraw event.
+4. The fungible asset metadata object calls <code>deposit</code> on the recipient's primary store to deposit <code>amount</code> of
+fungible asset to it. This emits an deposit event.
+
+
+-  [Resource `DeriveRefPod`](#0x1_primary_fungible_store_DeriveRefPod)
+-  [Function `create_primary_store_enabled_fungible_asset`](#0x1_primary_fungible_store_create_primary_store_enabled_fungible_asset)
+-  [Function `ensure_primary_store_exists`](#0x1_primary_fungible_store_ensure_primary_store_exists)
+-  [Function `create_primary_store`](#0x1_primary_fungible_store_create_primary_store)
+-  [Function `primary_store_address`](#0x1_primary_fungible_store_primary_store_address)
+-  [Function `primary_store`](#0x1_primary_fungible_store_primary_store)
+-  [Function `primary_store_exists`](#0x1_primary_fungible_store_primary_store_exists)
+-  [Function `primary_store_address_inlined`](#0x1_primary_fungible_store_primary_store_address_inlined)
+-  [Function `primary_store_inlined`](#0x1_primary_fungible_store_primary_store_inlined)
+-  [Function `primary_store_exists_inlined`](#0x1_primary_fungible_store_primary_store_exists_inlined)
+-  [Function `balance`](#0x1_primary_fungible_store_balance)
+-  [Function `is_balance_at_least`](#0x1_primary_fungible_store_is_balance_at_least)
+-  [Function `is_frozen`](#0x1_primary_fungible_store_is_frozen)
+-  [Function `withdraw`](#0x1_primary_fungible_store_withdraw)
+-  [Function `deposit`](#0x1_primary_fungible_store_deposit)
+-  [Function `force_deposit`](#0x1_primary_fungible_store_force_deposit)
+-  [Function `transfer`](#0x1_primary_fungible_store_transfer)
+-  [Function `transfer_assert_minimum_deposit`](#0x1_primary_fungible_store_transfer_assert_minimum_deposit)
+-  [Function `mint`](#0x1_primary_fungible_store_mint)
+-  [Function `burn`](#0x1_primary_fungible_store_burn)
+-  [Function `set_frozen_flag`](#0x1_primary_fungible_store_set_frozen_flag)
+-  [Function `withdraw_with_ref`](#0x1_primary_fungible_store_withdraw_with_ref)
+-  [Function `deposit_with_ref`](#0x1_primary_fungible_store_deposit_with_ref)
+-  [Function `transfer_with_ref`](#0x1_primary_fungible_store_transfer_with_ref)
+-  [Function `may_be_unburn`](#0x1_primary_fungible_store_may_be_unburn)
+-  [Specification](#@Specification_0)
+    -  [High-level Requirements](#high-level-req)
+    -  [Module-level Specification](#module-level-spec)
+
+
+<pre><code><b>use</b> <a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset">0x1::dispatchable_fungible_asset</a>;
+<b>use</b> <a href="fungible_asset.md#0x1_fungible_asset">0x1::fungible_asset</a>;
+<b>use</b> <a href="object.md#0x1_object">0x1::object</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option">0x1::option</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">0x1::signer</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string">0x1::string</a>;
+</code></pre>
+
+
+
+<a id="0x1_primary_fungible_store_DeriveRefPod"></a>
+
+## Resource `DeriveRefPod`
+
+A resource that holds the derive ref for the fungible asset metadata object. This is used to create primary
+stores for users with deterministic addresses so that users can easily deposit/withdraw/transfer fungible
+assets.
+
+
+<pre><code>#[resource_group_member(#[group = <a href="object.md#0x1_object_ObjectGroup">0x1::object::ObjectGroup</a>])]
+<b>struct</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_DeriveRefPod">DeriveRefPod</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>metadata_derive_ref: <a href="object.md#0x1_object_DeriveRef">object::DeriveRef</a></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_primary_fungible_store_create_primary_store_enabled_fungible_asset"></a>
+
+## Function `create_primary_store_enabled_fungible_asset`
+
+Create a fungible asset with primary store support. When users transfer fungible assets to each other, their
+primary stores will be created automatically if they don't exist. Primary stores have deterministic addresses
+so that users can easily deposit/withdraw/transfer fungible assets.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_create_primary_store_enabled_fungible_asset">create_primary_store_enabled_fungible_asset</a>(constructor_ref: &<a href="object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>, maximum_supply: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;u128&gt;, name: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, symbol: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, decimals: u8, icon_uri: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, project_uri: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_create_primary_store_enabled_fungible_asset">create_primary_store_enabled_fungible_asset</a>(
+    constructor_ref: &ConstructorRef,
+    maximum_supply: Option&lt;u128&gt;,
+    name: String,
+    symbol: String,
+    decimals: u8,
+    icon_uri: String,
+    project_uri: String,
+) {
+    <a href="fungible_asset.md#0x1_fungible_asset_add_fungibility">fungible_asset::add_fungibility</a>(
+        constructor_ref,
+        maximum_supply,
+        name,
+        symbol,
+        decimals,
+        icon_uri,
+        project_uri,
+    );
+    <b>let</b> metadata_obj = &<a href="object.md#0x1_object_generate_signer">object::generate_signer</a>(constructor_ref);
+    <b>move_to</b>(metadata_obj, <a href="primary_fungible_store.md#0x1_primary_fungible_store_DeriveRefPod">DeriveRefPod</a> {
+        metadata_derive_ref: <a href="object.md#0x1_object_generate_derive_ref">object::generate_derive_ref</a>(constructor_ref),
+    });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_primary_fungible_store_ensure_primary_store_exists"></a>
+
+## Function `ensure_primary_store_exists`
+
+Ensure that the primary store object for the given address exists. If it doesn't, create it.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_ensure_primary_store_exists">ensure_primary_store_exists</a>&lt;T: key&gt;(owner: <b>address</b>, metadata: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): <a href="object.md#0x1_object_Object">object::Object</a>&lt;<a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">fungible_asset::FungibleStore</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_ensure_primary_store_exists">ensure_primary_store_exists</a>&lt;T: key&gt;(
+    owner: <b>address</b>,
+    metadata: Object&lt;T&gt;,
+): Object&lt;FungibleStore&gt; <b>acquires</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_DeriveRefPod">DeriveRefPod</a> {
+    <b>let</b> store_addr = <a href="primary_fungible_store.md#0x1_primary_fungible_store_primary_store_address">primary_store_address</a>(owner, metadata);
+    <b>if</b> (<a href="fungible_asset.md#0x1_fungible_asset_store_exists">fungible_asset::store_exists</a>(store_addr)) {
+        <a href="object.md#0x1_object_address_to_object">object::address_to_object</a>(store_addr)
+    } <b>else</b> {
+        <a href="primary_fungible_store.md#0x1_primary_fungible_store_create_primary_store">create_primary_store</a>(owner, metadata)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_primary_fungible_store_create_primary_store"></a>
+
+## Function `create_primary_store`
+
+Create a primary store object to hold fungible asset for the given address.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_create_primary_store">create_primary_store</a>&lt;T: key&gt;(owner_addr: <b>address</b>, metadata: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): <a href="object.md#0x1_object_Object">object::Object</a>&lt;<a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">fungible_asset::FungibleStore</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_create_primary_store">create_primary_store</a>&lt;T: key&gt;(
+    owner_addr: <b>address</b>,
+    metadata: Object&lt;T&gt;,
+): Object&lt;FungibleStore&gt; <b>acquires</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_DeriveRefPod">DeriveRefPod</a> {
+    <b>let</b> metadata_addr = <a href="object.md#0x1_object_object_address">object::object_address</a>(&metadata);
+    <a href="object.md#0x1_object_address_to_object">object::address_to_object</a>&lt;Metadata&gt;(metadata_addr);
+    <b>let</b> derive_ref = &<b>borrow_global</b>&lt;<a href="primary_fungible_store.md#0x1_primary_fungible_store_DeriveRefPod">DeriveRefPod</a>&gt;(metadata_addr).metadata_derive_ref;
+    <b>let</b> constructor_ref = &<a href="object.md#0x1_object_create_user_derived_object">object::create_user_derived_object</a>(owner_addr, derive_ref);
+    // Disable ungated transfer <b>as</b> deterministic stores shouldn't be transferrable.
+    <b>let</b> transfer_ref = &<a href="object.md#0x1_object_generate_transfer_ref">object::generate_transfer_ref</a>(constructor_ref);
+    <a href="object.md#0x1_object_disable_ungated_transfer">object::disable_ungated_transfer</a>(transfer_ref);
+
+    <a href="fungible_asset.md#0x1_fungible_asset_create_store">fungible_asset::create_store</a>(constructor_ref, metadata)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_primary_fungible_store_primary_store_address"></a>
+
+## Function `primary_store_address`
+
+Get the address of the primary store for the given account.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_primary_store_address">primary_store_address</a>&lt;T: key&gt;(owner: <b>address</b>, metadata: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_primary_store_address">primary_store_address</a>&lt;T: key&gt;(owner: <b>address</b>, metadata: Object&lt;T&gt;): <b>address</b> {
+    <b>let</b> metadata_addr = <a href="object.md#0x1_object_object_address">object::object_address</a>(&metadata);
+    <a href="object.md#0x1_object_create_user_derived_object_address">object::create_user_derived_object_address</a>(owner, metadata_addr)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_primary_fungible_store_primary_store"></a>
+
+## Function `primary_store`
+
+Get the primary store object for the given account.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_primary_store">primary_store</a>&lt;T: key&gt;(owner: <b>address</b>, metadata: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): <a href="object.md#0x1_object_Object">object::Object</a>&lt;<a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">fungible_asset::FungibleStore</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_primary_store">primary_store</a>&lt;T: key&gt;(owner: <b>address</b>, metadata: Object&lt;T&gt;): Object&lt;FungibleStore&gt; {
+    <b>let</b> store = <a href="primary_fungible_store.md#0x1_primary_fungible_store_primary_store_address">primary_store_address</a>(owner, metadata);
+    <a href="object.md#0x1_object_address_to_object">object::address_to_object</a>&lt;FungibleStore&gt;(store)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_primary_fungible_store_primary_store_exists"></a>
+
+## Function `primary_store_exists`
+
+Return whether the given account's primary store exists.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_primary_store_exists">primary_store_exists</a>&lt;T: key&gt;(<a href="account.md#0x1_account">account</a>: <b>address</b>, metadata: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_primary_store_exists">primary_store_exists</a>&lt;T: key&gt;(<a href="account.md#0x1_account">account</a>: <b>address</b>, metadata: Object&lt;T&gt;): bool {
+    <a href="fungible_asset.md#0x1_fungible_asset_store_exists">fungible_asset::store_exists</a>(<a href="primary_fungible_store.md#0x1_primary_fungible_store_primary_store_address">primary_store_address</a>(<a href="account.md#0x1_account">account</a>, metadata))
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_primary_fungible_store_primary_store_address_inlined"></a>
+
+## Function `primary_store_address_inlined`
+
+Get the address of the primary store for the given account.
+Use instead of the corresponding view functions for dispatchable hooks to avoid circular dependencies of modules.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_primary_store_address_inlined">primary_store_address_inlined</a>&lt;T: key&gt;(owner: <b>address</b>, metadata: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_primary_store_address_inlined">primary_store_address_inlined</a>&lt;T: key&gt;(owner: <b>address</b>, metadata: Object&lt;T&gt;): <b>address</b> {
+    <b>let</b> metadata_addr = <a href="object.md#0x1_object_object_address">object::object_address</a>(&metadata);
+    <a href="object.md#0x1_object_create_user_derived_object_address">object::create_user_derived_object_address</a>(owner, metadata_addr)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_primary_fungible_store_primary_store_inlined"></a>
+
+## Function `primary_store_inlined`
+
+Get the primary store object for the given account.
+Use instead of the corresponding view functions for dispatchable hooks to avoid circular dependencies of modules.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_primary_store_inlined">primary_store_inlined</a>&lt;T: key&gt;(owner: <b>address</b>, metadata: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): <a href="object.md#0x1_object_Object">object::Object</a>&lt;<a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">fungible_asset::FungibleStore</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_primary_store_inlined">primary_store_inlined</a>&lt;T: key&gt;(owner: <b>address</b>, metadata: Object&lt;T&gt;): Object&lt;FungibleStore&gt; {
+    <b>let</b> store = <a href="primary_fungible_store.md#0x1_primary_fungible_store_primary_store_address_inlined">primary_store_address_inlined</a>(owner, metadata);
+    <a href="object.md#0x1_object_address_to_object">object::address_to_object</a>(store)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_primary_fungible_store_primary_store_exists_inlined"></a>
+
+## Function `primary_store_exists_inlined`
+
+Return whether the given account's primary store exists.
+Use instead of the corresponding view functions for dispatchable hooks to avoid circular dependencies of modules.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_primary_store_exists_inlined">primary_store_exists_inlined</a>&lt;T: key&gt;(<a href="account.md#0x1_account">account</a>: <b>address</b>, metadata: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_primary_store_exists_inlined">primary_store_exists_inlined</a>&lt;T: key&gt;(<a href="account.md#0x1_account">account</a>: <b>address</b>, metadata: Object&lt;T&gt;): bool {
+    <a href="fungible_asset.md#0x1_fungible_asset_store_exists">fungible_asset::store_exists</a>(<a href="primary_fungible_store.md#0x1_primary_fungible_store_primary_store_address_inlined">primary_store_address_inlined</a>(<a href="account.md#0x1_account">account</a>, metadata))
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_primary_fungible_store_balance"></a>
+
+## Function `balance`
+
+Get the balance of <code><a href="account.md#0x1_account">account</a></code>'s primary store.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_balance">balance</a>&lt;T: key&gt;(<a href="account.md#0x1_account">account</a>: <b>address</b>, metadata: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_balance">balance</a>&lt;T: key&gt;(<a href="account.md#0x1_account">account</a>: <b>address</b>, metadata: Object&lt;T&gt;): u64 {
+    <b>if</b> (<a href="primary_fungible_store.md#0x1_primary_fungible_store_primary_store_exists">primary_store_exists</a>(<a href="account.md#0x1_account">account</a>, metadata)) {
+        <a href="fungible_asset.md#0x1_fungible_asset_balance">fungible_asset::balance</a>(<a href="primary_fungible_store.md#0x1_primary_fungible_store_primary_store">primary_store</a>(<a href="account.md#0x1_account">account</a>, metadata))
+    } <b>else</b> {
+        0
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_primary_fungible_store_is_balance_at_least"></a>
+
+## Function `is_balance_at_least`
+
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_is_balance_at_least">is_balance_at_least</a>&lt;T: key&gt;(<a href="account.md#0x1_account">account</a>: <b>address</b>, metadata: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, amount: u64): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_is_balance_at_least">is_balance_at_least</a>&lt;T: key&gt;(<a href="account.md#0x1_account">account</a>: <b>address</b>, metadata: Object&lt;T&gt;, amount: u64): bool {
+    <b>if</b> (<a href="primary_fungible_store.md#0x1_primary_fungible_store_primary_store_exists">primary_store_exists</a>(<a href="account.md#0x1_account">account</a>, metadata)) {
+        <a href="fungible_asset.md#0x1_fungible_asset_is_balance_at_least">fungible_asset::is_balance_at_least</a>(<a href="primary_fungible_store.md#0x1_primary_fungible_store_primary_store">primary_store</a>(<a href="account.md#0x1_account">account</a>, metadata), amount)
+    } <b>else</b> {
+        amount == 0
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_primary_fungible_store_is_frozen"></a>
+
+## Function `is_frozen`
+
+Return whether the given account's primary store is frozen.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_is_frozen">is_frozen</a>&lt;T: key&gt;(<a href="account.md#0x1_account">account</a>: <b>address</b>, metadata: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_is_frozen">is_frozen</a>&lt;T: key&gt;(<a href="account.md#0x1_account">account</a>: <b>address</b>, metadata: Object&lt;T&gt;): bool {
+    <b>if</b> (<a href="primary_fungible_store.md#0x1_primary_fungible_store_primary_store_exists">primary_store_exists</a>(<a href="account.md#0x1_account">account</a>, metadata)) {
+        <a href="fungible_asset.md#0x1_fungible_asset_is_frozen">fungible_asset::is_frozen</a>(<a href="primary_fungible_store.md#0x1_primary_fungible_store_primary_store">primary_store</a>(<a href="account.md#0x1_account">account</a>, metadata))
+    } <b>else</b> {
+        <b>false</b>
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_primary_fungible_store_withdraw"></a>
+
+## Function `withdraw`
+
+Withdraw <code>amount</code> of fungible asset from the given account's primary store.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_withdraw">withdraw</a>&lt;T: key&gt;(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, metadata: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, amount: u64): <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">fungible_asset::FungibleAsset</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_withdraw">withdraw</a>&lt;T: key&gt;(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, metadata: Object&lt;T&gt;, amount: u64): FungibleAsset <b>acquires</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_DeriveRefPod">DeriveRefPod</a> {
+    <b>let</b> store = <a href="primary_fungible_store.md#0x1_primary_fungible_store_ensure_primary_store_exists">ensure_primary_store_exists</a>(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(owner), metadata);
+    // Check <b>if</b> the store <a href="object.md#0x1_object">object</a> <b>has</b> been burnt or not. If so, unburn it first.
+    <a href="primary_fungible_store.md#0x1_primary_fungible_store_may_be_unburn">may_be_unburn</a>(owner, store);
+    <a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_withdraw">dispatchable_fungible_asset::withdraw</a>(owner, store, amount)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_primary_fungible_store_deposit"></a>
+
+## Function `deposit`
+
+Deposit fungible asset <code>fa</code> to the given account's primary store.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_deposit">deposit</a>(owner: <b>address</b>, fa: <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">fungible_asset::FungibleAsset</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_deposit">deposit</a>(owner: <b>address</b>, fa: FungibleAsset) <b>acquires</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_DeriveRefPod">DeriveRefPod</a> {
+    <b>let</b> metadata = <a href="fungible_asset.md#0x1_fungible_asset_asset_metadata">fungible_asset::asset_metadata</a>(&fa);
+    <b>let</b> store = <a href="primary_fungible_store.md#0x1_primary_fungible_store_ensure_primary_store_exists">ensure_primary_store_exists</a>(owner, metadata);
+    <a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_deposit">dispatchable_fungible_asset::deposit</a>(store, fa);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_primary_fungible_store_force_deposit"></a>
+
+## Function `force_deposit`
+
+Deposit fungible asset <code>fa</code> to the given account's primary store.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_force_deposit">force_deposit</a>(owner: <b>address</b>, fa: <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">fungible_asset::FungibleAsset</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_force_deposit">force_deposit</a>(owner: <b>address</b>, fa: FungibleAsset) <b>acquires</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_DeriveRefPod">DeriveRefPod</a> {
+    <b>let</b> metadata = <a href="fungible_asset.md#0x1_fungible_asset_asset_metadata">fungible_asset::asset_metadata</a>(&fa);
+    <b>let</b> store = <a href="primary_fungible_store.md#0x1_primary_fungible_store_ensure_primary_store_exists">ensure_primary_store_exists</a>(owner, metadata);
+    <a href="fungible_asset.md#0x1_fungible_asset_deposit_internal">fungible_asset::deposit_internal</a>(<a href="object.md#0x1_object_object_address">object::object_address</a>(&store), fa);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_primary_fungible_store_transfer"></a>
+
+## Function `transfer`
+
+Transfer <code>amount</code> of fungible asset from sender's primary store to receiver's primary store.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_transfer">transfer</a>&lt;T: key&gt;(sender: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, metadata: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, recipient: <b>address</b>, amount: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_transfer">transfer</a>&lt;T: key&gt;(
+    sender: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    metadata: Object&lt;T&gt;,
+    recipient: <b>address</b>,
+    amount: u64,
+) <b>acquires</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_DeriveRefPod">DeriveRefPod</a> {
+    <b>let</b> sender_store = <a href="primary_fungible_store.md#0x1_primary_fungible_store_ensure_primary_store_exists">ensure_primary_store_exists</a>(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(sender), metadata);
+    // Check <b>if</b> the sender store <a href="object.md#0x1_object">object</a> <b>has</b> been burnt or not. If so, unburn it first.
+    <a href="primary_fungible_store.md#0x1_primary_fungible_store_may_be_unburn">may_be_unburn</a>(sender, sender_store);
+    <b>let</b> recipient_store = <a href="primary_fungible_store.md#0x1_primary_fungible_store_ensure_primary_store_exists">ensure_primary_store_exists</a>(recipient, metadata);
+    <a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_transfer">dispatchable_fungible_asset::transfer</a>(sender, sender_store, recipient_store, amount);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_primary_fungible_store_transfer_assert_minimum_deposit"></a>
+
+## Function `transfer_assert_minimum_deposit`
+
+Transfer <code>amount</code> of fungible asset from sender's primary store to receiver's primary store.
+Use the minimum deposit assertion api to make sure receipient will receive a minimum amount of fund.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_transfer_assert_minimum_deposit">transfer_assert_minimum_deposit</a>&lt;T: key&gt;(sender: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, metadata: <a href="object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, recipient: <b>address</b>, amount: u64, expected: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_transfer_assert_minimum_deposit">transfer_assert_minimum_deposit</a>&lt;T: key&gt;(
+    sender: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    metadata: Object&lt;T&gt;,
+    recipient: <b>address</b>,
+    amount: u64,
+    expected: u64,
+) <b>acquires</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_DeriveRefPod">DeriveRefPod</a> {
+    <b>let</b> sender_store = <a href="primary_fungible_store.md#0x1_primary_fungible_store_ensure_primary_store_exists">ensure_primary_store_exists</a>(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(sender), metadata);
+    // Check <b>if</b> the sender store <a href="object.md#0x1_object">object</a> <b>has</b> been burnt or not. If so, unburn it first.
+    <a href="primary_fungible_store.md#0x1_primary_fungible_store_may_be_unburn">may_be_unburn</a>(sender, sender_store);
+    <b>let</b> recipient_store = <a href="primary_fungible_store.md#0x1_primary_fungible_store_ensure_primary_store_exists">ensure_primary_store_exists</a>(recipient, metadata);
+    <a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_transfer_assert_minimum_deposit">dispatchable_fungible_asset::transfer_assert_minimum_deposit</a>(
+        sender,
+        sender_store,
+        recipient_store,
+        amount,
+        expected
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_primary_fungible_store_mint"></a>
+
+## Function `mint`
+
+Mint to the primary store of <code>owner</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_mint">mint</a>(mint_ref: &<a href="fungible_asset.md#0x1_fungible_asset_MintRef">fungible_asset::MintRef</a>, owner: <b>address</b>, amount: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_mint">mint</a>(mint_ref: &MintRef, owner: <b>address</b>, amount: u64) <b>acquires</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_DeriveRefPod">DeriveRefPod</a> {
+    <b>let</b> primary_store = <a href="primary_fungible_store.md#0x1_primary_fungible_store_ensure_primary_store_exists">ensure_primary_store_exists</a>(owner, <a href="fungible_asset.md#0x1_fungible_asset_mint_ref_metadata">fungible_asset::mint_ref_metadata</a>(mint_ref));
+    <a href="fungible_asset.md#0x1_fungible_asset_mint_to">fungible_asset::mint_to</a>(mint_ref, primary_store, amount);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_primary_fungible_store_burn"></a>
+
+## Function `burn`
+
+Burn from the primary store of <code>owner</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_burn">burn</a>(burn_ref: &<a href="fungible_asset.md#0x1_fungible_asset_BurnRef">fungible_asset::BurnRef</a>, owner: <b>address</b>, amount: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_burn">burn</a>(burn_ref: &BurnRef, owner: <b>address</b>, amount: u64) {
+    <b>let</b> primary_store = <a href="primary_fungible_store.md#0x1_primary_fungible_store_primary_store">primary_store</a>(owner, <a href="fungible_asset.md#0x1_fungible_asset_burn_ref_metadata">fungible_asset::burn_ref_metadata</a>(burn_ref));
+    <a href="fungible_asset.md#0x1_fungible_asset_burn_from">fungible_asset::burn_from</a>(burn_ref, primary_store, amount);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_primary_fungible_store_set_frozen_flag"></a>
+
+## Function `set_frozen_flag`
+
+Freeze/Unfreeze the primary store of <code>owner</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_set_frozen_flag">set_frozen_flag</a>(transfer_ref: &<a href="fungible_asset.md#0x1_fungible_asset_TransferRef">fungible_asset::TransferRef</a>, owner: <b>address</b>, frozen: bool)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_set_frozen_flag">set_frozen_flag</a>(transfer_ref: &TransferRef, owner: <b>address</b>, frozen: bool) <b>acquires</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_DeriveRefPod">DeriveRefPod</a> {
+    <b>let</b> primary_store = <a href="primary_fungible_store.md#0x1_primary_fungible_store_ensure_primary_store_exists">ensure_primary_store_exists</a>(owner, <a href="fungible_asset.md#0x1_fungible_asset_transfer_ref_metadata">fungible_asset::transfer_ref_metadata</a>(transfer_ref));
+    <a href="fungible_asset.md#0x1_fungible_asset_set_frozen_flag">fungible_asset::set_frozen_flag</a>(transfer_ref, primary_store, frozen);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_primary_fungible_store_withdraw_with_ref"></a>
+
+## Function `withdraw_with_ref`
+
+Withdraw from the primary store of <code>owner</code> ignoring frozen flag.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_withdraw_with_ref">withdraw_with_ref</a>(transfer_ref: &<a href="fungible_asset.md#0x1_fungible_asset_TransferRef">fungible_asset::TransferRef</a>, owner: <b>address</b>, amount: u64): <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">fungible_asset::FungibleAsset</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_withdraw_with_ref">withdraw_with_ref</a>(transfer_ref: &TransferRef, owner: <b>address</b>, amount: u64): FungibleAsset {
+    <b>let</b> from_primary_store = <a href="primary_fungible_store.md#0x1_primary_fungible_store_primary_store">primary_store</a>(owner, <a href="fungible_asset.md#0x1_fungible_asset_transfer_ref_metadata">fungible_asset::transfer_ref_metadata</a>(transfer_ref));
+    <a href="fungible_asset.md#0x1_fungible_asset_withdraw_with_ref">fungible_asset::withdraw_with_ref</a>(transfer_ref, from_primary_store, amount)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_primary_fungible_store_deposit_with_ref"></a>
+
+## Function `deposit_with_ref`
+
+Deposit from the primary store of <code>owner</code> ignoring frozen flag.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_deposit_with_ref">deposit_with_ref</a>(transfer_ref: &<a href="fungible_asset.md#0x1_fungible_asset_TransferRef">fungible_asset::TransferRef</a>, owner: <b>address</b>, fa: <a href="fungible_asset.md#0x1_fungible_asset_FungibleAsset">fungible_asset::FungibleAsset</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_deposit_with_ref">deposit_with_ref</a>(transfer_ref: &TransferRef, owner: <b>address</b>, fa: FungibleAsset) <b>acquires</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_DeriveRefPod">DeriveRefPod</a> {
+    <b>let</b> from_primary_store = <a href="primary_fungible_store.md#0x1_primary_fungible_store_ensure_primary_store_exists">ensure_primary_store_exists</a>(
+        owner,
+        <a href="fungible_asset.md#0x1_fungible_asset_transfer_ref_metadata">fungible_asset::transfer_ref_metadata</a>(transfer_ref)
+    );
+    <a href="fungible_asset.md#0x1_fungible_asset_deposit_with_ref">fungible_asset::deposit_with_ref</a>(transfer_ref, from_primary_store, fa);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_primary_fungible_store_transfer_with_ref"></a>
+
+## Function `transfer_with_ref`
+
+Transfer <code>amount</code> of FA from the primary store of <code>from</code> to that of <code><b>to</b></code> ignoring frozen flag.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_transfer_with_ref">transfer_with_ref</a>(transfer_ref: &<a href="fungible_asset.md#0x1_fungible_asset_TransferRef">fungible_asset::TransferRef</a>, from: <b>address</b>, <b>to</b>: <b>address</b>, amount: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_transfer_with_ref">transfer_with_ref</a>(
+    transfer_ref: &TransferRef,
+    from: <b>address</b>,
+    <b>to</b>: <b>address</b>,
+    amount: u64
+) <b>acquires</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_DeriveRefPod">DeriveRefPod</a> {
+    <b>let</b> from_primary_store = <a href="primary_fungible_store.md#0x1_primary_fungible_store_primary_store">primary_store</a>(from, <a href="fungible_asset.md#0x1_fungible_asset_transfer_ref_metadata">fungible_asset::transfer_ref_metadata</a>(transfer_ref));
+    <b>let</b> to_primary_store = <a href="primary_fungible_store.md#0x1_primary_fungible_store_ensure_primary_store_exists">ensure_primary_store_exists</a>(<b>to</b>, <a href="fungible_asset.md#0x1_fungible_asset_transfer_ref_metadata">fungible_asset::transfer_ref_metadata</a>(transfer_ref));
+    <a href="fungible_asset.md#0x1_fungible_asset_transfer_with_ref">fungible_asset::transfer_with_ref</a>(transfer_ref, from_primary_store, to_primary_store, amount);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_primary_fungible_store_may_be_unburn"></a>
+
+## Function `may_be_unburn`
+
+
+
+<pre><code><b>fun</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_may_be_unburn">may_be_unburn</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, store: <a href="object.md#0x1_object_Object">object::Object</a>&lt;<a href="fungible_asset.md#0x1_fungible_asset_FungibleStore">fungible_asset::FungibleStore</a>&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_may_be_unburn">may_be_unburn</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, store: Object&lt;FungibleStore&gt;) {
+    <b>if</b> (<a href="object.md#0x1_object_is_burnt">object::is_burnt</a>(store)) {
+        <a href="object.md#0x1_object_unburn">object::unburn</a>(owner, store);
+    };
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_0"></a>
+
+## Specification
+
+
+
+
+<a id="high-level-req"></a>
+
+### High-level Requirements
+
+<table>
+<tr>
+<th>No.</th><th>Requirement</th><th>Criticality</th><th>Implementation</th><th>Enforcement</th>
+</tr>
+
+<tr>
+<td>1</td>
+<td>Creating a fungible asset with primary store support should initiate a derived reference and store it under the metadata object.</td>
+<td>Medium</td>
+<td>The function create_primary_store_enabled_fungible_asset makes an existing object, fungible, via the fungible_asset::add_fungibility function and initializes the DeriveRefPod resource by generating a DeriveRef for the object and then stores it under the object address.</td>
+<td>Audited that the DeriveRefPod has been properly initialized and stored under the metadata object.</td>
+</tr>
+
+<tr>
+<td>2</td>
+<td>Fetching and creating a primary fungible store of an asset should only succeed if the object supports primary store.</td>
+<td>Low</td>
+<td>The function create_primary_store is used to create a primary store by borrowing the DeriveRef resource from the object. In case the resource does not exist, creation will fail. The function ensure_primary_store_exists is used to fetch the primary store if it exists, otherwise it will create one via the create_primary function.</td>
+<td>Audited that it aborts if the DeriveRefPod doesn't exist. Audited that it aborts if the FungibleStore resource exists already under the object address.</td>
+</tr>
+
+<tr>
+<td>3</td>
+<td>It should be possible to create a primary store to hold a fungible asset.</td>
+<td>Medium</td>
+<td>The function create_primary_store borrows the DeriveRef resource from DeriveRefPod and then creates the store which is returned.</td>
+<td>Audited that it returns the newly created FungibleStore.</td>
+</tr>
+
+<tr>
+<td>4</td>
+<td>Fetching the balance or the frozen status of a primary store should never abort.</td>
+<td>Low</td>
+<td>The function balance returns the balance of the store, if the store exists, otherwise it returns 0. The function is_frozen returns the frozen flag of the fungible store, if the store exists, otherwise it returns false.</td>
+<td>Audited that the balance function returns the balance of the FungibleStore. Audited that the is_frozen function returns the frozen status of the FungibleStore resource. Audited that it never aborts.</td>
+</tr>
+
+<tr>
+<td>5</td>
+<td>The ability to withdraw, deposit, transfer, mint and burn should only be available for assets with primary store support.</td>
+<td>Medium</td>
+<td>The primary store is fetched before performing either of withdraw, deposit, transfer, mint, burn operation. If the FungibleStore resource doesn't exist the operation will fail.</td>
+<td>Audited that it aborts if the primary store FungibleStore doesn't exist.</td>
+</tr>
+
+<tr>
+<td>6</td>
+<td>The action of depositing a fungible asset of the same type as the store should never fail if the store is not frozen.</td>
+<td>Medium</td>
+<td>The function deposit fetches the owner's store, if it doesn't exist it will be created, and then deposits the fungible asset to it. The function deposit_with_ref fetches the owner's store, if it doesn't exist it will be created, and then deposit the fungible asset via the fungible_asset::deposit_with_ref function. Depositing fails if the metadata of the FungibleStore and FungibleAsset differs.</td>
+<td>Audited that it aborts if the store is frozen (deposit). Audited that the balance of the store is increased by the deposit amount (deposit, deposit_with_ref). Audited that it aborts if the metadata of the store and the asset differs (deposit, deposit_with_ref).</td>
+</tr>
+
+<tr>
+<td>7</td>
+<td>Withdrawing should only be allowed to the owner of an existing store with sufficient balance.</td>
+<td>Critical</td>
+<td>The withdraw function fetches the owner's store via the primary_store function and then calls fungible_asset::withdraw which validates the owner of the store, checks the frozen status and the balance of the store. The withdraw_with_ref function fetches the store of the owner via primary_store function and calls the fungible_asset::withdraw_with_ref which validates transfer_ref's metadata with the withdrawing stores metadata, and the balance of the store.</td>
+<td>Audited that it aborts if the owner doesn't own the store (withdraw). Audited that it aborts if the store is frozen (withdraw). Audited that it aborts if the transfer ref's metadata doesn't match the withdrawing store's metadata (withdraw_with_ref). Audited that it aborts if the store doesn't have sufficient balance. Audited that the store is not burned. Audited that the balance of the store is decreased by the amount withdrawn.</td>
+</tr>
+
+<tr>
+<td>8</td>
+<td>Only the fungible store owner is allowed to unburn a burned store.</td>
+<td>High</td>
+<td>The function may_be_unburn checks if the store is burned and then proceeds to call object::unburn which ensures that the owner of the object matches the address of the signer.</td>
+<td>Audited that the store is unburned successfully.</td>
+</tr>
+
+<tr>
+<td>9</td>
+<td>Only the owner of a primary store can transfer its balance to any recipient's primary store.</td>
+<td>High</td>
+<td>The function transfer fetches sender and recipient's primary stores, if the sender's store is burned it unburns the store and calls the fungile_asset::transfer to proceed with the transfer, which first withdraws the assets from the sender's store and then deposits to the recipient's store. The function transfer_with_ref fetches the sender's and recipient's stores and calls the fungible_asset::transfer_with_ref function which withdraws the asset with the ref from the sender and deposits the asset to the recipient with the ref.</td>
+<td>Audited the deposit and withdraw (transfer). Audited the deposit_with_ref and withdraw_with_ref (transfer_with_ref). Audited that the store balance of the sender is decreased by the specified amount and its added to the recipients store. (transfer, transfer_with_ref) Audited that the sender's store is not burned (transfer).</td>
+</tr>
+
+<tr>
+<td>10</td>
+<td>Minting an amount of assets to an unfrozen store is only allowed with a valid mint reference.</td>
+<td>High</td>
+<td>The mint function fetches the primary store and calls the fungible_asset::mint_to, which mints with MintRef's metadata which internally validates the amount and the increases the total supply of the asset. And the minted asset is deposited to the provided store by validating that the store is unfrozen and the store's metadata is the same as the depositing asset's metadata.</td>
+<td>Audited that it aborts if the amount is equal to 0. Audited that it aborts if the store is frozen. Audited that it aborts if the mint_ref's metadata is not the same as the store's metadata. Audited that the asset's total supply is increased by the amount minted. Audited that the balance of the store is increased by the minted amount.</td>
+</tr>
+
+<tr>
+<td>11</td>
+<td>Burning an amount of assets from an existing unfrozen store is only allowed with a valid burn reference.</td>
+<td>High</td>
+<td>The burn function fetches the primary store and calls the fungible_asset::burn_from function which withdraws the amount from the store while enforcing that the store has enough balance and burns the withdrawn asset after validating the asset's metadata and the BurnRef's metadata followed by decreasing the supply of the asset.</td>
+<td>Audited that it aborts if the metadata of the store is not same as the BurnRef's metadata. Audited that it aborts if the burning amount is 0. Audited that it aborts if the store doesn't have enough balance. Audited that it aborts if the asset's metadata is not same as the BurnRef's metadata. Audited that the total supply of the asset is decreased. Audited that the store's balance is reduced by the amount burned.</td>
+</tr>
+
+<tr>
+<td>12</td>
+<td>Setting the frozen flag of a store is only allowed with a valid reference.</td>
+<td>High</td>
+<td>The function set_frozen_flag fetches the primary store and calls fungible_asset::set_frozen_flag which validates the TransferRef's metadata with the store's metadata and then updates the frozen flag.</td>
+<td>Audited that it aborts if the store's metadata is not same as the TransferRef's metadata. Audited that the status of the frozen flag is updated correctly.</td>
+</tr>
+
+</table>
+
+
+
+
+<a id="module-level-spec"></a>
+
+### Module-level Specification
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+
+<a id="0x1_primary_fungible_store_spec_primary_store_exists"></a>
+
+
+<pre><code><b>fun</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_spec_primary_store_exists">spec_primary_store_exists</a>&lt;T: key&gt;(<a href="account.md#0x1_account">account</a>: <b>address</b>, metadata: Object&lt;T&gt;): bool {
+   <a href="fungible_asset.md#0x1_fungible_asset_store_exists">fungible_asset::store_exists</a>(<a href="primary_fungible_store.md#0x1_primary_fungible_store_spec_primary_store_address">spec_primary_store_address</a>(<a href="account.md#0x1_account">account</a>, metadata))
+}
+</code></pre>
+
+
+
+
+<a id="0x1_primary_fungible_store_spec_primary_store_address"></a>
+
+
+<pre><code><b>fun</b> <a href="primary_fungible_store.md#0x1_primary_fungible_store_spec_primary_store_address">spec_primary_store_address</a>&lt;T: key&gt;(owner: <b>address</b>, metadata: Object&lt;T&gt;): <b>address</b> {
+   <b>let</b> metadata_addr = <a href="object.md#0x1_object_object_address">object::object_address</a>(metadata);
+   <a href="object.md#0x1_object_spec_create_user_derived_object_address">object::spec_create_user_derived_object_address</a>(owner, metadata_addr)
+}
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/randomness.md b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/randomness.md
new file mode 100644
index 0000000000000..80f27e49459c6
--- /dev/null
+++ b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/randomness.md
@@ -0,0 +1,1336 @@
+
+<a id="0x1_randomness"></a>
+
+# Module `0x1::randomness`
+
+This module provides access to *instant* secure randomness generated by the Aptos validators, as documented in
+[AIP-41](https://github.com/aptos-foundation/AIPs/blob/main/aips/aip-41.md).
+
+Secure randomness means (1) the randomness cannot be predicted ahead of time by validators, developers or users
+and (2) the randomness cannot be biased in any way by validators, developers or users.
+
+Security holds under the same proof-of-stake assumption that secures the Aptos network.
+
+
+-  [Resource `PerBlockRandomness`](#0x1_randomness_PerBlockRandomness)
+-  [Struct `RandomnessGeneratedEvent`](#0x1_randomness_RandomnessGeneratedEvent)
+-  [Resource `Ghost$var`](#0x1_randomness_Ghost$var)
+-  [Constants](#@Constants_0)
+-  [Function `initialize`](#0x1_randomness_initialize)
+-  [Function `on_new_block`](#0x1_randomness_on_new_block)
+-  [Function `next_32_bytes`](#0x1_randomness_next_32_bytes)
+-  [Function `bytes`](#0x1_randomness_bytes)
+-  [Function `u8_integer`](#0x1_randomness_u8_integer)
+-  [Function `u16_integer`](#0x1_randomness_u16_integer)
+-  [Function `u32_integer`](#0x1_randomness_u32_integer)
+-  [Function `u64_integer`](#0x1_randomness_u64_integer)
+-  [Function `u128_integer`](#0x1_randomness_u128_integer)
+-  [Function `u256_integer`](#0x1_randomness_u256_integer)
+-  [Function `u256_integer_internal`](#0x1_randomness_u256_integer_internal)
+-  [Function `u8_range`](#0x1_randomness_u8_range)
+-  [Function `u16_range`](#0x1_randomness_u16_range)
+-  [Function `u32_range`](#0x1_randomness_u32_range)
+-  [Function `u64_range`](#0x1_randomness_u64_range)
+-  [Function `u64_range_internal`](#0x1_randomness_u64_range_internal)
+-  [Function `u128_range`](#0x1_randomness_u128_range)
+-  [Function `u256_range`](#0x1_randomness_u256_range)
+-  [Function `permutation`](#0x1_randomness_permutation)
+-  [Function `safe_add_mod`](#0x1_randomness_safe_add_mod)
+-  [Function `take_first`](#0x1_randomness_take_first)
+-  [Function `fetch_and_increment_txn_counter`](#0x1_randomness_fetch_and_increment_txn_counter)
+-  [Function `is_unbiasable`](#0x1_randomness_is_unbiasable)
+-  [Specification](#@Specification_1)
+    -  [Function `initialize`](#@Specification_1_initialize)
+    -  [Function `on_new_block`](#@Specification_1_on_new_block)
+    -  [Function `next_32_bytes`](#@Specification_1_next_32_bytes)
+    -  [Function `u8_integer`](#@Specification_1_u8_integer)
+    -  [Function `u16_integer`](#@Specification_1_u16_integer)
+    -  [Function `u32_integer`](#@Specification_1_u32_integer)
+    -  [Function `u64_integer`](#@Specification_1_u64_integer)
+    -  [Function `u128_integer`](#@Specification_1_u128_integer)
+    -  [Function `u256_integer`](#@Specification_1_u256_integer)
+    -  [Function `u256_integer_internal`](#@Specification_1_u256_integer_internal)
+    -  [Function `u8_range`](#@Specification_1_u8_range)
+    -  [Function `u64_range`](#@Specification_1_u64_range)
+    -  [Function `u256_range`](#@Specification_1_u256_range)
+    -  [Function `permutation`](#@Specification_1_permutation)
+    -  [Function `fetch_and_increment_txn_counter`](#@Specification_1_fetch_and_increment_txn_counter)
+    -  [Function `is_unbiasable`](#@Specification_1_is_unbiasable)
+
+
+<pre><code><b>use</b> <a href="event.md#0x1_event">0x1::event</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/hash.md#0x1_hash">0x1::hash</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option">0x1::option</a>;
+<b>use</b> <a href="system_addresses.md#0x1_system_addresses">0x1::system_addresses</a>;
+<b>use</b> <a href="transaction_context.md#0x1_transaction_context">0x1::transaction_context</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">0x1::vector</a>;
+</code></pre>
+
+
+
+<a id="0x1_randomness_PerBlockRandomness"></a>
+
+## Resource `PerBlockRandomness`
+
+32-byte randomness seed unique to every block.
+This resource is updated in every block prologue.
+
+
+<pre><code><b>struct</b> <a href="randomness.md#0x1_randomness_PerBlockRandomness">PerBlockRandomness</a> <b>has</b> drop, key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>epoch: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>round: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>seed: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_randomness_RandomnessGeneratedEvent"></a>
+
+## Struct `RandomnessGeneratedEvent`
+
+Event emitted every time a public randomness API in this module is called.
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="randomness.md#0x1_randomness_RandomnessGeneratedEvent">RandomnessGeneratedEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>dummy_field: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_randomness_Ghost$var"></a>
+
+## Resource `Ghost$var`
+
+
+
+<pre><code><b>struct</b> Ghost$<a href="randomness.md#0x1_randomness_var">var</a> <b>has</b> <b>copy</b>, drop, store, key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>v: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_randomness_MAX_U256"></a>
+
+
+
+<pre><code><b>const</b> <a href="randomness.md#0x1_randomness_MAX_U256">MAX_U256</a>: u256 = 115792089237316195423570985008687907853269984665640564039457584007913129639935;
+</code></pre>
+
+
+
+<a id="0x1_randomness_DST"></a>
+
+
+
+<pre><code><b>const</b> <a href="randomness.md#0x1_randomness_DST">DST</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; = [65, 80, 84, 79, 83, 95, 82, 65, 78, 68, 79, 77, 78, 69, 83, 83];
+</code></pre>
+
+
+
+<a id="0x1_randomness_E_API_USE_IS_BIASIBLE"></a>
+
+Randomness APIs calls must originate from a private entry function with
+<code>#[<a href="randomness.md#0x1_randomness">randomness</a>]</code> annotation. Otherwise, malicious users can bias randomness result.
+
+
+<pre><code><b>const</b> <a href="randomness.md#0x1_randomness_E_API_USE_IS_BIASIBLE">E_API_USE_IS_BIASIBLE</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_randomness_initialize"></a>
+
+## Function `initialize`
+
+Called in genesis.move.
+Must be called in tests to initialize the <code><a href="randomness.md#0x1_randomness_PerBlockRandomness">PerBlockRandomness</a></code> resource.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness.md#0x1_randomness_initialize">initialize</a>(framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness.md#0x1_randomness_initialize">initialize</a>(framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>) {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(framework);
+    <b>if</b> (!<b>exists</b>&lt;<a href="randomness.md#0x1_randomness_PerBlockRandomness">PerBlockRandomness</a>&gt;(@aptos_framework)) {
+        <b>move_to</b>(framework, <a href="randomness.md#0x1_randomness_PerBlockRandomness">PerBlockRandomness</a> {
+            epoch: 0,
+            round: 0,
+            seed: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>(),
+        });
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_randomness_on_new_block"></a>
+
+## Function `on_new_block`
+
+Invoked in block prologues to update the block-level randomness seed.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="randomness.md#0x1_randomness_on_new_block">on_new_block</a>(vm: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, epoch: u64, round: u64, seed_for_new_block: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="randomness.md#0x1_randomness_on_new_block">on_new_block</a>(vm: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, epoch: u64, round: u64, seed_for_new_block: Option&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;) <b>acquires</b> <a href="randomness.md#0x1_randomness_PerBlockRandomness">PerBlockRandomness</a> {
+    <a href="system_addresses.md#0x1_system_addresses_assert_vm">system_addresses::assert_vm</a>(vm);
+    <b>if</b> (<b>exists</b>&lt;<a href="randomness.md#0x1_randomness_PerBlockRandomness">PerBlockRandomness</a>&gt;(@aptos_framework)) {
+        <b>let</b> <a href="randomness.md#0x1_randomness">randomness</a> = <b>borrow_global_mut</b>&lt;<a href="randomness.md#0x1_randomness_PerBlockRandomness">PerBlockRandomness</a>&gt;(@aptos_framework);
+        <a href="randomness.md#0x1_randomness">randomness</a>.epoch = epoch;
+        <a href="randomness.md#0x1_randomness">randomness</a>.round = round;
+        <a href="randomness.md#0x1_randomness">randomness</a>.seed = seed_for_new_block;
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_randomness_next_32_bytes"></a>
+
+## Function `next_32_bytes`
+
+Generate the next 32 random bytes. Repeated calls will yield different results (assuming the collision-resistance
+of the hash function).
+
+
+<pre><code><b>fun</b> <a href="randomness.md#0x1_randomness_next_32_bytes">next_32_bytes</a>(): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="randomness.md#0x1_randomness_next_32_bytes">next_32_bytes</a>(): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; <b>acquires</b> <a href="randomness.md#0x1_randomness_PerBlockRandomness">PerBlockRandomness</a> {
+    <b>assert</b>!(<a href="randomness.md#0x1_randomness_is_unbiasable">is_unbiasable</a>(), <a href="randomness.md#0x1_randomness_E_API_USE_IS_BIASIBLE">E_API_USE_IS_BIASIBLE</a>);
+
+    <b>let</b> input = <a href="randomness.md#0x1_randomness_DST">DST</a>;
+    <b>let</b> <a href="randomness.md#0x1_randomness">randomness</a> = <b>borrow_global</b>&lt;<a href="randomness.md#0x1_randomness_PerBlockRandomness">PerBlockRandomness</a>&gt;(@aptos_framework);
+    <b>let</b> seed = *<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(&<a href="randomness.md#0x1_randomness">randomness</a>.seed);
+
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_append">vector::append</a>(&<b>mut</b> input, seed);
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_append">vector::append</a>(&<b>mut</b> input, <a href="transaction_context.md#0x1_transaction_context_get_transaction_hash">transaction_context::get_transaction_hash</a>());
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_append">vector::append</a>(&<b>mut</b> input, <a href="randomness.md#0x1_randomness_fetch_and_increment_txn_counter">fetch_and_increment_txn_counter</a>());
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/hash.md#0x1_hash_sha3_256">hash::sha3_256</a>(input)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_randomness_bytes"></a>
+
+## Function `bytes`
+
+Generates a sequence of bytes uniformly at random
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness.md#0x1_randomness_bytes">bytes</a>(n: u64): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness.md#0x1_randomness_bytes">bytes</a>(n: u64): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; <b>acquires</b> <a href="randomness.md#0x1_randomness_PerBlockRandomness">PerBlockRandomness</a> {
+    <b>let</b> v = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>[];
+    <b>let</b> c = 0;
+    <b>while</b> (c &lt; n) {
+        <b>let</b> blob = <a href="randomness.md#0x1_randomness_next_32_bytes">next_32_bytes</a>();
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_reverse_append">vector::reverse_append</a>(&<b>mut</b> v, blob);
+
+        c = c + 32;
+    };
+
+    <b>if</b> (c &gt; n) {
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_trim">vector::trim</a>(&<b>mut</b> v, n);
+    };
+
+    <a href="event.md#0x1_event_emit">event::emit</a>(<a href="randomness.md#0x1_randomness_RandomnessGeneratedEvent">RandomnessGeneratedEvent</a> {});
+
+    v
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_randomness_u8_integer"></a>
+
+## Function `u8_integer`
+
+Generates an u8 uniformly at random.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness.md#0x1_randomness_u8_integer">u8_integer</a>(): u8
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness.md#0x1_randomness_u8_integer">u8_integer</a>(): u8 <b>acquires</b> <a href="randomness.md#0x1_randomness_PerBlockRandomness">PerBlockRandomness</a> {
+    <b>let</b> raw = <a href="randomness.md#0x1_randomness_next_32_bytes">next_32_bytes</a>();
+    <b>let</b> ret: u8 = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_pop_back">vector::pop_back</a>(&<b>mut</b> raw);
+
+    <a href="event.md#0x1_event_emit">event::emit</a>(<a href="randomness.md#0x1_randomness_RandomnessGeneratedEvent">RandomnessGeneratedEvent</a> {});
+
+    ret
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_randomness_u16_integer"></a>
+
+## Function `u16_integer`
+
+Generates an u16 uniformly at random.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness.md#0x1_randomness_u16_integer">u16_integer</a>(): u16
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness.md#0x1_randomness_u16_integer">u16_integer</a>(): u16 <b>acquires</b> <a href="randomness.md#0x1_randomness_PerBlockRandomness">PerBlockRandomness</a> {
+    <b>let</b> raw = <a href="randomness.md#0x1_randomness_next_32_bytes">next_32_bytes</a>();
+    <b>let</b> i = 0;
+    <b>let</b> ret: u16 = 0;
+    <b>while</b> (i &lt; 2) {
+        ret = ret * 256 + (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_pop_back">vector::pop_back</a>(&<b>mut</b> raw) <b>as</b> u16);
+        i = i + 1;
+    };
+
+    <a href="event.md#0x1_event_emit">event::emit</a>(<a href="randomness.md#0x1_randomness_RandomnessGeneratedEvent">RandomnessGeneratedEvent</a> {});
+
+    ret
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_randomness_u32_integer"></a>
+
+## Function `u32_integer`
+
+Generates an u32 uniformly at random.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness.md#0x1_randomness_u32_integer">u32_integer</a>(): u32
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness.md#0x1_randomness_u32_integer">u32_integer</a>(): u32 <b>acquires</b> <a href="randomness.md#0x1_randomness_PerBlockRandomness">PerBlockRandomness</a> {
+    <b>let</b> raw = <a href="randomness.md#0x1_randomness_next_32_bytes">next_32_bytes</a>();
+    <b>let</b> i = 0;
+    <b>let</b> ret: u32 = 0;
+    <b>while</b> (i &lt; 4) {
+        ret = ret * 256 + (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_pop_back">vector::pop_back</a>(&<b>mut</b> raw) <b>as</b> u32);
+        i = i + 1;
+    };
+
+    <a href="event.md#0x1_event_emit">event::emit</a>(<a href="randomness.md#0x1_randomness_RandomnessGeneratedEvent">RandomnessGeneratedEvent</a> {});
+
+    ret
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_randomness_u64_integer"></a>
+
+## Function `u64_integer`
+
+Generates an u64 uniformly at random.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness.md#0x1_randomness_u64_integer">u64_integer</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness.md#0x1_randomness_u64_integer">u64_integer</a>(): u64 <b>acquires</b> <a href="randomness.md#0x1_randomness_PerBlockRandomness">PerBlockRandomness</a> {
+    <b>let</b> raw = <a href="randomness.md#0x1_randomness_next_32_bytes">next_32_bytes</a>();
+    <b>let</b> i = 0;
+    <b>let</b> ret: u64 = 0;
+    <b>while</b> (i &lt; 8) {
+        ret = ret * 256 + (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_pop_back">vector::pop_back</a>(&<b>mut</b> raw) <b>as</b> u64);
+        i = i + 1;
+    };
+
+    <a href="event.md#0x1_event_emit">event::emit</a>(<a href="randomness.md#0x1_randomness_RandomnessGeneratedEvent">RandomnessGeneratedEvent</a> {});
+
+    ret
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_randomness_u128_integer"></a>
+
+## Function `u128_integer`
+
+Generates an u128 uniformly at random.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness.md#0x1_randomness_u128_integer">u128_integer</a>(): u128
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness.md#0x1_randomness_u128_integer">u128_integer</a>(): u128 <b>acquires</b> <a href="randomness.md#0x1_randomness_PerBlockRandomness">PerBlockRandomness</a> {
+    <b>let</b> raw = <a href="randomness.md#0x1_randomness_next_32_bytes">next_32_bytes</a>();
+    <b>let</b> i = 0;
+    <b>let</b> ret: u128 = 0;
+    <b>while</b> (i &lt; 16) {
+        ret = ret * 256 + (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_pop_back">vector::pop_back</a>(&<b>mut</b> raw) <b>as</b> u128);
+        i = i + 1;
+    };
+
+    <a href="event.md#0x1_event_emit">event::emit</a>(<a href="randomness.md#0x1_randomness_RandomnessGeneratedEvent">RandomnessGeneratedEvent</a> {});
+
+    ret
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_randomness_u256_integer"></a>
+
+## Function `u256_integer`
+
+Generates a u256 uniformly at random.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness.md#0x1_randomness_u256_integer">u256_integer</a>(): u256
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness.md#0x1_randomness_u256_integer">u256_integer</a>(): u256 <b>acquires</b> <a href="randomness.md#0x1_randomness_PerBlockRandomness">PerBlockRandomness</a> {
+    <a href="event.md#0x1_event_emit">event::emit</a>(<a href="randomness.md#0x1_randomness_RandomnessGeneratedEvent">RandomnessGeneratedEvent</a> {});
+    <a href="randomness.md#0x1_randomness_u256_integer_internal">u256_integer_internal</a>()
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_randomness_u256_integer_internal"></a>
+
+## Function `u256_integer_internal`
+
+Generates a u256 uniformly at random.
+
+
+<pre><code><b>fun</b> <a href="randomness.md#0x1_randomness_u256_integer_internal">u256_integer_internal</a>(): u256
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="randomness.md#0x1_randomness_u256_integer_internal">u256_integer_internal</a>(): u256 <b>acquires</b> <a href="randomness.md#0x1_randomness_PerBlockRandomness">PerBlockRandomness</a> {
+    <b>let</b> raw = <a href="randomness.md#0x1_randomness_next_32_bytes">next_32_bytes</a>();
+    <b>let</b> i = 0;
+    <b>let</b> ret: u256 = 0;
+    <b>while</b> (i &lt; 32) {
+        ret = ret * 256 + (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_pop_back">vector::pop_back</a>(&<b>mut</b> raw) <b>as</b> u256);
+        i = i + 1;
+    };
+    ret
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_randomness_u8_range"></a>
+
+## Function `u8_range`
+
+Generates a number $n \in [min_incl, max_excl)$ uniformly at random.
+
+NOTE: The uniformity is not perfect, but it can be proved that the bias is negligible.
+If you need perfect uniformity, consider implement your own via rejection sampling.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness.md#0x1_randomness_u8_range">u8_range</a>(min_incl: u8, max_excl: u8): u8
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness.md#0x1_randomness_u8_range">u8_range</a>(min_incl: u8, max_excl: u8): u8 <b>acquires</b> <a href="randomness.md#0x1_randomness_PerBlockRandomness">PerBlockRandomness</a> {
+    <b>let</b> range = ((max_excl - min_incl) <b>as</b> u256);
+    <b>let</b> sample = ((<a href="randomness.md#0x1_randomness_u256_integer_internal">u256_integer_internal</a>() % range) <b>as</b> u8);
+
+    <a href="event.md#0x1_event_emit">event::emit</a>(<a href="randomness.md#0x1_randomness_RandomnessGeneratedEvent">RandomnessGeneratedEvent</a> {});
+
+    min_incl + sample
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_randomness_u16_range"></a>
+
+## Function `u16_range`
+
+Generates a number $n \in [min_incl, max_excl)$ uniformly at random.
+
+NOTE: The uniformity is not perfect, but it can be proved that the bias is negligible.
+If you need perfect uniformity, consider implement your own via rejection sampling.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness.md#0x1_randomness_u16_range">u16_range</a>(min_incl: u16, max_excl: u16): u16
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness.md#0x1_randomness_u16_range">u16_range</a>(min_incl: u16, max_excl: u16): u16 <b>acquires</b> <a href="randomness.md#0x1_randomness_PerBlockRandomness">PerBlockRandomness</a> {
+    <b>let</b> range = ((max_excl - min_incl) <b>as</b> u256);
+    <b>let</b> sample = ((<a href="randomness.md#0x1_randomness_u256_integer_internal">u256_integer_internal</a>() % range) <b>as</b> u16);
+
+    <a href="event.md#0x1_event_emit">event::emit</a>(<a href="randomness.md#0x1_randomness_RandomnessGeneratedEvent">RandomnessGeneratedEvent</a> {});
+
+    min_incl + sample
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_randomness_u32_range"></a>
+
+## Function `u32_range`
+
+Generates a number $n \in [min_incl, max_excl)$ uniformly at random.
+
+NOTE: The uniformity is not perfect, but it can be proved that the bias is negligible.
+If you need perfect uniformity, consider implement your own via rejection sampling.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness.md#0x1_randomness_u32_range">u32_range</a>(min_incl: u32, max_excl: u32): u32
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness.md#0x1_randomness_u32_range">u32_range</a>(min_incl: u32, max_excl: u32): u32 <b>acquires</b> <a href="randomness.md#0x1_randomness_PerBlockRandomness">PerBlockRandomness</a> {
+    <b>let</b> range = ((max_excl - min_incl) <b>as</b> u256);
+    <b>let</b> sample = ((<a href="randomness.md#0x1_randomness_u256_integer_internal">u256_integer_internal</a>() % range) <b>as</b> u32);
+
+    <a href="event.md#0x1_event_emit">event::emit</a>(<a href="randomness.md#0x1_randomness_RandomnessGeneratedEvent">RandomnessGeneratedEvent</a> {});
+
+    min_incl + sample
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_randomness_u64_range"></a>
+
+## Function `u64_range`
+
+Generates a number $n \in [min_incl, max_excl)$ uniformly at random.
+
+NOTE: The uniformity is not perfect, but it can be proved that the bias is negligible.
+If you need perfect uniformity, consider implement your own via rejection sampling.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness.md#0x1_randomness_u64_range">u64_range</a>(min_incl: u64, max_excl: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness.md#0x1_randomness_u64_range">u64_range</a>(min_incl: u64, max_excl: u64): u64 <b>acquires</b> <a href="randomness.md#0x1_randomness_PerBlockRandomness">PerBlockRandomness</a> {
+    <a href="event.md#0x1_event_emit">event::emit</a>(<a href="randomness.md#0x1_randomness_RandomnessGeneratedEvent">RandomnessGeneratedEvent</a> {});
+
+    <a href="randomness.md#0x1_randomness_u64_range_internal">u64_range_internal</a>(min_incl, max_excl)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_randomness_u64_range_internal"></a>
+
+## Function `u64_range_internal`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness.md#0x1_randomness_u64_range_internal">u64_range_internal</a>(min_incl: u64, max_excl: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness.md#0x1_randomness_u64_range_internal">u64_range_internal</a>(min_incl: u64, max_excl: u64): u64 <b>acquires</b> <a href="randomness.md#0x1_randomness_PerBlockRandomness">PerBlockRandomness</a> {
+    <b>let</b> range = ((max_excl - min_incl) <b>as</b> u256);
+    <b>let</b> sample = ((<a href="randomness.md#0x1_randomness_u256_integer_internal">u256_integer_internal</a>() % range) <b>as</b> u64);
+
+    min_incl + sample
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_randomness_u128_range"></a>
+
+## Function `u128_range`
+
+Generates a number $n \in [min_incl, max_excl)$ uniformly at random.
+
+NOTE: The uniformity is not perfect, but it can be proved that the bias is negligible.
+If you need perfect uniformity, consider implement your own via rejection sampling.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness.md#0x1_randomness_u128_range">u128_range</a>(min_incl: u128, max_excl: u128): u128
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness.md#0x1_randomness_u128_range">u128_range</a>(min_incl: u128, max_excl: u128): u128 <b>acquires</b> <a href="randomness.md#0x1_randomness_PerBlockRandomness">PerBlockRandomness</a> {
+    <b>let</b> range = ((max_excl - min_incl) <b>as</b> u256);
+    <b>let</b> sample = ((<a href="randomness.md#0x1_randomness_u256_integer_internal">u256_integer_internal</a>() % range) <b>as</b> u128);
+
+    <a href="event.md#0x1_event_emit">event::emit</a>(<a href="randomness.md#0x1_randomness_RandomnessGeneratedEvent">RandomnessGeneratedEvent</a> {});
+
+    min_incl + sample
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_randomness_u256_range"></a>
+
+## Function `u256_range`
+
+Generates a number $n \in [min_incl, max_excl)$ uniformly at random.
+
+NOTE: The uniformity is not perfect, but it can be proved that the bias is negligible.
+If you need perfect uniformity, consider implement your own with <code><a href="randomness.md#0x1_randomness_u256_integer">u256_integer</a>()</code> + rejection sampling.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness.md#0x1_randomness_u256_range">u256_range</a>(min_incl: u256, max_excl: u256): u256
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness.md#0x1_randomness_u256_range">u256_range</a>(min_incl: u256, max_excl: u256): u256 <b>acquires</b> <a href="randomness.md#0x1_randomness_PerBlockRandomness">PerBlockRandomness</a> {
+    <b>let</b> range = max_excl - min_incl;
+    <b>let</b> r0 = <a href="randomness.md#0x1_randomness_u256_integer_internal">u256_integer_internal</a>();
+    <b>let</b> r1 = <a href="randomness.md#0x1_randomness_u256_integer_internal">u256_integer_internal</a>();
+
+    // Will compute sample := (r0 + r1*2^256) % range.
+
+    <b>let</b> sample = r1 % range;
+    <b>let</b> i = 0;
+    <b>while</b> ({
+        <b>spec</b> {
+            <b>invariant</b> sample &gt;= 0 && sample &lt; max_excl - min_incl;
+        };
+        i &lt; 256
+    }) {
+        sample = <a href="randomness.md#0x1_randomness_safe_add_mod">safe_add_mod</a>(sample, sample, range);
+        i = i + 1;
+    };
+
+    <b>let</b> sample = <a href="randomness.md#0x1_randomness_safe_add_mod">safe_add_mod</a>(sample, r0 % range, range);
+    <b>spec</b> {
+        <b>assert</b> sample &gt;= 0 && sample &lt; max_excl - min_incl;
+    };
+
+    <a href="event.md#0x1_event_emit">event::emit</a>(<a href="randomness.md#0x1_randomness_RandomnessGeneratedEvent">RandomnessGeneratedEvent</a> {});
+
+    min_incl + sample
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_randomness_permutation"></a>
+
+## Function `permutation`
+
+Generate a permutation of <code>[0, 1, ..., n-1]</code> uniformly at random.
+If n is 0, returns the empty vector.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness.md#0x1_randomness_permutation">permutation</a>(n: u64): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u64&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness.md#0x1_randomness_permutation">permutation</a>(n: u64): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u64&gt; <b>acquires</b> <a href="randomness.md#0x1_randomness_PerBlockRandomness">PerBlockRandomness</a> {
+    <a href="event.md#0x1_event_emit">event::emit</a>(<a href="randomness.md#0x1_randomness_RandomnessGeneratedEvent">RandomnessGeneratedEvent</a> {});
+
+    <b>let</b> values = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>[];
+
+    <b>if</b>(n == 0) {
+        <b>return</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>[]
+    };
+
+    // Initialize into [0, 1, ..., n-1].
+    <b>let</b> i = 0;
+    <b>while</b> ({
+        <b>spec</b> {
+            <b>invariant</b> i &lt;= n;
+            <b>invariant</b> len(values) == i;
+        };
+        i &lt; n
+    }) {
+        std::vector::push_back(&<b>mut</b> values, i);
+        i = i + 1;
+    };
+    <b>spec</b> {
+        <b>assert</b> len(values) == n;
+    };
+
+    // Shuffle.
+    <b>let</b> tail = n - 1;
+    <b>while</b> ({
+        <b>spec</b> {
+            <b>invariant</b> tail &gt;= 0 && tail &lt; len(values);
+        };
+        tail &gt; 0
+    }) {
+        <b>let</b> pop_position = <a href="randomness.md#0x1_randomness_u64_range_internal">u64_range_internal</a>(0, tail + 1);
+        <b>spec</b> {
+            <b>assert</b> pop_position &lt; len(values);
+        };
+        std::vector::swap(&<b>mut</b> values, pop_position, tail);
+        tail = tail - 1;
+    };
+
+    values
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_randomness_safe_add_mod"></a>
+
+## Function `safe_add_mod`
+
+Compute <code>(a + b) % m</code>, assuming <code>m &gt;= 1, 0 &lt;= a &lt; m, 0&lt;= b &lt; m</code>.
+
+
+<pre><code><b>fun</b> <a href="randomness.md#0x1_randomness_safe_add_mod">safe_add_mod</a>(a: u256, b: u256, m: u256): u256
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="randomness.md#0x1_randomness_safe_add_mod">safe_add_mod</a>(a: u256, b: u256, m: u256): u256 {
+    <b>let</b> a_clone = a;
+    <b>let</b> neg_b = m - b;
+    <b>let</b> a_less = a &lt; neg_b;
+    <a href="randomness.md#0x1_randomness_take_first">take_first</a>(<b>if</b> (a_less) { a + b } <b>else</b> { a_clone - neg_b }, <b>if</b> (!a_less) { a_clone - neg_b } <b>else</b> { a + b })
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_randomness_take_first"></a>
+
+## Function `take_first`
+
+
+
+<pre><code><b>fun</b> <a href="randomness.md#0x1_randomness_take_first">take_first</a>(x: u256, _y: u256): u256
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="randomness.md#0x1_randomness_take_first">take_first</a>(x: u256, _y: u256 ): u256 { x }
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_randomness_fetch_and_increment_txn_counter"></a>
+
+## Function `fetch_and_increment_txn_counter`
+
+Fetches and increments a transaction-specific 32-byte randomness-related counter.
+Aborts with <code>E_API_USE_SUSCEPTIBLE_TO_TEST_AND_ABORT</code> if randomness is not unbiasable.
+
+
+<pre><code><b>fun</b> <a href="randomness.md#0x1_randomness_fetch_and_increment_txn_counter">fetch_and_increment_txn_counter</a>(): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="randomness.md#0x1_randomness_fetch_and_increment_txn_counter">fetch_and_increment_txn_counter</a>(): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_randomness_is_unbiasable"></a>
+
+## Function `is_unbiasable`
+
+Called in each randomness generation function to ensure certain safety invariants, namely:
+1. The transaction that led to the call of this function had a private (or friend) entry
+function as its payload.
+2. The entry function had <code>#[<a href="randomness.md#0x1_randomness">randomness</a>]</code> annotation.
+
+
+<pre><code><b>fun</b> <a href="randomness.md#0x1_randomness_is_unbiasable">is_unbiasable</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="randomness.md#0x1_randomness_is_unbiasable">is_unbiasable</a>(): bool;
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+
+<pre><code><b>pragma</b> verify = <b>true</b>;
+<b>invariant</b> [suspendable] <a href="chain_status.md#0x1_chain_status_is_operating">chain_status::is_operating</a>() ==&gt; <b>exists</b>&lt;<a href="randomness.md#0x1_randomness_PerBlockRandomness">PerBlockRandomness</a>&gt;(@aptos_framework);
+<a id="0x1_randomness_var"></a>
+<b>global</b> <a href="randomness.md#0x1_randomness_var">var</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+</code></pre>
+
+
+
+<a id="@Specification_1_initialize"></a>
+
+### Function `initialize`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness.md#0x1_randomness_initialize">initialize</a>(framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> framework_addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(framework);
+<b>aborts_if</b> framework_addr != @aptos_framework;
+</code></pre>
+
+
+
+<a id="@Specification_1_on_new_block"></a>
+
+### Function `on_new_block`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="randomness.md#0x1_randomness_on_new_block">on_new_block</a>(vm: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, epoch: u64, round: u64, seed_for_new_block: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(vm) != @vm;
+<b>ensures</b> <b>exists</b>&lt;<a href="randomness.md#0x1_randomness_PerBlockRandomness">PerBlockRandomness</a>&gt;(@aptos_framework) ==&gt; <b>global</b>&lt;<a href="randomness.md#0x1_randomness_PerBlockRandomness">PerBlockRandomness</a>&gt;(@aptos_framework).seed == seed_for_new_block;
+<b>ensures</b> <b>exists</b>&lt;<a href="randomness.md#0x1_randomness_PerBlockRandomness">PerBlockRandomness</a>&gt;(@aptos_framework) ==&gt; <b>global</b>&lt;<a href="randomness.md#0x1_randomness_PerBlockRandomness">PerBlockRandomness</a>&gt;(@aptos_framework).epoch == epoch;
+<b>ensures</b> <b>exists</b>&lt;<a href="randomness.md#0x1_randomness_PerBlockRandomness">PerBlockRandomness</a>&gt;(@aptos_framework) ==&gt; <b>global</b>&lt;<a href="randomness.md#0x1_randomness_PerBlockRandomness">PerBlockRandomness</a>&gt;(@aptos_framework).round == round;
+</code></pre>
+
+
+
+<a id="@Specification_1_next_32_bytes"></a>
+
+### Function `next_32_bytes`
+
+
+<pre><code><b>fun</b> <a href="randomness.md#0x1_randomness_next_32_bytes">next_32_bytes</a>(): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="randomness.md#0x1_randomness_NextBlobAbortsIf">NextBlobAbortsIf</a>;
+<b>let</b> input = b"APTOS_RANDOMNESS";
+<b>let</b> <a href="randomness.md#0x1_randomness">randomness</a> = <b>global</b>&lt;<a href="randomness.md#0x1_randomness_PerBlockRandomness">PerBlockRandomness</a>&gt;(@aptos_framework);
+<b>let</b> seed = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_borrow">option::spec_borrow</a>(<a href="randomness.md#0x1_randomness">randomness</a>.seed);
+<b>let</b> txn_hash = <a href="transaction_context.md#0x1_transaction_context_spec_get_txn_hash">transaction_context::spec_get_txn_hash</a>();
+<b>let</b> txn_counter = <a href="randomness.md#0x1_randomness_spec_fetch_and_increment_txn_counter">spec_fetch_and_increment_txn_counter</a>();
+<b>ensures</b> len(result) == 32;
+<b>ensures</b> result == <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/hash.md#0x1_hash_sha3_256">hash::sha3_256</a>(concat(concat(concat(input, seed), txn_hash), txn_counter));
+</code></pre>
+
+
+
+
+<a id="0x1_randomness_NextBlobAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="randomness.md#0x1_randomness_NextBlobAbortsIf">NextBlobAbortsIf</a> {
+    <b>let</b> <a href="randomness.md#0x1_randomness">randomness</a> = <b>global</b>&lt;<a href="randomness.md#0x1_randomness_PerBlockRandomness">PerBlockRandomness</a>&gt;(@aptos_framework);
+    <b>aborts_if</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_is_none">option::spec_is_none</a>(<a href="randomness.md#0x1_randomness">randomness</a>.seed);
+    <b>aborts_if</b> !<a href="randomness.md#0x1_randomness_spec_is_unbiasable">spec_is_unbiasable</a>();
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="randomness.md#0x1_randomness_PerBlockRandomness">PerBlockRandomness</a>&gt;(@aptos_framework);
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_u8_integer"></a>
+
+### Function `u8_integer`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness.md#0x1_randomness_u8_integer">u8_integer</a>(): u8
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="randomness.md#0x1_randomness_NextBlobAbortsIf">NextBlobAbortsIf</a>;
+</code></pre>
+
+
+
+<a id="@Specification_1_u16_integer"></a>
+
+### Function `u16_integer`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness.md#0x1_randomness_u16_integer">u16_integer</a>(): u16
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> unroll = 2;
+<b>include</b> <a href="randomness.md#0x1_randomness_NextBlobAbortsIf">NextBlobAbortsIf</a>;
+</code></pre>
+
+
+
+<a id="@Specification_1_u32_integer"></a>
+
+### Function `u32_integer`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness.md#0x1_randomness_u32_integer">u32_integer</a>(): u32
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> unroll = 4;
+<b>include</b> <a href="randomness.md#0x1_randomness_NextBlobAbortsIf">NextBlobAbortsIf</a>;
+</code></pre>
+
+
+
+<a id="@Specification_1_u64_integer"></a>
+
+### Function `u64_integer`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness.md#0x1_randomness_u64_integer">u64_integer</a>(): u64
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> unroll = 8;
+<b>include</b> <a href="randomness.md#0x1_randomness_NextBlobAbortsIf">NextBlobAbortsIf</a>;
+</code></pre>
+
+
+
+<a id="@Specification_1_u128_integer"></a>
+
+### Function `u128_integer`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness.md#0x1_randomness_u128_integer">u128_integer</a>(): u128
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> unroll = 16;
+<b>include</b> <a href="randomness.md#0x1_randomness_NextBlobAbortsIf">NextBlobAbortsIf</a>;
+</code></pre>
+
+
+
+<a id="@Specification_1_u256_integer"></a>
+
+### Function `u256_integer`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness.md#0x1_randomness_u256_integer">u256_integer</a>(): u256
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify_duration_estimate = 300;
+<b>pragma</b> unroll = 32;
+<b>include</b> <a href="randomness.md#0x1_randomness_NextBlobAbortsIf">NextBlobAbortsIf</a>;
+<b>ensures</b> [abstract] result == <a href="randomness.md#0x1_randomness_spec_u256_integer">spec_u256_integer</a>();
+</code></pre>
+
+
+
+<a id="@Specification_1_u256_integer_internal"></a>
+
+### Function `u256_integer_internal`
+
+
+<pre><code><b>fun</b> <a href="randomness.md#0x1_randomness_u256_integer_internal">u256_integer_internal</a>(): u256
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify_duration_estimate = 300;
+<b>pragma</b> unroll = 32;
+<b>include</b> <a href="randomness.md#0x1_randomness_NextBlobAbortsIf">NextBlobAbortsIf</a>;
+</code></pre>
+
+
+
+
+<a id="0x1_randomness_spec_u256_integer"></a>
+
+
+<pre><code><b>fun</b> <a href="randomness.md#0x1_randomness_spec_u256_integer">spec_u256_integer</a>(): u256;
+</code></pre>
+
+
+
+<a id="@Specification_1_u8_range"></a>
+
+### Function `u8_range`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness.md#0x1_randomness_u8_range">u8_range</a>(min_incl: u8, max_excl: u8): u8
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify_duration_estimate = 120;
+<b>pragma</b> opaque;
+<b>include</b> <a href="randomness.md#0x1_randomness_NextBlobAbortsIf">NextBlobAbortsIf</a>;
+<b>aborts_if</b> min_incl &gt;= max_excl;
+<b>ensures</b> result &gt;= min_incl && result &lt; max_excl;
+</code></pre>
+
+
+
+<a id="@Specification_1_u64_range"></a>
+
+### Function `u64_range`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness.md#0x1_randomness_u64_range">u64_range</a>(min_incl: u64, max_excl: u64): u64
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify_duration_estimate = 120;
+<b>include</b> <a href="randomness.md#0x1_randomness_NextBlobAbortsIf">NextBlobAbortsIf</a>;
+<b>aborts_if</b> min_incl &gt;= max_excl;
+<b>ensures</b> result &gt;= min_incl && result &lt; max_excl;
+</code></pre>
+
+
+
+<a id="@Specification_1_u256_range"></a>
+
+### Function `u256_range`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness.md#0x1_randomness_u256_range">u256_range</a>(min_incl: u256, max_excl: u256): u256
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify_duration_estimate = 120;
+<b>include</b> <a href="randomness.md#0x1_randomness_NextBlobAbortsIf">NextBlobAbortsIf</a>;
+<b>aborts_if</b> min_incl &gt;= max_excl;
+<b>ensures</b> result &gt;= min_incl && result &lt; max_excl;
+</code></pre>
+
+
+
+<a id="@Specification_1_permutation"></a>
+
+### Function `permutation`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness.md#0x1_randomness_permutation">permutation</a>(n: u64): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u64&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> aborts_if_is_partial;
+</code></pre>
+
+
+
+
+<a id="0x1_randomness_spec_safe_add_mod"></a>
+
+
+<pre><code><b>fun</b> <a href="randomness.md#0x1_randomness_spec_safe_add_mod">spec_safe_add_mod</a>(a: u256, b: u256, m: u256): u256 {
+   <b>if</b> (a &lt; m - b) {
+       a + b
+   } <b>else</b> {
+       a - (m - b)
+   }
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_fetch_and_increment_txn_counter"></a>
+
+### Function `fetch_and_increment_txn_counter`
+
+
+<pre><code><b>fun</b> <a href="randomness.md#0x1_randomness_fetch_and_increment_txn_counter">fetch_and_increment_txn_counter</a>(): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> [abstract] <b>false</b>;
+<b>ensures</b> [abstract] result == <a href="randomness.md#0x1_randomness_spec_fetch_and_increment_txn_counter">spec_fetch_and_increment_txn_counter</a>();
+</code></pre>
+
+
+
+
+<a id="0x1_randomness_spec_fetch_and_increment_txn_counter"></a>
+
+
+<pre><code><b>fun</b> <a href="randomness.md#0x1_randomness_spec_fetch_and_increment_txn_counter">spec_fetch_and_increment_txn_counter</a>(): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+</code></pre>
+
+
+
+<a id="@Specification_1_is_unbiasable"></a>
+
+### Function `is_unbiasable`
+
+
+<pre><code><b>fun</b> <a href="randomness.md#0x1_randomness_is_unbiasable">is_unbiasable</a>(): bool
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> [abstract] <b>false</b>;
+<b>ensures</b> [abstract] result == <a href="randomness.md#0x1_randomness_spec_is_unbiasable">spec_is_unbiasable</a>();
+</code></pre>
+
+
+
+
+<a id="0x1_randomness_spec_is_unbiasable"></a>
+
+
+<pre><code><b>fun</b> <a href="randomness.md#0x1_randomness_spec_is_unbiasable">spec_is_unbiasable</a>(): bool;
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/randomness_api_v0_config.md b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/randomness_api_v0_config.md
new file mode 100644
index 0000000000000..71b3ada332a5e
--- /dev/null
+++ b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/randomness_api_v0_config.md
@@ -0,0 +1,211 @@
+
+<a id="0x1_randomness_api_v0_config"></a>
+
+# Module `0x1::randomness_api_v0_config`
+
+
+
+-  [Resource `RequiredGasDeposit`](#0x1_randomness_api_v0_config_RequiredGasDeposit)
+-  [Resource `AllowCustomMaxGasFlag`](#0x1_randomness_api_v0_config_AllowCustomMaxGasFlag)
+-  [Function `initialize`](#0x1_randomness_api_v0_config_initialize)
+-  [Function `set_for_next_epoch`](#0x1_randomness_api_v0_config_set_for_next_epoch)
+-  [Function `set_allow_max_gas_flag_for_next_epoch`](#0x1_randomness_api_v0_config_set_allow_max_gas_flag_for_next_epoch)
+-  [Function `on_new_epoch`](#0x1_randomness_api_v0_config_on_new_epoch)
+-  [Specification](#@Specification_0)
+
+
+<pre><code><b>use</b> <a href="chain_status.md#0x1_chain_status">0x1::chain_status</a>;
+<b>use</b> <a href="config_buffer.md#0x1_config_buffer">0x1::config_buffer</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option">0x1::option</a>;
+<b>use</b> <a href="system_addresses.md#0x1_system_addresses">0x1::system_addresses</a>;
+</code></pre>
+
+
+
+<a id="0x1_randomness_api_v0_config_RequiredGasDeposit"></a>
+
+## Resource `RequiredGasDeposit`
+
+
+
+<pre><code><b>struct</b> <a href="randomness_api_v0_config.md#0x1_randomness_api_v0_config_RequiredGasDeposit">RequiredGasDeposit</a> <b>has</b> drop, store, key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>gas_amount: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;u64&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_randomness_api_v0_config_AllowCustomMaxGasFlag"></a>
+
+## Resource `AllowCustomMaxGasFlag`
+
+If this flag is set, <code>max_gas</code> specified inside <code>#[<a href="randomness.md#0x1_randomness">randomness</a>()]</code> will be used as the required deposit.
+
+
+<pre><code><b>struct</b> <a href="randomness_api_v0_config.md#0x1_randomness_api_v0_config_AllowCustomMaxGasFlag">AllowCustomMaxGasFlag</a> <b>has</b> drop, store, key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>value: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_randomness_api_v0_config_initialize"></a>
+
+## Function `initialize`
+
+Only used in genesis.
+
+
+<pre><code><b>fun</b> <a href="randomness_api_v0_config.md#0x1_randomness_api_v0_config_initialize">initialize</a>(framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, required_amount: <a href="randomness_api_v0_config.md#0x1_randomness_api_v0_config_RequiredGasDeposit">randomness_api_v0_config::RequiredGasDeposit</a>, allow_custom_max_gas_flag: <a href="randomness_api_v0_config.md#0x1_randomness_api_v0_config_AllowCustomMaxGasFlag">randomness_api_v0_config::AllowCustomMaxGasFlag</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="randomness_api_v0_config.md#0x1_randomness_api_v0_config_initialize">initialize</a>(framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, required_amount: <a href="randomness_api_v0_config.md#0x1_randomness_api_v0_config_RequiredGasDeposit">RequiredGasDeposit</a>, allow_custom_max_gas_flag: <a href="randomness_api_v0_config.md#0x1_randomness_api_v0_config_AllowCustomMaxGasFlag">AllowCustomMaxGasFlag</a>) {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(framework);
+    <a href="chain_status.md#0x1_chain_status_assert_genesis">chain_status::assert_genesis</a>();
+    <b>move_to</b>(framework, required_amount);
+    <b>move_to</b>(framework, allow_custom_max_gas_flag);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_randomness_api_v0_config_set_for_next_epoch"></a>
+
+## Function `set_for_next_epoch`
+
+This can be called by on-chain governance to update <code><a href="randomness_api_v0_config.md#0x1_randomness_api_v0_config_RequiredGasDeposit">RequiredGasDeposit</a></code> for the next epoch.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness_api_v0_config.md#0x1_randomness_api_v0_config_set_for_next_epoch">set_for_next_epoch</a>(framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, gas_amount: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;u64&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness_api_v0_config.md#0x1_randomness_api_v0_config_set_for_next_epoch">set_for_next_epoch</a>(framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, gas_amount: Option&lt;u64&gt;) {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(framework);
+    <a href="config_buffer.md#0x1_config_buffer_upsert">config_buffer::upsert</a>(<a href="randomness_api_v0_config.md#0x1_randomness_api_v0_config_RequiredGasDeposit">RequiredGasDeposit</a> { gas_amount });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_randomness_api_v0_config_set_allow_max_gas_flag_for_next_epoch"></a>
+
+## Function `set_allow_max_gas_flag_for_next_epoch`
+
+This can be called by on-chain governance to update <code><a href="randomness_api_v0_config.md#0x1_randomness_api_v0_config_AllowCustomMaxGasFlag">AllowCustomMaxGasFlag</a></code> for the next epoch.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness_api_v0_config.md#0x1_randomness_api_v0_config_set_allow_max_gas_flag_for_next_epoch">set_allow_max_gas_flag_for_next_epoch</a>(framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, value: bool)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness_api_v0_config.md#0x1_randomness_api_v0_config_set_allow_max_gas_flag_for_next_epoch">set_allow_max_gas_flag_for_next_epoch</a>(framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, value: bool) {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(framework);
+    <a href="config_buffer.md#0x1_config_buffer_upsert">config_buffer::upsert</a>(<a href="randomness_api_v0_config.md#0x1_randomness_api_v0_config_AllowCustomMaxGasFlag">AllowCustomMaxGasFlag</a> { value } );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_randomness_api_v0_config_on_new_epoch"></a>
+
+## Function `on_new_epoch`
+
+Only used in reconfigurations to apply the pending <code><a href="randomness_api_v0_config.md#0x1_randomness_api_v0_config_RequiredGasDeposit">RequiredGasDeposit</a></code>, if there is any.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness_api_v0_config.md#0x1_randomness_api_v0_config_on_new_epoch">on_new_epoch</a>(framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness_api_v0_config.md#0x1_randomness_api_v0_config_on_new_epoch">on_new_epoch</a>(framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>) <b>acquires</b> <a href="randomness_api_v0_config.md#0x1_randomness_api_v0_config_RequiredGasDeposit">RequiredGasDeposit</a>, <a href="randomness_api_v0_config.md#0x1_randomness_api_v0_config_AllowCustomMaxGasFlag">AllowCustomMaxGasFlag</a> {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(framework);
+    <b>if</b> (<a href="config_buffer.md#0x1_config_buffer_does_exist">config_buffer::does_exist</a>&lt;<a href="randomness_api_v0_config.md#0x1_randomness_api_v0_config_RequiredGasDeposit">RequiredGasDeposit</a>&gt;()) {
+        <b>let</b> new_config = <a href="config_buffer.md#0x1_config_buffer_extract">config_buffer::extract</a>&lt;<a href="randomness_api_v0_config.md#0x1_randomness_api_v0_config_RequiredGasDeposit">RequiredGasDeposit</a>&gt;();
+        <b>if</b> (<b>exists</b>&lt;<a href="randomness_api_v0_config.md#0x1_randomness_api_v0_config_RequiredGasDeposit">RequiredGasDeposit</a>&gt;(@aptos_framework)) {
+            *<b>borrow_global_mut</b>&lt;<a href="randomness_api_v0_config.md#0x1_randomness_api_v0_config_RequiredGasDeposit">RequiredGasDeposit</a>&gt;(@aptos_framework) = new_config;
+        } <b>else</b> {
+            <b>move_to</b>(framework, new_config);
+        }
+    };
+    <b>if</b> (<a href="config_buffer.md#0x1_config_buffer_does_exist">config_buffer::does_exist</a>&lt;<a href="randomness_api_v0_config.md#0x1_randomness_api_v0_config_AllowCustomMaxGasFlag">AllowCustomMaxGasFlag</a>&gt;()) {
+        <b>let</b> new_config = <a href="config_buffer.md#0x1_config_buffer_extract">config_buffer::extract</a>&lt;<a href="randomness_api_v0_config.md#0x1_randomness_api_v0_config_AllowCustomMaxGasFlag">AllowCustomMaxGasFlag</a>&gt;();
+        <b>if</b> (<b>exists</b>&lt;<a href="randomness_api_v0_config.md#0x1_randomness_api_v0_config_AllowCustomMaxGasFlag">AllowCustomMaxGasFlag</a>&gt;(@aptos_framework)) {
+            *<b>borrow_global_mut</b>&lt;<a href="randomness_api_v0_config.md#0x1_randomness_api_v0_config_AllowCustomMaxGasFlag">AllowCustomMaxGasFlag</a>&gt;(@aptos_framework) = new_config;
+        } <b>else</b> {
+            <b>move_to</b>(framework, new_config);
+        }
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_0"></a>
+
+## Specification
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/randomness_config.md b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/randomness_config.md
new file mode 100644
index 0000000000000..37299fe41b95f
--- /dev/null
+++ b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/randomness_config.md
@@ -0,0 +1,463 @@
+
+<a id="0x1_randomness_config"></a>
+
+# Module `0x1::randomness_config`
+
+Structs and functions for on-chain randomness configurations.
+
+
+-  [Resource `RandomnessConfig`](#0x1_randomness_config_RandomnessConfig)
+-  [Struct `ConfigOff`](#0x1_randomness_config_ConfigOff)
+-  [Struct `ConfigV1`](#0x1_randomness_config_ConfigV1)
+-  [Struct `ConfigV2`](#0x1_randomness_config_ConfigV2)
+-  [Constants](#@Constants_0)
+-  [Function `initialize`](#0x1_randomness_config_initialize)
+-  [Function `set_for_next_epoch`](#0x1_randomness_config_set_for_next_epoch)
+-  [Function `on_new_epoch`](#0x1_randomness_config_on_new_epoch)
+-  [Function `enabled`](#0x1_randomness_config_enabled)
+-  [Function `new_off`](#0x1_randomness_config_new_off)
+-  [Function `new_v1`](#0x1_randomness_config_new_v1)
+-  [Function `new_v2`](#0x1_randomness_config_new_v2)
+-  [Function `current`](#0x1_randomness_config_current)
+-  [Specification](#@Specification_1)
+    -  [Function `on_new_epoch`](#@Specification_1_on_new_epoch)
+    -  [Function `current`](#@Specification_1_current)
+
+
+<pre><code><b>use</b> <a href="config_buffer.md#0x1_config_buffer">0x1::config_buffer</a>;
+<b>use</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/copyable_any.md#0x1_copyable_any">0x1::copyable_any</a>;
+<b>use</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/fixed_point64.md#0x1_fixed_point64">0x1::fixed_point64</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string">0x1::string</a>;
+<b>use</b> <a href="system_addresses.md#0x1_system_addresses">0x1::system_addresses</a>;
+</code></pre>
+
+
+
+<a id="0x1_randomness_config_RandomnessConfig"></a>
+
+## Resource `RandomnessConfig`
+
+The configuration of the on-chain randomness feature.
+
+
+<pre><code><b>struct</b> <a href="randomness_config.md#0x1_randomness_config_RandomnessConfig">RandomnessConfig</a> <b>has</b> <b>copy</b>, drop, store, key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>variant: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/copyable_any.md#0x1_copyable_any_Any">copyable_any::Any</a></code>
+</dt>
+<dd>
+ A config variant packed as an <code>Any</code>.
+ Currently the variant type is one of the following.
+ - <code><a href="randomness_config.md#0x1_randomness_config_ConfigOff">ConfigOff</a></code>
+ - <code><a href="randomness_config.md#0x1_randomness_config_ConfigV1">ConfigV1</a></code>
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_randomness_config_ConfigOff"></a>
+
+## Struct `ConfigOff`
+
+A randomness config variant indicating the feature is disabled.
+
+
+<pre><code><b>struct</b> <a href="randomness_config.md#0x1_randomness_config_ConfigOff">ConfigOff</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>dummy_field: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_randomness_config_ConfigV1"></a>
+
+## Struct `ConfigV1`
+
+A randomness config variant indicating the feature is enabled.
+
+
+<pre><code><b>struct</b> <a href="randomness_config.md#0x1_randomness_config_ConfigV1">ConfigV1</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>secrecy_threshold: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a></code>
+</dt>
+<dd>
+ Any validator subset should not be able to reconstruct randomness if <code>subset_power / total_power &lt;= secrecy_threshold</code>,
+</dd>
+<dt>
+<code>reconstruction_threshold: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a></code>
+</dt>
+<dd>
+ Any validator subset should be able to reconstruct randomness if <code>subset_power / total_power &gt; reconstruction_threshold</code>.
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_randomness_config_ConfigV2"></a>
+
+## Struct `ConfigV2`
+
+A randomness config variant indicating the feature is enabled with fast path.
+
+
+<pre><code><b>struct</b> <a href="randomness_config.md#0x1_randomness_config_ConfigV2">ConfigV2</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>secrecy_threshold: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a></code>
+</dt>
+<dd>
+ Any validator subset should not be able to reconstruct randomness if <code>subset_power / total_power &lt;= secrecy_threshold</code>,
+</dd>
+<dt>
+<code>reconstruction_threshold: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a></code>
+</dt>
+<dd>
+ Any validator subset should be able to reconstruct randomness if <code>subset_power / total_power &gt; reconstruction_threshold</code>.
+</dd>
+<dt>
+<code>fast_path_secrecy_threshold: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a></code>
+</dt>
+<dd>
+ Any validator subset should not be able to reconstruct randomness via the fast path if <code>subset_power / total_power &lt;= fast_path_secrecy_threshold</code>,
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_randomness_config_EINVALID_CONFIG_VARIANT"></a>
+
+
+
+<pre><code><b>const</b> <a href="randomness_config.md#0x1_randomness_config_EINVALID_CONFIG_VARIANT">EINVALID_CONFIG_VARIANT</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_randomness_config_initialize"></a>
+
+## Function `initialize`
+
+Initialize the configuration. Used in genesis or governance.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness_config.md#0x1_randomness_config_initialize">initialize</a>(framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, config: <a href="randomness_config.md#0x1_randomness_config_RandomnessConfig">randomness_config::RandomnessConfig</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness_config.md#0x1_randomness_config_initialize">initialize</a>(framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, config: <a href="randomness_config.md#0x1_randomness_config_RandomnessConfig">RandomnessConfig</a>) {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(framework);
+    <b>if</b> (!<b>exists</b>&lt;<a href="randomness_config.md#0x1_randomness_config_RandomnessConfig">RandomnessConfig</a>&gt;(@aptos_framework)) {
+        <b>move_to</b>(framework, config)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_randomness_config_set_for_next_epoch"></a>
+
+## Function `set_for_next_epoch`
+
+This can be called by on-chain governance to update on-chain consensus configs for the next epoch.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness_config.md#0x1_randomness_config_set_for_next_epoch">set_for_next_epoch</a>(framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, new_config: <a href="randomness_config.md#0x1_randomness_config_RandomnessConfig">randomness_config::RandomnessConfig</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness_config.md#0x1_randomness_config_set_for_next_epoch">set_for_next_epoch</a>(framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, new_config: <a href="randomness_config.md#0x1_randomness_config_RandomnessConfig">RandomnessConfig</a>) {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(framework);
+    <a href="config_buffer.md#0x1_config_buffer_upsert">config_buffer::upsert</a>(new_config);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_randomness_config_on_new_epoch"></a>
+
+## Function `on_new_epoch`
+
+Only used in reconfigurations to apply the pending <code><a href="randomness_config.md#0x1_randomness_config_RandomnessConfig">RandomnessConfig</a></code>, if there is any.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="randomness_config.md#0x1_randomness_config_on_new_epoch">on_new_epoch</a>(framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="randomness_config.md#0x1_randomness_config_on_new_epoch">on_new_epoch</a>(framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>) <b>acquires</b> <a href="randomness_config.md#0x1_randomness_config_RandomnessConfig">RandomnessConfig</a> {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(framework);
+    <b>if</b> (<a href="config_buffer.md#0x1_config_buffer_does_exist">config_buffer::does_exist</a>&lt;<a href="randomness_config.md#0x1_randomness_config_RandomnessConfig">RandomnessConfig</a>&gt;()) {
+        <b>let</b> new_config = <a href="config_buffer.md#0x1_config_buffer_extract">config_buffer::extract</a>&lt;<a href="randomness_config.md#0x1_randomness_config_RandomnessConfig">RandomnessConfig</a>&gt;();
+        <b>if</b> (<b>exists</b>&lt;<a href="randomness_config.md#0x1_randomness_config_RandomnessConfig">RandomnessConfig</a>&gt;(@aptos_framework)) {
+            *<b>borrow_global_mut</b>&lt;<a href="randomness_config.md#0x1_randomness_config_RandomnessConfig">RandomnessConfig</a>&gt;(@aptos_framework) = new_config;
+        } <b>else</b> {
+            <b>move_to</b>(framework, new_config);
+        }
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_randomness_config_enabled"></a>
+
+## Function `enabled`
+
+Check whether on-chain randomness main logic (e.g., <code>DKGManager</code>, <code>RandManager</code>, <code>BlockMetadataExt</code>) is enabled.
+
+NOTE: this returning true does not mean randomness will run.
+The feature works if and only if <code><a href="consensus_config.md#0x1_consensus_config_validator_txn_enabled">consensus_config::validator_txn_enabled</a>() && <a href="randomness_config.md#0x1_randomness_config_enabled">randomness_config::enabled</a>()</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness_config.md#0x1_randomness_config_enabled">enabled</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness_config.md#0x1_randomness_config_enabled">enabled</a>(): bool <b>acquires</b> <a href="randomness_config.md#0x1_randomness_config_RandomnessConfig">RandomnessConfig</a> {
+    <b>if</b> (<b>exists</b>&lt;<a href="randomness_config.md#0x1_randomness_config_RandomnessConfig">RandomnessConfig</a>&gt;(@aptos_framework)) {
+        <b>let</b> config = <b>borrow_global</b>&lt;<a href="randomness_config.md#0x1_randomness_config_RandomnessConfig">RandomnessConfig</a>&gt;(@aptos_framework);
+        <b>let</b> variant_type_name = *<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_bytes">string::bytes</a>(<a href="../../../aptos-stdlib/tests/compiler-v2-doc/copyable_any.md#0x1_copyable_any_type_name">copyable_any::type_name</a>(&config.variant));
+        variant_type_name != b"<a href="randomness_config.md#0x1_randomness_config_ConfigOff">0x1::randomness_config::ConfigOff</a>"
+    } <b>else</b> {
+        <b>false</b>
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_randomness_config_new_off"></a>
+
+## Function `new_off`
+
+Create a <code><a href="randomness_config.md#0x1_randomness_config_ConfigOff">ConfigOff</a></code> variant.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness_config.md#0x1_randomness_config_new_off">new_off</a>(): <a href="randomness_config.md#0x1_randomness_config_RandomnessConfig">randomness_config::RandomnessConfig</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness_config.md#0x1_randomness_config_new_off">new_off</a>(): <a href="randomness_config.md#0x1_randomness_config_RandomnessConfig">RandomnessConfig</a> {
+    <a href="randomness_config.md#0x1_randomness_config_RandomnessConfig">RandomnessConfig</a> {
+        variant: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/copyable_any.md#0x1_copyable_any_pack">copyable_any::pack</a>( <a href="randomness_config.md#0x1_randomness_config_ConfigOff">ConfigOff</a> {} )
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_randomness_config_new_v1"></a>
+
+## Function `new_v1`
+
+Create a <code><a href="randomness_config.md#0x1_randomness_config_ConfigV1">ConfigV1</a></code> variant.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness_config.md#0x1_randomness_config_new_v1">new_v1</a>(secrecy_threshold: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>, reconstruction_threshold: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>): <a href="randomness_config.md#0x1_randomness_config_RandomnessConfig">randomness_config::RandomnessConfig</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness_config.md#0x1_randomness_config_new_v1">new_v1</a>(secrecy_threshold: FixedPoint64, reconstruction_threshold: FixedPoint64): <a href="randomness_config.md#0x1_randomness_config_RandomnessConfig">RandomnessConfig</a> {
+    <a href="randomness_config.md#0x1_randomness_config_RandomnessConfig">RandomnessConfig</a> {
+        variant: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/copyable_any.md#0x1_copyable_any_pack">copyable_any::pack</a>( <a href="randomness_config.md#0x1_randomness_config_ConfigV1">ConfigV1</a> {
+            secrecy_threshold,
+            reconstruction_threshold
+        } )
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_randomness_config_new_v2"></a>
+
+## Function `new_v2`
+
+Create a <code><a href="randomness_config.md#0x1_randomness_config_ConfigV2">ConfigV2</a></code> variant.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness_config.md#0x1_randomness_config_new_v2">new_v2</a>(secrecy_threshold: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>, reconstruction_threshold: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>, fast_path_secrecy_threshold: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>): <a href="randomness_config.md#0x1_randomness_config_RandomnessConfig">randomness_config::RandomnessConfig</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness_config.md#0x1_randomness_config_new_v2">new_v2</a>(
+    secrecy_threshold: FixedPoint64,
+    reconstruction_threshold: FixedPoint64,
+    fast_path_secrecy_threshold: FixedPoint64,
+): <a href="randomness_config.md#0x1_randomness_config_RandomnessConfig">RandomnessConfig</a> {
+    <a href="randomness_config.md#0x1_randomness_config_RandomnessConfig">RandomnessConfig</a> {
+        variant: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/copyable_any.md#0x1_copyable_any_pack">copyable_any::pack</a>( <a href="randomness_config.md#0x1_randomness_config_ConfigV2">ConfigV2</a> {
+            secrecy_threshold,
+            reconstruction_threshold,
+            fast_path_secrecy_threshold,
+        } )
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_randomness_config_current"></a>
+
+## Function `current`
+
+Get the currently effective randomness configuration object.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness_config.md#0x1_randomness_config_current">current</a>(): <a href="randomness_config.md#0x1_randomness_config_RandomnessConfig">randomness_config::RandomnessConfig</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness_config.md#0x1_randomness_config_current">current</a>(): <a href="randomness_config.md#0x1_randomness_config_RandomnessConfig">RandomnessConfig</a> <b>acquires</b> <a href="randomness_config.md#0x1_randomness_config_RandomnessConfig">RandomnessConfig</a> {
+    <b>if</b> (<b>exists</b>&lt;<a href="randomness_config.md#0x1_randomness_config_RandomnessConfig">RandomnessConfig</a>&gt;(@aptos_framework)) {
+        *<b>borrow_global</b>&lt;<a href="randomness_config.md#0x1_randomness_config_RandomnessConfig">RandomnessConfig</a>&gt;(@aptos_framework)
+    } <b>else</b> {
+        <a href="randomness_config.md#0x1_randomness_config_new_off">new_off</a>()
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+<a id="@Specification_1_on_new_epoch"></a>
+
+### Function `on_new_epoch`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="randomness_config.md#0x1_randomness_config_on_new_epoch">on_new_epoch</a>(framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>requires</b> @aptos_framework == std::signer::address_of(framework);
+<b>include</b> <a href="config_buffer.md#0x1_config_buffer_OnNewEpochRequirement">config_buffer::OnNewEpochRequirement</a>&lt;<a href="randomness_config.md#0x1_randomness_config_RandomnessConfig">RandomnessConfig</a>&gt;;
+<b>aborts_if</b> <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_current"></a>
+
+### Function `current`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness_config.md#0x1_randomness_config_current">current</a>(): <a href="randomness_config.md#0x1_randomness_config_RandomnessConfig">randomness_config::RandomnessConfig</a>
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/randomness_config_seqnum.md b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/randomness_config_seqnum.md
new file mode 100644
index 0000000000000..204660ce96813
--- /dev/null
+++ b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/randomness_config_seqnum.md
@@ -0,0 +1,170 @@
+
+<a id="0x1_randomness_config_seqnum"></a>
+
+# Module `0x1::randomness_config_seqnum`
+
+Randomness stall recovery utils.
+
+When randomness generation is stuck due to a bug, the chain is also stuck. Below is the recovery procedure.
+1. Ensure more than 2/3 stakes are stuck at the same version.
+1. Every validator restarts with <code>randomness_override_seq_num</code> set to <code>X+1</code> in the node config file,
+where <code>X</code> is the current <code><a href="randomness_config_seqnum.md#0x1_randomness_config_seqnum_RandomnessConfigSeqNum">RandomnessConfigSeqNum</a></code> on chain.
+1. The chain should then be unblocked.
+1. Once the bug is fixed and the binary + framework have been patched,
+a governance proposal is needed to set <code><a href="randomness_config_seqnum.md#0x1_randomness_config_seqnum_RandomnessConfigSeqNum">RandomnessConfigSeqNum</a></code> to be <code>X+2</code>.
+
+
+-  [Resource `RandomnessConfigSeqNum`](#0x1_randomness_config_seqnum_RandomnessConfigSeqNum)
+-  [Function `set_for_next_epoch`](#0x1_randomness_config_seqnum_set_for_next_epoch)
+-  [Function `initialize`](#0x1_randomness_config_seqnum_initialize)
+-  [Function `on_new_epoch`](#0x1_randomness_config_seqnum_on_new_epoch)
+-  [Specification](#@Specification_0)
+    -  [Function `on_new_epoch`](#@Specification_0_on_new_epoch)
+
+
+<pre><code><b>use</b> <a href="config_buffer.md#0x1_config_buffer">0x1::config_buffer</a>;
+<b>use</b> <a href="system_addresses.md#0x1_system_addresses">0x1::system_addresses</a>;
+</code></pre>
+
+
+
+<a id="0x1_randomness_config_seqnum_RandomnessConfigSeqNum"></a>
+
+## Resource `RandomnessConfigSeqNum`
+
+If this seqnum is smaller than a validator local override, the on-chain <code>RandomnessConfig</code> will be ignored.
+Useful in a chain recovery from randomness stall.
+
+
+<pre><code><b>struct</b> <a href="randomness_config_seqnum.md#0x1_randomness_config_seqnum_RandomnessConfigSeqNum">RandomnessConfigSeqNum</a> <b>has</b> drop, store, key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>seq_num: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_randomness_config_seqnum_set_for_next_epoch"></a>
+
+## Function `set_for_next_epoch`
+
+Update <code><a href="randomness_config_seqnum.md#0x1_randomness_config_seqnum_RandomnessConfigSeqNum">RandomnessConfigSeqNum</a></code>.
+Used when re-enable randomness after an emergency randomness disable via local override.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness_config_seqnum.md#0x1_randomness_config_seqnum_set_for_next_epoch">set_for_next_epoch</a>(framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, seq_num: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness_config_seqnum.md#0x1_randomness_config_seqnum_set_for_next_epoch">set_for_next_epoch</a>(framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, seq_num: u64) {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(framework);
+    <a href="config_buffer.md#0x1_config_buffer_upsert">config_buffer::upsert</a>(<a href="randomness_config_seqnum.md#0x1_randomness_config_seqnum_RandomnessConfigSeqNum">RandomnessConfigSeqNum</a> { seq_num });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_randomness_config_seqnum_initialize"></a>
+
+## Function `initialize`
+
+Initialize the configuration. Used in genesis or governance.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness_config_seqnum.md#0x1_randomness_config_seqnum_initialize">initialize</a>(framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="randomness_config_seqnum.md#0x1_randomness_config_seqnum_initialize">initialize</a>(framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>) {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(framework);
+    <b>if</b> (!<b>exists</b>&lt;<a href="randomness_config_seqnum.md#0x1_randomness_config_seqnum_RandomnessConfigSeqNum">RandomnessConfigSeqNum</a>&gt;(@aptos_framework)) {
+        <b>move_to</b>(framework, <a href="randomness_config_seqnum.md#0x1_randomness_config_seqnum_RandomnessConfigSeqNum">RandomnessConfigSeqNum</a> { seq_num: 0 })
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_randomness_config_seqnum_on_new_epoch"></a>
+
+## Function `on_new_epoch`
+
+Only used in reconfigurations to apply the pending <code>RandomnessConfig</code>, if there is any.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="randomness_config_seqnum.md#0x1_randomness_config_seqnum_on_new_epoch">on_new_epoch</a>(framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="randomness_config_seqnum.md#0x1_randomness_config_seqnum_on_new_epoch">on_new_epoch</a>(framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>) <b>acquires</b> <a href="randomness_config_seqnum.md#0x1_randomness_config_seqnum_RandomnessConfigSeqNum">RandomnessConfigSeqNum</a> {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(framework);
+    <b>if</b> (<a href="config_buffer.md#0x1_config_buffer_does_exist">config_buffer::does_exist</a>&lt;<a href="randomness_config_seqnum.md#0x1_randomness_config_seqnum_RandomnessConfigSeqNum">RandomnessConfigSeqNum</a>&gt;()) {
+        <b>let</b> new_config = <a href="config_buffer.md#0x1_config_buffer_extract">config_buffer::extract</a>&lt;<a href="randomness_config_seqnum.md#0x1_randomness_config_seqnum_RandomnessConfigSeqNum">RandomnessConfigSeqNum</a>&gt;();
+        <b>if</b> (<b>exists</b>&lt;<a href="randomness_config_seqnum.md#0x1_randomness_config_seqnum_RandomnessConfigSeqNum">RandomnessConfigSeqNum</a>&gt;(@aptos_framework)) {
+            *<b>borrow_global_mut</b>&lt;<a href="randomness_config_seqnum.md#0x1_randomness_config_seqnum_RandomnessConfigSeqNum">RandomnessConfigSeqNum</a>&gt;(@aptos_framework) = new_config;
+        } <b>else</b> {
+            <b>move_to</b>(framework, new_config);
+        }
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_0"></a>
+
+## Specification
+
+
+<a id="@Specification_0_on_new_epoch"></a>
+
+### Function `on_new_epoch`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="randomness_config_seqnum.md#0x1_randomness_config_seqnum_on_new_epoch">on_new_epoch</a>(framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>requires</b> @aptos_framework == std::signer::address_of(framework);
+<b>include</b> <a href="config_buffer.md#0x1_config_buffer_OnNewEpochRequirement">config_buffer::OnNewEpochRequirement</a>&lt;<a href="randomness_config_seqnum.md#0x1_randomness_config_seqnum_RandomnessConfigSeqNum">RandomnessConfigSeqNum</a>&gt;;
+<b>aborts_if</b> <b>false</b>;
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/reconfiguration.md b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/reconfiguration.md
new file mode 100644
index 0000000000000..545dfef452233
--- /dev/null
+++ b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/reconfiguration.md
@@ -0,0 +1,798 @@
+
+<a id="0x1_reconfiguration"></a>
+
+# Module `0x1::reconfiguration`
+
+Publishes configuration information for validators, and issues reconfiguration events
+to synchronize configuration changes for the validators.
+
+
+-  [Struct `NewEpochEvent`](#0x1_reconfiguration_NewEpochEvent)
+-  [Struct `NewEpoch`](#0x1_reconfiguration_NewEpoch)
+-  [Resource `Configuration`](#0x1_reconfiguration_Configuration)
+-  [Resource `DisableReconfiguration`](#0x1_reconfiguration_DisableReconfiguration)
+-  [Constants](#@Constants_0)
+-  [Function `initialize`](#0x1_reconfiguration_initialize)
+-  [Function `disable_reconfiguration`](#0x1_reconfiguration_disable_reconfiguration)
+-  [Function `enable_reconfiguration`](#0x1_reconfiguration_enable_reconfiguration)
+-  [Function `reconfiguration_enabled`](#0x1_reconfiguration_reconfiguration_enabled)
+-  [Function `reconfigure`](#0x1_reconfiguration_reconfigure)
+-  [Function `last_reconfiguration_time`](#0x1_reconfiguration_last_reconfiguration_time)
+-  [Function `current_epoch`](#0x1_reconfiguration_current_epoch)
+-  [Function `emit_genesis_reconfiguration_event`](#0x1_reconfiguration_emit_genesis_reconfiguration_event)
+-  [Specification](#@Specification_1)
+    -  [High-level Requirements](#high-level-req)
+    -  [Module-level Specification](#module-level-spec)
+    -  [Function `initialize`](#@Specification_1_initialize)
+    -  [Function `disable_reconfiguration`](#@Specification_1_disable_reconfiguration)
+    -  [Function `enable_reconfiguration`](#@Specification_1_enable_reconfiguration)
+    -  [Function `reconfiguration_enabled`](#@Specification_1_reconfiguration_enabled)
+    -  [Function `reconfigure`](#@Specification_1_reconfigure)
+    -  [Function `last_reconfiguration_time`](#@Specification_1_last_reconfiguration_time)
+    -  [Function `current_epoch`](#@Specification_1_current_epoch)
+    -  [Function `emit_genesis_reconfiguration_event`](#@Specification_1_emit_genesis_reconfiguration_event)
+
+
+<pre><code><b>use</b> <a href="account.md#0x1_account">0x1::account</a>;
+<b>use</b> <a href="chain_status.md#0x1_chain_status">0x1::chain_status</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="event.md#0x1_event">0x1::event</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features">0x1::features</a>;
+<b>use</b> <a href="reconfiguration_state.md#0x1_reconfiguration_state">0x1::reconfiguration_state</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">0x1::signer</a>;
+<b>use</b> <a href="stake.md#0x1_stake">0x1::stake</a>;
+<b>use</b> <a href="storage_gas.md#0x1_storage_gas">0x1::storage_gas</a>;
+<b>use</b> <a href="system_addresses.md#0x1_system_addresses">0x1::system_addresses</a>;
+<b>use</b> <a href="timestamp.md#0x1_timestamp">0x1::timestamp</a>;
+<b>use</b> <a href="transaction_fee.md#0x1_transaction_fee">0x1::transaction_fee</a>;
+</code></pre>
+
+
+
+<a id="0x1_reconfiguration_NewEpochEvent"></a>
+
+## Struct `NewEpochEvent`
+
+Event that signals consensus to start a new epoch,
+with new configuration information. This is also called a
+"reconfiguration event"
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="reconfiguration.md#0x1_reconfiguration_NewEpochEvent">NewEpochEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>epoch: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_reconfiguration_NewEpoch"></a>
+
+## Struct `NewEpoch`
+
+Event that signals consensus to start a new epoch,
+with new configuration information. This is also called a
+"reconfiguration event"
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="reconfiguration.md#0x1_reconfiguration_NewEpoch">NewEpoch</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>epoch: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_reconfiguration_Configuration"></a>
+
+## Resource `Configuration`
+
+Holds information about state of reconfiguration
+
+
+<pre><code><b>struct</b> <a href="reconfiguration.md#0x1_reconfiguration_Configuration">Configuration</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>epoch: u64</code>
+</dt>
+<dd>
+ Epoch number
+</dd>
+<dt>
+<code>last_reconfiguration_time: u64</code>
+</dt>
+<dd>
+ Time of last reconfiguration. Only changes on reconfiguration events.
+</dd>
+<dt>
+<code>events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="reconfiguration.md#0x1_reconfiguration_NewEpochEvent">reconfiguration::NewEpochEvent</a>&gt;</code>
+</dt>
+<dd>
+ Event handle for reconfiguration events
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_reconfiguration_DisableReconfiguration"></a>
+
+## Resource `DisableReconfiguration`
+
+Reconfiguration will be disabled if this resource is published under the
+aptos_framework system address
+
+
+<pre><code><b>struct</b> <a href="reconfiguration.md#0x1_reconfiguration_DisableReconfiguration">DisableReconfiguration</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>dummy_field: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_reconfiguration_ECONFIG"></a>
+
+A <code>Reconfiguration</code> resource is in an invalid state
+
+
+<pre><code><b>const</b> <a href="reconfiguration.md#0x1_reconfiguration_ECONFIG">ECONFIG</a>: u64 = 2;
+</code></pre>
+
+
+
+<a id="0x1_reconfiguration_ECONFIGURATION"></a>
+
+The <code><a href="reconfiguration.md#0x1_reconfiguration_Configuration">Configuration</a></code> resource is in an invalid state
+
+
+<pre><code><b>const</b> <a href="reconfiguration.md#0x1_reconfiguration_ECONFIGURATION">ECONFIGURATION</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_reconfiguration_EINVALID_BLOCK_TIME"></a>
+
+An invalid block time was encountered.
+
+
+<pre><code><b>const</b> <a href="reconfiguration.md#0x1_reconfiguration_EINVALID_BLOCK_TIME">EINVALID_BLOCK_TIME</a>: u64 = 4;
+</code></pre>
+
+
+
+<a id="0x1_reconfiguration_EINVALID_GUID_FOR_EVENT"></a>
+
+An invalid block time was encountered.
+
+
+<pre><code><b>const</b> <a href="reconfiguration.md#0x1_reconfiguration_EINVALID_GUID_FOR_EVENT">EINVALID_GUID_FOR_EVENT</a>: u64 = 5;
+</code></pre>
+
+
+
+<a id="0x1_reconfiguration_EMODIFY_CAPABILITY"></a>
+
+A <code>ModifyConfigCapability</code> is in a different state than was expected
+
+
+<pre><code><b>const</b> <a href="reconfiguration.md#0x1_reconfiguration_EMODIFY_CAPABILITY">EMODIFY_CAPABILITY</a>: u64 = 3;
+</code></pre>
+
+
+
+<a id="0x1_reconfiguration_initialize"></a>
+
+## Function `initialize`
+
+Only called during genesis.
+Publishes <code><a href="reconfiguration.md#0x1_reconfiguration_Configuration">Configuration</a></code> resource. Can only be invoked by aptos framework account, and only a single time in Genesis.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="reconfiguration.md#0x1_reconfiguration_initialize">initialize</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="reconfiguration.md#0x1_reconfiguration_initialize">initialize</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>) {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(aptos_framework);
+
+    // <b>assert</b> it matches `new_epoch_event_key()`, otherwise the <a href="event.md#0x1_event">event</a> can't be recognized
+    <b>assert</b>!(<a href="account.md#0x1_account_get_guid_next_creation_num">account::get_guid_next_creation_num</a>(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(aptos_framework)) == 2, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="reconfiguration.md#0x1_reconfiguration_EINVALID_GUID_FOR_EVENT">EINVALID_GUID_FOR_EVENT</a>));
+    <b>move_to</b>&lt;<a href="reconfiguration.md#0x1_reconfiguration_Configuration">Configuration</a>&gt;(
+        aptos_framework,
+        <a href="reconfiguration.md#0x1_reconfiguration_Configuration">Configuration</a> {
+            epoch: 0,
+            last_reconfiguration_time: 0,
+            events: <a href="account.md#0x1_account_new_event_handle">account::new_event_handle</a>&lt;<a href="reconfiguration.md#0x1_reconfiguration_NewEpochEvent">NewEpochEvent</a>&gt;(aptos_framework),
+        }
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_reconfiguration_disable_reconfiguration"></a>
+
+## Function `disable_reconfiguration`
+
+Private function to temporarily halt reconfiguration.
+This function should only be used for offline WriteSet generation purpose and should never be invoked on chain.
+
+
+<pre><code><b>fun</b> <a href="reconfiguration.md#0x1_reconfiguration_disable_reconfiguration">disable_reconfiguration</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="reconfiguration.md#0x1_reconfiguration_disable_reconfiguration">disable_reconfiguration</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>) {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(aptos_framework);
+    <b>assert</b>!(<a href="reconfiguration.md#0x1_reconfiguration_reconfiguration_enabled">reconfiguration_enabled</a>(), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="reconfiguration.md#0x1_reconfiguration_ECONFIGURATION">ECONFIGURATION</a>));
+    <b>move_to</b>(aptos_framework, <a href="reconfiguration.md#0x1_reconfiguration_DisableReconfiguration">DisableReconfiguration</a> {})
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_reconfiguration_enable_reconfiguration"></a>
+
+## Function `enable_reconfiguration`
+
+Private function to resume reconfiguration.
+This function should only be used for offline WriteSet generation purpose and should never be invoked on chain.
+
+
+<pre><code><b>fun</b> <a href="reconfiguration.md#0x1_reconfiguration_enable_reconfiguration">enable_reconfiguration</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="reconfiguration.md#0x1_reconfiguration_enable_reconfiguration">enable_reconfiguration</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>) <b>acquires</b> <a href="reconfiguration.md#0x1_reconfiguration_DisableReconfiguration">DisableReconfiguration</a> {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(aptos_framework);
+
+    <b>assert</b>!(!<a href="reconfiguration.md#0x1_reconfiguration_reconfiguration_enabled">reconfiguration_enabled</a>(), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="reconfiguration.md#0x1_reconfiguration_ECONFIGURATION">ECONFIGURATION</a>));
+    <a href="reconfiguration.md#0x1_reconfiguration_DisableReconfiguration">DisableReconfiguration</a> {} = <b>move_from</b>&lt;<a href="reconfiguration.md#0x1_reconfiguration_DisableReconfiguration">DisableReconfiguration</a>&gt;(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(aptos_framework));
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_reconfiguration_reconfiguration_enabled"></a>
+
+## Function `reconfiguration_enabled`
+
+
+
+<pre><code><b>fun</b> <a href="reconfiguration.md#0x1_reconfiguration_reconfiguration_enabled">reconfiguration_enabled</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="reconfiguration.md#0x1_reconfiguration_reconfiguration_enabled">reconfiguration_enabled</a>(): bool {
+    !<b>exists</b>&lt;<a href="reconfiguration.md#0x1_reconfiguration_DisableReconfiguration">DisableReconfiguration</a>&gt;(@aptos_framework)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_reconfiguration_reconfigure"></a>
+
+## Function `reconfigure`
+
+Signal validators to start using new configuration. Must be called from friend config modules.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="reconfiguration.md#0x1_reconfiguration_reconfigure">reconfigure</a>()
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="reconfiguration.md#0x1_reconfiguration_reconfigure">reconfigure</a>() <b>acquires</b> <a href="reconfiguration.md#0x1_reconfiguration_Configuration">Configuration</a> {
+    // Do not do anything <b>if</b> <a href="genesis.md#0x1_genesis">genesis</a> <b>has</b> not finished.
+    <b>if</b> (<a href="chain_status.md#0x1_chain_status_is_genesis">chain_status::is_genesis</a>() || <a href="timestamp.md#0x1_timestamp_now_microseconds">timestamp::now_microseconds</a>() == 0 || !<a href="reconfiguration.md#0x1_reconfiguration_reconfiguration_enabled">reconfiguration_enabled</a>()) {
+        <b>return</b>
+    };
+
+    <b>let</b> config_ref = <b>borrow_global_mut</b>&lt;<a href="reconfiguration.md#0x1_reconfiguration_Configuration">Configuration</a>&gt;(@aptos_framework);
+    <b>let</b> current_time = <a href="timestamp.md#0x1_timestamp_now_microseconds">timestamp::now_microseconds</a>();
+
+    // Do not do anything <b>if</b> a <a href="reconfiguration.md#0x1_reconfiguration">reconfiguration</a> <a href="event.md#0x1_event">event</a> is already emitted within this transaction.
+    //
+    // This is OK because:
+    // - The time changes in every non-empty <a href="block.md#0x1_block">block</a>
+    // - A <a href="block.md#0x1_block">block</a> automatically ends after a transaction that <b>emits</b> a <a href="reconfiguration.md#0x1_reconfiguration">reconfiguration</a> <a href="event.md#0x1_event">event</a>, which is guaranteed by
+    //   VM <b>spec</b> that all transactions comming after a <a href="reconfiguration.md#0x1_reconfiguration">reconfiguration</a> transaction will be returned <b>as</b> Retry
+    //   status.
+    // - Each transaction must emit at most one <a href="reconfiguration.md#0x1_reconfiguration">reconfiguration</a> <a href="event.md#0x1_event">event</a>
+    //
+    // Thus, this check <b>ensures</b> that a transaction that does multiple "<a href="reconfiguration.md#0x1_reconfiguration">reconfiguration</a> required" actions <b>emits</b> only
+    // one <a href="reconfiguration.md#0x1_reconfiguration">reconfiguration</a> <a href="event.md#0x1_event">event</a>.
+    //
+    <b>if</b> (current_time == config_ref.last_reconfiguration_time) {
+        <b>return</b>
+    };
+
+    <a href="reconfiguration_state.md#0x1_reconfiguration_state_on_reconfig_start">reconfiguration_state::on_reconfig_start</a>();
+
+    // Reconfiguration "forces the <a href="block.md#0x1_block">block</a>" <b>to</b> end, <b>as</b> mentioned above. Therefore, we must process the collected fees
+    // explicitly so that staking can distribute them.
+    //
+    // This also handles the case when a validator is removed due <b>to</b> the governance proposal. In particular, removing
+    // the validator causes a <a href="reconfiguration.md#0x1_reconfiguration">reconfiguration</a>. We explicitly process fees, i.e. we drain aggregatable <a href="coin.md#0x1_coin">coin</a> and populate
+    // the fees <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table">table</a>, prior <b>to</b> calling `on_new_epoch()`. That call, in turn, distributes transaction fees for all active
+    // and pending_inactive validators, which <b>include</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/any.md#0x1_any">any</a> validator that is <b>to</b> be removed.
+    <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_collect_and_distribute_gas_fees">features::collect_and_distribute_gas_fees</a>()) {
+        // All transactions after <a href="reconfiguration.md#0x1_reconfiguration">reconfiguration</a> are Retry. Therefore, when the next
+        // <a href="block.md#0x1_block">block</a> starts and tries <b>to</b> assign/burn collected fees it will be just 0 and
+        // nothing will be assigned.
+        <a href="transaction_fee.md#0x1_transaction_fee_process_collected_fees">transaction_fee::process_collected_fees</a>();
+    };
+
+    // Call <a href="stake.md#0x1_stake">stake</a> <b>to</b> compute the new validator set and distribute rewards and transaction fees.
+    <a href="stake.md#0x1_stake_on_new_epoch">stake::on_new_epoch</a>();
+    <a href="storage_gas.md#0x1_storage_gas_on_reconfig">storage_gas::on_reconfig</a>();
+
+    <b>assert</b>!(current_time &gt; config_ref.last_reconfiguration_time, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="reconfiguration.md#0x1_reconfiguration_EINVALID_BLOCK_TIME">EINVALID_BLOCK_TIME</a>));
+    config_ref.last_reconfiguration_time = current_time;
+    <b>spec</b> {
+        <b>assume</b> config_ref.epoch + 1 &lt;= MAX_U64;
+    };
+    config_ref.epoch = config_ref.epoch + 1;
+
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        <a href="event.md#0x1_event_emit">event::emit</a>(
+            <a href="reconfiguration.md#0x1_reconfiguration_NewEpoch">NewEpoch</a> {
+                epoch: config_ref.epoch,
+            },
+        );
+    };
+    <a href="event.md#0x1_event_emit_event">event::emit_event</a>&lt;<a href="reconfiguration.md#0x1_reconfiguration_NewEpochEvent">NewEpochEvent</a>&gt;(
+        &<b>mut</b> config_ref.events,
+        <a href="reconfiguration.md#0x1_reconfiguration_NewEpochEvent">NewEpochEvent</a> {
+            epoch: config_ref.epoch,
+        },
+    );
+
+    <a href="reconfiguration_state.md#0x1_reconfiguration_state_on_reconfig_finish">reconfiguration_state::on_reconfig_finish</a>();
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_reconfiguration_last_reconfiguration_time"></a>
+
+## Function `last_reconfiguration_time`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="reconfiguration.md#0x1_reconfiguration_last_reconfiguration_time">last_reconfiguration_time</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="reconfiguration.md#0x1_reconfiguration_last_reconfiguration_time">last_reconfiguration_time</a>(): u64 <b>acquires</b> <a href="reconfiguration.md#0x1_reconfiguration_Configuration">Configuration</a> {
+    <b>borrow_global</b>&lt;<a href="reconfiguration.md#0x1_reconfiguration_Configuration">Configuration</a>&gt;(@aptos_framework).last_reconfiguration_time
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_reconfiguration_current_epoch"></a>
+
+## Function `current_epoch`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="reconfiguration.md#0x1_reconfiguration_current_epoch">current_epoch</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="reconfiguration.md#0x1_reconfiguration_current_epoch">current_epoch</a>(): u64 <b>acquires</b> <a href="reconfiguration.md#0x1_reconfiguration_Configuration">Configuration</a> {
+    <b>borrow_global</b>&lt;<a href="reconfiguration.md#0x1_reconfiguration_Configuration">Configuration</a>&gt;(@aptos_framework).epoch
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_reconfiguration_emit_genesis_reconfiguration_event"></a>
+
+## Function `emit_genesis_reconfiguration_event`
+
+Emit a <code><a href="reconfiguration.md#0x1_reconfiguration_NewEpochEvent">NewEpochEvent</a></code> event. This function will be invoked by genesis directly to generate the very first
+reconfiguration event.
+
+
+<pre><code><b>fun</b> <a href="reconfiguration.md#0x1_reconfiguration_emit_genesis_reconfiguration_event">emit_genesis_reconfiguration_event</a>()
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="reconfiguration.md#0x1_reconfiguration_emit_genesis_reconfiguration_event">emit_genesis_reconfiguration_event</a>() <b>acquires</b> <a href="reconfiguration.md#0x1_reconfiguration_Configuration">Configuration</a> {
+    <b>let</b> config_ref = <b>borrow_global_mut</b>&lt;<a href="reconfiguration.md#0x1_reconfiguration_Configuration">Configuration</a>&gt;(@aptos_framework);
+    <b>assert</b>!(config_ref.epoch == 0 && config_ref.last_reconfiguration_time == 0, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="reconfiguration.md#0x1_reconfiguration_ECONFIGURATION">ECONFIGURATION</a>));
+    config_ref.epoch = 1;
+
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        <a href="event.md#0x1_event_emit">event::emit</a>(
+            <a href="reconfiguration.md#0x1_reconfiguration_NewEpoch">NewEpoch</a> {
+                epoch: config_ref.epoch,
+            },
+        );
+    };
+    <a href="event.md#0x1_event_emit_event">event::emit_event</a>&lt;<a href="reconfiguration.md#0x1_reconfiguration_NewEpochEvent">NewEpochEvent</a>&gt;(
+        &<b>mut</b> config_ref.events,
+        <a href="reconfiguration.md#0x1_reconfiguration_NewEpochEvent">NewEpochEvent</a> {
+            epoch: config_ref.epoch,
+        },
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+
+
+<a id="high-level-req"></a>
+
+### High-level Requirements
+
+<table>
+<tr>
+<th>No.</th><th>Requirement</th><th>Criticality</th><th>Implementation</th><th>Enforcement</th>
+</tr>
+
+<tr>
+<td>1</td>
+<td>The Configuration resource is stored under the Aptos framework account with initial values upon module's initialization.</td>
+<td>Medium</td>
+<td>The Configuration resource may only be initialized with specific values and published under the aptos_framework account.</td>
+<td>Formally verified via <a href="#high-level-req-1">initialize</a>.</td>
+</tr>
+
+<tr>
+<td>2</td>
+<td>The reconfiguration status may be determined at any time without causing an abort, indicating whether or not the system allows reconfiguration.</td>
+<td>Low</td>
+<td>The reconfiguration_enabled function will never abort and always returns a boolean value that accurately represents whether the system allows reconfiguration.</td>
+<td>Formally verified via <a href="#high-level-req-2">reconfiguration_enabled</a>.</td>
+</tr>
+
+<tr>
+<td>3</td>
+<td>For each reconfiguration, the epoch value (config_ref.epoch) increases by 1, and one 'NewEpochEvent' is emitted.</td>
+<td>Critical</td>
+<td>After reconfiguration, the reconfigure() function increases the epoch value of the configuration by one and increments the counter of the NewEpochEvent's EventHandle by one.</td>
+<td>Audited that these two values remain in sync.</td>
+</tr>
+
+<tr>
+<td>4</td>
+<td>Reconfiguration is possible only if genesis has started and reconfiguration is enabled. Also, the last reconfiguration must not be the current time, returning early without further actions otherwise.</td>
+<td>High</td>
+<td>The reconfigure() function may only execute to perform successful reconfiguration when genesis has started and when reconfiguration is enabled. Without satisfying both conditions, the function returns early without executing any further actions.</td>
+<td>Formally verified via <a href="#high-level-req-4">reconfigure</a>.</td>
+</tr>
+
+<tr>
+<td>5</td>
+<td>Consecutive reconfigurations without the passage of time are not permitted.</td>
+<td>High</td>
+<td>The reconfigure() function enforces the restriction that reconfiguration may only be performed when the current time is not equal to the last_reconfiguration_time.</td>
+<td>Formally verified via <a href="#high-level-req-5">reconfigure</a>.</td>
+</tr>
+
+</table>
+
+
+
+
+<a id="module-level-spec"></a>
+
+### Module-level Specification
+
+
+<pre><code><b>pragma</b> verify = <b>true</b>;
+<b>pragma</b> aborts_if_is_strict;
+<b>invariant</b> [suspendable] <a href="chain_status.md#0x1_chain_status_is_operating">chain_status::is_operating</a>() ==&gt; <b>exists</b>&lt;<a href="reconfiguration.md#0x1_reconfiguration_Configuration">Configuration</a>&gt;(@aptos_framework);
+<b>invariant</b> [suspendable] <a href="chain_status.md#0x1_chain_status_is_operating">chain_status::is_operating</a>() ==&gt;
+    (<a href="timestamp.md#0x1_timestamp_spec_now_microseconds">timestamp::spec_now_microseconds</a>() &gt;= <a href="reconfiguration.md#0x1_reconfiguration_last_reconfiguration_time">last_reconfiguration_time</a>());
+</code></pre>
+
+
+Make sure the signer address is @aptos_framework.
+
+
+<a id="0x1_reconfiguration_AbortsIfNotAptosFramework"></a>
+
+
+<pre><code><b>schema</b> <a href="reconfiguration.md#0x1_reconfiguration_AbortsIfNotAptosFramework">AbortsIfNotAptosFramework</a> {
+    aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>;
+    <b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(aptos_framework);
+    <b>aborts_if</b> !<a href="system_addresses.md#0x1_system_addresses_is_aptos_framework_address">system_addresses::is_aptos_framework_address</a>(addr);
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_initialize"></a>
+
+### Function `initialize`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="reconfiguration.md#0x1_reconfiguration_initialize">initialize</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+Address @aptos_framework must exist resource Account and Configuration.
+Already exists in framework account.
+Guid_creation_num should be 2 according to logic.
+
+
+<pre><code><b>include</b> <a href="reconfiguration.md#0x1_reconfiguration_AbortsIfNotAptosFramework">AbortsIfNotAptosFramework</a>;
+<b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(aptos_framework);
+<b>let</b> <b>post</b> config = <b>global</b>&lt;<a href="reconfiguration.md#0x1_reconfiguration_Configuration">Configuration</a>&gt;(@aptos_framework);
+<b>requires</b> <b>exists</b>&lt;Account&gt;(addr);
+<b>aborts_if</b> !(<b>global</b>&lt;Account&gt;(addr).guid_creation_num == 2);
+<b>aborts_if</b> <b>exists</b>&lt;<a href="reconfiguration.md#0x1_reconfiguration_Configuration">Configuration</a>&gt;(@aptos_framework);
+// This enforces <a id="high-level-req-1" href="#high-level-req">high-level requirement 1</a>:
+<b>ensures</b> <b>exists</b>&lt;<a href="reconfiguration.md#0x1_reconfiguration_Configuration">Configuration</a>&gt;(@aptos_framework);
+<b>ensures</b> config.epoch == 0 && config.last_reconfiguration_time == 0;
+<b>ensures</b> config.events == <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="reconfiguration.md#0x1_reconfiguration_NewEpochEvent">NewEpochEvent</a>&gt; {
+    counter: 0,
+    <a href="guid.md#0x1_guid">guid</a>: <a href="guid.md#0x1_guid_GUID">guid::GUID</a> {
+        id: <a href="guid.md#0x1_guid_ID">guid::ID</a> {
+            creation_num: 2,
+            addr: @aptos_framework
+        }
+    }
+};
+</code></pre>
+
+
+
+<a id="@Specification_1_disable_reconfiguration"></a>
+
+### Function `disable_reconfiguration`
+
+
+<pre><code><b>fun</b> <a href="reconfiguration.md#0x1_reconfiguration_disable_reconfiguration">disable_reconfiguration</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="reconfiguration.md#0x1_reconfiguration_AbortsIfNotAptosFramework">AbortsIfNotAptosFramework</a>;
+<b>aborts_if</b> <b>exists</b>&lt;<a href="reconfiguration.md#0x1_reconfiguration_DisableReconfiguration">DisableReconfiguration</a>&gt;(@aptos_framework);
+<b>ensures</b> <b>exists</b>&lt;<a href="reconfiguration.md#0x1_reconfiguration_DisableReconfiguration">DisableReconfiguration</a>&gt;(@aptos_framework);
+</code></pre>
+
+
+
+<a id="@Specification_1_enable_reconfiguration"></a>
+
+### Function `enable_reconfiguration`
+
+
+<pre><code><b>fun</b> <a href="reconfiguration.md#0x1_reconfiguration_enable_reconfiguration">enable_reconfiguration</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+Make sure the caller is admin and check the resource DisableReconfiguration.
+
+
+<pre><code><b>include</b> <a href="reconfiguration.md#0x1_reconfiguration_AbortsIfNotAptosFramework">AbortsIfNotAptosFramework</a>;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="reconfiguration.md#0x1_reconfiguration_DisableReconfiguration">DisableReconfiguration</a>&gt;(@aptos_framework);
+<b>ensures</b> !<b>exists</b>&lt;<a href="reconfiguration.md#0x1_reconfiguration_DisableReconfiguration">DisableReconfiguration</a>&gt;(@aptos_framework);
+</code></pre>
+
+
+
+<a id="@Specification_1_reconfiguration_enabled"></a>
+
+### Function `reconfiguration_enabled`
+
+
+<pre><code><b>fun</b> <a href="reconfiguration.md#0x1_reconfiguration_reconfiguration_enabled">reconfiguration_enabled</a>(): bool
+</code></pre>
+
+
+
+
+<pre><code>// This enforces <a id="high-level-req-2" href="#high-level-req">high-level requirement 2</a>:
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == !<b>exists</b>&lt;<a href="reconfiguration.md#0x1_reconfiguration_DisableReconfiguration">DisableReconfiguration</a>&gt;(@aptos_framework);
+</code></pre>
+
+
+
+<a id="@Specification_1_reconfigure"></a>
+
+### Function `reconfigure`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="reconfiguration.md#0x1_reconfiguration_reconfigure">reconfigure</a>()
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>true</b>;
+<b>pragma</b> verify_duration_estimate = 600;
+<b>requires</b> <b>exists</b>&lt;<a href="stake.md#0x1_stake_ValidatorFees">stake::ValidatorFees</a>&gt;(@aptos_framework);
+<b>let</b> success = !(<a href="chain_status.md#0x1_chain_status_is_genesis">chain_status::is_genesis</a>() || <a href="timestamp.md#0x1_timestamp_spec_now_microseconds">timestamp::spec_now_microseconds</a>() == 0 || !<a href="reconfiguration.md#0x1_reconfiguration_reconfiguration_enabled">reconfiguration_enabled</a>())
+    && <a href="timestamp.md#0x1_timestamp_spec_now_microseconds">timestamp::spec_now_microseconds</a>() != <b>global</b>&lt;<a href="reconfiguration.md#0x1_reconfiguration_Configuration">Configuration</a>&gt;(@aptos_framework).last_reconfiguration_time;
+<b>include</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_spec_periodical_reward_rate_decrease_enabled">features::spec_periodical_reward_rate_decrease_enabled</a>() ==&gt; <a href="staking_config.md#0x1_staking_config_StakingRewardsConfigEnabledRequirement">staking_config::StakingRewardsConfigEnabledRequirement</a>;
+<b>include</b> success ==&gt; <a href="aptos_coin.md#0x1_aptos_coin_ExistsAptosCoin">aptos_coin::ExistsAptosCoin</a>;
+<b>include</b> <a href="transaction_fee.md#0x1_transaction_fee_RequiresCollectedFeesPerValueLeqBlockAptosSupply">transaction_fee::RequiresCollectedFeesPerValueLeqBlockAptosSupply</a>;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> success ==&gt; <b>global</b>&lt;<a href="reconfiguration.md#0x1_reconfiguration_Configuration">Configuration</a>&gt;(@aptos_framework).epoch == <b>old</b>(<b>global</b>&lt;<a href="reconfiguration.md#0x1_reconfiguration_Configuration">Configuration</a>&gt;(@aptos_framework).epoch) + 1;
+<b>ensures</b> success ==&gt; <b>global</b>&lt;<a href="reconfiguration.md#0x1_reconfiguration_Configuration">Configuration</a>&gt;(@aptos_framework).last_reconfiguration_time == <a href="timestamp.md#0x1_timestamp_spec_now_microseconds">timestamp::spec_now_microseconds</a>();
+// This enforces <a id="high-level-req-4" href="#high-level-req">high-level requirement 4</a> and <a id="high-level-req-5" href="#high-level-req">high-level requirement 5</a>:
+<b>ensures</b> !success ==&gt; <b>global</b>&lt;<a href="reconfiguration.md#0x1_reconfiguration_Configuration">Configuration</a>&gt;(@aptos_framework).epoch == <b>old</b>(<b>global</b>&lt;<a href="reconfiguration.md#0x1_reconfiguration_Configuration">Configuration</a>&gt;(@aptos_framework).epoch);
+</code></pre>
+
+
+
+<a id="@Specification_1_last_reconfiguration_time"></a>
+
+### Function `last_reconfiguration_time`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="reconfiguration.md#0x1_reconfiguration_last_reconfiguration_time">last_reconfiguration_time</a>(): u64
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="reconfiguration.md#0x1_reconfiguration_Configuration">Configuration</a>&gt;(@aptos_framework);
+<b>ensures</b> result == <b>global</b>&lt;<a href="reconfiguration.md#0x1_reconfiguration_Configuration">Configuration</a>&gt;(@aptos_framework).last_reconfiguration_time;
+</code></pre>
+
+
+
+<a id="@Specification_1_current_epoch"></a>
+
+### Function `current_epoch`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="reconfiguration.md#0x1_reconfiguration_current_epoch">current_epoch</a>(): u64
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="reconfiguration.md#0x1_reconfiguration_Configuration">Configuration</a>&gt;(@aptos_framework);
+<b>ensures</b> result == <b>global</b>&lt;<a href="reconfiguration.md#0x1_reconfiguration_Configuration">Configuration</a>&gt;(@aptos_framework).epoch;
+</code></pre>
+
+
+
+<a id="@Specification_1_emit_genesis_reconfiguration_event"></a>
+
+### Function `emit_genesis_reconfiguration_event`
+
+
+<pre><code><b>fun</b> <a href="reconfiguration.md#0x1_reconfiguration_emit_genesis_reconfiguration_event">emit_genesis_reconfiguration_event</a>()
+</code></pre>
+
+
+When genesis_event emit the epoch and the <code>last_reconfiguration_time</code> .
+Should equal to 0
+
+
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="reconfiguration.md#0x1_reconfiguration_Configuration">Configuration</a>&gt;(@aptos_framework);
+<b>let</b> config_ref = <b>global</b>&lt;<a href="reconfiguration.md#0x1_reconfiguration_Configuration">Configuration</a>&gt;(@aptos_framework);
+<b>aborts_if</b> !(config_ref.epoch == 0 && config_ref.last_reconfiguration_time == 0);
+<b>ensures</b> <b>global</b>&lt;<a href="reconfiguration.md#0x1_reconfiguration_Configuration">Configuration</a>&gt;(@aptos_framework).epoch == 1;
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/reconfiguration_state.md b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/reconfiguration_state.md
new file mode 100644
index 0000000000000..f10d45d9f5b62
--- /dev/null
+++ b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/reconfiguration_state.md
@@ -0,0 +1,573 @@
+
+<a id="0x1_reconfiguration_state"></a>
+
+# Module `0x1::reconfiguration_state`
+
+Reconfiguration meta-state resources and util functions.
+
+WARNING: <code><a href="reconfiguration_state.md#0x1_reconfiguration_state_initialize">reconfiguration_state::initialize</a>()</code> is required before <code>RECONFIGURE_WITH_DKG</code> can be enabled.
+
+
+-  [Resource `State`](#0x1_reconfiguration_state_State)
+-  [Struct `StateInactive`](#0x1_reconfiguration_state_StateInactive)
+-  [Struct `StateActive`](#0x1_reconfiguration_state_StateActive)
+-  [Constants](#@Constants_0)
+-  [Function `is_initialized`](#0x1_reconfiguration_state_is_initialized)
+-  [Function `initialize`](#0x1_reconfiguration_state_initialize)
+-  [Function `initialize_for_testing`](#0x1_reconfiguration_state_initialize_for_testing)
+-  [Function `is_in_progress`](#0x1_reconfiguration_state_is_in_progress)
+-  [Function `on_reconfig_start`](#0x1_reconfiguration_state_on_reconfig_start)
+-  [Function `start_time_secs`](#0x1_reconfiguration_state_start_time_secs)
+-  [Function `on_reconfig_finish`](#0x1_reconfiguration_state_on_reconfig_finish)
+-  [Specification](#@Specification_1)
+    -  [Resource `State`](#@Specification_1_State)
+    -  [Function `initialize`](#@Specification_1_initialize)
+    -  [Function `initialize_for_testing`](#@Specification_1_initialize_for_testing)
+    -  [Function `is_in_progress`](#@Specification_1_is_in_progress)
+    -  [Function `on_reconfig_start`](#@Specification_1_on_reconfig_start)
+    -  [Function `start_time_secs`](#@Specification_1_start_time_secs)
+
+
+<pre><code><b>use</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/copyable_any.md#0x1_copyable_any">0x1::copyable_any</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string">0x1::string</a>;
+<b>use</b> <a href="system_addresses.md#0x1_system_addresses">0x1::system_addresses</a>;
+<b>use</b> <a href="timestamp.md#0x1_timestamp">0x1::timestamp</a>;
+</code></pre>
+
+
+
+<a id="0x1_reconfiguration_state_State"></a>
+
+## Resource `State`
+
+Reconfiguration drivers update this resources to notify other modules of some reconfiguration state.
+
+
+<pre><code><b>struct</b> <a href="reconfiguration_state.md#0x1_reconfiguration_state_State">State</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>variant: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/copyable_any.md#0x1_copyable_any_Any">copyable_any::Any</a></code>
+</dt>
+<dd>
+ The state variant packed as an <code>Any</code>.
+ Currently the variant type is one of the following.
+ - <code>ReconfigStateInactive</code>
+ - <code>ReconfigStateActive</code>
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_reconfiguration_state_StateInactive"></a>
+
+## Struct `StateInactive`
+
+A state variant indicating no reconfiguration is in progress.
+
+
+<pre><code><b>struct</b> <a href="reconfiguration_state.md#0x1_reconfiguration_state_StateInactive">StateInactive</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>dummy_field: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_reconfiguration_state_StateActive"></a>
+
+## Struct `StateActive`
+
+A state variant indicating a reconfiguration is in progress.
+
+
+<pre><code><b>struct</b> <a href="reconfiguration_state.md#0x1_reconfiguration_state_StateActive">StateActive</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>start_time_secs: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_reconfiguration_state_ERECONFIG_NOT_IN_PROGRESS"></a>
+
+
+
+<pre><code><b>const</b> <a href="reconfiguration_state.md#0x1_reconfiguration_state_ERECONFIG_NOT_IN_PROGRESS">ERECONFIG_NOT_IN_PROGRESS</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_reconfiguration_state_is_initialized"></a>
+
+## Function `is_initialized`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="reconfiguration_state.md#0x1_reconfiguration_state_is_initialized">is_initialized</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="reconfiguration_state.md#0x1_reconfiguration_state_is_initialized">is_initialized</a>(): bool {
+    <b>exists</b>&lt;<a href="reconfiguration_state.md#0x1_reconfiguration_state_State">State</a>&gt;(@aptos_framework)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_reconfiguration_state_initialize"></a>
+
+## Function `initialize`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="reconfiguration_state.md#0x1_reconfiguration_state_initialize">initialize</a>(fx: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="reconfiguration_state.md#0x1_reconfiguration_state_initialize">initialize</a>(fx: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>) {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(fx);
+    <b>if</b> (!<b>exists</b>&lt;<a href="reconfiguration_state.md#0x1_reconfiguration_state_State">State</a>&gt;(@aptos_framework)) {
+        <b>move_to</b>(fx, <a href="reconfiguration_state.md#0x1_reconfiguration_state_State">State</a> {
+            variant: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/copyable_any.md#0x1_copyable_any_pack">copyable_any::pack</a>(<a href="reconfiguration_state.md#0x1_reconfiguration_state_StateInactive">StateInactive</a> {})
+        })
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_reconfiguration_state_initialize_for_testing"></a>
+
+## Function `initialize_for_testing`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="reconfiguration_state.md#0x1_reconfiguration_state_initialize_for_testing">initialize_for_testing</a>(fx: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="reconfiguration_state.md#0x1_reconfiguration_state_initialize_for_testing">initialize_for_testing</a>(fx: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>) {
+    <a href="reconfiguration_state.md#0x1_reconfiguration_state_initialize">initialize</a>(fx)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_reconfiguration_state_is_in_progress"></a>
+
+## Function `is_in_progress`
+
+Return whether the reconfiguration state is marked "in progress".
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="reconfiguration_state.md#0x1_reconfiguration_state_is_in_progress">is_in_progress</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="reconfiguration_state.md#0x1_reconfiguration_state_is_in_progress">is_in_progress</a>(): bool <b>acquires</b> <a href="reconfiguration_state.md#0x1_reconfiguration_state_State">State</a> {
+    <b>if</b> (!<b>exists</b>&lt;<a href="reconfiguration_state.md#0x1_reconfiguration_state_State">State</a>&gt;(@aptos_framework)) {
+        <b>return</b> <b>false</b>
+    };
+
+    <b>let</b> state = <b>borrow_global</b>&lt;<a href="reconfiguration_state.md#0x1_reconfiguration_state_State">State</a>&gt;(@aptos_framework);
+    <b>let</b> variant_type_name = *<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_bytes">string::bytes</a>(<a href="../../../aptos-stdlib/tests/compiler-v2-doc/copyable_any.md#0x1_copyable_any_type_name">copyable_any::type_name</a>(&state.variant));
+    variant_type_name == b"<a href="reconfiguration_state.md#0x1_reconfiguration_state_StateActive">0x1::reconfiguration_state::StateActive</a>"
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_reconfiguration_state_on_reconfig_start"></a>
+
+## Function `on_reconfig_start`
+
+Called at the beginning of a reconfiguration (either immediate or async)
+to mark the reconfiguration state "in progress" if it is currently "stopped".
+
+Also record the current time as the reconfiguration start time. (Some module, e.g., <code><a href="stake.md#0x1_stake">stake</a>.<b>move</b></code>, needs this info).
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="reconfiguration_state.md#0x1_reconfiguration_state_on_reconfig_start">on_reconfig_start</a>()
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="reconfiguration_state.md#0x1_reconfiguration_state_on_reconfig_start">on_reconfig_start</a>() <b>acquires</b> <a href="reconfiguration_state.md#0x1_reconfiguration_state_State">State</a> {
+    <b>if</b> (<b>exists</b>&lt;<a href="reconfiguration_state.md#0x1_reconfiguration_state_State">State</a>&gt;(@aptos_framework)) {
+        <b>let</b> state = <b>borrow_global_mut</b>&lt;<a href="reconfiguration_state.md#0x1_reconfiguration_state_State">State</a>&gt;(@aptos_framework);
+        <b>let</b> variant_type_name = *<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_bytes">string::bytes</a>(<a href="../../../aptos-stdlib/tests/compiler-v2-doc/copyable_any.md#0x1_copyable_any_type_name">copyable_any::type_name</a>(&state.variant));
+        <b>if</b> (variant_type_name == b"<a href="reconfiguration_state.md#0x1_reconfiguration_state_StateInactive">0x1::reconfiguration_state::StateInactive</a>") {
+            state.variant = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/copyable_any.md#0x1_copyable_any_pack">copyable_any::pack</a>(<a href="reconfiguration_state.md#0x1_reconfiguration_state_StateActive">StateActive</a> {
+                start_time_secs: <a href="timestamp.md#0x1_timestamp_now_seconds">timestamp::now_seconds</a>()
+            });
+        }
+    };
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_reconfiguration_state_start_time_secs"></a>
+
+## Function `start_time_secs`
+
+Get the unix time when the currently in-progress reconfiguration started.
+Abort if the reconfiguration state is not "in progress".
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="reconfiguration_state.md#0x1_reconfiguration_state_start_time_secs">start_time_secs</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="reconfiguration_state.md#0x1_reconfiguration_state_start_time_secs">start_time_secs</a>(): u64 <b>acquires</b> <a href="reconfiguration_state.md#0x1_reconfiguration_state_State">State</a> {
+    <b>let</b> state = <b>borrow_global</b>&lt;<a href="reconfiguration_state.md#0x1_reconfiguration_state_State">State</a>&gt;(@aptos_framework);
+    <b>let</b> variant_type_name = *<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_bytes">string::bytes</a>(<a href="../../../aptos-stdlib/tests/compiler-v2-doc/copyable_any.md#0x1_copyable_any_type_name">copyable_any::type_name</a>(&state.variant));
+    <b>if</b> (variant_type_name == b"<a href="reconfiguration_state.md#0x1_reconfiguration_state_StateActive">0x1::reconfiguration_state::StateActive</a>") {
+        <b>let</b> active = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/copyable_any.md#0x1_copyable_any_unpack">copyable_any::unpack</a>&lt;<a href="reconfiguration_state.md#0x1_reconfiguration_state_StateActive">StateActive</a>&gt;(state.variant);
+        active.start_time_secs
+    } <b>else</b> {
+        <b>abort</b>(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="reconfiguration_state.md#0x1_reconfiguration_state_ERECONFIG_NOT_IN_PROGRESS">ERECONFIG_NOT_IN_PROGRESS</a>))
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_reconfiguration_state_on_reconfig_finish"></a>
+
+## Function `on_reconfig_finish`
+
+Called at the end of every reconfiguration to mark the state as "stopped".
+Abort if the current state is not "in progress".
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="reconfiguration_state.md#0x1_reconfiguration_state_on_reconfig_finish">on_reconfig_finish</a>()
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="reconfiguration_state.md#0x1_reconfiguration_state_on_reconfig_finish">on_reconfig_finish</a>() <b>acquires</b> <a href="reconfiguration_state.md#0x1_reconfiguration_state_State">State</a> {
+    <b>if</b> (<b>exists</b>&lt;<a href="reconfiguration_state.md#0x1_reconfiguration_state_State">State</a>&gt;(@aptos_framework)) {
+        <b>let</b> state = <b>borrow_global_mut</b>&lt;<a href="reconfiguration_state.md#0x1_reconfiguration_state_State">State</a>&gt;(@aptos_framework);
+        <b>let</b> variant_type_name = *<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_bytes">string::bytes</a>(<a href="../../../aptos-stdlib/tests/compiler-v2-doc/copyable_any.md#0x1_copyable_any_type_name">copyable_any::type_name</a>(&state.variant));
+        <b>if</b> (variant_type_name == b"<a href="reconfiguration_state.md#0x1_reconfiguration_state_StateActive">0x1::reconfiguration_state::StateActive</a>") {
+            state.variant = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/copyable_any.md#0x1_copyable_any_pack">copyable_any::pack</a>(<a href="reconfiguration_state.md#0x1_reconfiguration_state_StateInactive">StateInactive</a> {});
+        } <b>else</b> {
+            <b>abort</b>(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="reconfiguration_state.md#0x1_reconfiguration_state_ERECONFIG_NOT_IN_PROGRESS">ERECONFIG_NOT_IN_PROGRESS</a>))
+        }
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+
+<pre><code><b>invariant</b> [suspendable] <a href="chain_status.md#0x1_chain_status_is_operating">chain_status::is_operating</a>() ==&gt; <b>exists</b>&lt;<a href="reconfiguration_state.md#0x1_reconfiguration_state_State">State</a>&gt;(@aptos_framework);
+</code></pre>
+
+
+
+<a id="@Specification_1_State"></a>
+
+### Resource `State`
+
+
+<pre><code><b>struct</b> <a href="reconfiguration_state.md#0x1_reconfiguration_state_State">State</a> <b>has</b> key
+</code></pre>
+
+
+
+<dl>
+<dt>
+<code>variant: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/copyable_any.md#0x1_copyable_any_Any">copyable_any::Any</a></code>
+</dt>
+<dd>
+ The state variant packed as an <code>Any</code>.
+ Currently the variant type is one of the following.
+ - <code>ReconfigStateInactive</code>
+ - <code>ReconfigStateActive</code>
+</dd>
+</dl>
+
+
+
+<pre><code><b>invariant</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/copyable_any.md#0x1_copyable_any_type_name">copyable_any::type_name</a>(variant).bytes == b"<a href="reconfiguration_state.md#0x1_reconfiguration_state_StateActive">0x1::reconfiguration_state::StateActive</a>" ||
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/copyable_any.md#0x1_copyable_any_type_name">copyable_any::type_name</a>(variant).bytes == b"<a href="reconfiguration_state.md#0x1_reconfiguration_state_StateInactive">0x1::reconfiguration_state::StateInactive</a>";
+<b>invariant</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/copyable_any.md#0x1_copyable_any_type_name">copyable_any::type_name</a>(variant).bytes == b"<a href="reconfiguration_state.md#0x1_reconfiguration_state_StateActive">0x1::reconfiguration_state::StateActive</a>"
+    ==&gt; <a href="../../../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_deserializable">from_bcs::deserializable</a>&lt;<a href="reconfiguration_state.md#0x1_reconfiguration_state_StateActive">StateActive</a>&gt;(variant.data);
+<b>invariant</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/copyable_any.md#0x1_copyable_any_type_name">copyable_any::type_name</a>(variant).bytes == b"<a href="reconfiguration_state.md#0x1_reconfiguration_state_StateInactive">0x1::reconfiguration_state::StateInactive</a>"
+    ==&gt; <a href="../../../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_deserializable">from_bcs::deserializable</a>&lt;<a href="reconfiguration_state.md#0x1_reconfiguration_state_StateInactive">StateInactive</a>&gt;(variant.data);
+<b>invariant</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/copyable_any.md#0x1_copyable_any_type_name">copyable_any::type_name</a>(variant).bytes == b"<a href="reconfiguration_state.md#0x1_reconfiguration_state_StateActive">0x1::reconfiguration_state::StateActive</a>" ==&gt;
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_type_name">type_info::type_name</a>&lt;<a href="reconfiguration_state.md#0x1_reconfiguration_state_StateActive">StateActive</a>&gt;() == variant.type_name;
+<b>invariant</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/copyable_any.md#0x1_copyable_any_type_name">copyable_any::type_name</a>(variant).bytes == b"<a href="reconfiguration_state.md#0x1_reconfiguration_state_StateInactive">0x1::reconfiguration_state::StateInactive</a>" ==&gt;
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_type_name">type_info::type_name</a>&lt;<a href="reconfiguration_state.md#0x1_reconfiguration_state_StateInactive">StateInactive</a>&gt;() == variant.type_name;
+</code></pre>
+
+
+
+<a id="@Specification_1_initialize"></a>
+
+### Function `initialize`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="reconfiguration_state.md#0x1_reconfiguration_state_initialize">initialize</a>(fx: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(fx) != @aptos_framework;
+<b>let</b> <b>post</b> post_state = <b>global</b>&lt;<a href="reconfiguration_state.md#0x1_reconfiguration_state_State">State</a>&gt;(@aptos_framework);
+<b>ensures</b> <b>exists</b>&lt;<a href="reconfiguration_state.md#0x1_reconfiguration_state_State">State</a>&gt;(@aptos_framework);
+<b>ensures</b> !<b>exists</b>&lt;<a href="reconfiguration_state.md#0x1_reconfiguration_state_State">State</a>&gt;(@aptos_framework) ==&gt; <a href="../../../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_deserializable">from_bcs::deserializable</a>&lt;<a href="reconfiguration_state.md#0x1_reconfiguration_state_StateInactive">StateInactive</a>&gt;(post_state.variant.data);
+</code></pre>
+
+
+
+<a id="@Specification_1_initialize_for_testing"></a>
+
+### Function `initialize_for_testing`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="reconfiguration_state.md#0x1_reconfiguration_state_initialize_for_testing">initialize_for_testing</a>(fx: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(fx) != @aptos_framework;
+</code></pre>
+
+
+
+<a id="@Specification_1_is_in_progress"></a>
+
+### Function `is_in_progress`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="reconfiguration_state.md#0x1_reconfiguration_state_is_in_progress">is_in_progress</a>(): bool
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+</code></pre>
+
+
+
+
+<a id="0x1_reconfiguration_state_spec_is_in_progress"></a>
+
+
+<pre><code><b>fun</b> <a href="reconfiguration_state.md#0x1_reconfiguration_state_spec_is_in_progress">spec_is_in_progress</a>(): bool {
+   <b>if</b> (!<b>exists</b>&lt;<a href="reconfiguration_state.md#0x1_reconfiguration_state_State">State</a>&gt;(@aptos_framework)) {
+       <b>false</b>
+   } <b>else</b> {
+       <a href="../../../aptos-stdlib/tests/compiler-v2-doc/copyable_any.md#0x1_copyable_any_type_name">copyable_any::type_name</a>(<b>global</b>&lt;<a href="reconfiguration_state.md#0x1_reconfiguration_state_State">State</a>&gt;(@aptos_framework).variant).bytes == b"<a href="reconfiguration_state.md#0x1_reconfiguration_state_StateActive">0x1::reconfiguration_state::StateActive</a>"
+   }
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_on_reconfig_start"></a>
+
+### Function `on_reconfig_start`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="reconfiguration_state.md#0x1_reconfiguration_state_on_reconfig_start">on_reconfig_start</a>()
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+<b>requires</b> <b>exists</b>&lt;<a href="timestamp.md#0x1_timestamp_CurrentTimeMicroseconds">timestamp::CurrentTimeMicroseconds</a>&gt;(@aptos_framework);
+<b>let</b> state = Any {
+    type_name: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_type_name">type_info::type_name</a>&lt;<a href="reconfiguration_state.md#0x1_reconfiguration_state_StateActive">StateActive</a>&gt;(),
+    data: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs_serialize">bcs::serialize</a>(<a href="reconfiguration_state.md#0x1_reconfiguration_state_StateActive">StateActive</a> {
+        start_time_secs: <a href="timestamp.md#0x1_timestamp_spec_now_seconds">timestamp::spec_now_seconds</a>()
+    })
+};
+<b>let</b> pre_state = <b>global</b>&lt;<a href="reconfiguration_state.md#0x1_reconfiguration_state_State">State</a>&gt;(@aptos_framework);
+<b>let</b> <b>post</b> post_state = <b>global</b>&lt;<a href="reconfiguration_state.md#0x1_reconfiguration_state_State">State</a>&gt;(@aptos_framework);
+<b>ensures</b> (<b>exists</b>&lt;<a href="reconfiguration_state.md#0x1_reconfiguration_state_State">State</a>&gt;(@aptos_framework) && <a href="../../../aptos-stdlib/tests/compiler-v2-doc/copyable_any.md#0x1_copyable_any_type_name">copyable_any::type_name</a>(pre_state.variant).bytes
+    == b"<a href="reconfiguration_state.md#0x1_reconfiguration_state_StateInactive">0x1::reconfiguration_state::StateInactive</a>") ==&gt; <a href="../../../aptos-stdlib/tests/compiler-v2-doc/copyable_any.md#0x1_copyable_any_type_name">copyable_any::type_name</a>(post_state.variant).bytes
+    == b"<a href="reconfiguration_state.md#0x1_reconfiguration_state_StateActive">0x1::reconfiguration_state::StateActive</a>";
+<b>ensures</b> (<b>exists</b>&lt;<a href="reconfiguration_state.md#0x1_reconfiguration_state_State">State</a>&gt;(@aptos_framework) && <a href="../../../aptos-stdlib/tests/compiler-v2-doc/copyable_any.md#0x1_copyable_any_type_name">copyable_any::type_name</a>(pre_state.variant).bytes
+    == b"<a href="reconfiguration_state.md#0x1_reconfiguration_state_StateInactive">0x1::reconfiguration_state::StateInactive</a>") ==&gt; post_state.variant == state;
+<b>ensures</b> (<b>exists</b>&lt;<a href="reconfiguration_state.md#0x1_reconfiguration_state_State">State</a>&gt;(@aptos_framework) && <a href="../../../aptos-stdlib/tests/compiler-v2-doc/copyable_any.md#0x1_copyable_any_type_name">copyable_any::type_name</a>(pre_state.variant).bytes
+    == b"<a href="reconfiguration_state.md#0x1_reconfiguration_state_StateInactive">0x1::reconfiguration_state::StateInactive</a>") ==&gt; <a href="../../../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_deserializable">from_bcs::deserializable</a>&lt;<a href="reconfiguration_state.md#0x1_reconfiguration_state_StateActive">StateActive</a>&gt;(post_state.variant.data);
+</code></pre>
+
+
+
+<a id="@Specification_1_start_time_secs"></a>
+
+### Function `start_time_secs`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="reconfiguration_state.md#0x1_reconfiguration_state_start_time_secs">start_time_secs</a>(): u64
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="reconfiguration_state.md#0x1_reconfiguration_state_StartTimeSecsAbortsIf">StartTimeSecsAbortsIf</a>;
+</code></pre>
+
+
+
+
+<a id="0x1_reconfiguration_state_spec_start_time_secs"></a>
+
+
+<pre><code><b>fun</b> <a href="reconfiguration_state.md#0x1_reconfiguration_state_spec_start_time_secs">spec_start_time_secs</a>(): u64 {
+   <b>use</b> aptos_std::from_bcs;
+   <b>let</b> state = <b>global</b>&lt;<a href="reconfiguration_state.md#0x1_reconfiguration_state_State">State</a>&gt;(@aptos_framework);
+   <a href="../../../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_deserialize">from_bcs::deserialize</a>&lt;<a href="reconfiguration_state.md#0x1_reconfiguration_state_StateActive">StateActive</a>&gt;(state.variant.data).start_time_secs
+}
+</code></pre>
+
+
+
+
+<a id="0x1_reconfiguration_state_StartTimeSecsRequirement"></a>
+
+
+<pre><code><b>schema</b> <a href="reconfiguration_state.md#0x1_reconfiguration_state_StartTimeSecsRequirement">StartTimeSecsRequirement</a> {
+    <b>requires</b> <b>exists</b>&lt;<a href="reconfiguration_state.md#0x1_reconfiguration_state_State">State</a>&gt;(@aptos_framework);
+    <b>requires</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/copyable_any.md#0x1_copyable_any_type_name">copyable_any::type_name</a>(<b>global</b>&lt;<a href="reconfiguration_state.md#0x1_reconfiguration_state_State">State</a>&gt;(@aptos_framework).variant).bytes
+        == b"<a href="reconfiguration_state.md#0x1_reconfiguration_state_StateActive">0x1::reconfiguration_state::StateActive</a>";
+    <b>include</b> <a href="reconfiguration_state.md#0x1_reconfiguration_state_UnpackRequiresStateActive">UnpackRequiresStateActive</a> {
+        x:  <b>global</b>&lt;<a href="reconfiguration_state.md#0x1_reconfiguration_state_State">State</a>&gt;(@aptos_framework).variant
+    };
+}
+</code></pre>
+
+
+
+
+<a id="0x1_reconfiguration_state_UnpackRequiresStateActive"></a>
+
+
+<pre><code><b>schema</b> <a href="reconfiguration_state.md#0x1_reconfiguration_state_UnpackRequiresStateActive">UnpackRequiresStateActive</a> {
+    x: Any;
+    <b>requires</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_type_name">type_info::type_name</a>&lt;<a href="reconfiguration_state.md#0x1_reconfiguration_state_StateActive">StateActive</a>&gt;() == x.type_name && <a href="../../../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_deserializable">from_bcs::deserializable</a>&lt;<a href="reconfiguration_state.md#0x1_reconfiguration_state_StateActive">StateActive</a>&gt;(x.data);
+}
+</code></pre>
+
+
+
+
+<a id="0x1_reconfiguration_state_StartTimeSecsAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="reconfiguration_state.md#0x1_reconfiguration_state_StartTimeSecsAbortsIf">StartTimeSecsAbortsIf</a> {
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="reconfiguration_state.md#0x1_reconfiguration_state_State">State</a>&gt;(@aptos_framework);
+    <b>include</b>  <a href="../../../aptos-stdlib/tests/compiler-v2-doc/copyable_any.md#0x1_copyable_any_type_name">copyable_any::type_name</a>(<b>global</b>&lt;<a href="reconfiguration_state.md#0x1_reconfiguration_state_State">State</a>&gt;(@aptos_framework).variant).bytes
+        == b"<a href="reconfiguration_state.md#0x1_reconfiguration_state_StateActive">0x1::reconfiguration_state::StateActive</a>" ==&gt;
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/copyable_any.md#0x1_copyable_any_UnpackAbortsIf">copyable_any::UnpackAbortsIf</a>&lt;<a href="reconfiguration_state.md#0x1_reconfiguration_state_StateActive">StateActive</a>&gt; {
+        x:  <b>global</b>&lt;<a href="reconfiguration_state.md#0x1_reconfiguration_state_State">State</a>&gt;(@aptos_framework).variant
+    };
+    <b>aborts_if</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/copyable_any.md#0x1_copyable_any_type_name">copyable_any::type_name</a>(<b>global</b>&lt;<a href="reconfiguration_state.md#0x1_reconfiguration_state_State">State</a>&gt;(@aptos_framework).variant).bytes
+        != b"<a href="reconfiguration_state.md#0x1_reconfiguration_state_StateActive">0x1::reconfiguration_state::StateActive</a>";
+}
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/reconfiguration_with_dkg.md b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/reconfiguration_with_dkg.md
new file mode 100644
index 0000000000000..85b4f1dbc74e2
--- /dev/null
+++ b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/reconfiguration_with_dkg.md
@@ -0,0 +1,251 @@
+
+<a id="0x1_reconfiguration_with_dkg"></a>
+
+# Module `0x1::reconfiguration_with_dkg`
+
+Reconfiguration with DKG helper functions.
+
+
+-  [Function `try_start`](#0x1_reconfiguration_with_dkg_try_start)
+-  [Function `finish`](#0x1_reconfiguration_with_dkg_finish)
+-  [Function `finish_with_dkg_result`](#0x1_reconfiguration_with_dkg_finish_with_dkg_result)
+-  [Specification](#@Specification_0)
+    -  [Function `try_start`](#@Specification_0_try_start)
+    -  [Function `finish`](#@Specification_0_finish)
+    -  [Function `finish_with_dkg_result`](#@Specification_0_finish_with_dkg_result)
+
+
+<pre><code><b>use</b> <a href="consensus_config.md#0x1_consensus_config">0x1::consensus_config</a>;
+<b>use</b> <a href="dkg.md#0x1_dkg">0x1::dkg</a>;
+<b>use</b> <a href="execution_config.md#0x1_execution_config">0x1::execution_config</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features">0x1::features</a>;
+<b>use</b> <a href="gas_schedule.md#0x1_gas_schedule">0x1::gas_schedule</a>;
+<b>use</b> <a href="jwk_consensus_config.md#0x1_jwk_consensus_config">0x1::jwk_consensus_config</a>;
+<b>use</b> <a href="jwks.md#0x1_jwks">0x1::jwks</a>;
+<b>use</b> <a href="keyless_account.md#0x1_keyless_account">0x1::keyless_account</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option">0x1::option</a>;
+<b>use</b> <a href="randomness_api_v0_config.md#0x1_randomness_api_v0_config">0x1::randomness_api_v0_config</a>;
+<b>use</b> <a href="randomness_config.md#0x1_randomness_config">0x1::randomness_config</a>;
+<b>use</b> <a href="randomness_config_seqnum.md#0x1_randomness_config_seqnum">0x1::randomness_config_seqnum</a>;
+<b>use</b> <a href="reconfiguration.md#0x1_reconfiguration">0x1::reconfiguration</a>;
+<b>use</b> <a href="reconfiguration_state.md#0x1_reconfiguration_state">0x1::reconfiguration_state</a>;
+<b>use</b> <a href="stake.md#0x1_stake">0x1::stake</a>;
+<b>use</b> <a href="system_addresses.md#0x1_system_addresses">0x1::system_addresses</a>;
+<b>use</b> <a href="validator_consensus_info.md#0x1_validator_consensus_info">0x1::validator_consensus_info</a>;
+<b>use</b> <a href="version.md#0x1_version">0x1::version</a>;
+</code></pre>
+
+
+
+<a id="0x1_reconfiguration_with_dkg_try_start"></a>
+
+## Function `try_start`
+
+Trigger a reconfiguration with DKG.
+Do nothing if one is already in progress.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="reconfiguration_with_dkg.md#0x1_reconfiguration_with_dkg_try_start">try_start</a>()
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="reconfiguration_with_dkg.md#0x1_reconfiguration_with_dkg_try_start">try_start</a>() {
+    <b>let</b> incomplete_dkg_session = <a href="dkg.md#0x1_dkg_incomplete_session">dkg::incomplete_session</a>();
+    <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&incomplete_dkg_session)) {
+        <b>let</b> session = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(&incomplete_dkg_session);
+        <b>if</b> (<a href="dkg.md#0x1_dkg_session_dealer_epoch">dkg::session_dealer_epoch</a>(session) == <a href="reconfiguration.md#0x1_reconfiguration_current_epoch">reconfiguration::current_epoch</a>()) {
+            <b>return</b>
+        }
+    };
+    <a href="reconfiguration_state.md#0x1_reconfiguration_state_on_reconfig_start">reconfiguration_state::on_reconfig_start</a>();
+    <b>let</b> cur_epoch = <a href="reconfiguration.md#0x1_reconfiguration_current_epoch">reconfiguration::current_epoch</a>();
+    <a href="dkg.md#0x1_dkg_start">dkg::start</a>(
+        cur_epoch,
+        <a href="randomness_config.md#0x1_randomness_config_current">randomness_config::current</a>(),
+        <a href="stake.md#0x1_stake_cur_validator_consensus_infos">stake::cur_validator_consensus_infos</a>(),
+        <a href="stake.md#0x1_stake_next_validator_consensus_infos">stake::next_validator_consensus_infos</a>(),
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_reconfiguration_with_dkg_finish"></a>
+
+## Function `finish`
+
+Clear incomplete DKG session, if it exists.
+Apply buffered on-chain configs (except for ValidatorSet, which is done inside <code><a href="reconfiguration.md#0x1_reconfiguration_reconfigure">reconfiguration::reconfigure</a>()</code>).
+Re-enable validator set changes.
+Run the default reconfiguration to enter the new epoch.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="reconfiguration_with_dkg.md#0x1_reconfiguration_with_dkg_finish">finish</a>(framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="reconfiguration_with_dkg.md#0x1_reconfiguration_with_dkg_finish">finish</a>(framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>) {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(framework);
+    <a href="dkg.md#0x1_dkg_try_clear_incomplete_session">dkg::try_clear_incomplete_session</a>(framework);
+    <a href="consensus_config.md#0x1_consensus_config_on_new_epoch">consensus_config::on_new_epoch</a>(framework);
+    <a href="execution_config.md#0x1_execution_config_on_new_epoch">execution_config::on_new_epoch</a>(framework);
+    <a href="gas_schedule.md#0x1_gas_schedule_on_new_epoch">gas_schedule::on_new_epoch</a>(framework);
+    std::version::on_new_epoch(framework);
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_on_new_epoch">features::on_new_epoch</a>(framework);
+    <a href="jwk_consensus_config.md#0x1_jwk_consensus_config_on_new_epoch">jwk_consensus_config::on_new_epoch</a>(framework);
+    <a href="jwks.md#0x1_jwks_on_new_epoch">jwks::on_new_epoch</a>(framework);
+    <a href="keyless_account.md#0x1_keyless_account_on_new_epoch">keyless_account::on_new_epoch</a>(framework);
+    <a href="randomness_config_seqnum.md#0x1_randomness_config_seqnum_on_new_epoch">randomness_config_seqnum::on_new_epoch</a>(framework);
+    <a href="randomness_config.md#0x1_randomness_config_on_new_epoch">randomness_config::on_new_epoch</a>(framework);
+    <a href="randomness_api_v0_config.md#0x1_randomness_api_v0_config_on_new_epoch">randomness_api_v0_config::on_new_epoch</a>(framework);
+    <a href="reconfiguration.md#0x1_reconfiguration_reconfigure">reconfiguration::reconfigure</a>();
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_reconfiguration_with_dkg_finish_with_dkg_result"></a>
+
+## Function `finish_with_dkg_result`
+
+Complete the current reconfiguration with DKG.
+Abort if no DKG is in progress.
+
+
+<pre><code><b>fun</b> <a href="reconfiguration_with_dkg.md#0x1_reconfiguration_with_dkg_finish_with_dkg_result">finish_with_dkg_result</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, dkg_result: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="reconfiguration_with_dkg.md#0x1_reconfiguration_with_dkg_finish_with_dkg_result">finish_with_dkg_result</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, dkg_result: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;) {
+    <a href="dkg.md#0x1_dkg_finish">dkg::finish</a>(dkg_result);
+    <a href="reconfiguration_with_dkg.md#0x1_reconfiguration_with_dkg_finish">finish</a>(<a href="account.md#0x1_account">account</a>);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_0"></a>
+
+## Specification
+
+
+
+<pre><code><b>pragma</b> verify = <b>true</b>;
+</code></pre>
+
+
+
+<a id="@Specification_0_try_start"></a>
+
+### Function `try_start`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="reconfiguration_with_dkg.md#0x1_reconfiguration_with_dkg_try_start">try_start</a>()
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify_duration_estimate = 120;
+<b>requires</b> <b>exists</b>&lt;<a href="reconfiguration.md#0x1_reconfiguration_Configuration">reconfiguration::Configuration</a>&gt;(@aptos_framework);
+<b>requires</b> <a href="chain_status.md#0x1_chain_status_is_operating">chain_status::is_operating</a>();
+<b>include</b> <a href="stake.md#0x1_stake_ResourceRequirement">stake::ResourceRequirement</a>;
+<b>include</b> <a href="stake.md#0x1_stake_GetReconfigStartTimeRequirement">stake::GetReconfigStartTimeRequirement</a>;
+<b>include</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_spec_periodical_reward_rate_decrease_enabled">features::spec_periodical_reward_rate_decrease_enabled</a>(
+) ==&gt; <a href="staking_config.md#0x1_staking_config_StakingRewardsConfigEnabledRequirement">staking_config::StakingRewardsConfigEnabledRequirement</a>;
+<b>aborts_if</b> <b>false</b>;
+<b>pragma</b> verify_duration_estimate = 600;
+</code></pre>
+
+
+
+<a id="@Specification_0_finish"></a>
+
+### Function `finish`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="reconfiguration_with_dkg.md#0x1_reconfiguration_with_dkg_finish">finish</a>(framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify_duration_estimate = 1500;
+<b>include</b> <a href="reconfiguration_with_dkg.md#0x1_reconfiguration_with_dkg_FinishRequirement">FinishRequirement</a>;
+<b>aborts_if</b> <b>false</b>;
+</code></pre>
+
+
+
+
+<a id="0x1_reconfiguration_with_dkg_FinishRequirement"></a>
+
+
+<pre><code><b>schema</b> <a href="reconfiguration_with_dkg.md#0x1_reconfiguration_with_dkg_FinishRequirement">FinishRequirement</a> {
+    framework: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>;
+    <b>requires</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(framework) == @aptos_framework;
+    <b>requires</b> <a href="chain_status.md#0x1_chain_status_is_operating">chain_status::is_operating</a>();
+    <b>requires</b> <b>exists</b>&lt;CoinInfo&lt;AptosCoin&gt;&gt;(@aptos_framework);
+    <b>include</b> <a href="staking_config.md#0x1_staking_config_StakingRewardsConfigRequirement">staking_config::StakingRewardsConfigRequirement</a>;
+    <b>requires</b> <b>exists</b>&lt;<a href="stake.md#0x1_stake_ValidatorFees">stake::ValidatorFees</a>&gt;(@aptos_framework);
+    <b>include</b> <a href="transaction_fee.md#0x1_transaction_fee_RequiresCollectedFeesPerValueLeqBlockAptosSupply">transaction_fee::RequiresCollectedFeesPerValueLeqBlockAptosSupply</a>;
+    <b>requires</b> <b>exists</b>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_Features">features::Features</a>&gt;(@std);
+    <b>include</b> <a href="config_buffer.md#0x1_config_buffer_OnNewEpochRequirement">config_buffer::OnNewEpochRequirement</a>&lt;<a href="version.md#0x1_version_Version">version::Version</a>&gt;;
+    <b>include</b> <a href="config_buffer.md#0x1_config_buffer_OnNewEpochRequirement">config_buffer::OnNewEpochRequirement</a>&lt;<a href="gas_schedule.md#0x1_gas_schedule_GasScheduleV2">gas_schedule::GasScheduleV2</a>&gt;;
+    <b>include</b> <a href="config_buffer.md#0x1_config_buffer_OnNewEpochRequirement">config_buffer::OnNewEpochRequirement</a>&lt;<a href="execution_config.md#0x1_execution_config_ExecutionConfig">execution_config::ExecutionConfig</a>&gt;;
+    <b>include</b> <a href="config_buffer.md#0x1_config_buffer_OnNewEpochRequirement">config_buffer::OnNewEpochRequirement</a>&lt;<a href="consensus_config.md#0x1_consensus_config_ConsensusConfig">consensus_config::ConsensusConfig</a>&gt;;
+    <b>include</b> <a href="config_buffer.md#0x1_config_buffer_OnNewEpochRequirement">config_buffer::OnNewEpochRequirement</a>&lt;<a href="jwks.md#0x1_jwks_SupportedOIDCProviders">jwks::SupportedOIDCProviders</a>&gt;;
+    <b>include</b> <a href="config_buffer.md#0x1_config_buffer_OnNewEpochRequirement">config_buffer::OnNewEpochRequirement</a>&lt;<a href="randomness_config.md#0x1_randomness_config_RandomnessConfig">randomness_config::RandomnessConfig</a>&gt;;
+    <b>include</b> <a href="config_buffer.md#0x1_config_buffer_OnNewEpochRequirement">config_buffer::OnNewEpochRequirement</a>&lt;<a href="randomness_config_seqnum.md#0x1_randomness_config_seqnum_RandomnessConfigSeqNum">randomness_config_seqnum::RandomnessConfigSeqNum</a>&gt;;
+    <b>include</b> <a href="config_buffer.md#0x1_config_buffer_OnNewEpochRequirement">config_buffer::OnNewEpochRequirement</a>&lt;<a href="randomness_api_v0_config.md#0x1_randomness_api_v0_config_AllowCustomMaxGasFlag">randomness_api_v0_config::AllowCustomMaxGasFlag</a>&gt;;
+    <b>include</b> <a href="config_buffer.md#0x1_config_buffer_OnNewEpochRequirement">config_buffer::OnNewEpochRequirement</a>&lt;<a href="randomness_api_v0_config.md#0x1_randomness_api_v0_config_RequiredGasDeposit">randomness_api_v0_config::RequiredGasDeposit</a>&gt;;
+    <b>include</b> <a href="config_buffer.md#0x1_config_buffer_OnNewEpochRequirement">config_buffer::OnNewEpochRequirement</a>&lt;<a href="jwk_consensus_config.md#0x1_jwk_consensus_config_JWKConsensusConfig">jwk_consensus_config::JWKConsensusConfig</a>&gt;;
+    <b>include</b> <a href="config_buffer.md#0x1_config_buffer_OnNewEpochRequirement">config_buffer::OnNewEpochRequirement</a>&lt;<a href="keyless_account.md#0x1_keyless_account_Configuration">keyless_account::Configuration</a>&gt;;
+    <b>include</b> <a href="config_buffer.md#0x1_config_buffer_OnNewEpochRequirement">config_buffer::OnNewEpochRequirement</a>&lt;<a href="keyless_account.md#0x1_keyless_account_Groth16VerificationKey">keyless_account::Groth16VerificationKey</a>&gt;;
+}
+</code></pre>
+
+
+
+<a id="@Specification_0_finish_with_dkg_result"></a>
+
+### Function `finish_with_dkg_result`
+
+
+<pre><code><b>fun</b> <a href="reconfiguration_with_dkg.md#0x1_reconfiguration_with_dkg_finish_with_dkg_result">finish_with_dkg_result</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, dkg_result: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify_duration_estimate = 1500;
+<b>include</b> <a href="reconfiguration_with_dkg.md#0x1_reconfiguration_with_dkg_FinishRequirement">FinishRequirement</a> {
+    framework: <a href="account.md#0x1_account">account</a>
+};
+<b>requires</b> <a href="dkg.md#0x1_dkg_has_incomplete_session">dkg::has_incomplete_session</a>();
+<b>aborts_if</b> <b>false</b>;
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/resource_account.md b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/resource_account.md
new file mode 100644
index 0000000000000..4df4d4691ced3
--- /dev/null
+++ b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/resource_account.md
@@ -0,0 +1,636 @@
+
+<a id="0x1_resource_account"></a>
+
+# Module `0x1::resource_account`
+
+A resource account is used to manage resources independent of an account managed by a user.
+This contains several utilities to make using resource accounts more effective.
+
+
+<a id="@Resource_Accounts_to_manage_liquidity_pools_0"></a>
+
+### Resource Accounts to manage liquidity pools
+
+
+A dev wishing to use resource accounts for a liquidity pool, would likely do the following:
+
+1. Create a new account using <code><a href="resource_account.md#0x1_resource_account_create_resource_account">resource_account::create_resource_account</a></code>. This creates the
+account, stores the <code>signer_cap</code> within a <code><a href="resource_account.md#0x1_resource_account_Container">resource_account::Container</a></code>, and rotates the key to
+the current account's authentication key or a provided authentication key.
+2. Define the liquidity pool module's address to be the same as the resource account.
+3. Construct a package-publishing transaction for the resource account using the
+authentication key used in step 1.
+4. In the liquidity pool module's <code>init_module</code> function, call <code>retrieve_resource_account_cap</code>
+which will retrieve the <code>signer_cap</code> and rotate the resource account's authentication key to
+<code>0x0</code>, effectively locking it off.
+5. When adding a new coin, the liquidity pool will load the capability and hence the <code><a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a></code> to
+register and store new <code>LiquidityCoin</code> resources.
+
+Code snippets to help:
+
+```
+fun init_module(resource_account: &signer) {
+let dev_address = @DEV_ADDR;
+let signer_cap = retrieve_resource_account_cap(resource_account, dev_address);
+let lp = LiquidityPoolInfo { signer_cap: signer_cap, ... };
+move_to(resource_account, lp);
+}
+```
+
+Later on during a coin registration:
+```
+public fun add_coin<X, Y>(lp: &LP, x: Coin<x>, y: Coin<y>) {
+if(!exists<LiquidityCoin<X, Y>(LP::Address(lp), LiquidityCoin<X, Y>)) {
+let mint, burn = Coin::initialize<LiquidityCoin<X, Y>>(...);
+move_to(&create_signer_with_capability(&lp.cap), LiquidityCoin<X, Y>{ mint, burn });
+}
+...
+}
+```
+
+<a id="@Resource_accounts_to_manage_an_account_for_module_publishing_(i.e.,_contract_account)_1"></a>
+
+### Resource accounts to manage an account for module publishing (i.e., contract account)
+
+
+A dev wishes to have an account dedicated to managing a contract. The contract itself does not
+require signer post initialization. The dev could do the following:
+1. Create a new account using <code><a href="resource_account.md#0x1_resource_account_create_resource_account_and_publish_package">resource_account::create_resource_account_and_publish_package</a></code>.
+This creates the account and publishes the package for that account.
+2. At a later point in time, the account creator can move the signer capability to the module.
+
+```
+struct MyModuleResource has key {
+...
+resource_signer_cap: Option<SignerCapability>,
+}
+
+public fun provide_signer_capability(resource_signer_cap: SignerCapability) {
+let account_addr = account::get_signer_capability_address(resource_signer_cap);
+let resource_addr = type_info::account_address(&type_info::type_of<MyModuleResource>());
+assert!(account_addr == resource_addr, EADDRESS_MISMATCH);
+let module = borrow_global_mut<MyModuleResource>(account_addr);
+module.resource_signer_cap = option::some(resource_signer_cap);
+}
+```
+
+
+    -  [Resource Accounts to manage liquidity pools](#@Resource_Accounts_to_manage_liquidity_pools_0)
+    -  [Resource accounts to manage an account for module publishing (i.e., contract account)](#@Resource_accounts_to_manage_an_account_for_module_publishing_(i.e.,_contract_account)_1)
+-  [Resource `Container`](#0x1_resource_account_Container)
+-  [Constants](#@Constants_2)
+-  [Function `create_resource_account`](#0x1_resource_account_create_resource_account)
+-  [Function `create_resource_account_and_fund`](#0x1_resource_account_create_resource_account_and_fund)
+-  [Function `create_resource_account_and_publish_package`](#0x1_resource_account_create_resource_account_and_publish_package)
+-  [Function `rotate_account_authentication_key_and_store_capability`](#0x1_resource_account_rotate_account_authentication_key_and_store_capability)
+-  [Function `retrieve_resource_account_cap`](#0x1_resource_account_retrieve_resource_account_cap)
+-  [Specification](#@Specification_3)
+    -  [High-level Requirements](#high-level-req)
+    -  [Module-level Specification](#module-level-spec)
+    -  [Function `create_resource_account`](#@Specification_3_create_resource_account)
+    -  [Function `create_resource_account_and_fund`](#@Specification_3_create_resource_account_and_fund)
+    -  [Function `create_resource_account_and_publish_package`](#@Specification_3_create_resource_account_and_publish_package)
+    -  [Function `rotate_account_authentication_key_and_store_capability`](#@Specification_3_rotate_account_authentication_key_and_store_capability)
+    -  [Function `retrieve_resource_account_cap`](#@Specification_3_retrieve_resource_account_cap)
+
+
+<pre><code><b>use</b> <a href="account.md#0x1_account">0x1::account</a>;
+<b>use</b> <a href="aptos_coin.md#0x1_aptos_coin">0x1::aptos_coin</a>;
+<b>use</b> <a href="code.md#0x1_code">0x1::code</a>;
+<b>use</b> <a href="coin.md#0x1_coin">0x1::coin</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">0x1::signer</a>;
+<b>use</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map">0x1::simple_map</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">0x1::vector</a>;
+</code></pre>
+
+
+
+<a id="0x1_resource_account_Container"></a>
+
+## Resource `Container`
+
+
+
+<pre><code><b>struct</b> <a href="resource_account.md#0x1_resource_account_Container">Container</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>store: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;<b>address</b>, <a href="account.md#0x1_account_SignerCapability">account::SignerCapability</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_2"></a>
+
+## Constants
+
+
+<a id="0x1_resource_account_ZERO_AUTH_KEY"></a>
+
+
+
+<pre><code><b>const</b> <a href="resource_account.md#0x1_resource_account_ZERO_AUTH_KEY">ZERO_AUTH_KEY</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
+</code></pre>
+
+
+
+<a id="0x1_resource_account_ECONTAINER_NOT_PUBLISHED"></a>
+
+Container resource not found in account
+
+
+<pre><code><b>const</b> <a href="resource_account.md#0x1_resource_account_ECONTAINER_NOT_PUBLISHED">ECONTAINER_NOT_PUBLISHED</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_resource_account_EUNAUTHORIZED_NOT_OWNER"></a>
+
+The resource account was not created by the specified source account
+
+
+<pre><code><b>const</b> <a href="resource_account.md#0x1_resource_account_EUNAUTHORIZED_NOT_OWNER">EUNAUTHORIZED_NOT_OWNER</a>: u64 = 2;
+</code></pre>
+
+
+
+<a id="0x1_resource_account_create_resource_account"></a>
+
+## Function `create_resource_account`
+
+Creates a new resource account and rotates the authentication key to either
+the optional auth key if it is non-empty (though auth keys are 32-bytes)
+or the source accounts current auth key.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="resource_account.md#0x1_resource_account_create_resource_account">create_resource_account</a>(origin: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, seed: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, optional_auth_key: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="resource_account.md#0x1_resource_account_create_resource_account">create_resource_account</a>(
+    origin: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    seed: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    optional_auth_key: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+) <b>acquires</b> <a href="resource_account.md#0x1_resource_account_Container">Container</a> {
+    <b>let</b> (resource, resource_signer_cap) = <a href="account.md#0x1_account_create_resource_account">account::create_resource_account</a>(origin, seed);
+    <a href="resource_account.md#0x1_resource_account_rotate_account_authentication_key_and_store_capability">rotate_account_authentication_key_and_store_capability</a>(
+        origin,
+        resource,
+        resource_signer_cap,
+        optional_auth_key,
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_resource_account_create_resource_account_and_fund"></a>
+
+## Function `create_resource_account_and_fund`
+
+Creates a new resource account, transfer the amount of coins from the origin to the resource
+account, and rotates the authentication key to either the optional auth key if it is
+non-empty (though auth keys are 32-bytes) or the source accounts current auth key. Note,
+this function adds additional resource ownership to the resource account and should only be
+used for resource accounts that need access to <code>Coin&lt;AptosCoin&gt;</code>.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="resource_account.md#0x1_resource_account_create_resource_account_and_fund">create_resource_account_and_fund</a>(origin: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, seed: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, optional_auth_key: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, fund_amount: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="resource_account.md#0x1_resource_account_create_resource_account_and_fund">create_resource_account_and_fund</a>(
+    origin: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    seed: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    optional_auth_key: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    fund_amount: u64,
+) <b>acquires</b> <a href="resource_account.md#0x1_resource_account_Container">Container</a> {
+    <b>let</b> (resource, resource_signer_cap) = <a href="account.md#0x1_account_create_resource_account">account::create_resource_account</a>(origin, seed);
+    <a href="coin.md#0x1_coin_register">coin::register</a>&lt;AptosCoin&gt;(&resource);
+    <a href="coin.md#0x1_coin_transfer">coin::transfer</a>&lt;AptosCoin&gt;(origin, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(&resource), fund_amount);
+    <a href="resource_account.md#0x1_resource_account_rotate_account_authentication_key_and_store_capability">rotate_account_authentication_key_and_store_capability</a>(
+        origin,
+        resource,
+        resource_signer_cap,
+        optional_auth_key,
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_resource_account_create_resource_account_and_publish_package"></a>
+
+## Function `create_resource_account_and_publish_package`
+
+Creates a new resource account, publishes the package under this account transaction under
+this account and leaves the signer cap readily available for pickup.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="resource_account.md#0x1_resource_account_create_resource_account_and_publish_package">create_resource_account_and_publish_package</a>(origin: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, seed: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, metadata_serialized: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, <a href="code.md#0x1_code">code</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="resource_account.md#0x1_resource_account_create_resource_account_and_publish_package">create_resource_account_and_publish_package</a>(
+    origin: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    seed: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    metadata_serialized: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    <a href="code.md#0x1_code">code</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;,
+) <b>acquires</b> <a href="resource_account.md#0x1_resource_account_Container">Container</a> {
+    <b>let</b> (resource, resource_signer_cap) = <a href="account.md#0x1_account_create_resource_account">account::create_resource_account</a>(origin, seed);
+    aptos_framework::code::publish_package_txn(&resource, metadata_serialized, <a href="code.md#0x1_code">code</a>);
+    <a href="resource_account.md#0x1_resource_account_rotate_account_authentication_key_and_store_capability">rotate_account_authentication_key_and_store_capability</a>(
+        origin,
+        resource,
+        resource_signer_cap,
+        <a href="resource_account.md#0x1_resource_account_ZERO_AUTH_KEY">ZERO_AUTH_KEY</a>,
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_resource_account_rotate_account_authentication_key_and_store_capability"></a>
+
+## Function `rotate_account_authentication_key_and_store_capability`
+
+
+
+<pre><code><b>fun</b> <a href="resource_account.md#0x1_resource_account_rotate_account_authentication_key_and_store_capability">rotate_account_authentication_key_and_store_capability</a>(origin: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, resource: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, resource_signer_cap: <a href="account.md#0x1_account_SignerCapability">account::SignerCapability</a>, optional_auth_key: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="resource_account.md#0x1_resource_account_rotate_account_authentication_key_and_store_capability">rotate_account_authentication_key_and_store_capability</a>(
+    origin: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    resource: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    resource_signer_cap: <a href="account.md#0x1_account_SignerCapability">account::SignerCapability</a>,
+    optional_auth_key: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+) <b>acquires</b> <a href="resource_account.md#0x1_resource_account_Container">Container</a> {
+    <b>let</b> origin_addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(origin);
+    <b>if</b> (!<b>exists</b>&lt;<a href="resource_account.md#0x1_resource_account_Container">Container</a>&gt;(origin_addr)) {
+        <b>move_to</b>(origin, <a href="resource_account.md#0x1_resource_account_Container">Container</a> { store: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_create">simple_map::create</a>() })
+    };
+
+    <b>let</b> container = <b>borrow_global_mut</b>&lt;<a href="resource_account.md#0x1_resource_account_Container">Container</a>&gt;(origin_addr);
+    <b>let</b> resource_addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(&resource);
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_add">simple_map::add</a>(&<b>mut</b> container.store, resource_addr, resource_signer_cap);
+
+    <b>let</b> auth_key = <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_is_empty">vector::is_empty</a>(&optional_auth_key)) {
+        <a href="account.md#0x1_account_get_authentication_key">account::get_authentication_key</a>(origin_addr)
+    } <b>else</b> {
+        optional_auth_key
+    };
+    <a href="account.md#0x1_account_rotate_authentication_key_internal">account::rotate_authentication_key_internal</a>(&resource, auth_key);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_resource_account_retrieve_resource_account_cap"></a>
+
+## Function `retrieve_resource_account_cap`
+
+When called by the resource account, it will retrieve the capability associated with that
+account and rotate the account's auth key to 0x0 making the account inaccessible without
+the SignerCapability.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="resource_account.md#0x1_resource_account_retrieve_resource_account_cap">retrieve_resource_account_cap</a>(resource: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, source_addr: <b>address</b>): <a href="account.md#0x1_account_SignerCapability">account::SignerCapability</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="resource_account.md#0x1_resource_account_retrieve_resource_account_cap">retrieve_resource_account_cap</a>(
+    resource: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    source_addr: <b>address</b>,
+): <a href="account.md#0x1_account_SignerCapability">account::SignerCapability</a> <b>acquires</b> <a href="resource_account.md#0x1_resource_account_Container">Container</a> {
+    <b>assert</b>!(<b>exists</b>&lt;<a href="resource_account.md#0x1_resource_account_Container">Container</a>&gt;(source_addr), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="resource_account.md#0x1_resource_account_ECONTAINER_NOT_PUBLISHED">ECONTAINER_NOT_PUBLISHED</a>));
+
+    <b>let</b> resource_addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(resource);
+    <b>let</b> (resource_signer_cap, empty_container) = {
+        <b>let</b> container = <b>borrow_global_mut</b>&lt;<a href="resource_account.md#0x1_resource_account_Container">Container</a>&gt;(source_addr);
+        <b>assert</b>!(
+            <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_contains_key">simple_map::contains_key</a>(&container.store, &resource_addr),
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="resource_account.md#0x1_resource_account_EUNAUTHORIZED_NOT_OWNER">EUNAUTHORIZED_NOT_OWNER</a>)
+        );
+        <b>let</b> (_resource_addr, signer_cap) = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_remove">simple_map::remove</a>(&<b>mut</b> container.store, &resource_addr);
+        (signer_cap, <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_length">simple_map::length</a>(&container.store) == 0)
+    };
+
+    <b>if</b> (empty_container) {
+        <b>let</b> container = <b>move_from</b>(source_addr);
+        <b>let</b> <a href="resource_account.md#0x1_resource_account_Container">Container</a> { store } = container;
+        <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_destroy_empty">simple_map::destroy_empty</a>(store);
+    };
+
+    <a href="account.md#0x1_account_rotate_authentication_key_internal">account::rotate_authentication_key_internal</a>(resource, <a href="resource_account.md#0x1_resource_account_ZERO_AUTH_KEY">ZERO_AUTH_KEY</a>);
+    resource_signer_cap
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_3"></a>
+
+## Specification
+
+
+
+
+<a id="high-level-req"></a>
+
+### High-level Requirements
+
+<table>
+<tr>
+<th>No.</th><th>Requirement</th><th>Criticality</th><th>Implementation</th><th>Enforcement</th>
+</tr>
+
+<tr>
+<td>1</td>
+<td>The length of the authentication key must be 32 bytes.</td>
+<td>Medium</td>
+<td>The rotate_authentication_key_internal function ensures that the authentication key passed to it is of 32 bytes.</td>
+<td>Formally verified via <a href="#high-level-req-1">RotateAccountAuthenticationKeyAndStoreCapabilityAbortsIf</a>.</td>
+</tr>
+
+<tr>
+<td>2</td>
+<td>The Container structure must exist in the origin account in order to rotate the authentication key of a resource account and to store its signer capability.</td>
+<td>High</td>
+<td>The rotate_account_authentication_key_and_store_capability function makes sure the Container structure exists under the origin account.</td>
+<td>Formally verified via <a href="#high-level-req-2">rotate_account_authentication_key_and_store_capability</a>.</td>
+</tr>
+
+<tr>
+<td>3</td>
+<td>The resource account is registered for the Aptos coin.</td>
+<td>High</td>
+<td>The create_resource_account_and_fund ensures the newly created resource account is registered to receive the AptosCoin.</td>
+<td>Formally verified via <a href="#high-level-req-3">create_resource_account_and_fund</a>.</td>
+</tr>
+
+<tr>
+<td>4</td>
+<td>It is not possible to store two capabilities for the same resource address.</td>
+<td>Medium</td>
+<td>The rotate_account_authentication_key_and_store_capability will abort if the resource signer capability for the given resource address already exists in container.store.</td>
+<td>Formally verified via <a href="#high-level-req-4">rotate_account_authentication_key_and_store_capability</a>.</td>
+</tr>
+
+<tr>
+<td>5</td>
+<td>If provided, the optional authentication key is used for key rotation.</td>
+<td>Low</td>
+<td>The rotate_account_authentication_key_and_store_capability function will use optional_auth_key if it is provided as a parameter.</td>
+<td>Formally verified via <a href="#high-level-req-5">rotate_account_authentication_key_and_store_capability</a>.</td>
+</tr>
+
+<tr>
+<td>6</td>
+<td>The container stores the resource accounts' signer capabilities.</td>
+<td>Low</td>
+<td>retrieve_resource_account_cap will abort if there is no Container structure assigned to source_addr.</td>
+<td>Formally verified via <a href="#high-level-req-6">retreive_resource_account_cap</a>.</td>
+</tr>
+
+<tr>
+<td>7</td>
+<td>Resource account may retrieve the signer capability if it was previously added to its container.</td>
+<td>High</td>
+<td>retrieve_resource_account_cap will abort if the container of source_addr doesn't store the signer capability for the given resource.</td>
+<td>Formally verified via <a href="#high-level-req-7">retrieve_resource_account_cap</a>.</td>
+</tr>
+
+<tr>
+<td>8</td>
+<td>Retrieving the last signer capability from the container must result in the container being removed.</td>
+<td>Low</td>
+<td>retrieve_resource_account_cap will remove the container if the retrieved signer_capability was the last one stored under it.</td>
+<td>Formally verified via <a href="#high-level-req-8">retrieve_resource_account_cap</a>.</td>
+</tr>
+
+</table>
+
+
+
+
+<a id="module-level-spec"></a>
+
+### Module-level Specification
+
+
+<pre><code><b>pragma</b> verify = <b>true</b>;
+<b>pragma</b> aborts_if_is_strict;
+</code></pre>
+
+
+
+<a id="@Specification_3_create_resource_account"></a>
+
+### Function `create_resource_account`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="resource_account.md#0x1_resource_account_create_resource_account">create_resource_account</a>(origin: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, seed: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, optional_auth_key: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> source_addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(origin);
+<b>let</b> resource_addr = <a href="account.md#0x1_account_spec_create_resource_address">account::spec_create_resource_address</a>(source_addr, seed);
+<b>include</b> <a href="resource_account.md#0x1_resource_account_RotateAccountAuthenticationKeyAndStoreCapabilityAbortsIfWithoutAccountLimit">RotateAccountAuthenticationKeyAndStoreCapabilityAbortsIfWithoutAccountLimit</a>;
+</code></pre>
+
+
+
+<a id="@Specification_3_create_resource_account_and_fund"></a>
+
+### Function `create_resource_account_and_fund`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="resource_account.md#0x1_resource_account_create_resource_account_and_fund">create_resource_account_and_fund</a>(origin: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, seed: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, optional_auth_key: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, fund_amount: u64)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+<b>let</b> source_addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(origin);
+<b>let</b> resource_addr = <a href="account.md#0x1_account_spec_create_resource_address">account::spec_create_resource_address</a>(source_addr, seed);
+<b>let</b> coin_store_resource = <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;AptosCoin&gt;&gt;(resource_addr);
+<b>include</b> <a href="aptos_account.md#0x1_aptos_account_WithdrawAbortsIf">aptos_account::WithdrawAbortsIf</a>&lt;AptosCoin&gt;{from: origin, amount: fund_amount};
+<b>include</b> <a href="aptos_account.md#0x1_aptos_account_GuidAbortsIf">aptos_account::GuidAbortsIf</a>&lt;AptosCoin&gt;{<b>to</b>: resource_addr};
+<b>include</b> <a href="resource_account.md#0x1_resource_account_RotateAccountAuthenticationKeyAndStoreCapabilityAbortsIfWithoutAccountLimit">RotateAccountAuthenticationKeyAndStoreCapabilityAbortsIfWithoutAccountLimit</a>;
+<b>aborts_if</b> <a href="coin.md#0x1_coin_spec_is_account_registered">coin::spec_is_account_registered</a>&lt;AptosCoin&gt;(resource_addr) && coin_store_resource.frozen;
+// This enforces <a id="high-level-req-3" href="#high-level-req">high-level requirement 3</a>:
+<b>ensures</b> <b>exists</b>&lt;aptos_framework::coin::CoinStore&lt;AptosCoin&gt;&gt;(resource_addr);
+</code></pre>
+
+
+
+<a id="@Specification_3_create_resource_account_and_publish_package"></a>
+
+### Function `create_resource_account_and_publish_package`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="resource_account.md#0x1_resource_account_create_resource_account_and_publish_package">create_resource_account_and_publish_package</a>(origin: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, seed: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, metadata_serialized: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, <a href="code.md#0x1_code">code</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+<b>let</b> source_addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(origin);
+<b>let</b> resource_addr = <a href="account.md#0x1_account_spec_create_resource_address">account::spec_create_resource_address</a>(source_addr, seed);
+<b>let</b> optional_auth_key = <a href="resource_account.md#0x1_resource_account_ZERO_AUTH_KEY">ZERO_AUTH_KEY</a>;
+<b>include</b> <a href="resource_account.md#0x1_resource_account_RotateAccountAuthenticationKeyAndStoreCapabilityAbortsIfWithoutAccountLimit">RotateAccountAuthenticationKeyAndStoreCapabilityAbortsIfWithoutAccountLimit</a>;
+</code></pre>
+
+
+
+<a id="@Specification_3_rotate_account_authentication_key_and_store_capability"></a>
+
+### Function `rotate_account_authentication_key_and_store_capability`
+
+
+<pre><code><b>fun</b> <a href="resource_account.md#0x1_resource_account_rotate_account_authentication_key_and_store_capability">rotate_account_authentication_key_and_store_capability</a>(origin: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, resource: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, resource_signer_cap: <a href="account.md#0x1_account_SignerCapability">account::SignerCapability</a>, optional_auth_key: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> resource_addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(resource);
+// This enforces <a id="high-level-req-1" href="#high-level-req">high-level requirement 1</a>:
+<b>include</b> <a href="resource_account.md#0x1_resource_account_RotateAccountAuthenticationKeyAndStoreCapabilityAbortsIf">RotateAccountAuthenticationKeyAndStoreCapabilityAbortsIf</a>;
+// This enforces <a id="high-level-req-2" href="#high-level-req">high-level requirement 2</a>:
+<b>ensures</b> <b>exists</b>&lt;<a href="resource_account.md#0x1_resource_account_Container">Container</a>&gt;(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(origin));
+// This enforces <a id="high-level-req-5" href="#high-level-req">high-level requirement 5</a>:
+<b>ensures</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(optional_auth_key) != 0 ==&gt;
+    <b>global</b>&lt;aptos_framework::account::Account&gt;(resource_addr).authentication_key == optional_auth_key;
+</code></pre>
+
+
+
+
+<a id="0x1_resource_account_RotateAccountAuthenticationKeyAndStoreCapabilityAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="resource_account.md#0x1_resource_account_RotateAccountAuthenticationKeyAndStoreCapabilityAbortsIf">RotateAccountAuthenticationKeyAndStoreCapabilityAbortsIf</a> {
+    origin: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>;
+    resource_addr: <b>address</b>;
+    optional_auth_key: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+    <b>let</b> source_addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(origin);
+    <b>let</b> container = <b>global</b>&lt;<a href="resource_account.md#0x1_resource_account_Container">Container</a>&gt;(source_addr);
+    <b>let</b> get = len(optional_auth_key) == 0;
+    <b>aborts_if</b> get && !<b>exists</b>&lt;Account&gt;(source_addr);
+    // This enforces <a id="high-level-req-4" href="#high-level-req">high-level requirement 4</a>:
+    <b>aborts_if</b> <b>exists</b>&lt;<a href="resource_account.md#0x1_resource_account_Container">Container</a>&gt;(source_addr) && <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(container.store, resource_addr);
+    <b>aborts_if</b> get && !(<b>exists</b>&lt;Account&gt;(resource_addr) && len(<b>global</b>&lt;Account&gt;(source_addr).authentication_key) == 32);
+    <b>aborts_if</b> !get && !(<b>exists</b>&lt;Account&gt;(resource_addr) && len(optional_auth_key) == 32);
+    <b>ensures</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(<b>global</b>&lt;<a href="resource_account.md#0x1_resource_account_Container">Container</a>&gt;(source_addr).store, resource_addr);
+    <b>ensures</b> <b>exists</b>&lt;<a href="resource_account.md#0x1_resource_account_Container">Container</a>&gt;(source_addr);
+}
+</code></pre>
+
+
+
+
+<a id="0x1_resource_account_RotateAccountAuthenticationKeyAndStoreCapabilityAbortsIfWithoutAccountLimit"></a>
+
+
+<pre><code><b>schema</b> <a href="resource_account.md#0x1_resource_account_RotateAccountAuthenticationKeyAndStoreCapabilityAbortsIfWithoutAccountLimit">RotateAccountAuthenticationKeyAndStoreCapabilityAbortsIfWithoutAccountLimit</a> {
+    source_addr: <b>address</b>;
+    optional_auth_key: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+    resource_addr: <b>address</b>;
+    <b>let</b> container = <b>global</b>&lt;<a href="resource_account.md#0x1_resource_account_Container">Container</a>&gt;(source_addr);
+    <b>let</b> get = len(optional_auth_key) == 0;
+    <b>let</b> <a href="account.md#0x1_account">account</a> = <b>global</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(source_addr);
+    <b>requires</b> source_addr != resource_addr;
+    <b>aborts_if</b> len(<a href="resource_account.md#0x1_resource_account_ZERO_AUTH_KEY">ZERO_AUTH_KEY</a>) != 32;
+    <b>include</b> <a href="account.md#0x1_account_exists_at">account::exists_at</a>(resource_addr) ==&gt; <a href="account.md#0x1_account_CreateResourceAccountAbortsIf">account::CreateResourceAccountAbortsIf</a>;
+    <b>include</b> !<a href="account.md#0x1_account_exists_at">account::exists_at</a>(resource_addr) ==&gt; <a href="account.md#0x1_account_CreateAccountAbortsIf">account::CreateAccountAbortsIf</a> {addr: resource_addr};
+    <b>aborts_if</b> get && !<b>exists</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(source_addr);
+    <b>aborts_if</b> <b>exists</b>&lt;<a href="resource_account.md#0x1_resource_account_Container">Container</a>&gt;(source_addr) && <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(container.store, resource_addr);
+    <b>aborts_if</b> get && len(<b>global</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(source_addr).authentication_key) != 32;
+    <b>aborts_if</b> !get && len(optional_auth_key) != 32;
+    <b>ensures</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(<b>global</b>&lt;<a href="resource_account.md#0x1_resource_account_Container">Container</a>&gt;(source_addr).store, resource_addr);
+    <b>ensures</b> <b>exists</b>&lt;<a href="resource_account.md#0x1_resource_account_Container">Container</a>&gt;(source_addr);
+}
+</code></pre>
+
+
+
+<a id="@Specification_3_retrieve_resource_account_cap"></a>
+
+### Function `retrieve_resource_account_cap`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="resource_account.md#0x1_resource_account_retrieve_resource_account_cap">retrieve_resource_account_cap</a>(resource: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, source_addr: <b>address</b>): <a href="account.md#0x1_account_SignerCapability">account::SignerCapability</a>
+</code></pre>
+
+
+
+
+<pre><code>// This enforces <a id="high-level-req-6" href="#high-level-req">high-level requirement 6</a>:
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="resource_account.md#0x1_resource_account_Container">Container</a>&gt;(source_addr);
+<b>let</b> resource_addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(resource);
+<b>let</b> container = <b>global</b>&lt;<a href="resource_account.md#0x1_resource_account_Container">Container</a>&gt;(source_addr);
+// This enforces <a id="high-level-req-7" href="#high-level-req">high-level requirement 7</a>:
+<b>aborts_if</b> !<a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(container.store, resource_addr);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(resource_addr);
+// This enforces <a id="high-level-req-8" href="#high-level-req">high-level requirement 8</a>:
+<b>ensures</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(<b>old</b>(<b>global</b>&lt;<a href="resource_account.md#0x1_resource_account_Container">Container</a>&gt;(source_addr)).store, resource_addr) &&
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_len">simple_map::spec_len</a>(<b>old</b>(<b>global</b>&lt;<a href="resource_account.md#0x1_resource_account_Container">Container</a>&gt;(source_addr)).store) == 1 ==&gt; !<b>exists</b>&lt;<a href="resource_account.md#0x1_resource_account_Container">Container</a>&gt;(source_addr);
+<b>ensures</b> <b>exists</b>&lt;<a href="resource_account.md#0x1_resource_account_Container">Container</a>&gt;(source_addr) ==&gt; !<a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(<b>global</b>&lt;<a href="resource_account.md#0x1_resource_account_Container">Container</a>&gt;(source_addr).store, resource_addr);
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/stake.md b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/stake.md
new file mode 100644
index 0000000000000..865c0df8233c7
--- /dev/null
+++ b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/stake.md
@@ -0,0 +1,6105 @@
+
+<a id="0x1_stake"></a>
+
+# Module `0x1::stake`
+
+
+Validator lifecycle:
+1. Prepare a validator node set up and call stake::initialize_validator
+2. Once ready to deposit stake (or have funds assigned by a staking service in exchange for ownership capability),
+call stake::add_stake (or *_with_cap versions if called from the staking service)
+3. Call stake::join_validator_set (or _with_cap version) to join the active validator set. Changes are effective in
+the next epoch.
+4. Validate and gain rewards. The stake will automatically be locked up for a fixed duration (set by governance) and
+automatically renewed at expiration.
+5. At any point, if the validator operator wants to update the consensus key or network/fullnode addresses, they can
+call stake::rotate_consensus_key and stake::update_network_and_fullnode_addresses. Similar to changes to stake, the
+changes to consensus key/network/fullnode addresses are only effective in the next epoch.
+6. Validator can request to unlock their stake at any time. However, their stake will only become withdrawable when
+their current lockup expires. This can be at most as long as the fixed lockup duration.
+7. After exiting, the validator can either explicitly leave the validator set by calling stake::leave_validator_set
+or if their stake drops below the min required, they would get removed at the end of the epoch.
+8. Validator can always rejoin the validator set by going through steps 2-3 again.
+9. An owner can always switch operators by calling stake::set_operator.
+10. An owner can always switch designated voter by calling stake::set_designated_voter.
+
+
+-  [Resource `OwnerCapability`](#0x1_stake_OwnerCapability)
+-  [Resource `StakePool`](#0x1_stake_StakePool)
+-  [Resource `ValidatorConfig`](#0x1_stake_ValidatorConfig)
+-  [Struct `ValidatorInfo`](#0x1_stake_ValidatorInfo)
+-  [Resource `ValidatorSet`](#0x1_stake_ValidatorSet)
+-  [Resource `AptosCoinCapabilities`](#0x1_stake_AptosCoinCapabilities)
+-  [Struct `IndividualValidatorPerformance`](#0x1_stake_IndividualValidatorPerformance)
+-  [Resource `ValidatorPerformance`](#0x1_stake_ValidatorPerformance)
+-  [Struct `RegisterValidatorCandidateEvent`](#0x1_stake_RegisterValidatorCandidateEvent)
+-  [Struct `RegisterValidatorCandidate`](#0x1_stake_RegisterValidatorCandidate)
+-  [Struct `SetOperatorEvent`](#0x1_stake_SetOperatorEvent)
+-  [Struct `SetOperator`](#0x1_stake_SetOperator)
+-  [Struct `AddStakeEvent`](#0x1_stake_AddStakeEvent)
+-  [Struct `AddStake`](#0x1_stake_AddStake)
+-  [Struct `ReactivateStakeEvent`](#0x1_stake_ReactivateStakeEvent)
+-  [Struct `ReactivateStake`](#0x1_stake_ReactivateStake)
+-  [Struct `RotateConsensusKeyEvent`](#0x1_stake_RotateConsensusKeyEvent)
+-  [Struct `RotateConsensusKey`](#0x1_stake_RotateConsensusKey)
+-  [Struct `UpdateNetworkAndFullnodeAddressesEvent`](#0x1_stake_UpdateNetworkAndFullnodeAddressesEvent)
+-  [Struct `UpdateNetworkAndFullnodeAddresses`](#0x1_stake_UpdateNetworkAndFullnodeAddresses)
+-  [Struct `IncreaseLockupEvent`](#0x1_stake_IncreaseLockupEvent)
+-  [Struct `IncreaseLockup`](#0x1_stake_IncreaseLockup)
+-  [Struct `JoinValidatorSetEvent`](#0x1_stake_JoinValidatorSetEvent)
+-  [Struct `JoinValidatorSet`](#0x1_stake_JoinValidatorSet)
+-  [Struct `DistributeRewardsEvent`](#0x1_stake_DistributeRewardsEvent)
+-  [Struct `DistributeRewards`](#0x1_stake_DistributeRewards)
+-  [Struct `UnlockStakeEvent`](#0x1_stake_UnlockStakeEvent)
+-  [Struct `UnlockStake`](#0x1_stake_UnlockStake)
+-  [Struct `WithdrawStakeEvent`](#0x1_stake_WithdrawStakeEvent)
+-  [Struct `WithdrawStake`](#0x1_stake_WithdrawStake)
+-  [Struct `LeaveValidatorSetEvent`](#0x1_stake_LeaveValidatorSetEvent)
+-  [Struct `LeaveValidatorSet`](#0x1_stake_LeaveValidatorSet)
+-  [Resource `ValidatorFees`](#0x1_stake_ValidatorFees)
+-  [Resource `AllowedValidators`](#0x1_stake_AllowedValidators)
+-  [Resource `Ghost$ghost_valid_perf`](#0x1_stake_Ghost$ghost_valid_perf)
+-  [Resource `Ghost$ghost_proposer_idx`](#0x1_stake_Ghost$ghost_proposer_idx)
+-  [Resource `Ghost$ghost_active_num`](#0x1_stake_Ghost$ghost_active_num)
+-  [Resource `Ghost$ghost_pending_inactive_num`](#0x1_stake_Ghost$ghost_pending_inactive_num)
+-  [Constants](#@Constants_0)
+-  [Function `initialize_validator_fees`](#0x1_stake_initialize_validator_fees)
+-  [Function `add_transaction_fee`](#0x1_stake_add_transaction_fee)
+-  [Function `get_lockup_secs`](#0x1_stake_get_lockup_secs)
+-  [Function `get_remaining_lockup_secs`](#0x1_stake_get_remaining_lockup_secs)
+-  [Function `get_stake`](#0x1_stake_get_stake)
+-  [Function `get_validator_state`](#0x1_stake_get_validator_state)
+-  [Function `get_current_epoch_voting_power`](#0x1_stake_get_current_epoch_voting_power)
+-  [Function `get_delegated_voter`](#0x1_stake_get_delegated_voter)
+-  [Function `get_operator`](#0x1_stake_get_operator)
+-  [Function `get_owned_pool_address`](#0x1_stake_get_owned_pool_address)
+-  [Function `get_validator_index`](#0x1_stake_get_validator_index)
+-  [Function `get_current_epoch_proposal_counts`](#0x1_stake_get_current_epoch_proposal_counts)
+-  [Function `get_validator_config`](#0x1_stake_get_validator_config)
+-  [Function `stake_pool_exists`](#0x1_stake_stake_pool_exists)
+-  [Function `initialize`](#0x1_stake_initialize)
+-  [Function `store_aptos_coin_mint_cap`](#0x1_stake_store_aptos_coin_mint_cap)
+-  [Function `remove_validators`](#0x1_stake_remove_validators)
+-  [Function `initialize_stake_owner`](#0x1_stake_initialize_stake_owner)
+-  [Function `initialize_validator`](#0x1_stake_initialize_validator)
+-  [Function `initialize_owner`](#0x1_stake_initialize_owner)
+-  [Function `extract_owner_cap`](#0x1_stake_extract_owner_cap)
+-  [Function `deposit_owner_cap`](#0x1_stake_deposit_owner_cap)
+-  [Function `destroy_owner_cap`](#0x1_stake_destroy_owner_cap)
+-  [Function `set_operator`](#0x1_stake_set_operator)
+-  [Function `set_operator_with_cap`](#0x1_stake_set_operator_with_cap)
+-  [Function `set_delegated_voter`](#0x1_stake_set_delegated_voter)
+-  [Function `set_delegated_voter_with_cap`](#0x1_stake_set_delegated_voter_with_cap)
+-  [Function `add_stake`](#0x1_stake_add_stake)
+-  [Function `add_stake_with_cap`](#0x1_stake_add_stake_with_cap)
+-  [Function `reactivate_stake`](#0x1_stake_reactivate_stake)
+-  [Function `reactivate_stake_with_cap`](#0x1_stake_reactivate_stake_with_cap)
+-  [Function `rotate_consensus_key`](#0x1_stake_rotate_consensus_key)
+-  [Function `update_network_and_fullnode_addresses`](#0x1_stake_update_network_and_fullnode_addresses)
+-  [Function `increase_lockup`](#0x1_stake_increase_lockup)
+-  [Function `increase_lockup_with_cap`](#0x1_stake_increase_lockup_with_cap)
+-  [Function `join_validator_set`](#0x1_stake_join_validator_set)
+-  [Function `join_validator_set_internal`](#0x1_stake_join_validator_set_internal)
+-  [Function `unlock`](#0x1_stake_unlock)
+-  [Function `unlock_with_cap`](#0x1_stake_unlock_with_cap)
+-  [Function `withdraw`](#0x1_stake_withdraw)
+-  [Function `withdraw_with_cap`](#0x1_stake_withdraw_with_cap)
+-  [Function `leave_validator_set`](#0x1_stake_leave_validator_set)
+-  [Function `is_current_epoch_validator`](#0x1_stake_is_current_epoch_validator)
+-  [Function `update_performance_statistics`](#0x1_stake_update_performance_statistics)
+-  [Function `on_new_epoch`](#0x1_stake_on_new_epoch)
+-  [Function `cur_validator_consensus_infos`](#0x1_stake_cur_validator_consensus_infos)
+-  [Function `next_validator_consensus_infos`](#0x1_stake_next_validator_consensus_infos)
+-  [Function `validator_consensus_infos_from_validator_set`](#0x1_stake_validator_consensus_infos_from_validator_set)
+-  [Function `addresses_from_validator_infos`](#0x1_stake_addresses_from_validator_infos)
+-  [Function `update_stake_pool`](#0x1_stake_update_stake_pool)
+-  [Function `get_reconfig_start_time_secs`](#0x1_stake_get_reconfig_start_time_secs)
+-  [Function `calculate_rewards_amount`](#0x1_stake_calculate_rewards_amount)
+-  [Function `distribute_rewards`](#0x1_stake_distribute_rewards)
+-  [Function `append`](#0x1_stake_append)
+-  [Function `find_validator`](#0x1_stake_find_validator)
+-  [Function `generate_validator_info`](#0x1_stake_generate_validator_info)
+-  [Function `get_next_epoch_voting_power`](#0x1_stake_get_next_epoch_voting_power)
+-  [Function `update_voting_power_increase`](#0x1_stake_update_voting_power_increase)
+-  [Function `assert_stake_pool_exists`](#0x1_stake_assert_stake_pool_exists)
+-  [Function `configure_allowed_validators`](#0x1_stake_configure_allowed_validators)
+-  [Function `is_allowed`](#0x1_stake_is_allowed)
+-  [Function `assert_owner_cap_exists`](#0x1_stake_assert_owner_cap_exists)
+-  [Function `assert_reconfig_not_in_progress`](#0x1_stake_assert_reconfig_not_in_progress)
+-  [Specification](#@Specification_1)
+    -  [High-level Requirements](#high-level-req)
+    -  [Module-level Specification](#module-level-spec)
+    -  [Resource `ValidatorSet`](#@Specification_1_ValidatorSet)
+    -  [Function `initialize_validator_fees`](#@Specification_1_initialize_validator_fees)
+    -  [Function `add_transaction_fee`](#@Specification_1_add_transaction_fee)
+    -  [Function `get_validator_state`](#@Specification_1_get_validator_state)
+    -  [Function `initialize`](#@Specification_1_initialize)
+    -  [Function `remove_validators`](#@Specification_1_remove_validators)
+    -  [Function `initialize_stake_owner`](#@Specification_1_initialize_stake_owner)
+    -  [Function `initialize_validator`](#@Specification_1_initialize_validator)
+    -  [Function `extract_owner_cap`](#@Specification_1_extract_owner_cap)
+    -  [Function `deposit_owner_cap`](#@Specification_1_deposit_owner_cap)
+    -  [Function `set_operator_with_cap`](#@Specification_1_set_operator_with_cap)
+    -  [Function `set_delegated_voter_with_cap`](#@Specification_1_set_delegated_voter_with_cap)
+    -  [Function `add_stake`](#@Specification_1_add_stake)
+    -  [Function `add_stake_with_cap`](#@Specification_1_add_stake_with_cap)
+    -  [Function `reactivate_stake_with_cap`](#@Specification_1_reactivate_stake_with_cap)
+    -  [Function `rotate_consensus_key`](#@Specification_1_rotate_consensus_key)
+    -  [Function `update_network_and_fullnode_addresses`](#@Specification_1_update_network_and_fullnode_addresses)
+    -  [Function `increase_lockup_with_cap`](#@Specification_1_increase_lockup_with_cap)
+    -  [Function `join_validator_set`](#@Specification_1_join_validator_set)
+    -  [Function `unlock_with_cap`](#@Specification_1_unlock_with_cap)
+    -  [Function `withdraw`](#@Specification_1_withdraw)
+    -  [Function `leave_validator_set`](#@Specification_1_leave_validator_set)
+    -  [Function `is_current_epoch_validator`](#@Specification_1_is_current_epoch_validator)
+    -  [Function `update_performance_statistics`](#@Specification_1_update_performance_statistics)
+    -  [Function `on_new_epoch`](#@Specification_1_on_new_epoch)
+    -  [Function `next_validator_consensus_infos`](#@Specification_1_next_validator_consensus_infos)
+    -  [Function `validator_consensus_infos_from_validator_set`](#@Specification_1_validator_consensus_infos_from_validator_set)
+    -  [Function `update_stake_pool`](#@Specification_1_update_stake_pool)
+    -  [Function `get_reconfig_start_time_secs`](#@Specification_1_get_reconfig_start_time_secs)
+    -  [Function `calculate_rewards_amount`](#@Specification_1_calculate_rewards_amount)
+    -  [Function `distribute_rewards`](#@Specification_1_distribute_rewards)
+    -  [Function `append`](#@Specification_1_append)
+    -  [Function `find_validator`](#@Specification_1_find_validator)
+    -  [Function `update_voting_power_increase`](#@Specification_1_update_voting_power_increase)
+    -  [Function `assert_stake_pool_exists`](#@Specification_1_assert_stake_pool_exists)
+    -  [Function `configure_allowed_validators`](#@Specification_1_configure_allowed_validators)
+    -  [Function `assert_owner_cap_exists`](#@Specification_1_assert_owner_cap_exists)
+
+
+<pre><code><b>use</b> <a href="account.md#0x1_account">0x1::account</a>;
+<b>use</b> <a href="aptos_coin.md#0x1_aptos_coin">0x1::aptos_coin</a>;
+<b>use</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/bls12381.md#0x1_bls12381">0x1::bls12381</a>;
+<b>use</b> <a href="chain_status.md#0x1_chain_status">0x1::chain_status</a>;
+<b>use</b> <a href="coin.md#0x1_coin">0x1::coin</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="event.md#0x1_event">0x1::event</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features">0x1::features</a>;
+<b>use</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/fixed_point64.md#0x1_fixed_point64">0x1::fixed_point64</a>;
+<b>use</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/math64.md#0x1_math64">0x1::math64</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option">0x1::option</a>;
+<b>use</b> <a href="reconfiguration_state.md#0x1_reconfiguration_state">0x1::reconfiguration_state</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">0x1::signer</a>;
+<b>use</b> <a href="staking_config.md#0x1_staking_config">0x1::staking_config</a>;
+<b>use</b> <a href="system_addresses.md#0x1_system_addresses">0x1::system_addresses</a>;
+<b>use</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table">0x1::table</a>;
+<b>use</b> <a href="timestamp.md#0x1_timestamp">0x1::timestamp</a>;
+<b>use</b> <a href="validator_consensus_info.md#0x1_validator_consensus_info">0x1::validator_consensus_info</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">0x1::vector</a>;
+</code></pre>
+
+
+
+<a id="0x1_stake_OwnerCapability"></a>
+
+## Resource `OwnerCapability`
+
+Capability that represents ownership and can be used to control the validator and the associated stake pool.
+Having this be separate from the signer for the account that the validator resources are hosted at allows
+modules to have control over a validator.
+
+
+<pre><code><b>struct</b> <a href="stake.md#0x1_stake_OwnerCapability">OwnerCapability</a> <b>has</b> store, key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_stake_StakePool"></a>
+
+## Resource `StakePool`
+
+Each validator has a separate StakePool resource and can provide a stake.
+Changes in stake for an active validator:
+1. If a validator calls add_stake, the newly added stake is moved to pending_active.
+2. If validator calls unlock, their stake is moved to pending_inactive.
+2. When the next epoch starts, any pending_inactive stake is moved to inactive and can be withdrawn.
+Any pending_active stake is moved to active and adds to the validator's voting power.
+
+Changes in stake for an inactive validator:
+1. If a validator calls add_stake, the newly added stake is moved directly to active.
+2. If validator calls unlock, their stake is moved directly to inactive.
+3. When the next epoch starts, the validator can be activated if their active stake is more than the minimum.
+
+
+<pre><code><b>struct</b> <a href="stake.md#0x1_stake_StakePool">StakePool</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>active: <a href="coin.md#0x1_coin_Coin">coin::Coin</a>&lt;<a href="aptos_coin.md#0x1_aptos_coin_AptosCoin">aptos_coin::AptosCoin</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>inactive: <a href="coin.md#0x1_coin_Coin">coin::Coin</a>&lt;<a href="aptos_coin.md#0x1_aptos_coin_AptosCoin">aptos_coin::AptosCoin</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>pending_active: <a href="coin.md#0x1_coin_Coin">coin::Coin</a>&lt;<a href="aptos_coin.md#0x1_aptos_coin_AptosCoin">aptos_coin::AptosCoin</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>pending_inactive: <a href="coin.md#0x1_coin_Coin">coin::Coin</a>&lt;<a href="aptos_coin.md#0x1_aptos_coin_AptosCoin">aptos_coin::AptosCoin</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>locked_until_secs: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>operator_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>delegated_voter: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>initialize_validator_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="stake.md#0x1_stake_RegisterValidatorCandidateEvent">stake::RegisterValidatorCandidateEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>set_operator_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="stake.md#0x1_stake_SetOperatorEvent">stake::SetOperatorEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>add_stake_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="stake.md#0x1_stake_AddStakeEvent">stake::AddStakeEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>reactivate_stake_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="stake.md#0x1_stake_ReactivateStakeEvent">stake::ReactivateStakeEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>rotate_consensus_key_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="stake.md#0x1_stake_RotateConsensusKeyEvent">stake::RotateConsensusKeyEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>update_network_and_fullnode_addresses_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="stake.md#0x1_stake_UpdateNetworkAndFullnodeAddressesEvent">stake::UpdateNetworkAndFullnodeAddressesEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>increase_lockup_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="stake.md#0x1_stake_IncreaseLockupEvent">stake::IncreaseLockupEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>join_validator_set_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="stake.md#0x1_stake_JoinValidatorSetEvent">stake::JoinValidatorSetEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>distribute_rewards_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="stake.md#0x1_stake_DistributeRewardsEvent">stake::DistributeRewardsEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>unlock_stake_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="stake.md#0x1_stake_UnlockStakeEvent">stake::UnlockStakeEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>withdraw_stake_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="stake.md#0x1_stake_WithdrawStakeEvent">stake::WithdrawStakeEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>leave_validator_set_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="stake.md#0x1_stake_LeaveValidatorSetEvent">stake::LeaveValidatorSetEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_stake_ValidatorConfig"></a>
+
+## Resource `ValidatorConfig`
+
+Validator info stored in validator address.
+
+
+<pre><code><b>struct</b> <a href="stake.md#0x1_stake_ValidatorConfig">ValidatorConfig</a> <b>has</b> <b>copy</b>, drop, store, key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>consensus_pubkey: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>network_addresses: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>fullnode_addresses: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>validator_index: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_stake_ValidatorInfo"></a>
+
+## Struct `ValidatorInfo`
+
+Consensus information per validator, stored in ValidatorSet.
+
+
+<pre><code><b>struct</b> <a href="stake.md#0x1_stake_ValidatorInfo">ValidatorInfo</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>addr: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>voting_power: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>config: <a href="stake.md#0x1_stake_ValidatorConfig">stake::ValidatorConfig</a></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_stake_ValidatorSet"></a>
+
+## Resource `ValidatorSet`
+
+Full ValidatorSet, stored in @aptos_framework.
+1. join_validator_set adds to pending_active queue.
+2. leave_valdiator_set moves from active to pending_inactive queue.
+3. on_new_epoch processes two pending queues and refresh ValidatorInfo from the owner's address.
+
+
+<pre><code><b>struct</b> <a href="stake.md#0x1_stake_ValidatorSet">ValidatorSet</a> <b>has</b> <b>copy</b>, drop, store, key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>consensus_scheme: u8</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>active_validators: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="stake.md#0x1_stake_ValidatorInfo">stake::ValidatorInfo</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>pending_inactive: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="stake.md#0x1_stake_ValidatorInfo">stake::ValidatorInfo</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>pending_active: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="stake.md#0x1_stake_ValidatorInfo">stake::ValidatorInfo</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>total_voting_power: u128</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>total_joining_power: u128</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_stake_AptosCoinCapabilities"></a>
+
+## Resource `AptosCoinCapabilities`
+
+AptosCoin capabilities, set during genesis and stored in @CoreResource account.
+This allows the Stake module to mint rewards to stakers.
+
+
+<pre><code><b>struct</b> <a href="stake.md#0x1_stake_AptosCoinCapabilities">AptosCoinCapabilities</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>mint_cap: <a href="coin.md#0x1_coin_MintCapability">coin::MintCapability</a>&lt;<a href="aptos_coin.md#0x1_aptos_coin_AptosCoin">aptos_coin::AptosCoin</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_stake_IndividualValidatorPerformance"></a>
+
+## Struct `IndividualValidatorPerformance`
+
+
+
+<pre><code><b>struct</b> <a href="stake.md#0x1_stake_IndividualValidatorPerformance">IndividualValidatorPerformance</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>successful_proposals: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>failed_proposals: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_stake_ValidatorPerformance"></a>
+
+## Resource `ValidatorPerformance`
+
+
+
+<pre><code><b>struct</b> <a href="stake.md#0x1_stake_ValidatorPerformance">ValidatorPerformance</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>validators: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="stake.md#0x1_stake_IndividualValidatorPerformance">stake::IndividualValidatorPerformance</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_stake_RegisterValidatorCandidateEvent"></a>
+
+## Struct `RegisterValidatorCandidateEvent`
+
+
+
+<pre><code><b>struct</b> <a href="stake.md#0x1_stake_RegisterValidatorCandidateEvent">RegisterValidatorCandidateEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_stake_RegisterValidatorCandidate"></a>
+
+## Struct `RegisterValidatorCandidate`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="stake.md#0x1_stake_RegisterValidatorCandidate">RegisterValidatorCandidate</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_stake_SetOperatorEvent"></a>
+
+## Struct `SetOperatorEvent`
+
+
+
+<pre><code><b>struct</b> <a href="stake.md#0x1_stake_SetOperatorEvent">SetOperatorEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>old_operator: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>new_operator: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_stake_SetOperator"></a>
+
+## Struct `SetOperator`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="stake.md#0x1_stake_SetOperator">SetOperator</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>old_operator: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>new_operator: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_stake_AddStakeEvent"></a>
+
+## Struct `AddStakeEvent`
+
+
+
+<pre><code><b>struct</b> <a href="stake.md#0x1_stake_AddStakeEvent">AddStakeEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>amount_added: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_stake_AddStake"></a>
+
+## Struct `AddStake`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="stake.md#0x1_stake_AddStake">AddStake</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>amount_added: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_stake_ReactivateStakeEvent"></a>
+
+## Struct `ReactivateStakeEvent`
+
+
+
+<pre><code><b>struct</b> <a href="stake.md#0x1_stake_ReactivateStakeEvent">ReactivateStakeEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>amount: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_stake_ReactivateStake"></a>
+
+## Struct `ReactivateStake`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="stake.md#0x1_stake_ReactivateStake">ReactivateStake</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>amount: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_stake_RotateConsensusKeyEvent"></a>
+
+## Struct `RotateConsensusKeyEvent`
+
+
+
+<pre><code><b>struct</b> <a href="stake.md#0x1_stake_RotateConsensusKeyEvent">RotateConsensusKeyEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>old_consensus_pubkey: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>new_consensus_pubkey: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_stake_RotateConsensusKey"></a>
+
+## Struct `RotateConsensusKey`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="stake.md#0x1_stake_RotateConsensusKey">RotateConsensusKey</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>old_consensus_pubkey: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>new_consensus_pubkey: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_stake_UpdateNetworkAndFullnodeAddressesEvent"></a>
+
+## Struct `UpdateNetworkAndFullnodeAddressesEvent`
+
+
+
+<pre><code><b>struct</b> <a href="stake.md#0x1_stake_UpdateNetworkAndFullnodeAddressesEvent">UpdateNetworkAndFullnodeAddressesEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>old_network_addresses: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>new_network_addresses: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>old_fullnode_addresses: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>new_fullnode_addresses: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_stake_UpdateNetworkAndFullnodeAddresses"></a>
+
+## Struct `UpdateNetworkAndFullnodeAddresses`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="stake.md#0x1_stake_UpdateNetworkAndFullnodeAddresses">UpdateNetworkAndFullnodeAddresses</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>old_network_addresses: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>new_network_addresses: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>old_fullnode_addresses: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>new_fullnode_addresses: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_stake_IncreaseLockupEvent"></a>
+
+## Struct `IncreaseLockupEvent`
+
+
+
+<pre><code><b>struct</b> <a href="stake.md#0x1_stake_IncreaseLockupEvent">IncreaseLockupEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>old_locked_until_secs: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>new_locked_until_secs: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_stake_IncreaseLockup"></a>
+
+## Struct `IncreaseLockup`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="stake.md#0x1_stake_IncreaseLockup">IncreaseLockup</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>old_locked_until_secs: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>new_locked_until_secs: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_stake_JoinValidatorSetEvent"></a>
+
+## Struct `JoinValidatorSetEvent`
+
+
+
+<pre><code><b>struct</b> <a href="stake.md#0x1_stake_JoinValidatorSetEvent">JoinValidatorSetEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_stake_JoinValidatorSet"></a>
+
+## Struct `JoinValidatorSet`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="stake.md#0x1_stake_JoinValidatorSet">JoinValidatorSet</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_stake_DistributeRewardsEvent"></a>
+
+## Struct `DistributeRewardsEvent`
+
+
+
+<pre><code><b>struct</b> <a href="stake.md#0x1_stake_DistributeRewardsEvent">DistributeRewardsEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>rewards_amount: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_stake_DistributeRewards"></a>
+
+## Struct `DistributeRewards`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="stake.md#0x1_stake_DistributeRewards">DistributeRewards</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>rewards_amount: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_stake_UnlockStakeEvent"></a>
+
+## Struct `UnlockStakeEvent`
+
+
+
+<pre><code><b>struct</b> <a href="stake.md#0x1_stake_UnlockStakeEvent">UnlockStakeEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>amount_unlocked: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_stake_UnlockStake"></a>
+
+## Struct `UnlockStake`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="stake.md#0x1_stake_UnlockStake">UnlockStake</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>amount_unlocked: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_stake_WithdrawStakeEvent"></a>
+
+## Struct `WithdrawStakeEvent`
+
+
+
+<pre><code><b>struct</b> <a href="stake.md#0x1_stake_WithdrawStakeEvent">WithdrawStakeEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>amount_withdrawn: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_stake_WithdrawStake"></a>
+
+## Struct `WithdrawStake`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="stake.md#0x1_stake_WithdrawStake">WithdrawStake</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>amount_withdrawn: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_stake_LeaveValidatorSetEvent"></a>
+
+## Struct `LeaveValidatorSetEvent`
+
+
+
+<pre><code><b>struct</b> <a href="stake.md#0x1_stake_LeaveValidatorSetEvent">LeaveValidatorSetEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_stake_LeaveValidatorSet"></a>
+
+## Struct `LeaveValidatorSet`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="stake.md#0x1_stake_LeaveValidatorSet">LeaveValidatorSet</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_stake_ValidatorFees"></a>
+
+## Resource `ValidatorFees`
+
+Stores transaction fees assigned to validators. All fees are distributed to validators
+at the end of the epoch.
+
+
+<pre><code><b>struct</b> <a href="stake.md#0x1_stake_ValidatorFees">ValidatorFees</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>fees_table: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_Table">table::Table</a>&lt;<b>address</b>, <a href="coin.md#0x1_coin_Coin">coin::Coin</a>&lt;<a href="aptos_coin.md#0x1_aptos_coin_AptosCoin">aptos_coin::AptosCoin</a>&gt;&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_stake_AllowedValidators"></a>
+
+## Resource `AllowedValidators`
+
+This provides an ACL for Testnet purposes. In testnet, everyone is a whale, a whale can be a validator.
+This allows a testnet to bring additional entities into the validator set without compromising the
+security of the testnet. This will NOT be enabled in Mainnet.
+
+
+<pre><code><b>struct</b> <a href="stake.md#0x1_stake_AllowedValidators">AllowedValidators</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>accounts: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_stake_Ghost$ghost_valid_perf"></a>
+
+## Resource `Ghost$ghost_valid_perf`
+
+
+
+<pre><code><b>struct</b> Ghost$<a href="stake.md#0x1_stake_ghost_valid_perf">ghost_valid_perf</a> <b>has</b> <b>copy</b>, drop, store, key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>v: <a href="stake.md#0x1_stake_ValidatorPerformance">stake::ValidatorPerformance</a></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_stake_Ghost$ghost_proposer_idx"></a>
+
+## Resource `Ghost$ghost_proposer_idx`
+
+
+
+<pre><code><b>struct</b> Ghost$<a href="stake.md#0x1_stake_ghost_proposer_idx">ghost_proposer_idx</a> <b>has</b> <b>copy</b>, drop, store, key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>v: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;u64&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_stake_Ghost$ghost_active_num"></a>
+
+## Resource `Ghost$ghost_active_num`
+
+
+
+<pre><code><b>struct</b> Ghost$<a href="stake.md#0x1_stake_ghost_active_num">ghost_active_num</a> <b>has</b> <b>copy</b>, drop, store, key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>v: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_stake_Ghost$ghost_pending_inactive_num"></a>
+
+## Resource `Ghost$ghost_pending_inactive_num`
+
+
+
+<pre><code><b>struct</b> Ghost$<a href="stake.md#0x1_stake_ghost_pending_inactive_num">ghost_pending_inactive_num</a> <b>has</b> <b>copy</b>, drop, store, key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>v: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_stake_MAX_U64"></a>
+
+
+
+<pre><code><b>const</b> <a href="stake.md#0x1_stake_MAX_U64">MAX_U64</a>: u128 = 18446744073709551615;
+</code></pre>
+
+
+
+<a id="0x1_stake_EALREADY_REGISTERED"></a>
+
+Account is already registered as a validator candidate.
+
+
+<pre><code><b>const</b> <a href="stake.md#0x1_stake_EALREADY_REGISTERED">EALREADY_REGISTERED</a>: u64 = 8;
+</code></pre>
+
+
+
+<a id="0x1_stake_MAX_REWARDS_RATE"></a>
+
+Limit the maximum value of <code>rewards_rate</code> in order to avoid any arithmetic overflow.
+
+
+<pre><code><b>const</b> <a href="stake.md#0x1_stake_MAX_REWARDS_RATE">MAX_REWARDS_RATE</a>: u64 = 1000000;
+</code></pre>
+
+
+
+<a id="0x1_stake_EALREADY_ACTIVE_VALIDATOR"></a>
+
+Account is already a validator or pending validator.
+
+
+<pre><code><b>const</b> <a href="stake.md#0x1_stake_EALREADY_ACTIVE_VALIDATOR">EALREADY_ACTIVE_VALIDATOR</a>: u64 = 4;
+</code></pre>
+
+
+
+<a id="0x1_stake_EFEES_TABLE_ALREADY_EXISTS"></a>
+
+Table to store collected transaction fees for each validator already exists.
+
+
+<pre><code><b>const</b> <a href="stake.md#0x1_stake_EFEES_TABLE_ALREADY_EXISTS">EFEES_TABLE_ALREADY_EXISTS</a>: u64 = 19;
+</code></pre>
+
+
+
+<a id="0x1_stake_EINELIGIBLE_VALIDATOR"></a>
+
+Validator is not defined in the ACL of entities allowed to be validators
+
+
+<pre><code><b>const</b> <a href="stake.md#0x1_stake_EINELIGIBLE_VALIDATOR">EINELIGIBLE_VALIDATOR</a>: u64 = 17;
+</code></pre>
+
+
+
+<a id="0x1_stake_EINVALID_LOCKUP"></a>
+
+Cannot update stake pool's lockup to earlier than current lockup.
+
+
+<pre><code><b>const</b> <a href="stake.md#0x1_stake_EINVALID_LOCKUP">EINVALID_LOCKUP</a>: u64 = 18;
+</code></pre>
+
+
+
+<a id="0x1_stake_EINVALID_PUBLIC_KEY"></a>
+
+Invalid consensus public key
+
+
+<pre><code><b>const</b> <a href="stake.md#0x1_stake_EINVALID_PUBLIC_KEY">EINVALID_PUBLIC_KEY</a>: u64 = 11;
+</code></pre>
+
+
+
+<a id="0x1_stake_ELAST_VALIDATOR"></a>
+
+Can't remove last validator.
+
+
+<pre><code><b>const</b> <a href="stake.md#0x1_stake_ELAST_VALIDATOR">ELAST_VALIDATOR</a>: u64 = 6;
+</code></pre>
+
+
+
+<a id="0x1_stake_ENOT_OPERATOR"></a>
+
+Account does not have the right operator capability.
+
+
+<pre><code><b>const</b> <a href="stake.md#0x1_stake_ENOT_OPERATOR">ENOT_OPERATOR</a>: u64 = 9;
+</code></pre>
+
+
+
+<a id="0x1_stake_ENOT_VALIDATOR"></a>
+
+Account is not a validator.
+
+
+<pre><code><b>const</b> <a href="stake.md#0x1_stake_ENOT_VALIDATOR">ENOT_VALIDATOR</a>: u64 = 5;
+</code></pre>
+
+
+
+<a id="0x1_stake_ENO_POST_GENESIS_VALIDATOR_SET_CHANGE_ALLOWED"></a>
+
+Validators cannot join or leave post genesis on this test network.
+
+
+<pre><code><b>const</b> <a href="stake.md#0x1_stake_ENO_POST_GENESIS_VALIDATOR_SET_CHANGE_ALLOWED">ENO_POST_GENESIS_VALIDATOR_SET_CHANGE_ALLOWED</a>: u64 = 10;
+</code></pre>
+
+
+
+<a id="0x1_stake_EOWNER_CAP_ALREADY_EXISTS"></a>
+
+An account cannot own more than one owner capability.
+
+
+<pre><code><b>const</b> <a href="stake.md#0x1_stake_EOWNER_CAP_ALREADY_EXISTS">EOWNER_CAP_ALREADY_EXISTS</a>: u64 = 16;
+</code></pre>
+
+
+
+<a id="0x1_stake_EOWNER_CAP_NOT_FOUND"></a>
+
+Owner capability does not exist at the provided account.
+
+
+<pre><code><b>const</b> <a href="stake.md#0x1_stake_EOWNER_CAP_NOT_FOUND">EOWNER_CAP_NOT_FOUND</a>: u64 = 15;
+</code></pre>
+
+
+
+<a id="0x1_stake_ERECONFIGURATION_IN_PROGRESS"></a>
+
+Validator set change temporarily disabled because of in-progress reconfiguration.
+
+
+<pre><code><b>const</b> <a href="stake.md#0x1_stake_ERECONFIGURATION_IN_PROGRESS">ERECONFIGURATION_IN_PROGRESS</a>: u64 = 20;
+</code></pre>
+
+
+
+<a id="0x1_stake_ESTAKE_EXCEEDS_MAX"></a>
+
+Total stake exceeds maximum allowed.
+
+
+<pre><code><b>const</b> <a href="stake.md#0x1_stake_ESTAKE_EXCEEDS_MAX">ESTAKE_EXCEEDS_MAX</a>: u64 = 7;
+</code></pre>
+
+
+
+<a id="0x1_stake_ESTAKE_POOL_DOES_NOT_EXIST"></a>
+
+Stake pool does not exist at the provided pool address.
+
+
+<pre><code><b>const</b> <a href="stake.md#0x1_stake_ESTAKE_POOL_DOES_NOT_EXIST">ESTAKE_POOL_DOES_NOT_EXIST</a>: u64 = 14;
+</code></pre>
+
+
+
+<a id="0x1_stake_ESTAKE_TOO_HIGH"></a>
+
+Too much stake to join validator set.
+
+
+<pre><code><b>const</b> <a href="stake.md#0x1_stake_ESTAKE_TOO_HIGH">ESTAKE_TOO_HIGH</a>: u64 = 3;
+</code></pre>
+
+
+
+<a id="0x1_stake_ESTAKE_TOO_LOW"></a>
+
+Not enough stake to join validator set.
+
+
+<pre><code><b>const</b> <a href="stake.md#0x1_stake_ESTAKE_TOO_LOW">ESTAKE_TOO_LOW</a>: u64 = 2;
+</code></pre>
+
+
+
+<a id="0x1_stake_EVALIDATOR_CONFIG"></a>
+
+Validator Config not published.
+
+
+<pre><code><b>const</b> <a href="stake.md#0x1_stake_EVALIDATOR_CONFIG">EVALIDATOR_CONFIG</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_stake_EVALIDATOR_SET_TOO_LARGE"></a>
+
+Validator set exceeds the limit
+
+
+<pre><code><b>const</b> <a href="stake.md#0x1_stake_EVALIDATOR_SET_TOO_LARGE">EVALIDATOR_SET_TOO_LARGE</a>: u64 = 12;
+</code></pre>
+
+
+
+<a id="0x1_stake_EVOTING_POWER_INCREASE_EXCEEDS_LIMIT"></a>
+
+Voting power increase has exceeded the limit for this current epoch.
+
+
+<pre><code><b>const</b> <a href="stake.md#0x1_stake_EVOTING_POWER_INCREASE_EXCEEDS_LIMIT">EVOTING_POWER_INCREASE_EXCEEDS_LIMIT</a>: u64 = 13;
+</code></pre>
+
+
+
+<a id="0x1_stake_MAX_VALIDATOR_SET_SIZE"></a>
+
+Limit the maximum size to u16::max, it's the current limit of the bitvec
+https://github.com/aptos-labs/aptos-core/blob/main/crates/aptos-bitvec/src/lib.rs#L20
+
+
+<pre><code><b>const</b> <a href="stake.md#0x1_stake_MAX_VALIDATOR_SET_SIZE">MAX_VALIDATOR_SET_SIZE</a>: u64 = 65536;
+</code></pre>
+
+
+
+<a id="0x1_stake_VALIDATOR_STATUS_ACTIVE"></a>
+
+
+
+<pre><code><b>const</b> <a href="stake.md#0x1_stake_VALIDATOR_STATUS_ACTIVE">VALIDATOR_STATUS_ACTIVE</a>: u64 = 2;
+</code></pre>
+
+
+
+<a id="0x1_stake_VALIDATOR_STATUS_INACTIVE"></a>
+
+
+
+<pre><code><b>const</b> <a href="stake.md#0x1_stake_VALIDATOR_STATUS_INACTIVE">VALIDATOR_STATUS_INACTIVE</a>: u64 = 4;
+</code></pre>
+
+
+
+<a id="0x1_stake_VALIDATOR_STATUS_PENDING_ACTIVE"></a>
+
+Validator status enum. We can switch to proper enum later once Move supports it.
+
+
+<pre><code><b>const</b> <a href="stake.md#0x1_stake_VALIDATOR_STATUS_PENDING_ACTIVE">VALIDATOR_STATUS_PENDING_ACTIVE</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_stake_VALIDATOR_STATUS_PENDING_INACTIVE"></a>
+
+
+
+<pre><code><b>const</b> <a href="stake.md#0x1_stake_VALIDATOR_STATUS_PENDING_INACTIVE">VALIDATOR_STATUS_PENDING_INACTIVE</a>: u64 = 3;
+</code></pre>
+
+
+
+<a id="0x1_stake_initialize_validator_fees"></a>
+
+## Function `initialize_validator_fees`
+
+Initializes the resource storing information about collected transaction fees per validator.
+Used by <code><a href="transaction_fee.md#0x1_transaction_fee">transaction_fee</a>.<b>move</b></code> to initialize fee collection and distribution.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="stake.md#0x1_stake_initialize_validator_fees">initialize_validator_fees</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="stake.md#0x1_stake_initialize_validator_fees">initialize_validator_fees</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>) {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(aptos_framework);
+    <b>assert</b>!(
+        !<b>exists</b>&lt;<a href="stake.md#0x1_stake_ValidatorFees">ValidatorFees</a>&gt;(@aptos_framework),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_already_exists">error::already_exists</a>(<a href="stake.md#0x1_stake_EFEES_TABLE_ALREADY_EXISTS">EFEES_TABLE_ALREADY_EXISTS</a>)
+    );
+    <b>move_to</b>(aptos_framework, <a href="stake.md#0x1_stake_ValidatorFees">ValidatorFees</a> { fees_table: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_new">table::new</a>() });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_stake_add_transaction_fee"></a>
+
+## Function `add_transaction_fee`
+
+Stores the transaction fee collected to the specified validator address.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="stake.md#0x1_stake_add_transaction_fee">add_transaction_fee</a>(validator_addr: <b>address</b>, fee: <a href="coin.md#0x1_coin_Coin">coin::Coin</a>&lt;<a href="aptos_coin.md#0x1_aptos_coin_AptosCoin">aptos_coin::AptosCoin</a>&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="stake.md#0x1_stake_add_transaction_fee">add_transaction_fee</a>(validator_addr: <b>address</b>, fee: Coin&lt;AptosCoin&gt;) <b>acquires</b> <a href="stake.md#0x1_stake_ValidatorFees">ValidatorFees</a> {
+    <b>let</b> fees_table = &<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="stake.md#0x1_stake_ValidatorFees">ValidatorFees</a>&gt;(@aptos_framework).fees_table;
+    <b>if</b> (<a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_contains">table::contains</a>(fees_table, validator_addr)) {
+        <b>let</b> collected_fee = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_borrow_mut">table::borrow_mut</a>(fees_table, validator_addr);
+        <a href="coin.md#0x1_coin_merge">coin::merge</a>(collected_fee, fee);
+    } <b>else</b> {
+        <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_add">table::add</a>(fees_table, validator_addr, fee);
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_stake_get_lockup_secs"></a>
+
+## Function `get_lockup_secs`
+
+Return the lockup expiration of the stake pool at <code>pool_address</code>.
+This will throw an error if there's no stake pool at <code>pool_address</code>.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_get_lockup_secs">get_lockup_secs</a>(pool_address: <b>address</b>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_get_lockup_secs">get_lockup_secs</a>(pool_address: <b>address</b>): u64 <b>acquires</b> <a href="stake.md#0x1_stake_StakePool">StakePool</a> {
+    <a href="stake.md#0x1_stake_assert_stake_pool_exists">assert_stake_pool_exists</a>(pool_address);
+    <b>borrow_global</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(pool_address).locked_until_secs
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_stake_get_remaining_lockup_secs"></a>
+
+## Function `get_remaining_lockup_secs`
+
+Return the remaining lockup of the stake pool at <code>pool_address</code>.
+This will throw an error if there's no stake pool at <code>pool_address</code>.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_get_remaining_lockup_secs">get_remaining_lockup_secs</a>(pool_address: <b>address</b>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_get_remaining_lockup_secs">get_remaining_lockup_secs</a>(pool_address: <b>address</b>): u64 <b>acquires</b> <a href="stake.md#0x1_stake_StakePool">StakePool</a> {
+    <a href="stake.md#0x1_stake_assert_stake_pool_exists">assert_stake_pool_exists</a>(pool_address);
+    <b>let</b> lockup_time = <b>borrow_global</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(pool_address).locked_until_secs;
+    <b>if</b> (lockup_time &lt;= <a href="timestamp.md#0x1_timestamp_now_seconds">timestamp::now_seconds</a>()) {
+        0
+    } <b>else</b> {
+        lockup_time - <a href="timestamp.md#0x1_timestamp_now_seconds">timestamp::now_seconds</a>()
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_stake_get_stake"></a>
+
+## Function `get_stake`
+
+Return the different stake amounts for <code>pool_address</code> (whether the validator is active or not).
+The returned amounts are for (active, inactive, pending_active, pending_inactive) stake respectively.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_get_stake">get_stake</a>(pool_address: <b>address</b>): (u64, u64, u64, u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_get_stake">get_stake</a>(pool_address: <b>address</b>): (u64, u64, u64, u64) <b>acquires</b> <a href="stake.md#0x1_stake_StakePool">StakePool</a> {
+    <a href="stake.md#0x1_stake_assert_stake_pool_exists">assert_stake_pool_exists</a>(pool_address);
+    <b>let</b> stake_pool = <b>borrow_global</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(pool_address);
+    (
+        <a href="coin.md#0x1_coin_value">coin::value</a>(&stake_pool.active),
+        <a href="coin.md#0x1_coin_value">coin::value</a>(&stake_pool.inactive),
+        <a href="coin.md#0x1_coin_value">coin::value</a>(&stake_pool.pending_active),
+        <a href="coin.md#0x1_coin_value">coin::value</a>(&stake_pool.pending_inactive),
+    )
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_stake_get_validator_state"></a>
+
+## Function `get_validator_state`
+
+Returns the validator's state.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_get_validator_state">get_validator_state</a>(pool_address: <b>address</b>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_get_validator_state">get_validator_state</a>(pool_address: <b>address</b>): u64 <b>acquires</b> <a href="stake.md#0x1_stake_ValidatorSet">ValidatorSet</a> {
+    <b>let</b> validator_set = <b>borrow_global</b>&lt;<a href="stake.md#0x1_stake_ValidatorSet">ValidatorSet</a>&gt;(@aptos_framework);
+    <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&<a href="stake.md#0x1_stake_find_validator">find_validator</a>(&validator_set.pending_active, pool_address))) {
+        <a href="stake.md#0x1_stake_VALIDATOR_STATUS_PENDING_ACTIVE">VALIDATOR_STATUS_PENDING_ACTIVE</a>
+    } <b>else</b> <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&<a href="stake.md#0x1_stake_find_validator">find_validator</a>(&validator_set.active_validators, pool_address))) {
+        <a href="stake.md#0x1_stake_VALIDATOR_STATUS_ACTIVE">VALIDATOR_STATUS_ACTIVE</a>
+    } <b>else</b> <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&<a href="stake.md#0x1_stake_find_validator">find_validator</a>(&validator_set.pending_inactive, pool_address))) {
+        <a href="stake.md#0x1_stake_VALIDATOR_STATUS_PENDING_INACTIVE">VALIDATOR_STATUS_PENDING_INACTIVE</a>
+    } <b>else</b> {
+        <a href="stake.md#0x1_stake_VALIDATOR_STATUS_INACTIVE">VALIDATOR_STATUS_INACTIVE</a>
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_stake_get_current_epoch_voting_power"></a>
+
+## Function `get_current_epoch_voting_power`
+
+Return the voting power of the validator in the current epoch.
+This is the same as the validator's total active and pending_inactive stake.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_get_current_epoch_voting_power">get_current_epoch_voting_power</a>(pool_address: <b>address</b>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_get_current_epoch_voting_power">get_current_epoch_voting_power</a>(pool_address: <b>address</b>): u64 <b>acquires</b> <a href="stake.md#0x1_stake_StakePool">StakePool</a>, <a href="stake.md#0x1_stake_ValidatorSet">ValidatorSet</a> {
+    <a href="stake.md#0x1_stake_assert_stake_pool_exists">assert_stake_pool_exists</a>(pool_address);
+    <b>let</b> validator_state = <a href="stake.md#0x1_stake_get_validator_state">get_validator_state</a>(pool_address);
+    // Both active and pending inactive validators can still vote in the current epoch.
+    <b>if</b> (validator_state == <a href="stake.md#0x1_stake_VALIDATOR_STATUS_ACTIVE">VALIDATOR_STATUS_ACTIVE</a> || validator_state == <a href="stake.md#0x1_stake_VALIDATOR_STATUS_PENDING_INACTIVE">VALIDATOR_STATUS_PENDING_INACTIVE</a>) {
+        <b>let</b> active_stake = <a href="coin.md#0x1_coin_value">coin::value</a>(&<b>borrow_global</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(pool_address).active);
+        <b>let</b> pending_inactive_stake = <a href="coin.md#0x1_coin_value">coin::value</a>(&<b>borrow_global</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(pool_address).pending_inactive);
+        active_stake + pending_inactive_stake
+    } <b>else</b> {
+        0
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_stake_get_delegated_voter"></a>
+
+## Function `get_delegated_voter`
+
+Return the delegated voter of the validator at <code>pool_address</code>.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_get_delegated_voter">get_delegated_voter</a>(pool_address: <b>address</b>): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_get_delegated_voter">get_delegated_voter</a>(pool_address: <b>address</b>): <b>address</b> <b>acquires</b> <a href="stake.md#0x1_stake_StakePool">StakePool</a> {
+    <a href="stake.md#0x1_stake_assert_stake_pool_exists">assert_stake_pool_exists</a>(pool_address);
+    <b>borrow_global</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(pool_address).delegated_voter
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_stake_get_operator"></a>
+
+## Function `get_operator`
+
+Return the operator of the validator at <code>pool_address</code>.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_get_operator">get_operator</a>(pool_address: <b>address</b>): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_get_operator">get_operator</a>(pool_address: <b>address</b>): <b>address</b> <b>acquires</b> <a href="stake.md#0x1_stake_StakePool">StakePool</a> {
+    <a href="stake.md#0x1_stake_assert_stake_pool_exists">assert_stake_pool_exists</a>(pool_address);
+    <b>borrow_global</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(pool_address).operator_address
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_stake_get_owned_pool_address"></a>
+
+## Function `get_owned_pool_address`
+
+Return the pool address in <code>owner_cap</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_get_owned_pool_address">get_owned_pool_address</a>(owner_cap: &<a href="stake.md#0x1_stake_OwnerCapability">stake::OwnerCapability</a>): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_get_owned_pool_address">get_owned_pool_address</a>(owner_cap: &<a href="stake.md#0x1_stake_OwnerCapability">OwnerCapability</a>): <b>address</b> {
+    owner_cap.pool_address
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_stake_get_validator_index"></a>
+
+## Function `get_validator_index`
+
+Return the validator index for <code>pool_address</code>.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_get_validator_index">get_validator_index</a>(pool_address: <b>address</b>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_get_validator_index">get_validator_index</a>(pool_address: <b>address</b>): u64 <b>acquires</b> <a href="stake.md#0x1_stake_ValidatorConfig">ValidatorConfig</a> {
+    <a href="stake.md#0x1_stake_assert_stake_pool_exists">assert_stake_pool_exists</a>(pool_address);
+    <b>borrow_global</b>&lt;<a href="stake.md#0x1_stake_ValidatorConfig">ValidatorConfig</a>&gt;(pool_address).validator_index
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_stake_get_current_epoch_proposal_counts"></a>
+
+## Function `get_current_epoch_proposal_counts`
+
+Return the number of successful and failed proposals for the proposal at the given validator index.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_get_current_epoch_proposal_counts">get_current_epoch_proposal_counts</a>(validator_index: u64): (u64, u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_get_current_epoch_proposal_counts">get_current_epoch_proposal_counts</a>(validator_index: u64): (u64, u64) <b>acquires</b> <a href="stake.md#0x1_stake_ValidatorPerformance">ValidatorPerformance</a> {
+    <b>let</b> validator_performances = &<b>borrow_global</b>&lt;<a href="stake.md#0x1_stake_ValidatorPerformance">ValidatorPerformance</a>&gt;(@aptos_framework).validators;
+    <b>let</b> validator_performance = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(validator_performances, validator_index);
+    (validator_performance.successful_proposals, validator_performance.failed_proposals)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_stake_get_validator_config"></a>
+
+## Function `get_validator_config`
+
+Return the validator's config.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_get_validator_config">get_validator_config</a>(pool_address: <b>address</b>): (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_get_validator_config">get_validator_config</a>(
+    pool_address: <b>address</b>
+): (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;) <b>acquires</b> <a href="stake.md#0x1_stake_ValidatorConfig">ValidatorConfig</a> {
+    <a href="stake.md#0x1_stake_assert_stake_pool_exists">assert_stake_pool_exists</a>(pool_address);
+    <b>let</b> validator_config = <b>borrow_global</b>&lt;<a href="stake.md#0x1_stake_ValidatorConfig">ValidatorConfig</a>&gt;(pool_address);
+    (validator_config.consensus_pubkey, validator_config.network_addresses, validator_config.fullnode_addresses)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_stake_stake_pool_exists"></a>
+
+## Function `stake_pool_exists`
+
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_stake_pool_exists">stake_pool_exists</a>(addr: <b>address</b>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_stake_pool_exists">stake_pool_exists</a>(addr: <b>address</b>): bool {
+    <b>exists</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(addr)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_stake_initialize"></a>
+
+## Function `initialize`
+
+Initialize validator set to the core resource account.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="stake.md#0x1_stake_initialize">initialize</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="stake.md#0x1_stake_initialize">initialize</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>) {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(aptos_framework);
+
+    <b>move_to</b>(aptos_framework, <a href="stake.md#0x1_stake_ValidatorSet">ValidatorSet</a> {
+        consensus_scheme: 0,
+        active_validators: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_empty">vector::empty</a>(),
+        pending_active: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_empty">vector::empty</a>(),
+        pending_inactive: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_empty">vector::empty</a>(),
+        total_voting_power: 0,
+        total_joining_power: 0,
+    });
+
+    <b>move_to</b>(aptos_framework, <a href="stake.md#0x1_stake_ValidatorPerformance">ValidatorPerformance</a> {
+        validators: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_empty">vector::empty</a>(),
+    });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_stake_store_aptos_coin_mint_cap"></a>
+
+## Function `store_aptos_coin_mint_cap`
+
+This is only called during Genesis, which is where MintCapability<AptosCoin> can be created.
+Beyond genesis, no one can create AptosCoin mint/burn capabilities.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="stake.md#0x1_stake_store_aptos_coin_mint_cap">store_aptos_coin_mint_cap</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, mint_cap: <a href="coin.md#0x1_coin_MintCapability">coin::MintCapability</a>&lt;<a href="aptos_coin.md#0x1_aptos_coin_AptosCoin">aptos_coin::AptosCoin</a>&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="stake.md#0x1_stake_store_aptos_coin_mint_cap">store_aptos_coin_mint_cap</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, mint_cap: MintCapability&lt;AptosCoin&gt;) {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(aptos_framework);
+    <b>move_to</b>(aptos_framework, <a href="stake.md#0x1_stake_AptosCoinCapabilities">AptosCoinCapabilities</a> { mint_cap })
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_stake_remove_validators"></a>
+
+## Function `remove_validators`
+
+Allow on chain governance to remove validators from the validator set.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_remove_validators">remove_validators</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, validators: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_remove_validators">remove_validators</a>(
+    aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    validators: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;,
+) <b>acquires</b> <a href="stake.md#0x1_stake_ValidatorSet">ValidatorSet</a> {
+    <a href="stake.md#0x1_stake_assert_reconfig_not_in_progress">assert_reconfig_not_in_progress</a>();
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(aptos_framework);
+    <b>let</b> validator_set = <b>borrow_global_mut</b>&lt;<a href="stake.md#0x1_stake_ValidatorSet">ValidatorSet</a>&gt;(@aptos_framework);
+    <b>let</b> active_validators = &<b>mut</b> validator_set.active_validators;
+    <b>let</b> pending_inactive = &<b>mut</b> validator_set.pending_inactive;
+    <b>spec</b> {
+        <b>update</b> <a href="stake.md#0x1_stake_ghost_active_num">ghost_active_num</a> = len(active_validators);
+        <b>update</b> <a href="stake.md#0x1_stake_ghost_pending_inactive_num">ghost_pending_inactive_num</a> = len(pending_inactive);
+    };
+    <b>let</b> len_validators = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(validators);
+    <b>let</b> i = 0;
+    // Remove each validator from the validator set.
+    <b>while</b> ({
+        <b>spec</b> {
+            <b>invariant</b> i &lt;= len_validators;
+            <b>invariant</b> <a href="stake.md#0x1_stake_spec_validators_are_initialized">spec_validators_are_initialized</a>(active_validators);
+            <b>invariant</b> <a href="stake.md#0x1_stake_spec_validator_indices_are_valid">spec_validator_indices_are_valid</a>(active_validators);
+            <b>invariant</b> <a href="stake.md#0x1_stake_spec_validators_are_initialized">spec_validators_are_initialized</a>(pending_inactive);
+            <b>invariant</b> <a href="stake.md#0x1_stake_spec_validator_indices_are_valid">spec_validator_indices_are_valid</a>(pending_inactive);
+            <b>invariant</b> <a href="stake.md#0x1_stake_ghost_active_num">ghost_active_num</a> + <a href="stake.md#0x1_stake_ghost_pending_inactive_num">ghost_pending_inactive_num</a> == len(active_validators) + len(pending_inactive);
+        };
+        i &lt; len_validators
+    }) {
+        <b>let</b> validator = *<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(validators, i);
+        <b>let</b> validator_index = <a href="stake.md#0x1_stake_find_validator">find_validator</a>(active_validators, validator);
+        <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&validator_index)) {
+            <b>let</b> validator_info = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_swap_remove">vector::swap_remove</a>(active_validators, *<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(&validator_index));
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_push_back">vector::push_back</a>(pending_inactive, validator_info);
+            <b>spec</b> {
+                <b>update</b> <a href="stake.md#0x1_stake_ghost_active_num">ghost_active_num</a> = <a href="stake.md#0x1_stake_ghost_active_num">ghost_active_num</a> - 1;
+                <b>update</b> <a href="stake.md#0x1_stake_ghost_pending_inactive_num">ghost_pending_inactive_num</a> = <a href="stake.md#0x1_stake_ghost_pending_inactive_num">ghost_pending_inactive_num</a> + 1;
+            };
+        };
+        i = i + 1;
+    };
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_stake_initialize_stake_owner"></a>
+
+## Function `initialize_stake_owner`
+
+Initialize the validator account and give ownership to the signing account
+except it leaves the ValidatorConfig to be set by another entity.
+Note: this triggers setting the operator and owner, set it to the account's address
+to set later.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="stake.md#0x1_stake_initialize_stake_owner">initialize_stake_owner</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, initial_stake_amount: u64, operator: <b>address</b>, voter: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="stake.md#0x1_stake_initialize_stake_owner">initialize_stake_owner</a>(
+    owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    initial_stake_amount: u64,
+    operator: <b>address</b>,
+    voter: <b>address</b>,
+) <b>acquires</b> <a href="stake.md#0x1_stake_AllowedValidators">AllowedValidators</a>, <a href="stake.md#0x1_stake_OwnerCapability">OwnerCapability</a>, <a href="stake.md#0x1_stake_StakePool">StakePool</a>, <a href="stake.md#0x1_stake_ValidatorSet">ValidatorSet</a> {
+    <a href="stake.md#0x1_stake_initialize_owner">initialize_owner</a>(owner);
+    <b>move_to</b>(owner, <a href="stake.md#0x1_stake_ValidatorConfig">ValidatorConfig</a> {
+        consensus_pubkey: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_empty">vector::empty</a>(),
+        network_addresses: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_empty">vector::empty</a>(),
+        fullnode_addresses: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_empty">vector::empty</a>(),
+        validator_index: 0,
+    });
+
+    <b>if</b> (initial_stake_amount &gt; 0) {
+        <a href="stake.md#0x1_stake_add_stake">add_stake</a>(owner, initial_stake_amount);
+    };
+
+    <b>let</b> account_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(owner);
+    <b>if</b> (account_address != operator) {
+        <a href="stake.md#0x1_stake_set_operator">set_operator</a>(owner, operator)
+    };
+    <b>if</b> (account_address != voter) {
+        <a href="stake.md#0x1_stake_set_delegated_voter">set_delegated_voter</a>(owner, voter)
+    };
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_stake_initialize_validator"></a>
+
+## Function `initialize_validator`
+
+Initialize the validator account and give ownership to the signing account.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="stake.md#0x1_stake_initialize_validator">initialize_validator</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, consensus_pubkey: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, proof_of_possession: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, network_addresses: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, fullnode_addresses: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="stake.md#0x1_stake_initialize_validator">initialize_validator</a>(
+    <a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    consensus_pubkey: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    proof_of_possession: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    network_addresses: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    fullnode_addresses: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+) <b>acquires</b> <a href="stake.md#0x1_stake_AllowedValidators">AllowedValidators</a> {
+    // Checks the <b>public</b> key <b>has</b> a valid proof-of-possession <b>to</b> prevent rogue-key attacks.
+    <b>let</b> pubkey_from_pop = &<b>mut</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/bls12381.md#0x1_bls12381_public_key_from_bytes_with_pop">bls12381::public_key_from_bytes_with_pop</a>(
+        consensus_pubkey,
+        &proof_of_possession_from_bytes(proof_of_possession)
+    );
+    <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(pubkey_from_pop), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="stake.md#0x1_stake_EINVALID_PUBLIC_KEY">EINVALID_PUBLIC_KEY</a>));
+
+    <a href="stake.md#0x1_stake_initialize_owner">initialize_owner</a>(<a href="account.md#0x1_account">account</a>);
+    <b>move_to</b>(<a href="account.md#0x1_account">account</a>, <a href="stake.md#0x1_stake_ValidatorConfig">ValidatorConfig</a> {
+        consensus_pubkey,
+        network_addresses,
+        fullnode_addresses,
+        validator_index: 0,
+    });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_stake_initialize_owner"></a>
+
+## Function `initialize_owner`
+
+
+
+<pre><code><b>fun</b> <a href="stake.md#0x1_stake_initialize_owner">initialize_owner</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="stake.md#0x1_stake_initialize_owner">initialize_owner</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>) <b>acquires</b> <a href="stake.md#0x1_stake_AllowedValidators">AllowedValidators</a> {
+    <b>let</b> owner_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(owner);
+    <b>assert</b>!(<a href="stake.md#0x1_stake_is_allowed">is_allowed</a>(owner_address), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="stake.md#0x1_stake_EINELIGIBLE_VALIDATOR">EINELIGIBLE_VALIDATOR</a>));
+    <b>assert</b>!(!<a href="stake.md#0x1_stake_stake_pool_exists">stake_pool_exists</a>(owner_address), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_already_exists">error::already_exists</a>(<a href="stake.md#0x1_stake_EALREADY_REGISTERED">EALREADY_REGISTERED</a>));
+
+    <b>move_to</b>(owner, <a href="stake.md#0x1_stake_StakePool">StakePool</a> {
+        active: <a href="coin.md#0x1_coin_zero">coin::zero</a>&lt;AptosCoin&gt;(),
+        pending_active: <a href="coin.md#0x1_coin_zero">coin::zero</a>&lt;AptosCoin&gt;(),
+        pending_inactive: <a href="coin.md#0x1_coin_zero">coin::zero</a>&lt;AptosCoin&gt;(),
+        inactive: <a href="coin.md#0x1_coin_zero">coin::zero</a>&lt;AptosCoin&gt;(),
+        locked_until_secs: 0,
+        operator_address: owner_address,
+        delegated_voter: owner_address,
+        // Events.
+        initialize_validator_events: <a href="account.md#0x1_account_new_event_handle">account::new_event_handle</a>&lt;<a href="stake.md#0x1_stake_RegisterValidatorCandidateEvent">RegisterValidatorCandidateEvent</a>&gt;(owner),
+        set_operator_events: <a href="account.md#0x1_account_new_event_handle">account::new_event_handle</a>&lt;<a href="stake.md#0x1_stake_SetOperatorEvent">SetOperatorEvent</a>&gt;(owner),
+        add_stake_events: <a href="account.md#0x1_account_new_event_handle">account::new_event_handle</a>&lt;<a href="stake.md#0x1_stake_AddStakeEvent">AddStakeEvent</a>&gt;(owner),
+        reactivate_stake_events: <a href="account.md#0x1_account_new_event_handle">account::new_event_handle</a>&lt;<a href="stake.md#0x1_stake_ReactivateStakeEvent">ReactivateStakeEvent</a>&gt;(owner),
+        rotate_consensus_key_events: <a href="account.md#0x1_account_new_event_handle">account::new_event_handle</a>&lt;<a href="stake.md#0x1_stake_RotateConsensusKeyEvent">RotateConsensusKeyEvent</a>&gt;(owner),
+        update_network_and_fullnode_addresses_events: <a href="account.md#0x1_account_new_event_handle">account::new_event_handle</a>&lt;<a href="stake.md#0x1_stake_UpdateNetworkAndFullnodeAddressesEvent">UpdateNetworkAndFullnodeAddressesEvent</a>&gt;(
+            owner
+        ),
+        increase_lockup_events: <a href="account.md#0x1_account_new_event_handle">account::new_event_handle</a>&lt;<a href="stake.md#0x1_stake_IncreaseLockupEvent">IncreaseLockupEvent</a>&gt;(owner),
+        join_validator_set_events: <a href="account.md#0x1_account_new_event_handle">account::new_event_handle</a>&lt;<a href="stake.md#0x1_stake_JoinValidatorSetEvent">JoinValidatorSetEvent</a>&gt;(owner),
+        distribute_rewards_events: <a href="account.md#0x1_account_new_event_handle">account::new_event_handle</a>&lt;<a href="stake.md#0x1_stake_DistributeRewardsEvent">DistributeRewardsEvent</a>&gt;(owner),
+        unlock_stake_events: <a href="account.md#0x1_account_new_event_handle">account::new_event_handle</a>&lt;<a href="stake.md#0x1_stake_UnlockStakeEvent">UnlockStakeEvent</a>&gt;(owner),
+        withdraw_stake_events: <a href="account.md#0x1_account_new_event_handle">account::new_event_handle</a>&lt;<a href="stake.md#0x1_stake_WithdrawStakeEvent">WithdrawStakeEvent</a>&gt;(owner),
+        leave_validator_set_events: <a href="account.md#0x1_account_new_event_handle">account::new_event_handle</a>&lt;<a href="stake.md#0x1_stake_LeaveValidatorSetEvent">LeaveValidatorSetEvent</a>&gt;(owner),
+    });
+
+    <b>move_to</b>(owner, <a href="stake.md#0x1_stake_OwnerCapability">OwnerCapability</a> { pool_address: owner_address });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_stake_extract_owner_cap"></a>
+
+## Function `extract_owner_cap`
+
+Extract and return owner capability from the signing account.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_extract_owner_cap">extract_owner_cap</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>): <a href="stake.md#0x1_stake_OwnerCapability">stake::OwnerCapability</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_extract_owner_cap">extract_owner_cap</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>): <a href="stake.md#0x1_stake_OwnerCapability">OwnerCapability</a> <b>acquires</b> <a href="stake.md#0x1_stake_OwnerCapability">OwnerCapability</a> {
+    <b>let</b> owner_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(owner);
+    <a href="stake.md#0x1_stake_assert_owner_cap_exists">assert_owner_cap_exists</a>(owner_address);
+    <b>move_from</b>&lt;<a href="stake.md#0x1_stake_OwnerCapability">OwnerCapability</a>&gt;(owner_address)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_stake_deposit_owner_cap"></a>
+
+## Function `deposit_owner_cap`
+
+Deposit <code>owner_cap</code> into <code><a href="account.md#0x1_account">account</a></code>. This requires <code><a href="account.md#0x1_account">account</a></code> to not already have ownership of another
+staking pool.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_deposit_owner_cap">deposit_owner_cap</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, owner_cap: <a href="stake.md#0x1_stake_OwnerCapability">stake::OwnerCapability</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_deposit_owner_cap">deposit_owner_cap</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, owner_cap: <a href="stake.md#0x1_stake_OwnerCapability">OwnerCapability</a>) {
+    <b>assert</b>!(!<b>exists</b>&lt;<a href="stake.md#0x1_stake_OwnerCapability">OwnerCapability</a>&gt;(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(owner)), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="stake.md#0x1_stake_EOWNER_CAP_ALREADY_EXISTS">EOWNER_CAP_ALREADY_EXISTS</a>));
+    <b>move_to</b>(owner, owner_cap);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_stake_destroy_owner_cap"></a>
+
+## Function `destroy_owner_cap`
+
+Destroy <code>owner_cap</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_destroy_owner_cap">destroy_owner_cap</a>(owner_cap: <a href="stake.md#0x1_stake_OwnerCapability">stake::OwnerCapability</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_destroy_owner_cap">destroy_owner_cap</a>(owner_cap: <a href="stake.md#0x1_stake_OwnerCapability">OwnerCapability</a>) {
+    <b>let</b> <a href="stake.md#0x1_stake_OwnerCapability">OwnerCapability</a> { pool_address: _ } = owner_cap;
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_stake_set_operator"></a>
+
+## Function `set_operator`
+
+Allows an owner to change the operator of the stake pool.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="stake.md#0x1_stake_set_operator">set_operator</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, new_operator: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="stake.md#0x1_stake_set_operator">set_operator</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, new_operator: <b>address</b>) <b>acquires</b> <a href="stake.md#0x1_stake_OwnerCapability">OwnerCapability</a>, <a href="stake.md#0x1_stake_StakePool">StakePool</a> {
+    <b>let</b> owner_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(owner);
+    <a href="stake.md#0x1_stake_assert_owner_cap_exists">assert_owner_cap_exists</a>(owner_address);
+    <b>let</b> ownership_cap = <b>borrow_global</b>&lt;<a href="stake.md#0x1_stake_OwnerCapability">OwnerCapability</a>&gt;(owner_address);
+    <a href="stake.md#0x1_stake_set_operator_with_cap">set_operator_with_cap</a>(ownership_cap, new_operator);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_stake_set_operator_with_cap"></a>
+
+## Function `set_operator_with_cap`
+
+Allows an account with ownership capability to change the operator of the stake pool.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_set_operator_with_cap">set_operator_with_cap</a>(owner_cap: &<a href="stake.md#0x1_stake_OwnerCapability">stake::OwnerCapability</a>, new_operator: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_set_operator_with_cap">set_operator_with_cap</a>(owner_cap: &<a href="stake.md#0x1_stake_OwnerCapability">OwnerCapability</a>, new_operator: <b>address</b>) <b>acquires</b> <a href="stake.md#0x1_stake_StakePool">StakePool</a> {
+    <b>let</b> pool_address = owner_cap.pool_address;
+    <a href="stake.md#0x1_stake_assert_stake_pool_exists">assert_stake_pool_exists</a>(pool_address);
+    <b>let</b> stake_pool = <b>borrow_global_mut</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(pool_address);
+    <b>let</b> old_operator = stake_pool.operator_address;
+    stake_pool.operator_address = new_operator;
+
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        <a href="event.md#0x1_event_emit">event::emit</a>(
+            <a href="stake.md#0x1_stake_SetOperator">SetOperator</a> {
+                pool_address,
+                old_operator,
+                new_operator,
+            },
+        );
+    };
+
+    <a href="event.md#0x1_event_emit_event">event::emit_event</a>(
+        &<b>mut</b> stake_pool.set_operator_events,
+        <a href="stake.md#0x1_stake_SetOperatorEvent">SetOperatorEvent</a> {
+            pool_address,
+            old_operator,
+            new_operator,
+        },
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_stake_set_delegated_voter"></a>
+
+## Function `set_delegated_voter`
+
+Allows an owner to change the delegated voter of the stake pool.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="stake.md#0x1_stake_set_delegated_voter">set_delegated_voter</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, new_voter: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="stake.md#0x1_stake_set_delegated_voter">set_delegated_voter</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, new_voter: <b>address</b>) <b>acquires</b> <a href="stake.md#0x1_stake_OwnerCapability">OwnerCapability</a>, <a href="stake.md#0x1_stake_StakePool">StakePool</a> {
+    <b>let</b> owner_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(owner);
+    <a href="stake.md#0x1_stake_assert_owner_cap_exists">assert_owner_cap_exists</a>(owner_address);
+    <b>let</b> ownership_cap = <b>borrow_global</b>&lt;<a href="stake.md#0x1_stake_OwnerCapability">OwnerCapability</a>&gt;(owner_address);
+    <a href="stake.md#0x1_stake_set_delegated_voter_with_cap">set_delegated_voter_with_cap</a>(ownership_cap, new_voter);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_stake_set_delegated_voter_with_cap"></a>
+
+## Function `set_delegated_voter_with_cap`
+
+Allows an owner to change the delegated voter of the stake pool.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_set_delegated_voter_with_cap">set_delegated_voter_with_cap</a>(owner_cap: &<a href="stake.md#0x1_stake_OwnerCapability">stake::OwnerCapability</a>, new_voter: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_set_delegated_voter_with_cap">set_delegated_voter_with_cap</a>(owner_cap: &<a href="stake.md#0x1_stake_OwnerCapability">OwnerCapability</a>, new_voter: <b>address</b>) <b>acquires</b> <a href="stake.md#0x1_stake_StakePool">StakePool</a> {
+    <b>let</b> pool_address = owner_cap.pool_address;
+    <a href="stake.md#0x1_stake_assert_stake_pool_exists">assert_stake_pool_exists</a>(pool_address);
+    <b>let</b> stake_pool = <b>borrow_global_mut</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(pool_address);
+    stake_pool.delegated_voter = new_voter;
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_stake_add_stake"></a>
+
+## Function `add_stake`
+
+Add <code>amount</code> of coins from the <code><a href="account.md#0x1_account">account</a></code> owning the StakePool.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="stake.md#0x1_stake_add_stake">add_stake</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, amount: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="stake.md#0x1_stake_add_stake">add_stake</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, amount: u64) <b>acquires</b> <a href="stake.md#0x1_stake_OwnerCapability">OwnerCapability</a>, <a href="stake.md#0x1_stake_StakePool">StakePool</a>, <a href="stake.md#0x1_stake_ValidatorSet">ValidatorSet</a> {
+    <b>let</b> owner_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(owner);
+    <a href="stake.md#0x1_stake_assert_owner_cap_exists">assert_owner_cap_exists</a>(owner_address);
+    <b>let</b> ownership_cap = <b>borrow_global</b>&lt;<a href="stake.md#0x1_stake_OwnerCapability">OwnerCapability</a>&gt;(owner_address);
+    <a href="stake.md#0x1_stake_add_stake_with_cap">add_stake_with_cap</a>(ownership_cap, <a href="coin.md#0x1_coin_withdraw">coin::withdraw</a>&lt;AptosCoin&gt;(owner, amount));
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_stake_add_stake_with_cap"></a>
+
+## Function `add_stake_with_cap`
+
+Add <code>coins</code> into <code>pool_address</code>. this requires the corresponding <code>owner_cap</code> to be passed in.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_add_stake_with_cap">add_stake_with_cap</a>(owner_cap: &<a href="stake.md#0x1_stake_OwnerCapability">stake::OwnerCapability</a>, coins: <a href="coin.md#0x1_coin_Coin">coin::Coin</a>&lt;<a href="aptos_coin.md#0x1_aptos_coin_AptosCoin">aptos_coin::AptosCoin</a>&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_add_stake_with_cap">add_stake_with_cap</a>(owner_cap: &<a href="stake.md#0x1_stake_OwnerCapability">OwnerCapability</a>, coins: Coin&lt;AptosCoin&gt;) <b>acquires</b> <a href="stake.md#0x1_stake_StakePool">StakePool</a>, <a href="stake.md#0x1_stake_ValidatorSet">ValidatorSet</a> {
+    <a href="stake.md#0x1_stake_assert_reconfig_not_in_progress">assert_reconfig_not_in_progress</a>();
+    <b>let</b> pool_address = owner_cap.pool_address;
+    <a href="stake.md#0x1_stake_assert_stake_pool_exists">assert_stake_pool_exists</a>(pool_address);
+
+    <b>let</b> amount = <a href="coin.md#0x1_coin_value">coin::value</a>(&coins);
+    <b>if</b> (amount == 0) {
+        <a href="coin.md#0x1_coin_destroy_zero">coin::destroy_zero</a>(coins);
+        <b>return</b>
+    };
+
+    // Only track and validate <a href="voting.md#0x1_voting">voting</a> power increase for active and pending_active validator.
+    // Pending_inactive validator will be removed from the validator set in the next epoch.
+    // Inactive validator's total <a href="stake.md#0x1_stake">stake</a> will be tracked when they join the validator set.
+    <b>let</b> validator_set = <b>borrow_global_mut</b>&lt;<a href="stake.md#0x1_stake_ValidatorSet">ValidatorSet</a>&gt;(@aptos_framework);
+    // Search directly rather using get_validator_state <b>to</b> save on unnecessary loops.
+    <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&<a href="stake.md#0x1_stake_find_validator">find_validator</a>(&validator_set.active_validators, pool_address)) ||
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&<a href="stake.md#0x1_stake_find_validator">find_validator</a>(&validator_set.pending_active, pool_address))) {
+        <a href="stake.md#0x1_stake_update_voting_power_increase">update_voting_power_increase</a>(amount);
+    };
+
+    // Add <b>to</b> pending_active <b>if</b> it's a current validator because the <a href="stake.md#0x1_stake">stake</a> is not counted until the next epoch.
+    // Otherwise, the delegation can be added <b>to</b> active directly <b>as</b> the validator is also activated in the epoch.
+    <b>let</b> stake_pool = <b>borrow_global_mut</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(pool_address);
+    <b>if</b> (<a href="stake.md#0x1_stake_is_current_epoch_validator">is_current_epoch_validator</a>(pool_address)) {
+        <a href="coin.md#0x1_coin_merge">coin::merge</a>&lt;AptosCoin&gt;(&<b>mut</b> stake_pool.pending_active, coins);
+    } <b>else</b> {
+        <a href="coin.md#0x1_coin_merge">coin::merge</a>&lt;AptosCoin&gt;(&<b>mut</b> stake_pool.active, coins);
+    };
+
+    <b>let</b> (_, maximum_stake) = <a href="staking_config.md#0x1_staking_config_get_required_stake">staking_config::get_required_stake</a>(&<a href="staking_config.md#0x1_staking_config_get">staking_config::get</a>());
+    <b>let</b> voting_power = <a href="stake.md#0x1_stake_get_next_epoch_voting_power">get_next_epoch_voting_power</a>(stake_pool);
+    <b>assert</b>!(voting_power &lt;= maximum_stake, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="stake.md#0x1_stake_ESTAKE_EXCEEDS_MAX">ESTAKE_EXCEEDS_MAX</a>));
+
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        <a href="event.md#0x1_event_emit">event::emit</a>(
+            <a href="stake.md#0x1_stake_AddStake">AddStake</a> {
+                pool_address,
+                amount_added: amount,
+            },
+        );
+    };
+    <a href="event.md#0x1_event_emit_event">event::emit_event</a>(
+        &<b>mut</b> stake_pool.add_stake_events,
+        <a href="stake.md#0x1_stake_AddStakeEvent">AddStakeEvent</a> {
+            pool_address,
+            amount_added: amount,
+        },
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_stake_reactivate_stake"></a>
+
+## Function `reactivate_stake`
+
+Move <code>amount</code> of coins from pending_inactive to active.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="stake.md#0x1_stake_reactivate_stake">reactivate_stake</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, amount: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="stake.md#0x1_stake_reactivate_stake">reactivate_stake</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, amount: u64) <b>acquires</b> <a href="stake.md#0x1_stake_OwnerCapability">OwnerCapability</a>, <a href="stake.md#0x1_stake_StakePool">StakePool</a> {
+    <a href="stake.md#0x1_stake_assert_reconfig_not_in_progress">assert_reconfig_not_in_progress</a>();
+    <b>let</b> owner_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(owner);
+    <a href="stake.md#0x1_stake_assert_owner_cap_exists">assert_owner_cap_exists</a>(owner_address);
+    <b>let</b> ownership_cap = <b>borrow_global</b>&lt;<a href="stake.md#0x1_stake_OwnerCapability">OwnerCapability</a>&gt;(owner_address);
+    <a href="stake.md#0x1_stake_reactivate_stake_with_cap">reactivate_stake_with_cap</a>(ownership_cap, amount);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_stake_reactivate_stake_with_cap"></a>
+
+## Function `reactivate_stake_with_cap`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_reactivate_stake_with_cap">reactivate_stake_with_cap</a>(owner_cap: &<a href="stake.md#0x1_stake_OwnerCapability">stake::OwnerCapability</a>, amount: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_reactivate_stake_with_cap">reactivate_stake_with_cap</a>(owner_cap: &<a href="stake.md#0x1_stake_OwnerCapability">OwnerCapability</a>, amount: u64) <b>acquires</b> <a href="stake.md#0x1_stake_StakePool">StakePool</a> {
+    <a href="stake.md#0x1_stake_assert_reconfig_not_in_progress">assert_reconfig_not_in_progress</a>();
+    <b>let</b> pool_address = owner_cap.pool_address;
+    <a href="stake.md#0x1_stake_assert_stake_pool_exists">assert_stake_pool_exists</a>(pool_address);
+
+    // Cap the amount <b>to</b> reactivate by the amount in pending_inactive.
+    <b>let</b> stake_pool = <b>borrow_global_mut</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(pool_address);
+    <b>let</b> total_pending_inactive = <a href="coin.md#0x1_coin_value">coin::value</a>(&stake_pool.pending_inactive);
+    amount = <b>min</b>(amount, total_pending_inactive);
+
+    // Since this does not count <b>as</b> a <a href="voting.md#0x1_voting">voting</a> power change (pending inactive still counts <b>as</b> <a href="voting.md#0x1_voting">voting</a> power in the
+    // current epoch), <a href="stake.md#0x1_stake">stake</a> can be immediately moved from pending inactive <b>to</b> active.
+    // We also don't need <b>to</b> check <a href="voting.md#0x1_voting">voting</a> power increase <b>as</b> there's none.
+    <b>let</b> reactivated_coins = <a href="coin.md#0x1_coin_extract">coin::extract</a>(&<b>mut</b> stake_pool.pending_inactive, amount);
+    <a href="coin.md#0x1_coin_merge">coin::merge</a>(&<b>mut</b> stake_pool.active, reactivated_coins);
+
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        <a href="event.md#0x1_event_emit">event::emit</a>(
+            <a href="stake.md#0x1_stake_ReactivateStake">ReactivateStake</a> {
+                pool_address,
+                amount,
+            },
+        );
+    };
+    <a href="event.md#0x1_event_emit_event">event::emit_event</a>(
+        &<b>mut</b> stake_pool.reactivate_stake_events,
+        <a href="stake.md#0x1_stake_ReactivateStakeEvent">ReactivateStakeEvent</a> {
+            pool_address,
+            amount,
+        },
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_stake_rotate_consensus_key"></a>
+
+## Function `rotate_consensus_key`
+
+Rotate the consensus key of the validator, it'll take effect in next epoch.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="stake.md#0x1_stake_rotate_consensus_key">rotate_consensus_key</a>(operator: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, pool_address: <b>address</b>, new_consensus_pubkey: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, proof_of_possession: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="stake.md#0x1_stake_rotate_consensus_key">rotate_consensus_key</a>(
+    operator: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    pool_address: <b>address</b>,
+    new_consensus_pubkey: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    proof_of_possession: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+) <b>acquires</b> <a href="stake.md#0x1_stake_StakePool">StakePool</a>, <a href="stake.md#0x1_stake_ValidatorConfig">ValidatorConfig</a> {
+    <a href="stake.md#0x1_stake_assert_reconfig_not_in_progress">assert_reconfig_not_in_progress</a>();
+    <a href="stake.md#0x1_stake_assert_stake_pool_exists">assert_stake_pool_exists</a>(pool_address);
+
+    <b>let</b> stake_pool = <b>borrow_global_mut</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(pool_address);
+    <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(operator) == stake_pool.operator_address, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_unauthenticated">error::unauthenticated</a>(<a href="stake.md#0x1_stake_ENOT_OPERATOR">ENOT_OPERATOR</a>));
+
+    <b>assert</b>!(<b>exists</b>&lt;<a href="stake.md#0x1_stake_ValidatorConfig">ValidatorConfig</a>&gt;(pool_address), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="stake.md#0x1_stake_EVALIDATOR_CONFIG">EVALIDATOR_CONFIG</a>));
+    <b>let</b> validator_info = <b>borrow_global_mut</b>&lt;<a href="stake.md#0x1_stake_ValidatorConfig">ValidatorConfig</a>&gt;(pool_address);
+    <b>let</b> old_consensus_pubkey = validator_info.consensus_pubkey;
+    // Checks the <b>public</b> key <b>has</b> a valid proof-of-possession <b>to</b> prevent rogue-key attacks.
+    <b>let</b> pubkey_from_pop = &<b>mut</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/bls12381.md#0x1_bls12381_public_key_from_bytes_with_pop">bls12381::public_key_from_bytes_with_pop</a>(
+        new_consensus_pubkey,
+        &proof_of_possession_from_bytes(proof_of_possession)
+    );
+    <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(pubkey_from_pop), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="stake.md#0x1_stake_EINVALID_PUBLIC_KEY">EINVALID_PUBLIC_KEY</a>));
+    validator_info.consensus_pubkey = new_consensus_pubkey;
+
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        <a href="event.md#0x1_event_emit">event::emit</a>(
+            <a href="stake.md#0x1_stake_RotateConsensusKey">RotateConsensusKey</a> {
+                pool_address,
+                old_consensus_pubkey,
+                new_consensus_pubkey,
+            },
+        );
+    };
+    <a href="event.md#0x1_event_emit_event">event::emit_event</a>(
+        &<b>mut</b> stake_pool.rotate_consensus_key_events,
+        <a href="stake.md#0x1_stake_RotateConsensusKeyEvent">RotateConsensusKeyEvent</a> {
+            pool_address,
+            old_consensus_pubkey,
+            new_consensus_pubkey,
+        },
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_stake_update_network_and_fullnode_addresses"></a>
+
+## Function `update_network_and_fullnode_addresses`
+
+Update the network and full node addresses of the validator. This only takes effect in the next epoch.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="stake.md#0x1_stake_update_network_and_fullnode_addresses">update_network_and_fullnode_addresses</a>(operator: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, pool_address: <b>address</b>, new_network_addresses: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, new_fullnode_addresses: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="stake.md#0x1_stake_update_network_and_fullnode_addresses">update_network_and_fullnode_addresses</a>(
+    operator: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    pool_address: <b>address</b>,
+    new_network_addresses: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    new_fullnode_addresses: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+) <b>acquires</b> <a href="stake.md#0x1_stake_StakePool">StakePool</a>, <a href="stake.md#0x1_stake_ValidatorConfig">ValidatorConfig</a> {
+    <a href="stake.md#0x1_stake_assert_reconfig_not_in_progress">assert_reconfig_not_in_progress</a>();
+    <a href="stake.md#0x1_stake_assert_stake_pool_exists">assert_stake_pool_exists</a>(pool_address);
+    <b>let</b> stake_pool = <b>borrow_global_mut</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(pool_address);
+    <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(operator) == stake_pool.operator_address, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_unauthenticated">error::unauthenticated</a>(<a href="stake.md#0x1_stake_ENOT_OPERATOR">ENOT_OPERATOR</a>));
+    <b>assert</b>!(<b>exists</b>&lt;<a href="stake.md#0x1_stake_ValidatorConfig">ValidatorConfig</a>&gt;(pool_address), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="stake.md#0x1_stake_EVALIDATOR_CONFIG">EVALIDATOR_CONFIG</a>));
+    <b>let</b> validator_info = <b>borrow_global_mut</b>&lt;<a href="stake.md#0x1_stake_ValidatorConfig">ValidatorConfig</a>&gt;(pool_address);
+    <b>let</b> old_network_addresses = validator_info.network_addresses;
+    validator_info.network_addresses = new_network_addresses;
+    <b>let</b> old_fullnode_addresses = validator_info.fullnode_addresses;
+    validator_info.fullnode_addresses = new_fullnode_addresses;
+
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        <a href="event.md#0x1_event_emit">event::emit</a>(
+            <a href="stake.md#0x1_stake_UpdateNetworkAndFullnodeAddresses">UpdateNetworkAndFullnodeAddresses</a> {
+                pool_address,
+                old_network_addresses,
+                new_network_addresses,
+                old_fullnode_addresses,
+                new_fullnode_addresses,
+            },
+        );
+    };
+    <a href="event.md#0x1_event_emit_event">event::emit_event</a>(
+        &<b>mut</b> stake_pool.update_network_and_fullnode_addresses_events,
+        <a href="stake.md#0x1_stake_UpdateNetworkAndFullnodeAddressesEvent">UpdateNetworkAndFullnodeAddressesEvent</a> {
+            pool_address,
+            old_network_addresses,
+            new_network_addresses,
+            old_fullnode_addresses,
+            new_fullnode_addresses,
+        },
+    );
+
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_stake_increase_lockup"></a>
+
+## Function `increase_lockup`
+
+Similar to increase_lockup_with_cap but will use ownership capability from the signing account.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="stake.md#0x1_stake_increase_lockup">increase_lockup</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="stake.md#0x1_stake_increase_lockup">increase_lockup</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>) <b>acquires</b> <a href="stake.md#0x1_stake_OwnerCapability">OwnerCapability</a>, <a href="stake.md#0x1_stake_StakePool">StakePool</a> {
+    <b>let</b> owner_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(owner);
+    <a href="stake.md#0x1_stake_assert_owner_cap_exists">assert_owner_cap_exists</a>(owner_address);
+    <b>let</b> ownership_cap = <b>borrow_global</b>&lt;<a href="stake.md#0x1_stake_OwnerCapability">OwnerCapability</a>&gt;(owner_address);
+    <a href="stake.md#0x1_stake_increase_lockup_with_cap">increase_lockup_with_cap</a>(ownership_cap);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_stake_increase_lockup_with_cap"></a>
+
+## Function `increase_lockup_with_cap`
+
+Unlock from active delegation, it's moved to pending_inactive if locked_until_secs < current_time or
+directly inactive if it's not from an active validator.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_increase_lockup_with_cap">increase_lockup_with_cap</a>(owner_cap: &<a href="stake.md#0x1_stake_OwnerCapability">stake::OwnerCapability</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_increase_lockup_with_cap">increase_lockup_with_cap</a>(owner_cap: &<a href="stake.md#0x1_stake_OwnerCapability">OwnerCapability</a>) <b>acquires</b> <a href="stake.md#0x1_stake_StakePool">StakePool</a> {
+    <b>let</b> pool_address = owner_cap.pool_address;
+    <a href="stake.md#0x1_stake_assert_stake_pool_exists">assert_stake_pool_exists</a>(pool_address);
+    <b>let</b> config = <a href="staking_config.md#0x1_staking_config_get">staking_config::get</a>();
+
+    <b>let</b> stake_pool = <b>borrow_global_mut</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(pool_address);
+    <b>let</b> old_locked_until_secs = stake_pool.locked_until_secs;
+    <b>let</b> new_locked_until_secs = <a href="timestamp.md#0x1_timestamp_now_seconds">timestamp::now_seconds</a>() + <a href="staking_config.md#0x1_staking_config_get_recurring_lockup_duration">staking_config::get_recurring_lockup_duration</a>(&config);
+    <b>assert</b>!(old_locked_until_secs &lt; new_locked_until_secs, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="stake.md#0x1_stake_EINVALID_LOCKUP">EINVALID_LOCKUP</a>));
+    stake_pool.locked_until_secs = new_locked_until_secs;
+
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        <a href="event.md#0x1_event_emit">event::emit</a>(
+            <a href="stake.md#0x1_stake_IncreaseLockup">IncreaseLockup</a> {
+                pool_address,
+                old_locked_until_secs,
+                new_locked_until_secs,
+            },
+        );
+    };
+    <a href="event.md#0x1_event_emit_event">event::emit_event</a>(
+        &<b>mut</b> stake_pool.increase_lockup_events,
+        <a href="stake.md#0x1_stake_IncreaseLockupEvent">IncreaseLockupEvent</a> {
+            pool_address,
+            old_locked_until_secs,
+            new_locked_until_secs,
+        },
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_stake_join_validator_set"></a>
+
+## Function `join_validator_set`
+
+This can only called by the operator of the validator/staking pool.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="stake.md#0x1_stake_join_validator_set">join_validator_set</a>(operator: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, pool_address: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="stake.md#0x1_stake_join_validator_set">join_validator_set</a>(
+    operator: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    pool_address: <b>address</b>
+) <b>acquires</b> <a href="stake.md#0x1_stake_StakePool">StakePool</a>, <a href="stake.md#0x1_stake_ValidatorConfig">ValidatorConfig</a>, <a href="stake.md#0x1_stake_ValidatorSet">ValidatorSet</a> {
+    <b>assert</b>!(
+        <a href="staking_config.md#0x1_staking_config_get_allow_validator_set_change">staking_config::get_allow_validator_set_change</a>(&<a href="staking_config.md#0x1_staking_config_get">staking_config::get</a>()),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="stake.md#0x1_stake_ENO_POST_GENESIS_VALIDATOR_SET_CHANGE_ALLOWED">ENO_POST_GENESIS_VALIDATOR_SET_CHANGE_ALLOWED</a>),
+    );
+
+    <a href="stake.md#0x1_stake_join_validator_set_internal">join_validator_set_internal</a>(operator, pool_address);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_stake_join_validator_set_internal"></a>
+
+## Function `join_validator_set_internal`
+
+Request to have <code>pool_address</code> join the validator set. Can only be called after calling <code>initialize_validator</code>.
+If the validator has the required stake (more than minimum and less than maximum allowed), they will be
+added to the pending_active queue. All validators in this queue will be added to the active set when the next
+epoch starts (eligibility will be rechecked).
+
+This internal version can only be called by the Genesis module during Genesis.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="stake.md#0x1_stake_join_validator_set_internal">join_validator_set_internal</a>(operator: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, pool_address: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="stake.md#0x1_stake_join_validator_set_internal">join_validator_set_internal</a>(
+    operator: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    pool_address: <b>address</b>
+) <b>acquires</b> <a href="stake.md#0x1_stake_StakePool">StakePool</a>, <a href="stake.md#0x1_stake_ValidatorConfig">ValidatorConfig</a>, <a href="stake.md#0x1_stake_ValidatorSet">ValidatorSet</a> {
+    <a href="stake.md#0x1_stake_assert_reconfig_not_in_progress">assert_reconfig_not_in_progress</a>();
+    <a href="stake.md#0x1_stake_assert_stake_pool_exists">assert_stake_pool_exists</a>(pool_address);
+    <b>let</b> stake_pool = <b>borrow_global_mut</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(pool_address);
+    <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(operator) == stake_pool.operator_address, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_unauthenticated">error::unauthenticated</a>(<a href="stake.md#0x1_stake_ENOT_OPERATOR">ENOT_OPERATOR</a>));
+    <b>assert</b>!(
+        <a href="stake.md#0x1_stake_get_validator_state">get_validator_state</a>(pool_address) == <a href="stake.md#0x1_stake_VALIDATOR_STATUS_INACTIVE">VALIDATOR_STATUS_INACTIVE</a>,
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="stake.md#0x1_stake_EALREADY_ACTIVE_VALIDATOR">EALREADY_ACTIVE_VALIDATOR</a>),
+    );
+
+    <b>let</b> config = <a href="staking_config.md#0x1_staking_config_get">staking_config::get</a>();
+    <b>let</b> (minimum_stake, maximum_stake) = <a href="staking_config.md#0x1_staking_config_get_required_stake">staking_config::get_required_stake</a>(&config);
+    <b>let</b> voting_power = <a href="stake.md#0x1_stake_get_next_epoch_voting_power">get_next_epoch_voting_power</a>(stake_pool);
+    <b>assert</b>!(voting_power &gt;= minimum_stake, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="stake.md#0x1_stake_ESTAKE_TOO_LOW">ESTAKE_TOO_LOW</a>));
+    <b>assert</b>!(voting_power &lt;= maximum_stake, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="stake.md#0x1_stake_ESTAKE_TOO_HIGH">ESTAKE_TOO_HIGH</a>));
+
+    // Track and validate <a href="voting.md#0x1_voting">voting</a> power increase.
+    <a href="stake.md#0x1_stake_update_voting_power_increase">update_voting_power_increase</a>(voting_power);
+
+    // Add validator <b>to</b> pending_active, <b>to</b> be activated in the next epoch.
+    <b>let</b> validator_config = <b>borrow_global_mut</b>&lt;<a href="stake.md#0x1_stake_ValidatorConfig">ValidatorConfig</a>&gt;(pool_address);
+    <b>assert</b>!(!<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_is_empty">vector::is_empty</a>(&validator_config.consensus_pubkey), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="stake.md#0x1_stake_EINVALID_PUBLIC_KEY">EINVALID_PUBLIC_KEY</a>));
+
+    // Validate the current validator set size <b>has</b> not exceeded the limit.
+    <b>let</b> validator_set = <b>borrow_global_mut</b>&lt;<a href="stake.md#0x1_stake_ValidatorSet">ValidatorSet</a>&gt;(@aptos_framework);
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_push_back">vector::push_back</a>(
+        &<b>mut</b> validator_set.pending_active,
+        <a href="stake.md#0x1_stake_generate_validator_info">generate_validator_info</a>(pool_address, stake_pool, *validator_config)
+    );
+    <b>let</b> validator_set_size = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&validator_set.active_validators) + <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(
+        &validator_set.pending_active
+    );
+    <b>assert</b>!(validator_set_size &lt;= <a href="stake.md#0x1_stake_MAX_VALIDATOR_SET_SIZE">MAX_VALIDATOR_SET_SIZE</a>, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="stake.md#0x1_stake_EVALIDATOR_SET_TOO_LARGE">EVALIDATOR_SET_TOO_LARGE</a>));
+
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        <a href="event.md#0x1_event_emit">event::emit</a>(<a href="stake.md#0x1_stake_JoinValidatorSet">JoinValidatorSet</a> { pool_address });
+    };
+    <a href="event.md#0x1_event_emit_event">event::emit_event</a>(
+        &<b>mut</b> stake_pool.join_validator_set_events,
+        <a href="stake.md#0x1_stake_JoinValidatorSetEvent">JoinValidatorSetEvent</a> { pool_address },
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_stake_unlock"></a>
+
+## Function `unlock`
+
+Similar to unlock_with_cap but will use ownership capability from the signing account.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="stake.md#0x1_stake_unlock">unlock</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, amount: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="stake.md#0x1_stake_unlock">unlock</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, amount: u64) <b>acquires</b> <a href="stake.md#0x1_stake_OwnerCapability">OwnerCapability</a>, <a href="stake.md#0x1_stake_StakePool">StakePool</a> {
+    <a href="stake.md#0x1_stake_assert_reconfig_not_in_progress">assert_reconfig_not_in_progress</a>();
+    <b>let</b> owner_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(owner);
+    <a href="stake.md#0x1_stake_assert_owner_cap_exists">assert_owner_cap_exists</a>(owner_address);
+    <b>let</b> ownership_cap = <b>borrow_global</b>&lt;<a href="stake.md#0x1_stake_OwnerCapability">OwnerCapability</a>&gt;(owner_address);
+    <a href="stake.md#0x1_stake_unlock_with_cap">unlock_with_cap</a>(amount, ownership_cap);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_stake_unlock_with_cap"></a>
+
+## Function `unlock_with_cap`
+
+Unlock <code>amount</code> from the active stake. Only possible if the lockup has expired.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_unlock_with_cap">unlock_with_cap</a>(amount: u64, owner_cap: &<a href="stake.md#0x1_stake_OwnerCapability">stake::OwnerCapability</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_unlock_with_cap">unlock_with_cap</a>(amount: u64, owner_cap: &<a href="stake.md#0x1_stake_OwnerCapability">OwnerCapability</a>) <b>acquires</b> <a href="stake.md#0x1_stake_StakePool">StakePool</a> {
+    <a href="stake.md#0x1_stake_assert_reconfig_not_in_progress">assert_reconfig_not_in_progress</a>();
+    // Short-circuit <b>if</b> amount <b>to</b> unlock is 0 so we don't emit events.
+    <b>if</b> (amount == 0) {
+        <b>return</b>
+    };
+
+    // Unlocked coins are moved <b>to</b> pending_inactive. When the current lockup cycle expires, they will be moved into
+    // inactive in the earliest possible epoch transition.
+    <b>let</b> pool_address = owner_cap.pool_address;
+    <a href="stake.md#0x1_stake_assert_stake_pool_exists">assert_stake_pool_exists</a>(pool_address);
+    <b>let</b> stake_pool = <b>borrow_global_mut</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(pool_address);
+    // Cap amount <b>to</b> unlock by maximum active <a href="stake.md#0x1_stake">stake</a>.
+    <b>let</b> amount = <b>min</b>(amount, <a href="coin.md#0x1_coin_value">coin::value</a>(&stake_pool.active));
+    <b>let</b> unlocked_stake = <a href="coin.md#0x1_coin_extract">coin::extract</a>(&<b>mut</b> stake_pool.active, amount);
+    <a href="coin.md#0x1_coin_merge">coin::merge</a>&lt;AptosCoin&gt;(&<b>mut</b> stake_pool.pending_inactive, unlocked_stake);
+
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        <a href="event.md#0x1_event_emit">event::emit</a>(
+            <a href="stake.md#0x1_stake_UnlockStake">UnlockStake</a> {
+                pool_address,
+                amount_unlocked: amount,
+            },
+        );
+    };
+    <a href="event.md#0x1_event_emit_event">event::emit_event</a>(
+        &<b>mut</b> stake_pool.unlock_stake_events,
+        <a href="stake.md#0x1_stake_UnlockStakeEvent">UnlockStakeEvent</a> {
+            pool_address,
+            amount_unlocked: amount,
+        },
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_stake_withdraw"></a>
+
+## Function `withdraw`
+
+Withdraw from <code><a href="account.md#0x1_account">account</a></code>'s inactive stake.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="stake.md#0x1_stake_withdraw">withdraw</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, withdraw_amount: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="stake.md#0x1_stake_withdraw">withdraw</a>(
+    owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    withdraw_amount: u64
+) <b>acquires</b> <a href="stake.md#0x1_stake_OwnerCapability">OwnerCapability</a>, <a href="stake.md#0x1_stake_StakePool">StakePool</a>, <a href="stake.md#0x1_stake_ValidatorSet">ValidatorSet</a> {
+    <b>let</b> owner_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(owner);
+    <a href="stake.md#0x1_stake_assert_owner_cap_exists">assert_owner_cap_exists</a>(owner_address);
+    <b>let</b> ownership_cap = <b>borrow_global</b>&lt;<a href="stake.md#0x1_stake_OwnerCapability">OwnerCapability</a>&gt;(owner_address);
+    <b>let</b> coins = <a href="stake.md#0x1_stake_withdraw_with_cap">withdraw_with_cap</a>(ownership_cap, withdraw_amount);
+    <a href="coin.md#0x1_coin_deposit">coin::deposit</a>&lt;AptosCoin&gt;(owner_address, coins);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_stake_withdraw_with_cap"></a>
+
+## Function `withdraw_with_cap`
+
+Withdraw from <code>pool_address</code>'s inactive stake with the corresponding <code>owner_cap</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_withdraw_with_cap">withdraw_with_cap</a>(owner_cap: &<a href="stake.md#0x1_stake_OwnerCapability">stake::OwnerCapability</a>, withdraw_amount: u64): <a href="coin.md#0x1_coin_Coin">coin::Coin</a>&lt;<a href="aptos_coin.md#0x1_aptos_coin_AptosCoin">aptos_coin::AptosCoin</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_withdraw_with_cap">withdraw_with_cap</a>(
+    owner_cap: &<a href="stake.md#0x1_stake_OwnerCapability">OwnerCapability</a>,
+    withdraw_amount: u64
+): Coin&lt;AptosCoin&gt; <b>acquires</b> <a href="stake.md#0x1_stake_StakePool">StakePool</a>, <a href="stake.md#0x1_stake_ValidatorSet">ValidatorSet</a> {
+    <a href="stake.md#0x1_stake_assert_reconfig_not_in_progress">assert_reconfig_not_in_progress</a>();
+    <b>let</b> pool_address = owner_cap.pool_address;
+    <a href="stake.md#0x1_stake_assert_stake_pool_exists">assert_stake_pool_exists</a>(pool_address);
+    <b>let</b> stake_pool = <b>borrow_global_mut</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(pool_address);
+    // There's an edge case <b>where</b> a validator unlocks their <a href="stake.md#0x1_stake">stake</a> and leaves the validator set before
+    // the <a href="stake.md#0x1_stake">stake</a> is fully unlocked (the current lockup cycle <b>has</b> not expired yet).
+    // This can leave their <a href="stake.md#0x1_stake">stake</a> stuck in pending_inactive even after the current lockup cycle expires.
+    <b>if</b> (<a href="stake.md#0x1_stake_get_validator_state">get_validator_state</a>(pool_address) == <a href="stake.md#0x1_stake_VALIDATOR_STATUS_INACTIVE">VALIDATOR_STATUS_INACTIVE</a> &&
+        <a href="timestamp.md#0x1_timestamp_now_seconds">timestamp::now_seconds</a>() &gt;= stake_pool.locked_until_secs) {
+        <b>let</b> pending_inactive_stake = <a href="coin.md#0x1_coin_extract_all">coin::extract_all</a>(&<b>mut</b> stake_pool.pending_inactive);
+        <a href="coin.md#0x1_coin_merge">coin::merge</a>(&<b>mut</b> stake_pool.inactive, pending_inactive_stake);
+    };
+
+    // Cap withdraw amount by total inactive coins.
+    withdraw_amount = <b>min</b>(withdraw_amount, <a href="coin.md#0x1_coin_value">coin::value</a>(&stake_pool.inactive));
+    <b>if</b> (withdraw_amount == 0) <b>return</b> <a href="coin.md#0x1_coin_zero">coin::zero</a>&lt;AptosCoin&gt;();
+
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        <a href="event.md#0x1_event_emit">event::emit</a>(
+            <a href="stake.md#0x1_stake_WithdrawStake">WithdrawStake</a> {
+                pool_address,
+                amount_withdrawn: withdraw_amount,
+            },
+        );
+    };
+    <a href="event.md#0x1_event_emit_event">event::emit_event</a>(
+        &<b>mut</b> stake_pool.withdraw_stake_events,
+        <a href="stake.md#0x1_stake_WithdrawStakeEvent">WithdrawStakeEvent</a> {
+            pool_address,
+            amount_withdrawn: withdraw_amount,
+        },
+    );
+
+    <a href="coin.md#0x1_coin_extract">coin::extract</a>(&<b>mut</b> stake_pool.inactive, withdraw_amount)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_stake_leave_validator_set"></a>
+
+## Function `leave_validator_set`
+
+Request to have <code>pool_address</code> leave the validator set. The validator is only actually removed from the set when
+the next epoch starts.
+The last validator in the set cannot leave. This is an edge case that should never happen as long as the network
+is still operational.
+
+Can only be called by the operator of the validator/staking pool.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="stake.md#0x1_stake_leave_validator_set">leave_validator_set</a>(operator: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, pool_address: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="stake.md#0x1_stake_leave_validator_set">leave_validator_set</a>(
+    operator: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    pool_address: <b>address</b>
+) <b>acquires</b> <a href="stake.md#0x1_stake_StakePool">StakePool</a>, <a href="stake.md#0x1_stake_ValidatorSet">ValidatorSet</a> {
+    <a href="stake.md#0x1_stake_assert_reconfig_not_in_progress">assert_reconfig_not_in_progress</a>();
+    <b>let</b> config = <a href="staking_config.md#0x1_staking_config_get">staking_config::get</a>();
+    <b>assert</b>!(
+        <a href="staking_config.md#0x1_staking_config_get_allow_validator_set_change">staking_config::get_allow_validator_set_change</a>(&config),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="stake.md#0x1_stake_ENO_POST_GENESIS_VALIDATOR_SET_CHANGE_ALLOWED">ENO_POST_GENESIS_VALIDATOR_SET_CHANGE_ALLOWED</a>),
+    );
+
+    <a href="stake.md#0x1_stake_assert_stake_pool_exists">assert_stake_pool_exists</a>(pool_address);
+    <b>let</b> stake_pool = <b>borrow_global_mut</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(pool_address);
+    // Account <b>has</b> <b>to</b> be the operator.
+    <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(operator) == stake_pool.operator_address, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_unauthenticated">error::unauthenticated</a>(<a href="stake.md#0x1_stake_ENOT_OPERATOR">ENOT_OPERATOR</a>));
+
+    <b>let</b> validator_set = <b>borrow_global_mut</b>&lt;<a href="stake.md#0x1_stake_ValidatorSet">ValidatorSet</a>&gt;(@aptos_framework);
+    // If the validator is still pending_active, directly kick the validator out.
+    <b>let</b> maybe_pending_active_index = <a href="stake.md#0x1_stake_find_validator">find_validator</a>(&validator_set.pending_active, pool_address);
+    <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&maybe_pending_active_index)) {
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_swap_remove">vector::swap_remove</a>(
+            &<b>mut</b> validator_set.pending_active, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_extract">option::extract</a>(&<b>mut</b> maybe_pending_active_index));
+
+        // Decrease the <a href="voting.md#0x1_voting">voting</a> power increase <b>as</b> the pending validator's <a href="voting.md#0x1_voting">voting</a> power was added when they requested
+        // <b>to</b> join. Now that they changed their mind, their <a href="voting.md#0x1_voting">voting</a> power should not affect the joining limit of this
+        // epoch.
+        <b>let</b> validator_stake = (<a href="stake.md#0x1_stake_get_next_epoch_voting_power">get_next_epoch_voting_power</a>(stake_pool) <b>as</b> u128);
+        // total_joining_power should be larger than validator_stake but just in case there <b>has</b> been a small
+        // rounding <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">error</a> somewhere that can lead <b>to</b> an underflow, we still want <b>to</b> allow this transaction <b>to</b>
+        // succeed.
+        <b>if</b> (validator_set.total_joining_power &gt; validator_stake) {
+            validator_set.total_joining_power = validator_set.total_joining_power - validator_stake;
+        } <b>else</b> {
+            validator_set.total_joining_power = 0;
+        };
+    } <b>else</b> {
+        // Validate that the validator is already part of the validator set.
+        <b>let</b> maybe_active_index = <a href="stake.md#0x1_stake_find_validator">find_validator</a>(&validator_set.active_validators, pool_address);
+        <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&maybe_active_index), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="stake.md#0x1_stake_ENOT_VALIDATOR">ENOT_VALIDATOR</a>));
+        <b>let</b> validator_info = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_swap_remove">vector::swap_remove</a>(
+            &<b>mut</b> validator_set.active_validators, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_extract">option::extract</a>(&<b>mut</b> maybe_active_index));
+        <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&validator_set.active_validators) &gt; 0, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="stake.md#0x1_stake_ELAST_VALIDATOR">ELAST_VALIDATOR</a>));
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_push_back">vector::push_back</a>(&<b>mut</b> validator_set.pending_inactive, validator_info);
+
+        <b>if</b> (std::features::module_event_migration_enabled()) {
+            <a href="event.md#0x1_event_emit">event::emit</a>(<a href="stake.md#0x1_stake_LeaveValidatorSet">LeaveValidatorSet</a> { pool_address });
+        };
+        <a href="event.md#0x1_event_emit_event">event::emit_event</a>(
+            &<b>mut</b> stake_pool.leave_validator_set_events,
+            <a href="stake.md#0x1_stake_LeaveValidatorSetEvent">LeaveValidatorSetEvent</a> {
+                pool_address,
+            },
+        );
+    };
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_stake_is_current_epoch_validator"></a>
+
+## Function `is_current_epoch_validator`
+
+Returns true if the current validator can still vote in the current epoch.
+This includes validators that requested to leave but are still in the pending_inactive queue and will be removed
+when the epoch starts.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_is_current_epoch_validator">is_current_epoch_validator</a>(pool_address: <b>address</b>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_is_current_epoch_validator">is_current_epoch_validator</a>(pool_address: <b>address</b>): bool <b>acquires</b> <a href="stake.md#0x1_stake_ValidatorSet">ValidatorSet</a> {
+    <a href="stake.md#0x1_stake_assert_stake_pool_exists">assert_stake_pool_exists</a>(pool_address);
+    <b>let</b> validator_state = <a href="stake.md#0x1_stake_get_validator_state">get_validator_state</a>(pool_address);
+    validator_state == <a href="stake.md#0x1_stake_VALIDATOR_STATUS_ACTIVE">VALIDATOR_STATUS_ACTIVE</a> || validator_state == <a href="stake.md#0x1_stake_VALIDATOR_STATUS_PENDING_INACTIVE">VALIDATOR_STATUS_PENDING_INACTIVE</a>
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_stake_update_performance_statistics"></a>
+
+## Function `update_performance_statistics`
+
+Update the validator performance (proposal statistics). This is only called by block::prologue().
+This function cannot abort.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="stake.md#0x1_stake_update_performance_statistics">update_performance_statistics</a>(proposer_index: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;u64&gt;, failed_proposer_indices: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u64&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="stake.md#0x1_stake_update_performance_statistics">update_performance_statistics</a>(
+    proposer_index: Option&lt;u64&gt;,
+    failed_proposer_indices: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u64&gt;
+) <b>acquires</b> <a href="stake.md#0x1_stake_ValidatorPerformance">ValidatorPerformance</a> {
+    // Validator set cannot change until the end of the epoch, so the validator index in arguments should
+    // match <b>with</b> those of the validators in <a href="stake.md#0x1_stake_ValidatorPerformance">ValidatorPerformance</a> resource.
+    <b>let</b> validator_perf = <b>borrow_global_mut</b>&lt;<a href="stake.md#0x1_stake_ValidatorPerformance">ValidatorPerformance</a>&gt;(@aptos_framework);
+    <b>let</b> validator_len = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&validator_perf.validators);
+
+    <b>spec</b> {
+        <b>update</b> <a href="stake.md#0x1_stake_ghost_valid_perf">ghost_valid_perf</a> = validator_perf;
+        <b>update</b> <a href="stake.md#0x1_stake_ghost_proposer_idx">ghost_proposer_idx</a> = proposer_index;
+    };
+    // proposer_index is an <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option">option</a> because it can be missing (for NilBlocks)
+    <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&proposer_index)) {
+        <b>let</b> cur_proposer_index = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_extract">option::extract</a>(&<b>mut</b> proposer_index);
+        // Here, and in all other <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>, skip <a href="../../../aptos-stdlib/tests/compiler-v2-doc/any.md#0x1_any">any</a> validator indices that are out of bounds,
+        // this <b>ensures</b> that this function doesn't <b>abort</b> <b>if</b> there are out of bounds errors.
+        <b>if</b> (cur_proposer_index &lt; validator_len) {
+            <b>let</b> validator = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow_mut">vector::borrow_mut</a>(&<b>mut</b> validator_perf.validators, cur_proposer_index);
+            <b>spec</b> {
+                <b>assume</b> validator.successful_proposals + 1 &lt;= <a href="stake.md#0x1_stake_MAX_U64">MAX_U64</a>;
+            };
+            validator.successful_proposals = validator.successful_proposals + 1;
+        };
+    };
+
+    <b>let</b> f = 0;
+    <b>let</b> f_len = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&failed_proposer_indices);
+    <b>while</b> ({
+        <b>spec</b> {
+            <b>invariant</b> len(validator_perf.validators) == validator_len;
+            <b>invariant</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_is_some">option::spec_is_some</a>(<a href="stake.md#0x1_stake_ghost_proposer_idx">ghost_proposer_idx</a>) && <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_borrow">option::spec_borrow</a>(
+                <a href="stake.md#0x1_stake_ghost_proposer_idx">ghost_proposer_idx</a>
+            ) &lt; validator_len) ==&gt;
+                (validator_perf.validators[<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_borrow">option::spec_borrow</a>(<a href="stake.md#0x1_stake_ghost_proposer_idx">ghost_proposer_idx</a>)].successful_proposals ==
+                    <a href="stake.md#0x1_stake_ghost_valid_perf">ghost_valid_perf</a>.validators[<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_borrow">option::spec_borrow</a>(<a href="stake.md#0x1_stake_ghost_proposer_idx">ghost_proposer_idx</a>)].successful_proposals + 1);
+        };
+        f &lt; f_len
+    }) {
+        <b>let</b> validator_index = *<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(&failed_proposer_indices, f);
+        <b>if</b> (validator_index &lt; validator_len) {
+            <b>let</b> validator = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow_mut">vector::borrow_mut</a>(&<b>mut</b> validator_perf.validators, validator_index);
+            <b>spec</b> {
+                <b>assume</b> validator.failed_proposals + 1 &lt;= <a href="stake.md#0x1_stake_MAX_U64">MAX_U64</a>;
+            };
+            validator.failed_proposals = validator.failed_proposals + 1;
+        };
+        f = f + 1;
+    };
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_stake_on_new_epoch"></a>
+
+## Function `on_new_epoch`
+
+Triggered during a reconfiguration. This function shouldn't abort.
+
+1. Distribute transaction fees and rewards to stake pools of active and pending inactive validators (requested
+to leave but not yet removed).
+2. Officially move pending active stake to active and move pending inactive stake to inactive.
+The staking pool's voting power in this new epoch will be updated to the total active stake.
+3. Add pending active validators to the active set if they satisfy requirements so they can vote and remove
+pending inactive validators so they no longer can vote.
+4. The validator's voting power in the validator set is updated to be the corresponding staking pool's voting
+power.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="stake.md#0x1_stake_on_new_epoch">on_new_epoch</a>()
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="stake.md#0x1_stake_on_new_epoch">on_new_epoch</a>(
+) <b>acquires</b> <a href="stake.md#0x1_stake_StakePool">StakePool</a>, <a href="stake.md#0x1_stake_AptosCoinCapabilities">AptosCoinCapabilities</a>, <a href="stake.md#0x1_stake_ValidatorConfig">ValidatorConfig</a>, <a href="stake.md#0x1_stake_ValidatorPerformance">ValidatorPerformance</a>, <a href="stake.md#0x1_stake_ValidatorSet">ValidatorSet</a>, <a href="stake.md#0x1_stake_ValidatorFees">ValidatorFees</a> {
+    <b>let</b> validator_set = <b>borrow_global_mut</b>&lt;<a href="stake.md#0x1_stake_ValidatorSet">ValidatorSet</a>&gt;(@aptos_framework);
+    <b>let</b> config = <a href="staking_config.md#0x1_staking_config_get">staking_config::get</a>();
+    <b>let</b> validator_perf = <b>borrow_global_mut</b>&lt;<a href="stake.md#0x1_stake_ValidatorPerformance">ValidatorPerformance</a>&gt;(@aptos_framework);
+
+    // Process pending <a href="stake.md#0x1_stake">stake</a> and distribute transaction fees and rewards for each currently active validator.
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_for_each_ref">vector::for_each_ref</a>(&validator_set.active_validators, |validator| {
+        <b>let</b> validator: &<a href="stake.md#0x1_stake_ValidatorInfo">ValidatorInfo</a> = validator;
+        <a href="stake.md#0x1_stake_update_stake_pool">update_stake_pool</a>(validator_perf, validator.addr, &config);
+    });
+
+    // Process pending <a href="stake.md#0x1_stake">stake</a> and distribute transaction fees and rewards for each currently pending_inactive validator
+    // (requested <b>to</b> leave but not removed yet).
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_for_each_ref">vector::for_each_ref</a>(&validator_set.pending_inactive, |validator| {
+        <b>let</b> validator: &<a href="stake.md#0x1_stake_ValidatorInfo">ValidatorInfo</a> = validator;
+        <a href="stake.md#0x1_stake_update_stake_pool">update_stake_pool</a>(validator_perf, validator.addr, &config);
+    });
+
+    // Activate currently pending_active validators.
+    <a href="stake.md#0x1_stake_append">append</a>(&<b>mut</b> validator_set.active_validators, &<b>mut</b> validator_set.pending_active);
+
+    // Officially deactivate all pending_inactive validators. They will now no longer receive rewards.
+    validator_set.pending_inactive = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_empty">vector::empty</a>();
+
+    // Update active validator set so that network <b>address</b>/<b>public</b> key change takes effect.
+    // Moreover, recalculate the total <a href="voting.md#0x1_voting">voting</a> power, and deactivate the validator whose
+    // <a href="voting.md#0x1_voting">voting</a> power is less than the minimum required <a href="stake.md#0x1_stake">stake</a>.
+    <b>let</b> next_epoch_validators = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_empty">vector::empty</a>();
+    <b>let</b> (minimum_stake, _) = <a href="staking_config.md#0x1_staking_config_get_required_stake">staking_config::get_required_stake</a>(&config);
+    <b>let</b> vlen = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&validator_set.active_validators);
+    <b>let</b> total_voting_power = 0;
+    <b>let</b> i = 0;
+    <b>while</b> ({
+        <b>spec</b> {
+            <b>invariant</b> <a href="stake.md#0x1_stake_spec_validators_are_initialized">spec_validators_are_initialized</a>(next_epoch_validators);
+            <b>invariant</b> i &lt;= vlen;
+        };
+        i &lt; vlen
+    }) {
+        <b>let</b> old_validator_info = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow_mut">vector::borrow_mut</a>(&<b>mut</b> validator_set.active_validators, i);
+        <b>let</b> pool_address = old_validator_info.addr;
+        <b>let</b> validator_config = <b>borrow_global_mut</b>&lt;<a href="stake.md#0x1_stake_ValidatorConfig">ValidatorConfig</a>&gt;(pool_address);
+        <b>let</b> stake_pool = <b>borrow_global_mut</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(pool_address);
+        <b>let</b> new_validator_info = <a href="stake.md#0x1_stake_generate_validator_info">generate_validator_info</a>(pool_address, stake_pool, *validator_config);
+
+        // A validator needs at least the <b>min</b> <a href="stake.md#0x1_stake">stake</a> required <b>to</b> join the validator set.
+        <b>if</b> (new_validator_info.voting_power &gt;= minimum_stake) {
+            <b>spec</b> {
+                <b>assume</b> total_voting_power + new_validator_info.voting_power &lt;= MAX_U128;
+            };
+            total_voting_power = total_voting_power + (new_validator_info.voting_power <b>as</b> u128);
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_push_back">vector::push_back</a>(&<b>mut</b> next_epoch_validators, new_validator_info);
+        };
+        i = i + 1;
+    };
+
+    validator_set.active_validators = next_epoch_validators;
+    validator_set.total_voting_power = total_voting_power;
+    validator_set.total_joining_power = 0;
+
+    // Update validator indices, reset performance scores, and renew lockups.
+    validator_perf.validators = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_empty">vector::empty</a>();
+    <b>let</b> recurring_lockup_duration_secs = <a href="staking_config.md#0x1_staking_config_get_recurring_lockup_duration">staking_config::get_recurring_lockup_duration</a>(&config);
+    <b>let</b> vlen = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&validator_set.active_validators);
+    <b>let</b> validator_index = 0;
+    <b>while</b> ({
+        <b>spec</b> {
+            <b>invariant</b> <a href="stake.md#0x1_stake_spec_validators_are_initialized">spec_validators_are_initialized</a>(validator_set.active_validators);
+            <b>invariant</b> len(validator_set.pending_active) == 0;
+            <b>invariant</b> len(validator_set.pending_inactive) == 0;
+            <b>invariant</b> 0 &lt;= validator_index && validator_index &lt;= vlen;
+            <b>invariant</b> vlen == len(validator_set.active_validators);
+            <b>invariant</b> <b>forall</b> i in 0..validator_index:
+                <b>global</b>&lt;<a href="stake.md#0x1_stake_ValidatorConfig">ValidatorConfig</a>&gt;(validator_set.active_validators[i].addr).validator_index &lt; validator_index;
+            <b>invariant</b> <b>forall</b> i in 0..validator_index:
+                validator_set.active_validators[i].config.validator_index &lt; validator_index;
+            <b>invariant</b> len(validator_perf.validators) == validator_index;
+        };
+        validator_index &lt; vlen
+    }) {
+        <b>let</b> validator_info = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow_mut">vector::borrow_mut</a>(&<b>mut</b> validator_set.active_validators, validator_index);
+        validator_info.config.validator_index = validator_index;
+        <b>let</b> validator_config = <b>borrow_global_mut</b>&lt;<a href="stake.md#0x1_stake_ValidatorConfig">ValidatorConfig</a>&gt;(validator_info.addr);
+        validator_config.validator_index = validator_index;
+
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_push_back">vector::push_back</a>(&<b>mut</b> validator_perf.validators, <a href="stake.md#0x1_stake_IndividualValidatorPerformance">IndividualValidatorPerformance</a> {
+            successful_proposals: 0,
+            failed_proposals: 0,
+        });
+
+        // Automatically renew a validator's lockup for validators that will still be in the validator set in the
+        // next epoch.
+        <b>let</b> stake_pool = <b>borrow_global_mut</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(validator_info.addr);
+        <b>let</b> now_secs = <a href="timestamp.md#0x1_timestamp_now_seconds">timestamp::now_seconds</a>();
+        <b>let</b> reconfig_start_secs = <b>if</b> (<a href="chain_status.md#0x1_chain_status_is_operating">chain_status::is_operating</a>()) {
+            <a href="stake.md#0x1_stake_get_reconfig_start_time_secs">get_reconfig_start_time_secs</a>()
+        } <b>else</b> {
+            now_secs
+        };
+        <b>if</b> (stake_pool.locked_until_secs &lt;= reconfig_start_secs) {
+            <b>spec</b> {
+                <b>assume</b> now_secs + recurring_lockup_duration_secs &lt;= <a href="stake.md#0x1_stake_MAX_U64">MAX_U64</a>;
+            };
+            stake_pool.locked_until_secs = now_secs + recurring_lockup_duration_secs;
+        };
+
+        validator_index = validator_index + 1;
+    };
+
+    <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_periodical_reward_rate_decrease_enabled">features::periodical_reward_rate_decrease_enabled</a>()) {
+        // Update rewards rate after reward distribution.
+        <a href="staking_config.md#0x1_staking_config_calculate_and_save_latest_epoch_rewards_rate">staking_config::calculate_and_save_latest_epoch_rewards_rate</a>();
+    };
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_stake_cur_validator_consensus_infos"></a>
+
+## Function `cur_validator_consensus_infos`
+
+Return the <code>ValidatorConsensusInfo</code> of each current validator, sorted by current validator index.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_cur_validator_consensus_infos">cur_validator_consensus_infos</a>(): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="validator_consensus_info.md#0x1_validator_consensus_info_ValidatorConsensusInfo">validator_consensus_info::ValidatorConsensusInfo</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_cur_validator_consensus_infos">cur_validator_consensus_infos</a>(): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;ValidatorConsensusInfo&gt; <b>acquires</b> <a href="stake.md#0x1_stake_ValidatorSet">ValidatorSet</a> {
+    <b>let</b> validator_set = <b>borrow_global</b>&lt;<a href="stake.md#0x1_stake_ValidatorSet">ValidatorSet</a>&gt;(@aptos_framework);
+    <a href="stake.md#0x1_stake_validator_consensus_infos_from_validator_set">validator_consensus_infos_from_validator_set</a>(validator_set)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_stake_next_validator_consensus_infos"></a>
+
+## Function `next_validator_consensus_infos`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_next_validator_consensus_infos">next_validator_consensus_infos</a>(): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="validator_consensus_info.md#0x1_validator_consensus_info_ValidatorConsensusInfo">validator_consensus_info::ValidatorConsensusInfo</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_next_validator_consensus_infos">next_validator_consensus_infos</a>(): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;ValidatorConsensusInfo&gt; <b>acquires</b> <a href="stake.md#0x1_stake_ValidatorSet">ValidatorSet</a>, <a href="stake.md#0x1_stake_ValidatorPerformance">ValidatorPerformance</a>, <a href="stake.md#0x1_stake_StakePool">StakePool</a>, <a href="stake.md#0x1_stake_ValidatorFees">ValidatorFees</a>, <a href="stake.md#0x1_stake_ValidatorConfig">ValidatorConfig</a> {
+    // Init.
+    <b>let</b> cur_validator_set = <b>borrow_global</b>&lt;<a href="stake.md#0x1_stake_ValidatorSet">ValidatorSet</a>&gt;(@aptos_framework);
+    <b>let</b> <a href="staking_config.md#0x1_staking_config">staking_config</a> = <a href="staking_config.md#0x1_staking_config_get">staking_config::get</a>();
+    <b>let</b> validator_perf = <b>borrow_global</b>&lt;<a href="stake.md#0x1_stake_ValidatorPerformance">ValidatorPerformance</a>&gt;(@aptos_framework);
+    <b>let</b> (minimum_stake, _) = <a href="staking_config.md#0x1_staking_config_get_required_stake">staking_config::get_required_stake</a>(&<a href="staking_config.md#0x1_staking_config">staking_config</a>);
+    <b>let</b> (rewards_rate, rewards_rate_denominator) = <a href="staking_config.md#0x1_staking_config_get_reward_rate">staking_config::get_reward_rate</a>(&<a href="staking_config.md#0x1_staking_config">staking_config</a>);
+
+    // Compute new validator set.
+    <b>let</b> new_active_validators = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>[];
+    <b>let</b> num_new_actives = 0;
+    <b>let</b> candidate_idx = 0;
+    <b>let</b> new_total_power = 0;
+    <b>let</b> num_cur_actives = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&cur_validator_set.active_validators);
+    <b>let</b> num_cur_pending_actives = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&cur_validator_set.pending_active);
+    <b>spec</b> {
+        <b>assume</b> num_cur_actives + num_cur_pending_actives &lt;= <a href="stake.md#0x1_stake_MAX_U64">MAX_U64</a>;
+    };
+    <b>let</b> num_candidates = num_cur_actives + num_cur_pending_actives;
+    <b>while</b> ({
+        <b>spec</b> {
+            <b>invariant</b> candidate_idx &lt;= num_candidates;
+            <b>invariant</b> <a href="stake.md#0x1_stake_spec_validators_are_initialized">spec_validators_are_initialized</a>(new_active_validators);
+            <b>invariant</b> len(new_active_validators) == num_new_actives;
+            <b>invariant</b> <b>forall</b> i in 0..len(new_active_validators):
+                new_active_validators[i].config.validator_index == i;
+            <b>invariant</b> num_new_actives &lt;= candidate_idx;
+            <b>invariant</b> <a href="stake.md#0x1_stake_spec_validators_are_initialized">spec_validators_are_initialized</a>(new_active_validators);
+        };
+        candidate_idx &lt; num_candidates
+    }) {
+        <b>let</b> candidate_in_current_validator_set = candidate_idx &lt; num_cur_actives;
+        <b>let</b> candidate = <b>if</b> (candidate_idx &lt; num_cur_actives) {
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(&cur_validator_set.active_validators, candidate_idx)
+        } <b>else</b> {
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(&cur_validator_set.pending_active, candidate_idx - num_cur_actives)
+        };
+        <b>let</b> stake_pool = <b>borrow_global</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(candidate.addr);
+        <b>let</b> cur_active = <a href="coin.md#0x1_coin_value">coin::value</a>(&stake_pool.active);
+        <b>let</b> cur_pending_active = <a href="coin.md#0x1_coin_value">coin::value</a>(&stake_pool.pending_active);
+        <b>let</b> cur_pending_inactive = <a href="coin.md#0x1_coin_value">coin::value</a>(&stake_pool.pending_inactive);
+
+        <b>let</b> cur_reward = <b>if</b> (candidate_in_current_validator_set && cur_active &gt; 0) {
+            <b>spec</b> {
+                <b>assert</b> candidate.config.validator_index &lt; len(validator_perf.validators);
+            };
+            <b>let</b> cur_perf = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(&validator_perf.validators, candidate.config.validator_index);
+            <b>spec</b> {
+                <b>assume</b> cur_perf.successful_proposals + cur_perf.failed_proposals &lt;= <a href="stake.md#0x1_stake_MAX_U64">MAX_U64</a>;
+            };
+            <a href="stake.md#0x1_stake_calculate_rewards_amount">calculate_rewards_amount</a>(cur_active, cur_perf.successful_proposals, cur_perf.successful_proposals + cur_perf.failed_proposals, rewards_rate, rewards_rate_denominator)
+        } <b>else</b> {
+            0
+        };
+
+        <b>let</b> cur_fee = 0;
+        <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_collect_and_distribute_gas_fees">features::collect_and_distribute_gas_fees</a>()) {
+            <b>let</b> fees_table = &<b>borrow_global</b>&lt;<a href="stake.md#0x1_stake_ValidatorFees">ValidatorFees</a>&gt;(@aptos_framework).fees_table;
+            <b>if</b> (<a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_contains">table::contains</a>(fees_table, candidate.addr)) {
+                <b>let</b> fee_coin = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_borrow">table::borrow</a>(fees_table, candidate.addr);
+                cur_fee = <a href="coin.md#0x1_coin_value">coin::value</a>(fee_coin);
+            }
+        };
+
+        <b>let</b> lockup_expired = <a href="stake.md#0x1_stake_get_reconfig_start_time_secs">get_reconfig_start_time_secs</a>() &gt;= stake_pool.locked_until_secs;
+        <b>spec</b> {
+            <b>assume</b> cur_active + cur_pending_active + cur_reward + cur_fee &lt;= <a href="stake.md#0x1_stake_MAX_U64">MAX_U64</a>;
+            <b>assume</b> cur_active + cur_pending_inactive + cur_pending_active + cur_reward + cur_fee &lt;= <a href="stake.md#0x1_stake_MAX_U64">MAX_U64</a>;
+        };
+        <b>let</b> new_voting_power =
+            cur_active
+            + <b>if</b> (lockup_expired) { 0 } <b>else</b> { cur_pending_inactive }
+            + cur_pending_active
+            + cur_reward + cur_fee;
+
+        <b>if</b> (new_voting_power &gt;= minimum_stake) {
+            <b>let</b> config = *<b>borrow_global</b>&lt;<a href="stake.md#0x1_stake_ValidatorConfig">ValidatorConfig</a>&gt;(candidate.addr);
+            config.validator_index = num_new_actives;
+            <b>let</b> new_validator_info = <a href="stake.md#0x1_stake_ValidatorInfo">ValidatorInfo</a> {
+                addr: candidate.addr,
+                voting_power: new_voting_power,
+                config,
+            };
+
+            // Update <a href="stake.md#0x1_stake_ValidatorSet">ValidatorSet</a>.
+            <b>spec</b> {
+                <b>assume</b> new_total_power + new_voting_power &lt;= MAX_U128;
+            };
+            new_total_power = new_total_power + (new_voting_power <b>as</b> u128);
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_push_back">vector::push_back</a>(&<b>mut</b> new_active_validators, new_validator_info);
+            num_new_actives = num_new_actives + 1;
+
+        };
+        candidate_idx = candidate_idx + 1;
+    };
+
+    <b>let</b> new_validator_set = <a href="stake.md#0x1_stake_ValidatorSet">ValidatorSet</a> {
+        consensus_scheme: cur_validator_set.consensus_scheme,
+        active_validators: new_active_validators,
+        pending_inactive: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>[],
+        pending_active: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>[],
+        total_voting_power: new_total_power,
+        total_joining_power: 0,
+    };
+
+    <a href="stake.md#0x1_stake_validator_consensus_infos_from_validator_set">validator_consensus_infos_from_validator_set</a>(&new_validator_set)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_stake_validator_consensus_infos_from_validator_set"></a>
+
+## Function `validator_consensus_infos_from_validator_set`
+
+
+
+<pre><code><b>fun</b> <a href="stake.md#0x1_stake_validator_consensus_infos_from_validator_set">validator_consensus_infos_from_validator_set</a>(validator_set: &<a href="stake.md#0x1_stake_ValidatorSet">stake::ValidatorSet</a>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="validator_consensus_info.md#0x1_validator_consensus_info_ValidatorConsensusInfo">validator_consensus_info::ValidatorConsensusInfo</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="stake.md#0x1_stake_validator_consensus_infos_from_validator_set">validator_consensus_infos_from_validator_set</a>(validator_set: &<a href="stake.md#0x1_stake_ValidatorSet">ValidatorSet</a>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;ValidatorConsensusInfo&gt; {
+    <b>let</b> validator_consensus_infos = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>[];
+
+    <b>let</b> num_active = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&validator_set.active_validators);
+    <b>let</b> num_pending_inactive = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&validator_set.pending_inactive);
+    <b>spec</b> {
+        <b>assume</b> num_active + num_pending_inactive &lt;= <a href="stake.md#0x1_stake_MAX_U64">MAX_U64</a>;
+    };
+    <b>let</b> total = num_active + num_pending_inactive;
+
+    // Pre-fill the <b>return</b> value <b>with</b> dummy values.
+    <b>let</b> idx = 0;
+    <b>while</b> ({
+        <b>spec</b> {
+            <b>invariant</b> idx &lt;= len(validator_set.active_validators) + len(validator_set.pending_inactive);
+            <b>invariant</b> len(validator_consensus_infos) == idx;
+            <b>invariant</b> len(validator_consensus_infos) &lt;= len(validator_set.active_validators) + len(validator_set.pending_inactive);
+        };
+        idx &lt; total
+    }) {
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_push_back">vector::push_back</a>(&<b>mut</b> validator_consensus_infos, <a href="validator_consensus_info.md#0x1_validator_consensus_info_default">validator_consensus_info::default</a>());
+        idx = idx + 1;
+    };
+    <b>spec</b> {
+        <b>assert</b> len(validator_consensus_infos) == len(validator_set.active_validators) + len(validator_set.pending_inactive);
+        <b>assert</b> <a href="stake.md#0x1_stake_spec_validator_indices_are_valid_config">spec_validator_indices_are_valid_config</a>(validator_set.active_validators,
+            len(validator_set.active_validators) + len(validator_set.pending_inactive));
+    };
+
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_for_each_ref">vector::for_each_ref</a>(&validator_set.active_validators, |obj| {
+        <b>let</b> vi: &<a href="stake.md#0x1_stake_ValidatorInfo">ValidatorInfo</a> = obj;
+        <b>spec</b> {
+            <b>assume</b> len(validator_consensus_infos) == len(validator_set.active_validators) + len(validator_set.pending_inactive);
+            <b>assert</b> vi.config.validator_index &lt; len(validator_consensus_infos);
+        };
+        <b>let</b> vci = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow_mut">vector::borrow_mut</a>(&<b>mut</b> validator_consensus_infos, vi.config.validator_index);
+        *vci = <a href="validator_consensus_info.md#0x1_validator_consensus_info_new">validator_consensus_info::new</a>(
+            vi.addr,
+            vi.config.consensus_pubkey,
+            vi.voting_power
+        );
+        <b>spec</b> {
+            <b>assert</b> len(validator_consensus_infos) == len(validator_set.active_validators) + len(validator_set.pending_inactive);
+        };
+    });
+
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_for_each_ref">vector::for_each_ref</a>(&validator_set.pending_inactive, |obj| {
+        <b>let</b> vi: &<a href="stake.md#0x1_stake_ValidatorInfo">ValidatorInfo</a> = obj;
+        <b>spec</b> {
+            <b>assume</b> len(validator_consensus_infos) == len(validator_set.active_validators) + len(validator_set.pending_inactive);
+            <b>assert</b> vi.config.validator_index &lt; len(validator_consensus_infos);
+        };
+        <b>let</b> vci = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow_mut">vector::borrow_mut</a>(&<b>mut</b> validator_consensus_infos, vi.config.validator_index);
+        *vci = <a href="validator_consensus_info.md#0x1_validator_consensus_info_new">validator_consensus_info::new</a>(
+            vi.addr,
+            vi.config.consensus_pubkey,
+            vi.voting_power
+        );
+        <b>spec</b> {
+            <b>assert</b> len(validator_consensus_infos) == len(validator_set.active_validators) + len(validator_set.pending_inactive);
+        };
+    });
+
+    validator_consensus_infos
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_stake_addresses_from_validator_infos"></a>
+
+## Function `addresses_from_validator_infos`
+
+
+
+<pre><code><b>fun</b> <a href="stake.md#0x1_stake_addresses_from_validator_infos">addresses_from_validator_infos</a>(infos: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="stake.md#0x1_stake_ValidatorInfo">stake::ValidatorInfo</a>&gt;): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="stake.md#0x1_stake_addresses_from_validator_infos">addresses_from_validator_infos</a>(infos: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="stake.md#0x1_stake_ValidatorInfo">ValidatorInfo</a>&gt;): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt; {
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_map_ref">vector::map_ref</a>(infos, |obj| {
+        <b>let</b> info: &<a href="stake.md#0x1_stake_ValidatorInfo">ValidatorInfo</a> = obj;
+        info.addr
+    })
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_stake_update_stake_pool"></a>
+
+## Function `update_stake_pool`
+
+Calculate the stake amount of a stake pool for the next epoch.
+Update individual validator's stake pool if <code>commit == <b>true</b></code>.
+
+1. distribute transaction fees to active/pending_inactive delegations
+2. distribute rewards to active/pending_inactive delegations
+3. process pending_active, pending_inactive correspondingly
+This function shouldn't abort.
+
+
+<pre><code><b>fun</b> <a href="stake.md#0x1_stake_update_stake_pool">update_stake_pool</a>(validator_perf: &<a href="stake.md#0x1_stake_ValidatorPerformance">stake::ValidatorPerformance</a>, pool_address: <b>address</b>, <a href="staking_config.md#0x1_staking_config">staking_config</a>: &<a href="staking_config.md#0x1_staking_config_StakingConfig">staking_config::StakingConfig</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="stake.md#0x1_stake_update_stake_pool">update_stake_pool</a>(
+    validator_perf: &<a href="stake.md#0x1_stake_ValidatorPerformance">ValidatorPerformance</a>,
+    pool_address: <b>address</b>,
+    <a href="staking_config.md#0x1_staking_config">staking_config</a>: &StakingConfig,
+) <b>acquires</b> <a href="stake.md#0x1_stake_StakePool">StakePool</a>, <a href="stake.md#0x1_stake_AptosCoinCapabilities">AptosCoinCapabilities</a>, <a href="stake.md#0x1_stake_ValidatorConfig">ValidatorConfig</a>, <a href="stake.md#0x1_stake_ValidatorFees">ValidatorFees</a> {
+    <b>let</b> stake_pool = <b>borrow_global_mut</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(pool_address);
+    <b>let</b> validator_config = <b>borrow_global</b>&lt;<a href="stake.md#0x1_stake_ValidatorConfig">ValidatorConfig</a>&gt;(pool_address);
+    <b>let</b> cur_validator_perf = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(&validator_perf.validators, validator_config.validator_index);
+    <b>let</b> num_successful_proposals = cur_validator_perf.successful_proposals;
+    <b>spec</b> {
+        // The following addition should not overflow because `num_total_proposals` cannot be larger than 86400,
+        // the maximum number of proposals in a day (1 proposal per second).
+        <b>assume</b> cur_validator_perf.successful_proposals + cur_validator_perf.failed_proposals &lt;= <a href="stake.md#0x1_stake_MAX_U64">MAX_U64</a>;
+    };
+    <b>let</b> num_total_proposals = cur_validator_perf.successful_proposals + cur_validator_perf.failed_proposals;
+    <b>let</b> (rewards_rate, rewards_rate_denominator) = <a href="staking_config.md#0x1_staking_config_get_reward_rate">staking_config::get_reward_rate</a>(<a href="staking_config.md#0x1_staking_config">staking_config</a>);
+    <b>let</b> rewards_active = <a href="stake.md#0x1_stake_distribute_rewards">distribute_rewards</a>(
+        &<b>mut</b> stake_pool.active,
+        num_successful_proposals,
+        num_total_proposals,
+        rewards_rate,
+        rewards_rate_denominator
+    );
+    <b>let</b> rewards_pending_inactive = <a href="stake.md#0x1_stake_distribute_rewards">distribute_rewards</a>(
+        &<b>mut</b> stake_pool.pending_inactive,
+        num_successful_proposals,
+        num_total_proposals,
+        rewards_rate,
+        rewards_rate_denominator
+    );
+    <b>spec</b> {
+        <b>assume</b> rewards_active + rewards_pending_inactive &lt;= <a href="stake.md#0x1_stake_MAX_U64">MAX_U64</a>;
+    };
+    <b>let</b> rewards_amount = rewards_active + rewards_pending_inactive;
+    // Pending active <a href="stake.md#0x1_stake">stake</a> can now be active.
+    <a href="coin.md#0x1_coin_merge">coin::merge</a>(&<b>mut</b> stake_pool.active, <a href="coin.md#0x1_coin_extract_all">coin::extract_all</a>(&<b>mut</b> stake_pool.pending_active));
+
+    // Additionally, distribute transaction fees.
+    <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_collect_and_distribute_gas_fees">features::collect_and_distribute_gas_fees</a>()) {
+        <b>let</b> fees_table = &<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="stake.md#0x1_stake_ValidatorFees">ValidatorFees</a>&gt;(@aptos_framework).fees_table;
+        <b>if</b> (<a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_contains">table::contains</a>(fees_table, pool_address)) {
+            <b>let</b> <a href="coin.md#0x1_coin">coin</a> = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_remove">table::remove</a>(fees_table, pool_address);
+            <a href="coin.md#0x1_coin_merge">coin::merge</a>(&<b>mut</b> stake_pool.active, <a href="coin.md#0x1_coin">coin</a>);
+        };
+    };
+
+    // Pending inactive <a href="stake.md#0x1_stake">stake</a> is only fully unlocked and moved into inactive <b>if</b> the current lockup cycle <b>has</b> expired
+    <b>let</b> current_lockup_expiration = stake_pool.locked_until_secs;
+    <b>if</b> (<a href="stake.md#0x1_stake_get_reconfig_start_time_secs">get_reconfig_start_time_secs</a>() &gt;= current_lockup_expiration) {
+        <a href="coin.md#0x1_coin_merge">coin::merge</a>(
+            &<b>mut</b> stake_pool.inactive,
+            <a href="coin.md#0x1_coin_extract_all">coin::extract_all</a>(&<b>mut</b> stake_pool.pending_inactive),
+        );
+    };
+
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        <a href="event.md#0x1_event_emit">event::emit</a>(<a href="stake.md#0x1_stake_DistributeRewards">DistributeRewards</a> { pool_address, rewards_amount });
+    };
+    <a href="event.md#0x1_event_emit_event">event::emit_event</a>(
+        &<b>mut</b> stake_pool.distribute_rewards_events,
+        <a href="stake.md#0x1_stake_DistributeRewardsEvent">DistributeRewardsEvent</a> {
+            pool_address,
+            rewards_amount,
+        },
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_stake_get_reconfig_start_time_secs"></a>
+
+## Function `get_reconfig_start_time_secs`
+
+Assuming we are in a middle of a reconfiguration (no matter it is immediate or async), get its start time.
+
+
+<pre><code><b>fun</b> <a href="stake.md#0x1_stake_get_reconfig_start_time_secs">get_reconfig_start_time_secs</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="stake.md#0x1_stake_get_reconfig_start_time_secs">get_reconfig_start_time_secs</a>(): u64 {
+    <b>if</b> (<a href="reconfiguration_state.md#0x1_reconfiguration_state_is_initialized">reconfiguration_state::is_initialized</a>()) {
+        <a href="reconfiguration_state.md#0x1_reconfiguration_state_start_time_secs">reconfiguration_state::start_time_secs</a>()
+    } <b>else</b> {
+        <a href="timestamp.md#0x1_timestamp_now_seconds">timestamp::now_seconds</a>()
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_stake_calculate_rewards_amount"></a>
+
+## Function `calculate_rewards_amount`
+
+Calculate the rewards amount.
+
+
+<pre><code><b>fun</b> <a href="stake.md#0x1_stake_calculate_rewards_amount">calculate_rewards_amount</a>(stake_amount: u64, num_successful_proposals: u64, num_total_proposals: u64, rewards_rate: u64, rewards_rate_denominator: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="stake.md#0x1_stake_calculate_rewards_amount">calculate_rewards_amount</a>(
+    stake_amount: u64,
+    num_successful_proposals: u64,
+    num_total_proposals: u64,
+    rewards_rate: u64,
+    rewards_rate_denominator: u64,
+): u64 {
+    <b>spec</b> {
+        // The following condition must hold because
+        // (1) num_successful_proposals &lt;= num_total_proposals, and
+        // (2) `num_total_proposals` cannot be larger than 86400, the maximum number of proposals
+        //     in a day (1 proposal per second), and `num_total_proposals` is reset <b>to</b> 0 every epoch.
+        <b>assume</b> num_successful_proposals * <a href="stake.md#0x1_stake_MAX_REWARDS_RATE">MAX_REWARDS_RATE</a> &lt;= <a href="stake.md#0x1_stake_MAX_U64">MAX_U64</a>;
+    };
+    // The rewards amount is equal <b>to</b> (<a href="stake.md#0x1_stake">stake</a> amount * rewards rate * performance multiplier).
+    // We do multiplication in u128 before division <b>to</b> avoid the overflow and minimize the rounding <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">error</a>.
+    <b>let</b> rewards_numerator = (stake_amount <b>as</b> u128) * (rewards_rate <b>as</b> u128) * (num_successful_proposals <b>as</b> u128);
+    <b>let</b> rewards_denominator = (rewards_rate_denominator <b>as</b> u128) * (num_total_proposals <b>as</b> u128);
+    <b>if</b> (rewards_denominator &gt; 0) {
+        ((rewards_numerator / rewards_denominator) <b>as</b> u64)
+    } <b>else</b> {
+        0
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_stake_distribute_rewards"></a>
+
+## Function `distribute_rewards`
+
+Mint rewards corresponding to current epoch's <code><a href="stake.md#0x1_stake">stake</a></code> and <code>num_successful_votes</code>.
+
+
+<pre><code><b>fun</b> <a href="stake.md#0x1_stake_distribute_rewards">distribute_rewards</a>(<a href="stake.md#0x1_stake">stake</a>: &<b>mut</b> <a href="coin.md#0x1_coin_Coin">coin::Coin</a>&lt;<a href="aptos_coin.md#0x1_aptos_coin_AptosCoin">aptos_coin::AptosCoin</a>&gt;, num_successful_proposals: u64, num_total_proposals: u64, rewards_rate: u64, rewards_rate_denominator: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="stake.md#0x1_stake_distribute_rewards">distribute_rewards</a>(
+    <a href="stake.md#0x1_stake">stake</a>: &<b>mut</b> Coin&lt;AptosCoin&gt;,
+    num_successful_proposals: u64,
+    num_total_proposals: u64,
+    rewards_rate: u64,
+    rewards_rate_denominator: u64,
+): u64 <b>acquires</b> <a href="stake.md#0x1_stake_AptosCoinCapabilities">AptosCoinCapabilities</a> {
+    <b>let</b> stake_amount = <a href="coin.md#0x1_coin_value">coin::value</a>(<a href="stake.md#0x1_stake">stake</a>);
+    <b>let</b> rewards_amount = <b>if</b> (stake_amount &gt; 0) {
+        <a href="stake.md#0x1_stake_calculate_rewards_amount">calculate_rewards_amount</a>(
+            stake_amount,
+            num_successful_proposals,
+            num_total_proposals,
+            rewards_rate,
+            rewards_rate_denominator
+        )
+    } <b>else</b> {
+        0
+    };
+    <b>if</b> (rewards_amount &gt; 0) {
+        <b>let</b> mint_cap = &<b>borrow_global</b>&lt;<a href="stake.md#0x1_stake_AptosCoinCapabilities">AptosCoinCapabilities</a>&gt;(@aptos_framework).mint_cap;
+        <b>let</b> rewards = <a href="coin.md#0x1_coin_mint">coin::mint</a>(rewards_amount, mint_cap);
+        <a href="coin.md#0x1_coin_merge">coin::merge</a>(<a href="stake.md#0x1_stake">stake</a>, rewards);
+    };
+    rewards_amount
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_stake_append"></a>
+
+## Function `append`
+
+
+
+<pre><code><b>fun</b> <a href="stake.md#0x1_stake_append">append</a>&lt;T&gt;(v1: &<b>mut</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;T&gt;, v2: &<b>mut</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;T&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="stake.md#0x1_stake_append">append</a>&lt;T&gt;(v1: &<b>mut</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;T&gt;, v2: &<b>mut</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;T&gt;) {
+    <b>while</b> (!<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_is_empty">vector::is_empty</a>(v2)) {
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_push_back">vector::push_back</a>(v1, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_pop_back">vector::pop_back</a>(v2));
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_stake_find_validator"></a>
+
+## Function `find_validator`
+
+
+
+<pre><code><b>fun</b> <a href="stake.md#0x1_stake_find_validator">find_validator</a>(v: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="stake.md#0x1_stake_ValidatorInfo">stake::ValidatorInfo</a>&gt;, addr: <b>address</b>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;u64&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="stake.md#0x1_stake_find_validator">find_validator</a>(v: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="stake.md#0x1_stake_ValidatorInfo">ValidatorInfo</a>&gt;, addr: <b>address</b>): Option&lt;u64&gt; {
+    <b>let</b> i = 0;
+    <b>let</b> len = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(v);
+    <b>while</b> ({
+        <b>spec</b> {
+            <b>invariant</b> !(<b>exists</b> j in 0..i: v[j].addr == addr);
+        };
+        i &lt; len
+    }) {
+        <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(v, i).addr == addr) {
+            <b>return</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(i)
+        };
+        i = i + 1;
+    };
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>()
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_stake_generate_validator_info"></a>
+
+## Function `generate_validator_info`
+
+
+
+<pre><code><b>fun</b> <a href="stake.md#0x1_stake_generate_validator_info">generate_validator_info</a>(addr: <b>address</b>, stake_pool: &<a href="stake.md#0x1_stake_StakePool">stake::StakePool</a>, config: <a href="stake.md#0x1_stake_ValidatorConfig">stake::ValidatorConfig</a>): <a href="stake.md#0x1_stake_ValidatorInfo">stake::ValidatorInfo</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="stake.md#0x1_stake_generate_validator_info">generate_validator_info</a>(addr: <b>address</b>, stake_pool: &<a href="stake.md#0x1_stake_StakePool">StakePool</a>, config: <a href="stake.md#0x1_stake_ValidatorConfig">ValidatorConfig</a>): <a href="stake.md#0x1_stake_ValidatorInfo">ValidatorInfo</a> {
+    <b>let</b> voting_power = <a href="stake.md#0x1_stake_get_next_epoch_voting_power">get_next_epoch_voting_power</a>(stake_pool);
+    <a href="stake.md#0x1_stake_ValidatorInfo">ValidatorInfo</a> {
+        addr,
+        voting_power,
+        config,
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_stake_get_next_epoch_voting_power"></a>
+
+## Function `get_next_epoch_voting_power`
+
+Returns validator's next epoch voting power, including pending_active, active, and pending_inactive stake.
+
+
+<pre><code><b>fun</b> <a href="stake.md#0x1_stake_get_next_epoch_voting_power">get_next_epoch_voting_power</a>(stake_pool: &<a href="stake.md#0x1_stake_StakePool">stake::StakePool</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="stake.md#0x1_stake_get_next_epoch_voting_power">get_next_epoch_voting_power</a>(stake_pool: &<a href="stake.md#0x1_stake_StakePool">StakePool</a>): u64 {
+    <b>let</b> value_pending_active = <a href="coin.md#0x1_coin_value">coin::value</a>(&stake_pool.pending_active);
+    <b>let</b> value_active = <a href="coin.md#0x1_coin_value">coin::value</a>(&stake_pool.active);
+    <b>let</b> value_pending_inactive = <a href="coin.md#0x1_coin_value">coin::value</a>(&stake_pool.pending_inactive);
+    <b>spec</b> {
+        <b>assume</b> value_pending_active + value_active + value_pending_inactive &lt;= <a href="stake.md#0x1_stake_MAX_U64">MAX_U64</a>;
+    };
+    value_pending_active + value_active + value_pending_inactive
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_stake_update_voting_power_increase"></a>
+
+## Function `update_voting_power_increase`
+
+
+
+<pre><code><b>fun</b> <a href="stake.md#0x1_stake_update_voting_power_increase">update_voting_power_increase</a>(increase_amount: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="stake.md#0x1_stake_update_voting_power_increase">update_voting_power_increase</a>(increase_amount: u64) <b>acquires</b> <a href="stake.md#0x1_stake_ValidatorSet">ValidatorSet</a> {
+    <b>let</b> validator_set = <b>borrow_global_mut</b>&lt;<a href="stake.md#0x1_stake_ValidatorSet">ValidatorSet</a>&gt;(@aptos_framework);
+    <b>let</b> voting_power_increase_limit =
+        (<a href="staking_config.md#0x1_staking_config_get_voting_power_increase_limit">staking_config::get_voting_power_increase_limit</a>(&<a href="staking_config.md#0x1_staking_config_get">staking_config::get</a>()) <b>as</b> u128);
+    validator_set.total_joining_power = validator_set.total_joining_power + (increase_amount <b>as</b> u128);
+
+    // Only validator <a href="voting.md#0x1_voting">voting</a> power increase <b>if</b> the current validator set's <a href="voting.md#0x1_voting">voting</a> power &gt; 0.
+    <b>if</b> (validator_set.total_voting_power &gt; 0) {
+        <b>assert</b>!(
+            validator_set.total_joining_power &lt;= validator_set.total_voting_power * voting_power_increase_limit / 100,
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="stake.md#0x1_stake_EVOTING_POWER_INCREASE_EXCEEDS_LIMIT">EVOTING_POWER_INCREASE_EXCEEDS_LIMIT</a>),
+        );
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_stake_assert_stake_pool_exists"></a>
+
+## Function `assert_stake_pool_exists`
+
+
+
+<pre><code><b>fun</b> <a href="stake.md#0x1_stake_assert_stake_pool_exists">assert_stake_pool_exists</a>(pool_address: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="stake.md#0x1_stake_assert_stake_pool_exists">assert_stake_pool_exists</a>(pool_address: <b>address</b>) {
+    <b>assert</b>!(<a href="stake.md#0x1_stake_stake_pool_exists">stake_pool_exists</a>(pool_address), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="stake.md#0x1_stake_ESTAKE_POOL_DOES_NOT_EXIST">ESTAKE_POOL_DOES_NOT_EXIST</a>));
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_stake_configure_allowed_validators"></a>
+
+## Function `configure_allowed_validators`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_configure_allowed_validators">configure_allowed_validators</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, accounts: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_configure_allowed_validators">configure_allowed_validators</a>(
+    aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    accounts: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;
+) <b>acquires</b> <a href="stake.md#0x1_stake_AllowedValidators">AllowedValidators</a> {
+    <b>let</b> aptos_framework_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(aptos_framework);
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(aptos_framework);
+    <b>if</b> (!<b>exists</b>&lt;<a href="stake.md#0x1_stake_AllowedValidators">AllowedValidators</a>&gt;(aptos_framework_address)) {
+        <b>move_to</b>(aptos_framework, <a href="stake.md#0x1_stake_AllowedValidators">AllowedValidators</a> { accounts });
+    } <b>else</b> {
+        <b>let</b> allowed = <b>borrow_global_mut</b>&lt;<a href="stake.md#0x1_stake_AllowedValidators">AllowedValidators</a>&gt;(aptos_framework_address);
+        allowed.accounts = accounts;
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_stake_is_allowed"></a>
+
+## Function `is_allowed`
+
+
+
+<pre><code><b>fun</b> <a href="stake.md#0x1_stake_is_allowed">is_allowed</a>(<a href="account.md#0x1_account">account</a>: <b>address</b>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="stake.md#0x1_stake_is_allowed">is_allowed</a>(<a href="account.md#0x1_account">account</a>: <b>address</b>): bool <b>acquires</b> <a href="stake.md#0x1_stake_AllowedValidators">AllowedValidators</a> {
+    <b>if</b> (!<b>exists</b>&lt;<a href="stake.md#0x1_stake_AllowedValidators">AllowedValidators</a>&gt;(@aptos_framework)) {
+        <b>true</b>
+    } <b>else</b> {
+        <b>let</b> allowed = <b>borrow_global</b>&lt;<a href="stake.md#0x1_stake_AllowedValidators">AllowedValidators</a>&gt;(@aptos_framework);
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_contains">vector::contains</a>(&allowed.accounts, &<a href="account.md#0x1_account">account</a>)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_stake_assert_owner_cap_exists"></a>
+
+## Function `assert_owner_cap_exists`
+
+
+
+<pre><code><b>fun</b> <a href="stake.md#0x1_stake_assert_owner_cap_exists">assert_owner_cap_exists</a>(owner: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="stake.md#0x1_stake_assert_owner_cap_exists">assert_owner_cap_exists</a>(owner: <b>address</b>) {
+    <b>assert</b>!(<b>exists</b>&lt;<a href="stake.md#0x1_stake_OwnerCapability">OwnerCapability</a>&gt;(owner), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="stake.md#0x1_stake_EOWNER_CAP_NOT_FOUND">EOWNER_CAP_NOT_FOUND</a>));
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_stake_assert_reconfig_not_in_progress"></a>
+
+## Function `assert_reconfig_not_in_progress`
+
+
+
+<pre><code><b>fun</b> <a href="stake.md#0x1_stake_assert_reconfig_not_in_progress">assert_reconfig_not_in_progress</a>()
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="stake.md#0x1_stake_assert_reconfig_not_in_progress">assert_reconfig_not_in_progress</a>() {
+    <b>assert</b>!(!<a href="reconfiguration_state.md#0x1_reconfiguration_state_is_in_progress">reconfiguration_state::is_in_progress</a>(), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="stake.md#0x1_stake_ERECONFIGURATION_IN_PROGRESS">ERECONFIGURATION_IN_PROGRESS</a>));
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+
+
+<a id="high-level-req"></a>
+
+### High-level Requirements
+
+<table>
+<tr>
+<th>No.</th><th>Requirement</th><th>Criticality</th><th>Implementation</th><th>Enforcement</th>
+</tr>
+
+<tr>
+<td>1</td>
+<td>The validator set resource stores consensus information for each validator. The consensus scheme remains consistent across all validators within the set.</td>
+<td>Low</td>
+<td>The consensus_scheme attribute within ValidatorSet initializes with the value zero during the module's initialization and its value remains unchanged afterward.</td>
+<td>Formally verified by the data invariant of <a href="#high-level-req-1">ValidatorSet</a>.</td>
+</tr>
+
+<tr>
+<td>2</td>
+<td>The owner of a validator is immutable.</td>
+<td>Low</td>
+<td>During the initialization of a validator, the owner attribute becomes the signer's address. This assignment establishes the signer as the owner and controller of the validator entity. Subsequently, the owner attribute remains unchanged throughout the validator's lifespan, maintaining its assigned value without any modifications.</td>
+<td>Formally verified in the schema <a href="#high-level-req-2">ValidatorOwnerNoChange</a>.</td>
+</tr>
+
+<tr>
+<td>3</td>
+<td>The total staked value in the stake pool should remain constant, excluding operations related to adding and withdrawing.</td>
+<td>Low</td>
+<td>The total staked value (AptosCoin) of a stake pool is grouped by: active, inactive, pending_active, and pending_inactive. The stake value remains constant except during the execution of the add_stake_with_cap or withdraw_with_cap functions or on_new_epoch (which distributes the reward).</td>
+<td>Formally specified in the schema <a href="#high-level-req-3">StakedValueNoChange</a>.</td>
+</tr>
+
+<tr>
+<td>4</td>
+<td>During each epoch, the following operations should be consistently performed without aborting: rewards distribution, validator activation/deactivation, updates to validator sets and voting power, and renewal of lockups.</td>
+<td>Low</td>
+<td>The on_new_epoch function is triggered at each epoch boundary to perform distribution of the transaction fee, updates to active/inactive stakes, updates to pending active/inactive validators and adjusts voting power of the validators without aborting.</td>
+<td>Formally verified via <a href="#high-level-req-4">on_new_epoch</a>. This also requires a manual review to verify the state updates of the stake pool.</td>
+</tr>
+
+</table>
+
+
+
+
+<a id="module-level-spec"></a>
+
+### Module-level Specification
+
+
+<pre><code><b>pragma</b> verify = <b>true</b>;
+<b>invariant</b> [suspendable] <b>exists</b>&lt;<a href="stake.md#0x1_stake_ValidatorSet">ValidatorSet</a>&gt;(@aptos_framework) ==&gt; <a href="stake.md#0x1_stake_validator_set_is_valid">validator_set_is_valid</a>();
+<b>invariant</b> [suspendable] <a href="chain_status.md#0x1_chain_status_is_operating">chain_status::is_operating</a>() ==&gt; <b>exists</b>&lt;<a href="stake.md#0x1_stake_AptosCoinCapabilities">AptosCoinCapabilities</a>&gt;(@aptos_framework);
+<b>invariant</b> [suspendable] <a href="chain_status.md#0x1_chain_status_is_operating">chain_status::is_operating</a>() ==&gt; <b>exists</b>&lt;<a href="stake.md#0x1_stake_ValidatorPerformance">ValidatorPerformance</a>&gt;(@aptos_framework);
+<b>invariant</b> [suspendable] <a href="chain_status.md#0x1_chain_status_is_operating">chain_status::is_operating</a>() ==&gt; <b>exists</b>&lt;<a href="stake.md#0x1_stake_ValidatorSet">ValidatorSet</a>&gt;(@aptos_framework);
+<b>apply</b> <a href="stake.md#0x1_stake_ValidatorOwnerNoChange">ValidatorOwnerNoChange</a> <b>to</b> *;
+<b>apply</b> <a href="stake.md#0x1_stake_ValidatorNotChangeDuringReconfig">ValidatorNotChangeDuringReconfig</a> <b>to</b> * <b>except</b> on_new_epoch;
+<b>apply</b> <a href="stake.md#0x1_stake_StakePoolNotChangeDuringReconfig">StakePoolNotChangeDuringReconfig</a> <b>to</b> * <b>except</b> on_new_epoch, update_stake_pool;
+<a id="0x1_stake_ghost_valid_perf"></a>
+<b>global</b> <a href="stake.md#0x1_stake_ghost_valid_perf">ghost_valid_perf</a>: <a href="stake.md#0x1_stake_ValidatorPerformance">ValidatorPerformance</a>;
+<a id="0x1_stake_ghost_proposer_idx"></a>
+<b>global</b> <a href="stake.md#0x1_stake_ghost_proposer_idx">ghost_proposer_idx</a>: Option&lt;u64&gt;;
+<a id="0x1_stake_ghost_active_num"></a>
+<b>global</b> <a href="stake.md#0x1_stake_ghost_active_num">ghost_active_num</a>: u64;
+<a id="0x1_stake_ghost_pending_inactive_num"></a>
+<b>global</b> <a href="stake.md#0x1_stake_ghost_pending_inactive_num">ghost_pending_inactive_num</a>: u64;
+</code></pre>
+
+
+
+<a id="@Specification_1_ValidatorSet"></a>
+
+### Resource `ValidatorSet`
+
+
+<pre><code><b>struct</b> <a href="stake.md#0x1_stake_ValidatorSet">ValidatorSet</a> <b>has</b> <b>copy</b>, drop, store, key
+</code></pre>
+
+
+
+<dl>
+<dt>
+<code>consensus_scheme: u8</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>active_validators: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="stake.md#0x1_stake_ValidatorInfo">stake::ValidatorInfo</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>pending_inactive: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="stake.md#0x1_stake_ValidatorInfo">stake::ValidatorInfo</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>pending_active: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="stake.md#0x1_stake_ValidatorInfo">stake::ValidatorInfo</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>total_voting_power: u128</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>total_joining_power: u128</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+
+<pre><code>// This enforces <a id="high-level-req-1" href="#high-level-req">high-level requirement 1</a>:
+<b>invariant</b> consensus_scheme == 0;
+</code></pre>
+
+
+
+
+<a id="0x1_stake_ValidatorNotChangeDuringReconfig"></a>
+
+
+<pre><code><b>schema</b> <a href="stake.md#0x1_stake_ValidatorNotChangeDuringReconfig">ValidatorNotChangeDuringReconfig</a> {
+    <b>ensures</b> (<a href="reconfiguration_state.md#0x1_reconfiguration_state_spec_is_in_progress">reconfiguration_state::spec_is_in_progress</a>() && <b>old</b>(<b>exists</b>&lt;<a href="stake.md#0x1_stake_ValidatorSet">ValidatorSet</a>&gt;(@aptos_framework))) ==&gt;
+        <b>old</b>(<b>global</b>&lt;<a href="stake.md#0x1_stake_ValidatorSet">ValidatorSet</a>&gt;(@aptos_framework)) == <b>global</b>&lt;<a href="stake.md#0x1_stake_ValidatorSet">ValidatorSet</a>&gt;(@aptos_framework);
+}
+</code></pre>
+
+
+
+
+<a id="0x1_stake_StakePoolNotChangeDuringReconfig"></a>
+
+
+<pre><code><b>schema</b> <a href="stake.md#0x1_stake_StakePoolNotChangeDuringReconfig">StakePoolNotChangeDuringReconfig</a> {
+    <b>ensures</b> <b>forall</b> a: <b>address</b> <b>where</b> <b>old</b>(<b>exists</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(a)): <a href="reconfiguration_state.md#0x1_reconfiguration_state_spec_is_in_progress">reconfiguration_state::spec_is_in_progress</a>() ==&gt;
+        (<b>old</b>(<b>global</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(a).pending_inactive) == <b>global</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(a).pending_inactive &&
+        <b>old</b>(<b>global</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(a).pending_active) == <b>global</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(a).pending_active &&
+        <b>old</b>(<b>global</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(a).inactive) == <b>global</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(a).inactive &&
+        <b>old</b>(<b>global</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(a).active) == <b>global</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(a).active);
+}
+</code></pre>
+
+
+
+
+<a id="0x1_stake_ValidatorOwnerNoChange"></a>
+
+
+<pre><code><b>schema</b> <a href="stake.md#0x1_stake_ValidatorOwnerNoChange">ValidatorOwnerNoChange</a> {
+    // This enforces <a id="high-level-req-2" href="#high-level-req">high-level requirement 2</a>:
+    <b>ensures</b> <b>forall</b> addr: <b>address</b> <b>where</b> <b>old</b>(<b>exists</b>&lt;<a href="stake.md#0x1_stake_OwnerCapability">OwnerCapability</a>&gt;(addr)):
+        <b>old</b>(<b>global</b>&lt;<a href="stake.md#0x1_stake_OwnerCapability">OwnerCapability</a>&gt;(addr)).pool_address == <b>global</b>&lt;<a href="stake.md#0x1_stake_OwnerCapability">OwnerCapability</a>&gt;(addr).pool_address;
+}
+</code></pre>
+
+
+
+
+<a id="0x1_stake_StakedValueNochange"></a>
+
+
+<pre><code><b>schema</b> <a href="stake.md#0x1_stake_StakedValueNochange">StakedValueNochange</a> {
+    pool_address: <b>address</b>;
+    <b>let</b> stake_pool = <b>global</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(pool_address);
+    <b>let</b> <b>post</b> post_stake_pool = <b>global</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(pool_address);
+    // This enforces <a id="high-level-req-3" href="#high-level-req">high-level requirement 3</a>:
+    <b>ensures</b> stake_pool.active.value + stake_pool.inactive.value + stake_pool.pending_active.value + stake_pool.pending_inactive.value ==
+        post_stake_pool.active.value + post_stake_pool.inactive.value + post_stake_pool.pending_active.value + post_stake_pool.pending_inactive.value;
+}
+</code></pre>
+
+
+
+
+<a id="0x1_stake_validator_set_is_valid"></a>
+
+
+<pre><code><b>fun</b> <a href="stake.md#0x1_stake_validator_set_is_valid">validator_set_is_valid</a>(): bool {
+   <b>let</b> validator_set = <b>global</b>&lt;<a href="stake.md#0x1_stake_ValidatorSet">ValidatorSet</a>&gt;(@aptos_framework);
+   <a href="stake.md#0x1_stake_validator_set_is_valid_impl">validator_set_is_valid_impl</a>(validator_set)
+}
+</code></pre>
+
+
+
+
+<a id="0x1_stake_validator_set_is_valid_impl"></a>
+
+
+<pre><code><b>fun</b> <a href="stake.md#0x1_stake_validator_set_is_valid_impl">validator_set_is_valid_impl</a>(validator_set: <a href="stake.md#0x1_stake_ValidatorSet">ValidatorSet</a>): bool {
+   <a href="stake.md#0x1_stake_spec_validators_are_initialized">spec_validators_are_initialized</a>(validator_set.active_validators) &&
+       <a href="stake.md#0x1_stake_spec_validators_are_initialized">spec_validators_are_initialized</a>(validator_set.pending_inactive) &&
+       <a href="stake.md#0x1_stake_spec_validators_are_initialized">spec_validators_are_initialized</a>(validator_set.pending_active) &&
+       <a href="stake.md#0x1_stake_spec_validator_indices_are_valid">spec_validator_indices_are_valid</a>(validator_set.active_validators) &&
+       <a href="stake.md#0x1_stake_spec_validator_indices_are_valid">spec_validator_indices_are_valid</a>(validator_set.pending_inactive)
+       && <a href="stake.md#0x1_stake_spec_validator_indices_active_pending_inactive">spec_validator_indices_active_pending_inactive</a>(validator_set)
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_initialize_validator_fees"></a>
+
+### Function `initialize_validator_fees`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="stake.md#0x1_stake_initialize_validator_fees">initialize_validator_fees</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> aptos_addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(aptos_framework);
+<b>aborts_if</b> !<a href="system_addresses.md#0x1_system_addresses_is_aptos_framework_address">system_addresses::is_aptos_framework_address</a>(aptos_addr);
+<b>aborts_if</b> <b>exists</b>&lt;<a href="stake.md#0x1_stake_ValidatorFees">ValidatorFees</a>&gt;(aptos_addr);
+<b>ensures</b> <b>exists</b>&lt;<a href="stake.md#0x1_stake_ValidatorFees">ValidatorFees</a>&gt;(aptos_addr);
+</code></pre>
+
+
+
+<a id="@Specification_1_add_transaction_fee"></a>
+
+### Function `add_transaction_fee`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="stake.md#0x1_stake_add_transaction_fee">add_transaction_fee</a>(validator_addr: <b>address</b>, fee: <a href="coin.md#0x1_coin_Coin">coin::Coin</a>&lt;<a href="aptos_coin.md#0x1_aptos_coin_AptosCoin">aptos_coin::AptosCoin</a>&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="stake.md#0x1_stake_ValidatorFees">ValidatorFees</a>&gt;(@aptos_framework);
+<b>let</b> fees_table = <b>global</b>&lt;<a href="stake.md#0x1_stake_ValidatorFees">ValidatorFees</a>&gt;(@aptos_framework).fees_table;
+<b>let</b> <b>post</b> post_fees_table = <b>global</b>&lt;<a href="stake.md#0x1_stake_ValidatorFees">ValidatorFees</a>&gt;(@aptos_framework).fees_table;
+<b>let</b> collected_fee = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(fees_table, validator_addr);
+<b>let</b> <b>post</b> post_collected_fee = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(post_fees_table, validator_addr);
+<b>ensures</b> <b>if</b> (<a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_contains">table::spec_contains</a>(fees_table, validator_addr)) {
+    post_collected_fee.value == collected_fee.value + fee.value
+} <b>else</b> {
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_contains">table::spec_contains</a>(post_fees_table, validator_addr) &&
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(post_fees_table, validator_addr) == fee
+};
+</code></pre>
+
+
+
+<a id="@Specification_1_get_validator_state"></a>
+
+### Function `get_validator_state`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_get_validator_state">get_validator_state</a>(pool_address: <b>address</b>): u64
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="stake.md#0x1_stake_ValidatorSet">ValidatorSet</a>&gt;(@aptos_framework);
+<b>let</b> validator_set = <b>global</b>&lt;<a href="stake.md#0x1_stake_ValidatorSet">ValidatorSet</a>&gt;(@aptos_framework);
+<b>ensures</b> result == <a href="stake.md#0x1_stake_VALIDATOR_STATUS_PENDING_ACTIVE">VALIDATOR_STATUS_PENDING_ACTIVE</a> ==&gt; <a href="stake.md#0x1_stake_spec_contains">spec_contains</a>(validator_set.pending_active, pool_address);
+<b>ensures</b> result == <a href="stake.md#0x1_stake_VALIDATOR_STATUS_ACTIVE">VALIDATOR_STATUS_ACTIVE</a> ==&gt; <a href="stake.md#0x1_stake_spec_contains">spec_contains</a>(validator_set.active_validators, pool_address);
+<b>ensures</b> result == <a href="stake.md#0x1_stake_VALIDATOR_STATUS_PENDING_INACTIVE">VALIDATOR_STATUS_PENDING_INACTIVE</a> ==&gt; <a href="stake.md#0x1_stake_spec_contains">spec_contains</a>(validator_set.pending_inactive, pool_address);
+<b>ensures</b> result == <a href="stake.md#0x1_stake_VALIDATOR_STATUS_INACTIVE">VALIDATOR_STATUS_INACTIVE</a> ==&gt; (
+    !<a href="stake.md#0x1_stake_spec_contains">spec_contains</a>(validator_set.pending_active, pool_address)
+        && !<a href="stake.md#0x1_stake_spec_contains">spec_contains</a>(validator_set.active_validators, pool_address)
+        && !<a href="stake.md#0x1_stake_spec_contains">spec_contains</a>(validator_set.pending_inactive, pool_address)
+);
+</code></pre>
+
+
+
+<a id="@Specification_1_initialize"></a>
+
+### Function `initialize`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="stake.md#0x1_stake_initialize">initialize</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> disable_invariants_in_body;
+<b>let</b> aptos_addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(aptos_framework);
+<b>aborts_if</b> !<a href="system_addresses.md#0x1_system_addresses_is_aptos_framework_address">system_addresses::is_aptos_framework_address</a>(aptos_addr);
+<b>aborts_if</b> <b>exists</b>&lt;<a href="stake.md#0x1_stake_ValidatorSet">ValidatorSet</a>&gt;(aptos_addr);
+<b>aborts_if</b> <b>exists</b>&lt;<a href="stake.md#0x1_stake_ValidatorPerformance">ValidatorPerformance</a>&gt;(aptos_addr);
+<b>ensures</b> <b>exists</b>&lt;<a href="stake.md#0x1_stake_ValidatorSet">ValidatorSet</a>&gt;(aptos_addr);
+<b>ensures</b> <b>global</b>&lt;<a href="stake.md#0x1_stake_ValidatorSet">ValidatorSet</a>&gt;(aptos_addr).consensus_scheme == 0;
+<b>ensures</b> <b>exists</b>&lt;<a href="stake.md#0x1_stake_ValidatorPerformance">ValidatorPerformance</a>&gt;(aptos_addr);
+</code></pre>
+
+
+
+<a id="@Specification_1_remove_validators"></a>
+
+### Function `remove_validators`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_remove_validators">remove_validators</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, validators: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>requires</b> <a href="chain_status.md#0x1_chain_status_is_operating">chain_status::is_operating</a>();
+<b>let</b> validator_set = <b>global</b>&lt;<a href="stake.md#0x1_stake_ValidatorSet">ValidatorSet</a>&gt;(@aptos_framework);
+<b>let</b> <b>post</b> post_validator_set = <b>global</b>&lt;<a href="stake.md#0x1_stake_ValidatorSet">ValidatorSet</a>&gt;(@aptos_framework);
+<b>let</b> active_validators = validator_set.active_validators;
+<b>let</b> <b>post</b> post_active_validators = post_validator_set.active_validators;
+<b>let</b> pending_inactive_validators = validator_set.pending_inactive;
+<b>let</b> <b>post</b> post_pending_inactive_validators = post_validator_set.pending_inactive;
+<b>invariant</b> len(active_validators) &gt; 0;
+<b>ensures</b> len(active_validators) + len(pending_inactive_validators) == len(post_active_validators)
+    + len(post_pending_inactive_validators);
+</code></pre>
+
+
+
+<a id="@Specification_1_initialize_stake_owner"></a>
+
+### Function `initialize_stake_owner`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="stake.md#0x1_stake_initialize_stake_owner">initialize_stake_owner</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, initial_stake_amount: u64, operator: <b>address</b>, voter: <b>address</b>)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify_duration_estimate = 120;
+<b>include</b> <a href="stake.md#0x1_stake_ResourceRequirement">ResourceRequirement</a>;
+<b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(owner);
+<b>ensures</b> <b>global</b>&lt;<a href="stake.md#0x1_stake_ValidatorConfig">ValidatorConfig</a>&gt;(addr) == <a href="stake.md#0x1_stake_ValidatorConfig">ValidatorConfig</a> {
+    consensus_pubkey: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_empty">vector::empty</a>(),
+    network_addresses: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_empty">vector::empty</a>(),
+    fullnode_addresses: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_empty">vector::empty</a>(),
+    validator_index: 0,
+};
+<b>ensures</b> <b>global</b>&lt;<a href="stake.md#0x1_stake_OwnerCapability">OwnerCapability</a>&gt;(addr) == <a href="stake.md#0x1_stake_OwnerCapability">OwnerCapability</a> { pool_address: addr };
+<b>let</b> <b>post</b> stakepool = <b>global</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(addr);
+<b>let</b> <b>post</b> active = stakepool.active.value;
+<b>let</b> <b>post</b> pending_active = stakepool.pending_active.value;
+<b>ensures</b> <a href="stake.md#0x1_stake_spec_is_current_epoch_validator">spec_is_current_epoch_validator</a>(addr) ==&gt;
+    pending_active == initial_stake_amount;
+<b>ensures</b> !<a href="stake.md#0x1_stake_spec_is_current_epoch_validator">spec_is_current_epoch_validator</a>(addr) ==&gt;
+    active == initial_stake_amount;
+</code></pre>
+
+
+
+<a id="@Specification_1_initialize_validator"></a>
+
+### Function `initialize_validator`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="stake.md#0x1_stake_initialize_validator">initialize_validator</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, consensus_pubkey: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, proof_of_possession: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, network_addresses: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, fullnode_addresses: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> pubkey_from_pop = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/bls12381.md#0x1_bls12381_spec_public_key_from_bytes_with_pop">bls12381::spec_public_key_from_bytes_with_pop</a>(
+    consensus_pubkey,
+    proof_of_possession_from_bytes(proof_of_possession)
+);
+<b>aborts_if</b> !<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_is_some">option::spec_is_some</a>(pubkey_from_pop);
+<b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>);
+<b>let</b> post_addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>);
+<b>let</b> allowed = <b>global</b>&lt;<a href="stake.md#0x1_stake_AllowedValidators">AllowedValidators</a>&gt;(@aptos_framework);
+<b>aborts_if</b> <b>exists</b>&lt;<a href="stake.md#0x1_stake_ValidatorConfig">ValidatorConfig</a>&gt;(addr);
+<b>aborts_if</b> <b>exists</b>&lt;<a href="stake.md#0x1_stake_AllowedValidators">AllowedValidators</a>&gt;(@aptos_framework) && !<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_spec_contains">vector::spec_contains</a>(allowed.accounts, addr);
+<b>aborts_if</b> <a href="stake.md#0x1_stake_stake_pool_exists">stake_pool_exists</a>(addr);
+<b>aborts_if</b> <b>exists</b>&lt;<a href="stake.md#0x1_stake_OwnerCapability">OwnerCapability</a>&gt;(addr);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(addr);
+<b>aborts_if</b> <b>global</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(addr).guid_creation_num + 12 &gt; <a href="stake.md#0x1_stake_MAX_U64">MAX_U64</a>;
+<b>aborts_if</b> <b>global</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(addr).guid_creation_num + 12 &gt;= <a href="account.md#0x1_account_MAX_GUID_CREATION_NUM">account::MAX_GUID_CREATION_NUM</a>;
+<b>ensures</b> <b>exists</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(post_addr);
+<b>ensures</b> <b>global</b>&lt;<a href="stake.md#0x1_stake_OwnerCapability">OwnerCapability</a>&gt;(post_addr) == <a href="stake.md#0x1_stake_OwnerCapability">OwnerCapability</a> { pool_address: post_addr };
+<b>ensures</b> <b>global</b>&lt;<a href="stake.md#0x1_stake_ValidatorConfig">ValidatorConfig</a>&gt;(post_addr) == <a href="stake.md#0x1_stake_ValidatorConfig">ValidatorConfig</a> {
+    consensus_pubkey,
+    network_addresses,
+    fullnode_addresses,
+    validator_index: 0,
+};
+</code></pre>
+
+
+
+<a id="@Specification_1_extract_owner_cap"></a>
+
+### Function `extract_owner_cap`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_extract_owner_cap">extract_owner_cap</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>): <a href="stake.md#0x1_stake_OwnerCapability">stake::OwnerCapability</a>
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify_duration_estimate = 300;
+<b>let</b> owner_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(owner);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="stake.md#0x1_stake_OwnerCapability">OwnerCapability</a>&gt;(owner_address);
+<b>ensures</b> !<b>exists</b>&lt;<a href="stake.md#0x1_stake_OwnerCapability">OwnerCapability</a>&gt;(owner_address);
+</code></pre>
+
+
+
+<a id="@Specification_1_deposit_owner_cap"></a>
+
+### Function `deposit_owner_cap`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_deposit_owner_cap">deposit_owner_cap</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, owner_cap: <a href="stake.md#0x1_stake_OwnerCapability">stake::OwnerCapability</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> owner_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(owner);
+<b>aborts_if</b> <b>exists</b>&lt;<a href="stake.md#0x1_stake_OwnerCapability">OwnerCapability</a>&gt;(owner_address);
+<b>ensures</b> <b>exists</b>&lt;<a href="stake.md#0x1_stake_OwnerCapability">OwnerCapability</a>&gt;(owner_address);
+<b>ensures</b> <b>global</b>&lt;<a href="stake.md#0x1_stake_OwnerCapability">OwnerCapability</a>&gt;(owner_address) == owner_cap;
+</code></pre>
+
+
+
+<a id="@Specification_1_set_operator_with_cap"></a>
+
+### Function `set_operator_with_cap`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_set_operator_with_cap">set_operator_with_cap</a>(owner_cap: &<a href="stake.md#0x1_stake_OwnerCapability">stake::OwnerCapability</a>, new_operator: <b>address</b>)
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> pool_address = owner_cap.pool_address;
+<b>let</b> <b>post</b> post_stake_pool = <b>global</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(pool_address);
+<b>modifies</b> <b>global</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(pool_address);
+<b>include</b> <a href="stake.md#0x1_stake_StakedValueNochange">StakedValueNochange</a>;
+<b>ensures</b> post_stake_pool.operator_address == new_operator;
+</code></pre>
+
+
+
+<a id="@Specification_1_set_delegated_voter_with_cap"></a>
+
+### Function `set_delegated_voter_with_cap`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_set_delegated_voter_with_cap">set_delegated_voter_with_cap</a>(owner_cap: &<a href="stake.md#0x1_stake_OwnerCapability">stake::OwnerCapability</a>, new_voter: <b>address</b>)
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> pool_address = owner_cap.pool_address;
+<b>let</b> <b>post</b> post_stake_pool = <b>global</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(pool_address);
+<b>include</b> <a href="stake.md#0x1_stake_StakedValueNochange">StakedValueNochange</a>;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(pool_address);
+<b>modifies</b> <b>global</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(pool_address);
+<b>ensures</b> post_stake_pool.delegated_voter == new_voter;
+</code></pre>
+
+
+
+<a id="@Specification_1_add_stake"></a>
+
+### Function `add_stake`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="stake.md#0x1_stake_add_stake">add_stake</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, amount: u64)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify_duration_estimate = 120;
+<b>pragma</b> aborts_if_is_partial;
+<b>aborts_if</b> <a href="reconfiguration_state.md#0x1_reconfiguration_state_spec_is_in_progress">reconfiguration_state::spec_is_in_progress</a>();
+<b>include</b> <a href="stake.md#0x1_stake_ResourceRequirement">ResourceRequirement</a>;
+<b>include</b> <a href="stake.md#0x1_stake_AddStakeAbortsIfAndEnsures">AddStakeAbortsIfAndEnsures</a>;
+</code></pre>
+
+
+
+<a id="@Specification_1_add_stake_with_cap"></a>
+
+### Function `add_stake_with_cap`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_add_stake_with_cap">add_stake_with_cap</a>(owner_cap: &<a href="stake.md#0x1_stake_OwnerCapability">stake::OwnerCapability</a>, coins: <a href="coin.md#0x1_coin_Coin">coin::Coin</a>&lt;<a href="aptos_coin.md#0x1_aptos_coin_AptosCoin">aptos_coin::AptosCoin</a>&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> disable_invariants_in_body;
+<b>pragma</b> verify_duration_estimate = 300;
+<b>include</b> <a href="stake.md#0x1_stake_ResourceRequirement">ResourceRequirement</a>;
+<b>let</b> amount = coins.value;
+<b>aborts_if</b> <a href="reconfiguration_state.md#0x1_reconfiguration_state_spec_is_in_progress">reconfiguration_state::spec_is_in_progress</a>();
+<b>include</b> <a href="stake.md#0x1_stake_AddStakeWithCapAbortsIfAndEnsures">AddStakeWithCapAbortsIfAndEnsures</a> { amount };
+</code></pre>
+
+
+
+<a id="@Specification_1_reactivate_stake_with_cap"></a>
+
+### Function `reactivate_stake_with_cap`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_reactivate_stake_with_cap">reactivate_stake_with_cap</a>(owner_cap: &<a href="stake.md#0x1_stake_OwnerCapability">stake::OwnerCapability</a>, amount: u64)
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> pool_address = owner_cap.pool_address;
+<b>include</b> <a href="stake.md#0x1_stake_StakedValueNochange">StakedValueNochange</a>;
+<b>aborts_if</b> <a href="reconfiguration_state.md#0x1_reconfiguration_state_spec_is_in_progress">reconfiguration_state::spec_is_in_progress</a>();
+<b>aborts_if</b> !<a href="stake.md#0x1_stake_stake_pool_exists">stake_pool_exists</a>(pool_address);
+<b>let</b> pre_stake_pool = <b>global</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(pool_address);
+<b>let</b> <b>post</b> stake_pool = <b>global</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(pool_address);
+<b>modifies</b> <b>global</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(pool_address);
+<b>let</b> min_amount = aptos_std::math64::min(amount, pre_stake_pool.pending_inactive.value);
+<b>ensures</b> stake_pool.pending_inactive.value == pre_stake_pool.pending_inactive.value - min_amount;
+<b>ensures</b> stake_pool.active.value == pre_stake_pool.active.value + min_amount;
+</code></pre>
+
+
+
+<a id="@Specification_1_rotate_consensus_key"></a>
+
+### Function `rotate_consensus_key`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="stake.md#0x1_stake_rotate_consensus_key">rotate_consensus_key</a>(operator: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, pool_address: <b>address</b>, new_consensus_pubkey: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, proof_of_possession: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> pre_stake_pool = <b>global</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(pool_address);
+<b>let</b> <b>post</b> validator_info = <b>global</b>&lt;<a href="stake.md#0x1_stake_ValidatorConfig">ValidatorConfig</a>&gt;(pool_address);
+<b>aborts_if</b> <a href="reconfiguration_state.md#0x1_reconfiguration_state_spec_is_in_progress">reconfiguration_state::spec_is_in_progress</a>();
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(pool_address);
+<b>aborts_if</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(operator) != pre_stake_pool.operator_address;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="stake.md#0x1_stake_ValidatorConfig">ValidatorConfig</a>&gt;(pool_address);
+<b>let</b> pubkey_from_pop = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/bls12381.md#0x1_bls12381_spec_public_key_from_bytes_with_pop">bls12381::spec_public_key_from_bytes_with_pop</a>(
+    new_consensus_pubkey,
+    proof_of_possession_from_bytes(proof_of_possession)
+);
+<b>aborts_if</b> !<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_is_some">option::spec_is_some</a>(pubkey_from_pop);
+<b>modifies</b> <b>global</b>&lt;<a href="stake.md#0x1_stake_ValidatorConfig">ValidatorConfig</a>&gt;(pool_address);
+<b>include</b> <a href="stake.md#0x1_stake_StakedValueNochange">StakedValueNochange</a>;
+<b>ensures</b> validator_info.consensus_pubkey == new_consensus_pubkey;
+</code></pre>
+
+
+
+<a id="@Specification_1_update_network_and_fullnode_addresses"></a>
+
+### Function `update_network_and_fullnode_addresses`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="stake.md#0x1_stake_update_network_and_fullnode_addresses">update_network_and_fullnode_addresses</a>(operator: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, pool_address: <b>address</b>, new_network_addresses: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, new_fullnode_addresses: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> pre_stake_pool = <b>global</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(pool_address);
+<b>let</b> <b>post</b> validator_info = <b>global</b>&lt;<a href="stake.md#0x1_stake_ValidatorConfig">ValidatorConfig</a>&gt;(pool_address);
+<b>modifies</b> <b>global</b>&lt;<a href="stake.md#0x1_stake_ValidatorConfig">ValidatorConfig</a>&gt;(pool_address);
+<b>include</b> <a href="stake.md#0x1_stake_StakedValueNochange">StakedValueNochange</a>;
+<b>aborts_if</b> <a href="reconfiguration_state.md#0x1_reconfiguration_state_spec_is_in_progress">reconfiguration_state::spec_is_in_progress</a>();
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(pool_address);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="stake.md#0x1_stake_ValidatorConfig">ValidatorConfig</a>&gt;(pool_address);
+<b>aborts_if</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(operator) != pre_stake_pool.operator_address;
+<b>ensures</b> validator_info.network_addresses == new_network_addresses;
+<b>ensures</b> validator_info.fullnode_addresses == new_fullnode_addresses;
+</code></pre>
+
+
+
+<a id="@Specification_1_increase_lockup_with_cap"></a>
+
+### Function `increase_lockup_with_cap`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_increase_lockup_with_cap">increase_lockup_with_cap</a>(owner_cap: &<a href="stake.md#0x1_stake_OwnerCapability">stake::OwnerCapability</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> config = <b>global</b>&lt;<a href="staking_config.md#0x1_staking_config_StakingConfig">staking_config::StakingConfig</a>&gt;(@aptos_framework);
+<b>let</b> pool_address = owner_cap.pool_address;
+<b>let</b> pre_stake_pool = <b>global</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(pool_address);
+<b>let</b> <b>post</b> stake_pool = <b>global</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(pool_address);
+<b>let</b> now_seconds = <a href="timestamp.md#0x1_timestamp_spec_now_seconds">timestamp::spec_now_seconds</a>();
+<b>let</b> lockup = config.recurring_lockup_duration_secs;
+<b>modifies</b> <b>global</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(pool_address);
+<b>include</b> <a href="stake.md#0x1_stake_StakedValueNochange">StakedValueNochange</a>;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(pool_address);
+<b>aborts_if</b> pre_stake_pool.locked_until_secs &gt;= lockup + now_seconds;
+<b>aborts_if</b> lockup + now_seconds &gt; <a href="stake.md#0x1_stake_MAX_U64">MAX_U64</a>;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="timestamp.md#0x1_timestamp_CurrentTimeMicroseconds">timestamp::CurrentTimeMicroseconds</a>&gt;(@aptos_framework);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="staking_config.md#0x1_staking_config_StakingConfig">staking_config::StakingConfig</a>&gt;(@aptos_framework);
+<b>ensures</b> stake_pool.locked_until_secs == lockup + now_seconds;
+</code></pre>
+
+
+
+<a id="@Specification_1_join_validator_set"></a>
+
+### Function `join_validator_set`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="stake.md#0x1_stake_join_validator_set">join_validator_set</a>(operator: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, pool_address: <b>address</b>)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> disable_invariants_in_body;
+<b>aborts_if</b> !<a href="staking_config.md#0x1_staking_config_get_allow_validator_set_change">staking_config::get_allow_validator_set_change</a>(<a href="staking_config.md#0x1_staking_config_get">staking_config::get</a>());
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(pool_address);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="stake.md#0x1_stake_ValidatorConfig">ValidatorConfig</a>&gt;(pool_address);
+<b>aborts_if</b> !<b>exists</b>&lt;StakingConfig&gt;(@aptos_framework);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="stake.md#0x1_stake_ValidatorSet">ValidatorSet</a>&gt;(@aptos_framework);
+<b>aborts_if</b> <a href="reconfiguration_state.md#0x1_reconfiguration_state_spec_is_in_progress">reconfiguration_state::spec_is_in_progress</a>();
+<b>let</b> stake_pool = <b>global</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(pool_address);
+<b>let</b> validator_set = <b>global</b>&lt;<a href="stake.md#0x1_stake_ValidatorSet">ValidatorSet</a>&gt;(@aptos_framework);
+<b>let</b> <b>post</b> p_validator_set = <b>global</b>&lt;<a href="stake.md#0x1_stake_ValidatorSet">ValidatorSet</a>&gt;(@aptos_framework);
+<b>aborts_if</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(operator) != stake_pool.operator_address;
+<b>aborts_if</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_is_some">option::spec_is_some</a>(<a href="stake.md#0x1_stake_spec_find_validator">spec_find_validator</a>(validator_set.active_validators, pool_address)) ||
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_is_some">option::spec_is_some</a>(<a href="stake.md#0x1_stake_spec_find_validator">spec_find_validator</a>(validator_set.pending_inactive, pool_address)) ||
+                <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_is_some">option::spec_is_some</a>(<a href="stake.md#0x1_stake_spec_find_validator">spec_find_validator</a>(validator_set.pending_active, pool_address));
+<b>let</b> config = <a href="staking_config.md#0x1_staking_config_get">staking_config::get</a>();
+<b>let</b> voting_power = <a href="stake.md#0x1_stake_get_next_epoch_voting_power">get_next_epoch_voting_power</a>(stake_pool);
+<b>let</b> minimum_stake = config.minimum_stake;
+<b>let</b> maximum_stake = config.maximum_stake;
+<b>aborts_if</b> voting_power &lt; minimum_stake;
+<b>aborts_if</b> voting_power &gt;maximum_stake;
+<b>let</b> validator_config = <b>global</b>&lt;<a href="stake.md#0x1_stake_ValidatorConfig">ValidatorConfig</a>&gt;(pool_address);
+<b>aborts_if</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_is_empty">vector::is_empty</a>(validator_config.consensus_pubkey);
+<b>let</b> validator_set_size = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(validator_set.active_validators) + <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(validator_set.pending_active) + 1;
+<b>aborts_if</b> validator_set_size &gt; <a href="stake.md#0x1_stake_MAX_VALIDATOR_SET_SIZE">MAX_VALIDATOR_SET_SIZE</a>;
+<b>let</b> voting_power_increase_limit = (<a href="staking_config.md#0x1_staking_config_get_voting_power_increase_limit">staking_config::get_voting_power_increase_limit</a>(config) <b>as</b> u128);
+<b>aborts_if</b> (validator_set.total_joining_power + (voting_power <b>as</b> u128)) &gt; MAX_U128;
+<b>aborts_if</b> validator_set.total_voting_power * voting_power_increase_limit &gt; MAX_U128;
+<b>aborts_if</b> validator_set.total_voting_power &gt; 0 &&
+    (validator_set.total_joining_power + (voting_power <b>as</b> u128)) * 100 &gt; validator_set.total_voting_power * voting_power_increase_limit;
+<b>let</b> <b>post</b> p_validator_info = <a href="stake.md#0x1_stake_ValidatorInfo">ValidatorInfo</a> {
+    addr: pool_address,
+    voting_power,
+    config: validator_config,
+};
+<b>ensures</b> validator_set.total_joining_power + voting_power == p_validator_set.total_joining_power;
+<b>ensures</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_spec_contains">vector::spec_contains</a>(p_validator_set.pending_active, p_validator_info);
+</code></pre>
+
+
+
+<a id="@Specification_1_unlock_with_cap"></a>
+
+### Function `unlock_with_cap`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_unlock_with_cap">unlock_with_cap</a>(amount: u64, owner_cap: &<a href="stake.md#0x1_stake_OwnerCapability">stake::OwnerCapability</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify_duration_estimate = 300;
+<b>let</b> pool_address = owner_cap.pool_address;
+<b>let</b> pre_stake_pool = <b>global</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(pool_address);
+<b>let</b> <b>post</b> stake_pool = <b>global</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(pool_address);
+<b>aborts_if</b> <a href="reconfiguration_state.md#0x1_reconfiguration_state_spec_is_in_progress">reconfiguration_state::spec_is_in_progress</a>();
+<b>aborts_if</b> amount != 0 && !<b>exists</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(pool_address);
+<b>modifies</b> <b>global</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(pool_address);
+<b>include</b> <a href="stake.md#0x1_stake_StakedValueNochange">StakedValueNochange</a>;
+<b>let</b> min_amount = aptos_std::math64::min(amount,pre_stake_pool.active.value);
+<b>ensures</b> stake_pool.active.value == pre_stake_pool.active.value - min_amount;
+<b>ensures</b> stake_pool.pending_inactive.value == pre_stake_pool.pending_inactive.value + min_amount;
+</code></pre>
+
+
+
+<a id="@Specification_1_withdraw"></a>
+
+### Function `withdraw`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="stake.md#0x1_stake_withdraw">withdraw</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, withdraw_amount: u64)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+<b>aborts_if</b> <a href="reconfiguration_state.md#0x1_reconfiguration_state_spec_is_in_progress">reconfiguration_state::spec_is_in_progress</a>();
+<b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(owner);
+<b>let</b> ownership_cap = <b>global</b>&lt;<a href="stake.md#0x1_stake_OwnerCapability">OwnerCapability</a>&gt;(addr);
+<b>let</b> pool_address = ownership_cap.pool_address;
+<b>let</b> stake_pool = <b>global</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(pool_address);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="stake.md#0x1_stake_OwnerCapability">OwnerCapability</a>&gt;(addr);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(pool_address);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="stake.md#0x1_stake_ValidatorSet">ValidatorSet</a>&gt;(@aptos_framework);
+<b>let</b> validator_set = <b>global</b>&lt;<a href="stake.md#0x1_stake_ValidatorSet">ValidatorSet</a>&gt;(@aptos_framework);
+<b>let</b> bool_find_validator = !<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_is_some">option::spec_is_some</a>(<a href="stake.md#0x1_stake_spec_find_validator">spec_find_validator</a>(validator_set.active_validators, pool_address)) &&
+            !<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_is_some">option::spec_is_some</a>(<a href="stake.md#0x1_stake_spec_find_validator">spec_find_validator</a>(validator_set.pending_inactive, pool_address)) &&
+                !<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_is_some">option::spec_is_some</a>(<a href="stake.md#0x1_stake_spec_find_validator">spec_find_validator</a>(validator_set.pending_active, pool_address));
+<b>aborts_if</b> bool_find_validator && !<b>exists</b>&lt;<a href="timestamp.md#0x1_timestamp_CurrentTimeMicroseconds">timestamp::CurrentTimeMicroseconds</a>&gt;(@aptos_framework);
+<b>let</b> new_withdraw_amount_1 = <b>min</b>(withdraw_amount, stake_pool.inactive.value + stake_pool.pending_inactive.value);
+<b>let</b> new_withdraw_amount_2 = <b>min</b>(withdraw_amount, stake_pool.inactive.value);
+<b>aborts_if</b> bool_find_validator && <a href="timestamp.md#0x1_timestamp_now_seconds">timestamp::now_seconds</a>() &gt; stake_pool.locked_until_secs &&
+            new_withdraw_amount_1 &gt; 0 && stake_pool.inactive.value + stake_pool.pending_inactive.value &lt; new_withdraw_amount_1;
+<b>aborts_if</b> !(bool_find_validator && <b>exists</b>&lt;<a href="timestamp.md#0x1_timestamp_CurrentTimeMicroseconds">timestamp::CurrentTimeMicroseconds</a>&gt;(@aptos_framework)) &&
+            new_withdraw_amount_2 &gt; 0 && stake_pool.inactive.value &lt; new_withdraw_amount_2;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;AptosCoin&gt;&gt;(addr);
+<b>include</b> <a href="coin.md#0x1_coin_DepositAbortsIf">coin::DepositAbortsIf</a>&lt;AptosCoin&gt;{account_addr: addr};
+<b>let</b> coin_store = <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;AptosCoin&gt;&gt;(addr);
+<b>let</b> <b>post</b> p_coin_store = <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;AptosCoin&gt;&gt;(addr);
+<b>ensures</b> bool_find_validator && <a href="timestamp.md#0x1_timestamp_now_seconds">timestamp::now_seconds</a>() &gt; stake_pool.locked_until_secs
+            && <b>exists</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(addr) && <b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;AptosCoin&gt;&gt;(addr) ==&gt;
+                coin_store.<a href="coin.md#0x1_coin">coin</a>.value + new_withdraw_amount_1 == p_coin_store.<a href="coin.md#0x1_coin">coin</a>.value;
+<b>ensures</b> !(bool_find_validator && <b>exists</b>&lt;<a href="timestamp.md#0x1_timestamp_CurrentTimeMicroseconds">timestamp::CurrentTimeMicroseconds</a>&gt;(@aptos_framework))
+            && <b>exists</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(addr) && <b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;AptosCoin&gt;&gt;(addr) ==&gt;
+                coin_store.<a href="coin.md#0x1_coin">coin</a>.value + new_withdraw_amount_2 == p_coin_store.<a href="coin.md#0x1_coin">coin</a>.value;
+</code></pre>
+
+
+
+<a id="@Specification_1_leave_validator_set"></a>
+
+### Function `leave_validator_set`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="stake.md#0x1_stake_leave_validator_set">leave_validator_set</a>(operator: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, pool_address: <b>address</b>)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> disable_invariants_in_body;
+<b>requires</b> <a href="chain_status.md#0x1_chain_status_is_operating">chain_status::is_operating</a>();
+<b>aborts_if</b> <a href="reconfiguration_state.md#0x1_reconfiguration_state_spec_is_in_progress">reconfiguration_state::spec_is_in_progress</a>();
+<b>let</b> config = <a href="staking_config.md#0x1_staking_config_get">staking_config::get</a>();
+<b>aborts_if</b> !<a href="staking_config.md#0x1_staking_config_get_allow_validator_set_change">staking_config::get_allow_validator_set_change</a>(config);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(pool_address);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="stake.md#0x1_stake_ValidatorSet">ValidatorSet</a>&gt;(@aptos_framework);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="staking_config.md#0x1_staking_config_StakingConfig">staking_config::StakingConfig</a>&gt;(@aptos_framework);
+<b>let</b> stake_pool = <b>global</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(pool_address);
+<b>aborts_if</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(operator) != stake_pool.operator_address;
+<b>let</b> validator_set = <b>global</b>&lt;<a href="stake.md#0x1_stake_ValidatorSet">ValidatorSet</a>&gt;(@aptos_framework);
+<b>let</b> validator_find_bool = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_is_some">option::spec_is_some</a>(<a href="stake.md#0x1_stake_spec_find_validator">spec_find_validator</a>(validator_set.pending_active, pool_address));
+<b>let</b> active_validators = validator_set.active_validators;
+<b>let</b> pending_active = validator_set.pending_active;
+<b>let</b> <b>post</b> post_validator_set = <b>global</b>&lt;<a href="stake.md#0x1_stake_ValidatorSet">ValidatorSet</a>&gt;(@aptos_framework);
+<b>let</b> <b>post</b> post_active_validators = post_validator_set.active_validators;
+<b>let</b> pending_inactive_validators = validator_set.pending_inactive;
+<b>let</b> <b>post</b> post_pending_inactive_validators = post_validator_set.pending_inactive;
+<b>ensures</b> len(active_validators) + len(pending_inactive_validators) == len(post_active_validators)
+    + len(post_pending_inactive_validators);
+<b>aborts_if</b> !validator_find_bool && !<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_is_some">option::spec_is_some</a>(<a href="stake.md#0x1_stake_spec_find_validator">spec_find_validator</a>(active_validators, pool_address));
+<b>aborts_if</b> !validator_find_bool && <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(validator_set.active_validators) &lt;= <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_borrow">option::spec_borrow</a>(<a href="stake.md#0x1_stake_spec_find_validator">spec_find_validator</a>(active_validators, pool_address));
+<b>aborts_if</b> !validator_find_bool && <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(validator_set.active_validators) &lt; 2;
+<b>aborts_if</b> validator_find_bool && <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(validator_set.pending_active) &lt;= <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_borrow">option::spec_borrow</a>(<a href="stake.md#0x1_stake_spec_find_validator">spec_find_validator</a>(pending_active, pool_address));
+<b>let</b> <b>post</b> p_validator_set = <b>global</b>&lt;<a href="stake.md#0x1_stake_ValidatorSet">ValidatorSet</a>&gt;(@aptos_framework);
+<b>let</b> validator_stake = (<a href="stake.md#0x1_stake_get_next_epoch_voting_power">get_next_epoch_voting_power</a>(stake_pool) <b>as</b> u128);
+<b>ensures</b> validator_find_bool && validator_set.total_joining_power &gt; validator_stake ==&gt;
+            p_validator_set.total_joining_power == validator_set.total_joining_power - validator_stake;
+<b>ensures</b> !validator_find_bool ==&gt; !<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_is_some">option::spec_is_some</a>(<a href="stake.md#0x1_stake_spec_find_validator">spec_find_validator</a>(p_validator_set.pending_active, pool_address));
+</code></pre>
+
+
+
+<a id="@Specification_1_is_current_epoch_validator"></a>
+
+### Function `is_current_epoch_validator`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_is_current_epoch_validator">is_current_epoch_validator</a>(pool_address: <b>address</b>): bool
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="stake.md#0x1_stake_ResourceRequirement">ResourceRequirement</a>;
+<b>aborts_if</b> !<a href="stake.md#0x1_stake_spec_has_stake_pool">spec_has_stake_pool</a>(pool_address);
+<b>ensures</b> result == <a href="stake.md#0x1_stake_spec_is_current_epoch_validator">spec_is_current_epoch_validator</a>(pool_address);
+</code></pre>
+
+
+
+<a id="@Specification_1_update_performance_statistics"></a>
+
+### Function `update_performance_statistics`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="stake.md#0x1_stake_update_performance_statistics">update_performance_statistics</a>(proposer_index: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;u64&gt;, failed_proposer_indices: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u64&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>requires</b> <a href="chain_status.md#0x1_chain_status_is_operating">chain_status::is_operating</a>();
+<b>aborts_if</b> <b>false</b>;
+<b>let</b> validator_perf = <b>global</b>&lt;<a href="stake.md#0x1_stake_ValidatorPerformance">ValidatorPerformance</a>&gt;(@aptos_framework);
+<b>let</b> <b>post</b> post_validator_perf = <b>global</b>&lt;<a href="stake.md#0x1_stake_ValidatorPerformance">ValidatorPerformance</a>&gt;(@aptos_framework);
+<b>let</b> validator_len = len(validator_perf.validators);
+<b>ensures</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_is_some">option::spec_is_some</a>(<a href="stake.md#0x1_stake_ghost_proposer_idx">ghost_proposer_idx</a>) && <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_borrow">option::spec_borrow</a>(<a href="stake.md#0x1_stake_ghost_proposer_idx">ghost_proposer_idx</a>) &lt; validator_len) ==&gt;
+    (post_validator_perf.validators[<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_borrow">option::spec_borrow</a>(<a href="stake.md#0x1_stake_ghost_proposer_idx">ghost_proposer_idx</a>)].successful_proposals ==
+        validator_perf.validators[<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_borrow">option::spec_borrow</a>(<a href="stake.md#0x1_stake_ghost_proposer_idx">ghost_proposer_idx</a>)].successful_proposals + 1);
+</code></pre>
+
+
+
+<a id="@Specification_1_on_new_epoch"></a>
+
+### Function `on_new_epoch`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="stake.md#0x1_stake_on_new_epoch">on_new_epoch</a>()
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+<b>pragma</b> disable_invariants_in_body;
+<b>include</b> <a href="stake.md#0x1_stake_ResourceRequirement">ResourceRequirement</a>;
+<b>include</b> <a href="stake.md#0x1_stake_GetReconfigStartTimeRequirement">GetReconfigStartTimeRequirement</a>;
+<b>include</b> <a href="staking_config.md#0x1_staking_config_StakingRewardsConfigRequirement">staking_config::StakingRewardsConfigRequirement</a>;
+<b>include</b> aptos_framework::aptos_coin::ExistsAptosCoin;
+// This enforces <a id="high-level-req-4" href="#high-level-req">high-level requirement 4</a>:
+<b>aborts_if</b> <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_next_validator_consensus_infos"></a>
+
+### Function `next_validator_consensus_infos`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_next_validator_consensus_infos">next_validator_consensus_infos</a>(): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="validator_consensus_info.md#0x1_validator_consensus_info_ValidatorConsensusInfo">validator_consensus_info::ValidatorConsensusInfo</a>&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify_duration_estimate = 300;
+<b>aborts_if</b> <b>false</b>;
+<b>include</b> <a href="stake.md#0x1_stake_ResourceRequirement">ResourceRequirement</a>;
+<b>include</b> <a href="stake.md#0x1_stake_GetReconfigStartTimeRequirement">GetReconfigStartTimeRequirement</a>;
+<b>include</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_spec_periodical_reward_rate_decrease_enabled">features::spec_periodical_reward_rate_decrease_enabled</a>() ==&gt; <a href="staking_config.md#0x1_staking_config_StakingRewardsConfigEnabledRequirement">staking_config::StakingRewardsConfigEnabledRequirement</a>;
+</code></pre>
+
+
+
+<a id="@Specification_1_validator_consensus_infos_from_validator_set"></a>
+
+### Function `validator_consensus_infos_from_validator_set`
+
+
+<pre><code><b>fun</b> <a href="stake.md#0x1_stake_validator_consensus_infos_from_validator_set">validator_consensus_infos_from_validator_set</a>(validator_set: &<a href="stake.md#0x1_stake_ValidatorSet">stake::ValidatorSet</a>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="validator_consensus_info.md#0x1_validator_consensus_info_ValidatorConsensusInfo">validator_consensus_info::ValidatorConsensusInfo</a>&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+<b>invariant</b> <a href="stake.md#0x1_stake_spec_validator_indices_are_valid_config">spec_validator_indices_are_valid_config</a>(validator_set.active_validators,
+    len(validator_set.active_validators) + len(validator_set.pending_inactive));
+<b>invariant</b> len(validator_set.pending_inactive) == 0 ||
+    <a href="stake.md#0x1_stake_spec_validator_indices_are_valid_config">spec_validator_indices_are_valid_config</a>(validator_set.pending_inactive,
+        len(validator_set.active_validators) + len(validator_set.pending_inactive));
+</code></pre>
+
+
+
+
+<a id="0x1_stake_AddStakeWithCapAbortsIfAndEnsures"></a>
+
+
+<pre><code><b>schema</b> <a href="stake.md#0x1_stake_AddStakeWithCapAbortsIfAndEnsures">AddStakeWithCapAbortsIfAndEnsures</a> {
+    owner_cap: <a href="stake.md#0x1_stake_OwnerCapability">OwnerCapability</a>;
+    amount: u64;
+    <b>let</b> pool_address = owner_cap.pool_address;
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(pool_address);
+    <b>let</b> config = <b>global</b>&lt;<a href="staking_config.md#0x1_staking_config_StakingConfig">staking_config::StakingConfig</a>&gt;(@aptos_framework);
+    <b>let</b> validator_set = <b>global</b>&lt;<a href="stake.md#0x1_stake_ValidatorSet">ValidatorSet</a>&gt;(@aptos_framework);
+    <b>let</b> voting_power_increase_limit = config.voting_power_increase_limit;
+    <b>let</b> <b>post</b> post_validator_set = <b>global</b>&lt;<a href="stake.md#0x1_stake_ValidatorSet">ValidatorSet</a>&gt;(@aptos_framework);
+    <b>let</b> update_voting_power_increase = amount != 0 && (<a href="stake.md#0x1_stake_spec_contains">spec_contains</a>(validator_set.active_validators, pool_address)
+                                                       || <a href="stake.md#0x1_stake_spec_contains">spec_contains</a>(validator_set.pending_active, pool_address));
+    <b>aborts_if</b> update_voting_power_increase && validator_set.total_joining_power + amount &gt; MAX_U128;
+    <b>ensures</b> update_voting_power_increase ==&gt; post_validator_set.total_joining_power == validator_set.total_joining_power + amount;
+    <b>aborts_if</b> update_voting_power_increase && validator_set.total_voting_power &gt; 0
+            && validator_set.total_voting_power * voting_power_increase_limit &gt; MAX_U128;
+    <b>aborts_if</b> update_voting_power_increase && validator_set.total_voting_power &gt; 0
+            && validator_set.total_joining_power + amount &gt; validator_set.total_voting_power * voting_power_increase_limit / 100;
+    <b>let</b> stake_pool = <b>global</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(pool_address);
+    <b>let</b> <b>post</b> post_stake_pool = <b>global</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(pool_address);
+    <b>let</b> value_pending_active = stake_pool.pending_active.value;
+    <b>let</b> value_active = stake_pool.active.value;
+    <b>ensures</b> amount != 0 && <a href="stake.md#0x1_stake_spec_is_current_epoch_validator">spec_is_current_epoch_validator</a>(pool_address) ==&gt; post_stake_pool.pending_active.value == value_pending_active + amount;
+    <b>ensures</b> amount != 0 && !<a href="stake.md#0x1_stake_spec_is_current_epoch_validator">spec_is_current_epoch_validator</a>(pool_address) ==&gt; post_stake_pool.active.value == value_active + amount;
+    <b>let</b> maximum_stake = config.maximum_stake;
+    <b>let</b> value_pending_inactive = stake_pool.pending_inactive.value;
+    <b>let</b> next_epoch_voting_power = value_pending_active + value_active + value_pending_inactive;
+    <b>let</b> voting_power = next_epoch_voting_power + amount;
+    <b>aborts_if</b> amount != 0 && voting_power &gt; <a href="stake.md#0x1_stake_MAX_U64">MAX_U64</a>;
+    <b>aborts_if</b> amount != 0 && voting_power &gt; maximum_stake;
+}
+</code></pre>
+
+
+
+
+<a id="0x1_stake_AddStakeAbortsIfAndEnsures"></a>
+
+
+<pre><code><b>schema</b> <a href="stake.md#0x1_stake_AddStakeAbortsIfAndEnsures">AddStakeAbortsIfAndEnsures</a> {
+    owner: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>;
+    amount: u64;
+    <b>let</b> owner_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(owner);
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="stake.md#0x1_stake_OwnerCapability">OwnerCapability</a>&gt;(owner_address);
+    <b>let</b> owner_cap = <b>global</b>&lt;<a href="stake.md#0x1_stake_OwnerCapability">OwnerCapability</a>&gt;(owner_address);
+    <b>include</b> <a href="stake.md#0x1_stake_AddStakeWithCapAbortsIfAndEnsures">AddStakeWithCapAbortsIfAndEnsures</a> { owner_cap };
+}
+</code></pre>
+
+
+
+
+<a id="0x1_stake_spec_is_allowed"></a>
+
+
+<pre><code><b>fun</b> <a href="stake.md#0x1_stake_spec_is_allowed">spec_is_allowed</a>(<a href="account.md#0x1_account">account</a>: <b>address</b>): bool {
+   <b>if</b> (!<b>exists</b>&lt;<a href="stake.md#0x1_stake_AllowedValidators">AllowedValidators</a>&gt;(@aptos_framework)) {
+       <b>true</b>
+   } <b>else</b> {
+       <b>let</b> allowed = <b>global</b>&lt;<a href="stake.md#0x1_stake_AllowedValidators">AllowedValidators</a>&gt;(@aptos_framework);
+       contains(allowed.accounts, <a href="account.md#0x1_account">account</a>)
+   }
+}
+</code></pre>
+
+
+
+
+<a id="0x1_stake_spec_find_validator"></a>
+
+
+<pre><code><b>fun</b> <a href="stake.md#0x1_stake_spec_find_validator">spec_find_validator</a>(v: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="stake.md#0x1_stake_ValidatorInfo">ValidatorInfo</a>&gt;, addr: <b>address</b>): Option&lt;u64&gt;;
+</code></pre>
+
+
+
+
+<a id="0x1_stake_spec_validators_are_initialized"></a>
+
+
+<pre><code><b>fun</b> <a href="stake.md#0x1_stake_spec_validators_are_initialized">spec_validators_are_initialized</a>(validators: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="stake.md#0x1_stake_ValidatorInfo">ValidatorInfo</a>&gt;): bool {
+   <b>forall</b> i in 0..len(validators):
+       <a href="stake.md#0x1_stake_spec_has_stake_pool">spec_has_stake_pool</a>(validators[i].addr) &&
+           <a href="stake.md#0x1_stake_spec_has_validator_config">spec_has_validator_config</a>(validators[i].addr)
+}
+</code></pre>
+
+
+
+
+<a id="0x1_stake_spec_validators_are_initialized_addrs"></a>
+
+
+<pre><code><b>fun</b> <a href="stake.md#0x1_stake_spec_validators_are_initialized_addrs">spec_validators_are_initialized_addrs</a>(addrs: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;): bool {
+   <b>forall</b> i in 0..len(addrs):
+       <a href="stake.md#0x1_stake_spec_has_stake_pool">spec_has_stake_pool</a>(addrs[i]) &&
+           <a href="stake.md#0x1_stake_spec_has_validator_config">spec_has_validator_config</a>(addrs[i])
+}
+</code></pre>
+
+
+
+
+<a id="0x1_stake_spec_validator_indices_are_valid"></a>
+
+
+<pre><code><b>fun</b> <a href="stake.md#0x1_stake_spec_validator_indices_are_valid">spec_validator_indices_are_valid</a>(validators: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="stake.md#0x1_stake_ValidatorInfo">ValidatorInfo</a>&gt;): bool {
+   <a href="stake.md#0x1_stake_spec_validator_indices_are_valid_addr">spec_validator_indices_are_valid_addr</a>(validators, <a href="stake.md#0x1_stake_spec_validator_index_upper_bound">spec_validator_index_upper_bound</a>()) &&
+       <a href="stake.md#0x1_stake_spec_validator_indices_are_valid_config">spec_validator_indices_are_valid_config</a>(validators, <a href="stake.md#0x1_stake_spec_validator_index_upper_bound">spec_validator_index_upper_bound</a>())
+}
+</code></pre>
+
+
+
+
+<a id="0x1_stake_spec_validator_indices_are_valid_addr"></a>
+
+
+<pre><code><b>fun</b> <a href="stake.md#0x1_stake_spec_validator_indices_are_valid_addr">spec_validator_indices_are_valid_addr</a>(validators: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="stake.md#0x1_stake_ValidatorInfo">ValidatorInfo</a>&gt;, upper_bound: u64): bool {
+   <b>forall</b> i in 0..len(validators):
+       <b>global</b>&lt;<a href="stake.md#0x1_stake_ValidatorConfig">ValidatorConfig</a>&gt;(validators[i].addr).validator_index &lt; upper_bound
+}
+</code></pre>
+
+
+
+
+<a id="0x1_stake_spec_validator_indices_are_valid_config"></a>
+
+
+<pre><code><b>fun</b> <a href="stake.md#0x1_stake_spec_validator_indices_are_valid_config">spec_validator_indices_are_valid_config</a>(validators: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="stake.md#0x1_stake_ValidatorInfo">ValidatorInfo</a>&gt;, upper_bound: u64): bool {
+   <b>forall</b> i in 0..len(validators):
+       validators[i].config.validator_index &lt; upper_bound
+}
+</code></pre>
+
+
+
+
+<a id="0x1_stake_spec_validator_indices_active_pending_inactive"></a>
+
+
+<pre><code><b>fun</b> <a href="stake.md#0x1_stake_spec_validator_indices_active_pending_inactive">spec_validator_indices_active_pending_inactive</a>(validator_set: <a href="stake.md#0x1_stake_ValidatorSet">ValidatorSet</a>): bool {
+   len(validator_set.pending_inactive) + len(validator_set.active_validators) == <a href="stake.md#0x1_stake_spec_validator_index_upper_bound">spec_validator_index_upper_bound</a>()
+}
+</code></pre>
+
+
+
+
+<a id="0x1_stake_spec_validator_index_upper_bound"></a>
+
+
+<pre><code><b>fun</b> <a href="stake.md#0x1_stake_spec_validator_index_upper_bound">spec_validator_index_upper_bound</a>(): u64 {
+   len(<b>global</b>&lt;<a href="stake.md#0x1_stake_ValidatorPerformance">ValidatorPerformance</a>&gt;(@aptos_framework).validators)
+}
+</code></pre>
+
+
+
+
+<a id="0x1_stake_spec_has_stake_pool"></a>
+
+
+<pre><code><b>fun</b> <a href="stake.md#0x1_stake_spec_has_stake_pool">spec_has_stake_pool</a>(a: <b>address</b>): bool {
+   <b>exists</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(a)
+}
+</code></pre>
+
+
+
+
+<a id="0x1_stake_spec_has_validator_config"></a>
+
+
+<pre><code><b>fun</b> <a href="stake.md#0x1_stake_spec_has_validator_config">spec_has_validator_config</a>(a: <b>address</b>): bool {
+   <b>exists</b>&lt;<a href="stake.md#0x1_stake_ValidatorConfig">ValidatorConfig</a>&gt;(a)
+}
+</code></pre>
+
+
+
+
+<a id="0x1_stake_spec_rewards_amount"></a>
+
+
+<pre><code><b>fun</b> <a href="stake.md#0x1_stake_spec_rewards_amount">spec_rewards_amount</a>(
+   stake_amount: u64,
+   num_successful_proposals: u64,
+   num_total_proposals: u64,
+   rewards_rate: u64,
+   rewards_rate_denominator: u64,
+): u64;
+</code></pre>
+
+
+
+
+<a id="0x1_stake_spec_contains"></a>
+
+
+<pre><code><b>fun</b> <a href="stake.md#0x1_stake_spec_contains">spec_contains</a>(validators: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="stake.md#0x1_stake_ValidatorInfo">ValidatorInfo</a>&gt;, addr: <b>address</b>): bool {
+   <b>exists</b> i in 0..len(validators): validators[i].addr == addr
+}
+</code></pre>
+
+
+
+
+<a id="0x1_stake_spec_is_current_epoch_validator"></a>
+
+
+<pre><code><b>fun</b> <a href="stake.md#0x1_stake_spec_is_current_epoch_validator">spec_is_current_epoch_validator</a>(pool_address: <b>address</b>): bool {
+   <b>let</b> validator_set = <b>global</b>&lt;<a href="stake.md#0x1_stake_ValidatorSet">ValidatorSet</a>&gt;(@aptos_framework);
+   !<a href="stake.md#0x1_stake_spec_contains">spec_contains</a>(validator_set.pending_active, pool_address)
+       && (<a href="stake.md#0x1_stake_spec_contains">spec_contains</a>(validator_set.active_validators, pool_address)
+       || <a href="stake.md#0x1_stake_spec_contains">spec_contains</a>(validator_set.pending_inactive, pool_address))
+}
+</code></pre>
+
+
+
+
+<a id="0x1_stake_ResourceRequirement"></a>
+
+
+<pre><code><b>schema</b> <a href="stake.md#0x1_stake_ResourceRequirement">ResourceRequirement</a> {
+    <b>requires</b> <b>exists</b>&lt;<a href="stake.md#0x1_stake_AptosCoinCapabilities">AptosCoinCapabilities</a>&gt;(@aptos_framework);
+    <b>requires</b> <b>exists</b>&lt;<a href="stake.md#0x1_stake_ValidatorPerformance">ValidatorPerformance</a>&gt;(@aptos_framework);
+    <b>requires</b> <b>exists</b>&lt;<a href="stake.md#0x1_stake_ValidatorSet">ValidatorSet</a>&gt;(@aptos_framework);
+    <b>requires</b> <b>exists</b>&lt;StakingConfig&gt;(@aptos_framework);
+    <b>requires</b> <b>exists</b>&lt;StakingRewardsConfig&gt;(@aptos_framework) || !<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_spec_periodical_reward_rate_decrease_enabled">features::spec_periodical_reward_rate_decrease_enabled</a>();
+    <b>requires</b> <b>exists</b>&lt;<a href="timestamp.md#0x1_timestamp_CurrentTimeMicroseconds">timestamp::CurrentTimeMicroseconds</a>&gt;(@aptos_framework);
+    <b>requires</b> <b>exists</b>&lt;<a href="stake.md#0x1_stake_ValidatorFees">ValidatorFees</a>&gt;(@aptos_framework);
+}
+</code></pre>
+
+
+
+
+<a id="0x1_stake_spec_get_reward_rate_1"></a>
+
+
+<pre><code><b>fun</b> <a href="stake.md#0x1_stake_spec_get_reward_rate_1">spec_get_reward_rate_1</a>(config: StakingConfig): num {
+   <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_spec_periodical_reward_rate_decrease_enabled">features::spec_periodical_reward_rate_decrease_enabled</a>()) {
+       <b>let</b> epoch_rewards_rate = <b>global</b>&lt;<a href="staking_config.md#0x1_staking_config_StakingRewardsConfig">staking_config::StakingRewardsConfig</a>&gt;(@aptos_framework).rewards_rate;
+       <b>if</b> (epoch_rewards_rate.value == 0) {
+           0
+       } <b>else</b> {
+           <b>let</b> denominator_0 = aptos_std::fixed_point64::spec_divide_u128(<a href="staking_config.md#0x1_staking_config_MAX_REWARDS_RATE">staking_config::MAX_REWARDS_RATE</a>, epoch_rewards_rate);
+           <b>let</b> denominator = <b>if</b> (denominator_0 &gt; <a href="stake.md#0x1_stake_MAX_U64">MAX_U64</a>) {
+               <a href="stake.md#0x1_stake_MAX_U64">MAX_U64</a>
+           } <b>else</b> {
+               denominator_0
+           };
+           <b>let</b> nominator = aptos_std::fixed_point64::spec_multiply_u128(denominator, epoch_rewards_rate);
+           nominator
+       }
+   } <b>else</b> {
+           config.rewards_rate
+   }
+}
+</code></pre>
+
+
+
+
+<a id="0x1_stake_spec_get_reward_rate_2"></a>
+
+
+<pre><code><b>fun</b> <a href="stake.md#0x1_stake_spec_get_reward_rate_2">spec_get_reward_rate_2</a>(config: StakingConfig): num {
+   <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_spec_periodical_reward_rate_decrease_enabled">features::spec_periodical_reward_rate_decrease_enabled</a>()) {
+       <b>let</b> epoch_rewards_rate = <b>global</b>&lt;<a href="staking_config.md#0x1_staking_config_StakingRewardsConfig">staking_config::StakingRewardsConfig</a>&gt;(@aptos_framework).rewards_rate;
+       <b>if</b> (epoch_rewards_rate.value == 0) {
+           1
+       } <b>else</b> {
+           <b>let</b> denominator_0 = aptos_std::fixed_point64::spec_divide_u128(<a href="staking_config.md#0x1_staking_config_MAX_REWARDS_RATE">staking_config::MAX_REWARDS_RATE</a>, epoch_rewards_rate);
+           <b>let</b> denominator = <b>if</b> (denominator_0 &gt; <a href="stake.md#0x1_stake_MAX_U64">MAX_U64</a>) {
+               <a href="stake.md#0x1_stake_MAX_U64">MAX_U64</a>
+           } <b>else</b> {
+               denominator_0
+           };
+           denominator
+       }
+   } <b>else</b> {
+           config.rewards_rate_denominator
+   }
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_update_stake_pool"></a>
+
+### Function `update_stake_pool`
+
+
+<pre><code><b>fun</b> <a href="stake.md#0x1_stake_update_stake_pool">update_stake_pool</a>(validator_perf: &<a href="stake.md#0x1_stake_ValidatorPerformance">stake::ValidatorPerformance</a>, pool_address: <b>address</b>, <a href="staking_config.md#0x1_staking_config">staking_config</a>: &<a href="staking_config.md#0x1_staking_config_StakingConfig">staking_config::StakingConfig</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify_duration_estimate = 300;
+<b>include</b> <a href="stake.md#0x1_stake_ResourceRequirement">ResourceRequirement</a>;
+<b>include</b> <a href="stake.md#0x1_stake_GetReconfigStartTimeRequirement">GetReconfigStartTimeRequirement</a>;
+<b>include</b> <a href="staking_config.md#0x1_staking_config_StakingRewardsConfigRequirement">staking_config::StakingRewardsConfigRequirement</a>;
+<b>include</b> <a href="stake.md#0x1_stake_UpdateStakePoolAbortsIf">UpdateStakePoolAbortsIf</a>;
+<b>let</b> stake_pool = <b>global</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(pool_address);
+<b>let</b> validator_config = <b>global</b>&lt;<a href="stake.md#0x1_stake_ValidatorConfig">ValidatorConfig</a>&gt;(pool_address);
+<b>let</b> cur_validator_perf = validator_perf.validators[validator_config.validator_index];
+<b>let</b> num_successful_proposals = cur_validator_perf.successful_proposals;
+<b>let</b> num_total_proposals = cur_validator_perf.successful_proposals + cur_validator_perf.failed_proposals;
+<b>let</b> rewards_rate = <a href="stake.md#0x1_stake_spec_get_reward_rate_1">spec_get_reward_rate_1</a>(<a href="staking_config.md#0x1_staking_config">staking_config</a>);
+<b>let</b> rewards_rate_denominator = <a href="stake.md#0x1_stake_spec_get_reward_rate_2">spec_get_reward_rate_2</a>(<a href="staking_config.md#0x1_staking_config">staking_config</a>);
+<b>let</b> rewards_amount_1 = <b>if</b> (stake_pool.active.value &gt; 0) {
+    <a href="stake.md#0x1_stake_spec_rewards_amount">spec_rewards_amount</a>(stake_pool.active.value, num_successful_proposals, num_total_proposals, rewards_rate, rewards_rate_denominator)
+} <b>else</b> {
+    0
+};
+<b>let</b> rewards_amount_2 = <b>if</b> (stake_pool.pending_inactive.value &gt; 0) {
+    <a href="stake.md#0x1_stake_spec_rewards_amount">spec_rewards_amount</a>(stake_pool.pending_inactive.value, num_successful_proposals, num_total_proposals, rewards_rate, rewards_rate_denominator)
+} <b>else</b> {
+    0
+};
+<b>let</b> <b>post</b> post_stake_pool = <b>global</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(pool_address);
+<b>let</b> <b>post</b> post_active_value = post_stake_pool.active.value;
+<b>let</b> <b>post</b> post_pending_inactive_value = post_stake_pool.pending_inactive.value;
+<b>let</b> fees_table = <b>global</b>&lt;<a href="stake.md#0x1_stake_ValidatorFees">ValidatorFees</a>&gt;(@aptos_framework).fees_table;
+<b>let</b> <b>post</b> post_fees_table = <b>global</b>&lt;<a href="stake.md#0x1_stake_ValidatorFees">ValidatorFees</a>&gt;(@aptos_framework).fees_table;
+<b>let</b> <b>post</b> post_inactive_value = post_stake_pool.inactive.value;
+<b>ensures</b> post_stake_pool.pending_active.value == 0;
+<b>ensures</b> <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_spec_is_enabled">features::spec_is_enabled</a>(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_COLLECT_AND_DISTRIBUTE_GAS_FEES">features::COLLECT_AND_DISTRIBUTE_GAS_FEES</a>) && <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_contains">table::spec_contains</a>(fees_table, pool_address)) {
+    !<a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_contains">table::spec_contains</a>(post_fees_table, pool_address) &&
+    post_active_value == stake_pool.active.value + rewards_amount_1 + stake_pool.pending_active.value + <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(fees_table, pool_address).value
+} <b>else</b> {
+    post_active_value == stake_pool.active.value + rewards_amount_1 + stake_pool.pending_active.value
+};
+<b>ensures</b> <b>if</b> (<a href="stake.md#0x1_stake_spec_get_reconfig_start_time_secs">spec_get_reconfig_start_time_secs</a>() &gt;= stake_pool.locked_until_secs) {
+    post_pending_inactive_value == 0 &&
+    post_inactive_value == stake_pool.inactive.value + stake_pool.pending_inactive.value + rewards_amount_2
+} <b>else</b> {
+    post_pending_inactive_value == stake_pool.pending_inactive.value + rewards_amount_2
+};
+</code></pre>
+
+
+
+
+<a id="0x1_stake_UpdateStakePoolAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="stake.md#0x1_stake_UpdateStakePoolAbortsIf">UpdateStakePoolAbortsIf</a> {
+    pool_address: <b>address</b>;
+    validator_perf: <a href="stake.md#0x1_stake_ValidatorPerformance">ValidatorPerformance</a>;
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(pool_address);
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="stake.md#0x1_stake_ValidatorConfig">ValidatorConfig</a>&gt;(pool_address);
+    <b>aborts_if</b> <b>global</b>&lt;<a href="stake.md#0x1_stake_ValidatorConfig">ValidatorConfig</a>&gt;(pool_address).validator_index &gt;= len(validator_perf.validators);
+    <b>let</b> aptos_addr = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_type_of">type_info::type_of</a>&lt;AptosCoin&gt;().account_address;
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="stake.md#0x1_stake_ValidatorFees">ValidatorFees</a>&gt;(aptos_addr);
+    <b>let</b> stake_pool = <b>global</b>&lt;<a href="stake.md#0x1_stake_StakePool">StakePool</a>&gt;(pool_address);
+    <b>include</b> <a href="stake.md#0x1_stake_DistributeRewardsAbortsIf">DistributeRewardsAbortsIf</a> {<a href="stake.md#0x1_stake">stake</a>: stake_pool.active};
+    <b>include</b> <a href="stake.md#0x1_stake_DistributeRewardsAbortsIf">DistributeRewardsAbortsIf</a> {<a href="stake.md#0x1_stake">stake</a>: stake_pool.pending_inactive};
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_get_reconfig_start_time_secs"></a>
+
+### Function `get_reconfig_start_time_secs`
+
+
+<pre><code><b>fun</b> <a href="stake.md#0x1_stake_get_reconfig_start_time_secs">get_reconfig_start_time_secs</a>(): u64
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="stake.md#0x1_stake_GetReconfigStartTimeRequirement">GetReconfigStartTimeRequirement</a>;
+</code></pre>
+
+
+
+
+<a id="0x1_stake_GetReconfigStartTimeRequirement"></a>
+
+
+<pre><code><b>schema</b> <a href="stake.md#0x1_stake_GetReconfigStartTimeRequirement">GetReconfigStartTimeRequirement</a> {
+    <b>requires</b> <b>exists</b>&lt;<a href="timestamp.md#0x1_timestamp_CurrentTimeMicroseconds">timestamp::CurrentTimeMicroseconds</a>&gt;(@aptos_framework);
+    <b>include</b> <a href="reconfiguration_state.md#0x1_reconfiguration_state_StartTimeSecsRequirement">reconfiguration_state::StartTimeSecsRequirement</a>;
+}
+</code></pre>
+
+
+
+
+<a id="0x1_stake_spec_get_reconfig_start_time_secs"></a>
+
+
+<pre><code><b>fun</b> <a href="stake.md#0x1_stake_spec_get_reconfig_start_time_secs">spec_get_reconfig_start_time_secs</a>(): u64 {
+   <b>if</b> (<b>exists</b>&lt;<a href="reconfiguration_state.md#0x1_reconfiguration_state_State">reconfiguration_state::State</a>&gt;(@aptos_framework)) {
+       <a href="reconfiguration_state.md#0x1_reconfiguration_state_spec_start_time_secs">reconfiguration_state::spec_start_time_secs</a>()
+   } <b>else</b> {
+       <a href="timestamp.md#0x1_timestamp_spec_now_seconds">timestamp::spec_now_seconds</a>()
+   }
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_calculate_rewards_amount"></a>
+
+### Function `calculate_rewards_amount`
+
+
+<pre><code><b>fun</b> <a href="stake.md#0x1_stake_calculate_rewards_amount">calculate_rewards_amount</a>(stake_amount: u64, num_successful_proposals: u64, num_total_proposals: u64, rewards_rate: u64, rewards_rate_denominator: u64): u64
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>pragma</b> verify_duration_estimate = 300;
+<b>requires</b> rewards_rate &lt;= <a href="stake.md#0x1_stake_MAX_REWARDS_RATE">MAX_REWARDS_RATE</a>;
+<b>requires</b> rewards_rate_denominator &gt; 0;
+<b>requires</b> rewards_rate &lt;= rewards_rate_denominator;
+<b>requires</b> num_successful_proposals &lt;= num_total_proposals;
+<b>ensures</b> [concrete] (rewards_rate_denominator * num_total_proposals == 0) ==&gt; result == 0;
+<b>ensures</b> [concrete] (rewards_rate_denominator * num_total_proposals &gt; 0) ==&gt; {
+    <b>let</b> amount = ((stake_amount * rewards_rate * num_successful_proposals) /
+        (rewards_rate_denominator * num_total_proposals));
+    result == amount
+};
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> [abstract] result == <a href="stake.md#0x1_stake_spec_rewards_amount">spec_rewards_amount</a>(
+    stake_amount,
+    num_successful_proposals,
+    num_total_proposals,
+    rewards_rate,
+    rewards_rate_denominator);
+</code></pre>
+
+
+
+<a id="@Specification_1_distribute_rewards"></a>
+
+### Function `distribute_rewards`
+
+
+<pre><code><b>fun</b> <a href="stake.md#0x1_stake_distribute_rewards">distribute_rewards</a>(<a href="stake.md#0x1_stake">stake</a>: &<b>mut</b> <a href="coin.md#0x1_coin_Coin">coin::Coin</a>&lt;<a href="aptos_coin.md#0x1_aptos_coin_AptosCoin">aptos_coin::AptosCoin</a>&gt;, num_successful_proposals: u64, num_total_proposals: u64, rewards_rate: u64, rewards_rate_denominator: u64): u64
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="stake.md#0x1_stake_ResourceRequirement">ResourceRequirement</a>;
+<b>requires</b> rewards_rate &lt;= <a href="stake.md#0x1_stake_MAX_REWARDS_RATE">MAX_REWARDS_RATE</a>;
+<b>requires</b> rewards_rate_denominator &gt; 0;
+<b>requires</b> rewards_rate &lt;= rewards_rate_denominator;
+<b>requires</b> num_successful_proposals &lt;= num_total_proposals;
+<b>include</b> <a href="stake.md#0x1_stake_DistributeRewardsAbortsIf">DistributeRewardsAbortsIf</a>;
+<b>ensures</b> <b>old</b>(<a href="stake.md#0x1_stake">stake</a>.value) &gt; 0 ==&gt;
+    result == <a href="stake.md#0x1_stake_spec_rewards_amount">spec_rewards_amount</a>(
+        <b>old</b>(<a href="stake.md#0x1_stake">stake</a>.value),
+        num_successful_proposals,
+        num_total_proposals,
+        rewards_rate,
+        rewards_rate_denominator);
+<b>ensures</b> <b>old</b>(<a href="stake.md#0x1_stake">stake</a>.value) &gt; 0 ==&gt;
+    <a href="stake.md#0x1_stake">stake</a>.value == <b>old</b>(<a href="stake.md#0x1_stake">stake</a>.value) + <a href="stake.md#0x1_stake_spec_rewards_amount">spec_rewards_amount</a>(
+        <b>old</b>(<a href="stake.md#0x1_stake">stake</a>.value),
+        num_successful_proposals,
+        num_total_proposals,
+        rewards_rate,
+        rewards_rate_denominator);
+<b>ensures</b> <b>old</b>(<a href="stake.md#0x1_stake">stake</a>.value) == 0 ==&gt; result == 0;
+<b>ensures</b> <b>old</b>(<a href="stake.md#0x1_stake">stake</a>.value) == 0 ==&gt; <a href="stake.md#0x1_stake">stake</a>.value == <b>old</b>(<a href="stake.md#0x1_stake">stake</a>.value);
+</code></pre>
+
+
+
+
+<a id="0x1_stake_DistributeRewardsAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="stake.md#0x1_stake_DistributeRewardsAbortsIf">DistributeRewardsAbortsIf</a> {
+    <a href="stake.md#0x1_stake">stake</a>: Coin&lt;AptosCoin&gt;;
+    num_successful_proposals: num;
+    num_total_proposals: num;
+    rewards_rate: num;
+    rewards_rate_denominator: num;
+    <b>let</b> stake_amount = <a href="coin.md#0x1_coin_value">coin::value</a>(<a href="stake.md#0x1_stake">stake</a>);
+    <b>let</b> rewards_amount = <b>if</b> (stake_amount &gt; 0) {
+        <a href="stake.md#0x1_stake_spec_rewards_amount">spec_rewards_amount</a>(stake_amount, num_successful_proposals, num_total_proposals, rewards_rate, rewards_rate_denominator)
+    } <b>else</b> {
+        0
+    };
+    <b>let</b> amount = rewards_amount;
+    <b>let</b> addr = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_type_of">type_info::type_of</a>&lt;AptosCoin&gt;().account_address;
+    <b>aborts_if</b> (rewards_amount &gt; 0) && !<b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinInfo">coin::CoinInfo</a>&lt;AptosCoin&gt;&gt;(addr);
+    <b>modifies</b> <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinInfo">coin::CoinInfo</a>&lt;AptosCoin&gt;&gt;(addr);
+    <b>include</b> (rewards_amount &gt; 0) ==&gt; <a href="coin.md#0x1_coin_CoinAddAbortsIf">coin::CoinAddAbortsIf</a>&lt;AptosCoin&gt; { amount: amount };
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_append"></a>
+
+### Function `append`
+
+
+<pre><code><b>fun</b> <a href="stake.md#0x1_stake_append">append</a>&lt;T&gt;(v1: &<b>mut</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;T&gt;, v2: &<b>mut</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;T&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque, verify = <b>false</b>;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> len(v1) == <b>old</b>(len(v1) + len(v2));
+<b>ensures</b> len(v2) == 0;
+<b>ensures</b> (<b>forall</b> i in 0..<b>old</b>(len(v1)): v1[i] == <b>old</b>(v1[i]));
+<b>ensures</b> (<b>forall</b> i in <b>old</b>(len(v1))..len(v1): v1[i] == <b>old</b>(v2[len(v2) - (i - len(v1)) - 1]));
+</code></pre>
+
+
+
+<a id="@Specification_1_find_validator"></a>
+
+### Function `find_validator`
+
+
+<pre><code><b>fun</b> <a href="stake.md#0x1_stake_find_validator">find_validator</a>(v: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="stake.md#0x1_stake_ValidatorInfo">stake::ValidatorInfo</a>&gt;, addr: <b>address</b>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;u64&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_none">option::is_none</a>(result) ==&gt; (<b>forall</b> i in 0..len(v): v[i].addr != addr);
+<b>ensures</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(result) ==&gt; v[<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(result)].addr == addr;
+<b>ensures</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(result) ==&gt; <a href="stake.md#0x1_stake_spec_contains">spec_contains</a>(v, addr);
+<b>ensures</b> [abstract] result == <a href="stake.md#0x1_stake_spec_find_validator">spec_find_validator</a>(v,addr);
+</code></pre>
+
+
+
+<a id="@Specification_1_update_voting_power_increase"></a>
+
+### Function `update_voting_power_increase`
+
+
+<pre><code><b>fun</b> <a href="stake.md#0x1_stake_update_voting_power_increase">update_voting_power_increase</a>(increase_amount: u64)
+</code></pre>
+
+
+
+
+<pre><code><b>requires</b> !<a href="reconfiguration_state.md#0x1_reconfiguration_state_spec_is_in_progress">reconfiguration_state::spec_is_in_progress</a>();
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="stake.md#0x1_stake_ValidatorSet">ValidatorSet</a>&gt;(@aptos_framework);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="staking_config.md#0x1_staking_config_StakingConfig">staking_config::StakingConfig</a>&gt;(@aptos_framework);
+<b>let</b> aptos = @aptos_framework;
+<b>let</b> pre_validator_set = <b>global</b>&lt;<a href="stake.md#0x1_stake_ValidatorSet">ValidatorSet</a>&gt;(aptos);
+<b>let</b> <b>post</b> validator_set = <b>global</b>&lt;<a href="stake.md#0x1_stake_ValidatorSet">ValidatorSet</a>&gt;(aptos);
+<b>let</b> <a href="staking_config.md#0x1_staking_config">staking_config</a> = <b>global</b>&lt;<a href="staking_config.md#0x1_staking_config_StakingConfig">staking_config::StakingConfig</a>&gt;(aptos);
+<b>let</b> voting_power_increase_limit = <a href="staking_config.md#0x1_staking_config">staking_config</a>.voting_power_increase_limit;
+<b>aborts_if</b> pre_validator_set.total_joining_power + increase_amount &gt; MAX_U128;
+<b>aborts_if</b> pre_validator_set.total_voting_power &gt; 0 && pre_validator_set.total_voting_power * voting_power_increase_limit &gt; MAX_U128;
+<b>aborts_if</b> pre_validator_set.total_voting_power &gt; 0 &&
+    pre_validator_set.total_joining_power + increase_amount &gt; pre_validator_set.total_voting_power * voting_power_increase_limit / 100;
+<b>ensures</b> validator_set.total_voting_power &gt; 0 ==&gt;
+    validator_set.total_joining_power &lt;= validator_set.total_voting_power * voting_power_increase_limit / 100;
+<b>ensures</b> validator_set.total_joining_power == pre_validator_set.total_joining_power + increase_amount;
+</code></pre>
+
+
+
+<a id="@Specification_1_assert_stake_pool_exists"></a>
+
+### Function `assert_stake_pool_exists`
+
+
+<pre><code><b>fun</b> <a href="stake.md#0x1_stake_assert_stake_pool_exists">assert_stake_pool_exists</a>(pool_address: <b>address</b>)
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<a href="stake.md#0x1_stake_stake_pool_exists">stake_pool_exists</a>(pool_address);
+</code></pre>
+
+
+
+<a id="@Specification_1_configure_allowed_validators"></a>
+
+### Function `configure_allowed_validators`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="stake.md#0x1_stake_configure_allowed_validators">configure_allowed_validators</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, accounts: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> aptos_framework_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(aptos_framework);
+<b>aborts_if</b> !<a href="system_addresses.md#0x1_system_addresses_is_aptos_framework_address">system_addresses::is_aptos_framework_address</a>(aptos_framework_address);
+<b>let</b> <b>post</b> allowed = <b>global</b>&lt;<a href="stake.md#0x1_stake_AllowedValidators">AllowedValidators</a>&gt;(aptos_framework_address);
+<b>ensures</b> allowed.accounts == accounts;
+</code></pre>
+
+
+
+<a id="@Specification_1_assert_owner_cap_exists"></a>
+
+### Function `assert_owner_cap_exists`
+
+
+<pre><code><b>fun</b> <a href="stake.md#0x1_stake_assert_owner_cap_exists">assert_owner_cap_exists</a>(owner: <b>address</b>)
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="stake.md#0x1_stake_OwnerCapability">OwnerCapability</a>&gt;(owner);
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/staking_config.md b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/staking_config.md
new file mode 100644
index 0000000000000..f053716b0e392
--- /dev/null
+++ b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/staking_config.md
@@ -0,0 +1,1595 @@
+
+<a id="0x1_staking_config"></a>
+
+# Module `0x1::staking_config`
+
+Provides the configuration for staking and rewards
+
+
+-  [Resource `StakingConfig`](#0x1_staking_config_StakingConfig)
+-  [Resource `StakingRewardsConfig`](#0x1_staking_config_StakingRewardsConfig)
+-  [Constants](#@Constants_0)
+-  [Function `initialize`](#0x1_staking_config_initialize)
+-  [Function `reward_rate`](#0x1_staking_config_reward_rate)
+-  [Function `initialize_rewards`](#0x1_staking_config_initialize_rewards)
+-  [Function `get`](#0x1_staking_config_get)
+-  [Function `get_allow_validator_set_change`](#0x1_staking_config_get_allow_validator_set_change)
+-  [Function `get_required_stake`](#0x1_staking_config_get_required_stake)
+-  [Function `get_recurring_lockup_duration`](#0x1_staking_config_get_recurring_lockup_duration)
+-  [Function `get_reward_rate`](#0x1_staking_config_get_reward_rate)
+-  [Function `get_voting_power_increase_limit`](#0x1_staking_config_get_voting_power_increase_limit)
+-  [Function `calculate_and_save_latest_epoch_rewards_rate`](#0x1_staking_config_calculate_and_save_latest_epoch_rewards_rate)
+-  [Function `calculate_and_save_latest_rewards_config`](#0x1_staking_config_calculate_and_save_latest_rewards_config)
+-  [Function `update_required_stake`](#0x1_staking_config_update_required_stake)
+-  [Function `update_recurring_lockup_duration_secs`](#0x1_staking_config_update_recurring_lockup_duration_secs)
+-  [Function `update_rewards_rate`](#0x1_staking_config_update_rewards_rate)
+-  [Function `update_rewards_config`](#0x1_staking_config_update_rewards_config)
+-  [Function `update_voting_power_increase_limit`](#0x1_staking_config_update_voting_power_increase_limit)
+-  [Function `validate_required_stake`](#0x1_staking_config_validate_required_stake)
+-  [Function `validate_rewards_config`](#0x1_staking_config_validate_rewards_config)
+-  [Specification](#@Specification_1)
+    -  [High-level Requirements](#high-level-req)
+    -  [Module-level Specification](#module-level-spec)
+    -  [Resource `StakingConfig`](#@Specification_1_StakingConfig)
+    -  [Resource `StakingRewardsConfig`](#@Specification_1_StakingRewardsConfig)
+    -  [Function `initialize`](#@Specification_1_initialize)
+    -  [Function `reward_rate`](#@Specification_1_reward_rate)
+    -  [Function `initialize_rewards`](#@Specification_1_initialize_rewards)
+    -  [Function `get`](#@Specification_1_get)
+    -  [Function `get_reward_rate`](#@Specification_1_get_reward_rate)
+    -  [Function `calculate_and_save_latest_epoch_rewards_rate`](#@Specification_1_calculate_and_save_latest_epoch_rewards_rate)
+    -  [Function `calculate_and_save_latest_rewards_config`](#@Specification_1_calculate_and_save_latest_rewards_config)
+    -  [Function `update_required_stake`](#@Specification_1_update_required_stake)
+    -  [Function `update_recurring_lockup_duration_secs`](#@Specification_1_update_recurring_lockup_duration_secs)
+    -  [Function `update_rewards_rate`](#@Specification_1_update_rewards_rate)
+    -  [Function `update_rewards_config`](#@Specification_1_update_rewards_config)
+    -  [Function `update_voting_power_increase_limit`](#@Specification_1_update_voting_power_increase_limit)
+    -  [Function `validate_required_stake`](#@Specification_1_validate_required_stake)
+    -  [Function `validate_rewards_config`](#@Specification_1_validate_rewards_config)
+
+
+<pre><code><b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features">0x1::features</a>;
+<b>use</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/fixed_point64.md#0x1_fixed_point64">0x1::fixed_point64</a>;
+<b>use</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/math_fixed64.md#0x1_math_fixed64">0x1::math_fixed64</a>;
+<b>use</b> <a href="system_addresses.md#0x1_system_addresses">0x1::system_addresses</a>;
+<b>use</b> <a href="timestamp.md#0x1_timestamp">0x1::timestamp</a>;
+</code></pre>
+
+
+
+<a id="0x1_staking_config_StakingConfig"></a>
+
+## Resource `StakingConfig`
+
+Validator set configurations that will be stored with the @aptos_framework account.
+
+
+<pre><code><b>struct</b> <a href="staking_config.md#0x1_staking_config_StakingConfig">StakingConfig</a> <b>has</b> <b>copy</b>, drop, key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>minimum_stake: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>maximum_stake: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>recurring_lockup_duration_secs: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>allow_validator_set_change: bool</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>rewards_rate: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>rewards_rate_denominator: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>voting_power_increase_limit: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_staking_config_StakingRewardsConfig"></a>
+
+## Resource `StakingRewardsConfig`
+
+Staking reward configurations that will be stored with the @aptos_framework account.
+
+
+<pre><code><b>struct</b> <a href="staking_config.md#0x1_staking_config_StakingRewardsConfig">StakingRewardsConfig</a> <b>has</b> <b>copy</b>, drop, key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>rewards_rate: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>min_rewards_rate: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>rewards_rate_period_in_secs: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>last_rewards_rate_period_start_in_secs: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>rewards_rate_decrease_rate: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_staking_config_MAX_U64"></a>
+
+
+
+<pre><code><b>const</b> <a href="staking_config.md#0x1_staking_config_MAX_U64">MAX_U64</a>: u128 = 18446744073709551615;
+</code></pre>
+
+
+
+<a id="0x1_staking_config_BPS_DENOMINATOR"></a>
+
+Denominator of number in basis points. 1 bps(basis points) = 0.01%.
+
+
+<pre><code><b>const</b> <a href="staking_config.md#0x1_staking_config_BPS_DENOMINATOR">BPS_DENOMINATOR</a>: u64 = 10000;
+</code></pre>
+
+
+
+<a id="0x1_staking_config_EDEPRECATED_FUNCTION"></a>
+
+The function has been deprecated.
+
+
+<pre><code><b>const</b> <a href="staking_config.md#0x1_staking_config_EDEPRECATED_FUNCTION">EDEPRECATED_FUNCTION</a>: u64 = 10;
+</code></pre>
+
+
+
+<a id="0x1_staking_config_EDISABLED_FUNCTION"></a>
+
+The function is disabled or hasn't been enabled.
+
+
+<pre><code><b>const</b> <a href="staking_config.md#0x1_staking_config_EDISABLED_FUNCTION">EDISABLED_FUNCTION</a>: u64 = 11;
+</code></pre>
+
+
+
+<a id="0x1_staking_config_EINVALID_LAST_REWARDS_RATE_PERIOD_START"></a>
+
+Specified start time of last rewards rate period is invalid, which must be not late than the current timestamp.
+
+
+<pre><code><b>const</b> <a href="staking_config.md#0x1_staking_config_EINVALID_LAST_REWARDS_RATE_PERIOD_START">EINVALID_LAST_REWARDS_RATE_PERIOD_START</a>: u64 = 7;
+</code></pre>
+
+
+
+<a id="0x1_staking_config_EINVALID_MIN_REWARDS_RATE"></a>
+
+Specified min rewards rate is invalid, which must be within [0, rewards_rate].
+
+
+<pre><code><b>const</b> <a href="staking_config.md#0x1_staking_config_EINVALID_MIN_REWARDS_RATE">EINVALID_MIN_REWARDS_RATE</a>: u64 = 6;
+</code></pre>
+
+
+
+<a id="0x1_staking_config_EINVALID_REWARDS_RATE"></a>
+
+Specified rewards rate is invalid, which must be within [0, MAX_REWARDS_RATE].
+
+
+<pre><code><b>const</b> <a href="staking_config.md#0x1_staking_config_EINVALID_REWARDS_RATE">EINVALID_REWARDS_RATE</a>: u64 = 5;
+</code></pre>
+
+
+
+<a id="0x1_staking_config_EINVALID_REWARDS_RATE_DECREASE_RATE"></a>
+
+Specified rewards rate decrease rate is invalid, which must be not greater than BPS_DENOMINATOR.
+
+
+<pre><code><b>const</b> <a href="staking_config.md#0x1_staking_config_EINVALID_REWARDS_RATE_DECREASE_RATE">EINVALID_REWARDS_RATE_DECREASE_RATE</a>: u64 = 8;
+</code></pre>
+
+
+
+<a id="0x1_staking_config_EINVALID_REWARDS_RATE_PERIOD"></a>
+
+Specified rewards rate period is invalid. It must be larger than 0 and cannot be changed if configured.
+
+
+<pre><code><b>const</b> <a href="staking_config.md#0x1_staking_config_EINVALID_REWARDS_RATE_PERIOD">EINVALID_REWARDS_RATE_PERIOD</a>: u64 = 9;
+</code></pre>
+
+
+
+<a id="0x1_staking_config_EINVALID_STAKE_RANGE"></a>
+
+Specified stake range is invalid. Max must be greater than min.
+
+
+<pre><code><b>const</b> <a href="staking_config.md#0x1_staking_config_EINVALID_STAKE_RANGE">EINVALID_STAKE_RANGE</a>: u64 = 3;
+</code></pre>
+
+
+
+<a id="0x1_staking_config_EINVALID_VOTING_POWER_INCREASE_LIMIT"></a>
+
+The voting power increase limit percentage must be within (0, 50].
+
+
+<pre><code><b>const</b> <a href="staking_config.md#0x1_staking_config_EINVALID_VOTING_POWER_INCREASE_LIMIT">EINVALID_VOTING_POWER_INCREASE_LIMIT</a>: u64 = 4;
+</code></pre>
+
+
+
+<a id="0x1_staking_config_EZERO_LOCKUP_DURATION"></a>
+
+Stake lockup duration cannot be zero.
+
+
+<pre><code><b>const</b> <a href="staking_config.md#0x1_staking_config_EZERO_LOCKUP_DURATION">EZERO_LOCKUP_DURATION</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_staking_config_EZERO_REWARDS_RATE_DENOMINATOR"></a>
+
+Reward rate denominator cannot be zero.
+
+
+<pre><code><b>const</b> <a href="staking_config.md#0x1_staking_config_EZERO_REWARDS_RATE_DENOMINATOR">EZERO_REWARDS_RATE_DENOMINATOR</a>: u64 = 2;
+</code></pre>
+
+
+
+<a id="0x1_staking_config_MAX_REWARDS_RATE"></a>
+
+Limit the maximum value of <code>rewards_rate</code> in order to avoid any arithmetic overflow.
+
+
+<pre><code><b>const</b> <a href="staking_config.md#0x1_staking_config_MAX_REWARDS_RATE">MAX_REWARDS_RATE</a>: u64 = 1000000;
+</code></pre>
+
+
+
+<a id="0x1_staking_config_ONE_YEAR_IN_SECS"></a>
+
+1 year => 365 * 24 * 60 * 60
+
+
+<pre><code><b>const</b> <a href="staking_config.md#0x1_staking_config_ONE_YEAR_IN_SECS">ONE_YEAR_IN_SECS</a>: u64 = 31536000;
+</code></pre>
+
+
+
+<a id="0x1_staking_config_initialize"></a>
+
+## Function `initialize`
+
+Only called during genesis.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="staking_config.md#0x1_staking_config_initialize">initialize</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, minimum_stake: u64, maximum_stake: u64, recurring_lockup_duration_secs: u64, allow_validator_set_change: bool, rewards_rate: u64, rewards_rate_denominator: u64, voting_power_increase_limit: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="staking_config.md#0x1_staking_config_initialize">initialize</a>(
+    aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    minimum_stake: u64,
+    maximum_stake: u64,
+    recurring_lockup_duration_secs: u64,
+    allow_validator_set_change: bool,
+    rewards_rate: u64,
+    rewards_rate_denominator: u64,
+    voting_power_increase_limit: u64,
+) {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(aptos_framework);
+
+    // This can fail <a href="genesis.md#0x1_genesis">genesis</a> but is necessary so that <a href="../../../aptos-stdlib/tests/compiler-v2-doc/any.md#0x1_any">any</a> misconfigurations can be corrected before <a href="genesis.md#0x1_genesis">genesis</a> succeeds
+    <a href="staking_config.md#0x1_staking_config_validate_required_stake">validate_required_stake</a>(minimum_stake, maximum_stake);
+
+    <b>assert</b>!(recurring_lockup_duration_secs &gt; 0, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="staking_config.md#0x1_staking_config_EZERO_LOCKUP_DURATION">EZERO_LOCKUP_DURATION</a>));
+    <b>assert</b>!(
+        rewards_rate_denominator &gt; 0,
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="staking_config.md#0x1_staking_config_EZERO_REWARDS_RATE_DENOMINATOR">EZERO_REWARDS_RATE_DENOMINATOR</a>),
+    );
+    <b>assert</b>!(
+        voting_power_increase_limit &gt; 0 && voting_power_increase_limit &lt;= 50,
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="staking_config.md#0x1_staking_config_EINVALID_VOTING_POWER_INCREASE_LIMIT">EINVALID_VOTING_POWER_INCREASE_LIMIT</a>),
+    );
+
+    // `rewards_rate` which is the numerator is limited <b>to</b> be `&lt;= <a href="staking_config.md#0x1_staking_config_MAX_REWARDS_RATE">MAX_REWARDS_RATE</a>` in order <b>to</b> avoid the arithmetic
+    // overflow in the rewards calculation. `rewards_rate_denominator` can be adjusted <b>to</b> get the desired rewards
+    // rate (i.e., rewards_rate / rewards_rate_denominator).
+    <b>assert</b>!(rewards_rate &lt;= <a href="staking_config.md#0x1_staking_config_MAX_REWARDS_RATE">MAX_REWARDS_RATE</a>, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="staking_config.md#0x1_staking_config_EINVALID_REWARDS_RATE">EINVALID_REWARDS_RATE</a>));
+
+    // We <b>assert</b> that (rewards_rate / rewards_rate_denominator &lt;= 1).
+    <b>assert</b>!(rewards_rate &lt;= rewards_rate_denominator, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="staking_config.md#0x1_staking_config_EINVALID_REWARDS_RATE">EINVALID_REWARDS_RATE</a>));
+
+    <b>move_to</b>(aptos_framework, <a href="staking_config.md#0x1_staking_config_StakingConfig">StakingConfig</a> {
+        minimum_stake,
+        maximum_stake,
+        recurring_lockup_duration_secs,
+        allow_validator_set_change,
+        rewards_rate,
+        rewards_rate_denominator,
+        voting_power_increase_limit,
+    });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_staking_config_reward_rate"></a>
+
+## Function `reward_rate`
+
+Return the reward rate of this epoch as a tuple (numerator, denominator).
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="staking_config.md#0x1_staking_config_reward_rate">reward_rate</a>(): (u64, u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="staking_config.md#0x1_staking_config_reward_rate">reward_rate</a>(): (u64, u64) <b>acquires</b> <a href="staking_config.md#0x1_staking_config_StakingRewardsConfig">StakingRewardsConfig</a>, <a href="staking_config.md#0x1_staking_config_StakingConfig">StakingConfig</a> {
+    <a href="staking_config.md#0x1_staking_config_get_reward_rate">get_reward_rate</a>(<b>borrow_global</b>&lt;<a href="staking_config.md#0x1_staking_config_StakingConfig">StakingConfig</a>&gt;(@aptos_framework))
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_staking_config_initialize_rewards"></a>
+
+## Function `initialize_rewards`
+
+Initialize rewards configurations.
+Can only be called as part of the Aptos governance proposal process established by the AptosGovernance module.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="staking_config.md#0x1_staking_config_initialize_rewards">initialize_rewards</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, rewards_rate: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>, min_rewards_rate: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>, rewards_rate_period_in_secs: u64, last_rewards_rate_period_start_in_secs: u64, rewards_rate_decrease_rate: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="staking_config.md#0x1_staking_config_initialize_rewards">initialize_rewards</a>(
+    aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    rewards_rate: FixedPoint64,
+    min_rewards_rate: FixedPoint64,
+    rewards_rate_period_in_secs: u64,
+    last_rewards_rate_period_start_in_secs: u64,
+    rewards_rate_decrease_rate: FixedPoint64,
+) {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(aptos_framework);
+
+    <a href="staking_config.md#0x1_staking_config_validate_rewards_config">validate_rewards_config</a>(
+        rewards_rate,
+        min_rewards_rate,
+        rewards_rate_period_in_secs,
+        rewards_rate_decrease_rate,
+    );
+    <b>assert</b>!(
+        <a href="timestamp.md#0x1_timestamp_now_seconds">timestamp::now_seconds</a>() &gt;= last_rewards_rate_period_start_in_secs,
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="staking_config.md#0x1_staking_config_EINVALID_LAST_REWARDS_RATE_PERIOD_START">EINVALID_LAST_REWARDS_RATE_PERIOD_START</a>)
+    );
+
+    <b>move_to</b>(aptos_framework, <a href="staking_config.md#0x1_staking_config_StakingRewardsConfig">StakingRewardsConfig</a> {
+        rewards_rate,
+        min_rewards_rate,
+        rewards_rate_period_in_secs,
+        last_rewards_rate_period_start_in_secs,
+        rewards_rate_decrease_rate,
+    });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_staking_config_get"></a>
+
+## Function `get`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="staking_config.md#0x1_staking_config_get">get</a>(): <a href="staking_config.md#0x1_staking_config_StakingConfig">staking_config::StakingConfig</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="staking_config.md#0x1_staking_config_get">get</a>(): <a href="staking_config.md#0x1_staking_config_StakingConfig">StakingConfig</a> <b>acquires</b> <a href="staking_config.md#0x1_staking_config_StakingConfig">StakingConfig</a> {
+    *<b>borrow_global</b>&lt;<a href="staking_config.md#0x1_staking_config_StakingConfig">StakingConfig</a>&gt;(@aptos_framework)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_staking_config_get_allow_validator_set_change"></a>
+
+## Function `get_allow_validator_set_change`
+
+Return whether validator set changes are allowed
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="staking_config.md#0x1_staking_config_get_allow_validator_set_change">get_allow_validator_set_change</a>(config: &<a href="staking_config.md#0x1_staking_config_StakingConfig">staking_config::StakingConfig</a>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="staking_config.md#0x1_staking_config_get_allow_validator_set_change">get_allow_validator_set_change</a>(config: &<a href="staking_config.md#0x1_staking_config_StakingConfig">StakingConfig</a>): bool {
+    config.allow_validator_set_change
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_staking_config_get_required_stake"></a>
+
+## Function `get_required_stake`
+
+Return the required min/max stake.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="staking_config.md#0x1_staking_config_get_required_stake">get_required_stake</a>(config: &<a href="staking_config.md#0x1_staking_config_StakingConfig">staking_config::StakingConfig</a>): (u64, u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="staking_config.md#0x1_staking_config_get_required_stake">get_required_stake</a>(config: &<a href="staking_config.md#0x1_staking_config_StakingConfig">StakingConfig</a>): (u64, u64) {
+    (config.minimum_stake, config.maximum_stake)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_staking_config_get_recurring_lockup_duration"></a>
+
+## Function `get_recurring_lockup_duration`
+
+Return the recurring lockup duration that every validator is automatically renewed for (unless they unlock and
+withdraw all funds).
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="staking_config.md#0x1_staking_config_get_recurring_lockup_duration">get_recurring_lockup_duration</a>(config: &<a href="staking_config.md#0x1_staking_config_StakingConfig">staking_config::StakingConfig</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="staking_config.md#0x1_staking_config_get_recurring_lockup_duration">get_recurring_lockup_duration</a>(config: &<a href="staking_config.md#0x1_staking_config_StakingConfig">StakingConfig</a>): u64 {
+    config.recurring_lockup_duration_secs
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_staking_config_get_reward_rate"></a>
+
+## Function `get_reward_rate`
+
+Return the reward rate of this epoch.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="staking_config.md#0x1_staking_config_get_reward_rate">get_reward_rate</a>(config: &<a href="staking_config.md#0x1_staking_config_StakingConfig">staking_config::StakingConfig</a>): (u64, u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="staking_config.md#0x1_staking_config_get_reward_rate">get_reward_rate</a>(config: &<a href="staking_config.md#0x1_staking_config_StakingConfig">StakingConfig</a>): (u64, u64) <b>acquires</b> <a href="staking_config.md#0x1_staking_config_StakingRewardsConfig">StakingRewardsConfig</a> {
+    <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_periodical_reward_rate_decrease_enabled">features::periodical_reward_rate_decrease_enabled</a>()) {
+        <b>let</b> epoch_rewards_rate = <b>borrow_global</b>&lt;<a href="staking_config.md#0x1_staking_config_StakingRewardsConfig">StakingRewardsConfig</a>&gt;(@aptos_framework).rewards_rate;
+        <b>if</b> (<a href="../../../aptos-stdlib/tests/compiler-v2-doc/fixed_point64.md#0x1_fixed_point64_is_zero">fixed_point64::is_zero</a>(epoch_rewards_rate)) {
+            (0u64, 1u64)
+        } <b>else</b> {
+            // Maximize denominator for higher precision.
+            // Restriction: nominator &lt;= <a href="staking_config.md#0x1_staking_config_MAX_REWARDS_RATE">MAX_REWARDS_RATE</a> && denominator &lt;= <a href="staking_config.md#0x1_staking_config_MAX_U64">MAX_U64</a>
+            <b>let</b> denominator = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/fixed_point64.md#0x1_fixed_point64_divide_u128">fixed_point64::divide_u128</a>((<a href="staking_config.md#0x1_staking_config_MAX_REWARDS_RATE">MAX_REWARDS_RATE</a> <b>as</b> u128), epoch_rewards_rate);
+            <b>if</b> (denominator &gt; <a href="staking_config.md#0x1_staking_config_MAX_U64">MAX_U64</a>) {
+                denominator = <a href="staking_config.md#0x1_staking_config_MAX_U64">MAX_U64</a>
+            };
+            <b>let</b> nominator = (<a href="../../../aptos-stdlib/tests/compiler-v2-doc/fixed_point64.md#0x1_fixed_point64_multiply_u128">fixed_point64::multiply_u128</a>(denominator, epoch_rewards_rate) <b>as</b> u64);
+            (nominator, (denominator <b>as</b> u64))
+        }
+    } <b>else</b> {
+        (config.rewards_rate, config.rewards_rate_denominator)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_staking_config_get_voting_power_increase_limit"></a>
+
+## Function `get_voting_power_increase_limit`
+
+Return the joining limit %.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="staking_config.md#0x1_staking_config_get_voting_power_increase_limit">get_voting_power_increase_limit</a>(config: &<a href="staking_config.md#0x1_staking_config_StakingConfig">staking_config::StakingConfig</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="staking_config.md#0x1_staking_config_get_voting_power_increase_limit">get_voting_power_increase_limit</a>(config: &<a href="staking_config.md#0x1_staking_config_StakingConfig">StakingConfig</a>): u64 {
+    config.voting_power_increase_limit
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_staking_config_calculate_and_save_latest_epoch_rewards_rate"></a>
+
+## Function `calculate_and_save_latest_epoch_rewards_rate`
+
+Calculate and save the latest rewards rate.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="staking_config.md#0x1_staking_config_calculate_and_save_latest_epoch_rewards_rate">calculate_and_save_latest_epoch_rewards_rate</a>(): <a href="../../../aptos-stdlib/tests/compiler-v2-doc/fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="staking_config.md#0x1_staking_config_calculate_and_save_latest_epoch_rewards_rate">calculate_and_save_latest_epoch_rewards_rate</a>(): FixedPoint64 <b>acquires</b> <a href="staking_config.md#0x1_staking_config_StakingRewardsConfig">StakingRewardsConfig</a> {
+    <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_periodical_reward_rate_decrease_enabled">features::periodical_reward_rate_decrease_enabled</a>(), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="staking_config.md#0x1_staking_config_EDISABLED_FUNCTION">EDISABLED_FUNCTION</a>));
+    <b>let</b> staking_rewards_config = <a href="staking_config.md#0x1_staking_config_calculate_and_save_latest_rewards_config">calculate_and_save_latest_rewards_config</a>();
+    staking_rewards_config.rewards_rate
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_staking_config_calculate_and_save_latest_rewards_config"></a>
+
+## Function `calculate_and_save_latest_rewards_config`
+
+Calculate and return the up-to-date StakingRewardsConfig.
+
+
+<pre><code><b>fun</b> <a href="staking_config.md#0x1_staking_config_calculate_and_save_latest_rewards_config">calculate_and_save_latest_rewards_config</a>(): <a href="staking_config.md#0x1_staking_config_StakingRewardsConfig">staking_config::StakingRewardsConfig</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="staking_config.md#0x1_staking_config_calculate_and_save_latest_rewards_config">calculate_and_save_latest_rewards_config</a>(): <a href="staking_config.md#0x1_staking_config_StakingRewardsConfig">StakingRewardsConfig</a> <b>acquires</b> <a href="staking_config.md#0x1_staking_config_StakingRewardsConfig">StakingRewardsConfig</a> {
+    <b>let</b> staking_rewards_config = <b>borrow_global_mut</b>&lt;<a href="staking_config.md#0x1_staking_config_StakingRewardsConfig">StakingRewardsConfig</a>&gt;(@aptos_framework);
+    <b>let</b> current_time_in_secs = <a href="timestamp.md#0x1_timestamp_now_seconds">timestamp::now_seconds</a>();
+    <b>assert</b>!(
+        current_time_in_secs &gt;= staking_rewards_config.last_rewards_rate_period_start_in_secs,
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="staking_config.md#0x1_staking_config_EINVALID_LAST_REWARDS_RATE_PERIOD_START">EINVALID_LAST_REWARDS_RATE_PERIOD_START</a>)
+    );
+    <b>if</b> (current_time_in_secs - staking_rewards_config.last_rewards_rate_period_start_in_secs &lt; staking_rewards_config.rewards_rate_period_in_secs) {
+        <b>return</b> *staking_rewards_config
+    };
+    // Rewards rate decrease rate cannot be greater than 100%. Otherwise rewards rate will be negative.
+    <b>assert</b>!(
+        <a href="../../../aptos-stdlib/tests/compiler-v2-doc/fixed_point64.md#0x1_fixed_point64_ceil">fixed_point64::ceil</a>(staking_rewards_config.rewards_rate_decrease_rate) &lt;= 1,
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="staking_config.md#0x1_staking_config_EINVALID_REWARDS_RATE_DECREASE_RATE">EINVALID_REWARDS_RATE_DECREASE_RATE</a>)
+    );
+    <b>let</b> new_rate = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/math_fixed64.md#0x1_math_fixed64_mul_div">math_fixed64::mul_div</a>(
+        staking_rewards_config.rewards_rate,
+        <a href="../../../aptos-stdlib/tests/compiler-v2-doc/fixed_point64.md#0x1_fixed_point64_sub">fixed_point64::sub</a>(
+            <a href="../../../aptos-stdlib/tests/compiler-v2-doc/fixed_point64.md#0x1_fixed_point64_create_from_u128">fixed_point64::create_from_u128</a>(1),
+            staking_rewards_config.rewards_rate_decrease_rate,
+        ),
+        <a href="../../../aptos-stdlib/tests/compiler-v2-doc/fixed_point64.md#0x1_fixed_point64_create_from_u128">fixed_point64::create_from_u128</a>(1),
+    );
+    new_rate = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/fixed_point64.md#0x1_fixed_point64_max">fixed_point64::max</a>(new_rate, staking_rewards_config.min_rewards_rate);
+
+    staking_rewards_config.rewards_rate = new_rate;
+    staking_rewards_config.last_rewards_rate_period_start_in_secs =
+        staking_rewards_config.last_rewards_rate_period_start_in_secs +
+        staking_rewards_config.rewards_rate_period_in_secs;
+    <b>return</b> *staking_rewards_config
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_staking_config_update_required_stake"></a>
+
+## Function `update_required_stake`
+
+Update the min and max stake amounts.
+Can only be called as part of the Aptos governance proposal process established by the AptosGovernance module.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="staking_config.md#0x1_staking_config_update_required_stake">update_required_stake</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, minimum_stake: u64, maximum_stake: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="staking_config.md#0x1_staking_config_update_required_stake">update_required_stake</a>(
+    aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    minimum_stake: u64,
+    maximum_stake: u64,
+) <b>acquires</b> <a href="staking_config.md#0x1_staking_config_StakingConfig">StakingConfig</a> {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(aptos_framework);
+    <a href="staking_config.md#0x1_staking_config_validate_required_stake">validate_required_stake</a>(minimum_stake, maximum_stake);
+
+    <b>let</b> <a href="staking_config.md#0x1_staking_config">staking_config</a> = <b>borrow_global_mut</b>&lt;<a href="staking_config.md#0x1_staking_config_StakingConfig">StakingConfig</a>&gt;(@aptos_framework);
+    <a href="staking_config.md#0x1_staking_config">staking_config</a>.minimum_stake = minimum_stake;
+    <a href="staking_config.md#0x1_staking_config">staking_config</a>.maximum_stake = maximum_stake;
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_staking_config_update_recurring_lockup_duration_secs"></a>
+
+## Function `update_recurring_lockup_duration_secs`
+
+Update the recurring lockup duration.
+Can only be called as part of the Aptos governance proposal process established by the AptosGovernance module.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="staking_config.md#0x1_staking_config_update_recurring_lockup_duration_secs">update_recurring_lockup_duration_secs</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, new_recurring_lockup_duration_secs: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="staking_config.md#0x1_staking_config_update_recurring_lockup_duration_secs">update_recurring_lockup_duration_secs</a>(
+    aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    new_recurring_lockup_duration_secs: u64,
+) <b>acquires</b> <a href="staking_config.md#0x1_staking_config_StakingConfig">StakingConfig</a> {
+    <b>assert</b>!(new_recurring_lockup_duration_secs &gt; 0, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="staking_config.md#0x1_staking_config_EZERO_LOCKUP_DURATION">EZERO_LOCKUP_DURATION</a>));
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(aptos_framework);
+
+    <b>let</b> <a href="staking_config.md#0x1_staking_config">staking_config</a> = <b>borrow_global_mut</b>&lt;<a href="staking_config.md#0x1_staking_config_StakingConfig">StakingConfig</a>&gt;(@aptos_framework);
+    <a href="staking_config.md#0x1_staking_config">staking_config</a>.recurring_lockup_duration_secs = new_recurring_lockup_duration_secs;
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_staking_config_update_rewards_rate"></a>
+
+## Function `update_rewards_rate`
+
+DEPRECATING
+Update the rewards rate.
+Can only be called as part of the Aptos governance proposal process established by the AptosGovernance module.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="staking_config.md#0x1_staking_config_update_rewards_rate">update_rewards_rate</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, new_rewards_rate: u64, new_rewards_rate_denominator: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="staking_config.md#0x1_staking_config_update_rewards_rate">update_rewards_rate</a>(
+    aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    new_rewards_rate: u64,
+    new_rewards_rate_denominator: u64,
+) <b>acquires</b> <a href="staking_config.md#0x1_staking_config_StakingConfig">StakingConfig</a> {
+    <b>assert</b>!(!<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_periodical_reward_rate_decrease_enabled">features::periodical_reward_rate_decrease_enabled</a>(), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="staking_config.md#0x1_staking_config_EDEPRECATED_FUNCTION">EDEPRECATED_FUNCTION</a>));
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(aptos_framework);
+    <b>assert</b>!(
+        new_rewards_rate_denominator &gt; 0,
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="staking_config.md#0x1_staking_config_EZERO_REWARDS_RATE_DENOMINATOR">EZERO_REWARDS_RATE_DENOMINATOR</a>),
+    );
+    // `rewards_rate` which is the numerator is limited <b>to</b> be `&lt;= <a href="staking_config.md#0x1_staking_config_MAX_REWARDS_RATE">MAX_REWARDS_RATE</a>` in order <b>to</b> avoid the arithmetic
+    // overflow in the rewards calculation. `rewards_rate_denominator` can be adjusted <b>to</b> get the desired rewards
+    // rate (i.e., rewards_rate / rewards_rate_denominator).
+    <b>assert</b>!(new_rewards_rate &lt;= <a href="staking_config.md#0x1_staking_config_MAX_REWARDS_RATE">MAX_REWARDS_RATE</a>, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="staking_config.md#0x1_staking_config_EINVALID_REWARDS_RATE">EINVALID_REWARDS_RATE</a>));
+
+    // We <b>assert</b> that (rewards_rate / rewards_rate_denominator &lt;= 1).
+    <b>assert</b>!(new_rewards_rate &lt;= new_rewards_rate_denominator, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="staking_config.md#0x1_staking_config_EINVALID_REWARDS_RATE">EINVALID_REWARDS_RATE</a>));
+
+    <b>let</b> <a href="staking_config.md#0x1_staking_config">staking_config</a> = <b>borrow_global_mut</b>&lt;<a href="staking_config.md#0x1_staking_config_StakingConfig">StakingConfig</a>&gt;(@aptos_framework);
+    <a href="staking_config.md#0x1_staking_config">staking_config</a>.rewards_rate = new_rewards_rate;
+    <a href="staking_config.md#0x1_staking_config">staking_config</a>.rewards_rate_denominator = new_rewards_rate_denominator;
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_staking_config_update_rewards_config"></a>
+
+## Function `update_rewards_config`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="staking_config.md#0x1_staking_config_update_rewards_config">update_rewards_config</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, rewards_rate: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>, min_rewards_rate: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>, rewards_rate_period_in_secs: u64, rewards_rate_decrease_rate: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="staking_config.md#0x1_staking_config_update_rewards_config">update_rewards_config</a>(
+    aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    rewards_rate: FixedPoint64,
+    min_rewards_rate: FixedPoint64,
+    rewards_rate_period_in_secs: u64,
+    rewards_rate_decrease_rate: FixedPoint64,
+) <b>acquires</b> <a href="staking_config.md#0x1_staking_config_StakingRewardsConfig">StakingRewardsConfig</a> {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(aptos_framework);
+
+    <a href="staking_config.md#0x1_staking_config_validate_rewards_config">validate_rewards_config</a>(
+        rewards_rate,
+        min_rewards_rate,
+        rewards_rate_period_in_secs,
+        rewards_rate_decrease_rate,
+    );
+
+    <b>let</b> staking_rewards_config = <b>borrow_global_mut</b>&lt;<a href="staking_config.md#0x1_staking_config_StakingRewardsConfig">StakingRewardsConfig</a>&gt;(@aptos_framework);
+    // Currently rewards_rate_period_in_secs is not allowed <b>to</b> be changed because this could bring complicated
+    // logics. At the moment the argument is just a placeholder for future <b>use</b>.
+    <b>assert</b>!(
+        rewards_rate_period_in_secs == staking_rewards_config.rewards_rate_period_in_secs,
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="staking_config.md#0x1_staking_config_EINVALID_REWARDS_RATE_PERIOD">EINVALID_REWARDS_RATE_PERIOD</a>),
+    );
+    staking_rewards_config.rewards_rate = rewards_rate;
+    staking_rewards_config.min_rewards_rate = min_rewards_rate;
+    staking_rewards_config.rewards_rate_period_in_secs = rewards_rate_period_in_secs;
+    staking_rewards_config.rewards_rate_decrease_rate = rewards_rate_decrease_rate;
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_staking_config_update_voting_power_increase_limit"></a>
+
+## Function `update_voting_power_increase_limit`
+
+Update the joining limit %.
+Can only be called as part of the Aptos governance proposal process established by the AptosGovernance module.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="staking_config.md#0x1_staking_config_update_voting_power_increase_limit">update_voting_power_increase_limit</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, new_voting_power_increase_limit: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="staking_config.md#0x1_staking_config_update_voting_power_increase_limit">update_voting_power_increase_limit</a>(
+    aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    new_voting_power_increase_limit: u64,
+) <b>acquires</b> <a href="staking_config.md#0x1_staking_config_StakingConfig">StakingConfig</a> {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(aptos_framework);
+    <b>assert</b>!(
+        new_voting_power_increase_limit &gt; 0 && new_voting_power_increase_limit &lt;= 50,
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="staking_config.md#0x1_staking_config_EINVALID_VOTING_POWER_INCREASE_LIMIT">EINVALID_VOTING_POWER_INCREASE_LIMIT</a>),
+    );
+
+    <b>let</b> <a href="staking_config.md#0x1_staking_config">staking_config</a> = <b>borrow_global_mut</b>&lt;<a href="staking_config.md#0x1_staking_config_StakingConfig">StakingConfig</a>&gt;(@aptos_framework);
+    <a href="staking_config.md#0x1_staking_config">staking_config</a>.voting_power_increase_limit = new_voting_power_increase_limit;
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_staking_config_validate_required_stake"></a>
+
+## Function `validate_required_stake`
+
+
+
+<pre><code><b>fun</b> <a href="staking_config.md#0x1_staking_config_validate_required_stake">validate_required_stake</a>(minimum_stake: u64, maximum_stake: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="staking_config.md#0x1_staking_config_validate_required_stake">validate_required_stake</a>(minimum_stake: u64, maximum_stake: u64) {
+    <b>assert</b>!(minimum_stake &lt;= maximum_stake && maximum_stake &gt; 0, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="staking_config.md#0x1_staking_config_EINVALID_STAKE_RANGE">EINVALID_STAKE_RANGE</a>));
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_staking_config_validate_rewards_config"></a>
+
+## Function `validate_rewards_config`
+
+
+
+<pre><code><b>fun</b> <a href="staking_config.md#0x1_staking_config_validate_rewards_config">validate_rewards_config</a>(rewards_rate: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>, min_rewards_rate: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>, rewards_rate_period_in_secs: u64, rewards_rate_decrease_rate: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="staking_config.md#0x1_staking_config_validate_rewards_config">validate_rewards_config</a>(
+    rewards_rate: FixedPoint64,
+    min_rewards_rate: FixedPoint64,
+    rewards_rate_period_in_secs: u64,
+    rewards_rate_decrease_rate: FixedPoint64,
+) {
+    // Bound rewards rate <b>to</b> avoid arithmetic overflow.
+    <b>assert</b>!(
+        less_or_equal(rewards_rate, <a href="../../../aptos-stdlib/tests/compiler-v2-doc/fixed_point64.md#0x1_fixed_point64_create_from_u128">fixed_point64::create_from_u128</a>((1u128))),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="staking_config.md#0x1_staking_config_EINVALID_REWARDS_RATE">EINVALID_REWARDS_RATE</a>)
+    );
+    <b>assert</b>!(
+        less_or_equal(min_rewards_rate, rewards_rate),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="staking_config.md#0x1_staking_config_EINVALID_MIN_REWARDS_RATE">EINVALID_MIN_REWARDS_RATE</a>)
+    );
+    // Rewards rate decrease rate cannot be greater than 100%. Otherwise rewards rate will be negative.
+    <b>assert</b>!(
+        <a href="../../../aptos-stdlib/tests/compiler-v2-doc/fixed_point64.md#0x1_fixed_point64_ceil">fixed_point64::ceil</a>(rewards_rate_decrease_rate) &lt;= 1,
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="staking_config.md#0x1_staking_config_EINVALID_REWARDS_RATE_DECREASE_RATE">EINVALID_REWARDS_RATE_DECREASE_RATE</a>)
+    );
+    // This field, rewards_rate_period_in_secs must be greater than 0.
+    // TODO: rewards_rate_period_in_secs should be longer than the epoch duration but reading epoch duration causes a circular dependency.
+    <b>assert</b>!(
+        rewards_rate_period_in_secs &gt; 0,
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="staking_config.md#0x1_staking_config_EINVALID_REWARDS_RATE_PERIOD">EINVALID_REWARDS_RATE_PERIOD</a>),
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+
+
+<a id="high-level-req"></a>
+
+### High-level Requirements
+
+<table>
+<tr>
+<th>No.</th><th>Requirement</th><th>Criticality</th><th>Implementation</th><th>Enforcement</th>
+</tr>
+
+<tr>
+<td>1</td>
+<td>The ability to initialize the staking config and staking rewards resources, as well as the ability to update the staking config and staking rewards should only be available to the Aptos framework account.</td>
+<td>Medium</td>
+<td>The function initialize and initialize_rewards are used to initialize the StakingConfig and StakingRewardConfig resources. Updating the resources, can be done using the update_required_stake, update_recurring_lockup_duration_secs, update_rewards_rate, update_rewards_config, update_voting_power_increase_limit functions, which ensure that the signer is aptos_framework using the assert_aptos_framework function.</td>
+<td>Verified via <a href="#high-level-req-1.1">initialize</a>, <a href="#high-level-req-1.2">initialize_rewards</a>, <a href="#high-level-req-1.3">update_required_stake</a>, <a href="#high-level-req-1.4">update_recurring_lockup_duration_secs</a>, <a href="#high-level-req-1.5">update_rewards_rate</a>, <a href="#high-level-req-1.6">update_rewards_config</a>, and <a href="#high-level-req-1.7">update_voting_power_increase_limit</a>.</td>
+</tr>
+
+<tr>
+<td>2</td>
+<td>The voting power increase, in a staking config resource, should always be greater than 0 and less or equal to 50.</td>
+<td>High</td>
+<td>During the initialization and update of the staking config, the value of voting_power_increase_limit is ensured to be in the range of (0 to 50].</td>
+<td>Ensured via <a href="#high-level-req-2.1">initialize</a> and <a href="#high-level-req-2.2">update_voting_power_increase_limit</a>. Formally verified via <a href="#high-level-req-2.3">StakingConfig</a>.</td>
+</tr>
+
+<tr>
+<td>3</td>
+<td>The recurring lockup duration, in a staking config resource, should always be greater than 0.</td>
+<td>Medium</td>
+<td>During the initialization and update of the staking config, the value of recurring_lockup_duration_secs is ensured to be greater than 0.</td>
+<td>Ensured via <a href="#high-level-req-3.1">initialize</a> and <a href="#high-level-req-3.2">update_recurring_lockup_duration_secs</a>. Formally verified via <a href="#high-level-req-3.3">StakingConfig</a>.</td>
+</tr>
+
+<tr>
+<td>4</td>
+<td>The calculation of rewards should not be possible if the last reward rate period just started.</td>
+<td>High</td>
+<td>The function calculate_and_save_latest_rewards_config ensures that last_rewards_rate_period_start_in_secs is greater or equal to the current timestamp.</td>
+<td>Formally verified in <a href="#high-level-req-4">StakingRewardsConfigEnabledRequirement</a>.</td>
+</tr>
+
+<tr>
+<td>5</td>
+<td>The rewards rate should always be less than or equal to 100%.</td>
+<td>High</td>
+<td>When initializing and updating the rewards rate, it is ensured that the rewards_rate is less or equal to MAX_REWARDS_RATE, otherwise rewards rate will be negative.</td>
+<td>Verified via <a href="#high-level-req-5">StakingConfig</a>.</td>
+</tr>
+
+<tr>
+<td>6</td>
+<td>The reward rate's denominator should never be 0.</td>
+<td>High</td>
+<td>While initializing and updating the rewards rate, rewards_rate_denominator is ensured to be greater than 0.</td>
+<td>Verified via <a href="#high-level-req-6">StakingConfig</a>.</td>
+</tr>
+
+<tr>
+<td>7</td>
+<td>The reward rate's nominator and dominator ratio should always be less or equal to 1.</td>
+<td>High</td>
+<td>When initializing and updating the rewards rate, it is ensured that rewards_rate is less or equal to rewards_rate_denominator.</td>
+<td>Verified via <a href="#high-level-req-7">StakingConfig</a>.</td>
+</tr>
+
+</table>
+
+
+
+
+<a id="module-level-spec"></a>
+
+### Module-level Specification
+
+
+<pre><code><b>invariant</b> [suspendable] <a href="chain_status.md#0x1_chain_status_is_operating">chain_status::is_operating</a>() ==&gt; <b>exists</b>&lt;<a href="staking_config.md#0x1_staking_config_StakingConfig">StakingConfig</a>&gt;(@aptos_framework);
+<b>pragma</b> verify = <b>true</b>;
+<b>pragma</b> aborts_if_is_strict;
+</code></pre>
+
+
+
+<a id="@Specification_1_StakingConfig"></a>
+
+### Resource `StakingConfig`
+
+
+<pre><code><b>struct</b> <a href="staking_config.md#0x1_staking_config_StakingConfig">StakingConfig</a> <b>has</b> <b>copy</b>, drop, key
+</code></pre>
+
+
+
+<dl>
+<dt>
+<code>minimum_stake: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>maximum_stake: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>recurring_lockup_duration_secs: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>allow_validator_set_change: bool</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>rewards_rate: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>rewards_rate_denominator: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>voting_power_increase_limit: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+
+<pre><code>// This enforces <a id="high-level-req-5" href="#high-level-req">high-level requirement 5</a>:
+<b>invariant</b> rewards_rate &lt;= <a href="staking_config.md#0x1_staking_config_MAX_REWARDS_RATE">MAX_REWARDS_RATE</a>;
+// This enforces <a id="high-level-req-6" href="#high-level-req">high-level requirement 6</a>:
+<b>invariant</b> rewards_rate_denominator &gt; 0;
+// This enforces <a id="high-level-req-7" href="#high-level-req">high-level requirement 7</a>:
+<b>invariant</b> rewards_rate &lt;= rewards_rate_denominator;
+// This enforces <a id="high-level-req-3.3" href="#high-level-req">high-level requirement 3</a>:
+<b>invariant</b> recurring_lockup_duration_secs &gt; 0;
+// This enforces <a id="high-level-req-2.3" href="#high-level-req">high-level requirement 2</a>:
+<b>invariant</b> voting_power_increase_limit &gt; 0 && voting_power_increase_limit &lt;= 50;
+</code></pre>
+
+
+
+<a id="@Specification_1_StakingRewardsConfig"></a>
+
+### Resource `StakingRewardsConfig`
+
+
+<pre><code><b>struct</b> <a href="staking_config.md#0x1_staking_config_StakingRewardsConfig">StakingRewardsConfig</a> <b>has</b> <b>copy</b>, drop, key
+</code></pre>
+
+
+
+<dl>
+<dt>
+<code>rewards_rate: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>min_rewards_rate: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>rewards_rate_period_in_secs: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>last_rewards_rate_period_start_in_secs: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>rewards_rate_decrease_rate: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+
+<pre><code><b>invariant</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/fixed_point64.md#0x1_fixed_point64_spec_less_or_equal">fixed_point64::spec_less_or_equal</a>(
+    rewards_rate,
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/fixed_point64.md#0x1_fixed_point64_spec_create_from_u128">fixed_point64::spec_create_from_u128</a>((1u128)));
+<b>invariant</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/fixed_point64.md#0x1_fixed_point64_spec_less_or_equal">fixed_point64::spec_less_or_equal</a>(min_rewards_rate, rewards_rate);
+<b>invariant</b> rewards_rate_period_in_secs &gt; 0;
+<b>invariant</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/fixed_point64.md#0x1_fixed_point64_spec_ceil">fixed_point64::spec_ceil</a>(rewards_rate_decrease_rate) &lt;= 1;
+</code></pre>
+
+
+
+<a id="@Specification_1_initialize"></a>
+
+### Function `initialize`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="staking_config.md#0x1_staking_config_initialize">initialize</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, minimum_stake: u64, maximum_stake: u64, recurring_lockup_duration_secs: u64, allow_validator_set_change: bool, rewards_rate: u64, rewards_rate_denominator: u64, voting_power_increase_limit: u64)
+</code></pre>
+
+
+Caller must be @aptos_framework.
+The maximum_stake must be greater than maximum_stake in the range of Specified stake and the maximum_stake greater than zero.
+The rewards_rate_denominator must greater than zero.
+Only this %0-%50 of current total voting power is allowed to join the validator set in each epoch.
+The <code>rewards_rate</code> which is the numerator is limited to be <code>&lt;= <a href="staking_config.md#0x1_staking_config_MAX_REWARDS_RATE">MAX_REWARDS_RATE</a></code> in order to avoid the arithmetic overflow in the rewards calculation.
+rewards_rate/rewards_rate_denominator <= 1.
+StakingConfig does not exist under the aptos_framework before creating it.
+
+
+<pre><code><b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(aptos_framework);
+// This enforces <a id="high-level-req-1.1" href="#high-level-req">high-level requirement 1</a>:
+<b>aborts_if</b> addr != @aptos_framework;
+<b>aborts_if</b> minimum_stake &gt; maximum_stake || maximum_stake == 0;
+// This enforces <a id="high-level-req-3.1" href="#high-level-req">high-level requirement 3</a>:
+<b>aborts_if</b> recurring_lockup_duration_secs == 0;
+<b>aborts_if</b> rewards_rate_denominator == 0;
+// This enforces <a id="high-level-req-2.1" href="#high-level-req">high-level requirement 2</a>:
+<b>aborts_if</b> voting_power_increase_limit == 0 || voting_power_increase_limit &gt; 50;
+<b>aborts_if</b> rewards_rate &gt; <a href="staking_config.md#0x1_staking_config_MAX_REWARDS_RATE">MAX_REWARDS_RATE</a>;
+<b>aborts_if</b> rewards_rate &gt; rewards_rate_denominator;
+<b>aborts_if</b> <b>exists</b>&lt;<a href="staking_config.md#0x1_staking_config_StakingConfig">StakingConfig</a>&gt;(addr);
+<b>ensures</b> <b>exists</b>&lt;<a href="staking_config.md#0x1_staking_config_StakingConfig">StakingConfig</a>&gt;(addr);
+</code></pre>
+
+
+
+<a id="@Specification_1_reward_rate"></a>
+
+### Function `reward_rate`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="staking_config.md#0x1_staking_config_reward_rate">reward_rate</a>(): (u64, u64)
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> config = <b>global</b>&lt;<a href="staking_config.md#0x1_staking_config_StakingConfig">StakingConfig</a>&gt;(@aptos_framework);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="staking_config.md#0x1_staking_config_StakingConfig">StakingConfig</a>&gt;(@aptos_framework);
+<b>include</b> <a href="staking_config.md#0x1_staking_config_StakingRewardsConfigRequirement">StakingRewardsConfigRequirement</a>;
+<b>ensures</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_spec_periodical_reward_rate_decrease_enabled">features::spec_periodical_reward_rate_decrease_enabled</a>() &&
+    (<b>global</b>&lt;<a href="staking_config.md#0x1_staking_config_StakingRewardsConfig">StakingRewardsConfig</a>&gt;(@aptos_framework).rewards_rate.value <b>as</b> u64) != 0) ==&gt;
+    result_1 &lt;= <a href="staking_config.md#0x1_staking_config_MAX_REWARDS_RATE">MAX_REWARDS_RATE</a> && result_2 &lt;= <a href="staking_config.md#0x1_staking_config_MAX_U64">MAX_U64</a>;
+</code></pre>
+
+
+
+<a id="@Specification_1_initialize_rewards"></a>
+
+### Function `initialize_rewards`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="staking_config.md#0x1_staking_config_initialize_rewards">initialize_rewards</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, rewards_rate: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>, min_rewards_rate: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>, rewards_rate_period_in_secs: u64, last_rewards_rate_period_start_in_secs: u64, rewards_rate_decrease_rate: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>)
+</code></pre>
+
+
+Caller must be @aptos_framework.
+last_rewards_rate_period_start_in_secs cannot be later than now.
+Abort at any condition in StakingRewardsConfigValidationAborts.
+StakingRewardsConfig does not exist under the aptos_framework before creating it.
+
+
+<pre><code><b>pragma</b> verify_duration_estimate = 120;
+<b>requires</b> <b>exists</b>&lt;<a href="timestamp.md#0x1_timestamp_CurrentTimeMicroseconds">timestamp::CurrentTimeMicroseconds</a>&gt;(@aptos_framework);
+<b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(aptos_framework);
+// This enforces <a id="high-level-req-1.2" href="#high-level-req">high-level requirement 1</a>:
+<b>aborts_if</b> addr != @aptos_framework;
+<b>aborts_if</b> last_rewards_rate_period_start_in_secs &gt; <a href="timestamp.md#0x1_timestamp_spec_now_seconds">timestamp::spec_now_seconds</a>();
+<b>include</b> <a href="staking_config.md#0x1_staking_config_StakingRewardsConfigValidationAbortsIf">StakingRewardsConfigValidationAbortsIf</a>;
+<b>aborts_if</b> <b>exists</b>&lt;<a href="staking_config.md#0x1_staking_config_StakingRewardsConfig">StakingRewardsConfig</a>&gt;(addr);
+<b>ensures</b> <b>exists</b>&lt;<a href="staking_config.md#0x1_staking_config_StakingRewardsConfig">StakingRewardsConfig</a>&gt;(addr);
+</code></pre>
+
+
+
+<a id="@Specification_1_get"></a>
+
+### Function `get`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="staking_config.md#0x1_staking_config_get">get</a>(): <a href="staking_config.md#0x1_staking_config_StakingConfig">staking_config::StakingConfig</a>
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="staking_config.md#0x1_staking_config_StakingConfig">StakingConfig</a>&gt;(@aptos_framework);
+</code></pre>
+
+
+
+<a id="@Specification_1_get_reward_rate"></a>
+
+### Function `get_reward_rate`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="staking_config.md#0x1_staking_config_get_reward_rate">get_reward_rate</a>(config: &<a href="staking_config.md#0x1_staking_config_StakingConfig">staking_config::StakingConfig</a>): (u64, u64)
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="staking_config.md#0x1_staking_config_StakingRewardsConfigRequirement">StakingRewardsConfigRequirement</a>;
+<b>ensures</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_spec_periodical_reward_rate_decrease_enabled">features::spec_periodical_reward_rate_decrease_enabled</a>() &&
+    (<b>global</b>&lt;<a href="staking_config.md#0x1_staking_config_StakingRewardsConfig">StakingRewardsConfig</a>&gt;(@aptos_framework).rewards_rate.value <b>as</b> u64) != 0) ==&gt;
+        result_1 &lt;= <a href="staking_config.md#0x1_staking_config_MAX_REWARDS_RATE">MAX_REWARDS_RATE</a> && result_2 &lt;= <a href="staking_config.md#0x1_staking_config_MAX_U64">MAX_U64</a>;
+</code></pre>
+
+
+
+<a id="@Specification_1_calculate_and_save_latest_epoch_rewards_rate"></a>
+
+### Function `calculate_and_save_latest_epoch_rewards_rate`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="staking_config.md#0x1_staking_config_calculate_and_save_latest_epoch_rewards_rate">calculate_and_save_latest_epoch_rewards_rate</a>(): <a href="../../../aptos-stdlib/tests/compiler-v2-doc/fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify_duration_estimate = 120;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="staking_config.md#0x1_staking_config_StakingRewardsConfig">StakingRewardsConfig</a>&gt;(@aptos_framework);
+<b>aborts_if</b> !<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_spec_periodical_reward_rate_decrease_enabled">features::spec_periodical_reward_rate_decrease_enabled</a>();
+<b>include</b> <a href="staking_config.md#0x1_staking_config_StakingRewardsConfigRequirement">StakingRewardsConfigRequirement</a>;
+</code></pre>
+
+
+
+<a id="@Specification_1_calculate_and_save_latest_rewards_config"></a>
+
+### Function `calculate_and_save_latest_rewards_config`
+
+
+<pre><code><b>fun</b> <a href="staking_config.md#0x1_staking_config_calculate_and_save_latest_rewards_config">calculate_and_save_latest_rewards_config</a>(): <a href="staking_config.md#0x1_staking_config_StakingRewardsConfig">staking_config::StakingRewardsConfig</a>
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify_duration_estimate = 120;
+<b>requires</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_spec_periodical_reward_rate_decrease_enabled">features::spec_periodical_reward_rate_decrease_enabled</a>();
+<b>include</b> <a href="staking_config.md#0x1_staking_config_StakingRewardsConfigRequirement">StakingRewardsConfigRequirement</a>;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="staking_config.md#0x1_staking_config_StakingRewardsConfig">StakingRewardsConfig</a>&gt;(@aptos_framework);
+</code></pre>
+
+
+
+<a id="@Specification_1_update_required_stake"></a>
+
+### Function `update_required_stake`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="staking_config.md#0x1_staking_config_update_required_stake">update_required_stake</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, minimum_stake: u64, maximum_stake: u64)
+</code></pre>
+
+
+Caller must be @aptos_framework.
+The maximum_stake must be greater than maximum_stake in the range of Specified stake and the maximum_stake greater than zero.
+The StakingConfig is under @aptos_framework.
+
+
+<pre><code><b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(aptos_framework);
+// This enforces <a id="high-level-req-1.3" href="#high-level-req">high-level requirement 1</a>:
+<b>aborts_if</b> addr != @aptos_framework;
+<b>aborts_if</b> minimum_stake &gt; maximum_stake || maximum_stake == 0;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="staking_config.md#0x1_staking_config_StakingConfig">StakingConfig</a>&gt;(@aptos_framework);
+<b>ensures</b> <b>global</b>&lt;<a href="staking_config.md#0x1_staking_config_StakingConfig">StakingConfig</a>&gt;(@aptos_framework).minimum_stake == minimum_stake &&
+    <b>global</b>&lt;<a href="staking_config.md#0x1_staking_config_StakingConfig">StakingConfig</a>&gt;(@aptos_framework).maximum_stake == maximum_stake;
+</code></pre>
+
+
+
+<a id="@Specification_1_update_recurring_lockup_duration_secs"></a>
+
+### Function `update_recurring_lockup_duration_secs`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="staking_config.md#0x1_staking_config_update_recurring_lockup_duration_secs">update_recurring_lockup_duration_secs</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, new_recurring_lockup_duration_secs: u64)
+</code></pre>
+
+
+Caller must be @aptos_framework.
+The new_recurring_lockup_duration_secs must greater than zero.
+The StakingConfig is under @aptos_framework.
+
+
+<pre><code><b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(aptos_framework);
+// This enforces <a id="high-level-req-1.4" href="#high-level-req">high-level requirement 1</a>:
+<b>aborts_if</b> addr != @aptos_framework;
+// This enforces <a id="high-level-req-3.2" href="#high-level-req">high-level requirement 3</a>:
+<b>aborts_if</b> new_recurring_lockup_duration_secs == 0;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="staking_config.md#0x1_staking_config_StakingConfig">StakingConfig</a>&gt;(@aptos_framework);
+<b>ensures</b> <b>global</b>&lt;<a href="staking_config.md#0x1_staking_config_StakingConfig">StakingConfig</a>&gt;(@aptos_framework).recurring_lockup_duration_secs == new_recurring_lockup_duration_secs;
+</code></pre>
+
+
+
+<a id="@Specification_1_update_rewards_rate"></a>
+
+### Function `update_rewards_rate`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="staking_config.md#0x1_staking_config_update_rewards_rate">update_rewards_rate</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, new_rewards_rate: u64, new_rewards_rate_denominator: u64)
+</code></pre>
+
+
+Caller must be @aptos_framework.
+The new_rewards_rate_denominator must greater than zero.
+The StakingConfig is under @aptos_framework.
+The <code>rewards_rate</code> which is the numerator is limited to be <code>&lt;= <a href="staking_config.md#0x1_staking_config_MAX_REWARDS_RATE">MAX_REWARDS_RATE</a></code> in order to avoid the arithmetic overflow in the rewards calculation.
+rewards_rate/rewards_rate_denominator <= 1.
+
+
+<pre><code><b>aborts_if</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_spec_periodical_reward_rate_decrease_enabled">features::spec_periodical_reward_rate_decrease_enabled</a>();
+<b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(aptos_framework);
+// This enforces <a id="high-level-req-1.5" href="#high-level-req">high-level requirement 1</a>:
+<b>aborts_if</b> addr != @aptos_framework;
+<b>aborts_if</b> new_rewards_rate_denominator == 0;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="staking_config.md#0x1_staking_config_StakingConfig">StakingConfig</a>&gt;(@aptos_framework);
+<b>aborts_if</b> new_rewards_rate &gt; <a href="staking_config.md#0x1_staking_config_MAX_REWARDS_RATE">MAX_REWARDS_RATE</a>;
+<b>aborts_if</b> new_rewards_rate &gt; new_rewards_rate_denominator;
+<b>let</b> <b>post</b> <a href="staking_config.md#0x1_staking_config">staking_config</a> = <b>global</b>&lt;<a href="staking_config.md#0x1_staking_config_StakingConfig">StakingConfig</a>&gt;(@aptos_framework);
+<b>ensures</b> <a href="staking_config.md#0x1_staking_config">staking_config</a>.rewards_rate == new_rewards_rate;
+<b>ensures</b> <a href="staking_config.md#0x1_staking_config">staking_config</a>.rewards_rate_denominator == new_rewards_rate_denominator;
+</code></pre>
+
+
+
+<a id="@Specification_1_update_rewards_config"></a>
+
+### Function `update_rewards_config`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="staking_config.md#0x1_staking_config_update_rewards_config">update_rewards_config</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, rewards_rate: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>, min_rewards_rate: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>, rewards_rate_period_in_secs: u64, rewards_rate_decrease_rate: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>)
+</code></pre>
+
+
+Caller must be @aptos_framework.
+StakingRewardsConfig is under the @aptos_framework.
+
+
+<pre><code><b>pragma</b> verify_duration_estimate = 120;
+<b>include</b> <a href="staking_config.md#0x1_staking_config_StakingRewardsConfigRequirement">StakingRewardsConfigRequirement</a>;
+<b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(aptos_framework);
+// This enforces <a id="high-level-req-1.6" href="#high-level-req">high-level requirement 1</a>:
+<b>aborts_if</b> addr != @aptos_framework;
+<b>aborts_if</b> <b>global</b>&lt;<a href="staking_config.md#0x1_staking_config_StakingRewardsConfig">StakingRewardsConfig</a>&gt;(@aptos_framework).rewards_rate_period_in_secs != rewards_rate_period_in_secs;
+<b>include</b> <a href="staking_config.md#0x1_staking_config_StakingRewardsConfigValidationAbortsIf">StakingRewardsConfigValidationAbortsIf</a>;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="staking_config.md#0x1_staking_config_StakingRewardsConfig">StakingRewardsConfig</a>&gt;(addr);
+<b>let</b> <b>post</b> staking_rewards_config = <b>global</b>&lt;<a href="staking_config.md#0x1_staking_config_StakingRewardsConfig">StakingRewardsConfig</a>&gt;(@aptos_framework);
+<b>ensures</b> staking_rewards_config.rewards_rate == rewards_rate;
+<b>ensures</b> staking_rewards_config.min_rewards_rate == min_rewards_rate;
+<b>ensures</b> staking_rewards_config.rewards_rate_period_in_secs == rewards_rate_period_in_secs;
+<b>ensures</b> staking_rewards_config.rewards_rate_decrease_rate == rewards_rate_decrease_rate;
+</code></pre>
+
+
+
+<a id="@Specification_1_update_voting_power_increase_limit"></a>
+
+### Function `update_voting_power_increase_limit`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="staking_config.md#0x1_staking_config_update_voting_power_increase_limit">update_voting_power_increase_limit</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, new_voting_power_increase_limit: u64)
+</code></pre>
+
+
+Caller must be @aptos_framework.
+Only this %0-%50 of current total voting power is allowed to join the validator set in each epoch.
+The StakingConfig is under @aptos_framework.
+
+
+<pre><code><b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(aptos_framework);
+// This enforces <a id="high-level-req-1.7" href="#high-level-req">high-level requirement 1</a>:
+<b>aborts_if</b> addr != @aptos_framework;
+// This enforces <a id="high-level-req-2.2" href="#high-level-req">high-level requirement 2</a>:
+<b>aborts_if</b> new_voting_power_increase_limit == 0 || new_voting_power_increase_limit &gt; 50;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="staking_config.md#0x1_staking_config_StakingConfig">StakingConfig</a>&gt;(@aptos_framework);
+<b>ensures</b> <b>global</b>&lt;<a href="staking_config.md#0x1_staking_config_StakingConfig">StakingConfig</a>&gt;(@aptos_framework).voting_power_increase_limit == new_voting_power_increase_limit;
+</code></pre>
+
+
+
+<a id="@Specification_1_validate_required_stake"></a>
+
+### Function `validate_required_stake`
+
+
+<pre><code><b>fun</b> <a href="staking_config.md#0x1_staking_config_validate_required_stake">validate_required_stake</a>(minimum_stake: u64, maximum_stake: u64)
+</code></pre>
+
+
+The maximum_stake must be greater than maximum_stake in the range of Specified stake and the maximum_stake greater than zero.
+
+
+<pre><code><b>aborts_if</b> minimum_stake &gt; maximum_stake || maximum_stake == 0;
+</code></pre>
+
+
+
+<a id="@Specification_1_validate_rewards_config"></a>
+
+### Function `validate_rewards_config`
+
+
+<pre><code><b>fun</b> <a href="staking_config.md#0x1_staking_config_validate_rewards_config">validate_rewards_config</a>(rewards_rate: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>, min_rewards_rate: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>, rewards_rate_period_in_secs: u64, rewards_rate_decrease_rate: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>)
+</code></pre>
+
+
+Abort at any condition in StakingRewardsConfigValidationAborts.
+
+
+<pre><code><b>include</b> <a href="staking_config.md#0x1_staking_config_StakingRewardsConfigValidationAbortsIf">StakingRewardsConfigValidationAbortsIf</a>;
+</code></pre>
+
+
+rewards_rate must be within [0, 1].
+min_rewards_rate must be not greater than rewards_rate.
+rewards_rate_period_in_secs must be greater than 0.
+rewards_rate_decrease_rate must be within [0,1].
+
+
+<a id="0x1_staking_config_StakingRewardsConfigValidationAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="staking_config.md#0x1_staking_config_StakingRewardsConfigValidationAbortsIf">StakingRewardsConfigValidationAbortsIf</a> {
+    rewards_rate: FixedPoint64;
+    min_rewards_rate: FixedPoint64;
+    rewards_rate_period_in_secs: u64;
+    rewards_rate_decrease_rate: FixedPoint64;
+    <b>aborts_if</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/fixed_point64.md#0x1_fixed_point64_spec_greater">fixed_point64::spec_greater</a>(
+        rewards_rate,
+        <a href="../../../aptos-stdlib/tests/compiler-v2-doc/fixed_point64.md#0x1_fixed_point64_spec_create_from_u128">fixed_point64::spec_create_from_u128</a>((1u128)));
+    <b>aborts_if</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/fixed_point64.md#0x1_fixed_point64_spec_greater">fixed_point64::spec_greater</a>(min_rewards_rate, rewards_rate);
+    <b>aborts_if</b> rewards_rate_period_in_secs == 0;
+    <b>aborts_if</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/fixed_point64.md#0x1_fixed_point64_spec_ceil">fixed_point64::spec_ceil</a>(rewards_rate_decrease_rate) &gt; 1;
+}
+</code></pre>
+
+
+
+
+<a id="0x1_staking_config_StakingRewardsConfigRequirement"></a>
+
+
+<pre><code><b>schema</b> <a href="staking_config.md#0x1_staking_config_StakingRewardsConfigRequirement">StakingRewardsConfigRequirement</a> {
+    <b>requires</b> <b>exists</b>&lt;<a href="timestamp.md#0x1_timestamp_CurrentTimeMicroseconds">timestamp::CurrentTimeMicroseconds</a>&gt;(@aptos_framework);
+    <b>include</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_spec_periodical_reward_rate_decrease_enabled">features::spec_periodical_reward_rate_decrease_enabled</a>() ==&gt; <a href="staking_config.md#0x1_staking_config_StakingRewardsConfigEnabledRequirement">StakingRewardsConfigEnabledRequirement</a>;
+}
+</code></pre>
+
+
+
+
+<a id="0x1_staking_config_StakingRewardsConfigEnabledRequirement"></a>
+
+
+<pre><code><b>schema</b> <a href="staking_config.md#0x1_staking_config_StakingRewardsConfigEnabledRequirement">StakingRewardsConfigEnabledRequirement</a> {
+    <b>requires</b> <b>exists</b>&lt;<a href="staking_config.md#0x1_staking_config_StakingRewardsConfig">StakingRewardsConfig</a>&gt;(@aptos_framework);
+    <b>let</b> staking_rewards_config = <b>global</b>&lt;<a href="staking_config.md#0x1_staking_config_StakingRewardsConfig">StakingRewardsConfig</a>&gt;(@aptos_framework);
+    <b>let</b> rewards_rate = staking_rewards_config.rewards_rate;
+    <b>let</b> min_rewards_rate = staking_rewards_config.min_rewards_rate;
+    <b>let</b> rewards_rate_period_in_secs = staking_rewards_config.rewards_rate_period_in_secs;
+    <b>let</b> last_rewards_rate_period_start_in_secs = staking_rewards_config.last_rewards_rate_period_start_in_secs;
+    <b>let</b> rewards_rate_decrease_rate = staking_rewards_config.rewards_rate_decrease_rate;
+    <b>requires</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/fixed_point64.md#0x1_fixed_point64_spec_less_or_equal">fixed_point64::spec_less_or_equal</a>(
+        rewards_rate,
+        <a href="../../../aptos-stdlib/tests/compiler-v2-doc/fixed_point64.md#0x1_fixed_point64_spec_create_from_u128">fixed_point64::spec_create_from_u128</a>((1u128)));
+    <b>requires</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/fixed_point64.md#0x1_fixed_point64_spec_less_or_equal">fixed_point64::spec_less_or_equal</a>(min_rewards_rate, rewards_rate);
+    <b>requires</b> rewards_rate_period_in_secs &gt; 0;
+    // This enforces <a id="high-level-req-4" href="#high-level-req">high-level requirement 4</a>:
+    <b>requires</b> last_rewards_rate_period_start_in_secs &lt;= <a href="timestamp.md#0x1_timestamp_spec_now_seconds">timestamp::spec_now_seconds</a>();
+    <b>requires</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/fixed_point64.md#0x1_fixed_point64_spec_ceil">fixed_point64::spec_ceil</a>(rewards_rate_decrease_rate) &lt;= 1;
+}
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/staking_contract.md b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/staking_contract.md
new file mode 100644
index 0000000000000..e57893b01b4d1
--- /dev/null
+++ b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/staking_contract.md
@@ -0,0 +1,3581 @@
+
+<a id="0x1_staking_contract"></a>
+
+# Module `0x1::staking_contract`
+
+Allow stakers and operators to enter a staking contract with reward sharing.
+The main accounting logic in a staking contract consists of 2 parts:
+1. Tracks how much commission needs to be paid out to the operator. This is tracked with an increasing principal
+amount that's updated every time the operator requests commission, the staker withdraws funds, or the staker
+switches operators.
+2. Distributions of funds to operators (commissions) and stakers (stake withdrawals) use the shares model provided
+by the pool_u64 to track shares that increase in price as the stake pool accumulates rewards.
+
+Example flow:
+1. A staker creates a staking contract with an operator by calling create_staking_contract() with 100 coins of
+initial stake and commission = 10%. This means the operator will receive 10% of any accumulated rewards. A new stake
+pool will be created and hosted in a separate account that's controlled by the staking contract.
+2. The operator sets up a validator node and, once ready, joins the validator set by calling stake::join_validator_set
+3. After some time, the stake pool gains rewards and now has 150 coins.
+4. Operator can now call request_commission. 10% of (150 - 100) = 5 coins will be unlocked from the stake pool. The
+staker's principal is now updated from 100 to 145 (150 coins - 5 coins of commission). The pending distribution pool
+has 5 coins total and the operator owns all 5 shares of it.
+5. Some more time has passed. The pool now has 50 more coins in rewards and a total balance of 195. The operator
+calls request_commission again. Since the previous 5 coins have now become withdrawable, it'll be deposited into the
+operator's account first. Their new commission will be 10% of (195 coins - 145 principal) = 5 coins. Principal is
+updated to be 190 (195 - 5). Pending distribution pool has 5 coins and operator owns all 5 shares.
+6. Staker calls unlock_stake to unlock 50 coins of stake, which gets added to the pending distribution pool. Based
+on shares math, staker will be owning 50 shares and operator still owns 5 shares of the 55-coin pending distribution
+pool.
+7. Some time passes and the 55 coins become fully withdrawable from the stake pool. Due to accumulated rewards, the
+55 coins become 70 coins. Calling distribute() distributes 6 coins to the operator and 64 coins to the validator.
+
+
+-  [Struct `StakingGroupContainer`](#0x1_staking_contract_StakingGroupContainer)
+-  [Struct `StakingContract`](#0x1_staking_contract_StakingContract)
+-  [Resource `Store`](#0x1_staking_contract_Store)
+-  [Resource `BeneficiaryForOperator`](#0x1_staking_contract_BeneficiaryForOperator)
+-  [Struct `UpdateCommissionEvent`](#0x1_staking_contract_UpdateCommissionEvent)
+-  [Struct `UpdateCommission`](#0x1_staking_contract_UpdateCommission)
+-  [Resource `StakingGroupUpdateCommissionEvent`](#0x1_staking_contract_StakingGroupUpdateCommissionEvent)
+-  [Struct `CreateStakingContract`](#0x1_staking_contract_CreateStakingContract)
+-  [Struct `UpdateVoter`](#0x1_staking_contract_UpdateVoter)
+-  [Struct `ResetLockup`](#0x1_staking_contract_ResetLockup)
+-  [Struct `AddStake`](#0x1_staking_contract_AddStake)
+-  [Struct `RequestCommission`](#0x1_staking_contract_RequestCommission)
+-  [Struct `UnlockStake`](#0x1_staking_contract_UnlockStake)
+-  [Struct `SwitchOperator`](#0x1_staking_contract_SwitchOperator)
+-  [Struct `AddDistribution`](#0x1_staking_contract_AddDistribution)
+-  [Struct `Distribute`](#0x1_staking_contract_Distribute)
+-  [Struct `SetBeneficiaryForOperator`](#0x1_staking_contract_SetBeneficiaryForOperator)
+-  [Struct `CreateStakingContractEvent`](#0x1_staking_contract_CreateStakingContractEvent)
+-  [Struct `UpdateVoterEvent`](#0x1_staking_contract_UpdateVoterEvent)
+-  [Struct `ResetLockupEvent`](#0x1_staking_contract_ResetLockupEvent)
+-  [Struct `AddStakeEvent`](#0x1_staking_contract_AddStakeEvent)
+-  [Struct `RequestCommissionEvent`](#0x1_staking_contract_RequestCommissionEvent)
+-  [Struct `UnlockStakeEvent`](#0x1_staking_contract_UnlockStakeEvent)
+-  [Struct `SwitchOperatorEvent`](#0x1_staking_contract_SwitchOperatorEvent)
+-  [Struct `AddDistributionEvent`](#0x1_staking_contract_AddDistributionEvent)
+-  [Struct `DistributeEvent`](#0x1_staking_contract_DistributeEvent)
+-  [Constants](#@Constants_0)
+-  [Function `stake_pool_address`](#0x1_staking_contract_stake_pool_address)
+-  [Function `last_recorded_principal`](#0x1_staking_contract_last_recorded_principal)
+-  [Function `commission_percentage`](#0x1_staking_contract_commission_percentage)
+-  [Function `staking_contract_amounts`](#0x1_staking_contract_staking_contract_amounts)
+-  [Function `pending_distribution_counts`](#0x1_staking_contract_pending_distribution_counts)
+-  [Function `staking_contract_exists`](#0x1_staking_contract_staking_contract_exists)
+-  [Function `beneficiary_for_operator`](#0x1_staking_contract_beneficiary_for_operator)
+-  [Function `get_expected_stake_pool_address`](#0x1_staking_contract_get_expected_stake_pool_address)
+-  [Function `create_staking_contract`](#0x1_staking_contract_create_staking_contract)
+-  [Function `create_staking_contract_with_coins`](#0x1_staking_contract_create_staking_contract_with_coins)
+-  [Function `add_stake`](#0x1_staking_contract_add_stake)
+-  [Function `update_voter`](#0x1_staking_contract_update_voter)
+-  [Function `reset_lockup`](#0x1_staking_contract_reset_lockup)
+-  [Function `update_commision`](#0x1_staking_contract_update_commision)
+-  [Function `request_commission`](#0x1_staking_contract_request_commission)
+-  [Function `request_commission_internal`](#0x1_staking_contract_request_commission_internal)
+-  [Function `unlock_stake`](#0x1_staking_contract_unlock_stake)
+-  [Function `unlock_rewards`](#0x1_staking_contract_unlock_rewards)
+-  [Function `switch_operator_with_same_commission`](#0x1_staking_contract_switch_operator_with_same_commission)
+-  [Function `switch_operator`](#0x1_staking_contract_switch_operator)
+-  [Function `set_beneficiary_for_operator`](#0x1_staking_contract_set_beneficiary_for_operator)
+-  [Function `distribute`](#0x1_staking_contract_distribute)
+-  [Function `distribute_internal`](#0x1_staking_contract_distribute_internal)
+-  [Function `assert_staking_contract_exists`](#0x1_staking_contract_assert_staking_contract_exists)
+-  [Function `add_distribution`](#0x1_staking_contract_add_distribution)
+-  [Function `get_staking_contract_amounts_internal`](#0x1_staking_contract_get_staking_contract_amounts_internal)
+-  [Function `create_stake_pool`](#0x1_staking_contract_create_stake_pool)
+-  [Function `update_distribution_pool`](#0x1_staking_contract_update_distribution_pool)
+-  [Function `create_resource_account_seed`](#0x1_staking_contract_create_resource_account_seed)
+-  [Function `new_staking_contracts_holder`](#0x1_staking_contract_new_staking_contracts_holder)
+-  [Specification](#@Specification_1)
+    -  [High-level Requirements](#high-level-req)
+    -  [Module-level Specification](#module-level-spec)
+    -  [Function `stake_pool_address`](#@Specification_1_stake_pool_address)
+    -  [Function `last_recorded_principal`](#@Specification_1_last_recorded_principal)
+    -  [Function `commission_percentage`](#@Specification_1_commission_percentage)
+    -  [Function `staking_contract_amounts`](#@Specification_1_staking_contract_amounts)
+    -  [Function `pending_distribution_counts`](#@Specification_1_pending_distribution_counts)
+    -  [Function `staking_contract_exists`](#@Specification_1_staking_contract_exists)
+    -  [Function `beneficiary_for_operator`](#@Specification_1_beneficiary_for_operator)
+    -  [Function `create_staking_contract`](#@Specification_1_create_staking_contract)
+    -  [Function `create_staking_contract_with_coins`](#@Specification_1_create_staking_contract_with_coins)
+    -  [Function `add_stake`](#@Specification_1_add_stake)
+    -  [Function `update_voter`](#@Specification_1_update_voter)
+    -  [Function `reset_lockup`](#@Specification_1_reset_lockup)
+    -  [Function `update_commision`](#@Specification_1_update_commision)
+    -  [Function `request_commission`](#@Specification_1_request_commission)
+    -  [Function `request_commission_internal`](#@Specification_1_request_commission_internal)
+    -  [Function `unlock_stake`](#@Specification_1_unlock_stake)
+    -  [Function `unlock_rewards`](#@Specification_1_unlock_rewards)
+    -  [Function `switch_operator_with_same_commission`](#@Specification_1_switch_operator_with_same_commission)
+    -  [Function `switch_operator`](#@Specification_1_switch_operator)
+    -  [Function `set_beneficiary_for_operator`](#@Specification_1_set_beneficiary_for_operator)
+    -  [Function `distribute`](#@Specification_1_distribute)
+    -  [Function `distribute_internal`](#@Specification_1_distribute_internal)
+    -  [Function `assert_staking_contract_exists`](#@Specification_1_assert_staking_contract_exists)
+    -  [Function `add_distribution`](#@Specification_1_add_distribution)
+    -  [Function `get_staking_contract_amounts_internal`](#@Specification_1_get_staking_contract_amounts_internal)
+    -  [Function `create_stake_pool`](#@Specification_1_create_stake_pool)
+    -  [Function `update_distribution_pool`](#@Specification_1_update_distribution_pool)
+    -  [Function `new_staking_contracts_holder`](#@Specification_1_new_staking_contracts_holder)
+
+
+<pre><code><b>use</b> <a href="account.md#0x1_account">0x1::account</a>;
+<b>use</b> <a href="aptos_account.md#0x1_aptos_account">0x1::aptos_account</a>;
+<b>use</b> <a href="aptos_coin.md#0x1_aptos_coin">0x1::aptos_coin</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs">0x1::bcs</a>;
+<b>use</b> <a href="coin.md#0x1_coin">0x1::coin</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="event.md#0x1_event">0x1::event</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features">0x1::features</a>;
+<b>use</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64">0x1::pool_u64</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">0x1::signer</a>;
+<b>use</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map">0x1::simple_map</a>;
+<b>use</b> <a href="stake.md#0x1_stake">0x1::stake</a>;
+<b>use</b> <a href="staking_config.md#0x1_staking_config">0x1::staking_config</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">0x1::vector</a>;
+</code></pre>
+
+
+
+<a id="0x1_staking_contract_StakingGroupContainer"></a>
+
+## Struct `StakingGroupContainer`
+
+
+
+<pre><code>#[resource_group(#[scope = module_])]
+<b>struct</b> <a href="staking_contract.md#0x1_staking_contract_StakingGroupContainer">StakingGroupContainer</a>
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>dummy_field: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_staking_contract_StakingContract"></a>
+
+## Struct `StakingContract`
+
+
+
+<pre><code><b>struct</b> <a href="staking_contract.md#0x1_staking_contract_StakingContract">StakingContract</a> <b>has</b> store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>principal: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>owner_cap: <a href="stake.md#0x1_stake_OwnerCapability">stake::OwnerCapability</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>commission_percentage: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>distribution_pool: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_Pool">pool_u64::Pool</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>signer_cap: <a href="account.md#0x1_account_SignerCapability">account::SignerCapability</a></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_staking_contract_Store"></a>
+
+## Resource `Store`
+
+
+
+<pre><code><b>struct</b> <a href="staking_contract.md#0x1_staking_contract_Store">Store</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>staking_contracts: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;<b>address</b>, <a href="staking_contract.md#0x1_staking_contract_StakingContract">staking_contract::StakingContract</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>create_staking_contract_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="staking_contract.md#0x1_staking_contract_CreateStakingContractEvent">staking_contract::CreateStakingContractEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>update_voter_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="staking_contract.md#0x1_staking_contract_UpdateVoterEvent">staking_contract::UpdateVoterEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>reset_lockup_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="staking_contract.md#0x1_staking_contract_ResetLockupEvent">staking_contract::ResetLockupEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>add_stake_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="staking_contract.md#0x1_staking_contract_AddStakeEvent">staking_contract::AddStakeEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>request_commission_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="staking_contract.md#0x1_staking_contract_RequestCommissionEvent">staking_contract::RequestCommissionEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>unlock_stake_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="staking_contract.md#0x1_staking_contract_UnlockStakeEvent">staking_contract::UnlockStakeEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>switch_operator_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="staking_contract.md#0x1_staking_contract_SwitchOperatorEvent">staking_contract::SwitchOperatorEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>add_distribution_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="staking_contract.md#0x1_staking_contract_AddDistributionEvent">staking_contract::AddDistributionEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>distribute_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="staking_contract.md#0x1_staking_contract_DistributeEvent">staking_contract::DistributeEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_staking_contract_BeneficiaryForOperator"></a>
+
+## Resource `BeneficiaryForOperator`
+
+
+
+<pre><code><b>struct</b> <a href="staking_contract.md#0x1_staking_contract_BeneficiaryForOperator">BeneficiaryForOperator</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>beneficiary_for_operator: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_staking_contract_UpdateCommissionEvent"></a>
+
+## Struct `UpdateCommissionEvent`
+
+
+
+<pre><code><b>struct</b> <a href="staking_contract.md#0x1_staking_contract_UpdateCommissionEvent">UpdateCommissionEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>staker: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>operator: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>old_commission_percentage: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>new_commission_percentage: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_staking_contract_UpdateCommission"></a>
+
+## Struct `UpdateCommission`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="staking_contract.md#0x1_staking_contract_UpdateCommission">UpdateCommission</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>staker: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>operator: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>old_commission_percentage: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>new_commission_percentage: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_staking_contract_StakingGroupUpdateCommissionEvent"></a>
+
+## Resource `StakingGroupUpdateCommissionEvent`
+
+
+
+<pre><code>#[resource_group_member(#[group = <a href="staking_contract.md#0x1_staking_contract_StakingGroupContainer">0x1::staking_contract::StakingGroupContainer</a>])]
+<b>struct</b> <a href="staking_contract.md#0x1_staking_contract_StakingGroupUpdateCommissionEvent">StakingGroupUpdateCommissionEvent</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>update_commission_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="staking_contract.md#0x1_staking_contract_UpdateCommissionEvent">staking_contract::UpdateCommissionEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_staking_contract_CreateStakingContract"></a>
+
+## Struct `CreateStakingContract`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="staking_contract.md#0x1_staking_contract_CreateStakingContract">CreateStakingContract</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>operator: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>voter: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>principal: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>commission_percentage: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_staking_contract_UpdateVoter"></a>
+
+## Struct `UpdateVoter`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="staking_contract.md#0x1_staking_contract_UpdateVoter">UpdateVoter</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>operator: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>old_voter: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>new_voter: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_staking_contract_ResetLockup"></a>
+
+## Struct `ResetLockup`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="staking_contract.md#0x1_staking_contract_ResetLockup">ResetLockup</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>operator: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_staking_contract_AddStake"></a>
+
+## Struct `AddStake`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="staking_contract.md#0x1_staking_contract_AddStake">AddStake</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>operator: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>amount: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_staking_contract_RequestCommission"></a>
+
+## Struct `RequestCommission`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="staking_contract.md#0x1_staking_contract_RequestCommission">RequestCommission</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>operator: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>accumulated_rewards: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>commission_amount: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_staking_contract_UnlockStake"></a>
+
+## Struct `UnlockStake`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="staking_contract.md#0x1_staking_contract_UnlockStake">UnlockStake</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>operator: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>amount: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>commission_paid: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_staking_contract_SwitchOperator"></a>
+
+## Struct `SwitchOperator`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="staking_contract.md#0x1_staking_contract_SwitchOperator">SwitchOperator</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>old_operator: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>new_operator: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_staking_contract_AddDistribution"></a>
+
+## Struct `AddDistribution`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="staking_contract.md#0x1_staking_contract_AddDistribution">AddDistribution</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>operator: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>amount: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_staking_contract_Distribute"></a>
+
+## Struct `Distribute`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="staking_contract.md#0x1_staking_contract_Distribute">Distribute</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>operator: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>recipient: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>amount: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_staking_contract_SetBeneficiaryForOperator"></a>
+
+## Struct `SetBeneficiaryForOperator`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="staking_contract.md#0x1_staking_contract_SetBeneficiaryForOperator">SetBeneficiaryForOperator</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>operator: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>old_beneficiary: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>new_beneficiary: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_staking_contract_CreateStakingContractEvent"></a>
+
+## Struct `CreateStakingContractEvent`
+
+
+
+<pre><code><b>struct</b> <a href="staking_contract.md#0x1_staking_contract_CreateStakingContractEvent">CreateStakingContractEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>operator: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>voter: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>principal: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>commission_percentage: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_staking_contract_UpdateVoterEvent"></a>
+
+## Struct `UpdateVoterEvent`
+
+
+
+<pre><code><b>struct</b> <a href="staking_contract.md#0x1_staking_contract_UpdateVoterEvent">UpdateVoterEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>operator: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>old_voter: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>new_voter: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_staking_contract_ResetLockupEvent"></a>
+
+## Struct `ResetLockupEvent`
+
+
+
+<pre><code><b>struct</b> <a href="staking_contract.md#0x1_staking_contract_ResetLockupEvent">ResetLockupEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>operator: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_staking_contract_AddStakeEvent"></a>
+
+## Struct `AddStakeEvent`
+
+
+
+<pre><code><b>struct</b> <a href="staking_contract.md#0x1_staking_contract_AddStakeEvent">AddStakeEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>operator: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>amount: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_staking_contract_RequestCommissionEvent"></a>
+
+## Struct `RequestCommissionEvent`
+
+
+
+<pre><code><b>struct</b> <a href="staking_contract.md#0x1_staking_contract_RequestCommissionEvent">RequestCommissionEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>operator: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>accumulated_rewards: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>commission_amount: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_staking_contract_UnlockStakeEvent"></a>
+
+## Struct `UnlockStakeEvent`
+
+
+
+<pre><code><b>struct</b> <a href="staking_contract.md#0x1_staking_contract_UnlockStakeEvent">UnlockStakeEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>operator: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>amount: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>commission_paid: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_staking_contract_SwitchOperatorEvent"></a>
+
+## Struct `SwitchOperatorEvent`
+
+
+
+<pre><code><b>struct</b> <a href="staking_contract.md#0x1_staking_contract_SwitchOperatorEvent">SwitchOperatorEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>old_operator: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>new_operator: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_staking_contract_AddDistributionEvent"></a>
+
+## Struct `AddDistributionEvent`
+
+
+
+<pre><code><b>struct</b> <a href="staking_contract.md#0x1_staking_contract_AddDistributionEvent">AddDistributionEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>operator: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>amount: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_staking_contract_DistributeEvent"></a>
+
+## Struct `DistributeEvent`
+
+
+
+<pre><code><b>struct</b> <a href="staking_contract.md#0x1_staking_contract_DistributeEvent">DistributeEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>operator: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>recipient: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>amount: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_staking_contract_EINVALID_COMMISSION_PERCENTAGE"></a>
+
+Commission percentage has to be between 0 and 100.
+
+
+<pre><code><b>const</b> <a href="staking_contract.md#0x1_staking_contract_EINVALID_COMMISSION_PERCENTAGE">EINVALID_COMMISSION_PERCENTAGE</a>: u64 = 2;
+</code></pre>
+
+
+
+<a id="0x1_staking_contract_EOPERATOR_BENEFICIARY_CHANGE_NOT_SUPPORTED"></a>
+
+Chaning beneficiaries for operators is not supported.
+
+
+<pre><code><b>const</b> <a href="staking_contract.md#0x1_staking_contract_EOPERATOR_BENEFICIARY_CHANGE_NOT_SUPPORTED">EOPERATOR_BENEFICIARY_CHANGE_NOT_SUPPORTED</a>: u64 = 9;
+</code></pre>
+
+
+
+<a id="0x1_staking_contract_ECANT_MERGE_STAKING_CONTRACTS"></a>
+
+Staking contracts can't be merged.
+
+
+<pre><code><b>const</b> <a href="staking_contract.md#0x1_staking_contract_ECANT_MERGE_STAKING_CONTRACTS">ECANT_MERGE_STAKING_CONTRACTS</a>: u64 = 5;
+</code></pre>
+
+
+
+<a id="0x1_staking_contract_EINSUFFICIENT_ACTIVE_STAKE_TO_WITHDRAW"></a>
+
+Not enough active stake to withdraw. Some stake might still pending and will be active in the next epoch.
+
+
+<pre><code><b>const</b> <a href="staking_contract.md#0x1_staking_contract_EINSUFFICIENT_ACTIVE_STAKE_TO_WITHDRAW">EINSUFFICIENT_ACTIVE_STAKE_TO_WITHDRAW</a>: u64 = 7;
+</code></pre>
+
+
+
+<a id="0x1_staking_contract_EINSUFFICIENT_STAKE_AMOUNT"></a>
+
+Store amount must be at least the min stake required for a stake pool to join the validator set.
+
+
+<pre><code><b>const</b> <a href="staking_contract.md#0x1_staking_contract_EINSUFFICIENT_STAKE_AMOUNT">EINSUFFICIENT_STAKE_AMOUNT</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_staking_contract_ENOT_STAKER_OR_OPERATOR_OR_BENEFICIARY"></a>
+
+Caller must be either the staker, operator, or beneficiary.
+
+
+<pre><code><b>const</b> <a href="staking_contract.md#0x1_staking_contract_ENOT_STAKER_OR_OPERATOR_OR_BENEFICIARY">ENOT_STAKER_OR_OPERATOR_OR_BENEFICIARY</a>: u64 = 8;
+</code></pre>
+
+
+
+<a id="0x1_staking_contract_ENO_STAKING_CONTRACT_FOUND_FOR_OPERATOR"></a>
+
+No staking contract between the staker and operator found.
+
+
+<pre><code><b>const</b> <a href="staking_contract.md#0x1_staking_contract_ENO_STAKING_CONTRACT_FOUND_FOR_OPERATOR">ENO_STAKING_CONTRACT_FOUND_FOR_OPERATOR</a>: u64 = 4;
+</code></pre>
+
+
+
+<a id="0x1_staking_contract_ENO_STAKING_CONTRACT_FOUND_FOR_STAKER"></a>
+
+Staker has no staking contracts.
+
+
+<pre><code><b>const</b> <a href="staking_contract.md#0x1_staking_contract_ENO_STAKING_CONTRACT_FOUND_FOR_STAKER">ENO_STAKING_CONTRACT_FOUND_FOR_STAKER</a>: u64 = 3;
+</code></pre>
+
+
+
+<a id="0x1_staking_contract_ESTAKING_CONTRACT_ALREADY_EXISTS"></a>
+
+The staking contract already exists and cannot be re-created.
+
+
+<pre><code><b>const</b> <a href="staking_contract.md#0x1_staking_contract_ESTAKING_CONTRACT_ALREADY_EXISTS">ESTAKING_CONTRACT_ALREADY_EXISTS</a>: u64 = 6;
+</code></pre>
+
+
+
+<a id="0x1_staking_contract_MAXIMUM_PENDING_DISTRIBUTIONS"></a>
+
+Maximum number of distributions a stake pool can support.
+
+
+<pre><code><b>const</b> <a href="staking_contract.md#0x1_staking_contract_MAXIMUM_PENDING_DISTRIBUTIONS">MAXIMUM_PENDING_DISTRIBUTIONS</a>: u64 = 20;
+</code></pre>
+
+
+
+<a id="0x1_staking_contract_SALT"></a>
+
+
+
+<pre><code><b>const</b> <a href="staking_contract.md#0x1_staking_contract_SALT">SALT</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; = [97, 112, 116, 111, 115, 95, 102, 114, 97, 109, 101, 119, 111, 114, 107, 58, 58, 115, 116, 97, 107, 105, 110, 103, 95, 99, 111, 110, 116, 114, 97, 99, 116];
+</code></pre>
+
+
+
+<a id="0x1_staking_contract_stake_pool_address"></a>
+
+## Function `stake_pool_address`
+
+Return the address of the underlying stake pool for the staking contract between the provided staker and
+operator.
+
+This errors out the staking contract with the provided staker and operator doesn't exist.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="staking_contract.md#0x1_staking_contract_stake_pool_address">stake_pool_address</a>(staker: <b>address</b>, operator: <b>address</b>): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="staking_contract.md#0x1_staking_contract_stake_pool_address">stake_pool_address</a>(staker: <b>address</b>, operator: <b>address</b>): <b>address</b> <b>acquires</b> <a href="staking_contract.md#0x1_staking_contract_Store">Store</a> {
+    <a href="staking_contract.md#0x1_staking_contract_assert_staking_contract_exists">assert_staking_contract_exists</a>(staker, operator);
+    <b>let</b> staking_contracts = &<b>borrow_global</b>&lt;<a href="staking_contract.md#0x1_staking_contract_Store">Store</a>&gt;(staker).staking_contracts;
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_borrow">simple_map::borrow</a>(staking_contracts, &operator).pool_address
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_staking_contract_last_recorded_principal"></a>
+
+## Function `last_recorded_principal`
+
+Return the last recorded principal (the amount that 100% belongs to the staker with commission already paid for)
+for staking contract between the provided staker and operator.
+
+This errors out the staking contract with the provided staker and operator doesn't exist.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="staking_contract.md#0x1_staking_contract_last_recorded_principal">last_recorded_principal</a>(staker: <b>address</b>, operator: <b>address</b>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="staking_contract.md#0x1_staking_contract_last_recorded_principal">last_recorded_principal</a>(staker: <b>address</b>, operator: <b>address</b>): u64 <b>acquires</b> <a href="staking_contract.md#0x1_staking_contract_Store">Store</a> {
+    <a href="staking_contract.md#0x1_staking_contract_assert_staking_contract_exists">assert_staking_contract_exists</a>(staker, operator);
+    <b>let</b> staking_contracts = &<b>borrow_global</b>&lt;<a href="staking_contract.md#0x1_staking_contract_Store">Store</a>&gt;(staker).staking_contracts;
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_borrow">simple_map::borrow</a>(staking_contracts, &operator).principal
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_staking_contract_commission_percentage"></a>
+
+## Function `commission_percentage`
+
+Return percentage of accumulated rewards that will be paid to the operator as commission for staking contract
+between the provided staker and operator.
+
+This errors out the staking contract with the provided staker and operator doesn't exist.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="staking_contract.md#0x1_staking_contract_commission_percentage">commission_percentage</a>(staker: <b>address</b>, operator: <b>address</b>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="staking_contract.md#0x1_staking_contract_commission_percentage">commission_percentage</a>(staker: <b>address</b>, operator: <b>address</b>): u64 <b>acquires</b> <a href="staking_contract.md#0x1_staking_contract_Store">Store</a> {
+    <a href="staking_contract.md#0x1_staking_contract_assert_staking_contract_exists">assert_staking_contract_exists</a>(staker, operator);
+    <b>let</b> staking_contracts = &<b>borrow_global</b>&lt;<a href="staking_contract.md#0x1_staking_contract_Store">Store</a>&gt;(staker).staking_contracts;
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_borrow">simple_map::borrow</a>(staking_contracts, &operator).commission_percentage
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_staking_contract_staking_contract_amounts"></a>
+
+## Function `staking_contract_amounts`
+
+Return a tuple of three numbers:
+1. The total active stake in the underlying stake pool
+2. The total accumulated rewards that haven't had commission paid out
+3. The commission amount owned from those accumulated rewards.
+
+This errors out the staking contract with the provided staker and operator doesn't exist.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="staking_contract.md#0x1_staking_contract_staking_contract_amounts">staking_contract_amounts</a>(staker: <b>address</b>, operator: <b>address</b>): (u64, u64, u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="staking_contract.md#0x1_staking_contract_staking_contract_amounts">staking_contract_amounts</a>(staker: <b>address</b>, operator: <b>address</b>): (u64, u64, u64) <b>acquires</b> <a href="staking_contract.md#0x1_staking_contract_Store">Store</a> {
+    <a href="staking_contract.md#0x1_staking_contract_assert_staking_contract_exists">assert_staking_contract_exists</a>(staker, operator);
+    <b>let</b> staking_contracts = &<b>borrow_global</b>&lt;<a href="staking_contract.md#0x1_staking_contract_Store">Store</a>&gt;(staker).staking_contracts;
+    <b>let</b> <a href="staking_contract.md#0x1_staking_contract">staking_contract</a> = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_borrow">simple_map::borrow</a>(staking_contracts, &operator);
+    <a href="staking_contract.md#0x1_staking_contract_get_staking_contract_amounts_internal">get_staking_contract_amounts_internal</a>(<a href="staking_contract.md#0x1_staking_contract">staking_contract</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_staking_contract_pending_distribution_counts"></a>
+
+## Function `pending_distribution_counts`
+
+Return the number of pending distributions (e.g. commission, withdrawals from stakers).
+
+This errors out the staking contract with the provided staker and operator doesn't exist.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="staking_contract.md#0x1_staking_contract_pending_distribution_counts">pending_distribution_counts</a>(staker: <b>address</b>, operator: <b>address</b>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="staking_contract.md#0x1_staking_contract_pending_distribution_counts">pending_distribution_counts</a>(staker: <b>address</b>, operator: <b>address</b>): u64 <b>acquires</b> <a href="staking_contract.md#0x1_staking_contract_Store">Store</a> {
+    <a href="staking_contract.md#0x1_staking_contract_assert_staking_contract_exists">assert_staking_contract_exists</a>(staker, operator);
+    <b>let</b> staking_contracts = &<b>borrow_global</b>&lt;<a href="staking_contract.md#0x1_staking_contract_Store">Store</a>&gt;(staker).staking_contracts;
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_shareholders_count">pool_u64::shareholders_count</a>(&<a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_borrow">simple_map::borrow</a>(staking_contracts, &operator).distribution_pool)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_staking_contract_staking_contract_exists"></a>
+
+## Function `staking_contract_exists`
+
+Return true if the staking contract between the provided staker and operator exists.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="staking_contract.md#0x1_staking_contract_staking_contract_exists">staking_contract_exists</a>(staker: <b>address</b>, operator: <b>address</b>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="staking_contract.md#0x1_staking_contract_staking_contract_exists">staking_contract_exists</a>(staker: <b>address</b>, operator: <b>address</b>): bool <b>acquires</b> <a href="staking_contract.md#0x1_staking_contract_Store">Store</a> {
+    <b>if</b> (!<b>exists</b>&lt;<a href="staking_contract.md#0x1_staking_contract_Store">Store</a>&gt;(staker)) {
+        <b>return</b> <b>false</b>
+    };
+
+    <b>let</b> store = <b>borrow_global</b>&lt;<a href="staking_contract.md#0x1_staking_contract_Store">Store</a>&gt;(staker);
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_contains_key">simple_map::contains_key</a>(&store.staking_contracts, &operator)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_staking_contract_beneficiary_for_operator"></a>
+
+## Function `beneficiary_for_operator`
+
+Return the beneficiary address of the operator.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="staking_contract.md#0x1_staking_contract_beneficiary_for_operator">beneficiary_for_operator</a>(operator: <b>address</b>): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="staking_contract.md#0x1_staking_contract_beneficiary_for_operator">beneficiary_for_operator</a>(operator: <b>address</b>): <b>address</b> <b>acquires</b> <a href="staking_contract.md#0x1_staking_contract_BeneficiaryForOperator">BeneficiaryForOperator</a> {
+    <b>if</b> (<b>exists</b>&lt;<a href="staking_contract.md#0x1_staking_contract_BeneficiaryForOperator">BeneficiaryForOperator</a>&gt;(operator)) {
+        <b>return</b> <b>borrow_global</b>&lt;<a href="staking_contract.md#0x1_staking_contract_BeneficiaryForOperator">BeneficiaryForOperator</a>&gt;(operator).beneficiary_for_operator
+    } <b>else</b> {
+        operator
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_staking_contract_get_expected_stake_pool_address"></a>
+
+## Function `get_expected_stake_pool_address`
+
+Return the address of the stake pool to be created with the provided staker, operator and seed.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="staking_contract.md#0x1_staking_contract_get_expected_stake_pool_address">get_expected_stake_pool_address</a>(staker: <b>address</b>, operator: <b>address</b>, contract_creation_seed: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="staking_contract.md#0x1_staking_contract_get_expected_stake_pool_address">get_expected_stake_pool_address</a>(
+    staker: <b>address</b>,
+    operator: <b>address</b>,
+    contract_creation_seed: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+): <b>address</b> {
+    <b>let</b> seed = <a href="staking_contract.md#0x1_staking_contract_create_resource_account_seed">create_resource_account_seed</a>(staker, operator, contract_creation_seed);
+    <a href="account.md#0x1_account_create_resource_address">account::create_resource_address</a>(&staker, seed)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_staking_contract_create_staking_contract"></a>
+
+## Function `create_staking_contract`
+
+Staker can call this function to create a simple staking contract with a specified operator.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="staking_contract.md#0x1_staking_contract_create_staking_contract">create_staking_contract</a>(staker: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, operator: <b>address</b>, voter: <b>address</b>, amount: u64, commission_percentage: u64, contract_creation_seed: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="staking_contract.md#0x1_staking_contract_create_staking_contract">create_staking_contract</a>(
+    staker: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    operator: <b>address</b>,
+    voter: <b>address</b>,
+    amount: u64,
+    commission_percentage: u64,
+    // Optional seed used when creating the staking contract <a href="account.md#0x1_account">account</a>.
+    contract_creation_seed: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+) <b>acquires</b> <a href="staking_contract.md#0x1_staking_contract_Store">Store</a> {
+    <b>let</b> staked_coins = <a href="coin.md#0x1_coin_withdraw">coin::withdraw</a>&lt;AptosCoin&gt;(staker, amount);
+    <a href="staking_contract.md#0x1_staking_contract_create_staking_contract_with_coins">create_staking_contract_with_coins</a>(
+        staker, operator, voter, staked_coins, commission_percentage, contract_creation_seed);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_staking_contract_create_staking_contract_with_coins"></a>
+
+## Function `create_staking_contract_with_coins`
+
+Staker can call this function to create a simple staking contract with a specified operator.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="staking_contract.md#0x1_staking_contract_create_staking_contract_with_coins">create_staking_contract_with_coins</a>(staker: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, operator: <b>address</b>, voter: <b>address</b>, coins: <a href="coin.md#0x1_coin_Coin">coin::Coin</a>&lt;<a href="aptos_coin.md#0x1_aptos_coin_AptosCoin">aptos_coin::AptosCoin</a>&gt;, commission_percentage: u64, contract_creation_seed: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="staking_contract.md#0x1_staking_contract_create_staking_contract_with_coins">create_staking_contract_with_coins</a>(
+    staker: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    operator: <b>address</b>,
+    voter: <b>address</b>,
+    coins: Coin&lt;AptosCoin&gt;,
+    commission_percentage: u64,
+    // Optional seed used when creating the staking contract <a href="account.md#0x1_account">account</a>.
+    contract_creation_seed: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+): <b>address</b> <b>acquires</b> <a href="staking_contract.md#0x1_staking_contract_Store">Store</a> {
+    <b>assert</b>!(
+        commission_percentage &gt;= 0 && <a href="staking_contract.md#0x1_staking_contract_commission_percentage">commission_percentage</a> &lt;= 100,
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="staking_contract.md#0x1_staking_contract_EINVALID_COMMISSION_PERCENTAGE">EINVALID_COMMISSION_PERCENTAGE</a>),
+    );
+    // The amount should be at least the min_stake_required, so the <a href="stake.md#0x1_stake">stake</a> pool will be eligible <b>to</b> join the
+    // validator set.
+    <b>let</b> (min_stake_required, _) = <a href="staking_config.md#0x1_staking_config_get_required_stake">staking_config::get_required_stake</a>(&<a href="staking_config.md#0x1_staking_config_get">staking_config::get</a>());
+    <b>let</b> principal = <a href="coin.md#0x1_coin_value">coin::value</a>(&coins);
+    <b>assert</b>!(principal &gt;= min_stake_required, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="staking_contract.md#0x1_staking_contract_EINSUFFICIENT_STAKE_AMOUNT">EINSUFFICIENT_STAKE_AMOUNT</a>));
+
+    // Initialize <a href="staking_contract.md#0x1_staking_contract_Store">Store</a> resource <b>if</b> this is the first time the staker <b>has</b> delegated <b>to</b> anyone.
+    <b>let</b> staker_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(staker);
+    <b>if</b> (!<b>exists</b>&lt;<a href="staking_contract.md#0x1_staking_contract_Store">Store</a>&gt;(staker_address)) {
+        <b>move_to</b>(staker, <a href="staking_contract.md#0x1_staking_contract_new_staking_contracts_holder">new_staking_contracts_holder</a>(staker));
+    };
+
+    // Cannot create the staking contract <b>if</b> it already <b>exists</b>.
+    <b>let</b> store = <b>borrow_global_mut</b>&lt;<a href="staking_contract.md#0x1_staking_contract_Store">Store</a>&gt;(staker_address);
+    <b>let</b> staking_contracts = &<b>mut</b> store.staking_contracts;
+    <b>assert</b>!(
+        !<a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_contains_key">simple_map::contains_key</a>(staking_contracts, &operator),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_already_exists">error::already_exists</a>(<a href="staking_contract.md#0x1_staking_contract_ESTAKING_CONTRACT_ALREADY_EXISTS">ESTAKING_CONTRACT_ALREADY_EXISTS</a>)
+    );
+
+    // Initialize the <a href="stake.md#0x1_stake">stake</a> pool in a new resource <a href="account.md#0x1_account">account</a>. This allows the same staker <b>to</b> contract <b>with</b> multiple
+    // different operators.
+    <b>let</b> (stake_pool_signer, stake_pool_signer_cap, owner_cap) =
+        <a href="staking_contract.md#0x1_staking_contract_create_stake_pool">create_stake_pool</a>(staker, operator, voter, contract_creation_seed);
+
+    // Add the <a href="stake.md#0x1_stake">stake</a> <b>to</b> the <a href="stake.md#0x1_stake">stake</a> pool.
+    <a href="stake.md#0x1_stake_add_stake_with_cap">stake::add_stake_with_cap</a>(&owner_cap, coins);
+
+    // Create the contract record.
+    <b>let</b> pool_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(&stake_pool_signer);
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_add">simple_map::add</a>(staking_contracts, operator, <a href="staking_contract.md#0x1_staking_contract_StakingContract">StakingContract</a> {
+        principal,
+        pool_address,
+        owner_cap,
+        commission_percentage,
+        // Make sure we don't have too many pending recipients in the distribution pool.
+        // Otherwise, a griefing attack is possible <b>where</b> the staker can keep switching operators and create too
+        // many pending distributions. This can lead <b>to</b> out-of-gas failure whenever <a href="staking_contract.md#0x1_staking_contract_distribute">distribute</a>() is called.
+        distribution_pool: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_create">pool_u64::create</a>(<a href="staking_contract.md#0x1_staking_contract_MAXIMUM_PENDING_DISTRIBUTIONS">MAXIMUM_PENDING_DISTRIBUTIONS</a>),
+        signer_cap: stake_pool_signer_cap,
+    });
+
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        emit(<a href="staking_contract.md#0x1_staking_contract_CreateStakingContract">CreateStakingContract</a> { operator, voter, pool_address, principal, commission_percentage });
+    };
+    emit_event(
+        &<b>mut</b> store.create_staking_contract_events,
+        <a href="staking_contract.md#0x1_staking_contract_CreateStakingContractEvent">CreateStakingContractEvent</a> { operator, voter, pool_address, principal, commission_percentage },
+    );
+    pool_address
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_staking_contract_add_stake"></a>
+
+## Function `add_stake`
+
+Add more stake to an existing staking contract.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="staking_contract.md#0x1_staking_contract_add_stake">add_stake</a>(staker: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, operator: <b>address</b>, amount: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="staking_contract.md#0x1_staking_contract_add_stake">add_stake</a>(staker: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, operator: <b>address</b>, amount: u64) <b>acquires</b> <a href="staking_contract.md#0x1_staking_contract_Store">Store</a> {
+    <b>let</b> staker_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(staker);
+    <a href="staking_contract.md#0x1_staking_contract_assert_staking_contract_exists">assert_staking_contract_exists</a>(staker_address, operator);
+
+    <b>let</b> store = <b>borrow_global_mut</b>&lt;<a href="staking_contract.md#0x1_staking_contract_Store">Store</a>&gt;(staker_address);
+    <b>let</b> <a href="staking_contract.md#0x1_staking_contract">staking_contract</a> = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_borrow_mut">simple_map::borrow_mut</a>(&<b>mut</b> store.staking_contracts, &operator);
+
+    // Add the <a href="stake.md#0x1_stake">stake</a> <b>to</b> the <a href="stake.md#0x1_stake">stake</a> pool.
+    <b>let</b> staked_coins = <a href="coin.md#0x1_coin_withdraw">coin::withdraw</a>&lt;AptosCoin&gt;(staker, amount);
+    <a href="stake.md#0x1_stake_add_stake_with_cap">stake::add_stake_with_cap</a>(&<a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.owner_cap, staked_coins);
+
+    <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.principal = <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.principal + amount;
+    <b>let</b> pool_address = <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.pool_address;
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        emit(<a href="staking_contract.md#0x1_staking_contract_AddStake">AddStake</a> { operator, pool_address, amount });
+    };
+    emit_event(
+        &<b>mut</b> store.add_stake_events,
+        <a href="staking_contract.md#0x1_staking_contract_AddStakeEvent">AddStakeEvent</a> { operator, pool_address, amount },
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_staking_contract_update_voter"></a>
+
+## Function `update_voter`
+
+Convenient function to allow the staker to update the voter address in a staking contract they made.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="staking_contract.md#0x1_staking_contract_update_voter">update_voter</a>(staker: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, operator: <b>address</b>, new_voter: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="staking_contract.md#0x1_staking_contract_update_voter">update_voter</a>(staker: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, operator: <b>address</b>, new_voter: <b>address</b>) <b>acquires</b> <a href="staking_contract.md#0x1_staking_contract_Store">Store</a> {
+    <b>let</b> staker_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(staker);
+    <a href="staking_contract.md#0x1_staking_contract_assert_staking_contract_exists">assert_staking_contract_exists</a>(staker_address, operator);
+
+    <b>let</b> store = <b>borrow_global_mut</b>&lt;<a href="staking_contract.md#0x1_staking_contract_Store">Store</a>&gt;(staker_address);
+    <b>let</b> <a href="staking_contract.md#0x1_staking_contract">staking_contract</a> = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_borrow_mut">simple_map::borrow_mut</a>(&<b>mut</b> store.staking_contracts, &operator);
+    <b>let</b> pool_address = <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.pool_address;
+    <b>let</b> old_voter = <a href="stake.md#0x1_stake_get_delegated_voter">stake::get_delegated_voter</a>(pool_address);
+    <a href="stake.md#0x1_stake_set_delegated_voter_with_cap">stake::set_delegated_voter_with_cap</a>(&<a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.owner_cap, new_voter);
+
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        emit(<a href="staking_contract.md#0x1_staking_contract_UpdateVoter">UpdateVoter</a> { operator, pool_address, old_voter, new_voter });
+    };
+    emit_event(
+        &<b>mut</b> store.update_voter_events,
+        <a href="staking_contract.md#0x1_staking_contract_UpdateVoterEvent">UpdateVoterEvent</a> { operator, pool_address, old_voter, new_voter },
+    );
+
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_staking_contract_reset_lockup"></a>
+
+## Function `reset_lockup`
+
+Convenient function to allow the staker to reset their stake pool's lockup period to start now.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="staking_contract.md#0x1_staking_contract_reset_lockup">reset_lockup</a>(staker: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, operator: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="staking_contract.md#0x1_staking_contract_reset_lockup">reset_lockup</a>(staker: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, operator: <b>address</b>) <b>acquires</b> <a href="staking_contract.md#0x1_staking_contract_Store">Store</a> {
+    <b>let</b> staker_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(staker);
+    <a href="staking_contract.md#0x1_staking_contract_assert_staking_contract_exists">assert_staking_contract_exists</a>(staker_address, operator);
+
+    <b>let</b> store = <b>borrow_global_mut</b>&lt;<a href="staking_contract.md#0x1_staking_contract_Store">Store</a>&gt;(staker_address);
+    <b>let</b> <a href="staking_contract.md#0x1_staking_contract">staking_contract</a> = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_borrow_mut">simple_map::borrow_mut</a>(&<b>mut</b> store.staking_contracts, &operator);
+    <b>let</b> pool_address = <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.pool_address;
+    <a href="stake.md#0x1_stake_increase_lockup_with_cap">stake::increase_lockup_with_cap</a>(&<a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.owner_cap);
+
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        emit(<a href="staking_contract.md#0x1_staking_contract_ResetLockup">ResetLockup</a> { operator, pool_address });
+    };
+    emit_event(&<b>mut</b> store.reset_lockup_events, <a href="staking_contract.md#0x1_staking_contract_ResetLockupEvent">ResetLockupEvent</a> { operator, pool_address });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_staking_contract_update_commision"></a>
+
+## Function `update_commision`
+
+Convenience function to allow a staker to update the commission percentage paid to the operator.
+TODO: fix the typo in function name. commision -> commission
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="staking_contract.md#0x1_staking_contract_update_commision">update_commision</a>(staker: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, operator: <b>address</b>, new_commission_percentage: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="staking_contract.md#0x1_staking_contract_update_commision">update_commision</a>(
+    staker: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    operator: <b>address</b>,
+    new_commission_percentage: u64
+) <b>acquires</b> <a href="staking_contract.md#0x1_staking_contract_Store">Store</a>, <a href="staking_contract.md#0x1_staking_contract_BeneficiaryForOperator">BeneficiaryForOperator</a>, <a href="staking_contract.md#0x1_staking_contract_StakingGroupUpdateCommissionEvent">StakingGroupUpdateCommissionEvent</a> {
+    <b>assert</b>!(
+        new_commission_percentage &gt;= 0 && new_commission_percentage &lt;= 100,
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="staking_contract.md#0x1_staking_contract_EINVALID_COMMISSION_PERCENTAGE">EINVALID_COMMISSION_PERCENTAGE</a>),
+    );
+
+    <b>let</b> staker_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(staker);
+    <b>assert</b>!(<b>exists</b>&lt;<a href="staking_contract.md#0x1_staking_contract_Store">Store</a>&gt;(staker_address), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="staking_contract.md#0x1_staking_contract_ENO_STAKING_CONTRACT_FOUND_FOR_STAKER">ENO_STAKING_CONTRACT_FOUND_FOR_STAKER</a>));
+
+    <b>let</b> store = <b>borrow_global_mut</b>&lt;<a href="staking_contract.md#0x1_staking_contract_Store">Store</a>&gt;(staker_address);
+    <b>let</b> <a href="staking_contract.md#0x1_staking_contract">staking_contract</a> = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_borrow_mut">simple_map::borrow_mut</a>(&<b>mut</b> store.staking_contracts, &operator);
+    <a href="staking_contract.md#0x1_staking_contract_distribute_internal">distribute_internal</a>(staker_address, operator, <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>, &<b>mut</b> store.distribute_events);
+    <a href="staking_contract.md#0x1_staking_contract_request_commission_internal">request_commission_internal</a>(
+        operator,
+        <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>,
+        &<b>mut</b> store.add_distribution_events,
+        &<b>mut</b> store.request_commission_events,
+    );
+    <b>let</b> old_commission_percentage = <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.commission_percentage;
+    <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.commission_percentage = new_commission_percentage;
+    <b>if</b> (!<b>exists</b>&lt;<a href="staking_contract.md#0x1_staking_contract_StakingGroupUpdateCommissionEvent">StakingGroupUpdateCommissionEvent</a>&gt;(staker_address)) {
+        <b>move_to</b>(
+            staker,
+            <a href="staking_contract.md#0x1_staking_contract_StakingGroupUpdateCommissionEvent">StakingGroupUpdateCommissionEvent</a> {
+                update_commission_events: <a href="account.md#0x1_account_new_event_handle">account::new_event_handle</a>&lt;<a href="staking_contract.md#0x1_staking_contract_UpdateCommissionEvent">UpdateCommissionEvent</a>&gt;(
+                    staker
+                )
+            }
+        )
+    };
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        emit(
+            <a href="staking_contract.md#0x1_staking_contract_UpdateCommission">UpdateCommission</a> { staker: staker_address, operator, old_commission_percentage, new_commission_percentage }
+        );
+    };
+    emit_event(
+        &<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="staking_contract.md#0x1_staking_contract_StakingGroupUpdateCommissionEvent">StakingGroupUpdateCommissionEvent</a>&gt;(staker_address).update_commission_events,
+        <a href="staking_contract.md#0x1_staking_contract_UpdateCommissionEvent">UpdateCommissionEvent</a> { staker: staker_address, operator, old_commission_percentage, new_commission_percentage }
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_staking_contract_request_commission"></a>
+
+## Function `request_commission`
+
+Unlock commission amount from the stake pool. Operator needs to wait for the amount to become withdrawable
+at the end of the stake pool's lockup period before they can actually can withdraw_commission.
+
+Only staker, operator or beneficiary can call this.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="staking_contract.md#0x1_staking_contract_request_commission">request_commission</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, staker: <b>address</b>, operator: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="staking_contract.md#0x1_staking_contract_request_commission">request_commission</a>(
+    <a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    staker: <b>address</b>,
+    operator: <b>address</b>
+) <b>acquires</b> <a href="staking_contract.md#0x1_staking_contract_Store">Store</a>, <a href="staking_contract.md#0x1_staking_contract_BeneficiaryForOperator">BeneficiaryForOperator</a> {
+    <b>let</b> account_addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>);
+    <b>assert</b>!(
+        account_addr == staker || account_addr == operator || account_addr == <a href="staking_contract.md#0x1_staking_contract_beneficiary_for_operator">beneficiary_for_operator</a>(operator),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_unauthenticated">error::unauthenticated</a>(<a href="staking_contract.md#0x1_staking_contract_ENOT_STAKER_OR_OPERATOR_OR_BENEFICIARY">ENOT_STAKER_OR_OPERATOR_OR_BENEFICIARY</a>)
+    );
+    <a href="staking_contract.md#0x1_staking_contract_assert_staking_contract_exists">assert_staking_contract_exists</a>(staker, operator);
+
+    <b>let</b> store = <b>borrow_global_mut</b>&lt;<a href="staking_contract.md#0x1_staking_contract_Store">Store</a>&gt;(staker);
+    <b>let</b> <a href="staking_contract.md#0x1_staking_contract">staking_contract</a> = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_borrow_mut">simple_map::borrow_mut</a>(&<b>mut</b> store.staking_contracts, &operator);
+    // Short-circuit <b>if</b> zero commission.
+    <b>if</b> (<a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.commission_percentage == 0) {
+        <b>return</b>
+    };
+
+    // Force distribution of <a href="../../../aptos-stdlib/tests/compiler-v2-doc/any.md#0x1_any">any</a> already inactive <a href="stake.md#0x1_stake">stake</a>.
+    <a href="staking_contract.md#0x1_staking_contract_distribute_internal">distribute_internal</a>(staker, operator, <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>, &<b>mut</b> store.distribute_events);
+
+    <a href="staking_contract.md#0x1_staking_contract_request_commission_internal">request_commission_internal</a>(
+        operator,
+        <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>,
+        &<b>mut</b> store.add_distribution_events,
+        &<b>mut</b> store.request_commission_events,
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_staking_contract_request_commission_internal"></a>
+
+## Function `request_commission_internal`
+
+
+
+<pre><code><b>fun</b> <a href="staking_contract.md#0x1_staking_contract_request_commission_internal">request_commission_internal</a>(operator: <b>address</b>, <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>: &<b>mut</b> <a href="staking_contract.md#0x1_staking_contract_StakingContract">staking_contract::StakingContract</a>, add_distribution_events: &<b>mut</b> <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="staking_contract.md#0x1_staking_contract_AddDistributionEvent">staking_contract::AddDistributionEvent</a>&gt;, request_commission_events: &<b>mut</b> <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="staking_contract.md#0x1_staking_contract_RequestCommissionEvent">staking_contract::RequestCommissionEvent</a>&gt;): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="staking_contract.md#0x1_staking_contract_request_commission_internal">request_commission_internal</a>(
+    operator: <b>address</b>,
+    <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>: &<b>mut</b> <a href="staking_contract.md#0x1_staking_contract_StakingContract">StakingContract</a>,
+    add_distribution_events: &<b>mut</b> EventHandle&lt;<a href="staking_contract.md#0x1_staking_contract_AddDistributionEvent">AddDistributionEvent</a>&gt;,
+    request_commission_events: &<b>mut</b> EventHandle&lt;<a href="staking_contract.md#0x1_staking_contract_RequestCommissionEvent">RequestCommissionEvent</a>&gt;,
+): u64 {
+    // Unlock just the commission portion from the <a href="stake.md#0x1_stake">stake</a> pool.
+    <b>let</b> (total_active_stake, accumulated_rewards, commission_amount) =
+        <a href="staking_contract.md#0x1_staking_contract_get_staking_contract_amounts_internal">get_staking_contract_amounts_internal</a>(<a href="staking_contract.md#0x1_staking_contract">staking_contract</a>);
+    <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.principal = total_active_stake - commission_amount;
+
+    // Short-circuit <b>if</b> there's no commission <b>to</b> pay.
+    <b>if</b> (commission_amount == 0) {
+        <b>return</b> 0
+    };
+
+    // Add a distribution for the operator.
+    <a href="staking_contract.md#0x1_staking_contract_add_distribution">add_distribution</a>(operator, <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>, operator, commission_amount, add_distribution_events);
+
+    // Request <b>to</b> unlock the commission from the <a href="stake.md#0x1_stake">stake</a> pool.
+    // This won't become fully unlocked until the <a href="stake.md#0x1_stake">stake</a> pool's lockup expires.
+    <a href="stake.md#0x1_stake_unlock_with_cap">stake::unlock_with_cap</a>(commission_amount, &<a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.owner_cap);
+
+    <b>let</b> pool_address = <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.pool_address;
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        emit(<a href="staking_contract.md#0x1_staking_contract_RequestCommission">RequestCommission</a> { operator, pool_address, accumulated_rewards, commission_amount });
+    };
+    emit_event(
+        request_commission_events,
+        <a href="staking_contract.md#0x1_staking_contract_RequestCommissionEvent">RequestCommissionEvent</a> { operator, pool_address, accumulated_rewards, commission_amount },
+    );
+
+    commission_amount
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_staking_contract_unlock_stake"></a>
+
+## Function `unlock_stake`
+
+Staker can call this to request withdrawal of part or all of their staking_contract.
+This also triggers paying commission to the operator for accounting simplicity.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="staking_contract.md#0x1_staking_contract_unlock_stake">unlock_stake</a>(staker: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, operator: <b>address</b>, amount: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="staking_contract.md#0x1_staking_contract_unlock_stake">unlock_stake</a>(
+    staker: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    operator: <b>address</b>,
+    amount: u64
+) <b>acquires</b> <a href="staking_contract.md#0x1_staking_contract_Store">Store</a>, <a href="staking_contract.md#0x1_staking_contract_BeneficiaryForOperator">BeneficiaryForOperator</a> {
+    // Short-circuit <b>if</b> amount is 0.
+    <b>if</b> (amount == 0) <b>return</b>;
+
+    <b>let</b> staker_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(staker);
+    <a href="staking_contract.md#0x1_staking_contract_assert_staking_contract_exists">assert_staking_contract_exists</a>(staker_address, operator);
+
+    <b>let</b> store = <b>borrow_global_mut</b>&lt;<a href="staking_contract.md#0x1_staking_contract_Store">Store</a>&gt;(staker_address);
+    <b>let</b> <a href="staking_contract.md#0x1_staking_contract">staking_contract</a> = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_borrow_mut">simple_map::borrow_mut</a>(&<b>mut</b> store.staking_contracts, &operator);
+
+    // Force distribution of <a href="../../../aptos-stdlib/tests/compiler-v2-doc/any.md#0x1_any">any</a> already inactive <a href="stake.md#0x1_stake">stake</a>.
+    <a href="staking_contract.md#0x1_staking_contract_distribute_internal">distribute_internal</a>(staker_address, operator, <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>, &<b>mut</b> store.distribute_events);
+
+    // For simplicity, we request commission <b>to</b> be paid out first. This avoids having <b>to</b> ensure <b>to</b> staker doesn't
+    // withdraw into the commission portion.
+    <b>let</b> commission_paid = <a href="staking_contract.md#0x1_staking_contract_request_commission_internal">request_commission_internal</a>(
+        operator,
+        <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>,
+        &<b>mut</b> store.add_distribution_events,
+        &<b>mut</b> store.request_commission_events,
+    );
+
+    // If there's less active <a href="stake.md#0x1_stake">stake</a> remaining than the amount requested (potentially due <b>to</b> commission),
+    // only withdraw up <b>to</b> the active amount.
+    <b>let</b> (active, _, _, _) = <a href="stake.md#0x1_stake_get_stake">stake::get_stake</a>(<a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.pool_address);
+    <b>if</b> (active &lt; amount) {
+        amount = active;
+    };
+    <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.principal = <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.principal - amount;
+
+    // Record a distribution for the staker.
+    <a href="staking_contract.md#0x1_staking_contract_add_distribution">add_distribution</a>(operator, <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>, staker_address, amount, &<b>mut</b> store.add_distribution_events);
+
+    // Request <b>to</b> unlock the distribution amount from the <a href="stake.md#0x1_stake">stake</a> pool.
+    // This won't become fully unlocked until the <a href="stake.md#0x1_stake">stake</a> pool's lockup expires.
+    <a href="stake.md#0x1_stake_unlock_with_cap">stake::unlock_with_cap</a>(amount, &<a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.owner_cap);
+
+    <b>let</b> pool_address = <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.pool_address;
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        emit(<a href="staking_contract.md#0x1_staking_contract_UnlockStake">UnlockStake</a> { pool_address, operator, amount, commission_paid });
+    };
+    emit_event(
+        &<b>mut</b> store.unlock_stake_events,
+        <a href="staking_contract.md#0x1_staking_contract_UnlockStakeEvent">UnlockStakeEvent</a> { pool_address, operator, amount, commission_paid },
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_staking_contract_unlock_rewards"></a>
+
+## Function `unlock_rewards`
+
+Unlock all accumulated rewards since the last recorded principals.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="staking_contract.md#0x1_staking_contract_unlock_rewards">unlock_rewards</a>(staker: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, operator: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="staking_contract.md#0x1_staking_contract_unlock_rewards">unlock_rewards</a>(staker: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, operator: <b>address</b>) <b>acquires</b> <a href="staking_contract.md#0x1_staking_contract_Store">Store</a>, <a href="staking_contract.md#0x1_staking_contract_BeneficiaryForOperator">BeneficiaryForOperator</a> {
+    <b>let</b> staker_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(staker);
+    <a href="staking_contract.md#0x1_staking_contract_assert_staking_contract_exists">assert_staking_contract_exists</a>(staker_address, operator);
+
+    // Calculate how much rewards belongs <b>to</b> the staker after commission is paid.
+    <b>let</b> (_, accumulated_rewards, unpaid_commission) = <a href="staking_contract.md#0x1_staking_contract_staking_contract_amounts">staking_contract_amounts</a>(staker_address, operator);
+    <b>let</b> staker_rewards = accumulated_rewards - unpaid_commission;
+    <a href="staking_contract.md#0x1_staking_contract_unlock_stake">unlock_stake</a>(staker, operator, staker_rewards);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_staking_contract_switch_operator_with_same_commission"></a>
+
+## Function `switch_operator_with_same_commission`
+
+Allows staker to switch operator without going through the lenghthy process to unstake, without resetting commission.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="staking_contract.md#0x1_staking_contract_switch_operator_with_same_commission">switch_operator_with_same_commission</a>(staker: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, old_operator: <b>address</b>, new_operator: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="staking_contract.md#0x1_staking_contract_switch_operator_with_same_commission">switch_operator_with_same_commission</a>(
+    staker: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    old_operator: <b>address</b>,
+    new_operator: <b>address</b>,
+) <b>acquires</b> <a href="staking_contract.md#0x1_staking_contract_Store">Store</a>, <a href="staking_contract.md#0x1_staking_contract_BeneficiaryForOperator">BeneficiaryForOperator</a> {
+    <b>let</b> staker_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(staker);
+    <a href="staking_contract.md#0x1_staking_contract_assert_staking_contract_exists">assert_staking_contract_exists</a>(staker_address, old_operator);
+
+    <b>let</b> commission_percentage = <a href="staking_contract.md#0x1_staking_contract_commission_percentage">commission_percentage</a>(staker_address, old_operator);
+    <a href="staking_contract.md#0x1_staking_contract_switch_operator">switch_operator</a>(staker, old_operator, new_operator, commission_percentage);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_staking_contract_switch_operator"></a>
+
+## Function `switch_operator`
+
+Allows staker to switch operator without going through the lenghthy process to unstake.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="staking_contract.md#0x1_staking_contract_switch_operator">switch_operator</a>(staker: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, old_operator: <b>address</b>, new_operator: <b>address</b>, new_commission_percentage: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="staking_contract.md#0x1_staking_contract_switch_operator">switch_operator</a>(
+    staker: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    old_operator: <b>address</b>,
+    new_operator: <b>address</b>,
+    new_commission_percentage: u64,
+) <b>acquires</b> <a href="staking_contract.md#0x1_staking_contract_Store">Store</a>, <a href="staking_contract.md#0x1_staking_contract_BeneficiaryForOperator">BeneficiaryForOperator</a> {
+    <b>let</b> staker_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(staker);
+    <a href="staking_contract.md#0x1_staking_contract_assert_staking_contract_exists">assert_staking_contract_exists</a>(staker_address, old_operator);
+
+    // Merging two existing staking contracts is too complex <b>as</b> we'd need <b>to</b> merge two separate <a href="stake.md#0x1_stake">stake</a> pools.
+    <b>let</b> store = <b>borrow_global_mut</b>&lt;<a href="staking_contract.md#0x1_staking_contract_Store">Store</a>&gt;(staker_address);
+    <b>let</b> staking_contracts = &<b>mut</b> store.staking_contracts;
+    <b>assert</b>!(
+        !<a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_contains_key">simple_map::contains_key</a>(staking_contracts, &new_operator),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="staking_contract.md#0x1_staking_contract_ECANT_MERGE_STAKING_CONTRACTS">ECANT_MERGE_STAKING_CONTRACTS</a>),
+    );
+
+    <b>let</b> (_, <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>) = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_remove">simple_map::remove</a>(staking_contracts, &old_operator);
+    // Force distribution of <a href="../../../aptos-stdlib/tests/compiler-v2-doc/any.md#0x1_any">any</a> already inactive <a href="stake.md#0x1_stake">stake</a>.
+    <a href="staking_contract.md#0x1_staking_contract_distribute_internal">distribute_internal</a>(staker_address, old_operator, &<b>mut</b> <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>, &<b>mut</b> store.distribute_events);
+
+    // For simplicity, we request commission <b>to</b> be paid out first. This avoids having <b>to</b> ensure <b>to</b> staker doesn't
+    // withdraw into the commission portion.
+    <a href="staking_contract.md#0x1_staking_contract_request_commission_internal">request_commission_internal</a>(
+        old_operator,
+        &<b>mut</b> <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>,
+        &<b>mut</b> store.add_distribution_events,
+        &<b>mut</b> store.request_commission_events,
+    );
+
+    // Update the staking contract's commission rate and <a href="stake.md#0x1_stake">stake</a> pool's operator.
+    <a href="stake.md#0x1_stake_set_operator_with_cap">stake::set_operator_with_cap</a>(&<a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.owner_cap, new_operator);
+    <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.commission_percentage = new_commission_percentage;
+
+    <b>let</b> pool_address = <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.pool_address;
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_add">simple_map::add</a>(staking_contracts, new_operator, <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>);
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        emit(<a href="staking_contract.md#0x1_staking_contract_SwitchOperator">SwitchOperator</a> { pool_address, old_operator, new_operator });
+    };
+    emit_event(
+        &<b>mut</b> store.switch_operator_events,
+        <a href="staking_contract.md#0x1_staking_contract_SwitchOperatorEvent">SwitchOperatorEvent</a> { pool_address, old_operator, new_operator }
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_staking_contract_set_beneficiary_for_operator"></a>
+
+## Function `set_beneficiary_for_operator`
+
+Allows an operator to change its beneficiary. Any existing unpaid commission rewards will be paid to the new
+beneficiary. To ensures payment to the current beneficiary, one should first call <code>distribute</code> before switching
+the beneficiary. An operator can set one beneficiary for staking contract pools, not a separate one for each pool.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="staking_contract.md#0x1_staking_contract_set_beneficiary_for_operator">set_beneficiary_for_operator</a>(operator: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, new_beneficiary: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="staking_contract.md#0x1_staking_contract_set_beneficiary_for_operator">set_beneficiary_for_operator</a>(
+    operator: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    new_beneficiary: <b>address</b>
+) <b>acquires</b> <a href="staking_contract.md#0x1_staking_contract_BeneficiaryForOperator">BeneficiaryForOperator</a> {
+    <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_operator_beneficiary_change_enabled">features::operator_beneficiary_change_enabled</a>(), std::error::invalid_state(
+        <a href="staking_contract.md#0x1_staking_contract_EOPERATOR_BENEFICIARY_CHANGE_NOT_SUPPORTED">EOPERATOR_BENEFICIARY_CHANGE_NOT_SUPPORTED</a>
+    ));
+    // The beneficiay <b>address</b> of an operator is stored under the operator's <b>address</b>.
+    // So, the operator does not need <b>to</b> be validated <b>with</b> respect <b>to</b> a staking pool.
+    <b>let</b> operator_addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(operator);
+    <b>let</b> old_beneficiary = <a href="staking_contract.md#0x1_staking_contract_beneficiary_for_operator">beneficiary_for_operator</a>(operator_addr);
+    <b>if</b> (<b>exists</b>&lt;<a href="staking_contract.md#0x1_staking_contract_BeneficiaryForOperator">BeneficiaryForOperator</a>&gt;(operator_addr)) {
+        <b>borrow_global_mut</b>&lt;<a href="staking_contract.md#0x1_staking_contract_BeneficiaryForOperator">BeneficiaryForOperator</a>&gt;(operator_addr).beneficiary_for_operator = new_beneficiary;
+    } <b>else</b> {
+        <b>move_to</b>(operator, <a href="staking_contract.md#0x1_staking_contract_BeneficiaryForOperator">BeneficiaryForOperator</a> { beneficiary_for_operator: new_beneficiary });
+    };
+
+    emit(<a href="staking_contract.md#0x1_staking_contract_SetBeneficiaryForOperator">SetBeneficiaryForOperator</a> {
+        operator: operator_addr,
+        old_beneficiary,
+        new_beneficiary,
+    });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_staking_contract_distribute"></a>
+
+## Function `distribute`
+
+Allow anyone to distribute already unlocked funds. This does not affect reward compounding and therefore does
+not need to be restricted to just the staker or operator.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="staking_contract.md#0x1_staking_contract_distribute">distribute</a>(staker: <b>address</b>, operator: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="staking_contract.md#0x1_staking_contract_distribute">distribute</a>(staker: <b>address</b>, operator: <b>address</b>) <b>acquires</b> <a href="staking_contract.md#0x1_staking_contract_Store">Store</a>, <a href="staking_contract.md#0x1_staking_contract_BeneficiaryForOperator">BeneficiaryForOperator</a> {
+    <a href="staking_contract.md#0x1_staking_contract_assert_staking_contract_exists">assert_staking_contract_exists</a>(staker, operator);
+    <b>let</b> store = <b>borrow_global_mut</b>&lt;<a href="staking_contract.md#0x1_staking_contract_Store">Store</a>&gt;(staker);
+    <b>let</b> <a href="staking_contract.md#0x1_staking_contract">staking_contract</a> = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_borrow_mut">simple_map::borrow_mut</a>(&<b>mut</b> store.staking_contracts, &operator);
+    <a href="staking_contract.md#0x1_staking_contract_distribute_internal">distribute_internal</a>(staker, operator, <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>, &<b>mut</b> store.distribute_events);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_staking_contract_distribute_internal"></a>
+
+## Function `distribute_internal`
+
+Distribute all unlocked (inactive) funds according to distribution shares.
+
+
+<pre><code><b>fun</b> <a href="staking_contract.md#0x1_staking_contract_distribute_internal">distribute_internal</a>(staker: <b>address</b>, operator: <b>address</b>, <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>: &<b>mut</b> <a href="staking_contract.md#0x1_staking_contract_StakingContract">staking_contract::StakingContract</a>, distribute_events: &<b>mut</b> <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="staking_contract.md#0x1_staking_contract_DistributeEvent">staking_contract::DistributeEvent</a>&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="staking_contract.md#0x1_staking_contract_distribute_internal">distribute_internal</a>(
+    staker: <b>address</b>,
+    operator: <b>address</b>,
+    <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>: &<b>mut</b> <a href="staking_contract.md#0x1_staking_contract_StakingContract">StakingContract</a>,
+    distribute_events: &<b>mut</b> EventHandle&lt;<a href="staking_contract.md#0x1_staking_contract_DistributeEvent">DistributeEvent</a>&gt;,
+) <b>acquires</b> <a href="staking_contract.md#0x1_staking_contract_BeneficiaryForOperator">BeneficiaryForOperator</a> {
+    <b>let</b> pool_address = <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.pool_address;
+    <b>let</b> (_, inactive, _, pending_inactive) = <a href="stake.md#0x1_stake_get_stake">stake::get_stake</a>(pool_address);
+    <b>let</b> total_potential_withdrawable = inactive + pending_inactive;
+    <b>let</b> coins = <a href="stake.md#0x1_stake_withdraw_with_cap">stake::withdraw_with_cap</a>(&<a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.owner_cap, total_potential_withdrawable);
+    <b>let</b> distribution_amount = <a href="coin.md#0x1_coin_value">coin::value</a>(&coins);
+    <b>if</b> (distribution_amount == 0) {
+        <a href="coin.md#0x1_coin_destroy_zero">coin::destroy_zero</a>(coins);
+        <b>return</b>
+    };
+
+    <b>let</b> distribution_pool = &<b>mut</b> <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.distribution_pool;
+    <a href="staking_contract.md#0x1_staking_contract_update_distribution_pool">update_distribution_pool</a>(
+        distribution_pool, distribution_amount, operator, <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.commission_percentage);
+
+    // Buy all recipients out of the distribution pool.
+    <b>while</b> (<a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_shareholders_count">pool_u64::shareholders_count</a>(distribution_pool) &gt; 0) {
+        <b>let</b> recipients = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_shareholders">pool_u64::shareholders</a>(distribution_pool);
+        <b>let</b> recipient = *<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(&<b>mut</b> recipients, 0);
+        <b>let</b> current_shares = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_shares">pool_u64::shares</a>(distribution_pool, recipient);
+        <b>let</b> amount_to_distribute = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_redeem_shares">pool_u64::redeem_shares</a>(distribution_pool, recipient, current_shares);
+        // If the recipient is the operator, send the commission <b>to</b> the beneficiary instead.
+        <b>if</b> (recipient == operator) {
+            recipient = <a href="staking_contract.md#0x1_staking_contract_beneficiary_for_operator">beneficiary_for_operator</a>(operator);
+        };
+        <a href="aptos_account.md#0x1_aptos_account_deposit_coins">aptos_account::deposit_coins</a>(recipient, <a href="coin.md#0x1_coin_extract">coin::extract</a>(&<b>mut</b> coins, amount_to_distribute));
+
+        <b>if</b> (std::features::module_event_migration_enabled()) {
+            emit(<a href="staking_contract.md#0x1_staking_contract_Distribute">Distribute</a> { operator, pool_address, recipient, amount: amount_to_distribute });
+        };
+        emit_event(
+            distribute_events,
+            <a href="staking_contract.md#0x1_staking_contract_DistributeEvent">DistributeEvent</a> { operator, pool_address, recipient, amount: amount_to_distribute }
+        );
+    };
+
+    // In case there's <a href="../../../aptos-stdlib/tests/compiler-v2-doc/any.md#0x1_any">any</a> dust left, send them all <b>to</b> the staker.
+    <b>if</b> (<a href="coin.md#0x1_coin_value">coin::value</a>(&coins) &gt; 0) {
+        <a href="aptos_account.md#0x1_aptos_account_deposit_coins">aptos_account::deposit_coins</a>(staker, coins);
+        <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_update_total_coins">pool_u64::update_total_coins</a>(distribution_pool, 0);
+    } <b>else</b> {
+        <a href="coin.md#0x1_coin_destroy_zero">coin::destroy_zero</a>(coins);
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_staking_contract_assert_staking_contract_exists"></a>
+
+## Function `assert_staking_contract_exists`
+
+Assert that a staking_contract exists for the staker/operator pair.
+
+
+<pre><code><b>fun</b> <a href="staking_contract.md#0x1_staking_contract_assert_staking_contract_exists">assert_staking_contract_exists</a>(staker: <b>address</b>, operator: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="staking_contract.md#0x1_staking_contract_assert_staking_contract_exists">assert_staking_contract_exists</a>(staker: <b>address</b>, operator: <b>address</b>) <b>acquires</b> <a href="staking_contract.md#0x1_staking_contract_Store">Store</a> {
+    <b>assert</b>!(<b>exists</b>&lt;<a href="staking_contract.md#0x1_staking_contract_Store">Store</a>&gt;(staker), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="staking_contract.md#0x1_staking_contract_ENO_STAKING_CONTRACT_FOUND_FOR_STAKER">ENO_STAKING_CONTRACT_FOUND_FOR_STAKER</a>));
+    <b>let</b> staking_contracts = &<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="staking_contract.md#0x1_staking_contract_Store">Store</a>&gt;(staker).staking_contracts;
+    <b>assert</b>!(
+        <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_contains_key">simple_map::contains_key</a>(staking_contracts, &operator),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="staking_contract.md#0x1_staking_contract_ENO_STAKING_CONTRACT_FOUND_FOR_OPERATOR">ENO_STAKING_CONTRACT_FOUND_FOR_OPERATOR</a>),
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_staking_contract_add_distribution"></a>
+
+## Function `add_distribution`
+
+Add a new distribution for <code>recipient</code> and <code>amount</code> to the staking contract's distributions list.
+
+
+<pre><code><b>fun</b> <a href="staking_contract.md#0x1_staking_contract_add_distribution">add_distribution</a>(operator: <b>address</b>, <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>: &<b>mut</b> <a href="staking_contract.md#0x1_staking_contract_StakingContract">staking_contract::StakingContract</a>, recipient: <b>address</b>, coins_amount: u64, add_distribution_events: &<b>mut</b> <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="staking_contract.md#0x1_staking_contract_AddDistributionEvent">staking_contract::AddDistributionEvent</a>&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="staking_contract.md#0x1_staking_contract_add_distribution">add_distribution</a>(
+    operator: <b>address</b>,
+    <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>: &<b>mut</b> <a href="staking_contract.md#0x1_staking_contract_StakingContract">StakingContract</a>,
+    recipient: <b>address</b>,
+    coins_amount: u64,
+    add_distribution_events: &<b>mut</b> EventHandle&lt;<a href="staking_contract.md#0x1_staking_contract_AddDistributionEvent">AddDistributionEvent</a>&gt;
+) {
+    <b>let</b> distribution_pool = &<b>mut</b> <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.distribution_pool;
+    <b>let</b> (_, _, _, total_distribution_amount) = <a href="stake.md#0x1_stake_get_stake">stake::get_stake</a>(<a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.pool_address);
+    <a href="staking_contract.md#0x1_staking_contract_update_distribution_pool">update_distribution_pool</a>(
+        distribution_pool, total_distribution_amount, operator, <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.commission_percentage);
+
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_buy_in">pool_u64::buy_in</a>(distribution_pool, recipient, coins_amount);
+    <b>let</b> pool_address = <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.pool_address;
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        emit(<a href="staking_contract.md#0x1_staking_contract_AddDistribution">AddDistribution</a> { operator, pool_address, amount: coins_amount });
+    };
+    emit_event(
+        add_distribution_events,
+        <a href="staking_contract.md#0x1_staking_contract_AddDistributionEvent">AddDistributionEvent</a> { operator, pool_address, amount: coins_amount }
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_staking_contract_get_staking_contract_amounts_internal"></a>
+
+## Function `get_staking_contract_amounts_internal`
+
+Calculate accumulated rewards and commissions since last update.
+
+
+<pre><code><b>fun</b> <a href="staking_contract.md#0x1_staking_contract_get_staking_contract_amounts_internal">get_staking_contract_amounts_internal</a>(<a href="staking_contract.md#0x1_staking_contract">staking_contract</a>: &<a href="staking_contract.md#0x1_staking_contract_StakingContract">staking_contract::StakingContract</a>): (u64, u64, u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="staking_contract.md#0x1_staking_contract_get_staking_contract_amounts_internal">get_staking_contract_amounts_internal</a>(<a href="staking_contract.md#0x1_staking_contract">staking_contract</a>: &<a href="staking_contract.md#0x1_staking_contract_StakingContract">StakingContract</a>): (u64, u64, u64) {
+    // Pending_inactive is not included in the calculation because pending_inactive can only come from:
+    // 1. Outgoing commissions. This means commission <b>has</b> already been extracted.
+    // 2. Stake withdrawals from stakers. This also means commission <b>has</b> already been extracted <b>as</b>
+    // request_commission_internal is called in unlock_stake
+    <b>let</b> (active, _, pending_active, _) = <a href="stake.md#0x1_stake_get_stake">stake::get_stake</a>(<a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.pool_address);
+    <b>let</b> total_active_stake = active + pending_active;
+    <b>let</b> accumulated_rewards = total_active_stake - <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.principal;
+    <b>let</b> commission_amount = accumulated_rewards * <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.commission_percentage / 100;
+
+    (total_active_stake, accumulated_rewards, commission_amount)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_staking_contract_create_stake_pool"></a>
+
+## Function `create_stake_pool`
+
+
+
+<pre><code><b>fun</b> <a href="staking_contract.md#0x1_staking_contract_create_stake_pool">create_stake_pool</a>(staker: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, operator: <b>address</b>, voter: <b>address</b>, contract_creation_seed: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="account.md#0x1_account_SignerCapability">account::SignerCapability</a>, <a href="stake.md#0x1_stake_OwnerCapability">stake::OwnerCapability</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="staking_contract.md#0x1_staking_contract_create_stake_pool">create_stake_pool</a>(
+    staker: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    operator: <b>address</b>,
+    voter: <b>address</b>,
+    contract_creation_seed: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+): (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, SignerCapability, OwnerCapability) {
+    // Generate a seed that will be used <b>to</b> create the resource <a href="account.md#0x1_account">account</a> that hosts the staking contract.
+    <b>let</b> seed = <a href="staking_contract.md#0x1_staking_contract_create_resource_account_seed">create_resource_account_seed</a>(
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(staker), operator, contract_creation_seed);
+
+    <b>let</b> (stake_pool_signer, stake_pool_signer_cap) = <a href="account.md#0x1_account_create_resource_account">account::create_resource_account</a>(staker, seed);
+    <a href="stake.md#0x1_stake_initialize_stake_owner">stake::initialize_stake_owner</a>(&stake_pool_signer, 0, operator, voter);
+
+    // Extract owner_cap from the StakePool, so we have control over it in the staking_contracts flow.
+    // This is stored <b>as</b> part of the <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>. Thus, the staker would not have direct control over it without
+    // going through well-defined functions in this <b>module</b>.
+    <b>let</b> owner_cap = <a href="stake.md#0x1_stake_extract_owner_cap">stake::extract_owner_cap</a>(&stake_pool_signer);
+
+    (stake_pool_signer, stake_pool_signer_cap, owner_cap)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_staking_contract_update_distribution_pool"></a>
+
+## Function `update_distribution_pool`
+
+
+
+<pre><code><b>fun</b> <a href="staking_contract.md#0x1_staking_contract_update_distribution_pool">update_distribution_pool</a>(distribution_pool: &<b>mut</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_Pool">pool_u64::Pool</a>, updated_total_coins: u64, operator: <b>address</b>, commission_percentage: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="staking_contract.md#0x1_staking_contract_update_distribution_pool">update_distribution_pool</a>(
+    distribution_pool: &<b>mut</b> Pool,
+    updated_total_coins: u64,
+    operator: <b>address</b>,
+    commission_percentage: u64,
+) {
+    // Short-circuit and do nothing <b>if</b> the pool's total value <b>has</b> not changed.
+    <b>if</b> (<a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_total_coins">pool_u64::total_coins</a>(distribution_pool) == updated_total_coins) {
+        <b>return</b>
+    };
+
+    // Charge all stakeholders (<b>except</b> for the operator themselves) commission on <a href="../../../aptos-stdlib/tests/compiler-v2-doc/any.md#0x1_any">any</a> rewards earnt relatively <b>to</b> the
+    // previous value of the distribution pool.
+    <b>let</b> shareholders = &<a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_shareholders">pool_u64::shareholders</a>(distribution_pool);
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_for_each_ref">vector::for_each_ref</a>(shareholders, |shareholder| {
+        <b>let</b> shareholder: <b>address</b> = *shareholder;
+        <b>if</b> (shareholder != operator) {
+            <b>let</b> shares = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_shares">pool_u64::shares</a>(distribution_pool, shareholder);
+            <b>let</b> previous_worth = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_balance">pool_u64::balance</a>(distribution_pool, shareholder);
+            <b>let</b> current_worth = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_shares_to_amount_with_total_coins">pool_u64::shares_to_amount_with_total_coins</a>(
+                distribution_pool, shares, updated_total_coins);
+            <b>let</b> unpaid_commission = (current_worth - previous_worth) * commission_percentage / 100;
+            // Transfer shares from current shareholder <b>to</b> the operator <b>as</b> payment.
+            // The value of the shares should <b>use</b> the updated pool's total value.
+            <b>let</b> shares_to_transfer = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_amount_to_shares_with_total_coins">pool_u64::amount_to_shares_with_total_coins</a>(
+                distribution_pool, unpaid_commission, updated_total_coins);
+            <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_transfer_shares">pool_u64::transfer_shares</a>(distribution_pool, shareholder, operator, shares_to_transfer);
+        };
+    });
+
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_update_total_coins">pool_u64::update_total_coins</a>(distribution_pool, updated_total_coins);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_staking_contract_create_resource_account_seed"></a>
+
+## Function `create_resource_account_seed`
+
+Create the seed to derive the resource account address.
+
+
+<pre><code><b>fun</b> <a href="staking_contract.md#0x1_staking_contract_create_resource_account_seed">create_resource_account_seed</a>(staker: <b>address</b>, operator: <b>address</b>, contract_creation_seed: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="staking_contract.md#0x1_staking_contract_create_resource_account_seed">create_resource_account_seed</a>(
+    staker: <b>address</b>,
+    operator: <b>address</b>,
+    contract_creation_seed: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; {
+    <b>let</b> seed = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs_to_bytes">bcs::to_bytes</a>(&staker);
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_append">vector::append</a>(&<b>mut</b> seed, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs_to_bytes">bcs::to_bytes</a>(&operator));
+    // Include a salt <b>to</b> avoid conflicts <b>with</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/any.md#0x1_any">any</a> other modules out there that might also generate
+    // deterministic resource accounts for the same staker + operator addresses.
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_append">vector::append</a>(&<b>mut</b> seed, <a href="staking_contract.md#0x1_staking_contract_SALT">SALT</a>);
+    // Add an extra salt given by the staker in case an <a href="account.md#0x1_account">account</a> <b>with</b> the same <b>address</b> <b>has</b> already been created.
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_append">vector::append</a>(&<b>mut</b> seed, contract_creation_seed);
+    seed
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_staking_contract_new_staking_contracts_holder"></a>
+
+## Function `new_staking_contracts_holder`
+
+Create a new staking_contracts resource.
+
+
+<pre><code><b>fun</b> <a href="staking_contract.md#0x1_staking_contract_new_staking_contracts_holder">new_staking_contracts_holder</a>(staker: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>): <a href="staking_contract.md#0x1_staking_contract_Store">staking_contract::Store</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="staking_contract.md#0x1_staking_contract_new_staking_contracts_holder">new_staking_contracts_holder</a>(staker: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>): <a href="staking_contract.md#0x1_staking_contract_Store">Store</a> {
+    <a href="staking_contract.md#0x1_staking_contract_Store">Store</a> {
+        staking_contracts: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_create">simple_map::create</a>&lt;<b>address</b>, <a href="staking_contract.md#0x1_staking_contract_StakingContract">StakingContract</a>&gt;(),
+        // Events.
+        create_staking_contract_events: <a href="account.md#0x1_account_new_event_handle">account::new_event_handle</a>&lt;<a href="staking_contract.md#0x1_staking_contract_CreateStakingContractEvent">CreateStakingContractEvent</a>&gt;(staker),
+        update_voter_events: <a href="account.md#0x1_account_new_event_handle">account::new_event_handle</a>&lt;<a href="staking_contract.md#0x1_staking_contract_UpdateVoterEvent">UpdateVoterEvent</a>&gt;(staker),
+        reset_lockup_events: <a href="account.md#0x1_account_new_event_handle">account::new_event_handle</a>&lt;<a href="staking_contract.md#0x1_staking_contract_ResetLockupEvent">ResetLockupEvent</a>&gt;(staker),
+        add_stake_events: <a href="account.md#0x1_account_new_event_handle">account::new_event_handle</a>&lt;<a href="staking_contract.md#0x1_staking_contract_AddStakeEvent">AddStakeEvent</a>&gt;(staker),
+        request_commission_events: <a href="account.md#0x1_account_new_event_handle">account::new_event_handle</a>&lt;<a href="staking_contract.md#0x1_staking_contract_RequestCommissionEvent">RequestCommissionEvent</a>&gt;(staker),
+        unlock_stake_events: <a href="account.md#0x1_account_new_event_handle">account::new_event_handle</a>&lt;<a href="staking_contract.md#0x1_staking_contract_UnlockStakeEvent">UnlockStakeEvent</a>&gt;(staker),
+        switch_operator_events: <a href="account.md#0x1_account_new_event_handle">account::new_event_handle</a>&lt;<a href="staking_contract.md#0x1_staking_contract_SwitchOperatorEvent">SwitchOperatorEvent</a>&gt;(staker),
+        add_distribution_events: <a href="account.md#0x1_account_new_event_handle">account::new_event_handle</a>&lt;<a href="staking_contract.md#0x1_staking_contract_AddDistributionEvent">AddDistributionEvent</a>&gt;(staker),
+        distribute_events: <a href="account.md#0x1_account_new_event_handle">account::new_event_handle</a>&lt;<a href="staking_contract.md#0x1_staking_contract_DistributeEvent">DistributeEvent</a>&gt;(staker),
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+
+
+<a id="high-level-req"></a>
+
+### High-level Requirements
+
+<table>
+<tr>
+<th>No.</th><th>Requirement</th><th>Criticality</th><th>Implementation</th><th>Enforcement</th>
+</tr>
+
+<tr>
+<td>1</td>
+<td>The Store structure for the staker exists after the staking contract is created.</td>
+<td>Medium</td>
+<td>The create_staking_contract_with_coins function ensures that the staker account has a Store structure assigned.</td>
+<td>Formally verified via <a href="#high-level-req-1">CreateStakingContractWithCoinsAbortsifAndEnsures</a>.</td>
+</tr>
+
+<tr>
+<td>2</td>
+<td>A staking contract is created and stored in a mapping within the Store resource.</td>
+<td>High</td>
+<td>The create_staking_contract_with_coins function adds the newly created StakingContract to the staking_contracts map with the operator as a key of the Store resource, effectively storing the staking contract.</td>
+<td>Formally verified via <a href="#high-level-req-2">CreateStakingContractWithCoinsAbortsifAndEnsures</a>.</td>
+</tr>
+
+<tr>
+<td>3</td>
+<td>Adding stake to the stake pool increases the principal value of the pool, reflecting the additional stake amount.</td>
+<td>High</td>
+<td>The add_stake function transfers the specified amount of staked coins from the staker's account to the stake pool associated with the staking contract. It increases the principal value of the staking contract by the added stake amount.</td>
+<td>Formally verified via <a href="#high-level-req-3">add_stake</a>.</td>
+</tr>
+
+<tr>
+<td>4</td>
+<td>The staker may update the voter of a staking contract, enabling them to modify the assigned voter address and ensure it accurately reflects their desired choice.</td>
+<td>High</td>
+<td>The update_voter function ensures that the voter address in a staking contract may be updated by the staker, resulting in the modification of the delegated voter address in the associated stake pool to reflect the new address provided.</td>
+<td>Formally verified via <a href="#high-level-req-4">update_voter</a>.</td>
+</tr>
+
+<tr>
+<td>5</td>
+<td>Only the owner of the stake pool has the permission to reset the lockup period of the pool.</td>
+<td>Critical</td>
+<td>The reset_lockup function ensures that only the staker who owns the stake pool has the authority to reset the lockup period of the pool.</td>
+<td>Formally verified via <a href="#high-level-req-5">reset_lockup</a>.</td>
+</tr>
+
+<tr>
+<td>6</td>
+<td>Unlocked funds are correctly distributed to recipients based on their distribution shares, taking into account the associated commission percentage.</td>
+<td>High</td>
+<td>The distribution process, implemented in the distribute_internal function, accurately allocates unlocked funds to their intended recipients based on their distribution shares. It guarantees that each recipient receives the correct amount of funds, considering the commission percentage associated with the staking contract.</td>
+<td>Audited that the correct amount of unlocked funds is distributed according to distribution shares.</td>
+</tr>
+
+<tr>
+<td>7</td>
+<td>The stake pool ensures that the commission is correctly requested and paid out from the old operator's stake pool before allowing the switch to the new operator.</td>
+<td>High</td>
+<td>The switch_operator function initiates the commission payout from the stake pool associated with the old operator, ensuring a smooth transition. Paying out the commission before the switch guarantees that the staker receives the appropriate commission amount and maintains the integrity of the staking process.</td>
+<td>Audited that the commission is paid to the old operator.</td>
+</tr>
+
+<tr>
+<td>8</td>
+<td>Stakers can withdraw their funds from the staking contract, ensuring the unlocked amount becomes available for withdrawal after the lockup period.</td>
+<td>High</td>
+<td>The unlock_stake function ensures that the requested amount is properly unlocked from the stake pool, considering the lockup period and that the funds become available for withdrawal when the lockup expires.</td>
+<td>Audited that funds are unlocked properly.</td>
+</tr>
+
+</table>
+
+
+
+
+<a id="module-level-spec"></a>
+
+### Module-level Specification
+
+
+<pre><code><b>pragma</b> verify = <b>true</b>;
+<b>pragma</b> aborts_if_is_strict;
+</code></pre>
+
+
+
+<a id="@Specification_1_stake_pool_address"></a>
+
+### Function `stake_pool_address`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="staking_contract.md#0x1_staking_contract_stake_pool_address">stake_pool_address</a>(staker: <b>address</b>, operator: <b>address</b>): <b>address</b>
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="staking_contract.md#0x1_staking_contract_ContractExistsAbortsIf">ContractExistsAbortsIf</a>;
+<b>let</b> staking_contracts = <b>global</b>&lt;<a href="staking_contract.md#0x1_staking_contract_Store">Store</a>&gt;(staker).staking_contracts;
+<b>ensures</b> result == <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(staking_contracts, operator).pool_address;
+</code></pre>
+
+
+
+<a id="@Specification_1_last_recorded_principal"></a>
+
+### Function `last_recorded_principal`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="staking_contract.md#0x1_staking_contract_last_recorded_principal">last_recorded_principal</a>(staker: <b>address</b>, operator: <b>address</b>): u64
+</code></pre>
+
+
+Staking_contract exists the stacker/operator pair.
+
+
+<pre><code><b>include</b> <a href="staking_contract.md#0x1_staking_contract_ContractExistsAbortsIf">ContractExistsAbortsIf</a>;
+<b>let</b> staking_contracts = <b>global</b>&lt;<a href="staking_contract.md#0x1_staking_contract_Store">Store</a>&gt;(staker).staking_contracts;
+<b>ensures</b> result == <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(staking_contracts, operator).principal;
+</code></pre>
+
+
+
+<a id="@Specification_1_commission_percentage"></a>
+
+### Function `commission_percentage`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="staking_contract.md#0x1_staking_contract_commission_percentage">commission_percentage</a>(staker: <b>address</b>, operator: <b>address</b>): u64
+</code></pre>
+
+
+Staking_contract exists the stacker/operator pair.
+
+
+<pre><code><b>include</b> <a href="staking_contract.md#0x1_staking_contract_ContractExistsAbortsIf">ContractExistsAbortsIf</a>;
+<b>let</b> staking_contracts = <b>global</b>&lt;<a href="staking_contract.md#0x1_staking_contract_Store">Store</a>&gt;(staker).staking_contracts;
+<b>ensures</b> result == <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(staking_contracts, operator).commission_percentage;
+</code></pre>
+
+
+
+<a id="@Specification_1_staking_contract_amounts"></a>
+
+### Function `staking_contract_amounts`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="staking_contract.md#0x1_staking_contract_staking_contract_amounts">staking_contract_amounts</a>(staker: <b>address</b>, operator: <b>address</b>): (u64, u64, u64)
+</code></pre>
+
+
+Staking_contract exists the stacker/operator pair.
+
+
+<pre><code><b>pragma</b> verify_duration_estimate = 120;
+<b>requires</b> <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.commission_percentage &gt;= 0 && <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.<a href="staking_contract.md#0x1_staking_contract_commission_percentage">commission_percentage</a> &lt;= 100;
+<b>let</b> staking_contracts = <b>global</b>&lt;<a href="staking_contract.md#0x1_staking_contract_Store">Store</a>&gt;(staker).staking_contracts;
+<b>let</b> <a href="staking_contract.md#0x1_staking_contract">staking_contract</a> = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(staking_contracts, operator);
+<b>include</b> <a href="staking_contract.md#0x1_staking_contract_ContractExistsAbortsIf">ContractExistsAbortsIf</a>;
+<b>include</b> <a href="staking_contract.md#0x1_staking_contract_GetStakingContractAmountsAbortsIf">GetStakingContractAmountsAbortsIf</a> { <a href="staking_contract.md#0x1_staking_contract">staking_contract</a> };
+<b>let</b> pool_address = <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.pool_address;
+<b>let</b> stake_pool = <b>global</b>&lt;<a href="stake.md#0x1_stake_StakePool">stake::StakePool</a>&gt;(pool_address);
+<b>let</b> active = <a href="coin.md#0x1_coin_value">coin::value</a>(stake_pool.active);
+<b>let</b> pending_active = <a href="coin.md#0x1_coin_value">coin::value</a>(stake_pool.pending_active);
+<b>let</b> total_active_stake = active + pending_active;
+<b>let</b> accumulated_rewards = total_active_stake - <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.principal;
+<b>ensures</b> result_1 == total_active_stake;
+<b>ensures</b> result_2 == accumulated_rewards;
+</code></pre>
+
+
+
+<a id="@Specification_1_pending_distribution_counts"></a>
+
+### Function `pending_distribution_counts`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="staking_contract.md#0x1_staking_contract_pending_distribution_counts">pending_distribution_counts</a>(staker: <b>address</b>, operator: <b>address</b>): u64
+</code></pre>
+
+
+Staking_contract exists the stacker/operator pair.
+
+
+<pre><code><b>include</b> <a href="staking_contract.md#0x1_staking_contract_ContractExistsAbortsIf">ContractExistsAbortsIf</a>;
+<b>let</b> staking_contracts = <b>global</b>&lt;<a href="staking_contract.md#0x1_staking_contract_Store">Store</a>&gt;(staker).staking_contracts;
+<b>let</b> <a href="staking_contract.md#0x1_staking_contract">staking_contract</a> = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(staking_contracts, operator);
+<b>let</b> shareholders_count = len(<a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.distribution_pool.shareholders);
+<b>ensures</b> result == shareholders_count;
+</code></pre>
+
+
+
+<a id="@Specification_1_staking_contract_exists"></a>
+
+### Function `staking_contract_exists`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="staking_contract.md#0x1_staking_contract_staking_contract_exists">staking_contract_exists</a>(staker: <b>address</b>, operator: <b>address</b>): bool
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="staking_contract.md#0x1_staking_contract_spec_staking_contract_exists">spec_staking_contract_exists</a>(staker, operator);
+</code></pre>
+
+
+
+
+<a id="0x1_staking_contract_spec_staking_contract_exists"></a>
+
+
+<pre><code><b>fun</b> <a href="staking_contract.md#0x1_staking_contract_spec_staking_contract_exists">spec_staking_contract_exists</a>(staker: <b>address</b>, operator: <b>address</b>): bool {
+   <b>if</b> (!<b>exists</b>&lt;<a href="staking_contract.md#0x1_staking_contract_Store">Store</a>&gt;(staker)) {
+       <b>false</b>
+   } <b>else</b> {
+       <b>let</b> store = <b>global</b>&lt;<a href="staking_contract.md#0x1_staking_contract_Store">Store</a>&gt;(staker);
+       <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(store.staking_contracts, operator)
+   }
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_beneficiary_for_operator"></a>
+
+### Function `beneficiary_for_operator`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="staking_contract.md#0x1_staking_contract_beneficiary_for_operator">beneficiary_for_operator</a>(operator: <b>address</b>): <b>address</b>
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_create_staking_contract"></a>
+
+### Function `create_staking_contract`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="staking_contract.md#0x1_staking_contract_create_staking_contract">create_staking_contract</a>(staker: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, operator: <b>address</b>, voter: <b>address</b>, amount: u64, commission_percentage: u64, contract_creation_seed: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+Account is not frozen and sufficient to withdraw.
+
+
+<pre><code><b>pragma</b> aborts_if_is_partial;
+<b>pragma</b> verify_duration_estimate = 120;
+<b>include</b> <a href="staking_contract.md#0x1_staking_contract_PreconditionsInCreateContract">PreconditionsInCreateContract</a>;
+<b>include</b> <a href="staking_contract.md#0x1_staking_contract_WithdrawAbortsIf">WithdrawAbortsIf</a>&lt;AptosCoin&gt; { <a href="account.md#0x1_account">account</a>: staker };
+<b>include</b> <a href="staking_contract.md#0x1_staking_contract_CreateStakingContractWithCoinsAbortsIfAndEnsures">CreateStakingContractWithCoinsAbortsIfAndEnsures</a>;
+</code></pre>
+
+
+
+<a id="@Specification_1_create_staking_contract_with_coins"></a>
+
+### Function `create_staking_contract_with_coins`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="staking_contract.md#0x1_staking_contract_create_staking_contract_with_coins">create_staking_contract_with_coins</a>(staker: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, operator: <b>address</b>, voter: <b>address</b>, coins: <a href="coin.md#0x1_coin_Coin">coin::Coin</a>&lt;<a href="aptos_coin.md#0x1_aptos_coin_AptosCoin">aptos_coin::AptosCoin</a>&gt;, commission_percentage: u64, contract_creation_seed: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <b>address</b>
+</code></pre>
+
+
+The amount should be at least the min_stake_required, so the stake pool will be eligible to join the validator set.
+Initialize Store resource if this is the first time the staker has delegated to anyone.
+Cannot create the staking contract if it already exists.
+
+
+<pre><code><b>pragma</b> verify_duration_estimate = 120;
+<b>pragma</b> aborts_if_is_partial;
+<b>include</b> <a href="staking_contract.md#0x1_staking_contract_PreconditionsInCreateContract">PreconditionsInCreateContract</a>;
+<b>let</b> amount = coins.value;
+<b>include</b> <a href="staking_contract.md#0x1_staking_contract_CreateStakingContractWithCoinsAbortsIfAndEnsures">CreateStakingContractWithCoinsAbortsIfAndEnsures</a> { amount };
+</code></pre>
+
+
+
+<a id="@Specification_1_add_stake"></a>
+
+### Function `add_stake`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="staking_contract.md#0x1_staking_contract_add_stake">add_stake</a>(staker: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, operator: <b>address</b>, amount: u64)
+</code></pre>
+
+
+Account is not frozen and sufficient to withdraw.
+Staking_contract exists the stacker/operator pair.
+
+
+<pre><code><b>pragma</b> verify_duration_estimate = 600;
+<b>include</b> <a href="stake.md#0x1_stake_ResourceRequirement">stake::ResourceRequirement</a>;
+<b>aborts_if</b> <a href="reconfiguration_state.md#0x1_reconfiguration_state_spec_is_in_progress">reconfiguration_state::spec_is_in_progress</a>();
+<b>let</b> staker_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(staker);
+<b>include</b> <a href="staking_contract.md#0x1_staking_contract_ContractExistsAbortsIf">ContractExistsAbortsIf</a> { staker: staker_address };
+<b>let</b> store = <b>global</b>&lt;<a href="staking_contract.md#0x1_staking_contract_Store">Store</a>&gt;(staker_address);
+<b>let</b> <a href="staking_contract.md#0x1_staking_contract">staking_contract</a> = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(store.staking_contracts, operator);
+<b>include</b> <a href="staking_contract.md#0x1_staking_contract_WithdrawAbortsIf">WithdrawAbortsIf</a>&lt;AptosCoin&gt; { <a href="account.md#0x1_account">account</a>: staker };
+<b>let</b> balance = <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;AptosCoin&gt;&gt;(staker_address).<a href="coin.md#0x1_coin">coin</a>.value;
+<b>let</b> <b>post</b> post_coin = <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;AptosCoin&gt;&gt;(staker_address).<a href="coin.md#0x1_coin">coin</a>.value;
+<b>ensures</b> post_coin == balance - amount;
+<b>let</b> owner_cap = <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.owner_cap;
+<b>include</b> <a href="stake.md#0x1_stake_AddStakeWithCapAbortsIfAndEnsures">stake::AddStakeWithCapAbortsIfAndEnsures</a> { owner_cap };
+<b>let</b> <b>post</b> post_store = <b>global</b>&lt;<a href="staking_contract.md#0x1_staking_contract_Store">Store</a>&gt;(staker_address);
+<b>let</b> <b>post</b> post_staking_contract = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(post_store.staking_contracts, operator);
+<b>aborts_if</b> <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.principal + amount &gt; MAX_U64;
+// This enforces <a id="high-level-req-3" href="#high-level-req">high-level requirement 3</a>:
+<b>ensures</b> post_staking_contract.principal == <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.principal + amount;
+</code></pre>
+
+
+
+<a id="@Specification_1_update_voter"></a>
+
+### Function `update_voter`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="staking_contract.md#0x1_staking_contract_update_voter">update_voter</a>(staker: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, operator: <b>address</b>, new_voter: <b>address</b>)
+</code></pre>
+
+
+Staking_contract exists the stacker/operator pair.
+
+
+<pre><code><b>let</b> staker_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(staker);
+<b>include</b> <a href="staking_contract.md#0x1_staking_contract_UpdateVoterSchema">UpdateVoterSchema</a> { staker: staker_address };
+<b>let</b> <b>post</b> store = <b>global</b>&lt;<a href="staking_contract.md#0x1_staking_contract_Store">Store</a>&gt;(staker_address);
+<b>let</b> <b>post</b> <a href="staking_contract.md#0x1_staking_contract">staking_contract</a> = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(store.staking_contracts, operator);
+<b>let</b> <b>post</b> pool_address = <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.owner_cap.pool_address;
+<b>let</b> <b>post</b> new_delegated_voter = <b>global</b>&lt;<a href="stake.md#0x1_stake_StakePool">stake::StakePool</a>&gt;(pool_address).delegated_voter;
+<b>ensures</b> new_delegated_voter == new_voter;
+</code></pre>
+
+
+
+<a id="@Specification_1_reset_lockup"></a>
+
+### Function `reset_lockup`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="staking_contract.md#0x1_staking_contract_reset_lockup">reset_lockup</a>(staker: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, operator: <b>address</b>)
+</code></pre>
+
+
+Staking_contract exists the stacker/operator pair.
+Only active validator can update locked_until_secs.
+
+
+<pre><code><b>let</b> staker_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(staker);
+// This enforces <a id="high-level-req-5" href="#high-level-req">high-level requirement 5</a>:
+<b>include</b> <a href="staking_contract.md#0x1_staking_contract_ContractExistsAbortsIf">ContractExistsAbortsIf</a> { staker: staker_address };
+<b>include</b> <a href="staking_contract.md#0x1_staking_contract_IncreaseLockupWithCapAbortsIf">IncreaseLockupWithCapAbortsIf</a> { staker: staker_address };
+</code></pre>
+
+
+
+<a id="@Specification_1_update_commision"></a>
+
+### Function `update_commision`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="staking_contract.md#0x1_staking_contract_update_commision">update_commision</a>(staker: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, operator: <b>address</b>, new_commission_percentage: u64)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+<b>let</b> staker_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(staker);
+<b>aborts_if</b> new_commission_percentage &gt; 100;
+<b>include</b> <a href="staking_contract.md#0x1_staking_contract_ContractExistsAbortsIf">ContractExistsAbortsIf</a> { staker: staker_address };
+</code></pre>
+
+
+
+<a id="@Specification_1_request_commission"></a>
+
+### Function `request_commission`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="staking_contract.md#0x1_staking_contract_request_commission">request_commission</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, staker: <b>address</b>, operator: <b>address</b>)
+</code></pre>
+
+
+Only staker or operator can call this.
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+<b>let</b> account_addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>);
+<b>include</b> <a href="staking_contract.md#0x1_staking_contract_ContractExistsAbortsIf">ContractExistsAbortsIf</a> { staker };
+<b>aborts_if</b> account_addr != staker && account_addr != operator;
+</code></pre>
+
+
+
+<a id="@Specification_1_request_commission_internal"></a>
+
+### Function `request_commission_internal`
+
+
+<pre><code><b>fun</b> <a href="staking_contract.md#0x1_staking_contract_request_commission_internal">request_commission_internal</a>(operator: <b>address</b>, <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>: &<b>mut</b> <a href="staking_contract.md#0x1_staking_contract_StakingContract">staking_contract::StakingContract</a>, add_distribution_events: &<b>mut</b> <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="staking_contract.md#0x1_staking_contract_AddDistributionEvent">staking_contract::AddDistributionEvent</a>&gt;, request_commission_events: &<b>mut</b> <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="staking_contract.md#0x1_staking_contract_RequestCommissionEvent">staking_contract::RequestCommissionEvent</a>&gt;): u64
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+<b>include</b> <a href="staking_contract.md#0x1_staking_contract_GetStakingContractAmountsAbortsIf">GetStakingContractAmountsAbortsIf</a>;
+</code></pre>
+
+
+
+<a id="@Specification_1_unlock_stake"></a>
+
+### Function `unlock_stake`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="staking_contract.md#0x1_staking_contract_unlock_stake">unlock_stake</a>(staker: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, operator: <b>address</b>, amount: u64)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+<b>requires</b> amount &gt; 0;
+<b>let</b> staker_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(staker);
+<b>include</b> <a href="staking_contract.md#0x1_staking_contract_ContractExistsAbortsIf">ContractExistsAbortsIf</a> { staker: staker_address };
+</code></pre>
+
+
+
+<a id="@Specification_1_unlock_rewards"></a>
+
+### Function `unlock_rewards`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="staking_contract.md#0x1_staking_contract_unlock_rewards">unlock_rewards</a>(staker: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, operator: <b>address</b>)
+</code></pre>
+
+
+Staking_contract exists the stacker/operator pair.
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+// This enforces <a id="high-level-req-4" href="#high-level-req">high-level requirement 4</a>:
+<b>requires</b> <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.commission_percentage &gt;= 0 && <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.<a href="staking_contract.md#0x1_staking_contract_commission_percentage">commission_percentage</a> &lt;= 100;
+<b>let</b> staker_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(staker);
+<b>let</b> staking_contracts = <b>global</b>&lt;<a href="staking_contract.md#0x1_staking_contract_Store">Store</a>&gt;(staker_address).staking_contracts;
+<b>let</b> <a href="staking_contract.md#0x1_staking_contract">staking_contract</a> = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(staking_contracts, operator);
+<b>include</b> <a href="staking_contract.md#0x1_staking_contract_ContractExistsAbortsIf">ContractExistsAbortsIf</a> { staker: staker_address };
+</code></pre>
+
+
+
+<a id="@Specification_1_switch_operator_with_same_commission"></a>
+
+### Function `switch_operator_with_same_commission`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="staking_contract.md#0x1_staking_contract_switch_operator_with_same_commission">switch_operator_with_same_commission</a>(staker: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, old_operator: <b>address</b>, new_operator: <b>address</b>)
+</code></pre>
+
+
+Staking_contract exists the stacker/operator pair.
+
+
+<pre><code><b>pragma</b> verify_duration_estimate = 120;
+<b>pragma</b> aborts_if_is_partial;
+<b>let</b> staker_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(staker);
+<b>include</b> <a href="staking_contract.md#0x1_staking_contract_ContractExistsAbortsIf">ContractExistsAbortsIf</a> { staker: staker_address, operator: old_operator };
+</code></pre>
+
+
+
+<a id="@Specification_1_switch_operator"></a>
+
+### Function `switch_operator`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="staking_contract.md#0x1_staking_contract_switch_operator">switch_operator</a>(staker: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, old_operator: <b>address</b>, new_operator: <b>address</b>, new_commission_percentage: u64)
+</code></pre>
+
+
+Staking_contract exists the stacker/operator pair.
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+<b>let</b> staker_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(staker);
+<b>include</b> <a href="staking_contract.md#0x1_staking_contract_ContractExistsAbortsIf">ContractExistsAbortsIf</a> { staker: staker_address, operator: old_operator };
+<b>let</b> store = <b>global</b>&lt;<a href="staking_contract.md#0x1_staking_contract_Store">Store</a>&gt;(staker_address);
+<b>let</b> staking_contracts = store.staking_contracts;
+<b>aborts_if</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(staking_contracts, new_operator);
+</code></pre>
+
+
+
+<a id="@Specification_1_set_beneficiary_for_operator"></a>
+
+### Function `set_beneficiary_for_operator`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="staking_contract.md#0x1_staking_contract_set_beneficiary_for_operator">set_beneficiary_for_operator</a>(operator: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, new_beneficiary: <b>address</b>)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_distribute"></a>
+
+### Function `distribute`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="staking_contract.md#0x1_staking_contract_distribute">distribute</a>(staker: <b>address</b>, operator: <b>address</b>)
+</code></pre>
+
+
+Staking_contract exists the stacker/operator pair.
+
+
+<pre><code><b>pragma</b> verify_duration_estimate = 120;
+<b>pragma</b> aborts_if_is_partial;
+<b>include</b> <a href="staking_contract.md#0x1_staking_contract_ContractExistsAbortsIf">ContractExistsAbortsIf</a>;
+</code></pre>
+
+
+
+<a id="@Specification_1_distribute_internal"></a>
+
+### Function `distribute_internal`
+
+
+<pre><code><b>fun</b> <a href="staking_contract.md#0x1_staking_contract_distribute_internal">distribute_internal</a>(staker: <b>address</b>, operator: <b>address</b>, <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>: &<b>mut</b> <a href="staking_contract.md#0x1_staking_contract_StakingContract">staking_contract::StakingContract</a>, distribute_events: &<b>mut</b> <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="staking_contract.md#0x1_staking_contract_DistributeEvent">staking_contract::DistributeEvent</a>&gt;)
+</code></pre>
+
+
+The StakePool exists under the pool_address of StakingContract.
+The value of inactive and pending_inactive in the stake_pool is up to MAX_U64.
+
+
+<pre><code><b>pragma</b> verify_duration_estimate = 120;
+<b>pragma</b> aborts_if_is_partial;
+<b>let</b> pool_address = <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.pool_address;
+<b>let</b> stake_pool = <b>borrow_global</b>&lt;<a href="stake.md#0x1_stake_StakePool">stake::StakePool</a>&gt;(pool_address);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="stake.md#0x1_stake_StakePool">stake::StakePool</a>&gt;(pool_address);
+<b>aborts_if</b> stake_pool.inactive.value + stake_pool.pending_inactive.value &gt; MAX_U64;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="stake.md#0x1_stake_StakePool">stake::StakePool</a>&gt;(<a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.owner_cap.pool_address);
+</code></pre>
+
+
+
+<a id="@Specification_1_assert_staking_contract_exists"></a>
+
+### Function `assert_staking_contract_exists`
+
+
+<pre><code><b>fun</b> <a href="staking_contract.md#0x1_staking_contract_assert_staking_contract_exists">assert_staking_contract_exists</a>(staker: <b>address</b>, operator: <b>address</b>)
+</code></pre>
+
+
+Staking_contract exists the stacker/operator pair.
+
+
+<pre><code><b>include</b> <a href="staking_contract.md#0x1_staking_contract_ContractExistsAbortsIf">ContractExistsAbortsIf</a>;
+</code></pre>
+
+
+
+<a id="@Specification_1_add_distribution"></a>
+
+### Function `add_distribution`
+
+
+<pre><code><b>fun</b> <a href="staking_contract.md#0x1_staking_contract_add_distribution">add_distribution</a>(operator: <b>address</b>, <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>: &<b>mut</b> <a href="staking_contract.md#0x1_staking_contract_StakingContract">staking_contract::StakingContract</a>, recipient: <b>address</b>, coins_amount: u64, add_distribution_events: &<b>mut</b> <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="staking_contract.md#0x1_staking_contract_AddDistributionEvent">staking_contract::AddDistributionEvent</a>&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_get_staking_contract_amounts_internal"></a>
+
+### Function `get_staking_contract_amounts_internal`
+
+
+<pre><code><b>fun</b> <a href="staking_contract.md#0x1_staking_contract_get_staking_contract_amounts_internal">get_staking_contract_amounts_internal</a>(<a href="staking_contract.md#0x1_staking_contract">staking_contract</a>: &<a href="staking_contract.md#0x1_staking_contract_StakingContract">staking_contract::StakingContract</a>): (u64, u64, u64)
+</code></pre>
+
+
+The StakePool exists under the pool_address of StakingContract.
+
+
+<pre><code><b>pragma</b> verify_duration_estimate = 120;
+<b>include</b> <a href="staking_contract.md#0x1_staking_contract_GetStakingContractAmountsAbortsIf">GetStakingContractAmountsAbortsIf</a>;
+<b>let</b> pool_address = <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.pool_address;
+<b>let</b> stake_pool = <b>global</b>&lt;<a href="stake.md#0x1_stake_StakePool">stake::StakePool</a>&gt;(pool_address);
+<b>let</b> active = <a href="coin.md#0x1_coin_value">coin::value</a>(stake_pool.active);
+<b>let</b> pending_active = <a href="coin.md#0x1_coin_value">coin::value</a>(stake_pool.pending_active);
+<b>let</b> total_active_stake = active + pending_active;
+<b>let</b> accumulated_rewards = total_active_stake - <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.principal;
+<b>let</b> commission_amount = accumulated_rewards * <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.commission_percentage / 100;
+<b>ensures</b> result_1 == total_active_stake;
+<b>ensures</b> result_2 == accumulated_rewards;
+<b>ensures</b> result_3 == commission_amount;
+</code></pre>
+
+
+
+<a id="@Specification_1_create_stake_pool"></a>
+
+### Function `create_stake_pool`
+
+
+<pre><code><b>fun</b> <a href="staking_contract.md#0x1_staking_contract_create_stake_pool">create_stake_pool</a>(staker: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, operator: <b>address</b>, voter: <b>address</b>, contract_creation_seed: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="account.md#0x1_account_SignerCapability">account::SignerCapability</a>, <a href="stake.md#0x1_stake_OwnerCapability">stake::OwnerCapability</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify_duration_estimate = 120;
+<b>include</b> <a href="stake.md#0x1_stake_ResourceRequirement">stake::ResourceRequirement</a>;
+<b>let</b> staker_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(staker);
+<b>let</b> seed_0 = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs_to_bytes">bcs::to_bytes</a>(staker_address);
+<b>let</b> seed_1 = concat(concat(concat(seed_0, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs_to_bytes">bcs::to_bytes</a>(operator)), <a href="staking_contract.md#0x1_staking_contract_SALT">SALT</a>), contract_creation_seed);
+<b>let</b> resource_addr = <a href="account.md#0x1_account_spec_create_resource_address">account::spec_create_resource_address</a>(staker_address, seed_1);
+<b>include</b> <a href="staking_contract.md#0x1_staking_contract_CreateStakePoolAbortsIf">CreateStakePoolAbortsIf</a> { resource_addr };
+<b>ensures</b> <b>exists</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(resource_addr);
+<b>let</b> <b>post</b> post_account = <b>global</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(resource_addr);
+<b>ensures</b> post_account.authentication_key == <a href="account.md#0x1_account_ZERO_AUTH_KEY">account::ZERO_AUTH_KEY</a>;
+<b>ensures</b> post_account.signer_capability_offer.for == std::option::spec_some(resource_addr);
+<b>ensures</b> <b>exists</b>&lt;<a href="stake.md#0x1_stake_StakePool">stake::StakePool</a>&gt;(resource_addr);
+<b>let</b> <b>post</b> post_owner_cap = <b>global</b>&lt;<a href="stake.md#0x1_stake_OwnerCapability">stake::OwnerCapability</a>&gt;(resource_addr);
+<b>let</b> <b>post</b> post_pool_address = post_owner_cap.pool_address;
+<b>let</b> <b>post</b> post_stake_pool = <b>global</b>&lt;<a href="stake.md#0x1_stake_StakePool">stake::StakePool</a>&gt;(post_pool_address);
+<b>let</b> <b>post</b> post_operator = post_stake_pool.operator_address;
+<b>let</b> <b>post</b> post_delegated_voter = post_stake_pool.delegated_voter;
+<b>ensures</b> resource_addr != operator ==&gt; post_operator == operator;
+<b>ensures</b> resource_addr != voter ==&gt; post_delegated_voter == voter;
+<b>ensures</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(result_1) == resource_addr;
+<b>ensures</b> result_2 == SignerCapability { <a href="account.md#0x1_account">account</a>: resource_addr };
+<b>ensures</b> result_3 == OwnerCapability { pool_address: resource_addr };
+</code></pre>
+
+
+
+<a id="@Specification_1_update_distribution_pool"></a>
+
+### Function `update_distribution_pool`
+
+
+<pre><code><b>fun</b> <a href="staking_contract.md#0x1_staking_contract_update_distribution_pool">update_distribution_pool</a>(distribution_pool: &<b>mut</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_Pool">pool_u64::Pool</a>, updated_total_coins: u64, operator: <b>address</b>, commission_percentage: u64)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> aborts_if_is_partial;
+</code></pre>
+
+
+
+<a id="@Specification_1_new_staking_contracts_holder"></a>
+
+### Function `new_staking_contracts_holder`
+
+
+<pre><code><b>fun</b> <a href="staking_contract.md#0x1_staking_contract_new_staking_contracts_holder">new_staking_contracts_holder</a>(staker: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>): <a href="staking_contract.md#0x1_staking_contract_Store">staking_contract::Store</a>
+</code></pre>
+
+
+The Account exists under the staker.
+The guid_creation_num of the ccount resource is up to MAX_U64.
+
+
+<pre><code><b>include</b> <a href="staking_contract.md#0x1_staking_contract_NewStakingContractsHolderAbortsIf">NewStakingContractsHolderAbortsIf</a>;
+</code></pre>
+
+
+
+
+<a id="0x1_staking_contract_NewStakingContractsHolderAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="staking_contract.md#0x1_staking_contract_NewStakingContractsHolderAbortsIf">NewStakingContractsHolderAbortsIf</a> {
+    staker: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>;
+    <b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(staker);
+    <b>let</b> <a href="account.md#0x1_account">account</a> = <b>global</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(addr);
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(addr);
+    <b>aborts_if</b> <a href="account.md#0x1_account">account</a>.guid_creation_num + 9 &gt;= <a href="account.md#0x1_account_MAX_GUID_CREATION_NUM">account::MAX_GUID_CREATION_NUM</a>;
+    <b>aborts_if</b> <a href="account.md#0x1_account">account</a>.guid_creation_num + 9 &gt; MAX_U64;
+}
+</code></pre>
+
+
+The Store exists under the staker.
+a staking_contract exists for the staker/operator pair.
+
+
+<a id="0x1_staking_contract_ContractExistsAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="staking_contract.md#0x1_staking_contract_ContractExistsAbortsIf">ContractExistsAbortsIf</a> {
+    staker: <b>address</b>;
+    operator: <b>address</b>;
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="staking_contract.md#0x1_staking_contract_Store">Store</a>&gt;(staker);
+    <b>let</b> staking_contracts = <b>global</b>&lt;<a href="staking_contract.md#0x1_staking_contract_Store">Store</a>&gt;(staker).staking_contracts;
+    <b>aborts_if</b> !<a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(staking_contracts, operator);
+}
+</code></pre>
+
+
+
+
+<a id="0x1_staking_contract_UpdateVoterSchema"></a>
+
+
+<pre><code><b>schema</b> <a href="staking_contract.md#0x1_staking_contract_UpdateVoterSchema">UpdateVoterSchema</a> {
+    staker: <b>address</b>;
+    operator: <b>address</b>;
+    <b>let</b> store = <b>global</b>&lt;<a href="staking_contract.md#0x1_staking_contract_Store">Store</a>&gt;(staker);
+    <b>let</b> <a href="staking_contract.md#0x1_staking_contract">staking_contract</a> = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(store.staking_contracts, operator);
+    <b>let</b> pool_address = <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.pool_address;
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="stake.md#0x1_stake_StakePool">stake::StakePool</a>&gt;(pool_address);
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="stake.md#0x1_stake_StakePool">stake::StakePool</a>&gt;(<a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.owner_cap.pool_address);
+    <b>include</b> <a href="staking_contract.md#0x1_staking_contract_ContractExistsAbortsIf">ContractExistsAbortsIf</a>;
+}
+</code></pre>
+
+
+
+
+<a id="0x1_staking_contract_WithdrawAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="staking_contract.md#0x1_staking_contract_WithdrawAbortsIf">WithdrawAbortsIf</a>&lt;CoinType&gt; {
+    <a href="account.md#0x1_account">account</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>;
+    amount: u64;
+    <b>let</b> account_addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>);
+    <b>let</b> coin_store = <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;CoinType&gt;&gt;(account_addr);
+    <b>let</b> balance = coin_store.<a href="coin.md#0x1_coin">coin</a>.value;
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;CoinType&gt;&gt;(account_addr);
+    <b>aborts_if</b> coin_store.frozen;
+    <b>aborts_if</b> balance &lt; amount;
+}
+</code></pre>
+
+
+
+
+<a id="0x1_staking_contract_GetStakingContractAmountsAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="staking_contract.md#0x1_staking_contract_GetStakingContractAmountsAbortsIf">GetStakingContractAmountsAbortsIf</a> {
+    <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>: <a href="staking_contract.md#0x1_staking_contract_StakingContract">StakingContract</a>;
+    <b>let</b> pool_address = <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.pool_address;
+    <b>let</b> stake_pool = <b>global</b>&lt;<a href="stake.md#0x1_stake_StakePool">stake::StakePool</a>&gt;(pool_address);
+    <b>let</b> active = <a href="coin.md#0x1_coin_value">coin::value</a>(stake_pool.active);
+    <b>let</b> pending_active = <a href="coin.md#0x1_coin_value">coin::value</a>(stake_pool.pending_active);
+    <b>let</b> total_active_stake = active + pending_active;
+    <b>let</b> accumulated_rewards = total_active_stake - <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.principal;
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="stake.md#0x1_stake_StakePool">stake::StakePool</a>&gt;(pool_address);
+    <b>aborts_if</b> active + pending_active &gt; MAX_U64;
+    <b>aborts_if</b> total_active_stake &lt; <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.principal;
+    <b>aborts_if</b> accumulated_rewards * <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.commission_percentage &gt; MAX_U64;
+}
+</code></pre>
+
+
+
+
+<a id="0x1_staking_contract_IncreaseLockupWithCapAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="staking_contract.md#0x1_staking_contract_IncreaseLockupWithCapAbortsIf">IncreaseLockupWithCapAbortsIf</a> {
+    staker: <b>address</b>;
+    operator: <b>address</b>;
+    <b>let</b> store = <b>global</b>&lt;<a href="staking_contract.md#0x1_staking_contract_Store">Store</a>&gt;(staker);
+    <b>let</b> <a href="staking_contract.md#0x1_staking_contract">staking_contract</a> = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(store.staking_contracts, operator);
+    <b>let</b> pool_address = <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.owner_cap.pool_address;
+    <b>aborts_if</b> !<a href="stake.md#0x1_stake_stake_pool_exists">stake::stake_pool_exists</a>(pool_address);
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="staking_config.md#0x1_staking_config_StakingConfig">staking_config::StakingConfig</a>&gt;(@aptos_framework);
+    <b>let</b> config = <b>global</b>&lt;<a href="staking_config.md#0x1_staking_config_StakingConfig">staking_config::StakingConfig</a>&gt;(@aptos_framework);
+    <b>let</b> stake_pool = <b>global</b>&lt;<a href="stake.md#0x1_stake_StakePool">stake::StakePool</a>&gt;(pool_address);
+    <b>let</b> old_locked_until_secs = stake_pool.locked_until_secs;
+    <b>let</b> seconds = <b>global</b>&lt;<a href="timestamp.md#0x1_timestamp_CurrentTimeMicroseconds">timestamp::CurrentTimeMicroseconds</a>&gt;(
+        @aptos_framework
+    ).microseconds / <a href="timestamp.md#0x1_timestamp_MICRO_CONVERSION_FACTOR">timestamp::MICRO_CONVERSION_FACTOR</a>;
+    <b>let</b> new_locked_until_secs = seconds + config.recurring_lockup_duration_secs;
+    <b>aborts_if</b> seconds + config.recurring_lockup_duration_secs &gt; MAX_U64;
+    <b>aborts_if</b> old_locked_until_secs &gt; new_locked_until_secs || old_locked_until_secs == new_locked_until_secs;
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="timestamp.md#0x1_timestamp_CurrentTimeMicroseconds">timestamp::CurrentTimeMicroseconds</a>&gt;(@aptos_framework);
+    <b>let</b> <b>post</b> post_store = <b>global</b>&lt;<a href="staking_contract.md#0x1_staking_contract_Store">Store</a>&gt;(staker);
+    <b>let</b> <b>post</b> post_staking_contract = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(post_store.staking_contracts, operator);
+    <b>let</b> <b>post</b> post_stake_pool = <b>global</b>&lt;<a href="stake.md#0x1_stake_StakePool">stake::StakePool</a>&gt;(post_staking_contract.owner_cap.pool_address);
+    <b>ensures</b> post_stake_pool.locked_until_secs == new_locked_until_secs;
+}
+</code></pre>
+
+
+
+
+<a id="0x1_staking_contract_CreateStakingContractWithCoinsAbortsIfAndEnsures"></a>
+
+
+<pre><code><b>schema</b> <a href="staking_contract.md#0x1_staking_contract_CreateStakingContractWithCoinsAbortsIfAndEnsures">CreateStakingContractWithCoinsAbortsIfAndEnsures</a> {
+    staker: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>;
+    operator: <b>address</b>;
+    voter: <b>address</b>;
+    amount: u64;
+    commission_percentage: u64;
+    contract_creation_seed: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+    <b>aborts_if</b> commission_percentage &gt; 100;
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="staking_config.md#0x1_staking_config_StakingConfig">staking_config::StakingConfig</a>&gt;(@aptos_framework);
+    <b>let</b> config = <b>global</b>&lt;<a href="staking_config.md#0x1_staking_config_StakingConfig">staking_config::StakingConfig</a>&gt;(@aptos_framework);
+    <b>let</b> min_stake_required = config.minimum_stake;
+    <b>aborts_if</b> amount &lt; min_stake_required;
+    <b>let</b> staker_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(staker);
+    <b>let</b> <a href="account.md#0x1_account">account</a> = <b>global</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(staker_address);
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="staking_contract.md#0x1_staking_contract_Store">Store</a>&gt;(staker_address) && !<b>exists</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(staker_address);
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="staking_contract.md#0x1_staking_contract_Store">Store</a>&gt;(staker_address) && <a href="account.md#0x1_account">account</a>.guid_creation_num + 9 &gt;= <a href="account.md#0x1_account_MAX_GUID_CREATION_NUM">account::MAX_GUID_CREATION_NUM</a>;
+    // This enforces <a id="high-level-req-1" href="#high-level-req">high-level requirement 1</a>:
+    <b>ensures</b> <b>exists</b>&lt;<a href="staking_contract.md#0x1_staking_contract_Store">Store</a>&gt;(staker_address);
+    <b>let</b> store = <b>global</b>&lt;<a href="staking_contract.md#0x1_staking_contract_Store">Store</a>&gt;(staker_address);
+    <b>let</b> staking_contracts = store.staking_contracts;
+    <b>let</b> owner_cap = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(store.staking_contracts, operator).owner_cap;
+    <b>let</b> <b>post</b> post_store = <b>global</b>&lt;<a href="staking_contract.md#0x1_staking_contract_Store">Store</a>&gt;(staker_address);
+    <b>let</b> <b>post</b> post_staking_contracts = post_store.staking_contracts;
+}
+</code></pre>
+
+
+
+
+<a id="0x1_staking_contract_PreconditionsInCreateContract"></a>
+
+
+<pre><code><b>schema</b> <a href="staking_contract.md#0x1_staking_contract_PreconditionsInCreateContract">PreconditionsInCreateContract</a> {
+    <b>requires</b> <b>exists</b>&lt;<a href="stake.md#0x1_stake_ValidatorPerformance">stake::ValidatorPerformance</a>&gt;(@aptos_framework);
+    <b>requires</b> <b>exists</b>&lt;<a href="stake.md#0x1_stake_ValidatorSet">stake::ValidatorSet</a>&gt;(@aptos_framework);
+    <b>requires</b> <b>exists</b>&lt;<a href="staking_config.md#0x1_staking_config_StakingRewardsConfig">staking_config::StakingRewardsConfig</a>&gt;(
+        @aptos_framework
+    ) || !std::features::spec_periodical_reward_rate_decrease_enabled();
+    <b>requires</b> <b>exists</b>&lt;<a href="stake.md#0x1_stake_ValidatorFees">stake::ValidatorFees</a>&gt;(@aptos_framework);
+    <b>requires</b> <b>exists</b>&lt;aptos_framework::timestamp::CurrentTimeMicroseconds&gt;(@aptos_framework);
+    <b>requires</b> <b>exists</b>&lt;<a href="stake.md#0x1_stake_AptosCoinCapabilities">stake::AptosCoinCapabilities</a>&gt;(@aptos_framework);
+}
+</code></pre>
+
+
+
+
+<a id="0x1_staking_contract_CreateStakePoolAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="staking_contract.md#0x1_staking_contract_CreateStakePoolAbortsIf">CreateStakePoolAbortsIf</a> {
+    resource_addr: <b>address</b>;
+    operator: <b>address</b>;
+    voter: <b>address</b>;
+    contract_creation_seed: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+    <b>let</b> acc = <b>global</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(resource_addr);
+    <b>aborts_if</b> <b>exists</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(resource_addr) && (len(
+        acc.signer_capability_offer.for.vec
+    ) != 0 || acc.sequence_number != 0);
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(resource_addr) && len(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs_to_bytes">bcs::to_bytes</a>(resource_addr)) != 32;
+    <b>aborts_if</b> len(<a href="account.md#0x1_account_ZERO_AUTH_KEY">account::ZERO_AUTH_KEY</a>) != 32;
+    <b>aborts_if</b> <b>exists</b>&lt;<a href="stake.md#0x1_stake_ValidatorConfig">stake::ValidatorConfig</a>&gt;(resource_addr);
+    <b>let</b> allowed = <b>global</b>&lt;<a href="stake.md#0x1_stake_AllowedValidators">stake::AllowedValidators</a>&gt;(@aptos_framework);
+    <b>aborts_if</b> <b>exists</b>&lt;<a href="stake.md#0x1_stake_AllowedValidators">stake::AllowedValidators</a>&gt;(@aptos_framework) && !contains(allowed.accounts, resource_addr);
+    <b>aborts_if</b> <b>exists</b>&lt;<a href="stake.md#0x1_stake_StakePool">stake::StakePool</a>&gt;(resource_addr);
+    <b>aborts_if</b> <b>exists</b>&lt;<a href="stake.md#0x1_stake_OwnerCapability">stake::OwnerCapability</a>&gt;(resource_addr);
+    <b>aborts_if</b> <b>exists</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(
+        resource_addr
+    ) && acc.guid_creation_num + 12 &gt;= <a href="account.md#0x1_account_MAX_GUID_CREATION_NUM">account::MAX_GUID_CREATION_NUM</a>;
+}
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/staking_proxy.md b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/staking_proxy.md
new file mode 100644
index 0000000000000..17cd7ab0c01ff
--- /dev/null
+++ b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/staking_proxy.md
@@ -0,0 +1,566 @@
+
+<a id="0x1_staking_proxy"></a>
+
+# Module `0x1::staking_proxy`
+
+
+
+-  [Function `set_operator`](#0x1_staking_proxy_set_operator)
+-  [Function `set_voter`](#0x1_staking_proxy_set_voter)
+-  [Function `set_vesting_contract_operator`](#0x1_staking_proxy_set_vesting_contract_operator)
+-  [Function `set_staking_contract_operator`](#0x1_staking_proxy_set_staking_contract_operator)
+-  [Function `set_stake_pool_operator`](#0x1_staking_proxy_set_stake_pool_operator)
+-  [Function `set_vesting_contract_voter`](#0x1_staking_proxy_set_vesting_contract_voter)
+-  [Function `set_staking_contract_voter`](#0x1_staking_proxy_set_staking_contract_voter)
+-  [Function `set_stake_pool_voter`](#0x1_staking_proxy_set_stake_pool_voter)
+-  [Specification](#@Specification_0)
+    -  [High-level Requirements](#high-level-req)
+    -  [Module-level Specification](#module-level-spec)
+    -  [Function `set_operator`](#@Specification_0_set_operator)
+    -  [Function `set_voter`](#@Specification_0_set_voter)
+    -  [Function `set_vesting_contract_operator`](#@Specification_0_set_vesting_contract_operator)
+    -  [Function `set_staking_contract_operator`](#@Specification_0_set_staking_contract_operator)
+    -  [Function `set_stake_pool_operator`](#@Specification_0_set_stake_pool_operator)
+    -  [Function `set_vesting_contract_voter`](#@Specification_0_set_vesting_contract_voter)
+    -  [Function `set_staking_contract_voter`](#@Specification_0_set_staking_contract_voter)
+    -  [Function `set_stake_pool_voter`](#@Specification_0_set_stake_pool_voter)
+
+
+<pre><code><b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">0x1::signer</a>;
+<b>use</b> <a href="stake.md#0x1_stake">0x1::stake</a>;
+<b>use</b> <a href="staking_contract.md#0x1_staking_contract">0x1::staking_contract</a>;
+<b>use</b> <a href="vesting.md#0x1_vesting">0x1::vesting</a>;
+</code></pre>
+
+
+
+<a id="0x1_staking_proxy_set_operator"></a>
+
+## Function `set_operator`
+
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="staking_proxy.md#0x1_staking_proxy_set_operator">set_operator</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, old_operator: <b>address</b>, new_operator: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="staking_proxy.md#0x1_staking_proxy_set_operator">set_operator</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, old_operator: <b>address</b>, new_operator: <b>address</b>) {
+    <a href="staking_proxy.md#0x1_staking_proxy_set_vesting_contract_operator">set_vesting_contract_operator</a>(owner, old_operator, new_operator);
+    <a href="staking_proxy.md#0x1_staking_proxy_set_staking_contract_operator">set_staking_contract_operator</a>(owner, old_operator, new_operator);
+    <a href="staking_proxy.md#0x1_staking_proxy_set_stake_pool_operator">set_stake_pool_operator</a>(owner, new_operator);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_staking_proxy_set_voter"></a>
+
+## Function `set_voter`
+
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="staking_proxy.md#0x1_staking_proxy_set_voter">set_voter</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, operator: <b>address</b>, new_voter: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="staking_proxy.md#0x1_staking_proxy_set_voter">set_voter</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, operator: <b>address</b>, new_voter: <b>address</b>) {
+    <a href="staking_proxy.md#0x1_staking_proxy_set_vesting_contract_voter">set_vesting_contract_voter</a>(owner, operator, new_voter);
+    <a href="staking_proxy.md#0x1_staking_proxy_set_staking_contract_voter">set_staking_contract_voter</a>(owner, operator, new_voter);
+    <a href="staking_proxy.md#0x1_staking_proxy_set_stake_pool_voter">set_stake_pool_voter</a>(owner, new_voter);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_staking_proxy_set_vesting_contract_operator"></a>
+
+## Function `set_vesting_contract_operator`
+
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="staking_proxy.md#0x1_staking_proxy_set_vesting_contract_operator">set_vesting_contract_operator</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, old_operator: <b>address</b>, new_operator: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="staking_proxy.md#0x1_staking_proxy_set_vesting_contract_operator">set_vesting_contract_operator</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, old_operator: <b>address</b>, new_operator: <b>address</b>) {
+    <b>let</b> owner_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(owner);
+    <b>let</b> vesting_contracts = &<a href="vesting.md#0x1_vesting_vesting_contracts">vesting::vesting_contracts</a>(owner_address);
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_for_each_ref">vector::for_each_ref</a>(vesting_contracts, |vesting_contract| {
+        <b>let</b> vesting_contract = *vesting_contract;
+        <b>if</b> (<a href="vesting.md#0x1_vesting_operator">vesting::operator</a>(vesting_contract) == old_operator) {
+            <b>let</b> current_commission_percentage = <a href="vesting.md#0x1_vesting_operator_commission_percentage">vesting::operator_commission_percentage</a>(vesting_contract);
+            <a href="vesting.md#0x1_vesting_update_operator">vesting::update_operator</a>(owner, vesting_contract, new_operator, current_commission_percentage);
+        };
+    });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_staking_proxy_set_staking_contract_operator"></a>
+
+## Function `set_staking_contract_operator`
+
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="staking_proxy.md#0x1_staking_proxy_set_staking_contract_operator">set_staking_contract_operator</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, old_operator: <b>address</b>, new_operator: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="staking_proxy.md#0x1_staking_proxy_set_staking_contract_operator">set_staking_contract_operator</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, old_operator: <b>address</b>, new_operator: <b>address</b>) {
+    <b>let</b> owner_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(owner);
+    <b>if</b> (<a href="staking_contract.md#0x1_staking_contract_staking_contract_exists">staking_contract::staking_contract_exists</a>(owner_address, old_operator)) {
+        <b>let</b> current_commission_percentage = <a href="staking_contract.md#0x1_staking_contract_commission_percentage">staking_contract::commission_percentage</a>(owner_address, old_operator);
+        <a href="staking_contract.md#0x1_staking_contract_switch_operator">staking_contract::switch_operator</a>(owner, old_operator, new_operator, current_commission_percentage);
+    };
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_staking_proxy_set_stake_pool_operator"></a>
+
+## Function `set_stake_pool_operator`
+
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="staking_proxy.md#0x1_staking_proxy_set_stake_pool_operator">set_stake_pool_operator</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, new_operator: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="staking_proxy.md#0x1_staking_proxy_set_stake_pool_operator">set_stake_pool_operator</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, new_operator: <b>address</b>) {
+    <b>let</b> owner_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(owner);
+    <b>if</b> (<a href="stake.md#0x1_stake_stake_pool_exists">stake::stake_pool_exists</a>(owner_address)) {
+        <a href="stake.md#0x1_stake_set_operator">stake::set_operator</a>(owner, new_operator);
+    };
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_staking_proxy_set_vesting_contract_voter"></a>
+
+## Function `set_vesting_contract_voter`
+
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="staking_proxy.md#0x1_staking_proxy_set_vesting_contract_voter">set_vesting_contract_voter</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, operator: <b>address</b>, new_voter: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="staking_proxy.md#0x1_staking_proxy_set_vesting_contract_voter">set_vesting_contract_voter</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, operator: <b>address</b>, new_voter: <b>address</b>) {
+    <b>let</b> owner_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(owner);
+    <b>let</b> vesting_contracts = &<a href="vesting.md#0x1_vesting_vesting_contracts">vesting::vesting_contracts</a>(owner_address);
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_for_each_ref">vector::for_each_ref</a>(vesting_contracts, |vesting_contract| {
+        <b>let</b> vesting_contract = *vesting_contract;
+        <b>if</b> (<a href="vesting.md#0x1_vesting_operator">vesting::operator</a>(vesting_contract) == operator) {
+            <a href="vesting.md#0x1_vesting_update_voter">vesting::update_voter</a>(owner, vesting_contract, new_voter);
+        };
+    });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_staking_proxy_set_staking_contract_voter"></a>
+
+## Function `set_staking_contract_voter`
+
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="staking_proxy.md#0x1_staking_proxy_set_staking_contract_voter">set_staking_contract_voter</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, operator: <b>address</b>, new_voter: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="staking_proxy.md#0x1_staking_proxy_set_staking_contract_voter">set_staking_contract_voter</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, operator: <b>address</b>, new_voter: <b>address</b>) {
+    <b>let</b> owner_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(owner);
+    <b>if</b> (<a href="staking_contract.md#0x1_staking_contract_staking_contract_exists">staking_contract::staking_contract_exists</a>(owner_address, operator)) {
+        <a href="staking_contract.md#0x1_staking_contract_update_voter">staking_contract::update_voter</a>(owner, operator, new_voter);
+    };
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_staking_proxy_set_stake_pool_voter"></a>
+
+## Function `set_stake_pool_voter`
+
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="staking_proxy.md#0x1_staking_proxy_set_stake_pool_voter">set_stake_pool_voter</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, new_voter: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="staking_proxy.md#0x1_staking_proxy_set_stake_pool_voter">set_stake_pool_voter</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, new_voter: <b>address</b>) {
+    <b>if</b> (<a href="stake.md#0x1_stake_stake_pool_exists">stake::stake_pool_exists</a>(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(owner))) {
+        <a href="stake.md#0x1_stake_set_delegated_voter">stake::set_delegated_voter</a>(owner, new_voter);
+    };
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_0"></a>
+
+## Specification
+
+
+
+
+<a id="high-level-req"></a>
+
+### High-level Requirements
+
+<table>
+<tr>
+<th>No.</th><th>Requirement</th><th>Criticality</th><th>Implementation</th><th>Enforcement</th>
+</tr>
+
+<tr>
+<td>1</td>
+<td>When updating the Vesting operator, it should be updated throughout all depending units.</td>
+<td>Medium</td>
+<td>The VestingContract contains a StakingInfo object that has an operator field, and this operator is mapped to a StakingContract object that in turn encompasses a StakePool object where the operator matches.</td>
+<td>Audited that it ensures the two operator fields hold the new value after the update.</td>
+</tr>
+
+<tr>
+<td>2</td>
+<td>When updating the Vesting voter, it should be updated throughout all depending units.</td>
+<td>Medium</td>
+<td>The VestingContract contains a StakingInfo object that has an operator field, and this operator is mapped to a StakingContract object that in turn encompasses a StakePool object where the operator matches.</td>
+<td>Audited that it ensures the two operator fields hold the new value after the update.</td>
+</tr>
+
+<tr>
+<td>3</td>
+<td>The operator and voter of a Vesting Contract should only be updated by the owner of the contract.</td>
+<td>High</td>
+<td>The owner-operator-voter model, as defined in the documentation, grants distinct abilities to each role. Therefore, it's crucial to ensure that only the owner has the authority to modify the operator or voter, to prevent the compromise of the StakePool.</td>
+<td>Audited that it ensures the signer owns the AdminStore resource and that the operator or voter intended for the update actually exists.</td>
+</tr>
+
+<tr>
+<td>4</td>
+<td>The operator and voter of a Staking Contract should only be updated by the owner of the contract.</td>
+<td>High</td>
+<td>The owner-operator-voter model, as defined in the documentation, grants distinct abilities to each role. Therefore, it's crucial to ensure that only the owner has the authority to modify the operator or voter, to prevent the compromise of the StakePool.</td>
+<td>Audited the patterns of updating operators and voters in the staking contract.</td>
+</tr>
+
+<tr>
+<td>5</td>
+<td>Staking Contract's operators should be unique inside a store.</td>
+<td>Medium</td>
+<td>Duplicates among operators could result in incorrectly updating the operator or voter associated with the incorrect StakingContract.</td>
+<td>Enforced via <a href="https://github.com/aptos-labs/aptos-core/blob/main/aptos-move/framework/aptos-framework/sources/staking_contract.move#L87">SimpleMap</a>.</td>
+</tr>
+
+</table>
+
+
+
+
+<a id="module-level-spec"></a>
+
+### Module-level Specification
+
+
+<pre><code><b>pragma</b> verify = <b>true</b>;
+<b>pragma</b> aborts_if_is_strict;
+</code></pre>
+
+
+
+<a id="@Specification_0_set_operator"></a>
+
+### Function `set_operator`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="staking_proxy.md#0x1_staking_proxy_set_operator">set_operator</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, old_operator: <b>address</b>, new_operator: <b>address</b>)
+</code></pre>
+
+
+Aborts if conditions of SetStakePoolOperator are not met
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+<b>pragma</b> aborts_if_is_partial;
+<b>include</b> <a href="staking_proxy.md#0x1_staking_proxy_SetStakePoolOperator">SetStakePoolOperator</a>;
+<b>include</b> <a href="staking_proxy.md#0x1_staking_proxy_SetStakingContractOperator">SetStakingContractOperator</a>;
+</code></pre>
+
+
+
+<a id="@Specification_0_set_voter"></a>
+
+### Function `set_voter`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="staking_proxy.md#0x1_staking_proxy_set_voter">set_voter</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, operator: <b>address</b>, new_voter: <b>address</b>)
+</code></pre>
+
+
+Aborts if conditions of SetStackingContractVoter and SetStackPoolVoterAbortsIf are not met
+
+
+<pre><code><b>pragma</b> aborts_if_is_partial;
+<b>include</b> <a href="staking_proxy.md#0x1_staking_proxy_SetStakingContractVoter">SetStakingContractVoter</a>;
+<b>include</b> <a href="staking_proxy.md#0x1_staking_proxy_SetStakePoolVoterAbortsIf">SetStakePoolVoterAbortsIf</a>;
+</code></pre>
+
+
+
+<a id="@Specification_0_set_vesting_contract_operator"></a>
+
+### Function `set_vesting_contract_operator`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="staking_proxy.md#0x1_staking_proxy_set_vesting_contract_operator">set_vesting_contract_operator</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, old_operator: <b>address</b>, new_operator: <b>address</b>)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_0_set_staking_contract_operator"></a>
+
+### Function `set_staking_contract_operator`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="staking_proxy.md#0x1_staking_proxy_set_staking_contract_operator">set_staking_contract_operator</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, old_operator: <b>address</b>, new_operator: <b>address</b>)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> aborts_if_is_partial;
+<b>pragma</b> verify = <b>false</b>;
+<b>include</b> <a href="staking_proxy.md#0x1_staking_proxy_SetStakingContractOperator">SetStakingContractOperator</a>;
+</code></pre>
+
+
+
+
+<a id="0x1_staking_proxy_SetStakingContractOperator"></a>
+
+
+<pre><code><b>schema</b> <a href="staking_proxy.md#0x1_staking_proxy_SetStakingContractOperator">SetStakingContractOperator</a> {
+    owner: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>;
+    old_operator: <b>address</b>;
+    new_operator: <b>address</b>;
+    <b>let</b> owner_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(owner);
+    <b>let</b> store = <b>global</b>&lt;Store&gt;(owner_address);
+    <b>let</b> staking_contract_exists = <b>exists</b>&lt;Store&gt;(owner_address) && <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(store.staking_contracts, old_operator);
+    <b>aborts_if</b> staking_contract_exists && <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(store.staking_contracts, new_operator);
+    <b>let</b> <b>post</b> post_store = <b>global</b>&lt;Store&gt;(owner_address);
+    <b>ensures</b> staking_contract_exists ==&gt; !<a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(post_store.staking_contracts, old_operator);
+    <b>let</b> <a href="staking_contract.md#0x1_staking_contract">staking_contract</a> = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(store.staking_contracts, old_operator);
+    <b>let</b> stake_pool = <b>global</b>&lt;<a href="stake.md#0x1_stake_StakePool">stake::StakePool</a>&gt;(<a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.pool_address);
+    <b>let</b> active = <a href="coin.md#0x1_coin_value">coin::value</a>(stake_pool.active);
+    <b>let</b> pending_active = <a href="coin.md#0x1_coin_value">coin::value</a>(stake_pool.pending_active);
+    <b>let</b> total_active_stake = active + pending_active;
+    <b>let</b> accumulated_rewards = total_active_stake - <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.principal;
+    <b>let</b> commission_amount = accumulated_rewards * <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.commission_percentage / 100;
+    <b>aborts_if</b> staking_contract_exists && !<b>exists</b>&lt;<a href="stake.md#0x1_stake_StakePool">stake::StakePool</a>&gt;(<a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.pool_address);
+    <b>ensures</b> staking_contract_exists ==&gt;
+        <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(post_store.staking_contracts, new_operator).principal == total_active_stake - commission_amount;
+    <b>let</b> pool_address = <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.owner_cap.pool_address;
+    <b>let</b> current_commission_percentage = <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.commission_percentage;
+    <b>aborts_if</b> staking_contract_exists && commission_amount != 0 && !<b>exists</b>&lt;<a href="stake.md#0x1_stake_StakePool">stake::StakePool</a>&gt;(pool_address);
+    <b>ensures</b> staking_contract_exists && commission_amount != 0 ==&gt;
+        <b>global</b>&lt;<a href="stake.md#0x1_stake_StakePool">stake::StakePool</a>&gt;(pool_address).operator_address == new_operator
+        && <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(post_store.staking_contracts, new_operator).commission_percentage == current_commission_percentage;
+    <b>ensures</b> staking_contract_exists ==&gt; <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(post_store.staking_contracts, new_operator);
+}
+</code></pre>
+
+
+
+<a id="@Specification_0_set_stake_pool_operator"></a>
+
+### Function `set_stake_pool_operator`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="staking_proxy.md#0x1_staking_proxy_set_stake_pool_operator">set_stake_pool_operator</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, new_operator: <b>address</b>)
+</code></pre>
+
+
+Aborts if stake_pool is exists and when OwnerCapability or stake_pool_exists
+One of them are not exists
+
+
+<pre><code><b>include</b> <a href="staking_proxy.md#0x1_staking_proxy_SetStakePoolOperator">SetStakePoolOperator</a>;
+</code></pre>
+
+
+
+
+<a id="0x1_staking_proxy_SetStakePoolOperator"></a>
+
+
+<pre><code><b>schema</b> <a href="staking_proxy.md#0x1_staking_proxy_SetStakePoolOperator">SetStakePoolOperator</a> {
+    owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>;
+    new_operator: <b>address</b>;
+    <b>let</b> owner_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(owner);
+    <b>let</b> ownership_cap = <b>borrow_global</b>&lt;<a href="stake.md#0x1_stake_OwnerCapability">stake::OwnerCapability</a>&gt;(owner_address);
+    <b>let</b> pool_address = ownership_cap.pool_address;
+    <b>aborts_if</b> <a href="stake.md#0x1_stake_stake_pool_exists">stake::stake_pool_exists</a>(owner_address) && !(<b>exists</b>&lt;<a href="stake.md#0x1_stake_OwnerCapability">stake::OwnerCapability</a>&gt;(owner_address) && <a href="stake.md#0x1_stake_stake_pool_exists">stake::stake_pool_exists</a>(pool_address));
+    <b>ensures</b> <a href="stake.md#0x1_stake_stake_pool_exists">stake::stake_pool_exists</a>(owner_address) ==&gt; <b>global</b>&lt;<a href="stake.md#0x1_stake_StakePool">stake::StakePool</a>&gt;(pool_address).operator_address == new_operator;
+}
+</code></pre>
+
+
+
+<a id="@Specification_0_set_vesting_contract_voter"></a>
+
+### Function `set_vesting_contract_voter`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="staking_proxy.md#0x1_staking_proxy_set_vesting_contract_voter">set_vesting_contract_voter</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, operator: <b>address</b>, new_voter: <b>address</b>)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_0_set_staking_contract_voter"></a>
+
+### Function `set_staking_contract_voter`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="staking_proxy.md#0x1_staking_proxy_set_staking_contract_voter">set_staking_contract_voter</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, operator: <b>address</b>, new_voter: <b>address</b>)
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="staking_proxy.md#0x1_staking_proxy_SetStakingContractVoter">SetStakingContractVoter</a>;
+</code></pre>
+
+
+Make sure staking_contract_exists first
+Then abort if the resource is not exist
+
+
+<a id="0x1_staking_proxy_SetStakingContractVoter"></a>
+
+
+<pre><code><b>schema</b> <a href="staking_proxy.md#0x1_staking_proxy_SetStakingContractVoter">SetStakingContractVoter</a> {
+    owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>;
+    operator: <b>address</b>;
+    new_voter: <b>address</b>;
+    <b>let</b> owner_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(owner);
+    <b>let</b> staker = owner_address;
+    <b>let</b> store = <b>global</b>&lt;Store&gt;(staker);
+    <b>let</b> staking_contract_exists = <b>exists</b>&lt;Store&gt;(staker) && <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(store.staking_contracts, operator);
+    <b>let</b> staker_address = owner_address;
+    <b>let</b> <a href="staking_contract.md#0x1_staking_contract">staking_contract</a> = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(store.staking_contracts, operator);
+    <b>let</b> pool_address = <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.pool_address;
+    <b>let</b> pool_address1 = <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.owner_cap.pool_address;
+    <b>aborts_if</b> staking_contract_exists && !<b>exists</b>&lt;<a href="stake.md#0x1_stake_StakePool">stake::StakePool</a>&gt;(pool_address);
+    <b>aborts_if</b> staking_contract_exists && !<b>exists</b>&lt;<a href="stake.md#0x1_stake_StakePool">stake::StakePool</a>&gt;(<a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.owner_cap.pool_address);
+    <b>ensures</b> staking_contract_exists ==&gt; <b>global</b>&lt;<a href="stake.md#0x1_stake_StakePool">stake::StakePool</a>&gt;(pool_address1).delegated_voter == new_voter;
+}
+</code></pre>
+
+
+
+<a id="@Specification_0_set_stake_pool_voter"></a>
+
+### Function `set_stake_pool_voter`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="staking_proxy.md#0x1_staking_proxy_set_stake_pool_voter">set_stake_pool_voter</a>(owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, new_voter: <b>address</b>)
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="staking_proxy.md#0x1_staking_proxy_SetStakePoolVoterAbortsIf">SetStakePoolVoterAbortsIf</a>;
+</code></pre>
+
+
+
+
+<a id="0x1_staking_proxy_SetStakePoolVoterAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="staking_proxy.md#0x1_staking_proxy_SetStakePoolVoterAbortsIf">SetStakePoolVoterAbortsIf</a> {
+    owner: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>;
+    new_voter: <b>address</b>;
+    <b>let</b> owner_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(owner);
+    <b>let</b> ownership_cap = <b>global</b>&lt;<a href="stake.md#0x1_stake_OwnerCapability">stake::OwnerCapability</a>&gt;(owner_address);
+    <b>let</b> pool_address = ownership_cap.pool_address;
+    <b>aborts_if</b> <a href="stake.md#0x1_stake_stake_pool_exists">stake::stake_pool_exists</a>(owner_address) && !(<b>exists</b>&lt;<a href="stake.md#0x1_stake_OwnerCapability">stake::OwnerCapability</a>&gt;(owner_address) && <a href="stake.md#0x1_stake_stake_pool_exists">stake::stake_pool_exists</a>(pool_address));
+    <b>ensures</b> <a href="stake.md#0x1_stake_stake_pool_exists">stake::stake_pool_exists</a>(owner_address) ==&gt; <b>global</b>&lt;<a href="stake.md#0x1_stake_StakePool">stake::StakePool</a>&gt;(pool_address).delegated_voter == new_voter;
+}
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/state_storage.md b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/state_storage.md
new file mode 100644
index 0000000000000..d73e08033129a
--- /dev/null
+++ b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/state_storage.md
@@ -0,0 +1,456 @@
+
+<a id="0x1_state_storage"></a>
+
+# Module `0x1::state_storage`
+
+
+
+-  [Struct `Usage`](#0x1_state_storage_Usage)
+-  [Resource `StateStorageUsage`](#0x1_state_storage_StateStorageUsage)
+-  [Resource `GasParameter`](#0x1_state_storage_GasParameter)
+-  [Constants](#@Constants_0)
+-  [Function `initialize`](#0x1_state_storage_initialize)
+-  [Function `on_new_block`](#0x1_state_storage_on_new_block)
+-  [Function `current_items_and_bytes`](#0x1_state_storage_current_items_and_bytes)
+-  [Function `get_state_storage_usage_only_at_epoch_beginning`](#0x1_state_storage_get_state_storage_usage_only_at_epoch_beginning)
+-  [Function `on_reconfig`](#0x1_state_storage_on_reconfig)
+-  [Specification](#@Specification_1)
+    -  [High-level Requirements](#high-level-req)
+    -  [Module-level Specification](#module-level-spec)
+    -  [Function `initialize`](#@Specification_1_initialize)
+    -  [Function `on_new_block`](#@Specification_1_on_new_block)
+    -  [Function `current_items_and_bytes`](#@Specification_1_current_items_and_bytes)
+    -  [Function `get_state_storage_usage_only_at_epoch_beginning`](#@Specification_1_get_state_storage_usage_only_at_epoch_beginning)
+    -  [Function `on_reconfig`](#@Specification_1_on_reconfig)
+
+
+<pre><code><b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="system_addresses.md#0x1_system_addresses">0x1::system_addresses</a>;
+</code></pre>
+
+
+
+<a id="0x1_state_storage_Usage"></a>
+
+## Struct `Usage`
+
+
+
+<pre><code><b>struct</b> <a href="state_storage.md#0x1_state_storage_Usage">Usage</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>items: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>bytes: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_state_storage_StateStorageUsage"></a>
+
+## Resource `StateStorageUsage`
+
+This is updated at the beginning of each epoch, reflecting the storage
+usage after the last txn of the previous epoch is committed.
+
+
+<pre><code><b>struct</b> <a href="state_storage.md#0x1_state_storage_StateStorageUsage">StateStorageUsage</a> <b>has</b> store, key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>epoch: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>usage: <a href="state_storage.md#0x1_state_storage_Usage">state_storage::Usage</a></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_state_storage_GasParameter"></a>
+
+## Resource `GasParameter`
+
+
+
+<pre><code><b>struct</b> <a href="state_storage.md#0x1_state_storage_GasParameter">GasParameter</a> <b>has</b> store, key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>usage: <a href="state_storage.md#0x1_state_storage_Usage">state_storage::Usage</a></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_state_storage_ESTATE_STORAGE_USAGE"></a>
+
+
+
+<pre><code><b>const</b> <a href="state_storage.md#0x1_state_storage_ESTATE_STORAGE_USAGE">ESTATE_STORAGE_USAGE</a>: u64 = 0;
+</code></pre>
+
+
+
+<a id="0x1_state_storage_initialize"></a>
+
+## Function `initialize`
+
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="state_storage.md#0x1_state_storage_initialize">initialize</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="state_storage.md#0x1_state_storage_initialize">initialize</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>) {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(aptos_framework);
+    <b>assert</b>!(
+        !<b>exists</b>&lt;<a href="state_storage.md#0x1_state_storage_StateStorageUsage">StateStorageUsage</a>&gt;(@aptos_framework),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_already_exists">error::already_exists</a>(<a href="state_storage.md#0x1_state_storage_ESTATE_STORAGE_USAGE">ESTATE_STORAGE_USAGE</a>)
+    );
+    <b>move_to</b>(aptos_framework, <a href="state_storage.md#0x1_state_storage_StateStorageUsage">StateStorageUsage</a> {
+        epoch: 0,
+        usage: <a href="state_storage.md#0x1_state_storage_Usage">Usage</a> {
+            items: 0,
+            bytes: 0,
+        }
+    });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_state_storage_on_new_block"></a>
+
+## Function `on_new_block`
+
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="state_storage.md#0x1_state_storage_on_new_block">on_new_block</a>(epoch: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="state_storage.md#0x1_state_storage_on_new_block">on_new_block</a>(epoch: u64) <b>acquires</b> <a href="state_storage.md#0x1_state_storage_StateStorageUsage">StateStorageUsage</a> {
+    <b>assert</b>!(
+        <b>exists</b>&lt;<a href="state_storage.md#0x1_state_storage_StateStorageUsage">StateStorageUsage</a>&gt;(@aptos_framework),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="state_storage.md#0x1_state_storage_ESTATE_STORAGE_USAGE">ESTATE_STORAGE_USAGE</a>)
+    );
+    <b>let</b> usage = <b>borrow_global_mut</b>&lt;<a href="state_storage.md#0x1_state_storage_StateStorageUsage">StateStorageUsage</a>&gt;(@aptos_framework);
+    <b>if</b> (epoch != usage.epoch) {
+        usage.epoch = epoch;
+        usage.usage = <a href="state_storage.md#0x1_state_storage_get_state_storage_usage_only_at_epoch_beginning">get_state_storage_usage_only_at_epoch_beginning</a>();
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_state_storage_current_items_and_bytes"></a>
+
+## Function `current_items_and_bytes`
+
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="state_storage.md#0x1_state_storage_current_items_and_bytes">current_items_and_bytes</a>(): (u64, u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="state_storage.md#0x1_state_storage_current_items_and_bytes">current_items_and_bytes</a>(): (u64, u64) <b>acquires</b> <a href="state_storage.md#0x1_state_storage_StateStorageUsage">StateStorageUsage</a> {
+    <b>assert</b>!(
+        <b>exists</b>&lt;<a href="state_storage.md#0x1_state_storage_StateStorageUsage">StateStorageUsage</a>&gt;(@aptos_framework),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="state_storage.md#0x1_state_storage_ESTATE_STORAGE_USAGE">ESTATE_STORAGE_USAGE</a>)
+    );
+    <b>let</b> usage = <b>borrow_global</b>&lt;<a href="state_storage.md#0x1_state_storage_StateStorageUsage">StateStorageUsage</a>&gt;(@aptos_framework);
+    (usage.usage.items, usage.usage.bytes)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_state_storage_get_state_storage_usage_only_at_epoch_beginning"></a>
+
+## Function `get_state_storage_usage_only_at_epoch_beginning`
+
+Warning: the result returned is based on the base state view held by the
+VM for the entire block or chunk of transactions, it's only deterministic
+if called from the first transaction of the block because the execution layer
+guarantees a fresh state view then.
+
+
+<pre><code><b>fun</b> <a href="state_storage.md#0x1_state_storage_get_state_storage_usage_only_at_epoch_beginning">get_state_storage_usage_only_at_epoch_beginning</a>(): <a href="state_storage.md#0x1_state_storage_Usage">state_storage::Usage</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="state_storage.md#0x1_state_storage_get_state_storage_usage_only_at_epoch_beginning">get_state_storage_usage_only_at_epoch_beginning</a>(): <a href="state_storage.md#0x1_state_storage_Usage">Usage</a>;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_state_storage_on_reconfig"></a>
+
+## Function `on_reconfig`
+
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="state_storage.md#0x1_state_storage_on_reconfig">on_reconfig</a>()
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="state_storage.md#0x1_state_storage_on_reconfig">on_reconfig</a>() {
+    <b>abort</b> 0
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+
+
+<a id="high-level-req"></a>
+
+### High-level Requirements
+
+<table>
+<tr>
+<th>No.</th><th>Requirement</th><th>Criticality</th><th>Implementation</th><th>Enforcement</th>
+</tr>
+
+<tr>
+<td>1</td>
+<td>Given the blockchain is in an operating state, the resources for tracking state storage usage and gas parameters must exist for the Aptos framework address.</td>
+<td>Critical</td>
+<td>The initialize function ensures only the Aptos framework address can call it.</td>
+<td>Formally verified via <a href="#high-level-req-1">module</a>.</td>
+</tr>
+
+<tr>
+<td>2</td>
+<td>During the initialization of the module, it is guaranteed that the resource for tracking state storage usage will be moved under the Aptos framework account with default initial values.</td>
+<td>Medium</td>
+<td>The resource for tracking state storage usage may only be initialized with specific values and published under the aptos_framework account.</td>
+<td>Formally verified via <a href="#high-level-req-2">initialize</a>.</td>
+</tr>
+
+<tr>
+<td>3</td>
+<td>The initialization function is only called once, during genesis.</td>
+<td>Medium</td>
+<td>The initialize function ensures StateStorageUsage does not already exist.</td>
+<td>Formally verified via <a href="#high-level-req-3">initialize</a>.</td>
+</tr>
+
+<tr>
+<td>4</td>
+<td>During the initialization of the module, it is guaranteed that the resource for tracking state storage usage will be moved under the Aptos framework account with default initial values.</td>
+<td>Medium</td>
+<td>The resource for tracking state storage usage may only be initialized with specific values and published under the aptos_framework account.</td>
+<td>Formally verified via <a href="#high-level-req-4">initialize</a>.</td>
+</tr>
+
+<tr>
+<td>5</td>
+<td>The structure for tracking state storage usage should exist for it to be updated at the beginning of each new block and for retrieving the values of structure members.</td>
+<td>Medium</td>
+<td>The functions on_new_block and current_items_and_bytes verify that the StateStorageUsage structure exists before performing any further operations.</td>
+<td>Formally Verified via <a href="#high-level-req-5.1">current_items_and_bytes</a>, <a href="#high-level-req-5.2">on_new_block</a>, and the <a href="#high-level-req-5.3">global invariant</a>.</td>
+</tr>
+
+</table>
+
+
+
+
+<a id="module-level-spec"></a>
+
+### Module-level Specification
+
+
+<pre><code><b>pragma</b> verify = <b>true</b>;
+<b>pragma</b> aborts_if_is_strict;
+// This enforces <a id="high-level-req-1" href="#high-level-req">high-level requirement 1</a> and <a id="high-level-req-5.3" href="#high-level-req">high-level requirement 5</a>:
+<b>invariant</b> [suspendable] <a href="chain_status.md#0x1_chain_status_is_operating">chain_status::is_operating</a>() ==&gt; <b>exists</b>&lt;<a href="state_storage.md#0x1_state_storage_StateStorageUsage">StateStorageUsage</a>&gt;(@aptos_framework);
+<b>invariant</b> [suspendable] <a href="chain_status.md#0x1_chain_status_is_operating">chain_status::is_operating</a>() ==&gt; <b>exists</b>&lt;<a href="state_storage.md#0x1_state_storage_GasParameter">GasParameter</a>&gt;(@aptos_framework);
+</code></pre>
+
+
+
+<a id="@Specification_1_initialize"></a>
+
+### Function `initialize`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="state_storage.md#0x1_state_storage_initialize">initialize</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+ensure caller is admin.
+aborts if StateStorageUsage already exists.
+
+
+<pre><code><b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(aptos_framework);
+// This enforces <a id="high-level-req-4" href="#high-level-req">high-level requirement 4</a>:
+<b>aborts_if</b> !<a href="system_addresses.md#0x1_system_addresses_is_aptos_framework_address">system_addresses::is_aptos_framework_address</a>(addr);
+// This enforces <a id="high-level-req-3" href="#high-level-req">high-level requirement 3</a>:
+<b>aborts_if</b> <b>exists</b>&lt;<a href="state_storage.md#0x1_state_storage_StateStorageUsage">StateStorageUsage</a>&gt;(@aptos_framework);
+<b>ensures</b> <b>exists</b>&lt;<a href="state_storage.md#0x1_state_storage_StateStorageUsage">StateStorageUsage</a>&gt;(@aptos_framework);
+<b>let</b> <b>post</b> state_usage = <b>global</b>&lt;<a href="state_storage.md#0x1_state_storage_StateStorageUsage">StateStorageUsage</a>&gt;(@aptos_framework);
+// This enforces <a id="high-level-req-2" href="#high-level-req">high-level requirement 2</a>:
+<b>ensures</b> state_usage.epoch == 0 && state_usage.usage.bytes == 0 && state_usage.usage.items == 0;
+</code></pre>
+
+
+
+<a id="@Specification_1_on_new_block"></a>
+
+### Function `on_new_block`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="state_storage.md#0x1_state_storage_on_new_block">on_new_block</a>(epoch: u64)
+</code></pre>
+
+
+
+
+<pre><code>// This enforces <a id="high-level-req-5.2" href="#high-level-req">high-level requirement 5</a>:
+<b>requires</b> <a href="chain_status.md#0x1_chain_status_is_operating">chain_status::is_operating</a>();
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> epoch == <b>global</b>&lt;<a href="state_storage.md#0x1_state_storage_StateStorageUsage">StateStorageUsage</a>&gt;(@aptos_framework).epoch;
+</code></pre>
+
+
+
+<a id="@Specification_1_current_items_and_bytes"></a>
+
+### Function `current_items_and_bytes`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="state_storage.md#0x1_state_storage_current_items_and_bytes">current_items_and_bytes</a>(): (u64, u64)
+</code></pre>
+
+
+
+
+<pre><code>// This enforces <a id="high-level-req-5.1" href="#high-level-req">high-level requirement 5</a>:
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="state_storage.md#0x1_state_storage_StateStorageUsage">StateStorageUsage</a>&gt;(@aptos_framework);
+</code></pre>
+
+
+
+<a id="@Specification_1_get_state_storage_usage_only_at_epoch_beginning"></a>
+
+### Function `get_state_storage_usage_only_at_epoch_beginning`
+
+
+<pre><code><b>fun</b> <a href="state_storage.md#0x1_state_storage_get_state_storage_usage_only_at_epoch_beginning">get_state_storage_usage_only_at_epoch_beginning</a>(): <a href="state_storage.md#0x1_state_storage_Usage">state_storage::Usage</a>
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_on_reconfig"></a>
+
+### Function `on_reconfig`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="state_storage.md#0x1_state_storage_on_reconfig">on_reconfig</a>()
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>true</b>;
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/storage_gas.md b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/storage_gas.md
new file mode 100644
index 0000000000000..1e17497c79d00
--- /dev/null
+++ b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/storage_gas.md
@@ -0,0 +1,1636 @@
+
+<a id="0x1_storage_gas"></a>
+
+# Module `0x1::storage_gas`
+
+Gas parameters for global storage.
+
+
+<a id="@General_overview_sections_0"></a>
+
+## General overview sections
+
+
+[Definitions](#definitions)
+
+* [Utilization dimensions](#utilization-dimensions)
+* [Utilization ratios](#utilization-ratios)
+* [Gas curve lookup](#gas-curve-lookup)
+* [Item-wise operations](#item-wise-operations)
+* [Byte-wise operations](#byte-wise-operations)
+
+[Function dependencies](#function-dependencies)
+
+* [Initialization](#initialization)
+* [Reconfiguration](#reconfiguration)
+* [Setting configurations](#setting-configurations)
+
+
+<a id="@Definitions_1"></a>
+
+## Definitions
+
+
+
+<a id="@Utilization_dimensions_2"></a>
+
+### Utilization dimensions
+
+
+Global storage gas fluctuates each epoch based on total utilization,
+which is defined across two dimensions:
+
+1. The number of "items" in global storage.
+2. The number of bytes in global storage.
+
+"Items" include:
+
+1. Resources having the <code>key</code> attribute, which have been moved into
+global storage via a <code><b>move_to</b>()</code> operation.
+2.  Table entries.
+
+
+<a id="@Utilization_ratios_3"></a>
+
+### Utilization ratios
+
+
+<code><a href="storage_gas.md#0x1_storage_gas_initialize">initialize</a>()</code> sets an arbitrary "target" utilization for both
+item-wise and byte-wise storage, then each epoch, gas parameters are
+reconfigured based on the "utilization ratio" for each of the two
+utilization dimensions. The utilization ratio for a given dimension,
+either item-wise or byte-wise, is taken as the quotient of actual
+utilization and target utilization. For example, given a 500 GB
+target and 250 GB actual utilization, the byte-wise utilization
+ratio is 50%.
+
+See <code><a href="storage_gas.md#0x1_storage_gas_base_8192_exponential_curve">base_8192_exponential_curve</a>()</code> for mathematical definitions.
+
+
+<a id="@Gas_curve_lookup_4"></a>
+
+### Gas curve lookup
+
+
+The utilization ratio in a given epoch is used as a lookup value in
+a Eulerian approximation to an exponential curve, known as a
+<code><a href="storage_gas.md#0x1_storage_gas_GasCurve">GasCurve</a></code>, which is defined in <code><a href="storage_gas.md#0x1_storage_gas_base_8192_exponential_curve">base_8192_exponential_curve</a>()</code>,
+based on a minimum gas charge and a maximum gas charge.
+
+The minimum gas charge and maximum gas charge at the endpoints of
+the curve are set in <code><a href="storage_gas.md#0x1_storage_gas_initialize">initialize</a>()</code>, and correspond to the following
+operations defined in <code><a href="storage_gas.md#0x1_storage_gas_StorageGas">StorageGas</a></code>:
+
+1. Per-item read
+2. Per-item create
+3. Per-item write
+4. Per-byte read
+5. Per-byte create
+6. Per-byte write
+
+For example, if the byte-wise utilization ratio is 50%, then
+per-byte reads will charge the minimum per-byte gas cost, plus
+1.09% of the difference between the maximum and the minimum cost.
+See <code><a href="storage_gas.md#0x1_storage_gas_base_8192_exponential_curve">base_8192_exponential_curve</a>()</code> for a supporting calculation.
+
+
+<a id="@Item-wise_operations_5"></a>
+
+### Item-wise operations
+
+
+1. Per-item read gas is assessed whenever an item is read from
+global storage via <code><b>borrow_global</b>&lt;T&gt;()</code> or via a table entry read
+operation.
+2. Per-item create gas is assessed whenever an item is created in
+global storage via <code><b>move_to</b>&lt;T&gt;()</code> or via a table entry creation
+operation.
+3. Per-item write gas is assessed whenever an item is overwritten in
+global storage via <code><b>borrow_global_mut</b>&lt;T&gt;</code> or via a table entry
+mutation operation.
+
+
+<a id="@Byte-wise_operations_6"></a>
+
+### Byte-wise operations
+
+
+Byte-wise operations are assessed in a manner similar to per-item
+operations, but account for the number of bytes affected by the
+given operation. Notably, this number denotes the total number of
+bytes in an *entire item*.
+
+For example, if an operation mutates a <code>u8</code> field in a resource that
+has 5 other <code>u128</code> fields, the per-byte gas write cost will account
+for $(5 * 128) / 8 + 1 = 81$ bytes. Vectors are similarly treated
+as fields.
+
+
+<a id="@Function_dependencies_7"></a>
+
+## Function dependencies
+
+
+The below dependency chart uses <code>mermaid.js</code> syntax, which can be
+automatically rendered into a diagram (depending on the browser)
+when viewing the documentation file generated from source code. If
+a browser renders the diagrams with coloring that makes it difficult
+to read, try a different browser.
+
+
+<a id="@Initialization_8"></a>
+
+### Initialization
+
+
+```mermaid
+
+flowchart LR
+
+initialize --> base_8192_exponential_curve
+base_8192_exponential_curve --> new_gas_curve
+base_8192_exponential_curve --> new_point
+new_gas_curve --> validate_points
+
+```
+
+
+<a id="@Reconfiguration_9"></a>
+
+### Reconfiguration
+
+
+```mermaid
+
+flowchart LR
+
+calculate_gas --> Interpolate %% capitalized
+calculate_read_gas --> calculate_gas
+calculate_create_gas --> calculate_gas
+calculate_write_gas --> calculate_gas
+on_reconfig --> calculate_read_gas
+on_reconfig --> calculate_create_gas
+on_reconfig --> calculate_write_gas
+reconfiguration::reconfigure --> on_reconfig
+
+```
+
+Here, the function <code><a href="storage_gas.md#0x1_storage_gas_interpolate">interpolate</a>()</code> is spelled <code>Interpolate</code> because
+<code>interpolate</code> is a reserved word in <code>mermaid.js</code>.
+
+
+<a id="@Setting_configurations_10"></a>
+
+### Setting configurations
+
+
+```mermaid
+
+flowchart LR
+
+gas_schedule::set_storage_gas_config --> set_config
+
+```
+
+
+<a id="@Complete_docgen_index_11"></a>
+
+## Complete docgen index
+
+
+The below index is automatically generated from source code:
+
+
+-  [General overview sections](#@General_overview_sections_0)
+-  [Definitions](#@Definitions_1)
+    -  [Utilization dimensions](#@Utilization_dimensions_2)
+    -  [Utilization ratios](#@Utilization_ratios_3)
+    -  [Gas curve lookup](#@Gas_curve_lookup_4)
+    -  [Item-wise operations](#@Item-wise_operations_5)
+    -  [Byte-wise operations](#@Byte-wise_operations_6)
+-  [Function dependencies](#@Function_dependencies_7)
+    -  [Initialization](#@Initialization_8)
+    -  [Reconfiguration](#@Reconfiguration_9)
+    -  [Setting configurations](#@Setting_configurations_10)
+-  [Complete docgen index](#@Complete_docgen_index_11)
+-  [Resource `StorageGas`](#0x1_storage_gas_StorageGas)
+-  [Struct `Point`](#0x1_storage_gas_Point)
+-  [Struct `UsageGasConfig`](#0x1_storage_gas_UsageGasConfig)
+-  [Struct `GasCurve`](#0x1_storage_gas_GasCurve)
+-  [Resource `StorageGasConfig`](#0x1_storage_gas_StorageGasConfig)
+-  [Constants](#@Constants_12)
+-  [Function `base_8192_exponential_curve`](#0x1_storage_gas_base_8192_exponential_curve)
+    -  [Function definition](#@Function_definition_13)
+    -  [Example](#@Example_14)
+    -  [Utilization multipliers](#@Utilization_multipliers_15)
+-  [Function `new_point`](#0x1_storage_gas_new_point)
+-  [Function `new_gas_curve`](#0x1_storage_gas_new_gas_curve)
+-  [Function `new_usage_gas_config`](#0x1_storage_gas_new_usage_gas_config)
+-  [Function `new_storage_gas_config`](#0x1_storage_gas_new_storage_gas_config)
+-  [Function `set_config`](#0x1_storage_gas_set_config)
+-  [Function `initialize`](#0x1_storage_gas_initialize)
+-  [Function `validate_points`](#0x1_storage_gas_validate_points)
+-  [Function `calculate_gas`](#0x1_storage_gas_calculate_gas)
+-  [Function `interpolate`](#0x1_storage_gas_interpolate)
+-  [Function `calculate_read_gas`](#0x1_storage_gas_calculate_read_gas)
+-  [Function `calculate_create_gas`](#0x1_storage_gas_calculate_create_gas)
+-  [Function `calculate_write_gas`](#0x1_storage_gas_calculate_write_gas)
+-  [Function `on_reconfig`](#0x1_storage_gas_on_reconfig)
+-  [Specification](#@Specification_16)
+    -  [Struct `Point`](#@Specification_16_Point)
+    -  [Struct `UsageGasConfig`](#@Specification_16_UsageGasConfig)
+    -  [High-level Requirements](#high-level-req)
+    -  [Module-level Specification](#module-level-spec)
+    -  [Struct `GasCurve`](#@Specification_16_GasCurve)
+    -  [Function `base_8192_exponential_curve`](#@Specification_16_base_8192_exponential_curve)
+    -  [Function `new_point`](#@Specification_16_new_point)
+    -  [Function `new_gas_curve`](#@Specification_16_new_gas_curve)
+    -  [Function `new_usage_gas_config`](#@Specification_16_new_usage_gas_config)
+    -  [Function `new_storage_gas_config`](#@Specification_16_new_storage_gas_config)
+    -  [Function `set_config`](#@Specification_16_set_config)
+    -  [Function `initialize`](#@Specification_16_initialize)
+    -  [Function `validate_points`](#@Specification_16_validate_points)
+    -  [Function `calculate_gas`](#@Specification_16_calculate_gas)
+    -  [Function `interpolate`](#@Specification_16_interpolate)
+    -  [Function `on_reconfig`](#@Specification_16_on_reconfig)
+
+
+<pre><code><b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="state_storage.md#0x1_state_storage">0x1::state_storage</a>;
+<b>use</b> <a href="system_addresses.md#0x1_system_addresses">0x1::system_addresses</a>;
+</code></pre>
+
+
+
+<a id="0x1_storage_gas_StorageGas"></a>
+
+## Resource `StorageGas`
+
+Storage parameters, reconfigured each epoch.
+
+Parameters are updated during reconfiguration via
+<code><a href="storage_gas.md#0x1_storage_gas_on_reconfig">on_reconfig</a>()</code>, based on storage utilization at the beginning
+of the epoch in which the reconfiguration transaction is
+executed. The gas schedule derived from these parameters will
+then be used to calculate gas for the entirety of the
+following epoch, such that the data is one epoch older than
+ideal. Notably, however, per this approach, the virtual machine
+does not need to reload gas parameters after the
+first transaction of an epoch.
+
+
+<pre><code><b>struct</b> <a href="storage_gas.md#0x1_storage_gas_StorageGas">StorageGas</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>per_item_read: u64</code>
+</dt>
+<dd>
+ Cost to read an item from global storage.
+</dd>
+<dt>
+<code>per_item_create: u64</code>
+</dt>
+<dd>
+ Cost to create an item in global storage.
+</dd>
+<dt>
+<code>per_item_write: u64</code>
+</dt>
+<dd>
+ Cost to overwrite an item in global storage.
+</dd>
+<dt>
+<code>per_byte_read: u64</code>
+</dt>
+<dd>
+ Cost to read a byte from global storage.
+</dd>
+<dt>
+<code>per_byte_create: u64</code>
+</dt>
+<dd>
+ Cost to create a byte in global storage.
+</dd>
+<dt>
+<code>per_byte_write: u64</code>
+</dt>
+<dd>
+ Cost to overwrite a byte in global storage.
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_storage_gas_Point"></a>
+
+## Struct `Point`
+
+A point in a Eulerian curve approximation, with each coordinate
+given in basis points:
+
+| Field value | Percentage |
+|-------------|------------|
+| <code>1</code>         | 00.01 %    |
+| <code>10</code>        | 00.10 %    |
+| <code>100</code>       | 01.00 %    |
+| <code>1000</code>      | 10.00 %    |
+
+
+<pre><code><b>struct</b> <a href="storage_gas.md#0x1_storage_gas_Point">Point</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>x: u64</code>
+</dt>
+<dd>
+ x-coordinate basis points, corresponding to utilization
+ ratio in <code><a href="storage_gas.md#0x1_storage_gas_base_8192_exponential_curve">base_8192_exponential_curve</a>()</code>.
+</dd>
+<dt>
+<code>y: u64</code>
+</dt>
+<dd>
+ y-coordinate basis points, corresponding to utilization
+ multiplier in <code><a href="storage_gas.md#0x1_storage_gas_base_8192_exponential_curve">base_8192_exponential_curve</a>()</code>.
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_storage_gas_UsageGasConfig"></a>
+
+## Struct `UsageGasConfig`
+
+A gas configuration for either per-item or per-byte costs.
+
+Contains a target usage amount, as well as a Eulerian
+approximation of an exponential curve for reads, creations, and
+overwrites. See <code><a href="storage_gas.md#0x1_storage_gas_StorageGasConfig">StorageGasConfig</a></code>.
+
+
+<pre><code><b>struct</b> <a href="storage_gas.md#0x1_storage_gas_UsageGasConfig">UsageGasConfig</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>target_usage: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>read_curve: <a href="storage_gas.md#0x1_storage_gas_GasCurve">storage_gas::GasCurve</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>create_curve: <a href="storage_gas.md#0x1_storage_gas_GasCurve">storage_gas::GasCurve</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>write_curve: <a href="storage_gas.md#0x1_storage_gas_GasCurve">storage_gas::GasCurve</a></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_storage_gas_GasCurve"></a>
+
+## Struct `GasCurve`
+
+Eulerian approximation of an exponential curve.
+
+Assumes the following endpoints:
+
+* $(x_0, y_0) = (0, 0)$
+* $(x_f, y_f) = (10000, 10000)$
+
+Intermediate points must satisfy:
+
+1. $x_i > x_{i - 1}$ ( $x$ is strictly increasing).
+2. $0 \leq x_i \leq 10000$ ( $x$ is between 0 and 10000).
+3. $y_i \geq y_{i - 1}$ ( $y$ is non-decreasing).
+4. $0 \leq y_i \leq 10000$ ( $y$ is between 0 and 10000).
+
+Lookup between two successive points is calculated via linear
+interpolation, e.g., as if there were a straight line between
+them.
+
+See <code><a href="storage_gas.md#0x1_storage_gas_base_8192_exponential_curve">base_8192_exponential_curve</a>()</code>.
+
+
+<pre><code><b>struct</b> <a href="storage_gas.md#0x1_storage_gas_GasCurve">GasCurve</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>min_gas: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>max_gas: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>points: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="storage_gas.md#0x1_storage_gas_Point">storage_gas::Point</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_storage_gas_StorageGasConfig"></a>
+
+## Resource `StorageGasConfig`
+
+Gas configurations for per-item and per-byte prices.
+
+
+<pre><code><b>struct</b> <a href="storage_gas.md#0x1_storage_gas_StorageGasConfig">StorageGasConfig</a> <b>has</b> <b>copy</b>, drop, key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>item_config: <a href="storage_gas.md#0x1_storage_gas_UsageGasConfig">storage_gas::UsageGasConfig</a></code>
+</dt>
+<dd>
+ Per-item gas configuration.
+</dd>
+<dt>
+<code>byte_config: <a href="storage_gas.md#0x1_storage_gas_UsageGasConfig">storage_gas::UsageGasConfig</a></code>
+</dt>
+<dd>
+ Per-byte gas configuration.
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_12"></a>
+
+## Constants
+
+
+<a id="0x1_storage_gas_MAX_U64"></a>
+
+
+
+<pre><code><b>const</b> <a href="storage_gas.md#0x1_storage_gas_MAX_U64">MAX_U64</a>: u64 = 18446744073709551615;
+</code></pre>
+
+
+
+<a id="0x1_storage_gas_BASIS_POINT_DENOMINATION"></a>
+
+
+
+<pre><code><b>const</b> <a href="storage_gas.md#0x1_storage_gas_BASIS_POINT_DENOMINATION">BASIS_POINT_DENOMINATION</a>: u64 = 10000;
+</code></pre>
+
+
+
+<a id="0x1_storage_gas_EINVALID_GAS_RANGE"></a>
+
+
+
+<pre><code><b>const</b> <a href="storage_gas.md#0x1_storage_gas_EINVALID_GAS_RANGE">EINVALID_GAS_RANGE</a>: u64 = 2;
+</code></pre>
+
+
+
+<a id="0x1_storage_gas_EINVALID_MONOTONICALLY_NON_DECREASING_CURVE"></a>
+
+
+
+<pre><code><b>const</b> <a href="storage_gas.md#0x1_storage_gas_EINVALID_MONOTONICALLY_NON_DECREASING_CURVE">EINVALID_MONOTONICALLY_NON_DECREASING_CURVE</a>: u64 = 5;
+</code></pre>
+
+
+
+<a id="0x1_storage_gas_EINVALID_POINT_RANGE"></a>
+
+
+
+<pre><code><b>const</b> <a href="storage_gas.md#0x1_storage_gas_EINVALID_POINT_RANGE">EINVALID_POINT_RANGE</a>: u64 = 6;
+</code></pre>
+
+
+
+<a id="0x1_storage_gas_ESTORAGE_GAS"></a>
+
+
+
+<pre><code><b>const</b> <a href="storage_gas.md#0x1_storage_gas_ESTORAGE_GAS">ESTORAGE_GAS</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_storage_gas_ESTORAGE_GAS_CONFIG"></a>
+
+
+
+<pre><code><b>const</b> <a href="storage_gas.md#0x1_storage_gas_ESTORAGE_GAS_CONFIG">ESTORAGE_GAS_CONFIG</a>: u64 = 0;
+</code></pre>
+
+
+
+<a id="0x1_storage_gas_ETARGET_USAGE_TOO_BIG"></a>
+
+
+
+<pre><code><b>const</b> <a href="storage_gas.md#0x1_storage_gas_ETARGET_USAGE_TOO_BIG">ETARGET_USAGE_TOO_BIG</a>: u64 = 4;
+</code></pre>
+
+
+
+<a id="0x1_storage_gas_EZERO_TARGET_USAGE"></a>
+
+
+
+<pre><code><b>const</b> <a href="storage_gas.md#0x1_storage_gas_EZERO_TARGET_USAGE">EZERO_TARGET_USAGE</a>: u64 = 3;
+</code></pre>
+
+
+
+<a id="0x1_storage_gas_base_8192_exponential_curve"></a>
+
+## Function `base_8192_exponential_curve`
+
+Default exponential curve having base 8192.
+
+
+<a id="@Function_definition_13"></a>
+
+### Function definition
+
+
+Gas price as a function of utilization ratio is defined as:
+
+$$g(u_r) = g_{min} + \frac{(b^{u_r} - 1)}{b - 1} \Delta_g$$
+
+$$g(u_r) = g_{min} + u_m \Delta_g$$
+
+| Variable                            | Description            |
+|-------------------------------------|------------------------|
+| $g_{min}$                           | <code>min_gas</code>              |
+| $g_{max}$                           | <code>max_gas</code>              |
+| $\Delta_{g} = g_{max} - g_{min}$    | Gas delta              |
+| $u$                                 | Utilization            |
+| $u_t$                               | Target utilization     |
+| $u_r = u / u_t$                     | Utilization ratio      |
+| $u_m = \frac{(b^{u_r} - 1)}{b - 1}$ | Utilization multiplier |
+| $b = 8192$                          | Exponent base          |
+
+
+<a id="@Example_14"></a>
+
+### Example
+
+
+Hence for a utilization ratio of 50% ( $u_r = 0.5$ ):
+
+$$g(0.5) = g_{min} + \frac{8192^{0.5} - 1}{8192 - 1} \Delta_g$$
+
+$$g(0.5) \approx g_{min} + 0.0109 \Delta_g$$
+
+Which means that the price above <code>min_gas</code> is approximately
+1.09% of the difference between <code>max_gas</code> and <code>min_gas</code>.
+
+
+<a id="@Utilization_multipliers_15"></a>
+
+### Utilization multipliers
+
+
+| $u_r$ | $u_m$ (approximate) |
+|-------|---------------------|
+| 10%   | 0.02%               |
+| 20%   | 0.06%               |
+| 30%   | 0.17%               |
+| 40%   | 0.44%               |
+| 50%   | 1.09%               |
+| 60%   | 2.71%               |
+| 70%   | 6.69%               |
+| 80%   | 16.48%              |
+| 90%   | 40.61%              |
+| 95%   | 63.72%              |
+| 99%   | 91.38%              |
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="storage_gas.md#0x1_storage_gas_base_8192_exponential_curve">base_8192_exponential_curve</a>(min_gas: u64, max_gas: u64): <a href="storage_gas.md#0x1_storage_gas_GasCurve">storage_gas::GasCurve</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="storage_gas.md#0x1_storage_gas_base_8192_exponential_curve">base_8192_exponential_curve</a>(min_gas: u64, max_gas: u64): <a href="storage_gas.md#0x1_storage_gas_GasCurve">GasCurve</a> {
+    <a href="storage_gas.md#0x1_storage_gas_new_gas_curve">new_gas_curve</a>(min_gas, max_gas,
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>[
+            <a href="storage_gas.md#0x1_storage_gas_new_point">new_point</a>(1000, 2),
+            <a href="storage_gas.md#0x1_storage_gas_new_point">new_point</a>(2000, 6),
+            <a href="storage_gas.md#0x1_storage_gas_new_point">new_point</a>(3000, 17),
+            <a href="storage_gas.md#0x1_storage_gas_new_point">new_point</a>(4000, 44),
+            <a href="storage_gas.md#0x1_storage_gas_new_point">new_point</a>(5000, 109),
+            <a href="storage_gas.md#0x1_storage_gas_new_point">new_point</a>(6000, 271),
+            <a href="storage_gas.md#0x1_storage_gas_new_point">new_point</a>(7000, 669),
+            <a href="storage_gas.md#0x1_storage_gas_new_point">new_point</a>(8000, 1648),
+            <a href="storage_gas.md#0x1_storage_gas_new_point">new_point</a>(9000, 4061),
+            <a href="storage_gas.md#0x1_storage_gas_new_point">new_point</a>(9500, 6372),
+            <a href="storage_gas.md#0x1_storage_gas_new_point">new_point</a>(9900, 9138),
+        ]
+    )
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_storage_gas_new_point"></a>
+
+## Function `new_point`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="storage_gas.md#0x1_storage_gas_new_point">new_point</a>(x: u64, y: u64): <a href="storage_gas.md#0x1_storage_gas_Point">storage_gas::Point</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="storage_gas.md#0x1_storage_gas_new_point">new_point</a>(x: u64, y: u64): <a href="storage_gas.md#0x1_storage_gas_Point">Point</a> {
+    <b>assert</b>!(
+        x &lt;= <a href="storage_gas.md#0x1_storage_gas_BASIS_POINT_DENOMINATION">BASIS_POINT_DENOMINATION</a> && y &lt;= <a href="storage_gas.md#0x1_storage_gas_BASIS_POINT_DENOMINATION">BASIS_POINT_DENOMINATION</a>,
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="storage_gas.md#0x1_storage_gas_EINVALID_POINT_RANGE">EINVALID_POINT_RANGE</a>)
+    );
+    <a href="storage_gas.md#0x1_storage_gas_Point">Point</a> { x, y }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_storage_gas_new_gas_curve"></a>
+
+## Function `new_gas_curve`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="storage_gas.md#0x1_storage_gas_new_gas_curve">new_gas_curve</a>(min_gas: u64, max_gas: u64, points: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="storage_gas.md#0x1_storage_gas_Point">storage_gas::Point</a>&gt;): <a href="storage_gas.md#0x1_storage_gas_GasCurve">storage_gas::GasCurve</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="storage_gas.md#0x1_storage_gas_new_gas_curve">new_gas_curve</a>(min_gas: u64, max_gas: u64, points: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="storage_gas.md#0x1_storage_gas_Point">Point</a>&gt;): <a href="storage_gas.md#0x1_storage_gas_GasCurve">GasCurve</a> {
+    <b>assert</b>!(max_gas &gt;= min_gas, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="storage_gas.md#0x1_storage_gas_EINVALID_GAS_RANGE">EINVALID_GAS_RANGE</a>));
+    <b>assert</b>!(max_gas &lt;= <a href="storage_gas.md#0x1_storage_gas_MAX_U64">MAX_U64</a> / <a href="storage_gas.md#0x1_storage_gas_BASIS_POINT_DENOMINATION">BASIS_POINT_DENOMINATION</a>, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="storage_gas.md#0x1_storage_gas_EINVALID_GAS_RANGE">EINVALID_GAS_RANGE</a>));
+    <a href="storage_gas.md#0x1_storage_gas_validate_points">validate_points</a>(&points);
+    <a href="storage_gas.md#0x1_storage_gas_GasCurve">GasCurve</a> {
+        min_gas,
+        max_gas,
+        points
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_storage_gas_new_usage_gas_config"></a>
+
+## Function `new_usage_gas_config`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="storage_gas.md#0x1_storage_gas_new_usage_gas_config">new_usage_gas_config</a>(target_usage: u64, read_curve: <a href="storage_gas.md#0x1_storage_gas_GasCurve">storage_gas::GasCurve</a>, create_curve: <a href="storage_gas.md#0x1_storage_gas_GasCurve">storage_gas::GasCurve</a>, write_curve: <a href="storage_gas.md#0x1_storage_gas_GasCurve">storage_gas::GasCurve</a>): <a href="storage_gas.md#0x1_storage_gas_UsageGasConfig">storage_gas::UsageGasConfig</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="storage_gas.md#0x1_storage_gas_new_usage_gas_config">new_usage_gas_config</a>(target_usage: u64, read_curve: <a href="storage_gas.md#0x1_storage_gas_GasCurve">GasCurve</a>, create_curve: <a href="storage_gas.md#0x1_storage_gas_GasCurve">GasCurve</a>, write_curve: <a href="storage_gas.md#0x1_storage_gas_GasCurve">GasCurve</a>): <a href="storage_gas.md#0x1_storage_gas_UsageGasConfig">UsageGasConfig</a> {
+    <b>assert</b>!(target_usage &gt; 0, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="storage_gas.md#0x1_storage_gas_EZERO_TARGET_USAGE">EZERO_TARGET_USAGE</a>));
+    <b>assert</b>!(target_usage &lt;= <a href="storage_gas.md#0x1_storage_gas_MAX_U64">MAX_U64</a> / <a href="storage_gas.md#0x1_storage_gas_BASIS_POINT_DENOMINATION">BASIS_POINT_DENOMINATION</a>, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="storage_gas.md#0x1_storage_gas_ETARGET_USAGE_TOO_BIG">ETARGET_USAGE_TOO_BIG</a>));
+    <a href="storage_gas.md#0x1_storage_gas_UsageGasConfig">UsageGasConfig</a> {
+        target_usage,
+        read_curve,
+        create_curve,
+        write_curve,
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_storage_gas_new_storage_gas_config"></a>
+
+## Function `new_storage_gas_config`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="storage_gas.md#0x1_storage_gas_new_storage_gas_config">new_storage_gas_config</a>(item_config: <a href="storage_gas.md#0x1_storage_gas_UsageGasConfig">storage_gas::UsageGasConfig</a>, byte_config: <a href="storage_gas.md#0x1_storage_gas_UsageGasConfig">storage_gas::UsageGasConfig</a>): <a href="storage_gas.md#0x1_storage_gas_StorageGasConfig">storage_gas::StorageGasConfig</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="storage_gas.md#0x1_storage_gas_new_storage_gas_config">new_storage_gas_config</a>(item_config: <a href="storage_gas.md#0x1_storage_gas_UsageGasConfig">UsageGasConfig</a>, byte_config: <a href="storage_gas.md#0x1_storage_gas_UsageGasConfig">UsageGasConfig</a>): <a href="storage_gas.md#0x1_storage_gas_StorageGasConfig">StorageGasConfig</a> {
+    <a href="storage_gas.md#0x1_storage_gas_StorageGasConfig">StorageGasConfig</a> {
+        item_config,
+        byte_config
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_storage_gas_set_config"></a>
+
+## Function `set_config`
+
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="storage_gas.md#0x1_storage_gas_set_config">set_config</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, config: <a href="storage_gas.md#0x1_storage_gas_StorageGasConfig">storage_gas::StorageGasConfig</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="storage_gas.md#0x1_storage_gas_set_config">set_config</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, config: <a href="storage_gas.md#0x1_storage_gas_StorageGasConfig">StorageGasConfig</a>) <b>acquires</b> <a href="storage_gas.md#0x1_storage_gas_StorageGasConfig">StorageGasConfig</a> {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(aptos_framework);
+    *<b>borrow_global_mut</b>&lt;<a href="storage_gas.md#0x1_storage_gas_StorageGasConfig">StorageGasConfig</a>&gt;(@aptos_framework) = config;
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_storage_gas_initialize"></a>
+
+## Function `initialize`
+
+Initialize per-item and per-byte gas prices.
+
+Target utilization is set to 2 billion items and 1 TB.
+
+<code><a href="storage_gas.md#0x1_storage_gas_GasCurve">GasCurve</a></code> endpoints are initialized as follows:
+
+| Data style | Operation | Minimum gas | Maximum gas |
+|------------|-----------|-------------|-------------|
+| Per item   | Read      | 300K        | 300K * 100  |
+| Per item   | Create    | 300k        | 300k * 100    |
+| Per item   | Write     | 300K        | 300K * 100  |
+| Per byte   | Read      | 300         | 300 * 100   |
+| Per byte   | Create    | 5K          | 5K * 100    |
+| Per byte   | Write     | 5K          | 5K * 100    |
+
+<code><a href="storage_gas.md#0x1_storage_gas_StorageGas">StorageGas</a></code> values are additionally initialized, but per
+<code><a href="storage_gas.md#0x1_storage_gas_on_reconfig">on_reconfig</a>()</code>, they will be reconfigured for each subsequent
+epoch after initialization.
+
+See <code><a href="storage_gas.md#0x1_storage_gas_base_8192_exponential_curve">base_8192_exponential_curve</a>()</code> fore more information on
+target utilization.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="storage_gas.md#0x1_storage_gas_initialize">initialize</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="storage_gas.md#0x1_storage_gas_initialize">initialize</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>) {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(aptos_framework);
+    <b>assert</b>!(
+        !<b>exists</b>&lt;<a href="storage_gas.md#0x1_storage_gas_StorageGasConfig">StorageGasConfig</a>&gt;(@aptos_framework),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_already_exists">error::already_exists</a>(<a href="storage_gas.md#0x1_storage_gas_ESTORAGE_GAS_CONFIG">ESTORAGE_GAS_CONFIG</a>)
+    );
+
+    <b>let</b> k: u64 = 1000;
+    <b>let</b> m: u64 = 1000 * 1000;
+
+    <b>let</b> item_config = <a href="storage_gas.md#0x1_storage_gas_UsageGasConfig">UsageGasConfig</a> {
+        target_usage: 2 * k * m, // 2 billion
+        read_curve: <a href="storage_gas.md#0x1_storage_gas_base_8192_exponential_curve">base_8192_exponential_curve</a>(300 * k, 300 * k * 100),
+        create_curve: <a href="storage_gas.md#0x1_storage_gas_base_8192_exponential_curve">base_8192_exponential_curve</a>(300 * k, 300 * k * 100),
+        write_curve: <a href="storage_gas.md#0x1_storage_gas_base_8192_exponential_curve">base_8192_exponential_curve</a>(300 * k, 300 * k * 100),
+    };
+    <b>let</b> byte_config = <a href="storage_gas.md#0x1_storage_gas_UsageGasConfig">UsageGasConfig</a> {
+        target_usage: 1 * m * m, // 1TB
+        read_curve: <a href="storage_gas.md#0x1_storage_gas_base_8192_exponential_curve">base_8192_exponential_curve</a>(300, 300 * 100),
+        create_curve: <a href="storage_gas.md#0x1_storage_gas_base_8192_exponential_curve">base_8192_exponential_curve</a>(5 * k,  5 * k * 100),
+        write_curve: <a href="storage_gas.md#0x1_storage_gas_base_8192_exponential_curve">base_8192_exponential_curve</a>(5 * k,  5 * k * 100),
+    };
+    <b>move_to</b>(aptos_framework, <a href="storage_gas.md#0x1_storage_gas_StorageGasConfig">StorageGasConfig</a> {
+        item_config,
+        byte_config,
+    });
+
+    <b>assert</b>!(
+        !<b>exists</b>&lt;<a href="storage_gas.md#0x1_storage_gas_StorageGas">StorageGas</a>&gt;(@aptos_framework),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_already_exists">error::already_exists</a>(<a href="storage_gas.md#0x1_storage_gas_ESTORAGE_GAS">ESTORAGE_GAS</a>)
+    );
+    <b>move_to</b>(aptos_framework, <a href="storage_gas.md#0x1_storage_gas_StorageGas">StorageGas</a> {
+        per_item_read: 300 * k,
+        per_item_create: 5 * m,
+        per_item_write: 300 * k,
+        per_byte_read: 300,
+        per_byte_create: 5 * k,
+        per_byte_write: 5 * k,
+    });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_storage_gas_validate_points"></a>
+
+## Function `validate_points`
+
+
+
+<pre><code><b>fun</b> <a href="storage_gas.md#0x1_storage_gas_validate_points">validate_points</a>(points: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="storage_gas.md#0x1_storage_gas_Point">storage_gas::Point</a>&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="storage_gas.md#0x1_storage_gas_validate_points">validate_points</a>(points: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="storage_gas.md#0x1_storage_gas_Point">Point</a>&gt;) {
+    <b>let</b> len = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(points);
+    <b>spec</b> {
+        <b>assume</b> len &lt; <a href="storage_gas.md#0x1_storage_gas_MAX_U64">MAX_U64</a>;
+    };
+    <b>let</b> i = 0;
+    <b>while</b> ({
+        <b>spec</b> {
+            <b>invariant</b> <b>forall</b> j in 0..i: {
+                <b>let</b> cur = <b>if</b> (j == 0) { <a href="storage_gas.md#0x1_storage_gas_Point">Point</a> { x: 0, y: 0 } } <b>else</b> { points[j - 1] };
+                <b>let</b> next = <b>if</b> (j == len) { <a href="storage_gas.md#0x1_storage_gas_Point">Point</a> { x: <a href="storage_gas.md#0x1_storage_gas_BASIS_POINT_DENOMINATION">BASIS_POINT_DENOMINATION</a>, y: <a href="storage_gas.md#0x1_storage_gas_BASIS_POINT_DENOMINATION">BASIS_POINT_DENOMINATION</a> } } <b>else</b> { points[j] };
+                cur.x &lt; next.x && cur.y &lt;= next.y
+            };
+        };
+        i &lt;= len
+    }) {
+        <b>let</b> cur = <b>if</b> (i == 0) { &<a href="storage_gas.md#0x1_storage_gas_Point">Point</a> { x: 0, y: 0 } } <b>else</b> { <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(points, i - 1) };
+        <b>let</b> next = <b>if</b> (i == len) { &<a href="storage_gas.md#0x1_storage_gas_Point">Point</a> { x: <a href="storage_gas.md#0x1_storage_gas_BASIS_POINT_DENOMINATION">BASIS_POINT_DENOMINATION</a>, y: <a href="storage_gas.md#0x1_storage_gas_BASIS_POINT_DENOMINATION">BASIS_POINT_DENOMINATION</a> } } <b>else</b> { <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(points, i) };
+        <b>assert</b>!(cur.x &lt; next.x && cur.y &lt;= next.y, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="storage_gas.md#0x1_storage_gas_EINVALID_MONOTONICALLY_NON_DECREASING_CURVE">EINVALID_MONOTONICALLY_NON_DECREASING_CURVE</a>));
+        i = i + 1;
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_storage_gas_calculate_gas"></a>
+
+## Function `calculate_gas`
+
+
+
+<pre><code><b>fun</b> <a href="storage_gas.md#0x1_storage_gas_calculate_gas">calculate_gas</a>(max_usage: u64, current_usage: u64, curve: &<a href="storage_gas.md#0x1_storage_gas_GasCurve">storage_gas::GasCurve</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="storage_gas.md#0x1_storage_gas_calculate_gas">calculate_gas</a>(max_usage: u64, current_usage: u64, curve: &<a href="storage_gas.md#0x1_storage_gas_GasCurve">GasCurve</a>): u64 {
+    <b>let</b> capped_current_usage = <b>if</b> (current_usage &gt; max_usage) max_usage <b>else</b> current_usage;
+    <b>let</b> points = &curve.points;
+    <b>let</b> num_points = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(points);
+    <b>let</b> current_usage_bps = capped_current_usage * <a href="storage_gas.md#0x1_storage_gas_BASIS_POINT_DENOMINATION">BASIS_POINT_DENOMINATION</a> / max_usage;
+
+    // Check the corner case that current_usage_bps drops before the first point.
+    <b>let</b> (left, right) = <b>if</b> (num_points == 0) {
+        (&<a href="storage_gas.md#0x1_storage_gas_Point">Point</a> { x: 0, y: 0 }, &<a href="storage_gas.md#0x1_storage_gas_Point">Point</a> { x: <a href="storage_gas.md#0x1_storage_gas_BASIS_POINT_DENOMINATION">BASIS_POINT_DENOMINATION</a>, y: <a href="storage_gas.md#0x1_storage_gas_BASIS_POINT_DENOMINATION">BASIS_POINT_DENOMINATION</a> })
+    } <b>else</b> <b>if</b> (current_usage_bps &lt; <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(points, 0).x) {
+        (&<a href="storage_gas.md#0x1_storage_gas_Point">Point</a> { x: 0, y: 0 }, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(points, 0))
+    } <b>else</b> <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(points, num_points - 1).x &lt;= current_usage_bps) {
+        (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(points, num_points - 1), &<a href="storage_gas.md#0x1_storage_gas_Point">Point</a> { x: <a href="storage_gas.md#0x1_storage_gas_BASIS_POINT_DENOMINATION">BASIS_POINT_DENOMINATION</a>, y: <a href="storage_gas.md#0x1_storage_gas_BASIS_POINT_DENOMINATION">BASIS_POINT_DENOMINATION</a> })
+    } <b>else</b> {
+        <b>let</b> (i, j) = (0, num_points - 2);
+        <b>while</b> ({
+            <b>spec</b> {
+                <b>invariant</b> i &lt;= j;
+                <b>invariant</b> j &lt; num_points - 1;
+                <b>invariant</b> points[i].x &lt;= current_usage_bps;
+                <b>invariant</b> current_usage_bps &lt; points[j + 1].x;
+            };
+            i &lt; j
+        }) {
+            <b>let</b> mid = j - (j - i) / 2;
+            <b>if</b> (current_usage_bps &lt; <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(points, mid).x) {
+                <b>spec</b> {
+                    // j is strictly decreasing.
+                    <b>assert</b> mid - 1 &lt; j;
+                };
+                j = mid - 1;
+            } <b>else</b> {
+                <b>spec</b> {
+                    // i is strictly increasing.
+                    <b>assert</b> i &lt; mid;
+                };
+                i = mid;
+            };
+        };
+        (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(points, i), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(points, i + 1))
+    };
+    <b>let</b> y_interpolated = <a href="storage_gas.md#0x1_storage_gas_interpolate">interpolate</a>(left.x, right.x, left.y, right.y, current_usage_bps);
+    <a href="storage_gas.md#0x1_storage_gas_interpolate">interpolate</a>(0, <a href="storage_gas.md#0x1_storage_gas_BASIS_POINT_DENOMINATION">BASIS_POINT_DENOMINATION</a>, curve.min_gas, curve.max_gas, y_interpolated)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_storage_gas_interpolate"></a>
+
+## Function `interpolate`
+
+
+
+<pre><code><b>fun</b> <a href="storage_gas.md#0x1_storage_gas_interpolate">interpolate</a>(x0: u64, x1: u64, y0: u64, y1: u64, x: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="storage_gas.md#0x1_storage_gas_interpolate">interpolate</a>(x0: u64, x1: u64, y0: u64, y1: u64, x: u64): u64 {
+    y0 + (x - x0) * (y1 - y0) / (x1 - x0)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_storage_gas_calculate_read_gas"></a>
+
+## Function `calculate_read_gas`
+
+
+
+<pre><code><b>fun</b> <a href="storage_gas.md#0x1_storage_gas_calculate_read_gas">calculate_read_gas</a>(config: &<a href="storage_gas.md#0x1_storage_gas_UsageGasConfig">storage_gas::UsageGasConfig</a>, usage: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="storage_gas.md#0x1_storage_gas_calculate_read_gas">calculate_read_gas</a>(config: &<a href="storage_gas.md#0x1_storage_gas_UsageGasConfig">UsageGasConfig</a>, usage: u64): u64 {
+    <a href="storage_gas.md#0x1_storage_gas_calculate_gas">calculate_gas</a>(config.target_usage, usage, &config.read_curve)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_storage_gas_calculate_create_gas"></a>
+
+## Function `calculate_create_gas`
+
+
+
+<pre><code><b>fun</b> <a href="storage_gas.md#0x1_storage_gas_calculate_create_gas">calculate_create_gas</a>(config: &<a href="storage_gas.md#0x1_storage_gas_UsageGasConfig">storage_gas::UsageGasConfig</a>, usage: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="storage_gas.md#0x1_storage_gas_calculate_create_gas">calculate_create_gas</a>(config: &<a href="storage_gas.md#0x1_storage_gas_UsageGasConfig">UsageGasConfig</a>, usage: u64): u64 {
+    <a href="storage_gas.md#0x1_storage_gas_calculate_gas">calculate_gas</a>(config.target_usage, usage, &config.create_curve)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_storage_gas_calculate_write_gas"></a>
+
+## Function `calculate_write_gas`
+
+
+
+<pre><code><b>fun</b> <a href="storage_gas.md#0x1_storage_gas_calculate_write_gas">calculate_write_gas</a>(config: &<a href="storage_gas.md#0x1_storage_gas_UsageGasConfig">storage_gas::UsageGasConfig</a>, usage: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="storage_gas.md#0x1_storage_gas_calculate_write_gas">calculate_write_gas</a>(config: &<a href="storage_gas.md#0x1_storage_gas_UsageGasConfig">UsageGasConfig</a>, usage: u64): u64 {
+    <a href="storage_gas.md#0x1_storage_gas_calculate_gas">calculate_gas</a>(config.target_usage, usage, &config.write_curve)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_storage_gas_on_reconfig"></a>
+
+## Function `on_reconfig`
+
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="storage_gas.md#0x1_storage_gas_on_reconfig">on_reconfig</a>()
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="storage_gas.md#0x1_storage_gas_on_reconfig">on_reconfig</a>() <b>acquires</b> <a href="storage_gas.md#0x1_storage_gas_StorageGas">StorageGas</a>, <a href="storage_gas.md#0x1_storage_gas_StorageGasConfig">StorageGasConfig</a> {
+    <b>assert</b>!(
+        <b>exists</b>&lt;<a href="storage_gas.md#0x1_storage_gas_StorageGasConfig">StorageGasConfig</a>&gt;(@aptos_framework),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="storage_gas.md#0x1_storage_gas_ESTORAGE_GAS_CONFIG">ESTORAGE_GAS_CONFIG</a>)
+    );
+    <b>assert</b>!(
+        <b>exists</b>&lt;<a href="storage_gas.md#0x1_storage_gas_StorageGas">StorageGas</a>&gt;(@aptos_framework),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="storage_gas.md#0x1_storage_gas_ESTORAGE_GAS">ESTORAGE_GAS</a>)
+    );
+    <b>let</b> (items, bytes) = <a href="state_storage.md#0x1_state_storage_current_items_and_bytes">state_storage::current_items_and_bytes</a>();
+    <b>let</b> gas_config = <b>borrow_global</b>&lt;<a href="storage_gas.md#0x1_storage_gas_StorageGasConfig">StorageGasConfig</a>&gt;(@aptos_framework);
+    <b>let</b> gas = <b>borrow_global_mut</b>&lt;<a href="storage_gas.md#0x1_storage_gas_StorageGas">StorageGas</a>&gt;(@aptos_framework);
+    gas.per_item_read = <a href="storage_gas.md#0x1_storage_gas_calculate_read_gas">calculate_read_gas</a>(&gas_config.item_config, items);
+    gas.per_item_create = <a href="storage_gas.md#0x1_storage_gas_calculate_create_gas">calculate_create_gas</a>(&gas_config.item_config, items);
+    gas.per_item_write = <a href="storage_gas.md#0x1_storage_gas_calculate_write_gas">calculate_write_gas</a>(&gas_config.item_config, items);
+    gas.per_byte_read = <a href="storage_gas.md#0x1_storage_gas_calculate_read_gas">calculate_read_gas</a>(&gas_config.byte_config, bytes);
+    gas.per_byte_create = <a href="storage_gas.md#0x1_storage_gas_calculate_create_gas">calculate_create_gas</a>(&gas_config.byte_config, bytes);
+    gas.per_byte_write = <a href="storage_gas.md#0x1_storage_gas_calculate_write_gas">calculate_write_gas</a>(&gas_config.byte_config, bytes);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_16"></a>
+
+## Specification
+
+
+
+<a id="0x1_storage_gas_spec_calculate_gas"></a>
+
+
+<pre><code><b>fun</b> <a href="storage_gas.md#0x1_storage_gas_spec_calculate_gas">spec_calculate_gas</a>(max_usage: u64, current_usage: u64, curve: <a href="storage_gas.md#0x1_storage_gas_GasCurve">GasCurve</a>): u64;
+</code></pre>
+
+
+
+
+<a id="0x1_storage_gas_NewGasCurveAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="storage_gas.md#0x1_storage_gas_NewGasCurveAbortsIf">NewGasCurveAbortsIf</a> {
+    min_gas: u64;
+    max_gas: u64;
+    <b>aborts_if</b> max_gas &lt; min_gas;
+    <b>aborts_if</b> max_gas &gt; <a href="storage_gas.md#0x1_storage_gas_MAX_U64">MAX_U64</a> / <a href="storage_gas.md#0x1_storage_gas_BASIS_POINT_DENOMINATION">BASIS_POINT_DENOMINATION</a>;
+}
+</code></pre>
+
+
+A non decreasing curve must ensure that next is greater than cur.
+
+
+<a id="0x1_storage_gas_ValidatePointsAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="storage_gas.md#0x1_storage_gas_ValidatePointsAbortsIf">ValidatePointsAbortsIf</a> {
+    points: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="storage_gas.md#0x1_storage_gas_Point">Point</a>&gt;;
+    // This enforces <a id="high-level-req-2" href="#high-level-req">high-level requirement 2</a>:
+    <b>aborts_if</b> <b>exists</b> i in 0..len(points) - 1: (
+        points[i].x &gt;= points[i + 1].x || points[i].y &gt; points[i + 1].y
+    );
+    <b>aborts_if</b> len(points) &gt; 0 && points[0].x == 0;
+    <b>aborts_if</b> len(points) &gt; 0 && points[len(points) - 1].x == <a href="storage_gas.md#0x1_storage_gas_BASIS_POINT_DENOMINATION">BASIS_POINT_DENOMINATION</a>;
+}
+</code></pre>
+
+
+
+<a id="@Specification_16_Point"></a>
+
+### Struct `Point`
+
+
+<pre><code><b>struct</b> <a href="storage_gas.md#0x1_storage_gas_Point">Point</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<dl>
+<dt>
+<code>x: u64</code>
+</dt>
+<dd>
+ x-coordinate basis points, corresponding to utilization
+ ratio in <code><a href="storage_gas.md#0x1_storage_gas_base_8192_exponential_curve">base_8192_exponential_curve</a>()</code>.
+</dd>
+<dt>
+<code>y: u64</code>
+</dt>
+<dd>
+ y-coordinate basis points, corresponding to utilization
+ multiplier in <code><a href="storage_gas.md#0x1_storage_gas_base_8192_exponential_curve">base_8192_exponential_curve</a>()</code>.
+</dd>
+</dl>
+
+
+
+<pre><code><b>invariant</b> x &lt;= <a href="storage_gas.md#0x1_storage_gas_BASIS_POINT_DENOMINATION">BASIS_POINT_DENOMINATION</a>;
+<b>invariant</b> y &lt;= <a href="storage_gas.md#0x1_storage_gas_BASIS_POINT_DENOMINATION">BASIS_POINT_DENOMINATION</a>;
+</code></pre>
+
+
+
+<a id="@Specification_16_UsageGasConfig"></a>
+
+### Struct `UsageGasConfig`
+
+
+<pre><code><b>struct</b> <a href="storage_gas.md#0x1_storage_gas_UsageGasConfig">UsageGasConfig</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<dl>
+<dt>
+<code>target_usage: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>read_curve: <a href="storage_gas.md#0x1_storage_gas_GasCurve">storage_gas::GasCurve</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>create_curve: <a href="storage_gas.md#0x1_storage_gas_GasCurve">storage_gas::GasCurve</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>write_curve: <a href="storage_gas.md#0x1_storage_gas_GasCurve">storage_gas::GasCurve</a></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+
+<pre><code><b>invariant</b> target_usage &gt; 0;
+<b>invariant</b> target_usage &lt;= <a href="storage_gas.md#0x1_storage_gas_MAX_U64">MAX_U64</a> / <a href="storage_gas.md#0x1_storage_gas_BASIS_POINT_DENOMINATION">BASIS_POINT_DENOMINATION</a>;
+</code></pre>
+
+
+
+
+
+<a id="high-level-req"></a>
+
+### High-level Requirements
+
+<table>
+<tr>
+<th>No.</th><th>Requirement</th><th>Criticality</th><th>Implementation</th><th>Enforcement</th>
+</tr>
+
+<tr>
+<td>1</td>
+<td>The module's initialization guarantees the creation of the StorageGasConfig resource with a precise configuration, including accurate gas curves for per-item and per-byte operations.</td>
+<td>Medium</td>
+<td>The initialize function is responsible for setting up the initial state of the module, ensuring the fulfillment of the following conditions: (1) the creation of the StorageGasConfig resource, indicating its existence witqhin the module's context, and (2) the configuration of the StorageGasConfig resource includes the precise gas curves that define the behavior of per-item and per-byte operations.</td>
+<td>Formally verified via <a href="#high-level-req-1">initialize</a>. Moreover, the native gas logic has been manually audited.</td>
+</tr>
+
+<tr>
+<td>2</td>
+<td>The gas curve approximates an exponential curve based on a minimum and maximum gas charge.</td>
+<td>High</td>
+<td>The validate_points function ensures that the provided vector of points represents a monotonically non-decreasing curve.</td>
+<td>Formally verified via <a href="#high-level-req-2">validate_points</a>. Moreover, the configuration logic has been manually audited.</td>
+</tr>
+
+<tr>
+<td>3</td>
+<td>The initialized gas curve structure has values set according to the provided parameters.</td>
+<td>Low</td>
+<td>The new_gas_curve function initializes the GasCurve structure with values provided as parameters.</td>
+<td>Formally verified via <a href="#high-level-req-3">new_gas_curve</a>.</td>
+</tr>
+
+<tr>
+<td>4</td>
+<td>The initialized usage gas configuration structure has values set according to the provided parameters.</td>
+<td>Low</td>
+<td>The new_usage_gas_config function initializes the UsageGasConfig structure with values provided as parameters.</td>
+<td>Formally verified via <a href="#high-level-req-4">new_usage_gas_config</a>.</td>
+</tr>
+
+</table>
+
+
+
+
+<a id="module-level-spec"></a>
+
+### Module-level Specification
+
+
+<pre><code><b>pragma</b> verify = <b>true</b>;
+<b>pragma</b> aborts_if_is_strict;
+<b>invariant</b> [suspendable] <a href="chain_status.md#0x1_chain_status_is_operating">chain_status::is_operating</a>() ==&gt; <b>exists</b>&lt;<a href="storage_gas.md#0x1_storage_gas_StorageGasConfig">StorageGasConfig</a>&gt;(@aptos_framework);
+<b>invariant</b> [suspendable] <a href="chain_status.md#0x1_chain_status_is_operating">chain_status::is_operating</a>() ==&gt; <b>exists</b>&lt;<a href="storage_gas.md#0x1_storage_gas_StorageGas">StorageGas</a>&gt;(@aptos_framework);
+</code></pre>
+
+
+
+<a id="@Specification_16_GasCurve"></a>
+
+### Struct `GasCurve`
+
+
+<pre><code><b>struct</b> <a href="storage_gas.md#0x1_storage_gas_GasCurve">GasCurve</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<dl>
+<dt>
+<code>min_gas: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>max_gas: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>points: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="storage_gas.md#0x1_storage_gas_Point">storage_gas::Point</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+Invariant 1: The minimum gas charge does not exceed the maximum gas charge.
+
+
+<pre><code><b>invariant</b> min_gas &lt;= max_gas;
+</code></pre>
+
+
+Invariant 2: The maximum gas charge is capped by MAX_U64 scaled down by the basis point denomination.
+
+
+<pre><code><b>invariant</b> max_gas &lt;= <a href="storage_gas.md#0x1_storage_gas_MAX_U64">MAX_U64</a> / <a href="storage_gas.md#0x1_storage_gas_BASIS_POINT_DENOMINATION">BASIS_POINT_DENOMINATION</a>;
+</code></pre>
+
+
+Invariant 3: The x-coordinate increases monotonically and the y-coordinate increasing strictly monotonically,
+that is, the gas-curve is a monotonically increasing function.
+
+
+<pre><code><b>invariant</b> (len(points) &gt; 0 ==&gt; points[0].x &gt; 0)
+    && (len(points) &gt; 0 ==&gt; points[len(points) - 1].x &lt; <a href="storage_gas.md#0x1_storage_gas_BASIS_POINT_DENOMINATION">BASIS_POINT_DENOMINATION</a>)
+    && (<b>forall</b> i in 0..len(points) - 1: (points[i].x &lt; points[i + 1].x && points[i].y &lt;= points[i + 1].y));
+</code></pre>
+
+
+
+<a id="@Specification_16_base_8192_exponential_curve"></a>
+
+### Function `base_8192_exponential_curve`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="storage_gas.md#0x1_storage_gas_base_8192_exponential_curve">base_8192_exponential_curve</a>(min_gas: u64, max_gas: u64): <a href="storage_gas.md#0x1_storage_gas_GasCurve">storage_gas::GasCurve</a>
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="storage_gas.md#0x1_storage_gas_NewGasCurveAbortsIf">NewGasCurveAbortsIf</a>;
+</code></pre>
+
+
+
+<a id="@Specification_16_new_point"></a>
+
+### Function `new_point`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="storage_gas.md#0x1_storage_gas_new_point">new_point</a>(x: u64, y: u64): <a href="storage_gas.md#0x1_storage_gas_Point">storage_gas::Point</a>
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> x &gt; <a href="storage_gas.md#0x1_storage_gas_BASIS_POINT_DENOMINATION">BASIS_POINT_DENOMINATION</a> || y &gt; <a href="storage_gas.md#0x1_storage_gas_BASIS_POINT_DENOMINATION">BASIS_POINT_DENOMINATION</a>;
+<b>ensures</b> result.x == x;
+<b>ensures</b> result.y == y;
+</code></pre>
+
+
+
+<a id="@Specification_16_new_gas_curve"></a>
+
+### Function `new_gas_curve`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="storage_gas.md#0x1_storage_gas_new_gas_curve">new_gas_curve</a>(min_gas: u64, max_gas: u64, points: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="storage_gas.md#0x1_storage_gas_Point">storage_gas::Point</a>&gt;): <a href="storage_gas.md#0x1_storage_gas_GasCurve">storage_gas::GasCurve</a>
+</code></pre>
+
+
+A non decreasing curve must ensure that next is greater than cur.
+
+
+<pre><code><b>pragma</b> verify_duration_estimate = 120;
+<b>include</b> <a href="storage_gas.md#0x1_storage_gas_NewGasCurveAbortsIf">NewGasCurveAbortsIf</a>;
+<b>include</b> <a href="storage_gas.md#0x1_storage_gas_ValidatePointsAbortsIf">ValidatePointsAbortsIf</a>;
+// This enforces <a id="high-level-req-3" href="#high-level-req">high-level requirement 3</a>:
+<b>ensures</b> result == <a href="storage_gas.md#0x1_storage_gas_GasCurve">GasCurve</a> {
+    min_gas,
+    max_gas,
+    points
+};
+</code></pre>
+
+
+
+<a id="@Specification_16_new_usage_gas_config"></a>
+
+### Function `new_usage_gas_config`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="storage_gas.md#0x1_storage_gas_new_usage_gas_config">new_usage_gas_config</a>(target_usage: u64, read_curve: <a href="storage_gas.md#0x1_storage_gas_GasCurve">storage_gas::GasCurve</a>, create_curve: <a href="storage_gas.md#0x1_storage_gas_GasCurve">storage_gas::GasCurve</a>, write_curve: <a href="storage_gas.md#0x1_storage_gas_GasCurve">storage_gas::GasCurve</a>): <a href="storage_gas.md#0x1_storage_gas_UsageGasConfig">storage_gas::UsageGasConfig</a>
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> target_usage == 0;
+<b>aborts_if</b> target_usage &gt; <a href="storage_gas.md#0x1_storage_gas_MAX_U64">MAX_U64</a> / <a href="storage_gas.md#0x1_storage_gas_BASIS_POINT_DENOMINATION">BASIS_POINT_DENOMINATION</a>;
+// This enforces <a id="high-level-req-4" href="#high-level-req">high-level requirement 4</a>:
+<b>ensures</b> result == <a href="storage_gas.md#0x1_storage_gas_UsageGasConfig">UsageGasConfig</a> {
+    target_usage,
+    read_curve,
+    create_curve,
+    write_curve,
+};
+</code></pre>
+
+
+
+<a id="@Specification_16_new_storage_gas_config"></a>
+
+### Function `new_storage_gas_config`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="storage_gas.md#0x1_storage_gas_new_storage_gas_config">new_storage_gas_config</a>(item_config: <a href="storage_gas.md#0x1_storage_gas_UsageGasConfig">storage_gas::UsageGasConfig</a>, byte_config: <a href="storage_gas.md#0x1_storage_gas_UsageGasConfig">storage_gas::UsageGasConfig</a>): <a href="storage_gas.md#0x1_storage_gas_StorageGasConfig">storage_gas::StorageGasConfig</a>
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result.item_config == item_config;
+<b>ensures</b> result.byte_config == byte_config;
+</code></pre>
+
+
+
+<a id="@Specification_16_set_config"></a>
+
+### Function `set_config`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="storage_gas.md#0x1_storage_gas_set_config">set_config</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, config: <a href="storage_gas.md#0x1_storage_gas_StorageGasConfig">storage_gas::StorageGasConfig</a>)
+</code></pre>
+
+
+Signer address must be @aptos_framework and StorageGasConfig exists.
+
+
+<pre><code><b>include</b> <a href="system_addresses.md#0x1_system_addresses_AbortsIfNotAptosFramework">system_addresses::AbortsIfNotAptosFramework</a>{ <a href="account.md#0x1_account">account</a>: aptos_framework };
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="storage_gas.md#0x1_storage_gas_StorageGasConfig">StorageGasConfig</a>&gt;(@aptos_framework);
+</code></pre>
+
+
+
+<a id="@Specification_16_initialize"></a>
+
+### Function `initialize`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="storage_gas.md#0x1_storage_gas_initialize">initialize</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+Signer address must be @aptos_framework.
+Address @aptos_framework does not exist StorageGasConfig and StorageGas before the function call is restricted
+and exists after the function is executed.
+
+
+<pre><code><b>include</b> <a href="system_addresses.md#0x1_system_addresses_AbortsIfNotAptosFramework">system_addresses::AbortsIfNotAptosFramework</a>{ <a href="account.md#0x1_account">account</a>: aptos_framework };
+<b>pragma</b> verify_duration_estimate = 120;
+<b>aborts_if</b> <b>exists</b>&lt;<a href="storage_gas.md#0x1_storage_gas_StorageGasConfig">StorageGasConfig</a>&gt;(@aptos_framework);
+<b>aborts_if</b> <b>exists</b>&lt;<a href="storage_gas.md#0x1_storage_gas_StorageGas">StorageGas</a>&gt;(@aptos_framework);
+// This enforces <a id="high-level-req-1" href="#high-level-req">high-level requirement 1</a>:
+<b>ensures</b> <b>exists</b>&lt;<a href="storage_gas.md#0x1_storage_gas_StorageGasConfig">StorageGasConfig</a>&gt;(@aptos_framework);
+<b>ensures</b> <b>exists</b>&lt;<a href="storage_gas.md#0x1_storage_gas_StorageGas">StorageGas</a>&gt;(@aptos_framework);
+</code></pre>
+
+
+
+<a id="@Specification_16_validate_points"></a>
+
+### Function `validate_points`
+
+
+<pre><code><b>fun</b> <a href="storage_gas.md#0x1_storage_gas_validate_points">validate_points</a>(points: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="storage_gas.md#0x1_storage_gas_Point">storage_gas::Point</a>&gt;)
+</code></pre>
+
+
+A non decreasing curve must ensure that next is greater than cur.
+
+
+<pre><code><b>pragma</b> aborts_if_is_strict = <b>false</b>;
+<b>pragma</b> verify = <b>false</b>;
+<b>pragma</b> opaque;
+<b>include</b> <a href="storage_gas.md#0x1_storage_gas_ValidatePointsAbortsIf">ValidatePointsAbortsIf</a>;
+</code></pre>
+
+
+
+<a id="@Specification_16_calculate_gas"></a>
+
+### Function `calculate_gas`
+
+
+<pre><code><b>fun</b> <a href="storage_gas.md#0x1_storage_gas_calculate_gas">calculate_gas</a>(max_usage: u64, current_usage: u64, curve: &<a href="storage_gas.md#0x1_storage_gas_GasCurve">storage_gas::GasCurve</a>): u64
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>pragma</b> verify_duration_estimate = 120;
+<b>requires</b> max_usage &gt; 0;
+<b>requires</b> max_usage &lt;= <a href="storage_gas.md#0x1_storage_gas_MAX_U64">MAX_U64</a> / <a href="storage_gas.md#0x1_storage_gas_BASIS_POINT_DENOMINATION">BASIS_POINT_DENOMINATION</a>;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> [abstract] result == <a href="storage_gas.md#0x1_storage_gas_spec_calculate_gas">spec_calculate_gas</a>(max_usage, current_usage, curve);
+</code></pre>
+
+
+
+<a id="@Specification_16_interpolate"></a>
+
+### Function `interpolate`
+
+
+<pre><code><b>fun</b> <a href="storage_gas.md#0x1_storage_gas_interpolate">interpolate</a>(x0: u64, x1: u64, y0: u64, y1: u64, x: u64): u64
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>pragma</b> intrinsic;
+<b>aborts_if</b> <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_16_on_reconfig"></a>
+
+### Function `on_reconfig`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="storage_gas.md#0x1_storage_gas_on_reconfig">on_reconfig</a>()
+</code></pre>
+
+
+Address @aptos_framework must exist StorageGasConfig and StorageGas and StateStorageUsage.
+
+
+<pre><code><b>requires</b> <a href="chain_status.md#0x1_chain_status_is_operating">chain_status::is_operating</a>();
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="storage_gas.md#0x1_storage_gas_StorageGasConfig">StorageGasConfig</a>&gt;(@aptos_framework);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="storage_gas.md#0x1_storage_gas_StorageGas">StorageGas</a>&gt;(@aptos_framework);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="state_storage.md#0x1_state_storage_StateStorageUsage">state_storage::StateStorageUsage</a>&gt;(@aptos_framework);
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/system_addresses.md b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/system_addresses.md
new file mode 100644
index 0000000000000..d17af72b2f98b
--- /dev/null
+++ b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/system_addresses.md
@@ -0,0 +1,594 @@
+
+<a id="0x1_system_addresses"></a>
+
+# Module `0x1::system_addresses`
+
+
+
+-  [Constants](#@Constants_0)
+-  [Function `assert_core_resource`](#0x1_system_addresses_assert_core_resource)
+-  [Function `assert_core_resource_address`](#0x1_system_addresses_assert_core_resource_address)
+-  [Function `is_core_resource_address`](#0x1_system_addresses_is_core_resource_address)
+-  [Function `assert_aptos_framework`](#0x1_system_addresses_assert_aptos_framework)
+-  [Function `assert_framework_reserved_address`](#0x1_system_addresses_assert_framework_reserved_address)
+-  [Function `assert_framework_reserved`](#0x1_system_addresses_assert_framework_reserved)
+-  [Function `is_framework_reserved_address`](#0x1_system_addresses_is_framework_reserved_address)
+-  [Function `is_aptos_framework_address`](#0x1_system_addresses_is_aptos_framework_address)
+-  [Function `assert_vm`](#0x1_system_addresses_assert_vm)
+-  [Function `is_vm`](#0x1_system_addresses_is_vm)
+-  [Function `is_vm_address`](#0x1_system_addresses_is_vm_address)
+-  [Function `is_reserved_address`](#0x1_system_addresses_is_reserved_address)
+-  [Specification](#@Specification_1)
+    -  [High-level Requirements](#high-level-req)
+    -  [Module-level Specification](#module-level-spec)
+    -  [Function `assert_core_resource`](#@Specification_1_assert_core_resource)
+    -  [Function `assert_core_resource_address`](#@Specification_1_assert_core_resource_address)
+    -  [Function `is_core_resource_address`](#@Specification_1_is_core_resource_address)
+    -  [Function `assert_aptos_framework`](#@Specification_1_assert_aptos_framework)
+    -  [Function `assert_framework_reserved_address`](#@Specification_1_assert_framework_reserved_address)
+    -  [Function `assert_framework_reserved`](#@Specification_1_assert_framework_reserved)
+    -  [Function `assert_vm`](#@Specification_1_assert_vm)
+
+
+<pre><code><b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">0x1::signer</a>;
+</code></pre>
+
+
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_system_addresses_ENOT_APTOS_FRAMEWORK_ADDRESS"></a>
+
+The address/account did not correspond to the core framework address
+
+
+<pre><code><b>const</b> <a href="system_addresses.md#0x1_system_addresses_ENOT_APTOS_FRAMEWORK_ADDRESS">ENOT_APTOS_FRAMEWORK_ADDRESS</a>: u64 = 3;
+</code></pre>
+
+
+
+<a id="0x1_system_addresses_ENOT_CORE_RESOURCE_ADDRESS"></a>
+
+The address/account did not correspond to the core resource address
+
+
+<pre><code><b>const</b> <a href="system_addresses.md#0x1_system_addresses_ENOT_CORE_RESOURCE_ADDRESS">ENOT_CORE_RESOURCE_ADDRESS</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_system_addresses_ENOT_FRAMEWORK_RESERVED_ADDRESS"></a>
+
+The address is not framework reserved address
+
+
+<pre><code><b>const</b> <a href="system_addresses.md#0x1_system_addresses_ENOT_FRAMEWORK_RESERVED_ADDRESS">ENOT_FRAMEWORK_RESERVED_ADDRESS</a>: u64 = 4;
+</code></pre>
+
+
+
+<a id="0x1_system_addresses_EVM"></a>
+
+The operation can only be performed by the VM
+
+
+<pre><code><b>const</b> <a href="system_addresses.md#0x1_system_addresses_EVM">EVM</a>: u64 = 2;
+</code></pre>
+
+
+
+<a id="0x1_system_addresses_assert_core_resource"></a>
+
+## Function `assert_core_resource`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="system_addresses.md#0x1_system_addresses_assert_core_resource">assert_core_resource</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="system_addresses.md#0x1_system_addresses_assert_core_resource">assert_core_resource</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>) {
+    <a href="system_addresses.md#0x1_system_addresses_assert_core_resource_address">assert_core_resource_address</a>(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>))
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_system_addresses_assert_core_resource_address"></a>
+
+## Function `assert_core_resource_address`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="system_addresses.md#0x1_system_addresses_assert_core_resource_address">assert_core_resource_address</a>(addr: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="system_addresses.md#0x1_system_addresses_assert_core_resource_address">assert_core_resource_address</a>(addr: <b>address</b>) {
+    <b>assert</b>!(<a href="system_addresses.md#0x1_system_addresses_is_core_resource_address">is_core_resource_address</a>(addr), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="system_addresses.md#0x1_system_addresses_ENOT_CORE_RESOURCE_ADDRESS">ENOT_CORE_RESOURCE_ADDRESS</a>))
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_system_addresses_is_core_resource_address"></a>
+
+## Function `is_core_resource_address`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="system_addresses.md#0x1_system_addresses_is_core_resource_address">is_core_resource_address</a>(addr: <b>address</b>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="system_addresses.md#0x1_system_addresses_is_core_resource_address">is_core_resource_address</a>(addr: <b>address</b>): bool {
+    addr == @core_resources
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_system_addresses_assert_aptos_framework"></a>
+
+## Function `assert_aptos_framework`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">assert_aptos_framework</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">assert_aptos_framework</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>) {
+    <b>assert</b>!(
+        <a href="system_addresses.md#0x1_system_addresses_is_aptos_framework_address">is_aptos_framework_address</a>(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>)),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="system_addresses.md#0x1_system_addresses_ENOT_APTOS_FRAMEWORK_ADDRESS">ENOT_APTOS_FRAMEWORK_ADDRESS</a>),
+    )
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_system_addresses_assert_framework_reserved_address"></a>
+
+## Function `assert_framework_reserved_address`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="system_addresses.md#0x1_system_addresses_assert_framework_reserved_address">assert_framework_reserved_address</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="system_addresses.md#0x1_system_addresses_assert_framework_reserved_address">assert_framework_reserved_address</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>) {
+    <a href="system_addresses.md#0x1_system_addresses_assert_framework_reserved">assert_framework_reserved</a>(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>));
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_system_addresses_assert_framework_reserved"></a>
+
+## Function `assert_framework_reserved`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="system_addresses.md#0x1_system_addresses_assert_framework_reserved">assert_framework_reserved</a>(addr: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="system_addresses.md#0x1_system_addresses_assert_framework_reserved">assert_framework_reserved</a>(addr: <b>address</b>) {
+    <b>assert</b>!(
+        <a href="system_addresses.md#0x1_system_addresses_is_framework_reserved_address">is_framework_reserved_address</a>(addr),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="system_addresses.md#0x1_system_addresses_ENOT_FRAMEWORK_RESERVED_ADDRESS">ENOT_FRAMEWORK_RESERVED_ADDRESS</a>),
+    )
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_system_addresses_is_framework_reserved_address"></a>
+
+## Function `is_framework_reserved_address`
+
+Return true if <code>addr</code> is 0x0 or under the on chain governance's control.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="system_addresses.md#0x1_system_addresses_is_framework_reserved_address">is_framework_reserved_address</a>(addr: <b>address</b>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="system_addresses.md#0x1_system_addresses_is_framework_reserved_address">is_framework_reserved_address</a>(addr: <b>address</b>): bool {
+    <a href="system_addresses.md#0x1_system_addresses_is_aptos_framework_address">is_aptos_framework_address</a>(addr) ||
+        addr == @0x2 ||
+        addr == @0x3 ||
+        addr == @0x4 ||
+        addr == @0x5 ||
+        addr == @0x6 ||
+        addr == @0x7 ||
+        addr == @0x8 ||
+        addr == @0x9 ||
+        addr == @0xa
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_system_addresses_is_aptos_framework_address"></a>
+
+## Function `is_aptos_framework_address`
+
+Return true if <code>addr</code> is 0x1.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="system_addresses.md#0x1_system_addresses_is_aptos_framework_address">is_aptos_framework_address</a>(addr: <b>address</b>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="system_addresses.md#0x1_system_addresses_is_aptos_framework_address">is_aptos_framework_address</a>(addr: <b>address</b>): bool {
+    addr == @aptos_framework
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_system_addresses_assert_vm"></a>
+
+## Function `assert_vm`
+
+Assert that the signer has the VM reserved address.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="system_addresses.md#0x1_system_addresses_assert_vm">assert_vm</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="system_addresses.md#0x1_system_addresses_assert_vm">assert_vm</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>) {
+    <b>assert</b>!(<a href="system_addresses.md#0x1_system_addresses_is_vm">is_vm</a>(<a href="account.md#0x1_account">account</a>), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="system_addresses.md#0x1_system_addresses_EVM">EVM</a>))
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_system_addresses_is_vm"></a>
+
+## Function `is_vm`
+
+Return true if <code>addr</code> is a reserved address for the VM to call system modules.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="system_addresses.md#0x1_system_addresses_is_vm">is_vm</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="system_addresses.md#0x1_system_addresses_is_vm">is_vm</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>): bool {
+    <a href="system_addresses.md#0x1_system_addresses_is_vm_address">is_vm_address</a>(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>))
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_system_addresses_is_vm_address"></a>
+
+## Function `is_vm_address`
+
+Return true if <code>addr</code> is a reserved address for the VM to call system modules.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="system_addresses.md#0x1_system_addresses_is_vm_address">is_vm_address</a>(addr: <b>address</b>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="system_addresses.md#0x1_system_addresses_is_vm_address">is_vm_address</a>(addr: <b>address</b>): bool {
+    addr == @vm_reserved
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_system_addresses_is_reserved_address"></a>
+
+## Function `is_reserved_address`
+
+Return true if <code>addr</code> is either the VM address or an Aptos Framework address.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="system_addresses.md#0x1_system_addresses_is_reserved_address">is_reserved_address</a>(addr: <b>address</b>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="system_addresses.md#0x1_system_addresses_is_reserved_address">is_reserved_address</a>(addr: <b>address</b>): bool {
+    <a href="system_addresses.md#0x1_system_addresses_is_aptos_framework_address">is_aptos_framework_address</a>(addr) || <a href="system_addresses.md#0x1_system_addresses_is_vm_address">is_vm_address</a>(addr)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+
+
+<a id="high-level-req"></a>
+
+### High-level Requirements
+
+<table>
+<tr>
+<th>No.</th><th>Requirement</th><th>Criticality</th><th>Implementation</th><th>Enforcement</th>
+</tr>
+
+<tr>
+<td>1</td>
+<td>Asserting that a provided address corresponds to the Core Resources address should always yield a true result when matched.</td>
+<td>Low</td>
+<td>The assert_core_resource and assert_core_resource_address functions ensure that the provided signer or address belong to the @core_resources account.</td>
+<td>Formally verified via <a href="#high-level-req-1">AbortsIfNotCoreResource</a>.</td>
+</tr>
+
+<tr>
+<td>2</td>
+<td>Asserting that a provided address corresponds to the Aptos Framework Resources address should always yield a true result when matched.</td>
+<td>High</td>
+<td>The assert_aptos_framework function ensures that the provided signer belongs to the @aptos_framework account.</td>
+<td>Formally verified via <a href="#high-level-req-2">AbortsIfNotAptosFramework</a>.</td>
+</tr>
+
+<tr>
+<td>3</td>
+<td>Asserting that a provided address corresponds to the VM address should always yield a true result when matched.</td>
+<td>High</td>
+<td>The assert_vm function ensure that the provided signer belongs to the @vm_reserved account.</td>
+<td>Formally verified via <a href="#high-level-req-3">AbortsIfNotVM</a>.</td>
+</tr>
+
+</table>
+
+
+
+
+<a id="module-level-spec"></a>
+
+### Module-level Specification
+
+
+<pre><code><b>pragma</b> verify = <b>true</b>;
+<b>pragma</b> aborts_if_is_strict;
+</code></pre>
+
+
+
+<a id="@Specification_1_assert_core_resource"></a>
+
+### Function `assert_core_resource`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="system_addresses.md#0x1_system_addresses_assert_core_resource">assert_core_resource</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>include</b> <a href="system_addresses.md#0x1_system_addresses_AbortsIfNotCoreResource">AbortsIfNotCoreResource</a> { addr: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>) };
+</code></pre>
+
+
+
+<a id="@Specification_1_assert_core_resource_address"></a>
+
+### Function `assert_core_resource_address`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="system_addresses.md#0x1_system_addresses_assert_core_resource_address">assert_core_resource_address</a>(addr: <b>address</b>)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>include</b> <a href="system_addresses.md#0x1_system_addresses_AbortsIfNotCoreResource">AbortsIfNotCoreResource</a>;
+</code></pre>
+
+
+
+<a id="@Specification_1_is_core_resource_address"></a>
+
+### Function `is_core_resource_address`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="system_addresses.md#0x1_system_addresses_is_core_resource_address">is_core_resource_address</a>(addr: <b>address</b>): bool
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == (addr == @core_resources);
+</code></pre>
+
+
+
+<a id="@Specification_1_assert_aptos_framework"></a>
+
+### Function `assert_aptos_framework`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">assert_aptos_framework</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>include</b> <a href="system_addresses.md#0x1_system_addresses_AbortsIfNotAptosFramework">AbortsIfNotAptosFramework</a>;
+</code></pre>
+
+
+
+<a id="@Specification_1_assert_framework_reserved_address"></a>
+
+### Function `assert_framework_reserved_address`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="system_addresses.md#0x1_system_addresses_assert_framework_reserved_address">assert_framework_reserved_address</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<a href="system_addresses.md#0x1_system_addresses_is_framework_reserved_address">is_framework_reserved_address</a>(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>));
+</code></pre>
+
+
+
+<a id="@Specification_1_assert_framework_reserved"></a>
+
+### Function `assert_framework_reserved`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="system_addresses.md#0x1_system_addresses_assert_framework_reserved">assert_framework_reserved</a>(addr: <b>address</b>)
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<a href="system_addresses.md#0x1_system_addresses_is_framework_reserved_address">is_framework_reserved_address</a>(addr);
+</code></pre>
+
+
+Specifies that a function aborts if the account does not have the aptos framework address.
+
+
+<a id="0x1_system_addresses_AbortsIfNotAptosFramework"></a>
+
+
+<pre><code><b>schema</b> <a href="system_addresses.md#0x1_system_addresses_AbortsIfNotAptosFramework">AbortsIfNotAptosFramework</a> {
+    <a href="account.md#0x1_account">account</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>;
+    // This enforces <a id="high-level-req-2" href="#high-level-req">high-level requirement 2</a>:
+    <b>aborts_if</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>) != @aptos_framework <b>with</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_PERMISSION_DENIED">error::PERMISSION_DENIED</a>;
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_assert_vm"></a>
+
+### Function `assert_vm`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="system_addresses.md#0x1_system_addresses_assert_vm">assert_vm</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>include</b> <a href="system_addresses.md#0x1_system_addresses_AbortsIfNotVM">AbortsIfNotVM</a>;
+</code></pre>
+
+
+Specifies that a function aborts if the account does not have the VM reserved address.
+
+
+<a id="0x1_system_addresses_AbortsIfNotVM"></a>
+
+
+<pre><code><b>schema</b> <a href="system_addresses.md#0x1_system_addresses_AbortsIfNotVM">AbortsIfNotVM</a> {
+    <a href="account.md#0x1_account">account</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>;
+    // This enforces <a id="high-level-req-3" href="#high-level-req">high-level requirement 3</a>:
+    <b>aborts_if</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>) != @vm_reserved <b>with</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_PERMISSION_DENIED">error::PERMISSION_DENIED</a>;
+}
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/timestamp.md b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/timestamp.md
new file mode 100644
index 0000000000000..45db531cc6b00
--- /dev/null
+++ b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/timestamp.md
@@ -0,0 +1,334 @@
+
+<a id="0x1_timestamp"></a>
+
+# Module `0x1::timestamp`
+
+This module keeps a global wall clock that stores the current Unix time in microseconds.
+It interacts with the other modules in the following ways:
+* genesis: to initialize the timestamp
+* block: to reach consensus on the global wall clock time
+
+
+-  [Resource `CurrentTimeMicroseconds`](#0x1_timestamp_CurrentTimeMicroseconds)
+-  [Constants](#@Constants_0)
+-  [Function `set_time_has_started`](#0x1_timestamp_set_time_has_started)
+-  [Function `update_global_time`](#0x1_timestamp_update_global_time)
+-  [Function `now_microseconds`](#0x1_timestamp_now_microseconds)
+-  [Function `now_seconds`](#0x1_timestamp_now_seconds)
+-  [Specification](#@Specification_1)
+    -  [High-level Requirements](#high-level-req)
+    -  [Module-level Specification](#module-level-spec)
+    -  [Function `update_global_time`](#@Specification_1_update_global_time)
+
+
+<pre><code><b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="system_addresses.md#0x1_system_addresses">0x1::system_addresses</a>;
+</code></pre>
+
+
+
+<a id="0x1_timestamp_CurrentTimeMicroseconds"></a>
+
+## Resource `CurrentTimeMicroseconds`
+
+A singleton resource holding the current Unix time in microseconds
+
+
+<pre><code><b>struct</b> <a href="timestamp.md#0x1_timestamp_CurrentTimeMicroseconds">CurrentTimeMicroseconds</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>microseconds: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_timestamp_ENOT_OPERATING"></a>
+
+The blockchain is not in an operating state yet
+
+
+<pre><code><b>const</b> <a href="timestamp.md#0x1_timestamp_ENOT_OPERATING">ENOT_OPERATING</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_timestamp_EINVALID_TIMESTAMP"></a>
+
+An invalid timestamp was provided
+
+
+<pre><code><b>const</b> <a href="timestamp.md#0x1_timestamp_EINVALID_TIMESTAMP">EINVALID_TIMESTAMP</a>: u64 = 2;
+</code></pre>
+
+
+
+<a id="0x1_timestamp_MICRO_CONVERSION_FACTOR"></a>
+
+Conversion factor between seconds and microseconds
+
+
+<pre><code><b>const</b> <a href="timestamp.md#0x1_timestamp_MICRO_CONVERSION_FACTOR">MICRO_CONVERSION_FACTOR</a>: u64 = 1000000;
+</code></pre>
+
+
+
+<a id="0x1_timestamp_set_time_has_started"></a>
+
+## Function `set_time_has_started`
+
+Marks that time has started. This can only be called from genesis and with the aptos framework account.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="timestamp.md#0x1_timestamp_set_time_has_started">set_time_has_started</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="timestamp.md#0x1_timestamp_set_time_has_started">set_time_has_started</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>) {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(aptos_framework);
+    <b>let</b> timer = <a href="timestamp.md#0x1_timestamp_CurrentTimeMicroseconds">CurrentTimeMicroseconds</a> { microseconds: 0 };
+    <b>move_to</b>(aptos_framework, timer);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_timestamp_update_global_time"></a>
+
+## Function `update_global_time`
+
+Updates the wall clock time by consensus. Requires VM privilege and will be invoked during block prologue.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="timestamp.md#0x1_timestamp_update_global_time">update_global_time</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, proposer: <b>address</b>, <a href="timestamp.md#0x1_timestamp">timestamp</a>: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="timestamp.md#0x1_timestamp_update_global_time">update_global_time</a>(
+    <a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    proposer: <b>address</b>,
+    <a href="timestamp.md#0x1_timestamp">timestamp</a>: u64
+) <b>acquires</b> <a href="timestamp.md#0x1_timestamp_CurrentTimeMicroseconds">CurrentTimeMicroseconds</a> {
+    // Can only be invoked by AptosVM <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>.
+    <a href="system_addresses.md#0x1_system_addresses_assert_vm">system_addresses::assert_vm</a>(<a href="account.md#0x1_account">account</a>);
+
+    <b>let</b> global_timer = <b>borrow_global_mut</b>&lt;<a href="timestamp.md#0x1_timestamp_CurrentTimeMicroseconds">CurrentTimeMicroseconds</a>&gt;(@aptos_framework);
+    <b>let</b> now = global_timer.microseconds;
+    <b>if</b> (proposer == @vm_reserved) {
+        // NIL <a href="block.md#0x1_block">block</a> <b>with</b> null <b>address</b> <b>as</b> proposer. Timestamp must be equal.
+        <b>assert</b>!(now == <a href="timestamp.md#0x1_timestamp">timestamp</a>, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="timestamp.md#0x1_timestamp_EINVALID_TIMESTAMP">EINVALID_TIMESTAMP</a>));
+    } <b>else</b> {
+        // Normal <a href="block.md#0x1_block">block</a>. Time must advance
+        <b>assert</b>!(now &lt; <a href="timestamp.md#0x1_timestamp">timestamp</a>, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="timestamp.md#0x1_timestamp_EINVALID_TIMESTAMP">EINVALID_TIMESTAMP</a>));
+        global_timer.microseconds = <a href="timestamp.md#0x1_timestamp">timestamp</a>;
+    };
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_timestamp_now_microseconds"></a>
+
+## Function `now_microseconds`
+
+Gets the current time in microseconds.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="timestamp.md#0x1_timestamp_now_microseconds">now_microseconds</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="timestamp.md#0x1_timestamp_now_microseconds">now_microseconds</a>(): u64 <b>acquires</b> <a href="timestamp.md#0x1_timestamp_CurrentTimeMicroseconds">CurrentTimeMicroseconds</a> {
+    <b>borrow_global</b>&lt;<a href="timestamp.md#0x1_timestamp_CurrentTimeMicroseconds">CurrentTimeMicroseconds</a>&gt;(@aptos_framework).microseconds
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_timestamp_now_seconds"></a>
+
+## Function `now_seconds`
+
+Gets the current time in seconds.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="timestamp.md#0x1_timestamp_now_seconds">now_seconds</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="timestamp.md#0x1_timestamp_now_seconds">now_seconds</a>(): u64 <b>acquires</b> <a href="timestamp.md#0x1_timestamp_CurrentTimeMicroseconds">CurrentTimeMicroseconds</a> {
+    <a href="timestamp.md#0x1_timestamp_now_microseconds">now_microseconds</a>() / <a href="timestamp.md#0x1_timestamp_MICRO_CONVERSION_FACTOR">MICRO_CONVERSION_FACTOR</a>
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+
+
+<a id="high-level-req"></a>
+
+### High-level Requirements
+
+<table>
+<tr>
+<th>No.</th><th>Requirement</th><th>Criticality</th><th>Implementation</th><th>Enforcement</th>
+</tr>
+
+<tr>
+<td>1</td>
+<td>There should only exist one global wall clock and it should be created during genesis.</td>
+<td>High</td>
+<td>The function set_time_has_started is only called by genesis::initialize and ensures that no other resources of this type exist by only assigning it to a predefined account.</td>
+<td>Formally verified via <a href="#high-level-req-1">module</a>.</td>
+</tr>
+
+<tr>
+<td>2</td>
+<td>The global wall clock resource should only be owned by the Aptos framework.</td>
+<td>High</td>
+<td>The function set_time_has_started ensures that only the aptos_framework account can possess the CurrentTimeMicroseconds resource using the assert_aptos_framework function.</td>
+<td>Formally verified via <a href="#high-level-req-2">module</a>.</td>
+</tr>
+
+<tr>
+<td>3</td>
+<td>The clock time should only be updated by the VM account.</td>
+<td>High</td>
+<td>The update_global_time function asserts that the transaction signer is the vm_reserved account.</td>
+<td>Formally verified via <a href="#high-level-req-3">UpdateGlobalTimeAbortsIf</a>.</td>
+</tr>
+
+<tr>
+<td>4</td>
+<td>The clock time should increase with every update as agreed through consensus and proposed by the current epoch's validator.</td>
+<td>High</td>
+<td>The update_global_time function asserts that the new timestamp is greater than the current timestamp.</td>
+<td>Formally verified via <a href="#high-level-req-4">UpdateGlobalTimeAbortsIf</a>.</td>
+</tr>
+
+</table>
+
+
+
+
+<a id="module-level-spec"></a>
+
+### Module-level Specification
+
+
+<pre><code>// This enforces <a id="high-level-req-1" href="#high-level-req">high-level requirement 1</a> and <a id="high-level-req-2" href="#high-level-req">high-level requirement 2</a>:
+<b>invariant</b> [suspendable] <a href="chain_status.md#0x1_chain_status_is_operating">chain_status::is_operating</a>() ==&gt; <b>exists</b>&lt;<a href="timestamp.md#0x1_timestamp_CurrentTimeMicroseconds">CurrentTimeMicroseconds</a>&gt;(@aptos_framework);
+</code></pre>
+
+
+
+<a id="@Specification_1_update_global_time"></a>
+
+### Function `update_global_time`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="timestamp.md#0x1_timestamp_update_global_time">update_global_time</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, proposer: <b>address</b>, <a href="timestamp.md#0x1_timestamp">timestamp</a>: u64)
+</code></pre>
+
+
+
+
+<pre><code><b>requires</b> <a href="chain_status.md#0x1_chain_status_is_operating">chain_status::is_operating</a>();
+<b>include</b> <a href="timestamp.md#0x1_timestamp_UpdateGlobalTimeAbortsIf">UpdateGlobalTimeAbortsIf</a>;
+<b>ensures</b> (proposer != @vm_reserved) ==&gt; (<a href="timestamp.md#0x1_timestamp_spec_now_microseconds">spec_now_microseconds</a>() == <a href="timestamp.md#0x1_timestamp">timestamp</a>);
+</code></pre>
+
+
+
+
+<a id="0x1_timestamp_UpdateGlobalTimeAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="timestamp.md#0x1_timestamp_UpdateGlobalTimeAbortsIf">UpdateGlobalTimeAbortsIf</a> {
+    <a href="account.md#0x1_account">account</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>;
+    proposer: <b>address</b>;
+    <a href="timestamp.md#0x1_timestamp">timestamp</a>: u64;
+    // This enforces <a id="high-level-req-3" href="#high-level-req">high-level requirement 3</a>:
+    <b>aborts_if</b> !<a href="system_addresses.md#0x1_system_addresses_is_vm">system_addresses::is_vm</a>(<a href="account.md#0x1_account">account</a>);
+    // This enforces <a id="high-level-req-4" href="#high-level-req">high-level requirement 4</a>:
+    <b>aborts_if</b> (proposer == @vm_reserved) && (<a href="timestamp.md#0x1_timestamp_spec_now_microseconds">spec_now_microseconds</a>() != <a href="timestamp.md#0x1_timestamp">timestamp</a>);
+    <b>aborts_if</b> (proposer != @vm_reserved) && (<a href="timestamp.md#0x1_timestamp_spec_now_microseconds">spec_now_microseconds</a>() &gt;= <a href="timestamp.md#0x1_timestamp">timestamp</a>);
+}
+</code></pre>
+
+
+
+
+<a id="0x1_timestamp_spec_now_microseconds"></a>
+
+
+<pre><code><b>fun</b> <a href="timestamp.md#0x1_timestamp_spec_now_microseconds">spec_now_microseconds</a>(): u64 {
+   <b>global</b>&lt;<a href="timestamp.md#0x1_timestamp_CurrentTimeMicroseconds">CurrentTimeMicroseconds</a>&gt;(@aptos_framework).microseconds
+}
+</code></pre>
+
+
+
+
+<a id="0x1_timestamp_spec_now_seconds"></a>
+
+
+<pre><code><b>fun</b> <a href="timestamp.md#0x1_timestamp_spec_now_seconds">spec_now_seconds</a>(): u64 {
+   <a href="timestamp.md#0x1_timestamp_spec_now_microseconds">spec_now_microseconds</a>() / <a href="timestamp.md#0x1_timestamp_MICRO_CONVERSION_FACTOR">MICRO_CONVERSION_FACTOR</a>
+}
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/transaction_context.md b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/transaction_context.md
new file mode 100644
index 0000000000000..2bdbe14562187
--- /dev/null
+++ b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/transaction_context.md
@@ -0,0 +1,1288 @@
+
+<a id="0x1_transaction_context"></a>
+
+# Module `0x1::transaction_context`
+
+
+
+-  [Struct `AUID`](#0x1_transaction_context_AUID)
+-  [Struct `EntryFunctionPayload`](#0x1_transaction_context_EntryFunctionPayload)
+-  [Struct `MultisigPayload`](#0x1_transaction_context_MultisigPayload)
+-  [Constants](#@Constants_0)
+-  [Function `get_txn_hash`](#0x1_transaction_context_get_txn_hash)
+-  [Function `get_transaction_hash`](#0x1_transaction_context_get_transaction_hash)
+-  [Function `generate_unique_address`](#0x1_transaction_context_generate_unique_address)
+-  [Function `generate_auid_address`](#0x1_transaction_context_generate_auid_address)
+-  [Function `get_script_hash`](#0x1_transaction_context_get_script_hash)
+-  [Function `generate_auid`](#0x1_transaction_context_generate_auid)
+-  [Function `auid_address`](#0x1_transaction_context_auid_address)
+-  [Function `sender`](#0x1_transaction_context_sender)
+-  [Function `sender_internal`](#0x1_transaction_context_sender_internal)
+-  [Function `secondary_signers`](#0x1_transaction_context_secondary_signers)
+-  [Function `secondary_signers_internal`](#0x1_transaction_context_secondary_signers_internal)
+-  [Function `gas_payer`](#0x1_transaction_context_gas_payer)
+-  [Function `gas_payer_internal`](#0x1_transaction_context_gas_payer_internal)
+-  [Function `max_gas_amount`](#0x1_transaction_context_max_gas_amount)
+-  [Function `max_gas_amount_internal`](#0x1_transaction_context_max_gas_amount_internal)
+-  [Function `gas_unit_price`](#0x1_transaction_context_gas_unit_price)
+-  [Function `gas_unit_price_internal`](#0x1_transaction_context_gas_unit_price_internal)
+-  [Function `chain_id`](#0x1_transaction_context_chain_id)
+-  [Function `chain_id_internal`](#0x1_transaction_context_chain_id_internal)
+-  [Function `entry_function_payload`](#0x1_transaction_context_entry_function_payload)
+-  [Function `entry_function_payload_internal`](#0x1_transaction_context_entry_function_payload_internal)
+-  [Function `account_address`](#0x1_transaction_context_account_address)
+-  [Function `module_name`](#0x1_transaction_context_module_name)
+-  [Function `function_name`](#0x1_transaction_context_function_name)
+-  [Function `type_arg_names`](#0x1_transaction_context_type_arg_names)
+-  [Function `args`](#0x1_transaction_context_args)
+-  [Function `multisig_payload`](#0x1_transaction_context_multisig_payload)
+-  [Function `multisig_payload_internal`](#0x1_transaction_context_multisig_payload_internal)
+-  [Function `multisig_address`](#0x1_transaction_context_multisig_address)
+-  [Function `inner_entry_function_payload`](#0x1_transaction_context_inner_entry_function_payload)
+-  [Specification](#@Specification_1)
+    -  [Function `get_txn_hash`](#@Specification_1_get_txn_hash)
+    -  [Function `get_transaction_hash`](#@Specification_1_get_transaction_hash)
+    -  [Function `generate_unique_address`](#@Specification_1_generate_unique_address)
+    -  [Function `generate_auid_address`](#@Specification_1_generate_auid_address)
+    -  [Function `get_script_hash`](#@Specification_1_get_script_hash)
+    -  [High-level Requirements](#high-level-req)
+    -  [Module-level Specification](#module-level-spec)
+    -  [Function `auid_address`](#@Specification_1_auid_address)
+    -  [Function `sender_internal`](#@Specification_1_sender_internal)
+    -  [Function `secondary_signers_internal`](#@Specification_1_secondary_signers_internal)
+    -  [Function `gas_payer_internal`](#@Specification_1_gas_payer_internal)
+    -  [Function `max_gas_amount_internal`](#@Specification_1_max_gas_amount_internal)
+    -  [Function `gas_unit_price_internal`](#@Specification_1_gas_unit_price_internal)
+    -  [Function `chain_id_internal`](#@Specification_1_chain_id_internal)
+    -  [Function `entry_function_payload_internal`](#@Specification_1_entry_function_payload_internal)
+    -  [Function `multisig_payload_internal`](#@Specification_1_multisig_payload_internal)
+
+
+<pre><code><b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features">0x1::features</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option">0x1::option</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string">0x1::string</a>;
+</code></pre>
+
+
+
+<a id="0x1_transaction_context_AUID"></a>
+
+## Struct `AUID`
+
+A wrapper denoting aptos unique identifer (AUID)
+for storing an address
+
+
+<pre><code><b>struct</b> <a href="transaction_context.md#0x1_transaction_context_AUID">AUID</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>unique_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_transaction_context_EntryFunctionPayload"></a>
+
+## Struct `EntryFunctionPayload`
+
+Represents the entry function payload.
+
+
+<pre><code><b>struct</b> <a href="transaction_context.md#0x1_transaction_context_EntryFunctionPayload">EntryFunctionPayload</a> <b>has</b> <b>copy</b>, drop
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>account_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>module_name: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>function_name: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>ty_args_names: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>args: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_transaction_context_MultisigPayload"></a>
+
+## Struct `MultisigPayload`
+
+Represents the multisig payload.
+
+
+<pre><code><b>struct</b> <a href="transaction_context.md#0x1_transaction_context_MultisigPayload">MultisigPayload</a> <b>has</b> <b>copy</b>, drop
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>multisig_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>entry_function_payload: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="transaction_context.md#0x1_transaction_context_EntryFunctionPayload">transaction_context::EntryFunctionPayload</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_transaction_context_ETRANSACTION_CONTEXT_EXTENSION_NOT_ENABLED"></a>
+
+The transaction context extension feature is not enabled.
+
+
+<pre><code><b>const</b> <a href="transaction_context.md#0x1_transaction_context_ETRANSACTION_CONTEXT_EXTENSION_NOT_ENABLED">ETRANSACTION_CONTEXT_EXTENSION_NOT_ENABLED</a>: u64 = 2;
+</code></pre>
+
+
+
+<a id="0x1_transaction_context_ETRANSACTION_CONTEXT_NOT_AVAILABLE"></a>
+
+Transaction context is only available in the user transaction prologue, execution, or epilogue phases.
+
+
+<pre><code><b>const</b> <a href="transaction_context.md#0x1_transaction_context_ETRANSACTION_CONTEXT_NOT_AVAILABLE">ETRANSACTION_CONTEXT_NOT_AVAILABLE</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_transaction_context_get_txn_hash"></a>
+
+## Function `get_txn_hash`
+
+Returns the transaction hash of the current transaction.
+
+
+<pre><code><b>fun</b> <a href="transaction_context.md#0x1_transaction_context_get_txn_hash">get_txn_hash</a>(): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="transaction_context.md#0x1_transaction_context_get_txn_hash">get_txn_hash</a>(): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_transaction_context_get_transaction_hash"></a>
+
+## Function `get_transaction_hash`
+
+Returns the transaction hash of the current transaction.
+Internally calls the private function <code>get_txn_hash</code>.
+This function is created for to feature gate the <code>get_txn_hash</code> function.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="transaction_context.md#0x1_transaction_context_get_transaction_hash">get_transaction_hash</a>(): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="transaction_context.md#0x1_transaction_context_get_transaction_hash">get_transaction_hash</a>(): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; {
+    <a href="transaction_context.md#0x1_transaction_context_get_txn_hash">get_txn_hash</a>()
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_transaction_context_generate_unique_address"></a>
+
+## Function `generate_unique_address`
+
+Returns a universally unique identifier (of type address) generated
+by hashing the transaction hash of this transaction and a sequence number
+specific to this transaction. This function can be called any
+number of times inside a single transaction. Each such call increments
+the sequence number and generates a new unique address.
+Uses Scheme in types/src/transaction/authenticator.rs for domain separation
+from other ways of generating unique addresses.
+
+
+<pre><code><b>fun</b> <a href="transaction_context.md#0x1_transaction_context_generate_unique_address">generate_unique_address</a>(): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="transaction_context.md#0x1_transaction_context_generate_unique_address">generate_unique_address</a>(): <b>address</b>;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_transaction_context_generate_auid_address"></a>
+
+## Function `generate_auid_address`
+
+Returns a aptos unique identifier. Internally calls
+the private function <code>generate_unique_address</code>. This function is
+created for to feature gate the <code>generate_unique_address</code> function.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="transaction_context.md#0x1_transaction_context_generate_auid_address">generate_auid_address</a>(): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="transaction_context.md#0x1_transaction_context_generate_auid_address">generate_auid_address</a>(): <b>address</b> {
+    <a href="transaction_context.md#0x1_transaction_context_generate_unique_address">generate_unique_address</a>()
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_transaction_context_get_script_hash"></a>
+
+## Function `get_script_hash`
+
+Returns the script hash of the current entry function.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="transaction_context.md#0x1_transaction_context_get_script_hash">get_script_hash</a>(): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>native</b> <b>fun</b> <a href="transaction_context.md#0x1_transaction_context_get_script_hash">get_script_hash</a>(): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_transaction_context_generate_auid"></a>
+
+## Function `generate_auid`
+
+This method runs <code>generate_unique_address</code> native function and returns
+the generated unique address wrapped in the AUID class.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="transaction_context.md#0x1_transaction_context_generate_auid">generate_auid</a>(): <a href="transaction_context.md#0x1_transaction_context_AUID">transaction_context::AUID</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="transaction_context.md#0x1_transaction_context_generate_auid">generate_auid</a>(): <a href="transaction_context.md#0x1_transaction_context_AUID">AUID</a> {
+    <b>return</b> <a href="transaction_context.md#0x1_transaction_context_AUID">AUID</a> {
+        unique_address: <a href="transaction_context.md#0x1_transaction_context_generate_unique_address">generate_unique_address</a>()
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_transaction_context_auid_address"></a>
+
+## Function `auid_address`
+
+Returns the unique address wrapped in the given AUID struct.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="transaction_context.md#0x1_transaction_context_auid_address">auid_address</a>(auid: &<a href="transaction_context.md#0x1_transaction_context_AUID">transaction_context::AUID</a>): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="transaction_context.md#0x1_transaction_context_auid_address">auid_address</a>(auid: &<a href="transaction_context.md#0x1_transaction_context_AUID">AUID</a>): <b>address</b> {
+    auid.unique_address
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_transaction_context_sender"></a>
+
+## Function `sender`
+
+Returns the sender's address for the current transaction.
+This function aborts if called outside of the transaction prologue, execution, or epilogue phases.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="transaction_context.md#0x1_transaction_context_sender">sender</a>(): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="transaction_context.md#0x1_transaction_context_sender">sender</a>(): <b>address</b> {
+    <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_transaction_context_extension_enabled">features::transaction_context_extension_enabled</a>(), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="transaction_context.md#0x1_transaction_context_ETRANSACTION_CONTEXT_EXTENSION_NOT_ENABLED">ETRANSACTION_CONTEXT_EXTENSION_NOT_ENABLED</a>));
+    <a href="transaction_context.md#0x1_transaction_context_sender_internal">sender_internal</a>()
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_transaction_context_sender_internal"></a>
+
+## Function `sender_internal`
+
+
+
+<pre><code><b>fun</b> <a href="transaction_context.md#0x1_transaction_context_sender_internal">sender_internal</a>(): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="transaction_context.md#0x1_transaction_context_sender_internal">sender_internal</a>(): <b>address</b>;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_transaction_context_secondary_signers"></a>
+
+## Function `secondary_signers`
+
+Returns the list of the secondary signers for the current transaction.
+If the current transaction has no secondary signers, this function returns an empty vector.
+This function aborts if called outside of the transaction prologue, execution, or epilogue phases.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="transaction_context.md#0x1_transaction_context_secondary_signers">secondary_signers</a>(): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="transaction_context.md#0x1_transaction_context_secondary_signers">secondary_signers</a>(): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt; {
+    <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_transaction_context_extension_enabled">features::transaction_context_extension_enabled</a>(), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="transaction_context.md#0x1_transaction_context_ETRANSACTION_CONTEXT_EXTENSION_NOT_ENABLED">ETRANSACTION_CONTEXT_EXTENSION_NOT_ENABLED</a>));
+    <a href="transaction_context.md#0x1_transaction_context_secondary_signers_internal">secondary_signers_internal</a>()
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_transaction_context_secondary_signers_internal"></a>
+
+## Function `secondary_signers_internal`
+
+
+
+<pre><code><b>fun</b> <a href="transaction_context.md#0x1_transaction_context_secondary_signers_internal">secondary_signers_internal</a>(): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="transaction_context.md#0x1_transaction_context_secondary_signers_internal">secondary_signers_internal</a>(): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_transaction_context_gas_payer"></a>
+
+## Function `gas_payer`
+
+Returns the gas payer address for the current transaction.
+It is either the sender's address if no separate gas fee payer is specified for the current transaction,
+or the address of the separate gas fee payer if one is specified.
+This function aborts if called outside of the transaction prologue, execution, or epilogue phases.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="transaction_context.md#0x1_transaction_context_gas_payer">gas_payer</a>(): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="transaction_context.md#0x1_transaction_context_gas_payer">gas_payer</a>(): <b>address</b> {
+    <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_transaction_context_extension_enabled">features::transaction_context_extension_enabled</a>(), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="transaction_context.md#0x1_transaction_context_ETRANSACTION_CONTEXT_EXTENSION_NOT_ENABLED">ETRANSACTION_CONTEXT_EXTENSION_NOT_ENABLED</a>));
+    <a href="transaction_context.md#0x1_transaction_context_gas_payer_internal">gas_payer_internal</a>()
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_transaction_context_gas_payer_internal"></a>
+
+## Function `gas_payer_internal`
+
+
+
+<pre><code><b>fun</b> <a href="transaction_context.md#0x1_transaction_context_gas_payer_internal">gas_payer_internal</a>(): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="transaction_context.md#0x1_transaction_context_gas_payer_internal">gas_payer_internal</a>(): <b>address</b>;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_transaction_context_max_gas_amount"></a>
+
+## Function `max_gas_amount`
+
+Returns the max gas amount in units which is specified for the current transaction.
+This function aborts if called outside of the transaction prologue, execution, or epilogue phases.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="transaction_context.md#0x1_transaction_context_max_gas_amount">max_gas_amount</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="transaction_context.md#0x1_transaction_context_max_gas_amount">max_gas_amount</a>(): u64 {
+    <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_transaction_context_extension_enabled">features::transaction_context_extension_enabled</a>(), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="transaction_context.md#0x1_transaction_context_ETRANSACTION_CONTEXT_EXTENSION_NOT_ENABLED">ETRANSACTION_CONTEXT_EXTENSION_NOT_ENABLED</a>));
+    <a href="transaction_context.md#0x1_transaction_context_max_gas_amount_internal">max_gas_amount_internal</a>()
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_transaction_context_max_gas_amount_internal"></a>
+
+## Function `max_gas_amount_internal`
+
+
+
+<pre><code><b>fun</b> <a href="transaction_context.md#0x1_transaction_context_max_gas_amount_internal">max_gas_amount_internal</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="transaction_context.md#0x1_transaction_context_max_gas_amount_internal">max_gas_amount_internal</a>(): u64;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_transaction_context_gas_unit_price"></a>
+
+## Function `gas_unit_price`
+
+Returns the gas unit price in Octas which is specified for the current transaction.
+This function aborts if called outside of the transaction prologue, execution, or epilogue phases.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="transaction_context.md#0x1_transaction_context_gas_unit_price">gas_unit_price</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="transaction_context.md#0x1_transaction_context_gas_unit_price">gas_unit_price</a>(): u64 {
+    <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_transaction_context_extension_enabled">features::transaction_context_extension_enabled</a>(), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="transaction_context.md#0x1_transaction_context_ETRANSACTION_CONTEXT_EXTENSION_NOT_ENABLED">ETRANSACTION_CONTEXT_EXTENSION_NOT_ENABLED</a>));
+    <a href="transaction_context.md#0x1_transaction_context_gas_unit_price_internal">gas_unit_price_internal</a>()
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_transaction_context_gas_unit_price_internal"></a>
+
+## Function `gas_unit_price_internal`
+
+
+
+<pre><code><b>fun</b> <a href="transaction_context.md#0x1_transaction_context_gas_unit_price_internal">gas_unit_price_internal</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="transaction_context.md#0x1_transaction_context_gas_unit_price_internal">gas_unit_price_internal</a>(): u64;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_transaction_context_chain_id"></a>
+
+## Function `chain_id`
+
+Returns the chain ID specified for the current transaction.
+This function aborts if called outside of the transaction prologue, execution, or epilogue phases.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="chain_id.md#0x1_chain_id">chain_id</a>(): u8
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="chain_id.md#0x1_chain_id">chain_id</a>(): u8 {
+    <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_transaction_context_extension_enabled">features::transaction_context_extension_enabled</a>(), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="transaction_context.md#0x1_transaction_context_ETRANSACTION_CONTEXT_EXTENSION_NOT_ENABLED">ETRANSACTION_CONTEXT_EXTENSION_NOT_ENABLED</a>));
+    <a href="transaction_context.md#0x1_transaction_context_chain_id_internal">chain_id_internal</a>()
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_transaction_context_chain_id_internal"></a>
+
+## Function `chain_id_internal`
+
+
+
+<pre><code><b>fun</b> <a href="transaction_context.md#0x1_transaction_context_chain_id_internal">chain_id_internal</a>(): u8
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="transaction_context.md#0x1_transaction_context_chain_id_internal">chain_id_internal</a>(): u8;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_transaction_context_entry_function_payload"></a>
+
+## Function `entry_function_payload`
+
+Returns the entry function payload if the current transaction has such a payload. Otherwise, return <code>None</code>.
+This function aborts if called outside of the transaction prologue, execution, or epilogue phases.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="transaction_context.md#0x1_transaction_context_entry_function_payload">entry_function_payload</a>(): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="transaction_context.md#0x1_transaction_context_EntryFunctionPayload">transaction_context::EntryFunctionPayload</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="transaction_context.md#0x1_transaction_context_entry_function_payload">entry_function_payload</a>(): Option&lt;<a href="transaction_context.md#0x1_transaction_context_EntryFunctionPayload">EntryFunctionPayload</a>&gt; {
+    <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_transaction_context_extension_enabled">features::transaction_context_extension_enabled</a>(), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="transaction_context.md#0x1_transaction_context_ETRANSACTION_CONTEXT_EXTENSION_NOT_ENABLED">ETRANSACTION_CONTEXT_EXTENSION_NOT_ENABLED</a>));
+    <a href="transaction_context.md#0x1_transaction_context_entry_function_payload_internal">entry_function_payload_internal</a>()
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_transaction_context_entry_function_payload_internal"></a>
+
+## Function `entry_function_payload_internal`
+
+
+
+<pre><code><b>fun</b> <a href="transaction_context.md#0x1_transaction_context_entry_function_payload_internal">entry_function_payload_internal</a>(): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="transaction_context.md#0x1_transaction_context_EntryFunctionPayload">transaction_context::EntryFunctionPayload</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="transaction_context.md#0x1_transaction_context_entry_function_payload_internal">entry_function_payload_internal</a>(): Option&lt;<a href="transaction_context.md#0x1_transaction_context_EntryFunctionPayload">EntryFunctionPayload</a>&gt;;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_transaction_context_account_address"></a>
+
+## Function `account_address`
+
+Returns the account address of the entry function payload.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="transaction_context.md#0x1_transaction_context_account_address">account_address</a>(payload: &<a href="transaction_context.md#0x1_transaction_context_EntryFunctionPayload">transaction_context::EntryFunctionPayload</a>): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="transaction_context.md#0x1_transaction_context_account_address">account_address</a>(payload: &<a href="transaction_context.md#0x1_transaction_context_EntryFunctionPayload">EntryFunctionPayload</a>): <b>address</b> {
+    <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_transaction_context_extension_enabled">features::transaction_context_extension_enabled</a>(), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="transaction_context.md#0x1_transaction_context_ETRANSACTION_CONTEXT_EXTENSION_NOT_ENABLED">ETRANSACTION_CONTEXT_EXTENSION_NOT_ENABLED</a>));
+    payload.account_address
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_transaction_context_module_name"></a>
+
+## Function `module_name`
+
+Returns the module name of the entry function payload.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="transaction_context.md#0x1_transaction_context_module_name">module_name</a>(payload: &<a href="transaction_context.md#0x1_transaction_context_EntryFunctionPayload">transaction_context::EntryFunctionPayload</a>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="transaction_context.md#0x1_transaction_context_module_name">module_name</a>(payload: &<a href="transaction_context.md#0x1_transaction_context_EntryFunctionPayload">EntryFunctionPayload</a>): String {
+    <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_transaction_context_extension_enabled">features::transaction_context_extension_enabled</a>(), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="transaction_context.md#0x1_transaction_context_ETRANSACTION_CONTEXT_EXTENSION_NOT_ENABLED">ETRANSACTION_CONTEXT_EXTENSION_NOT_ENABLED</a>));
+    payload.module_name
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_transaction_context_function_name"></a>
+
+## Function `function_name`
+
+Returns the function name of the entry function payload.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="transaction_context.md#0x1_transaction_context_function_name">function_name</a>(payload: &<a href="transaction_context.md#0x1_transaction_context_EntryFunctionPayload">transaction_context::EntryFunctionPayload</a>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="transaction_context.md#0x1_transaction_context_function_name">function_name</a>(payload: &<a href="transaction_context.md#0x1_transaction_context_EntryFunctionPayload">EntryFunctionPayload</a>): String {
+    <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_transaction_context_extension_enabled">features::transaction_context_extension_enabled</a>(), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="transaction_context.md#0x1_transaction_context_ETRANSACTION_CONTEXT_EXTENSION_NOT_ENABLED">ETRANSACTION_CONTEXT_EXTENSION_NOT_ENABLED</a>));
+    payload.function_name
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_transaction_context_type_arg_names"></a>
+
+## Function `type_arg_names`
+
+Returns the type arguments names of the entry function payload.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="transaction_context.md#0x1_transaction_context_type_arg_names">type_arg_names</a>(payload: &<a href="transaction_context.md#0x1_transaction_context_EntryFunctionPayload">transaction_context::EntryFunctionPayload</a>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="transaction_context.md#0x1_transaction_context_type_arg_names">type_arg_names</a>(payload: &<a href="transaction_context.md#0x1_transaction_context_EntryFunctionPayload">EntryFunctionPayload</a>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;String&gt; {
+    <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_transaction_context_extension_enabled">features::transaction_context_extension_enabled</a>(), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="transaction_context.md#0x1_transaction_context_ETRANSACTION_CONTEXT_EXTENSION_NOT_ENABLED">ETRANSACTION_CONTEXT_EXTENSION_NOT_ENABLED</a>));
+    payload.ty_args_names
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_transaction_context_args"></a>
+
+## Function `args`
+
+Returns the arguments of the entry function payload.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="transaction_context.md#0x1_transaction_context_args">args</a>(payload: &<a href="transaction_context.md#0x1_transaction_context_EntryFunctionPayload">transaction_context::EntryFunctionPayload</a>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="transaction_context.md#0x1_transaction_context_args">args</a>(payload: &<a href="transaction_context.md#0x1_transaction_context_EntryFunctionPayload">EntryFunctionPayload</a>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt; {
+    <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_transaction_context_extension_enabled">features::transaction_context_extension_enabled</a>(), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="transaction_context.md#0x1_transaction_context_ETRANSACTION_CONTEXT_EXTENSION_NOT_ENABLED">ETRANSACTION_CONTEXT_EXTENSION_NOT_ENABLED</a>));
+    payload.args
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_transaction_context_multisig_payload"></a>
+
+## Function `multisig_payload`
+
+Returns the multisig payload if the current transaction has such a payload. Otherwise, return <code>None</code>.
+This function aborts if called outside of the transaction prologue, execution, or epilogue phases.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="transaction_context.md#0x1_transaction_context_multisig_payload">multisig_payload</a>(): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="transaction_context.md#0x1_transaction_context_MultisigPayload">transaction_context::MultisigPayload</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="transaction_context.md#0x1_transaction_context_multisig_payload">multisig_payload</a>(): Option&lt;<a href="transaction_context.md#0x1_transaction_context_MultisigPayload">MultisigPayload</a>&gt; {
+    <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_transaction_context_extension_enabled">features::transaction_context_extension_enabled</a>(), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="transaction_context.md#0x1_transaction_context_ETRANSACTION_CONTEXT_EXTENSION_NOT_ENABLED">ETRANSACTION_CONTEXT_EXTENSION_NOT_ENABLED</a>));
+    <a href="transaction_context.md#0x1_transaction_context_multisig_payload_internal">multisig_payload_internal</a>()
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_transaction_context_multisig_payload_internal"></a>
+
+## Function `multisig_payload_internal`
+
+
+
+<pre><code><b>fun</b> <a href="transaction_context.md#0x1_transaction_context_multisig_payload_internal">multisig_payload_internal</a>(): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="transaction_context.md#0x1_transaction_context_MultisigPayload">transaction_context::MultisigPayload</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="transaction_context.md#0x1_transaction_context_multisig_payload_internal">multisig_payload_internal</a>(): Option&lt;<a href="transaction_context.md#0x1_transaction_context_MultisigPayload">MultisigPayload</a>&gt;;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_transaction_context_multisig_address"></a>
+
+## Function `multisig_address`
+
+Returns the multisig account address of the multisig payload.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="transaction_context.md#0x1_transaction_context_multisig_address">multisig_address</a>(payload: &<a href="transaction_context.md#0x1_transaction_context_MultisigPayload">transaction_context::MultisigPayload</a>): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="transaction_context.md#0x1_transaction_context_multisig_address">multisig_address</a>(payload: &<a href="transaction_context.md#0x1_transaction_context_MultisigPayload">MultisigPayload</a>): <b>address</b> {
+    <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_transaction_context_extension_enabled">features::transaction_context_extension_enabled</a>(), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="transaction_context.md#0x1_transaction_context_ETRANSACTION_CONTEXT_EXTENSION_NOT_ENABLED">ETRANSACTION_CONTEXT_EXTENSION_NOT_ENABLED</a>));
+    payload.multisig_address
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_transaction_context_inner_entry_function_payload"></a>
+
+## Function `inner_entry_function_payload`
+
+Returns the inner entry function payload of the multisig payload.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="transaction_context.md#0x1_transaction_context_inner_entry_function_payload">inner_entry_function_payload</a>(payload: &<a href="transaction_context.md#0x1_transaction_context_MultisigPayload">transaction_context::MultisigPayload</a>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="transaction_context.md#0x1_transaction_context_EntryFunctionPayload">transaction_context::EntryFunctionPayload</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="transaction_context.md#0x1_transaction_context_inner_entry_function_payload">inner_entry_function_payload</a>(payload: &<a href="transaction_context.md#0x1_transaction_context_MultisigPayload">MultisigPayload</a>): Option&lt;<a href="transaction_context.md#0x1_transaction_context_EntryFunctionPayload">EntryFunctionPayload</a>&gt; {
+    <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_transaction_context_extension_enabled">features::transaction_context_extension_enabled</a>(), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="transaction_context.md#0x1_transaction_context_ETRANSACTION_CONTEXT_EXTENSION_NOT_ENABLED">ETRANSACTION_CONTEXT_EXTENSION_NOT_ENABLED</a>));
+    payload.entry_function_payload
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+<a id="@Specification_1_get_txn_hash"></a>
+
+### Function `get_txn_hash`
+
+
+<pre><code><b>fun</b> <a href="transaction_context.md#0x1_transaction_context_get_txn_hash">get_txn_hash</a>(): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> [abstract] <b>false</b>;
+<b>ensures</b> result == <a href="transaction_context.md#0x1_transaction_context_spec_get_txn_hash">spec_get_txn_hash</a>();
+</code></pre>
+
+
+
+
+<a id="0x1_transaction_context_spec_get_txn_hash"></a>
+
+
+<pre><code><b>fun</b> <a href="transaction_context.md#0x1_transaction_context_spec_get_txn_hash">spec_get_txn_hash</a>(): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+</code></pre>
+
+
+
+<a id="@Specification_1_get_transaction_hash"></a>
+
+### Function `get_transaction_hash`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="transaction_context.md#0x1_transaction_context_get_transaction_hash">get_transaction_hash</a>(): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> [abstract] <b>false</b>;
+<b>ensures</b> result == <a href="transaction_context.md#0x1_transaction_context_spec_get_txn_hash">spec_get_txn_hash</a>();
+// This enforces <a id="high-level-req-1" href="#high-level-req">high-level requirement 1</a>:
+<b>ensures</b> [abstract] len(result) == 32;
+</code></pre>
+
+
+
+<a id="@Specification_1_generate_unique_address"></a>
+
+### Function `generate_unique_address`
+
+
+<pre><code><b>fun</b> <a href="transaction_context.md#0x1_transaction_context_generate_unique_address">generate_unique_address</a>(): <b>address</b>
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>ensures</b> [abstract] result == <a href="transaction_context.md#0x1_transaction_context_spec_generate_unique_address">spec_generate_unique_address</a>();
+</code></pre>
+
+
+
+
+<a id="0x1_transaction_context_spec_generate_unique_address"></a>
+
+
+<pre><code><b>fun</b> <a href="transaction_context.md#0x1_transaction_context_spec_generate_unique_address">spec_generate_unique_address</a>(): <b>address</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_generate_auid_address"></a>
+
+### Function `generate_auid_address`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="transaction_context.md#0x1_transaction_context_generate_auid_address">generate_auid_address</a>(): <b>address</b>
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+// This enforces <a id="high-level-req-3" href="#high-level-req">high-level requirement 3</a>:
+<b>ensures</b> [abstract] result == <a href="transaction_context.md#0x1_transaction_context_spec_generate_unique_address">spec_generate_unique_address</a>();
+</code></pre>
+
+
+
+<a id="@Specification_1_get_script_hash"></a>
+
+### Function `get_script_hash`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="transaction_context.md#0x1_transaction_context_get_script_hash">get_script_hash</a>(): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+
+
+<a id="high-level-req"></a>
+
+### High-level Requirements
+
+<table>
+<tr>
+<th>No.</th><th>Requirement</th><th>Criticality</th><th>Implementation</th><th>Enforcement</th>
+</tr>
+
+<tr>
+<td>1</td>
+<td>Fetching the transaction hash should return a vector with 32 bytes.</td>
+<td>Medium</td>
+<td>The get_transaction_hash function calls the native function get_txn_hash, which fetches the NativeTransactionContext struct and returns the txn_hash field.</td>
+<td>Audited that the native function returns the txn hash, whose size is 32 bytes. This has been modeled as the abstract postcondition that the returned vector is of length 32. Formally verified via <a href="#high-level-req-1">get_txn_hash</a>.</td>
+</tr>
+
+<tr>
+<td>2</td>
+<td>Fetching the unique address should never abort.</td>
+<td>Low</td>
+<td>The function auid_address returns the unique address from a supplied AUID resource.</td>
+<td>Formally verified via <a href="#high-level-req-2">auid_address</a>.</td>
+</tr>
+
+<tr>
+<td>3</td>
+<td>Generating the unique address should return a vector with 32 bytes.</td>
+<td>Medium</td>
+<td>The generate_auid_address function checks calls the native function generate_unique_address which fetches the NativeTransactionContext struct, increments the auid_counter by one, and then creates a new authentication key from a preimage, which is then returned.</td>
+<td>Audited that the native function returns an address, and the length of an address is 32 bytes. This has been modeled as the abstract postcondition that the returned vector is of length 32. Formally verified via <a href="#high-level-req-3">generate_auid_address</a>.</td>
+</tr>
+
+<tr>
+<td>4</td>
+<td>Fetching the script hash of the current entry function should never fail and should return a vector with 32 bytes if the transaction payload is a script, otherwise an empty vector.</td>
+<td>Low</td>
+<td>The native function get_script_hash returns the NativeTransactionContext.script_hash field.</td>
+<td>Audited that the native function holds the required property. This has been modeled as the abstract spec. Formally verified via <a href="#high-level-req-4">get_script_hash</a>.</td>
+</tr>
+
+</table>
+
+
+
+<a id="module-level-spec"></a>
+
+### Module-level Specification
+
+
+<pre><code><b>pragma</b> opaque;
+// This enforces <a id="high-level-req-4" href="#high-level-req">high-level requirement 4</a>:
+<b>aborts_if</b> [abstract] <b>false</b>;
+<b>ensures</b> [abstract] result == <a href="transaction_context.md#0x1_transaction_context_spec_get_script_hash">spec_get_script_hash</a>();
+<b>ensures</b> [abstract] len(result) == 32;
+</code></pre>
+
+
+
+
+<a id="0x1_transaction_context_spec_get_script_hash"></a>
+
+
+<pre><code><b>fun</b> <a href="transaction_context.md#0x1_transaction_context_spec_get_script_hash">spec_get_script_hash</a>(): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+</code></pre>
+
+
+
+<a id="@Specification_1_auid_address"></a>
+
+### Function `auid_address`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="transaction_context.md#0x1_transaction_context_auid_address">auid_address</a>(auid: &<a href="transaction_context.md#0x1_transaction_context_AUID">transaction_context::AUID</a>): <b>address</b>
+</code></pre>
+
+
+
+
+<pre><code>// This enforces <a id="high-level-req-2" href="#high-level-req">high-level requirement 2</a>:
+<b>aborts_if</b> <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_sender_internal"></a>
+
+### Function `sender_internal`
+
+
+<pre><code><b>fun</b> <a href="transaction_context.md#0x1_transaction_context_sender_internal">sender_internal</a>(): <b>address</b>
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_secondary_signers_internal"></a>
+
+### Function `secondary_signers_internal`
+
+
+<pre><code><b>fun</b> <a href="transaction_context.md#0x1_transaction_context_secondary_signers_internal">secondary_signers_internal</a>(): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_gas_payer_internal"></a>
+
+### Function `gas_payer_internal`
+
+
+<pre><code><b>fun</b> <a href="transaction_context.md#0x1_transaction_context_gas_payer_internal">gas_payer_internal</a>(): <b>address</b>
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_max_gas_amount_internal"></a>
+
+### Function `max_gas_amount_internal`
+
+
+<pre><code><b>fun</b> <a href="transaction_context.md#0x1_transaction_context_max_gas_amount_internal">max_gas_amount_internal</a>(): u64
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_gas_unit_price_internal"></a>
+
+### Function `gas_unit_price_internal`
+
+
+<pre><code><b>fun</b> <a href="transaction_context.md#0x1_transaction_context_gas_unit_price_internal">gas_unit_price_internal</a>(): u64
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_chain_id_internal"></a>
+
+### Function `chain_id_internal`
+
+
+<pre><code><b>fun</b> <a href="transaction_context.md#0x1_transaction_context_chain_id_internal">chain_id_internal</a>(): u8
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_entry_function_payload_internal"></a>
+
+### Function `entry_function_payload_internal`
+
+
+<pre><code><b>fun</b> <a href="transaction_context.md#0x1_transaction_context_entry_function_payload_internal">entry_function_payload_internal</a>(): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="transaction_context.md#0x1_transaction_context_EntryFunctionPayload">transaction_context::EntryFunctionPayload</a>&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_multisig_payload_internal"></a>
+
+### Function `multisig_payload_internal`
+
+
+<pre><code><b>fun</b> <a href="transaction_context.md#0x1_transaction_context_multisig_payload_internal">multisig_payload_internal</a>(): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="transaction_context.md#0x1_transaction_context_MultisigPayload">transaction_context::MultisigPayload</a>&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/transaction_fee.md b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/transaction_fee.md
new file mode 100644
index 0000000000000..8051db864cac9
--- /dev/null
+++ b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/transaction_fee.md
@@ -0,0 +1,1245 @@
+
+<a id="0x1_transaction_fee"></a>
+
+# Module `0x1::transaction_fee`
+
+This module provides an interface to burn or collect and redistribute transaction fees.
+
+
+-  [Resource `AptosCoinCapabilities`](#0x1_transaction_fee_AptosCoinCapabilities)
+-  [Resource `AptosFABurnCapabilities`](#0x1_transaction_fee_AptosFABurnCapabilities)
+-  [Resource `AptosCoinMintCapability`](#0x1_transaction_fee_AptosCoinMintCapability)
+-  [Resource `CollectedFeesPerBlock`](#0x1_transaction_fee_CollectedFeesPerBlock)
+-  [Struct `FeeStatement`](#0x1_transaction_fee_FeeStatement)
+-  [Constants](#@Constants_0)
+-  [Function `initialize_fee_collection_and_distribution`](#0x1_transaction_fee_initialize_fee_collection_and_distribution)
+-  [Function `is_fees_collection_enabled`](#0x1_transaction_fee_is_fees_collection_enabled)
+-  [Function `upgrade_burn_percentage`](#0x1_transaction_fee_upgrade_burn_percentage)
+-  [Function `register_proposer_for_fee_collection`](#0x1_transaction_fee_register_proposer_for_fee_collection)
+-  [Function `burn_coin_fraction`](#0x1_transaction_fee_burn_coin_fraction)
+-  [Function `process_collected_fees`](#0x1_transaction_fee_process_collected_fees)
+-  [Function `burn_fee`](#0x1_transaction_fee_burn_fee)
+-  [Function `mint_and_refund`](#0x1_transaction_fee_mint_and_refund)
+-  [Function `collect_fee`](#0x1_transaction_fee_collect_fee)
+-  [Function `store_aptos_coin_burn_cap`](#0x1_transaction_fee_store_aptos_coin_burn_cap)
+-  [Function `convert_to_aptos_fa_burn_ref`](#0x1_transaction_fee_convert_to_aptos_fa_burn_ref)
+-  [Function `store_aptos_coin_mint_cap`](#0x1_transaction_fee_store_aptos_coin_mint_cap)
+-  [Function `initialize_storage_refund`](#0x1_transaction_fee_initialize_storage_refund)
+-  [Function `emit_fee_statement`](#0x1_transaction_fee_emit_fee_statement)
+-  [Specification](#@Specification_1)
+    -  [High-level Requirements](#high-level-req)
+    -  [Module-level Specification](#module-level-spec)
+    -  [Resource `CollectedFeesPerBlock`](#@Specification_1_CollectedFeesPerBlock)
+    -  [Function `initialize_fee_collection_and_distribution`](#@Specification_1_initialize_fee_collection_and_distribution)
+    -  [Function `upgrade_burn_percentage`](#@Specification_1_upgrade_burn_percentage)
+    -  [Function `register_proposer_for_fee_collection`](#@Specification_1_register_proposer_for_fee_collection)
+    -  [Function `burn_coin_fraction`](#@Specification_1_burn_coin_fraction)
+    -  [Function `process_collected_fees`](#@Specification_1_process_collected_fees)
+    -  [Function `burn_fee`](#@Specification_1_burn_fee)
+    -  [Function `mint_and_refund`](#@Specification_1_mint_and_refund)
+    -  [Function `collect_fee`](#@Specification_1_collect_fee)
+    -  [Function `store_aptos_coin_burn_cap`](#@Specification_1_store_aptos_coin_burn_cap)
+    -  [Function `store_aptos_coin_mint_cap`](#@Specification_1_store_aptos_coin_mint_cap)
+    -  [Function `initialize_storage_refund`](#@Specification_1_initialize_storage_refund)
+    -  [Function `emit_fee_statement`](#@Specification_1_emit_fee_statement)
+
+
+<pre><code><b>use</b> <a href="aptos_account.md#0x1_aptos_account">0x1::aptos_account</a>;
+<b>use</b> <a href="aptos_coin.md#0x1_aptos_coin">0x1::aptos_coin</a>;
+<b>use</b> <a href="coin.md#0x1_coin">0x1::coin</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="event.md#0x1_event">0x1::event</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features">0x1::features</a>;
+<b>use</b> <a href="fungible_asset.md#0x1_fungible_asset">0x1::fungible_asset</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option">0x1::option</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">0x1::signer</a>;
+<b>use</b> <a href="stake.md#0x1_stake">0x1::stake</a>;
+<b>use</b> <a href="system_addresses.md#0x1_system_addresses">0x1::system_addresses</a>;
+</code></pre>
+
+
+
+<a id="0x1_transaction_fee_AptosCoinCapabilities"></a>
+
+## Resource `AptosCoinCapabilities`
+
+Stores burn capability to burn the gas fees.
+
+
+<pre><code><b>struct</b> <a href="transaction_fee.md#0x1_transaction_fee_AptosCoinCapabilities">AptosCoinCapabilities</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>burn_cap: <a href="coin.md#0x1_coin_BurnCapability">coin::BurnCapability</a>&lt;<a href="aptos_coin.md#0x1_aptos_coin_AptosCoin">aptos_coin::AptosCoin</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_transaction_fee_AptosFABurnCapabilities"></a>
+
+## Resource `AptosFABurnCapabilities`
+
+Stores burn capability to burn the gas fees.
+
+
+<pre><code><b>struct</b> <a href="transaction_fee.md#0x1_transaction_fee_AptosFABurnCapabilities">AptosFABurnCapabilities</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>burn_ref: <a href="fungible_asset.md#0x1_fungible_asset_BurnRef">fungible_asset::BurnRef</a></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_transaction_fee_AptosCoinMintCapability"></a>
+
+## Resource `AptosCoinMintCapability`
+
+Stores mint capability to mint the refunds.
+
+
+<pre><code><b>struct</b> <a href="transaction_fee.md#0x1_transaction_fee_AptosCoinMintCapability">AptosCoinMintCapability</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>mint_cap: <a href="coin.md#0x1_coin_MintCapability">coin::MintCapability</a>&lt;<a href="aptos_coin.md#0x1_aptos_coin_AptosCoin">aptos_coin::AptosCoin</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_transaction_fee_CollectedFeesPerBlock"></a>
+
+## Resource `CollectedFeesPerBlock`
+
+Stores information about the block proposer and the amount of fees
+collected when executing the block.
+
+
+<pre><code><b>struct</b> <a href="transaction_fee.md#0x1_transaction_fee_CollectedFeesPerBlock">CollectedFeesPerBlock</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>amount: <a href="coin.md#0x1_coin_AggregatableCoin">coin::AggregatableCoin</a>&lt;<a href="aptos_coin.md#0x1_aptos_coin_AptosCoin">aptos_coin::AptosCoin</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>proposer: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<b>address</b>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>burn_percentage: u8</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_transaction_fee_FeeStatement"></a>
+
+## Struct `FeeStatement`
+
+Breakdown of fee charge and refund for a transaction.
+The structure is:
+
+- Net charge or refund (not in the statement)
+- total charge: total_charge_gas_units, matches <code>gas_used</code> in the on-chain <code>TransactionInfo</code>.
+This is the sum of the sub-items below. Notice that there's potential precision loss when
+the conversion between internal and external gas units and between native token and gas
+units, so it's possible that the numbers don't add up exactly. -- This number is the final
+charge, while the break down is merely informational.
+- gas charge for execution (CPU time): <code>execution_gas_units</code>
+- gas charge for IO (storage random access): <code>io_gas_units</code>
+- storage fee charge (storage space): <code>storage_fee_octas</code>, to be included in
+<code>total_charge_gas_unit</code>, this number is converted to gas units according to the user
+specified <code>gas_unit_price</code> on the transaction.
+- storage deletion refund: <code>storage_fee_refund_octas</code>, this is not included in <code>gas_used</code> or
+<code>total_charge_gas_units</code>, the net charge / refund is calculated by
+<code>total_charge_gas_units</code> * <code>gas_unit_price</code> - <code>storage_fee_refund_octas</code>.
+
+This is meant to emitted as a module event.
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="transaction_fee.md#0x1_transaction_fee_FeeStatement">FeeStatement</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>total_charge_gas_units: u64</code>
+</dt>
+<dd>
+ Total gas charge.
+</dd>
+<dt>
+<code>execution_gas_units: u64</code>
+</dt>
+<dd>
+ Execution gas charge.
+</dd>
+<dt>
+<code>io_gas_units: u64</code>
+</dt>
+<dd>
+ IO gas charge.
+</dd>
+<dt>
+<code>storage_fee_octas: u64</code>
+</dt>
+<dd>
+ Storage fee charge.
+</dd>
+<dt>
+<code>storage_fee_refund_octas: u64</code>
+</dt>
+<dd>
+ Storage fee refund.
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_transaction_fee_EALREADY_COLLECTING_FEES"></a>
+
+Gas fees are already being collected and the struct holding
+information about collected amounts is already published.
+
+
+<pre><code><b>const</b> <a href="transaction_fee.md#0x1_transaction_fee_EALREADY_COLLECTING_FEES">EALREADY_COLLECTING_FEES</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_transaction_fee_EFA_GAS_CHARGING_NOT_ENABLED"></a>
+
+
+
+<pre><code><b>const</b> <a href="transaction_fee.md#0x1_transaction_fee_EFA_GAS_CHARGING_NOT_ENABLED">EFA_GAS_CHARGING_NOT_ENABLED</a>: u64 = 5;
+</code></pre>
+
+
+
+<a id="0x1_transaction_fee_EINVALID_BURN_PERCENTAGE"></a>
+
+The burn percentage is out of range [0, 100].
+
+
+<pre><code><b>const</b> <a href="transaction_fee.md#0x1_transaction_fee_EINVALID_BURN_PERCENTAGE">EINVALID_BURN_PERCENTAGE</a>: u64 = 3;
+</code></pre>
+
+
+
+<a id="0x1_transaction_fee_ENO_LONGER_SUPPORTED"></a>
+
+No longer supported.
+
+
+<pre><code><b>const</b> <a href="transaction_fee.md#0x1_transaction_fee_ENO_LONGER_SUPPORTED">ENO_LONGER_SUPPORTED</a>: u64 = 4;
+</code></pre>
+
+
+
+<a id="0x1_transaction_fee_initialize_fee_collection_and_distribution"></a>
+
+## Function `initialize_fee_collection_and_distribution`
+
+Initializes the resource storing information about gas fees collection and
+distribution. Should be called by on-chain governance.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="transaction_fee.md#0x1_transaction_fee_initialize_fee_collection_and_distribution">initialize_fee_collection_and_distribution</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, burn_percentage: u8)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="transaction_fee.md#0x1_transaction_fee_initialize_fee_collection_and_distribution">initialize_fee_collection_and_distribution</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, burn_percentage: u8) {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(aptos_framework);
+    <b>assert</b>!(
+        !<b>exists</b>&lt;<a href="transaction_fee.md#0x1_transaction_fee_CollectedFeesPerBlock">CollectedFeesPerBlock</a>&gt;(@aptos_framework),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_already_exists">error::already_exists</a>(<a href="transaction_fee.md#0x1_transaction_fee_EALREADY_COLLECTING_FEES">EALREADY_COLLECTING_FEES</a>)
+    );
+    <b>assert</b>!(burn_percentage &lt;= 100, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_out_of_range">error::out_of_range</a>(<a href="transaction_fee.md#0x1_transaction_fee_EINVALID_BURN_PERCENTAGE">EINVALID_BURN_PERCENTAGE</a>));
+
+    // Make sure stakng <b>module</b> is aware of transaction fees collection.
+    <a href="stake.md#0x1_stake_initialize_validator_fees">stake::initialize_validator_fees</a>(aptos_framework);
+
+    // Initially, no fees are collected and the <a href="block.md#0x1_block">block</a> proposer is not set.
+    <b>let</b> collected_fees = <a href="transaction_fee.md#0x1_transaction_fee_CollectedFeesPerBlock">CollectedFeesPerBlock</a> {
+        amount: <a href="coin.md#0x1_coin_initialize_aggregatable_coin">coin::initialize_aggregatable_coin</a>(aptos_framework),
+        proposer: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>(),
+        burn_percentage,
+    };
+    <b>move_to</b>(aptos_framework, collected_fees);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_transaction_fee_is_fees_collection_enabled"></a>
+
+## Function `is_fees_collection_enabled`
+
+
+
+<pre><code><b>fun</b> <a href="transaction_fee.md#0x1_transaction_fee_is_fees_collection_enabled">is_fees_collection_enabled</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="transaction_fee.md#0x1_transaction_fee_is_fees_collection_enabled">is_fees_collection_enabled</a>(): bool {
+    <b>exists</b>&lt;<a href="transaction_fee.md#0x1_transaction_fee_CollectedFeesPerBlock">CollectedFeesPerBlock</a>&gt;(@aptos_framework)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_transaction_fee_upgrade_burn_percentage"></a>
+
+## Function `upgrade_burn_percentage`
+
+Sets the burn percentage for collected fees to a new value. Should be called by on-chain governance.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="transaction_fee.md#0x1_transaction_fee_upgrade_burn_percentage">upgrade_burn_percentage</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, new_burn_percentage: u8)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="transaction_fee.md#0x1_transaction_fee_upgrade_burn_percentage">upgrade_burn_percentage</a>(
+    aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    new_burn_percentage: u8
+) <b>acquires</b> <a href="transaction_fee.md#0x1_transaction_fee_AptosCoinCapabilities">AptosCoinCapabilities</a>, <a href="transaction_fee.md#0x1_transaction_fee_CollectedFeesPerBlock">CollectedFeesPerBlock</a> {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(aptos_framework);
+    <b>assert</b>!(new_burn_percentage &lt;= 100, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_out_of_range">error::out_of_range</a>(<a href="transaction_fee.md#0x1_transaction_fee_EINVALID_BURN_PERCENTAGE">EINVALID_BURN_PERCENTAGE</a>));
+
+    // Prior <b>to</b> upgrading the burn percentage, make sure <b>to</b> process collected
+    // fees. Otherwise we would <b>use</b> the new (incorrect) burn_percentage when
+    // processing fees later!
+    <a href="transaction_fee.md#0x1_transaction_fee_process_collected_fees">process_collected_fees</a>();
+
+    <b>if</b> (<a href="transaction_fee.md#0x1_transaction_fee_is_fees_collection_enabled">is_fees_collection_enabled</a>()) {
+        // Upgrade <b>has</b> no effect unless fees are being collected.
+        <b>let</b> burn_percentage = &<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="transaction_fee.md#0x1_transaction_fee_CollectedFeesPerBlock">CollectedFeesPerBlock</a>&gt;(@aptos_framework).burn_percentage;
+        *burn_percentage = new_burn_percentage
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_transaction_fee_register_proposer_for_fee_collection"></a>
+
+## Function `register_proposer_for_fee_collection`
+
+Registers the proposer of the block for gas fees collection. This function
+can only be called at the beginning of the block.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="transaction_fee.md#0x1_transaction_fee_register_proposer_for_fee_collection">register_proposer_for_fee_collection</a>(proposer_addr: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="transaction_fee.md#0x1_transaction_fee_register_proposer_for_fee_collection">register_proposer_for_fee_collection</a>(proposer_addr: <b>address</b>) <b>acquires</b> <a href="transaction_fee.md#0x1_transaction_fee_CollectedFeesPerBlock">CollectedFeesPerBlock</a> {
+    <b>if</b> (<a href="transaction_fee.md#0x1_transaction_fee_is_fees_collection_enabled">is_fees_collection_enabled</a>()) {
+        <b>let</b> collected_fees = <b>borrow_global_mut</b>&lt;<a href="transaction_fee.md#0x1_transaction_fee_CollectedFeesPerBlock">CollectedFeesPerBlock</a>&gt;(@aptos_framework);
+        <b>let</b> _ = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_swap_or_fill">option::swap_or_fill</a>(&<b>mut</b> collected_fees.proposer, proposer_addr);
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_transaction_fee_burn_coin_fraction"></a>
+
+## Function `burn_coin_fraction`
+
+Burns a specified fraction of the coin.
+
+
+<pre><code><b>fun</b> <a href="transaction_fee.md#0x1_transaction_fee_burn_coin_fraction">burn_coin_fraction</a>(<a href="coin.md#0x1_coin">coin</a>: &<b>mut</b> <a href="coin.md#0x1_coin_Coin">coin::Coin</a>&lt;<a href="aptos_coin.md#0x1_aptos_coin_AptosCoin">aptos_coin::AptosCoin</a>&gt;, burn_percentage: u8)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="transaction_fee.md#0x1_transaction_fee_burn_coin_fraction">burn_coin_fraction</a>(<a href="coin.md#0x1_coin">coin</a>: &<b>mut</b> Coin&lt;AptosCoin&gt;, burn_percentage: u8) <b>acquires</b> <a href="transaction_fee.md#0x1_transaction_fee_AptosCoinCapabilities">AptosCoinCapabilities</a> {
+    <b>assert</b>!(burn_percentage &lt;= 100, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_out_of_range">error::out_of_range</a>(<a href="transaction_fee.md#0x1_transaction_fee_EINVALID_BURN_PERCENTAGE">EINVALID_BURN_PERCENTAGE</a>));
+
+    <b>let</b> collected_amount = <a href="coin.md#0x1_coin_value">coin::value</a>(<a href="coin.md#0x1_coin">coin</a>);
+    <b>spec</b> {
+        // We <b>assume</b> that `burn_percentage * collected_amount` does not overflow.
+        <b>assume</b> burn_percentage * collected_amount &lt;= MAX_U64;
+    };
+    <b>let</b> amount_to_burn = (burn_percentage <b>as</b> u64) * collected_amount / 100;
+    <b>if</b> (amount_to_burn &gt; 0) {
+        <b>let</b> coin_to_burn = <a href="coin.md#0x1_coin_extract">coin::extract</a>(<a href="coin.md#0x1_coin">coin</a>, amount_to_burn);
+        <a href="coin.md#0x1_coin_burn">coin::burn</a>(
+            coin_to_burn,
+            &<b>borrow_global</b>&lt;<a href="transaction_fee.md#0x1_transaction_fee_AptosCoinCapabilities">AptosCoinCapabilities</a>&gt;(@aptos_framework).burn_cap,
+        );
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_transaction_fee_process_collected_fees"></a>
+
+## Function `process_collected_fees`
+
+Calculates the fee which should be distributed to the block proposer at the
+end of an epoch, and records it in the system. This function can only be called
+at the beginning of the block or during reconfiguration.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="transaction_fee.md#0x1_transaction_fee_process_collected_fees">process_collected_fees</a>()
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="transaction_fee.md#0x1_transaction_fee_process_collected_fees">process_collected_fees</a>() <b>acquires</b> <a href="transaction_fee.md#0x1_transaction_fee_AptosCoinCapabilities">AptosCoinCapabilities</a>, <a href="transaction_fee.md#0x1_transaction_fee_CollectedFeesPerBlock">CollectedFeesPerBlock</a> {
+    <b>if</b> (!<a href="transaction_fee.md#0x1_transaction_fee_is_fees_collection_enabled">is_fees_collection_enabled</a>()) {
+        <b>return</b>
+    };
+    <b>let</b> collected_fees = <b>borrow_global_mut</b>&lt;<a href="transaction_fee.md#0x1_transaction_fee_CollectedFeesPerBlock">CollectedFeesPerBlock</a>&gt;(@aptos_framework);
+
+    // If there are no collected fees, only unset the proposer. See the rationale for
+    // setting proposer <b>to</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>() below.
+    <b>if</b> (<a href="coin.md#0x1_coin_is_aggregatable_coin_zero">coin::is_aggregatable_coin_zero</a>(&collected_fees.amount)) {
+        <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&collected_fees.proposer)) {
+            <b>let</b> _ = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_extract">option::extract</a>(&<b>mut</b> collected_fees.proposer);
+        };
+        <b>return</b>
+    };
+
+    // Otherwise get the collected fee, and check <b>if</b> it can distributed later.
+    <b>let</b> <a href="coin.md#0x1_coin">coin</a> = <a href="coin.md#0x1_coin_drain_aggregatable_coin">coin::drain_aggregatable_coin</a>(&<b>mut</b> collected_fees.amount);
+    <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&collected_fees.proposer)) {
+        // Extract the <b>address</b> of proposer here and reset it <b>to</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>(). This
+        // is particularly useful <b>to</b> avoid <a href="../../../aptos-stdlib/tests/compiler-v2-doc/any.md#0x1_any">any</a> undesired side-effects <b>where</b> coins are
+        // collected but never distributed or distributed <b>to</b> the wrong <a href="account.md#0x1_account">account</a>.
+        // With this design, processing collected fees enforces that all fees will be burnt
+        // unless the proposer is specified in the <a href="block.md#0x1_block">block</a> prologue. When we have a governance
+        // proposal that triggers <a href="reconfiguration.md#0x1_reconfiguration">reconfiguration</a>, we distribute pending fees and burn the
+        // fee for the proposal. Otherwise, that fee would be leaked <b>to</b> the next <a href="block.md#0x1_block">block</a>.
+        <b>let</b> proposer = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_extract">option::extract</a>(&<b>mut</b> collected_fees.proposer);
+
+        // Since the <a href="block.md#0x1_block">block</a> can be produced by the VM itself, we have <b>to</b> make sure we catch
+        // this case.
+        <b>if</b> (proposer == @vm_reserved) {
+            <a href="transaction_fee.md#0x1_transaction_fee_burn_coin_fraction">burn_coin_fraction</a>(&<b>mut</b> <a href="coin.md#0x1_coin">coin</a>, 100);
+            <a href="coin.md#0x1_coin_destroy_zero">coin::destroy_zero</a>(<a href="coin.md#0x1_coin">coin</a>);
+            <b>return</b>
+        };
+
+        <a href="transaction_fee.md#0x1_transaction_fee_burn_coin_fraction">burn_coin_fraction</a>(&<b>mut</b> <a href="coin.md#0x1_coin">coin</a>, collected_fees.burn_percentage);
+        <a href="stake.md#0x1_stake_add_transaction_fee">stake::add_transaction_fee</a>(proposer, <a href="coin.md#0x1_coin">coin</a>);
+        <b>return</b>
+    };
+
+    // If checks did not pass, simply burn all collected coins and <b>return</b> none.
+    <a href="transaction_fee.md#0x1_transaction_fee_burn_coin_fraction">burn_coin_fraction</a>(&<b>mut</b> <a href="coin.md#0x1_coin">coin</a>, 100);
+    <a href="coin.md#0x1_coin_destroy_zero">coin::destroy_zero</a>(<a href="coin.md#0x1_coin">coin</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_transaction_fee_burn_fee"></a>
+
+## Function `burn_fee`
+
+Burn transaction fees in epilogue.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="transaction_fee.md#0x1_transaction_fee_burn_fee">burn_fee</a>(<a href="account.md#0x1_account">account</a>: <b>address</b>, fee: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="transaction_fee.md#0x1_transaction_fee_burn_fee">burn_fee</a>(<a href="account.md#0x1_account">account</a>: <b>address</b>, fee: u64) <b>acquires</b> <a href="transaction_fee.md#0x1_transaction_fee_AptosFABurnCapabilities">AptosFABurnCapabilities</a>, <a href="transaction_fee.md#0x1_transaction_fee_AptosCoinCapabilities">AptosCoinCapabilities</a> {
+    <b>if</b> (<b>exists</b>&lt;<a href="transaction_fee.md#0x1_transaction_fee_AptosFABurnCapabilities">AptosFABurnCapabilities</a>&gt;(@aptos_framework)) {
+        <b>let</b> burn_ref = &<b>borrow_global</b>&lt;<a href="transaction_fee.md#0x1_transaction_fee_AptosFABurnCapabilities">AptosFABurnCapabilities</a>&gt;(@aptos_framework).burn_ref;
+        <a href="aptos_account.md#0x1_aptos_account_burn_from_fungible_store">aptos_account::burn_from_fungible_store</a>(burn_ref, <a href="account.md#0x1_account">account</a>, fee);
+    } <b>else</b> {
+        <b>let</b> burn_cap = &<b>borrow_global</b>&lt;<a href="transaction_fee.md#0x1_transaction_fee_AptosCoinCapabilities">AptosCoinCapabilities</a>&gt;(@aptos_framework).burn_cap;
+        <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_operations_default_to_fa_apt_store_enabled">features::operations_default_to_fa_apt_store_enabled</a>()) {
+            <b>let</b> (burn_ref, burn_receipt) = <a href="coin.md#0x1_coin_get_paired_burn_ref">coin::get_paired_burn_ref</a>(burn_cap);
+            <a href="aptos_account.md#0x1_aptos_account_burn_from_fungible_store">aptos_account::burn_from_fungible_store</a>(&burn_ref, <a href="account.md#0x1_account">account</a>, fee);
+            <a href="coin.md#0x1_coin_return_paired_burn_ref">coin::return_paired_burn_ref</a>(burn_ref, burn_receipt);
+        } <b>else</b> {
+            <a href="coin.md#0x1_coin_burn_from">coin::burn_from</a>&lt;AptosCoin&gt;(
+                <a href="account.md#0x1_account">account</a>,
+                fee,
+                burn_cap,
+            );
+        };
+    };
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_transaction_fee_mint_and_refund"></a>
+
+## Function `mint_and_refund`
+
+Mint refund in epilogue.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="transaction_fee.md#0x1_transaction_fee_mint_and_refund">mint_and_refund</a>(<a href="account.md#0x1_account">account</a>: <b>address</b>, refund: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="transaction_fee.md#0x1_transaction_fee_mint_and_refund">mint_and_refund</a>(<a href="account.md#0x1_account">account</a>: <b>address</b>, refund: u64) <b>acquires</b> <a href="transaction_fee.md#0x1_transaction_fee_AptosCoinMintCapability">AptosCoinMintCapability</a> {
+    <b>let</b> mint_cap = &<b>borrow_global</b>&lt;<a href="transaction_fee.md#0x1_transaction_fee_AptosCoinMintCapability">AptosCoinMintCapability</a>&gt;(@aptos_framework).mint_cap;
+    <b>let</b> refund_coin = <a href="coin.md#0x1_coin_mint">coin::mint</a>(refund, mint_cap);
+    <a href="coin.md#0x1_coin_force_deposit">coin::force_deposit</a>(<a href="account.md#0x1_account">account</a>, refund_coin);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_transaction_fee_collect_fee"></a>
+
+## Function `collect_fee`
+
+Collect transaction fees in epilogue.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="transaction_fee.md#0x1_transaction_fee_collect_fee">collect_fee</a>(<a href="account.md#0x1_account">account</a>: <b>address</b>, fee: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="transaction_fee.md#0x1_transaction_fee_collect_fee">collect_fee</a>(<a href="account.md#0x1_account">account</a>: <b>address</b>, fee: u64) <b>acquires</b> <a href="transaction_fee.md#0x1_transaction_fee_CollectedFeesPerBlock">CollectedFeesPerBlock</a> {
+    <b>let</b> collected_fees = <b>borrow_global_mut</b>&lt;<a href="transaction_fee.md#0x1_transaction_fee_CollectedFeesPerBlock">CollectedFeesPerBlock</a>&gt;(@aptos_framework);
+
+    // Here, we are always optimistic and always collect fees. If the proposer is not set,
+    // or we cannot redistribute fees later for some reason (e.g. <a href="account.md#0x1_account">account</a> cannot receive AptoCoin)
+    // we burn them all at once. This way we avoid having a check for every transaction epilogue.
+    <b>let</b> collected_amount = &<b>mut</b> collected_fees.amount;
+    <a href="coin.md#0x1_coin_collect_into_aggregatable_coin">coin::collect_into_aggregatable_coin</a>&lt;AptosCoin&gt;(<a href="account.md#0x1_account">account</a>, fee, collected_amount);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_transaction_fee_store_aptos_coin_burn_cap"></a>
+
+## Function `store_aptos_coin_burn_cap`
+
+Only called during genesis.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="transaction_fee.md#0x1_transaction_fee_store_aptos_coin_burn_cap">store_aptos_coin_burn_cap</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, burn_cap: <a href="coin.md#0x1_coin_BurnCapability">coin::BurnCapability</a>&lt;<a href="aptos_coin.md#0x1_aptos_coin_AptosCoin">aptos_coin::AptosCoin</a>&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="transaction_fee.md#0x1_transaction_fee_store_aptos_coin_burn_cap">store_aptos_coin_burn_cap</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, burn_cap: BurnCapability&lt;AptosCoin&gt;) {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(aptos_framework);
+
+    <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_operations_default_to_fa_apt_store_enabled">features::operations_default_to_fa_apt_store_enabled</a>()) {
+        <b>let</b> burn_ref = <a href="coin.md#0x1_coin_convert_and_take_paired_burn_ref">coin::convert_and_take_paired_burn_ref</a>(burn_cap);
+        <b>move_to</b>(aptos_framework, <a href="transaction_fee.md#0x1_transaction_fee_AptosFABurnCapabilities">AptosFABurnCapabilities</a> { burn_ref });
+    } <b>else</b> {
+        <b>move_to</b>(aptos_framework, <a href="transaction_fee.md#0x1_transaction_fee_AptosCoinCapabilities">AptosCoinCapabilities</a> { burn_cap })
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_transaction_fee_convert_to_aptos_fa_burn_ref"></a>
+
+## Function `convert_to_aptos_fa_burn_ref`
+
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="transaction_fee.md#0x1_transaction_fee_convert_to_aptos_fa_burn_ref">convert_to_aptos_fa_burn_ref</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="transaction_fee.md#0x1_transaction_fee_convert_to_aptos_fa_burn_ref">convert_to_aptos_fa_burn_ref</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>) <b>acquires</b> <a href="transaction_fee.md#0x1_transaction_fee_AptosCoinCapabilities">AptosCoinCapabilities</a> {
+    <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_operations_default_to_fa_apt_store_enabled">features::operations_default_to_fa_apt_store_enabled</a>(), <a href="transaction_fee.md#0x1_transaction_fee_EFA_GAS_CHARGING_NOT_ENABLED">EFA_GAS_CHARGING_NOT_ENABLED</a>);
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(aptos_framework);
+    <b>let</b> <a href="transaction_fee.md#0x1_transaction_fee_AptosCoinCapabilities">AptosCoinCapabilities</a> {
+        burn_cap,
+    } = <b>move_from</b>&lt;<a href="transaction_fee.md#0x1_transaction_fee_AptosCoinCapabilities">AptosCoinCapabilities</a>&gt;(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(aptos_framework));
+    <b>let</b> burn_ref = <a href="coin.md#0x1_coin_convert_and_take_paired_burn_ref">coin::convert_and_take_paired_burn_ref</a>(burn_cap);
+    <b>move_to</b>(aptos_framework, <a href="transaction_fee.md#0x1_transaction_fee_AptosFABurnCapabilities">AptosFABurnCapabilities</a> { burn_ref });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_transaction_fee_store_aptos_coin_mint_cap"></a>
+
+## Function `store_aptos_coin_mint_cap`
+
+Only called during genesis.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="transaction_fee.md#0x1_transaction_fee_store_aptos_coin_mint_cap">store_aptos_coin_mint_cap</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, mint_cap: <a href="coin.md#0x1_coin_MintCapability">coin::MintCapability</a>&lt;<a href="aptos_coin.md#0x1_aptos_coin_AptosCoin">aptos_coin::AptosCoin</a>&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="transaction_fee.md#0x1_transaction_fee_store_aptos_coin_mint_cap">store_aptos_coin_mint_cap</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, mint_cap: MintCapability&lt;AptosCoin&gt;) {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(aptos_framework);
+    <b>move_to</b>(aptos_framework, <a href="transaction_fee.md#0x1_transaction_fee_AptosCoinMintCapability">AptosCoinMintCapability</a> { mint_cap })
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_transaction_fee_initialize_storage_refund"></a>
+
+## Function `initialize_storage_refund`
+
+
+
+<pre><code>#[deprecated]
+<b>public</b> <b>fun</b> <a href="transaction_fee.md#0x1_transaction_fee_initialize_storage_refund">initialize_storage_refund</a>(_: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="transaction_fee.md#0x1_transaction_fee_initialize_storage_refund">initialize_storage_refund</a>(_: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>) {
+    <b>abort</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_implemented">error::not_implemented</a>(<a href="transaction_fee.md#0x1_transaction_fee_ENO_LONGER_SUPPORTED">ENO_LONGER_SUPPORTED</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_transaction_fee_emit_fee_statement"></a>
+
+## Function `emit_fee_statement`
+
+
+
+<pre><code><b>fun</b> <a href="transaction_fee.md#0x1_transaction_fee_emit_fee_statement">emit_fee_statement</a>(fee_statement: <a href="transaction_fee.md#0x1_transaction_fee_FeeStatement">transaction_fee::FeeStatement</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="transaction_fee.md#0x1_transaction_fee_emit_fee_statement">emit_fee_statement</a>(fee_statement: <a href="transaction_fee.md#0x1_transaction_fee_FeeStatement">FeeStatement</a>) {
+    <a href="event.md#0x1_event_emit">event::emit</a>(fee_statement)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+
+
+<a id="high-level-req"></a>
+
+### High-level Requirements
+
+<table>
+<tr>
+<th>No.</th><th>Requirement</th><th>Criticality</th><th>Implementation</th><th>Enforcement</th>
+</tr>
+
+<tr>
+<td>1</td>
+<td>Given the blockchain is in an operating state, it guarantees that the Aptos framework signer may burn Aptos coins.</td>
+<td>Critical</td>
+<td>The AptosCoinCapabilities structure is defined in this module and it stores burn capability to burn the gas fees.</td>
+<td>Formally Verified via <a href="#high-level-req-1">module</a>.</td>
+</tr>
+
+<tr>
+<td>2</td>
+<td>The initialization function may only be called once.</td>
+<td>Medium</td>
+<td>The initialize_fee_collection_and_distribution function ensures CollectedFeesPerBlock does not already exist.</td>
+<td>Formally verified via <a href="#high-level-req-2">initialize_fee_collection_and_distribution</a>.</td>
+</tr>
+
+<tr>
+<td>3</td>
+<td>Only the admin address is authorized to call the initialization function.</td>
+<td>Critical</td>
+<td>The initialize_fee_collection_and_distribution function ensures only the Aptos framework address calls it.</td>
+<td>Formally verified via <a href="#high-level-req-3">initialize_fee_collection_and_distribution</a>.</td>
+</tr>
+
+<tr>
+<td>4</td>
+<td>The percentage of the burnt collected fee is always a value from 0 to 100.</td>
+<td>Medium</td>
+<td>During the initialization of CollectedFeesPerBlock in Initialize_fee_collection_and_distribution, and while upgrading burn percentage, it asserts that burn_percentage is within the specified limits.</td>
+<td>Formally verified via <a href="#high-level-req-4">CollectedFeesPerBlock</a>.</td>
+</tr>
+
+<tr>
+<td>5</td>
+<td>Prior to upgrading the burn percentage, it must process all the fees collected up to that point.</td>
+<td>Critical</td>
+<td>The upgrade_burn_percentage function ensures process_collected_fees function is called before updating the burn percentage.</td>
+<td>Formally verified in <a href="#high-level-req-5">ProcessCollectedFeesRequiresAndEnsures</a>.</td>
+</tr>
+
+<tr>
+<td>6</td>
+<td>The presence of the resource, indicating collected fees per block under the Aptos framework account, is a prerequisite for the successful execution of the following functionalities: Upgrading burn percentage. Registering a block proposer. Processing collected fees.</td>
+<td>Low</td>
+<td>The functions: upgrade_burn_percentage, register_proposer_for_fee_collection, and process_collected_fees all ensure that the CollectedFeesPerBlock resource exists under aptos_framework by calling the is_fees_collection_enabled method, which returns a boolean value confirming if the resource exists or not.</td>
+<td>Formally verified via <a href="#high-level-req-6.1">register_proposer_for_fee_collection</a>, <a href="#high-level-req-6.2">process_collected_fees</a>, and <a href="#high-level-req-6.3">upgrade_burn_percentage</a>.</td>
+</tr>
+
+</table>
+
+
+
+
+<a id="module-level-spec"></a>
+
+### Module-level Specification
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+<b>pragma</b> aborts_if_is_strict;
+// This enforces <a id="high-level-req-1" href="#high-level-req">high-level requirement 1</a>:
+<b>invariant</b> [suspendable] <a href="chain_status.md#0x1_chain_status_is_operating">chain_status::is_operating</a>() ==&gt; <b>exists</b>&lt;<a href="transaction_fee.md#0x1_transaction_fee_AptosCoinCapabilities">AptosCoinCapabilities</a>&gt;(@aptos_framework) || <b>exists</b>&lt;<a href="transaction_fee.md#0x1_transaction_fee_AptosFABurnCapabilities">AptosFABurnCapabilities</a>&gt;(@aptos_framework);
+</code></pre>
+
+
+
+<a id="@Specification_1_CollectedFeesPerBlock"></a>
+
+### Resource `CollectedFeesPerBlock`
+
+
+<pre><code><b>struct</b> <a href="transaction_fee.md#0x1_transaction_fee_CollectedFeesPerBlock">CollectedFeesPerBlock</a> <b>has</b> key
+</code></pre>
+
+
+
+<dl>
+<dt>
+<code>amount: <a href="coin.md#0x1_coin_AggregatableCoin">coin::AggregatableCoin</a>&lt;<a href="aptos_coin.md#0x1_aptos_coin_AptosCoin">aptos_coin::AptosCoin</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>proposer: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<b>address</b>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>burn_percentage: u8</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+
+<pre><code>// This enforces <a id="high-level-req-4" href="#high-level-req">high-level requirement 4</a>:
+<b>invariant</b> burn_percentage &lt;= 100;
+</code></pre>
+
+
+
+<a id="@Specification_1_initialize_fee_collection_and_distribution"></a>
+
+### Function `initialize_fee_collection_and_distribution`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="transaction_fee.md#0x1_transaction_fee_initialize_fee_collection_and_distribution">initialize_fee_collection_and_distribution</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, burn_percentage: u8)
+</code></pre>
+
+
+
+
+<pre><code>// This enforces <a id="high-level-req-2" href="#high-level-req">high-level requirement 2</a>:
+<b>aborts_if</b> <b>exists</b>&lt;<a href="transaction_fee.md#0x1_transaction_fee_CollectedFeesPerBlock">CollectedFeesPerBlock</a>&gt;(@aptos_framework);
+<b>aborts_if</b> burn_percentage &gt; 100;
+<b>let</b> aptos_addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(aptos_framework);
+// This enforces <a id="high-level-req-3" href="#high-level-req">high-level requirement 3</a>:
+<b>aborts_if</b> !<a href="system_addresses.md#0x1_system_addresses_is_aptos_framework_address">system_addresses::is_aptos_framework_address</a>(aptos_addr);
+<b>aborts_if</b> <b>exists</b>&lt;ValidatorFees&gt;(aptos_addr);
+<b>include</b> <a href="system_addresses.md#0x1_system_addresses_AbortsIfNotAptosFramework">system_addresses::AbortsIfNotAptosFramework</a> { <a href="account.md#0x1_account">account</a>: aptos_framework };
+<b>include</b> <a href="aggregator_factory.md#0x1_aggregator_factory_CreateAggregatorInternalAbortsIf">aggregator_factory::CreateAggregatorInternalAbortsIf</a>;
+<b>aborts_if</b> <b>exists</b>&lt;<a href="transaction_fee.md#0x1_transaction_fee_CollectedFeesPerBlock">CollectedFeesPerBlock</a>&gt;(aptos_addr);
+<b>ensures</b> <b>exists</b>&lt;ValidatorFees&gt;(aptos_addr);
+<b>ensures</b> <b>exists</b>&lt;<a href="transaction_fee.md#0x1_transaction_fee_CollectedFeesPerBlock">CollectedFeesPerBlock</a>&gt;(aptos_addr);
+</code></pre>
+
+
+
+<a id="@Specification_1_upgrade_burn_percentage"></a>
+
+### Function `upgrade_burn_percentage`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="transaction_fee.md#0x1_transaction_fee_upgrade_burn_percentage">upgrade_burn_percentage</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, new_burn_percentage: u8)
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> new_burn_percentage &gt; 100;
+<b>let</b> aptos_addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(aptos_framework);
+<b>aborts_if</b> !<a href="system_addresses.md#0x1_system_addresses_is_aptos_framework_address">system_addresses::is_aptos_framework_address</a>(aptos_addr);
+// This enforces <a id="high-level-req-5" href="#high-level-req">high-level requirement 5</a> and <a id="high-level-req-6.3" href="#high-level-req">high-level requirement 6</a>:
+<b>include</b> <a href="transaction_fee.md#0x1_transaction_fee_ProcessCollectedFeesRequiresAndEnsures">ProcessCollectedFeesRequiresAndEnsures</a>;
+<b>ensures</b> <b>exists</b>&lt;<a href="transaction_fee.md#0x1_transaction_fee_CollectedFeesPerBlock">CollectedFeesPerBlock</a>&gt;(@aptos_framework) ==&gt;
+    <b>global</b>&lt;<a href="transaction_fee.md#0x1_transaction_fee_CollectedFeesPerBlock">CollectedFeesPerBlock</a>&gt;(@aptos_framework).burn_percentage == new_burn_percentage;
+</code></pre>
+
+
+
+<a id="@Specification_1_register_proposer_for_fee_collection"></a>
+
+### Function `register_proposer_for_fee_collection`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="transaction_fee.md#0x1_transaction_fee_register_proposer_for_fee_collection">register_proposer_for_fee_collection</a>(proposer_addr: <b>address</b>)
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+// This enforces <a id="high-level-req-6.1" href="#high-level-req">high-level requirement 6</a>:
+<b>ensures</b> <a href="transaction_fee.md#0x1_transaction_fee_is_fees_collection_enabled">is_fees_collection_enabled</a>() ==&gt;
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_borrow">option::spec_borrow</a>(<b>global</b>&lt;<a href="transaction_fee.md#0x1_transaction_fee_CollectedFeesPerBlock">CollectedFeesPerBlock</a>&gt;(@aptos_framework).proposer) == proposer_addr;
+</code></pre>
+
+
+
+<a id="@Specification_1_burn_coin_fraction"></a>
+
+### Function `burn_coin_fraction`
+
+
+<pre><code><b>fun</b> <a href="transaction_fee.md#0x1_transaction_fee_burn_coin_fraction">burn_coin_fraction</a>(<a href="coin.md#0x1_coin">coin</a>: &<b>mut</b> <a href="coin.md#0x1_coin_Coin">coin::Coin</a>&lt;<a href="aptos_coin.md#0x1_aptos_coin_AptosCoin">aptos_coin::AptosCoin</a>&gt;, burn_percentage: u8)
+</code></pre>
+
+
+
+
+<pre><code><b>requires</b> burn_percentage &lt;= 100;
+<b>requires</b> <b>exists</b>&lt;<a href="transaction_fee.md#0x1_transaction_fee_AptosCoinCapabilities">AptosCoinCapabilities</a>&gt;(@aptos_framework);
+<b>requires</b> <b>exists</b>&lt;CoinInfo&lt;AptosCoin&gt;&gt;(@aptos_framework);
+<b>let</b> amount_to_burn = (burn_percentage * <a href="coin.md#0x1_coin_value">coin::value</a>(<a href="coin.md#0x1_coin">coin</a>)) / 100;
+<b>include</b> amount_to_burn &gt; 0 ==&gt; <a href="coin.md#0x1_coin_CoinSubAbortsIf">coin::CoinSubAbortsIf</a>&lt;AptosCoin&gt; { amount: amount_to_burn };
+<b>ensures</b> <a href="coin.md#0x1_coin">coin</a>.value == <b>old</b>(<a href="coin.md#0x1_coin">coin</a>).value - amount_to_burn;
+</code></pre>
+
+
+
+
+<a id="0x1_transaction_fee_collectedFeesAggregator"></a>
+
+
+<pre><code><b>fun</b> <a href="transaction_fee.md#0x1_transaction_fee_collectedFeesAggregator">collectedFeesAggregator</a>(): AggregatableCoin&lt;AptosCoin&gt; {
+   <b>global</b>&lt;<a href="transaction_fee.md#0x1_transaction_fee_CollectedFeesPerBlock">CollectedFeesPerBlock</a>&gt;(@aptos_framework).amount
+}
+</code></pre>
+
+
+
+
+<a id="0x1_transaction_fee_RequiresCollectedFeesPerValueLeqBlockAptosSupply"></a>
+
+
+<pre><code><b>schema</b> <a href="transaction_fee.md#0x1_transaction_fee_RequiresCollectedFeesPerValueLeqBlockAptosSupply">RequiresCollectedFeesPerValueLeqBlockAptosSupply</a> {
+    <b>let</b> maybe_supply = <a href="coin.md#0x1_coin_get_coin_supply_opt">coin::get_coin_supply_opt</a>&lt;AptosCoin&gt;();
+    <b>requires</b>
+        (<a href="transaction_fee.md#0x1_transaction_fee_is_fees_collection_enabled">is_fees_collection_enabled</a>() && <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(maybe_supply)) ==&gt;
+            (<a href="aggregator.md#0x1_aggregator_spec_aggregator_get_val">aggregator::spec_aggregator_get_val</a>(<b>global</b>&lt;<a href="transaction_fee.md#0x1_transaction_fee_CollectedFeesPerBlock">CollectedFeesPerBlock</a>&gt;(@aptos_framework).amount.value) &lt;=
+                <a href="optional_aggregator.md#0x1_optional_aggregator_optional_aggregator_value">optional_aggregator::optional_aggregator_value</a>(
+                    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_borrow">option::spec_borrow</a>(<a href="coin.md#0x1_coin_get_coin_supply_opt">coin::get_coin_supply_opt</a>&lt;AptosCoin&gt;())
+                ));
+}
+</code></pre>
+
+
+
+
+<a id="0x1_transaction_fee_ProcessCollectedFeesRequiresAndEnsures"></a>
+
+
+<pre><code><b>schema</b> <a href="transaction_fee.md#0x1_transaction_fee_ProcessCollectedFeesRequiresAndEnsures">ProcessCollectedFeesRequiresAndEnsures</a> {
+    <b>requires</b> <b>exists</b>&lt;<a href="transaction_fee.md#0x1_transaction_fee_AptosCoinCapabilities">AptosCoinCapabilities</a>&gt;(@aptos_framework);
+    <b>requires</b> <b>exists</b>&lt;<a href="stake.md#0x1_stake_ValidatorFees">stake::ValidatorFees</a>&gt;(@aptos_framework);
+    <b>requires</b> <b>exists</b>&lt;CoinInfo&lt;AptosCoin&gt;&gt;(@aptos_framework);
+    <b>include</b> <a href="transaction_fee.md#0x1_transaction_fee_RequiresCollectedFeesPerValueLeqBlockAptosSupply">RequiresCollectedFeesPerValueLeqBlockAptosSupply</a>;
+    <b>aborts_if</b> <b>false</b>;
+    <b>let</b> collected_fees = <b>global</b>&lt;<a href="transaction_fee.md#0x1_transaction_fee_CollectedFeesPerBlock">CollectedFeesPerBlock</a>&gt;(@aptos_framework);
+    <b>let</b> <b>post</b> post_collected_fees = <b>global</b>&lt;<a href="transaction_fee.md#0x1_transaction_fee_CollectedFeesPerBlock">CollectedFeesPerBlock</a>&gt;(@aptos_framework);
+    <b>let</b> pre_amount = <a href="aggregator.md#0x1_aggregator_spec_aggregator_get_val">aggregator::spec_aggregator_get_val</a>(collected_fees.amount.value);
+    <b>let</b> <b>post</b> post_amount = <a href="aggregator.md#0x1_aggregator_spec_aggregator_get_val">aggregator::spec_aggregator_get_val</a>(post_collected_fees.amount.value);
+    <b>let</b> fees_table = <b>global</b>&lt;<a href="stake.md#0x1_stake_ValidatorFees">stake::ValidatorFees</a>&gt;(@aptos_framework).fees_table;
+    <b>let</b> <b>post</b> post_fees_table = <b>global</b>&lt;<a href="stake.md#0x1_stake_ValidatorFees">stake::ValidatorFees</a>&gt;(@aptos_framework).fees_table;
+    <b>let</b> proposer = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_borrow">option::spec_borrow</a>(collected_fees.proposer);
+    <b>let</b> fee_to_add = pre_amount - pre_amount * collected_fees.burn_percentage / 100;
+    <b>ensures</b> <a href="transaction_fee.md#0x1_transaction_fee_is_fees_collection_enabled">is_fees_collection_enabled</a>() ==&gt; <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_is_none">option::spec_is_none</a>(post_collected_fees.proposer) && post_amount == 0;
+    <b>ensures</b> <a href="transaction_fee.md#0x1_transaction_fee_is_fees_collection_enabled">is_fees_collection_enabled</a>() && <a href="aggregator.md#0x1_aggregator_spec_read">aggregator::spec_read</a>(collected_fees.amount.value) &gt; 0 &&
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_is_some">option::spec_is_some</a>(collected_fees.proposer) ==&gt;
+        <b>if</b> (proposer != @vm_reserved) {
+            <b>if</b> (<a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_contains">table::spec_contains</a>(fees_table, proposer)) {
+                <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(post_fees_table, proposer).value == <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(
+                    fees_table,
+                    proposer
+                ).value + fee_to_add
+            } <b>else</b> {
+                <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(post_fees_table, proposer).value == fee_to_add
+            }
+        } <b>else</b> {
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_is_none">option::spec_is_none</a>(post_collected_fees.proposer) && post_amount == 0
+        };
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_process_collected_fees"></a>
+
+### Function `process_collected_fees`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="transaction_fee.md#0x1_transaction_fee_process_collected_fees">process_collected_fees</a>()
+</code></pre>
+
+
+
+
+<pre><code>// This enforces <a id="high-level-req-6.2" href="#high-level-req">high-level requirement 6</a>:
+<b>include</b> <a href="transaction_fee.md#0x1_transaction_fee_ProcessCollectedFeesRequiresAndEnsures">ProcessCollectedFeesRequiresAndEnsures</a>;
+</code></pre>
+
+
+
+<a id="@Specification_1_burn_fee"></a>
+
+### Function `burn_fee`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="transaction_fee.md#0x1_transaction_fee_burn_fee">burn_fee</a>(<a href="account.md#0x1_account">account</a>: <b>address</b>, fee: u64)
+</code></pre>
+
+
+<code><a href="transaction_fee.md#0x1_transaction_fee_AptosCoinCapabilities">AptosCoinCapabilities</a></code> should be exists.
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="transaction_fee.md#0x1_transaction_fee_AptosCoinCapabilities">AptosCoinCapabilities</a>&gt;(@aptos_framework);
+<b>let</b> account_addr = <a href="account.md#0x1_account">account</a>;
+<b>let</b> amount = fee;
+<b>let</b> aptos_addr = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_type_of">type_info::type_of</a>&lt;AptosCoin&gt;().account_address;
+<b>let</b> coin_store = <b>global</b>&lt;CoinStore&lt;AptosCoin&gt;&gt;(account_addr);
+<b>let</b> <b>post</b> post_coin_store = <b>global</b>&lt;CoinStore&lt;AptosCoin&gt;&gt;(account_addr);
+<b>aborts_if</b> amount != 0 && !(<b>exists</b>&lt;CoinInfo&lt;AptosCoin&gt;&gt;(aptos_addr)
+    && <b>exists</b>&lt;CoinStore&lt;AptosCoin&gt;&gt;(account_addr));
+<b>aborts_if</b> coin_store.<a href="coin.md#0x1_coin">coin</a>.value &lt; amount;
+<b>let</b> maybe_supply = <b>global</b>&lt;CoinInfo&lt;AptosCoin&gt;&gt;(aptos_addr).supply;
+<b>let</b> supply_aggr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_borrow">option::spec_borrow</a>(maybe_supply);
+<b>let</b> value = <a href="optional_aggregator.md#0x1_optional_aggregator_optional_aggregator_value">optional_aggregator::optional_aggregator_value</a>(supply_aggr);
+<b>let</b> <b>post</b> post_maybe_supply = <b>global</b>&lt;CoinInfo&lt;AptosCoin&gt;&gt;(aptos_addr).supply;
+<b>let</b> <b>post</b> post_supply = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_borrow">option::spec_borrow</a>(post_maybe_supply);
+<b>let</b> <b>post</b> post_value = <a href="optional_aggregator.md#0x1_optional_aggregator_optional_aggregator_value">optional_aggregator::optional_aggregator_value</a>(post_supply);
+<b>aborts_if</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_is_some">option::spec_is_some</a>(maybe_supply) && value &lt; amount;
+<b>ensures</b> post_coin_store.<a href="coin.md#0x1_coin">coin</a>.value == coin_store.<a href="coin.md#0x1_coin">coin</a>.value - amount;
+<b>ensures</b> <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_is_some">option::spec_is_some</a>(maybe_supply)) {
+    post_value == value - amount
+} <b>else</b> {
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_is_none">option::spec_is_none</a>(post_maybe_supply)
+};
+<b>ensures</b> <a href="coin.md#0x1_coin_supply">coin::supply</a>&lt;AptosCoin&gt; == <b>old</b>(<a href="coin.md#0x1_coin_supply">coin::supply</a>&lt;AptosCoin&gt;) - amount;
+</code></pre>
+
+
+
+<a id="@Specification_1_mint_and_refund"></a>
+
+### Function `mint_and_refund`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="transaction_fee.md#0x1_transaction_fee_mint_and_refund">mint_and_refund</a>(<a href="account.md#0x1_account">account</a>: <b>address</b>, refund: u64)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+<b>let</b> aptos_addr = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_type_of">type_info::type_of</a>&lt;AptosCoin&gt;().account_address;
+<b>aborts_if</b> (refund != 0) && !<b>exists</b>&lt;CoinInfo&lt;AptosCoin&gt;&gt;(aptos_addr);
+<b>include</b> <a href="coin.md#0x1_coin_CoinAddAbortsIf">coin::CoinAddAbortsIf</a>&lt;AptosCoin&gt; { amount: refund };
+<b>aborts_if</b> !<b>exists</b>&lt;CoinStore&lt;AptosCoin&gt;&gt;(<a href="account.md#0x1_account">account</a>);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="transaction_fee.md#0x1_transaction_fee_AptosCoinMintCapability">AptosCoinMintCapability</a>&gt;(@aptos_framework);
+<b>let</b> supply = <a href="coin.md#0x1_coin_supply">coin::supply</a>&lt;AptosCoin&gt;;
+<b>let</b> <b>post</b> post_supply = <a href="coin.md#0x1_coin_supply">coin::supply</a>&lt;AptosCoin&gt;;
+<b>aborts_if</b> [abstract] supply + refund &gt; MAX_U128;
+<b>ensures</b> post_supply == supply + refund;
+</code></pre>
+
+
+
+<a id="@Specification_1_collect_fee"></a>
+
+### Function `collect_fee`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="transaction_fee.md#0x1_transaction_fee_collect_fee">collect_fee</a>(<a href="account.md#0x1_account">account</a>: <b>address</b>, fee: u64)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+<b>let</b> collected_fees = <b>global</b>&lt;<a href="transaction_fee.md#0x1_transaction_fee_CollectedFeesPerBlock">CollectedFeesPerBlock</a>&gt;(@aptos_framework).amount;
+<b>let</b> aggr = collected_fees.value;
+<b>let</b> coin_store = <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;AptosCoin&gt;&gt;(<a href="account.md#0x1_account">account</a>);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="transaction_fee.md#0x1_transaction_fee_CollectedFeesPerBlock">CollectedFeesPerBlock</a>&gt;(@aptos_framework);
+<b>aborts_if</b> fee &gt; 0 && !<b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;AptosCoin&gt;&gt;(<a href="account.md#0x1_account">account</a>);
+<b>aborts_if</b> fee &gt; 0 && coin_store.<a href="coin.md#0x1_coin">coin</a>.value &lt; fee;
+<b>aborts_if</b> fee &gt; 0 && <a href="aggregator.md#0x1_aggregator_spec_aggregator_get_val">aggregator::spec_aggregator_get_val</a>(aggr)
+    + fee &gt; <a href="aggregator.md#0x1_aggregator_spec_get_limit">aggregator::spec_get_limit</a>(aggr);
+<b>aborts_if</b> fee &gt; 0 && <a href="aggregator.md#0x1_aggregator_spec_aggregator_get_val">aggregator::spec_aggregator_get_val</a>(aggr)
+    + fee &gt; MAX_U128;
+<b>let</b> <b>post</b> post_coin_store = <b>global</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;AptosCoin&gt;&gt;(<a href="account.md#0x1_account">account</a>);
+<b>let</b> <b>post</b> post_collected_fees = <b>global</b>&lt;<a href="transaction_fee.md#0x1_transaction_fee_CollectedFeesPerBlock">CollectedFeesPerBlock</a>&gt;(@aptos_framework).amount;
+<b>ensures</b> post_coin_store.<a href="coin.md#0x1_coin">coin</a>.value == coin_store.<a href="coin.md#0x1_coin">coin</a>.value - fee;
+<b>ensures</b> <a href="aggregator.md#0x1_aggregator_spec_aggregator_get_val">aggregator::spec_aggregator_get_val</a>(post_collected_fees.value) == <a href="aggregator.md#0x1_aggregator_spec_aggregator_get_val">aggregator::spec_aggregator_get_val</a>(
+    aggr
+) + fee;
+</code></pre>
+
+
+
+<a id="@Specification_1_store_aptos_coin_burn_cap"></a>
+
+### Function `store_aptos_coin_burn_cap`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="transaction_fee.md#0x1_transaction_fee_store_aptos_coin_burn_cap">store_aptos_coin_burn_cap</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, burn_cap: <a href="coin.md#0x1_coin_BurnCapability">coin::BurnCapability</a>&lt;<a href="aptos_coin.md#0x1_aptos_coin_AptosCoin">aptos_coin::AptosCoin</a>&gt;)
+</code></pre>
+
+
+Ensure caller is admin.
+Aborts if <code><a href="transaction_fee.md#0x1_transaction_fee_AptosCoinCapabilities">AptosCoinCapabilities</a></code> already exists.
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+<b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(aptos_framework);
+<b>aborts_if</b> !<a href="system_addresses.md#0x1_system_addresses_is_aptos_framework_address">system_addresses::is_aptos_framework_address</a>(addr);
+<b>aborts_if</b> <b>exists</b>&lt;<a href="transaction_fee.md#0x1_transaction_fee_AptosFABurnCapabilities">AptosFABurnCapabilities</a>&gt;(addr);
+<b>aborts_if</b> <b>exists</b>&lt;<a href="transaction_fee.md#0x1_transaction_fee_AptosCoinCapabilities">AptosCoinCapabilities</a>&gt;(addr);
+<b>ensures</b> <b>exists</b>&lt;<a href="transaction_fee.md#0x1_transaction_fee_AptosFABurnCapabilities">AptosFABurnCapabilities</a>&gt;(addr) || <b>exists</b>&lt;<a href="transaction_fee.md#0x1_transaction_fee_AptosCoinCapabilities">AptosCoinCapabilities</a>&gt;(addr);
+</code></pre>
+
+
+
+<a id="@Specification_1_store_aptos_coin_mint_cap"></a>
+
+### Function `store_aptos_coin_mint_cap`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="transaction_fee.md#0x1_transaction_fee_store_aptos_coin_mint_cap">store_aptos_coin_mint_cap</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, mint_cap: <a href="coin.md#0x1_coin_MintCapability">coin::MintCapability</a>&lt;<a href="aptos_coin.md#0x1_aptos_coin_AptosCoin">aptos_coin::AptosCoin</a>&gt;)
+</code></pre>
+
+
+Ensure caller is admin.
+Aborts if <code><a href="transaction_fee.md#0x1_transaction_fee_AptosCoinMintCapability">AptosCoinMintCapability</a></code> already exists.
+
+
+<pre><code><b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(aptos_framework);
+<b>aborts_if</b> !<a href="system_addresses.md#0x1_system_addresses_is_aptos_framework_address">system_addresses::is_aptos_framework_address</a>(addr);
+<b>aborts_if</b> <b>exists</b>&lt;<a href="transaction_fee.md#0x1_transaction_fee_AptosCoinMintCapability">AptosCoinMintCapability</a>&gt;(addr);
+<b>ensures</b> <b>exists</b>&lt;<a href="transaction_fee.md#0x1_transaction_fee_AptosCoinMintCapability">AptosCoinMintCapability</a>&gt;(addr);
+</code></pre>
+
+
+
+<a id="@Specification_1_initialize_storage_refund"></a>
+
+### Function `initialize_storage_refund`
+
+
+<pre><code>#[deprecated]
+<b>public</b> <b>fun</b> <a href="transaction_fee.md#0x1_transaction_fee_initialize_storage_refund">initialize_storage_refund</a>(_: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+Historical. Aborts.
+
+
+<pre><code><b>aborts_if</b> <b>true</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_emit_fee_statement"></a>
+
+### Function `emit_fee_statement`
+
+
+<pre><code><b>fun</b> <a href="transaction_fee.md#0x1_transaction_fee_emit_fee_statement">emit_fee_statement</a>(fee_statement: <a href="transaction_fee.md#0x1_transaction_fee_FeeStatement">transaction_fee::FeeStatement</a>)
+</code></pre>
+
+
+Aborts if module event feature is not enabled.
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/transaction_validation.md b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/transaction_validation.md
new file mode 100644
index 0000000000000..adebab98ec1c2
--- /dev/null
+++ b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/transaction_validation.md
@@ -0,0 +1,1033 @@
+
+<a id="0x1_transaction_validation"></a>
+
+# Module `0x1::transaction_validation`
+
+
+
+-  [Resource `TransactionValidation`](#0x1_transaction_validation_TransactionValidation)
+-  [Constants](#@Constants_0)
+-  [Function `initialize`](#0x1_transaction_validation_initialize)
+-  [Function `prologue_common`](#0x1_transaction_validation_prologue_common)
+-  [Function `script_prologue`](#0x1_transaction_validation_script_prologue)
+-  [Function `multi_agent_script_prologue`](#0x1_transaction_validation_multi_agent_script_prologue)
+-  [Function `multi_agent_common_prologue`](#0x1_transaction_validation_multi_agent_common_prologue)
+-  [Function `fee_payer_script_prologue`](#0x1_transaction_validation_fee_payer_script_prologue)
+-  [Function `epilogue`](#0x1_transaction_validation_epilogue)
+-  [Function `epilogue_gas_payer`](#0x1_transaction_validation_epilogue_gas_payer)
+-  [Specification](#@Specification_1)
+    -  [High-level Requirements](#high-level-req)
+    -  [Module-level Specification](#module-level-spec)
+    -  [Function `initialize`](#@Specification_1_initialize)
+    -  [Function `prologue_common`](#@Specification_1_prologue_common)
+    -  [Function `script_prologue`](#@Specification_1_script_prologue)
+    -  [Function `multi_agent_script_prologue`](#@Specification_1_multi_agent_script_prologue)
+    -  [Function `multi_agent_common_prologue`](#@Specification_1_multi_agent_common_prologue)
+    -  [Function `fee_payer_script_prologue`](#@Specification_1_fee_payer_script_prologue)
+    -  [Function `epilogue`](#@Specification_1_epilogue)
+    -  [Function `epilogue_gas_payer`](#@Specification_1_epilogue_gas_payer)
+
+
+<pre><code><b>use</b> <a href="account.md#0x1_account">0x1::account</a>;
+<b>use</b> <a href="aptos_account.md#0x1_aptos_account">0x1::aptos_account</a>;
+<b>use</b> <a href="aptos_coin.md#0x1_aptos_coin">0x1::aptos_coin</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs">0x1::bcs</a>;
+<b>use</b> <a href="chain_id.md#0x1_chain_id">0x1::chain_id</a>;
+<b>use</b> <a href="coin.md#0x1_coin">0x1::coin</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features">0x1::features</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">0x1::signer</a>;
+<b>use</b> <a href="system_addresses.md#0x1_system_addresses">0x1::system_addresses</a>;
+<b>use</b> <a href="timestamp.md#0x1_timestamp">0x1::timestamp</a>;
+<b>use</b> <a href="transaction_fee.md#0x1_transaction_fee">0x1::transaction_fee</a>;
+</code></pre>
+
+
+
+<a id="0x1_transaction_validation_TransactionValidation"></a>
+
+## Resource `TransactionValidation`
+
+This holds information that will be picked up by the VM to call the
+correct chain-specific prologue and epilogue functions
+
+
+<pre><code><b>struct</b> <a href="transaction_validation.md#0x1_transaction_validation_TransactionValidation">TransactionValidation</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>module_addr: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>module_name: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>script_prologue_name: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>module_prologue_name: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>multi_agent_prologue_name: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>user_epilogue_name: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_transaction_validation_MAX_U64"></a>
+
+MSB is used to indicate a gas payer tx
+
+
+<pre><code><b>const</b> <a href="transaction_validation.md#0x1_transaction_validation_MAX_U64">MAX_U64</a>: u128 = 18446744073709551615;
+</code></pre>
+
+
+
+<a id="0x1_transaction_validation_EOUT_OF_GAS"></a>
+
+Transaction exceeded its allocated max gas
+
+
+<pre><code><b>const</b> <a href="transaction_validation.md#0x1_transaction_validation_EOUT_OF_GAS">EOUT_OF_GAS</a>: u64 = 6;
+</code></pre>
+
+
+
+<a id="0x1_transaction_validation_PROLOGUE_EACCOUNT_DOES_NOT_EXIST"></a>
+
+
+
+<pre><code><b>const</b> <a href="transaction_validation.md#0x1_transaction_validation_PROLOGUE_EACCOUNT_DOES_NOT_EXIST">PROLOGUE_EACCOUNT_DOES_NOT_EXIST</a>: u64 = 1004;
+</code></pre>
+
+
+
+<a id="0x1_transaction_validation_PROLOGUE_EBAD_CHAIN_ID"></a>
+
+
+
+<pre><code><b>const</b> <a href="transaction_validation.md#0x1_transaction_validation_PROLOGUE_EBAD_CHAIN_ID">PROLOGUE_EBAD_CHAIN_ID</a>: u64 = 1007;
+</code></pre>
+
+
+
+<a id="0x1_transaction_validation_PROLOGUE_ECANT_PAY_GAS_DEPOSIT"></a>
+
+
+
+<pre><code><b>const</b> <a href="transaction_validation.md#0x1_transaction_validation_PROLOGUE_ECANT_PAY_GAS_DEPOSIT">PROLOGUE_ECANT_PAY_GAS_DEPOSIT</a>: u64 = 1005;
+</code></pre>
+
+
+
+<a id="0x1_transaction_validation_PROLOGUE_EFEE_PAYER_NOT_ENABLED"></a>
+
+
+
+<pre><code><b>const</b> <a href="transaction_validation.md#0x1_transaction_validation_PROLOGUE_EFEE_PAYER_NOT_ENABLED">PROLOGUE_EFEE_PAYER_NOT_ENABLED</a>: u64 = 1010;
+</code></pre>
+
+
+
+<a id="0x1_transaction_validation_PROLOGUE_EINVALID_ACCOUNT_AUTH_KEY"></a>
+
+Prologue errors. These are separated out from the other errors in this
+module since they are mapped separately to major VM statuses, and are
+important to the semantics of the system.
+
+
+<pre><code><b>const</b> <a href="transaction_validation.md#0x1_transaction_validation_PROLOGUE_EINVALID_ACCOUNT_AUTH_KEY">PROLOGUE_EINVALID_ACCOUNT_AUTH_KEY</a>: u64 = 1001;
+</code></pre>
+
+
+
+<a id="0x1_transaction_validation_PROLOGUE_ESECONDARY_KEYS_ADDRESSES_COUNT_MISMATCH"></a>
+
+
+
+<pre><code><b>const</b> <a href="transaction_validation.md#0x1_transaction_validation_PROLOGUE_ESECONDARY_KEYS_ADDRESSES_COUNT_MISMATCH">PROLOGUE_ESECONDARY_KEYS_ADDRESSES_COUNT_MISMATCH</a>: u64 = 1009;
+</code></pre>
+
+
+
+<a id="0x1_transaction_validation_PROLOGUE_ESEQUENCE_NUMBER_TOO_BIG"></a>
+
+
+
+<pre><code><b>const</b> <a href="transaction_validation.md#0x1_transaction_validation_PROLOGUE_ESEQUENCE_NUMBER_TOO_BIG">PROLOGUE_ESEQUENCE_NUMBER_TOO_BIG</a>: u64 = 1008;
+</code></pre>
+
+
+
+<a id="0x1_transaction_validation_PROLOGUE_ESEQUENCE_NUMBER_TOO_NEW"></a>
+
+
+
+<pre><code><b>const</b> <a href="transaction_validation.md#0x1_transaction_validation_PROLOGUE_ESEQUENCE_NUMBER_TOO_NEW">PROLOGUE_ESEQUENCE_NUMBER_TOO_NEW</a>: u64 = 1003;
+</code></pre>
+
+
+
+<a id="0x1_transaction_validation_PROLOGUE_ESEQUENCE_NUMBER_TOO_OLD"></a>
+
+
+
+<pre><code><b>const</b> <a href="transaction_validation.md#0x1_transaction_validation_PROLOGUE_ESEQUENCE_NUMBER_TOO_OLD">PROLOGUE_ESEQUENCE_NUMBER_TOO_OLD</a>: u64 = 1002;
+</code></pre>
+
+
+
+<a id="0x1_transaction_validation_PROLOGUE_ETRANSACTION_EXPIRED"></a>
+
+
+
+<pre><code><b>const</b> <a href="transaction_validation.md#0x1_transaction_validation_PROLOGUE_ETRANSACTION_EXPIRED">PROLOGUE_ETRANSACTION_EXPIRED</a>: u64 = 1006;
+</code></pre>
+
+
+
+<a id="0x1_transaction_validation_initialize"></a>
+
+## Function `initialize`
+
+Only called during genesis to initialize system resources for this module.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="transaction_validation.md#0x1_transaction_validation_initialize">initialize</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, script_prologue_name: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, module_prologue_name: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, multi_agent_prologue_name: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, user_epilogue_name: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="transaction_validation.md#0x1_transaction_validation_initialize">initialize</a>(
+    aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    script_prologue_name: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    // module_prologue_name is deprecated and not used.
+    module_prologue_name: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    multi_agent_prologue_name: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    user_epilogue_name: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+) {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(aptos_framework);
+
+    <b>move_to</b>(aptos_framework, <a href="transaction_validation.md#0x1_transaction_validation_TransactionValidation">TransactionValidation</a> {
+        module_addr: @aptos_framework,
+        module_name: b"<a href="transaction_validation.md#0x1_transaction_validation">transaction_validation</a>",
+        script_prologue_name,
+        // module_prologue_name is deprecated and not used.
+        module_prologue_name,
+        multi_agent_prologue_name,
+        user_epilogue_name,
+    });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_transaction_validation_prologue_common"></a>
+
+## Function `prologue_common`
+
+
+
+<pre><code><b>fun</b> <a href="transaction_validation.md#0x1_transaction_validation_prologue_common">prologue_common</a>(sender: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, gas_payer: <b>address</b>, txn_sequence_number: u64, txn_authentication_key: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, txn_gas_price: u64, txn_max_gas_units: u64, txn_expiration_time: u64, <a href="chain_id.md#0x1_chain_id">chain_id</a>: u8)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="transaction_validation.md#0x1_transaction_validation_prologue_common">prologue_common</a>(
+    sender: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    gas_payer: <b>address</b>,
+    txn_sequence_number: u64,
+    txn_authentication_key: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    txn_gas_price: u64,
+    txn_max_gas_units: u64,
+    txn_expiration_time: u64,
+    <a href="chain_id.md#0x1_chain_id">chain_id</a>: u8,
+) {
+    <b>assert</b>!(
+        <a href="timestamp.md#0x1_timestamp_now_seconds">timestamp::now_seconds</a>() &lt; txn_expiration_time,
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="transaction_validation.md#0x1_transaction_validation_PROLOGUE_ETRANSACTION_EXPIRED">PROLOGUE_ETRANSACTION_EXPIRED</a>),
+    );
+    <b>assert</b>!(<a href="chain_id.md#0x1_chain_id_get">chain_id::get</a>() == <a href="chain_id.md#0x1_chain_id">chain_id</a>, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="transaction_validation.md#0x1_transaction_validation_PROLOGUE_EBAD_CHAIN_ID">PROLOGUE_EBAD_CHAIN_ID</a>));
+
+    <b>let</b> transaction_sender = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(&sender);
+
+    <b>if</b> (
+        transaction_sender == gas_payer
+            || <a href="account.md#0x1_account_exists_at">account::exists_at</a>(transaction_sender)
+            || !<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_sponsored_automatic_account_creation_enabled">features::sponsored_automatic_account_creation_enabled</a>()
+            || txn_sequence_number &gt; 0
+    ) {
+        <b>assert</b>!(<a href="account.md#0x1_account_exists_at">account::exists_at</a>(transaction_sender), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="transaction_validation.md#0x1_transaction_validation_PROLOGUE_EACCOUNT_DOES_NOT_EXIST">PROLOGUE_EACCOUNT_DOES_NOT_EXIST</a>));
+        <b>assert</b>!(
+            txn_authentication_key == <a href="account.md#0x1_account_get_authentication_key">account::get_authentication_key</a>(transaction_sender),
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="transaction_validation.md#0x1_transaction_validation_PROLOGUE_EINVALID_ACCOUNT_AUTH_KEY">PROLOGUE_EINVALID_ACCOUNT_AUTH_KEY</a>),
+        );
+
+        <b>let</b> account_sequence_number = <a href="account.md#0x1_account_get_sequence_number">account::get_sequence_number</a>(transaction_sender);
+        <b>assert</b>!(
+            txn_sequence_number &lt; (1u64 &lt;&lt; 63),
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_out_of_range">error::out_of_range</a>(<a href="transaction_validation.md#0x1_transaction_validation_PROLOGUE_ESEQUENCE_NUMBER_TOO_BIG">PROLOGUE_ESEQUENCE_NUMBER_TOO_BIG</a>)
+        );
+
+        <b>assert</b>!(
+            txn_sequence_number &gt;= account_sequence_number,
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="transaction_validation.md#0x1_transaction_validation_PROLOGUE_ESEQUENCE_NUMBER_TOO_OLD">PROLOGUE_ESEQUENCE_NUMBER_TOO_OLD</a>)
+        );
+
+        <b>assert</b>!(
+            txn_sequence_number == account_sequence_number,
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="transaction_validation.md#0x1_transaction_validation_PROLOGUE_ESEQUENCE_NUMBER_TOO_NEW">PROLOGUE_ESEQUENCE_NUMBER_TOO_NEW</a>)
+        );
+    } <b>else</b> {
+        // In this case, the transaction is sponsored and the <a href="account.md#0x1_account">account</a> does not exist, so ensure
+        // the default values match.
+        <b>assert</b>!(
+            txn_sequence_number == 0,
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="transaction_validation.md#0x1_transaction_validation_PROLOGUE_ESEQUENCE_NUMBER_TOO_NEW">PROLOGUE_ESEQUENCE_NUMBER_TOO_NEW</a>)
+        );
+
+        <b>assert</b>!(
+            txn_authentication_key == <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs_to_bytes">bcs::to_bytes</a>(&transaction_sender),
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="transaction_validation.md#0x1_transaction_validation_PROLOGUE_EINVALID_ACCOUNT_AUTH_KEY">PROLOGUE_EINVALID_ACCOUNT_AUTH_KEY</a>),
+        );
+    };
+
+    <b>let</b> max_transaction_fee = txn_gas_price * txn_max_gas_units;
+
+    <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_operations_default_to_fa_apt_store_enabled">features::operations_default_to_fa_apt_store_enabled</a>()) {
+        <b>assert</b>!(
+            <a href="aptos_account.md#0x1_aptos_account_is_fungible_balance_at_least">aptos_account::is_fungible_balance_at_least</a>(gas_payer, max_transaction_fee),
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="transaction_validation.md#0x1_transaction_validation_PROLOGUE_ECANT_PAY_GAS_DEPOSIT">PROLOGUE_ECANT_PAY_GAS_DEPOSIT</a>)
+        );
+    } <b>else</b> {
+        <b>assert</b>!(
+            <a href="coin.md#0x1_coin_is_balance_at_least">coin::is_balance_at_least</a>&lt;AptosCoin&gt;(gas_payer, max_transaction_fee),
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="transaction_validation.md#0x1_transaction_validation_PROLOGUE_ECANT_PAY_GAS_DEPOSIT">PROLOGUE_ECANT_PAY_GAS_DEPOSIT</a>)
+        );
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_transaction_validation_script_prologue"></a>
+
+## Function `script_prologue`
+
+
+
+<pre><code><b>fun</b> <a href="transaction_validation.md#0x1_transaction_validation_script_prologue">script_prologue</a>(sender: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, txn_sequence_number: u64, txn_public_key: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, txn_gas_price: u64, txn_max_gas_units: u64, txn_expiration_time: u64, <a href="chain_id.md#0x1_chain_id">chain_id</a>: u8, _script_hash: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="transaction_validation.md#0x1_transaction_validation_script_prologue">script_prologue</a>(
+    sender: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    txn_sequence_number: u64,
+    txn_public_key: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    txn_gas_price: u64,
+    txn_max_gas_units: u64,
+    txn_expiration_time: u64,
+    <a href="chain_id.md#0x1_chain_id">chain_id</a>: u8,
+    _script_hash: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+) {
+    <b>let</b> gas_payer = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(&sender);
+    <a href="transaction_validation.md#0x1_transaction_validation_prologue_common">prologue_common</a>(
+        sender,
+        gas_payer,
+        txn_sequence_number,
+        txn_public_key,
+        txn_gas_price,
+        txn_max_gas_units,
+        txn_expiration_time,
+        <a href="chain_id.md#0x1_chain_id">chain_id</a>
+    )
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_transaction_validation_multi_agent_script_prologue"></a>
+
+## Function `multi_agent_script_prologue`
+
+
+
+<pre><code><b>fun</b> <a href="transaction_validation.md#0x1_transaction_validation_multi_agent_script_prologue">multi_agent_script_prologue</a>(sender: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, txn_sequence_number: u64, txn_sender_public_key: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, secondary_signer_addresses: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;, secondary_signer_public_key_hashes: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;, txn_gas_price: u64, txn_max_gas_units: u64, txn_expiration_time: u64, <a href="chain_id.md#0x1_chain_id">chain_id</a>: u8)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="transaction_validation.md#0x1_transaction_validation_multi_agent_script_prologue">multi_agent_script_prologue</a>(
+    sender: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    txn_sequence_number: u64,
+    txn_sender_public_key: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    secondary_signer_addresses: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;,
+    secondary_signer_public_key_hashes: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;,
+    txn_gas_price: u64,
+    txn_max_gas_units: u64,
+    txn_expiration_time: u64,
+    <a href="chain_id.md#0x1_chain_id">chain_id</a>: u8,
+) {
+    <b>let</b> sender_addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(&sender);
+    <a href="transaction_validation.md#0x1_transaction_validation_prologue_common">prologue_common</a>(
+        sender,
+        sender_addr,
+        txn_sequence_number,
+        txn_sender_public_key,
+        txn_gas_price,
+        txn_max_gas_units,
+        txn_expiration_time,
+        <a href="chain_id.md#0x1_chain_id">chain_id</a>,
+    );
+    <a href="transaction_validation.md#0x1_transaction_validation_multi_agent_common_prologue">multi_agent_common_prologue</a>(secondary_signer_addresses, secondary_signer_public_key_hashes);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_transaction_validation_multi_agent_common_prologue"></a>
+
+## Function `multi_agent_common_prologue`
+
+
+
+<pre><code><b>fun</b> <a href="transaction_validation.md#0x1_transaction_validation_multi_agent_common_prologue">multi_agent_common_prologue</a>(secondary_signer_addresses: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;, secondary_signer_public_key_hashes: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="transaction_validation.md#0x1_transaction_validation_multi_agent_common_prologue">multi_agent_common_prologue</a>(
+    secondary_signer_addresses: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;,
+    secondary_signer_public_key_hashes: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;,
+) {
+    <b>let</b> num_secondary_signers = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&secondary_signer_addresses);
+    <b>assert</b>!(
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&secondary_signer_public_key_hashes) == num_secondary_signers,
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="transaction_validation.md#0x1_transaction_validation_PROLOGUE_ESECONDARY_KEYS_ADDRESSES_COUNT_MISMATCH">PROLOGUE_ESECONDARY_KEYS_ADDRESSES_COUNT_MISMATCH</a>),
+    );
+
+    <b>let</b> i = 0;
+    <b>while</b> ({
+        <b>spec</b> {
+            <b>invariant</b> i &lt;= num_secondary_signers;
+            <b>invariant</b> <b>forall</b> j in 0..i:
+                <a href="account.md#0x1_account_exists_at">account::exists_at</a>(secondary_signer_addresses[j])
+                    && secondary_signer_public_key_hashes[j]
+                    == <a href="account.md#0x1_account_get_authentication_key">account::get_authentication_key</a>(secondary_signer_addresses[j]);
+        };
+        (i &lt; num_secondary_signers)
+    }) {
+        <b>let</b> secondary_address = *<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(&secondary_signer_addresses, i);
+        <b>assert</b>!(<a href="account.md#0x1_account_exists_at">account::exists_at</a>(secondary_address), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="transaction_validation.md#0x1_transaction_validation_PROLOGUE_EACCOUNT_DOES_NOT_EXIST">PROLOGUE_EACCOUNT_DOES_NOT_EXIST</a>));
+
+        <b>let</b> signer_public_key_hash = *<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(&secondary_signer_public_key_hashes, i);
+        <b>assert</b>!(
+            signer_public_key_hash == <a href="account.md#0x1_account_get_authentication_key">account::get_authentication_key</a>(secondary_address),
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="transaction_validation.md#0x1_transaction_validation_PROLOGUE_EINVALID_ACCOUNT_AUTH_KEY">PROLOGUE_EINVALID_ACCOUNT_AUTH_KEY</a>),
+        );
+        i = i + 1;
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_transaction_validation_fee_payer_script_prologue"></a>
+
+## Function `fee_payer_script_prologue`
+
+
+
+<pre><code><b>fun</b> <a href="transaction_validation.md#0x1_transaction_validation_fee_payer_script_prologue">fee_payer_script_prologue</a>(sender: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, txn_sequence_number: u64, txn_sender_public_key: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, secondary_signer_addresses: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;, secondary_signer_public_key_hashes: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;, fee_payer_address: <b>address</b>, fee_payer_public_key_hash: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, txn_gas_price: u64, txn_max_gas_units: u64, txn_expiration_time: u64, <a href="chain_id.md#0x1_chain_id">chain_id</a>: u8)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="transaction_validation.md#0x1_transaction_validation_fee_payer_script_prologue">fee_payer_script_prologue</a>(
+    sender: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    txn_sequence_number: u64,
+    txn_sender_public_key: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    secondary_signer_addresses: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;,
+    secondary_signer_public_key_hashes: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;,
+    fee_payer_address: <b>address</b>,
+    fee_payer_public_key_hash: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    txn_gas_price: u64,
+    txn_max_gas_units: u64,
+    txn_expiration_time: u64,
+    <a href="chain_id.md#0x1_chain_id">chain_id</a>: u8,
+) {
+    <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_fee_payer_enabled">features::fee_payer_enabled</a>(), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="transaction_validation.md#0x1_transaction_validation_PROLOGUE_EFEE_PAYER_NOT_ENABLED">PROLOGUE_EFEE_PAYER_NOT_ENABLED</a>));
+    <a href="transaction_validation.md#0x1_transaction_validation_prologue_common">prologue_common</a>(
+        sender,
+        fee_payer_address,
+        txn_sequence_number,
+        txn_sender_public_key,
+        txn_gas_price,
+        txn_max_gas_units,
+        txn_expiration_time,
+        <a href="chain_id.md#0x1_chain_id">chain_id</a>,
+    );
+    <a href="transaction_validation.md#0x1_transaction_validation_multi_agent_common_prologue">multi_agent_common_prologue</a>(secondary_signer_addresses, secondary_signer_public_key_hashes);
+    <b>assert</b>!(
+        fee_payer_public_key_hash == <a href="account.md#0x1_account_get_authentication_key">account::get_authentication_key</a>(fee_payer_address),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="transaction_validation.md#0x1_transaction_validation_PROLOGUE_EINVALID_ACCOUNT_AUTH_KEY">PROLOGUE_EINVALID_ACCOUNT_AUTH_KEY</a>),
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_transaction_validation_epilogue"></a>
+
+## Function `epilogue`
+
+Epilogue function is run after a transaction is successfully executed.
+Called by the Adapter
+
+
+<pre><code><b>fun</b> <a href="transaction_validation.md#0x1_transaction_validation_epilogue">epilogue</a>(<a href="account.md#0x1_account">account</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, storage_fee_refunded: u64, txn_gas_price: u64, txn_max_gas_units: u64, gas_units_remaining: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="transaction_validation.md#0x1_transaction_validation_epilogue">epilogue</a>(
+    <a href="account.md#0x1_account">account</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    storage_fee_refunded: u64,
+    txn_gas_price: u64,
+    txn_max_gas_units: u64,
+    gas_units_remaining: u64
+) {
+    <b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(&<a href="account.md#0x1_account">account</a>);
+    <a href="transaction_validation.md#0x1_transaction_validation_epilogue_gas_payer">epilogue_gas_payer</a>(<a href="account.md#0x1_account">account</a>, addr, storage_fee_refunded, txn_gas_price, txn_max_gas_units, gas_units_remaining);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_transaction_validation_epilogue_gas_payer"></a>
+
+## Function `epilogue_gas_payer`
+
+Epilogue function with explicit gas payer specified, is run after a transaction is successfully executed.
+Called by the Adapter
+
+
+<pre><code><b>fun</b> <a href="transaction_validation.md#0x1_transaction_validation_epilogue_gas_payer">epilogue_gas_payer</a>(<a href="account.md#0x1_account">account</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, gas_payer: <b>address</b>, storage_fee_refunded: u64, txn_gas_price: u64, txn_max_gas_units: u64, gas_units_remaining: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="transaction_validation.md#0x1_transaction_validation_epilogue_gas_payer">epilogue_gas_payer</a>(
+    <a href="account.md#0x1_account">account</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    gas_payer: <b>address</b>,
+    storage_fee_refunded: u64,
+    txn_gas_price: u64,
+    txn_max_gas_units: u64,
+    gas_units_remaining: u64
+) {
+    <b>assert</b>!(txn_max_gas_units &gt;= gas_units_remaining, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="transaction_validation.md#0x1_transaction_validation_EOUT_OF_GAS">EOUT_OF_GAS</a>));
+    <b>let</b> gas_used = txn_max_gas_units - gas_units_remaining;
+
+    <b>assert</b>!(
+        (txn_gas_price <b>as</b> u128) * (gas_used <b>as</b> u128) &lt;= <a href="transaction_validation.md#0x1_transaction_validation_MAX_U64">MAX_U64</a>,
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_out_of_range">error::out_of_range</a>(<a href="transaction_validation.md#0x1_transaction_validation_EOUT_OF_GAS">EOUT_OF_GAS</a>)
+    );
+    <b>let</b> transaction_fee_amount = txn_gas_price * gas_used;
+
+    // it's important <b>to</b> maintain the <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">error</a> <a href="code.md#0x1_code">code</a> consistent <b>with</b> vm
+    // <b>to</b> do failed transaction cleanup.
+    <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_operations_default_to_fa_apt_store_enabled">features::operations_default_to_fa_apt_store_enabled</a>()) {
+        <b>assert</b>!(
+            <a href="aptos_account.md#0x1_aptos_account_is_fungible_balance_at_least">aptos_account::is_fungible_balance_at_least</a>(gas_payer, transaction_fee_amount),
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_out_of_range">error::out_of_range</a>(<a href="transaction_validation.md#0x1_transaction_validation_PROLOGUE_ECANT_PAY_GAS_DEPOSIT">PROLOGUE_ECANT_PAY_GAS_DEPOSIT</a>),
+        );
+    } <b>else</b> {
+        <b>assert</b>!(
+            <a href="coin.md#0x1_coin_is_balance_at_least">coin::is_balance_at_least</a>&lt;AptosCoin&gt;(gas_payer, transaction_fee_amount),
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_out_of_range">error::out_of_range</a>(<a href="transaction_validation.md#0x1_transaction_validation_PROLOGUE_ECANT_PAY_GAS_DEPOSIT">PROLOGUE_ECANT_PAY_GAS_DEPOSIT</a>),
+        );
+    };
+
+    <b>let</b> amount_to_burn = <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_collect_and_distribute_gas_fees">features::collect_and_distribute_gas_fees</a>()) {
+        // TODO(gas): We might want <b>to</b> distinguish the refundable part of the charge and burn it or track
+        // it separately, so that we don't increase the total supply by refunding.
+
+        // If transaction fees are redistributed <b>to</b> validators, collect them here for
+        // later redistribution.
+        <a href="transaction_fee.md#0x1_transaction_fee_collect_fee">transaction_fee::collect_fee</a>(gas_payer, transaction_fee_amount);
+        0
+    } <b>else</b> {
+        // Otherwise, just burn the fee.
+        // TODO: this branch should be removed completely when transaction fee collection
+        // is tested and is fully proven <b>to</b> work well.
+        transaction_fee_amount
+    };
+
+    <b>if</b> (amount_to_burn &gt; storage_fee_refunded) {
+        <b>let</b> burn_amount = amount_to_burn - storage_fee_refunded;
+        <a href="transaction_fee.md#0x1_transaction_fee_burn_fee">transaction_fee::burn_fee</a>(gas_payer, burn_amount);
+    } <b>else</b> <b>if</b> (amount_to_burn &lt; storage_fee_refunded) {
+        <b>let</b> mint_amount = storage_fee_refunded - amount_to_burn;
+        <a href="transaction_fee.md#0x1_transaction_fee_mint_and_refund">transaction_fee::mint_and_refund</a>(gas_payer, mint_amount)
+    };
+
+    // Increment sequence number
+    <b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(&<a href="account.md#0x1_account">account</a>);
+    <a href="account.md#0x1_account_increment_sequence_number">account::increment_sequence_number</a>(addr);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+
+
+<a id="high-level-req"></a>
+
+### High-level Requirements
+
+<table>
+<tr>
+<th>No.</th><th>Requirement</th><th>Criticality</th><th>Implementation</th><th>Enforcement</th>
+</tr>
+
+<tr>
+<td>1</td>
+<td>The sender of a transaction should have sufficient coin balance to pay the transaction fee.</td>
+<td>High</td>
+<td>The prologue_common function asserts that the transaction sender has enough coin balance to be paid as the max_transaction_fee.</td>
+<td>Formally verified via <a href="#high-level-req-1">PrologueCommonAbortsIf</a>. Moreover, the native transaction validation patterns have been manually audited.</td>
+</tr>
+
+<tr>
+<td>2</td>
+<td>All secondary signer addresses are verified to be authentic through a validation process.</td>
+<td>Critical</td>
+<td>The function multi_agent_script_prologue ensures that each secondary signer address undergoes authentication validation, including verification of account existence and authentication key matching, confirming their authenticity.</td>
+<td>Formally verified via <a href="#high-level-req-2">multi_agent_script_prologue</a>. Moreover, the native transaction validation patterns have been manually audited.</td>
+</tr>
+
+<tr>
+<td>3</td>
+<td>After successful execution, base the transaction fee on the configuration set by the features library.</td>
+<td>High</td>
+<td>The epilogue function collects the transaction fee for either redistribution or burning based on the feature::collect_and_distribute_gas_fees result.</td>
+<td>Formally Verified via <a href="#high-level-req-3">epilogue</a>. Moreover, the native transaction validation patterns have been manually audited.</td>
+</tr>
+
+</table>
+
+
+
+
+<a id="module-level-spec"></a>
+
+### Module-level Specification
+
+
+<pre><code><b>pragma</b> verify = <b>true</b>;
+<b>pragma</b> aborts_if_is_strict;
+</code></pre>
+
+
+
+<a id="@Specification_1_initialize"></a>
+
+### Function `initialize`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="transaction_validation.md#0x1_transaction_validation_initialize">initialize</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, script_prologue_name: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, module_prologue_name: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, multi_agent_prologue_name: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, user_epilogue_name: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+Ensure caller is <code>aptos_framework</code>.
+Aborts if TransactionValidation already exists.
+
+
+<pre><code><b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(aptos_framework);
+<b>aborts_if</b> !<a href="system_addresses.md#0x1_system_addresses_is_aptos_framework_address">system_addresses::is_aptos_framework_address</a>(addr);
+<b>aborts_if</b> <b>exists</b>&lt;<a href="transaction_validation.md#0x1_transaction_validation_TransactionValidation">TransactionValidation</a>&gt;(addr);
+<b>ensures</b> <b>exists</b>&lt;<a href="transaction_validation.md#0x1_transaction_validation_TransactionValidation">TransactionValidation</a>&gt;(addr);
+</code></pre>
+
+
+Create a schema to reuse some code.
+Give some constraints that may abort according to the conditions.
+
+
+<a id="0x1_transaction_validation_PrologueCommonAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="transaction_validation.md#0x1_transaction_validation_PrologueCommonAbortsIf">PrologueCommonAbortsIf</a> {
+    sender: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>;
+    gas_payer: <b>address</b>;
+    txn_sequence_number: u64;
+    txn_authentication_key: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+    txn_gas_price: u64;
+    txn_max_gas_units: u64;
+    txn_expiration_time: u64;
+    <a href="chain_id.md#0x1_chain_id">chain_id</a>: u8;
+    <b>aborts_if</b> !<b>exists</b>&lt;CurrentTimeMicroseconds&gt;(@aptos_framework);
+    <b>aborts_if</b> !(<a href="timestamp.md#0x1_timestamp_now_seconds">timestamp::now_seconds</a>() &lt; txn_expiration_time);
+    <b>aborts_if</b> !<b>exists</b>&lt;ChainId&gt;(@aptos_framework);
+    <b>aborts_if</b> !(<a href="chain_id.md#0x1_chain_id_get">chain_id::get</a>() == <a href="chain_id.md#0x1_chain_id">chain_id</a>);
+    <b>let</b> transaction_sender = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(sender);
+    <b>aborts_if</b> (
+        !<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_spec_is_enabled">features::spec_is_enabled</a>(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_SPONSORED_AUTOMATIC_ACCOUNT_CREATION">features::SPONSORED_AUTOMATIC_ACCOUNT_CREATION</a>)
+            || <a href="account.md#0x1_account_exists_at">account::exists_at</a>(transaction_sender)
+            || transaction_sender == gas_payer
+            || txn_sequence_number &gt; 0
+    ) && (
+        !(txn_sequence_number &gt;= <b>global</b>&lt;Account&gt;(transaction_sender).sequence_number)
+            || !(txn_authentication_key == <b>global</b>&lt;Account&gt;(transaction_sender).authentication_key)
+            || !<a href="account.md#0x1_account_exists_at">account::exists_at</a>(transaction_sender)
+            || !(txn_sequence_number == <b>global</b>&lt;Account&gt;(transaction_sender).sequence_number)
+    );
+    <b>aborts_if</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_spec_is_enabled">features::spec_is_enabled</a>(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_SPONSORED_AUTOMATIC_ACCOUNT_CREATION">features::SPONSORED_AUTOMATIC_ACCOUNT_CREATION</a>)
+        && transaction_sender != gas_payer
+        && txn_sequence_number == 0
+        && !<a href="account.md#0x1_account_exists_at">account::exists_at</a>(transaction_sender)
+        && txn_authentication_key != <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs_to_bytes">bcs::to_bytes</a>(transaction_sender);
+    <b>aborts_if</b> !(txn_sequence_number &lt; (1u64 &lt;&lt; 63));
+    <b>let</b> max_transaction_fee = txn_gas_price * txn_max_gas_units;
+    <b>aborts_if</b> max_transaction_fee &gt; <a href="transaction_validation.md#0x1_transaction_validation_MAX_U64">MAX_U64</a>;
+    <b>aborts_if</b> !<b>exists</b>&lt;CoinStore&lt;AptosCoin&gt;&gt;(gas_payer);
+    // This enforces <a id="high-level-req-1" href="#high-level-req">high-level requirement 1</a>:
+    <b>aborts_if</b> !(<b>global</b>&lt;CoinStore&lt;AptosCoin&gt;&gt;(gas_payer).<a href="coin.md#0x1_coin">coin</a>.value &gt;= max_transaction_fee);
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_prologue_common"></a>
+
+### Function `prologue_common`
+
+
+<pre><code><b>fun</b> <a href="transaction_validation.md#0x1_transaction_validation_prologue_common">prologue_common</a>(sender: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, gas_payer: <b>address</b>, txn_sequence_number: u64, txn_authentication_key: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, txn_gas_price: u64, txn_max_gas_units: u64, txn_expiration_time: u64, <a href="chain_id.md#0x1_chain_id">chain_id</a>: u8)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+<b>include</b> <a href="transaction_validation.md#0x1_transaction_validation_PrologueCommonAbortsIf">PrologueCommonAbortsIf</a>;
+</code></pre>
+
+
+
+<a id="@Specification_1_script_prologue"></a>
+
+### Function `script_prologue`
+
+
+<pre><code><b>fun</b> <a href="transaction_validation.md#0x1_transaction_validation_script_prologue">script_prologue</a>(sender: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, txn_sequence_number: u64, txn_public_key: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, txn_gas_price: u64, txn_max_gas_units: u64, txn_expiration_time: u64, <a href="chain_id.md#0x1_chain_id">chain_id</a>: u8, _script_hash: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+<b>include</b> <a href="transaction_validation.md#0x1_transaction_validation_PrologueCommonAbortsIf">PrologueCommonAbortsIf</a> {
+    gas_payer: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(sender),
+    txn_authentication_key: txn_public_key
+};
+</code></pre>
+
+
+
+
+<a id="0x1_transaction_validation_MultiAgentPrologueCommonAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="transaction_validation.md#0x1_transaction_validation_MultiAgentPrologueCommonAbortsIf">MultiAgentPrologueCommonAbortsIf</a> {
+    secondary_signer_addresses: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;;
+    secondary_signer_public_key_hashes: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;;
+    <b>let</b> num_secondary_signers = len(secondary_signer_addresses);
+    <b>aborts_if</b> len(secondary_signer_public_key_hashes) != num_secondary_signers;
+    // This enforces <a id="high-level-req-2" href="#high-level-req">high-level requirement 2</a>:
+    <b>aborts_if</b> <b>exists</b> i in 0..num_secondary_signers:
+        !<a href="account.md#0x1_account_exists_at">account::exists_at</a>(secondary_signer_addresses[i])
+            || secondary_signer_public_key_hashes[i] !=
+            <a href="account.md#0x1_account_get_authentication_key">account::get_authentication_key</a>(secondary_signer_addresses[i]);
+    <b>ensures</b> <b>forall</b> i in 0..num_secondary_signers:
+        <a href="account.md#0x1_account_exists_at">account::exists_at</a>(secondary_signer_addresses[i])
+            && secondary_signer_public_key_hashes[i] ==
+            <a href="account.md#0x1_account_get_authentication_key">account::get_authentication_key</a>(secondary_signer_addresses[i]);
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_multi_agent_script_prologue"></a>
+
+### Function `multi_agent_script_prologue`
+
+
+<pre><code><b>fun</b> <a href="transaction_validation.md#0x1_transaction_validation_multi_agent_script_prologue">multi_agent_script_prologue</a>(sender: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, txn_sequence_number: u64, txn_sender_public_key: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, secondary_signer_addresses: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;, secondary_signer_public_key_hashes: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;, txn_gas_price: u64, txn_max_gas_units: u64, txn_expiration_time: u64, <a href="chain_id.md#0x1_chain_id">chain_id</a>: u8)
+</code></pre>
+
+
+Aborts if length of public key hashed vector
+not equal the number of singers.
+
+
+<pre><code><b>pragma</b> verify_duration_estimate = 120;
+<b>let</b> gas_payer = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(sender);
+<b>pragma</b> verify = <b>false</b>;
+<b>include</b> <a href="transaction_validation.md#0x1_transaction_validation_PrologueCommonAbortsIf">PrologueCommonAbortsIf</a> {
+    gas_payer,
+    txn_sequence_number,
+    txn_authentication_key: txn_sender_public_key,
+};
+<b>include</b> <a href="transaction_validation.md#0x1_transaction_validation_MultiAgentPrologueCommonAbortsIf">MultiAgentPrologueCommonAbortsIf</a> {
+    secondary_signer_addresses,
+    secondary_signer_public_key_hashes,
+};
+</code></pre>
+
+
+
+<a id="@Specification_1_multi_agent_common_prologue"></a>
+
+### Function `multi_agent_common_prologue`
+
+
+<pre><code><b>fun</b> <a href="transaction_validation.md#0x1_transaction_validation_multi_agent_common_prologue">multi_agent_common_prologue</a>(secondary_signer_addresses: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;, secondary_signer_public_key_hashes: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="transaction_validation.md#0x1_transaction_validation_MultiAgentPrologueCommonAbortsIf">MultiAgentPrologueCommonAbortsIf</a> {
+    secondary_signer_addresses,
+    secondary_signer_public_key_hashes,
+};
+</code></pre>
+
+
+
+<a id="@Specification_1_fee_payer_script_prologue"></a>
+
+### Function `fee_payer_script_prologue`
+
+
+<pre><code><b>fun</b> <a href="transaction_validation.md#0x1_transaction_validation_fee_payer_script_prologue">fee_payer_script_prologue</a>(sender: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, txn_sequence_number: u64, txn_sender_public_key: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, secondary_signer_addresses: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;, secondary_signer_public_key_hashes: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;, fee_payer_address: <b>address</b>, fee_payer_public_key_hash: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, txn_gas_price: u64, txn_max_gas_units: u64, txn_expiration_time: u64, <a href="chain_id.md#0x1_chain_id">chain_id</a>: u8)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify_duration_estimate = 120;
+<b>aborts_if</b> !<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_spec_is_enabled">features::spec_is_enabled</a>(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_FEE_PAYER_ENABLED">features::FEE_PAYER_ENABLED</a>);
+<b>let</b> gas_payer = fee_payer_address;
+<b>include</b> <a href="transaction_validation.md#0x1_transaction_validation_PrologueCommonAbortsIf">PrologueCommonAbortsIf</a> {
+    gas_payer,
+    txn_sequence_number,
+    txn_authentication_key: txn_sender_public_key,
+};
+<b>include</b> <a href="transaction_validation.md#0x1_transaction_validation_MultiAgentPrologueCommonAbortsIf">MultiAgentPrologueCommonAbortsIf</a> {
+    secondary_signer_addresses,
+    secondary_signer_public_key_hashes,
+};
+<b>aborts_if</b> !<a href="account.md#0x1_account_exists_at">account::exists_at</a>(gas_payer);
+<b>aborts_if</b> !(fee_payer_public_key_hash == <a href="account.md#0x1_account_get_authentication_key">account::get_authentication_key</a>(gas_payer));
+<b>aborts_if</b> !<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_spec_fee_payer_enabled">features::spec_fee_payer_enabled</a>();
+</code></pre>
+
+
+
+<a id="@Specification_1_epilogue"></a>
+
+### Function `epilogue`
+
+
+<pre><code><b>fun</b> <a href="transaction_validation.md#0x1_transaction_validation_epilogue">epilogue</a>(<a href="account.md#0x1_account">account</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, storage_fee_refunded: u64, txn_gas_price: u64, txn_max_gas_units: u64, gas_units_remaining: u64)
+</code></pre>
+
+
+Abort according to the conditions.
+<code>AptosCoinCapabilities</code> and <code>CoinInfo</code> should exists.
+Skip transaction_fee::burn_fee verification.
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+<b>include</b> <a href="transaction_validation.md#0x1_transaction_validation_EpilogueGasPayerAbortsIf">EpilogueGasPayerAbortsIf</a> { gas_payer: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>) };
+</code></pre>
+
+
+
+<a id="@Specification_1_epilogue_gas_payer"></a>
+
+### Function `epilogue_gas_payer`
+
+
+<pre><code><b>fun</b> <a href="transaction_validation.md#0x1_transaction_validation_epilogue_gas_payer">epilogue_gas_payer</a>(<a href="account.md#0x1_account">account</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, gas_payer: <b>address</b>, storage_fee_refunded: u64, txn_gas_price: u64, txn_max_gas_units: u64, gas_units_remaining: u64)
+</code></pre>
+
+
+Abort according to the conditions.
+<code>AptosCoinCapabilities</code> and <code>CoinInfo</code> should exist.
+Skip transaction_fee::burn_fee verification.
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+<b>include</b> <a href="transaction_validation.md#0x1_transaction_validation_EpilogueGasPayerAbortsIf">EpilogueGasPayerAbortsIf</a>;
+</code></pre>
+
+
+
+
+<a id="0x1_transaction_validation_EpilogueGasPayerAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="transaction_validation.md#0x1_transaction_validation_EpilogueGasPayerAbortsIf">EpilogueGasPayerAbortsIf</a> {
+    <a href="account.md#0x1_account">account</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>;
+    gas_payer: <b>address</b>;
+    storage_fee_refunded: u64;
+    txn_gas_price: u64;
+    txn_max_gas_units: u64;
+    gas_units_remaining: u64;
+    <b>aborts_if</b> !(txn_max_gas_units &gt;= gas_units_remaining);
+    <b>let</b> gas_used = txn_max_gas_units - gas_units_remaining;
+    <b>aborts_if</b> !(txn_gas_price * gas_used &lt;= <a href="transaction_validation.md#0x1_transaction_validation_MAX_U64">MAX_U64</a>);
+    <b>let</b> transaction_fee_amount = txn_gas_price * gas_used;
+    <b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>);
+    <b>let</b> pre_account = <b>global</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(addr);
+    <b>let</b> <b>post</b> <a href="account.md#0x1_account">account</a> = <b>global</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(addr);
+    <b>aborts_if</b> !<b>exists</b>&lt;CoinStore&lt;AptosCoin&gt;&gt;(gas_payer);
+    <b>aborts_if</b> !<b>exists</b>&lt;Account&gt;(addr);
+    <b>aborts_if</b> !(<b>global</b>&lt;Account&gt;(addr).sequence_number &lt; <a href="transaction_validation.md#0x1_transaction_validation_MAX_U64">MAX_U64</a>);
+    <b>ensures</b> <a href="account.md#0x1_account">account</a>.sequence_number == pre_account.sequence_number + 1;
+    <b>let</b> collect_fee_enabled = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_spec_is_enabled">features::spec_is_enabled</a>(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_COLLECT_AND_DISTRIBUTE_GAS_FEES">features::COLLECT_AND_DISTRIBUTE_GAS_FEES</a>);
+    <b>let</b> collected_fees = <b>global</b>&lt;CollectedFeesPerBlock&gt;(@aptos_framework).amount;
+    <b>let</b> aggr = collected_fees.value;
+    <b>let</b> aggr_val = <a href="aggregator.md#0x1_aggregator_spec_aggregator_get_val">aggregator::spec_aggregator_get_val</a>(aggr);
+    <b>let</b> aggr_lim = <a href="aggregator.md#0x1_aggregator_spec_get_limit">aggregator::spec_get_limit</a>(aggr);
+    // This enforces <a id="high-level-req-3" href="#high-level-req">high-level requirement 3</a>:
+    <b>aborts_if</b> collect_fee_enabled && !<b>exists</b>&lt;CollectedFeesPerBlock&gt;(@aptos_framework);
+    <b>aborts_if</b> collect_fee_enabled && transaction_fee_amount &gt; 0 && aggr_val + transaction_fee_amount &gt; aggr_lim;
+    <b>let</b> amount_to_burn = <b>if</b> (collect_fee_enabled) {
+        0
+    } <b>else</b> {
+        transaction_fee_amount - storage_fee_refunded
+    };
+    <b>let</b> apt_addr = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_type_of">type_info::type_of</a>&lt;AptosCoin&gt;().account_address;
+    <b>let</b> maybe_apt_supply = <b>global</b>&lt;CoinInfo&lt;AptosCoin&gt;&gt;(apt_addr).supply;
+    <b>let</b> total_supply_enabled = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_is_some">option::spec_is_some</a>(maybe_apt_supply);
+    <b>let</b> apt_supply = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_borrow">option::spec_borrow</a>(maybe_apt_supply);
+    <b>let</b> apt_supply_value = <a href="optional_aggregator.md#0x1_optional_aggregator_optional_aggregator_value">optional_aggregator::optional_aggregator_value</a>(apt_supply);
+    <b>let</b> <b>post</b> post_maybe_apt_supply = <b>global</b>&lt;CoinInfo&lt;AptosCoin&gt;&gt;(apt_addr).supply;
+    <b>let</b> <b>post</b> post_apt_supply = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_borrow">option::spec_borrow</a>(post_maybe_apt_supply);
+    <b>let</b> <b>post</b> post_apt_supply_value = <a href="optional_aggregator.md#0x1_optional_aggregator_optional_aggregator_value">optional_aggregator::optional_aggregator_value</a>(post_apt_supply);
+    <b>aborts_if</b> amount_to_burn &gt; 0 && !<b>exists</b>&lt;AptosCoinCapabilities&gt;(@aptos_framework);
+    <b>aborts_if</b> amount_to_burn &gt; 0 && !<b>exists</b>&lt;CoinInfo&lt;AptosCoin&gt;&gt;(apt_addr);
+    <b>aborts_if</b> amount_to_burn &gt; 0 && total_supply_enabled && apt_supply_value &lt; amount_to_burn;
+    <b>ensures</b> total_supply_enabled ==&gt; apt_supply_value - amount_to_burn == post_apt_supply_value;
+    <b>let</b> amount_to_mint = <b>if</b> (collect_fee_enabled) {
+        storage_fee_refunded
+    } <b>else</b> {
+        storage_fee_refunded - transaction_fee_amount
+    };
+    <b>let</b> total_supply = <a href="coin.md#0x1_coin_supply">coin::supply</a>&lt;AptosCoin&gt;;
+    <b>let</b> <b>post</b> post_total_supply = <a href="coin.md#0x1_coin_supply">coin::supply</a>&lt;AptosCoin&gt;;
+    <b>aborts_if</b> amount_to_mint &gt; 0 && !<b>exists</b>&lt;CoinStore&lt;AptosCoin&gt;&gt;(addr);
+    <b>aborts_if</b> amount_to_mint &gt; 0 && !<b>exists</b>&lt;AptosCoinMintCapability&gt;(@aptos_framework);
+    <b>aborts_if</b> amount_to_mint &gt; 0 && total_supply + amount_to_mint &gt; MAX_U128;
+    <b>ensures</b> amount_to_mint &gt; 0 ==&gt; post_total_supply == total_supply + amount_to_mint;
+    <b>let</b> aptos_addr = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_type_of">type_info::type_of</a>&lt;AptosCoin&gt;().account_address;
+    <b>aborts_if</b> (amount_to_mint != 0) && !<b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinInfo">coin::CoinInfo</a>&lt;AptosCoin&gt;&gt;(aptos_addr);
+    <b>include</b> <a href="coin.md#0x1_coin_CoinAddAbortsIf">coin::CoinAddAbortsIf</a>&lt;AptosCoin&gt; { amount: amount_to_mint };
+}
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/util.md b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/util.md
new file mode 100644
index 0000000000000..8a3933b170760
--- /dev/null
+++ b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/util.md
@@ -0,0 +1,149 @@
+
+<a id="0x1_util"></a>
+
+# Module `0x1::util`
+
+Utility functions used by the framework modules.
+
+
+-  [Function `from_bytes`](#0x1_util_from_bytes)
+-  [Function `address_from_bytes`](#0x1_util_address_from_bytes)
+-  [Specification](#@Specification_0)
+    -  [Function `from_bytes`](#@Specification_0_from_bytes)
+    -  [High-level Requirements](#high-level-req)
+    -  [Module-level Specification](#module-level-spec)
+    -  [Function `address_from_bytes`](#@Specification_0_address_from_bytes)
+
+
+<pre><code></code></pre>
+
+
+
+<a id="0x1_util_from_bytes"></a>
+
+## Function `from_bytes`
+
+Native function to deserialize a type T.
+
+Note that this function does not put any constraint on <code>T</code>. If code uses this function to
+deserialized a linear value, its their responsibility that the data they deserialize is
+owned.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="util.md#0x1_util_from_bytes">from_bytes</a>&lt;T&gt;(bytes: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): T
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>native</b> <b>fun</b> <a href="util.md#0x1_util_from_bytes">from_bytes</a>&lt;T&gt;(bytes: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): T;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_util_address_from_bytes"></a>
+
+## Function `address_from_bytes`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="util.md#0x1_util_address_from_bytes">address_from_bytes</a>(bytes: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="util.md#0x1_util_address_from_bytes">address_from_bytes</a>(bytes: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <b>address</b> {
+    <a href="util.md#0x1_util_from_bytes">from_bytes</a>(bytes)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_0"></a>
+
+## Specification
+
+
+<a id="@Specification_0_from_bytes"></a>
+
+### Function `from_bytes`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="util.md#0x1_util_from_bytes">from_bytes</a>&lt;T&gt;(bytes: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): T
+</code></pre>
+
+
+
+
+
+<a id="high-level-req"></a>
+
+### High-level Requirements
+
+<table>
+<tr>
+<th>No.</th><th>Requirement</th><th>Criticality</th><th>Implementation</th><th>Enforcement</th>
+</tr>
+
+<tr>
+<td>1</td>
+<td>The address input bytes should be exactly 32 bytes long.</td>
+<td>Low</td>
+<td>The address_from_bytes function should assert if the length of the input bytes is 32.</td>
+<td>Verified via <a href="#high-level-req-1">address_from_bytes</a>.</td>
+</tr>
+
+</table>
+
+
+
+
+<a id="module-level-spec"></a>
+
+### Module-level Specification
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> [abstract] <b>false</b>;
+<b>ensures</b> [abstract] result == <a href="util.md#0x1_util_spec_from_bytes">spec_from_bytes</a>&lt;T&gt;(bytes);
+</code></pre>
+
+
+
+
+<a id="0x1_util_spec_from_bytes"></a>
+
+
+<pre><code><b>fun</b> <a href="util.md#0x1_util_spec_from_bytes">spec_from_bytes</a>&lt;T&gt;(bytes: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): T;
+</code></pre>
+
+
+
+<a id="@Specification_0_address_from_bytes"></a>
+
+### Function `address_from_bytes`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="util.md#0x1_util_address_from_bytes">address_from_bytes</a>(bytes: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <b>address</b>
+</code></pre>
+
+
+
+
+<pre><code>// This enforces <a id="high-level-req-1" href="#high-level-req">high-level requirement 1</a>:
+<b>aborts_if</b> [abstract] len(bytes) != 32;
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/validator_consensus_info.md b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/validator_consensus_info.md
new file mode 100644
index 0000000000000..0100837fdd975
--- /dev/null
+++ b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/validator_consensus_info.md
@@ -0,0 +1,205 @@
+
+<a id="0x1_validator_consensus_info"></a>
+
+# Module `0x1::validator_consensus_info`
+
+Common type: <code><a href="validator_consensus_info.md#0x1_validator_consensus_info_ValidatorConsensusInfo">ValidatorConsensusInfo</a></code>.
+
+
+-  [Struct `ValidatorConsensusInfo`](#0x1_validator_consensus_info_ValidatorConsensusInfo)
+-  [Function `default`](#0x1_validator_consensus_info_default)
+-  [Function `new`](#0x1_validator_consensus_info_new)
+-  [Function `get_addr`](#0x1_validator_consensus_info_get_addr)
+-  [Function `get_pk_bytes`](#0x1_validator_consensus_info_get_pk_bytes)
+-  [Function `get_voting_power`](#0x1_validator_consensus_info_get_voting_power)
+-  [Specification](#@Specification_0)
+
+
+<pre><code></code></pre>
+
+
+
+<a id="0x1_validator_consensus_info_ValidatorConsensusInfo"></a>
+
+## Struct `ValidatorConsensusInfo`
+
+Information about a validator that participates consensus.
+
+
+<pre><code><b>struct</b> <a href="validator_consensus_info.md#0x1_validator_consensus_info_ValidatorConsensusInfo">ValidatorConsensusInfo</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>addr: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>pk_bytes: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>voting_power: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_validator_consensus_info_default"></a>
+
+## Function `default`
+
+Create a default <code><a href="validator_consensus_info.md#0x1_validator_consensus_info_ValidatorConsensusInfo">ValidatorConsensusInfo</a></code> object. Value may be invalid. Only for place holding prupose.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="validator_consensus_info.md#0x1_validator_consensus_info_default">default</a>(): <a href="validator_consensus_info.md#0x1_validator_consensus_info_ValidatorConsensusInfo">validator_consensus_info::ValidatorConsensusInfo</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="validator_consensus_info.md#0x1_validator_consensus_info_default">default</a>(): <a href="validator_consensus_info.md#0x1_validator_consensus_info_ValidatorConsensusInfo">ValidatorConsensusInfo</a> {
+    <a href="validator_consensus_info.md#0x1_validator_consensus_info_ValidatorConsensusInfo">ValidatorConsensusInfo</a> {
+        addr: @vm,
+        pk_bytes: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>[],
+        voting_power: 0,
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_validator_consensus_info_new"></a>
+
+## Function `new`
+
+Create a <code><a href="validator_consensus_info.md#0x1_validator_consensus_info_ValidatorConsensusInfo">ValidatorConsensusInfo</a></code> object.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="validator_consensus_info.md#0x1_validator_consensus_info_new">new</a>(addr: <b>address</b>, pk_bytes: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, voting_power: u64): <a href="validator_consensus_info.md#0x1_validator_consensus_info_ValidatorConsensusInfo">validator_consensus_info::ValidatorConsensusInfo</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="validator_consensus_info.md#0x1_validator_consensus_info_new">new</a>(addr: <b>address</b>, pk_bytes: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, voting_power: u64): <a href="validator_consensus_info.md#0x1_validator_consensus_info_ValidatorConsensusInfo">ValidatorConsensusInfo</a> {
+    <a href="validator_consensus_info.md#0x1_validator_consensus_info_ValidatorConsensusInfo">ValidatorConsensusInfo</a> {
+        addr,
+        pk_bytes,
+        voting_power,
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_validator_consensus_info_get_addr"></a>
+
+## Function `get_addr`
+
+Get <code><a href="validator_consensus_info.md#0x1_validator_consensus_info_ValidatorConsensusInfo">ValidatorConsensusInfo</a>.addr</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="validator_consensus_info.md#0x1_validator_consensus_info_get_addr">get_addr</a>(vci: &<a href="validator_consensus_info.md#0x1_validator_consensus_info_ValidatorConsensusInfo">validator_consensus_info::ValidatorConsensusInfo</a>): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="validator_consensus_info.md#0x1_validator_consensus_info_get_addr">get_addr</a>(vci: &<a href="validator_consensus_info.md#0x1_validator_consensus_info_ValidatorConsensusInfo">ValidatorConsensusInfo</a>): <b>address</b> {
+    vci.addr
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_validator_consensus_info_get_pk_bytes"></a>
+
+## Function `get_pk_bytes`
+
+Get <code><a href="validator_consensus_info.md#0x1_validator_consensus_info_ValidatorConsensusInfo">ValidatorConsensusInfo</a>.pk_bytes</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="validator_consensus_info.md#0x1_validator_consensus_info_get_pk_bytes">get_pk_bytes</a>(vci: &<a href="validator_consensus_info.md#0x1_validator_consensus_info_ValidatorConsensusInfo">validator_consensus_info::ValidatorConsensusInfo</a>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="validator_consensus_info.md#0x1_validator_consensus_info_get_pk_bytes">get_pk_bytes</a>(vci: &<a href="validator_consensus_info.md#0x1_validator_consensus_info_ValidatorConsensusInfo">ValidatorConsensusInfo</a>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; {
+    vci.pk_bytes
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_validator_consensus_info_get_voting_power"></a>
+
+## Function `get_voting_power`
+
+Get <code><a href="validator_consensus_info.md#0x1_validator_consensus_info_ValidatorConsensusInfo">ValidatorConsensusInfo</a>.voting_power</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="validator_consensus_info.md#0x1_validator_consensus_info_get_voting_power">get_voting_power</a>(vci: &<a href="validator_consensus_info.md#0x1_validator_consensus_info_ValidatorConsensusInfo">validator_consensus_info::ValidatorConsensusInfo</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="validator_consensus_info.md#0x1_validator_consensus_info_get_voting_power">get_voting_power</a>(vci: &<a href="validator_consensus_info.md#0x1_validator_consensus_info_ValidatorConsensusInfo">ValidatorConsensusInfo</a>): u64 {
+    vci.voting_power
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_0"></a>
+
+## Specification
+
+
+
+<pre><code><b>pragma</b> verify = <b>true</b>;
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/version.md b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/version.md
new file mode 100644
index 0000000000000..28e34690a97de
--- /dev/null
+++ b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/version.md
@@ -0,0 +1,430 @@
+
+<a id="0x1_version"></a>
+
+# Module `0x1::version`
+
+Maintains the version number for the blockchain.
+
+
+-  [Resource `Version`](#0x1_version_Version)
+-  [Resource `SetVersionCapability`](#0x1_version_SetVersionCapability)
+-  [Constants](#@Constants_0)
+-  [Function `initialize`](#0x1_version_initialize)
+-  [Function `set_version`](#0x1_version_set_version)
+-  [Function `set_for_next_epoch`](#0x1_version_set_for_next_epoch)
+-  [Function `on_new_epoch`](#0x1_version_on_new_epoch)
+-  [Function `initialize_for_test`](#0x1_version_initialize_for_test)
+-  [Specification](#@Specification_1)
+    -  [High-level Requirements](#high-level-req)
+    -  [Module-level Specification](#module-level-spec)
+    -  [Function `initialize`](#@Specification_1_initialize)
+    -  [Function `set_version`](#@Specification_1_set_version)
+    -  [Function `set_for_next_epoch`](#@Specification_1_set_for_next_epoch)
+    -  [Function `on_new_epoch`](#@Specification_1_on_new_epoch)
+    -  [Function `initialize_for_test`](#@Specification_1_initialize_for_test)
+
+
+<pre><code><b>use</b> <a href="chain_status.md#0x1_chain_status">0x1::chain_status</a>;
+<b>use</b> <a href="config_buffer.md#0x1_config_buffer">0x1::config_buffer</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="reconfiguration.md#0x1_reconfiguration">0x1::reconfiguration</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">0x1::signer</a>;
+<b>use</b> <a href="system_addresses.md#0x1_system_addresses">0x1::system_addresses</a>;
+</code></pre>
+
+
+
+<a id="0x1_version_Version"></a>
+
+## Resource `Version`
+
+
+
+<pre><code><b>struct</b> <a href="version.md#0x1_version_Version">Version</a> <b>has</b> drop, store, key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>major: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_version_SetVersionCapability"></a>
+
+## Resource `SetVersionCapability`
+
+
+
+<pre><code><b>struct</b> <a href="version.md#0x1_version_SetVersionCapability">SetVersionCapability</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>dummy_field: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_version_EINVALID_MAJOR_VERSION_NUMBER"></a>
+
+Specified major version number must be greater than current version number.
+
+
+<pre><code><b>const</b> <a href="version.md#0x1_version_EINVALID_MAJOR_VERSION_NUMBER">EINVALID_MAJOR_VERSION_NUMBER</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_version_ENOT_AUTHORIZED"></a>
+
+Account is not authorized to make this change.
+
+
+<pre><code><b>const</b> <a href="version.md#0x1_version_ENOT_AUTHORIZED">ENOT_AUTHORIZED</a>: u64 = 2;
+</code></pre>
+
+
+
+<a id="0x1_version_initialize"></a>
+
+## Function `initialize`
+
+Only called during genesis.
+Publishes the Version config.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="version.md#0x1_version_initialize">initialize</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, initial_version: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="version.md#0x1_version_initialize">initialize</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, initial_version: u64) {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(aptos_framework);
+
+    <b>move_to</b>(aptos_framework, <a href="version.md#0x1_version_Version">Version</a> { major: initial_version });
+    // Give aptos framework <a href="account.md#0x1_account">account</a> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/capability.md#0x1_capability">capability</a> <b>to</b> call set <a href="version.md#0x1_version">version</a>. This allows on chain governance <b>to</b> do it through
+    // control of the aptos framework <a href="account.md#0x1_account">account</a>.
+    <b>move_to</b>(aptos_framework, <a href="version.md#0x1_version_SetVersionCapability">SetVersionCapability</a> {});
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_version_set_version"></a>
+
+## Function `set_version`
+
+Deprecated by <code><a href="version.md#0x1_version_set_for_next_epoch">set_for_next_epoch</a>()</code>.
+
+WARNING: calling this while randomness is enabled will trigger a new epoch without randomness!
+
+TODO: update all the tests that reference this function, then disable this function.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="version.md#0x1_version_set_version">set_version</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, major: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="version.md#0x1_version_set_version">set_version</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, major: u64) <b>acquires</b> <a href="version.md#0x1_version_Version">Version</a> {
+    <b>assert</b>!(<b>exists</b>&lt;<a href="version.md#0x1_version_SetVersionCapability">SetVersionCapability</a>&gt;(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>)), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="version.md#0x1_version_ENOT_AUTHORIZED">ENOT_AUTHORIZED</a>));
+    <a href="chain_status.md#0x1_chain_status_assert_genesis">chain_status::assert_genesis</a>();
+
+    <b>let</b> old_major = <b>borrow_global</b>&lt;<a href="version.md#0x1_version_Version">Version</a>&gt;(@aptos_framework).major;
+    <b>assert</b>!(old_major &lt; major, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="version.md#0x1_version_EINVALID_MAJOR_VERSION_NUMBER">EINVALID_MAJOR_VERSION_NUMBER</a>));
+
+    <b>let</b> config = <b>borrow_global_mut</b>&lt;<a href="version.md#0x1_version_Version">Version</a>&gt;(@aptos_framework);
+    config.major = major;
+
+    // Need <b>to</b> trigger <a href="reconfiguration.md#0x1_reconfiguration">reconfiguration</a> so validator nodes can sync on the updated <a href="version.md#0x1_version">version</a>.
+    <a href="reconfiguration.md#0x1_reconfiguration_reconfigure">reconfiguration::reconfigure</a>();
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_version_set_for_next_epoch"></a>
+
+## Function `set_for_next_epoch`
+
+Used in on-chain governances to update the major version for the next epoch.
+Example usage:
+- <code>aptos_framework::version::set_for_next_epoch(&framework_signer, new_version);</code>
+- <code>aptos_framework::aptos_governance::reconfigure(&framework_signer);</code>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="version.md#0x1_version_set_for_next_epoch">set_for_next_epoch</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, major: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="version.md#0x1_version_set_for_next_epoch">set_for_next_epoch</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, major: u64) <b>acquires</b> <a href="version.md#0x1_version_Version">Version</a> {
+    <b>assert</b>!(<b>exists</b>&lt;<a href="version.md#0x1_version_SetVersionCapability">SetVersionCapability</a>&gt;(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>)), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="version.md#0x1_version_ENOT_AUTHORIZED">ENOT_AUTHORIZED</a>));
+    <b>let</b> old_major = <b>borrow_global</b>&lt;<a href="version.md#0x1_version_Version">Version</a>&gt;(@aptos_framework).major;
+    <b>assert</b>!(old_major &lt; major, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="version.md#0x1_version_EINVALID_MAJOR_VERSION_NUMBER">EINVALID_MAJOR_VERSION_NUMBER</a>));
+    <a href="config_buffer.md#0x1_config_buffer_upsert">config_buffer::upsert</a>(<a href="version.md#0x1_version_Version">Version</a> {major});
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_version_on_new_epoch"></a>
+
+## Function `on_new_epoch`
+
+Only used in reconfigurations to apply the pending <code><a href="version.md#0x1_version_Version">Version</a></code>, if there is any.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="version.md#0x1_version_on_new_epoch">on_new_epoch</a>(framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="version.md#0x1_version_on_new_epoch">on_new_epoch</a>(framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>) <b>acquires</b> <a href="version.md#0x1_version_Version">Version</a> {
+    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(framework);
+    <b>if</b> (<a href="config_buffer.md#0x1_config_buffer_does_exist">config_buffer::does_exist</a>&lt;<a href="version.md#0x1_version_Version">Version</a>&gt;()) {
+        <b>let</b> new_value = <a href="config_buffer.md#0x1_config_buffer_extract">config_buffer::extract</a>&lt;<a href="version.md#0x1_version_Version">Version</a>&gt;();
+        <b>if</b> (<b>exists</b>&lt;<a href="version.md#0x1_version_Version">Version</a>&gt;(@aptos_framework)) {
+            *<b>borrow_global_mut</b>&lt;<a href="version.md#0x1_version_Version">Version</a>&gt;(@aptos_framework) = new_value;
+        } <b>else</b> {
+            <b>move_to</b>(framework, new_value);
+        }
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_version_initialize_for_test"></a>
+
+## Function `initialize_for_test`
+
+Only called in tests and testnets. This allows the core resources account, which only exists in tests/testnets,
+to update the version.
+
+
+<pre><code><b>fun</b> <a href="version.md#0x1_version_initialize_for_test">initialize_for_test</a>(core_resources: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="version.md#0x1_version_initialize_for_test">initialize_for_test</a>(core_resources: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>) {
+    <a href="system_addresses.md#0x1_system_addresses_assert_core_resource">system_addresses::assert_core_resource</a>(core_resources);
+    <b>move_to</b>(core_resources, <a href="version.md#0x1_version_SetVersionCapability">SetVersionCapability</a> {});
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+
+
+<a id="high-level-req"></a>
+
+### High-level Requirements
+
+<table>
+<tr>
+<th>No.</th><th>Requirement</th><th>Criticality</th><th>Implementation</th><th>Enforcement</th>
+</tr>
+
+<tr>
+<td>1</td>
+<td>During genesis, the Version resource should be initialized with the initial version and stored along with its capability under the aptos framework account.</td>
+<td>Medium</td>
+<td>The initialize function ensures that the signer is the aptos framework account and stores the Version and SetVersionCapability resources in it.</td>
+<td>Formally verified via <a href="#high-level-req-1">initialize</a>.</td>
+</tr>
+
+<tr>
+<td>2</td>
+<td>The version should be updateable after initialization, but only by the Aptos framework account and with an increasing version number.</td>
+<td>Medium</td>
+<td>The version number for the blockchain should be updatable whenever necessary. This functionality is provided by the set_version function which ensures that the new version is greater than the previous one.</td>
+<td>Formally verified via <a href="#high-level-req-2">set_version</a>.</td>
+</tr>
+
+</table>
+
+
+
+
+<a id="module-level-spec"></a>
+
+### Module-level Specification
+
+
+<pre><code><b>pragma</b> verify = <b>true</b>;
+<b>pragma</b> aborts_if_is_strict;
+</code></pre>
+
+
+
+<a id="@Specification_1_initialize"></a>
+
+### Function `initialize`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="version.md#0x1_version_initialize">initialize</a>(aptos_framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, initial_version: u64)
+</code></pre>
+
+
+Abort if resource already exists in <code>@aptos_framwork</code> when initializing.
+
+
+<pre><code>// This enforces <a id="high-level-req-1" href="#high-level-req">high-level requirement 1</a>:
+<b>aborts_if</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(aptos_framework) != @aptos_framework;
+<b>aborts_if</b> <b>exists</b>&lt;<a href="version.md#0x1_version_Version">Version</a>&gt;(@aptos_framework);
+<b>aborts_if</b> <b>exists</b>&lt;<a href="version.md#0x1_version_SetVersionCapability">SetVersionCapability</a>&gt;(@aptos_framework);
+<b>ensures</b> <b>exists</b>&lt;<a href="version.md#0x1_version_Version">Version</a>&gt;(@aptos_framework);
+<b>ensures</b> <b>exists</b>&lt;<a href="version.md#0x1_version_SetVersionCapability">SetVersionCapability</a>&gt;(@aptos_framework);
+<b>ensures</b> <b>global</b>&lt;<a href="version.md#0x1_version_Version">Version</a>&gt;(@aptos_framework) == <a href="version.md#0x1_version_Version">Version</a> { major: initial_version };
+<b>ensures</b> <b>global</b>&lt;<a href="version.md#0x1_version_SetVersionCapability">SetVersionCapability</a>&gt;(@aptos_framework) == <a href="version.md#0x1_version_SetVersionCapability">SetVersionCapability</a> {};
+</code></pre>
+
+
+
+<a id="@Specification_1_set_version"></a>
+
+### Function `set_version`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="version.md#0x1_version_set_version">set_version</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, major: u64)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify_duration_estimate = 120;
+<b>include</b> <a href="transaction_fee.md#0x1_transaction_fee_RequiresCollectedFeesPerValueLeqBlockAptosSupply">transaction_fee::RequiresCollectedFeesPerValueLeqBlockAptosSupply</a>;
+<b>include</b> <a href="staking_config.md#0x1_staking_config_StakingRewardsConfigRequirement">staking_config::StakingRewardsConfigRequirement</a>;
+<b>requires</b> <a href="chain_status.md#0x1_chain_status_is_genesis">chain_status::is_genesis</a>();
+<b>requires</b> <a href="timestamp.md#0x1_timestamp_spec_now_microseconds">timestamp::spec_now_microseconds</a>() &gt;= <a href="reconfiguration.md#0x1_reconfiguration_last_reconfiguration_time">reconfiguration::last_reconfiguration_time</a>();
+<b>requires</b> <b>exists</b>&lt;<a href="stake.md#0x1_stake_ValidatorFees">stake::ValidatorFees</a>&gt;(@aptos_framework);
+<b>requires</b> <b>exists</b>&lt;CoinInfo&lt;AptosCoin&gt;&gt;(@aptos_framework);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="version.md#0x1_version_SetVersionCapability">SetVersionCapability</a>&gt;(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>));
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="version.md#0x1_version_Version">Version</a>&gt;(@aptos_framework);
+<b>let</b> old_major = <b>global</b>&lt;<a href="version.md#0x1_version_Version">Version</a>&gt;(@aptos_framework).major;
+// This enforces <a id="high-level-req-2" href="#high-level-req">high-level requirement 2</a>:
+<b>aborts_if</b> !(old_major &lt; major);
+<b>ensures</b> <b>global</b>&lt;<a href="version.md#0x1_version_Version">Version</a>&gt;(@aptos_framework).major == major;
+</code></pre>
+
+
+
+<a id="@Specification_1_set_for_next_epoch"></a>
+
+### Function `set_for_next_epoch`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="version.md#0x1_version_set_for_next_epoch">set_for_next_epoch</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, major: u64)
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="version.md#0x1_version_SetVersionCapability">SetVersionCapability</a>&gt;(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>));
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="version.md#0x1_version_Version">Version</a>&gt;(@aptos_framework);
+<b>aborts_if</b> <b>global</b>&lt;<a href="version.md#0x1_version_Version">Version</a>&gt;(@aptos_framework).major &gt;= major;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="config_buffer.md#0x1_config_buffer_PendingConfigs">config_buffer::PendingConfigs</a>&gt;(@aptos_framework);
+</code></pre>
+
+
+
+<a id="@Specification_1_on_new_epoch"></a>
+
+### Function `on_new_epoch`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="version.md#0x1_version_on_new_epoch">on_new_epoch</a>(framework: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>requires</b> @aptos_framework == std::signer::address_of(framework);
+<b>include</b> <a href="config_buffer.md#0x1_config_buffer_OnNewEpochRequirement">config_buffer::OnNewEpochRequirement</a>&lt;<a href="version.md#0x1_version_Version">Version</a>&gt;;
+<b>aborts_if</b> <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_initialize_for_test"></a>
+
+### Function `initialize_for_test`
+
+
+<pre><code><b>fun</b> <a href="version.md#0x1_version_initialize_for_test">initialize_for_test</a>(core_resources: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+This module turns on <code>aborts_if_is_strict</code>, so need to add spec for test function <code>initialize_for_test</code>.
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/vesting.md b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/vesting.md
new file mode 100644
index 0000000000000..f10b63becec13
--- /dev/null
+++ b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/vesting.md
@@ -0,0 +1,4528 @@
+
+<a id="0x1_vesting"></a>
+
+# Module `0x1::vesting`
+
+
+Simple vesting contract that allows specifying how much APT coins should be vesting in each fixed-size period. The
+vesting contract also comes with staking and allows shareholders to withdraw rewards anytime.
+
+Vesting schedule is represented as a vector of distributions. For example, a vesting schedule of
+[3/48, 3/48, 1/48] means that after the vesting starts:
+1. The first and second periods will vest 3/48 of the total original grant.
+2. The third period will vest 1/48.
+3. All subsequent periods will also vest 1/48 (last distribution in the schedule) until the original grant runs out.
+
+Shareholder flow:
+1. Admin calls create_vesting_contract with a schedule of [3/48, 3/48, 1/48] with a vesting cliff of 1 year and
+vesting period of 1 month.
+2. After a month, a shareholder calls unlock_rewards to request rewards. They can also call vest() which would also
+unlocks rewards but since the 1 year cliff has not passed (vesting has not started), vest() would not release any of
+the original grant.
+3. After the unlocked rewards become fully withdrawable (as it's subject to staking lockup), shareholders can call
+distribute() to send all withdrawable funds to all shareholders based on the original grant's shares structure.
+4. After 1 year and 1 month, the vesting schedule now starts. Shareholders call vest() to unlock vested coins. vest()
+checks the schedule and unlocks 3/48 of the original grant in addition to any accumulated rewards since last
+unlock_rewards(). Once the unlocked coins become withdrawable, shareholders can call distribute().
+5. Assuming the shareholders forgot to call vest() for 2 months, when they call vest() again, they will unlock vested
+tokens for the next period since last vest. This would be for the first month they missed. They can call vest() a
+second time to unlock for the second month they missed.
+
+Admin flow:
+1. After creating the vesting contract, admin cannot change the vesting schedule.
+2. Admin can call update_voter, update_operator, or reset_lockup at any time to update the underlying staking
+contract.
+3. Admin can also call update_beneficiary for any shareholder. This would send all distributions (rewards, vested
+coins) of that shareholder to the beneficiary account. By defalt, if a beneficiary is not set, the distributions are
+send directly to the shareholder account.
+4. Admin can call terminate_vesting_contract to terminate the vesting. This would first finish any distribution but
+will prevent any further rewards or vesting distributions from being created. Once the locked up stake becomes
+withdrawable, admin can call admin_withdraw to withdraw all funds to the vesting contract's withdrawal address.
+
+
+-  [Struct `VestingSchedule`](#0x1_vesting_VestingSchedule)
+-  [Struct `StakingInfo`](#0x1_vesting_StakingInfo)
+-  [Resource `VestingContract`](#0x1_vesting_VestingContract)
+-  [Resource `VestingAccountManagement`](#0x1_vesting_VestingAccountManagement)
+-  [Resource `AdminStore`](#0x1_vesting_AdminStore)
+-  [Struct `CreateVestingContract`](#0x1_vesting_CreateVestingContract)
+-  [Struct `UpdateOperator`](#0x1_vesting_UpdateOperator)
+-  [Struct `UpdateVoter`](#0x1_vesting_UpdateVoter)
+-  [Struct `ResetLockup`](#0x1_vesting_ResetLockup)
+-  [Struct `SetBeneficiary`](#0x1_vesting_SetBeneficiary)
+-  [Struct `UnlockRewards`](#0x1_vesting_UnlockRewards)
+-  [Struct `Vest`](#0x1_vesting_Vest)
+-  [Struct `Distribute`](#0x1_vesting_Distribute)
+-  [Struct `Terminate`](#0x1_vesting_Terminate)
+-  [Struct `AdminWithdraw`](#0x1_vesting_AdminWithdraw)
+-  [Struct `CreateVestingContractEvent`](#0x1_vesting_CreateVestingContractEvent)
+-  [Struct `UpdateOperatorEvent`](#0x1_vesting_UpdateOperatorEvent)
+-  [Struct `UpdateVoterEvent`](#0x1_vesting_UpdateVoterEvent)
+-  [Struct `ResetLockupEvent`](#0x1_vesting_ResetLockupEvent)
+-  [Struct `SetBeneficiaryEvent`](#0x1_vesting_SetBeneficiaryEvent)
+-  [Struct `UnlockRewardsEvent`](#0x1_vesting_UnlockRewardsEvent)
+-  [Struct `VestEvent`](#0x1_vesting_VestEvent)
+-  [Struct `DistributeEvent`](#0x1_vesting_DistributeEvent)
+-  [Struct `TerminateEvent`](#0x1_vesting_TerminateEvent)
+-  [Struct `AdminWithdrawEvent`](#0x1_vesting_AdminWithdrawEvent)
+-  [Constants](#@Constants_0)
+-  [Function `stake_pool_address`](#0x1_vesting_stake_pool_address)
+-  [Function `vesting_start_secs`](#0x1_vesting_vesting_start_secs)
+-  [Function `period_duration_secs`](#0x1_vesting_period_duration_secs)
+-  [Function `remaining_grant`](#0x1_vesting_remaining_grant)
+-  [Function `beneficiary`](#0x1_vesting_beneficiary)
+-  [Function `operator_commission_percentage`](#0x1_vesting_operator_commission_percentage)
+-  [Function `vesting_contracts`](#0x1_vesting_vesting_contracts)
+-  [Function `operator`](#0x1_vesting_operator)
+-  [Function `voter`](#0x1_vesting_voter)
+-  [Function `vesting_schedule`](#0x1_vesting_vesting_schedule)
+-  [Function `total_accumulated_rewards`](#0x1_vesting_total_accumulated_rewards)
+-  [Function `accumulated_rewards`](#0x1_vesting_accumulated_rewards)
+-  [Function `shareholders`](#0x1_vesting_shareholders)
+-  [Function `shareholder`](#0x1_vesting_shareholder)
+-  [Function `create_vesting_schedule`](#0x1_vesting_create_vesting_schedule)
+-  [Function `create_vesting_contract`](#0x1_vesting_create_vesting_contract)
+-  [Function `unlock_rewards`](#0x1_vesting_unlock_rewards)
+-  [Function `unlock_rewards_many`](#0x1_vesting_unlock_rewards_many)
+-  [Function `vest`](#0x1_vesting_vest)
+-  [Function `vest_many`](#0x1_vesting_vest_many)
+-  [Function `distribute`](#0x1_vesting_distribute)
+-  [Function `distribute_many`](#0x1_vesting_distribute_many)
+-  [Function `terminate_vesting_contract`](#0x1_vesting_terminate_vesting_contract)
+-  [Function `admin_withdraw`](#0x1_vesting_admin_withdraw)
+-  [Function `update_operator`](#0x1_vesting_update_operator)
+-  [Function `update_operator_with_same_commission`](#0x1_vesting_update_operator_with_same_commission)
+-  [Function `update_commission_percentage`](#0x1_vesting_update_commission_percentage)
+-  [Function `update_voter`](#0x1_vesting_update_voter)
+-  [Function `reset_lockup`](#0x1_vesting_reset_lockup)
+-  [Function `set_beneficiary`](#0x1_vesting_set_beneficiary)
+-  [Function `reset_beneficiary`](#0x1_vesting_reset_beneficiary)
+-  [Function `set_management_role`](#0x1_vesting_set_management_role)
+-  [Function `set_beneficiary_resetter`](#0x1_vesting_set_beneficiary_resetter)
+-  [Function `set_beneficiary_for_operator`](#0x1_vesting_set_beneficiary_for_operator)
+-  [Function `get_role_holder`](#0x1_vesting_get_role_holder)
+-  [Function `get_vesting_account_signer`](#0x1_vesting_get_vesting_account_signer)
+-  [Function `get_vesting_account_signer_internal`](#0x1_vesting_get_vesting_account_signer_internal)
+-  [Function `create_vesting_contract_account`](#0x1_vesting_create_vesting_contract_account)
+-  [Function `verify_admin`](#0x1_vesting_verify_admin)
+-  [Function `assert_vesting_contract_exists`](#0x1_vesting_assert_vesting_contract_exists)
+-  [Function `assert_active_vesting_contract`](#0x1_vesting_assert_active_vesting_contract)
+-  [Function `unlock_stake`](#0x1_vesting_unlock_stake)
+-  [Function `withdraw_stake`](#0x1_vesting_withdraw_stake)
+-  [Function `get_beneficiary`](#0x1_vesting_get_beneficiary)
+-  [Specification](#@Specification_1)
+    -  [High-level Requirements](#high-level-req)
+    -  [Module-level Specification](#module-level-spec)
+    -  [Function `stake_pool_address`](#@Specification_1_stake_pool_address)
+    -  [Function `vesting_start_secs`](#@Specification_1_vesting_start_secs)
+    -  [Function `period_duration_secs`](#@Specification_1_period_duration_secs)
+    -  [Function `remaining_grant`](#@Specification_1_remaining_grant)
+    -  [Function `beneficiary`](#@Specification_1_beneficiary)
+    -  [Function `operator_commission_percentage`](#@Specification_1_operator_commission_percentage)
+    -  [Function `vesting_contracts`](#@Specification_1_vesting_contracts)
+    -  [Function `operator`](#@Specification_1_operator)
+    -  [Function `voter`](#@Specification_1_voter)
+    -  [Function `vesting_schedule`](#@Specification_1_vesting_schedule)
+    -  [Function `total_accumulated_rewards`](#@Specification_1_total_accumulated_rewards)
+    -  [Function `accumulated_rewards`](#@Specification_1_accumulated_rewards)
+    -  [Function `shareholders`](#@Specification_1_shareholders)
+    -  [Function `shareholder`](#@Specification_1_shareholder)
+    -  [Function `create_vesting_schedule`](#@Specification_1_create_vesting_schedule)
+    -  [Function `create_vesting_contract`](#@Specification_1_create_vesting_contract)
+    -  [Function `unlock_rewards`](#@Specification_1_unlock_rewards)
+    -  [Function `unlock_rewards_many`](#@Specification_1_unlock_rewards_many)
+    -  [Function `vest`](#@Specification_1_vest)
+    -  [Function `vest_many`](#@Specification_1_vest_many)
+    -  [Function `distribute`](#@Specification_1_distribute)
+    -  [Function `distribute_many`](#@Specification_1_distribute_many)
+    -  [Function `terminate_vesting_contract`](#@Specification_1_terminate_vesting_contract)
+    -  [Function `admin_withdraw`](#@Specification_1_admin_withdraw)
+    -  [Function `update_operator`](#@Specification_1_update_operator)
+    -  [Function `update_operator_with_same_commission`](#@Specification_1_update_operator_with_same_commission)
+    -  [Function `update_commission_percentage`](#@Specification_1_update_commission_percentage)
+    -  [Function `update_voter`](#@Specification_1_update_voter)
+    -  [Function `reset_lockup`](#@Specification_1_reset_lockup)
+    -  [Function `set_beneficiary`](#@Specification_1_set_beneficiary)
+    -  [Function `reset_beneficiary`](#@Specification_1_reset_beneficiary)
+    -  [Function `set_management_role`](#@Specification_1_set_management_role)
+    -  [Function `set_beneficiary_resetter`](#@Specification_1_set_beneficiary_resetter)
+    -  [Function `set_beneficiary_for_operator`](#@Specification_1_set_beneficiary_for_operator)
+    -  [Function `get_role_holder`](#@Specification_1_get_role_holder)
+    -  [Function `get_vesting_account_signer`](#@Specification_1_get_vesting_account_signer)
+    -  [Function `get_vesting_account_signer_internal`](#@Specification_1_get_vesting_account_signer_internal)
+    -  [Function `create_vesting_contract_account`](#@Specification_1_create_vesting_contract_account)
+    -  [Function `verify_admin`](#@Specification_1_verify_admin)
+    -  [Function `assert_vesting_contract_exists`](#@Specification_1_assert_vesting_contract_exists)
+    -  [Function `assert_active_vesting_contract`](#@Specification_1_assert_active_vesting_contract)
+    -  [Function `unlock_stake`](#@Specification_1_unlock_stake)
+    -  [Function `withdraw_stake`](#@Specification_1_withdraw_stake)
+    -  [Function `get_beneficiary`](#@Specification_1_get_beneficiary)
+
+
+<pre><code><b>use</b> <a href="account.md#0x1_account">0x1::account</a>;
+<b>use</b> <a href="aptos_account.md#0x1_aptos_account">0x1::aptos_account</a>;
+<b>use</b> <a href="aptos_coin.md#0x1_aptos_coin">0x1::aptos_coin</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs">0x1::bcs</a>;
+<b>use</b> <a href="coin.md#0x1_coin">0x1::coin</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="event.md#0x1_event">0x1::event</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features">0x1::features</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/fixed_point32.md#0x1_fixed_point32">0x1::fixed_point32</a>;
+<b>use</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/math64.md#0x1_math64">0x1::math64</a>;
+<b>use</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64">0x1::pool_u64</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">0x1::signer</a>;
+<b>use</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map">0x1::simple_map</a>;
+<b>use</b> <a href="stake.md#0x1_stake">0x1::stake</a>;
+<b>use</b> <a href="staking_contract.md#0x1_staking_contract">0x1::staking_contract</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string">0x1::string</a>;
+<b>use</b> <a href="system_addresses.md#0x1_system_addresses">0x1::system_addresses</a>;
+<b>use</b> <a href="timestamp.md#0x1_timestamp">0x1::timestamp</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">0x1::vector</a>;
+</code></pre>
+
+
+
+<a id="0x1_vesting_VestingSchedule"></a>
+
+## Struct `VestingSchedule`
+
+
+
+<pre><code><b>struct</b> <a href="vesting.md#0x1_vesting_VestingSchedule">VestingSchedule</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>schedule: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>start_timestamp_secs: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>period_duration: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>last_vested_period: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_vesting_StakingInfo"></a>
+
+## Struct `StakingInfo`
+
+
+
+<pre><code><b>struct</b> <a href="vesting.md#0x1_vesting_StakingInfo">StakingInfo</a> <b>has</b> store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>operator: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>voter: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>commission_percentage: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_vesting_VestingContract"></a>
+
+## Resource `VestingContract`
+
+
+
+<pre><code><b>struct</b> <a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>state: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>admin: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>grant_pool: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_Pool">pool_u64::Pool</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>beneficiaries: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;<b>address</b>, <b>address</b>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>vesting_schedule: <a href="vesting.md#0x1_vesting_VestingSchedule">vesting::VestingSchedule</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>withdrawal_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>staking: <a href="vesting.md#0x1_vesting_StakingInfo">vesting::StakingInfo</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>remaining_grant: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>signer_cap: <a href="account.md#0x1_account_SignerCapability">account::SignerCapability</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>update_operator_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="vesting.md#0x1_vesting_UpdateOperatorEvent">vesting::UpdateOperatorEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>update_voter_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="vesting.md#0x1_vesting_UpdateVoterEvent">vesting::UpdateVoterEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>reset_lockup_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="vesting.md#0x1_vesting_ResetLockupEvent">vesting::ResetLockupEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>set_beneficiary_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="vesting.md#0x1_vesting_SetBeneficiaryEvent">vesting::SetBeneficiaryEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>unlock_rewards_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="vesting.md#0x1_vesting_UnlockRewardsEvent">vesting::UnlockRewardsEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>vest_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="vesting.md#0x1_vesting_VestEvent">vesting::VestEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>distribute_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="vesting.md#0x1_vesting_DistributeEvent">vesting::DistributeEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>terminate_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="vesting.md#0x1_vesting_TerminateEvent">vesting::TerminateEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>admin_withdraw_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="vesting.md#0x1_vesting_AdminWithdrawEvent">vesting::AdminWithdrawEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_vesting_VestingAccountManagement"></a>
+
+## Resource `VestingAccountManagement`
+
+
+
+<pre><code><b>struct</b> <a href="vesting.md#0x1_vesting_VestingAccountManagement">VestingAccountManagement</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>roles: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, <b>address</b>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_vesting_AdminStore"></a>
+
+## Resource `AdminStore`
+
+
+
+<pre><code><b>struct</b> <a href="vesting.md#0x1_vesting_AdminStore">AdminStore</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>vesting_contracts: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>nonce: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>create_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="vesting.md#0x1_vesting_CreateVestingContractEvent">vesting::CreateVestingContractEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_vesting_CreateVestingContract"></a>
+
+## Struct `CreateVestingContract`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="vesting.md#0x1_vesting_CreateVestingContract">CreateVestingContract</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>operator: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>voter: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>grant_amount: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>withdrawal_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>vesting_contract_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>staking_pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>commission_percentage: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_vesting_UpdateOperator"></a>
+
+## Struct `UpdateOperator`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="vesting.md#0x1_vesting_UpdateOperator">UpdateOperator</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>admin: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>vesting_contract_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>staking_pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>old_operator: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>new_operator: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>commission_percentage: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_vesting_UpdateVoter"></a>
+
+## Struct `UpdateVoter`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="vesting.md#0x1_vesting_UpdateVoter">UpdateVoter</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>admin: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>vesting_contract_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>staking_pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>old_voter: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>new_voter: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_vesting_ResetLockup"></a>
+
+## Struct `ResetLockup`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="vesting.md#0x1_vesting_ResetLockup">ResetLockup</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>admin: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>vesting_contract_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>staking_pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>new_lockup_expiration_secs: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_vesting_SetBeneficiary"></a>
+
+## Struct `SetBeneficiary`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="vesting.md#0x1_vesting_SetBeneficiary">SetBeneficiary</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>admin: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>vesting_contract_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>shareholder: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>old_beneficiary: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>new_beneficiary: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_vesting_UnlockRewards"></a>
+
+## Struct `UnlockRewards`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="vesting.md#0x1_vesting_UnlockRewards">UnlockRewards</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>admin: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>vesting_contract_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>staking_pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>amount: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_vesting_Vest"></a>
+
+## Struct `Vest`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="vesting.md#0x1_vesting_Vest">Vest</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>admin: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>vesting_contract_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>staking_pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>period_vested: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>amount: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_vesting_Distribute"></a>
+
+## Struct `Distribute`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="vesting.md#0x1_vesting_Distribute">Distribute</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>admin: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>vesting_contract_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>amount: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_vesting_Terminate"></a>
+
+## Struct `Terminate`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="vesting.md#0x1_vesting_Terminate">Terminate</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>admin: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>vesting_contract_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_vesting_AdminWithdraw"></a>
+
+## Struct `AdminWithdraw`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="vesting.md#0x1_vesting_AdminWithdraw">AdminWithdraw</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>admin: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>vesting_contract_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>amount: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_vesting_CreateVestingContractEvent"></a>
+
+## Struct `CreateVestingContractEvent`
+
+
+
+<pre><code><b>struct</b> <a href="vesting.md#0x1_vesting_CreateVestingContractEvent">CreateVestingContractEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>operator: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>voter: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>grant_amount: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>withdrawal_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>vesting_contract_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>staking_pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>commission_percentage: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_vesting_UpdateOperatorEvent"></a>
+
+## Struct `UpdateOperatorEvent`
+
+
+
+<pre><code><b>struct</b> <a href="vesting.md#0x1_vesting_UpdateOperatorEvent">UpdateOperatorEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>admin: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>vesting_contract_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>staking_pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>old_operator: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>new_operator: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>commission_percentage: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_vesting_UpdateVoterEvent"></a>
+
+## Struct `UpdateVoterEvent`
+
+
+
+<pre><code><b>struct</b> <a href="vesting.md#0x1_vesting_UpdateVoterEvent">UpdateVoterEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>admin: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>vesting_contract_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>staking_pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>old_voter: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>new_voter: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_vesting_ResetLockupEvent"></a>
+
+## Struct `ResetLockupEvent`
+
+
+
+<pre><code><b>struct</b> <a href="vesting.md#0x1_vesting_ResetLockupEvent">ResetLockupEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>admin: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>vesting_contract_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>staking_pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>new_lockup_expiration_secs: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_vesting_SetBeneficiaryEvent"></a>
+
+## Struct `SetBeneficiaryEvent`
+
+
+
+<pre><code><b>struct</b> <a href="vesting.md#0x1_vesting_SetBeneficiaryEvent">SetBeneficiaryEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>admin: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>vesting_contract_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>shareholder: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>old_beneficiary: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>new_beneficiary: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_vesting_UnlockRewardsEvent"></a>
+
+## Struct `UnlockRewardsEvent`
+
+
+
+<pre><code><b>struct</b> <a href="vesting.md#0x1_vesting_UnlockRewardsEvent">UnlockRewardsEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>admin: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>vesting_contract_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>staking_pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>amount: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_vesting_VestEvent"></a>
+
+## Struct `VestEvent`
+
+
+
+<pre><code><b>struct</b> <a href="vesting.md#0x1_vesting_VestEvent">VestEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>admin: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>vesting_contract_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>staking_pool_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>period_vested: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>amount: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_vesting_DistributeEvent"></a>
+
+## Struct `DistributeEvent`
+
+
+
+<pre><code><b>struct</b> <a href="vesting.md#0x1_vesting_DistributeEvent">DistributeEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>admin: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>vesting_contract_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>amount: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_vesting_TerminateEvent"></a>
+
+## Struct `TerminateEvent`
+
+
+
+<pre><code><b>struct</b> <a href="vesting.md#0x1_vesting_TerminateEvent">TerminateEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>admin: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>vesting_contract_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_vesting_AdminWithdrawEvent"></a>
+
+## Struct `AdminWithdrawEvent`
+
+
+
+<pre><code><b>struct</b> <a href="vesting.md#0x1_vesting_AdminWithdrawEvent">AdminWithdrawEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>admin: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>vesting_contract_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>amount: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_vesting_EEMPTY_VESTING_SCHEDULE"></a>
+
+Vesting schedule cannot be empty.
+
+
+<pre><code><b>const</b> <a href="vesting.md#0x1_vesting_EEMPTY_VESTING_SCHEDULE">EEMPTY_VESTING_SCHEDULE</a>: u64 = 2;
+</code></pre>
+
+
+
+<a id="0x1_vesting_EINVALID_WITHDRAWAL_ADDRESS"></a>
+
+Withdrawal address is invalid.
+
+
+<pre><code><b>const</b> <a href="vesting.md#0x1_vesting_EINVALID_WITHDRAWAL_ADDRESS">EINVALID_WITHDRAWAL_ADDRESS</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_vesting_ENOT_ADMIN"></a>
+
+The signer is not the admin of the vesting contract.
+
+
+<pre><code><b>const</b> <a href="vesting.md#0x1_vesting_ENOT_ADMIN">ENOT_ADMIN</a>: u64 = 7;
+</code></pre>
+
+
+
+<a id="0x1_vesting_ENO_SHAREHOLDERS"></a>
+
+Shareholders list cannot be empty.
+
+
+<pre><code><b>const</b> <a href="vesting.md#0x1_vesting_ENO_SHAREHOLDERS">ENO_SHAREHOLDERS</a>: u64 = 4;
+</code></pre>
+
+
+
+<a id="0x1_vesting_EPENDING_STAKE_FOUND"></a>
+
+Cannot terminate the vesting contract with pending active stake. Need to wait until next epoch.
+
+
+<pre><code><b>const</b> <a href="vesting.md#0x1_vesting_EPENDING_STAKE_FOUND">EPENDING_STAKE_FOUND</a>: u64 = 11;
+</code></pre>
+
+
+
+<a id="0x1_vesting_EPERMISSION_DENIED"></a>
+
+Account is not admin or does not have the required role to take this action.
+
+
+<pre><code><b>const</b> <a href="vesting.md#0x1_vesting_EPERMISSION_DENIED">EPERMISSION_DENIED</a>: u64 = 15;
+</code></pre>
+
+
+
+<a id="0x1_vesting_EROLE_NOT_FOUND"></a>
+
+The vesting account has no such management role.
+
+
+<pre><code><b>const</b> <a href="vesting.md#0x1_vesting_EROLE_NOT_FOUND">EROLE_NOT_FOUND</a>: u64 = 14;
+</code></pre>
+
+
+
+<a id="0x1_vesting_ESHARES_LENGTH_MISMATCH"></a>
+
+The length of shareholders and shares lists don't match.
+
+
+<pre><code><b>const</b> <a href="vesting.md#0x1_vesting_ESHARES_LENGTH_MISMATCH">ESHARES_LENGTH_MISMATCH</a>: u64 = 5;
+</code></pre>
+
+
+
+<a id="0x1_vesting_EVEC_EMPTY_FOR_MANY_FUNCTION"></a>
+
+Zero items were provided to a *_many function.
+
+
+<pre><code><b>const</b> <a href="vesting.md#0x1_vesting_EVEC_EMPTY_FOR_MANY_FUNCTION">EVEC_EMPTY_FOR_MANY_FUNCTION</a>: u64 = 16;
+</code></pre>
+
+
+
+<a id="0x1_vesting_EVESTING_ACCOUNT_HAS_NO_ROLES"></a>
+
+Vesting account has no other management roles beside admin.
+
+
+<pre><code><b>const</b> <a href="vesting.md#0x1_vesting_EVESTING_ACCOUNT_HAS_NO_ROLES">EVESTING_ACCOUNT_HAS_NO_ROLES</a>: u64 = 13;
+</code></pre>
+
+
+
+<a id="0x1_vesting_EVESTING_CONTRACT_NOT_ACTIVE"></a>
+
+Vesting contract needs to be in active state.
+
+
+<pre><code><b>const</b> <a href="vesting.md#0x1_vesting_EVESTING_CONTRACT_NOT_ACTIVE">EVESTING_CONTRACT_NOT_ACTIVE</a>: u64 = 8;
+</code></pre>
+
+
+
+<a id="0x1_vesting_EVESTING_CONTRACT_NOT_FOUND"></a>
+
+No vesting contract found at provided address.
+
+
+<pre><code><b>const</b> <a href="vesting.md#0x1_vesting_EVESTING_CONTRACT_NOT_FOUND">EVESTING_CONTRACT_NOT_FOUND</a>: u64 = 10;
+</code></pre>
+
+
+
+<a id="0x1_vesting_EVESTING_CONTRACT_STILL_ACTIVE"></a>
+
+Admin can only withdraw from an inactive (paused or terminated) vesting contract.
+
+
+<pre><code><b>const</b> <a href="vesting.md#0x1_vesting_EVESTING_CONTRACT_STILL_ACTIVE">EVESTING_CONTRACT_STILL_ACTIVE</a>: u64 = 9;
+</code></pre>
+
+
+
+<a id="0x1_vesting_EVESTING_START_TOO_SOON"></a>
+
+Vesting cannot start before or at the current block timestamp. Has to be in the future.
+
+
+<pre><code><b>const</b> <a href="vesting.md#0x1_vesting_EVESTING_START_TOO_SOON">EVESTING_START_TOO_SOON</a>: u64 = 6;
+</code></pre>
+
+
+
+<a id="0x1_vesting_EZERO_GRANT"></a>
+
+Grant amount cannot be 0.
+
+
+<pre><code><b>const</b> <a href="vesting.md#0x1_vesting_EZERO_GRANT">EZERO_GRANT</a>: u64 = 12;
+</code></pre>
+
+
+
+<a id="0x1_vesting_EZERO_VESTING_SCHEDULE_PERIOD"></a>
+
+Vesting period cannot be 0.
+
+
+<pre><code><b>const</b> <a href="vesting.md#0x1_vesting_EZERO_VESTING_SCHEDULE_PERIOD">EZERO_VESTING_SCHEDULE_PERIOD</a>: u64 = 3;
+</code></pre>
+
+
+
+<a id="0x1_vesting_MAXIMUM_SHAREHOLDERS"></a>
+
+Maximum number of shareholders a vesting pool can support.
+
+
+<pre><code><b>const</b> <a href="vesting.md#0x1_vesting_MAXIMUM_SHAREHOLDERS">MAXIMUM_SHAREHOLDERS</a>: u64 = 30;
+</code></pre>
+
+
+
+<a id="0x1_vesting_ROLE_BENEFICIARY_RESETTER"></a>
+
+Roles that can manage certain aspects of the vesting account beyond the main admin.
+
+
+<pre><code><b>const</b> <a href="vesting.md#0x1_vesting_ROLE_BENEFICIARY_RESETTER">ROLE_BENEFICIARY_RESETTER</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; = [82, 79, 76, 69, 95, 66, 69, 78, 69, 70, 73, 67, 73, 65, 82, 89, 95, 82, 69, 83, 69, 84, 84, 69, 82];
+</code></pre>
+
+
+
+<a id="0x1_vesting_VESTING_POOL_ACTIVE"></a>
+
+Vesting contract states.
+Vesting contract is active and distributions can be made.
+
+
+<pre><code><b>const</b> <a href="vesting.md#0x1_vesting_VESTING_POOL_ACTIVE">VESTING_POOL_ACTIVE</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_vesting_VESTING_POOL_SALT"></a>
+
+
+
+<pre><code><b>const</b> <a href="vesting.md#0x1_vesting_VESTING_POOL_SALT">VESTING_POOL_SALT</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; = [97, 112, 116, 111, 115, 95, 102, 114, 97, 109, 101, 119, 111, 114, 107, 58, 58, 118, 101, 115, 116, 105, 110, 103];
+</code></pre>
+
+
+
+<a id="0x1_vesting_VESTING_POOL_TERMINATED"></a>
+
+Vesting contract has been terminated and all funds have been released back to the withdrawal address.
+
+
+<pre><code><b>const</b> <a href="vesting.md#0x1_vesting_VESTING_POOL_TERMINATED">VESTING_POOL_TERMINATED</a>: u64 = 2;
+</code></pre>
+
+
+
+<a id="0x1_vesting_stake_pool_address"></a>
+
+## Function `stake_pool_address`
+
+Return the address of the underlying stake pool (separate resource account) of the vesting contract.
+
+This errors out if the vesting contract with the provided address doesn't exist.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="vesting.md#0x1_vesting_stake_pool_address">stake_pool_address</a>(vesting_contract_address: <b>address</b>): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vesting.md#0x1_vesting_stake_pool_address">stake_pool_address</a>(vesting_contract_address: <b>address</b>): <b>address</b> <b>acquires</b> <a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a> {
+    <a href="vesting.md#0x1_vesting_assert_vesting_contract_exists">assert_vesting_contract_exists</a>(vesting_contract_address);
+    <b>borrow_global</b>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;(vesting_contract_address).staking.pool_address
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vesting_vesting_start_secs"></a>
+
+## Function `vesting_start_secs`
+
+Return the vesting start timestamp (in seconds) of the vesting contract.
+Vesting will start at this time, and once a full period has passed, the first vest will become unlocked.
+
+This errors out if the vesting contract with the provided address doesn't exist.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="vesting.md#0x1_vesting_vesting_start_secs">vesting_start_secs</a>(vesting_contract_address: <b>address</b>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vesting.md#0x1_vesting_vesting_start_secs">vesting_start_secs</a>(vesting_contract_address: <b>address</b>): u64 <b>acquires</b> <a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a> {
+    <a href="vesting.md#0x1_vesting_assert_vesting_contract_exists">assert_vesting_contract_exists</a>(vesting_contract_address);
+    <b>borrow_global</b>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;(vesting_contract_address).vesting_schedule.start_timestamp_secs
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vesting_period_duration_secs"></a>
+
+## Function `period_duration_secs`
+
+Return the duration of one vesting period (in seconds).
+Each vest is released after one full period has started, starting from the specified start_timestamp_secs.
+
+This errors out if the vesting contract with the provided address doesn't exist.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="vesting.md#0x1_vesting_period_duration_secs">period_duration_secs</a>(vesting_contract_address: <b>address</b>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vesting.md#0x1_vesting_period_duration_secs">period_duration_secs</a>(vesting_contract_address: <b>address</b>): u64 <b>acquires</b> <a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a> {
+    <a href="vesting.md#0x1_vesting_assert_vesting_contract_exists">assert_vesting_contract_exists</a>(vesting_contract_address);
+    <b>borrow_global</b>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;(vesting_contract_address).vesting_schedule.period_duration
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vesting_remaining_grant"></a>
+
+## Function `remaining_grant`
+
+Return the remaining grant, consisting of unvested coins that have not been distributed to shareholders.
+Prior to start_timestamp_secs, the remaining grant will always be equal to the original grant.
+Once vesting has started, and vested tokens are distributed, the remaining grant will decrease over time,
+according to the vesting schedule.
+
+This errors out if the vesting contract with the provided address doesn't exist.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="vesting.md#0x1_vesting_remaining_grant">remaining_grant</a>(vesting_contract_address: <b>address</b>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vesting.md#0x1_vesting_remaining_grant">remaining_grant</a>(vesting_contract_address: <b>address</b>): u64 <b>acquires</b> <a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a> {
+    <a href="vesting.md#0x1_vesting_assert_vesting_contract_exists">assert_vesting_contract_exists</a>(vesting_contract_address);
+    <b>borrow_global</b>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;(vesting_contract_address).remaining_grant
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vesting_beneficiary"></a>
+
+## Function `beneficiary`
+
+Return the beneficiary account of the specified shareholder in a vesting contract.
+This is the same as the shareholder address by default and only different if it's been explicitly set.
+
+This errors out if the vesting contract with the provided address doesn't exist.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="vesting.md#0x1_vesting_beneficiary">beneficiary</a>(vesting_contract_address: <b>address</b>, shareholder: <b>address</b>): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vesting.md#0x1_vesting_beneficiary">beneficiary</a>(vesting_contract_address: <b>address</b>, shareholder: <b>address</b>): <b>address</b> <b>acquires</b> <a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a> {
+    <a href="vesting.md#0x1_vesting_assert_vesting_contract_exists">assert_vesting_contract_exists</a>(vesting_contract_address);
+    <a href="vesting.md#0x1_vesting_get_beneficiary">get_beneficiary</a>(<b>borrow_global</b>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;(vesting_contract_address), shareholder)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vesting_operator_commission_percentage"></a>
+
+## Function `operator_commission_percentage`
+
+Return the percentage of accumulated rewards that is paid to the operator as commission.
+
+This errors out if the vesting contract with the provided address doesn't exist.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="vesting.md#0x1_vesting_operator_commission_percentage">operator_commission_percentage</a>(vesting_contract_address: <b>address</b>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vesting.md#0x1_vesting_operator_commission_percentage">operator_commission_percentage</a>(vesting_contract_address: <b>address</b>): u64 <b>acquires</b> <a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a> {
+    <a href="vesting.md#0x1_vesting_assert_vesting_contract_exists">assert_vesting_contract_exists</a>(vesting_contract_address);
+    <b>borrow_global</b>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;(vesting_contract_address).staking.commission_percentage
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vesting_vesting_contracts"></a>
+
+## Function `vesting_contracts`
+
+Return all the vesting contracts a given address is an admin of.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="vesting.md#0x1_vesting_vesting_contracts">vesting_contracts</a>(admin: <b>address</b>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vesting.md#0x1_vesting_vesting_contracts">vesting_contracts</a>(admin: <b>address</b>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt; <b>acquires</b> <a href="vesting.md#0x1_vesting_AdminStore">AdminStore</a> {
+    <b>if</b> (!<b>exists</b>&lt;<a href="vesting.md#0x1_vesting_AdminStore">AdminStore</a>&gt;(admin)) {
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_empty">vector::empty</a>&lt;<b>address</b>&gt;()
+    } <b>else</b> {
+        <b>borrow_global</b>&lt;<a href="vesting.md#0x1_vesting_AdminStore">AdminStore</a>&gt;(admin).vesting_contracts
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vesting_operator"></a>
+
+## Function `operator`
+
+Return the operator who runs the validator for the vesting contract.
+
+This errors out if the vesting contract with the provided address doesn't exist.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="vesting.md#0x1_vesting_operator">operator</a>(vesting_contract_address: <b>address</b>): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vesting.md#0x1_vesting_operator">operator</a>(vesting_contract_address: <b>address</b>): <b>address</b> <b>acquires</b> <a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a> {
+    <a href="vesting.md#0x1_vesting_assert_vesting_contract_exists">assert_vesting_contract_exists</a>(vesting_contract_address);
+    <b>borrow_global</b>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;(vesting_contract_address).staking.operator
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vesting_voter"></a>
+
+## Function `voter`
+
+Return the voter who will be voting on on-chain governance proposals on behalf of the vesting contract's stake
+pool.
+
+This errors out if the vesting contract with the provided address doesn't exist.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="vesting.md#0x1_vesting_voter">voter</a>(vesting_contract_address: <b>address</b>): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vesting.md#0x1_vesting_voter">voter</a>(vesting_contract_address: <b>address</b>): <b>address</b> <b>acquires</b> <a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a> {
+    <a href="vesting.md#0x1_vesting_assert_vesting_contract_exists">assert_vesting_contract_exists</a>(vesting_contract_address);
+    <b>borrow_global</b>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;(vesting_contract_address).staking.voter
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vesting_vesting_schedule"></a>
+
+## Function `vesting_schedule`
+
+Return the vesting contract's vesting schedule. The core schedule is represented as a list of u64-based
+fractions, where the rightmmost 32 bits can be divided by 2^32 to get the fraction, and anything else is the
+whole number.
+
+For example 3/48, or 0.0625, will be represented as 268435456. The fractional portion would be
+268435456 / 2^32 = 0.0625. Since there are fewer than 32 bits, the whole number portion is effectively 0.
+So 268435456 = 0.0625.
+
+This errors out if the vesting contract with the provided address doesn't exist.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="vesting.md#0x1_vesting_vesting_schedule">vesting_schedule</a>(vesting_contract_address: <b>address</b>): <a href="vesting.md#0x1_vesting_VestingSchedule">vesting::VestingSchedule</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vesting.md#0x1_vesting_vesting_schedule">vesting_schedule</a>(vesting_contract_address: <b>address</b>): <a href="vesting.md#0x1_vesting_VestingSchedule">VestingSchedule</a> <b>acquires</b> <a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a> {
+    <a href="vesting.md#0x1_vesting_assert_vesting_contract_exists">assert_vesting_contract_exists</a>(vesting_contract_address);
+    <b>borrow_global</b>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;(vesting_contract_address).vesting_schedule
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vesting_total_accumulated_rewards"></a>
+
+## Function `total_accumulated_rewards`
+
+Return the total accumulated rewards that have not been distributed to shareholders of the vesting contract.
+This excludes any unpaid commission that the operator has not collected.
+
+This errors out if the vesting contract with the provided address doesn't exist.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="vesting.md#0x1_vesting_total_accumulated_rewards">total_accumulated_rewards</a>(vesting_contract_address: <b>address</b>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vesting.md#0x1_vesting_total_accumulated_rewards">total_accumulated_rewards</a>(vesting_contract_address: <b>address</b>): u64 <b>acquires</b> <a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a> {
+    <a href="vesting.md#0x1_vesting_assert_active_vesting_contract">assert_active_vesting_contract</a>(vesting_contract_address);
+
+    <b>let</b> vesting_contract = <b>borrow_global</b>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;(vesting_contract_address);
+    <b>let</b> (total_active_stake, _, commission_amount) =
+        <a href="staking_contract.md#0x1_staking_contract_staking_contract_amounts">staking_contract::staking_contract_amounts</a>(vesting_contract_address, vesting_contract.staking.operator);
+    total_active_stake - vesting_contract.remaining_grant - commission_amount
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vesting_accumulated_rewards"></a>
+
+## Function `accumulated_rewards`
+
+Return the accumulated rewards that have not been distributed to the provided shareholder. Caller can also pass
+the beneficiary address instead of shareholder address.
+
+This errors out if the vesting contract with the provided address doesn't exist.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="vesting.md#0x1_vesting_accumulated_rewards">accumulated_rewards</a>(vesting_contract_address: <b>address</b>, shareholder_or_beneficiary: <b>address</b>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vesting.md#0x1_vesting_accumulated_rewards">accumulated_rewards</a>(
+    vesting_contract_address: <b>address</b>, shareholder_or_beneficiary: <b>address</b>): u64 <b>acquires</b> <a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a> {
+    <a href="vesting.md#0x1_vesting_assert_active_vesting_contract">assert_active_vesting_contract</a>(vesting_contract_address);
+
+    <b>let</b> total_accumulated_rewards = <a href="vesting.md#0x1_vesting_total_accumulated_rewards">total_accumulated_rewards</a>(vesting_contract_address);
+    <b>let</b> shareholder = <a href="vesting.md#0x1_vesting_shareholder">shareholder</a>(vesting_contract_address, shareholder_or_beneficiary);
+    <b>let</b> vesting_contract = <b>borrow_global</b>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;(vesting_contract_address);
+    <b>let</b> shares = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_shares">pool_u64::shares</a>(&vesting_contract.grant_pool, shareholder);
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_shares_to_amount_with_total_coins">pool_u64::shares_to_amount_with_total_coins</a>(&vesting_contract.grant_pool, shares, total_accumulated_rewards)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vesting_shareholders"></a>
+
+## Function `shareholders`
+
+Return the list of all shareholders in the vesting contract.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="vesting.md#0x1_vesting_shareholders">shareholders</a>(vesting_contract_address: <b>address</b>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vesting.md#0x1_vesting_shareholders">shareholders</a>(vesting_contract_address: <b>address</b>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt; <b>acquires</b> <a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a> {
+    <a href="vesting.md#0x1_vesting_assert_active_vesting_contract">assert_active_vesting_contract</a>(vesting_contract_address);
+
+    <b>let</b> vesting_contract = <b>borrow_global</b>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;(vesting_contract_address);
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_shareholders">pool_u64::shareholders</a>(&vesting_contract.grant_pool)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vesting_shareholder"></a>
+
+## Function `shareholder`
+
+Return the shareholder address given the beneficiary address in a given vesting contract. If there are multiple
+shareholders with the same beneficiary address, only the first shareholder is returned. If the given beneficiary
+address is actually a shareholder address, just return the address back.
+
+This returns 0x0 if no shareholder is found for the given beneficiary / the address is not a shareholder itself.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="vesting.md#0x1_vesting_shareholder">shareholder</a>(vesting_contract_address: <b>address</b>, shareholder_or_beneficiary: <b>address</b>): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vesting.md#0x1_vesting_shareholder">shareholder</a>(
+    vesting_contract_address: <b>address</b>,
+    shareholder_or_beneficiary: <b>address</b>
+): <b>address</b> <b>acquires</b> <a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a> {
+    <a href="vesting.md#0x1_vesting_assert_active_vesting_contract">assert_active_vesting_contract</a>(vesting_contract_address);
+
+    <b>let</b> shareholders = &<a href="vesting.md#0x1_vesting_shareholders">shareholders</a>(vesting_contract_address);
+    <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_contains">vector::contains</a>(shareholders, &shareholder_or_beneficiary)) {
+        <b>return</b> shareholder_or_beneficiary
+    };
+    <b>let</b> vesting_contract = <b>borrow_global</b>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;(vesting_contract_address);
+    <b>let</b> result = @0x0;
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_any">vector::any</a>(shareholders, |shareholder| {
+        <b>if</b> (shareholder_or_beneficiary == <a href="vesting.md#0x1_vesting_get_beneficiary">get_beneficiary</a>(vesting_contract, *shareholder)) {
+            result = *shareholder;
+            <b>true</b>
+        } <b>else</b> {
+            <b>false</b>
+        }
+    });
+
+    result
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vesting_create_vesting_schedule"></a>
+
+## Function `create_vesting_schedule`
+
+Create a vesting schedule with the given schedule of distributions, a vesting start time and period duration.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vesting.md#0x1_vesting_create_vesting_schedule">create_vesting_schedule</a>(schedule: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>&gt;, start_timestamp_secs: u64, period_duration: u64): <a href="vesting.md#0x1_vesting_VestingSchedule">vesting::VestingSchedule</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vesting.md#0x1_vesting_create_vesting_schedule">create_vesting_schedule</a>(
+    schedule: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;FixedPoint32&gt;,
+    start_timestamp_secs: u64,
+    period_duration: u64,
+): <a href="vesting.md#0x1_vesting_VestingSchedule">VestingSchedule</a> {
+    <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&schedule) &gt; 0, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="vesting.md#0x1_vesting_EEMPTY_VESTING_SCHEDULE">EEMPTY_VESTING_SCHEDULE</a>));
+    <b>assert</b>!(period_duration &gt; 0, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="vesting.md#0x1_vesting_EZERO_VESTING_SCHEDULE_PERIOD">EZERO_VESTING_SCHEDULE_PERIOD</a>));
+    <b>assert</b>!(
+        start_timestamp_secs &gt;= <a href="timestamp.md#0x1_timestamp_now_seconds">timestamp::now_seconds</a>(),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="vesting.md#0x1_vesting_EVESTING_START_TOO_SOON">EVESTING_START_TOO_SOON</a>),
+    );
+
+    <a href="vesting.md#0x1_vesting_VestingSchedule">VestingSchedule</a> {
+        schedule,
+        start_timestamp_secs,
+        period_duration,
+        last_vested_period: 0,
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vesting_create_vesting_contract"></a>
+
+## Function `create_vesting_contract`
+
+Create a vesting contract with a given configurations.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vesting.md#0x1_vesting_create_vesting_contract">create_vesting_contract</a>(admin: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, shareholders: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;, buy_ins: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;<b>address</b>, <a href="coin.md#0x1_coin_Coin">coin::Coin</a>&lt;<a href="aptos_coin.md#0x1_aptos_coin_AptosCoin">aptos_coin::AptosCoin</a>&gt;&gt;, vesting_schedule: <a href="vesting.md#0x1_vesting_VestingSchedule">vesting::VestingSchedule</a>, withdrawal_address: <b>address</b>, operator: <b>address</b>, voter: <b>address</b>, commission_percentage: u64, contract_creation_seed: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vesting.md#0x1_vesting_create_vesting_contract">create_vesting_contract</a>(
+    admin: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    shareholders: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;,
+    buy_ins: SimpleMap&lt;<b>address</b>, Coin&lt;AptosCoin&gt;&gt;,
+    vesting_schedule: <a href="vesting.md#0x1_vesting_VestingSchedule">VestingSchedule</a>,
+    withdrawal_address: <b>address</b>,
+    operator: <b>address</b>,
+    voter: <b>address</b>,
+    commission_percentage: u64,
+    // Optional seed used when creating the staking contract <a href="account.md#0x1_account">account</a>.
+    contract_creation_seed: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+): <b>address</b> <b>acquires</b> <a href="vesting.md#0x1_vesting_AdminStore">AdminStore</a> {
+    <b>assert</b>!(
+        !<a href="system_addresses.md#0x1_system_addresses_is_reserved_address">system_addresses::is_reserved_address</a>(withdrawal_address),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="vesting.md#0x1_vesting_EINVALID_WITHDRAWAL_ADDRESS">EINVALID_WITHDRAWAL_ADDRESS</a>),
+    );
+    assert_account_is_registered_for_apt(withdrawal_address);
+    <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(shareholders) &gt; 0, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="vesting.md#0x1_vesting_ENO_SHAREHOLDERS">ENO_SHAREHOLDERS</a>));
+    <b>assert</b>!(
+        <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_length">simple_map::length</a>(&buy_ins) == <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(shareholders),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="vesting.md#0x1_vesting_ESHARES_LENGTH_MISMATCH">ESHARES_LENGTH_MISMATCH</a>),
+    );
+
+    // Create a coins pool <b>to</b> track shareholders and shares of the grant.
+    <b>let</b> grant = <a href="coin.md#0x1_coin_zero">coin::zero</a>&lt;AptosCoin&gt;();
+    <b>let</b> grant_amount = 0;
+    <b>let</b> grant_pool = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_create">pool_u64::create</a>(<a href="vesting.md#0x1_vesting_MAXIMUM_SHAREHOLDERS">MAXIMUM_SHAREHOLDERS</a>);
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_for_each_ref">vector::for_each_ref</a>(shareholders, |shareholder| {
+        <b>let</b> shareholder: <b>address</b> = *shareholder;
+        <b>let</b> (_, buy_in) = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_remove">simple_map::remove</a>(&<b>mut</b> buy_ins, &shareholder);
+        <b>let</b> buy_in_amount = <a href="coin.md#0x1_coin_value">coin::value</a>(&buy_in);
+        <a href="coin.md#0x1_coin_merge">coin::merge</a>(&<b>mut</b> grant, buy_in);
+        <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_buy_in">pool_u64::buy_in</a>(
+            &<b>mut</b> grant_pool,
+            shareholder,
+            buy_in_amount,
+        );
+        grant_amount = grant_amount + buy_in_amount;
+    });
+    <b>assert</b>!(grant_amount &gt; 0, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="vesting.md#0x1_vesting_EZERO_GRANT">EZERO_GRANT</a>));
+
+    // If this is the first time this admin <a href="account.md#0x1_account">account</a> <b>has</b> created a <a href="vesting.md#0x1_vesting">vesting</a> contract, initialize the admin store.
+    <b>let</b> admin_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(admin);
+    <b>if</b> (!<b>exists</b>&lt;<a href="vesting.md#0x1_vesting_AdminStore">AdminStore</a>&gt;(admin_address)) {
+        <b>move_to</b>(admin, <a href="vesting.md#0x1_vesting_AdminStore">AdminStore</a> {
+            vesting_contracts: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_empty">vector::empty</a>&lt;<b>address</b>&gt;(),
+            nonce: 0,
+            create_events: new_event_handle&lt;<a href="vesting.md#0x1_vesting_CreateVestingContractEvent">CreateVestingContractEvent</a>&gt;(admin),
+        });
+    };
+
+    // Initialize the <a href="vesting.md#0x1_vesting">vesting</a> contract in a new resource <a href="account.md#0x1_account">account</a>. This allows the same admin <b>to</b> create multiple
+    // pools.
+    <b>let</b> (contract_signer, contract_signer_cap) = <a href="vesting.md#0x1_vesting_create_vesting_contract_account">create_vesting_contract_account</a>(admin, contract_creation_seed);
+    <b>let</b> pool_address = <a href="staking_contract.md#0x1_staking_contract_create_staking_contract_with_coins">staking_contract::create_staking_contract_with_coins</a>(
+        &contract_signer, operator, voter, grant, commission_percentage, contract_creation_seed);
+
+    // Add the newly created <a href="vesting.md#0x1_vesting">vesting</a> contract's <b>address</b> <b>to</b> the admin store.
+    <b>let</b> contract_address = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(&contract_signer);
+    <b>let</b> admin_store = <b>borrow_global_mut</b>&lt;<a href="vesting.md#0x1_vesting_AdminStore">AdminStore</a>&gt;(admin_address);
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_push_back">vector::push_back</a>(&<b>mut</b> admin_store.vesting_contracts, contract_address);
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        emit(
+            <a href="vesting.md#0x1_vesting_CreateVestingContract">CreateVestingContract</a> {
+                operator,
+                voter,
+                withdrawal_address,
+                grant_amount,
+                vesting_contract_address: contract_address,
+                staking_pool_address: pool_address,
+                commission_percentage,
+            },
+        );
+    };
+    emit_event(
+        &<b>mut</b> admin_store.create_events,
+        <a href="vesting.md#0x1_vesting_CreateVestingContractEvent">CreateVestingContractEvent</a> {
+            operator,
+            voter,
+            withdrawal_address,
+            grant_amount,
+            vesting_contract_address: contract_address,
+            staking_pool_address: pool_address,
+            commission_percentage,
+        },
+    );
+
+    <b>move_to</b>(&contract_signer, <a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a> {
+        state: <a href="vesting.md#0x1_vesting_VESTING_POOL_ACTIVE">VESTING_POOL_ACTIVE</a>,
+        admin: admin_address,
+        grant_pool,
+        beneficiaries: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_create">simple_map::create</a>&lt;<b>address</b>, <b>address</b>&gt;(),
+        vesting_schedule,
+        withdrawal_address,
+        staking: <a href="vesting.md#0x1_vesting_StakingInfo">StakingInfo</a> { pool_address, operator, voter, commission_percentage },
+        remaining_grant: grant_amount,
+        signer_cap: contract_signer_cap,
+        update_operator_events: new_event_handle&lt;<a href="vesting.md#0x1_vesting_UpdateOperatorEvent">UpdateOperatorEvent</a>&gt;(&contract_signer),
+        update_voter_events: new_event_handle&lt;<a href="vesting.md#0x1_vesting_UpdateVoterEvent">UpdateVoterEvent</a>&gt;(&contract_signer),
+        reset_lockup_events: new_event_handle&lt;<a href="vesting.md#0x1_vesting_ResetLockupEvent">ResetLockupEvent</a>&gt;(&contract_signer),
+        set_beneficiary_events: new_event_handle&lt;<a href="vesting.md#0x1_vesting_SetBeneficiaryEvent">SetBeneficiaryEvent</a>&gt;(&contract_signer),
+        unlock_rewards_events: new_event_handle&lt;<a href="vesting.md#0x1_vesting_UnlockRewardsEvent">UnlockRewardsEvent</a>&gt;(&contract_signer),
+        vest_events: new_event_handle&lt;<a href="vesting.md#0x1_vesting_VestEvent">VestEvent</a>&gt;(&contract_signer),
+        distribute_events: new_event_handle&lt;<a href="vesting.md#0x1_vesting_DistributeEvent">DistributeEvent</a>&gt;(&contract_signer),
+        terminate_events: new_event_handle&lt;<a href="vesting.md#0x1_vesting_TerminateEvent">TerminateEvent</a>&gt;(&contract_signer),
+        admin_withdraw_events: new_event_handle&lt;<a href="vesting.md#0x1_vesting_AdminWithdrawEvent">AdminWithdrawEvent</a>&gt;(&contract_signer),
+    });
+
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_destroy_empty">simple_map::destroy_empty</a>(buy_ins);
+    contract_address
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vesting_unlock_rewards"></a>
+
+## Function `unlock_rewards`
+
+Unlock any accumulated rewards.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="vesting.md#0x1_vesting_unlock_rewards">unlock_rewards</a>(contract_address: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="vesting.md#0x1_vesting_unlock_rewards">unlock_rewards</a>(contract_address: <b>address</b>) <b>acquires</b> <a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a> {
+    <b>let</b> accumulated_rewards = <a href="vesting.md#0x1_vesting_total_accumulated_rewards">total_accumulated_rewards</a>(contract_address);
+    <b>let</b> vesting_contract = <b>borrow_global</b>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;(contract_address);
+    <a href="vesting.md#0x1_vesting_unlock_stake">unlock_stake</a>(vesting_contract, accumulated_rewards);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vesting_unlock_rewards_many"></a>
+
+## Function `unlock_rewards_many`
+
+Call <code>unlock_rewards</code> for many vesting contracts.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="vesting.md#0x1_vesting_unlock_rewards_many">unlock_rewards_many</a>(contract_addresses: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="vesting.md#0x1_vesting_unlock_rewards_many">unlock_rewards_many</a>(contract_addresses: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;) <b>acquires</b> <a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a> {
+    <b>let</b> len = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&contract_addresses);
+
+    <b>assert</b>!(len != 0, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="vesting.md#0x1_vesting_EVEC_EMPTY_FOR_MANY_FUNCTION">EVEC_EMPTY_FOR_MANY_FUNCTION</a>));
+
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_for_each_ref">vector::for_each_ref</a>(&contract_addresses, |contract_address| {
+        <b>let</b> contract_address: <b>address</b> = *contract_address;
+        <a href="vesting.md#0x1_vesting_unlock_rewards">unlock_rewards</a>(contract_address);
+    });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vesting_vest"></a>
+
+## Function `vest`
+
+Unlock any vested portion of the grant.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="vesting.md#0x1_vesting_vest">vest</a>(contract_address: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="vesting.md#0x1_vesting_vest">vest</a>(contract_address: <b>address</b>) <b>acquires</b> <a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a> {
+    // Unlock all rewards first, <b>if</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/any.md#0x1_any">any</a>.
+    <a href="vesting.md#0x1_vesting_unlock_rewards">unlock_rewards</a>(contract_address);
+
+    // Unlock the vested amount. This amount will become withdrawable when the underlying <a href="stake.md#0x1_stake">stake</a> pool's lockup
+    // expires.
+    <b>let</b> vesting_contract = <b>borrow_global_mut</b>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;(contract_address);
+    // Short-circuit <b>if</b> <a href="vesting.md#0x1_vesting">vesting</a> hasn't started yet.
+    <b>if</b> (vesting_contract.vesting_schedule.start_timestamp_secs &gt; <a href="timestamp.md#0x1_timestamp_now_seconds">timestamp::now_seconds</a>()) {
+        <b>return</b>
+    };
+
+    // Check <b>if</b> the next vested period <b>has</b> already passed. If not, short-circuit since there's nothing <b>to</b> vest.
+    <b>let</b> vesting_schedule = &<b>mut</b> vesting_contract.vesting_schedule;
+    <b>let</b> last_vested_period = vesting_schedule.last_vested_period;
+    <b>let</b> next_period_to_vest = last_vested_period + 1;
+    <b>let</b> last_completed_period =
+        (<a href="timestamp.md#0x1_timestamp_now_seconds">timestamp::now_seconds</a>() - vesting_schedule.start_timestamp_secs) / vesting_schedule.period_duration;
+    <b>if</b> (last_completed_period &lt; next_period_to_vest) {
+        <b>return</b>
+    };
+
+    // Calculate how much <b>has</b> vested, excluding rewards.
+    // Index is 0-based <b>while</b> period is 1-based so we need <b>to</b> subtract 1.
+    <b>let</b> schedule = &vesting_schedule.schedule;
+    <b>let</b> schedule_index = next_period_to_vest - 1;
+    <b>let</b> vesting_fraction = <b>if</b> (schedule_index &lt; <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(schedule)) {
+        *<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(schedule, schedule_index)
+    } <b>else</b> {
+        // Last <a href="vesting.md#0x1_vesting">vesting</a> schedule fraction will repeat until the grant runs out.
+        *<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(schedule, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(schedule) - 1)
+    };
+    <b>let</b> total_grant = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_total_coins">pool_u64::total_coins</a>(&vesting_contract.grant_pool);
+    <b>let</b> vested_amount = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/fixed_point32.md#0x1_fixed_point32_multiply_u64">fixed_point32::multiply_u64</a>(total_grant, vesting_fraction);
+    // Cap vested amount by the remaining grant amount so we don't try <b>to</b> distribute more than what's remaining.
+    vested_amount = <b>min</b>(vested_amount, vesting_contract.remaining_grant);
+    vesting_contract.remaining_grant = vesting_contract.remaining_grant - vested_amount;
+    vesting_schedule.last_vested_period = next_period_to_vest;
+    <a href="vesting.md#0x1_vesting_unlock_stake">unlock_stake</a>(vesting_contract, vested_amount);
+
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        emit(
+            <a href="vesting.md#0x1_vesting_Vest">Vest</a> {
+                admin: vesting_contract.admin,
+                vesting_contract_address: contract_address,
+                staking_pool_address: vesting_contract.staking.pool_address,
+                period_vested: next_period_to_vest,
+                amount: vested_amount,
+            },
+        );
+    };
+    emit_event(
+        &<b>mut</b> vesting_contract.vest_events,
+        <a href="vesting.md#0x1_vesting_VestEvent">VestEvent</a> {
+            admin: vesting_contract.admin,
+            vesting_contract_address: contract_address,
+            staking_pool_address: vesting_contract.staking.pool_address,
+            period_vested: next_period_to_vest,
+            amount: vested_amount,
+        },
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vesting_vest_many"></a>
+
+## Function `vest_many`
+
+Call <code>vest</code> for many vesting contracts.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="vesting.md#0x1_vesting_vest_many">vest_many</a>(contract_addresses: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="vesting.md#0x1_vesting_vest_many">vest_many</a>(contract_addresses: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;) <b>acquires</b> <a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a> {
+    <b>let</b> len = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&contract_addresses);
+
+    <b>assert</b>!(len != 0, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="vesting.md#0x1_vesting_EVEC_EMPTY_FOR_MANY_FUNCTION">EVEC_EMPTY_FOR_MANY_FUNCTION</a>));
+
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_for_each_ref">vector::for_each_ref</a>(&contract_addresses, |contract_address| {
+        <b>let</b> contract_address = *contract_address;
+        <a href="vesting.md#0x1_vesting_vest">vest</a>(contract_address);
+    });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vesting_distribute"></a>
+
+## Function `distribute`
+
+Distribute any withdrawable stake from the stake pool.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="vesting.md#0x1_vesting_distribute">distribute</a>(contract_address: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="vesting.md#0x1_vesting_distribute">distribute</a>(contract_address: <b>address</b>) <b>acquires</b> <a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a> {
+    <a href="vesting.md#0x1_vesting_assert_active_vesting_contract">assert_active_vesting_contract</a>(contract_address);
+
+    <b>let</b> vesting_contract = <b>borrow_global_mut</b>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;(contract_address);
+    <b>let</b> coins = <a href="vesting.md#0x1_vesting_withdraw_stake">withdraw_stake</a>(vesting_contract, contract_address);
+    <b>let</b> total_distribution_amount = <a href="coin.md#0x1_coin_value">coin::value</a>(&coins);
+    <b>if</b> (total_distribution_amount == 0) {
+        <a href="coin.md#0x1_coin_destroy_zero">coin::destroy_zero</a>(coins);
+        <b>return</b>
+    };
+
+    // <a href="vesting.md#0x1_vesting_Distribute">Distribute</a> coins <b>to</b> all shareholders in the <a href="vesting.md#0x1_vesting">vesting</a> contract.
+    <b>let</b> grant_pool = &vesting_contract.grant_pool;
+    <b>let</b> shareholders = &<a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_shareholders">pool_u64::shareholders</a>(grant_pool);
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_for_each_ref">vector::for_each_ref</a>(shareholders, |shareholder| {
+        <b>let</b> shareholder = *shareholder;
+        <b>let</b> shares = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_shares">pool_u64::shares</a>(grant_pool, shareholder);
+        <b>let</b> amount = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_shares_to_amount_with_total_coins">pool_u64::shares_to_amount_with_total_coins</a>(grant_pool, shares, total_distribution_amount);
+        <b>let</b> share_of_coins = <a href="coin.md#0x1_coin_extract">coin::extract</a>(&<b>mut</b> coins, amount);
+        <b>let</b> recipient_address = <a href="vesting.md#0x1_vesting_get_beneficiary">get_beneficiary</a>(vesting_contract, shareholder);
+        <a href="aptos_account.md#0x1_aptos_account_deposit_coins">aptos_account::deposit_coins</a>(recipient_address, share_of_coins);
+    });
+
+    // Send <a href="../../../aptos-stdlib/tests/compiler-v2-doc/any.md#0x1_any">any</a> remaining "dust" (leftover due <b>to</b> rounding <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">error</a>) <b>to</b> the withdrawal <b>address</b>.
+    <b>if</b> (<a href="coin.md#0x1_coin_value">coin::value</a>(&coins) &gt; 0) {
+        <a href="aptos_account.md#0x1_aptos_account_deposit_coins">aptos_account::deposit_coins</a>(vesting_contract.withdrawal_address, coins);
+    } <b>else</b> {
+        <a href="coin.md#0x1_coin_destroy_zero">coin::destroy_zero</a>(coins);
+    };
+
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        emit(
+            <a href="vesting.md#0x1_vesting_Distribute">Distribute</a> {
+                admin: vesting_contract.admin,
+                vesting_contract_address: contract_address,
+                amount: total_distribution_amount,
+            },
+        );
+    };
+    emit_event(
+        &<b>mut</b> vesting_contract.distribute_events,
+        <a href="vesting.md#0x1_vesting_DistributeEvent">DistributeEvent</a> {
+            admin: vesting_contract.admin,
+            vesting_contract_address: contract_address,
+            amount: total_distribution_amount,
+        },
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vesting_distribute_many"></a>
+
+## Function `distribute_many`
+
+Call <code>distribute</code> for many vesting contracts.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="vesting.md#0x1_vesting_distribute_many">distribute_many</a>(contract_addresses: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="vesting.md#0x1_vesting_distribute_many">distribute_many</a>(contract_addresses: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;) <b>acquires</b> <a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a> {
+    <b>let</b> len = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&contract_addresses);
+
+    <b>assert</b>!(len != 0, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="vesting.md#0x1_vesting_EVEC_EMPTY_FOR_MANY_FUNCTION">EVEC_EMPTY_FOR_MANY_FUNCTION</a>));
+
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_for_each_ref">vector::for_each_ref</a>(&contract_addresses, |contract_address| {
+        <b>let</b> contract_address = *contract_address;
+        <a href="vesting.md#0x1_vesting_distribute">distribute</a>(contract_address);
+    });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vesting_terminate_vesting_contract"></a>
+
+## Function `terminate_vesting_contract`
+
+Terminate the vesting contract and send all funds back to the withdrawal address.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="vesting.md#0x1_vesting_terminate_vesting_contract">terminate_vesting_contract</a>(admin: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, contract_address: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="vesting.md#0x1_vesting_terminate_vesting_contract">terminate_vesting_contract</a>(admin: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, contract_address: <b>address</b>) <b>acquires</b> <a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a> {
+    <a href="vesting.md#0x1_vesting_assert_active_vesting_contract">assert_active_vesting_contract</a>(contract_address);
+
+    // <a href="vesting.md#0x1_vesting_Distribute">Distribute</a> all withdrawable coins, which should have been from previous rewards withdrawal or vest.
+    <a href="vesting.md#0x1_vesting_distribute">distribute</a>(contract_address);
+
+    <b>let</b> vesting_contract = <b>borrow_global_mut</b>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;(contract_address);
+    <a href="vesting.md#0x1_vesting_verify_admin">verify_admin</a>(admin, vesting_contract);
+    <b>let</b> (active_stake, _, pending_active_stake, _) = <a href="stake.md#0x1_stake_get_stake">stake::get_stake</a>(vesting_contract.staking.pool_address);
+    <b>assert</b>!(pending_active_stake == 0, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="vesting.md#0x1_vesting_EPENDING_STAKE_FOUND">EPENDING_STAKE_FOUND</a>));
+
+    // Unlock all remaining active <a href="stake.md#0x1_stake">stake</a>.
+    vesting_contract.state = <a href="vesting.md#0x1_vesting_VESTING_POOL_TERMINATED">VESTING_POOL_TERMINATED</a>;
+    vesting_contract.remaining_grant = 0;
+    <a href="vesting.md#0x1_vesting_unlock_stake">unlock_stake</a>(vesting_contract, active_stake);
+
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        emit(
+            <a href="vesting.md#0x1_vesting_Terminate">Terminate</a> {
+                admin: vesting_contract.admin,
+                vesting_contract_address: contract_address,
+            },
+        );
+    };
+    emit_event(
+        &<b>mut</b> vesting_contract.terminate_events,
+        <a href="vesting.md#0x1_vesting_TerminateEvent">TerminateEvent</a> {
+            admin: vesting_contract.admin,
+            vesting_contract_address: contract_address,
+        },
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vesting_admin_withdraw"></a>
+
+## Function `admin_withdraw`
+
+Withdraw all funds to the preset vesting contract's withdrawal address. This can only be called if the contract
+has already been terminated.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="vesting.md#0x1_vesting_admin_withdraw">admin_withdraw</a>(admin: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, contract_address: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="vesting.md#0x1_vesting_admin_withdraw">admin_withdraw</a>(admin: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, contract_address: <b>address</b>) <b>acquires</b> <a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a> {
+    <b>let</b> vesting_contract = <b>borrow_global</b>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;(contract_address);
+    <b>assert</b>!(
+        vesting_contract.state == <a href="vesting.md#0x1_vesting_VESTING_POOL_TERMINATED">VESTING_POOL_TERMINATED</a>,
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="vesting.md#0x1_vesting_EVESTING_CONTRACT_STILL_ACTIVE">EVESTING_CONTRACT_STILL_ACTIVE</a>)
+    );
+
+    <b>let</b> vesting_contract = <b>borrow_global_mut</b>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;(contract_address);
+    <a href="vesting.md#0x1_vesting_verify_admin">verify_admin</a>(admin, vesting_contract);
+    <b>let</b> coins = <a href="vesting.md#0x1_vesting_withdraw_stake">withdraw_stake</a>(vesting_contract, contract_address);
+    <b>let</b> amount = <a href="coin.md#0x1_coin_value">coin::value</a>(&coins);
+    <b>if</b> (amount == 0) {
+        <a href="coin.md#0x1_coin_destroy_zero">coin::destroy_zero</a>(coins);
+        <b>return</b>
+    };
+    <a href="aptos_account.md#0x1_aptos_account_deposit_coins">aptos_account::deposit_coins</a>(vesting_contract.withdrawal_address, coins);
+
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        emit(
+            <a href="vesting.md#0x1_vesting_AdminWithdraw">AdminWithdraw</a> {
+                admin: vesting_contract.admin,
+                vesting_contract_address: contract_address,
+                amount,
+            },
+        );
+    };
+    emit_event(
+        &<b>mut</b> vesting_contract.admin_withdraw_events,
+        <a href="vesting.md#0x1_vesting_AdminWithdrawEvent">AdminWithdrawEvent</a> {
+            admin: vesting_contract.admin,
+            vesting_contract_address: contract_address,
+            amount,
+        },
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vesting_update_operator"></a>
+
+## Function `update_operator`
+
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="vesting.md#0x1_vesting_update_operator">update_operator</a>(admin: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, contract_address: <b>address</b>, new_operator: <b>address</b>, commission_percentage: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="vesting.md#0x1_vesting_update_operator">update_operator</a>(
+    admin: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    contract_address: <b>address</b>,
+    new_operator: <b>address</b>,
+    commission_percentage: u64,
+) <b>acquires</b> <a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a> {
+    <b>let</b> vesting_contract = <b>borrow_global_mut</b>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;(contract_address);
+    <a href="vesting.md#0x1_vesting_verify_admin">verify_admin</a>(admin, vesting_contract);
+    <b>let</b> contract_signer = &<a href="vesting.md#0x1_vesting_get_vesting_account_signer_internal">get_vesting_account_signer_internal</a>(vesting_contract);
+    <b>let</b> old_operator = vesting_contract.staking.operator;
+    <a href="staking_contract.md#0x1_staking_contract_switch_operator">staking_contract::switch_operator</a>(contract_signer, old_operator, new_operator, commission_percentage);
+    vesting_contract.staking.operator = new_operator;
+    vesting_contract.staking.commission_percentage = commission_percentage;
+
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        emit(
+            <a href="vesting.md#0x1_vesting_UpdateOperator">UpdateOperator</a> {
+                admin: vesting_contract.admin,
+                vesting_contract_address: contract_address,
+                staking_pool_address: vesting_contract.staking.pool_address,
+                old_operator,
+                new_operator,
+                commission_percentage,
+            },
+        );
+    };
+    emit_event(
+        &<b>mut</b> vesting_contract.update_operator_events,
+        <a href="vesting.md#0x1_vesting_UpdateOperatorEvent">UpdateOperatorEvent</a> {
+            admin: vesting_contract.admin,
+            vesting_contract_address: contract_address,
+            staking_pool_address: vesting_contract.staking.pool_address,
+            old_operator,
+            new_operator,
+            commission_percentage,
+        },
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vesting_update_operator_with_same_commission"></a>
+
+## Function `update_operator_with_same_commission`
+
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="vesting.md#0x1_vesting_update_operator_with_same_commission">update_operator_with_same_commission</a>(admin: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, contract_address: <b>address</b>, new_operator: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="vesting.md#0x1_vesting_update_operator_with_same_commission">update_operator_with_same_commission</a>(
+    admin: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    contract_address: <b>address</b>,
+    new_operator: <b>address</b>,
+) <b>acquires</b> <a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a> {
+    <b>let</b> commission_percentage = <a href="vesting.md#0x1_vesting_operator_commission_percentage">operator_commission_percentage</a>(contract_address);
+    <a href="vesting.md#0x1_vesting_update_operator">update_operator</a>(admin, contract_address, new_operator, commission_percentage);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vesting_update_commission_percentage"></a>
+
+## Function `update_commission_percentage`
+
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="vesting.md#0x1_vesting_update_commission_percentage">update_commission_percentage</a>(admin: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, contract_address: <b>address</b>, new_commission_percentage: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="vesting.md#0x1_vesting_update_commission_percentage">update_commission_percentage</a>(
+    admin: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    contract_address: <b>address</b>,
+    new_commission_percentage: u64,
+) <b>acquires</b> <a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a> {
+    <b>let</b> operator = <a href="vesting.md#0x1_vesting_operator">operator</a>(contract_address);
+    <b>let</b> vesting_contract = <b>borrow_global_mut</b>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;(contract_address);
+    <a href="vesting.md#0x1_vesting_verify_admin">verify_admin</a>(admin, vesting_contract);
+    <b>let</b> contract_signer = &<a href="vesting.md#0x1_vesting_get_vesting_account_signer_internal">get_vesting_account_signer_internal</a>(vesting_contract);
+    <a href="staking_contract.md#0x1_staking_contract_update_commision">staking_contract::update_commision</a>(contract_signer, operator, new_commission_percentage);
+    vesting_contract.staking.commission_percentage = new_commission_percentage;
+    // This function does not emit an <a href="event.md#0x1_event">event</a>. Instead, `staking_contract::update_commission_percentage`
+    // <b>emits</b> the <a href="event.md#0x1_event">event</a> for this commission percentage <b>update</b>.
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vesting_update_voter"></a>
+
+## Function `update_voter`
+
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="vesting.md#0x1_vesting_update_voter">update_voter</a>(admin: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, contract_address: <b>address</b>, new_voter: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="vesting.md#0x1_vesting_update_voter">update_voter</a>(
+    admin: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    contract_address: <b>address</b>,
+    new_voter: <b>address</b>,
+) <b>acquires</b> <a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a> {
+    <b>let</b> vesting_contract = <b>borrow_global_mut</b>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;(contract_address);
+    <a href="vesting.md#0x1_vesting_verify_admin">verify_admin</a>(admin, vesting_contract);
+    <b>let</b> contract_signer = &<a href="vesting.md#0x1_vesting_get_vesting_account_signer_internal">get_vesting_account_signer_internal</a>(vesting_contract);
+    <b>let</b> old_voter = vesting_contract.staking.voter;
+    <a href="staking_contract.md#0x1_staking_contract_update_voter">staking_contract::update_voter</a>(contract_signer, vesting_contract.staking.operator, new_voter);
+    vesting_contract.staking.voter = new_voter;
+
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        emit(
+            <a href="vesting.md#0x1_vesting_UpdateVoter">UpdateVoter</a> {
+                admin: vesting_contract.admin,
+                vesting_contract_address: contract_address,
+                staking_pool_address: vesting_contract.staking.pool_address,
+                old_voter,
+                new_voter,
+            },
+        );
+    };
+    emit_event(
+        &<b>mut</b> vesting_contract.update_voter_events,
+        <a href="vesting.md#0x1_vesting_UpdateVoterEvent">UpdateVoterEvent</a> {
+            admin: vesting_contract.admin,
+            vesting_contract_address: contract_address,
+            staking_pool_address: vesting_contract.staking.pool_address,
+            old_voter,
+            new_voter,
+        },
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vesting_reset_lockup"></a>
+
+## Function `reset_lockup`
+
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="vesting.md#0x1_vesting_reset_lockup">reset_lockup</a>(admin: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, contract_address: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="vesting.md#0x1_vesting_reset_lockup">reset_lockup</a>(
+    admin: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    contract_address: <b>address</b>,
+) <b>acquires</b> <a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a> {
+    <b>let</b> vesting_contract = <b>borrow_global_mut</b>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;(contract_address);
+    <a href="vesting.md#0x1_vesting_verify_admin">verify_admin</a>(admin, vesting_contract);
+    <b>let</b> contract_signer = &<a href="vesting.md#0x1_vesting_get_vesting_account_signer_internal">get_vesting_account_signer_internal</a>(vesting_contract);
+    <a href="staking_contract.md#0x1_staking_contract_reset_lockup">staking_contract::reset_lockup</a>(contract_signer, vesting_contract.staking.operator);
+
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        emit(
+            <a href="vesting.md#0x1_vesting_ResetLockup">ResetLockup</a> {
+                admin: vesting_contract.admin,
+                vesting_contract_address: contract_address,
+                staking_pool_address: vesting_contract.staking.pool_address,
+                new_lockup_expiration_secs: <a href="stake.md#0x1_stake_get_lockup_secs">stake::get_lockup_secs</a>(vesting_contract.staking.pool_address),
+            },
+        );
+    };
+    emit_event(
+        &<b>mut</b> vesting_contract.reset_lockup_events,
+        <a href="vesting.md#0x1_vesting_ResetLockupEvent">ResetLockupEvent</a> {
+            admin: vesting_contract.admin,
+            vesting_contract_address: contract_address,
+            staking_pool_address: vesting_contract.staking.pool_address,
+            new_lockup_expiration_secs: <a href="stake.md#0x1_stake_get_lockup_secs">stake::get_lockup_secs</a>(vesting_contract.staking.pool_address),
+        },
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vesting_set_beneficiary"></a>
+
+## Function `set_beneficiary`
+
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="vesting.md#0x1_vesting_set_beneficiary">set_beneficiary</a>(admin: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, contract_address: <b>address</b>, shareholder: <b>address</b>, new_beneficiary: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="vesting.md#0x1_vesting_set_beneficiary">set_beneficiary</a>(
+    admin: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    contract_address: <b>address</b>,
+    shareholder: <b>address</b>,
+    new_beneficiary: <b>address</b>,
+) <b>acquires</b> <a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a> {
+    // Verify that the beneficiary <a href="account.md#0x1_account">account</a> is set up <b>to</b> receive APT. This is a requirement so <a href="vesting.md#0x1_vesting_distribute">distribute</a>() wouldn't
+    // fail and <a href="block.md#0x1_block">block</a> all other accounts from receiving APT <b>if</b> one beneficiary is not registered.
+    assert_account_is_registered_for_apt(new_beneficiary);
+
+    <b>let</b> vesting_contract = <b>borrow_global_mut</b>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;(contract_address);
+    <a href="vesting.md#0x1_vesting_verify_admin">verify_admin</a>(admin, vesting_contract);
+
+    <b>let</b> old_beneficiary = <a href="vesting.md#0x1_vesting_get_beneficiary">get_beneficiary</a>(vesting_contract, shareholder);
+    <b>let</b> beneficiaries = &<b>mut</b> vesting_contract.beneficiaries;
+    <b>if</b> (<a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_contains_key">simple_map::contains_key</a>(beneficiaries, &shareholder)) {
+        <b>let</b> beneficiary = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_borrow_mut">simple_map::borrow_mut</a>(beneficiaries, &shareholder);
+        *beneficiary = new_beneficiary;
+    } <b>else</b> {
+        <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_add">simple_map::add</a>(beneficiaries, shareholder, new_beneficiary);
+    };
+
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        emit(
+            <a href="vesting.md#0x1_vesting_SetBeneficiary">SetBeneficiary</a> {
+                admin: vesting_contract.admin,
+                vesting_contract_address: contract_address,
+                shareholder,
+                old_beneficiary,
+                new_beneficiary,
+            },
+        );
+    };
+    emit_event(
+        &<b>mut</b> vesting_contract.set_beneficiary_events,
+        <a href="vesting.md#0x1_vesting_SetBeneficiaryEvent">SetBeneficiaryEvent</a> {
+            admin: vesting_contract.admin,
+            vesting_contract_address: contract_address,
+            shareholder,
+            old_beneficiary,
+            new_beneficiary,
+        },
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vesting_reset_beneficiary"></a>
+
+## Function `reset_beneficiary`
+
+Remove the beneficiary for the given shareholder. All distributions will sent directly to the shareholder
+account.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="vesting.md#0x1_vesting_reset_beneficiary">reset_beneficiary</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, contract_address: <b>address</b>, shareholder: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="vesting.md#0x1_vesting_reset_beneficiary">reset_beneficiary</a>(
+    <a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    contract_address: <b>address</b>,
+    shareholder: <b>address</b>,
+) <b>acquires</b> <a href="vesting.md#0x1_vesting_VestingAccountManagement">VestingAccountManagement</a>, <a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a> {
+    <b>let</b> vesting_contract = <b>borrow_global_mut</b>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;(contract_address);
+    <b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>);
+    <b>assert</b>!(
+        addr == vesting_contract.admin ||
+            addr == <a href="vesting.md#0x1_vesting_get_role_holder">get_role_holder</a>(contract_address, utf8(<a href="vesting.md#0x1_vesting_ROLE_BENEFICIARY_RESETTER">ROLE_BENEFICIARY_RESETTER</a>)),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="vesting.md#0x1_vesting_EPERMISSION_DENIED">EPERMISSION_DENIED</a>),
+    );
+
+    <b>let</b> beneficiaries = &<b>mut</b> vesting_contract.beneficiaries;
+    <b>if</b> (<a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_contains_key">simple_map::contains_key</a>(beneficiaries, &shareholder)) {
+        <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_remove">simple_map::remove</a>(beneficiaries, &shareholder);
+    };
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vesting_set_management_role"></a>
+
+## Function `set_management_role`
+
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="vesting.md#0x1_vesting_set_management_role">set_management_role</a>(admin: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, contract_address: <b>address</b>, role: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, role_holder: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="vesting.md#0x1_vesting_set_management_role">set_management_role</a>(
+    admin: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    contract_address: <b>address</b>,
+    role: String,
+    role_holder: <b>address</b>,
+) <b>acquires</b> <a href="vesting.md#0x1_vesting_VestingAccountManagement">VestingAccountManagement</a>, <a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a> {
+    <b>let</b> vesting_contract = <b>borrow_global_mut</b>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;(contract_address);
+    <a href="vesting.md#0x1_vesting_verify_admin">verify_admin</a>(admin, vesting_contract);
+
+    <b>if</b> (!<b>exists</b>&lt;<a href="vesting.md#0x1_vesting_VestingAccountManagement">VestingAccountManagement</a>&gt;(contract_address)) {
+        <b>let</b> contract_signer = &<a href="vesting.md#0x1_vesting_get_vesting_account_signer_internal">get_vesting_account_signer_internal</a>(vesting_contract);
+        <b>move_to</b>(contract_signer, <a href="vesting.md#0x1_vesting_VestingAccountManagement">VestingAccountManagement</a> {
+            roles: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_create">simple_map::create</a>&lt;String, <b>address</b>&gt;(),
+        })
+    };
+    <b>let</b> roles = &<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="vesting.md#0x1_vesting_VestingAccountManagement">VestingAccountManagement</a>&gt;(contract_address).roles;
+    <b>if</b> (<a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_contains_key">simple_map::contains_key</a>(roles, &role)) {
+        *<a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_borrow_mut">simple_map::borrow_mut</a>(roles, &role) = role_holder;
+    } <b>else</b> {
+        <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_add">simple_map::add</a>(roles, role, role_holder);
+    };
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vesting_set_beneficiary_resetter"></a>
+
+## Function `set_beneficiary_resetter`
+
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="vesting.md#0x1_vesting_set_beneficiary_resetter">set_beneficiary_resetter</a>(admin: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, contract_address: <b>address</b>, beneficiary_resetter: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="vesting.md#0x1_vesting_set_beneficiary_resetter">set_beneficiary_resetter</a>(
+    admin: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    contract_address: <b>address</b>,
+    beneficiary_resetter: <b>address</b>,
+) <b>acquires</b> <a href="vesting.md#0x1_vesting_VestingAccountManagement">VestingAccountManagement</a>, <a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a> {
+    <a href="vesting.md#0x1_vesting_set_management_role">set_management_role</a>(admin, contract_address, utf8(<a href="vesting.md#0x1_vesting_ROLE_BENEFICIARY_RESETTER">ROLE_BENEFICIARY_RESETTER</a>), beneficiary_resetter);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vesting_set_beneficiary_for_operator"></a>
+
+## Function `set_beneficiary_for_operator`
+
+Set the beneficiary for the operator.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="vesting.md#0x1_vesting_set_beneficiary_for_operator">set_beneficiary_for_operator</a>(operator: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, new_beneficiary: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="vesting.md#0x1_vesting_set_beneficiary_for_operator">set_beneficiary_for_operator</a>(
+    operator: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    new_beneficiary: <b>address</b>,
+) {
+    <a href="staking_contract.md#0x1_staking_contract_set_beneficiary_for_operator">staking_contract::set_beneficiary_for_operator</a>(operator, new_beneficiary);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vesting_get_role_holder"></a>
+
+## Function `get_role_holder`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vesting.md#0x1_vesting_get_role_holder">get_role_holder</a>(contract_address: <b>address</b>, role: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vesting.md#0x1_vesting_get_role_holder">get_role_holder</a>(contract_address: <b>address</b>, role: String): <b>address</b> <b>acquires</b> <a href="vesting.md#0x1_vesting_VestingAccountManagement">VestingAccountManagement</a> {
+    <b>assert</b>!(<b>exists</b>&lt;<a href="vesting.md#0x1_vesting_VestingAccountManagement">VestingAccountManagement</a>&gt;(contract_address), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="vesting.md#0x1_vesting_EVESTING_ACCOUNT_HAS_NO_ROLES">EVESTING_ACCOUNT_HAS_NO_ROLES</a>));
+    <b>let</b> roles = &<b>borrow_global</b>&lt;<a href="vesting.md#0x1_vesting_VestingAccountManagement">VestingAccountManagement</a>&gt;(contract_address).roles;
+    <b>assert</b>!(<a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_contains_key">simple_map::contains_key</a>(roles, &role), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="vesting.md#0x1_vesting_EROLE_NOT_FOUND">EROLE_NOT_FOUND</a>));
+    *<a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_borrow">simple_map::borrow</a>(roles, &role)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vesting_get_vesting_account_signer"></a>
+
+## Function `get_vesting_account_signer`
+
+For emergency use in case the admin needs emergency control of vesting contract account.
+This doesn't give the admin total power as the admin would still need to follow the rules set by
+staking_contract and stake modules.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vesting.md#0x1_vesting_get_vesting_account_signer">get_vesting_account_signer</a>(admin: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, contract_address: <b>address</b>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vesting.md#0x1_vesting_get_vesting_account_signer">get_vesting_account_signer</a>(admin: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, contract_address: <b>address</b>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a> <b>acquires</b> <a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a> {
+    <b>let</b> vesting_contract = <b>borrow_global_mut</b>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;(contract_address);
+    <a href="vesting.md#0x1_vesting_verify_admin">verify_admin</a>(admin, vesting_contract);
+    <a href="vesting.md#0x1_vesting_get_vesting_account_signer_internal">get_vesting_account_signer_internal</a>(vesting_contract)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vesting_get_vesting_account_signer_internal"></a>
+
+## Function `get_vesting_account_signer_internal`
+
+
+
+<pre><code><b>fun</b> <a href="vesting.md#0x1_vesting_get_vesting_account_signer_internal">get_vesting_account_signer_internal</a>(vesting_contract: &<a href="vesting.md#0x1_vesting_VestingContract">vesting::VestingContract</a>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="vesting.md#0x1_vesting_get_vesting_account_signer_internal">get_vesting_account_signer_internal</a>(vesting_contract: &<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a> {
+    <a href="account.md#0x1_account_create_signer_with_capability">account::create_signer_with_capability</a>(&vesting_contract.signer_cap)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vesting_create_vesting_contract_account"></a>
+
+## Function `create_vesting_contract_account`
+
+Create a salt for generating the resource accounts that will be holding the VestingContract.
+This address should be deterministic for the same admin and vesting contract creation nonce.
+
+
+<pre><code><b>fun</b> <a href="vesting.md#0x1_vesting_create_vesting_contract_account">create_vesting_contract_account</a>(admin: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, contract_creation_seed: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="account.md#0x1_account_SignerCapability">account::SignerCapability</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="vesting.md#0x1_vesting_create_vesting_contract_account">create_vesting_contract_account</a>(
+    admin: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    contract_creation_seed: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+): (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, SignerCapability) <b>acquires</b> <a href="vesting.md#0x1_vesting_AdminStore">AdminStore</a> {
+    <b>let</b> admin_store = <b>borrow_global_mut</b>&lt;<a href="vesting.md#0x1_vesting_AdminStore">AdminStore</a>&gt;(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(admin));
+    <b>let</b> seed = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs_to_bytes">bcs::to_bytes</a>(&<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(admin));
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_append">vector::append</a>(&<b>mut</b> seed, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs_to_bytes">bcs::to_bytes</a>(&admin_store.nonce));
+    admin_store.nonce = admin_store.nonce + 1;
+
+    // Include a salt <b>to</b> avoid conflicts <b>with</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/any.md#0x1_any">any</a> other modules out there that might also generate
+    // deterministic resource accounts for the same admin <b>address</b> + nonce.
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_append">vector::append</a>(&<b>mut</b> seed, <a href="vesting.md#0x1_vesting_VESTING_POOL_SALT">VESTING_POOL_SALT</a>);
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_append">vector::append</a>(&<b>mut</b> seed, contract_creation_seed);
+
+    <b>let</b> (account_signer, signer_cap) = <a href="account.md#0x1_account_create_resource_account">account::create_resource_account</a>(admin, seed);
+    // Register the <a href="vesting.md#0x1_vesting">vesting</a> contract <a href="account.md#0x1_account">account</a> <b>to</b> receive APT <b>as</b> it'll be sent <b>to</b> it when claiming unlocked <a href="stake.md#0x1_stake">stake</a> from
+    // the underlying staking contract.
+    <a href="coin.md#0x1_coin_register">coin::register</a>&lt;AptosCoin&gt;(&account_signer);
+
+    (account_signer, signer_cap)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vesting_verify_admin"></a>
+
+## Function `verify_admin`
+
+
+
+<pre><code><b>fun</b> <a href="vesting.md#0x1_vesting_verify_admin">verify_admin</a>(admin: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, vesting_contract: &<a href="vesting.md#0x1_vesting_VestingContract">vesting::VestingContract</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="vesting.md#0x1_vesting_verify_admin">verify_admin</a>(admin: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, vesting_contract: &<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>) {
+    <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(admin) == vesting_contract.admin, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_unauthenticated">error::unauthenticated</a>(<a href="vesting.md#0x1_vesting_ENOT_ADMIN">ENOT_ADMIN</a>));
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vesting_assert_vesting_contract_exists"></a>
+
+## Function `assert_vesting_contract_exists`
+
+
+
+<pre><code><b>fun</b> <a href="vesting.md#0x1_vesting_assert_vesting_contract_exists">assert_vesting_contract_exists</a>(contract_address: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="vesting.md#0x1_vesting_assert_vesting_contract_exists">assert_vesting_contract_exists</a>(contract_address: <b>address</b>) {
+    <b>assert</b>!(<b>exists</b>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;(contract_address), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="vesting.md#0x1_vesting_EVESTING_CONTRACT_NOT_FOUND">EVESTING_CONTRACT_NOT_FOUND</a>));
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vesting_assert_active_vesting_contract"></a>
+
+## Function `assert_active_vesting_contract`
+
+
+
+<pre><code><b>fun</b> <a href="vesting.md#0x1_vesting_assert_active_vesting_contract">assert_active_vesting_contract</a>(contract_address: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="vesting.md#0x1_vesting_assert_active_vesting_contract">assert_active_vesting_contract</a>(contract_address: <b>address</b>) <b>acquires</b> <a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a> {
+    <a href="vesting.md#0x1_vesting_assert_vesting_contract_exists">assert_vesting_contract_exists</a>(contract_address);
+    <b>let</b> vesting_contract = <b>borrow_global</b>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;(contract_address);
+    <b>assert</b>!(vesting_contract.state == <a href="vesting.md#0x1_vesting_VESTING_POOL_ACTIVE">VESTING_POOL_ACTIVE</a>, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="vesting.md#0x1_vesting_EVESTING_CONTRACT_NOT_ACTIVE">EVESTING_CONTRACT_NOT_ACTIVE</a>));
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vesting_unlock_stake"></a>
+
+## Function `unlock_stake`
+
+
+
+<pre><code><b>fun</b> <a href="vesting.md#0x1_vesting_unlock_stake">unlock_stake</a>(vesting_contract: &<a href="vesting.md#0x1_vesting_VestingContract">vesting::VestingContract</a>, amount: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="vesting.md#0x1_vesting_unlock_stake">unlock_stake</a>(vesting_contract: &<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>, amount: u64) {
+    <b>let</b> contract_signer = &<a href="vesting.md#0x1_vesting_get_vesting_account_signer_internal">get_vesting_account_signer_internal</a>(vesting_contract);
+    <a href="staking_contract.md#0x1_staking_contract_unlock_stake">staking_contract::unlock_stake</a>(contract_signer, vesting_contract.staking.operator, amount);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vesting_withdraw_stake"></a>
+
+## Function `withdraw_stake`
+
+
+
+<pre><code><b>fun</b> <a href="vesting.md#0x1_vesting_withdraw_stake">withdraw_stake</a>(vesting_contract: &<a href="vesting.md#0x1_vesting_VestingContract">vesting::VestingContract</a>, contract_address: <b>address</b>): <a href="coin.md#0x1_coin_Coin">coin::Coin</a>&lt;<a href="aptos_coin.md#0x1_aptos_coin_AptosCoin">aptos_coin::AptosCoin</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="vesting.md#0x1_vesting_withdraw_stake">withdraw_stake</a>(vesting_contract: &<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>, contract_address: <b>address</b>): Coin&lt;AptosCoin&gt; {
+    // Claim <a href="../../../aptos-stdlib/tests/compiler-v2-doc/any.md#0x1_any">any</a> withdrawable distribution from the staking contract. The withdrawn coins will be sent directly <b>to</b>
+    // the <a href="vesting.md#0x1_vesting">vesting</a> contract's <a href="account.md#0x1_account">account</a>.
+    <a href="staking_contract.md#0x1_staking_contract_distribute">staking_contract::distribute</a>(contract_address, vesting_contract.staking.operator);
+    <b>let</b> withdrawn_coins = <a href="coin.md#0x1_coin_balance">coin::balance</a>&lt;AptosCoin&gt;(contract_address);
+    <b>let</b> contract_signer = &<a href="vesting.md#0x1_vesting_get_vesting_account_signer_internal">get_vesting_account_signer_internal</a>(vesting_contract);
+    <a href="coin.md#0x1_coin_withdraw">coin::withdraw</a>&lt;AptosCoin&gt;(contract_signer, withdrawn_coins)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vesting_get_beneficiary"></a>
+
+## Function `get_beneficiary`
+
+
+
+<pre><code><b>fun</b> <a href="vesting.md#0x1_vesting_get_beneficiary">get_beneficiary</a>(contract: &<a href="vesting.md#0x1_vesting_VestingContract">vesting::VestingContract</a>, shareholder: <b>address</b>): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="vesting.md#0x1_vesting_get_beneficiary">get_beneficiary</a>(contract: &<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>, shareholder: <b>address</b>): <b>address</b> {
+    <b>if</b> (<a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_contains_key">simple_map::contains_key</a>(&contract.beneficiaries, &shareholder)) {
+        *<a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_borrow">simple_map::borrow</a>(&contract.beneficiaries, &shareholder)
+    } <b>else</b> {
+        shareholder
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+
+
+<a id="high-level-req"></a>
+
+### High-level Requirements
+
+<table>
+<tr>
+<th>No.</th><th>Requirement</th><th>Criticality</th><th>Implementation</th><th>Enforcement</th>
+</tr>
+
+<tr>
+<td>1</td>
+<td>In order to retrieve the address of the underlying stake pool, the vesting start timestamp of the vesting contract, the duration of the vesting period, the remaining grant of a vesting contract, the beneficiary account of a shareholder in a vesting contract, the percentage of accumulated rewards that is paid to the operator as commission, the operator who runs the validator, the voter who will be voting on-chain, and the vesting schedule of a vesting contract, the supplied vesting contract should exist.</td>
+<td>Low</td>
+<td>The vesting_start_secs, period_duration_secs, remaining_grant, beneficiary, operator_commission_percentage, operator, voter, and vesting_schedule functions ensure that the supplied vesting contract address exists by calling the assert_vesting_contract_exists function.</td>
+<td>Formally verified via <a href="#high-level-req-1">assert_vesting_contract_exists</a>.</td>
+</tr>
+
+<tr>
+<td>2</td>
+<td>The vesting pool should not exceed a maximum of 30 shareholders.</td>
+<td>Medium</td>
+<td>The maximum number of shareholders a vesting pool can support is stored as a constant in MAXIMUM_SHAREHOLDERS which is passed to the pool_u64::create function.</td>
+<td>Formally verified via a <a href="#high-level-spec-2">global invariant</a>.</td>
+</tr>
+
+<tr>
+<td>3</td>
+<td>Retrieving all the vesting contracts of a given address and retrieving the list of beneficiaries from a vesting contract should never fail.</td>
+<td>Medium</td>
+<td>The function vesting_contracts checks if the supplied admin address contains an AdminStore resource and returns all the vesting contracts as a vector<address>. Otherwise it returns an empty vector. The function get_beneficiary checks for a given vesting contract, a specific shareholder exists, and if so, the beneficiary will be returned, otherwise it will simply return the address of the shareholder.</td>
+<td>Formally verified via <a href="#high-level-spec-3.1">vesting_contracts</a> and <a href="#high-level-spec-3.2">get_beneficiary</a>.</td>
+</tr>
+
+<tr>
+<td>4</td>
+<td>The shareholders should be able to start vesting only after the vesting cliff and the first vesting period have transpired.</td>
+<td>High</td>
+<td>The end of the vesting cliff is stored under VestingContract.vesting_schedule.start_timestamp_secs. The vest function always checks that timestamp::now_seconds is greater or equal to the end of the vesting cliff period.</td>
+<td>Audited the check for the end of vesting cliff: <a href="https://github.com/aptos-labs/aptos-core/blob/main/aptos-move/framework/aptos-framework/sources/vesting.move#L566">vest</a> module.</td>
+</tr>
+
+<tr>
+<td>5</td>
+<td>In order to retrieve the total accumulated rewards that have not been distributed, the accumulated rewards of a given beneficiary, the list of al shareholders in a vesting contract,the shareholder address given the beneficiary address in a given vesting contract, to terminate a vesting contract and to distribute any withdrawable stake from the stake pool, the supplied vesting contract should exist and be active.</td>
+<td>Low</td>
+<td>The distribute, terminate_vesting_contract, shareholder, shareholders, accumulated_rewards, and total_accumulated_rewards functions ensure that the supplied vesting contract address exists and is active by calling the assert_active_vesting_contract function.</td>
+<td>Formally verified via <a href="#high-level-spec-5">ActiveVestingContractAbortsIf</a>.</td>
+</tr>
+
+<tr>
+<td>6</td>
+<td>A new vesting schedule should not be allowed to start vesting in the past or to supply an empty schedule or for the period duration to be zero.</td>
+<td>High</td>
+<td>The create_vesting_schedule function ensures that the length of the schedule vector is greater than 0, that the period duration is greater than 0 and that the start_timestamp_secs is greater or equal to timestamp::now_seconds.</td>
+<td>Formally verified via <a href="#high-level-req-6">create_vesting_schedule</a>.</td>
+</tr>
+
+<tr>
+<td>7</td>
+<td>The shareholders should be able to vest the tokens from previous periods.</td>
+<td>High</td>
+<td>When vesting, the last_completed_period is checked against the next period to vest. This allows to unlock vested tokens for the next period since last vested, in case they didn't call vest for some periods.</td>
+<td>Audited that vesting doesn't skip periods, but gradually increments to allow shareholders to retrieve all the vested tokens.</td>
+</tr>
+
+<tr>
+<td>8</td>
+<td>Actions such as obtaining a list of shareholders, calculating accrued rewards, distributing withdrawable stake, and terminating the vesting contract should be accessible exclusively while the vesting contract remains active.</td>
+<td>Low</td>
+<td>Restricting access to inactive vesting contracts is achieved through the assert_active_vesting_contract function.</td>
+<td>Formally verified via <a href="#high-level-spec-8">ActiveVestingContractAbortsIf</a>.</td>
+</tr>
+
+<tr>
+<td>9</td>
+<td>The ability to terminate a vesting contract should only be available to the owner.</td>
+<td>High</td>
+<td>Limiting the access of accounts to specific function, is achieved by asserting that the signer matches the admin of the VestingContract.</td>
+<td>Formally verified via <a href="#high-level-req-9">verify_admin</a>.</td>
+</tr>
+
+<tr>
+<td>10</td>
+<td>A new vesting contract should not be allowed to have an empty list of shareholders, have a different amount of shareholders than buy-ins, and provide a withdrawal address which is either reserved or not registered for apt.</td>
+<td>High</td>
+<td>The create_vesting_contract function ensures that the withdrawal_address is not a reserved address, that it is registered for apt, that the list of shareholders is non-empty, and that the amount of shareholders matches the amount of buy_ins.</td>
+<td>Formally verified via <a href="#high-level-req-10">create_vesting_contract</a>.</td>
+</tr>
+
+<tr>
+<td>11</td>
+<td>Creating a vesting contract account should require the signer (admin) to own an admin store and should enforce that the seed of the resource account is composed of the admin store's nonce, the vesting pool salt, and the custom contract creation seed.</td>
+<td>Medium</td>
+<td>The create_vesting_contract_account concatenates to the seed first the admin_store.nonce then the VESTING_POOL_SALT then the contract_creation_seed and then it is passed to the create_resource_account function.</td>
+<td>Enforced via <a href="#high-level-req-11">create_vesting_contract_account</a>.</td>
+</tr>
+
+</table>
+
+
+
+<a id="module-level-spec"></a>
+
+### Module-level Specification
+
+
+<pre><code><b>pragma</b> verify = <b>true</b>;
+<b>pragma</b> aborts_if_is_strict;
+// This enforces <a id="high-level-spec-2" href="#high-level-req">high-level requirement 2</a>:
+<b>invariant</b> <b>forall</b> a: <b>address</b> <b>where</b> <b>exists</b>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;(a):
+    <b>global</b>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;(a).grant_pool.shareholders_limit &lt;= <a href="vesting.md#0x1_vesting_MAXIMUM_SHAREHOLDERS">MAXIMUM_SHAREHOLDERS</a>;
+</code></pre>
+
+
+
+<a id="@Specification_1_stake_pool_address"></a>
+
+### Function `stake_pool_address`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="vesting.md#0x1_vesting_stake_pool_address">stake_pool_address</a>(vesting_contract_address: <b>address</b>): <b>address</b>
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;(vesting_contract_address);
+</code></pre>
+
+
+
+<a id="@Specification_1_vesting_start_secs"></a>
+
+### Function `vesting_start_secs`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="vesting.md#0x1_vesting_vesting_start_secs">vesting_start_secs</a>(vesting_contract_address: <b>address</b>): u64
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;(vesting_contract_address);
+</code></pre>
+
+
+
+<a id="@Specification_1_period_duration_secs"></a>
+
+### Function `period_duration_secs`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="vesting.md#0x1_vesting_period_duration_secs">period_duration_secs</a>(vesting_contract_address: <b>address</b>): u64
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;(vesting_contract_address);
+</code></pre>
+
+
+
+<a id="@Specification_1_remaining_grant"></a>
+
+### Function `remaining_grant`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="vesting.md#0x1_vesting_remaining_grant">remaining_grant</a>(vesting_contract_address: <b>address</b>): u64
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;(vesting_contract_address);
+</code></pre>
+
+
+
+<a id="@Specification_1_beneficiary"></a>
+
+### Function `beneficiary`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="vesting.md#0x1_vesting_beneficiary">beneficiary</a>(vesting_contract_address: <b>address</b>, shareholder: <b>address</b>): <b>address</b>
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;(vesting_contract_address);
+</code></pre>
+
+
+
+<a id="@Specification_1_operator_commission_percentage"></a>
+
+### Function `operator_commission_percentage`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="vesting.md#0x1_vesting_operator_commission_percentage">operator_commission_percentage</a>(vesting_contract_address: <b>address</b>): u64
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;(vesting_contract_address);
+</code></pre>
+
+
+
+<a id="@Specification_1_vesting_contracts"></a>
+
+### Function `vesting_contracts`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="vesting.md#0x1_vesting_vesting_contracts">vesting_contracts</a>(admin: <b>address</b>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;
+</code></pre>
+
+
+
+
+<pre><code>// This enforces <a id="high-level-spec-3.1" href="#high-level-req">high-level requirement 3</a>:
+<b>aborts_if</b> <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_operator"></a>
+
+### Function `operator`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="vesting.md#0x1_vesting_operator">operator</a>(vesting_contract_address: <b>address</b>): <b>address</b>
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;(vesting_contract_address);
+</code></pre>
+
+
+
+<a id="@Specification_1_voter"></a>
+
+### Function `voter`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="vesting.md#0x1_vesting_voter">voter</a>(vesting_contract_address: <b>address</b>): <b>address</b>
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;(vesting_contract_address);
+</code></pre>
+
+
+
+<a id="@Specification_1_vesting_schedule"></a>
+
+### Function `vesting_schedule`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="vesting.md#0x1_vesting_vesting_schedule">vesting_schedule</a>(vesting_contract_address: <b>address</b>): <a href="vesting.md#0x1_vesting_VestingSchedule">vesting::VestingSchedule</a>
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;(vesting_contract_address);
+</code></pre>
+
+
+
+<a id="@Specification_1_total_accumulated_rewards"></a>
+
+### Function `total_accumulated_rewards`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="vesting.md#0x1_vesting_total_accumulated_rewards">total_accumulated_rewards</a>(vesting_contract_address: <b>address</b>): u64
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+<b>include</b> <a href="vesting.md#0x1_vesting_TotalAccumulatedRewardsAbortsIf">TotalAccumulatedRewardsAbortsIf</a>;
+</code></pre>
+
+
+
+
+<a id="0x1_vesting_TotalAccumulatedRewardsAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="vesting.md#0x1_vesting_TotalAccumulatedRewardsAbortsIf">TotalAccumulatedRewardsAbortsIf</a> {
+    vesting_contract_address: <b>address</b>;
+    <b>requires</b> <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.commission_percentage &gt;= 0 && <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.commission_percentage &lt;= 100;
+    <b>include</b> <a href="vesting.md#0x1_vesting_ActiveVestingContractAbortsIf">ActiveVestingContractAbortsIf</a>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;{contract_address: vesting_contract_address};
+    <b>let</b> vesting_contract = <b>global</b>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;(vesting_contract_address);
+    <b>let</b> staker = vesting_contract_address;
+    <b>let</b> operator = vesting_contract.staking.operator;
+    <b>let</b> staking_contracts = <b>global</b>&lt;<a href="staking_contract.md#0x1_staking_contract_Store">staking_contract::Store</a>&gt;(staker).staking_contracts;
+    <b>let</b> <a href="staking_contract.md#0x1_staking_contract">staking_contract</a> = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(staking_contracts, operator);
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="staking_contract.md#0x1_staking_contract_Store">staking_contract::Store</a>&gt;(staker);
+    <b>aborts_if</b> !<a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(staking_contracts, operator);
+    <b>let</b> pool_address = <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.pool_address;
+    <b>let</b> stake_pool = <b>global</b>&lt;<a href="stake.md#0x1_stake_StakePool">stake::StakePool</a>&gt;(pool_address);
+    <b>let</b> active = <a href="coin.md#0x1_coin_value">coin::value</a>(stake_pool.active);
+    <b>let</b> pending_active = <a href="coin.md#0x1_coin_value">coin::value</a>(stake_pool.pending_active);
+    <b>let</b> total_active_stake = active + pending_active;
+    <b>let</b> accumulated_rewards = total_active_stake - <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.principal;
+    <b>let</b> commission_amount = accumulated_rewards * <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.commission_percentage / 100;
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="stake.md#0x1_stake_StakePool">stake::StakePool</a>&gt;(pool_address);
+    <b>aborts_if</b> active + pending_active &gt; MAX_U64;
+    <b>aborts_if</b> total_active_stake &lt; <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.principal;
+    <b>aborts_if</b> accumulated_rewards * <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.commission_percentage &gt; MAX_U64;
+    <b>aborts_if</b> (vesting_contract.remaining_grant + commission_amount) &gt; total_active_stake;
+    <b>aborts_if</b> total_active_stake &lt; vesting_contract.remaining_grant;
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_accumulated_rewards"></a>
+
+### Function `accumulated_rewards`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="vesting.md#0x1_vesting_accumulated_rewards">accumulated_rewards</a>(vesting_contract_address: <b>address</b>, shareholder_or_beneficiary: <b>address</b>): u64
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+<b>include</b> <a href="vesting.md#0x1_vesting_TotalAccumulatedRewardsAbortsIf">TotalAccumulatedRewardsAbortsIf</a>;
+<b>let</b> vesting_contract = <b>global</b>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;(vesting_contract_address);
+<b>let</b> operator = vesting_contract.staking.operator;
+<b>let</b> staking_contracts = <b>global</b>&lt;<a href="staking_contract.md#0x1_staking_contract_Store">staking_contract::Store</a>&gt;(vesting_contract_address).staking_contracts;
+<b>let</b> <a href="staking_contract.md#0x1_staking_contract">staking_contract</a> = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(staking_contracts, operator);
+<b>let</b> pool_address = <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.pool_address;
+<b>let</b> stake_pool = <b>global</b>&lt;<a href="stake.md#0x1_stake_StakePool">stake::StakePool</a>&gt;(pool_address);
+<b>let</b> active = <a href="coin.md#0x1_coin_value">coin::value</a>(stake_pool.active);
+<b>let</b> pending_active = <a href="coin.md#0x1_coin_value">coin::value</a>(stake_pool.pending_active);
+<b>let</b> total_active_stake = active + pending_active;
+<b>let</b> accumulated_rewards = total_active_stake - <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.principal;
+<b>let</b> commission_amount = accumulated_rewards * <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.commission_percentage / 100;
+<b>let</b> total_accumulated_rewards = total_active_stake - vesting_contract.remaining_grant - commission_amount;
+<b>let</b> shareholder = <a href="vesting.md#0x1_vesting_spec_shareholder">spec_shareholder</a>(vesting_contract_address, shareholder_or_beneficiary);
+<b>let</b> pool = vesting_contract.grant_pool;
+<b>let</b> shares = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_spec_shares">pool_u64::spec_shares</a>(pool, shareholder);
+<b>aborts_if</b> pool.total_coins &gt; 0 && pool.total_shares &gt; 0
+    && (shares * total_accumulated_rewards) / pool.total_shares &gt; MAX_U64;
+<b>ensures</b> result == <a href="../../../aptos-stdlib/tests/compiler-v2-doc/pool_u64.md#0x1_pool_u64_spec_shares_to_amount_with_total_coins">pool_u64::spec_shares_to_amount_with_total_coins</a>(pool, shares, total_accumulated_rewards);
+</code></pre>
+
+
+
+<a id="@Specification_1_shareholders"></a>
+
+### Function `shareholders`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="vesting.md#0x1_vesting_shareholders">shareholders</a>(vesting_contract_address: <b>address</b>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="vesting.md#0x1_vesting_ActiveVestingContractAbortsIf">ActiveVestingContractAbortsIf</a>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;{contract_address: vesting_contract_address};
+</code></pre>
+
+
+
+
+<a id="0x1_vesting_spec_shareholder"></a>
+
+
+<pre><code><b>fun</b> <a href="vesting.md#0x1_vesting_spec_shareholder">spec_shareholder</a>(vesting_contract_address: <b>address</b>, shareholder_or_beneficiary: <b>address</b>): <b>address</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_shareholder"></a>
+
+### Function `shareholder`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="vesting.md#0x1_vesting_shareholder">shareholder</a>(vesting_contract_address: <b>address</b>, shareholder_or_beneficiary: <b>address</b>): <b>address</b>
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>include</b> <a href="vesting.md#0x1_vesting_ActiveVestingContractAbortsIf">ActiveVestingContractAbortsIf</a>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;{contract_address: vesting_contract_address};
+<b>ensures</b> [abstract] result == <a href="vesting.md#0x1_vesting_spec_shareholder">spec_shareholder</a>(vesting_contract_address, shareholder_or_beneficiary);
+</code></pre>
+
+
+
+<a id="@Specification_1_create_vesting_schedule"></a>
+
+### Function `create_vesting_schedule`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vesting.md#0x1_vesting_create_vesting_schedule">create_vesting_schedule</a>(schedule: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>&gt;, start_timestamp_secs: u64, period_duration: u64): <a href="vesting.md#0x1_vesting_VestingSchedule">vesting::VestingSchedule</a>
+</code></pre>
+
+
+
+
+<pre><code>// This enforces <a id="high-level-req-6" href="#high-level-req">high-level requirement 6</a>:
+<b>aborts_if</b> !(len(schedule) &gt; 0);
+<b>aborts_if</b> !(period_duration &gt; 0);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="timestamp.md#0x1_timestamp_CurrentTimeMicroseconds">timestamp::CurrentTimeMicroseconds</a>&gt;(@aptos_framework);
+<b>aborts_if</b> !(start_timestamp_secs &gt;= <a href="timestamp.md#0x1_timestamp_now_seconds">timestamp::now_seconds</a>());
+</code></pre>
+
+
+
+<a id="@Specification_1_create_vesting_contract"></a>
+
+### Function `create_vesting_contract`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vesting.md#0x1_vesting_create_vesting_contract">create_vesting_contract</a>(admin: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, shareholders: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;, buy_ins: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;<b>address</b>, <a href="coin.md#0x1_coin_Coin">coin::Coin</a>&lt;<a href="aptos_coin.md#0x1_aptos_coin_AptosCoin">aptos_coin::AptosCoin</a>&gt;&gt;, vesting_schedule: <a href="vesting.md#0x1_vesting_VestingSchedule">vesting::VestingSchedule</a>, withdrawal_address: <b>address</b>, operator: <b>address</b>, voter: <b>address</b>, commission_percentage: u64, contract_creation_seed: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <b>address</b>
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+// This enforces <a id="high-level-req-10" href="#high-level-req">high-level requirement 10</a>:
+<b>aborts_if</b> withdrawal_address == @aptos_framework || withdrawal_address == @vm_reserved;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(withdrawal_address);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;AptosCoin&gt;&gt;(withdrawal_address);
+<b>aborts_if</b> len(shareholders) == 0;
+<b>aborts_if</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_len">simple_map::spec_len</a>(buy_ins) != len(shareholders);
+<b>ensures</b> <b>global</b>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;(result).grant_pool.shareholders_limit == 30;
+</code></pre>
+
+
+
+<a id="@Specification_1_unlock_rewards"></a>
+
+### Function `unlock_rewards`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="vesting.md#0x1_vesting_unlock_rewards">unlock_rewards</a>(contract_address: <b>address</b>)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+<b>include</b> <a href="vesting.md#0x1_vesting_UnlockRewardsAbortsIf">UnlockRewardsAbortsIf</a>;
+</code></pre>
+
+
+
+
+<a id="0x1_vesting_UnlockRewardsAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="vesting.md#0x1_vesting_UnlockRewardsAbortsIf">UnlockRewardsAbortsIf</a> {
+    contract_address: <b>address</b>;
+    <b>include</b> <a href="vesting.md#0x1_vesting_TotalAccumulatedRewardsAbortsIf">TotalAccumulatedRewardsAbortsIf</a> { vesting_contract_address: contract_address };
+    <b>let</b> vesting_contract = <b>global</b>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;(contract_address);
+    <b>let</b> operator = vesting_contract.staking.operator;
+    <b>let</b> staking_contracts = <b>global</b>&lt;<a href="staking_contract.md#0x1_staking_contract_Store">staking_contract::Store</a>&gt;(contract_address).staking_contracts;
+    <b>let</b> <a href="staking_contract.md#0x1_staking_contract">staking_contract</a> = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(staking_contracts, operator);
+    <b>let</b> pool_address = <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.pool_address;
+    <b>let</b> stake_pool = <b>global</b>&lt;<a href="stake.md#0x1_stake_StakePool">stake::StakePool</a>&gt;(pool_address);
+    <b>let</b> active = <a href="coin.md#0x1_coin_value">coin::value</a>(stake_pool.active);
+    <b>let</b> pending_active = <a href="coin.md#0x1_coin_value">coin::value</a>(stake_pool.pending_active);
+    <b>let</b> total_active_stake = active + pending_active;
+    <b>let</b> accumulated_rewards = total_active_stake - <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.principal;
+    <b>let</b> commission_amount = accumulated_rewards * <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.commission_percentage / 100;
+    <b>let</b> amount = total_active_stake - vesting_contract.remaining_grant - commission_amount;
+    <b>include</b> <a href="vesting.md#0x1_vesting_UnlockStakeAbortsIf">UnlockStakeAbortsIf</a> { vesting_contract, amount };
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_unlock_rewards_many"></a>
+
+### Function `unlock_rewards_many`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="vesting.md#0x1_vesting_unlock_rewards_many">unlock_rewards_many</a>(contract_addresses: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+<b>aborts_if</b> len(contract_addresses) == 0;
+<b>include</b> <a href="vesting.md#0x1_vesting_PreconditionAbortsIf">PreconditionAbortsIf</a>;
+</code></pre>
+
+
+
+<a id="@Specification_1_vest"></a>
+
+### Function `vest`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="vesting.md#0x1_vesting_vest">vest</a>(contract_address: <b>address</b>)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+<b>include</b> <a href="vesting.md#0x1_vesting_UnlockRewardsAbortsIf">UnlockRewardsAbortsIf</a>;
+</code></pre>
+
+
+
+<a id="@Specification_1_vest_many"></a>
+
+### Function `vest_many`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="vesting.md#0x1_vesting_vest_many">vest_many</a>(contract_addresses: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+<b>aborts_if</b> len(contract_addresses) == 0;
+<b>include</b> <a href="vesting.md#0x1_vesting_PreconditionAbortsIf">PreconditionAbortsIf</a>;
+</code></pre>
+
+
+
+<a id="@Specification_1_distribute"></a>
+
+### Function `distribute`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="vesting.md#0x1_vesting_distribute">distribute</a>(contract_address: <b>address</b>)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+<b>include</b> <a href="vesting.md#0x1_vesting_ActiveVestingContractAbortsIf">ActiveVestingContractAbortsIf</a>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;;
+<b>let</b> vesting_contract = <b>global</b>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;(contract_address);
+<b>include</b> <a href="vesting.md#0x1_vesting_WithdrawStakeAbortsIf">WithdrawStakeAbortsIf</a> { vesting_contract };
+</code></pre>
+
+
+
+<a id="@Specification_1_distribute_many"></a>
+
+### Function `distribute_many`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="vesting.md#0x1_vesting_distribute_many">distribute_many</a>(contract_addresses: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+<b>aborts_if</b> len(contract_addresses) == 0;
+</code></pre>
+
+
+
+<a id="@Specification_1_terminate_vesting_contract"></a>
+
+### Function `terminate_vesting_contract`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="vesting.md#0x1_vesting_terminate_vesting_contract">terminate_vesting_contract</a>(admin: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, contract_address: <b>address</b>)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+<b>include</b> <a href="vesting.md#0x1_vesting_ActiveVestingContractAbortsIf">ActiveVestingContractAbortsIf</a>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;;
+<b>let</b> vesting_contract = <b>global</b>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;(contract_address);
+<b>include</b> <a href="vesting.md#0x1_vesting_WithdrawStakeAbortsIf">WithdrawStakeAbortsIf</a> { vesting_contract };
+</code></pre>
+
+
+
+<a id="@Specification_1_admin_withdraw"></a>
+
+### Function `admin_withdraw`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="vesting.md#0x1_vesting_admin_withdraw">admin_withdraw</a>(admin: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, contract_address: <b>address</b>)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+<b>let</b> vesting_contract = <b>global</b>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;(contract_address);
+<b>aborts_if</b> vesting_contract.state != <a href="vesting.md#0x1_vesting_VESTING_POOL_TERMINATED">VESTING_POOL_TERMINATED</a>;
+<b>include</b> <a href="vesting.md#0x1_vesting_VerifyAdminAbortsIf">VerifyAdminAbortsIf</a>;
+<b>include</b> <a href="vesting.md#0x1_vesting_WithdrawStakeAbortsIf">WithdrawStakeAbortsIf</a> { vesting_contract };
+</code></pre>
+
+
+
+<a id="@Specification_1_update_operator"></a>
+
+### Function `update_operator`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="vesting.md#0x1_vesting_update_operator">update_operator</a>(admin: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, contract_address: <b>address</b>, new_operator: <b>address</b>, commission_percentage: u64)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+<b>include</b> <a href="vesting.md#0x1_vesting_VerifyAdminAbortsIf">VerifyAdminAbortsIf</a>;
+<b>let</b> vesting_contract = <b>global</b>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;(contract_address);
+<b>let</b> acc = vesting_contract.signer_cap.<a href="account.md#0x1_account">account</a>;
+<b>let</b> old_operator = vesting_contract.staking.operator;
+<b>include</b> <a href="staking_contract.md#0x1_staking_contract_ContractExistsAbortsIf">staking_contract::ContractExistsAbortsIf</a> { staker: acc, operator: old_operator };
+<b>let</b> store = <b>global</b>&lt;<a href="staking_contract.md#0x1_staking_contract_Store">staking_contract::Store</a>&gt;(acc);
+<b>let</b> staking_contracts = store.staking_contracts;
+<b>aborts_if</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(staking_contracts, new_operator);
+<b>let</b> <a href="staking_contract.md#0x1_staking_contract">staking_contract</a> = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(staking_contracts, old_operator);
+<b>include</b> <a href="vesting.md#0x1_vesting_DistributeInternalAbortsIf">DistributeInternalAbortsIf</a> { staker: acc, operator: old_operator, <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>, distribute_events: store.distribute_events };
+</code></pre>
+
+
+
+<a id="@Specification_1_update_operator_with_same_commission"></a>
+
+### Function `update_operator_with_same_commission`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="vesting.md#0x1_vesting_update_operator_with_same_commission">update_operator_with_same_commission</a>(admin: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, contract_address: <b>address</b>, new_operator: <b>address</b>)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_update_commission_percentage"></a>
+
+### Function `update_commission_percentage`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="vesting.md#0x1_vesting_update_commission_percentage">update_commission_percentage</a>(admin: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, contract_address: <b>address</b>, new_commission_percentage: u64)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_update_voter"></a>
+
+### Function `update_voter`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="vesting.md#0x1_vesting_update_voter">update_voter</a>(admin: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, contract_address: <b>address</b>, new_voter: <b>address</b>)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify_duration_estimate = 300;
+<b>include</b> <a href="vesting.md#0x1_vesting_VerifyAdminAbortsIf">VerifyAdminAbortsIf</a>;
+<b>let</b> vesting_contract = <b>global</b>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;(contract_address);
+<b>let</b> operator = vesting_contract.staking.operator;
+<b>let</b> staker = vesting_contract.signer_cap.<a href="account.md#0x1_account">account</a>;
+<b>include</b> <a href="staking_contract.md#0x1_staking_contract_UpdateVoterSchema">staking_contract::UpdateVoterSchema</a>;
+</code></pre>
+
+
+
+<a id="@Specification_1_reset_lockup"></a>
+
+### Function `reset_lockup`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="vesting.md#0x1_vesting_reset_lockup">reset_lockup</a>(admin: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, contract_address: <b>address</b>)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify_duration_estimate = 300;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;(contract_address);
+<b>let</b> vesting_contract = <b>global</b>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;(contract_address);
+<b>aborts_if</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(admin) != vesting_contract.admin;
+<b>let</b> operator = vesting_contract.staking.operator;
+<b>let</b> staker = vesting_contract.signer_cap.<a href="account.md#0x1_account">account</a>;
+<b>include</b> <a href="staking_contract.md#0x1_staking_contract_ContractExistsAbortsIf">staking_contract::ContractExistsAbortsIf</a> {staker, operator};
+<b>include</b> <a href="staking_contract.md#0x1_staking_contract_IncreaseLockupWithCapAbortsIf">staking_contract::IncreaseLockupWithCapAbortsIf</a> {staker, operator};
+<b>let</b> store = <b>global</b>&lt;<a href="staking_contract.md#0x1_staking_contract_Store">staking_contract::Store</a>&gt;(staker);
+<b>let</b> <a href="staking_contract.md#0x1_staking_contract">staking_contract</a> = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(store.staking_contracts, operator);
+<b>let</b> pool_address = <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.owner_cap.pool_address;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="stake.md#0x1_stake_StakePool">stake::StakePool</a>&gt;(vesting_contract.staking.pool_address);
+</code></pre>
+
+
+
+<a id="@Specification_1_set_beneficiary"></a>
+
+### Function `set_beneficiary`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="vesting.md#0x1_vesting_set_beneficiary">set_beneficiary</a>(admin: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, contract_address: <b>address</b>, shareholder: <b>address</b>, new_beneficiary: <b>address</b>)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify_duration_estimate = 300;
+<b>pragma</b> aborts_if_is_partial;
+<b>aborts_if</b> !<a href="account.md#0x1_account_exists_at">account::exists_at</a>(new_beneficiary);
+<b>aborts_if</b> !<a href="coin.md#0x1_coin_spec_is_account_registered">coin::spec_is_account_registered</a>&lt;AptosCoin&gt;(new_beneficiary);
+<b>include</b> <a href="vesting.md#0x1_vesting_VerifyAdminAbortsIf">VerifyAdminAbortsIf</a>;
+<b>let</b> <b>post</b> vesting_contract = <b>global</b>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;(contract_address);
+<b>ensures</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(vesting_contract.beneficiaries,shareholder);
+</code></pre>
+
+
+
+<a id="@Specification_1_reset_beneficiary"></a>
+
+### Function `reset_beneficiary`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="vesting.md#0x1_vesting_reset_beneficiary">reset_beneficiary</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, contract_address: <b>address</b>, shareholder: <b>address</b>)
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;(contract_address);
+<b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>);
+<b>let</b> vesting_contract = <b>global</b>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;(contract_address);
+<b>aborts_if</b> addr != vesting_contract.admin && !std::string::spec_internal_check_utf8(<a href="vesting.md#0x1_vesting_ROLE_BENEFICIARY_RESETTER">ROLE_BENEFICIARY_RESETTER</a>);
+<b>aborts_if</b> addr != vesting_contract.admin && !<b>exists</b>&lt;<a href="vesting.md#0x1_vesting_VestingAccountManagement">VestingAccountManagement</a>&gt;(contract_address);
+<b>let</b> roles = <b>global</b>&lt;<a href="vesting.md#0x1_vesting_VestingAccountManagement">VestingAccountManagement</a>&gt;(contract_address).roles;
+<b>let</b> role = std::string::spec_utf8(<a href="vesting.md#0x1_vesting_ROLE_BENEFICIARY_RESETTER">ROLE_BENEFICIARY_RESETTER</a>);
+<b>aborts_if</b> addr != vesting_contract.admin && !<a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(roles, role);
+<b>aborts_if</b> addr != vesting_contract.admin && addr != <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(roles, role);
+<b>let</b> <b>post</b> post_vesting_contract = <b>global</b>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;(contract_address);
+<b>ensures</b> !<a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(post_vesting_contract.beneficiaries,shareholder);
+</code></pre>
+
+
+
+<a id="@Specification_1_set_management_role"></a>
+
+### Function `set_management_role`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="vesting.md#0x1_vesting_set_management_role">set_management_role</a>(admin: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, contract_address: <b>address</b>, role: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, role_holder: <b>address</b>)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> aborts_if_is_partial;
+<b>include</b> <a href="vesting.md#0x1_vesting_SetManagementRoleAbortsIf">SetManagementRoleAbortsIf</a>;
+</code></pre>
+
+
+
+<a id="@Specification_1_set_beneficiary_resetter"></a>
+
+### Function `set_beneficiary_resetter`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="vesting.md#0x1_vesting_set_beneficiary_resetter">set_beneficiary_resetter</a>(admin: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, contract_address: <b>address</b>, beneficiary_resetter: <b>address</b>)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> aborts_if_is_partial;
+<b>aborts_if</b> !std::string::spec_internal_check_utf8(<a href="vesting.md#0x1_vesting_ROLE_BENEFICIARY_RESETTER">ROLE_BENEFICIARY_RESETTER</a>);
+<b>include</b> <a href="vesting.md#0x1_vesting_SetManagementRoleAbortsIf">SetManagementRoleAbortsIf</a>;
+</code></pre>
+
+
+
+<a id="@Specification_1_set_beneficiary_for_operator"></a>
+
+### Function `set_beneficiary_for_operator`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="vesting.md#0x1_vesting_set_beneficiary_for_operator">set_beneficiary_for_operator</a>(operator: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, new_beneficiary: <b>address</b>)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_get_role_holder"></a>
+
+### Function `get_role_holder`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vesting.md#0x1_vesting_get_role_holder">get_role_holder</a>(contract_address: <b>address</b>, role: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): <b>address</b>
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="vesting.md#0x1_vesting_VestingAccountManagement">VestingAccountManagement</a>&gt;(contract_address);
+<b>let</b> roles = <b>global</b>&lt;<a href="vesting.md#0x1_vesting_VestingAccountManagement">VestingAccountManagement</a>&gt;(contract_address).roles;
+<b>aborts_if</b> !<a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(roles,role);
+</code></pre>
+
+
+
+<a id="@Specification_1_get_vesting_account_signer"></a>
+
+### Function `get_vesting_account_signer`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vesting.md#0x1_vesting_get_vesting_account_signer">get_vesting_account_signer</a>(admin: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, contract_address: <b>address</b>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="vesting.md#0x1_vesting_VerifyAdminAbortsIf">VerifyAdminAbortsIf</a>;
+</code></pre>
+
+
+
+<a id="@Specification_1_get_vesting_account_signer_internal"></a>
+
+### Function `get_vesting_account_signer_internal`
+
+
+<pre><code><b>fun</b> <a href="vesting.md#0x1_vesting_get_vesting_account_signer_internal">get_vesting_account_signer_internal</a>(vesting_contract: &<a href="vesting.md#0x1_vesting_VestingContract">vesting::VestingContract</a>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+</code></pre>
+
+
+
+
+<a id="0x1_vesting_spec_get_vesting_account_signer"></a>
+
+
+<pre><code><b>fun</b> <a href="vesting.md#0x1_vesting_spec_get_vesting_account_signer">spec_get_vesting_account_signer</a>(vesting_contract: <a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>;
+</code></pre>
+
+
+
+<a id="@Specification_1_create_vesting_contract_account"></a>
+
+### Function `create_vesting_contract_account`
+
+
+<pre><code><b>fun</b> <a href="vesting.md#0x1_vesting_create_vesting_contract_account">create_vesting_contract_account</a>(admin: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, contract_creation_seed: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="account.md#0x1_account_SignerCapability">account::SignerCapability</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify_duration_estimate = 300;
+<b>let</b> admin_addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(admin);
+<b>let</b> admin_store = <b>global</b>&lt;<a href="vesting.md#0x1_vesting_AdminStore">AdminStore</a>&gt;(admin_addr);
+<b>let</b> seed = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs_to_bytes">bcs::to_bytes</a>(admin_addr);
+<b>let</b> nonce = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs_to_bytes">bcs::to_bytes</a>(admin_store.nonce);
+<b>let</b> first = concat(seed, nonce);
+<b>let</b> second = concat(first, <a href="vesting.md#0x1_vesting_VESTING_POOL_SALT">VESTING_POOL_SALT</a>);
+<b>let</b> end = concat(second, contract_creation_seed);
+// This enforces <a id="high-level-req-11" href="#high-level-req">high-level requirement 11</a>:
+<b>let</b> resource_addr = <a href="account.md#0x1_account_spec_create_resource_address">account::spec_create_resource_address</a>(admin_addr, end);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="vesting.md#0x1_vesting_AdminStore">AdminStore</a>&gt;(admin_addr);
+<b>aborts_if</b> len(<a href="account.md#0x1_account_ZERO_AUTH_KEY">account::ZERO_AUTH_KEY</a>) != 32;
+<b>aborts_if</b> admin_store.nonce + 1 &gt; MAX_U64;
+<b>let</b> ea = <a href="account.md#0x1_account_exists_at">account::exists_at</a>(resource_addr);
+<b>include</b> <b>if</b> (ea) <a href="account.md#0x1_account_CreateResourceAccountAbortsIf">account::CreateResourceAccountAbortsIf</a> <b>else</b> <a href="account.md#0x1_account_CreateAccountAbortsIf">account::CreateAccountAbortsIf</a> {addr: resource_addr};
+<b>let</b> acc = <b>global</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(resource_addr);
+<b>let</b> <b>post</b> post_acc = <b>global</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(resource_addr);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;AptosCoin&gt;&gt;(resource_addr) && !aptos_std::type_info::spec_is_struct&lt;AptosCoin&gt;();
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;AptosCoin&gt;&gt;(resource_addr) && ea && acc.guid_creation_num + 2 &gt; MAX_U64;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;AptosCoin&gt;&gt;(resource_addr) && ea && acc.guid_creation_num + 2 &gt;= <a href="account.md#0x1_account_MAX_GUID_CREATION_NUM">account::MAX_GUID_CREATION_NUM</a>;
+<b>ensures</b> <b>exists</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(resource_addr) && post_acc.authentication_key == <a href="account.md#0x1_account_ZERO_AUTH_KEY">account::ZERO_AUTH_KEY</a> &&
+        <b>exists</b>&lt;<a href="coin.md#0x1_coin_CoinStore">coin::CoinStore</a>&lt;AptosCoin&gt;&gt;(resource_addr);
+<b>ensures</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(result_1) == resource_addr;
+<b>ensures</b> result_2.<a href="account.md#0x1_account">account</a> == resource_addr;
+</code></pre>
+
+
+
+<a id="@Specification_1_verify_admin"></a>
+
+### Function `verify_admin`
+
+
+<pre><code><b>fun</b> <a href="vesting.md#0x1_vesting_verify_admin">verify_admin</a>(admin: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, vesting_contract: &<a href="vesting.md#0x1_vesting_VestingContract">vesting::VestingContract</a>)
+</code></pre>
+
+
+
+
+<pre><code>// This enforces <a id="high-level-req-9" href="#high-level-req">high-level requirement 9</a>:
+<b>aborts_if</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(admin) != vesting_contract.admin;
+</code></pre>
+
+
+
+<a id="@Specification_1_assert_vesting_contract_exists"></a>
+
+### Function `assert_vesting_contract_exists`
+
+
+<pre><code><b>fun</b> <a href="vesting.md#0x1_vesting_assert_vesting_contract_exists">assert_vesting_contract_exists</a>(contract_address: <b>address</b>)
+</code></pre>
+
+
+
+
+<pre><code>// This enforces <a id="high-level-req-1" href="#high-level-req">high-level requirement 1</a>:
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;(contract_address);
+</code></pre>
+
+
+
+<a id="@Specification_1_assert_active_vesting_contract"></a>
+
+### Function `assert_active_vesting_contract`
+
+
+<pre><code><b>fun</b> <a href="vesting.md#0x1_vesting_assert_active_vesting_contract">assert_active_vesting_contract</a>(contract_address: <b>address</b>)
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="vesting.md#0x1_vesting_ActiveVestingContractAbortsIf">ActiveVestingContractAbortsIf</a>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;;
+</code></pre>
+
+
+
+<a id="@Specification_1_unlock_stake"></a>
+
+### Function `unlock_stake`
+
+
+<pre><code><b>fun</b> <a href="vesting.md#0x1_vesting_unlock_stake">unlock_stake</a>(vesting_contract: &<a href="vesting.md#0x1_vesting_VestingContract">vesting::VestingContract</a>, amount: u64)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+<b>include</b> <a href="vesting.md#0x1_vesting_UnlockStakeAbortsIf">UnlockStakeAbortsIf</a>;
+</code></pre>
+
+
+
+
+<a id="0x1_vesting_UnlockStakeAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="vesting.md#0x1_vesting_UnlockStakeAbortsIf">UnlockStakeAbortsIf</a> {
+    vesting_contract: &<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>;
+    amount: u64;
+    <b>let</b> acc = vesting_contract.signer_cap.<a href="account.md#0x1_account">account</a>;
+    <b>let</b> operator = vesting_contract.staking.operator;
+    <b>include</b> amount != 0 ==&gt; <a href="staking_contract.md#0x1_staking_contract_ContractExistsAbortsIf">staking_contract::ContractExistsAbortsIf</a> { staker: acc, operator };
+    <b>let</b> store = <b>global</b>&lt;<a href="staking_contract.md#0x1_staking_contract_Store">staking_contract::Store</a>&gt;(acc);
+    <b>let</b> <a href="staking_contract.md#0x1_staking_contract">staking_contract</a> = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(store.staking_contracts, operator);
+    <b>include</b> amount != 0 ==&gt; <a href="vesting.md#0x1_vesting_DistributeInternalAbortsIf">DistributeInternalAbortsIf</a> { staker: acc, operator, <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>, distribute_events: store.distribute_events };
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_withdraw_stake"></a>
+
+### Function `withdraw_stake`
+
+
+<pre><code><b>fun</b> <a href="vesting.md#0x1_vesting_withdraw_stake">withdraw_stake</a>(vesting_contract: &<a href="vesting.md#0x1_vesting_VestingContract">vesting::VestingContract</a>, contract_address: <b>address</b>): <a href="coin.md#0x1_coin_Coin">coin::Coin</a>&lt;<a href="aptos_coin.md#0x1_aptos_coin_AptosCoin">aptos_coin::AptosCoin</a>&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+<b>include</b> <a href="vesting.md#0x1_vesting_WithdrawStakeAbortsIf">WithdrawStakeAbortsIf</a>;
+</code></pre>
+
+
+
+
+<a id="0x1_vesting_WithdrawStakeAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="vesting.md#0x1_vesting_WithdrawStakeAbortsIf">WithdrawStakeAbortsIf</a> {
+    vesting_contract: &<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>;
+    contract_address: <b>address</b>;
+    <b>let</b> operator = vesting_contract.staking.operator;
+    <b>include</b> <a href="staking_contract.md#0x1_staking_contract_ContractExistsAbortsIf">staking_contract::ContractExistsAbortsIf</a> { staker: contract_address, operator };
+    <b>let</b> store = <b>global</b>&lt;<a href="staking_contract.md#0x1_staking_contract_Store">staking_contract::Store</a>&gt;(contract_address);
+    <b>let</b> <a href="staking_contract.md#0x1_staking_contract">staking_contract</a> = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(store.staking_contracts, operator);
+    <b>include</b> <a href="vesting.md#0x1_vesting_DistributeInternalAbortsIf">DistributeInternalAbortsIf</a> { staker: contract_address, operator, <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>, distribute_events: store.distribute_events };
+}
+</code></pre>
+
+
+
+
+<a id="0x1_vesting_DistributeInternalAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="vesting.md#0x1_vesting_DistributeInternalAbortsIf">DistributeInternalAbortsIf</a> {
+    staker: <b>address</b>;
+    operator: <b>address</b>;
+    <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>: <a href="staking_contract.md#0x1_staking_contract_StakingContract">staking_contract::StakingContract</a>;
+    distribute_events: EventHandle&lt;<a href="staking_contract.md#0x1_staking_contract_DistributeEvent">staking_contract::DistributeEvent</a>&gt;;
+    <b>let</b> pool_address = <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.pool_address;
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="stake.md#0x1_stake_StakePool">stake::StakePool</a>&gt;(pool_address);
+    <b>let</b> stake_pool = <b>global</b>&lt;<a href="stake.md#0x1_stake_StakePool">stake::StakePool</a>&gt;(pool_address);
+    <b>let</b> inactive = stake_pool.inactive.value;
+    <b>let</b> pending_inactive = stake_pool.pending_inactive.value;
+    <b>aborts_if</b> inactive + pending_inactive &gt; MAX_U64;
+    <b>let</b> total_potential_withdrawable = inactive + pending_inactive;
+    <b>let</b> pool_address_1 = <a href="staking_contract.md#0x1_staking_contract">staking_contract</a>.owner_cap.pool_address;
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="stake.md#0x1_stake_StakePool">stake::StakePool</a>&gt;(pool_address_1);
+    <b>let</b> stake_pool_1 = <b>global</b>&lt;<a href="stake.md#0x1_stake_StakePool">stake::StakePool</a>&gt;(pool_address_1);
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="stake.md#0x1_stake_ValidatorSet">stake::ValidatorSet</a>&gt;(@aptos_framework);
+    <b>let</b> validator_set = <b>global</b>&lt;<a href="stake.md#0x1_stake_ValidatorSet">stake::ValidatorSet</a>&gt;(@aptos_framework);
+    <b>let</b> inactive_state = !<a href="stake.md#0x1_stake_spec_contains">stake::spec_contains</a>(validator_set.pending_active, pool_address_1)
+        && !<a href="stake.md#0x1_stake_spec_contains">stake::spec_contains</a>(validator_set.active_validators, pool_address_1)
+        && !<a href="stake.md#0x1_stake_spec_contains">stake::spec_contains</a>(validator_set.pending_inactive, pool_address_1);
+    <b>let</b> inactive_1 = stake_pool_1.inactive.value;
+    <b>let</b> pending_inactive_1 = stake_pool_1.pending_inactive.value;
+    <b>let</b> new_inactive_1 = inactive_1 + pending_inactive_1;
+    <b>aborts_if</b> inactive_state && <a href="timestamp.md#0x1_timestamp_spec_now_seconds">timestamp::spec_now_seconds</a>() &gt;= stake_pool_1.locked_until_secs
+        && inactive_1 + pending_inactive_1 &gt; MAX_U64;
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_get_beneficiary"></a>
+
+### Function `get_beneficiary`
+
+
+<pre><code><b>fun</b> <a href="vesting.md#0x1_vesting_get_beneficiary">get_beneficiary</a>(contract: &<a href="vesting.md#0x1_vesting_VestingContract">vesting::VestingContract</a>, shareholder: <b>address</b>): <b>address</b>
+</code></pre>
+
+
+
+
+<pre><code>// This enforces <a id="high-level-spec-3.2" href="#high-level-req">high-level requirement 3</a>:
+<b>aborts_if</b> <b>false</b>;
+</code></pre>
+
+
+
+
+<a id="0x1_vesting_SetManagementRoleAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="vesting.md#0x1_vesting_SetManagementRoleAbortsIf">SetManagementRoleAbortsIf</a> {
+    contract_address: <b>address</b>;
+    admin: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>;
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;(contract_address);
+    <b>let</b> vesting_contract = <b>global</b>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;(contract_address);
+    <b>aborts_if</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(admin) != vesting_contract.admin;
+}
+</code></pre>
+
+
+
+
+<a id="0x1_vesting_VerifyAdminAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="vesting.md#0x1_vesting_VerifyAdminAbortsIf">VerifyAdminAbortsIf</a> {
+    contract_address: <b>address</b>;
+    admin: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>;
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;(contract_address);
+    <b>let</b> vesting_contract = <b>global</b>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;(contract_address);
+    <b>aborts_if</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(admin) != vesting_contract.admin;
+}
+</code></pre>
+
+
+
+
+<a id="0x1_vesting_ActiveVestingContractAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="vesting.md#0x1_vesting_ActiveVestingContractAbortsIf">ActiveVestingContractAbortsIf</a>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt; {
+    contract_address: <b>address</b>;
+    // This enforces <a id="high-level-spec-5" href="#high-level-req">high-level requirement 5</a>:
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;(contract_address);
+    <b>let</b> vesting_contract = <b>global</b>&lt;<a href="vesting.md#0x1_vesting_VestingContract">VestingContract</a>&gt;(contract_address);
+    // This enforces <a id="high-level-spec-8" href="#high-level-req">high-level requirement 8</a>:
+    <b>aborts_if</b> vesting_contract.state != <a href="vesting.md#0x1_vesting_VESTING_POOL_ACTIVE">VESTING_POOL_ACTIVE</a>;
+}
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/voting.md b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/voting.md
new file mode 100644
index 0000000000000..431eb53db9cb5
--- /dev/null
+++ b/aptos-move/framework/aptos-framework/tests/compiler-v2-doc/voting.md
@@ -0,0 +1,2596 @@
+
+<a id="0x1_voting"></a>
+
+# Module `0x1::voting`
+
+
+This is the general Voting module that can be used as part of a DAO Governance. Voting is designed to be used by
+standalone governance modules, who has full control over the voting flow and is responsible for voting power
+calculation and including proper capabilities when creating the proposal so resolution can go through.
+On-chain governance of the Aptos network also uses Voting.
+
+The voting flow:
+1. The Voting module can be deployed at a known address (e.g. 0x1 for Aptos on-chain governance)
+2. The governance module, e.g. AptosGovernance, can be deployed later and define a GovernanceProposal resource type
+that can also contain other information such as Capability resource for authorization.
+3. The governance module's owner can then register the ProposalType with Voting. This also hosts the proposal list
+(forum) on the calling account.
+4. A proposer, through the governance module, can call Voting::create_proposal to create a proposal. create_proposal
+cannot be called directly not through the governance module. A script hash of the resolution script that can later
+be called to execute the proposal is required.
+5. A voter, through the governance module, can call Voting::vote on a proposal. vote requires passing a &ProposalType
+and thus only the governance module that registers ProposalType can call vote.
+6. Once the proposal's expiration time has passed and more than the defined threshold has voted yes on the proposal,
+anyone can call resolve which returns the content of the proposal (of type ProposalType) that can be used to execute.
+7. Only the resolution script with the same script hash specified in the proposal can call Voting::resolve as part of
+the resolution process.
+
+
+-  [Struct `Proposal`](#0x1_voting_Proposal)
+-  [Resource `VotingForum`](#0x1_voting_VotingForum)
+-  [Struct `VotingEvents`](#0x1_voting_VotingEvents)
+-  [Struct `CreateProposal`](#0x1_voting_CreateProposal)
+-  [Struct `RegisterForum`](#0x1_voting_RegisterForum)
+-  [Struct `Vote`](#0x1_voting_Vote)
+-  [Struct `ResolveProposal`](#0x1_voting_ResolveProposal)
+-  [Struct `CreateProposalEvent`](#0x1_voting_CreateProposalEvent)
+-  [Struct `RegisterForumEvent`](#0x1_voting_RegisterForumEvent)
+-  [Struct `VoteEvent`](#0x1_voting_VoteEvent)
+-  [Constants](#@Constants_0)
+-  [Function `register`](#0x1_voting_register)
+-  [Function `create_proposal`](#0x1_voting_create_proposal)
+-  [Function `create_proposal_v2`](#0x1_voting_create_proposal_v2)
+-  [Function `vote`](#0x1_voting_vote)
+-  [Function `is_proposal_resolvable`](#0x1_voting_is_proposal_resolvable)
+-  [Function `resolve`](#0x1_voting_resolve)
+-  [Function `resolve_proposal_v2`](#0x1_voting_resolve_proposal_v2)
+-  [Function `next_proposal_id`](#0x1_voting_next_proposal_id)
+-  [Function `get_proposer`](#0x1_voting_get_proposer)
+-  [Function `is_voting_closed`](#0x1_voting_is_voting_closed)
+-  [Function `can_be_resolved_early`](#0x1_voting_can_be_resolved_early)
+-  [Function `get_proposal_metadata`](#0x1_voting_get_proposal_metadata)
+-  [Function `get_proposal_metadata_value`](#0x1_voting_get_proposal_metadata_value)
+-  [Function `get_proposal_state`](#0x1_voting_get_proposal_state)
+-  [Function `get_proposal_creation_secs`](#0x1_voting_get_proposal_creation_secs)
+-  [Function `get_proposal_expiration_secs`](#0x1_voting_get_proposal_expiration_secs)
+-  [Function `get_execution_hash`](#0x1_voting_get_execution_hash)
+-  [Function `get_min_vote_threshold`](#0x1_voting_get_min_vote_threshold)
+-  [Function `get_early_resolution_vote_threshold`](#0x1_voting_get_early_resolution_vote_threshold)
+-  [Function `get_votes`](#0x1_voting_get_votes)
+-  [Function `is_resolved`](#0x1_voting_is_resolved)
+-  [Function `get_resolution_time_secs`](#0x1_voting_get_resolution_time_secs)
+-  [Function `is_multi_step_proposal_in_execution`](#0x1_voting_is_multi_step_proposal_in_execution)
+-  [Function `is_voting_period_over`](#0x1_voting_is_voting_period_over)
+-  [Function `get_proposal`](#0x1_voting_get_proposal)
+-  [Specification](#@Specification_1)
+    -  [High-level Requirements](#high-level-req)
+    -  [Module-level Specification](#module-level-spec)
+    -  [Function `register`](#@Specification_1_register)
+    -  [Function `create_proposal`](#@Specification_1_create_proposal)
+    -  [Function `create_proposal_v2`](#@Specification_1_create_proposal_v2)
+    -  [Function `vote`](#@Specification_1_vote)
+    -  [Function `is_proposal_resolvable`](#@Specification_1_is_proposal_resolvable)
+    -  [Function `resolve`](#@Specification_1_resolve)
+    -  [Function `resolve_proposal_v2`](#@Specification_1_resolve_proposal_v2)
+    -  [Function `next_proposal_id`](#@Specification_1_next_proposal_id)
+    -  [Function `get_proposer`](#@Specification_1_get_proposer)
+    -  [Function `is_voting_closed`](#@Specification_1_is_voting_closed)
+    -  [Function `can_be_resolved_early`](#@Specification_1_can_be_resolved_early)
+    -  [Function `get_proposal_metadata`](#@Specification_1_get_proposal_metadata)
+    -  [Function `get_proposal_metadata_value`](#@Specification_1_get_proposal_metadata_value)
+    -  [Function `get_proposal_state`](#@Specification_1_get_proposal_state)
+    -  [Function `get_proposal_creation_secs`](#@Specification_1_get_proposal_creation_secs)
+    -  [Function `get_proposal_expiration_secs`](#@Specification_1_get_proposal_expiration_secs)
+    -  [Function `get_execution_hash`](#@Specification_1_get_execution_hash)
+    -  [Function `get_min_vote_threshold`](#@Specification_1_get_min_vote_threshold)
+    -  [Function `get_early_resolution_vote_threshold`](#@Specification_1_get_early_resolution_vote_threshold)
+    -  [Function `get_votes`](#@Specification_1_get_votes)
+    -  [Function `is_resolved`](#@Specification_1_is_resolved)
+    -  [Function `get_resolution_time_secs`](#@Specification_1_get_resolution_time_secs)
+    -  [Function `is_multi_step_proposal_in_execution`](#@Specification_1_is_multi_step_proposal_in_execution)
+    -  [Function `is_voting_period_over`](#@Specification_1_is_voting_period_over)
+
+
+<pre><code><b>use</b> <a href="account.md#0x1_account">0x1::account</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs">0x1::bcs</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="event.md#0x1_event">0x1::event</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features">0x1::features</a>;
+<b>use</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs">0x1::from_bcs</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option">0x1::option</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">0x1::signer</a>;
+<b>use</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map">0x1::simple_map</a>;
+<b>use</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string">0x1::string</a>;
+<b>use</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table">0x1::table</a>;
+<b>use</b> <a href="timestamp.md#0x1_timestamp">0x1::timestamp</a>;
+<b>use</b> <a href="transaction_context.md#0x1_transaction_context">0x1::transaction_context</a>;
+<b>use</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info">0x1::type_info</a>;
+</code></pre>
+
+
+
+<a id="0x1_voting_Proposal"></a>
+
+## Struct `Proposal`
+
+Extra metadata (e.g. description, code url) can be part of the ProposalType struct.
+
+
+<pre><code><b>struct</b> <a href="voting.md#0x1_voting_Proposal">Proposal</a>&lt;ProposalType: store&gt; <b>has</b> store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>proposer: <b>address</b></code>
+</dt>
+<dd>
+ Required. The address of the proposer.
+</dd>
+<dt>
+<code>execution_content: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;ProposalType&gt;</code>
+</dt>
+<dd>
+ Required. Should contain enough information to execute later, for example the required capability.
+ This is stored as an option so we can return it to governance when the proposal is resolved.
+</dd>
+<dt>
+<code>metadata: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;</code>
+</dt>
+<dd>
+ Optional. Value is serialized value of an attribute.
+ Currently, we have three attributes that are used by the voting flow.
+ 1. RESOLVABLE_TIME_METADATA_KEY: this is uesed to record the resolvable time to ensure that resolution has to be done non-atomically.
+ 2. IS_MULTI_STEP_PROPOSAL_KEY: this is used to track if a proposal is single-step or multi-step.
+ 3. IS_MULTI_STEP_PROPOSAL_IN_EXECUTION_KEY: this attribute only applies to multi-step proposals. A single-step proposal will not have
+ this field in its metadata map. The value is used to indicate if a multi-step proposal is in execution. If yes, we will disable further
+ voting for this multi-step proposal.
+</dd>
+<dt>
+<code>creation_time_secs: u64</code>
+</dt>
+<dd>
+ Timestamp when the proposal was created.
+</dd>
+<dt>
+<code>execution_hash: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+ Required. The hash for the execution script module. Only the same exact script module can resolve this
+ proposal.
+</dd>
+<dt>
+<code>min_vote_threshold: u128</code>
+</dt>
+<dd>
+ A proposal is only resolved if expiration has passed and the number of votes is above threshold.
+</dd>
+<dt>
+<code>expiration_secs: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>early_resolution_vote_threshold: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;u128&gt;</code>
+</dt>
+<dd>
+ Optional. Early resolution threshold. If specified, the proposal can be resolved early if the total
+ number of yes or no votes passes this threshold.
+ For example, this can be set to 50% of the total supply of the voting token, so if > 50% vote yes or no,
+ the proposal can be resolved before expiration.
+</dd>
+<dt>
+<code>yes_votes: u128</code>
+</dt>
+<dd>
+ Number of votes for each outcome.
+ u128 since the voting power is already u64 and can add up to more than u64 can hold.
+</dd>
+<dt>
+<code>no_votes: u128</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>is_resolved: bool</code>
+</dt>
+<dd>
+ Whether the proposal has been resolved.
+</dd>
+<dt>
+<code>resolution_time_secs: u64</code>
+</dt>
+<dd>
+ Resolution timestamp if the proposal has been resolved. 0 otherwise.
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_voting_VotingForum"></a>
+
+## Resource `VotingForum`
+
+
+
+<pre><code><b>struct</b> <a href="voting.md#0x1_voting_VotingForum">VotingForum</a>&lt;ProposalType: store&gt; <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>proposals: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_Table">table::Table</a>&lt;u64, <a href="voting.md#0x1_voting_Proposal">voting::Proposal</a>&lt;ProposalType&gt;&gt;</code>
+</dt>
+<dd>
+ Use Table for execution optimization instead of Vector for gas cost since Vector is read entirely into memory
+ during execution while only relevant Table entries are.
+</dd>
+<dt>
+<code>events: <a href="voting.md#0x1_voting_VotingEvents">voting::VotingEvents</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>next_proposal_id: u64</code>
+</dt>
+<dd>
+ Unique identifier for a proposal. This allows for 2 * 10**19 proposals.
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_voting_VotingEvents"></a>
+
+## Struct `VotingEvents`
+
+
+
+<pre><code><b>struct</b> <a href="voting.md#0x1_voting_VotingEvents">VotingEvents</a> <b>has</b> store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>create_proposal_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="voting.md#0x1_voting_CreateProposalEvent">voting::CreateProposalEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>register_forum_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="voting.md#0x1_voting_RegisterForumEvent">voting::RegisterForumEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>resolve_proposal_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="voting.md#0x1_voting_ResolveProposal">voting::ResolveProposal</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>vote_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="voting.md#0x1_voting_VoteEvent">voting::VoteEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_voting_CreateProposal"></a>
+
+## Struct `CreateProposal`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="voting.md#0x1_voting_CreateProposal">CreateProposal</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>proposal_id: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>early_resolution_vote_threshold: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;u128&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>execution_hash: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>expiration_secs: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>metadata: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>min_vote_threshold: u128</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_voting_RegisterForum"></a>
+
+## Struct `RegisterForum`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="voting.md#0x1_voting_RegisterForum">RegisterForum</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>hosting_account: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>proposal_type_info: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_TypeInfo">type_info::TypeInfo</a></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_voting_Vote"></a>
+
+## Struct `Vote`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="voting.md#0x1_voting_Vote">Vote</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>proposal_id: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>num_votes: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_voting_ResolveProposal"></a>
+
+## Struct `ResolveProposal`
+
+
+
+<pre><code>#[<a href="event.md#0x1_event">event</a>]
+<b>struct</b> <a href="voting.md#0x1_voting_ResolveProposal">ResolveProposal</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>proposal_id: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>yes_votes: u128</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>no_votes: u128</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>resolved_early: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_voting_CreateProposalEvent"></a>
+
+## Struct `CreateProposalEvent`
+
+
+
+<pre><code><b>struct</b> <a href="voting.md#0x1_voting_CreateProposalEvent">CreateProposalEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>proposal_id: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>early_resolution_vote_threshold: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;u128&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>execution_hash: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>expiration_secs: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>metadata: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>min_vote_threshold: u128</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_voting_RegisterForumEvent"></a>
+
+## Struct `RegisterForumEvent`
+
+
+
+<pre><code><b>struct</b> <a href="voting.md#0x1_voting_RegisterForumEvent">RegisterForumEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>hosting_account: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>proposal_type_info: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_TypeInfo">type_info::TypeInfo</a></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_voting_VoteEvent"></a>
+
+## Struct `VoteEvent`
+
+
+
+<pre><code><b>struct</b> <a href="voting.md#0x1_voting_VoteEvent">VoteEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>proposal_id: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>num_votes: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_voting_EINVALID_MIN_VOTE_THRESHOLD"></a>
+
+Minimum vote threshold cannot be higher than early resolution threshold.
+
+
+<pre><code><b>const</b> <a href="voting.md#0x1_voting_EINVALID_MIN_VOTE_THRESHOLD">EINVALID_MIN_VOTE_THRESHOLD</a>: u64 = 7;
+</code></pre>
+
+
+
+<a id="0x1_voting_EMULTI_STEP_PROPOSAL_CANNOT_USE_SINGLE_STEP_RESOLVE_FUNCTION"></a>
+
+If a proposal is multi-step, we need to use <code><a href="voting.md#0x1_voting_resolve_proposal_v2">resolve_proposal_v2</a>()</code> to resolve it.
+If we use <code><a href="voting.md#0x1_voting_resolve">resolve</a>()</code> to resolve a multi-step proposal, it will fail with EMULTI_STEP_PROPOSAL_CANNOT_USE_SINGLE_STEP_RESOLVE_FUNCTION.
+
+
+<pre><code><b>const</b> <a href="voting.md#0x1_voting_EMULTI_STEP_PROPOSAL_CANNOT_USE_SINGLE_STEP_RESOLVE_FUNCTION">EMULTI_STEP_PROPOSAL_CANNOT_USE_SINGLE_STEP_RESOLVE_FUNCTION</a>: u64 = 10;
+</code></pre>
+
+
+
+<a id="0x1_voting_EMULTI_STEP_PROPOSAL_IN_EXECUTION"></a>
+
+Cannot vote if the specified multi-step proposal is in execution.
+
+
+<pre><code><b>const</b> <a href="voting.md#0x1_voting_EMULTI_STEP_PROPOSAL_IN_EXECUTION">EMULTI_STEP_PROPOSAL_IN_EXECUTION</a>: u64 = 9;
+</code></pre>
+
+
+
+<a id="0x1_voting_EPROPOSAL_ALREADY_RESOLVED"></a>
+
+Proposal cannot be resolved more than once
+
+
+<pre><code><b>const</b> <a href="voting.md#0x1_voting_EPROPOSAL_ALREADY_RESOLVED">EPROPOSAL_ALREADY_RESOLVED</a>: u64 = 3;
+</code></pre>
+
+
+
+<a id="0x1_voting_EPROPOSAL_CANNOT_BE_RESOLVED"></a>
+
+Proposal cannot be resolved. Either voting duration has not passed, not enough votes, or fewer yes than no votes
+
+
+<pre><code><b>const</b> <a href="voting.md#0x1_voting_EPROPOSAL_CANNOT_BE_RESOLVED">EPROPOSAL_CANNOT_BE_RESOLVED</a>: u64 = 2;
+</code></pre>
+
+
+
+<a id="0x1_voting_EPROPOSAL_EMPTY_EXECUTION_HASH"></a>
+
+Proposal cannot contain an empty execution script hash
+
+
+<pre><code><b>const</b> <a href="voting.md#0x1_voting_EPROPOSAL_EMPTY_EXECUTION_HASH">EPROPOSAL_EMPTY_EXECUTION_HASH</a>: u64 = 4;
+</code></pre>
+
+
+
+<a id="0x1_voting_EPROPOSAL_EXECUTION_HASH_NOT_MATCHING"></a>
+
+Current script's execution hash does not match the specified proposal's
+
+
+<pre><code><b>const</b> <a href="voting.md#0x1_voting_EPROPOSAL_EXECUTION_HASH_NOT_MATCHING">EPROPOSAL_EXECUTION_HASH_NOT_MATCHING</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_voting_EPROPOSAL_IS_SINGLE_STEP"></a>
+
+Cannot call <code><a href="voting.md#0x1_voting_is_multi_step_proposal_in_execution">is_multi_step_proposal_in_execution</a>()</code> on single-step proposals.
+
+
+<pre><code><b>const</b> <a href="voting.md#0x1_voting_EPROPOSAL_IS_SINGLE_STEP">EPROPOSAL_IS_SINGLE_STEP</a>: u64 = 12;
+</code></pre>
+
+
+
+<a id="0x1_voting_EPROPOSAL_VOTING_ALREADY_ENDED"></a>
+
+Proposal's voting period has already ended.
+
+
+<pre><code><b>const</b> <a href="voting.md#0x1_voting_EPROPOSAL_VOTING_ALREADY_ENDED">EPROPOSAL_VOTING_ALREADY_ENDED</a>: u64 = 5;
+</code></pre>
+
+
+
+<a id="0x1_voting_ERESOLUTION_CANNOT_BE_ATOMIC"></a>
+
+Resolution of a proposal cannot happen atomically in the same transaction as the last vote.
+
+
+<pre><code><b>const</b> <a href="voting.md#0x1_voting_ERESOLUTION_CANNOT_BE_ATOMIC">ERESOLUTION_CANNOT_BE_ATOMIC</a>: u64 = 8;
+</code></pre>
+
+
+
+<a id="0x1_voting_ESINGLE_STEP_PROPOSAL_CANNOT_HAVE_NEXT_EXECUTION_HASH"></a>
+
+If we call <code><a href="voting.md#0x1_voting_resolve_proposal_v2">resolve_proposal_v2</a>()</code> to resolve a single-step proposal, the <code>next_execution_hash</code> parameter should be an empty vector.
+
+
+<pre><code><b>const</b> <a href="voting.md#0x1_voting_ESINGLE_STEP_PROPOSAL_CANNOT_HAVE_NEXT_EXECUTION_HASH">ESINGLE_STEP_PROPOSAL_CANNOT_HAVE_NEXT_EXECUTION_HASH</a>: u64 = 11;
+</code></pre>
+
+
+
+<a id="0x1_voting_EVOTING_FORUM_ALREADY_REGISTERED"></a>
+
+Voting forum has already been registered.
+
+
+<pre><code><b>const</b> <a href="voting.md#0x1_voting_EVOTING_FORUM_ALREADY_REGISTERED">EVOTING_FORUM_ALREADY_REGISTERED</a>: u64 = 6;
+</code></pre>
+
+
+
+<a id="0x1_voting_IS_MULTI_STEP_PROPOSAL_IN_EXECUTION_KEY"></a>
+
+Key used to track if the multi-step proposal is in execution / resolving in progress.
+
+
+<pre><code><b>const</b> <a href="voting.md#0x1_voting_IS_MULTI_STEP_PROPOSAL_IN_EXECUTION_KEY">IS_MULTI_STEP_PROPOSAL_IN_EXECUTION_KEY</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; = [73, 83, 95, 77, 85, 76, 84, 73, 95, 83, 84, 69, 80, 95, 80, 82, 79, 80, 79, 83, 65, 76, 95, 73, 78, 95, 69, 88, 69, 67, 85, 84, 73, 79, 78];
+</code></pre>
+
+
+
+<a id="0x1_voting_IS_MULTI_STEP_PROPOSAL_KEY"></a>
+
+Key used to track if the proposal is multi-step
+
+
+<pre><code><b>const</b> <a href="voting.md#0x1_voting_IS_MULTI_STEP_PROPOSAL_KEY">IS_MULTI_STEP_PROPOSAL_KEY</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; = [73, 83, 95, 77, 85, 76, 84, 73, 95, 83, 84, 69, 80, 95, 80, 82, 79, 80, 79, 83, 65, 76, 95, 75, 69, 89];
+</code></pre>
+
+
+
+<a id="0x1_voting_PROPOSAL_STATE_FAILED"></a>
+
+Proposal has failed because either the min vote threshold is not met or majority voted no.
+
+
+<pre><code><b>const</b> <a href="voting.md#0x1_voting_PROPOSAL_STATE_FAILED">PROPOSAL_STATE_FAILED</a>: u64 = 3;
+</code></pre>
+
+
+
+<a id="0x1_voting_PROPOSAL_STATE_PENDING"></a>
+
+ProposalStateEnum representing proposal state.
+
+
+<pre><code><b>const</b> <a href="voting.md#0x1_voting_PROPOSAL_STATE_PENDING">PROPOSAL_STATE_PENDING</a>: u64 = 0;
+</code></pre>
+
+
+
+<a id="0x1_voting_PROPOSAL_STATE_SUCCEEDED"></a>
+
+
+
+<pre><code><b>const</b> <a href="voting.md#0x1_voting_PROPOSAL_STATE_SUCCEEDED">PROPOSAL_STATE_SUCCEEDED</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_voting_RESOLVABLE_TIME_METADATA_KEY"></a>
+
+Key used to track the resolvable time in the proposal's metadata.
+
+
+<pre><code><b>const</b> <a href="voting.md#0x1_voting_RESOLVABLE_TIME_METADATA_KEY">RESOLVABLE_TIME_METADATA_KEY</a>: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; = [82, 69, 83, 79, 76, 86, 65, 66, 76, 69, 95, 84, 73, 77, 69, 95, 77, 69, 84, 65, 68, 65, 84, 65, 95, 75, 69, 89];
+</code></pre>
+
+
+
+<a id="0x1_voting_register"></a>
+
+## Function `register`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_register">register</a>&lt;ProposalType: store&gt;(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_register">register</a>&lt;ProposalType: store&gt;(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>) {
+    <b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>);
+    <b>assert</b>!(!<b>exists</b>&lt;<a href="voting.md#0x1_voting_VotingForum">VotingForum</a>&lt;ProposalType&gt;&gt;(addr), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_already_exists">error::already_exists</a>(<a href="voting.md#0x1_voting_EVOTING_FORUM_ALREADY_REGISTERED">EVOTING_FORUM_ALREADY_REGISTERED</a>));
+
+    <b>let</b> voting_forum = <a href="voting.md#0x1_voting_VotingForum">VotingForum</a>&lt;ProposalType&gt; {
+        next_proposal_id: 0,
+        proposals: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_new">table::new</a>&lt;u64, <a href="voting.md#0x1_voting_Proposal">Proposal</a>&lt;ProposalType&gt;&gt;(),
+        events: <a href="voting.md#0x1_voting_VotingEvents">VotingEvents</a> {
+            create_proposal_events: <a href="account.md#0x1_account_new_event_handle">account::new_event_handle</a>&lt;<a href="voting.md#0x1_voting_CreateProposalEvent">CreateProposalEvent</a>&gt;(<a href="account.md#0x1_account">account</a>),
+            register_forum_events: <a href="account.md#0x1_account_new_event_handle">account::new_event_handle</a>&lt;<a href="voting.md#0x1_voting_RegisterForumEvent">RegisterForumEvent</a>&gt;(<a href="account.md#0x1_account">account</a>),
+            resolve_proposal_events: <a href="account.md#0x1_account_new_event_handle">account::new_event_handle</a>&lt;<a href="voting.md#0x1_voting_ResolveProposal">ResolveProposal</a>&gt;(<a href="account.md#0x1_account">account</a>),
+            vote_events: <a href="account.md#0x1_account_new_event_handle">account::new_event_handle</a>&lt;<a href="voting.md#0x1_voting_VoteEvent">VoteEvent</a>&gt;(<a href="account.md#0x1_account">account</a>),
+        }
+    };
+
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        <a href="event.md#0x1_event_emit">event::emit</a>(
+            <a href="voting.md#0x1_voting_RegisterForum">RegisterForum</a> {
+                hosting_account: addr,
+                proposal_type_info: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_type_of">type_info::type_of</a>&lt;ProposalType&gt;(),
+            },
+        );
+    };
+    <a href="event.md#0x1_event_emit_event">event::emit_event</a>&lt;<a href="voting.md#0x1_voting_RegisterForumEvent">RegisterForumEvent</a>&gt;(
+        &<b>mut</b> voting_forum.events.register_forum_events,
+        <a href="voting.md#0x1_voting_RegisterForumEvent">RegisterForumEvent</a> {
+            hosting_account: addr,
+            proposal_type_info: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_type_of">type_info::type_of</a>&lt;ProposalType&gt;(),
+        },
+    );
+
+    <b>move_to</b>(<a href="account.md#0x1_account">account</a>, voting_forum);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_voting_create_proposal"></a>
+
+## Function `create_proposal`
+
+Create a single-step proposal with the given parameters
+
+@param voting_forum_address The forum's address where the proposal will be stored.
+@param execution_content The execution content that will be given back at resolution time. This can contain
+data such as a capability resource used to scope the execution.
+@param execution_hash The hash for the execution script module. Only the same exact script module can resolve
+this proposal.
+@param min_vote_threshold The minimum number of votes needed to consider this proposal successful.
+@param expiration_secs The time in seconds at which the proposal expires and can potentially be resolved.
+@param early_resolution_vote_threshold The vote threshold for early resolution of this proposal.
+@param metadata A simple_map that stores information about this proposal.
+@return The proposal id.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_create_proposal">create_proposal</a>&lt;ProposalType: store&gt;(proposer: <b>address</b>, voting_forum_address: <b>address</b>, execution_content: ProposalType, execution_hash: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, min_vote_threshold: u128, expiration_secs: u64, early_resolution_vote_threshold: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;u128&gt;, metadata: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_create_proposal">create_proposal</a>&lt;ProposalType: store&gt;(
+    proposer: <b>address</b>,
+    voting_forum_address: <b>address</b>,
+    execution_content: ProposalType,
+    execution_hash: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    min_vote_threshold: u128,
+    expiration_secs: u64,
+    early_resolution_vote_threshold: Option&lt;u128&gt;,
+    metadata: SimpleMap&lt;String, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;,
+): u64 <b>acquires</b> <a href="voting.md#0x1_voting_VotingForum">VotingForum</a> {
+    <a href="voting.md#0x1_voting_create_proposal_v2">create_proposal_v2</a>(
+        proposer,
+        voting_forum_address,
+        execution_content,
+        execution_hash,
+        min_vote_threshold,
+        expiration_secs,
+        early_resolution_vote_threshold,
+        metadata,
+        <b>false</b>
+    )
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_voting_create_proposal_v2"></a>
+
+## Function `create_proposal_v2`
+
+Create a single-step or a multi-step proposal with the given parameters
+
+@param voting_forum_address The forum's address where the proposal will be stored.
+@param execution_content The execution content that will be given back at resolution time. This can contain
+data such as a capability resource used to scope the execution.
+@param execution_hash The sha-256 hash for the execution script module. Only the same exact script module can
+resolve this proposal.
+@param min_vote_threshold The minimum number of votes needed to consider this proposal successful.
+@param expiration_secs The time in seconds at which the proposal expires and can potentially be resolved.
+@param early_resolution_vote_threshold The vote threshold for early resolution of this proposal.
+@param metadata A simple_map that stores information about this proposal.
+@param is_multi_step_proposal A bool value that indicates if the proposal is single-step or multi-step.
+@return The proposal id.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_create_proposal_v2">create_proposal_v2</a>&lt;ProposalType: store&gt;(proposer: <b>address</b>, voting_forum_address: <b>address</b>, execution_content: ProposalType, execution_hash: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, min_vote_threshold: u128, expiration_secs: u64, early_resolution_vote_threshold: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;u128&gt;, metadata: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;, is_multi_step_proposal: bool): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_create_proposal_v2">create_proposal_v2</a>&lt;ProposalType: store&gt;(
+    proposer: <b>address</b>,
+    voting_forum_address: <b>address</b>,
+    execution_content: ProposalType,
+    execution_hash: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    min_vote_threshold: u128,
+    expiration_secs: u64,
+    early_resolution_vote_threshold: Option&lt;u128&gt;,
+    metadata: SimpleMap&lt;String, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;,
+    is_multi_step_proposal: bool,
+): u64 <b>acquires</b> <a href="voting.md#0x1_voting_VotingForum">VotingForum</a> {
+    <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&early_resolution_vote_threshold)) {
+        <b>assert</b>!(
+            min_vote_threshold &lt;= *<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(&early_resolution_vote_threshold),
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="voting.md#0x1_voting_EINVALID_MIN_VOTE_THRESHOLD">EINVALID_MIN_VOTE_THRESHOLD</a>),
+        );
+    };
+    // Make sure the execution <b>script</b>'s <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/hash.md#0x1_hash">hash</a> is not empty.
+    <b>assert</b>!(<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&execution_hash) &gt; 0, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="voting.md#0x1_voting_EPROPOSAL_EMPTY_EXECUTION_HASH">EPROPOSAL_EMPTY_EXECUTION_HASH</a>));
+
+    <b>let</b> voting_forum = <b>borrow_global_mut</b>&lt;<a href="voting.md#0x1_voting_VotingForum">VotingForum</a>&lt;ProposalType&gt;&gt;(voting_forum_address);
+    <b>let</b> proposal_id = voting_forum.next_proposal_id;
+    voting_forum.next_proposal_id = voting_forum.next_proposal_id + 1;
+
+    // Add a flag <b>to</b> indicate <b>if</b> this proposal is single-step or multi-step.
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_add">simple_map::add</a>(&<b>mut</b> metadata, utf8(<a href="voting.md#0x1_voting_IS_MULTI_STEP_PROPOSAL_KEY">IS_MULTI_STEP_PROPOSAL_KEY</a>), to_bytes(&is_multi_step_proposal));
+
+    <b>let</b> is_multi_step_in_execution_key = utf8(<a href="voting.md#0x1_voting_IS_MULTI_STEP_PROPOSAL_IN_EXECUTION_KEY">IS_MULTI_STEP_PROPOSAL_IN_EXECUTION_KEY</a>);
+    <b>if</b> (is_multi_step_proposal) {
+        // If the given proposal is a multi-step proposal, we will add a flag <b>to</b> indicate <b>if</b> this multi-step proposal is in execution.
+        // This value is by default <b>false</b>. We turn this value <b>to</b> <b>true</b> when we start executing the multi-step proposal. This value
+        // will be used <b>to</b> disable further <a href="voting.md#0x1_voting">voting</a> after we started executing the multi-step proposal.
+        <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_add">simple_map::add</a>(&<b>mut</b> metadata, is_multi_step_in_execution_key, to_bytes(&<b>false</b>));
+        // If the proposal is a single-step proposal, we check <b>if</b> the metadata passed by the client <b>has</b> the <a href="voting.md#0x1_voting_IS_MULTI_STEP_PROPOSAL_IN_EXECUTION_KEY">IS_MULTI_STEP_PROPOSAL_IN_EXECUTION_KEY</a> key.
+        // If they have the key, we will remove it, because a single-step proposal that doesn't need this key.
+    } <b>else</b> <b>if</b> (<a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_contains_key">simple_map::contains_key</a>(&<b>mut</b> metadata, &is_multi_step_in_execution_key)) {
+        <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_remove">simple_map::remove</a>(&<b>mut</b> metadata, &is_multi_step_in_execution_key);
+    };
+
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_add">table::add</a>(&<b>mut</b> voting_forum.proposals, proposal_id, <a href="voting.md#0x1_voting_Proposal">Proposal</a> {
+        proposer,
+        creation_time_secs: <a href="timestamp.md#0x1_timestamp_now_seconds">timestamp::now_seconds</a>(),
+        execution_content: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>&lt;ProposalType&gt;(execution_content),
+        execution_hash,
+        metadata,
+        min_vote_threshold,
+        expiration_secs,
+        early_resolution_vote_threshold,
+        yes_votes: 0,
+        no_votes: 0,
+        is_resolved: <b>false</b>,
+        resolution_time_secs: 0,
+    });
+
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        <a href="event.md#0x1_event_emit">event::emit</a>(
+            <a href="voting.md#0x1_voting_CreateProposal">CreateProposal</a> {
+                proposal_id,
+                early_resolution_vote_threshold,
+                execution_hash,
+                expiration_secs,
+                metadata,
+                min_vote_threshold,
+            },
+        );
+    };
+    <a href="event.md#0x1_event_emit_event">event::emit_event</a>&lt;<a href="voting.md#0x1_voting_CreateProposalEvent">CreateProposalEvent</a>&gt;(
+        &<b>mut</b> voting_forum.events.create_proposal_events,
+        <a href="voting.md#0x1_voting_CreateProposalEvent">CreateProposalEvent</a> {
+            proposal_id,
+            early_resolution_vote_threshold,
+            execution_hash,
+            expiration_secs,
+            metadata,
+            min_vote_threshold,
+        },
+    );
+
+    proposal_id
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_voting_vote"></a>
+
+## Function `vote`
+
+Vote on the given proposal.
+
+@param _proof Required so only the governance module that defines ProposalType can initiate voting.
+This guarantees that voting eligibility and voting power are controlled by the right governance.
+@param voting_forum_address The address of the forum where the proposals are stored.
+@param proposal_id The proposal id.
+@param num_votes Number of votes. Voting power should be calculated by governance.
+@param should_pass Whether the votes are for yes or no.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_vote">vote</a>&lt;ProposalType: store&gt;(_proof: &ProposalType, voting_forum_address: <b>address</b>, proposal_id: u64, num_votes: u64, should_pass: bool)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_vote">vote</a>&lt;ProposalType: store&gt;(
+    _proof: &ProposalType,
+    voting_forum_address: <b>address</b>,
+    proposal_id: u64,
+    num_votes: u64,
+    should_pass: bool,
+) <b>acquires</b> <a href="voting.md#0x1_voting_VotingForum">VotingForum</a> {
+    <b>let</b> voting_forum = <b>borrow_global_mut</b>&lt;<a href="voting.md#0x1_voting_VotingForum">VotingForum</a>&lt;ProposalType&gt;&gt;(voting_forum_address);
+    <b>let</b> proposal = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_borrow_mut">table::borrow_mut</a>(&<b>mut</b> voting_forum.proposals, proposal_id);
+    // Voting might still be possible after the proposal <b>has</b> enough yes votes <b>to</b> be resolved early. This would only
+    // lead <b>to</b> possible proposal resolution failure <b>if</b> the resolve early threshold is not definitive (e.g. &lt; 50% + 1
+    // of the total <a href="voting.md#0x1_voting">voting</a> token's supply). In this case, more <a href="voting.md#0x1_voting">voting</a> might actually still be desirable.
+    // Governance mechanisms built on this <a href="voting.md#0x1_voting">voting</a> <b>module</b> can <b>apply</b> additional rules on when <a href="voting.md#0x1_voting">voting</a> is closed <b>as</b>
+    // appropriate.
+    <b>assert</b>!(!<a href="voting.md#0x1_voting_is_voting_period_over">is_voting_period_over</a>(proposal), <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="voting.md#0x1_voting_EPROPOSAL_VOTING_ALREADY_ENDED">EPROPOSAL_VOTING_ALREADY_ENDED</a>));
+    <b>assert</b>!(!proposal.is_resolved, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="voting.md#0x1_voting_EPROPOSAL_ALREADY_RESOLVED">EPROPOSAL_ALREADY_RESOLVED</a>));
+    // Assert this proposal is single-step, or <b>if</b> the proposal is multi-step, it is not in execution yet.
+    <b>assert</b>!(!<a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_contains_key">simple_map::contains_key</a>(&proposal.metadata, &utf8(<a href="voting.md#0x1_voting_IS_MULTI_STEP_PROPOSAL_IN_EXECUTION_KEY">IS_MULTI_STEP_PROPOSAL_IN_EXECUTION_KEY</a>))
+        || *<a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_borrow">simple_map::borrow</a>(&proposal.metadata, &utf8(<a href="voting.md#0x1_voting_IS_MULTI_STEP_PROPOSAL_IN_EXECUTION_KEY">IS_MULTI_STEP_PROPOSAL_IN_EXECUTION_KEY</a>)) == to_bytes(
+        &<b>false</b>
+    ),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="voting.md#0x1_voting_EMULTI_STEP_PROPOSAL_IN_EXECUTION">EMULTI_STEP_PROPOSAL_IN_EXECUTION</a>));
+
+    <b>if</b> (should_pass) {
+        proposal.yes_votes = proposal.yes_votes + (num_votes <b>as</b> u128);
+    } <b>else</b> {
+        proposal.no_votes = proposal.no_votes + (num_votes <b>as</b> u128);
+    };
+
+    // Record the resolvable time <b>to</b> ensure that resolution <b>has</b> <b>to</b> be done non-atomically.
+    <b>let</b> timestamp_secs_bytes = to_bytes(&<a href="timestamp.md#0x1_timestamp_now_seconds">timestamp::now_seconds</a>());
+    <b>let</b> key = utf8(<a href="voting.md#0x1_voting_RESOLVABLE_TIME_METADATA_KEY">RESOLVABLE_TIME_METADATA_KEY</a>);
+    <b>if</b> (<a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_contains_key">simple_map::contains_key</a>(&proposal.metadata, &key)) {
+        *<a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_borrow_mut">simple_map::borrow_mut</a>(&<b>mut</b> proposal.metadata, &key) = timestamp_secs_bytes;
+    } <b>else</b> {
+        <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_add">simple_map::add</a>(&<b>mut</b> proposal.metadata, key, timestamp_secs_bytes);
+    };
+
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        <a href="event.md#0x1_event_emit">event::emit</a>(<a href="voting.md#0x1_voting_Vote">Vote</a> { proposal_id, num_votes });
+    };
+    <a href="event.md#0x1_event_emit_event">event::emit_event</a>&lt;<a href="voting.md#0x1_voting_VoteEvent">VoteEvent</a>&gt;(
+        &<b>mut</b> voting_forum.events.vote_events,
+        <a href="voting.md#0x1_voting_VoteEvent">VoteEvent</a> { proposal_id, num_votes },
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_voting_is_proposal_resolvable"></a>
+
+## Function `is_proposal_resolvable`
+
+Common checks on if a proposal is resolvable, regardless if the proposal is single-step or multi-step.
+
+
+<pre><code><b>fun</b> <a href="voting.md#0x1_voting_is_proposal_resolvable">is_proposal_resolvable</a>&lt;ProposalType: store&gt;(voting_forum_address: <b>address</b>, proposal_id: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="voting.md#0x1_voting_is_proposal_resolvable">is_proposal_resolvable</a>&lt;ProposalType: store&gt;(
+    voting_forum_address: <b>address</b>,
+    proposal_id: u64,
+) <b>acquires</b> <a href="voting.md#0x1_voting_VotingForum">VotingForum</a> {
+    <b>let</b> proposal_state = <a href="voting.md#0x1_voting_get_proposal_state">get_proposal_state</a>&lt;ProposalType&gt;(voting_forum_address, proposal_id);
+    <b>assert</b>!(proposal_state == <a href="voting.md#0x1_voting_PROPOSAL_STATE_SUCCEEDED">PROPOSAL_STATE_SUCCEEDED</a>, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="voting.md#0x1_voting_EPROPOSAL_CANNOT_BE_RESOLVED">EPROPOSAL_CANNOT_BE_RESOLVED</a>));
+
+    <b>let</b> voting_forum = <b>borrow_global_mut</b>&lt;<a href="voting.md#0x1_voting_VotingForum">VotingForum</a>&lt;ProposalType&gt;&gt;(voting_forum_address);
+    <b>let</b> proposal = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_borrow_mut">table::borrow_mut</a>(&<b>mut</b> voting_forum.proposals, proposal_id);
+    <b>assert</b>!(!proposal.is_resolved, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="voting.md#0x1_voting_EPROPOSAL_ALREADY_RESOLVED">EPROPOSAL_ALREADY_RESOLVED</a>));
+
+    // We need <b>to</b> make sure that the resolution is happening in
+    // a separate transaction from the last vote <b>to</b> guard against <a href="../../../aptos-stdlib/tests/compiler-v2-doc/any.md#0x1_any">any</a> potential flashloan attacks.
+    <b>let</b> resolvable_time = to_u64(*<a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_borrow">simple_map::borrow</a>(&proposal.metadata, &utf8(<a href="voting.md#0x1_voting_RESOLVABLE_TIME_METADATA_KEY">RESOLVABLE_TIME_METADATA_KEY</a>)));
+    <b>assert</b>!(<a href="timestamp.md#0x1_timestamp_now_seconds">timestamp::now_seconds</a>() &gt; resolvable_time, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="voting.md#0x1_voting_ERESOLUTION_CANNOT_BE_ATOMIC">ERESOLUTION_CANNOT_BE_ATOMIC</a>));
+
+    <b>assert</b>!(
+        <a href="transaction_context.md#0x1_transaction_context_get_script_hash">transaction_context::get_script_hash</a>() == proposal.execution_hash,
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="voting.md#0x1_voting_EPROPOSAL_EXECUTION_HASH_NOT_MATCHING">EPROPOSAL_EXECUTION_HASH_NOT_MATCHING</a>),
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_voting_resolve"></a>
+
+## Function `resolve`
+
+Resolve a single-step proposal with given id. Can only be done if there are at least as many votes as min required and
+there are more yes votes than no. If either of these conditions is not met, this will revert.
+
+@param voting_forum_address The address of the forum where the proposals are stored.
+@param proposal_id The proposal id.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_resolve">resolve</a>&lt;ProposalType: store&gt;(voting_forum_address: <b>address</b>, proposal_id: u64): ProposalType
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_resolve">resolve</a>&lt;ProposalType: store&gt;(
+    voting_forum_address: <b>address</b>,
+    proposal_id: u64,
+): ProposalType <b>acquires</b> <a href="voting.md#0x1_voting_VotingForum">VotingForum</a> {
+    <a href="voting.md#0x1_voting_is_proposal_resolvable">is_proposal_resolvable</a>&lt;ProposalType&gt;(voting_forum_address, proposal_id);
+
+    <b>let</b> voting_forum = <b>borrow_global_mut</b>&lt;<a href="voting.md#0x1_voting_VotingForum">VotingForum</a>&lt;ProposalType&gt;&gt;(voting_forum_address);
+    <b>let</b> proposal = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_borrow_mut">table::borrow_mut</a>(&<b>mut</b> voting_forum.proposals, proposal_id);
+
+    // Assert that the specified proposal is not a multi-step proposal.
+    <b>let</b> multi_step_key = utf8(<a href="voting.md#0x1_voting_IS_MULTI_STEP_PROPOSAL_KEY">IS_MULTI_STEP_PROPOSAL_KEY</a>);
+    <b>let</b> has_multi_step_key = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_contains_key">simple_map::contains_key</a>(&proposal.metadata, &multi_step_key);
+    <b>if</b> (has_multi_step_key) {
+        <b>let</b> is_multi_step_proposal = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_to_bool">from_bcs::to_bool</a>(*<a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_borrow">simple_map::borrow</a>(&proposal.metadata, &multi_step_key));
+        <b>assert</b>!(
+            !is_multi_step_proposal,
+            <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="voting.md#0x1_voting_EMULTI_STEP_PROPOSAL_CANNOT_USE_SINGLE_STEP_RESOLVE_FUNCTION">EMULTI_STEP_PROPOSAL_CANNOT_USE_SINGLE_STEP_RESOLVE_FUNCTION</a>)
+        );
+    };
+
+    <b>let</b> resolved_early = <a href="voting.md#0x1_voting_can_be_resolved_early">can_be_resolved_early</a>(proposal);
+    proposal.is_resolved = <b>true</b>;
+    proposal.resolution_time_secs = <a href="timestamp.md#0x1_timestamp_now_seconds">timestamp::now_seconds</a>();
+
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        <a href="event.md#0x1_event_emit">event::emit</a>(
+            <a href="voting.md#0x1_voting_ResolveProposal">ResolveProposal</a> {
+                proposal_id,
+                yes_votes: proposal.yes_votes,
+                no_votes: proposal.no_votes,
+                resolved_early,
+            },
+        );
+    };
+    <a href="event.md#0x1_event_emit_event">event::emit_event</a>&lt;<a href="voting.md#0x1_voting_ResolveProposal">ResolveProposal</a>&gt;(
+        &<b>mut</b> voting_forum.events.resolve_proposal_events,
+        <a href="voting.md#0x1_voting_ResolveProposal">ResolveProposal</a> {
+            proposal_id,
+            yes_votes: proposal.yes_votes,
+            no_votes: proposal.no_votes,
+            resolved_early,
+        },
+    );
+
+    <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_extract">option::extract</a>(&<b>mut</b> proposal.execution_content)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_voting_resolve_proposal_v2"></a>
+
+## Function `resolve_proposal_v2`
+
+Resolve a single-step or a multi-step proposal with the given id.
+Can only be done if there are at least as many votes as min required and
+there are more yes votes than no. If either of these conditions is not met, this will revert.
+
+
+@param voting_forum_address The address of the forum where the proposals are stored.
+@param proposal_id The proposal id.
+@param next_execution_hash The next execution hash if the given proposal is multi-step.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_resolve_proposal_v2">resolve_proposal_v2</a>&lt;ProposalType: store&gt;(voting_forum_address: <b>address</b>, proposal_id: u64, next_execution_hash: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_resolve_proposal_v2">resolve_proposal_v2</a>&lt;ProposalType: store&gt;(
+    voting_forum_address: <b>address</b>,
+    proposal_id: u64,
+    next_execution_hash: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+) <b>acquires</b> <a href="voting.md#0x1_voting_VotingForum">VotingForum</a> {
+    <a href="voting.md#0x1_voting_is_proposal_resolvable">is_proposal_resolvable</a>&lt;ProposalType&gt;(voting_forum_address, proposal_id);
+
+    <b>let</b> voting_forum = <b>borrow_global_mut</b>&lt;<a href="voting.md#0x1_voting_VotingForum">VotingForum</a>&lt;ProposalType&gt;&gt;(voting_forum_address);
+    <b>let</b> proposal = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_borrow_mut">table::borrow_mut</a>(&<b>mut</b> voting_forum.proposals, proposal_id);
+
+    // Update the <a href="voting.md#0x1_voting_IS_MULTI_STEP_PROPOSAL_IN_EXECUTION_KEY">IS_MULTI_STEP_PROPOSAL_IN_EXECUTION_KEY</a> key <b>to</b> indicate that the multi-step proposal is in execution.
+    <b>let</b> multi_step_in_execution_key = utf8(<a href="voting.md#0x1_voting_IS_MULTI_STEP_PROPOSAL_IN_EXECUTION_KEY">IS_MULTI_STEP_PROPOSAL_IN_EXECUTION_KEY</a>);
+    <b>if</b> (<a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_contains_key">simple_map::contains_key</a>(&proposal.metadata, &multi_step_in_execution_key)) {
+        <b>let</b> is_multi_step_proposal_in_execution_value = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_borrow_mut">simple_map::borrow_mut</a>(
+            &<b>mut</b> proposal.metadata,
+            &multi_step_in_execution_key
+        );
+        *is_multi_step_proposal_in_execution_value = to_bytes(&<b>true</b>);
+    };
+
+    <b>let</b> multi_step_key = utf8(<a href="voting.md#0x1_voting_IS_MULTI_STEP_PROPOSAL_KEY">IS_MULTI_STEP_PROPOSAL_KEY</a>);
+    <b>let</b> is_multi_step = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_contains_key">simple_map::contains_key</a>(&proposal.metadata, &multi_step_key) && <a href="../../../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_to_bool">from_bcs::to_bool</a>(
+        *<a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_borrow">simple_map::borrow</a>(&proposal.metadata, &multi_step_key)
+    );
+    <b>let</b> next_execution_hash_is_empty = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&next_execution_hash) == 0;
+
+    // Assert that <b>if</b> this proposal is single-step, the `next_execution_hash` parameter is empty.
+    <b>assert</b>!(
+        is_multi_step || next_execution_hash_is_empty,
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="voting.md#0x1_voting_ESINGLE_STEP_PROPOSAL_CANNOT_HAVE_NEXT_EXECUTION_HASH">ESINGLE_STEP_PROPOSAL_CANNOT_HAVE_NEXT_EXECUTION_HASH</a>)
+    );
+
+    // If the `next_execution_hash` parameter is empty, it means that either
+    // - this proposal is a single-step proposal, or
+    // - this proposal is multi-step and we're currently resolving the last step in the multi-step proposal.
+    // We can mark that this proposal is resolved.
+    <b>if</b> (next_execution_hash_is_empty) {
+        proposal.is_resolved = <b>true</b>;
+        proposal.resolution_time_secs = <a href="timestamp.md#0x1_timestamp_now_seconds">timestamp::now_seconds</a>();
+
+        // Set the `<a href="voting.md#0x1_voting_IS_MULTI_STEP_PROPOSAL_IN_EXECUTION_KEY">IS_MULTI_STEP_PROPOSAL_IN_EXECUTION_KEY</a>` value <b>to</b> <b>false</b> upon successful resolution of the last step of a multi-step proposal.
+        <b>if</b> (is_multi_step) {
+            <b>let</b> is_multi_step_proposal_in_execution_value = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_borrow_mut">simple_map::borrow_mut</a>(
+                &<b>mut</b> proposal.metadata,
+                &multi_step_in_execution_key
+            );
+            *is_multi_step_proposal_in_execution_value = to_bytes(&<b>false</b>);
+        };
+    } <b>else</b> {
+        // If the current step is not the last step,
+        // <b>update</b> the proposal's execution <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/hash.md#0x1_hash">hash</a> on-chain <b>to</b> the execution <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/hash.md#0x1_hash">hash</a> of the next step.
+        proposal.execution_hash = next_execution_hash;
+    };
+
+    // For single-step proposals, we emit one `<a href="voting.md#0x1_voting_ResolveProposal">ResolveProposal</a>` <a href="event.md#0x1_event">event</a> per proposal.
+    // For multi-step proposals, we emit one `<a href="voting.md#0x1_voting_ResolveProposal">ResolveProposal</a>` <a href="event.md#0x1_event">event</a> per step in the multi-step proposal. This means
+    // that we emit multiple `<a href="voting.md#0x1_voting_ResolveProposal">ResolveProposal</a>` events for the same multi-step proposal.
+    <b>let</b> resolved_early = <a href="voting.md#0x1_voting_can_be_resolved_early">can_be_resolved_early</a>(proposal);
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        <a href="event.md#0x1_event_emit">event::emit</a>(
+            <a href="voting.md#0x1_voting_ResolveProposal">ResolveProposal</a> {
+                proposal_id,
+                yes_votes: proposal.yes_votes,
+                no_votes: proposal.no_votes,
+                resolved_early,
+            },
+        );
+    };
+    <a href="event.md#0x1_event_emit_event">event::emit_event</a>(
+        &<b>mut</b> voting_forum.events.resolve_proposal_events,
+        <a href="voting.md#0x1_voting_ResolveProposal">ResolveProposal</a> {
+            proposal_id,
+            yes_votes: proposal.yes_votes,
+            no_votes: proposal.no_votes,
+            resolved_early,
+        },
+    );
+
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_voting_next_proposal_id"></a>
+
+## Function `next_proposal_id`
+
+Return the next unassigned proposal id
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_next_proposal_id">next_proposal_id</a>&lt;ProposalType: store&gt;(voting_forum_address: <b>address</b>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_next_proposal_id">next_proposal_id</a>&lt;ProposalType: store&gt;(voting_forum_address: <b>address</b>, ): u64 <b>acquires</b> <a href="voting.md#0x1_voting_VotingForum">VotingForum</a> {
+    <b>let</b> voting_forum = <b>borrow_global</b>&lt;<a href="voting.md#0x1_voting_VotingForum">VotingForum</a>&lt;ProposalType&gt;&gt;(voting_forum_address);
+    voting_forum.next_proposal_id
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_voting_get_proposer"></a>
+
+## Function `get_proposer`
+
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_get_proposer">get_proposer</a>&lt;ProposalType: store&gt;(voting_forum_address: <b>address</b>, proposal_id: u64): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_get_proposer">get_proposer</a>&lt;ProposalType: store&gt;(
+    voting_forum_address: <b>address</b>,
+    proposal_id: u64
+): <b>address</b> <b>acquires</b> <a href="voting.md#0x1_voting_VotingForum">VotingForum</a> {
+    <b>let</b> proposal = <a href="voting.md#0x1_voting_get_proposal">get_proposal</a>&lt;ProposalType&gt;(voting_forum_address, proposal_id);
+    proposal.proposer
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_voting_is_voting_closed"></a>
+
+## Function `is_voting_closed`
+
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_is_voting_closed">is_voting_closed</a>&lt;ProposalType: store&gt;(voting_forum_address: <b>address</b>, proposal_id: u64): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_is_voting_closed">is_voting_closed</a>&lt;ProposalType: store&gt;(
+    voting_forum_address: <b>address</b>,
+    proposal_id: u64
+): bool <b>acquires</b> <a href="voting.md#0x1_voting_VotingForum">VotingForum</a> {
+    <b>let</b> proposal = <a href="voting.md#0x1_voting_get_proposal">get_proposal</a>&lt;ProposalType&gt;(voting_forum_address, proposal_id);
+    <a href="voting.md#0x1_voting_can_be_resolved_early">can_be_resolved_early</a>(proposal) || <a href="voting.md#0x1_voting_is_voting_period_over">is_voting_period_over</a>(proposal)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_voting_can_be_resolved_early"></a>
+
+## Function `can_be_resolved_early`
+
+Return true if the proposal has reached early resolution threshold (if specified).
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_can_be_resolved_early">can_be_resolved_early</a>&lt;ProposalType: store&gt;(proposal: &<a href="voting.md#0x1_voting_Proposal">voting::Proposal</a>&lt;ProposalType&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_can_be_resolved_early">can_be_resolved_early</a>&lt;ProposalType: store&gt;(proposal: &<a href="voting.md#0x1_voting_Proposal">Proposal</a>&lt;ProposalType&gt;): bool {
+    <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&proposal.early_resolution_vote_threshold)) {
+        <b>let</b> early_resolution_threshold = *<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(&proposal.early_resolution_vote_threshold);
+        <b>if</b> (proposal.yes_votes &gt;= early_resolution_threshold || proposal.no_votes &gt;= early_resolution_threshold) {
+            <b>return</b> <b>true</b>
+        };
+    };
+    <b>false</b>
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_voting_get_proposal_metadata"></a>
+
+## Function `get_proposal_metadata`
+
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_get_proposal_metadata">get_proposal_metadata</a>&lt;ProposalType: store&gt;(voting_forum_address: <b>address</b>, proposal_id: u64): <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_get_proposal_metadata">get_proposal_metadata</a>&lt;ProposalType: store&gt;(
+    voting_forum_address: <b>address</b>,
+    proposal_id: u64,
+): SimpleMap&lt;String, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt; <b>acquires</b> <a href="voting.md#0x1_voting_VotingForum">VotingForum</a> {
+    <b>let</b> proposal = <a href="voting.md#0x1_voting_get_proposal">get_proposal</a>&lt;ProposalType&gt;(voting_forum_address, proposal_id);
+    proposal.metadata
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_voting_get_proposal_metadata_value"></a>
+
+## Function `get_proposal_metadata_value`
+
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_get_proposal_metadata_value">get_proposal_metadata_value</a>&lt;ProposalType: store&gt;(voting_forum_address: <b>address</b>, proposal_id: u64, metadata_key: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_get_proposal_metadata_value">get_proposal_metadata_value</a>&lt;ProposalType: store&gt;(
+    voting_forum_address: <b>address</b>,
+    proposal_id: u64,
+    metadata_key: String,
+): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; <b>acquires</b> <a href="voting.md#0x1_voting_VotingForum">VotingForum</a> {
+    <b>let</b> proposal = <a href="voting.md#0x1_voting_get_proposal">get_proposal</a>&lt;ProposalType&gt;(voting_forum_address, proposal_id);
+    *<a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_borrow">simple_map::borrow</a>(&proposal.metadata, &metadata_key)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_voting_get_proposal_state"></a>
+
+## Function `get_proposal_state`
+
+Return the state of the proposal with given id.
+
+@param voting_forum_address The address of the forum where the proposals are stored.
+@param proposal_id The proposal id.
+@return Proposal state as an enum value.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_get_proposal_state">get_proposal_state</a>&lt;ProposalType: store&gt;(voting_forum_address: <b>address</b>, proposal_id: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_get_proposal_state">get_proposal_state</a>&lt;ProposalType: store&gt;(
+    voting_forum_address: <b>address</b>,
+    proposal_id: u64,
+): u64 <b>acquires</b> <a href="voting.md#0x1_voting_VotingForum">VotingForum</a> {
+    <b>if</b> (<a href="voting.md#0x1_voting_is_voting_closed">is_voting_closed</a>&lt;ProposalType&gt;(voting_forum_address, proposal_id)) {
+        <b>let</b> proposal = <a href="voting.md#0x1_voting_get_proposal">get_proposal</a>&lt;ProposalType&gt;(voting_forum_address, proposal_id);
+        <b>let</b> yes_votes = proposal.yes_votes;
+        <b>let</b> no_votes = proposal.no_votes;
+
+        <b>if</b> (yes_votes &gt; no_votes && yes_votes + no_votes &gt;= proposal.min_vote_threshold) {
+            <a href="voting.md#0x1_voting_PROPOSAL_STATE_SUCCEEDED">PROPOSAL_STATE_SUCCEEDED</a>
+        } <b>else</b> {
+            <a href="voting.md#0x1_voting_PROPOSAL_STATE_FAILED">PROPOSAL_STATE_FAILED</a>
+        }
+    } <b>else</b> {
+        <a href="voting.md#0x1_voting_PROPOSAL_STATE_PENDING">PROPOSAL_STATE_PENDING</a>
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_voting_get_proposal_creation_secs"></a>
+
+## Function `get_proposal_creation_secs`
+
+Return the proposal's creation time.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_get_proposal_creation_secs">get_proposal_creation_secs</a>&lt;ProposalType: store&gt;(voting_forum_address: <b>address</b>, proposal_id: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_get_proposal_creation_secs">get_proposal_creation_secs</a>&lt;ProposalType: store&gt;(
+    voting_forum_address: <b>address</b>,
+    proposal_id: u64,
+): u64 <b>acquires</b> <a href="voting.md#0x1_voting_VotingForum">VotingForum</a> {
+    <b>let</b> proposal = <a href="voting.md#0x1_voting_get_proposal">get_proposal</a>&lt;ProposalType&gt;(voting_forum_address, proposal_id);
+    proposal.creation_time_secs
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_voting_get_proposal_expiration_secs"></a>
+
+## Function `get_proposal_expiration_secs`
+
+Return the proposal's expiration time.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_get_proposal_expiration_secs">get_proposal_expiration_secs</a>&lt;ProposalType: store&gt;(voting_forum_address: <b>address</b>, proposal_id: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_get_proposal_expiration_secs">get_proposal_expiration_secs</a>&lt;ProposalType: store&gt;(
+    voting_forum_address: <b>address</b>,
+    proposal_id: u64,
+): u64 <b>acquires</b> <a href="voting.md#0x1_voting_VotingForum">VotingForum</a> {
+    <b>let</b> proposal = <a href="voting.md#0x1_voting_get_proposal">get_proposal</a>&lt;ProposalType&gt;(voting_forum_address, proposal_id);
+    proposal.expiration_secs
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_voting_get_execution_hash"></a>
+
+## Function `get_execution_hash`
+
+Return the proposal's execution hash.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_get_execution_hash">get_execution_hash</a>&lt;ProposalType: store&gt;(voting_forum_address: <b>address</b>, proposal_id: u64): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_get_execution_hash">get_execution_hash</a>&lt;ProposalType: store&gt;(
+    voting_forum_address: <b>address</b>,
+    proposal_id: u64,
+): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; <b>acquires</b> <a href="voting.md#0x1_voting_VotingForum">VotingForum</a> {
+    <b>let</b> proposal = <a href="voting.md#0x1_voting_get_proposal">get_proposal</a>&lt;ProposalType&gt;(voting_forum_address, proposal_id);
+    proposal.execution_hash
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_voting_get_min_vote_threshold"></a>
+
+## Function `get_min_vote_threshold`
+
+Return the proposal's minimum vote threshold
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_get_min_vote_threshold">get_min_vote_threshold</a>&lt;ProposalType: store&gt;(voting_forum_address: <b>address</b>, proposal_id: u64): u128
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_get_min_vote_threshold">get_min_vote_threshold</a>&lt;ProposalType: store&gt;(
+    voting_forum_address: <b>address</b>,
+    proposal_id: u64,
+): u128 <b>acquires</b> <a href="voting.md#0x1_voting_VotingForum">VotingForum</a> {
+    <b>let</b> proposal = <a href="voting.md#0x1_voting_get_proposal">get_proposal</a>&lt;ProposalType&gt;(voting_forum_address, proposal_id);
+    proposal.min_vote_threshold
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_voting_get_early_resolution_vote_threshold"></a>
+
+## Function `get_early_resolution_vote_threshold`
+
+Return the proposal's early resolution minimum vote threshold (optionally set)
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_get_early_resolution_vote_threshold">get_early_resolution_vote_threshold</a>&lt;ProposalType: store&gt;(voting_forum_address: <b>address</b>, proposal_id: u64): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;u128&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_get_early_resolution_vote_threshold">get_early_resolution_vote_threshold</a>&lt;ProposalType: store&gt;(
+    voting_forum_address: <b>address</b>,
+    proposal_id: u64,
+): Option&lt;u128&gt; <b>acquires</b> <a href="voting.md#0x1_voting_VotingForum">VotingForum</a> {
+    <b>let</b> proposal = <a href="voting.md#0x1_voting_get_proposal">get_proposal</a>&lt;ProposalType&gt;(voting_forum_address, proposal_id);
+    proposal.early_resolution_vote_threshold
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_voting_get_votes"></a>
+
+## Function `get_votes`
+
+Return the proposal's current vote count (yes_votes, no_votes)
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_get_votes">get_votes</a>&lt;ProposalType: store&gt;(voting_forum_address: <b>address</b>, proposal_id: u64): (u128, u128)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_get_votes">get_votes</a>&lt;ProposalType: store&gt;(
+    voting_forum_address: <b>address</b>,
+    proposal_id: u64,
+): (u128, u128) <b>acquires</b> <a href="voting.md#0x1_voting_VotingForum">VotingForum</a> {
+    <b>let</b> proposal = <a href="voting.md#0x1_voting_get_proposal">get_proposal</a>&lt;ProposalType&gt;(voting_forum_address, proposal_id);
+    (proposal.yes_votes, proposal.no_votes)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_voting_is_resolved"></a>
+
+## Function `is_resolved`
+
+Return true if the governance proposal has already been resolved.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_is_resolved">is_resolved</a>&lt;ProposalType: store&gt;(voting_forum_address: <b>address</b>, proposal_id: u64): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_is_resolved">is_resolved</a>&lt;ProposalType: store&gt;(
+    voting_forum_address: <b>address</b>,
+    proposal_id: u64,
+): bool <b>acquires</b> <a href="voting.md#0x1_voting_VotingForum">VotingForum</a> {
+    <b>let</b> proposal = <a href="voting.md#0x1_voting_get_proposal">get_proposal</a>&lt;ProposalType&gt;(voting_forum_address, proposal_id);
+    proposal.is_resolved
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_voting_get_resolution_time_secs"></a>
+
+## Function `get_resolution_time_secs`
+
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_get_resolution_time_secs">get_resolution_time_secs</a>&lt;ProposalType: store&gt;(voting_forum_address: <b>address</b>, proposal_id: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_get_resolution_time_secs">get_resolution_time_secs</a>&lt;ProposalType: store&gt;(
+    voting_forum_address: <b>address</b>,
+    proposal_id: u64,
+): u64 <b>acquires</b> <a href="voting.md#0x1_voting_VotingForum">VotingForum</a> {
+    <b>let</b> proposal = <a href="voting.md#0x1_voting_get_proposal">get_proposal</a>&lt;ProposalType&gt;(voting_forum_address, proposal_id);
+    proposal.resolution_time_secs
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_voting_is_multi_step_proposal_in_execution"></a>
+
+## Function `is_multi_step_proposal_in_execution`
+
+Return true if the multi-step governance proposal is in execution.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_is_multi_step_proposal_in_execution">is_multi_step_proposal_in_execution</a>&lt;ProposalType: store&gt;(voting_forum_address: <b>address</b>, proposal_id: u64): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_is_multi_step_proposal_in_execution">is_multi_step_proposal_in_execution</a>&lt;ProposalType: store&gt;(
+    voting_forum_address: <b>address</b>,
+    proposal_id: u64,
+): bool <b>acquires</b> <a href="voting.md#0x1_voting_VotingForum">VotingForum</a> {
+    <b>let</b> voting_forum = <b>borrow_global</b>&lt;<a href="voting.md#0x1_voting_VotingForum">VotingForum</a>&lt;ProposalType&gt;&gt;(voting_forum_address);
+    <b>let</b> proposal = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_borrow">table::borrow</a>(&voting_forum.proposals, proposal_id);
+    <b>let</b> is_multi_step_in_execution_key = utf8(<a href="voting.md#0x1_voting_IS_MULTI_STEP_PROPOSAL_IN_EXECUTION_KEY">IS_MULTI_STEP_PROPOSAL_IN_EXECUTION_KEY</a>);
+    <b>assert</b>!(
+        <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_contains_key">simple_map::contains_key</a>(&proposal.metadata, &is_multi_step_in_execution_key),
+        <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="voting.md#0x1_voting_EPROPOSAL_IS_SINGLE_STEP">EPROPOSAL_IS_SINGLE_STEP</a>)
+    );
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_to_bool">from_bcs::to_bool</a>(*<a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_borrow">simple_map::borrow</a>(&proposal.metadata, &is_multi_step_in_execution_key))
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_voting_is_voting_period_over"></a>
+
+## Function `is_voting_period_over`
+
+Return true if the voting period of the given proposal has already ended.
+
+
+<pre><code><b>fun</b> <a href="voting.md#0x1_voting_is_voting_period_over">is_voting_period_over</a>&lt;ProposalType: store&gt;(proposal: &<a href="voting.md#0x1_voting_Proposal">voting::Proposal</a>&lt;ProposalType&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="voting.md#0x1_voting_is_voting_period_over">is_voting_period_over</a>&lt;ProposalType: store&gt;(proposal: &<a href="voting.md#0x1_voting_Proposal">Proposal</a>&lt;ProposalType&gt;): bool {
+    <a href="timestamp.md#0x1_timestamp_now_seconds">timestamp::now_seconds</a>() &gt; proposal.expiration_secs
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_voting_get_proposal"></a>
+
+## Function `get_proposal`
+
+
+
+<pre><code><b>fun</b> <a href="voting.md#0x1_voting_get_proposal">get_proposal</a>&lt;ProposalType: store&gt;(voting_forum_address: <b>address</b>, proposal_id: u64): &<a href="voting.md#0x1_voting_Proposal">voting::Proposal</a>&lt;ProposalType&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="voting.md#0x1_voting_get_proposal">get_proposal</a>&lt;ProposalType: store&gt;(
+    voting_forum_address: <b>address</b>,
+    proposal_id: u64,
+): &<a href="voting.md#0x1_voting_Proposal">Proposal</a>&lt;ProposalType&gt; <b>acquires</b> <a href="voting.md#0x1_voting_VotingForum">VotingForum</a> {
+    <b>let</b> voting_forum = <b>borrow_global</b>&lt;<a href="voting.md#0x1_voting_VotingForum">VotingForum</a>&lt;ProposalType&gt;&gt;(voting_forum_address);
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_borrow">table::borrow</a>(&voting_forum.proposals, proposal_id)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+
+
+<a id="high-level-req"></a>
+
+### High-level Requirements
+
+<table>
+<tr>
+<th>No.</th><th>Requirement</th><th>Criticality</th><th>Implementation</th><th>Enforcement</th>
+</tr>
+
+<tr>
+<td>1</td>
+<td>The proposal ID in a voting forum is unique and always increases monotonically with each new proposal created for that voting forum.</td>
+<td>High</td>
+<td>The create_proposal and create_proposal_v2 create a new proposal with a unique ID derived from the voting_forum's next_proposal_id incrementally.</td>
+<td>Formally verified via <a href="#high-level-req-1">create_proposal</a>.</td>
+</tr>
+
+<tr>
+<td>2</td>
+<td>While voting, it ensures that only the governance module that defines ProposalType may initiate voting and that the proposal under vote exists in the specified voting forum.</td>
+<td>Critical</td>
+<td>The vote function verifies the eligibility and validity of a proposal before allowing voting. It ensures that only the correct governance module initiates voting. The function checks if the proposal is currently eligible for voting by confirming it has not resolved and the voting period has not ended.</td>
+<td>Formally verified via <a href="#high-level-req-2">vote</a>.</td>
+</tr>
+
+<tr>
+<td>3</td>
+<td>After resolving a single-step proposal, the corresponding proposal is guaranteed to be marked as successfully resolved.</td>
+<td>High</td>
+<td>Upon invoking the resolve function on a proposal, it undergoes a series of checks to ensure its validity. These include verifying if the proposal exists, is a single-step proposal, and meets the criteria for resolution. If the checks pass, the proposal's is_resolved flag becomes true, indicating a successful resolution.</td>
+<td>Formally verified via <a href="#high-level-req-3">resolve</a>.</td>
+</tr>
+
+<tr>
+<td>4</td>
+<td>In the context of v2 proposal resolving, both single-step and multi-step proposals are accurately handled. It ensures that for single-step proposals, the next execution hash is empty and resolves the proposal, while for multi-step proposals, it guarantees that the next execution hash corresponds to the hash of the next step, maintaining the integrity of the proposal execution sequence.</td>
+<td>Medium</td>
+<td>The function resolve_proposal_v2 correctly handles both single-step and multi-step proposals. For single-step proposals, it ensures that the next_execution_hash parameter is empty and resolves the proposal. For multi-step proposals, it ensures that the next_execution_hash parameter contains the hash of the next step.</td>
+<td>Formally verified via <a href="#high-level-req-4">resolve_proposal_v2</a>.</td>
+</tr>
+
+</table>
+
+
+
+<a id="module-level-spec"></a>
+
+### Module-level Specification
+
+
+<pre><code><b>pragma</b> verify = <b>true</b>;
+<b>pragma</b> aborts_if_is_strict;
+</code></pre>
+
+
+
+<a id="@Specification_1_register"></a>
+
+### Function `register`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_register">register</a>&lt;ProposalType: store&gt;(<a href="account.md#0x1_account">account</a>: &<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> addr = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="account.md#0x1_account">account</a>);
+<b>aborts_if</b> <b>exists</b>&lt;<a href="voting.md#0x1_voting_VotingForum">VotingForum</a>&lt;ProposalType&gt;&gt;(addr);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(addr);
+<b>let</b> register_account = <b>global</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(addr);
+<b>aborts_if</b> register_account.guid_creation_num + 4 &gt;= <a href="account.md#0x1_account_MAX_GUID_CREATION_NUM">account::MAX_GUID_CREATION_NUM</a>;
+<b>aborts_if</b> register_account.guid_creation_num + 4 &gt; MAX_U64;
+<b>aborts_if</b> !<a href="../../../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_spec_is_struct">type_info::spec_is_struct</a>&lt;ProposalType&gt;();
+<b>ensures</b> <b>exists</b>&lt;<a href="voting.md#0x1_voting_VotingForum">VotingForum</a>&lt;ProposalType&gt;&gt;(addr);
+</code></pre>
+
+
+
+<a id="@Specification_1_create_proposal"></a>
+
+### Function `create_proposal`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_create_proposal">create_proposal</a>&lt;ProposalType: store&gt;(proposer: <b>address</b>, voting_forum_address: <b>address</b>, execution_content: ProposalType, execution_hash: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, min_vote_threshold: u128, expiration_secs: u64, early_resolution_vote_threshold: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;u128&gt;, metadata: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;): u64
+</code></pre>
+
+
+
+
+<pre><code><b>requires</b> <a href="chain_status.md#0x1_chain_status_is_operating">chain_status::is_operating</a>();
+<b>include</b> <a href="voting.md#0x1_voting_CreateProposalAbortsIfAndEnsures">CreateProposalAbortsIfAndEnsures</a>&lt;ProposalType&gt;{is_multi_step_proposal: <b>false</b>};
+// This enforces <a id="high-level-req-1" href="#high-level-req">high-level requirement 1</a>:
+<b>ensures</b> result == <b>old</b>(<b>global</b>&lt;<a href="voting.md#0x1_voting_VotingForum">VotingForum</a>&lt;ProposalType&gt;&gt;(voting_forum_address)).next_proposal_id;
+</code></pre>
+
+
+
+<a id="@Specification_1_create_proposal_v2"></a>
+
+### Function `create_proposal_v2`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_create_proposal_v2">create_proposal_v2</a>&lt;ProposalType: store&gt;(proposer: <b>address</b>, voting_forum_address: <b>address</b>, execution_content: ProposalType, execution_hash: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, min_vote_threshold: u128, expiration_secs: u64, early_resolution_vote_threshold: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;u128&gt;, metadata: <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;, is_multi_step_proposal: bool): u64
+</code></pre>
+
+
+
+
+<pre><code><b>requires</b> <a href="chain_status.md#0x1_chain_status_is_operating">chain_status::is_operating</a>();
+<b>include</b> <a href="voting.md#0x1_voting_CreateProposalAbortsIfAndEnsures">CreateProposalAbortsIfAndEnsures</a>&lt;ProposalType&gt;;
+<b>ensures</b> result == <b>old</b>(<b>global</b>&lt;<a href="voting.md#0x1_voting_VotingForum">VotingForum</a>&lt;ProposalType&gt;&gt;(voting_forum_address)).next_proposal_id;
+</code></pre>
+
+
+
+
+<a id="0x1_voting_CreateProposalAbortsIfAndEnsures"></a>
+
+
+<pre><code><b>schema</b> <a href="voting.md#0x1_voting_CreateProposalAbortsIfAndEnsures">CreateProposalAbortsIfAndEnsures</a>&lt;ProposalType&gt; {
+    voting_forum_address: <b>address</b>;
+    execution_hash: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+    min_vote_threshold: u128;
+    early_resolution_vote_threshold: Option&lt;u128&gt;;
+    metadata: SimpleMap&lt;String, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;;
+    is_multi_step_proposal: bool;
+    <b>let</b> voting_forum = <b>global</b>&lt;<a href="voting.md#0x1_voting_VotingForum">VotingForum</a>&lt;ProposalType&gt;&gt;(voting_forum_address);
+    <b>let</b> proposal_id = voting_forum.next_proposal_id;
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="voting.md#0x1_voting_VotingForum">VotingForum</a>&lt;ProposalType&gt;&gt;(voting_forum_address);
+    <b>aborts_if</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_contains">table::spec_contains</a>(voting_forum.proposals,proposal_id);
+    <b>aborts_if</b> len(early_resolution_vote_threshold.vec) != 0 && min_vote_threshold &gt; early_resolution_vote_threshold.vec[0];
+    <b>aborts_if</b> !std::string::spec_internal_check_utf8(<a href="voting.md#0x1_voting_IS_MULTI_STEP_PROPOSAL_KEY">IS_MULTI_STEP_PROPOSAL_KEY</a>);
+    <b>aborts_if</b> !std::string::spec_internal_check_utf8(<a href="voting.md#0x1_voting_IS_MULTI_STEP_PROPOSAL_IN_EXECUTION_KEY">IS_MULTI_STEP_PROPOSAL_IN_EXECUTION_KEY</a>);
+    <b>aborts_if</b> len(execution_hash) == 0;
+    <b>let</b> execution_key = std::string::spec_utf8(<a href="voting.md#0x1_voting_IS_MULTI_STEP_PROPOSAL_KEY">IS_MULTI_STEP_PROPOSAL_KEY</a>);
+    <b>aborts_if</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(metadata, execution_key);
+    <b>aborts_if</b> voting_forum.next_proposal_id + 1 &gt; MAX_U64;
+    <b>let</b> is_multi_step_in_execution_key = std::string::spec_utf8(<a href="voting.md#0x1_voting_IS_MULTI_STEP_PROPOSAL_IN_EXECUTION_KEY">IS_MULTI_STEP_PROPOSAL_IN_EXECUTION_KEY</a>);
+    <b>aborts_if</b> is_multi_step_proposal && <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(metadata, is_multi_step_in_execution_key);
+    <b>let</b> <b>post</b> post_voting_forum = <b>global</b>&lt;<a href="voting.md#0x1_voting_VotingForum">VotingForum</a>&lt;ProposalType&gt;&gt;(voting_forum_address);
+    <b>let</b> <b>post</b> post_metadata = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(post_voting_forum.proposals, proposal_id).metadata;
+    <b>ensures</b> post_voting_forum.next_proposal_id == voting_forum.next_proposal_id + 1;
+    <b>ensures</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_contains">table::spec_contains</a>(post_voting_forum.proposals, proposal_id);
+    <b>ensures</b> <b>if</b> (is_multi_step_proposal) {
+        <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(post_metadata, is_multi_step_in_execution_key) == std::bcs::serialize(<b>false</b>)
+    } <b>else</b> {
+        !<a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(post_metadata, is_multi_step_in_execution_key)
+    };
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_vote"></a>
+
+### Function `vote`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_vote">vote</a>&lt;ProposalType: store&gt;(_proof: &ProposalType, voting_forum_address: <b>address</b>, proposal_id: u64, num_votes: u64, should_pass: bool)
+</code></pre>
+
+
+
+
+<pre><code><b>requires</b> <a href="chain_status.md#0x1_chain_status_is_operating">chain_status::is_operating</a>();
+// This enforces <a id="high-level-req-2" href="#high-level-req">high-level requirement 2</a>:
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="voting.md#0x1_voting_VotingForum">VotingForum</a>&lt;ProposalType&gt;&gt;(voting_forum_address);
+<b>let</b> voting_forum = <b>global</b>&lt;<a href="voting.md#0x1_voting_VotingForum">VotingForum</a>&lt;ProposalType&gt;&gt;(voting_forum_address);
+<b>let</b> proposal = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(voting_forum.proposals, proposal_id);
+<b>aborts_if</b> !<a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_contains">table::spec_contains</a>(voting_forum.proposals, proposal_id);
+<b>aborts_if</b> <a href="voting.md#0x1_voting_is_voting_period_over">is_voting_period_over</a>(proposal);
+<b>aborts_if</b> proposal.is_resolved;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="timestamp.md#0x1_timestamp_CurrentTimeMicroseconds">timestamp::CurrentTimeMicroseconds</a>&gt;(@aptos_framework);
+<b>aborts_if</b> !std::string::spec_internal_check_utf8(<a href="voting.md#0x1_voting_IS_MULTI_STEP_PROPOSAL_IN_EXECUTION_KEY">IS_MULTI_STEP_PROPOSAL_IN_EXECUTION_KEY</a>);
+<b>let</b> execution_key = std::string::spec_utf8(<a href="voting.md#0x1_voting_IS_MULTI_STEP_PROPOSAL_IN_EXECUTION_KEY">IS_MULTI_STEP_PROPOSAL_IN_EXECUTION_KEY</a>);
+<b>aborts_if</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(proposal.metadata, execution_key) &&
+          <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(proposal.metadata, execution_key) != std::bcs::serialize(<b>false</b>);
+<b>aborts_if</b> <b>if</b> (should_pass) { proposal.yes_votes + num_votes &gt; MAX_U128 } <b>else</b> { proposal.no_votes + num_votes &gt; MAX_U128 };
+<b>aborts_if</b> !std::string::spec_internal_check_utf8(<a href="voting.md#0x1_voting_RESOLVABLE_TIME_METADATA_KEY">RESOLVABLE_TIME_METADATA_KEY</a>);
+<b>let</b> <b>post</b> post_voting_forum = <b>global</b>&lt;<a href="voting.md#0x1_voting_VotingForum">VotingForum</a>&lt;ProposalType&gt;&gt;(voting_forum_address);
+<b>let</b> <b>post</b> post_proposal = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(post_voting_forum.proposals, proposal_id);
+<b>ensures</b> <b>if</b> (should_pass) {
+    post_proposal.yes_votes == proposal.yes_votes + num_votes
+} <b>else</b> {
+    post_proposal.no_votes == proposal.no_votes + num_votes
+};
+<b>let</b> timestamp_secs_bytes = std::bcs::serialize(<a href="timestamp.md#0x1_timestamp_spec_now_seconds">timestamp::spec_now_seconds</a>());
+<b>let</b> key = std::string::spec_utf8(<a href="voting.md#0x1_voting_RESOLVABLE_TIME_METADATA_KEY">RESOLVABLE_TIME_METADATA_KEY</a>);
+<b>ensures</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(post_proposal.metadata, key) == timestamp_secs_bytes;
+</code></pre>
+
+
+
+<a id="@Specification_1_is_proposal_resolvable"></a>
+
+### Function `is_proposal_resolvable`
+
+
+<pre><code><b>fun</b> <a href="voting.md#0x1_voting_is_proposal_resolvable">is_proposal_resolvable</a>&lt;ProposalType: store&gt;(voting_forum_address: <b>address</b>, proposal_id: u64)
+</code></pre>
+
+
+
+
+<pre><code><b>requires</b> <a href="chain_status.md#0x1_chain_status_is_operating">chain_status::is_operating</a>();
+<b>include</b> <a href="voting.md#0x1_voting_IsProposalResolvableAbortsIf">IsProposalResolvableAbortsIf</a>&lt;ProposalType&gt;;
+</code></pre>
+
+
+
+
+<a id="0x1_voting_IsProposalResolvableAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="voting.md#0x1_voting_IsProposalResolvableAbortsIf">IsProposalResolvableAbortsIf</a>&lt;ProposalType&gt; {
+    voting_forum_address: <b>address</b>;
+    proposal_id: u64;
+    <b>include</b> <a href="voting.md#0x1_voting_AbortsIfNotContainProposalID">AbortsIfNotContainProposalID</a>&lt;ProposalType&gt;;
+    <b>let</b> voting_forum = <b>global</b>&lt;<a href="voting.md#0x1_voting_VotingForum">VotingForum</a>&lt;ProposalType&gt;&gt;(voting_forum_address);
+    <b>let</b> proposal = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(voting_forum.proposals, proposal_id);
+    <b>let</b> voting_closed = <a href="voting.md#0x1_voting_spec_is_voting_closed">spec_is_voting_closed</a>&lt;ProposalType&gt;(voting_forum_address, proposal_id);
+    <b>aborts_if</b> voting_closed && (proposal.yes_votes &lt;= proposal.no_votes || proposal.yes_votes + proposal.no_votes &lt; proposal.min_vote_threshold);
+    <b>aborts_if</b> !voting_closed;
+    <b>aborts_if</b> proposal.is_resolved;
+    <b>aborts_if</b> !std::string::spec_internal_check_utf8(<a href="voting.md#0x1_voting_RESOLVABLE_TIME_METADATA_KEY">RESOLVABLE_TIME_METADATA_KEY</a>);
+    <b>aborts_if</b> !<a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(proposal.metadata, std::string::spec_utf8(<a href="voting.md#0x1_voting_RESOLVABLE_TIME_METADATA_KEY">RESOLVABLE_TIME_METADATA_KEY</a>));
+    <b>aborts_if</b> !<a href="../../../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_deserializable">from_bcs::deserializable</a>&lt;u64&gt;(<a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(proposal.metadata, std::string::spec_utf8(<a href="voting.md#0x1_voting_RESOLVABLE_TIME_METADATA_KEY">RESOLVABLE_TIME_METADATA_KEY</a>)));
+    <b>aborts_if</b> <a href="timestamp.md#0x1_timestamp_spec_now_seconds">timestamp::spec_now_seconds</a>() &lt;= <a href="../../../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_deserialize">from_bcs::deserialize</a>&lt;u64&gt;(<a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(proposal.metadata, std::string::spec_utf8(<a href="voting.md#0x1_voting_RESOLVABLE_TIME_METADATA_KEY">RESOLVABLE_TIME_METADATA_KEY</a>)));
+    <b>aborts_if</b> <a href="transaction_context.md#0x1_transaction_context_spec_get_script_hash">transaction_context::spec_get_script_hash</a>() != proposal.execution_hash;
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_resolve"></a>
+
+### Function `resolve`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_resolve">resolve</a>&lt;ProposalType: store&gt;(voting_forum_address: <b>address</b>, proposal_id: u64): ProposalType
+</code></pre>
+
+
+
+
+<pre><code><b>requires</b> <a href="chain_status.md#0x1_chain_status_is_operating">chain_status::is_operating</a>();
+<b>include</b> <a href="voting.md#0x1_voting_IsProposalResolvableAbortsIf">IsProposalResolvableAbortsIf</a>&lt;ProposalType&gt;;
+<b>aborts_if</b> !std::string::spec_internal_check_utf8(<a href="voting.md#0x1_voting_IS_MULTI_STEP_PROPOSAL_KEY">IS_MULTI_STEP_PROPOSAL_KEY</a>);
+<b>let</b> voting_forum = <b>global</b>&lt;<a href="voting.md#0x1_voting_VotingForum">VotingForum</a>&lt;ProposalType&gt;&gt;(voting_forum_address);
+<b>let</b> proposal = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(voting_forum.proposals, proposal_id);
+<b>let</b> multi_step_key = std::string::spec_utf8(<a href="voting.md#0x1_voting_IS_MULTI_STEP_PROPOSAL_KEY">IS_MULTI_STEP_PROPOSAL_KEY</a>);
+<b>let</b> has_multi_step_key = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(proposal.metadata, multi_step_key);
+<b>aborts_if</b> has_multi_step_key && !<a href="../../../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_deserializable">from_bcs::deserializable</a>&lt;bool&gt;(<a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(proposal.metadata, multi_step_key));
+<b>aborts_if</b> has_multi_step_key && <a href="../../../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_deserialize">from_bcs::deserialize</a>&lt;bool&gt;(<a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(proposal.metadata, multi_step_key));
+<b>let</b> <b>post</b> post_voting_forum = <b>global</b>&lt;<a href="voting.md#0x1_voting_VotingForum">VotingForum</a>&lt;ProposalType&gt;&gt;(voting_forum_address);
+<b>let</b> <b>post</b> post_proposal = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(post_voting_forum.proposals, proposal_id);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="timestamp.md#0x1_timestamp_CurrentTimeMicroseconds">timestamp::CurrentTimeMicroseconds</a>&gt;(@aptos_framework);
+// This enforces <a id="high-level-req-3" href="#high-level-req">high-level requirement 3</a>:
+<b>ensures</b> post_proposal.is_resolved == <b>true</b>;
+<b>ensures</b> post_proposal.resolution_time_secs == <a href="timestamp.md#0x1_timestamp_spec_now_seconds">timestamp::spec_now_seconds</a>();
+<b>aborts_if</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_is_none">option::spec_is_none</a>(proposal.execution_content);
+<b>ensures</b> result == <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_borrow">option::spec_borrow</a>(proposal.execution_content);
+<b>ensures</b> <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_is_none">option::spec_is_none</a>(post_proposal.execution_content);
+</code></pre>
+
+
+
+<a id="@Specification_1_resolve_proposal_v2"></a>
+
+### Function `resolve_proposal_v2`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_resolve_proposal_v2">resolve_proposal_v2</a>&lt;ProposalType: store&gt;(voting_forum_address: <b>address</b>, proposal_id: u64, next_execution_hash: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify_duration_estimate = 300;
+<b>requires</b> <a href="chain_status.md#0x1_chain_status_is_operating">chain_status::is_operating</a>();
+<b>include</b> <a href="voting.md#0x1_voting_IsProposalResolvableAbortsIf">IsProposalResolvableAbortsIf</a>&lt;ProposalType&gt;;
+<b>let</b> voting_forum = <b>global</b>&lt;<a href="voting.md#0x1_voting_VotingForum">VotingForum</a>&lt;ProposalType&gt;&gt;(voting_forum_address);
+<b>let</b> proposal = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(voting_forum.proposals, proposal_id);
+<b>let</b> <b>post</b> post_voting_forum = <b>global</b>&lt;<a href="voting.md#0x1_voting_VotingForum">VotingForum</a>&lt;ProposalType&gt;&gt;(voting_forum_address);
+<b>let</b> <b>post</b> post_proposal = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(post_voting_forum.proposals, proposal_id);
+<b>let</b> multi_step_in_execution_key = std::string::spec_utf8(<a href="voting.md#0x1_voting_IS_MULTI_STEP_PROPOSAL_IN_EXECUTION_KEY">IS_MULTI_STEP_PROPOSAL_IN_EXECUTION_KEY</a>);
+<b>aborts_if</b> !std::string::spec_internal_check_utf8(<a href="voting.md#0x1_voting_IS_MULTI_STEP_PROPOSAL_IN_EXECUTION_KEY">IS_MULTI_STEP_PROPOSAL_IN_EXECUTION_KEY</a>);
+<b>aborts_if</b> !std::string::spec_internal_check_utf8(<a href="voting.md#0x1_voting_IS_MULTI_STEP_PROPOSAL_KEY">IS_MULTI_STEP_PROPOSAL_KEY</a>);
+<b>ensures</b> (<a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(proposal.metadata, multi_step_in_execution_key) && len(next_execution_hash) != 0) ==&gt;
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(post_proposal.metadata, multi_step_in_execution_key) == std::bcs::serialize(<b>true</b>);
+<b>ensures</b> (<a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(proposal.metadata, multi_step_in_execution_key) &&
+    (len(next_execution_hash) == 0 && !is_multi_step)) ==&gt;
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(post_proposal.metadata, multi_step_in_execution_key) == std::bcs::serialize(<b>true</b>);
+<b>let</b> multi_step_key = std::string::spec_utf8(<a href="voting.md#0x1_voting_IS_MULTI_STEP_PROPOSAL_KEY">IS_MULTI_STEP_PROPOSAL_KEY</a>);
+<b>aborts_if</b> <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(proposal.metadata, multi_step_key) &&
+    !<a href="../../../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_deserializable">from_bcs::deserializable</a>&lt;bool&gt;(<a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(proposal.metadata, multi_step_key));
+<b>let</b> is_multi_step = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(proposal.metadata, multi_step_key) &&
+    <a href="../../../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_deserialize">from_bcs::deserialize</a>(<a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(proposal.metadata, multi_step_key));
+<b>aborts_if</b> !is_multi_step && len(next_execution_hash) != 0;
+<b>aborts_if</b> len(next_execution_hash) == 0 && !<b>exists</b>&lt;<a href="timestamp.md#0x1_timestamp_CurrentTimeMicroseconds">timestamp::CurrentTimeMicroseconds</a>&gt;(@aptos_framework);
+<b>aborts_if</b> len(next_execution_hash) == 0 && is_multi_step && !<a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(proposal.metadata, multi_step_in_execution_key);
+// This enforces <a id="high-level-req-4" href="#high-level-req">high-level requirement 4</a>:
+<b>ensures</b> len(next_execution_hash) == 0 ==&gt; post_proposal.resolution_time_secs == <a href="timestamp.md#0x1_timestamp_spec_now_seconds">timestamp::spec_now_seconds</a>();
+<b>ensures</b> len(next_execution_hash) == 0 ==&gt; post_proposal.is_resolved == <b>true</b>;
+<b>ensures</b> (len(next_execution_hash) == 0 && is_multi_step) ==&gt; <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(post_proposal.metadata, multi_step_in_execution_key) == std::bcs::serialize(<b>false</b>);
+<b>ensures</b> len(next_execution_hash) != 0 ==&gt; post_proposal.execution_hash == next_execution_hash;
+</code></pre>
+
+
+
+<a id="@Specification_1_next_proposal_id"></a>
+
+### Function `next_proposal_id`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_next_proposal_id">next_proposal_id</a>&lt;ProposalType: store&gt;(voting_forum_address: <b>address</b>): u64
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="voting.md#0x1_voting_VotingForum">VotingForum</a>&lt;ProposalType&gt;&gt;(voting_forum_address);
+<b>ensures</b> result == <b>global</b>&lt;<a href="voting.md#0x1_voting_VotingForum">VotingForum</a>&lt;ProposalType&gt;&gt;(voting_forum_address).next_proposal_id;
+</code></pre>
+
+
+
+<a id="@Specification_1_get_proposer"></a>
+
+### Function `get_proposer`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_get_proposer">get_proposer</a>&lt;ProposalType: store&gt;(voting_forum_address: <b>address</b>, proposal_id: u64): <b>address</b>
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="voting.md#0x1_voting_AbortsIfNotContainProposalID">AbortsIfNotContainProposalID</a>&lt;ProposalType&gt;;
+<b>let</b> voting_forum = <b>global</b>&lt;<a href="voting.md#0x1_voting_VotingForum">VotingForum</a>&lt;ProposalType&gt;&gt;(voting_forum_address);
+<b>let</b> proposal = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(voting_forum.proposals, proposal_id);
+<b>ensures</b> result == proposal.proposer;
+</code></pre>
+
+
+
+<a id="@Specification_1_is_voting_closed"></a>
+
+### Function `is_voting_closed`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_is_voting_closed">is_voting_closed</a>&lt;ProposalType: store&gt;(voting_forum_address: <b>address</b>, proposal_id: u64): bool
+</code></pre>
+
+
+
+
+<pre><code><b>requires</b> <a href="chain_status.md#0x1_chain_status_is_operating">chain_status::is_operating</a>();
+<b>include</b> <a href="voting.md#0x1_voting_AbortsIfNotContainProposalID">AbortsIfNotContainProposalID</a>&lt;ProposalType&gt;;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="timestamp.md#0x1_timestamp_CurrentTimeMicroseconds">timestamp::CurrentTimeMicroseconds</a>&gt;(@aptos_framework);
+<b>ensures</b> result == <a href="voting.md#0x1_voting_spec_is_voting_closed">spec_is_voting_closed</a>&lt;ProposalType&gt;(voting_forum_address, proposal_id);
+</code></pre>
+
+
+
+
+<a id="0x1_voting_spec_is_voting_closed"></a>
+
+
+<pre><code><b>fun</b> <a href="voting.md#0x1_voting_spec_is_voting_closed">spec_is_voting_closed</a>&lt;ProposalType: store&gt;(voting_forum_address: <b>address</b>, proposal_id: u64): bool {
+   <b>let</b> voting_forum = <b>global</b>&lt;<a href="voting.md#0x1_voting_VotingForum">VotingForum</a>&lt;ProposalType&gt;&gt;(voting_forum_address);
+   <b>let</b> proposal = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(voting_forum.proposals, proposal_id);
+   <a href="voting.md#0x1_voting_spec_can_be_resolved_early">spec_can_be_resolved_early</a>&lt;ProposalType&gt;(proposal) || <a href="voting.md#0x1_voting_is_voting_period_over">is_voting_period_over</a>(proposal)
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_can_be_resolved_early"></a>
+
+### Function `can_be_resolved_early`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_can_be_resolved_early">can_be_resolved_early</a>&lt;ProposalType: store&gt;(proposal: &<a href="voting.md#0x1_voting_Proposal">voting::Proposal</a>&lt;ProposalType&gt;): bool
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="voting.md#0x1_voting_spec_can_be_resolved_early">spec_can_be_resolved_early</a>&lt;ProposalType&gt;(proposal);
+</code></pre>
+
+
+
+
+<a id="0x1_voting_spec_can_be_resolved_early"></a>
+
+
+<pre><code><b>fun</b> <a href="voting.md#0x1_voting_spec_can_be_resolved_early">spec_can_be_resolved_early</a>&lt;ProposalType: store&gt;(proposal: <a href="voting.md#0x1_voting_Proposal">Proposal</a>&lt;ProposalType&gt;): bool {
+   <b>if</b> (<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_is_some">option::spec_is_some</a>(proposal.early_resolution_vote_threshold)) {
+       <b>let</b> early_resolution_threshold = <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_borrow">option::spec_borrow</a>(proposal.early_resolution_vote_threshold);
+       <b>if</b> (proposal.yes_votes &gt;= early_resolution_threshold || proposal.no_votes &gt;= early_resolution_threshold) {
+           <b>true</b>
+       } <b>else</b>{
+           <b>false</b>
+       }
+   } <b>else</b> {
+       <b>false</b>
+   }
+}
+</code></pre>
+
+
+
+
+<a id="0x1_voting_spec_get_proposal_state"></a>
+
+
+<pre><code><b>fun</b> <a href="voting.md#0x1_voting_spec_get_proposal_state">spec_get_proposal_state</a>&lt;ProposalType&gt;(
+   voting_forum_address: <b>address</b>,
+   proposal_id: u64,
+   voting_forum: <a href="voting.md#0x1_voting_VotingForum">VotingForum</a>&lt;ProposalType&gt;
+): u64 {
+   <b>let</b> proposal = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(voting_forum.proposals, proposal_id);
+   <b>let</b> voting_closed = <a href="voting.md#0x1_voting_spec_is_voting_closed">spec_is_voting_closed</a>&lt;ProposalType&gt;(voting_forum_address, proposal_id);
+   <b>let</b> proposal_vote_cond = (proposal.yes_votes &gt; proposal.no_votes && proposal.yes_votes + proposal.no_votes &gt;= proposal.min_vote_threshold);
+   <b>if</b> (voting_closed && proposal_vote_cond) {
+       <a href="voting.md#0x1_voting_PROPOSAL_STATE_SUCCEEDED">PROPOSAL_STATE_SUCCEEDED</a>
+   } <b>else</b> <b>if</b> (voting_closed && !proposal_vote_cond) {
+       <a href="voting.md#0x1_voting_PROPOSAL_STATE_FAILED">PROPOSAL_STATE_FAILED</a>
+   } <b>else</b> {
+       <a href="voting.md#0x1_voting_PROPOSAL_STATE_PENDING">PROPOSAL_STATE_PENDING</a>
+   }
+}
+</code></pre>
+
+
+
+
+<a id="0x1_voting_spec_get_proposal_expiration_secs"></a>
+
+
+<pre><code><b>fun</b> <a href="voting.md#0x1_voting_spec_get_proposal_expiration_secs">spec_get_proposal_expiration_secs</a>&lt;ProposalType: store&gt;(
+   voting_forum_address: <b>address</b>,
+   proposal_id: u64,
+): u64 {
+   <b>let</b> voting_forum = <b>global</b>&lt;<a href="voting.md#0x1_voting_VotingForum">VotingForum</a>&lt;ProposalType&gt;&gt;(voting_forum_address);
+   <b>let</b> proposal = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(voting_forum.proposals, proposal_id);
+   proposal.expiration_secs
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_get_proposal_metadata"></a>
+
+### Function `get_proposal_metadata`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_get_proposal_metadata">get_proposal_metadata</a>&lt;ProposalType: store&gt;(voting_forum_address: <b>address</b>, proposal_id: u64): <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;<a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="voting.md#0x1_voting_AbortsIfNotContainProposalID">AbortsIfNotContainProposalID</a>&lt;ProposalType&gt;;
+<b>let</b> voting_forum = <b>global</b>&lt;<a href="voting.md#0x1_voting_VotingForum">VotingForum</a>&lt;ProposalType&gt;&gt;(voting_forum_address);
+<b>let</b> proposal = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(voting_forum.proposals, proposal_id);
+<b>ensures</b> result == proposal.metadata;
+</code></pre>
+
+
+
+<a id="@Specification_1_get_proposal_metadata_value"></a>
+
+### Function `get_proposal_metadata_value`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_get_proposal_metadata_value">get_proposal_metadata_value</a>&lt;ProposalType: store&gt;(voting_forum_address: <b>address</b>, proposal_id: u64, metadata_key: <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="voting.md#0x1_voting_AbortsIfNotContainProposalID">AbortsIfNotContainProposalID</a>&lt;ProposalType&gt;;
+<b>let</b> voting_forum = <b>global</b>&lt;<a href="voting.md#0x1_voting_VotingForum">VotingForum</a>&lt;ProposalType&gt;&gt;(voting_forum_address);
+<b>let</b> proposal = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(voting_forum.proposals, proposal_id);
+<b>aborts_if</b> !<a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(proposal.metadata, metadata_key);
+<b>ensures</b> result == <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(proposal.metadata, metadata_key);
+</code></pre>
+
+
+
+<a id="@Specification_1_get_proposal_state"></a>
+
+### Function `get_proposal_state`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_get_proposal_state">get_proposal_state</a>&lt;ProposalType: store&gt;(voting_forum_address: <b>address</b>, proposal_id: u64): u64
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> addition_overflow_unchecked;
+<b>requires</b> <a href="chain_status.md#0x1_chain_status_is_operating">chain_status::is_operating</a>();
+<b>include</b> <a href="voting.md#0x1_voting_AbortsIfNotContainProposalID">AbortsIfNotContainProposalID</a>&lt;ProposalType&gt;;
+<b>let</b> voting_forum = <b>global</b>&lt;<a href="voting.md#0x1_voting_VotingForum">VotingForum</a>&lt;ProposalType&gt;&gt;(voting_forum_address);
+<b>ensures</b> result == <a href="voting.md#0x1_voting_spec_get_proposal_state">spec_get_proposal_state</a>(voting_forum_address, proposal_id, voting_forum);
+</code></pre>
+
+
+
+<a id="@Specification_1_get_proposal_creation_secs"></a>
+
+### Function `get_proposal_creation_secs`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_get_proposal_creation_secs">get_proposal_creation_secs</a>&lt;ProposalType: store&gt;(voting_forum_address: <b>address</b>, proposal_id: u64): u64
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="voting.md#0x1_voting_AbortsIfNotContainProposalID">AbortsIfNotContainProposalID</a>&lt;ProposalType&gt;;
+<b>let</b> voting_forum = <b>global</b>&lt;<a href="voting.md#0x1_voting_VotingForum">VotingForum</a>&lt;ProposalType&gt;&gt;(voting_forum_address);
+<b>let</b> proposal = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(voting_forum.proposals, proposal_id);
+<b>ensures</b> result == proposal.creation_time_secs;
+</code></pre>
+
+
+
+<a id="@Specification_1_get_proposal_expiration_secs"></a>
+
+### Function `get_proposal_expiration_secs`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_get_proposal_expiration_secs">get_proposal_expiration_secs</a>&lt;ProposalType: store&gt;(voting_forum_address: <b>address</b>, proposal_id: u64): u64
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="voting.md#0x1_voting_AbortsIfNotContainProposalID">AbortsIfNotContainProposalID</a>&lt;ProposalType&gt;;
+<b>ensures</b> result == <a href="voting.md#0x1_voting_spec_get_proposal_expiration_secs">spec_get_proposal_expiration_secs</a>&lt;ProposalType&gt;(voting_forum_address, proposal_id);
+</code></pre>
+
+
+
+<a id="@Specification_1_get_execution_hash"></a>
+
+### Function `get_execution_hash`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_get_execution_hash">get_execution_hash</a>&lt;ProposalType: store&gt;(voting_forum_address: <b>address</b>, proposal_id: u64): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="voting.md#0x1_voting_AbortsIfNotContainProposalID">AbortsIfNotContainProposalID</a>&lt;ProposalType&gt;;
+<b>let</b> voting_forum = <b>global</b>&lt;<a href="voting.md#0x1_voting_VotingForum">VotingForum</a>&lt;ProposalType&gt;&gt;(voting_forum_address);
+<b>let</b> proposal = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(voting_forum.proposals, proposal_id);
+<b>ensures</b> result == proposal.execution_hash;
+</code></pre>
+
+
+
+<a id="@Specification_1_get_min_vote_threshold"></a>
+
+### Function `get_min_vote_threshold`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_get_min_vote_threshold">get_min_vote_threshold</a>&lt;ProposalType: store&gt;(voting_forum_address: <b>address</b>, proposal_id: u64): u128
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="voting.md#0x1_voting_AbortsIfNotContainProposalID">AbortsIfNotContainProposalID</a>&lt;ProposalType&gt;;
+<b>let</b> voting_forum = <b>global</b>&lt;<a href="voting.md#0x1_voting_VotingForum">VotingForum</a>&lt;ProposalType&gt;&gt;(voting_forum_address);
+<b>let</b> proposal = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(voting_forum.proposals, proposal_id);
+<b>ensures</b> result == proposal.min_vote_threshold;
+</code></pre>
+
+
+
+<a id="@Specification_1_get_early_resolution_vote_threshold"></a>
+
+### Function `get_early_resolution_vote_threshold`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_get_early_resolution_vote_threshold">get_early_resolution_vote_threshold</a>&lt;ProposalType: store&gt;(voting_forum_address: <b>address</b>, proposal_id: u64): <a href="../../../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;u128&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="voting.md#0x1_voting_AbortsIfNotContainProposalID">AbortsIfNotContainProposalID</a>&lt;ProposalType&gt;;
+<b>let</b> voting_forum = <b>global</b>&lt;<a href="voting.md#0x1_voting_VotingForum">VotingForum</a>&lt;ProposalType&gt;&gt;(voting_forum_address);
+<b>let</b> proposal = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(voting_forum.proposals, proposal_id);
+<b>ensures</b> result == proposal.early_resolution_vote_threshold;
+</code></pre>
+
+
+
+<a id="@Specification_1_get_votes"></a>
+
+### Function `get_votes`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_get_votes">get_votes</a>&lt;ProposalType: store&gt;(voting_forum_address: <b>address</b>, proposal_id: u64): (u128, u128)
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="voting.md#0x1_voting_AbortsIfNotContainProposalID">AbortsIfNotContainProposalID</a>&lt;ProposalType&gt;;
+<b>let</b> voting_forum = <b>global</b>&lt;<a href="voting.md#0x1_voting_VotingForum">VotingForum</a>&lt;ProposalType&gt;&gt;(voting_forum_address);
+<b>let</b> proposal = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(voting_forum.proposals, proposal_id);
+<b>ensures</b> result_1 == proposal.yes_votes;
+<b>ensures</b> result_2 == proposal.no_votes;
+</code></pre>
+
+
+
+<a id="@Specification_1_is_resolved"></a>
+
+### Function `is_resolved`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_is_resolved">is_resolved</a>&lt;ProposalType: store&gt;(voting_forum_address: <b>address</b>, proposal_id: u64): bool
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="voting.md#0x1_voting_AbortsIfNotContainProposalID">AbortsIfNotContainProposalID</a>&lt;ProposalType&gt;;
+<b>let</b> voting_forum = <b>global</b>&lt;<a href="voting.md#0x1_voting_VotingForum">VotingForum</a>&lt;ProposalType&gt;&gt;(voting_forum_address);
+<b>let</b> proposal = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(voting_forum.proposals, proposal_id);
+<b>ensures</b> result == proposal.is_resolved;
+</code></pre>
+
+
+
+
+<a id="0x1_voting_AbortsIfNotContainProposalID"></a>
+
+
+<pre><code><b>schema</b> <a href="voting.md#0x1_voting_AbortsIfNotContainProposalID">AbortsIfNotContainProposalID</a>&lt;ProposalType&gt; {
+    proposal_id: u64;
+    voting_forum_address: <b>address</b>;
+    <b>let</b> voting_forum = <b>global</b>&lt;<a href="voting.md#0x1_voting_VotingForum">VotingForum</a>&lt;ProposalType&gt;&gt;(voting_forum_address);
+    <b>aborts_if</b> !<a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_contains">table::spec_contains</a>(voting_forum.proposals, proposal_id);
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="voting.md#0x1_voting_VotingForum">VotingForum</a>&lt;ProposalType&gt;&gt;(voting_forum_address);
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_get_resolution_time_secs"></a>
+
+### Function `get_resolution_time_secs`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_get_resolution_time_secs">get_resolution_time_secs</a>&lt;ProposalType: store&gt;(voting_forum_address: <b>address</b>, proposal_id: u64): u64
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="voting.md#0x1_voting_AbortsIfNotContainProposalID">AbortsIfNotContainProposalID</a>&lt;ProposalType&gt;;
+<b>let</b> voting_forum = <b>global</b>&lt;<a href="voting.md#0x1_voting_VotingForum">VotingForum</a>&lt;ProposalType&gt;&gt;(voting_forum_address);
+<b>let</b> proposal = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(voting_forum.proposals, proposal_id);
+<b>ensures</b> result == proposal.resolution_time_secs;
+</code></pre>
+
+
+
+<a id="@Specification_1_is_multi_step_proposal_in_execution"></a>
+
+### Function `is_multi_step_proposal_in_execution`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="voting.md#0x1_voting_is_multi_step_proposal_in_execution">is_multi_step_proposal_in_execution</a>&lt;ProposalType: store&gt;(voting_forum_address: <b>address</b>, proposal_id: u64): bool
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="voting.md#0x1_voting_AbortsIfNotContainProposalID">AbortsIfNotContainProposalID</a>&lt;ProposalType&gt;;
+<b>let</b> voting_forum = <b>global</b>&lt;<a href="voting.md#0x1_voting_VotingForum">VotingForum</a>&lt;ProposalType&gt;&gt;(voting_forum_address);
+<b>let</b> proposal = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(voting_forum.proposals,proposal_id);
+<b>aborts_if</b> !std::string::spec_internal_check_utf8(<a href="voting.md#0x1_voting_IS_MULTI_STEP_PROPOSAL_IN_EXECUTION_KEY">IS_MULTI_STEP_PROPOSAL_IN_EXECUTION_KEY</a>);
+<b>let</b> execution_key = std::string::spec_utf8(<a href="voting.md#0x1_voting_IS_MULTI_STEP_PROPOSAL_IN_EXECUTION_KEY">IS_MULTI_STEP_PROPOSAL_IN_EXECUTION_KEY</a>);
+<b>aborts_if</b> !<a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(proposal.metadata,execution_key);
+<b>let</b> is_multi_step_in_execution_key = <a href="../../../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(proposal.metadata,execution_key);
+<b>aborts_if</b> !<a href="../../../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_deserializable">from_bcs::deserializable</a>&lt;bool&gt;(is_multi_step_in_execution_key);
+<b>ensures</b> result == <a href="../../../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_deserialize">from_bcs::deserialize</a>&lt;bool&gt;(is_multi_step_in_execution_key);
+</code></pre>
+
+
+
+<a id="@Specification_1_is_voting_period_over"></a>
+
+### Function `is_voting_period_over`
+
+
+<pre><code><b>fun</b> <a href="voting.md#0x1_voting_is_voting_period_over">is_voting_period_over</a>&lt;ProposalType: store&gt;(proposal: &<a href="voting.md#0x1_voting_Proposal">voting::Proposal</a>&lt;ProposalType&gt;): bool
+</code></pre>
+
+
+
+
+<pre><code><b>requires</b> <a href="chain_status.md#0x1_chain_status_is_operating">chain_status::is_operating</a>();
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == (<a href="timestamp.md#0x1_timestamp_spec_now_seconds">timestamp::spec_now_seconds</a>() &gt; proposal.expiration_secs);
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-framework/tests/deflation_token.move b/aptos-move/framework/aptos-framework/tests/deflation_token.move
index fa98e45a27e85..58c1e711d68a9 100644
--- a/aptos-move/framework/aptos-framework/tests/deflation_token.move
+++ b/aptos-move/framework/aptos-framework/tests/deflation_token.move
@@ -58,7 +58,7 @@ module 0xcafe::deflation_token {
         creator: &signer,
     ) {
         let (creator_ref, token_object) = fungible_asset::create_test_token(creator);
-        let (mint, _, _) = fungible_asset::init_test_metadata(&creator_ref);
+        let (mint, _, _, _) = fungible_asset::init_test_metadata(&creator_ref);
         let metadata = object::convert<TestToken, Metadata>(token_object);
 
         let creator_store = fungible_asset::create_test_store(creator, metadata);
diff --git a/aptos-move/framework/aptos-framework/tests/deflation_token_tests.move b/aptos-move/framework/aptos-framework/tests/deflation_token_tests.move
index 29bfe73c5fd32..6d7b6d32b3dae 100644
--- a/aptos-move/framework/aptos-framework/tests/deflation_token_tests.move
+++ b/aptos-move/framework/aptos-framework/tests/deflation_token_tests.move
@@ -17,7 +17,7 @@ module 0xcafe::deflation_token_tests {
         aaron: &signer,
     ) {
         let (creator_ref, token_object) = fungible_asset::create_test_token(creator);
-        let (mint, _, _) = fungible_asset::init_test_metadata(&creator_ref);
+        let (mint, _, _, _) = fungible_asset::init_test_metadata(&creator_ref);
         let metadata = object::convert<TestToken, Metadata>(token_object);
 
         let creator_store = fungible_asset::create_test_store(creator, metadata);
@@ -64,7 +64,7 @@ module 0xcafe::deflation_token_tests {
         aaron: &signer,
     ) {
         let (creator_ref, token_object) = fungible_asset::create_test_token(creator);
-        let (mint, _, _) = fungible_asset::init_test_metadata(&creator_ref);
+        let (mint, _, _, _) = fungible_asset::init_test_metadata(&creator_ref);
         let metadata = object::convert<TestToken, Metadata>(token_object);
 
         let creator_store = fungible_asset::create_test_store(creator, metadata);
@@ -87,7 +87,7 @@ module 0xcafe::deflation_token_tests {
         creator: &signer,
     ) {
         let (creator_ref, token_object) = fungible_asset::create_test_token(creator);
-        let (mint, _, _) = fungible_asset::init_test_metadata(&creator_ref);
+        let (mint, _, _, _) = fungible_asset::init_test_metadata(&creator_ref);
         let metadata = object::convert<TestToken, Metadata>(token_object);
 
         let creator_store = fungible_asset::create_test_store(creator, metadata);
@@ -112,7 +112,7 @@ module 0xcafe::deflation_token_tests {
         aaron: &signer,
     ) {
         let (creator_ref, token_object) = fungible_asset::create_test_token(creator);
-        let (mint, _, _) = fungible_asset::init_test_metadata(&creator_ref);
+        let (mint, _, _, _) = fungible_asset::init_test_metadata(&creator_ref);
         let metadata = object::convert<TestToken, Metadata>(token_object);
 
         let creator_store = fungible_asset::create_test_store(creator, metadata);
@@ -138,7 +138,7 @@ module 0xcafe::deflation_token_tests {
         creator: &signer,
     ) {
         let (creator_ref, _) = fungible_asset::create_test_token(creator);
-        let (_, _, _) = fungible_asset::init_test_metadata(&creator_ref);
+        let (_, _, _, _) = fungible_asset::init_test_metadata(&creator_ref);
         deflation_token::initialize(creator, &creator_ref);
 
         let withdraw = function_info::new_function_info(
@@ -152,7 +152,7 @@ module 0xcafe::deflation_token_tests {
             &creator_ref,
             option::some(withdraw),
             option::none(),
-            option::none(),
+            option::none()
         );
     }
 
@@ -218,7 +218,7 @@ module 0xcafe::deflation_token_tests {
             &creator_ref,
             option::some(withdraw),
             option::none(),
-            option::some(withdraw),
+            option::some(withdraw)
         );
     }
 
@@ -241,7 +241,7 @@ module 0xcafe::deflation_token_tests {
             &creator_ref,
             option::some(withdraw),
             option::none(),
-            option::none(),
+            option::none()
         );
     }
 
@@ -263,7 +263,7 @@ module 0xcafe::deflation_token_tests {
             &creator_ref,
             option::some(withdraw),
             option::none(),
-            option::none(),
+            option::none()
         );
     }
 
@@ -272,7 +272,7 @@ module 0xcafe::deflation_token_tests {
         creator: &signer,
     ) {
         let (creator_ref, token_object) = fungible_asset::create_test_token(creator);
-        let (mint, _, _) = fungible_asset::init_test_metadata(&creator_ref);
+        let (mint, _, _, _) = fungible_asset::init_test_metadata(&creator_ref);
         let metadata = object::convert<TestToken, Metadata>(token_object);
 
         let creator_store = fungible_asset::create_test_store(creator, metadata);
@@ -303,7 +303,7 @@ module 0xcafe::deflation_token_tests {
             &creator_ref,
             option::some(withdraw),
             option::none(),
-            option::none(),
+            option::none()
         );
     }
 
@@ -360,7 +360,7 @@ module 0xcafe::deflation_token_tests {
         aaron: &signer,
     ) {
         let (creator_ref, token_object) = fungible_asset::create_test_token(creator);
-        let (mint, transfer_ref, _) = fungible_asset::init_test_metadata(&creator_ref);
+        let (mint, transfer_ref, _, _) = fungible_asset::init_test_metadata(&creator_ref);
         let metadata = object::convert<TestToken, Metadata>(token_object);
 
         let creator_store = fungible_asset::create_test_store(creator, metadata);
diff --git a/aptos-move/framework/aptos-framework/tests/native_disaptch_token_tests.move b/aptos-move/framework/aptos-framework/tests/native_disaptch_token_tests.move
new file mode 100644
index 0000000000000..6b942f1078659
--- /dev/null
+++ b/aptos-move/framework/aptos-framework/tests/native_disaptch_token_tests.move
@@ -0,0 +1,16 @@
+#[test_only]
+module aptos_framework::native_dispatch_token_tests {
+    use aptos_framework::fungible_asset;
+    use 0xcafe::native_dispatch_token;
+
+    #[test(creator = @0xcafe)]
+    #[expected_failure(abort_code=0x10019, location=aptos_framework::fungible_asset)]
+    fun test_native_dispatch_token(
+        creator: &signer,
+    ) {
+        let (creator_ref, _) = fungible_asset::create_test_token(creator);
+        fungible_asset::init_test_metadata(&creator_ref);
+
+        native_dispatch_token::initialize(creator, &creator_ref);
+    }
+}
diff --git a/aptos-move/framework/aptos-framework/tests/native_dispatch_token.move b/aptos-move/framework/aptos-framework/tests/native_dispatch_token.move
new file mode 100644
index 0000000000000..51e7ef601c2fe
--- /dev/null
+++ b/aptos-move/framework/aptos-framework/tests/native_dispatch_token.move
@@ -0,0 +1,33 @@
+#[test_only]
+module 0xcafe::native_dispatch_token {
+    use aptos_framework::fungible_asset::{FungibleAsset, TransferRef};
+    use aptos_framework::dispatchable_fungible_asset;
+    use aptos_framework::object::{ConstructorRef, Object};
+    use aptos_framework::function_info;
+
+    use std::option;
+    use std::signer;
+    use std::string;
+
+    public fun initialize(account: &signer, constructor_ref: &ConstructorRef) {
+        assert!(signer::address_of(account) == @0xcafe, 1);
+        let withdraw = function_info::new_function_info(
+            account,
+            string::utf8(b"native_dispatch_token"),
+            string::utf8(b"withdraw"),
+        );
+
+        dispatchable_fungible_asset::register_dispatch_functions(
+            constructor_ref,
+            option::some(withdraw),
+            option::none(),
+            option::none(),
+        );
+    }
+
+    public native fun withdraw<T: key>(
+        store: Object<T>,
+        _amount: u64,
+        transfer_ref: &TransferRef,
+    ): FungibleAsset;
+}
diff --git a/aptos-move/framework/aptos-framework/tests/nil_op_token.move b/aptos-move/framework/aptos-framework/tests/nil_op_token.move
index 6a4a852e19c78..9cdf7b13a6de2 100644
--- a/aptos-move/framework/aptos-framework/tests/nil_op_token.move
+++ b/aptos-move/framework/aptos-framework/tests/nil_op_token.move
@@ -21,7 +21,7 @@ module 0xcafe::nil_op_token {
             constructor_ref,
             option::some(withdraw),
             option::none(),
-            option::none()
+            option::none(),
         );
     }
 
diff --git a/aptos-move/framework/aptos-framework/tests/nil_op_token_tests.move b/aptos-move/framework/aptos-framework/tests/nil_op_token_tests.move
index 5749acbc18a41..d4bf6abbdba52 100644
--- a/aptos-move/framework/aptos-framework/tests/nil_op_token_tests.move
+++ b/aptos-move/framework/aptos-framework/tests/nil_op_token_tests.move
@@ -12,7 +12,7 @@ module aptos_framework::nil_op_token_tests {
         creator: &signer,
     ) {
         let (creator_ref, token_object) = fungible_asset::create_test_token(creator);
-        let (mint, _, _) = fungible_asset::init_test_metadata(&creator_ref);
+        let (mint, _, _, _) = fungible_asset::init_test_metadata(&creator_ref);
         let metadata = object::convert<TestToken, Metadata>(token_object);
 
         let creator_store = fungible_asset::create_test_store(creator, metadata);
diff --git a/aptos-move/framework/aptos-framework/tests/permissioned_token.move b/aptos-move/framework/aptos-framework/tests/permissioned_token.move
index fe0ea6d3a7dfc..724ee6b628fac 100644
--- a/aptos-move/framework/aptos-framework/tests/permissioned_token.move
+++ b/aptos-move/framework/aptos-framework/tests/permissioned_token.move
@@ -31,7 +31,7 @@ module 0xcafe::permissioned_token {
             constructor_ref,
             option::some(withdraw),
             option::none(),
-            option::none()
+            option::none(),
         );
     }
 
diff --git a/aptos-move/framework/aptos-framework/tests/permissioned_token_tests.move b/aptos-move/framework/aptos-framework/tests/permissioned_token_tests.move
index 683b0e9c8afd1..02f12ce85abf5 100644
--- a/aptos-move/framework/aptos-framework/tests/permissioned_token_tests.move
+++ b/aptos-move/framework/aptos-framework/tests/permissioned_token_tests.move
@@ -12,7 +12,7 @@ module 0xcafe::permissioned_token_tests {
         aaron: &signer,
     ) {
         let (creator_ref, token_object) = fungible_asset::create_test_token(creator);
-        let (mint, _, _) = fungible_asset::init_test_metadata(&creator_ref);
+        let (mint, _, _, _) = fungible_asset::init_test_metadata(&creator_ref);
         let metadata = object::convert<TestToken, Metadata>(token_object);
 
         let creator_store = fungible_asset::create_test_store(creator, metadata);
@@ -47,7 +47,7 @@ module 0xcafe::permissioned_token_tests {
         aaron: &signer,
     ) {
         let (creator_ref, token_object) = fungible_asset::create_test_token(creator);
-        let (mint, _, _) = fungible_asset::init_test_metadata(&creator_ref);
+        let (mint, _, _, _) = fungible_asset::init_test_metadata(&creator_ref);
         let metadata = object::convert<TestToken, Metadata>(token_object);
 
         let creator_store = fungible_asset::create_test_store(creator, metadata);
@@ -81,7 +81,7 @@ module 0xcafe::permissioned_token_tests {
         aaron: &signer,
     ) {
         let (creator_ref, token_object) = fungible_asset::create_test_token(creator);
-        let (mint, _, _) = fungible_asset::init_test_metadata(&creator_ref);
+        let (mint, _, _, _) = fungible_asset::init_test_metadata(&creator_ref);
         let metadata = object::convert<TestToken, Metadata>(token_object);
 
         let creator_store = fungible_asset::create_test_store(creator, metadata);
diff --git a/aptos-move/framework/aptos-framework/tests/reentrant_token_tests.move b/aptos-move/framework/aptos-framework/tests/reentrant_token_tests.move
index d68af4bbceb76..c60edb17d5f5f 100644
--- a/aptos-move/framework/aptos-framework/tests/reentrant_token_tests.move
+++ b/aptos-move/framework/aptos-framework/tests/reentrant_token_tests.move
@@ -12,7 +12,7 @@ module 0xcafe::reentrant_token_tests {
         creator: &signer,
     ) {
         let (creator_ref, token_object) = fungible_asset::create_test_token(creator);
-        let (mint, _, _) = fungible_asset::init_test_metadata(&creator_ref);
+        let (mint, _, _, _) = fungible_asset::init_test_metadata(&creator_ref);
         let metadata = object::convert<TestToken, Metadata>(token_object);
 
         let creator_store = fungible_asset::create_test_store(creator, metadata);
diff --git a/aptos-move/framework/aptos-framework/tests/simple_dispatchable_token.move b/aptos-move/framework/aptos-framework/tests/simple_dispatchable_token.move
index 7c6e05e0fc5ea..3f9057521bcaa 100644
--- a/aptos-move/framework/aptos-framework/tests/simple_dispatchable_token.move
+++ b/aptos-move/framework/aptos-framework/tests/simple_dispatchable_token.move
@@ -28,7 +28,7 @@ module 0xcafe::simple_token {
             constructor_ref,
             option::some(withdraw),
             option::some(deposit),
-            option::none(),
+            option::none()
         );
     }
 
diff --git a/aptos-move/framework/aptos-framework/tests/simple_dispatchable_token_fa_tests.move b/aptos-move/framework/aptos-framework/tests/simple_dispatchable_token_fa_tests.move
index 062d32ebd5f07..eee226f7d567c 100644
--- a/aptos-move/framework/aptos-framework/tests/simple_dispatchable_token_fa_tests.move
+++ b/aptos-move/framework/aptos-framework/tests/simple_dispatchable_token_fa_tests.move
@@ -28,7 +28,7 @@ module aptos_framework::simple_token_fa_tests {
         aaron: &signer,
     ) {
         let (creator_ref, test_token) = create_test_token(creator);
-        let (mint_ref, transfer_ref, _burn_ref) = init_test_metadata(&creator_ref);
+        let (mint_ref, transfer_ref, _burn_ref, _mutate_metadata_ref) = init_test_metadata(&creator_ref);
         let metadata = object::convert<TestToken, Metadata>(test_token);
         simple_token::initialize(creator, &creator_ref);
 
@@ -49,7 +49,7 @@ module aptos_framework::simple_token_fa_tests {
     #[test(creator = @0xcafe)]
     fun test_merge_and_exact(creator: &signer) {
         let (creator_ref, _test_token) = create_test_token(creator);
-        let (mint_ref, _transfer_ref, burn_ref) = init_test_metadata(&creator_ref);
+        let (mint_ref, _transfer_ref, burn_ref, _mutate_metadata_ref) = init_test_metadata(&creator_ref);
         simple_token::initialize(creator, &creator_ref);
 
         let fa = mint(&mint_ref, 100);
@@ -70,11 +70,10 @@ module aptos_framework::simple_token_fa_tests {
         creator: &signer
     ) {
         let feature = features::get_concurrent_fungible_assets_feature();
-        let agg_feature = features::get_aggregator_v2_api_feature();
-        features::change_feature_flags_for_testing(fx, vector[], vector[feature, agg_feature]);
+        features::change_feature_flags_for_testing(fx, vector[], vector[feature]);
 
         let (creator_ref, token_object) = create_test_token(creator);
-        let (mint_ref, transfer_ref, _burn) = init_test_metadata(&creator_ref);
+        let (mint_ref, transfer_ref, _burn_ref, _mutate_metadata_ref) = init_test_metadata(&creator_ref);
         let test_token = object::convert<TestToken, Metadata>(token_object);
         simple_token::initialize(creator, &creator_ref);
 
@@ -85,7 +84,7 @@ module aptos_framework::simple_token_fa_tests {
 
         deposit_with_ref(&transfer_ref, creator_store, fa);
 
-        features::change_feature_flags_for_testing(fx, vector[feature, agg_feature], vector[]);
+        features::change_feature_flags_for_testing(fx, vector[feature], vector[]);
 
         let extend_ref = object::generate_extend_ref(&creator_ref);
         upgrade_to_concurrent(&extend_ref);
@@ -102,7 +101,7 @@ module aptos_framework::simple_token_fa_tests {
         creator: &signer
     ) {
         let (creator_ref, test_token) = create_test_token(creator);
-        let (mint_ref, transfer_ref, _burn_ref) = init_test_metadata(&creator_ref);
+        let (mint_ref, transfer_ref, _burn_ref, _mutate_metadata_ref) = init_test_metadata(&creator_ref);
         let metadata = object::convert<TestToken, Metadata>(test_token);
         simple_token::initialize(creator, &creator_ref);
 
diff --git a/aptos-move/framework/aptos-framework/tests/ten_x_token.move b/aptos-move/framework/aptos-framework/tests/ten_x_token.move
index 7db59d838c9fc..c3841702fe881 100644
--- a/aptos-move/framework/aptos-framework/tests/ten_x_token.move
+++ b/aptos-move/framework/aptos-framework/tests/ten_x_token.move
@@ -6,21 +6,31 @@ module 0xcafe::ten_x_token {
     use aptos_framework::function_info;
 
     use std::option;
+    use std::option::Option;
     use std::signer;
     use std::string;
 
     public fun initialize(account: &signer, constructor_ref: &ConstructorRef) {
         assert!(signer::address_of(account) == @0xcafe, 1);
-        let value = function_info::new_function_info(
+        let balance_value = function_info::new_function_info(
             account,
             string::utf8(b"ten_x_token"),
             string::utf8(b"derived_balance"),
         );
+        let supply_value = function_info::new_function_info(
+            account,
+            string::utf8(b"ten_x_token"),
+            string::utf8(b"derived_supply"),
+        );
         dispatchable_fungible_asset::register_dispatch_functions(
             constructor_ref,
             option::none(),
             option::none(),
-            option::some(value)
+            option::some(balance_value)
+        );
+        dispatchable_fungible_asset::register_derive_supply_dispatch_function(
+            constructor_ref,
+            option::some(supply_value)
         );
     }
 
@@ -28,4 +38,12 @@ module 0xcafe::ten_x_token {
         // Derived value is always 10x!
         fungible_asset::balance(store) * 10
     }
+
+    public fun derived_supply<T: key>(metadata: Object<T>): Option<u128> {
+        // Derived supply is 10x.
+        if(option::is_some(&fungible_asset::supply(metadata))) {
+            return option::some(option::extract(&mut fungible_asset::supply(metadata)) * 10)
+        };
+        option::none()
+    }
 }
diff --git a/aptos-move/framework/aptos-framework/tests/ten_x_token_tests.move b/aptos-move/framework/aptos-framework/tests/ten_x_token_tests.move
index 6ec82bac2b94a..282783f40c32b 100644
--- a/aptos-move/framework/aptos-framework/tests/ten_x_token_tests.move
+++ b/aptos-move/framework/aptos-framework/tests/ten_x_token_tests.move
@@ -11,7 +11,7 @@ module aptos_framework::ten_x_token_tests {
         creator: &signer,
     ) {
         let (creator_ref, token_object) = fungible_asset::create_test_token(creator);
-        let (mint, _, _) = fungible_asset::init_test_metadata(&creator_ref);
+        let (mint, _, _, _) = fungible_asset::init_test_metadata(&creator_ref);
         let metadata = object::convert<TestToken, Metadata>(token_object);
 
         let creator_store = fungible_asset::create_test_store(creator, metadata);
@@ -19,13 +19,17 @@ module aptos_framework::ten_x_token_tests {
         ten_x_token::initialize(creator, &creator_ref);
 
         assert!(fungible_asset::supply(metadata) == option::some(0), 1);
+        assert!(dispatchable_fungible_asset::derived_supply(metadata) == option::some(0), 2);
         // Mint
         let fa = fungible_asset::mint(&mint, 100);
-        assert!(fungible_asset::supply(metadata) == option::some(100), 2);
+        assert!(fungible_asset::supply(metadata) == option::some(100), 3);
         // Deposit will cause an re-entrant call into dispatchable_fungible_asset
         dispatchable_fungible_asset::deposit(creator_store, fa);
 
         // The derived value is 10x
-        assert!(dispatchable_fungible_asset::derived_balance(creator_store) == 1000, 5);
+        assert!(dispatchable_fungible_asset::derived_balance(creator_store) == 1000, 4);
+
+        // The derived supply is 10x
+        assert!(dispatchable_fungible_asset::derived_supply(metadata) == option::some(1000), 5);
     }
 }
diff --git a/aptos-move/framework/aptos-stdlib/doc/type_info.md b/aptos-move/framework/aptos-stdlib/doc/type_info.md
index 1d9687e05701a..e6e3d2f447484 100644
--- a/aptos-move/framework/aptos-stdlib/doc/type_info.md
+++ b/aptos-move/framework/aptos-stdlib/doc/type_info.md
@@ -283,8 +283,7 @@ analysis of vector size dynamism.
 
 
 <pre><code><b>public</b> <b>fun</b> <a href="type_info.md#0x1_type_info_size_of_val">size_of_val</a>&lt;T&gt;(val_ref: &T): u64 {
-    // Return <a href="../../move-stdlib/doc/vector.md#0x1_vector">vector</a> length of vectorized BCS representation.
-    <a href="../../move-stdlib/doc/vector.md#0x1_vector_length">vector::length</a>(&<a href="../../move-stdlib/doc/bcs.md#0x1_bcs_to_bytes">bcs::to_bytes</a>(val_ref))
+    <a href="../../move-stdlib/doc/bcs.md#0x1_bcs_serialized_size">bcs::serialized_size</a>(val_ref)
 }
 </code></pre>
 
@@ -451,8 +450,7 @@ analysis of vector size dynamism.
 
 
 
-<pre><code><b>aborts_if</b> <b>false</b>;
-<b>ensures</b> result == <a href="type_info.md#0x1_type_info_spec_size_of_val">spec_size_of_val</a>&lt;T&gt;(val_ref);
+<pre><code><b>ensures</b> result == <a href="type_info.md#0x1_type_info_spec_size_of_val">spec_size_of_val</a>&lt;T&gt;(val_ref);
 </code></pre>
 
 
diff --git a/aptos-move/framework/aptos-stdlib/sources/type_info.move b/aptos-move/framework/aptos-stdlib/sources/type_info.move
index 2ad3bba4041cc..56d413f166a74 100644
--- a/aptos-move/framework/aptos-stdlib/sources/type_info.move
+++ b/aptos-move/framework/aptos-stdlib/sources/type_info.move
@@ -2,7 +2,6 @@ module aptos_std::type_info {
     use std::bcs;
     use std::features;
     use std::string::{Self, String};
-    use std::vector;
 
     //
     // Error codes
@@ -65,13 +64,15 @@ module aptos_std::type_info {
     /// nesting patterns, as well as `test_size_of_val_vectors()` for an
     /// analysis of vector size dynamism.
     public fun size_of_val<T>(val_ref: &T): u64 {
-        // Return vector length of vectorized BCS representation.
-        vector::length(&bcs::to_bytes(val_ref))
+        bcs::serialized_size(val_ref)
     }
 
     #[test_only]
     use aptos_std::table::Table;
 
+    #[test_only]
+    use std::vector;
+
     #[test]
     fun test_type_of() {
         let type_info = type_of<TypeInfo>();
diff --git a/aptos-move/framework/aptos-stdlib/sources/type_info.spec.move b/aptos-move/framework/aptos-stdlib/sources/type_info.spec.move
index ed3ed481c8008..26fe9b6163c6a 100644
--- a/aptos-move/framework/aptos-stdlib/sources/type_info.spec.move
+++ b/aptos-move/framework/aptos-stdlib/sources/type_info.spec.move
@@ -30,7 +30,6 @@ spec aptos_std::type_info {
     }
 
     spec size_of_val<T>(val_ref: &T): u64 {
-        aborts_if false;
         ensures result == spec_size_of_val<T>(val_ref);
     }
 }
diff --git a/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/any.md b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/any.md
new file mode 100644
index 0000000000000..cb36046ce688c
--- /dev/null
+++ b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/any.md
@@ -0,0 +1,252 @@
+
+<a id="0x1_any"></a>
+
+# Module `0x1::any`
+
+
+
+-  [Struct `Any`](#0x1_any_Any)
+-  [Constants](#@Constants_0)
+-  [Function `pack`](#0x1_any_pack)
+-  [Function `unpack`](#0x1_any_unpack)
+-  [Function `type_name`](#0x1_any_type_name)
+-  [Specification](#@Specification_1)
+    -  [Function `pack`](#@Specification_1_pack)
+    -  [Function `unpack`](#@Specification_1_unpack)
+    -  [Function `type_name`](#@Specification_1_type_name)
+
+
+<pre><code><b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs">0x1::bcs</a>;
+<b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="from_bcs.md#0x1_from_bcs">0x1::from_bcs</a>;
+<b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string">0x1::string</a>;
+<b>use</b> <a href="type_info.md#0x1_type_info">0x1::type_info</a>;
+</code></pre>
+
+
+
+<a id="0x1_any_Any"></a>
+
+## Struct `Any`
+
+A type which can represent a value of any type. This allows for representation of 'unknown' future
+values. For example, to define a resource such that it can be later be extended without breaking
+changes one can do
+
+```move
+struct Resource {
+field: Type,
+...
+extension: Option<Any>
+}
+```
+
+
+<pre><code><b>struct</b> <a href="any.md#0x1_any_Any">Any</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>type_name: <a href="../../../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>data: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_any_ETYPE_MISMATCH"></a>
+
+The type provided for <code>unpack</code> is not the same as was given for <code>pack</code>.
+
+
+<pre><code><b>const</b> <a href="any.md#0x1_any_ETYPE_MISMATCH">ETYPE_MISMATCH</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_any_pack"></a>
+
+## Function `pack`
+
+Pack a value into the <code><a href="any.md#0x1_any_Any">Any</a></code> representation. Because Any can be stored and dropped, this is
+also required from <code>T</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="any.md#0x1_any_pack">pack</a>&lt;T: drop, store&gt;(x: T): <a href="any.md#0x1_any_Any">any::Any</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="any.md#0x1_any_pack">pack</a>&lt;T: drop + store&gt;(x: T): <a href="any.md#0x1_any_Any">Any</a> {
+    <a href="any.md#0x1_any_Any">Any</a> {
+        type_name: <a href="type_info.md#0x1_type_info_type_name">type_info::type_name</a>&lt;T&gt;(),
+        data: to_bytes(&x)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_any_unpack"></a>
+
+## Function `unpack`
+
+Unpack a value from the <code><a href="any.md#0x1_any_Any">Any</a></code> representation. This aborts if the value has not the expected type <code>T</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="any.md#0x1_any_unpack">unpack</a>&lt;T&gt;(x: <a href="any.md#0x1_any_Any">any::Any</a>): T
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="any.md#0x1_any_unpack">unpack</a>&lt;T&gt;(x: <a href="any.md#0x1_any_Any">Any</a>): T {
+    <b>assert</b>!(<a href="type_info.md#0x1_type_info_type_name">type_info::type_name</a>&lt;T&gt;() == x.type_name, <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="any.md#0x1_any_ETYPE_MISMATCH">ETYPE_MISMATCH</a>));
+    from_bytes&lt;T&gt;(x.data)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_any_type_name"></a>
+
+## Function `type_name`
+
+Returns the type name of this Any
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="any.md#0x1_any_type_name">type_name</a>(x: &<a href="any.md#0x1_any_Any">any::Any</a>): &<a href="../../../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="any.md#0x1_any_type_name">type_name</a>(x: &<a href="any.md#0x1_any_Any">Any</a>): &String {
+    &x.type_name
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+<a id="@Specification_1_pack"></a>
+
+### Function `pack`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="any.md#0x1_any_pack">pack</a>&lt;T: drop, store&gt;(x: T): <a href="any.md#0x1_any_Any">any::Any</a>
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="any.md#0x1_any_Any">Any</a> {
+    type_name: <a href="type_info.md#0x1_type_info_type_name">type_info::type_name</a>&lt;T&gt;(),
+    data: <a href="../../../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs_serialize">bcs::serialize</a>&lt;T&gt;(x)
+};
+<b>ensures</b> [abstract] <a href="from_bcs.md#0x1_from_bcs_deserializable">from_bcs::deserializable</a>&lt;T&gt;(result.data);
+</code></pre>
+
+
+
+<a id="@Specification_1_unpack"></a>
+
+### Function `unpack`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="any.md#0x1_any_unpack">unpack</a>&lt;T&gt;(x: <a href="any.md#0x1_any_Any">any::Any</a>): T
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="any.md#0x1_any_UnpackAbortsIf">UnpackAbortsIf</a>&lt;T&gt;;
+<b>ensures</b> result == <a href="from_bcs.md#0x1_from_bcs_deserialize">from_bcs::deserialize</a>&lt;T&gt;(x.data);
+</code></pre>
+
+
+
+
+<a id="0x1_any_UnpackAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="any.md#0x1_any_UnpackAbortsIf">UnpackAbortsIf</a>&lt;T&gt; {
+    x: <a href="any.md#0x1_any_Any">Any</a>;
+    <b>aborts_if</b> <a href="type_info.md#0x1_type_info_type_name">type_info::type_name</a>&lt;T&gt;() != x.type_name;
+    <b>aborts_if</b> !<a href="from_bcs.md#0x1_from_bcs_deserializable">from_bcs::deserializable</a>&lt;T&gt;(x.data);
+}
+</code></pre>
+
+
+
+
+<a id="0x1_any_UnpackRequirement"></a>
+
+
+<pre><code><b>schema</b> <a href="any.md#0x1_any_UnpackRequirement">UnpackRequirement</a>&lt;T&gt; {
+    x: <a href="any.md#0x1_any_Any">Any</a>;
+    <b>requires</b> <a href="type_info.md#0x1_type_info_type_name">type_info::type_name</a>&lt;T&gt;() == x.type_name;
+    <b>requires</b> <a href="from_bcs.md#0x1_from_bcs_deserializable">from_bcs::deserializable</a>&lt;T&gt;(x.data);
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_type_name"></a>
+
+### Function `type_name`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="any.md#0x1_any_type_name">type_name</a>(x: &<a href="any.md#0x1_any_Any">any::Any</a>): &<a href="../../../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == x.type_name;
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/big_vector.md b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/big_vector.md
new file mode 100644
index 0000000000000..a983f2f515a13
--- /dev/null
+++ b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/big_vector.md
@@ -0,0 +1,1120 @@
+
+<a id="0x1_big_vector"></a>
+
+# Module `0x1::big_vector`
+
+
+
+-  [Struct `BigVector`](#0x1_big_vector_BigVector)
+-  [Constants](#@Constants_0)
+-  [Function `empty`](#0x1_big_vector_empty)
+-  [Function `singleton`](#0x1_big_vector_singleton)
+-  [Function `destroy_empty`](#0x1_big_vector_destroy_empty)
+-  [Function `destroy`](#0x1_big_vector_destroy)
+-  [Function `borrow`](#0x1_big_vector_borrow)
+-  [Function `borrow_mut`](#0x1_big_vector_borrow_mut)
+-  [Function `append`](#0x1_big_vector_append)
+-  [Function `push_back`](#0x1_big_vector_push_back)
+-  [Function `pop_back`](#0x1_big_vector_pop_back)
+-  [Function `remove`](#0x1_big_vector_remove)
+-  [Function `swap_remove`](#0x1_big_vector_swap_remove)
+-  [Function `swap`](#0x1_big_vector_swap)
+-  [Function `reverse`](#0x1_big_vector_reverse)
+-  [Function `index_of`](#0x1_big_vector_index_of)
+-  [Function `contains`](#0x1_big_vector_contains)
+-  [Function `to_vector`](#0x1_big_vector_to_vector)
+-  [Function `length`](#0x1_big_vector_length)
+-  [Function `is_empty`](#0x1_big_vector_is_empty)
+-  [Specification](#@Specification_1)
+    -  [Struct `BigVector`](#@Specification_1_BigVector)
+    -  [Function `empty`](#@Specification_1_empty)
+    -  [Function `singleton`](#@Specification_1_singleton)
+    -  [Function `destroy_empty`](#@Specification_1_destroy_empty)
+    -  [Function `borrow`](#@Specification_1_borrow)
+    -  [Function `borrow_mut`](#@Specification_1_borrow_mut)
+    -  [Function `append`](#@Specification_1_append)
+    -  [Function `push_back`](#@Specification_1_push_back)
+    -  [Function `pop_back`](#@Specification_1_pop_back)
+    -  [Function `remove`](#@Specification_1_remove)
+    -  [Function `swap_remove`](#@Specification_1_swap_remove)
+    -  [Function `swap`](#@Specification_1_swap)
+    -  [Function `reverse`](#@Specification_1_reverse)
+    -  [Function `index_of`](#@Specification_1_index_of)
+
+
+<pre><code><b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="table_with_length.md#0x1_table_with_length">0x1::table_with_length</a>;
+<b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">0x1::vector</a>;
+</code></pre>
+
+
+
+<a id="0x1_big_vector_BigVector"></a>
+
+## Struct `BigVector`
+
+A scalable vector implementation based on tables where elements are grouped into buckets.
+Each bucket has a capacity of <code>bucket_size</code> elements.
+
+
+<pre><code><b>struct</b> <a href="big_vector.md#0x1_big_vector_BigVector">BigVector</a>&lt;T&gt; <b>has</b> store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>buckets: <a href="table_with_length.md#0x1_table_with_length_TableWithLength">table_with_length::TableWithLength</a>&lt;u64, <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;T&gt;&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>end_index: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>bucket_size: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_big_vector_EINDEX_OUT_OF_BOUNDS"></a>
+
+Vector index is out of bounds
+
+
+<pre><code><b>const</b> <a href="big_vector.md#0x1_big_vector_EINDEX_OUT_OF_BOUNDS">EINDEX_OUT_OF_BOUNDS</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_big_vector_EVECTOR_EMPTY"></a>
+
+Cannot pop back from an empty vector
+
+
+<pre><code><b>const</b> <a href="big_vector.md#0x1_big_vector_EVECTOR_EMPTY">EVECTOR_EMPTY</a>: u64 = 3;
+</code></pre>
+
+
+
+<a id="0x1_big_vector_EVECTOR_NOT_EMPTY"></a>
+
+Cannot destroy a non-empty vector
+
+
+<pre><code><b>const</b> <a href="big_vector.md#0x1_big_vector_EVECTOR_NOT_EMPTY">EVECTOR_NOT_EMPTY</a>: u64 = 2;
+</code></pre>
+
+
+
+<a id="0x1_big_vector_EZERO_BUCKET_SIZE"></a>
+
+bucket_size cannot be 0
+
+
+<pre><code><b>const</b> <a href="big_vector.md#0x1_big_vector_EZERO_BUCKET_SIZE">EZERO_BUCKET_SIZE</a>: u64 = 4;
+</code></pre>
+
+
+
+<a id="0x1_big_vector_empty"></a>
+
+## Function `empty`
+
+Regular Vector API
+Create an empty vector.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="big_vector.md#0x1_big_vector_empty">empty</a>&lt;T: store&gt;(bucket_size: u64): <a href="big_vector.md#0x1_big_vector_BigVector">big_vector::BigVector</a>&lt;T&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="big_vector.md#0x1_big_vector_empty">empty</a>&lt;T: store&gt;(bucket_size: u64): <a href="big_vector.md#0x1_big_vector_BigVector">BigVector</a>&lt;T&gt; {
+    <b>assert</b>!(bucket_size &gt; 0, <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="big_vector.md#0x1_big_vector_EZERO_BUCKET_SIZE">EZERO_BUCKET_SIZE</a>));
+    <a href="big_vector.md#0x1_big_vector_BigVector">BigVector</a> {
+        buckets: <a href="table_with_length.md#0x1_table_with_length_new">table_with_length::new</a>(),
+        end_index: 0,
+        bucket_size,
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_big_vector_singleton"></a>
+
+## Function `singleton`
+
+Create a vector of length 1 containing the passed in element.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="big_vector.md#0x1_big_vector_singleton">singleton</a>&lt;T: store&gt;(element: T, bucket_size: u64): <a href="big_vector.md#0x1_big_vector_BigVector">big_vector::BigVector</a>&lt;T&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="big_vector.md#0x1_big_vector_singleton">singleton</a>&lt;T: store&gt;(element: T, bucket_size: u64): <a href="big_vector.md#0x1_big_vector_BigVector">BigVector</a>&lt;T&gt; {
+    <b>let</b> v = <a href="big_vector.md#0x1_big_vector_empty">empty</a>(bucket_size);
+    <a href="big_vector.md#0x1_big_vector_push_back">push_back</a>(&<b>mut</b> v, element);
+    v
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_big_vector_destroy_empty"></a>
+
+## Function `destroy_empty`
+
+Destroy the vector <code>v</code>.
+Aborts if <code>v</code> is not empty.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="big_vector.md#0x1_big_vector_destroy_empty">destroy_empty</a>&lt;T&gt;(v: <a href="big_vector.md#0x1_big_vector_BigVector">big_vector::BigVector</a>&lt;T&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="big_vector.md#0x1_big_vector_destroy_empty">destroy_empty</a>&lt;T&gt;(v: <a href="big_vector.md#0x1_big_vector_BigVector">BigVector</a>&lt;T&gt;) {
+    <b>assert</b>!(<a href="big_vector.md#0x1_big_vector_is_empty">is_empty</a>(&v), <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="big_vector.md#0x1_big_vector_EVECTOR_NOT_EMPTY">EVECTOR_NOT_EMPTY</a>));
+    <b>let</b> <a href="big_vector.md#0x1_big_vector_BigVector">BigVector</a> { buckets, end_index: _, bucket_size: _ } = v;
+    <a href="table_with_length.md#0x1_table_with_length_destroy_empty">table_with_length::destroy_empty</a>(buckets);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_big_vector_destroy"></a>
+
+## Function `destroy`
+
+Destroy the vector <code>v</code> if T has <code>drop</code>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="big_vector.md#0x1_big_vector_destroy">destroy</a>&lt;T: drop&gt;(v: <a href="big_vector.md#0x1_big_vector_BigVector">big_vector::BigVector</a>&lt;T&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="big_vector.md#0x1_big_vector_destroy">destroy</a>&lt;T: drop&gt;(v: <a href="big_vector.md#0x1_big_vector_BigVector">BigVector</a>&lt;T&gt;) {
+    <b>let</b> <a href="big_vector.md#0x1_big_vector_BigVector">BigVector</a> { buckets, end_index, bucket_size: _ } = v;
+    <b>let</b> i = 0;
+    <b>while</b> (end_index &gt; 0) {
+        <b>let</b> num_elements = <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&<a href="table_with_length.md#0x1_table_with_length_remove">table_with_length::remove</a>(&<b>mut</b> buckets, i));
+        end_index = end_index - num_elements;
+        i = i + 1;
+    };
+    <a href="table_with_length.md#0x1_table_with_length_destroy_empty">table_with_length::destroy_empty</a>(buckets);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_big_vector_borrow"></a>
+
+## Function `borrow`
+
+Acquire an immutable reference to the <code>i</code>th element of the vector <code>v</code>.
+Aborts if <code>i</code> is out of bounds.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="big_vector.md#0x1_big_vector_borrow">borrow</a>&lt;T&gt;(v: &<a href="big_vector.md#0x1_big_vector_BigVector">big_vector::BigVector</a>&lt;T&gt;, i: u64): &T
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="big_vector.md#0x1_big_vector_borrow">borrow</a>&lt;T&gt;(v: &<a href="big_vector.md#0x1_big_vector_BigVector">BigVector</a>&lt;T&gt;, i: u64): &T {
+    <b>assert</b>!(i &lt; <a href="big_vector.md#0x1_big_vector_length">length</a>(v), <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="big_vector.md#0x1_big_vector_EINDEX_OUT_OF_BOUNDS">EINDEX_OUT_OF_BOUNDS</a>));
+    <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(<a href="table_with_length.md#0x1_table_with_length_borrow">table_with_length::borrow</a>(&v.buckets, i / v.bucket_size), i % v.bucket_size)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_big_vector_borrow_mut"></a>
+
+## Function `borrow_mut`
+
+Return a mutable reference to the <code>i</code>th element in the vector <code>v</code>.
+Aborts if <code>i</code> is out of bounds.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="big_vector.md#0x1_big_vector_borrow_mut">borrow_mut</a>&lt;T&gt;(v: &<b>mut</b> <a href="big_vector.md#0x1_big_vector_BigVector">big_vector::BigVector</a>&lt;T&gt;, i: u64): &<b>mut</b> T
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="big_vector.md#0x1_big_vector_borrow_mut">borrow_mut</a>&lt;T&gt;(v: &<b>mut</b> <a href="big_vector.md#0x1_big_vector_BigVector">BigVector</a>&lt;T&gt;, i: u64): &<b>mut</b> T {
+    <b>assert</b>!(i &lt; <a href="big_vector.md#0x1_big_vector_length">length</a>(v), <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="big_vector.md#0x1_big_vector_EINDEX_OUT_OF_BOUNDS">EINDEX_OUT_OF_BOUNDS</a>));
+    <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow_mut">vector::borrow_mut</a>(<a href="table_with_length.md#0x1_table_with_length_borrow_mut">table_with_length::borrow_mut</a>(&<b>mut</b> v.buckets, i / v.bucket_size), i % v.bucket_size)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_big_vector_append"></a>
+
+## Function `append`
+
+Empty and destroy the other vector, and push each of the elements in the other vector onto the lhs vector in the
+same order as they occurred in other.
+Disclaimer: This function is costly. Use it at your own discretion.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="big_vector.md#0x1_big_vector_append">append</a>&lt;T: store&gt;(lhs: &<b>mut</b> <a href="big_vector.md#0x1_big_vector_BigVector">big_vector::BigVector</a>&lt;T&gt;, other: <a href="big_vector.md#0x1_big_vector_BigVector">big_vector::BigVector</a>&lt;T&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="big_vector.md#0x1_big_vector_append">append</a>&lt;T: store&gt;(lhs: &<b>mut</b> <a href="big_vector.md#0x1_big_vector_BigVector">BigVector</a>&lt;T&gt;, other: <a href="big_vector.md#0x1_big_vector_BigVector">BigVector</a>&lt;T&gt;) {
+    <b>let</b> other_len = <a href="big_vector.md#0x1_big_vector_length">length</a>(&other);
+    <b>let</b> half_other_len = other_len / 2;
+    <b>let</b> i = 0;
+    <b>while</b> (i &lt; half_other_len) {
+        <a href="big_vector.md#0x1_big_vector_push_back">push_back</a>(lhs, <a href="big_vector.md#0x1_big_vector_swap_remove">swap_remove</a>(&<b>mut</b> other, i));
+        i = i + 1;
+    };
+    <b>while</b> (i &lt; other_len) {
+        <a href="big_vector.md#0x1_big_vector_push_back">push_back</a>(lhs, <a href="big_vector.md#0x1_big_vector_pop_back">pop_back</a>(&<b>mut</b> other));
+        i = i + 1;
+    };
+    <a href="big_vector.md#0x1_big_vector_destroy_empty">destroy_empty</a>(other);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_big_vector_push_back"></a>
+
+## Function `push_back`
+
+Add element <code>val</code> to the end of the vector <code>v</code>. It grows the buckets when the current buckets are full.
+This operation will cost more gas when it adds new bucket.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="big_vector.md#0x1_big_vector_push_back">push_back</a>&lt;T: store&gt;(v: &<b>mut</b> <a href="big_vector.md#0x1_big_vector_BigVector">big_vector::BigVector</a>&lt;T&gt;, val: T)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="big_vector.md#0x1_big_vector_push_back">push_back</a>&lt;T: store&gt;(v: &<b>mut</b> <a href="big_vector.md#0x1_big_vector_BigVector">BigVector</a>&lt;T&gt;, val: T) {
+    <b>let</b> num_buckets = <a href="table_with_length.md#0x1_table_with_length_length">table_with_length::length</a>(&v.buckets);
+    <b>if</b> (v.end_index == num_buckets * v.bucket_size) {
+        <a href="table_with_length.md#0x1_table_with_length_add">table_with_length::add</a>(&<b>mut</b> v.buckets, num_buckets, <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_empty">vector::empty</a>());
+        <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_push_back">vector::push_back</a>(<a href="table_with_length.md#0x1_table_with_length_borrow_mut">table_with_length::borrow_mut</a>(&<b>mut</b> v.buckets, num_buckets), val);
+    } <b>else</b> {
+        <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_push_back">vector::push_back</a>(<a href="table_with_length.md#0x1_table_with_length_borrow_mut">table_with_length::borrow_mut</a>(&<b>mut</b> v.buckets, num_buckets - 1), val);
+    };
+    v.end_index = v.end_index + 1;
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_big_vector_pop_back"></a>
+
+## Function `pop_back`
+
+Pop an element from the end of vector <code>v</code>. It doesn't shrink the buckets even if they're empty.
+Call <code>shrink_to_fit</code> explicity to deallocate empty buckets.
+Aborts if <code>v</code> is empty.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="big_vector.md#0x1_big_vector_pop_back">pop_back</a>&lt;T&gt;(v: &<b>mut</b> <a href="big_vector.md#0x1_big_vector_BigVector">big_vector::BigVector</a>&lt;T&gt;): T
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="big_vector.md#0x1_big_vector_pop_back">pop_back</a>&lt;T&gt;(v: &<b>mut</b> <a href="big_vector.md#0x1_big_vector_BigVector">BigVector</a>&lt;T&gt;): T {
+    <b>assert</b>!(!<a href="big_vector.md#0x1_big_vector_is_empty">is_empty</a>(v), <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="big_vector.md#0x1_big_vector_EVECTOR_EMPTY">EVECTOR_EMPTY</a>));
+    <b>let</b> num_buckets = <a href="table_with_length.md#0x1_table_with_length_length">table_with_length::length</a>(&v.buckets);
+    <b>let</b> last_bucket = <a href="table_with_length.md#0x1_table_with_length_borrow_mut">table_with_length::borrow_mut</a>(&<b>mut</b> v.buckets, num_buckets - 1);
+    <b>let</b> val = <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_pop_back">vector::pop_back</a>(last_bucket);
+    // Shrink the <a href="table.md#0x1_table">table</a> <b>if</b> the last <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a> is empty.
+    <b>if</b> (<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_is_empty">vector::is_empty</a>(last_bucket)) {
+        <b>move</b> last_bucket;
+        <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_destroy_empty">vector::destroy_empty</a>(<a href="table_with_length.md#0x1_table_with_length_remove">table_with_length::remove</a>(&<b>mut</b> v.buckets, num_buckets - 1));
+    };
+    v.end_index = v.end_index - 1;
+    val
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_big_vector_remove"></a>
+
+## Function `remove`
+
+Remove the element at index i in the vector v and return the owned value that was previously stored at i in v.
+All elements occurring at indices greater than i will be shifted down by 1. Will abort if i is out of bounds.
+Disclaimer: This function is costly. Use it at your own discretion.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="big_vector.md#0x1_big_vector_remove">remove</a>&lt;T&gt;(v: &<b>mut</b> <a href="big_vector.md#0x1_big_vector_BigVector">big_vector::BigVector</a>&lt;T&gt;, i: u64): T
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="big_vector.md#0x1_big_vector_remove">remove</a>&lt;T&gt;(v: &<b>mut</b> <a href="big_vector.md#0x1_big_vector_BigVector">BigVector</a>&lt;T&gt;, i: u64): T {
+    <b>let</b> len = <a href="big_vector.md#0x1_big_vector_length">length</a>(v);
+    <b>assert</b>!(i &lt; len, <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="big_vector.md#0x1_big_vector_EINDEX_OUT_OF_BOUNDS">EINDEX_OUT_OF_BOUNDS</a>));
+    <b>let</b> num_buckets = <a href="table_with_length.md#0x1_table_with_length_length">table_with_length::length</a>(&v.buckets);
+    <b>let</b> cur_bucket_index = i / v.bucket_size + 1;
+    <b>let</b> cur_bucket = <a href="table_with_length.md#0x1_table_with_length_borrow_mut">table_with_length::borrow_mut</a>(&<b>mut</b> v.buckets, cur_bucket_index - 1);
+    <b>let</b> res = <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_remove">vector::remove</a>(cur_bucket, i % v.bucket_size);
+    v.end_index = v.end_index - 1;
+    <b>move</b> cur_bucket;
+    <b>while</b> ({
+        <b>spec</b> {
+            <b>invariant</b> cur_bucket_index &lt;= num_buckets;
+            <b>invariant</b> <a href="table_with_length.md#0x1_table_with_length_spec_len">table_with_length::spec_len</a>(v.buckets) == num_buckets;
+        };
+        (cur_bucket_index &lt; num_buckets)
+    }) {
+        // remove one element from the start of current <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>
+        <b>let</b> cur_bucket = <a href="table_with_length.md#0x1_table_with_length_borrow_mut">table_with_length::borrow_mut</a>(&<b>mut</b> v.buckets, cur_bucket_index);
+        <b>let</b> t = <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_remove">vector::remove</a>(cur_bucket, 0);
+        <b>move</b> cur_bucket;
+        // and put it at the end of the last one
+        <b>let</b> prev_bucket = <a href="table_with_length.md#0x1_table_with_length_borrow_mut">table_with_length::borrow_mut</a>(&<b>mut</b> v.buckets, cur_bucket_index - 1);
+        <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_push_back">vector::push_back</a>(prev_bucket, t);
+        cur_bucket_index = cur_bucket_index + 1;
+    };
+    <b>spec</b> {
+        <b>assert</b> cur_bucket_index == num_buckets;
+    };
+
+    // Shrink the <a href="table.md#0x1_table">table</a> <b>if</b> the last <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a> is empty.
+    <b>let</b> last_bucket = <a href="table_with_length.md#0x1_table_with_length_borrow_mut">table_with_length::borrow_mut</a>(&<b>mut</b> v.buckets, num_buckets - 1);
+    <b>if</b> (<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_is_empty">vector::is_empty</a>(last_bucket)) {
+        <b>move</b> last_bucket;
+        <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_destroy_empty">vector::destroy_empty</a>(<a href="table_with_length.md#0x1_table_with_length_remove">table_with_length::remove</a>(&<b>mut</b> v.buckets, num_buckets - 1));
+    };
+
+    res
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_big_vector_swap_remove"></a>
+
+## Function `swap_remove`
+
+Swap the <code>i</code>th element of the vector <code>v</code> with the last element and then pop the vector.
+This is O(1), but does not preserve ordering of elements in the vector.
+Aborts if <code>i</code> is out of bounds.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="big_vector.md#0x1_big_vector_swap_remove">swap_remove</a>&lt;T&gt;(v: &<b>mut</b> <a href="big_vector.md#0x1_big_vector_BigVector">big_vector::BigVector</a>&lt;T&gt;, i: u64): T
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="big_vector.md#0x1_big_vector_swap_remove">swap_remove</a>&lt;T&gt;(v: &<b>mut</b> <a href="big_vector.md#0x1_big_vector_BigVector">BigVector</a>&lt;T&gt;, i: u64): T {
+    <b>assert</b>!(i &lt; <a href="big_vector.md#0x1_big_vector_length">length</a>(v), <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="big_vector.md#0x1_big_vector_EINDEX_OUT_OF_BOUNDS">EINDEX_OUT_OF_BOUNDS</a>));
+    <b>let</b> last_val = <a href="big_vector.md#0x1_big_vector_pop_back">pop_back</a>(v);
+    // <b>if</b> the requested value is the last one, <b>return</b> it
+    <b>if</b> (v.end_index == i) {
+        <b>return</b> last_val
+    };
+    // because the lack of mem::swap, here we swap remove the requested value from the bucket
+    // and append the last_val <b>to</b> the bucket then swap the last bucket val back
+    <b>let</b> bucket = <a href="table_with_length.md#0x1_table_with_length_borrow_mut">table_with_length::borrow_mut</a>(&<b>mut</b> v.buckets, i / v.bucket_size);
+    <b>let</b> bucket_len = <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(bucket);
+    <b>let</b> val = <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_swap_remove">vector::swap_remove</a>(bucket, i % v.bucket_size);
+    <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_push_back">vector::push_back</a>(bucket, last_val);
+    <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_swap">vector::swap</a>(bucket, i % v.bucket_size, bucket_len - 1);
+    val
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_big_vector_swap"></a>
+
+## Function `swap`
+
+Swap the elements at the i'th and j'th indices in the vector v. Will abort if either of i or j are out of bounds
+for v.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="big_vector.md#0x1_big_vector_swap">swap</a>&lt;T&gt;(v: &<b>mut</b> <a href="big_vector.md#0x1_big_vector_BigVector">big_vector::BigVector</a>&lt;T&gt;, i: u64, j: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="big_vector.md#0x1_big_vector_swap">swap</a>&lt;T&gt;(v: &<b>mut</b> <a href="big_vector.md#0x1_big_vector_BigVector">BigVector</a>&lt;T&gt;, i: u64, j: u64) {
+    <b>assert</b>!(i &lt; <a href="big_vector.md#0x1_big_vector_length">length</a>(v) && j &lt; <a href="big_vector.md#0x1_big_vector_length">length</a>(v), <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="big_vector.md#0x1_big_vector_EINDEX_OUT_OF_BOUNDS">EINDEX_OUT_OF_BOUNDS</a>));
+    <b>let</b> i_bucket_index = i / v.bucket_size;
+    <b>let</b> j_bucket_index = j / v.bucket_size;
+    <b>let</b> i_vector_index = i % v.bucket_size;
+    <b>let</b> j_vector_index = j % v.bucket_size;
+    <b>if</b> (i_bucket_index == j_bucket_index) {
+        <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_swap">vector::swap</a>(<a href="table_with_length.md#0x1_table_with_length_borrow_mut">table_with_length::borrow_mut</a>(&<b>mut</b> v.buckets, i_bucket_index), i_vector_index, j_vector_index);
+        <b>return</b>
+    };
+    // If i and j are in different buckets, take the buckets out first for easy mutation.
+    <b>let</b> bucket_i = <a href="table_with_length.md#0x1_table_with_length_remove">table_with_length::remove</a>(&<b>mut</b> v.buckets, i_bucket_index);
+    <b>let</b> bucket_j = <a href="table_with_length.md#0x1_table_with_length_remove">table_with_length::remove</a>(&<b>mut</b> v.buckets, j_bucket_index);
+    // Get the elements from buckets by calling `swap_remove`.
+    <b>let</b> element_i = <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_swap_remove">vector::swap_remove</a>(&<b>mut</b> bucket_i, i_vector_index);
+    <b>let</b> element_j = <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_swap_remove">vector::swap_remove</a>(&<b>mut</b> bucket_j, j_vector_index);
+    // Swap the elements and push back <b>to</b> the other bucket.
+    <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_push_back">vector::push_back</a>(&<b>mut</b> bucket_i, element_j);
+    <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_push_back">vector::push_back</a>(&<b>mut</b> bucket_j, element_i);
+    <b>let</b> last_index_in_bucket_i = <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&bucket_i) - 1;
+    <b>let</b> last_index_in_bucket_j = <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&bucket_j) - 1;
+    // Re-position the swapped elements <b>to</b> the right index.
+    <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_swap">vector::swap</a>(&<b>mut</b> bucket_i, i_vector_index, last_index_in_bucket_i);
+    <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_swap">vector::swap</a>(&<b>mut</b> bucket_j, j_vector_index, last_index_in_bucket_j);
+    // Add back the buckets.
+    <a href="table_with_length.md#0x1_table_with_length_add">table_with_length::add</a>(&<b>mut</b> v.buckets, i_bucket_index, bucket_i);
+    <a href="table_with_length.md#0x1_table_with_length_add">table_with_length::add</a>(&<b>mut</b> v.buckets, j_bucket_index, bucket_j);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_big_vector_reverse"></a>
+
+## Function `reverse`
+
+Reverse the order of the elements in the vector v in-place.
+Disclaimer: This function is costly. Use it at your own discretion.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="big_vector.md#0x1_big_vector_reverse">reverse</a>&lt;T&gt;(v: &<b>mut</b> <a href="big_vector.md#0x1_big_vector_BigVector">big_vector::BigVector</a>&lt;T&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="big_vector.md#0x1_big_vector_reverse">reverse</a>&lt;T&gt;(v: &<b>mut</b> <a href="big_vector.md#0x1_big_vector_BigVector">BigVector</a>&lt;T&gt;) {
+    <b>let</b> new_buckets = <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>[];
+    <b>let</b> push_bucket = <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>[];
+    <b>let</b> num_buckets = <a href="table_with_length.md#0x1_table_with_length_length">table_with_length::length</a>(&v.buckets);
+    <b>let</b> num_buckets_left = num_buckets;
+
+    <b>while</b> (num_buckets_left &gt; 0) {
+        <b>let</b> pop_bucket = <a href="table_with_length.md#0x1_table_with_length_remove">table_with_length::remove</a>(&<b>mut</b> v.buckets, num_buckets_left - 1);
+        <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_for_each_reverse">vector::for_each_reverse</a>(pop_bucket, |val| {
+            <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_push_back">vector::push_back</a>(&<b>mut</b> push_bucket, val);
+            <b>if</b> (<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&push_bucket) == v.bucket_size) {
+                <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_push_back">vector::push_back</a>(&<b>mut</b> new_buckets, push_bucket);
+                push_bucket = <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>[];
+            };
+        });
+        num_buckets_left = num_buckets_left - 1;
+    };
+
+    <b>if</b> (<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&push_bucket) &gt; 0) {
+        <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_push_back">vector::push_back</a>(&<b>mut</b> new_buckets, push_bucket);
+    } <b>else</b> {
+        <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_destroy_empty">vector::destroy_empty</a>(push_bucket);
+    };
+
+    <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_reverse">vector::reverse</a>(&<b>mut</b> new_buckets);
+    <b>let</b> i = 0;
+    <b>assert</b>!(<a href="table_with_length.md#0x1_table_with_length_length">table_with_length::length</a>(&v.buckets) == 0, 0);
+    <b>while</b> (i &lt; num_buckets) {
+        <a href="table_with_length.md#0x1_table_with_length_add">table_with_length::add</a>(&<b>mut</b> v.buckets, i, <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_pop_back">vector::pop_back</a>(&<b>mut</b> new_buckets));
+        i = i + 1;
+    };
+    <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_destroy_empty">vector::destroy_empty</a>(new_buckets);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_big_vector_index_of"></a>
+
+## Function `index_of`
+
+Return the index of the first occurrence of an element in v that is equal to e. Returns (true, index) if such an
+element was found, and (false, 0) otherwise.
+Disclaimer: This function is costly. Use it at your own discretion.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="big_vector.md#0x1_big_vector_index_of">index_of</a>&lt;T&gt;(v: &<a href="big_vector.md#0x1_big_vector_BigVector">big_vector::BigVector</a>&lt;T&gt;, val: &T): (bool, u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="big_vector.md#0x1_big_vector_index_of">index_of</a>&lt;T&gt;(v: &<a href="big_vector.md#0x1_big_vector_BigVector">BigVector</a>&lt;T&gt;, val: &T): (bool, u64) {
+    <b>let</b> num_buckets = <a href="table_with_length.md#0x1_table_with_length_length">table_with_length::length</a>(&v.buckets);
+    <b>let</b> bucket_index = 0;
+    <b>while</b> (bucket_index &lt; num_buckets) {
+        <b>let</b> cur = <a href="table_with_length.md#0x1_table_with_length_borrow">table_with_length::borrow</a>(&v.buckets, bucket_index);
+        <b>let</b> (found, i) = <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_index_of">vector::index_of</a>(cur, val);
+        <b>if</b> (found) {
+            <b>return</b> (<b>true</b>, bucket_index * v.bucket_size + i)
+        };
+        bucket_index = bucket_index + 1;
+    };
+    (<b>false</b>, 0)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_big_vector_contains"></a>
+
+## Function `contains`
+
+Return if an element equal to e exists in the vector v.
+Disclaimer: This function is costly. Use it at your own discretion.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="big_vector.md#0x1_big_vector_contains">contains</a>&lt;T&gt;(v: &<a href="big_vector.md#0x1_big_vector_BigVector">big_vector::BigVector</a>&lt;T&gt;, val: &T): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="big_vector.md#0x1_big_vector_contains">contains</a>&lt;T&gt;(v: &<a href="big_vector.md#0x1_big_vector_BigVector">BigVector</a>&lt;T&gt;, val: &T): bool {
+    <b>if</b> (<a href="big_vector.md#0x1_big_vector_is_empty">is_empty</a>(v)) <b>return</b> <b>false</b>;
+    <b>let</b> (exist, _) = <a href="big_vector.md#0x1_big_vector_index_of">index_of</a>(v, val);
+    exist
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_big_vector_to_vector"></a>
+
+## Function `to_vector`
+
+Convert a big vector to a native vector, which is supposed to be called mostly by view functions to get an
+atomic view of the whole vector.
+Disclaimer: This function may be costly as the big vector may be huge in size. Use it at your own discretion.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="big_vector.md#0x1_big_vector_to_vector">to_vector</a>&lt;T: <b>copy</b>&gt;(v: &<a href="big_vector.md#0x1_big_vector_BigVector">big_vector::BigVector</a>&lt;T&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;T&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="big_vector.md#0x1_big_vector_to_vector">to_vector</a>&lt;T: <b>copy</b>&gt;(v: &<a href="big_vector.md#0x1_big_vector_BigVector">BigVector</a>&lt;T&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;T&gt; {
+    <b>let</b> res = <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>[];
+    <b>let</b> num_buckets = <a href="table_with_length.md#0x1_table_with_length_length">table_with_length::length</a>(&v.buckets);
+    <b>let</b> i = 0;
+    <b>while</b> (i &lt; num_buckets) {
+        <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_append">vector::append</a>(&<b>mut</b> res, *<a href="table_with_length.md#0x1_table_with_length_borrow">table_with_length::borrow</a>(&v.buckets, i));
+        i = i + 1;
+    };
+    res
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_big_vector_length"></a>
+
+## Function `length`
+
+Return the length of the vector.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="big_vector.md#0x1_big_vector_length">length</a>&lt;T&gt;(v: &<a href="big_vector.md#0x1_big_vector_BigVector">big_vector::BigVector</a>&lt;T&gt;): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="big_vector.md#0x1_big_vector_length">length</a>&lt;T&gt;(v: &<a href="big_vector.md#0x1_big_vector_BigVector">BigVector</a>&lt;T&gt;): u64 {
+    v.end_index
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_big_vector_is_empty"></a>
+
+## Function `is_empty`
+
+Return <code><b>true</b></code> if the vector <code>v</code> has no elements and <code><b>false</b></code> otherwise.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="big_vector.md#0x1_big_vector_is_empty">is_empty</a>&lt;T&gt;(v: &<a href="big_vector.md#0x1_big_vector_BigVector">big_vector::BigVector</a>&lt;T&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="big_vector.md#0x1_big_vector_is_empty">is_empty</a>&lt;T&gt;(v: &<a href="big_vector.md#0x1_big_vector_BigVector">BigVector</a>&lt;T&gt;): bool {
+    <a href="big_vector.md#0x1_big_vector_length">length</a>(v) == 0
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+<a id="@Specification_1_BigVector"></a>
+
+### Struct `BigVector`
+
+
+<pre><code><b>struct</b> <a href="big_vector.md#0x1_big_vector_BigVector">BigVector</a>&lt;T&gt; <b>has</b> store
+</code></pre>
+
+
+
+<dl>
+<dt>
+<code>buckets: <a href="table_with_length.md#0x1_table_with_length_TableWithLength">table_with_length::TableWithLength</a>&lt;u64, <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;T&gt;&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>end_index: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>bucket_size: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+
+<pre><code><b>invariant</b> bucket_size != 0;
+<b>invariant</b> <a href="big_vector.md#0x1_big_vector_spec_table_len">spec_table_len</a>(buckets) == 0 ==&gt; end_index == 0;
+<b>invariant</b> end_index == 0 ==&gt; <a href="big_vector.md#0x1_big_vector_spec_table_len">spec_table_len</a>(buckets) == 0;
+<b>invariant</b> end_index &lt;= <a href="big_vector.md#0x1_big_vector_spec_table_len">spec_table_len</a>(buckets) * bucket_size;
+<b>invariant</b> <a href="big_vector.md#0x1_big_vector_spec_table_len">spec_table_len</a>(buckets) == 0
+    || (<b>forall</b> i in 0..<a href="big_vector.md#0x1_big_vector_spec_table_len">spec_table_len</a>(buckets)-1: len(<a href="table_with_length.md#0x1_table_with_length_spec_get">table_with_length::spec_get</a>(buckets, i)) == bucket_size);
+<b>invariant</b> <a href="big_vector.md#0x1_big_vector_spec_table_len">spec_table_len</a>(buckets) == 0
+    || len(<a href="table_with_length.md#0x1_table_with_length_spec_get">table_with_length::spec_get</a>(buckets, <a href="big_vector.md#0x1_big_vector_spec_table_len">spec_table_len</a>(buckets) -1 )) &lt;= bucket_size;
+<b>invariant</b> <b>forall</b> i in 0..<a href="big_vector.md#0x1_big_vector_spec_table_len">spec_table_len</a>(buckets): <a href="big_vector.md#0x1_big_vector_spec_table_contains">spec_table_contains</a>(buckets, i);
+<b>invariant</b> <a href="big_vector.md#0x1_big_vector_spec_table_len">spec_table_len</a>(buckets) == (end_index + bucket_size - 1) / bucket_size;
+<b>invariant</b> (<a href="big_vector.md#0x1_big_vector_spec_table_len">spec_table_len</a>(buckets) == 0 && end_index == 0)
+    || (<a href="big_vector.md#0x1_big_vector_spec_table_len">spec_table_len</a>(buckets) != 0 && ((<a href="big_vector.md#0x1_big_vector_spec_table_len">spec_table_len</a>(buckets) - 1) * bucket_size) + (len(<a href="table_with_length.md#0x1_table_with_length_spec_get">table_with_length::spec_get</a>(buckets, <a href="big_vector.md#0x1_big_vector_spec_table_len">spec_table_len</a>(buckets) - 1))) == end_index);
+<b>invariant</b> <b>forall</b> i: u64 <b>where</b> i &gt;= <a href="big_vector.md#0x1_big_vector_spec_table_len">spec_table_len</a>(buckets):  {
+    !<a href="big_vector.md#0x1_big_vector_spec_table_contains">spec_table_contains</a>(buckets, i)
+};
+<b>invariant</b> <b>forall</b> i: u64 <b>where</b> i &lt; <a href="big_vector.md#0x1_big_vector_spec_table_len">spec_table_len</a>(buckets):  {
+    <a href="big_vector.md#0x1_big_vector_spec_table_contains">spec_table_contains</a>(buckets, i)
+};
+<b>invariant</b> <a href="big_vector.md#0x1_big_vector_spec_table_len">spec_table_len</a>(buckets) == 0
+    || (len(<a href="table_with_length.md#0x1_table_with_length_spec_get">table_with_length::spec_get</a>(buckets, <a href="big_vector.md#0x1_big_vector_spec_table_len">spec_table_len</a>(buckets) - 1)) &gt; 0);
+</code></pre>
+
+
+
+<a id="@Specification_1_empty"></a>
+
+### Function `empty`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="big_vector.md#0x1_big_vector_empty">empty</a>&lt;T: store&gt;(bucket_size: u64): <a href="big_vector.md#0x1_big_vector_BigVector">big_vector::BigVector</a>&lt;T&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> bucket_size == 0;
+<b>ensures</b> <a href="big_vector.md#0x1_big_vector_length">length</a>(result) == 0;
+<b>ensures</b> result.bucket_size == bucket_size;
+</code></pre>
+
+
+
+<a id="@Specification_1_singleton"></a>
+
+### Function `singleton`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="big_vector.md#0x1_big_vector_singleton">singleton</a>&lt;T: store&gt;(element: T, bucket_size: u64): <a href="big_vector.md#0x1_big_vector_BigVector">big_vector::BigVector</a>&lt;T&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> bucket_size == 0;
+<b>ensures</b> <a href="big_vector.md#0x1_big_vector_length">length</a>(result) == 1;
+<b>ensures</b> result.bucket_size == bucket_size;
+</code></pre>
+
+
+
+<a id="@Specification_1_destroy_empty"></a>
+
+### Function `destroy_empty`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="big_vector.md#0x1_big_vector_destroy_empty">destroy_empty</a>&lt;T&gt;(v: <a href="big_vector.md#0x1_big_vector_BigVector">big_vector::BigVector</a>&lt;T&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<a href="big_vector.md#0x1_big_vector_is_empty">is_empty</a>(v);
+</code></pre>
+
+
+
+<a id="@Specification_1_borrow"></a>
+
+### Function `borrow`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="big_vector.md#0x1_big_vector_borrow">borrow</a>&lt;T&gt;(v: &<a href="big_vector.md#0x1_big_vector_BigVector">big_vector::BigVector</a>&lt;T&gt;, i: u64): &T
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> i &gt;= <a href="big_vector.md#0x1_big_vector_length">length</a>(v);
+<b>ensures</b> result == <a href="big_vector.md#0x1_big_vector_spec_at">spec_at</a>(v, i);
+</code></pre>
+
+
+
+<a id="@Specification_1_borrow_mut"></a>
+
+### Function `borrow_mut`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="big_vector.md#0x1_big_vector_borrow_mut">borrow_mut</a>&lt;T&gt;(v: &<b>mut</b> <a href="big_vector.md#0x1_big_vector_BigVector">big_vector::BigVector</a>&lt;T&gt;, i: u64): &<b>mut</b> T
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> i &gt;= <a href="big_vector.md#0x1_big_vector_length">length</a>(v);
+<b>ensures</b> result == <a href="big_vector.md#0x1_big_vector_spec_at">spec_at</a>(v, i);
+</code></pre>
+
+
+
+<a id="@Specification_1_append"></a>
+
+### Function `append`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="big_vector.md#0x1_big_vector_append">append</a>&lt;T: store&gt;(lhs: &<b>mut</b> <a href="big_vector.md#0x1_big_vector_BigVector">big_vector::BigVector</a>&lt;T&gt;, other: <a href="big_vector.md#0x1_big_vector_BigVector">big_vector::BigVector</a>&lt;T&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify=<b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_push_back"></a>
+
+### Function `push_back`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="big_vector.md#0x1_big_vector_push_back">push_back</a>&lt;T: store&gt;(v: &<b>mut</b> <a href="big_vector.md#0x1_big_vector_BigVector">big_vector::BigVector</a>&lt;T&gt;, val: T)
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> num_buckets = <a href="big_vector.md#0x1_big_vector_spec_table_len">spec_table_len</a>(v.buckets);
+<b>include</b> <a href="big_vector.md#0x1_big_vector_PushbackAbortsIf">PushbackAbortsIf</a>&lt;T&gt;;
+<b>ensures</b> <a href="big_vector.md#0x1_big_vector_length">length</a>(v) == <a href="big_vector.md#0x1_big_vector_length">length</a>(<b>old</b>(v)) + 1;
+<b>ensures</b> v.end_index == <b>old</b>(v.end_index) + 1;
+<b>ensures</b> <a href="big_vector.md#0x1_big_vector_spec_at">spec_at</a>(v, v.end_index-1) == val;
+<b>ensures</b> <b>forall</b> i in 0..v.end_index-1: <a href="big_vector.md#0x1_big_vector_spec_at">spec_at</a>(v, i) == <a href="big_vector.md#0x1_big_vector_spec_at">spec_at</a>(<b>old</b>(v), i);
+<b>ensures</b> v.bucket_size == <b>old</b>(v).bucket_size;
+</code></pre>
+
+
+
+
+<a id="0x1_big_vector_PushbackAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="big_vector.md#0x1_big_vector_PushbackAbortsIf">PushbackAbortsIf</a>&lt;T&gt; {
+    v: <a href="big_vector.md#0x1_big_vector_BigVector">BigVector</a>&lt;T&gt;;
+    <b>let</b> num_buckets = <a href="big_vector.md#0x1_big_vector_spec_table_len">spec_table_len</a>(v.buckets);
+    <b>aborts_if</b> num_buckets * v.bucket_size &gt; MAX_U64;
+    <b>aborts_if</b> v.end_index + 1 &gt; MAX_U64;
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_pop_back"></a>
+
+### Function `pop_back`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="big_vector.md#0x1_big_vector_pop_back">pop_back</a>&lt;T&gt;(v: &<b>mut</b> <a href="big_vector.md#0x1_big_vector_BigVector">big_vector::BigVector</a>&lt;T&gt;): T
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <a href="big_vector.md#0x1_big_vector_is_empty">is_empty</a>(v);
+<b>ensures</b> <a href="big_vector.md#0x1_big_vector_length">length</a>(v) == <a href="big_vector.md#0x1_big_vector_length">length</a>(<b>old</b>(v)) - 1;
+<b>ensures</b> result == <b>old</b>(<a href="big_vector.md#0x1_big_vector_spec_at">spec_at</a>(v, v.end_index-1));
+<b>ensures</b> <b>forall</b> i in 0..v.end_index: <a href="big_vector.md#0x1_big_vector_spec_at">spec_at</a>(v, i) == <a href="big_vector.md#0x1_big_vector_spec_at">spec_at</a>(<b>old</b>(v), i);
+</code></pre>
+
+
+
+<a id="@Specification_1_remove"></a>
+
+### Function `remove`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="big_vector.md#0x1_big_vector_remove">remove</a>&lt;T&gt;(v: &<b>mut</b> <a href="big_vector.md#0x1_big_vector_BigVector">big_vector::BigVector</a>&lt;T&gt;, i: u64): T
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify=<b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_swap_remove"></a>
+
+### Function `swap_remove`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="big_vector.md#0x1_big_vector_swap_remove">swap_remove</a>&lt;T&gt;(v: &<b>mut</b> <a href="big_vector.md#0x1_big_vector_BigVector">big_vector::BigVector</a>&lt;T&gt;, i: u64): T
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify_duration_estimate = 120;
+<b>aborts_if</b> i &gt;= <a href="big_vector.md#0x1_big_vector_length">length</a>(v);
+<b>ensures</b> <a href="big_vector.md#0x1_big_vector_length">length</a>(v) == <a href="big_vector.md#0x1_big_vector_length">length</a>(<b>old</b>(v)) - 1;
+<b>ensures</b> result == <a href="big_vector.md#0x1_big_vector_spec_at">spec_at</a>(<b>old</b>(v), i);
+</code></pre>
+
+
+
+<a id="@Specification_1_swap"></a>
+
+### Function `swap`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="big_vector.md#0x1_big_vector_swap">swap</a>&lt;T&gt;(v: &<b>mut</b> <a href="big_vector.md#0x1_big_vector_BigVector">big_vector::BigVector</a>&lt;T&gt;, i: u64, j: u64)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify_duration_estimate = 1000;
+<b>aborts_if</b> i &gt;= <a href="big_vector.md#0x1_big_vector_length">length</a>(v) || j &gt;= <a href="big_vector.md#0x1_big_vector_length">length</a>(v);
+<b>ensures</b> <a href="big_vector.md#0x1_big_vector_length">length</a>(v) == <a href="big_vector.md#0x1_big_vector_length">length</a>(<b>old</b>(v));
+<b>ensures</b> <a href="big_vector.md#0x1_big_vector_spec_at">spec_at</a>(v, i) == <a href="big_vector.md#0x1_big_vector_spec_at">spec_at</a>(<b>old</b>(v), j);
+<b>ensures</b> <a href="big_vector.md#0x1_big_vector_spec_at">spec_at</a>(v, j) == <a href="big_vector.md#0x1_big_vector_spec_at">spec_at</a>(<b>old</b>(v), i);
+<b>ensures</b> <b>forall</b> idx in 0..<a href="big_vector.md#0x1_big_vector_length">length</a>(v)
+    <b>where</b> idx != i && idx != j:
+    <a href="big_vector.md#0x1_big_vector_spec_at">spec_at</a>(v, idx) == <a href="big_vector.md#0x1_big_vector_spec_at">spec_at</a>(<b>old</b>(v), idx);
+</code></pre>
+
+
+
+<a id="@Specification_1_reverse"></a>
+
+### Function `reverse`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="big_vector.md#0x1_big_vector_reverse">reverse</a>&lt;T&gt;(v: &<b>mut</b> <a href="big_vector.md#0x1_big_vector_BigVector">big_vector::BigVector</a>&lt;T&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify=<b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_index_of"></a>
+
+### Function `index_of`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="big_vector.md#0x1_big_vector_index_of">index_of</a>&lt;T&gt;(v: &<a href="big_vector.md#0x1_big_vector_BigVector">big_vector::BigVector</a>&lt;T&gt;, val: &T): (bool, u64)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify=<b>false</b>;
+</code></pre>
+
+
+
+
+<a id="0x1_big_vector_spec_table_len"></a>
+
+
+<pre><code><b>fun</b> <a href="big_vector.md#0x1_big_vector_spec_table_len">spec_table_len</a>&lt;K, V&gt;(t: TableWithLength&lt;K, V&gt;): u64 {
+   <a href="table_with_length.md#0x1_table_with_length_spec_len">table_with_length::spec_len</a>(t)
+}
+</code></pre>
+
+
+
+
+<a id="0x1_big_vector_spec_table_contains"></a>
+
+
+<pre><code><b>fun</b> <a href="big_vector.md#0x1_big_vector_spec_table_contains">spec_table_contains</a>&lt;K, V&gt;(t: TableWithLength&lt;K, V&gt;, k: K): bool {
+   <a href="table_with_length.md#0x1_table_with_length_spec_contains">table_with_length::spec_contains</a>(t, k)
+}
+</code></pre>
+
+
+
+
+<a id="0x1_big_vector_spec_at"></a>
+
+
+<pre><code><b>fun</b> <a href="big_vector.md#0x1_big_vector_spec_at">spec_at</a>&lt;T&gt;(v: <a href="big_vector.md#0x1_big_vector_BigVector">BigVector</a>&lt;T&gt;, i: u64): T {
+   <b>let</b> bucket = i / v.bucket_size;
+   <b>let</b> idx = i % v.bucket_size;
+   <b>let</b> v = <a href="table_with_length.md#0x1_table_with_length_spec_get">table_with_length::spec_get</a>(v.buckets, bucket);
+   v[idx]
+}
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/bls12381.md b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/bls12381.md
new file mode 100644
index 0000000000000..edab19cccb525
--- /dev/null
+++ b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/bls12381.md
@@ -0,0 +1,1661 @@
+
+<a id="0x1_bls12381"></a>
+
+# Module `0x1::bls12381`
+
+Contains functions for:
+
+The minimum-pubkey-size variant of [Boneh-Lynn-Shacham (BLS) signatures](https://en.wikipedia.org/wiki/BLS_digital_signature),
+where public keys are BLS12-381 elliptic-curve points in $\mathbb{G}_1$ and signatures are in $\mathbb{G}_2$,
+as per the [IETF BLS draft standard](https://datatracker.ietf.org/doc/html/draft-irtf-cfrg-bls-signature#section-2.1).
+
+
+-  [Struct `PublicKey`](#0x1_bls12381_PublicKey)
+-  [Struct `ProofOfPossession`](#0x1_bls12381_ProofOfPossession)
+-  [Struct `PublicKeyWithPoP`](#0x1_bls12381_PublicKeyWithPoP)
+-  [Struct `AggrPublicKeysWithPoP`](#0x1_bls12381_AggrPublicKeysWithPoP)
+-  [Struct `Signature`](#0x1_bls12381_Signature)
+-  [Struct `AggrOrMultiSignature`](#0x1_bls12381_AggrOrMultiSignature)
+-  [Constants](#@Constants_0)
+-  [Function `public_key_from_bytes`](#0x1_bls12381_public_key_from_bytes)
+-  [Function `public_key_to_bytes`](#0x1_bls12381_public_key_to_bytes)
+-  [Function `proof_of_possession_from_bytes`](#0x1_bls12381_proof_of_possession_from_bytes)
+-  [Function `proof_of_possession_to_bytes`](#0x1_bls12381_proof_of_possession_to_bytes)
+-  [Function `public_key_from_bytes_with_pop`](#0x1_bls12381_public_key_from_bytes_with_pop)
+-  [Function `public_key_with_pop_to_normal`](#0x1_bls12381_public_key_with_pop_to_normal)
+-  [Function `public_key_with_pop_to_bytes`](#0x1_bls12381_public_key_with_pop_to_bytes)
+-  [Function `signature_from_bytes`](#0x1_bls12381_signature_from_bytes)
+-  [Function `signature_to_bytes`](#0x1_bls12381_signature_to_bytes)
+-  [Function `signature_subgroup_check`](#0x1_bls12381_signature_subgroup_check)
+-  [Function `aggregate_pubkeys`](#0x1_bls12381_aggregate_pubkeys)
+-  [Function `aggregate_pubkey_to_bytes`](#0x1_bls12381_aggregate_pubkey_to_bytes)
+-  [Function `aggregate_signatures`](#0x1_bls12381_aggregate_signatures)
+-  [Function `aggr_or_multi_signature_to_bytes`](#0x1_bls12381_aggr_or_multi_signature_to_bytes)
+-  [Function `aggr_or_multi_signature_from_bytes`](#0x1_bls12381_aggr_or_multi_signature_from_bytes)
+-  [Function `aggr_or_multi_signature_subgroup_check`](#0x1_bls12381_aggr_or_multi_signature_subgroup_check)
+-  [Function `verify_aggregate_signature`](#0x1_bls12381_verify_aggregate_signature)
+-  [Function `verify_multisignature`](#0x1_bls12381_verify_multisignature)
+-  [Function `verify_normal_signature`](#0x1_bls12381_verify_normal_signature)
+-  [Function `verify_signature_share`](#0x1_bls12381_verify_signature_share)
+-  [Function `aggregate_pubkeys_internal`](#0x1_bls12381_aggregate_pubkeys_internal)
+-  [Function `aggregate_signatures_internal`](#0x1_bls12381_aggregate_signatures_internal)
+-  [Function `validate_pubkey_internal`](#0x1_bls12381_validate_pubkey_internal)
+-  [Function `signature_subgroup_check_internal`](#0x1_bls12381_signature_subgroup_check_internal)
+-  [Function `verify_aggregate_signature_internal`](#0x1_bls12381_verify_aggregate_signature_internal)
+-  [Function `verify_multisignature_internal`](#0x1_bls12381_verify_multisignature_internal)
+-  [Function `verify_normal_signature_internal`](#0x1_bls12381_verify_normal_signature_internal)
+-  [Function `verify_proof_of_possession_internal`](#0x1_bls12381_verify_proof_of_possession_internal)
+-  [Function `verify_signature_share_internal`](#0x1_bls12381_verify_signature_share_internal)
+-  [Specification](#@Specification_1)
+    -  [Function `public_key_from_bytes`](#@Specification_1_public_key_from_bytes)
+    -  [Function `public_key_from_bytes_with_pop`](#@Specification_1_public_key_from_bytes_with_pop)
+    -  [Function `aggregate_pubkeys`](#@Specification_1_aggregate_pubkeys)
+    -  [Function `aggregate_signatures`](#@Specification_1_aggregate_signatures)
+    -  [Function `aggr_or_multi_signature_from_bytes`](#@Specification_1_aggr_or_multi_signature_from_bytes)
+    -  [Function `aggr_or_multi_signature_subgroup_check`](#@Specification_1_aggr_or_multi_signature_subgroup_check)
+    -  [Function `verify_aggregate_signature`](#@Specification_1_verify_aggregate_signature)
+    -  [Function `verify_multisignature`](#@Specification_1_verify_multisignature)
+    -  [Function `verify_normal_signature`](#@Specification_1_verify_normal_signature)
+    -  [Function `verify_signature_share`](#@Specification_1_verify_signature_share)
+    -  [Function `aggregate_pubkeys_internal`](#@Specification_1_aggregate_pubkeys_internal)
+    -  [Function `aggregate_signatures_internal`](#@Specification_1_aggregate_signatures_internal)
+    -  [Function `validate_pubkey_internal`](#@Specification_1_validate_pubkey_internal)
+    -  [Function `signature_subgroup_check_internal`](#@Specification_1_signature_subgroup_check_internal)
+    -  [Function `verify_aggregate_signature_internal`](#@Specification_1_verify_aggregate_signature_internal)
+    -  [Function `verify_multisignature_internal`](#@Specification_1_verify_multisignature_internal)
+    -  [Function `verify_normal_signature_internal`](#@Specification_1_verify_normal_signature_internal)
+    -  [Function `verify_proof_of_possession_internal`](#@Specification_1_verify_proof_of_possession_internal)
+    -  [Function `verify_signature_share_internal`](#@Specification_1_verify_signature_share_internal)
+    -  [Helper functions](#@Helper_functions_2)
+
+
+<pre><code><b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option">0x1::option</a>;
+</code></pre>
+
+
+
+<a id="0x1_bls12381_PublicKey"></a>
+
+## Struct `PublicKey`
+
+A *validated* public key that:
+(1) is a point in the prime-order subgroup of the BLS12-381 elliptic curve, and
+(2) is not the identity point
+
+This struct can be used to verify a normal (non-aggregated) signature.
+
+This struct can be combined with a ProofOfPossession struct in order to create a PublicKeyWithPop struct, which
+can be used to verify a multisignature.
+
+
+<pre><code><b>struct</b> <a href="bls12381.md#0x1_bls12381_PublicKey">PublicKey</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_bls12381_ProofOfPossession"></a>
+
+## Struct `ProofOfPossession`
+
+A proof-of-possession (PoP).
+Given such a struct and a PublicKey struct, one can construct a PublicKeyWithPoP (see below).
+
+
+<pre><code><b>struct</b> <a href="bls12381.md#0x1_bls12381_ProofOfPossession">ProofOfPossession</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_bls12381_PublicKeyWithPoP"></a>
+
+## Struct `PublicKeyWithPoP`
+
+A *validated* public key that had a successfully-verified proof-of-possession (PoP).
+
+A vector of these structs can be either:
+(1) used to verify an aggregate signature
+(2) aggregated with other PublicKeyWithPoP structs into an AggrPublicKeysWithPoP, which in turn can be used
+to verify a multisignature
+
+
+<pre><code><b>struct</b> <a href="bls12381.md#0x1_bls12381_PublicKeyWithPoP">PublicKeyWithPoP</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_bls12381_AggrPublicKeysWithPoP"></a>
+
+## Struct `AggrPublicKeysWithPoP`
+
+An aggregation of public keys with verified PoPs, which can be used to verify multisignatures.
+
+
+<pre><code><b>struct</b> <a href="bls12381.md#0x1_bls12381_AggrPublicKeysWithPoP">AggrPublicKeysWithPoP</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_bls12381_Signature"></a>
+
+## Struct `Signature`
+
+A BLS signature. This can be either a:
+(1) normal (non-aggregated) signature
+(2) signature share (for a multisignature or aggregate signature)
+
+
+<pre><code><b>struct</b> <a href="bls12381.md#0x1_bls12381_Signature">Signature</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_bls12381_AggrOrMultiSignature"></a>
+
+## Struct `AggrOrMultiSignature`
+
+An aggregation of BLS signatures. This can be either a:
+(4) aggregated signature (i.e., an aggregation of signatures s_i, each on a message m_i)
+(3) multisignature (i.e., an aggregation of signatures s_i, each on the same message m)
+
+We distinguish between a Signature type and a AggrOrMultiSignature type to prevent developers from interchangeably
+calling <code>verify_multisignature</code> and <code>verify_signature_share</code> to verify both multisignatures and signature shares,
+which could create problems down the line.
+
+
+<pre><code><b>struct</b> <a href="bls12381.md#0x1_bls12381_AggrOrMultiSignature">AggrOrMultiSignature</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_bls12381_EWRONG_SIZE"></a>
+
+One of the given inputs has the wrong size.s
+
+
+<pre><code><b>const</b> <a href="bls12381.md#0x1_bls12381_EWRONG_SIZE">EWRONG_SIZE</a>: u64 = 2;
+</code></pre>
+
+
+
+<a id="0x1_bls12381_EZERO_PUBKEYS"></a>
+
+The caller was supposed to input one or more public keys.
+
+
+<pre><code><b>const</b> <a href="bls12381.md#0x1_bls12381_EZERO_PUBKEYS">EZERO_PUBKEYS</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_bls12381_E_NUM_SIGNERS_MUST_EQ_NUM_MESSAGES"></a>
+
+The number of signers does not match the number of messages to be signed.
+
+
+<pre><code><b>const</b> <a href="bls12381.md#0x1_bls12381_E_NUM_SIGNERS_MUST_EQ_NUM_MESSAGES">E_NUM_SIGNERS_MUST_EQ_NUM_MESSAGES</a>: u64 = 3;
+</code></pre>
+
+
+
+<a id="0x1_bls12381_PUBLIC_KEY_NUM_BYTES"></a>
+
+The public key size, in bytes
+
+
+<pre><code><b>const</b> <a href="bls12381.md#0x1_bls12381_PUBLIC_KEY_NUM_BYTES">PUBLIC_KEY_NUM_BYTES</a>: u64 = 48;
+</code></pre>
+
+
+
+<a id="0x1_bls12381_RANDOM_PK"></a>
+
+Random signature generated by running <code>cargo test -- bls12381_sample_signature --nocapture --<b>include</b>-ignored</code> in <code>crates/aptos-crypto</code>.
+The associated SK is 07416693b6b32c84abe45578728e2379f525729e5b94762435a31e65ecc728da.
+
+
+<pre><code><b>const</b> <a href="bls12381.md#0x1_bls12381_RANDOM_PK">RANDOM_PK</a>: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; = [138, 83, 231, 174, 82, 112, 227, 231, 101, 205, 138, 64, 50, 194, 231, 124, 111, 126, 135, 164, 78, 187, 133, 191, 40, 164, 215, 134, 85, 101, 105, 143, 151, 83, 70, 113, 66, 98, 249, 228, 124, 111, 62, 13, 93, 149, 22, 96];
+</code></pre>
+
+
+
+<a id="0x1_bls12381_RANDOM_SIGNATURE"></a>
+
+Random signature generated by running <code>cargo test -- bls12381_sample_signature --nocapture --<b>include</b>-ignored</code> in <code>crates/aptos-crypto</code>.
+The message signed is "Hello Aptos!" and the associated SK is 07416693b6b32c84abe45578728e2379f525729e5b94762435a31e65ecc728da.
+
+
+<pre><code><b>const</b> <a href="bls12381.md#0x1_bls12381_RANDOM_SIGNATURE">RANDOM_SIGNATURE</a>: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; = [160, 26, 101, 133, 79, 152, 125, 52, 52, 20, 155, 127, 8, 247, 7, 48, 227, 11, 36, 25, 132, 232, 113, 43, 194, 172, 168, 133, 214, 50, 170, 252, 237, 76, 63, 102, 18, 9, 222, 187, 107, 28, 134, 1, 50, 102, 35, 204, 22, 202, 47, 108, 158, 220, 83, 183, 184, 139, 116, 53, 251, 107, 5, 221, 236, 228, 24, 210, 195, 77, 198, 172, 162, 245, 161, 26, 121, 230, 119, 116, 88, 44, 20, 8, 74, 1, 220, 183, 130, 14, 76, 180, 186, 208, 234, 141];
+</code></pre>
+
+
+
+<a id="0x1_bls12381_SIGNATURE_SIZE"></a>
+
+The signature size, in bytes
+
+
+<pre><code><b>const</b> <a href="bls12381.md#0x1_bls12381_SIGNATURE_SIZE">SIGNATURE_SIZE</a>: u64 = 96;
+</code></pre>
+
+
+
+<a id="0x1_bls12381_public_key_from_bytes"></a>
+
+## Function `public_key_from_bytes`
+
+Creates a new public key from a sequence of bytes.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bls12381.md#0x1_bls12381_public_key_from_bytes">public_key_from_bytes</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="bls12381.md#0x1_bls12381_PublicKey">bls12381::PublicKey</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bls12381.md#0x1_bls12381_public_key_from_bytes">public_key_from_bytes</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): Option&lt;<a href="bls12381.md#0x1_bls12381_PublicKey">PublicKey</a>&gt; {
+    <b>if</b> (<a href="bls12381.md#0x1_bls12381_validate_pubkey_internal">validate_pubkey_internal</a>(bytes)) {
+        <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(<a href="bls12381.md#0x1_bls12381_PublicKey">PublicKey</a> {
+            bytes
+        })
+    } <b>else</b> {
+        <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>&lt;<a href="bls12381.md#0x1_bls12381_PublicKey">PublicKey</a>&gt;()
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_bls12381_public_key_to_bytes"></a>
+
+## Function `public_key_to_bytes`
+
+Serializes a public key into 48 bytes.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bls12381.md#0x1_bls12381_public_key_to_bytes">public_key_to_bytes</a>(pk: &<a href="bls12381.md#0x1_bls12381_PublicKey">bls12381::PublicKey</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bls12381.md#0x1_bls12381_public_key_to_bytes">public_key_to_bytes</a>(pk: &<a href="bls12381.md#0x1_bls12381_PublicKey">PublicKey</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; {
+    pk.bytes
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_bls12381_proof_of_possession_from_bytes"></a>
+
+## Function `proof_of_possession_from_bytes`
+
+Creates a new proof-of-possession (PoP) which can be later used to create a PublicKeyWithPoP struct,
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bls12381.md#0x1_bls12381_proof_of_possession_from_bytes">proof_of_possession_from_bytes</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="bls12381.md#0x1_bls12381_ProofOfPossession">bls12381::ProofOfPossession</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bls12381.md#0x1_bls12381_proof_of_possession_from_bytes">proof_of_possession_from_bytes</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="bls12381.md#0x1_bls12381_ProofOfPossession">ProofOfPossession</a> {
+    <a href="bls12381.md#0x1_bls12381_ProofOfPossession">ProofOfPossession</a> {
+        bytes
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_bls12381_proof_of_possession_to_bytes"></a>
+
+## Function `proof_of_possession_to_bytes`
+
+Serializes the signature into 96 bytes.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bls12381.md#0x1_bls12381_proof_of_possession_to_bytes">proof_of_possession_to_bytes</a>(pop: &<a href="bls12381.md#0x1_bls12381_ProofOfPossession">bls12381::ProofOfPossession</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bls12381.md#0x1_bls12381_proof_of_possession_to_bytes">proof_of_possession_to_bytes</a>(pop: &<a href="bls12381.md#0x1_bls12381_ProofOfPossession">ProofOfPossession</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; {
+    pop.bytes
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_bls12381_public_key_from_bytes_with_pop"></a>
+
+## Function `public_key_from_bytes_with_pop`
+
+Creates a PoP'd public key from a normal public key and a corresponding proof-of-possession.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bls12381.md#0x1_bls12381_public_key_from_bytes_with_pop">public_key_from_bytes_with_pop</a>(pk_bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, pop: &<a href="bls12381.md#0x1_bls12381_ProofOfPossession">bls12381::ProofOfPossession</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="bls12381.md#0x1_bls12381_PublicKeyWithPoP">bls12381::PublicKeyWithPoP</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bls12381.md#0x1_bls12381_public_key_from_bytes_with_pop">public_key_from_bytes_with_pop</a>(pk_bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, pop: &<a href="bls12381.md#0x1_bls12381_ProofOfPossession">ProofOfPossession</a>): Option&lt;<a href="bls12381.md#0x1_bls12381_PublicKeyWithPoP">PublicKeyWithPoP</a>&gt; {
+    <b>if</b> (<a href="bls12381.md#0x1_bls12381_verify_proof_of_possession_internal">verify_proof_of_possession_internal</a>(pk_bytes, pop.bytes)) {
+        <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(<a href="bls12381.md#0x1_bls12381_PublicKeyWithPoP">PublicKeyWithPoP</a> {
+            bytes: pk_bytes
+        })
+    } <b>else</b> {
+        <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>&lt;<a href="bls12381.md#0x1_bls12381_PublicKeyWithPoP">PublicKeyWithPoP</a>&gt;()
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_bls12381_public_key_with_pop_to_normal"></a>
+
+## Function `public_key_with_pop_to_normal`
+
+Creates a normal public key from a PoP'd public key.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bls12381.md#0x1_bls12381_public_key_with_pop_to_normal">public_key_with_pop_to_normal</a>(pkpop: &<a href="bls12381.md#0x1_bls12381_PublicKeyWithPoP">bls12381::PublicKeyWithPoP</a>): <a href="bls12381.md#0x1_bls12381_PublicKey">bls12381::PublicKey</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bls12381.md#0x1_bls12381_public_key_with_pop_to_normal">public_key_with_pop_to_normal</a>(pkpop: &<a href="bls12381.md#0x1_bls12381_PublicKeyWithPoP">PublicKeyWithPoP</a>): <a href="bls12381.md#0x1_bls12381_PublicKey">PublicKey</a> {
+    <a href="bls12381.md#0x1_bls12381_PublicKey">PublicKey</a> {
+        bytes: pkpop.bytes
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_bls12381_public_key_with_pop_to_bytes"></a>
+
+## Function `public_key_with_pop_to_bytes`
+
+Serializes a PoP'd public key into 48 bytes.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bls12381.md#0x1_bls12381_public_key_with_pop_to_bytes">public_key_with_pop_to_bytes</a>(pk: &<a href="bls12381.md#0x1_bls12381_PublicKeyWithPoP">bls12381::PublicKeyWithPoP</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bls12381.md#0x1_bls12381_public_key_with_pop_to_bytes">public_key_with_pop_to_bytes</a>(pk: &<a href="bls12381.md#0x1_bls12381_PublicKeyWithPoP">PublicKeyWithPoP</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; {
+    pk.bytes
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_bls12381_signature_from_bytes"></a>
+
+## Function `signature_from_bytes`
+
+Creates a new signature from a sequence of bytes. Does not check the signature for prime-order subgroup
+membership since that is done implicitly during verification.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bls12381.md#0x1_bls12381_signature_from_bytes">signature_from_bytes</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="bls12381.md#0x1_bls12381_Signature">bls12381::Signature</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bls12381.md#0x1_bls12381_signature_from_bytes">signature_from_bytes</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="bls12381.md#0x1_bls12381_Signature">Signature</a> {
+    <a href="bls12381.md#0x1_bls12381_Signature">Signature</a> {
+        bytes
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_bls12381_signature_to_bytes"></a>
+
+## Function `signature_to_bytes`
+
+Serializes the signature into 96 bytes.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bls12381.md#0x1_bls12381_signature_to_bytes">signature_to_bytes</a>(sig: &<a href="bls12381.md#0x1_bls12381_Signature">bls12381::Signature</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bls12381.md#0x1_bls12381_signature_to_bytes">signature_to_bytes</a>(sig: &<a href="bls12381.md#0x1_bls12381_Signature">Signature</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; {
+    sig.bytes
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_bls12381_signature_subgroup_check"></a>
+
+## Function `signature_subgroup_check`
+
+Checks that the group element that defines a signature is in the prime-order subgroup.
+This check is implicitly performed when verifying any signature via this module, but we expose this functionality
+in case it might be useful for applications to easily dismiss invalid signatures early on.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bls12381.md#0x1_bls12381_signature_subgroup_check">signature_subgroup_check</a>(signature: &<a href="bls12381.md#0x1_bls12381_Signature">bls12381::Signature</a>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bls12381.md#0x1_bls12381_signature_subgroup_check">signature_subgroup_check</a>(signature: &<a href="bls12381.md#0x1_bls12381_Signature">Signature</a>): bool {
+    <a href="bls12381.md#0x1_bls12381_signature_subgroup_check_internal">signature_subgroup_check_internal</a>(signature.bytes)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_bls12381_aggregate_pubkeys"></a>
+
+## Function `aggregate_pubkeys`
+
+Given a vector of public keys with verified PoPs, combines them into an *aggregated* public key which can be used
+to verify multisignatures using <code>verify_multisignature</code> and aggregate signatures using <code>verify_aggregate_signature</code>.
+Aborts if no public keys are given as input.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bls12381.md#0x1_bls12381_aggregate_pubkeys">aggregate_pubkeys</a>(public_keys: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="bls12381.md#0x1_bls12381_PublicKeyWithPoP">bls12381::PublicKeyWithPoP</a>&gt;): <a href="bls12381.md#0x1_bls12381_AggrPublicKeysWithPoP">bls12381::AggrPublicKeysWithPoP</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bls12381.md#0x1_bls12381_aggregate_pubkeys">aggregate_pubkeys</a>(public_keys: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="bls12381.md#0x1_bls12381_PublicKeyWithPoP">PublicKeyWithPoP</a>&gt;): <a href="bls12381.md#0x1_bls12381_AggrPublicKeysWithPoP">AggrPublicKeysWithPoP</a> {
+    <b>let</b> (bytes, success) = <a href="bls12381.md#0x1_bls12381_aggregate_pubkeys_internal">aggregate_pubkeys_internal</a>(public_keys);
+    <b>assert</b>!(success, std::error::invalid_argument(<a href="bls12381.md#0x1_bls12381_EZERO_PUBKEYS">EZERO_PUBKEYS</a>));
+
+    <a href="bls12381.md#0x1_bls12381_AggrPublicKeysWithPoP">AggrPublicKeysWithPoP</a> {
+        bytes
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_bls12381_aggregate_pubkey_to_bytes"></a>
+
+## Function `aggregate_pubkey_to_bytes`
+
+Serializes an aggregate public key into 48 bytes.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bls12381.md#0x1_bls12381_aggregate_pubkey_to_bytes">aggregate_pubkey_to_bytes</a>(apk: &<a href="bls12381.md#0x1_bls12381_AggrPublicKeysWithPoP">bls12381::AggrPublicKeysWithPoP</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bls12381.md#0x1_bls12381_aggregate_pubkey_to_bytes">aggregate_pubkey_to_bytes</a>(apk: &<a href="bls12381.md#0x1_bls12381_AggrPublicKeysWithPoP">AggrPublicKeysWithPoP</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; {
+    apk.bytes
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_bls12381_aggregate_signatures"></a>
+
+## Function `aggregate_signatures`
+
+Aggregates the input signatures into an aggregate-or-multi-signature structure, which can be later verified via
+<code>verify_aggregate_signature</code> or <code>verify_multisignature</code>. Returns <code>None</code> if zero signatures are given as input
+or if some of the signatures are not valid group elements.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bls12381.md#0x1_bls12381_aggregate_signatures">aggregate_signatures</a>(signatures: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="bls12381.md#0x1_bls12381_Signature">bls12381::Signature</a>&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="bls12381.md#0x1_bls12381_AggrOrMultiSignature">bls12381::AggrOrMultiSignature</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bls12381.md#0x1_bls12381_aggregate_signatures">aggregate_signatures</a>(signatures: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="bls12381.md#0x1_bls12381_Signature">Signature</a>&gt;): Option&lt;<a href="bls12381.md#0x1_bls12381_AggrOrMultiSignature">AggrOrMultiSignature</a>&gt; {
+    <b>let</b> (bytes, success) = <a href="bls12381.md#0x1_bls12381_aggregate_signatures_internal">aggregate_signatures_internal</a>(signatures);
+    <b>if</b> (success) {
+        <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(
+            <a href="bls12381.md#0x1_bls12381_AggrOrMultiSignature">AggrOrMultiSignature</a> {
+                bytes
+            }
+        )
+    } <b>else</b> {
+        <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>&lt;<a href="bls12381.md#0x1_bls12381_AggrOrMultiSignature">AggrOrMultiSignature</a>&gt;()
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_bls12381_aggr_or_multi_signature_to_bytes"></a>
+
+## Function `aggr_or_multi_signature_to_bytes`
+
+Serializes an aggregate-or-multi-signature into 96 bytes.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bls12381.md#0x1_bls12381_aggr_or_multi_signature_to_bytes">aggr_or_multi_signature_to_bytes</a>(sig: &<a href="bls12381.md#0x1_bls12381_AggrOrMultiSignature">bls12381::AggrOrMultiSignature</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bls12381.md#0x1_bls12381_aggr_or_multi_signature_to_bytes">aggr_or_multi_signature_to_bytes</a>(sig: &<a href="bls12381.md#0x1_bls12381_AggrOrMultiSignature">AggrOrMultiSignature</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; {
+    sig.bytes
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_bls12381_aggr_or_multi_signature_from_bytes"></a>
+
+## Function `aggr_or_multi_signature_from_bytes`
+
+Deserializes an aggregate-or-multi-signature from 96 bytes.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bls12381.md#0x1_bls12381_aggr_or_multi_signature_from_bytes">aggr_or_multi_signature_from_bytes</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="bls12381.md#0x1_bls12381_AggrOrMultiSignature">bls12381::AggrOrMultiSignature</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bls12381.md#0x1_bls12381_aggr_or_multi_signature_from_bytes">aggr_or_multi_signature_from_bytes</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="bls12381.md#0x1_bls12381_AggrOrMultiSignature">AggrOrMultiSignature</a> {
+    <b>assert</b>!(std::vector::length(&bytes) == <a href="bls12381.md#0x1_bls12381_SIGNATURE_SIZE">SIGNATURE_SIZE</a>, std::error::invalid_argument(<a href="bls12381.md#0x1_bls12381_EWRONG_SIZE">EWRONG_SIZE</a>));
+
+    <a href="bls12381.md#0x1_bls12381_AggrOrMultiSignature">AggrOrMultiSignature</a> {
+        bytes
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_bls12381_aggr_or_multi_signature_subgroup_check"></a>
+
+## Function `aggr_or_multi_signature_subgroup_check`
+
+Checks that the group element that defines an aggregate-or-multi-signature is in the prime-order subgroup.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bls12381.md#0x1_bls12381_aggr_or_multi_signature_subgroup_check">aggr_or_multi_signature_subgroup_check</a>(signature: &<a href="bls12381.md#0x1_bls12381_AggrOrMultiSignature">bls12381::AggrOrMultiSignature</a>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bls12381.md#0x1_bls12381_aggr_or_multi_signature_subgroup_check">aggr_or_multi_signature_subgroup_check</a>(signature: &<a href="bls12381.md#0x1_bls12381_AggrOrMultiSignature">AggrOrMultiSignature</a>): bool {
+    <a href="bls12381.md#0x1_bls12381_signature_subgroup_check_internal">signature_subgroup_check_internal</a>(signature.bytes)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_bls12381_verify_aggregate_signature"></a>
+
+## Function `verify_aggregate_signature`
+
+Verifies an aggregate signature, an aggregation of many signatures <code>s_i</code>, each on a different message <code>m_i</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bls12381.md#0x1_bls12381_verify_aggregate_signature">verify_aggregate_signature</a>(aggr_sig: &<a href="bls12381.md#0x1_bls12381_AggrOrMultiSignature">bls12381::AggrOrMultiSignature</a>, public_keys: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="bls12381.md#0x1_bls12381_PublicKeyWithPoP">bls12381::PublicKeyWithPoP</a>&gt;, messages: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bls12381.md#0x1_bls12381_verify_aggregate_signature">verify_aggregate_signature</a>(
+    aggr_sig: &<a href="bls12381.md#0x1_bls12381_AggrOrMultiSignature">AggrOrMultiSignature</a>,
+    public_keys: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="bls12381.md#0x1_bls12381_PublicKeyWithPoP">PublicKeyWithPoP</a>&gt;,
+    messages: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;,
+): bool {
+    <a href="bls12381.md#0x1_bls12381_verify_aggregate_signature_internal">verify_aggregate_signature_internal</a>(aggr_sig.bytes, public_keys, messages)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_bls12381_verify_multisignature"></a>
+
+## Function `verify_multisignature`
+
+Verifies a multisignature: an aggregation of many signatures, each on the same message <code>m</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bls12381.md#0x1_bls12381_verify_multisignature">verify_multisignature</a>(multisig: &<a href="bls12381.md#0x1_bls12381_AggrOrMultiSignature">bls12381::AggrOrMultiSignature</a>, aggr_public_key: &<a href="bls12381.md#0x1_bls12381_AggrPublicKeysWithPoP">bls12381::AggrPublicKeysWithPoP</a>, message: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bls12381.md#0x1_bls12381_verify_multisignature">verify_multisignature</a>(
+    multisig: &<a href="bls12381.md#0x1_bls12381_AggrOrMultiSignature">AggrOrMultiSignature</a>,
+    aggr_public_key: &<a href="bls12381.md#0x1_bls12381_AggrPublicKeysWithPoP">AggrPublicKeysWithPoP</a>,
+    message: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+): bool {
+    <a href="bls12381.md#0x1_bls12381_verify_multisignature_internal">verify_multisignature_internal</a>(multisig.bytes, aggr_public_key.bytes, message)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_bls12381_verify_normal_signature"></a>
+
+## Function `verify_normal_signature`
+
+Verifies a normal, non-aggregated signature.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bls12381.md#0x1_bls12381_verify_normal_signature">verify_normal_signature</a>(signature: &<a href="bls12381.md#0x1_bls12381_Signature">bls12381::Signature</a>, public_key: &<a href="bls12381.md#0x1_bls12381_PublicKey">bls12381::PublicKey</a>, message: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bls12381.md#0x1_bls12381_verify_normal_signature">verify_normal_signature</a>(
+    signature: &<a href="bls12381.md#0x1_bls12381_Signature">Signature</a>,
+    public_key: &<a href="bls12381.md#0x1_bls12381_PublicKey">PublicKey</a>,
+    message: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+): bool {
+    <a href="bls12381.md#0x1_bls12381_verify_normal_signature_internal">verify_normal_signature_internal</a>(signature.bytes, public_key.bytes, message)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_bls12381_verify_signature_share"></a>
+
+## Function `verify_signature_share`
+
+Verifies a signature share in the multisignature share or an aggregate signature share.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bls12381.md#0x1_bls12381_verify_signature_share">verify_signature_share</a>(signature_share: &<a href="bls12381.md#0x1_bls12381_Signature">bls12381::Signature</a>, public_key: &<a href="bls12381.md#0x1_bls12381_PublicKeyWithPoP">bls12381::PublicKeyWithPoP</a>, message: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bls12381.md#0x1_bls12381_verify_signature_share">verify_signature_share</a>(
+    signature_share: &<a href="bls12381.md#0x1_bls12381_Signature">Signature</a>,
+    public_key: &<a href="bls12381.md#0x1_bls12381_PublicKeyWithPoP">PublicKeyWithPoP</a>,
+    message: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+): bool {
+    <a href="bls12381.md#0x1_bls12381_verify_signature_share_internal">verify_signature_share_internal</a>(signature_share.bytes, public_key.bytes, message)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_bls12381_aggregate_pubkeys_internal"></a>
+
+## Function `aggregate_pubkeys_internal`
+
+CRYPTOGRAPHY WARNING: This function assumes that the caller verified all public keys have a valid
+proof-of-possesion (PoP) using <code>verify_proof_of_possession</code>.
+
+Given a vector of serialized public keys, combines them into an aggregated public key, returning <code>(bytes, <b>true</b>)</code>,
+where <code>bytes</code> store the serialized public key.
+Aborts if no public keys are given as input.
+
+
+<pre><code><b>fun</b> <a href="bls12381.md#0x1_bls12381_aggregate_pubkeys_internal">aggregate_pubkeys_internal</a>(public_keys: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="bls12381.md#0x1_bls12381_PublicKeyWithPoP">bls12381::PublicKeyWithPoP</a>&gt;): (<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, bool)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="bls12381.md#0x1_bls12381_aggregate_pubkeys_internal">aggregate_pubkeys_internal</a>(public_keys: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="bls12381.md#0x1_bls12381_PublicKeyWithPoP">PublicKeyWithPoP</a>&gt;): (<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, bool);
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_bls12381_aggregate_signatures_internal"></a>
+
+## Function `aggregate_signatures_internal`
+
+CRYPTOGRAPHY WARNING: This function can be safely called without verifying that the input signatures are elements
+of the prime-order subgroup of the BLS12-381 curve.
+
+Given a vector of serialized signatures, combines them into an aggregate signature, returning <code>(bytes, <b>true</b>)</code>,
+where <code>bytes</code> store the serialized signature.
+Does not check the input signatures nor the final aggregated signatures for prime-order subgroup membership.
+Returns <code>(_, <b>false</b>)</code> if no signatures are given as input.
+Does not abort.
+
+
+<pre><code><b>fun</b> <a href="bls12381.md#0x1_bls12381_aggregate_signatures_internal">aggregate_signatures_internal</a>(signatures: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="bls12381.md#0x1_bls12381_Signature">bls12381::Signature</a>&gt;): (<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, bool)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="bls12381.md#0x1_bls12381_aggregate_signatures_internal">aggregate_signatures_internal</a>(signatures: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="bls12381.md#0x1_bls12381_Signature">Signature</a>&gt;): (<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, bool);
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_bls12381_validate_pubkey_internal"></a>
+
+## Function `validate_pubkey_internal`
+
+Return <code><b>true</b></code> if the bytes in <code>public_key</code> are a valid BLS12-381 public key:
+(1) it is NOT the identity point, and
+(2) it is a BLS12-381 elliptic curve point, and
+(3) it is a prime-order point
+Return <code><b>false</b></code> otherwise.
+Does not abort.
+
+
+<pre><code><b>fun</b> <a href="bls12381.md#0x1_bls12381_validate_pubkey_internal">validate_pubkey_internal</a>(public_key: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="bls12381.md#0x1_bls12381_validate_pubkey_internal">validate_pubkey_internal</a>(public_key: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_bls12381_signature_subgroup_check_internal"></a>
+
+## Function `signature_subgroup_check_internal`
+
+Return <code><b>true</b></code> if the elliptic curve point serialized in <code>signature</code>:
+(1) is NOT the identity point, and
+(2) is a BLS12-381 elliptic curve point, and
+(3) is a prime-order point
+Return <code><b>false</b></code> otherwise.
+Does not abort.
+
+
+<pre><code><b>fun</b> <a href="bls12381.md#0x1_bls12381_signature_subgroup_check_internal">signature_subgroup_check_internal</a>(signature: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="bls12381.md#0x1_bls12381_signature_subgroup_check_internal">signature_subgroup_check_internal</a>(signature: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_bls12381_verify_aggregate_signature_internal"></a>
+
+## Function `verify_aggregate_signature_internal`
+
+CRYPTOGRAPHY WARNING: First, this function assumes all public keys have a valid proof-of-possesion (PoP).
+This prevents both small-subgroup attacks and rogue-key attacks. Second, this function can be safely called
+without verifying that the aggregate signature is in the prime-order subgroup of the BLS12-381 curve.
+
+Returns <code><b>true</b></code> if the aggregate signature <code>aggsig</code> on <code>messages</code> under <code>public_keys</code> verifies (where <code>messages[i]</code>
+should be signed by <code>public_keys[i]</code>).
+
+Returns <code><b>false</b></code> if either:
+- no public keys or messages are given as input,
+- number of messages does not equal number of public keys
+- <code>aggsig</code> (1) is the identity point, or (2) is NOT a BLS12-381 elliptic curve point, or (3) is NOT a
+prime-order point
+Does not abort.
+
+
+<pre><code><b>fun</b> <a href="bls12381.md#0x1_bls12381_verify_aggregate_signature_internal">verify_aggregate_signature_internal</a>(aggsig: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, public_keys: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="bls12381.md#0x1_bls12381_PublicKeyWithPoP">bls12381::PublicKeyWithPoP</a>&gt;, messages: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="bls12381.md#0x1_bls12381_verify_aggregate_signature_internal">verify_aggregate_signature_internal</a>(
+    aggsig: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    public_keys: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="bls12381.md#0x1_bls12381_PublicKeyWithPoP">PublicKeyWithPoP</a>&gt;,
+    messages: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;,
+): bool;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_bls12381_verify_multisignature_internal"></a>
+
+## Function `verify_multisignature_internal`
+
+CRYPTOGRAPHY WARNING: This function assumes verified proofs-of-possesion (PoP) for the public keys used in
+computing the aggregate public key. This prevents small-subgroup attacks and rogue-key attacks.
+
+Return <code><b>true</b></code> if the BLS <code>multisignature</code> on <code>message</code> verifies against the BLS aggregate public key <code>agg_public_key</code>.
+Returns <code><b>false</b></code> otherwise.
+Does not abort.
+
+
+<pre><code><b>fun</b> <a href="bls12381.md#0x1_bls12381_verify_multisignature_internal">verify_multisignature_internal</a>(multisignature: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, agg_public_key: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, message: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="bls12381.md#0x1_bls12381_verify_multisignature_internal">verify_multisignature_internal</a>(
+    multisignature: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    agg_public_key: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    message: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+): bool;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_bls12381_verify_normal_signature_internal"></a>
+
+## Function `verify_normal_signature_internal`
+
+CRYPTOGRAPHY WARNING: This function WILL check that the public key is a prime-order point, in order to prevent
+library users from misusing the library by forgetting to validate public keys before giving them as arguments to
+this function.
+
+Returns <code><b>true</b></code> if the <code>signature</code> on <code>message</code> verifies under <code><b>public</b> key</code>.
+Returns <code><b>false</b></code> otherwise.
+Does not abort.
+
+
+<pre><code><b>fun</b> <a href="bls12381.md#0x1_bls12381_verify_normal_signature_internal">verify_normal_signature_internal</a>(signature: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, public_key: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, message: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="bls12381.md#0x1_bls12381_verify_normal_signature_internal">verify_normal_signature_internal</a>(
+    signature: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    public_key: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    message: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+): bool;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_bls12381_verify_proof_of_possession_internal"></a>
+
+## Function `verify_proof_of_possession_internal`
+
+Return <code><b>true</b></code> if the bytes in <code>public_key</code> are a valid bls12381 public key (as per <code>validate_pubkey</code>)
+*and* this public key has a valid proof-of-possesion (PoP).
+Return <code><b>false</b></code> otherwise.
+Does not abort.
+
+
+<pre><code><b>fun</b> <a href="bls12381.md#0x1_bls12381_verify_proof_of_possession_internal">verify_proof_of_possession_internal</a>(public_key: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, proof_of_possesion: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="bls12381.md#0x1_bls12381_verify_proof_of_possession_internal">verify_proof_of_possession_internal</a>(
+    public_key: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    proof_of_possesion: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+): bool;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_bls12381_verify_signature_share_internal"></a>
+
+## Function `verify_signature_share_internal`
+
+CRYPTOGRAPHY WARNING: Assumes the public key has a valid proof-of-possesion (PoP). This prevents rogue-key
+attacks later on during signature aggregation.
+
+Returns <code><b>true</b></code> if the <code>signature_share</code> on <code>message</code> verifies under <code><b>public</b> key</code>.
+Returns <code><b>false</b></code> otherwise, similar to <code>verify_multisignature</code>.
+Does not abort.
+
+
+<pre><code><b>fun</b> <a href="bls12381.md#0x1_bls12381_verify_signature_share_internal">verify_signature_share_internal</a>(signature_share: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, public_key: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, message: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="bls12381.md#0x1_bls12381_verify_signature_share_internal">verify_signature_share_internal</a>(
+    signature_share: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    public_key: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    message: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+): bool;
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+<a id="@Specification_1_public_key_from_bytes"></a>
+
+### Function `public_key_from_bytes`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bls12381.md#0x1_bls12381_public_key_from_bytes">public_key_from_bytes</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="bls12381.md#0x1_bls12381_PublicKey">bls12381::PublicKey</a>&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+<b>ensures</b> <a href="bls12381.md#0x1_bls12381_spec_validate_pubkey_internal">spec_validate_pubkey_internal</a>(bytes) ==&gt; (std::option::spec_is_some(result) && std::option::spec_borrow(result).bytes == bytes);
+<b>ensures</b> !<a href="bls12381.md#0x1_bls12381_spec_validate_pubkey_internal">spec_validate_pubkey_internal</a>(bytes) ==&gt; std::option::spec_is_none(result);
+</code></pre>
+
+
+
+<a id="@Specification_1_public_key_from_bytes_with_pop"></a>
+
+### Function `public_key_from_bytes_with_pop`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bls12381.md#0x1_bls12381_public_key_from_bytes_with_pop">public_key_from_bytes_with_pop</a>(pk_bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, pop: &<a href="bls12381.md#0x1_bls12381_ProofOfPossession">bls12381::ProofOfPossession</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="bls12381.md#0x1_bls12381_PublicKeyWithPoP">bls12381::PublicKeyWithPoP</a>&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> <a href="bls12381.md#0x1_bls12381_spec_verify_proof_of_possession_internal">spec_verify_proof_of_possession_internal</a>(pk_bytes, pop.bytes) ==&gt; (std::option::spec_is_some(result) && std::option::spec_borrow(result).bytes == pk_bytes);
+<b>ensures</b> !<a href="bls12381.md#0x1_bls12381_spec_verify_proof_of_possession_internal">spec_verify_proof_of_possession_internal</a>(pk_bytes, pop.bytes) ==&gt; std::option::spec_is_none(result);
+<b>ensures</b> [abstract] result == <a href="bls12381.md#0x1_bls12381_spec_public_key_from_bytes_with_pop">spec_public_key_from_bytes_with_pop</a>(pk_bytes, pop);
+</code></pre>
+
+
+
+<a id="@Specification_1_aggregate_pubkeys"></a>
+
+### Function `aggregate_pubkeys`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bls12381.md#0x1_bls12381_aggregate_pubkeys">aggregate_pubkeys</a>(public_keys: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="bls12381.md#0x1_bls12381_PublicKeyWithPoP">bls12381::PublicKeyWithPoP</a>&gt;): <a href="bls12381.md#0x1_bls12381_AggrPublicKeysWithPoP">bls12381::AggrPublicKeysWithPoP</a>
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> bytes = <a href="bls12381.md#0x1_bls12381_spec_aggregate_pubkeys_internal_1">spec_aggregate_pubkeys_internal_1</a>(public_keys);
+<b>let</b> success = <a href="bls12381.md#0x1_bls12381_spec_aggregate_pubkeys_internal_2">spec_aggregate_pubkeys_internal_2</a>(public_keys);
+<b>aborts_if</b> !success;
+<b>ensures</b> result.bytes == bytes;
+</code></pre>
+
+
+
+<a id="@Specification_1_aggregate_signatures"></a>
+
+### Function `aggregate_signatures`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bls12381.md#0x1_bls12381_aggregate_signatures">aggregate_signatures</a>(signatures: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="bls12381.md#0x1_bls12381_Signature">bls12381::Signature</a>&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="bls12381.md#0x1_bls12381_AggrOrMultiSignature">bls12381::AggrOrMultiSignature</a>&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+<b>let</b> bytes = <a href="bls12381.md#0x1_bls12381_spec_aggregate_signatures_internal_1">spec_aggregate_signatures_internal_1</a>(signatures);
+<b>let</b> success = <a href="bls12381.md#0x1_bls12381_spec_aggregate_signatures_internal_2">spec_aggregate_signatures_internal_2</a>(signatures);
+<b>ensures</b> success ==&gt; (std::option::spec_is_some(result) && std::option::spec_borrow(result).bytes == bytes);
+<b>ensures</b> !success ==&gt; std::option::spec_is_none(result);
+</code></pre>
+
+
+
+<a id="@Specification_1_aggr_or_multi_signature_from_bytes"></a>
+
+### Function `aggr_or_multi_signature_from_bytes`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bls12381.md#0x1_bls12381_aggr_or_multi_signature_from_bytes">aggr_or_multi_signature_from_bytes</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="bls12381.md#0x1_bls12381_AggrOrMultiSignature">bls12381::AggrOrMultiSignature</a>
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> len(bytes) != <a href="bls12381.md#0x1_bls12381_SIGNATURE_SIZE">SIGNATURE_SIZE</a>;
+<b>ensures</b> result.bytes == bytes;
+</code></pre>
+
+
+
+<a id="@Specification_1_aggr_or_multi_signature_subgroup_check"></a>
+
+### Function `aggr_or_multi_signature_subgroup_check`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bls12381.md#0x1_bls12381_aggr_or_multi_signature_subgroup_check">aggr_or_multi_signature_subgroup_check</a>(signature: &<a href="bls12381.md#0x1_bls12381_AggrOrMultiSignature">bls12381::AggrOrMultiSignature</a>): bool
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="bls12381.md#0x1_bls12381_spec_signature_subgroup_check_internal">spec_signature_subgroup_check_internal</a>(signature.bytes);
+</code></pre>
+
+
+
+<a id="@Specification_1_verify_aggregate_signature"></a>
+
+### Function `verify_aggregate_signature`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bls12381.md#0x1_bls12381_verify_aggregate_signature">verify_aggregate_signature</a>(aggr_sig: &<a href="bls12381.md#0x1_bls12381_AggrOrMultiSignature">bls12381::AggrOrMultiSignature</a>, public_keys: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="bls12381.md#0x1_bls12381_PublicKeyWithPoP">bls12381::PublicKeyWithPoP</a>&gt;, messages: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;): bool
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="bls12381.md#0x1_bls12381_spec_verify_aggregate_signature_internal">spec_verify_aggregate_signature_internal</a>(aggr_sig.bytes, public_keys, messages);
+</code></pre>
+
+
+
+<a id="@Specification_1_verify_multisignature"></a>
+
+### Function `verify_multisignature`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bls12381.md#0x1_bls12381_verify_multisignature">verify_multisignature</a>(multisig: &<a href="bls12381.md#0x1_bls12381_AggrOrMultiSignature">bls12381::AggrOrMultiSignature</a>, aggr_public_key: &<a href="bls12381.md#0x1_bls12381_AggrPublicKeysWithPoP">bls12381::AggrPublicKeysWithPoP</a>, message: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="bls12381.md#0x1_bls12381_spec_verify_multisignature_internal">spec_verify_multisignature_internal</a>(multisig.bytes, aggr_public_key.bytes, message);
+</code></pre>
+
+
+
+<a id="@Specification_1_verify_normal_signature"></a>
+
+### Function `verify_normal_signature`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bls12381.md#0x1_bls12381_verify_normal_signature">verify_normal_signature</a>(signature: &<a href="bls12381.md#0x1_bls12381_Signature">bls12381::Signature</a>, public_key: &<a href="bls12381.md#0x1_bls12381_PublicKey">bls12381::PublicKey</a>, message: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="bls12381.md#0x1_bls12381_spec_verify_normal_signature_internal">spec_verify_normal_signature_internal</a>(signature.bytes, public_key.bytes, message);
+</code></pre>
+
+
+
+<a id="@Specification_1_verify_signature_share"></a>
+
+### Function `verify_signature_share`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bls12381.md#0x1_bls12381_verify_signature_share">verify_signature_share</a>(signature_share: &<a href="bls12381.md#0x1_bls12381_Signature">bls12381::Signature</a>, public_key: &<a href="bls12381.md#0x1_bls12381_PublicKeyWithPoP">bls12381::PublicKeyWithPoP</a>, message: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="bls12381.md#0x1_bls12381_spec_verify_signature_share_internal">spec_verify_signature_share_internal</a>(signature_share.bytes, public_key.bytes, message);
+</code></pre>
+
+
+
+<a id="@Specification_1_aggregate_pubkeys_internal"></a>
+
+### Function `aggregate_pubkeys_internal`
+
+
+<pre><code><b>fun</b> <a href="bls12381.md#0x1_bls12381_aggregate_pubkeys_internal">aggregate_pubkeys_internal</a>(public_keys: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="bls12381.md#0x1_bls12381_PublicKeyWithPoP">bls12381::PublicKeyWithPoP</a>&gt;): (<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, bool)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> [abstract] <b>false</b>;
+<b>ensures</b> result_1 == <a href="bls12381.md#0x1_bls12381_spec_aggregate_pubkeys_internal_1">spec_aggregate_pubkeys_internal_1</a>(public_keys);
+<b>ensures</b> result_2 == <a href="bls12381.md#0x1_bls12381_spec_aggregate_pubkeys_internal_2">spec_aggregate_pubkeys_internal_2</a>(public_keys);
+</code></pre>
+
+
+
+<a id="@Specification_1_aggregate_signatures_internal"></a>
+
+### Function `aggregate_signatures_internal`
+
+
+<pre><code><b>fun</b> <a href="bls12381.md#0x1_bls12381_aggregate_signatures_internal">aggregate_signatures_internal</a>(signatures: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="bls12381.md#0x1_bls12381_Signature">bls12381::Signature</a>&gt;): (<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, bool)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> [abstract] <b>false</b>;
+<b>ensures</b> result_1 == <a href="bls12381.md#0x1_bls12381_spec_aggregate_signatures_internal_1">spec_aggregate_signatures_internal_1</a>(signatures);
+<b>ensures</b> result_2 == <a href="bls12381.md#0x1_bls12381_spec_aggregate_signatures_internal_2">spec_aggregate_signatures_internal_2</a>(signatures);
+</code></pre>
+
+
+
+<a id="@Specification_1_validate_pubkey_internal"></a>
+
+### Function `validate_pubkey_internal`
+
+
+<pre><code><b>fun</b> <a href="bls12381.md#0x1_bls12381_validate_pubkey_internal">validate_pubkey_internal</a>(public_key: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> [abstract] <b>false</b>;
+<b>ensures</b> result == <a href="bls12381.md#0x1_bls12381_spec_validate_pubkey_internal">spec_validate_pubkey_internal</a>(public_key);
+</code></pre>
+
+
+
+<a id="@Specification_1_signature_subgroup_check_internal"></a>
+
+### Function `signature_subgroup_check_internal`
+
+
+<pre><code><b>fun</b> <a href="bls12381.md#0x1_bls12381_signature_subgroup_check_internal">signature_subgroup_check_internal</a>(signature: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> [abstract] <b>false</b>;
+<b>ensures</b> result == <a href="bls12381.md#0x1_bls12381_spec_signature_subgroup_check_internal">spec_signature_subgroup_check_internal</a>(signature);
+</code></pre>
+
+
+
+<a id="@Specification_1_verify_aggregate_signature_internal"></a>
+
+### Function `verify_aggregate_signature_internal`
+
+
+<pre><code><b>fun</b> <a href="bls12381.md#0x1_bls12381_verify_aggregate_signature_internal">verify_aggregate_signature_internal</a>(aggsig: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, public_keys: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="bls12381.md#0x1_bls12381_PublicKeyWithPoP">bls12381::PublicKeyWithPoP</a>&gt;, messages: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;): bool
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> [abstract] <b>false</b>;
+<b>ensures</b> result == <a href="bls12381.md#0x1_bls12381_spec_verify_aggregate_signature_internal">spec_verify_aggregate_signature_internal</a>(aggsig, public_keys, messages);
+</code></pre>
+
+
+
+<a id="@Specification_1_verify_multisignature_internal"></a>
+
+### Function `verify_multisignature_internal`
+
+
+<pre><code><b>fun</b> <a href="bls12381.md#0x1_bls12381_verify_multisignature_internal">verify_multisignature_internal</a>(multisignature: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, agg_public_key: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, message: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> [abstract] <b>false</b>;
+<b>ensures</b> result == <a href="bls12381.md#0x1_bls12381_spec_verify_multisignature_internal">spec_verify_multisignature_internal</a>(multisignature, agg_public_key, message);
+</code></pre>
+
+
+
+<a id="@Specification_1_verify_normal_signature_internal"></a>
+
+### Function `verify_normal_signature_internal`
+
+
+<pre><code><b>fun</b> <a href="bls12381.md#0x1_bls12381_verify_normal_signature_internal">verify_normal_signature_internal</a>(signature: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, public_key: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, message: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> [abstract] <b>false</b>;
+<b>ensures</b> result == <a href="bls12381.md#0x1_bls12381_spec_verify_normal_signature_internal">spec_verify_normal_signature_internal</a>(signature, public_key, message);
+</code></pre>
+
+
+
+<a id="@Specification_1_verify_proof_of_possession_internal"></a>
+
+### Function `verify_proof_of_possession_internal`
+
+
+<pre><code><b>fun</b> <a href="bls12381.md#0x1_bls12381_verify_proof_of_possession_internal">verify_proof_of_possession_internal</a>(public_key: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, proof_of_possesion: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> [abstract] <b>false</b>;
+<b>ensures</b> result == <a href="bls12381.md#0x1_bls12381_spec_verify_proof_of_possession_internal">spec_verify_proof_of_possession_internal</a>(public_key, proof_of_possesion);
+</code></pre>
+
+
+
+<a id="@Specification_1_verify_signature_share_internal"></a>
+
+### Function `verify_signature_share_internal`
+
+
+<pre><code><b>fun</b> <a href="bls12381.md#0x1_bls12381_verify_signature_share_internal">verify_signature_share_internal</a>(signature_share: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, public_key: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, message: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> [abstract] <b>false</b>;
+<b>ensures</b> result == <a href="bls12381.md#0x1_bls12381_spec_verify_signature_share_internal">spec_verify_signature_share_internal</a>(signature_share, public_key, message);
+</code></pre>
+
+
+
+<a id="@Helper_functions_2"></a>
+
+### Helper functions
+
+
+
+<a id="0x1_bls12381_spec_aggregate_pubkeys_internal_1"></a>
+
+
+<pre><code><b>fun</b> <a href="bls12381.md#0x1_bls12381_spec_aggregate_pubkeys_internal_1">spec_aggregate_pubkeys_internal_1</a>(public_keys: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="bls12381.md#0x1_bls12381_PublicKeyWithPoP">PublicKeyWithPoP</a>&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+</code></pre>
+
+
+
+
+<a id="0x1_bls12381_spec_public_key_from_bytes_with_pop"></a>
+
+
+<pre><code><b>fun</b> <a href="bls12381.md#0x1_bls12381_spec_public_key_from_bytes_with_pop">spec_public_key_from_bytes_with_pop</a>(pk_bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, pop: <a href="bls12381.md#0x1_bls12381_ProofOfPossession">ProofOfPossession</a>): Option&lt;<a href="bls12381.md#0x1_bls12381_PublicKeyWithPoP">PublicKeyWithPoP</a>&gt;;
+</code></pre>
+
+
+
+
+<a id="0x1_bls12381_spec_aggregate_pubkeys_internal_2"></a>
+
+
+<pre><code><b>fun</b> <a href="bls12381.md#0x1_bls12381_spec_aggregate_pubkeys_internal_2">spec_aggregate_pubkeys_internal_2</a>(public_keys: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="bls12381.md#0x1_bls12381_PublicKeyWithPoP">PublicKeyWithPoP</a>&gt;): bool;
+</code></pre>
+
+
+
+
+<a id="0x1_bls12381_spec_aggregate_signatures_internal_1"></a>
+
+
+<pre><code><b>fun</b> <a href="bls12381.md#0x1_bls12381_spec_aggregate_signatures_internal_1">spec_aggregate_signatures_internal_1</a>(signatures: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="bls12381.md#0x1_bls12381_Signature">Signature</a>&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+</code></pre>
+
+
+
+
+<a id="0x1_bls12381_spec_aggregate_signatures_internal_2"></a>
+
+
+<pre><code><b>fun</b> <a href="bls12381.md#0x1_bls12381_spec_aggregate_signatures_internal_2">spec_aggregate_signatures_internal_2</a>(signatures: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="bls12381.md#0x1_bls12381_Signature">Signature</a>&gt;): bool;
+</code></pre>
+
+
+
+
+<a id="0x1_bls12381_spec_validate_pubkey_internal"></a>
+
+
+<pre><code><b>fun</b> <a href="bls12381.md#0x1_bls12381_spec_validate_pubkey_internal">spec_validate_pubkey_internal</a>(public_key: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool;
+</code></pre>
+
+
+
+
+<a id="0x1_bls12381_spec_signature_subgroup_check_internal"></a>
+
+
+<pre><code><b>fun</b> <a href="bls12381.md#0x1_bls12381_spec_signature_subgroup_check_internal">spec_signature_subgroup_check_internal</a>(signature: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool;
+</code></pre>
+
+
+
+
+<a id="0x1_bls12381_spec_verify_aggregate_signature_internal"></a>
+
+
+<pre><code><b>fun</b> <a href="bls12381.md#0x1_bls12381_spec_verify_aggregate_signature_internal">spec_verify_aggregate_signature_internal</a>(
+   aggsig: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+   public_keys: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="bls12381.md#0x1_bls12381_PublicKeyWithPoP">PublicKeyWithPoP</a>&gt;,
+   messages: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;,
+): bool;
+</code></pre>
+
+
+
+
+<a id="0x1_bls12381_spec_verify_multisignature_internal"></a>
+
+
+<pre><code><b>fun</b> <a href="bls12381.md#0x1_bls12381_spec_verify_multisignature_internal">spec_verify_multisignature_internal</a>(
+   multisignature: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+   agg_public_key: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+   message: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+): bool;
+</code></pre>
+
+
+
+
+<a id="0x1_bls12381_spec_verify_normal_signature_internal"></a>
+
+
+<pre><code><b>fun</b> <a href="bls12381.md#0x1_bls12381_spec_verify_normal_signature_internal">spec_verify_normal_signature_internal</a>(
+   signature: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+   public_key: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+   message: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+): bool;
+</code></pre>
+
+
+
+
+<a id="0x1_bls12381_spec_verify_proof_of_possession_internal"></a>
+
+
+<pre><code><b>fun</b> <a href="bls12381.md#0x1_bls12381_spec_verify_proof_of_possession_internal">spec_verify_proof_of_possession_internal</a>(
+   public_key: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+   proof_of_possesion: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+): bool;
+</code></pre>
+
+
+
+
+<a id="0x1_bls12381_spec_verify_signature_share_internal"></a>
+
+
+<pre><code><b>fun</b> <a href="bls12381.md#0x1_bls12381_spec_verify_signature_share_internal">spec_verify_signature_share_internal</a>(
+   signature_share: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+   public_key: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+   message: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+): bool;
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/bls12381_algebra.md b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/bls12381_algebra.md
new file mode 100644
index 0000000000000..9a6a39faec328
--- /dev/null
+++ b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/bls12381_algebra.md
@@ -0,0 +1,631 @@
+
+<a id="0x1_bls12381_algebra"></a>
+
+# Module `0x1::bls12381_algebra`
+
+This module defines marker types, constants and test cases for working with BLS12-381 curves
+using the generic API defined in <code>algebra.<b>move</b></code>.
+See https://datatracker.ietf.org/doc/html/draft-irtf-cfrg-pairing-friendly-curves-11#name-bls-curves-for-the-128-bit-
+for the full specification of BLS12-381 curves.
+
+Currently-supported BLS12-381 structures include <code><a href="bls12381_algebra.md#0x1_bls12381_algebra_Fq12">Fq12</a></code>, <code><a href="bls12381_algebra.md#0x1_bls12381_algebra_Fr">Fr</a></code>, <code><a href="bls12381_algebra.md#0x1_bls12381_algebra_G1">G1</a></code>, <code><a href="bls12381_algebra.md#0x1_bls12381_algebra_G2">G2</a></code> and <code><a href="bls12381_algebra.md#0x1_bls12381_algebra_Gt">Gt</a></code>,
+along with their widely-used serialization formats,
+the pairing between <code><a href="bls12381_algebra.md#0x1_bls12381_algebra_G1">G1</a></code>, <code><a href="bls12381_algebra.md#0x1_bls12381_algebra_G2">G2</a></code> and <code><a href="bls12381_algebra.md#0x1_bls12381_algebra_Gt">Gt</a></code>,
+and the hash-to-curve operations for <code><a href="bls12381_algebra.md#0x1_bls12381_algebra_G1">G1</a></code> and <code><a href="bls12381_algebra.md#0x1_bls12381_algebra_G2">G2</a></code> defined in https://datatracker.ietf.org/doc/html/draft-irtf-cfrg-hash-to-curve-16.
+
+Other unimplemented BLS12-381 structures and serialization formats are also listed here,
+as they help define some of the currently supported structures.
+Their implementation may also be added in the future.
+
+<code>Fq</code>: the finite field $F_q$ used in BLS12-381 curves with a prime order $q$ equal to
+0x1a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaab.
+
+<code>FormatFqLsb</code>: a serialization format for <code>Fq</code> elements,
+where an element is represented by a byte array <code>b[]</code> of size 48 with the least significant byte (LSB) coming first.
+
+<code>FormatFqMsb</code>: a serialization format for <code>Fq</code> elements,
+where an element is represented by a byte array <code>b[]</code> of size 48 with the most significant byte (MSB) coming first.
+
+<code>Fq2</code>: the finite field $F_{q^2}$ used in BLS12-381 curves,
+which is an extension field of <code>Fq</code>, constructed as $F_{q^2}=F_q[u]/(u^2+1)$.
+
+<code>FormatFq2LscLsb</code>: a serialization format for <code>Fq2</code> elements,
+where an element in the form $(c_0+c_1\cdot u)$ is represented by a byte array <code>b[]</code> of size 96,
+which is a concatenation of its coefficients serialized, with the least significant coefficient (LSC) coming first:
+- <code>b[0..48]</code> is $c_0$ serialized using <code>FormatFqLsb</code>.
+- <code>b[48..96]</code> is $c_1$ serialized using <code>FormatFqLsb</code>.
+
+<code>FormatFq2MscMsb</code>: a serialization format for <code>Fq2</code> elements,
+where an element in the form $(c_0+c_1\cdot u)$ is represented by a byte array <code>b[]</code> of size 96,
+which is a concatenation of its coefficients serialized, with the most significant coefficient (MSC) coming first:
+- <code>b[0..48]</code> is $c_1$ serialized using <code>FormatFqLsb</code>.
+- <code>b[48..96]</code> is $c_0$ serialized using <code>FormatFqLsb</code>.
+
+<code>Fq6</code>: the finite field $F_{q^6}$ used in BLS12-381 curves,
+which is an extension field of <code>Fq2</code>, constructed as $F_{q^6}=F_{q^2}[v]/(v^3-u-1)$.
+
+<code>FormatFq6LscLsb</code>: a serialization scheme for <code>Fq6</code> elements,
+where an element in the form $(c_0+c_1\cdot v+c_2\cdot v^2)$ is represented by a byte array <code>b[]</code> of size 288,
+which is a concatenation of its coefficients serialized, with the least significant coefficient (LSC) coming first:
+- <code>b[0..96]</code> is $c_0$ serialized using <code>FormatFq2LscLsb</code>.
+- <code>b[96..192]</code> is $c_1$ serialized using <code>FormatFq2LscLsb</code>.
+- <code>b[192..288]</code> is $c_2$ serialized using <code>FormatFq2LscLsb</code>.
+
+<code>G1Full</code>: a group constructed by the points on the BLS12-381 curve $E(F_q): y^2=x^3+4$ and the point at infinity,
+under the elliptic curve point addition.
+It contains the prime-order subgroup $G_1$ used in pairing.
+
+<code>G2Full</code>: a group constructed by the points on a curve $E'(F_{q^2}): y^2=x^3+4(u+1)$ and the point at infinity,
+under the elliptic curve point addition.
+It contains the prime-order subgroup $G_2$ used in pairing.
+
+
+-  [Struct `Fq12`](#0x1_bls12381_algebra_Fq12)
+-  [Struct `FormatFq12LscLsb`](#0x1_bls12381_algebra_FormatFq12LscLsb)
+-  [Struct `G1`](#0x1_bls12381_algebra_G1)
+-  [Struct `FormatG1Uncompr`](#0x1_bls12381_algebra_FormatG1Uncompr)
+-  [Struct `FormatG1Compr`](#0x1_bls12381_algebra_FormatG1Compr)
+-  [Struct `G2`](#0x1_bls12381_algebra_G2)
+-  [Struct `FormatG2Uncompr`](#0x1_bls12381_algebra_FormatG2Uncompr)
+-  [Struct `FormatG2Compr`](#0x1_bls12381_algebra_FormatG2Compr)
+-  [Struct `Gt`](#0x1_bls12381_algebra_Gt)
+-  [Struct `FormatGt`](#0x1_bls12381_algebra_FormatGt)
+-  [Struct `Fr`](#0x1_bls12381_algebra_Fr)
+-  [Struct `FormatFrLsb`](#0x1_bls12381_algebra_FormatFrLsb)
+-  [Struct `FormatFrMsb`](#0x1_bls12381_algebra_FormatFrMsb)
+-  [Struct `HashG1XmdSha256SswuRo`](#0x1_bls12381_algebra_HashG1XmdSha256SswuRo)
+-  [Struct `HashG2XmdSha256SswuRo`](#0x1_bls12381_algebra_HashG2XmdSha256SswuRo)
+
+
+<pre><code></code></pre>
+
+
+
+<a id="0x1_bls12381_algebra_Fq12"></a>
+
+## Struct `Fq12`
+
+The finite field $F_{q^12}$ used in BLS12-381 curves,
+which is an extension field of <code>Fq6</code> (defined in the module documentation), constructed as $F_{q^12}=F_{q^6}[w]/(w^2-v)$.
+
+
+<pre><code><b>struct</b> <a href="bls12381_algebra.md#0x1_bls12381_algebra_Fq12">Fq12</a>
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>dummy_field: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_bls12381_algebra_FormatFq12LscLsb"></a>
+
+## Struct `FormatFq12LscLsb`
+
+A serialization scheme for <code><a href="bls12381_algebra.md#0x1_bls12381_algebra_Fq12">Fq12</a></code> elements,
+where an element $(c_0+c_1\cdot w)$ is represented by a byte array <code>b[]</code> of size 576,
+which is a concatenation of its coefficients serialized, with the least significant coefficient (LSC) coming first.
+- <code>b[0..288]</code> is $c_0$ serialized using <code>FormatFq6LscLsb</code> (defined in the module documentation).
+- <code>b[288..576]</code> is $c_1$ serialized using <code>FormatFq6LscLsb</code>.
+
+NOTE: other implementation(s) using this format: ark-bls12-381-0.4.0.
+
+
+<pre><code><b>struct</b> <a href="bls12381_algebra.md#0x1_bls12381_algebra_FormatFq12LscLsb">FormatFq12LscLsb</a>
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>dummy_field: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_bls12381_algebra_G1"></a>
+
+## Struct `G1`
+
+The group $G_1$ in BLS12-381-based pairing $G_1 \times G_2 \rightarrow G_t$.
+It is a subgroup of <code>G1Full</code> (defined in the module documentation) with a prime order $r$
+equal to 0x73eda753299d7d483339d80809a1d80553bda402fffe5bfeffffffff00000001.
+(so <code><a href="bls12381_algebra.md#0x1_bls12381_algebra_Fr">Fr</a></code> is the associated scalar field).
+
+
+<pre><code><b>struct</b> <a href="bls12381_algebra.md#0x1_bls12381_algebra_G1">G1</a>
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>dummy_field: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_bls12381_algebra_FormatG1Uncompr"></a>
+
+## Struct `FormatG1Uncompr`
+
+A serialization scheme for <code><a href="bls12381_algebra.md#0x1_bls12381_algebra_G1">G1</a></code> elements derived from
+https://www.ietf.org/archive/id/draft-irtf-cfrg-pairing-friendly-curves-11.html#name-zcash-serialization-format-.
+
+Below is the serialization procedure that takes a <code><a href="bls12381_algebra.md#0x1_bls12381_algebra_G1">G1</a></code> element <code>p</code> and outputs a byte array of size 96.
+1. Let <code>(x,y)</code> be the coordinates of <code>p</code> if <code>p</code> is on the curve, or <code>(0,0)</code> otherwise.
+1. Serialize <code>x</code> and <code>y</code> into <code>b_x[]</code> and <code>b_y[]</code> respectively using <code>FormatFqMsb</code> (defined in the module documentation).
+1. Concatenate <code>b_x[]</code> and <code>b_y[]</code> into <code>b[]</code>.
+1. If <code>p</code> is the point at infinity, set the infinity bit: <code>b[0]: = b[0] | 0x40</code>.
+1. Return <code>b[]</code>.
+
+Below is the deserialization procedure that takes a byte array <code>b[]</code> and outputs either a <code><a href="bls12381_algebra.md#0x1_bls12381_algebra_G1">G1</a></code> element or none.
+1. If the size of <code>b[]</code> is not 96, return none.
+1. Compute the compression flag as <code>b[0] & 0x80 != 0</code>.
+1. If the compression flag is true, return none.
+1. Compute the infinity flag as <code>b[0] & 0x40 != 0</code>.
+1. If the infinity flag is set, return the point at infinity.
+1. Deserialize <code>[b[0] & 0x1f, b[1], ..., b[47]]</code> to <code>x</code> using <code>FormatFqMsb</code>. If <code>x</code> is none, return none.
+1. Deserialize <code>[b[48], ..., b[95]]</code> to <code>y</code> using <code>FormatFqMsb</code>. If <code>y</code> is none, return none.
+1. Check if <code>(x,y)</code> is on curve <code>E</code>. If not, return none.
+1. Check if <code>(x,y)</code> is in the subgroup of order <code>r</code>. If not, return none.
+1. Return <code>(x,y)</code>.
+
+NOTE: other implementation(s) using this format: ark-bls12-381-0.4.0.
+
+
+<pre><code><b>struct</b> <a href="bls12381_algebra.md#0x1_bls12381_algebra_FormatG1Uncompr">FormatG1Uncompr</a>
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>dummy_field: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_bls12381_algebra_FormatG1Compr"></a>
+
+## Struct `FormatG1Compr`
+
+A serialization scheme for <code><a href="bls12381_algebra.md#0x1_bls12381_algebra_G1">G1</a></code> elements derived from
+https://www.ietf.org/archive/id/draft-irtf-cfrg-pairing-friendly-curves-11.html#name-zcash-serialization-format-.
+
+Below is the serialization procedure that takes a <code><a href="bls12381_algebra.md#0x1_bls12381_algebra_G1">G1</a></code> element <code>p</code> and outputs a byte array of size 48.
+1. Let <code>(x,y)</code> be the coordinates of <code>p</code> if <code>p</code> is on the curve, or <code>(0,0)</code> otherwise.
+1. Serialize <code>x</code> into <code>b[]</code> using <code>FormatFqMsb</code> (defined in the module documentation).
+1. Set the compression bit: <code>b[0] := b[0] | 0x80</code>.
+1. If <code>p</code> is the point at infinity, set the infinity bit: <code>b[0]: = b[0] | 0x40</code>.
+1. If <code>y &gt; -y</code>, set the lexicographical flag: <code>b[0] := b[0] | 0x20</code>.
+1. Return <code>b[]</code>.
+
+Below is the deserialization procedure that takes a byte array <code>b[]</code> and outputs either a <code><a href="bls12381_algebra.md#0x1_bls12381_algebra_G1">G1</a></code> element or none.
+1. If the size of <code>b[]</code> is not 48, return none.
+1. Compute the compression flag as <code>b[0] & 0x80 != 0</code>.
+1. If the compression flag is false, return none.
+1. Compute the infinity flag as <code>b[0] & 0x40 != 0</code>.
+1. If the infinity flag is set, return the point at infinity.
+1. Compute the lexicographical flag as <code>b[0] & 0x20 != 0</code>.
+1. Deserialize <code>[b[0] & 0x1f, b[1], ..., b[47]]</code> to <code>x</code> using <code>FormatFqMsb</code>. If <code>x</code> is none, return none.
+1. Solve the curve equation with <code>x</code> for <code>y</code>. If no such <code>y</code> exists, return none.
+1. Let <code>y'</code> be <code>max(y,-y)</code> if the lexicographical flag is set, or <code><b>min</b>(y,-y)</code> otherwise.
+1. Check if <code>(x,y')</code> is in the subgroup of order <code>r</code>. If not, return none.
+1. Return <code>(x,y')</code>.
+
+NOTE: other implementation(s) using this format: ark-bls12-381-0.4.0.
+
+
+<pre><code><b>struct</b> <a href="bls12381_algebra.md#0x1_bls12381_algebra_FormatG1Compr">FormatG1Compr</a>
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>dummy_field: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_bls12381_algebra_G2"></a>
+
+## Struct `G2`
+
+The group $G_2$ in BLS12-381-based pairing $G_1 \times G_2 \rightarrow G_t$.
+It is a subgroup of <code>G2Full</code> (defined in the module documentation) with a prime order $r$ equal to
+0x73eda753299d7d483339d80809a1d80553bda402fffe5bfeffffffff00000001.
+(so <code><a href="bls12381_algebra.md#0x1_bls12381_algebra_Fr">Fr</a></code> is the scalar field).
+
+
+<pre><code><b>struct</b> <a href="bls12381_algebra.md#0x1_bls12381_algebra_G2">G2</a>
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>dummy_field: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_bls12381_algebra_FormatG2Uncompr"></a>
+
+## Struct `FormatG2Uncompr`
+
+A serialization scheme for <code><a href="bls12381_algebra.md#0x1_bls12381_algebra_G2">G2</a></code> elements derived from
+https://www.ietf.org/archive/id/draft-irtf-cfrg-pairing-friendly-curves-11.html#name-zcash-serialization-format-.
+
+Below is the serialization procedure that takes a <code><a href="bls12381_algebra.md#0x1_bls12381_algebra_G2">G2</a></code> element <code>p</code> and outputs a byte array of size 192.
+1. Let <code>(x,y)</code> be the coordinates of <code>p</code> if <code>p</code> is on the curve, or <code>(0,0)</code> otherwise.
+1. Serialize <code>x</code> and <code>y</code> into <code>b_x[]</code> and <code>b_y[]</code> respectively using <code>FormatFq2MscMsb</code> (defined in the module documentation).
+1. Concatenate <code>b_x[]</code> and <code>b_y[]</code> into <code>b[]</code>.
+1. If <code>p</code> is the point at infinity, set the infinity bit in <code>b[]</code>: <code>b[0]: = b[0] | 0x40</code>.
+1. Return <code>b[]</code>.
+
+Below is the deserialization procedure that takes a byte array <code>b[]</code> and outputs either a <code><a href="bls12381_algebra.md#0x1_bls12381_algebra_G2">G2</a></code> element or none.
+1. If the size of <code>b[]</code> is not 192, return none.
+1. Compute the compression flag as <code>b[0] & 0x80 != 0</code>.
+1. If the compression flag is true, return none.
+1. Compute the infinity flag as <code>b[0] & 0x40 != 0</code>.
+1. If the infinity flag is set, return the point at infinity.
+1. Deserialize <code>[b[0] & 0x1f, ..., b[95]]</code> to <code>x</code> using <code>FormatFq2MscMsb</code>. If <code>x</code> is none, return none.
+1. Deserialize <code>[b[96], ..., b[191]]</code> to <code>y</code> using <code>FormatFq2MscMsb</code>. If <code>y</code> is none, return none.
+1. Check if <code>(x,y)</code> is on the curve <code>E'</code>. If not, return none.
+1. Check if <code>(x,y)</code> is in the subgroup of order <code>r</code>. If not, return none.
+1. Return <code>(x,y)</code>.
+
+NOTE: other implementation(s) using this format: ark-bls12-381-0.4.0.
+
+
+<pre><code><b>struct</b> <a href="bls12381_algebra.md#0x1_bls12381_algebra_FormatG2Uncompr">FormatG2Uncompr</a>
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>dummy_field: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_bls12381_algebra_FormatG2Compr"></a>
+
+## Struct `FormatG2Compr`
+
+A serialization scheme for <code><a href="bls12381_algebra.md#0x1_bls12381_algebra_G2">G2</a></code> elements derived from
+https://www.ietf.org/archive/id/draft-irtf-cfrg-pairing-friendly-curves-11.html#name-zcash-serialization-format-.
+
+Below is the serialization procedure that takes a <code><a href="bls12381_algebra.md#0x1_bls12381_algebra_G2">G2</a></code> element <code>p</code> and outputs a byte array of size 96.
+1. Let <code>(x,y)</code> be the coordinates of <code>p</code> if <code>p</code> is on the curve, or <code>(0,0)</code> otherwise.
+1. Serialize <code>x</code> into <code>b[]</code> using <code>FormatFq2MscMsb</code> (defined in the module documentation).
+1. Set the compression bit: <code>b[0] := b[0] | 0x80</code>.
+1. If <code>p</code> is the point at infinity, set the infinity bit: <code>b[0]: = b[0] | 0x40</code>.
+1. If <code>y &gt; -y</code>, set the lexicographical flag: <code>b[0] := b[0] | 0x20</code>.
+1. Return <code>b[]</code>.
+
+Below is the deserialization procedure that takes a byte array <code>b[]</code> and outputs either a <code><a href="bls12381_algebra.md#0x1_bls12381_algebra_G2">G2</a></code> element or none.
+1. If the size of <code>b[]</code> is not 96, return none.
+1. Compute the compression flag as <code>b[0] & 0x80 != 0</code>.
+1. If the compression flag is false, return none.
+1. Compute the infinity flag as <code>b[0] & 0x40 != 0</code>.
+1. If the infinity flag is set, return the point at infinity.
+1. Compute the lexicographical flag as <code>b[0] & 0x20 != 0</code>.
+1. Deserialize <code>[b[0] & 0x1f, b[1], ..., b[95]]</code> to <code>x</code> using <code>FormatFq2MscMsb</code>. If <code>x</code> is none, return none.
+1. Solve the curve equation with <code>x</code> for <code>y</code>. If no such <code>y</code> exists, return none.
+1. Let <code>y'</code> be <code>max(y,-y)</code> if the lexicographical flag is set, or <code><b>min</b>(y,-y)</code> otherwise.
+1. Check if <code>(x,y')</code> is in the subgroup of order <code>r</code>. If not, return none.
+1. Return <code>(x,y')</code>.
+
+NOTE: other implementation(s) using this format: ark-bls12-381-0.4.0.
+
+
+<pre><code><b>struct</b> <a href="bls12381_algebra.md#0x1_bls12381_algebra_FormatG2Compr">FormatG2Compr</a>
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>dummy_field: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_bls12381_algebra_Gt"></a>
+
+## Struct `Gt`
+
+The group $G_t$ in BLS12-381-based pairing $G_1 \times G_2 \rightarrow G_t$.
+It is a multiplicative subgroup of <code><a href="bls12381_algebra.md#0x1_bls12381_algebra_Fq12">Fq12</a></code>,
+with a prime order $r$ equal to 0x73eda753299d7d483339d80809a1d80553bda402fffe5bfeffffffff00000001.
+(so <code><a href="bls12381_algebra.md#0x1_bls12381_algebra_Fr">Fr</a></code> is the scalar field).
+The identity of <code><a href="bls12381_algebra.md#0x1_bls12381_algebra_Gt">Gt</a></code> is 1.
+
+
+<pre><code><b>struct</b> <a href="bls12381_algebra.md#0x1_bls12381_algebra_Gt">Gt</a>
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>dummy_field: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_bls12381_algebra_FormatGt"></a>
+
+## Struct `FormatGt`
+
+A serialization scheme for <code><a href="bls12381_algebra.md#0x1_bls12381_algebra_Gt">Gt</a></code> elements.
+
+To serialize, it treats a <code><a href="bls12381_algebra.md#0x1_bls12381_algebra_Gt">Gt</a></code> element <code>p</code> as an <code><a href="bls12381_algebra.md#0x1_bls12381_algebra_Fq12">Fq12</a></code> element and serialize it using <code><a href="bls12381_algebra.md#0x1_bls12381_algebra_FormatFq12LscLsb">FormatFq12LscLsb</a></code>.
+
+To deserialize, it uses <code><a href="bls12381_algebra.md#0x1_bls12381_algebra_FormatFq12LscLsb">FormatFq12LscLsb</a></code> to try deserializing to an <code><a href="bls12381_algebra.md#0x1_bls12381_algebra_Fq12">Fq12</a></code> element then test the membership in <code><a href="bls12381_algebra.md#0x1_bls12381_algebra_Gt">Gt</a></code>.
+
+NOTE: other implementation(s) using this format: ark-bls12-381-0.4.0.
+
+
+<pre><code><b>struct</b> <a href="bls12381_algebra.md#0x1_bls12381_algebra_FormatGt">FormatGt</a>
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>dummy_field: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_bls12381_algebra_Fr"></a>
+
+## Struct `Fr`
+
+The finite field $F_r$ that can be used as the scalar fields
+associated with the groups $G_1$, $G_2$, $G_t$ in BLS12-381-based pairing.
+
+
+<pre><code><b>struct</b> <a href="bls12381_algebra.md#0x1_bls12381_algebra_Fr">Fr</a>
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>dummy_field: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_bls12381_algebra_FormatFrLsb"></a>
+
+## Struct `FormatFrLsb`
+
+A serialization format for <code><a href="bls12381_algebra.md#0x1_bls12381_algebra_Fr">Fr</a></code> elements,
+where an element is represented by a byte array <code>b[]</code> of size 32 with the least significant byte (LSB) coming first.
+
+NOTE: other implementation(s) using this format: ark-bls12-381-0.4.0, blst-0.3.7.
+
+
+<pre><code><b>struct</b> <a href="bls12381_algebra.md#0x1_bls12381_algebra_FormatFrLsb">FormatFrLsb</a>
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>dummy_field: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_bls12381_algebra_FormatFrMsb"></a>
+
+## Struct `FormatFrMsb`
+
+A serialization scheme for <code><a href="bls12381_algebra.md#0x1_bls12381_algebra_Fr">Fr</a></code> elements,
+where an element is represented by a byte array <code>b[]</code> of size 32 with the most significant byte (MSB) coming first.
+
+NOTE: other implementation(s) using this format: ark-bls12-381-0.4.0, blst-0.3.7.
+
+
+<pre><code><b>struct</b> <a href="bls12381_algebra.md#0x1_bls12381_algebra_FormatFrMsb">FormatFrMsb</a>
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>dummy_field: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_bls12381_algebra_HashG1XmdSha256SswuRo"></a>
+
+## Struct `HashG1XmdSha256SswuRo`
+
+The hash-to-curve suite <code>BLS12381G1_XMD:SHA-256_SSWU_RO_</code> that hashes a byte array into <code><a href="bls12381_algebra.md#0x1_bls12381_algebra_G1">G1</a></code> elements.
+
+Full specification is defined in https://datatracker.ietf.org/doc/html/draft-irtf-cfrg-hash-to-curve-16#name-bls12-381-g1.
+
+
+<pre><code><b>struct</b> <a href="bls12381_algebra.md#0x1_bls12381_algebra_HashG1XmdSha256SswuRo">HashG1XmdSha256SswuRo</a>
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>dummy_field: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_bls12381_algebra_HashG2XmdSha256SswuRo"></a>
+
+## Struct `HashG2XmdSha256SswuRo`
+
+The hash-to-curve suite <code>BLS12381G2_XMD:SHA-256_SSWU_RO_</code> that hashes a byte array into <code><a href="bls12381_algebra.md#0x1_bls12381_algebra_G2">G2</a></code> elements.
+
+Full specification is defined in https://datatracker.ietf.org/doc/html/draft-irtf-cfrg-hash-to-curve-16#name-bls12-381-g2.
+
+
+<pre><code><b>struct</b> <a href="bls12381_algebra.md#0x1_bls12381_algebra_HashG2XmdSha256SswuRo">HashG2XmdSha256SswuRo</a>
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>dummy_field: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/bn254_algebra.md b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/bn254_algebra.md
new file mode 100644
index 0000000000000..e535bcd84fed6
--- /dev/null
+++ b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/bn254_algebra.md
@@ -0,0 +1,665 @@
+
+<a id="0x1_bn254_algebra"></a>
+
+# Module `0x1::bn254_algebra`
+
+This module defines marker types, constants and test cases for working with BN254 curves using the generic API defined in <code>algebra.<b>move</b></code>.
+BN254 was sampled as part of the [\[BCTV14\]](https://eprint.iacr.org/2013/879.pdf) paper .
+The name denotes that it is a Barreto-Naehrig curve of embedding degree 12, defined over a 254-bit (prime) field.
+The scalar field is highly 2-adic which supports subgroups of roots of unity of size <= 2^28.
+(as (21888242871839275222246405745257275088548364400416034343698204186575808495617 - 1) mod 2^28 = 0)
+
+This curve is also implemented in [libff](https://github.com/scipr-lab/libff/tree/master/libff/algebra/curves/alt_bn128) under the name <code>bn128</code>.
+It is the same as the <code>bn254</code> curve used in Ethereum (eg: [go-ethereum](https://github.com/ethereum/go-ethereum/tree/master/crypto/bn254/cloudflare)).
+
+
+<a id="@CAUTION_0"></a>
+
+## CAUTION
+
+**This curve does not satisfy the 128-bit security level anymore.**
+
+Its current security is estimated at 128-bits (see "Updating Key Size Estimations for Pairings"; by Barbulescu, Razvan and Duquesne, Sylvain; in Journal of Cryptology; 2019; https://doi.org/10.1007/s00145-018-9280-5)
+
+
+Curve information:
+* Base field: q =
+21888242871839275222246405745257275088696311157297823662689037894645226208583
+* Scalar field: r =
+21888242871839275222246405745257275088548364400416034343698204186575808495617
+* valuation(q - 1, 2) = 1
+* valuation(r - 1, 2) = 28
+* G1 curve equation: y^2 = x^3 + 3
+* G2 curve equation: y^2 = x^3 + B, where
+* B = 3/(u+9) where Fq2 is represented as Fq\[u\]/(u^2+1) =
+Fq2(19485874751759354771024239261021720505790618469301721065564631296452457478373,
+266929791119991161246907387137283842545076965332900288569378510910307636690)
+
+
+Currently-supported BN254 structures include <code><a href="bn254_algebra.md#0x1_bn254_algebra_Fq12">Fq12</a></code>, <code><a href="bn254_algebra.md#0x1_bn254_algebra_Fr">Fr</a></code>, <code><a href="bn254_algebra.md#0x1_bn254_algebra_Fq">Fq</a></code>, <code>Fq2</code>, <code><a href="bn254_algebra.md#0x1_bn254_algebra_G1">G1</a></code>, <code><a href="bn254_algebra.md#0x1_bn254_algebra_G2">G2</a></code> and <code><a href="bn254_algebra.md#0x1_bn254_algebra_Gt">Gt</a></code>,
+along with their widely-used serialization formats,
+the pairing between <code><a href="bn254_algebra.md#0x1_bn254_algebra_G1">G1</a></code>, <code><a href="bn254_algebra.md#0x1_bn254_algebra_G2">G2</a></code> and <code><a href="bn254_algebra.md#0x1_bn254_algebra_Gt">Gt</a></code>.
+
+Other unimplemented BN254 structures and serialization formats are also listed here,
+as they help define some of the currently supported structures.
+Their implementation may also be added in the future.
+
+<code>Fq2</code>: The finite field $F_{q^2}$ that can be used as the base field of $G_2$
+which is an extension field of <code><a href="bn254_algebra.md#0x1_bn254_algebra_Fq">Fq</a></code>, constructed as $F_{q^2}=F_{q}[u]/(u^2+1)$.
+
+<code>FormatFq2LscLsb</code>: A serialization scheme for <code>Fq2</code> elements,
+where an element $(c_0+c_1\cdot u)$ is represented by a byte array <code>b[]</code> of size N=64,
+which is a concatenation of its coefficients serialized, with the least significant coefficient (LSC) coming first.
+- <code>b[0..32]</code> is $c_0$ serialized using <code>FormatFqLscLsb</code>.
+- <code>b[32..64]</code> is $c_1$ serialized using <code>FormatFqLscLsb</code>.
+
+<code>Fq6</code>: the finite field $F_{q^6}$ used in BN254 curves,
+which is an extension field of <code>Fq2</code>, constructed as $F_{q^6}=F_{q^2}[v]/(v^3-u-9)$.
+
+<code>FormatFq6LscLsb</code>: a serialization scheme for <code>Fq6</code> elements,
+where an element in the form $(c_0+c_1\cdot v+c_2\cdot v^2)$ is represented by a byte array <code>b[]</code> of size 192,
+which is a concatenation of its coefficients serialized, with the least significant coefficient (LSC) coming first:
+- <code>b[0..64]</code> is $c_0$ serialized using <code>FormatFq2LscLsb</code>.
+- <code>b[64..128]</code> is $c_1$ serialized using <code>FormatFq2LscLsb</code>.
+- <code>b[128..192]</code> is $c_2$ serialized using <code>FormatFq2LscLsb</code>.
+
+<code>G1Full</code>: a group constructed by the points on the BN254 curve $E(F_q): y^2=x^3+3$ and the point at infinity,
+under the elliptic curve point addition.
+It contains the prime-order subgroup $G_1$ used in pairing.
+
+<code>G2Full</code>: a group constructed by the points on a curve $E'(F_{q^2}): y^2=x^3+3/(u+9)$ and the point at infinity,
+under the elliptic curve point addition.
+It contains the prime-order subgroup $G_2$ used in pairing.
+
+
+-  [CAUTION](#@CAUTION_0)
+-  [Struct `Fr`](#0x1_bn254_algebra_Fr)
+-  [Struct `FormatFrLsb`](#0x1_bn254_algebra_FormatFrLsb)
+-  [Struct `FormatFrMsb`](#0x1_bn254_algebra_FormatFrMsb)
+-  [Struct `Fq`](#0x1_bn254_algebra_Fq)
+-  [Struct `FormatFqLsb`](#0x1_bn254_algebra_FormatFqLsb)
+-  [Struct `FormatFqMsb`](#0x1_bn254_algebra_FormatFqMsb)
+-  [Struct `Fq12`](#0x1_bn254_algebra_Fq12)
+-  [Struct `FormatFq12LscLsb`](#0x1_bn254_algebra_FormatFq12LscLsb)
+-  [Struct `G1`](#0x1_bn254_algebra_G1)
+-  [Struct `FormatG1Uncompr`](#0x1_bn254_algebra_FormatG1Uncompr)
+-  [Struct `FormatG1Compr`](#0x1_bn254_algebra_FormatG1Compr)
+-  [Struct `G2`](#0x1_bn254_algebra_G2)
+-  [Struct `FormatG2Uncompr`](#0x1_bn254_algebra_FormatG2Uncompr)
+-  [Struct `FormatG2Compr`](#0x1_bn254_algebra_FormatG2Compr)
+-  [Struct `Gt`](#0x1_bn254_algebra_Gt)
+-  [Struct `FormatGt`](#0x1_bn254_algebra_FormatGt)
+
+
+<pre><code></code></pre>
+
+
+
+<a id="0x1_bn254_algebra_Fr"></a>
+
+## Struct `Fr`
+
+The finite field $F_r$ that can be used as the scalar fields
+associated with the groups $G_1$, $G_2$, $G_t$ in BN254-based pairing.
+
+
+<pre><code><b>struct</b> <a href="bn254_algebra.md#0x1_bn254_algebra_Fr">Fr</a>
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>dummy_field: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_bn254_algebra_FormatFrLsb"></a>
+
+## Struct `FormatFrLsb`
+
+A serialization format for <code><a href="bn254_algebra.md#0x1_bn254_algebra_Fr">Fr</a></code> elements,
+where an element is represented by a byte array <code>b[]</code> of size 32 with the least significant byte (LSB) coming first.
+
+NOTE: other implementation(s) using this format: ark-bn254-0.4.0.
+
+
+<pre><code><b>struct</b> <a href="bn254_algebra.md#0x1_bn254_algebra_FormatFrLsb">FormatFrLsb</a>
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>dummy_field: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_bn254_algebra_FormatFrMsb"></a>
+
+## Struct `FormatFrMsb`
+
+A serialization scheme for <code><a href="bn254_algebra.md#0x1_bn254_algebra_Fr">Fr</a></code> elements,
+where an element is represented by a byte array <code>b[]</code> of size 32 with the most significant byte (MSB) coming first.
+
+NOTE: other implementation(s) using this format: ark-bn254-0.4.0.
+
+
+<pre><code><b>struct</b> <a href="bn254_algebra.md#0x1_bn254_algebra_FormatFrMsb">FormatFrMsb</a>
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>dummy_field: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_bn254_algebra_Fq"></a>
+
+## Struct `Fq`
+
+The finite field $F_q$ that can be used as the base field of $G_1$
+
+
+<pre><code><b>struct</b> <a href="bn254_algebra.md#0x1_bn254_algebra_Fq">Fq</a>
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>dummy_field: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_bn254_algebra_FormatFqLsb"></a>
+
+## Struct `FormatFqLsb`
+
+A serialization format for <code><a href="bn254_algebra.md#0x1_bn254_algebra_Fq">Fq</a></code> elements,
+where an element is represented by a byte array <code>b[]</code> of size 32 with the least significant byte (LSB) coming first.
+
+NOTE: other implementation(s) using this format: ark-bn254-0.4.0.
+
+
+<pre><code><b>struct</b> <a href="bn254_algebra.md#0x1_bn254_algebra_FormatFqLsb">FormatFqLsb</a>
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>dummy_field: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_bn254_algebra_FormatFqMsb"></a>
+
+## Struct `FormatFqMsb`
+
+A serialization scheme for <code><a href="bn254_algebra.md#0x1_bn254_algebra_Fq">Fq</a></code> elements,
+where an element is represented by a byte array <code>b[]</code> of size 32 with the most significant byte (MSB) coming first.
+
+NOTE: other implementation(s) using this format: ark-bn254-0.4.0.
+
+
+<pre><code><b>struct</b> <a href="bn254_algebra.md#0x1_bn254_algebra_FormatFqMsb">FormatFqMsb</a>
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>dummy_field: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_bn254_algebra_Fq12"></a>
+
+## Struct `Fq12`
+
+The finite field $F_{q^12}$ used in BN254 curves,
+which is an extension field of <code>Fq6</code> (defined in the module documentation), constructed as $F_{q^12}=F_{q^6}[w]/(w^2-v)$.
+The field can downcast to <code><a href="bn254_algebra.md#0x1_bn254_algebra_Gt">Gt</a></code> if it's an element of the multiplicative subgroup <code><a href="bn254_algebra.md#0x1_bn254_algebra_Gt">Gt</a></code> of <code><a href="bn254_algebra.md#0x1_bn254_algebra_Fq12">Fq12</a></code>
+with a prime order $r$ = 0x73eda753299d7d483339d80809a1d80553bda402fffe5bfeffffffff00000001.
+
+
+<pre><code><b>struct</b> <a href="bn254_algebra.md#0x1_bn254_algebra_Fq12">Fq12</a>
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>dummy_field: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_bn254_algebra_FormatFq12LscLsb"></a>
+
+## Struct `FormatFq12LscLsb`
+
+A serialization scheme for <code><a href="bn254_algebra.md#0x1_bn254_algebra_Fq12">Fq12</a></code> elements,
+where an element $(c_0+c_1\cdot w)$ is represented by a byte array <code>b[]</code> of size 384,
+which is a concatenation of its coefficients serialized, with the least significant coefficient (LSC) coming first.
+- <code>b[0..192]</code> is $c_0$ serialized using <code>FormatFq6LscLsb</code> (defined in the module documentation).
+- <code>b[192..384]</code> is $c_1$ serialized using <code>FormatFq6LscLsb</code>.
+
+NOTE: other implementation(s) using this format: ark-bn254-0.4.0.
+
+
+<pre><code><b>struct</b> <a href="bn254_algebra.md#0x1_bn254_algebra_FormatFq12LscLsb">FormatFq12LscLsb</a>
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>dummy_field: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_bn254_algebra_G1"></a>
+
+## Struct `G1`
+
+The group $G_1$ in BN254-based pairing $G_1 \times G_2 \rightarrow G_t$.
+It is a subgroup of <code>G1Full</code> (defined in the module documentation) with a prime order $r$
+equal to 0x73eda753299d7d483339d80809a1d80553bda402fffe5bfeffffffff00000001.
+(so <code><a href="bn254_algebra.md#0x1_bn254_algebra_Fr">Fr</a></code> is the associated scalar field).
+
+
+<pre><code><b>struct</b> <a href="bn254_algebra.md#0x1_bn254_algebra_G1">G1</a>
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>dummy_field: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_bn254_algebra_FormatG1Uncompr"></a>
+
+## Struct `FormatG1Uncompr`
+
+A serialization scheme for <code><a href="bn254_algebra.md#0x1_bn254_algebra_G1">G1</a></code> elements derived from arkworks.rs.
+
+Below is the serialization procedure that takes a <code><a href="bn254_algebra.md#0x1_bn254_algebra_G1">G1</a></code> element <code>p</code> and outputs a byte array of size N=64.
+1. Let <code>(x,y)</code> be the coordinates of <code>p</code> if <code>p</code> is on the curve, or <code>(0,0)</code> otherwise.
+1. Serialize <code>x</code> and <code>y</code> into <code>b_x[]</code> and <code>b_y[]</code> respectively using <code><a href="bn254_algebra.md#0x1_bn254_algebra_FormatFqLsb">FormatFqLsb</a></code> (defined in the module documentation).
+1. Concatenate <code>b_x[]</code> and <code>b_y[]</code> into <code>b[]</code>.
+1. If <code>p</code> is the point at infinity, set the infinity bit: <code>b[N-1]: = b[N-1] | 0b0100_0000</code>.
+1. If <code>y &gt; -y</code>, set the lexicographical bit:  <code>b[N-1]: = b[N-1] | 0b1000_0000</code>.
+1. Return <code>b[]</code>.
+
+Below is the deserialization procedure that takes a byte array <code>b[]</code> and outputs either a <code><a href="bn254_algebra.md#0x1_bn254_algebra_G1">G1</a></code> element or none.
+1. If the size of <code>b[]</code> is not N, return none.
+1. Compute the infinity flag as <code>b[N-1] & 0b0100_0000 != 0</code>.
+1. If the infinity flag is set, return the point at infinity.
+1. Deserialize <code>[b[0], b[1], ..., b[N/2-1]]</code> to <code>x</code> using <code><a href="bn254_algebra.md#0x1_bn254_algebra_FormatFqLsb">FormatFqLsb</a></code>. If <code>x</code> is none, return none.
+1. Deserialize <code>[b[N/2], ..., b[N] & 0b0011_1111]</code> to <code>y</code> using <code><a href="bn254_algebra.md#0x1_bn254_algebra_FormatFqLsb">FormatFqLsb</a></code>. If <code>y</code> is none, return none.
+1. Check if <code>(x,y)</code> is on curve <code>E</code>. If not, return none.
+1. Check if <code>(x,y)</code> is in the subgroup of order <code>r</code>. If not, return none.
+1. Return <code>(x,y)</code>.
+
+NOTE: other implementation(s) using this format: ark-bn254-0.4.0.
+
+
+<pre><code><b>struct</b> <a href="bn254_algebra.md#0x1_bn254_algebra_FormatG1Uncompr">FormatG1Uncompr</a>
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>dummy_field: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_bn254_algebra_FormatG1Compr"></a>
+
+## Struct `FormatG1Compr`
+
+A serialization scheme for <code><a href="bn254_algebra.md#0x1_bn254_algebra_G1">G1</a></code> elements derived from arkworks.rs
+
+Below is the serialization procedure that takes a <code><a href="bn254_algebra.md#0x1_bn254_algebra_G1">G1</a></code> element <code>p</code> and outputs a byte array of size N=32.
+1. Let <code>(x,y)</code> be the coordinates of <code>p</code> if <code>p</code> is on the curve, or <code>(0,0)</code> otherwise.
+1. Serialize <code>x</code> into <code>b[]</code> using <code><a href="bn254_algebra.md#0x1_bn254_algebra_FormatFqLsb">FormatFqLsb</a></code> (defined in the module documentation).
+1. If <code>p</code> is the point at infinity, set the infinity bit: <code>b[N-1]: = b[N-1] | 0b0100_0000</code>.
+1. If <code>y &gt; -y</code>, set the lexicographical flag: <code>b[N-1] := b[N-1] | 0x1000_0000</code>.
+1. Return <code>b[]</code>.
+
+Below is the deserialization procedure that takes a byte array <code>b[]</code> and outputs either a <code><a href="bn254_algebra.md#0x1_bn254_algebra_G1">G1</a></code> element or none.
+1. If the size of <code>b[]</code> is not N, return none.
+1. Compute the infinity flag as <code>b[N-1] & 0b0100_0000 != 0</code>.
+1. If the infinity flag is set, return the point at infinity.
+1. Compute the lexicographical flag as <code>b[N-1] & 0b1000_0000 != 0</code>.
+1. Deserialize <code>[b[0], b[1], ..., b[N/2-1] & 0b0011_1111]</code> to <code>x</code> using <code><a href="bn254_algebra.md#0x1_bn254_algebra_FormatFqLsb">FormatFqLsb</a></code>. If <code>x</code> is none, return none.
+1. Solve the curve equation with <code>x</code> for <code>y</code>. If no such <code>y</code> exists, return none.
+1. Let <code>y'</code> be <code>max(y,-y)</code> if the lexicographical flag is set, or <code><b>min</b>(y,-y)</code> otherwise.
+1. Check if <code>(x,y')</code> is in the subgroup of order <code>r</code>. If not, return none.
+1. Return <code>(x,y')</code>.
+
+NOTE: other implementation(s) using this format: ark-bn254-0.4.0.
+
+
+<pre><code><b>struct</b> <a href="bn254_algebra.md#0x1_bn254_algebra_FormatG1Compr">FormatG1Compr</a>
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>dummy_field: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_bn254_algebra_G2"></a>
+
+## Struct `G2`
+
+The group $G_2$ in BN254-based pairing $G_1 \times G_2 \rightarrow G_t$.
+It is a subgroup of <code>G2Full</code> (defined in the module documentation) with a prime order $r$ equal to
+0x73eda753299d7d483339d80809a1d80553bda402fffe5bfeffffffff00000001.
+(so <code><a href="bn254_algebra.md#0x1_bn254_algebra_Fr">Fr</a></code> is the scalar field).
+
+
+<pre><code><b>struct</b> <a href="bn254_algebra.md#0x1_bn254_algebra_G2">G2</a>
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>dummy_field: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_bn254_algebra_FormatG2Uncompr"></a>
+
+## Struct `FormatG2Uncompr`
+
+A serialization scheme for <code><a href="bn254_algebra.md#0x1_bn254_algebra_G2">G2</a></code> elements derived from arkworks.rs.
+
+Below is the serialization procedure that takes a <code><a href="bn254_algebra.md#0x1_bn254_algebra_G2">G2</a></code> element <code>p</code> and outputs a byte array of size N=128.
+1. Let <code>(x,y)</code> be the coordinates of <code>p</code> if <code>p</code> is on the curve, or <code>(0,0)</code> otherwise.
+1. Serialize <code>x</code> and <code>y</code> into <code>b_x[]</code> and <code>b_y[]</code> respectively using <code>FormatFq2LscLsb</code> (defined in the module documentation).
+1. Concatenate <code>b_x[]</code> and <code>b_y[]</code> into <code>b[]</code>.
+1. If <code>p</code> is the point at infinity, set the infinity bit: <code>b[N-1]: = b[N-1] | 0b0100_0000</code>.
+1. If <code>y &gt; -y</code>, set the lexicographical bit:  <code>b[N-1]: = b[N-1] | 0b1000_0000</code>.
+1. Return <code>b[]</code>.
+
+Below is the deserialization procedure that takes a byte array <code>b[]</code> and outputs either a <code><a href="bn254_algebra.md#0x1_bn254_algebra_G1">G1</a></code> element or none.
+1. If the size of <code>b[]</code> is not N, return none.
+1. Compute the infinity flag as <code>b[N-1] & 0b0100_0000 != 0</code>.
+1. If the infinity flag is set, return the point at infinity.
+1. Deserialize <code>[b[0], b[1], ..., b[N/2-1]]</code> to <code>x</code> using <code>FormatFq2LscLsb</code>. If <code>x</code> is none, return none.
+1. Deserialize <code>[b[N/2], ..., b[N] & 0b0011_1111]</code> to <code>y</code> using <code>FormatFq2LscLsb</code>. If <code>y</code> is none, return none.
+1. Check if <code>(x,y)</code> is on curve <code>E</code>. If not, return none.
+1. Check if <code>(x,y)</code> is in the subgroup of order <code>r</code>. If not, return none.
+1. Return <code>(x,y)</code>.
+
+NOTE: other implementation(s) using this format: ark-bn254-0.4.0.
+
+
+<pre><code><b>struct</b> <a href="bn254_algebra.md#0x1_bn254_algebra_FormatG2Uncompr">FormatG2Uncompr</a>
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>dummy_field: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_bn254_algebra_FormatG2Compr"></a>
+
+## Struct `FormatG2Compr`
+
+A serialization scheme for <code><a href="bn254_algebra.md#0x1_bn254_algebra_G1">G1</a></code> elements derived from arkworks.rs
+
+Below is the serialization procedure that takes a <code><a href="bn254_algebra.md#0x1_bn254_algebra_G1">G1</a></code> element <code>p</code> and outputs a byte array of size N=64.
+1. Let <code>(x,y)</code> be the coordinates of <code>p</code> if <code>p</code> is on the curve, or <code>(0,0)</code> otherwise.
+1. Serialize <code>x</code> into <code>b[]</code> using <code>FormatFq2LscLsb</code> (defined in the module documentation).
+1. If <code>p</code> is the point at infinity, set the infinity bit: <code>b[N-1]: = b[N-1] | 0b0100_0000</code>.
+1. If <code>y &gt; -y</code>, set the lexicographical flag: <code>b[N-1] := b[N-1] | 0x1000_0000</code>.
+1. Return <code>b[]</code>.
+
+Below is the deserialization procedure that takes a byte array <code>b[]</code> and outputs either a <code><a href="bn254_algebra.md#0x1_bn254_algebra_G1">G1</a></code> element or none.
+1. If the size of <code>b[]</code> is not N, return none.
+1. Compute the infinity flag as <code>b[N-1] & 0b0100_0000 != 0</code>.
+1. If the infinity flag is set, return the point at infinity.
+1. Compute the lexicographical flag as <code>b[N-1] & 0b1000_0000 != 0</code>.
+1. Deserialize <code>[b[0], b[1], ..., b[N/2-1] & 0b0011_1111]</code> to <code>x</code> using <code>FormatFq2LscLsb</code>. If <code>x</code> is none, return none.
+1. Solve the curve equation with <code>x</code> for <code>y</code>. If no such <code>y</code> exists, return none.
+1. Let <code>y'</code> be <code>max(y,-y)</code> if the lexicographical flag is set, or <code><b>min</b>(y,-y)</code> otherwise.
+1. Check if <code>(x,y')</code> is in the subgroup of order <code>r</code>. If not, return none.
+1. Return <code>(x,y')</code>.
+
+NOTE: other implementation(s) using this format: ark-bn254-0.4.0.
+
+
+<pre><code><b>struct</b> <a href="bn254_algebra.md#0x1_bn254_algebra_FormatG2Compr">FormatG2Compr</a>
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>dummy_field: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_bn254_algebra_Gt"></a>
+
+## Struct `Gt`
+
+The group $G_t$ in BN254-based pairing $G_1 \times G_2 \rightarrow G_t$.
+It is a multiplicative subgroup of <code><a href="bn254_algebra.md#0x1_bn254_algebra_Fq12">Fq12</a></code>, so it  can upcast to <code><a href="bn254_algebra.md#0x1_bn254_algebra_Fq12">Fq12</a></code>.
+with a prime order $r$ equal to 0x73eda753299d7d483339d80809a1d80553bda402fffe5bfeffffffff00000001.
+(so <code><a href="bn254_algebra.md#0x1_bn254_algebra_Fr">Fr</a></code> is the scalar field).
+The identity of <code><a href="bn254_algebra.md#0x1_bn254_algebra_Gt">Gt</a></code> is 1.
+
+
+<pre><code><b>struct</b> <a href="bn254_algebra.md#0x1_bn254_algebra_Gt">Gt</a>
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>dummy_field: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_bn254_algebra_FormatGt"></a>
+
+## Struct `FormatGt`
+
+A serialization scheme for <code><a href="bn254_algebra.md#0x1_bn254_algebra_Gt">Gt</a></code> elements.
+
+To serialize, it treats a <code><a href="bn254_algebra.md#0x1_bn254_algebra_Gt">Gt</a></code> element <code>p</code> as an <code><a href="bn254_algebra.md#0x1_bn254_algebra_Fq12">Fq12</a></code> element and serialize it using <code><a href="bn254_algebra.md#0x1_bn254_algebra_FormatFq12LscLsb">FormatFq12LscLsb</a></code>.
+
+To deserialize, it uses <code><a href="bn254_algebra.md#0x1_bn254_algebra_FormatFq12LscLsb">FormatFq12LscLsb</a></code> to try deserializing to an <code><a href="bn254_algebra.md#0x1_bn254_algebra_Fq12">Fq12</a></code> element then test the membership in <code><a href="bn254_algebra.md#0x1_bn254_algebra_Gt">Gt</a></code>.
+
+NOTE: other implementation(s) using this format: ark-bn254-0.4.0.
+
+
+<pre><code><b>struct</b> <a href="bn254_algebra.md#0x1_bn254_algebra_FormatGt">FormatGt</a>
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>dummy_field: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/capability.md b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/capability.md
new file mode 100644
index 0000000000000..34bf50f11d898
--- /dev/null
+++ b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/capability.md
@@ -0,0 +1,735 @@
+
+<a id="0x1_capability"></a>
+
+# Module `0x1::capability`
+
+A module which defines the basic concept of
+[*capabilities*](https://en.wikipedia.org/wiki/Capability-based_security) for managing access control.
+
+EXPERIMENTAL
+
+
+<a id="@Overview_0"></a>
+
+## Overview
+
+
+A capability is a unforgeable token which testifies that a signer has authorized a certain operation.
+The token is valid during the transaction where it is obtained. Since the type <code><a href="capability.md#0x1_capability_Cap">capability::Cap</a></code> has
+no ability to be stored in global memory, capabilities cannot leak out of a transaction. For every function
+called within a transaction which has a capability as a parameter, it is guaranteed that the capability
+has been obtained via a proper signer-based authorization step previously in the transaction's execution.
+
+
+<a id="@Usage_1"></a>
+
+### Usage
+
+
+Initializing and acquiring capabilities is usually encapsulated in a module with a type
+tag which can only be constructed by this module.
+
+```
+module Pkg::Feature {
+use std::capability::Cap;
+
+/// A type tag used in Cap<Feature>. Only this module can create an instance,
+/// and there is no public function other than Self::acquire which returns a value of this type.
+/// This way, this module has full control how Cap<Feature> is given out.
+struct Feature has drop {}
+
+/// Initializes this module.
+public fun initialize(s: &signer) {
+// Create capability. This happens once at module initialization time.
+// One needs to provide a witness for being the owner of Feature
+// in the 2nd parameter.
+<<additional conditions allowing to initialize this capability>>
+capability::create<Feature>(s, &Feature{});
+}
+
+/// Acquires the capability to work with this feature.
+public fun acquire(s: &signer): Cap<Feature> {
+<<additional conditions allowing to acquire this capability>>
+capability::acquire<Feature>(s, &Feature{});
+}
+
+/// Does something related to the feature. The caller must pass a Cap<Feature>.
+public fun do_something(_cap: Cap<Feature>) { ... }
+}
+```
+
+
+<a id="@Delegation_2"></a>
+
+### Delegation
+
+
+Capabilities come with the optional feature of *delegation*. Via <code><a href="capability.md#0x1_capability_delegate">Self::delegate</a></code>, an owner of a capability
+can designate another signer to be also capable of acquiring the capability. Like the original creator,
+the delegate needs to present his signer to obtain the capability in his transactions. Delegation can
+be revoked via <code><a href="capability.md#0x1_capability_revoke">Self::revoke</a></code>, removing this access right from the delegate.
+
+While the basic authorization mechanism for delegates is the same as with core capabilities, the
+target of delegation might be subject of restrictions which need to be specified and verified. This can
+be done via global invariants in the specification language. For example, in order to prevent delegation
+all together for a capability, one can use the following invariant:
+
+```
+invariant forall a: address where capability::spec_has_cap<Feature>(a):
+len(capability::spec_delegates<Feature>(a)) == 0;
+```
+
+Similarly, the following invariant would enforce that delegates, if existent, must satisfy a certain
+predicate:
+
+```
+invariant forall a: address where capability::spec_has_cap<Feature>(a):
+forall d in capability::spec_delegates<Feature>(a):
+is_valid_delegate_for_feature(d);
+```
+
+
+-  [Overview](#@Overview_0)
+    -  [Usage](#@Usage_1)
+    -  [Delegation](#@Delegation_2)
+-  [Struct `Cap`](#0x1_capability_Cap)
+-  [Struct `LinearCap`](#0x1_capability_LinearCap)
+-  [Resource `CapState`](#0x1_capability_CapState)
+-  [Resource `CapDelegateState`](#0x1_capability_CapDelegateState)
+-  [Constants](#@Constants_3)
+-  [Function `create`](#0x1_capability_create)
+-  [Function `acquire`](#0x1_capability_acquire)
+-  [Function `acquire_linear`](#0x1_capability_acquire_linear)
+-  [Function `validate_acquire`](#0x1_capability_validate_acquire)
+-  [Function `root_addr`](#0x1_capability_root_addr)
+-  [Function `linear_root_addr`](#0x1_capability_linear_root_addr)
+-  [Function `delegate`](#0x1_capability_delegate)
+-  [Function `revoke`](#0x1_capability_revoke)
+-  [Function `remove_element`](#0x1_capability_remove_element)
+-  [Function `add_element`](#0x1_capability_add_element)
+-  [Specification](#@Specification_4)
+    -  [Function `create`](#@Specification_4_create)
+    -  [Function `acquire`](#@Specification_4_acquire)
+    -  [Function `acquire_linear`](#@Specification_4_acquire_linear)
+    -  [Function `delegate`](#@Specification_4_delegate)
+    -  [Function `revoke`](#@Specification_4_revoke)
+    -  [Function `remove_element`](#@Specification_4_remove_element)
+    -  [Function `add_element`](#@Specification_4_add_element)
+
+
+<pre><code><b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">0x1::signer</a>;
+<b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">0x1::vector</a>;
+</code></pre>
+
+
+
+<a id="0x1_capability_Cap"></a>
+
+## Struct `Cap`
+
+The token representing an acquired capability. Cannot be stored in memory, but copied and dropped freely.
+
+
+<pre><code><b>struct</b> <a href="capability.md#0x1_capability_Cap">Cap</a>&lt;Feature&gt; <b>has</b> <b>copy</b>, drop
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>root: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_capability_LinearCap"></a>
+
+## Struct `LinearCap`
+
+A linear version of a capability token. This can be used if an acquired capability should be enforced
+to be used only once for an authorization.
+
+
+<pre><code><b>struct</b> <a href="capability.md#0x1_capability_LinearCap">LinearCap</a>&lt;Feature&gt; <b>has</b> drop
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>root: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_capability_CapState"></a>
+
+## Resource `CapState`
+
+An internal data structure for representing a configured capability.
+
+
+<pre><code><b>struct</b> <a href="capability.md#0x1_capability_CapState">CapState</a>&lt;Feature&gt; <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>delegates: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_capability_CapDelegateState"></a>
+
+## Resource `CapDelegateState`
+
+An internal data structure for representing a configured delegated capability.
+
+
+<pre><code><b>struct</b> <a href="capability.md#0x1_capability_CapDelegateState">CapDelegateState</a>&lt;Feature&gt; <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>root: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_3"></a>
+
+## Constants
+
+
+<a id="0x1_capability_ECAPABILITY_ALREADY_EXISTS"></a>
+
+Capability resource already exists on the specified account
+
+
+<pre><code><b>const</b> <a href="capability.md#0x1_capability_ECAPABILITY_ALREADY_EXISTS">ECAPABILITY_ALREADY_EXISTS</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_capability_ECAPABILITY_NOT_FOUND"></a>
+
+Capability resource not found
+
+
+<pre><code><b>const</b> <a href="capability.md#0x1_capability_ECAPABILITY_NOT_FOUND">ECAPABILITY_NOT_FOUND</a>: u64 = 2;
+</code></pre>
+
+
+
+<a id="0x1_capability_EDELEGATE"></a>
+
+Account does not have delegated permissions
+
+
+<pre><code><b>const</b> <a href="capability.md#0x1_capability_EDELEGATE">EDELEGATE</a>: u64 = 3;
+</code></pre>
+
+
+
+<a id="0x1_capability_create"></a>
+
+## Function `create`
+
+Creates a new capability class, owned by the passed signer. A caller must pass a witness that
+they own the <code>Feature</code> type parameter.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="capability.md#0x1_capability_create">create</a>&lt;Feature&gt;(owner: &<a href="../../../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, _feature_witness: &Feature)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="capability.md#0x1_capability_create">create</a>&lt;Feature&gt;(owner: &<a href="../../../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, _feature_witness: &Feature) {
+    <b>let</b> addr = <a href="../../../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(owner);
+    <b>assert</b>!(!<b>exists</b>&lt;<a href="capability.md#0x1_capability_CapState">CapState</a>&lt;Feature&gt;&gt;(addr), <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_already_exists">error::already_exists</a>(<a href="capability.md#0x1_capability_ECAPABILITY_ALREADY_EXISTS">ECAPABILITY_ALREADY_EXISTS</a>));
+    <b>move_to</b>&lt;<a href="capability.md#0x1_capability_CapState">CapState</a>&lt;Feature&gt;&gt;(owner, <a href="capability.md#0x1_capability_CapState">CapState</a> { delegates: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_empty">vector::empty</a>() });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_capability_acquire"></a>
+
+## Function `acquire`
+
+Acquires a capability token. Only the owner of the capability class, or an authorized delegate,
+can succeed with this operation. A caller must pass a witness that they own the <code>Feature</code> type
+parameter.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="capability.md#0x1_capability_acquire">acquire</a>&lt;Feature&gt;(requester: &<a href="../../../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, _feature_witness: &Feature): <a href="capability.md#0x1_capability_Cap">capability::Cap</a>&lt;Feature&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="capability.md#0x1_capability_acquire">acquire</a>&lt;Feature&gt;(requester: &<a href="../../../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, _feature_witness: &Feature): <a href="capability.md#0x1_capability_Cap">Cap</a>&lt;Feature&gt;
+<b>acquires</b> <a href="capability.md#0x1_capability_CapState">CapState</a>, <a href="capability.md#0x1_capability_CapDelegateState">CapDelegateState</a> {
+    <a href="capability.md#0x1_capability_Cap">Cap</a>&lt;Feature&gt; { root: <a href="capability.md#0x1_capability_validate_acquire">validate_acquire</a>&lt;Feature&gt;(requester) }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_capability_acquire_linear"></a>
+
+## Function `acquire_linear`
+
+Acquires a linear capability token. It is up to the module which owns <code>Feature</code> to decide
+whether to expose a linear or non-linear capability.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="capability.md#0x1_capability_acquire_linear">acquire_linear</a>&lt;Feature&gt;(requester: &<a href="../../../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, _feature_witness: &Feature): <a href="capability.md#0x1_capability_LinearCap">capability::LinearCap</a>&lt;Feature&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="capability.md#0x1_capability_acquire_linear">acquire_linear</a>&lt;Feature&gt;(requester: &<a href="../../../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, _feature_witness: &Feature): <a href="capability.md#0x1_capability_LinearCap">LinearCap</a>&lt;Feature&gt;
+<b>acquires</b> <a href="capability.md#0x1_capability_CapState">CapState</a>, <a href="capability.md#0x1_capability_CapDelegateState">CapDelegateState</a> {
+    <a href="capability.md#0x1_capability_LinearCap">LinearCap</a>&lt;Feature&gt; { root: <a href="capability.md#0x1_capability_validate_acquire">validate_acquire</a>&lt;Feature&gt;(requester) }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_capability_validate_acquire"></a>
+
+## Function `validate_acquire`
+
+Helper to validate an acquire. Returns the root address of the capability.
+
+
+<pre><code><b>fun</b> <a href="capability.md#0x1_capability_validate_acquire">validate_acquire</a>&lt;Feature&gt;(requester: &<a href="../../../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="capability.md#0x1_capability_validate_acquire">validate_acquire</a>&lt;Feature&gt;(requester: &<a href="../../../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>): <b>address</b>
+<b>acquires</b> <a href="capability.md#0x1_capability_CapState">CapState</a>, <a href="capability.md#0x1_capability_CapDelegateState">CapDelegateState</a> {
+    <b>let</b> addr = <a href="../../../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(requester);
+    <b>if</b> (<b>exists</b>&lt;<a href="capability.md#0x1_capability_CapDelegateState">CapDelegateState</a>&lt;Feature&gt;&gt;(addr)) {
+        <b>let</b> root_addr = <b>borrow_global</b>&lt;<a href="capability.md#0x1_capability_CapDelegateState">CapDelegateState</a>&lt;Feature&gt;&gt;(addr).root;
+        // double check that requester is actually registered <b>as</b> a delegate
+        <b>assert</b>!(<b>exists</b>&lt;<a href="capability.md#0x1_capability_CapState">CapState</a>&lt;Feature&gt;&gt;(root_addr), <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="capability.md#0x1_capability_EDELEGATE">EDELEGATE</a>));
+        <b>assert</b>!(<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_contains">vector::contains</a>(&<b>borrow_global</b>&lt;<a href="capability.md#0x1_capability_CapState">CapState</a>&lt;Feature&gt;&gt;(root_addr).delegates, &addr),
+            <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="capability.md#0x1_capability_EDELEGATE">EDELEGATE</a>));
+        root_addr
+    } <b>else</b> {
+        <b>assert</b>!(<b>exists</b>&lt;<a href="capability.md#0x1_capability_CapState">CapState</a>&lt;Feature&gt;&gt;(addr), <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="capability.md#0x1_capability_ECAPABILITY_NOT_FOUND">ECAPABILITY_NOT_FOUND</a>));
+        addr
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_capability_root_addr"></a>
+
+## Function `root_addr`
+
+Returns the root address associated with the given capability token. Only the owner
+of the feature can do this.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="capability.md#0x1_capability_root_addr">root_addr</a>&lt;Feature&gt;(cap: <a href="capability.md#0x1_capability_Cap">capability::Cap</a>&lt;Feature&gt;, _feature_witness: &Feature): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="capability.md#0x1_capability_root_addr">root_addr</a>&lt;Feature&gt;(cap: <a href="capability.md#0x1_capability_Cap">Cap</a>&lt;Feature&gt;, _feature_witness: &Feature): <b>address</b> {
+    cap.root
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_capability_linear_root_addr"></a>
+
+## Function `linear_root_addr`
+
+Returns the root address associated with the given linear capability token.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="capability.md#0x1_capability_linear_root_addr">linear_root_addr</a>&lt;Feature&gt;(cap: <a href="capability.md#0x1_capability_LinearCap">capability::LinearCap</a>&lt;Feature&gt;, _feature_witness: &Feature): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="capability.md#0x1_capability_linear_root_addr">linear_root_addr</a>&lt;Feature&gt;(cap: <a href="capability.md#0x1_capability_LinearCap">LinearCap</a>&lt;Feature&gt;, _feature_witness: &Feature): <b>address</b> {
+    cap.root
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_capability_delegate"></a>
+
+## Function `delegate`
+
+Registers a delegation relation. If the relation already exists, this function does
+nothing.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="capability.md#0x1_capability_delegate">delegate</a>&lt;Feature&gt;(cap: <a href="capability.md#0x1_capability_Cap">capability::Cap</a>&lt;Feature&gt;, _feature_witness: &Feature, <b>to</b>: &<a href="../../../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="capability.md#0x1_capability_delegate">delegate</a>&lt;Feature&gt;(cap: <a href="capability.md#0x1_capability_Cap">Cap</a>&lt;Feature&gt;, _feature_witness: &Feature, <b>to</b>: &<a href="../../../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+<b>acquires</b> <a href="capability.md#0x1_capability_CapState">CapState</a> {
+    <b>let</b> addr = <a href="../../../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<b>to</b>);
+    <b>if</b> (<b>exists</b>&lt;<a href="capability.md#0x1_capability_CapDelegateState">CapDelegateState</a>&lt;Feature&gt;&gt;(addr)) <b>return</b>;
+    <b>move_to</b>(<b>to</b>, <a href="capability.md#0x1_capability_CapDelegateState">CapDelegateState</a>&lt;Feature&gt; { root: cap.root });
+    <a href="capability.md#0x1_capability_add_element">add_element</a>(&<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="capability.md#0x1_capability_CapState">CapState</a>&lt;Feature&gt;&gt;(cap.root).delegates, addr);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_capability_revoke"></a>
+
+## Function `revoke`
+
+Revokes a delegation relation. If no relation exists, this function does nothing.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="capability.md#0x1_capability_revoke">revoke</a>&lt;Feature&gt;(cap: <a href="capability.md#0x1_capability_Cap">capability::Cap</a>&lt;Feature&gt;, _feature_witness: &Feature, from: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="capability.md#0x1_capability_revoke">revoke</a>&lt;Feature&gt;(cap: <a href="capability.md#0x1_capability_Cap">Cap</a>&lt;Feature&gt;, _feature_witness: &Feature, from: <b>address</b>)
+<b>acquires</b> <a href="capability.md#0x1_capability_CapState">CapState</a>, <a href="capability.md#0x1_capability_CapDelegateState">CapDelegateState</a>
+{
+    <b>if</b> (!<b>exists</b>&lt;<a href="capability.md#0x1_capability_CapDelegateState">CapDelegateState</a>&lt;Feature&gt;&gt;(from)) <b>return</b>;
+    <b>let</b> <a href="capability.md#0x1_capability_CapDelegateState">CapDelegateState</a> { root: _root } = <b>move_from</b>&lt;<a href="capability.md#0x1_capability_CapDelegateState">CapDelegateState</a>&lt;Feature&gt;&gt;(from);
+    <a href="capability.md#0x1_capability_remove_element">remove_element</a>(&<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="capability.md#0x1_capability_CapState">CapState</a>&lt;Feature&gt;&gt;(cap.root).delegates, &from);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_capability_remove_element"></a>
+
+## Function `remove_element`
+
+Helper to remove an element from a vector.
+
+
+<pre><code><b>fun</b> <a href="capability.md#0x1_capability_remove_element">remove_element</a>&lt;E: drop&gt;(v: &<b>mut</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;E&gt;, x: &E)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="capability.md#0x1_capability_remove_element">remove_element</a>&lt;E: drop&gt;(v: &<b>mut</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;E&gt;, x: &E) {
+    <b>let</b> (found, index) = <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_index_of">vector::index_of</a>(v, x);
+    <b>if</b> (found) {
+        <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_remove">vector::remove</a>(v, index);
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_capability_add_element"></a>
+
+## Function `add_element`
+
+Helper to add an element to a vector.
+
+
+<pre><code><b>fun</b> <a href="capability.md#0x1_capability_add_element">add_element</a>&lt;E: drop&gt;(v: &<b>mut</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;E&gt;, x: E)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="capability.md#0x1_capability_add_element">add_element</a>&lt;E: drop&gt;(v: &<b>mut</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;E&gt;, x: E) {
+    <b>if</b> (!<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_contains">vector::contains</a>(v, &x)) {
+        <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_push_back">vector::push_back</a>(v, x)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_4"></a>
+
+## Specification
+
+Helper specification function to check whether a capability exists at address.
+
+
+<a id="0x1_capability_spec_has_cap"></a>
+
+
+<pre><code><b>fun</b> <a href="capability.md#0x1_capability_spec_has_cap">spec_has_cap</a>&lt;Feature&gt;(addr: <b>address</b>): bool {
+   <b>exists</b>&lt;<a href="capability.md#0x1_capability_CapState">CapState</a>&lt;Feature&gt;&gt;(addr)
+}
+</code></pre>
+
+
+Helper specification function to obtain the delegates of a capability.
+
+
+<a id="0x1_capability_spec_delegates"></a>
+
+
+<pre><code><b>fun</b> <a href="capability.md#0x1_capability_spec_delegates">spec_delegates</a>&lt;Feature&gt;(addr: <b>address</b>): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt; {
+   <b>global</b>&lt;<a href="capability.md#0x1_capability_CapState">CapState</a>&lt;Feature&gt;&gt;(addr).delegates
+}
+</code></pre>
+
+
+Helper specification function to check whether a delegated capability exists at address.
+
+
+<a id="0x1_capability_spec_has_delegate_cap"></a>
+
+
+<pre><code><b>fun</b> <a href="capability.md#0x1_capability_spec_has_delegate_cap">spec_has_delegate_cap</a>&lt;Feature&gt;(addr: <b>address</b>): bool {
+   <b>exists</b>&lt;<a href="capability.md#0x1_capability_CapDelegateState">CapDelegateState</a>&lt;Feature&gt;&gt;(addr)
+}
+</code></pre>
+
+
+
+<a id="@Specification_4_create"></a>
+
+### Function `create`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="capability.md#0x1_capability_create">create</a>&lt;Feature&gt;(owner: &<a href="../../../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, _feature_witness: &Feature)
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> addr = <a href="../../../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(owner);
+<b>aborts_if</b> <a href="capability.md#0x1_capability_spec_has_cap">spec_has_cap</a>&lt;Feature&gt;(addr);
+<b>ensures</b> <a href="capability.md#0x1_capability_spec_has_cap">spec_has_cap</a>&lt;Feature&gt;(addr);
+</code></pre>
+
+
+
+<a id="@Specification_4_acquire"></a>
+
+### Function `acquire`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="capability.md#0x1_capability_acquire">acquire</a>&lt;Feature&gt;(requester: &<a href="../../../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, _feature_witness: &Feature): <a href="capability.md#0x1_capability_Cap">capability::Cap</a>&lt;Feature&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> addr = <a href="../../../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(requester);
+<b>let</b> root_addr = <b>global</b>&lt;<a href="capability.md#0x1_capability_CapDelegateState">CapDelegateState</a>&lt;Feature&gt;&gt;(addr).root;
+<b>include</b> <a href="capability.md#0x1_capability_AcquireSchema">AcquireSchema</a>&lt;Feature&gt;;
+<b>ensures</b> <a href="capability.md#0x1_capability_spec_has_delegate_cap">spec_has_delegate_cap</a>&lt;Feature&gt;(addr) ==&gt; result.root == root_addr;
+<b>ensures</b> !<a href="capability.md#0x1_capability_spec_has_delegate_cap">spec_has_delegate_cap</a>&lt;Feature&gt;(addr) ==&gt; result.root == addr;
+</code></pre>
+
+
+
+<a id="@Specification_4_acquire_linear"></a>
+
+### Function `acquire_linear`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="capability.md#0x1_capability_acquire_linear">acquire_linear</a>&lt;Feature&gt;(requester: &<a href="../../../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, _feature_witness: &Feature): <a href="capability.md#0x1_capability_LinearCap">capability::LinearCap</a>&lt;Feature&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> addr = <a href="../../../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(requester);
+<b>let</b> root_addr = <b>global</b>&lt;<a href="capability.md#0x1_capability_CapDelegateState">CapDelegateState</a>&lt;Feature&gt;&gt;(addr).root;
+<b>include</b> <a href="capability.md#0x1_capability_AcquireSchema">AcquireSchema</a>&lt;Feature&gt;;
+<b>ensures</b> <a href="capability.md#0x1_capability_spec_has_delegate_cap">spec_has_delegate_cap</a>&lt;Feature&gt;(addr) ==&gt; result.root == root_addr;
+<b>ensures</b> !<a href="capability.md#0x1_capability_spec_has_delegate_cap">spec_has_delegate_cap</a>&lt;Feature&gt;(addr) ==&gt; result.root == addr;
+</code></pre>
+
+
+
+
+<a id="0x1_capability_AcquireSchema"></a>
+
+
+<pre><code><b>schema</b> <a href="capability.md#0x1_capability_AcquireSchema">AcquireSchema</a>&lt;Feature&gt; {
+    addr: <b>address</b>;
+    root_addr: <b>address</b>;
+    <b>aborts_if</b> <a href="capability.md#0x1_capability_spec_has_delegate_cap">spec_has_delegate_cap</a>&lt;Feature&gt;(addr) && !<a href="capability.md#0x1_capability_spec_has_cap">spec_has_cap</a>&lt;Feature&gt;(root_addr);
+    <b>aborts_if</b> <a href="capability.md#0x1_capability_spec_has_delegate_cap">spec_has_delegate_cap</a>&lt;Feature&gt;(addr) && !<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_spec_contains">vector::spec_contains</a>(<a href="capability.md#0x1_capability_spec_delegates">spec_delegates</a>&lt;Feature&gt;(root_addr), addr);
+    <b>aborts_if</b> !<a href="capability.md#0x1_capability_spec_has_delegate_cap">spec_has_delegate_cap</a>&lt;Feature&gt;(addr) && !<a href="capability.md#0x1_capability_spec_has_cap">spec_has_cap</a>&lt;Feature&gt;(addr);
+}
+</code></pre>
+
+
+
+<a id="@Specification_4_delegate"></a>
+
+### Function `delegate`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="capability.md#0x1_capability_delegate">delegate</a>&lt;Feature&gt;(cap: <a href="capability.md#0x1_capability_Cap">capability::Cap</a>&lt;Feature&gt;, _feature_witness: &Feature, <b>to</b>: &<a href="../../../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> addr = <a href="../../../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<b>to</b>);
+<b>ensures</b> <a href="capability.md#0x1_capability_spec_has_delegate_cap">spec_has_delegate_cap</a>&lt;Feature&gt;(addr);
+<b>ensures</b> !<b>old</b>(<a href="capability.md#0x1_capability_spec_has_delegate_cap">spec_has_delegate_cap</a>&lt;Feature&gt;(addr)) ==&gt; <b>global</b>&lt;<a href="capability.md#0x1_capability_CapDelegateState">CapDelegateState</a>&lt;Feature&gt;&gt;(addr).root == cap.root;
+<b>ensures</b> !<b>old</b>(<a href="capability.md#0x1_capability_spec_has_delegate_cap">spec_has_delegate_cap</a>&lt;Feature&gt;(addr)) ==&gt; <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_spec_contains">vector::spec_contains</a>(<a href="capability.md#0x1_capability_spec_delegates">spec_delegates</a>&lt;Feature&gt;(cap.root), addr);
+</code></pre>
+
+
+
+<a id="@Specification_4_revoke"></a>
+
+### Function `revoke`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="capability.md#0x1_capability_revoke">revoke</a>&lt;Feature&gt;(cap: <a href="capability.md#0x1_capability_Cap">capability::Cap</a>&lt;Feature&gt;, _feature_witness: &Feature, from: <b>address</b>)
+</code></pre>
+
+
+
+
+<pre><code><b>ensures</b> !<a href="capability.md#0x1_capability_spec_has_delegate_cap">spec_has_delegate_cap</a>&lt;Feature&gt;(from);
+</code></pre>
+
+
+
+<a id="@Specification_4_remove_element"></a>
+
+### Function `remove_element`
+
+
+<pre><code><b>fun</b> <a href="capability.md#0x1_capability_remove_element">remove_element</a>&lt;E: drop&gt;(v: &<b>mut</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;E&gt;, x: &E)
+</code></pre>
+
+
+
+
+<a id="@Specification_4_add_element"></a>
+
+### Function `add_element`
+
+
+<pre><code><b>fun</b> <a href="capability.md#0x1_capability_add_element">add_element</a>&lt;E: drop&gt;(v: &<b>mut</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;E&gt;, x: E)
+</code></pre>
+
+
+
+
+<pre><code><b>ensures</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_spec_contains">vector::spec_contains</a>(v, x);
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/comparator.md b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/comparator.md
new file mode 100644
index 0000000000000..24aa41f3b8400
--- /dev/null
+++ b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/comparator.md
@@ -0,0 +1,387 @@
+
+<a id="0x1_comparator"></a>
+
+# Module `0x1::comparator`
+
+Provides a framework for comparing two elements
+
+
+-  [Struct `Result`](#0x1_comparator_Result)
+-  [Constants](#@Constants_0)
+-  [Function `is_equal`](#0x1_comparator_is_equal)
+-  [Function `is_smaller_than`](#0x1_comparator_is_smaller_than)
+-  [Function `is_greater_than`](#0x1_comparator_is_greater_than)
+-  [Function `compare`](#0x1_comparator_compare)
+-  [Function `compare_u8_vector`](#0x1_comparator_compare_u8_vector)
+-  [Specification](#@Specification_1)
+    -  [Struct `Result`](#@Specification_1_Result)
+    -  [Function `is_equal`](#@Specification_1_is_equal)
+    -  [Function `is_smaller_than`](#@Specification_1_is_smaller_than)
+    -  [Function `is_greater_than`](#@Specification_1_is_greater_than)
+    -  [Function `compare`](#@Specification_1_compare)
+    -  [Function `compare_u8_vector`](#@Specification_1_compare_u8_vector)
+
+
+<pre><code><b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs">0x1::bcs</a>;
+</code></pre>
+
+
+
+<a id="0x1_comparator_Result"></a>
+
+## Struct `Result`
+
+
+
+<pre><code><b>struct</b> <a href="comparator.md#0x1_comparator_Result">Result</a> <b>has</b> drop
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>inner: u8</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_comparator_EQUAL"></a>
+
+
+
+<pre><code><b>const</b> <a href="comparator.md#0x1_comparator_EQUAL">EQUAL</a>: u8 = 0;
+</code></pre>
+
+
+
+<a id="0x1_comparator_GREATER"></a>
+
+
+
+<pre><code><b>const</b> <a href="comparator.md#0x1_comparator_GREATER">GREATER</a>: u8 = 2;
+</code></pre>
+
+
+
+<a id="0x1_comparator_SMALLER"></a>
+
+
+
+<pre><code><b>const</b> <a href="comparator.md#0x1_comparator_SMALLER">SMALLER</a>: u8 = 1;
+</code></pre>
+
+
+
+<a id="0x1_comparator_is_equal"></a>
+
+## Function `is_equal`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="comparator.md#0x1_comparator_is_equal">is_equal</a>(result: &<a href="comparator.md#0x1_comparator_Result">comparator::Result</a>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="comparator.md#0x1_comparator_is_equal">is_equal</a>(result: &<a href="comparator.md#0x1_comparator_Result">Result</a>): bool {
+    result.inner == <a href="comparator.md#0x1_comparator_EQUAL">EQUAL</a>
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_comparator_is_smaller_than"></a>
+
+## Function `is_smaller_than`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="comparator.md#0x1_comparator_is_smaller_than">is_smaller_than</a>(result: &<a href="comparator.md#0x1_comparator_Result">comparator::Result</a>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="comparator.md#0x1_comparator_is_smaller_than">is_smaller_than</a>(result: &<a href="comparator.md#0x1_comparator_Result">Result</a>): bool {
+    result.inner == <a href="comparator.md#0x1_comparator_SMALLER">SMALLER</a>
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_comparator_is_greater_than"></a>
+
+## Function `is_greater_than`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="comparator.md#0x1_comparator_is_greater_than">is_greater_than</a>(result: &<a href="comparator.md#0x1_comparator_Result">comparator::Result</a>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="comparator.md#0x1_comparator_is_greater_than">is_greater_than</a>(result: &<a href="comparator.md#0x1_comparator_Result">Result</a>): bool {
+    result.inner == <a href="comparator.md#0x1_comparator_GREATER">GREATER</a>
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_comparator_compare"></a>
+
+## Function `compare`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="comparator.md#0x1_comparator_compare">compare</a>&lt;T&gt;(left: &T, right: &T): <a href="comparator.md#0x1_comparator_Result">comparator::Result</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="comparator.md#0x1_comparator_compare">compare</a>&lt;T&gt;(left: &T, right: &T): <a href="comparator.md#0x1_comparator_Result">Result</a> {
+    <b>let</b> left_bytes = <a href="../../../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs_to_bytes">bcs::to_bytes</a>(left);
+    <b>let</b> right_bytes = <a href="../../../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs_to_bytes">bcs::to_bytes</a>(right);
+
+    <a href="comparator.md#0x1_comparator_compare_u8_vector">compare_u8_vector</a>(left_bytes, right_bytes)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_comparator_compare_u8_vector"></a>
+
+## Function `compare_u8_vector`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="comparator.md#0x1_comparator_compare_u8_vector">compare_u8_vector</a>(left: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, right: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="comparator.md#0x1_comparator_Result">comparator::Result</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="comparator.md#0x1_comparator_compare_u8_vector">compare_u8_vector</a>(left: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, right: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="comparator.md#0x1_comparator_Result">Result</a> {
+    <b>let</b> left_length = <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&left);
+    <b>let</b> right_length = <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&right);
+
+    <b>let</b> idx = 0;
+
+    <b>while</b> (idx &lt; left_length && idx &lt; right_length) {
+        <b>let</b> left_byte = *<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(&left, idx);
+        <b>let</b> right_byte = *<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(&right, idx);
+
+        <b>if</b> (left_byte &lt; right_byte) {
+            <b>return</b> <a href="comparator.md#0x1_comparator_Result">Result</a> { inner: <a href="comparator.md#0x1_comparator_SMALLER">SMALLER</a> }
+        } <b>else</b> <b>if</b> (left_byte &gt; right_byte) {
+            <b>return</b> <a href="comparator.md#0x1_comparator_Result">Result</a> { inner: <a href="comparator.md#0x1_comparator_GREATER">GREATER</a> }
+        };
+        idx = idx + 1;
+    };
+
+    <b>if</b> (left_length &lt; right_length) {
+        <a href="comparator.md#0x1_comparator_Result">Result</a> { inner: <a href="comparator.md#0x1_comparator_SMALLER">SMALLER</a> }
+    } <b>else</b> <b>if</b> (left_length &gt; right_length) {
+        <a href="comparator.md#0x1_comparator_Result">Result</a> { inner: <a href="comparator.md#0x1_comparator_GREATER">GREATER</a> }
+    } <b>else</b> {
+        <a href="comparator.md#0x1_comparator_Result">Result</a> { inner: <a href="comparator.md#0x1_comparator_EQUAL">EQUAL</a> }
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+<a id="@Specification_1_Result"></a>
+
+### Struct `Result`
+
+
+<pre><code><b>struct</b> <a href="comparator.md#0x1_comparator_Result">Result</a> <b>has</b> drop
+</code></pre>
+
+
+
+<dl>
+<dt>
+<code>inner: u8</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+
+<pre><code><b>invariant</b> inner == <a href="comparator.md#0x1_comparator_EQUAL">EQUAL</a> || inner == <a href="comparator.md#0x1_comparator_SMALLER">SMALLER</a> || inner == <a href="comparator.md#0x1_comparator_GREATER">GREATER</a>;
+</code></pre>
+
+
+
+<a id="@Specification_1_is_equal"></a>
+
+### Function `is_equal`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="comparator.md#0x1_comparator_is_equal">is_equal</a>(result: &<a href="comparator.md#0x1_comparator_Result">comparator::Result</a>): bool
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+<b>let</b> res = result;
+<b>ensures</b> result == (res.inner == <a href="comparator.md#0x1_comparator_EQUAL">EQUAL</a>);
+</code></pre>
+
+
+
+<a id="@Specification_1_is_smaller_than"></a>
+
+### Function `is_smaller_than`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="comparator.md#0x1_comparator_is_smaller_than">is_smaller_than</a>(result: &<a href="comparator.md#0x1_comparator_Result">comparator::Result</a>): bool
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+<b>let</b> res = result;
+<b>ensures</b> result == (res.inner == <a href="comparator.md#0x1_comparator_SMALLER">SMALLER</a>);
+</code></pre>
+
+
+
+<a id="@Specification_1_is_greater_than"></a>
+
+### Function `is_greater_than`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="comparator.md#0x1_comparator_is_greater_than">is_greater_than</a>(result: &<a href="comparator.md#0x1_comparator_Result">comparator::Result</a>): bool
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+<b>let</b> res = result;
+<b>ensures</b> result == (res.inner == <a href="comparator.md#0x1_comparator_GREATER">GREATER</a>);
+</code></pre>
+
+
+
+<a id="@Specification_1_compare"></a>
+
+### Function `compare`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="comparator.md#0x1_comparator_compare">compare</a>&lt;T&gt;(left: &T, right: &T): <a href="comparator.md#0x1_comparator_Result">comparator::Result</a>
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> left_bytes = <a href="../../../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs_to_bytes">bcs::to_bytes</a>(left);
+<b>let</b> right_bytes = <a href="../../../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs_to_bytes">bcs::to_bytes</a>(right);
+<b>ensures</b> result == <a href="comparator.md#0x1_comparator_spec_compare_u8_vector">spec_compare_u8_vector</a>(left_bytes, right_bytes);
+</code></pre>
+
+
+
+
+<a id="0x1_comparator_spec_compare_u8_vector"></a>
+
+
+<pre><code><b>fun</b> <a href="comparator.md#0x1_comparator_spec_compare_u8_vector">spec_compare_u8_vector</a>(left: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, right: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="comparator.md#0x1_comparator_Result">Result</a>;
+</code></pre>
+
+
+
+<a id="@Specification_1_compare_u8_vector"></a>
+
+### Function `compare_u8_vector`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="comparator.md#0x1_comparator_compare_u8_vector">compare_u8_vector</a>(left: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, right: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="comparator.md#0x1_comparator_Result">comparator::Result</a>
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> unroll = 5;
+<b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>let</b> left_length = len(left);
+<b>let</b> right_length = len(right);
+<b>ensures</b> (result.inner == <a href="comparator.md#0x1_comparator_EQUAL">EQUAL</a>) ==&gt; (
+    (left_length == right_length) &&
+        (<b>forall</b> i: u64 <b>where</b> i &lt; left_length: left[i] == right[i])
+);
+<b>ensures</b> (result.inner == <a href="comparator.md#0x1_comparator_SMALLER">SMALLER</a>) ==&gt; (
+    (<b>exists</b> i: u64 <b>where</b> i &lt; left_length:
+        (i &lt; right_length) &&
+            (left[i] &lt; right[i]) &&
+            (<b>forall</b> j: u64 <b>where</b> j &lt; i: left[j] == right[j])
+    ) ||
+        (left_length &lt; right_length)
+);
+<b>ensures</b> (result.inner == <a href="comparator.md#0x1_comparator_GREATER">GREATER</a>) ==&gt; (
+    (<b>exists</b> i: u64 <b>where</b> i &lt; left_length:
+        (i &lt; right_length) &&
+            (left[i] &gt; right[i]) &&
+            (<b>forall</b> j: u64 <b>where</b> j &lt; i: left[j] == right[j])
+    ) ||
+        (left_length &gt; right_length)
+);
+<b>ensures</b> [abstract] result == <a href="comparator.md#0x1_comparator_spec_compare_u8_vector">spec_compare_u8_vector</a>(left, right);
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/copyable_any.md b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/copyable_any.md
new file mode 100644
index 0000000000000..7e6c8f613383f
--- /dev/null
+++ b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/copyable_any.md
@@ -0,0 +1,230 @@
+
+<a id="0x1_copyable_any"></a>
+
+# Module `0x1::copyable_any`
+
+
+
+-  [Struct `Any`](#0x1_copyable_any_Any)
+-  [Constants](#@Constants_0)
+-  [Function `pack`](#0x1_copyable_any_pack)
+-  [Function `unpack`](#0x1_copyable_any_unpack)
+-  [Function `type_name`](#0x1_copyable_any_type_name)
+-  [Specification](#@Specification_1)
+    -  [Function `pack`](#@Specification_1_pack)
+    -  [Function `unpack`](#@Specification_1_unpack)
+    -  [Function `type_name`](#@Specification_1_type_name)
+
+
+<pre><code><b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs">0x1::bcs</a>;
+<b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="from_bcs.md#0x1_from_bcs">0x1::from_bcs</a>;
+<b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string">0x1::string</a>;
+<b>use</b> <a href="type_info.md#0x1_type_info">0x1::type_info</a>;
+</code></pre>
+
+
+
+<a id="0x1_copyable_any_Any"></a>
+
+## Struct `Any`
+
+The same as <code><a href="any.md#0x1_any_Any">any::Any</a></code> but with the copy ability.
+
+
+<pre><code><b>struct</b> <a href="copyable_any.md#0x1_copyable_any_Any">Any</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>type_name: <a href="../../../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>data: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_copyable_any_ETYPE_MISMATCH"></a>
+
+The type provided for <code>unpack</code> is not the same as was given for <code>pack</code>.
+
+
+<pre><code><b>const</b> <a href="copyable_any.md#0x1_copyable_any_ETYPE_MISMATCH">ETYPE_MISMATCH</a>: u64 = 0;
+</code></pre>
+
+
+
+<a id="0x1_copyable_any_pack"></a>
+
+## Function `pack`
+
+Pack a value into the <code><a href="copyable_any.md#0x1_copyable_any_Any">Any</a></code> representation. Because Any can be stored, dropped, and copied this is
+also required from <code>T</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="copyable_any.md#0x1_copyable_any_pack">pack</a>&lt;T: <b>copy</b>, drop, store&gt;(x: T): <a href="copyable_any.md#0x1_copyable_any_Any">copyable_any::Any</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="copyable_any.md#0x1_copyable_any_pack">pack</a>&lt;T: drop + store + <b>copy</b>&gt;(x: T): <a href="copyable_any.md#0x1_copyable_any_Any">Any</a> {
+    <a href="copyable_any.md#0x1_copyable_any_Any">Any</a> {
+        type_name: <a href="type_info.md#0x1_type_info_type_name">type_info::type_name</a>&lt;T&gt;(),
+        data: <a href="../../../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs_to_bytes">bcs::to_bytes</a>(&x)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_copyable_any_unpack"></a>
+
+## Function `unpack`
+
+Unpack a value from the <code><a href="copyable_any.md#0x1_copyable_any_Any">Any</a></code> representation. This aborts if the value has not the expected type <code>T</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="copyable_any.md#0x1_copyable_any_unpack">unpack</a>&lt;T&gt;(x: <a href="copyable_any.md#0x1_copyable_any_Any">copyable_any::Any</a>): T
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="copyable_any.md#0x1_copyable_any_unpack">unpack</a>&lt;T&gt;(x: <a href="copyable_any.md#0x1_copyable_any_Any">Any</a>): T {
+    <b>assert</b>!(<a href="type_info.md#0x1_type_info_type_name">type_info::type_name</a>&lt;T&gt;() == x.type_name, <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="copyable_any.md#0x1_copyable_any_ETYPE_MISMATCH">ETYPE_MISMATCH</a>));
+    from_bytes&lt;T&gt;(x.data)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_copyable_any_type_name"></a>
+
+## Function `type_name`
+
+Returns the type name of this Any
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="copyable_any.md#0x1_copyable_any_type_name">type_name</a>(x: &<a href="copyable_any.md#0x1_copyable_any_Any">copyable_any::Any</a>): &<a href="../../../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="copyable_any.md#0x1_copyable_any_type_name">type_name</a>(x: &<a href="copyable_any.md#0x1_copyable_any_Any">Any</a>): &String {
+    &x.type_name
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+<a id="@Specification_1_pack"></a>
+
+### Function `pack`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="copyable_any.md#0x1_copyable_any_pack">pack</a>&lt;T: <b>copy</b>, drop, store&gt;(x: T): <a href="copyable_any.md#0x1_copyable_any_Any">copyable_any::Any</a>
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+<b>pragma</b> opaque;
+<b>ensures</b> result == <a href="copyable_any.md#0x1_copyable_any_Any">Any</a> {
+    type_name: <a href="type_info.md#0x1_type_info_type_name">type_info::type_name</a>&lt;T&gt;(),
+    data: <a href="../../../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs_serialize">bcs::serialize</a>&lt;T&gt;(x)
+};
+<b>ensures</b> [abstract] <a href="from_bcs.md#0x1_from_bcs_deserializable">from_bcs::deserializable</a>&lt;T&gt;(result.data);
+</code></pre>
+
+
+
+<a id="@Specification_1_unpack"></a>
+
+### Function `unpack`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="copyable_any.md#0x1_copyable_any_unpack">unpack</a>&lt;T&gt;(x: <a href="copyable_any.md#0x1_copyable_any_Any">copyable_any::Any</a>): T
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="copyable_any.md#0x1_copyable_any_UnpackAbortsIf">UnpackAbortsIf</a>&lt;T&gt;;
+<b>ensures</b> result == <a href="from_bcs.md#0x1_from_bcs_deserialize">from_bcs::deserialize</a>&lt;T&gt;(x.data);
+</code></pre>
+
+
+
+
+<a id="0x1_copyable_any_UnpackAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="copyable_any.md#0x1_copyable_any_UnpackAbortsIf">UnpackAbortsIf</a>&lt;T&gt; {
+    x: <a href="copyable_any.md#0x1_copyable_any_Any">Any</a>;
+    <b>aborts_if</b> <a href="type_info.md#0x1_type_info_type_name">type_info::type_name</a>&lt;T&gt;() != x.type_name;
+    <b>aborts_if</b> !<a href="from_bcs.md#0x1_from_bcs_deserializable">from_bcs::deserializable</a>&lt;T&gt;(x.data);
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_type_name"></a>
+
+### Function `type_name`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="copyable_any.md#0x1_copyable_any_type_name">type_name</a>(x: &<a href="copyable_any.md#0x1_copyable_any_Any">copyable_any::Any</a>): &<a href="../../../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == x.type_name;
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/crypto_algebra.md b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/crypto_algebra.md
new file mode 100644
index 0000000000000..4aa0fab2c7833
--- /dev/null
+++ b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/crypto_algebra.md
@@ -0,0 +1,1755 @@
+
+<a id="0x1_crypto_algebra"></a>
+
+# Module `0x1::crypto_algebra`
+
+This module provides generic structs/functions for operations of algebraic structures (e.g. fields and groups),
+which can be used to build generic cryptographic schemes atop.
+E.g., a Groth16 ZK proof verifier can be built to work over any pairing supported in this module.
+
+In general, every structure implements basic operations like (de)serialization, equality check, random sampling.
+
+A group may also implement the following operations. (Additive group notation is assumed.)
+- <code><a href="crypto_algebra.md#0x1_crypto_algebra_order">order</a>()</code> for getting the group order.
+- <code><a href="crypto_algebra.md#0x1_crypto_algebra_zero">zero</a>()</code> for getting the group identity.
+- <code><a href="crypto_algebra.md#0x1_crypto_algebra_one">one</a>()</code> for getting the group generator (if exists).
+- <code><a href="crypto_algebra.md#0x1_crypto_algebra_neg">neg</a>()</code> for group element inversion.
+- <code><a href="crypto_algebra.md#0x1_crypto_algebra_add">add</a>()</code> for group operation (i.e., a group addition).
+- <code><a href="crypto_algebra.md#0x1_crypto_algebra_sub">sub</a>()</code> for group element subtraction.
+- <code><a href="crypto_algebra.md#0x1_crypto_algebra_double">double</a>()</code> for efficient doubling.
+- <code><a href="crypto_algebra.md#0x1_crypto_algebra_scalar_mul">scalar_mul</a>()</code> for group scalar multiplication.
+- <code><a href="crypto_algebra.md#0x1_crypto_algebra_multi_scalar_mul">multi_scalar_mul</a>()</code> for efficient group multi-scalar multiplication.
+- <code><a href="crypto_algebra.md#0x1_crypto_algebra_hash_to">hash_to</a>()</code> for hash-to-group.
+
+A field may also implement the following operations.
+- <code><a href="crypto_algebra.md#0x1_crypto_algebra_zero">zero</a>()</code> for getting the field additive identity.
+- <code><a href="crypto_algebra.md#0x1_crypto_algebra_one">one</a>()</code> for getting the field multiplicative identity.
+- <code><a href="crypto_algebra.md#0x1_crypto_algebra_add">add</a>()</code> for field addition.
+- <code><a href="crypto_algebra.md#0x1_crypto_algebra_sub">sub</a>()</code> for field subtraction.
+- <code><a href="crypto_algebra.md#0x1_crypto_algebra_mul">mul</a>()</code> for field multiplication.
+- <code><a href="crypto_algebra.md#0x1_crypto_algebra_div">div</a>()</code> for field division.
+- <code><a href="crypto_algebra.md#0x1_crypto_algebra_neg">neg</a>()</code> for field negation.
+- <code><a href="crypto_algebra.md#0x1_crypto_algebra_inv">inv</a>()</code> for field inversion.
+- <code><a href="crypto_algebra.md#0x1_crypto_algebra_sqr">sqr</a>()</code> for efficient field element squaring.
+- <code><a href="crypto_algebra.md#0x1_crypto_algebra_from_u64">from_u64</a>()</code> for quick conversion from u64 to field element.
+
+For 3 groups that admit a bilinear map, <code><a href="crypto_algebra.md#0x1_crypto_algebra_pairing">pairing</a>()</code> and <code><a href="crypto_algebra.md#0x1_crypto_algebra_multi_pairing">multi_pairing</a>()</code> may be implemented.
+
+For a subset/superset relationship between 2 structures, <code><a href="crypto_algebra.md#0x1_crypto_algebra_upcast">upcast</a>()</code> and <code><a href="crypto_algebra.md#0x1_crypto_algebra_downcast">downcast</a>()</code> may be implemented.
+E.g., in BLS12-381 pairing, since <code>Gt</code> is a subset of <code>Fq12</code>,
+<code><a href="crypto_algebra.md#0x1_crypto_algebra_upcast">upcast</a>&lt;Gt, Fq12&gt;()</code> and <code><a href="crypto_algebra.md#0x1_crypto_algebra_downcast">downcast</a>&lt;Fq12, Gt&gt;()</code> will be supported.
+
+See <code>*_algebra.<b>move</b></code> for currently implemented algebraic structures.
+
+
+-  [Struct `Element`](#0x1_crypto_algebra_Element)
+-  [Constants](#@Constants_0)
+-  [Function `eq`](#0x1_crypto_algebra_eq)
+-  [Function `from_u64`](#0x1_crypto_algebra_from_u64)
+-  [Function `zero`](#0x1_crypto_algebra_zero)
+-  [Function `one`](#0x1_crypto_algebra_one)
+-  [Function `neg`](#0x1_crypto_algebra_neg)
+-  [Function `add`](#0x1_crypto_algebra_add)
+-  [Function `sub`](#0x1_crypto_algebra_sub)
+-  [Function `mul`](#0x1_crypto_algebra_mul)
+-  [Function `div`](#0x1_crypto_algebra_div)
+-  [Function `sqr`](#0x1_crypto_algebra_sqr)
+-  [Function `inv`](#0x1_crypto_algebra_inv)
+-  [Function `double`](#0x1_crypto_algebra_double)
+-  [Function `multi_scalar_mul`](#0x1_crypto_algebra_multi_scalar_mul)
+-  [Function `scalar_mul`](#0x1_crypto_algebra_scalar_mul)
+-  [Function `multi_pairing`](#0x1_crypto_algebra_multi_pairing)
+-  [Function `pairing`](#0x1_crypto_algebra_pairing)
+-  [Function `deserialize`](#0x1_crypto_algebra_deserialize)
+-  [Function `serialize`](#0x1_crypto_algebra_serialize)
+-  [Function `order`](#0x1_crypto_algebra_order)
+-  [Function `upcast`](#0x1_crypto_algebra_upcast)
+-  [Function `downcast`](#0x1_crypto_algebra_downcast)
+-  [Function `hash_to`](#0x1_crypto_algebra_hash_to)
+-  [Function `abort_unless_cryptography_algebra_natives_enabled`](#0x1_crypto_algebra_abort_unless_cryptography_algebra_natives_enabled)
+-  [Function `handles_from_elements`](#0x1_crypto_algebra_handles_from_elements)
+-  [Function `add_internal`](#0x1_crypto_algebra_add_internal)
+-  [Function `deserialize_internal`](#0x1_crypto_algebra_deserialize_internal)
+-  [Function `div_internal`](#0x1_crypto_algebra_div_internal)
+-  [Function `double_internal`](#0x1_crypto_algebra_double_internal)
+-  [Function `downcast_internal`](#0x1_crypto_algebra_downcast_internal)
+-  [Function `from_u64_internal`](#0x1_crypto_algebra_from_u64_internal)
+-  [Function `eq_internal`](#0x1_crypto_algebra_eq_internal)
+-  [Function `hash_to_internal`](#0x1_crypto_algebra_hash_to_internal)
+-  [Function `inv_internal`](#0x1_crypto_algebra_inv_internal)
+-  [Function `mul_internal`](#0x1_crypto_algebra_mul_internal)
+-  [Function `multi_pairing_internal`](#0x1_crypto_algebra_multi_pairing_internal)
+-  [Function `multi_scalar_mul_internal`](#0x1_crypto_algebra_multi_scalar_mul_internal)
+-  [Function `neg_internal`](#0x1_crypto_algebra_neg_internal)
+-  [Function `one_internal`](#0x1_crypto_algebra_one_internal)
+-  [Function `order_internal`](#0x1_crypto_algebra_order_internal)
+-  [Function `pairing_internal`](#0x1_crypto_algebra_pairing_internal)
+-  [Function `scalar_mul_internal`](#0x1_crypto_algebra_scalar_mul_internal)
+-  [Function `serialize_internal`](#0x1_crypto_algebra_serialize_internal)
+-  [Function `sqr_internal`](#0x1_crypto_algebra_sqr_internal)
+-  [Function `sub_internal`](#0x1_crypto_algebra_sub_internal)
+-  [Function `upcast_internal`](#0x1_crypto_algebra_upcast_internal)
+-  [Function `zero_internal`](#0x1_crypto_algebra_zero_internal)
+-  [Specification](#@Specification_1)
+    -  [Function `handles_from_elements`](#@Specification_1_handles_from_elements)
+    -  [Function `add_internal`](#@Specification_1_add_internal)
+    -  [Function `deserialize_internal`](#@Specification_1_deserialize_internal)
+    -  [Function `div_internal`](#@Specification_1_div_internal)
+    -  [Function `double_internal`](#@Specification_1_double_internal)
+    -  [Function `downcast_internal`](#@Specification_1_downcast_internal)
+    -  [Function `from_u64_internal`](#@Specification_1_from_u64_internal)
+    -  [Function `eq_internal`](#@Specification_1_eq_internal)
+    -  [Function `hash_to_internal`](#@Specification_1_hash_to_internal)
+    -  [Function `inv_internal`](#@Specification_1_inv_internal)
+    -  [Function `mul_internal`](#@Specification_1_mul_internal)
+    -  [Function `multi_pairing_internal`](#@Specification_1_multi_pairing_internal)
+    -  [Function `multi_scalar_mul_internal`](#@Specification_1_multi_scalar_mul_internal)
+    -  [Function `neg_internal`](#@Specification_1_neg_internal)
+    -  [Function `one_internal`](#@Specification_1_one_internal)
+    -  [Function `order_internal`](#@Specification_1_order_internal)
+    -  [Function `pairing_internal`](#@Specification_1_pairing_internal)
+    -  [Function `scalar_mul_internal`](#@Specification_1_scalar_mul_internal)
+    -  [Function `serialize_internal`](#@Specification_1_serialize_internal)
+    -  [Function `sqr_internal`](#@Specification_1_sqr_internal)
+    -  [Function `sub_internal`](#@Specification_1_sub_internal)
+    -  [Function `upcast_internal`](#@Specification_1_upcast_internal)
+    -  [Function `zero_internal`](#@Specification_1_zero_internal)
+
+
+<pre><code><b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features">0x1::features</a>;
+<b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option">0x1::option</a>;
+</code></pre>
+
+
+
+<a id="0x1_crypto_algebra_Element"></a>
+
+## Struct `Element`
+
+This struct represents an element of a structure <code>S</code>.
+
+
+<pre><code><b>struct</b> <a href="crypto_algebra.md#0x1_crypto_algebra_Element">Element</a>&lt;S&gt; <b>has</b> <b>copy</b>, drop
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>handle: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_crypto_algebra_E_NON_EQUAL_LENGTHS"></a>
+
+
+
+<pre><code><b>const</b> <a href="crypto_algebra.md#0x1_crypto_algebra_E_NON_EQUAL_LENGTHS">E_NON_EQUAL_LENGTHS</a>: u64 = 2;
+</code></pre>
+
+
+
+<a id="0x1_crypto_algebra_E_NOT_IMPLEMENTED"></a>
+
+
+
+<pre><code><b>const</b> <a href="crypto_algebra.md#0x1_crypto_algebra_E_NOT_IMPLEMENTED">E_NOT_IMPLEMENTED</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_crypto_algebra_E_TOO_MUCH_MEMORY_USED"></a>
+
+
+
+<pre><code><b>const</b> <a href="crypto_algebra.md#0x1_crypto_algebra_E_TOO_MUCH_MEMORY_USED">E_TOO_MUCH_MEMORY_USED</a>: u64 = 3;
+</code></pre>
+
+
+
+<a id="0x1_crypto_algebra_eq"></a>
+
+## Function `eq`
+
+Check if <code>x == y</code> for elements <code>x</code> and <code>y</code> of a structure <code>S</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_eq">eq</a>&lt;S&gt;(x: &<a href="crypto_algebra.md#0x1_crypto_algebra_Element">crypto_algebra::Element</a>&lt;S&gt;, y: &<a href="crypto_algebra.md#0x1_crypto_algebra_Element">crypto_algebra::Element</a>&lt;S&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_eq">eq</a>&lt;S&gt;(x: &<a href="crypto_algebra.md#0x1_crypto_algebra_Element">Element</a>&lt;S&gt;, y: &<a href="crypto_algebra.md#0x1_crypto_algebra_Element">Element</a>&lt;S&gt;): bool {
+    <a href="crypto_algebra.md#0x1_crypto_algebra_abort_unless_cryptography_algebra_natives_enabled">abort_unless_cryptography_algebra_natives_enabled</a>();
+    <a href="crypto_algebra.md#0x1_crypto_algebra_eq_internal">eq_internal</a>&lt;S&gt;(x.handle, y.handle)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_crypto_algebra_from_u64"></a>
+
+## Function `from_u64`
+
+Convert a u64 to an element of a structure <code>S</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_from_u64">from_u64</a>&lt;S&gt;(value: u64): <a href="crypto_algebra.md#0x1_crypto_algebra_Element">crypto_algebra::Element</a>&lt;S&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_from_u64">from_u64</a>&lt;S&gt;(value: u64): <a href="crypto_algebra.md#0x1_crypto_algebra_Element">Element</a>&lt;S&gt; {
+    <a href="crypto_algebra.md#0x1_crypto_algebra_abort_unless_cryptography_algebra_natives_enabled">abort_unless_cryptography_algebra_natives_enabled</a>();
+    <a href="crypto_algebra.md#0x1_crypto_algebra_Element">Element</a>&lt;S&gt; {
+        handle: <a href="crypto_algebra.md#0x1_crypto_algebra_from_u64_internal">from_u64_internal</a>&lt;S&gt;(value)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_crypto_algebra_zero"></a>
+
+## Function `zero`
+
+Return the additive identity of field <code>S</code>, or the identity of group <code>S</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_zero">zero</a>&lt;S&gt;(): <a href="crypto_algebra.md#0x1_crypto_algebra_Element">crypto_algebra::Element</a>&lt;S&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_zero">zero</a>&lt;S&gt;(): <a href="crypto_algebra.md#0x1_crypto_algebra_Element">Element</a>&lt;S&gt; {
+    <a href="crypto_algebra.md#0x1_crypto_algebra_abort_unless_cryptography_algebra_natives_enabled">abort_unless_cryptography_algebra_natives_enabled</a>();
+    <a href="crypto_algebra.md#0x1_crypto_algebra_Element">Element</a>&lt;S&gt; {
+        handle: <a href="crypto_algebra.md#0x1_crypto_algebra_zero_internal">zero_internal</a>&lt;S&gt;()
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_crypto_algebra_one"></a>
+
+## Function `one`
+
+Return the multiplicative identity of field <code>S</code>, or a fixed generator of group <code>S</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_one">one</a>&lt;S&gt;(): <a href="crypto_algebra.md#0x1_crypto_algebra_Element">crypto_algebra::Element</a>&lt;S&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_one">one</a>&lt;S&gt;(): <a href="crypto_algebra.md#0x1_crypto_algebra_Element">Element</a>&lt;S&gt; {
+    <a href="crypto_algebra.md#0x1_crypto_algebra_abort_unless_cryptography_algebra_natives_enabled">abort_unless_cryptography_algebra_natives_enabled</a>();
+    <a href="crypto_algebra.md#0x1_crypto_algebra_Element">Element</a>&lt;S&gt; {
+        handle: <a href="crypto_algebra.md#0x1_crypto_algebra_one_internal">one_internal</a>&lt;S&gt;()
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_crypto_algebra_neg"></a>
+
+## Function `neg`
+
+Compute <code>-x</code> for an element <code>x</code> of a structure <code>S</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_neg">neg</a>&lt;S&gt;(x: &<a href="crypto_algebra.md#0x1_crypto_algebra_Element">crypto_algebra::Element</a>&lt;S&gt;): <a href="crypto_algebra.md#0x1_crypto_algebra_Element">crypto_algebra::Element</a>&lt;S&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_neg">neg</a>&lt;S&gt;(x: &<a href="crypto_algebra.md#0x1_crypto_algebra_Element">Element</a>&lt;S&gt;): <a href="crypto_algebra.md#0x1_crypto_algebra_Element">Element</a>&lt;S&gt; {
+    <a href="crypto_algebra.md#0x1_crypto_algebra_abort_unless_cryptography_algebra_natives_enabled">abort_unless_cryptography_algebra_natives_enabled</a>();
+    <a href="crypto_algebra.md#0x1_crypto_algebra_Element">Element</a>&lt;S&gt; {
+        handle: <a href="crypto_algebra.md#0x1_crypto_algebra_neg_internal">neg_internal</a>&lt;S&gt;(x.handle)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_crypto_algebra_add"></a>
+
+## Function `add`
+
+Compute <code>x + y</code> for elements <code>x</code> and <code>y</code> of structure <code>S</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_add">add</a>&lt;S&gt;(x: &<a href="crypto_algebra.md#0x1_crypto_algebra_Element">crypto_algebra::Element</a>&lt;S&gt;, y: &<a href="crypto_algebra.md#0x1_crypto_algebra_Element">crypto_algebra::Element</a>&lt;S&gt;): <a href="crypto_algebra.md#0x1_crypto_algebra_Element">crypto_algebra::Element</a>&lt;S&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_add">add</a>&lt;S&gt;(x: &<a href="crypto_algebra.md#0x1_crypto_algebra_Element">Element</a>&lt;S&gt;, y: &<a href="crypto_algebra.md#0x1_crypto_algebra_Element">Element</a>&lt;S&gt;): <a href="crypto_algebra.md#0x1_crypto_algebra_Element">Element</a>&lt;S&gt; {
+    <a href="crypto_algebra.md#0x1_crypto_algebra_abort_unless_cryptography_algebra_natives_enabled">abort_unless_cryptography_algebra_natives_enabled</a>();
+    <a href="crypto_algebra.md#0x1_crypto_algebra_Element">Element</a>&lt;S&gt; {
+        handle: <a href="crypto_algebra.md#0x1_crypto_algebra_add_internal">add_internal</a>&lt;S&gt;(x.handle, y.handle)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_crypto_algebra_sub"></a>
+
+## Function `sub`
+
+Compute <code>x - y</code> for elements <code>x</code> and <code>y</code> of a structure <code>S</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_sub">sub</a>&lt;S&gt;(x: &<a href="crypto_algebra.md#0x1_crypto_algebra_Element">crypto_algebra::Element</a>&lt;S&gt;, y: &<a href="crypto_algebra.md#0x1_crypto_algebra_Element">crypto_algebra::Element</a>&lt;S&gt;): <a href="crypto_algebra.md#0x1_crypto_algebra_Element">crypto_algebra::Element</a>&lt;S&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_sub">sub</a>&lt;S&gt;(x: &<a href="crypto_algebra.md#0x1_crypto_algebra_Element">Element</a>&lt;S&gt;, y: &<a href="crypto_algebra.md#0x1_crypto_algebra_Element">Element</a>&lt;S&gt;): <a href="crypto_algebra.md#0x1_crypto_algebra_Element">Element</a>&lt;S&gt; {
+    <a href="crypto_algebra.md#0x1_crypto_algebra_abort_unless_cryptography_algebra_natives_enabled">abort_unless_cryptography_algebra_natives_enabled</a>();
+    <a href="crypto_algebra.md#0x1_crypto_algebra_Element">Element</a>&lt;S&gt; {
+        handle: <a href="crypto_algebra.md#0x1_crypto_algebra_sub_internal">sub_internal</a>&lt;S&gt;(x.handle, y.handle)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_crypto_algebra_mul"></a>
+
+## Function `mul`
+
+Compute <code>x * y</code> for elements <code>x</code> and <code>y</code> of a structure <code>S</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_mul">mul</a>&lt;S&gt;(x: &<a href="crypto_algebra.md#0x1_crypto_algebra_Element">crypto_algebra::Element</a>&lt;S&gt;, y: &<a href="crypto_algebra.md#0x1_crypto_algebra_Element">crypto_algebra::Element</a>&lt;S&gt;): <a href="crypto_algebra.md#0x1_crypto_algebra_Element">crypto_algebra::Element</a>&lt;S&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_mul">mul</a>&lt;S&gt;(x: &<a href="crypto_algebra.md#0x1_crypto_algebra_Element">Element</a>&lt;S&gt;, y: &<a href="crypto_algebra.md#0x1_crypto_algebra_Element">Element</a>&lt;S&gt;): <a href="crypto_algebra.md#0x1_crypto_algebra_Element">Element</a>&lt;S&gt; {
+    <a href="crypto_algebra.md#0x1_crypto_algebra_abort_unless_cryptography_algebra_natives_enabled">abort_unless_cryptography_algebra_natives_enabled</a>();
+    <a href="crypto_algebra.md#0x1_crypto_algebra_Element">Element</a>&lt;S&gt; {
+        handle: <a href="crypto_algebra.md#0x1_crypto_algebra_mul_internal">mul_internal</a>&lt;S&gt;(x.handle, y.handle)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_crypto_algebra_div"></a>
+
+## Function `div`
+
+Try computing <code>x / y</code> for elements <code>x</code> and <code>y</code> of a structure <code>S</code>.
+Return none if <code>y</code> does not have a multiplicative inverse in the structure <code>S</code>
+(e.g., when <code>S</code> is a field, and <code>y</code> is zero).
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_div">div</a>&lt;S&gt;(x: &<a href="crypto_algebra.md#0x1_crypto_algebra_Element">crypto_algebra::Element</a>&lt;S&gt;, y: &<a href="crypto_algebra.md#0x1_crypto_algebra_Element">crypto_algebra::Element</a>&lt;S&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="crypto_algebra.md#0x1_crypto_algebra_Element">crypto_algebra::Element</a>&lt;S&gt;&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_div">div</a>&lt;S&gt;(x: &<a href="crypto_algebra.md#0x1_crypto_algebra_Element">Element</a>&lt;S&gt;, y: &<a href="crypto_algebra.md#0x1_crypto_algebra_Element">Element</a>&lt;S&gt;): Option&lt;<a href="crypto_algebra.md#0x1_crypto_algebra_Element">Element</a>&lt;S&gt;&gt; {
+    <a href="crypto_algebra.md#0x1_crypto_algebra_abort_unless_cryptography_algebra_natives_enabled">abort_unless_cryptography_algebra_natives_enabled</a>();
+    <b>let</b> (succ, handle) = <a href="crypto_algebra.md#0x1_crypto_algebra_div_internal">div_internal</a>&lt;S&gt;(x.handle, y.handle);
+    <b>if</b> (succ) {
+        some(<a href="crypto_algebra.md#0x1_crypto_algebra_Element">Element</a>&lt;S&gt; { handle })
+    } <b>else</b> {
+        none()
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_crypto_algebra_sqr"></a>
+
+## Function `sqr`
+
+Compute <code>x^2</code> for an element <code>x</code> of a structure <code>S</code>. Faster and cheaper than <code><a href="crypto_algebra.md#0x1_crypto_algebra_mul">mul</a>(x, x)</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_sqr">sqr</a>&lt;S&gt;(x: &<a href="crypto_algebra.md#0x1_crypto_algebra_Element">crypto_algebra::Element</a>&lt;S&gt;): <a href="crypto_algebra.md#0x1_crypto_algebra_Element">crypto_algebra::Element</a>&lt;S&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_sqr">sqr</a>&lt;S&gt;(x: &<a href="crypto_algebra.md#0x1_crypto_algebra_Element">Element</a>&lt;S&gt;): <a href="crypto_algebra.md#0x1_crypto_algebra_Element">Element</a>&lt;S&gt; {
+    <a href="crypto_algebra.md#0x1_crypto_algebra_abort_unless_cryptography_algebra_natives_enabled">abort_unless_cryptography_algebra_natives_enabled</a>();
+    <a href="crypto_algebra.md#0x1_crypto_algebra_Element">Element</a>&lt;S&gt; {
+        handle: <a href="crypto_algebra.md#0x1_crypto_algebra_sqr_internal">sqr_internal</a>&lt;S&gt;(x.handle)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_crypto_algebra_inv"></a>
+
+## Function `inv`
+
+Try computing <code>x^(-1)</code> for an element <code>x</code> of a structure <code>S</code>.
+Return none if <code>x</code> does not have a multiplicative inverse in the structure <code>S</code>
+(e.g., when <code>S</code> is a field, and <code>x</code> is zero).
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_inv">inv</a>&lt;S&gt;(x: &<a href="crypto_algebra.md#0x1_crypto_algebra_Element">crypto_algebra::Element</a>&lt;S&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="crypto_algebra.md#0x1_crypto_algebra_Element">crypto_algebra::Element</a>&lt;S&gt;&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_inv">inv</a>&lt;S&gt;(x: &<a href="crypto_algebra.md#0x1_crypto_algebra_Element">Element</a>&lt;S&gt;): Option&lt;<a href="crypto_algebra.md#0x1_crypto_algebra_Element">Element</a>&lt;S&gt;&gt; {
+    <a href="crypto_algebra.md#0x1_crypto_algebra_abort_unless_cryptography_algebra_natives_enabled">abort_unless_cryptography_algebra_natives_enabled</a>();
+    <b>let</b> (succeeded, handle) = <a href="crypto_algebra.md#0x1_crypto_algebra_inv_internal">inv_internal</a>&lt;S&gt;(x.handle);
+    <b>if</b> (succeeded) {
+        <b>let</b> scalar = <a href="crypto_algebra.md#0x1_crypto_algebra_Element">Element</a>&lt;S&gt; { handle };
+        some(scalar)
+    } <b>else</b> {
+        none()
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_crypto_algebra_double"></a>
+
+## Function `double`
+
+Compute <code>2*P</code> for an element <code>P</code> of a structure <code>S</code>. Faster and cheaper than <code><a href="crypto_algebra.md#0x1_crypto_algebra_add">add</a>(P, P)</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_double">double</a>&lt;S&gt;(element_p: &<a href="crypto_algebra.md#0x1_crypto_algebra_Element">crypto_algebra::Element</a>&lt;S&gt;): <a href="crypto_algebra.md#0x1_crypto_algebra_Element">crypto_algebra::Element</a>&lt;S&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_double">double</a>&lt;S&gt;(element_p: &<a href="crypto_algebra.md#0x1_crypto_algebra_Element">Element</a>&lt;S&gt;): <a href="crypto_algebra.md#0x1_crypto_algebra_Element">Element</a>&lt;S&gt; {
+    <a href="crypto_algebra.md#0x1_crypto_algebra_abort_unless_cryptography_algebra_natives_enabled">abort_unless_cryptography_algebra_natives_enabled</a>();
+    <a href="crypto_algebra.md#0x1_crypto_algebra_Element">Element</a>&lt;S&gt; {
+        handle: <a href="crypto_algebra.md#0x1_crypto_algebra_double_internal">double_internal</a>&lt;S&gt;(element_p.handle)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_crypto_algebra_multi_scalar_mul"></a>
+
+## Function `multi_scalar_mul`
+
+Compute <code>k[0]*P[0]+...+k[n-1]*P[n-1]</code>, where
+<code>P[]</code> are <code>n</code> elements of group <code>G</code> represented by parameter <code>elements</code>, and
+<code>k[]</code> are <code>n</code> elements of the scalarfield <code>S</code> of group <code>G</code> represented by parameter <code>scalars</code>.
+
+Abort with code <code>std::error::invalid_argument(<a href="crypto_algebra.md#0x1_crypto_algebra_E_NON_EQUAL_LENGTHS">E_NON_EQUAL_LENGTHS</a>)</code> if the sizes of <code>elements</code> and <code>scalars</code> do not match.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_multi_scalar_mul">multi_scalar_mul</a>&lt;G, S&gt;(elements: &<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="crypto_algebra.md#0x1_crypto_algebra_Element">crypto_algebra::Element</a>&lt;G&gt;&gt;, scalars: &<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="crypto_algebra.md#0x1_crypto_algebra_Element">crypto_algebra::Element</a>&lt;S&gt;&gt;): <a href="crypto_algebra.md#0x1_crypto_algebra_Element">crypto_algebra::Element</a>&lt;G&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_multi_scalar_mul">multi_scalar_mul</a>&lt;G, S&gt;(elements: &<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="crypto_algebra.md#0x1_crypto_algebra_Element">Element</a>&lt;G&gt;&gt;, scalars: &<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="crypto_algebra.md#0x1_crypto_algebra_Element">Element</a>&lt;S&gt;&gt;): <a href="crypto_algebra.md#0x1_crypto_algebra_Element">Element</a>&lt;G&gt; {
+    <b>let</b> element_handles = <a href="crypto_algebra.md#0x1_crypto_algebra_handles_from_elements">handles_from_elements</a>(elements);
+    <b>let</b> scalar_handles = <a href="crypto_algebra.md#0x1_crypto_algebra_handles_from_elements">handles_from_elements</a>(scalars);
+    <a href="crypto_algebra.md#0x1_crypto_algebra_Element">Element</a>&lt;G&gt; {
+        handle: <a href="crypto_algebra.md#0x1_crypto_algebra_multi_scalar_mul_internal">multi_scalar_mul_internal</a>&lt;G, S&gt;(element_handles, scalar_handles)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_crypto_algebra_scalar_mul"></a>
+
+## Function `scalar_mul`
+
+Compute <code>k*P</code>, where <code>P</code> is an element of a group <code>G</code> and <code>k</code> is an element of the scalar field <code>S</code> associated to the group <code>G</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_scalar_mul">scalar_mul</a>&lt;G, S&gt;(element_p: &<a href="crypto_algebra.md#0x1_crypto_algebra_Element">crypto_algebra::Element</a>&lt;G&gt;, scalar_k: &<a href="crypto_algebra.md#0x1_crypto_algebra_Element">crypto_algebra::Element</a>&lt;S&gt;): <a href="crypto_algebra.md#0x1_crypto_algebra_Element">crypto_algebra::Element</a>&lt;G&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_scalar_mul">scalar_mul</a>&lt;G, S&gt;(element_p: &<a href="crypto_algebra.md#0x1_crypto_algebra_Element">Element</a>&lt;G&gt;, scalar_k: &<a href="crypto_algebra.md#0x1_crypto_algebra_Element">Element</a>&lt;S&gt;): <a href="crypto_algebra.md#0x1_crypto_algebra_Element">Element</a>&lt;G&gt; {
+    <a href="crypto_algebra.md#0x1_crypto_algebra_abort_unless_cryptography_algebra_natives_enabled">abort_unless_cryptography_algebra_natives_enabled</a>();
+    <a href="crypto_algebra.md#0x1_crypto_algebra_Element">Element</a>&lt;G&gt; {
+        handle: <a href="crypto_algebra.md#0x1_crypto_algebra_scalar_mul_internal">scalar_mul_internal</a>&lt;G, S&gt;(element_p.handle, scalar_k.handle)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_crypto_algebra_multi_pairing"></a>
+
+## Function `multi_pairing`
+
+Efficiently compute <code>e(P[0],Q[0])+...+e(P[n-1],Q[n-1])</code>,
+where <code>e: (G1,G2) -&gt; (Gt)</code> is the pairing function from groups <code>(G1,G2)</code> to group <code>Gt</code>,
+<code>P[]</code> are <code>n</code> elements of group <code>G1</code> represented by parameter <code>g1_elements</code>, and
+<code>Q[]</code> are <code>n</code> elements of group <code>G2</code> represented by parameter <code>g2_elements</code>.
+
+Abort with code <code>std::error::invalid_argument(<a href="crypto_algebra.md#0x1_crypto_algebra_E_NON_EQUAL_LENGTHS">E_NON_EQUAL_LENGTHS</a>)</code> if the sizes of <code>g1_elements</code> and <code>g2_elements</code> do not match.
+
+NOTE: we are viewing the target group <code>Gt</code> of the pairing as an additive group,
+rather than a multiplicative one (which is typically the case).
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_multi_pairing">multi_pairing</a>&lt;G1, G2, Gt&gt;(g1_elements: &<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="crypto_algebra.md#0x1_crypto_algebra_Element">crypto_algebra::Element</a>&lt;G1&gt;&gt;, g2_elements: &<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="crypto_algebra.md#0x1_crypto_algebra_Element">crypto_algebra::Element</a>&lt;G2&gt;&gt;): <a href="crypto_algebra.md#0x1_crypto_algebra_Element">crypto_algebra::Element</a>&lt;Gt&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_multi_pairing">multi_pairing</a>&lt;G1,G2,Gt&gt;(g1_elements: &<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="crypto_algebra.md#0x1_crypto_algebra_Element">Element</a>&lt;G1&gt;&gt;, g2_elements: &<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="crypto_algebra.md#0x1_crypto_algebra_Element">Element</a>&lt;G2&gt;&gt;): <a href="crypto_algebra.md#0x1_crypto_algebra_Element">Element</a>&lt;Gt&gt; {
+    <a href="crypto_algebra.md#0x1_crypto_algebra_abort_unless_cryptography_algebra_natives_enabled">abort_unless_cryptography_algebra_natives_enabled</a>();
+    <b>let</b> g1_handles = <a href="crypto_algebra.md#0x1_crypto_algebra_handles_from_elements">handles_from_elements</a>(g1_elements);
+    <b>let</b> g2_handles = <a href="crypto_algebra.md#0x1_crypto_algebra_handles_from_elements">handles_from_elements</a>(g2_elements);
+    <a href="crypto_algebra.md#0x1_crypto_algebra_Element">Element</a>&lt;Gt&gt; {
+        handle: <a href="crypto_algebra.md#0x1_crypto_algebra_multi_pairing_internal">multi_pairing_internal</a>&lt;G1,G2,Gt&gt;(g1_handles, g2_handles)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_crypto_algebra_pairing"></a>
+
+## Function `pairing`
+
+Compute the pairing function (a.k.a., bilinear map) on a <code>G1</code> element and a <code>G2</code> element.
+Return an element in the target group <code>Gt</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_pairing">pairing</a>&lt;G1, G2, Gt&gt;(element_1: &<a href="crypto_algebra.md#0x1_crypto_algebra_Element">crypto_algebra::Element</a>&lt;G1&gt;, element_2: &<a href="crypto_algebra.md#0x1_crypto_algebra_Element">crypto_algebra::Element</a>&lt;G2&gt;): <a href="crypto_algebra.md#0x1_crypto_algebra_Element">crypto_algebra::Element</a>&lt;Gt&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_pairing">pairing</a>&lt;G1,G2,Gt&gt;(element_1: &<a href="crypto_algebra.md#0x1_crypto_algebra_Element">Element</a>&lt;G1&gt;, element_2: &<a href="crypto_algebra.md#0x1_crypto_algebra_Element">Element</a>&lt;G2&gt;): <a href="crypto_algebra.md#0x1_crypto_algebra_Element">Element</a>&lt;Gt&gt; {
+    <a href="crypto_algebra.md#0x1_crypto_algebra_abort_unless_cryptography_algebra_natives_enabled">abort_unless_cryptography_algebra_natives_enabled</a>();
+    <a href="crypto_algebra.md#0x1_crypto_algebra_Element">Element</a>&lt;Gt&gt; {
+        handle: <a href="crypto_algebra.md#0x1_crypto_algebra_pairing_internal">pairing_internal</a>&lt;G1,G2,Gt&gt;(element_1.handle, element_2.handle)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_crypto_algebra_deserialize"></a>
+
+## Function `deserialize`
+
+Try deserializing a byte array to an element of an algebraic structure <code>S</code> using a given serialization format <code>F</code>.
+Return none if the deserialization failed.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_deserialize">deserialize</a>&lt;S, F&gt;(bytes: &<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="crypto_algebra.md#0x1_crypto_algebra_Element">crypto_algebra::Element</a>&lt;S&gt;&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_deserialize">deserialize</a>&lt;S, F&gt;(bytes: &<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): Option&lt;<a href="crypto_algebra.md#0x1_crypto_algebra_Element">Element</a>&lt;S&gt;&gt; {
+    <a href="crypto_algebra.md#0x1_crypto_algebra_abort_unless_cryptography_algebra_natives_enabled">abort_unless_cryptography_algebra_natives_enabled</a>();
+    <b>let</b> (succeeded, handle) = <a href="crypto_algebra.md#0x1_crypto_algebra_deserialize_internal">deserialize_internal</a>&lt;S, F&gt;(bytes);
+    <b>if</b> (succeeded) {
+        some(<a href="crypto_algebra.md#0x1_crypto_algebra_Element">Element</a>&lt;S&gt; { handle })
+    } <b>else</b> {
+        none()
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_crypto_algebra_serialize"></a>
+
+## Function `serialize`
+
+Serialize an element of an algebraic structure <code>S</code> to a byte array using a given serialization format <code>F</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_serialize">serialize</a>&lt;S, F&gt;(element: &<a href="crypto_algebra.md#0x1_crypto_algebra_Element">crypto_algebra::Element</a>&lt;S&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_serialize">serialize</a>&lt;S, F&gt;(element: &<a href="crypto_algebra.md#0x1_crypto_algebra_Element">Element</a>&lt;S&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; {
+    <a href="crypto_algebra.md#0x1_crypto_algebra_abort_unless_cryptography_algebra_natives_enabled">abort_unless_cryptography_algebra_natives_enabled</a>();
+    <a href="crypto_algebra.md#0x1_crypto_algebra_serialize_internal">serialize_internal</a>&lt;S, F&gt;(element.handle)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_crypto_algebra_order"></a>
+
+## Function `order`
+
+Get the order of structure <code>S</code>, a big integer little-endian encoded as a byte array.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_order">order</a>&lt;S&gt;(): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_order">order</a>&lt;S&gt;(): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; {
+    <a href="crypto_algebra.md#0x1_crypto_algebra_abort_unless_cryptography_algebra_natives_enabled">abort_unless_cryptography_algebra_natives_enabled</a>();
+    <a href="crypto_algebra.md#0x1_crypto_algebra_order_internal">order_internal</a>&lt;S&gt;()
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_crypto_algebra_upcast"></a>
+
+## Function `upcast`
+
+Cast an element of a structure <code>S</code> to a parent structure <code>L</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_upcast">upcast</a>&lt;S, L&gt;(element: &<a href="crypto_algebra.md#0x1_crypto_algebra_Element">crypto_algebra::Element</a>&lt;S&gt;): <a href="crypto_algebra.md#0x1_crypto_algebra_Element">crypto_algebra::Element</a>&lt;L&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_upcast">upcast</a>&lt;S,L&gt;(element: &<a href="crypto_algebra.md#0x1_crypto_algebra_Element">Element</a>&lt;S&gt;): <a href="crypto_algebra.md#0x1_crypto_algebra_Element">Element</a>&lt;L&gt; {
+    <a href="crypto_algebra.md#0x1_crypto_algebra_abort_unless_cryptography_algebra_natives_enabled">abort_unless_cryptography_algebra_natives_enabled</a>();
+    <a href="crypto_algebra.md#0x1_crypto_algebra_Element">Element</a>&lt;L&gt; {
+        handle: <a href="crypto_algebra.md#0x1_crypto_algebra_upcast_internal">upcast_internal</a>&lt;S,L&gt;(element.handle)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_crypto_algebra_downcast"></a>
+
+## Function `downcast`
+
+Try casting an element <code>x</code> of a structure <code>L</code> to a sub-structure <code>S</code>.
+Return none if <code>x</code> is not a member of <code>S</code>.
+
+NOTE: Membership check in <code>S</code> is performed inside, which can be expensive, depending on the structures <code>L</code> and <code>S</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_downcast">downcast</a>&lt;L, S&gt;(element_x: &<a href="crypto_algebra.md#0x1_crypto_algebra_Element">crypto_algebra::Element</a>&lt;L&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="crypto_algebra.md#0x1_crypto_algebra_Element">crypto_algebra::Element</a>&lt;S&gt;&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_downcast">downcast</a>&lt;L,S&gt;(element_x: &<a href="crypto_algebra.md#0x1_crypto_algebra_Element">Element</a>&lt;L&gt;): Option&lt;<a href="crypto_algebra.md#0x1_crypto_algebra_Element">Element</a>&lt;S&gt;&gt; {
+    <a href="crypto_algebra.md#0x1_crypto_algebra_abort_unless_cryptography_algebra_natives_enabled">abort_unless_cryptography_algebra_natives_enabled</a>();
+    <b>let</b> (succ, new_handle) = <a href="crypto_algebra.md#0x1_crypto_algebra_downcast_internal">downcast_internal</a>&lt;L,S&gt;(element_x.handle);
+    <b>if</b> (succ) {
+        some(<a href="crypto_algebra.md#0x1_crypto_algebra_Element">Element</a>&lt;S&gt; { handle: new_handle })
+    } <b>else</b> {
+        none()
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_crypto_algebra_hash_to"></a>
+
+## Function `hash_to`
+
+Hash an arbitrary-length byte array <code>msg</code> into structure <code>S</code> with a domain separation tag <code>dst</code>
+using the given hash-to-structure suite <code>H</code>.
+
+NOTE: some hashing methods do not accept a <code>dst</code> and will abort if a non-empty one is provided.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_hash_to">hash_to</a>&lt;S, H&gt;(dst: &<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, msg: &<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="crypto_algebra.md#0x1_crypto_algebra_Element">crypto_algebra::Element</a>&lt;S&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_hash_to">hash_to</a>&lt;S, H&gt;(dst: &<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, msg: &<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="crypto_algebra.md#0x1_crypto_algebra_Element">Element</a>&lt;S&gt; {
+    <a href="crypto_algebra.md#0x1_crypto_algebra_abort_unless_cryptography_algebra_natives_enabled">abort_unless_cryptography_algebra_natives_enabled</a>();
+    <a href="crypto_algebra.md#0x1_crypto_algebra_Element">Element</a> {
+        handle: <a href="crypto_algebra.md#0x1_crypto_algebra_hash_to_internal">hash_to_internal</a>&lt;S, H&gt;(dst, msg)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_crypto_algebra_abort_unless_cryptography_algebra_natives_enabled"></a>
+
+## Function `abort_unless_cryptography_algebra_natives_enabled`
+
+
+
+<pre><code><b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_abort_unless_cryptography_algebra_natives_enabled">abort_unless_cryptography_algebra_natives_enabled</a>()
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_abort_unless_cryptography_algebra_natives_enabled">abort_unless_cryptography_algebra_natives_enabled</a>() {
+    <b>if</b> (<a href="../../../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_cryptography_algebra_enabled">features::cryptography_algebra_enabled</a>()) <b>return</b>;
+    <b>abort</b>(std::error::not_implemented(0))
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_crypto_algebra_handles_from_elements"></a>
+
+## Function `handles_from_elements`
+
+
+
+<pre><code><b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_handles_from_elements">handles_from_elements</a>&lt;S&gt;(elements: &<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="crypto_algebra.md#0x1_crypto_algebra_Element">crypto_algebra::Element</a>&lt;S&gt;&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u64&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_handles_from_elements">handles_from_elements</a>&lt;S&gt;(elements: &<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="crypto_algebra.md#0x1_crypto_algebra_Element">Element</a>&lt;S&gt;&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u64&gt; {
+    <b>let</b> num_elements = std::vector::length(elements);
+    <b>let</b> element_handles = std::vector::empty();
+    <b>let</b> i = 0;
+    <b>while</b> ({
+        <b>spec</b> {
+            <b>invariant</b> len(element_handles) == i;
+            <b>invariant</b> <b>forall</b> k in 0..i: element_handles[k] == elements[k].handle;
+        };
+        i &lt; num_elements
+    }) {
+        std::vector::push_back(&<b>mut</b> element_handles, std::vector::borrow(elements, i).handle);
+        i = i + 1;
+    };
+    element_handles
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_crypto_algebra_add_internal"></a>
+
+## Function `add_internal`
+
+
+
+<pre><code><b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_add_internal">add_internal</a>&lt;S&gt;(handle_1: u64, handle_2: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_add_internal">add_internal</a>&lt;S&gt;(handle_1: u64, handle_2: u64): u64;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_crypto_algebra_deserialize_internal"></a>
+
+## Function `deserialize_internal`
+
+
+
+<pre><code><b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_deserialize_internal">deserialize_internal</a>&lt;S, F&gt;(bytes: &<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): (bool, u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_deserialize_internal">deserialize_internal</a>&lt;S, F&gt;(bytes: &<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): (bool, u64);
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_crypto_algebra_div_internal"></a>
+
+## Function `div_internal`
+
+
+
+<pre><code><b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_div_internal">div_internal</a>&lt;F&gt;(handle_1: u64, handle_2: u64): (bool, u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_div_internal">div_internal</a>&lt;F&gt;(handle_1: u64, handle_2: u64): (bool, u64);
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_crypto_algebra_double_internal"></a>
+
+## Function `double_internal`
+
+
+
+<pre><code><b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_double_internal">double_internal</a>&lt;G&gt;(element_handle: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_double_internal">double_internal</a>&lt;G&gt;(element_handle: u64): u64;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_crypto_algebra_downcast_internal"></a>
+
+## Function `downcast_internal`
+
+
+
+<pre><code><b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_downcast_internal">downcast_internal</a>&lt;L, S&gt;(handle: u64): (bool, u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_downcast_internal">downcast_internal</a>&lt;L,S&gt;(handle: u64): (bool, u64);
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_crypto_algebra_from_u64_internal"></a>
+
+## Function `from_u64_internal`
+
+
+
+<pre><code><b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_from_u64_internal">from_u64_internal</a>&lt;S&gt;(value: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_from_u64_internal">from_u64_internal</a>&lt;S&gt;(value: u64): u64;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_crypto_algebra_eq_internal"></a>
+
+## Function `eq_internal`
+
+
+
+<pre><code><b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_eq_internal">eq_internal</a>&lt;S&gt;(handle_1: u64, handle_2: u64): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_eq_internal">eq_internal</a>&lt;S&gt;(handle_1: u64, handle_2: u64): bool;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_crypto_algebra_hash_to_internal"></a>
+
+## Function `hash_to_internal`
+
+
+
+<pre><code><b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_hash_to_internal">hash_to_internal</a>&lt;S, H&gt;(dst: &<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, bytes: &<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_hash_to_internal">hash_to_internal</a>&lt;S, H&gt;(dst: &<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, bytes: &<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): u64;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_crypto_algebra_inv_internal"></a>
+
+## Function `inv_internal`
+
+
+
+<pre><code><b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_inv_internal">inv_internal</a>&lt;F&gt;(handle: u64): (bool, u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_inv_internal">inv_internal</a>&lt;F&gt;(handle: u64): (bool, u64);
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_crypto_algebra_mul_internal"></a>
+
+## Function `mul_internal`
+
+
+
+<pre><code><b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_mul_internal">mul_internal</a>&lt;F&gt;(handle_1: u64, handle_2: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_mul_internal">mul_internal</a>&lt;F&gt;(handle_1: u64, handle_2: u64): u64;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_crypto_algebra_multi_pairing_internal"></a>
+
+## Function `multi_pairing_internal`
+
+
+
+<pre><code><b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_multi_pairing_internal">multi_pairing_internal</a>&lt;G1, G2, Gt&gt;(g1_handles: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u64&gt;, g2_handles: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u64&gt;): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_multi_pairing_internal">multi_pairing_internal</a>&lt;G1,G2,Gt&gt;(g1_handles: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u64&gt;, g2_handles: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u64&gt;): u64;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_crypto_algebra_multi_scalar_mul_internal"></a>
+
+## Function `multi_scalar_mul_internal`
+
+
+
+<pre><code><b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_multi_scalar_mul_internal">multi_scalar_mul_internal</a>&lt;G, S&gt;(element_handles: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u64&gt;, scalar_handles: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u64&gt;): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_multi_scalar_mul_internal">multi_scalar_mul_internal</a>&lt;G, S&gt;(element_handles: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u64&gt;, scalar_handles: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u64&gt;): u64;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_crypto_algebra_neg_internal"></a>
+
+## Function `neg_internal`
+
+
+
+<pre><code><b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_neg_internal">neg_internal</a>&lt;F&gt;(handle: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_neg_internal">neg_internal</a>&lt;F&gt;(handle: u64): u64;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_crypto_algebra_one_internal"></a>
+
+## Function `one_internal`
+
+
+
+<pre><code><b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_one_internal">one_internal</a>&lt;S&gt;(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_one_internal">one_internal</a>&lt;S&gt;(): u64;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_crypto_algebra_order_internal"></a>
+
+## Function `order_internal`
+
+
+
+<pre><code><b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_order_internal">order_internal</a>&lt;G&gt;(): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_order_internal">order_internal</a>&lt;G&gt;(): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_crypto_algebra_pairing_internal"></a>
+
+## Function `pairing_internal`
+
+
+
+<pre><code><b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_pairing_internal">pairing_internal</a>&lt;G1, G2, Gt&gt;(g1_handle: u64, g2_handle: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_pairing_internal">pairing_internal</a>&lt;G1,G2,Gt&gt;(g1_handle: u64, g2_handle: u64): u64;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_crypto_algebra_scalar_mul_internal"></a>
+
+## Function `scalar_mul_internal`
+
+
+
+<pre><code><b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_scalar_mul_internal">scalar_mul_internal</a>&lt;G, S&gt;(element_handle: u64, scalar_handle: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_scalar_mul_internal">scalar_mul_internal</a>&lt;G, S&gt;(element_handle: u64, scalar_handle: u64): u64;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_crypto_algebra_serialize_internal"></a>
+
+## Function `serialize_internal`
+
+
+
+<pre><code><b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_serialize_internal">serialize_internal</a>&lt;S, F&gt;(handle: u64): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_serialize_internal">serialize_internal</a>&lt;S, F&gt;(handle: u64): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_crypto_algebra_sqr_internal"></a>
+
+## Function `sqr_internal`
+
+
+
+<pre><code><b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_sqr_internal">sqr_internal</a>&lt;G&gt;(handle: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_sqr_internal">sqr_internal</a>&lt;G&gt;(handle: u64): u64;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_crypto_algebra_sub_internal"></a>
+
+## Function `sub_internal`
+
+
+
+<pre><code><b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_sub_internal">sub_internal</a>&lt;G&gt;(handle_1: u64, handle_2: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_sub_internal">sub_internal</a>&lt;G&gt;(handle_1: u64, handle_2: u64): u64;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_crypto_algebra_upcast_internal"></a>
+
+## Function `upcast_internal`
+
+
+
+<pre><code><b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_upcast_internal">upcast_internal</a>&lt;S, L&gt;(handle: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_upcast_internal">upcast_internal</a>&lt;S,L&gt;(handle: u64): u64;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_crypto_algebra_zero_internal"></a>
+
+## Function `zero_internal`
+
+
+
+<pre><code><b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_zero_internal">zero_internal</a>&lt;S&gt;(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_zero_internal">zero_internal</a>&lt;S&gt;(): u64;
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+<a id="@Specification_1_handles_from_elements"></a>
+
+### Function `handles_from_elements`
+
+
+<pre><code><b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_handles_from_elements">handles_from_elements</a>&lt;S&gt;(elements: &<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="crypto_algebra.md#0x1_crypto_algebra_Element">crypto_algebra::Element</a>&lt;S&gt;&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u64&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+<b>ensures</b> <b>forall</b> i in 0..len(elements): result[i] == elements[i].handle;
+</code></pre>
+
+
+
+<a id="@Specification_1_add_internal"></a>
+
+### Function `add_internal`
+
+
+<pre><code><b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_add_internal">add_internal</a>&lt;S&gt;(handle_1: u64, handle_2: u64): u64
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_deserialize_internal"></a>
+
+### Function `deserialize_internal`
+
+
+<pre><code><b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_deserialize_internal">deserialize_internal</a>&lt;S, F&gt;(bytes: &<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): (bool, u64)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_div_internal"></a>
+
+### Function `div_internal`
+
+
+<pre><code><b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_div_internal">div_internal</a>&lt;F&gt;(handle_1: u64, handle_2: u64): (bool, u64)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_double_internal"></a>
+
+### Function `double_internal`
+
+
+<pre><code><b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_double_internal">double_internal</a>&lt;G&gt;(element_handle: u64): u64
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_downcast_internal"></a>
+
+### Function `downcast_internal`
+
+
+<pre><code><b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_downcast_internal">downcast_internal</a>&lt;L, S&gt;(handle: u64): (bool, u64)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_from_u64_internal"></a>
+
+### Function `from_u64_internal`
+
+
+<pre><code><b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_from_u64_internal">from_u64_internal</a>&lt;S&gt;(value: u64): u64
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_eq_internal"></a>
+
+### Function `eq_internal`
+
+
+<pre><code><b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_eq_internal">eq_internal</a>&lt;S&gt;(handle_1: u64, handle_2: u64): bool
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_hash_to_internal"></a>
+
+### Function `hash_to_internal`
+
+
+<pre><code><b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_hash_to_internal">hash_to_internal</a>&lt;S, H&gt;(dst: &<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, bytes: &<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): u64
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_inv_internal"></a>
+
+### Function `inv_internal`
+
+
+<pre><code><b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_inv_internal">inv_internal</a>&lt;F&gt;(handle: u64): (bool, u64)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_mul_internal"></a>
+
+### Function `mul_internal`
+
+
+<pre><code><b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_mul_internal">mul_internal</a>&lt;F&gt;(handle_1: u64, handle_2: u64): u64
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_multi_pairing_internal"></a>
+
+### Function `multi_pairing_internal`
+
+
+<pre><code><b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_multi_pairing_internal">multi_pairing_internal</a>&lt;G1, G2, Gt&gt;(g1_handles: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u64&gt;, g2_handles: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u64&gt;): u64
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_multi_scalar_mul_internal"></a>
+
+### Function `multi_scalar_mul_internal`
+
+
+<pre><code><b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_multi_scalar_mul_internal">multi_scalar_mul_internal</a>&lt;G, S&gt;(element_handles: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u64&gt;, scalar_handles: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u64&gt;): u64
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_neg_internal"></a>
+
+### Function `neg_internal`
+
+
+<pre><code><b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_neg_internal">neg_internal</a>&lt;F&gt;(handle: u64): u64
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_one_internal"></a>
+
+### Function `one_internal`
+
+
+<pre><code><b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_one_internal">one_internal</a>&lt;S&gt;(): u64
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_order_internal"></a>
+
+### Function `order_internal`
+
+
+<pre><code><b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_order_internal">order_internal</a>&lt;G&gt;(): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_pairing_internal"></a>
+
+### Function `pairing_internal`
+
+
+<pre><code><b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_pairing_internal">pairing_internal</a>&lt;G1, G2, Gt&gt;(g1_handle: u64, g2_handle: u64): u64
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_scalar_mul_internal"></a>
+
+### Function `scalar_mul_internal`
+
+
+<pre><code><b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_scalar_mul_internal">scalar_mul_internal</a>&lt;G, S&gt;(element_handle: u64, scalar_handle: u64): u64
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_serialize_internal"></a>
+
+### Function `serialize_internal`
+
+
+<pre><code><b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_serialize_internal">serialize_internal</a>&lt;S, F&gt;(handle: u64): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_sqr_internal"></a>
+
+### Function `sqr_internal`
+
+
+<pre><code><b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_sqr_internal">sqr_internal</a>&lt;G&gt;(handle: u64): u64
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_sub_internal"></a>
+
+### Function `sub_internal`
+
+
+<pre><code><b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_sub_internal">sub_internal</a>&lt;G&gt;(handle_1: u64, handle_2: u64): u64
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_upcast_internal"></a>
+
+### Function `upcast_internal`
+
+
+<pre><code><b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_upcast_internal">upcast_internal</a>&lt;S, L&gt;(handle: u64): u64
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_zero_internal"></a>
+
+### Function `zero_internal`
+
+
+<pre><code><b>fun</b> <a href="crypto_algebra.md#0x1_crypto_algebra_zero_internal">zero_internal</a>&lt;S&gt;(): u64
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/debug.md b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/debug.md
new file mode 100644
index 0000000000000..3fe59b4b97ca4
--- /dev/null
+++ b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/debug.md
@@ -0,0 +1,237 @@
+
+<a id="0x1_debug"></a>
+
+# Module `0x1::debug`
+
+Module providing debug functionality.
+
+
+-  [Constants](#@Constants_0)
+-  [Function `print`](#0x1_debug_print)
+-  [Function `print_stack_trace`](#0x1_debug_print_stack_trace)
+-  [Function `format`](#0x1_debug_format)
+-  [Function `native_print`](#0x1_debug_native_print)
+-  [Function `native_stack_trace`](#0x1_debug_native_stack_trace)
+-  [Specification](#@Specification_1)
+    -  [Function `print`](#@Specification_1_print)
+    -  [Function `print_stack_trace`](#@Specification_1_print_stack_trace)
+    -  [Function `native_print`](#@Specification_1_native_print)
+    -  [Function `native_stack_trace`](#@Specification_1_native_stack_trace)
+
+
+<pre><code><b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string">0x1::string</a>;
+<b>use</b> <a href="string_utils.md#0x1_string_utils">0x1::string_utils</a>;
+</code></pre>
+
+
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_debug_MSG_1"></a>
+
+
+
+<pre><code><b>const</b> <a href="debug.md#0x1_debug_MSG_1">MSG_1</a>: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; = [97, 98, 99, 100, 101, 102];
+</code></pre>
+
+
+
+<a id="0x1_debug_MSG_2"></a>
+
+
+
+<pre><code><b>const</b> <a href="debug.md#0x1_debug_MSG_2">MSG_2</a>: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; = [49, 50, 51, 52, 53, 54];
+</code></pre>
+
+
+
+<a id="0x1_debug_print"></a>
+
+## Function `print`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="debug.md#0x1_debug_print">print</a>&lt;T&gt;(x: &T)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="debug.md#0x1_debug_print">print</a>&lt;T&gt;(x: &T) {
+    <a href="debug.md#0x1_debug_native_print">native_print</a>(<a href="debug.md#0x1_debug_format">format</a>(x));
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_debug_print_stack_trace"></a>
+
+## Function `print_stack_trace`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="debug.md#0x1_debug_print_stack_trace">print_stack_trace</a>()
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="debug.md#0x1_debug_print_stack_trace">print_stack_trace</a>() {
+    <a href="debug.md#0x1_debug_native_print">native_print</a>(<a href="debug.md#0x1_debug_native_stack_trace">native_stack_trace</a>());
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_debug_format"></a>
+
+## Function `format`
+
+
+
+<pre><code><b>fun</b> <a href="debug.md#0x1_debug_format">format</a>&lt;T&gt;(x: &T): <a href="../../../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="debug.md#0x1_debug_format">format</a>&lt;T&gt;(x: &T): String {
+    aptos_std::string_utils::debug_string(x)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_debug_native_print"></a>
+
+## Function `native_print`
+
+
+
+<pre><code><b>fun</b> <a href="debug.md#0x1_debug_native_print">native_print</a>(x: <a href="../../../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="debug.md#0x1_debug_native_print">native_print</a>(x: String);
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_debug_native_stack_trace"></a>
+
+## Function `native_stack_trace`
+
+
+
+<pre><code><b>fun</b> <a href="debug.md#0x1_debug_native_stack_trace">native_stack_trace</a>(): <a href="../../../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="debug.md#0x1_debug_native_stack_trace">native_stack_trace</a>(): String;
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+<a id="@Specification_1_print"></a>
+
+### Function `print`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="debug.md#0x1_debug_print">print</a>&lt;T&gt;(x: &T)
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_print_stack_trace"></a>
+
+### Function `print_stack_trace`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="debug.md#0x1_debug_print_stack_trace">print_stack_trace</a>()
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_native_print"></a>
+
+### Function `native_print`
+
+
+<pre><code><b>fun</b> <a href="debug.md#0x1_debug_native_print">native_print</a>(x: <a href="../../../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_native_stack_trace"></a>
+
+### Function `native_stack_trace`
+
+
+<pre><code><b>fun</b> <a href="debug.md#0x1_debug_native_stack_trace">native_stack_trace</a>(): <a href="../../../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/ed25519.md b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/ed25519.md
new file mode 100644
index 0000000000000..5122e741ba6a6
--- /dev/null
+++ b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/ed25519.md
@@ -0,0 +1,876 @@
+
+<a id="0x1_ed25519"></a>
+
+# Module `0x1::ed25519`
+
+Contains functions for:
+
+1. [Ed25519](https://en.wikipedia.org/wiki/EdDSA#Ed25519) digital signatures: i.e., EdDSA signatures over Edwards25519 curves with co-factor 8
+
+
+-  [Struct `SignedMessage`](#0x1_ed25519_SignedMessage)
+-  [Struct `UnvalidatedPublicKey`](#0x1_ed25519_UnvalidatedPublicKey)
+-  [Struct `ValidatedPublicKey`](#0x1_ed25519_ValidatedPublicKey)
+-  [Struct `Signature`](#0x1_ed25519_Signature)
+-  [Constants](#@Constants_0)
+-  [Function `new_unvalidated_public_key_from_bytes`](#0x1_ed25519_new_unvalidated_public_key_from_bytes)
+-  [Function `new_validated_public_key_from_bytes`](#0x1_ed25519_new_validated_public_key_from_bytes)
+-  [Function `new_signature_from_bytes`](#0x1_ed25519_new_signature_from_bytes)
+-  [Function `public_key_to_unvalidated`](#0x1_ed25519_public_key_to_unvalidated)
+-  [Function `public_key_into_unvalidated`](#0x1_ed25519_public_key_into_unvalidated)
+-  [Function `unvalidated_public_key_to_bytes`](#0x1_ed25519_unvalidated_public_key_to_bytes)
+-  [Function `validated_public_key_to_bytes`](#0x1_ed25519_validated_public_key_to_bytes)
+-  [Function `signature_to_bytes`](#0x1_ed25519_signature_to_bytes)
+-  [Function `public_key_validate`](#0x1_ed25519_public_key_validate)
+-  [Function `signature_verify_strict`](#0x1_ed25519_signature_verify_strict)
+-  [Function `signature_verify_strict_t`](#0x1_ed25519_signature_verify_strict_t)
+-  [Function `new_signed_message`](#0x1_ed25519_new_signed_message)
+-  [Function `unvalidated_public_key_to_authentication_key`](#0x1_ed25519_unvalidated_public_key_to_authentication_key)
+-  [Function `validated_public_key_to_authentication_key`](#0x1_ed25519_validated_public_key_to_authentication_key)
+-  [Function `public_key_bytes_to_authentication_key`](#0x1_ed25519_public_key_bytes_to_authentication_key)
+-  [Function `public_key_validate_internal`](#0x1_ed25519_public_key_validate_internal)
+-  [Function `signature_verify_strict_internal`](#0x1_ed25519_signature_verify_strict_internal)
+-  [Specification](#@Specification_1)
+    -  [Function `new_unvalidated_public_key_from_bytes`](#@Specification_1_new_unvalidated_public_key_from_bytes)
+    -  [Function `new_validated_public_key_from_bytes`](#@Specification_1_new_validated_public_key_from_bytes)
+    -  [Function `new_signature_from_bytes`](#@Specification_1_new_signature_from_bytes)
+    -  [Function `public_key_bytes_to_authentication_key`](#@Specification_1_public_key_bytes_to_authentication_key)
+    -  [Function `public_key_validate_internal`](#@Specification_1_public_key_validate_internal)
+    -  [Function `signature_verify_strict_internal`](#@Specification_1_signature_verify_strict_internal)
+    -  [Helper functions](#@Helper_functions_2)
+
+
+<pre><code><b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs">0x1::bcs</a>;
+<b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/hash.md#0x1_hash">0x1::hash</a>;
+<b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option">0x1::option</a>;
+<b>use</b> <a href="type_info.md#0x1_type_info">0x1::type_info</a>;
+</code></pre>
+
+
+
+<a id="0x1_ed25519_SignedMessage"></a>
+
+## Struct `SignedMessage`
+
+A BCS-serializable message, which one can verify signatures on via <code>signature_verify_strict_t</code>
+
+
+<pre><code><b>struct</b> <a href="ed25519.md#0x1_ed25519_SignedMessage">SignedMessage</a>&lt;MessageType&gt; <b>has</b> drop
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code><a href="type_info.md#0x1_type_info">type_info</a>: <a href="type_info.md#0x1_type_info_TypeInfo">type_info::TypeInfo</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>inner: MessageType</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_ed25519_UnvalidatedPublicKey"></a>
+
+## Struct `UnvalidatedPublicKey`
+
+An *unvalidated* Ed25519 public key: not necessarily an elliptic curve point, just a sequence of 32 bytes
+
+
+<pre><code><b>struct</b> <a href="ed25519.md#0x1_ed25519_UnvalidatedPublicKey">UnvalidatedPublicKey</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_ed25519_ValidatedPublicKey"></a>
+
+## Struct `ValidatedPublicKey`
+
+A *validated* Ed25519 public key: not necessarily a prime-order point, could be mixed-order, but will never be
+a small-order point.
+
+For now, this struct is not used in any verification functions, but it might be in the future.
+
+
+<pre><code><b>struct</b> <a href="ed25519.md#0x1_ed25519_ValidatedPublicKey">ValidatedPublicKey</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_ed25519_Signature"></a>
+
+## Struct `Signature`
+
+A purported Ed25519 signature that can be verified via <code>signature_verify_strict</code> or <code>signature_verify_strict_t</code>.
+
+
+<pre><code><b>struct</b> <a href="ed25519.md#0x1_ed25519_Signature">Signature</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_ed25519_PUBLIC_KEY_NUM_BYTES"></a>
+
+The size of a serialized public key, in bytes.
+
+
+<pre><code><b>const</b> <a href="ed25519.md#0x1_ed25519_PUBLIC_KEY_NUM_BYTES">PUBLIC_KEY_NUM_BYTES</a>: u64 = 32;
+</code></pre>
+
+
+
+<a id="0x1_ed25519_E_WRONG_PUBKEY_SIZE"></a>
+
+Wrong number of bytes were given as input when deserializing an Ed25519 public key.
+
+
+<pre><code><b>const</b> <a href="ed25519.md#0x1_ed25519_E_WRONG_PUBKEY_SIZE">E_WRONG_PUBKEY_SIZE</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_ed25519_E_WRONG_SIGNATURE_SIZE"></a>
+
+Wrong number of bytes were given as input when deserializing an Ed25519 signature.
+
+
+<pre><code><b>const</b> <a href="ed25519.md#0x1_ed25519_E_WRONG_SIGNATURE_SIZE">E_WRONG_SIGNATURE_SIZE</a>: u64 = 2;
+</code></pre>
+
+
+
+<a id="0x1_ed25519_SIGNATURE_NUM_BYTES"></a>
+
+The size of a serialized signature, in bytes.
+
+
+<pre><code><b>const</b> <a href="ed25519.md#0x1_ed25519_SIGNATURE_NUM_BYTES">SIGNATURE_NUM_BYTES</a>: u64 = 64;
+</code></pre>
+
+
+
+<a id="0x1_ed25519_SIGNATURE_SCHEME_ID"></a>
+
+The identifier of the Ed25519 signature scheme, which is used when deriving Aptos authentication keys by hashing
+it together with an Ed25519 public key.
+
+
+<pre><code><b>const</b> <a href="ed25519.md#0x1_ed25519_SIGNATURE_SCHEME_ID">SIGNATURE_SCHEME_ID</a>: u8 = 0;
+</code></pre>
+
+
+
+<a id="0x1_ed25519_new_unvalidated_public_key_from_bytes"></a>
+
+## Function `new_unvalidated_public_key_from_bytes`
+
+Parses the input 32 bytes as an *unvalidated* Ed25519 public key.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ed25519.md#0x1_ed25519_new_unvalidated_public_key_from_bytes">new_unvalidated_public_key_from_bytes</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="ed25519.md#0x1_ed25519_UnvalidatedPublicKey">ed25519::UnvalidatedPublicKey</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ed25519.md#0x1_ed25519_new_unvalidated_public_key_from_bytes">new_unvalidated_public_key_from_bytes</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="ed25519.md#0x1_ed25519_UnvalidatedPublicKey">UnvalidatedPublicKey</a> {
+    <b>assert</b>!(std::vector::length(&bytes) == <a href="ed25519.md#0x1_ed25519_PUBLIC_KEY_NUM_BYTES">PUBLIC_KEY_NUM_BYTES</a>, std::error::invalid_argument(<a href="ed25519.md#0x1_ed25519_E_WRONG_PUBKEY_SIZE">E_WRONG_PUBKEY_SIZE</a>));
+    <a href="ed25519.md#0x1_ed25519_UnvalidatedPublicKey">UnvalidatedPublicKey</a> { bytes }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ed25519_new_validated_public_key_from_bytes"></a>
+
+## Function `new_validated_public_key_from_bytes`
+
+Parses the input 32 bytes as a *validated* Ed25519 public key.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ed25519.md#0x1_ed25519_new_validated_public_key_from_bytes">new_validated_public_key_from_bytes</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="ed25519.md#0x1_ed25519_ValidatedPublicKey">ed25519::ValidatedPublicKey</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ed25519.md#0x1_ed25519_new_validated_public_key_from_bytes">new_validated_public_key_from_bytes</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): Option&lt;<a href="ed25519.md#0x1_ed25519_ValidatedPublicKey">ValidatedPublicKey</a>&gt; {
+    <b>if</b> (<a href="ed25519.md#0x1_ed25519_public_key_validate_internal">public_key_validate_internal</a>(bytes)) {
+        <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(<a href="ed25519.md#0x1_ed25519_ValidatedPublicKey">ValidatedPublicKey</a> {
+            bytes
+        })
+    } <b>else</b> {
+        <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>&lt;<a href="ed25519.md#0x1_ed25519_ValidatedPublicKey">ValidatedPublicKey</a>&gt;()
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ed25519_new_signature_from_bytes"></a>
+
+## Function `new_signature_from_bytes`
+
+Parses the input 64 bytes as a purported Ed25519 signature.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ed25519.md#0x1_ed25519_new_signature_from_bytes">new_signature_from_bytes</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="ed25519.md#0x1_ed25519_Signature">ed25519::Signature</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ed25519.md#0x1_ed25519_new_signature_from_bytes">new_signature_from_bytes</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="ed25519.md#0x1_ed25519_Signature">Signature</a> {
+    <b>assert</b>!(std::vector::length(&bytes) == <a href="ed25519.md#0x1_ed25519_SIGNATURE_NUM_BYTES">SIGNATURE_NUM_BYTES</a>, std::error::invalid_argument(<a href="ed25519.md#0x1_ed25519_E_WRONG_SIGNATURE_SIZE">E_WRONG_SIGNATURE_SIZE</a>));
+    <a href="ed25519.md#0x1_ed25519_Signature">Signature</a> { bytes }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ed25519_public_key_to_unvalidated"></a>
+
+## Function `public_key_to_unvalidated`
+
+Converts a ValidatedPublicKey to an UnvalidatedPublicKey, which can be used in the strict verification APIs.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ed25519.md#0x1_ed25519_public_key_to_unvalidated">public_key_to_unvalidated</a>(pk: &<a href="ed25519.md#0x1_ed25519_ValidatedPublicKey">ed25519::ValidatedPublicKey</a>): <a href="ed25519.md#0x1_ed25519_UnvalidatedPublicKey">ed25519::UnvalidatedPublicKey</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ed25519.md#0x1_ed25519_public_key_to_unvalidated">public_key_to_unvalidated</a>(pk: &<a href="ed25519.md#0x1_ed25519_ValidatedPublicKey">ValidatedPublicKey</a>): <a href="ed25519.md#0x1_ed25519_UnvalidatedPublicKey">UnvalidatedPublicKey</a> {
+    <a href="ed25519.md#0x1_ed25519_UnvalidatedPublicKey">UnvalidatedPublicKey</a> {
+        bytes: pk.bytes
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ed25519_public_key_into_unvalidated"></a>
+
+## Function `public_key_into_unvalidated`
+
+Moves a ValidatedPublicKey into an UnvalidatedPublicKey, which can be used in the strict verification APIs.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ed25519.md#0x1_ed25519_public_key_into_unvalidated">public_key_into_unvalidated</a>(pk: <a href="ed25519.md#0x1_ed25519_ValidatedPublicKey">ed25519::ValidatedPublicKey</a>): <a href="ed25519.md#0x1_ed25519_UnvalidatedPublicKey">ed25519::UnvalidatedPublicKey</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ed25519.md#0x1_ed25519_public_key_into_unvalidated">public_key_into_unvalidated</a>(pk: <a href="ed25519.md#0x1_ed25519_ValidatedPublicKey">ValidatedPublicKey</a>): <a href="ed25519.md#0x1_ed25519_UnvalidatedPublicKey">UnvalidatedPublicKey</a> {
+    <a href="ed25519.md#0x1_ed25519_UnvalidatedPublicKey">UnvalidatedPublicKey</a> {
+        bytes: pk.bytes
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ed25519_unvalidated_public_key_to_bytes"></a>
+
+## Function `unvalidated_public_key_to_bytes`
+
+Serializes an UnvalidatedPublicKey struct to 32-bytes.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ed25519.md#0x1_ed25519_unvalidated_public_key_to_bytes">unvalidated_public_key_to_bytes</a>(pk: &<a href="ed25519.md#0x1_ed25519_UnvalidatedPublicKey">ed25519::UnvalidatedPublicKey</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ed25519.md#0x1_ed25519_unvalidated_public_key_to_bytes">unvalidated_public_key_to_bytes</a>(pk: &<a href="ed25519.md#0x1_ed25519_UnvalidatedPublicKey">UnvalidatedPublicKey</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; {
+    pk.bytes
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ed25519_validated_public_key_to_bytes"></a>
+
+## Function `validated_public_key_to_bytes`
+
+Serializes an ValidatedPublicKey struct to 32-bytes.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ed25519.md#0x1_ed25519_validated_public_key_to_bytes">validated_public_key_to_bytes</a>(pk: &<a href="ed25519.md#0x1_ed25519_ValidatedPublicKey">ed25519::ValidatedPublicKey</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ed25519.md#0x1_ed25519_validated_public_key_to_bytes">validated_public_key_to_bytes</a>(pk: &<a href="ed25519.md#0x1_ed25519_ValidatedPublicKey">ValidatedPublicKey</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; {
+    pk.bytes
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ed25519_signature_to_bytes"></a>
+
+## Function `signature_to_bytes`
+
+Serializes a Signature struct to 64-bytes.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ed25519.md#0x1_ed25519_signature_to_bytes">signature_to_bytes</a>(sig: &<a href="ed25519.md#0x1_ed25519_Signature">ed25519::Signature</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ed25519.md#0x1_ed25519_signature_to_bytes">signature_to_bytes</a>(sig: &<a href="ed25519.md#0x1_ed25519_Signature">Signature</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; {
+    sig.bytes
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ed25519_public_key_validate"></a>
+
+## Function `public_key_validate`
+
+Takes in an *unvalidated* public key and attempts to validate it.
+Returns <code>Some(<a href="ed25519.md#0x1_ed25519_ValidatedPublicKey">ValidatedPublicKey</a>)</code> if successful and <code>None</code> otherwise.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ed25519.md#0x1_ed25519_public_key_validate">public_key_validate</a>(pk: &<a href="ed25519.md#0x1_ed25519_UnvalidatedPublicKey">ed25519::UnvalidatedPublicKey</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="ed25519.md#0x1_ed25519_ValidatedPublicKey">ed25519::ValidatedPublicKey</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ed25519.md#0x1_ed25519_public_key_validate">public_key_validate</a>(pk: &<a href="ed25519.md#0x1_ed25519_UnvalidatedPublicKey">UnvalidatedPublicKey</a>): Option&lt;<a href="ed25519.md#0x1_ed25519_ValidatedPublicKey">ValidatedPublicKey</a>&gt; {
+    <a href="ed25519.md#0x1_ed25519_new_validated_public_key_from_bytes">new_validated_public_key_from_bytes</a>(pk.bytes)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ed25519_signature_verify_strict"></a>
+
+## Function `signature_verify_strict`
+
+Verifies a purported Ed25519 <code>signature</code> under an *unvalidated* <code>public_key</code> on the specified <code>message</code>.
+This call will validate the public key by checking it is NOT in the small subgroup.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ed25519.md#0x1_ed25519_signature_verify_strict">signature_verify_strict</a>(signature: &<a href="ed25519.md#0x1_ed25519_Signature">ed25519::Signature</a>, public_key: &<a href="ed25519.md#0x1_ed25519_UnvalidatedPublicKey">ed25519::UnvalidatedPublicKey</a>, message: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ed25519.md#0x1_ed25519_signature_verify_strict">signature_verify_strict</a>(
+    signature: &<a href="ed25519.md#0x1_ed25519_Signature">Signature</a>,
+    public_key: &<a href="ed25519.md#0x1_ed25519_UnvalidatedPublicKey">UnvalidatedPublicKey</a>,
+    message: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+): bool {
+    <a href="ed25519.md#0x1_ed25519_signature_verify_strict_internal">signature_verify_strict_internal</a>(signature.bytes, public_key.bytes, message)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ed25519_signature_verify_strict_t"></a>
+
+## Function `signature_verify_strict_t`
+
+This function is used to verify a signature on any BCS-serializable type T. For now, it is used to verify the
+proof of private key ownership when rotating authentication keys.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ed25519.md#0x1_ed25519_signature_verify_strict_t">signature_verify_strict_t</a>&lt;T: drop&gt;(signature: &<a href="ed25519.md#0x1_ed25519_Signature">ed25519::Signature</a>, public_key: &<a href="ed25519.md#0x1_ed25519_UnvalidatedPublicKey">ed25519::UnvalidatedPublicKey</a>, data: T): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ed25519.md#0x1_ed25519_signature_verify_strict_t">signature_verify_strict_t</a>&lt;T: drop&gt;(signature: &<a href="ed25519.md#0x1_ed25519_Signature">Signature</a>, public_key: &<a href="ed25519.md#0x1_ed25519_UnvalidatedPublicKey">UnvalidatedPublicKey</a>, data: T): bool {
+    <b>let</b> encoded = <a href="ed25519.md#0x1_ed25519_SignedMessage">SignedMessage</a> {
+        <a href="type_info.md#0x1_type_info">type_info</a>: <a href="type_info.md#0x1_type_info_type_of">type_info::type_of</a>&lt;T&gt;(),
+        inner: data,
+    };
+
+    <a href="ed25519.md#0x1_ed25519_signature_verify_strict_internal">signature_verify_strict_internal</a>(signature.bytes, public_key.bytes, <a href="../../../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs_to_bytes">bcs::to_bytes</a>(&encoded))
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ed25519_new_signed_message"></a>
+
+## Function `new_signed_message`
+
+Helper method to construct a SignedMessage struct.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ed25519.md#0x1_ed25519_new_signed_message">new_signed_message</a>&lt;T: drop&gt;(data: T): <a href="ed25519.md#0x1_ed25519_SignedMessage">ed25519::SignedMessage</a>&lt;T&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ed25519.md#0x1_ed25519_new_signed_message">new_signed_message</a>&lt;T: drop&gt;(data: T): <a href="ed25519.md#0x1_ed25519_SignedMessage">SignedMessage</a>&lt;T&gt; {
+    <a href="ed25519.md#0x1_ed25519_SignedMessage">SignedMessage</a> {
+        <a href="type_info.md#0x1_type_info">type_info</a>: <a href="type_info.md#0x1_type_info_type_of">type_info::type_of</a>&lt;T&gt;(),
+        inner: data,
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ed25519_unvalidated_public_key_to_authentication_key"></a>
+
+## Function `unvalidated_public_key_to_authentication_key`
+
+Derives the Aptos-specific authentication key of the given Ed25519 public key.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ed25519.md#0x1_ed25519_unvalidated_public_key_to_authentication_key">unvalidated_public_key_to_authentication_key</a>(pk: &<a href="ed25519.md#0x1_ed25519_UnvalidatedPublicKey">ed25519::UnvalidatedPublicKey</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ed25519.md#0x1_ed25519_unvalidated_public_key_to_authentication_key">unvalidated_public_key_to_authentication_key</a>(pk: &<a href="ed25519.md#0x1_ed25519_UnvalidatedPublicKey">UnvalidatedPublicKey</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; {
+    <a href="ed25519.md#0x1_ed25519_public_key_bytes_to_authentication_key">public_key_bytes_to_authentication_key</a>(pk.bytes)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ed25519_validated_public_key_to_authentication_key"></a>
+
+## Function `validated_public_key_to_authentication_key`
+
+Derives the Aptos-specific authentication key of the given Ed25519 public key.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ed25519.md#0x1_ed25519_validated_public_key_to_authentication_key">validated_public_key_to_authentication_key</a>(pk: &<a href="ed25519.md#0x1_ed25519_ValidatedPublicKey">ed25519::ValidatedPublicKey</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ed25519.md#0x1_ed25519_validated_public_key_to_authentication_key">validated_public_key_to_authentication_key</a>(pk: &<a href="ed25519.md#0x1_ed25519_ValidatedPublicKey">ValidatedPublicKey</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; {
+    <a href="ed25519.md#0x1_ed25519_public_key_bytes_to_authentication_key">public_key_bytes_to_authentication_key</a>(pk.bytes)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ed25519_public_key_bytes_to_authentication_key"></a>
+
+## Function `public_key_bytes_to_authentication_key`
+
+Derives the Aptos-specific authentication key of the given Ed25519 public key.
+
+
+<pre><code><b>fun</b> <a href="ed25519.md#0x1_ed25519_public_key_bytes_to_authentication_key">public_key_bytes_to_authentication_key</a>(pk_bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="ed25519.md#0x1_ed25519_public_key_bytes_to_authentication_key">public_key_bytes_to_authentication_key</a>(pk_bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; {
+    std::vector::push_back(&<b>mut</b> pk_bytes, <a href="ed25519.md#0x1_ed25519_SIGNATURE_SCHEME_ID">SIGNATURE_SCHEME_ID</a>);
+    std::hash::sha3_256(pk_bytes)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ed25519_public_key_validate_internal"></a>
+
+## Function `public_key_validate_internal`
+
+Return <code><b>true</b></code> if the bytes in <code>public_key</code> can be parsed as a valid Ed25519 public key: i.e., it passes
+points-on-curve and not-in-small-subgroup checks.
+Returns <code><b>false</b></code> otherwise.
+
+
+<pre><code><b>fun</b> <a href="ed25519.md#0x1_ed25519_public_key_validate_internal">public_key_validate_internal</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="ed25519.md#0x1_ed25519_public_key_validate_internal">public_key_validate_internal</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ed25519_signature_verify_strict_internal"></a>
+
+## Function `signature_verify_strict_internal`
+
+Return true if the Ed25519 <code>signature</code> on <code>message</code> verifies against the Ed25519 <code>public_key</code>.
+Returns <code><b>false</b></code> if either:
+- <code>signature</code> or <code><b>public</b> key</code> are of wrong sizes
+- <code>public_key</code> does not pass points-on-curve or not-in-small-subgroup checks,
+- <code>signature</code> does not pass points-on-curve or not-in-small-subgroup checks,
+- the signature on <code>message</code> does not verify.
+
+
+<pre><code><b>fun</b> <a href="ed25519.md#0x1_ed25519_signature_verify_strict_internal">signature_verify_strict_internal</a>(signature: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, public_key: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, message: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="ed25519.md#0x1_ed25519_signature_verify_strict_internal">signature_verify_strict_internal</a>(
+    signature: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    public_key: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    message: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+): bool;
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+<a id="@Specification_1_new_unvalidated_public_key_from_bytes"></a>
+
+### Function `new_unvalidated_public_key_from_bytes`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ed25519.md#0x1_ed25519_new_unvalidated_public_key_from_bytes">new_unvalidated_public_key_from_bytes</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="ed25519.md#0x1_ed25519_UnvalidatedPublicKey">ed25519::UnvalidatedPublicKey</a>
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="ed25519.md#0x1_ed25519_NewUnvalidatedPublicKeyFromBytesAbortsIf">NewUnvalidatedPublicKeyFromBytesAbortsIf</a>;
+<b>ensures</b> result == <a href="ed25519.md#0x1_ed25519_UnvalidatedPublicKey">UnvalidatedPublicKey</a> { bytes };
+</code></pre>
+
+
+
+
+<a id="0x1_ed25519_NewUnvalidatedPublicKeyFromBytesAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="ed25519.md#0x1_ed25519_NewUnvalidatedPublicKeyFromBytesAbortsIf">NewUnvalidatedPublicKeyFromBytesAbortsIf</a> {
+    bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+    <b>aborts_if</b> len(bytes) != <a href="ed25519.md#0x1_ed25519_PUBLIC_KEY_NUM_BYTES">PUBLIC_KEY_NUM_BYTES</a>;
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_new_validated_public_key_from_bytes"></a>
+
+### Function `new_validated_public_key_from_bytes`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ed25519.md#0x1_ed25519_new_validated_public_key_from_bytes">new_validated_public_key_from_bytes</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="ed25519.md#0x1_ed25519_ValidatedPublicKey">ed25519::ValidatedPublicKey</a>&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+<b>let</b> cond = <a href="ed25519.md#0x1_ed25519_spec_public_key_validate_internal">spec_public_key_validate_internal</a>(bytes);
+<b>ensures</b> cond ==&gt; result == <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_some">option::spec_some</a>(<a href="ed25519.md#0x1_ed25519_ValidatedPublicKey">ValidatedPublicKey</a>{bytes});
+<b>ensures</b> !cond ==&gt; result == <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_none">option::spec_none</a>&lt;<a href="ed25519.md#0x1_ed25519_ValidatedPublicKey">ValidatedPublicKey</a>&gt;();
+</code></pre>
+
+
+
+<a id="@Specification_1_new_signature_from_bytes"></a>
+
+### Function `new_signature_from_bytes`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ed25519.md#0x1_ed25519_new_signature_from_bytes">new_signature_from_bytes</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="ed25519.md#0x1_ed25519_Signature">ed25519::Signature</a>
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="ed25519.md#0x1_ed25519_NewSignatureFromBytesAbortsIf">NewSignatureFromBytesAbortsIf</a>;
+<b>ensures</b> result == <a href="ed25519.md#0x1_ed25519_Signature">Signature</a> { bytes };
+</code></pre>
+
+
+
+
+<a id="0x1_ed25519_NewSignatureFromBytesAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="ed25519.md#0x1_ed25519_NewSignatureFromBytesAbortsIf">NewSignatureFromBytesAbortsIf</a> {
+    bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+    <b>aborts_if</b> len(bytes) != <a href="ed25519.md#0x1_ed25519_SIGNATURE_NUM_BYTES">SIGNATURE_NUM_BYTES</a>;
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_public_key_bytes_to_authentication_key"></a>
+
+### Function `public_key_bytes_to_authentication_key`
+
+
+<pre><code><b>fun</b> <a href="ed25519.md#0x1_ed25519_public_key_bytes_to_authentication_key">public_key_bytes_to_authentication_key</a>(pk_bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> [abstract] result == <a href="ed25519.md#0x1_ed25519_spec_public_key_bytes_to_authentication_key">spec_public_key_bytes_to_authentication_key</a>(pk_bytes);
+</code></pre>
+
+
+
+<a id="@Specification_1_public_key_validate_internal"></a>
+
+### Function `public_key_validate_internal`
+
+
+<pre><code><b>fun</b> <a href="ed25519.md#0x1_ed25519_public_key_validate_internal">public_key_validate_internal</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="ed25519.md#0x1_ed25519_spec_public_key_validate_internal">spec_public_key_validate_internal</a>(bytes);
+</code></pre>
+
+
+
+<a id="@Specification_1_signature_verify_strict_internal"></a>
+
+### Function `signature_verify_strict_internal`
+
+
+<pre><code><b>fun</b> <a href="ed25519.md#0x1_ed25519_signature_verify_strict_internal">signature_verify_strict_internal</a>(signature: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, public_key: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, message: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="ed25519.md#0x1_ed25519_spec_signature_verify_strict_internal">spec_signature_verify_strict_internal</a>(signature, public_key, message);
+</code></pre>
+
+
+
+<a id="@Helper_functions_2"></a>
+
+### Helper functions
+
+
+
+<a id="0x1_ed25519_spec_signature_verify_strict_internal"></a>
+
+
+<pre><code><b>fun</b> <a href="ed25519.md#0x1_ed25519_spec_signature_verify_strict_internal">spec_signature_verify_strict_internal</a>(
+   signature: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+   public_key: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+   message: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+): bool;
+</code></pre>
+
+
+
+
+<a id="0x1_ed25519_spec_public_key_validate_internal"></a>
+
+
+<pre><code><b>fun</b> <a href="ed25519.md#0x1_ed25519_spec_public_key_validate_internal">spec_public_key_validate_internal</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool;
+</code></pre>
+
+
+
+
+<a id="0x1_ed25519_spec_public_key_bytes_to_authentication_key"></a>
+
+
+<pre><code><b>fun</b> <a href="ed25519.md#0x1_ed25519_spec_public_key_bytes_to_authentication_key">spec_public_key_bytes_to_authentication_key</a>(pk_bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+</code></pre>
+
+
+
+
+<a id="0x1_ed25519_spec_signature_verify_strict_t"></a>
+
+
+<pre><code><b>fun</b> <a href="ed25519.md#0x1_ed25519_spec_signature_verify_strict_t">spec_signature_verify_strict_t</a>&lt;T&gt;(signature: <a href="ed25519.md#0x1_ed25519_Signature">Signature</a>, public_key: <a href="ed25519.md#0x1_ed25519_UnvalidatedPublicKey">UnvalidatedPublicKey</a>, data: T): bool {
+   <b>let</b> encoded = <a href="ed25519.md#0x1_ed25519_SignedMessage">SignedMessage</a>&lt;T&gt; {
+       <a href="type_info.md#0x1_type_info">type_info</a>: <a href="type_info.md#0x1_type_info_type_of">type_info::type_of</a>&lt;T&gt;(),
+       inner: data,
+   };
+   <b>let</b> message = <a href="../../../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs_serialize">bcs::serialize</a>(encoded);
+   <a href="ed25519.md#0x1_ed25519_spec_signature_verify_strict_internal">spec_signature_verify_strict_internal</a>(signature.bytes, public_key.bytes, message)
+}
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/fixed_point64.md b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/fixed_point64.md
new file mode 100644
index 0000000000000..d455b0a8f8548
--- /dev/null
+++ b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/fixed_point64.md
@@ -0,0 +1,1333 @@
+
+<a id="0x1_fixed_point64"></a>
+
+# Module `0x1::fixed_point64`
+
+Defines a fixed-point numeric type with a 64-bit integer part and
+a 64-bit fractional part.
+
+
+-  [Struct `FixedPoint64`](#0x1_fixed_point64_FixedPoint64)
+-  [Constants](#@Constants_0)
+-  [Function `sub`](#0x1_fixed_point64_sub)
+-  [Function `add`](#0x1_fixed_point64_add)
+-  [Function `multiply_u128`](#0x1_fixed_point64_multiply_u128)
+-  [Function `divide_u128`](#0x1_fixed_point64_divide_u128)
+-  [Function `create_from_rational`](#0x1_fixed_point64_create_from_rational)
+-  [Function `create_from_raw_value`](#0x1_fixed_point64_create_from_raw_value)
+-  [Function `get_raw_value`](#0x1_fixed_point64_get_raw_value)
+-  [Function `is_zero`](#0x1_fixed_point64_is_zero)
+-  [Function `min`](#0x1_fixed_point64_min)
+-  [Function `max`](#0x1_fixed_point64_max)
+-  [Function `less_or_equal`](#0x1_fixed_point64_less_or_equal)
+-  [Function `less`](#0x1_fixed_point64_less)
+-  [Function `greater_or_equal`](#0x1_fixed_point64_greater_or_equal)
+-  [Function `greater`](#0x1_fixed_point64_greater)
+-  [Function `equal`](#0x1_fixed_point64_equal)
+-  [Function `almost_equal`](#0x1_fixed_point64_almost_equal)
+-  [Function `create_from_u128`](#0x1_fixed_point64_create_from_u128)
+-  [Function `floor`](#0x1_fixed_point64_floor)
+-  [Function `ceil`](#0x1_fixed_point64_ceil)
+-  [Function `round`](#0x1_fixed_point64_round)
+-  [Specification](#@Specification_1)
+    -  [Function `sub`](#@Specification_1_sub)
+    -  [Function `add`](#@Specification_1_add)
+    -  [Function `multiply_u128`](#@Specification_1_multiply_u128)
+    -  [Function `divide_u128`](#@Specification_1_divide_u128)
+    -  [Function `create_from_rational`](#@Specification_1_create_from_rational)
+    -  [Function `create_from_raw_value`](#@Specification_1_create_from_raw_value)
+    -  [Function `min`](#@Specification_1_min)
+    -  [Function `max`](#@Specification_1_max)
+    -  [Function `less_or_equal`](#@Specification_1_less_or_equal)
+    -  [Function `less`](#@Specification_1_less)
+    -  [Function `greater_or_equal`](#@Specification_1_greater_or_equal)
+    -  [Function `greater`](#@Specification_1_greater)
+    -  [Function `equal`](#@Specification_1_equal)
+    -  [Function `almost_equal`](#@Specification_1_almost_equal)
+    -  [Function `create_from_u128`](#@Specification_1_create_from_u128)
+    -  [Function `floor`](#@Specification_1_floor)
+    -  [Function `ceil`](#@Specification_1_ceil)
+    -  [Function `round`](#@Specification_1_round)
+
+
+<pre><code></code></pre>
+
+
+
+<a id="0x1_fixed_point64_FixedPoint64"></a>
+
+## Struct `FixedPoint64`
+
+Define a fixed-point numeric type with 64 fractional bits.
+This is just a u128 integer but it is wrapped in a struct to
+make a unique type. This is a binary representation, so decimal
+values may not be exactly representable, but it provides more
+than 9 decimal digits of precision both before and after the
+decimal point (18 digits total). For comparison, double precision
+floating-point has less than 16 decimal digits of precision, so
+be careful about using floating-point to convert these values to
+decimal.
+
+
+<pre><code><b>struct</b> <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>value: u128</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_fixed_point64_MAX_U128"></a>
+
+
+
+<pre><code><b>const</b> <a href="fixed_point64.md#0x1_fixed_point64_MAX_U128">MAX_U128</a>: u256 = 340282366920938463463374607431768211455;
+</code></pre>
+
+
+
+<a id="0x1_fixed_point64_EDENOMINATOR"></a>
+
+The denominator provided was zero
+
+
+<pre><code><b>const</b> <a href="fixed_point64.md#0x1_fixed_point64_EDENOMINATOR">EDENOMINATOR</a>: u64 = 65537;
+</code></pre>
+
+
+
+<a id="0x1_fixed_point64_EDIVISION"></a>
+
+The quotient value would be too large to be held in a <code>u128</code>
+
+
+<pre><code><b>const</b> <a href="fixed_point64.md#0x1_fixed_point64_EDIVISION">EDIVISION</a>: u64 = 131074;
+</code></pre>
+
+
+
+<a id="0x1_fixed_point64_EDIVISION_BY_ZERO"></a>
+
+A division by zero was encountered
+
+
+<pre><code><b>const</b> <a href="fixed_point64.md#0x1_fixed_point64_EDIVISION_BY_ZERO">EDIVISION_BY_ZERO</a>: u64 = 65540;
+</code></pre>
+
+
+
+<a id="0x1_fixed_point64_EMULTIPLICATION"></a>
+
+The multiplied value would be too large to be held in a <code>u128</code>
+
+
+<pre><code><b>const</b> <a href="fixed_point64.md#0x1_fixed_point64_EMULTIPLICATION">EMULTIPLICATION</a>: u64 = 131075;
+</code></pre>
+
+
+
+<a id="0x1_fixed_point64_ENEGATIVE_RESULT"></a>
+
+Abort code on calculation result is negative.
+
+
+<pre><code><b>const</b> <a href="fixed_point64.md#0x1_fixed_point64_ENEGATIVE_RESULT">ENEGATIVE_RESULT</a>: u64 = 65542;
+</code></pre>
+
+
+
+<a id="0x1_fixed_point64_ERATIO_OUT_OF_RANGE"></a>
+
+The computed ratio when converting to a <code><a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a></code> would be unrepresentable
+
+
+<pre><code><b>const</b> <a href="fixed_point64.md#0x1_fixed_point64_ERATIO_OUT_OF_RANGE">ERATIO_OUT_OF_RANGE</a>: u64 = 131077;
+</code></pre>
+
+
+
+<a id="0x1_fixed_point64_sub"></a>
+
+## Function `sub`
+
+Returns x - y. x must be not less than y.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_sub">sub</a>(x: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>, y: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>): <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_sub">sub</a>(x: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a>, y: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a>): <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a> {
+    <b>let</b> x_raw = <a href="fixed_point64.md#0x1_fixed_point64_get_raw_value">get_raw_value</a>(x);
+    <b>let</b> y_raw = <a href="fixed_point64.md#0x1_fixed_point64_get_raw_value">get_raw_value</a>(y);
+    <b>assert</b>!(x_raw &gt;= y_raw, <a href="fixed_point64.md#0x1_fixed_point64_ENEGATIVE_RESULT">ENEGATIVE_RESULT</a>);
+    <a href="fixed_point64.md#0x1_fixed_point64_create_from_raw_value">create_from_raw_value</a>(x_raw - y_raw)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fixed_point64_add"></a>
+
+## Function `add`
+
+Returns x + y. The result cannot be greater than MAX_U128.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_add">add</a>(x: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>, y: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>): <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_add">add</a>(x: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a>, y: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a>): <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a> {
+    <b>let</b> x_raw = <a href="fixed_point64.md#0x1_fixed_point64_get_raw_value">get_raw_value</a>(x);
+    <b>let</b> y_raw = <a href="fixed_point64.md#0x1_fixed_point64_get_raw_value">get_raw_value</a>(y);
+    <b>let</b> result = (x_raw <b>as</b> u256) + (y_raw <b>as</b> u256);
+    <b>assert</b>!(result &lt;= <a href="fixed_point64.md#0x1_fixed_point64_MAX_U128">MAX_U128</a>, <a href="fixed_point64.md#0x1_fixed_point64_ERATIO_OUT_OF_RANGE">ERATIO_OUT_OF_RANGE</a>);
+    <a href="fixed_point64.md#0x1_fixed_point64_create_from_raw_value">create_from_raw_value</a>((result <b>as</b> u128))
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fixed_point64_multiply_u128"></a>
+
+## Function `multiply_u128`
+
+Multiply a u128 integer by a fixed-point number, truncating any
+fractional part of the product. This will abort if the product
+overflows.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_multiply_u128">multiply_u128</a>(val: u128, multiplier: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>): u128
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_multiply_u128">multiply_u128</a>(val: u128, multiplier: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a>): u128 {
+    // The product of two 128 bit values <b>has</b> 256 bits, so perform the
+    // multiplication <b>with</b> u256 types and keep the full 256 bit product
+    // <b>to</b> avoid losing accuracy.
+    <b>let</b> unscaled_product = (val <b>as</b> u256) * (multiplier.value <b>as</b> u256);
+    // The unscaled product <b>has</b> 64 fractional bits (from the multiplier)
+    // so rescale it by shifting away the low bits.
+    <b>let</b> product = unscaled_product &gt;&gt; 64;
+    // Check whether the value is too large.
+    <b>assert</b>!(product &lt;= <a href="fixed_point64.md#0x1_fixed_point64_MAX_U128">MAX_U128</a>, <a href="fixed_point64.md#0x1_fixed_point64_EMULTIPLICATION">EMULTIPLICATION</a>);
+    (product <b>as</b> u128)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fixed_point64_divide_u128"></a>
+
+## Function `divide_u128`
+
+Divide a u128 integer by a fixed-point number, truncating any
+fractional part of the quotient. This will abort if the divisor
+is zero or if the quotient overflows.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_divide_u128">divide_u128</a>(val: u128, divisor: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>): u128
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_divide_u128">divide_u128</a>(val: u128, divisor: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a>): u128 {
+    // Check for division by zero.
+    <b>assert</b>!(divisor.value != 0, <a href="fixed_point64.md#0x1_fixed_point64_EDIVISION_BY_ZERO">EDIVISION_BY_ZERO</a>);
+    // First convert <b>to</b> 256 bits and then shift left <b>to</b>
+    // add 64 fractional zero bits <b>to</b> the dividend.
+    <b>let</b> scaled_value = (val <b>as</b> u256) &lt;&lt; 64;
+    <b>let</b> quotient = scaled_value / (divisor.value <b>as</b> u256);
+    // Check whether the value is too large.
+    <b>assert</b>!(quotient &lt;= <a href="fixed_point64.md#0x1_fixed_point64_MAX_U128">MAX_U128</a>, <a href="fixed_point64.md#0x1_fixed_point64_EDIVISION">EDIVISION</a>);
+    // the value may be too large, which will cause the cast <b>to</b> fail
+    // <b>with</b> an arithmetic <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">error</a>.
+    (quotient <b>as</b> u128)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fixed_point64_create_from_rational"></a>
+
+## Function `create_from_rational`
+
+Create a fixed-point value from a rational number specified by its
+numerator and denominator. Calling this function should be preferred
+for using <code><a href="fixed_point64.md#0x1_fixed_point64_create_from_raw_value">Self::create_from_raw_value</a></code> which is also available.
+This will abort if the denominator is zero. It will also
+abort if the numerator is nonzero and the ratio is not in the range
+2^-64 .. 2^64-1. When specifying decimal fractions, be careful about
+rounding errors: if you round to display N digits after the decimal
+point, you can use a denominator of 10^N to avoid numbers where the
+very small imprecision in the binary representation could change the
+rounding, e.g., 0.0125 will round down to 0.012 instead of up to 0.013.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_create_from_rational">create_from_rational</a>(numerator: u128, denominator: u128): <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_create_from_rational">create_from_rational</a>(numerator: u128, denominator: u128): <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a> {
+    // If the denominator is zero, this will <b>abort</b>.
+    // Scale the numerator <b>to</b> have 64 fractional bits, so that the quotient will have 64
+    // fractional bits.
+    <b>let</b> scaled_numerator = (numerator <b>as</b> u256) &lt;&lt; 64;
+    <b>assert</b>!(denominator != 0, <a href="fixed_point64.md#0x1_fixed_point64_EDENOMINATOR">EDENOMINATOR</a>);
+    <b>let</b> quotient = scaled_numerator / (denominator <b>as</b> u256);
+    <b>assert</b>!(quotient != 0 || numerator == 0, <a href="fixed_point64.md#0x1_fixed_point64_ERATIO_OUT_OF_RANGE">ERATIO_OUT_OF_RANGE</a>);
+    // Return the quotient <b>as</b> a fixed-point number. We first need <b>to</b> check whether the cast
+    // can succeed.
+    <b>assert</b>!(quotient &lt;= <a href="fixed_point64.md#0x1_fixed_point64_MAX_U128">MAX_U128</a>, <a href="fixed_point64.md#0x1_fixed_point64_ERATIO_OUT_OF_RANGE">ERATIO_OUT_OF_RANGE</a>);
+    <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a> { value: (quotient <b>as</b> u128) }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fixed_point64_create_from_raw_value"></a>
+
+## Function `create_from_raw_value`
+
+Create a fixedpoint value from a raw value.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_create_from_raw_value">create_from_raw_value</a>(value: u128): <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_create_from_raw_value">create_from_raw_value</a>(value: u128): <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a> {
+    <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a> { value }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fixed_point64_get_raw_value"></a>
+
+## Function `get_raw_value`
+
+Accessor for the raw u128 value. Other less common operations, such as
+adding or subtracting FixedPoint64 values, can be done using the raw
+values directly.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_get_raw_value">get_raw_value</a>(num: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>): u128
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_get_raw_value">get_raw_value</a>(num: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a>): u128 {
+    num.value
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fixed_point64_is_zero"></a>
+
+## Function `is_zero`
+
+Returns true if the ratio is zero.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_is_zero">is_zero</a>(num: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_is_zero">is_zero</a>(num: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a>): bool {
+    num.value == 0
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fixed_point64_min"></a>
+
+## Function `min`
+
+Returns the smaller of the two FixedPoint64 numbers.
+
+
+<pre><code><b>public</b> <b>fun</b> <b>min</b>(num1: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>, num2: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>): <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <b>min</b>(num1: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a>, num2: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a>): <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a> {
+    <b>if</b> (num1.value &lt; num2.value) {
+        num1
+    } <b>else</b> {
+        num2
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fixed_point64_max"></a>
+
+## Function `max`
+
+Returns the larger of the two FixedPoint64 numbers.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_max">max</a>(num1: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>, num2: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>): <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_max">max</a>(num1: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a>, num2: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a>): <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a> {
+    <b>if</b> (num1.value &gt; num2.value) {
+        num1
+    } <b>else</b> {
+        num2
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fixed_point64_less_or_equal"></a>
+
+## Function `less_or_equal`
+
+Returns true if num1 <= num2
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_less_or_equal">less_or_equal</a>(num1: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>, num2: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_less_or_equal">less_or_equal</a>(num1: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a>, num2: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a>): bool {
+    num1.value &lt;= num2.value
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fixed_point64_less"></a>
+
+## Function `less`
+
+Returns true if num1 < num2
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_less">less</a>(num1: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>, num2: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_less">less</a>(num1: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a>, num2: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a>): bool {
+    num1.value &lt; num2.value
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fixed_point64_greater_or_equal"></a>
+
+## Function `greater_or_equal`
+
+Returns true if num1 >= num2
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_greater_or_equal">greater_or_equal</a>(num1: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>, num2: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_greater_or_equal">greater_or_equal</a>(num1: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a>, num2: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a>): bool {
+    num1.value &gt;= num2.value
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fixed_point64_greater"></a>
+
+## Function `greater`
+
+Returns true if num1 > num2
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_greater">greater</a>(num1: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>, num2: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_greater">greater</a>(num1: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a>, num2: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a>): bool {
+    num1.value &gt; num2.value
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fixed_point64_equal"></a>
+
+## Function `equal`
+
+Returns true if num1 = num2
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_equal">equal</a>(num1: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>, num2: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_equal">equal</a>(num1: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a>, num2: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a>): bool {
+    num1.value == num2.value
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fixed_point64_almost_equal"></a>
+
+## Function `almost_equal`
+
+Returns true if num1 almost equals to num2, which means abs(num1-num2) <= precision
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_almost_equal">almost_equal</a>(num1: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>, num2: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>, precision: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_almost_equal">almost_equal</a>(num1: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a>, num2: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a>, precision: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a>): bool {
+    <b>if</b> (num1.value &gt; num2.value) {
+        (num1.value - num2.value &lt;= precision.value)
+    } <b>else</b> {
+        (num2.value - num1.value &lt;= precision.value)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fixed_point64_create_from_u128"></a>
+
+## Function `create_from_u128`
+
+Create a fixedpoint value from a u128 value.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_create_from_u128">create_from_u128</a>(val: u128): <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_create_from_u128">create_from_u128</a>(val: u128): <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a> {
+    <b>let</b> value = (val <b>as</b> u256) &lt;&lt; 64;
+    <b>assert</b>!(value &lt;= <a href="fixed_point64.md#0x1_fixed_point64_MAX_U128">MAX_U128</a>, <a href="fixed_point64.md#0x1_fixed_point64_ERATIO_OUT_OF_RANGE">ERATIO_OUT_OF_RANGE</a>);
+    <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a> {value: (value <b>as</b> u128)}
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fixed_point64_floor"></a>
+
+## Function `floor`
+
+Returns the largest integer less than or equal to a given number.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_floor">floor</a>(num: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>): u128
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_floor">floor</a>(num: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a>): u128 {
+    num.value &gt;&gt; 64
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fixed_point64_ceil"></a>
+
+## Function `ceil`
+
+Rounds up the given FixedPoint64 to the next largest integer.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_ceil">ceil</a>(num: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>): u128
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_ceil">ceil</a>(num: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a>): u128 {
+    <b>let</b> floored_num = <a href="fixed_point64.md#0x1_fixed_point64_floor">floor</a>(num) &lt;&lt; 64;
+    <b>if</b> (num.value == floored_num) {
+        <b>return</b> floored_num &gt;&gt; 64
+    };
+    <b>let</b> val = ((floored_num <b>as</b> u256) + (1 &lt;&lt; 64));
+    (val &gt;&gt; 64 <b>as</b> u128)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fixed_point64_round"></a>
+
+## Function `round`
+
+Returns the value of a FixedPoint64 to the nearest integer.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_round">round</a>(num: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>): u128
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_round">round</a>(num: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a>): u128 {
+    <b>let</b> floored_num = <a href="fixed_point64.md#0x1_fixed_point64_floor">floor</a>(num) &lt;&lt; 64;
+    <b>let</b> boundary = floored_num + ((1 &lt;&lt; 64) / 2);
+    <b>if</b> (num.value &lt; boundary) {
+        floored_num &gt;&gt; 64
+    } <b>else</b> {
+        <a href="fixed_point64.md#0x1_fixed_point64_ceil">ceil</a>(num)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+
+
+<pre><code><b>pragma</b> aborts_if_is_strict;
+</code></pre>
+
+
+
+<a id="@Specification_1_sub"></a>
+
+### Function `sub`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_sub">sub</a>(x: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>, y: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>): <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> x.value &lt; y.value <b>with</b> <a href="fixed_point64.md#0x1_fixed_point64_ENEGATIVE_RESULT">ENEGATIVE_RESULT</a>;
+<b>ensures</b> result.value == x.value - y.value;
+</code></pre>
+
+
+
+<a id="@Specification_1_add"></a>
+
+### Function `add`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_add">add</a>(x: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>, y: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>): <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> (x.value <b>as</b> u256) + (y.value <b>as</b> u256) &gt; <a href="fixed_point64.md#0x1_fixed_point64_MAX_U128">MAX_U128</a> <b>with</b> <a href="fixed_point64.md#0x1_fixed_point64_ERATIO_OUT_OF_RANGE">ERATIO_OUT_OF_RANGE</a>;
+<b>ensures</b> result.value == x.value + y.value;
+</code></pre>
+
+
+
+<a id="@Specification_1_multiply_u128"></a>
+
+### Function `multiply_u128`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_multiply_u128">multiply_u128</a>(val: u128, multiplier: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>): u128
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>include</b> <a href="fixed_point64.md#0x1_fixed_point64_MultiplyAbortsIf">MultiplyAbortsIf</a>;
+<b>ensures</b> result == <a href="fixed_point64.md#0x1_fixed_point64_spec_multiply_u128">spec_multiply_u128</a>(val, multiplier);
+</code></pre>
+
+
+
+
+<a id="0x1_fixed_point64_MultiplyAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="fixed_point64.md#0x1_fixed_point64_MultiplyAbortsIf">MultiplyAbortsIf</a> {
+    val: num;
+    multiplier: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a>;
+    <b>aborts_if</b> <a href="fixed_point64.md#0x1_fixed_point64_spec_multiply_u128">spec_multiply_u128</a>(val, multiplier) &gt; <a href="fixed_point64.md#0x1_fixed_point64_MAX_U128">MAX_U128</a> <b>with</b> <a href="fixed_point64.md#0x1_fixed_point64_EMULTIPLICATION">EMULTIPLICATION</a>;
+}
+</code></pre>
+
+
+
+
+<a id="0x1_fixed_point64_spec_multiply_u128"></a>
+
+
+<pre><code><b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_spec_multiply_u128">spec_multiply_u128</a>(val: num, multiplier: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a>): num {
+   (val * multiplier.value) &gt;&gt; 64
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_divide_u128"></a>
+
+### Function `divide_u128`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_divide_u128">divide_u128</a>(val: u128, divisor: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>): u128
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>include</b> <a href="fixed_point64.md#0x1_fixed_point64_DivideAbortsIf">DivideAbortsIf</a>;
+<b>ensures</b> result == <a href="fixed_point64.md#0x1_fixed_point64_spec_divide_u128">spec_divide_u128</a>(val, divisor);
+</code></pre>
+
+
+
+
+<a id="0x1_fixed_point64_DivideAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="fixed_point64.md#0x1_fixed_point64_DivideAbortsIf">DivideAbortsIf</a> {
+    val: num;
+    divisor: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a>;
+    <b>aborts_if</b> divisor.value == 0 <b>with</b> <a href="fixed_point64.md#0x1_fixed_point64_EDIVISION_BY_ZERO">EDIVISION_BY_ZERO</a>;
+    <b>aborts_if</b> <a href="fixed_point64.md#0x1_fixed_point64_spec_divide_u128">spec_divide_u128</a>(val, divisor) &gt; <a href="fixed_point64.md#0x1_fixed_point64_MAX_U128">MAX_U128</a> <b>with</b> <a href="fixed_point64.md#0x1_fixed_point64_EDIVISION">EDIVISION</a>;
+}
+</code></pre>
+
+
+
+
+<a id="0x1_fixed_point64_spec_divide_u128"></a>
+
+
+<pre><code><b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_spec_divide_u128">spec_divide_u128</a>(val: num, divisor: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a>): num {
+   (val &lt;&lt; 64) / divisor.value
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_create_from_rational"></a>
+
+### Function `create_from_rational`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_create_from_rational">create_from_rational</a>(numerator: u128, denominator: u128): <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>pragma</b> verify_duration_estimate = 1000;
+<b>include</b> <a href="fixed_point64.md#0x1_fixed_point64_CreateFromRationalAbortsIf">CreateFromRationalAbortsIf</a>;
+<b>ensures</b> result == <a href="fixed_point64.md#0x1_fixed_point64_spec_create_from_rational">spec_create_from_rational</a>(numerator, denominator);
+</code></pre>
+
+
+
+
+<a id="0x1_fixed_point64_CreateFromRationalAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="fixed_point64.md#0x1_fixed_point64_CreateFromRationalAbortsIf">CreateFromRationalAbortsIf</a> {
+    numerator: u128;
+    denominator: u128;
+    <b>let</b> scaled_numerator = (numerator <b>as</b> u256)&lt;&lt; 64;
+    <b>let</b> scaled_denominator = (denominator <b>as</b> u256);
+    <b>let</b> quotient = scaled_numerator / scaled_denominator;
+    <b>aborts_if</b> scaled_denominator == 0 <b>with</b> <a href="fixed_point64.md#0x1_fixed_point64_EDENOMINATOR">EDENOMINATOR</a>;
+    <b>aborts_if</b> quotient == 0 && scaled_numerator != 0 <b>with</b> <a href="fixed_point64.md#0x1_fixed_point64_ERATIO_OUT_OF_RANGE">ERATIO_OUT_OF_RANGE</a>;
+    <b>aborts_if</b> quotient &gt; <a href="fixed_point64.md#0x1_fixed_point64_MAX_U128">MAX_U128</a> <b>with</b> <a href="fixed_point64.md#0x1_fixed_point64_ERATIO_OUT_OF_RANGE">ERATIO_OUT_OF_RANGE</a>;
+}
+</code></pre>
+
+
+
+
+<a id="0x1_fixed_point64_spec_create_from_rational"></a>
+
+
+<pre><code><b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_spec_create_from_rational">spec_create_from_rational</a>(numerator: num, denominator: num): <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a> {
+   <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a>{value: (numerator &lt;&lt; 128) / (denominator &lt;&lt; 64)}
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_create_from_raw_value"></a>
+
+### Function `create_from_raw_value`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_create_from_raw_value">create_from_raw_value</a>(value: u128): <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result.value == value;
+</code></pre>
+
+
+
+<a id="@Specification_1_min"></a>
+
+### Function `min`
+
+
+<pre><code><b>public</b> <b>fun</b> <b>min</b>(num1: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>, num2: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>): <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="fixed_point64.md#0x1_fixed_point64_spec_min">spec_min</a>(num1, num2);
+</code></pre>
+
+
+
+
+<a id="0x1_fixed_point64_spec_min"></a>
+
+
+<pre><code><b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_spec_min">spec_min</a>(num1: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a>, num2: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a>): <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a> {
+   <b>if</b> (num1.value &lt; num2.value) {
+       num1
+   } <b>else</b> {
+       num2
+   }
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_max"></a>
+
+### Function `max`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_max">max</a>(num1: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>, num2: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>): <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="fixed_point64.md#0x1_fixed_point64_spec_max">spec_max</a>(num1, num2);
+</code></pre>
+
+
+
+
+<a id="0x1_fixed_point64_spec_max"></a>
+
+
+<pre><code><b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_spec_max">spec_max</a>(num1: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a>, num2: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a>): <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a> {
+   <b>if</b> (num1.value &gt; num2.value) {
+       num1
+   } <b>else</b> {
+       num2
+   }
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_less_or_equal"></a>
+
+### Function `less_or_equal`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_less_or_equal">less_or_equal</a>(num1: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>, num2: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>): bool
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="fixed_point64.md#0x1_fixed_point64_spec_less_or_equal">spec_less_or_equal</a>(num1, num2);
+</code></pre>
+
+
+
+
+<a id="0x1_fixed_point64_spec_less_or_equal"></a>
+
+
+<pre><code><b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_spec_less_or_equal">spec_less_or_equal</a>(num1: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a>, num2: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a>): bool {
+   num1.value &lt;= num2.value
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_less"></a>
+
+### Function `less`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_less">less</a>(num1: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>, num2: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>): bool
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="fixed_point64.md#0x1_fixed_point64_spec_less">spec_less</a>(num1, num2);
+</code></pre>
+
+
+
+
+<a id="0x1_fixed_point64_spec_less"></a>
+
+
+<pre><code><b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_spec_less">spec_less</a>(num1: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a>, num2: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a>): bool {
+   num1.value &lt; num2.value
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_greater_or_equal"></a>
+
+### Function `greater_or_equal`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_greater_or_equal">greater_or_equal</a>(num1: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>, num2: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>): bool
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="fixed_point64.md#0x1_fixed_point64_spec_greater_or_equal">spec_greater_or_equal</a>(num1, num2);
+</code></pre>
+
+
+
+
+<a id="0x1_fixed_point64_spec_greater_or_equal"></a>
+
+
+<pre><code><b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_spec_greater_or_equal">spec_greater_or_equal</a>(num1: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a>, num2: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a>): bool {
+   num1.value &gt;= num2.value
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_greater"></a>
+
+### Function `greater`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_greater">greater</a>(num1: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>, num2: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>): bool
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="fixed_point64.md#0x1_fixed_point64_spec_greater">spec_greater</a>(num1, num2);
+</code></pre>
+
+
+
+
+<a id="0x1_fixed_point64_spec_greater"></a>
+
+
+<pre><code><b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_spec_greater">spec_greater</a>(num1: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a>, num2: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a>): bool {
+   num1.value &gt; num2.value
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_equal"></a>
+
+### Function `equal`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_equal">equal</a>(num1: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>, num2: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>): bool
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="fixed_point64.md#0x1_fixed_point64_spec_equal">spec_equal</a>(num1, num2);
+</code></pre>
+
+
+
+
+<a id="0x1_fixed_point64_spec_equal"></a>
+
+
+<pre><code><b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_spec_equal">spec_equal</a>(num1: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a>, num2: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a>): bool {
+   num1.value == num2.value
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_almost_equal"></a>
+
+### Function `almost_equal`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_almost_equal">almost_equal</a>(num1: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>, num2: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>, precision: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>): bool
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="fixed_point64.md#0x1_fixed_point64_spec_almost_equal">spec_almost_equal</a>(num1, num2, precision);
+</code></pre>
+
+
+
+
+<a id="0x1_fixed_point64_spec_almost_equal"></a>
+
+
+<pre><code><b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_spec_almost_equal">spec_almost_equal</a>(num1: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a>, num2: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a>, precision: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a>): bool {
+   <b>if</b> (num1.value &gt; num2.value) {
+       (num1.value - num2.value &lt;= precision.value)
+   } <b>else</b> {
+       (num2.value - num1.value &lt;= precision.value)
+   }
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_create_from_u128"></a>
+
+### Function `create_from_u128`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_create_from_u128">create_from_u128</a>(val: u128): <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>include</b> <a href="fixed_point64.md#0x1_fixed_point64_CreateFromU64AbortsIf">CreateFromU64AbortsIf</a>;
+<b>ensures</b> result == <a href="fixed_point64.md#0x1_fixed_point64_spec_create_from_u128">spec_create_from_u128</a>(val);
+</code></pre>
+
+
+
+
+<a id="0x1_fixed_point64_CreateFromU64AbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="fixed_point64.md#0x1_fixed_point64_CreateFromU64AbortsIf">CreateFromU64AbortsIf</a> {
+    val: num;
+    <b>let</b> scaled_value = (val <b>as</b> u256) &lt;&lt; 64;
+    <b>aborts_if</b> scaled_value &gt; <a href="fixed_point64.md#0x1_fixed_point64_MAX_U128">MAX_U128</a>;
+}
+</code></pre>
+
+
+
+
+<a id="0x1_fixed_point64_spec_create_from_u128"></a>
+
+
+<pre><code><b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_spec_create_from_u128">spec_create_from_u128</a>(val: num): <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a> {
+   <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a> {value: val &lt;&lt; 64}
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_floor"></a>
+
+### Function `floor`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_floor">floor</a>(num: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>): u128
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="fixed_point64.md#0x1_fixed_point64_spec_floor">spec_floor</a>(num);
+</code></pre>
+
+
+
+
+<a id="0x1_fixed_point64_spec_floor"></a>
+
+
+<pre><code><b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_spec_floor">spec_floor</a>(val: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a>): u128 {
+   <b>let</b> fractional = val.value % (1 &lt;&lt; 64);
+   <b>if</b> (fractional == 0) {
+       val.value &gt;&gt; 64
+   } <b>else</b> {
+       (val.value - fractional) &gt;&gt; 64
+   }
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_ceil"></a>
+
+### Function `ceil`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_ceil">ceil</a>(num: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>): u128
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify_duration_estimate = 1000;
+<b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="fixed_point64.md#0x1_fixed_point64_spec_ceil">spec_ceil</a>(num);
+</code></pre>
+
+
+
+
+<a id="0x1_fixed_point64_spec_ceil"></a>
+
+
+<pre><code><b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_spec_ceil">spec_ceil</a>(val: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a>): u128 {
+   <b>let</b> fractional = val.value % (1 &lt;&lt; 64);
+   <b>let</b> one = 1 &lt;&lt; 64;
+   <b>if</b> (fractional == 0) {
+       val.value &gt;&gt; 64
+   } <b>else</b> {
+       (val.value - fractional + one) &gt;&gt; 64
+   }
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_round"></a>
+
+### Function `round`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_round">round</a>(num: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>): u128
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="fixed_point64.md#0x1_fixed_point64_spec_round">spec_round</a>(num);
+</code></pre>
+
+
+
+
+<a id="0x1_fixed_point64_spec_round"></a>
+
+
+<pre><code><b>fun</b> <a href="fixed_point64.md#0x1_fixed_point64_spec_round">spec_round</a>(val: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">FixedPoint64</a>): u128 {
+   <b>let</b> fractional = val.value % (1 &lt;&lt; 64);
+   <b>let</b> boundary = (1 &lt;&lt; 64) / 2;
+   <b>let</b> one = 1 &lt;&lt; 64;
+   <b>if</b> (fractional &lt; boundary) {
+       (val.value - fractional) &gt;&gt; 64
+   } <b>else</b> {
+       (val.value - fractional + one) &gt;&gt; 64
+   }
+}
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/from_bcs.md b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/from_bcs.md
new file mode 100644
index 0000000000000..5838c78fdd758
--- /dev/null
+++ b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/from_bcs.md
@@ -0,0 +1,363 @@
+
+<a id="0x1_from_bcs"></a>
+
+# Module `0x1::from_bcs`
+
+This module provides a number of functions to convert _primitive_ types from their representation in <code>std::bcs</code>
+to values. This is the opposite of <code><a href="../../../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs_to_bytes">bcs::to_bytes</a></code>. Note that it is not safe to define a generic public <code>from_bytes</code>
+function because this can violate implicit struct invariants, therefore only primitive types are offerred. If
+a general conversion back-and-force is needed, consider the <code>aptos_std::Any</code> type which preserves invariants.
+
+Example:
+```
+use std::bcs;
+use aptos_std::from_bcs;
+
+assert!(from_bcs::to_address(bcs::to_bytes(&@0xabcdef)) == @0xabcdef, 0);
+```
+
+
+-  [Constants](#@Constants_0)
+-  [Function `to_bool`](#0x1_from_bcs_to_bool)
+-  [Function `to_u8`](#0x1_from_bcs_to_u8)
+-  [Function `to_u16`](#0x1_from_bcs_to_u16)
+-  [Function `to_u32`](#0x1_from_bcs_to_u32)
+-  [Function `to_u64`](#0x1_from_bcs_to_u64)
+-  [Function `to_u128`](#0x1_from_bcs_to_u128)
+-  [Function `to_u256`](#0x1_from_bcs_to_u256)
+-  [Function `to_address`](#0x1_from_bcs_to_address)
+-  [Function `to_bytes`](#0x1_from_bcs_to_bytes)
+-  [Function `to_string`](#0x1_from_bcs_to_string)
+-  [Function `from_bytes`](#0x1_from_bcs_from_bytes)
+-  [Specification](#@Specification_1)
+    -  [Function `from_bytes`](#@Specification_1_from_bytes)
+
+
+<pre><code><b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string">0x1::string</a>;
+</code></pre>
+
+
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_from_bcs_EINVALID_UTF8"></a>
+
+UTF8 check failed in conversion from bytes to string
+
+
+<pre><code><b>const</b> <a href="from_bcs.md#0x1_from_bcs_EINVALID_UTF8">EINVALID_UTF8</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_from_bcs_to_bool"></a>
+
+## Function `to_bool`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="from_bcs.md#0x1_from_bcs_to_bool">to_bool</a>(v: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="from_bcs.md#0x1_from_bcs_to_bool">to_bool</a>(v: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool {
+    <a href="from_bcs.md#0x1_from_bcs_from_bytes">from_bytes</a>&lt;bool&gt;(v)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_from_bcs_to_u8"></a>
+
+## Function `to_u8`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="from_bcs.md#0x1_from_bcs_to_u8">to_u8</a>(v: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): u8
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="from_bcs.md#0x1_from_bcs_to_u8">to_u8</a>(v: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): u8 {
+    <a href="from_bcs.md#0x1_from_bcs_from_bytes">from_bytes</a>&lt;u8&gt;(v)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_from_bcs_to_u16"></a>
+
+## Function `to_u16`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="from_bcs.md#0x1_from_bcs_to_u16">to_u16</a>(v: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): u16
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="from_bcs.md#0x1_from_bcs_to_u16">to_u16</a>(v: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): u16 {
+    <a href="from_bcs.md#0x1_from_bcs_from_bytes">from_bytes</a>&lt;u16&gt;(v)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_from_bcs_to_u32"></a>
+
+## Function `to_u32`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="from_bcs.md#0x1_from_bcs_to_u32">to_u32</a>(v: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): u32
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="from_bcs.md#0x1_from_bcs_to_u32">to_u32</a>(v: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): u32 {
+    <a href="from_bcs.md#0x1_from_bcs_from_bytes">from_bytes</a>&lt;u32&gt;(v)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_from_bcs_to_u64"></a>
+
+## Function `to_u64`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="from_bcs.md#0x1_from_bcs_to_u64">to_u64</a>(v: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="from_bcs.md#0x1_from_bcs_to_u64">to_u64</a>(v: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): u64 {
+    <a href="from_bcs.md#0x1_from_bcs_from_bytes">from_bytes</a>&lt;u64&gt;(v)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_from_bcs_to_u128"></a>
+
+## Function `to_u128`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="from_bcs.md#0x1_from_bcs_to_u128">to_u128</a>(v: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): u128
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="from_bcs.md#0x1_from_bcs_to_u128">to_u128</a>(v: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): u128 {
+    <a href="from_bcs.md#0x1_from_bcs_from_bytes">from_bytes</a>&lt;u128&gt;(v)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_from_bcs_to_u256"></a>
+
+## Function `to_u256`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="from_bcs.md#0x1_from_bcs_to_u256">to_u256</a>(v: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): u256
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="from_bcs.md#0x1_from_bcs_to_u256">to_u256</a>(v: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): u256 {
+    <a href="from_bcs.md#0x1_from_bcs_from_bytes">from_bytes</a>&lt;u256&gt;(v)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_from_bcs_to_address"></a>
+
+## Function `to_address`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="from_bcs.md#0x1_from_bcs_to_address">to_address</a>(v: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="from_bcs.md#0x1_from_bcs_to_address">to_address</a>(v: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <b>address</b> {
+    <a href="from_bcs.md#0x1_from_bcs_from_bytes">from_bytes</a>&lt;<b>address</b>&gt;(v)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_from_bcs_to_bytes"></a>
+
+## Function `to_bytes`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="from_bcs.md#0x1_from_bcs_to_bytes">to_bytes</a>(v: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="from_bcs.md#0x1_from_bcs_to_bytes">to_bytes</a>(v: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; {
+    <a href="from_bcs.md#0x1_from_bcs_from_bytes">from_bytes</a>&lt;<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;(v)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_from_bcs_to_string"></a>
+
+## Function `to_string`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="from_bcs.md#0x1_from_bcs_to_string">to_string</a>(v: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="from_bcs.md#0x1_from_bcs_to_string">to_string</a>(v: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): String {
+    // To make this safe, we need <b>to</b> evaluate the utf8 <b>invariant</b>.
+    <b>let</b> s = <a href="from_bcs.md#0x1_from_bcs_from_bytes">from_bytes</a>&lt;String&gt;(v);
+    <b>assert</b>!(<a href="../../../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_internal_check_utf8">string::internal_check_utf8</a>(<a href="../../../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_bytes">string::bytes</a>(&s)), <a href="from_bcs.md#0x1_from_bcs_EINVALID_UTF8">EINVALID_UTF8</a>);
+    s
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_from_bcs_from_bytes"></a>
+
+## Function `from_bytes`
+
+Package private native function to deserialize a type T.
+
+Note that this function does not put any constraint on <code>T</code>. If code uses this function to
+deserialize a linear value, its their responsibility that the data they deserialize is
+owned.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="from_bcs.md#0x1_from_bcs_from_bytes">from_bytes</a>&lt;T&gt;(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): T
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>native</b> <b>fun</b> <a href="from_bcs.md#0x1_from_bcs_from_bytes">from_bytes</a>&lt;T&gt;(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): T;
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+
+<a id="0x1_from_bcs_deserialize"></a>
+
+
+<pre><code><b>fun</b> <a href="from_bcs.md#0x1_from_bcs_deserialize">deserialize</a>&lt;T&gt;(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): T;
+<a id="0x1_from_bcs_deserializable"></a>
+<b>fun</b> <a href="from_bcs.md#0x1_from_bcs_deserializable">deserializable</a>&lt;T&gt;(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool;
+<b>axiom</b>&lt;T&gt; <b>forall</b> b1: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, b2: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;:
+    ( b1 == b2 ==&gt; <a href="from_bcs.md#0x1_from_bcs_deserializable">deserializable</a>&lt;T&gt;(b1) == <a href="from_bcs.md#0x1_from_bcs_deserializable">deserializable</a>&lt;T&gt;(b2) );
+<b>axiom</b>&lt;T&gt; <b>forall</b> b1: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, b2: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;:
+    ( b1 == b2 ==&gt; <a href="from_bcs.md#0x1_from_bcs_deserialize">deserialize</a>&lt;T&gt;(b1) == <a href="from_bcs.md#0x1_from_bcs_deserialize">deserialize</a>&lt;T&gt;(b2) );
+</code></pre>
+
+
+
+<a id="@Specification_1_from_bytes"></a>
+
+### Function `from_bytes`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="from_bcs.md#0x1_from_bcs_from_bytes">from_bytes</a>&lt;T&gt;(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): T
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> !<a href="from_bcs.md#0x1_from_bcs_deserializable">deserializable</a>&lt;T&gt;(bytes);
+<b>ensures</b> result == <a href="from_bcs.md#0x1_from_bcs_deserialize">deserialize</a>&lt;T&gt;(bytes);
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/hash.md b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/hash.md
new file mode 100644
index 0000000000000..908970ce7c41d
--- /dev/null
+++ b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/hash.md
@@ -0,0 +1,623 @@
+
+<a id="0x1_aptos_hash"></a>
+
+# Module `0x1::aptos_hash`
+
+Cryptographic hashes:
+- Keccak-256: see https://keccak.team/keccak.html
+
+In addition, SHA2-256 and SHA3-256 are available in <code>std::hash</code>. Note that SHA3-256 is a variant of Keccak: it is
+NOT the same as Keccak-256.
+
+Non-cryptograhic hashes:
+- SipHash: an add-rotate-xor (ARX) based family of pseudorandom functions created by Jean-Philippe Aumasson and Daniel J. Bernstein in 2012
+
+
+-  [Constants](#@Constants_0)
+-  [Function `sip_hash`](#0x1_aptos_hash_sip_hash)
+-  [Function `sip_hash_from_value`](#0x1_aptos_hash_sip_hash_from_value)
+-  [Function `keccak256`](#0x1_aptos_hash_keccak256)
+-  [Function `sha2_512`](#0x1_aptos_hash_sha2_512)
+-  [Function `sha3_512`](#0x1_aptos_hash_sha3_512)
+-  [Function `ripemd160`](#0x1_aptos_hash_ripemd160)
+-  [Function `blake2b_256`](#0x1_aptos_hash_blake2b_256)
+-  [Function `sha2_512_internal`](#0x1_aptos_hash_sha2_512_internal)
+-  [Function `sha3_512_internal`](#0x1_aptos_hash_sha3_512_internal)
+-  [Function `ripemd160_internal`](#0x1_aptos_hash_ripemd160_internal)
+-  [Function `blake2b_256_internal`](#0x1_aptos_hash_blake2b_256_internal)
+-  [Specification](#@Specification_1)
+    -  [Function `sip_hash`](#@Specification_1_sip_hash)
+    -  [Function `sip_hash_from_value`](#@Specification_1_sip_hash_from_value)
+    -  [Function `keccak256`](#@Specification_1_keccak256)
+    -  [Function `sha2_512`](#@Specification_1_sha2_512)
+    -  [Function `sha3_512`](#@Specification_1_sha3_512)
+    -  [Function `ripemd160`](#@Specification_1_ripemd160)
+    -  [Function `blake2b_256`](#@Specification_1_blake2b_256)
+    -  [Function `sha2_512_internal`](#@Specification_1_sha2_512_internal)
+    -  [Function `sha3_512_internal`](#@Specification_1_sha3_512_internal)
+    -  [Function `ripemd160_internal`](#@Specification_1_ripemd160_internal)
+    -  [Function `blake2b_256_internal`](#@Specification_1_blake2b_256_internal)
+
+
+<pre><code><b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs">0x1::bcs</a>;
+<b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features">0x1::features</a>;
+</code></pre>
+
+
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_aptos_hash_E_NATIVE_FUN_NOT_AVAILABLE"></a>
+
+A newly-added native function is not yet enabled.
+
+
+<pre><code><b>const</b> <a href="hash.md#0x1_aptos_hash_E_NATIVE_FUN_NOT_AVAILABLE">E_NATIVE_FUN_NOT_AVAILABLE</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_aptos_hash_sip_hash"></a>
+
+## Function `sip_hash`
+
+Returns the (non-cryptographic) SipHash of <code>bytes</code>. See https://en.wikipedia.org/wiki/SipHash
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="hash.md#0x1_aptos_hash_sip_hash">sip_hash</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>public</b> <b>fun</b> <a href="hash.md#0x1_aptos_hash_sip_hash">sip_hash</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): u64;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_hash_sip_hash_from_value"></a>
+
+## Function `sip_hash_from_value`
+
+Returns the (non-cryptographic) SipHash of the BCS serialization of <code>v</code>. See https://en.wikipedia.org/wiki/SipHash
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="hash.md#0x1_aptos_hash_sip_hash_from_value">sip_hash_from_value</a>&lt;MoveValue&gt;(v: &MoveValue): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="hash.md#0x1_aptos_hash_sip_hash_from_value">sip_hash_from_value</a>&lt;MoveValue&gt;(v: &MoveValue): u64 {
+    <b>let</b> bytes = <a href="../../../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs_to_bytes">bcs::to_bytes</a>(v);
+
+    <a href="hash.md#0x1_aptos_hash_sip_hash">sip_hash</a>(bytes)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_hash_keccak256"></a>
+
+## Function `keccak256`
+
+Returns the Keccak-256 hash of <code>bytes</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="hash.md#0x1_aptos_hash_keccak256">keccak256</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>public</b> <b>fun</b> <a href="hash.md#0x1_aptos_hash_keccak256">keccak256</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_hash_sha2_512"></a>
+
+## Function `sha2_512`
+
+Returns the SHA2-512 hash of <code>bytes</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="hash.md#0x1_aptos_hash_sha2_512">sha2_512</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="hash.md#0x1_aptos_hash_sha2_512">sha2_512</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; {
+    <b>if</b>(!<a href="../../../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_sha_512_and_ripemd_160_enabled">features::sha_512_and_ripemd_160_enabled</a>()) {
+        <b>abort</b>(std::error::invalid_state(<a href="hash.md#0x1_aptos_hash_E_NATIVE_FUN_NOT_AVAILABLE">E_NATIVE_FUN_NOT_AVAILABLE</a>))
+    };
+
+    <a href="hash.md#0x1_aptos_hash_sha2_512_internal">sha2_512_internal</a>(bytes)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_hash_sha3_512"></a>
+
+## Function `sha3_512`
+
+Returns the SHA3-512 hash of <code>bytes</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="hash.md#0x1_aptos_hash_sha3_512">sha3_512</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="hash.md#0x1_aptos_hash_sha3_512">sha3_512</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; {
+    <b>if</b>(!<a href="../../../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_sha_512_and_ripemd_160_enabled">features::sha_512_and_ripemd_160_enabled</a>()) {
+        <b>abort</b>(std::error::invalid_state(<a href="hash.md#0x1_aptos_hash_E_NATIVE_FUN_NOT_AVAILABLE">E_NATIVE_FUN_NOT_AVAILABLE</a>))
+    };
+
+    <a href="hash.md#0x1_aptos_hash_sha3_512_internal">sha3_512_internal</a>(bytes)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_hash_ripemd160"></a>
+
+## Function `ripemd160`
+
+Returns the RIPEMD-160 hash of <code>bytes</code>.
+
+WARNING: Only 80-bit security is provided by this function. This means an adversary who can compute roughly 2^80
+hashes will, with high probability, find a collision x_1 != x_2 such that RIPEMD-160(x_1) = RIPEMD-160(x_2).
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="hash.md#0x1_aptos_hash_ripemd160">ripemd160</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="hash.md#0x1_aptos_hash_ripemd160">ripemd160</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; {
+    <b>if</b>(!<a href="../../../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_sha_512_and_ripemd_160_enabled">features::sha_512_and_ripemd_160_enabled</a>()) {
+        <b>abort</b>(std::error::invalid_state(<a href="hash.md#0x1_aptos_hash_E_NATIVE_FUN_NOT_AVAILABLE">E_NATIVE_FUN_NOT_AVAILABLE</a>))
+    };
+
+    <a href="hash.md#0x1_aptos_hash_ripemd160_internal">ripemd160_internal</a>(bytes)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_hash_blake2b_256"></a>
+
+## Function `blake2b_256`
+
+Returns the BLAKE2B-256 hash of <code>bytes</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="hash.md#0x1_aptos_hash_blake2b_256">blake2b_256</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="hash.md#0x1_aptos_hash_blake2b_256">blake2b_256</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; {
+    <b>if</b>(!<a href="../../../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_blake2b_256_enabled">features::blake2b_256_enabled</a>()) {
+        <b>abort</b>(std::error::invalid_state(<a href="hash.md#0x1_aptos_hash_E_NATIVE_FUN_NOT_AVAILABLE">E_NATIVE_FUN_NOT_AVAILABLE</a>))
+    };
+
+    <a href="hash.md#0x1_aptos_hash_blake2b_256_internal">blake2b_256_internal</a>(bytes)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_hash_sha2_512_internal"></a>
+
+## Function `sha2_512_internal`
+
+Returns the SHA2-512 hash of <code>bytes</code>.
+
+
+<pre><code><b>fun</b> <a href="hash.md#0x1_aptos_hash_sha2_512_internal">sha2_512_internal</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="hash.md#0x1_aptos_hash_sha2_512_internal">sha2_512_internal</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_hash_sha3_512_internal"></a>
+
+## Function `sha3_512_internal`
+
+Returns the SHA3-512 hash of <code>bytes</code>.
+
+
+<pre><code><b>fun</b> <a href="hash.md#0x1_aptos_hash_sha3_512_internal">sha3_512_internal</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="hash.md#0x1_aptos_hash_sha3_512_internal">sha3_512_internal</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_hash_ripemd160_internal"></a>
+
+## Function `ripemd160_internal`
+
+Returns the RIPEMD-160 hash of <code>bytes</code>.
+
+WARNING: Only 80-bit security is provided by this function. This means an adversary who can compute roughly 2^80
+hashes will, with high probability, find a collision x_1 != x_2 such that RIPEMD-160(x_1) = RIPEMD-160(x_2).
+
+
+<pre><code><b>fun</b> <a href="hash.md#0x1_aptos_hash_ripemd160_internal">ripemd160_internal</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="hash.md#0x1_aptos_hash_ripemd160_internal">ripemd160_internal</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_aptos_hash_blake2b_256_internal"></a>
+
+## Function `blake2b_256_internal`
+
+Returns the BLAKE2B-256 hash of <code>bytes</code>.
+
+
+<pre><code><b>fun</b> <a href="hash.md#0x1_aptos_hash_blake2b_256_internal">blake2b_256_internal</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="hash.md#0x1_aptos_hash_blake2b_256_internal">blake2b_256_internal</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+<code>spec_sip_hash</code> is not assumed to be injective.
+
+
+<a id="0x1_aptos_hash_spec_sip_hash"></a>
+
+
+<pre><code><b>fun</b> <a href="hash.md#0x1_aptos_hash_spec_sip_hash">spec_sip_hash</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): u64;
+</code></pre>
+
+
+<code>spec_keccak256</code> is an injective function.
+
+
+<a id="0x1_aptos_hash_spec_keccak256"></a>
+
+
+<pre><code><b>fun</b> <a href="hash.md#0x1_aptos_hash_spec_keccak256">spec_keccak256</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+<b>axiom</b> <b>forall</b> b1: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, b2: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;:
+    (<a href="hash.md#0x1_aptos_hash_spec_keccak256">spec_keccak256</a>(b1) == <a href="hash.md#0x1_aptos_hash_spec_keccak256">spec_keccak256</a>(b2) ==&gt; b1 == b2);
+</code></pre>
+
+
+<code>spec_sha2_512_internal</code> is an injective function.
+
+
+<a id="0x1_aptos_hash_spec_sha2_512_internal"></a>
+
+
+<pre><code><b>fun</b> <a href="hash.md#0x1_aptos_hash_spec_sha2_512_internal">spec_sha2_512_internal</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+<b>axiom</b> <b>forall</b> b1: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, b2: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;:
+    (<a href="hash.md#0x1_aptos_hash_spec_sha2_512_internal">spec_sha2_512_internal</a>(b1) == <a href="hash.md#0x1_aptos_hash_spec_sha2_512_internal">spec_sha2_512_internal</a>(b2) ==&gt; b1 == b2);
+</code></pre>
+
+
+<code>spec_sha3_512_internal</code> is an injective function.
+
+
+<a id="0x1_aptos_hash_spec_sha3_512_internal"></a>
+
+
+<pre><code><b>fun</b> <a href="hash.md#0x1_aptos_hash_spec_sha3_512_internal">spec_sha3_512_internal</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+<b>axiom</b> <b>forall</b> b1: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, b2: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;:
+    (<a href="hash.md#0x1_aptos_hash_spec_sha3_512_internal">spec_sha3_512_internal</a>(b1) == <a href="hash.md#0x1_aptos_hash_spec_sha3_512_internal">spec_sha3_512_internal</a>(b2) ==&gt; b1 == b2);
+</code></pre>
+
+
+<code>spec_ripemd160_internal</code> is an injective function.
+
+
+<a id="0x1_aptos_hash_spec_ripemd160_internal"></a>
+
+
+<pre><code><b>fun</b> <a href="hash.md#0x1_aptos_hash_spec_ripemd160_internal">spec_ripemd160_internal</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+<b>axiom</b> <b>forall</b> b1: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, b2: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;:
+    (<a href="hash.md#0x1_aptos_hash_spec_ripemd160_internal">spec_ripemd160_internal</a>(b1) == <a href="hash.md#0x1_aptos_hash_spec_ripemd160_internal">spec_ripemd160_internal</a>(b2) ==&gt; b1 == b2);
+</code></pre>
+
+
+<code>spec_blake2b_256_internal</code> is an injective function.
+
+
+<a id="0x1_aptos_hash_spec_blake2b_256_internal"></a>
+
+
+<pre><code><b>fun</b> <a href="hash.md#0x1_aptos_hash_spec_blake2b_256_internal">spec_blake2b_256_internal</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+<b>axiom</b> <b>forall</b> b1: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, b2: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;:
+    (<a href="hash.md#0x1_aptos_hash_spec_blake2b_256_internal">spec_blake2b_256_internal</a>(b1) == <a href="hash.md#0x1_aptos_hash_spec_blake2b_256_internal">spec_blake2b_256_internal</a>(b2) ==&gt; b1 == b2);
+</code></pre>
+
+
+
+<a id="@Specification_1_sip_hash"></a>
+
+### Function `sip_hash`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="hash.md#0x1_aptos_hash_sip_hash">sip_hash</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): u64
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> [abstract] <b>false</b>;
+<b>ensures</b> [abstract] result == <a href="hash.md#0x1_aptos_hash_spec_sip_hash">spec_sip_hash</a>(bytes);
+</code></pre>
+
+
+
+<a id="@Specification_1_sip_hash_from_value"></a>
+
+### Function `sip_hash_from_value`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="hash.md#0x1_aptos_hash_sip_hash_from_value">sip_hash_from_value</a>&lt;MoveValue&gt;(v: &MoveValue): u64
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>ensures</b> result == <a href="hash.md#0x1_aptos_hash_spec_sip_hash">spec_sip_hash</a>(<a href="../../../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs_serialize">bcs::serialize</a>(v));
+</code></pre>
+
+
+
+<a id="@Specification_1_keccak256"></a>
+
+### Function `keccak256`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="hash.md#0x1_aptos_hash_keccak256">keccak256</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> [abstract] <b>false</b>;
+<b>ensures</b> [abstract] result == <a href="hash.md#0x1_aptos_hash_spec_keccak256">spec_keccak256</a>(bytes);
+</code></pre>
+
+
+
+<a id="@Specification_1_sha2_512"></a>
+
+### Function `sha2_512`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="hash.md#0x1_aptos_hash_sha2_512">sha2_512</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> !<a href="../../../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_spec_is_enabled">features::spec_is_enabled</a>(<a href="../../../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_SHA_512_AND_RIPEMD_160_NATIVES">features::SHA_512_AND_RIPEMD_160_NATIVES</a>);
+<b>ensures</b> result == <a href="hash.md#0x1_aptos_hash_spec_sha2_512_internal">spec_sha2_512_internal</a>(bytes);
+</code></pre>
+
+
+
+<a id="@Specification_1_sha3_512"></a>
+
+### Function `sha3_512`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="hash.md#0x1_aptos_hash_sha3_512">sha3_512</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> !<a href="../../../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_spec_is_enabled">features::spec_is_enabled</a>(<a href="../../../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_SHA_512_AND_RIPEMD_160_NATIVES">features::SHA_512_AND_RIPEMD_160_NATIVES</a>);
+<b>ensures</b> result == <a href="hash.md#0x1_aptos_hash_spec_sha3_512_internal">spec_sha3_512_internal</a>(bytes);
+</code></pre>
+
+
+
+<a id="@Specification_1_ripemd160"></a>
+
+### Function `ripemd160`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="hash.md#0x1_aptos_hash_ripemd160">ripemd160</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> !<a href="../../../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_spec_is_enabled">features::spec_is_enabled</a>(<a href="../../../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_SHA_512_AND_RIPEMD_160_NATIVES">features::SHA_512_AND_RIPEMD_160_NATIVES</a>);
+<b>ensures</b> result == <a href="hash.md#0x1_aptos_hash_spec_ripemd160_internal">spec_ripemd160_internal</a>(bytes);
+</code></pre>
+
+
+
+<a id="@Specification_1_blake2b_256"></a>
+
+### Function `blake2b_256`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="hash.md#0x1_aptos_hash_blake2b_256">blake2b_256</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> !<a href="../../../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_spec_is_enabled">features::spec_is_enabled</a>(<a href="../../../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_BLAKE2B_256_NATIVE">features::BLAKE2B_256_NATIVE</a>);
+<b>ensures</b> result == <a href="hash.md#0x1_aptos_hash_spec_blake2b_256_internal">spec_blake2b_256_internal</a>(bytes);
+</code></pre>
+
+
+
+<a id="@Specification_1_sha2_512_internal"></a>
+
+### Function `sha2_512_internal`
+
+
+<pre><code><b>fun</b> <a href="hash.md#0x1_aptos_hash_sha2_512_internal">sha2_512_internal</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> [abstract] <b>false</b>;
+<b>ensures</b> [abstract] result == <a href="hash.md#0x1_aptos_hash_spec_sha2_512_internal">spec_sha2_512_internal</a>(bytes);
+</code></pre>
+
+
+
+<a id="@Specification_1_sha3_512_internal"></a>
+
+### Function `sha3_512_internal`
+
+
+<pre><code><b>fun</b> <a href="hash.md#0x1_aptos_hash_sha3_512_internal">sha3_512_internal</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> [abstract] <b>false</b>;
+<b>ensures</b> [abstract] result == <a href="hash.md#0x1_aptos_hash_spec_sha3_512_internal">spec_sha3_512_internal</a>(bytes);
+</code></pre>
+
+
+
+<a id="@Specification_1_ripemd160_internal"></a>
+
+### Function `ripemd160_internal`
+
+
+<pre><code><b>fun</b> <a href="hash.md#0x1_aptos_hash_ripemd160_internal">ripemd160_internal</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> [abstract] <b>false</b>;
+<b>ensures</b> [abstract] result == <a href="hash.md#0x1_aptos_hash_spec_ripemd160_internal">spec_ripemd160_internal</a>(bytes);
+</code></pre>
+
+
+
+<a id="@Specification_1_blake2b_256_internal"></a>
+
+### Function `blake2b_256_internal`
+
+
+<pre><code><b>fun</b> <a href="hash.md#0x1_aptos_hash_blake2b_256_internal">blake2b_256_internal</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="hash.md#0x1_aptos_hash_spec_blake2b_256_internal">spec_blake2b_256_internal</a>(bytes);
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/math128.md b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/math128.md
new file mode 100644
index 0000000000000..d8e0fa05716df
--- /dev/null
+++ b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/math128.md
@@ -0,0 +1,594 @@
+
+<a id="0x1_math128"></a>
+
+# Module `0x1::math128`
+
+Standard math utilities missing in the Move Language.
+
+
+-  [Constants](#@Constants_0)
+-  [Function `max`](#0x1_math128_max)
+-  [Function `min`](#0x1_math128_min)
+-  [Function `average`](#0x1_math128_average)
+-  [Function `gcd`](#0x1_math128_gcd)
+-  [Function `mul_div`](#0x1_math128_mul_div)
+-  [Function `clamp`](#0x1_math128_clamp)
+-  [Function `pow`](#0x1_math128_pow)
+-  [Function `floor_log2`](#0x1_math128_floor_log2)
+-  [Function `log2`](#0x1_math128_log2)
+-  [Function `log2_64`](#0x1_math128_log2_64)
+-  [Function `sqrt`](#0x1_math128_sqrt)
+-  [Function `ceil_div`](#0x1_math128_ceil_div)
+-  [Specification](#@Specification_1)
+    -  [Function `max`](#@Specification_1_max)
+    -  [Function `min`](#@Specification_1_min)
+    -  [Function `average`](#@Specification_1_average)
+    -  [Function `clamp`](#@Specification_1_clamp)
+    -  [Function `pow`](#@Specification_1_pow)
+    -  [Function `floor_log2`](#@Specification_1_floor_log2)
+    -  [Function `sqrt`](#@Specification_1_sqrt)
+
+
+<pre><code><b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/fixed_point32.md#0x1_fixed_point32">0x1::fixed_point32</a>;
+<b>use</b> <a href="fixed_point64.md#0x1_fixed_point64">0x1::fixed_point64</a>;
+</code></pre>
+
+
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_math128_EINVALID_ARG_FLOOR_LOG2"></a>
+
+Cannot log2 the value 0
+
+
+<pre><code><b>const</b> <a href="math128.md#0x1_math128_EINVALID_ARG_FLOOR_LOG2">EINVALID_ARG_FLOOR_LOG2</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_math128_max"></a>
+
+## Function `max`
+
+Return the largest of two numbers.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math128.md#0x1_math128_max">max</a>(a: u128, b: u128): u128
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math128.md#0x1_math128_max">max</a>(a: u128, b: u128): u128 {
+    <b>if</b> (a &gt;= b) a <b>else</b> b
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_math128_min"></a>
+
+## Function `min`
+
+Return the smallest of two numbers.
+
+
+<pre><code><b>public</b> <b>fun</b> <b>min</b>(a: u128, b: u128): u128
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <b>min</b>(a: u128, b: u128): u128 {
+    <b>if</b> (a &lt; b) a <b>else</b> b
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_math128_average"></a>
+
+## Function `average`
+
+Return the average of two.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math128.md#0x1_math128_average">average</a>(a: u128, b: u128): u128
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math128.md#0x1_math128_average">average</a>(a: u128, b: u128): u128 {
+    <b>if</b> (a &lt; b) {
+        a + (b - a) / 2
+    } <b>else</b> {
+        b + (a - b) / 2
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_math128_gcd"></a>
+
+## Function `gcd`
+
+Return greatest common divisor of <code>a</code> & <code>b</code>, via the Euclidean algorithm.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math128.md#0x1_math128_gcd">gcd</a>(a: u128, b: u128): u128
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="math128.md#0x1_math128_gcd">gcd</a>(a: u128, b: u128): u128 {
+    <b>let</b> (large, small) = <b>if</b> (a &gt; b) (a, b) <b>else</b> (b, a);
+    <b>while</b> (small != 0) {
+        <b>let</b> tmp = small;
+        small = large % small;
+        large = tmp;
+    };
+    large
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_math128_mul_div"></a>
+
+## Function `mul_div`
+
+Returns a * b / c going through u256 to prevent intermediate overflow
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math128.md#0x1_math128_mul_div">mul_div</a>(a: u128, b: u128, c: u128): u128
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="math128.md#0x1_math128_mul_div">mul_div</a>(a: u128, b: u128, c: u128): u128 {
+    // Inline functions cannot take constants, <b>as</b> then every <b>module</b> using it needs the constant
+    <b>assert</b>!(c != 0, std::error::invalid_argument(4));
+    (((a <b>as</b> u256) * (b <b>as</b> u256) / (c <b>as</b> u256)) <b>as</b> u128)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_math128_clamp"></a>
+
+## Function `clamp`
+
+Return x clamped to the interval [lower, upper].
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math128.md#0x1_math128_clamp">clamp</a>(x: u128, lower: u128, upper: u128): u128
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math128.md#0x1_math128_clamp">clamp</a>(x: u128, lower: u128, upper: u128): u128 {
+    <b>min</b>(upper, <a href="math128.md#0x1_math128_max">max</a>(lower, x))
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_math128_pow"></a>
+
+## Function `pow`
+
+Return the value of n raised to power e
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math128.md#0x1_math128_pow">pow</a>(n: u128, e: u128): u128
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math128.md#0x1_math128_pow">pow</a>(n: u128, e: u128): u128 {
+    <b>if</b> (e == 0) {
+        1
+    } <b>else</b> {
+        <b>let</b> p = 1;
+        <b>while</b> (e &gt; 1) {
+            <b>if</b> (e % 2 == 1) {
+                p = p * n;
+            };
+            e = e / 2;
+            n = n * n;
+        };
+        p * n
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_math128_floor_log2"></a>
+
+## Function `floor_log2`
+
+Returns floor(log2(x))
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math128.md#0x1_math128_floor_log2">floor_log2</a>(x: u128): u8
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math128.md#0x1_math128_floor_log2">floor_log2</a>(x: u128): u8 {
+    <b>let</b> res = 0;
+    <b>assert</b>!(x != 0, std::error::invalid_argument(<a href="math128.md#0x1_math128_EINVALID_ARG_FLOOR_LOG2">EINVALID_ARG_FLOOR_LOG2</a>));
+    // Effectively the position of the most significant set bit
+    <b>let</b> n = 64;
+    <b>while</b> (n &gt; 0) {
+        <b>if</b> (x &gt;= (1 &lt;&lt; n)) {
+            x = x &gt;&gt; n;
+            res = res + n;
+        };
+        n = n &gt;&gt; 1;
+    };
+    res
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_math128_log2"></a>
+
+## Function `log2`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math128.md#0x1_math128_log2">log2</a>(x: u128): <a href="../../../move-stdlib/tests/compiler-v2-doc/fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math128.md#0x1_math128_log2">log2</a>(x: u128): FixedPoint32 {
+    <b>let</b> integer_part = <a href="math128.md#0x1_math128_floor_log2">floor_log2</a>(x);
+    // Normalize x <b>to</b> [1, 2) in fixed point 32.
+    <b>if</b> (x &gt;= 1 &lt;&lt; 32) {
+        x = x &gt;&gt; (integer_part - 32);
+    } <b>else</b> {
+        x = x &lt;&lt; (32 - integer_part);
+    };
+    <b>let</b> frac = 0;
+    <b>let</b> delta = 1 &lt;&lt; 31;
+    <b>while</b> (delta != 0) {
+        // log x = 1/2 log x^2
+        // x in [1, 2)
+        x = (x * x) &gt;&gt; 32;
+        // x is now in [1, 4)
+        // <b>if</b> x in [2, 4) then log x = 1 + log (x / 2)
+        <b>if</b> (x &gt;= (2 &lt;&lt; 32)) { frac = frac + delta; x = x &gt;&gt; 1; };
+        delta = delta &gt;&gt; 1;
+    };
+    <a href="../../../move-stdlib/tests/compiler-v2-doc/fixed_point32.md#0x1_fixed_point32_create_from_raw_value">fixed_point32::create_from_raw_value</a> (((integer_part <b>as</b> u64) &lt;&lt; 32) + frac)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_math128_log2_64"></a>
+
+## Function `log2_64`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math128.md#0x1_math128_log2_64">log2_64</a>(x: u128): <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math128.md#0x1_math128_log2_64">log2_64</a>(x: u128): FixedPoint64 {
+    <b>let</b> integer_part = <a href="math128.md#0x1_math128_floor_log2">floor_log2</a>(x);
+    // Normalize x <b>to</b> [1, 2) in fixed point 63. To ensure x is smaller then 1&lt;&lt;64
+    <b>if</b> (x &gt;= 1 &lt;&lt; 63) {
+        x = x &gt;&gt; (integer_part - 63);
+    } <b>else</b> {
+        x = x &lt;&lt; (63 - integer_part);
+    };
+    <b>let</b> frac = 0;
+    <b>let</b> delta = 1 &lt;&lt; 63;
+    <b>while</b> (delta != 0) {
+        // log x = 1/2 log x^2
+        // x in [1, 2)
+        x = (x * x) &gt;&gt; 63;
+        // x is now in [1, 4)
+        // <b>if</b> x in [2, 4) then log x = 1 + log (x / 2)
+        <b>if</b> (x &gt;= (2 &lt;&lt; 63)) { frac = frac + delta; x = x &gt;&gt; 1; };
+        delta = delta &gt;&gt; 1;
+    };
+    <a href="fixed_point64.md#0x1_fixed_point64_create_from_raw_value">fixed_point64::create_from_raw_value</a> (((integer_part <b>as</b> u128) &lt;&lt; 64) + frac)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_math128_sqrt"></a>
+
+## Function `sqrt`
+
+Returns square root of x, precisely floor(sqrt(x))
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math128.md#0x1_math128_sqrt">sqrt</a>(x: u128): u128
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math128.md#0x1_math128_sqrt">sqrt</a>(x: u128): u128 {
+    <b>if</b> (x == 0) <b>return</b> 0;
+    // Note the plus 1 in the expression. Let n = floor_lg2(x) we have x in [2^n, 2^{n+1}) and thus the answer in
+    // the half-open interval [2^(n/2), 2^{(n+1)/2}). For even n we can write this <b>as</b> [2^(n/2), <a href="math128.md#0x1_math128_sqrt">sqrt</a>(2) 2^{n/2})
+    // for odd n [2^((n+1)/2)/<a href="math128.md#0x1_math128_sqrt">sqrt</a>(2), 2^((n+1)/2). For even n the left end point is integer for odd the right
+    // end point is integer. If we <b>choose</b> <b>as</b> our first approximation the integer end point we have <b>as</b> maximum
+    // relative <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">error</a> either (<a href="math128.md#0x1_math128_sqrt">sqrt</a>(2) - 1) or (1 - 1/<a href="math128.md#0x1_math128_sqrt">sqrt</a>(2)) both are smaller then 1/2.
+    <b>let</b> res = 1 &lt;&lt; ((<a href="math128.md#0x1_math128_floor_log2">floor_log2</a>(x) + 1) &gt;&gt; 1);
+    // We <b>use</b> standard newton-rhapson iteration <b>to</b> improve the initial approximation.
+    // The <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">error</a> term evolves <b>as</b> delta_i+1 = delta_i^2 / 2 (quadratic convergence).
+    // It turns out that after 5 iterations the delta is smaller than 2^-64 and thus below the treshold.
+    res = (res + x / res) &gt;&gt; 1;
+    res = (res + x / res) &gt;&gt; 1;
+    res = (res + x / res) &gt;&gt; 1;
+    res = (res + x / res) &gt;&gt; 1;
+    res = (res + x / res) &gt;&gt; 1;
+    <b>min</b>(res, x / res)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_math128_ceil_div"></a>
+
+## Function `ceil_div`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math128.md#0x1_math128_ceil_div">ceil_div</a>(x: u128, y: u128): u128
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="math128.md#0x1_math128_ceil_div">ceil_div</a>(x: u128, y: u128): u128 {
+    // <a href="math128.md#0x1_math128_ceil_div">ceil_div</a>(x, y) = floor((x + y - 1) / y) = floor((x - 1) / y) + 1
+    // (x + y - 1) could spuriously overflow. so we <b>use</b> the later version
+    <b>if</b> (x == 0) {
+        // Inline functions cannot take constants, <b>as</b> then every <b>module</b> using it needs the constant
+        <b>assert</b>!(y != 0, std::error::invalid_argument(4));
+        0
+    }
+    <b>else</b> (x - 1) / y + 1
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+<a id="@Specification_1_max"></a>
+
+### Function `max`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math128.md#0x1_math128_max">max</a>(a: u128, b: u128): u128
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+<b>ensures</b> a &gt;= b ==&gt; result == a;
+<b>ensures</b> a &lt; b ==&gt; result == b;
+</code></pre>
+
+
+
+<a id="@Specification_1_min"></a>
+
+### Function `min`
+
+
+<pre><code><b>public</b> <b>fun</b> <b>min</b>(a: u128, b: u128): u128
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+<b>ensures</b> a &lt; b ==&gt; result == a;
+<b>ensures</b> a &gt;= b ==&gt; result == b;
+</code></pre>
+
+
+
+<a id="@Specification_1_average"></a>
+
+### Function `average`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math128.md#0x1_math128_average">average</a>(a: u128, b: u128): u128
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == (a + b) / 2;
+</code></pre>
+
+
+
+<a id="@Specification_1_clamp"></a>
+
+### Function `clamp`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math128.md#0x1_math128_clamp">clamp</a>(x: u128, lower: u128, upper: u128): u128
+</code></pre>
+
+
+
+
+<pre><code><b>requires</b> (lower &lt;= upper);
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> (lower &lt;=x && x &lt;= upper) ==&gt; result == x;
+<b>ensures</b> (x &lt; lower) ==&gt; result == lower;
+<b>ensures</b> (upper &lt; x) ==&gt; result == upper;
+</code></pre>
+
+
+
+<a id="@Specification_1_pow"></a>
+
+### Function `pow`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math128.md#0x1_math128_pow">pow</a>(n: u128, e: u128): u128
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> [abstract] <a href="math128.md#0x1_math128_spec_pow">spec_pow</a>(n, e) &gt; MAX_U128;
+<b>ensures</b> [abstract] result == <a href="math128.md#0x1_math128_spec_pow">spec_pow</a>(n, e);
+</code></pre>
+
+
+
+<a id="@Specification_1_floor_log2"></a>
+
+### Function `floor_log2`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math128.md#0x1_math128_floor_log2">floor_log2</a>(x: u128): u8
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> [abstract] x == 0;
+<b>ensures</b> [abstract] <a href="math128.md#0x1_math128_spec_pow">spec_pow</a>(2, result) &lt;= x;
+<b>ensures</b> [abstract] x &lt; <a href="math128.md#0x1_math128_spec_pow">spec_pow</a>(2, result+1);
+</code></pre>
+
+
+
+<a id="@Specification_1_sqrt"></a>
+
+### Function `sqrt`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math128.md#0x1_math128_sqrt">sqrt</a>(x: u128): u128
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> [abstract] <b>false</b>;
+<b>ensures</b> [abstract] x &gt; 0 ==&gt; result * result &lt;= x;
+<b>ensures</b> [abstract] x &gt; 0 ==&gt; x &lt; (result+1) * (result+1);
+</code></pre>
+
+
+
+
+<a id="0x1_math128_spec_pow"></a>
+
+
+<pre><code><b>fun</b> <a href="math128.md#0x1_math128_spec_pow">spec_pow</a>(n: u128, e: u128): u128 {
+   <b>if</b> (e == 0) {
+       1
+   }
+   <b>else</b> {
+       n * <a href="math128.md#0x1_math128_spec_pow">spec_pow</a>(n, e-1)
+   }
+}
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/math64.md b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/math64.md
new file mode 100644
index 0000000000000..9a9e0b90a77f8
--- /dev/null
+++ b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/math64.md
@@ -0,0 +1,549 @@
+
+<a id="0x1_math64"></a>
+
+# Module `0x1::math64`
+
+Standard math utilities missing in the Move Language.
+
+
+-  [Constants](#@Constants_0)
+-  [Function `max`](#0x1_math64_max)
+-  [Function `min`](#0x1_math64_min)
+-  [Function `average`](#0x1_math64_average)
+-  [Function `gcd`](#0x1_math64_gcd)
+-  [Function `mul_div`](#0x1_math64_mul_div)
+-  [Function `clamp`](#0x1_math64_clamp)
+-  [Function `pow`](#0x1_math64_pow)
+-  [Function `floor_log2`](#0x1_math64_floor_log2)
+-  [Function `log2`](#0x1_math64_log2)
+-  [Function `sqrt`](#0x1_math64_sqrt)
+-  [Function `ceil_div`](#0x1_math64_ceil_div)
+-  [Specification](#@Specification_1)
+    -  [Function `max`](#@Specification_1_max)
+    -  [Function `min`](#@Specification_1_min)
+    -  [Function `average`](#@Specification_1_average)
+    -  [Function `clamp`](#@Specification_1_clamp)
+    -  [Function `pow`](#@Specification_1_pow)
+    -  [Function `floor_log2`](#@Specification_1_floor_log2)
+    -  [Function `sqrt`](#@Specification_1_sqrt)
+
+
+<pre><code><b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/fixed_point32.md#0x1_fixed_point32">0x1::fixed_point32</a>;
+</code></pre>
+
+
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_math64_EINVALID_ARG_FLOOR_LOG2"></a>
+
+Cannot log2 the value 0
+
+
+<pre><code><b>const</b> <a href="math64.md#0x1_math64_EINVALID_ARG_FLOOR_LOG2">EINVALID_ARG_FLOOR_LOG2</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_math64_max"></a>
+
+## Function `max`
+
+Return the largest of two numbers.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math64.md#0x1_math64_max">max</a>(a: u64, b: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math64.md#0x1_math64_max">max</a>(a: u64, b: u64): u64 {
+    <b>if</b> (a &gt;= b) a <b>else</b> b
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_math64_min"></a>
+
+## Function `min`
+
+Return the smallest of two numbers.
+
+
+<pre><code><b>public</b> <b>fun</b> <b>min</b>(a: u64, b: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <b>min</b>(a: u64, b: u64): u64 {
+    <b>if</b> (a &lt; b) a <b>else</b> b
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_math64_average"></a>
+
+## Function `average`
+
+Return the average of two.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math64.md#0x1_math64_average">average</a>(a: u64, b: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math64.md#0x1_math64_average">average</a>(a: u64, b: u64): u64 {
+    <b>if</b> (a &lt; b) {
+        a + (b - a) / 2
+    } <b>else</b> {
+        b + (a - b) / 2
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_math64_gcd"></a>
+
+## Function `gcd`
+
+Return greatest common divisor of <code>a</code> & <code>b</code>, via the Euclidean algorithm.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math64.md#0x1_math64_gcd">gcd</a>(a: u64, b: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="math64.md#0x1_math64_gcd">gcd</a>(a: u64, b: u64): u64 {
+    <b>let</b> (large, small) = <b>if</b> (a &gt; b) (a, b) <b>else</b> (b, a);
+    <b>while</b> (small != 0) {
+        <b>let</b> tmp = small;
+        small = large % small;
+        large = tmp;
+    };
+    large
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_math64_mul_div"></a>
+
+## Function `mul_div`
+
+Returns a * b / c going through u128 to prevent intermediate overflow
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math64.md#0x1_math64_mul_div">mul_div</a>(a: u64, b: u64, c: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="math64.md#0x1_math64_mul_div">mul_div</a>(a: u64, b: u64, c: u64): u64 {
+    // Inline functions cannot take constants, <b>as</b> then every <b>module</b> using it needs the constant
+    <b>assert</b>!(c != 0, std::error::invalid_argument(4));
+    (((a <b>as</b> u128) * (b <b>as</b> u128) / (c <b>as</b> u128)) <b>as</b> u64)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_math64_clamp"></a>
+
+## Function `clamp`
+
+Return x clamped to the interval [lower, upper].
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math64.md#0x1_math64_clamp">clamp</a>(x: u64, lower: u64, upper: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math64.md#0x1_math64_clamp">clamp</a>(x: u64, lower: u64, upper: u64): u64 {
+    <b>min</b>(upper, <a href="math64.md#0x1_math64_max">max</a>(lower, x))
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_math64_pow"></a>
+
+## Function `pow`
+
+Return the value of n raised to power e
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math64.md#0x1_math64_pow">pow</a>(n: u64, e: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math64.md#0x1_math64_pow">pow</a>(n: u64, e: u64): u64 {
+    <b>if</b> (e == 0) {
+        1
+    } <b>else</b> {
+        <b>let</b> p = 1;
+        <b>while</b> (e &gt; 1) {
+            <b>if</b> (e % 2 == 1) {
+                p = p * n;
+            };
+            e = e / 2;
+            n = n * n;
+        };
+        p * n
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_math64_floor_log2"></a>
+
+## Function `floor_log2`
+
+Returns floor(lg2(x))
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math64.md#0x1_math64_floor_log2">floor_log2</a>(x: u64): u8
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math64.md#0x1_math64_floor_log2">floor_log2</a>(x: u64): u8 {
+    <b>let</b> res = 0;
+    <b>assert</b>!(x != 0, std::error::invalid_argument(<a href="math64.md#0x1_math64_EINVALID_ARG_FLOOR_LOG2">EINVALID_ARG_FLOOR_LOG2</a>));
+    // Effectively the position of the most significant set bit
+    <b>let</b> n = 32;
+    <b>while</b> (n &gt; 0) {
+        <b>if</b> (x &gt;= (1 &lt;&lt; n)) {
+            x = x &gt;&gt; n;
+            res = res + n;
+        };
+        n = n &gt;&gt; 1;
+    };
+    res
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_math64_log2"></a>
+
+## Function `log2`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math64.md#0x1_math64_log2">log2</a>(x: u64): <a href="../../../move-stdlib/tests/compiler-v2-doc/fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math64.md#0x1_math64_log2">log2</a>(x: u64): FixedPoint32 {
+    <b>let</b> integer_part = <a href="math64.md#0x1_math64_floor_log2">floor_log2</a>(x);
+    // Normalize x <b>to</b> [1, 2) in fixed point 32.
+    <b>let</b> y = (<b>if</b> (x &gt;= 1 &lt;&lt; 32) {
+        x &gt;&gt; (integer_part - 32)
+    } <b>else</b> {
+        x &lt;&lt; (32 - integer_part)
+    } <b>as</b> u128);
+    <b>let</b> frac = 0;
+    <b>let</b> delta = 1 &lt;&lt; 31;
+    <b>while</b> (delta != 0) {
+        // log x = 1/2 log x^2
+        // x in [1, 2)
+        y = (y * y) &gt;&gt; 32;
+        // x is now in [1, 4)
+        // <b>if</b> x in [2, 4) then log x = 1 + log (x / 2)
+        <b>if</b> (y &gt;= (2 &lt;&lt; 32)) { frac = frac + delta; y = y &gt;&gt; 1; };
+        delta = delta &gt;&gt; 1;
+    };
+    <a href="../../../move-stdlib/tests/compiler-v2-doc/fixed_point32.md#0x1_fixed_point32_create_from_raw_value">fixed_point32::create_from_raw_value</a> (((integer_part <b>as</b> u64) &lt;&lt; 32) + frac)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_math64_sqrt"></a>
+
+## Function `sqrt`
+
+Returns square root of x, precisely floor(sqrt(x))
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math64.md#0x1_math64_sqrt">sqrt</a>(x: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math64.md#0x1_math64_sqrt">sqrt</a>(x: u64): u64 {
+    <b>if</b> (x == 0) <b>return</b> 0;
+    // Note the plus 1 in the expression. Let n = floor_lg2(x) we have x in [2^n, 2^(n+1)&gt; and thus the answer in
+    // the half-open interval [2^(n/2), 2^((n+1)/2)&gt;. For even n we can write this <b>as</b> [2^(n/2), <a href="math64.md#0x1_math64_sqrt">sqrt</a>(2) 2^(n/2)&gt;
+    // for odd n [2^((n+1)/2)/<a href="math64.md#0x1_math64_sqrt">sqrt</a>(2), 2^((n+1)/2&gt;. For even n the left end point is integer for odd the right
+    // end point is integer. If we <b>choose</b> <b>as</b> our first approximation the integer end point we have <b>as</b> maximum
+    // relative <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">error</a> either (<a href="math64.md#0x1_math64_sqrt">sqrt</a>(2) - 1) or (1 - 1/<a href="math64.md#0x1_math64_sqrt">sqrt</a>(2)) both are smaller then 1/2.
+    <b>let</b> res = 1 &lt;&lt; ((<a href="math64.md#0x1_math64_floor_log2">floor_log2</a>(x) + 1) &gt;&gt; 1);
+    // We <b>use</b> standard newton-rhapson iteration <b>to</b> improve the initial approximation.
+    // The <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">error</a> term evolves <b>as</b> delta_i+1 = delta_i^2 / 2 (quadratic convergence).
+    // It turns out that after 4 iterations the delta is smaller than 2^-32 and thus below the treshold.
+    res = (res + x / res) &gt;&gt; 1;
+    res = (res + x / res) &gt;&gt; 1;
+    res = (res + x / res) &gt;&gt; 1;
+    res = (res + x / res) &gt;&gt; 1;
+    <b>min</b>(res, x / res)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_math64_ceil_div"></a>
+
+## Function `ceil_div`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math64.md#0x1_math64_ceil_div">ceil_div</a>(x: u64, y: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="math64.md#0x1_math64_ceil_div">ceil_div</a>(x: u64, y: u64): u64 {
+    // <a href="math64.md#0x1_math64_ceil_div">ceil_div</a>(x, y) = floor((x + y - 1) / y) = floor((x - 1) / y) + 1
+    // (x + y - 1) could spuriously overflow. so we <b>use</b> the later version
+    <b>if</b> (x == 0) {
+        // Inline functions cannot take constants, <b>as</b> then every <b>module</b> using it needs the constant
+        <b>assert</b>!(y != 0, std::error::invalid_argument(4));
+        0
+    }
+    <b>else</b> (x - 1) / y + 1
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+<a id="@Specification_1_max"></a>
+
+### Function `max`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math64.md#0x1_math64_max">max</a>(a: u64, b: u64): u64
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+<b>ensures</b> a &gt;= b ==&gt; result == a;
+<b>ensures</b> a &lt; b ==&gt; result == b;
+</code></pre>
+
+
+
+<a id="@Specification_1_min"></a>
+
+### Function `min`
+
+
+<pre><code><b>public</b> <b>fun</b> <b>min</b>(a: u64, b: u64): u64
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+<b>ensures</b> a &lt; b ==&gt; result == a;
+<b>ensures</b> a &gt;= b ==&gt; result == b;
+</code></pre>
+
+
+
+<a id="@Specification_1_average"></a>
+
+### Function `average`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math64.md#0x1_math64_average">average</a>(a: u64, b: u64): u64
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == (a + b) / 2;
+</code></pre>
+
+
+
+<a id="@Specification_1_clamp"></a>
+
+### Function `clamp`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math64.md#0x1_math64_clamp">clamp</a>(x: u64, lower: u64, upper: u64): u64
+</code></pre>
+
+
+
+
+<pre><code><b>requires</b> (lower &lt;= upper);
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> (lower &lt;=x && x &lt;= upper) ==&gt; result == x;
+<b>ensures</b> (x &lt; lower) ==&gt; result == lower;
+<b>ensures</b> (upper &lt; x) ==&gt; result == upper;
+</code></pre>
+
+
+
+<a id="@Specification_1_pow"></a>
+
+### Function `pow`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math64.md#0x1_math64_pow">pow</a>(n: u64, e: u64): u64
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> [abstract] <a href="math64.md#0x1_math64_spec_pow">spec_pow</a>(n, e) &gt; MAX_U64;
+<b>ensures</b> [abstract] result == <a href="math64.md#0x1_math64_spec_pow">spec_pow</a>(n, e);
+</code></pre>
+
+
+
+<a id="@Specification_1_floor_log2"></a>
+
+### Function `floor_log2`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math64.md#0x1_math64_floor_log2">floor_log2</a>(x: u64): u8
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> [abstract] x == 0;
+<b>ensures</b> [abstract] <a href="math64.md#0x1_math64_spec_pow">spec_pow</a>(2, result) &lt;= x;
+<b>ensures</b> [abstract] x &lt; <a href="math64.md#0x1_math64_spec_pow">spec_pow</a>(2, result+1);
+</code></pre>
+
+
+
+<a id="@Specification_1_sqrt"></a>
+
+### Function `sqrt`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math64.md#0x1_math64_sqrt">sqrt</a>(x: u64): u64
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> [abstract] <b>false</b>;
+<b>ensures</b> [abstract] x &gt; 0 ==&gt; result * result &lt;= x;
+<b>ensures</b> [abstract] x &gt; 0 ==&gt; x &lt; (result+1) * (result+1);
+</code></pre>
+
+
+
+
+<a id="0x1_math64_spec_pow"></a>
+
+
+<pre><code><b>fun</b> <a href="math64.md#0x1_math64_spec_pow">spec_pow</a>(n: u64, e: u64): u64 {
+   <b>if</b> (e == 0) {
+       1
+   }
+   <b>else</b> {
+       n * <a href="math64.md#0x1_math64_spec_pow">spec_pow</a>(n, e-1)
+   }
+}
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/math_fixed.md b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/math_fixed.md
new file mode 100644
index 0000000000000..b1099005aad39
--- /dev/null
+++ b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/math_fixed.md
@@ -0,0 +1,299 @@
+
+<a id="0x1_math_fixed"></a>
+
+# Module `0x1::math_fixed`
+
+Standard math utilities missing in the Move Language.
+
+
+-  [Constants](#@Constants_0)
+-  [Function `sqrt`](#0x1_math_fixed_sqrt)
+-  [Function `exp`](#0x1_math_fixed_exp)
+-  [Function `log2_plus_32`](#0x1_math_fixed_log2_plus_32)
+-  [Function `ln_plus_32ln2`](#0x1_math_fixed_ln_plus_32ln2)
+-  [Function `pow`](#0x1_math_fixed_pow)
+-  [Function `mul_div`](#0x1_math_fixed_mul_div)
+-  [Function `exp_raw`](#0x1_math_fixed_exp_raw)
+-  [Function `pow_raw`](#0x1_math_fixed_pow_raw)
+
+
+<pre><code><b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/fixed_point32.md#0x1_fixed_point32">0x1::fixed_point32</a>;
+<b>use</b> <a href="math128.md#0x1_math128">0x1::math128</a>;
+</code></pre>
+
+
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_math_fixed_EOVERFLOW_EXP"></a>
+
+Abort code on overflow
+
+
+<pre><code><b>const</b> <a href="math_fixed.md#0x1_math_fixed_EOVERFLOW_EXP">EOVERFLOW_EXP</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_math_fixed_LN2"></a>
+
+Natural log 2 in 32 bit fixed point
+
+
+<pre><code><b>const</b> <a href="math_fixed.md#0x1_math_fixed_LN2">LN2</a>: u128 = 2977044472;
+</code></pre>
+
+
+
+<a id="0x1_math_fixed_LN2_X_32"></a>
+
+
+
+<pre><code><b>const</b> <a href="math_fixed.md#0x1_math_fixed_LN2_X_32">LN2_X_32</a>: u64 = 95265423104;
+</code></pre>
+
+
+
+<a id="0x1_math_fixed_sqrt"></a>
+
+## Function `sqrt`
+
+Square root of fixed point number
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math_fixed.md#0x1_math_fixed_sqrt">sqrt</a>(x: <a href="../../../move-stdlib/tests/compiler-v2-doc/fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math_fixed.md#0x1_math_fixed_sqrt">sqrt</a>(x: FixedPoint32): FixedPoint32 {
+    <b>let</b> y = (<a href="../../../move-stdlib/tests/compiler-v2-doc/fixed_point32.md#0x1_fixed_point32_get_raw_value">fixed_point32::get_raw_value</a>(x) <b>as</b> u128);
+    <a href="../../../move-stdlib/tests/compiler-v2-doc/fixed_point32.md#0x1_fixed_point32_create_from_raw_value">fixed_point32::create_from_raw_value</a>((<a href="math128.md#0x1_math128_sqrt">math128::sqrt</a>(y &lt;&lt; 32) <b>as</b> u64))
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_math_fixed_exp"></a>
+
+## Function `exp`
+
+Exponent function with a precission of 9 digits.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math_fixed.md#0x1_math_fixed_exp">exp</a>(x: <a href="../../../move-stdlib/tests/compiler-v2-doc/fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math_fixed.md#0x1_math_fixed_exp">exp</a>(x: FixedPoint32): FixedPoint32 {
+    <b>let</b> raw_value = (<a href="../../../move-stdlib/tests/compiler-v2-doc/fixed_point32.md#0x1_fixed_point32_get_raw_value">fixed_point32::get_raw_value</a>(x) <b>as</b> u128);
+    <a href="../../../move-stdlib/tests/compiler-v2-doc/fixed_point32.md#0x1_fixed_point32_create_from_raw_value">fixed_point32::create_from_raw_value</a>((<a href="math_fixed.md#0x1_math_fixed_exp_raw">exp_raw</a>(raw_value) <b>as</b> u64))
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_math_fixed_log2_plus_32"></a>
+
+## Function `log2_plus_32`
+
+Because log2 is negative for values < 1 we instead return log2(x) + 32 which
+is positive for all values of x.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math_fixed.md#0x1_math_fixed_log2_plus_32">log2_plus_32</a>(x: <a href="../../../move-stdlib/tests/compiler-v2-doc/fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math_fixed.md#0x1_math_fixed_log2_plus_32">log2_plus_32</a>(x: FixedPoint32): FixedPoint32 {
+    <b>let</b> raw_value = (<a href="../../../move-stdlib/tests/compiler-v2-doc/fixed_point32.md#0x1_fixed_point32_get_raw_value">fixed_point32::get_raw_value</a>(x) <b>as</b> u128);
+    <a href="math128.md#0x1_math128_log2">math128::log2</a>(raw_value)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_math_fixed_ln_plus_32ln2"></a>
+
+## Function `ln_plus_32ln2`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math_fixed.md#0x1_math_fixed_ln_plus_32ln2">ln_plus_32ln2</a>(x: <a href="../../../move-stdlib/tests/compiler-v2-doc/fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math_fixed.md#0x1_math_fixed_ln_plus_32ln2">ln_plus_32ln2</a>(x: FixedPoint32): FixedPoint32 {
+    <b>let</b> raw_value = (<a href="../../../move-stdlib/tests/compiler-v2-doc/fixed_point32.md#0x1_fixed_point32_get_raw_value">fixed_point32::get_raw_value</a>(x) <b>as</b> u128);
+    <b>let</b> x = (<a href="../../../move-stdlib/tests/compiler-v2-doc/fixed_point32.md#0x1_fixed_point32_get_raw_value">fixed_point32::get_raw_value</a>(<a href="math128.md#0x1_math128_log2">math128::log2</a>(raw_value)) <b>as</b> u128);
+    <a href="../../../move-stdlib/tests/compiler-v2-doc/fixed_point32.md#0x1_fixed_point32_create_from_raw_value">fixed_point32::create_from_raw_value</a>((x * <a href="math_fixed.md#0x1_math_fixed_LN2">LN2</a> &gt;&gt; 32 <b>as</b> u64))
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_math_fixed_pow"></a>
+
+## Function `pow`
+
+Integer power of a fixed point number
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math_fixed.md#0x1_math_fixed_pow">pow</a>(x: <a href="../../../move-stdlib/tests/compiler-v2-doc/fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>, n: u64): <a href="../../../move-stdlib/tests/compiler-v2-doc/fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math_fixed.md#0x1_math_fixed_pow">pow</a>(x: FixedPoint32, n: u64): FixedPoint32 {
+    <b>let</b> raw_value = (<a href="../../../move-stdlib/tests/compiler-v2-doc/fixed_point32.md#0x1_fixed_point32_get_raw_value">fixed_point32::get_raw_value</a>(x) <b>as</b> u128);
+    <a href="../../../move-stdlib/tests/compiler-v2-doc/fixed_point32.md#0x1_fixed_point32_create_from_raw_value">fixed_point32::create_from_raw_value</a>((<a href="math_fixed.md#0x1_math_fixed_pow_raw">pow_raw</a>(raw_value, (n <b>as</b> u128)) <b>as</b> u64))
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_math_fixed_mul_div"></a>
+
+## Function `mul_div`
+
+Specialized function for x * y / z that omits intermediate shifting
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math_fixed.md#0x1_math_fixed_mul_div">mul_div</a>(x: <a href="../../../move-stdlib/tests/compiler-v2-doc/fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>, y: <a href="../../../move-stdlib/tests/compiler-v2-doc/fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>, z: <a href="../../../move-stdlib/tests/compiler-v2-doc/fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math_fixed.md#0x1_math_fixed_mul_div">mul_div</a>(x: FixedPoint32, y: FixedPoint32, z: FixedPoint32): FixedPoint32 {
+    <b>let</b> a = <a href="../../../move-stdlib/tests/compiler-v2-doc/fixed_point32.md#0x1_fixed_point32_get_raw_value">fixed_point32::get_raw_value</a>(x);
+    <b>let</b> b = <a href="../../../move-stdlib/tests/compiler-v2-doc/fixed_point32.md#0x1_fixed_point32_get_raw_value">fixed_point32::get_raw_value</a>(y);
+    <b>let</b> c = <a href="../../../move-stdlib/tests/compiler-v2-doc/fixed_point32.md#0x1_fixed_point32_get_raw_value">fixed_point32::get_raw_value</a>(z);
+    <a href="../../../move-stdlib/tests/compiler-v2-doc/fixed_point32.md#0x1_fixed_point32_create_from_raw_value">fixed_point32::create_from_raw_value</a> (<a href="math64.md#0x1_math64_mul_div">math64::mul_div</a>(a, b, c))
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_math_fixed_exp_raw"></a>
+
+## Function `exp_raw`
+
+
+
+<pre><code><b>fun</b> <a href="math_fixed.md#0x1_math_fixed_exp_raw">exp_raw</a>(x: u128): u128
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="math_fixed.md#0x1_math_fixed_exp_raw">exp_raw</a>(x: u128): u128 {
+    // <a href="math_fixed.md#0x1_math_fixed_exp">exp</a>(x / 2^32) = 2^(x / (2^32 * ln(2))) = 2^(floor(x / (2^32 * ln(2))) + frac(x / (2^32 * ln(2))))
+    <b>let</b> shift_long = x / <a href="math_fixed.md#0x1_math_fixed_LN2">LN2</a>;
+    <b>assert</b>!(shift_long &lt;= 31, std::error::invalid_state(<a href="math_fixed.md#0x1_math_fixed_EOVERFLOW_EXP">EOVERFLOW_EXP</a>));
+    <b>let</b> shift = (shift_long <b>as</b> u8);
+    <b>let</b> remainder = x % <a href="math_fixed.md#0x1_math_fixed_LN2">LN2</a>;
+    // At this point we want <b>to</b> calculate 2^(remainder / ln2) &lt;&lt; shift
+    // ln2 = 595528 * 4999 which means
+    <b>let</b> bigfactor = 595528;
+    <b>let</b> exponent = remainder / bigfactor;
+    <b>let</b> x = remainder % bigfactor;
+    // 2^(remainder / ln2) = (2^(1/4999))^exponent * <a href="math_fixed.md#0x1_math_fixed_exp">exp</a>(x / 2^32)
+    <b>let</b> roottwo = 4295562865;  // fixed point representation of 2^(1/4999)
+    // This <b>has</b> an <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">error</a> of 5000 / 4 10^9 roughly 6 digits of precission
+    <b>let</b> power = <a href="math_fixed.md#0x1_math_fixed_pow_raw">pow_raw</a>(roottwo, exponent);
+    <b>let</b> eps_correction = 1241009291;
+    power = power + ((power * eps_correction * exponent) &gt;&gt; 64);
+    // x is fixed point number smaller than 595528/2^32 &lt; 0.00014 so we need only 2 tayler steps
+    // <b>to</b> get the 6 digits of precission
+    <b>let</b> taylor1 = (power * x) &gt;&gt; (32 - shift);
+    <b>let</b> taylor2 = (taylor1 * x) &gt;&gt; 32;
+    <b>let</b> taylor3 = (taylor2 * x) &gt;&gt; 32;
+    (power &lt;&lt; shift) + taylor1 + taylor2 / 2 + taylor3 / 6
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_math_fixed_pow_raw"></a>
+
+## Function `pow_raw`
+
+
+
+<pre><code><b>fun</b> <a href="math_fixed.md#0x1_math_fixed_pow_raw">pow_raw</a>(x: u128, n: u128): u128
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="math_fixed.md#0x1_math_fixed_pow_raw">pow_raw</a>(x: u128, n: u128): u128 {
+    <b>let</b> res: u256 = 1 &lt;&lt; 64;
+    x = x &lt;&lt; 32;
+    <b>while</b> (n != 0) {
+        <b>if</b> (n & 1 != 0) {
+            res = (res * (x <b>as</b> u256)) &gt;&gt; 64;
+        };
+        n = n &gt;&gt; 1;
+        x = ((((x <b>as</b> u256) * (x <b>as</b> u256)) &gt;&gt; 64) <b>as</b> u128);
+    };
+    ((res &gt;&gt; 32) <b>as</b> u128)
+}
+</code></pre>
+
+
+
+</details>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/math_fixed64.md b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/math_fixed64.md
new file mode 100644
index 0000000000000..be0bd197ae48a
--- /dev/null
+++ b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/math_fixed64.md
@@ -0,0 +1,294 @@
+
+<a id="0x1_math_fixed64"></a>
+
+# Module `0x1::math_fixed64`
+
+Standard math utilities missing in the Move Language.
+
+
+-  [Constants](#@Constants_0)
+-  [Function `sqrt`](#0x1_math_fixed64_sqrt)
+-  [Function `exp`](#0x1_math_fixed64_exp)
+-  [Function `log2_plus_64`](#0x1_math_fixed64_log2_plus_64)
+-  [Function `ln_plus_32ln2`](#0x1_math_fixed64_ln_plus_32ln2)
+-  [Function `pow`](#0x1_math_fixed64_pow)
+-  [Function `mul_div`](#0x1_math_fixed64_mul_div)
+-  [Function `exp_raw`](#0x1_math_fixed64_exp_raw)
+-  [Function `pow_raw`](#0x1_math_fixed64_pow_raw)
+
+
+<pre><code><b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="fixed_point64.md#0x1_fixed_point64">0x1::fixed_point64</a>;
+<b>use</b> <a href="math128.md#0x1_math128">0x1::math128</a>;
+</code></pre>
+
+
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_math_fixed64_EOVERFLOW_EXP"></a>
+
+Abort code on overflow
+
+
+<pre><code><b>const</b> <a href="math_fixed64.md#0x1_math_fixed64_EOVERFLOW_EXP">EOVERFLOW_EXP</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_math_fixed64_LN2"></a>
+
+Natural log 2 in 32 bit fixed point
+
+
+<pre><code><b>const</b> <a href="math_fixed64.md#0x1_math_fixed64_LN2">LN2</a>: u256 = 12786308645202655660;
+</code></pre>
+
+
+
+<a id="0x1_math_fixed64_sqrt"></a>
+
+## Function `sqrt`
+
+Square root of fixed point number
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math_fixed64.md#0x1_math_fixed64_sqrt">sqrt</a>(x: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>): <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math_fixed64.md#0x1_math_fixed64_sqrt">sqrt</a>(x: FixedPoint64): FixedPoint64 {
+    <b>let</b> y = <a href="fixed_point64.md#0x1_fixed_point64_get_raw_value">fixed_point64::get_raw_value</a>(x);
+    <b>let</b> z = (<a href="math128.md#0x1_math128_sqrt">math128::sqrt</a>(y) &lt;&lt; 32 <b>as</b> u256);
+    z = (z + ((y <b>as</b> u256) &lt;&lt; 64) / z) &gt;&gt; 1;
+    <a href="fixed_point64.md#0x1_fixed_point64_create_from_raw_value">fixed_point64::create_from_raw_value</a>((z <b>as</b> u128))
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_math_fixed64_exp"></a>
+
+## Function `exp`
+
+Exponent function with a precission of 9 digits.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math_fixed64.md#0x1_math_fixed64_exp">exp</a>(x: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>): <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math_fixed64.md#0x1_math_fixed64_exp">exp</a>(x: FixedPoint64): FixedPoint64 {
+    <b>let</b> raw_value = (<a href="fixed_point64.md#0x1_fixed_point64_get_raw_value">fixed_point64::get_raw_value</a>(x) <b>as</b> u256);
+    <a href="fixed_point64.md#0x1_fixed_point64_create_from_raw_value">fixed_point64::create_from_raw_value</a>((<a href="math_fixed64.md#0x1_math_fixed64_exp_raw">exp_raw</a>(raw_value) <b>as</b> u128))
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_math_fixed64_log2_plus_64"></a>
+
+## Function `log2_plus_64`
+
+Because log2 is negative for values < 1 we instead return log2(x) + 64 which
+is positive for all values of x.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math_fixed64.md#0x1_math_fixed64_log2_plus_64">log2_plus_64</a>(x: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>): <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math_fixed64.md#0x1_math_fixed64_log2_plus_64">log2_plus_64</a>(x: FixedPoint64): FixedPoint64 {
+    <b>let</b> raw_value = (<a href="fixed_point64.md#0x1_fixed_point64_get_raw_value">fixed_point64::get_raw_value</a>(x) <b>as</b> u128);
+    <a href="math128.md#0x1_math128_log2_64">math128::log2_64</a>(raw_value)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_math_fixed64_ln_plus_32ln2"></a>
+
+## Function `ln_plus_32ln2`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math_fixed64.md#0x1_math_fixed64_ln_plus_32ln2">ln_plus_32ln2</a>(x: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>): <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math_fixed64.md#0x1_math_fixed64_ln_plus_32ln2">ln_plus_32ln2</a>(x: FixedPoint64): FixedPoint64 {
+    <b>let</b> raw_value = <a href="fixed_point64.md#0x1_fixed_point64_get_raw_value">fixed_point64::get_raw_value</a>(x);
+    <b>let</b> x = (<a href="fixed_point64.md#0x1_fixed_point64_get_raw_value">fixed_point64::get_raw_value</a>(<a href="math128.md#0x1_math128_log2_64">math128::log2_64</a>(raw_value)) <b>as</b> u256);
+    <a href="fixed_point64.md#0x1_fixed_point64_create_from_raw_value">fixed_point64::create_from_raw_value</a>(((x * <a href="math_fixed64.md#0x1_math_fixed64_LN2">LN2</a>) &gt;&gt; 64 <b>as</b> u128))
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_math_fixed64_pow"></a>
+
+## Function `pow`
+
+Integer power of a fixed point number
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math_fixed64.md#0x1_math_fixed64_pow">pow</a>(x: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>, n: u64): <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math_fixed64.md#0x1_math_fixed64_pow">pow</a>(x: FixedPoint64, n: u64): FixedPoint64 {
+    <b>let</b> raw_value = (<a href="fixed_point64.md#0x1_fixed_point64_get_raw_value">fixed_point64::get_raw_value</a>(x) <b>as</b> u256);
+    <a href="fixed_point64.md#0x1_fixed_point64_create_from_raw_value">fixed_point64::create_from_raw_value</a>((<a href="math_fixed64.md#0x1_math_fixed64_pow_raw">pow_raw</a>(raw_value, (n <b>as</b> u128)) <b>as</b> u128))
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_math_fixed64_mul_div"></a>
+
+## Function `mul_div`
+
+Specialized function for x * y / z that omits intermediate shifting
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math_fixed64.md#0x1_math_fixed64_mul_div">mul_div</a>(x: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>, y: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>, z: <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>): <a href="fixed_point64.md#0x1_fixed_point64_FixedPoint64">fixed_point64::FixedPoint64</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="math_fixed64.md#0x1_math_fixed64_mul_div">mul_div</a>(x: FixedPoint64, y: FixedPoint64, z: FixedPoint64): FixedPoint64 {
+    <b>let</b> a = <a href="fixed_point64.md#0x1_fixed_point64_get_raw_value">fixed_point64::get_raw_value</a>(x);
+    <b>let</b> b = <a href="fixed_point64.md#0x1_fixed_point64_get_raw_value">fixed_point64::get_raw_value</a>(y);
+    <b>let</b> c = <a href="fixed_point64.md#0x1_fixed_point64_get_raw_value">fixed_point64::get_raw_value</a>(z);
+    <a href="fixed_point64.md#0x1_fixed_point64_create_from_raw_value">fixed_point64::create_from_raw_value</a> (<a href="math128.md#0x1_math128_mul_div">math128::mul_div</a>(a, b, c))
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_math_fixed64_exp_raw"></a>
+
+## Function `exp_raw`
+
+
+
+<pre><code><b>fun</b> <a href="math_fixed64.md#0x1_math_fixed64_exp_raw">exp_raw</a>(x: u256): u256
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="math_fixed64.md#0x1_math_fixed64_exp_raw">exp_raw</a>(x: u256): u256 {
+    // <a href="math_fixed64.md#0x1_math_fixed64_exp">exp</a>(x / 2^64) = 2^(x / (2^64 * ln(2))) = 2^(floor(x / (2^64 * ln(2))) + frac(x / (2^64 * ln(2))))
+    <b>let</b> shift_long = x / <a href="math_fixed64.md#0x1_math_fixed64_LN2">LN2</a>;
+    <b>assert</b>!(shift_long &lt;= 63, std::error::invalid_state(<a href="math_fixed64.md#0x1_math_fixed64_EOVERFLOW_EXP">EOVERFLOW_EXP</a>));
+    <b>let</b> shift = (shift_long <b>as</b> u8);
+    <b>let</b> remainder = x % <a href="math_fixed64.md#0x1_math_fixed64_LN2">LN2</a>;
+    // At this point we want <b>to</b> calculate 2^(remainder / ln2) &lt;&lt; shift
+    // ln2 = 580 * 22045359733108027
+    <b>let</b> bigfactor = 22045359733108027;
+    <b>let</b> exponent = remainder / bigfactor;
+    <b>let</b> x = remainder % bigfactor;
+    // 2^(remainder / ln2) = (2^(1/580))^exponent * <a href="math_fixed64.md#0x1_math_fixed64_exp">exp</a>(x / 2^64)
+    <b>let</b> roottwo = 18468802611690918839;  // fixed point representation of 2^(1/580)
+    // 2^(1/580) = roottwo(1 - eps), so the number we seek is roottwo^exponent (1 - eps * exponent)
+    <b>let</b> power = <a href="math_fixed64.md#0x1_math_fixed64_pow_raw">pow_raw</a>(roottwo, (exponent <b>as</b> u128));
+    <b>let</b> eps_correction = 219071715585908898;
+    power = power - ((power * eps_correction * exponent) &gt;&gt; 128);
+    // x is fixed point number smaller than bigfactor/2^64 &lt; 0.0011 so we need only 5 tayler steps
+    // <b>to</b> get the 15 digits of precission
+    <b>let</b> taylor1 = (power * x) &gt;&gt; (64 - shift);
+    <b>let</b> taylor2 = (taylor1 * x) &gt;&gt; 64;
+    <b>let</b> taylor3 = (taylor2 * x) &gt;&gt; 64;
+    <b>let</b> taylor4 = (taylor3 * x) &gt;&gt; 64;
+    <b>let</b> taylor5 = (taylor4 * x) &gt;&gt; 64;
+    <b>let</b> taylor6 = (taylor5 * x) &gt;&gt; 64;
+    (power &lt;&lt; shift) + taylor1 + taylor2 / 2 + taylor3 / 6 + taylor4 / 24 + taylor5 / 120 + taylor6 / 720
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_math_fixed64_pow_raw"></a>
+
+## Function `pow_raw`
+
+
+
+<pre><code><b>fun</b> <a href="math_fixed64.md#0x1_math_fixed64_pow_raw">pow_raw</a>(x: u256, n: u128): u256
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="math_fixed64.md#0x1_math_fixed64_pow_raw">pow_raw</a>(x: u256, n: u128): u256 {
+    <b>let</b> res: u256 = 1 &lt;&lt; 64;
+    <b>while</b> (n != 0) {
+        <b>if</b> (n & 1 != 0) {
+            res = (res * x) &gt;&gt; 64;
+        };
+        n = n &gt;&gt; 1;
+        x = (x * x) &gt;&gt; 64;
+    };
+    res
+}
+</code></pre>
+
+
+
+</details>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/multi_ed25519.md b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/multi_ed25519.md
new file mode 100644
index 0000000000000..1105c7f983be6
--- /dev/null
+++ b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/multi_ed25519.md
@@ -0,0 +1,1324 @@
+
+<a id="0x1_multi_ed25519"></a>
+
+# Module `0x1::multi_ed25519`
+
+Exports MultiEd25519 multi-signatures in Move.
+This module has the exact same interface as the Ed25519 module.
+
+
+-  [Struct `UnvalidatedPublicKey`](#0x1_multi_ed25519_UnvalidatedPublicKey)
+-  [Struct `ValidatedPublicKey`](#0x1_multi_ed25519_ValidatedPublicKey)
+-  [Struct `Signature`](#0x1_multi_ed25519_Signature)
+-  [Constants](#@Constants_0)
+-  [Function `new_unvalidated_public_key_from_bytes`](#0x1_multi_ed25519_new_unvalidated_public_key_from_bytes)
+-  [Function `new_validated_public_key_from_bytes`](#0x1_multi_ed25519_new_validated_public_key_from_bytes)
+-  [Function `new_validated_public_key_from_bytes_v2`](#0x1_multi_ed25519_new_validated_public_key_from_bytes_v2)
+-  [Function `new_signature_from_bytes`](#0x1_multi_ed25519_new_signature_from_bytes)
+-  [Function `public_key_to_unvalidated`](#0x1_multi_ed25519_public_key_to_unvalidated)
+-  [Function `public_key_into_unvalidated`](#0x1_multi_ed25519_public_key_into_unvalidated)
+-  [Function `unvalidated_public_key_to_bytes`](#0x1_multi_ed25519_unvalidated_public_key_to_bytes)
+-  [Function `validated_public_key_to_bytes`](#0x1_multi_ed25519_validated_public_key_to_bytes)
+-  [Function `signature_to_bytes`](#0x1_multi_ed25519_signature_to_bytes)
+-  [Function `public_key_validate`](#0x1_multi_ed25519_public_key_validate)
+-  [Function `public_key_validate_v2`](#0x1_multi_ed25519_public_key_validate_v2)
+-  [Function `signature_verify_strict`](#0x1_multi_ed25519_signature_verify_strict)
+-  [Function `signature_verify_strict_t`](#0x1_multi_ed25519_signature_verify_strict_t)
+-  [Function `unvalidated_public_key_to_authentication_key`](#0x1_multi_ed25519_unvalidated_public_key_to_authentication_key)
+-  [Function `unvalidated_public_key_num_sub_pks`](#0x1_multi_ed25519_unvalidated_public_key_num_sub_pks)
+-  [Function `unvalidated_public_key_threshold`](#0x1_multi_ed25519_unvalidated_public_key_threshold)
+-  [Function `validated_public_key_to_authentication_key`](#0x1_multi_ed25519_validated_public_key_to_authentication_key)
+-  [Function `validated_public_key_num_sub_pks`](#0x1_multi_ed25519_validated_public_key_num_sub_pks)
+-  [Function `validated_public_key_threshold`](#0x1_multi_ed25519_validated_public_key_threshold)
+-  [Function `check_and_get_threshold`](#0x1_multi_ed25519_check_and_get_threshold)
+-  [Function `public_key_bytes_to_authentication_key`](#0x1_multi_ed25519_public_key_bytes_to_authentication_key)
+-  [Function `public_key_validate_internal`](#0x1_multi_ed25519_public_key_validate_internal)
+-  [Function `public_key_validate_v2_internal`](#0x1_multi_ed25519_public_key_validate_v2_internal)
+-  [Function `signature_verify_strict_internal`](#0x1_multi_ed25519_signature_verify_strict_internal)
+-  [Specification](#@Specification_1)
+    -  [Function `new_unvalidated_public_key_from_bytes`](#@Specification_1_new_unvalidated_public_key_from_bytes)
+    -  [Function `new_validated_public_key_from_bytes`](#@Specification_1_new_validated_public_key_from_bytes)
+    -  [Function `new_validated_public_key_from_bytes_v2`](#@Specification_1_new_validated_public_key_from_bytes_v2)
+    -  [Function `new_signature_from_bytes`](#@Specification_1_new_signature_from_bytes)
+    -  [Function `unvalidated_public_key_num_sub_pks`](#@Specification_1_unvalidated_public_key_num_sub_pks)
+    -  [Function `unvalidated_public_key_threshold`](#@Specification_1_unvalidated_public_key_threshold)
+    -  [Function `validated_public_key_num_sub_pks`](#@Specification_1_validated_public_key_num_sub_pks)
+    -  [Function `validated_public_key_threshold`](#@Specification_1_validated_public_key_threshold)
+    -  [Function `check_and_get_threshold`](#@Specification_1_check_and_get_threshold)
+    -  [Function `public_key_bytes_to_authentication_key`](#@Specification_1_public_key_bytes_to_authentication_key)
+    -  [Function `public_key_validate_internal`](#@Specification_1_public_key_validate_internal)
+    -  [Function `public_key_validate_v2_internal`](#@Specification_1_public_key_validate_v2_internal)
+    -  [Function `signature_verify_strict_internal`](#@Specification_1_signature_verify_strict_internal)
+    -  [Helper functions](#@Helper_functions_2)
+
+
+<pre><code><b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs">0x1::bcs</a>;
+<b>use</b> <a href="ed25519.md#0x1_ed25519">0x1::ed25519</a>;
+<b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features">0x1::features</a>;
+<b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/hash.md#0x1_hash">0x1::hash</a>;
+<b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option">0x1::option</a>;
+</code></pre>
+
+
+
+<a id="0x1_multi_ed25519_UnvalidatedPublicKey"></a>
+
+## Struct `UnvalidatedPublicKey`
+
+An *unvalidated*, k out of n MultiEd25519 public key. The <code>bytes</code> field contains (1) several chunks of
+<code><a href="ed25519.md#0x1_ed25519_PUBLIC_KEY_NUM_BYTES">ed25519::PUBLIC_KEY_NUM_BYTES</a></code> bytes, each encoding a Ed25519 PK, and (2) a single byte encoding the threshold k.
+*Unvalidated* means there is no guarantee that the underlying PKs are valid elliptic curve points of non-small
+order.
+
+
+<pre><code><b>struct</b> <a href="multi_ed25519.md#0x1_multi_ed25519_UnvalidatedPublicKey">UnvalidatedPublicKey</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_multi_ed25519_ValidatedPublicKey"></a>
+
+## Struct `ValidatedPublicKey`
+
+A *validated* k out of n MultiEd25519 public key. *Validated* means that all the underlying PKs will be
+elliptic curve points that are NOT of small-order. It does not necessarily mean they will be prime-order points.
+This struct encodes the public key exactly as <code><a href="multi_ed25519.md#0x1_multi_ed25519_UnvalidatedPublicKey">UnvalidatedPublicKey</a></code>.
+
+For now, this struct is not used in any verification functions, but it might be in the future.
+
+
+<pre><code><b>struct</b> <a href="multi_ed25519.md#0x1_multi_ed25519_ValidatedPublicKey">ValidatedPublicKey</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_multi_ed25519_Signature"></a>
+
+## Struct `Signature`
+
+A purported MultiEd25519 multi-signature that can be verified via <code>signature_verify_strict</code> or
+<code>signature_verify_strict_t</code>. The <code>bytes</code> field contains (1) several chunks of <code><a href="ed25519.md#0x1_ed25519_SIGNATURE_NUM_BYTES">ed25519::SIGNATURE_NUM_BYTES</a></code>
+bytes, each encoding a Ed25519 signature, and (2) a <code><a href="multi_ed25519.md#0x1_multi_ed25519_BITMAP_NUM_OF_BYTES">BITMAP_NUM_OF_BYTES</a></code>-byte bitmap encoding the signer
+identities.
+
+
+<pre><code><b>struct</b> <a href="multi_ed25519.md#0x1_multi_ed25519_Signature">Signature</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_multi_ed25519_E_NATIVE_FUN_NOT_AVAILABLE"></a>
+
+The native functions have not been rolled out yet.
+
+
+<pre><code><b>const</b> <a href="multi_ed25519.md#0x1_multi_ed25519_E_NATIVE_FUN_NOT_AVAILABLE">E_NATIVE_FUN_NOT_AVAILABLE</a>: u64 = 4;
+</code></pre>
+
+
+
+<a id="0x1_multi_ed25519_E_WRONG_PUBKEY_SIZE"></a>
+
+Wrong number of bytes were given as input when deserializing an Ed25519 public key.
+
+
+<pre><code><b>const</b> <a href="multi_ed25519.md#0x1_multi_ed25519_E_WRONG_PUBKEY_SIZE">E_WRONG_PUBKEY_SIZE</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_multi_ed25519_E_WRONG_SIGNATURE_SIZE"></a>
+
+Wrong number of bytes were given as input when deserializing an Ed25519 signature.
+
+
+<pre><code><b>const</b> <a href="multi_ed25519.md#0x1_multi_ed25519_E_WRONG_SIGNATURE_SIZE">E_WRONG_SIGNATURE_SIZE</a>: u64 = 2;
+</code></pre>
+
+
+
+<a id="0x1_multi_ed25519_SIGNATURE_SCHEME_ID"></a>
+
+The identifier of the MultiEd25519 signature scheme, which is used when deriving Aptos authentication keys by hashing
+it together with an MultiEd25519 public key.
+
+
+<pre><code><b>const</b> <a href="multi_ed25519.md#0x1_multi_ed25519_SIGNATURE_SCHEME_ID">SIGNATURE_SCHEME_ID</a>: u8 = 1;
+</code></pre>
+
+
+
+<a id="0x1_multi_ed25519_BITMAP_NUM_OF_BYTES"></a>
+
+When serializing a MultiEd25519 signature, the bitmap that indicates the signers will be encoded using this many
+bytes.
+
+
+<pre><code><b>const</b> <a href="multi_ed25519.md#0x1_multi_ed25519_BITMAP_NUM_OF_BYTES">BITMAP_NUM_OF_BYTES</a>: u64 = 4;
+</code></pre>
+
+
+
+<a id="0x1_multi_ed25519_E_INVALID_THRESHOLD_OR_NUMBER_OF_SIGNERS"></a>
+
+The threshold must be in the range <code>[1, n]</code>, where n is the total number of signers.
+
+
+<pre><code><b>const</b> <a href="multi_ed25519.md#0x1_multi_ed25519_E_INVALID_THRESHOLD_OR_NUMBER_OF_SIGNERS">E_INVALID_THRESHOLD_OR_NUMBER_OF_SIGNERS</a>: u64 = 3;
+</code></pre>
+
+
+
+<a id="0x1_multi_ed25519_INDIVIDUAL_PUBLIC_KEY_NUM_BYTES"></a>
+
+The size of an individual Ed25519 public key, in bytes.
+(A MultiEd25519 public key consists of several of these, plus the threshold.)
+
+
+<pre><code><b>const</b> <a href="multi_ed25519.md#0x1_multi_ed25519_INDIVIDUAL_PUBLIC_KEY_NUM_BYTES">INDIVIDUAL_PUBLIC_KEY_NUM_BYTES</a>: u64 = 32;
+</code></pre>
+
+
+
+<a id="0x1_multi_ed25519_INDIVIDUAL_SIGNATURE_NUM_BYTES"></a>
+
+The size of an individual Ed25519 signature, in bytes.
+(A MultiEd25519 signature consists of several of these, plus the signer bitmap.)
+
+
+<pre><code><b>const</b> <a href="multi_ed25519.md#0x1_multi_ed25519_INDIVIDUAL_SIGNATURE_NUM_BYTES">INDIVIDUAL_SIGNATURE_NUM_BYTES</a>: u64 = 64;
+</code></pre>
+
+
+
+<a id="0x1_multi_ed25519_MAX_NUMBER_OF_PUBLIC_KEYS"></a>
+
+Max number of ed25519 public keys allowed in multi-ed25519 keys
+
+
+<pre><code><b>const</b> <a href="multi_ed25519.md#0x1_multi_ed25519_MAX_NUMBER_OF_PUBLIC_KEYS">MAX_NUMBER_OF_PUBLIC_KEYS</a>: u64 = 32;
+</code></pre>
+
+
+
+<a id="0x1_multi_ed25519_THRESHOLD_SIZE_BYTES"></a>
+
+When serializing a MultiEd25519 public key, the threshold k will be encoded using this many bytes.
+
+
+<pre><code><b>const</b> <a href="multi_ed25519.md#0x1_multi_ed25519_THRESHOLD_SIZE_BYTES">THRESHOLD_SIZE_BYTES</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_multi_ed25519_new_unvalidated_public_key_from_bytes"></a>
+
+## Function `new_unvalidated_public_key_from_bytes`
+
+Parses the input 32 bytes as an *unvalidated* MultiEd25519 public key.
+
+NOTE: This function could have also checked that the # of sub-PKs is > 0, but it did not. However, since such
+invalid PKs are rejected during signature verification  (see <code>bugfix_unvalidated_pk_from_zero_subpks</code>) they
+will not cause problems.
+
+We could fix this API by adding a new one that checks the # of sub-PKs is > 0, but it is likely not a good idea
+to reproduce the PK validation logic in Move. We should not have done so in the first place. Instead, we will
+leave it as is and continue assuming <code><a href="multi_ed25519.md#0x1_multi_ed25519_UnvalidatedPublicKey">UnvalidatedPublicKey</a></code> objects could be invalid PKs that will safely be
+rejected during signature verification.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_new_unvalidated_public_key_from_bytes">new_unvalidated_public_key_from_bytes</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="multi_ed25519.md#0x1_multi_ed25519_UnvalidatedPublicKey">multi_ed25519::UnvalidatedPublicKey</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_new_unvalidated_public_key_from_bytes">new_unvalidated_public_key_from_bytes</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="multi_ed25519.md#0x1_multi_ed25519_UnvalidatedPublicKey">UnvalidatedPublicKey</a> {
+    <b>let</b> len = <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&bytes);
+    <b>let</b> num_sub_pks = len / <a href="multi_ed25519.md#0x1_multi_ed25519_INDIVIDUAL_PUBLIC_KEY_NUM_BYTES">INDIVIDUAL_PUBLIC_KEY_NUM_BYTES</a>;
+
+    <b>assert</b>!(num_sub_pks &lt;= <a href="multi_ed25519.md#0x1_multi_ed25519_MAX_NUMBER_OF_PUBLIC_KEYS">MAX_NUMBER_OF_PUBLIC_KEYS</a>, <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="multi_ed25519.md#0x1_multi_ed25519_E_WRONG_PUBKEY_SIZE">E_WRONG_PUBKEY_SIZE</a>));
+    <b>assert</b>!(len % <a href="multi_ed25519.md#0x1_multi_ed25519_INDIVIDUAL_PUBLIC_KEY_NUM_BYTES">INDIVIDUAL_PUBLIC_KEY_NUM_BYTES</a> == <a href="multi_ed25519.md#0x1_multi_ed25519_THRESHOLD_SIZE_BYTES">THRESHOLD_SIZE_BYTES</a>, <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="multi_ed25519.md#0x1_multi_ed25519_E_WRONG_PUBKEY_SIZE">E_WRONG_PUBKEY_SIZE</a>));
+    <a href="multi_ed25519.md#0x1_multi_ed25519_UnvalidatedPublicKey">UnvalidatedPublicKey</a> { bytes }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multi_ed25519_new_validated_public_key_from_bytes"></a>
+
+## Function `new_validated_public_key_from_bytes`
+
+DEPRECATED: Use <code>new_validated_public_key_from_bytes_v2</code> instead. See <code>public_key_validate_internal</code> comments.
+
+(Incorrectly) parses the input bytes as a *validated* MultiEd25519 public key.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_new_validated_public_key_from_bytes">new_validated_public_key_from_bytes</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="multi_ed25519.md#0x1_multi_ed25519_ValidatedPublicKey">multi_ed25519::ValidatedPublicKey</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_new_validated_public_key_from_bytes">new_validated_public_key_from_bytes</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): Option&lt;<a href="multi_ed25519.md#0x1_multi_ed25519_ValidatedPublicKey">ValidatedPublicKey</a>&gt; {
+    // Note that `public_key_validate_internal` will check that `<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&bytes) / <a href="multi_ed25519.md#0x1_multi_ed25519_INDIVIDUAL_PUBLIC_KEY_NUM_BYTES">INDIVIDUAL_PUBLIC_KEY_NUM_BYTES</a> &lt;= <a href="multi_ed25519.md#0x1_multi_ed25519_MAX_NUMBER_OF_PUBLIC_KEYS">MAX_NUMBER_OF_PUBLIC_KEYS</a>`.
+    <b>if</b> (<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&bytes) % <a href="multi_ed25519.md#0x1_multi_ed25519_INDIVIDUAL_PUBLIC_KEY_NUM_BYTES">INDIVIDUAL_PUBLIC_KEY_NUM_BYTES</a> == <a href="multi_ed25519.md#0x1_multi_ed25519_THRESHOLD_SIZE_BYTES">THRESHOLD_SIZE_BYTES</a> &&
+        <a href="multi_ed25519.md#0x1_multi_ed25519_public_key_validate_internal">public_key_validate_internal</a>(bytes)) {
+        <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(<a href="multi_ed25519.md#0x1_multi_ed25519_ValidatedPublicKey">ValidatedPublicKey</a> {
+            bytes
+        })
+    } <b>else</b> {
+        <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>&lt;<a href="multi_ed25519.md#0x1_multi_ed25519_ValidatedPublicKey">ValidatedPublicKey</a>&gt;()
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multi_ed25519_new_validated_public_key_from_bytes_v2"></a>
+
+## Function `new_validated_public_key_from_bytes_v2`
+
+Parses the input bytes as a *validated* MultiEd25519 public key (see <code>public_key_validate_internal_v2</code>).
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_new_validated_public_key_from_bytes_v2">new_validated_public_key_from_bytes_v2</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="multi_ed25519.md#0x1_multi_ed25519_ValidatedPublicKey">multi_ed25519::ValidatedPublicKey</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_new_validated_public_key_from_bytes_v2">new_validated_public_key_from_bytes_v2</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): Option&lt;<a href="multi_ed25519.md#0x1_multi_ed25519_ValidatedPublicKey">ValidatedPublicKey</a>&gt; {
+    <b>if</b> (!<a href="../../../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_multi_ed25519_pk_validate_v2_enabled">features::multi_ed25519_pk_validate_v2_enabled</a>()) {
+        <b>abort</b>(<a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="multi_ed25519.md#0x1_multi_ed25519_E_NATIVE_FUN_NOT_AVAILABLE">E_NATIVE_FUN_NOT_AVAILABLE</a>))
+    };
+
+    <b>if</b> (<a href="multi_ed25519.md#0x1_multi_ed25519_public_key_validate_v2_internal">public_key_validate_v2_internal</a>(bytes)) {
+        <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(<a href="multi_ed25519.md#0x1_multi_ed25519_ValidatedPublicKey">ValidatedPublicKey</a> {
+            bytes
+        })
+    } <b>else</b> {
+        <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>&lt;<a href="multi_ed25519.md#0x1_multi_ed25519_ValidatedPublicKey">ValidatedPublicKey</a>&gt;()
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multi_ed25519_new_signature_from_bytes"></a>
+
+## Function `new_signature_from_bytes`
+
+Parses the input bytes as a purported MultiEd25519 multi-signature.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_new_signature_from_bytes">new_signature_from_bytes</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="multi_ed25519.md#0x1_multi_ed25519_Signature">multi_ed25519::Signature</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_new_signature_from_bytes">new_signature_from_bytes</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="multi_ed25519.md#0x1_multi_ed25519_Signature">Signature</a> {
+    <b>assert</b>!(<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&bytes) % <a href="multi_ed25519.md#0x1_multi_ed25519_INDIVIDUAL_SIGNATURE_NUM_BYTES">INDIVIDUAL_SIGNATURE_NUM_BYTES</a> == <a href="multi_ed25519.md#0x1_multi_ed25519_BITMAP_NUM_OF_BYTES">BITMAP_NUM_OF_BYTES</a>, <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="multi_ed25519.md#0x1_multi_ed25519_E_WRONG_SIGNATURE_SIZE">E_WRONG_SIGNATURE_SIZE</a>));
+    <a href="multi_ed25519.md#0x1_multi_ed25519_Signature">Signature</a> { bytes }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multi_ed25519_public_key_to_unvalidated"></a>
+
+## Function `public_key_to_unvalidated`
+
+Converts a ValidatedPublicKey to an UnvalidatedPublicKey, which can be used in the strict verification APIs.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_public_key_to_unvalidated">public_key_to_unvalidated</a>(pk: &<a href="multi_ed25519.md#0x1_multi_ed25519_ValidatedPublicKey">multi_ed25519::ValidatedPublicKey</a>): <a href="multi_ed25519.md#0x1_multi_ed25519_UnvalidatedPublicKey">multi_ed25519::UnvalidatedPublicKey</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_public_key_to_unvalidated">public_key_to_unvalidated</a>(pk: &<a href="multi_ed25519.md#0x1_multi_ed25519_ValidatedPublicKey">ValidatedPublicKey</a>): <a href="multi_ed25519.md#0x1_multi_ed25519_UnvalidatedPublicKey">UnvalidatedPublicKey</a> {
+    <a href="multi_ed25519.md#0x1_multi_ed25519_UnvalidatedPublicKey">UnvalidatedPublicKey</a> {
+        bytes: pk.bytes
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multi_ed25519_public_key_into_unvalidated"></a>
+
+## Function `public_key_into_unvalidated`
+
+Moves a ValidatedPublicKey into an UnvalidatedPublicKey, which can be used in the strict verification APIs.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_public_key_into_unvalidated">public_key_into_unvalidated</a>(pk: <a href="multi_ed25519.md#0x1_multi_ed25519_ValidatedPublicKey">multi_ed25519::ValidatedPublicKey</a>): <a href="multi_ed25519.md#0x1_multi_ed25519_UnvalidatedPublicKey">multi_ed25519::UnvalidatedPublicKey</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_public_key_into_unvalidated">public_key_into_unvalidated</a>(pk: <a href="multi_ed25519.md#0x1_multi_ed25519_ValidatedPublicKey">ValidatedPublicKey</a>): <a href="multi_ed25519.md#0x1_multi_ed25519_UnvalidatedPublicKey">UnvalidatedPublicKey</a> {
+    <a href="multi_ed25519.md#0x1_multi_ed25519_UnvalidatedPublicKey">UnvalidatedPublicKey</a> {
+        bytes: pk.bytes
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multi_ed25519_unvalidated_public_key_to_bytes"></a>
+
+## Function `unvalidated_public_key_to_bytes`
+
+Serializes an UnvalidatedPublicKey struct to 32-bytes.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_unvalidated_public_key_to_bytes">unvalidated_public_key_to_bytes</a>(pk: &<a href="multi_ed25519.md#0x1_multi_ed25519_UnvalidatedPublicKey">multi_ed25519::UnvalidatedPublicKey</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_unvalidated_public_key_to_bytes">unvalidated_public_key_to_bytes</a>(pk: &<a href="multi_ed25519.md#0x1_multi_ed25519_UnvalidatedPublicKey">UnvalidatedPublicKey</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; {
+    pk.bytes
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multi_ed25519_validated_public_key_to_bytes"></a>
+
+## Function `validated_public_key_to_bytes`
+
+Serializes a ValidatedPublicKey struct to 32-bytes.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_validated_public_key_to_bytes">validated_public_key_to_bytes</a>(pk: &<a href="multi_ed25519.md#0x1_multi_ed25519_ValidatedPublicKey">multi_ed25519::ValidatedPublicKey</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_validated_public_key_to_bytes">validated_public_key_to_bytes</a>(pk: &<a href="multi_ed25519.md#0x1_multi_ed25519_ValidatedPublicKey">ValidatedPublicKey</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; {
+    pk.bytes
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multi_ed25519_signature_to_bytes"></a>
+
+## Function `signature_to_bytes`
+
+Serializes a Signature struct to 64-bytes.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_signature_to_bytes">signature_to_bytes</a>(sig: &<a href="multi_ed25519.md#0x1_multi_ed25519_Signature">multi_ed25519::Signature</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_signature_to_bytes">signature_to_bytes</a>(sig: &<a href="multi_ed25519.md#0x1_multi_ed25519_Signature">Signature</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; {
+    sig.bytes
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multi_ed25519_public_key_validate"></a>
+
+## Function `public_key_validate`
+
+DEPRECATED: Use <code>public_key_validate_v2</code> instead. See <code>public_key_validate_internal</code> comments.
+
+Takes in an *unvalidated* public key and attempts to validate it.
+Returns <code>Some(<a href="multi_ed25519.md#0x1_multi_ed25519_ValidatedPublicKey">ValidatedPublicKey</a>)</code> if successful and <code>None</code> otherwise.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_public_key_validate">public_key_validate</a>(pk: &<a href="multi_ed25519.md#0x1_multi_ed25519_UnvalidatedPublicKey">multi_ed25519::UnvalidatedPublicKey</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="multi_ed25519.md#0x1_multi_ed25519_ValidatedPublicKey">multi_ed25519::ValidatedPublicKey</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_public_key_validate">public_key_validate</a>(pk: &<a href="multi_ed25519.md#0x1_multi_ed25519_UnvalidatedPublicKey">UnvalidatedPublicKey</a>): Option&lt;<a href="multi_ed25519.md#0x1_multi_ed25519_ValidatedPublicKey">ValidatedPublicKey</a>&gt; {
+    <a href="multi_ed25519.md#0x1_multi_ed25519_new_validated_public_key_from_bytes">new_validated_public_key_from_bytes</a>(pk.bytes)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multi_ed25519_public_key_validate_v2"></a>
+
+## Function `public_key_validate_v2`
+
+Takes in an *unvalidated* public key and attempts to validate it.
+Returns <code>Some(<a href="multi_ed25519.md#0x1_multi_ed25519_ValidatedPublicKey">ValidatedPublicKey</a>)</code> if successful and <code>None</code> otherwise.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_public_key_validate_v2">public_key_validate_v2</a>(pk: &<a href="multi_ed25519.md#0x1_multi_ed25519_UnvalidatedPublicKey">multi_ed25519::UnvalidatedPublicKey</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="multi_ed25519.md#0x1_multi_ed25519_ValidatedPublicKey">multi_ed25519::ValidatedPublicKey</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_public_key_validate_v2">public_key_validate_v2</a>(pk: &<a href="multi_ed25519.md#0x1_multi_ed25519_UnvalidatedPublicKey">UnvalidatedPublicKey</a>): Option&lt;<a href="multi_ed25519.md#0x1_multi_ed25519_ValidatedPublicKey">ValidatedPublicKey</a>&gt; {
+    <a href="multi_ed25519.md#0x1_multi_ed25519_new_validated_public_key_from_bytes_v2">new_validated_public_key_from_bytes_v2</a>(pk.bytes)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multi_ed25519_signature_verify_strict"></a>
+
+## Function `signature_verify_strict`
+
+Verifies a purported MultiEd25519 <code>multisignature</code> under an *unvalidated* <code>public_key</code> on the specified <code>message</code>.
+This call will validate the public key by checking it is NOT in the small subgroup.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_signature_verify_strict">signature_verify_strict</a>(multisignature: &<a href="multi_ed25519.md#0x1_multi_ed25519_Signature">multi_ed25519::Signature</a>, public_key: &<a href="multi_ed25519.md#0x1_multi_ed25519_UnvalidatedPublicKey">multi_ed25519::UnvalidatedPublicKey</a>, message: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_signature_verify_strict">signature_verify_strict</a>(
+    multisignature: &<a href="multi_ed25519.md#0x1_multi_ed25519_Signature">Signature</a>,
+    public_key: &<a href="multi_ed25519.md#0x1_multi_ed25519_UnvalidatedPublicKey">UnvalidatedPublicKey</a>,
+    message: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+): bool {
+    <a href="multi_ed25519.md#0x1_multi_ed25519_signature_verify_strict_internal">signature_verify_strict_internal</a>(multisignature.bytes, public_key.bytes, message)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multi_ed25519_signature_verify_strict_t"></a>
+
+## Function `signature_verify_strict_t`
+
+This function is used to verify a multi-signature on any BCS-serializable type T. For now, it is used to verify the
+proof of private key ownership when rotating authentication keys.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_signature_verify_strict_t">signature_verify_strict_t</a>&lt;T: drop&gt;(multisignature: &<a href="multi_ed25519.md#0x1_multi_ed25519_Signature">multi_ed25519::Signature</a>, public_key: &<a href="multi_ed25519.md#0x1_multi_ed25519_UnvalidatedPublicKey">multi_ed25519::UnvalidatedPublicKey</a>, data: T): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_signature_verify_strict_t">signature_verify_strict_t</a>&lt;T: drop&gt;(multisignature: &<a href="multi_ed25519.md#0x1_multi_ed25519_Signature">Signature</a>, public_key: &<a href="multi_ed25519.md#0x1_multi_ed25519_UnvalidatedPublicKey">UnvalidatedPublicKey</a>, data: T): bool {
+    <b>let</b> encoded = <a href="ed25519.md#0x1_ed25519_new_signed_message">ed25519::new_signed_message</a>(data);
+
+    <a href="multi_ed25519.md#0x1_multi_ed25519_signature_verify_strict_internal">signature_verify_strict_internal</a>(multisignature.bytes, public_key.bytes, <a href="../../../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs_to_bytes">bcs::to_bytes</a>(&encoded))
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multi_ed25519_unvalidated_public_key_to_authentication_key"></a>
+
+## Function `unvalidated_public_key_to_authentication_key`
+
+Derives the Aptos-specific authentication key of the given Ed25519 public key.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_unvalidated_public_key_to_authentication_key">unvalidated_public_key_to_authentication_key</a>(pk: &<a href="multi_ed25519.md#0x1_multi_ed25519_UnvalidatedPublicKey">multi_ed25519::UnvalidatedPublicKey</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_unvalidated_public_key_to_authentication_key">unvalidated_public_key_to_authentication_key</a>(pk: &<a href="multi_ed25519.md#0x1_multi_ed25519_UnvalidatedPublicKey">UnvalidatedPublicKey</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; {
+    <a href="multi_ed25519.md#0x1_multi_ed25519_public_key_bytes_to_authentication_key">public_key_bytes_to_authentication_key</a>(pk.bytes)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multi_ed25519_unvalidated_public_key_num_sub_pks"></a>
+
+## Function `unvalidated_public_key_num_sub_pks`
+
+Returns the number n of sub-PKs in an unvalidated t-out-of-n MultiEd25519 PK.
+If this <code><a href="multi_ed25519.md#0x1_multi_ed25519_UnvalidatedPublicKey">UnvalidatedPublicKey</a></code> would pass validation in <code>public_key_validate</code>, then the returned # of sub-PKs
+can be relied upon as correct.
+
+We provide this API as a cheaper alternative to calling <code>public_key_validate</code> and then <code>validated_public_key_num_sub_pks</code>
+when the input <code>pk</code> is known to be valid.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_unvalidated_public_key_num_sub_pks">unvalidated_public_key_num_sub_pks</a>(pk: &<a href="multi_ed25519.md#0x1_multi_ed25519_UnvalidatedPublicKey">multi_ed25519::UnvalidatedPublicKey</a>): u8
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_unvalidated_public_key_num_sub_pks">unvalidated_public_key_num_sub_pks</a>(pk: &<a href="multi_ed25519.md#0x1_multi_ed25519_UnvalidatedPublicKey">UnvalidatedPublicKey</a>): u8 {
+    <b>let</b> len = <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&pk.bytes);
+
+    ((len / <a href="multi_ed25519.md#0x1_multi_ed25519_INDIVIDUAL_PUBLIC_KEY_NUM_BYTES">INDIVIDUAL_PUBLIC_KEY_NUM_BYTES</a>) <b>as</b> u8)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multi_ed25519_unvalidated_public_key_threshold"></a>
+
+## Function `unvalidated_public_key_threshold`
+
+Returns the number t of sub-PKs in an unvalidated t-out-of-n MultiEd25519 PK (i.e., the threshold) or <code>None</code>
+if <code>bytes</code> does not correctly encode such a PK.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_unvalidated_public_key_threshold">unvalidated_public_key_threshold</a>(pk: &<a href="multi_ed25519.md#0x1_multi_ed25519_UnvalidatedPublicKey">multi_ed25519::UnvalidatedPublicKey</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_unvalidated_public_key_threshold">unvalidated_public_key_threshold</a>(pk: &<a href="multi_ed25519.md#0x1_multi_ed25519_UnvalidatedPublicKey">UnvalidatedPublicKey</a>): Option&lt;u8&gt; {
+    <a href="multi_ed25519.md#0x1_multi_ed25519_check_and_get_threshold">check_and_get_threshold</a>(pk.bytes)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multi_ed25519_validated_public_key_to_authentication_key"></a>
+
+## Function `validated_public_key_to_authentication_key`
+
+Derives the Aptos-specific authentication key of the given Ed25519 public key.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_validated_public_key_to_authentication_key">validated_public_key_to_authentication_key</a>(pk: &<a href="multi_ed25519.md#0x1_multi_ed25519_ValidatedPublicKey">multi_ed25519::ValidatedPublicKey</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_validated_public_key_to_authentication_key">validated_public_key_to_authentication_key</a>(pk: &<a href="multi_ed25519.md#0x1_multi_ed25519_ValidatedPublicKey">ValidatedPublicKey</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; {
+    <a href="multi_ed25519.md#0x1_multi_ed25519_public_key_bytes_to_authentication_key">public_key_bytes_to_authentication_key</a>(pk.bytes)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multi_ed25519_validated_public_key_num_sub_pks"></a>
+
+## Function `validated_public_key_num_sub_pks`
+
+Returns the number n of sub-PKs in a validated t-out-of-n MultiEd25519 PK.
+Since the format of this PK has been validated, the returned # of sub-PKs is guaranteed to be correct.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_validated_public_key_num_sub_pks">validated_public_key_num_sub_pks</a>(pk: &<a href="multi_ed25519.md#0x1_multi_ed25519_ValidatedPublicKey">multi_ed25519::ValidatedPublicKey</a>): u8
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_validated_public_key_num_sub_pks">validated_public_key_num_sub_pks</a>(pk: &<a href="multi_ed25519.md#0x1_multi_ed25519_ValidatedPublicKey">ValidatedPublicKey</a>): u8 {
+    <b>let</b> len = <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&pk.bytes);
+
+    ((len / <a href="multi_ed25519.md#0x1_multi_ed25519_INDIVIDUAL_PUBLIC_KEY_NUM_BYTES">INDIVIDUAL_PUBLIC_KEY_NUM_BYTES</a>) <b>as</b> u8)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multi_ed25519_validated_public_key_threshold"></a>
+
+## Function `validated_public_key_threshold`
+
+Returns the number t of sub-PKs in a validated t-out-of-n MultiEd25519 PK (i.e., the threshold).
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_validated_public_key_threshold">validated_public_key_threshold</a>(pk: &<a href="multi_ed25519.md#0x1_multi_ed25519_ValidatedPublicKey">multi_ed25519::ValidatedPublicKey</a>): u8
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_validated_public_key_threshold">validated_public_key_threshold</a>(pk: &<a href="multi_ed25519.md#0x1_multi_ed25519_ValidatedPublicKey">ValidatedPublicKey</a>): u8 {
+    <b>let</b> len = <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&pk.bytes);
+    <b>let</b> threshold_byte = *<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(&pk.bytes, len - 1);
+
+    threshold_byte
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multi_ed25519_check_and_get_threshold"></a>
+
+## Function `check_and_get_threshold`
+
+Checks that the serialized format of a t-out-of-n MultiEd25519 PK correctly encodes 1 <= n <= 32 sub-PKs.
+(All <code><a href="multi_ed25519.md#0x1_multi_ed25519_ValidatedPublicKey">ValidatedPublicKey</a></code> objects are guaranteed to pass this check.)
+Returns the threshold t <= n of the PK.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_check_and_get_threshold">check_and_get_threshold</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_check_and_get_threshold">check_and_get_threshold</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): Option&lt;u8&gt; {
+    <b>let</b> len = <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&bytes);
+    <b>if</b> (len == 0) {
+        <b>return</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>&lt;u8&gt;()
+    };
+
+    <b>let</b> threshold_num_of_bytes = len % <a href="multi_ed25519.md#0x1_multi_ed25519_INDIVIDUAL_PUBLIC_KEY_NUM_BYTES">INDIVIDUAL_PUBLIC_KEY_NUM_BYTES</a>;
+    <b>let</b> num_of_keys = len / <a href="multi_ed25519.md#0x1_multi_ed25519_INDIVIDUAL_PUBLIC_KEY_NUM_BYTES">INDIVIDUAL_PUBLIC_KEY_NUM_BYTES</a>;
+    <b>let</b> threshold_byte = *<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(&bytes, len - 1);
+
+    <b>if</b> (num_of_keys == 0 || num_of_keys &gt; <a href="multi_ed25519.md#0x1_multi_ed25519_MAX_NUMBER_OF_PUBLIC_KEYS">MAX_NUMBER_OF_PUBLIC_KEYS</a> || threshold_num_of_bytes != 1) {
+        <b>return</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>&lt;u8&gt;()
+    } <b>else</b> <b>if</b> (threshold_byte == 0 || threshold_byte &gt; (num_of_keys <b>as</b> u8)) {
+        <b>return</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>&lt;u8&gt;()
+    } <b>else</b> {
+        <b>return</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(threshold_byte)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multi_ed25519_public_key_bytes_to_authentication_key"></a>
+
+## Function `public_key_bytes_to_authentication_key`
+
+Derives the Aptos-specific authentication key of the given Ed25519 public key.
+
+
+<pre><code><b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_public_key_bytes_to_authentication_key">public_key_bytes_to_authentication_key</a>(pk_bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_public_key_bytes_to_authentication_key">public_key_bytes_to_authentication_key</a>(pk_bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; {
+    <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_push_back">vector::push_back</a>(&<b>mut</b> pk_bytes, <a href="multi_ed25519.md#0x1_multi_ed25519_SIGNATURE_SCHEME_ID">SIGNATURE_SCHEME_ID</a>);
+    std::hash::sha3_256(pk_bytes)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multi_ed25519_public_key_validate_internal"></a>
+
+## Function `public_key_validate_internal`
+
+DEPRECATED: Use <code>public_key_validate_internal_v2</code> instead. This function was NOT correctly implemented:
+
+1. It does not check that the # of sub public keys is > 0, which leads to invalid <code><a href="multi_ed25519.md#0x1_multi_ed25519_ValidatedPublicKey">ValidatedPublicKey</a></code> objects
+against which no signature will verify, since <code>signature_verify_strict_internal</code> will reject such invalid PKs.
+This is not a security issue, but a correctness issue. See <code>bugfix_validated_pk_from_zero_subpks</code>.
+2. It charges too much gas: if the first sub-PK is invalid, it will charge for verifying all remaining sub-PKs.
+
+DEPRECATES:
+- new_validated_public_key_from_bytes
+- public_key_validate
+
+Return <code><b>true</b></code> if the bytes in <code>public_key</code> can be parsed as a valid MultiEd25519 public key: i.e., all underlying
+PKs pass point-on-curve and not-in-small-subgroup checks.
+Returns <code><b>false</b></code> otherwise.
+
+
+<pre><code><b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_public_key_validate_internal">public_key_validate_internal</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_public_key_validate_internal">public_key_validate_internal</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multi_ed25519_public_key_validate_v2_internal"></a>
+
+## Function `public_key_validate_v2_internal`
+
+Return <code><b>true</b></code> if the bytes in <code>public_key</code> can be parsed as a valid MultiEd25519 public key: i.e., all underlying
+sub-PKs pass point-on-curve and not-in-small-subgroup checks.
+Returns <code><b>false</b></code> otherwise.
+
+
+<pre><code><b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_public_key_validate_v2_internal">public_key_validate_v2_internal</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_public_key_validate_v2_internal">public_key_validate_v2_internal</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_multi_ed25519_signature_verify_strict_internal"></a>
+
+## Function `signature_verify_strict_internal`
+
+Return true if the MultiEd25519 <code>multisignature</code> on <code>message</code> verifies against the MultiEd25519 <code>public_key</code>.
+Returns <code><b>false</b></code> if either:
+- The PKs in <code>public_key</code> do not all pass points-on-curve or not-in-small-subgroup checks,
+- The signatures in <code>multisignature</code> do not all pass points-on-curve or not-in-small-subgroup checks,
+- the <code>multisignature</code> on <code>message</code> does not verify.
+
+
+<pre><code><b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_signature_verify_strict_internal">signature_verify_strict_internal</a>(multisignature: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, public_key: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, message: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_signature_verify_strict_internal">signature_verify_strict_internal</a>(
+    multisignature: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    public_key: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    message: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+): bool;
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+<a id="@Specification_1_new_unvalidated_public_key_from_bytes"></a>
+
+### Function `new_unvalidated_public_key_from_bytes`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_new_unvalidated_public_key_from_bytes">new_unvalidated_public_key_from_bytes</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="multi_ed25519.md#0x1_multi_ed25519_UnvalidatedPublicKey">multi_ed25519::UnvalidatedPublicKey</a>
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="multi_ed25519.md#0x1_multi_ed25519_NewUnvalidatedPublicKeyFromBytesAbortsIf">NewUnvalidatedPublicKeyFromBytesAbortsIf</a>;
+<b>ensures</b> result == <a href="multi_ed25519.md#0x1_multi_ed25519_UnvalidatedPublicKey">UnvalidatedPublicKey</a> { bytes };
+</code></pre>
+
+
+
+
+<a id="0x1_multi_ed25519_NewUnvalidatedPublicKeyFromBytesAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="multi_ed25519.md#0x1_multi_ed25519_NewUnvalidatedPublicKeyFromBytesAbortsIf">NewUnvalidatedPublicKeyFromBytesAbortsIf</a> {
+    bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+    <b>let</b> length = len(bytes);
+    <b>aborts_if</b> length / <a href="multi_ed25519.md#0x1_multi_ed25519_INDIVIDUAL_PUBLIC_KEY_NUM_BYTES">INDIVIDUAL_PUBLIC_KEY_NUM_BYTES</a> &gt; <a href="multi_ed25519.md#0x1_multi_ed25519_MAX_NUMBER_OF_PUBLIC_KEYS">MAX_NUMBER_OF_PUBLIC_KEYS</a>;
+    <b>aborts_if</b> length % <a href="multi_ed25519.md#0x1_multi_ed25519_INDIVIDUAL_PUBLIC_KEY_NUM_BYTES">INDIVIDUAL_PUBLIC_KEY_NUM_BYTES</a> != <a href="multi_ed25519.md#0x1_multi_ed25519_THRESHOLD_SIZE_BYTES">THRESHOLD_SIZE_BYTES</a>;
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_new_validated_public_key_from_bytes"></a>
+
+### Function `new_validated_public_key_from_bytes`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_new_validated_public_key_from_bytes">new_validated_public_key_from_bytes</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="multi_ed25519.md#0x1_multi_ed25519_ValidatedPublicKey">multi_ed25519::ValidatedPublicKey</a>&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+<b>let</b> cond = len(bytes) % <a href="multi_ed25519.md#0x1_multi_ed25519_INDIVIDUAL_PUBLIC_KEY_NUM_BYTES">INDIVIDUAL_PUBLIC_KEY_NUM_BYTES</a> == <a href="multi_ed25519.md#0x1_multi_ed25519_THRESHOLD_SIZE_BYTES">THRESHOLD_SIZE_BYTES</a>
+    && <a href="multi_ed25519.md#0x1_multi_ed25519_spec_public_key_validate_internal">spec_public_key_validate_internal</a>(bytes);
+<b>ensures</b> cond ==&gt; result == <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_some">option::spec_some</a>(<a href="multi_ed25519.md#0x1_multi_ed25519_ValidatedPublicKey">ValidatedPublicKey</a>{bytes});
+<b>ensures</b> !cond ==&gt; result == <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_none">option::spec_none</a>&lt;<a href="multi_ed25519.md#0x1_multi_ed25519_ValidatedPublicKey">ValidatedPublicKey</a>&gt;();
+</code></pre>
+
+
+
+<a id="@Specification_1_new_validated_public_key_from_bytes_v2"></a>
+
+### Function `new_validated_public_key_from_bytes_v2`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_new_validated_public_key_from_bytes_v2">new_validated_public_key_from_bytes_v2</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="multi_ed25519.md#0x1_multi_ed25519_ValidatedPublicKey">multi_ed25519::ValidatedPublicKey</a>&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> cond = <a href="multi_ed25519.md#0x1_multi_ed25519_spec_public_key_validate_v2_internal">spec_public_key_validate_v2_internal</a>(bytes);
+<b>ensures</b> cond ==&gt; result == <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_some">option::spec_some</a>(<a href="multi_ed25519.md#0x1_multi_ed25519_ValidatedPublicKey">ValidatedPublicKey</a>{bytes});
+<b>ensures</b> !cond ==&gt; result == <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_none">option::spec_none</a>&lt;<a href="multi_ed25519.md#0x1_multi_ed25519_ValidatedPublicKey">ValidatedPublicKey</a>&gt;();
+</code></pre>
+
+
+
+<a id="@Specification_1_new_signature_from_bytes"></a>
+
+### Function `new_signature_from_bytes`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_new_signature_from_bytes">new_signature_from_bytes</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="multi_ed25519.md#0x1_multi_ed25519_Signature">multi_ed25519::Signature</a>
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="multi_ed25519.md#0x1_multi_ed25519_NewSignatureFromBytesAbortsIf">NewSignatureFromBytesAbortsIf</a>;
+<b>ensures</b> result == <a href="multi_ed25519.md#0x1_multi_ed25519_Signature">Signature</a> { bytes };
+</code></pre>
+
+
+
+
+<a id="0x1_multi_ed25519_NewSignatureFromBytesAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="multi_ed25519.md#0x1_multi_ed25519_NewSignatureFromBytesAbortsIf">NewSignatureFromBytesAbortsIf</a> {
+    bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+    <b>aborts_if</b> len(bytes) % <a href="multi_ed25519.md#0x1_multi_ed25519_INDIVIDUAL_SIGNATURE_NUM_BYTES">INDIVIDUAL_SIGNATURE_NUM_BYTES</a> != <a href="multi_ed25519.md#0x1_multi_ed25519_BITMAP_NUM_OF_BYTES">BITMAP_NUM_OF_BYTES</a>;
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_unvalidated_public_key_num_sub_pks"></a>
+
+### Function `unvalidated_public_key_num_sub_pks`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_unvalidated_public_key_num_sub_pks">unvalidated_public_key_num_sub_pks</a>(pk: &<a href="multi_ed25519.md#0x1_multi_ed25519_UnvalidatedPublicKey">multi_ed25519::UnvalidatedPublicKey</a>): u8
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> bytes = pk.bytes;
+<b>include</b> <a href="multi_ed25519.md#0x1_multi_ed25519_PkDivision">PkDivision</a>;
+</code></pre>
+
+
+
+<a id="@Specification_1_unvalidated_public_key_threshold"></a>
+
+### Function `unvalidated_public_key_threshold`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_unvalidated_public_key_threshold">unvalidated_public_key_threshold</a>(pk: &<a href="multi_ed25519.md#0x1_multi_ed25519_UnvalidatedPublicKey">multi_ed25519::UnvalidatedPublicKey</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;u8&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="multi_ed25519.md#0x1_multi_ed25519_spec_check_and_get_threshold">spec_check_and_get_threshold</a>(pk.bytes);
+</code></pre>
+
+
+
+<a id="@Specification_1_validated_public_key_num_sub_pks"></a>
+
+### Function `validated_public_key_num_sub_pks`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_validated_public_key_num_sub_pks">validated_public_key_num_sub_pks</a>(pk: &<a href="multi_ed25519.md#0x1_multi_ed25519_ValidatedPublicKey">multi_ed25519::ValidatedPublicKey</a>): u8
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> bytes = pk.bytes;
+<b>include</b> <a href="multi_ed25519.md#0x1_multi_ed25519_PkDivision">PkDivision</a>;
+</code></pre>
+
+
+
+<a id="@Specification_1_validated_public_key_threshold"></a>
+
+### Function `validated_public_key_threshold`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_validated_public_key_threshold">validated_public_key_threshold</a>(pk: &<a href="multi_ed25519.md#0x1_multi_ed25519_ValidatedPublicKey">multi_ed25519::ValidatedPublicKey</a>): u8
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> len(pk.bytes) == 0;
+<b>ensures</b> result == pk.bytes[len(pk.bytes) - 1];
+</code></pre>
+
+
+
+<a id="@Specification_1_check_and_get_threshold"></a>
+
+### Function `check_and_get_threshold`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_check_and_get_threshold">check_and_get_threshold</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;u8&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="multi_ed25519.md#0x1_multi_ed25519_spec_check_and_get_threshold">spec_check_and_get_threshold</a>(bytes);
+</code></pre>
+
+
+
+
+<a id="0x1_multi_ed25519_PkDivision"></a>
+
+
+<pre><code><b>schema</b> <a href="multi_ed25519.md#0x1_multi_ed25519_PkDivision">PkDivision</a> {
+    bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+    result: u8;
+    <b>aborts_if</b> len(bytes) / <a href="multi_ed25519.md#0x1_multi_ed25519_INDIVIDUAL_PUBLIC_KEY_NUM_BYTES">INDIVIDUAL_PUBLIC_KEY_NUM_BYTES</a> &gt; MAX_U8;
+    <b>ensures</b> result == len(bytes) / <a href="multi_ed25519.md#0x1_multi_ed25519_INDIVIDUAL_PUBLIC_KEY_NUM_BYTES">INDIVIDUAL_PUBLIC_KEY_NUM_BYTES</a>;
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_public_key_bytes_to_authentication_key"></a>
+
+### Function `public_key_bytes_to_authentication_key`
+
+
+<pre><code><b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_public_key_bytes_to_authentication_key">public_key_bytes_to_authentication_key</a>(pk_bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> [abstract] result == <a href="multi_ed25519.md#0x1_multi_ed25519_spec_public_key_bytes_to_authentication_key">spec_public_key_bytes_to_authentication_key</a>(pk_bytes);
+</code></pre>
+
+
+
+<a id="@Specification_1_public_key_validate_internal"></a>
+
+### Function `public_key_validate_internal`
+
+
+<pre><code><b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_public_key_validate_internal">public_key_validate_internal</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> (len(bytes) / <a href="multi_ed25519.md#0x1_multi_ed25519_INDIVIDUAL_PUBLIC_KEY_NUM_BYTES">INDIVIDUAL_PUBLIC_KEY_NUM_BYTES</a> &gt; <a href="multi_ed25519.md#0x1_multi_ed25519_MAX_NUMBER_OF_PUBLIC_KEYS">MAX_NUMBER_OF_PUBLIC_KEYS</a>) ==&gt; (result == <b>false</b>);
+<b>ensures</b> result == <a href="multi_ed25519.md#0x1_multi_ed25519_spec_public_key_validate_internal">spec_public_key_validate_internal</a>(bytes);
+</code></pre>
+
+
+
+<a id="@Specification_1_public_key_validate_v2_internal"></a>
+
+### Function `public_key_validate_v2_internal`
+
+
+<pre><code><b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_public_key_validate_v2_internal">public_key_validate_v2_internal</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>ensures</b> result == <a href="multi_ed25519.md#0x1_multi_ed25519_spec_public_key_validate_v2_internal">spec_public_key_validate_v2_internal</a>(bytes);
+</code></pre>
+
+
+
+<a id="@Specification_1_signature_verify_strict_internal"></a>
+
+### Function `signature_verify_strict_internal`
+
+
+<pre><code><b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_signature_verify_strict_internal">signature_verify_strict_internal</a>(multisignature: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, public_key: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, message: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="multi_ed25519.md#0x1_multi_ed25519_spec_signature_verify_strict_internal">spec_signature_verify_strict_internal</a>(multisignature, public_key, message);
+</code></pre>
+
+
+
+<a id="@Helper_functions_2"></a>
+
+### Helper functions
+
+
+
+<a id="0x1_multi_ed25519_spec_check_and_get_threshold"></a>
+
+
+<pre><code><b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_spec_check_and_get_threshold">spec_check_and_get_threshold</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): Option&lt;u8&gt; {
+   <b>let</b> len = len(bytes);
+   <b>if</b> (len == 0) {
+       <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>&lt;u8&gt;()
+   } <b>else</b> {
+       <b>let</b> threshold_num_of_bytes = len % <a href="multi_ed25519.md#0x1_multi_ed25519_INDIVIDUAL_PUBLIC_KEY_NUM_BYTES">INDIVIDUAL_PUBLIC_KEY_NUM_BYTES</a>;
+       <b>let</b> num_of_keys = len / <a href="multi_ed25519.md#0x1_multi_ed25519_INDIVIDUAL_PUBLIC_KEY_NUM_BYTES">INDIVIDUAL_PUBLIC_KEY_NUM_BYTES</a>;
+       <b>let</b> threshold_byte = bytes[len - 1];
+       <b>if</b> (num_of_keys == 0 || num_of_keys &gt; <a href="multi_ed25519.md#0x1_multi_ed25519_MAX_NUMBER_OF_PUBLIC_KEYS">MAX_NUMBER_OF_PUBLIC_KEYS</a> || len % <a href="multi_ed25519.md#0x1_multi_ed25519_INDIVIDUAL_PUBLIC_KEY_NUM_BYTES">INDIVIDUAL_PUBLIC_KEY_NUM_BYTES</a> != 1) {
+           <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>&lt;u8&gt;()
+       } <b>else</b> <b>if</b> (threshold_byte == 0 || threshold_byte &gt; (num_of_keys <b>as</b> u8)) {
+           <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>&lt;u8&gt;()
+       } <b>else</b> {
+           <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_some">option::spec_some</a>(threshold_byte)
+       }
+   }
+}
+</code></pre>
+
+
+
+
+<a id="0x1_multi_ed25519_spec_signature_verify_strict_internal"></a>
+
+
+<pre><code><b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_spec_signature_verify_strict_internal">spec_signature_verify_strict_internal</a>(
+   multisignature: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+   public_key: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+   message: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+): bool;
+</code></pre>
+
+
+
+
+<a id="0x1_multi_ed25519_spec_public_key_validate_internal"></a>
+
+
+<pre><code><b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_spec_public_key_validate_internal">spec_public_key_validate_internal</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool;
+</code></pre>
+
+
+
+
+<a id="0x1_multi_ed25519_spec_public_key_validate_v2_internal"></a>
+
+
+<pre><code><b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_spec_public_key_validate_v2_internal">spec_public_key_validate_v2_internal</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool;
+</code></pre>
+
+
+
+
+<a id="0x1_multi_ed25519_spec_public_key_bytes_to_authentication_key"></a>
+
+
+<pre><code><b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_spec_public_key_bytes_to_authentication_key">spec_public_key_bytes_to_authentication_key</a>(pk_bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+</code></pre>
+
+
+
+
+<a id="0x1_multi_ed25519_spec_signature_verify_strict_t"></a>
+
+
+<pre><code><b>fun</b> <a href="multi_ed25519.md#0x1_multi_ed25519_spec_signature_verify_strict_t">spec_signature_verify_strict_t</a>&lt;T&gt;(signature: <a href="multi_ed25519.md#0x1_multi_ed25519_Signature">Signature</a>, public_key: <a href="multi_ed25519.md#0x1_multi_ed25519_UnvalidatedPublicKey">UnvalidatedPublicKey</a>, data: T): bool {
+   <b>let</b> encoded = <a href="ed25519.md#0x1_ed25519_new_signed_message">ed25519::new_signed_message</a>&lt;T&gt;(data);
+   <b>let</b> message = <a href="../../../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs_serialize">bcs::serialize</a>(encoded);
+   <a href="multi_ed25519.md#0x1_multi_ed25519_spec_signature_verify_strict_internal">spec_signature_verify_strict_internal</a>(signature.bytes, public_key.bytes, message)
+}
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/overview.md b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/overview.md
new file mode 100644
index 0000000000000..6176385db1d97
--- /dev/null
+++ b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/overview.md
@@ -0,0 +1,50 @@
+
+<a id="@Aptos_Standard_Library_0"></a>
+
+# Aptos Standard Library
+
+
+This is the reference documentation of the Aptos standard library.
+
+
+<a id="@Index_1"></a>
+
+## Index
+
+
+-  [`0x1::any`](any.md#0x1_any)
+-  [`0x1::aptos_hash`](hash.md#0x1_aptos_hash)
+-  [`0x1::big_vector`](big_vector.md#0x1_big_vector)
+-  [`0x1::bls12381`](bls12381.md#0x1_bls12381)
+-  [`0x1::bls12381_algebra`](bls12381_algebra.md#0x1_bls12381_algebra)
+-  [`0x1::bn254_algebra`](bn254_algebra.md#0x1_bn254_algebra)
+-  [`0x1::capability`](capability.md#0x1_capability)
+-  [`0x1::comparator`](comparator.md#0x1_comparator)
+-  [`0x1::copyable_any`](copyable_any.md#0x1_copyable_any)
+-  [`0x1::crypto_algebra`](crypto_algebra.md#0x1_crypto_algebra)
+-  [`0x1::debug`](debug.md#0x1_debug)
+-  [`0x1::ed25519`](ed25519.md#0x1_ed25519)
+-  [`0x1::fixed_point64`](fixed_point64.md#0x1_fixed_point64)
+-  [`0x1::from_bcs`](from_bcs.md#0x1_from_bcs)
+-  [`0x1::math128`](math128.md#0x1_math128)
+-  [`0x1::math64`](math64.md#0x1_math64)
+-  [`0x1::math_fixed`](math_fixed.md#0x1_math_fixed)
+-  [`0x1::math_fixed64`](math_fixed64.md#0x1_math_fixed64)
+-  [`0x1::multi_ed25519`](multi_ed25519.md#0x1_multi_ed25519)
+-  [`0x1::pool_u64`](pool_u64.md#0x1_pool_u64)
+-  [`0x1::pool_u64_unbound`](pool_u64_unbound.md#0x1_pool_u64_unbound)
+-  [`0x1::ristretto255`](ristretto255.md#0x1_ristretto255)
+-  [`0x1::ristretto255_bulletproofs`](ristretto255_bulletproofs.md#0x1_ristretto255_bulletproofs)
+-  [`0x1::ristretto255_elgamal`](ristretto255_elgamal.md#0x1_ristretto255_elgamal)
+-  [`0x1::ristretto255_pedersen`](ristretto255_pedersen.md#0x1_ristretto255_pedersen)
+-  [`0x1::secp256k1`](secp256k1.md#0x1_secp256k1)
+-  [`0x1::simple_map`](simple_map.md#0x1_simple_map)
+-  [`0x1::smart_table`](smart_table.md#0x1_smart_table)
+-  [`0x1::smart_vector`](smart_vector.md#0x1_smart_vector)
+-  [`0x1::string_utils`](string_utils.md#0x1_string_utils)
+-  [`0x1::table`](table.md#0x1_table)
+-  [`0x1::table_with_length`](table_with_length.md#0x1_table_with_length)
+-  [`0x1::type_info`](type_info.md#0x1_type_info)
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/pool_u64.md b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/pool_u64.md
new file mode 100644
index 0000000000000..14616c6041e08
--- /dev/null
+++ b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/pool_u64.md
@@ -0,0 +1,1290 @@
+
+<a id="0x1_pool_u64"></a>
+
+# Module `0x1::pool_u64`
+
+
+Simple module for tracking and calculating shares of a pool of coins. The shares are worth more as the total coins in
+the pool increases. New shareholder can buy more shares or redeem their existing shares.
+
+Example flow:
+1. Pool start outs empty.
+2. Shareholder A buys in with 1000 coins. A will receive 1000 shares in the pool. Pool now has 1000 total coins and
+1000 total shares.
+3. Pool appreciates in value from rewards and now has 2000 coins. A's 1000 shares are now worth 2000 coins.
+4. Shareholder B now buys in with 1000 coins. Since before the buy in, each existing share is worth 2 coins, B will
+receive 500 shares in exchange for 1000 coins. Pool now has 1500 shares and 3000 coins.
+5. Pool appreciates in value from rewards and now has 6000 coins.
+6. A redeems 500 shares. Each share is worth 6000 / 1500 = 4. A receives 2000 coins. Pool has 4000 coins and 1000
+shares left.
+
+
+-  [Struct `Pool`](#0x1_pool_u64_Pool)
+-  [Constants](#@Constants_0)
+-  [Function `new`](#0x1_pool_u64_new)
+-  [Function `create`](#0x1_pool_u64_create)
+-  [Function `create_with_scaling_factor`](#0x1_pool_u64_create_with_scaling_factor)
+-  [Function `destroy_empty`](#0x1_pool_u64_destroy_empty)
+-  [Function `total_coins`](#0x1_pool_u64_total_coins)
+-  [Function `total_shares`](#0x1_pool_u64_total_shares)
+-  [Function `contains`](#0x1_pool_u64_contains)
+-  [Function `shares`](#0x1_pool_u64_shares)
+-  [Function `balance`](#0x1_pool_u64_balance)
+-  [Function `shareholders`](#0x1_pool_u64_shareholders)
+-  [Function `shareholders_count`](#0x1_pool_u64_shareholders_count)
+-  [Function `update_total_coins`](#0x1_pool_u64_update_total_coins)
+-  [Function `buy_in`](#0x1_pool_u64_buy_in)
+-  [Function `add_shares`](#0x1_pool_u64_add_shares)
+-  [Function `redeem_shares`](#0x1_pool_u64_redeem_shares)
+-  [Function `transfer_shares`](#0x1_pool_u64_transfer_shares)
+-  [Function `deduct_shares`](#0x1_pool_u64_deduct_shares)
+-  [Function `amount_to_shares`](#0x1_pool_u64_amount_to_shares)
+-  [Function `amount_to_shares_with_total_coins`](#0x1_pool_u64_amount_to_shares_with_total_coins)
+-  [Function `shares_to_amount`](#0x1_pool_u64_shares_to_amount)
+-  [Function `shares_to_amount_with_total_coins`](#0x1_pool_u64_shares_to_amount_with_total_coins)
+-  [Function `multiply_then_divide`](#0x1_pool_u64_multiply_then_divide)
+-  [Function `to_u128`](#0x1_pool_u64_to_u128)
+-  [Specification](#@Specification_1)
+    -  [Struct `Pool`](#@Specification_1_Pool)
+    -  [Function `contains`](#@Specification_1_contains)
+    -  [Function `shares`](#@Specification_1_shares)
+    -  [Function `balance`](#@Specification_1_balance)
+    -  [Function `buy_in`](#@Specification_1_buy_in)
+    -  [Function `add_shares`](#@Specification_1_add_shares)
+    -  [Function `redeem_shares`](#@Specification_1_redeem_shares)
+    -  [Function `transfer_shares`](#@Specification_1_transfer_shares)
+    -  [Function `deduct_shares`](#@Specification_1_deduct_shares)
+    -  [Function `amount_to_shares_with_total_coins`](#@Specification_1_amount_to_shares_with_total_coins)
+    -  [Function `shares_to_amount_with_total_coins`](#@Specification_1_shares_to_amount_with_total_coins)
+    -  [Function `multiply_then_divide`](#@Specification_1_multiply_then_divide)
+
+
+<pre><code><b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="simple_map.md#0x1_simple_map">0x1::simple_map</a>;
+<b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">0x1::vector</a>;
+</code></pre>
+
+
+
+<a id="0x1_pool_u64_Pool"></a>
+
+## Struct `Pool`
+
+
+
+<pre><code><b>struct</b> <a href="pool_u64.md#0x1_pool_u64_Pool">Pool</a> <b>has</b> store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>shareholders_limit: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>total_coins: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>total_shares: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>shares: <a href="simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;<b>address</b>, u64&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>shareholders: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>scaling_factor: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_pool_u64_MAX_U64"></a>
+
+
+
+<pre><code><b>const</b> <a href="pool_u64.md#0x1_pool_u64_MAX_U64">MAX_U64</a>: u64 = 18446744073709551615;
+</code></pre>
+
+
+
+<a id="0x1_pool_u64_EINSUFFICIENT_SHARES"></a>
+
+Cannot redeem more shares than the shareholder has in the pool.
+
+
+<pre><code><b>const</b> <a href="pool_u64.md#0x1_pool_u64_EINSUFFICIENT_SHARES">EINSUFFICIENT_SHARES</a>: u64 = 4;
+</code></pre>
+
+
+
+<a id="0x1_pool_u64_EPOOL_IS_NOT_EMPTY"></a>
+
+Cannot destroy non-empty pool.
+
+
+<pre><code><b>const</b> <a href="pool_u64.md#0x1_pool_u64_EPOOL_IS_NOT_EMPTY">EPOOL_IS_NOT_EMPTY</a>: u64 = 3;
+</code></pre>
+
+
+
+<a id="0x1_pool_u64_EPOOL_TOTAL_COINS_OVERFLOW"></a>
+
+Pool's total coins cannot exceed u64.max.
+
+
+<pre><code><b>const</b> <a href="pool_u64.md#0x1_pool_u64_EPOOL_TOTAL_COINS_OVERFLOW">EPOOL_TOTAL_COINS_OVERFLOW</a>: u64 = 6;
+</code></pre>
+
+
+
+<a id="0x1_pool_u64_EPOOL_TOTAL_SHARES_OVERFLOW"></a>
+
+Pool's total shares cannot exceed u64.max.
+
+
+<pre><code><b>const</b> <a href="pool_u64.md#0x1_pool_u64_EPOOL_TOTAL_SHARES_OVERFLOW">EPOOL_TOTAL_SHARES_OVERFLOW</a>: u64 = 7;
+</code></pre>
+
+
+
+<a id="0x1_pool_u64_ESHAREHOLDER_NOT_FOUND"></a>
+
+Shareholder not present in pool.
+
+
+<pre><code><b>const</b> <a href="pool_u64.md#0x1_pool_u64_ESHAREHOLDER_NOT_FOUND">ESHAREHOLDER_NOT_FOUND</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_pool_u64_ESHAREHOLDER_SHARES_OVERFLOW"></a>
+
+Shareholder cannot have more than u64.max shares.
+
+
+<pre><code><b>const</b> <a href="pool_u64.md#0x1_pool_u64_ESHAREHOLDER_SHARES_OVERFLOW">ESHAREHOLDER_SHARES_OVERFLOW</a>: u64 = 5;
+</code></pre>
+
+
+
+<a id="0x1_pool_u64_ETOO_MANY_SHAREHOLDERS"></a>
+
+There are too many shareholders in the pool.
+
+
+<pre><code><b>const</b> <a href="pool_u64.md#0x1_pool_u64_ETOO_MANY_SHAREHOLDERS">ETOO_MANY_SHAREHOLDERS</a>: u64 = 2;
+</code></pre>
+
+
+
+<a id="0x1_pool_u64_new"></a>
+
+## Function `new`
+
+Create a new pool.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64.md#0x1_pool_u64_new">new</a>(shareholders_limit: u64): <a href="pool_u64.md#0x1_pool_u64_Pool">pool_u64::Pool</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64.md#0x1_pool_u64_new">new</a>(shareholders_limit: u64): <a href="pool_u64.md#0x1_pool_u64_Pool">Pool</a> {
+    // Default <b>to</b> a scaling factor of 1 (effectively no scaling).
+    <a href="pool_u64.md#0x1_pool_u64_create_with_scaling_factor">create_with_scaling_factor</a>(shareholders_limit, 1)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_pool_u64_create"></a>
+
+## Function `create`
+
+Deprecated. Use <code>new</code> instead.
+Create a new pool.
+
+
+<pre><code>#[deprecated]
+<b>public</b> <b>fun</b> <a href="pool_u64.md#0x1_pool_u64_create">create</a>(shareholders_limit: u64): <a href="pool_u64.md#0x1_pool_u64_Pool">pool_u64::Pool</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64.md#0x1_pool_u64_create">create</a>(shareholders_limit: u64): <a href="pool_u64.md#0x1_pool_u64_Pool">Pool</a> {
+    <a href="pool_u64.md#0x1_pool_u64_new">new</a>(shareholders_limit)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_pool_u64_create_with_scaling_factor"></a>
+
+## Function `create_with_scaling_factor`
+
+Create a new pool with custom <code>scaling_factor</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64.md#0x1_pool_u64_create_with_scaling_factor">create_with_scaling_factor</a>(shareholders_limit: u64, scaling_factor: u64): <a href="pool_u64.md#0x1_pool_u64_Pool">pool_u64::Pool</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64.md#0x1_pool_u64_create_with_scaling_factor">create_with_scaling_factor</a>(shareholders_limit: u64, scaling_factor: u64): <a href="pool_u64.md#0x1_pool_u64_Pool">Pool</a> {
+    <a href="pool_u64.md#0x1_pool_u64_Pool">Pool</a> {
+        shareholders_limit,
+        total_coins: 0,
+        total_shares: 0,
+        shares: <a href="simple_map.md#0x1_simple_map_create">simple_map::create</a>&lt;<b>address</b>, u64&gt;(),
+        shareholders: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_empty">vector::empty</a>&lt;<b>address</b>&gt;(),
+        scaling_factor,
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_pool_u64_destroy_empty"></a>
+
+## Function `destroy_empty`
+
+Destroy an empty pool. This will fail if the pool has any balance of coins.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64.md#0x1_pool_u64_destroy_empty">destroy_empty</a>(pool: <a href="pool_u64.md#0x1_pool_u64_Pool">pool_u64::Pool</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64.md#0x1_pool_u64_destroy_empty">destroy_empty</a>(pool: <a href="pool_u64.md#0x1_pool_u64_Pool">Pool</a>) {
+    <b>assert</b>!(pool.total_coins == 0, <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="pool_u64.md#0x1_pool_u64_EPOOL_IS_NOT_EMPTY">EPOOL_IS_NOT_EMPTY</a>));
+    <b>let</b> <a href="pool_u64.md#0x1_pool_u64_Pool">Pool</a> {
+        shareholders_limit: _,
+        total_coins: _,
+        total_shares: _,
+        shares: _,
+        shareholders: _,
+        scaling_factor: _,
+    } = pool;
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_pool_u64_total_coins"></a>
+
+## Function `total_coins`
+
+Return <code>pool</code>'s total balance of coins.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64.md#0x1_pool_u64_total_coins">total_coins</a>(pool: &<a href="pool_u64.md#0x1_pool_u64_Pool">pool_u64::Pool</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64.md#0x1_pool_u64_total_coins">total_coins</a>(pool: &<a href="pool_u64.md#0x1_pool_u64_Pool">Pool</a>): u64 {
+    pool.total_coins
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_pool_u64_total_shares"></a>
+
+## Function `total_shares`
+
+Return the total number of shares across all shareholders in <code>pool</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64.md#0x1_pool_u64_total_shares">total_shares</a>(pool: &<a href="pool_u64.md#0x1_pool_u64_Pool">pool_u64::Pool</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64.md#0x1_pool_u64_total_shares">total_shares</a>(pool: &<a href="pool_u64.md#0x1_pool_u64_Pool">Pool</a>): u64 {
+    pool.total_shares
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_pool_u64_contains"></a>
+
+## Function `contains`
+
+Return true if <code>shareholder</code> is in <code>pool</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64.md#0x1_pool_u64_contains">contains</a>(pool: &<a href="pool_u64.md#0x1_pool_u64_Pool">pool_u64::Pool</a>, shareholder: <b>address</b>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64.md#0x1_pool_u64_contains">contains</a>(pool: &<a href="pool_u64.md#0x1_pool_u64_Pool">Pool</a>, shareholder: <b>address</b>): bool {
+    <a href="simple_map.md#0x1_simple_map_contains_key">simple_map::contains_key</a>(&pool.shares, &shareholder)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_pool_u64_shares"></a>
+
+## Function `shares`
+
+Return the number of shares of <code>stakeholder</code> in <code>pool</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64.md#0x1_pool_u64_shares">shares</a>(pool: &<a href="pool_u64.md#0x1_pool_u64_Pool">pool_u64::Pool</a>, shareholder: <b>address</b>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64.md#0x1_pool_u64_shares">shares</a>(pool: &<a href="pool_u64.md#0x1_pool_u64_Pool">Pool</a>, shareholder: <b>address</b>): u64 {
+    <b>if</b> (<a href="pool_u64.md#0x1_pool_u64_contains">contains</a>(pool, shareholder)) {
+        *<a href="simple_map.md#0x1_simple_map_borrow">simple_map::borrow</a>(&pool.shares, &shareholder)
+    } <b>else</b> {
+        0
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_pool_u64_balance"></a>
+
+## Function `balance`
+
+Return the balance in coins of <code>shareholder</code> in <code>pool.</code>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64.md#0x1_pool_u64_balance">balance</a>(pool: &<a href="pool_u64.md#0x1_pool_u64_Pool">pool_u64::Pool</a>, shareholder: <b>address</b>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64.md#0x1_pool_u64_balance">balance</a>(pool: &<a href="pool_u64.md#0x1_pool_u64_Pool">Pool</a>, shareholder: <b>address</b>): u64 {
+    <b>let</b> num_shares = <a href="pool_u64.md#0x1_pool_u64_shares">shares</a>(pool, shareholder);
+    <a href="pool_u64.md#0x1_pool_u64_shares_to_amount">shares_to_amount</a>(pool, num_shares)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_pool_u64_shareholders"></a>
+
+## Function `shareholders`
+
+Return the list of shareholders in <code>pool</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64.md#0x1_pool_u64_shareholders">shareholders</a>(pool: &<a href="pool_u64.md#0x1_pool_u64_Pool">pool_u64::Pool</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64.md#0x1_pool_u64_shareholders">shareholders</a>(pool: &<a href="pool_u64.md#0x1_pool_u64_Pool">Pool</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt; {
+    pool.shareholders
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_pool_u64_shareholders_count"></a>
+
+## Function `shareholders_count`
+
+Return the number of shareholders in <code>pool</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64.md#0x1_pool_u64_shareholders_count">shareholders_count</a>(pool: &<a href="pool_u64.md#0x1_pool_u64_Pool">pool_u64::Pool</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64.md#0x1_pool_u64_shareholders_count">shareholders_count</a>(pool: &<a href="pool_u64.md#0x1_pool_u64_Pool">Pool</a>): u64 {
+    <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&pool.shareholders)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_pool_u64_update_total_coins"></a>
+
+## Function `update_total_coins`
+
+Update <code>pool</code>'s total balance of coins.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64.md#0x1_pool_u64_update_total_coins">update_total_coins</a>(pool: &<b>mut</b> <a href="pool_u64.md#0x1_pool_u64_Pool">pool_u64::Pool</a>, new_total_coins: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64.md#0x1_pool_u64_update_total_coins">update_total_coins</a>(pool: &<b>mut</b> <a href="pool_u64.md#0x1_pool_u64_Pool">Pool</a>, new_total_coins: u64) {
+    pool.total_coins = new_total_coins;
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_pool_u64_buy_in"></a>
+
+## Function `buy_in`
+
+Allow an existing or new shareholder to add their coins to the pool in exchange for new shares.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64.md#0x1_pool_u64_buy_in">buy_in</a>(pool: &<b>mut</b> <a href="pool_u64.md#0x1_pool_u64_Pool">pool_u64::Pool</a>, shareholder: <b>address</b>, coins_amount: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64.md#0x1_pool_u64_buy_in">buy_in</a>(pool: &<b>mut</b> <a href="pool_u64.md#0x1_pool_u64_Pool">Pool</a>, shareholder: <b>address</b>, coins_amount: u64): u64 {
+    <b>if</b> (coins_amount == 0) <b>return</b> 0;
+
+    <b>let</b> new_shares = <a href="pool_u64.md#0x1_pool_u64_amount_to_shares">amount_to_shares</a>(pool, coins_amount);
+    <b>assert</b>!(<a href="pool_u64.md#0x1_pool_u64_MAX_U64">MAX_U64</a> - pool.total_coins &gt;= coins_amount, <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="pool_u64.md#0x1_pool_u64_EPOOL_TOTAL_COINS_OVERFLOW">EPOOL_TOTAL_COINS_OVERFLOW</a>));
+    <b>assert</b>!(<a href="pool_u64.md#0x1_pool_u64_MAX_U64">MAX_U64</a> - pool.total_shares &gt;= new_shares, <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="pool_u64.md#0x1_pool_u64_EPOOL_TOTAL_COINS_OVERFLOW">EPOOL_TOTAL_COINS_OVERFLOW</a>));
+
+    pool.total_coins = pool.total_coins + coins_amount;
+    pool.total_shares = pool.total_shares + new_shares;
+    <a href="pool_u64.md#0x1_pool_u64_add_shares">add_shares</a>(pool, shareholder, new_shares);
+    new_shares
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_pool_u64_add_shares"></a>
+
+## Function `add_shares`
+
+Add the number of shares directly for <code>shareholder</code> in <code>pool</code>.
+This would dilute other shareholders if the pool's balance of coins didn't change.
+
+
+<pre><code><b>fun</b> <a href="pool_u64.md#0x1_pool_u64_add_shares">add_shares</a>(pool: &<b>mut</b> <a href="pool_u64.md#0x1_pool_u64_Pool">pool_u64::Pool</a>, shareholder: <b>address</b>, new_shares: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="pool_u64.md#0x1_pool_u64_add_shares">add_shares</a>(pool: &<b>mut</b> <a href="pool_u64.md#0x1_pool_u64_Pool">Pool</a>, shareholder: <b>address</b>, new_shares: u64): u64 {
+    <b>if</b> (<a href="pool_u64.md#0x1_pool_u64_contains">contains</a>(pool, shareholder)) {
+        <b>let</b> existing_shares = <a href="simple_map.md#0x1_simple_map_borrow_mut">simple_map::borrow_mut</a>(&<b>mut</b> pool.shares, &shareholder);
+        <b>let</b> current_shares = *existing_shares;
+        <b>assert</b>!(<a href="pool_u64.md#0x1_pool_u64_MAX_U64">MAX_U64</a> - current_shares &gt;= new_shares, <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="pool_u64.md#0x1_pool_u64_ESHAREHOLDER_SHARES_OVERFLOW">ESHAREHOLDER_SHARES_OVERFLOW</a>));
+
+        *existing_shares = current_shares + new_shares;
+        *existing_shares
+    } <b>else</b> <b>if</b> (new_shares &gt; 0) {
+        <b>assert</b>!(
+            <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&pool.shareholders) &lt; pool.shareholders_limit,
+            <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="pool_u64.md#0x1_pool_u64_ETOO_MANY_SHAREHOLDERS">ETOO_MANY_SHAREHOLDERS</a>),
+        );
+
+        <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_push_back">vector::push_back</a>(&<b>mut</b> pool.shareholders, shareholder);
+        <a href="simple_map.md#0x1_simple_map_add">simple_map::add</a>(&<b>mut</b> pool.shares, shareholder, new_shares);
+        new_shares
+    } <b>else</b> {
+        new_shares
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_pool_u64_redeem_shares"></a>
+
+## Function `redeem_shares`
+
+Allow <code>shareholder</code> to redeem their shares in <code>pool</code> for coins.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64.md#0x1_pool_u64_redeem_shares">redeem_shares</a>(pool: &<b>mut</b> <a href="pool_u64.md#0x1_pool_u64_Pool">pool_u64::Pool</a>, shareholder: <b>address</b>, shares_to_redeem: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64.md#0x1_pool_u64_redeem_shares">redeem_shares</a>(pool: &<b>mut</b> <a href="pool_u64.md#0x1_pool_u64_Pool">Pool</a>, shareholder: <b>address</b>, shares_to_redeem: u64): u64 {
+    <b>assert</b>!(<a href="pool_u64.md#0x1_pool_u64_contains">contains</a>(pool, shareholder), <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="pool_u64.md#0x1_pool_u64_ESHAREHOLDER_NOT_FOUND">ESHAREHOLDER_NOT_FOUND</a>));
+    <b>assert</b>!(<a href="pool_u64.md#0x1_pool_u64_shares">shares</a>(pool, shareholder) &gt;= shares_to_redeem, <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="pool_u64.md#0x1_pool_u64_EINSUFFICIENT_SHARES">EINSUFFICIENT_SHARES</a>));
+
+    <b>if</b> (shares_to_redeem == 0) <b>return</b> 0;
+
+    <b>let</b> redeemed_coins = <a href="pool_u64.md#0x1_pool_u64_shares_to_amount">shares_to_amount</a>(pool, shares_to_redeem);
+    pool.total_coins = pool.total_coins - redeemed_coins;
+    pool.total_shares = pool.total_shares - shares_to_redeem;
+    <a href="pool_u64.md#0x1_pool_u64_deduct_shares">deduct_shares</a>(pool, shareholder, shares_to_redeem);
+
+    redeemed_coins
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_pool_u64_transfer_shares"></a>
+
+## Function `transfer_shares`
+
+Transfer shares from <code>shareholder_1</code> to <code>shareholder_2</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64.md#0x1_pool_u64_transfer_shares">transfer_shares</a>(pool: &<b>mut</b> <a href="pool_u64.md#0x1_pool_u64_Pool">pool_u64::Pool</a>, shareholder_1: <b>address</b>, shareholder_2: <b>address</b>, shares_to_transfer: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64.md#0x1_pool_u64_transfer_shares">transfer_shares</a>(
+    pool: &<b>mut</b> <a href="pool_u64.md#0x1_pool_u64_Pool">Pool</a>,
+    shareholder_1: <b>address</b>,
+    shareholder_2: <b>address</b>,
+    shares_to_transfer: u64,
+) {
+    <b>assert</b>!(<a href="pool_u64.md#0x1_pool_u64_contains">contains</a>(pool, shareholder_1), <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="pool_u64.md#0x1_pool_u64_ESHAREHOLDER_NOT_FOUND">ESHAREHOLDER_NOT_FOUND</a>));
+    <b>assert</b>!(<a href="pool_u64.md#0x1_pool_u64_shares">shares</a>(pool, shareholder_1) &gt;= shares_to_transfer, <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="pool_u64.md#0x1_pool_u64_EINSUFFICIENT_SHARES">EINSUFFICIENT_SHARES</a>));
+    <b>if</b> (shares_to_transfer == 0) <b>return</b>;
+
+    <a href="pool_u64.md#0x1_pool_u64_deduct_shares">deduct_shares</a>(pool, shareholder_1, shares_to_transfer);
+    <a href="pool_u64.md#0x1_pool_u64_add_shares">add_shares</a>(pool, shareholder_2, shares_to_transfer);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_pool_u64_deduct_shares"></a>
+
+## Function `deduct_shares`
+
+Directly deduct <code>shareholder</code>'s number of shares in <code>pool</code> and return the number of remaining shares.
+
+
+<pre><code><b>fun</b> <a href="pool_u64.md#0x1_pool_u64_deduct_shares">deduct_shares</a>(pool: &<b>mut</b> <a href="pool_u64.md#0x1_pool_u64_Pool">pool_u64::Pool</a>, shareholder: <b>address</b>, num_shares: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="pool_u64.md#0x1_pool_u64_deduct_shares">deduct_shares</a>(pool: &<b>mut</b> <a href="pool_u64.md#0x1_pool_u64_Pool">Pool</a>, shareholder: <b>address</b>, num_shares: u64): u64 {
+    <b>assert</b>!(<a href="pool_u64.md#0x1_pool_u64_contains">contains</a>(pool, shareholder), <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="pool_u64.md#0x1_pool_u64_ESHAREHOLDER_NOT_FOUND">ESHAREHOLDER_NOT_FOUND</a>));
+    <b>assert</b>!(<a href="pool_u64.md#0x1_pool_u64_shares">shares</a>(pool, shareholder) &gt;= num_shares, <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="pool_u64.md#0x1_pool_u64_EINSUFFICIENT_SHARES">EINSUFFICIENT_SHARES</a>));
+
+    <b>let</b> existing_shares = <a href="simple_map.md#0x1_simple_map_borrow_mut">simple_map::borrow_mut</a>(&<b>mut</b> pool.shares, &shareholder);
+    *existing_shares = *existing_shares - num_shares;
+
+    // Remove the shareholder completely <b>if</b> they have no shares left.
+    <b>let</b> remaining_shares = *existing_shares;
+    <b>if</b> (remaining_shares == 0) {
+        <b>let</b> (_, shareholder_index) = <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_index_of">vector::index_of</a>(&pool.shareholders, &shareholder);
+        <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_remove">vector::remove</a>(&<b>mut</b> pool.shareholders, shareholder_index);
+        <a href="simple_map.md#0x1_simple_map_remove">simple_map::remove</a>(&<b>mut</b> pool.shares, &shareholder);
+    };
+
+    remaining_shares
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_pool_u64_amount_to_shares"></a>
+
+## Function `amount_to_shares`
+
+Return the number of new shares <code>coins_amount</code> can buy in <code>pool</code>.
+<code>amount</code> needs to big enough to avoid rounding number.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64.md#0x1_pool_u64_amount_to_shares">amount_to_shares</a>(pool: &<a href="pool_u64.md#0x1_pool_u64_Pool">pool_u64::Pool</a>, coins_amount: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64.md#0x1_pool_u64_amount_to_shares">amount_to_shares</a>(pool: &<a href="pool_u64.md#0x1_pool_u64_Pool">Pool</a>, coins_amount: u64): u64 {
+    <a href="pool_u64.md#0x1_pool_u64_amount_to_shares_with_total_coins">amount_to_shares_with_total_coins</a>(pool, coins_amount, pool.total_coins)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_pool_u64_amount_to_shares_with_total_coins"></a>
+
+## Function `amount_to_shares_with_total_coins`
+
+Return the number of new shares <code>coins_amount</code> can buy in <code>pool</code> with a custom total coins number.
+<code>amount</code> needs to big enough to avoid rounding number.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64.md#0x1_pool_u64_amount_to_shares_with_total_coins">amount_to_shares_with_total_coins</a>(pool: &<a href="pool_u64.md#0x1_pool_u64_Pool">pool_u64::Pool</a>, coins_amount: u64, total_coins: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64.md#0x1_pool_u64_amount_to_shares_with_total_coins">amount_to_shares_with_total_coins</a>(pool: &<a href="pool_u64.md#0x1_pool_u64_Pool">Pool</a>, coins_amount: u64, total_coins: u64): u64 {
+    // No shares yet so amount is worth the same number of shares.
+    <b>if</b> (pool.total_coins == 0 || pool.total_shares == 0) {
+        // Multiply by scaling factor <b>to</b> minimize rounding errors during <b>internal</b> calculations for buy ins/redeems.
+        // This can overflow but scaling factor is expected <b>to</b> be chosen carefully so this would not overflow.
+        coins_amount * pool.scaling_factor
+    } <b>else</b> {
+        // Shares price = total_coins / total existing shares.
+        // New number of shares = new_amount / shares_price = new_amount * existing_shares / total_amount.
+        // We rearrange the calc and do multiplication first <b>to</b> avoid rounding errors.
+        <a href="pool_u64.md#0x1_pool_u64_multiply_then_divide">multiply_then_divide</a>(pool, coins_amount, pool.total_shares, total_coins)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_pool_u64_shares_to_amount"></a>
+
+## Function `shares_to_amount`
+
+Return the number of coins <code>shares</code> are worth in <code>pool</code>.
+<code>shares</code> needs to big enough to avoid rounding number.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64.md#0x1_pool_u64_shares_to_amount">shares_to_amount</a>(pool: &<a href="pool_u64.md#0x1_pool_u64_Pool">pool_u64::Pool</a>, shares: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64.md#0x1_pool_u64_shares_to_amount">shares_to_amount</a>(pool: &<a href="pool_u64.md#0x1_pool_u64_Pool">Pool</a>, shares: u64): u64 {
+    <a href="pool_u64.md#0x1_pool_u64_shares_to_amount_with_total_coins">shares_to_amount_with_total_coins</a>(pool, shares, pool.total_coins)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_pool_u64_shares_to_amount_with_total_coins"></a>
+
+## Function `shares_to_amount_with_total_coins`
+
+Return the number of coins <code>shares</code> are worth in <code>pool</code> with a custom total coins number.
+<code>shares</code> needs to big enough to avoid rounding number.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64.md#0x1_pool_u64_shares_to_amount_with_total_coins">shares_to_amount_with_total_coins</a>(pool: &<a href="pool_u64.md#0x1_pool_u64_Pool">pool_u64::Pool</a>, shares: u64, total_coins: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64.md#0x1_pool_u64_shares_to_amount_with_total_coins">shares_to_amount_with_total_coins</a>(pool: &<a href="pool_u64.md#0x1_pool_u64_Pool">Pool</a>, shares: u64, total_coins: u64): u64 {
+    // No shares or coins yet so shares are worthless.
+    <b>if</b> (pool.total_coins == 0 || pool.total_shares == 0) {
+        0
+    } <b>else</b> {
+        // Shares price = total_coins / total existing shares.
+        // Shares worth = shares * shares price = shares * total_coins / total existing shares.
+        // We rearrange the calc and do multiplication first <b>to</b> avoid rounding errors.
+        <a href="pool_u64.md#0x1_pool_u64_multiply_then_divide">multiply_then_divide</a>(pool, shares, total_coins, pool.total_shares)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_pool_u64_multiply_then_divide"></a>
+
+## Function `multiply_then_divide`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64.md#0x1_pool_u64_multiply_then_divide">multiply_then_divide</a>(_pool: &<a href="pool_u64.md#0x1_pool_u64_Pool">pool_u64::Pool</a>, x: u64, y: u64, z: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64.md#0x1_pool_u64_multiply_then_divide">multiply_then_divide</a>(_pool: &<a href="pool_u64.md#0x1_pool_u64_Pool">Pool</a>, x: u64, y: u64, z: u64): u64 {
+    <b>let</b> result = (<a href="pool_u64.md#0x1_pool_u64_to_u128">to_u128</a>(x) * <a href="pool_u64.md#0x1_pool_u64_to_u128">to_u128</a>(y)) / <a href="pool_u64.md#0x1_pool_u64_to_u128">to_u128</a>(z);
+    (result <b>as</b> u64)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_pool_u64_to_u128"></a>
+
+## Function `to_u128`
+
+
+
+<pre><code><b>fun</b> <a href="pool_u64.md#0x1_pool_u64_to_u128">to_u128</a>(num: u64): u128
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="pool_u64.md#0x1_pool_u64_to_u128">to_u128</a>(num: u64): u128 {
+    (num <b>as</b> u128)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_Pool"></a>
+
+### Struct `Pool`
+
+
+<pre><code><b>struct</b> <a href="pool_u64.md#0x1_pool_u64_Pool">Pool</a> <b>has</b> store
+</code></pre>
+
+
+
+<dl>
+<dt>
+<code>shareholders_limit: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>total_coins: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>total_shares: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>shares: <a href="simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;<b>address</b>, u64&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>shareholders: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>scaling_factor: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+
+<pre><code><b>invariant</b> <b>forall</b> addr: <b>address</b>:
+    (<a href="simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(shares, addr) == <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_spec_contains">vector::spec_contains</a>(shareholders, addr));
+<b>invariant</b> <b>forall</b> i in 0..len(shareholders), j in 0..len(shareholders):
+    shareholders[i] == shareholders[j] ==&gt; i == j;
+</code></pre>
+
+
+
+
+<a id="0x1_pool_u64_spec_contains"></a>
+
+
+<pre><code><b>fun</b> <a href="pool_u64.md#0x1_pool_u64_spec_contains">spec_contains</a>(pool: <a href="pool_u64.md#0x1_pool_u64_Pool">Pool</a>, shareholder: <b>address</b>): bool {
+   <a href="simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(pool.shares, shareholder)
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_contains"></a>
+
+### Function `contains`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64.md#0x1_pool_u64_contains">contains</a>(pool: &<a href="pool_u64.md#0x1_pool_u64_Pool">pool_u64::Pool</a>, shareholder: <b>address</b>): bool
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="pool_u64.md#0x1_pool_u64_spec_contains">spec_contains</a>(pool, shareholder);
+</code></pre>
+
+
+
+
+<a id="0x1_pool_u64_spec_shares"></a>
+
+
+<pre><code><b>fun</b> <a href="pool_u64.md#0x1_pool_u64_spec_shares">spec_shares</a>(pool: <a href="pool_u64.md#0x1_pool_u64_Pool">Pool</a>, shareholder: <b>address</b>): u64 {
+   <b>if</b> (<a href="simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(pool.shares, shareholder)) {
+       <a href="simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(pool.shares, shareholder)
+   }
+   <b>else</b> {
+       0
+   }
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_shares"></a>
+
+### Function `shares`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64.md#0x1_pool_u64_shares">shares</a>(pool: &<a href="pool_u64.md#0x1_pool_u64_Pool">pool_u64::Pool</a>, shareholder: <b>address</b>): u64
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="pool_u64.md#0x1_pool_u64_spec_shares">spec_shares</a>(pool, shareholder);
+</code></pre>
+
+
+
+<a id="@Specification_1_balance"></a>
+
+### Function `balance`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64.md#0x1_pool_u64_balance">balance</a>(pool: &<a href="pool_u64.md#0x1_pool_u64_Pool">pool_u64::Pool</a>, shareholder: <b>address</b>): u64
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> shares = <a href="pool_u64.md#0x1_pool_u64_spec_shares">spec_shares</a>(pool, shareholder);
+<b>let</b> total_coins = pool.total_coins;
+<b>aborts_if</b> pool.total_coins &gt; 0 && pool.total_shares &gt; 0 && (shares * total_coins) / pool.total_shares &gt; <a href="pool_u64.md#0x1_pool_u64_MAX_U64">MAX_U64</a>;
+<b>ensures</b> result == <a href="pool_u64.md#0x1_pool_u64_spec_shares_to_amount_with_total_coins">spec_shares_to_amount_with_total_coins</a>(pool, shares, total_coins);
+</code></pre>
+
+
+
+<a id="@Specification_1_buy_in"></a>
+
+### Function `buy_in`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64.md#0x1_pool_u64_buy_in">buy_in</a>(pool: &<b>mut</b> <a href="pool_u64.md#0x1_pool_u64_Pool">pool_u64::Pool</a>, shareholder: <b>address</b>, coins_amount: u64): u64
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> new_shares = <a href="pool_u64.md#0x1_pool_u64_spec_amount_to_shares_with_total_coins">spec_amount_to_shares_with_total_coins</a>(pool, coins_amount, pool.total_coins);
+<b>aborts_if</b> pool.total_coins + coins_amount &gt; <a href="pool_u64.md#0x1_pool_u64_MAX_U64">MAX_U64</a>;
+<b>aborts_if</b> pool.total_shares + new_shares &gt; <a href="pool_u64.md#0x1_pool_u64_MAX_U64">MAX_U64</a>;
+<b>include</b> coins_amount &gt; 0 ==&gt; <a href="pool_u64.md#0x1_pool_u64_AddSharesAbortsIf">AddSharesAbortsIf</a> { new_shares: new_shares };
+<b>include</b> coins_amount &gt; 0 ==&gt; <a href="pool_u64.md#0x1_pool_u64_AddSharesEnsures">AddSharesEnsures</a> { new_shares: new_shares };
+<b>ensures</b> pool.total_coins == <b>old</b>(pool.total_coins) + coins_amount;
+<b>ensures</b> pool.total_shares == <b>old</b>(pool.total_shares) + new_shares;
+<b>ensures</b> result == new_shares;
+</code></pre>
+
+
+
+<a id="@Specification_1_add_shares"></a>
+
+### Function `add_shares`
+
+
+<pre><code><b>fun</b> <a href="pool_u64.md#0x1_pool_u64_add_shares">add_shares</a>(pool: &<b>mut</b> <a href="pool_u64.md#0x1_pool_u64_Pool">pool_u64::Pool</a>, shareholder: <b>address</b>, new_shares: u64): u64
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="pool_u64.md#0x1_pool_u64_AddSharesAbortsIf">AddSharesAbortsIf</a>;
+<b>include</b> <a href="pool_u64.md#0x1_pool_u64_AddSharesEnsures">AddSharesEnsures</a>;
+<b>let</b> key_exists = <a href="simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(pool.shares, shareholder);
+<b>ensures</b> result == <b>if</b> (key_exists) { <a href="simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(pool.shares, shareholder) }
+<b>else</b> { new_shares };
+</code></pre>
+
+
+
+
+<a id="0x1_pool_u64_AddSharesAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="pool_u64.md#0x1_pool_u64_AddSharesAbortsIf">AddSharesAbortsIf</a> {
+    pool: <a href="pool_u64.md#0x1_pool_u64_Pool">Pool</a>;
+    shareholder: <b>address</b>;
+    new_shares: u64;
+    <b>let</b> key_exists = <a href="simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(pool.shares, shareholder);
+    <b>let</b> current_shares = <a href="simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(pool.shares, shareholder);
+    <b>aborts_if</b> key_exists && current_shares + new_shares &gt; <a href="pool_u64.md#0x1_pool_u64_MAX_U64">MAX_U64</a>;
+    <b>aborts_if</b> !key_exists && new_shares &gt; 0 && len(pool.shareholders) &gt;= pool.shareholders_limit;
+}
+</code></pre>
+
+
+
+
+<a id="0x1_pool_u64_AddSharesEnsures"></a>
+
+
+<pre><code><b>schema</b> <a href="pool_u64.md#0x1_pool_u64_AddSharesEnsures">AddSharesEnsures</a> {
+    pool: <a href="pool_u64.md#0x1_pool_u64_Pool">Pool</a>;
+    shareholder: <b>address</b>;
+    new_shares: u64;
+    <b>let</b> key_exists = <a href="simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(pool.shares, shareholder);
+    <b>let</b> current_shares = <a href="simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(pool.shares, shareholder);
+    <b>ensures</b> key_exists ==&gt;
+        pool.shares == <a href="simple_map.md#0x1_simple_map_spec_set">simple_map::spec_set</a>(<b>old</b>(pool.shares), shareholder, current_shares + new_shares);
+    <b>ensures</b> (!key_exists && new_shares &gt; 0) ==&gt;
+        pool.shares == <a href="simple_map.md#0x1_simple_map_spec_set">simple_map::spec_set</a>(<b>old</b>(pool.shares), shareholder, new_shares);
+    <b>ensures</b> (!key_exists && new_shares &gt; 0) ==&gt;
+        <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_eq_push_back">vector::eq_push_back</a>(pool.shareholders, <b>old</b>(pool.shareholders), shareholder);
+}
+</code></pre>
+
+
+
+
+<a id="0x1_pool_u64_spec_amount_to_shares_with_total_coins"></a>
+
+
+<pre><code><b>fun</b> <a href="pool_u64.md#0x1_pool_u64_spec_amount_to_shares_with_total_coins">spec_amount_to_shares_with_total_coins</a>(pool: <a href="pool_u64.md#0x1_pool_u64_Pool">Pool</a>, coins_amount: u64, total_coins: u64): u64 {
+   <b>if</b> (pool.total_coins == 0 || pool.total_shares == 0) {
+       coins_amount * pool.scaling_factor
+   }
+   <b>else</b> {
+       (coins_amount * pool.total_shares) / total_coins
+   }
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_redeem_shares"></a>
+
+### Function `redeem_shares`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64.md#0x1_pool_u64_redeem_shares">redeem_shares</a>(pool: &<b>mut</b> <a href="pool_u64.md#0x1_pool_u64_Pool">pool_u64::Pool</a>, shareholder: <b>address</b>, shares_to_redeem: u64): u64
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> redeemed_coins = <a href="pool_u64.md#0x1_pool_u64_spec_shares_to_amount_with_total_coins">spec_shares_to_amount_with_total_coins</a>(pool, shares_to_redeem, pool.total_coins);
+<b>aborts_if</b> !<a href="pool_u64.md#0x1_pool_u64_spec_contains">spec_contains</a>(pool, shareholder);
+<b>aborts_if</b> <a href="pool_u64.md#0x1_pool_u64_spec_shares">spec_shares</a>(pool, shareholder) &lt; shares_to_redeem;
+<b>aborts_if</b> pool.<a href="pool_u64.md#0x1_pool_u64_total_coins">total_coins</a> &lt; redeemed_coins;
+<b>aborts_if</b> pool.<a href="pool_u64.md#0x1_pool_u64_total_shares">total_shares</a> &lt; shares_to_redeem;
+<b>ensures</b> pool.total_coins == <b>old</b>(pool.total_coins) - redeemed_coins;
+<b>ensures</b> pool.total_shares == <b>old</b>(pool.total_shares) - shares_to_redeem;
+<b>include</b> shares_to_redeem &gt; 0 ==&gt; <a href="pool_u64.md#0x1_pool_u64_DeductSharesEnsures">DeductSharesEnsures</a> { num_shares: shares_to_redeem };
+<b>ensures</b> result == redeemed_coins;
+</code></pre>
+
+
+
+<a id="@Specification_1_transfer_shares"></a>
+
+### Function `transfer_shares`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64.md#0x1_pool_u64_transfer_shares">transfer_shares</a>(pool: &<b>mut</b> <a href="pool_u64.md#0x1_pool_u64_Pool">pool_u64::Pool</a>, shareholder_1: <b>address</b>, shareholder_2: <b>address</b>, shares_to_transfer: u64)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> aborts_if_is_partial;
+<b>aborts_if</b> !<a href="pool_u64.md#0x1_pool_u64_spec_contains">spec_contains</a>(pool, shareholder_1);
+<b>aborts_if</b> <a href="pool_u64.md#0x1_pool_u64_spec_shares">spec_shares</a>(pool, shareholder_1) &lt; shares_to_transfer;
+</code></pre>
+
+
+
+<a id="@Specification_1_deduct_shares"></a>
+
+### Function `deduct_shares`
+
+
+<pre><code><b>fun</b> <a href="pool_u64.md#0x1_pool_u64_deduct_shares">deduct_shares</a>(pool: &<b>mut</b> <a href="pool_u64.md#0x1_pool_u64_Pool">pool_u64::Pool</a>, shareholder: <b>address</b>, num_shares: u64): u64
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<a href="pool_u64.md#0x1_pool_u64_spec_contains">spec_contains</a>(pool, shareholder);
+<b>aborts_if</b> <a href="pool_u64.md#0x1_pool_u64_spec_shares">spec_shares</a>(pool, shareholder) &lt; num_shares;
+<b>include</b> <a href="pool_u64.md#0x1_pool_u64_DeductSharesEnsures">DeductSharesEnsures</a>;
+<b>let</b> remaining_shares = <a href="simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(pool.shares, shareholder) - num_shares;
+<b>ensures</b> remaining_shares &gt; 0 ==&gt; result == <a href="simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(pool.shares, shareholder);
+<b>ensures</b> remaining_shares == 0 ==&gt; result == 0;
+</code></pre>
+
+
+
+
+<a id="0x1_pool_u64_DeductSharesEnsures"></a>
+
+
+<pre><code><b>schema</b> <a href="pool_u64.md#0x1_pool_u64_DeductSharesEnsures">DeductSharesEnsures</a> {
+    pool: <a href="pool_u64.md#0x1_pool_u64_Pool">Pool</a>;
+    shareholder: <b>address</b>;
+    num_shares: u64;
+    <b>let</b> remaining_shares = <a href="simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(pool.shares, shareholder) - num_shares;
+    <b>ensures</b> remaining_shares &gt; 0 ==&gt; <a href="simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(pool.shares, shareholder) == remaining_shares;
+    <b>ensures</b> remaining_shares == 0 ==&gt; !<a href="simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(pool.shares, shareholder);
+    <b>ensures</b> remaining_shares == 0 ==&gt; !<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_spec_contains">vector::spec_contains</a>(pool.shareholders, shareholder);
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_amount_to_shares_with_total_coins"></a>
+
+### Function `amount_to_shares_with_total_coins`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64.md#0x1_pool_u64_amount_to_shares_with_total_coins">amount_to_shares_with_total_coins</a>(pool: &<a href="pool_u64.md#0x1_pool_u64_Pool">pool_u64::Pool</a>, coins_amount: u64, total_coins: u64): u64
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> pool.total_coins &gt; 0 && pool.total_shares &gt; 0
+    && (coins_amount * pool.total_shares) / total_coins &gt; <a href="pool_u64.md#0x1_pool_u64_MAX_U64">MAX_U64</a>;
+<b>aborts_if</b> (pool.total_coins == 0 || pool.total_shares == 0)
+    && coins_amount * pool.scaling_factor &gt; <a href="pool_u64.md#0x1_pool_u64_MAX_U64">MAX_U64</a>;
+<b>aborts_if</b> pool.total_coins &gt; 0 && pool.total_shares &gt; 0 && total_coins == 0;
+<b>ensures</b> result == <a href="pool_u64.md#0x1_pool_u64_spec_amount_to_shares_with_total_coins">spec_amount_to_shares_with_total_coins</a>(pool, coins_amount, total_coins);
+</code></pre>
+
+
+
+<a id="@Specification_1_shares_to_amount_with_total_coins"></a>
+
+### Function `shares_to_amount_with_total_coins`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64.md#0x1_pool_u64_shares_to_amount_with_total_coins">shares_to_amount_with_total_coins</a>(pool: &<a href="pool_u64.md#0x1_pool_u64_Pool">pool_u64::Pool</a>, shares: u64, total_coins: u64): u64
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> pool.total_coins &gt; 0 && pool.total_shares &gt; 0
+    && (shares * total_coins) / pool.total_shares &gt; <a href="pool_u64.md#0x1_pool_u64_MAX_U64">MAX_U64</a>;
+<b>ensures</b> result == <a href="pool_u64.md#0x1_pool_u64_spec_shares_to_amount_with_total_coins">spec_shares_to_amount_with_total_coins</a>(pool, shares, total_coins);
+</code></pre>
+
+
+
+
+<a id="0x1_pool_u64_spec_shares_to_amount_with_total_coins"></a>
+
+
+<pre><code><b>fun</b> <a href="pool_u64.md#0x1_pool_u64_spec_shares_to_amount_with_total_coins">spec_shares_to_amount_with_total_coins</a>(pool: <a href="pool_u64.md#0x1_pool_u64_Pool">Pool</a>, shares: u64, total_coins: u64): u64 {
+   <b>if</b> (pool.total_coins == 0 || pool.total_shares == 0) {
+       0
+   }
+   <b>else</b> {
+       (shares * total_coins) / pool.total_shares
+   }
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_multiply_then_divide"></a>
+
+### Function `multiply_then_divide`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64.md#0x1_pool_u64_multiply_then_divide">multiply_then_divide</a>(_pool: &<a href="pool_u64.md#0x1_pool_u64_Pool">pool_u64::Pool</a>, x: u64, y: u64, z: u64): u64
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> z == 0;
+<b>aborts_if</b> (x * y) / z &gt; <a href="pool_u64.md#0x1_pool_u64_MAX_U64">MAX_U64</a>;
+<b>ensures</b> result == (x * y) / z;
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/pool_u64_unbound.md b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/pool_u64_unbound.md
new file mode 100644
index 0000000000000..6d23dd44b65b4
--- /dev/null
+++ b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/pool_u64_unbound.md
@@ -0,0 +1,1333 @@
+
+<a id="0x1_pool_u64_unbound"></a>
+
+# Module `0x1::pool_u64_unbound`
+
+
+Simple module for tracking and calculating shares of a pool of coins. The shares are worth more as the total coins in
+the pool increases. New shareholder can buy more shares or redeem their existing shares.
+
+Example flow:
+1. Pool start outs empty.
+2. Shareholder A buys in with 1000 coins. A will receive 1000 shares in the pool. Pool now has 1000 total coins and
+1000 total shares.
+3. Pool appreciates in value from rewards and now has 2000 coins. A's 1000 shares are now worth 2000 coins.
+4. Shareholder B now buys in with 1000 coins. Since before the buy in, each existing share is worth 2 coins, B will
+receive 500 shares in exchange for 1000 coins. Pool now has 1500 shares and 3000 coins.
+5. Pool appreciates in value from rewards and now has 6000 coins.
+6. A redeems 500 shares. Each share is worth 6000 / 1500 = 4. A receives 2000 coins. Pool has 4000 coins and 1000
+shares left.
+
+
+-  [Struct `Pool`](#0x1_pool_u64_unbound_Pool)
+-  [Constants](#@Constants_0)
+-  [Function `new`](#0x1_pool_u64_unbound_new)
+-  [Function `create`](#0x1_pool_u64_unbound_create)
+-  [Function `create_with_scaling_factor`](#0x1_pool_u64_unbound_create_with_scaling_factor)
+-  [Function `destroy_empty`](#0x1_pool_u64_unbound_destroy_empty)
+-  [Function `total_coins`](#0x1_pool_u64_unbound_total_coins)
+-  [Function `total_shares`](#0x1_pool_u64_unbound_total_shares)
+-  [Function `contains`](#0x1_pool_u64_unbound_contains)
+-  [Function `shares`](#0x1_pool_u64_unbound_shares)
+-  [Function `balance`](#0x1_pool_u64_unbound_balance)
+-  [Function `shareholders_count`](#0x1_pool_u64_unbound_shareholders_count)
+-  [Function `update_total_coins`](#0x1_pool_u64_unbound_update_total_coins)
+-  [Function `buy_in`](#0x1_pool_u64_unbound_buy_in)
+-  [Function `add_shares`](#0x1_pool_u64_unbound_add_shares)
+-  [Function `redeem_shares`](#0x1_pool_u64_unbound_redeem_shares)
+-  [Function `transfer_shares`](#0x1_pool_u64_unbound_transfer_shares)
+-  [Function `deduct_shares`](#0x1_pool_u64_unbound_deduct_shares)
+-  [Function `amount_to_shares`](#0x1_pool_u64_unbound_amount_to_shares)
+-  [Function `amount_to_shares_with_total_coins`](#0x1_pool_u64_unbound_amount_to_shares_with_total_coins)
+-  [Function `shares_to_amount`](#0x1_pool_u64_unbound_shares_to_amount)
+-  [Function `shares_to_amount_with_total_coins`](#0x1_pool_u64_unbound_shares_to_amount_with_total_coins)
+-  [Function `shares_to_amount_with_total_stats`](#0x1_pool_u64_unbound_shares_to_amount_with_total_stats)
+-  [Function `multiply_then_divide`](#0x1_pool_u64_unbound_multiply_then_divide)
+-  [Function `to_u128`](#0x1_pool_u64_unbound_to_u128)
+-  [Function `to_u256`](#0x1_pool_u64_unbound_to_u256)
+-  [Specification](#@Specification_1)
+    -  [Struct `Pool`](#@Specification_1_Pool)
+    -  [Function `contains`](#@Specification_1_contains)
+    -  [Function `shares`](#@Specification_1_shares)
+    -  [Function `balance`](#@Specification_1_balance)
+    -  [Function `buy_in`](#@Specification_1_buy_in)
+    -  [Function `add_shares`](#@Specification_1_add_shares)
+    -  [Function `redeem_shares`](#@Specification_1_redeem_shares)
+    -  [Function `transfer_shares`](#@Specification_1_transfer_shares)
+    -  [Function `deduct_shares`](#@Specification_1_deduct_shares)
+    -  [Function `amount_to_shares_with_total_coins`](#@Specification_1_amount_to_shares_with_total_coins)
+    -  [Function `shares_to_amount_with_total_coins`](#@Specification_1_shares_to_amount_with_total_coins)
+    -  [Function `multiply_then_divide`](#@Specification_1_multiply_then_divide)
+    -  [Function `to_u128`](#@Specification_1_to_u128)
+    -  [Function `to_u256`](#@Specification_1_to_u256)
+
+
+<pre><code><b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="table_with_length.md#0x1_table_with_length">0x1::table_with_length</a>;
+</code></pre>
+
+
+
+<a id="0x1_pool_u64_unbound_Pool"></a>
+
+## Struct `Pool`
+
+
+
+<pre><code><b>struct</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">Pool</a> <b>has</b> store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>total_coins: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>total_shares: u128</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>shares: <a href="table_with_length.md#0x1_table_with_length_TableWithLength">table_with_length::TableWithLength</a>&lt;<b>address</b>, u128&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>scaling_factor: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_pool_u64_unbound_MAX_U64"></a>
+
+
+
+<pre><code><b>const</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_MAX_U64">MAX_U64</a>: u64 = 18446744073709551615;
+</code></pre>
+
+
+
+<a id="0x1_pool_u64_unbound_MAX_U128"></a>
+
+
+
+<pre><code><b>const</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_MAX_U128">MAX_U128</a>: u128 = 340282366920938463463374607431768211455;
+</code></pre>
+
+
+
+<a id="0x1_pool_u64_unbound_EINSUFFICIENT_SHARES"></a>
+
+Cannot redeem more shares than the shareholder has in the pool.
+
+
+<pre><code><b>const</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_EINSUFFICIENT_SHARES">EINSUFFICIENT_SHARES</a>: u64 = 4;
+</code></pre>
+
+
+
+<a id="0x1_pool_u64_unbound_EPOOL_IS_NOT_EMPTY"></a>
+
+Cannot destroy non-empty pool.
+
+
+<pre><code><b>const</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_EPOOL_IS_NOT_EMPTY">EPOOL_IS_NOT_EMPTY</a>: u64 = 3;
+</code></pre>
+
+
+
+<a id="0x1_pool_u64_unbound_EPOOL_TOTAL_COINS_OVERFLOW"></a>
+
+Pool's total coins cannot exceed u64.max.
+
+
+<pre><code><b>const</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_EPOOL_TOTAL_COINS_OVERFLOW">EPOOL_TOTAL_COINS_OVERFLOW</a>: u64 = 6;
+</code></pre>
+
+
+
+<a id="0x1_pool_u64_unbound_EPOOL_TOTAL_SHARES_OVERFLOW"></a>
+
+Pool's total shares cannot exceed u64.max.
+
+
+<pre><code><b>const</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_EPOOL_TOTAL_SHARES_OVERFLOW">EPOOL_TOTAL_SHARES_OVERFLOW</a>: u64 = 7;
+</code></pre>
+
+
+
+<a id="0x1_pool_u64_unbound_ESHAREHOLDER_NOT_FOUND"></a>
+
+Shareholder not present in pool.
+
+
+<pre><code><b>const</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_ESHAREHOLDER_NOT_FOUND">ESHAREHOLDER_NOT_FOUND</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_pool_u64_unbound_ESHAREHOLDER_SHARES_OVERFLOW"></a>
+
+Shareholder cannot have more than u64.max shares.
+
+
+<pre><code><b>const</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_ESHAREHOLDER_SHARES_OVERFLOW">ESHAREHOLDER_SHARES_OVERFLOW</a>: u64 = 5;
+</code></pre>
+
+
+
+<a id="0x1_pool_u64_unbound_ETOO_MANY_SHAREHOLDERS"></a>
+
+There are too many shareholders in the pool.
+
+
+<pre><code><b>const</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_ETOO_MANY_SHAREHOLDERS">ETOO_MANY_SHAREHOLDERS</a>: u64 = 2;
+</code></pre>
+
+
+
+<a id="0x1_pool_u64_unbound_new"></a>
+
+## Function `new`
+
+Create a new pool.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_new">new</a>(): <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">pool_u64_unbound::Pool</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_new">new</a>(): <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">Pool</a> {
+    // Default <b>to</b> a scaling factor of 1 (effectively no scaling).
+    <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_create_with_scaling_factor">create_with_scaling_factor</a>(1)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_pool_u64_unbound_create"></a>
+
+## Function `create`
+
+Deprecated. Use <code>new</code> instead.
+Create a new pool.
+
+
+<pre><code>#[deprecated]
+<b>public</b> <b>fun</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_create">create</a>(): <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">pool_u64_unbound::Pool</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_create">create</a>(): <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">Pool</a> {
+    <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_new">new</a>()
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_pool_u64_unbound_create_with_scaling_factor"></a>
+
+## Function `create_with_scaling_factor`
+
+Create a new pool with custom <code>scaling_factor</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_create_with_scaling_factor">create_with_scaling_factor</a>(scaling_factor: u64): <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">pool_u64_unbound::Pool</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_create_with_scaling_factor">create_with_scaling_factor</a>(scaling_factor: u64): <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">Pool</a> {
+    <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">Pool</a> {
+        total_coins: 0,
+        total_shares: 0,
+        shares: <a href="table.md#0x1_table_new">table::new</a>&lt;<b>address</b>, u128&gt;(),
+        scaling_factor,
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_pool_u64_unbound_destroy_empty"></a>
+
+## Function `destroy_empty`
+
+Destroy an empty pool. This will fail if the pool has any balance of coins.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_destroy_empty">destroy_empty</a>(pool: <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">pool_u64_unbound::Pool</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_destroy_empty">destroy_empty</a>(pool: <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">Pool</a>) {
+    <b>assert</b>!(pool.total_coins == 0, <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_EPOOL_IS_NOT_EMPTY">EPOOL_IS_NOT_EMPTY</a>));
+    <b>let</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">Pool</a> {
+        total_coins: _,
+        total_shares: _,
+        shares,
+        scaling_factor: _,
+    } = pool;
+    table::destroy_empty&lt;<b>address</b>, u128&gt;(shares);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_pool_u64_unbound_total_coins"></a>
+
+## Function `total_coins`
+
+Return <code>pool</code>'s total balance of coins.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_total_coins">total_coins</a>(pool: &<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">pool_u64_unbound::Pool</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_total_coins">total_coins</a>(pool: &<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">Pool</a>): u64 {
+    pool.total_coins
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_pool_u64_unbound_total_shares"></a>
+
+## Function `total_shares`
+
+Return the total number of shares across all shareholders in <code>pool</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_total_shares">total_shares</a>(pool: &<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">pool_u64_unbound::Pool</a>): u128
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_total_shares">total_shares</a>(pool: &<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">Pool</a>): u128 {
+    pool.total_shares
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_pool_u64_unbound_contains"></a>
+
+## Function `contains`
+
+Return true if <code>shareholder</code> is in <code>pool</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_contains">contains</a>(pool: &<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">pool_u64_unbound::Pool</a>, shareholder: <b>address</b>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_contains">contains</a>(pool: &<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">Pool</a>, shareholder: <b>address</b>): bool {
+    <a href="table.md#0x1_table_contains">table::contains</a>(&pool.shares, shareholder)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_pool_u64_unbound_shares"></a>
+
+## Function `shares`
+
+Return the number of shares of <code>stakeholder</code> in <code>pool</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_shares">shares</a>(pool: &<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">pool_u64_unbound::Pool</a>, shareholder: <b>address</b>): u128
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_shares">shares</a>(pool: &<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">Pool</a>, shareholder: <b>address</b>): u128 {
+    <b>if</b> (<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_contains">contains</a>(pool, shareholder)) {
+        *<a href="table.md#0x1_table_borrow">table::borrow</a>(&pool.shares, shareholder)
+    } <b>else</b> {
+        0
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_pool_u64_unbound_balance"></a>
+
+## Function `balance`
+
+Return the balance in coins of <code>shareholder</code> in <code>pool.</code>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_balance">balance</a>(pool: &<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">pool_u64_unbound::Pool</a>, shareholder: <b>address</b>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_balance">balance</a>(pool: &<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">Pool</a>, shareholder: <b>address</b>): u64 {
+    <b>let</b> num_shares = <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_shares">shares</a>(pool, shareholder);
+    <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_shares_to_amount">shares_to_amount</a>(pool, num_shares)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_pool_u64_unbound_shareholders_count"></a>
+
+## Function `shareholders_count`
+
+Return the number of shareholders in <code>pool</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_shareholders_count">shareholders_count</a>(pool: &<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">pool_u64_unbound::Pool</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_shareholders_count">shareholders_count</a>(pool: &<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">Pool</a>): u64 {
+    table::length(&pool.shares)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_pool_u64_unbound_update_total_coins"></a>
+
+## Function `update_total_coins`
+
+Update <code>pool</code>'s total balance of coins.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_update_total_coins">update_total_coins</a>(pool: &<b>mut</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">pool_u64_unbound::Pool</a>, new_total_coins: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_update_total_coins">update_total_coins</a>(pool: &<b>mut</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">Pool</a>, new_total_coins: u64) {
+    pool.total_coins = new_total_coins;
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_pool_u64_unbound_buy_in"></a>
+
+## Function `buy_in`
+
+Allow an existing or new shareholder to add their coins to the pool in exchange for new shares.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_buy_in">buy_in</a>(pool: &<b>mut</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">pool_u64_unbound::Pool</a>, shareholder: <b>address</b>, coins_amount: u64): u128
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_buy_in">buy_in</a>(pool: &<b>mut</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">Pool</a>, shareholder: <b>address</b>, coins_amount: u64): u128 {
+    <b>if</b> (coins_amount == 0) <b>return</b> 0;
+
+    <b>let</b> new_shares = <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_amount_to_shares">amount_to_shares</a>(pool, coins_amount);
+    <b>assert</b>!(<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_MAX_U64">MAX_U64</a> - pool.total_coins &gt;= coins_amount, <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_EPOOL_TOTAL_COINS_OVERFLOW">EPOOL_TOTAL_COINS_OVERFLOW</a>));
+    <b>assert</b>!(<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_MAX_U128">MAX_U128</a> - pool.total_shares &gt;= new_shares, <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_EPOOL_TOTAL_SHARES_OVERFLOW">EPOOL_TOTAL_SHARES_OVERFLOW</a>));
+
+    pool.total_coins = pool.total_coins + coins_amount;
+    pool.total_shares = pool.total_shares + new_shares;
+    <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_add_shares">add_shares</a>(pool, shareholder, new_shares);
+    new_shares
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_pool_u64_unbound_add_shares"></a>
+
+## Function `add_shares`
+
+Add the number of shares directly for <code>shareholder</code> in <code>pool</code>.
+This would dilute other shareholders if the pool's balance of coins didn't change.
+
+
+<pre><code><b>fun</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_add_shares">add_shares</a>(pool: &<b>mut</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">pool_u64_unbound::Pool</a>, shareholder: <b>address</b>, new_shares: u128): u128
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_add_shares">add_shares</a>(pool: &<b>mut</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">Pool</a>, shareholder: <b>address</b>, new_shares: u128): u128 {
+    <b>if</b> (<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_contains">contains</a>(pool, shareholder)) {
+        <b>let</b> existing_shares = <a href="table.md#0x1_table_borrow_mut">table::borrow_mut</a>(&<b>mut</b> pool.shares, shareholder);
+        <b>let</b> current_shares = *existing_shares;
+        <b>assert</b>!(<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_MAX_U128">MAX_U128</a> - current_shares &gt;= new_shares, <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_ESHAREHOLDER_SHARES_OVERFLOW">ESHAREHOLDER_SHARES_OVERFLOW</a>));
+
+        *existing_shares = current_shares + new_shares;
+        *existing_shares
+    } <b>else</b> <b>if</b> (new_shares &gt; 0) {
+        <a href="table.md#0x1_table_add">table::add</a>(&<b>mut</b> pool.shares, shareholder, new_shares);
+        new_shares
+    } <b>else</b> {
+        new_shares
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_pool_u64_unbound_redeem_shares"></a>
+
+## Function `redeem_shares`
+
+Allow <code>shareholder</code> to redeem their shares in <code>pool</code> for coins.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_redeem_shares">redeem_shares</a>(pool: &<b>mut</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">pool_u64_unbound::Pool</a>, shareholder: <b>address</b>, shares_to_redeem: u128): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_redeem_shares">redeem_shares</a>(pool: &<b>mut</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">Pool</a>, shareholder: <b>address</b>, shares_to_redeem: u128): u64 {
+    <b>assert</b>!(<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_contains">contains</a>(pool, shareholder), <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_ESHAREHOLDER_NOT_FOUND">ESHAREHOLDER_NOT_FOUND</a>));
+    <b>assert</b>!(<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_shares">shares</a>(pool, shareholder) &gt;= shares_to_redeem, <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_EINSUFFICIENT_SHARES">EINSUFFICIENT_SHARES</a>));
+
+    <b>if</b> (shares_to_redeem == 0) <b>return</b> 0;
+
+    <b>let</b> redeemed_coins = <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_shares_to_amount">shares_to_amount</a>(pool, shares_to_redeem);
+    pool.total_coins = pool.total_coins - redeemed_coins;
+    pool.total_shares = pool.total_shares - shares_to_redeem;
+    <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_deduct_shares">deduct_shares</a>(pool, shareholder, shares_to_redeem);
+
+    redeemed_coins
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_pool_u64_unbound_transfer_shares"></a>
+
+## Function `transfer_shares`
+
+Transfer shares from <code>shareholder_1</code> to <code>shareholder_2</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_transfer_shares">transfer_shares</a>(pool: &<b>mut</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">pool_u64_unbound::Pool</a>, shareholder_1: <b>address</b>, shareholder_2: <b>address</b>, shares_to_transfer: u128)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_transfer_shares">transfer_shares</a>(
+    pool: &<b>mut</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">Pool</a>,
+    shareholder_1: <b>address</b>,
+    shareholder_2: <b>address</b>,
+    shares_to_transfer: u128,
+) {
+    <b>assert</b>!(<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_contains">contains</a>(pool, shareholder_1), <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_ESHAREHOLDER_NOT_FOUND">ESHAREHOLDER_NOT_FOUND</a>));
+    <b>assert</b>!(<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_shares">shares</a>(pool, shareholder_1) &gt;= shares_to_transfer, <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_EINSUFFICIENT_SHARES">EINSUFFICIENT_SHARES</a>));
+    <b>if</b> (shares_to_transfer == 0) <b>return</b>;
+
+    <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_deduct_shares">deduct_shares</a>(pool, shareholder_1, shares_to_transfer);
+    <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_add_shares">add_shares</a>(pool, shareholder_2, shares_to_transfer);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_pool_u64_unbound_deduct_shares"></a>
+
+## Function `deduct_shares`
+
+Directly deduct <code>shareholder</code>'s number of shares in <code>pool</code> and return the number of remaining shares.
+
+
+<pre><code><b>fun</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_deduct_shares">deduct_shares</a>(pool: &<b>mut</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">pool_u64_unbound::Pool</a>, shareholder: <b>address</b>, num_shares: u128): u128
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_deduct_shares">deduct_shares</a>(pool: &<b>mut</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">Pool</a>, shareholder: <b>address</b>, num_shares: u128): u128 {
+    <b>assert</b>!(<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_contains">contains</a>(pool, shareholder), <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_ESHAREHOLDER_NOT_FOUND">ESHAREHOLDER_NOT_FOUND</a>));
+    <b>assert</b>!(<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_shares">shares</a>(pool, shareholder) &gt;= num_shares, <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_EINSUFFICIENT_SHARES">EINSUFFICIENT_SHARES</a>));
+
+    <b>let</b> existing_shares = <a href="table.md#0x1_table_borrow_mut">table::borrow_mut</a>(&<b>mut</b> pool.shares, shareholder);
+    *existing_shares = *existing_shares - num_shares;
+
+    // Remove the shareholder completely <b>if</b> they have no shares left.
+    <b>let</b> remaining_shares = *existing_shares;
+    <b>if</b> (remaining_shares == 0) {
+        <a href="table.md#0x1_table_remove">table::remove</a>(&<b>mut</b> pool.shares, shareholder);
+    };
+
+    remaining_shares
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_pool_u64_unbound_amount_to_shares"></a>
+
+## Function `amount_to_shares`
+
+Return the number of new shares <code>coins_amount</code> can buy in <code>pool</code>.
+<code>amount</code> needs to big enough to avoid rounding number.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_amount_to_shares">amount_to_shares</a>(pool: &<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">pool_u64_unbound::Pool</a>, coins_amount: u64): u128
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_amount_to_shares">amount_to_shares</a>(pool: &<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">Pool</a>, coins_amount: u64): u128 {
+    <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_amount_to_shares_with_total_coins">amount_to_shares_with_total_coins</a>(pool, coins_amount, pool.total_coins)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_pool_u64_unbound_amount_to_shares_with_total_coins"></a>
+
+## Function `amount_to_shares_with_total_coins`
+
+Return the number of new shares <code>coins_amount</code> can buy in <code>pool</code> with a custom total coins number.
+<code>amount</code> needs to big enough to avoid rounding number.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_amount_to_shares_with_total_coins">amount_to_shares_with_total_coins</a>(pool: &<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">pool_u64_unbound::Pool</a>, coins_amount: u64, total_coins: u64): u128
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_amount_to_shares_with_total_coins">amount_to_shares_with_total_coins</a>(pool: &<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">Pool</a>, coins_amount: u64, total_coins: u64): u128 {
+    // No shares yet so amount is worth the same number of shares.
+    <b>if</b> (pool.total_coins == 0 || pool.total_shares == 0) {
+        // Multiply by scaling factor <b>to</b> minimize rounding errors during <b>internal</b> calculations for buy ins/redeems.
+        // This can overflow but scaling factor is expected <b>to</b> be chosen carefully so this would not overflow.
+        <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_to_u128">to_u128</a>(coins_amount) * <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_to_u128">to_u128</a>(pool.scaling_factor)
+    } <b>else</b> {
+        // Shares price = total_coins / total existing shares.
+        // New number of shares = new_amount / shares_price = new_amount * existing_shares / total_amount.
+        // We rearrange the calc and do multiplication first <b>to</b> avoid rounding errors.
+        <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_multiply_then_divide">multiply_then_divide</a>(pool, <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_to_u128">to_u128</a>(coins_amount), pool.total_shares, <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_to_u128">to_u128</a>(total_coins))
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_pool_u64_unbound_shares_to_amount"></a>
+
+## Function `shares_to_amount`
+
+Return the number of coins <code>shares</code> are worth in <code>pool</code>.
+<code>shares</code> needs to big enough to avoid rounding number.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_shares_to_amount">shares_to_amount</a>(pool: &<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">pool_u64_unbound::Pool</a>, shares: u128): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_shares_to_amount">shares_to_amount</a>(pool: &<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">Pool</a>, shares: u128): u64 {
+    <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_shares_to_amount_with_total_coins">shares_to_amount_with_total_coins</a>(pool, shares, pool.total_coins)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_pool_u64_unbound_shares_to_amount_with_total_coins"></a>
+
+## Function `shares_to_amount_with_total_coins`
+
+Return the number of coins <code>shares</code> are worth in <code>pool</code> with a custom total coins number.
+<code>shares</code> needs to big enough to avoid rounding number.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_shares_to_amount_with_total_coins">shares_to_amount_with_total_coins</a>(pool: &<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">pool_u64_unbound::Pool</a>, shares: u128, total_coins: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_shares_to_amount_with_total_coins">shares_to_amount_with_total_coins</a>(pool: &<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">Pool</a>, shares: u128, total_coins: u64): u64 {
+    // No shares or coins yet so shares are worthless.
+    <b>if</b> (pool.total_coins == 0 || pool.total_shares == 0) {
+        0
+    } <b>else</b> {
+        // Shares price = total_coins / total existing shares.
+        // Shares worth = shares * shares price = shares * total_coins / total existing shares.
+        // We rearrange the calc and do multiplication first <b>to</b> avoid rounding errors.
+        (<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_multiply_then_divide">multiply_then_divide</a>(pool, shares, <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_to_u128">to_u128</a>(total_coins), pool.total_shares) <b>as</b> u64)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_pool_u64_unbound_shares_to_amount_with_total_stats"></a>
+
+## Function `shares_to_amount_with_total_stats`
+
+Return the number of coins <code>shares</code> are worth in <code>pool</code> with custom total coins and shares numbers.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_shares_to_amount_with_total_stats">shares_to_amount_with_total_stats</a>(pool: &<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">pool_u64_unbound::Pool</a>, shares: u128, total_coins: u64, total_shares: u128): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_shares_to_amount_with_total_stats">shares_to_amount_with_total_stats</a>(
+    pool: &<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">Pool</a>,
+    shares: u128,
+    total_coins: u64,
+    total_shares: u128,
+): u64 {
+    <b>if</b> (pool.total_coins == 0 || total_shares == 0) {
+        0
+    } <b>else</b> {
+        (<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_multiply_then_divide">multiply_then_divide</a>(pool, shares, <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_to_u128">to_u128</a>(total_coins), total_shares) <b>as</b> u64)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_pool_u64_unbound_multiply_then_divide"></a>
+
+## Function `multiply_then_divide`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_multiply_then_divide">multiply_then_divide</a>(_pool: &<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">pool_u64_unbound::Pool</a>, x: u128, y: u128, z: u128): u128
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_multiply_then_divide">multiply_then_divide</a>(_pool: &<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">Pool</a>, x: u128, y: u128, z: u128): u128 {
+    <b>let</b> result = (<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_to_u256">to_u256</a>(x) * <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_to_u256">to_u256</a>(y)) / <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_to_u256">to_u256</a>(z);
+    (result <b>as</b> u128)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_pool_u64_unbound_to_u128"></a>
+
+## Function `to_u128`
+
+
+
+<pre><code><b>fun</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_to_u128">to_u128</a>(num: u64): u128
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_to_u128">to_u128</a>(num: u64): u128 {
+    (num <b>as</b> u128)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_pool_u64_unbound_to_u256"></a>
+
+## Function `to_u256`
+
+
+
+<pre><code><b>fun</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_to_u256">to_u256</a>(num: u128): u256
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_to_u256">to_u256</a>(num: u128): u256 {
+    (num <b>as</b> u256)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+<a id="@Specification_1_Pool"></a>
+
+### Struct `Pool`
+
+
+<pre><code><b>struct</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">Pool</a> <b>has</b> store
+</code></pre>
+
+
+
+<dl>
+<dt>
+<code>total_coins: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>total_shares: u128</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>shares: <a href="table_with_length.md#0x1_table_with_length_TableWithLength">table_with_length::TableWithLength</a>&lt;<b>address</b>, u128&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>scaling_factor: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+
+<pre><code><b>invariant</b> <b>forall</b> addr: <b>address</b>:
+    <a href="table.md#0x1_table_spec_contains">table::spec_contains</a>(shares, addr) ==&gt; (<a href="table.md#0x1_table_spec_get">table::spec_get</a>(shares, addr) &gt; 0);
+</code></pre>
+
+
+
+
+<a id="0x1_pool_u64_unbound_spec_contains"></a>
+
+
+<pre><code><b>fun</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_spec_contains">spec_contains</a>(pool: <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">Pool</a>, shareholder: <b>address</b>): bool {
+   <a href="table.md#0x1_table_spec_contains">table::spec_contains</a>(pool.shares, shareholder)
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_contains"></a>
+
+### Function `contains`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_contains">contains</a>(pool: &<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">pool_u64_unbound::Pool</a>, shareholder: <b>address</b>): bool
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_spec_contains">spec_contains</a>(pool, shareholder);
+</code></pre>
+
+
+
+
+<a id="0x1_pool_u64_unbound_spec_shares"></a>
+
+
+<pre><code><b>fun</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_spec_shares">spec_shares</a>(pool: <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">Pool</a>, shareholder: <b>address</b>): u64 {
+   <b>if</b> (<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_spec_contains">spec_contains</a>(pool, shareholder)) {
+       <a href="table.md#0x1_table_spec_get">table::spec_get</a>(pool.shares, shareholder)
+   }
+   <b>else</b> {
+       0
+   }
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_shares"></a>
+
+### Function `shares`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_shares">shares</a>(pool: &<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">pool_u64_unbound::Pool</a>, shareholder: <b>address</b>): u128
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_spec_shares">spec_shares</a>(pool, shareholder);
+</code></pre>
+
+
+
+<a id="@Specification_1_balance"></a>
+
+### Function `balance`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_balance">balance</a>(pool: &<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">pool_u64_unbound::Pool</a>, shareholder: <b>address</b>): u64
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> shares = <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_spec_shares">spec_shares</a>(pool, shareholder);
+<b>let</b> total_coins = pool.total_coins;
+<b>aborts_if</b> pool.total_coins &gt; 0 && pool.total_shares &gt; 0 && (shares * total_coins) / pool.total_shares &gt; <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_MAX_U64">MAX_U64</a>;
+<b>ensures</b> result == <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_spec_shares_to_amount_with_total_coins">spec_shares_to_amount_with_total_coins</a>(pool, shares, total_coins);
+</code></pre>
+
+
+
+<a id="@Specification_1_buy_in"></a>
+
+### Function `buy_in`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_buy_in">buy_in</a>(pool: &<b>mut</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">pool_u64_unbound::Pool</a>, shareholder: <b>address</b>, coins_amount: u64): u128
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> new_shares = <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_spec_amount_to_shares_with_total_coins">spec_amount_to_shares_with_total_coins</a>(pool, coins_amount, pool.total_coins);
+<b>aborts_if</b> pool.total_coins + coins_amount &gt; <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_MAX_U64">MAX_U64</a>;
+<b>aborts_if</b> pool.total_shares + new_shares &gt; <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_MAX_U128">MAX_U128</a>;
+<b>include</b> coins_amount &gt; 0 ==&gt; <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_AddSharesAbortsIf">AddSharesAbortsIf</a> { new_shares: new_shares };
+<b>include</b> coins_amount &gt; 0 ==&gt; <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_AddSharesEnsures">AddSharesEnsures</a> { new_shares: new_shares };
+<b>ensures</b> pool.total_coins == <b>old</b>(pool.total_coins) + coins_amount;
+<b>ensures</b> pool.total_shares == <b>old</b>(pool.total_shares) + new_shares;
+<b>ensures</b> result == new_shares;
+</code></pre>
+
+
+
+<a id="@Specification_1_add_shares"></a>
+
+### Function `add_shares`
+
+
+<pre><code><b>fun</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_add_shares">add_shares</a>(pool: &<b>mut</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">pool_u64_unbound::Pool</a>, shareholder: <b>address</b>, new_shares: u128): u128
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_AddSharesAbortsIf">AddSharesAbortsIf</a>;
+<b>include</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_AddSharesEnsures">AddSharesEnsures</a>;
+<b>let</b> key_exists = <a href="table.md#0x1_table_spec_contains">table::spec_contains</a>(pool.shares, shareholder);
+<b>ensures</b> result == <b>if</b> (key_exists) { <a href="table.md#0x1_table_spec_get">table::spec_get</a>(pool.shares, shareholder) }
+<b>else</b> { new_shares };
+</code></pre>
+
+
+
+
+<a id="0x1_pool_u64_unbound_AddSharesAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_AddSharesAbortsIf">AddSharesAbortsIf</a> {
+    pool: <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">Pool</a>;
+    shareholder: <b>address</b>;
+    new_shares: u64;
+    <b>let</b> key_exists = <a href="table.md#0x1_table_spec_contains">table::spec_contains</a>(pool.shares, shareholder);
+    <b>let</b> current_shares = <a href="table.md#0x1_table_spec_get">table::spec_get</a>(pool.shares, shareholder);
+    <b>aborts_if</b> key_exists && current_shares + new_shares &gt; <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_MAX_U128">MAX_U128</a>;
+}
+</code></pre>
+
+
+
+
+<a id="0x1_pool_u64_unbound_AddSharesEnsures"></a>
+
+
+<pre><code><b>schema</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_AddSharesEnsures">AddSharesEnsures</a> {
+    pool: <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">Pool</a>;
+    shareholder: <b>address</b>;
+    new_shares: u64;
+    <b>let</b> key_exists = <a href="table.md#0x1_table_spec_contains">table::spec_contains</a>(pool.shares, shareholder);
+    <b>let</b> current_shares = <a href="table.md#0x1_table_spec_get">table::spec_get</a>(pool.shares, shareholder);
+    <b>ensures</b> key_exists ==&gt;
+        pool.shares == <a href="table.md#0x1_table_spec_set">table::spec_set</a>(<b>old</b>(pool.shares), shareholder, current_shares + new_shares);
+    <b>ensures</b> (!key_exists && new_shares &gt; 0) ==&gt;
+        pool.shares == <a href="table.md#0x1_table_spec_set">table::spec_set</a>(<b>old</b>(pool.shares), shareholder, new_shares);
+}
+</code></pre>
+
+
+
+
+<a id="0x1_pool_u64_unbound_spec_amount_to_shares_with_total_coins"></a>
+
+
+<pre><code><b>fun</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_spec_amount_to_shares_with_total_coins">spec_amount_to_shares_with_total_coins</a>(pool: <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">Pool</a>, coins_amount: u64, total_coins: u64): u128 {
+   <b>if</b> (pool.total_coins == 0 || pool.total_shares == 0) {
+       coins_amount * pool.scaling_factor
+   }
+   <b>else</b> {
+       (coins_amount * pool.total_shares) / total_coins
+   }
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_redeem_shares"></a>
+
+### Function `redeem_shares`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_redeem_shares">redeem_shares</a>(pool: &<b>mut</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">pool_u64_unbound::Pool</a>, shareholder: <b>address</b>, shares_to_redeem: u128): u64
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> redeemed_coins = <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_spec_shares_to_amount_with_total_coins">spec_shares_to_amount_with_total_coins</a>(pool, shares_to_redeem, pool.total_coins);
+<b>aborts_if</b> !<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_spec_contains">spec_contains</a>(pool, shareholder);
+<b>aborts_if</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_spec_shares">spec_shares</a>(pool, shareholder) &lt; shares_to_redeem;
+<b>aborts_if</b> pool.<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_total_coins">total_coins</a> &lt; redeemed_coins;
+<b>aborts_if</b> pool.<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_total_shares">total_shares</a> &lt; shares_to_redeem;
+<b>ensures</b> pool.total_coins == <b>old</b>(pool.total_coins) - redeemed_coins;
+<b>ensures</b> pool.total_shares == <b>old</b>(pool.total_shares) - shares_to_redeem;
+<b>include</b> shares_to_redeem &gt; 0 ==&gt; <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_DeductSharesEnsures">DeductSharesEnsures</a> { num_shares: shares_to_redeem };
+<b>ensures</b> result == redeemed_coins;
+</code></pre>
+
+
+
+<a id="@Specification_1_transfer_shares"></a>
+
+### Function `transfer_shares`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_transfer_shares">transfer_shares</a>(pool: &<b>mut</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">pool_u64_unbound::Pool</a>, shareholder_1: <b>address</b>, shareholder_2: <b>address</b>, shares_to_transfer: u128)
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> (shareholder_1 != shareholder_2) && shares_to_transfer &gt; 0 && <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_spec_contains">spec_contains</a>(pool, shareholder_2) &&
+    (<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_spec_shares">spec_shares</a>(pool, shareholder_2) + shares_to_transfer &gt; <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_MAX_U128">MAX_U128</a>);
+<b>aborts_if</b> !<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_spec_contains">spec_contains</a>(pool, shareholder_1);
+<b>aborts_if</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_spec_shares">spec_shares</a>(pool, shareholder_1) &lt; shares_to_transfer;
+<b>ensures</b> shareholder_1 == shareholder_2 ==&gt; <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_spec_shares">spec_shares</a>(<b>old</b>(pool), shareholder_1) == <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_spec_shares">spec_shares</a>(pool, shareholder_1);
+<b>ensures</b> ((shareholder_1 != shareholder_2) && (<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_spec_shares">spec_shares</a>(<b>old</b>(pool), shareholder_1) == shares_to_transfer)) ==&gt;
+    !<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_spec_contains">spec_contains</a>(pool, shareholder_1);
+<b>ensures</b> (shareholder_1 != shareholder_2 && shares_to_transfer &gt; 0) ==&gt;
+    (<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_spec_contains">spec_contains</a>(pool, shareholder_2));
+<b>ensures</b> (shareholder_1 != shareholder_2 && shares_to_transfer &gt; 0 && !<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_spec_contains">spec_contains</a>(<b>old</b>(pool), shareholder_2)) ==&gt;
+    (<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_spec_contains">spec_contains</a>(pool, shareholder_2) && <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_spec_shares">spec_shares</a>(pool, shareholder_2) == shares_to_transfer);
+<b>ensures</b> (shareholder_1 != shareholder_2 && shares_to_transfer &gt; 0 && <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_spec_contains">spec_contains</a>(<b>old</b>(pool), shareholder_2)) ==&gt;
+    (<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_spec_contains">spec_contains</a>(pool, shareholder_2) && <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_spec_shares">spec_shares</a>(pool, shareholder_2) == <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_spec_shares">spec_shares</a>(<b>old</b>(pool), shareholder_2) + shares_to_transfer);
+<b>ensures</b> ((shareholder_1 != shareholder_2) && (<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_spec_shares">spec_shares</a>(<b>old</b>(pool), shareholder_1) &gt; shares_to_transfer)) ==&gt;
+    (<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_spec_contains">spec_contains</a>(pool, shareholder_1) && (<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_spec_shares">spec_shares</a>(pool, shareholder_1) == <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_spec_shares">spec_shares</a>(<b>old</b>(pool), shareholder_1) - shares_to_transfer));
+</code></pre>
+
+
+
+<a id="@Specification_1_deduct_shares"></a>
+
+### Function `deduct_shares`
+
+
+<pre><code><b>fun</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_deduct_shares">deduct_shares</a>(pool: &<b>mut</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">pool_u64_unbound::Pool</a>, shareholder: <b>address</b>, num_shares: u128): u128
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_spec_contains">spec_contains</a>(pool, shareholder);
+<b>aborts_if</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_spec_shares">spec_shares</a>(pool, shareholder) &lt; num_shares;
+<b>include</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_DeductSharesEnsures">DeductSharesEnsures</a>;
+<b>let</b> remaining_shares = <a href="table.md#0x1_table_spec_get">table::spec_get</a>(pool.shares, shareholder) - num_shares;
+<b>ensures</b> remaining_shares &gt; 0 ==&gt; result == <a href="table.md#0x1_table_spec_get">table::spec_get</a>(pool.shares, shareholder);
+<b>ensures</b> remaining_shares == 0 ==&gt; result == 0;
+</code></pre>
+
+
+
+
+<a id="0x1_pool_u64_unbound_DeductSharesEnsures"></a>
+
+
+<pre><code><b>schema</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_DeductSharesEnsures">DeductSharesEnsures</a> {
+    pool: <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">Pool</a>;
+    shareholder: <b>address</b>;
+    num_shares: u64;
+    <b>let</b> remaining_shares = <a href="table.md#0x1_table_spec_get">table::spec_get</a>(pool.shares, shareholder) - num_shares;
+    <b>ensures</b> remaining_shares &gt; 0 ==&gt; <a href="table.md#0x1_table_spec_get">table::spec_get</a>(pool.shares, shareholder) == remaining_shares;
+    <b>ensures</b> remaining_shares == 0 ==&gt; !<a href="table.md#0x1_table_spec_contains">table::spec_contains</a>(pool.shares, shareholder);
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_amount_to_shares_with_total_coins"></a>
+
+### Function `amount_to_shares_with_total_coins`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_amount_to_shares_with_total_coins">amount_to_shares_with_total_coins</a>(pool: &<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">pool_u64_unbound::Pool</a>, coins_amount: u64, total_coins: u64): u128
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> pool.total_coins &gt; 0 && pool.total_shares &gt; 0
+    && (coins_amount * pool.total_shares) / total_coins &gt; <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_MAX_U128">MAX_U128</a>;
+<b>aborts_if</b> (pool.total_coins == 0 || pool.total_shares == 0)
+    && coins_amount * pool.scaling_factor &gt; <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_MAX_U128">MAX_U128</a>;
+<b>aborts_if</b> pool.total_coins &gt; 0 && pool.total_shares &gt; 0 && total_coins == 0;
+<b>ensures</b> result == <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_spec_amount_to_shares_with_total_coins">spec_amount_to_shares_with_total_coins</a>(pool, coins_amount, total_coins);
+</code></pre>
+
+
+
+<a id="@Specification_1_shares_to_amount_with_total_coins"></a>
+
+### Function `shares_to_amount_with_total_coins`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_shares_to_amount_with_total_coins">shares_to_amount_with_total_coins</a>(pool: &<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">pool_u64_unbound::Pool</a>, shares: u128, total_coins: u64): u64
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> pool.total_coins &gt; 0 && pool.total_shares &gt; 0
+    && (shares * total_coins) / pool.total_shares &gt; <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_MAX_U64">MAX_U64</a>;
+<b>ensures</b> result == <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_spec_shares_to_amount_with_total_coins">spec_shares_to_amount_with_total_coins</a>(pool, shares, total_coins);
+</code></pre>
+
+
+
+
+<a id="0x1_pool_u64_unbound_spec_shares_to_amount_with_total_coins"></a>
+
+
+<pre><code><b>fun</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_spec_shares_to_amount_with_total_coins">spec_shares_to_amount_with_total_coins</a>(pool: <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">Pool</a>, shares: u128, total_coins: u64): u64 {
+   <b>if</b> (pool.total_coins == 0 || pool.total_shares == 0) {
+       0
+   }
+   <b>else</b> {
+       (shares * total_coins) / pool.total_shares
+   }
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_multiply_then_divide"></a>
+
+### Function `multiply_then_divide`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_multiply_then_divide">multiply_then_divide</a>(_pool: &<a href="pool_u64_unbound.md#0x1_pool_u64_unbound_Pool">pool_u64_unbound::Pool</a>, x: u128, y: u128, z: u128): u128
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> z == 0;
+<b>aborts_if</b> (x * y) / z &gt; <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_MAX_U128">MAX_U128</a>;
+<b>ensures</b> result == (x * y) / z;
+</code></pre>
+
+
+
+<a id="@Specification_1_to_u128"></a>
+
+### Function `to_u128`
+
+
+<pre><code><b>fun</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_to_u128">to_u128</a>(num: u64): u128
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == num;
+</code></pre>
+
+
+
+<a id="@Specification_1_to_u256"></a>
+
+### Function `to_u256`
+
+
+<pre><code><b>fun</b> <a href="pool_u64_unbound.md#0x1_pool_u64_unbound_to_u256">to_u256</a>(num: u128): u256
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == num;
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/ristretto255.md b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/ristretto255.md
new file mode 100644
index 0000000000000..15b42e8e8f61e
--- /dev/null
+++ b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/ristretto255.md
@@ -0,0 +1,3463 @@
+
+<a id="0x1_ristretto255"></a>
+
+# Module `0x1::ristretto255`
+
+This module contains functions for Ristretto255 curve arithmetic, assuming addition as the group operation.
+
+The order of the Ristretto255 elliptic curve group is $\ell = 2^252 + 27742317777372353535851937790883648493$, same
+as the order of the prime-order subgroup of Curve25519.
+
+This module provides two structs for encoding Ristretto elliptic curves to the developer:
+
+- First, a 32-byte-sized CompressedRistretto struct, which is used to persist points in storage.
+
+- Second, a larger, in-memory, RistrettoPoint struct, which is decompressable from a CompressedRistretto struct. This
+larger struct can be used for fast arithmetic operations (additions, multiplications, etc.). The results can be saved
+back into storage by compressing RistrettoPoint structs back to CompressedRistretto structs.
+
+This module also provides a Scalar struct for persisting scalars in storage and doing fast arithmetic on them.
+
+One invariant maintained by this module is that all CompressedRistretto structs store a canonically-encoded point,
+which can always be decompressed into a valid point on the curve as a RistrettoPoint struct. Unfortunately, due to
+limitations in our underlying curve25519-dalek elliptic curve library, this decompression will unnecessarily verify
+the validity of the point and thus slightly decrease performance.
+
+Similarly, all Scalar structs store a canonically-encoded scalar, which can always be safely operated on using
+arithmetic operations.
+
+In the future, we might support additional features:
+
+* For scalars:
+- batch_invert()
+
+* For points:
+- double()
++ The challenge is that curve25519-dalek does NOT export double for Ristretto points (nor for Edwards)
+
+- double_and_compress_batch()
+
+- fixed-base, variable-time via optional_mixed_multiscalar_mul() in VartimePrecomputedMultiscalarMul
++ This would require a storage-friendly RistrettoBasepointTable and an in-memory variant of it too
++ Similar to the CompressedRistretto and RistrettoPoint structs in this module
++ The challenge is that curve25519-dalek's RistrettoBasepointTable is not serializable
+
+
+-  [Struct `Scalar`](#0x1_ristretto255_Scalar)
+-  [Struct `CompressedRistretto`](#0x1_ristretto255_CompressedRistretto)
+-  [Struct `RistrettoPoint`](#0x1_ristretto255_RistrettoPoint)
+-  [Constants](#@Constants_0)
+-  [Function `point_identity_compressed`](#0x1_ristretto255_point_identity_compressed)
+-  [Function `point_identity`](#0x1_ristretto255_point_identity)
+-  [Function `basepoint_compressed`](#0x1_ristretto255_basepoint_compressed)
+-  [Function `hash_to_point_base`](#0x1_ristretto255_hash_to_point_base)
+-  [Function `basepoint`](#0x1_ristretto255_basepoint)
+-  [Function `basepoint_mul`](#0x1_ristretto255_basepoint_mul)
+-  [Function `new_compressed_point_from_bytes`](#0x1_ristretto255_new_compressed_point_from_bytes)
+-  [Function `new_point_from_bytes`](#0x1_ristretto255_new_point_from_bytes)
+-  [Function `compressed_point_to_bytes`](#0x1_ristretto255_compressed_point_to_bytes)
+-  [Function `new_point_from_sha512`](#0x1_ristretto255_new_point_from_sha512)
+-  [Function `new_point_from_sha2_512`](#0x1_ristretto255_new_point_from_sha2_512)
+-  [Function `new_point_from_64_uniform_bytes`](#0x1_ristretto255_new_point_from_64_uniform_bytes)
+-  [Function `point_decompress`](#0x1_ristretto255_point_decompress)
+-  [Function `point_clone`](#0x1_ristretto255_point_clone)
+-  [Function `point_compress`](#0x1_ristretto255_point_compress)
+-  [Function `point_to_bytes`](#0x1_ristretto255_point_to_bytes)
+-  [Function `point_mul`](#0x1_ristretto255_point_mul)
+-  [Function `point_mul_assign`](#0x1_ristretto255_point_mul_assign)
+-  [Function `basepoint_double_mul`](#0x1_ristretto255_basepoint_double_mul)
+-  [Function `point_add`](#0x1_ristretto255_point_add)
+-  [Function `point_add_assign`](#0x1_ristretto255_point_add_assign)
+-  [Function `point_sub`](#0x1_ristretto255_point_sub)
+-  [Function `point_sub_assign`](#0x1_ristretto255_point_sub_assign)
+-  [Function `point_neg`](#0x1_ristretto255_point_neg)
+-  [Function `point_neg_assign`](#0x1_ristretto255_point_neg_assign)
+-  [Function `point_equals`](#0x1_ristretto255_point_equals)
+-  [Function `double_scalar_mul`](#0x1_ristretto255_double_scalar_mul)
+-  [Function `multi_scalar_mul`](#0x1_ristretto255_multi_scalar_mul)
+-  [Function `new_scalar_from_bytes`](#0x1_ristretto255_new_scalar_from_bytes)
+-  [Function `new_scalar_from_sha512`](#0x1_ristretto255_new_scalar_from_sha512)
+-  [Function `new_scalar_from_sha2_512`](#0x1_ristretto255_new_scalar_from_sha2_512)
+-  [Function `new_scalar_from_u8`](#0x1_ristretto255_new_scalar_from_u8)
+-  [Function `new_scalar_from_u32`](#0x1_ristretto255_new_scalar_from_u32)
+-  [Function `new_scalar_from_u64`](#0x1_ristretto255_new_scalar_from_u64)
+-  [Function `new_scalar_from_u128`](#0x1_ristretto255_new_scalar_from_u128)
+-  [Function `new_scalar_reduced_from_32_bytes`](#0x1_ristretto255_new_scalar_reduced_from_32_bytes)
+-  [Function `new_scalar_uniform_from_64_bytes`](#0x1_ristretto255_new_scalar_uniform_from_64_bytes)
+-  [Function `scalar_zero`](#0x1_ristretto255_scalar_zero)
+-  [Function `scalar_is_zero`](#0x1_ristretto255_scalar_is_zero)
+-  [Function `scalar_one`](#0x1_ristretto255_scalar_one)
+-  [Function `scalar_is_one`](#0x1_ristretto255_scalar_is_one)
+-  [Function `scalar_equals`](#0x1_ristretto255_scalar_equals)
+-  [Function `scalar_invert`](#0x1_ristretto255_scalar_invert)
+-  [Function `scalar_mul`](#0x1_ristretto255_scalar_mul)
+-  [Function `scalar_mul_assign`](#0x1_ristretto255_scalar_mul_assign)
+-  [Function `scalar_add`](#0x1_ristretto255_scalar_add)
+-  [Function `scalar_add_assign`](#0x1_ristretto255_scalar_add_assign)
+-  [Function `scalar_sub`](#0x1_ristretto255_scalar_sub)
+-  [Function `scalar_sub_assign`](#0x1_ristretto255_scalar_sub_assign)
+-  [Function `scalar_neg`](#0x1_ristretto255_scalar_neg)
+-  [Function `scalar_neg_assign`](#0x1_ristretto255_scalar_neg_assign)
+-  [Function `scalar_to_bytes`](#0x1_ristretto255_scalar_to_bytes)
+-  [Function `new_point_from_sha512_internal`](#0x1_ristretto255_new_point_from_sha512_internal)
+-  [Function `new_point_from_64_uniform_bytes_internal`](#0x1_ristretto255_new_point_from_64_uniform_bytes_internal)
+-  [Function `point_is_canonical_internal`](#0x1_ristretto255_point_is_canonical_internal)
+-  [Function `point_identity_internal`](#0x1_ristretto255_point_identity_internal)
+-  [Function `point_decompress_internal`](#0x1_ristretto255_point_decompress_internal)
+-  [Function `point_clone_internal`](#0x1_ristretto255_point_clone_internal)
+-  [Function `point_compress_internal`](#0x1_ristretto255_point_compress_internal)
+-  [Function `point_mul_internal`](#0x1_ristretto255_point_mul_internal)
+-  [Function `basepoint_mul_internal`](#0x1_ristretto255_basepoint_mul_internal)
+-  [Function `basepoint_double_mul_internal`](#0x1_ristretto255_basepoint_double_mul_internal)
+-  [Function `point_add_internal`](#0x1_ristretto255_point_add_internal)
+-  [Function `point_sub_internal`](#0x1_ristretto255_point_sub_internal)
+-  [Function `point_neg_internal`](#0x1_ristretto255_point_neg_internal)
+-  [Function `double_scalar_mul_internal`](#0x1_ristretto255_double_scalar_mul_internal)
+-  [Function `multi_scalar_mul_internal`](#0x1_ristretto255_multi_scalar_mul_internal)
+-  [Function `scalar_is_canonical_internal`](#0x1_ristretto255_scalar_is_canonical_internal)
+-  [Function `scalar_from_u64_internal`](#0x1_ristretto255_scalar_from_u64_internal)
+-  [Function `scalar_from_u128_internal`](#0x1_ristretto255_scalar_from_u128_internal)
+-  [Function `scalar_reduced_from_32_bytes_internal`](#0x1_ristretto255_scalar_reduced_from_32_bytes_internal)
+-  [Function `scalar_uniform_from_64_bytes_internal`](#0x1_ristretto255_scalar_uniform_from_64_bytes_internal)
+-  [Function `scalar_invert_internal`](#0x1_ristretto255_scalar_invert_internal)
+-  [Function `scalar_from_sha512_internal`](#0x1_ristretto255_scalar_from_sha512_internal)
+-  [Function `scalar_mul_internal`](#0x1_ristretto255_scalar_mul_internal)
+-  [Function `scalar_add_internal`](#0x1_ristretto255_scalar_add_internal)
+-  [Function `scalar_sub_internal`](#0x1_ristretto255_scalar_sub_internal)
+-  [Function `scalar_neg_internal`](#0x1_ristretto255_scalar_neg_internal)
+-  [Specification](#@Specification_1)
+    -  [Helper functions](#@Helper_functions_2)
+    -  [Function `point_equals`](#@Specification_1_point_equals)
+    -  [Function `double_scalar_mul`](#@Specification_1_double_scalar_mul)
+    -  [Function `multi_scalar_mul`](#@Specification_1_multi_scalar_mul)
+    -  [Function `new_scalar_from_bytes`](#@Specification_1_new_scalar_from_bytes)
+    -  [Function `new_scalar_from_sha2_512`](#@Specification_1_new_scalar_from_sha2_512)
+    -  [Function `new_scalar_from_u8`](#@Specification_1_new_scalar_from_u8)
+    -  [Function `new_scalar_from_u32`](#@Specification_1_new_scalar_from_u32)
+    -  [Function `new_scalar_from_u64`](#@Specification_1_new_scalar_from_u64)
+    -  [Function `new_scalar_from_u128`](#@Specification_1_new_scalar_from_u128)
+    -  [Function `new_scalar_reduced_from_32_bytes`](#@Specification_1_new_scalar_reduced_from_32_bytes)
+    -  [Function `new_scalar_uniform_from_64_bytes`](#@Specification_1_new_scalar_uniform_from_64_bytes)
+    -  [Function `scalar_zero`](#@Specification_1_scalar_zero)
+    -  [Function `scalar_is_zero`](#@Specification_1_scalar_is_zero)
+    -  [Function `scalar_one`](#@Specification_1_scalar_one)
+    -  [Function `scalar_is_one`](#@Specification_1_scalar_is_one)
+    -  [Function `scalar_equals`](#@Specification_1_scalar_equals)
+    -  [Function `scalar_invert`](#@Specification_1_scalar_invert)
+    -  [Function `scalar_mul`](#@Specification_1_scalar_mul)
+    -  [Function `scalar_mul_assign`](#@Specification_1_scalar_mul_assign)
+    -  [Function `scalar_add`](#@Specification_1_scalar_add)
+    -  [Function `scalar_add_assign`](#@Specification_1_scalar_add_assign)
+    -  [Function `scalar_sub`](#@Specification_1_scalar_sub)
+    -  [Function `scalar_sub_assign`](#@Specification_1_scalar_sub_assign)
+    -  [Function `scalar_neg`](#@Specification_1_scalar_neg)
+    -  [Function `scalar_neg_assign`](#@Specification_1_scalar_neg_assign)
+    -  [Function `scalar_to_bytes`](#@Specification_1_scalar_to_bytes)
+    -  [Function `new_point_from_sha512_internal`](#@Specification_1_new_point_from_sha512_internal)
+    -  [Function `new_point_from_64_uniform_bytes_internal`](#@Specification_1_new_point_from_64_uniform_bytes_internal)
+    -  [Function `point_is_canonical_internal`](#@Specification_1_point_is_canonical_internal)
+    -  [Function `point_identity_internal`](#@Specification_1_point_identity_internal)
+    -  [Function `point_decompress_internal`](#@Specification_1_point_decompress_internal)
+    -  [Function `point_clone_internal`](#@Specification_1_point_clone_internal)
+    -  [Function `point_compress_internal`](#@Specification_1_point_compress_internal)
+    -  [Function `point_mul_internal`](#@Specification_1_point_mul_internal)
+    -  [Function `basepoint_mul_internal`](#@Specification_1_basepoint_mul_internal)
+    -  [Function `basepoint_double_mul_internal`](#@Specification_1_basepoint_double_mul_internal)
+    -  [Function `point_add_internal`](#@Specification_1_point_add_internal)
+    -  [Function `point_sub_internal`](#@Specification_1_point_sub_internal)
+    -  [Function `point_neg_internal`](#@Specification_1_point_neg_internal)
+    -  [Function `double_scalar_mul_internal`](#@Specification_1_double_scalar_mul_internal)
+    -  [Function `multi_scalar_mul_internal`](#@Specification_1_multi_scalar_mul_internal)
+    -  [Function `scalar_is_canonical_internal`](#@Specification_1_scalar_is_canonical_internal)
+    -  [Function `scalar_from_u64_internal`](#@Specification_1_scalar_from_u64_internal)
+    -  [Function `scalar_from_u128_internal`](#@Specification_1_scalar_from_u128_internal)
+    -  [Function `scalar_reduced_from_32_bytes_internal`](#@Specification_1_scalar_reduced_from_32_bytes_internal)
+    -  [Function `scalar_uniform_from_64_bytes_internal`](#@Specification_1_scalar_uniform_from_64_bytes_internal)
+    -  [Function `scalar_invert_internal`](#@Specification_1_scalar_invert_internal)
+    -  [Function `scalar_from_sha512_internal`](#@Specification_1_scalar_from_sha512_internal)
+    -  [Function `scalar_mul_internal`](#@Specification_1_scalar_mul_internal)
+    -  [Function `scalar_add_internal`](#@Specification_1_scalar_add_internal)
+    -  [Function `scalar_sub_internal`](#@Specification_1_scalar_sub_internal)
+    -  [Function `scalar_neg_internal`](#@Specification_1_scalar_neg_internal)
+
+
+<pre><code><b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features">0x1::features</a>;
+<b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option">0x1::option</a>;
+<b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">0x1::vector</a>;
+</code></pre>
+
+
+
+<a id="0x1_ristretto255_Scalar"></a>
+
+## Struct `Scalar`
+
+This struct represents a scalar as a little-endian byte encoding of an integer in $\mathbb{Z}_\ell$, which is
+stored in <code>data</code>. Here, \ell denotes the order of the scalar field (and the underlying elliptic curve group).
+
+
+<pre><code><b>struct</b> <a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>data: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_ristretto255_CompressedRistretto"></a>
+
+## Struct `CompressedRistretto`
+
+This struct represents a serialized point on the Ristretto255 curve, in 32 bytes.
+This struct can be decompressed from storage into an in-memory RistrettoPoint, on which fast curve arithmetic
+can be performed.
+
+
+<pre><code><b>struct</b> <a href="ristretto255.md#0x1_ristretto255_CompressedRistretto">CompressedRistretto</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>data: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_ristretto255_RistrettoPoint"></a>
+
+## Struct `RistrettoPoint`
+
+This struct represents an in-memory Ristretto255 point and supports fast curve arithmetic.
+
+An important invariant: There will never be two RistrettoPoint's constructed with the same handle. One can have
+immutable references to the same RistrettoPoint, of course.
+
+
+<pre><code><b>struct</b> <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a> <b>has</b> drop
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>handle: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_ristretto255_E_NATIVE_FUN_NOT_AVAILABLE"></a>
+
+The native function has not been deployed yet.
+
+
+<pre><code><b>const</b> <a href="ristretto255.md#0x1_ristretto255_E_NATIVE_FUN_NOT_AVAILABLE">E_NATIVE_FUN_NOT_AVAILABLE</a>: u64 = 5;
+</code></pre>
+
+
+
+<a id="0x1_ristretto255_BASE_POINT"></a>
+
+The basepoint (generator) of the Ristretto255 group
+
+
+<pre><code><b>const</b> <a href="ristretto255.md#0x1_ristretto255_BASE_POINT">BASE_POINT</a>: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; = [226, 242, 174, 10, 106, 188, 78, 113, 168, 132, 169, 97, 197, 0, 81, 95, 88, 227, 11, 106, 165, 130, 221, 141, 182, 166, 89, 69, 224, 141, 45, 118];
+</code></pre>
+
+
+
+<a id="0x1_ristretto255_E_DIFFERENT_NUM_POINTS_AND_SCALARS"></a>
+
+The number of scalars does not match the number of points.
+
+
+<pre><code><b>const</b> <a href="ristretto255.md#0x1_ristretto255_E_DIFFERENT_NUM_POINTS_AND_SCALARS">E_DIFFERENT_NUM_POINTS_AND_SCALARS</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_ristretto255_E_TOO_MANY_POINTS_CREATED"></a>
+
+Too many points have been created in the current transaction execution.
+
+
+<pre><code><b>const</b> <a href="ristretto255.md#0x1_ristretto255_E_TOO_MANY_POINTS_CREATED">E_TOO_MANY_POINTS_CREATED</a>: u64 = 4;
+</code></pre>
+
+
+
+<a id="0x1_ristretto255_E_ZERO_POINTS"></a>
+
+Expected more than zero points as input.
+
+
+<pre><code><b>const</b> <a href="ristretto255.md#0x1_ristretto255_E_ZERO_POINTS">E_ZERO_POINTS</a>: u64 = 2;
+</code></pre>
+
+
+
+<a id="0x1_ristretto255_E_ZERO_SCALARS"></a>
+
+Expected more than zero scalars as input.
+
+
+<pre><code><b>const</b> <a href="ristretto255.md#0x1_ristretto255_E_ZERO_SCALARS">E_ZERO_SCALARS</a>: u64 = 3;
+</code></pre>
+
+
+
+<a id="0x1_ristretto255_HASH_BASE_POINT"></a>
+
+The hash of the basepoint of the Ristretto255 group using SHA3_512
+
+
+<pre><code><b>const</b> <a href="ristretto255.md#0x1_ristretto255_HASH_BASE_POINT">HASH_BASE_POINT</a>: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; = [140, 146, 64, 180, 86, 169, 230, 220, 101, 195, 119, 161, 4, 141, 116, 95, 148, 160, 140, 219, 127, 68, 203, 205, 123, 70, 243, 64, 72, 135, 17, 52];
+</code></pre>
+
+
+
+<a id="0x1_ristretto255_L_MINUS_ONE"></a>
+
+<code><a href="ristretto255.md#0x1_ristretto255_ORDER_ELL">ORDER_ELL</a></code> - 1: i.e., the "largest", reduced scalar in the field
+
+
+<pre><code><b>const</b> <a href="ristretto255.md#0x1_ristretto255_L_MINUS_ONE">L_MINUS_ONE</a>: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; = [236, 211, 245, 92, 26, 99, 18, 88, 214, 156, 247, 162, 222, 249, 222, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16];
+</code></pre>
+
+
+
+<a id="0x1_ristretto255_MAX_POINT_NUM_BYTES"></a>
+
+The maximum size in bytes of a canonically-encoded Ristretto255 point is 32 bytes.
+
+
+<pre><code><b>const</b> <a href="ristretto255.md#0x1_ristretto255_MAX_POINT_NUM_BYTES">MAX_POINT_NUM_BYTES</a>: u64 = 32;
+</code></pre>
+
+
+
+<a id="0x1_ristretto255_MAX_SCALAR_NUM_BITS"></a>
+
+The maximum size in bits of a canonically-encoded Scalar is 256 bits.
+
+
+<pre><code><b>const</b> <a href="ristretto255.md#0x1_ristretto255_MAX_SCALAR_NUM_BITS">MAX_SCALAR_NUM_BITS</a>: u64 = 256;
+</code></pre>
+
+
+
+<a id="0x1_ristretto255_MAX_SCALAR_NUM_BYTES"></a>
+
+The maximum size in bytes of a canonically-encoded Scalar is 32 bytes.
+
+
+<pre><code><b>const</b> <a href="ristretto255.md#0x1_ristretto255_MAX_SCALAR_NUM_BYTES">MAX_SCALAR_NUM_BYTES</a>: u64 = 32;
+</code></pre>
+
+
+
+<a id="0x1_ristretto255_ORDER_ELL"></a>
+
+The order of the Ristretto255 group and its scalar field, in little-endian.
+
+
+<pre><code><b>const</b> <a href="ristretto255.md#0x1_ristretto255_ORDER_ELL">ORDER_ELL</a>: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; = [237, 211, 245, 92, 26, 99, 18, 88, 214, 156, 247, 162, 222, 249, 222, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16];
+</code></pre>
+
+
+
+<a id="0x1_ristretto255_point_identity_compressed"></a>
+
+## Function `point_identity_compressed`
+
+Returns the identity point as a CompressedRistretto.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_point_identity_compressed">point_identity_compressed</a>(): <a href="ristretto255.md#0x1_ristretto255_CompressedRistretto">ristretto255::CompressedRistretto</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_point_identity_compressed">point_identity_compressed</a>(): <a href="ristretto255.md#0x1_ristretto255_CompressedRistretto">CompressedRistretto</a> {
+    <a href="ristretto255.md#0x1_ristretto255_CompressedRistretto">CompressedRistretto</a> {
+        data: x"0000000000000000000000000000000000000000000000000000000000000000"
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_point_identity"></a>
+
+## Function `point_identity`
+
+Returns the identity point as a CompressedRistretto.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_point_identity">point_identity</a>(): <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_point_identity">point_identity</a>(): <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a> {
+    <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a> {
+        handle: <a href="ristretto255.md#0x1_ristretto255_point_identity_internal">point_identity_internal</a>()
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_basepoint_compressed"></a>
+
+## Function `basepoint_compressed`
+
+Returns the basepoint (generator) of the Ristretto255 group as a compressed point
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_basepoint_compressed">basepoint_compressed</a>(): <a href="ristretto255.md#0x1_ristretto255_CompressedRistretto">ristretto255::CompressedRistretto</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_basepoint_compressed">basepoint_compressed</a>(): <a href="ristretto255.md#0x1_ristretto255_CompressedRistretto">CompressedRistretto</a> {
+    <a href="ristretto255.md#0x1_ristretto255_CompressedRistretto">CompressedRistretto</a> {
+        data: <a href="ristretto255.md#0x1_ristretto255_BASE_POINT">BASE_POINT</a>
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_hash_to_point_base"></a>
+
+## Function `hash_to_point_base`
+
+Returns the hash-to-point result of serializing the basepoint of the Ristretto255 group.
+For use as the random value basepoint in Pedersen commitments
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_hash_to_point_base">hash_to_point_base</a>(): <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_hash_to_point_base">hash_to_point_base</a>(): <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a> {
+    <b>let</b> comp_res = <a href="ristretto255.md#0x1_ristretto255_CompressedRistretto">CompressedRistretto</a> { data: <a href="ristretto255.md#0x1_ristretto255_HASH_BASE_POINT">HASH_BASE_POINT</a> };
+    <a href="ristretto255.md#0x1_ristretto255_point_decompress">point_decompress</a>(&comp_res)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_basepoint"></a>
+
+## Function `basepoint`
+
+Returns the basepoint (generator) of the Ristretto255 group
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_basepoint">basepoint</a>(): <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_basepoint">basepoint</a>(): <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a> {
+    <b>let</b> (handle, _) = <a href="ristretto255.md#0x1_ristretto255_point_decompress_internal">point_decompress_internal</a>(<a href="ristretto255.md#0x1_ristretto255_BASE_POINT">BASE_POINT</a>);
+
+    <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a> {
+        handle
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_basepoint_mul"></a>
+
+## Function `basepoint_mul`
+
+Multiplies the basepoint (generator) of the Ristretto255 group by a scalar and returns the result.
+This call is much faster than <code><a href="ristretto255.md#0x1_ristretto255_point_mul">point_mul</a>(&<a href="ristretto255.md#0x1_ristretto255_basepoint">basepoint</a>(), &some_scalar)</code> because of precomputation tables.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_basepoint_mul">basepoint_mul</a>(a: &<a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>): <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_basepoint_mul">basepoint_mul</a>(a: &<a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a>): <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a> {
+    <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a> {
+        handle: <a href="ristretto255.md#0x1_ristretto255_basepoint_mul_internal">basepoint_mul_internal</a>(a.data)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_new_compressed_point_from_bytes"></a>
+
+## Function `new_compressed_point_from_bytes`
+
+Creates a new CompressedRistretto point from a sequence of 32 bytes. If those bytes do not represent a valid
+point, returns None.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_new_compressed_point_from_bytes">new_compressed_point_from_bytes</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="ristretto255.md#0x1_ristretto255_CompressedRistretto">ristretto255::CompressedRistretto</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_new_compressed_point_from_bytes">new_compressed_point_from_bytes</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): Option&lt;<a href="ristretto255.md#0x1_ristretto255_CompressedRistretto">CompressedRistretto</a>&gt; {
+    <b>if</b> (<a href="ristretto255.md#0x1_ristretto255_point_is_canonical_internal">point_is_canonical_internal</a>(bytes)) {
+        std::option::some(<a href="ristretto255.md#0x1_ristretto255_CompressedRistretto">CompressedRistretto</a> {
+            data: bytes
+        })
+    } <b>else</b> {
+        std::option::none&lt;<a href="ristretto255.md#0x1_ristretto255_CompressedRistretto">CompressedRistretto</a>&gt;()
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_new_point_from_bytes"></a>
+
+## Function `new_point_from_bytes`
+
+Creates a new RistrettoPoint from a sequence of 32 bytes. If those bytes do not represent a valid point,
+returns None.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_new_point_from_bytes">new_point_from_bytes</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_new_point_from_bytes">new_point_from_bytes</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): Option&lt;<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a>&gt; {
+    <b>let</b> (handle, is_canonical) = <a href="ristretto255.md#0x1_ristretto255_point_decompress_internal">point_decompress_internal</a>(bytes);
+    <b>if</b> (is_canonical) {
+        std::option::some(<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a> { handle })
+    } <b>else</b> {
+        std::option::none&lt;<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a>&gt;()
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_compressed_point_to_bytes"></a>
+
+## Function `compressed_point_to_bytes`
+
+Given a compressed ristretto point <code>point</code>, returns the byte representation of that point
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_compressed_point_to_bytes">compressed_point_to_bytes</a>(point: <a href="ristretto255.md#0x1_ristretto255_CompressedRistretto">ristretto255::CompressedRistretto</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_compressed_point_to_bytes">compressed_point_to_bytes</a>(point: <a href="ristretto255.md#0x1_ristretto255_CompressedRistretto">CompressedRistretto</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; {
+    point.data
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_new_point_from_sha512"></a>
+
+## Function `new_point_from_sha512`
+
+DEPRECATED: Use the more clearly-named <code>new_point_from_sha2_512</code>
+
+Hashes the input to a uniformly-at-random RistrettoPoint via SHA512.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_new_point_from_sha512">new_point_from_sha512</a>(sha2_512_input: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_new_point_from_sha512">new_point_from_sha512</a>(sha2_512_input: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a> {
+    <a href="ristretto255.md#0x1_ristretto255_new_point_from_sha2_512">new_point_from_sha2_512</a>(sha2_512_input)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_new_point_from_sha2_512"></a>
+
+## Function `new_point_from_sha2_512`
+
+Hashes the input to a uniformly-at-random RistrettoPoint via SHA2-512.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_new_point_from_sha2_512">new_point_from_sha2_512</a>(sha2_512_input: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_new_point_from_sha2_512">new_point_from_sha2_512</a>(sha2_512_input: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a> {
+    <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a> {
+        handle: <a href="ristretto255.md#0x1_ristretto255_new_point_from_sha512_internal">new_point_from_sha512_internal</a>(sha2_512_input)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_new_point_from_64_uniform_bytes"></a>
+
+## Function `new_point_from_64_uniform_bytes`
+
+Samples a uniformly-at-random RistrettoPoint given a sequence of 64 uniformly-at-random bytes. This function
+can be used to build a collision-resistant hash function that maps 64-byte messages to RistrettoPoint's.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_new_point_from_64_uniform_bytes">new_point_from_64_uniform_bytes</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_new_point_from_64_uniform_bytes">new_point_from_64_uniform_bytes</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): Option&lt;<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a>&gt; {
+    <b>if</b> (std::vector::length(&bytes) == 64) {
+        std::option::some(<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a> {
+            handle: <a href="ristretto255.md#0x1_ristretto255_new_point_from_64_uniform_bytes_internal">new_point_from_64_uniform_bytes_internal</a>(bytes)
+        })
+    } <b>else</b> {
+        std::option::none&lt;<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a>&gt;()
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_point_decompress"></a>
+
+## Function `point_decompress`
+
+Decompresses a CompressedRistretto from storage into a RistrettoPoint which can be used for fast arithmetic.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_point_decompress">point_decompress</a>(point: &<a href="ristretto255.md#0x1_ristretto255_CompressedRistretto">ristretto255::CompressedRistretto</a>): <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_point_decompress">point_decompress</a>(point: &<a href="ristretto255.md#0x1_ristretto255_CompressedRistretto">CompressedRistretto</a>): <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a> {
+    // NOTE: Our <a href="ristretto255.md#0x1_ristretto255_CompressedRistretto">CompressedRistretto</a> <b>invariant</b> assures us that every <a href="ristretto255.md#0x1_ristretto255_CompressedRistretto">CompressedRistretto</a> in storage is a valid
+    // <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a>
+    <b>let</b> (handle, _) = <a href="ristretto255.md#0x1_ristretto255_point_decompress_internal">point_decompress_internal</a>(point.data);
+    <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a> { handle }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_point_clone"></a>
+
+## Function `point_clone`
+
+Clones a RistrettoPoint.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_point_clone">point_clone</a>(point: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>): <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_point_clone">point_clone</a>(point: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a>): <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a> {
+    <b>if</b>(!<a href="../../../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_bulletproofs_enabled">features::bulletproofs_enabled</a>()) {
+        <b>abort</b>(std::error::invalid_state(<a href="ristretto255.md#0x1_ristretto255_E_NATIVE_FUN_NOT_AVAILABLE">E_NATIVE_FUN_NOT_AVAILABLE</a>))
+    };
+
+    <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a> {
+        handle: <a href="ristretto255.md#0x1_ristretto255_point_clone_internal">point_clone_internal</a>(point.handle)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_point_compress"></a>
+
+## Function `point_compress`
+
+Compresses a RistrettoPoint to a CompressedRistretto which can be put in storage.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_point_compress">point_compress</a>(point: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>): <a href="ristretto255.md#0x1_ristretto255_CompressedRistretto">ristretto255::CompressedRistretto</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_point_compress">point_compress</a>(point: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a>): <a href="ristretto255.md#0x1_ristretto255_CompressedRistretto">CompressedRistretto</a> {
+    <a href="ristretto255.md#0x1_ristretto255_CompressedRistretto">CompressedRistretto</a> {
+        data: <a href="ristretto255.md#0x1_ristretto255_point_compress_internal">point_compress_internal</a>(point)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_point_to_bytes"></a>
+
+## Function `point_to_bytes`
+
+Returns the sequence of bytes representin this Ristretto point.
+To convert a RistrettoPoint 'p' to bytes, first compress it via <code>c = <a href="ristretto255.md#0x1_ristretto255_point_compress">point_compress</a>(&p)</code>, and then call this
+function on <code>c</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_point_to_bytes">point_to_bytes</a>(point: &<a href="ristretto255.md#0x1_ristretto255_CompressedRistretto">ristretto255::CompressedRistretto</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_point_to_bytes">point_to_bytes</a>(point: &<a href="ristretto255.md#0x1_ristretto255_CompressedRistretto">CompressedRistretto</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; {
+    point.data
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_point_mul"></a>
+
+## Function `point_mul`
+
+Returns a * point.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_point_mul">point_mul</a>(point: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>, a: &<a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>): <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_point_mul">point_mul</a>(point: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a>, a: &<a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a>): <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a> {
+    <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a> {
+        handle: <a href="ristretto255.md#0x1_ristretto255_point_mul_internal">point_mul_internal</a>(point, a.data, <b>false</b>)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_point_mul_assign"></a>
+
+## Function `point_mul_assign`
+
+Sets a *= point and returns 'a'.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_point_mul_assign">point_mul_assign</a>(point: &<b>mut</b> <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>, a: &<a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>): &<b>mut</b> <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_point_mul_assign">point_mul_assign</a>(point: &<b>mut</b> <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a>, a: &<a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a>): &<b>mut</b> <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a> {
+    <a href="ristretto255.md#0x1_ristretto255_point_mul_internal">point_mul_internal</a>(point, a.data, <b>true</b>);
+    point
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_basepoint_double_mul"></a>
+
+## Function `basepoint_double_mul`
+
+Returns (a * a_base + b * base_point), where base_point is the Ristretto basepoint encoded in <code><a href="ristretto255.md#0x1_ristretto255_BASE_POINT">BASE_POINT</a></code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_basepoint_double_mul">basepoint_double_mul</a>(a: &<a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>, a_base: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>, b: &<a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>): <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_basepoint_double_mul">basepoint_double_mul</a>(a: &<a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a>, a_base: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a>, b: &<a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a>): <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a> {
+    <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a> {
+        handle: <a href="ristretto255.md#0x1_ristretto255_basepoint_double_mul_internal">basepoint_double_mul_internal</a>(a.data, a_base, b.data)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_point_add"></a>
+
+## Function `point_add`
+
+Returns a + b
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_point_add">point_add</a>(a: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>, b: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>): <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_point_add">point_add</a>(a: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a>, b: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a>): <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a> {
+    <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a> {
+        handle: <a href="ristretto255.md#0x1_ristretto255_point_add_internal">point_add_internal</a>(a, b, <b>false</b>)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_point_add_assign"></a>
+
+## Function `point_add_assign`
+
+Sets a += b and returns 'a'.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_point_add_assign">point_add_assign</a>(a: &<b>mut</b> <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>, b: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>): &<b>mut</b> <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_point_add_assign">point_add_assign</a>(a: &<b>mut</b> <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a>, b: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a>): &<b>mut</b> <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a> {
+    <a href="ristretto255.md#0x1_ristretto255_point_add_internal">point_add_internal</a>(a, b, <b>true</b>);
+    a
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_point_sub"></a>
+
+## Function `point_sub`
+
+Returns a - b
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_point_sub">point_sub</a>(a: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>, b: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>): <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_point_sub">point_sub</a>(a: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a>, b: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a>): <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a> {
+    <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a> {
+        handle: <a href="ristretto255.md#0x1_ristretto255_point_sub_internal">point_sub_internal</a>(a, b, <b>false</b>)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_point_sub_assign"></a>
+
+## Function `point_sub_assign`
+
+Sets a -= b and returns 'a'.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_point_sub_assign">point_sub_assign</a>(a: &<b>mut</b> <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>, b: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>): &<b>mut</b> <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_point_sub_assign">point_sub_assign</a>(a: &<b>mut</b> <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a>, b: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a>): &<b>mut</b> <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a> {
+    <a href="ristretto255.md#0x1_ristretto255_point_sub_internal">point_sub_internal</a>(a, b, <b>true</b>);
+    a
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_point_neg"></a>
+
+## Function `point_neg`
+
+Returns -a
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_point_neg">point_neg</a>(a: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>): <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_point_neg">point_neg</a>(a: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a>): <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a> {
+    <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a> {
+        handle: <a href="ristretto255.md#0x1_ristretto255_point_neg_internal">point_neg_internal</a>(a, <b>false</b>)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_point_neg_assign"></a>
+
+## Function `point_neg_assign`
+
+Sets a = -a, and returns 'a'.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_point_neg_assign">point_neg_assign</a>(a: &<b>mut</b> <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>): &<b>mut</b> <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_point_neg_assign">point_neg_assign</a>(a: &<b>mut</b> <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a>): &<b>mut</b> <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a> {
+    <a href="ristretto255.md#0x1_ristretto255_point_neg_internal">point_neg_internal</a>(a, <b>true</b>);
+    a
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_point_equals"></a>
+
+## Function `point_equals`
+
+Returns true if the two RistrettoPoints are the same points on the elliptic curve.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_point_equals">point_equals</a>(g: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>, h: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_point_equals">point_equals</a>(g: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a>, h: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a>): bool;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_double_scalar_mul"></a>
+
+## Function `double_scalar_mul`
+
+Computes a double-scalar multiplication, returning a_1 p_1 + a_2 p_2
+This function is much faster than computing each a_i p_i using <code>point_mul</code> and adding up the results using <code>point_add</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_double_scalar_mul">double_scalar_mul</a>(scalar1: &<a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>, point1: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>, scalar2: &<a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>, point2: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>): <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_double_scalar_mul">double_scalar_mul</a>(scalar1: &<a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a>, point1: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a>, scalar2: &<a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a>, point2: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a>): <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a> {
+    <b>if</b>(!<a href="../../../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_bulletproofs_enabled">features::bulletproofs_enabled</a>()) {
+        <b>abort</b>(std::error::invalid_state(<a href="ristretto255.md#0x1_ristretto255_E_NATIVE_FUN_NOT_AVAILABLE">E_NATIVE_FUN_NOT_AVAILABLE</a>))
+    };
+
+    <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a> {
+        handle: <a href="ristretto255.md#0x1_ristretto255_double_scalar_mul_internal">double_scalar_mul_internal</a>(point1.handle, point2.handle, scalar1.data, scalar2.data)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_multi_scalar_mul"></a>
+
+## Function `multi_scalar_mul`
+
+Computes a multi-scalar multiplication, returning a_1 p_1 + a_2 p_2 + ... + a_n p_n.
+This function is much faster than computing each a_i p_i using <code>point_mul</code> and adding up the results using <code>point_add</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_multi_scalar_mul">multi_scalar_mul</a>(points: &<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>&gt;, scalars: &<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>&gt;): <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_multi_scalar_mul">multi_scalar_mul</a>(points: &<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a>&gt;, scalars: &<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a>&gt;): <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a> {
+    <b>assert</b>!(!std::vector::is_empty(points), std::error::invalid_argument(<a href="ristretto255.md#0x1_ristretto255_E_ZERO_POINTS">E_ZERO_POINTS</a>));
+    <b>assert</b>!(!std::vector::is_empty(scalars), std::error::invalid_argument(<a href="ristretto255.md#0x1_ristretto255_E_ZERO_SCALARS">E_ZERO_SCALARS</a>));
+    <b>assert</b>!(std::vector::length(points) == std::vector::length(scalars), std::error::invalid_argument(<a href="ristretto255.md#0x1_ristretto255_E_DIFFERENT_NUM_POINTS_AND_SCALARS">E_DIFFERENT_NUM_POINTS_AND_SCALARS</a>));
+
+    <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a> {
+        handle: <a href="ristretto255.md#0x1_ristretto255_multi_scalar_mul_internal">multi_scalar_mul_internal</a>&lt;<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a>, <a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a>&gt;(points, scalars)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_new_scalar_from_bytes"></a>
+
+## Function `new_scalar_from_bytes`
+
+Given a sequence of 32 bytes, checks if they canonically-encode a Scalar and return it.
+Otherwise, returns None.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_new_scalar_from_bytes">new_scalar_from_bytes</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_new_scalar_from_bytes">new_scalar_from_bytes</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): Option&lt;<a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a>&gt; {
+    <b>if</b> (<a href="ristretto255.md#0x1_ristretto255_scalar_is_canonical_internal">scalar_is_canonical_internal</a>(bytes)) {
+        std::option::some(<a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a> {
+            data: bytes
+        })
+    } <b>else</b> {
+        std::option::none&lt;<a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a>&gt;()
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_new_scalar_from_sha512"></a>
+
+## Function `new_scalar_from_sha512`
+
+DEPRECATED: Use the more clearly-named <code>new_scalar_from_sha2_512</code>
+
+Hashes the input to a uniformly-at-random Scalar via SHA2-512
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_new_scalar_from_sha512">new_scalar_from_sha512</a>(sha2_512_input: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_new_scalar_from_sha512">new_scalar_from_sha512</a>(sha2_512_input: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a> {
+    <a href="ristretto255.md#0x1_ristretto255_new_scalar_from_sha2_512">new_scalar_from_sha2_512</a>(sha2_512_input)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_new_scalar_from_sha2_512"></a>
+
+## Function `new_scalar_from_sha2_512`
+
+Hashes the input to a uniformly-at-random Scalar via SHA2-512
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_new_scalar_from_sha2_512">new_scalar_from_sha2_512</a>(sha2_512_input: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_new_scalar_from_sha2_512">new_scalar_from_sha2_512</a>(sha2_512_input: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a> {
+    <a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a> {
+        data: <a href="ristretto255.md#0x1_ristretto255_scalar_from_sha512_internal">scalar_from_sha512_internal</a>(sha2_512_input)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_new_scalar_from_u8"></a>
+
+## Function `new_scalar_from_u8`
+
+Creates a Scalar from an u8.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_new_scalar_from_u8">new_scalar_from_u8</a>(byte: u8): <a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_new_scalar_from_u8">new_scalar_from_u8</a>(byte: u8): <a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a> {
+    <b>let</b> s = <a href="ristretto255.md#0x1_ristretto255_scalar_zero">scalar_zero</a>();
+    <b>let</b> byte_zero = std::vector::borrow_mut(&<b>mut</b> s.data, 0);
+    *byte_zero = byte;
+
+    s
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_new_scalar_from_u32"></a>
+
+## Function `new_scalar_from_u32`
+
+Creates a Scalar from an u32.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_new_scalar_from_u32">new_scalar_from_u32</a>(four_bytes: u32): <a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_new_scalar_from_u32">new_scalar_from_u32</a>(four_bytes: u32): <a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a> {
+    <a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a> {
+        data: <a href="ristretto255.md#0x1_ristretto255_scalar_from_u64_internal">scalar_from_u64_internal</a>((four_bytes <b>as</b> u64))
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_new_scalar_from_u64"></a>
+
+## Function `new_scalar_from_u64`
+
+Creates a Scalar from an u64.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_new_scalar_from_u64">new_scalar_from_u64</a>(eight_bytes: u64): <a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_new_scalar_from_u64">new_scalar_from_u64</a>(eight_bytes: u64): <a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a> {
+    <a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a> {
+        data: <a href="ristretto255.md#0x1_ristretto255_scalar_from_u64_internal">scalar_from_u64_internal</a>(eight_bytes)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_new_scalar_from_u128"></a>
+
+## Function `new_scalar_from_u128`
+
+Creates a Scalar from an u128.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_new_scalar_from_u128">new_scalar_from_u128</a>(sixteen_bytes: u128): <a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_new_scalar_from_u128">new_scalar_from_u128</a>(sixteen_bytes: u128): <a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a> {
+    <a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a> {
+        data: <a href="ristretto255.md#0x1_ristretto255_scalar_from_u128_internal">scalar_from_u128_internal</a>(sixteen_bytes)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_new_scalar_reduced_from_32_bytes"></a>
+
+## Function `new_scalar_reduced_from_32_bytes`
+
+Creates a Scalar from 32 bytes by reducing the little-endian-encoded number in those bytes modulo $\ell$.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_new_scalar_reduced_from_32_bytes">new_scalar_reduced_from_32_bytes</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_new_scalar_reduced_from_32_bytes">new_scalar_reduced_from_32_bytes</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): Option&lt;<a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a>&gt; {
+    <b>if</b> (std::vector::length(&bytes) == 32) {
+        std::option::some(<a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a> {
+            data: <a href="ristretto255.md#0x1_ristretto255_scalar_reduced_from_32_bytes_internal">scalar_reduced_from_32_bytes_internal</a>(bytes)
+        })
+    } <b>else</b> {
+        std::option::none()
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_new_scalar_uniform_from_64_bytes"></a>
+
+## Function `new_scalar_uniform_from_64_bytes`
+
+Samples a scalar uniformly-at-random given 64 uniform-at-random bytes as input by reducing the little-endian-encoded number
+in those bytes modulo $\ell$.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_new_scalar_uniform_from_64_bytes">new_scalar_uniform_from_64_bytes</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_new_scalar_uniform_from_64_bytes">new_scalar_uniform_from_64_bytes</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): Option&lt;<a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a>&gt; {
+    <b>if</b> (std::vector::length(&bytes) == 64) {
+        std::option::some(<a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a> {
+            data: <a href="ristretto255.md#0x1_ristretto255_scalar_uniform_from_64_bytes_internal">scalar_uniform_from_64_bytes_internal</a>(bytes)
+        })
+    } <b>else</b> {
+        std::option::none()
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_scalar_zero"></a>
+
+## Function `scalar_zero`
+
+Returns 0 as a Scalar.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_zero">scalar_zero</a>(): <a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_zero">scalar_zero</a>(): <a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a> {
+    <a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a> {
+        data: x"0000000000000000000000000000000000000000000000000000000000000000"
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_scalar_is_zero"></a>
+
+## Function `scalar_is_zero`
+
+Returns true if the given Scalar equals 0.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_is_zero">scalar_is_zero</a>(s: &<a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_is_zero">scalar_is_zero</a>(s: &<a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a>): bool {
+    s.data == x"0000000000000000000000000000000000000000000000000000000000000000"
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_scalar_one"></a>
+
+## Function `scalar_one`
+
+Returns 1 as a Scalar.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_one">scalar_one</a>(): <a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_one">scalar_one</a>(): <a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a> {
+    <a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a> {
+        data: x"0100000000000000000000000000000000000000000000000000000000000000"
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_scalar_is_one"></a>
+
+## Function `scalar_is_one`
+
+Returns true if the given Scalar equals 1.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_is_one">scalar_is_one</a>(s: &<a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_is_one">scalar_is_one</a>(s: &<a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a>): bool {
+    s.data == x"0100000000000000000000000000000000000000000000000000000000000000"
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_scalar_equals"></a>
+
+## Function `scalar_equals`
+
+Returns true if the two scalars are equal.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_equals">scalar_equals</a>(lhs: &<a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>, rhs: &<a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_equals">scalar_equals</a>(lhs: &<a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a>, rhs: &<a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a>): bool {
+    lhs.data == rhs.data
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_scalar_invert"></a>
+
+## Function `scalar_invert`
+
+Returns the inverse s^{-1} mod \ell of a scalar s.
+Returns None if s is zero.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_invert">scalar_invert</a>(s: &<a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_invert">scalar_invert</a>(s: &<a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a>): Option&lt;<a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a>&gt; {
+    <b>if</b> (<a href="ristretto255.md#0x1_ristretto255_scalar_is_zero">scalar_is_zero</a>(s)) {
+        std::option::none&lt;<a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a>&gt;()
+    } <b>else</b> {
+        std::option::some(<a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a> {
+            data: <a href="ristretto255.md#0x1_ristretto255_scalar_invert_internal">scalar_invert_internal</a>(s.data)
+        })
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_scalar_mul"></a>
+
+## Function `scalar_mul`
+
+Returns the product of the two scalars.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_mul">scalar_mul</a>(a: &<a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>, b: &<a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>): <a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_mul">scalar_mul</a>(a: &<a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a>, b: &<a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a>): <a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a> {
+    <a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a> {
+        data: <a href="ristretto255.md#0x1_ristretto255_scalar_mul_internal">scalar_mul_internal</a>(a.data, b.data)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_scalar_mul_assign"></a>
+
+## Function `scalar_mul_assign`
+
+Computes the product of 'a' and 'b' and assigns the result to 'a'.
+Returns 'a'.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_mul_assign">scalar_mul_assign</a>(a: &<b>mut</b> <a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>, b: &<a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>): &<b>mut</b> <a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_mul_assign">scalar_mul_assign</a>(a: &<b>mut</b> <a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a>, b: &<a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a>): &<b>mut</b> <a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a> {
+    a.data = <a href="ristretto255.md#0x1_ristretto255_scalar_mul">scalar_mul</a>(a, b).data;
+    a
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_scalar_add"></a>
+
+## Function `scalar_add`
+
+Returns the sum of the two scalars.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_add">scalar_add</a>(a: &<a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>, b: &<a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>): <a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_add">scalar_add</a>(a: &<a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a>, b: &<a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a>): <a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a> {
+    <a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a> {
+        data: <a href="ristretto255.md#0x1_ristretto255_scalar_add_internal">scalar_add_internal</a>(a.data, b.data)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_scalar_add_assign"></a>
+
+## Function `scalar_add_assign`
+
+Computes the sum of 'a' and 'b' and assigns the result to 'a'
+Returns 'a'.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_add_assign">scalar_add_assign</a>(a: &<b>mut</b> <a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>, b: &<a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>): &<b>mut</b> <a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_add_assign">scalar_add_assign</a>(a: &<b>mut</b> <a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a>, b: &<a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a>): &<b>mut</b> <a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a> {
+    a.data = <a href="ristretto255.md#0x1_ristretto255_scalar_add">scalar_add</a>(a, b).data;
+    a
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_scalar_sub"></a>
+
+## Function `scalar_sub`
+
+Returns the difference of the two scalars.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_sub">scalar_sub</a>(a: &<a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>, b: &<a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>): <a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_sub">scalar_sub</a>(a: &<a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a>, b: &<a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a>): <a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a> {
+    <a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a> {
+        data: <a href="ristretto255.md#0x1_ristretto255_scalar_sub_internal">scalar_sub_internal</a>(a.data, b.data)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_scalar_sub_assign"></a>
+
+## Function `scalar_sub_assign`
+
+Subtracts 'b' from 'a' and assigns the result to 'a'.
+Returns 'a'.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_sub_assign">scalar_sub_assign</a>(a: &<b>mut</b> <a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>, b: &<a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>): &<b>mut</b> <a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_sub_assign">scalar_sub_assign</a>(a: &<b>mut</b> <a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a>, b: &<a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a>): &<b>mut</b> <a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a> {
+    a.data = <a href="ristretto255.md#0x1_ristretto255_scalar_sub">scalar_sub</a>(a, b).data;
+    a
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_scalar_neg"></a>
+
+## Function `scalar_neg`
+
+Returns the negation of 'a': i.e., $(0 - a) \mod \ell$.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_neg">scalar_neg</a>(a: &<a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>): <a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_neg">scalar_neg</a>(a: &<a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a>): <a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a> {
+    <a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a> {
+        data: <a href="ristretto255.md#0x1_ristretto255_scalar_neg_internal">scalar_neg_internal</a>(a.data)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_scalar_neg_assign"></a>
+
+## Function `scalar_neg_assign`
+
+Replaces 'a' by its negation.
+Returns 'a'.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_neg_assign">scalar_neg_assign</a>(a: &<b>mut</b> <a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>): &<b>mut</b> <a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_neg_assign">scalar_neg_assign</a>(a: &<b>mut</b> <a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a>): &<b>mut</b> <a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a> {
+    a.data = <a href="ristretto255.md#0x1_ristretto255_scalar_neg">scalar_neg</a>(a).data;
+    a
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_scalar_to_bytes"></a>
+
+## Function `scalar_to_bytes`
+
+Returns the byte-representation of the scalar.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_to_bytes">scalar_to_bytes</a>(s: &<a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_to_bytes">scalar_to_bytes</a>(s: &<a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; {
+    s.data
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_new_point_from_sha512_internal"></a>
+
+## Function `new_point_from_sha512_internal`
+
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_new_point_from_sha512_internal">new_point_from_sha512_internal</a>(sha2_512_input: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_new_point_from_sha512_internal">new_point_from_sha512_internal</a>(sha2_512_input: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): u64;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_new_point_from_64_uniform_bytes_internal"></a>
+
+## Function `new_point_from_64_uniform_bytes_internal`
+
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_new_point_from_64_uniform_bytes_internal">new_point_from_64_uniform_bytes_internal</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_new_point_from_64_uniform_bytes_internal">new_point_from_64_uniform_bytes_internal</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): u64;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_point_is_canonical_internal"></a>
+
+## Function `point_is_canonical_internal`
+
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_point_is_canonical_internal">point_is_canonical_internal</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_point_is_canonical_internal">point_is_canonical_internal</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_point_identity_internal"></a>
+
+## Function `point_identity_internal`
+
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_point_identity_internal">point_identity_internal</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_point_identity_internal">point_identity_internal</a>(): u64;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_point_decompress_internal"></a>
+
+## Function `point_decompress_internal`
+
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_point_decompress_internal">point_decompress_internal</a>(maybe_non_canonical_bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): (u64, bool)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_point_decompress_internal">point_decompress_internal</a>(maybe_non_canonical_bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): (u64, bool);
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_point_clone_internal"></a>
+
+## Function `point_clone_internal`
+
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_point_clone_internal">point_clone_internal</a>(point_handle: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_point_clone_internal">point_clone_internal</a>(point_handle: u64): u64;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_point_compress_internal"></a>
+
+## Function `point_compress_internal`
+
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_point_compress_internal">point_compress_internal</a>(point: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_point_compress_internal">point_compress_internal</a>(point: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_point_mul_internal"></a>
+
+## Function `point_mul_internal`
+
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_point_mul_internal">point_mul_internal</a>(point: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>, a: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, in_place: bool): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_point_mul_internal">point_mul_internal</a>(point: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a>, a: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, in_place: bool): u64;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_basepoint_mul_internal"></a>
+
+## Function `basepoint_mul_internal`
+
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_basepoint_mul_internal">basepoint_mul_internal</a>(a: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_basepoint_mul_internal">basepoint_mul_internal</a>(a: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): u64;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_basepoint_double_mul_internal"></a>
+
+## Function `basepoint_double_mul_internal`
+
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_basepoint_double_mul_internal">basepoint_double_mul_internal</a>(a: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, some_point: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>, b: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_basepoint_double_mul_internal">basepoint_double_mul_internal</a>(a: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, some_point: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a>, b: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): u64;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_point_add_internal"></a>
+
+## Function `point_add_internal`
+
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_point_add_internal">point_add_internal</a>(a: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>, b: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>, in_place: bool): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_point_add_internal">point_add_internal</a>(a: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a>, b: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a>, in_place: bool): u64;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_point_sub_internal"></a>
+
+## Function `point_sub_internal`
+
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_point_sub_internal">point_sub_internal</a>(a: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>, b: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>, in_place: bool): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_point_sub_internal">point_sub_internal</a>(a: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a>, b: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a>, in_place: bool): u64;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_point_neg_internal"></a>
+
+## Function `point_neg_internal`
+
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_point_neg_internal">point_neg_internal</a>(a: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>, in_place: bool): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_point_neg_internal">point_neg_internal</a>(a: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">RistrettoPoint</a>, in_place: bool): u64;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_double_scalar_mul_internal"></a>
+
+## Function `double_scalar_mul_internal`
+
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_double_scalar_mul_internal">double_scalar_mul_internal</a>(point1: u64, point2: u64, scalar1: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, scalar2: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_double_scalar_mul_internal">double_scalar_mul_internal</a>(point1: u64, point2: u64, scalar1: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, scalar2: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): u64;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_multi_scalar_mul_internal"></a>
+
+## Function `multi_scalar_mul_internal`
+
+The generic arguments are needed to deal with some Move VM peculiarities which prevent us from borrowing the
+points (or scalars) inside a &vector in Rust.
+
+WARNING: This function can only be called with P = RistrettoPoint and S = Scalar.
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_multi_scalar_mul_internal">multi_scalar_mul_internal</a>&lt;P, S&gt;(points: &<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;P&gt;, scalars: &<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;S&gt;): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_multi_scalar_mul_internal">multi_scalar_mul_internal</a>&lt;P, S&gt;(points: &<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;P&gt;, scalars: &<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;S&gt;): u64;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_scalar_is_canonical_internal"></a>
+
+## Function `scalar_is_canonical_internal`
+
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_is_canonical_internal">scalar_is_canonical_internal</a>(s: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_is_canonical_internal">scalar_is_canonical_internal</a>(s: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_scalar_from_u64_internal"></a>
+
+## Function `scalar_from_u64_internal`
+
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_from_u64_internal">scalar_from_u64_internal</a>(num: u64): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_from_u64_internal">scalar_from_u64_internal</a>(num: u64): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_scalar_from_u128_internal"></a>
+
+## Function `scalar_from_u128_internal`
+
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_from_u128_internal">scalar_from_u128_internal</a>(num: u128): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_from_u128_internal">scalar_from_u128_internal</a>(num: u128): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_scalar_reduced_from_32_bytes_internal"></a>
+
+## Function `scalar_reduced_from_32_bytes_internal`
+
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_reduced_from_32_bytes_internal">scalar_reduced_from_32_bytes_internal</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_reduced_from_32_bytes_internal">scalar_reduced_from_32_bytes_internal</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_scalar_uniform_from_64_bytes_internal"></a>
+
+## Function `scalar_uniform_from_64_bytes_internal`
+
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_uniform_from_64_bytes_internal">scalar_uniform_from_64_bytes_internal</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_uniform_from_64_bytes_internal">scalar_uniform_from_64_bytes_internal</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_scalar_invert_internal"></a>
+
+## Function `scalar_invert_internal`
+
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_invert_internal">scalar_invert_internal</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_invert_internal">scalar_invert_internal</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_scalar_from_sha512_internal"></a>
+
+## Function `scalar_from_sha512_internal`
+
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_from_sha512_internal">scalar_from_sha512_internal</a>(sha2_512_input: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_from_sha512_internal">scalar_from_sha512_internal</a>(sha2_512_input: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_scalar_mul_internal"></a>
+
+## Function `scalar_mul_internal`
+
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_mul_internal">scalar_mul_internal</a>(a_bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, b_bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_mul_internal">scalar_mul_internal</a>(a_bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, b_bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_scalar_add_internal"></a>
+
+## Function `scalar_add_internal`
+
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_add_internal">scalar_add_internal</a>(a_bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, b_bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_add_internal">scalar_add_internal</a>(a_bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, b_bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_scalar_sub_internal"></a>
+
+## Function `scalar_sub_internal`
+
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_sub_internal">scalar_sub_internal</a>(a_bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, b_bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_sub_internal">scalar_sub_internal</a>(a_bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, b_bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_scalar_neg_internal"></a>
+
+## Function `scalar_neg_internal`
+
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_neg_internal">scalar_neg_internal</a>(a_bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_neg_internal">scalar_neg_internal</a>(a_bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+<a id="@Helper_functions_2"></a>
+
+### Helper functions
+
+
+
+<a id="0x1_ristretto255_spec_scalar_is_zero"></a>
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_spec_scalar_is_zero">spec_scalar_is_zero</a>(s: <a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a>): bool {
+   s.data == x"0000000000000000000000000000000000000000000000000000000000000000"
+}
+</code></pre>
+
+
+
+
+<a id="0x1_ristretto255_spec_scalar_is_one"></a>
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_spec_scalar_is_one">spec_scalar_is_one</a>(s: <a href="ristretto255.md#0x1_ristretto255_Scalar">Scalar</a>): bool {
+   s.data == x"0100000000000000000000000000000000000000000000000000000000000000"
+}
+</code></pre>
+
+
+
+
+<a id="0x1_ristretto255_spec_point_is_canonical_internal"></a>
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_spec_point_is_canonical_internal">spec_point_is_canonical_internal</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool;
+</code></pre>
+
+
+
+
+<a id="0x1_ristretto255_spec_double_scalar_mul_internal"></a>
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_spec_double_scalar_mul_internal">spec_double_scalar_mul_internal</a>(point1: u64, point2: u64, scalar1: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, scalar2: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): u64;
+</code></pre>
+
+
+
+
+<a id="0x1_ristretto255_spec_multi_scalar_mul_internal"></a>
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_spec_multi_scalar_mul_internal">spec_multi_scalar_mul_internal</a>&lt;P, S&gt;(points: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;P&gt;, scalars: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;S&gt;): u64;
+</code></pre>
+
+
+
+
+<a id="0x1_ristretto255_spec_scalar_is_canonical_internal"></a>
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_spec_scalar_is_canonical_internal">spec_scalar_is_canonical_internal</a>(s: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool;
+</code></pre>
+
+
+
+
+<a id="0x1_ristretto255_spec_scalar_from_u64_internal"></a>
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_spec_scalar_from_u64_internal">spec_scalar_from_u64_internal</a>(num: u64): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+</code></pre>
+
+
+
+
+<a id="0x1_ristretto255_spec_scalar_from_u128_internal"></a>
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_spec_scalar_from_u128_internal">spec_scalar_from_u128_internal</a>(num: u128): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+</code></pre>
+
+
+
+
+<a id="0x1_ristretto255_spec_scalar_reduced_from_32_bytes_internal"></a>
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_spec_scalar_reduced_from_32_bytes_internal">spec_scalar_reduced_from_32_bytes_internal</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+</code></pre>
+
+
+
+
+<a id="0x1_ristretto255_spec_scalar_uniform_from_64_bytes_internal"></a>
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_spec_scalar_uniform_from_64_bytes_internal">spec_scalar_uniform_from_64_bytes_internal</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+</code></pre>
+
+
+
+
+<a id="0x1_ristretto255_spec_scalar_invert_internal"></a>
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_spec_scalar_invert_internal">spec_scalar_invert_internal</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+</code></pre>
+
+
+
+
+<a id="0x1_ristretto255_spec_scalar_from_sha512_internal"></a>
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_spec_scalar_from_sha512_internal">spec_scalar_from_sha512_internal</a>(sha2_512_input: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+</code></pre>
+
+
+
+
+<a id="0x1_ristretto255_spec_scalar_mul_internal"></a>
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_spec_scalar_mul_internal">spec_scalar_mul_internal</a>(a_bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, b_bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+</code></pre>
+
+
+
+
+<a id="0x1_ristretto255_spec_scalar_add_internal"></a>
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_spec_scalar_add_internal">spec_scalar_add_internal</a>(a_bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, b_bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+</code></pre>
+
+
+
+
+<a id="0x1_ristretto255_spec_scalar_sub_internal"></a>
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_spec_scalar_sub_internal">spec_scalar_sub_internal</a>(a_bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, b_bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+</code></pre>
+
+
+
+
+<a id="0x1_ristretto255_spec_scalar_neg_internal"></a>
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_spec_scalar_neg_internal">spec_scalar_neg_internal</a>(a_bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+</code></pre>
+
+
+
+<a id="@Specification_1_point_equals"></a>
+
+### Function `point_equals`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_point_equals">point_equals</a>(g: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>, h: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>): bool
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_double_scalar_mul"></a>
+
+### Function `double_scalar_mul`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_double_scalar_mul">double_scalar_mul</a>(scalar1: &<a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>, point1: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>, scalar2: &<a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>, point2: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>): <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_multi_scalar_mul"></a>
+
+### Function `multi_scalar_mul`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_multi_scalar_mul">multi_scalar_mul</a>(points: &<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>&gt;, scalars: &<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>&gt;): <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> len(points) == 0;
+<b>aborts_if</b> len(scalars) == 0;
+<b>aborts_if</b> len(points) != len(scalars);
+<b>ensures</b> result.handle == <a href="ristretto255.md#0x1_ristretto255_spec_multi_scalar_mul_internal">spec_multi_scalar_mul_internal</a>(points, scalars);
+</code></pre>
+
+
+
+<a id="@Specification_1_new_scalar_from_bytes"></a>
+
+### Function `new_scalar_from_bytes`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_new_scalar_from_bytes">new_scalar_from_bytes</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+<b>ensures</b> <a href="ristretto255.md#0x1_ristretto255_spec_scalar_is_canonical_internal">spec_scalar_is_canonical_internal</a>(bytes) ==&gt; (std::option::spec_is_some(result)
+    && std::option::spec_borrow(result).data == bytes);
+<b>ensures</b> !<a href="ristretto255.md#0x1_ristretto255_spec_scalar_is_canonical_internal">spec_scalar_is_canonical_internal</a>(bytes) ==&gt; std::option::spec_is_none(result);
+</code></pre>
+
+
+
+<a id="@Specification_1_new_scalar_from_sha2_512"></a>
+
+### Function `new_scalar_from_sha2_512`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_new_scalar_from_sha2_512">new_scalar_from_sha2_512</a>(sha2_512_input: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result.data == <a href="ristretto255.md#0x1_ristretto255_spec_scalar_from_sha512_internal">spec_scalar_from_sha512_internal</a>(sha2_512_input);
+</code></pre>
+
+
+
+<a id="@Specification_1_new_scalar_from_u8"></a>
+
+### Function `new_scalar_from_u8`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_new_scalar_from_u8">new_scalar_from_u8</a>(byte: u8): <a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result.data[0] == byte;
+<b>ensures</b> <b>forall</b> i in 1..len(result.data): result.data[i] == 0;
+</code></pre>
+
+
+
+<a id="@Specification_1_new_scalar_from_u32"></a>
+
+### Function `new_scalar_from_u32`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_new_scalar_from_u32">new_scalar_from_u32</a>(four_bytes: u32): <a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result.data == <a href="ristretto255.md#0x1_ristretto255_spec_scalar_from_u64_internal">spec_scalar_from_u64_internal</a>(four_bytes);
+</code></pre>
+
+
+
+<a id="@Specification_1_new_scalar_from_u64"></a>
+
+### Function `new_scalar_from_u64`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_new_scalar_from_u64">new_scalar_from_u64</a>(eight_bytes: u64): <a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result.data == <a href="ristretto255.md#0x1_ristretto255_spec_scalar_from_u64_internal">spec_scalar_from_u64_internal</a>(eight_bytes);
+</code></pre>
+
+
+
+<a id="@Specification_1_new_scalar_from_u128"></a>
+
+### Function `new_scalar_from_u128`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_new_scalar_from_u128">new_scalar_from_u128</a>(sixteen_bytes: u128): <a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result.data == <a href="ristretto255.md#0x1_ristretto255_spec_scalar_from_u128_internal">spec_scalar_from_u128_internal</a>(sixteen_bytes);
+</code></pre>
+
+
+
+<a id="@Specification_1_new_scalar_reduced_from_32_bytes"></a>
+
+### Function `new_scalar_reduced_from_32_bytes`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_new_scalar_reduced_from_32_bytes">new_scalar_reduced_from_32_bytes</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>ensures</b> len(bytes) != 32 ==&gt; std::option::spec_is_none(result);
+<b>ensures</b> len(bytes) == 32 ==&gt; std::option::spec_borrow(result).data == <a href="ristretto255.md#0x1_ristretto255_spec_scalar_reduced_from_32_bytes_internal">spec_scalar_reduced_from_32_bytes_internal</a>(bytes);
+</code></pre>
+
+
+
+<a id="@Specification_1_new_scalar_uniform_from_64_bytes"></a>
+
+### Function `new_scalar_uniform_from_64_bytes`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_new_scalar_uniform_from_64_bytes">new_scalar_uniform_from_64_bytes</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>ensures</b> len(bytes) != 64 ==&gt; std::option::spec_is_none(result);
+<b>ensures</b> len(bytes) == 64 ==&gt; std::option::spec_borrow(result).data == <a href="ristretto255.md#0x1_ristretto255_spec_scalar_uniform_from_64_bytes_internal">spec_scalar_uniform_from_64_bytes_internal</a>(bytes);
+</code></pre>
+
+
+
+<a id="@Specification_1_scalar_zero"></a>
+
+### Function `scalar_zero`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_zero">scalar_zero</a>(): <a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>
+</code></pre>
+
+
+
+
+<pre><code><b>ensures</b> <a href="ristretto255.md#0x1_ristretto255_spec_scalar_is_zero">spec_scalar_is_zero</a>(result);
+</code></pre>
+
+
+
+<a id="@Specification_1_scalar_is_zero"></a>
+
+### Function `scalar_is_zero`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_is_zero">scalar_is_zero</a>(s: &<a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>): bool
+</code></pre>
+
+
+
+
+<pre><code><b>ensures</b> result == <a href="ristretto255.md#0x1_ristretto255_spec_scalar_is_zero">spec_scalar_is_zero</a>(s);
+</code></pre>
+
+
+
+<a id="@Specification_1_scalar_one"></a>
+
+### Function `scalar_one`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_one">scalar_one</a>(): <a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>
+</code></pre>
+
+
+
+
+<pre><code><b>ensures</b> <a href="ristretto255.md#0x1_ristretto255_spec_scalar_is_one">spec_scalar_is_one</a>(result);
+</code></pre>
+
+
+
+<a id="@Specification_1_scalar_is_one"></a>
+
+### Function `scalar_is_one`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_is_one">scalar_is_one</a>(s: &<a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>): bool
+</code></pre>
+
+
+
+
+<pre><code><b>ensures</b> result == <a href="ristretto255.md#0x1_ristretto255_spec_scalar_is_one">spec_scalar_is_one</a>(s);
+</code></pre>
+
+
+
+<a id="@Specification_1_scalar_equals"></a>
+
+### Function `scalar_equals`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_equals">scalar_equals</a>(lhs: &<a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>, rhs: &<a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>): bool
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == (lhs.data == rhs.data);
+</code></pre>
+
+
+
+<a id="@Specification_1_scalar_invert"></a>
+
+### Function `scalar_invert`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_invert">scalar_invert</a>(s: &<a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+<b>ensures</b> <a href="ristretto255.md#0x1_ristretto255_spec_scalar_is_zero">spec_scalar_is_zero</a>(s) ==&gt; std::option::spec_is_none(result);
+<b>ensures</b> !<a href="ristretto255.md#0x1_ristretto255_spec_scalar_is_zero">spec_scalar_is_zero</a>(s) ==&gt; (std::option::spec_is_some(result) && std::option::spec_borrow(result).data == <a href="ristretto255.md#0x1_ristretto255_spec_scalar_invert_internal">spec_scalar_invert_internal</a>(s.data));
+</code></pre>
+
+
+
+<a id="@Specification_1_scalar_mul"></a>
+
+### Function `scalar_mul`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_mul">scalar_mul</a>(a: &<a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>, b: &<a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>): <a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result.data == <a href="ristretto255.md#0x1_ristretto255_spec_scalar_mul_internal">spec_scalar_mul_internal</a>(a.data, b.data);
+</code></pre>
+
+
+
+<a id="@Specification_1_scalar_mul_assign"></a>
+
+### Function `scalar_mul_assign`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_mul_assign">scalar_mul_assign</a>(a: &<b>mut</b> <a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>, b: &<a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>): &<b>mut</b> <a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+<b>ensures</b> a.data == <a href="ristretto255.md#0x1_ristretto255_spec_scalar_mul_internal">spec_scalar_mul_internal</a>(<b>old</b>(a).data, b.data);
+</code></pre>
+
+
+
+<a id="@Specification_1_scalar_add"></a>
+
+### Function `scalar_add`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_add">scalar_add</a>(a: &<a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>, b: &<a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>): <a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result.data == <a href="ristretto255.md#0x1_ristretto255_spec_scalar_add_internal">spec_scalar_add_internal</a>(a.data, b.data);
+</code></pre>
+
+
+
+<a id="@Specification_1_scalar_add_assign"></a>
+
+### Function `scalar_add_assign`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_add_assign">scalar_add_assign</a>(a: &<b>mut</b> <a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>, b: &<a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>): &<b>mut</b> <a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+<b>ensures</b> a.data == <a href="ristretto255.md#0x1_ristretto255_spec_scalar_add_internal">spec_scalar_add_internal</a>(<b>old</b>(a).data, b.data);
+</code></pre>
+
+
+
+<a id="@Specification_1_scalar_sub"></a>
+
+### Function `scalar_sub`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_sub">scalar_sub</a>(a: &<a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>, b: &<a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>): <a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result.data == <a href="ristretto255.md#0x1_ristretto255_spec_scalar_sub_internal">spec_scalar_sub_internal</a>(a.data, b.data);
+</code></pre>
+
+
+
+<a id="@Specification_1_scalar_sub_assign"></a>
+
+### Function `scalar_sub_assign`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_sub_assign">scalar_sub_assign</a>(a: &<b>mut</b> <a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>, b: &<a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>): &<b>mut</b> <a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+<b>ensures</b> a.data == <a href="ristretto255.md#0x1_ristretto255_spec_scalar_sub_internal">spec_scalar_sub_internal</a>(<b>old</b>(a).data, b.data);
+</code></pre>
+
+
+
+<a id="@Specification_1_scalar_neg"></a>
+
+### Function `scalar_neg`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_neg">scalar_neg</a>(a: &<a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>): <a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result.data == <a href="ristretto255.md#0x1_ristretto255_spec_scalar_neg_internal">spec_scalar_neg_internal</a>(a.data);
+</code></pre>
+
+
+
+<a id="@Specification_1_scalar_neg_assign"></a>
+
+### Function `scalar_neg_assign`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_neg_assign">scalar_neg_assign</a>(a: &<b>mut</b> <a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>): &<b>mut</b> <a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+<b>ensures</b> a.data == <a href="ristretto255.md#0x1_ristretto255_spec_scalar_neg_internal">spec_scalar_neg_internal</a>(<b>old</b>(a).data);
+</code></pre>
+
+
+
+<a id="@Specification_1_scalar_to_bytes"></a>
+
+### Function `scalar_to_bytes`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_to_bytes">scalar_to_bytes</a>(s: &<a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == s.data;
+</code></pre>
+
+
+
+<a id="@Specification_1_new_point_from_sha512_internal"></a>
+
+### Function `new_point_from_sha512_internal`
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_new_point_from_sha512_internal">new_point_from_sha512_internal</a>(sha2_512_input: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): u64
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_new_point_from_64_uniform_bytes_internal"></a>
+
+### Function `new_point_from_64_uniform_bytes_internal`
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_new_point_from_64_uniform_bytes_internal">new_point_from_64_uniform_bytes_internal</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): u64
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_point_is_canonical_internal"></a>
+
+### Function `point_is_canonical_internal`
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_point_is_canonical_internal">point_is_canonical_internal</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> [abstract] <b>false</b>;
+<b>ensures</b> result == <a href="ristretto255.md#0x1_ristretto255_spec_point_is_canonical_internal">spec_point_is_canonical_internal</a>(bytes);
+</code></pre>
+
+
+
+<a id="@Specification_1_point_identity_internal"></a>
+
+### Function `point_identity_internal`
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_point_identity_internal">point_identity_internal</a>(): u64
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_point_decompress_internal"></a>
+
+### Function `point_decompress_internal`
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_point_decompress_internal">point_decompress_internal</a>(maybe_non_canonical_bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): (u64, bool)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_point_clone_internal"></a>
+
+### Function `point_clone_internal`
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_point_clone_internal">point_clone_internal</a>(point_handle: u64): u64
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_point_compress_internal"></a>
+
+### Function `point_compress_internal`
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_point_compress_internal">point_compress_internal</a>(point: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_point_mul_internal"></a>
+
+### Function `point_mul_internal`
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_point_mul_internal">point_mul_internal</a>(point: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>, a: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, in_place: bool): u64
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_basepoint_mul_internal"></a>
+
+### Function `basepoint_mul_internal`
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_basepoint_mul_internal">basepoint_mul_internal</a>(a: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): u64
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_basepoint_double_mul_internal"></a>
+
+### Function `basepoint_double_mul_internal`
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_basepoint_double_mul_internal">basepoint_double_mul_internal</a>(a: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, some_point: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>, b: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): u64
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_point_add_internal"></a>
+
+### Function `point_add_internal`
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_point_add_internal">point_add_internal</a>(a: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>, b: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>, in_place: bool): u64
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_point_sub_internal"></a>
+
+### Function `point_sub_internal`
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_point_sub_internal">point_sub_internal</a>(a: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>, b: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>, in_place: bool): u64
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_point_neg_internal"></a>
+
+### Function `point_neg_internal`
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_point_neg_internal">point_neg_internal</a>(a: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>, in_place: bool): u64
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_double_scalar_mul_internal"></a>
+
+### Function `double_scalar_mul_internal`
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_double_scalar_mul_internal">double_scalar_mul_internal</a>(point1: u64, point2: u64, scalar1: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, scalar2: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): u64
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+
+<a id="@Specification_1_multi_scalar_mul_internal"></a>
+
+### Function `multi_scalar_mul_internal`
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_multi_scalar_mul_internal">multi_scalar_mul_internal</a>&lt;P, S&gt;(points: &<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;P&gt;, scalars: &<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;S&gt;): u64
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> [abstract] <b>false</b>;
+<b>ensures</b> result == <a href="ristretto255.md#0x1_ristretto255_spec_multi_scalar_mul_internal">spec_multi_scalar_mul_internal</a>&lt;P, S&gt;(points, scalars);
+</code></pre>
+
+
+
+<a id="@Specification_1_scalar_is_canonical_internal"></a>
+
+### Function `scalar_is_canonical_internal`
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_is_canonical_internal">scalar_is_canonical_internal</a>(s: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> [abstract] <b>false</b>;
+<b>ensures</b> result == <a href="ristretto255.md#0x1_ristretto255_spec_scalar_is_canonical_internal">spec_scalar_is_canonical_internal</a>(s);
+</code></pre>
+
+
+
+<a id="@Specification_1_scalar_from_u64_internal"></a>
+
+### Function `scalar_from_u64_internal`
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_from_u64_internal">scalar_from_u64_internal</a>(num: u64): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> [abstract] <b>false</b>;
+<b>ensures</b> result == <a href="ristretto255.md#0x1_ristretto255_spec_scalar_from_u64_internal">spec_scalar_from_u64_internal</a>(num);
+</code></pre>
+
+
+
+<a id="@Specification_1_scalar_from_u128_internal"></a>
+
+### Function `scalar_from_u128_internal`
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_from_u128_internal">scalar_from_u128_internal</a>(num: u128): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> [abstract] <b>false</b>;
+<b>ensures</b> result == <a href="ristretto255.md#0x1_ristretto255_spec_scalar_from_u128_internal">spec_scalar_from_u128_internal</a>(num);
+</code></pre>
+
+
+
+<a id="@Specification_1_scalar_reduced_from_32_bytes_internal"></a>
+
+### Function `scalar_reduced_from_32_bytes_internal`
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_reduced_from_32_bytes_internal">scalar_reduced_from_32_bytes_internal</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>ensures</b> result == <a href="ristretto255.md#0x1_ristretto255_spec_scalar_reduced_from_32_bytes_internal">spec_scalar_reduced_from_32_bytes_internal</a>(bytes);
+</code></pre>
+
+
+
+<a id="@Specification_1_scalar_uniform_from_64_bytes_internal"></a>
+
+### Function `scalar_uniform_from_64_bytes_internal`
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_uniform_from_64_bytes_internal">scalar_uniform_from_64_bytes_internal</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> [abstract] <b>false</b>;
+<b>ensures</b> result == <a href="ristretto255.md#0x1_ristretto255_spec_scalar_uniform_from_64_bytes_internal">spec_scalar_uniform_from_64_bytes_internal</a>(bytes);
+</code></pre>
+
+
+
+<a id="@Specification_1_scalar_invert_internal"></a>
+
+### Function `scalar_invert_internal`
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_invert_internal">scalar_invert_internal</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> [abstract] <b>false</b>;
+<b>ensures</b> result == <a href="ristretto255.md#0x1_ristretto255_spec_scalar_invert_internal">spec_scalar_invert_internal</a>(bytes);
+</code></pre>
+
+
+
+<a id="@Specification_1_scalar_from_sha512_internal"></a>
+
+### Function `scalar_from_sha512_internal`
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_from_sha512_internal">scalar_from_sha512_internal</a>(sha2_512_input: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> [abstract] <b>false</b>;
+<b>ensures</b> result == <a href="ristretto255.md#0x1_ristretto255_spec_scalar_from_sha512_internal">spec_scalar_from_sha512_internal</a>(sha2_512_input);
+</code></pre>
+
+
+
+<a id="@Specification_1_scalar_mul_internal"></a>
+
+### Function `scalar_mul_internal`
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_mul_internal">scalar_mul_internal</a>(a_bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, b_bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> [abstract] <b>false</b>;
+<b>ensures</b> result == <a href="ristretto255.md#0x1_ristretto255_spec_scalar_mul_internal">spec_scalar_mul_internal</a>(a_bytes, b_bytes);
+</code></pre>
+
+
+
+<a id="@Specification_1_scalar_add_internal"></a>
+
+### Function `scalar_add_internal`
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_add_internal">scalar_add_internal</a>(a_bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, b_bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> [abstract] <b>false</b>;
+<b>ensures</b> result == <a href="ristretto255.md#0x1_ristretto255_spec_scalar_add_internal">spec_scalar_add_internal</a>(a_bytes, b_bytes);
+</code></pre>
+
+
+
+<a id="@Specification_1_scalar_sub_internal"></a>
+
+### Function `scalar_sub_internal`
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_sub_internal">scalar_sub_internal</a>(a_bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, b_bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> [abstract] <b>false</b>;
+<b>ensures</b> result == <a href="ristretto255.md#0x1_ristretto255_spec_scalar_sub_internal">spec_scalar_sub_internal</a>(a_bytes, b_bytes);
+</code></pre>
+
+
+
+<a id="@Specification_1_scalar_neg_internal"></a>
+
+### Function `scalar_neg_internal`
+
+
+<pre><code><b>fun</b> <a href="ristretto255.md#0x1_ristretto255_scalar_neg_internal">scalar_neg_internal</a>(a_bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> [abstract] <b>false</b>;
+<b>ensures</b> result == <a href="ristretto255.md#0x1_ristretto255_spec_scalar_neg_internal">spec_scalar_neg_internal</a>(a_bytes);
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/ristretto255_bulletproofs.md b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/ristretto255_bulletproofs.md
new file mode 100644
index 0000000000000..e98a3e6acd194
--- /dev/null
+++ b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/ristretto255_bulletproofs.md
@@ -0,0 +1,321 @@
+
+<a id="0x1_ristretto255_bulletproofs"></a>
+
+# Module `0x1::ristretto255_bulletproofs`
+
+This module implements a Bulletproof range proof verifier on the Ristretto255 curve.
+
+A Bulletproof-based zero-knowledge range proof is a proof that a Pedersen commitment
+$c = v G + r H$ commits to an $n$-bit value $v$ (i.e., $v \in [0, 2^n)$). Currently, this module only supports
+$n \in \{8, 16, 32, 64\}$ for the number of bits.
+
+
+-  [Struct `RangeProof`](#0x1_ristretto255_bulletproofs_RangeProof)
+-  [Constants](#@Constants_0)
+-  [Function `get_max_range_bits`](#0x1_ristretto255_bulletproofs_get_max_range_bits)
+-  [Function `range_proof_from_bytes`](#0x1_ristretto255_bulletproofs_range_proof_from_bytes)
+-  [Function `range_proof_to_bytes`](#0x1_ristretto255_bulletproofs_range_proof_to_bytes)
+-  [Function `verify_range_proof_pedersen`](#0x1_ristretto255_bulletproofs_verify_range_proof_pedersen)
+-  [Function `verify_range_proof`](#0x1_ristretto255_bulletproofs_verify_range_proof)
+-  [Function `verify_range_proof_internal`](#0x1_ristretto255_bulletproofs_verify_range_proof_internal)
+-  [Specification](#@Specification_1)
+    -  [Function `verify_range_proof_internal`](#@Specification_1_verify_range_proof_internal)
+
+
+<pre><code><b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features">0x1::features</a>;
+<b>use</b> <a href="ristretto255.md#0x1_ristretto255">0x1::ristretto255</a>;
+<b>use</b> <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen">0x1::ristretto255_pedersen</a>;
+</code></pre>
+
+
+
+<a id="0x1_ristretto255_bulletproofs_RangeProof"></a>
+
+## Struct `RangeProof`
+
+Represents a zero-knowledge range proof that a value committed inside a Pedersen commitment lies in
+<code>[0, 2^{<a href="ristretto255_bulletproofs.md#0x1_ristretto255_bulletproofs_MAX_RANGE_BITS">MAX_RANGE_BITS</a>})</code>.
+
+
+<pre><code><b>struct</b> <a href="ristretto255_bulletproofs.md#0x1_ristretto255_bulletproofs_RangeProof">RangeProof</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_ristretto255_bulletproofs_E_NATIVE_FUN_NOT_AVAILABLE"></a>
+
+The native functions have not been rolled out yet.
+
+
+<pre><code><b>const</b> <a href="ristretto255_bulletproofs.md#0x1_ristretto255_bulletproofs_E_NATIVE_FUN_NOT_AVAILABLE">E_NATIVE_FUN_NOT_AVAILABLE</a>: u64 = 4;
+</code></pre>
+
+
+
+<a id="0x1_ristretto255_bulletproofs_E_DESERIALIZE_RANGE_PROOF"></a>
+
+There was an error deserializing the range proof.
+
+
+<pre><code><b>const</b> <a href="ristretto255_bulletproofs.md#0x1_ristretto255_bulletproofs_E_DESERIALIZE_RANGE_PROOF">E_DESERIALIZE_RANGE_PROOF</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_ristretto255_bulletproofs_E_RANGE_NOT_SUPPORTED"></a>
+
+The range proof system only supports proving ranges of type $[0, 2^b)$ where $b \in \{8, 16, 32, 64\}$.
+
+
+<pre><code><b>const</b> <a href="ristretto255_bulletproofs.md#0x1_ristretto255_bulletproofs_E_RANGE_NOT_SUPPORTED">E_RANGE_NOT_SUPPORTED</a>: u64 = 3;
+</code></pre>
+
+
+
+<a id="0x1_ristretto255_bulletproofs_E_VALUE_OUTSIDE_RANGE"></a>
+
+The committed value given to the prover is too large.
+
+
+<pre><code><b>const</b> <a href="ristretto255_bulletproofs.md#0x1_ristretto255_bulletproofs_E_VALUE_OUTSIDE_RANGE">E_VALUE_OUTSIDE_RANGE</a>: u64 = 2;
+</code></pre>
+
+
+
+<a id="0x1_ristretto255_bulletproofs_MAX_RANGE_BITS"></a>
+
+The maximum range supported by the Bulletproofs library is $[0, 2^{64})$.
+
+
+<pre><code><b>const</b> <a href="ristretto255_bulletproofs.md#0x1_ristretto255_bulletproofs_MAX_RANGE_BITS">MAX_RANGE_BITS</a>: u64 = 64;
+</code></pre>
+
+
+
+<a id="0x1_ristretto255_bulletproofs_get_max_range_bits"></a>
+
+## Function `get_max_range_bits`
+
+Returns the maximum # of bits that the range proof system can verify proofs for.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_bulletproofs.md#0x1_ristretto255_bulletproofs_get_max_range_bits">get_max_range_bits</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_bulletproofs.md#0x1_ristretto255_bulletproofs_get_max_range_bits">get_max_range_bits</a>(): u64 {
+    <a href="ristretto255_bulletproofs.md#0x1_ristretto255_bulletproofs_MAX_RANGE_BITS">MAX_RANGE_BITS</a>
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_bulletproofs_range_proof_from_bytes"></a>
+
+## Function `range_proof_from_bytes`
+
+Deserializes a range proof from a sequence of bytes. The serialization format is the same as the format in
+the zkcrypto's <code>bulletproofs</code> library (https://docs.rs/bulletproofs/4.0.0/bulletproofs/struct.RangeProof.html#method.from_bytes).
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_bulletproofs.md#0x1_ristretto255_bulletproofs_range_proof_from_bytes">range_proof_from_bytes</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="ristretto255_bulletproofs.md#0x1_ristretto255_bulletproofs_RangeProof">ristretto255_bulletproofs::RangeProof</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_bulletproofs.md#0x1_ristretto255_bulletproofs_range_proof_from_bytes">range_proof_from_bytes</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="ristretto255_bulletproofs.md#0x1_ristretto255_bulletproofs_RangeProof">RangeProof</a> {
+    <a href="ristretto255_bulletproofs.md#0x1_ristretto255_bulletproofs_RangeProof">RangeProof</a> {
+        bytes
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_bulletproofs_range_proof_to_bytes"></a>
+
+## Function `range_proof_to_bytes`
+
+Returns the byte-representation of a range proof.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_bulletproofs.md#0x1_ristretto255_bulletproofs_range_proof_to_bytes">range_proof_to_bytes</a>(proof: &<a href="ristretto255_bulletproofs.md#0x1_ristretto255_bulletproofs_RangeProof">ristretto255_bulletproofs::RangeProof</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_bulletproofs.md#0x1_ristretto255_bulletproofs_range_proof_to_bytes">range_proof_to_bytes</a>(proof: &<a href="ristretto255_bulletproofs.md#0x1_ristretto255_bulletproofs_RangeProof">RangeProof</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; {
+    proof.bytes
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_bulletproofs_verify_range_proof_pedersen"></a>
+
+## Function `verify_range_proof_pedersen`
+
+Verifies a zero-knowledge range proof that the value <code>v</code> committed in <code>com</code> (under the default Bulletproofs
+commitment key; see <code>pedersen::new_commitment_for_bulletproof</code>) satisfies $v \in [0, 2^b)$. Only works
+for $b \in \{8, 16, 32, 64\}$. Additionally, checks that the prover used <code>dst</code> as the domain-separation
+tag (DST).
+
+WARNING: The DST check is VERY important for security as it prevents proofs computed for one application
+(a.k.a., a _domain_) with <code>dst_1</code> from verifying in a different application with <code>dst_2 != dst_1</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_bulletproofs.md#0x1_ristretto255_bulletproofs_verify_range_proof_pedersen">verify_range_proof_pedersen</a>(com: &<a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_Commitment">ristretto255_pedersen::Commitment</a>, proof: &<a href="ristretto255_bulletproofs.md#0x1_ristretto255_bulletproofs_RangeProof">ristretto255_bulletproofs::RangeProof</a>, num_bits: u64, dst: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_bulletproofs.md#0x1_ristretto255_bulletproofs_verify_range_proof_pedersen">verify_range_proof_pedersen</a>(com: &pedersen::Commitment, proof: &<a href="ristretto255_bulletproofs.md#0x1_ristretto255_bulletproofs_RangeProof">RangeProof</a>, num_bits: u64, dst: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool {
+    <b>assert</b>!(<a href="../../../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_bulletproofs_enabled">features::bulletproofs_enabled</a>(), <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="ristretto255_bulletproofs.md#0x1_ristretto255_bulletproofs_E_NATIVE_FUN_NOT_AVAILABLE">E_NATIVE_FUN_NOT_AVAILABLE</a>));
+
+    <a href="ristretto255_bulletproofs.md#0x1_ristretto255_bulletproofs_verify_range_proof_internal">verify_range_proof_internal</a>(
+        <a href="ristretto255.md#0x1_ristretto255_point_to_bytes">ristretto255::point_to_bytes</a>(&pedersen::commitment_as_compressed_point(com)),
+        &<a href="ristretto255.md#0x1_ristretto255_basepoint">ristretto255::basepoint</a>(), &<a href="ristretto255.md#0x1_ristretto255_hash_to_point_base">ristretto255::hash_to_point_base</a>(),
+        proof.bytes,
+        num_bits,
+        dst
+    )
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_bulletproofs_verify_range_proof"></a>
+
+## Function `verify_range_proof`
+
+Verifies a zero-knowledge range proof that the value <code>v</code> committed in <code>com</code> (as v * val_base + r * rand_base,
+for some randomness <code>r</code>) satisfies <code>v</code> in <code>[0, 2^num_bits)</code>. Only works for <code>num_bits</code> in <code>{8, 16, 32, 64}</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_bulletproofs.md#0x1_ristretto255_bulletproofs_verify_range_proof">verify_range_proof</a>(com: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>, val_base: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>, rand_base: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>, proof: &<a href="ristretto255_bulletproofs.md#0x1_ristretto255_bulletproofs_RangeProof">ristretto255_bulletproofs::RangeProof</a>, num_bits: u64, dst: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_bulletproofs.md#0x1_ristretto255_bulletproofs_verify_range_proof">verify_range_proof</a>(
+    com: &RistrettoPoint,
+    val_base: &RistrettoPoint, rand_base: &RistrettoPoint,
+    proof: &<a href="ristretto255_bulletproofs.md#0x1_ristretto255_bulletproofs_RangeProof">RangeProof</a>, num_bits: u64, dst: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool
+{
+    <b>assert</b>!(<a href="../../../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_bulletproofs_enabled">features::bulletproofs_enabled</a>(), <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="ristretto255_bulletproofs.md#0x1_ristretto255_bulletproofs_E_NATIVE_FUN_NOT_AVAILABLE">E_NATIVE_FUN_NOT_AVAILABLE</a>));
+
+    <a href="ristretto255_bulletproofs.md#0x1_ristretto255_bulletproofs_verify_range_proof_internal">verify_range_proof_internal</a>(
+        <a href="ristretto255.md#0x1_ristretto255_point_to_bytes">ristretto255::point_to_bytes</a>(&<a href="ristretto255.md#0x1_ristretto255_point_compress">ristretto255::point_compress</a>(com)),
+        val_base, rand_base,
+        proof.bytes, num_bits, dst
+    )
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_bulletproofs_verify_range_proof_internal"></a>
+
+## Function `verify_range_proof_internal`
+
+Aborts with <code><a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="ristretto255_bulletproofs.md#0x1_ristretto255_bulletproofs_E_DESERIALIZE_RANGE_PROOF">E_DESERIALIZE_RANGE_PROOF</a>)</code> if <code>proof</code> is not a valid serialization of a
+range proof.
+Aborts with <code><a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="ristretto255_bulletproofs.md#0x1_ristretto255_bulletproofs_E_RANGE_NOT_SUPPORTED">E_RANGE_NOT_SUPPORTED</a>)</code> if an unsupported <code>num_bits</code> is provided.
+
+
+<pre><code><b>fun</b> <a href="ristretto255_bulletproofs.md#0x1_ristretto255_bulletproofs_verify_range_proof_internal">verify_range_proof_internal</a>(com: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, val_base: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>, rand_base: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>, proof: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, num_bits: u64, dst: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="ristretto255_bulletproofs.md#0x1_ristretto255_bulletproofs_verify_range_proof_internal">verify_range_proof_internal</a>(
+    com: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    val_base: &RistrettoPoint,
+    rand_base: &RistrettoPoint,
+    proof: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    num_bits: u64,
+    dst: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool;
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+<a id="@Specification_1_verify_range_proof_internal"></a>
+
+### Function `verify_range_proof_internal`
+
+
+<pre><code><b>fun</b> <a href="ristretto255_bulletproofs.md#0x1_ristretto255_bulletproofs_verify_range_proof_internal">verify_range_proof_internal</a>(com: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, val_base: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>, rand_base: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>, proof: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, num_bits: u64, dst: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/ristretto255_elgamal.md b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/ristretto255_elgamal.md
new file mode 100644
index 0000000000000..ec09869195b51
--- /dev/null
+++ b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/ristretto255_elgamal.md
@@ -0,0 +1,707 @@
+
+<a id="0x1_ristretto255_elgamal"></a>
+
+# Module `0x1::ristretto255_elgamal`
+
+This module implements an ElGamal encryption API, over the Ristretto255 curve, that can be used with the
+Bulletproofs module.
+
+An ElGamal *ciphertext* is an encryption of a value <code>v</code> under a basepoint <code>G</code> and public key <code>Y = sk * G</code>, where <code>sk</code>
+is the corresponding secret key, is <code>(v * G + r * Y, r * G)</code>, for a random scalar <code>r</code>.
+
+Note that we place the value <code>v</code> "in the exponent" of <code>G</code> so that ciphertexts are additively homomorphic: i.e., so
+that <code>Enc_Y(v, r) + Enc_Y(v', r') = Enc_Y(v + v', r + r')</code> where <code>v, v'</code> are plaintext messages, <code>Y</code> is a public key and <code>r, r'</code>
+are the randomness of the ciphertexts.
+
+
+-  [Struct `Ciphertext`](#0x1_ristretto255_elgamal_Ciphertext)
+-  [Struct `CompressedCiphertext`](#0x1_ristretto255_elgamal_CompressedCiphertext)
+-  [Struct `CompressedPubkey`](#0x1_ristretto255_elgamal_CompressedPubkey)
+-  [Function `new_pubkey_from_bytes`](#0x1_ristretto255_elgamal_new_pubkey_from_bytes)
+-  [Function `pubkey_to_bytes`](#0x1_ristretto255_elgamal_pubkey_to_bytes)
+-  [Function `pubkey_to_point`](#0x1_ristretto255_elgamal_pubkey_to_point)
+-  [Function `pubkey_to_compressed_point`](#0x1_ristretto255_elgamal_pubkey_to_compressed_point)
+-  [Function `new_ciphertext_from_bytes`](#0x1_ristretto255_elgamal_new_ciphertext_from_bytes)
+-  [Function `new_ciphertext_no_randomness`](#0x1_ristretto255_elgamal_new_ciphertext_no_randomness)
+-  [Function `ciphertext_from_points`](#0x1_ristretto255_elgamal_ciphertext_from_points)
+-  [Function `ciphertext_from_compressed_points`](#0x1_ristretto255_elgamal_ciphertext_from_compressed_points)
+-  [Function `ciphertext_to_bytes`](#0x1_ristretto255_elgamal_ciphertext_to_bytes)
+-  [Function `ciphertext_into_points`](#0x1_ristretto255_elgamal_ciphertext_into_points)
+-  [Function `ciphertext_as_points`](#0x1_ristretto255_elgamal_ciphertext_as_points)
+-  [Function `compress_ciphertext`](#0x1_ristretto255_elgamal_compress_ciphertext)
+-  [Function `decompress_ciphertext`](#0x1_ristretto255_elgamal_decompress_ciphertext)
+-  [Function `ciphertext_add`](#0x1_ristretto255_elgamal_ciphertext_add)
+-  [Function `ciphertext_add_assign`](#0x1_ristretto255_elgamal_ciphertext_add_assign)
+-  [Function `ciphertext_sub`](#0x1_ristretto255_elgamal_ciphertext_sub)
+-  [Function `ciphertext_sub_assign`](#0x1_ristretto255_elgamal_ciphertext_sub_assign)
+-  [Function `ciphertext_clone`](#0x1_ristretto255_elgamal_ciphertext_clone)
+-  [Function `ciphertext_equals`](#0x1_ristretto255_elgamal_ciphertext_equals)
+-  [Function `get_value_component`](#0x1_ristretto255_elgamal_get_value_component)
+
+
+<pre><code><b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option">0x1::option</a>;
+<b>use</b> <a href="ristretto255.md#0x1_ristretto255">0x1::ristretto255</a>;
+<b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">0x1::vector</a>;
+</code></pre>
+
+
+
+<a id="0x1_ristretto255_elgamal_Ciphertext"></a>
+
+## Struct `Ciphertext`
+
+An ElGamal ciphertext.
+
+
+<pre><code><b>struct</b> <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_Ciphertext">Ciphertext</a> <b>has</b> drop
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>left: <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>right: <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_ristretto255_elgamal_CompressedCiphertext"></a>
+
+## Struct `CompressedCiphertext`
+
+A compressed ElGamal ciphertext.
+
+
+<pre><code><b>struct</b> <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_CompressedCiphertext">CompressedCiphertext</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>left: <a href="ristretto255.md#0x1_ristretto255_CompressedRistretto">ristretto255::CompressedRistretto</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>right: <a href="ristretto255.md#0x1_ristretto255_CompressedRistretto">ristretto255::CompressedRistretto</a></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_ristretto255_elgamal_CompressedPubkey"></a>
+
+## Struct `CompressedPubkey`
+
+An ElGamal public key.
+
+
+<pre><code><b>struct</b> <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_CompressedPubkey">CompressedPubkey</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>point: <a href="ristretto255.md#0x1_ristretto255_CompressedRistretto">ristretto255::CompressedRistretto</a></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_ristretto255_elgamal_new_pubkey_from_bytes"></a>
+
+## Function `new_pubkey_from_bytes`
+
+Creates a new public key from a serialized Ristretto255 point.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_new_pubkey_from_bytes">new_pubkey_from_bytes</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_CompressedPubkey">ristretto255_elgamal::CompressedPubkey</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_new_pubkey_from_bytes">new_pubkey_from_bytes</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): Option&lt;<a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_CompressedPubkey">CompressedPubkey</a>&gt; {
+    <b>let</b> point = <a href="ristretto255.md#0x1_ristretto255_new_compressed_point_from_bytes">ristretto255::new_compressed_point_from_bytes</a>(bytes);
+    <b>if</b> (std::option::is_some(&<b>mut</b> point)) {
+        <b>let</b> pk = <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_CompressedPubkey">CompressedPubkey</a> {
+            point: std::option::extract(&<b>mut</b> point)
+        };
+        std::option::some(pk)
+    } <b>else</b> {
+        std::option::none&lt;<a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_CompressedPubkey">CompressedPubkey</a>&gt;()
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_elgamal_pubkey_to_bytes"></a>
+
+## Function `pubkey_to_bytes`
+
+Given an ElGamal public key <code>pubkey</code>, returns the byte representation of that public key.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_pubkey_to_bytes">pubkey_to_bytes</a>(pubkey: &<a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_CompressedPubkey">ristretto255_elgamal::CompressedPubkey</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_pubkey_to_bytes">pubkey_to_bytes</a>(pubkey: &<a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_CompressedPubkey">CompressedPubkey</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; {
+    <a href="ristretto255.md#0x1_ristretto255_compressed_point_to_bytes">ristretto255::compressed_point_to_bytes</a>(pubkey.point)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_elgamal_pubkey_to_point"></a>
+
+## Function `pubkey_to_point`
+
+Given a public key <code>pubkey</code>, returns the underlying <code>RistrettoPoint</code> representing that key.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_pubkey_to_point">pubkey_to_point</a>(pubkey: &<a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_CompressedPubkey">ristretto255_elgamal::CompressedPubkey</a>): <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_pubkey_to_point">pubkey_to_point</a>(pubkey: &<a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_CompressedPubkey">CompressedPubkey</a>): RistrettoPoint {
+    <a href="ristretto255.md#0x1_ristretto255_point_decompress">ristretto255::point_decompress</a>(&pubkey.point)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_elgamal_pubkey_to_compressed_point"></a>
+
+## Function `pubkey_to_compressed_point`
+
+Given a public key, returns the underlying <code>CompressedRistretto</code> point representing that key.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_pubkey_to_compressed_point">pubkey_to_compressed_point</a>(pubkey: &<a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_CompressedPubkey">ristretto255_elgamal::CompressedPubkey</a>): <a href="ristretto255.md#0x1_ristretto255_CompressedRistretto">ristretto255::CompressedRistretto</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_pubkey_to_compressed_point">pubkey_to_compressed_point</a>(pubkey: &<a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_CompressedPubkey">CompressedPubkey</a>): CompressedRistretto {
+    pubkey.point
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_elgamal_new_ciphertext_from_bytes"></a>
+
+## Function `new_ciphertext_from_bytes`
+
+Creates a new ciphertext from two serialized Ristretto255 points: the first 32 bytes store <code>r * G</code> while the
+next 32 bytes store <code>v * G + r * Y</code>, where <code>Y</code> is the public key.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_new_ciphertext_from_bytes">new_ciphertext_from_bytes</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_Ciphertext">ristretto255_elgamal::Ciphertext</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_new_ciphertext_from_bytes">new_ciphertext_from_bytes</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): Option&lt;<a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_Ciphertext">Ciphertext</a>&gt; {
+    <b>if</b>(<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&bytes) != 64) {
+        <b>return</b> std::option::none&lt;<a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_Ciphertext">Ciphertext</a>&gt;()
+    };
+
+    <b>let</b> bytes_right = <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_trim">vector::trim</a>(&<b>mut</b> bytes, 32);
+
+    <b>let</b> left_point = <a href="ristretto255.md#0x1_ristretto255_new_point_from_bytes">ristretto255::new_point_from_bytes</a>(bytes);
+    <b>let</b> right_point = <a href="ristretto255.md#0x1_ristretto255_new_point_from_bytes">ristretto255::new_point_from_bytes</a>(bytes_right);
+
+    <b>if</b> (std::option::is_some&lt;RistrettoPoint&gt;(&<b>mut</b> left_point) && std::option::is_some&lt;RistrettoPoint&gt;(&<b>mut</b> right_point)) {
+        std::option::some&lt;<a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_Ciphertext">Ciphertext</a>&gt;(<a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_Ciphertext">Ciphertext</a> {
+            left: std::option::extract&lt;RistrettoPoint&gt;(&<b>mut</b> left_point),
+            right: std::option::extract&lt;RistrettoPoint&gt;(&<b>mut</b> right_point)
+        })
+    } <b>else</b> {
+        std::option::none&lt;<a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_Ciphertext">Ciphertext</a>&gt;()
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_elgamal_new_ciphertext_no_randomness"></a>
+
+## Function `new_ciphertext_no_randomness`
+
+Creates a new ciphertext <code>(val * G + 0 * Y, 0 * G) = (val * G, 0 * G)</code> where <code>G</code> is the Ristretto255 basepoint
+and the randomness is set to zero.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_new_ciphertext_no_randomness">new_ciphertext_no_randomness</a>(val: &<a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>): <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_Ciphertext">ristretto255_elgamal::Ciphertext</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_new_ciphertext_no_randomness">new_ciphertext_no_randomness</a>(val: &Scalar): <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_Ciphertext">Ciphertext</a> {
+    <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_Ciphertext">Ciphertext</a> {
+        left: <a href="ristretto255.md#0x1_ristretto255_basepoint_mul">ristretto255::basepoint_mul</a>(val),
+        right: <a href="ristretto255.md#0x1_ristretto255_point_identity">ristretto255::point_identity</a>(),
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_elgamal_ciphertext_from_points"></a>
+
+## Function `ciphertext_from_points`
+
+Moves a pair of Ristretto points into an ElGamal ciphertext.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_ciphertext_from_points">ciphertext_from_points</a>(left: <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>, right: <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>): <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_Ciphertext">ristretto255_elgamal::Ciphertext</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_ciphertext_from_points">ciphertext_from_points</a>(left: RistrettoPoint, right: RistrettoPoint): <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_Ciphertext">Ciphertext</a> {
+    <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_Ciphertext">Ciphertext</a> {
+        left,
+        right,
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_elgamal_ciphertext_from_compressed_points"></a>
+
+## Function `ciphertext_from_compressed_points`
+
+Moves a pair of <code>CompressedRistretto</code> points into an ElGamal ciphertext.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_ciphertext_from_compressed_points">ciphertext_from_compressed_points</a>(left: <a href="ristretto255.md#0x1_ristretto255_CompressedRistretto">ristretto255::CompressedRistretto</a>, right: <a href="ristretto255.md#0x1_ristretto255_CompressedRistretto">ristretto255::CompressedRistretto</a>): <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_CompressedCiphertext">ristretto255_elgamal::CompressedCiphertext</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_ciphertext_from_compressed_points">ciphertext_from_compressed_points</a>(left: CompressedRistretto, right: CompressedRistretto): <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_CompressedCiphertext">CompressedCiphertext</a> {
+    <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_CompressedCiphertext">CompressedCiphertext</a> {
+        left,
+        right,
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_elgamal_ciphertext_to_bytes"></a>
+
+## Function `ciphertext_to_bytes`
+
+Given a ciphertext <code>ct</code>, serializes that ciphertext into bytes.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_ciphertext_to_bytes">ciphertext_to_bytes</a>(ct: &<a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_Ciphertext">ristretto255_elgamal::Ciphertext</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_ciphertext_to_bytes">ciphertext_to_bytes</a>(ct: &<a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_Ciphertext">Ciphertext</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; {
+    <b>let</b> bytes_left = <a href="ristretto255.md#0x1_ristretto255_point_to_bytes">ristretto255::point_to_bytes</a>(&<a href="ristretto255.md#0x1_ristretto255_point_compress">ristretto255::point_compress</a>(&ct.left));
+    <b>let</b> bytes_right = <a href="ristretto255.md#0x1_ristretto255_point_to_bytes">ristretto255::point_to_bytes</a>(&<a href="ristretto255.md#0x1_ristretto255_point_compress">ristretto255::point_compress</a>(&ct.right));
+    <b>let</b> bytes = <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_empty">vector::empty</a>&lt;u8&gt;();
+    <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_append">vector::append</a>&lt;u8&gt;(&<b>mut</b> bytes, bytes_left);
+    <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_append">vector::append</a>&lt;u8&gt;(&<b>mut</b> bytes, bytes_right);
+    bytes
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_elgamal_ciphertext_into_points"></a>
+
+## Function `ciphertext_into_points`
+
+Moves the ciphertext into a pair of <code>RistrettoPoint</code>'s.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_ciphertext_into_points">ciphertext_into_points</a>(c: <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_Ciphertext">ristretto255_elgamal::Ciphertext</a>): (<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>, <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_ciphertext_into_points">ciphertext_into_points</a>(c: <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_Ciphertext">Ciphertext</a>): (RistrettoPoint, RistrettoPoint) {
+    <b>let</b> <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_Ciphertext">Ciphertext</a> { left, right } = c;
+    (left, right)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_elgamal_ciphertext_as_points"></a>
+
+## Function `ciphertext_as_points`
+
+Returns the pair of <code>RistrettoPoint</code>'s representing the ciphertext.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_ciphertext_as_points">ciphertext_as_points</a>(c: &<a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_Ciphertext">ristretto255_elgamal::Ciphertext</a>): (&<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>, &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_ciphertext_as_points">ciphertext_as_points</a>(c: &<a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_Ciphertext">Ciphertext</a>): (&RistrettoPoint, &RistrettoPoint) {
+    (&c.left, &c.right)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_elgamal_compress_ciphertext"></a>
+
+## Function `compress_ciphertext`
+
+Creates a new compressed ciphertext from a decompressed ciphertext.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_compress_ciphertext">compress_ciphertext</a>(ct: &<a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_Ciphertext">ristretto255_elgamal::Ciphertext</a>): <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_CompressedCiphertext">ristretto255_elgamal::CompressedCiphertext</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_compress_ciphertext">compress_ciphertext</a>(ct: &<a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_Ciphertext">Ciphertext</a>): <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_CompressedCiphertext">CompressedCiphertext</a> {
+    <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_CompressedCiphertext">CompressedCiphertext</a> {
+        left: point_compress(&ct.left),
+        right: point_compress(&ct.right),
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_elgamal_decompress_ciphertext"></a>
+
+## Function `decompress_ciphertext`
+
+Creates a new decompressed ciphertext from a compressed ciphertext.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_decompress_ciphertext">decompress_ciphertext</a>(ct: &<a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_CompressedCiphertext">ristretto255_elgamal::CompressedCiphertext</a>): <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_Ciphertext">ristretto255_elgamal::Ciphertext</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_decompress_ciphertext">decompress_ciphertext</a>(ct: &<a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_CompressedCiphertext">CompressedCiphertext</a>): <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_Ciphertext">Ciphertext</a> {
+    <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_Ciphertext">Ciphertext</a> {
+        left: <a href="ristretto255.md#0x1_ristretto255_point_decompress">ristretto255::point_decompress</a>(&ct.left),
+        right: <a href="ristretto255.md#0x1_ristretto255_point_decompress">ristretto255::point_decompress</a>(&ct.right),
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_elgamal_ciphertext_add"></a>
+
+## Function `ciphertext_add`
+
+Homomorphically combines two ciphertexts <code>lhs</code> and <code>rhs</code> as <code>lhs + rhs</code>.
+Useful for re-randomizing the ciphertext or updating the committed value.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_ciphertext_add">ciphertext_add</a>(lhs: &<a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_Ciphertext">ristretto255_elgamal::Ciphertext</a>, rhs: &<a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_Ciphertext">ristretto255_elgamal::Ciphertext</a>): <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_Ciphertext">ristretto255_elgamal::Ciphertext</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_ciphertext_add">ciphertext_add</a>(lhs: &<a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_Ciphertext">Ciphertext</a>, rhs: &<a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_Ciphertext">Ciphertext</a>): <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_Ciphertext">Ciphertext</a> {
+    <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_Ciphertext">Ciphertext</a> {
+        left: <a href="ristretto255.md#0x1_ristretto255_point_add">ristretto255::point_add</a>(&lhs.left, &rhs.left),
+        right: <a href="ristretto255.md#0x1_ristretto255_point_add">ristretto255::point_add</a>(&lhs.right, &rhs.right),
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_elgamal_ciphertext_add_assign"></a>
+
+## Function `ciphertext_add_assign`
+
+Like <code>ciphertext_add</code> but assigns <code>lhs = lhs + rhs</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_ciphertext_add_assign">ciphertext_add_assign</a>(lhs: &<b>mut</b> <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_Ciphertext">ristretto255_elgamal::Ciphertext</a>, rhs: &<a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_Ciphertext">ristretto255_elgamal::Ciphertext</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_ciphertext_add_assign">ciphertext_add_assign</a>(lhs: &<b>mut</b> <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_Ciphertext">Ciphertext</a>, rhs: &<a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_Ciphertext">Ciphertext</a>) {
+    <a href="ristretto255.md#0x1_ristretto255_point_add_assign">ristretto255::point_add_assign</a>(&<b>mut</b> lhs.left, &rhs.left);
+    <a href="ristretto255.md#0x1_ristretto255_point_add_assign">ristretto255::point_add_assign</a>(&<b>mut</b> lhs.right, &rhs.right);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_elgamal_ciphertext_sub"></a>
+
+## Function `ciphertext_sub`
+
+Homomorphically combines two ciphertexts <code>lhs</code> and <code>rhs</code> as <code>lhs - rhs</code>.
+Useful for re-randomizing the ciphertext or updating the committed value.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_ciphertext_sub">ciphertext_sub</a>(lhs: &<a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_Ciphertext">ristretto255_elgamal::Ciphertext</a>, rhs: &<a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_Ciphertext">ristretto255_elgamal::Ciphertext</a>): <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_Ciphertext">ristretto255_elgamal::Ciphertext</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_ciphertext_sub">ciphertext_sub</a>(lhs: &<a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_Ciphertext">Ciphertext</a>, rhs: &<a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_Ciphertext">Ciphertext</a>): <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_Ciphertext">Ciphertext</a> {
+    <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_Ciphertext">Ciphertext</a> {
+        left: <a href="ristretto255.md#0x1_ristretto255_point_sub">ristretto255::point_sub</a>(&lhs.left, &rhs.left),
+        right: <a href="ristretto255.md#0x1_ristretto255_point_sub">ristretto255::point_sub</a>(&lhs.right, &rhs.right),
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_elgamal_ciphertext_sub_assign"></a>
+
+## Function `ciphertext_sub_assign`
+
+Like <code>ciphertext_add</code> but assigns <code>lhs = lhs - rhs</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_ciphertext_sub_assign">ciphertext_sub_assign</a>(lhs: &<b>mut</b> <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_Ciphertext">ristretto255_elgamal::Ciphertext</a>, rhs: &<a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_Ciphertext">ristretto255_elgamal::Ciphertext</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_ciphertext_sub_assign">ciphertext_sub_assign</a>(lhs: &<b>mut</b> <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_Ciphertext">Ciphertext</a>, rhs: &<a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_Ciphertext">Ciphertext</a>) {
+    <a href="ristretto255.md#0x1_ristretto255_point_sub_assign">ristretto255::point_sub_assign</a>(&<b>mut</b> lhs.left, &rhs.left);
+    <a href="ristretto255.md#0x1_ristretto255_point_sub_assign">ristretto255::point_sub_assign</a>(&<b>mut</b> lhs.right, &rhs.right);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_elgamal_ciphertext_clone"></a>
+
+## Function `ciphertext_clone`
+
+Creates a copy of this ciphertext.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_ciphertext_clone">ciphertext_clone</a>(c: &<a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_Ciphertext">ristretto255_elgamal::Ciphertext</a>): <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_Ciphertext">ristretto255_elgamal::Ciphertext</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_ciphertext_clone">ciphertext_clone</a>(c: &<a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_Ciphertext">Ciphertext</a>): <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_Ciphertext">Ciphertext</a> {
+    <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_Ciphertext">Ciphertext</a> {
+        left: <a href="ristretto255.md#0x1_ristretto255_point_clone">ristretto255::point_clone</a>(&c.left),
+        right: <a href="ristretto255.md#0x1_ristretto255_point_clone">ristretto255::point_clone</a>(&c.right),
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_elgamal_ciphertext_equals"></a>
+
+## Function `ciphertext_equals`
+
+Returns true if the two ciphertexts are identical: i.e., same value and same randomness.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_ciphertext_equals">ciphertext_equals</a>(lhs: &<a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_Ciphertext">ristretto255_elgamal::Ciphertext</a>, rhs: &<a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_Ciphertext">ristretto255_elgamal::Ciphertext</a>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_ciphertext_equals">ciphertext_equals</a>(lhs: &<a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_Ciphertext">Ciphertext</a>, rhs: &<a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_Ciphertext">Ciphertext</a>): bool {
+    <a href="ristretto255.md#0x1_ristretto255_point_equals">ristretto255::point_equals</a>(&lhs.left, &rhs.left) &&
+    <a href="ristretto255.md#0x1_ristretto255_point_equals">ristretto255::point_equals</a>(&lhs.right, &rhs.right)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_elgamal_get_value_component"></a>
+
+## Function `get_value_component`
+
+Returns the <code>RistrettoPoint</code> in the ciphertext which contains the encrypted value in the exponent.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_get_value_component">get_value_component</a>(ct: &<a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_Ciphertext">ristretto255_elgamal::Ciphertext</a>): &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_get_value_component">get_value_component</a>(ct: &<a href="ristretto255_elgamal.md#0x1_ristretto255_elgamal_Ciphertext">Ciphertext</a>): &RistrettoPoint {
+    &ct.left
+}
+</code></pre>
+
+
+
+</details>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/ristretto255_pedersen.md b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/ristretto255_pedersen.md
new file mode 100644
index 0000000000000..f9d681ace0e90
--- /dev/null
+++ b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/ristretto255_pedersen.md
@@ -0,0 +1,573 @@
+
+<a id="0x1_ristretto255_pedersen"></a>
+
+# Module `0x1::ristretto255_pedersen`
+
+This module implements a Pedersen commitment API, over the Ristretto255 curve, that can be used with the
+Bulletproofs module.
+
+A Pedersen commitment to a value <code>v</code> under _commitment key_ <code>(g, h)</code> is <code>v * g + r * h</code>, for a random scalar <code>r</code>.
+
+
+-  [Struct `Commitment`](#0x1_ristretto255_pedersen_Commitment)
+-  [Constants](#@Constants_0)
+-  [Function `new_commitment_from_bytes`](#0x1_ristretto255_pedersen_new_commitment_from_bytes)
+-  [Function `commitment_to_bytes`](#0x1_ristretto255_pedersen_commitment_to_bytes)
+-  [Function `commitment_from_point`](#0x1_ristretto255_pedersen_commitment_from_point)
+-  [Function `commitment_from_compressed`](#0x1_ristretto255_pedersen_commitment_from_compressed)
+-  [Function `new_commitment`](#0x1_ristretto255_pedersen_new_commitment)
+-  [Function `new_commitment_with_basepoint`](#0x1_ristretto255_pedersen_new_commitment_with_basepoint)
+-  [Function `new_commitment_for_bulletproof`](#0x1_ristretto255_pedersen_new_commitment_for_bulletproof)
+-  [Function `commitment_add`](#0x1_ristretto255_pedersen_commitment_add)
+-  [Function `commitment_add_assign`](#0x1_ristretto255_pedersen_commitment_add_assign)
+-  [Function `commitment_sub`](#0x1_ristretto255_pedersen_commitment_sub)
+-  [Function `commitment_sub_assign`](#0x1_ristretto255_pedersen_commitment_sub_assign)
+-  [Function `commitment_clone`](#0x1_ristretto255_pedersen_commitment_clone)
+-  [Function `commitment_equals`](#0x1_ristretto255_pedersen_commitment_equals)
+-  [Function `commitment_as_point`](#0x1_ristretto255_pedersen_commitment_as_point)
+-  [Function `commitment_as_compressed_point`](#0x1_ristretto255_pedersen_commitment_as_compressed_point)
+-  [Function `commitment_into_point`](#0x1_ristretto255_pedersen_commitment_into_point)
+-  [Function `commitment_into_compressed_point`](#0x1_ristretto255_pedersen_commitment_into_compressed_point)
+-  [Function `randomness_base_for_bulletproof`](#0x1_ristretto255_pedersen_randomness_base_for_bulletproof)
+
+
+<pre><code><b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option">0x1::option</a>;
+<b>use</b> <a href="ristretto255.md#0x1_ristretto255">0x1::ristretto255</a>;
+</code></pre>
+
+
+
+<a id="0x1_ristretto255_pedersen_Commitment"></a>
+
+## Struct `Commitment`
+
+A Pedersen commitment to some value with some randomness.
+
+
+<pre><code><b>struct</b> <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_Commitment">Commitment</a> <b>has</b> drop
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>point: <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_ristretto255_pedersen_BULLETPROOF_DEFAULT_PEDERSEN_RAND_BASE"></a>
+
+The default Pedersen randomness base <code>h</code> used in our underlying Bulletproofs library.
+This is obtained by hashing the compressed Ristretto255 basepoint using SHA3-512 (not SHA2-512).
+
+
+<pre><code><b>const</b> <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_BULLETPROOF_DEFAULT_PEDERSEN_RAND_BASE">BULLETPROOF_DEFAULT_PEDERSEN_RAND_BASE</a>: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; = [140, 146, 64, 180, 86, 169, 230, 220, 101, 195, 119, 161, 4, 141, 116, 95, 148, 160, 140, 219, 127, 68, 203, 205, 123, 70, 243, 64, 72, 135, 17, 52];
+</code></pre>
+
+
+
+<a id="0x1_ristretto255_pedersen_new_commitment_from_bytes"></a>
+
+## Function `new_commitment_from_bytes`
+
+Creates a new public key from a serialized Ristretto255 point.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_new_commitment_from_bytes">new_commitment_from_bytes</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_Commitment">ristretto255_pedersen::Commitment</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_new_commitment_from_bytes">new_commitment_from_bytes</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): Option&lt;<a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_Commitment">Commitment</a>&gt; {
+    <b>let</b> point = <a href="ristretto255.md#0x1_ristretto255_new_point_from_bytes">ristretto255::new_point_from_bytes</a>(bytes);
+    <b>if</b> (std::option::is_some(&<b>mut</b> point)) {
+        <b>let</b> comm = <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_Commitment">Commitment</a> {
+            point: std::option::extract(&<b>mut</b> point)
+        };
+        std::option::some(comm)
+    } <b>else</b> {
+        std::option::none&lt;<a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_Commitment">Commitment</a>&gt;()
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_pedersen_commitment_to_bytes"></a>
+
+## Function `commitment_to_bytes`
+
+Returns a commitment as a serialized byte array
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_commitment_to_bytes">commitment_to_bytes</a>(comm: &<a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_Commitment">ristretto255_pedersen::Commitment</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_commitment_to_bytes">commitment_to_bytes</a>(comm: &<a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_Commitment">Commitment</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; {
+    <a href="ristretto255.md#0x1_ristretto255_point_to_bytes">ristretto255::point_to_bytes</a>(&<a href="ristretto255.md#0x1_ristretto255_point_compress">ristretto255::point_compress</a>(&comm.point))
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_pedersen_commitment_from_point"></a>
+
+## Function `commitment_from_point`
+
+Moves a Ristretto point into a Pedersen commitment.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_commitment_from_point">commitment_from_point</a>(point: <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>): <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_Commitment">ristretto255_pedersen::Commitment</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_commitment_from_point">commitment_from_point</a>(point: RistrettoPoint): <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_Commitment">Commitment</a> {
+    <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_Commitment">Commitment</a> {
+        point
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_pedersen_commitment_from_compressed"></a>
+
+## Function `commitment_from_compressed`
+
+Deserializes a commitment from a compressed Ristretto point.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_commitment_from_compressed">commitment_from_compressed</a>(point: &<a href="ristretto255.md#0x1_ristretto255_CompressedRistretto">ristretto255::CompressedRistretto</a>): <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_Commitment">ristretto255_pedersen::Commitment</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_commitment_from_compressed">commitment_from_compressed</a>(point: &CompressedRistretto): <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_Commitment">Commitment</a> {
+    <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_Commitment">Commitment</a> {
+        point: <a href="ristretto255.md#0x1_ristretto255_point_decompress">ristretto255::point_decompress</a>(point)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_pedersen_new_commitment"></a>
+
+## Function `new_commitment`
+
+Returns a commitment <code>v * val_base + r * rand_base</code> where <code>(val_base, rand_base)</code> is the commitment key.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_new_commitment">new_commitment</a>(v: &<a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>, val_base: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>, r: &<a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>, rand_base: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>): <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_Commitment">ristretto255_pedersen::Commitment</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_new_commitment">new_commitment</a>(v: &Scalar, val_base: &RistrettoPoint, r: &Scalar, rand_base: &RistrettoPoint): <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_Commitment">Commitment</a> {
+    <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_Commitment">Commitment</a> {
+        point: <a href="ristretto255.md#0x1_ristretto255_double_scalar_mul">ristretto255::double_scalar_mul</a>(v, val_base, r, rand_base)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_pedersen_new_commitment_with_basepoint"></a>
+
+## Function `new_commitment_with_basepoint`
+
+Returns a commitment <code>v * G + r * rand_base</code> where <code>G</code> is the Ristretto255 basepoint.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_new_commitment_with_basepoint">new_commitment_with_basepoint</a>(v: &<a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>, r: &<a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>, rand_base: &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>): <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_Commitment">ristretto255_pedersen::Commitment</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_new_commitment_with_basepoint">new_commitment_with_basepoint</a>(v: &Scalar, r: &Scalar, rand_base: &RistrettoPoint): <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_Commitment">Commitment</a> {
+    <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_Commitment">Commitment</a> {
+        point: <a href="ristretto255.md#0x1_ristretto255_basepoint_double_mul">ristretto255::basepoint_double_mul</a>(r, rand_base, v)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_pedersen_new_commitment_for_bulletproof"></a>
+
+## Function `new_commitment_for_bulletproof`
+
+Returns a commitment <code>v * G + r * H</code> where <code>G</code> is the Ristretto255 basepoint and <code>H</code> is the default randomness
+base used in the Bulletproofs library (i.e., <code><a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_BULLETPROOF_DEFAULT_PEDERSEN_RAND_BASE">BULLETPROOF_DEFAULT_PEDERSEN_RAND_BASE</a></code>).
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_new_commitment_for_bulletproof">new_commitment_for_bulletproof</a>(v: &<a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>, r: &<a href="ristretto255.md#0x1_ristretto255_Scalar">ristretto255::Scalar</a>): <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_Commitment">ristretto255_pedersen::Commitment</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_new_commitment_for_bulletproof">new_commitment_for_bulletproof</a>(v: &Scalar, r: &Scalar): <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_Commitment">Commitment</a> {
+    <b>let</b> rand_base = <a href="ristretto255.md#0x1_ristretto255_new_point_from_bytes">ristretto255::new_point_from_bytes</a>(<a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_BULLETPROOF_DEFAULT_PEDERSEN_RAND_BASE">BULLETPROOF_DEFAULT_PEDERSEN_RAND_BASE</a>);
+    <b>let</b> rand_base = std::option::extract(&<b>mut</b> rand_base);
+
+    <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_Commitment">Commitment</a> {
+        point: <a href="ristretto255.md#0x1_ristretto255_basepoint_double_mul">ristretto255::basepoint_double_mul</a>(r, &rand_base, v)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_pedersen_commitment_add"></a>
+
+## Function `commitment_add`
+
+Homomorphically combines two commitments <code>lhs</code> and <code>rhs</code> as <code>lhs + rhs</code>.
+Useful for re-randomizing the commitment or updating the committed value.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_commitment_add">commitment_add</a>(lhs: &<a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_Commitment">ristretto255_pedersen::Commitment</a>, rhs: &<a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_Commitment">ristretto255_pedersen::Commitment</a>): <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_Commitment">ristretto255_pedersen::Commitment</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_commitment_add">commitment_add</a>(lhs: &<a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_Commitment">Commitment</a>, rhs: &<a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_Commitment">Commitment</a>): <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_Commitment">Commitment</a> {
+    <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_Commitment">Commitment</a> {
+        point: <a href="ristretto255.md#0x1_ristretto255_point_add">ristretto255::point_add</a>(&lhs.point, &rhs.point)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_pedersen_commitment_add_assign"></a>
+
+## Function `commitment_add_assign`
+
+Like <code>commitment_add</code> but assigns <code>lhs = lhs + rhs</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_commitment_add_assign">commitment_add_assign</a>(lhs: &<b>mut</b> <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_Commitment">ristretto255_pedersen::Commitment</a>, rhs: &<a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_Commitment">ristretto255_pedersen::Commitment</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_commitment_add_assign">commitment_add_assign</a>(lhs: &<b>mut</b> <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_Commitment">Commitment</a>, rhs: &<a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_Commitment">Commitment</a>) {
+    <a href="ristretto255.md#0x1_ristretto255_point_add_assign">ristretto255::point_add_assign</a>(&<b>mut</b> lhs.point, &rhs.point);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_pedersen_commitment_sub"></a>
+
+## Function `commitment_sub`
+
+Homomorphically combines two commitments <code>lhs</code> and <code>rhs</code> as <code>lhs - rhs</code>.
+Useful for re-randomizing the commitment or updating the committed value.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_commitment_sub">commitment_sub</a>(lhs: &<a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_Commitment">ristretto255_pedersen::Commitment</a>, rhs: &<a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_Commitment">ristretto255_pedersen::Commitment</a>): <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_Commitment">ristretto255_pedersen::Commitment</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_commitment_sub">commitment_sub</a>(lhs: &<a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_Commitment">Commitment</a>, rhs: &<a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_Commitment">Commitment</a>): <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_Commitment">Commitment</a> {
+    <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_Commitment">Commitment</a> {
+        point: <a href="ristretto255.md#0x1_ristretto255_point_sub">ristretto255::point_sub</a>(&lhs.point, &rhs.point)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_pedersen_commitment_sub_assign"></a>
+
+## Function `commitment_sub_assign`
+
+Like <code>commitment_add</code> but assigns <code>lhs = lhs - rhs</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_commitment_sub_assign">commitment_sub_assign</a>(lhs: &<b>mut</b> <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_Commitment">ristretto255_pedersen::Commitment</a>, rhs: &<a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_Commitment">ristretto255_pedersen::Commitment</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_commitment_sub_assign">commitment_sub_assign</a>(lhs: &<b>mut</b> <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_Commitment">Commitment</a>, rhs: &<a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_Commitment">Commitment</a>) {
+    <a href="ristretto255.md#0x1_ristretto255_point_sub_assign">ristretto255::point_sub_assign</a>(&<b>mut</b> lhs.point, &rhs.point);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_pedersen_commitment_clone"></a>
+
+## Function `commitment_clone`
+
+Creates a copy of this commitment.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_commitment_clone">commitment_clone</a>(c: &<a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_Commitment">ristretto255_pedersen::Commitment</a>): <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_Commitment">ristretto255_pedersen::Commitment</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_commitment_clone">commitment_clone</a>(c: &<a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_Commitment">Commitment</a>): <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_Commitment">Commitment</a> {
+    <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_Commitment">Commitment</a> {
+        point: <a href="ristretto255.md#0x1_ristretto255_point_clone">ristretto255::point_clone</a>(&c.point)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_pedersen_commitment_equals"></a>
+
+## Function `commitment_equals`
+
+Returns true if the two commitments are identical: i.e., same value and same randomness.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_commitment_equals">commitment_equals</a>(lhs: &<a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_Commitment">ristretto255_pedersen::Commitment</a>, rhs: &<a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_Commitment">ristretto255_pedersen::Commitment</a>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_commitment_equals">commitment_equals</a>(lhs: &<a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_Commitment">Commitment</a>, rhs: &<a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_Commitment">Commitment</a>): bool {
+    <a href="ristretto255.md#0x1_ristretto255_point_equals">ristretto255::point_equals</a>(&lhs.point, &rhs.point)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_pedersen_commitment_as_point"></a>
+
+## Function `commitment_as_point`
+
+Returns the underlying elliptic curve point representing the commitment as an in-memory <code>RistrettoPoint</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_commitment_as_point">commitment_as_point</a>(c: &<a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_Commitment">ristretto255_pedersen::Commitment</a>): &<a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_commitment_as_point">commitment_as_point</a>(c: &<a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_Commitment">Commitment</a>): &RistrettoPoint {
+    &c.point
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_pedersen_commitment_as_compressed_point"></a>
+
+## Function `commitment_as_compressed_point`
+
+Returns the Pedersen commitment as a <code>CompressedRistretto</code> point.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_commitment_as_compressed_point">commitment_as_compressed_point</a>(c: &<a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_Commitment">ristretto255_pedersen::Commitment</a>): <a href="ristretto255.md#0x1_ristretto255_CompressedRistretto">ristretto255::CompressedRistretto</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_commitment_as_compressed_point">commitment_as_compressed_point</a>(c: &<a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_Commitment">Commitment</a>): CompressedRistretto {
+    point_compress(&c.point)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_pedersen_commitment_into_point"></a>
+
+## Function `commitment_into_point`
+
+Moves the Commitment into a CompressedRistretto point.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_commitment_into_point">commitment_into_point</a>(c: <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_Commitment">ristretto255_pedersen::Commitment</a>): <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_commitment_into_point">commitment_into_point</a>(c: <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_Commitment">Commitment</a>): RistrettoPoint {
+    <b>let</b> <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_Commitment">Commitment</a> { point } = c;
+    point
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_pedersen_commitment_into_compressed_point"></a>
+
+## Function `commitment_into_compressed_point`
+
+Moves the Commitment into a <code>CompressedRistretto</code> point.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_commitment_into_compressed_point">commitment_into_compressed_point</a>(c: <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_Commitment">ristretto255_pedersen::Commitment</a>): <a href="ristretto255.md#0x1_ristretto255_CompressedRistretto">ristretto255::CompressedRistretto</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_commitment_into_compressed_point">commitment_into_compressed_point</a>(c: <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_Commitment">Commitment</a>): CompressedRistretto {
+    point_compress(&c.point)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_ristretto255_pedersen_randomness_base_for_bulletproof"></a>
+
+## Function `randomness_base_for_bulletproof`
+
+Returns the randomness base compatible with the Bulletproofs module.
+
+Recal that a Bulletproof range proof attests, in zero-knowledge, that a value <code>v</code> inside a Pedersen commitment
+<code>v * g + r * h</code> is sufficiently "small" (e.g., is 32-bits wide). Here, <code>h</code> is referred to as the
+"randomness base" of the commitment scheme.
+
+Bulletproof has a default choice for <code>g</code> and <code>h</code> and this function returns the default <code>h</code> as used in the
+Bulletproofs Move module.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_randomness_base_for_bulletproof">randomness_base_for_bulletproof</a>(): <a href="ristretto255.md#0x1_ristretto255_RistrettoPoint">ristretto255::RistrettoPoint</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_randomness_base_for_bulletproof">randomness_base_for_bulletproof</a>(): RistrettoPoint {
+    std::option::extract(&<b>mut</b> <a href="ristretto255.md#0x1_ristretto255_new_point_from_bytes">ristretto255::new_point_from_bytes</a>(<a href="ristretto255_pedersen.md#0x1_ristretto255_pedersen_BULLETPROOF_DEFAULT_PEDERSEN_RAND_BASE">BULLETPROOF_DEFAULT_PEDERSEN_RAND_BASE</a>))
+}
+</code></pre>
+
+
+
+</details>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/secp256k1.md b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/secp256k1.md
new file mode 100644
index 0000000000000..813c491081892
--- /dev/null
+++ b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/secp256k1.md
@@ -0,0 +1,432 @@
+
+<a id="0x1_secp256k1"></a>
+
+# Module `0x1::secp256k1`
+
+This module implements ECDSA signatures based on the prime-order secp256k1 ellptic curve (i.e., cofactor is 1).
+
+
+-  [Struct `ECDSARawPublicKey`](#0x1_secp256k1_ECDSARawPublicKey)
+-  [Struct `ECDSASignature`](#0x1_secp256k1_ECDSASignature)
+-  [Constants](#@Constants_0)
+-  [Function `ecdsa_signature_from_bytes`](#0x1_secp256k1_ecdsa_signature_from_bytes)
+-  [Function `ecdsa_raw_public_key_from_64_bytes`](#0x1_secp256k1_ecdsa_raw_public_key_from_64_bytes)
+-  [Function `ecdsa_raw_public_key_to_bytes`](#0x1_secp256k1_ecdsa_raw_public_key_to_bytes)
+-  [Function `ecdsa_signature_to_bytes`](#0x1_secp256k1_ecdsa_signature_to_bytes)
+-  [Function `ecdsa_recover`](#0x1_secp256k1_ecdsa_recover)
+-  [Function `ecdsa_recover_internal`](#0x1_secp256k1_ecdsa_recover_internal)
+-  [Specification](#@Specification_1)
+    -  [Function `ecdsa_signature_from_bytes`](#@Specification_1_ecdsa_signature_from_bytes)
+    -  [Function `ecdsa_raw_public_key_from_64_bytes`](#@Specification_1_ecdsa_raw_public_key_from_64_bytes)
+    -  [Function `ecdsa_raw_public_key_to_bytes`](#@Specification_1_ecdsa_raw_public_key_to_bytes)
+    -  [Function `ecdsa_signature_to_bytes`](#@Specification_1_ecdsa_signature_to_bytes)
+    -  [Function `ecdsa_recover`](#@Specification_1_ecdsa_recover)
+    -  [Function `ecdsa_recover_internal`](#@Specification_1_ecdsa_recover_internal)
+
+
+<pre><code><b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option">0x1::option</a>;
+</code></pre>
+
+
+
+<a id="0x1_secp256k1_ECDSARawPublicKey"></a>
+
+## Struct `ECDSARawPublicKey`
+
+A 64-byte ECDSA public key.
+
+
+<pre><code><b>struct</b> <a href="secp256k1.md#0x1_secp256k1_ECDSARawPublicKey">ECDSARawPublicKey</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_secp256k1_ECDSASignature"></a>
+
+## Struct `ECDSASignature`
+
+A 64-byte ECDSA signature.
+
+
+<pre><code><b>struct</b> <a href="secp256k1.md#0x1_secp256k1_ECDSASignature">ECDSASignature</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_secp256k1_SIGNATURE_NUM_BYTES"></a>
+
+The size of a secp256k1-based ECDSA signature, in bytes.
+
+
+<pre><code><b>const</b> <a href="secp256k1.md#0x1_secp256k1_SIGNATURE_NUM_BYTES">SIGNATURE_NUM_BYTES</a>: u64 = 64;
+</code></pre>
+
+
+
+<a id="0x1_secp256k1_E_DESERIALIZE"></a>
+
+An error occurred while deserializing, for example due to wrong input size.
+
+
+<pre><code><b>const</b> <a href="secp256k1.md#0x1_secp256k1_E_DESERIALIZE">E_DESERIALIZE</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_secp256k1_RAW_PUBLIC_KEY_NUM_BYTES"></a>
+
+The size of a secp256k1-based ECDSA public key, in bytes.
+
+
+<pre><code><b>const</b> <a href="secp256k1.md#0x1_secp256k1_RAW_PUBLIC_KEY_NUM_BYTES">RAW_PUBLIC_KEY_NUM_BYTES</a>: u64 = 64;
+</code></pre>
+
+
+
+<a id="0x1_secp256k1_ecdsa_signature_from_bytes"></a>
+
+## Function `ecdsa_signature_from_bytes`
+
+Constructs an ECDSASignature struct from the given 64 bytes.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="secp256k1.md#0x1_secp256k1_ecdsa_signature_from_bytes">ecdsa_signature_from_bytes</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="secp256k1.md#0x1_secp256k1_ECDSASignature">secp256k1::ECDSASignature</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="secp256k1.md#0x1_secp256k1_ecdsa_signature_from_bytes">ecdsa_signature_from_bytes</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="secp256k1.md#0x1_secp256k1_ECDSASignature">ECDSASignature</a> {
+    <b>assert</b>!(std::vector::length(&bytes) == <a href="secp256k1.md#0x1_secp256k1_SIGNATURE_NUM_BYTES">SIGNATURE_NUM_BYTES</a>, std::error::invalid_argument(<a href="secp256k1.md#0x1_secp256k1_E_DESERIALIZE">E_DESERIALIZE</a>));
+    <a href="secp256k1.md#0x1_secp256k1_ECDSASignature">ECDSASignature</a> { bytes }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_secp256k1_ecdsa_raw_public_key_from_64_bytes"></a>
+
+## Function `ecdsa_raw_public_key_from_64_bytes`
+
+Constructs an ECDSARawPublicKey struct, given a 64-byte raw representation.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="secp256k1.md#0x1_secp256k1_ecdsa_raw_public_key_from_64_bytes">ecdsa_raw_public_key_from_64_bytes</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="secp256k1.md#0x1_secp256k1_ECDSARawPublicKey">secp256k1::ECDSARawPublicKey</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="secp256k1.md#0x1_secp256k1_ecdsa_raw_public_key_from_64_bytes">ecdsa_raw_public_key_from_64_bytes</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="secp256k1.md#0x1_secp256k1_ECDSARawPublicKey">ECDSARawPublicKey</a> {
+    <b>assert</b>!(std::vector::length(&bytes) == <a href="secp256k1.md#0x1_secp256k1_RAW_PUBLIC_KEY_NUM_BYTES">RAW_PUBLIC_KEY_NUM_BYTES</a>, std::error::invalid_argument(<a href="secp256k1.md#0x1_secp256k1_E_DESERIALIZE">E_DESERIALIZE</a>));
+    <a href="secp256k1.md#0x1_secp256k1_ECDSARawPublicKey">ECDSARawPublicKey</a> { bytes }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_secp256k1_ecdsa_raw_public_key_to_bytes"></a>
+
+## Function `ecdsa_raw_public_key_to_bytes`
+
+Serializes an ECDSARawPublicKey struct to 64-bytes.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="secp256k1.md#0x1_secp256k1_ecdsa_raw_public_key_to_bytes">ecdsa_raw_public_key_to_bytes</a>(pk: &<a href="secp256k1.md#0x1_secp256k1_ECDSARawPublicKey">secp256k1::ECDSARawPublicKey</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="secp256k1.md#0x1_secp256k1_ecdsa_raw_public_key_to_bytes">ecdsa_raw_public_key_to_bytes</a>(pk: &<a href="secp256k1.md#0x1_secp256k1_ECDSARawPublicKey">ECDSARawPublicKey</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; {
+    pk.bytes
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_secp256k1_ecdsa_signature_to_bytes"></a>
+
+## Function `ecdsa_signature_to_bytes`
+
+Serializes an ECDSASignature struct to 64-bytes.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="secp256k1.md#0x1_secp256k1_ecdsa_signature_to_bytes">ecdsa_signature_to_bytes</a>(sig: &<a href="secp256k1.md#0x1_secp256k1_ECDSASignature">secp256k1::ECDSASignature</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="secp256k1.md#0x1_secp256k1_ecdsa_signature_to_bytes">ecdsa_signature_to_bytes</a>(sig: &<a href="secp256k1.md#0x1_secp256k1_ECDSASignature">ECDSASignature</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; {
+    sig.bytes
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_secp256k1_ecdsa_recover"></a>
+
+## Function `ecdsa_recover`
+
+Recovers the signer's raw (64-byte) public key from a secp256k1 ECDSA <code>signature</code> given the <code>recovery_id</code> and the signed
+<code>message</code> (32 byte digest).
+
+Note that an invalid signature, or a signature from a different message, will result in the recovery of an
+incorrect public key. This recovery algorithm can only be used to check validity of a signature if the signer's
+public key (or its hash) is known beforehand.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="secp256k1.md#0x1_secp256k1_ecdsa_recover">ecdsa_recover</a>(message: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, recovery_id: u8, signature: &<a href="secp256k1.md#0x1_secp256k1_ECDSASignature">secp256k1::ECDSASignature</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="secp256k1.md#0x1_secp256k1_ECDSARawPublicKey">secp256k1::ECDSARawPublicKey</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="secp256k1.md#0x1_secp256k1_ecdsa_recover">ecdsa_recover</a>(
+    message: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    recovery_id: u8,
+    signature: &<a href="secp256k1.md#0x1_secp256k1_ECDSASignature">ECDSASignature</a>,
+): Option&lt;<a href="secp256k1.md#0x1_secp256k1_ECDSARawPublicKey">ECDSARawPublicKey</a>&gt; {
+    <b>let</b> (pk, success) = <a href="secp256k1.md#0x1_secp256k1_ecdsa_recover_internal">ecdsa_recover_internal</a>(message, recovery_id, signature.bytes);
+    <b>if</b> (success) {
+        std::option::some(<a href="secp256k1.md#0x1_secp256k1_ecdsa_raw_public_key_from_64_bytes">ecdsa_raw_public_key_from_64_bytes</a>(pk))
+    } <b>else</b> {
+        std::option::none&lt;<a href="secp256k1.md#0x1_secp256k1_ECDSARawPublicKey">ECDSARawPublicKey</a>&gt;()
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_secp256k1_ecdsa_recover_internal"></a>
+
+## Function `ecdsa_recover_internal`
+
+Returns <code>(public_key, <b>true</b>)</code> if <code>signature</code> verifies on <code>message</code> under the recovered <code>public_key</code>
+and returns <code>([], <b>false</b>)</code> otherwise.
+
+
+<pre><code><b>fun</b> <a href="secp256k1.md#0x1_secp256k1_ecdsa_recover_internal">ecdsa_recover_internal</a>(message: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, recovery_id: u8, signature: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): (<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, bool)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="secp256k1.md#0x1_secp256k1_ecdsa_recover_internal">ecdsa_recover_internal</a>(
+    message: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    recovery_id: u8,
+    signature: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+): (<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, bool);
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+<a id="@Specification_1_ecdsa_signature_from_bytes"></a>
+
+### Function `ecdsa_signature_from_bytes`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="secp256k1.md#0x1_secp256k1_ecdsa_signature_from_bytes">ecdsa_signature_from_bytes</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="secp256k1.md#0x1_secp256k1_ECDSASignature">secp256k1::ECDSASignature</a>
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> len(bytes) != <a href="secp256k1.md#0x1_secp256k1_SIGNATURE_NUM_BYTES">SIGNATURE_NUM_BYTES</a>;
+<b>ensures</b> result == <a href="secp256k1.md#0x1_secp256k1_ECDSASignature">ECDSASignature</a> { bytes };
+</code></pre>
+
+
+
+<a id="@Specification_1_ecdsa_raw_public_key_from_64_bytes"></a>
+
+### Function `ecdsa_raw_public_key_from_64_bytes`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="secp256k1.md#0x1_secp256k1_ecdsa_raw_public_key_from_64_bytes">ecdsa_raw_public_key_from_64_bytes</a>(bytes: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="secp256k1.md#0x1_secp256k1_ECDSARawPublicKey">secp256k1::ECDSARawPublicKey</a>
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> len(bytes) != <a href="secp256k1.md#0x1_secp256k1_RAW_PUBLIC_KEY_NUM_BYTES">RAW_PUBLIC_KEY_NUM_BYTES</a>;
+<b>ensures</b> result == <a href="secp256k1.md#0x1_secp256k1_ECDSARawPublicKey">ECDSARawPublicKey</a> { bytes };
+</code></pre>
+
+
+
+<a id="@Specification_1_ecdsa_raw_public_key_to_bytes"></a>
+
+### Function `ecdsa_raw_public_key_to_bytes`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="secp256k1.md#0x1_secp256k1_ecdsa_raw_public_key_to_bytes">ecdsa_raw_public_key_to_bytes</a>(pk: &<a href="secp256k1.md#0x1_secp256k1_ECDSARawPublicKey">secp256k1::ECDSARawPublicKey</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == pk.bytes;
+</code></pre>
+
+
+
+<a id="@Specification_1_ecdsa_signature_to_bytes"></a>
+
+### Function `ecdsa_signature_to_bytes`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="secp256k1.md#0x1_secp256k1_ecdsa_signature_to_bytes">ecdsa_signature_to_bytes</a>(sig: &<a href="secp256k1.md#0x1_secp256k1_ECDSASignature">secp256k1::ECDSASignature</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == sig.bytes;
+</code></pre>
+
+
+
+<a id="@Specification_1_ecdsa_recover"></a>
+
+### Function `ecdsa_recover`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="secp256k1.md#0x1_secp256k1_ecdsa_recover">ecdsa_recover</a>(message: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, recovery_id: u8, signature: &<a href="secp256k1.md#0x1_secp256k1_ECDSASignature">secp256k1::ECDSASignature</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="secp256k1.md#0x1_secp256k1_ECDSARawPublicKey">secp256k1::ECDSARawPublicKey</a>&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <a href="secp256k1.md#0x1_secp256k1_ecdsa_recover_internal_abort_condition">ecdsa_recover_internal_abort_condition</a>(message, recovery_id, signature.bytes);
+<b>let</b> pk = <a href="secp256k1.md#0x1_secp256k1_spec_ecdsa_recover_internal_result_1">spec_ecdsa_recover_internal_result_1</a>(message, recovery_id, signature.bytes);
+<b>let</b> success = <a href="secp256k1.md#0x1_secp256k1_spec_ecdsa_recover_internal_result_2">spec_ecdsa_recover_internal_result_2</a>(message, recovery_id, signature.bytes);
+<b>ensures</b> success ==&gt; result == std::option::spec_some(<a href="secp256k1.md#0x1_secp256k1_ecdsa_raw_public_key_from_64_bytes">ecdsa_raw_public_key_from_64_bytes</a>(pk));
+<b>ensures</b> !success ==&gt; result == std::option::spec_none&lt;<a href="secp256k1.md#0x1_secp256k1_ECDSARawPublicKey">ECDSARawPublicKey</a>&gt;();
+</code></pre>
+
+
+
+<a id="@Specification_1_ecdsa_recover_internal"></a>
+
+### Function `ecdsa_recover_internal`
+
+
+<pre><code><b>fun</b> <a href="secp256k1.md#0x1_secp256k1_ecdsa_recover_internal">ecdsa_recover_internal</a>(message: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, recovery_id: u8, signature: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): (<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, bool)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <a href="secp256k1.md#0x1_secp256k1_ecdsa_recover_internal_abort_condition">ecdsa_recover_internal_abort_condition</a>(message, recovery_id, signature);
+<b>ensures</b> result_1 == <a href="secp256k1.md#0x1_secp256k1_spec_ecdsa_recover_internal_result_1">spec_ecdsa_recover_internal_result_1</a>(message, recovery_id, signature);
+<b>ensures</b> result_2 == <a href="secp256k1.md#0x1_secp256k1_spec_ecdsa_recover_internal_result_2">spec_ecdsa_recover_internal_result_2</a>(message, recovery_id, signature);
+<b>ensures</b> len(result_1) == <b>if</b> (result_2) { <a href="secp256k1.md#0x1_secp256k1_RAW_PUBLIC_KEY_NUM_BYTES">RAW_PUBLIC_KEY_NUM_BYTES</a> } <b>else</b> { 0 };
+</code></pre>
+
+
+
+
+<a id="0x1_secp256k1_ecdsa_recover_internal_abort_condition"></a>
+
+
+<pre><code><b>fun</b> <a href="secp256k1.md#0x1_secp256k1_ecdsa_recover_internal_abort_condition">ecdsa_recover_internal_abort_condition</a>(message: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, recovery_id: u8, signature: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool;
+</code></pre>
+
+
+
+
+<a id="0x1_secp256k1_spec_ecdsa_recover_internal_result_1"></a>
+
+
+<pre><code><b>fun</b> <a href="secp256k1.md#0x1_secp256k1_spec_ecdsa_recover_internal_result_1">spec_ecdsa_recover_internal_result_1</a>(message: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, recovery_id: u8, signature: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+</code></pre>
+
+
+
+
+<a id="0x1_secp256k1_spec_ecdsa_recover_internal_result_2"></a>
+
+
+<pre><code><b>fun</b> <a href="secp256k1.md#0x1_secp256k1_spec_ecdsa_recover_internal_result_2">spec_ecdsa_recover_internal_result_2</a>(message: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, recovery_id: u8, signature: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool;
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/simple_map.md b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/simple_map.md
new file mode 100644
index 0000000000000..df818cb386c6f
--- /dev/null
+++ b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/simple_map.md
@@ -0,0 +1,1033 @@
+
+<a id="0x1_simple_map"></a>
+
+# Module `0x1::simple_map`
+
+This module provides a solution for unsorted maps, that is it has the properties that
+1) Keys point to Values
+2) Each Key must be unique
+3) A Key can be found within O(N) time
+4) The keys are unsorted.
+5) Adds and removals take O(N) time
+
+
+-  [Struct `SimpleMap`](#0x1_simple_map_SimpleMap)
+-  [Struct `Element`](#0x1_simple_map_Element)
+-  [Constants](#@Constants_0)
+-  [Function `length`](#0x1_simple_map_length)
+-  [Function `new`](#0x1_simple_map_new)
+-  [Function `new_from`](#0x1_simple_map_new_from)
+-  [Function `create`](#0x1_simple_map_create)
+-  [Function `borrow`](#0x1_simple_map_borrow)
+-  [Function `borrow_mut`](#0x1_simple_map_borrow_mut)
+-  [Function `contains_key`](#0x1_simple_map_contains_key)
+-  [Function `destroy_empty`](#0x1_simple_map_destroy_empty)
+-  [Function `add`](#0x1_simple_map_add)
+-  [Function `add_all`](#0x1_simple_map_add_all)
+-  [Function `upsert`](#0x1_simple_map_upsert)
+-  [Function `keys`](#0x1_simple_map_keys)
+-  [Function `values`](#0x1_simple_map_values)
+-  [Function `to_vec_pair`](#0x1_simple_map_to_vec_pair)
+-  [Function `destroy`](#0x1_simple_map_destroy)
+-  [Function `remove`](#0x1_simple_map_remove)
+-  [Function `find`](#0x1_simple_map_find)
+-  [Specification](#@Specification_1)
+    -  [Struct `SimpleMap`](#@Specification_1_SimpleMap)
+    -  [Function `length`](#@Specification_1_length)
+    -  [Function `new`](#@Specification_1_new)
+    -  [Function `new_from`](#@Specification_1_new_from)
+    -  [Function `create`](#@Specification_1_create)
+    -  [Function `borrow`](#@Specification_1_borrow)
+    -  [Function `borrow_mut`](#@Specification_1_borrow_mut)
+    -  [Function `contains_key`](#@Specification_1_contains_key)
+    -  [Function `destroy_empty`](#@Specification_1_destroy_empty)
+    -  [Function `add`](#@Specification_1_add)
+    -  [Function `add_all`](#@Specification_1_add_all)
+    -  [Function `upsert`](#@Specification_1_upsert)
+    -  [Function `keys`](#@Specification_1_keys)
+    -  [Function `values`](#@Specification_1_values)
+    -  [Function `to_vec_pair`](#@Specification_1_to_vec_pair)
+    -  [Function `remove`](#@Specification_1_remove)
+    -  [Function `find`](#@Specification_1_find)
+
+
+<pre><code><b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option">0x1::option</a>;
+<b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">0x1::vector</a>;
+</code></pre>
+
+
+
+<a id="0x1_simple_map_SimpleMap"></a>
+
+## Struct `SimpleMap`
+
+
+
+<pre><code><b>struct</b> <a href="simple_map.md#0x1_simple_map_SimpleMap">SimpleMap</a>&lt;Key, Value&gt; <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>data: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="simple_map.md#0x1_simple_map_Element">simple_map::Element</a>&lt;Key, Value&gt;&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_simple_map_Element"></a>
+
+## Struct `Element`
+
+
+
+<pre><code><b>struct</b> <a href="simple_map.md#0x1_simple_map_Element">Element</a>&lt;Key, Value&gt; <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>key: Key</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>value: Value</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_simple_map_EKEY_ALREADY_EXISTS"></a>
+
+Map key already exists
+
+
+<pre><code><b>const</b> <a href="simple_map.md#0x1_simple_map_EKEY_ALREADY_EXISTS">EKEY_ALREADY_EXISTS</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_simple_map_EKEY_NOT_FOUND"></a>
+
+Map key is not found
+
+
+<pre><code><b>const</b> <a href="simple_map.md#0x1_simple_map_EKEY_NOT_FOUND">EKEY_NOT_FOUND</a>: u64 = 2;
+</code></pre>
+
+
+
+<a id="0x1_simple_map_length"></a>
+
+## Function `length`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="simple_map.md#0x1_simple_map_length">length</a>&lt;Key: store, Value: store&gt;(map: &<a href="simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;Key, Value&gt;): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="simple_map.md#0x1_simple_map_length">length</a>&lt;Key: store, Value: store&gt;(map: &<a href="simple_map.md#0x1_simple_map_SimpleMap">SimpleMap</a>&lt;Key, Value&gt;): u64 {
+    <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&map.data)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_simple_map_new"></a>
+
+## Function `new`
+
+Create an empty SimpleMap.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="simple_map.md#0x1_simple_map_new">new</a>&lt;Key: store, Value: store&gt;(): <a href="simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;Key, Value&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="simple_map.md#0x1_simple_map_new">new</a>&lt;Key: store, Value: store&gt;(): <a href="simple_map.md#0x1_simple_map_SimpleMap">SimpleMap</a>&lt;Key, Value&gt; {
+    <a href="simple_map.md#0x1_simple_map_SimpleMap">SimpleMap</a> {
+        data: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_empty">vector::empty</a>(),
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_simple_map_new_from"></a>
+
+## Function `new_from`
+
+Create a SimpleMap from a vector of keys and values. The keys must be unique.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="simple_map.md#0x1_simple_map_new_from">new_from</a>&lt;Key: store, Value: store&gt;(keys: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;Key&gt;, values: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;Value&gt;): <a href="simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;Key, Value&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="simple_map.md#0x1_simple_map_new_from">new_from</a>&lt;Key: store, Value: store&gt;(
+    keys: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;Key&gt;,
+    values: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;Value&gt;,
+): <a href="simple_map.md#0x1_simple_map_SimpleMap">SimpleMap</a>&lt;Key, Value&gt; {
+    <b>let</b> map = <a href="simple_map.md#0x1_simple_map_new">new</a>();
+    <a href="simple_map.md#0x1_simple_map_add_all">add_all</a>(&<b>mut</b> map, keys, values);
+    map
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_simple_map_create"></a>
+
+## Function `create`
+
+Create an empty SimpleMap.
+This function is deprecated, use <code>new</code> instead.
+
+
+<pre><code>#[deprecated]
+<b>public</b> <b>fun</b> <a href="simple_map.md#0x1_simple_map_create">create</a>&lt;Key: store, Value: store&gt;(): <a href="simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;Key, Value&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="simple_map.md#0x1_simple_map_create">create</a>&lt;Key: store, Value: store&gt;(): <a href="simple_map.md#0x1_simple_map_SimpleMap">SimpleMap</a>&lt;Key, Value&gt; {
+    <a href="simple_map.md#0x1_simple_map_new">new</a>()
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_simple_map_borrow"></a>
+
+## Function `borrow`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="simple_map.md#0x1_simple_map_borrow">borrow</a>&lt;Key: store, Value: store&gt;(map: &<a href="simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;Key, Value&gt;, key: &Key): &Value
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="simple_map.md#0x1_simple_map_borrow">borrow</a>&lt;Key: store, Value: store&gt;(
+    map: &<a href="simple_map.md#0x1_simple_map_SimpleMap">SimpleMap</a>&lt;Key, Value&gt;,
+    key: &Key,
+): &Value {
+    <b>let</b> maybe_idx = <a href="simple_map.md#0x1_simple_map_find">find</a>(map, key);
+    <b>assert</b>!(<a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&maybe_idx), <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="simple_map.md#0x1_simple_map_EKEY_NOT_FOUND">EKEY_NOT_FOUND</a>));
+    <b>let</b> idx = <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_extract">option::extract</a>(&<b>mut</b> maybe_idx);
+    &<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(&map.data, idx).value
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_simple_map_borrow_mut"></a>
+
+## Function `borrow_mut`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="simple_map.md#0x1_simple_map_borrow_mut">borrow_mut</a>&lt;Key: store, Value: store&gt;(map: &<b>mut</b> <a href="simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;Key, Value&gt;, key: &Key): &<b>mut</b> Value
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="simple_map.md#0x1_simple_map_borrow_mut">borrow_mut</a>&lt;Key: store, Value: store&gt;(
+    map: &<b>mut</b> <a href="simple_map.md#0x1_simple_map_SimpleMap">SimpleMap</a>&lt;Key, Value&gt;,
+    key: &Key,
+): &<b>mut</b> Value {
+    <b>let</b> maybe_idx = <a href="simple_map.md#0x1_simple_map_find">find</a>(map, key);
+    <b>assert</b>!(<a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&maybe_idx), <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="simple_map.md#0x1_simple_map_EKEY_NOT_FOUND">EKEY_NOT_FOUND</a>));
+    <b>let</b> idx = <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_extract">option::extract</a>(&<b>mut</b> maybe_idx);
+    &<b>mut</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow_mut">vector::borrow_mut</a>(&<b>mut</b> map.data, idx).value
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_simple_map_contains_key"></a>
+
+## Function `contains_key`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="simple_map.md#0x1_simple_map_contains_key">contains_key</a>&lt;Key: store, Value: store&gt;(map: &<a href="simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;Key, Value&gt;, key: &Key): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="simple_map.md#0x1_simple_map_contains_key">contains_key</a>&lt;Key: store, Value: store&gt;(
+    map: &<a href="simple_map.md#0x1_simple_map_SimpleMap">SimpleMap</a>&lt;Key, Value&gt;,
+    key: &Key,
+): bool {
+    <b>let</b> maybe_idx = <a href="simple_map.md#0x1_simple_map_find">find</a>(map, key);
+    <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&maybe_idx)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_simple_map_destroy_empty"></a>
+
+## Function `destroy_empty`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="simple_map.md#0x1_simple_map_destroy_empty">destroy_empty</a>&lt;Key: store, Value: store&gt;(map: <a href="simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;Key, Value&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="simple_map.md#0x1_simple_map_destroy_empty">destroy_empty</a>&lt;Key: store, Value: store&gt;(map: <a href="simple_map.md#0x1_simple_map_SimpleMap">SimpleMap</a>&lt;Key, Value&gt;) {
+    <b>let</b> <a href="simple_map.md#0x1_simple_map_SimpleMap">SimpleMap</a> { data } = map;
+    <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_destroy_empty">vector::destroy_empty</a>(data);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_simple_map_add"></a>
+
+## Function `add`
+
+Add a key/value pair to the map. The key must not already exist.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="simple_map.md#0x1_simple_map_add">add</a>&lt;Key: store, Value: store&gt;(map: &<b>mut</b> <a href="simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;Key, Value&gt;, key: Key, value: Value)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="simple_map.md#0x1_simple_map_add">add</a>&lt;Key: store, Value: store&gt;(
+    map: &<b>mut</b> <a href="simple_map.md#0x1_simple_map_SimpleMap">SimpleMap</a>&lt;Key, Value&gt;,
+    key: Key,
+    value: Value,
+) {
+    <b>let</b> maybe_idx = <a href="simple_map.md#0x1_simple_map_find">find</a>(map, &key);
+    <b>assert</b>!(<a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_none">option::is_none</a>(&maybe_idx), <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="simple_map.md#0x1_simple_map_EKEY_ALREADY_EXISTS">EKEY_ALREADY_EXISTS</a>));
+
+    <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_push_back">vector::push_back</a>(&<b>mut</b> map.data, <a href="simple_map.md#0x1_simple_map_Element">Element</a> { key, value });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_simple_map_add_all"></a>
+
+## Function `add_all`
+
+Add multiple key/value pairs to the map. The keys must not already exist.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="simple_map.md#0x1_simple_map_add_all">add_all</a>&lt;Key: store, Value: store&gt;(map: &<b>mut</b> <a href="simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;Key, Value&gt;, keys: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;Key&gt;, values: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;Value&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="simple_map.md#0x1_simple_map_add_all">add_all</a>&lt;Key: store, Value: store&gt;(
+    map: &<b>mut</b> <a href="simple_map.md#0x1_simple_map_SimpleMap">SimpleMap</a>&lt;Key, Value&gt;,
+    keys: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;Key&gt;,
+    values: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;Value&gt;,
+) {
+    <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_zip">vector::zip</a>(keys, values, |key, value| {
+        <a href="simple_map.md#0x1_simple_map_add">add</a>(map, key, value);
+    });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_simple_map_upsert"></a>
+
+## Function `upsert`
+
+Insert key/value pair or update an existing key to a new value
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="simple_map.md#0x1_simple_map_upsert">upsert</a>&lt;Key: store, Value: store&gt;(map: &<b>mut</b> <a href="simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;Key, Value&gt;, key: Key, value: Value): (<a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;Key&gt;, <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;Value&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="simple_map.md#0x1_simple_map_upsert">upsert</a>&lt;Key: store, Value: store&gt;(
+    map: &<b>mut</b> <a href="simple_map.md#0x1_simple_map_SimpleMap">SimpleMap</a>&lt;Key, Value&gt;,
+    key: Key,
+    value: Value
+): (std::option::Option&lt;Key&gt;, std::option::Option&lt;Value&gt;) {
+    <b>let</b> data = &<b>mut</b> map.data;
+    <b>let</b> len = <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(data);
+    <b>let</b> i = 0;
+    <b>while</b> (i &lt; len) {
+        <b>let</b> element = <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(data, i);
+        <b>if</b> (&element.key == &key) {
+            <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_push_back">vector::push_back</a>(data, <a href="simple_map.md#0x1_simple_map_Element">Element</a> { key, value });
+            <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_swap">vector::swap</a>(data, i, len);
+            <b>let</b> <a href="simple_map.md#0x1_simple_map_Element">Element</a> { key, value } = <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_pop_back">vector::pop_back</a>(data);
+            <b>return</b> (std::option::some(key), std::option::some(value))
+        };
+        i = i + 1;
+    };
+    <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_push_back">vector::push_back</a>(&<b>mut</b> map.data, <a href="simple_map.md#0x1_simple_map_Element">Element</a> { key, value });
+    (std::option::none(), std::option::none())
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_simple_map_keys"></a>
+
+## Function `keys`
+
+Return all keys in the map. This requires keys to be copyable.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="simple_map.md#0x1_simple_map_keys">keys</a>&lt;Key: <b>copy</b>, Value&gt;(map: &<a href="simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;Key, Value&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;Key&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="simple_map.md#0x1_simple_map_keys">keys</a>&lt;Key: <b>copy</b>, Value&gt;(map: &<a href="simple_map.md#0x1_simple_map_SimpleMap">SimpleMap</a>&lt;Key, Value&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;Key&gt; {
+    <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_map_ref">vector::map_ref</a>(&map.data, |e| {
+        <b>let</b> e: &<a href="simple_map.md#0x1_simple_map_Element">Element</a>&lt;Key, Value&gt; = e;
+        e.key
+    })
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_simple_map_values"></a>
+
+## Function `values`
+
+Return all values in the map. This requires values to be copyable.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="simple_map.md#0x1_simple_map_values">values</a>&lt;Key, Value: <b>copy</b>&gt;(map: &<a href="simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;Key, Value&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;Value&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="simple_map.md#0x1_simple_map_values">values</a>&lt;Key, Value: <b>copy</b>&gt;(map: &<a href="simple_map.md#0x1_simple_map_SimpleMap">SimpleMap</a>&lt;Key, Value&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;Value&gt; {
+    <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_map_ref">vector::map_ref</a>(&map.data, |e| {
+        <b>let</b> e: &<a href="simple_map.md#0x1_simple_map_Element">Element</a>&lt;Key, Value&gt; = e;
+        e.value
+    })
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_simple_map_to_vec_pair"></a>
+
+## Function `to_vec_pair`
+
+Transform the map into two vectors with the keys and values respectively
+Primarily used to destroy a map
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="simple_map.md#0x1_simple_map_to_vec_pair">to_vec_pair</a>&lt;Key: store, Value: store&gt;(map: <a href="simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;Key, Value&gt;): (<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;Key&gt;, <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;Value&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="simple_map.md#0x1_simple_map_to_vec_pair">to_vec_pair</a>&lt;Key: store, Value: store&gt;(
+    map: <a href="simple_map.md#0x1_simple_map_SimpleMap">SimpleMap</a>&lt;Key, Value&gt;): (<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;Key&gt;, <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;Value&gt;) {
+    <b>let</b> keys: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;Key&gt; = <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_empty">vector::empty</a>();
+    <b>let</b> values: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;Value&gt; = <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_empty">vector::empty</a>();
+    <b>let</b> <a href="simple_map.md#0x1_simple_map_SimpleMap">SimpleMap</a> { data } = map;
+    <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_for_each">vector::for_each</a>(data, |e| {
+        <b>let</b> <a href="simple_map.md#0x1_simple_map_Element">Element</a> { key, value } = e;
+        <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_push_back">vector::push_back</a>(&<b>mut</b> keys, key);
+        <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_push_back">vector::push_back</a>(&<b>mut</b> values, value);
+    });
+    (keys, values)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_simple_map_destroy"></a>
+
+## Function `destroy`
+
+For maps that cannot be dropped this is a utility to destroy them
+using lambdas to destroy the individual keys and values.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="simple_map.md#0x1_simple_map_destroy">destroy</a>&lt;Key: store, Value: store&gt;(map: <a href="simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;Key, Value&gt;, dk: |Key|, dv: |Value|)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="simple_map.md#0x1_simple_map_destroy">destroy</a>&lt;Key: store, Value: store&gt;(
+    map: <a href="simple_map.md#0x1_simple_map_SimpleMap">SimpleMap</a>&lt;Key, Value&gt;,
+    dk: |Key|,
+    dv: |Value|
+) {
+    <b>let</b> (keys, values) = <a href="simple_map.md#0x1_simple_map_to_vec_pair">to_vec_pair</a>(map);
+    <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_destroy">vector::destroy</a>(keys, |_k| dk(_k));
+    <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_destroy">vector::destroy</a>(values, |_v| dv(_v));
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_simple_map_remove"></a>
+
+## Function `remove`
+
+Remove a key/value pair from the map. The key must exist.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="simple_map.md#0x1_simple_map_remove">remove</a>&lt;Key: store, Value: store&gt;(map: &<b>mut</b> <a href="simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;Key, Value&gt;, key: &Key): (Key, Value)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="simple_map.md#0x1_simple_map_remove">remove</a>&lt;Key: store, Value: store&gt;(
+    map: &<b>mut</b> <a href="simple_map.md#0x1_simple_map_SimpleMap">SimpleMap</a>&lt;Key, Value&gt;,
+    key: &Key,
+): (Key, Value) {
+    <b>let</b> maybe_idx = <a href="simple_map.md#0x1_simple_map_find">find</a>(map, key);
+    <b>assert</b>!(<a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&maybe_idx), <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="simple_map.md#0x1_simple_map_EKEY_NOT_FOUND">EKEY_NOT_FOUND</a>));
+    <b>let</b> placement = <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_extract">option::extract</a>(&<b>mut</b> maybe_idx);
+    <b>let</b> <a href="simple_map.md#0x1_simple_map_Element">Element</a> { key, value } = <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_swap_remove">vector::swap_remove</a>(&<b>mut</b> map.data, placement);
+    (key, value)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_simple_map_find"></a>
+
+## Function `find`
+
+
+
+<pre><code><b>fun</b> <a href="simple_map.md#0x1_simple_map_find">find</a>&lt;Key: store, Value: store&gt;(map: &<a href="simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;Key, Value&gt;, key: &Key): <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;u64&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="simple_map.md#0x1_simple_map_find">find</a>&lt;Key: store, Value: store&gt;(
+    map: &<a href="simple_map.md#0x1_simple_map_SimpleMap">SimpleMap</a>&lt;Key, Value&gt;,
+    key: &Key,
+): <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;u64&gt; {
+    <b>let</b> leng = <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&map.data);
+    <b>let</b> i = 0;
+    <b>while</b> (i &lt; leng) {
+        <b>let</b> element = <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(&map.data, i);
+        <b>if</b> (&element.key == key) {
+            <b>return</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(i)
+        };
+        i = i + 1;
+    };
+    <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>&lt;u64&gt;()
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+<a id="@Specification_1_SimpleMap"></a>
+
+### Struct `SimpleMap`
+
+
+<pre><code><b>struct</b> <a href="simple_map.md#0x1_simple_map_SimpleMap">SimpleMap</a>&lt;Key, Value&gt; <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<dl>
+<dt>
+<code>data: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="simple_map.md#0x1_simple_map_Element">simple_map::Element</a>&lt;Key, Value&gt;&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+
+<pre><code><b>pragma</b> intrinsic = map,
+    map_new = create,
+    map_len = length,
+    map_destroy_empty = destroy_empty,
+    map_has_key = contains_key,
+    map_add_no_override = add,
+    map_del_return_key = remove,
+    map_borrow = borrow,
+    map_borrow_mut = borrow_mut,
+    map_spec_get = spec_get,
+    map_spec_set = spec_set,
+    map_spec_del = spec_remove,
+    map_spec_len = spec_len,
+    map_spec_has_key = spec_contains_key;
+</code></pre>
+
+
+
+<a id="@Specification_1_length"></a>
+
+### Function `length`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="simple_map.md#0x1_simple_map_length">length</a>&lt;Key: store, Value: store&gt;(map: &<a href="simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;Key, Value&gt;): u64
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> intrinsic;
+</code></pre>
+
+
+
+<a id="@Specification_1_new"></a>
+
+### Function `new`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="simple_map.md#0x1_simple_map_new">new</a>&lt;Key: store, Value: store&gt;(): <a href="simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;Key, Value&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> intrinsic;
+<b>pragma</b> opaque;
+<b>aborts_if</b> [abstract] <b>false</b>;
+<b>ensures</b> [abstract] <a href="simple_map.md#0x1_simple_map_spec_len">spec_len</a>(result) == 0;
+<b>ensures</b> [abstract] <b>forall</b> k: Key: !<a href="simple_map.md#0x1_simple_map_spec_contains_key">spec_contains_key</a>(result, k);
+</code></pre>
+
+
+
+<a id="@Specification_1_new_from"></a>
+
+### Function `new_from`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="simple_map.md#0x1_simple_map_new_from">new_from</a>&lt;Key: store, Value: store&gt;(keys: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;Key&gt;, values: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;Value&gt;): <a href="simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;Key, Value&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> intrinsic;
+<b>pragma</b> opaque;
+<b>aborts_if</b> [abstract] <b>false</b>;
+<b>ensures</b> [abstract] <a href="simple_map.md#0x1_simple_map_spec_len">spec_len</a>(result) == len(keys);
+<b>ensures</b> [abstract] <b>forall</b> k: Key: <a href="simple_map.md#0x1_simple_map_spec_contains_key">spec_contains_key</a>(result, k) &lt;==&gt; <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_spec_contains">vector::spec_contains</a>(keys, k);
+<b>ensures</b> [abstract] <b>forall</b> i in 0..len(keys):
+    <a href="simple_map.md#0x1_simple_map_spec_get">spec_get</a>(result, <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(keys, i)) == <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(values, i);
+</code></pre>
+
+
+
+<a id="@Specification_1_create"></a>
+
+### Function `create`
+
+
+<pre><code>#[deprecated]
+<b>public</b> <b>fun</b> <a href="simple_map.md#0x1_simple_map_create">create</a>&lt;Key: store, Value: store&gt;(): <a href="simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;Key, Value&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> intrinsic;
+</code></pre>
+
+
+
+<a id="@Specification_1_borrow"></a>
+
+### Function `borrow`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="simple_map.md#0x1_simple_map_borrow">borrow</a>&lt;Key: store, Value: store&gt;(map: &<a href="simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;Key, Value&gt;, key: &Key): &Value
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> intrinsic;
+</code></pre>
+
+
+
+<a id="@Specification_1_borrow_mut"></a>
+
+### Function `borrow_mut`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="simple_map.md#0x1_simple_map_borrow_mut">borrow_mut</a>&lt;Key: store, Value: store&gt;(map: &<b>mut</b> <a href="simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;Key, Value&gt;, key: &Key): &<b>mut</b> Value
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> intrinsic;
+</code></pre>
+
+
+
+<a id="@Specification_1_contains_key"></a>
+
+### Function `contains_key`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="simple_map.md#0x1_simple_map_contains_key">contains_key</a>&lt;Key: store, Value: store&gt;(map: &<a href="simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;Key, Value&gt;, key: &Key): bool
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> intrinsic;
+</code></pre>
+
+
+
+<a id="@Specification_1_destroy_empty"></a>
+
+### Function `destroy_empty`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="simple_map.md#0x1_simple_map_destroy_empty">destroy_empty</a>&lt;Key: store, Value: store&gt;(map: <a href="simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;Key, Value&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> intrinsic;
+</code></pre>
+
+
+
+<a id="@Specification_1_add"></a>
+
+### Function `add`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="simple_map.md#0x1_simple_map_add">add</a>&lt;Key: store, Value: store&gt;(map: &<b>mut</b> <a href="simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;Key, Value&gt;, key: Key, value: Value)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> intrinsic;
+</code></pre>
+
+
+
+<a id="@Specification_1_add_all"></a>
+
+### Function `add_all`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="simple_map.md#0x1_simple_map_add_all">add_all</a>&lt;Key: store, Value: store&gt;(map: &<b>mut</b> <a href="simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;Key, Value&gt;, keys: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;Key&gt;, values: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;Value&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> intrinsic;
+</code></pre>
+
+
+
+<a id="@Specification_1_upsert"></a>
+
+### Function `upsert`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="simple_map.md#0x1_simple_map_upsert">upsert</a>&lt;Key: store, Value: store&gt;(map: &<b>mut</b> <a href="simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;Key, Value&gt;, key: Key, value: Value): (<a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;Key&gt;, <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;Value&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> intrinsic;
+<b>pragma</b> opaque;
+<b>aborts_if</b> [abstract] <b>false</b>;
+<b>ensures</b> [abstract] !<a href="simple_map.md#0x1_simple_map_spec_contains_key">spec_contains_key</a>(<b>old</b>(map), key) ==&gt; <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_none">option::is_none</a>(result_1);
+<b>ensures</b> [abstract] !<a href="simple_map.md#0x1_simple_map_spec_contains_key">spec_contains_key</a>(<b>old</b>(map), key) ==&gt; <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_none">option::is_none</a>(result_2);
+<b>ensures</b> [abstract] <a href="simple_map.md#0x1_simple_map_spec_contains_key">spec_contains_key</a>(map, key);
+<b>ensures</b> [abstract] <a href="simple_map.md#0x1_simple_map_spec_get">spec_get</a>(map, key) == value;
+<b>ensures</b> [abstract] <a href="simple_map.md#0x1_simple_map_spec_contains_key">spec_contains_key</a>(<b>old</b>(map), key) ==&gt; ((<a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(result_1)) && (<a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_borrow">option::spec_borrow</a>(result_1) == key));
+<b>ensures</b> [abstract] <a href="simple_map.md#0x1_simple_map_spec_contains_key">spec_contains_key</a>(<b>old</b>(map), key) ==&gt; ((<a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(result_2)) && (<a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_borrow">option::spec_borrow</a>(result_2) == <a href="simple_map.md#0x1_simple_map_spec_get">spec_get</a>(<b>old</b>(map), key)));
+</code></pre>
+
+
+
+
+<a id="0x1_simple_map_spec_len"></a>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="simple_map.md#0x1_simple_map_spec_len">spec_len</a>&lt;K, V&gt;(t: <a href="simple_map.md#0x1_simple_map_SimpleMap">SimpleMap</a>&lt;K, V&gt;): num;
+</code></pre>
+
+
+
+
+<a id="0x1_simple_map_spec_contains_key"></a>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="simple_map.md#0x1_simple_map_spec_contains_key">spec_contains_key</a>&lt;K, V&gt;(t: <a href="simple_map.md#0x1_simple_map_SimpleMap">SimpleMap</a>&lt;K, V&gt;, k: K): bool;
+</code></pre>
+
+
+
+
+<a id="0x1_simple_map_spec_set"></a>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="simple_map.md#0x1_simple_map_spec_set">spec_set</a>&lt;K, V&gt;(t: <a href="simple_map.md#0x1_simple_map_SimpleMap">SimpleMap</a>&lt;K, V&gt;, k: K, v: V): <a href="simple_map.md#0x1_simple_map_SimpleMap">SimpleMap</a>&lt;K, V&gt;;
+</code></pre>
+
+
+
+
+<a id="0x1_simple_map_spec_remove"></a>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="simple_map.md#0x1_simple_map_spec_remove">spec_remove</a>&lt;K, V&gt;(t: <a href="simple_map.md#0x1_simple_map_SimpleMap">SimpleMap</a>&lt;K, V&gt;, k: K): <a href="simple_map.md#0x1_simple_map_SimpleMap">SimpleMap</a>&lt;K, V&gt;;
+</code></pre>
+
+
+
+
+<a id="0x1_simple_map_spec_get"></a>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="simple_map.md#0x1_simple_map_spec_get">spec_get</a>&lt;K, V&gt;(t: <a href="simple_map.md#0x1_simple_map_SimpleMap">SimpleMap</a>&lt;K, V&gt;, k: K): V;
+</code></pre>
+
+
+
+<a id="@Specification_1_keys"></a>
+
+### Function `keys`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="simple_map.md#0x1_simple_map_keys">keys</a>&lt;Key: <b>copy</b>, Value&gt;(map: &<a href="simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;Key, Value&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;Key&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify=<b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_values"></a>
+
+### Function `values`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="simple_map.md#0x1_simple_map_values">values</a>&lt;Key, Value: <b>copy</b>&gt;(map: &<a href="simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;Key, Value&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;Value&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify=<b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_to_vec_pair"></a>
+
+### Function `to_vec_pair`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="simple_map.md#0x1_simple_map_to_vec_pair">to_vec_pair</a>&lt;Key: store, Value: store&gt;(map: <a href="simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;Key, Value&gt;): (<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;Key&gt;, <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;Value&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> intrinsic;
+<b>pragma</b> opaque;
+<b>ensures</b> [abstract]
+    <b>forall</b> k: Key: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_spec_contains">vector::spec_contains</a>(result_1, k) &lt;==&gt;
+        <a href="simple_map.md#0x1_simple_map_spec_contains_key">spec_contains_key</a>(map, k);
+<b>ensures</b> [abstract] <b>forall</b> i in 0..len(result_1):
+    <a href="simple_map.md#0x1_simple_map_spec_get">spec_get</a>(map, <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(result_1, i)) == <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(result_2, i);
+</code></pre>
+
+
+
+<a id="@Specification_1_remove"></a>
+
+### Function `remove`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="simple_map.md#0x1_simple_map_remove">remove</a>&lt;Key: store, Value: store&gt;(map: &<b>mut</b> <a href="simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;Key, Value&gt;, key: &Key): (Key, Value)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> intrinsic;
+</code></pre>
+
+
+
+<a id="@Specification_1_find"></a>
+
+### Function `find`
+
+
+<pre><code><b>fun</b> <a href="simple_map.md#0x1_simple_map_find">find</a>&lt;Key: store, Value: store&gt;(map: &<a href="simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;Key, Value&gt;, key: &Key): <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;u64&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify=<b>false</b>;
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/smart_table.md b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/smart_table.md
new file mode 100644
index 0000000000000..b28f1a0800579
--- /dev/null
+++ b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/smart_table.md
@@ -0,0 +1,1786 @@
+
+<a id="0x1_smart_table"></a>
+
+# Module `0x1::smart_table`
+
+A smart table implementation based on linear hashing. (https://en.wikipedia.org/wiki/Linear_hashing)
+Compare to Table, it uses less storage slots but has higher chance of collision, a trade-off between space and time.
+Compare to other dynamic hashing implementation, linear hashing splits one bucket a time instead of doubling buckets
+when expanding to avoid unexpected gas cost.
+SmartTable uses faster hash function SipHash instead of cryptographically secure hash functions like sha3-256 since
+it tolerates collisions.
+
+
+-  [Struct `Entry`](#0x1_smart_table_Entry)
+-  [Struct `SmartTable`](#0x1_smart_table_SmartTable)
+-  [Constants](#@Constants_0)
+-  [Function `new`](#0x1_smart_table_new)
+-  [Function `new_with_config`](#0x1_smart_table_new_with_config)
+-  [Function `destroy_empty`](#0x1_smart_table_destroy_empty)
+-  [Function `destroy`](#0x1_smart_table_destroy)
+-  [Function `clear`](#0x1_smart_table_clear)
+-  [Function `add`](#0x1_smart_table_add)
+-  [Function `add_all`](#0x1_smart_table_add_all)
+-  [Function `unzip_entries`](#0x1_smart_table_unzip_entries)
+-  [Function `to_simple_map`](#0x1_smart_table_to_simple_map)
+-  [Function `keys`](#0x1_smart_table_keys)
+-  [Function `keys_paginated`](#0x1_smart_table_keys_paginated)
+-  [Function `split_one_bucket`](#0x1_smart_table_split_one_bucket)
+-  [Function `bucket_index`](#0x1_smart_table_bucket_index)
+-  [Function `borrow`](#0x1_smart_table_borrow)
+-  [Function `borrow_with_default`](#0x1_smart_table_borrow_with_default)
+-  [Function `borrow_mut`](#0x1_smart_table_borrow_mut)
+-  [Function `borrow_mut_with_default`](#0x1_smart_table_borrow_mut_with_default)
+-  [Function `contains`](#0x1_smart_table_contains)
+-  [Function `remove`](#0x1_smart_table_remove)
+-  [Function `upsert`](#0x1_smart_table_upsert)
+-  [Function `length`](#0x1_smart_table_length)
+-  [Function `load_factor`](#0x1_smart_table_load_factor)
+-  [Function `update_split_load_threshold`](#0x1_smart_table_update_split_load_threshold)
+-  [Function `update_target_bucket_size`](#0x1_smart_table_update_target_bucket_size)
+-  [Function `for_each_ref`](#0x1_smart_table_for_each_ref)
+-  [Function `for_each_mut`](#0x1_smart_table_for_each_mut)
+-  [Function `map_ref`](#0x1_smart_table_map_ref)
+-  [Function `any`](#0x1_smart_table_any)
+-  [Function `borrow_kv`](#0x1_smart_table_borrow_kv)
+-  [Function `borrow_kv_mut`](#0x1_smart_table_borrow_kv_mut)
+-  [Function `num_buckets`](#0x1_smart_table_num_buckets)
+-  [Function `borrow_buckets`](#0x1_smart_table_borrow_buckets)
+-  [Function `borrow_buckets_mut`](#0x1_smart_table_borrow_buckets_mut)
+-  [Specification](#@Specification_1)
+    -  [Struct `SmartTable`](#@Specification_1_SmartTable)
+    -  [Function `new_with_config`](#@Specification_1_new_with_config)
+    -  [Function `destroy`](#@Specification_1_destroy)
+    -  [Function `clear`](#@Specification_1_clear)
+    -  [Function `add_all`](#@Specification_1_add_all)
+    -  [Function `to_simple_map`](#@Specification_1_to_simple_map)
+    -  [Function `keys`](#@Specification_1_keys)
+    -  [Function `keys_paginated`](#@Specification_1_keys_paginated)
+    -  [Function `split_one_bucket`](#@Specification_1_split_one_bucket)
+    -  [Function `bucket_index`](#@Specification_1_bucket_index)
+    -  [Function `borrow_with_default`](#@Specification_1_borrow_with_default)
+    -  [Function `load_factor`](#@Specification_1_load_factor)
+    -  [Function `update_split_load_threshold`](#@Specification_1_update_split_load_threshold)
+    -  [Function `update_target_bucket_size`](#@Specification_1_update_target_bucket_size)
+    -  [Function `borrow_kv`](#@Specification_1_borrow_kv)
+    -  [Function `borrow_kv_mut`](#@Specification_1_borrow_kv_mut)
+    -  [Function `num_buckets`](#@Specification_1_num_buckets)
+    -  [Function `borrow_buckets`](#@Specification_1_borrow_buckets)
+    -  [Function `borrow_buckets_mut`](#@Specification_1_borrow_buckets_mut)
+
+
+<pre><code><b>use</b> <a href="hash.md#0x1_aptos_hash">0x1::aptos_hash</a>;
+<b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="math64.md#0x1_math64">0x1::math64</a>;
+<b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option">0x1::option</a>;
+<b>use</b> <a href="simple_map.md#0x1_simple_map">0x1::simple_map</a>;
+<b>use</b> <a href="table_with_length.md#0x1_table_with_length">0x1::table_with_length</a>;
+<b>use</b> <a href="type_info.md#0x1_type_info">0x1::type_info</a>;
+<b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">0x1::vector</a>;
+</code></pre>
+
+
+
+<a id="0x1_smart_table_Entry"></a>
+
+## Struct `Entry`
+
+SmartTable entry contains both the key and value.
+
+
+<pre><code><b>struct</b> <a href="smart_table.md#0x1_smart_table_Entry">Entry</a>&lt;K, V&gt; <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code><a href="../../../move-stdlib/tests/compiler-v2-doc/hash.md#0x1_hash">hash</a>: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>key: K</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>value: V</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_smart_table_SmartTable"></a>
+
+## Struct `SmartTable`
+
+
+
+<pre><code><b>struct</b> <a href="smart_table.md#0x1_smart_table_SmartTable">SmartTable</a>&lt;K, V&gt; <b>has</b> store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>buckets: <a href="table_with_length.md#0x1_table_with_length_TableWithLength">table_with_length::TableWithLength</a>&lt;u64, <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="smart_table.md#0x1_smart_table_Entry">smart_table::Entry</a>&lt;K, V&gt;&gt;&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>num_buckets: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>level: u8</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>size: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>split_load_threshold: u8</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>target_bucket_size: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_smart_table_ENOT_EMPTY"></a>
+
+Cannot destroy non-empty hashmap
+
+
+<pre><code><b>const</b> <a href="smart_table.md#0x1_smart_table_ENOT_EMPTY">ENOT_EMPTY</a>: u64 = 3;
+</code></pre>
+
+
+
+<a id="0x1_smart_table_ENOT_FOUND"></a>
+
+Key not found in the smart table
+
+
+<pre><code><b>const</b> <a href="smart_table.md#0x1_smart_table_ENOT_FOUND">ENOT_FOUND</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_smart_table_EALREADY_EXIST"></a>
+
+Key already exists
+
+
+<pre><code><b>const</b> <a href="smart_table.md#0x1_smart_table_EALREADY_EXIST">EALREADY_EXIST</a>: u64 = 4;
+</code></pre>
+
+
+
+<a id="0x1_smart_table_EEXCEED_MAX_BUCKET_SIZE"></a>
+
+Invalid target bucket size.
+
+
+<pre><code><b>const</b> <a href="smart_table.md#0x1_smart_table_EEXCEED_MAX_BUCKET_SIZE">EEXCEED_MAX_BUCKET_SIZE</a>: u64 = 7;
+</code></pre>
+
+
+
+<a id="0x1_smart_table_EINVALID_BUCKET_INDEX"></a>
+
+Invalid bucket index.
+
+
+<pre><code><b>const</b> <a href="smart_table.md#0x1_smart_table_EINVALID_BUCKET_INDEX">EINVALID_BUCKET_INDEX</a>: u64 = 8;
+</code></pre>
+
+
+
+<a id="0x1_smart_table_EINVALID_LOAD_THRESHOLD_PERCENT"></a>
+
+Invalid load threshold percent to trigger split.
+
+
+<pre><code><b>const</b> <a href="smart_table.md#0x1_smart_table_EINVALID_LOAD_THRESHOLD_PERCENT">EINVALID_LOAD_THRESHOLD_PERCENT</a>: u64 = 5;
+</code></pre>
+
+
+
+<a id="0x1_smart_table_EINVALID_TARGET_BUCKET_SIZE"></a>
+
+Invalid target bucket size.
+
+
+<pre><code><b>const</b> <a href="smart_table.md#0x1_smart_table_EINVALID_TARGET_BUCKET_SIZE">EINVALID_TARGET_BUCKET_SIZE</a>: u64 = 6;
+</code></pre>
+
+
+
+<a id="0x1_smart_table_EINVALID_VECTOR_INDEX"></a>
+
+Invalid vector index within a bucket.
+
+
+<pre><code><b>const</b> <a href="smart_table.md#0x1_smart_table_EINVALID_VECTOR_INDEX">EINVALID_VECTOR_INDEX</a>: u64 = 9;
+</code></pre>
+
+
+
+<a id="0x1_smart_table_EZERO_CAPACITY"></a>
+
+Smart table capacity must be larger than 0
+
+
+<pre><code><b>const</b> <a href="smart_table.md#0x1_smart_table_EZERO_CAPACITY">EZERO_CAPACITY</a>: u64 = 2;
+</code></pre>
+
+
+
+<a id="0x1_smart_table_new"></a>
+
+## Function `new`
+
+Create an empty SmartTable with default configurations.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_new">new</a>&lt;K: <b>copy</b>, drop, store, V: store&gt;(): <a href="smart_table.md#0x1_smart_table_SmartTable">smart_table::SmartTable</a>&lt;K, V&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_new">new</a>&lt;K: <b>copy</b> + drop + store, V: store&gt;(): <a href="smart_table.md#0x1_smart_table_SmartTable">SmartTable</a>&lt;K, V&gt; {
+    <a href="smart_table.md#0x1_smart_table_new_with_config">new_with_config</a>&lt;K, V&gt;(0, 0, 0)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_table_new_with_config"></a>
+
+## Function `new_with_config`
+
+Create an empty SmartTable with customized configurations.
+<code>num_initial_buckets</code>: The number of buckets on initialization. 0 means using default value.
+<code>split_load_threshold</code>: The percent number which once reached, split will be triggered. 0 means using default
+value.
+<code>target_bucket_size</code>: The target number of entries per bucket, though not guaranteed. 0 means not set and will
+dynamically assgined by the contract code.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_new_with_config">new_with_config</a>&lt;K: <b>copy</b>, drop, store, V: store&gt;(num_initial_buckets: u64, split_load_threshold: u8, target_bucket_size: u64): <a href="smart_table.md#0x1_smart_table_SmartTable">smart_table::SmartTable</a>&lt;K, V&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_new_with_config">new_with_config</a>&lt;K: <b>copy</b> + drop + store, V: store&gt;(
+    num_initial_buckets: u64,
+    split_load_threshold: u8,
+    target_bucket_size: u64
+): <a href="smart_table.md#0x1_smart_table_SmartTable">SmartTable</a>&lt;K, V&gt; {
+    <b>assert</b>!(split_load_threshold &lt;= 100, <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="smart_table.md#0x1_smart_table_EINVALID_LOAD_THRESHOLD_PERCENT">EINVALID_LOAD_THRESHOLD_PERCENT</a>));
+    <b>let</b> buckets = <a href="table_with_length.md#0x1_table_with_length_new">table_with_length::new</a>();
+    <a href="table_with_length.md#0x1_table_with_length_add">table_with_length::add</a>(&<b>mut</b> buckets, 0, <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_empty">vector::empty</a>());
+    <b>let</b> <a href="table.md#0x1_table">table</a> = <a href="smart_table.md#0x1_smart_table_SmartTable">SmartTable</a> {
+        buckets,
+        num_buckets: 1,
+        level: 0,
+        size: 0,
+        // The default split load threshold is 75%.
+        split_load_threshold: <b>if</b> (split_load_threshold == 0) { 75 } <b>else</b> { split_load_threshold },
+        target_bucket_size,
+    };
+    // The default number of initial buckets is 2.
+    <b>if</b> (num_initial_buckets == 0) {
+        num_initial_buckets = 2;
+    };
+    <b>while</b> (num_initial_buckets &gt; 1) {
+        num_initial_buckets = num_initial_buckets - 1;
+        <a href="smart_table.md#0x1_smart_table_split_one_bucket">split_one_bucket</a>(&<b>mut</b> <a href="table.md#0x1_table">table</a>);
+    };
+    <a href="table.md#0x1_table">table</a>
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_table_destroy_empty"></a>
+
+## Function `destroy_empty`
+
+Destroy empty table.
+Aborts if it's not empty.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_destroy_empty">destroy_empty</a>&lt;K, V&gt;(<a href="table.md#0x1_table">table</a>: <a href="smart_table.md#0x1_smart_table_SmartTable">smart_table::SmartTable</a>&lt;K, V&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_destroy_empty">destroy_empty</a>&lt;K, V&gt;(<a href="table.md#0x1_table">table</a>: <a href="smart_table.md#0x1_smart_table_SmartTable">SmartTable</a>&lt;K, V&gt;) {
+    <b>assert</b>!(<a href="table.md#0x1_table">table</a>.size == 0, <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="smart_table.md#0x1_smart_table_ENOT_EMPTY">ENOT_EMPTY</a>));
+    <b>let</b> i = 0;
+    <b>while</b> (i &lt; <a href="table.md#0x1_table">table</a>.num_buckets) {
+        <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_destroy_empty">vector::destroy_empty</a>(<a href="table_with_length.md#0x1_table_with_length_remove">table_with_length::remove</a>(&<b>mut</b> <a href="table.md#0x1_table">table</a>.buckets, i));
+        i = i + 1;
+    };
+    <b>let</b> <a href="smart_table.md#0x1_smart_table_SmartTable">SmartTable</a> { buckets, num_buckets: _, level: _, size: _, split_load_threshold: _, target_bucket_size: _ } = <a href="table.md#0x1_table">table</a>;
+    <a href="table_with_length.md#0x1_table_with_length_destroy_empty">table_with_length::destroy_empty</a>(buckets);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_table_destroy"></a>
+
+## Function `destroy`
+
+Destroy a table completely when V has <code>drop</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_destroy">destroy</a>&lt;K: drop, V: drop&gt;(<a href="table.md#0x1_table">table</a>: <a href="smart_table.md#0x1_smart_table_SmartTable">smart_table::SmartTable</a>&lt;K, V&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_destroy">destroy</a>&lt;K: drop, V: drop&gt;(<a href="table.md#0x1_table">table</a>: <a href="smart_table.md#0x1_smart_table_SmartTable">SmartTable</a>&lt;K, V&gt;) {
+    <a href="smart_table.md#0x1_smart_table_clear">clear</a>(&<b>mut</b> <a href="table.md#0x1_table">table</a>);
+    <a href="smart_table.md#0x1_smart_table_destroy_empty">destroy_empty</a>(<a href="table.md#0x1_table">table</a>);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_table_clear"></a>
+
+## Function `clear`
+
+Clear a table completely when T has <code>drop</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_clear">clear</a>&lt;K: drop, V: drop&gt;(<a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="smart_table.md#0x1_smart_table_SmartTable">smart_table::SmartTable</a>&lt;K, V&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_clear">clear</a>&lt;K: drop, V: drop&gt;(<a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="smart_table.md#0x1_smart_table_SmartTable">SmartTable</a>&lt;K, V&gt;) {
+    *<a href="table_with_length.md#0x1_table_with_length_borrow_mut">table_with_length::borrow_mut</a>(&<b>mut</b> <a href="table.md#0x1_table">table</a>.buckets, 0) = <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_empty">vector::empty</a>();
+    <b>let</b> i = 1;
+    <b>while</b> (i &lt; <a href="table.md#0x1_table">table</a>.num_buckets) {
+        <a href="table_with_length.md#0x1_table_with_length_remove">table_with_length::remove</a>(&<b>mut</b> <a href="table.md#0x1_table">table</a>.buckets, i);
+        i = i + 1;
+    };
+    <a href="table.md#0x1_table">table</a>.num_buckets = 1;
+    <a href="table.md#0x1_table">table</a>.level = 0;
+    <a href="table.md#0x1_table">table</a>.size = 0;
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_table_add"></a>
+
+## Function `add`
+
+Add (key, value) pair in the hash map, it may grow one bucket if current load factor exceeds the threshold.
+Note it may not split the actual overflowed bucket. Instead, it was determined by <code>num_buckets</code> and <code>level</code>.
+For standard linear hash algorithm, it is stored as a variable but <code>num_buckets</code> here could be leveraged.
+Abort if <code>key</code> already exists.
+Note: This method may occasionally cost much more gas when triggering bucket split.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_add">add</a>&lt;K, V&gt;(<a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="smart_table.md#0x1_smart_table_SmartTable">smart_table::SmartTable</a>&lt;K, V&gt;, key: K, value: V)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_add">add</a>&lt;K, V&gt;(<a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="smart_table.md#0x1_smart_table_SmartTable">SmartTable</a>&lt;K, V&gt;, key: K, value: V) {
+    <b>let</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/hash.md#0x1_hash">hash</a> = sip_hash_from_value(&key);
+    <b>let</b> index = <a href="smart_table.md#0x1_smart_table_bucket_index">bucket_index</a>(<a href="table.md#0x1_table">table</a>.level, <a href="table.md#0x1_table">table</a>.num_buckets, <a href="../../../move-stdlib/tests/compiler-v2-doc/hash.md#0x1_hash">hash</a>);
+    <b>let</b> bucket = <a href="table_with_length.md#0x1_table_with_length_borrow_mut">table_with_length::borrow_mut</a>(&<b>mut</b> <a href="table.md#0x1_table">table</a>.buckets, index);
+    // We set a per-bucket limit here <b>with</b> a upper bound (10000) that nobody should normally reach.
+    <b>assert</b>!(<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(bucket) &lt;= 10000, <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="smart_table.md#0x1_smart_table_EEXCEED_MAX_BUCKET_SIZE">EEXCEED_MAX_BUCKET_SIZE</a>));
+    <b>assert</b>!(<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_all">vector::all</a>(bucket, | entry | {
+        <b>let</b> e: &<a href="smart_table.md#0x1_smart_table_Entry">Entry</a>&lt;K, V&gt; = entry;
+        &e.key != &key
+    }), <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="smart_table.md#0x1_smart_table_EALREADY_EXIST">EALREADY_EXIST</a>));
+    <b>let</b> e = <a href="smart_table.md#0x1_smart_table_Entry">Entry</a> { <a href="../../../move-stdlib/tests/compiler-v2-doc/hash.md#0x1_hash">hash</a>, key, value };
+    <b>if</b> (<a href="table.md#0x1_table">table</a>.target_bucket_size == 0) {
+        <b>let</b> estimated_entry_size = max(size_of_val(&e), 1);
+        <a href="table.md#0x1_table">table</a>.target_bucket_size = max(1024 /* free_write_quota */ / estimated_entry_size, 1);
+    };
+    <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_push_back">vector::push_back</a>(bucket, e);
+    <a href="table.md#0x1_table">table</a>.size = <a href="table.md#0x1_table">table</a>.size + 1;
+
+    <b>if</b> (<a href="smart_table.md#0x1_smart_table_load_factor">load_factor</a>(<a href="table.md#0x1_table">table</a>) &gt;= (<a href="table.md#0x1_table">table</a>.split_load_threshold <b>as</b> u64)) {
+        <a href="smart_table.md#0x1_smart_table_split_one_bucket">split_one_bucket</a>(<a href="table.md#0x1_table">table</a>);
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_table_add_all"></a>
+
+## Function `add_all`
+
+Add multiple key/value pairs to the smart table. The keys must not already exist.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_add_all">add_all</a>&lt;K, V&gt;(<a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="smart_table.md#0x1_smart_table_SmartTable">smart_table::SmartTable</a>&lt;K, V&gt;, keys: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;K&gt;, values: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;V&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_add_all">add_all</a>&lt;K, V&gt;(<a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="smart_table.md#0x1_smart_table_SmartTable">SmartTable</a>&lt;K, V&gt;, keys: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;K&gt;, values: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;V&gt;) {
+    <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_zip">vector::zip</a>(keys, values, |key, value| { <a href="smart_table.md#0x1_smart_table_add">add</a>(<a href="table.md#0x1_table">table</a>, key, value); });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_table_unzip_entries"></a>
+
+## Function `unzip_entries`
+
+
+
+<pre><code><b>fun</b> <a href="smart_table.md#0x1_smart_table_unzip_entries">unzip_entries</a>&lt;K: <b>copy</b>, V: <b>copy</b>&gt;(entries: &<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="smart_table.md#0x1_smart_table_Entry">smart_table::Entry</a>&lt;K, V&gt;&gt;): (<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;K&gt;, <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;V&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="smart_table.md#0x1_smart_table_unzip_entries">unzip_entries</a>&lt;K: <b>copy</b>, V: <b>copy</b>&gt;(entries: &<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="smart_table.md#0x1_smart_table_Entry">Entry</a>&lt;K, V&gt;&gt;): (<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;K&gt;, <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;V&gt;) {
+    <b>let</b> keys = <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>[];
+    <b>let</b> values = <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>[];
+    <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_for_each_ref">vector::for_each_ref</a>(entries, |e|{
+        <b>let</b> entry: &<a href="smart_table.md#0x1_smart_table_Entry">Entry</a>&lt;K, V&gt; = e;
+        <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_push_back">vector::push_back</a>(&<b>mut</b> keys, entry.key);
+        <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_push_back">vector::push_back</a>(&<b>mut</b> values, entry.value);
+    });
+    (keys, values)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_table_to_simple_map"></a>
+
+## Function `to_simple_map`
+
+Convert a smart table to a simple_map, which is supposed to be called mostly by view functions to get an atomic
+view of the whole table.
+Disclaimer: This function may be costly as the smart table may be huge in size. Use it at your own discretion.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_to_simple_map">to_simple_map</a>&lt;K: <b>copy</b>, drop, store, V: <b>copy</b>, store&gt;(<a href="table.md#0x1_table">table</a>: &<a href="smart_table.md#0x1_smart_table_SmartTable">smart_table::SmartTable</a>&lt;K, V&gt;): <a href="simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;K, V&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_to_simple_map">to_simple_map</a>&lt;K: store + <b>copy</b> + drop, V: store + <b>copy</b>&gt;(
+    <a href="table.md#0x1_table">table</a>: &<a href="smart_table.md#0x1_smart_table_SmartTable">SmartTable</a>&lt;K, V&gt;,
+): SimpleMap&lt;K, V&gt; {
+    <b>let</b> i = 0;
+    <b>let</b> res = <a href="simple_map.md#0x1_simple_map_new">simple_map::new</a>&lt;K, V&gt;();
+    <b>while</b> (i &lt; <a href="table.md#0x1_table">table</a>.num_buckets) {
+        <b>let</b> (keys, values) = <a href="smart_table.md#0x1_smart_table_unzip_entries">unzip_entries</a>(<a href="table_with_length.md#0x1_table_with_length_borrow">table_with_length::borrow</a>(&<a href="table.md#0x1_table">table</a>.buckets, i));
+        <a href="simple_map.md#0x1_simple_map_add_all">simple_map::add_all</a>(&<b>mut</b> res, keys, values);
+        i = i + 1;
+    };
+    res
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_table_keys"></a>
+
+## Function `keys`
+
+Get all keys in a smart table.
+
+For a large enough smart table this function will fail due to execution gas limits, and
+<code>keys_paginated</code> should be used instead.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_keys">keys</a>&lt;K: <b>copy</b>, drop, store, V: <b>copy</b>, store&gt;(table_ref: &<a href="smart_table.md#0x1_smart_table_SmartTable">smart_table::SmartTable</a>&lt;K, V&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;K&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_keys">keys</a>&lt;K: store + <b>copy</b> + drop, V: store + <b>copy</b>&gt;(
+    table_ref: &<a href="smart_table.md#0x1_smart_table_SmartTable">SmartTable</a>&lt;K, V&gt;
+): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;K&gt; {
+    <b>let</b> (keys, _, _) = <a href="smart_table.md#0x1_smart_table_keys_paginated">keys_paginated</a>(table_ref, 0, 0, <a href="smart_table.md#0x1_smart_table_length">length</a>(table_ref));
+    keys
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_table_keys_paginated"></a>
+
+## Function `keys_paginated`
+
+Get keys from a smart table, paginated.
+
+This function can be used to paginate all keys in a large smart table outside of runtime,
+e.g. through chained view function calls. The maximum <code>num_keys_to_get</code> before hitting gas
+limits depends on the data types in the smart table.
+
+When starting pagination, pass <code>starting_bucket_index</code> = <code>starting_vector_index</code> = 0.
+
+The function will then return a vector of keys, an optional bucket index, and an optional
+vector index. The unpacked return indices can then be used as inputs to another pagination
+call, which will return a vector of more keys. This process can be repeated until the
+returned bucket index and vector index value options are both none, which means that
+pagination is complete. For an example, see <code>test_keys()</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_keys_paginated">keys_paginated</a>&lt;K: <b>copy</b>, drop, store, V: <b>copy</b>, store&gt;(table_ref: &<a href="smart_table.md#0x1_smart_table_SmartTable">smart_table::SmartTable</a>&lt;K, V&gt;, starting_bucket_index: u64, starting_vector_index: u64, num_keys_to_get: u64): (<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;K&gt;, <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;u64&gt;, <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;u64&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_keys_paginated">keys_paginated</a>&lt;K: store + <b>copy</b> + drop, V: store + <b>copy</b>&gt;(
+    table_ref: &<a href="smart_table.md#0x1_smart_table_SmartTable">SmartTable</a>&lt;K, V&gt;,
+    starting_bucket_index: u64,
+    starting_vector_index: u64,
+    num_keys_to_get: u64,
+): (
+    <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;K&gt;,
+    Option&lt;u64&gt;,
+    Option&lt;u64&gt;,
+) {
+    <b>let</b> num_buckets = table_ref.num_buckets;
+    <b>let</b> buckets_ref = &table_ref.buckets;
+    <b>assert</b>!(starting_bucket_index &lt; num_buckets, <a href="smart_table.md#0x1_smart_table_EINVALID_BUCKET_INDEX">EINVALID_BUCKET_INDEX</a>);
+    <b>let</b> bucket_ref = <a href="table_with_length.md#0x1_table_with_length_borrow">table_with_length::borrow</a>(buckets_ref, starting_bucket_index);
+    <b>let</b> bucket_length = <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(bucket_ref);
+    <b>assert</b>!(
+        // In the general case, starting <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a> index should never be equal <b>to</b> bucket length
+        // because then iteration will attempt <b>to</b> borrow a <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a> element that is out of bounds.
+        // However starting <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a> index can be equal <b>to</b> bucket length in the special case of
+        // starting iteration at the beginning of an empty bucket since buckets are never
+        // destroyed, only emptied.
+        starting_vector_index &lt; bucket_length || starting_vector_index == 0,
+        <a href="smart_table.md#0x1_smart_table_EINVALID_VECTOR_INDEX">EINVALID_VECTOR_INDEX</a>
+    );
+    <b>let</b> keys = <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>[];
+    <b>if</b> (num_keys_to_get == 0) <b>return</b>
+        (keys, <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(starting_bucket_index), <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(starting_vector_index));
+    for (bucket_index in starting_bucket_index..num_buckets) {
+        bucket_ref = <a href="table_with_length.md#0x1_table_with_length_borrow">table_with_length::borrow</a>(buckets_ref, bucket_index);
+        bucket_length = <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(bucket_ref);
+        for (vector_index in starting_vector_index..bucket_length) {
+            <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_push_back">vector::push_back</a>(&<b>mut</b> keys, <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(bucket_ref, vector_index).key);
+            num_keys_to_get = num_keys_to_get - 1;
+            <b>if</b> (num_keys_to_get == 0) {
+                vector_index = vector_index + 1;
+                <b>return</b> <b>if</b> (vector_index == bucket_length) {
+                    bucket_index = bucket_index + 1;
+                    <b>if</b> (<a href="smart_table.md#0x1_smart_table_bucket_index">bucket_index</a> &lt; num_buckets) {
+                        (keys, <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(bucket_index), <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(0))
+                    } <b>else</b> {
+                        (keys, <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>(), <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>())
+                    }
+                } <b>else</b> {
+                    (keys, <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(bucket_index), <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(vector_index))
+                }
+            };
+        };
+        starting_vector_index = 0; // Start parsing the next bucket at <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a> index 0.
+    };
+    (keys, <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>(), <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>())
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_table_split_one_bucket"></a>
+
+## Function `split_one_bucket`
+
+Decide which is the next bucket to split and split it into two with the elements inside the bucket.
+
+
+<pre><code><b>fun</b> <a href="smart_table.md#0x1_smart_table_split_one_bucket">split_one_bucket</a>&lt;K, V&gt;(<a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="smart_table.md#0x1_smart_table_SmartTable">smart_table::SmartTable</a>&lt;K, V&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="smart_table.md#0x1_smart_table_split_one_bucket">split_one_bucket</a>&lt;K, V&gt;(<a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="smart_table.md#0x1_smart_table_SmartTable">SmartTable</a>&lt;K, V&gt;) {
+    <b>let</b> new_bucket_index = <a href="table.md#0x1_table">table</a>.num_buckets;
+    // the next bucket <b>to</b> split is num_bucket without the most significant bit.
+    <b>let</b> to_split = new_bucket_index ^ (1 &lt;&lt; <a href="table.md#0x1_table">table</a>.level);
+    <a href="table.md#0x1_table">table</a>.num_buckets = new_bucket_index + 1;
+    // <b>if</b> the whole level is splitted once, bump the level.
+    <b>if</b> (to_split + 1 == 1 &lt;&lt; <a href="table.md#0x1_table">table</a>.level) {
+        <a href="table.md#0x1_table">table</a>.level = <a href="table.md#0x1_table">table</a>.level + 1;
+    };
+    <b>let</b> old_bucket = <a href="table_with_length.md#0x1_table_with_length_borrow_mut">table_with_length::borrow_mut</a>(&<b>mut</b> <a href="table.md#0x1_table">table</a>.buckets, to_split);
+    // partition the bucket, [0..p) stays in <b>old</b> bucket, [p..len) goes <b>to</b> new bucket
+    <b>let</b> p = <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_partition">vector::partition</a>(old_bucket, |e| {
+        <b>let</b> entry: &<a href="smart_table.md#0x1_smart_table_Entry">Entry</a>&lt;K, V&gt; = e; // Explicit type <b>to</b> satisfy compiler
+        <a href="smart_table.md#0x1_smart_table_bucket_index">bucket_index</a>(<a href="table.md#0x1_table">table</a>.level, <a href="table.md#0x1_table">table</a>.num_buckets, entry.<a href="../../../move-stdlib/tests/compiler-v2-doc/hash.md#0x1_hash">hash</a>) != new_bucket_index
+    });
+    <b>let</b> new_bucket = <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_trim_reverse">vector::trim_reverse</a>(old_bucket, p);
+    <a href="table_with_length.md#0x1_table_with_length_add">table_with_length::add</a>(&<b>mut</b> <a href="table.md#0x1_table">table</a>.buckets, new_bucket_index, new_bucket);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_table_bucket_index"></a>
+
+## Function `bucket_index`
+
+Return the expected bucket index to find the hash.
+Basically, it use different base <code>1 &lt;&lt; level</code> vs <code>1 &lt;&lt; (level + 1)</code> in modulo operation based on the target
+bucket index compared to the index of the next bucket to split.
+
+
+<pre><code><b>fun</b> <a href="smart_table.md#0x1_smart_table_bucket_index">bucket_index</a>(level: u8, num_buckets: u64, <a href="../../../move-stdlib/tests/compiler-v2-doc/hash.md#0x1_hash">hash</a>: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="smart_table.md#0x1_smart_table_bucket_index">bucket_index</a>(level: u8, num_buckets: u64, <a href="../../../move-stdlib/tests/compiler-v2-doc/hash.md#0x1_hash">hash</a>: u64): u64 {
+    <b>let</b> index = <a href="../../../move-stdlib/tests/compiler-v2-doc/hash.md#0x1_hash">hash</a> % (1 &lt;&lt; (level + 1));
+    <b>if</b> (index &lt; num_buckets) {
+        // in existing bucket
+        index
+    } <b>else</b> {
+        // in unsplitted bucket
+        index % (1 &lt;&lt; level)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_table_borrow"></a>
+
+## Function `borrow`
+
+Acquire an immutable reference to the value which <code>key</code> maps to.
+Aborts if there is no entry for <code>key</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_borrow">borrow</a>&lt;K: drop, V&gt;(<a href="table.md#0x1_table">table</a>: &<a href="smart_table.md#0x1_smart_table_SmartTable">smart_table::SmartTable</a>&lt;K, V&gt;, key: K): &V
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_borrow">borrow</a>&lt;K: drop, V&gt;(<a href="table.md#0x1_table">table</a>: &<a href="smart_table.md#0x1_smart_table_SmartTable">SmartTable</a>&lt;K, V&gt;, key: K): &V {
+    <b>let</b> index = <a href="smart_table.md#0x1_smart_table_bucket_index">bucket_index</a>(<a href="table.md#0x1_table">table</a>.level, <a href="table.md#0x1_table">table</a>.num_buckets, sip_hash_from_value(&key));
+    <b>let</b> bucket = <a href="table_with_length.md#0x1_table_with_length_borrow">table_with_length::borrow</a>(&<a href="table.md#0x1_table">table</a>.buckets, index);
+    <b>let</b> i = 0;
+    <b>let</b> len = <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(bucket);
+    <b>while</b> (i &lt; len) {
+        <b>let</b> entry = <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(bucket, i);
+        <b>if</b> (&entry.key == &key) {
+            <b>return</b> &entry.value
+        };
+        i = i + 1;
+    };
+    <b>abort</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="smart_table.md#0x1_smart_table_ENOT_FOUND">ENOT_FOUND</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_table_borrow_with_default"></a>
+
+## Function `borrow_with_default`
+
+Acquire an immutable reference to the value which <code>key</code> maps to.
+Returns specified default value if there is no entry for <code>key</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_borrow_with_default">borrow_with_default</a>&lt;K: <b>copy</b>, drop, V&gt;(<a href="table.md#0x1_table">table</a>: &<a href="smart_table.md#0x1_smart_table_SmartTable">smart_table::SmartTable</a>&lt;K, V&gt;, key: K, default: &V): &V
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_borrow_with_default">borrow_with_default</a>&lt;K: <b>copy</b> + drop, V&gt;(<a href="table.md#0x1_table">table</a>: &<a href="smart_table.md#0x1_smart_table_SmartTable">SmartTable</a>&lt;K, V&gt;, key: K, default: &V): &V {
+    <b>if</b> (!<a href="smart_table.md#0x1_smart_table_contains">contains</a>(<a href="table.md#0x1_table">table</a>, <b>copy</b> key)) {
+        default
+    } <b>else</b> {
+        <a href="smart_table.md#0x1_smart_table_borrow">borrow</a>(<a href="table.md#0x1_table">table</a>, <b>copy</b> key)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_table_borrow_mut"></a>
+
+## Function `borrow_mut`
+
+Acquire a mutable reference to the value which <code>key</code> maps to.
+Aborts if there is no entry for <code>key</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_borrow_mut">borrow_mut</a>&lt;K: drop, V&gt;(<a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="smart_table.md#0x1_smart_table_SmartTable">smart_table::SmartTable</a>&lt;K, V&gt;, key: K): &<b>mut</b> V
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_borrow_mut">borrow_mut</a>&lt;K: drop, V&gt;(<a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="smart_table.md#0x1_smart_table_SmartTable">SmartTable</a>&lt;K, V&gt;, key: K): &<b>mut</b> V {
+    <b>let</b> index = <a href="smart_table.md#0x1_smart_table_bucket_index">bucket_index</a>(<a href="table.md#0x1_table">table</a>.level, <a href="table.md#0x1_table">table</a>.num_buckets, sip_hash_from_value(&key));
+    <b>let</b> bucket = <a href="table_with_length.md#0x1_table_with_length_borrow_mut">table_with_length::borrow_mut</a>(&<b>mut</b> <a href="table.md#0x1_table">table</a>.buckets, index);
+    <b>let</b> i = 0;
+    <b>let</b> len = <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(bucket);
+    <b>while</b> (i &lt; len) {
+        <b>let</b> entry = <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow_mut">vector::borrow_mut</a>(bucket, i);
+        <b>if</b> (&entry.key == &key) {
+            <b>return</b> &<b>mut</b> entry.value
+        };
+        i = i + 1;
+    };
+    <b>abort</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="smart_table.md#0x1_smart_table_ENOT_FOUND">ENOT_FOUND</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_table_borrow_mut_with_default"></a>
+
+## Function `borrow_mut_with_default`
+
+Acquire a mutable reference to the value which <code>key</code> maps to.
+Insert the pair (<code>key</code>, <code>default</code>) first if there is no entry for <code>key</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_borrow_mut_with_default">borrow_mut_with_default</a>&lt;K: <b>copy</b>, drop, V: drop&gt;(<a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="smart_table.md#0x1_smart_table_SmartTable">smart_table::SmartTable</a>&lt;K, V&gt;, key: K, default: V): &<b>mut</b> V
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_borrow_mut_with_default">borrow_mut_with_default</a>&lt;K: <b>copy</b> + drop, V: drop&gt;(
+    <a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="smart_table.md#0x1_smart_table_SmartTable">SmartTable</a>&lt;K, V&gt;,
+    key: K,
+    default: V
+): &<b>mut</b> V {
+    <b>if</b> (!<a href="smart_table.md#0x1_smart_table_contains">contains</a>(<a href="table.md#0x1_table">table</a>, <b>copy</b> key)) {
+        <a href="smart_table.md#0x1_smart_table_add">add</a>(<a href="table.md#0x1_table">table</a>, <b>copy</b> key, default)
+    };
+    <a href="smart_table.md#0x1_smart_table_borrow_mut">borrow_mut</a>(<a href="table.md#0x1_table">table</a>, key)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_table_contains"></a>
+
+## Function `contains`
+
+Returns true iff <code><a href="table.md#0x1_table">table</a></code> contains an entry for <code>key</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_contains">contains</a>&lt;K: drop, V&gt;(<a href="table.md#0x1_table">table</a>: &<a href="smart_table.md#0x1_smart_table_SmartTable">smart_table::SmartTable</a>&lt;K, V&gt;, key: K): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_contains">contains</a>&lt;K: drop, V&gt;(<a href="table.md#0x1_table">table</a>: &<a href="smart_table.md#0x1_smart_table_SmartTable">SmartTable</a>&lt;K, V&gt;, key: K): bool {
+    <b>let</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/hash.md#0x1_hash">hash</a> = sip_hash_from_value(&key);
+    <b>let</b> index = <a href="smart_table.md#0x1_smart_table_bucket_index">bucket_index</a>(<a href="table.md#0x1_table">table</a>.level, <a href="table.md#0x1_table">table</a>.num_buckets, <a href="../../../move-stdlib/tests/compiler-v2-doc/hash.md#0x1_hash">hash</a>);
+    <b>let</b> bucket = <a href="table_with_length.md#0x1_table_with_length_borrow">table_with_length::borrow</a>(&<a href="table.md#0x1_table">table</a>.buckets, index);
+    <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_any">vector::any</a>(bucket, | entry | {
+        <b>let</b> e: &<a href="smart_table.md#0x1_smart_table_Entry">Entry</a>&lt;K, V&gt; = entry;
+        e.<a href="../../../move-stdlib/tests/compiler-v2-doc/hash.md#0x1_hash">hash</a> == <a href="../../../move-stdlib/tests/compiler-v2-doc/hash.md#0x1_hash">hash</a> && &e.key == &key
+    })
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_table_remove"></a>
+
+## Function `remove`
+
+Remove from <code><a href="table.md#0x1_table">table</a></code> and return the value which <code>key</code> maps to.
+Aborts if there is no entry for <code>key</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_remove">remove</a>&lt;K: <b>copy</b>, drop, V&gt;(<a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="smart_table.md#0x1_smart_table_SmartTable">smart_table::SmartTable</a>&lt;K, V&gt;, key: K): V
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_remove">remove</a>&lt;K: <b>copy</b> + drop, V&gt;(<a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="smart_table.md#0x1_smart_table_SmartTable">SmartTable</a>&lt;K, V&gt;, key: K): V {
+    <b>let</b> index = <a href="smart_table.md#0x1_smart_table_bucket_index">bucket_index</a>(<a href="table.md#0x1_table">table</a>.level, <a href="table.md#0x1_table">table</a>.num_buckets, sip_hash_from_value(&key));
+    <b>let</b> bucket = <a href="table_with_length.md#0x1_table_with_length_borrow_mut">table_with_length::borrow_mut</a>(&<b>mut</b> <a href="table.md#0x1_table">table</a>.buckets, index);
+    <b>let</b> i = 0;
+    <b>let</b> len = <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(bucket);
+    <b>while</b> (i &lt; len) {
+        <b>let</b> entry = <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(bucket, i);
+        <b>if</b> (&entry.key == &key) {
+            <b>let</b> <a href="smart_table.md#0x1_smart_table_Entry">Entry</a> { <a href="../../../move-stdlib/tests/compiler-v2-doc/hash.md#0x1_hash">hash</a>: _, key: _, value } = <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_swap_remove">vector::swap_remove</a>(bucket, i);
+            <a href="table.md#0x1_table">table</a>.size = <a href="table.md#0x1_table">table</a>.size - 1;
+            <b>return</b> value
+        };
+        i = i + 1;
+    };
+    <b>abort</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="smart_table.md#0x1_smart_table_ENOT_FOUND">ENOT_FOUND</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_table_upsert"></a>
+
+## Function `upsert`
+
+Insert the pair (<code>key</code>, <code>value</code>) if there is no entry for <code>key</code>.
+update the value of the entry for <code>key</code> to <code>value</code> otherwise
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_upsert">upsert</a>&lt;K: <b>copy</b>, drop, V: drop&gt;(<a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="smart_table.md#0x1_smart_table_SmartTable">smart_table::SmartTable</a>&lt;K, V&gt;, key: K, value: V)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_upsert">upsert</a>&lt;K: <b>copy</b> + drop, V: drop&gt;(<a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="smart_table.md#0x1_smart_table_SmartTable">SmartTable</a>&lt;K, V&gt;, key: K, value: V) {
+    <b>if</b> (!<a href="smart_table.md#0x1_smart_table_contains">contains</a>(<a href="table.md#0x1_table">table</a>, <b>copy</b> key)) {
+        <a href="smart_table.md#0x1_smart_table_add">add</a>(<a href="table.md#0x1_table">table</a>, <b>copy</b> key, value)
+    } <b>else</b> {
+        <b>let</b> ref = <a href="smart_table.md#0x1_smart_table_borrow_mut">borrow_mut</a>(<a href="table.md#0x1_table">table</a>, key);
+        *ref = value;
+    };
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_table_length"></a>
+
+## Function `length`
+
+Returns the length of the table, i.e. the number of entries.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_length">length</a>&lt;K, V&gt;(<a href="table.md#0x1_table">table</a>: &<a href="smart_table.md#0x1_smart_table_SmartTable">smart_table::SmartTable</a>&lt;K, V&gt;): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_length">length</a>&lt;K, V&gt;(<a href="table.md#0x1_table">table</a>: &<a href="smart_table.md#0x1_smart_table_SmartTable">SmartTable</a>&lt;K, V&gt;): u64 {
+    <a href="table.md#0x1_table">table</a>.size
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_table_load_factor"></a>
+
+## Function `load_factor`
+
+Return the load factor of the hashtable.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_load_factor">load_factor</a>&lt;K, V&gt;(<a href="table.md#0x1_table">table</a>: &<a href="smart_table.md#0x1_smart_table_SmartTable">smart_table::SmartTable</a>&lt;K, V&gt;): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_load_factor">load_factor</a>&lt;K, V&gt;(<a href="table.md#0x1_table">table</a>: &<a href="smart_table.md#0x1_smart_table_SmartTable">SmartTable</a>&lt;K, V&gt;): u64 {
+    <a href="table.md#0x1_table">table</a>.size * 100 / <a href="table.md#0x1_table">table</a>.num_buckets / <a href="table.md#0x1_table">table</a>.target_bucket_size
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_table_update_split_load_threshold"></a>
+
+## Function `update_split_load_threshold`
+
+Update <code>split_load_threshold</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_update_split_load_threshold">update_split_load_threshold</a>&lt;K, V&gt;(<a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="smart_table.md#0x1_smart_table_SmartTable">smart_table::SmartTable</a>&lt;K, V&gt;, split_load_threshold: u8)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_update_split_load_threshold">update_split_load_threshold</a>&lt;K, V&gt;(<a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="smart_table.md#0x1_smart_table_SmartTable">SmartTable</a>&lt;K, V&gt;, split_load_threshold: u8) {
+    <b>assert</b>!(
+        split_load_threshold &lt;= 100 && split_load_threshold &gt; 0,
+        <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="smart_table.md#0x1_smart_table_EINVALID_LOAD_THRESHOLD_PERCENT">EINVALID_LOAD_THRESHOLD_PERCENT</a>)
+    );
+    <a href="table.md#0x1_table">table</a>.split_load_threshold = split_load_threshold;
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_table_update_target_bucket_size"></a>
+
+## Function `update_target_bucket_size`
+
+Update <code>target_bucket_size</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_update_target_bucket_size">update_target_bucket_size</a>&lt;K, V&gt;(<a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="smart_table.md#0x1_smart_table_SmartTable">smart_table::SmartTable</a>&lt;K, V&gt;, target_bucket_size: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_update_target_bucket_size">update_target_bucket_size</a>&lt;K, V&gt;(<a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="smart_table.md#0x1_smart_table_SmartTable">SmartTable</a>&lt;K, V&gt;, target_bucket_size: u64) {
+    <b>assert</b>!(target_bucket_size &gt; 0, <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="smart_table.md#0x1_smart_table_EINVALID_TARGET_BUCKET_SIZE">EINVALID_TARGET_BUCKET_SIZE</a>));
+    <a href="table.md#0x1_table">table</a>.target_bucket_size = target_bucket_size;
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_table_for_each_ref"></a>
+
+## Function `for_each_ref`
+
+Apply the function to a reference of each key-value pair in the table.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_for_each_ref">for_each_ref</a>&lt;K, V&gt;(<a href="table.md#0x1_table">table</a>: &<a href="smart_table.md#0x1_smart_table_SmartTable">smart_table::SmartTable</a>&lt;K, V&gt;, f: |(&K, &V)|)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="smart_table.md#0x1_smart_table_for_each_ref">for_each_ref</a>&lt;K, V&gt;(<a href="table.md#0x1_table">table</a>: &<a href="smart_table.md#0x1_smart_table_SmartTable">SmartTable</a>&lt;K, V&gt;, f: |&K, &V|) {
+    <b>let</b> i = 0;
+    <b>while</b> (i &lt; aptos_std::smart_table::num_buckets(<a href="table.md#0x1_table">table</a>)) {
+        <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_for_each_ref">vector::for_each_ref</a>(
+            aptos_std::table_with_length::borrow(aptos_std::smart_table::borrow_buckets(<a href="table.md#0x1_table">table</a>), i),
+            |elem| {
+                <b>let</b> (key, value) = aptos_std::smart_table::borrow_kv(elem);
+                f(key, value)
+            }
+        );
+        i = i + 1;
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_table_for_each_mut"></a>
+
+## Function `for_each_mut`
+
+Apply the function to a mutable reference of each key-value pair in the table.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_for_each_mut">for_each_mut</a>&lt;K, V&gt;(<a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="smart_table.md#0x1_smart_table_SmartTable">smart_table::SmartTable</a>&lt;K, V&gt;, f: |(&K, &<b>mut</b> V)|)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="smart_table.md#0x1_smart_table_for_each_mut">for_each_mut</a>&lt;K, V&gt;(<a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="smart_table.md#0x1_smart_table_SmartTable">SmartTable</a>&lt;K, V&gt;, f: |&K, &<b>mut</b> V|) {
+    <b>let</b> i = 0;
+    <b>while</b> (i &lt; aptos_std::smart_table::num_buckets(<a href="table.md#0x1_table">table</a>)) {
+        <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_for_each_mut">vector::for_each_mut</a>(
+            <a href="table_with_length.md#0x1_table_with_length_borrow_mut">table_with_length::borrow_mut</a>(aptos_std::smart_table::borrow_buckets_mut(<a href="table.md#0x1_table">table</a>), i),
+            |elem| {
+                <b>let</b> (key, value) = aptos_std::smart_table::borrow_kv_mut(elem);
+                f(key, value)
+            }
+        );
+        i = i + 1;
+    };
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_table_map_ref"></a>
+
+## Function `map_ref`
+
+Map the function over the references of key-value pairs in the table without modifying it.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_map_ref">map_ref</a>&lt;K: <b>copy</b>, drop, store, V1, V2: store&gt;(<a href="table.md#0x1_table">table</a>: &<a href="smart_table.md#0x1_smart_table_SmartTable">smart_table::SmartTable</a>&lt;K, V1&gt;, f: |&V1|V2): <a href="smart_table.md#0x1_smart_table_SmartTable">smart_table::SmartTable</a>&lt;K, V2&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="smart_table.md#0x1_smart_table_map_ref">map_ref</a>&lt;K: <b>copy</b> + drop + store, V1, V2: store&gt;(
+    <a href="table.md#0x1_table">table</a>: &<a href="smart_table.md#0x1_smart_table_SmartTable">SmartTable</a>&lt;K, V1&gt;,
+    f: |&V1|V2
+): <a href="smart_table.md#0x1_smart_table_SmartTable">SmartTable</a>&lt;K, V2&gt; {
+    <b>let</b> new_table = <a href="smart_table.md#0x1_smart_table_new">new</a>&lt;K, V2&gt;();
+    <a href="smart_table.md#0x1_smart_table_for_each_ref">for_each_ref</a>(<a href="table.md#0x1_table">table</a>, |key, value| <a href="smart_table.md#0x1_smart_table_add">add</a>(&<b>mut</b> new_table, *key, f(value)));
+    new_table
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_table_any"></a>
+
+## Function `any`
+
+Return true if any key-value pair in the table satisfies the predicate.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="any.md#0x1_any">any</a>&lt;K, V&gt;(<a href="table.md#0x1_table">table</a>: &<a href="smart_table.md#0x1_smart_table_SmartTable">smart_table::SmartTable</a>&lt;K, V&gt;, p: |(&K, &V)|bool): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="any.md#0x1_any">any</a>&lt;K, V&gt;(
+    <a href="table.md#0x1_table">table</a>: &<a href="smart_table.md#0x1_smart_table_SmartTable">SmartTable</a>&lt;K, V&gt;,
+    p: |&K, &V|bool
+): bool {
+    <b>let</b> found = <b>false</b>;
+    <b>let</b> i = 0;
+    <b>while</b> (i &lt; aptos_std::smart_table::num_buckets(<a href="table.md#0x1_table">table</a>)) {
+        found = <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_any">vector::any</a>(<a href="table_with_length.md#0x1_table_with_length_borrow">table_with_length::borrow</a>(aptos_std::smart_table::borrow_buckets(<a href="table.md#0x1_table">table</a>), i), |elem| {
+            <b>let</b> (key, value) = aptos_std::smart_table::borrow_kv(elem);
+            p(key, value)
+        });
+        <b>if</b> (found) <b>break</b>;
+        i = i + 1;
+    };
+    found
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_table_borrow_kv"></a>
+
+## Function `borrow_kv`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_borrow_kv">borrow_kv</a>&lt;K, V&gt;(e: &<a href="smart_table.md#0x1_smart_table_Entry">smart_table::Entry</a>&lt;K, V&gt;): (&K, &V)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_borrow_kv">borrow_kv</a>&lt;K, V&gt;(e: &<a href="smart_table.md#0x1_smart_table_Entry">Entry</a>&lt;K, V&gt;): (&K, &V) {
+    (&e.key, &e.value)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_table_borrow_kv_mut"></a>
+
+## Function `borrow_kv_mut`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_borrow_kv_mut">borrow_kv_mut</a>&lt;K, V&gt;(e: &<b>mut</b> <a href="smart_table.md#0x1_smart_table_Entry">smart_table::Entry</a>&lt;K, V&gt;): (&<b>mut</b> K, &<b>mut</b> V)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_borrow_kv_mut">borrow_kv_mut</a>&lt;K, V&gt;(e: &<b>mut</b> <a href="smart_table.md#0x1_smart_table_Entry">Entry</a>&lt;K, V&gt;): (&<b>mut</b> K, &<b>mut</b> V) {
+    (&<b>mut</b> e.key, &<b>mut</b> e.value)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_table_num_buckets"></a>
+
+## Function `num_buckets`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_num_buckets">num_buckets</a>&lt;K, V&gt;(<a href="table.md#0x1_table">table</a>: &<a href="smart_table.md#0x1_smart_table_SmartTable">smart_table::SmartTable</a>&lt;K, V&gt;): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_num_buckets">num_buckets</a>&lt;K, V&gt;(<a href="table.md#0x1_table">table</a>: &<a href="smart_table.md#0x1_smart_table_SmartTable">SmartTable</a>&lt;K, V&gt;): u64 {
+    <a href="table.md#0x1_table">table</a>.num_buckets
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_table_borrow_buckets"></a>
+
+## Function `borrow_buckets`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_borrow_buckets">borrow_buckets</a>&lt;K, V&gt;(<a href="table.md#0x1_table">table</a>: &<a href="smart_table.md#0x1_smart_table_SmartTable">smart_table::SmartTable</a>&lt;K, V&gt;): &<a href="table_with_length.md#0x1_table_with_length_TableWithLength">table_with_length::TableWithLength</a>&lt;u64, <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="smart_table.md#0x1_smart_table_Entry">smart_table::Entry</a>&lt;K, V&gt;&gt;&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_borrow_buckets">borrow_buckets</a>&lt;K, V&gt;(<a href="table.md#0x1_table">table</a>: &<a href="smart_table.md#0x1_smart_table_SmartTable">SmartTable</a>&lt;K, V&gt;): &TableWithLength&lt;u64, <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="smart_table.md#0x1_smart_table_Entry">Entry</a>&lt;K, V&gt;&gt;&gt; {
+    &<a href="table.md#0x1_table">table</a>.buckets
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_table_borrow_buckets_mut"></a>
+
+## Function `borrow_buckets_mut`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_borrow_buckets_mut">borrow_buckets_mut</a>&lt;K, V&gt;(<a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="smart_table.md#0x1_smart_table_SmartTable">smart_table::SmartTable</a>&lt;K, V&gt;): &<b>mut</b> <a href="table_with_length.md#0x1_table_with_length_TableWithLength">table_with_length::TableWithLength</a>&lt;u64, <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="smart_table.md#0x1_smart_table_Entry">smart_table::Entry</a>&lt;K, V&gt;&gt;&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_borrow_buckets_mut">borrow_buckets_mut</a>&lt;K, V&gt;(<a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="smart_table.md#0x1_smart_table_SmartTable">SmartTable</a>&lt;K, V&gt;): &<b>mut</b> TableWithLength&lt;u64, <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="smart_table.md#0x1_smart_table_Entry">Entry</a>&lt;K, V&gt;&gt;&gt; {
+    &<b>mut</b> <a href="table.md#0x1_table">table</a>.buckets
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+<a id="@Specification_1_SmartTable"></a>
+
+### Struct `SmartTable`
+
+
+<pre><code><b>struct</b> <a href="smart_table.md#0x1_smart_table_SmartTable">SmartTable</a>&lt;K, V&gt; <b>has</b> store
+</code></pre>
+
+
+
+<dl>
+<dt>
+<code>buckets: <a href="table_with_length.md#0x1_table_with_length_TableWithLength">table_with_length::TableWithLength</a>&lt;u64, <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="smart_table.md#0x1_smart_table_Entry">smart_table::Entry</a>&lt;K, V&gt;&gt;&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>num_buckets: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>level: u8</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>size: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>split_load_threshold: u8</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>target_bucket_size: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+
+<pre><code><b>pragma</b> intrinsic = map,
+    map_new = new,
+    map_destroy_empty = destroy_empty,
+    map_len = length,
+    map_has_key = contains,
+    map_add_no_override = add,
+    map_add_override_if_exists = upsert,
+    map_del_must_exist = remove,
+    map_borrow = borrow,
+    map_borrow_mut = borrow_mut,
+    map_borrow_mut_with_default = borrow_mut_with_default,
+    map_spec_get = spec_get,
+    map_spec_set = spec_set,
+    map_spec_del = spec_remove,
+    map_spec_len = spec_len,
+map_spec_has_key = spec_contains;
+</code></pre>
+
+
+
+<a id="@Specification_1_new_with_config"></a>
+
+### Function `new_with_config`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_new_with_config">new_with_config</a>&lt;K: <b>copy</b>, drop, store, V: store&gt;(num_initial_buckets: u64, split_load_threshold: u8, target_bucket_size: u64): <a href="smart_table.md#0x1_smart_table_SmartTable">smart_table::SmartTable</a>&lt;K, V&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_destroy"></a>
+
+### Function `destroy`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_destroy">destroy</a>&lt;K: drop, V: drop&gt;(<a href="table.md#0x1_table">table</a>: <a href="smart_table.md#0x1_smart_table_SmartTable">smart_table::SmartTable</a>&lt;K, V&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_clear"></a>
+
+### Function `clear`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_clear">clear</a>&lt;K: drop, V: drop&gt;(<a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="smart_table.md#0x1_smart_table_SmartTable">smart_table::SmartTable</a>&lt;K, V&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_add_all"></a>
+
+### Function `add_all`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_add_all">add_all</a>&lt;K, V&gt;(<a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="smart_table.md#0x1_smart_table_SmartTable">smart_table::SmartTable</a>&lt;K, V&gt;, keys: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;K&gt;, values: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;V&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_to_simple_map"></a>
+
+### Function `to_simple_map`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_to_simple_map">to_simple_map</a>&lt;K: <b>copy</b>, drop, store, V: <b>copy</b>, store&gt;(<a href="table.md#0x1_table">table</a>: &<a href="smart_table.md#0x1_smart_table_SmartTable">smart_table::SmartTable</a>&lt;K, V&gt;): <a href="simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;K, V&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_keys"></a>
+
+### Function `keys`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_keys">keys</a>&lt;K: <b>copy</b>, drop, store, V: <b>copy</b>, store&gt;(table_ref: &<a href="smart_table.md#0x1_smart_table_SmartTable">smart_table::SmartTable</a>&lt;K, V&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;K&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_keys_paginated"></a>
+
+### Function `keys_paginated`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_keys_paginated">keys_paginated</a>&lt;K: <b>copy</b>, drop, store, V: <b>copy</b>, store&gt;(table_ref: &<a href="smart_table.md#0x1_smart_table_SmartTable">smart_table::SmartTable</a>&lt;K, V&gt;, starting_bucket_index: u64, starting_vector_index: u64, num_keys_to_get: u64): (<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;K&gt;, <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;u64&gt;, <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;u64&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_split_one_bucket"></a>
+
+### Function `split_one_bucket`
+
+
+<pre><code><b>fun</b> <a href="smart_table.md#0x1_smart_table_split_one_bucket">split_one_bucket</a>&lt;K, V&gt;(<a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="smart_table.md#0x1_smart_table_SmartTable">smart_table::SmartTable</a>&lt;K, V&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_bucket_index"></a>
+
+### Function `bucket_index`
+
+
+<pre><code><b>fun</b> <a href="smart_table.md#0x1_smart_table_bucket_index">bucket_index</a>(level: u8, num_buckets: u64, <a href="../../../move-stdlib/tests/compiler-v2-doc/hash.md#0x1_hash">hash</a>: u64): u64
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_borrow_with_default"></a>
+
+### Function `borrow_with_default`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_borrow_with_default">borrow_with_default</a>&lt;K: <b>copy</b>, drop, V&gt;(<a href="table.md#0x1_table">table</a>: &<a href="smart_table.md#0x1_smart_table_SmartTable">smart_table::SmartTable</a>&lt;K, V&gt;, key: K, default: &V): &V
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_load_factor"></a>
+
+### Function `load_factor`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_load_factor">load_factor</a>&lt;K, V&gt;(<a href="table.md#0x1_table">table</a>: &<a href="smart_table.md#0x1_smart_table_SmartTable">smart_table::SmartTable</a>&lt;K, V&gt;): u64
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_update_split_load_threshold"></a>
+
+### Function `update_split_load_threshold`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_update_split_load_threshold">update_split_load_threshold</a>&lt;K, V&gt;(<a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="smart_table.md#0x1_smart_table_SmartTable">smart_table::SmartTable</a>&lt;K, V&gt;, split_load_threshold: u8)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_update_target_bucket_size"></a>
+
+### Function `update_target_bucket_size`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_update_target_bucket_size">update_target_bucket_size</a>&lt;K, V&gt;(<a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="smart_table.md#0x1_smart_table_SmartTable">smart_table::SmartTable</a>&lt;K, V&gt;, target_bucket_size: u64)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_borrow_kv"></a>
+
+### Function `borrow_kv`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_borrow_kv">borrow_kv</a>&lt;K, V&gt;(e: &<a href="smart_table.md#0x1_smart_table_Entry">smart_table::Entry</a>&lt;K, V&gt;): (&K, &V)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_borrow_kv_mut"></a>
+
+### Function `borrow_kv_mut`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_borrow_kv_mut">borrow_kv_mut</a>&lt;K, V&gt;(e: &<b>mut</b> <a href="smart_table.md#0x1_smart_table_Entry">smart_table::Entry</a>&lt;K, V&gt;): (&<b>mut</b> K, &<b>mut</b> V)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_num_buckets"></a>
+
+### Function `num_buckets`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_num_buckets">num_buckets</a>&lt;K, V&gt;(<a href="table.md#0x1_table">table</a>: &<a href="smart_table.md#0x1_smart_table_SmartTable">smart_table::SmartTable</a>&lt;K, V&gt;): u64
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_borrow_buckets"></a>
+
+### Function `borrow_buckets`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_borrow_buckets">borrow_buckets</a>&lt;K, V&gt;(<a href="table.md#0x1_table">table</a>: &<a href="smart_table.md#0x1_smart_table_SmartTable">smart_table::SmartTable</a>&lt;K, V&gt;): &<a href="table_with_length.md#0x1_table_with_length_TableWithLength">table_with_length::TableWithLength</a>&lt;u64, <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="smart_table.md#0x1_smart_table_Entry">smart_table::Entry</a>&lt;K, V&gt;&gt;&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_borrow_buckets_mut"></a>
+
+### Function `borrow_buckets_mut`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_borrow_buckets_mut">borrow_buckets_mut</a>&lt;K, V&gt;(<a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="smart_table.md#0x1_smart_table_SmartTable">smart_table::SmartTable</a>&lt;K, V&gt;): &<b>mut</b> <a href="table_with_length.md#0x1_table_with_length_TableWithLength">table_with_length::TableWithLength</a>&lt;u64, <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="smart_table.md#0x1_smart_table_Entry">smart_table::Entry</a>&lt;K, V&gt;&gt;&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+
+<a id="0x1_smart_table_spec_len"></a>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_spec_len">spec_len</a>&lt;K, V&gt;(t: <a href="smart_table.md#0x1_smart_table_SmartTable">SmartTable</a>&lt;K, V&gt;): num;
+</code></pre>
+
+
+
+
+<a id="0x1_smart_table_spec_contains"></a>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_spec_contains">spec_contains</a>&lt;K, V&gt;(t: <a href="smart_table.md#0x1_smart_table_SmartTable">SmartTable</a>&lt;K, V&gt;, k: K): bool;
+</code></pre>
+
+
+
+
+<a id="0x1_smart_table_spec_set"></a>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_spec_set">spec_set</a>&lt;K, V&gt;(t: <a href="smart_table.md#0x1_smart_table_SmartTable">SmartTable</a>&lt;K, V&gt;, k: K, v: V): <a href="smart_table.md#0x1_smart_table_SmartTable">SmartTable</a>&lt;K, V&gt;;
+</code></pre>
+
+
+
+
+<a id="0x1_smart_table_spec_remove"></a>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_spec_remove">spec_remove</a>&lt;K, V&gt;(t: <a href="smart_table.md#0x1_smart_table_SmartTable">SmartTable</a>&lt;K, V&gt;, k: K): <a href="smart_table.md#0x1_smart_table_SmartTable">SmartTable</a>&lt;K, V&gt;;
+</code></pre>
+
+
+
+
+<a id="0x1_smart_table_spec_get"></a>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="smart_table.md#0x1_smart_table_spec_get">spec_get</a>&lt;K, V&gt;(t: <a href="smart_table.md#0x1_smart_table_SmartTable">SmartTable</a>&lt;K, V&gt;, k: K): V;
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/smart_vector.md b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/smart_vector.md
new file mode 100644
index 0000000000000..3b82a5c91a65f
--- /dev/null
+++ b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/smart_vector.md
@@ -0,0 +1,1727 @@
+
+<a id="0x1_smart_vector"></a>
+
+# Module `0x1::smart_vector`
+
+
+
+-  [Struct `SmartVector`](#0x1_smart_vector_SmartVector)
+-  [Constants](#@Constants_0)
+-  [Function `new`](#0x1_smart_vector_new)
+-  [Function `empty`](#0x1_smart_vector_empty)
+-  [Function `empty_with_config`](#0x1_smart_vector_empty_with_config)
+-  [Function `singleton`](#0x1_smart_vector_singleton)
+-  [Function `destroy_empty`](#0x1_smart_vector_destroy_empty)
+-  [Function `destroy`](#0x1_smart_vector_destroy)
+-  [Function `clear`](#0x1_smart_vector_clear)
+-  [Function `borrow`](#0x1_smart_vector_borrow)
+-  [Function `borrow_mut`](#0x1_smart_vector_borrow_mut)
+-  [Function `append`](#0x1_smart_vector_append)
+-  [Function `add_all`](#0x1_smart_vector_add_all)
+-  [Function `to_vector`](#0x1_smart_vector_to_vector)
+-  [Function `push_back`](#0x1_smart_vector_push_back)
+-  [Function `pop_back`](#0x1_smart_vector_pop_back)
+-  [Function `remove`](#0x1_smart_vector_remove)
+-  [Function `swap_remove`](#0x1_smart_vector_swap_remove)
+-  [Function `swap`](#0x1_smart_vector_swap)
+-  [Function `reverse`](#0x1_smart_vector_reverse)
+-  [Function `index_of`](#0x1_smart_vector_index_of)
+-  [Function `contains`](#0x1_smart_vector_contains)
+-  [Function `length`](#0x1_smart_vector_length)
+-  [Function `is_empty`](#0x1_smart_vector_is_empty)
+-  [Function `for_each`](#0x1_smart_vector_for_each)
+-  [Function `for_each_reverse`](#0x1_smart_vector_for_each_reverse)
+-  [Function `for_each_ref`](#0x1_smart_vector_for_each_ref)
+-  [Function `for_each_mut`](#0x1_smart_vector_for_each_mut)
+-  [Function `enumerate_ref`](#0x1_smart_vector_enumerate_ref)
+-  [Function `enumerate_mut`](#0x1_smart_vector_enumerate_mut)
+-  [Function `fold`](#0x1_smart_vector_fold)
+-  [Function `foldr`](#0x1_smart_vector_foldr)
+-  [Function `map_ref`](#0x1_smart_vector_map_ref)
+-  [Function `map`](#0x1_smart_vector_map)
+-  [Function `filter`](#0x1_smart_vector_filter)
+-  [Function `zip`](#0x1_smart_vector_zip)
+-  [Function `zip_reverse`](#0x1_smart_vector_zip_reverse)
+-  [Function `zip_ref`](#0x1_smart_vector_zip_ref)
+-  [Function `zip_mut`](#0x1_smart_vector_zip_mut)
+-  [Function `zip_map`](#0x1_smart_vector_zip_map)
+-  [Function `zip_map_ref`](#0x1_smart_vector_zip_map_ref)
+-  [Specification](#@Specification_1)
+    -  [Struct `SmartVector`](#@Specification_1_SmartVector)
+    -  [Function `empty`](#@Specification_1_empty)
+    -  [Function `empty_with_config`](#@Specification_1_empty_with_config)
+    -  [Function `destroy_empty`](#@Specification_1_destroy_empty)
+    -  [Function `borrow`](#@Specification_1_borrow)
+    -  [Function `append`](#@Specification_1_append)
+    -  [Function `push_back`](#@Specification_1_push_back)
+    -  [Function `pop_back`](#@Specification_1_pop_back)
+    -  [Function `remove`](#@Specification_1_remove)
+    -  [Function `swap_remove`](#@Specification_1_swap_remove)
+    -  [Function `swap`](#@Specification_1_swap)
+    -  [Function `length`](#@Specification_1_length)
+
+
+<pre><code><b>use</b> <a href="big_vector.md#0x1_big_vector">0x1::big_vector</a>;
+<b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="math64.md#0x1_math64">0x1::math64</a>;
+<b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option">0x1::option</a>;
+<b>use</b> <a href="type_info.md#0x1_type_info">0x1::type_info</a>;
+<b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">0x1::vector</a>;
+</code></pre>
+
+
+
+<a id="0x1_smart_vector_SmartVector"></a>
+
+## Struct `SmartVector`
+
+A Scalable vector implementation based on tables, Ts are grouped into buckets with <code>bucket_size</code>.
+The option wrapping BigVector saves space in the metadata associated with BigVector when smart_vector is
+so small that inline_vec vector can hold all the data.
+
+
+<pre><code><b>struct</b> <a href="smart_vector.md#0x1_smart_vector_SmartVector">SmartVector</a>&lt;T&gt; <b>has</b> store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>inline_vec: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;T&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>big_vec: <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="big_vector.md#0x1_big_vector_BigVector">big_vector::BigVector</a>&lt;T&gt;&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>inline_capacity: <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;u64&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>bucket_size: <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;u64&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_smart_vector_EINDEX_OUT_OF_BOUNDS"></a>
+
+Vector index is out of bounds
+
+
+<pre><code><b>const</b> <a href="smart_vector.md#0x1_smart_vector_EINDEX_OUT_OF_BOUNDS">EINDEX_OUT_OF_BOUNDS</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_smart_vector_EVECTOR_EMPTY"></a>
+
+Cannot pop back from an empty vector
+
+
+<pre><code><b>const</b> <a href="smart_vector.md#0x1_smart_vector_EVECTOR_EMPTY">EVECTOR_EMPTY</a>: u64 = 3;
+</code></pre>
+
+
+
+<a id="0x1_smart_vector_EVECTOR_NOT_EMPTY"></a>
+
+Cannot destroy a non-empty vector
+
+
+<pre><code><b>const</b> <a href="smart_vector.md#0x1_smart_vector_EVECTOR_NOT_EMPTY">EVECTOR_NOT_EMPTY</a>: u64 = 2;
+</code></pre>
+
+
+
+<a id="0x1_smart_vector_EZERO_BUCKET_SIZE"></a>
+
+bucket_size cannot be 0
+
+
+<pre><code><b>const</b> <a href="smart_vector.md#0x1_smart_vector_EZERO_BUCKET_SIZE">EZERO_BUCKET_SIZE</a>: u64 = 4;
+</code></pre>
+
+
+
+<a id="0x1_smart_vector_ESMART_VECTORS_LENGTH_MISMATCH"></a>
+
+The length of the smart vectors are not equal.
+
+
+<pre><code><b>const</b> <a href="smart_vector.md#0x1_smart_vector_ESMART_VECTORS_LENGTH_MISMATCH">ESMART_VECTORS_LENGTH_MISMATCH</a>: u64 = 131077;
+</code></pre>
+
+
+
+<a id="0x1_smart_vector_new"></a>
+
+## Function `new`
+
+Regular Vector API
+Create an empty vector using default logic to estimate <code>inline_capacity</code> and <code>bucket_size</code>, which may be
+inaccurate.
+This is exactly the same as empty() but is more standardized as all other data structures have new().
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_new">new</a>&lt;T: store&gt;(): <a href="smart_vector.md#0x1_smart_vector_SmartVector">smart_vector::SmartVector</a>&lt;T&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_new">new</a>&lt;T: store&gt;(): <a href="smart_vector.md#0x1_smart_vector_SmartVector">SmartVector</a>&lt;T&gt; {
+    <a href="smart_vector.md#0x1_smart_vector_empty">empty</a>()
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_vector_empty"></a>
+
+## Function `empty`
+
+Create an empty vector using default logic to estimate <code>inline_capacity</code> and <code>bucket_size</code>, which may be
+inaccurate.
+
+
+<pre><code>#[deprecated]
+<b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_empty">empty</a>&lt;T: store&gt;(): <a href="smart_vector.md#0x1_smart_vector_SmartVector">smart_vector::SmartVector</a>&lt;T&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_empty">empty</a>&lt;T: store&gt;(): <a href="smart_vector.md#0x1_smart_vector_SmartVector">SmartVector</a>&lt;T&gt; {
+    <a href="smart_vector.md#0x1_smart_vector_SmartVector">SmartVector</a> {
+        inline_vec: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>[],
+        big_vec: <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>(),
+        inline_capacity: <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>(),
+        bucket_size: <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>(),
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_vector_empty_with_config"></a>
+
+## Function `empty_with_config`
+
+Create an empty vector with customized config.
+When inline_capacity = 0, SmartVector degrades to a wrapper of BigVector.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_empty_with_config">empty_with_config</a>&lt;T: store&gt;(inline_capacity: u64, bucket_size: u64): <a href="smart_vector.md#0x1_smart_vector_SmartVector">smart_vector::SmartVector</a>&lt;T&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_empty_with_config">empty_with_config</a>&lt;T: store&gt;(inline_capacity: u64, bucket_size: u64): <a href="smart_vector.md#0x1_smart_vector_SmartVector">SmartVector</a>&lt;T&gt; {
+    <b>assert</b>!(bucket_size &gt; 0, <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="smart_vector.md#0x1_smart_vector_EZERO_BUCKET_SIZE">EZERO_BUCKET_SIZE</a>));
+    <a href="smart_vector.md#0x1_smart_vector_SmartVector">SmartVector</a> {
+        inline_vec: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>[],
+        big_vec: <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>(),
+        inline_capacity: <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(inline_capacity),
+        bucket_size: <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(bucket_size),
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_vector_singleton"></a>
+
+## Function `singleton`
+
+Create a vector of length 1 containing the passed in T.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_singleton">singleton</a>&lt;T: store&gt;(element: T): <a href="smart_vector.md#0x1_smart_vector_SmartVector">smart_vector::SmartVector</a>&lt;T&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_singleton">singleton</a>&lt;T: store&gt;(element: T): <a href="smart_vector.md#0x1_smart_vector_SmartVector">SmartVector</a>&lt;T&gt; {
+    <b>let</b> v = <a href="smart_vector.md#0x1_smart_vector_empty">empty</a>();
+    <a href="smart_vector.md#0x1_smart_vector_push_back">push_back</a>(&<b>mut</b> v, element);
+    v
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_vector_destroy_empty"></a>
+
+## Function `destroy_empty`
+
+Destroy the vector <code>v</code>.
+Aborts if <code>v</code> is not empty.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_destroy_empty">destroy_empty</a>&lt;T&gt;(v: <a href="smart_vector.md#0x1_smart_vector_SmartVector">smart_vector::SmartVector</a>&lt;T&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_destroy_empty">destroy_empty</a>&lt;T&gt;(v: <a href="smart_vector.md#0x1_smart_vector_SmartVector">SmartVector</a>&lt;T&gt;) {
+    <b>assert</b>!(<a href="smart_vector.md#0x1_smart_vector_is_empty">is_empty</a>(&v), <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="smart_vector.md#0x1_smart_vector_EVECTOR_NOT_EMPTY">EVECTOR_NOT_EMPTY</a>));
+    <b>let</b> <a href="smart_vector.md#0x1_smart_vector_SmartVector">SmartVector</a> { inline_vec, big_vec, inline_capacity: _, bucket_size: _ } = v;
+    <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_destroy_empty">vector::destroy_empty</a>(inline_vec);
+    <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_destroy_none">option::destroy_none</a>(big_vec);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_vector_destroy"></a>
+
+## Function `destroy`
+
+Destroy a vector completely when T has <code>drop</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_destroy">destroy</a>&lt;T: drop&gt;(v: <a href="smart_vector.md#0x1_smart_vector_SmartVector">smart_vector::SmartVector</a>&lt;T&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_destroy">destroy</a>&lt;T: drop&gt;(v: <a href="smart_vector.md#0x1_smart_vector_SmartVector">SmartVector</a>&lt;T&gt;) {
+    <a href="smart_vector.md#0x1_smart_vector_clear">clear</a>(&<b>mut</b> v);
+    <a href="smart_vector.md#0x1_smart_vector_destroy_empty">destroy_empty</a>(v);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_vector_clear"></a>
+
+## Function `clear`
+
+Clear a vector completely when T has <code>drop</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_clear">clear</a>&lt;T: drop&gt;(v: &<b>mut</b> <a href="smart_vector.md#0x1_smart_vector_SmartVector">smart_vector::SmartVector</a>&lt;T&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_clear">clear</a>&lt;T: drop&gt;(v: &<b>mut</b> <a href="smart_vector.md#0x1_smart_vector_SmartVector">SmartVector</a>&lt;T&gt;) {
+    v.inline_vec = <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>[];
+    <b>if</b> (<a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&v.big_vec)) {
+        <a href="big_vector.md#0x1_big_vector_destroy">big_vector::destroy</a>(<a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_extract">option::extract</a>(&<b>mut</b> v.big_vec));
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_vector_borrow"></a>
+
+## Function `borrow`
+
+Acquire an immutable reference to the <code>i</code>th T of the vector <code>v</code>.
+Aborts if <code>i</code> is out of bounds.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_borrow">borrow</a>&lt;T&gt;(v: &<a href="smart_vector.md#0x1_smart_vector_SmartVector">smart_vector::SmartVector</a>&lt;T&gt;, i: u64): &T
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_borrow">borrow</a>&lt;T&gt;(v: &<a href="smart_vector.md#0x1_smart_vector_SmartVector">SmartVector</a>&lt;T&gt;, i: u64): &T {
+    <b>assert</b>!(i &lt; <a href="smart_vector.md#0x1_smart_vector_length">length</a>(v), <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="smart_vector.md#0x1_smart_vector_EINDEX_OUT_OF_BOUNDS">EINDEX_OUT_OF_BOUNDS</a>));
+    <b>let</b> inline_len = <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&v.inline_vec);
+    <b>if</b> (i &lt; inline_len) {
+        <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(&v.inline_vec, i)
+    } <b>else</b> {
+        <a href="big_vector.md#0x1_big_vector_borrow">big_vector::borrow</a>(<a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(&v.big_vec), i - inline_len)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_vector_borrow_mut"></a>
+
+## Function `borrow_mut`
+
+Return a mutable reference to the <code>i</code>th T in the vector <code>v</code>.
+Aborts if <code>i</code> is out of bounds.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_borrow_mut">borrow_mut</a>&lt;T&gt;(v: &<b>mut</b> <a href="smart_vector.md#0x1_smart_vector_SmartVector">smart_vector::SmartVector</a>&lt;T&gt;, i: u64): &<b>mut</b> T
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_borrow_mut">borrow_mut</a>&lt;T&gt;(v: &<b>mut</b> <a href="smart_vector.md#0x1_smart_vector_SmartVector">SmartVector</a>&lt;T&gt;, i: u64): &<b>mut</b> T {
+    <b>assert</b>!(i &lt; <a href="smart_vector.md#0x1_smart_vector_length">length</a>(v), <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="smart_vector.md#0x1_smart_vector_EINDEX_OUT_OF_BOUNDS">EINDEX_OUT_OF_BOUNDS</a>));
+    <b>let</b> inline_len = <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&v.inline_vec);
+    <b>if</b> (i &lt; inline_len) {
+        <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow_mut">vector::borrow_mut</a>(&<b>mut</b> v.inline_vec, i)
+    } <b>else</b> {
+        <a href="big_vector.md#0x1_big_vector_borrow_mut">big_vector::borrow_mut</a>(<a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow_mut">option::borrow_mut</a>(&<b>mut</b> v.big_vec), i - inline_len)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_vector_append"></a>
+
+## Function `append`
+
+Empty and destroy the other vector, and push each of the Ts in the other vector onto the lhs vector in the
+same order as they occurred in other.
+Disclaimer: This function may be costly. Use it at your own discretion.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_append">append</a>&lt;T: store&gt;(lhs: &<b>mut</b> <a href="smart_vector.md#0x1_smart_vector_SmartVector">smart_vector::SmartVector</a>&lt;T&gt;, other: <a href="smart_vector.md#0x1_smart_vector_SmartVector">smart_vector::SmartVector</a>&lt;T&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_append">append</a>&lt;T: store&gt;(lhs: &<b>mut</b> <a href="smart_vector.md#0x1_smart_vector_SmartVector">SmartVector</a>&lt;T&gt;, other: <a href="smart_vector.md#0x1_smart_vector_SmartVector">SmartVector</a>&lt;T&gt;) {
+    <b>let</b> other_len = <a href="smart_vector.md#0x1_smart_vector_length">length</a>(&other);
+    <b>let</b> half_other_len = other_len / 2;
+    <b>let</b> i = 0;
+    <b>while</b> (i &lt; half_other_len) {
+        <a href="smart_vector.md#0x1_smart_vector_push_back">push_back</a>(lhs, <a href="smart_vector.md#0x1_smart_vector_swap_remove">swap_remove</a>(&<b>mut</b> other, i));
+        i = i + 1;
+    };
+    <b>while</b> (i &lt; other_len) {
+        <a href="smart_vector.md#0x1_smart_vector_push_back">push_back</a>(lhs, <a href="smart_vector.md#0x1_smart_vector_pop_back">pop_back</a>(&<b>mut</b> other));
+        i = i + 1;
+    };
+    <a href="smart_vector.md#0x1_smart_vector_destroy_empty">destroy_empty</a>(other);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_vector_add_all"></a>
+
+## Function `add_all`
+
+Add multiple values to the vector at once.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_add_all">add_all</a>&lt;T: store&gt;(v: &<b>mut</b> <a href="smart_vector.md#0x1_smart_vector_SmartVector">smart_vector::SmartVector</a>&lt;T&gt;, vals: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;T&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_add_all">add_all</a>&lt;T: store&gt;(v: &<b>mut</b> <a href="smart_vector.md#0x1_smart_vector_SmartVector">SmartVector</a>&lt;T&gt;, vals: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;T&gt;) {
+    <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_for_each">vector::for_each</a>(vals, |val| { <a href="smart_vector.md#0x1_smart_vector_push_back">push_back</a>(v, val); })
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_vector_to_vector"></a>
+
+## Function `to_vector`
+
+Convert a smart vector to a native vector, which is supposed to be called mostly by view functions to get an
+atomic view of the whole vector.
+Disclaimer: This function may be costly as the smart vector may be huge in size. Use it at your own discretion.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_to_vector">to_vector</a>&lt;T: <b>copy</b>, store&gt;(v: &<a href="smart_vector.md#0x1_smart_vector_SmartVector">smart_vector::SmartVector</a>&lt;T&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;T&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_to_vector">to_vector</a>&lt;T: store + <b>copy</b>&gt;(v: &<a href="smart_vector.md#0x1_smart_vector_SmartVector">SmartVector</a>&lt;T&gt;): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;T&gt; {
+    <b>let</b> res = v.inline_vec;
+    <b>if</b> (<a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&v.big_vec)) {
+        <b>let</b> big_vec = <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(&v.big_vec);
+        <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_append">vector::append</a>(&<b>mut</b> res, <a href="big_vector.md#0x1_big_vector_to_vector">big_vector::to_vector</a>(big_vec));
+    };
+    res
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_vector_push_back"></a>
+
+## Function `push_back`
+
+Add T <code>val</code> to the end of the vector <code>v</code>. It grows the buckets when the current buckets are full.
+This operation will cost more gas when it adds new bucket.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_push_back">push_back</a>&lt;T: store&gt;(v: &<b>mut</b> <a href="smart_vector.md#0x1_smart_vector_SmartVector">smart_vector::SmartVector</a>&lt;T&gt;, val: T)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_push_back">push_back</a>&lt;T: store&gt;(v: &<b>mut</b> <a href="smart_vector.md#0x1_smart_vector_SmartVector">SmartVector</a>&lt;T&gt;, val: T) {
+    <b>let</b> len = <a href="smart_vector.md#0x1_smart_vector_length">length</a>(v);
+    <b>let</b> inline_len = <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&v.inline_vec);
+    <b>if</b> (len == inline_len) {
+        <b>let</b> bucket_size = <b>if</b> (<a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&v.inline_capacity)) {
+            <b>if</b> (len &lt; *<a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(&v.inline_capacity)) {
+                <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_push_back">vector::push_back</a>(&<b>mut</b> v.inline_vec, val);
+                <b>return</b>
+            };
+            *<a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(&v.bucket_size)
+        } <b>else</b> {
+            <b>let</b> val_size = size_of_val(&val);
+            <b>if</b> (val_size * (inline_len + 1) &lt; 150 /* magic number */) {
+                <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_push_back">vector::push_back</a>(&<b>mut</b> v.inline_vec, val);
+                <b>return</b>
+            };
+            <b>let</b> estimated_avg_size = max((size_of_val(&v.inline_vec) + val_size) / (inline_len + 1), 1);
+            max(1024 /* free_write_quota */ / estimated_avg_size, 1)
+        };
+        <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_fill">option::fill</a>(&<b>mut</b> v.big_vec, <a href="big_vector.md#0x1_big_vector_empty">big_vector::empty</a>(bucket_size));
+    };
+    <a href="big_vector.md#0x1_big_vector_push_back">big_vector::push_back</a>(<a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow_mut">option::borrow_mut</a>(&<b>mut</b> v.big_vec), val);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_vector_pop_back"></a>
+
+## Function `pop_back`
+
+Pop an T from the end of vector <code>v</code>. It does shrink the buckets if they're empty.
+Aborts if <code>v</code> is empty.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_pop_back">pop_back</a>&lt;T&gt;(v: &<b>mut</b> <a href="smart_vector.md#0x1_smart_vector_SmartVector">smart_vector::SmartVector</a>&lt;T&gt;): T
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_pop_back">pop_back</a>&lt;T&gt;(v: &<b>mut</b> <a href="smart_vector.md#0x1_smart_vector_SmartVector">SmartVector</a>&lt;T&gt;): T {
+    <b>assert</b>!(!<a href="smart_vector.md#0x1_smart_vector_is_empty">is_empty</a>(v), <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="smart_vector.md#0x1_smart_vector_EVECTOR_EMPTY">EVECTOR_EMPTY</a>));
+    <b>let</b> big_vec_wrapper = &<b>mut</b> v.big_vec;
+    <b>if</b> (<a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(big_vec_wrapper)) {
+        <b>let</b> big_vec = <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_extract">option::extract</a>(big_vec_wrapper);
+        <b>let</b> val = <a href="big_vector.md#0x1_big_vector_pop_back">big_vector::pop_back</a>(&<b>mut</b> big_vec);
+        <b>if</b> (<a href="big_vector.md#0x1_big_vector_is_empty">big_vector::is_empty</a>(&big_vec)) {
+            <a href="big_vector.md#0x1_big_vector_destroy_empty">big_vector::destroy_empty</a>(big_vec)
+        } <b>else</b> {
+            <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_fill">option::fill</a>(big_vec_wrapper, big_vec);
+        };
+        val
+    } <b>else</b> {
+        <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_pop_back">vector::pop_back</a>(&<b>mut</b> v.inline_vec)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_vector_remove"></a>
+
+## Function `remove`
+
+Remove the T at index i in the vector v and return the owned value that was previously stored at i in v.
+All Ts occurring at indices greater than i will be shifted down by 1. Will abort if i is out of bounds.
+Disclaimer: This function may be costly. Use it at your own discretion.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_remove">remove</a>&lt;T&gt;(v: &<b>mut</b> <a href="smart_vector.md#0x1_smart_vector_SmartVector">smart_vector::SmartVector</a>&lt;T&gt;, i: u64): T
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_remove">remove</a>&lt;T&gt;(v: &<b>mut</b> <a href="smart_vector.md#0x1_smart_vector_SmartVector">SmartVector</a>&lt;T&gt;, i: u64): T {
+    <b>let</b> len = <a href="smart_vector.md#0x1_smart_vector_length">length</a>(v);
+    <b>assert</b>!(i &lt; len, <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="smart_vector.md#0x1_smart_vector_EINDEX_OUT_OF_BOUNDS">EINDEX_OUT_OF_BOUNDS</a>));
+    <b>let</b> inline_len = <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&v.inline_vec);
+    <b>if</b> (i &lt; inline_len) {
+        <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_remove">vector::remove</a>(&<b>mut</b> v.inline_vec, i)
+    } <b>else</b> {
+        <b>let</b> big_vec_wrapper = &<b>mut</b> v.big_vec;
+        <b>let</b> big_vec = <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_extract">option::extract</a>(big_vec_wrapper);
+        <b>let</b> val = <a href="big_vector.md#0x1_big_vector_remove">big_vector::remove</a>(&<b>mut</b> big_vec, i - inline_len);
+        <b>if</b> (<a href="big_vector.md#0x1_big_vector_is_empty">big_vector::is_empty</a>(&big_vec)) {
+            <a href="big_vector.md#0x1_big_vector_destroy_empty">big_vector::destroy_empty</a>(big_vec)
+        } <b>else</b> {
+            <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_fill">option::fill</a>(big_vec_wrapper, big_vec);
+        };
+        val
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_vector_swap_remove"></a>
+
+## Function `swap_remove`
+
+Swap the <code>i</code>th T of the vector <code>v</code> with the last T and then pop the vector.
+This is O(1), but does not preserve ordering of Ts in the vector.
+Aborts if <code>i</code> is out of bounds.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_swap_remove">swap_remove</a>&lt;T&gt;(v: &<b>mut</b> <a href="smart_vector.md#0x1_smart_vector_SmartVector">smart_vector::SmartVector</a>&lt;T&gt;, i: u64): T
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_swap_remove">swap_remove</a>&lt;T&gt;(v: &<b>mut</b> <a href="smart_vector.md#0x1_smart_vector_SmartVector">SmartVector</a>&lt;T&gt;, i: u64): T {
+    <b>let</b> len = <a href="smart_vector.md#0x1_smart_vector_length">length</a>(v);
+    <b>assert</b>!(i &lt; len, <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="smart_vector.md#0x1_smart_vector_EINDEX_OUT_OF_BOUNDS">EINDEX_OUT_OF_BOUNDS</a>));
+    <b>let</b> inline_len = <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&v.inline_vec);
+    <b>let</b> big_vec_wrapper = &<b>mut</b> v.big_vec;
+    <b>let</b> inline_vec = &<b>mut</b> v.inline_vec;
+    <b>if</b> (i &gt;= inline_len) {
+        <b>let</b> big_vec = <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_extract">option::extract</a>(big_vec_wrapper);
+        <b>let</b> val = <a href="big_vector.md#0x1_big_vector_swap_remove">big_vector::swap_remove</a>(&<b>mut</b> big_vec, i - inline_len);
+        <b>if</b> (<a href="big_vector.md#0x1_big_vector_is_empty">big_vector::is_empty</a>(&big_vec)) {
+            <a href="big_vector.md#0x1_big_vector_destroy_empty">big_vector::destroy_empty</a>(big_vec)
+        } <b>else</b> {
+            <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_fill">option::fill</a>(big_vec_wrapper, big_vec);
+        };
+        val
+    } <b>else</b> {
+        <b>if</b> (inline_len &lt; len) {
+            <b>let</b> big_vec = <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_extract">option::extract</a>(big_vec_wrapper);
+            <b>let</b> last_from_big_vec = <a href="big_vector.md#0x1_big_vector_pop_back">big_vector::pop_back</a>(&<b>mut</b> big_vec);
+            <b>if</b> (<a href="big_vector.md#0x1_big_vector_is_empty">big_vector::is_empty</a>(&big_vec)) {
+                <a href="big_vector.md#0x1_big_vector_destroy_empty">big_vector::destroy_empty</a>(big_vec)
+            } <b>else</b> {
+                <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_fill">option::fill</a>(big_vec_wrapper, big_vec);
+            };
+            <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_push_back">vector::push_back</a>(inline_vec, last_from_big_vec);
+        };
+        <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_swap_remove">vector::swap_remove</a>(inline_vec, i)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_vector_swap"></a>
+
+## Function `swap`
+
+Swap the Ts at the i'th and j'th indices in the vector v. Will abort if either of i or j are out of bounds
+for v.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_swap">swap</a>&lt;T: store&gt;(v: &<b>mut</b> <a href="smart_vector.md#0x1_smart_vector_SmartVector">smart_vector::SmartVector</a>&lt;T&gt;, i: u64, j: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_swap">swap</a>&lt;T: store&gt;(v: &<b>mut</b> <a href="smart_vector.md#0x1_smart_vector_SmartVector">SmartVector</a>&lt;T&gt;, i: u64, j: u64) {
+    <b>if</b> (i &gt; j) {
+        <b>return</b> <a href="smart_vector.md#0x1_smart_vector_swap">swap</a>(v, j, i)
+    };
+    <b>let</b> len = <a href="smart_vector.md#0x1_smart_vector_length">length</a>(v);
+    <b>assert</b>!(j &lt; len, <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="smart_vector.md#0x1_smart_vector_EINDEX_OUT_OF_BOUNDS">EINDEX_OUT_OF_BOUNDS</a>));
+    <b>let</b> inline_len = <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&v.inline_vec);
+    <b>if</b> (i &gt;= inline_len) {
+        <a href="big_vector.md#0x1_big_vector_swap">big_vector::swap</a>(<a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow_mut">option::borrow_mut</a>(&<b>mut</b> v.big_vec), i - inline_len, j - inline_len);
+    } <b>else</b> <b>if</b> (j &lt; inline_len) {
+        <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_swap">vector::swap</a>(&<b>mut</b> v.inline_vec, i, j);
+    } <b>else</b> {
+        <b>let</b> big_vec = <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow_mut">option::borrow_mut</a>(&<b>mut</b> v.big_vec);
+        <b>let</b> inline_vec = &<b>mut</b> v.inline_vec;
+        <b>let</b> element_i = <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_swap_remove">vector::swap_remove</a>(inline_vec, i);
+        <b>let</b> element_j = <a href="big_vector.md#0x1_big_vector_swap_remove">big_vector::swap_remove</a>(big_vec, j - inline_len);
+        <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_push_back">vector::push_back</a>(inline_vec, element_j);
+        <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_swap">vector::swap</a>(inline_vec, i, inline_len - 1);
+        <a href="big_vector.md#0x1_big_vector_push_back">big_vector::push_back</a>(big_vec, element_i);
+        <a href="big_vector.md#0x1_big_vector_swap">big_vector::swap</a>(big_vec, j - inline_len, len - inline_len - 1);
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_vector_reverse"></a>
+
+## Function `reverse`
+
+Reverse the order of the Ts in the vector v in-place.
+Disclaimer: This function may be costly. Use it at your own discretion.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_reverse">reverse</a>&lt;T: store&gt;(v: &<b>mut</b> <a href="smart_vector.md#0x1_smart_vector_SmartVector">smart_vector::SmartVector</a>&lt;T&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_reverse">reverse</a>&lt;T: store&gt;(v: &<b>mut</b> <a href="smart_vector.md#0x1_smart_vector_SmartVector">SmartVector</a>&lt;T&gt;) {
+    <b>let</b> inline_len = <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&v.inline_vec);
+    <b>let</b> i = 0;
+    <b>let</b> new_inline_vec = <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>[];
+    // Push the last `inline_len` Ts into a temp <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>.
+    <b>while</b> (i &lt; inline_len) {
+        <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_push_back">vector::push_back</a>(&<b>mut</b> new_inline_vec, <a href="smart_vector.md#0x1_smart_vector_pop_back">pop_back</a>(v));
+        i = i + 1;
+    };
+    <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_reverse">vector::reverse</a>(&<b>mut</b> new_inline_vec);
+    // Reverse the <a href="big_vector.md#0x1_big_vector">big_vector</a> left <b>if</b> <b>exists</b>.
+    <b>if</b> (<a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&v.big_vec)) {
+        <a href="big_vector.md#0x1_big_vector_reverse">big_vector::reverse</a>(<a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow_mut">option::borrow_mut</a>(&<b>mut</b> v.big_vec));
+    };
+    // Mem::swap the two vectors.
+    <b>let</b> temp_vec = <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>[];
+    <b>while</b> (!<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_is_empty">vector::is_empty</a>(&<b>mut</b> v.inline_vec)) {
+        <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_push_back">vector::push_back</a>(&<b>mut</b> temp_vec, <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_pop_back">vector::pop_back</a>(&<b>mut</b> v.inline_vec));
+    };
+    <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_reverse">vector::reverse</a>(&<b>mut</b> temp_vec);
+    <b>while</b> (!<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_is_empty">vector::is_empty</a>(&<b>mut</b> new_inline_vec)) {
+        <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_push_back">vector::push_back</a>(&<b>mut</b> v.inline_vec, <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_pop_back">vector::pop_back</a>(&<b>mut</b> new_inline_vec));
+    };
+    <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_destroy_empty">vector::destroy_empty</a>(new_inline_vec);
+    // Push the rest Ts originally left in inline_vector back <b>to</b> the end of the smart <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>.
+    <b>while</b> (!<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_is_empty">vector::is_empty</a>(&<b>mut</b> temp_vec)) {
+        <a href="smart_vector.md#0x1_smart_vector_push_back">push_back</a>(v, <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_pop_back">vector::pop_back</a>(&<b>mut</b> temp_vec));
+    };
+    <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_destroy_empty">vector::destroy_empty</a>(temp_vec);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_vector_index_of"></a>
+
+## Function `index_of`
+
+Return <code>(<b>true</b>, i)</code> if <code>val</code> is in the vector <code>v</code> at index <code>i</code>.
+Otherwise, returns <code>(<b>false</b>, 0)</code>.
+Disclaimer: This function may be costly. Use it at your own discretion.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_index_of">index_of</a>&lt;T&gt;(v: &<a href="smart_vector.md#0x1_smart_vector_SmartVector">smart_vector::SmartVector</a>&lt;T&gt;, val: &T): (bool, u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_index_of">index_of</a>&lt;T&gt;(v: &<a href="smart_vector.md#0x1_smart_vector_SmartVector">SmartVector</a>&lt;T&gt;, val: &T): (bool, u64) {
+    <b>let</b> (found, i) = <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_index_of">vector::index_of</a>(&v.inline_vec, val);
+    <b>if</b> (found) {
+        (<b>true</b>, i)
+    } <b>else</b> <b>if</b> (<a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&v.big_vec)) {
+        <b>let</b> (found, i) = <a href="big_vector.md#0x1_big_vector_index_of">big_vector::index_of</a>(<a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(&v.big_vec), val);
+        (found, i + <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&v.inline_vec))
+    } <b>else</b> {
+        (<b>false</b>, 0)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_vector_contains"></a>
+
+## Function `contains`
+
+Return true if <code>val</code> is in the vector <code>v</code>.
+Disclaimer: This function may be costly. Use it at your own discretion.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_contains">contains</a>&lt;T&gt;(v: &<a href="smart_vector.md#0x1_smart_vector_SmartVector">smart_vector::SmartVector</a>&lt;T&gt;, val: &T): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_contains">contains</a>&lt;T&gt;(v: &<a href="smart_vector.md#0x1_smart_vector_SmartVector">SmartVector</a>&lt;T&gt;, val: &T): bool {
+    <b>if</b> (<a href="smart_vector.md#0x1_smart_vector_is_empty">is_empty</a>(v)) <b>return</b> <b>false</b>;
+    <b>let</b> (exist, _) = <a href="smart_vector.md#0x1_smart_vector_index_of">index_of</a>(v, val);
+    exist
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_vector_length"></a>
+
+## Function `length`
+
+Return the length of the vector.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_length">length</a>&lt;T&gt;(v: &<a href="smart_vector.md#0x1_smart_vector_SmartVector">smart_vector::SmartVector</a>&lt;T&gt;): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_length">length</a>&lt;T&gt;(v: &<a href="smart_vector.md#0x1_smart_vector_SmartVector">SmartVector</a>&lt;T&gt;): u64 {
+    <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&v.inline_vec) + <b>if</b> (<a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_none">option::is_none</a>(&v.big_vec)) {
+        0
+    } <b>else</b> {
+        <a href="big_vector.md#0x1_big_vector_length">big_vector::length</a>(<a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(&v.big_vec))
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_vector_is_empty"></a>
+
+## Function `is_empty`
+
+Return <code><b>true</b></code> if the vector <code>v</code> has no Ts and <code><b>false</b></code> otherwise.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_is_empty">is_empty</a>&lt;T&gt;(v: &<a href="smart_vector.md#0x1_smart_vector_SmartVector">smart_vector::SmartVector</a>&lt;T&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_is_empty">is_empty</a>&lt;T&gt;(v: &<a href="smart_vector.md#0x1_smart_vector_SmartVector">SmartVector</a>&lt;T&gt;): bool {
+    <a href="smart_vector.md#0x1_smart_vector_length">length</a>(v) == 0
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_vector_for_each"></a>
+
+## Function `for_each`
+
+Apply the function to each T in the vector, consuming it.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_for_each">for_each</a>&lt;T: store&gt;(v: <a href="smart_vector.md#0x1_smart_vector_SmartVector">smart_vector::SmartVector</a>&lt;T&gt;, f: |T|)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_for_each">for_each</a>&lt;T: store&gt;(v: <a href="smart_vector.md#0x1_smart_vector_SmartVector">SmartVector</a>&lt;T&gt;, f: |T|) {
+    aptos_std::smart_vector::reverse(&<b>mut</b> v); // We need <b>to</b> reverse the <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a> <b>to</b> consume it efficiently
+    aptos_std::smart_vector::for_each_reverse(v, |e| f(e));
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_vector_for_each_reverse"></a>
+
+## Function `for_each_reverse`
+
+Apply the function to each T in the vector, consuming it.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_for_each_reverse">for_each_reverse</a>&lt;T&gt;(v: <a href="smart_vector.md#0x1_smart_vector_SmartVector">smart_vector::SmartVector</a>&lt;T&gt;, f: |T|)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_for_each_reverse">for_each_reverse</a>&lt;T&gt;(v: <a href="smart_vector.md#0x1_smart_vector_SmartVector">SmartVector</a>&lt;T&gt;, f: |T|) {
+    <b>let</b> len = aptos_std::smart_vector::length(&v);
+    <b>while</b> (len &gt; 0) {
+        f(aptos_std::smart_vector::pop_back(&<b>mut</b> v));
+        len = len - 1;
+    };
+    aptos_std::smart_vector::destroy_empty(v)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_vector_for_each_ref"></a>
+
+## Function `for_each_ref`
+
+Apply the function to a reference of each T in the vector.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_for_each_ref">for_each_ref</a>&lt;T&gt;(v: &<a href="smart_vector.md#0x1_smart_vector_SmartVector">smart_vector::SmartVector</a>&lt;T&gt;, f: |&T|)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_for_each_ref">for_each_ref</a>&lt;T&gt;(v: &<a href="smart_vector.md#0x1_smart_vector_SmartVector">SmartVector</a>&lt;T&gt;, f: |&T|) {
+    <b>let</b> i = 0;
+    <b>let</b> len = aptos_std::smart_vector::length(v);
+    <b>while</b> (i &lt; len) {
+        f(aptos_std::smart_vector::borrow(v, i));
+        i = i + 1
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_vector_for_each_mut"></a>
+
+## Function `for_each_mut`
+
+Apply the function to a mutable reference to each T in the vector.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_for_each_mut">for_each_mut</a>&lt;T&gt;(v: &<b>mut</b> <a href="smart_vector.md#0x1_smart_vector_SmartVector">smart_vector::SmartVector</a>&lt;T&gt;, f: |&<b>mut</b> T|)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_for_each_mut">for_each_mut</a>&lt;T&gt;(v: &<b>mut</b> <a href="smart_vector.md#0x1_smart_vector_SmartVector">SmartVector</a>&lt;T&gt;, f: |&<b>mut</b> T|) {
+    <b>let</b> i = 0;
+    <b>let</b> len = aptos_std::smart_vector::length(v);
+    <b>while</b> (i &lt; len) {
+        f(aptos_std::smart_vector::borrow_mut(v, i));
+        i = i + 1
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_vector_enumerate_ref"></a>
+
+## Function `enumerate_ref`
+
+Apply the function to a reference of each T in the vector with its index.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_enumerate_ref">enumerate_ref</a>&lt;T&gt;(v: &<a href="smart_vector.md#0x1_smart_vector_SmartVector">smart_vector::SmartVector</a>&lt;T&gt;, f: |(u64, &T)|)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_enumerate_ref">enumerate_ref</a>&lt;T&gt;(v: &<a href="smart_vector.md#0x1_smart_vector_SmartVector">SmartVector</a>&lt;T&gt;, f: |u64, &T|) {
+    <b>let</b> i = 0;
+    <b>let</b> len = aptos_std::smart_vector::length(v);
+    <b>while</b> (i &lt; len) {
+        f(i, aptos_std::smart_vector::borrow(v, i));
+        i = i + 1;
+    };
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_vector_enumerate_mut"></a>
+
+## Function `enumerate_mut`
+
+Apply the function to a mutable reference of each T in the vector with its index.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_enumerate_mut">enumerate_mut</a>&lt;T&gt;(v: &<b>mut</b> <a href="smart_vector.md#0x1_smart_vector_SmartVector">smart_vector::SmartVector</a>&lt;T&gt;, f: |(u64, &<b>mut</b> T)|)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_enumerate_mut">enumerate_mut</a>&lt;T&gt;(v: &<b>mut</b> <a href="smart_vector.md#0x1_smart_vector_SmartVector">SmartVector</a>&lt;T&gt;, f: |u64, &<b>mut</b> T|) {
+    <b>let</b> i = 0;
+    <b>let</b> len = <a href="smart_vector.md#0x1_smart_vector_length">length</a>(v);
+    <b>while</b> (i &lt; len) {
+        f(i, <a href="smart_vector.md#0x1_smart_vector_borrow_mut">borrow_mut</a>(v, i));
+        i = i + 1;
+    };
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_vector_fold"></a>
+
+## Function `fold`
+
+Fold the function over the Ts. For example, <code><a href="smart_vector.md#0x1_smart_vector_fold">fold</a>(<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>[1,2,3], 0, f)</code> will execute
+<code>f(f(f(0, 1), 2), 3)</code>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_fold">fold</a>&lt;Accumulator, T: store&gt;(v: <a href="smart_vector.md#0x1_smart_vector_SmartVector">smart_vector::SmartVector</a>&lt;T&gt;, init: Accumulator, f: |(Accumulator, T)|Accumulator): Accumulator
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_fold">fold</a>&lt;Accumulator, T: store&gt;(
+    v: <a href="smart_vector.md#0x1_smart_vector_SmartVector">SmartVector</a>&lt;T&gt;,
+    init: Accumulator,
+    f: |Accumulator, T|Accumulator
+): Accumulator {
+    <b>let</b> accu = init;
+    aptos_std::smart_vector::for_each(v, |elem| accu = f(accu, elem));
+    accu
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_vector_foldr"></a>
+
+## Function `foldr`
+
+Fold right like fold above but working right to left. For example, <code><a href="smart_vector.md#0x1_smart_vector_fold">fold</a>(<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>[1,2,3], 0, f)</code> will execute
+<code>f(1, f(2, f(3, 0)))</code>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_foldr">foldr</a>&lt;Accumulator, T&gt;(v: <a href="smart_vector.md#0x1_smart_vector_SmartVector">smart_vector::SmartVector</a>&lt;T&gt;, init: Accumulator, f: |(T, Accumulator)|Accumulator): Accumulator
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_foldr">foldr</a>&lt;Accumulator, T&gt;(
+    v: <a href="smart_vector.md#0x1_smart_vector_SmartVector">SmartVector</a>&lt;T&gt;,
+    init: Accumulator,
+    f: |T, Accumulator|Accumulator
+): Accumulator {
+    <b>let</b> accu = init;
+    aptos_std::smart_vector::for_each_reverse(v, |elem| accu = f(elem, accu));
+    accu
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_vector_map_ref"></a>
+
+## Function `map_ref`
+
+Map the function over the references of the Ts of the vector, producing a new vector without modifying the
+original vector.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_map_ref">map_ref</a>&lt;T1, T2: store&gt;(v: &<a href="smart_vector.md#0x1_smart_vector_SmartVector">smart_vector::SmartVector</a>&lt;T1&gt;, f: |&T1|T2): <a href="smart_vector.md#0x1_smart_vector_SmartVector">smart_vector::SmartVector</a>&lt;T2&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_map_ref">map_ref</a>&lt;T1, T2: store&gt;(
+    v: &<a href="smart_vector.md#0x1_smart_vector_SmartVector">SmartVector</a>&lt;T1&gt;,
+    f: |&T1|T2
+): <a href="smart_vector.md#0x1_smart_vector_SmartVector">SmartVector</a>&lt;T2&gt; {
+    <b>let</b> result = aptos_std::smart_vector::new&lt;T2&gt;();
+    aptos_std::smart_vector::for_each_ref(v, |elem| aptos_std::smart_vector::push_back(&<b>mut</b> result, f(elem)));
+    result
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_vector_map"></a>
+
+## Function `map`
+
+Map the function over the Ts of the vector, producing a new vector.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_map">map</a>&lt;T1: store, T2: store&gt;(v: <a href="smart_vector.md#0x1_smart_vector_SmartVector">smart_vector::SmartVector</a>&lt;T1&gt;, f: |T1|T2): <a href="smart_vector.md#0x1_smart_vector_SmartVector">smart_vector::SmartVector</a>&lt;T2&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_map">map</a>&lt;T1: store, T2: store&gt;(
+    v: <a href="smart_vector.md#0x1_smart_vector_SmartVector">SmartVector</a>&lt;T1&gt;,
+    f: |T1|T2
+): <a href="smart_vector.md#0x1_smart_vector_SmartVector">SmartVector</a>&lt;T2&gt; {
+    <b>let</b> result = aptos_std::smart_vector::new&lt;T2&gt;();
+    aptos_std::smart_vector::for_each(v, |elem| <a href="smart_vector.md#0x1_smart_vector_push_back">push_back</a>(&<b>mut</b> result, f(elem)));
+    result
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_vector_filter"></a>
+
+## Function `filter`
+
+Filter the vector using the boolean function, removing all Ts for which <code>p(e)</code> is not true.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_filter">filter</a>&lt;T: drop, store&gt;(v: <a href="smart_vector.md#0x1_smart_vector_SmartVector">smart_vector::SmartVector</a>&lt;T&gt;, p: |&T|bool): <a href="smart_vector.md#0x1_smart_vector_SmartVector">smart_vector::SmartVector</a>&lt;T&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_filter">filter</a>&lt;T: store + drop&gt;(
+    v: <a href="smart_vector.md#0x1_smart_vector_SmartVector">SmartVector</a>&lt;T&gt;,
+    p: |&T|bool
+): <a href="smart_vector.md#0x1_smart_vector_SmartVector">SmartVector</a>&lt;T&gt; {
+    <b>let</b> result = aptos_std::smart_vector::new&lt;T&gt;();
+    aptos_std::smart_vector::for_each(v, |elem| {
+        <b>if</b> (p(&elem)) aptos_std::smart_vector::push_back(&<b>mut</b> result, elem);
+    });
+    result
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_vector_zip"></a>
+
+## Function `zip`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_zip">zip</a>&lt;T1: store, T2: store&gt;(v1: <a href="smart_vector.md#0x1_smart_vector_SmartVector">smart_vector::SmartVector</a>&lt;T1&gt;, v2: <a href="smart_vector.md#0x1_smart_vector_SmartVector">smart_vector::SmartVector</a>&lt;T2&gt;, f: |(T1, T2)|)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_zip">zip</a>&lt;T1: store, T2: store&gt;(v1: <a href="smart_vector.md#0x1_smart_vector_SmartVector">SmartVector</a>&lt;T1&gt;, v2: <a href="smart_vector.md#0x1_smart_vector_SmartVector">SmartVector</a>&lt;T2&gt;, f: |T1, T2|) {
+    // We need <b>to</b> reverse the vectors <b>to</b> consume it efficiently
+    aptos_std::smart_vector::reverse(&<b>mut</b> v1);
+    aptos_std::smart_vector::reverse(&<b>mut</b> v2);
+    aptos_std::smart_vector::zip_reverse(v1, v2, |e1, e2| f(e1, e2));
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_vector_zip_reverse"></a>
+
+## Function `zip_reverse`
+
+Apply the function to each pair of elements in the two given vectors in the reverse order, consuming them.
+This errors out if the vectors are not of the same length.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_zip_reverse">zip_reverse</a>&lt;T1, T2&gt;(v1: <a href="smart_vector.md#0x1_smart_vector_SmartVector">smart_vector::SmartVector</a>&lt;T1&gt;, v2: <a href="smart_vector.md#0x1_smart_vector_SmartVector">smart_vector::SmartVector</a>&lt;T2&gt;, f: |(T1, T2)|)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_zip_reverse">zip_reverse</a>&lt;T1, T2&gt;(
+    v1: <a href="smart_vector.md#0x1_smart_vector_SmartVector">SmartVector</a>&lt;T1&gt;,
+    v2: <a href="smart_vector.md#0x1_smart_vector_SmartVector">SmartVector</a>&lt;T2&gt;,
+    f: |T1, T2|,
+) {
+    <b>let</b> len = aptos_std::smart_vector::length(&v1);
+    // We can't <b>use</b> the constant <a href="smart_vector.md#0x1_smart_vector_ESMART_VECTORS_LENGTH_MISMATCH">ESMART_VECTORS_LENGTH_MISMATCH</a> here <b>as</b> all calling code would then need <b>to</b> define it
+    // due <b>to</b> how inline functions work.
+    <b>assert</b>!(len == aptos_std::smart_vector::length(&v2), 0x20005);
+    <b>while</b> (len &gt; 0) {
+        f(aptos_std::smart_vector::pop_back(&<b>mut</b> v1), aptos_std::smart_vector::pop_back(&<b>mut</b> v2));
+        len = len - 1;
+    };
+    aptos_std::smart_vector::destroy_empty(v1);
+    aptos_std::smart_vector::destroy_empty(v2);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_vector_zip_ref"></a>
+
+## Function `zip_ref`
+
+Apply the function to the references of each pair of elements in the two given vectors.
+This errors out if the vectors are not of the same length.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_zip_ref">zip_ref</a>&lt;T1, T2&gt;(v1: &<a href="smart_vector.md#0x1_smart_vector_SmartVector">smart_vector::SmartVector</a>&lt;T1&gt;, v2: &<a href="smart_vector.md#0x1_smart_vector_SmartVector">smart_vector::SmartVector</a>&lt;T2&gt;, f: |(&T1, &T2)|)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_zip_ref">zip_ref</a>&lt;T1, T2&gt;(
+    v1: &<a href="smart_vector.md#0x1_smart_vector_SmartVector">SmartVector</a>&lt;T1&gt;,
+    v2: &<a href="smart_vector.md#0x1_smart_vector_SmartVector">SmartVector</a>&lt;T2&gt;,
+    f: |&T1, &T2|,
+) {
+    <b>let</b> len = aptos_std::smart_vector::length(v1);
+    // We can't <b>use</b> the constant <a href="smart_vector.md#0x1_smart_vector_ESMART_VECTORS_LENGTH_MISMATCH">ESMART_VECTORS_LENGTH_MISMATCH</a> here <b>as</b> all calling code would then need <b>to</b> define it
+    // due <b>to</b> how inline functions work.
+    <b>assert</b>!(len == aptos_std::smart_vector::length(v2), 0x20005);
+    <b>let</b> i = 0;
+    <b>while</b> (i &lt; len) {
+        f(aptos_std::smart_vector::borrow(v1, i), aptos_std::smart_vector::borrow(v2, i));
+        i = i + 1
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_vector_zip_mut"></a>
+
+## Function `zip_mut`
+
+Apply the function to mutable references to each pair of elements in the two given vectors.
+This errors out if the vectors are not of the same length.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_zip_mut">zip_mut</a>&lt;T1, T2&gt;(v1: &<b>mut</b> <a href="smart_vector.md#0x1_smart_vector_SmartVector">smart_vector::SmartVector</a>&lt;T1&gt;, v2: &<b>mut</b> <a href="smart_vector.md#0x1_smart_vector_SmartVector">smart_vector::SmartVector</a>&lt;T2&gt;, f: |(&<b>mut</b> T1, &<b>mut</b> T2)|)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_zip_mut">zip_mut</a>&lt;T1, T2&gt;(
+    v1: &<b>mut</b> <a href="smart_vector.md#0x1_smart_vector_SmartVector">SmartVector</a>&lt;T1&gt;,
+    v2: &<b>mut</b> <a href="smart_vector.md#0x1_smart_vector_SmartVector">SmartVector</a>&lt;T2&gt;,
+    f: |&<b>mut</b> T1, &<b>mut</b> T2|,
+) {
+    <b>let</b> i = 0;
+    <b>let</b> len = aptos_std::smart_vector::length(v1);
+    // We can't <b>use</b> the constant <a href="smart_vector.md#0x1_smart_vector_ESMART_VECTORS_LENGTH_MISMATCH">ESMART_VECTORS_LENGTH_MISMATCH</a> here <b>as</b> all calling code would then need <b>to</b> define it
+    // due <b>to</b> how inline functions work.
+    <b>assert</b>!(len == aptos_std::smart_vector::length(v2), 0x20005);
+    <b>while</b> (i &lt; len) {
+        f(aptos_std::smart_vector::borrow_mut(v1, i), aptos_std::smart_vector::borrow_mut(v2, i));
+        i = i + 1
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_vector_zip_map"></a>
+
+## Function `zip_map`
+
+Map the function over the element pairs of the two vectors, producing a new vector.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_zip_map">zip_map</a>&lt;T1: store, T2: store, NewT: store&gt;(v1: <a href="smart_vector.md#0x1_smart_vector_SmartVector">smart_vector::SmartVector</a>&lt;T1&gt;, v2: <a href="smart_vector.md#0x1_smart_vector_SmartVector">smart_vector::SmartVector</a>&lt;T2&gt;, f: |(T1, T2)|NewT): <a href="smart_vector.md#0x1_smart_vector_SmartVector">smart_vector::SmartVector</a>&lt;NewT&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_zip_map">zip_map</a>&lt;T1: store, T2: store, NewT: store&gt;(
+    v1: <a href="smart_vector.md#0x1_smart_vector_SmartVector">SmartVector</a>&lt;T1&gt;,
+    v2: <a href="smart_vector.md#0x1_smart_vector_SmartVector">SmartVector</a>&lt;T2&gt;,
+    f: |T1, T2|NewT
+): <a href="smart_vector.md#0x1_smart_vector_SmartVector">SmartVector</a>&lt;NewT&gt; {
+    // We can't <b>use</b> the constant <a href="smart_vector.md#0x1_smart_vector_ESMART_VECTORS_LENGTH_MISMATCH">ESMART_VECTORS_LENGTH_MISMATCH</a> here <b>as</b> all calling code would then need <b>to</b> define it
+    // due <b>to</b> how inline functions work.
+    <b>assert</b>!(aptos_std::smart_vector::length(&v1) == aptos_std::smart_vector::length(&v2), 0x20005);
+
+    <b>let</b> result = aptos_std::smart_vector::new&lt;NewT&gt;();
+    aptos_std::smart_vector::zip(v1, v2, |e1, e2| <a href="smart_vector.md#0x1_smart_vector_push_back">push_back</a>(&<b>mut</b> result, f(e1, e2)));
+    result
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_smart_vector_zip_map_ref"></a>
+
+## Function `zip_map_ref`
+
+Map the function over the references of the element pairs of two vectors, producing a new vector from the return
+values without modifying the original vectors.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_zip_map_ref">zip_map_ref</a>&lt;T1, T2, NewT: store&gt;(v1: &<a href="smart_vector.md#0x1_smart_vector_SmartVector">smart_vector::SmartVector</a>&lt;T1&gt;, v2: &<a href="smart_vector.md#0x1_smart_vector_SmartVector">smart_vector::SmartVector</a>&lt;T2&gt;, f: |(&T1, &T2)|NewT): <a href="smart_vector.md#0x1_smart_vector_SmartVector">smart_vector::SmartVector</a>&lt;NewT&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_zip_map_ref">zip_map_ref</a>&lt;T1, T2, NewT: store&gt;(
+    v1: &<a href="smart_vector.md#0x1_smart_vector_SmartVector">SmartVector</a>&lt;T1&gt;,
+    v2: &<a href="smart_vector.md#0x1_smart_vector_SmartVector">SmartVector</a>&lt;T2&gt;,
+    f: |&T1, &T2|NewT
+): <a href="smart_vector.md#0x1_smart_vector_SmartVector">SmartVector</a>&lt;NewT&gt; {
+    // We can't <b>use</b> the constant <a href="smart_vector.md#0x1_smart_vector_ESMART_VECTORS_LENGTH_MISMATCH">ESMART_VECTORS_LENGTH_MISMATCH</a> here <b>as</b> all calling code would then need <b>to</b> define it
+    // due <b>to</b> how inline functions work.
+    <b>assert</b>!(aptos_std::smart_vector::length(v1) == aptos_std::smart_vector::length(v2), 0x20005);
+
+    <b>let</b> result = aptos_std::smart_vector::new&lt;NewT&gt;();
+    aptos_std::smart_vector::zip_ref(v1, v2, |e1, e2| <a href="smart_vector.md#0x1_smart_vector_push_back">push_back</a>(&<b>mut</b> result, f(e1, e2)));
+    result
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+<a id="@Specification_1_SmartVector"></a>
+
+### Struct `SmartVector`
+
+
+<pre><code><b>struct</b> <a href="smart_vector.md#0x1_smart_vector_SmartVector">SmartVector</a>&lt;T&gt; <b>has</b> store
+</code></pre>
+
+
+
+<dl>
+<dt>
+<code>inline_vec: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;T&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>big_vec: <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="big_vector.md#0x1_big_vector_BigVector">big_vector::BigVector</a>&lt;T&gt;&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>inline_capacity: <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;u64&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>bucket_size: <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;u64&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+
+<pre><code><b>invariant</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_none">option::is_none</a>(bucket_size)
+    || (<a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(bucket_size) && <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(bucket_size) != 0);
+<b>invariant</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_none">option::is_none</a>(inline_capacity)
+    || (len(inline_vec) &lt;= <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(inline_capacity));
+<b>invariant</b> (<a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_none">option::is_none</a>(inline_capacity) && <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_none">option::is_none</a>(bucket_size))
+    || (<a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(inline_capacity) && <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(bucket_size));
+</code></pre>
+
+
+
+<a id="@Specification_1_empty"></a>
+
+### Function `empty`
+
+
+<pre><code>#[deprecated]
+<b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_empty">empty</a>&lt;T: store&gt;(): <a href="smart_vector.md#0x1_smart_vector_SmartVector">smart_vector::SmartVector</a>&lt;T&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_empty_with_config"></a>
+
+### Function `empty_with_config`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_empty_with_config">empty_with_config</a>&lt;T: store&gt;(inline_capacity: u64, bucket_size: u64): <a href="smart_vector.md#0x1_smart_vector_SmartVector">smart_vector::SmartVector</a>&lt;T&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> bucket_size == 0;
+</code></pre>
+
+
+
+<a id="@Specification_1_destroy_empty"></a>
+
+### Function `destroy_empty`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_destroy_empty">destroy_empty</a>&lt;T&gt;(v: <a href="smart_vector.md#0x1_smart_vector_SmartVector">smart_vector::SmartVector</a>&lt;T&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !(<a href="smart_vector.md#0x1_smart_vector_is_empty">is_empty</a>(v));
+<b>aborts_if</b> len(v.inline_vec) != 0
+    || <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(v.big_vec);
+</code></pre>
+
+
+
+<a id="@Specification_1_borrow"></a>
+
+### Function `borrow`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_borrow">borrow</a>&lt;T&gt;(v: &<a href="smart_vector.md#0x1_smart_vector_SmartVector">smart_vector::SmartVector</a>&lt;T&gt;, i: u64): &T
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> i &gt;= <a href="smart_vector.md#0x1_smart_vector_length">length</a>(v);
+<b>aborts_if</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(v.big_vec) && (
+    (len(v.inline_vec) + <a href="big_vector.md#0x1_big_vector_length">big_vector::length</a>&lt;T&gt;(<a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(v.big_vec))) &gt; MAX_U64
+);
+</code></pre>
+
+
+
+<a id="@Specification_1_append"></a>
+
+### Function `append`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_append">append</a>&lt;T: store&gt;(lhs: &<b>mut</b> <a href="smart_vector.md#0x1_smart_vector_SmartVector">smart_vector::SmartVector</a>&lt;T&gt;, other: <a href="smart_vector.md#0x1_smart_vector_SmartVector">smart_vector::SmartVector</a>&lt;T&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_push_back"></a>
+
+### Function `push_back`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_push_back">push_back</a>&lt;T: store&gt;(v: &<b>mut</b> <a href="smart_vector.md#0x1_smart_vector_SmartVector">smart_vector::SmartVector</a>&lt;T&gt;, val: T)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_pop_back"></a>
+
+### Function `pop_back`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_pop_back">pop_back</a>&lt;T&gt;(v: &<b>mut</b> <a href="smart_vector.md#0x1_smart_vector_SmartVector">smart_vector::SmartVector</a>&lt;T&gt;): T
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify_duration_estimate = 120;
+<b>aborts_if</b>  <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(v.big_vec)
+    &&
+    (<a href="table_with_length.md#0x1_table_with_length_spec_len">table_with_length::spec_len</a>(<a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(v.big_vec).buckets) == 0);
+<b>aborts_if</b> <a href="smart_vector.md#0x1_smart_vector_is_empty">is_empty</a>(v);
+<b>aborts_if</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(v.big_vec) && (
+    (len(v.inline_vec) + <a href="big_vector.md#0x1_big_vector_length">big_vector::length</a>&lt;T&gt;(<a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(v.big_vec))) &gt; MAX_U64
+);
+<b>ensures</b> <a href="smart_vector.md#0x1_smart_vector_length">length</a>(v) == <a href="smart_vector.md#0x1_smart_vector_length">length</a>(<b>old</b>(v)) - 1;
+</code></pre>
+
+
+
+<a id="@Specification_1_remove"></a>
+
+### Function `remove`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_remove">remove</a>&lt;T&gt;(v: &<b>mut</b> <a href="smart_vector.md#0x1_smart_vector_SmartVector">smart_vector::SmartVector</a>&lt;T&gt;, i: u64): T
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_swap_remove"></a>
+
+### Function `swap_remove`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_swap_remove">swap_remove</a>&lt;T&gt;(v: &<b>mut</b> <a href="smart_vector.md#0x1_smart_vector_SmartVector">smart_vector::SmartVector</a>&lt;T&gt;, i: u64): T
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+<b>aborts_if</b> i &gt;= <a href="smart_vector.md#0x1_smart_vector_length">length</a>(v);
+<b>aborts_if</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(v.big_vec) && (
+    (len(v.inline_vec) + <a href="big_vector.md#0x1_big_vector_length">big_vector::length</a>&lt;T&gt;(<a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(v.big_vec))) &gt; MAX_U64
+);
+<b>ensures</b> <a href="smart_vector.md#0x1_smart_vector_length">length</a>(v) == <a href="smart_vector.md#0x1_smart_vector_length">length</a>(<b>old</b>(v)) - 1;
+</code></pre>
+
+
+
+<a id="@Specification_1_swap"></a>
+
+### Function `swap`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_swap">swap</a>&lt;T: store&gt;(v: &<b>mut</b> <a href="smart_vector.md#0x1_smart_vector_SmartVector">smart_vector::SmartVector</a>&lt;T&gt;, i: u64, j: u64)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_length"></a>
+
+### Function `length`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="smart_vector.md#0x1_smart_vector_length">length</a>&lt;T&gt;(v: &<a href="smart_vector.md#0x1_smart_vector_SmartVector">smart_vector::SmartVector</a>&lt;T&gt;): u64
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(v.big_vec) && len(v.inline_vec) + <a href="big_vector.md#0x1_big_vector_length">big_vector::length</a>(<a href="../../../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_spec_borrow">option::spec_borrow</a>(v.big_vec)) &gt; MAX_U64;
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/string_utils.md b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/string_utils.md
new file mode 100644
index 0000000000000..396d1c84fb50c
--- /dev/null
+++ b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/string_utils.md
@@ -0,0 +1,763 @@
+
+<a id="0x1_string_utils"></a>
+
+# Module `0x1::string_utils`
+
+A module for formatting move values as strings.
+
+
+-  [Struct `Cons`](#0x1_string_utils_Cons)
+-  [Struct `NIL`](#0x1_string_utils_NIL)
+-  [Struct `FakeCons`](#0x1_string_utils_FakeCons)
+    -  [[test_only]](#@[test_only]_0)
+-  [Constants](#@Constants_1)
+-  [Function `to_string`](#0x1_string_utils_to_string)
+-  [Function `to_string_with_canonical_addresses`](#0x1_string_utils_to_string_with_canonical_addresses)
+-  [Function `to_string_with_integer_types`](#0x1_string_utils_to_string_with_integer_types)
+-  [Function `debug_string`](#0x1_string_utils_debug_string)
+-  [Function `format1`](#0x1_string_utils_format1)
+-  [Function `format2`](#0x1_string_utils_format2)
+-  [Function `format3`](#0x1_string_utils_format3)
+-  [Function `format4`](#0x1_string_utils_format4)
+-  [Function `cons`](#0x1_string_utils_cons)
+-  [Function `nil`](#0x1_string_utils_nil)
+-  [Function `list1`](#0x1_string_utils_list1)
+-  [Function `list2`](#0x1_string_utils_list2)
+-  [Function `list3`](#0x1_string_utils_list3)
+-  [Function `list4`](#0x1_string_utils_list4)
+-  [Function `native_format`](#0x1_string_utils_native_format)
+-  [Function `native_format_list`](#0x1_string_utils_native_format_list)
+-  [Specification](#@Specification_2)
+    -  [Function `to_string`](#@Specification_2_to_string)
+    -  [Function `to_string_with_canonical_addresses`](#@Specification_2_to_string_with_canonical_addresses)
+    -  [Function `to_string_with_integer_types`](#@Specification_2_to_string_with_integer_types)
+    -  [Function `debug_string`](#@Specification_2_debug_string)
+    -  [Function `format1`](#@Specification_2_format1)
+    -  [Function `format2`](#@Specification_2_format2)
+    -  [Function `format3`](#@Specification_2_format3)
+    -  [Function `format4`](#@Specification_2_format4)
+    -  [Function `native_format`](#@Specification_2_native_format)
+    -  [Function `native_format_list`](#@Specification_2_native_format_list)
+
+
+<pre><code><b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string">0x1::string</a>;
+</code></pre>
+
+
+
+<a id="0x1_string_utils_Cons"></a>
+
+## Struct `Cons`
+
+
+
+<pre><code><b>struct</b> <a href="string_utils.md#0x1_string_utils_Cons">Cons</a>&lt;T, N&gt; <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>car: T</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>cdr: N</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_string_utils_NIL"></a>
+
+## Struct `NIL`
+
+
+
+<pre><code><b>struct</b> <a href="string_utils.md#0x1_string_utils_NIL">NIL</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>dummy_field: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_string_utils_FakeCons"></a>
+
+## Struct `FakeCons`
+
+
+<a id="@[test_only]_0"></a>
+
+### [test_only]
+
+
+
+<pre><code><b>struct</b> <a href="string_utils.md#0x1_string_utils_FakeCons">FakeCons</a>&lt;T, N&gt; <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>car: T</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>cdr: N</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_1"></a>
+
+## Constants
+
+
+<a id="0x1_string_utils_EARGS_MISMATCH"></a>
+
+The number of values in the list does not match the number of "{}" in the format string.
+
+
+<pre><code><b>const</b> <a href="string_utils.md#0x1_string_utils_EARGS_MISMATCH">EARGS_MISMATCH</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_string_utils_EINVALID_FORMAT"></a>
+
+The format string is not valid.
+
+
+<pre><code><b>const</b> <a href="string_utils.md#0x1_string_utils_EINVALID_FORMAT">EINVALID_FORMAT</a>: u64 = 2;
+</code></pre>
+
+
+
+<a id="0x1_string_utils_EUNABLE_TO_FORMAT_DELAYED_FIELD"></a>
+
+Formatting is not possible because the value contains delayed fields such as aggregators.
+
+
+<pre><code><b>const</b> <a href="string_utils.md#0x1_string_utils_EUNABLE_TO_FORMAT_DELAYED_FIELD">EUNABLE_TO_FORMAT_DELAYED_FIELD</a>: u64 = 3;
+</code></pre>
+
+
+
+<a id="0x1_string_utils_to_string"></a>
+
+## Function `to_string`
+
+Format a move value as a human readable string,
+eg. <code><a href="string_utils.md#0x1_string_utils_to_string">to_string</a>(&1u64) == "1"</code>, <code><a href="string_utils.md#0x1_string_utils_to_string">to_string</a>(&<b>false</b>) == "<b>false</b>"</code>, <code><a href="string_utils.md#0x1_string_utils_to_string">to_string</a>(&@0x1) == "@0x1"</code>.
+For vectors and structs the format is similar to rust, eg.
+<code><a href="string_utils.md#0x1_string_utils_to_string">to_string</a>(&<a href="string_utils.md#0x1_string_utils_cons">cons</a>(1,2)) == "<a href="string_utils.md#0x1_string_utils_Cons">Cons</a> { car: 1, cdr: 2 }"</code> and <code><a href="string_utils.md#0x1_string_utils_to_string">to_string</a>(&<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>[1, 2, 3]) == "[ 1, 2, 3 ]"</code>
+For vectors of u8 the output is hex encoded, eg. <code><a href="string_utils.md#0x1_string_utils_to_string">to_string</a>(&<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>[1u8, 2u8, 3u8]) == "0x010203"</code>
+For std::string::String the output is the string itself including quotes, eg.
+<code><a href="string_utils.md#0x1_string_utils_to_string">to_string</a>(&std::string::utf8(b"My <a href="../../../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string">string</a>")) == "\"My <a href="../../../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string">string</a>\""</code>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string_utils.md#0x1_string_utils_to_string">to_string</a>&lt;T&gt;(s: &T): <a href="../../../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string_utils.md#0x1_string_utils_to_string">to_string</a>&lt;T&gt;(s: &T): String {
+    <a href="string_utils.md#0x1_string_utils_native_format">native_format</a>(s, <b>false</b>, <b>false</b>, <b>true</b>, <b>false</b>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_string_utils_to_string_with_canonical_addresses"></a>
+
+## Function `to_string_with_canonical_addresses`
+
+Format addresses as 64 zero-padded hexadecimals.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string_utils.md#0x1_string_utils_to_string_with_canonical_addresses">to_string_with_canonical_addresses</a>&lt;T&gt;(s: &T): <a href="../../../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string_utils.md#0x1_string_utils_to_string_with_canonical_addresses">to_string_with_canonical_addresses</a>&lt;T&gt;(s: &T): String {
+    <a href="string_utils.md#0x1_string_utils_native_format">native_format</a>(s, <b>false</b>, <b>true</b>, <b>true</b>, <b>false</b>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_string_utils_to_string_with_integer_types"></a>
+
+## Function `to_string_with_integer_types`
+
+Format emitting integers with types ie. 6u8 or 128u32.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string_utils.md#0x1_string_utils_to_string_with_integer_types">to_string_with_integer_types</a>&lt;T&gt;(s: &T): <a href="../../../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string_utils.md#0x1_string_utils_to_string_with_integer_types">to_string_with_integer_types</a>&lt;T&gt;(s: &T): String {
+    <a href="string_utils.md#0x1_string_utils_native_format">native_format</a>(s, <b>false</b>, <b>true</b>, <b>true</b>, <b>false</b>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_string_utils_debug_string"></a>
+
+## Function `debug_string`
+
+Format vectors and structs with newlines and indentation.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string_utils.md#0x1_string_utils_debug_string">debug_string</a>&lt;T&gt;(s: &T): <a href="../../../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string_utils.md#0x1_string_utils_debug_string">debug_string</a>&lt;T&gt;(s: &T): String {
+    <a href="string_utils.md#0x1_string_utils_native_format">native_format</a>(s, <b>true</b>, <b>false</b>, <b>false</b>, <b>false</b>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_string_utils_format1"></a>
+
+## Function `format1`
+
+Formatting with a rust-like format string, eg. <code><a href="string_utils.md#0x1_string_utils_format2">format2</a>(&b"a = {}, b = {}", 1, 2) == "a = 1, b = 2"</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string_utils.md#0x1_string_utils_format1">format1</a>&lt;T0: drop&gt;(fmt: &<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, a: T0): <a href="../../../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string_utils.md#0x1_string_utils_format1">format1</a>&lt;T0: drop&gt;(fmt: &<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, a: T0): String {
+    <a href="string_utils.md#0x1_string_utils_native_format_list">native_format_list</a>(fmt, &<a href="string_utils.md#0x1_string_utils_list1">list1</a>(a))
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_string_utils_format2"></a>
+
+## Function `format2`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string_utils.md#0x1_string_utils_format2">format2</a>&lt;T0: drop, T1: drop&gt;(fmt: &<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, a: T0, b: T1): <a href="../../../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string_utils.md#0x1_string_utils_format2">format2</a>&lt;T0: drop, T1: drop&gt;(fmt: &<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, a: T0, b: T1): String {
+    <a href="string_utils.md#0x1_string_utils_native_format_list">native_format_list</a>(fmt, &<a href="string_utils.md#0x1_string_utils_list2">list2</a>(a, b))
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_string_utils_format3"></a>
+
+## Function `format3`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string_utils.md#0x1_string_utils_format3">format3</a>&lt;T0: drop, T1: drop, T2: drop&gt;(fmt: &<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, a: T0, b: T1, c: T2): <a href="../../../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string_utils.md#0x1_string_utils_format3">format3</a>&lt;T0: drop, T1: drop, T2: drop&gt;(fmt: &<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, a: T0, b: T1, c: T2): String {
+    <a href="string_utils.md#0x1_string_utils_native_format_list">native_format_list</a>(fmt, &<a href="string_utils.md#0x1_string_utils_list3">list3</a>(a, b, c))
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_string_utils_format4"></a>
+
+## Function `format4`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string_utils.md#0x1_string_utils_format4">format4</a>&lt;T0: drop, T1: drop, T2: drop, T3: drop&gt;(fmt: &<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, a: T0, b: T1, c: T2, d: T3): <a href="../../../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string_utils.md#0x1_string_utils_format4">format4</a>&lt;T0: drop, T1: drop, T2: drop, T3: drop&gt;(fmt: &<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, a: T0, b: T1, c: T2, d: T3): String {
+    <a href="string_utils.md#0x1_string_utils_native_format_list">native_format_list</a>(fmt, &<a href="string_utils.md#0x1_string_utils_list4">list4</a>(a, b, c, d))
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_string_utils_cons"></a>
+
+## Function `cons`
+
+
+
+<pre><code><b>fun</b> <a href="string_utils.md#0x1_string_utils_cons">cons</a>&lt;T, N&gt;(car: T, cdr: N): <a href="string_utils.md#0x1_string_utils_Cons">string_utils::Cons</a>&lt;T, N&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="string_utils.md#0x1_string_utils_cons">cons</a>&lt;T, N&gt;(car: T, cdr: N): <a href="string_utils.md#0x1_string_utils_Cons">Cons</a>&lt;T, N&gt; { <a href="string_utils.md#0x1_string_utils_Cons">Cons</a> { car, cdr } }
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_string_utils_nil"></a>
+
+## Function `nil`
+
+
+
+<pre><code><b>fun</b> <a href="string_utils.md#0x1_string_utils_nil">nil</a>(): <a href="string_utils.md#0x1_string_utils_NIL">string_utils::NIL</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="string_utils.md#0x1_string_utils_nil">nil</a>(): <a href="string_utils.md#0x1_string_utils_NIL">NIL</a> { <a href="string_utils.md#0x1_string_utils_NIL">NIL</a> {} }
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_string_utils_list1"></a>
+
+## Function `list1`
+
+
+
+<pre><code><b>fun</b> <a href="string_utils.md#0x1_string_utils_list1">list1</a>&lt;T0&gt;(a: T0): <a href="string_utils.md#0x1_string_utils_Cons">string_utils::Cons</a>&lt;T0, <a href="string_utils.md#0x1_string_utils_NIL">string_utils::NIL</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="string_utils.md#0x1_string_utils_list1">list1</a>&lt;T0&gt;(a: T0): <a href="string_utils.md#0x1_string_utils_Cons">Cons</a>&lt;T0, <a href="string_utils.md#0x1_string_utils_NIL">NIL</a>&gt; { <a href="string_utils.md#0x1_string_utils_cons">cons</a>(a, <a href="string_utils.md#0x1_string_utils_nil">nil</a>()) }
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_string_utils_list2"></a>
+
+## Function `list2`
+
+
+
+<pre><code><b>fun</b> <a href="string_utils.md#0x1_string_utils_list2">list2</a>&lt;T0, T1&gt;(a: T0, b: T1): <a href="string_utils.md#0x1_string_utils_Cons">string_utils::Cons</a>&lt;T0, <a href="string_utils.md#0x1_string_utils_Cons">string_utils::Cons</a>&lt;T1, <a href="string_utils.md#0x1_string_utils_NIL">string_utils::NIL</a>&gt;&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="string_utils.md#0x1_string_utils_list2">list2</a>&lt;T0, T1&gt;(a: T0, b: T1): <a href="string_utils.md#0x1_string_utils_Cons">Cons</a>&lt;T0, <a href="string_utils.md#0x1_string_utils_Cons">Cons</a>&lt;T1, <a href="string_utils.md#0x1_string_utils_NIL">NIL</a>&gt;&gt; { <a href="string_utils.md#0x1_string_utils_cons">cons</a>(a, <a href="string_utils.md#0x1_string_utils_list1">list1</a>(b)) }
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_string_utils_list3"></a>
+
+## Function `list3`
+
+
+
+<pre><code><b>fun</b> <a href="string_utils.md#0x1_string_utils_list3">list3</a>&lt;T0, T1, T2&gt;(a: T0, b: T1, c: T2): <a href="string_utils.md#0x1_string_utils_Cons">string_utils::Cons</a>&lt;T0, <a href="string_utils.md#0x1_string_utils_Cons">string_utils::Cons</a>&lt;T1, <a href="string_utils.md#0x1_string_utils_Cons">string_utils::Cons</a>&lt;T2, <a href="string_utils.md#0x1_string_utils_NIL">string_utils::NIL</a>&gt;&gt;&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="string_utils.md#0x1_string_utils_list3">list3</a>&lt;T0, T1, T2&gt;(a: T0, b: T1, c: T2): <a href="string_utils.md#0x1_string_utils_Cons">Cons</a>&lt;T0, <a href="string_utils.md#0x1_string_utils_Cons">Cons</a>&lt;T1, <a href="string_utils.md#0x1_string_utils_Cons">Cons</a>&lt;T2, <a href="string_utils.md#0x1_string_utils_NIL">NIL</a>&gt;&gt;&gt; { <a href="string_utils.md#0x1_string_utils_cons">cons</a>(a, <a href="string_utils.md#0x1_string_utils_list2">list2</a>(b, c)) }
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_string_utils_list4"></a>
+
+## Function `list4`
+
+
+
+<pre><code><b>fun</b> <a href="string_utils.md#0x1_string_utils_list4">list4</a>&lt;T0, T1, T2, T3&gt;(a: T0, b: T1, c: T2, d: T3): <a href="string_utils.md#0x1_string_utils_Cons">string_utils::Cons</a>&lt;T0, <a href="string_utils.md#0x1_string_utils_Cons">string_utils::Cons</a>&lt;T1, <a href="string_utils.md#0x1_string_utils_Cons">string_utils::Cons</a>&lt;T2, <a href="string_utils.md#0x1_string_utils_Cons">string_utils::Cons</a>&lt;T3, <a href="string_utils.md#0x1_string_utils_NIL">string_utils::NIL</a>&gt;&gt;&gt;&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="string_utils.md#0x1_string_utils_list4">list4</a>&lt;T0, T1, T2, T3&gt;(a: T0, b: T1, c: T2, d: T3): <a href="string_utils.md#0x1_string_utils_Cons">Cons</a>&lt;T0, <a href="string_utils.md#0x1_string_utils_Cons">Cons</a>&lt;T1, <a href="string_utils.md#0x1_string_utils_Cons">Cons</a>&lt;T2, <a href="string_utils.md#0x1_string_utils_Cons">Cons</a>&lt;T3, <a href="string_utils.md#0x1_string_utils_NIL">NIL</a>&gt;&gt;&gt;&gt; { <a href="string_utils.md#0x1_string_utils_cons">cons</a>(a, <a href="string_utils.md#0x1_string_utils_list3">list3</a>(b, c, d)) }
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_string_utils_native_format"></a>
+
+## Function `native_format`
+
+
+
+<pre><code><b>fun</b> <a href="string_utils.md#0x1_string_utils_native_format">native_format</a>&lt;T&gt;(s: &T, type_tag: bool, canonicalize: bool, single_line: bool, include_int_types: bool): <a href="../../../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="string_utils.md#0x1_string_utils_native_format">native_format</a>&lt;T&gt;(s: &T, type_tag: bool, canonicalize: bool, single_line: bool, include_int_types: bool): String;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_string_utils_native_format_list"></a>
+
+## Function `native_format_list`
+
+
+
+<pre><code><b>fun</b> <a href="string_utils.md#0x1_string_utils_native_format_list">native_format_list</a>&lt;T&gt;(fmt: &<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, val: &T): <a href="../../../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="string_utils.md#0x1_string_utils_native_format_list">native_format_list</a>&lt;T&gt;(fmt: &<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, val: &T): String;
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_2"></a>
+
+## Specification
+
+
+<a id="@Specification_2_to_string"></a>
+
+### Function `to_string`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string_utils.md#0x1_string_utils_to_string">to_string</a>&lt;T&gt;(s: &T): <a href="../../../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="string_utils.md#0x1_string_utils_spec_native_format">spec_native_format</a>(s, <b>false</b>, <b>false</b>, <b>true</b>, <b>false</b>);
+</code></pre>
+
+
+
+<a id="@Specification_2_to_string_with_canonical_addresses"></a>
+
+### Function `to_string_with_canonical_addresses`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string_utils.md#0x1_string_utils_to_string_with_canonical_addresses">to_string_with_canonical_addresses</a>&lt;T&gt;(s: &T): <a href="../../../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="string_utils.md#0x1_string_utils_spec_native_format">spec_native_format</a>(s, <b>false</b>, <b>true</b>, <b>true</b>, <b>false</b>);
+</code></pre>
+
+
+
+<a id="@Specification_2_to_string_with_integer_types"></a>
+
+### Function `to_string_with_integer_types`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string_utils.md#0x1_string_utils_to_string_with_integer_types">to_string_with_integer_types</a>&lt;T&gt;(s: &T): <a href="../../../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="string_utils.md#0x1_string_utils_spec_native_format">spec_native_format</a>(s, <b>false</b>, <b>true</b>, <b>true</b>, <b>false</b>);
+</code></pre>
+
+
+
+<a id="@Specification_2_debug_string"></a>
+
+### Function `debug_string`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string_utils.md#0x1_string_utils_debug_string">debug_string</a>&lt;T&gt;(s: &T): <a href="../../../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="string_utils.md#0x1_string_utils_spec_native_format">spec_native_format</a>(s, <b>true</b>, <b>false</b>, <b>false</b>, <b>false</b>);
+</code></pre>
+
+
+
+<a id="@Specification_2_format1"></a>
+
+### Function `format1`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string_utils.md#0x1_string_utils_format1">format1</a>&lt;T0: drop&gt;(fmt: &<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, a: T0): <a href="../../../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <a href="string_utils.md#0x1_string_utils_args_mismatch_or_invalid_format">args_mismatch_or_invalid_format</a>(fmt, <a href="string_utils.md#0x1_string_utils_list1">list1</a>(a));
+<b>ensures</b> result == <a href="string_utils.md#0x1_string_utils_spec_native_format_list">spec_native_format_list</a>(fmt, <a href="string_utils.md#0x1_string_utils_list1">list1</a>(a));
+</code></pre>
+
+
+
+<a id="@Specification_2_format2"></a>
+
+### Function `format2`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string_utils.md#0x1_string_utils_format2">format2</a>&lt;T0: drop, T1: drop&gt;(fmt: &<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, a: T0, b: T1): <a href="../../../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <a href="string_utils.md#0x1_string_utils_args_mismatch_or_invalid_format">args_mismatch_or_invalid_format</a>(fmt, <a href="string_utils.md#0x1_string_utils_list2">list2</a>(a, b));
+<b>ensures</b> result == <a href="string_utils.md#0x1_string_utils_spec_native_format_list">spec_native_format_list</a>(fmt, <a href="string_utils.md#0x1_string_utils_list2">list2</a>(a, b));
+</code></pre>
+
+
+
+<a id="@Specification_2_format3"></a>
+
+### Function `format3`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string_utils.md#0x1_string_utils_format3">format3</a>&lt;T0: drop, T1: drop, T2: drop&gt;(fmt: &<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, a: T0, b: T1, c: T2): <a href="../../../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <a href="string_utils.md#0x1_string_utils_args_mismatch_or_invalid_format">args_mismatch_or_invalid_format</a>(fmt, <a href="string_utils.md#0x1_string_utils_list3">list3</a>(a, b, c));
+<b>ensures</b> result == <a href="string_utils.md#0x1_string_utils_spec_native_format_list">spec_native_format_list</a>(fmt, <a href="string_utils.md#0x1_string_utils_list3">list3</a>(a, b, c));
+</code></pre>
+
+
+
+<a id="@Specification_2_format4"></a>
+
+### Function `format4`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string_utils.md#0x1_string_utils_format4">format4</a>&lt;T0: drop, T1: drop, T2: drop, T3: drop&gt;(fmt: &<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, a: T0, b: T1, c: T2, d: T3): <a href="../../../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <a href="string_utils.md#0x1_string_utils_args_mismatch_or_invalid_format">args_mismatch_or_invalid_format</a>(fmt, <a href="string_utils.md#0x1_string_utils_list4">list4</a>(a, b, c, d));
+<b>ensures</b> result == <a href="string_utils.md#0x1_string_utils_spec_native_format_list">spec_native_format_list</a>(fmt, <a href="string_utils.md#0x1_string_utils_list4">list4</a>(a, b, c, d));
+</code></pre>
+
+
+
+<a id="@Specification_2_native_format"></a>
+
+### Function `native_format`
+
+
+<pre><code><b>fun</b> <a href="string_utils.md#0x1_string_utils_native_format">native_format</a>&lt;T&gt;(s: &T, type_tag: bool, canonicalize: bool, single_line: bool, include_int_types: bool): <a href="../../../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="string_utils.md#0x1_string_utils_spec_native_format">spec_native_format</a>(s, type_tag, canonicalize, single_line, include_int_types);
+</code></pre>
+
+
+
+<a id="@Specification_2_native_format_list"></a>
+
+### Function `native_format_list`
+
+
+<pre><code><b>fun</b> <a href="string_utils.md#0x1_string_utils_native_format_list">native_format_list</a>&lt;T&gt;(fmt: &<a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, val: &T): <a href="../../../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <a href="string_utils.md#0x1_string_utils_args_mismatch_or_invalid_format">args_mismatch_or_invalid_format</a>(fmt, val);
+<b>ensures</b> result == <a href="string_utils.md#0x1_string_utils_spec_native_format_list">spec_native_format_list</a>(fmt, val);
+</code></pre>
+
+
+
+
+<a id="0x1_string_utils_spec_native_format"></a>
+
+
+<pre><code><b>fun</b> <a href="string_utils.md#0x1_string_utils_spec_native_format">spec_native_format</a>&lt;T&gt;(s: T, type_tag: bool, canonicalize: bool, single_line: bool, include_int_types: bool): String;
+</code></pre>
+
+
+
+
+<a id="0x1_string_utils_spec_native_format_list"></a>
+
+
+<pre><code><b>fun</b> <a href="string_utils.md#0x1_string_utils_spec_native_format_list">spec_native_format_list</a>&lt;T&gt;(fmt: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, val: T): String;
+</code></pre>
+
+
+
+
+<a id="0x1_string_utils_args_mismatch_or_invalid_format"></a>
+
+
+<pre><code><b>fun</b> <a href="string_utils.md#0x1_string_utils_args_mismatch_or_invalid_format">args_mismatch_or_invalid_format</a>&lt;T&gt;(fmt: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, val: T): bool;
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/table.md b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/table.md
new file mode 100644
index 0000000000000..d05ea82adb590
--- /dev/null
+++ b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/table.md
@@ -0,0 +1,779 @@
+
+<a id="0x1_table"></a>
+
+# Module `0x1::table`
+
+Type of large-scale storage tables.
+source: https://github.com/move-language/move/blob/1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e/language/extensions/move-table-extension/sources/Table.move#L1
+
+It implements the Table type which supports individual table items to be represented by
+separate global state items. The number of items and a unique handle are tracked on the table
+struct itself, while the operations are implemented as native functions. No traversal is provided.
+
+
+-  [Struct `Table`](#0x1_table_Table)
+-  [Resource `Box`](#0x1_table_Box)
+-  [Function `new`](#0x1_table_new)
+-  [Function `add`](#0x1_table_add)
+-  [Function `borrow`](#0x1_table_borrow)
+-  [Function `borrow_with_default`](#0x1_table_borrow_with_default)
+-  [Function `borrow_mut`](#0x1_table_borrow_mut)
+-  [Function `borrow_mut_with_default`](#0x1_table_borrow_mut_with_default)
+-  [Function `upsert`](#0x1_table_upsert)
+-  [Function `remove`](#0x1_table_remove)
+-  [Function `contains`](#0x1_table_contains)
+-  [Function `destroy`](#0x1_table_destroy)
+-  [Function `new_table_handle`](#0x1_table_new_table_handle)
+-  [Function `add_box`](#0x1_table_add_box)
+-  [Function `borrow_box`](#0x1_table_borrow_box)
+-  [Function `borrow_box_mut`](#0x1_table_borrow_box_mut)
+-  [Function `contains_box`](#0x1_table_contains_box)
+-  [Function `remove_box`](#0x1_table_remove_box)
+-  [Function `destroy_empty_box`](#0x1_table_destroy_empty_box)
+-  [Function `drop_unchecked_box`](#0x1_table_drop_unchecked_box)
+-  [Specification](#@Specification_0)
+    -  [Struct `Table`](#@Specification_0_Table)
+    -  [Function `new`](#@Specification_0_new)
+    -  [Function `add`](#@Specification_0_add)
+    -  [Function `borrow`](#@Specification_0_borrow)
+    -  [Function `borrow_mut`](#@Specification_0_borrow_mut)
+    -  [Function `borrow_mut_with_default`](#@Specification_0_borrow_mut_with_default)
+    -  [Function `upsert`](#@Specification_0_upsert)
+    -  [Function `remove`](#@Specification_0_remove)
+    -  [Function `contains`](#@Specification_0_contains)
+    -  [Function `destroy`](#@Specification_0_destroy)
+
+
+<pre><code></code></pre>
+
+
+
+<a id="0x1_table_Table"></a>
+
+## Struct `Table`
+
+Type of tables
+
+
+<pre><code><b>struct</b> <a href="table.md#0x1_table_Table">Table</a>&lt;K: <b>copy</b>, drop, V&gt; <b>has</b> store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>handle: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_table_Box"></a>
+
+## Resource `Box`
+
+Wrapper for values. Required for making values appear as resources in the implementation.
+
+
+<pre><code><b>struct</b> <a href="table.md#0x1_table_Box">Box</a>&lt;V&gt; <b>has</b> drop, store, key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>val: V</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_table_new"></a>
+
+## Function `new`
+
+Create a new Table.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="table.md#0x1_table_new">new</a>&lt;K: <b>copy</b>, drop, V: store&gt;(): <a href="table.md#0x1_table_Table">table::Table</a>&lt;K, V&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="table.md#0x1_table_new">new</a>&lt;K: <b>copy</b> + drop, V: store&gt;(): <a href="table.md#0x1_table_Table">Table</a>&lt;K, V&gt; {
+    <a href="table.md#0x1_table_Table">Table</a> {
+        handle: <a href="table.md#0x1_table_new_table_handle">new_table_handle</a>&lt;K, V&gt;(),
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_table_add"></a>
+
+## Function `add`
+
+Add a new entry to the table. Aborts if an entry for this
+key already exists. The entry itself is not stored in the
+table, and cannot be discovered from it.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="table.md#0x1_table_add">add</a>&lt;K: <b>copy</b>, drop, V&gt;(<a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="table.md#0x1_table_Table">table::Table</a>&lt;K, V&gt;, key: K, val: V)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="table.md#0x1_table_add">add</a>&lt;K: <b>copy</b> + drop, V&gt;(<a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="table.md#0x1_table_Table">Table</a>&lt;K, V&gt;, key: K, val: V) {
+    <a href="table.md#0x1_table_add_box">add_box</a>&lt;K, V, <a href="table.md#0x1_table_Box">Box</a>&lt;V&gt;&gt;(<a href="table.md#0x1_table">table</a>, key, <a href="table.md#0x1_table_Box">Box</a> { val })
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_table_borrow"></a>
+
+## Function `borrow`
+
+Acquire an immutable reference to the value which <code>key</code> maps to.
+Aborts if there is no entry for <code>key</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="table.md#0x1_table_borrow">borrow</a>&lt;K: <b>copy</b>, drop, V&gt;(<a href="table.md#0x1_table">table</a>: &<a href="table.md#0x1_table_Table">table::Table</a>&lt;K, V&gt;, key: K): &V
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="table.md#0x1_table_borrow">borrow</a>&lt;K: <b>copy</b> + drop, V&gt;(<a href="table.md#0x1_table">table</a>: &<a href="table.md#0x1_table_Table">Table</a>&lt;K, V&gt;, key: K): &V {
+    &<a href="table.md#0x1_table_borrow_box">borrow_box</a>&lt;K, V, <a href="table.md#0x1_table_Box">Box</a>&lt;V&gt;&gt;(<a href="table.md#0x1_table">table</a>, key).val
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_table_borrow_with_default"></a>
+
+## Function `borrow_with_default`
+
+Acquire an immutable reference to the value which <code>key</code> maps to.
+Returns specified default value if there is no entry for <code>key</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="table.md#0x1_table_borrow_with_default">borrow_with_default</a>&lt;K: <b>copy</b>, drop, V&gt;(<a href="table.md#0x1_table">table</a>: &<a href="table.md#0x1_table_Table">table::Table</a>&lt;K, V&gt;, key: K, default: &V): &V
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="table.md#0x1_table_borrow_with_default">borrow_with_default</a>&lt;K: <b>copy</b> + drop, V&gt;(<a href="table.md#0x1_table">table</a>: &<a href="table.md#0x1_table_Table">Table</a>&lt;K, V&gt;, key: K, default: &V): &V {
+    <b>if</b> (!<a href="table.md#0x1_table_contains">contains</a>(<a href="table.md#0x1_table">table</a>, <b>copy</b> key)) {
+        default
+    } <b>else</b> {
+        <a href="table.md#0x1_table_borrow">borrow</a>(<a href="table.md#0x1_table">table</a>, <b>copy</b> key)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_table_borrow_mut"></a>
+
+## Function `borrow_mut`
+
+Acquire a mutable reference to the value which <code>key</code> maps to.
+Aborts if there is no entry for <code>key</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="table.md#0x1_table_borrow_mut">borrow_mut</a>&lt;K: <b>copy</b>, drop, V&gt;(<a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="table.md#0x1_table_Table">table::Table</a>&lt;K, V&gt;, key: K): &<b>mut</b> V
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="table.md#0x1_table_borrow_mut">borrow_mut</a>&lt;K: <b>copy</b> + drop, V&gt;(<a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="table.md#0x1_table_Table">Table</a>&lt;K, V&gt;, key: K): &<b>mut</b> V {
+    &<b>mut</b> <a href="table.md#0x1_table_borrow_box_mut">borrow_box_mut</a>&lt;K, V, <a href="table.md#0x1_table_Box">Box</a>&lt;V&gt;&gt;(<a href="table.md#0x1_table">table</a>, key).val
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_table_borrow_mut_with_default"></a>
+
+## Function `borrow_mut_with_default`
+
+Acquire a mutable reference to the value which <code>key</code> maps to.
+Insert the pair (<code>key</code>, <code>default</code>) first if there is no entry for <code>key</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="table.md#0x1_table_borrow_mut_with_default">borrow_mut_with_default</a>&lt;K: <b>copy</b>, drop, V: drop&gt;(<a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="table.md#0x1_table_Table">table::Table</a>&lt;K, V&gt;, key: K, default: V): &<b>mut</b> V
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="table.md#0x1_table_borrow_mut_with_default">borrow_mut_with_default</a>&lt;K: <b>copy</b> + drop, V: drop&gt;(<a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="table.md#0x1_table_Table">Table</a>&lt;K, V&gt;, key: K, default: V): &<b>mut</b> V {
+    <b>if</b> (!<a href="table.md#0x1_table_contains">contains</a>(<a href="table.md#0x1_table">table</a>, <b>copy</b> key)) {
+        <a href="table.md#0x1_table_add">add</a>(<a href="table.md#0x1_table">table</a>, <b>copy</b> key, default)
+    };
+    <a href="table.md#0x1_table_borrow_mut">borrow_mut</a>(<a href="table.md#0x1_table">table</a>, key)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_table_upsert"></a>
+
+## Function `upsert`
+
+Insert the pair (<code>key</code>, <code>value</code>) if there is no entry for <code>key</code>.
+update the value of the entry for <code>key</code> to <code>value</code> otherwise
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="table.md#0x1_table_upsert">upsert</a>&lt;K: <b>copy</b>, drop, V: drop&gt;(<a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="table.md#0x1_table_Table">table::Table</a>&lt;K, V&gt;, key: K, value: V)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="table.md#0x1_table_upsert">upsert</a>&lt;K: <b>copy</b> + drop, V: drop&gt;(<a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="table.md#0x1_table_Table">Table</a>&lt;K, V&gt;, key: K, value: V) {
+    <b>if</b> (!<a href="table.md#0x1_table_contains">contains</a>(<a href="table.md#0x1_table">table</a>, <b>copy</b> key)) {
+        <a href="table.md#0x1_table_add">add</a>(<a href="table.md#0x1_table">table</a>, <b>copy</b> key, value)
+    } <b>else</b> {
+        <b>let</b> ref = <a href="table.md#0x1_table_borrow_mut">borrow_mut</a>(<a href="table.md#0x1_table">table</a>, key);
+        *ref = value;
+    };
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_table_remove"></a>
+
+## Function `remove`
+
+Remove from <code><a href="table.md#0x1_table">table</a></code> and return the value which <code>key</code> maps to.
+Aborts if there is no entry for <code>key</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="table.md#0x1_table_remove">remove</a>&lt;K: <b>copy</b>, drop, V&gt;(<a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="table.md#0x1_table_Table">table::Table</a>&lt;K, V&gt;, key: K): V
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="table.md#0x1_table_remove">remove</a>&lt;K: <b>copy</b> + drop, V&gt;(<a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="table.md#0x1_table_Table">Table</a>&lt;K, V&gt;, key: K): V {
+    <b>let</b> <a href="table.md#0x1_table_Box">Box</a> { val } = <a href="table.md#0x1_table_remove_box">remove_box</a>&lt;K, V, <a href="table.md#0x1_table_Box">Box</a>&lt;V&gt;&gt;(<a href="table.md#0x1_table">table</a>, key);
+    val
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_table_contains"></a>
+
+## Function `contains`
+
+Returns true iff <code><a href="table.md#0x1_table">table</a></code> contains an entry for <code>key</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="table.md#0x1_table_contains">contains</a>&lt;K: <b>copy</b>, drop, V&gt;(<a href="table.md#0x1_table">table</a>: &<a href="table.md#0x1_table_Table">table::Table</a>&lt;K, V&gt;, key: K): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="table.md#0x1_table_contains">contains</a>&lt;K: <b>copy</b> + drop, V&gt;(<a href="table.md#0x1_table">table</a>: &<a href="table.md#0x1_table_Table">Table</a>&lt;K, V&gt;, key: K): bool {
+    <a href="table.md#0x1_table_contains_box">contains_box</a>&lt;K, V, <a href="table.md#0x1_table_Box">Box</a>&lt;V&gt;&gt;(<a href="table.md#0x1_table">table</a>, key)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_table_destroy"></a>
+
+## Function `destroy`
+
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="table.md#0x1_table_destroy">destroy</a>&lt;K: <b>copy</b>, drop, V&gt;(<a href="table.md#0x1_table">table</a>: <a href="table.md#0x1_table_Table">table::Table</a>&lt;K, V&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="table.md#0x1_table_destroy">destroy</a>&lt;K: <b>copy</b> + drop, V&gt;(<a href="table.md#0x1_table">table</a>: <a href="table.md#0x1_table_Table">Table</a>&lt;K, V&gt;) {
+    <a href="table.md#0x1_table_destroy_empty_box">destroy_empty_box</a>&lt;K, V, <a href="table.md#0x1_table_Box">Box</a>&lt;V&gt;&gt;(&<a href="table.md#0x1_table">table</a>);
+    <a href="table.md#0x1_table_drop_unchecked_box">drop_unchecked_box</a>&lt;K, V, <a href="table.md#0x1_table_Box">Box</a>&lt;V&gt;&gt;(<a href="table.md#0x1_table">table</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_table_new_table_handle"></a>
+
+## Function `new_table_handle`
+
+
+
+<pre><code><b>fun</b> <a href="table.md#0x1_table_new_table_handle">new_table_handle</a>&lt;K, V&gt;(): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="table.md#0x1_table_new_table_handle">new_table_handle</a>&lt;K, V&gt;(): <b>address</b>;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_table_add_box"></a>
+
+## Function `add_box`
+
+
+
+<pre><code><b>fun</b> <a href="table.md#0x1_table_add_box">add_box</a>&lt;K: <b>copy</b>, drop, V, B&gt;(<a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="table.md#0x1_table_Table">table::Table</a>&lt;K, V&gt;, key: K, val: <a href="table.md#0x1_table_Box">table::Box</a>&lt;V&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="table.md#0x1_table_add_box">add_box</a>&lt;K: <b>copy</b> + drop, V, B&gt;(<a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="table.md#0x1_table_Table">Table</a>&lt;K, V&gt;, key: K, val: <a href="table.md#0x1_table_Box">Box</a>&lt;V&gt;);
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_table_borrow_box"></a>
+
+## Function `borrow_box`
+
+
+
+<pre><code><b>fun</b> <a href="table.md#0x1_table_borrow_box">borrow_box</a>&lt;K: <b>copy</b>, drop, V, B&gt;(<a href="table.md#0x1_table">table</a>: &<a href="table.md#0x1_table_Table">table::Table</a>&lt;K, V&gt;, key: K): &<a href="table.md#0x1_table_Box">table::Box</a>&lt;V&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="table.md#0x1_table_borrow_box">borrow_box</a>&lt;K: <b>copy</b> + drop, V, B&gt;(<a href="table.md#0x1_table">table</a>: &<a href="table.md#0x1_table_Table">Table</a>&lt;K, V&gt;, key: K): &<a href="table.md#0x1_table_Box">Box</a>&lt;V&gt;;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_table_borrow_box_mut"></a>
+
+## Function `borrow_box_mut`
+
+
+
+<pre><code><b>fun</b> <a href="table.md#0x1_table_borrow_box_mut">borrow_box_mut</a>&lt;K: <b>copy</b>, drop, V, B&gt;(<a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="table.md#0x1_table_Table">table::Table</a>&lt;K, V&gt;, key: K): &<b>mut</b> <a href="table.md#0x1_table_Box">table::Box</a>&lt;V&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="table.md#0x1_table_borrow_box_mut">borrow_box_mut</a>&lt;K: <b>copy</b> + drop, V, B&gt;(<a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="table.md#0x1_table_Table">Table</a>&lt;K, V&gt;, key: K): &<b>mut</b> <a href="table.md#0x1_table_Box">Box</a>&lt;V&gt;;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_table_contains_box"></a>
+
+## Function `contains_box`
+
+
+
+<pre><code><b>fun</b> <a href="table.md#0x1_table_contains_box">contains_box</a>&lt;K: <b>copy</b>, drop, V, B&gt;(<a href="table.md#0x1_table">table</a>: &<a href="table.md#0x1_table_Table">table::Table</a>&lt;K, V&gt;, key: K): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="table.md#0x1_table_contains_box">contains_box</a>&lt;K: <b>copy</b> + drop, V, B&gt;(<a href="table.md#0x1_table">table</a>: &<a href="table.md#0x1_table_Table">Table</a>&lt;K, V&gt;, key: K): bool;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_table_remove_box"></a>
+
+## Function `remove_box`
+
+
+
+<pre><code><b>fun</b> <a href="table.md#0x1_table_remove_box">remove_box</a>&lt;K: <b>copy</b>, drop, V, B&gt;(<a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="table.md#0x1_table_Table">table::Table</a>&lt;K, V&gt;, key: K): <a href="table.md#0x1_table_Box">table::Box</a>&lt;V&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="table.md#0x1_table_remove_box">remove_box</a>&lt;K: <b>copy</b> + drop, V, B&gt;(<a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="table.md#0x1_table_Table">Table</a>&lt;K, V&gt;, key: K): <a href="table.md#0x1_table_Box">Box</a>&lt;V&gt;;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_table_destroy_empty_box"></a>
+
+## Function `destroy_empty_box`
+
+
+
+<pre><code><b>fun</b> <a href="table.md#0x1_table_destroy_empty_box">destroy_empty_box</a>&lt;K: <b>copy</b>, drop, V, B&gt;(<a href="table.md#0x1_table">table</a>: &<a href="table.md#0x1_table_Table">table::Table</a>&lt;K, V&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="table.md#0x1_table_destroy_empty_box">destroy_empty_box</a>&lt;K: <b>copy</b> + drop, V, B&gt;(<a href="table.md#0x1_table">table</a>: &<a href="table.md#0x1_table_Table">Table</a>&lt;K, V&gt;);
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_table_drop_unchecked_box"></a>
+
+## Function `drop_unchecked_box`
+
+
+
+<pre><code><b>fun</b> <a href="table.md#0x1_table_drop_unchecked_box">drop_unchecked_box</a>&lt;K: <b>copy</b>, drop, V, B&gt;(<a href="table.md#0x1_table">table</a>: <a href="table.md#0x1_table_Table">table::Table</a>&lt;K, V&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="table.md#0x1_table_drop_unchecked_box">drop_unchecked_box</a>&lt;K: <b>copy</b> + drop, V, B&gt;(<a href="table.md#0x1_table">table</a>: <a href="table.md#0x1_table_Table">Table</a>&lt;K, V&gt;);
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_0"></a>
+
+## Specification
+
+
+<a id="@Specification_0_Table"></a>
+
+### Struct `Table`
+
+
+<pre><code><b>struct</b> <a href="table.md#0x1_table_Table">Table</a>&lt;K: <b>copy</b>, drop, V&gt; <b>has</b> store
+</code></pre>
+
+
+
+<dl>
+<dt>
+<code>handle: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+
+<pre><code><b>pragma</b> intrinsic = map,
+    map_new = new,
+    map_destroy_empty = destroy,
+    map_has_key = contains,
+    map_add_no_override = add,
+    map_add_override_if_exists = upsert,
+    map_del_must_exist = remove,
+    map_borrow = borrow,
+    map_borrow_mut = borrow_mut,
+    map_borrow_mut_with_default = borrow_mut_with_default,
+    map_spec_get = spec_get,
+    map_spec_set = spec_set,
+    map_spec_del = spec_remove,
+    map_spec_has_key = spec_contains;
+</code></pre>
+
+
+
+<a id="@Specification_0_new"></a>
+
+### Function `new`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="table.md#0x1_table_new">new</a>&lt;K: <b>copy</b>, drop, V: store&gt;(): <a href="table.md#0x1_table_Table">table::Table</a>&lt;K, V&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> intrinsic;
+</code></pre>
+
+
+
+<a id="@Specification_0_add"></a>
+
+### Function `add`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="table.md#0x1_table_add">add</a>&lt;K: <b>copy</b>, drop, V&gt;(<a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="table.md#0x1_table_Table">table::Table</a>&lt;K, V&gt;, key: K, val: V)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> intrinsic;
+</code></pre>
+
+
+
+<a id="@Specification_0_borrow"></a>
+
+### Function `borrow`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="table.md#0x1_table_borrow">borrow</a>&lt;K: <b>copy</b>, drop, V&gt;(<a href="table.md#0x1_table">table</a>: &<a href="table.md#0x1_table_Table">table::Table</a>&lt;K, V&gt;, key: K): &V
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> intrinsic;
+</code></pre>
+
+
+
+<a id="@Specification_0_borrow_mut"></a>
+
+### Function `borrow_mut`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="table.md#0x1_table_borrow_mut">borrow_mut</a>&lt;K: <b>copy</b>, drop, V&gt;(<a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="table.md#0x1_table_Table">table::Table</a>&lt;K, V&gt;, key: K): &<b>mut</b> V
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> intrinsic;
+</code></pre>
+
+
+
+<a id="@Specification_0_borrow_mut_with_default"></a>
+
+### Function `borrow_mut_with_default`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="table.md#0x1_table_borrow_mut_with_default">borrow_mut_with_default</a>&lt;K: <b>copy</b>, drop, V: drop&gt;(<a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="table.md#0x1_table_Table">table::Table</a>&lt;K, V&gt;, key: K, default: V): &<b>mut</b> V
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> intrinsic;
+</code></pre>
+
+
+
+<a id="@Specification_0_upsert"></a>
+
+### Function `upsert`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="table.md#0x1_table_upsert">upsert</a>&lt;K: <b>copy</b>, drop, V: drop&gt;(<a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="table.md#0x1_table_Table">table::Table</a>&lt;K, V&gt;, key: K, value: V)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> intrinsic;
+</code></pre>
+
+
+
+<a id="@Specification_0_remove"></a>
+
+### Function `remove`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="table.md#0x1_table_remove">remove</a>&lt;K: <b>copy</b>, drop, V&gt;(<a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="table.md#0x1_table_Table">table::Table</a>&lt;K, V&gt;, key: K): V
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> intrinsic;
+</code></pre>
+
+
+
+<a id="@Specification_0_contains"></a>
+
+### Function `contains`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="table.md#0x1_table_contains">contains</a>&lt;K: <b>copy</b>, drop, V&gt;(<a href="table.md#0x1_table">table</a>: &<a href="table.md#0x1_table_Table">table::Table</a>&lt;K, V&gt;, key: K): bool
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> intrinsic;
+</code></pre>
+
+
+
+
+<a id="0x1_table_spec_contains"></a>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="table.md#0x1_table_spec_contains">spec_contains</a>&lt;K, V&gt;(t: <a href="table.md#0x1_table_Table">Table</a>&lt;K, V&gt;, k: K): bool;
+</code></pre>
+
+
+
+
+<a id="0x1_table_spec_remove"></a>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="table.md#0x1_table_spec_remove">spec_remove</a>&lt;K, V&gt;(t: <a href="table.md#0x1_table_Table">Table</a>&lt;K, V&gt;, k: K): <a href="table.md#0x1_table_Table">Table</a>&lt;K, V&gt;;
+</code></pre>
+
+
+
+
+<a id="0x1_table_spec_set"></a>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="table.md#0x1_table_spec_set">spec_set</a>&lt;K, V&gt;(t: <a href="table.md#0x1_table_Table">Table</a>&lt;K, V&gt;, k: K, v: V): <a href="table.md#0x1_table_Table">Table</a>&lt;K, V&gt;;
+</code></pre>
+
+
+
+
+<a id="0x1_table_spec_get"></a>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="table.md#0x1_table_spec_get">spec_get</a>&lt;K, V&gt;(t: <a href="table.md#0x1_table_Table">Table</a>&lt;K, V&gt;, k: K): V;
+</code></pre>
+
+
+
+<a id="@Specification_0_destroy"></a>
+
+### Function `destroy`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="table.md#0x1_table_destroy">destroy</a>&lt;K: <b>copy</b>, drop, V&gt;(<a href="table.md#0x1_table">table</a>: <a href="table.md#0x1_table_Table">table::Table</a>&lt;K, V&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> intrinsic;
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/table_with_length.md b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/table_with_length.md
new file mode 100644
index 0000000000000..733165ad6807f
--- /dev/null
+++ b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/table_with_length.md
@@ -0,0 +1,684 @@
+
+<a id="0x1_table_with_length"></a>
+
+# Module `0x1::table_with_length`
+
+Extends Table and provides functions such as length and the ability to be destroyed
+
+
+-  [Struct `TableWithLength`](#0x1_table_with_length_TableWithLength)
+-  [Constants](#@Constants_0)
+-  [Function `new`](#0x1_table_with_length_new)
+-  [Function `destroy_empty`](#0x1_table_with_length_destroy_empty)
+-  [Function `add`](#0x1_table_with_length_add)
+-  [Function `borrow`](#0x1_table_with_length_borrow)
+-  [Function `borrow_mut`](#0x1_table_with_length_borrow_mut)
+-  [Function `length`](#0x1_table_with_length_length)
+-  [Function `empty`](#0x1_table_with_length_empty)
+-  [Function `borrow_mut_with_default`](#0x1_table_with_length_borrow_mut_with_default)
+-  [Function `upsert`](#0x1_table_with_length_upsert)
+-  [Function `remove`](#0x1_table_with_length_remove)
+-  [Function `contains`](#0x1_table_with_length_contains)
+-  [Specification](#@Specification_1)
+    -  [Struct `TableWithLength`](#@Specification_1_TableWithLength)
+    -  [Function `new`](#@Specification_1_new)
+    -  [Function `destroy_empty`](#@Specification_1_destroy_empty)
+    -  [Function `add`](#@Specification_1_add)
+    -  [Function `borrow`](#@Specification_1_borrow)
+    -  [Function `borrow_mut`](#@Specification_1_borrow_mut)
+    -  [Function `length`](#@Specification_1_length)
+    -  [Function `empty`](#@Specification_1_empty)
+    -  [Function `borrow_mut_with_default`](#@Specification_1_borrow_mut_with_default)
+    -  [Function `upsert`](#@Specification_1_upsert)
+    -  [Function `remove`](#@Specification_1_remove)
+    -  [Function `contains`](#@Specification_1_contains)
+
+
+<pre><code><b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="table.md#0x1_table">0x1::table</a>;
+</code></pre>
+
+
+
+<a id="0x1_table_with_length_TableWithLength"></a>
+
+## Struct `TableWithLength`
+
+Type of tables
+
+
+<pre><code><b>struct</b> <a href="table_with_length.md#0x1_table_with_length_TableWithLength">TableWithLength</a>&lt;K: <b>copy</b>, drop, V&gt; <b>has</b> store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>inner: <a href="table.md#0x1_table_Table">table::Table</a>&lt;K, V&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>length: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_table_with_length_EALREADY_EXISTS"></a>
+
+
+
+<pre><code><b>const</b> <a href="table_with_length.md#0x1_table_with_length_EALREADY_EXISTS">EALREADY_EXISTS</a>: u64 = 100;
+</code></pre>
+
+
+
+<a id="0x1_table_with_length_ENOT_EMPTY"></a>
+
+
+
+<pre><code><b>const</b> <a href="table_with_length.md#0x1_table_with_length_ENOT_EMPTY">ENOT_EMPTY</a>: u64 = 102;
+</code></pre>
+
+
+
+<a id="0x1_table_with_length_ENOT_FOUND"></a>
+
+
+
+<pre><code><b>const</b> <a href="table_with_length.md#0x1_table_with_length_ENOT_FOUND">ENOT_FOUND</a>: u64 = 101;
+</code></pre>
+
+
+
+<a id="0x1_table_with_length_new"></a>
+
+## Function `new`
+
+Create a new Table.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="table_with_length.md#0x1_table_with_length_new">new</a>&lt;K: <b>copy</b>, drop, V: store&gt;(): <a href="table_with_length.md#0x1_table_with_length_TableWithLength">table_with_length::TableWithLength</a>&lt;K, V&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="table_with_length.md#0x1_table_with_length_new">new</a>&lt;K: <b>copy</b> + drop, V: store&gt;(): <a href="table_with_length.md#0x1_table_with_length_TableWithLength">TableWithLength</a>&lt;K, V&gt; {
+    <a href="table_with_length.md#0x1_table_with_length_TableWithLength">TableWithLength</a> {
+        inner: <a href="table.md#0x1_table_new">table::new</a>&lt;K, V&gt;(),
+        length: 0,
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_table_with_length_destroy_empty"></a>
+
+## Function `destroy_empty`
+
+Destroy a table. The table must be empty to succeed.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="table_with_length.md#0x1_table_with_length_destroy_empty">destroy_empty</a>&lt;K: <b>copy</b>, drop, V&gt;(<a href="table.md#0x1_table">table</a>: <a href="table_with_length.md#0x1_table_with_length_TableWithLength">table_with_length::TableWithLength</a>&lt;K, V&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="table_with_length.md#0x1_table_with_length_destroy_empty">destroy_empty</a>&lt;K: <b>copy</b> + drop, V&gt;(<a href="table.md#0x1_table">table</a>: <a href="table_with_length.md#0x1_table_with_length_TableWithLength">TableWithLength</a>&lt;K, V&gt;) {
+    <b>assert</b>!(<a href="table.md#0x1_table">table</a>.length == 0, <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="table_with_length.md#0x1_table_with_length_ENOT_EMPTY">ENOT_EMPTY</a>));
+    <b>let</b> <a href="table_with_length.md#0x1_table_with_length_TableWithLength">TableWithLength</a> { inner, length: _ } = <a href="table.md#0x1_table">table</a>;
+    <a href="table.md#0x1_table_destroy">table::destroy</a>(inner)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_table_with_length_add"></a>
+
+## Function `add`
+
+Add a new entry to the table. Aborts if an entry for this
+key already exists. The entry itself is not stored in the
+table, and cannot be discovered from it.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="table_with_length.md#0x1_table_with_length_add">add</a>&lt;K: <b>copy</b>, drop, V&gt;(<a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="table_with_length.md#0x1_table_with_length_TableWithLength">table_with_length::TableWithLength</a>&lt;K, V&gt;, key: K, val: V)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="table_with_length.md#0x1_table_with_length_add">add</a>&lt;K: <b>copy</b> + drop, V&gt;(<a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="table_with_length.md#0x1_table_with_length_TableWithLength">TableWithLength</a>&lt;K, V&gt;, key: K, val: V) {
+    <a href="table.md#0x1_table_add">table::add</a>(&<b>mut</b> <a href="table.md#0x1_table">table</a>.inner, key, val);
+    <a href="table.md#0x1_table">table</a>.length = <a href="table.md#0x1_table">table</a>.length + 1;
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_table_with_length_borrow"></a>
+
+## Function `borrow`
+
+Acquire an immutable reference to the value which <code>key</code> maps to.
+Aborts if there is no entry for <code>key</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="table_with_length.md#0x1_table_with_length_borrow">borrow</a>&lt;K: <b>copy</b>, drop, V&gt;(<a href="table.md#0x1_table">table</a>: &<a href="table_with_length.md#0x1_table_with_length_TableWithLength">table_with_length::TableWithLength</a>&lt;K, V&gt;, key: K): &V
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="table_with_length.md#0x1_table_with_length_borrow">borrow</a>&lt;K: <b>copy</b> + drop, V&gt;(<a href="table.md#0x1_table">table</a>: &<a href="table_with_length.md#0x1_table_with_length_TableWithLength">TableWithLength</a>&lt;K, V&gt;, key: K): &V {
+    <a href="table.md#0x1_table_borrow">table::borrow</a>(&<a href="table.md#0x1_table">table</a>.inner, key)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_table_with_length_borrow_mut"></a>
+
+## Function `borrow_mut`
+
+Acquire a mutable reference to the value which <code>key</code> maps to.
+Aborts if there is no entry for <code>key</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="table_with_length.md#0x1_table_with_length_borrow_mut">borrow_mut</a>&lt;K: <b>copy</b>, drop, V&gt;(<a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="table_with_length.md#0x1_table_with_length_TableWithLength">table_with_length::TableWithLength</a>&lt;K, V&gt;, key: K): &<b>mut</b> V
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="table_with_length.md#0x1_table_with_length_borrow_mut">borrow_mut</a>&lt;K: <b>copy</b> + drop, V&gt;(<a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="table_with_length.md#0x1_table_with_length_TableWithLength">TableWithLength</a>&lt;K, V&gt;, key: K): &<b>mut</b> V {
+    <a href="table.md#0x1_table_borrow_mut">table::borrow_mut</a>(&<b>mut</b> <a href="table.md#0x1_table">table</a>.inner, key)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_table_with_length_length"></a>
+
+## Function `length`
+
+Returns the length of the table, i.e. the number of entries.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="table_with_length.md#0x1_table_with_length_length">length</a>&lt;K: <b>copy</b>, drop, V&gt;(<a href="table.md#0x1_table">table</a>: &<a href="table_with_length.md#0x1_table_with_length_TableWithLength">table_with_length::TableWithLength</a>&lt;K, V&gt;): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="table_with_length.md#0x1_table_with_length_length">length</a>&lt;K: <b>copy</b> + drop, V&gt;(<a href="table.md#0x1_table">table</a>: &<a href="table_with_length.md#0x1_table_with_length_TableWithLength">TableWithLength</a>&lt;K, V&gt;): u64 {
+    <a href="table.md#0x1_table">table</a>.length
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_table_with_length_empty"></a>
+
+## Function `empty`
+
+Returns true if this table is empty.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="table_with_length.md#0x1_table_with_length_empty">empty</a>&lt;K: <b>copy</b>, drop, V&gt;(<a href="table.md#0x1_table">table</a>: &<a href="table_with_length.md#0x1_table_with_length_TableWithLength">table_with_length::TableWithLength</a>&lt;K, V&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="table_with_length.md#0x1_table_with_length_empty">empty</a>&lt;K: <b>copy</b> + drop, V&gt;(<a href="table.md#0x1_table">table</a>: &<a href="table_with_length.md#0x1_table_with_length_TableWithLength">TableWithLength</a>&lt;K, V&gt;): bool {
+    <a href="table.md#0x1_table">table</a>.length == 0
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_table_with_length_borrow_mut_with_default"></a>
+
+## Function `borrow_mut_with_default`
+
+Acquire a mutable reference to the value which <code>key</code> maps to.
+Insert the pair (<code>key</code>, <code>default</code>) first if there is no entry for <code>key</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="table_with_length.md#0x1_table_with_length_borrow_mut_with_default">borrow_mut_with_default</a>&lt;K: <b>copy</b>, drop, V: drop&gt;(<a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="table_with_length.md#0x1_table_with_length_TableWithLength">table_with_length::TableWithLength</a>&lt;K, V&gt;, key: K, default: V): &<b>mut</b> V
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="table_with_length.md#0x1_table_with_length_borrow_mut_with_default">borrow_mut_with_default</a>&lt;K: <b>copy</b> + drop, V: drop&gt;(<a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="table_with_length.md#0x1_table_with_length_TableWithLength">TableWithLength</a>&lt;K, V&gt;, key: K, default: V): &<b>mut</b> V {
+    <b>if</b> (<a href="table.md#0x1_table_contains">table::contains</a>(&<a href="table.md#0x1_table">table</a>.inner, key)) {
+        <a href="table.md#0x1_table_borrow_mut">table::borrow_mut</a>(&<b>mut</b> <a href="table.md#0x1_table">table</a>.inner, key)
+    } <b>else</b> {
+        <a href="table.md#0x1_table_add">table::add</a>(&<b>mut</b> <a href="table.md#0x1_table">table</a>.inner, key, default);
+        <a href="table.md#0x1_table">table</a>.length = <a href="table.md#0x1_table">table</a>.length + 1;
+        <a href="table.md#0x1_table_borrow_mut">table::borrow_mut</a>(&<b>mut</b> <a href="table.md#0x1_table">table</a>.inner, key)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_table_with_length_upsert"></a>
+
+## Function `upsert`
+
+Insert the pair (<code>key</code>, <code>value</code>) if there is no entry for <code>key</code>.
+update the value of the entry for <code>key</code> to <code>value</code> otherwise
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="table_with_length.md#0x1_table_with_length_upsert">upsert</a>&lt;K: <b>copy</b>, drop, V: drop&gt;(<a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="table_with_length.md#0x1_table_with_length_TableWithLength">table_with_length::TableWithLength</a>&lt;K, V&gt;, key: K, value: V)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="table_with_length.md#0x1_table_with_length_upsert">upsert</a>&lt;K: <b>copy</b> + drop, V: drop&gt;(<a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="table_with_length.md#0x1_table_with_length_TableWithLength">TableWithLength</a>&lt;K, V&gt;, key: K, value: V) {
+    <b>if</b> (!<a href="table.md#0x1_table_contains">table::contains</a>(&<a href="table.md#0x1_table">table</a>.inner, key)) {
+        <a href="table_with_length.md#0x1_table_with_length_add">add</a>(<a href="table.md#0x1_table">table</a>, <b>copy</b> key, value)
+    } <b>else</b> {
+        <b>let</b> ref = <a href="table.md#0x1_table_borrow_mut">table::borrow_mut</a>(&<b>mut</b> <a href="table.md#0x1_table">table</a>.inner, key);
+        *ref = value;
+    };
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_table_with_length_remove"></a>
+
+## Function `remove`
+
+Remove from <code><a href="table.md#0x1_table">table</a></code> and return the value which <code>key</code> maps to.
+Aborts if there is no entry for <code>key</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="table_with_length.md#0x1_table_with_length_remove">remove</a>&lt;K: <b>copy</b>, drop, V&gt;(<a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="table_with_length.md#0x1_table_with_length_TableWithLength">table_with_length::TableWithLength</a>&lt;K, V&gt;, key: K): V
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="table_with_length.md#0x1_table_with_length_remove">remove</a>&lt;K: <b>copy</b> + drop, V&gt;(<a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="table_with_length.md#0x1_table_with_length_TableWithLength">TableWithLength</a>&lt;K, V&gt;, key: K): V {
+    <b>let</b> val = <a href="table.md#0x1_table_remove">table::remove</a>(&<b>mut</b> <a href="table.md#0x1_table">table</a>.inner, key);
+    <a href="table.md#0x1_table">table</a>.length = <a href="table.md#0x1_table">table</a>.length - 1;
+    val
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_table_with_length_contains"></a>
+
+## Function `contains`
+
+Returns true iff <code><a href="table.md#0x1_table">table</a></code> contains an entry for <code>key</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="table_with_length.md#0x1_table_with_length_contains">contains</a>&lt;K: <b>copy</b>, drop, V&gt;(<a href="table.md#0x1_table">table</a>: &<a href="table_with_length.md#0x1_table_with_length_TableWithLength">table_with_length::TableWithLength</a>&lt;K, V&gt;, key: K): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="table_with_length.md#0x1_table_with_length_contains">contains</a>&lt;K: <b>copy</b> + drop, V&gt;(<a href="table.md#0x1_table">table</a>: &<a href="table_with_length.md#0x1_table_with_length_TableWithLength">TableWithLength</a>&lt;K, V&gt;, key: K): bool {
+    <a href="table.md#0x1_table_contains">table::contains</a>(&<a href="table.md#0x1_table">table</a>.inner, key)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+<a id="@Specification_1_TableWithLength"></a>
+
+### Struct `TableWithLength`
+
+
+<pre><code><b>struct</b> <a href="table_with_length.md#0x1_table_with_length_TableWithLength">TableWithLength</a>&lt;K: <b>copy</b>, drop, V&gt; <b>has</b> store
+</code></pre>
+
+
+
+<dl>
+<dt>
+<code>inner: <a href="table.md#0x1_table_Table">table::Table</a>&lt;K, V&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>length: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+
+<pre><code><b>pragma</b> intrinsic = map,
+    map_new = new,
+    map_destroy_empty = destroy_empty,
+    map_len = length,
+    map_is_empty = empty,
+    map_has_key = contains,
+    map_add_no_override = add,
+    map_add_override_if_exists = upsert,
+    map_del_must_exist = remove,
+    map_borrow = borrow,
+    map_borrow_mut = borrow_mut,
+    map_borrow_mut_with_default = borrow_mut_with_default,
+    map_spec_get = spec_get,
+    map_spec_set = spec_set,
+    map_spec_del = spec_remove,
+    map_spec_len = spec_len,
+    map_spec_has_key = spec_contains;
+</code></pre>
+
+
+
+<a id="@Specification_1_new"></a>
+
+### Function `new`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="table_with_length.md#0x1_table_with_length_new">new</a>&lt;K: <b>copy</b>, drop, V: store&gt;(): <a href="table_with_length.md#0x1_table_with_length_TableWithLength">table_with_length::TableWithLength</a>&lt;K, V&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> intrinsic;
+</code></pre>
+
+
+
+<a id="@Specification_1_destroy_empty"></a>
+
+### Function `destroy_empty`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="table_with_length.md#0x1_table_with_length_destroy_empty">destroy_empty</a>&lt;K: <b>copy</b>, drop, V&gt;(<a href="table.md#0x1_table">table</a>: <a href="table_with_length.md#0x1_table_with_length_TableWithLength">table_with_length::TableWithLength</a>&lt;K, V&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> intrinsic;
+</code></pre>
+
+
+
+<a id="@Specification_1_add"></a>
+
+### Function `add`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="table_with_length.md#0x1_table_with_length_add">add</a>&lt;K: <b>copy</b>, drop, V&gt;(<a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="table_with_length.md#0x1_table_with_length_TableWithLength">table_with_length::TableWithLength</a>&lt;K, V&gt;, key: K, val: V)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> intrinsic;
+</code></pre>
+
+
+
+<a id="@Specification_1_borrow"></a>
+
+### Function `borrow`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="table_with_length.md#0x1_table_with_length_borrow">borrow</a>&lt;K: <b>copy</b>, drop, V&gt;(<a href="table.md#0x1_table">table</a>: &<a href="table_with_length.md#0x1_table_with_length_TableWithLength">table_with_length::TableWithLength</a>&lt;K, V&gt;, key: K): &V
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> intrinsic;
+</code></pre>
+
+
+
+<a id="@Specification_1_borrow_mut"></a>
+
+### Function `borrow_mut`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="table_with_length.md#0x1_table_with_length_borrow_mut">borrow_mut</a>&lt;K: <b>copy</b>, drop, V&gt;(<a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="table_with_length.md#0x1_table_with_length_TableWithLength">table_with_length::TableWithLength</a>&lt;K, V&gt;, key: K): &<b>mut</b> V
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> intrinsic;
+</code></pre>
+
+
+
+<a id="@Specification_1_length"></a>
+
+### Function `length`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="table_with_length.md#0x1_table_with_length_length">length</a>&lt;K: <b>copy</b>, drop, V&gt;(<a href="table.md#0x1_table">table</a>: &<a href="table_with_length.md#0x1_table_with_length_TableWithLength">table_with_length::TableWithLength</a>&lt;K, V&gt;): u64
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> intrinsic;
+</code></pre>
+
+
+
+<a id="@Specification_1_empty"></a>
+
+### Function `empty`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="table_with_length.md#0x1_table_with_length_empty">empty</a>&lt;K: <b>copy</b>, drop, V&gt;(<a href="table.md#0x1_table">table</a>: &<a href="table_with_length.md#0x1_table_with_length_TableWithLength">table_with_length::TableWithLength</a>&lt;K, V&gt;): bool
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> intrinsic;
+</code></pre>
+
+
+
+<a id="@Specification_1_borrow_mut_with_default"></a>
+
+### Function `borrow_mut_with_default`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="table_with_length.md#0x1_table_with_length_borrow_mut_with_default">borrow_mut_with_default</a>&lt;K: <b>copy</b>, drop, V: drop&gt;(<a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="table_with_length.md#0x1_table_with_length_TableWithLength">table_with_length::TableWithLength</a>&lt;K, V&gt;, key: K, default: V): &<b>mut</b> V
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+<b>pragma</b> intrinsic;
+</code></pre>
+
+
+
+<a id="@Specification_1_upsert"></a>
+
+### Function `upsert`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="table_with_length.md#0x1_table_with_length_upsert">upsert</a>&lt;K: <b>copy</b>, drop, V: drop&gt;(<a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="table_with_length.md#0x1_table_with_length_TableWithLength">table_with_length::TableWithLength</a>&lt;K, V&gt;, key: K, value: V)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> intrinsic;
+</code></pre>
+
+
+
+<a id="@Specification_1_remove"></a>
+
+### Function `remove`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="table_with_length.md#0x1_table_with_length_remove">remove</a>&lt;K: <b>copy</b>, drop, V&gt;(<a href="table.md#0x1_table">table</a>: &<b>mut</b> <a href="table_with_length.md#0x1_table_with_length_TableWithLength">table_with_length::TableWithLength</a>&lt;K, V&gt;, key: K): V
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> intrinsic;
+</code></pre>
+
+
+
+<a id="@Specification_1_contains"></a>
+
+### Function `contains`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="table_with_length.md#0x1_table_with_length_contains">contains</a>&lt;K: <b>copy</b>, drop, V&gt;(<a href="table.md#0x1_table">table</a>: &<a href="table_with_length.md#0x1_table_with_length_TableWithLength">table_with_length::TableWithLength</a>&lt;K, V&gt;, key: K): bool
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> intrinsic;
+</code></pre>
+
+
+
+
+<a id="0x1_table_with_length_spec_len"></a>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="table_with_length.md#0x1_table_with_length_spec_len">spec_len</a>&lt;K, V&gt;(t: <a href="table_with_length.md#0x1_table_with_length_TableWithLength">TableWithLength</a>&lt;K, V&gt;): num;
+</code></pre>
+
+
+
+
+<a id="0x1_table_with_length_spec_contains"></a>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="table_with_length.md#0x1_table_with_length_spec_contains">spec_contains</a>&lt;K, V&gt;(t: <a href="table_with_length.md#0x1_table_with_length_TableWithLength">TableWithLength</a>&lt;K, V&gt;, k: K): bool;
+</code></pre>
+
+
+
+
+<a id="0x1_table_with_length_spec_set"></a>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="table_with_length.md#0x1_table_with_length_spec_set">spec_set</a>&lt;K, V&gt;(t: <a href="table_with_length.md#0x1_table_with_length_TableWithLength">TableWithLength</a>&lt;K, V&gt;, k: K, v: V): <a href="table_with_length.md#0x1_table_with_length_TableWithLength">TableWithLength</a>&lt;K, V&gt;;
+</code></pre>
+
+
+
+
+<a id="0x1_table_with_length_spec_remove"></a>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="table_with_length.md#0x1_table_with_length_spec_remove">spec_remove</a>&lt;K, V&gt;(t: <a href="table_with_length.md#0x1_table_with_length_TableWithLength">TableWithLength</a>&lt;K, V&gt;, k: K): <a href="table_with_length.md#0x1_table_with_length_TableWithLength">TableWithLength</a>&lt;K, V&gt;;
+</code></pre>
+
+
+
+
+<a id="0x1_table_with_length_spec_get"></a>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="table_with_length.md#0x1_table_with_length_spec_get">spec_get</a>&lt;K, V&gt;(t: <a href="table_with_length.md#0x1_table_with_length_TableWithLength">TableWithLength</a>&lt;K, V&gt;, k: K): V;
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/type_info.md b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/type_info.md
new file mode 100644
index 0000000000000..8cc7cf089708f
--- /dev/null
+++ b/aptos-move/framework/aptos-stdlib/tests/compiler-v2-doc/type_info.md
@@ -0,0 +1,397 @@
+
+<a id="0x1_type_info"></a>
+
+# Module `0x1::type_info`
+
+
+
+-  [Struct `TypeInfo`](#0x1_type_info_TypeInfo)
+-  [Constants](#@Constants_0)
+-  [Function `account_address`](#0x1_type_info_account_address)
+-  [Function `module_name`](#0x1_type_info_module_name)
+-  [Function `struct_name`](#0x1_type_info_struct_name)
+-  [Function `chain_id`](#0x1_type_info_chain_id)
+-  [Function `type_of`](#0x1_type_info_type_of)
+-  [Function `type_name`](#0x1_type_info_type_name)
+-  [Function `chain_id_internal`](#0x1_type_info_chain_id_internal)
+-  [Function `size_of_val`](#0x1_type_info_size_of_val)
+-  [Specification](#@Specification_1)
+    -  [Function `chain_id`](#@Specification_1_chain_id)
+    -  [Function `type_of`](#@Specification_1_type_of)
+    -  [Function `type_name`](#@Specification_1_type_name)
+    -  [Function `chain_id_internal`](#@Specification_1_chain_id_internal)
+    -  [Function `size_of_val`](#@Specification_1_size_of_val)
+
+
+<pre><code><b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs">0x1::bcs</a>;
+<b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features">0x1::features</a>;
+<b>use</b> <a href="../../../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string">0x1::string</a>;
+</code></pre>
+
+
+
+<a id="0x1_type_info_TypeInfo"></a>
+
+## Struct `TypeInfo`
+
+
+
+<pre><code><b>struct</b> <a href="type_info.md#0x1_type_info_TypeInfo">TypeInfo</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>account_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>module_name: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>struct_name: <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_type_info_E_NATIVE_FUN_NOT_AVAILABLE"></a>
+
+
+
+<pre><code><b>const</b> <a href="type_info.md#0x1_type_info_E_NATIVE_FUN_NOT_AVAILABLE">E_NATIVE_FUN_NOT_AVAILABLE</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_type_info_account_address"></a>
+
+## Function `account_address`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="type_info.md#0x1_type_info_account_address">account_address</a>(<a href="type_info.md#0x1_type_info">type_info</a>: &<a href="type_info.md#0x1_type_info_TypeInfo">type_info::TypeInfo</a>): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="type_info.md#0x1_type_info_account_address">account_address</a>(<a href="type_info.md#0x1_type_info">type_info</a>: &<a href="type_info.md#0x1_type_info_TypeInfo">TypeInfo</a>): <b>address</b> {
+    <a href="type_info.md#0x1_type_info">type_info</a>.account_address
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_type_info_module_name"></a>
+
+## Function `module_name`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="type_info.md#0x1_type_info_module_name">module_name</a>(<a href="type_info.md#0x1_type_info">type_info</a>: &<a href="type_info.md#0x1_type_info_TypeInfo">type_info::TypeInfo</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="type_info.md#0x1_type_info_module_name">module_name</a>(<a href="type_info.md#0x1_type_info">type_info</a>: &<a href="type_info.md#0x1_type_info_TypeInfo">TypeInfo</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; {
+    <a href="type_info.md#0x1_type_info">type_info</a>.module_name
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_type_info_struct_name"></a>
+
+## Function `struct_name`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="type_info.md#0x1_type_info_struct_name">struct_name</a>(<a href="type_info.md#0x1_type_info">type_info</a>: &<a href="type_info.md#0x1_type_info_TypeInfo">type_info::TypeInfo</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="type_info.md#0x1_type_info_struct_name">struct_name</a>(<a href="type_info.md#0x1_type_info">type_info</a>: &<a href="type_info.md#0x1_type_info_TypeInfo">TypeInfo</a>): <a href="../../../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; {
+    <a href="type_info.md#0x1_type_info">type_info</a>.struct_name
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_type_info_chain_id"></a>
+
+## Function `chain_id`
+
+Returns the current chain ID, mirroring what <code>aptos_framework::chain_id::get()</code> would return, except in <code>#[test]</code>
+functions, where this will always return <code>4u8</code> as the chain ID, whereas <code>aptos_framework::chain_id::get()</code> will
+return whichever ID was passed to <code>aptos_framework::chain_id::initialize_for_test()</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="type_info.md#0x1_type_info_chain_id">chain_id</a>(): u8
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="type_info.md#0x1_type_info_chain_id">chain_id</a>(): u8 {
+    <b>if</b> (!<a href="../../../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_aptos_stdlib_chain_id_enabled">features::aptos_stdlib_chain_id_enabled</a>()) {
+        <b>abort</b>(std::error::invalid_state(<a href="type_info.md#0x1_type_info_E_NATIVE_FUN_NOT_AVAILABLE">E_NATIVE_FUN_NOT_AVAILABLE</a>))
+    };
+
+    <a href="type_info.md#0x1_type_info_chain_id_internal">chain_id_internal</a>()
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_type_info_type_of"></a>
+
+## Function `type_of`
+
+Return the <code><a href="type_info.md#0x1_type_info_TypeInfo">TypeInfo</a></code> struct containing  for the type <code>T</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="type_info.md#0x1_type_info_type_of">type_of</a>&lt;T&gt;(): <a href="type_info.md#0x1_type_info_TypeInfo">type_info::TypeInfo</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>native</b> <b>fun</b> <a href="type_info.md#0x1_type_info_type_of">type_of</a>&lt;T&gt;(): <a href="type_info.md#0x1_type_info_TypeInfo">TypeInfo</a>;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_type_info_type_name"></a>
+
+## Function `type_name`
+
+Return the human readable string for the type, including the address, module name, and any type arguments.
+Example: 0x1::coin::CoinStore<0x1::aptos_coin::AptosCoin>
+Or: 0x1::table::Table<0x1::string::String, 0x1::string::String>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="type_info.md#0x1_type_info_type_name">type_name</a>&lt;T&gt;(): <a href="../../../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>native</b> <b>fun</b> <a href="type_info.md#0x1_type_info_type_name">type_name</a>&lt;T&gt;(): String;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_type_info_chain_id_internal"></a>
+
+## Function `chain_id_internal`
+
+
+
+<pre><code><b>fun</b> <a href="type_info.md#0x1_type_info_chain_id_internal">chain_id_internal</a>(): u8
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="type_info.md#0x1_type_info_chain_id_internal">chain_id_internal</a>(): u8;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_type_info_size_of_val"></a>
+
+## Function `size_of_val`
+
+Return the BCS size, in bytes, of value at <code>val_ref</code>.
+
+See the [BCS spec](https://github.com/diem/bcs)
+
+See <code>test_size_of_val()</code> for an analysis of common types and
+nesting patterns, as well as <code>test_size_of_val_vectors()</code> for an
+analysis of vector size dynamism.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="type_info.md#0x1_type_info_size_of_val">size_of_val</a>&lt;T&gt;(val_ref: &T): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="type_info.md#0x1_type_info_size_of_val">size_of_val</a>&lt;T&gt;(val_ref: &T): u64 {
+    <a href="../../../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs_serialized_size">bcs::serialized_size</a>(val_ref)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+
+<a id="0x1_type_info_spec_is_struct"></a>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="type_info.md#0x1_type_info_spec_is_struct">spec_is_struct</a>&lt;T&gt;(): bool;
+</code></pre>
+
+
+
+<a id="@Specification_1_chain_id"></a>
+
+### Function `chain_id`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="type_info.md#0x1_type_info_chain_id">chain_id</a>(): u8
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<a href="../../../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_spec_is_enabled">features::spec_is_enabled</a>(<a href="../../../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features_APTOS_STD_CHAIN_ID_NATIVES">features::APTOS_STD_CHAIN_ID_NATIVES</a>);
+<b>ensures</b> result == <a href="type_info.md#0x1_type_info_spec_chain_id_internal">spec_chain_id_internal</a>();
+</code></pre>
+
+
+
+<a id="@Specification_1_type_of"></a>
+
+### Function `type_of`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="type_info.md#0x1_type_info_type_of">type_of</a>&lt;T&gt;(): <a href="type_info.md#0x1_type_info_TypeInfo">type_info::TypeInfo</a>
+</code></pre>
+
+
+
+
+<a id="@Specification_1_type_name"></a>
+
+### Function `type_name`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="type_info.md#0x1_type_info_type_name">type_name</a>&lt;T&gt;(): <a href="../../../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+
+<a id="@Specification_1_chain_id_internal"></a>
+
+### Function `chain_id_internal`
+
+
+<pre><code><b>fun</b> <a href="type_info.md#0x1_type_info_chain_id_internal">chain_id_internal</a>(): u8
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="type_info.md#0x1_type_info_spec_chain_id_internal">spec_chain_id_internal</a>();
+</code></pre>
+
+
+
+
+<a id="0x1_type_info_spec_chain_id_internal"></a>
+
+
+<pre><code><b>fun</b> <a href="type_info.md#0x1_type_info_spec_chain_id_internal">spec_chain_id_internal</a>(): u8;
+</code></pre>
+
+
+
+
+<a id="0x1_type_info_spec_size_of_val"></a>
+
+
+<pre><code><b>fun</b> <a href="type_info.md#0x1_type_info_spec_size_of_val">spec_size_of_val</a>&lt;T&gt;(val_ref: T): u64 {
+   len(std::bcs::serialize(val_ref))
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_size_of_val"></a>
+
+### Function `size_of_val`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="type_info.md#0x1_type_info_size_of_val">size_of_val</a>&lt;T&gt;(val_ref: &T): u64
+</code></pre>
+
+
+
+
+<pre><code><b>ensures</b> result == <a href="type_info.md#0x1_type_info_spec_size_of_val">spec_size_of_val</a>&lt;T&gt;(val_ref);
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-token-objects/doc/collection.md b/aptos-move/framework/aptos-token-objects/doc/collection.md
index 3dad2ab44b617..59b704ea47bc0 100644
--- a/aptos-move/framework/aptos-token-objects/doc/collection.md
+++ b/aptos-move/framework/aptos-token-objects/doc/collection.md
@@ -45,7 +45,6 @@ require adding the field original_name.
 -  [Function `create_collection_address`](#0x4_collection_create_collection_address)
 -  [Function `create_collection_seed`](#0x4_collection_create_collection_seed)
 -  [Function `increment_supply`](#0x4_collection_increment_supply)
--  [Function `increment_concurrent_supply`](#0x4_collection_increment_concurrent_supply)
 -  [Function `decrement_supply`](#0x4_collection_decrement_supply)
 -  [Function `generate_mutator_ref`](#0x4_collection_generate_mutator_ref)
 -  [Function `upgrade_to_concurrent`](#0x4_collection_upgrade_to_concurrent)
@@ -818,41 +817,21 @@ Beyond that, it adds supply tracking with events.
     <b>assert</b>!(max_supply != 0, <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="collection.md#0x4_collection_EMAX_SUPPLY_CANNOT_BE_ZERO">EMAX_SUPPLY_CANNOT_BE_ZERO</a>));
     <b>let</b> collection_seed = <a href="collection.md#0x4_collection_create_collection_seed">create_collection_seed</a>(&name);
     <b>let</b> constructor_ref = <a href="../../aptos-framework/doc/object.md#0x1_object_create_named_object">object::create_named_object</a>(creator, collection_seed);
-    <b>let</b> object_signer = <a href="../../aptos-framework/doc/object.md#0x1_object_generate_signer">object::generate_signer</a>(&constructor_ref);
-    <b>if</b> (<a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/features.md#0x1_features_concurrent_token_v2_enabled">features::concurrent_token_v2_enabled</a>()) {
-        <b>let</b> supply = <a href="collection.md#0x4_collection_ConcurrentSupply">ConcurrentSupply</a> {
-            current_supply: <a href="../../aptos-framework/doc/aggregator_v2.md#0x1_aggregator_v2_create_aggregator">aggregator_v2::create_aggregator</a>(max_supply),
-            total_minted: <a href="../../aptos-framework/doc/aggregator_v2.md#0x1_aggregator_v2_create_unbounded_aggregator">aggregator_v2::create_unbounded_aggregator</a>(),
-        };
 
-        <a href="collection.md#0x4_collection_create_collection_internal">create_collection_internal</a>(
-            creator,
-            constructor_ref,
-            description,
-            name,
-            <a href="royalty.md#0x4_royalty">royalty</a>,
-            uri,
-            <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_some">option::some</a>(supply),
-        )
-    } <b>else</b> {
-        <b>let</b> supply = <a href="collection.md#0x4_collection_FixedSupply">FixedSupply</a> {
-            current_supply: 0,
-            max_supply,
-            total_minted: 0,
-            burn_events: <a href="../../aptos-framework/doc/object.md#0x1_object_new_event_handle">object::new_event_handle</a>(&object_signer),
-            mint_events: <a href="../../aptos-framework/doc/object.md#0x1_object_new_event_handle">object::new_event_handle</a>(&object_signer),
-        };
+    <b>let</b> supply = <a href="collection.md#0x4_collection_ConcurrentSupply">ConcurrentSupply</a> {
+        current_supply: <a href="../../aptos-framework/doc/aggregator_v2.md#0x1_aggregator_v2_create_aggregator">aggregator_v2::create_aggregator</a>(max_supply),
+        total_minted: <a href="../../aptos-framework/doc/aggregator_v2.md#0x1_aggregator_v2_create_unbounded_aggregator">aggregator_v2::create_unbounded_aggregator</a>(),
+    };
 
-        <a href="collection.md#0x4_collection_create_collection_internal">create_collection_internal</a>(
-            creator,
-            constructor_ref,
-            description,
-            name,
-            <a href="royalty.md#0x4_royalty">royalty</a>,
-            uri,
-            <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_some">option::some</a>(supply),
-        )
-    }
+    <a href="collection.md#0x4_collection_create_collection_internal">create_collection_internal</a>(
+        creator,
+        constructor_ref,
+        description,
+        name,
+        <a href="royalty.md#0x4_royalty">royalty</a>,
+        uri,
+        <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_some">option::some</a>(supply),
+    )
 }
 </code></pre>
 
@@ -886,41 +865,21 @@ the supply of tokens.
 ): ConstructorRef {
     <b>let</b> collection_seed = <a href="collection.md#0x4_collection_create_collection_seed">create_collection_seed</a>(&name);
     <b>let</b> constructor_ref = <a href="../../aptos-framework/doc/object.md#0x1_object_create_named_object">object::create_named_object</a>(creator, collection_seed);
-    <b>let</b> object_signer = <a href="../../aptos-framework/doc/object.md#0x1_object_generate_signer">object::generate_signer</a>(&constructor_ref);
 
-    <b>if</b> (<a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/features.md#0x1_features_concurrent_token_v2_enabled">features::concurrent_token_v2_enabled</a>()) {
-        <b>let</b> supply = <a href="collection.md#0x4_collection_ConcurrentSupply">ConcurrentSupply</a> {
-            current_supply: <a href="../../aptos-framework/doc/aggregator_v2.md#0x1_aggregator_v2_create_unbounded_aggregator">aggregator_v2::create_unbounded_aggregator</a>(),
-            total_minted: <a href="../../aptos-framework/doc/aggregator_v2.md#0x1_aggregator_v2_create_unbounded_aggregator">aggregator_v2::create_unbounded_aggregator</a>(),
-        };
-
-        <a href="collection.md#0x4_collection_create_collection_internal">create_collection_internal</a>(
-            creator,
-            constructor_ref,
-            description,
-            name,
-            <a href="royalty.md#0x4_royalty">royalty</a>,
-            uri,
-            <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_some">option::some</a>(supply),
-        )
-    } <b>else</b> {
-        <b>let</b> supply = <a href="collection.md#0x4_collection_UnlimitedSupply">UnlimitedSupply</a> {
-            current_supply: 0,
-            total_minted: 0,
-            burn_events: <a href="../../aptos-framework/doc/object.md#0x1_object_new_event_handle">object::new_event_handle</a>(&object_signer),
-            mint_events: <a href="../../aptos-framework/doc/object.md#0x1_object_new_event_handle">object::new_event_handle</a>(&object_signer),
-        };
+    <b>let</b> supply = <a href="collection.md#0x4_collection_ConcurrentSupply">ConcurrentSupply</a> {
+        current_supply: <a href="../../aptos-framework/doc/aggregator_v2.md#0x1_aggregator_v2_create_unbounded_aggregator">aggregator_v2::create_unbounded_aggregator</a>(),
+        total_minted: <a href="../../aptos-framework/doc/aggregator_v2.md#0x1_aggregator_v2_create_unbounded_aggregator">aggregator_v2::create_unbounded_aggregator</a>(),
+    };
 
-        <a href="collection.md#0x4_collection_create_collection_internal">create_collection_internal</a>(
-            creator,
-            constructor_ref,
-            description,
-            name,
-            <a href="royalty.md#0x4_royalty">royalty</a>,
-            uri,
-            <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_some">option::some</a>(supply),
-        )
-    }
+    <a href="collection.md#0x4_collection_create_collection_internal">create_collection_internal</a>(
+        creator,
+        constructor_ref,
+        description,
+        name,
+        <a href="royalty.md#0x4_royalty">royalty</a>,
+        uri,
+        <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_some">option::some</a>(supply),
+    )
 }
 </code></pre>
 
@@ -1021,9 +980,6 @@ TODO: Hide this until we bring back meaningful way to enforce burns
         <a href="royalty.md#0x4_royalty_init">royalty::init</a>(&constructor_ref, <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_extract">option::extract</a>(&<b>mut</b> <a href="royalty.md#0x4_royalty">royalty</a>))
     };
 
-    <b>let</b> transfer_ref = <a href="../../aptos-framework/doc/object.md#0x1_object_generate_transfer_ref">object::generate_transfer_ref</a>(&constructor_ref);
-    <a href="../../aptos-framework/doc/object.md#0x1_object_disable_ungated_transfer">object::disable_ungated_transfer</a>(&transfer_ref);
-
     constructor_ref
 }
 </code></pre>
@@ -1088,11 +1044,9 @@ Named objects are derived from a seed, the collection's seed is its name.
 ## Function `increment_supply`
 
 Called by token on mint to increment supply if there's an appropriate Supply struct.
-TODO[agg_v2](cleanup): remove in a future release. We need to have both functions, as
-increment_concurrent_supply cannot be used until AGGREGATOR_API_V2 is enabled.
 
 
-<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="collection.md#0x4_collection_increment_supply">increment_supply</a>(<a href="collection.md#0x4_collection">collection</a>: &<a href="../../aptos-framework/doc/object.md#0x1_object_Object">object::Object</a>&lt;<a href="collection.md#0x4_collection_Collection">collection::Collection</a>&gt;, <a href="token.md#0x4_token">token</a>: <b>address</b>): <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_Option">option::Option</a>&lt;u64&gt;
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="collection.md#0x4_collection_increment_supply">increment_supply</a>(<a href="collection.md#0x4_collection">collection</a>: &<a href="../../aptos-framework/doc/object.md#0x1_object_Object">object::Object</a>&lt;<a href="collection.md#0x4_collection_Collection">collection::Collection</a>&gt;, <a href="token.md#0x4_token">token</a>: <b>address</b>): <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="../../aptos-framework/doc/aggregator_v2.md#0x1_aggregator_v2_AggregatorSnapshot">aggregator_v2::AggregatorSnapshot</a>&lt;u64&gt;&gt;
 </code></pre>
 
 
@@ -1104,85 +1058,6 @@ increment_concurrent_supply cannot be used until AGGREGATOR_API_V2 is enabled.
 <pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="collection.md#0x4_collection_increment_supply">increment_supply</a>(
     <a href="collection.md#0x4_collection">collection</a>: &Object&lt;<a href="collection.md#0x4_collection_Collection">Collection</a>&gt;,
     <a href="token.md#0x4_token">token</a>: <b>address</b>,
-): Option&lt;u64&gt; <b>acquires</b> <a href="collection.md#0x4_collection_FixedSupply">FixedSupply</a>, <a href="collection.md#0x4_collection_UnlimitedSupply">UnlimitedSupply</a> {
-    <b>let</b> collection_addr = <a href="../../aptos-framework/doc/object.md#0x1_object_object_address">object::object_address</a>(<a href="collection.md#0x4_collection">collection</a>);
-    <b>if</b> (<b>exists</b>&lt;<a href="collection.md#0x4_collection_FixedSupply">FixedSupply</a>&gt;(collection_addr)) {
-        <b>let</b> supply = <b>borrow_global_mut</b>&lt;<a href="collection.md#0x4_collection_FixedSupply">FixedSupply</a>&gt;(collection_addr);
-        supply.current_supply = supply.current_supply + 1;
-        supply.total_minted = supply.total_minted + 1;
-        <b>assert</b>!(
-            supply.current_supply &lt;= supply.max_supply,
-            <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_out_of_range">error::out_of_range</a>(<a href="collection.md#0x4_collection_ECOLLECTION_SUPPLY_EXCEEDED">ECOLLECTION_SUPPLY_EXCEEDED</a>),
-        );
-
-        <b>if</b> (std::features::module_event_migration_enabled()) {
-            <a href="../../aptos-framework/doc/event.md#0x1_event_emit">event::emit</a>(
-                <a href="collection.md#0x4_collection_Mint">Mint</a> {
-                    <a href="collection.md#0x4_collection">collection</a>: collection_addr,
-                    index: <a href="../../aptos-framework/doc/aggregator_v2.md#0x1_aggregator_v2_create_snapshot">aggregator_v2::create_snapshot</a>(supply.total_minted),
-                    <a href="token.md#0x4_token">token</a>,
-                },
-            );
-        };
-        <a href="../../aptos-framework/doc/event.md#0x1_event_emit_event">event::emit_event</a>(&<b>mut</b> supply.mint_events,
-            <a href="collection.md#0x4_collection_MintEvent">MintEvent</a> {
-                index: supply.total_minted,
-                <a href="token.md#0x4_token">token</a>,
-            },
-        );
-        <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_some">option::some</a>(supply.total_minted)
-    } <b>else</b> <b>if</b> (<b>exists</b>&lt;<a href="collection.md#0x4_collection_UnlimitedSupply">UnlimitedSupply</a>&gt;(collection_addr)) {
-        <b>let</b> supply = <b>borrow_global_mut</b>&lt;<a href="collection.md#0x4_collection_UnlimitedSupply">UnlimitedSupply</a>&gt;(collection_addr);
-        supply.current_supply = supply.current_supply + 1;
-        supply.total_minted = supply.total_minted + 1;
-        <b>if</b> (std::features::module_event_migration_enabled()) {
-            <a href="../../aptos-framework/doc/event.md#0x1_event_emit">event::emit</a>(
-                <a href="collection.md#0x4_collection_Mint">Mint</a> {
-                    <a href="collection.md#0x4_collection">collection</a>: collection_addr,
-                    index: <a href="../../aptos-framework/doc/aggregator_v2.md#0x1_aggregator_v2_create_snapshot">aggregator_v2::create_snapshot</a>(supply.total_minted),
-                    <a href="token.md#0x4_token">token</a>,
-                },
-            );
-        };
-        <a href="../../aptos-framework/doc/event.md#0x1_event_emit_event">event::emit_event</a>(
-            &<b>mut</b> supply.mint_events,
-            <a href="collection.md#0x4_collection_MintEvent">MintEvent</a> {
-                index: supply.total_minted,
-                <a href="token.md#0x4_token">token</a>,
-            },
-        );
-        <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_some">option::some</a>(supply.total_minted)
-    } <b>else</b> <b>if</b> (<b>exists</b>&lt;<a href="collection.md#0x4_collection_ConcurrentSupply">ConcurrentSupply</a>&gt;(collection_addr)) {
-        <b>abort</b> <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="collection.md#0x4_collection_ECONCURRENT_NOT_ENABLED">ECONCURRENT_NOT_ENABLED</a>)
-    } <b>else</b> {
-        <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_none">option::none</a>()
-    }
-}
-</code></pre>
-
-
-
-</details>
-
-<a id="0x4_collection_increment_concurrent_supply"></a>
-
-## Function `increment_concurrent_supply`
-
-Called by token on mint to increment supply if there's an appropriate Supply struct.
-
-
-<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="collection.md#0x4_collection_increment_concurrent_supply">increment_concurrent_supply</a>(<a href="collection.md#0x4_collection">collection</a>: &<a href="../../aptos-framework/doc/object.md#0x1_object_Object">object::Object</a>&lt;<a href="collection.md#0x4_collection_Collection">collection::Collection</a>&gt;, <a href="token.md#0x4_token">token</a>: <b>address</b>): <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="../../aptos-framework/doc/aggregator_v2.md#0x1_aggregator_v2_AggregatorSnapshot">aggregator_v2::AggregatorSnapshot</a>&lt;u64&gt;&gt;
-</code></pre>
-
-
-
-<details>
-<summary>Implementation</summary>
-
-
-<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="collection.md#0x4_collection_increment_concurrent_supply">increment_concurrent_supply</a>(
-    <a href="collection.md#0x4_collection">collection</a>: &Object&lt;<a href="collection.md#0x4_collection_Collection">Collection</a>&gt;,
-    <a href="token.md#0x4_token">token</a>: <b>address</b>,
 ): Option&lt;AggregatorSnapshot&lt;u64&gt;&gt; <b>acquires</b> <a href="collection.md#0x4_collection_FixedSupply">FixedSupply</a>, <a href="collection.md#0x4_collection_UnlimitedSupply">UnlimitedSupply</a>, <a href="collection.md#0x4_collection_ConcurrentSupply">ConcurrentSupply</a> {
     <b>let</b> collection_addr = <a href="../../aptos-framework/doc/object.md#0x1_object_object_address">object::object_address</a>(<a href="collection.md#0x4_collection">collection</a>);
     <b>if</b> (<b>exists</b>&lt;<a href="collection.md#0x4_collection_ConcurrentSupply">ConcurrentSupply</a>&gt;(collection_addr)) {
@@ -1384,7 +1259,6 @@ Creates a MutatorRef, which gates the ability to mutate any fields that support
 ) <b>acquires</b> <a href="collection.md#0x4_collection_FixedSupply">FixedSupply</a>, <a href="collection.md#0x4_collection_UnlimitedSupply">UnlimitedSupply</a> {
     <b>let</b> metadata_object_address = <a href="../../aptos-framework/doc/object.md#0x1_object_address_from_extend_ref">object::address_from_extend_ref</a>(ref);
     <b>let</b> metadata_object_signer = <a href="../../aptos-framework/doc/object.md#0x1_object_generate_signer_for_extending">object::generate_signer_for_extending</a>(ref);
-    <b>assert</b>!(<a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/features.md#0x1_features_concurrent_token_v2_enabled">features::concurrent_token_v2_enabled</a>(), <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="collection.md#0x4_collection_ECONCURRENT_NOT_ENABLED">ECONCURRENT_NOT_ENABLED</a>));
 
     <b>let</b> (supply, current_supply, total_minted, burn_events, mint_events) = <b>if</b> (<b>exists</b>&lt;<a href="collection.md#0x4_collection_FixedSupply">FixedSupply</a>&gt;(
         metadata_object_address
diff --git a/aptos-move/framework/aptos-token-objects/doc/token.md b/aptos-move/framework/aptos-token-objects/doc/token.md
index fcce8b526862d..0068cdeaf002b 100644
--- a/aptos-move/framework/aptos-token-objects/doc/token.md
+++ b/aptos-move/framework/aptos-token-objects/doc/token.md
@@ -59,7 +59,6 @@ token are:
 <b>use</b> <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option">0x1::option</a>;
 <b>use</b> <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer">0x1::signer</a>;
 <b>use</b> <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/string.md#0x1_string">0x1::string</a>;
-<b>use</b> <a href="../../aptos-framework/../aptos-stdlib/doc/string_utils.md#0x1_string_utils">0x1::string_utils</a>;
 <b>use</b> <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector">0x1::vector</a>;
 <b>use</b> <a href="collection.md#0x4_collection">0x4::collection</a>;
 <b>use</b> <a href="royalty.md#0x4_royalty">0x4::royalty</a>;
@@ -96,7 +95,7 @@ Represents the common fields to all tokens.
 </dt>
 <dd>
  Deprecated in favor of <code>index</code> inside TokenIdentifiers.
- Will be populated until concurrent_token_v2_enabled feature flag is enabled.
+ Was populated until concurrent_token_v2_enabled feature flag was enabled.
 
  Unique identifier within the collection, optional, 0 means unassigned
 </dd>
@@ -111,7 +110,7 @@ Represents the common fields to all tokens.
 </dt>
 <dd>
  Deprecated in favor of <code>name</code> inside TokenIdentifiers.
- Will be populated until concurrent_token_v2_enabled feature flag is enabled.
+ Was populated until concurrent_token_v2_enabled feature flag was enabled.
 
  The name of the token, which should be unique within the collection; the length of name
  should be smaller than 128, characters, eg: "Aptos Animal #1234"
@@ -139,7 +138,7 @@ Represents the common fields to all tokens.
 ## Resource `TokenIdentifiers`
 
 Represents first addition to the common fields for all tokens
-Starts being populated once aggregator_v2_api_enabled is enabled.
+Started being populated once aggregator_v2_api_enabled was enabled.
 
 
 <pre><code>#[resource_group_member(#[group = <a href="../../aptos-framework/doc/object.md#0x1_object_ObjectGroup">0x1::object::ObjectGroup</a>])]
@@ -381,6 +380,16 @@ The URI is over the maximum length
 
 
 
+<a id="0x4_token_ENOT_OWNER"></a>
+
+The calling signer is not the owner
+
+
+<pre><code><b>const</b> <a href="token.md#0x4_token_ENOT_OWNER">ENOT_OWNER</a>: u64 = 8;
+</code></pre>
+
+
+
 <a id="0x4_token_EDESCRIPTION_TOO_LONG"></a>
 
 The description is over the maximum length
@@ -474,7 +483,7 @@ The token name is over the maximum length
 
 
 
-<pre><code><b>fun</b> <a href="token.md#0x4_token_create_common">create_common</a>(constructor_ref: &<a href="../../aptos-framework/doc/object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>, creator_address: <b>address</b>, collection_name: <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/string.md#0x1_string_String">string::String</a>, description: <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/string.md#0x1_string_String">string::String</a>, name_prefix: <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/string.md#0x1_string_String">string::String</a>, name_with_index_suffix: <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/string.md#0x1_string_String">string::String</a>&gt;, <a href="royalty.md#0x4_royalty">royalty</a>: <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="royalty.md#0x4_royalty_Royalty">royalty::Royalty</a>&gt;, uri: <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/string.md#0x1_string_String">string::String</a>)
+<pre><code><b>fun</b> <a href="token.md#0x4_token_create_common">create_common</a>(creator: &<a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer">signer</a>, constructor_ref: &<a href="../../aptos-framework/doc/object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>, collection_name: <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/string.md#0x1_string_String">string::String</a>, description: <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/string.md#0x1_string_String">string::String</a>, name_prefix: <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/string.md#0x1_string_String">string::String</a>, name_with_index_suffix: <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/string.md#0x1_string_String">string::String</a>&gt;, <a href="royalty.md#0x4_royalty">royalty</a>: <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="royalty.md#0x4_royalty_Royalty">royalty::Royalty</a>&gt;, uri: <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/string.md#0x1_string_String">string::String</a>)
 </code></pre>
 
 
@@ -484,8 +493,8 @@ The token name is over the maximum length
 
 
 <pre><code>inline <b>fun</b> <a href="token.md#0x4_token_create_common">create_common</a>(
+    creator: &<a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer">signer</a>,
     constructor_ref: &ConstructorRef,
-    creator_address: <b>address</b>,
     collection_name: String,
     description: String,
     name_prefix: String,
@@ -495,10 +504,12 @@ The token name is over the maximum length
     <a href="royalty.md#0x4_royalty">royalty</a>: Option&lt;Royalty&gt;,
     uri: String,
 ) {
+    <b>let</b> creator_address = <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer_address_of">signer::address_of</a>(creator);
     <b>let</b> collection_addr = <a href="collection.md#0x4_collection_create_collection_address">collection::create_collection_address</a>(&creator_address, &collection_name);
     <b>let</b> <a href="collection.md#0x4_collection">collection</a> = <a href="../../aptos-framework/doc/object.md#0x1_object_address_to_object">object::address_to_object</a>&lt;Collection&gt;(collection_addr);
 
     <a href="token.md#0x4_token_create_common_with_collection">create_common_with_collection</a>(
+        creator,
         constructor_ref,
         <a href="collection.md#0x4_collection">collection</a>,
         description,
@@ -520,7 +531,7 @@ The token name is over the maximum length
 
 
 
-<pre><code><b>fun</b> <a href="token.md#0x4_token_create_common_with_collection">create_common_with_collection</a>(constructor_ref: &<a href="../../aptos-framework/doc/object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>, <a href="collection.md#0x4_collection">collection</a>: <a href="../../aptos-framework/doc/object.md#0x1_object_Object">object::Object</a>&lt;<a href="collection.md#0x4_collection_Collection">collection::Collection</a>&gt;, description: <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/string.md#0x1_string_String">string::String</a>, name_prefix: <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/string.md#0x1_string_String">string::String</a>, name_with_index_suffix: <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/string.md#0x1_string_String">string::String</a>&gt;, <a href="royalty.md#0x4_royalty">royalty</a>: <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="royalty.md#0x4_royalty_Royalty">royalty::Royalty</a>&gt;, uri: <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/string.md#0x1_string_String">string::String</a>)
+<pre><code><b>fun</b> <a href="token.md#0x4_token_create_common_with_collection">create_common_with_collection</a>(creator: &<a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer">signer</a>, constructor_ref: &<a href="../../aptos-framework/doc/object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>, <a href="collection.md#0x4_collection">collection</a>: <a href="../../aptos-framework/doc/object.md#0x1_object_Object">object::Object</a>&lt;<a href="collection.md#0x4_collection_Collection">collection::Collection</a>&gt;, description: <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/string.md#0x1_string_String">string::String</a>, name_prefix: <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/string.md#0x1_string_String">string::String</a>, name_with_index_suffix: <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/string.md#0x1_string_String">string::String</a>&gt;, <a href="royalty.md#0x4_royalty">royalty</a>: <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="royalty.md#0x4_royalty_Royalty">royalty::Royalty</a>&gt;, uri: <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/string.md#0x1_string_String">string::String</a>)
 </code></pre>
 
 
@@ -530,6 +541,7 @@ The token name is over the maximum length
 
 
 <pre><code>inline <b>fun</b> <a href="token.md#0x4_token_create_common_with_collection">create_common_with_collection</a>(
+    creator: &<a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer">signer</a>,
     constructor_ref: &ConstructorRef,
     <a href="collection.md#0x4_collection">collection</a>: Object&lt;Collection&gt;,
     description: String,
@@ -540,6 +552,8 @@ The token name is over the maximum length
     <a href="royalty.md#0x4_royalty">royalty</a>: Option&lt;Royalty&gt;,
     uri: String,
 ) {
+    <b>assert</b>!(<a href="../../aptos-framework/doc/object.md#0x1_object_owner">object::owner</a>(<a href="collection.md#0x4_collection">collection</a>) == <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer_address_of">signer::address_of</a>(creator), <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_unauthenticated">error::unauthenticated</a>(<a href="token.md#0x4_token_ENOT_OWNER">ENOT_OWNER</a>));
+
     <b>if</b> (<a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_is_some">option::is_some</a>(&name_with_index_suffix)) {
         // Be conservative, <b>as</b> we don't know what length the index will be, and <b>assume</b> worst case (20 chars in MAX_U64)
         <b>assert</b>!(
@@ -556,65 +570,26 @@ The token name is over the maximum length
 
     <b>let</b> object_signer = <a href="../../aptos-framework/doc/object.md#0x1_object_generate_signer">object::generate_signer</a>(constructor_ref);
 
-    // TODO[agg_v2](cleanup) once this flag is enabled, cleanup <a href="../../aptos-framework/doc/code.md#0x1_code">code</a> for aggregator_api_enabled = <b>false</b>.
-    // Flag which controls whether <a href="../../aptos-framework/../aptos-stdlib/doc/any.md#0x1_any">any</a> functions from <a href="../../aptos-framework/doc/aggregator_v2.md#0x1_aggregator_v2">aggregator_v2</a> <b>module</b> can be called.
-    <b>let</b> aggregator_api_enabled = <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/features.md#0x1_features_aggregator_v2_api_enabled">features::aggregator_v2_api_enabled</a>();
-    // Flag which controls whether we are going <b>to</b> still <b>continue</b> writing <b>to</b> deprecated fields.
-    <b>let</b> concurrent_token_v2_enabled = <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/features.md#0x1_features_concurrent_token_v2_enabled">features::concurrent_token_v2_enabled</a>();
+    <b>let</b> index = <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_destroy_with_default">option::destroy_with_default</a>(
+        <a href="collection.md#0x4_collection_increment_supply">collection::increment_supply</a>(&<a href="collection.md#0x4_collection">collection</a>, <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer_address_of">signer::address_of</a>(&object_signer)),
+        <a href="../../aptos-framework/doc/aggregator_v2.md#0x1_aggregator_v2_create_snapshot">aggregator_v2::create_snapshot</a>&lt;u64&gt;(0)
+    );
 
-    <b>let</b> (deprecated_index, deprecated_name) = <b>if</b> (aggregator_api_enabled) {
-        <b>let</b> index = <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_destroy_with_default">option::destroy_with_default</a>(
-            <a href="collection.md#0x4_collection_increment_concurrent_supply">collection::increment_concurrent_supply</a>(&<a href="collection.md#0x4_collection">collection</a>, <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer_address_of">signer::address_of</a>(&object_signer)),
-            <a href="../../aptos-framework/doc/aggregator_v2.md#0x1_aggregator_v2_create_snapshot">aggregator_v2::create_snapshot</a>&lt;u64&gt;(0)
-        );
+    // If create_numbered_token called us, add index <b>to</b> the name.
+    <b>let</b> name = <b>if</b> (<a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_is_some">option::is_some</a>(&name_with_index_suffix)) {
+        <a href="../../aptos-framework/doc/aggregator_v2.md#0x1_aggregator_v2_derive_string_concat">aggregator_v2::derive_string_concat</a>(name_prefix, &index, <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_extract">option::extract</a>(&<b>mut</b> name_with_index_suffix))
+    } <b>else</b> {
+        <a href="../../aptos-framework/doc/aggregator_v2.md#0x1_aggregator_v2_create_derived_string">aggregator_v2::create_derived_string</a>(name_prefix)
+    };
 
-        // If create_numbered_token called us, add index <b>to</b> the name.
-        <b>let</b> name = <b>if</b> (<a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_is_some">option::is_some</a>(&name_with_index_suffix)) {
-            <a href="../../aptos-framework/doc/aggregator_v2.md#0x1_aggregator_v2_derive_string_concat">aggregator_v2::derive_string_concat</a>(name_prefix, &index, <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_extract">option::extract</a>(&<b>mut</b> name_with_index_suffix))
-        } <b>else</b> {
-            <a href="../../aptos-framework/doc/aggregator_v2.md#0x1_aggregator_v2_create_derived_string">aggregator_v2::create_derived_string</a>(name_prefix)
-        };
-
-        // Until concurrent_token_v2_enabled is enabled, we still need <b>to</b> write <b>to</b> deprecated fields.
-        // Otherwise we put empty values there.
-        // (we need <b>to</b> do these calls before creating token_concurrent, <b>to</b> avoid copying objects)
-        <b>let</b> deprecated_index = <b>if</b> (concurrent_token_v2_enabled) {
-            0
-        } <b>else</b> {
-            <a href="../../aptos-framework/doc/aggregator_v2.md#0x1_aggregator_v2_read_snapshot">aggregator_v2::read_snapshot</a>(&index)
-        };
-        <b>let</b> deprecated_name = <b>if</b> (concurrent_token_v2_enabled) {
-            <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/string.md#0x1_string_utf8">string::utf8</a>(b"")
-        } <b>else</b> {
-            <a href="../../aptos-framework/doc/aggregator_v2.md#0x1_aggregator_v2_read_derived_string">aggregator_v2::read_derived_string</a>(&name)
-        };
-
-        // If aggregator_api_enabled, we always populate newly added fields
-        <b>let</b> token_concurrent = <a href="token.md#0x4_token_TokenIdentifiers">TokenIdentifiers</a> {
-            index,
-            name,
-        };
-        <b>move_to</b>(&object_signer, token_concurrent);
+    <b>let</b> deprecated_index = 0;
+    <b>let</b> deprecated_name = <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/string.md#0x1_string_utf8">string::utf8</a>(b"");
 
-        (deprecated_index, deprecated_name)
-    } <b>else</b> {
-        // If aggregator_api_enabled is disabled, we cannot <b>use</b> increment_concurrent_supply or
-        // create <a href="token.md#0x4_token_TokenIdentifiers">TokenIdentifiers</a>, so we fallback <b>to</b> the <b>old</b> behavior.
-        <b>let</b> id = <a href="collection.md#0x4_collection_increment_supply">collection::increment_supply</a>(&<a href="collection.md#0x4_collection">collection</a>, <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer_address_of">signer::address_of</a>(&object_signer));
-        <b>let</b> index = <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_get_with_default">option::get_with_default</a>(&<b>mut</b> id, 0);
-
-        // If create_numbered_token called us, add index <b>to</b> the name.
-        <b>let</b> name = <b>if</b> (<a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_is_some">option::is_some</a>(&name_with_index_suffix)) {
-            <b>let</b> name = name_prefix;
-            <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/string.md#0x1_string_append">string::append</a>(&<b>mut</b> name, to_string&lt;u64&gt;(&index));
-            <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/string.md#0x1_string_append">string::append</a>(&<b>mut</b> name, <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_extract">option::extract</a>(&<b>mut</b> name_with_index_suffix));
-            name
-        } <b>else</b> {
-            name_prefix
-        };
-
-        (index, name)
+    <b>let</b> token_concurrent = <a href="token.md#0x4_token_TokenIdentifiers">TokenIdentifiers</a> {
+        index,
+        name,
     };
+    <b>move_to</b>(&object_signer, token_concurrent);
 
     <b>let</b> <a href="token.md#0x4_token">token</a> = <a href="token.md#0x4_token_Token">Token</a> {
         <a href="collection.md#0x4_collection">collection</a>,
@@ -666,6 +641,7 @@ This function must be called if the collection name has been previously changed.
     <b>let</b> creator_address = <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer_address_of">signer::address_of</a>(creator);
     <b>let</b> constructor_ref = <a href="../../aptos-framework/doc/object.md#0x1_object_create_object">object::create_object</a>(creator_address);
     <a href="token.md#0x4_token_create_common_with_collection">create_common_with_collection</a>(
+        creator,
         &constructor_ref,
         <a href="collection.md#0x4_collection">collection</a>,
         description,
@@ -710,8 +686,8 @@ for additional specialization.
     <b>let</b> creator_address = <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer_address_of">signer::address_of</a>(creator);
     <b>let</b> constructor_ref = <a href="../../aptos-framework/doc/object.md#0x1_object_create_object">object::create_object</a>(creator_address);
     <a href="token.md#0x4_token_create_common">create_common</a>(
+        creator,
         &constructor_ref,
-        creator_address,
         collection_name,
         description,
         name,
@@ -734,8 +710,8 @@ for additional specialization.
 Creates a new token object with a unique address and returns the ConstructorRef
 for additional specialization.
 The name is created by concatenating the (name_prefix, index, name_suffix).
-After flag concurrent_token_v2_enabled is enabled, this function will allow
-creating tokens in parallel, from the same collection, while providing sequential names.
+This function allows creating tokens in parallel, from the same collection,
+while providing sequential names.
 
 This takes in the collection object instead of the collection name.
 This function must be called if the collection name has been previously changed.
@@ -762,6 +738,7 @@ This function must be called if the collection name has been previously changed.
     <b>let</b> creator_address = <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer_address_of">signer::address_of</a>(creator);
     <b>let</b> constructor_ref = <a href="../../aptos-framework/doc/object.md#0x1_object_create_object">object::create_object</a>(creator_address);
     <a href="token.md#0x4_token_create_common_with_collection">create_common_with_collection</a>(
+        creator,
         &constructor_ref,
         <a href="collection.md#0x4_collection">collection</a>,
         description,
@@ -785,8 +762,8 @@ This function must be called if the collection name has been previously changed.
 Creates a new token object with a unique address and returns the ConstructorRef
 for additional specialization.
 The name is created by concatenating the (name_prefix, index, name_suffix).
-After flag concurrent_token_v2_enabled is enabled, this function will allow
-creating tokens in parallel, from the same collection, while providing sequential names.
+This function will allow creating tokens in parallel, from the same collection,
+while providing sequential names.
 
 
 <pre><code><b>public</b> <b>fun</b> <a href="token.md#0x4_token_create_numbered_token">create_numbered_token</a>(creator: &<a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer">signer</a>, collection_name: <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/string.md#0x1_string_String">string::String</a>, description: <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/string.md#0x1_string_String">string::String</a>, name_with_index_prefix: <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/string.md#0x1_string_String">string::String</a>, name_with_index_suffix: <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/string.md#0x1_string_String">string::String</a>, <a href="royalty.md#0x4_royalty">royalty</a>: <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="royalty.md#0x4_royalty_Royalty">royalty::Royalty</a>&gt;, uri: <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/string.md#0x1_string_String">string::String</a>): <a href="../../aptos-framework/doc/object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>
@@ -810,8 +787,8 @@ creating tokens in parallel, from the same collection, while providing sequentia
     <b>let</b> creator_address = <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer_address_of">signer::address_of</a>(creator);
     <b>let</b> constructor_ref = <a href="../../aptos-framework/doc/object.md#0x1_object_create_object">object::create_object</a>(creator_address);
     <a href="token.md#0x4_token_create_common">create_common</a>(
+        creator,
         &constructor_ref,
-        creator_address,
         collection_name,
         description,
         name_with_index_prefix,
@@ -856,6 +833,7 @@ This function must be called if the collection name has been previously changed.
     <b>let</b> seed = <a href="token.md#0x4_token_create_token_seed">create_token_seed</a>(&<a href="collection.md#0x4_collection_name">collection::name</a>(<a href="collection.md#0x4_collection">collection</a>), &name);
     <b>let</b> constructor_ref = <a href="../../aptos-framework/doc/object.md#0x1_object_create_named_object">object::create_named_object</a>(creator, seed);
     <a href="token.md#0x4_token_create_common_with_collection">create_common_with_collection</a>(
+        creator,
         &constructor_ref,
         <a href="collection.md#0x4_collection">collection</a>,
         description,
@@ -897,13 +875,12 @@ additional specialization.
     <a href="royalty.md#0x4_royalty">royalty</a>: Option&lt;Royalty&gt;,
     uri: String,
 ): ConstructorRef {
-    <b>let</b> creator_address = <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer_address_of">signer::address_of</a>(creator);
     <b>let</b> seed = <a href="token.md#0x4_token_create_token_seed">create_token_seed</a>(&collection_name, &name);
 
     <b>let</b> constructor_ref = <a href="../../aptos-framework/doc/object.md#0x1_object_create_named_object">object::create_named_object</a>(creator, seed);
     <a href="token.md#0x4_token_create_common">create_common</a>(
+        creator,
         &constructor_ref,
-        creator_address,
         collection_name,
         description,
         name,
@@ -948,7 +925,7 @@ This function must be called if the collection name has been previously changed.
 ): ConstructorRef {
     <b>let</b> seed = <a href="token.md#0x4_token_create_token_name_with_seed">create_token_name_with_seed</a>(&<a href="collection.md#0x4_collection_name">collection::name</a>(<a href="collection.md#0x4_collection">collection</a>), &name, &seed);
     <b>let</b> constructor_ref = <a href="../../aptos-framework/doc/object.md#0x1_object_create_named_object">object::create_named_object</a>(creator, seed);
-    <a href="token.md#0x4_token_create_common_with_collection">create_common_with_collection</a>(&constructor_ref, <a href="collection.md#0x4_collection">collection</a>, description, name, <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_none">option::none</a>(), <a href="royalty.md#0x4_royalty">royalty</a>, uri);
+    <a href="token.md#0x4_token_create_common_with_collection">create_common_with_collection</a>(creator, &constructor_ref, <a href="collection.md#0x4_collection">collection</a>, description, name, <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_none">option::none</a>(), <a href="royalty.md#0x4_royalty">royalty</a>, uri);
     constructor_ref
 }
 </code></pre>
@@ -985,11 +962,10 @@ additional specialization.
     <a href="royalty.md#0x4_royalty">royalty</a>: Option&lt;Royalty&gt;,
     uri: String,
 ): ConstructorRef {
-    <b>let</b> creator_address = <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer_address_of">signer::address_of</a>(creator);
     <b>let</b> constructor_ref = <a href="../../aptos-framework/doc/object.md#0x1_object_create_object_from_account">object::create_object_from_account</a>(creator);
     <a href="token.md#0x4_token_create_common">create_common</a>(
+        creator,
         &constructor_ref,
-        creator_address,
         collection_name,
         description,
         name,
diff --git a/aptos-move/framework/aptos-token-objects/sources/collection.move b/aptos-move/framework/aptos-token-objects/sources/collection.move
index 76b1fe5ef2a90..af88007f84dfa 100644
--- a/aptos-move/framework/aptos-token-objects/sources/collection.move
+++ b/aptos-move/framework/aptos-token-objects/sources/collection.move
@@ -18,7 +18,6 @@
 /// * Add aggregator support when added to framework
 module aptos_token_objects::collection {
     use std::error;
-    use std::features;
     use std::option::{Self, Option};
     use std::signer;
     use std::string::{Self, String};
@@ -194,41 +193,21 @@ module aptos_token_objects::collection {
         assert!(max_supply != 0, error::invalid_argument(EMAX_SUPPLY_CANNOT_BE_ZERO));
         let collection_seed = create_collection_seed(&name);
         let constructor_ref = object::create_named_object(creator, collection_seed);
-        let object_signer = object::generate_signer(&constructor_ref);
-        if (features::concurrent_token_v2_enabled()) {
-            let supply = ConcurrentSupply {
-                current_supply: aggregator_v2::create_aggregator(max_supply),
-                total_minted: aggregator_v2::create_unbounded_aggregator(),
-            };
 
-            create_collection_internal(
-                creator,
-                constructor_ref,
-                description,
-                name,
-                royalty,
-                uri,
-                option::some(supply),
-            )
-        } else {
-            let supply = FixedSupply {
-                current_supply: 0,
-                max_supply,
-                total_minted: 0,
-                burn_events: object::new_event_handle(&object_signer),
-                mint_events: object::new_event_handle(&object_signer),
-            };
+        let supply = ConcurrentSupply {
+            current_supply: aggregator_v2::create_aggregator(max_supply),
+            total_minted: aggregator_v2::create_unbounded_aggregator(),
+        };
 
-            create_collection_internal(
-                creator,
-                constructor_ref,
-                description,
-                name,
-                royalty,
-                uri,
-                option::some(supply),
-            )
-        }
+        create_collection_internal(
+            creator,
+            constructor_ref,
+            description,
+            name,
+            royalty,
+            uri,
+            option::some(supply),
+        )
     }
 
     /// Creates an unlimited collection. This has support for supply tracking but does not limit
@@ -242,41 +221,21 @@ module aptos_token_objects::collection {
     ): ConstructorRef {
         let collection_seed = create_collection_seed(&name);
         let constructor_ref = object::create_named_object(creator, collection_seed);
-        let object_signer = object::generate_signer(&constructor_ref);
-
-        if (features::concurrent_token_v2_enabled()) {
-            let supply = ConcurrentSupply {
-                current_supply: aggregator_v2::create_unbounded_aggregator(),
-                total_minted: aggregator_v2::create_unbounded_aggregator(),
-            };
 
-            create_collection_internal(
-                creator,
-                constructor_ref,
-                description,
-                name,
-                royalty,
-                uri,
-                option::some(supply),
-            )
-        } else {
-            let supply = UnlimitedSupply {
-                current_supply: 0,
-                total_minted: 0,
-                burn_events: object::new_event_handle(&object_signer),
-                mint_events: object::new_event_handle(&object_signer),
-            };
+        let supply = ConcurrentSupply {
+            current_supply: aggregator_v2::create_unbounded_aggregator(),
+            total_minted: aggregator_v2::create_unbounded_aggregator(),
+        };
 
-            create_collection_internal(
-                creator,
-                constructor_ref,
-                description,
-                name,
-                royalty,
-                uri,
-                option::some(supply),
-            )
-        }
+        create_collection_internal(
+            creator,
+            constructor_ref,
+            description,
+            name,
+            royalty,
+            uri,
+            option::some(supply),
+        )
     }
 
     /// Creates an untracked collection, or a collection that supports an arbitrary amount of
@@ -337,9 +296,6 @@ module aptos_token_objects::collection {
             royalty::init(&constructor_ref, option::extract(&mut royalty))
         };
 
-        let transfer_ref = object::generate_transfer_ref(&constructor_ref);
-        object::disable_ungated_transfer(&transfer_ref);
-
         constructor_ref
     }
 
@@ -355,70 +311,9 @@ module aptos_token_objects::collection {
     }
 
     /// Called by token on mint to increment supply if there's an appropriate Supply struct.
-    /// TODO[agg_v2](cleanup): remove in a future release. We need to have both functions, as
-    /// increment_concurrent_supply cannot be used until AGGREGATOR_API_V2 is enabled.
     public(friend) fun increment_supply(
         collection: &Object<Collection>,
         token: address,
-    ): Option<u64> acquires FixedSupply, UnlimitedSupply {
-        let collection_addr = object::object_address(collection);
-        if (exists<FixedSupply>(collection_addr)) {
-            let supply = borrow_global_mut<FixedSupply>(collection_addr);
-            supply.current_supply = supply.current_supply + 1;
-            supply.total_minted = supply.total_minted + 1;
-            assert!(
-                supply.current_supply <= supply.max_supply,
-                error::out_of_range(ECOLLECTION_SUPPLY_EXCEEDED),
-            );
-
-            if (std::features::module_event_migration_enabled()) {
-                event::emit(
-                    Mint {
-                        collection: collection_addr,
-                        index: aggregator_v2::create_snapshot(supply.total_minted),
-                        token,
-                    },
-                );
-            };
-            event::emit_event(&mut supply.mint_events,
-                MintEvent {
-                    index: supply.total_minted,
-                    token,
-                },
-            );
-            option::some(supply.total_minted)
-        } else if (exists<UnlimitedSupply>(collection_addr)) {
-            let supply = borrow_global_mut<UnlimitedSupply>(collection_addr);
-            supply.current_supply = supply.current_supply + 1;
-            supply.total_minted = supply.total_minted + 1;
-            if (std::features::module_event_migration_enabled()) {
-                event::emit(
-                    Mint {
-                        collection: collection_addr,
-                        index: aggregator_v2::create_snapshot(supply.total_minted),
-                        token,
-                    },
-                );
-            };
-            event::emit_event(
-                &mut supply.mint_events,
-                MintEvent {
-                    index: supply.total_minted,
-                    token,
-                },
-            );
-            option::some(supply.total_minted)
-        } else if (exists<ConcurrentSupply>(collection_addr)) {
-            abort error::invalid_argument(ECONCURRENT_NOT_ENABLED)
-        } else {
-            option::none()
-        }
-    }
-
-    /// Called by token on mint to increment supply if there's an appropriate Supply struct.
-    public(friend) fun increment_concurrent_supply(
-        collection: &Object<Collection>,
-        token: address,
     ): Option<AggregatorSnapshot<u64>> acquires FixedSupply, UnlimitedSupply, ConcurrentSupply {
         let collection_addr = object::object_address(collection);
         if (exists<ConcurrentSupply>(collection_addr)) {
@@ -560,7 +455,6 @@ module aptos_token_objects::collection {
     ) acquires FixedSupply, UnlimitedSupply {
         let metadata_object_address = object::address_from_extend_ref(ref);
         let metadata_object_signer = object::generate_signer_for_extending(ref);
-        assert!(features::concurrent_token_v2_enabled(), error::invalid_argument(ECONCURRENT_NOT_ENABLED));
 
         let (supply, current_supply, total_minted, burn_events, mint_events) = if (exists<FixedSupply>(
             metadata_object_address
@@ -758,18 +652,47 @@ module aptos_token_objects::collection {
 
     // Tests
 
-    #[test(fx = @aptos_framework, creator = @0x123)]
-    fun test_create_mint_burn_for_unlimited(fx: &signer, creator: &signer) acquires FixedSupply, UnlimitedSupply, ConcurrentSupply {
-        let feature = features::get_concurrent_token_v2_feature();
-        features::change_feature_flags_for_testing(fx, vector[], vector[feature]);
+    #[test_only]
+    fun downgrade_from_concurrent_for_test(
+        ref: &ExtendRef,
+    ) acquires ConcurrentSupply {
+        let metadata_object_address = object::address_from_extend_ref(ref);
+        let metadata_object_signer = object::generate_signer_for_extending(ref);
 
+        let ConcurrentSupply {
+            current_supply,
+            total_minted,
+        } = move_from<ConcurrentSupply>(metadata_object_address);
+
+        if (aggregator_v2::max_value(&current_supply) == MAX_U64) {
+            move_to(&metadata_object_signer, UnlimitedSupply {
+                current_supply: aggregator_v2::read(&current_supply),
+                total_minted: aggregator_v2::read(&total_minted),
+                burn_events: object::new_event_handle(&metadata_object_signer),
+                mint_events: object::new_event_handle(&metadata_object_signer),
+            });
+        } else {
+            move_to(&metadata_object_signer, FixedSupply {
+                current_supply: aggregator_v2::read(&current_supply),
+                max_supply: aggregator_v2::max_value(&current_supply),
+                total_minted: aggregator_v2::read(&total_minted),
+                burn_events: object::new_event_handle(&metadata_object_signer),
+                mint_events: object::new_event_handle(&metadata_object_signer),
+            });
+        }
+    }
+
+    #[test(creator = @0x123)]
+    fun test_create_mint_burn_for_unlimited(creator: &signer) acquires FixedSupply, UnlimitedSupply, ConcurrentSupply {
         let creator_address = signer::address_of(creator);
         let name = string::utf8(b"collection name");
-        create_unlimited_collection(creator, string::utf8(b""), name, option::none(), string::utf8(b""));
+        let constructor_ref = create_unlimited_collection(creator, string::utf8(b""), name, option::none(), string::utf8(b""));
+        downgrade_from_concurrent_for_test(&object::generate_extend_ref(&constructor_ref));
+
         let collection_address = create_collection_address(&creator_address, &name);
         let collection = object::address_to_object<Collection>(collection_address);
         assert!(count(collection) == option::some(0), 0);
-        let cid = aggregator_v2::read_snapshot(&option::destroy_some(increment_concurrent_supply(&collection, creator_address)));
+        let cid = aggregator_v2::read_snapshot(&option::destroy_some(increment_supply(&collection, creator_address)));
         assert!(count(collection) == option::some(1), 0);
         assert!(event::counter(&borrow_global<UnlimitedSupply>(collection_address).mint_events) == 1, 0);
         decrement_supply(&collection, creator_address, option::some(cid), creator_address);
@@ -777,18 +700,17 @@ module aptos_token_objects::collection {
         assert!(event::counter(&borrow_global<UnlimitedSupply>(collection_address).burn_events) == 1, 0);
     }
 
-    #[test(fx = @aptos_framework, creator = @0x123)]
-    fun test_create_mint_burn_for_fixed(fx: &signer, creator: &signer) acquires FixedSupply, UnlimitedSupply, ConcurrentSupply {
-        let feature = features::get_concurrent_token_v2_feature();
-        features::change_feature_flags_for_testing(fx, vector[], vector[feature]);
-
+    #[test(creator = @0x123)]
+    fun test_create_mint_burn_for_fixed(creator: &signer) acquires FixedSupply, UnlimitedSupply, ConcurrentSupply {
         let creator_address = signer::address_of(creator);
         let name = string::utf8(b"collection name");
-        create_fixed_collection(creator, string::utf8(b""), 1, name, option::none(), string::utf8(b""));
+        let constructor_ref = create_fixed_collection(creator, string::utf8(b""), 1, name, option::none(), string::utf8(b""));
+        downgrade_from_concurrent_for_test(&object::generate_extend_ref(&constructor_ref));
+
         let collection_address = create_collection_address(&creator_address, &name);
         let collection = object::address_to_object<Collection>(collection_address);
         assert!(count(collection) == option::some(0), 0);
-        let cid = aggregator_v2::read_snapshot(&option::destroy_some(increment_concurrent_supply(&collection, creator_address)));
+        let cid = aggregator_v2::read_snapshot(&option::destroy_some(increment_supply(&collection, creator_address)));
         assert!(count(collection) == option::some(1), 0);
         assert!(event::counter(&borrow_global<FixedSupply>(collection_address).mint_events) == 1, 0);
         decrement_supply(&collection, creator_address, option::some(cid), creator_address);
@@ -796,21 +718,17 @@ module aptos_token_objects::collection {
         assert!(event::counter(&borrow_global<FixedSupply>(collection_address).burn_events) == 1, 0);
     }
 
-    #[test(fx = @aptos_framework, creator = @0x123)]
+    #[test(creator = @0x123)]
     fun test_create_mint_burn_for_concurrent(
-        fx: &signer,
         creator: &signer
     ) acquires FixedSupply, UnlimitedSupply, ConcurrentSupply {
-        let feature = features::get_concurrent_token_v2_feature();
-        features::change_feature_flags_for_testing(fx, vector[feature], vector[]);
-
         let creator_address = signer::address_of(creator);
         let name = string::utf8(b"collection name");
         create_fixed_collection(creator, string::utf8(b""), 1, name, option::none(), string::utf8(b""));
         let collection_address = create_collection_address(&creator_address, &name);
         let collection = object::address_to_object<Collection>(collection_address);
         assert!(count(collection) == option::some(0), 0);
-        let cid = increment_concurrent_supply(&collection, creator_address);
+        let cid = increment_supply(&collection, creator_address);
         event::was_event_emitted<Mint>(&Mint {
             collection: collection_address,
             index: aggregator_v2::create_snapshot(0),
@@ -829,9 +747,9 @@ module aptos_token_objects::collection {
     }
 
     #[test(creator = @0x123, trader = @0x456)]
-    #[expected_failure(abort_code = 0x50003, location = aptos_framework::object)]
     entry fun test_create_and_transfer(creator: &signer, trader: &signer) {
         let creator_address = signer::address_of(creator);
+        let trader_address = signer::address_of(trader);
         let collection_name = string::utf8(b"collection name");
         create_collection_helper(creator, collection_name);
 
@@ -839,7 +757,9 @@ module aptos_token_objects::collection {
             create_collection_address(&creator_address, &collection_name),
         );
         assert!(object::owner(collection) == creator_address, 1);
-        object::transfer(creator, collection, signer::address_of(trader));
+        // Transferring collections is allowed
+        object::transfer(creator, collection, trader_address);
+        assert!(object::owner(collection) == trader_address, 1);
     }
 
     #[test(creator = @0x123)]
@@ -898,11 +818,8 @@ module aptos_token_objects::collection {
         assert!(uri == uri(collection), 1);
     }
 
-    #[test(fx = @aptos_framework, creator = @0x123)]
-    entry fun test_set_max_supply_concurrent(creator: &signer, fx: &signer) acquires ConcurrentSupply, FixedSupply {
-        let feature = features::get_concurrent_token_v2_feature();
-        features::change_feature_flags_for_testing(fx, vector[feature], vector[]);
-
+    #[test(creator = @0x123)]
+    entry fun test_set_max_supply_concurrent(creator: &signer) acquires ConcurrentSupply, FixedSupply {
         let collection_name = string::utf8(b"collection name");
         let max_supply = 100;
         let constructor_ref = create_fixed_collection_helper(creator, collection_name, max_supply);
@@ -922,14 +839,10 @@ module aptos_token_objects::collection {
         });
     }
 
-    #[test(fx = @aptos_framework, creator = @0x123)]
+    #[test(creator = @0x123)]
     entry fun test_set_max_supply_same_as_current_supply_fixed(
         creator: &signer,
-        fx: &signer,
     ) acquires ConcurrentSupply, FixedSupply, UnlimitedSupply {
-        let feature = features::get_concurrent_token_v2_feature();
-        features::change_feature_flags_for_testing(fx, vector[], vector[feature]);
-
         let collection_name = string::utf8(b"collection name");
         let max_supply = 10;
         let constructor_ref = create_fixed_collection_helper(creator, collection_name, max_supply);
@@ -947,8 +860,8 @@ module aptos_token_objects::collection {
         set_max_supply(&mutator_ref, current_supply);
 
         let collection_address = create_collection_address(&signer::address_of(creator), &collection_name);
-        let supply = borrow_global<FixedSupply>(collection_address);
-        assert!(supply.max_supply == current_supply, EINVALID_MAX_SUPPLY);
+        let supply = borrow_global<ConcurrentSupply>(collection_address);
+        assert!(aggregator_v2::max_value(&supply.current_supply) == current_supply, EINVALID_MAX_SUPPLY);
 
         event::was_event_emitted<SetMaxSupply>(&SetMaxSupply {
             collection: object::address_to_object<Collection>(collection_address),
@@ -966,15 +879,14 @@ module aptos_token_objects::collection {
         set_max_supply(&mutator_ref, 200);
     }
 
-    #[test(fx = @aptos_framework, creator = @0x123)]
+    #[test(creator = @0x123)]
     #[expected_failure(abort_code = 0x20009, location = aptos_token_objects::collection)]
-    entry fun test_set_max_supply_too_low_fixed_supply(creator: &signer, fx: &signer) acquires ConcurrentSupply, FixedSupply, UnlimitedSupply {
-        let feature = features::get_concurrent_token_v2_feature();
-        features::change_feature_flags_for_testing(fx, vector[], vector[feature]);
-
+    entry fun test_set_max_supply_too_low_fixed_supply(creator: &signer) acquires ConcurrentSupply, FixedSupply, UnlimitedSupply {
         let max_supply = 3;
         let collection_name = string::utf8(b"Low Supply Collection");
         let constructor_ref = create_fixed_collection_helper(creator, collection_name, max_supply);
+        downgrade_from_concurrent_for_test(&object::generate_extend_ref(&constructor_ref));
+
         let collection = object::object_from_constructor_ref<Collection>(&constructor_ref);
         let token_signer = create_token(creator);
 
@@ -989,13 +901,9 @@ module aptos_token_objects::collection {
         set_max_supply(&mutator_ref, new_max_supply);
     }
 
-    #[test(fx = @aptos_framework, creator = @0x123)]
+    #[test(creator = @0x123)]
     #[expected_failure(abort_code = 0x20009, location = aptos_token_objects::collection)]
-    entry fun test_set_max_supply_too_low_concurrent_supply(creator: &signer, fx: &signer) acquires ConcurrentSupply, FixedSupply, UnlimitedSupply {
-        let concurrent_feature = features::get_concurrent_token_v2_feature();
-        let aggregator_feature = features::get_aggregator_v2_api_feature();
-        features::change_feature_flags_for_testing(fx, vector[concurrent_feature, aggregator_feature], vector[]);
-
+    entry fun test_set_max_supply_too_low_concurrent_supply(creator: &signer) acquires ConcurrentSupply, FixedSupply, UnlimitedSupply {
         let collection_name = string::utf8(b"Low Supply Collection");
         let max_supply = 3;
         let constructor_ref = create_fixed_collection_helper(creator, collection_name, max_supply);
@@ -1004,7 +912,7 @@ module aptos_token_objects::collection {
 
         let i = 0;
         while (i < max_supply) {
-            increment_concurrent_supply(&collection, signer::address_of(&token_signer));
+            increment_supply(&collection, signer::address_of(&token_signer));
             i = i + 1;
         };
 
diff --git a/aptos-move/framework/aptos-token-objects/sources/token.move b/aptos-move/framework/aptos-token-objects/sources/token.move
index d03f522b6321f..4187f5306393e 100644
--- a/aptos-move/framework/aptos-token-objects/sources/token.move
+++ b/aptos-move/framework/aptos-token-objects/sources/token.move
@@ -7,14 +7,12 @@
 module aptos_token_objects::token {
     use std::error;
     use std::option::{Self, Option};
-    use std::features;
     use std::string::{Self, String};
     use std::signer;
     use std::vector;
     use aptos_framework::aggregator_v2::{Self, AggregatorSnapshot, DerivedStringSnapshot};
     use aptos_framework::event;
     use aptos_framework::object::{Self, ConstructorRef, Object};
-    use aptos_std::string_utils::{to_string};
     use aptos_token_objects::collection::{Self, Collection};
     use aptos_token_objects::royalty::{Self, Royalty};
 
@@ -35,6 +33,8 @@ module aptos_token_objects::token {
     const EDESCRIPTION_TOO_LONG: u64 = 6;
     /// The seed is over the maximum length
     const ESEED_TOO_LONG: u64 = 7;
+    /// The calling signer is not the owner
+    const ENOT_OWNER: u64 = 8;
 
     const MAX_TOKEN_NAME_LENGTH: u64 = 128;
     const MAX_TOKEN_SEED_LENGTH: u64 = 128;
@@ -47,7 +47,7 @@ module aptos_token_objects::token {
         /// The collection from which this token resides.
         collection: Object<Collection>,
         /// Deprecated in favor of `index` inside TokenIdentifiers.
-        /// Will be populated until concurrent_token_v2_enabled feature flag is enabled.
+        /// Was populated until concurrent_token_v2_enabled feature flag was enabled.
         ///
         /// Unique identifier within the collection, optional, 0 means unassigned
         index: u64,
@@ -55,7 +55,7 @@ module aptos_token_objects::token {
         /// A brief description of the token.
         description: String,
         /// Deprecated in favor of `name` inside TokenIdentifiers.
-        /// Will be populated until concurrent_token_v2_enabled feature flag is enabled.
+        /// Was populated until concurrent_token_v2_enabled feature flag was enabled.
         ///
         /// The name of the token, which should be unique within the collection; the length of name
         /// should be smaller than 128, characters, eg: "Aptos Animal #1234"
@@ -70,7 +70,7 @@ module aptos_token_objects::token {
 
     #[resource_group_member(group = aptos_framework::object::ObjectGroup)]
     /// Represents first addition to the common fields for all tokens
-    /// Starts being populated once aggregator_v2_api_enabled is enabled.
+    /// Started being populated once aggregator_v2_api_enabled was enabled.
     struct TokenIdentifiers has key {
         /// Unique identifier within the collection, optional, 0 means unassigned
         index: AggregatorSnapshot<u64>,
@@ -117,8 +117,8 @@ module aptos_token_objects::token {
     }
 
     inline fun create_common(
+        creator: &signer,
         constructor_ref: &ConstructorRef,
-        creator_address: address,
         collection_name: String,
         description: String,
         name_prefix: String,
@@ -128,10 +128,12 @@ module aptos_token_objects::token {
         royalty: Option<Royalty>,
         uri: String,
     ) {
+        let creator_address = signer::address_of(creator);
         let collection_addr = collection::create_collection_address(&creator_address, &collection_name);
         let collection = object::address_to_object<Collection>(collection_addr);
 
         create_common_with_collection(
+            creator,
             constructor_ref,
             collection,
             description,
@@ -143,6 +145,7 @@ module aptos_token_objects::token {
     }
 
     inline fun create_common_with_collection(
+        creator: &signer,
         constructor_ref: &ConstructorRef,
         collection: Object<Collection>,
         description: String,
@@ -153,6 +156,8 @@ module aptos_token_objects::token {
         royalty: Option<Royalty>,
         uri: String,
     ) {
+        assert!(object::owner(collection) == signer::address_of(creator), error::unauthenticated(ENOT_OWNER));
+
         if (option::is_some(&name_with_index_suffix)) {
             // Be conservative, as we don't know what length the index will be, and assume worst case (20 chars in MAX_U64)
             assert!(
@@ -169,65 +174,26 @@ module aptos_token_objects::token {
 
         let object_signer = object::generate_signer(constructor_ref);
 
-        // TODO[agg_v2](cleanup) once this flag is enabled, cleanup code for aggregator_api_enabled = false.
-        // Flag which controls whether any functions from aggregator_v2 module can be called.
-        let aggregator_api_enabled = features::aggregator_v2_api_enabled();
-        // Flag which controls whether we are going to still continue writing to deprecated fields.
-        let concurrent_token_v2_enabled = features::concurrent_token_v2_enabled();
+        let index = option::destroy_with_default(
+            collection::increment_supply(&collection, signer::address_of(&object_signer)),
+            aggregator_v2::create_snapshot<u64>(0)
+        );
 
-        let (deprecated_index, deprecated_name) = if (aggregator_api_enabled) {
-            let index = option::destroy_with_default(
-                collection::increment_concurrent_supply(&collection, signer::address_of(&object_signer)),
-                aggregator_v2::create_snapshot<u64>(0)
-            );
+        // If create_numbered_token called us, add index to the name.
+        let name = if (option::is_some(&name_with_index_suffix)) {
+            aggregator_v2::derive_string_concat(name_prefix, &index, option::extract(&mut name_with_index_suffix))
+        } else {
+            aggregator_v2::create_derived_string(name_prefix)
+        };
 
-            // If create_numbered_token called us, add index to the name.
-            let name = if (option::is_some(&name_with_index_suffix)) {
-                aggregator_v2::derive_string_concat(name_prefix, &index, option::extract(&mut name_with_index_suffix))
-            } else {
-                aggregator_v2::create_derived_string(name_prefix)
-            };
-
-            // Until concurrent_token_v2_enabled is enabled, we still need to write to deprecated fields.
-            // Otherwise we put empty values there.
-            // (we need to do these calls before creating token_concurrent, to avoid copying objects)
-            let deprecated_index = if (concurrent_token_v2_enabled) {
-                0
-            } else {
-                aggregator_v2::read_snapshot(&index)
-            };
-            let deprecated_name = if (concurrent_token_v2_enabled) {
-                string::utf8(b"")
-            } else {
-                aggregator_v2::read_derived_string(&name)
-            };
-
-            // If aggregator_api_enabled, we always populate newly added fields
-            let token_concurrent = TokenIdentifiers {
-                index,
-                name,
-            };
-            move_to(&object_signer, token_concurrent);
+        let deprecated_index = 0;
+        let deprecated_name = string::utf8(b"");
 
-            (deprecated_index, deprecated_name)
-        } else {
-            // If aggregator_api_enabled is disabled, we cannot use increment_concurrent_supply or
-            // create TokenIdentifiers, so we fallback to the old behavior.
-            let id = collection::increment_supply(&collection, signer::address_of(&object_signer));
-            let index = option::get_with_default(&mut id, 0);
-
-            // If create_numbered_token called us, add index to the name.
-            let name = if (option::is_some(&name_with_index_suffix)) {
-                let name = name_prefix;
-                string::append(&mut name, to_string<u64>(&index));
-                string::append(&mut name, option::extract(&mut name_with_index_suffix));
-                name
-            } else {
-                name_prefix
-            };
-
-            (index, name)
+        let token_concurrent = TokenIdentifiers {
+            index,
+            name,
         };
+        move_to(&object_signer, token_concurrent);
 
         let token = Token {
             collection,
@@ -259,6 +225,7 @@ module aptos_token_objects::token {
         let creator_address = signer::address_of(creator);
         let constructor_ref = object::create_object(creator_address);
         create_common_with_collection(
+            creator,
             &constructor_ref,
             collection,
             description,
@@ -283,8 +250,8 @@ module aptos_token_objects::token {
         let creator_address = signer::address_of(creator);
         let constructor_ref = object::create_object(creator_address);
         create_common(
+            creator,
             &constructor_ref,
-            creator_address,
             collection_name,
             description,
             name,
@@ -298,8 +265,8 @@ module aptos_token_objects::token {
     /// Creates a new token object with a unique address and returns the ConstructorRef
     /// for additional specialization.
     /// The name is created by concatenating the (name_prefix, index, name_suffix).
-    /// After flag concurrent_token_v2_enabled is enabled, this function will allow
-    /// creating tokens in parallel, from the same collection, while providing sequential names.
+    /// This function allows creating tokens in parallel, from the same collection,
+    /// while providing sequential names.
     ///
     /// This takes in the collection object instead of the collection name.
     /// This function must be called if the collection name has been previously changed.
@@ -315,6 +282,7 @@ module aptos_token_objects::token {
         let creator_address = signer::address_of(creator);
         let constructor_ref = object::create_object(creator_address);
         create_common_with_collection(
+            creator,
             &constructor_ref,
             collection,
             description,
@@ -329,8 +297,8 @@ module aptos_token_objects::token {
     /// Creates a new token object with a unique address and returns the ConstructorRef
     /// for additional specialization.
     /// The name is created by concatenating the (name_prefix, index, name_suffix).
-    /// After flag concurrent_token_v2_enabled is enabled, this function will allow
-    /// creating tokens in parallel, from the same collection, while providing sequential names.
+    /// This function will allow creating tokens in parallel, from the same collection,
+    /// while providing sequential names.
     public fun create_numbered_token(
         creator: &signer,
         collection_name: String,
@@ -343,8 +311,8 @@ module aptos_token_objects::token {
         let creator_address = signer::address_of(creator);
         let constructor_ref = object::create_object(creator_address);
         create_common(
+            creator,
             &constructor_ref,
-            creator_address,
             collection_name,
             description,
             name_with_index_prefix,
@@ -369,6 +337,7 @@ module aptos_token_objects::token {
         let seed = create_token_seed(&collection::name(collection), &name);
         let constructor_ref = object::create_named_object(creator, seed);
         create_common_with_collection(
+            creator,
             &constructor_ref,
             collection,
             description,
@@ -390,13 +359,12 @@ module aptos_token_objects::token {
         royalty: Option<Royalty>,
         uri: String,
     ): ConstructorRef {
-        let creator_address = signer::address_of(creator);
         let seed = create_token_seed(&collection_name, &name);
 
         let constructor_ref = object::create_named_object(creator, seed);
         create_common(
+            creator,
             &constructor_ref,
-            creator_address,
             collection_name,
             description,
             name,
@@ -421,7 +389,7 @@ module aptos_token_objects::token {
     ): ConstructorRef {
         let seed = create_token_name_with_seed(&collection::name(collection), &name, &seed);
         let constructor_ref = object::create_named_object(creator, seed);
-        create_common_with_collection(&constructor_ref, collection, description, name, option::none(), royalty, uri);
+        create_common_with_collection(creator, &constructor_ref, collection, description, name, option::none(), royalty, uri);
         constructor_ref
     }
 
@@ -438,11 +406,10 @@ module aptos_token_objects::token {
         royalty: Option<Royalty>,
         uri: String,
     ): ConstructorRef {
-        let creator_address = signer::address_of(creator);
         let constructor_ref = object::create_object_from_account(creator);
         create_common(
+            creator,
             &constructor_ref,
-            creator_address,
             collection_name,
             description,
             name,
@@ -756,6 +723,47 @@ module aptos_token_objects::token {
         assert!(option::some(expected_royalty) == royalty(token), 2);
     }
 
+    #[test(creator = @0x123, trader = @0x456)]
+    #[expected_failure(abort_code = 0x40008, location = aptos_token_objects::token)]
+    fun test_create_token_non_collection_owner(creator: &signer, trader: &signer) {
+        let constructor_ref = &create_fixed_collection(creator, string::utf8(b"collection name"), 5);
+        let collection = get_collection_from_ref(&object::generate_extend_ref(constructor_ref));
+        create_token(
+            trader, collection, string::utf8(b"token description"), string::utf8(b"token name"),
+            option::some(royalty::create(25, 10000, signer::address_of(creator))), string::utf8(b"uri"),
+        );
+    }
+
+    #[test(creator = @0x123, trader = @0x456)]
+    #[expected_failure(abort_code = 0x40008, location = aptos_token_objects::token)]
+    fun test_create_named_token_non_collection_owner(creator: &signer, trader: &signer) {
+        let constructor_ref = &create_fixed_collection(creator, string::utf8(b"collection name"), 5);
+        let collection = get_collection_from_ref(&object::generate_extend_ref(constructor_ref));
+        create_token_with_collection_helper(trader, collection, string::utf8(b"token name"));
+    }
+
+    #[test(creator = @0x123, trader = @0x456)]
+    #[expected_failure(abort_code = 0x40008, location = aptos_token_objects::token)]
+    fun test_create_named_token_object_non_collection_owner(creator: &signer, trader: &signer) {
+        let constructor_ref = &create_fixed_collection(creator, string::utf8(b"collection name"), 5);
+        let collection = get_collection_from_ref(&object::generate_extend_ref(constructor_ref));
+        create_named_token_object(
+            trader, collection, string::utf8(b"token description"), string::utf8(b"token name"),
+            option::some(royalty::create(25, 10000, signer::address_of(creator))), string::utf8(b"uri"),
+        );
+    }
+
+    #[test(creator = @0x123, trader = @0x456)]
+    #[expected_failure(abort_code = 0x40008, location = aptos_token_objects::token)]
+    fun test_create_named_token_from_seed_non_collection_owner(creator: &signer, trader: &signer) {
+        let constructor_ref = &create_fixed_collection(creator, string::utf8(b"collection name"), 5);
+        let collection = get_collection_from_ref(&object::generate_extend_ref(constructor_ref));
+        create_named_token_object(
+            trader, collection, string::utf8(b"token description"), string::utf8(b"token name"),
+            option::some(royalty::create(25, 10000, signer::address_of(creator))), string::utf8(b"uri"),
+        );
+    }
+
     #[test(creator = @0x123, trader = @0x456)]
     fun test_create_and_transfer_token_with_seed(creator: &signer, trader: &signer) acquires Token {
         let collection_name = string::utf8(b"collection name");
@@ -778,6 +786,43 @@ module aptos_token_objects::token {
         assert!(option::some(expected_royalty) == royalty(token), 2);
     }
 
+    #[test(creator = @0x123, trader = @0x456)]
+    #[expected_failure(abort_code = 0x40008, location = aptos_token_objects::token)]
+    fun test_create_token_after_transferring_collection(creator: &signer, trader: &signer) {
+        let constructor_ref = &create_fixed_collection(creator, string::utf8(b"collection name"), 5);
+        let collection = get_collection_from_ref(&object::generate_extend_ref(constructor_ref));
+        create_token(
+            creator, collection, string::utf8(b"token description"), string::utf8(b"token name"),
+            option::some(royalty::create(25, 10000, signer::address_of(creator))), string::utf8(b"uri"),
+        );
+
+        object::transfer(creator, collection, signer::address_of(trader));
+
+        // This should fail as the collection is no longer owned by the creator.
+        create_token(
+            creator, collection, string::utf8(b"token description"), string::utf8(b"token name"),
+            option::some(royalty::create(25, 10000, signer::address_of(creator))), string::utf8(b"uri"),
+        );
+    }
+
+    #[test(creator = @0x123, trader = @0x456)]
+    fun create_token_works_with_new_collection_owner(creator: &signer, trader: &signer) {
+        let constructor_ref = &create_fixed_collection(creator, string::utf8(b"collection name"), 5);
+        let collection = get_collection_from_ref(&object::generate_extend_ref(constructor_ref));
+        create_token(
+            creator, collection, string::utf8(b"token description"), string::utf8(b"token name"),
+            option::some(royalty::create(25, 10000, signer::address_of(creator))), string::utf8(b"uri"),
+        );
+
+        object::transfer(creator, collection, signer::address_of(trader));
+
+        // This should pass as `trader` is the new collection owner
+        create_token(
+            trader, collection, string::utf8(b"token description"), string::utf8(b"token name"),
+            option::some(royalty::create(25, 10000, signer::address_of(creator))), string::utf8(b"uri"),
+        );
+    }
+
     #[test(creator = @0x123)]
     fun test_collection_royalty(creator: &signer) acquires Token {
         let collection_name = string::utf8(b"collection name");
@@ -982,13 +1027,9 @@ module aptos_token_objects::token {
         assert!(!object::is_object(token_addr), 2);
     }
 
-    #[test(creator = @0x123, fx = @std)]
-    fun test_create_burn_and_delete(creator: &signer, fx: signer) acquires Token, TokenIdentifiers {
+    #[test(creator = @0x123)]
+    fun test_create_burn_and_delete(creator: &signer) acquires Token, TokenIdentifiers {
         use aptos_framework::account;
-        use std::features;
-
-        let feature = features::get_auids();
-        features::change_feature_flags_for_testing(&fx, vector[feature], vector[]);
 
         let collection_name = string::utf8(b"collection name");
         let token_name = string::utf8(b"token name");
@@ -1012,16 +1053,8 @@ module aptos_token_objects::token {
         assert!(!object::is_object(token_addr), 2);
     }
 
-    #[test(fx = @aptos_framework, creator = @0x123)]
-    fun test_upgrade_to_concurrent_and_numbered_tokens(fx: &signer, creator: &signer) acquires Token, TokenIdentifiers {
-        use std::debug;
-
-        let feature = features::get_concurrent_token_v2_feature();
-        let agg_feature = features::get_aggregator_v2_api_feature();
-        let auid_feature = features::get_auids();
-        let module_event_feature = features::get_module_event_feature();
-        features::change_feature_flags_for_testing(fx, vector[auid_feature, module_event_feature], vector[feature, agg_feature]);
-
+    #[test(creator = @0x123)]
+    fun test_upgrade_to_concurrent_and_numbered_tokens(creator: &signer) acquires Token, TokenIdentifiers {
         let collection_name = string::utf8(b"collection name");
         let token_name = string::utf8(b"token name");
 
@@ -1029,12 +1062,8 @@ module aptos_token_objects::token {
         let collection = get_collection_from_ref(&extend_ref);
         let token_1_ref = create_numbered_token_helper(creator, collection, token_name);
         let token_1_name = name(object::object_from_constructor_ref<Token>(&token_1_ref));
-        debug::print(&token_1_name);
         assert!(token_1_name == std::string::utf8(b"token name1"), 1);
 
-        features::change_feature_flags_for_testing(fx, vector[feature, agg_feature], vector[]);
-        collection::upgrade_to_concurrent(&extend_ref);
-
         let token_2_ref = create_numbered_token_helper(creator, collection, token_name);
         assert!(name(object::object_from_constructor_ref<Token>(&token_2_ref)) == std::string::utf8(b"token name2"), 1);
         assert!(vector::length(&event::emitted_events<collection::Mint>()) == 2, 0);
diff --git a/aptos-move/framework/aptos-token-objects/tests/compiler-v2-doc/aptos_token.md b/aptos-move/framework/aptos-token-objects/tests/compiler-v2-doc/aptos_token.md
new file mode 100644
index 0000000000000..c7c9f64e1dfca
--- /dev/null
+++ b/aptos-move/framework/aptos-token-objects/tests/compiler-v2-doc/aptos_token.md
@@ -0,0 +1,1703 @@
+
+<a id="0x4_aptos_token"></a>
+
+# Module `0x4::aptos_token`
+
+This defines a minimally viable token for no-code solutions akin to the original token at
+0x3::token module.
+The key features are:
+* Base token and collection features
+* Creator definable mutability for tokens
+* Creator-based freezing of tokens
+* Standard object-based transfer and events
+* Metadata property type
+
+
+-  [Resource `AptosCollection`](#0x4_aptos_token_AptosCollection)
+-  [Resource `AptosToken`](#0x4_aptos_token_AptosToken)
+-  [Constants](#@Constants_0)
+-  [Function `create_collection`](#0x4_aptos_token_create_collection)
+-  [Function `create_collection_object`](#0x4_aptos_token_create_collection_object)
+-  [Function `mint`](#0x4_aptos_token_mint)
+-  [Function `mint_token_object`](#0x4_aptos_token_mint_token_object)
+-  [Function `mint_soul_bound`](#0x4_aptos_token_mint_soul_bound)
+-  [Function `mint_soul_bound_token_object`](#0x4_aptos_token_mint_soul_bound_token_object)
+-  [Function `mint_internal`](#0x4_aptos_token_mint_internal)
+-  [Function `borrow`](#0x4_aptos_token_borrow)
+-  [Function `are_properties_mutable`](#0x4_aptos_token_are_properties_mutable)
+-  [Function `is_burnable`](#0x4_aptos_token_is_burnable)
+-  [Function `is_freezable_by_creator`](#0x4_aptos_token_is_freezable_by_creator)
+-  [Function `is_mutable_description`](#0x4_aptos_token_is_mutable_description)
+-  [Function `is_mutable_name`](#0x4_aptos_token_is_mutable_name)
+-  [Function `is_mutable_uri`](#0x4_aptos_token_is_mutable_uri)
+-  [Function `authorized_borrow`](#0x4_aptos_token_authorized_borrow)
+-  [Function `burn`](#0x4_aptos_token_burn)
+-  [Function `freeze_transfer`](#0x4_aptos_token_freeze_transfer)
+-  [Function `unfreeze_transfer`](#0x4_aptos_token_unfreeze_transfer)
+-  [Function `set_description`](#0x4_aptos_token_set_description)
+-  [Function `set_name`](#0x4_aptos_token_set_name)
+-  [Function `set_uri`](#0x4_aptos_token_set_uri)
+-  [Function `add_property`](#0x4_aptos_token_add_property)
+-  [Function `add_typed_property`](#0x4_aptos_token_add_typed_property)
+-  [Function `remove_property`](#0x4_aptos_token_remove_property)
+-  [Function `update_property`](#0x4_aptos_token_update_property)
+-  [Function `update_typed_property`](#0x4_aptos_token_update_typed_property)
+-  [Function `collection_object`](#0x4_aptos_token_collection_object)
+-  [Function `borrow_collection`](#0x4_aptos_token_borrow_collection)
+-  [Function `is_mutable_collection_description`](#0x4_aptos_token_is_mutable_collection_description)
+-  [Function `is_mutable_collection_royalty`](#0x4_aptos_token_is_mutable_collection_royalty)
+-  [Function `is_mutable_collection_uri`](#0x4_aptos_token_is_mutable_collection_uri)
+-  [Function `is_mutable_collection_token_description`](#0x4_aptos_token_is_mutable_collection_token_description)
+-  [Function `is_mutable_collection_token_name`](#0x4_aptos_token_is_mutable_collection_token_name)
+-  [Function `is_mutable_collection_token_uri`](#0x4_aptos_token_is_mutable_collection_token_uri)
+-  [Function `is_mutable_collection_token_properties`](#0x4_aptos_token_is_mutable_collection_token_properties)
+-  [Function `are_collection_tokens_burnable`](#0x4_aptos_token_are_collection_tokens_burnable)
+-  [Function `are_collection_tokens_freezable`](#0x4_aptos_token_are_collection_tokens_freezable)
+-  [Function `authorized_borrow_collection`](#0x4_aptos_token_authorized_borrow_collection)
+-  [Function `set_collection_description`](#0x4_aptos_token_set_collection_description)
+-  [Function `set_collection_royalties`](#0x4_aptos_token_set_collection_royalties)
+-  [Function `set_collection_royalties_call`](#0x4_aptos_token_set_collection_royalties_call)
+-  [Function `set_collection_uri`](#0x4_aptos_token_set_collection_uri)
+
+
+<pre><code><b>use</b> <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">0x1::object</a>;
+<b>use</b> <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option">0x1::option</a>;
+<b>use</b> <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">0x1::signer</a>;
+<b>use</b> <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string">0x1::string</a>;
+<b>use</b> <a href="collection.md#0x4_collection">0x4::collection</a>;
+<b>use</b> <a href="property_map.md#0x4_property_map">0x4::property_map</a>;
+<b>use</b> <a href="royalty.md#0x4_royalty">0x4::royalty</a>;
+<b>use</b> <a href="token.md#0x4_token">0x4::token</a>;
+</code></pre>
+
+
+
+<a id="0x4_aptos_token_AptosCollection"></a>
+
+## Resource `AptosCollection`
+
+Storage state for managing the no-code Collection.
+
+
+<pre><code>#[resource_group_member(#[group = <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_ObjectGroup">0x1::object::ObjectGroup</a>])]
+<b>struct</b> <a href="aptos_token.md#0x4_aptos_token_AptosCollection">AptosCollection</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>mutator_ref: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="collection.md#0x4_collection_MutatorRef">collection::MutatorRef</a>&gt;</code>
+</dt>
+<dd>
+ Used to mutate collection fields
+</dd>
+<dt>
+<code>royalty_mutator_ref: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="royalty.md#0x4_royalty_MutatorRef">royalty::MutatorRef</a>&gt;</code>
+</dt>
+<dd>
+ Used to mutate royalties
+</dd>
+<dt>
+<code>mutable_description: bool</code>
+</dt>
+<dd>
+ Determines if the creator can mutate the collection's description
+</dd>
+<dt>
+<code>mutable_uri: bool</code>
+</dt>
+<dd>
+ Determines if the creator can mutate the collection's uri
+</dd>
+<dt>
+<code>mutable_token_description: bool</code>
+</dt>
+<dd>
+ Determines if the creator can mutate token descriptions
+</dd>
+<dt>
+<code>mutable_token_name: bool</code>
+</dt>
+<dd>
+ Determines if the creator can mutate token names
+</dd>
+<dt>
+<code>mutable_token_properties: bool</code>
+</dt>
+<dd>
+ Determines if the creator can mutate token properties
+</dd>
+<dt>
+<code>mutable_token_uri: bool</code>
+</dt>
+<dd>
+ Determines if the creator can mutate token uris
+</dd>
+<dt>
+<code>tokens_burnable_by_creator: bool</code>
+</dt>
+<dd>
+ Determines if the creator can burn tokens
+</dd>
+<dt>
+<code>tokens_freezable_by_creator: bool</code>
+</dt>
+<dd>
+ Determines if the creator can freeze tokens
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x4_aptos_token_AptosToken"></a>
+
+## Resource `AptosToken`
+
+Storage state for managing the no-code Token.
+
+
+<pre><code>#[resource_group_member(#[group = <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_ObjectGroup">0x1::object::ObjectGroup</a>])]
+<b>struct</b> <a href="aptos_token.md#0x4_aptos_token_AptosToken">AptosToken</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>burn_ref: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="token.md#0x4_token_BurnRef">token::BurnRef</a>&gt;</code>
+</dt>
+<dd>
+ Used to burn.
+</dd>
+<dt>
+<code>transfer_ref: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_TransferRef">object::TransferRef</a>&gt;</code>
+</dt>
+<dd>
+ Used to control freeze.
+</dd>
+<dt>
+<code>mutator_ref: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="token.md#0x4_token_MutatorRef">token::MutatorRef</a>&gt;</code>
+</dt>
+<dd>
+ Used to mutate fields
+</dd>
+<dt>
+<code>property_mutator_ref: <a href="property_map.md#0x4_property_map_MutatorRef">property_map::MutatorRef</a></code>
+</dt>
+<dd>
+ Used to mutate properties
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x4_aptos_token_ECOLLECTION_DOES_NOT_EXIST"></a>
+
+The collection does not exist
+
+
+<pre><code><b>const</b> <a href="aptos_token.md#0x4_aptos_token_ECOLLECTION_DOES_NOT_EXIST">ECOLLECTION_DOES_NOT_EXIST</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x4_aptos_token_EFIELD_NOT_MUTABLE"></a>
+
+The field being changed is not mutable
+
+
+<pre><code><b>const</b> <a href="aptos_token.md#0x4_aptos_token_EFIELD_NOT_MUTABLE">EFIELD_NOT_MUTABLE</a>: u64 = 4;
+</code></pre>
+
+
+
+<a id="0x4_aptos_token_ENOT_CREATOR"></a>
+
+The provided signer is not the creator
+
+
+<pre><code><b>const</b> <a href="aptos_token.md#0x4_aptos_token_ENOT_CREATOR">ENOT_CREATOR</a>: u64 = 3;
+</code></pre>
+
+
+
+<a id="0x4_aptos_token_ETOKEN_DOES_NOT_EXIST"></a>
+
+The token does not exist
+
+
+<pre><code><b>const</b> <a href="aptos_token.md#0x4_aptos_token_ETOKEN_DOES_NOT_EXIST">ETOKEN_DOES_NOT_EXIST</a>: u64 = 2;
+</code></pre>
+
+
+
+<a id="0x4_aptos_token_EPROPERTIES_NOT_MUTABLE"></a>
+
+The property map being mutated is not mutable
+
+
+<pre><code><b>const</b> <a href="aptos_token.md#0x4_aptos_token_EPROPERTIES_NOT_MUTABLE">EPROPERTIES_NOT_MUTABLE</a>: u64 = 6;
+</code></pre>
+
+
+
+<a id="0x4_aptos_token_ETOKEN_NOT_BURNABLE"></a>
+
+The token being burned is not burnable
+
+
+<pre><code><b>const</b> <a href="aptos_token.md#0x4_aptos_token_ETOKEN_NOT_BURNABLE">ETOKEN_NOT_BURNABLE</a>: u64 = 5;
+</code></pre>
+
+
+
+<a id="0x4_aptos_token_create_collection"></a>
+
+## Function `create_collection`
+
+Create a new collection
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_create_collection">create_collection</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, description: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, max_supply: u64, name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, uri: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, mutable_description: bool, mutable_royalty: bool, mutable_uri: bool, mutable_token_description: bool, mutable_token_name: bool, mutable_token_properties: bool, mutable_token_uri: bool, tokens_burnable_by_creator: bool, tokens_freezable_by_creator: bool, royalty_numerator: u64, royalty_denominator: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_create_collection">create_collection</a>(
+    creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    description: String,
+    max_supply: u64,
+    name: String,
+    uri: String,
+    mutable_description: bool,
+    mutable_royalty: bool,
+    mutable_uri: bool,
+    mutable_token_description: bool,
+    mutable_token_name: bool,
+    mutable_token_properties: bool,
+    mutable_token_uri: bool,
+    tokens_burnable_by_creator: bool,
+    tokens_freezable_by_creator: bool,
+    royalty_numerator: u64,
+    royalty_denominator: u64,
+) {
+    <a href="aptos_token.md#0x4_aptos_token_create_collection_object">create_collection_object</a>(
+        creator,
+        description,
+        max_supply,
+        name,
+        uri,
+        mutable_description,
+        mutable_royalty,
+        mutable_uri,
+        mutable_token_description,
+        mutable_token_name,
+        mutable_token_properties,
+        mutable_token_uri,
+        tokens_burnable_by_creator,
+        tokens_freezable_by_creator,
+        royalty_numerator,
+        royalty_denominator
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_aptos_token_create_collection_object"></a>
+
+## Function `create_collection_object`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_create_collection_object">create_collection_object</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, description: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, max_supply: u64, name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, uri: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, mutable_description: bool, mutable_royalty: bool, mutable_uri: bool, mutable_token_description: bool, mutable_token_name: bool, mutable_token_properties: bool, mutable_token_uri: bool, tokens_burnable_by_creator: bool, tokens_freezable_by_creator: bool, royalty_numerator: u64, royalty_denominator: u64): <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;<a href="aptos_token.md#0x4_aptos_token_AptosCollection">aptos_token::AptosCollection</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_create_collection_object">create_collection_object</a>(
+    creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    description: String,
+    max_supply: u64,
+    name: String,
+    uri: String,
+    mutable_description: bool,
+    mutable_royalty: bool,
+    mutable_uri: bool,
+    mutable_token_description: bool,
+    mutable_token_name: bool,
+    mutable_token_properties: bool,
+    mutable_token_uri: bool,
+    tokens_burnable_by_creator: bool,
+    tokens_freezable_by_creator: bool,
+    royalty_numerator: u64,
+    royalty_denominator: u64,
+): Object&lt;<a href="aptos_token.md#0x4_aptos_token_AptosCollection">AptosCollection</a>&gt; {
+    <b>let</b> creator_addr = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(creator);
+    <b>let</b> <a href="royalty.md#0x4_royalty">royalty</a> = <a href="royalty.md#0x4_royalty_create">royalty::create</a>(royalty_numerator, royalty_denominator, creator_addr);
+    <b>let</b> constructor_ref = <a href="collection.md#0x4_collection_create_fixed_collection">collection::create_fixed_collection</a>(
+        creator,
+        description,
+        max_supply,
+        name,
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(<a href="royalty.md#0x4_royalty">royalty</a>),
+        uri,
+    );
+
+    <b>let</b> object_signer = <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_generate_signer">object::generate_signer</a>(&constructor_ref);
+    <b>let</b> mutator_ref = <b>if</b> (mutable_description || mutable_uri) {
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(<a href="collection.md#0x4_collection_generate_mutator_ref">collection::generate_mutator_ref</a>(&constructor_ref))
+    } <b>else</b> {
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>()
+    };
+
+    <b>let</b> royalty_mutator_ref = <b>if</b> (mutable_royalty) {
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(<a href="royalty.md#0x4_royalty_generate_mutator_ref">royalty::generate_mutator_ref</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_generate_extend_ref">object::generate_extend_ref</a>(&constructor_ref)))
+    } <b>else</b> {
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>()
+    };
+
+    <b>let</b> aptos_collection = <a href="aptos_token.md#0x4_aptos_token_AptosCollection">AptosCollection</a> {
+        mutator_ref,
+        royalty_mutator_ref,
+        mutable_description,
+        mutable_uri,
+        mutable_token_description,
+        mutable_token_name,
+        mutable_token_properties,
+        mutable_token_uri,
+        tokens_burnable_by_creator,
+        tokens_freezable_by_creator,
+    };
+    <b>move_to</b>(&object_signer, aptos_collection);
+    <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_object_from_constructor_ref">object::object_from_constructor_ref</a>(&constructor_ref)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_aptos_token_mint"></a>
+
+## Function `mint`
+
+With an existing collection, directly mint a viable token into the creators account.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_mint">mint</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="collection.md#0x4_collection">collection</a>: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, description: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, uri: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, property_keys: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;, property_types: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;, property_values: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_mint">mint</a>(
+    creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    <a href="collection.md#0x4_collection">collection</a>: String,
+    description: String,
+    name: String,
+    uri: String,
+    property_keys: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;String&gt;,
+    property_types: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;String&gt;,
+    property_values: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;,
+) <b>acquires</b> <a href="aptos_token.md#0x4_aptos_token_AptosCollection">AptosCollection</a>, <a href="aptos_token.md#0x4_aptos_token_AptosToken">AptosToken</a> {
+    <a href="aptos_token.md#0x4_aptos_token_mint_token_object">mint_token_object</a>(creator, <a href="collection.md#0x4_collection">collection</a>, description, name, uri, property_keys, property_types, property_values);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_aptos_token_mint_token_object"></a>
+
+## Function `mint_token_object`
+
+Mint a token into an existing collection, and retrieve the object / address of the token.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_mint_token_object">mint_token_object</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="collection.md#0x4_collection">collection</a>: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, description: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, uri: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, property_keys: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;, property_types: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;, property_values: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;): <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;<a href="aptos_token.md#0x4_aptos_token_AptosToken">aptos_token::AptosToken</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_mint_token_object">mint_token_object</a>(
+    creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    <a href="collection.md#0x4_collection">collection</a>: String,
+    description: String,
+    name: String,
+    uri: String,
+    property_keys: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;String&gt;,
+    property_types: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;String&gt;,
+    property_values: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;,
+): Object&lt;<a href="aptos_token.md#0x4_aptos_token_AptosToken">AptosToken</a>&gt; <b>acquires</b> <a href="aptos_token.md#0x4_aptos_token_AptosCollection">AptosCollection</a>, <a href="aptos_token.md#0x4_aptos_token_AptosToken">AptosToken</a> {
+    <b>let</b> constructor_ref = <a href="aptos_token.md#0x4_aptos_token_mint_internal">mint_internal</a>(
+        creator,
+        <a href="collection.md#0x4_collection">collection</a>,
+        description,
+        name,
+        uri,
+        property_keys,
+        property_types,
+        property_values,
+    );
+
+    <b>let</b> <a href="collection.md#0x4_collection">collection</a> = <a href="aptos_token.md#0x4_aptos_token_collection_object">collection_object</a>(creator, &<a href="collection.md#0x4_collection">collection</a>);
+
+    // If tokens are freezable, add a transfer ref <b>to</b> be able <b>to</b> <b>freeze</b> transfers
+    <b>let</b> freezable_by_creator = <a href="aptos_token.md#0x4_aptos_token_are_collection_tokens_freezable">are_collection_tokens_freezable</a>(<a href="collection.md#0x4_collection">collection</a>);
+    <b>if</b> (freezable_by_creator) {
+        <b>let</b> aptos_token_addr = <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_address_from_constructor_ref">object::address_from_constructor_ref</a>(&constructor_ref);
+        <b>let</b> <a href="aptos_token.md#0x4_aptos_token">aptos_token</a> = <b>borrow_global_mut</b>&lt;<a href="aptos_token.md#0x4_aptos_token_AptosToken">AptosToken</a>&gt;(aptos_token_addr);
+        <b>let</b> transfer_ref = <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_generate_transfer_ref">object::generate_transfer_ref</a>(&constructor_ref);
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_fill">option::fill</a>(&<b>mut</b> <a href="aptos_token.md#0x4_aptos_token">aptos_token</a>.transfer_ref, transfer_ref);
+    };
+
+    <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_object_from_constructor_ref">object::object_from_constructor_ref</a>(&constructor_ref)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_aptos_token_mint_soul_bound"></a>
+
+## Function `mint_soul_bound`
+
+With an existing collection, directly mint a soul bound token into the recipient's account.
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_mint_soul_bound">mint_soul_bound</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="collection.md#0x4_collection">collection</a>: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, description: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, uri: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, property_keys: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;, property_types: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;, property_values: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;, soul_bound_to: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_mint_soul_bound">mint_soul_bound</a>(
+    creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    <a href="collection.md#0x4_collection">collection</a>: String,
+    description: String,
+    name: String,
+    uri: String,
+    property_keys: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;String&gt;,
+    property_types: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;String&gt;,
+    property_values: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;,
+    soul_bound_to: <b>address</b>,
+) <b>acquires</b> <a href="aptos_token.md#0x4_aptos_token_AptosCollection">AptosCollection</a> {
+    <a href="aptos_token.md#0x4_aptos_token_mint_soul_bound_token_object">mint_soul_bound_token_object</a>(
+        creator,
+        <a href="collection.md#0x4_collection">collection</a>,
+        description,
+        name,
+        uri,
+        property_keys,
+        property_types,
+        property_values,
+        soul_bound_to
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_aptos_token_mint_soul_bound_token_object"></a>
+
+## Function `mint_soul_bound_token_object`
+
+With an existing collection, directly mint a soul bound token into the recipient's account.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_mint_soul_bound_token_object">mint_soul_bound_token_object</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="collection.md#0x4_collection">collection</a>: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, description: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, uri: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, property_keys: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;, property_types: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;, property_values: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;, soul_bound_to: <b>address</b>): <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;<a href="aptos_token.md#0x4_aptos_token_AptosToken">aptos_token::AptosToken</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_mint_soul_bound_token_object">mint_soul_bound_token_object</a>(
+    creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    <a href="collection.md#0x4_collection">collection</a>: String,
+    description: String,
+    name: String,
+    uri: String,
+    property_keys: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;String&gt;,
+    property_types: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;String&gt;,
+    property_values: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;,
+    soul_bound_to: <b>address</b>,
+): Object&lt;<a href="aptos_token.md#0x4_aptos_token_AptosToken">AptosToken</a>&gt; <b>acquires</b> <a href="aptos_token.md#0x4_aptos_token_AptosCollection">AptosCollection</a> {
+    <b>let</b> constructor_ref = <a href="aptos_token.md#0x4_aptos_token_mint_internal">mint_internal</a>(
+        creator,
+        <a href="collection.md#0x4_collection">collection</a>,
+        description,
+        name,
+        uri,
+        property_keys,
+        property_types,
+        property_values,
+    );
+
+    <b>let</b> transfer_ref = <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_generate_transfer_ref">object::generate_transfer_ref</a>(&constructor_ref);
+    <b>let</b> linear_transfer_ref = <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_generate_linear_transfer_ref">object::generate_linear_transfer_ref</a>(&transfer_ref);
+    <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_transfer_with_ref">object::transfer_with_ref</a>(linear_transfer_ref, soul_bound_to);
+    <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_disable_ungated_transfer">object::disable_ungated_transfer</a>(&transfer_ref);
+
+    <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_object_from_constructor_ref">object::object_from_constructor_ref</a>(&constructor_ref)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_aptos_token_mint_internal"></a>
+
+## Function `mint_internal`
+
+
+
+<pre><code><b>fun</b> <a href="aptos_token.md#0x4_aptos_token_mint_internal">mint_internal</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="collection.md#0x4_collection">collection</a>: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, description: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, uri: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, property_keys: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;, property_types: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;, property_values: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;): <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="aptos_token.md#0x4_aptos_token_mint_internal">mint_internal</a>(
+    creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    <a href="collection.md#0x4_collection">collection</a>: String,
+    description: String,
+    name: String,
+    uri: String,
+    property_keys: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;String&gt;,
+    property_types: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;String&gt;,
+    property_values: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;,
+): ConstructorRef <b>acquires</b> <a href="aptos_token.md#0x4_aptos_token_AptosCollection">AptosCollection</a> {
+    <b>let</b> constructor_ref = <a href="token.md#0x4_token_create">token::create</a>(creator, <a href="collection.md#0x4_collection">collection</a>, description, name, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>(), uri);
+
+    <b>let</b> object_signer = <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_generate_signer">object::generate_signer</a>(&constructor_ref);
+
+    <b>let</b> collection_obj = <a href="aptos_token.md#0x4_aptos_token_collection_object">collection_object</a>(creator, &<a href="collection.md#0x4_collection">collection</a>);
+    <b>let</b> <a href="collection.md#0x4_collection">collection</a> = <a href="aptos_token.md#0x4_aptos_token_borrow_collection">borrow_collection</a>(&collection_obj);
+
+    <b>let</b> mutator_ref = <b>if</b> (
+        <a href="collection.md#0x4_collection">collection</a>.mutable_token_description
+            || <a href="collection.md#0x4_collection">collection</a>.mutable_token_name
+            || <a href="collection.md#0x4_collection">collection</a>.mutable_token_uri
+    ) {
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(<a href="token.md#0x4_token_generate_mutator_ref">token::generate_mutator_ref</a>(&constructor_ref))
+    } <b>else</b> {
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>()
+    };
+
+    <b>let</b> burn_ref = <b>if</b> (<a href="collection.md#0x4_collection">collection</a>.tokens_burnable_by_creator) {
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(<a href="token.md#0x4_token_generate_burn_ref">token::generate_burn_ref</a>(&constructor_ref))
+    } <b>else</b> {
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>()
+    };
+
+    <b>let</b> <a href="aptos_token.md#0x4_aptos_token">aptos_token</a> = <a href="aptos_token.md#0x4_aptos_token_AptosToken">AptosToken</a> {
+        burn_ref,
+        transfer_ref: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>(),
+        mutator_ref,
+        property_mutator_ref: <a href="property_map.md#0x4_property_map_generate_mutator_ref">property_map::generate_mutator_ref</a>(&constructor_ref),
+    };
+    <b>move_to</b>(&object_signer, <a href="aptos_token.md#0x4_aptos_token">aptos_token</a>);
+
+    <b>let</b> properties = <a href="property_map.md#0x4_property_map_prepare_input">property_map::prepare_input</a>(property_keys, property_types, property_values);
+    <a href="property_map.md#0x4_property_map_init">property_map::init</a>(&constructor_ref, properties);
+
+    constructor_ref
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_aptos_token_borrow"></a>
+
+## Function `borrow`
+
+
+
+<pre><code><b>fun</b> <a href="aptos_token.md#0x4_aptos_token_borrow">borrow</a>&lt;T: key&gt;(<a href="token.md#0x4_token">token</a>: &<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): &<a href="aptos_token.md#0x4_aptos_token_AptosToken">aptos_token::AptosToken</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_borrow">borrow</a>&lt;T: key&gt;(<a href="token.md#0x4_token">token</a>: &Object&lt;T&gt;): &<a href="aptos_token.md#0x4_aptos_token_AptosToken">AptosToken</a> {
+    <b>let</b> token_address = <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_object_address">object::object_address</a>(<a href="token.md#0x4_token">token</a>);
+    <b>assert</b>!(
+        <b>exists</b>&lt;<a href="aptos_token.md#0x4_aptos_token_AptosToken">AptosToken</a>&gt;(token_address),
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="aptos_token.md#0x4_aptos_token_ETOKEN_DOES_NOT_EXIST">ETOKEN_DOES_NOT_EXIST</a>),
+    );
+    <b>borrow_global</b>&lt;<a href="aptos_token.md#0x4_aptos_token_AptosToken">AptosToken</a>&gt;(token_address)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_aptos_token_are_properties_mutable"></a>
+
+## Function `are_properties_mutable`
+
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_are_properties_mutable">are_properties_mutable</a>&lt;T: key&gt;(<a href="token.md#0x4_token">token</a>: <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_are_properties_mutable">are_properties_mutable</a>&lt;T: key&gt;(<a href="token.md#0x4_token">token</a>: Object&lt;T&gt;): bool <b>acquires</b> <a href="aptos_token.md#0x4_aptos_token_AptosCollection">AptosCollection</a> {
+    <b>let</b> <a href="collection.md#0x4_collection">collection</a> = <a href="token.md#0x4_token_collection_object">token::collection_object</a>(<a href="token.md#0x4_token">token</a>);
+    <a href="aptos_token.md#0x4_aptos_token_borrow_collection">borrow_collection</a>(&<a href="collection.md#0x4_collection">collection</a>).mutable_token_properties
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_aptos_token_is_burnable"></a>
+
+## Function `is_burnable`
+
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_is_burnable">is_burnable</a>&lt;T: key&gt;(<a href="token.md#0x4_token">token</a>: <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_is_burnable">is_burnable</a>&lt;T: key&gt;(<a href="token.md#0x4_token">token</a>: Object&lt;T&gt;): bool <b>acquires</b> <a href="aptos_token.md#0x4_aptos_token_AptosToken">AptosToken</a> {
+    <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&<a href="aptos_token.md#0x4_aptos_token_borrow">borrow</a>(&<a href="token.md#0x4_token">token</a>).burn_ref)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_aptos_token_is_freezable_by_creator"></a>
+
+## Function `is_freezable_by_creator`
+
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_is_freezable_by_creator">is_freezable_by_creator</a>&lt;T: key&gt;(<a href="token.md#0x4_token">token</a>: <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_is_freezable_by_creator">is_freezable_by_creator</a>&lt;T: key&gt;(<a href="token.md#0x4_token">token</a>: Object&lt;T&gt;): bool <b>acquires</b> <a href="aptos_token.md#0x4_aptos_token_AptosCollection">AptosCollection</a> {
+    <a href="aptos_token.md#0x4_aptos_token_are_collection_tokens_freezable">are_collection_tokens_freezable</a>(<a href="token.md#0x4_token_collection_object">token::collection_object</a>(<a href="token.md#0x4_token">token</a>))
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_aptos_token_is_mutable_description"></a>
+
+## Function `is_mutable_description`
+
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_is_mutable_description">is_mutable_description</a>&lt;T: key&gt;(<a href="token.md#0x4_token">token</a>: <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_is_mutable_description">is_mutable_description</a>&lt;T: key&gt;(<a href="token.md#0x4_token">token</a>: Object&lt;T&gt;): bool <b>acquires</b> <a href="aptos_token.md#0x4_aptos_token_AptosCollection">AptosCollection</a> {
+    <a href="aptos_token.md#0x4_aptos_token_is_mutable_collection_token_description">is_mutable_collection_token_description</a>(<a href="token.md#0x4_token_collection_object">token::collection_object</a>(<a href="token.md#0x4_token">token</a>))
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_aptos_token_is_mutable_name"></a>
+
+## Function `is_mutable_name`
+
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_is_mutable_name">is_mutable_name</a>&lt;T: key&gt;(<a href="token.md#0x4_token">token</a>: <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_is_mutable_name">is_mutable_name</a>&lt;T: key&gt;(<a href="token.md#0x4_token">token</a>: Object&lt;T&gt;): bool <b>acquires</b> <a href="aptos_token.md#0x4_aptos_token_AptosCollection">AptosCollection</a> {
+    <a href="aptos_token.md#0x4_aptos_token_is_mutable_collection_token_name">is_mutable_collection_token_name</a>(<a href="token.md#0x4_token_collection_object">token::collection_object</a>(<a href="token.md#0x4_token">token</a>))
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_aptos_token_is_mutable_uri"></a>
+
+## Function `is_mutable_uri`
+
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_is_mutable_uri">is_mutable_uri</a>&lt;T: key&gt;(<a href="token.md#0x4_token">token</a>: <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_is_mutable_uri">is_mutable_uri</a>&lt;T: key&gt;(<a href="token.md#0x4_token">token</a>: Object&lt;T&gt;): bool <b>acquires</b> <a href="aptos_token.md#0x4_aptos_token_AptosCollection">AptosCollection</a> {
+    <a href="aptos_token.md#0x4_aptos_token_is_mutable_collection_token_uri">is_mutable_collection_token_uri</a>(<a href="token.md#0x4_token_collection_object">token::collection_object</a>(<a href="token.md#0x4_token">token</a>))
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_aptos_token_authorized_borrow"></a>
+
+## Function `authorized_borrow`
+
+
+
+<pre><code><b>fun</b> <a href="aptos_token.md#0x4_aptos_token_authorized_borrow">authorized_borrow</a>&lt;T: key&gt;(<a href="token.md#0x4_token">token</a>: &<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>): &<a href="aptos_token.md#0x4_aptos_token_AptosToken">aptos_token::AptosToken</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_authorized_borrow">authorized_borrow</a>&lt;T: key&gt;(<a href="token.md#0x4_token">token</a>: &Object&lt;T&gt;, creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>): &<a href="aptos_token.md#0x4_aptos_token_AptosToken">AptosToken</a> {
+    <b>let</b> token_address = <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_object_address">object::object_address</a>(<a href="token.md#0x4_token">token</a>);
+    <b>assert</b>!(
+        <b>exists</b>&lt;<a href="aptos_token.md#0x4_aptos_token_AptosToken">AptosToken</a>&gt;(token_address),
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="aptos_token.md#0x4_aptos_token_ETOKEN_DOES_NOT_EXIST">ETOKEN_DOES_NOT_EXIST</a>),
+    );
+
+    <b>assert</b>!(
+        <a href="token.md#0x4_token_creator">token::creator</a>(*<a href="token.md#0x4_token">token</a>) == <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(creator),
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="aptos_token.md#0x4_aptos_token_ENOT_CREATOR">ENOT_CREATOR</a>),
+    );
+    <b>borrow_global</b>&lt;<a href="aptos_token.md#0x4_aptos_token_AptosToken">AptosToken</a>&gt;(token_address)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_aptos_token_burn"></a>
+
+## Function `burn`
+
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_burn">burn</a>&lt;T: key&gt;(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="token.md#0x4_token">token</a>: <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;T&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_burn">burn</a>&lt;T: key&gt;(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="token.md#0x4_token">token</a>: Object&lt;T&gt;) <b>acquires</b> <a href="aptos_token.md#0x4_aptos_token_AptosToken">AptosToken</a> {
+    <b>let</b> <a href="aptos_token.md#0x4_aptos_token">aptos_token</a> = <a href="aptos_token.md#0x4_aptos_token_authorized_borrow">authorized_borrow</a>(&<a href="token.md#0x4_token">token</a>, creator);
+    <b>assert</b>!(
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&<a href="aptos_token.md#0x4_aptos_token">aptos_token</a>.burn_ref),
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="aptos_token.md#0x4_aptos_token_ETOKEN_NOT_BURNABLE">ETOKEN_NOT_BURNABLE</a>),
+    );
+    <b>move</b> <a href="aptos_token.md#0x4_aptos_token">aptos_token</a>;
+    <b>let</b> <a href="aptos_token.md#0x4_aptos_token">aptos_token</a> = <b>move_from</b>&lt;<a href="aptos_token.md#0x4_aptos_token_AptosToken">AptosToken</a>&gt;(<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_object_address">object::object_address</a>(&<a href="token.md#0x4_token">token</a>));
+    <b>let</b> <a href="aptos_token.md#0x4_aptos_token_AptosToken">AptosToken</a> {
+        burn_ref,
+        transfer_ref: _,
+        mutator_ref: _,
+        property_mutator_ref,
+    } = <a href="aptos_token.md#0x4_aptos_token">aptos_token</a>;
+    <a href="property_map.md#0x4_property_map_burn">property_map::burn</a>(property_mutator_ref);
+    <a href="token.md#0x4_token_burn">token::burn</a>(<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_extract">option::extract</a>(&<b>mut</b> burn_ref));
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_aptos_token_freeze_transfer"></a>
+
+## Function `freeze_transfer`
+
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_freeze_transfer">freeze_transfer</a>&lt;T: key&gt;(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="token.md#0x4_token">token</a>: <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;T&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_freeze_transfer">freeze_transfer</a>&lt;T: key&gt;(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="token.md#0x4_token">token</a>: Object&lt;T&gt;) <b>acquires</b> <a href="aptos_token.md#0x4_aptos_token_AptosCollection">AptosCollection</a>, <a href="aptos_token.md#0x4_aptos_token_AptosToken">AptosToken</a> {
+    <b>let</b> <a href="aptos_token.md#0x4_aptos_token">aptos_token</a> = <a href="aptos_token.md#0x4_aptos_token_authorized_borrow">authorized_borrow</a>(&<a href="token.md#0x4_token">token</a>, creator);
+    <b>assert</b>!(
+        <a href="aptos_token.md#0x4_aptos_token_are_collection_tokens_freezable">are_collection_tokens_freezable</a>(<a href="token.md#0x4_token_collection_object">token::collection_object</a>(<a href="token.md#0x4_token">token</a>))
+            && <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&<a href="aptos_token.md#0x4_aptos_token">aptos_token</a>.transfer_ref),
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="aptos_token.md#0x4_aptos_token_EFIELD_NOT_MUTABLE">EFIELD_NOT_MUTABLE</a>),
+    );
+    <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_disable_ungated_transfer">object::disable_ungated_transfer</a>(<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(&<a href="aptos_token.md#0x4_aptos_token">aptos_token</a>.transfer_ref));
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_aptos_token_unfreeze_transfer"></a>
+
+## Function `unfreeze_transfer`
+
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_unfreeze_transfer">unfreeze_transfer</a>&lt;T: key&gt;(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="token.md#0x4_token">token</a>: <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;T&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_unfreeze_transfer">unfreeze_transfer</a>&lt;T: key&gt;(
+    creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    <a href="token.md#0x4_token">token</a>: Object&lt;T&gt;
+) <b>acquires</b> <a href="aptos_token.md#0x4_aptos_token_AptosCollection">AptosCollection</a>, <a href="aptos_token.md#0x4_aptos_token_AptosToken">AptosToken</a> {
+    <b>let</b> <a href="aptos_token.md#0x4_aptos_token">aptos_token</a> = <a href="aptos_token.md#0x4_aptos_token_authorized_borrow">authorized_borrow</a>(&<a href="token.md#0x4_token">token</a>, creator);
+    <b>assert</b>!(
+        <a href="aptos_token.md#0x4_aptos_token_are_collection_tokens_freezable">are_collection_tokens_freezable</a>(<a href="token.md#0x4_token_collection_object">token::collection_object</a>(<a href="token.md#0x4_token">token</a>))
+            && <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&<a href="aptos_token.md#0x4_aptos_token">aptos_token</a>.transfer_ref),
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="aptos_token.md#0x4_aptos_token_EFIELD_NOT_MUTABLE">EFIELD_NOT_MUTABLE</a>),
+    );
+    <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_enable_ungated_transfer">object::enable_ungated_transfer</a>(<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(&<a href="aptos_token.md#0x4_aptos_token">aptos_token</a>.transfer_ref));
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_aptos_token_set_description"></a>
+
+## Function `set_description`
+
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_set_description">set_description</a>&lt;T: key&gt;(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="token.md#0x4_token">token</a>: <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, description: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_set_description">set_description</a>&lt;T: key&gt;(
+    creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    <a href="token.md#0x4_token">token</a>: Object&lt;T&gt;,
+    description: String,
+) <b>acquires</b> <a href="aptos_token.md#0x4_aptos_token_AptosCollection">AptosCollection</a>, <a href="aptos_token.md#0x4_aptos_token_AptosToken">AptosToken</a> {
+    <b>assert</b>!(
+        <a href="aptos_token.md#0x4_aptos_token_is_mutable_description">is_mutable_description</a>(<a href="token.md#0x4_token">token</a>),
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="aptos_token.md#0x4_aptos_token_EFIELD_NOT_MUTABLE">EFIELD_NOT_MUTABLE</a>),
+    );
+    <b>let</b> <a href="aptos_token.md#0x4_aptos_token">aptos_token</a> = <a href="aptos_token.md#0x4_aptos_token_authorized_borrow">authorized_borrow</a>(&<a href="token.md#0x4_token">token</a>, creator);
+    <a href="token.md#0x4_token_set_description">token::set_description</a>(<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(&<a href="aptos_token.md#0x4_aptos_token">aptos_token</a>.mutator_ref), description);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_aptos_token_set_name"></a>
+
+## Function `set_name`
+
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_set_name">set_name</a>&lt;T: key&gt;(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="token.md#0x4_token">token</a>: <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_set_name">set_name</a>&lt;T: key&gt;(
+    creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    <a href="token.md#0x4_token">token</a>: Object&lt;T&gt;,
+    name: String,
+) <b>acquires</b> <a href="aptos_token.md#0x4_aptos_token_AptosCollection">AptosCollection</a>, <a href="aptos_token.md#0x4_aptos_token_AptosToken">AptosToken</a> {
+    <b>assert</b>!(
+        <a href="aptos_token.md#0x4_aptos_token_is_mutable_name">is_mutable_name</a>(<a href="token.md#0x4_token">token</a>),
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="aptos_token.md#0x4_aptos_token_EFIELD_NOT_MUTABLE">EFIELD_NOT_MUTABLE</a>),
+    );
+    <b>let</b> <a href="aptos_token.md#0x4_aptos_token">aptos_token</a> = <a href="aptos_token.md#0x4_aptos_token_authorized_borrow">authorized_borrow</a>(&<a href="token.md#0x4_token">token</a>, creator);
+    <a href="token.md#0x4_token_set_name">token::set_name</a>(<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(&<a href="aptos_token.md#0x4_aptos_token">aptos_token</a>.mutator_ref), name);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_aptos_token_set_uri"></a>
+
+## Function `set_uri`
+
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_set_uri">set_uri</a>&lt;T: key&gt;(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="token.md#0x4_token">token</a>: <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, uri: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_set_uri">set_uri</a>&lt;T: key&gt;(
+    creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    <a href="token.md#0x4_token">token</a>: Object&lt;T&gt;,
+    uri: String,
+) <b>acquires</b> <a href="aptos_token.md#0x4_aptos_token_AptosCollection">AptosCollection</a>, <a href="aptos_token.md#0x4_aptos_token_AptosToken">AptosToken</a> {
+    <b>assert</b>!(
+        <a href="aptos_token.md#0x4_aptos_token_is_mutable_uri">is_mutable_uri</a>(<a href="token.md#0x4_token">token</a>),
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="aptos_token.md#0x4_aptos_token_EFIELD_NOT_MUTABLE">EFIELD_NOT_MUTABLE</a>),
+    );
+    <b>let</b> <a href="aptos_token.md#0x4_aptos_token">aptos_token</a> = <a href="aptos_token.md#0x4_aptos_token_authorized_borrow">authorized_borrow</a>(&<a href="token.md#0x4_token">token</a>, creator);
+    <a href="token.md#0x4_token_set_uri">token::set_uri</a>(<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(&<a href="aptos_token.md#0x4_aptos_token">aptos_token</a>.mutator_ref), uri);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_aptos_token_add_property"></a>
+
+## Function `add_property`
+
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_add_property">add_property</a>&lt;T: key&gt;(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="token.md#0x4_token">token</a>: <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, key: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, type: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, value: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_add_property">add_property</a>&lt;T: key&gt;(
+    creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    <a href="token.md#0x4_token">token</a>: Object&lt;T&gt;,
+    key: String,
+    type: String,
+    value: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+) <b>acquires</b> <a href="aptos_token.md#0x4_aptos_token_AptosCollection">AptosCollection</a>, <a href="aptos_token.md#0x4_aptos_token_AptosToken">AptosToken</a> {
+    <b>let</b> <a href="aptos_token.md#0x4_aptos_token">aptos_token</a> = <a href="aptos_token.md#0x4_aptos_token_authorized_borrow">authorized_borrow</a>(&<a href="token.md#0x4_token">token</a>, creator);
+    <b>assert</b>!(
+        <a href="aptos_token.md#0x4_aptos_token_are_properties_mutable">are_properties_mutable</a>(<a href="token.md#0x4_token">token</a>),
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="aptos_token.md#0x4_aptos_token_EPROPERTIES_NOT_MUTABLE">EPROPERTIES_NOT_MUTABLE</a>),
+    );
+
+    <a href="property_map.md#0x4_property_map_add">property_map::add</a>(&<a href="aptos_token.md#0x4_aptos_token">aptos_token</a>.property_mutator_ref, key, type, value);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_aptos_token_add_typed_property"></a>
+
+## Function `add_typed_property`
+
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_add_typed_property">add_typed_property</a>&lt;T: key, V: drop&gt;(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="token.md#0x4_token">token</a>: <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, key: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, value: V)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_add_typed_property">add_typed_property</a>&lt;T: key, V: drop&gt;(
+    creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    <a href="token.md#0x4_token">token</a>: Object&lt;T&gt;,
+    key: String,
+    value: V,
+) <b>acquires</b> <a href="aptos_token.md#0x4_aptos_token_AptosCollection">AptosCollection</a>, <a href="aptos_token.md#0x4_aptos_token_AptosToken">AptosToken</a> {
+    <b>let</b> <a href="aptos_token.md#0x4_aptos_token">aptos_token</a> = <a href="aptos_token.md#0x4_aptos_token_authorized_borrow">authorized_borrow</a>(&<a href="token.md#0x4_token">token</a>, creator);
+    <b>assert</b>!(
+        <a href="aptos_token.md#0x4_aptos_token_are_properties_mutable">are_properties_mutable</a>(<a href="token.md#0x4_token">token</a>),
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="aptos_token.md#0x4_aptos_token_EPROPERTIES_NOT_MUTABLE">EPROPERTIES_NOT_MUTABLE</a>),
+    );
+
+    <a href="property_map.md#0x4_property_map_add_typed">property_map::add_typed</a>(&<a href="aptos_token.md#0x4_aptos_token">aptos_token</a>.property_mutator_ref, key, value);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_aptos_token_remove_property"></a>
+
+## Function `remove_property`
+
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_remove_property">remove_property</a>&lt;T: key&gt;(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="token.md#0x4_token">token</a>: <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, key: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_remove_property">remove_property</a>&lt;T: key&gt;(
+    creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    <a href="token.md#0x4_token">token</a>: Object&lt;T&gt;,
+    key: String,
+) <b>acquires</b> <a href="aptos_token.md#0x4_aptos_token_AptosCollection">AptosCollection</a>, <a href="aptos_token.md#0x4_aptos_token_AptosToken">AptosToken</a> {
+    <b>let</b> <a href="aptos_token.md#0x4_aptos_token">aptos_token</a> = <a href="aptos_token.md#0x4_aptos_token_authorized_borrow">authorized_borrow</a>(&<a href="token.md#0x4_token">token</a>, creator);
+    <b>assert</b>!(
+        <a href="aptos_token.md#0x4_aptos_token_are_properties_mutable">are_properties_mutable</a>(<a href="token.md#0x4_token">token</a>),
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="aptos_token.md#0x4_aptos_token_EPROPERTIES_NOT_MUTABLE">EPROPERTIES_NOT_MUTABLE</a>),
+    );
+
+    <a href="property_map.md#0x4_property_map_remove">property_map::remove</a>(&<a href="aptos_token.md#0x4_aptos_token">aptos_token</a>.property_mutator_ref, &key);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_aptos_token_update_property"></a>
+
+## Function `update_property`
+
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_update_property">update_property</a>&lt;T: key&gt;(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="token.md#0x4_token">token</a>: <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, key: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, type: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, value: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_update_property">update_property</a>&lt;T: key&gt;(
+    creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    <a href="token.md#0x4_token">token</a>: Object&lt;T&gt;,
+    key: String,
+    type: String,
+    value: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+) <b>acquires</b> <a href="aptos_token.md#0x4_aptos_token_AptosCollection">AptosCollection</a>, <a href="aptos_token.md#0x4_aptos_token_AptosToken">AptosToken</a> {
+    <b>let</b> <a href="aptos_token.md#0x4_aptos_token">aptos_token</a> = <a href="aptos_token.md#0x4_aptos_token_authorized_borrow">authorized_borrow</a>(&<a href="token.md#0x4_token">token</a>, creator);
+    <b>assert</b>!(
+        <a href="aptos_token.md#0x4_aptos_token_are_properties_mutable">are_properties_mutable</a>(<a href="token.md#0x4_token">token</a>),
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="aptos_token.md#0x4_aptos_token_EPROPERTIES_NOT_MUTABLE">EPROPERTIES_NOT_MUTABLE</a>),
+    );
+
+    <a href="property_map.md#0x4_property_map_update">property_map::update</a>(&<a href="aptos_token.md#0x4_aptos_token">aptos_token</a>.property_mutator_ref, &key, type, value);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_aptos_token_update_typed_property"></a>
+
+## Function `update_typed_property`
+
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_update_typed_property">update_typed_property</a>&lt;T: key, V: drop&gt;(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="token.md#0x4_token">token</a>: <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, key: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, value: V)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_update_typed_property">update_typed_property</a>&lt;T: key, V: drop&gt;(
+    creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    <a href="token.md#0x4_token">token</a>: Object&lt;T&gt;,
+    key: String,
+    value: V,
+) <b>acquires</b> <a href="aptos_token.md#0x4_aptos_token_AptosCollection">AptosCollection</a>, <a href="aptos_token.md#0x4_aptos_token_AptosToken">AptosToken</a> {
+    <b>let</b> <a href="aptos_token.md#0x4_aptos_token">aptos_token</a> = <a href="aptos_token.md#0x4_aptos_token_authorized_borrow">authorized_borrow</a>(&<a href="token.md#0x4_token">token</a>, creator);
+    <b>assert</b>!(
+        <a href="aptos_token.md#0x4_aptos_token_are_properties_mutable">are_properties_mutable</a>(<a href="token.md#0x4_token">token</a>),
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="aptos_token.md#0x4_aptos_token_EPROPERTIES_NOT_MUTABLE">EPROPERTIES_NOT_MUTABLE</a>),
+    );
+
+    <a href="property_map.md#0x4_property_map_update_typed">property_map::update_typed</a>(&<a href="aptos_token.md#0x4_aptos_token">aptos_token</a>.property_mutator_ref, &key, value);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_aptos_token_collection_object"></a>
+
+## Function `collection_object`
+
+
+
+<pre><code><b>fun</b> <a href="aptos_token.md#0x4_aptos_token_collection_object">collection_object</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, name: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;<a href="aptos_token.md#0x4_aptos_token_AptosCollection">aptos_token::AptosCollection</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_collection_object">collection_object</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, name: &String): Object&lt;<a href="aptos_token.md#0x4_aptos_token_AptosCollection">AptosCollection</a>&gt; {
+    <b>let</b> collection_addr = <a href="collection.md#0x4_collection_create_collection_address">collection::create_collection_address</a>(&<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(creator), name);
+    <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_address_to_object">object::address_to_object</a>&lt;<a href="aptos_token.md#0x4_aptos_token_AptosCollection">AptosCollection</a>&gt;(collection_addr)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_aptos_token_borrow_collection"></a>
+
+## Function `borrow_collection`
+
+
+
+<pre><code><b>fun</b> <a href="aptos_token.md#0x4_aptos_token_borrow_collection">borrow_collection</a>&lt;T: key&gt;(<a href="token.md#0x4_token">token</a>: &<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): &<a href="aptos_token.md#0x4_aptos_token_AptosCollection">aptos_token::AptosCollection</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_borrow_collection">borrow_collection</a>&lt;T: key&gt;(<a href="token.md#0x4_token">token</a>: &Object&lt;T&gt;): &<a href="aptos_token.md#0x4_aptos_token_AptosCollection">AptosCollection</a> {
+    <b>let</b> collection_address = <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_object_address">object::object_address</a>(<a href="token.md#0x4_token">token</a>);
+    <b>assert</b>!(
+        <b>exists</b>&lt;<a href="aptos_token.md#0x4_aptos_token_AptosCollection">AptosCollection</a>&gt;(collection_address),
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="aptos_token.md#0x4_aptos_token_ECOLLECTION_DOES_NOT_EXIST">ECOLLECTION_DOES_NOT_EXIST</a>),
+    );
+    <b>borrow_global</b>&lt;<a href="aptos_token.md#0x4_aptos_token_AptosCollection">AptosCollection</a>&gt;(collection_address)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_aptos_token_is_mutable_collection_description"></a>
+
+## Function `is_mutable_collection_description`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_is_mutable_collection_description">is_mutable_collection_description</a>&lt;T: key&gt;(<a href="collection.md#0x4_collection">collection</a>: <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_is_mutable_collection_description">is_mutable_collection_description</a>&lt;T: key&gt;(
+    <a href="collection.md#0x4_collection">collection</a>: Object&lt;T&gt;,
+): bool <b>acquires</b> <a href="aptos_token.md#0x4_aptos_token_AptosCollection">AptosCollection</a> {
+    <a href="aptos_token.md#0x4_aptos_token_borrow_collection">borrow_collection</a>(&<a href="collection.md#0x4_collection">collection</a>).mutable_description
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_aptos_token_is_mutable_collection_royalty"></a>
+
+## Function `is_mutable_collection_royalty`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_is_mutable_collection_royalty">is_mutable_collection_royalty</a>&lt;T: key&gt;(<a href="collection.md#0x4_collection">collection</a>: <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_is_mutable_collection_royalty">is_mutable_collection_royalty</a>&lt;T: key&gt;(
+    <a href="collection.md#0x4_collection">collection</a>: Object&lt;T&gt;,
+): bool <b>acquires</b> <a href="aptos_token.md#0x4_aptos_token_AptosCollection">AptosCollection</a> {
+    <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&<a href="aptos_token.md#0x4_aptos_token_borrow_collection">borrow_collection</a>(&<a href="collection.md#0x4_collection">collection</a>).royalty_mutator_ref)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_aptos_token_is_mutable_collection_uri"></a>
+
+## Function `is_mutable_collection_uri`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_is_mutable_collection_uri">is_mutable_collection_uri</a>&lt;T: key&gt;(<a href="collection.md#0x4_collection">collection</a>: <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_is_mutable_collection_uri">is_mutable_collection_uri</a>&lt;T: key&gt;(
+    <a href="collection.md#0x4_collection">collection</a>: Object&lt;T&gt;,
+): bool <b>acquires</b> <a href="aptos_token.md#0x4_aptos_token_AptosCollection">AptosCollection</a> {
+    <a href="aptos_token.md#0x4_aptos_token_borrow_collection">borrow_collection</a>(&<a href="collection.md#0x4_collection">collection</a>).mutable_uri
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_aptos_token_is_mutable_collection_token_description"></a>
+
+## Function `is_mutable_collection_token_description`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_is_mutable_collection_token_description">is_mutable_collection_token_description</a>&lt;T: key&gt;(<a href="collection.md#0x4_collection">collection</a>: <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_is_mutable_collection_token_description">is_mutable_collection_token_description</a>&lt;T: key&gt;(
+    <a href="collection.md#0x4_collection">collection</a>: Object&lt;T&gt;,
+): bool <b>acquires</b> <a href="aptos_token.md#0x4_aptos_token_AptosCollection">AptosCollection</a> {
+    <a href="aptos_token.md#0x4_aptos_token_borrow_collection">borrow_collection</a>(&<a href="collection.md#0x4_collection">collection</a>).mutable_token_description
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_aptos_token_is_mutable_collection_token_name"></a>
+
+## Function `is_mutable_collection_token_name`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_is_mutable_collection_token_name">is_mutable_collection_token_name</a>&lt;T: key&gt;(<a href="collection.md#0x4_collection">collection</a>: <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_is_mutable_collection_token_name">is_mutable_collection_token_name</a>&lt;T: key&gt;(
+    <a href="collection.md#0x4_collection">collection</a>: Object&lt;T&gt;,
+): bool <b>acquires</b> <a href="aptos_token.md#0x4_aptos_token_AptosCollection">AptosCollection</a> {
+    <a href="aptos_token.md#0x4_aptos_token_borrow_collection">borrow_collection</a>(&<a href="collection.md#0x4_collection">collection</a>).mutable_token_name
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_aptos_token_is_mutable_collection_token_uri"></a>
+
+## Function `is_mutable_collection_token_uri`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_is_mutable_collection_token_uri">is_mutable_collection_token_uri</a>&lt;T: key&gt;(<a href="collection.md#0x4_collection">collection</a>: <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_is_mutable_collection_token_uri">is_mutable_collection_token_uri</a>&lt;T: key&gt;(
+    <a href="collection.md#0x4_collection">collection</a>: Object&lt;T&gt;,
+): bool <b>acquires</b> <a href="aptos_token.md#0x4_aptos_token_AptosCollection">AptosCollection</a> {
+    <a href="aptos_token.md#0x4_aptos_token_borrow_collection">borrow_collection</a>(&<a href="collection.md#0x4_collection">collection</a>).mutable_token_uri
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_aptos_token_is_mutable_collection_token_properties"></a>
+
+## Function `is_mutable_collection_token_properties`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_is_mutable_collection_token_properties">is_mutable_collection_token_properties</a>&lt;T: key&gt;(<a href="collection.md#0x4_collection">collection</a>: <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_is_mutable_collection_token_properties">is_mutable_collection_token_properties</a>&lt;T: key&gt;(
+    <a href="collection.md#0x4_collection">collection</a>: Object&lt;T&gt;,
+): bool <b>acquires</b> <a href="aptos_token.md#0x4_aptos_token_AptosCollection">AptosCollection</a> {
+    <a href="aptos_token.md#0x4_aptos_token_borrow_collection">borrow_collection</a>(&<a href="collection.md#0x4_collection">collection</a>).mutable_token_properties
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_aptos_token_are_collection_tokens_burnable"></a>
+
+## Function `are_collection_tokens_burnable`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_are_collection_tokens_burnable">are_collection_tokens_burnable</a>&lt;T: key&gt;(<a href="collection.md#0x4_collection">collection</a>: <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_are_collection_tokens_burnable">are_collection_tokens_burnable</a>&lt;T: key&gt;(
+    <a href="collection.md#0x4_collection">collection</a>: Object&lt;T&gt;,
+): bool <b>acquires</b> <a href="aptos_token.md#0x4_aptos_token_AptosCollection">AptosCollection</a> {
+    <a href="aptos_token.md#0x4_aptos_token_borrow_collection">borrow_collection</a>(&<a href="collection.md#0x4_collection">collection</a>).tokens_burnable_by_creator
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_aptos_token_are_collection_tokens_freezable"></a>
+
+## Function `are_collection_tokens_freezable`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_are_collection_tokens_freezable">are_collection_tokens_freezable</a>&lt;T: key&gt;(<a href="collection.md#0x4_collection">collection</a>: <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_are_collection_tokens_freezable">are_collection_tokens_freezable</a>&lt;T: key&gt;(
+    <a href="collection.md#0x4_collection">collection</a>: Object&lt;T&gt;,
+): bool <b>acquires</b> <a href="aptos_token.md#0x4_aptos_token_AptosCollection">AptosCollection</a> {
+    <a href="aptos_token.md#0x4_aptos_token_borrow_collection">borrow_collection</a>(&<a href="collection.md#0x4_collection">collection</a>).tokens_freezable_by_creator
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_aptos_token_authorized_borrow_collection"></a>
+
+## Function `authorized_borrow_collection`
+
+
+
+<pre><code><b>fun</b> <a href="aptos_token.md#0x4_aptos_token_authorized_borrow_collection">authorized_borrow_collection</a>&lt;T: key&gt;(<a href="collection.md#0x4_collection">collection</a>: &<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>): &<a href="aptos_token.md#0x4_aptos_token_AptosCollection">aptos_token::AptosCollection</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_authorized_borrow_collection">authorized_borrow_collection</a>&lt;T: key&gt;(<a href="collection.md#0x4_collection">collection</a>: &Object&lt;T&gt;, creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>): &<a href="aptos_token.md#0x4_aptos_token_AptosCollection">AptosCollection</a> {
+    <b>let</b> collection_address = <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_object_address">object::object_address</a>(<a href="collection.md#0x4_collection">collection</a>);
+    <b>assert</b>!(
+        <b>exists</b>&lt;<a href="aptos_token.md#0x4_aptos_token_AptosCollection">AptosCollection</a>&gt;(collection_address),
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="aptos_token.md#0x4_aptos_token_ECOLLECTION_DOES_NOT_EXIST">ECOLLECTION_DOES_NOT_EXIST</a>),
+    );
+    <b>assert</b>!(
+        <a href="collection.md#0x4_collection_creator">collection::creator</a>(*<a href="collection.md#0x4_collection">collection</a>) == <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(creator),
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="aptos_token.md#0x4_aptos_token_ENOT_CREATOR">ENOT_CREATOR</a>),
+    );
+    <b>borrow_global</b>&lt;<a href="aptos_token.md#0x4_aptos_token_AptosCollection">AptosCollection</a>&gt;(collection_address)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_aptos_token_set_collection_description"></a>
+
+## Function `set_collection_description`
+
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_set_collection_description">set_collection_description</a>&lt;T: key&gt;(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="collection.md#0x4_collection">collection</a>: <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, description: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_set_collection_description">set_collection_description</a>&lt;T: key&gt;(
+    creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    <a href="collection.md#0x4_collection">collection</a>: Object&lt;T&gt;,
+    description: String,
+) <b>acquires</b> <a href="aptos_token.md#0x4_aptos_token_AptosCollection">AptosCollection</a> {
+    <b>let</b> aptos_collection = <a href="aptos_token.md#0x4_aptos_token_authorized_borrow_collection">authorized_borrow_collection</a>(&<a href="collection.md#0x4_collection">collection</a>, creator);
+    <b>assert</b>!(
+        aptos_collection.mutable_description,
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="aptos_token.md#0x4_aptos_token_EFIELD_NOT_MUTABLE">EFIELD_NOT_MUTABLE</a>),
+    );
+    <a href="collection.md#0x4_collection_set_description">collection::set_description</a>(<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(&aptos_collection.mutator_ref), description);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_aptos_token_set_collection_royalties"></a>
+
+## Function `set_collection_royalties`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_set_collection_royalties">set_collection_royalties</a>&lt;T: key&gt;(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="collection.md#0x4_collection">collection</a>: <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, <a href="royalty.md#0x4_royalty">royalty</a>: <a href="royalty.md#0x4_royalty_Royalty">royalty::Royalty</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_set_collection_royalties">set_collection_royalties</a>&lt;T: key&gt;(
+    creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    <a href="collection.md#0x4_collection">collection</a>: Object&lt;T&gt;,
+    <a href="royalty.md#0x4_royalty">royalty</a>: <a href="royalty.md#0x4_royalty_Royalty">royalty::Royalty</a>,
+) <b>acquires</b> <a href="aptos_token.md#0x4_aptos_token_AptosCollection">AptosCollection</a> {
+    <b>let</b> aptos_collection = <a href="aptos_token.md#0x4_aptos_token_authorized_borrow_collection">authorized_borrow_collection</a>(&<a href="collection.md#0x4_collection">collection</a>, creator);
+    <b>assert</b>!(
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&aptos_collection.royalty_mutator_ref),
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="aptos_token.md#0x4_aptos_token_EFIELD_NOT_MUTABLE">EFIELD_NOT_MUTABLE</a>),
+    );
+    <a href="royalty.md#0x4_royalty_update">royalty::update</a>(<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(&aptos_collection.royalty_mutator_ref), <a href="royalty.md#0x4_royalty">royalty</a>);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_aptos_token_set_collection_royalties_call"></a>
+
+## Function `set_collection_royalties_call`
+
+
+
+<pre><code>entry <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_set_collection_royalties_call">set_collection_royalties_call</a>&lt;T: key&gt;(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="collection.md#0x4_collection">collection</a>: <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, royalty_numerator: u64, royalty_denominator: u64, payee_address: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>entry <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_set_collection_royalties_call">set_collection_royalties_call</a>&lt;T: key&gt;(
+    creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    <a href="collection.md#0x4_collection">collection</a>: Object&lt;T&gt;,
+    royalty_numerator: u64,
+    royalty_denominator: u64,
+    payee_address: <b>address</b>,
+) <b>acquires</b> <a href="aptos_token.md#0x4_aptos_token_AptosCollection">AptosCollection</a> {
+    <b>let</b> <a href="royalty.md#0x4_royalty">royalty</a> = <a href="royalty.md#0x4_royalty_create">royalty::create</a>(royalty_numerator, royalty_denominator, payee_address);
+    <a href="aptos_token.md#0x4_aptos_token_set_collection_royalties">set_collection_royalties</a>(creator, <a href="collection.md#0x4_collection">collection</a>, <a href="royalty.md#0x4_royalty">royalty</a>);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_aptos_token_set_collection_uri"></a>
+
+## Function `set_collection_uri`
+
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_set_collection_uri">set_collection_uri</a>&lt;T: key&gt;(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="collection.md#0x4_collection">collection</a>: <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, uri: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="aptos_token.md#0x4_aptos_token_set_collection_uri">set_collection_uri</a>&lt;T: key&gt;(
+    creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    <a href="collection.md#0x4_collection">collection</a>: Object&lt;T&gt;,
+    uri: String,
+) <b>acquires</b> <a href="aptos_token.md#0x4_aptos_token_AptosCollection">AptosCollection</a> {
+    <b>let</b> aptos_collection = <a href="aptos_token.md#0x4_aptos_token_authorized_borrow_collection">authorized_borrow_collection</a>(&<a href="collection.md#0x4_collection">collection</a>, creator);
+    <b>assert</b>!(
+        aptos_collection.mutable_uri,
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="aptos_token.md#0x4_aptos_token_EFIELD_NOT_MUTABLE">EFIELD_NOT_MUTABLE</a>),
+    );
+    <a href="collection.md#0x4_collection_set_uri">collection::set_uri</a>(<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(&aptos_collection.mutator_ref), uri);
+}
+</code></pre>
+
+
+
+</details>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-token-objects/tests/compiler-v2-doc/collection.md b/aptos-move/framework/aptos-token-objects/tests/compiler-v2-doc/collection.md
new file mode 100644
index 0000000000000..1f9f1547c5729
--- /dev/null
+++ b/aptos-move/framework/aptos-token-objects/tests/compiler-v2-doc/collection.md
@@ -0,0 +1,1699 @@
+
+<a id="0x4_collection"></a>
+
+# Module `0x4::collection`
+
+This defines an object-based Collection. A collection acts as a set organizer for a group of
+tokens. This includes aspects such as a general description, project URI, name, and may contain
+other useful generalizations across this set of tokens.
+
+Being built upon objects enables collections to be relatively flexible. As core primitives it
+supports:
+* Common fields: name, uri, description, creator
+* MutatorRef leaving mutability configuration to a higher level component
+* Addressed by a global identifier of creator's address and collection name, thus collections
+cannot be deleted as a restriction of the object model.
+* Optional support for collection-wide royalties
+* Optional support for tracking of supply with events on mint or burn
+
+TODO:
+* Consider supporting changing the name of the collection with the MutatorRef. This would
+require adding the field original_name.
+* Consider supporting changing the aspects of supply with the MutatorRef.
+* Add aggregator support when added to framework
+
+
+-  [Resource `Collection`](#0x4_collection_Collection)
+-  [Struct `MutatorRef`](#0x4_collection_MutatorRef)
+-  [Struct `MutationEvent`](#0x4_collection_MutationEvent)
+-  [Struct `Mutation`](#0x4_collection_Mutation)
+-  [Resource `FixedSupply`](#0x4_collection_FixedSupply)
+-  [Resource `UnlimitedSupply`](#0x4_collection_UnlimitedSupply)
+-  [Resource `ConcurrentSupply`](#0x4_collection_ConcurrentSupply)
+-  [Struct `BurnEvent`](#0x4_collection_BurnEvent)
+-  [Struct `MintEvent`](#0x4_collection_MintEvent)
+-  [Struct `Burn`](#0x4_collection_Burn)
+-  [Struct `Mint`](#0x4_collection_Mint)
+-  [Struct `ConcurrentBurnEvent`](#0x4_collection_ConcurrentBurnEvent)
+-  [Struct `ConcurrentMintEvent`](#0x4_collection_ConcurrentMintEvent)
+-  [Struct `SetMaxSupply`](#0x4_collection_SetMaxSupply)
+-  [Constants](#@Constants_0)
+-  [Function `create_fixed_collection`](#0x4_collection_create_fixed_collection)
+-  [Function `create_unlimited_collection`](#0x4_collection_create_unlimited_collection)
+-  [Function `create_untracked_collection`](#0x4_collection_create_untracked_collection)
+-  [Function `create_collection_internal`](#0x4_collection_create_collection_internal)
+-  [Function `create_collection_address`](#0x4_collection_create_collection_address)
+-  [Function `create_collection_seed`](#0x4_collection_create_collection_seed)
+-  [Function `increment_supply`](#0x4_collection_increment_supply)
+-  [Function `decrement_supply`](#0x4_collection_decrement_supply)
+-  [Function `generate_mutator_ref`](#0x4_collection_generate_mutator_ref)
+-  [Function `upgrade_to_concurrent`](#0x4_collection_upgrade_to_concurrent)
+-  [Function `check_collection_exists`](#0x4_collection_check_collection_exists)
+-  [Function `borrow`](#0x4_collection_borrow)
+-  [Function `count`](#0x4_collection_count)
+-  [Function `creator`](#0x4_collection_creator)
+-  [Function `description`](#0x4_collection_description)
+-  [Function `name`](#0x4_collection_name)
+-  [Function `uri`](#0x4_collection_uri)
+-  [Function `borrow_mut`](#0x4_collection_borrow_mut)
+-  [Function `set_name`](#0x4_collection_set_name)
+-  [Function `set_description`](#0x4_collection_set_description)
+-  [Function `set_uri`](#0x4_collection_set_uri)
+-  [Function `set_max_supply`](#0x4_collection_set_max_supply)
+
+
+<pre><code><b>use</b> <a href="../../../aptos-framework/tests/compiler-v2-doc/aggregator_v2.md#0x1_aggregator_v2">0x1::aggregator_v2</a>;
+<b>use</b> <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event">0x1::event</a>;
+<b>use</b> <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features">0x1::features</a>;
+<b>use</b> <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">0x1::object</a>;
+<b>use</b> <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option">0x1::option</a>;
+<b>use</b> <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">0x1::signer</a>;
+<b>use</b> <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string">0x1::string</a>;
+<b>use</b> <a href="royalty.md#0x4_royalty">0x4::royalty</a>;
+</code></pre>
+
+
+
+<a id="0x4_collection_Collection"></a>
+
+## Resource `Collection`
+
+Represents the common fields for a collection.
+
+
+<pre><code>#[resource_group_member(#[group = <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_ObjectGroup">0x1::object::ObjectGroup</a>])]
+<b>struct</b> <a href="collection.md#0x4_collection_Collection">Collection</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>creator: <b>address</b></code>
+</dt>
+<dd>
+ The creator of this collection.
+</dd>
+<dt>
+<code>description: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+ A brief description of the collection.
+</dd>
+<dt>
+<code>name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+ An optional categorization of similar token.
+</dd>
+<dt>
+<code>uri: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+ The Uniform Resource Identifier (uri) pointing to the JSON file stored in off-chain
+ storage; the URL length will likely need a maximum any suggestions?
+</dd>
+<dt>
+<code>mutation_events: <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="collection.md#0x4_collection_MutationEvent">collection::MutationEvent</a>&gt;</code>
+</dt>
+<dd>
+ Emitted upon any mutation of the collection.
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x4_collection_MutatorRef"></a>
+
+## Struct `MutatorRef`
+
+This enables mutating description and URI by higher level services.
+
+
+<pre><code><b>struct</b> <a href="collection.md#0x4_collection_MutatorRef">MutatorRef</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>self: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x4_collection_MutationEvent"></a>
+
+## Struct `MutationEvent`
+
+Contains the mutated fields name. This makes the life of indexers easier, so that they can
+directly understand the behavior in a writeset.
+
+
+<pre><code><b>struct</b> <a href="collection.md#0x4_collection_MutationEvent">MutationEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>mutated_field_name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x4_collection_Mutation"></a>
+
+## Struct `Mutation`
+
+Contains the mutated fields name. This makes the life of indexers easier, so that they can
+directly understand the behavior in a writeset.
+
+
+<pre><code>#[<a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event">event</a>]
+<b>struct</b> <a href="collection.md#0x4_collection_Mutation">Mutation</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>mutated_field_name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code><a href="collection.md#0x4_collection">collection</a>: <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;<a href="collection.md#0x4_collection_Collection">collection::Collection</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>old_value: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>new_value: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x4_collection_FixedSupply"></a>
+
+## Resource `FixedSupply`
+
+Fixed supply tracker, this is useful for ensuring that a limited number of tokens are minted.
+and adding events and supply tracking to a collection.
+
+
+<pre><code>#[resource_group_member(#[group = <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_ObjectGroup">0x1::object::ObjectGroup</a>])]
+<b>struct</b> <a href="collection.md#0x4_collection_FixedSupply">FixedSupply</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>current_supply: u64</code>
+</dt>
+<dd>
+ Total minted - total burned
+</dd>
+<dt>
+<code>max_supply: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>total_minted: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>burn_events: <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="collection.md#0x4_collection_BurnEvent">collection::BurnEvent</a>&gt;</code>
+</dt>
+<dd>
+ Emitted upon burning a Token.
+</dd>
+<dt>
+<code>mint_events: <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="collection.md#0x4_collection_MintEvent">collection::MintEvent</a>&gt;</code>
+</dt>
+<dd>
+ Emitted upon minting an Token.
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x4_collection_UnlimitedSupply"></a>
+
+## Resource `UnlimitedSupply`
+
+Unlimited supply tracker, this is useful for adding events and supply tracking to a collection.
+
+
+<pre><code>#[resource_group_member(#[group = <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_ObjectGroup">0x1::object::ObjectGroup</a>])]
+<b>struct</b> <a href="collection.md#0x4_collection_UnlimitedSupply">UnlimitedSupply</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>current_supply: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>total_minted: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>burn_events: <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="collection.md#0x4_collection_BurnEvent">collection::BurnEvent</a>&gt;</code>
+</dt>
+<dd>
+ Emitted upon burning a Token.
+</dd>
+<dt>
+<code>mint_events: <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="collection.md#0x4_collection_MintEvent">collection::MintEvent</a>&gt;</code>
+</dt>
+<dd>
+ Emitted upon minting an Token.
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x4_collection_ConcurrentSupply"></a>
+
+## Resource `ConcurrentSupply`
+
+Supply tracker, useful for tracking amount of issued tokens.
+If max_value is not set to U64_MAX, this ensures that a limited number of tokens are minted.
+
+
+<pre><code>#[resource_group_member(#[group = <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_ObjectGroup">0x1::object::ObjectGroup</a>])]
+<b>struct</b> <a href="collection.md#0x4_collection_ConcurrentSupply">ConcurrentSupply</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>current_supply: <a href="../../../aptos-framework/tests/compiler-v2-doc/aggregator_v2.md#0x1_aggregator_v2_Aggregator">aggregator_v2::Aggregator</a>&lt;u64&gt;</code>
+</dt>
+<dd>
+ Total minted - total burned
+</dd>
+<dt>
+<code>total_minted: <a href="../../../aptos-framework/tests/compiler-v2-doc/aggregator_v2.md#0x1_aggregator_v2_Aggregator">aggregator_v2::Aggregator</a>&lt;u64&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x4_collection_BurnEvent"></a>
+
+## Struct `BurnEvent`
+
+
+
+<pre><code><b>struct</b> <a href="collection.md#0x4_collection_BurnEvent">BurnEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>index: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code><a href="token.md#0x4_token">token</a>: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x4_collection_MintEvent"></a>
+
+## Struct `MintEvent`
+
+
+
+<pre><code><b>struct</b> <a href="collection.md#0x4_collection_MintEvent">MintEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>index: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code><a href="token.md#0x4_token">token</a>: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x4_collection_Burn"></a>
+
+## Struct `Burn`
+
+
+
+<pre><code>#[<a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event">event</a>]
+<b>struct</b> <a href="collection.md#0x4_collection_Burn">Burn</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code><a href="collection.md#0x4_collection">collection</a>: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>index: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code><a href="token.md#0x4_token">token</a>: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>previous_owner: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x4_collection_Mint"></a>
+
+## Struct `Mint`
+
+
+
+<pre><code>#[<a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event">event</a>]
+<b>struct</b> <a href="collection.md#0x4_collection_Mint">Mint</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code><a href="collection.md#0x4_collection">collection</a>: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>index: <a href="../../../aptos-framework/tests/compiler-v2-doc/aggregator_v2.md#0x1_aggregator_v2_AggregatorSnapshot">aggregator_v2::AggregatorSnapshot</a>&lt;u64&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code><a href="token.md#0x4_token">token</a>: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x4_collection_ConcurrentBurnEvent"></a>
+
+## Struct `ConcurrentBurnEvent`
+
+
+
+<pre><code>#[<a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event">event</a>]
+#[deprecated]
+<b>struct</b> <a href="collection.md#0x4_collection_ConcurrentBurnEvent">ConcurrentBurnEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>collection_addr: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>index: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code><a href="token.md#0x4_token">token</a>: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x4_collection_ConcurrentMintEvent"></a>
+
+## Struct `ConcurrentMintEvent`
+
+
+
+<pre><code>#[<a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event">event</a>]
+#[deprecated]
+<b>struct</b> <a href="collection.md#0x4_collection_ConcurrentMintEvent">ConcurrentMintEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>collection_addr: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>index: <a href="../../../aptos-framework/tests/compiler-v2-doc/aggregator_v2.md#0x1_aggregator_v2_AggregatorSnapshot">aggregator_v2::AggregatorSnapshot</a>&lt;u64&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code><a href="token.md#0x4_token">token</a>: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x4_collection_SetMaxSupply"></a>
+
+## Struct `SetMaxSupply`
+
+
+
+<pre><code>#[<a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event">event</a>]
+<b>struct</b> <a href="collection.md#0x4_collection_SetMaxSupply">SetMaxSupply</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code><a href="collection.md#0x4_collection">collection</a>: <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;<a href="collection.md#0x4_collection_Collection">collection::Collection</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>old_max_supply: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>new_max_supply: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x4_collection_MAX_U64"></a>
+
+
+
+<pre><code><b>const</b> <a href="collection.md#0x4_collection_MAX_U64">MAX_U64</a>: u64 = 18446744073709551615;
+</code></pre>
+
+
+
+<a id="0x4_collection_EURI_TOO_LONG"></a>
+
+The URI is over the maximum length
+
+
+<pre><code><b>const</b> <a href="collection.md#0x4_collection_EURI_TOO_LONG">EURI_TOO_LONG</a>: u64 = 4;
+</code></pre>
+
+
+
+<a id="0x4_collection_MAX_URI_LENGTH"></a>
+
+
+
+<pre><code><b>const</b> <a href="collection.md#0x4_collection_MAX_URI_LENGTH">MAX_URI_LENGTH</a>: u64 = 512;
+</code></pre>
+
+
+
+<a id="0x4_collection_EALREADY_CONCURRENT"></a>
+
+Tried upgrading collection to concurrent, but collection is already concurrent
+
+
+<pre><code><b>const</b> <a href="collection.md#0x4_collection_EALREADY_CONCURRENT">EALREADY_CONCURRENT</a>: u64 = 8;
+</code></pre>
+
+
+
+<a id="0x4_collection_ECOLLECTION_DOES_NOT_EXIST"></a>
+
+The collection does not exist
+
+
+<pre><code><b>const</b> <a href="collection.md#0x4_collection_ECOLLECTION_DOES_NOT_EXIST">ECOLLECTION_DOES_NOT_EXIST</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x4_collection_ECOLLECTION_NAME_TOO_LONG"></a>
+
+The collection name is over the maximum length
+
+
+<pre><code><b>const</b> <a href="collection.md#0x4_collection_ECOLLECTION_NAME_TOO_LONG">ECOLLECTION_NAME_TOO_LONG</a>: u64 = 3;
+</code></pre>
+
+
+
+<a id="0x4_collection_ECOLLECTION_SUPPLY_EXCEEDED"></a>
+
+The collection has reached its supply and no more tokens can be minted, unless some are burned
+
+
+<pre><code><b>const</b> <a href="collection.md#0x4_collection_ECOLLECTION_SUPPLY_EXCEEDED">ECOLLECTION_SUPPLY_EXCEEDED</a>: u64 = 2;
+</code></pre>
+
+
+
+<a id="0x4_collection_ECONCURRENT_NOT_ENABLED"></a>
+
+Concurrent feature flag is not yet enabled, so the function cannot be performed
+
+
+<pre><code><b>const</b> <a href="collection.md#0x4_collection_ECONCURRENT_NOT_ENABLED">ECONCURRENT_NOT_ENABLED</a>: u64 = 7;
+</code></pre>
+
+
+
+<a id="0x4_collection_EDESCRIPTION_TOO_LONG"></a>
+
+The description is over the maximum length
+
+
+<pre><code><b>const</b> <a href="collection.md#0x4_collection_EDESCRIPTION_TOO_LONG">EDESCRIPTION_TOO_LONG</a>: u64 = 5;
+</code></pre>
+
+
+
+<a id="0x4_collection_EINVALID_MAX_SUPPLY"></a>
+
+The new max supply cannot be less than the current supply
+
+
+<pre><code><b>const</b> <a href="collection.md#0x4_collection_EINVALID_MAX_SUPPLY">EINVALID_MAX_SUPPLY</a>: u64 = 9;
+</code></pre>
+
+
+
+<a id="0x4_collection_EMAX_SUPPLY_CANNOT_BE_ZERO"></a>
+
+The max supply must be positive
+
+
+<pre><code><b>const</b> <a href="collection.md#0x4_collection_EMAX_SUPPLY_CANNOT_BE_ZERO">EMAX_SUPPLY_CANNOT_BE_ZERO</a>: u64 = 6;
+</code></pre>
+
+
+
+<a id="0x4_collection_ENO_MAX_SUPPLY_IN_COLLECTION"></a>
+
+The collection does not have a max supply
+
+
+<pre><code><b>const</b> <a href="collection.md#0x4_collection_ENO_MAX_SUPPLY_IN_COLLECTION">ENO_MAX_SUPPLY_IN_COLLECTION</a>: u64 = 10;
+</code></pre>
+
+
+
+<a id="0x4_collection_MAX_COLLECTION_NAME_LENGTH"></a>
+
+
+
+<pre><code><b>const</b> <a href="collection.md#0x4_collection_MAX_COLLECTION_NAME_LENGTH">MAX_COLLECTION_NAME_LENGTH</a>: u64 = 128;
+</code></pre>
+
+
+
+<a id="0x4_collection_MAX_DESCRIPTION_LENGTH"></a>
+
+
+
+<pre><code><b>const</b> <a href="collection.md#0x4_collection_MAX_DESCRIPTION_LENGTH">MAX_DESCRIPTION_LENGTH</a>: u64 = 2048;
+</code></pre>
+
+
+
+<a id="0x4_collection_create_fixed_collection"></a>
+
+## Function `create_fixed_collection`
+
+Creates a fixed-sized collection, or a collection that supports a fixed amount of tokens.
+This is useful to create a guaranteed, limited supply on-chain digital asset. For example,
+a collection 1111 vicious vipers. Note, creating restrictions such as upward limits results
+in data structures that prevent Aptos from parallelizing mints of this collection type.
+Beyond that, it adds supply tracking with events.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="collection.md#0x4_collection_create_fixed_collection">create_fixed_collection</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, description: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, max_supply: u64, name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, <a href="royalty.md#0x4_royalty">royalty</a>: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="royalty.md#0x4_royalty_Royalty">royalty::Royalty</a>&gt;, uri: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="collection.md#0x4_collection_create_fixed_collection">create_fixed_collection</a>(
+    creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    description: String,
+    max_supply: u64,
+    name: String,
+    <a href="royalty.md#0x4_royalty">royalty</a>: Option&lt;Royalty&gt;,
+    uri: String,
+): ConstructorRef {
+    <b>assert</b>!(max_supply != 0, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="collection.md#0x4_collection_EMAX_SUPPLY_CANNOT_BE_ZERO">EMAX_SUPPLY_CANNOT_BE_ZERO</a>));
+    <b>let</b> collection_seed = <a href="collection.md#0x4_collection_create_collection_seed">create_collection_seed</a>(&name);
+    <b>let</b> constructor_ref = <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_create_named_object">object::create_named_object</a>(creator, collection_seed);
+
+    <b>let</b> supply = <a href="collection.md#0x4_collection_ConcurrentSupply">ConcurrentSupply</a> {
+        current_supply: <a href="../../../aptos-framework/tests/compiler-v2-doc/aggregator_v2.md#0x1_aggregator_v2_create_aggregator">aggregator_v2::create_aggregator</a>(max_supply),
+        total_minted: <a href="../../../aptos-framework/tests/compiler-v2-doc/aggregator_v2.md#0x1_aggregator_v2_create_unbounded_aggregator">aggregator_v2::create_unbounded_aggregator</a>(),
+    };
+
+    <a href="collection.md#0x4_collection_create_collection_internal">create_collection_internal</a>(
+        creator,
+        constructor_ref,
+        description,
+        name,
+        <a href="royalty.md#0x4_royalty">royalty</a>,
+        uri,
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(supply),
+    )
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_collection_create_unlimited_collection"></a>
+
+## Function `create_unlimited_collection`
+
+Creates an unlimited collection. This has support for supply tracking but does not limit
+the supply of tokens.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="collection.md#0x4_collection_create_unlimited_collection">create_unlimited_collection</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, description: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, <a href="royalty.md#0x4_royalty">royalty</a>: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="royalty.md#0x4_royalty_Royalty">royalty::Royalty</a>&gt;, uri: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="collection.md#0x4_collection_create_unlimited_collection">create_unlimited_collection</a>(
+    creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    description: String,
+    name: String,
+    <a href="royalty.md#0x4_royalty">royalty</a>: Option&lt;Royalty&gt;,
+    uri: String,
+): ConstructorRef {
+    <b>let</b> collection_seed = <a href="collection.md#0x4_collection_create_collection_seed">create_collection_seed</a>(&name);
+    <b>let</b> constructor_ref = <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_create_named_object">object::create_named_object</a>(creator, collection_seed);
+
+    <b>let</b> supply = <a href="collection.md#0x4_collection_ConcurrentSupply">ConcurrentSupply</a> {
+        current_supply: <a href="../../../aptos-framework/tests/compiler-v2-doc/aggregator_v2.md#0x1_aggregator_v2_create_unbounded_aggregator">aggregator_v2::create_unbounded_aggregator</a>(),
+        total_minted: <a href="../../../aptos-framework/tests/compiler-v2-doc/aggregator_v2.md#0x1_aggregator_v2_create_unbounded_aggregator">aggregator_v2::create_unbounded_aggregator</a>(),
+    };
+
+    <a href="collection.md#0x4_collection_create_collection_internal">create_collection_internal</a>(
+        creator,
+        constructor_ref,
+        description,
+        name,
+        <a href="royalty.md#0x4_royalty">royalty</a>,
+        uri,
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(supply),
+    )
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_collection_create_untracked_collection"></a>
+
+## Function `create_untracked_collection`
+
+Creates an untracked collection, or a collection that supports an arbitrary amount of
+tokens. This is useful for mass airdrops that fully leverage Aptos parallelization.
+TODO: Hide this until we bring back meaningful way to enforce burns
+
+
+<pre><code><b>fun</b> <a href="collection.md#0x4_collection_create_untracked_collection">create_untracked_collection</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, description: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, <a href="royalty.md#0x4_royalty">royalty</a>: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="royalty.md#0x4_royalty_Royalty">royalty::Royalty</a>&gt;, uri: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="collection.md#0x4_collection_create_untracked_collection">create_untracked_collection</a>(
+    creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    description: String,
+    name: String,
+    <a href="royalty.md#0x4_royalty">royalty</a>: Option&lt;Royalty&gt;,
+    uri: String,
+): ConstructorRef {
+    <b>let</b> collection_seed = <a href="collection.md#0x4_collection_create_collection_seed">create_collection_seed</a>(&name);
+    <b>let</b> constructor_ref = <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_create_named_object">object::create_named_object</a>(creator, collection_seed);
+
+    <a href="collection.md#0x4_collection_create_collection_internal">create_collection_internal</a>&lt;<a href="collection.md#0x4_collection_FixedSupply">FixedSupply</a>&gt;(
+        creator,
+        constructor_ref,
+        description,
+        name,
+        <a href="royalty.md#0x4_royalty">royalty</a>,
+        uri,
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>(),
+    )
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_collection_create_collection_internal"></a>
+
+## Function `create_collection_internal`
+
+
+
+<pre><code><b>fun</b> <a href="collection.md#0x4_collection_create_collection_internal">create_collection_internal</a>&lt;Supply: key&gt;(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, constructor_ref: <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>, description: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, <a href="royalty.md#0x4_royalty">royalty</a>: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="royalty.md#0x4_royalty_Royalty">royalty::Royalty</a>&gt;, uri: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, supply: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;Supply&gt;): <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="collection.md#0x4_collection_create_collection_internal">create_collection_internal</a>&lt;Supply: key&gt;(
+    creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    constructor_ref: ConstructorRef,
+    description: String,
+    name: String,
+    <a href="royalty.md#0x4_royalty">royalty</a>: Option&lt;Royalty&gt;,
+    uri: String,
+    supply: Option&lt;Supply&gt;,
+): ConstructorRef {
+    <b>assert</b>!(<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_length">string::length</a>(&name) &lt;= <a href="collection.md#0x4_collection_MAX_COLLECTION_NAME_LENGTH">MAX_COLLECTION_NAME_LENGTH</a>, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_out_of_range">error::out_of_range</a>(<a href="collection.md#0x4_collection_ECOLLECTION_NAME_TOO_LONG">ECOLLECTION_NAME_TOO_LONG</a>));
+    <b>assert</b>!(<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_length">string::length</a>(&uri) &lt;= <a href="collection.md#0x4_collection_MAX_URI_LENGTH">MAX_URI_LENGTH</a>, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_out_of_range">error::out_of_range</a>(<a href="collection.md#0x4_collection_EURI_TOO_LONG">EURI_TOO_LONG</a>));
+    <b>assert</b>!(<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_length">string::length</a>(&description) &lt;= <a href="collection.md#0x4_collection_MAX_DESCRIPTION_LENGTH">MAX_DESCRIPTION_LENGTH</a>, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_out_of_range">error::out_of_range</a>(<a href="collection.md#0x4_collection_EDESCRIPTION_TOO_LONG">EDESCRIPTION_TOO_LONG</a>));
+
+    <b>let</b> object_signer = <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_generate_signer">object::generate_signer</a>(&constructor_ref);
+
+    <b>let</b> <a href="collection.md#0x4_collection">collection</a> = <a href="collection.md#0x4_collection_Collection">Collection</a> {
+        creator: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(creator),
+        description,
+        name,
+        uri,
+        mutation_events: <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_new_event_handle">object::new_event_handle</a>(&object_signer),
+    };
+    <b>move_to</b>(&object_signer, <a href="collection.md#0x4_collection">collection</a>);
+
+    <b>if</b> (<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&supply)) {
+        <b>move_to</b>(&object_signer, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_destroy_some">option::destroy_some</a>(supply))
+    } <b>else</b> {
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_destroy_none">option::destroy_none</a>(supply)
+    };
+
+    <b>if</b> (<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&<a href="royalty.md#0x4_royalty">royalty</a>)) {
+        <a href="royalty.md#0x4_royalty_init">royalty::init</a>(&constructor_ref, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_extract">option::extract</a>(&<b>mut</b> <a href="royalty.md#0x4_royalty">royalty</a>))
+    };
+
+    constructor_ref
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_collection_create_collection_address"></a>
+
+## Function `create_collection_address`
+
+Generates the collections address based upon the creators address and the collection's name
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="collection.md#0x4_collection_create_collection_address">create_collection_address</a>(creator: &<b>address</b>, name: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="collection.md#0x4_collection_create_collection_address">create_collection_address</a>(creator: &<b>address</b>, name: &String): <b>address</b> {
+    <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_create_object_address">object::create_object_address</a>(creator, <a href="collection.md#0x4_collection_create_collection_seed">create_collection_seed</a>(name))
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_collection_create_collection_seed"></a>
+
+## Function `create_collection_seed`
+
+Named objects are derived from a seed, the collection's seed is its name.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="collection.md#0x4_collection_create_collection_seed">create_collection_seed</a>(name: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="collection.md#0x4_collection_create_collection_seed">create_collection_seed</a>(name: &String): <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; {
+    <b>assert</b>!(<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_length">string::length</a>(name) &lt;= <a href="collection.md#0x4_collection_MAX_COLLECTION_NAME_LENGTH">MAX_COLLECTION_NAME_LENGTH</a>, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_out_of_range">error::out_of_range</a>(<a href="collection.md#0x4_collection_ECOLLECTION_NAME_TOO_LONG">ECOLLECTION_NAME_TOO_LONG</a>));
+    *<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_bytes">string::bytes</a>(name)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_collection_increment_supply"></a>
+
+## Function `increment_supply`
+
+Called by token on mint to increment supply if there's an appropriate Supply struct.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="collection.md#0x4_collection_increment_supply">increment_supply</a>(<a href="collection.md#0x4_collection">collection</a>: &<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;<a href="collection.md#0x4_collection_Collection">collection::Collection</a>&gt;, <a href="token.md#0x4_token">token</a>: <b>address</b>): <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="../../../aptos-framework/tests/compiler-v2-doc/aggregator_v2.md#0x1_aggregator_v2_AggregatorSnapshot">aggregator_v2::AggregatorSnapshot</a>&lt;u64&gt;&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="collection.md#0x4_collection_increment_supply">increment_supply</a>(
+    <a href="collection.md#0x4_collection">collection</a>: &Object&lt;<a href="collection.md#0x4_collection_Collection">Collection</a>&gt;,
+    <a href="token.md#0x4_token">token</a>: <b>address</b>,
+): Option&lt;AggregatorSnapshot&lt;u64&gt;&gt; <b>acquires</b> <a href="collection.md#0x4_collection_FixedSupply">FixedSupply</a>, <a href="collection.md#0x4_collection_UnlimitedSupply">UnlimitedSupply</a>, <a href="collection.md#0x4_collection_ConcurrentSupply">ConcurrentSupply</a> {
+    <b>let</b> collection_addr = <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_object_address">object::object_address</a>(<a href="collection.md#0x4_collection">collection</a>);
+    <b>if</b> (<b>exists</b>&lt;<a href="collection.md#0x4_collection_ConcurrentSupply">ConcurrentSupply</a>&gt;(collection_addr)) {
+        <b>let</b> supply = <b>borrow_global_mut</b>&lt;<a href="collection.md#0x4_collection_ConcurrentSupply">ConcurrentSupply</a>&gt;(collection_addr);
+        <b>assert</b>!(
+            <a href="../../../aptos-framework/tests/compiler-v2-doc/aggregator_v2.md#0x1_aggregator_v2_try_add">aggregator_v2::try_add</a>(&<b>mut</b> supply.current_supply, 1),
+            <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_out_of_range">error::out_of_range</a>(<a href="collection.md#0x4_collection_ECOLLECTION_SUPPLY_EXCEEDED">ECOLLECTION_SUPPLY_EXCEEDED</a>),
+        );
+        <a href="../../../aptos-framework/tests/compiler-v2-doc/aggregator_v2.md#0x1_aggregator_v2_add">aggregator_v2::add</a>(&<b>mut</b> supply.total_minted, 1);
+        <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit">event::emit</a>(
+            <a href="collection.md#0x4_collection_Mint">Mint</a> {
+                <a href="collection.md#0x4_collection">collection</a>: collection_addr,
+                index: <a href="../../../aptos-framework/tests/compiler-v2-doc/aggregator_v2.md#0x1_aggregator_v2_snapshot">aggregator_v2::snapshot</a>(&supply.total_minted),
+                <a href="token.md#0x4_token">token</a>,
+            },
+        );
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/aggregator_v2.md#0x1_aggregator_v2_snapshot">aggregator_v2::snapshot</a>(&supply.total_minted))
+    } <b>else</b> <b>if</b> (<b>exists</b>&lt;<a href="collection.md#0x4_collection_FixedSupply">FixedSupply</a>&gt;(collection_addr)) {
+        <b>let</b> supply = <b>borrow_global_mut</b>&lt;<a href="collection.md#0x4_collection_FixedSupply">FixedSupply</a>&gt;(collection_addr);
+        supply.current_supply = supply.current_supply + 1;
+        supply.total_minted = supply.total_minted + 1;
+        <b>assert</b>!(
+            supply.current_supply &lt;= supply.max_supply,
+            <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_out_of_range">error::out_of_range</a>(<a href="collection.md#0x4_collection_ECOLLECTION_SUPPLY_EXCEEDED">ECOLLECTION_SUPPLY_EXCEEDED</a>),
+        );
+        <b>if</b> (std::features::module_event_migration_enabled()) {
+            <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit">event::emit</a>(
+                <a href="collection.md#0x4_collection_Mint">Mint</a> {
+                    <a href="collection.md#0x4_collection">collection</a>: collection_addr,
+                    index: <a href="../../../aptos-framework/tests/compiler-v2-doc/aggregator_v2.md#0x1_aggregator_v2_create_snapshot">aggregator_v2::create_snapshot</a>(supply.total_minted),
+                    <a href="token.md#0x4_token">token</a>,
+                },
+            );
+        };
+        <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit_event">event::emit_event</a>(&<b>mut</b> supply.mint_events,
+            <a href="collection.md#0x4_collection_MintEvent">MintEvent</a> {
+                index: supply.total_minted,
+                <a href="token.md#0x4_token">token</a>,
+            },
+        );
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/aggregator_v2.md#0x1_aggregator_v2_create_snapshot">aggregator_v2::create_snapshot</a>&lt;u64&gt;(supply.total_minted))
+    } <b>else</b> <b>if</b> (<b>exists</b>&lt;<a href="collection.md#0x4_collection_UnlimitedSupply">UnlimitedSupply</a>&gt;(collection_addr)) {
+        <b>let</b> supply = <b>borrow_global_mut</b>&lt;<a href="collection.md#0x4_collection_UnlimitedSupply">UnlimitedSupply</a>&gt;(collection_addr);
+        supply.current_supply = supply.current_supply + 1;
+        supply.total_minted = supply.total_minted + 1;
+        <b>if</b> (std::features::module_event_migration_enabled()) {
+            <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit">event::emit</a>(
+                <a href="collection.md#0x4_collection_Mint">Mint</a> {
+                    <a href="collection.md#0x4_collection">collection</a>: collection_addr,
+                    index: <a href="../../../aptos-framework/tests/compiler-v2-doc/aggregator_v2.md#0x1_aggregator_v2_create_snapshot">aggregator_v2::create_snapshot</a>(supply.total_minted),
+                    <a href="token.md#0x4_token">token</a>,
+                },
+            );
+        };
+        <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit_event">event::emit_event</a>(
+            &<b>mut</b> supply.mint_events,
+            <a href="collection.md#0x4_collection_MintEvent">MintEvent</a> {
+                index: supply.total_minted,
+                <a href="token.md#0x4_token">token</a>,
+            },
+        );
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/aggregator_v2.md#0x1_aggregator_v2_create_snapshot">aggregator_v2::create_snapshot</a>&lt;u64&gt;(supply.total_minted))
+    } <b>else</b> {
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>()
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_collection_decrement_supply"></a>
+
+## Function `decrement_supply`
+
+Called by token on burn to decrement supply if there's an appropriate Supply struct.
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="collection.md#0x4_collection_decrement_supply">decrement_supply</a>(<a href="collection.md#0x4_collection">collection</a>: &<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;<a href="collection.md#0x4_collection_Collection">collection::Collection</a>&gt;, <a href="token.md#0x4_token">token</a>: <b>address</b>, index: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;u64&gt;, previous_owner: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="collection.md#0x4_collection_decrement_supply">decrement_supply</a>(
+    <a href="collection.md#0x4_collection">collection</a>: &Object&lt;<a href="collection.md#0x4_collection_Collection">Collection</a>&gt;,
+    <a href="token.md#0x4_token">token</a>: <b>address</b>,
+    index: Option&lt;u64&gt;,
+    previous_owner: <b>address</b>,
+) <b>acquires</b> <a href="collection.md#0x4_collection_FixedSupply">FixedSupply</a>, <a href="collection.md#0x4_collection_UnlimitedSupply">UnlimitedSupply</a>, <a href="collection.md#0x4_collection_ConcurrentSupply">ConcurrentSupply</a> {
+    <b>let</b> collection_addr = <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_object_address">object::object_address</a>(<a href="collection.md#0x4_collection">collection</a>);
+    <b>if</b> (<b>exists</b>&lt;<a href="collection.md#0x4_collection_ConcurrentSupply">ConcurrentSupply</a>&gt;(collection_addr)) {
+        <b>let</b> supply = <b>borrow_global_mut</b>&lt;<a href="collection.md#0x4_collection_ConcurrentSupply">ConcurrentSupply</a>&gt;(collection_addr);
+        <a href="../../../aptos-framework/tests/compiler-v2-doc/aggregator_v2.md#0x1_aggregator_v2_sub">aggregator_v2::sub</a>(&<b>mut</b> supply.current_supply, 1);
+
+        <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit">event::emit</a>(
+            <a href="collection.md#0x4_collection_Burn">Burn</a> {
+                <a href="collection.md#0x4_collection">collection</a>: collection_addr,
+                index: *<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(&index),
+                <a href="token.md#0x4_token">token</a>,
+                previous_owner,
+            },
+        );
+    } <b>else</b> <b>if</b> (<b>exists</b>&lt;<a href="collection.md#0x4_collection_FixedSupply">FixedSupply</a>&gt;(collection_addr)) {
+        <b>let</b> supply = <b>borrow_global_mut</b>&lt;<a href="collection.md#0x4_collection_FixedSupply">FixedSupply</a>&gt;(collection_addr);
+        supply.current_supply = supply.current_supply - 1;
+        <b>if</b> (std::features::module_event_migration_enabled()) {
+            <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit">event::emit</a>(
+                <a href="collection.md#0x4_collection_Burn">Burn</a> {
+                    <a href="collection.md#0x4_collection">collection</a>: collection_addr,
+                    index: *<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(&index),
+                    <a href="token.md#0x4_token">token</a>,
+                    previous_owner,
+                },
+            );
+        };
+        <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit_event">event::emit_event</a>(
+            &<b>mut</b> supply.burn_events,
+            <a href="collection.md#0x4_collection_BurnEvent">BurnEvent</a> {
+                index: *<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(&index),
+                <a href="token.md#0x4_token">token</a>,
+            },
+        );
+    } <b>else</b> <b>if</b> (<b>exists</b>&lt;<a href="collection.md#0x4_collection_UnlimitedSupply">UnlimitedSupply</a>&gt;(collection_addr)) {
+        <b>let</b> supply = <b>borrow_global_mut</b>&lt;<a href="collection.md#0x4_collection_UnlimitedSupply">UnlimitedSupply</a>&gt;(collection_addr);
+        supply.current_supply = supply.current_supply - 1;
+        <b>if</b> (std::features::module_event_migration_enabled()) {
+            <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit">event::emit</a>(
+                <a href="collection.md#0x4_collection_Burn">Burn</a> {
+                    <a href="collection.md#0x4_collection">collection</a>: collection_addr,
+                    index: *<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(&index),
+                    <a href="token.md#0x4_token">token</a>,
+                    previous_owner,
+                },
+            );
+        };
+        <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit_event">event::emit_event</a>(
+            &<b>mut</b> supply.burn_events,
+            <a href="collection.md#0x4_collection_BurnEvent">BurnEvent</a> {
+                index: *<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(&index),
+                <a href="token.md#0x4_token">token</a>,
+            },
+        );
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_collection_generate_mutator_ref"></a>
+
+## Function `generate_mutator_ref`
+
+Creates a MutatorRef, which gates the ability to mutate any fields that support mutation.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="collection.md#0x4_collection_generate_mutator_ref">generate_mutator_ref</a>(ref: &<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>): <a href="collection.md#0x4_collection_MutatorRef">collection::MutatorRef</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="collection.md#0x4_collection_generate_mutator_ref">generate_mutator_ref</a>(ref: &ConstructorRef): <a href="collection.md#0x4_collection_MutatorRef">MutatorRef</a> {
+    <b>let</b> <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">object</a> = <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_object_from_constructor_ref">object::object_from_constructor_ref</a>&lt;<a href="collection.md#0x4_collection_Collection">Collection</a>&gt;(ref);
+    <a href="collection.md#0x4_collection_MutatorRef">MutatorRef</a> { self: <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_object_address">object::object_address</a>(&<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">object</a>) }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_collection_upgrade_to_concurrent"></a>
+
+## Function `upgrade_to_concurrent`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="collection.md#0x4_collection_upgrade_to_concurrent">upgrade_to_concurrent</a>(ref: &<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_ExtendRef">object::ExtendRef</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="collection.md#0x4_collection_upgrade_to_concurrent">upgrade_to_concurrent</a>(
+    ref: &ExtendRef,
+) <b>acquires</b> <a href="collection.md#0x4_collection_FixedSupply">FixedSupply</a>, <a href="collection.md#0x4_collection_UnlimitedSupply">UnlimitedSupply</a> {
+    <b>let</b> metadata_object_address = <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_address_from_extend_ref">object::address_from_extend_ref</a>(ref);
+    <b>let</b> metadata_object_signer = <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_generate_signer_for_extending">object::generate_signer_for_extending</a>(ref);
+
+    <b>let</b> (supply, current_supply, total_minted, burn_events, mint_events) = <b>if</b> (<b>exists</b>&lt;<a href="collection.md#0x4_collection_FixedSupply">FixedSupply</a>&gt;(
+        metadata_object_address
+    )) {
+        <b>let</b> <a href="collection.md#0x4_collection_FixedSupply">FixedSupply</a> {
+            current_supply,
+            max_supply,
+            total_minted,
+            burn_events,
+            mint_events,
+        } = <b>move_from</b>&lt;<a href="collection.md#0x4_collection_FixedSupply">FixedSupply</a>&gt;(metadata_object_address);
+
+        <b>let</b> supply = <a href="collection.md#0x4_collection_ConcurrentSupply">ConcurrentSupply</a> {
+            current_supply: <a href="../../../aptos-framework/tests/compiler-v2-doc/aggregator_v2.md#0x1_aggregator_v2_create_aggregator">aggregator_v2::create_aggregator</a>(max_supply),
+            total_minted: <a href="../../../aptos-framework/tests/compiler-v2-doc/aggregator_v2.md#0x1_aggregator_v2_create_unbounded_aggregator">aggregator_v2::create_unbounded_aggregator</a>(),
+        };
+        (supply, current_supply, total_minted, burn_events, mint_events)
+    } <b>else</b> <b>if</b> (<b>exists</b>&lt;<a href="collection.md#0x4_collection_UnlimitedSupply">UnlimitedSupply</a>&gt;(metadata_object_address)) {
+        <b>let</b> <a href="collection.md#0x4_collection_UnlimitedSupply">UnlimitedSupply</a> {
+            current_supply,
+            total_minted,
+            burn_events,
+            mint_events,
+        } = <b>move_from</b>&lt;<a href="collection.md#0x4_collection_UnlimitedSupply">UnlimitedSupply</a>&gt;(metadata_object_address);
+
+        <b>let</b> supply = <a href="collection.md#0x4_collection_ConcurrentSupply">ConcurrentSupply</a> {
+            current_supply: <a href="../../../aptos-framework/tests/compiler-v2-doc/aggregator_v2.md#0x1_aggregator_v2_create_unbounded_aggregator">aggregator_v2::create_unbounded_aggregator</a>(),
+            total_minted: <a href="../../../aptos-framework/tests/compiler-v2-doc/aggregator_v2.md#0x1_aggregator_v2_create_unbounded_aggregator">aggregator_v2::create_unbounded_aggregator</a>(),
+        };
+        (supply, current_supply, total_minted, burn_events, mint_events)
+    } <b>else</b> {
+        // untracked <a href="collection.md#0x4_collection">collection</a> is already concurrent, and other variants too.
+        <b>abort</b> <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="collection.md#0x4_collection_EALREADY_CONCURRENT">EALREADY_CONCURRENT</a>)
+    };
+
+    // <b>update</b> current state:
+    <a href="../../../aptos-framework/tests/compiler-v2-doc/aggregator_v2.md#0x1_aggregator_v2_add">aggregator_v2::add</a>(&<b>mut</b> supply.current_supply, current_supply);
+    <a href="../../../aptos-framework/tests/compiler-v2-doc/aggregator_v2.md#0x1_aggregator_v2_add">aggregator_v2::add</a>(&<b>mut</b> supply.total_minted, total_minted);
+    <b>move_to</b>(&metadata_object_signer, supply);
+
+    <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_destroy_handle">event::destroy_handle</a>(burn_events);
+    <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_destroy_handle">event::destroy_handle</a>(mint_events);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_collection_check_collection_exists"></a>
+
+## Function `check_collection_exists`
+
+
+
+<pre><code><b>fun</b> <a href="collection.md#0x4_collection_check_collection_exists">check_collection_exists</a>(addr: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="collection.md#0x4_collection_check_collection_exists">check_collection_exists</a>(addr: <b>address</b>) {
+    <b>assert</b>!(
+        <b>exists</b>&lt;<a href="collection.md#0x4_collection_Collection">Collection</a>&gt;(addr),
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="collection.md#0x4_collection_ECOLLECTION_DOES_NOT_EXIST">ECOLLECTION_DOES_NOT_EXIST</a>),
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_collection_borrow"></a>
+
+## Function `borrow`
+
+
+
+<pre><code><b>fun</b> <a href="collection.md#0x4_collection_borrow">borrow</a>&lt;T: key&gt;(<a href="collection.md#0x4_collection">collection</a>: &<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): &<a href="collection.md#0x4_collection_Collection">collection::Collection</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="collection.md#0x4_collection_borrow">borrow</a>&lt;T: key&gt;(<a href="collection.md#0x4_collection">collection</a>: &Object&lt;T&gt;): &<a href="collection.md#0x4_collection_Collection">Collection</a> {
+    <b>let</b> collection_address = <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_object_address">object::object_address</a>(<a href="collection.md#0x4_collection">collection</a>);
+    <a href="collection.md#0x4_collection_check_collection_exists">check_collection_exists</a>(collection_address);
+    <b>borrow_global</b>&lt;<a href="collection.md#0x4_collection_Collection">Collection</a>&gt;(collection_address)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_collection_count"></a>
+
+## Function `count`
+
+Provides the count of the current selection if supply tracking is used
+
+Note: Calling this method from transaction that also mints/burns, prevents
+it from being parallelized.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="collection.md#0x4_collection_count">count</a>&lt;T: key&gt;(<a href="collection.md#0x4_collection">collection</a>: <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;u64&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="collection.md#0x4_collection_count">count</a>&lt;T: key&gt;(
+    <a href="collection.md#0x4_collection">collection</a>: Object&lt;T&gt;
+): Option&lt;u64&gt; <b>acquires</b> <a href="collection.md#0x4_collection_FixedSupply">FixedSupply</a>, <a href="collection.md#0x4_collection_UnlimitedSupply">UnlimitedSupply</a>, <a href="collection.md#0x4_collection_ConcurrentSupply">ConcurrentSupply</a> {
+    <b>let</b> collection_address = <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_object_address">object::object_address</a>(&<a href="collection.md#0x4_collection">collection</a>);
+    <a href="collection.md#0x4_collection_check_collection_exists">check_collection_exists</a>(collection_address);
+
+    <b>if</b> (<b>exists</b>&lt;<a href="collection.md#0x4_collection_ConcurrentSupply">ConcurrentSupply</a>&gt;(collection_address)) {
+        <b>let</b> supply = <b>borrow_global_mut</b>&lt;<a href="collection.md#0x4_collection_ConcurrentSupply">ConcurrentSupply</a>&gt;(collection_address);
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/aggregator_v2.md#0x1_aggregator_v2_read">aggregator_v2::read</a>(&supply.current_supply))
+    } <b>else</b> <b>if</b> (<b>exists</b>&lt;<a href="collection.md#0x4_collection_FixedSupply">FixedSupply</a>&gt;(collection_address)) {
+        <b>let</b> supply = <b>borrow_global_mut</b>&lt;<a href="collection.md#0x4_collection_FixedSupply">FixedSupply</a>&gt;(collection_address);
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(supply.current_supply)
+    } <b>else</b> <b>if</b> (<b>exists</b>&lt;<a href="collection.md#0x4_collection_UnlimitedSupply">UnlimitedSupply</a>&gt;(collection_address)) {
+        <b>let</b> supply = <b>borrow_global_mut</b>&lt;<a href="collection.md#0x4_collection_UnlimitedSupply">UnlimitedSupply</a>&gt;(collection_address);
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(supply.current_supply)
+    } <b>else</b> {
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>()
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_collection_creator"></a>
+
+## Function `creator`
+
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="collection.md#0x4_collection_creator">creator</a>&lt;T: key&gt;(<a href="collection.md#0x4_collection">collection</a>: <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="collection.md#0x4_collection_creator">creator</a>&lt;T: key&gt;(<a href="collection.md#0x4_collection">collection</a>: Object&lt;T&gt;): <b>address</b> <b>acquires</b> <a href="collection.md#0x4_collection_Collection">Collection</a> {
+    <a href="collection.md#0x4_collection_borrow">borrow</a>(&<a href="collection.md#0x4_collection">collection</a>).creator
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_collection_description"></a>
+
+## Function `description`
+
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="collection.md#0x4_collection_description">description</a>&lt;T: key&gt;(<a href="collection.md#0x4_collection">collection</a>: <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="collection.md#0x4_collection_description">description</a>&lt;T: key&gt;(<a href="collection.md#0x4_collection">collection</a>: Object&lt;T&gt;): String <b>acquires</b> <a href="collection.md#0x4_collection_Collection">Collection</a> {
+    <a href="collection.md#0x4_collection_borrow">borrow</a>(&<a href="collection.md#0x4_collection">collection</a>).description
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_collection_name"></a>
+
+## Function `name`
+
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="collection.md#0x4_collection_name">name</a>&lt;T: key&gt;(<a href="collection.md#0x4_collection">collection</a>: <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="collection.md#0x4_collection_name">name</a>&lt;T: key&gt;(<a href="collection.md#0x4_collection">collection</a>: Object&lt;T&gt;): String <b>acquires</b> <a href="collection.md#0x4_collection_Collection">Collection</a> {
+    <a href="collection.md#0x4_collection_borrow">borrow</a>(&<a href="collection.md#0x4_collection">collection</a>).name
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_collection_uri"></a>
+
+## Function `uri`
+
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="collection.md#0x4_collection_uri">uri</a>&lt;T: key&gt;(<a href="collection.md#0x4_collection">collection</a>: <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="collection.md#0x4_collection_uri">uri</a>&lt;T: key&gt;(<a href="collection.md#0x4_collection">collection</a>: Object&lt;T&gt;): String <b>acquires</b> <a href="collection.md#0x4_collection_Collection">Collection</a> {
+    <a href="collection.md#0x4_collection_borrow">borrow</a>(&<a href="collection.md#0x4_collection">collection</a>).uri
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_collection_borrow_mut"></a>
+
+## Function `borrow_mut`
+
+
+
+<pre><code><b>fun</b> <a href="collection.md#0x4_collection_borrow_mut">borrow_mut</a>(mutator_ref: &<a href="collection.md#0x4_collection_MutatorRef">collection::MutatorRef</a>): &<b>mut</b> <a href="collection.md#0x4_collection_Collection">collection::Collection</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="collection.md#0x4_collection_borrow_mut">borrow_mut</a>(mutator_ref: &<a href="collection.md#0x4_collection_MutatorRef">MutatorRef</a>): &<b>mut</b> <a href="collection.md#0x4_collection_Collection">Collection</a> {
+    <a href="collection.md#0x4_collection_check_collection_exists">check_collection_exists</a>(mutator_ref.self);
+    <b>borrow_global_mut</b>&lt;<a href="collection.md#0x4_collection_Collection">Collection</a>&gt;(mutator_ref.self)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_collection_set_name"></a>
+
+## Function `set_name`
+
+Callers of this function must be aware that changing the name will change the calculated
+collection's address when calling <code>create_collection_address</code>.
+Once the collection has been created, the collection address should be saved for reference and
+<code>create_collection_address</code> should not be used to derive the collection's address.
+
+After changing the collection's name, to create tokens - only call functions that accept the collection object as an argument.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="collection.md#0x4_collection_set_name">set_name</a>(mutator_ref: &<a href="collection.md#0x4_collection_MutatorRef">collection::MutatorRef</a>, name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="collection.md#0x4_collection_set_name">set_name</a>(mutator_ref: &<a href="collection.md#0x4_collection_MutatorRef">MutatorRef</a>, name: String) <b>acquires</b> <a href="collection.md#0x4_collection_Collection">Collection</a> {
+    <b>assert</b>!(<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_length">string::length</a>(&name) &lt;= <a href="collection.md#0x4_collection_MAX_COLLECTION_NAME_LENGTH">MAX_COLLECTION_NAME_LENGTH</a>, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_out_of_range">error::out_of_range</a>(<a href="collection.md#0x4_collection_ECOLLECTION_NAME_TOO_LONG">ECOLLECTION_NAME_TOO_LONG</a>));
+    <b>let</b> <a href="collection.md#0x4_collection">collection</a> = <a href="collection.md#0x4_collection_borrow_mut">borrow_mut</a>(mutator_ref);
+    <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit">event::emit</a>(<a href="collection.md#0x4_collection_Mutation">Mutation</a> {
+        mutated_field_name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"name") ,
+        <a href="collection.md#0x4_collection">collection</a>: <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_address_to_object">object::address_to_object</a>(mutator_ref.self),
+        old_value: <a href="collection.md#0x4_collection">collection</a>.name,
+        new_value: name,
+    });
+    <a href="collection.md#0x4_collection">collection</a>.name = name;
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_collection_set_description"></a>
+
+## Function `set_description`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="collection.md#0x4_collection_set_description">set_description</a>(mutator_ref: &<a href="collection.md#0x4_collection_MutatorRef">collection::MutatorRef</a>, description: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="collection.md#0x4_collection_set_description">set_description</a>(mutator_ref: &<a href="collection.md#0x4_collection_MutatorRef">MutatorRef</a>, description: String) <b>acquires</b> <a href="collection.md#0x4_collection_Collection">Collection</a> {
+    <b>assert</b>!(<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_length">string::length</a>(&description) &lt;= <a href="collection.md#0x4_collection_MAX_DESCRIPTION_LENGTH">MAX_DESCRIPTION_LENGTH</a>, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_out_of_range">error::out_of_range</a>(<a href="collection.md#0x4_collection_EDESCRIPTION_TOO_LONG">EDESCRIPTION_TOO_LONG</a>));
+    <b>let</b> <a href="collection.md#0x4_collection">collection</a> = <a href="collection.md#0x4_collection_borrow_mut">borrow_mut</a>(mutator_ref);
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit">event::emit</a>(<a href="collection.md#0x4_collection_Mutation">Mutation</a> {
+            mutated_field_name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"description"),
+            <a href="collection.md#0x4_collection">collection</a>: <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_address_to_object">object::address_to_object</a>(mutator_ref.self),
+            old_value: <a href="collection.md#0x4_collection">collection</a>.description,
+            new_value: description,
+        });
+    };
+    <a href="collection.md#0x4_collection">collection</a>.description = description;
+    <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit_event">event::emit_event</a>(
+        &<b>mut</b> <a href="collection.md#0x4_collection">collection</a>.mutation_events,
+        <a href="collection.md#0x4_collection_MutationEvent">MutationEvent</a> { mutated_field_name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"description") },
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_collection_set_uri"></a>
+
+## Function `set_uri`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="collection.md#0x4_collection_set_uri">set_uri</a>(mutator_ref: &<a href="collection.md#0x4_collection_MutatorRef">collection::MutatorRef</a>, uri: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="collection.md#0x4_collection_set_uri">set_uri</a>(mutator_ref: &<a href="collection.md#0x4_collection_MutatorRef">MutatorRef</a>, uri: String) <b>acquires</b> <a href="collection.md#0x4_collection_Collection">Collection</a> {
+    <b>assert</b>!(<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_length">string::length</a>(&uri) &lt;= <a href="collection.md#0x4_collection_MAX_URI_LENGTH">MAX_URI_LENGTH</a>, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_out_of_range">error::out_of_range</a>(<a href="collection.md#0x4_collection_EURI_TOO_LONG">EURI_TOO_LONG</a>));
+    <b>let</b> <a href="collection.md#0x4_collection">collection</a> = <a href="collection.md#0x4_collection_borrow_mut">borrow_mut</a>(mutator_ref);
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit">event::emit</a>(<a href="collection.md#0x4_collection_Mutation">Mutation</a> {
+            mutated_field_name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"uri"),
+            <a href="collection.md#0x4_collection">collection</a>: <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_address_to_object">object::address_to_object</a>(mutator_ref.self),
+            old_value: <a href="collection.md#0x4_collection">collection</a>.uri,
+            new_value: uri,
+        });
+    };
+    <a href="collection.md#0x4_collection">collection</a>.uri = uri;
+    <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit_event">event::emit_event</a>(
+        &<b>mut</b> <a href="collection.md#0x4_collection">collection</a>.mutation_events,
+        <a href="collection.md#0x4_collection_MutationEvent">MutationEvent</a> { mutated_field_name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"uri") },
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_collection_set_max_supply"></a>
+
+## Function `set_max_supply`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="collection.md#0x4_collection_set_max_supply">set_max_supply</a>(mutator_ref: &<a href="collection.md#0x4_collection_MutatorRef">collection::MutatorRef</a>, max_supply: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="collection.md#0x4_collection_set_max_supply">set_max_supply</a>(mutator_ref: &<a href="collection.md#0x4_collection_MutatorRef">MutatorRef</a>, max_supply: u64) <b>acquires</b> <a href="collection.md#0x4_collection_ConcurrentSupply">ConcurrentSupply</a>, <a href="collection.md#0x4_collection_FixedSupply">FixedSupply</a> {
+    <b>let</b> <a href="collection.md#0x4_collection">collection</a> = <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_address_to_object">object::address_to_object</a>&lt;<a href="collection.md#0x4_collection_Collection">Collection</a>&gt;(mutator_ref.self);
+    <b>let</b> collection_address = <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_object_address">object::object_address</a>(&<a href="collection.md#0x4_collection">collection</a>);
+    <b>let</b> old_max_supply;
+
+    <b>if</b> (<b>exists</b>&lt;<a href="collection.md#0x4_collection_ConcurrentSupply">ConcurrentSupply</a>&gt;(collection_address)) {
+        <b>let</b> supply = <b>borrow_global_mut</b>&lt;<a href="collection.md#0x4_collection_ConcurrentSupply">ConcurrentSupply</a>&gt;(collection_address);
+        <b>let</b> current_supply = <a href="../../../aptos-framework/tests/compiler-v2-doc/aggregator_v2.md#0x1_aggregator_v2_read">aggregator_v2::read</a>(&supply.current_supply);
+        <b>assert</b>!(
+            max_supply &gt;= current_supply,
+            <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_out_of_range">error::out_of_range</a>(<a href="collection.md#0x4_collection_EINVALID_MAX_SUPPLY">EINVALID_MAX_SUPPLY</a>),
+        );
+        old_max_supply = <a href="../../../aptos-framework/tests/compiler-v2-doc/aggregator_v2.md#0x1_aggregator_v2_max_value">aggregator_v2::max_value</a>(&supply.current_supply);
+        supply.current_supply = <a href="../../../aptos-framework/tests/compiler-v2-doc/aggregator_v2.md#0x1_aggregator_v2_create_aggregator">aggregator_v2::create_aggregator</a>(max_supply);
+        <a href="../../../aptos-framework/tests/compiler-v2-doc/aggregator_v2.md#0x1_aggregator_v2_add">aggregator_v2::add</a>(&<b>mut</b> supply.current_supply, current_supply);
+    } <b>else</b> <b>if</b> (<b>exists</b>&lt;<a href="collection.md#0x4_collection_FixedSupply">FixedSupply</a>&gt;(collection_address)) {
+        <b>let</b> supply = <b>borrow_global_mut</b>&lt;<a href="collection.md#0x4_collection_FixedSupply">FixedSupply</a>&gt;(collection_address);
+        <b>assert</b>!(
+            max_supply &gt;= supply.current_supply,
+            <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_out_of_range">error::out_of_range</a>(<a href="collection.md#0x4_collection_EINVALID_MAX_SUPPLY">EINVALID_MAX_SUPPLY</a>),
+        );
+        old_max_supply = supply.max_supply;
+        supply.max_supply = max_supply;
+    } <b>else</b> {
+        <b>abort</b> <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="collection.md#0x4_collection_ENO_MAX_SUPPLY_IN_COLLECTION">ENO_MAX_SUPPLY_IN_COLLECTION</a>)
+    };
+
+    <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit">event::emit</a>(<a href="collection.md#0x4_collection_SetMaxSupply">SetMaxSupply</a> { <a href="collection.md#0x4_collection">collection</a>, old_max_supply, new_max_supply: max_supply });
+}
+</code></pre>
+
+
+
+</details>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-token-objects/tests/compiler-v2-doc/overview.md b/aptos-move/framework/aptos-token-objects/tests/compiler-v2-doc/overview.md
new file mode 100644
index 0000000000000..eda0865b6e708
--- /dev/null
+++ b/aptos-move/framework/aptos-token-objects/tests/compiler-v2-doc/overview.md
@@ -0,0 +1,22 @@
+
+<a id="@Aptos_Token_Framework_0"></a>
+
+# Aptos Token Framework
+
+
+This is the reference documentation of the Aptos Token Objects framework.
+
+
+<a id="@Index_1"></a>
+
+## Index
+
+
+-  [`0x4::aptos_token`](aptos_token.md#0x4_aptos_token)
+-  [`0x4::collection`](collection.md#0x4_collection)
+-  [`0x4::property_map`](property_map.md#0x4_property_map)
+-  [`0x4::royalty`](royalty.md#0x4_royalty)
+-  [`0x4::token`](token.md#0x4_token)
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-token-objects/tests/compiler-v2-doc/property_map.md b/aptos-move/framework/aptos-token-objects/tests/compiler-v2-doc/property_map.md
new file mode 100644
index 0000000000000..d6e55d10f293a
--- /dev/null
+++ b/aptos-move/framework/aptos-token-objects/tests/compiler-v2-doc/property_map.md
@@ -0,0 +1,1282 @@
+
+<a id="0x4_property_map"></a>
+
+# Module `0x4::property_map`
+
+<code><a href="property_map.md#0x4_property_map_PropertyMap">PropertyMap</a></code> provides generic metadata support for <code>AptosToken</code>. It is a specialization of
+<code>SimpleMap</code> that enforces strict typing with minimal storage use by using constant u64 to
+represent types and storing values in bcs format.
+
+
+-  [Resource `PropertyMap`](#0x4_property_map_PropertyMap)
+-  [Struct `PropertyValue`](#0x4_property_map_PropertyValue)
+-  [Struct `MutatorRef`](#0x4_property_map_MutatorRef)
+-  [Constants](#@Constants_0)
+-  [Function `init`](#0x4_property_map_init)
+-  [Function `extend`](#0x4_property_map_extend)
+-  [Function `burn`](#0x4_property_map_burn)
+-  [Function `prepare_input`](#0x4_property_map_prepare_input)
+-  [Function `to_external_type`](#0x4_property_map_to_external_type)
+-  [Function `to_internal_type`](#0x4_property_map_to_internal_type)
+-  [Function `type_info_to_internal_type`](#0x4_property_map_type_info_to_internal_type)
+-  [Function `validate_type`](#0x4_property_map_validate_type)
+-  [Function `generate_mutator_ref`](#0x4_property_map_generate_mutator_ref)
+-  [Function `contains_key`](#0x4_property_map_contains_key)
+-  [Function `length`](#0x4_property_map_length)
+-  [Function `read`](#0x4_property_map_read)
+-  [Function `assert_exists`](#0x4_property_map_assert_exists)
+-  [Function `read_typed`](#0x4_property_map_read_typed)
+-  [Function `read_bool`](#0x4_property_map_read_bool)
+-  [Function `read_u8`](#0x4_property_map_read_u8)
+-  [Function `read_u16`](#0x4_property_map_read_u16)
+-  [Function `read_u32`](#0x4_property_map_read_u32)
+-  [Function `read_u64`](#0x4_property_map_read_u64)
+-  [Function `read_u128`](#0x4_property_map_read_u128)
+-  [Function `read_u256`](#0x4_property_map_read_u256)
+-  [Function `read_address`](#0x4_property_map_read_address)
+-  [Function `read_bytes`](#0x4_property_map_read_bytes)
+-  [Function `read_string`](#0x4_property_map_read_string)
+-  [Function `add`](#0x4_property_map_add)
+-  [Function `add_typed`](#0x4_property_map_add_typed)
+-  [Function `add_internal`](#0x4_property_map_add_internal)
+-  [Function `update`](#0x4_property_map_update)
+-  [Function `update_typed`](#0x4_property_map_update_typed)
+-  [Function `update_internal`](#0x4_property_map_update_internal)
+-  [Function `remove`](#0x4_property_map_remove)
+-  [Function `assert_end_to_end_input`](#0x4_property_map_assert_end_to_end_input)
+
+
+<pre><code><b>use</b> <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs">0x1::bcs</a>;
+<b>use</b> <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs">0x1::from_bcs</a>;
+<b>use</b> <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">0x1::object</a>;
+<b>use</b> <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map">0x1::simple_map</a>;
+<b>use</b> <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string">0x1::string</a>;
+<b>use</b> <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info">0x1::type_info</a>;
+<b>use</b> <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">0x1::vector</a>;
+</code></pre>
+
+
+
+<a id="0x4_property_map_PropertyMap"></a>
+
+## Resource `PropertyMap`
+
+A Map for typed key to value mapping, the contract using it
+should keep track of what keys are what types, and parse them accordingly.
+
+
+<pre><code>#[resource_group_member(#[group = <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_ObjectGroup">0x1::object::ObjectGroup</a>])]
+<b>struct</b> <a href="property_map.md#0x4_property_map_PropertyMap">PropertyMap</a> <b>has</b> drop, key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>inner: <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, <a href="property_map.md#0x4_property_map_PropertyValue">property_map::PropertyValue</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x4_property_map_PropertyValue"></a>
+
+## Struct `PropertyValue`
+
+A typed value for the <code><a href="property_map.md#0x4_property_map_PropertyMap">PropertyMap</a></code> to ensure that typing is always consistent
+
+
+<pre><code><b>struct</b> <a href="property_map.md#0x4_property_map_PropertyValue">PropertyValue</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>type: u8</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>value: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x4_property_map_MutatorRef"></a>
+
+## Struct `MutatorRef`
+
+A mutator ref that allows for mutation of the property map
+
+
+<pre><code><b>struct</b> <a href="property_map.md#0x4_property_map_MutatorRef">MutatorRef</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>self: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x4_property_map_ETYPE_MISMATCH"></a>
+
+Property value does not match expected type
+
+
+<pre><code><b>const</b> <a href="property_map.md#0x4_property_map_ETYPE_MISMATCH">ETYPE_MISMATCH</a>: u64 = 6;
+</code></pre>
+
+
+
+<a id="0x4_property_map_ADDRESS"></a>
+
+
+
+<pre><code><b>const</b> <a href="property_map.md#0x4_property_map_ADDRESS">ADDRESS</a>: u8 = 7;
+</code></pre>
+
+
+
+<a id="0x4_property_map_BOOL"></a>
+
+
+
+<pre><code><b>const</b> <a href="property_map.md#0x4_property_map_BOOL">BOOL</a>: u8 = 0;
+</code></pre>
+
+
+
+<a id="0x4_property_map_BYTE_VECTOR"></a>
+
+
+
+<pre><code><b>const</b> <a href="property_map.md#0x4_property_map_BYTE_VECTOR">BYTE_VECTOR</a>: u8 = 8;
+</code></pre>
+
+
+
+<a id="0x4_property_map_EKEY_ALREADY_EXISTS_IN_PROPERTY_MAP"></a>
+
+The property key already exists
+
+
+<pre><code><b>const</b> <a href="property_map.md#0x4_property_map_EKEY_ALREADY_EXISTS_IN_PROPERTY_MAP">EKEY_ALREADY_EXISTS_IN_PROPERTY_MAP</a>: u64 = 2;
+</code></pre>
+
+
+
+<a id="0x4_property_map_EKEY_TYPE_COUNT_MISMATCH"></a>
+
+Property key and type counts do not match
+
+
+<pre><code><b>const</b> <a href="property_map.md#0x4_property_map_EKEY_TYPE_COUNT_MISMATCH">EKEY_TYPE_COUNT_MISMATCH</a>: u64 = 5;
+</code></pre>
+
+
+
+<a id="0x4_property_map_EKEY_VALUE_COUNT_MISMATCH"></a>
+
+Property key and value counts do not match
+
+
+<pre><code><b>const</b> <a href="property_map.md#0x4_property_map_EKEY_VALUE_COUNT_MISMATCH">EKEY_VALUE_COUNT_MISMATCH</a>: u64 = 4;
+</code></pre>
+
+
+
+<a id="0x4_property_map_EPROPERTY_MAP_DOES_NOT_EXIST"></a>
+
+The property map does not exist
+
+
+<pre><code><b>const</b> <a href="property_map.md#0x4_property_map_EPROPERTY_MAP_DOES_NOT_EXIST">EPROPERTY_MAP_DOES_NOT_EXIST</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x4_property_map_EPROPERTY_MAP_KEY_TOO_LONG"></a>
+
+The key of the property is too long
+
+
+<pre><code><b>const</b> <a href="property_map.md#0x4_property_map_EPROPERTY_MAP_KEY_TOO_LONG">EPROPERTY_MAP_KEY_TOO_LONG</a>: u64 = 8;
+</code></pre>
+
+
+
+<a id="0x4_property_map_ETOO_MANY_PROPERTIES"></a>
+
+The number of properties exceeds the maximum
+
+
+<pre><code><b>const</b> <a href="property_map.md#0x4_property_map_ETOO_MANY_PROPERTIES">ETOO_MANY_PROPERTIES</a>: u64 = 3;
+</code></pre>
+
+
+
+<a id="0x4_property_map_ETYPE_INVALID"></a>
+
+Invalid value type specified
+
+
+<pre><code><b>const</b> <a href="property_map.md#0x4_property_map_ETYPE_INVALID">ETYPE_INVALID</a>: u64 = 7;
+</code></pre>
+
+
+
+<a id="0x4_property_map_MAX_PROPERTY_MAP_SIZE"></a>
+
+Maximum number of items in a <code><a href="property_map.md#0x4_property_map_PropertyMap">PropertyMap</a></code>
+
+
+<pre><code><b>const</b> <a href="property_map.md#0x4_property_map_MAX_PROPERTY_MAP_SIZE">MAX_PROPERTY_MAP_SIZE</a>: u64 = 1000;
+</code></pre>
+
+
+
+<a id="0x4_property_map_MAX_PROPERTY_NAME_LENGTH"></a>
+
+Maximum number of characters in a property name
+
+
+<pre><code><b>const</b> <a href="property_map.md#0x4_property_map_MAX_PROPERTY_NAME_LENGTH">MAX_PROPERTY_NAME_LENGTH</a>: u64 = 128;
+</code></pre>
+
+
+
+<a id="0x4_property_map_STRING"></a>
+
+
+
+<pre><code><b>const</b> <a href="property_map.md#0x4_property_map_STRING">STRING</a>: u8 = 9;
+</code></pre>
+
+
+
+<a id="0x4_property_map_U128"></a>
+
+
+
+<pre><code><b>const</b> <a href="property_map.md#0x4_property_map_U128">U128</a>: u8 = 5;
+</code></pre>
+
+
+
+<a id="0x4_property_map_U16"></a>
+
+
+
+<pre><code><b>const</b> <a href="property_map.md#0x4_property_map_U16">U16</a>: u8 = 2;
+</code></pre>
+
+
+
+<a id="0x4_property_map_U256"></a>
+
+
+
+<pre><code><b>const</b> <a href="property_map.md#0x4_property_map_U256">U256</a>: u8 = 6;
+</code></pre>
+
+
+
+<a id="0x4_property_map_U32"></a>
+
+
+
+<pre><code><b>const</b> <a href="property_map.md#0x4_property_map_U32">U32</a>: u8 = 3;
+</code></pre>
+
+
+
+<a id="0x4_property_map_U64"></a>
+
+
+
+<pre><code><b>const</b> <a href="property_map.md#0x4_property_map_U64">U64</a>: u8 = 4;
+</code></pre>
+
+
+
+<a id="0x4_property_map_U8"></a>
+
+
+
+<pre><code><b>const</b> <a href="property_map.md#0x4_property_map_U8">U8</a>: u8 = 1;
+</code></pre>
+
+
+
+<a id="0x4_property_map_init"></a>
+
+## Function `init`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x4_property_map_init">init</a>(ref: &<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>, container: <a href="property_map.md#0x4_property_map_PropertyMap">property_map::PropertyMap</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x4_property_map_init">init</a>(ref: &ConstructorRef, container: <a href="property_map.md#0x4_property_map_PropertyMap">PropertyMap</a>) {
+    <b>let</b> <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a> = <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_generate_signer">object::generate_signer</a>(ref);
+    <b>move_to</b>(&<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, container);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_property_map_extend"></a>
+
+## Function `extend`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x4_property_map_extend">extend</a>(ref: &<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_ExtendRef">object::ExtendRef</a>, container: <a href="property_map.md#0x4_property_map_PropertyMap">property_map::PropertyMap</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x4_property_map_extend">extend</a>(ref: &ExtendRef, container: <a href="property_map.md#0x4_property_map_PropertyMap">PropertyMap</a>) {
+    <b>let</b> <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a> = <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_generate_signer_for_extending">object::generate_signer_for_extending</a>(ref);
+    <b>move_to</b>(&<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, container);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_property_map_burn"></a>
+
+## Function `burn`
+
+Burns the entire property map
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x4_property_map_burn">burn</a>(ref: <a href="property_map.md#0x4_property_map_MutatorRef">property_map::MutatorRef</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x4_property_map_burn">burn</a>(ref: <a href="property_map.md#0x4_property_map_MutatorRef">MutatorRef</a>) <b>acquires</b> <a href="property_map.md#0x4_property_map_PropertyMap">PropertyMap</a> {
+    <b>move_from</b>&lt;<a href="property_map.md#0x4_property_map_PropertyMap">PropertyMap</a>&gt;(ref.self);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_property_map_prepare_input"></a>
+
+## Function `prepare_input`
+
+Helper for external entry functions to produce a valid container for property values.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x4_property_map_prepare_input">prepare_input</a>(keys: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;, types: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;, values: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;): <a href="property_map.md#0x4_property_map_PropertyMap">property_map::PropertyMap</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x4_property_map_prepare_input">prepare_input</a>(
+    keys: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;String&gt;,
+    types: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;String&gt;,
+    values: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;,
+): <a href="property_map.md#0x4_property_map_PropertyMap">PropertyMap</a> {
+    <b>let</b> length = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&keys);
+    <b>assert</b>!(<a href="property_map.md#0x4_property_map_length">length</a> &lt;= <a href="property_map.md#0x4_property_map_MAX_PROPERTY_MAP_SIZE">MAX_PROPERTY_MAP_SIZE</a>, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="property_map.md#0x4_property_map_ETOO_MANY_PROPERTIES">ETOO_MANY_PROPERTIES</a>));
+    <b>assert</b>!(length == <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&values), <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="property_map.md#0x4_property_map_EKEY_VALUE_COUNT_MISMATCH">EKEY_VALUE_COUNT_MISMATCH</a>));
+    <b>assert</b>!(length == <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&types), <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="property_map.md#0x4_property_map_EKEY_TYPE_COUNT_MISMATCH">EKEY_TYPE_COUNT_MISMATCH</a>));
+
+    <b>let</b> container = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_create">simple_map::create</a>&lt;String, <a href="property_map.md#0x4_property_map_PropertyValue">PropertyValue</a>&gt;();
+    <b>while</b> (!<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_is_empty">vector::is_empty</a>(&keys)) {
+        <b>let</b> key = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_pop_back">vector::pop_back</a>(&<b>mut</b> keys);
+        <b>assert</b>!(
+            <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_length">string::length</a>(&key) &lt;= <a href="property_map.md#0x4_property_map_MAX_PROPERTY_NAME_LENGTH">MAX_PROPERTY_NAME_LENGTH</a>,
+            <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="property_map.md#0x4_property_map_EPROPERTY_MAP_KEY_TOO_LONG">EPROPERTY_MAP_KEY_TOO_LONG</a>),
+        );
+
+        <b>let</b> value = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_pop_back">vector::pop_back</a>(&<b>mut</b> values);
+        <b>let</b> type = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_pop_back">vector::pop_back</a>(&<b>mut</b> types);
+
+        <b>let</b> new_type = <a href="property_map.md#0x4_property_map_to_internal_type">to_internal_type</a>(type);
+        <a href="property_map.md#0x4_property_map_validate_type">validate_type</a>(new_type, value);
+
+        <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_add">simple_map::add</a>(&<b>mut</b> container, key, <a href="property_map.md#0x4_property_map_PropertyValue">PropertyValue</a> { value, type: new_type });
+    };
+
+    <a href="property_map.md#0x4_property_map_PropertyMap">PropertyMap</a> { inner: container }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_property_map_to_external_type"></a>
+
+## Function `to_external_type`
+
+Maps <code>String</code> representation of types from their <code>u8</code> representation
+
+
+<pre><code><b>fun</b> <a href="property_map.md#0x4_property_map_to_external_type">to_external_type</a>(type: u8): <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="property_map.md#0x4_property_map_to_external_type">to_external_type</a>(type: u8): String {
+    <b>if</b> (type == <a href="property_map.md#0x4_property_map_BOOL">BOOL</a>) {
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"bool")
+    } <b>else</b> <b>if</b> (type == <a href="property_map.md#0x4_property_map_U8">U8</a>) {
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"u8")
+    } <b>else</b> <b>if</b> (type == <a href="property_map.md#0x4_property_map_U16">U16</a>) {
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"u16")
+    } <b>else</b> <b>if</b> (type == <a href="property_map.md#0x4_property_map_U32">U32</a>) {
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"u32")
+    } <b>else</b> <b>if</b> (type == <a href="property_map.md#0x4_property_map_U64">U64</a>) {
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"u64")
+    } <b>else</b> <b>if</b> (type == <a href="property_map.md#0x4_property_map_U128">U128</a>) {
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"u128")
+    } <b>else</b> <b>if</b> (type == <a href="property_map.md#0x4_property_map_U256">U256</a>) {
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"u256")
+    } <b>else</b> <b>if</b> (type == <a href="property_map.md#0x4_property_map_ADDRESS">ADDRESS</a>) {
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"<b>address</b>")
+    } <b>else</b> <b>if</b> (type == <a href="property_map.md#0x4_property_map_BYTE_VECTOR">BYTE_VECTOR</a>) {
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;")
+    } <b>else</b> <b>if</b> (type == <a href="property_map.md#0x4_property_map_STRING">STRING</a>) {
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">0x1::string::String</a>")
+    } <b>else</b> {
+        <b>abort</b> (<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="property_map.md#0x4_property_map_ETYPE_INVALID">ETYPE_INVALID</a>))
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_property_map_to_internal_type"></a>
+
+## Function `to_internal_type`
+
+Maps the <code>String</code> representation of types to <code>u8</code>
+
+
+<pre><code><b>fun</b> <a href="property_map.md#0x4_property_map_to_internal_type">to_internal_type</a>(type: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): u8
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="property_map.md#0x4_property_map_to_internal_type">to_internal_type</a>(type: String): u8 {
+    <b>if</b> (type == <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"bool")) {
+        <a href="property_map.md#0x4_property_map_BOOL">BOOL</a>
+    } <b>else</b> <b>if</b> (type == <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"u8")) {
+        <a href="property_map.md#0x4_property_map_U8">U8</a>
+    } <b>else</b> <b>if</b> (type == <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"u16")) {
+        <a href="property_map.md#0x4_property_map_U16">U16</a>
+    } <b>else</b> <b>if</b> (type == <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"u32")) {
+        <a href="property_map.md#0x4_property_map_U32">U32</a>
+    } <b>else</b> <b>if</b> (type == <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"u64")) {
+        <a href="property_map.md#0x4_property_map_U64">U64</a>
+    } <b>else</b> <b>if</b> (type == <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"u128")) {
+        <a href="property_map.md#0x4_property_map_U128">U128</a>
+    } <b>else</b> <b>if</b> (type == <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"u256")) {
+        <a href="property_map.md#0x4_property_map_U256">U256</a>
+    } <b>else</b> <b>if</b> (type == <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"<b>address</b>")) {
+        <a href="property_map.md#0x4_property_map_ADDRESS">ADDRESS</a>
+    } <b>else</b> <b>if</b> (type == <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;")) {
+        <a href="property_map.md#0x4_property_map_BYTE_VECTOR">BYTE_VECTOR</a>
+    } <b>else</b> <b>if</b> (type == <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">0x1::string::String</a>")) {
+        <a href="property_map.md#0x4_property_map_STRING">STRING</a>
+    } <b>else</b> {
+        <b>abort</b> (<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="property_map.md#0x4_property_map_ETYPE_INVALID">ETYPE_INVALID</a>))
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_property_map_type_info_to_internal_type"></a>
+
+## Function `type_info_to_internal_type`
+
+Maps Move type to <code>u8</code> representation
+
+
+<pre><code><b>fun</b> <a href="property_map.md#0x4_property_map_type_info_to_internal_type">type_info_to_internal_type</a>&lt;T&gt;(): u8
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="property_map.md#0x4_property_map_type_info_to_internal_type">type_info_to_internal_type</a>&lt;T&gt;(): u8 {
+    <b>let</b> type = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_type_name">type_info::type_name</a>&lt;T&gt;();
+    <a href="property_map.md#0x4_property_map_to_internal_type">to_internal_type</a>(type)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_property_map_validate_type"></a>
+
+## Function `validate_type`
+
+Validates property value type against its expected type
+
+
+<pre><code><b>fun</b> <a href="property_map.md#0x4_property_map_validate_type">validate_type</a>(type: u8, value: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="property_map.md#0x4_property_map_validate_type">validate_type</a>(type: u8, value: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;) {
+    <b>if</b> (type == <a href="property_map.md#0x4_property_map_BOOL">BOOL</a>) {
+        <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_to_bool">from_bcs::to_bool</a>(value);
+    } <b>else</b> <b>if</b> (type == <a href="property_map.md#0x4_property_map_U8">U8</a>) {
+        <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_to_u8">from_bcs::to_u8</a>(value);
+    } <b>else</b> <b>if</b> (type == <a href="property_map.md#0x4_property_map_U16">U16</a>) {
+        <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_to_u16">from_bcs::to_u16</a>(value);
+    } <b>else</b> <b>if</b> (type == <a href="property_map.md#0x4_property_map_U32">U32</a>) {
+        <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_to_u32">from_bcs::to_u32</a>(value);
+    } <b>else</b> <b>if</b> (type == <a href="property_map.md#0x4_property_map_U64">U64</a>) {
+        <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_to_u64">from_bcs::to_u64</a>(value);
+    } <b>else</b> <b>if</b> (type == <a href="property_map.md#0x4_property_map_U128">U128</a>) {
+        <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_to_u128">from_bcs::to_u128</a>(value);
+    } <b>else</b> <b>if</b> (type == <a href="property_map.md#0x4_property_map_U256">U256</a>) {
+        <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_to_u256">from_bcs::to_u256</a>(value);
+    } <b>else</b> <b>if</b> (type == <a href="property_map.md#0x4_property_map_ADDRESS">ADDRESS</a>) {
+        <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_to_address">from_bcs::to_address</a>(value);
+    } <b>else</b> <b>if</b> (type == <a href="property_map.md#0x4_property_map_BYTE_VECTOR">BYTE_VECTOR</a>) {
+        // nothing <b>to</b> validate...
+    } <b>else</b> <b>if</b> (type == <a href="property_map.md#0x4_property_map_STRING">STRING</a>) {
+        <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_to_string">from_bcs::to_string</a>(value);
+    } <b>else</b> {
+        <b>abort</b> (<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="property_map.md#0x4_property_map_ETYPE_MISMATCH">ETYPE_MISMATCH</a>))
+    };
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_property_map_generate_mutator_ref"></a>
+
+## Function `generate_mutator_ref`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x4_property_map_generate_mutator_ref">generate_mutator_ref</a>(ref: &<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>): <a href="property_map.md#0x4_property_map_MutatorRef">property_map::MutatorRef</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x4_property_map_generate_mutator_ref">generate_mutator_ref</a>(ref: &ConstructorRef): <a href="property_map.md#0x4_property_map_MutatorRef">MutatorRef</a> {
+    <a href="property_map.md#0x4_property_map_MutatorRef">MutatorRef</a> { self: <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_address_from_constructor_ref">object::address_from_constructor_ref</a>(ref) }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_property_map_contains_key"></a>
+
+## Function `contains_key`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x4_property_map_contains_key">contains_key</a>&lt;T: key&gt;(<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">object</a>: &<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, key: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x4_property_map_contains_key">contains_key</a>&lt;T: key&gt;(<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">object</a>: &Object&lt;T&gt;, key: &String): bool <b>acquires</b> <a href="property_map.md#0x4_property_map_PropertyMap">PropertyMap</a> {
+    <a href="property_map.md#0x4_property_map_assert_exists">assert_exists</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_object_address">object::object_address</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">object</a>));
+    <b>let</b> <a href="property_map.md#0x4_property_map">property_map</a> = <b>borrow_global</b>&lt;<a href="property_map.md#0x4_property_map_PropertyMap">PropertyMap</a>&gt;(<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_object_address">object::object_address</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">object</a>));
+    <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_contains_key">simple_map::contains_key</a>(&<a href="property_map.md#0x4_property_map">property_map</a>.inner, key)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_property_map_length"></a>
+
+## Function `length`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x4_property_map_length">length</a>&lt;T: key&gt;(<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">object</a>: &<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x4_property_map_length">length</a>&lt;T: key&gt;(<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">object</a>: &Object&lt;T&gt;): u64 <b>acquires</b> <a href="property_map.md#0x4_property_map_PropertyMap">PropertyMap</a> {
+    <a href="property_map.md#0x4_property_map_assert_exists">assert_exists</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_object_address">object::object_address</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">object</a>));
+    <b>let</b> <a href="property_map.md#0x4_property_map">property_map</a> = <b>borrow_global</b>&lt;<a href="property_map.md#0x4_property_map_PropertyMap">PropertyMap</a>&gt;(<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_object_address">object::object_address</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">object</a>));
+    <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_length">simple_map::length</a>(&<a href="property_map.md#0x4_property_map">property_map</a>.inner)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_property_map_read"></a>
+
+## Function `read`
+
+Read the property and get it's external type in it's bcs encoded format
+
+The preferred method is to use <code>read_&lt;type&gt;</code> where the type is already known.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x4_property_map_read">read</a>&lt;T: key&gt;(<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">object</a>: &<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, key: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): (<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x4_property_map_read">read</a>&lt;T: key&gt;(<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">object</a>: &Object&lt;T&gt;, key: &String): (String, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;) <b>acquires</b> <a href="property_map.md#0x4_property_map_PropertyMap">PropertyMap</a> {
+    <a href="property_map.md#0x4_property_map_assert_exists">assert_exists</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_object_address">object::object_address</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">object</a>));
+    <b>let</b> <a href="property_map.md#0x4_property_map">property_map</a> = <b>borrow_global</b>&lt;<a href="property_map.md#0x4_property_map_PropertyMap">PropertyMap</a>&gt;(<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_object_address">object::object_address</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">object</a>));
+    <b>let</b> property_value = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_borrow">simple_map::borrow</a>(&<a href="property_map.md#0x4_property_map">property_map</a>.inner, key);
+    <b>let</b> new_type = <a href="property_map.md#0x4_property_map_to_external_type">to_external_type</a>(property_value.type);
+    (new_type, property_value.value)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_property_map_assert_exists"></a>
+
+## Function `assert_exists`
+
+
+
+<pre><code><b>fun</b> <a href="property_map.md#0x4_property_map_assert_exists">assert_exists</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">object</a>: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="property_map.md#0x4_property_map_assert_exists">assert_exists</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">object</a>: <b>address</b>) {
+    <b>assert</b>!(
+        <b>exists</b>&lt;<a href="property_map.md#0x4_property_map_PropertyMap">PropertyMap</a>&gt;(<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">object</a>),
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="property_map.md#0x4_property_map_EPROPERTY_MAP_DOES_NOT_EXIST">EPROPERTY_MAP_DOES_NOT_EXIST</a>),
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_property_map_read_typed"></a>
+
+## Function `read_typed`
+
+Read a type and verify that the type is correct
+
+
+<pre><code><b>fun</b> <a href="property_map.md#0x4_property_map_read_typed">read_typed</a>&lt;T: key, V&gt;(<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">object</a>: &<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, key: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="property_map.md#0x4_property_map_read_typed">read_typed</a>&lt;T: key, V&gt;(<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">object</a>: &Object&lt;T&gt;, key: &String): <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; <b>acquires</b> <a href="property_map.md#0x4_property_map_PropertyMap">PropertyMap</a> {
+    <b>let</b> (type, value) = <a href="property_map.md#0x4_property_map_read">read</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">object</a>, key);
+    <b>assert</b>!(
+        type == <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_type_name">type_info::type_name</a>&lt;V&gt;(),
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="property_map.md#0x4_property_map_ETYPE_MISMATCH">ETYPE_MISMATCH</a>),
+    );
+    value
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_property_map_read_bool"></a>
+
+## Function `read_bool`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x4_property_map_read_bool">read_bool</a>&lt;T: key&gt;(<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">object</a>: &<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, key: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x4_property_map_read_bool">read_bool</a>&lt;T: key&gt;(<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">object</a>: &Object&lt;T&gt;, key: &String): bool <b>acquires</b> <a href="property_map.md#0x4_property_map_PropertyMap">PropertyMap</a> {
+    <b>let</b> value = <a href="property_map.md#0x4_property_map_read_typed">read_typed</a>&lt;T, bool&gt;(<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">object</a>, key);
+    <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_to_bool">from_bcs::to_bool</a>(value)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_property_map_read_u8"></a>
+
+## Function `read_u8`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x4_property_map_read_u8">read_u8</a>&lt;T: key&gt;(<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">object</a>: &<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, key: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): u8
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x4_property_map_read_u8">read_u8</a>&lt;T: key&gt;(<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">object</a>: &Object&lt;T&gt;, key: &String): u8 <b>acquires</b> <a href="property_map.md#0x4_property_map_PropertyMap">PropertyMap</a> {
+    <b>let</b> value = <a href="property_map.md#0x4_property_map_read_typed">read_typed</a>&lt;T, u8&gt;(<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">object</a>, key);
+    <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_to_u8">from_bcs::to_u8</a>(value)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_property_map_read_u16"></a>
+
+## Function `read_u16`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x4_property_map_read_u16">read_u16</a>&lt;T: key&gt;(<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">object</a>: &<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, key: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): u16
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x4_property_map_read_u16">read_u16</a>&lt;T: key&gt;(<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">object</a>: &Object&lt;T&gt;, key: &String): u16 <b>acquires</b> <a href="property_map.md#0x4_property_map_PropertyMap">PropertyMap</a> {
+    <b>let</b> value = <a href="property_map.md#0x4_property_map_read_typed">read_typed</a>&lt;T, u16&gt;(<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">object</a>, key);
+    <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_to_u16">from_bcs::to_u16</a>(value)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_property_map_read_u32"></a>
+
+## Function `read_u32`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x4_property_map_read_u32">read_u32</a>&lt;T: key&gt;(<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">object</a>: &<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, key: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): u32
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x4_property_map_read_u32">read_u32</a>&lt;T: key&gt;(<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">object</a>: &Object&lt;T&gt;, key: &String): u32 <b>acquires</b> <a href="property_map.md#0x4_property_map_PropertyMap">PropertyMap</a> {
+    <b>let</b> value = <a href="property_map.md#0x4_property_map_read_typed">read_typed</a>&lt;T, u32&gt;(<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">object</a>, key);
+    <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_to_u32">from_bcs::to_u32</a>(value)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_property_map_read_u64"></a>
+
+## Function `read_u64`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x4_property_map_read_u64">read_u64</a>&lt;T: key&gt;(<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">object</a>: &<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, key: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x4_property_map_read_u64">read_u64</a>&lt;T: key&gt;(<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">object</a>: &Object&lt;T&gt;, key: &String): u64 <b>acquires</b> <a href="property_map.md#0x4_property_map_PropertyMap">PropertyMap</a> {
+    <b>let</b> value = <a href="property_map.md#0x4_property_map_read_typed">read_typed</a>&lt;T, u64&gt;(<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">object</a>, key);
+    <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_to_u64">from_bcs::to_u64</a>(value)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_property_map_read_u128"></a>
+
+## Function `read_u128`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x4_property_map_read_u128">read_u128</a>&lt;T: key&gt;(<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">object</a>: &<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, key: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): u128
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x4_property_map_read_u128">read_u128</a>&lt;T: key&gt;(<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">object</a>: &Object&lt;T&gt;, key: &String): u128 <b>acquires</b> <a href="property_map.md#0x4_property_map_PropertyMap">PropertyMap</a> {
+    <b>let</b> value = <a href="property_map.md#0x4_property_map_read_typed">read_typed</a>&lt;T, u128&gt;(<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">object</a>, key);
+    <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_to_u128">from_bcs::to_u128</a>(value)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_property_map_read_u256"></a>
+
+## Function `read_u256`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x4_property_map_read_u256">read_u256</a>&lt;T: key&gt;(<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">object</a>: &<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, key: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): u256
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x4_property_map_read_u256">read_u256</a>&lt;T: key&gt;(<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">object</a>: &Object&lt;T&gt;, key: &String): u256 <b>acquires</b> <a href="property_map.md#0x4_property_map_PropertyMap">PropertyMap</a> {
+    <b>let</b> value = <a href="property_map.md#0x4_property_map_read_typed">read_typed</a>&lt;T, u256&gt;(<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">object</a>, key);
+    <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_to_u256">from_bcs::to_u256</a>(value)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_property_map_read_address"></a>
+
+## Function `read_address`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x4_property_map_read_address">read_address</a>&lt;T: key&gt;(<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">object</a>: &<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, key: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x4_property_map_read_address">read_address</a>&lt;T: key&gt;(<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">object</a>: &Object&lt;T&gt;, key: &String): <b>address</b> <b>acquires</b> <a href="property_map.md#0x4_property_map_PropertyMap">PropertyMap</a> {
+    <b>let</b> value = <a href="property_map.md#0x4_property_map_read_typed">read_typed</a>&lt;T, <b>address</b>&gt;(<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">object</a>, key);
+    <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_to_address">from_bcs::to_address</a>(value)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_property_map_read_bytes"></a>
+
+## Function `read_bytes`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x4_property_map_read_bytes">read_bytes</a>&lt;T: key&gt;(<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">object</a>: &<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, key: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x4_property_map_read_bytes">read_bytes</a>&lt;T: key&gt;(<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">object</a>: &Object&lt;T&gt;, key: &String): <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; <b>acquires</b> <a href="property_map.md#0x4_property_map_PropertyMap">PropertyMap</a> {
+    <b>let</b> value = <a href="property_map.md#0x4_property_map_read_typed">read_typed</a>&lt;T, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;(<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">object</a>, key);
+    <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_to_bytes">from_bcs::to_bytes</a>(value)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_property_map_read_string"></a>
+
+## Function `read_string`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x4_property_map_read_string">read_string</a>&lt;T: key&gt;(<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">object</a>: &<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;T&gt;, key: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x4_property_map_read_string">read_string</a>&lt;T: key&gt;(<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">object</a>: &Object&lt;T&gt;, key: &String): String <b>acquires</b> <a href="property_map.md#0x4_property_map_PropertyMap">PropertyMap</a> {
+    <b>let</b> value = <a href="property_map.md#0x4_property_map_read_typed">read_typed</a>&lt;T, String&gt;(<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">object</a>, key);
+    <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_to_string">from_bcs::to_string</a>(value)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_property_map_add"></a>
+
+## Function `add`
+
+Add a property, already bcs encoded as a <code><a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x4_property_map_add">add</a>(ref: &<a href="property_map.md#0x4_property_map_MutatorRef">property_map::MutatorRef</a>, key: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, type: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, value: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x4_property_map_add">add</a>(ref: &<a href="property_map.md#0x4_property_map_MutatorRef">MutatorRef</a>, key: String, type: String, value: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;) <b>acquires</b> <a href="property_map.md#0x4_property_map_PropertyMap">PropertyMap</a> {
+    <b>let</b> new_type = <a href="property_map.md#0x4_property_map_to_internal_type">to_internal_type</a>(type);
+    <a href="property_map.md#0x4_property_map_validate_type">validate_type</a>(new_type, value);
+    <a href="property_map.md#0x4_property_map_add_internal">add_internal</a>(ref, key, new_type, value);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_property_map_add_typed"></a>
+
+## Function `add_typed`
+
+Add a property that isn't already encoded as a <code><a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x4_property_map_add_typed">add_typed</a>&lt;T: drop&gt;(ref: &<a href="property_map.md#0x4_property_map_MutatorRef">property_map::MutatorRef</a>, key: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, value: T)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x4_property_map_add_typed">add_typed</a>&lt;T: drop&gt;(ref: &<a href="property_map.md#0x4_property_map_MutatorRef">MutatorRef</a>, key: String, value: T) <b>acquires</b> <a href="property_map.md#0x4_property_map_PropertyMap">PropertyMap</a> {
+    <b>let</b> type = <a href="property_map.md#0x4_property_map_type_info_to_internal_type">type_info_to_internal_type</a>&lt;T&gt;();
+    <a href="property_map.md#0x4_property_map_add_internal">add_internal</a>(ref, key, type, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs_to_bytes">bcs::to_bytes</a>(&value));
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_property_map_add_internal"></a>
+
+## Function `add_internal`
+
+
+
+<pre><code><b>fun</b> <a href="property_map.md#0x4_property_map_add_internal">add_internal</a>(ref: &<a href="property_map.md#0x4_property_map_MutatorRef">property_map::MutatorRef</a>, key: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, type: u8, value: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="property_map.md#0x4_property_map_add_internal">add_internal</a>(ref: &<a href="property_map.md#0x4_property_map_MutatorRef">MutatorRef</a>, key: String, type: u8, value: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;) <b>acquires</b> <a href="property_map.md#0x4_property_map_PropertyMap">PropertyMap</a> {
+    <a href="property_map.md#0x4_property_map_assert_exists">assert_exists</a>(ref.self);
+    <b>let</b> <a href="property_map.md#0x4_property_map">property_map</a> = <b>borrow_global_mut</b>&lt;<a href="property_map.md#0x4_property_map_PropertyMap">PropertyMap</a>&gt;(ref.self);
+    <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_add">simple_map::add</a>(&<b>mut</b> <a href="property_map.md#0x4_property_map">property_map</a>.inner, key, <a href="property_map.md#0x4_property_map_PropertyValue">PropertyValue</a> { type, value });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_property_map_update"></a>
+
+## Function `update`
+
+Updates a property in place already bcs encoded
+
+
+<pre><code><b>public</b> <b>fun</b> <b>update</b>(ref: &<a href="property_map.md#0x4_property_map_MutatorRef">property_map::MutatorRef</a>, key: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, type: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, value: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <b>update</b>(ref: &<a href="property_map.md#0x4_property_map_MutatorRef">MutatorRef</a>, key: &String, type: String, value: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;) <b>acquires</b> <a href="property_map.md#0x4_property_map_PropertyMap">PropertyMap</a> {
+    <b>let</b> new_type = <a href="property_map.md#0x4_property_map_to_internal_type">to_internal_type</a>(type);
+    <a href="property_map.md#0x4_property_map_validate_type">validate_type</a>(new_type, value);
+    <a href="property_map.md#0x4_property_map_update_internal">update_internal</a>(ref, key, new_type, value);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_property_map_update_typed"></a>
+
+## Function `update_typed`
+
+Updates a property in place that is not already bcs encoded
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x4_property_map_update_typed">update_typed</a>&lt;T: drop&gt;(ref: &<a href="property_map.md#0x4_property_map_MutatorRef">property_map::MutatorRef</a>, key: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, value: T)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x4_property_map_update_typed">update_typed</a>&lt;T: drop&gt;(ref: &<a href="property_map.md#0x4_property_map_MutatorRef">MutatorRef</a>, key: &String, value: T) <b>acquires</b> <a href="property_map.md#0x4_property_map_PropertyMap">PropertyMap</a> {
+    <b>let</b> type = <a href="property_map.md#0x4_property_map_type_info_to_internal_type">type_info_to_internal_type</a>&lt;T&gt;();
+    <a href="property_map.md#0x4_property_map_update_internal">update_internal</a>(ref, key, type, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs_to_bytes">bcs::to_bytes</a>(&value));
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_property_map_update_internal"></a>
+
+## Function `update_internal`
+
+
+
+<pre><code><b>fun</b> <a href="property_map.md#0x4_property_map_update_internal">update_internal</a>(ref: &<a href="property_map.md#0x4_property_map_MutatorRef">property_map::MutatorRef</a>, key: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, type: u8, value: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="property_map.md#0x4_property_map_update_internal">update_internal</a>(ref: &<a href="property_map.md#0x4_property_map_MutatorRef">MutatorRef</a>, key: &String, type: u8, value: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;) <b>acquires</b> <a href="property_map.md#0x4_property_map_PropertyMap">PropertyMap</a> {
+    <a href="property_map.md#0x4_property_map_assert_exists">assert_exists</a>(ref.self);
+    <b>let</b> <a href="property_map.md#0x4_property_map">property_map</a> = <b>borrow_global_mut</b>&lt;<a href="property_map.md#0x4_property_map_PropertyMap">PropertyMap</a>&gt;(ref.self);
+    <b>let</b> old_value = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_borrow_mut">simple_map::borrow_mut</a>(&<b>mut</b> <a href="property_map.md#0x4_property_map">property_map</a>.inner, key);
+    *old_value = <a href="property_map.md#0x4_property_map_PropertyValue">PropertyValue</a> { type, value };
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_property_map_remove"></a>
+
+## Function `remove`
+
+Removes a property from the map, ensuring that it does in fact exist
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x4_property_map_remove">remove</a>(ref: &<a href="property_map.md#0x4_property_map_MutatorRef">property_map::MutatorRef</a>, key: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x4_property_map_remove">remove</a>(ref: &<a href="property_map.md#0x4_property_map_MutatorRef">MutatorRef</a>, key: &String) <b>acquires</b> <a href="property_map.md#0x4_property_map_PropertyMap">PropertyMap</a> {
+    <a href="property_map.md#0x4_property_map_assert_exists">assert_exists</a>(ref.self);
+    <b>let</b> <a href="property_map.md#0x4_property_map">property_map</a> = <b>borrow_global_mut</b>&lt;<a href="property_map.md#0x4_property_map_PropertyMap">PropertyMap</a>&gt;(ref.self);
+    <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_remove">simple_map::remove</a>(&<b>mut</b> <a href="property_map.md#0x4_property_map">property_map</a>.inner, key);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_property_map_assert_end_to_end_input"></a>
+
+## Function `assert_end_to_end_input`
+
+
+
+<pre><code><b>fun</b> <a href="property_map.md#0x4_property_map_assert_end_to_end_input">assert_end_to_end_input</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">object</a>: <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_ObjectCore">object::ObjectCore</a>&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="property_map.md#0x4_property_map_assert_end_to_end_input">assert_end_to_end_input</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">object</a>: Object&lt;ObjectCore&gt;) <b>acquires</b> <a href="property_map.md#0x4_property_map_PropertyMap">PropertyMap</a> {
+    <b>assert</b>!(<a href="property_map.md#0x4_property_map_read_bool">read_bool</a>(&<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">object</a>, &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"bool")), 0);
+    <b>assert</b>!(<a href="property_map.md#0x4_property_map_read_u8">read_u8</a>(&<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">object</a>, &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"u8")) == 0x12, 1);
+    <b>assert</b>!(<a href="property_map.md#0x4_property_map_read_u16">read_u16</a>(&<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">object</a>, &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"u16")) == 0x1234, 2);
+    <b>assert</b>!(<a href="property_map.md#0x4_property_map_read_u32">read_u32</a>(&<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">object</a>, &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"u32")) == 0x12345678, 3);
+    <b>assert</b>!(<a href="property_map.md#0x4_property_map_read_u64">read_u64</a>(&<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">object</a>, &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"u64")) == 0x1234567812345678, 4);
+    <b>assert</b>!(<a href="property_map.md#0x4_property_map_read_u128">read_u128</a>(&<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">object</a>, &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"u128")) == 0x12345678123456781234567812345678, 5);
+    <b>assert</b>!(
+        <a href="property_map.md#0x4_property_map_read_u256">read_u256</a>(
+            &<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">object</a>,
+            &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"u256")
+        ) == 0x1234567812345678123456781234567812345678123456781234567812345678,
+        6
+    );
+    <b>assert</b>!(<a href="property_map.md#0x4_property_map_read_bytes">read_bytes</a>(&<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">object</a>, &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;")) == <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>[0x01], 7);
+    <b>assert</b>!(<a href="property_map.md#0x4_property_map_read_string">read_string</a>(&<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">object</a>, &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">0x1::string::String</a>")) == <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"a"), 8);
+
+    <b>assert</b>!(<a href="property_map.md#0x4_property_map_length">length</a>(&<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">object</a>) == 9, 9);
+}
+</code></pre>
+
+
+
+</details>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-token-objects/tests/compiler-v2-doc/royalty.md b/aptos-move/framework/aptos-token-objects/tests/compiler-v2-doc/royalty.md
new file mode 100644
index 0000000000000..491e716e7b89e
--- /dev/null
+++ b/aptos-move/framework/aptos-token-objects/tests/compiler-v2-doc/royalty.md
@@ -0,0 +1,401 @@
+
+<a id="0x4_royalty"></a>
+
+# Module `0x4::royalty`
+
+This defines an object-based Royalty. The royalty can be applied to either a collection or a
+token. Applications should read the royalty from the token, as it will read the appropriate
+royalty.
+
+
+-  [Resource `Royalty`](#0x4_royalty_Royalty)
+-  [Struct `MutatorRef`](#0x4_royalty_MutatorRef)
+-  [Constants](#@Constants_0)
+-  [Function `init`](#0x4_royalty_init)
+-  [Function `update`](#0x4_royalty_update)
+-  [Function `create`](#0x4_royalty_create)
+-  [Function `generate_mutator_ref`](#0x4_royalty_generate_mutator_ref)
+-  [Function `exists_at`](#0x4_royalty_exists_at)
+-  [Function `delete`](#0x4_royalty_delete)
+-  [Function `get`](#0x4_royalty_get)
+-  [Function `denominator`](#0x4_royalty_denominator)
+-  [Function `numerator`](#0x4_royalty_numerator)
+-  [Function `payee_address`](#0x4_royalty_payee_address)
+
+
+<pre><code><b>use</b> <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">0x1::object</a>;
+<b>use</b> <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option">0x1::option</a>;
+</code></pre>
+
+
+
+<a id="0x4_royalty_Royalty"></a>
+
+## Resource `Royalty`
+
+The royalty of a token within this collection
+
+Royalties are optional for a collection.  Royalty percentage is calculated
+by (numerator / denominator) * 100%
+
+
+<pre><code>#[resource_group_member(#[group = <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_ObjectGroup">0x1::object::ObjectGroup</a>])]
+<b>struct</b> <a href="royalty.md#0x4_royalty_Royalty">Royalty</a> <b>has</b> <b>copy</b>, drop, key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>numerator: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>denominator: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>payee_address: <b>address</b></code>
+</dt>
+<dd>
+ The recipient of royalty payments. See the <code>shared_account</code> for how to handle multiple
+ creators.
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x4_royalty_MutatorRef"></a>
+
+## Struct `MutatorRef`
+
+This enables creating or overwriting a <code><a href="royalty.md#0x4_royalty_MutatorRef">MutatorRef</a></code>.
+
+
+<pre><code><b>struct</b> <a href="royalty.md#0x4_royalty_MutatorRef">MutatorRef</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>inner: <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_ExtendRef">object::ExtendRef</a></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x4_royalty_EROYALTY_DENOMINATOR_IS_ZERO"></a>
+
+The royalty denominator cannot be 0
+
+
+<pre><code><b>const</b> <a href="royalty.md#0x4_royalty_EROYALTY_DENOMINATOR_IS_ZERO">EROYALTY_DENOMINATOR_IS_ZERO</a>: u64 = 3;
+</code></pre>
+
+
+
+<a id="0x4_royalty_EROYALTY_DOES_NOT_EXIST"></a>
+
+Royalty does not exist
+
+
+<pre><code><b>const</b> <a href="royalty.md#0x4_royalty_EROYALTY_DOES_NOT_EXIST">EROYALTY_DOES_NOT_EXIST</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x4_royalty_EROYALTY_EXCEEDS_MAXIMUM"></a>
+
+The royalty cannot be greater than 100%
+
+
+<pre><code><b>const</b> <a href="royalty.md#0x4_royalty_EROYALTY_EXCEEDS_MAXIMUM">EROYALTY_EXCEEDS_MAXIMUM</a>: u64 = 2;
+</code></pre>
+
+
+
+<a id="0x4_royalty_init"></a>
+
+## Function `init`
+
+Add a royalty, given a ConstructorRef.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="royalty.md#0x4_royalty_init">init</a>(ref: &<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>, <a href="royalty.md#0x4_royalty">royalty</a>: <a href="royalty.md#0x4_royalty_Royalty">royalty::Royalty</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="royalty.md#0x4_royalty_init">init</a>(ref: &ConstructorRef, <a href="royalty.md#0x4_royalty">royalty</a>: <a href="royalty.md#0x4_royalty_Royalty">Royalty</a>) {
+    <b>let</b> <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a> = <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_generate_signer">object::generate_signer</a>(ref);
+    <b>move_to</b>(&<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="royalty.md#0x4_royalty">royalty</a>);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_royalty_update"></a>
+
+## Function `update`
+
+Set the royalty if it does not exist, replace it otherwise.
+
+
+<pre><code><b>public</b> <b>fun</b> <b>update</b>(mutator_ref: &<a href="royalty.md#0x4_royalty_MutatorRef">royalty::MutatorRef</a>, <a href="royalty.md#0x4_royalty">royalty</a>: <a href="royalty.md#0x4_royalty_Royalty">royalty::Royalty</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <b>update</b>(mutator_ref: &<a href="royalty.md#0x4_royalty_MutatorRef">MutatorRef</a>, <a href="royalty.md#0x4_royalty">royalty</a>: <a href="royalty.md#0x4_royalty_Royalty">Royalty</a>) <b>acquires</b> <a href="royalty.md#0x4_royalty_Royalty">Royalty</a> {
+    <b>let</b> addr = <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_address_from_extend_ref">object::address_from_extend_ref</a>(&mutator_ref.inner);
+    <b>if</b> (<b>exists</b>&lt;<a href="royalty.md#0x4_royalty_Royalty">Royalty</a>&gt;(addr)) {
+        <b>move_from</b>&lt;<a href="royalty.md#0x4_royalty_Royalty">Royalty</a>&gt;(addr);
+    };
+
+    <b>let</b> <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a> = <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_generate_signer_for_extending">object::generate_signer_for_extending</a>(&mutator_ref.inner);
+    <b>move_to</b>(&<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="royalty.md#0x4_royalty">royalty</a>);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_royalty_create"></a>
+
+## Function `create`
+
+Creates a new royalty, verifying that it is a valid percentage
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="royalty.md#0x4_royalty_create">create</a>(numerator: u64, denominator: u64, payee_address: <b>address</b>): <a href="royalty.md#0x4_royalty_Royalty">royalty::Royalty</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="royalty.md#0x4_royalty_create">create</a>(numerator: u64, denominator: u64, payee_address: <b>address</b>): <a href="royalty.md#0x4_royalty_Royalty">Royalty</a> {
+    <b>assert</b>!(denominator != 0, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_out_of_range">error::out_of_range</a>(<a href="royalty.md#0x4_royalty_EROYALTY_DENOMINATOR_IS_ZERO">EROYALTY_DENOMINATOR_IS_ZERO</a>));
+    <b>assert</b>!(<a href="royalty.md#0x4_royalty_numerator">numerator</a> &lt;= denominator, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_out_of_range">error::out_of_range</a>(<a href="royalty.md#0x4_royalty_EROYALTY_EXCEEDS_MAXIMUM">EROYALTY_EXCEEDS_MAXIMUM</a>));
+
+    <a href="royalty.md#0x4_royalty_Royalty">Royalty</a> { numerator, denominator, payee_address }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_royalty_generate_mutator_ref"></a>
+
+## Function `generate_mutator_ref`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="royalty.md#0x4_royalty_generate_mutator_ref">generate_mutator_ref</a>(ref: <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_ExtendRef">object::ExtendRef</a>): <a href="royalty.md#0x4_royalty_MutatorRef">royalty::MutatorRef</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="royalty.md#0x4_royalty_generate_mutator_ref">generate_mutator_ref</a>(ref: ExtendRef): <a href="royalty.md#0x4_royalty_MutatorRef">MutatorRef</a> {
+    <a href="royalty.md#0x4_royalty_MutatorRef">MutatorRef</a> { inner: ref }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_royalty_exists_at"></a>
+
+## Function `exists_at`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="royalty.md#0x4_royalty_exists_at">exists_at</a>(addr: <b>address</b>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="royalty.md#0x4_royalty_exists_at">exists_at</a>(addr: <b>address</b>): bool {
+    <b>exists</b>&lt;<a href="royalty.md#0x4_royalty_Royalty">Royalty</a>&gt;(addr)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_royalty_delete"></a>
+
+## Function `delete`
+
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="royalty.md#0x4_royalty_delete">delete</a>(addr: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="royalty.md#0x4_royalty_delete">delete</a>(addr: <b>address</b>) <b>acquires</b> <a href="royalty.md#0x4_royalty_Royalty">Royalty</a> {
+    <b>assert</b>!(<b>exists</b>&lt;<a href="royalty.md#0x4_royalty_Royalty">Royalty</a>&gt;(addr), <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="royalty.md#0x4_royalty_EROYALTY_DOES_NOT_EXIST">EROYALTY_DOES_NOT_EXIST</a>));
+    <b>move_from</b>&lt;<a href="royalty.md#0x4_royalty_Royalty">Royalty</a>&gt;(addr);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_royalty_get"></a>
+
+## Function `get`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="royalty.md#0x4_royalty_get">get</a>&lt;T: key&gt;(maybe_royalty: <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="royalty.md#0x4_royalty_Royalty">royalty::Royalty</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="royalty.md#0x4_royalty_get">get</a>&lt;T: key&gt;(maybe_royalty: Object&lt;T&gt;): Option&lt;<a href="royalty.md#0x4_royalty_Royalty">Royalty</a>&gt; <b>acquires</b> <a href="royalty.md#0x4_royalty_Royalty">Royalty</a> {
+    <b>let</b> obj_addr = <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_object_address">object::object_address</a>(&maybe_royalty);
+    <b>if</b> (<b>exists</b>&lt;<a href="royalty.md#0x4_royalty_Royalty">Royalty</a>&gt;(obj_addr)) {
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(*<b>borrow_global</b>&lt;<a href="royalty.md#0x4_royalty_Royalty">Royalty</a>&gt;(obj_addr))
+    } <b>else</b> {
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>()
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_royalty_denominator"></a>
+
+## Function `denominator`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="royalty.md#0x4_royalty_denominator">denominator</a>(<a href="royalty.md#0x4_royalty">royalty</a>: &<a href="royalty.md#0x4_royalty_Royalty">royalty::Royalty</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="royalty.md#0x4_royalty_denominator">denominator</a>(<a href="royalty.md#0x4_royalty">royalty</a>: &<a href="royalty.md#0x4_royalty_Royalty">Royalty</a>): u64 {
+    <a href="royalty.md#0x4_royalty">royalty</a>.denominator
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_royalty_numerator"></a>
+
+## Function `numerator`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="royalty.md#0x4_royalty_numerator">numerator</a>(<a href="royalty.md#0x4_royalty">royalty</a>: &<a href="royalty.md#0x4_royalty_Royalty">royalty::Royalty</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="royalty.md#0x4_royalty_numerator">numerator</a>(<a href="royalty.md#0x4_royalty">royalty</a>: &<a href="royalty.md#0x4_royalty_Royalty">Royalty</a>): u64 {
+    <a href="royalty.md#0x4_royalty">royalty</a>.numerator
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_royalty_payee_address"></a>
+
+## Function `payee_address`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="royalty.md#0x4_royalty_payee_address">payee_address</a>(<a href="royalty.md#0x4_royalty">royalty</a>: &<a href="royalty.md#0x4_royalty_Royalty">royalty::Royalty</a>): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="royalty.md#0x4_royalty_payee_address">payee_address</a>(<a href="royalty.md#0x4_royalty">royalty</a>: &<a href="royalty.md#0x4_royalty_Royalty">Royalty</a>): <b>address</b> {
+    <a href="royalty.md#0x4_royalty">royalty</a>.payee_address
+}
+</code></pre>
+
+
+
+</details>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-token-objects/tests/compiler-v2-doc/token.md b/aptos-move/framework/aptos-token-objects/tests/compiler-v2-doc/token.md
new file mode 100644
index 0000000000000..d5dac5e4158ff
--- /dev/null
+++ b/aptos-move/framework/aptos-token-objects/tests/compiler-v2-doc/token.md
@@ -0,0 +1,1659 @@
+
+<a id="0x4_token"></a>
+
+# Module `0x4::token`
+
+This defines an object-based Token. The key differentiating features from the Aptos standard
+token are:
+* Decoupled token ownership from token data.
+* Explicit data model for token metadata via adjacent resources
+* Extensible framework for tokens
+
+
+-  [Resource `Token`](#0x4_token_Token)
+-  [Resource `TokenIdentifiers`](#0x4_token_TokenIdentifiers)
+-  [Resource `ConcurrentTokenIdentifiers`](#0x4_token_ConcurrentTokenIdentifiers)
+-  [Struct `BurnRef`](#0x4_token_BurnRef)
+-  [Struct `MutatorRef`](#0x4_token_MutatorRef)
+-  [Struct `MutationEvent`](#0x4_token_MutationEvent)
+-  [Struct `Mutation`](#0x4_token_Mutation)
+-  [Constants](#@Constants_0)
+-  [Function `create_common`](#0x4_token_create_common)
+-  [Function `create_common_with_collection`](#0x4_token_create_common_with_collection)
+-  [Function `create_token`](#0x4_token_create_token)
+-  [Function `create`](#0x4_token_create)
+-  [Function `create_numbered_token_object`](#0x4_token_create_numbered_token_object)
+-  [Function `create_numbered_token`](#0x4_token_create_numbered_token)
+-  [Function `create_named_token_object`](#0x4_token_create_named_token_object)
+-  [Function `create_named_token`](#0x4_token_create_named_token)
+-  [Function `create_named_token_from_seed`](#0x4_token_create_named_token_from_seed)
+-  [Function `create_from_account`](#0x4_token_create_from_account)
+-  [Function `create_token_address`](#0x4_token_create_token_address)
+-  [Function `create_token_address_with_seed`](#0x4_token_create_token_address_with_seed)
+-  [Function `create_token_seed`](#0x4_token_create_token_seed)
+-  [Function `create_token_name_with_seed`](#0x4_token_create_token_name_with_seed)
+-  [Function `generate_mutator_ref`](#0x4_token_generate_mutator_ref)
+-  [Function `generate_burn_ref`](#0x4_token_generate_burn_ref)
+-  [Function `address_from_burn_ref`](#0x4_token_address_from_burn_ref)
+-  [Function `borrow`](#0x4_token_borrow)
+-  [Function `creator`](#0x4_token_creator)
+-  [Function `collection_name`](#0x4_token_collection_name)
+-  [Function `collection_object`](#0x4_token_collection_object)
+-  [Function `description`](#0x4_token_description)
+-  [Function `name`](#0x4_token_name)
+-  [Function `uri`](#0x4_token_uri)
+-  [Function `royalty`](#0x4_token_royalty)
+-  [Function `index`](#0x4_token_index)
+-  [Function `borrow_mut`](#0x4_token_borrow_mut)
+-  [Function `burn`](#0x4_token_burn)
+-  [Function `set_description`](#0x4_token_set_description)
+-  [Function `set_name`](#0x4_token_set_name)
+-  [Function `set_uri`](#0x4_token_set_uri)
+
+
+<pre><code><b>use</b> <a href="../../../aptos-framework/tests/compiler-v2-doc/aggregator_v2.md#0x1_aggregator_v2">0x1::aggregator_v2</a>;
+<b>use</b> <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event">0x1::event</a>;
+<b>use</b> <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features">0x1::features</a>;
+<b>use</b> <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">0x1::object</a>;
+<b>use</b> <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option">0x1::option</a>;
+<b>use</b> <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">0x1::signer</a>;
+<b>use</b> <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string">0x1::string</a>;
+<b>use</b> <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">0x1::vector</a>;
+<b>use</b> <a href="collection.md#0x4_collection">0x4::collection</a>;
+<b>use</b> <a href="royalty.md#0x4_royalty">0x4::royalty</a>;
+</code></pre>
+
+
+
+<a id="0x4_token_Token"></a>
+
+## Resource `Token`
+
+Represents the common fields to all tokens.
+
+
+<pre><code>#[resource_group_member(#[group = <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_ObjectGroup">0x1::object::ObjectGroup</a>])]
+<b>struct</b> <a href="token.md#0x4_token_Token">Token</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code><a href="collection.md#0x4_collection">collection</a>: <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;<a href="collection.md#0x4_collection_Collection">collection::Collection</a>&gt;</code>
+</dt>
+<dd>
+ The collection from which this token resides.
+</dd>
+<dt>
+<code>index: u64</code>
+</dt>
+<dd>
+ Deprecated in favor of <code>index</code> inside TokenIdentifiers.
+ Was populated until concurrent_token_v2_enabled feature flag was enabled.
+
+ Unique identifier within the collection, optional, 0 means unassigned
+</dd>
+<dt>
+<code>description: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+ A brief description of the token.
+</dd>
+<dt>
+<code>name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+ Deprecated in favor of <code>name</code> inside TokenIdentifiers.
+ Was populated until concurrent_token_v2_enabled feature flag was enabled.
+
+ The name of the token, which should be unique within the collection; the length of name
+ should be smaller than 128, characters, eg: "Aptos Animal #1234"
+</dd>
+<dt>
+<code>uri: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+ The Uniform Resource Identifier (uri) pointing to the JSON file stored in off-chain
+ storage; the URL length will likely need a maximum any suggestions?
+</dd>
+<dt>
+<code>mutation_events: <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="token.md#0x4_token_MutationEvent">token::MutationEvent</a>&gt;</code>
+</dt>
+<dd>
+ Emitted upon any mutation of the token.
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x4_token_TokenIdentifiers"></a>
+
+## Resource `TokenIdentifiers`
+
+Represents first addition to the common fields for all tokens
+Started being populated once aggregator_v2_api_enabled was enabled.
+
+
+<pre><code>#[resource_group_member(#[group = <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_ObjectGroup">0x1::object::ObjectGroup</a>])]
+<b>struct</b> <a href="token.md#0x4_token_TokenIdentifiers">TokenIdentifiers</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>index: <a href="../../../aptos-framework/tests/compiler-v2-doc/aggregator_v2.md#0x1_aggregator_v2_AggregatorSnapshot">aggregator_v2::AggregatorSnapshot</a>&lt;u64&gt;</code>
+</dt>
+<dd>
+ Unique identifier within the collection, optional, 0 means unassigned
+</dd>
+<dt>
+<code>name: <a href="../../../aptos-framework/tests/compiler-v2-doc/aggregator_v2.md#0x1_aggregator_v2_DerivedStringSnapshot">aggregator_v2::DerivedStringSnapshot</a></code>
+</dt>
+<dd>
+ The name of the token, which should be unique within the collection; the length of name
+ should be smaller than 128, characters, eg: "Aptos Animal #1234"
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x4_token_ConcurrentTokenIdentifiers"></a>
+
+## Resource `ConcurrentTokenIdentifiers`
+
+
+
+<pre><code>#[resource_group_member(#[group = <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_ObjectGroup">0x1::object::ObjectGroup</a>])]
+#[deprecated]
+<b>struct</b> <a href="token.md#0x4_token_ConcurrentTokenIdentifiers">ConcurrentTokenIdentifiers</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>index: <a href="../../../aptos-framework/tests/compiler-v2-doc/aggregator_v2.md#0x1_aggregator_v2_AggregatorSnapshot">aggregator_v2::AggregatorSnapshot</a>&lt;u64&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>name: <a href="../../../aptos-framework/tests/compiler-v2-doc/aggregator_v2.md#0x1_aggregator_v2_AggregatorSnapshot">aggregator_v2::AggregatorSnapshot</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x4_token_BurnRef"></a>
+
+## Struct `BurnRef`
+
+This enables burning an NFT, if possible, it will also delete the object. Note, the data
+in inner and self occupies 32-bytes each, rather than have both, this data structure makes
+a small optimization to support either and take a fixed amount of 34-bytes.
+
+
+<pre><code><b>struct</b> <a href="token.md#0x4_token_BurnRef">BurnRef</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>inner: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_DeleteRef">object::DeleteRef</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>self: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<b>address</b>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x4_token_MutatorRef"></a>
+
+## Struct `MutatorRef`
+
+This enables mutating description and URI by higher level services.
+
+
+<pre><code><b>struct</b> <a href="token.md#0x4_token_MutatorRef">MutatorRef</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>self: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x4_token_MutationEvent"></a>
+
+## Struct `MutationEvent`
+
+Contains the mutated fields name. This makes the life of indexers easier, so that they can
+directly understand the behavior in a writeset.
+
+
+<pre><code><b>struct</b> <a href="token.md#0x4_token_MutationEvent">MutationEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>mutated_field_name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>old_value: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>new_value: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x4_token_Mutation"></a>
+
+## Struct `Mutation`
+
+
+
+<pre><code>#[<a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event">event</a>]
+<b>struct</b> <a href="token.md#0x4_token_Mutation">Mutation</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>token_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>mutated_field_name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>old_value: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>new_value: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x4_token_EURI_TOO_LONG"></a>
+
+The URI is over the maximum length
+
+
+<pre><code><b>const</b> <a href="token.md#0x4_token_EURI_TOO_LONG">EURI_TOO_LONG</a>: u64 = 5;
+</code></pre>
+
+
+
+<a id="0x4_token_MAX_URI_LENGTH"></a>
+
+
+
+<pre><code><b>const</b> <a href="token.md#0x4_token_MAX_URI_LENGTH">MAX_URI_LENGTH</a>: u64 = 512;
+</code></pre>
+
+
+
+<a id="0x4_token_ENOT_OWNER"></a>
+
+The calling signer is not the owner
+
+
+<pre><code><b>const</b> <a href="token.md#0x4_token_ENOT_OWNER">ENOT_OWNER</a>: u64 = 8;
+</code></pre>
+
+
+
+<a id="0x4_token_EDESCRIPTION_TOO_LONG"></a>
+
+The description is over the maximum length
+
+
+<pre><code><b>const</b> <a href="token.md#0x4_token_EDESCRIPTION_TOO_LONG">EDESCRIPTION_TOO_LONG</a>: u64 = 6;
+</code></pre>
+
+
+
+<a id="0x4_token_MAX_DESCRIPTION_LENGTH"></a>
+
+
+
+<pre><code><b>const</b> <a href="token.md#0x4_token_MAX_DESCRIPTION_LENGTH">MAX_DESCRIPTION_LENGTH</a>: u64 = 2048;
+</code></pre>
+
+
+
+<a id="0x4_token_EFIELD_NOT_MUTABLE"></a>
+
+The field being changed is not mutable
+
+
+<pre><code><b>const</b> <a href="token.md#0x4_token_EFIELD_NOT_MUTABLE">EFIELD_NOT_MUTABLE</a>: u64 = 3;
+</code></pre>
+
+
+
+<a id="0x4_token_ENOT_CREATOR"></a>
+
+The provided signer is not the creator
+
+
+<pre><code><b>const</b> <a href="token.md#0x4_token_ENOT_CREATOR">ENOT_CREATOR</a>: u64 = 2;
+</code></pre>
+
+
+
+<a id="0x4_token_ESEED_TOO_LONG"></a>
+
+The seed is over the maximum length
+
+
+<pre><code><b>const</b> <a href="token.md#0x4_token_ESEED_TOO_LONG">ESEED_TOO_LONG</a>: u64 = 7;
+</code></pre>
+
+
+
+<a id="0x4_token_ETOKEN_DOES_NOT_EXIST"></a>
+
+The token does not exist
+
+
+<pre><code><b>const</b> <a href="token.md#0x4_token_ETOKEN_DOES_NOT_EXIST">ETOKEN_DOES_NOT_EXIST</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x4_token_ETOKEN_NAME_TOO_LONG"></a>
+
+The token name is over the maximum length
+
+
+<pre><code><b>const</b> <a href="token.md#0x4_token_ETOKEN_NAME_TOO_LONG">ETOKEN_NAME_TOO_LONG</a>: u64 = 4;
+</code></pre>
+
+
+
+<a id="0x4_token_MAX_TOKEN_NAME_LENGTH"></a>
+
+
+
+<pre><code><b>const</b> <a href="token.md#0x4_token_MAX_TOKEN_NAME_LENGTH">MAX_TOKEN_NAME_LENGTH</a>: u64 = 128;
+</code></pre>
+
+
+
+<a id="0x4_token_MAX_TOKEN_SEED_LENGTH"></a>
+
+
+
+<pre><code><b>const</b> <a href="token.md#0x4_token_MAX_TOKEN_SEED_LENGTH">MAX_TOKEN_SEED_LENGTH</a>: u64 = 128;
+</code></pre>
+
+
+
+<a id="0x4_token_create_common"></a>
+
+## Function `create_common`
+
+
+
+<pre><code><b>fun</b> <a href="token.md#0x4_token_create_common">create_common</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, constructor_ref: &<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>, collection_name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, description: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, name_prefix: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, name_with_index_suffix: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;, <a href="royalty.md#0x4_royalty">royalty</a>: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="royalty.md#0x4_royalty_Royalty">royalty::Royalty</a>&gt;, uri: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="token.md#0x4_token_create_common">create_common</a>(
+    creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    constructor_ref: &ConstructorRef,
+    collection_name: String,
+    description: String,
+    name_prefix: String,
+    // If <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>, numbered <a href="token.md#0x4_token">token</a> is created - i.e. index is appended <b>to</b> the name.
+    // If <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>, name_prefix is the full name of the <a href="token.md#0x4_token">token</a>.
+    name_with_index_suffix: Option&lt;String&gt;,
+    <a href="royalty.md#0x4_royalty">royalty</a>: Option&lt;Royalty&gt;,
+    uri: String,
+) {
+    <b>let</b> creator_address = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(creator);
+    <b>let</b> collection_addr = <a href="collection.md#0x4_collection_create_collection_address">collection::create_collection_address</a>(&creator_address, &collection_name);
+    <b>let</b> <a href="collection.md#0x4_collection">collection</a> = <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_address_to_object">object::address_to_object</a>&lt;Collection&gt;(collection_addr);
+
+    <a href="token.md#0x4_token_create_common_with_collection">create_common_with_collection</a>(
+        creator,
+        constructor_ref,
+        <a href="collection.md#0x4_collection">collection</a>,
+        description,
+        name_prefix,
+        name_with_index_suffix,
+        <a href="royalty.md#0x4_royalty">royalty</a>,
+        uri
+    )
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_token_create_common_with_collection"></a>
+
+## Function `create_common_with_collection`
+
+
+
+<pre><code><b>fun</b> <a href="token.md#0x4_token_create_common_with_collection">create_common_with_collection</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, constructor_ref: &<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>, <a href="collection.md#0x4_collection">collection</a>: <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;<a href="collection.md#0x4_collection_Collection">collection::Collection</a>&gt;, description: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, name_prefix: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, name_with_index_suffix: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;, <a href="royalty.md#0x4_royalty">royalty</a>: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="royalty.md#0x4_royalty_Royalty">royalty::Royalty</a>&gt;, uri: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="token.md#0x4_token_create_common_with_collection">create_common_with_collection</a>(
+    creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    constructor_ref: &ConstructorRef,
+    <a href="collection.md#0x4_collection">collection</a>: Object&lt;Collection&gt;,
+    description: String,
+    name_prefix: String,
+    // If <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>, numbered <a href="token.md#0x4_token">token</a> is created - i.e. index is appended <b>to</b> the name.
+    // If <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>, name_prefix is the full name of the <a href="token.md#0x4_token">token</a>.
+    name_with_index_suffix: Option&lt;String&gt;,
+    <a href="royalty.md#0x4_royalty">royalty</a>: Option&lt;Royalty&gt;,
+    uri: String,
+) {
+    <b>assert</b>!(<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_owner">object::owner</a>(<a href="collection.md#0x4_collection">collection</a>) == <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(creator), <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_unauthenticated">error::unauthenticated</a>(<a href="token.md#0x4_token_ENOT_OWNER">ENOT_OWNER</a>));
+
+    <b>if</b> (<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&name_with_index_suffix)) {
+        // Be conservative, <b>as</b> we don't know what length the index will be, and <b>assume</b> worst case (20 chars in MAX_U64)
+        <b>assert</b>!(
+            <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_length">string::length</a>(&name_prefix) + 20 + <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_length">string::length</a>(
+                <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(&name_with_index_suffix)
+            ) &lt;= <a href="token.md#0x4_token_MAX_TOKEN_NAME_LENGTH">MAX_TOKEN_NAME_LENGTH</a>,
+            <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_out_of_range">error::out_of_range</a>(<a href="token.md#0x4_token_ETOKEN_NAME_TOO_LONG">ETOKEN_NAME_TOO_LONG</a>)
+        );
+    } <b>else</b> {
+        <b>assert</b>!(<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_length">string::length</a>(&name_prefix) &lt;= <a href="token.md#0x4_token_MAX_TOKEN_NAME_LENGTH">MAX_TOKEN_NAME_LENGTH</a>, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_out_of_range">error::out_of_range</a>(<a href="token.md#0x4_token_ETOKEN_NAME_TOO_LONG">ETOKEN_NAME_TOO_LONG</a>));
+    };
+    <b>assert</b>!(<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_length">string::length</a>(&description) &lt;= <a href="token.md#0x4_token_MAX_DESCRIPTION_LENGTH">MAX_DESCRIPTION_LENGTH</a>, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_out_of_range">error::out_of_range</a>(<a href="token.md#0x4_token_EDESCRIPTION_TOO_LONG">EDESCRIPTION_TOO_LONG</a>));
+    <b>assert</b>!(<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_length">string::length</a>(&uri) &lt;= <a href="token.md#0x4_token_MAX_URI_LENGTH">MAX_URI_LENGTH</a>, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_out_of_range">error::out_of_range</a>(<a href="token.md#0x4_token_EURI_TOO_LONG">EURI_TOO_LONG</a>));
+
+    <b>let</b> object_signer = <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_generate_signer">object::generate_signer</a>(constructor_ref);
+
+    <b>let</b> index = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_destroy_with_default">option::destroy_with_default</a>(
+        <a href="collection.md#0x4_collection_increment_supply">collection::increment_supply</a>(&<a href="collection.md#0x4_collection">collection</a>, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(&object_signer)),
+        <a href="../../../aptos-framework/tests/compiler-v2-doc/aggregator_v2.md#0x1_aggregator_v2_create_snapshot">aggregator_v2::create_snapshot</a>&lt;u64&gt;(0)
+    );
+
+    // If create_numbered_token called us, add index <b>to</b> the name.
+    <b>let</b> name = <b>if</b> (<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&name_with_index_suffix)) {
+        <a href="../../../aptos-framework/tests/compiler-v2-doc/aggregator_v2.md#0x1_aggregator_v2_derive_string_concat">aggregator_v2::derive_string_concat</a>(name_prefix, &index, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_extract">option::extract</a>(&<b>mut</b> name_with_index_suffix))
+    } <b>else</b> {
+        <a href="../../../aptos-framework/tests/compiler-v2-doc/aggregator_v2.md#0x1_aggregator_v2_create_derived_string">aggregator_v2::create_derived_string</a>(name_prefix)
+    };
+
+    <b>let</b> deprecated_index = 0;
+    <b>let</b> deprecated_name = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"");
+
+    <b>let</b> token_concurrent = <a href="token.md#0x4_token_TokenIdentifiers">TokenIdentifiers</a> {
+        index,
+        name,
+    };
+    <b>move_to</b>(&object_signer, token_concurrent);
+
+    <b>let</b> <a href="token.md#0x4_token">token</a> = <a href="token.md#0x4_token_Token">Token</a> {
+        <a href="collection.md#0x4_collection">collection</a>,
+        index: deprecated_index,
+        description,
+        name: deprecated_name,
+        uri,
+        mutation_events: <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_new_event_handle">object::new_event_handle</a>(&object_signer),
+    };
+    <b>move_to</b>(&object_signer, <a href="token.md#0x4_token">token</a>);
+
+    <b>if</b> (<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&<a href="royalty.md#0x4_royalty">royalty</a>)) {
+        <a href="royalty.md#0x4_royalty_init">royalty::init</a>(constructor_ref, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_extract">option::extract</a>(&<b>mut</b> <a href="royalty.md#0x4_royalty">royalty</a>))
+    };
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_token_create_token"></a>
+
+## Function `create_token`
+
+Creates a new token object with a unique address and returns the ConstructorRef
+for additional specialization.
+This takes in the collection object instead of the collection name.
+This function must be called if the collection name has been previously changed.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x4_token_create_token">create_token</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="collection.md#0x4_collection">collection</a>: <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;<a href="collection.md#0x4_collection_Collection">collection::Collection</a>&gt;, description: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, <a href="royalty.md#0x4_royalty">royalty</a>: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="royalty.md#0x4_royalty_Royalty">royalty::Royalty</a>&gt;, uri: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x4_token_create_token">create_token</a>(
+    creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    <a href="collection.md#0x4_collection">collection</a>: Object&lt;Collection&gt;,
+    description: String,
+    name: String,
+    <a href="royalty.md#0x4_royalty">royalty</a>: Option&lt;Royalty&gt;,
+    uri: String,
+): ConstructorRef {
+    <b>let</b> creator_address = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(creator);
+    <b>let</b> constructor_ref = <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_create_object">object::create_object</a>(creator_address);
+    <a href="token.md#0x4_token_create_common_with_collection">create_common_with_collection</a>(
+        creator,
+        &constructor_ref,
+        <a href="collection.md#0x4_collection">collection</a>,
+        description,
+        name,
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>(),
+        <a href="royalty.md#0x4_royalty">royalty</a>,
+        uri
+    );
+    constructor_ref
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_token_create"></a>
+
+## Function `create`
+
+Creates a new token object with a unique address and returns the ConstructorRef
+for additional specialization.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x4_token_create">create</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, collection_name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, description: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, <a href="royalty.md#0x4_royalty">royalty</a>: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="royalty.md#0x4_royalty_Royalty">royalty::Royalty</a>&gt;, uri: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x4_token_create">create</a>(
+    creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    collection_name: String,
+    description: String,
+    name: String,
+    <a href="royalty.md#0x4_royalty">royalty</a>: Option&lt;Royalty&gt;,
+    uri: String,
+): ConstructorRef {
+    <b>let</b> creator_address = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(creator);
+    <b>let</b> constructor_ref = <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_create_object">object::create_object</a>(creator_address);
+    <a href="token.md#0x4_token_create_common">create_common</a>(
+        creator,
+        &constructor_ref,
+        collection_name,
+        description,
+        name,
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>(),
+        <a href="royalty.md#0x4_royalty">royalty</a>,
+        uri
+    );
+    constructor_ref
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_token_create_numbered_token_object"></a>
+
+## Function `create_numbered_token_object`
+
+Creates a new token object with a unique address and returns the ConstructorRef
+for additional specialization.
+The name is created by concatenating the (name_prefix, index, name_suffix).
+This function allows creating tokens in parallel, from the same collection,
+while providing sequential names.
+
+This takes in the collection object instead of the collection name.
+This function must be called if the collection name has been previously changed.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x4_token_create_numbered_token_object">create_numbered_token_object</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="collection.md#0x4_collection">collection</a>: <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;<a href="collection.md#0x4_collection_Collection">collection::Collection</a>&gt;, description: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, name_with_index_prefix: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, name_with_index_suffix: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, <a href="royalty.md#0x4_royalty">royalty</a>: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="royalty.md#0x4_royalty_Royalty">royalty::Royalty</a>&gt;, uri: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x4_token_create_numbered_token_object">create_numbered_token_object</a>(
+    creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    <a href="collection.md#0x4_collection">collection</a>: Object&lt;Collection&gt;,
+    description: String,
+    name_with_index_prefix: String,
+    name_with_index_suffix: String,
+    <a href="royalty.md#0x4_royalty">royalty</a>: Option&lt;Royalty&gt;,
+    uri: String,
+): ConstructorRef {
+    <b>let</b> creator_address = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(creator);
+    <b>let</b> constructor_ref = <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_create_object">object::create_object</a>(creator_address);
+    <a href="token.md#0x4_token_create_common_with_collection">create_common_with_collection</a>(
+        creator,
+        &constructor_ref,
+        <a href="collection.md#0x4_collection">collection</a>,
+        description,
+        name_with_index_prefix,
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(name_with_index_suffix),
+        <a href="royalty.md#0x4_royalty">royalty</a>,
+        uri
+    );
+    constructor_ref
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_token_create_numbered_token"></a>
+
+## Function `create_numbered_token`
+
+Creates a new token object with a unique address and returns the ConstructorRef
+for additional specialization.
+The name is created by concatenating the (name_prefix, index, name_suffix).
+This function will allow creating tokens in parallel, from the same collection,
+while providing sequential names.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x4_token_create_numbered_token">create_numbered_token</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, collection_name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, description: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, name_with_index_prefix: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, name_with_index_suffix: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, <a href="royalty.md#0x4_royalty">royalty</a>: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="royalty.md#0x4_royalty_Royalty">royalty::Royalty</a>&gt;, uri: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x4_token_create_numbered_token">create_numbered_token</a>(
+    creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    collection_name: String,
+    description: String,
+    name_with_index_prefix: String,
+    name_with_index_suffix: String,
+    <a href="royalty.md#0x4_royalty">royalty</a>: Option&lt;Royalty&gt;,
+    uri: String,
+): ConstructorRef {
+    <b>let</b> creator_address = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(creator);
+    <b>let</b> constructor_ref = <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_create_object">object::create_object</a>(creator_address);
+    <a href="token.md#0x4_token_create_common">create_common</a>(
+        creator,
+        &constructor_ref,
+        collection_name,
+        description,
+        name_with_index_prefix,
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(name_with_index_suffix),
+        <a href="royalty.md#0x4_royalty">royalty</a>,
+        uri
+    );
+    constructor_ref
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_token_create_named_token_object"></a>
+
+## Function `create_named_token_object`
+
+Creates a new token object from a token name and returns the ConstructorRef for
+additional specialization.
+This function must be called if the collection name has been previously changed.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x4_token_create_named_token_object">create_named_token_object</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="collection.md#0x4_collection">collection</a>: <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;<a href="collection.md#0x4_collection_Collection">collection::Collection</a>&gt;, description: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, <a href="royalty.md#0x4_royalty">royalty</a>: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="royalty.md#0x4_royalty_Royalty">royalty::Royalty</a>&gt;, uri: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x4_token_create_named_token_object">create_named_token_object</a>(
+    creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    <a href="collection.md#0x4_collection">collection</a>: Object&lt;Collection&gt;,
+    description: String,
+    name: String,
+    <a href="royalty.md#0x4_royalty">royalty</a>: Option&lt;Royalty&gt;,
+    uri: String,
+): ConstructorRef {
+    <b>let</b> seed = <a href="token.md#0x4_token_create_token_seed">create_token_seed</a>(&<a href="collection.md#0x4_collection_name">collection::name</a>(<a href="collection.md#0x4_collection">collection</a>), &name);
+    <b>let</b> constructor_ref = <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_create_named_object">object::create_named_object</a>(creator, seed);
+    <a href="token.md#0x4_token_create_common_with_collection">create_common_with_collection</a>(
+        creator,
+        &constructor_ref,
+        <a href="collection.md#0x4_collection">collection</a>,
+        description,
+        name,
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>(),
+        <a href="royalty.md#0x4_royalty">royalty</a>,
+        uri
+    );
+    constructor_ref
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_token_create_named_token"></a>
+
+## Function `create_named_token`
+
+Creates a new token object from a token name and returns the ConstructorRef for
+additional specialization.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x4_token_create_named_token">create_named_token</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, collection_name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, description: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, <a href="royalty.md#0x4_royalty">royalty</a>: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="royalty.md#0x4_royalty_Royalty">royalty::Royalty</a>&gt;, uri: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x4_token_create_named_token">create_named_token</a>(
+    creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    collection_name: String,
+    description: String,
+    name: String,
+    <a href="royalty.md#0x4_royalty">royalty</a>: Option&lt;Royalty&gt;,
+    uri: String,
+): ConstructorRef {
+    <b>let</b> seed = <a href="token.md#0x4_token_create_token_seed">create_token_seed</a>(&collection_name, &name);
+
+    <b>let</b> constructor_ref = <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_create_named_object">object::create_named_object</a>(creator, seed);
+    <a href="token.md#0x4_token_create_common">create_common</a>(
+        creator,
+        &constructor_ref,
+        collection_name,
+        description,
+        name,
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>(),
+        <a href="royalty.md#0x4_royalty">royalty</a>,
+        uri
+    );
+    constructor_ref
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_token_create_named_token_from_seed"></a>
+
+## Function `create_named_token_from_seed`
+
+Creates a new token object from a token name and seed.
+Returns the ConstructorRef for additional specialization.
+This function must be called if the collection name has been previously changed.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x4_token_create_named_token_from_seed">create_named_token_from_seed</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="collection.md#0x4_collection">collection</a>: <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;<a href="collection.md#0x4_collection_Collection">collection::Collection</a>&gt;, description: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, seed: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, <a href="royalty.md#0x4_royalty">royalty</a>: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="royalty.md#0x4_royalty_Royalty">royalty::Royalty</a>&gt;, uri: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x4_token_create_named_token_from_seed">create_named_token_from_seed</a>(
+    creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    <a href="collection.md#0x4_collection">collection</a>: Object&lt;Collection&gt;,
+    description: String,
+    name: String,
+    seed: String,
+    <a href="royalty.md#0x4_royalty">royalty</a>: Option&lt;Royalty&gt;,
+    uri: String,
+): ConstructorRef {
+    <b>let</b> seed = <a href="token.md#0x4_token_create_token_name_with_seed">create_token_name_with_seed</a>(&<a href="collection.md#0x4_collection_name">collection::name</a>(<a href="collection.md#0x4_collection">collection</a>), &name, &seed);
+    <b>let</b> constructor_ref = <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_create_named_object">object::create_named_object</a>(creator, seed);
+    <a href="token.md#0x4_token_create_common_with_collection">create_common_with_collection</a>(creator, &constructor_ref, <a href="collection.md#0x4_collection">collection</a>, description, name, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>(), <a href="royalty.md#0x4_royalty">royalty</a>, uri);
+    constructor_ref
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_token_create_from_account"></a>
+
+## Function `create_from_account`
+
+DEPRECATED: Use <code>create</code> instead for identical behavior.
+
+Creates a new token object from an account GUID and returns the ConstructorRef for
+additional specialization.
+
+
+<pre><code>#[deprecated]
+<b>public</b> <b>fun</b> <a href="token.md#0x4_token_create_from_account">create_from_account</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, collection_name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, description: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, <a href="royalty.md#0x4_royalty">royalty</a>: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="royalty.md#0x4_royalty_Royalty">royalty::Royalty</a>&gt;, uri: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x4_token_create_from_account">create_from_account</a>(
+    creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    collection_name: String,
+    description: String,
+    name: String,
+    <a href="royalty.md#0x4_royalty">royalty</a>: Option&lt;Royalty&gt;,
+    uri: String,
+): ConstructorRef {
+    <b>let</b> constructor_ref = <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_create_object_from_account">object::create_object_from_account</a>(creator);
+    <a href="token.md#0x4_token_create_common">create_common</a>(
+        creator,
+        &constructor_ref,
+        collection_name,
+        description,
+        name,
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>(),
+        <a href="royalty.md#0x4_royalty">royalty</a>,
+        uri
+    );
+    constructor_ref
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_token_create_token_address"></a>
+
+## Function `create_token_address`
+
+Generates the token's address based upon the creator's address, the collection's name and the token's name.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x4_token_create_token_address">create_token_address</a>(creator: &<b>address</b>, <a href="collection.md#0x4_collection">collection</a>: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, name: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x4_token_create_token_address">create_token_address</a>(creator: &<b>address</b>, <a href="collection.md#0x4_collection">collection</a>: &String, name: &String): <b>address</b> {
+    <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_create_object_address">object::create_object_address</a>(creator, <a href="token.md#0x4_token_create_token_seed">create_token_seed</a>(<a href="collection.md#0x4_collection">collection</a>, name))
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_token_create_token_address_with_seed"></a>
+
+## Function `create_token_address_with_seed`
+
+Generates the token's address based upon the creator's address, the collection object and the token's name and seed.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="token.md#0x4_token_create_token_address_with_seed">create_token_address_with_seed</a>(creator: <b>address</b>, <a href="collection.md#0x4_collection">collection</a>: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, seed: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x4_token_create_token_address_with_seed">create_token_address_with_seed</a>(creator: <b>address</b>, <a href="collection.md#0x4_collection">collection</a>: String, name: String, seed: String): <b>address</b> {
+    <b>let</b> seed = <a href="token.md#0x4_token_create_token_name_with_seed">create_token_name_with_seed</a>(&<a href="collection.md#0x4_collection">collection</a>, &name, &seed);
+    <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_create_object_address">object::create_object_address</a>(&creator, seed)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_token_create_token_seed"></a>
+
+## Function `create_token_seed`
+
+Named objects are derived from a seed, the token's seed is its name appended to the collection's name.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x4_token_create_token_seed">create_token_seed</a>(<a href="collection.md#0x4_collection">collection</a>: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, name: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x4_token_create_token_seed">create_token_seed</a>(<a href="collection.md#0x4_collection">collection</a>: &String, name: &String): <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; {
+    <b>assert</b>!(<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_length">string::length</a>(name) &lt;= <a href="token.md#0x4_token_MAX_TOKEN_NAME_LENGTH">MAX_TOKEN_NAME_LENGTH</a>, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_out_of_range">error::out_of_range</a>(<a href="token.md#0x4_token_ETOKEN_NAME_TOO_LONG">ETOKEN_NAME_TOO_LONG</a>));
+    <b>let</b> seed = *<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_bytes">string::bytes</a>(<a href="collection.md#0x4_collection">collection</a>);
+    <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_append">vector::append</a>(&<b>mut</b> seed, b"::");
+    <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_append">vector::append</a>(&<b>mut</b> seed, *<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_bytes">string::bytes</a>(name));
+    seed
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_token_create_token_name_with_seed"></a>
+
+## Function `create_token_name_with_seed`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x4_token_create_token_name_with_seed">create_token_name_with_seed</a>(<a href="collection.md#0x4_collection">collection</a>: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, name: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, seed: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x4_token_create_token_name_with_seed">create_token_name_with_seed</a>(<a href="collection.md#0x4_collection">collection</a>: &String, name: &String, seed: &String): <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; {
+    <b>assert</b>!(<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_length">string::length</a>(seed) &lt;= <a href="token.md#0x4_token_MAX_TOKEN_SEED_LENGTH">MAX_TOKEN_SEED_LENGTH</a>, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_out_of_range">error::out_of_range</a>(<a href="token.md#0x4_token_ESEED_TOO_LONG">ESEED_TOO_LONG</a>));
+    <b>let</b> seeds = <a href="token.md#0x4_token_create_token_seed">create_token_seed</a>(<a href="collection.md#0x4_collection">collection</a>, name);
+    <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_append">vector::append</a>(&<b>mut</b> seeds, *<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_bytes">string::bytes</a>(seed));
+    seeds
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_token_generate_mutator_ref"></a>
+
+## Function `generate_mutator_ref`
+
+Creates a MutatorRef, which gates the ability to mutate any fields that support mutation.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x4_token_generate_mutator_ref">generate_mutator_ref</a>(ref: &<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>): <a href="token.md#0x4_token_MutatorRef">token::MutatorRef</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x4_token_generate_mutator_ref">generate_mutator_ref</a>(ref: &ConstructorRef): <a href="token.md#0x4_token_MutatorRef">MutatorRef</a> {
+    <b>let</b> <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">object</a> = <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_object_from_constructor_ref">object::object_from_constructor_ref</a>&lt;<a href="token.md#0x4_token_Token">Token</a>&gt;(ref);
+    <a href="token.md#0x4_token_MutatorRef">MutatorRef</a> { self: <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_object_address">object::object_address</a>(&<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object">object</a>) }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_token_generate_burn_ref"></a>
+
+## Function `generate_burn_ref`
+
+Creates a BurnRef, which gates the ability to burn the given token.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x4_token_generate_burn_ref">generate_burn_ref</a>(ref: &<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_ConstructorRef">object::ConstructorRef</a>): <a href="token.md#0x4_token_BurnRef">token::BurnRef</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x4_token_generate_burn_ref">generate_burn_ref</a>(ref: &ConstructorRef): <a href="token.md#0x4_token_BurnRef">BurnRef</a> {
+    <b>let</b> (inner, self) = <b>if</b> (<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_can_generate_delete_ref">object::can_generate_delete_ref</a>(ref)) {
+        <b>let</b> delete_ref = <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_generate_delete_ref">object::generate_delete_ref</a>(ref);
+        (<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(delete_ref), <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>())
+    } <b>else</b> {
+        <b>let</b> addr = <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_address_from_constructor_ref">object::address_from_constructor_ref</a>(ref);
+        (<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>(), <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(addr))
+    };
+    <a href="token.md#0x4_token_BurnRef">BurnRef</a> { self, inner }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_token_address_from_burn_ref"></a>
+
+## Function `address_from_burn_ref`
+
+Extracts the tokens address from a BurnRef.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x4_token_address_from_burn_ref">address_from_burn_ref</a>(ref: &<a href="token.md#0x4_token_BurnRef">token::BurnRef</a>): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x4_token_address_from_burn_ref">address_from_burn_ref</a>(ref: &<a href="token.md#0x4_token_BurnRef">BurnRef</a>): <b>address</b> {
+    <b>if</b> (<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&ref.inner)) {
+        <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_address_from_delete_ref">object::address_from_delete_ref</a>(<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(&ref.inner))
+    } <b>else</b> {
+        *<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_borrow">option::borrow</a>(&ref.self)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_token_borrow"></a>
+
+## Function `borrow`
+
+
+
+<pre><code><b>fun</b> <a href="token.md#0x4_token_borrow">borrow</a>&lt;T: key&gt;(<a href="token.md#0x4_token">token</a>: &<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): &<a href="token.md#0x4_token_Token">token::Token</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="token.md#0x4_token_borrow">borrow</a>&lt;T: key&gt;(<a href="token.md#0x4_token">token</a>: &Object&lt;T&gt;): &<a href="token.md#0x4_token_Token">Token</a> <b>acquires</b> <a href="token.md#0x4_token_Token">Token</a> {
+    <b>let</b> token_address = <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_object_address">object::object_address</a>(<a href="token.md#0x4_token">token</a>);
+    <b>assert</b>!(
+        <b>exists</b>&lt;<a href="token.md#0x4_token_Token">Token</a>&gt;(token_address),
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="token.md#0x4_token_ETOKEN_DOES_NOT_EXIST">ETOKEN_DOES_NOT_EXIST</a>),
+    );
+    <b>borrow_global</b>&lt;<a href="token.md#0x4_token_Token">Token</a>&gt;(token_address)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_token_creator"></a>
+
+## Function `creator`
+
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="token.md#0x4_token_creator">creator</a>&lt;T: key&gt;(<a href="token.md#0x4_token">token</a>: <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x4_token_creator">creator</a>&lt;T: key&gt;(<a href="token.md#0x4_token">token</a>: Object&lt;T&gt;): <b>address</b> <b>acquires</b> <a href="token.md#0x4_token_Token">Token</a> {
+    <a href="collection.md#0x4_collection_creator">collection::creator</a>(<a href="token.md#0x4_token_borrow">borrow</a>(&<a href="token.md#0x4_token">token</a>).<a href="collection.md#0x4_collection">collection</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_token_collection_name"></a>
+
+## Function `collection_name`
+
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="token.md#0x4_token_collection_name">collection_name</a>&lt;T: key&gt;(<a href="token.md#0x4_token">token</a>: <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x4_token_collection_name">collection_name</a>&lt;T: key&gt;(<a href="token.md#0x4_token">token</a>: Object&lt;T&gt;): String <b>acquires</b> <a href="token.md#0x4_token_Token">Token</a> {
+    <a href="collection.md#0x4_collection_name">collection::name</a>(<a href="token.md#0x4_token_borrow">borrow</a>(&<a href="token.md#0x4_token">token</a>).<a href="collection.md#0x4_collection">collection</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_token_collection_object"></a>
+
+## Function `collection_object`
+
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="token.md#0x4_token_collection_object">collection_object</a>&lt;T: key&gt;(<a href="token.md#0x4_token">token</a>: <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;<a href="collection.md#0x4_collection_Collection">collection::Collection</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x4_token_collection_object">collection_object</a>&lt;T: key&gt;(<a href="token.md#0x4_token">token</a>: Object&lt;T&gt;): Object&lt;Collection&gt; <b>acquires</b> <a href="token.md#0x4_token_Token">Token</a> {
+    <a href="token.md#0x4_token_borrow">borrow</a>(&<a href="token.md#0x4_token">token</a>).<a href="collection.md#0x4_collection">collection</a>
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_token_description"></a>
+
+## Function `description`
+
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="token.md#0x4_token_description">description</a>&lt;T: key&gt;(<a href="token.md#0x4_token">token</a>: <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x4_token_description">description</a>&lt;T: key&gt;(<a href="token.md#0x4_token">token</a>: Object&lt;T&gt;): String <b>acquires</b> <a href="token.md#0x4_token_Token">Token</a> {
+    <a href="token.md#0x4_token_borrow">borrow</a>(&<a href="token.md#0x4_token">token</a>).description
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_token_name"></a>
+
+## Function `name`
+
+Avoid this method in the same transaction as the token is minted
+as that would prohibit transactions to be executed in parallel.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="token.md#0x4_token_name">name</a>&lt;T: key&gt;(<a href="token.md#0x4_token">token</a>: <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x4_token_name">name</a>&lt;T: key&gt;(<a href="token.md#0x4_token">token</a>: Object&lt;T&gt;): String <b>acquires</b> <a href="token.md#0x4_token_Token">Token</a>, <a href="token.md#0x4_token_TokenIdentifiers">TokenIdentifiers</a> {
+    <b>let</b> token_address = <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_object_address">object::object_address</a>(&<a href="token.md#0x4_token">token</a>);
+    <b>if</b> (<b>exists</b>&lt;<a href="token.md#0x4_token_TokenIdentifiers">TokenIdentifiers</a>&gt;(token_address)) {
+        <a href="../../../aptos-framework/tests/compiler-v2-doc/aggregator_v2.md#0x1_aggregator_v2_read_derived_string">aggregator_v2::read_derived_string</a>(&<b>borrow_global</b>&lt;<a href="token.md#0x4_token_TokenIdentifiers">TokenIdentifiers</a>&gt;(token_address).name)
+    } <b>else</b> {
+        <a href="token.md#0x4_token_borrow">borrow</a>(&<a href="token.md#0x4_token">token</a>).name
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_token_uri"></a>
+
+## Function `uri`
+
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="token.md#0x4_token_uri">uri</a>&lt;T: key&gt;(<a href="token.md#0x4_token">token</a>: <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x4_token_uri">uri</a>&lt;T: key&gt;(<a href="token.md#0x4_token">token</a>: Object&lt;T&gt;): String <b>acquires</b> <a href="token.md#0x4_token_Token">Token</a> {
+    <a href="token.md#0x4_token_borrow">borrow</a>(&<a href="token.md#0x4_token">token</a>).uri
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_token_royalty"></a>
+
+## Function `royalty`
+
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="royalty.md#0x4_royalty">royalty</a>&lt;T: key&gt;(<a href="token.md#0x4_token">token</a>: <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="royalty.md#0x4_royalty_Royalty">royalty::Royalty</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="royalty.md#0x4_royalty">royalty</a>&lt;T: key&gt;(<a href="token.md#0x4_token">token</a>: Object&lt;T&gt;): Option&lt;Royalty&gt; <b>acquires</b> <a href="token.md#0x4_token_Token">Token</a> {
+    <a href="token.md#0x4_token_borrow">borrow</a>(&<a href="token.md#0x4_token">token</a>);
+    <b>let</b> <a href="royalty.md#0x4_royalty">royalty</a> = <a href="royalty.md#0x4_royalty_get">royalty::get</a>(<a href="token.md#0x4_token">token</a>);
+    <b>if</b> (<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&<a href="royalty.md#0x4_royalty">royalty</a>)) {
+        <a href="royalty.md#0x4_royalty">royalty</a>
+    } <b>else</b> {
+        <b>let</b> creator = <a href="token.md#0x4_token_creator">creator</a>(<a href="token.md#0x4_token">token</a>);
+        <b>let</b> collection_name = <a href="token.md#0x4_token_collection_name">collection_name</a>(<a href="token.md#0x4_token">token</a>);
+        <b>let</b> collection_address = <a href="collection.md#0x4_collection_create_collection_address">collection::create_collection_address</a>(&creator, &collection_name);
+        <b>let</b> <a href="collection.md#0x4_collection">collection</a> = <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_address_to_object">object::address_to_object</a>&lt;<a href="collection.md#0x4_collection_Collection">collection::Collection</a>&gt;(collection_address);
+        <a href="royalty.md#0x4_royalty_get">royalty::get</a>(<a href="collection.md#0x4_collection">collection</a>)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_token_index"></a>
+
+## Function `index`
+
+Avoid this method in the same transaction as the token is minted
+as that would prohibit transactions to be executed in parallel.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="token.md#0x4_token_index">index</a>&lt;T: key&gt;(<a href="token.md#0x4_token">token</a>: <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x4_token_index">index</a>&lt;T: key&gt;(<a href="token.md#0x4_token">token</a>: Object&lt;T&gt;): u64 <b>acquires</b> <a href="token.md#0x4_token_Token">Token</a>, <a href="token.md#0x4_token_TokenIdentifiers">TokenIdentifiers</a> {
+    <b>let</b> token_address = <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_object_address">object::object_address</a>(&<a href="token.md#0x4_token">token</a>);
+    <b>if</b> (<b>exists</b>&lt;<a href="token.md#0x4_token_TokenIdentifiers">TokenIdentifiers</a>&gt;(token_address)) {
+        <a href="../../../aptos-framework/tests/compiler-v2-doc/aggregator_v2.md#0x1_aggregator_v2_read_snapshot">aggregator_v2::read_snapshot</a>(&<b>borrow_global</b>&lt;<a href="token.md#0x4_token_TokenIdentifiers">TokenIdentifiers</a>&gt;(token_address).index)
+    } <b>else</b> {
+        <a href="token.md#0x4_token_borrow">borrow</a>(&<a href="token.md#0x4_token">token</a>).index
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_token_borrow_mut"></a>
+
+## Function `borrow_mut`
+
+
+
+<pre><code><b>fun</b> <a href="token.md#0x4_token_borrow_mut">borrow_mut</a>(mutator_ref: &<a href="token.md#0x4_token_MutatorRef">token::MutatorRef</a>): &<b>mut</b> <a href="token.md#0x4_token_Token">token::Token</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>inline <b>fun</b> <a href="token.md#0x4_token_borrow_mut">borrow_mut</a>(mutator_ref: &<a href="token.md#0x4_token_MutatorRef">MutatorRef</a>): &<b>mut</b> <a href="token.md#0x4_token_Token">Token</a> <b>acquires</b> <a href="token.md#0x4_token_Token">Token</a> {
+    <b>assert</b>!(
+        <b>exists</b>&lt;<a href="token.md#0x4_token_Token">Token</a>&gt;(mutator_ref.self),
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="token.md#0x4_token_ETOKEN_DOES_NOT_EXIST">ETOKEN_DOES_NOT_EXIST</a>),
+    );
+    <b>borrow_global_mut</b>&lt;<a href="token.md#0x4_token_Token">Token</a>&gt;(mutator_ref.self)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_token_burn"></a>
+
+## Function `burn`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x4_token_burn">burn</a>(burn_ref: <a href="token.md#0x4_token_BurnRef">token::BurnRef</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x4_token_burn">burn</a>(burn_ref: <a href="token.md#0x4_token_BurnRef">BurnRef</a>) <b>acquires</b> <a href="token.md#0x4_token_Token">Token</a>, <a href="token.md#0x4_token_TokenIdentifiers">TokenIdentifiers</a> {
+    <b>let</b> (addr, previous_owner) = <b>if</b> (<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&burn_ref.inner)) {
+        <b>let</b> delete_ref = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_extract">option::extract</a>(&<b>mut</b> burn_ref.inner);
+        <b>let</b> addr = <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_address_from_delete_ref">object::address_from_delete_ref</a>(&delete_ref);
+        <b>let</b> previous_owner = <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_owner">object::owner</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_address_to_object">object::address_to_object</a>&lt;<a href="token.md#0x4_token_Token">Token</a>&gt;(addr));
+        <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_delete">object::delete</a>(delete_ref);
+        (addr, previous_owner)
+    } <b>else</b> {
+        <b>let</b> addr = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_extract">option::extract</a>(&<b>mut</b> burn_ref.self);
+        <b>let</b> previous_owner = <a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_owner">object::owner</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/object.md#0x1_object_address_to_object">object::address_to_object</a>&lt;<a href="token.md#0x4_token_Token">Token</a>&gt;(addr));
+        (addr, previous_owner)
+    };
+
+    <b>if</b> (<a href="royalty.md#0x4_royalty_exists_at">royalty::exists_at</a>(addr)) {
+        <a href="royalty.md#0x4_royalty_delete">royalty::delete</a>(addr)
+    };
+
+    <b>let</b> <a href="token.md#0x4_token_Token">Token</a> {
+        <a href="collection.md#0x4_collection">collection</a>,
+        index: deprecated_index,
+        description: _,
+        name: _,
+        uri: _,
+        mutation_events,
+    } = <b>move_from</b>&lt;<a href="token.md#0x4_token_Token">Token</a>&gt;(addr);
+
+    <b>let</b> index = <b>if</b> (<b>exists</b>&lt;<a href="token.md#0x4_token_TokenIdentifiers">TokenIdentifiers</a>&gt;(addr)) {
+        <b>let</b> <a href="token.md#0x4_token_TokenIdentifiers">TokenIdentifiers</a> {
+            index,
+            name: _,
+        } = <b>move_from</b>&lt;<a href="token.md#0x4_token_TokenIdentifiers">TokenIdentifiers</a>&gt;(addr);
+        <a href="../../../aptos-framework/tests/compiler-v2-doc/aggregator_v2.md#0x1_aggregator_v2_read_snapshot">aggregator_v2::read_snapshot</a>(&index)
+    } <b>else</b> {
+        deprecated_index
+    };
+
+    <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_destroy_handle">event::destroy_handle</a>(mutation_events);
+    <a href="collection.md#0x4_collection_decrement_supply">collection::decrement_supply</a>(&<a href="collection.md#0x4_collection">collection</a>, addr, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(index), previous_owner);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_token_set_description"></a>
+
+## Function `set_description`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x4_token_set_description">set_description</a>(mutator_ref: &<a href="token.md#0x4_token_MutatorRef">token::MutatorRef</a>, description: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x4_token_set_description">set_description</a>(mutator_ref: &<a href="token.md#0x4_token_MutatorRef">MutatorRef</a>, description: String) <b>acquires</b> <a href="token.md#0x4_token_Token">Token</a> {
+    <b>assert</b>!(<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_length">string::length</a>(&description) &lt;= <a href="token.md#0x4_token_MAX_DESCRIPTION_LENGTH">MAX_DESCRIPTION_LENGTH</a>, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_out_of_range">error::out_of_range</a>(<a href="token.md#0x4_token_EDESCRIPTION_TOO_LONG">EDESCRIPTION_TOO_LONG</a>));
+    <b>let</b> <a href="token.md#0x4_token">token</a> = <a href="token.md#0x4_token_borrow_mut">borrow_mut</a>(mutator_ref);
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit">event::emit</a>(<a href="token.md#0x4_token_Mutation">Mutation</a> {
+            token_address: mutator_ref.self,
+            mutated_field_name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"description"),
+            old_value: <a href="token.md#0x4_token">token</a>.description,
+            new_value: description
+        })
+    };
+    <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit_event">event::emit_event</a>(
+        &<b>mut</b> <a href="token.md#0x4_token">token</a>.mutation_events,
+        <a href="token.md#0x4_token_MutationEvent">MutationEvent</a> {
+            mutated_field_name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"description"),
+            old_value: <a href="token.md#0x4_token">token</a>.description,
+            new_value: description
+        },
+    );
+    <a href="token.md#0x4_token">token</a>.description = description;
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_token_set_name"></a>
+
+## Function `set_name`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x4_token_set_name">set_name</a>(mutator_ref: &<a href="token.md#0x4_token_MutatorRef">token::MutatorRef</a>, name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x4_token_set_name">set_name</a>(mutator_ref: &<a href="token.md#0x4_token_MutatorRef">MutatorRef</a>, name: String) <b>acquires</b> <a href="token.md#0x4_token_Token">Token</a>, <a href="token.md#0x4_token_TokenIdentifiers">TokenIdentifiers</a> {
+    <b>assert</b>!(<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_length">string::length</a>(&name) &lt;= <a href="token.md#0x4_token_MAX_TOKEN_NAME_LENGTH">MAX_TOKEN_NAME_LENGTH</a>, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_out_of_range">error::out_of_range</a>(<a href="token.md#0x4_token_ETOKEN_NAME_TOO_LONG">ETOKEN_NAME_TOO_LONG</a>));
+
+    <b>let</b> <a href="token.md#0x4_token">token</a> = <a href="token.md#0x4_token_borrow_mut">borrow_mut</a>(mutator_ref);
+
+    <b>let</b> old_name = <b>if</b> (<b>exists</b>&lt;<a href="token.md#0x4_token_TokenIdentifiers">TokenIdentifiers</a>&gt;(mutator_ref.self)) {
+        <b>let</b> token_concurrent = <b>borrow_global_mut</b>&lt;<a href="token.md#0x4_token_TokenIdentifiers">TokenIdentifiers</a>&gt;(mutator_ref.self);
+        <b>let</b> old_name = <a href="../../../aptos-framework/tests/compiler-v2-doc/aggregator_v2.md#0x1_aggregator_v2_read_derived_string">aggregator_v2::read_derived_string</a>(&token_concurrent.name);
+        token_concurrent.name = <a href="../../../aptos-framework/tests/compiler-v2-doc/aggregator_v2.md#0x1_aggregator_v2_create_derived_string">aggregator_v2::create_derived_string</a>(name);
+        old_name
+    } <b>else</b> {
+        <b>let</b> old_name = <a href="token.md#0x4_token">token</a>.name;
+        <a href="token.md#0x4_token">token</a>.name = name;
+        old_name
+    };
+
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit">event::emit</a>(<a href="token.md#0x4_token_Mutation">Mutation</a> {
+            token_address: mutator_ref.self,
+            mutated_field_name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"name"),
+            old_value: old_name,
+            new_value: name
+        })
+    };
+    <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit_event">event::emit_event</a>(
+        &<b>mut</b> <a href="token.md#0x4_token">token</a>.mutation_events,
+        <a href="token.md#0x4_token_MutationEvent">MutationEvent</a> {
+            mutated_field_name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"name"),
+            old_value: old_name,
+            new_value: name
+        },
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x4_token_set_uri"></a>
+
+## Function `set_uri`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x4_token_set_uri">set_uri</a>(mutator_ref: &<a href="token.md#0x4_token_MutatorRef">token::MutatorRef</a>, uri: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x4_token_set_uri">set_uri</a>(mutator_ref: &<a href="token.md#0x4_token_MutatorRef">MutatorRef</a>, uri: String) <b>acquires</b> <a href="token.md#0x4_token_Token">Token</a> {
+    <b>assert</b>!(<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_length">string::length</a>(&uri) &lt;= <a href="token.md#0x4_token_MAX_URI_LENGTH">MAX_URI_LENGTH</a>, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_out_of_range">error::out_of_range</a>(<a href="token.md#0x4_token_EURI_TOO_LONG">EURI_TOO_LONG</a>));
+    <b>let</b> <a href="token.md#0x4_token">token</a> = <a href="token.md#0x4_token_borrow_mut">borrow_mut</a>(mutator_ref);
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit">event::emit</a>(<a href="token.md#0x4_token_Mutation">Mutation</a> {
+            token_address: mutator_ref.self,
+            mutated_field_name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"uri"),
+            old_value: <a href="token.md#0x4_token">token</a>.uri,
+            new_value: uri,
+        })
+    };
+    <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit_event">event::emit_event</a>(
+        &<b>mut</b> <a href="token.md#0x4_token">token</a>.mutation_events,
+        <a href="token.md#0x4_token_MutationEvent">MutationEvent</a> {
+            mutated_field_name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"uri"),
+            old_value: <a href="token.md#0x4_token">token</a>.uri,
+            new_value: uri,
+        },
+    );
+    <a href="token.md#0x4_token">token</a>.uri = uri;
+}
+</code></pre>
+
+
+
+</details>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-token/doc/token_transfers.md b/aptos-move/framework/aptos-token/doc/token_transfers.md
index 4a83d05aa5416..960c9e0ce2094 100644
--- a/aptos-move/framework/aptos-token/doc/token_transfers.md
+++ b/aptos-move/framework/aptos-token/doc/token_transfers.md
@@ -97,7 +97,8 @@ This module provides the foundation for transferring of Tokens
 
 
 
-<pre><code><b>struct</b> <a href="token_transfers.md#0x3_token_transfers_TokenOfferId">TokenOfferId</a> <b>has</b> <b>copy</b>, drop, store
+<pre><code>#[<a href="../../aptos-framework/doc/event.md#0x1_event">event</a>]
+<b>struct</b> <a href="token_transfers.md#0x3_token_transfers_TokenOfferId">TokenOfferId</a> <b>has</b> <b>copy</b>, drop, store
 </code></pre>
 
 
@@ -170,7 +171,8 @@ This module provides the foundation for transferring of Tokens
 
 
 
-<pre><code><b>struct</b> <a href="token_transfers.md#0x3_token_transfers_TokenOfferEvent">TokenOfferEvent</a> <b>has</b> drop, store
+<pre><code>#[<a href="../../aptos-framework/doc/event.md#0x1_event">event</a>]
+<b>struct</b> <a href="token_transfers.md#0x3_token_transfers_TokenOfferEvent">TokenOfferEvent</a> <b>has</b> drop, store
 </code></pre>
 
 
@@ -209,7 +211,8 @@ This module provides the foundation for transferring of Tokens
 
 
 
-<pre><code><b>struct</b> <a href="token_transfers.md#0x3_token_transfers_TokenCancelOfferEvent">TokenCancelOfferEvent</a> <b>has</b> drop, store
+<pre><code>#[<a href="../../aptos-framework/doc/event.md#0x1_event">event</a>]
+<b>struct</b> <a href="token_transfers.md#0x3_token_transfers_TokenCancelOfferEvent">TokenCancelOfferEvent</a> <b>has</b> drop, store
 </code></pre>
 
 
@@ -288,7 +291,8 @@ This module provides the foundation for transferring of Tokens
 
 
 
-<pre><code><b>struct</b> <a href="token_transfers.md#0x3_token_transfers_TokenClaimEvent">TokenClaimEvent</a> <b>has</b> drop, store
+<pre><code>#[<a href="../../aptos-framework/doc/event.md#0x1_event">event</a>]
+<b>struct</b> <a href="token_transfers.md#0x3_token_transfers_TokenClaimEvent">TokenClaimEvent</a> <b>has</b> drop, store
 </code></pre>
 
 
diff --git a/aptos-move/framework/aptos-token/sources/token_transfers.move b/aptos-move/framework/aptos-token/sources/token_transfers.move
index b255de3a204a4..6a8ec33b5ae2b 100644
--- a/aptos-move/framework/aptos-token/sources/token_transfers.move
+++ b/aptos-move/framework/aptos-token/sources/token_transfers.move
@@ -22,6 +22,7 @@ module aptos_token::token_transfers {
         claim_events: EventHandle<TokenClaimEvent>,
     }
 
+    #[event]
     struct TokenOfferId has copy, drop, store {
         to_addr: address,
         token_id: TokenId,
@@ -34,12 +35,14 @@ module aptos_token::token_transfers {
         amount: u64,
     }
 
+    #[event]
     struct TokenOfferEvent has drop, store {
         to_address: address,
         token_id: TokenId,
         amount: u64,
     }
 
+    #[event]
     struct TokenCancelOfferEvent has drop, store {
         to_address: address,
         token_id: TokenId,
@@ -53,6 +56,7 @@ module aptos_token::token_transfers {
         amount: u64,
     }
 
+    #[event]
     struct TokenClaimEvent has drop, store {
         to_address: address,
         token_id: TokenId,
diff --git a/aptos-move/framework/aptos-token/tests/compiler-v2-doc/overview.md b/aptos-move/framework/aptos-token/tests/compiler-v2-doc/overview.md
new file mode 100644
index 0000000000000..08aa8f39100f3
--- /dev/null
+++ b/aptos-move/framework/aptos-token/tests/compiler-v2-doc/overview.md
@@ -0,0 +1,22 @@
+
+<a id="@Aptos_Token_Framework_0"></a>
+
+# Aptos Token Framework
+
+
+This is the reference documentation of the Aptos Token framework.
+
+
+<a id="@Index_1"></a>
+
+## Index
+
+
+-  [`0x3::property_map`](property_map.md#0x3_property_map)
+-  [`0x3::token`](token.md#0x3_token)
+-  [`0x3::token_coin_swap`](token_coin_swap.md#0x3_token_coin_swap)
+-  [`0x3::token_event_store`](token_event_store.md#0x3_token_event_store)
+-  [`0x3::token_transfers`](token_transfers.md#0x3_token_transfers)
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-token/tests/compiler-v2-doc/property_map.md b/aptos-move/framework/aptos-token/tests/compiler-v2-doc/property_map.md
new file mode 100644
index 0000000000000..7769ccfc8c65c
--- /dev/null
+++ b/aptos-move/framework/aptos-token/tests/compiler-v2-doc/property_map.md
@@ -0,0 +1,1369 @@
+
+<a id="0x3_property_map"></a>
+
+# Module `0x3::property_map`
+
+PropertyMap is a specialization of SimpleMap for Tokens.
+It maps a String key to a PropertyValue that consists of type (string) and value (vector<u8>)
+It provides basic on-chain serialization of primitive and string to property value with type information
+It also supports deserializing property value to it original type.
+
+
+-  [Struct `PropertyMap`](#0x3_property_map_PropertyMap)
+-  [Struct `PropertyValue`](#0x3_property_map_PropertyValue)
+-  [Constants](#@Constants_0)
+-  [Function `new`](#0x3_property_map_new)
+-  [Function `new_with_key_and_property_value`](#0x3_property_map_new_with_key_and_property_value)
+-  [Function `empty`](#0x3_property_map_empty)
+-  [Function `contains_key`](#0x3_property_map_contains_key)
+-  [Function `add`](#0x3_property_map_add)
+-  [Function `length`](#0x3_property_map_length)
+-  [Function `borrow`](#0x3_property_map_borrow)
+-  [Function `keys`](#0x3_property_map_keys)
+-  [Function `types`](#0x3_property_map_types)
+-  [Function `values`](#0x3_property_map_values)
+-  [Function `read_string`](#0x3_property_map_read_string)
+-  [Function `read_u8`](#0x3_property_map_read_u8)
+-  [Function `read_u64`](#0x3_property_map_read_u64)
+-  [Function `read_address`](#0x3_property_map_read_address)
+-  [Function `read_u128`](#0x3_property_map_read_u128)
+-  [Function `read_bool`](#0x3_property_map_read_bool)
+-  [Function `borrow_value`](#0x3_property_map_borrow_value)
+-  [Function `borrow_type`](#0x3_property_map_borrow_type)
+-  [Function `remove`](#0x3_property_map_remove)
+-  [Function `update_property_map`](#0x3_property_map_update_property_map)
+-  [Function `update_property_value`](#0x3_property_map_update_property_value)
+-  [Function `create_property_value_raw`](#0x3_property_map_create_property_value_raw)
+-  [Function `create_property_value`](#0x3_property_map_create_property_value)
+-  [Specification](#@Specification_1)
+    -  [Function `new`](#@Specification_1_new)
+    -  [Function `new_with_key_and_property_value`](#@Specification_1_new_with_key_and_property_value)
+    -  [Function `empty`](#@Specification_1_empty)
+    -  [Function `contains_key`](#@Specification_1_contains_key)
+    -  [Function `add`](#@Specification_1_add)
+    -  [Function `length`](#@Specification_1_length)
+    -  [Function `borrow`](#@Specification_1_borrow)
+    -  [Function `keys`](#@Specification_1_keys)
+    -  [Function `types`](#@Specification_1_types)
+    -  [Function `values`](#@Specification_1_values)
+    -  [Function `read_string`](#@Specification_1_read_string)
+    -  [Function `read_u8`](#@Specification_1_read_u8)
+    -  [Function `read_u64`](#@Specification_1_read_u64)
+    -  [Function `read_address`](#@Specification_1_read_address)
+    -  [Function `read_u128`](#@Specification_1_read_u128)
+    -  [Function `read_bool`](#@Specification_1_read_bool)
+    -  [Function `borrow_value`](#@Specification_1_borrow_value)
+    -  [Function `borrow_type`](#@Specification_1_borrow_type)
+    -  [Function `remove`](#@Specification_1_remove)
+    -  [Function `update_property_map`](#@Specification_1_update_property_map)
+    -  [Function `update_property_value`](#@Specification_1_update_property_value)
+    -  [Function `create_property_value_raw`](#@Specification_1_create_property_value_raw)
+    -  [Function `create_property_value`](#@Specification_1_create_property_value)
+
+
+<pre><code><b>use</b> <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs">0x1::bcs</a>;
+<b>use</b> <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs">0x1::from_bcs</a>;
+<b>use</b> <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map">0x1::simple_map</a>;
+<b>use</b> <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string">0x1::string</a>;
+<b>use</b> <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info">0x1::type_info</a>;
+</code></pre>
+
+
+
+<a id="0x3_property_map_PropertyMap"></a>
+
+## Struct `PropertyMap`
+
+
+
+<pre><code><b>struct</b> <a href="property_map.md#0x3_property_map_PropertyMap">PropertyMap</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>map: <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_SimpleMap">simple_map::SimpleMap</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, <a href="property_map.md#0x3_property_map_PropertyValue">property_map::PropertyValue</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x3_property_map_PropertyValue"></a>
+
+## Struct `PropertyValue`
+
+
+
+<pre><code><b>struct</b> <a href="property_map.md#0x3_property_map_PropertyValue">PropertyValue</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>value: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>type: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x3_property_map_EKEY_AREADY_EXIST_IN_PROPERTY_MAP"></a>
+
+The property key already exists
+
+
+<pre><code><b>const</b> <a href="property_map.md#0x3_property_map_EKEY_AREADY_EXIST_IN_PROPERTY_MAP">EKEY_AREADY_EXIST_IN_PROPERTY_MAP</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x3_property_map_EKEY_COUNT_NOT_MATCH_TYPE_COUNT"></a>
+
+Property key and type count don't match
+
+
+<pre><code><b>const</b> <a href="property_map.md#0x3_property_map_EKEY_COUNT_NOT_MATCH_TYPE_COUNT">EKEY_COUNT_NOT_MATCH_TYPE_COUNT</a>: u64 = 5;
+</code></pre>
+
+
+
+<a id="0x3_property_map_EKEY_COUNT_NOT_MATCH_VALUE_COUNT"></a>
+
+Property key and value count don't match
+
+
+<pre><code><b>const</b> <a href="property_map.md#0x3_property_map_EKEY_COUNT_NOT_MATCH_VALUE_COUNT">EKEY_COUNT_NOT_MATCH_VALUE_COUNT</a>: u64 = 4;
+</code></pre>
+
+
+
+<a id="0x3_property_map_EPROPERTY_MAP_NAME_TOO_LONG"></a>
+
+The name (key) of the property is too long
+
+
+<pre><code><b>const</b> <a href="property_map.md#0x3_property_map_EPROPERTY_MAP_NAME_TOO_LONG">EPROPERTY_MAP_NAME_TOO_LONG</a>: u64 = 7;
+</code></pre>
+
+
+
+<a id="0x3_property_map_EPROPERTY_NOT_EXIST"></a>
+
+The property doesn't exist
+
+
+<pre><code><b>const</b> <a href="property_map.md#0x3_property_map_EPROPERTY_NOT_EXIST">EPROPERTY_NOT_EXIST</a>: u64 = 3;
+</code></pre>
+
+
+
+<a id="0x3_property_map_EPROPERTY_NUMBER_EXCEED_LIMIT"></a>
+
+The number of property exceeds the limit
+
+
+<pre><code><b>const</b> <a href="property_map.md#0x3_property_map_EPROPERTY_NUMBER_EXCEED_LIMIT">EPROPERTY_NUMBER_EXCEED_LIMIT</a>: u64 = 2;
+</code></pre>
+
+
+
+<a id="0x3_property_map_ETYPE_NOT_MATCH"></a>
+
+Property type doesn't match
+
+
+<pre><code><b>const</b> <a href="property_map.md#0x3_property_map_ETYPE_NOT_MATCH">ETYPE_NOT_MATCH</a>: u64 = 6;
+</code></pre>
+
+
+
+<a id="0x3_property_map_MAX_PROPERTY_MAP_SIZE"></a>
+
+The maximal number of property that can be stored in property map
+
+
+<pre><code><b>const</b> <a href="property_map.md#0x3_property_map_MAX_PROPERTY_MAP_SIZE">MAX_PROPERTY_MAP_SIZE</a>: u64 = 1000;
+</code></pre>
+
+
+
+<a id="0x3_property_map_MAX_PROPERTY_NAME_LENGTH"></a>
+
+
+
+<pre><code><b>const</b> <a href="property_map.md#0x3_property_map_MAX_PROPERTY_NAME_LENGTH">MAX_PROPERTY_NAME_LENGTH</a>: u64 = 128;
+</code></pre>
+
+
+
+<a id="0x3_property_map_new"></a>
+
+## Function `new`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_new">new</a>(keys: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;, values: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;, types: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;): <a href="property_map.md#0x3_property_map_PropertyMap">property_map::PropertyMap</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_new">new</a>(
+    keys: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;String&gt;,
+    values: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;,
+    types: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;String&gt;
+): <a href="property_map.md#0x3_property_map_PropertyMap">PropertyMap</a> {
+    <b>let</b> length = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&keys);
+    <b>assert</b>!(<a href="property_map.md#0x3_property_map_length">length</a> &lt;= <a href="property_map.md#0x3_property_map_MAX_PROPERTY_MAP_SIZE">MAX_PROPERTY_MAP_SIZE</a>, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="property_map.md#0x3_property_map_EPROPERTY_NUMBER_EXCEED_LIMIT">EPROPERTY_NUMBER_EXCEED_LIMIT</a>));
+    <b>assert</b>!(length == <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&values), <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="property_map.md#0x3_property_map_EKEY_COUNT_NOT_MATCH_VALUE_COUNT">EKEY_COUNT_NOT_MATCH_VALUE_COUNT</a>));
+    <b>assert</b>!(length == <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&types), <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="property_map.md#0x3_property_map_EKEY_COUNT_NOT_MATCH_TYPE_COUNT">EKEY_COUNT_NOT_MATCH_TYPE_COUNT</a>));
+
+    <b>let</b> properties = <a href="property_map.md#0x3_property_map_empty">empty</a>();
+
+    <b>let</b> i = 0;
+    <b>while</b> (i &lt; length) {
+        <b>let</b> key = *<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(&keys, i);
+        <b>assert</b>!(<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_length">string::length</a>(&key) &lt;= <a href="property_map.md#0x3_property_map_MAX_PROPERTY_NAME_LENGTH">MAX_PROPERTY_NAME_LENGTH</a>, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="property_map.md#0x3_property_map_EPROPERTY_MAP_NAME_TOO_LONG">EPROPERTY_MAP_NAME_TOO_LONG</a>));
+        <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_add">simple_map::add</a>(
+            &<b>mut</b> properties.map,
+            key,
+            <a href="property_map.md#0x3_property_map_PropertyValue">PropertyValue</a> { value: *<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(&values, i), type: *<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(&types, i) }
+        );
+        i = i + 1;
+    };
+    properties
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_property_map_new_with_key_and_property_value"></a>
+
+## Function `new_with_key_and_property_value`
+
+Create property map directly from key and property value
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_new_with_key_and_property_value">new_with_key_and_property_value</a>(keys: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;, values: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="property_map.md#0x3_property_map_PropertyValue">property_map::PropertyValue</a>&gt;): <a href="property_map.md#0x3_property_map_PropertyMap">property_map::PropertyMap</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_new_with_key_and_property_value">new_with_key_and_property_value</a>(
+    keys: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;String&gt;,
+    values: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="property_map.md#0x3_property_map_PropertyValue">PropertyValue</a>&gt;
+): <a href="property_map.md#0x3_property_map_PropertyMap">PropertyMap</a> {
+    <b>let</b> length = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&keys);
+    <b>assert</b>!(<a href="property_map.md#0x3_property_map_length">length</a> &lt;= <a href="property_map.md#0x3_property_map_MAX_PROPERTY_MAP_SIZE">MAX_PROPERTY_MAP_SIZE</a>, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="property_map.md#0x3_property_map_EPROPERTY_NUMBER_EXCEED_LIMIT">EPROPERTY_NUMBER_EXCEED_LIMIT</a>));
+    <b>assert</b>!(length == <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&values), <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="property_map.md#0x3_property_map_EKEY_COUNT_NOT_MATCH_VALUE_COUNT">EKEY_COUNT_NOT_MATCH_VALUE_COUNT</a>));
+
+    <b>let</b> properties = <a href="property_map.md#0x3_property_map_empty">empty</a>();
+
+    <b>let</b> i = 0;
+    <b>while</b> (i &lt; length) {
+        <b>let</b> key = *<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(&keys, i);
+        <b>let</b> val = *<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(&values, i);
+        <b>assert</b>!(<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_length">string::length</a>(&key) &lt;= <a href="property_map.md#0x3_property_map_MAX_PROPERTY_NAME_LENGTH">MAX_PROPERTY_NAME_LENGTH</a>, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="property_map.md#0x3_property_map_EPROPERTY_MAP_NAME_TOO_LONG">EPROPERTY_MAP_NAME_TOO_LONG</a>));
+        <a href="property_map.md#0x3_property_map_add">add</a>(&<b>mut</b> properties, key, val);
+        i = i + 1;
+    };
+    properties
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_property_map_empty"></a>
+
+## Function `empty`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_empty">empty</a>(): <a href="property_map.md#0x3_property_map_PropertyMap">property_map::PropertyMap</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_empty">empty</a>(): <a href="property_map.md#0x3_property_map_PropertyMap">PropertyMap</a> {
+    <a href="property_map.md#0x3_property_map_PropertyMap">PropertyMap</a> {
+        map: <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_create">simple_map::create</a>&lt;String, <a href="property_map.md#0x3_property_map_PropertyValue">PropertyValue</a>&gt;(),
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_property_map_contains_key"></a>
+
+## Function `contains_key`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_contains_key">contains_key</a>(map: &<a href="property_map.md#0x3_property_map_PropertyMap">property_map::PropertyMap</a>, key: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_contains_key">contains_key</a>(map: &<a href="property_map.md#0x3_property_map_PropertyMap">PropertyMap</a>, key: &String): bool {
+    <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_contains_key">simple_map::contains_key</a>(&map.map, key)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_property_map_add"></a>
+
+## Function `add`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_add">add</a>(map: &<b>mut</b> <a href="property_map.md#0x3_property_map_PropertyMap">property_map::PropertyMap</a>, key: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, value: <a href="property_map.md#0x3_property_map_PropertyValue">property_map::PropertyValue</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_add">add</a>(map: &<b>mut</b> <a href="property_map.md#0x3_property_map_PropertyMap">PropertyMap</a>, key: String, value: <a href="property_map.md#0x3_property_map_PropertyValue">PropertyValue</a>) {
+    <b>assert</b>!(<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_length">string::length</a>(&key) &lt;= <a href="property_map.md#0x3_property_map_MAX_PROPERTY_NAME_LENGTH">MAX_PROPERTY_NAME_LENGTH</a>, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="property_map.md#0x3_property_map_EPROPERTY_MAP_NAME_TOO_LONG">EPROPERTY_MAP_NAME_TOO_LONG</a>));
+    <b>assert</b>!(<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_length">simple_map::length</a>(&map.map) &lt; <a href="property_map.md#0x3_property_map_MAX_PROPERTY_MAP_SIZE">MAX_PROPERTY_MAP_SIZE</a>, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="property_map.md#0x3_property_map_EPROPERTY_NUMBER_EXCEED_LIMIT">EPROPERTY_NUMBER_EXCEED_LIMIT</a>));
+    <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_add">simple_map::add</a>(&<b>mut</b> map.map, key, value);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_property_map_length"></a>
+
+## Function `length`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_length">length</a>(map: &<a href="property_map.md#0x3_property_map_PropertyMap">property_map::PropertyMap</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_length">length</a>(map: &<a href="property_map.md#0x3_property_map_PropertyMap">PropertyMap</a>): u64 {
+    <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_length">simple_map::length</a>(&map.map)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_property_map_borrow"></a>
+
+## Function `borrow`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_borrow">borrow</a>(map: &<a href="property_map.md#0x3_property_map_PropertyMap">property_map::PropertyMap</a>, key: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): &<a href="property_map.md#0x3_property_map_PropertyValue">property_map::PropertyValue</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_borrow">borrow</a>(map: &<a href="property_map.md#0x3_property_map_PropertyMap">PropertyMap</a>, key: &String): &<a href="property_map.md#0x3_property_map_PropertyValue">PropertyValue</a> {
+    <b>let</b> found = <a href="property_map.md#0x3_property_map_contains_key">contains_key</a>(map, key);
+    <b>assert</b>!(found, <a href="property_map.md#0x3_property_map_EPROPERTY_NOT_EXIST">EPROPERTY_NOT_EXIST</a>);
+    <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_borrow">simple_map::borrow</a>(&map.map, key)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_property_map_keys"></a>
+
+## Function `keys`
+
+Return all the keys in the property map in the order they are added.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_keys">keys</a>(map: &<a href="property_map.md#0x3_property_map_PropertyMap">property_map::PropertyMap</a>): <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_keys">keys</a>(map: &<a href="property_map.md#0x3_property_map_PropertyMap">PropertyMap</a>): <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;String&gt; {
+    <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_keys">simple_map::keys</a>(&map.map)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_property_map_types"></a>
+
+## Function `types`
+
+Return the types of all properties in the property map in the order they are added.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_types">types</a>(map: &<a href="property_map.md#0x3_property_map_PropertyMap">property_map::PropertyMap</a>): <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_types">types</a>(map: &<a href="property_map.md#0x3_property_map_PropertyMap">PropertyMap</a>): <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;String&gt; {
+    <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_map_ref">vector::map_ref</a>(&<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_values">simple_map::values</a>(&map.map), |v| {
+        <b>let</b> v: &<a href="property_map.md#0x3_property_map_PropertyValue">PropertyValue</a> = v;
+        v.type
+    })
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_property_map_values"></a>
+
+## Function `values`
+
+Return the values of all properties in the property map in the order they are added.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_values">values</a>(map: &<a href="property_map.md#0x3_property_map_PropertyMap">property_map::PropertyMap</a>): <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_values">values</a>(map: &<a href="property_map.md#0x3_property_map_PropertyMap">PropertyMap</a>): <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt; {
+    <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_map_ref">vector::map_ref</a>(&<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_values">simple_map::values</a>(&map.map), |v| {
+        <b>let</b> v: &<a href="property_map.md#0x3_property_map_PropertyValue">PropertyValue</a> = v;
+        v.value
+    })
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_property_map_read_string"></a>
+
+## Function `read_string`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_read_string">read_string</a>(map: &<a href="property_map.md#0x3_property_map_PropertyMap">property_map::PropertyMap</a>, key: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_read_string">read_string</a>(map: &<a href="property_map.md#0x3_property_map_PropertyMap">PropertyMap</a>, key: &String): String {
+    <b>let</b> prop = <a href="property_map.md#0x3_property_map_borrow">borrow</a>(map, key);
+    <b>assert</b>!(prop.type == <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">0x1::string::String</a>"), <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="property_map.md#0x3_property_map_ETYPE_NOT_MATCH">ETYPE_NOT_MATCH</a>));
+    <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_to_string">from_bcs::to_string</a>(prop.value)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_property_map_read_u8"></a>
+
+## Function `read_u8`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_read_u8">read_u8</a>(map: &<a href="property_map.md#0x3_property_map_PropertyMap">property_map::PropertyMap</a>, key: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): u8
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_read_u8">read_u8</a>(map: &<a href="property_map.md#0x3_property_map_PropertyMap">PropertyMap</a>, key: &String): u8 {
+    <b>let</b> prop = <a href="property_map.md#0x3_property_map_borrow">borrow</a>(map, key);
+    <b>assert</b>!(prop.type == <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"u8"), <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="property_map.md#0x3_property_map_ETYPE_NOT_MATCH">ETYPE_NOT_MATCH</a>));
+    <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_to_u8">from_bcs::to_u8</a>(prop.value)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_property_map_read_u64"></a>
+
+## Function `read_u64`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_read_u64">read_u64</a>(map: &<a href="property_map.md#0x3_property_map_PropertyMap">property_map::PropertyMap</a>, key: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_read_u64">read_u64</a>(map: &<a href="property_map.md#0x3_property_map_PropertyMap">PropertyMap</a>, key: &String): u64 {
+    <b>let</b> prop = <a href="property_map.md#0x3_property_map_borrow">borrow</a>(map, key);
+    <b>assert</b>!(prop.type == <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"u64"), <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="property_map.md#0x3_property_map_ETYPE_NOT_MATCH">ETYPE_NOT_MATCH</a>));
+    <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_to_u64">from_bcs::to_u64</a>(prop.value)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_property_map_read_address"></a>
+
+## Function `read_address`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_read_address">read_address</a>(map: &<a href="property_map.md#0x3_property_map_PropertyMap">property_map::PropertyMap</a>, key: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_read_address">read_address</a>(map: &<a href="property_map.md#0x3_property_map_PropertyMap">PropertyMap</a>, key: &String): <b>address</b> {
+    <b>let</b> prop = <a href="property_map.md#0x3_property_map_borrow">borrow</a>(map, key);
+    <b>assert</b>!(prop.type == <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"<b>address</b>"), <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="property_map.md#0x3_property_map_ETYPE_NOT_MATCH">ETYPE_NOT_MATCH</a>));
+    <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_to_address">from_bcs::to_address</a>(prop.value)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_property_map_read_u128"></a>
+
+## Function `read_u128`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_read_u128">read_u128</a>(map: &<a href="property_map.md#0x3_property_map_PropertyMap">property_map::PropertyMap</a>, key: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): u128
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_read_u128">read_u128</a>(map: &<a href="property_map.md#0x3_property_map_PropertyMap">PropertyMap</a>, key: &String): u128 {
+    <b>let</b> prop = <a href="property_map.md#0x3_property_map_borrow">borrow</a>(map, key);
+    <b>assert</b>!(prop.type == <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"u128"), <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="property_map.md#0x3_property_map_ETYPE_NOT_MATCH">ETYPE_NOT_MATCH</a>));
+    <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_to_u128">from_bcs::to_u128</a>(prop.value)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_property_map_read_bool"></a>
+
+## Function `read_bool`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_read_bool">read_bool</a>(map: &<a href="property_map.md#0x3_property_map_PropertyMap">property_map::PropertyMap</a>, key: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_read_bool">read_bool</a>(map: &<a href="property_map.md#0x3_property_map_PropertyMap">PropertyMap</a>, key: &String): bool {
+    <b>let</b> prop = <a href="property_map.md#0x3_property_map_borrow">borrow</a>(map, key);
+    <b>assert</b>!(prop.type == <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"bool"), <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="property_map.md#0x3_property_map_ETYPE_NOT_MATCH">ETYPE_NOT_MATCH</a>));
+    <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/from_bcs.md#0x1_from_bcs_to_bool">from_bcs::to_bool</a>(prop.value)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_property_map_borrow_value"></a>
+
+## Function `borrow_value`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_borrow_value">borrow_value</a>(property: &<a href="property_map.md#0x3_property_map_PropertyValue">property_map::PropertyValue</a>): <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_borrow_value">borrow_value</a>(property: &<a href="property_map.md#0x3_property_map_PropertyValue">PropertyValue</a>): <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; {
+    property.value
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_property_map_borrow_type"></a>
+
+## Function `borrow_type`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_borrow_type">borrow_type</a>(property: &<a href="property_map.md#0x3_property_map_PropertyValue">property_map::PropertyValue</a>): <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_borrow_type">borrow_type</a>(property: &<a href="property_map.md#0x3_property_map_PropertyValue">PropertyValue</a>): String {
+    property.type
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_property_map_remove"></a>
+
+## Function `remove`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_remove">remove</a>(map: &<b>mut</b> <a href="property_map.md#0x3_property_map_PropertyMap">property_map::PropertyMap</a>, key: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): (<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, <a href="property_map.md#0x3_property_map_PropertyValue">property_map::PropertyValue</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_remove">remove</a>(
+    map: &<b>mut</b> <a href="property_map.md#0x3_property_map_PropertyMap">PropertyMap</a>,
+    key: &String
+): (String, <a href="property_map.md#0x3_property_map_PropertyValue">PropertyValue</a>) {
+    <b>let</b> found = <a href="property_map.md#0x3_property_map_contains_key">contains_key</a>(map, key);
+    <b>assert</b>!(found, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="property_map.md#0x3_property_map_EPROPERTY_NOT_EXIST">EPROPERTY_NOT_EXIST</a>));
+    <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_remove">simple_map::remove</a>(&<b>mut</b> map.map, key)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_property_map_update_property_map"></a>
+
+## Function `update_property_map`
+
+Update the property in the existing property map
+Allow updating existing keys' value and add new key-value pairs
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_update_property_map">update_property_map</a>(map: &<b>mut</b> <a href="property_map.md#0x3_property_map_PropertyMap">property_map::PropertyMap</a>, keys: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;, values: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;, types: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_update_property_map">update_property_map</a>(
+    map: &<b>mut</b> <a href="property_map.md#0x3_property_map_PropertyMap">PropertyMap</a>,
+    keys: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;String&gt;,
+    values: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;,
+    types: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;String&gt;,
+) {
+    <b>let</b> key_len = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&keys);
+    <b>let</b> val_len = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&values);
+    <b>let</b> typ_len = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&types);
+    <b>assert</b>!(key_len == val_len, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="property_map.md#0x3_property_map_EKEY_COUNT_NOT_MATCH_VALUE_COUNT">EKEY_COUNT_NOT_MATCH_VALUE_COUNT</a>));
+    <b>assert</b>!(key_len == typ_len, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="property_map.md#0x3_property_map_EKEY_COUNT_NOT_MATCH_TYPE_COUNT">EKEY_COUNT_NOT_MATCH_TYPE_COUNT</a>));
+
+    <b>let</b> i = 0;
+    <b>while</b> (i &lt; key_len) {
+        <b>let</b> key = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(&keys, i);
+        <b>let</b> prop_val = <a href="property_map.md#0x3_property_map_PropertyValue">PropertyValue</a> {
+            value: *<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(&values, i),
+            type: *<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(&types, i),
+        };
+        <b>if</b> (<a href="property_map.md#0x3_property_map_contains_key">contains_key</a>(map, key)) {
+            <a href="property_map.md#0x3_property_map_update_property_value">update_property_value</a>(map, key, prop_val);
+        } <b>else</b> {
+            <a href="property_map.md#0x3_property_map_add">add</a>(map, *key, prop_val);
+        };
+        i = i + 1;
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_property_map_update_property_value"></a>
+
+## Function `update_property_value`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_update_property_value">update_property_value</a>(map: &<b>mut</b> <a href="property_map.md#0x3_property_map_PropertyMap">property_map::PropertyMap</a>, key: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, value: <a href="property_map.md#0x3_property_map_PropertyValue">property_map::PropertyValue</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_update_property_value">update_property_value</a>(
+    map: &<b>mut</b> <a href="property_map.md#0x3_property_map_PropertyMap">PropertyMap</a>,
+    key: &String,
+    value: <a href="property_map.md#0x3_property_map_PropertyValue">PropertyValue</a>
+) {
+    <b>let</b> property_val = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_borrow_mut">simple_map::borrow_mut</a>(&<b>mut</b> map.map, key);
+    *property_val = value;
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_property_map_create_property_value_raw"></a>
+
+## Function `create_property_value_raw`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_create_property_value_raw">create_property_value_raw</a>(value: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, type: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): <a href="property_map.md#0x3_property_map_PropertyValue">property_map::PropertyValue</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_create_property_value_raw">create_property_value_raw</a>(
+    value: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;,
+    type: String
+): <a href="property_map.md#0x3_property_map_PropertyValue">PropertyValue</a> {
+    <a href="property_map.md#0x3_property_map_PropertyValue">PropertyValue</a> {
+        value,
+        type,
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_property_map_create_property_value"></a>
+
+## Function `create_property_value`
+
+create a property value from generic type data
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_create_property_value">create_property_value</a>&lt;T: <b>copy</b>&gt;(data: &T): <a href="property_map.md#0x3_property_map_PropertyValue">property_map::PropertyValue</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_create_property_value">create_property_value</a>&lt;T: <b>copy</b>&gt;(data: &T): <a href="property_map.md#0x3_property_map_PropertyValue">PropertyValue</a> {
+    <b>let</b> name = type_name&lt;T&gt;();
+    <b>if</b> (
+        name == <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"bool") ||
+            name == <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"u8") ||
+            name == <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"u64") ||
+            name == <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"u128") ||
+            name == <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"<b>address</b>") ||
+            name == <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">0x1::string::String</a>")
+    ) {
+        <a href="property_map.md#0x3_property_map_create_property_value_raw">create_property_value_raw</a>(<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs_to_bytes">bcs::to_bytes</a>&lt;T&gt;(data), name)
+    } <b>else</b> {
+        <a href="property_map.md#0x3_property_map_create_property_value_raw">create_property_value_raw</a>(<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/bcs.md#0x1_bcs_to_bytes">bcs::to_bytes</a>&lt;T&gt;(data), <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;"))
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+
+<pre><code><b>pragma</b> verify = <b>true</b>;
+<b>pragma</b> aborts_if_is_strict;
+<b>let</b> <a href="property_map.md#0x3_property_map_MAX_PROPERTY_MAP_SIZE">MAX_PROPERTY_MAP_SIZE</a> = 1000;
+<b>let</b> <a href="property_map.md#0x3_property_map_MAX_PROPERTY_NAME_LENGTH">MAX_PROPERTY_NAME_LENGTH</a>  = 128;
+</code></pre>
+
+
+
+<a id="@Specification_1_new"></a>
+
+### Function `new`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_new">new</a>(keys: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;, values: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;, types: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;): <a href="property_map.md#0x3_property_map_PropertyMap">property_map::PropertyMap</a>
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> aborts_if_is_partial;
+<b>let</b> length = len(keys);
+<b>aborts_if</b> !(<a href="property_map.md#0x3_property_map_length">length</a> &lt;= <a href="property_map.md#0x3_property_map_MAX_PROPERTY_MAP_SIZE">MAX_PROPERTY_MAP_SIZE</a>);
+<b>aborts_if</b> !(length == <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(values));
+<b>aborts_if</b> !(length == <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(types));
+</code></pre>
+
+
+
+<a id="@Specification_1_new_with_key_and_property_value"></a>
+
+### Function `new_with_key_and_property_value`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_new_with_key_and_property_value">new_with_key_and_property_value</a>(keys: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;, values: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="property_map.md#0x3_property_map_PropertyValue">property_map::PropertyValue</a>&gt;): <a href="property_map.md#0x3_property_map_PropertyMap">property_map::PropertyMap</a>
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> aborts_if_is_partial;
+<b>let</b> length = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(keys);
+<b>aborts_if</b> !(<a href="property_map.md#0x3_property_map_length">length</a> &lt;= <a href="property_map.md#0x3_property_map_MAX_PROPERTY_MAP_SIZE">MAX_PROPERTY_MAP_SIZE</a>);
+<b>aborts_if</b> !(length == len(values));
+</code></pre>
+
+
+
+<a id="@Specification_1_empty"></a>
+
+### Function `empty`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_empty">empty</a>(): <a href="property_map.md#0x3_property_map_PropertyMap">property_map::PropertyMap</a>
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_contains_key"></a>
+
+### Function `contains_key`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_contains_key">contains_key</a>(map: &<a href="property_map.md#0x3_property_map_PropertyMap">property_map::PropertyMap</a>, key: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): bool
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_add"></a>
+
+### Function `add`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_add">add</a>(map: &<b>mut</b> <a href="property_map.md#0x3_property_map_PropertyMap">property_map::PropertyMap</a>, key: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, value: <a href="property_map.md#0x3_property_map_PropertyValue">property_map::PropertyValue</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !(<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_length">string::length</a>(key) &lt;= <a href="property_map.md#0x3_property_map_MAX_PROPERTY_NAME_LENGTH">MAX_PROPERTY_NAME_LENGTH</a>);
+<b>aborts_if</b> !(!<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(map.map, key));
+<b>aborts_if</b> !(<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_len">simple_map::spec_len</a>(map.map) &lt; <a href="property_map.md#0x3_property_map_MAX_PROPERTY_MAP_SIZE">MAX_PROPERTY_MAP_SIZE</a>);
+</code></pre>
+
+
+
+<a id="@Specification_1_length"></a>
+
+### Function `length`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_length">length</a>(map: &<a href="property_map.md#0x3_property_map_PropertyMap">property_map::PropertyMap</a>): u64
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_borrow"></a>
+
+### Function `borrow`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_borrow">borrow</a>(map: &<a href="property_map.md#0x3_property_map_PropertyMap">property_map::PropertyMap</a>, key: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): &<a href="property_map.md#0x3_property_map_PropertyValue">property_map::PropertyValue</a>
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(map.map, key);
+</code></pre>
+
+
+
+<a id="@Specification_1_keys"></a>
+
+### Function `keys`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_keys">keys</a>(map: &<a href="property_map.md#0x3_property_map_PropertyMap">property_map::PropertyMap</a>): <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_types"></a>
+
+### Function `types`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_types">types</a>(map: &<a href="property_map.md#0x3_property_map_PropertyMap">property_map::PropertyMap</a>): <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_values"></a>
+
+### Function `values`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_values">values</a>(map: &<a href="property_map.md#0x3_property_map_PropertyMap">property_map::PropertyMap</a>): <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_read_string"></a>
+
+### Function `read_string`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_read_string">read_string</a>(map: &<a href="property_map.md#0x3_property_map_PropertyMap">property_map::PropertyMap</a>, key: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+Check utf8 for correctness and whether equal
+to <code>prop.type</code>
+
+
+<pre><code><b>pragma</b> aborts_if_is_partial;
+<b>aborts_if</b> !<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(map.map, key);
+<b>aborts_if</b> !<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_spec_internal_check_utf8">string::spec_internal_check_utf8</a>(b"<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">0x1::string::String</a>");
+<b>let</b> prop = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(map.map, key);
+<b>aborts_if</b> prop.type != <a href="property_map.md#0x3_property_map_spec_utf8">spec_utf8</a>(b"<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">0x1::string::String</a>");
+<b>aborts_if</b> !aptos_std::from_bcs::deserializable&lt;String&gt;(prop.value);
+</code></pre>
+
+
+
+
+<a id="0x3_property_map_spec_utf8"></a>
+
+
+<pre><code><b>fun</b> <a href="property_map.md#0x3_property_map_spec_utf8">spec_utf8</a>(bytes: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;): String {
+   String{bytes}
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_read_u8"></a>
+
+### Function `read_u8`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_read_u8">read_u8</a>(map: &<a href="property_map.md#0x3_property_map_PropertyMap">property_map::PropertyMap</a>, key: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): u8
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> str = b"u8";
+<b>aborts_if</b> !<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(map.map, key);
+<b>aborts_if</b> !<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_spec_internal_check_utf8">string::spec_internal_check_utf8</a>(str);
+<b>let</b> prop = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(map.map, key);
+<b>aborts_if</b> prop.type != <a href="property_map.md#0x3_property_map_spec_utf8">spec_utf8</a>(str);
+<b>aborts_if</b> !aptos_std::from_bcs::deserializable&lt;u8&gt;(prop.value);
+</code></pre>
+
+
+
+<a id="@Specification_1_read_u64"></a>
+
+### Function `read_u64`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_read_u64">read_u64</a>(map: &<a href="property_map.md#0x3_property_map_PropertyMap">property_map::PropertyMap</a>, key: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): u64
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> str = b"u64";
+<b>aborts_if</b> !<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(map.map, key);
+<b>aborts_if</b> !<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_spec_internal_check_utf8">string::spec_internal_check_utf8</a>(str);
+<b>let</b> prop = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(map.map, key);
+<b>aborts_if</b> prop.type != <a href="property_map.md#0x3_property_map_spec_utf8">spec_utf8</a>(str);
+<b>aborts_if</b> !aptos_std::from_bcs::deserializable&lt;u64&gt;(prop.value);
+</code></pre>
+
+
+
+<a id="@Specification_1_read_address"></a>
+
+### Function `read_address`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_read_address">read_address</a>(map: &<a href="property_map.md#0x3_property_map_PropertyMap">property_map::PropertyMap</a>, key: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): <b>address</b>
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> str = b"<b>address</b>";
+<b>aborts_if</b> !<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(map.map, key);
+<b>aborts_if</b> !<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_spec_internal_check_utf8">string::spec_internal_check_utf8</a>(str);
+<b>let</b> prop = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(map.map, key);
+<b>aborts_if</b> prop.type != <a href="property_map.md#0x3_property_map_spec_utf8">spec_utf8</a>(str);
+<b>aborts_if</b> !aptos_std::from_bcs::deserializable&lt;<b>address</b>&gt;(prop.value);
+</code></pre>
+
+
+
+<a id="@Specification_1_read_u128"></a>
+
+### Function `read_u128`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_read_u128">read_u128</a>(map: &<a href="property_map.md#0x3_property_map_PropertyMap">property_map::PropertyMap</a>, key: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): u128
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> str = b"u128";
+<b>aborts_if</b> !<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(map.map, key);
+<b>aborts_if</b> !<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_spec_internal_check_utf8">string::spec_internal_check_utf8</a>(str);
+<b>let</b> prop = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(map.map, key);
+<b>aborts_if</b> prop.type != <a href="property_map.md#0x3_property_map_spec_utf8">spec_utf8</a>(str);
+<b>aborts_if</b> !aptos_std::from_bcs::deserializable&lt;u128&gt;(prop.value);
+</code></pre>
+
+
+
+<a id="@Specification_1_read_bool"></a>
+
+### Function `read_bool`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_read_bool">read_bool</a>(map: &<a href="property_map.md#0x3_property_map_PropertyMap">property_map::PropertyMap</a>, key: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): bool
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> str = b"bool";
+<b>aborts_if</b> !<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(map.map, key);
+<b>aborts_if</b> !<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_spec_internal_check_utf8">string::spec_internal_check_utf8</a>(str);
+<b>let</b> prop = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_get">simple_map::spec_get</a>(map.map, key);
+<b>aborts_if</b> prop.type != <a href="property_map.md#0x3_property_map_spec_utf8">spec_utf8</a>(str);
+<b>aborts_if</b> !aptos_std::from_bcs::deserializable&lt;bool&gt;(prop.value);
+</code></pre>
+
+
+
+<a id="@Specification_1_borrow_value"></a>
+
+### Function `borrow_value`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_borrow_value">borrow_value</a>(property: &<a href="property_map.md#0x3_property_map_PropertyValue">property_map::PropertyValue</a>): <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_borrow_type"></a>
+
+### Function `borrow_type`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_borrow_type">borrow_type</a>(property: &<a href="property_map.md#0x3_property_map_PropertyValue">property_map::PropertyValue</a>): <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_remove"></a>
+
+### Function `remove`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_remove">remove</a>(map: &<b>mut</b> <a href="property_map.md#0x3_property_map_PropertyMap">property_map::PropertyMap</a>, key: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): (<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, <a href="property_map.md#0x3_property_map_PropertyValue">property_map::PropertyValue</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(map.map, key);
+</code></pre>
+
+
+
+<a id="@Specification_1_update_property_map"></a>
+
+### Function `update_property_map`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_update_property_map">update_property_map</a>(map: &<b>mut</b> <a href="property_map.md#0x3_property_map_PropertyMap">property_map::PropertyMap</a>, keys: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;, values: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;, types: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> aborts_if_is_partial;
+<b>let</b> key_len = len(keys);
+<b>let</b> val_len = len(values);
+<b>let</b> typ_len = len(types);
+<b>aborts_if</b> !(key_len == val_len);
+<b>aborts_if</b> !(key_len == typ_len);
+</code></pre>
+
+
+
+<a id="@Specification_1_update_property_value"></a>
+
+### Function `update_property_value`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_update_property_value">update_property_value</a>(map: &<b>mut</b> <a href="property_map.md#0x3_property_map_PropertyMap">property_map::PropertyMap</a>, key: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, value: <a href="property_map.md#0x3_property_map_PropertyValue">property_map::PropertyValue</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(map.map, key);
+</code></pre>
+
+
+
+<a id="@Specification_1_create_property_value_raw"></a>
+
+### Function `create_property_value_raw`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_create_property_value_raw">create_property_value_raw</a>(value: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;, type: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): <a href="property_map.md#0x3_property_map_PropertyValue">property_map::PropertyValue</a>
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_create_property_value"></a>
+
+### Function `create_property_value`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="property_map.md#0x3_property_map_create_property_value">create_property_value</a>&lt;T: <b>copy</b>&gt;(data: &T): <a href="property_map.md#0x3_property_map_PropertyValue">property_map::PropertyValue</a>
+</code></pre>
+
+
+Abort according to the code
+
+
+<pre><code><b>let</b> name = type_name&lt;T&gt;();
+<b>aborts_if</b> !<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_spec_internal_check_utf8">string::spec_internal_check_utf8</a>(b"bool");
+<b>aborts_if</b> name != <a href="property_map.md#0x3_property_map_spec_utf8">spec_utf8</a>(b"bool") &&
+    !<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_spec_internal_check_utf8">string::spec_internal_check_utf8</a>(b"u8");
+<b>aborts_if</b> name != <a href="property_map.md#0x3_property_map_spec_utf8">spec_utf8</a>(b"bool") &&
+    name != <a href="property_map.md#0x3_property_map_spec_utf8">spec_utf8</a>(b"u8") &&
+    !<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_spec_internal_check_utf8">string::spec_internal_check_utf8</a>(b"u64");
+<b>aborts_if</b> name != <a href="property_map.md#0x3_property_map_spec_utf8">spec_utf8</a>(b"bool") &&
+    name != <a href="property_map.md#0x3_property_map_spec_utf8">spec_utf8</a>(b"u8") &&
+    name != <a href="property_map.md#0x3_property_map_spec_utf8">spec_utf8</a>(b"u64") &&
+    !<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_spec_internal_check_utf8">string::spec_internal_check_utf8</a>(b"u128");
+<b>aborts_if</b> name != <a href="property_map.md#0x3_property_map_spec_utf8">spec_utf8</a>(b"bool") &&
+    name != <a href="property_map.md#0x3_property_map_spec_utf8">spec_utf8</a>(b"u8") &&
+    name != <a href="property_map.md#0x3_property_map_spec_utf8">spec_utf8</a>(b"u64") &&
+    name != <a href="property_map.md#0x3_property_map_spec_utf8">spec_utf8</a>(b"u128") &&
+    !<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_spec_internal_check_utf8">string::spec_internal_check_utf8</a>(b"<b>address</b>");
+<b>aborts_if</b> name != <a href="property_map.md#0x3_property_map_spec_utf8">spec_utf8</a>(b"bool") &&
+    name != <a href="property_map.md#0x3_property_map_spec_utf8">spec_utf8</a>(b"u8") &&
+    name != <a href="property_map.md#0x3_property_map_spec_utf8">spec_utf8</a>(b"u64") &&
+    name != <a href="property_map.md#0x3_property_map_spec_utf8">spec_utf8</a>(b"u128") &&
+    name != <a href="property_map.md#0x3_property_map_spec_utf8">spec_utf8</a>(b"<b>address</b>") &&
+    !<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_spec_internal_check_utf8">string::spec_internal_check_utf8</a>(b"<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">0x1::string::String</a>");
+<b>aborts_if</b> name != <a href="property_map.md#0x3_property_map_spec_utf8">spec_utf8</a>(b"bool") &&
+    name != <a href="property_map.md#0x3_property_map_spec_utf8">spec_utf8</a>(b"u8") &&
+    name != <a href="property_map.md#0x3_property_map_spec_utf8">spec_utf8</a>(b"u64") &&
+    name != <a href="property_map.md#0x3_property_map_spec_utf8">spec_utf8</a>(b"u128") &&
+    name != <a href="property_map.md#0x3_property_map_spec_utf8">spec_utf8</a>(b"<b>address</b>") &&
+    name != <a href="property_map.md#0x3_property_map_spec_utf8">spec_utf8</a>(b"<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">0x1::string::String</a>") &&
+    !<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_spec_internal_check_utf8">string::spec_internal_check_utf8</a>(b"<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;");
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-token/tests/compiler-v2-doc/token.md b/aptos-move/framework/aptos-token/tests/compiler-v2-doc/token.md
new file mode 100644
index 0000000000000..818be7527c2f8
--- /dev/null
+++ b/aptos-move/framework/aptos-token/tests/compiler-v2-doc/token.md
@@ -0,0 +1,6594 @@
+
+<a id="0x3_token"></a>
+
+# Module `0x3::token`
+
+This module provides the foundation for Tokens.
+Checkout our developer doc on our token standard https://aptos.dev/standards
+
+
+-  [Struct `Token`](#0x3_token_Token)
+-  [Struct `TokenId`](#0x3_token_TokenId)
+-  [Struct `TokenDataId`](#0x3_token_TokenDataId)
+-  [Struct `TokenData`](#0x3_token_TokenData)
+-  [Struct `Royalty`](#0x3_token_Royalty)
+-  [Struct `TokenMutabilityConfig`](#0x3_token_TokenMutabilityConfig)
+-  [Resource `TokenStore`](#0x3_token_TokenStore)
+-  [Struct `CollectionMutabilityConfig`](#0x3_token_CollectionMutabilityConfig)
+-  [Resource `Collections`](#0x3_token_Collections)
+-  [Struct `CollectionData`](#0x3_token_CollectionData)
+-  [Struct `WithdrawCapability`](#0x3_token_WithdrawCapability)
+-  [Struct `DepositEvent`](#0x3_token_DepositEvent)
+-  [Struct `Deposit`](#0x3_token_Deposit)
+-  [Struct `WithdrawEvent`](#0x3_token_WithdrawEvent)
+-  [Struct `Withdraw`](#0x3_token_Withdraw)
+-  [Struct `CreateTokenDataEvent`](#0x3_token_CreateTokenDataEvent)
+-  [Struct `CreateTokenData`](#0x3_token_CreateTokenData)
+-  [Struct `MintTokenEvent`](#0x3_token_MintTokenEvent)
+-  [Struct `MintToken`](#0x3_token_MintToken)
+-  [Struct `BurnTokenEvent`](#0x3_token_BurnTokenEvent)
+-  [Struct `BurnToken`](#0x3_token_BurnToken)
+-  [Struct `MutateTokenPropertyMapEvent`](#0x3_token_MutateTokenPropertyMapEvent)
+-  [Struct `MutateTokenPropertyMap`](#0x3_token_MutateTokenPropertyMap)
+-  [Struct `CreateCollectionEvent`](#0x3_token_CreateCollectionEvent)
+-  [Struct `CreateCollection`](#0x3_token_CreateCollection)
+-  [Constants](#@Constants_0)
+-  [Function `create_collection_script`](#0x3_token_create_collection_script)
+-  [Function `create_token_script`](#0x3_token_create_token_script)
+-  [Function `mint_script`](#0x3_token_mint_script)
+-  [Function `mutate_token_properties`](#0x3_token_mutate_token_properties)
+-  [Function `direct_transfer_script`](#0x3_token_direct_transfer_script)
+-  [Function `opt_in_direct_transfer`](#0x3_token_opt_in_direct_transfer)
+-  [Function `transfer_with_opt_in`](#0x3_token_transfer_with_opt_in)
+-  [Function `burn_by_creator`](#0x3_token_burn_by_creator)
+-  [Function `burn`](#0x3_token_burn)
+-  [Function `mutate_collection_description`](#0x3_token_mutate_collection_description)
+-  [Function `mutate_collection_uri`](#0x3_token_mutate_collection_uri)
+-  [Function `mutate_collection_maximum`](#0x3_token_mutate_collection_maximum)
+-  [Function `mutate_tokendata_maximum`](#0x3_token_mutate_tokendata_maximum)
+-  [Function `mutate_tokendata_uri`](#0x3_token_mutate_tokendata_uri)
+-  [Function `mutate_tokendata_royalty`](#0x3_token_mutate_tokendata_royalty)
+-  [Function `mutate_tokendata_description`](#0x3_token_mutate_tokendata_description)
+-  [Function `mutate_tokendata_property`](#0x3_token_mutate_tokendata_property)
+-  [Function `mutate_one_token`](#0x3_token_mutate_one_token)
+-  [Function `create_royalty`](#0x3_token_create_royalty)
+-  [Function `deposit_token`](#0x3_token_deposit_token)
+-  [Function `direct_deposit_with_opt_in`](#0x3_token_direct_deposit_with_opt_in)
+-  [Function `direct_transfer`](#0x3_token_direct_transfer)
+-  [Function `initialize_token_store`](#0x3_token_initialize_token_store)
+-  [Function `merge`](#0x3_token_merge)
+-  [Function `split`](#0x3_token_split)
+-  [Function `token_id`](#0x3_token_token_id)
+-  [Function `transfer`](#0x3_token_transfer)
+-  [Function `create_withdraw_capability`](#0x3_token_create_withdraw_capability)
+-  [Function `withdraw_with_capability`](#0x3_token_withdraw_with_capability)
+-  [Function `partial_withdraw_with_capability`](#0x3_token_partial_withdraw_with_capability)
+-  [Function `withdraw_token`](#0x3_token_withdraw_token)
+-  [Function `create_collection`](#0x3_token_create_collection)
+-  [Function `check_collection_exists`](#0x3_token_check_collection_exists)
+-  [Function `check_tokendata_exists`](#0x3_token_check_tokendata_exists)
+-  [Function `create_tokendata`](#0x3_token_create_tokendata)
+-  [Function `get_collection_supply`](#0x3_token_get_collection_supply)
+-  [Function `get_collection_description`](#0x3_token_get_collection_description)
+-  [Function `get_collection_uri`](#0x3_token_get_collection_uri)
+-  [Function `get_collection_maximum`](#0x3_token_get_collection_maximum)
+-  [Function `get_token_supply`](#0x3_token_get_token_supply)
+-  [Function `get_tokendata_largest_property_version`](#0x3_token_get_tokendata_largest_property_version)
+-  [Function `get_token_id`](#0x3_token_get_token_id)
+-  [Function `get_direct_transfer`](#0x3_token_get_direct_transfer)
+-  [Function `create_token_mutability_config`](#0x3_token_create_token_mutability_config)
+-  [Function `create_collection_mutability_config`](#0x3_token_create_collection_mutability_config)
+-  [Function `mint_token`](#0x3_token_mint_token)
+-  [Function `mint_token_to`](#0x3_token_mint_token_to)
+-  [Function `create_token_id`](#0x3_token_create_token_id)
+-  [Function `create_token_data_id`](#0x3_token_create_token_data_id)
+-  [Function `create_token_id_raw`](#0x3_token_create_token_id_raw)
+-  [Function `balance_of`](#0x3_token_balance_of)
+-  [Function `has_token_store`](#0x3_token_has_token_store)
+-  [Function `get_royalty`](#0x3_token_get_royalty)
+-  [Function `get_royalty_numerator`](#0x3_token_get_royalty_numerator)
+-  [Function `get_royalty_denominator`](#0x3_token_get_royalty_denominator)
+-  [Function `get_royalty_payee`](#0x3_token_get_royalty_payee)
+-  [Function `get_token_amount`](#0x3_token_get_token_amount)
+-  [Function `get_token_id_fields`](#0x3_token_get_token_id_fields)
+-  [Function `get_token_data_id_fields`](#0x3_token_get_token_data_id_fields)
+-  [Function `get_property_map`](#0x3_token_get_property_map)
+-  [Function `get_tokendata_maximum`](#0x3_token_get_tokendata_maximum)
+-  [Function `get_tokendata_uri`](#0x3_token_get_tokendata_uri)
+-  [Function `get_tokendata_description`](#0x3_token_get_tokendata_description)
+-  [Function `get_tokendata_royalty`](#0x3_token_get_tokendata_royalty)
+-  [Function `get_tokendata_id`](#0x3_token_get_tokendata_id)
+-  [Function `get_tokendata_mutability_config`](#0x3_token_get_tokendata_mutability_config)
+-  [Function `get_token_mutability_maximum`](#0x3_token_get_token_mutability_maximum)
+-  [Function `get_token_mutability_royalty`](#0x3_token_get_token_mutability_royalty)
+-  [Function `get_token_mutability_uri`](#0x3_token_get_token_mutability_uri)
+-  [Function `get_token_mutability_description`](#0x3_token_get_token_mutability_description)
+-  [Function `get_token_mutability_default_properties`](#0x3_token_get_token_mutability_default_properties)
+-  [Function `get_collection_mutability_config`](#0x3_token_get_collection_mutability_config)
+-  [Function `get_collection_mutability_description`](#0x3_token_get_collection_mutability_description)
+-  [Function `get_collection_mutability_uri`](#0x3_token_get_collection_mutability_uri)
+-  [Function `get_collection_mutability_maximum`](#0x3_token_get_collection_mutability_maximum)
+-  [Function `destroy_token_data`](#0x3_token_destroy_token_data)
+-  [Function `destroy_collection_data`](#0x3_token_destroy_collection_data)
+-  [Function `withdraw_with_event_internal`](#0x3_token_withdraw_with_event_internal)
+-  [Function `update_token_property_internal`](#0x3_token_update_token_property_internal)
+-  [Function `direct_deposit`](#0x3_token_direct_deposit)
+-  [Function `assert_collection_exists`](#0x3_token_assert_collection_exists)
+-  [Function `assert_tokendata_exists`](#0x3_token_assert_tokendata_exists)
+-  [Function `assert_non_standard_reserved_property`](#0x3_token_assert_non_standard_reserved_property)
+-  [Function `initialize_token_script`](#0x3_token_initialize_token_script)
+-  [Function `initialize_token`](#0x3_token_initialize_token)
+-  [Specification](#@Specification_1)
+    -  [Function `create_collection_script`](#@Specification_1_create_collection_script)
+    -  [Function `create_token_script`](#@Specification_1_create_token_script)
+    -  [Function `mint_script`](#@Specification_1_mint_script)
+    -  [Function `mutate_token_properties`](#@Specification_1_mutate_token_properties)
+    -  [Function `direct_transfer_script`](#@Specification_1_direct_transfer_script)
+    -  [Function `opt_in_direct_transfer`](#@Specification_1_opt_in_direct_transfer)
+    -  [Function `transfer_with_opt_in`](#@Specification_1_transfer_with_opt_in)
+    -  [Function `burn_by_creator`](#@Specification_1_burn_by_creator)
+    -  [Function `burn`](#@Specification_1_burn)
+    -  [Function `mutate_collection_description`](#@Specification_1_mutate_collection_description)
+    -  [Function `mutate_collection_uri`](#@Specification_1_mutate_collection_uri)
+    -  [Function `mutate_collection_maximum`](#@Specification_1_mutate_collection_maximum)
+    -  [Function `mutate_tokendata_maximum`](#@Specification_1_mutate_tokendata_maximum)
+    -  [Function `mutate_tokendata_uri`](#@Specification_1_mutate_tokendata_uri)
+    -  [Function `mutate_tokendata_royalty`](#@Specification_1_mutate_tokendata_royalty)
+    -  [Function `mutate_tokendata_description`](#@Specification_1_mutate_tokendata_description)
+    -  [Function `mutate_tokendata_property`](#@Specification_1_mutate_tokendata_property)
+    -  [Function `mutate_one_token`](#@Specification_1_mutate_one_token)
+    -  [Function `create_royalty`](#@Specification_1_create_royalty)
+    -  [Function `deposit_token`](#@Specification_1_deposit_token)
+    -  [Function `direct_deposit_with_opt_in`](#@Specification_1_direct_deposit_with_opt_in)
+    -  [Function `direct_transfer`](#@Specification_1_direct_transfer)
+    -  [Function `initialize_token_store`](#@Specification_1_initialize_token_store)
+    -  [Function `merge`](#@Specification_1_merge)
+    -  [Function `split`](#@Specification_1_split)
+    -  [Function `transfer`](#@Specification_1_transfer)
+    -  [Function `withdraw_with_capability`](#@Specification_1_withdraw_with_capability)
+    -  [Function `partial_withdraw_with_capability`](#@Specification_1_partial_withdraw_with_capability)
+    -  [Function `withdraw_token`](#@Specification_1_withdraw_token)
+    -  [Function `create_collection`](#@Specification_1_create_collection)
+    -  [Function `check_collection_exists`](#@Specification_1_check_collection_exists)
+    -  [Function `check_tokendata_exists`](#@Specification_1_check_tokendata_exists)
+    -  [Function `create_tokendata`](#@Specification_1_create_tokendata)
+    -  [Function `get_collection_supply`](#@Specification_1_get_collection_supply)
+    -  [Function `get_collection_description`](#@Specification_1_get_collection_description)
+    -  [Function `get_collection_uri`](#@Specification_1_get_collection_uri)
+    -  [Function `get_collection_maximum`](#@Specification_1_get_collection_maximum)
+    -  [Function `get_token_supply`](#@Specification_1_get_token_supply)
+    -  [Function `get_tokendata_largest_property_version`](#@Specification_1_get_tokendata_largest_property_version)
+    -  [Function `create_token_mutability_config`](#@Specification_1_create_token_mutability_config)
+    -  [Function `create_collection_mutability_config`](#@Specification_1_create_collection_mutability_config)
+    -  [Function `mint_token`](#@Specification_1_mint_token)
+    -  [Function `mint_token_to`](#@Specification_1_mint_token_to)
+    -  [Function `create_token_data_id`](#@Specification_1_create_token_data_id)
+    -  [Function `create_token_id_raw`](#@Specification_1_create_token_id_raw)
+    -  [Function `get_royalty`](#@Specification_1_get_royalty)
+    -  [Function `get_property_map`](#@Specification_1_get_property_map)
+    -  [Function `get_tokendata_maximum`](#@Specification_1_get_tokendata_maximum)
+    -  [Function `get_tokendata_uri`](#@Specification_1_get_tokendata_uri)
+    -  [Function `get_tokendata_description`](#@Specification_1_get_tokendata_description)
+    -  [Function `get_tokendata_royalty`](#@Specification_1_get_tokendata_royalty)
+    -  [Function `get_tokendata_mutability_config`](#@Specification_1_get_tokendata_mutability_config)
+    -  [Function `get_collection_mutability_config`](#@Specification_1_get_collection_mutability_config)
+    -  [Function `withdraw_with_event_internal`](#@Specification_1_withdraw_with_event_internal)
+    -  [Function `update_token_property_internal`](#@Specification_1_update_token_property_internal)
+    -  [Function `direct_deposit`](#@Specification_1_direct_deposit)
+    -  [Function `assert_collection_exists`](#@Specification_1_assert_collection_exists)
+    -  [Function `assert_tokendata_exists`](#@Specification_1_assert_tokendata_exists)
+    -  [Function `assert_non_standard_reserved_property`](#@Specification_1_assert_non_standard_reserved_property)
+    -  [Function `initialize_token_script`](#@Specification_1_initialize_token_script)
+    -  [Function `initialize_token`](#@Specification_1_initialize_token)
+
+
+<pre><code><b>use</b> <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">0x1::account</a>;
+<b>use</b> <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event">0x1::event</a>;
+<b>use</b> <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features">0x1::features</a>;
+<b>use</b> <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option">0x1::option</a>;
+<b>use</b> <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">0x1::signer</a>;
+<b>use</b> <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string">0x1::string</a>;
+<b>use</b> <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table">0x1::table</a>;
+<b>use</b> <a href="../../../aptos-framework/tests/compiler-v2-doc/timestamp.md#0x1_timestamp">0x1::timestamp</a>;
+<b>use</b> <a href="property_map.md#0x3_property_map">0x3::property_map</a>;
+<b>use</b> <a href="token_event_store.md#0x3_token_event_store">0x3::token_event_store</a>;
+</code></pre>
+
+
+
+<a id="0x3_token_Token"></a>
+
+## Struct `Token`
+
+
+
+<pre><code><b>struct</b> <a href="token.md#0x3_token_Token">Token</a> <b>has</b> store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>id: <a href="token.md#0x3_token_TokenId">token::TokenId</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>amount: u64</code>
+</dt>
+<dd>
+ the amount of tokens. Only property_version = 0 can have a value bigger than 1.
+</dd>
+<dt>
+<code>token_properties: <a href="property_map.md#0x3_property_map_PropertyMap">property_map::PropertyMap</a></code>
+</dt>
+<dd>
+ The properties with this token.
+ when property_version = 0, the token_properties are the same as default_properties in TokenData, we don't store it.
+ when the property_map mutates, a new property_version is assigned to the token.
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x3_token_TokenId"></a>
+
+## Struct `TokenId`
+
+global unique identifier of a token
+
+
+<pre><code><b>struct</b> <a href="token.md#0x3_token_TokenId">TokenId</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>token_data_id: <a href="token.md#0x3_token_TokenDataId">token::TokenDataId</a></code>
+</dt>
+<dd>
+ the id to the common token data shared by token with different property_version
+</dd>
+<dt>
+<code>property_version: u64</code>
+</dt>
+<dd>
+ The version of the property map; when a fungible token is mutated, a new property version is created and assigned to the token to make it an NFT
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x3_token_TokenDataId"></a>
+
+## Struct `TokenDataId`
+
+globally unique identifier of tokendata
+
+
+<pre><code><b>struct</b> <a href="token.md#0x3_token_TokenDataId">TokenDataId</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>creator: <b>address</b></code>
+</dt>
+<dd>
+ The address of the creator, eg: 0xcafe
+</dd>
+<dt>
+<code>collection: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+ The name of collection; this is unique under the same account, eg: "Aptos Animal Collection"
+</dd>
+<dt>
+<code>name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+ The name of the token; this is the same as the name field of TokenData
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x3_token_TokenData"></a>
+
+## Struct `TokenData`
+
+The shared TokenData by tokens with different property_version
+
+
+<pre><code><b>struct</b> <a href="token.md#0x3_token_TokenData">TokenData</a> <b>has</b> store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>maximum: u64</code>
+</dt>
+<dd>
+ The maximal number of tokens that can be minted under this TokenData; if the maximum is 0, there is no limit
+</dd>
+<dt>
+<code>largest_property_version: u64</code>
+</dt>
+<dd>
+ The current largest property version of all tokens with this TokenData
+</dd>
+<dt>
+<code>supply: u64</code>
+</dt>
+<dd>
+ The number of tokens with this TokenData. Supply is only tracked for the limited token whose maximum is not 0
+</dd>
+<dt>
+<code>uri: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+ The Uniform Resource Identifier (uri) pointing to the JSON file stored in off-chain storage; the URL length should be less than 512 characters, eg: https://arweave.net/Fmmn4ul-7Mv6vzm7JwE69O-I-vd6Bz2QriJO1niwCh4
+</dd>
+<dt>
+<code>royalty: <a href="token.md#0x3_token_Royalty">token::Royalty</a></code>
+</dt>
+<dd>
+ The denominator and numerator for calculating the royalty fee; it also contains payee account address for depositing the Royalty
+</dd>
+<dt>
+<code>name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+ The name of the token, which should be unique within the collection; the length of name should be smaller than 128, characters, eg: "Aptos Animal #1234"
+</dd>
+<dt>
+<code>description: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+ Describes this Token
+</dd>
+<dt>
+<code>default_properties: <a href="property_map.md#0x3_property_map_PropertyMap">property_map::PropertyMap</a></code>
+</dt>
+<dd>
+ The properties are stored in the TokenData that are shared by all tokens
+</dd>
+<dt>
+<code>mutability_config: <a href="token.md#0x3_token_TokenMutabilityConfig">token::TokenMutabilityConfig</a></code>
+</dt>
+<dd>
+ Control the TokenData field mutability
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x3_token_Royalty"></a>
+
+## Struct `Royalty`
+
+The royalty of a token
+
+
+<pre><code><b>struct</b> <a href="token.md#0x3_token_Royalty">Royalty</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>royalty_points_numerator: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>royalty_points_denominator: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>payee_address: <b>address</b></code>
+</dt>
+<dd>
+ if the token is jointly owned by multiple creators, the group of creators should create a shared account.
+ the payee_address will be the shared account address.
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x3_token_TokenMutabilityConfig"></a>
+
+## Struct `TokenMutabilityConfig`
+
+This config specifies which fields in the TokenData are mutable
+
+
+<pre><code><b>struct</b> <a href="token.md#0x3_token_TokenMutabilityConfig">TokenMutabilityConfig</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>maximum: bool</code>
+</dt>
+<dd>
+ control if the token maximum is mutable
+</dd>
+<dt>
+<code>uri: bool</code>
+</dt>
+<dd>
+ control if the token uri is mutable
+</dd>
+<dt>
+<code>royalty: bool</code>
+</dt>
+<dd>
+ control if the token royalty is mutable
+</dd>
+<dt>
+<code>description: bool</code>
+</dt>
+<dd>
+ control if the token description is mutable
+</dd>
+<dt>
+<code>properties: bool</code>
+</dt>
+<dd>
+ control if the property map is mutable
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x3_token_TokenStore"></a>
+
+## Resource `TokenStore`
+
+Represents token resources owned by token owner
+
+
+<pre><code><b>struct</b> <a href="token.md#0x3_token_TokenStore">TokenStore</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>tokens: <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_Table">table::Table</a>&lt;<a href="token.md#0x3_token_TokenId">token::TokenId</a>, <a href="token.md#0x3_token_Token">token::Token</a>&gt;</code>
+</dt>
+<dd>
+ the tokens owned by a token owner
+</dd>
+<dt>
+<code>direct_transfer: bool</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>deposit_events: <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="token.md#0x3_token_DepositEvent">token::DepositEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>withdraw_events: <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="token.md#0x3_token_WithdrawEvent">token::WithdrawEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>burn_events: <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="token.md#0x3_token_BurnTokenEvent">token::BurnTokenEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>mutate_token_property_events: <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="token.md#0x3_token_MutateTokenPropertyMapEvent">token::MutateTokenPropertyMapEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x3_token_CollectionMutabilityConfig"></a>
+
+## Struct `CollectionMutabilityConfig`
+
+This config specifies which fields in the Collection are mutable
+
+
+<pre><code><b>struct</b> <a href="token.md#0x3_token_CollectionMutabilityConfig">CollectionMutabilityConfig</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>description: bool</code>
+</dt>
+<dd>
+ control if description is mutable
+</dd>
+<dt>
+<code>uri: bool</code>
+</dt>
+<dd>
+ control if uri is mutable
+</dd>
+<dt>
+<code>maximum: bool</code>
+</dt>
+<dd>
+ control if collection maxium is mutable
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x3_token_Collections"></a>
+
+## Resource `Collections`
+
+Represent collection and token metadata for a creator
+
+
+<pre><code><b>struct</b> <a href="token.md#0x3_token_Collections">Collections</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>collection_data: <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_Table">table::Table</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, <a href="token.md#0x3_token_CollectionData">token::CollectionData</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>token_data: <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_Table">table::Table</a>&lt;<a href="token.md#0x3_token_TokenDataId">token::TokenDataId</a>, <a href="token.md#0x3_token_TokenData">token::TokenData</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>create_collection_events: <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="token.md#0x3_token_CreateCollectionEvent">token::CreateCollectionEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>create_token_data_events: <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="token.md#0x3_token_CreateTokenDataEvent">token::CreateTokenDataEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>mint_token_events: <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="token.md#0x3_token_MintTokenEvent">token::MintTokenEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x3_token_CollectionData"></a>
+
+## Struct `CollectionData`
+
+Represent the collection metadata
+
+
+<pre><code><b>struct</b> <a href="token.md#0x3_token_CollectionData">CollectionData</a> <b>has</b> store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>description: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+ A description for the token collection Eg: "Aptos Toad Overload"
+</dd>
+<dt>
+<code>name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+ The collection name, which should be unique among all collections by the creator; the name should also be smaller than 128 characters, eg: "Animal Collection"
+</dd>
+<dt>
+<code>uri: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+ The URI for the collection; its length should be smaller than 512 characters
+</dd>
+<dt>
+<code>supply: u64</code>
+</dt>
+<dd>
+ The number of different TokenData entries in this collection
+</dd>
+<dt>
+<code>maximum: u64</code>
+</dt>
+<dd>
+ If maximal is a non-zero value, the number of created TokenData entries should be smaller or equal to this maximum
+ If maximal is 0, Aptos doesn't track the supply of this collection, and there is no limit
+</dd>
+<dt>
+<code>mutability_config: <a href="token.md#0x3_token_CollectionMutabilityConfig">token::CollectionMutabilityConfig</a></code>
+</dt>
+<dd>
+ control which collectionData field is mutable
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x3_token_WithdrawCapability"></a>
+
+## Struct `WithdrawCapability`
+
+capability to withdraw without signer, this struct should be non-copyable
+
+
+<pre><code><b>struct</b> <a href="token.md#0x3_token_WithdrawCapability">WithdrawCapability</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>token_owner: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>token_id: <a href="token.md#0x3_token_TokenId">token::TokenId</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>amount: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>expiration_sec: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x3_token_DepositEvent"></a>
+
+## Struct `DepositEvent`
+
+Set of data sent to the event stream during a receive
+
+
+<pre><code><b>struct</b> <a href="token.md#0x3_token_DepositEvent">DepositEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>id: <a href="token.md#0x3_token_TokenId">token::TokenId</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>amount: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x3_token_Deposit"></a>
+
+## Struct `Deposit`
+
+Set of data sent to the event stream during a receive
+
+
+<pre><code>#[<a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event">event</a>]
+<b>struct</b> <a href="token.md#0x3_token_Deposit">Deposit</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>id: <a href="token.md#0x3_token_TokenId">token::TokenId</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>amount: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x3_token_WithdrawEvent"></a>
+
+## Struct `WithdrawEvent`
+
+Set of data sent to the event stream during a withdrawal
+
+
+<pre><code><b>struct</b> <a href="token.md#0x3_token_WithdrawEvent">WithdrawEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>id: <a href="token.md#0x3_token_TokenId">token::TokenId</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>amount: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x3_token_Withdraw"></a>
+
+## Struct `Withdraw`
+
+Set of data sent to the event stream during a withdrawal
+
+
+<pre><code>#[<a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event">event</a>]
+<b>struct</b> <a href="token.md#0x3_token_Withdraw">Withdraw</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>id: <a href="token.md#0x3_token_TokenId">token::TokenId</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>amount: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x3_token_CreateTokenDataEvent"></a>
+
+## Struct `CreateTokenDataEvent`
+
+token creation event id of token created
+
+
+<pre><code><b>struct</b> <a href="token.md#0x3_token_CreateTokenDataEvent">CreateTokenDataEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>id: <a href="token.md#0x3_token_TokenDataId">token::TokenDataId</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>description: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>maximum: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>uri: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>royalty_payee_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>royalty_points_denominator: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>royalty_points_numerator: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>mutability_config: <a href="token.md#0x3_token_TokenMutabilityConfig">token::TokenMutabilityConfig</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>property_keys: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>property_values: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>property_types: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x3_token_CreateTokenData"></a>
+
+## Struct `CreateTokenData`
+
+
+
+<pre><code>#[<a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event">event</a>]
+<b>struct</b> <a href="token.md#0x3_token_CreateTokenData">CreateTokenData</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>id: <a href="token.md#0x3_token_TokenDataId">token::TokenDataId</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>description: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>maximum: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>uri: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>royalty_payee_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>royalty_points_denominator: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>royalty_points_numerator: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>mutability_config: <a href="token.md#0x3_token_TokenMutabilityConfig">token::TokenMutabilityConfig</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>property_keys: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>property_values: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>property_types: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x3_token_MintTokenEvent"></a>
+
+## Struct `MintTokenEvent`
+
+mint token event. This event triggered when creator adds more supply to existing token
+
+
+<pre><code><b>struct</b> <a href="token.md#0x3_token_MintTokenEvent">MintTokenEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>id: <a href="token.md#0x3_token_TokenDataId">token::TokenDataId</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>amount: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x3_token_MintToken"></a>
+
+## Struct `MintToken`
+
+
+
+<pre><code>#[<a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event">event</a>]
+<b>struct</b> <a href="token.md#0x3_token_MintToken">MintToken</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>id: <a href="token.md#0x3_token_TokenDataId">token::TokenDataId</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>amount: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x3_token_BurnTokenEvent"></a>
+
+## Struct `BurnTokenEvent`
+
+
+
+<pre><code><b>struct</b> <a href="token.md#0x3_token_BurnTokenEvent">BurnTokenEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>id: <a href="token.md#0x3_token_TokenId">token::TokenId</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>amount: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x3_token_BurnToken"></a>
+
+## Struct `BurnToken`
+
+
+
+<pre><code>#[<a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event">event</a>]
+<b>struct</b> <a href="token.md#0x3_token_BurnToken">BurnToken</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>id: <a href="token.md#0x3_token_TokenId">token::TokenId</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>amount: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x3_token_MutateTokenPropertyMapEvent"></a>
+
+## Struct `MutateTokenPropertyMapEvent`
+
+
+
+<pre><code><b>struct</b> <a href="token.md#0x3_token_MutateTokenPropertyMapEvent">MutateTokenPropertyMapEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>old_id: <a href="token.md#0x3_token_TokenId">token::TokenId</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>new_id: <a href="token.md#0x3_token_TokenId">token::TokenId</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>keys: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>values: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>types: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x3_token_MutateTokenPropertyMap"></a>
+
+## Struct `MutateTokenPropertyMap`
+
+
+
+<pre><code>#[<a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event">event</a>]
+<b>struct</b> <a href="token.md#0x3_token_MutateTokenPropertyMap">MutateTokenPropertyMap</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>old_id: <a href="token.md#0x3_token_TokenId">token::TokenId</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>new_id: <a href="token.md#0x3_token_TokenId">token::TokenId</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>keys: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>values: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>types: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x3_token_CreateCollectionEvent"></a>
+
+## Struct `CreateCollectionEvent`
+
+create collection event with creator address and collection name
+
+
+<pre><code><b>struct</b> <a href="token.md#0x3_token_CreateCollectionEvent">CreateCollectionEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>creator: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>collection_name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>uri: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>description: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>maximum: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x3_token_CreateCollection"></a>
+
+## Struct `CreateCollection`
+
+
+
+<pre><code>#[<a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event">event</a>]
+<b>struct</b> <a href="token.md#0x3_token_CreateCollection">CreateCollection</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>creator: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>collection_name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>uri: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>description: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>maximum: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x3_token_EINSUFFICIENT_BALANCE"></a>
+
+Insufficient token balance
+
+
+<pre><code><b>const</b> <a href="token.md#0x3_token_EINSUFFICIENT_BALANCE">EINSUFFICIENT_BALANCE</a>: u64 = 5;
+</code></pre>
+
+
+
+<a id="0x3_token_EURI_TOO_LONG"></a>
+
+The URI is too long
+
+
+<pre><code><b>const</b> <a href="token.md#0x3_token_EURI_TOO_LONG">EURI_TOO_LONG</a>: u64 = 27;
+</code></pre>
+
+
+
+<a id="0x3_token_MAX_URI_LENGTH"></a>
+
+
+
+<pre><code><b>const</b> <a href="token.md#0x3_token_MAX_URI_LENGTH">MAX_URI_LENGTH</a>: u64 = 512;
+</code></pre>
+
+
+
+<a id="0x3_token_BURNABLE_BY_CREATOR"></a>
+
+
+
+<pre><code><b>const</b> <a href="token.md#0x3_token_BURNABLE_BY_CREATOR">BURNABLE_BY_CREATOR</a>: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; = [84, 79, 75, 69, 78, 95, 66, 85, 82, 78, 65, 66, 76, 69, 95, 66, 89, 95, 67, 82, 69, 65, 84, 79, 82];
+</code></pre>
+
+
+
+<a id="0x3_token_BURNABLE_BY_OWNER"></a>
+
+
+
+<pre><code><b>const</b> <a href="token.md#0x3_token_BURNABLE_BY_OWNER">BURNABLE_BY_OWNER</a>: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; = [84, 79, 75, 69, 78, 95, 66, 85, 82, 78, 65, 66, 76, 69, 95, 66, 89, 95, 79, 87, 78, 69, 82];
+</code></pre>
+
+
+
+<a id="0x3_token_COLLECTION_DESCRIPTION_MUTABLE_IND"></a>
+
+
+
+<pre><code><b>const</b> <a href="token.md#0x3_token_COLLECTION_DESCRIPTION_MUTABLE_IND">COLLECTION_DESCRIPTION_MUTABLE_IND</a>: u64 = 0;
+</code></pre>
+
+
+
+<a id="0x3_token_COLLECTION_MAX_MUTABLE_IND"></a>
+
+
+
+<pre><code><b>const</b> <a href="token.md#0x3_token_COLLECTION_MAX_MUTABLE_IND">COLLECTION_MAX_MUTABLE_IND</a>: u64 = 2;
+</code></pre>
+
+
+
+<a id="0x3_token_COLLECTION_URI_MUTABLE_IND"></a>
+
+
+
+<pre><code><b>const</b> <a href="token.md#0x3_token_COLLECTION_URI_MUTABLE_IND">COLLECTION_URI_MUTABLE_IND</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x3_token_EALREADY_HAS_BALANCE"></a>
+
+The token has balance and cannot be initialized
+
+
+<pre><code><b>const</b> <a href="token.md#0x3_token_EALREADY_HAS_BALANCE">EALREADY_HAS_BALANCE</a>: u64 = 0;
+</code></pre>
+
+
+
+<a id="0x3_token_ECANNOT_UPDATE_RESERVED_PROPERTY"></a>
+
+Reserved fields for token contract
+Cannot be updated by user
+
+
+<pre><code><b>const</b> <a href="token.md#0x3_token_ECANNOT_UPDATE_RESERVED_PROPERTY">ECANNOT_UPDATE_RESERVED_PROPERTY</a>: u64 = 32;
+</code></pre>
+
+
+
+<a id="0x3_token_ECOLLECTIONS_NOT_PUBLISHED"></a>
+
+There isn't any collection under this account
+
+
+<pre><code><b>const</b> <a href="token.md#0x3_token_ECOLLECTIONS_NOT_PUBLISHED">ECOLLECTIONS_NOT_PUBLISHED</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x3_token_ECOLLECTION_ALREADY_EXISTS"></a>
+
+The collection already exists
+
+
+<pre><code><b>const</b> <a href="token.md#0x3_token_ECOLLECTION_ALREADY_EXISTS">ECOLLECTION_ALREADY_EXISTS</a>: u64 = 3;
+</code></pre>
+
+
+
+<a id="0x3_token_ECOLLECTION_NAME_TOO_LONG"></a>
+
+The collection name is too long
+
+
+<pre><code><b>const</b> <a href="token.md#0x3_token_ECOLLECTION_NAME_TOO_LONG">ECOLLECTION_NAME_TOO_LONG</a>: u64 = 25;
+</code></pre>
+
+
+
+<a id="0x3_token_ECOLLECTION_NOT_PUBLISHED"></a>
+
+Cannot find collection in creator's account
+
+
+<pre><code><b>const</b> <a href="token.md#0x3_token_ECOLLECTION_NOT_PUBLISHED">ECOLLECTION_NOT_PUBLISHED</a>: u64 = 2;
+</code></pre>
+
+
+
+<a id="0x3_token_ECREATE_WOULD_EXCEED_COLLECTION_MAXIMUM"></a>
+
+Exceeds the collection's maximal number of token_data
+
+
+<pre><code><b>const</b> <a href="token.md#0x3_token_ECREATE_WOULD_EXCEED_COLLECTION_MAXIMUM">ECREATE_WOULD_EXCEED_COLLECTION_MAXIMUM</a>: u64 = 4;
+</code></pre>
+
+
+
+<a id="0x3_token_ECREATOR_CANNOT_BURN_TOKEN"></a>
+
+Token is not burnable by creator
+
+
+<pre><code><b>const</b> <a href="token.md#0x3_token_ECREATOR_CANNOT_BURN_TOKEN">ECREATOR_CANNOT_BURN_TOKEN</a>: u64 = 31;
+</code></pre>
+
+
+
+<a id="0x3_token_EFIELD_NOT_MUTABLE"></a>
+
+The field is not mutable
+
+
+<pre><code><b>const</b> <a href="token.md#0x3_token_EFIELD_NOT_MUTABLE">EFIELD_NOT_MUTABLE</a>: u64 = 13;
+</code></pre>
+
+
+
+<a id="0x3_token_EINSUFFICIENT_WITHDRAW_CAPABILITY_AMOUNT"></a>
+
+Withdraw capability doesn't have sufficient amount
+
+
+<pre><code><b>const</b> <a href="token.md#0x3_token_EINSUFFICIENT_WITHDRAW_CAPABILITY_AMOUNT">EINSUFFICIENT_WITHDRAW_CAPABILITY_AMOUNT</a>: u64 = 38;
+</code></pre>
+
+
+
+<a id="0x3_token_EINVALID_MAXIMUM"></a>
+
+Collection or tokendata maximum must be larger than supply
+
+
+<pre><code><b>const</b> <a href="token.md#0x3_token_EINVALID_MAXIMUM">EINVALID_MAXIMUM</a>: u64 = 36;
+</code></pre>
+
+
+
+<a id="0x3_token_EINVALID_ROYALTY_NUMERATOR_DENOMINATOR"></a>
+
+Royalty invalid if the numerator is larger than the denominator
+
+
+<pre><code><b>const</b> <a href="token.md#0x3_token_EINVALID_ROYALTY_NUMERATOR_DENOMINATOR">EINVALID_ROYALTY_NUMERATOR_DENOMINATOR</a>: u64 = 34;
+</code></pre>
+
+
+
+<a id="0x3_token_EINVALID_TOKEN_MERGE"></a>
+
+Cannot merge the two tokens with different token id
+
+
+<pre><code><b>const</b> <a href="token.md#0x3_token_EINVALID_TOKEN_MERGE">EINVALID_TOKEN_MERGE</a>: u64 = 6;
+</code></pre>
+
+
+
+<a id="0x3_token_EMINT_WOULD_EXCEED_TOKEN_MAXIMUM"></a>
+
+Exceed the token data maximal allowed
+
+
+<pre><code><b>const</b> <a href="token.md#0x3_token_EMINT_WOULD_EXCEED_TOKEN_MAXIMUM">EMINT_WOULD_EXCEED_TOKEN_MAXIMUM</a>: u64 = 7;
+</code></pre>
+
+
+
+<a id="0x3_token_ENFT_NAME_TOO_LONG"></a>
+
+The NFT name is too long
+
+
+<pre><code><b>const</b> <a href="token.md#0x3_token_ENFT_NAME_TOO_LONG">ENFT_NAME_TOO_LONG</a>: u64 = 26;
+</code></pre>
+
+
+
+<a id="0x3_token_ENFT_NOT_SPLITABLE"></a>
+
+Cannot split a token that only has 1 amount
+
+
+<pre><code><b>const</b> <a href="token.md#0x3_token_ENFT_NOT_SPLITABLE">ENFT_NOT_SPLITABLE</a>: u64 = 18;
+</code></pre>
+
+
+
+<a id="0x3_token_ENO_BURN_CAPABILITY"></a>
+
+No burn capability
+
+
+<pre><code><b>const</b> <a href="token.md#0x3_token_ENO_BURN_CAPABILITY">ENO_BURN_CAPABILITY</a>: u64 = 8;
+</code></pre>
+
+
+
+<a id="0x3_token_ENO_BURN_TOKEN_WITH_ZERO_AMOUNT"></a>
+
+Cannot burn 0 Token
+
+
+<pre><code><b>const</b> <a href="token.md#0x3_token_ENO_BURN_TOKEN_WITH_ZERO_AMOUNT">ENO_BURN_TOKEN_WITH_ZERO_AMOUNT</a>: u64 = 29;
+</code></pre>
+
+
+
+<a id="0x3_token_ENO_DEPOSIT_TOKEN_WITH_ZERO_AMOUNT"></a>
+
+Cannot deposit a Token with 0 amount
+
+
+<pre><code><b>const</b> <a href="token.md#0x3_token_ENO_DEPOSIT_TOKEN_WITH_ZERO_AMOUNT">ENO_DEPOSIT_TOKEN_WITH_ZERO_AMOUNT</a>: u64 = 28;
+</code></pre>
+
+
+
+<a id="0x3_token_ENO_MINT_CAPABILITY"></a>
+
+No mint capability
+
+
+<pre><code><b>const</b> <a href="token.md#0x3_token_ENO_MINT_CAPABILITY">ENO_MINT_CAPABILITY</a>: u64 = 19;
+</code></pre>
+
+
+
+<a id="0x3_token_ENO_MUTATE_CAPABILITY"></a>
+
+Not authorized to mutate
+
+
+<pre><code><b>const</b> <a href="token.md#0x3_token_ENO_MUTATE_CAPABILITY">ENO_MUTATE_CAPABILITY</a>: u64 = 14;
+</code></pre>
+
+
+
+<a id="0x3_token_ENO_TOKEN_IN_TOKEN_STORE"></a>
+
+Token not in the token store
+
+
+<pre><code><b>const</b> <a href="token.md#0x3_token_ENO_TOKEN_IN_TOKEN_STORE">ENO_TOKEN_IN_TOKEN_STORE</a>: u64 = 15;
+</code></pre>
+
+
+
+<a id="0x3_token_EOWNER_CANNOT_BURN_TOKEN"></a>
+
+Token is not burnable by owner
+
+
+<pre><code><b>const</b> <a href="token.md#0x3_token_EOWNER_CANNOT_BURN_TOKEN">EOWNER_CANNOT_BURN_TOKEN</a>: u64 = 30;
+</code></pre>
+
+
+
+<a id="0x3_token_EPROPERTY_RESERVED_BY_STANDARD"></a>
+
+The property is reserved by token standard
+
+
+<pre><code><b>const</b> <a href="token.md#0x3_token_EPROPERTY_RESERVED_BY_STANDARD">EPROPERTY_RESERVED_BY_STANDARD</a>: u64 = 40;
+</code></pre>
+
+
+
+<a id="0x3_token_EROYALTY_PAYEE_ACCOUNT_DOES_NOT_EXIST"></a>
+
+Royalty payee account does not exist
+
+
+<pre><code><b>const</b> <a href="token.md#0x3_token_EROYALTY_PAYEE_ACCOUNT_DOES_NOT_EXIST">EROYALTY_PAYEE_ACCOUNT_DOES_NOT_EXIST</a>: u64 = 35;
+</code></pre>
+
+
+
+<a id="0x3_token_ETOKEN_CANNOT_HAVE_ZERO_AMOUNT"></a>
+
+TOKEN with 0 amount is not allowed
+
+
+<pre><code><b>const</b> <a href="token.md#0x3_token_ETOKEN_CANNOT_HAVE_ZERO_AMOUNT">ETOKEN_CANNOT_HAVE_ZERO_AMOUNT</a>: u64 = 33;
+</code></pre>
+
+
+
+<a id="0x3_token_ETOKEN_DATA_ALREADY_EXISTS"></a>
+
+TokenData already exists
+
+
+<pre><code><b>const</b> <a href="token.md#0x3_token_ETOKEN_DATA_ALREADY_EXISTS">ETOKEN_DATA_ALREADY_EXISTS</a>: u64 = 9;
+</code></pre>
+
+
+
+<a id="0x3_token_ETOKEN_DATA_NOT_PUBLISHED"></a>
+
+TokenData not published
+
+
+<pre><code><b>const</b> <a href="token.md#0x3_token_ETOKEN_DATA_NOT_PUBLISHED">ETOKEN_DATA_NOT_PUBLISHED</a>: u64 = 10;
+</code></pre>
+
+
+
+<a id="0x3_token_ETOKEN_PROPERTIES_COUNT_NOT_MATCH"></a>
+
+Token Properties count doesn't match
+
+
+<pre><code><b>const</b> <a href="token.md#0x3_token_ETOKEN_PROPERTIES_COUNT_NOT_MATCH">ETOKEN_PROPERTIES_COUNT_NOT_MATCH</a>: u64 = 37;
+</code></pre>
+
+
+
+<a id="0x3_token_ETOKEN_SPLIT_AMOUNT_LARGER_OR_EQUAL_TO_TOKEN_AMOUNT"></a>
+
+Cannot split token to an amount larger than its amount
+
+
+<pre><code><b>const</b> <a href="token.md#0x3_token_ETOKEN_SPLIT_AMOUNT_LARGER_OR_EQUAL_TO_TOKEN_AMOUNT">ETOKEN_SPLIT_AMOUNT_LARGER_OR_EQUAL_TO_TOKEN_AMOUNT</a>: u64 = 12;
+</code></pre>
+
+
+
+<a id="0x3_token_ETOKEN_STORE_NOT_PUBLISHED"></a>
+
+TokenStore doesn't exist
+
+
+<pre><code><b>const</b> <a href="token.md#0x3_token_ETOKEN_STORE_NOT_PUBLISHED">ETOKEN_STORE_NOT_PUBLISHED</a>: u64 = 11;
+</code></pre>
+
+
+
+<a id="0x3_token_EUSER_NOT_OPT_IN_DIRECT_TRANSFER"></a>
+
+User didn't opt-in direct transfer
+
+
+<pre><code><b>const</b> <a href="token.md#0x3_token_EUSER_NOT_OPT_IN_DIRECT_TRANSFER">EUSER_NOT_OPT_IN_DIRECT_TRANSFER</a>: u64 = 16;
+</code></pre>
+
+
+
+<a id="0x3_token_EWITHDRAW_PROOF_EXPIRES"></a>
+
+Withdraw proof expires
+
+
+<pre><code><b>const</b> <a href="token.md#0x3_token_EWITHDRAW_PROOF_EXPIRES">EWITHDRAW_PROOF_EXPIRES</a>: u64 = 39;
+</code></pre>
+
+
+
+<a id="0x3_token_EWITHDRAW_ZERO"></a>
+
+Cannot withdraw 0 token
+
+
+<pre><code><b>const</b> <a href="token.md#0x3_token_EWITHDRAW_ZERO">EWITHDRAW_ZERO</a>: u64 = 17;
+</code></pre>
+
+
+
+<a id="0x3_token_MAX_COLLECTION_NAME_LENGTH"></a>
+
+
+
+<pre><code><b>const</b> <a href="token.md#0x3_token_MAX_COLLECTION_NAME_LENGTH">MAX_COLLECTION_NAME_LENGTH</a>: u64 = 128;
+</code></pre>
+
+
+
+<a id="0x3_token_MAX_NFT_NAME_LENGTH"></a>
+
+
+
+<pre><code><b>const</b> <a href="token.md#0x3_token_MAX_NFT_NAME_LENGTH">MAX_NFT_NAME_LENGTH</a>: u64 = 128;
+</code></pre>
+
+
+
+<a id="0x3_token_TOKEN_DESCRIPTION_MUTABLE_IND"></a>
+
+
+
+<pre><code><b>const</b> <a href="token.md#0x3_token_TOKEN_DESCRIPTION_MUTABLE_IND">TOKEN_DESCRIPTION_MUTABLE_IND</a>: u64 = 3;
+</code></pre>
+
+
+
+<a id="0x3_token_TOKEN_MAX_MUTABLE_IND"></a>
+
+
+
+<pre><code><b>const</b> <a href="token.md#0x3_token_TOKEN_MAX_MUTABLE_IND">TOKEN_MAX_MUTABLE_IND</a>: u64 = 0;
+</code></pre>
+
+
+
+<a id="0x3_token_TOKEN_PROPERTY_MUTABLE"></a>
+
+
+
+<pre><code><b>const</b> <a href="token.md#0x3_token_TOKEN_PROPERTY_MUTABLE">TOKEN_PROPERTY_MUTABLE</a>: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; = [84, 79, 75, 69, 78, 95, 80, 82, 79, 80, 69, 82, 84, 89, 95, 77, 85, 84, 65, 84, 66, 76, 69];
+</code></pre>
+
+
+
+<a id="0x3_token_TOKEN_PROPERTY_MUTABLE_IND"></a>
+
+
+
+<pre><code><b>const</b> <a href="token.md#0x3_token_TOKEN_PROPERTY_MUTABLE_IND">TOKEN_PROPERTY_MUTABLE_IND</a>: u64 = 4;
+</code></pre>
+
+
+
+<a id="0x3_token_TOKEN_PROPERTY_VALUE_MUTABLE_IND"></a>
+
+
+
+<pre><code><b>const</b> <a href="token.md#0x3_token_TOKEN_PROPERTY_VALUE_MUTABLE_IND">TOKEN_PROPERTY_VALUE_MUTABLE_IND</a>: u64 = 5;
+</code></pre>
+
+
+
+<a id="0x3_token_TOKEN_ROYALTY_MUTABLE_IND"></a>
+
+
+
+<pre><code><b>const</b> <a href="token.md#0x3_token_TOKEN_ROYALTY_MUTABLE_IND">TOKEN_ROYALTY_MUTABLE_IND</a>: u64 = 2;
+</code></pre>
+
+
+
+<a id="0x3_token_TOKEN_URI_MUTABLE_IND"></a>
+
+
+
+<pre><code><b>const</b> <a href="token.md#0x3_token_TOKEN_URI_MUTABLE_IND">TOKEN_URI_MUTABLE_IND</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x3_token_create_collection_script"></a>
+
+## Function `create_collection_script`
+
+create a empty token collection with parameters
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="token.md#0x3_token_create_collection_script">create_collection_script</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, description: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, uri: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, maximum: u64, mutate_setting: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;bool&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="token.md#0x3_token_create_collection_script">create_collection_script</a>(
+    creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    name: String,
+    description: String,
+    uri: String,
+    maximum: u64,
+    mutate_setting: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;bool&gt;,
+) <b>acquires</b> <a href="token.md#0x3_token_Collections">Collections</a> {
+    <a href="token.md#0x3_token_create_collection">create_collection</a>(
+        creator,
+        name,
+        description,
+        uri,
+        maximum,
+        mutate_setting
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_create_token_script"></a>
+
+## Function `create_token_script`
+
+create token with raw inputs
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="token.md#0x3_token_create_token_script">create_token_script</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, collection: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, description: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, balance: u64, maximum: u64, uri: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, royalty_payee_address: <b>address</b>, royalty_points_denominator: u64, royalty_points_numerator: u64, mutate_setting: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;bool&gt;, property_keys: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;, property_values: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;, property_types: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="token.md#0x3_token_create_token_script">create_token_script</a>(
+    <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    collection: String,
+    name: String,
+    description: String,
+    balance: u64,
+    maximum: u64,
+    uri: String,
+    royalty_payee_address: <b>address</b>,
+    royalty_points_denominator: u64,
+    royalty_points_numerator: u64,
+    mutate_setting: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;bool&gt;,
+    property_keys: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;String&gt;,
+    property_values: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;,
+    property_types: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;String&gt;
+) <b>acquires</b> <a href="token.md#0x3_token_Collections">Collections</a>, <a href="token.md#0x3_token_TokenStore">TokenStore</a> {
+    <b>let</b> token_mut_config = <a href="token.md#0x3_token_create_token_mutability_config">create_token_mutability_config</a>(&mutate_setting);
+    <b>let</b> tokendata_id = <a href="token.md#0x3_token_create_tokendata">create_tokendata</a>(
+        <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>,
+        collection,
+        name,
+        description,
+        maximum,
+        uri,
+        royalty_payee_address,
+        royalty_points_denominator,
+        royalty_points_numerator,
+        token_mut_config,
+        property_keys,
+        property_values,
+        property_types
+    );
+
+    <a href="token.md#0x3_token_mint_token">mint_token</a>(
+        <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>,
+        tokendata_id,
+        balance,
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_mint_script"></a>
+
+## Function `mint_script`
+
+Mint more token from an existing token_data. Mint only adds more token to property_version 0
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="token.md#0x3_token_mint_script">mint_script</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, token_data_address: <b>address</b>, collection: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, amount: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="token.md#0x3_token_mint_script">mint_script</a>(
+    <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    token_data_address: <b>address</b>,
+    collection: String,
+    name: String,
+    amount: u64,
+) <b>acquires</b> <a href="token.md#0x3_token_Collections">Collections</a>, <a href="token.md#0x3_token_TokenStore">TokenStore</a> {
+    <b>let</b> token_data_id = <a href="token.md#0x3_token_create_token_data_id">create_token_data_id</a>(
+        token_data_address,
+        collection,
+        name,
+    );
+    // only creator of the tokendata can mint more tokens for now
+    <b>assert</b>!(token_data_id.creator == <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>), <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="token.md#0x3_token_ENO_MINT_CAPABILITY">ENO_MINT_CAPABILITY</a>));
+    <a href="token.md#0x3_token_mint_token">mint_token</a>(
+        <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>,
+        token_data_id,
+        amount,
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_mutate_token_properties"></a>
+
+## Function `mutate_token_properties`
+
+mutate the token property and save the new property in TokenStore
+if the token property_version is 0, we will create a new property_version per token to generate a new token_id per token
+if the token property_version is not 0, we will just update the propertyMap and use the existing token_id (property_version)
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="token.md#0x3_token_mutate_token_properties">mutate_token_properties</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, token_owner: <b>address</b>, creator: <b>address</b>, collection_name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, token_name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, token_property_version: u64, amount: u64, keys: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;, values: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;, types: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="token.md#0x3_token_mutate_token_properties">mutate_token_properties</a>(
+    <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    token_owner: <b>address</b>,
+    creator: <b>address</b>,
+    collection_name: String,
+    token_name: String,
+    token_property_version: u64,
+    amount: u64,
+    keys: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;String&gt;,
+    values: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;,
+    types: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;String&gt;,
+) <b>acquires</b> <a href="token.md#0x3_token_Collections">Collections</a>, <a href="token.md#0x3_token_TokenStore">TokenStore</a> {
+    <b>assert</b>!(<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>) == creator, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="token.md#0x3_token_ENO_MUTATE_CAPABILITY">ENO_MUTATE_CAPABILITY</a>));
+    <b>let</b> i = 0;
+    <b>let</b> token_id = <a href="token.md#0x3_token_create_token_id_raw">create_token_id_raw</a>(
+        creator,
+        collection_name,
+        token_name,
+        token_property_version,
+    );
+    // give a new property_version for each <a href="token.md#0x3_token">token</a>
+    <b>while</b> (i &lt; amount) {
+        <a href="token.md#0x3_token_mutate_one_token">mutate_one_token</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>, token_owner, token_id, keys, values, types);
+        i = i + 1;
+    };
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_direct_transfer_script"></a>
+
+## Function `direct_transfer_script`
+
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="token.md#0x3_token_direct_transfer_script">direct_transfer_script</a>(sender: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, receiver: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, creators_address: <b>address</b>, collection: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, property_version: u64, amount: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="token.md#0x3_token_direct_transfer_script">direct_transfer_script</a>(
+    sender: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    receiver: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    creators_address: <b>address</b>,
+    collection: String,
+    name: String,
+    property_version: u64,
+    amount: u64,
+) <b>acquires</b> <a href="token.md#0x3_token_TokenStore">TokenStore</a> {
+    <b>let</b> token_id = <a href="token.md#0x3_token_create_token_id_raw">create_token_id_raw</a>(creators_address, collection, name, property_version);
+    <a href="token.md#0x3_token_direct_transfer">direct_transfer</a>(sender, receiver, token_id, amount);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_opt_in_direct_transfer"></a>
+
+## Function `opt_in_direct_transfer`
+
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="token.md#0x3_token_opt_in_direct_transfer">opt_in_direct_transfer</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, opt_in: bool)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="token.md#0x3_token_opt_in_direct_transfer">opt_in_direct_transfer</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, opt_in: bool) <b>acquires</b> <a href="token.md#0x3_token_TokenStore">TokenStore</a> {
+    <b>let</b> addr = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>);
+    <a href="token.md#0x3_token_initialize_token_store">initialize_token_store</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>);
+    <b>let</b> opt_in_flag = &<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="token.md#0x3_token_TokenStore">TokenStore</a>&gt;(addr).direct_transfer;
+    *opt_in_flag = opt_in;
+    <a href="token_event_store.md#0x3_token_event_store_emit_token_opt_in_event">token_event_store::emit_token_opt_in_event</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>, opt_in);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_transfer_with_opt_in"></a>
+
+## Function `transfer_with_opt_in`
+
+Transfers <code>amount</code> of tokens from <code>from</code> to <code><b>to</b></code>.
+The receiver <code><b>to</b></code> has to opt-in direct transfer first
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="token.md#0x3_token_transfer_with_opt_in">transfer_with_opt_in</a>(from: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, creator: <b>address</b>, collection_name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, token_name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, token_property_version: u64, <b>to</b>: <b>address</b>, amount: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="token.md#0x3_token_transfer_with_opt_in">transfer_with_opt_in</a>(
+    from: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    creator: <b>address</b>,
+    collection_name: String,
+    token_name: String,
+    token_property_version: u64,
+    <b>to</b>: <b>address</b>,
+    amount: u64,
+) <b>acquires</b> <a href="token.md#0x3_token_TokenStore">TokenStore</a> {
+    <b>let</b> token_id = <a href="token.md#0x3_token_create_token_id_raw">create_token_id_raw</a>(creator, collection_name, token_name, token_property_version);
+    <a href="token.md#0x3_token_transfer">transfer</a>(from, token_id, <b>to</b>, amount);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_burn_by_creator"></a>
+
+## Function `burn_by_creator`
+
+Burn a token by creator when the token's BURNABLE_BY_CREATOR is true
+The token is owned at address owner
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="token.md#0x3_token_burn_by_creator">burn_by_creator</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, owner: <b>address</b>, collection: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, property_version: u64, amount: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="token.md#0x3_token_burn_by_creator">burn_by_creator</a>(
+    creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    owner: <b>address</b>,
+    collection: String,
+    name: String,
+    property_version: u64,
+    amount: u64,
+) <b>acquires</b> <a href="token.md#0x3_token_Collections">Collections</a>, <a href="token.md#0x3_token_TokenStore">TokenStore</a> {
+    <b>let</b> creator_address = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(creator);
+    <b>assert</b>!(amount &gt; 0, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="token.md#0x3_token_ENO_BURN_TOKEN_WITH_ZERO_AMOUNT">ENO_BURN_TOKEN_WITH_ZERO_AMOUNT</a>));
+    <b>let</b> token_id = <a href="token.md#0x3_token_create_token_id_raw">create_token_id_raw</a>(creator_address, collection, name, property_version);
+    <b>let</b> creator_addr = token_id.token_data_id.creator;
+    <b>assert</b>!(
+        <b>exists</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator_addr),
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="token.md#0x3_token_ECOLLECTIONS_NOT_PUBLISHED">ECOLLECTIONS_NOT_PUBLISHED</a>),
+    );
+
+    <b>let</b> collections = <b>borrow_global_mut</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator_address);
+    <b>assert</b>!(
+        <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_contains">table::contains</a>(&collections.token_data, token_id.token_data_id),
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="token.md#0x3_token_ETOKEN_DATA_NOT_PUBLISHED">ETOKEN_DATA_NOT_PUBLISHED</a>),
+    );
+
+    <b>let</b> token_data = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_borrow_mut">table::borrow_mut</a>(
+        &<b>mut</b> collections.token_data,
+        token_id.token_data_id,
+    );
+
+    // The property should be explicitly set in the <a href="property_map.md#0x3_property_map">property_map</a> for creator <b>to</b> burn the <a href="token.md#0x3_token">token</a>
+    <b>assert</b>!(
+        <a href="property_map.md#0x3_property_map_contains_key">property_map::contains_key</a>(&token_data.default_properties, &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(<a href="token.md#0x3_token_BURNABLE_BY_CREATOR">BURNABLE_BY_CREATOR</a>)),
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="token.md#0x3_token_ECREATOR_CANNOT_BURN_TOKEN">ECREATOR_CANNOT_BURN_TOKEN</a>)
+    );
+
+    <b>let</b> burn_by_creator_flag = <a href="property_map.md#0x3_property_map_read_bool">property_map::read_bool</a>(&token_data.default_properties, &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(<a href="token.md#0x3_token_BURNABLE_BY_CREATOR">BURNABLE_BY_CREATOR</a>));
+    <b>assert</b>!(burn_by_creator_flag, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="token.md#0x3_token_ECREATOR_CANNOT_BURN_TOKEN">ECREATOR_CANNOT_BURN_TOKEN</a>));
+
+    // Burn the tokens.
+    <b>let</b> <a href="token.md#0x3_token_Token">Token</a> { id: _, amount: burned_amount, token_properties: _ } = <a href="token.md#0x3_token_withdraw_with_event_internal">withdraw_with_event_internal</a>(owner, token_id, amount);
+    <b>let</b> token_store = <b>borrow_global_mut</b>&lt;<a href="token.md#0x3_token_TokenStore">TokenStore</a>&gt;(owner);
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit">event::emit</a>(<a href="token.md#0x3_token_BurnToken">BurnToken</a> { id: token_id, amount: burned_amount });
+    };
+    <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit_event">event::emit_event</a>&lt;<a href="token.md#0x3_token_BurnTokenEvent">BurnTokenEvent</a>&gt;(
+        &<b>mut</b> token_store.burn_events,
+        <a href="token.md#0x3_token_BurnTokenEvent">BurnTokenEvent</a> { id: token_id, amount: burned_amount }
+    );
+
+    <b>if</b> (token_data.maximum &gt; 0) {
+        token_data.supply = token_data.supply - burned_amount;
+
+        // Delete the token_data <b>if</b> supply drops <b>to</b> 0.
+        <b>if</b> (token_data.supply == 0) {
+            <a href="token.md#0x3_token_destroy_token_data">destroy_token_data</a>(<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_remove">table::remove</a>(&<b>mut</b> collections.token_data, token_id.token_data_id));
+
+            // <b>update</b> the collection supply
+            <b>let</b> collection_data = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_borrow_mut">table::borrow_mut</a>(
+                &<b>mut</b> collections.collection_data,
+                token_id.token_data_id.collection
+            );
+            <b>if</b> (collection_data.maximum &gt; 0) {
+                collection_data.supply = collection_data.supply - 1;
+                // delete the collection data <b>if</b> the collection supply equals 0
+                <b>if</b> (collection_data.supply == 0) {
+                    <a href="token.md#0x3_token_destroy_collection_data">destroy_collection_data</a>(<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_remove">table::remove</a>(&<b>mut</b> collections.collection_data, collection_data.name));
+                };
+            };
+        };
+    };
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_burn"></a>
+
+## Function `burn`
+
+Burn a token by the token owner
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="token.md#0x3_token_burn">burn</a>(owner: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, creators_address: <b>address</b>, collection: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, property_version: u64, amount: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="token.md#0x3_token_burn">burn</a>(
+    owner: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    creators_address: <b>address</b>,
+    collection: String,
+    name: String,
+    property_version: u64,
+    amount: u64
+) <b>acquires</b> <a href="token.md#0x3_token_Collections">Collections</a>, <a href="token.md#0x3_token_TokenStore">TokenStore</a> {
+    <b>assert</b>!(amount &gt; 0, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="token.md#0x3_token_ENO_BURN_TOKEN_WITH_ZERO_AMOUNT">ENO_BURN_TOKEN_WITH_ZERO_AMOUNT</a>));
+    <b>let</b> token_id = <a href="token.md#0x3_token_create_token_id_raw">create_token_id_raw</a>(creators_address, collection, name, property_version);
+    <b>let</b> creator_addr = token_id.token_data_id.creator;
+    <b>assert</b>!(
+        <b>exists</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator_addr),
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="token.md#0x3_token_ECOLLECTIONS_NOT_PUBLISHED">ECOLLECTIONS_NOT_PUBLISHED</a>),
+    );
+
+    <b>let</b> collections = <b>borrow_global_mut</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator_addr);
+    <b>assert</b>!(
+        <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_contains">table::contains</a>(&collections.token_data, token_id.token_data_id),
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="token.md#0x3_token_ETOKEN_DATA_NOT_PUBLISHED">ETOKEN_DATA_NOT_PUBLISHED</a>),
+    );
+
+    <b>let</b> token_data = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_borrow_mut">table::borrow_mut</a>(
+        &<b>mut</b> collections.token_data,
+        token_id.token_data_id,
+    );
+
+    <b>assert</b>!(
+        <a href="property_map.md#0x3_property_map_contains_key">property_map::contains_key</a>(&token_data.default_properties, &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(<a href="token.md#0x3_token_BURNABLE_BY_OWNER">BURNABLE_BY_OWNER</a>)),
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="token.md#0x3_token_EOWNER_CANNOT_BURN_TOKEN">EOWNER_CANNOT_BURN_TOKEN</a>)
+    );
+    <b>let</b> burn_by_owner_flag = <a href="property_map.md#0x3_property_map_read_bool">property_map::read_bool</a>(&token_data.default_properties, &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(<a href="token.md#0x3_token_BURNABLE_BY_OWNER">BURNABLE_BY_OWNER</a>));
+    <b>assert</b>!(burn_by_owner_flag, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="token.md#0x3_token_EOWNER_CANNOT_BURN_TOKEN">EOWNER_CANNOT_BURN_TOKEN</a>));
+
+    // Burn the tokens.
+    <b>let</b> <a href="token.md#0x3_token_Token">Token</a> { id: _, amount: burned_amount, token_properties: _ } = <a href="token.md#0x3_token_withdraw_token">withdraw_token</a>(owner, token_id, amount);
+    <b>let</b> token_store = <b>borrow_global_mut</b>&lt;<a href="token.md#0x3_token_TokenStore">TokenStore</a>&gt;(<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(owner));
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit">event::emit</a>(<a href="token.md#0x3_token_BurnToken">BurnToken</a> { id: token_id, amount: burned_amount });
+    };
+    <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit_event">event::emit_event</a>&lt;<a href="token.md#0x3_token_BurnTokenEvent">BurnTokenEvent</a>&gt;(
+        &<b>mut</b> token_store.burn_events,
+        <a href="token.md#0x3_token_BurnTokenEvent">BurnTokenEvent</a> { id: token_id, amount: burned_amount }
+    );
+
+    // Decrease the supply correspondingly by the amount of tokens burned.
+    <b>let</b> token_data = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_borrow_mut">table::borrow_mut</a>(
+        &<b>mut</b> collections.token_data,
+        token_id.token_data_id,
+    );
+
+    // only <b>update</b> the supply <b>if</b> we tracking the supply and maximal
+    // maximal == 0 is reserved for unlimited <a href="token.md#0x3_token">token</a> and collection <b>with</b> no tracking info.
+    <b>if</b> (token_data.maximum &gt; 0) {
+        token_data.supply = token_data.supply - burned_amount;
+
+        // Delete the token_data <b>if</b> supply drops <b>to</b> 0.
+        <b>if</b> (token_data.supply == 0) {
+            <a href="token.md#0x3_token_destroy_token_data">destroy_token_data</a>(<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_remove">table::remove</a>(&<b>mut</b> collections.token_data, token_id.token_data_id));
+
+            // <b>update</b> the collection supply
+            <b>let</b> collection_data = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_borrow_mut">table::borrow_mut</a>(
+                &<b>mut</b> collections.collection_data,
+                token_id.token_data_id.collection
+            );
+
+            // only <b>update</b> and check the supply for unlimited collection
+            <b>if</b> (collection_data.maximum &gt; 0){
+                collection_data.supply = collection_data.supply - 1;
+                // delete the collection data <b>if</b> the collection supply equals 0
+                <b>if</b> (collection_data.supply == 0) {
+                    <a href="token.md#0x3_token_destroy_collection_data">destroy_collection_data</a>(<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_remove">table::remove</a>(&<b>mut</b> collections.collection_data, collection_data.name));
+                };
+            };
+        };
+    };
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_mutate_collection_description"></a>
+
+## Function `mutate_collection_description`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_mutate_collection_description">mutate_collection_description</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, collection_name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, description: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_mutate_collection_description">mutate_collection_description</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, collection_name: String, description: String) <b>acquires</b> <a href="token.md#0x3_token_Collections">Collections</a> {
+    <b>let</b> creator_address = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(creator);
+    <a href="token.md#0x3_token_assert_collection_exists">assert_collection_exists</a>(creator_address, collection_name);
+    <b>let</b> collection_data = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_borrow_mut">table::borrow_mut</a>(&<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator_address).collection_data, collection_name);
+    <b>assert</b>!(collection_data.mutability_config.description, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="token.md#0x3_token_EFIELD_NOT_MUTABLE">EFIELD_NOT_MUTABLE</a>));
+    <a href="token_event_store.md#0x3_token_event_store_emit_collection_description_mutate_event">token_event_store::emit_collection_description_mutate_event</a>(creator, collection_name, collection_data.description, description);
+    collection_data.description = description;
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_mutate_collection_uri"></a>
+
+## Function `mutate_collection_uri`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_mutate_collection_uri">mutate_collection_uri</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, collection_name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, uri: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_mutate_collection_uri">mutate_collection_uri</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, collection_name: String, uri: String) <b>acquires</b> <a href="token.md#0x3_token_Collections">Collections</a> {
+    <b>assert</b>!(<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_length">string::length</a>(&uri) &lt;= <a href="token.md#0x3_token_MAX_URI_LENGTH">MAX_URI_LENGTH</a>, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="token.md#0x3_token_EURI_TOO_LONG">EURI_TOO_LONG</a>));
+    <b>let</b> creator_address = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(creator);
+    <a href="token.md#0x3_token_assert_collection_exists">assert_collection_exists</a>(creator_address, collection_name);
+    <b>let</b> collection_data = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_borrow_mut">table::borrow_mut</a>(&<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator_address).collection_data, collection_name);
+    <b>assert</b>!(collection_data.mutability_config.uri, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="token.md#0x3_token_EFIELD_NOT_MUTABLE">EFIELD_NOT_MUTABLE</a>));
+    <a href="token_event_store.md#0x3_token_event_store_emit_collection_uri_mutate_event">token_event_store::emit_collection_uri_mutate_event</a>(creator, collection_name, collection_data.uri , uri);
+    collection_data.uri = uri;
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_mutate_collection_maximum"></a>
+
+## Function `mutate_collection_maximum`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_mutate_collection_maximum">mutate_collection_maximum</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, collection_name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, maximum: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_mutate_collection_maximum">mutate_collection_maximum</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, collection_name: String, maximum: u64) <b>acquires</b> <a href="token.md#0x3_token_Collections">Collections</a> {
+    <b>let</b> creator_address = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(creator);
+    <a href="token.md#0x3_token_assert_collection_exists">assert_collection_exists</a>(creator_address, collection_name);
+    <b>let</b> collection_data = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_borrow_mut">table::borrow_mut</a>(&<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator_address).collection_data, collection_name);
+    // cannot change maximum from 0 and cannot change maximum <b>to</b> 0
+    <b>assert</b>!(collection_data.maximum != 0 && maximum != 0, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="token.md#0x3_token_EINVALID_MAXIMUM">EINVALID_MAXIMUM</a>));
+    <b>assert</b>!(maximum &gt;= collection_data.supply, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="token.md#0x3_token_EINVALID_MAXIMUM">EINVALID_MAXIMUM</a>));
+    <b>assert</b>!(collection_data.mutability_config.maximum, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="token.md#0x3_token_EFIELD_NOT_MUTABLE">EFIELD_NOT_MUTABLE</a>));
+    <a href="token_event_store.md#0x3_token_event_store_emit_collection_maximum_mutate_event">token_event_store::emit_collection_maximum_mutate_event</a>(creator, collection_name, collection_data.maximum, maximum);
+    collection_data.maximum = maximum;
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_mutate_tokendata_maximum"></a>
+
+## Function `mutate_tokendata_maximum`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_mutate_tokendata_maximum">mutate_tokendata_maximum</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, token_data_id: <a href="token.md#0x3_token_TokenDataId">token::TokenDataId</a>, maximum: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_mutate_tokendata_maximum">mutate_tokendata_maximum</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, token_data_id: <a href="token.md#0x3_token_TokenDataId">TokenDataId</a>, maximum: u64) <b>acquires</b> <a href="token.md#0x3_token_Collections">Collections</a> {
+    <a href="token.md#0x3_token_assert_tokendata_exists">assert_tokendata_exists</a>(creator, token_data_id);
+    <b>let</b> all_token_data = &<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(token_data_id.creator).token_data;
+    <b>let</b> token_data = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_borrow_mut">table::borrow_mut</a>(all_token_data, token_data_id);
+    // cannot change maximum from 0 and cannot change maximum <b>to</b> 0
+    <b>assert</b>!(token_data.maximum != 0 && maximum != 0, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="token.md#0x3_token_EINVALID_MAXIMUM">EINVALID_MAXIMUM</a>));
+    <b>assert</b>!(maximum &gt;= token_data.supply, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="token.md#0x3_token_EINVALID_MAXIMUM">EINVALID_MAXIMUM</a>));
+    <b>assert</b>!(token_data.mutability_config.maximum, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="token.md#0x3_token_EFIELD_NOT_MUTABLE">EFIELD_NOT_MUTABLE</a>));
+    <a href="token_event_store.md#0x3_token_event_store_emit_token_maximum_mutate_event">token_event_store::emit_token_maximum_mutate_event</a>(creator, token_data_id.collection, token_data_id.name, token_data.maximum, maximum);
+    token_data.maximum = maximum;
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_mutate_tokendata_uri"></a>
+
+## Function `mutate_tokendata_uri`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_mutate_tokendata_uri">mutate_tokendata_uri</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, token_data_id: <a href="token.md#0x3_token_TokenDataId">token::TokenDataId</a>, uri: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_mutate_tokendata_uri">mutate_tokendata_uri</a>(
+    creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    token_data_id: <a href="token.md#0x3_token_TokenDataId">TokenDataId</a>,
+    uri: String
+) <b>acquires</b> <a href="token.md#0x3_token_Collections">Collections</a> {
+    <b>assert</b>!(<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_length">string::length</a>(&uri) &lt;= <a href="token.md#0x3_token_MAX_URI_LENGTH">MAX_URI_LENGTH</a>, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="token.md#0x3_token_EURI_TOO_LONG">EURI_TOO_LONG</a>));
+    <a href="token.md#0x3_token_assert_tokendata_exists">assert_tokendata_exists</a>(creator, token_data_id);
+
+    <b>let</b> all_token_data = &<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(token_data_id.creator).token_data;
+    <b>let</b> token_data = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_borrow_mut">table::borrow_mut</a>(all_token_data, token_data_id);
+    <b>assert</b>!(token_data.mutability_config.uri, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="token.md#0x3_token_EFIELD_NOT_MUTABLE">EFIELD_NOT_MUTABLE</a>));
+    <a href="token_event_store.md#0x3_token_event_store_emit_token_uri_mutate_event">token_event_store::emit_token_uri_mutate_event</a>(creator, token_data_id.collection, token_data_id.name, token_data.uri ,uri);
+    token_data.uri = uri;
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_mutate_tokendata_royalty"></a>
+
+## Function `mutate_tokendata_royalty`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_mutate_tokendata_royalty">mutate_tokendata_royalty</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, token_data_id: <a href="token.md#0x3_token_TokenDataId">token::TokenDataId</a>, royalty: <a href="token.md#0x3_token_Royalty">token::Royalty</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_mutate_tokendata_royalty">mutate_tokendata_royalty</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, token_data_id: <a href="token.md#0x3_token_TokenDataId">TokenDataId</a>, royalty: <a href="token.md#0x3_token_Royalty">Royalty</a>) <b>acquires</b> <a href="token.md#0x3_token_Collections">Collections</a> {
+    <a href="token.md#0x3_token_assert_tokendata_exists">assert_tokendata_exists</a>(creator, token_data_id);
+
+    <b>let</b> all_token_data = &<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(token_data_id.creator).token_data;
+    <b>let</b> token_data = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_borrow_mut">table::borrow_mut</a>(all_token_data, token_data_id);
+    <b>assert</b>!(token_data.mutability_config.royalty, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="token.md#0x3_token_EFIELD_NOT_MUTABLE">EFIELD_NOT_MUTABLE</a>));
+
+    <a href="token_event_store.md#0x3_token_event_store_emit_token_royalty_mutate_event">token_event_store::emit_token_royalty_mutate_event</a>(
+        creator,
+        token_data_id.collection,
+        token_data_id.name,
+        token_data.royalty.royalty_points_numerator,
+        token_data.royalty.royalty_points_denominator,
+        token_data.royalty.payee_address,
+        royalty.royalty_points_numerator,
+        royalty.royalty_points_denominator,
+        royalty.payee_address
+    );
+    token_data.royalty = royalty;
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_mutate_tokendata_description"></a>
+
+## Function `mutate_tokendata_description`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_mutate_tokendata_description">mutate_tokendata_description</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, token_data_id: <a href="token.md#0x3_token_TokenDataId">token::TokenDataId</a>, description: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_mutate_tokendata_description">mutate_tokendata_description</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, token_data_id: <a href="token.md#0x3_token_TokenDataId">TokenDataId</a>, description: String) <b>acquires</b> <a href="token.md#0x3_token_Collections">Collections</a> {
+    <a href="token.md#0x3_token_assert_tokendata_exists">assert_tokendata_exists</a>(creator, token_data_id);
+
+    <b>let</b> all_token_data = &<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(token_data_id.creator).token_data;
+    <b>let</b> token_data = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_borrow_mut">table::borrow_mut</a>(all_token_data, token_data_id);
+    <b>assert</b>!(token_data.mutability_config.description, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="token.md#0x3_token_EFIELD_NOT_MUTABLE">EFIELD_NOT_MUTABLE</a>));
+    <a href="token_event_store.md#0x3_token_event_store_emit_token_descrition_mutate_event">token_event_store::emit_token_descrition_mutate_event</a>(creator, token_data_id.collection, token_data_id.name, token_data.description, description);
+    token_data.description = description;
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_mutate_tokendata_property"></a>
+
+## Function `mutate_tokendata_property`
+
+Allow creator to mutate the default properties in TokenData
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_mutate_tokendata_property">mutate_tokendata_property</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, token_data_id: <a href="token.md#0x3_token_TokenDataId">token::TokenDataId</a>, keys: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;, values: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;, types: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_mutate_tokendata_property">mutate_tokendata_property</a>(
+    creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    token_data_id: <a href="token.md#0x3_token_TokenDataId">TokenDataId</a>,
+    keys: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;String&gt;,
+    values: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;,
+    types: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;String&gt;,
+) <b>acquires</b> <a href="token.md#0x3_token_Collections">Collections</a> {
+    <a href="token.md#0x3_token_assert_tokendata_exists">assert_tokendata_exists</a>(creator, token_data_id);
+    <b>let</b> key_len = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&keys);
+    <b>let</b> val_len = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&values);
+    <b>let</b> typ_len = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&types);
+    <b>assert</b>!(key_len == val_len, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="token.md#0x3_token_ETOKEN_PROPERTIES_COUNT_NOT_MATCH">ETOKEN_PROPERTIES_COUNT_NOT_MATCH</a>));
+    <b>assert</b>!(key_len == typ_len, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="token.md#0x3_token_ETOKEN_PROPERTIES_COUNT_NOT_MATCH">ETOKEN_PROPERTIES_COUNT_NOT_MATCH</a>));
+
+    <b>let</b> all_token_data = &<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(token_data_id.creator).token_data;
+    <b>let</b> token_data = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_borrow_mut">table::borrow_mut</a>(all_token_data, token_data_id);
+    <b>assert</b>!(token_data.mutability_config.properties, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="token.md#0x3_token_EFIELD_NOT_MUTABLE">EFIELD_NOT_MUTABLE</a>));
+    <b>let</b> i: u64 = 0;
+    <b>let</b> old_values: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;Option&lt;PropertyValue&gt;&gt; = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_empty">vector::empty</a>();
+    <b>let</b> new_values: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;PropertyValue&gt; = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_empty">vector::empty</a>();
+    <a href="token.md#0x3_token_assert_non_standard_reserved_property">assert_non_standard_reserved_property</a>(&keys);
+    <b>while</b> (i &lt; <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_length">vector::length</a>(&keys)){
+        <b>let</b> key = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(&keys, i);
+        <b>let</b> old_pv = <b>if</b> (<a href="property_map.md#0x3_property_map_contains_key">property_map::contains_key</a>(&token_data.default_properties, key)) {
+            <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(*<a href="property_map.md#0x3_property_map_borrow">property_map::borrow</a>(&token_data.default_properties, key))
+        } <b>else</b> {
+            <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>&lt;PropertyValue&gt;()
+        };
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_push_back">vector::push_back</a>(&<b>mut</b> old_values, old_pv);
+        <b>let</b> new_pv = <a href="property_map.md#0x3_property_map_create_property_value_raw">property_map::create_property_value_raw</a>(*<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(&values, i), *<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(&types, i));
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_push_back">vector::push_back</a>(&<b>mut</b> new_values, new_pv);
+        <b>if</b> (<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_is_some">option::is_some</a>(&old_pv)) {
+            <a href="property_map.md#0x3_property_map_update_property_value">property_map::update_property_value</a>(&<b>mut</b> token_data.default_properties, key, new_pv);
+        } <b>else</b> {
+            <a href="property_map.md#0x3_property_map_add">property_map::add</a>(&<b>mut</b> token_data.default_properties, *key, new_pv);
+        };
+        i = i + 1;
+    };
+    <a href="token_event_store.md#0x3_token_event_store_emit_default_property_mutate_event">token_event_store::emit_default_property_mutate_event</a>(creator, token_data_id.collection, token_data_id.name, keys, old_values, new_values);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_mutate_one_token"></a>
+
+## Function `mutate_one_token`
+
+Mutate the token_properties of one token.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_mutate_one_token">mutate_one_token</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, token_owner: <b>address</b>, token_id: <a href="token.md#0x3_token_TokenId">token::TokenId</a>, keys: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;, values: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;, types: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;): <a href="token.md#0x3_token_TokenId">token::TokenId</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_mutate_one_token">mutate_one_token</a>(
+    <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    token_owner: <b>address</b>,
+    token_id: <a href="token.md#0x3_token_TokenId">TokenId</a>,
+    keys: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;String&gt;,
+    values: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;,
+    types: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;String&gt;,
+): <a href="token.md#0x3_token_TokenId">TokenId</a> <b>acquires</b> <a href="token.md#0x3_token_Collections">Collections</a>, <a href="token.md#0x3_token_TokenStore">TokenStore</a> {
+    <b>let</b> creator = token_id.token_data_id.creator;
+    <b>assert</b>!(<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>) == creator, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="token.md#0x3_token_ENO_MUTATE_CAPABILITY">ENO_MUTATE_CAPABILITY</a>));
+    // validate <b>if</b> the properties is mutable
+    <b>assert</b>!(<b>exists</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator), <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="token.md#0x3_token_ECOLLECTIONS_NOT_PUBLISHED">ECOLLECTIONS_NOT_PUBLISHED</a>));
+    <b>let</b> all_token_data = &<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(
+        creator
+    ).token_data;
+
+    <b>assert</b>!(<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_contains">table::contains</a>(all_token_data, token_id.token_data_id), <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="token.md#0x3_token_ETOKEN_DATA_NOT_PUBLISHED">ETOKEN_DATA_NOT_PUBLISHED</a>));
+    <b>let</b> token_data = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_borrow_mut">table::borrow_mut</a>(all_token_data, token_id.token_data_id);
+
+    // <b>if</b> default property is mutatable, <a href="token.md#0x3_token">token</a> property is alwasy mutable
+    // we only need <b>to</b> check <a href="token.md#0x3_token_TOKEN_PROPERTY_MUTABLE">TOKEN_PROPERTY_MUTABLE</a> when default property is immutable
+    <b>if</b> (!token_data.mutability_config.properties) {
+        <b>assert</b>!(
+            <a href="property_map.md#0x3_property_map_contains_key">property_map::contains_key</a>(&token_data.default_properties, &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(<a href="token.md#0x3_token_TOKEN_PROPERTY_MUTABLE">TOKEN_PROPERTY_MUTABLE</a>)),
+            <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="token.md#0x3_token_EFIELD_NOT_MUTABLE">EFIELD_NOT_MUTABLE</a>)
+        );
+
+        <b>let</b> token_prop_mutable = <a href="property_map.md#0x3_property_map_read_bool">property_map::read_bool</a>(&token_data.default_properties, &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(<a href="token.md#0x3_token_TOKEN_PROPERTY_MUTABLE">TOKEN_PROPERTY_MUTABLE</a>));
+        <b>assert</b>!(token_prop_mutable, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="token.md#0x3_token_EFIELD_NOT_MUTABLE">EFIELD_NOT_MUTABLE</a>));
+    };
+
+    // check <b>if</b> the property_version is 0 <b>to</b> determine <b>if</b> we need <b>to</b> <b>update</b> the property_version
+    <b>if</b> (token_id.property_version == 0) {
+        <b>let</b> <a href="token.md#0x3_token">token</a> = <a href="token.md#0x3_token_withdraw_with_event_internal">withdraw_with_event_internal</a>(token_owner, token_id, 1);
+        // give a new property_version for each <a href="token.md#0x3_token">token</a>
+        <b>let</b> cur_property_version = token_data.largest_property_version + 1;
+        <b>let</b> new_token_id = <a href="token.md#0x3_token_create_token_id">create_token_id</a>(token_id.token_data_id, cur_property_version);
+        <b>let</b> new_token = <a href="token.md#0x3_token_Token">Token</a> {
+            id: new_token_id,
+            amount: 1,
+            token_properties: token_data.default_properties,
+        };
+        <a href="token.md#0x3_token_direct_deposit">direct_deposit</a>(token_owner, new_token);
+        <a href="token.md#0x3_token_update_token_property_internal">update_token_property_internal</a>(token_owner, new_token_id, keys, values, types);
+        <b>if</b> (std::features::module_event_migration_enabled()) {
+            <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit">event::emit</a>(<a href="token.md#0x3_token_MutateTokenPropertyMap">MutateTokenPropertyMap</a> {
+                old_id: token_id,
+                new_id: new_token_id,
+                keys,
+                values,
+                types
+            });
+        };
+        <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit_event">event::emit_event</a>&lt;<a href="token.md#0x3_token_MutateTokenPropertyMapEvent">MutateTokenPropertyMapEvent</a>&gt;(
+            &<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="token.md#0x3_token_TokenStore">TokenStore</a>&gt;(token_owner).mutate_token_property_events,
+            <a href="token.md#0x3_token_MutateTokenPropertyMapEvent">MutateTokenPropertyMapEvent</a> {
+                old_id: token_id,
+                new_id: new_token_id,
+                keys,
+                values,
+                types
+            },
+        );
+
+        token_data.largest_property_version = cur_property_version;
+        // burn the orignial property_version 0 <a href="token.md#0x3_token">token</a> after mutation
+        <b>let</b> <a href="token.md#0x3_token_Token">Token</a> { id: _, amount: _, token_properties: _ } = <a href="token.md#0x3_token">token</a>;
+        new_token_id
+    } <b>else</b> {
+        // only 1 <b>copy</b> for the <a href="token.md#0x3_token">token</a> <b>with</b> property verion bigger than 0
+        <a href="token.md#0x3_token_update_token_property_internal">update_token_property_internal</a>(token_owner, token_id, keys, values, types);
+        <b>if</b> (std::features::module_event_migration_enabled()) {
+            <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit">event::emit</a>(<a href="token.md#0x3_token_MutateTokenPropertyMap">MutateTokenPropertyMap</a> {
+                old_id: token_id,
+                new_id: token_id,
+                keys,
+                values,
+                types
+            });
+        };
+        <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit_event">event::emit_event</a>&lt;<a href="token.md#0x3_token_MutateTokenPropertyMapEvent">MutateTokenPropertyMapEvent</a>&gt;(
+            &<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="token.md#0x3_token_TokenStore">TokenStore</a>&gt;(token_owner).mutate_token_property_events,
+            <a href="token.md#0x3_token_MutateTokenPropertyMapEvent">MutateTokenPropertyMapEvent</a> {
+                old_id: token_id,
+                new_id: token_id,
+                keys,
+                values,
+                types
+            },
+        );
+        token_id
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_create_royalty"></a>
+
+## Function `create_royalty`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_create_royalty">create_royalty</a>(royalty_points_numerator: u64, royalty_points_denominator: u64, payee_address: <b>address</b>): <a href="token.md#0x3_token_Royalty">token::Royalty</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_create_royalty">create_royalty</a>(royalty_points_numerator: u64, royalty_points_denominator: u64, payee_address: <b>address</b>): <a href="token.md#0x3_token_Royalty">Royalty</a> {
+    <b>assert</b>!(royalty_points_numerator &lt;= royalty_points_denominator, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="token.md#0x3_token_EINVALID_ROYALTY_NUMERATOR_DENOMINATOR">EINVALID_ROYALTY_NUMERATOR_DENOMINATOR</a>));
+    <b>assert</b>!(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account_exists_at">account::exists_at</a>(payee_address), <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="token.md#0x3_token_EROYALTY_PAYEE_ACCOUNT_DOES_NOT_EXIST">EROYALTY_PAYEE_ACCOUNT_DOES_NOT_EXIST</a>));
+    <a href="token.md#0x3_token_Royalty">Royalty</a> {
+        royalty_points_numerator,
+        royalty_points_denominator,
+        payee_address
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_deposit_token"></a>
+
+## Function `deposit_token`
+
+Deposit the token balance into the owner's account and emit an event.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_deposit_token">deposit_token</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="token.md#0x3_token">token</a>: <a href="token.md#0x3_token_Token">token::Token</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_deposit_token">deposit_token</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="token.md#0x3_token">token</a>: <a href="token.md#0x3_token_Token">Token</a>) <b>acquires</b> <a href="token.md#0x3_token_TokenStore">TokenStore</a> {
+    <b>let</b> account_addr = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>);
+    <a href="token.md#0x3_token_initialize_token_store">initialize_token_store</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>);
+    <a href="token.md#0x3_token_direct_deposit">direct_deposit</a>(account_addr, <a href="token.md#0x3_token">token</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_direct_deposit_with_opt_in"></a>
+
+## Function `direct_deposit_with_opt_in`
+
+direct deposit if user opt in direct transfer
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_direct_deposit_with_opt_in">direct_deposit_with_opt_in</a>(account_addr: <b>address</b>, <a href="token.md#0x3_token">token</a>: <a href="token.md#0x3_token_Token">token::Token</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_direct_deposit_with_opt_in">direct_deposit_with_opt_in</a>(account_addr: <b>address</b>, <a href="token.md#0x3_token">token</a>: <a href="token.md#0x3_token_Token">Token</a>) <b>acquires</b> <a href="token.md#0x3_token_TokenStore">TokenStore</a> {
+    <b>let</b> opt_in_transfer = <b>borrow_global</b>&lt;<a href="token.md#0x3_token_TokenStore">TokenStore</a>&gt;(account_addr).direct_transfer;
+    <b>assert</b>!(opt_in_transfer, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="token.md#0x3_token_EUSER_NOT_OPT_IN_DIRECT_TRANSFER">EUSER_NOT_OPT_IN_DIRECT_TRANSFER</a>));
+    <a href="token.md#0x3_token_direct_deposit">direct_deposit</a>(account_addr, <a href="token.md#0x3_token">token</a>);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_direct_transfer"></a>
+
+## Function `direct_transfer`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_direct_transfer">direct_transfer</a>(sender: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, receiver: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, token_id: <a href="token.md#0x3_token_TokenId">token::TokenId</a>, amount: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_direct_transfer">direct_transfer</a>(
+    sender: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    receiver: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    token_id: <a href="token.md#0x3_token_TokenId">TokenId</a>,
+    amount: u64,
+) <b>acquires</b> <a href="token.md#0x3_token_TokenStore">TokenStore</a> {
+    <b>let</b> <a href="token.md#0x3_token">token</a> = <a href="token.md#0x3_token_withdraw_token">withdraw_token</a>(sender, token_id, amount);
+    <a href="token.md#0x3_token_deposit_token">deposit_token</a>(receiver, <a href="token.md#0x3_token">token</a>);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_initialize_token_store"></a>
+
+## Function `initialize_token_store`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_initialize_token_store">initialize_token_store</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_initialize_token_store">initialize_token_store</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>) {
+    <b>if</b> (!<b>exists</b>&lt;<a href="token.md#0x3_token_TokenStore">TokenStore</a>&gt;(<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>))) {
+        <b>move_to</b>(
+            <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>,
+            <a href="token.md#0x3_token_TokenStore">TokenStore</a> {
+                tokens: <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_new">table::new</a>(),
+                direct_transfer: <b>false</b>,
+                deposit_events: <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account_new_event_handle">account::new_event_handle</a>&lt;<a href="token.md#0x3_token_DepositEvent">DepositEvent</a>&gt;(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>),
+                withdraw_events: <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account_new_event_handle">account::new_event_handle</a>&lt;<a href="token.md#0x3_token_WithdrawEvent">WithdrawEvent</a>&gt;(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>),
+                burn_events: <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account_new_event_handle">account::new_event_handle</a>&lt;<a href="token.md#0x3_token_BurnTokenEvent">BurnTokenEvent</a>&gt;(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>),
+                mutate_token_property_events: <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account_new_event_handle">account::new_event_handle</a>&lt;<a href="token.md#0x3_token_MutateTokenPropertyMapEvent">MutateTokenPropertyMapEvent</a>&gt;(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>),
+            },
+        );
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_merge"></a>
+
+## Function `merge`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_merge">merge</a>(dst_token: &<b>mut</b> <a href="token.md#0x3_token_Token">token::Token</a>, source_token: <a href="token.md#0x3_token_Token">token::Token</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_merge">merge</a>(dst_token: &<b>mut</b> <a href="token.md#0x3_token_Token">Token</a>, source_token: <a href="token.md#0x3_token_Token">Token</a>) {
+    <b>assert</b>!(&dst_token.id == &source_token.id, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="token.md#0x3_token_EINVALID_TOKEN_MERGE">EINVALID_TOKEN_MERGE</a>));
+    dst_token.amount = dst_token.amount + source_token.amount;
+    <b>let</b> <a href="token.md#0x3_token_Token">Token</a> { id: _, amount: _, token_properties: _ } = source_token;
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_split"></a>
+
+## Function `split`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_split">split</a>(dst_token: &<b>mut</b> <a href="token.md#0x3_token_Token">token::Token</a>, amount: u64): <a href="token.md#0x3_token_Token">token::Token</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_split">split</a>(dst_token: &<b>mut</b> <a href="token.md#0x3_token_Token">Token</a>, amount: u64): <a href="token.md#0x3_token_Token">Token</a> {
+    <b>assert</b>!(dst_token.id.property_version == 0, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="token.md#0x3_token_ENFT_NOT_SPLITABLE">ENFT_NOT_SPLITABLE</a>));
+    <b>assert</b>!(dst_token.amount &gt; amount, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="token.md#0x3_token_ETOKEN_SPLIT_AMOUNT_LARGER_OR_EQUAL_TO_TOKEN_AMOUNT">ETOKEN_SPLIT_AMOUNT_LARGER_OR_EQUAL_TO_TOKEN_AMOUNT</a>));
+    <b>assert</b>!(amount &gt; 0, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="token.md#0x3_token_ETOKEN_CANNOT_HAVE_ZERO_AMOUNT">ETOKEN_CANNOT_HAVE_ZERO_AMOUNT</a>));
+    dst_token.amount = dst_token.amount - amount;
+    <a href="token.md#0x3_token_Token">Token</a> {
+        id: dst_token.id,
+        amount,
+        token_properties: <a href="property_map.md#0x3_property_map_empty">property_map::empty</a>(),
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_token_id"></a>
+
+## Function `token_id`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_token_id">token_id</a>(<a href="token.md#0x3_token">token</a>: &<a href="token.md#0x3_token_Token">token::Token</a>): &<a href="token.md#0x3_token_TokenId">token::TokenId</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_token_id">token_id</a>(<a href="token.md#0x3_token">token</a>: &<a href="token.md#0x3_token_Token">Token</a>): &<a href="token.md#0x3_token_TokenId">TokenId</a> {
+    &<a href="token.md#0x3_token">token</a>.id
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_transfer"></a>
+
+## Function `transfer`
+
+Transfers <code>amount</code> of tokens from <code>from</code> to <code><b>to</b></code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_transfer">transfer</a>(from: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, id: <a href="token.md#0x3_token_TokenId">token::TokenId</a>, <b>to</b>: <b>address</b>, amount: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_transfer">transfer</a>(
+    from: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    id: <a href="token.md#0x3_token_TokenId">TokenId</a>,
+    <b>to</b>: <b>address</b>,
+    amount: u64,
+) <b>acquires</b> <a href="token.md#0x3_token_TokenStore">TokenStore</a> {
+    <b>let</b> opt_in_transfer = <b>borrow_global</b>&lt;<a href="token.md#0x3_token_TokenStore">TokenStore</a>&gt;(<b>to</b>).direct_transfer;
+    <b>assert</b>!(opt_in_transfer, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="token.md#0x3_token_EUSER_NOT_OPT_IN_DIRECT_TRANSFER">EUSER_NOT_OPT_IN_DIRECT_TRANSFER</a>));
+    <b>let</b> <a href="token.md#0x3_token">token</a> = <a href="token.md#0x3_token_withdraw_token">withdraw_token</a>(from, id, amount);
+    <a href="token.md#0x3_token_direct_deposit">direct_deposit</a>(<b>to</b>, <a href="token.md#0x3_token">token</a>);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_create_withdraw_capability"></a>
+
+## Function `create_withdraw_capability`
+
+Token owner can create this one-time withdraw capability with an expiration time
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_create_withdraw_capability">create_withdraw_capability</a>(owner: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, token_id: <a href="token.md#0x3_token_TokenId">token::TokenId</a>, amount: u64, expiration_sec: u64): <a href="token.md#0x3_token_WithdrawCapability">token::WithdrawCapability</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_create_withdraw_capability">create_withdraw_capability</a>(
+    owner: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    token_id: <a href="token.md#0x3_token_TokenId">TokenId</a>,
+    amount: u64,
+    expiration_sec: u64,
+): <a href="token.md#0x3_token_WithdrawCapability">WithdrawCapability</a> {
+    <a href="token.md#0x3_token_WithdrawCapability">WithdrawCapability</a> {
+        token_owner: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(owner),
+        token_id,
+        amount,
+        expiration_sec,
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_withdraw_with_capability"></a>
+
+## Function `withdraw_with_capability`
+
+Withdraw the token with a capability
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_withdraw_with_capability">withdraw_with_capability</a>(withdraw_proof: <a href="token.md#0x3_token_WithdrawCapability">token::WithdrawCapability</a>): <a href="token.md#0x3_token_Token">token::Token</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_withdraw_with_capability">withdraw_with_capability</a>(
+    withdraw_proof: <a href="token.md#0x3_token_WithdrawCapability">WithdrawCapability</a>,
+): <a href="token.md#0x3_token_Token">Token</a> <b>acquires</b> <a href="token.md#0x3_token_TokenStore">TokenStore</a> {
+    // verify the delegation hasn't expired yet
+    <b>assert</b>!(<a href="../../../aptos-framework/tests/compiler-v2-doc/timestamp.md#0x1_timestamp_now_seconds">timestamp::now_seconds</a>() &lt;= withdraw_proof.expiration_sec, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="token.md#0x3_token_EWITHDRAW_PROOF_EXPIRES">EWITHDRAW_PROOF_EXPIRES</a>));
+
+    <a href="token.md#0x3_token_withdraw_with_event_internal">withdraw_with_event_internal</a>(
+        withdraw_proof.token_owner,
+        withdraw_proof.token_id,
+        withdraw_proof.amount,
+    )
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_partial_withdraw_with_capability"></a>
+
+## Function `partial_withdraw_with_capability`
+
+Withdraw the token with a capability.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_partial_withdraw_with_capability">partial_withdraw_with_capability</a>(withdraw_proof: <a href="token.md#0x3_token_WithdrawCapability">token::WithdrawCapability</a>, withdraw_amount: u64): (<a href="token.md#0x3_token_Token">token::Token</a>, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="token.md#0x3_token_WithdrawCapability">token::WithdrawCapability</a>&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_partial_withdraw_with_capability">partial_withdraw_with_capability</a>(
+    withdraw_proof: <a href="token.md#0x3_token_WithdrawCapability">WithdrawCapability</a>,
+    withdraw_amount: u64,
+): (<a href="token.md#0x3_token_Token">Token</a>, Option&lt;<a href="token.md#0x3_token_WithdrawCapability">WithdrawCapability</a>&gt;) <b>acquires</b> <a href="token.md#0x3_token_TokenStore">TokenStore</a> {
+    // verify the delegation hasn't expired yet
+    <b>assert</b>!(<a href="../../../aptos-framework/tests/compiler-v2-doc/timestamp.md#0x1_timestamp_now_seconds">timestamp::now_seconds</a>() &lt;= withdraw_proof.expiration_sec, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="token.md#0x3_token_EWITHDRAW_PROOF_EXPIRES">EWITHDRAW_PROOF_EXPIRES</a>));
+
+    <b>assert</b>!(withdraw_amount &lt;= withdraw_proof.amount, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="token.md#0x3_token_EINSUFFICIENT_WITHDRAW_CAPABILITY_AMOUNT">EINSUFFICIENT_WITHDRAW_CAPABILITY_AMOUNT</a>));
+
+    <b>let</b> res: Option&lt;<a href="token.md#0x3_token_WithdrawCapability">WithdrawCapability</a>&gt; = <b>if</b> (withdraw_amount == withdraw_proof.amount) {
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>&lt;<a href="token.md#0x3_token_WithdrawCapability">WithdrawCapability</a>&gt;()
+    } <b>else</b> {
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(
+            <a href="token.md#0x3_token_WithdrawCapability">WithdrawCapability</a> {
+                token_owner: withdraw_proof.token_owner,
+                token_id: withdraw_proof.token_id,
+                amount: withdraw_proof.amount - withdraw_amount,
+                expiration_sec: withdraw_proof.expiration_sec,
+            }
+        )
+    };
+
+    (
+        <a href="token.md#0x3_token_withdraw_with_event_internal">withdraw_with_event_internal</a>(
+            withdraw_proof.token_owner,
+            withdraw_proof.token_id,
+            withdraw_amount,
+        ),
+        res
+    )
+
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_withdraw_token"></a>
+
+## Function `withdraw_token`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_withdraw_token">withdraw_token</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, id: <a href="token.md#0x3_token_TokenId">token::TokenId</a>, amount: u64): <a href="token.md#0x3_token_Token">token::Token</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_withdraw_token">withdraw_token</a>(
+    <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    id: <a href="token.md#0x3_token_TokenId">TokenId</a>,
+    amount: u64,
+): <a href="token.md#0x3_token_Token">Token</a> <b>acquires</b> <a href="token.md#0x3_token_TokenStore">TokenStore</a> {
+    <b>let</b> account_addr = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>);
+    <a href="token.md#0x3_token_withdraw_with_event_internal">withdraw_with_event_internal</a>(account_addr, id, amount)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_create_collection"></a>
+
+## Function `create_collection`
+
+Create a new collection to hold tokens
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_create_collection">create_collection</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, description: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, uri: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, maximum: u64, mutate_setting: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;bool&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_create_collection">create_collection</a>(
+    creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    name: String,
+    description: String,
+    uri: String,
+    maximum: u64,
+    mutate_setting: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;bool&gt;
+) <b>acquires</b> <a href="token.md#0x3_token_Collections">Collections</a> {
+    <b>assert</b>!(<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_length">string::length</a>(&name) &lt;= <a href="token.md#0x3_token_MAX_COLLECTION_NAME_LENGTH">MAX_COLLECTION_NAME_LENGTH</a>, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="token.md#0x3_token_ECOLLECTION_NAME_TOO_LONG">ECOLLECTION_NAME_TOO_LONG</a>));
+    <b>assert</b>!(<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_length">string::length</a>(&uri) &lt;= <a href="token.md#0x3_token_MAX_URI_LENGTH">MAX_URI_LENGTH</a>, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="token.md#0x3_token_EURI_TOO_LONG">EURI_TOO_LONG</a>));
+    <b>let</b> account_addr = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(creator);
+    <b>if</b> (!<b>exists</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(account_addr)) {
+        <b>move_to</b>(
+            creator,
+            <a href="token.md#0x3_token_Collections">Collections</a> {
+                collection_data: <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_new">table::new</a>(),
+                token_data: <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_new">table::new</a>(),
+                create_collection_events: <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account_new_event_handle">account::new_event_handle</a>&lt;<a href="token.md#0x3_token_CreateCollectionEvent">CreateCollectionEvent</a>&gt;(creator),
+                create_token_data_events: <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account_new_event_handle">account::new_event_handle</a>&lt;<a href="token.md#0x3_token_CreateTokenDataEvent">CreateTokenDataEvent</a>&gt;(creator),
+                mint_token_events: <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account_new_event_handle">account::new_event_handle</a>&lt;<a href="token.md#0x3_token_MintTokenEvent">MintTokenEvent</a>&gt;(creator),
+            },
+        )
+    };
+
+    <b>let</b> collection_data = &<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(account_addr).collection_data;
+
+    <b>assert</b>!(
+        !<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_contains">table::contains</a>(collection_data, name),
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_already_exists">error::already_exists</a>(<a href="token.md#0x3_token_ECOLLECTION_ALREADY_EXISTS">ECOLLECTION_ALREADY_EXISTS</a>),
+    );
+
+    <b>let</b> mutability_config = <a href="token.md#0x3_token_create_collection_mutability_config">create_collection_mutability_config</a>(&mutate_setting);
+    <b>let</b> collection = <a href="token.md#0x3_token_CollectionData">CollectionData</a> {
+        description,
+        name: name,
+        uri,
+        supply: 0,
+        maximum,
+        mutability_config
+    };
+
+    <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_add">table::add</a>(collection_data, name, collection);
+    <b>let</b> collection_handle = <b>borrow_global_mut</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(account_addr);
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit">event::emit</a>(
+            <a href="token.md#0x3_token_CreateCollection">CreateCollection</a> {
+                creator: account_addr,
+                collection_name: name,
+                uri,
+                description,
+                maximum,
+            }
+        );
+    };
+    <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit_event">event::emit_event</a>&lt;<a href="token.md#0x3_token_CreateCollectionEvent">CreateCollectionEvent</a>&gt;(
+        &<b>mut</b> collection_handle.create_collection_events,
+        <a href="token.md#0x3_token_CreateCollectionEvent">CreateCollectionEvent</a> {
+            creator: account_addr,
+            collection_name: name,
+            uri,
+            description,
+            maximum,
+        }
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_check_collection_exists"></a>
+
+## Function `check_collection_exists`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_check_collection_exists">check_collection_exists</a>(creator: <b>address</b>, name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_check_collection_exists">check_collection_exists</a>(creator: <b>address</b>, name: String): bool <b>acquires</b> <a href="token.md#0x3_token_Collections">Collections</a> {
+    <b>assert</b>!(
+        <b>exists</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator),
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="token.md#0x3_token_ECOLLECTIONS_NOT_PUBLISHED">ECOLLECTIONS_NOT_PUBLISHED</a>),
+    );
+
+    <b>let</b> collection_data = &<b>borrow_global</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator).collection_data;
+    <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_contains">table::contains</a>(collection_data, name)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_check_tokendata_exists"></a>
+
+## Function `check_tokendata_exists`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_check_tokendata_exists">check_tokendata_exists</a>(creator: <b>address</b>, collection_name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, token_name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_check_tokendata_exists">check_tokendata_exists</a>(creator: <b>address</b>, collection_name: String, token_name: String): bool <b>acquires</b> <a href="token.md#0x3_token_Collections">Collections</a> {
+    <b>assert</b>!(
+        <b>exists</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator),
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="token.md#0x3_token_ECOLLECTIONS_NOT_PUBLISHED">ECOLLECTIONS_NOT_PUBLISHED</a>),
+    );
+
+    <b>let</b> token_data = &<b>borrow_global</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator).token_data;
+    <b>let</b> token_data_id = <a href="token.md#0x3_token_create_token_data_id">create_token_data_id</a>(creator, collection_name, token_name);
+    <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_contains">table::contains</a>(token_data, token_data_id)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_create_tokendata"></a>
+
+## Function `create_tokendata`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_create_tokendata">create_tokendata</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, collection: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, description: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, maximum: u64, uri: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, royalty_payee_address: <b>address</b>, royalty_points_denominator: u64, royalty_points_numerator: u64, token_mutate_config: <a href="token.md#0x3_token_TokenMutabilityConfig">token::TokenMutabilityConfig</a>, property_keys: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;, property_values: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;, property_types: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;): <a href="token.md#0x3_token_TokenDataId">token::TokenDataId</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_create_tokendata">create_tokendata</a>(
+    <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    collection: String,
+    name: String,
+    description: String,
+    maximum: u64,
+    uri: String,
+    royalty_payee_address: <b>address</b>,
+    royalty_points_denominator: u64,
+    royalty_points_numerator: u64,
+    token_mutate_config: <a href="token.md#0x3_token_TokenMutabilityConfig">TokenMutabilityConfig</a>,
+    property_keys: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;String&gt;,
+    property_values: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;,
+    property_types: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;String&gt;
+): <a href="token.md#0x3_token_TokenDataId">TokenDataId</a> <b>acquires</b> <a href="token.md#0x3_token_Collections">Collections</a> {
+    <b>assert</b>!(<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_length">string::length</a>(&name) &lt;= <a href="token.md#0x3_token_MAX_NFT_NAME_LENGTH">MAX_NFT_NAME_LENGTH</a>, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="token.md#0x3_token_ENFT_NAME_TOO_LONG">ENFT_NAME_TOO_LONG</a>));
+    <b>assert</b>!(<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_length">string::length</a>(&collection) &lt;= <a href="token.md#0x3_token_MAX_COLLECTION_NAME_LENGTH">MAX_COLLECTION_NAME_LENGTH</a>, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="token.md#0x3_token_ECOLLECTION_NAME_TOO_LONG">ECOLLECTION_NAME_TOO_LONG</a>));
+    <b>assert</b>!(<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_length">string::length</a>(&uri) &lt;= <a href="token.md#0x3_token_MAX_URI_LENGTH">MAX_URI_LENGTH</a>, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="token.md#0x3_token_EURI_TOO_LONG">EURI_TOO_LONG</a>));
+    <b>assert</b>!(royalty_points_numerator &lt;= royalty_points_denominator, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="token.md#0x3_token_EINVALID_ROYALTY_NUMERATOR_DENOMINATOR">EINVALID_ROYALTY_NUMERATOR_DENOMINATOR</a>));
+
+    <b>let</b> account_addr = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>);
+    <b>assert</b>!(
+        <b>exists</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(account_addr),
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="token.md#0x3_token_ECOLLECTIONS_NOT_PUBLISHED">ECOLLECTIONS_NOT_PUBLISHED</a>),
+    );
+    <b>let</b> collections = <b>borrow_global_mut</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(account_addr);
+
+    <b>let</b> token_data_id = <a href="token.md#0x3_token_create_token_data_id">create_token_data_id</a>(account_addr, collection, name);
+
+    <b>assert</b>!(
+        <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_contains">table::contains</a>(&collections.collection_data, token_data_id.collection),
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="token.md#0x3_token_ECOLLECTION_NOT_PUBLISHED">ECOLLECTION_NOT_PUBLISHED</a>),
+    );
+    <b>assert</b>!(
+        !<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_contains">table::contains</a>(&collections.token_data, token_data_id),
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_already_exists">error::already_exists</a>(<a href="token.md#0x3_token_ETOKEN_DATA_ALREADY_EXISTS">ETOKEN_DATA_ALREADY_EXISTS</a>),
+    );
+
+    <b>let</b> collection = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_borrow_mut">table::borrow_mut</a>(&<b>mut</b> collections.collection_data, token_data_id.collection);
+
+    // <b>if</b> collection maximum == 0, user don't want <b>to</b> enforce supply constraint.
+    // we don't track supply <b>to</b> make <a href="token.md#0x3_token">token</a> creation parallelizable
+    <b>if</b> (collection.maximum &gt; 0) {
+        collection.supply = collection.supply + 1;
+        <b>assert</b>!(
+            collection.maximum &gt;= collection.supply,
+            <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="token.md#0x3_token_ECREATE_WOULD_EXCEED_COLLECTION_MAXIMUM">ECREATE_WOULD_EXCEED_COLLECTION_MAXIMUM</a>),
+        );
+    };
+
+    <b>let</b> token_data = <a href="token.md#0x3_token_TokenData">TokenData</a> {
+        maximum,
+        largest_property_version: 0,
+        supply: 0,
+        uri,
+        royalty: <a href="token.md#0x3_token_create_royalty">create_royalty</a>(royalty_points_numerator, royalty_points_denominator, royalty_payee_address),
+        name,
+        description,
+        default_properties: <a href="property_map.md#0x3_property_map_new">property_map::new</a>(property_keys, property_values, property_types),
+        mutability_config: token_mutate_config,
+    };
+
+    <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_add">table::add</a>(&<b>mut</b> collections.token_data, token_data_id, token_data);
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit">event::emit</a>(
+            <a href="token.md#0x3_token_CreateTokenData">CreateTokenData</a> {
+                id: token_data_id,
+                description,
+                maximum,
+                uri,
+                royalty_payee_address,
+                royalty_points_denominator,
+                royalty_points_numerator,
+                name,
+                mutability_config: token_mutate_config,
+                property_keys,
+                property_values,
+                property_types,
+            }
+        );
+    };
+
+    <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit_event">event::emit_event</a>&lt;<a href="token.md#0x3_token_CreateTokenDataEvent">CreateTokenDataEvent</a>&gt;(
+        &<b>mut</b> collections.create_token_data_events,
+        <a href="token.md#0x3_token_CreateTokenDataEvent">CreateTokenDataEvent</a> {
+            id: token_data_id,
+            description,
+            maximum,
+            uri,
+            royalty_payee_address,
+            royalty_points_denominator,
+            royalty_points_numerator,
+            name,
+            mutability_config: token_mutate_config,
+            property_keys,
+            property_values,
+            property_types,
+        },
+    );
+    token_data_id
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_get_collection_supply"></a>
+
+## Function `get_collection_supply`
+
+return the number of distinct token_data_id created under this collection
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_collection_supply">get_collection_supply</a>(creator_address: <b>address</b>, collection_name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;u64&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_collection_supply">get_collection_supply</a>(creator_address: <b>address</b>, collection_name: String): Option&lt;u64&gt; <b>acquires</b> <a href="token.md#0x3_token_Collections">Collections</a> {
+    <a href="token.md#0x3_token_assert_collection_exists">assert_collection_exists</a>(creator_address, collection_name);
+    <b>let</b> collection_data = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_borrow_mut">table::borrow_mut</a>(&<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator_address).collection_data, collection_name);
+
+    <b>if</b> (collection_data.maximum &gt; 0) {
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(collection_data.supply)
+    } <b>else</b> {
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>()
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_get_collection_description"></a>
+
+## Function `get_collection_description`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_collection_description">get_collection_description</a>(creator_address: <b>address</b>, collection_name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_collection_description">get_collection_description</a>(creator_address: <b>address</b>, collection_name: String): String <b>acquires</b> <a href="token.md#0x3_token_Collections">Collections</a> {
+    <a href="token.md#0x3_token_assert_collection_exists">assert_collection_exists</a>(creator_address, collection_name);
+    <b>let</b> collection_data = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_borrow_mut">table::borrow_mut</a>(&<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator_address).collection_data, collection_name);
+    collection_data.description
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_get_collection_uri"></a>
+
+## Function `get_collection_uri`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_collection_uri">get_collection_uri</a>(creator_address: <b>address</b>, collection_name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_collection_uri">get_collection_uri</a>(creator_address: <b>address</b>, collection_name: String): String <b>acquires</b> <a href="token.md#0x3_token_Collections">Collections</a> {
+    <a href="token.md#0x3_token_assert_collection_exists">assert_collection_exists</a>(creator_address, collection_name);
+    <b>let</b> collection_data = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_borrow_mut">table::borrow_mut</a>(&<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator_address).collection_data, collection_name);
+    collection_data.uri
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_get_collection_maximum"></a>
+
+## Function `get_collection_maximum`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_collection_maximum">get_collection_maximum</a>(creator_address: <b>address</b>, collection_name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_collection_maximum">get_collection_maximum</a>(creator_address: <b>address</b>, collection_name: String): u64 <b>acquires</b> <a href="token.md#0x3_token_Collections">Collections</a> {
+    <a href="token.md#0x3_token_assert_collection_exists">assert_collection_exists</a>(creator_address, collection_name);
+    <b>let</b> collection_data = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_borrow_mut">table::borrow_mut</a>(&<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator_address).collection_data, collection_name);
+    collection_data.maximum
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_get_token_supply"></a>
+
+## Function `get_token_supply`
+
+return the number of distinct token_id created under this TokenData
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_token_supply">get_token_supply</a>(creator_address: <b>address</b>, token_data_id: <a href="token.md#0x3_token_TokenDataId">token::TokenDataId</a>): <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;u64&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_token_supply">get_token_supply</a>(creator_address: <b>address</b>, token_data_id: <a href="token.md#0x3_token_TokenDataId">TokenDataId</a>): Option&lt;u64&gt; <b>acquires</b> <a href="token.md#0x3_token_Collections">Collections</a> {
+    <b>assert</b>!(<b>exists</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator_address), <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="token.md#0x3_token_ECOLLECTIONS_NOT_PUBLISHED">ECOLLECTIONS_NOT_PUBLISHED</a>));
+    <b>let</b> all_token_data = &<b>borrow_global</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator_address).token_data;
+    <b>assert</b>!(<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_contains">table::contains</a>(all_token_data, token_data_id), <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="token.md#0x3_token_ETOKEN_DATA_NOT_PUBLISHED">ETOKEN_DATA_NOT_PUBLISHED</a>));
+    <b>let</b> token_data = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_borrow">table::borrow</a>(all_token_data, token_data_id);
+
+    <b>if</b> (token_data.maximum &gt; 0) {
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_some">option::some</a>(token_data.supply)
+    } <b>else</b> {
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>&lt;u64&gt;()
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_get_tokendata_largest_property_version"></a>
+
+## Function `get_tokendata_largest_property_version`
+
+return the largest_property_version of this TokenData
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_tokendata_largest_property_version">get_tokendata_largest_property_version</a>(creator_address: <b>address</b>, token_data_id: <a href="token.md#0x3_token_TokenDataId">token::TokenDataId</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_tokendata_largest_property_version">get_tokendata_largest_property_version</a>(creator_address: <b>address</b>, token_data_id: <a href="token.md#0x3_token_TokenDataId">TokenDataId</a>): u64 <b>acquires</b> <a href="token.md#0x3_token_Collections">Collections</a> {
+    <b>assert</b>!(<b>exists</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator_address), <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="token.md#0x3_token_ECOLLECTIONS_NOT_PUBLISHED">ECOLLECTIONS_NOT_PUBLISHED</a>));
+    <b>let</b> all_token_data = &<b>borrow_global</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator_address).token_data;
+    <b>assert</b>!(<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_contains">table::contains</a>(all_token_data, token_data_id), <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="token.md#0x3_token_ETOKEN_DATA_NOT_PUBLISHED">ETOKEN_DATA_NOT_PUBLISHED</a>));
+    <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_borrow">table::borrow</a>(all_token_data, token_data_id).largest_property_version
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_get_token_id"></a>
+
+## Function `get_token_id`
+
+return the TokenId for a given Token
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_token_id">get_token_id</a>(<a href="token.md#0x3_token">token</a>: &<a href="token.md#0x3_token_Token">token::Token</a>): <a href="token.md#0x3_token_TokenId">token::TokenId</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_token_id">get_token_id</a>(<a href="token.md#0x3_token">token</a>: &<a href="token.md#0x3_token_Token">Token</a>): <a href="token.md#0x3_token_TokenId">TokenId</a> {
+    <a href="token.md#0x3_token">token</a>.id
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_get_direct_transfer"></a>
+
+## Function `get_direct_transfer`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_direct_transfer">get_direct_transfer</a>(receiver: <b>address</b>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_direct_transfer">get_direct_transfer</a>(receiver: <b>address</b>): bool <b>acquires</b> <a href="token.md#0x3_token_TokenStore">TokenStore</a> {
+    <b>if</b> (!<b>exists</b>&lt;<a href="token.md#0x3_token_TokenStore">TokenStore</a>&gt;(receiver)) {
+        <b>return</b> <b>false</b>
+    };
+
+    <b>borrow_global</b>&lt;<a href="token.md#0x3_token_TokenStore">TokenStore</a>&gt;(receiver).direct_transfer
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_create_token_mutability_config"></a>
+
+## Function `create_token_mutability_config`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_create_token_mutability_config">create_token_mutability_config</a>(mutate_setting: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;bool&gt;): <a href="token.md#0x3_token_TokenMutabilityConfig">token::TokenMutabilityConfig</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_create_token_mutability_config">create_token_mutability_config</a>(mutate_setting: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;bool&gt;): <a href="token.md#0x3_token_TokenMutabilityConfig">TokenMutabilityConfig</a> {
+    <a href="token.md#0x3_token_TokenMutabilityConfig">TokenMutabilityConfig</a> {
+        maximum: *<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(mutate_setting, <a href="token.md#0x3_token_TOKEN_MAX_MUTABLE_IND">TOKEN_MAX_MUTABLE_IND</a>),
+        uri: *<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(mutate_setting, <a href="token.md#0x3_token_TOKEN_URI_MUTABLE_IND">TOKEN_URI_MUTABLE_IND</a>),
+        royalty: *<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(mutate_setting, <a href="token.md#0x3_token_TOKEN_ROYALTY_MUTABLE_IND">TOKEN_ROYALTY_MUTABLE_IND</a>),
+        description: *<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(mutate_setting, <a href="token.md#0x3_token_TOKEN_DESCRIPTION_MUTABLE_IND">TOKEN_DESCRIPTION_MUTABLE_IND</a>),
+        properties: *<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(mutate_setting, <a href="token.md#0x3_token_TOKEN_PROPERTY_MUTABLE_IND">TOKEN_PROPERTY_MUTABLE_IND</a>),
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_create_collection_mutability_config"></a>
+
+## Function `create_collection_mutability_config`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_create_collection_mutability_config">create_collection_mutability_config</a>(mutate_setting: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;bool&gt;): <a href="token.md#0x3_token_CollectionMutabilityConfig">token::CollectionMutabilityConfig</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_create_collection_mutability_config">create_collection_mutability_config</a>(mutate_setting: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;bool&gt;): <a href="token.md#0x3_token_CollectionMutabilityConfig">CollectionMutabilityConfig</a> {
+    <a href="token.md#0x3_token_CollectionMutabilityConfig">CollectionMutabilityConfig</a> {
+        description: *<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(mutate_setting, <a href="token.md#0x3_token_COLLECTION_DESCRIPTION_MUTABLE_IND">COLLECTION_DESCRIPTION_MUTABLE_IND</a>),
+        uri: *<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(mutate_setting, <a href="token.md#0x3_token_COLLECTION_URI_MUTABLE_IND">COLLECTION_URI_MUTABLE_IND</a>),
+        maximum: *<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_borrow">vector::borrow</a>(mutate_setting, <a href="token.md#0x3_token_COLLECTION_MAX_MUTABLE_IND">COLLECTION_MAX_MUTABLE_IND</a>),
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_mint_token"></a>
+
+## Function `mint_token`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_mint_token">mint_token</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, token_data_id: <a href="token.md#0x3_token_TokenDataId">token::TokenDataId</a>, amount: u64): <a href="token.md#0x3_token_TokenId">token::TokenId</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_mint_token">mint_token</a>(
+    <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    token_data_id: <a href="token.md#0x3_token_TokenDataId">TokenDataId</a>,
+    amount: u64,
+): <a href="token.md#0x3_token_TokenId">TokenId</a> <b>acquires</b> <a href="token.md#0x3_token_Collections">Collections</a>, <a href="token.md#0x3_token_TokenStore">TokenStore</a> {
+    <b>assert</b>!(token_data_id.creator == <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>), <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="token.md#0x3_token_ENO_MINT_CAPABILITY">ENO_MINT_CAPABILITY</a>));
+    <b>let</b> creator_addr = token_data_id.creator;
+    <b>let</b> all_token_data = &<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator_addr).token_data;
+    <b>assert</b>!(<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_contains">table::contains</a>(all_token_data, token_data_id), <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="token.md#0x3_token_ETOKEN_DATA_NOT_PUBLISHED">ETOKEN_DATA_NOT_PUBLISHED</a>));
+    <b>let</b> token_data = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_borrow_mut">table::borrow_mut</a>(all_token_data, token_data_id);
+
+    <b>if</b> (token_data.maximum &gt; 0) {
+        <b>assert</b>!(token_data.supply + amount &lt;= token_data.maximum, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="token.md#0x3_token_EMINT_WOULD_EXCEED_TOKEN_MAXIMUM">EMINT_WOULD_EXCEED_TOKEN_MAXIMUM</a>));
+        token_data.supply = token_data.supply + amount;
+    };
+
+    // we add more tokens <b>with</b> property_version 0
+    <b>let</b> token_id = <a href="token.md#0x3_token_create_token_id">create_token_id</a>(token_data_id, 0);
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit">event::emit</a>(<a href="token.md#0x3_token_MintToken">MintToken</a> { id: token_data_id, amount })
+    };
+    <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit_event">event::emit_event</a>&lt;<a href="token.md#0x3_token_MintTokenEvent">MintTokenEvent</a>&gt;(
+        &<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator_addr).mint_token_events,
+        <a href="token.md#0x3_token_MintTokenEvent">MintTokenEvent</a> {
+            id: token_data_id,
+            amount,
+        }
+    );
+
+    <a href="token.md#0x3_token_deposit_token">deposit_token</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>,
+        <a href="token.md#0x3_token_Token">Token</a> {
+            id: token_id,
+            amount,
+            token_properties: <a href="property_map.md#0x3_property_map_empty">property_map::empty</a>(), // same <b>as</b> default properties no need <b>to</b> store
+        }
+    );
+
+    token_id
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_mint_token_to"></a>
+
+## Function `mint_token_to`
+
+create tokens and directly deposite to receiver's address. The receiver should opt-in direct transfer
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_mint_token_to">mint_token_to</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, receiver: <b>address</b>, token_data_id: <a href="token.md#0x3_token_TokenDataId">token::TokenDataId</a>, amount: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_mint_token_to">mint_token_to</a>(
+    <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    receiver: <b>address</b>,
+    token_data_id: <a href="token.md#0x3_token_TokenDataId">TokenDataId</a>,
+    amount: u64,
+) <b>acquires</b> <a href="token.md#0x3_token_Collections">Collections</a>, <a href="token.md#0x3_token_TokenStore">TokenStore</a> {
+    <b>assert</b>!(<b>exists</b>&lt;<a href="token.md#0x3_token_TokenStore">TokenStore</a>&gt;(receiver), <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="token.md#0x3_token_ETOKEN_STORE_NOT_PUBLISHED">ETOKEN_STORE_NOT_PUBLISHED</a>));
+    <b>let</b> opt_in_transfer = <b>borrow_global</b>&lt;<a href="token.md#0x3_token_TokenStore">TokenStore</a>&gt;(receiver).direct_transfer;
+    <b>assert</b>!(opt_in_transfer, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="token.md#0x3_token_EUSER_NOT_OPT_IN_DIRECT_TRANSFER">EUSER_NOT_OPT_IN_DIRECT_TRANSFER</a>));
+
+    <b>assert</b>!(token_data_id.creator == <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>), <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="token.md#0x3_token_ENO_MINT_CAPABILITY">ENO_MINT_CAPABILITY</a>));
+    <b>let</b> creator_addr = token_data_id.creator;
+    <b>let</b> all_token_data = &<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator_addr).token_data;
+    <b>assert</b>!(<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_contains">table::contains</a>(all_token_data, token_data_id), <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="token.md#0x3_token_ETOKEN_DATA_NOT_PUBLISHED">ETOKEN_DATA_NOT_PUBLISHED</a>));
+    <b>let</b> token_data = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_borrow_mut">table::borrow_mut</a>(all_token_data, token_data_id);
+
+    <b>if</b> (token_data.maximum &gt; 0) {
+        <b>assert</b>!(token_data.supply + amount &lt;= token_data.maximum, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="token.md#0x3_token_EMINT_WOULD_EXCEED_TOKEN_MAXIMUM">EMINT_WOULD_EXCEED_TOKEN_MAXIMUM</a>));
+        token_data.supply = token_data.supply + amount;
+    };
+
+    // we add more tokens <b>with</b> property_version 0
+    <b>let</b> token_id = <a href="token.md#0x3_token_create_token_id">create_token_id</a>(token_data_id, 0);
+
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit">event::emit</a>(<a href="token.md#0x3_token_MintToken">MintToken</a> { id: token_data_id, amount })
+    };
+    <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit_event">event::emit_event</a>&lt;<a href="token.md#0x3_token_MintTokenEvent">MintTokenEvent</a>&gt;(
+        &<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator_addr).mint_token_events,
+        <a href="token.md#0x3_token_MintTokenEvent">MintTokenEvent</a> {
+            id: token_data_id,
+            amount,
+        }
+    );
+
+    <a href="token.md#0x3_token_direct_deposit">direct_deposit</a>(receiver,
+        <a href="token.md#0x3_token_Token">Token</a> {
+            id: token_id,
+            amount,
+            token_properties: <a href="property_map.md#0x3_property_map_empty">property_map::empty</a>(), // same <b>as</b> default properties no need <b>to</b> store
+        }
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_create_token_id"></a>
+
+## Function `create_token_id`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_create_token_id">create_token_id</a>(token_data_id: <a href="token.md#0x3_token_TokenDataId">token::TokenDataId</a>, property_version: u64): <a href="token.md#0x3_token_TokenId">token::TokenId</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_create_token_id">create_token_id</a>(token_data_id: <a href="token.md#0x3_token_TokenDataId">TokenDataId</a>, property_version: u64): <a href="token.md#0x3_token_TokenId">TokenId</a> {
+    <a href="token.md#0x3_token_TokenId">TokenId</a> {
+        token_data_id,
+        property_version,
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_create_token_data_id"></a>
+
+## Function `create_token_data_id`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_create_token_data_id">create_token_data_id</a>(creator: <b>address</b>, collection: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): <a href="token.md#0x3_token_TokenDataId">token::TokenDataId</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_create_token_data_id">create_token_data_id</a>(
+    creator: <b>address</b>,
+    collection: String,
+    name: String,
+): <a href="token.md#0x3_token_TokenDataId">TokenDataId</a> {
+    <b>assert</b>!(<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_length">string::length</a>(&collection) &lt;= <a href="token.md#0x3_token_MAX_COLLECTION_NAME_LENGTH">MAX_COLLECTION_NAME_LENGTH</a>, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="token.md#0x3_token_ECOLLECTION_NAME_TOO_LONG">ECOLLECTION_NAME_TOO_LONG</a>));
+    <b>assert</b>!(<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_length">string::length</a>(&name) &lt;= <a href="token.md#0x3_token_MAX_NFT_NAME_LENGTH">MAX_NFT_NAME_LENGTH</a>, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="token.md#0x3_token_ENFT_NAME_TOO_LONG">ENFT_NAME_TOO_LONG</a>));
+    <a href="token.md#0x3_token_TokenDataId">TokenDataId</a> { creator, collection, name }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_create_token_id_raw"></a>
+
+## Function `create_token_id_raw`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_create_token_id_raw">create_token_id_raw</a>(creator: <b>address</b>, collection: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, property_version: u64): <a href="token.md#0x3_token_TokenId">token::TokenId</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_create_token_id_raw">create_token_id_raw</a>(
+    creator: <b>address</b>,
+    collection: String,
+    name: String,
+    property_version: u64,
+): <a href="token.md#0x3_token_TokenId">TokenId</a> {
+    <a href="token.md#0x3_token_TokenId">TokenId</a> {
+        token_data_id: <a href="token.md#0x3_token_create_token_data_id">create_token_data_id</a>(creator, collection, name),
+        property_version,
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_balance_of"></a>
+
+## Function `balance_of`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_balance_of">balance_of</a>(owner: <b>address</b>, id: <a href="token.md#0x3_token_TokenId">token::TokenId</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_balance_of">balance_of</a>(owner: <b>address</b>, id: <a href="token.md#0x3_token_TokenId">TokenId</a>): u64 <b>acquires</b> <a href="token.md#0x3_token_TokenStore">TokenStore</a> {
+    <b>if</b> (!<b>exists</b>&lt;<a href="token.md#0x3_token_TokenStore">TokenStore</a>&gt;(owner)) {
+        <b>return</b> 0
+    };
+    <b>let</b> token_store = <b>borrow_global</b>&lt;<a href="token.md#0x3_token_TokenStore">TokenStore</a>&gt;(owner);
+    <b>if</b> (<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_contains">table::contains</a>(&token_store.tokens, id)) {
+        <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_borrow">table::borrow</a>(&token_store.tokens, id).amount
+    } <b>else</b> {
+        0
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_has_token_store"></a>
+
+## Function `has_token_store`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_has_token_store">has_token_store</a>(owner: <b>address</b>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_has_token_store">has_token_store</a>(owner: <b>address</b>): bool {
+    <b>exists</b>&lt;<a href="token.md#0x3_token_TokenStore">TokenStore</a>&gt;(owner)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_get_royalty"></a>
+
+## Function `get_royalty`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_royalty">get_royalty</a>(token_id: <a href="token.md#0x3_token_TokenId">token::TokenId</a>): <a href="token.md#0x3_token_Royalty">token::Royalty</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_royalty">get_royalty</a>(token_id: <a href="token.md#0x3_token_TokenId">TokenId</a>): <a href="token.md#0x3_token_Royalty">Royalty</a> <b>acquires</b> <a href="token.md#0x3_token_Collections">Collections</a> {
+    <b>let</b> token_data_id = token_id.token_data_id;
+    <a href="token.md#0x3_token_get_tokendata_royalty">get_tokendata_royalty</a>(token_data_id)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_get_royalty_numerator"></a>
+
+## Function `get_royalty_numerator`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_royalty_numerator">get_royalty_numerator</a>(royalty: &<a href="token.md#0x3_token_Royalty">token::Royalty</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_royalty_numerator">get_royalty_numerator</a>(royalty: &<a href="token.md#0x3_token_Royalty">Royalty</a>): u64 {
+    royalty.royalty_points_numerator
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_get_royalty_denominator"></a>
+
+## Function `get_royalty_denominator`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_royalty_denominator">get_royalty_denominator</a>(royalty: &<a href="token.md#0x3_token_Royalty">token::Royalty</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_royalty_denominator">get_royalty_denominator</a>(royalty: &<a href="token.md#0x3_token_Royalty">Royalty</a>): u64 {
+    royalty.royalty_points_denominator
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_get_royalty_payee"></a>
+
+## Function `get_royalty_payee`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_royalty_payee">get_royalty_payee</a>(royalty: &<a href="token.md#0x3_token_Royalty">token::Royalty</a>): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_royalty_payee">get_royalty_payee</a>(royalty: &<a href="token.md#0x3_token_Royalty">Royalty</a>): <b>address</b> {
+    royalty.payee_address
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_get_token_amount"></a>
+
+## Function `get_token_amount`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_token_amount">get_token_amount</a>(<a href="token.md#0x3_token">token</a>: &<a href="token.md#0x3_token_Token">token::Token</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_token_amount">get_token_amount</a>(<a href="token.md#0x3_token">token</a>: &<a href="token.md#0x3_token_Token">Token</a>): u64 {
+    <a href="token.md#0x3_token">token</a>.amount
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_get_token_id_fields"></a>
+
+## Function `get_token_id_fields`
+
+return the creator address, collection name, token name and property_version
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_token_id_fields">get_token_id_fields</a>(token_id: &<a href="token.md#0x3_token_TokenId">token::TokenId</a>): (<b>address</b>, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_token_id_fields">get_token_id_fields</a>(token_id: &<a href="token.md#0x3_token_TokenId">TokenId</a>): (<b>address</b>, String, String, u64) {
+    (
+        token_id.token_data_id.creator,
+        token_id.token_data_id.collection,
+        token_id.token_data_id.name,
+        token_id.property_version,
+    )
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_get_token_data_id_fields"></a>
+
+## Function `get_token_data_id_fields`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_token_data_id_fields">get_token_data_id_fields</a>(token_data_id: &<a href="token.md#0x3_token_TokenDataId">token::TokenDataId</a>): (<b>address</b>, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_token_data_id_fields">get_token_data_id_fields</a>(token_data_id: &<a href="token.md#0x3_token_TokenDataId">TokenDataId</a>): (<b>address</b>, String, String) {
+    (
+        token_data_id.creator,
+        token_data_id.collection,
+        token_data_id.name,
+    )
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_get_property_map"></a>
+
+## Function `get_property_map`
+
+return a copy of the token property map.
+if property_version = 0, return the default property map
+if property_version > 0, return the property value stored at owner's token store
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_property_map">get_property_map</a>(owner: <b>address</b>, token_id: <a href="token.md#0x3_token_TokenId">token::TokenId</a>): <a href="property_map.md#0x3_property_map_PropertyMap">property_map::PropertyMap</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_property_map">get_property_map</a>(owner: <b>address</b>, token_id: <a href="token.md#0x3_token_TokenId">TokenId</a>): PropertyMap <b>acquires</b> <a href="token.md#0x3_token_Collections">Collections</a>, <a href="token.md#0x3_token_TokenStore">TokenStore</a> {
+    <b>assert</b>!(<a href="token.md#0x3_token_balance_of">balance_of</a>(owner, token_id) &gt; 0, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="token.md#0x3_token_EINSUFFICIENT_BALANCE">EINSUFFICIENT_BALANCE</a>));
+    // <b>if</b> property_version = 0, <b>return</b> default property map
+    <b>if</b> (token_id.property_version == 0) {
+        <b>let</b> creator_addr = token_id.token_data_id.creator;
+        <b>let</b> all_token_data = &<b>borrow_global</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator_addr).token_data;
+        <b>assert</b>!(<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_contains">table::contains</a>(all_token_data, token_id.token_data_id), <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="token.md#0x3_token_ETOKEN_DATA_NOT_PUBLISHED">ETOKEN_DATA_NOT_PUBLISHED</a>));
+        <b>let</b> token_data = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_borrow">table::borrow</a>(all_token_data, token_id.token_data_id);
+        token_data.default_properties
+    } <b>else</b> {
+        <b>let</b> tokens = &<b>borrow_global</b>&lt;<a href="token.md#0x3_token_TokenStore">TokenStore</a>&gt;(owner).tokens;
+        <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_borrow">table::borrow</a>(tokens, token_id).token_properties
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_get_tokendata_maximum"></a>
+
+## Function `get_tokendata_maximum`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_tokendata_maximum">get_tokendata_maximum</a>(token_data_id: <a href="token.md#0x3_token_TokenDataId">token::TokenDataId</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_tokendata_maximum">get_tokendata_maximum</a>(token_data_id: <a href="token.md#0x3_token_TokenDataId">TokenDataId</a>): u64 <b>acquires</b> <a href="token.md#0x3_token_Collections">Collections</a> {
+    <b>let</b> creator_address = token_data_id.creator;
+    <b>assert</b>!(<b>exists</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator_address), <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="token.md#0x3_token_ECOLLECTIONS_NOT_PUBLISHED">ECOLLECTIONS_NOT_PUBLISHED</a>));
+    <b>let</b> all_token_data = &<b>borrow_global</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator_address).token_data;
+    <b>assert</b>!(<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_contains">table::contains</a>(all_token_data, token_data_id), <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="token.md#0x3_token_ETOKEN_DATA_NOT_PUBLISHED">ETOKEN_DATA_NOT_PUBLISHED</a>));
+
+    <b>let</b> token_data = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_borrow">table::borrow</a>(all_token_data, token_data_id);
+    token_data.maximum
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_get_tokendata_uri"></a>
+
+## Function `get_tokendata_uri`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_tokendata_uri">get_tokendata_uri</a>(creator: <b>address</b>, token_data_id: <a href="token.md#0x3_token_TokenDataId">token::TokenDataId</a>): <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_tokendata_uri">get_tokendata_uri</a>(creator: <b>address</b>, token_data_id: <a href="token.md#0x3_token_TokenDataId">TokenDataId</a>): String <b>acquires</b> <a href="token.md#0x3_token_Collections">Collections</a> {
+    <b>assert</b>!(<b>exists</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator), <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="token.md#0x3_token_ECOLLECTIONS_NOT_PUBLISHED">ECOLLECTIONS_NOT_PUBLISHED</a>));
+    <b>let</b> all_token_data = &<b>borrow_global</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator).token_data;
+    <b>assert</b>!(<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_contains">table::contains</a>(all_token_data, token_data_id), <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="token.md#0x3_token_ETOKEN_DATA_NOT_PUBLISHED">ETOKEN_DATA_NOT_PUBLISHED</a>));
+
+    <b>let</b> token_data = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_borrow">table::borrow</a>(all_token_data, token_data_id);
+    token_data.uri
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_get_tokendata_description"></a>
+
+## Function `get_tokendata_description`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_tokendata_description">get_tokendata_description</a>(token_data_id: <a href="token.md#0x3_token_TokenDataId">token::TokenDataId</a>): <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_tokendata_description">get_tokendata_description</a>(token_data_id: <a href="token.md#0x3_token_TokenDataId">TokenDataId</a>): String <b>acquires</b> <a href="token.md#0x3_token_Collections">Collections</a> {
+    <b>let</b> creator_address = token_data_id.creator;
+    <b>assert</b>!(<b>exists</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator_address), <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="token.md#0x3_token_ECOLLECTIONS_NOT_PUBLISHED">ECOLLECTIONS_NOT_PUBLISHED</a>));
+    <b>let</b> all_token_data = &<b>borrow_global</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator_address).token_data;
+    <b>assert</b>!(<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_contains">table::contains</a>(all_token_data, token_data_id), <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="token.md#0x3_token_ETOKEN_DATA_NOT_PUBLISHED">ETOKEN_DATA_NOT_PUBLISHED</a>));
+
+    <b>let</b> token_data = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_borrow">table::borrow</a>(all_token_data, token_data_id);
+    token_data.description
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_get_tokendata_royalty"></a>
+
+## Function `get_tokendata_royalty`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_tokendata_royalty">get_tokendata_royalty</a>(token_data_id: <a href="token.md#0x3_token_TokenDataId">token::TokenDataId</a>): <a href="token.md#0x3_token_Royalty">token::Royalty</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_tokendata_royalty">get_tokendata_royalty</a>(token_data_id: <a href="token.md#0x3_token_TokenDataId">TokenDataId</a>): <a href="token.md#0x3_token_Royalty">Royalty</a> <b>acquires</b> <a href="token.md#0x3_token_Collections">Collections</a> {
+    <b>let</b> creator_address = token_data_id.creator;
+    <b>assert</b>!(<b>exists</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator_address), <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="token.md#0x3_token_ECOLLECTIONS_NOT_PUBLISHED">ECOLLECTIONS_NOT_PUBLISHED</a>));
+    <b>let</b> all_token_data = &<b>borrow_global</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator_address).token_data;
+    <b>assert</b>!(<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_contains">table::contains</a>(all_token_data, token_data_id), <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="token.md#0x3_token_ETOKEN_DATA_NOT_PUBLISHED">ETOKEN_DATA_NOT_PUBLISHED</a>));
+
+    <b>let</b> token_data = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_borrow">table::borrow</a>(all_token_data, token_data_id);
+    token_data.royalty
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_get_tokendata_id"></a>
+
+## Function `get_tokendata_id`
+
+return the token_data_id from the token_id
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_tokendata_id">get_tokendata_id</a>(token_id: <a href="token.md#0x3_token_TokenId">token::TokenId</a>): <a href="token.md#0x3_token_TokenDataId">token::TokenDataId</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_tokendata_id">get_tokendata_id</a>(token_id: <a href="token.md#0x3_token_TokenId">TokenId</a>): <a href="token.md#0x3_token_TokenDataId">TokenDataId</a> {
+    token_id.token_data_id
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_get_tokendata_mutability_config"></a>
+
+## Function `get_tokendata_mutability_config`
+
+return the mutation setting of the token
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_tokendata_mutability_config">get_tokendata_mutability_config</a>(token_data_id: <a href="token.md#0x3_token_TokenDataId">token::TokenDataId</a>): <a href="token.md#0x3_token_TokenMutabilityConfig">token::TokenMutabilityConfig</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_tokendata_mutability_config">get_tokendata_mutability_config</a>(token_data_id: <a href="token.md#0x3_token_TokenDataId">TokenDataId</a>): <a href="token.md#0x3_token_TokenMutabilityConfig">TokenMutabilityConfig</a> <b>acquires</b> <a href="token.md#0x3_token_Collections">Collections</a> {
+    <b>let</b> creator_addr = token_data_id.creator;
+    <b>assert</b>!(<b>exists</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator_addr), <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="token.md#0x3_token_ECOLLECTIONS_NOT_PUBLISHED">ECOLLECTIONS_NOT_PUBLISHED</a>));
+    <b>let</b> all_token_data = &<b>borrow_global</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator_addr).token_data;
+    <b>assert</b>!(<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_contains">table::contains</a>(all_token_data, token_data_id), <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="token.md#0x3_token_ETOKEN_DATA_NOT_PUBLISHED">ETOKEN_DATA_NOT_PUBLISHED</a>));
+    <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_borrow">table::borrow</a>(all_token_data, token_data_id).mutability_config
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_get_token_mutability_maximum"></a>
+
+## Function `get_token_mutability_maximum`
+
+return if the token's maximum is mutable
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_token_mutability_maximum">get_token_mutability_maximum</a>(config: &<a href="token.md#0x3_token_TokenMutabilityConfig">token::TokenMutabilityConfig</a>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_token_mutability_maximum">get_token_mutability_maximum</a>(config: &<a href="token.md#0x3_token_TokenMutabilityConfig">TokenMutabilityConfig</a>): bool {
+    config.maximum
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_get_token_mutability_royalty"></a>
+
+## Function `get_token_mutability_royalty`
+
+return if the token royalty is mutable with a token mutability config
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_token_mutability_royalty">get_token_mutability_royalty</a>(config: &<a href="token.md#0x3_token_TokenMutabilityConfig">token::TokenMutabilityConfig</a>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_token_mutability_royalty">get_token_mutability_royalty</a>(config: &<a href="token.md#0x3_token_TokenMutabilityConfig">TokenMutabilityConfig</a>): bool {
+    config.royalty
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_get_token_mutability_uri"></a>
+
+## Function `get_token_mutability_uri`
+
+return if the token uri is mutable with a token mutability config
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_token_mutability_uri">get_token_mutability_uri</a>(config: &<a href="token.md#0x3_token_TokenMutabilityConfig">token::TokenMutabilityConfig</a>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_token_mutability_uri">get_token_mutability_uri</a>(config: &<a href="token.md#0x3_token_TokenMutabilityConfig">TokenMutabilityConfig</a>): bool {
+    config.uri
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_get_token_mutability_description"></a>
+
+## Function `get_token_mutability_description`
+
+return if the token description is mutable with a token mutability config
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_token_mutability_description">get_token_mutability_description</a>(config: &<a href="token.md#0x3_token_TokenMutabilityConfig">token::TokenMutabilityConfig</a>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_token_mutability_description">get_token_mutability_description</a>(config: &<a href="token.md#0x3_token_TokenMutabilityConfig">TokenMutabilityConfig</a>): bool {
+    config.description
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_get_token_mutability_default_properties"></a>
+
+## Function `get_token_mutability_default_properties`
+
+return if the tokendata's default properties is mutable with a token mutability config
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_token_mutability_default_properties">get_token_mutability_default_properties</a>(config: &<a href="token.md#0x3_token_TokenMutabilityConfig">token::TokenMutabilityConfig</a>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_token_mutability_default_properties">get_token_mutability_default_properties</a>(config: &<a href="token.md#0x3_token_TokenMutabilityConfig">TokenMutabilityConfig</a>): bool {
+    config.properties
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_get_collection_mutability_config"></a>
+
+## Function `get_collection_mutability_config`
+
+return the collection mutation setting
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_collection_mutability_config">get_collection_mutability_config</a>(creator: <b>address</b>, collection_name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): <a href="token.md#0x3_token_CollectionMutabilityConfig">token::CollectionMutabilityConfig</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_collection_mutability_config">get_collection_mutability_config</a>(
+    creator: <b>address</b>,
+    collection_name: String
+): <a href="token.md#0x3_token_CollectionMutabilityConfig">CollectionMutabilityConfig</a> <b>acquires</b> <a href="token.md#0x3_token_Collections">Collections</a> {
+    <b>assert</b>!(<b>exists</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator), <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="token.md#0x3_token_ECOLLECTIONS_NOT_PUBLISHED">ECOLLECTIONS_NOT_PUBLISHED</a>));
+    <b>let</b> all_collection_data = &<b>borrow_global</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator).collection_data;
+    <b>assert</b>!(<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_contains">table::contains</a>(all_collection_data, collection_name), <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="token.md#0x3_token_ECOLLECTION_NOT_PUBLISHED">ECOLLECTION_NOT_PUBLISHED</a>));
+    <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_borrow">table::borrow</a>(all_collection_data, collection_name).mutability_config
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_get_collection_mutability_description"></a>
+
+## Function `get_collection_mutability_description`
+
+return if the collection description is mutable with a collection mutability config
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_collection_mutability_description">get_collection_mutability_description</a>(config: &<a href="token.md#0x3_token_CollectionMutabilityConfig">token::CollectionMutabilityConfig</a>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_collection_mutability_description">get_collection_mutability_description</a>(config: &<a href="token.md#0x3_token_CollectionMutabilityConfig">CollectionMutabilityConfig</a>): bool {
+    config.description
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_get_collection_mutability_uri"></a>
+
+## Function `get_collection_mutability_uri`
+
+return if the collection uri is mutable with a collection mutability config
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_collection_mutability_uri">get_collection_mutability_uri</a>(config: &<a href="token.md#0x3_token_CollectionMutabilityConfig">token::CollectionMutabilityConfig</a>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_collection_mutability_uri">get_collection_mutability_uri</a>(config: &<a href="token.md#0x3_token_CollectionMutabilityConfig">CollectionMutabilityConfig</a>): bool {
+    config.uri
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_get_collection_mutability_maximum"></a>
+
+## Function `get_collection_mutability_maximum`
+
+return if the collection maximum is mutable with collection mutability config
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_collection_mutability_maximum">get_collection_mutability_maximum</a>(config: &<a href="token.md#0x3_token_CollectionMutabilityConfig">token::CollectionMutabilityConfig</a>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_collection_mutability_maximum">get_collection_mutability_maximum</a>(config: &<a href="token.md#0x3_token_CollectionMutabilityConfig">CollectionMutabilityConfig</a>): bool {
+    config.maximum
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_destroy_token_data"></a>
+
+## Function `destroy_token_data`
+
+
+
+<pre><code><b>fun</b> <a href="token.md#0x3_token_destroy_token_data">destroy_token_data</a>(token_data: <a href="token.md#0x3_token_TokenData">token::TokenData</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="token.md#0x3_token_destroy_token_data">destroy_token_data</a>(token_data: <a href="token.md#0x3_token_TokenData">TokenData</a>) {
+    <b>let</b> <a href="token.md#0x3_token_TokenData">TokenData</a> {
+        maximum: _,
+        largest_property_version: _,
+        supply: _,
+        uri: _,
+        royalty: _,
+        name: _,
+        description: _,
+        default_properties: _,
+        mutability_config: _,
+    } = token_data;
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_destroy_collection_data"></a>
+
+## Function `destroy_collection_data`
+
+
+
+<pre><code><b>fun</b> <a href="token.md#0x3_token_destroy_collection_data">destroy_collection_data</a>(collection_data: <a href="token.md#0x3_token_CollectionData">token::CollectionData</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="token.md#0x3_token_destroy_collection_data">destroy_collection_data</a>(collection_data: <a href="token.md#0x3_token_CollectionData">CollectionData</a>) {
+    <b>let</b> <a href="token.md#0x3_token_CollectionData">CollectionData</a> {
+        description: _,
+        name: _,
+        uri: _,
+        supply: _,
+        maximum: _,
+        mutability_config: _,
+    } = collection_data;
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_withdraw_with_event_internal"></a>
+
+## Function `withdraw_with_event_internal`
+
+
+
+<pre><code><b>fun</b> <a href="token.md#0x3_token_withdraw_with_event_internal">withdraw_with_event_internal</a>(account_addr: <b>address</b>, id: <a href="token.md#0x3_token_TokenId">token::TokenId</a>, amount: u64): <a href="token.md#0x3_token_Token">token::Token</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="token.md#0x3_token_withdraw_with_event_internal">withdraw_with_event_internal</a>(
+    account_addr: <b>address</b>,
+    id: <a href="token.md#0x3_token_TokenId">TokenId</a>,
+    amount: u64,
+): <a href="token.md#0x3_token_Token">Token</a> <b>acquires</b> <a href="token.md#0x3_token_TokenStore">TokenStore</a> {
+    // It does not make sense <b>to</b> withdraw 0 tokens.
+    <b>assert</b>!(amount &gt; 0, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="token.md#0x3_token_EWITHDRAW_ZERO">EWITHDRAW_ZERO</a>));
+    // Make sure the <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a> <b>has</b> sufficient tokens <b>to</b> withdraw.
+    <b>assert</b>!(<a href="token.md#0x3_token_balance_of">balance_of</a>(account_addr, id) &gt;= amount, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="token.md#0x3_token_EINSUFFICIENT_BALANCE">EINSUFFICIENT_BALANCE</a>));
+
+    <b>assert</b>!(
+        <b>exists</b>&lt;<a href="token.md#0x3_token_TokenStore">TokenStore</a>&gt;(account_addr),
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="token.md#0x3_token_ETOKEN_STORE_NOT_PUBLISHED">ETOKEN_STORE_NOT_PUBLISHED</a>),
+    );
+
+    <b>let</b> token_store = <b>borrow_global_mut</b>&lt;<a href="token.md#0x3_token_TokenStore">TokenStore</a>&gt;(account_addr);
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit">event::emit</a>(<a href="token.md#0x3_token_Withdraw">Withdraw</a> { id, amount })
+    };
+    <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit_event">event::emit_event</a>&lt;<a href="token.md#0x3_token_WithdrawEvent">WithdrawEvent</a>&gt;(
+        &<b>mut</b> token_store.withdraw_events,
+        <a href="token.md#0x3_token_WithdrawEvent">WithdrawEvent</a> { id, amount }
+    );
+    <b>let</b> tokens = &<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="token.md#0x3_token_TokenStore">TokenStore</a>&gt;(account_addr).tokens;
+    <b>assert</b>!(
+        <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_contains">table::contains</a>(tokens, id),
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="token.md#0x3_token_ENO_TOKEN_IN_TOKEN_STORE">ENO_TOKEN_IN_TOKEN_STORE</a>),
+    );
+    // balance &gt; amount and amount &gt; 0 indirectly asserted that balance &gt; 0.
+    <b>let</b> balance = &<b>mut</b> <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_borrow_mut">table::borrow_mut</a>(tokens, id).amount;
+    <b>if</b> (*balance &gt; amount) {
+        *balance = *balance - amount;
+        <a href="token.md#0x3_token_Token">Token</a> { id, amount, token_properties: <a href="property_map.md#0x3_property_map_empty">property_map::empty</a>() }
+    } <b>else</b> {
+        <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_remove">table::remove</a>(tokens, id)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_update_token_property_internal"></a>
+
+## Function `update_token_property_internal`
+
+
+
+<pre><code><b>fun</b> <a href="token.md#0x3_token_update_token_property_internal">update_token_property_internal</a>(token_owner: <b>address</b>, token_id: <a href="token.md#0x3_token_TokenId">token::TokenId</a>, keys: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;, values: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;, types: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="token.md#0x3_token_update_token_property_internal">update_token_property_internal</a>(
+    token_owner: <b>address</b>,
+    token_id: <a href="token.md#0x3_token_TokenId">TokenId</a>,
+    keys: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;String&gt;,
+    values: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;,
+    types: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;String&gt;,
+) <b>acquires</b> <a href="token.md#0x3_token_TokenStore">TokenStore</a> {
+    <b>let</b> tokens = &<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="token.md#0x3_token_TokenStore">TokenStore</a>&gt;(token_owner).tokens;
+    <b>assert</b>!(<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_contains">table::contains</a>(tokens, token_id), <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="token.md#0x3_token_ENO_TOKEN_IN_TOKEN_STORE">ENO_TOKEN_IN_TOKEN_STORE</a>));
+
+    <b>let</b> value = &<b>mut</b> <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_borrow_mut">table::borrow_mut</a>(tokens, token_id).token_properties;
+    <a href="token.md#0x3_token_assert_non_standard_reserved_property">assert_non_standard_reserved_property</a>(&keys);
+    <a href="property_map.md#0x3_property_map_update_property_map">property_map::update_property_map</a>(value, keys, values, types);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_direct_deposit"></a>
+
+## Function `direct_deposit`
+
+Deposit the token balance into the recipients account and emit an event.
+
+
+<pre><code><b>fun</b> <a href="token.md#0x3_token_direct_deposit">direct_deposit</a>(account_addr: <b>address</b>, <a href="token.md#0x3_token">token</a>: <a href="token.md#0x3_token_Token">token::Token</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="token.md#0x3_token_direct_deposit">direct_deposit</a>(account_addr: <b>address</b>, <a href="token.md#0x3_token">token</a>: <a href="token.md#0x3_token_Token">Token</a>) <b>acquires</b> <a href="token.md#0x3_token_TokenStore">TokenStore</a> {
+    <b>assert</b>!(<a href="token.md#0x3_token">token</a>.amount &gt; 0, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="token.md#0x3_token_ETOKEN_CANNOT_HAVE_ZERO_AMOUNT">ETOKEN_CANNOT_HAVE_ZERO_AMOUNT</a>));
+    <b>let</b> token_store = <b>borrow_global_mut</b>&lt;<a href="token.md#0x3_token_TokenStore">TokenStore</a>&gt;(account_addr);
+
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit">event::emit</a>(<a href="token.md#0x3_token_Deposit">Deposit</a> { id: <a href="token.md#0x3_token">token</a>.id, amount: <a href="token.md#0x3_token">token</a>.amount });
+    };
+    <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit_event">event::emit_event</a>&lt;<a href="token.md#0x3_token_DepositEvent">DepositEvent</a>&gt;(
+        &<b>mut</b> token_store.deposit_events,
+        <a href="token.md#0x3_token_DepositEvent">DepositEvent</a> { id: <a href="token.md#0x3_token">token</a>.id, amount: <a href="token.md#0x3_token">token</a>.amount },
+    );
+
+    <b>assert</b>!(
+        <b>exists</b>&lt;<a href="token.md#0x3_token_TokenStore">TokenStore</a>&gt;(account_addr),
+        <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="token.md#0x3_token_ETOKEN_STORE_NOT_PUBLISHED">ETOKEN_STORE_NOT_PUBLISHED</a>),
+    );
+
+    <b>if</b> (!<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_contains">table::contains</a>(&token_store.tokens, <a href="token.md#0x3_token">token</a>.id)) {
+        <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_add">table::add</a>(&<b>mut</b> token_store.tokens, <a href="token.md#0x3_token">token</a>.id, <a href="token.md#0x3_token">token</a>);
+    } <b>else</b> {
+        <b>let</b> recipient_token = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_borrow_mut">table::borrow_mut</a>(&<b>mut</b> token_store.tokens, <a href="token.md#0x3_token">token</a>.id);
+        <a href="token.md#0x3_token_merge">merge</a>(recipient_token, <a href="token.md#0x3_token">token</a>);
+    };
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_assert_collection_exists"></a>
+
+## Function `assert_collection_exists`
+
+
+
+<pre><code><b>fun</b> <a href="token.md#0x3_token_assert_collection_exists">assert_collection_exists</a>(creator_address: <b>address</b>, collection_name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="token.md#0x3_token_assert_collection_exists">assert_collection_exists</a>(creator_address: <b>address</b>, collection_name: String) <b>acquires</b> <a href="token.md#0x3_token_Collections">Collections</a> {
+    <b>assert</b>!(<b>exists</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator_address), <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="token.md#0x3_token_ECOLLECTIONS_NOT_PUBLISHED">ECOLLECTIONS_NOT_PUBLISHED</a>));
+    <b>let</b> all_collection_data = &<b>borrow_global</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator_address).collection_data;
+    <b>assert</b>!(<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_contains">table::contains</a>(all_collection_data, collection_name), <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="token.md#0x3_token_ECOLLECTION_NOT_PUBLISHED">ECOLLECTION_NOT_PUBLISHED</a>));
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_assert_tokendata_exists"></a>
+
+## Function `assert_tokendata_exists`
+
+
+
+<pre><code><b>fun</b> <a href="token.md#0x3_token_assert_tokendata_exists">assert_tokendata_exists</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, token_data_id: <a href="token.md#0x3_token_TokenDataId">token::TokenDataId</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="token.md#0x3_token_assert_tokendata_exists">assert_tokendata_exists</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, token_data_id: <a href="token.md#0x3_token_TokenDataId">TokenDataId</a>) <b>acquires</b> <a href="token.md#0x3_token_Collections">Collections</a> {
+    <b>let</b> creator_addr = token_data_id.creator;
+    <b>assert</b>!(<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(creator) == creator_addr, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="token.md#0x3_token_ENO_MUTATE_CAPABILITY">ENO_MUTATE_CAPABILITY</a>));
+    <b>assert</b>!(<b>exists</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator_addr), <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="token.md#0x3_token_ECOLLECTIONS_NOT_PUBLISHED">ECOLLECTIONS_NOT_PUBLISHED</a>));
+    <b>let</b> all_token_data = &<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator_addr).token_data;
+    <b>assert</b>!(<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_contains">table::contains</a>(all_token_data, token_data_id), <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="token.md#0x3_token_ETOKEN_DATA_NOT_PUBLISHED">ETOKEN_DATA_NOT_PUBLISHED</a>));
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_assert_non_standard_reserved_property"></a>
+
+## Function `assert_non_standard_reserved_property`
+
+
+
+<pre><code><b>fun</b> <a href="token.md#0x3_token_assert_non_standard_reserved_property">assert_non_standard_reserved_property</a>(keys: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="token.md#0x3_token_assert_non_standard_reserved_property">assert_non_standard_reserved_property</a>(keys: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;String&gt;) {
+    <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_for_each_ref">vector::for_each_ref</a>(keys, |key| {
+        <b>let</b> key: &String = key;
+        <b>let</b> length = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_length">string::length</a>(key);
+        <b>if</b> (length &gt;= 6) {
+            <b>let</b> prefix = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_sub_string">string::sub_string</a>(&*key, 0, 6);
+            <b>assert</b>!(prefix != <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_utf8">string::utf8</a>(b"TOKEN_"), <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="token.md#0x3_token_EPROPERTY_RESERVED_BY_STANDARD">EPROPERTY_RESERVED_BY_STANDARD</a>));
+        };
+    });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_initialize_token_script"></a>
+
+## Function `initialize_token_script`
+
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="token.md#0x3_token_initialize_token_script">initialize_token_script</a>(_account: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="token.md#0x3_token_initialize_token_script">initialize_token_script</a>(_account: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>) {
+    <b>abort</b> 0
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_initialize_token"></a>
+
+## Function `initialize_token`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_initialize_token">initialize_token</a>(_account: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, _token_id: <a href="token.md#0x3_token_TokenId">token::TokenId</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_initialize_token">initialize_token</a>(_account: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, _token_id: <a href="token.md#0x3_token_TokenId">TokenId</a>) {
+    <b>abort</b> 0
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+
+<pre><code><b>pragma</b> verify = <b>true</b>;
+<b>pragma</b> aborts_if_is_strict;
+</code></pre>
+
+
+
+<a id="@Specification_1_create_collection_script"></a>
+
+### Function `create_collection_script`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="token.md#0x3_token_create_collection_script">create_collection_script</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, description: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, uri: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, maximum: u64, mutate_setting: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;bool&gt;)
+</code></pre>
+
+
+The length of the name is up to MAX_COLLECTION_NAME_LENGTH;
+The length of the uri is up to MAX_URI_LENGTH;
+
+
+<pre><code><b>pragma</b> aborts_if_is_partial;
+<b>include</b> <a href="token.md#0x3_token_CreateCollectionAbortsIf">CreateCollectionAbortsIf</a>;
+</code></pre>
+
+
+
+<a id="@Specification_1_create_token_script"></a>
+
+### Function `create_token_script`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="token.md#0x3_token_create_token_script">create_token_script</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, collection: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, description: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, balance: u64, maximum: u64, uri: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, royalty_payee_address: <b>address</b>, royalty_points_denominator: u64, royalty_points_numerator: u64, mutate_setting: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;bool&gt;, property_keys: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;, property_values: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;, property_types: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;)
+</code></pre>
+
+
+the length of 'mutate_setting' should maore than five.
+The creator of the TokenDataId is signer.
+The token_data_id should exist in the creator's collections..
+The sum of supply and mint Token is less than maximum.
+
+
+<pre><code><b>pragma</b> aborts_if_is_partial;
+<b>let</b> addr = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>);
+<b>let</b> token_data_id = <a href="token.md#0x3_token_spec_create_tokendata">spec_create_tokendata</a>(addr, collection, name);
+<b>let</b> creator_addr = token_data_id.creator;
+<b>let</b> all_token_data = <b>global</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator_addr).token_data;
+<b>let</b> token_data = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(all_token_data, token_data_id);
+<b>aborts_if</b> token_data_id.creator != addr;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator_addr);
+<b>aborts_if</b> balance &lt;= 0;
+<b>include</b> <a href="token.md#0x3_token_CreateTokenMutabilityConfigAbortsIf">CreateTokenMutabilityConfigAbortsIf</a>;
+<b>include</b> <a href="token.md#0x3_token_CreateTokenMutabilityConfigAbortsIf">CreateTokenMutabilityConfigAbortsIf</a>;
+</code></pre>
+
+
+
+
+<a id="0x3_token_spec_create_tokendata"></a>
+
+
+<pre><code><b>fun</b> <a href="token.md#0x3_token_spec_create_tokendata">spec_create_tokendata</a>(
+   creator: <b>address</b>,
+   collection: String,
+   name: String): <a href="token.md#0x3_token_TokenDataId">TokenDataId</a> {
+   <a href="token.md#0x3_token_TokenDataId">TokenDataId</a> { creator, collection, name }
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_mint_script"></a>
+
+### Function `mint_script`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="token.md#0x3_token_mint_script">mint_script</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, token_data_address: <b>address</b>, collection: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, amount: u64)
+</code></pre>
+
+
+only creator of the tokendata can mint tokens
+
+
+<pre><code><b>pragma</b> aborts_if_is_partial;
+<b>let</b> token_data_id = <a href="token.md#0x3_token_spec_create_token_data_id">spec_create_token_data_id</a>(
+    token_data_address,
+    collection,
+    name,
+);
+<b>let</b> addr = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>);
+<b>let</b> creator_addr = token_data_id.creator;
+<b>let</b> all_token_data = <b>global</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator_addr).token_data;
+<b>let</b> token_data = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(all_token_data, token_data_id);
+<b>aborts_if</b> token_data_id.creator != <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>);
+<b>include</b> <a href="token.md#0x3_token_CreateTokenDataIdAbortsIf">CreateTokenDataIdAbortsIf</a>{
+creator: token_data_address,
+collection: collection,
+name: name
+};
+<b>include</b> <a href="token.md#0x3_token_MintTokenAbortsIf">MintTokenAbortsIf</a> {
+token_data_id: token_data_id
+};
+</code></pre>
+
+
+
+<a id="@Specification_1_mutate_token_properties"></a>
+
+### Function `mutate_token_properties`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="token.md#0x3_token_mutate_token_properties">mutate_token_properties</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, token_owner: <b>address</b>, creator: <b>address</b>, collection_name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, token_name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, token_property_version: u64, amount: u64, keys: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;, values: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;, types: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;)
+</code></pre>
+
+
+The signer is creator.
+
+
+<pre><code><b>pragma</b> aborts_if_is_partial;
+<b>let</b> addr = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>);
+<b>aborts_if</b> addr != creator;
+<b>include</b> <a href="token.md#0x3_token_CreateTokenDataIdAbortsIf">CreateTokenDataIdAbortsIf</a> {
+    creator: creator,
+    collection: collection_name,
+    name: token_name
+};
+</code></pre>
+
+
+
+<a id="@Specification_1_direct_transfer_script"></a>
+
+### Function `direct_transfer_script`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="token.md#0x3_token_direct_transfer_script">direct_transfer_script</a>(sender: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, receiver: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, creators_address: <b>address</b>, collection: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, property_version: u64, amount: u64)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> aborts_if_is_partial;
+<b>include</b> <a href="token.md#0x3_token_CreateTokenDataIdAbortsIf">CreateTokenDataIdAbortsIf</a>{
+    creator: creators_address,
+    collection: collection,
+    name: name
+};
+</code></pre>
+
+
+
+<a id="@Specification_1_opt_in_direct_transfer"></a>
+
+### Function `opt_in_direct_transfer`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="token.md#0x3_token_opt_in_direct_transfer">opt_in_direct_transfer</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, opt_in: bool)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> aborts_if_is_partial;
+<b>let</b> addr = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>);
+<b>let</b> account_addr = <b>global</b>&lt;<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account_Account">account::Account</a>&gt;(addr);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="token.md#0x3_token_TokenStore">TokenStore</a>&gt;(addr) && !<b>exists</b>&lt;<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account_Account">account::Account</a>&gt;(addr);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="token.md#0x3_token_TokenStore">TokenStore</a>&gt;(addr) && account_addr.guid_creation_num + 4 &gt;= <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account_MAX_GUID_CREATION_NUM">account::MAX_GUID_CREATION_NUM</a>;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="token.md#0x3_token_TokenStore">TokenStore</a>&gt;(addr) && account_addr.guid_creation_num + 4 &gt; MAX_U64;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="token_event_store.md#0x3_token_event_store_TokenEventStoreV1">token_event_store::TokenEventStoreV1</a>&gt;(addr) && account_addr.guid_creation_num + 9 &gt; <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account_MAX_GUID_CREATION_NUM">account::MAX_GUID_CREATION_NUM</a>;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="token_event_store.md#0x3_token_event_store_TokenEventStoreV1">token_event_store::TokenEventStoreV1</a>&gt;(addr) && account_addr.guid_creation_num + 9 &gt; MAX_U64;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="token_event_store.md#0x3_token_event_store_TokenEventStoreV1">token_event_store::TokenEventStoreV1</a>&gt;(addr) && !<b>exists</b>&lt;<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account_Account">account::Account</a>&gt;(addr);
+</code></pre>
+
+
+
+<a id="@Specification_1_transfer_with_opt_in"></a>
+
+### Function `transfer_with_opt_in`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="token.md#0x3_token_transfer_with_opt_in">transfer_with_opt_in</a>(from: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, creator: <b>address</b>, collection_name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, token_name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, token_property_version: u64, <b>to</b>: <b>address</b>, amount: u64)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> aborts_if_is_partial;
+<b>include</b> <a href="token.md#0x3_token_CreateTokenDataIdAbortsIf">CreateTokenDataIdAbortsIf</a>{
+    creator: creator,
+    collection: collection_name,
+    name: token_name
+};
+</code></pre>
+
+
+
+<a id="@Specification_1_burn_by_creator"></a>
+
+### Function `burn_by_creator`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="token.md#0x3_token_burn_by_creator">burn_by_creator</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, owner: <b>address</b>, collection: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, property_version: u64, amount: u64)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> aborts_if_is_partial;
+<b>let</b> creator_address = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(creator);
+<b>let</b> token_id = <a href="token.md#0x3_token_spec_create_token_id_raw">spec_create_token_id_raw</a>(creator_address, collection, name, property_version);
+<b>let</b> creator_addr = token_id.token_data_id.creator;
+<b>let</b> collections = <b>borrow_global_mut</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator_address);
+<b>let</b> token_data = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(
+    collections.token_data,
+    token_id.token_data_id,
+);
+<b>aborts_if</b> amount &lt;= 0;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator_addr);
+<b>aborts_if</b> !<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_contains">table::spec_contains</a>(collections.token_data, token_id.token_data_id);
+<b>aborts_if</b> !<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(token_data.default_properties.map, std::string::spec_utf8(<a href="token.md#0x3_token_BURNABLE_BY_CREATOR">BURNABLE_BY_CREATOR</a>));
+</code></pre>
+
+
+
+<a id="@Specification_1_burn"></a>
+
+### Function `burn`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="token.md#0x3_token_burn">burn</a>(owner: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, creators_address: <b>address</b>, collection: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, property_version: u64, amount: u64)
+</code></pre>
+
+
+The token_data_id should exist in token_data.
+
+
+<pre><code><b>pragma</b> aborts_if_is_partial;
+<b>let</b> token_id = <a href="token.md#0x3_token_spec_create_token_id_raw">spec_create_token_id_raw</a>(creators_address, collection, name, property_version);
+<b>let</b> creator_addr = token_id.token_data_id.creator;
+<b>let</b> collections = <b>borrow_global_mut</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator_addr);
+<b>let</b> token_data = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(
+    collections.token_data,
+    token_id.token_data_id,
+);
+<b>include</b> <a href="token.md#0x3_token_CreateTokenDataIdAbortsIf">CreateTokenDataIdAbortsIf</a> {
+creator: creators_address
+};
+<b>aborts_if</b> amount &lt;= 0;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator_addr);
+<b>aborts_if</b> !<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_contains">table::spec_contains</a>(collections.token_data, token_id.token_data_id);
+<b>aborts_if</b> !<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(token_data.default_properties.map, std::string::spec_utf8(<a href="token.md#0x3_token_BURNABLE_BY_OWNER">BURNABLE_BY_OWNER</a>));
+<b>aborts_if</b> !<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_spec_internal_check_utf8">string::spec_internal_check_utf8</a>(<a href="token.md#0x3_token_BURNABLE_BY_OWNER">BURNABLE_BY_OWNER</a>);
+</code></pre>
+
+
+
+
+<a id="0x3_token_spec_create_token_id_raw"></a>
+
+
+<pre><code><b>fun</b> <a href="token.md#0x3_token_spec_create_token_id_raw">spec_create_token_id_raw</a>(
+   creator: <b>address</b>,
+   collection: String,
+   name: String,
+   property_version: u64,
+): <a href="token.md#0x3_token_TokenId">TokenId</a> {
+   <b>let</b> token_data_id = <a href="token.md#0x3_token_TokenDataId">TokenDataId</a> { creator, collection, name };
+   <a href="token.md#0x3_token_TokenId">TokenId</a> {
+       token_data_id,
+       property_version
+   }
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_mutate_collection_description"></a>
+
+### Function `mutate_collection_description`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_mutate_collection_description">mutate_collection_description</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, collection_name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, description: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>)
+</code></pre>
+
+
+The description of Collection is mutable.
+
+
+<pre><code><b>let</b> addr = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(creator);
+<b>let</b> <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a> = <b>global</b>&lt;<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account_Account">account::Account</a>&gt;(addr);
+<b>let</b> collection_data = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(<b>global</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(addr).collection_data, collection_name);
+<b>include</b> <a href="token.md#0x3_token_AssertCollectionExistsAbortsIf">AssertCollectionExistsAbortsIf</a> {
+    creator_address: addr,
+    collection_name: collection_name
+};
+<b>aborts_if</b> !collection_data.mutability_config.description;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="token_event_store.md#0x3_token_event_store_TokenEventStoreV1">token_event_store::TokenEventStoreV1</a>&gt;(addr) && !<b>exists</b>&lt;<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account_Account">account::Account</a>&gt;(addr);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="token_event_store.md#0x3_token_event_store_TokenEventStoreV1">token_event_store::TokenEventStoreV1</a>&gt;(addr) && <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>.guid_creation_num + 9 &gt;= <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account_MAX_GUID_CREATION_NUM">account::MAX_GUID_CREATION_NUM</a>;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="token_event_store.md#0x3_token_event_store_TokenEventStoreV1">token_event_store::TokenEventStoreV1</a>&gt;(addr) && <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>.guid_creation_num + 9 &gt; MAX_U64;
+</code></pre>
+
+
+
+<a id="@Specification_1_mutate_collection_uri"></a>
+
+### Function `mutate_collection_uri`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_mutate_collection_uri">mutate_collection_uri</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, collection_name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, uri: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>)
+</code></pre>
+
+
+The uri of Collection is mutable.
+
+
+<pre><code><b>let</b> addr = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(creator);
+<b>let</b> <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a> = <b>global</b>&lt;<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account_Account">account::Account</a>&gt;(addr);
+<b>let</b> collection_data = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(<b>global</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(addr).collection_data, collection_name);
+<b>aborts_if</b> len(uri.bytes) &gt; <a href="token.md#0x3_token_MAX_URI_LENGTH">MAX_URI_LENGTH</a>;
+<b>include</b> <a href="token.md#0x3_token_AssertCollectionExistsAbortsIf">AssertCollectionExistsAbortsIf</a> {
+    creator_address: addr,
+    collection_name: collection_name
+};
+<b>aborts_if</b> !collection_data.mutability_config.uri;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="token_event_store.md#0x3_token_event_store_TokenEventStoreV1">token_event_store::TokenEventStoreV1</a>&gt;(addr) && !<b>exists</b>&lt;<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account_Account">account::Account</a>&gt;(addr);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="token_event_store.md#0x3_token_event_store_TokenEventStoreV1">token_event_store::TokenEventStoreV1</a>&gt;(addr) && <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>.guid_creation_num + 9 &gt;= <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account_MAX_GUID_CREATION_NUM">account::MAX_GUID_CREATION_NUM</a>;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="token_event_store.md#0x3_token_event_store_TokenEventStoreV1">token_event_store::TokenEventStoreV1</a>&gt;(addr) && <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>.guid_creation_num + 9 &gt; MAX_U64;
+</code></pre>
+
+
+
+<a id="@Specification_1_mutate_collection_maximum"></a>
+
+### Function `mutate_collection_maximum`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_mutate_collection_maximum">mutate_collection_maximum</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, collection_name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, maximum: u64)
+</code></pre>
+
+
+Cannot change maximum from 0 and cannot change maximum to 0.
+The maximum should more than suply.
+The maxium of Collection is mutable.
+
+
+<pre><code><b>let</b> addr = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(creator);
+<b>let</b> <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a> = <b>global</b>&lt;<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account_Account">account::Account</a>&gt;(addr);
+<b>let</b> collection_data = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(<b>global</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(addr).collection_data, collection_name);
+<b>include</b> <a href="token.md#0x3_token_AssertCollectionExistsAbortsIf">AssertCollectionExistsAbortsIf</a> {
+    creator_address: addr,
+    collection_name: collection_name
+};
+<b>aborts_if</b> collection_data.maximum == 0 || maximum == 0;
+<b>aborts_if</b> maximum &lt; collection_data.supply;
+<b>aborts_if</b> !collection_data.mutability_config.maximum;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="token_event_store.md#0x3_token_event_store_TokenEventStoreV1">token_event_store::TokenEventStoreV1</a>&gt;(addr) && !<b>exists</b>&lt;<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account_Account">account::Account</a>&gt;(addr);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="token_event_store.md#0x3_token_event_store_TokenEventStoreV1">token_event_store::TokenEventStoreV1</a>&gt;(addr) && <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>.guid_creation_num + 9 &gt;= <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account_MAX_GUID_CREATION_NUM">account::MAX_GUID_CREATION_NUM</a>;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="token_event_store.md#0x3_token_event_store_TokenEventStoreV1">token_event_store::TokenEventStoreV1</a>&gt;(addr) && <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>.guid_creation_num + 9 &gt; MAX_U64;
+</code></pre>
+
+
+
+<a id="@Specification_1_mutate_tokendata_maximum"></a>
+
+### Function `mutate_tokendata_maximum`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_mutate_tokendata_maximum">mutate_tokendata_maximum</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, token_data_id: <a href="token.md#0x3_token_TokenDataId">token::TokenDataId</a>, maximum: u64)
+</code></pre>
+
+
+Cannot change maximum from 0 and cannot change maximum to 0.
+The maximum should more than suply.
+The token maximum is mutable
+
+
+<pre><code><b>let</b> addr = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(creator);
+<b>let</b> <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a> = <b>global</b>&lt;<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account_Account">account::Account</a>&gt;(addr);
+<b>let</b> all_token_data = <b>global</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(token_data_id.creator).token_data;
+<b>let</b> token_data = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(all_token_data, token_data_id);
+<b>include</b> <a href="token.md#0x3_token_AssertTokendataExistsAbortsIf">AssertTokendataExistsAbortsIf</a>;
+<b>aborts_if</b> token_data.maximum == 0 || maximum == 0;
+<b>aborts_if</b> maximum &lt; token_data.supply;
+<b>aborts_if</b> !token_data.mutability_config.maximum;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="token_event_store.md#0x3_token_event_store_TokenEventStoreV1">token_event_store::TokenEventStoreV1</a>&gt;(addr) && !<b>exists</b>&lt;<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account_Account">account::Account</a>&gt;(addr);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="token_event_store.md#0x3_token_event_store_TokenEventStoreV1">token_event_store::TokenEventStoreV1</a>&gt;(addr) && <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>.guid_creation_num + 9 &gt;= <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account_MAX_GUID_CREATION_NUM">account::MAX_GUID_CREATION_NUM</a>;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="token_event_store.md#0x3_token_event_store_TokenEventStoreV1">token_event_store::TokenEventStoreV1</a>&gt;(addr) && <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>.guid_creation_num + 9 &gt; MAX_U64;
+</code></pre>
+
+
+
+<a id="@Specification_1_mutate_tokendata_uri"></a>
+
+### Function `mutate_tokendata_uri`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_mutate_tokendata_uri">mutate_tokendata_uri</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, token_data_id: <a href="token.md#0x3_token_TokenDataId">token::TokenDataId</a>, uri: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>)
+</code></pre>
+
+
+The length of uri should less than MAX_URI_LENGTH.
+The  creator of token_data_id should exist in Collections.
+The token uri is mutable
+
+
+<pre><code><b>let</b> addr = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(creator);
+<b>let</b> <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a> = <b>global</b>&lt;<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account_Account">account::Account</a>&gt;(addr);
+<b>let</b> all_token_data = <b>global</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(token_data_id.creator).token_data;
+<b>let</b> token_data = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(all_token_data, token_data_id);
+<b>include</b> <a href="token.md#0x3_token_AssertTokendataExistsAbortsIf">AssertTokendataExistsAbortsIf</a>;
+<b>aborts_if</b> len(uri.bytes) &gt; <a href="token.md#0x3_token_MAX_URI_LENGTH">MAX_URI_LENGTH</a>;
+<b>aborts_if</b> !token_data.mutability_config.uri;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="token_event_store.md#0x3_token_event_store_TokenEventStoreV1">token_event_store::TokenEventStoreV1</a>&gt;(addr) && !<b>exists</b>&lt;<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account_Account">account::Account</a>&gt;(addr);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="token_event_store.md#0x3_token_event_store_TokenEventStoreV1">token_event_store::TokenEventStoreV1</a>&gt;(addr) && <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>.guid_creation_num + 9 &gt;= <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account_MAX_GUID_CREATION_NUM">account::MAX_GUID_CREATION_NUM</a>;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="token_event_store.md#0x3_token_event_store_TokenEventStoreV1">token_event_store::TokenEventStoreV1</a>&gt;(addr) && <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>.guid_creation_num + 9 &gt; MAX_U64;
+</code></pre>
+
+
+
+<a id="@Specification_1_mutate_tokendata_royalty"></a>
+
+### Function `mutate_tokendata_royalty`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_mutate_tokendata_royalty">mutate_tokendata_royalty</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, token_data_id: <a href="token.md#0x3_token_TokenDataId">token::TokenDataId</a>, royalty: <a href="token.md#0x3_token_Royalty">token::Royalty</a>)
+</code></pre>
+
+
+The token royalty is mutable
+
+
+<pre><code><b>include</b> <a href="token.md#0x3_token_AssertTokendataExistsAbortsIf">AssertTokendataExistsAbortsIf</a>;
+<b>let</b> addr = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(creator);
+<b>let</b> <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a> = <b>global</b>&lt;<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account_Account">account::Account</a>&gt;(addr);
+<b>let</b> all_token_data = <b>global</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(token_data_id.creator).token_data;
+<b>let</b> token_data = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(all_token_data, token_data_id);
+<b>aborts_if</b> !token_data.mutability_config.royalty;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="token_event_store.md#0x3_token_event_store_TokenEventStoreV1">token_event_store::TokenEventStoreV1</a>&gt;(addr) && !<b>exists</b>&lt;<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account_Account">account::Account</a>&gt;(addr);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="token_event_store.md#0x3_token_event_store_TokenEventStoreV1">token_event_store::TokenEventStoreV1</a>&gt;(addr) && <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>.guid_creation_num + 9 &gt;= <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account_MAX_GUID_CREATION_NUM">account::MAX_GUID_CREATION_NUM</a>;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="token_event_store.md#0x3_token_event_store_TokenEventStoreV1">token_event_store::TokenEventStoreV1</a>&gt;(addr) && <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>.guid_creation_num + 9 &gt; MAX_U64;
+</code></pre>
+
+
+
+<a id="@Specification_1_mutate_tokendata_description"></a>
+
+### Function `mutate_tokendata_description`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_mutate_tokendata_description">mutate_tokendata_description</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, token_data_id: <a href="token.md#0x3_token_TokenDataId">token::TokenDataId</a>, description: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>)
+</code></pre>
+
+
+The token description is mutable
+
+
+<pre><code><b>include</b> <a href="token.md#0x3_token_AssertTokendataExistsAbortsIf">AssertTokendataExistsAbortsIf</a>;
+<b>let</b> addr = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(creator);
+<b>let</b> <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a> = <b>global</b>&lt;<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account_Account">account::Account</a>&gt;(addr);
+<b>let</b> all_token_data = <b>global</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(token_data_id.creator).token_data;
+<b>let</b> token_data = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(all_token_data, token_data_id);
+<b>aborts_if</b> !token_data.mutability_config.description;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="token_event_store.md#0x3_token_event_store_TokenEventStoreV1">token_event_store::TokenEventStoreV1</a>&gt;(addr) && !<b>exists</b>&lt;<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account_Account">account::Account</a>&gt;(addr);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="token_event_store.md#0x3_token_event_store_TokenEventStoreV1">token_event_store::TokenEventStoreV1</a>&gt;(addr) && <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>.guid_creation_num + 9 &gt;= <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account_MAX_GUID_CREATION_NUM">account::MAX_GUID_CREATION_NUM</a>;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="token_event_store.md#0x3_token_event_store_TokenEventStoreV1">token_event_store::TokenEventStoreV1</a>&gt;(addr) && <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>.guid_creation_num + 9 &gt; MAX_U64;
+</code></pre>
+
+
+
+<a id="@Specification_1_mutate_tokendata_property"></a>
+
+### Function `mutate_tokendata_property`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_mutate_tokendata_property">mutate_tokendata_property</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, token_data_id: <a href="token.md#0x3_token_TokenDataId">token::TokenDataId</a>, keys: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;, values: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;, types: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;)
+</code></pre>
+
+
+The property map is mutable
+
+
+<pre><code><b>pragma</b> aborts_if_is_partial;
+<b>let</b> all_token_data = <b>global</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(token_data_id.creator).token_data;
+<b>let</b> token_data = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(all_token_data, token_data_id);
+<b>include</b> <a href="token.md#0x3_token_AssertTokendataExistsAbortsIf">AssertTokendataExistsAbortsIf</a>;
+<b>aborts_if</b> len(keys) != len(values);
+<b>aborts_if</b> len(keys) != len(types);
+<b>aborts_if</b> !token_data.mutability_config.properties;
+</code></pre>
+
+
+
+<a id="@Specification_1_mutate_one_token"></a>
+
+### Function `mutate_one_token`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_mutate_one_token">mutate_one_token</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, token_owner: <b>address</b>, token_id: <a href="token.md#0x3_token_TokenId">token::TokenId</a>, keys: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;, values: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;, types: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;): <a href="token.md#0x3_token_TokenId">token::TokenId</a>
+</code></pre>
+
+
+The signer is creator.
+The token_data_id should exist in token_data.
+The property map is mutable.
+
+
+<pre><code><b>pragma</b> aborts_if_is_partial;
+<b>let</b> creator = token_id.token_data_id.creator;
+<b>let</b> addr = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>);
+<b>let</b> all_token_data = <b>global</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator).token_data;
+<b>let</b> token_data = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(all_token_data, token_id.token_data_id);
+<b>aborts_if</b> addr != creator;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator);
+<b>aborts_if</b> !<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_contains">table::spec_contains</a>(all_token_data, token_id.token_data_id);
+<b>aborts_if</b> !token_data.mutability_config.properties && !<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/simple_map.md#0x1_simple_map_spec_contains_key">simple_map::spec_contains_key</a>(token_data.default_properties.map, std::string::spec_utf8(<a href="token.md#0x3_token_TOKEN_PROPERTY_MUTABLE">TOKEN_PROPERTY_MUTABLE</a>));
+</code></pre>
+
+
+
+<a id="@Specification_1_create_royalty"></a>
+
+### Function `create_royalty`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_create_royalty">create_royalty</a>(royalty_points_numerator: u64, royalty_points_denominator: u64, payee_address: <b>address</b>): <a href="token.md#0x3_token_Royalty">token::Royalty</a>
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="token.md#0x3_token_CreateRoyaltyAbortsIf">CreateRoyaltyAbortsIf</a>;
+</code></pre>
+
+
+The royalty_points_numerator should less than royalty_points_denominator.
+
+
+<a id="0x3_token_CreateRoyaltyAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="token.md#0x3_token_CreateRoyaltyAbortsIf">CreateRoyaltyAbortsIf</a> {
+    royalty_points_numerator: u64;
+    royalty_points_denominator: u64;
+    payee_address: <b>address</b>;
+    <b>aborts_if</b> royalty_points_numerator &gt; royalty_points_denominator;
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account_Account">account::Account</a>&gt;(payee_address);
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_deposit_token"></a>
+
+### Function `deposit_token`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_deposit_token">deposit_token</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, <a href="token.md#0x3_token">token</a>: <a href="token.md#0x3_token_Token">token::Token</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+<b>pragma</b> aborts_if_is_partial;
+<b>let</b> account_addr = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>);
+<b>include</b> !<b>exists</b>&lt;<a href="token.md#0x3_token_TokenStore">TokenStore</a>&gt;(account_addr) ==&gt; <a href="token.md#0x3_token_InitializeTokenStore">InitializeTokenStore</a>;
+<b>let</b> token_id = <a href="token.md#0x3_token">token</a>.id;
+<b>let</b> token_amount = <a href="token.md#0x3_token">token</a>.amount;
+<b>include</b> <a href="token.md#0x3_token_DirectDepositAbortsIf">DirectDepositAbortsIf</a>;
+</code></pre>
+
+
+
+<a id="@Specification_1_direct_deposit_with_opt_in"></a>
+
+### Function `direct_deposit_with_opt_in`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_direct_deposit_with_opt_in">direct_deposit_with_opt_in</a>(account_addr: <b>address</b>, <a href="token.md#0x3_token">token</a>: <a href="token.md#0x3_token_Token">token::Token</a>)
+</code></pre>
+
+
+The token can direct_transfer.
+
+
+<pre><code><b>let</b> opt_in_transfer = <b>global</b>&lt;<a href="token.md#0x3_token_TokenStore">TokenStore</a>&gt;(account_addr).direct_transfer;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="token.md#0x3_token_TokenStore">TokenStore</a>&gt;(account_addr);
+<b>aborts_if</b> !opt_in_transfer;
+<b>let</b> token_id = <a href="token.md#0x3_token">token</a>.id;
+<b>let</b> token_amount = <a href="token.md#0x3_token">token</a>.amount;
+<b>include</b> <a href="token.md#0x3_token_DirectDepositAbortsIf">DirectDepositAbortsIf</a>;
+</code></pre>
+
+
+
+<a id="@Specification_1_direct_transfer"></a>
+
+### Function `direct_transfer`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_direct_transfer">direct_transfer</a>(sender: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, receiver: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, token_id: <a href="token.md#0x3_token_TokenId">token::TokenId</a>, amount: u64)
+</code></pre>
+
+
+Cannot withdraw 0 tokens.
+Make sure the account has sufficient tokens to withdraw.
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_initialize_token_store"></a>
+
+### Function `initialize_token_store`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_initialize_token_store">initialize_token_store</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="token.md#0x3_token_InitializeTokenStore">InitializeTokenStore</a>;
+</code></pre>
+
+
+
+
+<a id="0x3_token_InitializeTokenStore"></a>
+
+
+<pre><code><b>schema</b> <a href="token.md#0x3_token_InitializeTokenStore">InitializeTokenStore</a> {
+    <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>;
+    <b>let</b> addr = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>);
+    <b>let</b> account_addr = <b>global</b>&lt;<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account_Account">account::Account</a>&gt;(addr);
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="token.md#0x3_token_TokenStore">TokenStore</a>&gt;(addr) && !<b>exists</b>&lt;<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account_Account">account::Account</a>&gt;(addr);
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="token.md#0x3_token_TokenStore">TokenStore</a>&gt;(addr) && account_addr.guid_creation_num + 4 &gt;= <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account_MAX_GUID_CREATION_NUM">account::MAX_GUID_CREATION_NUM</a>;
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="token.md#0x3_token_TokenStore">TokenStore</a>&gt;(addr) && account_addr.guid_creation_num + 4 &gt; MAX_U64;
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_merge"></a>
+
+### Function `merge`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_merge">merge</a>(dst_token: &<b>mut</b> <a href="token.md#0x3_token_Token">token::Token</a>, source_token: <a href="token.md#0x3_token_Token">token::Token</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> dst_token.id != source_token.id;
+<b>aborts_if</b> dst_token.amount + source_token.amount &gt; MAX_U64;
+</code></pre>
+
+
+
+<a id="@Specification_1_split"></a>
+
+### Function `split`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_split">split</a>(dst_token: &<b>mut</b> <a href="token.md#0x3_token_Token">token::Token</a>, amount: u64): <a href="token.md#0x3_token_Token">token::Token</a>
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> dst_token.id.property_version != 0;
+<b>aborts_if</b> dst_token.amount &lt;= amount;
+<b>aborts_if</b> amount &lt;= 0;
+</code></pre>
+
+
+
+<a id="@Specification_1_transfer"></a>
+
+### Function `transfer`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_transfer">transfer</a>(from: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, id: <a href="token.md#0x3_token_TokenId">token::TokenId</a>, <b>to</b>: <b>address</b>, amount: u64)
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> opt_in_transfer = <b>global</b>&lt;<a href="token.md#0x3_token_TokenStore">TokenStore</a>&gt;(<b>to</b>).direct_transfer;
+<b>let</b> account_addr = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(from);
+<b>aborts_if</b> !opt_in_transfer;
+<b>pragma</b> aborts_if_is_partial;
+<b>include</b> <a href="token.md#0x3_token_WithdrawWithEventInternalAbortsIf">WithdrawWithEventInternalAbortsIf</a>;
+</code></pre>
+
+
+
+<a id="@Specification_1_withdraw_with_capability"></a>
+
+### Function `withdraw_with_capability`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_withdraw_with_capability">withdraw_with_capability</a>(withdraw_proof: <a href="token.md#0x3_token_WithdrawCapability">token::WithdrawCapability</a>): <a href="token.md#0x3_token_Token">token::Token</a>
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> now_seconds = <b>global</b>&lt;<a href="../../../aptos-framework/tests/compiler-v2-doc/timestamp.md#0x1_timestamp_CurrentTimeMicroseconds">timestamp::CurrentTimeMicroseconds</a>&gt;(@aptos_framework).microseconds;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="../../../aptos-framework/tests/compiler-v2-doc/timestamp.md#0x1_timestamp_CurrentTimeMicroseconds">timestamp::CurrentTimeMicroseconds</a>&gt;(@aptos_framework);
+<b>aborts_if</b> now_seconds / <a href="../../../aptos-framework/tests/compiler-v2-doc/timestamp.md#0x1_timestamp_MICRO_CONVERSION_FACTOR">timestamp::MICRO_CONVERSION_FACTOR</a> &gt; withdraw_proof.expiration_sec;
+<b>include</b> <a href="token.md#0x3_token_WithdrawWithEventInternalAbortsIf">WithdrawWithEventInternalAbortsIf</a>{
+account_addr: withdraw_proof.token_owner,
+id: withdraw_proof.token_id,
+amount: withdraw_proof.amount};
+</code></pre>
+
+
+
+<a id="@Specification_1_partial_withdraw_with_capability"></a>
+
+### Function `partial_withdraw_with_capability`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_partial_withdraw_with_capability">partial_withdraw_with_capability</a>(withdraw_proof: <a href="token.md#0x3_token_WithdrawCapability">token::WithdrawCapability</a>, withdraw_amount: u64): (<a href="token.md#0x3_token_Token">token::Token</a>, <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="token.md#0x3_token_WithdrawCapability">token::WithdrawCapability</a>&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> now_seconds = <b>global</b>&lt;<a href="../../../aptos-framework/tests/compiler-v2-doc/timestamp.md#0x1_timestamp_CurrentTimeMicroseconds">timestamp::CurrentTimeMicroseconds</a>&gt;(@aptos_framework).microseconds;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="../../../aptos-framework/tests/compiler-v2-doc/timestamp.md#0x1_timestamp_CurrentTimeMicroseconds">timestamp::CurrentTimeMicroseconds</a>&gt;(@aptos_framework);
+<b>aborts_if</b> now_seconds / <a href="../../../aptos-framework/tests/compiler-v2-doc/timestamp.md#0x1_timestamp_MICRO_CONVERSION_FACTOR">timestamp::MICRO_CONVERSION_FACTOR</a> &gt; withdraw_proof.expiration_sec;
+<b>aborts_if</b> withdraw_amount &gt; withdraw_proof.amount;
+<b>include</b> <a href="token.md#0x3_token_WithdrawWithEventInternalAbortsIf">WithdrawWithEventInternalAbortsIf</a>{
+    account_addr: withdraw_proof.token_owner,
+    id: withdraw_proof.token_id,
+    amount: withdraw_amount
+};
+</code></pre>
+
+
+
+<a id="@Specification_1_withdraw_token"></a>
+
+### Function `withdraw_token`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_withdraw_token">withdraw_token</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, id: <a href="token.md#0x3_token_TokenId">token::TokenId</a>, amount: u64): <a href="token.md#0x3_token_Token">token::Token</a>
+</code></pre>
+
+
+Cannot withdraw 0 tokens.
+Make sure the account has sufficient tokens to withdraw.
+
+
+<pre><code><b>let</b> account_addr = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>);
+<b>include</b> <a href="token.md#0x3_token_WithdrawWithEventInternalAbortsIf">WithdrawWithEventInternalAbortsIf</a>;
+</code></pre>
+
+
+
+<a id="@Specification_1_create_collection"></a>
+
+### Function `create_collection`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_create_collection">create_collection</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, description: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, uri: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, maximum: u64, mutate_setting: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;bool&gt;)
+</code></pre>
+
+
+The length of the name is up to MAX_COLLECTION_NAME_LENGTH;
+The length of the uri is up to MAX_URI_LENGTH;
+The collection_data should not exist before you create it.
+
+
+<pre><code><b>pragma</b> aborts_if_is_partial;
+<b>let</b> account_addr = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(creator);
+<b>aborts_if</b> len(name.bytes) &gt; 128;
+<b>aborts_if</b> len(uri.bytes) &gt; 512;
+<b>include</b> <a href="token.md#0x3_token_CreateCollectionAbortsIf">CreateCollectionAbortsIf</a>;
+</code></pre>
+
+
+
+
+<a id="0x3_token_CreateCollectionAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="token.md#0x3_token_CreateCollectionAbortsIf">CreateCollectionAbortsIf</a> {
+    creator: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>;
+    name: String;
+    description: String;
+    uri: String;
+    maximum: u64;
+    mutate_setting: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;bool&gt;;
+    <b>let</b> addr = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(creator);
+    <b>let</b> <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a> = <b>global</b>&lt;<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account_Account">account::Account</a>&gt;(addr);
+    <b>let</b> collection = <b>global</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(addr);
+    <b>let</b> b = !<b>exists</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(addr);
+    <b>let</b> collection_data = <b>global</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(addr).collection_data;
+    <b>aborts_if</b> b && !<b>exists</b>&lt;<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account_Account">account::Account</a>&gt;(addr);
+    <b>aborts_if</b> len(name.bytes) &gt; <a href="token.md#0x3_token_MAX_COLLECTION_NAME_LENGTH">MAX_COLLECTION_NAME_LENGTH</a>;
+    <b>aborts_if</b> len(uri.bytes) &gt; <a href="token.md#0x3_token_MAX_URI_LENGTH">MAX_URI_LENGTH</a>;
+    <b>aborts_if</b> b && <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>.guid_creation_num + 3 &gt;= <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account_MAX_GUID_CREATION_NUM">account::MAX_GUID_CREATION_NUM</a>;
+    <b>aborts_if</b> b && <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>.guid_creation_num + 3 &gt; MAX_U64;
+    <b>include</b> <a href="token.md#0x3_token_CreateCollectionMutabilityConfigAbortsIf">CreateCollectionMutabilityConfigAbortsIf</a>;
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_check_collection_exists"></a>
+
+### Function `check_collection_exists`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_check_collection_exists">check_collection_exists</a>(creator: <b>address</b>, name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): bool
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator);
+</code></pre>
+
+
+
+<a id="@Specification_1_check_tokendata_exists"></a>
+
+### Function `check_tokendata_exists`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_check_tokendata_exists">check_tokendata_exists</a>(creator: <b>address</b>, collection_name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, token_name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): bool
+</code></pre>
+
+
+The length of collection should less than MAX_COLLECTION_NAME_LENGTH
+The length of name should less than MAX_NFT_NAME_LENGTH
+
+
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator);
+<b>include</b> <a href="token.md#0x3_token_CreateTokenDataIdAbortsIf">CreateTokenDataIdAbortsIf</a> {
+    creator: creator,
+    collection: collection_name,
+    name: token_name
+};
+</code></pre>
+
+
+
+<a id="@Specification_1_create_tokendata"></a>
+
+### Function `create_tokendata`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_create_tokendata">create_tokendata</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, collection: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, description: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, maximum: u64, uri: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, royalty_payee_address: <b>address</b>, royalty_points_denominator: u64, royalty_points_numerator: u64, token_mutate_config: <a href="token.md#0x3_token_TokenMutabilityConfig">token::TokenMutabilityConfig</a>, property_keys: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;, property_values: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;, property_types: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;): <a href="token.md#0x3_token_TokenDataId">token::TokenDataId</a>
+</code></pre>
+
+
+The length of collection should less than MAX_COLLECTION_NAME_LENGTH
+The length of name should less than MAX_NFT_NAME_LENGTH
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+<b>pragma</b> aborts_if_is_partial;
+<b>let</b> account_addr = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>);
+<b>let</b> collections = <b>global</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(account_addr);
+<b>let</b> token_data_id = <a href="token.md#0x3_token_spec_create_token_data_id">spec_create_token_data_id</a>(account_addr, collection, name);
+<b>let</b> Collection = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(collections.collection_data, token_data_id.collection);
+<b>let</b> length = len(property_keys);
+<b>aborts_if</b> len(name.bytes) &gt; <a href="token.md#0x3_token_MAX_NFT_NAME_LENGTH">MAX_NFT_NAME_LENGTH</a>;
+<b>aborts_if</b> len(collection.bytes) &gt; <a href="token.md#0x3_token_MAX_COLLECTION_NAME_LENGTH">MAX_COLLECTION_NAME_LENGTH</a>;
+<b>aborts_if</b> len(uri.bytes) &gt; <a href="token.md#0x3_token_MAX_URI_LENGTH">MAX_URI_LENGTH</a>;
+<b>aborts_if</b> royalty_points_numerator &gt; royalty_points_denominator;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(account_addr);
+<b>include</b> <a href="token.md#0x3_token_CreateTokenDataIdAbortsIf">CreateTokenDataIdAbortsIf</a> {
+    creator: account_addr,
+    collection: collection,
+    name: name
+};
+<b>aborts_if</b> !<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_contains">table::spec_contains</a>(collections.collection_data, collection);
+<b>aborts_if</b> <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_contains">table::spec_contains</a>(collections.token_data, token_data_id);
+<b>aborts_if</b> Collection.maximum &gt; 0 && Collection.supply + 1 &gt; MAX_U64;
+<b>aborts_if</b> Collection.maximum &gt; 0 && Collection.maximum &lt; Collection.supply + 1;
+<b>include</b> <a href="token.md#0x3_token_CreateRoyaltyAbortsIf">CreateRoyaltyAbortsIf</a> {
+    payee_address: royalty_payee_address
+};
+<b>aborts_if</b> length &gt; <a href="property_map.md#0x3_property_map_MAX_PROPERTY_MAP_SIZE">property_map::MAX_PROPERTY_MAP_SIZE</a>;
+<b>aborts_if</b> length != len(property_values);
+<b>aborts_if</b> length != len(property_types);
+</code></pre>
+
+
+
+
+<a id="0x3_token_spec_create_token_data_id"></a>
+
+
+<pre><code><b>fun</b> <a href="token.md#0x3_token_spec_create_token_data_id">spec_create_token_data_id</a>(
+   creator: <b>address</b>,
+   collection: String,
+   name: String,
+): <a href="token.md#0x3_token_TokenDataId">TokenDataId</a> {
+   <a href="token.md#0x3_token_TokenDataId">TokenDataId</a> { creator, collection, name }
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_get_collection_supply"></a>
+
+### Function `get_collection_supply`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_collection_supply">get_collection_supply</a>(creator_address: <b>address</b>, collection_name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;u64&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="token.md#0x3_token_AssertCollectionExistsAbortsIf">AssertCollectionExistsAbortsIf</a>;
+</code></pre>
+
+
+
+<a id="@Specification_1_get_collection_description"></a>
+
+### Function `get_collection_description`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_collection_description">get_collection_description</a>(creator_address: <b>address</b>, collection_name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="token.md#0x3_token_AssertCollectionExistsAbortsIf">AssertCollectionExistsAbortsIf</a>;
+</code></pre>
+
+
+
+<a id="@Specification_1_get_collection_uri"></a>
+
+### Function `get_collection_uri`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_collection_uri">get_collection_uri</a>(creator_address: <b>address</b>, collection_name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="token.md#0x3_token_AssertCollectionExistsAbortsIf">AssertCollectionExistsAbortsIf</a>;
+</code></pre>
+
+
+
+<a id="@Specification_1_get_collection_maximum"></a>
+
+### Function `get_collection_maximum`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_collection_maximum">get_collection_maximum</a>(creator_address: <b>address</b>, collection_name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): u64
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="token.md#0x3_token_AssertCollectionExistsAbortsIf">AssertCollectionExistsAbortsIf</a>;
+</code></pre>
+
+
+
+<a id="@Specification_1_get_token_supply"></a>
+
+### Function `get_token_supply`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_token_supply">get_token_supply</a>(creator_address: <b>address</b>, token_data_id: <a href="token.md#0x3_token_TokenDataId">token::TokenDataId</a>): <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;u64&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator_address);
+<b>let</b> all_token_data = <b>global</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator_address).token_data;
+<b>aborts_if</b> !<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_contains">table::spec_contains</a>(all_token_data, token_data_id);
+</code></pre>
+
+
+
+<a id="@Specification_1_get_tokendata_largest_property_version"></a>
+
+### Function `get_tokendata_largest_property_version`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_tokendata_largest_property_version">get_tokendata_largest_property_version</a>(creator_address: <b>address</b>, token_data_id: <a href="token.md#0x3_token_TokenDataId">token::TokenDataId</a>): u64
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator_address);
+<b>let</b> all_token_data = <b>global</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator_address).token_data;
+<b>aborts_if</b> !<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_contains">table::spec_contains</a>(all_token_data, token_data_id);
+</code></pre>
+
+
+
+<a id="@Specification_1_create_token_mutability_config"></a>
+
+### Function `create_token_mutability_config`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_create_token_mutability_config">create_token_mutability_config</a>(mutate_setting: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;bool&gt;): <a href="token.md#0x3_token_TokenMutabilityConfig">token::TokenMutabilityConfig</a>
+</code></pre>
+
+
+The length of 'mutate_setting' should more than five.
+The mutate_setting shuold have a value.
+
+
+<pre><code><b>include</b> <a href="token.md#0x3_token_CreateTokenMutabilityConfigAbortsIf">CreateTokenMutabilityConfigAbortsIf</a>;
+</code></pre>
+
+
+
+
+<a id="0x3_token_CreateTokenMutabilityConfigAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="token.md#0x3_token_CreateTokenMutabilityConfigAbortsIf">CreateTokenMutabilityConfigAbortsIf</a> {
+    mutate_setting: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;bool&gt;;
+    <b>aborts_if</b> len(mutate_setting) &lt; 5;
+    <b>aborts_if</b> !<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_spec_contains">vector::spec_contains</a>(mutate_setting, mutate_setting[<a href="token.md#0x3_token_TOKEN_MAX_MUTABLE_IND">TOKEN_MAX_MUTABLE_IND</a>]);
+    <b>aborts_if</b> !<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_spec_contains">vector::spec_contains</a>(mutate_setting, mutate_setting[<a href="token.md#0x3_token_TOKEN_URI_MUTABLE_IND">TOKEN_URI_MUTABLE_IND</a>]);
+    <b>aborts_if</b> !<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_spec_contains">vector::spec_contains</a>(mutate_setting, mutate_setting[<a href="token.md#0x3_token_TOKEN_ROYALTY_MUTABLE_IND">TOKEN_ROYALTY_MUTABLE_IND</a>]);
+    <b>aborts_if</b> !<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_spec_contains">vector::spec_contains</a>(mutate_setting, mutate_setting[<a href="token.md#0x3_token_TOKEN_DESCRIPTION_MUTABLE_IND">TOKEN_DESCRIPTION_MUTABLE_IND</a>]);
+    <b>aborts_if</b> !<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_spec_contains">vector::spec_contains</a>(mutate_setting, mutate_setting[<a href="token.md#0x3_token_TOKEN_PROPERTY_MUTABLE_IND">TOKEN_PROPERTY_MUTABLE_IND</a>]);
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_create_collection_mutability_config"></a>
+
+### Function `create_collection_mutability_config`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_create_collection_mutability_config">create_collection_mutability_config</a>(mutate_setting: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;bool&gt;): <a href="token.md#0x3_token_CollectionMutabilityConfig">token::CollectionMutabilityConfig</a>
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="token.md#0x3_token_CreateCollectionMutabilityConfigAbortsIf">CreateCollectionMutabilityConfigAbortsIf</a>;
+</code></pre>
+
+
+
+
+<a id="0x3_token_CreateCollectionMutabilityConfigAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="token.md#0x3_token_CreateCollectionMutabilityConfigAbortsIf">CreateCollectionMutabilityConfigAbortsIf</a> {
+    mutate_setting: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;bool&gt;;
+    <b>aborts_if</b> len(mutate_setting) &lt; 3;
+    <b>aborts_if</b> !<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_spec_contains">vector::spec_contains</a>(mutate_setting, mutate_setting[<a href="token.md#0x3_token_COLLECTION_DESCRIPTION_MUTABLE_IND">COLLECTION_DESCRIPTION_MUTABLE_IND</a>]);
+    <b>aborts_if</b> !<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_spec_contains">vector::spec_contains</a>(mutate_setting, mutate_setting[<a href="token.md#0x3_token_COLLECTION_URI_MUTABLE_IND">COLLECTION_URI_MUTABLE_IND</a>]);
+    <b>aborts_if</b> !<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector_spec_contains">vector::spec_contains</a>(mutate_setting, mutate_setting[<a href="token.md#0x3_token_COLLECTION_MAX_MUTABLE_IND">COLLECTION_MAX_MUTABLE_IND</a>]);
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_mint_token"></a>
+
+### Function `mint_token`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_mint_token">mint_token</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, token_data_id: <a href="token.md#0x3_token_TokenDataId">token::TokenDataId</a>, amount: u64): <a href="token.md#0x3_token_TokenId">token::TokenId</a>
+</code></pre>
+
+
+The creator of the TokenDataId is signer.
+The token_data_id should exist in the creator's collections..
+The sum of supply and the amount of mint Token is less than maximum.
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+
+<a id="0x3_token_MintTokenAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="token.md#0x3_token_MintTokenAbortsIf">MintTokenAbortsIf</a> {
+    <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>;
+    token_data_id: <a href="token.md#0x3_token_TokenDataId">TokenDataId</a>;
+    amount: u64;
+    <b>let</b> addr = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>);
+    <b>let</b> creator_addr = token_data_id.creator;
+    <b>let</b> all_token_data = <b>global</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator_addr).token_data;
+    <b>let</b> token_data = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(all_token_data, token_data_id);
+    <b>aborts_if</b> token_data_id.creator != addr;
+    <b>aborts_if</b> !<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_contains">table::spec_contains</a>(all_token_data, token_data_id);
+    <b>aborts_if</b> token_data.maximum &gt; 0 && token_data.supply + amount &gt; token_data.maximum;
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator_addr);
+    <b>aborts_if</b> amount &lt;= 0;
+    <b>include</b> <a href="token.md#0x3_token_InitializeTokenStore">InitializeTokenStore</a>;
+    <b>let</b> token_id = <a href="token.md#0x3_token_create_token_id">create_token_id</a>(token_data_id, 0);
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_mint_token_to"></a>
+
+### Function `mint_token_to`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_mint_token_to">mint_token_to</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, receiver: <b>address</b>, token_data_id: <a href="token.md#0x3_token_TokenDataId">token::TokenDataId</a>, amount: u64)
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> addr = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>);
+<b>let</b> opt_in_transfer = <b>global</b>&lt;<a href="token.md#0x3_token_TokenStore">TokenStore</a>&gt;(receiver).direct_transfer;
+<b>let</b> creator_addr = token_data_id.creator;
+<b>let</b> all_token_data = <b>global</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator_addr).token_data;
+<b>let</b> token_data = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(all_token_data, token_data_id);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="token.md#0x3_token_TokenStore">TokenStore</a>&gt;(receiver);
+<b>aborts_if</b> !opt_in_transfer;
+<b>aborts_if</b> token_data_id.creator != addr;
+<b>aborts_if</b> !<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_contains">table::spec_contains</a>(all_token_data, token_data_id);
+<b>aborts_if</b> token_data.maximum &gt; 0 && token_data.supply + amount &gt; token_data.maximum;
+<b>aborts_if</b> amount &lt;= 0;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator_addr);
+<b>let</b> token_id = <a href="token.md#0x3_token_create_token_id">create_token_id</a>(token_data_id, 0);
+<b>include</b> <a href="token.md#0x3_token_DirectDepositAbortsIf">DirectDepositAbortsIf</a> {
+    account_addr: receiver,
+    token_id: token_id,
+    token_amount: amount,
+};
+</code></pre>
+
+
+
+<a id="@Specification_1_create_token_data_id"></a>
+
+### Function `create_token_data_id`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_create_token_data_id">create_token_data_id</a>(creator: <b>address</b>, collection: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): <a href="token.md#0x3_token_TokenDataId">token::TokenDataId</a>
+</code></pre>
+
+
+The length of collection should less than MAX_COLLECTION_NAME_LENGTH
+The length of name should less than MAX_NFT_NAME_LENGTH
+
+
+<pre><code><b>include</b> <a href="token.md#0x3_token_CreateTokenDataIdAbortsIf">CreateTokenDataIdAbortsIf</a>;
+</code></pre>
+
+
+
+
+<a id="0x3_token_CreateTokenDataIdAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="token.md#0x3_token_CreateTokenDataIdAbortsIf">CreateTokenDataIdAbortsIf</a> {
+    creator: <b>address</b>;
+    collection: String;
+    name: String;
+    <b>aborts_if</b> len(collection.bytes) &gt; <a href="token.md#0x3_token_MAX_COLLECTION_NAME_LENGTH">MAX_COLLECTION_NAME_LENGTH</a>;
+    <b>aborts_if</b> len(name.bytes) &gt; <a href="token.md#0x3_token_MAX_NFT_NAME_LENGTH">MAX_NFT_NAME_LENGTH</a>;
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_create_token_id_raw"></a>
+
+### Function `create_token_id_raw`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_create_token_id_raw">create_token_id_raw</a>(creator: <b>address</b>, collection: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, property_version: u64): <a href="token.md#0x3_token_TokenId">token::TokenId</a>
+</code></pre>
+
+
+The length of collection should less than MAX_COLLECTION_NAME_LENGTH
+The length of name should less than MAX_NFT_NAME_LENGTH
+
+
+<pre><code><b>include</b> <a href="token.md#0x3_token_CreateTokenDataIdAbortsIf">CreateTokenDataIdAbortsIf</a>;
+</code></pre>
+
+
+
+
+<a id="0x3_token_spec_balance_of"></a>
+
+
+<pre><code><b>fun</b> <a href="token.md#0x3_token_spec_balance_of">spec_balance_of</a>(owner: <b>address</b>, id: <a href="token.md#0x3_token_TokenId">TokenId</a>): u64 {
+   <b>let</b> token_store = <b>borrow_global</b>&lt;<a href="token.md#0x3_token_TokenStore">TokenStore</a>&gt;(owner);
+   <b>if</b> (!<b>exists</b>&lt;<a href="token.md#0x3_token_TokenStore">TokenStore</a>&gt;(owner)) {
+       0
+   }
+   <b>else</b> <b>if</b> (<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_contains">table::spec_contains</a>(token_store.tokens, id)) {
+       <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(token_store.tokens, id).amount
+   } <b>else</b> {
+       0
+   }
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_get_royalty"></a>
+
+### Function `get_royalty`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_royalty">get_royalty</a>(token_id: <a href="token.md#0x3_token_TokenId">token::TokenId</a>): <a href="token.md#0x3_token_Royalty">token::Royalty</a>
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="token.md#0x3_token_GetTokendataRoyaltyAbortsIf">GetTokendataRoyaltyAbortsIf</a> {
+    token_data_id: token_id.token_data_id
+};
+</code></pre>
+
+
+
+<a id="@Specification_1_get_property_map"></a>
+
+### Function `get_property_map`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_property_map">get_property_map</a>(owner: <b>address</b>, token_id: <a href="token.md#0x3_token_TokenId">token::TokenId</a>): <a href="property_map.md#0x3_property_map_PropertyMap">property_map::PropertyMap</a>
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> creator_addr = token_id.token_data_id.creator;
+<b>let</b> all_token_data = <b>global</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator_addr).token_data;
+<b>aborts_if</b> <a href="token.md#0x3_token_spec_balance_of">spec_balance_of</a>(owner, token_id) &lt;= 0;
+<b>aborts_if</b> token_id.property_version == 0 && !<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_contains">table::spec_contains</a>(all_token_data, token_id.token_data_id);
+<b>aborts_if</b> token_id.property_version == 0 && !<b>exists</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator_addr);
+</code></pre>
+
+
+
+<a id="@Specification_1_get_tokendata_maximum"></a>
+
+### Function `get_tokendata_maximum`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_tokendata_maximum">get_tokendata_maximum</a>(token_data_id: <a href="token.md#0x3_token_TokenDataId">token::TokenDataId</a>): u64
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> creator_address = token_data_id.creator;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator_address);
+<b>let</b> all_token_data = <b>global</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator_address).token_data;
+<b>aborts_if</b> !<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_contains">table::spec_contains</a>(all_token_data, token_data_id);
+</code></pre>
+
+
+
+<a id="@Specification_1_get_tokendata_uri"></a>
+
+### Function `get_tokendata_uri`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_tokendata_uri">get_tokendata_uri</a>(creator: <b>address</b>, token_data_id: <a href="token.md#0x3_token_TokenDataId">token::TokenDataId</a>): <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator);
+<b>let</b> all_token_data = <b>global</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator).token_data;
+<b>aborts_if</b> !<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_contains">table::spec_contains</a>(all_token_data, token_data_id);
+</code></pre>
+
+
+
+<a id="@Specification_1_get_tokendata_description"></a>
+
+### Function `get_tokendata_description`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_tokendata_description">get_tokendata_description</a>(token_data_id: <a href="token.md#0x3_token_TokenDataId">token::TokenDataId</a>): <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> creator_address = token_data_id.creator;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator_address);
+<b>let</b> all_token_data = <b>global</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator_address).token_data;
+<b>aborts_if</b> !<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_contains">table::spec_contains</a>(all_token_data, token_data_id);
+</code></pre>
+
+
+
+<a id="@Specification_1_get_tokendata_royalty"></a>
+
+### Function `get_tokendata_royalty`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_tokendata_royalty">get_tokendata_royalty</a>(token_data_id: <a href="token.md#0x3_token_TokenDataId">token::TokenDataId</a>): <a href="token.md#0x3_token_Royalty">token::Royalty</a>
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="token.md#0x3_token_GetTokendataRoyaltyAbortsIf">GetTokendataRoyaltyAbortsIf</a>;
+</code></pre>
+
+
+
+
+<a id="0x3_token_GetTokendataRoyaltyAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="token.md#0x3_token_GetTokendataRoyaltyAbortsIf">GetTokendataRoyaltyAbortsIf</a> {
+    token_data_id: <a href="token.md#0x3_token_TokenDataId">TokenDataId</a>;
+    <b>let</b> creator_address = token_data_id.creator;
+    <b>let</b> all_token_data = <b>global</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator_address).token_data;
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator_address);
+    <b>aborts_if</b> !<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_contains">table::spec_contains</a>(all_token_data, token_data_id);
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_get_tokendata_mutability_config"></a>
+
+### Function `get_tokendata_mutability_config`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_tokendata_mutability_config">get_tokendata_mutability_config</a>(token_data_id: <a href="token.md#0x3_token_TokenDataId">token::TokenDataId</a>): <a href="token.md#0x3_token_TokenMutabilityConfig">token::TokenMutabilityConfig</a>
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> creator_addr = token_data_id.creator;
+<b>let</b> all_token_data = <b>global</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator_addr).token_data;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator_addr);
+<b>aborts_if</b> !<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_contains">table::spec_contains</a>(all_token_data, token_data_id);
+</code></pre>
+
+
+
+<a id="@Specification_1_get_collection_mutability_config"></a>
+
+### Function `get_collection_mutability_config`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="token.md#0x3_token_get_collection_mutability_config">get_collection_mutability_config</a>(creator: <b>address</b>, collection_name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>): <a href="token.md#0x3_token_CollectionMutabilityConfig">token::CollectionMutabilityConfig</a>
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> all_collection_data = <b>global</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator).collection_data;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator);
+<b>aborts_if</b> !<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_contains">table::spec_contains</a>(all_collection_data, collection_name);
+</code></pre>
+
+
+
+<a id="@Specification_1_withdraw_with_event_internal"></a>
+
+### Function `withdraw_with_event_internal`
+
+
+<pre><code><b>fun</b> <a href="token.md#0x3_token_withdraw_with_event_internal">withdraw_with_event_internal</a>(account_addr: <b>address</b>, id: <a href="token.md#0x3_token_TokenId">token::TokenId</a>, amount: u64): <a href="token.md#0x3_token_Token">token::Token</a>
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="token.md#0x3_token_WithdrawWithEventInternalAbortsIf">WithdrawWithEventInternalAbortsIf</a>;
+</code></pre>
+
+
+
+
+<a id="0x3_token_WithdrawWithEventInternalAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="token.md#0x3_token_WithdrawWithEventInternalAbortsIf">WithdrawWithEventInternalAbortsIf</a> {
+    account_addr: <b>address</b>;
+    id: <a href="token.md#0x3_token_TokenId">TokenId</a>;
+    amount: u64;
+    <b>let</b> tokens = <b>global</b>&lt;<a href="token.md#0x3_token_TokenStore">TokenStore</a>&gt;(account_addr).tokens;
+    <b>aborts_if</b> amount &lt;= 0;
+    <b>aborts_if</b> <a href="token.md#0x3_token_spec_balance_of">spec_balance_of</a>(account_addr, id) &lt; amount;
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="token.md#0x3_token_TokenStore">TokenStore</a>&gt;(account_addr);
+    <b>aborts_if</b> !<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_contains">table::spec_contains</a>(tokens, id);
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_update_token_property_internal"></a>
+
+### Function `update_token_property_internal`
+
+
+<pre><code><b>fun</b> <a href="token.md#0x3_token_update_token_property_internal">update_token_property_internal</a>(token_owner: <b>address</b>, token_id: <a href="token.md#0x3_token_TokenId">token::TokenId</a>, keys: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;, values: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;, types: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> aborts_if_is_partial;
+<b>let</b> tokens = <b>global</b>&lt;<a href="token.md#0x3_token_TokenStore">TokenStore</a>&gt;(token_owner).tokens;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="token.md#0x3_token_TokenStore">TokenStore</a>&gt;(token_owner);
+<b>aborts_if</b> !<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_contains">table::spec_contains</a>(tokens, token_id);
+</code></pre>
+
+
+
+<a id="@Specification_1_direct_deposit"></a>
+
+### Function `direct_deposit`
+
+
+<pre><code><b>fun</b> <a href="token.md#0x3_token_direct_deposit">direct_deposit</a>(account_addr: <b>address</b>, <a href="token.md#0x3_token">token</a>: <a href="token.md#0x3_token_Token">token::Token</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>let</b> token_id = <a href="token.md#0x3_token">token</a>.id;
+<b>let</b> token_amount = <a href="token.md#0x3_token">token</a>.amount;
+<b>include</b> <a href="token.md#0x3_token_DirectDepositAbortsIf">DirectDepositAbortsIf</a>;
+</code></pre>
+
+
+
+
+<a id="0x3_token_DirectDepositAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="token.md#0x3_token_DirectDepositAbortsIf">DirectDepositAbortsIf</a> {
+    account_addr: <b>address</b>;
+    token_id: <a href="token.md#0x3_token_TokenId">TokenId</a>;
+    token_amount: u64;
+    <b>let</b> token_store = <b>global</b>&lt;<a href="token.md#0x3_token_TokenStore">TokenStore</a>&gt;(account_addr);
+    <b>let</b> recipient_token = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(token_store.tokens, token_id);
+    <b>let</b> b = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_contains">table::spec_contains</a>(token_store.tokens, token_id);
+    <b>aborts_if</b> token_amount &lt;= 0;
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="token.md#0x3_token_TokenStore">TokenStore</a>&gt;(account_addr);
+    <b>aborts_if</b> b && recipient_token.id != token_id;
+    <b>aborts_if</b> b && recipient_token.amount + token_amount &gt; MAX_U64;
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_assert_collection_exists"></a>
+
+### Function `assert_collection_exists`
+
+
+<pre><code><b>fun</b> <a href="token.md#0x3_token_assert_collection_exists">assert_collection_exists</a>(creator_address: <b>address</b>, collection_name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>)
+</code></pre>
+
+
+The collection_name should exist in collection_data of the creator_address's Collections.
+
+
+<pre><code><b>include</b> <a href="token.md#0x3_token_AssertCollectionExistsAbortsIf">AssertCollectionExistsAbortsIf</a>;
+</code></pre>
+
+
+
+
+<a id="0x3_token_AssertCollectionExistsAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="token.md#0x3_token_AssertCollectionExistsAbortsIf">AssertCollectionExistsAbortsIf</a> {
+    creator_address: <b>address</b>;
+    collection_name: String;
+    <b>let</b> all_collection_data = <b>global</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator_address).collection_data;
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator_address);
+    <b>aborts_if</b> !<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_contains">table::spec_contains</a>(all_collection_data, collection_name);
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_assert_tokendata_exists"></a>
+
+### Function `assert_tokendata_exists`
+
+
+<pre><code><b>fun</b> <a href="token.md#0x3_token_assert_tokendata_exists">assert_tokendata_exists</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, token_data_id: <a href="token.md#0x3_token_TokenDataId">token::TokenDataId</a>)
+</code></pre>
+
+
+The creator of token_data_id should be signer.
+The  creator of token_data_id exists in Collections.
+The token_data_id is in the all_token_data.
+
+
+<pre><code><b>include</b> <a href="token.md#0x3_token_AssertTokendataExistsAbortsIf">AssertTokendataExistsAbortsIf</a>;
+</code></pre>
+
+
+
+
+<a id="0x3_token_AssertTokendataExistsAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="token.md#0x3_token_AssertTokendataExistsAbortsIf">AssertTokendataExistsAbortsIf</a> {
+    creator: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>;
+    token_data_id: <a href="token.md#0x3_token_TokenDataId">TokenDataId</a>;
+    <b>let</b> creator_addr = token_data_id.creator;
+    <b>let</b> addr = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(creator);
+    <b>aborts_if</b> addr != creator_addr;
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator_addr);
+    <b>let</b> all_token_data = <b>global</b>&lt;<a href="token.md#0x3_token_Collections">Collections</a>&gt;(creator_addr).token_data;
+    <b>aborts_if</b> !<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_contains">table::spec_contains</a>(all_token_data, token_data_id);
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_assert_non_standard_reserved_property"></a>
+
+### Function `assert_non_standard_reserved_property`
+
+
+<pre><code><b>fun</b> <a href="token.md#0x3_token_assert_non_standard_reserved_property">assert_non_standard_reserved_property</a>(keys: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_initialize_token_script"></a>
+
+### Function `initialize_token_script`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="token.md#0x3_token_initialize_token_script">initialize_token_script</a>(_account: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+Deprecated function
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_initialize_token"></a>
+
+### Function `initialize_token`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x3_token_initialize_token">initialize_token</a>(_account: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, _token_id: <a href="token.md#0x3_token_TokenId">token::TokenId</a>)
+</code></pre>
+
+
+Deprecated function
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-token/tests/compiler-v2-doc/token_coin_swap.md b/aptos-move/framework/aptos-token/tests/compiler-v2-doc/token_coin_swap.md
new file mode 100644
index 0000000000000..5d66a8ffd04c8
--- /dev/null
+++ b/aptos-move/framework/aptos-token/tests/compiler-v2-doc/token_coin_swap.md
@@ -0,0 +1,633 @@
+
+<a id="0x3_token_coin_swap"></a>
+
+# Module `0x3::token_coin_swap`
+
+Deprecated module
+
+
+-  [Struct `TokenCoinSwap`](#0x3_token_coin_swap_TokenCoinSwap)
+-  [Resource `TokenListings`](#0x3_token_coin_swap_TokenListings)
+-  [Struct `TokenEscrow`](#0x3_token_coin_swap_TokenEscrow)
+-  [Resource `TokenStoreEscrow`](#0x3_token_coin_swap_TokenStoreEscrow)
+-  [Struct `TokenListingEvent`](#0x3_token_coin_swap_TokenListingEvent)
+-  [Struct `TokenSwapEvent`](#0x3_token_coin_swap_TokenSwapEvent)
+-  [Constants](#@Constants_0)
+-  [Function `does_listing_exist`](#0x3_token_coin_swap_does_listing_exist)
+-  [Function `exchange_coin_for_token`](#0x3_token_coin_swap_exchange_coin_for_token)
+-  [Function `list_token_for_swap`](#0x3_token_coin_swap_list_token_for_swap)
+-  [Function `initialize_token_listing`](#0x3_token_coin_swap_initialize_token_listing)
+-  [Function `initialize_token_store_escrow`](#0x3_token_coin_swap_initialize_token_store_escrow)
+-  [Function `deposit_token_to_escrow`](#0x3_token_coin_swap_deposit_token_to_escrow)
+-  [Function `withdraw_token_from_escrow_internal`](#0x3_token_coin_swap_withdraw_token_from_escrow_internal)
+-  [Function `withdraw_token_from_escrow`](#0x3_token_coin_swap_withdraw_token_from_escrow)
+-  [Function `cancel_token_listing`](#0x3_token_coin_swap_cancel_token_listing)
+-  [Specification](#@Specification_1)
+
+
+<pre><code><b>use</b> <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event">0x1::event</a>;
+<b>use</b> <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string">0x1::string</a>;
+<b>use</b> <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table">0x1::table</a>;
+<b>use</b> <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info">0x1::type_info</a>;
+<b>use</b> <a href="token.md#0x3_token">0x3::token</a>;
+</code></pre>
+
+
+
+<a id="0x3_token_coin_swap_TokenCoinSwap"></a>
+
+## Struct `TokenCoinSwap`
+
+TokenCoinSwap records a swap ask for swapping token_amount with CoinType with a minimal price per token
+
+
+<pre><code><b>struct</b> <a href="token_coin_swap.md#0x3_token_coin_swap_TokenCoinSwap">TokenCoinSwap</a>&lt;CoinType&gt; <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>token_amount: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>min_price_per_token: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x3_token_coin_swap_TokenListings"></a>
+
+## Resource `TokenListings`
+
+The listing of all tokens for swapping stored at token owner's account
+
+
+<pre><code><b>struct</b> <a href="token_coin_swap.md#0x3_token_coin_swap_TokenListings">TokenListings</a>&lt;CoinType&gt; <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>listings: <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_Table">table::Table</a>&lt;<a href="token.md#0x3_token_TokenId">token::TokenId</a>, <a href="token_coin_swap.md#0x3_token_coin_swap_TokenCoinSwap">token_coin_swap::TokenCoinSwap</a>&lt;CoinType&gt;&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>listing_events: <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="token_coin_swap.md#0x3_token_coin_swap_TokenListingEvent">token_coin_swap::TokenListingEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>swap_events: <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="token_coin_swap.md#0x3_token_coin_swap_TokenSwapEvent">token_coin_swap::TokenSwapEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x3_token_coin_swap_TokenEscrow"></a>
+
+## Struct `TokenEscrow`
+
+TokenEscrow holds the tokens that cannot be withdrawn or transferred
+
+
+<pre><code><b>struct</b> <a href="token_coin_swap.md#0x3_token_coin_swap_TokenEscrow">TokenEscrow</a> <b>has</b> store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code><a href="token.md#0x3_token">token</a>: <a href="token.md#0x3_token_Token">token::Token</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>locked_until_secs: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x3_token_coin_swap_TokenStoreEscrow"></a>
+
+## Resource `TokenStoreEscrow`
+
+TokenStoreEscrow holds a map of token id to their tokenEscrow
+
+
+<pre><code><b>struct</b> <a href="token_coin_swap.md#0x3_token_coin_swap_TokenStoreEscrow">TokenStoreEscrow</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>token_escrows: <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_Table">table::Table</a>&lt;<a href="token.md#0x3_token_TokenId">token::TokenId</a>, <a href="token_coin_swap.md#0x3_token_coin_swap_TokenEscrow">token_coin_swap::TokenEscrow</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x3_token_coin_swap_TokenListingEvent"></a>
+
+## Struct `TokenListingEvent`
+
+
+
+<pre><code><b>struct</b> <a href="token_coin_swap.md#0x3_token_coin_swap_TokenListingEvent">TokenListingEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>token_id: <a href="token.md#0x3_token_TokenId">token::TokenId</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>amount: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>min_price: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>locked_until_secs: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>coin_type_info: <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_TypeInfo">type_info::TypeInfo</a></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x3_token_coin_swap_TokenSwapEvent"></a>
+
+## Struct `TokenSwapEvent`
+
+
+
+<pre><code><b>struct</b> <a href="token_coin_swap.md#0x3_token_coin_swap_TokenSwapEvent">TokenSwapEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>token_id: <a href="token.md#0x3_token_TokenId">token::TokenId</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>token_buyer: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>token_amount: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>coin_amount: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>coin_type_info: <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/type_info.md#0x1_type_info_TypeInfo">type_info::TypeInfo</a></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x3_token_coin_swap_EDEPRECATED_MODULE"></a>
+
+Deprecated module
+
+
+<pre><code><b>const</b> <a href="token_coin_swap.md#0x3_token_coin_swap_EDEPRECATED_MODULE">EDEPRECATED_MODULE</a>: u64 = 8;
+</code></pre>
+
+
+
+<a id="0x3_token_coin_swap_ENOT_ENOUGH_COIN"></a>
+
+Not enough coin to buy token
+
+
+<pre><code><b>const</b> <a href="token_coin_swap.md#0x3_token_coin_swap_ENOT_ENOUGH_COIN">ENOT_ENOUGH_COIN</a>: u64 = 7;
+</code></pre>
+
+
+
+<a id="0x3_token_coin_swap_ETOKEN_ALREADY_LISTED"></a>
+
+Token already listed
+
+
+<pre><code><b>const</b> <a href="token_coin_swap.md#0x3_token_coin_swap_ETOKEN_ALREADY_LISTED">ETOKEN_ALREADY_LISTED</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x3_token_coin_swap_ETOKEN_AMOUNT_NOT_MATCH"></a>
+
+Token buy amount doesn't match listing amount
+
+
+<pre><code><b>const</b> <a href="token_coin_swap.md#0x3_token_coin_swap_ETOKEN_AMOUNT_NOT_MATCH">ETOKEN_AMOUNT_NOT_MATCH</a>: u64 = 6;
+</code></pre>
+
+
+
+<a id="0x3_token_coin_swap_ETOKEN_CANNOT_MOVE_OUT_OF_ESCROW_BEFORE_LOCKUP_TIME"></a>
+
+Token cannot be moved out of escrow before the lockup time
+
+
+<pre><code><b>const</b> <a href="token_coin_swap.md#0x3_token_coin_swap_ETOKEN_CANNOT_MOVE_OUT_OF_ESCROW_BEFORE_LOCKUP_TIME">ETOKEN_CANNOT_MOVE_OUT_OF_ESCROW_BEFORE_LOCKUP_TIME</a>: u64 = 4;
+</code></pre>
+
+
+
+<a id="0x3_token_coin_swap_ETOKEN_LISTING_NOT_EXIST"></a>
+
+Token listing no longer exists
+
+
+<pre><code><b>const</b> <a href="token_coin_swap.md#0x3_token_coin_swap_ETOKEN_LISTING_NOT_EXIST">ETOKEN_LISTING_NOT_EXIST</a>: u64 = 2;
+</code></pre>
+
+
+
+<a id="0x3_token_coin_swap_ETOKEN_MIN_PRICE_NOT_MATCH"></a>
+
+Token buy price doesn't match listing price
+
+
+<pre><code><b>const</b> <a href="token_coin_swap.md#0x3_token_coin_swap_ETOKEN_MIN_PRICE_NOT_MATCH">ETOKEN_MIN_PRICE_NOT_MATCH</a>: u64 = 5;
+</code></pre>
+
+
+
+<a id="0x3_token_coin_swap_ETOKEN_NOT_IN_ESCROW"></a>
+
+Token is not in escrow
+
+
+<pre><code><b>const</b> <a href="token_coin_swap.md#0x3_token_coin_swap_ETOKEN_NOT_IN_ESCROW">ETOKEN_NOT_IN_ESCROW</a>: u64 = 3;
+</code></pre>
+
+
+
+<a id="0x3_token_coin_swap_does_listing_exist"></a>
+
+## Function `does_listing_exist`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token_coin_swap.md#0x3_token_coin_swap_does_listing_exist">does_listing_exist</a>&lt;CoinType&gt;(_token_owner: <b>address</b>, _token_id: <a href="token.md#0x3_token_TokenId">token::TokenId</a>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token_coin_swap.md#0x3_token_coin_swap_does_listing_exist">does_listing_exist</a>&lt;CoinType&gt;(
+    _token_owner: <b>address</b>,
+    _token_id: TokenId
+): bool {
+    <b>abort</b> <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="token_coin_swap.md#0x3_token_coin_swap_EDEPRECATED_MODULE">EDEPRECATED_MODULE</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_coin_swap_exchange_coin_for_token"></a>
+
+## Function `exchange_coin_for_token`
+
+Coin owner withdraw coin to swap with tokens listed for swapping at the token owner's address.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token_coin_swap.md#0x3_token_coin_swap_exchange_coin_for_token">exchange_coin_for_token</a>&lt;CoinType&gt;(_coin_owner: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, _coin_amount: u64, _token_owner: <b>address</b>, _creators_address: <b>address</b>, _collection: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, _name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, _property_version: u64, _token_amount: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token_coin_swap.md#0x3_token_coin_swap_exchange_coin_for_token">exchange_coin_for_token</a>&lt;CoinType&gt;(
+    _coin_owner: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    _coin_amount: u64,
+    _token_owner: <b>address</b>,
+    _creators_address: <b>address</b>,
+    _collection: String,
+    _name: String,
+    _property_version: u64,
+    _token_amount: u64,
+) {
+    <b>abort</b> <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="token_coin_swap.md#0x3_token_coin_swap_EDEPRECATED_MODULE">EDEPRECATED_MODULE</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_coin_swap_list_token_for_swap"></a>
+
+## Function `list_token_for_swap`
+
+Token owner lists their token for swapping
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="token_coin_swap.md#0x3_token_coin_swap_list_token_for_swap">list_token_for_swap</a>&lt;CoinType&gt;(_token_owner: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, _creators_address: <b>address</b>, _collection: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, _name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, _property_version: u64, _token_amount: u64, _min_coin_per_token: u64, _locked_until_secs: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="token_coin_swap.md#0x3_token_coin_swap_list_token_for_swap">list_token_for_swap</a>&lt;CoinType&gt;(
+    _token_owner: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    _creators_address: <b>address</b>,
+    _collection: String,
+    _name: String,
+    _property_version: u64,
+    _token_amount: u64,
+    _min_coin_per_token: u64,
+    _locked_until_secs: u64
+) {
+    <b>abort</b> <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="token_coin_swap.md#0x3_token_coin_swap_EDEPRECATED_MODULE">EDEPRECATED_MODULE</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_coin_swap_initialize_token_listing"></a>
+
+## Function `initialize_token_listing`
+
+Initalize the token listing for a token owner
+
+
+<pre><code><b>fun</b> <a href="token_coin_swap.md#0x3_token_coin_swap_initialize_token_listing">initialize_token_listing</a>&lt;CoinType&gt;(_token_owner: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="token_coin_swap.md#0x3_token_coin_swap_initialize_token_listing">initialize_token_listing</a>&lt;CoinType&gt;(_token_owner: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>) {
+    <b>abort</b> <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="token_coin_swap.md#0x3_token_coin_swap_EDEPRECATED_MODULE">EDEPRECATED_MODULE</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_coin_swap_initialize_token_store_escrow"></a>
+
+## Function `initialize_token_store_escrow`
+
+Intialize the token escrow
+
+
+<pre><code><b>fun</b> <a href="token_coin_swap.md#0x3_token_coin_swap_initialize_token_store_escrow">initialize_token_store_escrow</a>(_token_owner: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="token_coin_swap.md#0x3_token_coin_swap_initialize_token_store_escrow">initialize_token_store_escrow</a>(_token_owner: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>) {
+    <b>abort</b> <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="token_coin_swap.md#0x3_token_coin_swap_EDEPRECATED_MODULE">EDEPRECATED_MODULE</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_coin_swap_deposit_token_to_escrow"></a>
+
+## Function `deposit_token_to_escrow`
+
+Put the token into escrow that cannot be transferred or withdrawed by the owner.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token_coin_swap.md#0x3_token_coin_swap_deposit_token_to_escrow">deposit_token_to_escrow</a>(_token_owner: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, _token_id: <a href="token.md#0x3_token_TokenId">token::TokenId</a>, _tokens: <a href="token.md#0x3_token_Token">token::Token</a>, _locked_until_secs: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token_coin_swap.md#0x3_token_coin_swap_deposit_token_to_escrow">deposit_token_to_escrow</a>(
+    _token_owner: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    _token_id: TokenId,
+    _tokens: Token,
+    _locked_until_secs: u64
+) {
+    <b>abort</b> <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="token_coin_swap.md#0x3_token_coin_swap_EDEPRECATED_MODULE">EDEPRECATED_MODULE</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_coin_swap_withdraw_token_from_escrow_internal"></a>
+
+## Function `withdraw_token_from_escrow_internal`
+
+Private function for withdraw tokens from an escrow stored in token owner address
+
+
+<pre><code><b>fun</b> <a href="token_coin_swap.md#0x3_token_coin_swap_withdraw_token_from_escrow_internal">withdraw_token_from_escrow_internal</a>(_token_owner_addr: <b>address</b>, _token_id: <a href="token.md#0x3_token_TokenId">token::TokenId</a>, _amount: u64): <a href="token.md#0x3_token_Token">token::Token</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="token_coin_swap.md#0x3_token_coin_swap_withdraw_token_from_escrow_internal">withdraw_token_from_escrow_internal</a>(
+    _token_owner_addr: <b>address</b>,
+    _token_id: TokenId,
+    _amount: u64
+): Token {
+    <b>abort</b> <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="token_coin_swap.md#0x3_token_coin_swap_EDEPRECATED_MODULE">EDEPRECATED_MODULE</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_coin_swap_withdraw_token_from_escrow"></a>
+
+## Function `withdraw_token_from_escrow`
+
+Withdraw tokens from the token escrow. It needs a signer to authorize
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token_coin_swap.md#0x3_token_coin_swap_withdraw_token_from_escrow">withdraw_token_from_escrow</a>(_token_owner: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, _token_id: <a href="token.md#0x3_token_TokenId">token::TokenId</a>, _amount: u64): <a href="token.md#0x3_token_Token">token::Token</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token_coin_swap.md#0x3_token_coin_swap_withdraw_token_from_escrow">withdraw_token_from_escrow</a>(
+    _token_owner: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    _token_id: TokenId,
+    _amount: u64
+): Token {
+    <b>abort</b> <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="token_coin_swap.md#0x3_token_coin_swap_EDEPRECATED_MODULE">EDEPRECATED_MODULE</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_coin_swap_cancel_token_listing"></a>
+
+## Function `cancel_token_listing`
+
+Cancel token listing for a fixed amount
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token_coin_swap.md#0x3_token_coin_swap_cancel_token_listing">cancel_token_listing</a>&lt;CoinType&gt;(_token_owner: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, _token_id: <a href="token.md#0x3_token_TokenId">token::TokenId</a>, _token_amount: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token_coin_swap.md#0x3_token_coin_swap_cancel_token_listing">cancel_token_listing</a>&lt;CoinType&gt;(
+    _token_owner: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    _token_id: TokenId,
+    _token_amount: u64,
+) {
+    <b>abort</b> <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="token_coin_swap.md#0x3_token_coin_swap_EDEPRECATED_MODULE">EDEPRECATED_MODULE</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-token/tests/compiler-v2-doc/token_event_store.md b/aptos-move/framework/aptos-token/tests/compiler-v2-doc/token_event_store.md
new file mode 100644
index 0000000000000..031fefa26208c
--- /dev/null
+++ b/aptos-move/framework/aptos-token/tests/compiler-v2-doc/token_event_store.md
@@ -0,0 +1,1787 @@
+
+<a id="0x3_token_event_store"></a>
+
+# Module `0x3::token_event_store`
+
+This module provides utils to add and emit new token events that are not in token.move
+
+
+-  [Struct `CollectionDescriptionMutateEvent`](#0x3_token_event_store_CollectionDescriptionMutateEvent)
+-  [Struct `CollectionDescriptionMutate`](#0x3_token_event_store_CollectionDescriptionMutate)
+-  [Struct `CollectionUriMutateEvent`](#0x3_token_event_store_CollectionUriMutateEvent)
+-  [Struct `CollectionUriMutate`](#0x3_token_event_store_CollectionUriMutate)
+-  [Struct `CollectionMaxiumMutateEvent`](#0x3_token_event_store_CollectionMaxiumMutateEvent)
+-  [Struct `CollectionMaxiumMutate`](#0x3_token_event_store_CollectionMaxiumMutate)
+-  [Struct `OptInTransferEvent`](#0x3_token_event_store_OptInTransferEvent)
+-  [Struct `OptInTransfer`](#0x3_token_event_store_OptInTransfer)
+-  [Struct `UriMutationEvent`](#0x3_token_event_store_UriMutationEvent)
+-  [Struct `UriMutation`](#0x3_token_event_store_UriMutation)
+-  [Struct `DefaultPropertyMutateEvent`](#0x3_token_event_store_DefaultPropertyMutateEvent)
+-  [Struct `DefaultPropertyMutate`](#0x3_token_event_store_DefaultPropertyMutate)
+-  [Struct `DescriptionMutateEvent`](#0x3_token_event_store_DescriptionMutateEvent)
+-  [Struct `DescriptionMutate`](#0x3_token_event_store_DescriptionMutate)
+-  [Struct `RoyaltyMutateEvent`](#0x3_token_event_store_RoyaltyMutateEvent)
+-  [Struct `RoyaltyMutate`](#0x3_token_event_store_RoyaltyMutate)
+-  [Struct `MaxiumMutateEvent`](#0x3_token_event_store_MaxiumMutateEvent)
+-  [Struct `MaximumMutate`](#0x3_token_event_store_MaximumMutate)
+-  [Resource `TokenEventStoreV1`](#0x3_token_event_store_TokenEventStoreV1)
+-  [Function `initialize_token_event_store`](#0x3_token_event_store_initialize_token_event_store)
+-  [Function `emit_collection_uri_mutate_event`](#0x3_token_event_store_emit_collection_uri_mutate_event)
+-  [Function `emit_collection_description_mutate_event`](#0x3_token_event_store_emit_collection_description_mutate_event)
+-  [Function `emit_collection_maximum_mutate_event`](#0x3_token_event_store_emit_collection_maximum_mutate_event)
+-  [Function `emit_token_opt_in_event`](#0x3_token_event_store_emit_token_opt_in_event)
+-  [Function `emit_token_uri_mutate_event`](#0x3_token_event_store_emit_token_uri_mutate_event)
+-  [Function `emit_default_property_mutate_event`](#0x3_token_event_store_emit_default_property_mutate_event)
+-  [Function `emit_token_descrition_mutate_event`](#0x3_token_event_store_emit_token_descrition_mutate_event)
+-  [Function `emit_token_royalty_mutate_event`](#0x3_token_event_store_emit_token_royalty_mutate_event)
+-  [Function `emit_token_maximum_mutate_event`](#0x3_token_event_store_emit_token_maximum_mutate_event)
+-  [Specification](#@Specification_0)
+    -  [Function `initialize_token_event_store`](#@Specification_0_initialize_token_event_store)
+    -  [Function `emit_collection_uri_mutate_event`](#@Specification_0_emit_collection_uri_mutate_event)
+    -  [Function `emit_collection_description_mutate_event`](#@Specification_0_emit_collection_description_mutate_event)
+    -  [Function `emit_collection_maximum_mutate_event`](#@Specification_0_emit_collection_maximum_mutate_event)
+    -  [Function `emit_token_opt_in_event`](#@Specification_0_emit_token_opt_in_event)
+    -  [Function `emit_token_uri_mutate_event`](#@Specification_0_emit_token_uri_mutate_event)
+    -  [Function `emit_default_property_mutate_event`](#@Specification_0_emit_default_property_mutate_event)
+    -  [Function `emit_token_descrition_mutate_event`](#@Specification_0_emit_token_descrition_mutate_event)
+    -  [Function `emit_token_royalty_mutate_event`](#@Specification_0_emit_token_royalty_mutate_event)
+    -  [Function `emit_token_maximum_mutate_event`](#@Specification_0_emit_token_maximum_mutate_event)
+
+
+<pre><code><b>use</b> <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">0x1::account</a>;
+<b>use</b> <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/any.md#0x1_any">0x1::any</a>;
+<b>use</b> <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event">0x1::event</a>;
+<b>use</b> <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features">0x1::features</a>;
+<b>use</b> <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option">0x1::option</a>;
+<b>use</b> <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">0x1::signer</a>;
+<b>use</b> <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string">0x1::string</a>;
+<b>use</b> <a href="property_map.md#0x3_property_map">0x3::property_map</a>;
+</code></pre>
+
+
+
+<a id="0x3_token_event_store_CollectionDescriptionMutateEvent"></a>
+
+## Struct `CollectionDescriptionMutateEvent`
+
+Event emitted when collection description is mutated
+
+
+<pre><code><b>struct</b> <a href="token_event_store.md#0x3_token_event_store_CollectionDescriptionMutateEvent">CollectionDescriptionMutateEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>creator_addr: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>collection_name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>old_description: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>new_description: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x3_token_event_store_CollectionDescriptionMutate"></a>
+
+## Struct `CollectionDescriptionMutate`
+
+Event emitted when collection description is mutated
+
+
+<pre><code>#[<a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event">event</a>]
+<b>struct</b> <a href="token_event_store.md#0x3_token_event_store_CollectionDescriptionMutate">CollectionDescriptionMutate</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>creator_addr: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>collection_name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>old_description: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>new_description: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x3_token_event_store_CollectionUriMutateEvent"></a>
+
+## Struct `CollectionUriMutateEvent`
+
+Event emitted when collection uri is mutated
+
+
+<pre><code><b>struct</b> <a href="token_event_store.md#0x3_token_event_store_CollectionUriMutateEvent">CollectionUriMutateEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>creator_addr: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>collection_name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>old_uri: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>new_uri: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x3_token_event_store_CollectionUriMutate"></a>
+
+## Struct `CollectionUriMutate`
+
+Event emitted when collection uri is mutated
+
+
+<pre><code>#[<a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event">event</a>]
+<b>struct</b> <a href="token_event_store.md#0x3_token_event_store_CollectionUriMutate">CollectionUriMutate</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>creator_addr: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>collection_name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>old_uri: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>new_uri: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x3_token_event_store_CollectionMaxiumMutateEvent"></a>
+
+## Struct `CollectionMaxiumMutateEvent`
+
+Event emitted when the collection maximum is mutated
+
+
+<pre><code><b>struct</b> <a href="token_event_store.md#0x3_token_event_store_CollectionMaxiumMutateEvent">CollectionMaxiumMutateEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>creator_addr: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>collection_name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>old_maximum: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>new_maximum: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x3_token_event_store_CollectionMaxiumMutate"></a>
+
+## Struct `CollectionMaxiumMutate`
+
+Event emitted when the collection maximum is mutated
+
+
+<pre><code>#[<a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event">event</a>]
+<b>struct</b> <a href="token_event_store.md#0x3_token_event_store_CollectionMaxiumMutate">CollectionMaxiumMutate</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>creator_addr: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>collection_name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>old_maximum: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>new_maximum: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x3_token_event_store_OptInTransferEvent"></a>
+
+## Struct `OptInTransferEvent`
+
+Event emitted when an user opt-in the direct transfer
+
+
+<pre><code><b>struct</b> <a href="token_event_store.md#0x3_token_event_store_OptInTransferEvent">OptInTransferEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>opt_in: bool</code>
+</dt>
+<dd>
+ True if the user opt in, false if the user opt-out
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x3_token_event_store_OptInTransfer"></a>
+
+## Struct `OptInTransfer`
+
+Event emitted when an user opt-in the direct transfer
+
+
+<pre><code>#[<a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event">event</a>]
+<b>struct</b> <a href="token_event_store.md#0x3_token_event_store_OptInTransfer">OptInTransfer</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>account_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>opt_in: bool</code>
+</dt>
+<dd>
+ True if the user opt in, false if the user opt-out
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x3_token_event_store_UriMutationEvent"></a>
+
+## Struct `UriMutationEvent`
+
+Event emitted when the tokendata uri mutates
+
+
+<pre><code><b>struct</b> <a href="token_event_store.md#0x3_token_event_store_UriMutationEvent">UriMutationEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>creator: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>collection: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code><a href="token.md#0x3_token">token</a>: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>old_uri: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>new_uri: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x3_token_event_store_UriMutation"></a>
+
+## Struct `UriMutation`
+
+Event emitted when the tokendata uri mutates
+
+
+<pre><code>#[<a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event">event</a>]
+<b>struct</b> <a href="token_event_store.md#0x3_token_event_store_UriMutation">UriMutation</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>creator: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>collection: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code><a href="token.md#0x3_token">token</a>: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>old_uri: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>new_uri: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x3_token_event_store_DefaultPropertyMutateEvent"></a>
+
+## Struct `DefaultPropertyMutateEvent`
+
+Event emitted when mutating the default the token properties stored at tokendata
+
+
+<pre><code><b>struct</b> <a href="token_event_store.md#0x3_token_event_store_DefaultPropertyMutateEvent">DefaultPropertyMutateEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>creator: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>collection: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code><a href="token.md#0x3_token">token</a>: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>keys: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>old_values: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="property_map.md#0x3_property_map_PropertyValue">property_map::PropertyValue</a>&gt;&gt;</code>
+</dt>
+<dd>
+ we allow upsert so the old values might be none
+</dd>
+<dt>
+<code>new_values: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="property_map.md#0x3_property_map_PropertyValue">property_map::PropertyValue</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x3_token_event_store_DefaultPropertyMutate"></a>
+
+## Struct `DefaultPropertyMutate`
+
+Event emitted when mutating the default the token properties stored at tokendata
+
+
+<pre><code>#[<a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event">event</a>]
+<b>struct</b> <a href="token_event_store.md#0x3_token_event_store_DefaultPropertyMutate">DefaultPropertyMutate</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>creator: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>collection: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code><a href="token.md#0x3_token">token</a>: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>keys: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>old_values: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="property_map.md#0x3_property_map_PropertyValue">property_map::PropertyValue</a>&gt;&gt;</code>
+</dt>
+<dd>
+ we allow upsert so the old values might be none
+</dd>
+<dt>
+<code>new_values: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="property_map.md#0x3_property_map_PropertyValue">property_map::PropertyValue</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x3_token_event_store_DescriptionMutateEvent"></a>
+
+## Struct `DescriptionMutateEvent`
+
+Event emitted when the tokendata description is mutated
+
+
+<pre><code><b>struct</b> <a href="token_event_store.md#0x3_token_event_store_DescriptionMutateEvent">DescriptionMutateEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>creator: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>collection: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code><a href="token.md#0x3_token">token</a>: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>old_description: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>new_description: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x3_token_event_store_DescriptionMutate"></a>
+
+## Struct `DescriptionMutate`
+
+Event emitted when the tokendata description is mutated
+
+
+<pre><code>#[<a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event">event</a>]
+<b>struct</b> <a href="token_event_store.md#0x3_token_event_store_DescriptionMutate">DescriptionMutate</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>creator: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>collection: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code><a href="token.md#0x3_token">token</a>: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>old_description: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>new_description: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x3_token_event_store_RoyaltyMutateEvent"></a>
+
+## Struct `RoyaltyMutateEvent`
+
+Event emitted when the token royalty is mutated
+
+
+<pre><code><b>struct</b> <a href="token_event_store.md#0x3_token_event_store_RoyaltyMutateEvent">RoyaltyMutateEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>creator: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>collection: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code><a href="token.md#0x3_token">token</a>: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>old_royalty_numerator: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>old_royalty_denominator: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>old_royalty_payee_addr: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>new_royalty_numerator: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>new_royalty_denominator: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>new_royalty_payee_addr: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x3_token_event_store_RoyaltyMutate"></a>
+
+## Struct `RoyaltyMutate`
+
+Event emitted when the token royalty is mutated
+
+
+<pre><code>#[<a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event">event</a>]
+<b>struct</b> <a href="token_event_store.md#0x3_token_event_store_RoyaltyMutate">RoyaltyMutate</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>creator: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>collection: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code><a href="token.md#0x3_token">token</a>: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>old_royalty_numerator: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>old_royalty_denominator: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>old_royalty_payee_addr: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>new_royalty_numerator: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>new_royalty_denominator: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>new_royalty_payee_addr: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x3_token_event_store_MaxiumMutateEvent"></a>
+
+## Struct `MaxiumMutateEvent`
+
+Event emitted when the token maximum is mutated
+
+
+<pre><code><b>struct</b> <a href="token_event_store.md#0x3_token_event_store_MaxiumMutateEvent">MaxiumMutateEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>creator: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>collection: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code><a href="token.md#0x3_token">token</a>: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>old_maximum: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>new_maximum: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x3_token_event_store_MaximumMutate"></a>
+
+## Struct `MaximumMutate`
+
+Event emitted when the token maximum is mutated
+
+
+<pre><code>#[<a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event">event</a>]
+<b>struct</b> <a href="token_event_store.md#0x3_token_event_store_MaximumMutate">MaximumMutate</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>creator: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>collection: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code><a href="token.md#0x3_token">token</a>: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>old_maximum: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>new_maximum: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x3_token_event_store_TokenEventStoreV1"></a>
+
+## Resource `TokenEventStoreV1`
+
+
+
+<pre><code><b>struct</b> <a href="token_event_store.md#0x3_token_event_store_TokenEventStoreV1">TokenEventStoreV1</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>collection_uri_mutate_events: <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="token_event_store.md#0x3_token_event_store_CollectionUriMutateEvent">token_event_store::CollectionUriMutateEvent</a>&gt;</code>
+</dt>
+<dd>
+ collection mutation events
+</dd>
+<dt>
+<code>collection_maximum_mutate_events: <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="token_event_store.md#0x3_token_event_store_CollectionMaxiumMutateEvent">token_event_store::CollectionMaxiumMutateEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>collection_description_mutate_events: <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="token_event_store.md#0x3_token_event_store_CollectionDescriptionMutateEvent">token_event_store::CollectionDescriptionMutateEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>opt_in_events: <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="token_event_store.md#0x3_token_event_store_OptInTransferEvent">token_event_store::OptInTransferEvent</a>&gt;</code>
+</dt>
+<dd>
+ token transfer opt-in event
+</dd>
+<dt>
+<code>uri_mutate_events: <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="token_event_store.md#0x3_token_event_store_UriMutationEvent">token_event_store::UriMutationEvent</a>&gt;</code>
+</dt>
+<dd>
+ token mutation events
+</dd>
+<dt>
+<code>default_property_mutate_events: <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="token_event_store.md#0x3_token_event_store_DefaultPropertyMutateEvent">token_event_store::DefaultPropertyMutateEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>description_mutate_events: <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="token_event_store.md#0x3_token_event_store_DescriptionMutateEvent">token_event_store::DescriptionMutateEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>royalty_mutate_events: <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="token_event_store.md#0x3_token_event_store_RoyaltyMutateEvent">token_event_store::RoyaltyMutateEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>maximum_mutate_events: <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="token_event_store.md#0x3_token_event_store_MaxiumMutateEvent">token_event_store::MaxiumMutateEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>extension: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/any.md#0x1_any_Any">any::Any</a>&gt;</code>
+</dt>
+<dd>
+ This is for adding new events in future
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x3_token_event_store_initialize_token_event_store"></a>
+
+## Function `initialize_token_event_store`
+
+
+
+<pre><code><b>fun</b> <a href="token_event_store.md#0x3_token_event_store_initialize_token_event_store">initialize_token_event_store</a>(acct: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="token_event_store.md#0x3_token_event_store_initialize_token_event_store">initialize_token_event_store</a>(acct: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>){
+    <b>if</b> (!<b>exists</b>&lt;<a href="token_event_store.md#0x3_token_event_store_TokenEventStoreV1">TokenEventStoreV1</a>&gt;(<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(acct))) {
+        <b>move_to</b>(acct, <a href="token_event_store.md#0x3_token_event_store_TokenEventStoreV1">TokenEventStoreV1</a> {
+            collection_uri_mutate_events: <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account_new_event_handle">account::new_event_handle</a>&lt;<a href="token_event_store.md#0x3_token_event_store_CollectionUriMutateEvent">CollectionUriMutateEvent</a>&gt;(acct),
+            collection_maximum_mutate_events: <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account_new_event_handle">account::new_event_handle</a>&lt;<a href="token_event_store.md#0x3_token_event_store_CollectionMaxiumMutateEvent">CollectionMaxiumMutateEvent</a>&gt;(acct),
+            collection_description_mutate_events: <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account_new_event_handle">account::new_event_handle</a>&lt;<a href="token_event_store.md#0x3_token_event_store_CollectionDescriptionMutateEvent">CollectionDescriptionMutateEvent</a>&gt;(acct),
+            opt_in_events: <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account_new_event_handle">account::new_event_handle</a>&lt;<a href="token_event_store.md#0x3_token_event_store_OptInTransferEvent">OptInTransferEvent</a>&gt;(acct),
+            uri_mutate_events: <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account_new_event_handle">account::new_event_handle</a>&lt;<a href="token_event_store.md#0x3_token_event_store_UriMutationEvent">UriMutationEvent</a>&gt;(acct),
+            default_property_mutate_events: <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account_new_event_handle">account::new_event_handle</a>&lt;<a href="token_event_store.md#0x3_token_event_store_DefaultPropertyMutateEvent">DefaultPropertyMutateEvent</a>&gt;(acct),
+            description_mutate_events: <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account_new_event_handle">account::new_event_handle</a>&lt;<a href="token_event_store.md#0x3_token_event_store_DescriptionMutateEvent">DescriptionMutateEvent</a>&gt;(acct),
+            royalty_mutate_events: <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account_new_event_handle">account::new_event_handle</a>&lt;<a href="token_event_store.md#0x3_token_event_store_RoyaltyMutateEvent">RoyaltyMutateEvent</a>&gt;(acct),
+            maximum_mutate_events: <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account_new_event_handle">account::new_event_handle</a>&lt;<a href="token_event_store.md#0x3_token_event_store_MaxiumMutateEvent">MaxiumMutateEvent</a>&gt;(acct),
+            extension: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_none">option::none</a>&lt;Any&gt;(),
+        });
+    };
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_event_store_emit_collection_uri_mutate_event"></a>
+
+## Function `emit_collection_uri_mutate_event`
+
+Emit the collection uri mutation event
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="token_event_store.md#0x3_token_event_store_emit_collection_uri_mutate_event">emit_collection_uri_mutate_event</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, collection: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, old_uri: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, new_uri: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="token_event_store.md#0x3_token_event_store_emit_collection_uri_mutate_event">emit_collection_uri_mutate_event</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, collection: String, old_uri: String, new_uri: String) <b>acquires</b> <a href="token_event_store.md#0x3_token_event_store_TokenEventStoreV1">TokenEventStoreV1</a> {
+    <b>let</b> <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event">event</a> = <a href="token_event_store.md#0x3_token_event_store_CollectionUriMutateEvent">CollectionUriMutateEvent</a> {
+        creator_addr: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(creator),
+        collection_name: collection,
+        old_uri,
+        new_uri,
+    };
+    <a href="token_event_store.md#0x3_token_event_store_initialize_token_event_store">initialize_token_event_store</a>(creator);
+    <b>let</b> <a href="token_event_store.md#0x3_token_event_store">token_event_store</a> = <b>borrow_global_mut</b>&lt;<a href="token_event_store.md#0x3_token_event_store_TokenEventStoreV1">TokenEventStoreV1</a>&gt;(<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(creator));
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit">event::emit</a>(
+            <a href="token_event_store.md#0x3_token_event_store_CollectionUriMutate">CollectionUriMutate</a> {
+                creator_addr: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(creator),
+                collection_name: collection,
+                old_uri,
+                new_uri,
+            }
+        );
+    };
+    <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit_event">event::emit_event</a>&lt;<a href="token_event_store.md#0x3_token_event_store_CollectionUriMutateEvent">CollectionUriMutateEvent</a>&gt;(
+        &<b>mut</b> <a href="token_event_store.md#0x3_token_event_store">token_event_store</a>.collection_uri_mutate_events,
+        <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event">event</a>,
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_event_store_emit_collection_description_mutate_event"></a>
+
+## Function `emit_collection_description_mutate_event`
+
+Emit the collection description mutation event
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="token_event_store.md#0x3_token_event_store_emit_collection_description_mutate_event">emit_collection_description_mutate_event</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, collection: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, old_description: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, new_description: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="token_event_store.md#0x3_token_event_store_emit_collection_description_mutate_event">emit_collection_description_mutate_event</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, collection: String, old_description: String, new_description: String) <b>acquires</b> <a href="token_event_store.md#0x3_token_event_store_TokenEventStoreV1">TokenEventStoreV1</a> {
+    <b>let</b> <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event">event</a> = <a href="token_event_store.md#0x3_token_event_store_CollectionDescriptionMutateEvent">CollectionDescriptionMutateEvent</a> {
+        creator_addr: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(creator),
+        collection_name: collection,
+        old_description,
+        new_description,
+    };
+    <a href="token_event_store.md#0x3_token_event_store_initialize_token_event_store">initialize_token_event_store</a>(creator);
+    <b>let</b> <a href="token_event_store.md#0x3_token_event_store">token_event_store</a> = <b>borrow_global_mut</b>&lt;<a href="token_event_store.md#0x3_token_event_store_TokenEventStoreV1">TokenEventStoreV1</a>&gt;(<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(creator));
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit">event::emit</a>(
+            <a href="token_event_store.md#0x3_token_event_store_CollectionDescriptionMutate">CollectionDescriptionMutate</a> {
+                creator_addr: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(creator),
+                collection_name: collection,
+                old_description,
+                new_description,
+            }
+        );
+    };
+    <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit_event">event::emit_event</a>&lt;<a href="token_event_store.md#0x3_token_event_store_CollectionDescriptionMutateEvent">CollectionDescriptionMutateEvent</a>&gt;(
+        &<b>mut</b> <a href="token_event_store.md#0x3_token_event_store">token_event_store</a>.collection_description_mutate_events,
+        <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event">event</a>,
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_event_store_emit_collection_maximum_mutate_event"></a>
+
+## Function `emit_collection_maximum_mutate_event`
+
+Emit the collection maximum mutation event
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="token_event_store.md#0x3_token_event_store_emit_collection_maximum_mutate_event">emit_collection_maximum_mutate_event</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, collection: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, old_maximum: u64, new_maximum: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="token_event_store.md#0x3_token_event_store_emit_collection_maximum_mutate_event">emit_collection_maximum_mutate_event</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, collection: String, old_maximum: u64, new_maximum: u64) <b>acquires</b> <a href="token_event_store.md#0x3_token_event_store_TokenEventStoreV1">TokenEventStoreV1</a> {
+    <b>let</b> <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event">event</a> = <a href="token_event_store.md#0x3_token_event_store_CollectionMaxiumMutateEvent">CollectionMaxiumMutateEvent</a> {
+        creator_addr: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(creator),
+        collection_name: collection,
+        old_maximum,
+        new_maximum,
+    };
+    <a href="token_event_store.md#0x3_token_event_store_initialize_token_event_store">initialize_token_event_store</a>(creator);
+    <b>let</b> <a href="token_event_store.md#0x3_token_event_store">token_event_store</a> = <b>borrow_global_mut</b>&lt;<a href="token_event_store.md#0x3_token_event_store_TokenEventStoreV1">TokenEventStoreV1</a>&gt;(<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(creator));
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit">event::emit</a>(
+            <a href="token_event_store.md#0x3_token_event_store_CollectionMaxiumMutate">CollectionMaxiumMutate</a> {
+                creator_addr: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(creator),
+                collection_name: collection,
+                old_maximum,
+                new_maximum,
+            }
+        );
+    };
+    <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit_event">event::emit_event</a>&lt;<a href="token_event_store.md#0x3_token_event_store_CollectionMaxiumMutateEvent">CollectionMaxiumMutateEvent</a>&gt;(
+        &<b>mut</b> <a href="token_event_store.md#0x3_token_event_store">token_event_store</a>.collection_maximum_mutate_events,
+        <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event">event</a>,
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_event_store_emit_token_opt_in_event"></a>
+
+## Function `emit_token_opt_in_event`
+
+Emit the direct opt-in event
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="token_event_store.md#0x3_token_event_store_emit_token_opt_in_event">emit_token_opt_in_event</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, opt_in: bool)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="token_event_store.md#0x3_token_event_store_emit_token_opt_in_event">emit_token_opt_in_event</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, opt_in: bool) <b>acquires</b> <a href="token_event_store.md#0x3_token_event_store_TokenEventStoreV1">TokenEventStoreV1</a> {
+    <b>let</b> opt_in_event = <a href="token_event_store.md#0x3_token_event_store_OptInTransferEvent">OptInTransferEvent</a> {
+      opt_in,
+    };
+    <a href="token_event_store.md#0x3_token_event_store_initialize_token_event_store">initialize_token_event_store</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>);
+    <b>let</b> <a href="token_event_store.md#0x3_token_event_store">token_event_store</a> = <b>borrow_global_mut</b>&lt;<a href="token_event_store.md#0x3_token_event_store_TokenEventStoreV1">TokenEventStoreV1</a>&gt;(<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>));
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit">event::emit</a>(
+            <a href="token_event_store.md#0x3_token_event_store_OptInTransfer">OptInTransfer</a> {
+                account_address: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>),
+                opt_in,
+            });
+    };
+    <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit_event">event::emit_event</a>&lt;<a href="token_event_store.md#0x3_token_event_store_OptInTransferEvent">OptInTransferEvent</a>&gt;(
+        &<b>mut</b> <a href="token_event_store.md#0x3_token_event_store">token_event_store</a>.opt_in_events,
+        opt_in_event,
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_event_store_emit_token_uri_mutate_event"></a>
+
+## Function `emit_token_uri_mutate_event`
+
+Emit URI mutation event
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="token_event_store.md#0x3_token_event_store_emit_token_uri_mutate_event">emit_token_uri_mutate_event</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, collection: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, <a href="token.md#0x3_token">token</a>: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, old_uri: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, new_uri: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="token_event_store.md#0x3_token_event_store_emit_token_uri_mutate_event">emit_token_uri_mutate_event</a>(
+    creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    collection: String,
+    <a href="token.md#0x3_token">token</a>: String,
+    old_uri: String,
+    new_uri: String,
+) <b>acquires</b> <a href="token_event_store.md#0x3_token_event_store_TokenEventStoreV1">TokenEventStoreV1</a> {
+    <b>let</b> creator_addr = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(creator);
+
+    <b>let</b> <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event">event</a> = <a href="token_event_store.md#0x3_token_event_store_UriMutationEvent">UriMutationEvent</a> {
+        creator: creator_addr,
+        collection,
+        <a href="token.md#0x3_token">token</a>,
+        old_uri,
+        new_uri,
+    };
+
+    <a href="token_event_store.md#0x3_token_event_store_initialize_token_event_store">initialize_token_event_store</a>(creator);
+    <b>let</b> <a href="token_event_store.md#0x3_token_event_store">token_event_store</a> = <b>borrow_global_mut</b>&lt;<a href="token_event_store.md#0x3_token_event_store_TokenEventStoreV1">TokenEventStoreV1</a>&gt;(creator_addr);
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit">event::emit</a>(
+            <a href="token_event_store.md#0x3_token_event_store_UriMutation">UriMutation</a> {
+                creator: creator_addr,
+                collection,
+                <a href="token.md#0x3_token">token</a>,
+                old_uri,
+                new_uri,
+            });
+    };
+    <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit_event">event::emit_event</a>&lt;<a href="token_event_store.md#0x3_token_event_store_UriMutationEvent">UriMutationEvent</a>&gt;(
+        &<b>mut</b> <a href="token_event_store.md#0x3_token_event_store">token_event_store</a>.uri_mutate_events,
+        <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event">event</a>,
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_event_store_emit_default_property_mutate_event"></a>
+
+## Function `emit_default_property_mutate_event`
+
+Emit tokendata property map mutation event
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="token_event_store.md#0x3_token_event_store_emit_default_property_mutate_event">emit_default_property_mutate_event</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, collection: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, <a href="token.md#0x3_token">token</a>: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, keys: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;, old_values: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="property_map.md#0x3_property_map_PropertyValue">property_map::PropertyValue</a>&gt;&gt;, new_values: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="property_map.md#0x3_property_map_PropertyValue">property_map::PropertyValue</a>&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="token_event_store.md#0x3_token_event_store_emit_default_property_mutate_event">emit_default_property_mutate_event</a>(
+    creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    collection: String,
+    <a href="token.md#0x3_token">token</a>: String,
+    keys: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;String&gt;,
+    old_values: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;Option&lt;PropertyValue&gt;&gt;,
+    new_values: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;PropertyValue&gt;,
+) <b>acquires</b> <a href="token_event_store.md#0x3_token_event_store_TokenEventStoreV1">TokenEventStoreV1</a> {
+    <b>let</b> creator_addr = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(creator);
+
+    <b>let</b> <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event">event</a> = <a href="token_event_store.md#0x3_token_event_store_DefaultPropertyMutateEvent">DefaultPropertyMutateEvent</a> {
+        creator: creator_addr,
+        collection,
+        <a href="token.md#0x3_token">token</a>,
+        keys,
+        old_values,
+        new_values,
+    };
+
+    <a href="token_event_store.md#0x3_token_event_store_initialize_token_event_store">initialize_token_event_store</a>(creator);
+    <b>let</b> <a href="token_event_store.md#0x3_token_event_store">token_event_store</a> = <b>borrow_global_mut</b>&lt;<a href="token_event_store.md#0x3_token_event_store_TokenEventStoreV1">TokenEventStoreV1</a>&gt;(creator_addr);
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit">event::emit</a>(
+            <a href="token_event_store.md#0x3_token_event_store_DefaultPropertyMutate">DefaultPropertyMutate</a> {
+                creator: creator_addr,
+                collection,
+                <a href="token.md#0x3_token">token</a>,
+                keys,
+                old_values,
+                new_values,
+            });
+    };
+    <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit_event">event::emit_event</a>&lt;<a href="token_event_store.md#0x3_token_event_store_DefaultPropertyMutateEvent">DefaultPropertyMutateEvent</a>&gt;(
+        &<b>mut</b> <a href="token_event_store.md#0x3_token_event_store">token_event_store</a>.default_property_mutate_events,
+        <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event">event</a>,
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_event_store_emit_token_descrition_mutate_event"></a>
+
+## Function `emit_token_descrition_mutate_event`
+
+Emit description mutation event
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="token_event_store.md#0x3_token_event_store_emit_token_descrition_mutate_event">emit_token_descrition_mutate_event</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, collection: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, <a href="token.md#0x3_token">token</a>: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, old_description: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, new_description: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="token_event_store.md#0x3_token_event_store_emit_token_descrition_mutate_event">emit_token_descrition_mutate_event</a>(
+    creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    collection: String,
+    <a href="token.md#0x3_token">token</a>: String,
+    old_description: String,
+    new_description: String,
+) <b>acquires</b> <a href="token_event_store.md#0x3_token_event_store_TokenEventStoreV1">TokenEventStoreV1</a> {
+    <b>let</b> creator_addr = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(creator);
+
+    <b>let</b> <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event">event</a> = <a href="token_event_store.md#0x3_token_event_store_DescriptionMutateEvent">DescriptionMutateEvent</a> {
+        creator: creator_addr,
+        collection,
+        <a href="token.md#0x3_token">token</a>,
+        old_description,
+        new_description,
+    };
+
+    <a href="token_event_store.md#0x3_token_event_store_initialize_token_event_store">initialize_token_event_store</a>(creator);
+    <b>let</b> <a href="token_event_store.md#0x3_token_event_store">token_event_store</a> = <b>borrow_global_mut</b>&lt;<a href="token_event_store.md#0x3_token_event_store_TokenEventStoreV1">TokenEventStoreV1</a>&gt;(creator_addr);
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit">event::emit</a>(
+            <a href="token_event_store.md#0x3_token_event_store_DescriptionMutate">DescriptionMutate</a> {
+                creator: creator_addr,
+                collection,
+                <a href="token.md#0x3_token">token</a>,
+                old_description,
+                new_description,
+            });
+    };
+    <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit_event">event::emit_event</a>&lt;<a href="token_event_store.md#0x3_token_event_store_DescriptionMutateEvent">DescriptionMutateEvent</a>&gt;(
+        &<b>mut</b> <a href="token_event_store.md#0x3_token_event_store">token_event_store</a>.description_mutate_events,
+        <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event">event</a>,
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_event_store_emit_token_royalty_mutate_event"></a>
+
+## Function `emit_token_royalty_mutate_event`
+
+Emit royalty mutation event
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="token_event_store.md#0x3_token_event_store_emit_token_royalty_mutate_event">emit_token_royalty_mutate_event</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, collection: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, <a href="token.md#0x3_token">token</a>: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, old_royalty_numerator: u64, old_royalty_denominator: u64, old_royalty_payee_addr: <b>address</b>, new_royalty_numerator: u64, new_royalty_denominator: u64, new_royalty_payee_addr: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="token_event_store.md#0x3_token_event_store_emit_token_royalty_mutate_event">emit_token_royalty_mutate_event</a>(
+    creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    collection: String,
+    <a href="token.md#0x3_token">token</a>: String,
+    old_royalty_numerator: u64,
+    old_royalty_denominator: u64,
+    old_royalty_payee_addr: <b>address</b>,
+    new_royalty_numerator: u64,
+    new_royalty_denominator: u64,
+    new_royalty_payee_addr: <b>address</b>,
+) <b>acquires</b> <a href="token_event_store.md#0x3_token_event_store_TokenEventStoreV1">TokenEventStoreV1</a> {
+    <b>let</b> creator_addr = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(creator);
+    <b>let</b> <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event">event</a> = <a href="token_event_store.md#0x3_token_event_store_RoyaltyMutateEvent">RoyaltyMutateEvent</a> {
+        creator: creator_addr,
+        collection,
+        <a href="token.md#0x3_token">token</a>,
+        old_royalty_numerator,
+        old_royalty_denominator,
+        old_royalty_payee_addr,
+        new_royalty_numerator,
+        new_royalty_denominator,
+        new_royalty_payee_addr,
+    };
+
+    <a href="token_event_store.md#0x3_token_event_store_initialize_token_event_store">initialize_token_event_store</a>(creator);
+    <b>let</b> <a href="token_event_store.md#0x3_token_event_store">token_event_store</a> = <b>borrow_global_mut</b>&lt;<a href="token_event_store.md#0x3_token_event_store_TokenEventStoreV1">TokenEventStoreV1</a>&gt;(creator_addr);
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit">event::emit</a>(
+            <a href="token_event_store.md#0x3_token_event_store_RoyaltyMutate">RoyaltyMutate</a> {
+                creator: creator_addr,
+                collection,
+                <a href="token.md#0x3_token">token</a>,
+                old_royalty_numerator,
+                old_royalty_denominator,
+                old_royalty_payee_addr,
+                new_royalty_numerator,
+                new_royalty_denominator,
+                new_royalty_payee_addr,
+            });
+    };
+    <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit_event">event::emit_event</a>&lt;<a href="token_event_store.md#0x3_token_event_store_RoyaltyMutateEvent">RoyaltyMutateEvent</a>&gt;(
+        &<b>mut</b> <a href="token_event_store.md#0x3_token_event_store">token_event_store</a>.royalty_mutate_events,
+        <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event">event</a>,
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_event_store_emit_token_maximum_mutate_event"></a>
+
+## Function `emit_token_maximum_mutate_event`
+
+Emit maximum mutation event
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="token_event_store.md#0x3_token_event_store_emit_token_maximum_mutate_event">emit_token_maximum_mutate_event</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, collection: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, <a href="token.md#0x3_token">token</a>: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, old_maximum: u64, new_maximum: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="token_event_store.md#0x3_token_event_store_emit_token_maximum_mutate_event">emit_token_maximum_mutate_event</a>(
+    creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    collection: String,
+    <a href="token.md#0x3_token">token</a>: String,
+    old_maximum: u64,
+    new_maximum: u64,
+) <b>acquires</b> <a href="token_event_store.md#0x3_token_event_store_TokenEventStoreV1">TokenEventStoreV1</a> {
+    <b>let</b> creator_addr = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(creator);
+
+    <b>let</b> <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event">event</a> = <a href="token_event_store.md#0x3_token_event_store_MaxiumMutateEvent">MaxiumMutateEvent</a> {
+        creator: creator_addr,
+        collection,
+        <a href="token.md#0x3_token">token</a>,
+        old_maximum,
+        new_maximum,
+    };
+
+    <a href="token_event_store.md#0x3_token_event_store_initialize_token_event_store">initialize_token_event_store</a>(creator);
+    <b>let</b> <a href="token_event_store.md#0x3_token_event_store">token_event_store</a> =  <b>borrow_global_mut</b>&lt;<a href="token_event_store.md#0x3_token_event_store_TokenEventStoreV1">TokenEventStoreV1</a>&gt;(creator_addr);
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit">event::emit</a>(
+            <a href="token_event_store.md#0x3_token_event_store_MaximumMutate">MaximumMutate</a> {
+                creator: creator_addr,
+                collection,
+                <a href="token.md#0x3_token">token</a>,
+                old_maximum,
+                new_maximum,
+            });
+    };
+    <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit_event">event::emit_event</a>&lt;<a href="token_event_store.md#0x3_token_event_store_MaxiumMutateEvent">MaxiumMutateEvent</a>&gt;(
+        &<b>mut</b> <a href="token_event_store.md#0x3_token_event_store">token_event_store</a>.maximum_mutate_events,
+        <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event">event</a>,
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_0"></a>
+
+## Specification
+
+
+
+<pre><code><b>pragma</b> verify = <b>true</b>;
+<b>pragma</b> aborts_if_is_strict;
+</code></pre>
+
+
+
+<a id="@Specification_0_initialize_token_event_store"></a>
+
+### Function `initialize_token_event_store`
+
+
+<pre><code><b>fun</b> <a href="token_event_store.md#0x3_token_event_store_initialize_token_event_store">initialize_token_event_store</a>(acct: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>true</b>;
+<b>let</b> addr = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(acct);
+<b>include</b> <a href="token_event_store.md#0x3_token_event_store_InitializeTokenEventStoreAbortsIf">InitializeTokenEventStoreAbortsIf</a> {creator : acct};
+</code></pre>
+
+
+Adjust the overflow value according to the
+number of registered events
+
+
+<a id="0x3_token_event_store_InitializeTokenEventStoreAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="token_event_store.md#0x3_token_event_store_InitializeTokenEventStoreAbortsIf">InitializeTokenEventStoreAbortsIf</a> {
+    creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>;
+    <b>let</b> addr = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(creator);
+    <b>let</b> <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a> = <b>global</b>&lt;Account&gt;(addr);
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="token_event_store.md#0x3_token_event_store_TokenEventStoreV1">TokenEventStoreV1</a>&gt;(addr) && !<b>exists</b>&lt;Account&gt;(addr);
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="token_event_store.md#0x3_token_event_store_TokenEventStoreV1">TokenEventStoreV1</a>&gt;(addr) && <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>.guid_creation_num + 9 &gt;= <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account_MAX_GUID_CREATION_NUM">account::MAX_GUID_CREATION_NUM</a>;
+    <b>aborts_if</b> !<b>exists</b>&lt;<a href="token_event_store.md#0x3_token_event_store_TokenEventStoreV1">TokenEventStoreV1</a>&gt;(addr) && <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>.guid_creation_num + 9 &gt; MAX_U64;
+}
+</code></pre>
+
+
+
+
+<a id="0x3_token_event_store_TokenEventStoreAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="token_event_store.md#0x3_token_event_store_TokenEventStoreAbortsIf">TokenEventStoreAbortsIf</a> {
+    creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>;
+    <b>let</b> addr = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(creator);
+    <b>let</b> <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a> = <b>global</b>&lt;Account&gt;(addr);
+    <b>aborts_if</b> !<b>exists</b>&lt;Account&gt;(addr);
+    <b>aborts_if</b> <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>.guid_creation_num + 9 &gt;= <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account_MAX_GUID_CREATION_NUM">account::MAX_GUID_CREATION_NUM</a>;
+    <b>aborts_if</b> <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>.guid_creation_num + 9 &gt; MAX_U64;
+}
+</code></pre>
+
+
+
+<a id="@Specification_0_emit_collection_uri_mutate_event"></a>
+
+### Function `emit_collection_uri_mutate_event`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="token_event_store.md#0x3_token_event_store_emit_collection_uri_mutate_event">emit_collection_uri_mutate_event</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, collection: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, old_uri: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, new_uri: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="token_event_store.md#0x3_token_event_store_InitializeTokenEventStoreAbortsIf">InitializeTokenEventStoreAbortsIf</a>;
+</code></pre>
+
+
+
+<a id="@Specification_0_emit_collection_description_mutate_event"></a>
+
+### Function `emit_collection_description_mutate_event`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="token_event_store.md#0x3_token_event_store_emit_collection_description_mutate_event">emit_collection_description_mutate_event</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, collection: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, old_description: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, new_description: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="token_event_store.md#0x3_token_event_store_InitializeTokenEventStoreAbortsIf">InitializeTokenEventStoreAbortsIf</a>;
+</code></pre>
+
+
+
+<a id="@Specification_0_emit_collection_maximum_mutate_event"></a>
+
+### Function `emit_collection_maximum_mutate_event`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="token_event_store.md#0x3_token_event_store_emit_collection_maximum_mutate_event">emit_collection_maximum_mutate_event</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, collection: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, old_maximum: u64, new_maximum: u64)
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="token_event_store.md#0x3_token_event_store_InitializeTokenEventStoreAbortsIf">InitializeTokenEventStoreAbortsIf</a>;
+</code></pre>
+
+
+
+<a id="@Specification_0_emit_token_opt_in_event"></a>
+
+### Function `emit_token_opt_in_event`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="token_event_store.md#0x3_token_event_store_emit_token_opt_in_event">emit_token_opt_in_event</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, opt_in: bool)
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="token_event_store.md#0x3_token_event_store_InitializeTokenEventStoreAbortsIf">InitializeTokenEventStoreAbortsIf</a> {creator : <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>};
+</code></pre>
+
+
+
+<a id="@Specification_0_emit_token_uri_mutate_event"></a>
+
+### Function `emit_token_uri_mutate_event`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="token_event_store.md#0x3_token_event_store_emit_token_uri_mutate_event">emit_token_uri_mutate_event</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, collection: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, <a href="token.md#0x3_token">token</a>: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, old_uri: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, new_uri: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="token_event_store.md#0x3_token_event_store_InitializeTokenEventStoreAbortsIf">InitializeTokenEventStoreAbortsIf</a>;
+</code></pre>
+
+
+
+<a id="@Specification_0_emit_default_property_mutate_event"></a>
+
+### Function `emit_default_property_mutate_event`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="token_event_store.md#0x3_token_event_store_emit_default_property_mutate_event">emit_default_property_mutate_event</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, collection: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, <a href="token.md#0x3_token">token</a>: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, keys: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>&gt;, old_values: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="property_map.md#0x3_property_map_PropertyValue">property_map::PropertyValue</a>&gt;&gt;, new_values: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/vector.md#0x1_vector">vector</a>&lt;<a href="property_map.md#0x3_property_map_PropertyValue">property_map::PropertyValue</a>&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="token_event_store.md#0x3_token_event_store_InitializeTokenEventStoreAbortsIf">InitializeTokenEventStoreAbortsIf</a>;
+</code></pre>
+
+
+
+<a id="@Specification_0_emit_token_descrition_mutate_event"></a>
+
+### Function `emit_token_descrition_mutate_event`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="token_event_store.md#0x3_token_event_store_emit_token_descrition_mutate_event">emit_token_descrition_mutate_event</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, collection: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, <a href="token.md#0x3_token">token</a>: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, old_description: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, new_description: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="token_event_store.md#0x3_token_event_store_InitializeTokenEventStoreAbortsIf">InitializeTokenEventStoreAbortsIf</a>;
+</code></pre>
+
+
+
+<a id="@Specification_0_emit_token_royalty_mutate_event"></a>
+
+### Function `emit_token_royalty_mutate_event`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="token_event_store.md#0x3_token_event_store_emit_token_royalty_mutate_event">emit_token_royalty_mutate_event</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, collection: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, <a href="token.md#0x3_token">token</a>: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, old_royalty_numerator: u64, old_royalty_denominator: u64, old_royalty_payee_addr: <b>address</b>, new_royalty_numerator: u64, new_royalty_denominator: u64, new_royalty_payee_addr: <b>address</b>)
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="token_event_store.md#0x3_token_event_store_InitializeTokenEventStoreAbortsIf">InitializeTokenEventStoreAbortsIf</a>;
+</code></pre>
+
+
+
+<a id="@Specification_0_emit_token_maximum_mutate_event"></a>
+
+### Function `emit_token_maximum_mutate_event`
+
+
+<pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="token_event_store.md#0x3_token_event_store_emit_token_maximum_mutate_event">emit_token_maximum_mutate_event</a>(creator: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, collection: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, <a href="token.md#0x3_token">token</a>: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, old_maximum: u64, new_maximum: u64)
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="token_event_store.md#0x3_token_event_store_InitializeTokenEventStoreAbortsIf">InitializeTokenEventStoreAbortsIf</a>;
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/aptos-token/tests/compiler-v2-doc/token_transfers.md b/aptos-move/framework/aptos-token/tests/compiler-v2-doc/token_transfers.md
new file mode 100644
index 0000000000000..db16be95cd33f
--- /dev/null
+++ b/aptos-move/framework/aptos-token/tests/compiler-v2-doc/token_transfers.md
@@ -0,0 +1,953 @@
+
+<a id="0x3_token_transfers"></a>
+
+# Module `0x3::token_transfers`
+
+This module provides the foundation for transferring of Tokens
+
+
+-  [Resource `PendingClaims`](#0x3_token_transfers_PendingClaims)
+-  [Struct `TokenOfferId`](#0x3_token_transfers_TokenOfferId)
+-  [Struct `TokenOffer`](#0x3_token_transfers_TokenOffer)
+-  [Struct `TokenOfferEvent`](#0x3_token_transfers_TokenOfferEvent)
+-  [Struct `TokenCancelOfferEvent`](#0x3_token_transfers_TokenCancelOfferEvent)
+-  [Struct `TokenCancelOffer`](#0x3_token_transfers_TokenCancelOffer)
+-  [Struct `TokenClaimEvent`](#0x3_token_transfers_TokenClaimEvent)
+-  [Struct `TokenClaim`](#0x3_token_transfers_TokenClaim)
+-  [Constants](#@Constants_0)
+-  [Function `initialize_token_transfers`](#0x3_token_transfers_initialize_token_transfers)
+-  [Function `create_token_offer_id`](#0x3_token_transfers_create_token_offer_id)
+-  [Function `offer_script`](#0x3_token_transfers_offer_script)
+-  [Function `offer`](#0x3_token_transfers_offer)
+-  [Function `claim_script`](#0x3_token_transfers_claim_script)
+-  [Function `claim`](#0x3_token_transfers_claim)
+-  [Function `cancel_offer_script`](#0x3_token_transfers_cancel_offer_script)
+-  [Function `cancel_offer`](#0x3_token_transfers_cancel_offer)
+-  [Specification](#@Specification_1)
+    -  [Function `initialize_token_transfers`](#@Specification_1_initialize_token_transfers)
+    -  [Function `create_token_offer_id`](#@Specification_1_create_token_offer_id)
+    -  [Function `offer_script`](#@Specification_1_offer_script)
+    -  [Function `offer`](#@Specification_1_offer)
+    -  [Function `claim_script`](#@Specification_1_claim_script)
+    -  [Function `claim`](#@Specification_1_claim)
+    -  [Function `cancel_offer_script`](#@Specification_1_cancel_offer_script)
+    -  [Function `cancel_offer`](#@Specification_1_cancel_offer)
+
+
+<pre><code><b>use</b> <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">0x1::account</a>;
+<b>use</b> <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event">0x1::event</a>;
+<b>use</b> <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/features.md#0x1_features">0x1::features</a>;
+<b>use</b> <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">0x1::signer</a>;
+<b>use</b> <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string">0x1::string</a>;
+<b>use</b> <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table">0x1::table</a>;
+<b>use</b> <a href="token.md#0x3_token">0x3::token</a>;
+</code></pre>
+
+
+
+<a id="0x3_token_transfers_PendingClaims"></a>
+
+## Resource `PendingClaims`
+
+
+
+<pre><code><b>struct</b> <a href="token_transfers.md#0x3_token_transfers_PendingClaims">PendingClaims</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>pending_claims: <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_Table">table::Table</a>&lt;<a href="token_transfers.md#0x3_token_transfers_TokenOfferId">token_transfers::TokenOfferId</a>, <a href="token.md#0x3_token_Token">token::Token</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>offer_events: <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="token_transfers.md#0x3_token_transfers_TokenOfferEvent">token_transfers::TokenOfferEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>cancel_offer_events: <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="token_transfers.md#0x3_token_transfers_TokenCancelOfferEvent">token_transfers::TokenCancelOfferEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>claim_events: <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="token_transfers.md#0x3_token_transfers_TokenClaimEvent">token_transfers::TokenClaimEvent</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x3_token_transfers_TokenOfferId"></a>
+
+## Struct `TokenOfferId`
+
+
+
+<pre><code>#[<a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event">event</a>]
+<b>struct</b> <a href="token_transfers.md#0x3_token_transfers_TokenOfferId">TokenOfferId</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>to_addr: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>token_id: <a href="token.md#0x3_token_TokenId">token::TokenId</a></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x3_token_transfers_TokenOffer"></a>
+
+## Struct `TokenOffer`
+
+
+
+<pre><code>#[<a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event">event</a>]
+<b>struct</b> <a href="token_transfers.md#0x3_token_transfers_TokenOffer">TokenOffer</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>to_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>token_id: <a href="token.md#0x3_token_TokenId">token::TokenId</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>amount: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x3_token_transfers_TokenOfferEvent"></a>
+
+## Struct `TokenOfferEvent`
+
+
+
+<pre><code>#[<a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event">event</a>]
+<b>struct</b> <a href="token_transfers.md#0x3_token_transfers_TokenOfferEvent">TokenOfferEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>to_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>token_id: <a href="token.md#0x3_token_TokenId">token::TokenId</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>amount: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x3_token_transfers_TokenCancelOfferEvent"></a>
+
+## Struct `TokenCancelOfferEvent`
+
+
+
+<pre><code>#[<a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event">event</a>]
+<b>struct</b> <a href="token_transfers.md#0x3_token_transfers_TokenCancelOfferEvent">TokenCancelOfferEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>to_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>token_id: <a href="token.md#0x3_token_TokenId">token::TokenId</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>amount: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x3_token_transfers_TokenCancelOffer"></a>
+
+## Struct `TokenCancelOffer`
+
+
+
+<pre><code>#[<a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event">event</a>]
+<b>struct</b> <a href="token_transfers.md#0x3_token_transfers_TokenCancelOffer">TokenCancelOffer</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>to_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>token_id: <a href="token.md#0x3_token_TokenId">token::TokenId</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>amount: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x3_token_transfers_TokenClaimEvent"></a>
+
+## Struct `TokenClaimEvent`
+
+
+
+<pre><code>#[<a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event">event</a>]
+<b>struct</b> <a href="token_transfers.md#0x3_token_transfers_TokenClaimEvent">TokenClaimEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>to_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>token_id: <a href="token.md#0x3_token_TokenId">token::TokenId</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>amount: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x3_token_transfers_TokenClaim"></a>
+
+## Struct `TokenClaim`
+
+
+
+<pre><code>#[<a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event">event</a>]
+<b>struct</b> <a href="token_transfers.md#0x3_token_transfers_TokenClaim">TokenClaim</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>to_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>token_id: <a href="token.md#0x3_token_TokenId">token::TokenId</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>amount: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x3_token_transfers_ETOKEN_OFFER_NOT_EXIST"></a>
+
+Token offer doesn't exist
+
+
+<pre><code><b>const</b> <a href="token_transfers.md#0x3_token_transfers_ETOKEN_OFFER_NOT_EXIST">ETOKEN_OFFER_NOT_EXIST</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x3_token_transfers_initialize_token_transfers"></a>
+
+## Function `initialize_token_transfers`
+
+
+
+<pre><code><b>fun</b> <a href="token_transfers.md#0x3_token_transfers_initialize_token_transfers">initialize_token_transfers</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="token_transfers.md#0x3_token_transfers_initialize_token_transfers">initialize_token_transfers</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>) {
+    <b>move_to</b>(
+        <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>,
+        <a href="token_transfers.md#0x3_token_transfers_PendingClaims">PendingClaims</a> {
+            pending_claims: <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_new">table::new</a>&lt;<a href="token_transfers.md#0x3_token_transfers_TokenOfferId">TokenOfferId</a>, Token&gt;(),
+            offer_events: <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account_new_event_handle">account::new_event_handle</a>&lt;<a href="token_transfers.md#0x3_token_transfers_TokenOfferEvent">TokenOfferEvent</a>&gt;(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>),
+            cancel_offer_events: <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account_new_event_handle">account::new_event_handle</a>&lt;<a href="token_transfers.md#0x3_token_transfers_TokenCancelOfferEvent">TokenCancelOfferEvent</a>&gt;(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>),
+            claim_events: <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account_new_event_handle">account::new_event_handle</a>&lt;<a href="token_transfers.md#0x3_token_transfers_TokenClaimEvent">TokenClaimEvent</a>&gt;(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>),
+        }
+    )
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_transfers_create_token_offer_id"></a>
+
+## Function `create_token_offer_id`
+
+
+
+<pre><code><b>fun</b> <a href="token_transfers.md#0x3_token_transfers_create_token_offer_id">create_token_offer_id</a>(to_addr: <b>address</b>, token_id: <a href="token.md#0x3_token_TokenId">token::TokenId</a>): <a href="token_transfers.md#0x3_token_transfers_TokenOfferId">token_transfers::TokenOfferId</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="token_transfers.md#0x3_token_transfers_create_token_offer_id">create_token_offer_id</a>(to_addr: <b>address</b>, token_id: TokenId): <a href="token_transfers.md#0x3_token_transfers_TokenOfferId">TokenOfferId</a> {
+    <a href="token_transfers.md#0x3_token_transfers_TokenOfferId">TokenOfferId</a> {
+        to_addr,
+        token_id
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_transfers_offer_script"></a>
+
+## Function `offer_script`
+
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="token_transfers.md#0x3_token_transfers_offer_script">offer_script</a>(sender: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, receiver: <b>address</b>, creator: <b>address</b>, collection: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, property_version: u64, amount: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="token_transfers.md#0x3_token_transfers_offer_script">offer_script</a>(
+    sender: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    receiver: <b>address</b>,
+    creator: <b>address</b>,
+    collection: String,
+    name: String,
+    property_version: u64,
+    amount: u64,
+) <b>acquires</b> <a href="token_transfers.md#0x3_token_transfers_PendingClaims">PendingClaims</a> {
+    <b>let</b> token_id = <a href="token.md#0x3_token_create_token_id_raw">token::create_token_id_raw</a>(creator, collection, name, property_version);
+    <a href="token_transfers.md#0x3_token_transfers_offer">offer</a>(&sender, receiver, token_id, amount);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_transfers_offer"></a>
+
+## Function `offer`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token_transfers.md#0x3_token_transfers_offer">offer</a>(sender: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, receiver: <b>address</b>, token_id: <a href="token.md#0x3_token_TokenId">token::TokenId</a>, amount: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token_transfers.md#0x3_token_transfers_offer">offer</a>(
+    sender: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    receiver: <b>address</b>,
+    token_id: TokenId,
+    amount: u64,
+) <b>acquires</b> <a href="token_transfers.md#0x3_token_transfers_PendingClaims">PendingClaims</a> {
+    <b>let</b> sender_addr = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(sender);
+    <b>if</b> (!<b>exists</b>&lt;<a href="token_transfers.md#0x3_token_transfers_PendingClaims">PendingClaims</a>&gt;(sender_addr)) {
+        <a href="token_transfers.md#0x3_token_transfers_initialize_token_transfers">initialize_token_transfers</a>(sender)
+    };
+
+    <b>let</b> pending_claims =
+        &<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="token_transfers.md#0x3_token_transfers_PendingClaims">PendingClaims</a>&gt;(sender_addr).pending_claims;
+    <b>let</b> token_offer_id = <a href="token_transfers.md#0x3_token_transfers_create_token_offer_id">create_token_offer_id</a>(receiver, token_id);
+    <b>let</b> <a href="token.md#0x3_token">token</a> = <a href="token.md#0x3_token_withdraw_token">token::withdraw_token</a>(sender, token_id, amount);
+    <b>if</b> (!<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_contains">table::contains</a>(pending_claims, token_offer_id)) {
+        <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_add">table::add</a>(pending_claims, token_offer_id, <a href="token.md#0x3_token">token</a>);
+    } <b>else</b> {
+        <b>let</b> dst_token = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_borrow_mut">table::borrow_mut</a>(pending_claims, token_offer_id);
+        <a href="token.md#0x3_token_merge">token::merge</a>(dst_token, <a href="token.md#0x3_token">token</a>);
+    };
+
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit">event::emit</a>(
+            <a href="token_transfers.md#0x3_token_transfers_TokenOffer">TokenOffer</a> {
+                to_address: receiver,
+                token_id,
+                amount,
+            }
+        )
+    };
+    <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit_event">event::emit_event</a>&lt;<a href="token_transfers.md#0x3_token_transfers_TokenOfferEvent">TokenOfferEvent</a>&gt;(
+        &<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="token_transfers.md#0x3_token_transfers_PendingClaims">PendingClaims</a>&gt;(sender_addr).offer_events,
+        <a href="token_transfers.md#0x3_token_transfers_TokenOfferEvent">TokenOfferEvent</a> {
+            to_address: receiver,
+            token_id,
+            amount,
+        },
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_transfers_claim_script"></a>
+
+## Function `claim_script`
+
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="token_transfers.md#0x3_token_transfers_claim_script">claim_script</a>(receiver: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, sender: <b>address</b>, creator: <b>address</b>, collection: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, property_version: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="token_transfers.md#0x3_token_transfers_claim_script">claim_script</a>(
+    receiver: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    sender: <b>address</b>,
+    creator: <b>address</b>,
+    collection: String,
+    name: String,
+    property_version: u64,
+) <b>acquires</b> <a href="token_transfers.md#0x3_token_transfers_PendingClaims">PendingClaims</a> {
+    <b>let</b> token_id = <a href="token.md#0x3_token_create_token_id_raw">token::create_token_id_raw</a>(creator, collection, name, property_version);
+    <a href="token_transfers.md#0x3_token_transfers_claim">claim</a>(&receiver, sender, token_id);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_transfers_claim"></a>
+
+## Function `claim`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token_transfers.md#0x3_token_transfers_claim">claim</a>(receiver: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, sender: <b>address</b>, token_id: <a href="token.md#0x3_token_TokenId">token::TokenId</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token_transfers.md#0x3_token_transfers_claim">claim</a>(
+    receiver: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    sender: <b>address</b>,
+    token_id: TokenId,
+) <b>acquires</b> <a href="token_transfers.md#0x3_token_transfers_PendingClaims">PendingClaims</a> {
+    <b>assert</b>!(<b>exists</b>&lt;<a href="token_transfers.md#0x3_token_transfers_PendingClaims">PendingClaims</a>&gt;(sender), <a href="token_transfers.md#0x3_token_transfers_ETOKEN_OFFER_NOT_EXIST">ETOKEN_OFFER_NOT_EXIST</a>);
+    <b>let</b> pending_claims =
+        &<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="token_transfers.md#0x3_token_transfers_PendingClaims">PendingClaims</a>&gt;(sender).pending_claims;
+    <b>let</b> token_offer_id = <a href="token_transfers.md#0x3_token_transfers_create_token_offer_id">create_token_offer_id</a>(<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(receiver), token_id);
+    <b>assert</b>!(<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_contains">table::contains</a>(pending_claims, token_offer_id), <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="token_transfers.md#0x3_token_transfers_ETOKEN_OFFER_NOT_EXIST">ETOKEN_OFFER_NOT_EXIST</a>));
+    <b>let</b> tokens = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_remove">table::remove</a>(pending_claims, token_offer_id);
+    <b>let</b> amount = <a href="token.md#0x3_token_get_token_amount">token::get_token_amount</a>(&tokens);
+    <a href="token.md#0x3_token_deposit_token">token::deposit_token</a>(receiver, tokens);
+
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit">event::emit</a>(
+            <a href="token_transfers.md#0x3_token_transfers_TokenClaim">TokenClaim</a> {
+                to_address: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(receiver),
+                token_id,
+                amount,
+            }
+        )
+    };
+    <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit_event">event::emit_event</a>&lt;<a href="token_transfers.md#0x3_token_transfers_TokenClaimEvent">TokenClaimEvent</a>&gt;(
+        &<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="token_transfers.md#0x3_token_transfers_PendingClaims">PendingClaims</a>&gt;(sender).claim_events,
+        <a href="token_transfers.md#0x3_token_transfers_TokenClaimEvent">TokenClaimEvent</a> {
+            to_address: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(receiver),
+            token_id,
+            amount,
+        },
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_transfers_cancel_offer_script"></a>
+
+## Function `cancel_offer_script`
+
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="token_transfers.md#0x3_token_transfers_cancel_offer_script">cancel_offer_script</a>(sender: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, receiver: <b>address</b>, creator: <b>address</b>, collection: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, property_version: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="token_transfers.md#0x3_token_transfers_cancel_offer_script">cancel_offer_script</a>(
+    sender: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    receiver: <b>address</b>,
+    creator: <b>address</b>,
+    collection: String,
+    name: String,
+    property_version: u64,
+) <b>acquires</b> <a href="token_transfers.md#0x3_token_transfers_PendingClaims">PendingClaims</a> {
+    <b>let</b> token_id = <a href="token.md#0x3_token_create_token_id_raw">token::create_token_id_raw</a>(creator, collection, name, property_version);
+    <a href="token_transfers.md#0x3_token_transfers_cancel_offer">cancel_offer</a>(&sender, receiver, token_id);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x3_token_transfers_cancel_offer"></a>
+
+## Function `cancel_offer`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token_transfers.md#0x3_token_transfers_cancel_offer">cancel_offer</a>(sender: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, receiver: <b>address</b>, token_id: <a href="token.md#0x3_token_TokenId">token::TokenId</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token_transfers.md#0x3_token_transfers_cancel_offer">cancel_offer</a>(
+    sender: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>,
+    receiver: <b>address</b>,
+    token_id: TokenId,
+) <b>acquires</b> <a href="token_transfers.md#0x3_token_transfers_PendingClaims">PendingClaims</a> {
+    <b>let</b> sender_addr = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(sender);
+    <b>let</b> token_offer_id = <a href="token_transfers.md#0x3_token_transfers_create_token_offer_id">create_token_offer_id</a>(receiver, token_id);
+    <b>assert</b>!(<b>exists</b>&lt;<a href="token_transfers.md#0x3_token_transfers_PendingClaims">PendingClaims</a>&gt;(sender_addr), <a href="token_transfers.md#0x3_token_transfers_ETOKEN_OFFER_NOT_EXIST">ETOKEN_OFFER_NOT_EXIST</a>);
+    <b>let</b> pending_claims =
+        &<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="token_transfers.md#0x3_token_transfers_PendingClaims">PendingClaims</a>&gt;(sender_addr).pending_claims;
+    <b>let</b> <a href="token.md#0x3_token">token</a> = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_remove">table::remove</a>(pending_claims, token_offer_id);
+    <b>let</b> amount = <a href="token.md#0x3_token_get_token_amount">token::get_token_amount</a>(&<a href="token.md#0x3_token">token</a>);
+    <a href="token.md#0x3_token_deposit_token">token::deposit_token</a>(sender, <a href="token.md#0x3_token">token</a>);
+
+    <b>if</b> (std::features::module_event_migration_enabled()) {
+        <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit">event::emit</a>(
+            <a href="token_transfers.md#0x3_token_transfers_TokenCancelOffer">TokenCancelOffer</a> {
+                to_address: receiver,
+                token_id,
+                amount,
+            },
+        )
+    };
+    <a href="../../../aptos-framework/tests/compiler-v2-doc/event.md#0x1_event_emit_event">event::emit_event</a>&lt;<a href="token_transfers.md#0x3_token_transfers_TokenCancelOfferEvent">TokenCancelOfferEvent</a>&gt;(
+        &<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="token_transfers.md#0x3_token_transfers_PendingClaims">PendingClaims</a>&gt;(sender_addr).cancel_offer_events,
+        <a href="token_transfers.md#0x3_token_transfers_TokenCancelOfferEvent">TokenCancelOfferEvent</a> {
+            to_address: receiver,
+            token_id,
+            amount,
+        },
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+
+<pre><code><b>pragma</b> verify = <b>true</b>;
+<b>pragma</b> aborts_if_is_strict;
+</code></pre>
+
+
+
+<a id="@Specification_1_initialize_token_transfers"></a>
+
+### Function `initialize_token_transfers`
+
+
+<pre><code><b>fun</b> <a href="token_transfers.md#0x3_token_transfers_initialize_token_transfers">initialize_token_transfers</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="token_transfers.md#0x3_token_transfers_InitializeTokenTransfersAbortsIf">InitializeTokenTransfersAbortsIf</a>;
+</code></pre>
+
+
+Abort according to the code
+
+
+<a id="0x3_token_transfers_InitializeTokenTransfersAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="token_transfers.md#0x3_token_transfers_InitializeTokenTransfersAbortsIf">InitializeTokenTransfersAbortsIf</a> {
+    <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>;
+    <b>let</b> addr = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>);
+    <b>aborts_if</b> <b>exists</b>&lt;<a href="token_transfers.md#0x3_token_transfers_PendingClaims">PendingClaims</a>&gt;(addr);
+    <b>let</b> <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a> = <b>global</b>&lt;Account&gt;(addr);
+    <b>aborts_if</b> !<b>exists</b>&lt;Account&gt;(addr);
+    <b>aborts_if</b> <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>.guid_creation_num + 3 &gt;= <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account_MAX_GUID_CREATION_NUM">account::MAX_GUID_CREATION_NUM</a>;
+    <b>aborts_if</b> <a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>.guid_creation_num + 3 &gt; MAX_U64;
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_create_token_offer_id"></a>
+
+### Function `create_token_offer_id`
+
+
+<pre><code><b>fun</b> <a href="token_transfers.md#0x3_token_transfers_create_token_offer_id">create_token_offer_id</a>(to_addr: <b>address</b>, token_id: <a href="token.md#0x3_token_TokenId">token::TokenId</a>): <a href="token_transfers.md#0x3_token_transfers_TokenOfferId">token_transfers::TokenOfferId</a>
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_offer_script"></a>
+
+### Function `offer_script`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="token_transfers.md#0x3_token_transfers_offer_script">offer_script</a>(sender: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, receiver: <b>address</b>, creator: <b>address</b>, collection: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, property_version: u64, amount: u64)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+<b>let</b> token_id = <a href="token.md#0x3_token_create_token_id_raw">token::create_token_id_raw</a>(creator, collection, name, property_version);
+</code></pre>
+
+
+
+<a id="@Specification_1_offer"></a>
+
+### Function `offer`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token_transfers.md#0x3_token_transfers_offer">offer</a>(sender: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, receiver: <b>address</b>, token_id: <a href="token.md#0x3_token_TokenId">token::TokenId</a>, amount: u64)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+<b>let</b> sender_addr = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(sender);
+<b>include</b> !<b>exists</b>&lt;<a href="token_transfers.md#0x3_token_transfers_PendingClaims">PendingClaims</a>&gt;(sender_addr) ==&gt; <a href="token_transfers.md#0x3_token_transfers_InitializeTokenTransfersAbortsIf">InitializeTokenTransfersAbortsIf</a>{<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a> : sender};
+<b>let</b> pending_claims = <b>global</b>&lt;<a href="token_transfers.md#0x3_token_transfers_PendingClaims">PendingClaims</a>&gt;(sender_addr).pending_claims;
+<b>let</b> token_offer_id = <a href="token_transfers.md#0x3_token_transfers_create_token_offer_id">create_token_offer_id</a>(receiver, token_id);
+<b>let</b> tokens = <b>global</b>&lt;TokenStore&gt;(sender_addr).tokens;
+<b>aborts_if</b> amount &lt;= 0;
+<b>aborts_if</b> <a href="token.md#0x3_token_spec_balance_of">token::spec_balance_of</a>(sender_addr, token_id) &lt; amount;
+<b>aborts_if</b> !<b>exists</b>&lt;TokenStore&gt;(sender_addr);
+<b>aborts_if</b> !<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_contains">table::spec_contains</a>(tokens, token_id);
+<b>aborts_if</b> !<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_contains">table::spec_contains</a>(pending_claims, token_offer_id);
+<b>let</b> a = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_contains">table::spec_contains</a>(pending_claims, token_offer_id);
+<b>let</b> dst_token = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(pending_claims, token_offer_id);
+<b>aborts_if</b> dst_token.amount + <a href="token_transfers.md#0x3_token_transfers_spce_get">spce_get</a>(<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(sender), token_id, amount) &gt; MAX_U64;
+</code></pre>
+
+
+Get the amount from sender token
+
+
+<a id="0x3_token_transfers_spce_get"></a>
+
+
+<pre><code><b>fun</b> <a href="token_transfers.md#0x3_token_transfers_spce_get">spce_get</a>(
+   account_addr: <b>address</b>,
+   id: TokenId,
+   amount: u64
+): u64 {
+   <b>use</b> aptos_token::token::{TokenStore};
+   <b>use</b> aptos_std::table::{<b>Self</b>};
+   <b>let</b> tokens = <b>global</b>&lt;TokenStore&gt;(account_addr).tokens;
+   <b>let</b> balance = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(tokens, id).amount;
+   <b>if</b> (balance &gt; amount) {
+       amount
+   } <b>else</b> {
+       <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(tokens, id).amount
+   }
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_claim_script"></a>
+
+### Function `claim_script`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="token_transfers.md#0x3_token_transfers_claim_script">claim_script</a>(receiver: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, sender: <b>address</b>, creator: <b>address</b>, collection: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, property_version: u64)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> aborts_if_is_partial;
+<b>let</b> token_id = <a href="token.md#0x3_token_create_token_id_raw">token::create_token_id_raw</a>(creator, collection, name, property_version);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="token_transfers.md#0x3_token_transfers_PendingClaims">PendingClaims</a>&gt;(sender);
+<b>let</b> pending_claims = <b>global</b>&lt;<a href="token_transfers.md#0x3_token_transfers_PendingClaims">PendingClaims</a>&gt;(sender).pending_claims;
+<b>let</b> token_offer_id = <a href="token_transfers.md#0x3_token_transfers_create_token_offer_id">create_token_offer_id</a>(<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(receiver), token_id);
+<b>aborts_if</b> !<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_contains">table::spec_contains</a>(pending_claims, token_offer_id);
+<b>let</b> tokens = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(pending_claims, token_offer_id);
+<b>include</b> <a href="token.md#0x3_token_InitializeTokenStore">token::InitializeTokenStore</a>{<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>: receiver };
+<b>let</b> account_addr = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(receiver);
+<b>let</b> <a href="token.md#0x3_token">token</a> = tokens;
+<b>let</b> token_store = <b>global</b>&lt;TokenStore&gt;(account_addr);
+<b>let</b> recipient_token = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(token_store.tokens, <a href="token.md#0x3_token">token</a>.id);
+<b>let</b> b = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_contains">table::spec_contains</a>(token_store.tokens, <a href="token.md#0x3_token">token</a>.id);
+<b>aborts_if</b> <a href="token.md#0x3_token">token</a>.amount &lt;= 0;
+</code></pre>
+
+
+
+<a id="@Specification_1_claim"></a>
+
+### Function `claim`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token_transfers.md#0x3_token_transfers_claim">claim</a>(receiver: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, sender: <b>address</b>, token_id: <a href="token.md#0x3_token_TokenId">token::TokenId</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> aborts_if_is_partial;
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="token_transfers.md#0x3_token_transfers_PendingClaims">PendingClaims</a>&gt;(sender);
+<b>let</b> pending_claims = <b>global</b>&lt;<a href="token_transfers.md#0x3_token_transfers_PendingClaims">PendingClaims</a>&gt;(sender).pending_claims;
+<b>let</b> token_offer_id = <a href="token_transfers.md#0x3_token_transfers_create_token_offer_id">create_token_offer_id</a>(<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(receiver), token_id);
+<b>aborts_if</b> !<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_contains">table::spec_contains</a>(pending_claims, token_offer_id);
+<b>let</b> tokens = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(pending_claims, token_offer_id);
+<b>include</b> <a href="token.md#0x3_token_InitializeTokenStore">token::InitializeTokenStore</a>{<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>: receiver };
+<b>let</b> account_addr = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(receiver);
+<b>let</b> <a href="token.md#0x3_token">token</a> = tokens;
+<b>let</b> token_store = <b>global</b>&lt;TokenStore&gt;(account_addr);
+<b>let</b> recipient_token = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(token_store.tokens, <a href="token.md#0x3_token">token</a>.id);
+<b>let</b> b = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_contains">table::spec_contains</a>(token_store.tokens, <a href="token.md#0x3_token">token</a>.id);
+<b>aborts_if</b> <a href="token.md#0x3_token">token</a>.amount &lt;= 0;
+</code></pre>
+
+
+
+<a id="@Specification_1_cancel_offer_script"></a>
+
+### Function `cancel_offer_script`
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="token_transfers.md#0x3_token_transfers_cancel_offer_script">cancel_offer_script</a>(sender: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, receiver: <b>address</b>, creator: <b>address</b>, collection: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, name: <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/string.md#0x1_string_String">string::String</a>, property_version: u64)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> aborts_if_is_partial;
+<b>let</b> token_id = <a href="token.md#0x3_token_create_token_id_raw">token::create_token_id_raw</a>(creator, collection, name, property_version);
+<b>let</b> sender_addr = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(sender);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="token_transfers.md#0x3_token_transfers_PendingClaims">PendingClaims</a>&gt;(sender_addr);
+<b>let</b> pending_claims = <b>global</b>&lt;<a href="token_transfers.md#0x3_token_transfers_PendingClaims">PendingClaims</a>&gt;(sender_addr).pending_claims;
+<b>let</b> token_offer_id = <a href="token_transfers.md#0x3_token_transfers_create_token_offer_id">create_token_offer_id</a>(receiver, token_id);
+<b>aborts_if</b> !<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_contains">table::spec_contains</a>(pending_claims, token_offer_id);
+<b>include</b> <a href="token.md#0x3_token_InitializeTokenStore">token::InitializeTokenStore</a>{<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>: sender };
+<b>let</b> dst_token = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(pending_claims, token_offer_id);
+<b>let</b> account_addr = sender_addr;
+<b>let</b> <a href="token.md#0x3_token">token</a> = dst_token;
+<b>let</b> token_store = <b>global</b>&lt;TokenStore&gt;(account_addr);
+<b>let</b> recipient_token = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(token_store.tokens, <a href="token.md#0x3_token">token</a>.id);
+<b>let</b> b = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_contains">table::spec_contains</a>(token_store.tokens, <a href="token.md#0x3_token">token</a>.id);
+<b>aborts_if</b> <a href="token.md#0x3_token">token</a>.amount &lt;= 0;
+</code></pre>
+
+
+
+<a id="@Specification_1_cancel_offer"></a>
+
+### Function `cancel_offer`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="token_transfers.md#0x3_token_transfers_cancel_offer">cancel_offer</a>(sender: &<a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer">signer</a>, receiver: <b>address</b>, token_id: <a href="token.md#0x3_token_TokenId">token::TokenId</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> aborts_if_is_partial;
+<b>let</b> sender_addr = <a href="../../../aptos-framework/../aptos-stdlib/../move-stdlib/tests/compiler-v2-doc/signer.md#0x1_signer_address_of">signer::address_of</a>(sender);
+<b>aborts_if</b> !<b>exists</b>&lt;<a href="token_transfers.md#0x3_token_transfers_PendingClaims">PendingClaims</a>&gt;(sender_addr);
+<b>let</b> pending_claims = <b>global</b>&lt;<a href="token_transfers.md#0x3_token_transfers_PendingClaims">PendingClaims</a>&gt;(sender_addr).pending_claims;
+<b>let</b> token_offer_id = <a href="token_transfers.md#0x3_token_transfers_create_token_offer_id">create_token_offer_id</a>(receiver, token_id);
+<b>aborts_if</b> !<a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_contains">table::spec_contains</a>(pending_claims, token_offer_id);
+<b>include</b> <a href="token.md#0x3_token_InitializeTokenStore">token::InitializeTokenStore</a>{<a href="../../../aptos-framework/tests/compiler-v2-doc/account.md#0x1_account">account</a>: sender };
+<b>let</b> dst_token = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(pending_claims, token_offer_id);
+<b>let</b> account_addr = sender_addr;
+<b>let</b> <a href="token.md#0x3_token">token</a> = dst_token;
+<b>let</b> token_store = <b>global</b>&lt;TokenStore&gt;(account_addr);
+<b>let</b> recipient_token = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_get">table::spec_get</a>(token_store.tokens, <a href="token.md#0x3_token">token</a>.id);
+<b>let</b> b = <a href="../../../aptos-framework/../aptos-stdlib/tests/compiler-v2-doc/table.md#0x1_table_spec_contains">table::spec_contains</a>(token_store.tokens, <a href="token.md#0x3_token">token</a>.id);
+<b>aborts_if</b> <a href="token.md#0x3_token">token</a>.amount &lt;= 0;
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/cached-packages/src/aptos_framework_sdk_builder.rs b/aptos-move/framework/cached-packages/src/aptos_framework_sdk_builder.rs
index 96e1228c66ece..120f318c99af9 100644
--- a/aptos-move/framework/cached-packages/src/aptos_framework_sdk_builder.rs
+++ b/aptos-move/framework/cached-packages/src/aptos_framework_sdk_builder.rs
@@ -165,6 +165,17 @@ pub enum EntryFunctionCall {
         auth_key: AccountAddress,
     },
 
+    /// APT Primary Fungible Store specific specialized functions,
+    /// Utilized internally once migration of APT to FungibleAsset is complete.
+    /// Convenient function to transfer APT to a recipient account that might not exist.
+    /// This would create the recipient APT PFS first, which also registers it to receive APT, before transferring.
+    /// TODO: once migration is complete, rename to just "transfer_only" and make it an entry function (for cheapest way
+    /// to transfer APT) - if we want to allow APT PFS without account itself
+    AptosAccountFungibleTransferOnly {
+        to: AccountAddress,
+        amount: u64,
+    },
+
     /// Set whether `account` can receive direct transfers of coins that they have not explicitly registered to receive.
     AptosAccountSetAllowDirectCoinTransfers {
         allow: bool,
@@ -206,6 +217,21 @@ pub enum EntryFunctionCall {
         proposal_id: u64,
     },
 
+    /// Batch vote on proposal with proposal_id and specified voting power from multiple stake_pools.
+    AptosGovernanceBatchPartialVote {
+        stake_pools: Vec<AccountAddress>,
+        proposal_id: u64,
+        voting_power: u64,
+        should_pass: bool,
+    },
+
+    /// Vote on proposal with proposal_id and all voting power from multiple stake_pools.
+    AptosGovernanceBatchVote {
+        stake_pools: Vec<AccountAddress>,
+        proposal_id: u64,
+        should_pass: bool,
+    },
+
     /// Create a single-step proposal with the backing `stake_pool`.
     /// @param execution_hash Required. This is the hash of the resolution script. When the proposal is resolved,
     /// only the exact script with matching hash can be successfully executed.
@@ -893,6 +919,8 @@ pub enum EntryFunctionCall {
         new_voter: AccountAddress,
     },
 
+    TransactionFeeConvertToAptosFaBurnRef {},
+
     /// Used in on-chain governances to update the major version for the next epoch.
     /// Example usage:
     /// - `aptos_framework::version::set_for_next_epoch(&framework_signer, new_version);`
@@ -1080,6 +1108,9 @@ impl EntryFunctionCall {
                 amounts,
             } => aptos_account_batch_transfer_coins(coin_type, recipients, amounts),
             AptosAccountCreateAccount { auth_key } => aptos_account_create_account(auth_key),
+            AptosAccountFungibleTransferOnly { to, amount } => {
+                aptos_account_fungible_transfer_only(to, amount)
+            },
             AptosAccountSetAllowDirectCoinTransfers { allow } => {
                 aptos_account_set_allow_direct_coin_transfers(allow)
             },
@@ -1095,6 +1126,22 @@ impl EntryFunctionCall {
             AptosGovernanceAddApprovedScriptHashScript { proposal_id } => {
                 aptos_governance_add_approved_script_hash_script(proposal_id)
             },
+            AptosGovernanceBatchPartialVote {
+                stake_pools,
+                proposal_id,
+                voting_power,
+                should_pass,
+            } => aptos_governance_batch_partial_vote(
+                stake_pools,
+                proposal_id,
+                voting_power,
+                should_pass,
+            ),
+            AptosGovernanceBatchVote {
+                stake_pools,
+                proposal_id,
+                should_pass,
+            } => aptos_governance_batch_vote(stake_pools, proposal_id, should_pass),
             AptosGovernanceCreateProposal {
                 stake_pool,
                 execution_hash,
@@ -1538,6 +1585,9 @@ impl EntryFunctionCall {
                 operator,
                 new_voter,
             } => staking_proxy_set_voter(operator, new_voter),
+            TransactionFeeConvertToAptosFaBurnRef {} => {
+                transaction_fee_convert_to_aptos_fa_burn_ref()
+            },
             VersionSetForNextEpoch { major } => version_set_for_next_epoch(major),
             VersionSetVersion { major } => version_set_version(major),
             VestingAdminWithdraw { contract_address } => vesting_admin_withdraw(contract_address),
@@ -1921,6 +1971,27 @@ pub fn aptos_account_create_account(auth_key: AccountAddress) -> TransactionPayl
     ))
 }
 
+/// APT Primary Fungible Store specific specialized functions,
+/// Utilized internally once migration of APT to FungibleAsset is complete.
+/// Convenient function to transfer APT to a recipient account that might not exist.
+/// This would create the recipient APT PFS first, which also registers it to receive APT, before transferring.
+/// TODO: once migration is complete, rename to just "transfer_only" and make it an entry function (for cheapest way
+/// to transfer APT) - if we want to allow APT PFS without account itself
+pub fn aptos_account_fungible_transfer_only(to: AccountAddress, amount: u64) -> TransactionPayload {
+    TransactionPayload::EntryFunction(EntryFunction::new(
+        ModuleId::new(
+            AccountAddress::new([
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 1,
+            ]),
+            ident_str!("aptos_account").to_owned(),
+        ),
+        ident_str!("fungible_transfer_only").to_owned(),
+        vec![],
+        vec![bcs::to_bytes(&to).unwrap(), bcs::to_bytes(&amount).unwrap()],
+    ))
+}
+
 /// Set whether `account` can receive direct transfers of coins that they have not explicitly registered to receive.
 pub fn aptos_account_set_allow_direct_coin_transfers(allow: bool) -> TransactionPayload {
     TransactionPayload::EntryFunction(EntryFunction::new(
@@ -2044,6 +2115,56 @@ pub fn aptos_governance_add_approved_script_hash_script(proposal_id: u64) -> Tra
     ))
 }
 
+/// Batch vote on proposal with proposal_id and specified voting power from multiple stake_pools.
+pub fn aptos_governance_batch_partial_vote(
+    stake_pools: Vec<AccountAddress>,
+    proposal_id: u64,
+    voting_power: u64,
+    should_pass: bool,
+) -> TransactionPayload {
+    TransactionPayload::EntryFunction(EntryFunction::new(
+        ModuleId::new(
+            AccountAddress::new([
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 1,
+            ]),
+            ident_str!("aptos_governance").to_owned(),
+        ),
+        ident_str!("batch_partial_vote").to_owned(),
+        vec![],
+        vec![
+            bcs::to_bytes(&stake_pools).unwrap(),
+            bcs::to_bytes(&proposal_id).unwrap(),
+            bcs::to_bytes(&voting_power).unwrap(),
+            bcs::to_bytes(&should_pass).unwrap(),
+        ],
+    ))
+}
+
+/// Vote on proposal with proposal_id and all voting power from multiple stake_pools.
+pub fn aptos_governance_batch_vote(
+    stake_pools: Vec<AccountAddress>,
+    proposal_id: u64,
+    should_pass: bool,
+) -> TransactionPayload {
+    TransactionPayload::EntryFunction(EntryFunction::new(
+        ModuleId::new(
+            AccountAddress::new([
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 1,
+            ]),
+            ident_str!("aptos_governance").to_owned(),
+        ),
+        ident_str!("batch_vote").to_owned(),
+        vec![],
+        vec![
+            bcs::to_bytes(&stake_pools).unwrap(),
+            bcs::to_bytes(&proposal_id).unwrap(),
+            bcs::to_bytes(&should_pass).unwrap(),
+        ],
+    ))
+}
+
 /// Create a single-step proposal with the backing `stake_pool`.
 /// @param execution_hash Required. This is the hash of the resolution script. When the proposal is resolved,
 /// only the exact script with matching hash can be successfully executed.
@@ -4150,6 +4271,21 @@ pub fn staking_proxy_set_voter(
     ))
 }
 
+pub fn transaction_fee_convert_to_aptos_fa_burn_ref() -> TransactionPayload {
+    TransactionPayload::EntryFunction(EntryFunction::new(
+        ModuleId::new(
+            AccountAddress::new([
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 1,
+            ]),
+            ident_str!("transaction_fee").to_owned(),
+        ),
+        ident_str!("convert_to_aptos_fa_burn_ref").to_owned(),
+        vec![],
+        vec![],
+    ))
+}
+
 /// Used in on-chain governances to update the major version for the next epoch.
 /// Example usage:
 /// - `aptos_framework::version::set_for_next_epoch(&framework_signer, new_version);`
@@ -4681,6 +4817,19 @@ mod decoder {
         }
     }
 
+    pub fn aptos_account_fungible_transfer_only(
+        payload: &TransactionPayload,
+    ) -> Option<EntryFunctionCall> {
+        if let TransactionPayload::EntryFunction(script) = payload {
+            Some(EntryFunctionCall::AptosAccountFungibleTransferOnly {
+                to: bcs::from_bytes(script.args().get(0)?).ok()?,
+                amount: bcs::from_bytes(script.args().get(1)?).ok()?,
+            })
+        } else {
+            None
+        }
+    }
+
     pub fn aptos_account_set_allow_direct_coin_transfers(
         payload: &TransactionPayload,
     ) -> Option<EntryFunctionCall> {
@@ -4763,6 +4912,33 @@ mod decoder {
         }
     }
 
+    pub fn aptos_governance_batch_partial_vote(
+        payload: &TransactionPayload,
+    ) -> Option<EntryFunctionCall> {
+        if let TransactionPayload::EntryFunction(script) = payload {
+            Some(EntryFunctionCall::AptosGovernanceBatchPartialVote {
+                stake_pools: bcs::from_bytes(script.args().get(0)?).ok()?,
+                proposal_id: bcs::from_bytes(script.args().get(1)?).ok()?,
+                voting_power: bcs::from_bytes(script.args().get(2)?).ok()?,
+                should_pass: bcs::from_bytes(script.args().get(3)?).ok()?,
+            })
+        } else {
+            None
+        }
+    }
+
+    pub fn aptos_governance_batch_vote(payload: &TransactionPayload) -> Option<EntryFunctionCall> {
+        if let TransactionPayload::EntryFunction(script) = payload {
+            Some(EntryFunctionCall::AptosGovernanceBatchVote {
+                stake_pools: bcs::from_bytes(script.args().get(0)?).ok()?,
+                proposal_id: bcs::from_bytes(script.args().get(1)?).ok()?,
+                should_pass: bcs::from_bytes(script.args().get(2)?).ok()?,
+            })
+        } else {
+            None
+        }
+    }
+
     pub fn aptos_governance_create_proposal(
         payload: &TransactionPayload,
     ) -> Option<EntryFunctionCall> {
@@ -5993,6 +6169,16 @@ mod decoder {
         }
     }
 
+    pub fn transaction_fee_convert_to_aptos_fa_burn_ref(
+        payload: &TransactionPayload,
+    ) -> Option<EntryFunctionCall> {
+        if let TransactionPayload::EntryFunction(_script) = payload {
+            Some(EntryFunctionCall::TransactionFeeConvertToAptosFaBurnRef {})
+        } else {
+            None
+        }
+    }
+
     pub fn version_set_for_next_epoch(payload: &TransactionPayload) -> Option<EntryFunctionCall> {
         if let TransactionPayload::EntryFunction(script) = payload {
             Some(EntryFunctionCall::VersionSetForNextEpoch {
@@ -6275,6 +6461,10 @@ static SCRIPT_FUNCTION_DECODER_MAP: once_cell::sync::Lazy<EntryFunctionDecoderMa
             "aptos_account_create_account".to_string(),
             Box::new(decoder::aptos_account_create_account),
         );
+        map.insert(
+            "aptos_account_fungible_transfer_only".to_string(),
+            Box::new(decoder::aptos_account_fungible_transfer_only),
+        );
         map.insert(
             "aptos_account_set_allow_direct_coin_transfers".to_string(),
             Box::new(decoder::aptos_account_set_allow_direct_coin_transfers),
@@ -6303,6 +6493,14 @@ static SCRIPT_FUNCTION_DECODER_MAP: once_cell::sync::Lazy<EntryFunctionDecoderMa
             "aptos_governance_add_approved_script_hash_script".to_string(),
             Box::new(decoder::aptos_governance_add_approved_script_hash_script),
         );
+        map.insert(
+            "aptos_governance_batch_partial_vote".to_string(),
+            Box::new(decoder::aptos_governance_batch_partial_vote),
+        );
+        map.insert(
+            "aptos_governance_batch_vote".to_string(),
+            Box::new(decoder::aptos_governance_batch_vote),
+        );
         map.insert(
             "aptos_governance_create_proposal".to_string(),
             Box::new(decoder::aptos_governance_create_proposal),
@@ -6692,6 +6890,10 @@ static SCRIPT_FUNCTION_DECODER_MAP: once_cell::sync::Lazy<EntryFunctionDecoderMa
             "staking_proxy_set_voter".to_string(),
             Box::new(decoder::staking_proxy_set_voter),
         );
+        map.insert(
+            "transaction_fee_convert_to_aptos_fa_burn_ref".to_string(),
+            Box::new(decoder::transaction_fee_convert_to_aptos_fa_burn_ref),
+        );
         map.insert(
             "version_set_for_next_epoch".to_string(),
             Box::new(decoder::version_set_for_next_epoch),
diff --git a/aptos-move/framework/move-stdlib/doc/bcs.md b/aptos-move/framework/move-stdlib/doc/bcs.md
index e01e1d89e1a28..9bdcf7f45f7d3 100644
--- a/aptos-move/framework/move-stdlib/doc/bcs.md
+++ b/aptos-move/framework/move-stdlib/doc/bcs.md
@@ -10,7 +10,9 @@ details on BCS.
 
 
 -  [Function `to_bytes`](#0x1_bcs_to_bytes)
+-  [Function `serialized_size`](#0x1_bcs_serialized_size)
 -  [Specification](#@Specification_0)
+    -  [Function `serialized_size`](#@Specification_0_serialized_size)
 
 
 <pre><code></code></pre>
@@ -21,7 +23,8 @@ details on BCS.
 
 ## Function `to_bytes`
 
-Return the binary representation of <code>v</code> in BCS (Binary Canonical Serialization) format
+Returns the binary representation of <code>v</code> in BCS (Binary Canonical Serialization) format.
+Aborts with <code>0x1c5</code> error code if serialization fails.
 
 
 <pre><code><b>public</b> <b>fun</b> <a href="bcs.md#0x1_bcs_to_bytes">to_bytes</a>&lt;MoveValue&gt;(v: &MoveValue): <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;
@@ -38,6 +41,30 @@ Return the binary representation of <code>v</code> in BCS (Binary Canonical Seri
 
 
 
+</details>
+
+<a id="0x1_bcs_serialized_size"></a>
+
+## Function `serialized_size`
+
+Returns the size of the binary representation of <code>v</code> in BCS (Binary Canonical Serialization) format.
+Aborts with <code>0x1c5</code> error code if there is a failure when calculating serialized size.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bcs.md#0x1_bcs_serialized_size">serialized_size</a>&lt;MoveValue&gt;(v: &MoveValue): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>public</b> <b>fun</b> <a href="bcs.md#0x1_bcs_serialized_size">serialized_size</a>&lt;MoveValue&gt;(v: &MoveValue): u64;
+</code></pre>
+
+
+
 </details>
 
 <a id="@Specification_0"></a>
@@ -56,4 +83,21 @@ Native function which is defined in the prover's prelude.
 </code></pre>
 
 
+
+<a id="@Specification_0_serialized_size"></a>
+
+### Function `serialized_size`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bcs.md#0x1_bcs_serialized_size">serialized_size</a>&lt;MoveValue&gt;(v: &MoveValue): u64
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>ensures</b> result == len(<a href="bcs.md#0x1_bcs_serialize">serialize</a>(v));
+</code></pre>
+
+
 [move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/move-stdlib/doc/features.md b/aptos-move/framework/move-stdlib/doc/features.md
index 568bf4fa636c3..d35bb996c55c8 100644
--- a/aptos-move/framework/move-stdlib/doc/features.md
+++ b/aptos-move/framework/move-stdlib/doc/features.md
@@ -114,10 +114,21 @@ return true.
 -  [Function `coin_to_fungible_asset_migration_feature_enabled`](#0x1_features_coin_to_fungible_asset_migration_feature_enabled)
 -  [Function `get_primary_apt_fungible_store_at_user_address_feature`](#0x1_features_get_primary_apt_fungible_store_at_user_address_feature)
 -  [Function `primary_apt_fungible_store_at_user_address_enabled`](#0x1_features_primary_apt_fungible_store_at_user_address_enabled)
+-  [Function `aggregator_v2_is_at_least_api_enabled`](#0x1_features_aggregator_v2_is_at_least_api_enabled)
 -  [Function `get_object_native_derived_address_feature`](#0x1_features_get_object_native_derived_address_feature)
 -  [Function `object_native_derived_address_enabled`](#0x1_features_object_native_derived_address_enabled)
 -  [Function `get_dispatchable_fungible_asset_feature`](#0x1_features_get_dispatchable_fungible_asset_feature)
 -  [Function `dispatchable_fungible_asset_enabled`](#0x1_features_dispatchable_fungible_asset_enabled)
+-  [Function `get_new_accounts_default_to_fa_apt_store_feature`](#0x1_features_get_new_accounts_default_to_fa_apt_store_feature)
+-  [Function `new_accounts_default_to_fa_apt_store_enabled`](#0x1_features_new_accounts_default_to_fa_apt_store_enabled)
+-  [Function `get_operations_default_to_fa_apt_store_feature`](#0x1_features_get_operations_default_to_fa_apt_store_feature)
+-  [Function `operations_default_to_fa_apt_store_enabled`](#0x1_features_operations_default_to_fa_apt_store_enabled)
+-  [Function `get_concurrent_fungible_balance_feature`](#0x1_features_get_concurrent_fungible_balance_feature)
+-  [Function `concurrent_fungible_balance_enabled`](#0x1_features_concurrent_fungible_balance_enabled)
+-  [Function `get_default_to_concurrent_fungible_balance_feature`](#0x1_features_get_default_to_concurrent_fungible_balance_feature)
+-  [Function `default_to_concurrent_fungible_balance_enabled`](#0x1_features_default_to_concurrent_fungible_balance_enabled)
+-  [Function `get_abort_if_multisig_payload_mismatch_feature`](#0x1_features_get_abort_if_multisig_payload_mismatch_feature)
+-  [Function `abort_if_multisig_payload_mismatch_enabled`](#0x1_features_abort_if_multisig_payload_mismatch_enabled)
 -  [Function `change_feature_flags`](#0x1_features_change_feature_flags)
 -  [Function `change_feature_flags_internal`](#0x1_features_change_feature_flags_internal)
 -  [Function `change_feature_flags_for_next_epoch`](#0x1_features_change_feature_flags_for_next_epoch)
@@ -134,6 +145,7 @@ return true.
     -  [Function `periodical_reward_rate_decrease_enabled`](#@Specification_1_periodical_reward_rate_decrease_enabled)
     -  [Function `partial_governance_voting_enabled`](#@Specification_1_partial_governance_voting_enabled)
     -  [Function `module_event_enabled`](#@Specification_1_module_event_enabled)
+    -  [Function `abort_if_multisig_payload_mismatch_enabled`](#@Specification_1_abort_if_multisig_payload_mismatch_enabled)
     -  [Function `change_feature_flags_internal`](#@Specification_1_change_feature_flags_internal)
     -  [Function `change_feature_flags_for_next_epoch`](#@Specification_1_change_feature_flags_for_next_epoch)
     -  [Function `on_new_epoch`](#@Specification_1_on_new_epoch)
@@ -212,26 +224,24 @@ On epoch change, the updates take effect and this buffer is cleared.
 ## Constants
 
 
-<a id="0x1_features_AGGREGATOR_V2_API"></a>
+<a id="0x1_features_ABORT_IF_MULTISIG_PAYLOAD_MISMATCH"></a>
+
+Whether the multisig v2 fix is enabled. Once enabled, the multisig transaction execution will explicitly
+abort if the provided payload does not match the payload stored on-chain.
 
-Whether the Aggregator V2 API feature is enabled.
-Once enabled, the functions from aggregator_v2.move will be available for use.
 Lifetime: transient
 
 
-<pre><code><b>const</b> <a href="features.md#0x1_features_AGGREGATOR_V2_API">AGGREGATOR_V2_API</a>: u64 = 30;
+<pre><code><b>const</b> <a href="features.md#0x1_features_ABORT_IF_MULTISIG_PAYLOAD_MISMATCH">ABORT_IF_MULTISIG_PAYLOAD_MISMATCH</a>: u64 = 70;
 </code></pre>
 
 
 
-<a id="0x1_features_AGGREGATOR_V2_DELAYED_FIELDS"></a>
+<a id="0x1_features_AGGREGATOR_V2_IS_AT_LEAST_API"></a>
 
-Whether the Aggregator V2 delayed fields feature is enabled.
-Once enabled, Aggregator V2 functions become parallel.
-Lifetime: transient
 
 
-<pre><code><b>const</b> <a href="features.md#0x1_features_AGGREGATOR_V2_DELAYED_FIELDS">AGGREGATOR_V2_DELAYED_FIELDS</a>: u64 = 36;
+<pre><code><b>const</b> <a href="features.md#0x1_features_AGGREGATOR_V2_IS_AT_LEAST_API">AGGREGATOR_V2_IS_AT_LEAST_API</a>: u64 = 66;
 </code></pre>
 
 
@@ -376,14 +386,14 @@ Lifetime: transient
 
 
 
-<a id="0x1_features_CONCURRENT_TOKEN_V2"></a>
+<a id="0x1_features_CONCURRENT_FUNGIBLE_BALANCE"></a>
 
-Whether enable TokenV2 collection creation and Fungible Asset creation
+Whether enable concurent Fungible Balance
 to create higher throughput concurrent variants.
 Lifetime: transient
 
 
-<pre><code><b>const</b> <a href="features.md#0x1_features_CONCURRENT_TOKEN_V2">CONCURRENT_TOKEN_V2</a>: u64 = 37;
+<pre><code><b>const</b> <a href="features.md#0x1_features_CONCURRENT_FUNGIBLE_BALANCE">CONCURRENT_FUNGIBLE_BALANCE</a>: u64 = 67;
 </code></pre>
 
 
@@ -400,6 +410,17 @@ Lifetime: transient
 
 
 
+<a id="0x1_features_DEFAULT_TO_CONCURRENT_FUNGIBLE_BALANCE"></a>
+
+Whether to default new Fungible Store to the concurrent variant.
+Lifetime: transient
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_DEFAULT_TO_CONCURRENT_FUNGIBLE_BALANCE">DEFAULT_TO_CONCURRENT_FUNGIBLE_BALANCE</a>: u64 = 68;
+</code></pre>
+
+
+
 <a id="0x1_features_DELEGATION_POOLS"></a>
 
 Whether delegation pools are enabled.
@@ -465,6 +486,16 @@ Lifetime: ephemeral
 
 
 
+<a id="0x1_features_EFEATURE_CANNOT_BE_DISABLED"></a>
+
+Deployed to production, and disabling is deprecated.
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_EFEATURE_CANNOT_BE_DISABLED">EFEATURE_CANNOT_BE_DISABLED</a>: u64 = 3;
+</code></pre>
+
+
+
 <a id="0x1_features_EFRAMEWORK_SIGNER_NEEDED"></a>
 
 The provided signer has not a framework address.
@@ -627,6 +658,16 @@ Lifetime: transient
 
 
 
+<a id="0x1_features_NEW_ACCOUNTS_DEFAULT_TO_FA_APT_STORE"></a>
+
+Lifetime: transient
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_NEW_ACCOUNTS_DEFAULT_TO_FA_APT_STORE">NEW_ACCOUNTS_DEFAULT_TO_FA_APT_STORE</a>: u64 = 64;
+</code></pre>
+
+
+
 <a id="0x1_features_OBJECT_CODE_DEPLOYMENT"></a>
 
 Whether deploying to objects is enabled.
@@ -647,6 +688,16 @@ Whether we use more efficient native implementation of computing object derived
 
 
 
+<a id="0x1_features_OPERATIONS_DEFAULT_TO_FA_APT_STORE"></a>
+
+Lifetime: transient
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_OPERATIONS_DEFAULT_TO_FA_APT_STORE">OPERATIONS_DEFAULT_TO_FA_APT_STORE</a>: u64 = 65;
+</code></pre>
+
+
+
 <a id="0x1_features_OPERATOR_BENEFICIARY_CHANGE"></a>
 
 Whether allow changing beneficiaries for operators.
@@ -1579,7 +1630,9 @@ Lifetime: transient
 <summary>Implementation</summary>
 
 
-<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_auids">get_auids</a>(): u64 { <a href="features.md#0x1_features_APTOS_UNIQUE_IDENTIFIERS">APTOS_UNIQUE_IDENTIFIERS</a> }
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_auids">get_auids</a>(): u64 {
+    <a href="error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="features.md#0x1_features_EFEATURE_CANNOT_BE_DISABLED">EFEATURE_CANNOT_BE_DISABLED</a>)
+ }
 </code></pre>
 
 
@@ -1601,8 +1654,8 @@ Lifetime: transient
 <summary>Implementation</summary>
 
 
-<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_auids_enabled">auids_enabled</a>(): bool <b>acquires</b> <a href="features.md#0x1_features_Features">Features</a> {
-    <a href="features.md#0x1_features_is_enabled">is_enabled</a>(<a href="features.md#0x1_features_APTOS_UNIQUE_IDENTIFIERS">APTOS_UNIQUE_IDENTIFIERS</a>)
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_auids_enabled">auids_enabled</a>(): bool {
+    <b>true</b>
 }
 </code></pre>
 
@@ -1763,7 +1816,9 @@ Lifetime: transient
 <summary>Implementation</summary>
 
 
-<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_aggregator_v2_api_feature">get_aggregator_v2_api_feature</a>(): u64 { <a href="features.md#0x1_features_AGGREGATOR_V2_API">AGGREGATOR_V2_API</a> }
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_aggregator_v2_api_feature">get_aggregator_v2_api_feature</a>(): u64 {
+    <b>abort</b> <a href="error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="features.md#0x1_features_EFEATURE_CANNOT_BE_DISABLED">EFEATURE_CANNOT_BE_DISABLED</a>)
+}
 </code></pre>
 
 
@@ -1785,8 +1840,8 @@ Lifetime: transient
 <summary>Implementation</summary>
 
 
-<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_aggregator_v2_api_enabled">aggregator_v2_api_enabled</a>(): bool <b>acquires</b> <a href="features.md#0x1_features_Features">Features</a> {
-    <a href="features.md#0x1_features_is_enabled">is_enabled</a>(<a href="features.md#0x1_features_AGGREGATOR_V2_API">AGGREGATOR_V2_API</a>)
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_aggregator_v2_api_enabled">aggregator_v2_api_enabled</a>(): bool {
+    <b>true</b>
 }
 </code></pre>
 
@@ -1905,7 +1960,9 @@ Lifetime: transient
 <summary>Implementation</summary>
 
 
-<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_concurrent_token_v2_feature">get_concurrent_token_v2_feature</a>(): u64 { <a href="features.md#0x1_features_CONCURRENT_TOKEN_V2">CONCURRENT_TOKEN_V2</a> }
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_concurrent_token_v2_feature">get_concurrent_token_v2_feature</a>(): u64 {
+    <a href="error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="features.md#0x1_features_EFEATURE_CANNOT_BE_DISABLED">EFEATURE_CANNOT_BE_DISABLED</a>)
+}
 </code></pre>
 
 
@@ -1927,9 +1984,8 @@ Lifetime: transient
 <summary>Implementation</summary>
 
 
-<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_concurrent_token_v2_enabled">concurrent_token_v2_enabled</a>(): bool <b>acquires</b> <a href="features.md#0x1_features_Features">Features</a> {
-    // concurrent token v2 cannot be used <b>if</b> aggregator v2 api is not enabled.
-    <a href="features.md#0x1_features_is_enabled">is_enabled</a>(<a href="features.md#0x1_features_CONCURRENT_TOKEN_V2">CONCURRENT_TOKEN_V2</a>) && <a href="features.md#0x1_features_aggregator_v2_api_enabled">aggregator_v2_api_enabled</a>()
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_concurrent_token_v2_enabled">concurrent_token_v2_enabled</a>(): bool {
+    <b>true</b>
 }
 </code></pre>
 
@@ -1954,7 +2010,7 @@ Lifetime: transient
 
 
 <pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_concurrent_assets_feature">get_concurrent_assets_feature</a>(): u64 {
-    <b>abort</b> <a href="error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="features.md#0x1_features_EINVALID_FEATURE">EINVALID_FEATURE</a>)
+    <b>abort</b> <a href="error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="features.md#0x1_features_EFEATURE_CANNOT_BE_DISABLED">EFEATURE_CANNOT_BE_DISABLED</a>)
 }
 </code></pre>
 
@@ -1979,7 +2035,7 @@ Lifetime: transient
 
 
 <pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_concurrent_assets_enabled">concurrent_assets_enabled</a>(): bool {
-    <b>abort</b> <a href="error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="features.md#0x1_features_EINVALID_FEATURE">EINVALID_FEATURE</a>)
+    <b>abort</b> <a href="error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="features.md#0x1_features_EFEATURE_CANNOT_BE_DISABLED">EFEATURE_CANNOT_BE_DISABLED</a>)
 }
 </code></pre>
 
@@ -2347,8 +2403,7 @@ Lifetime: transient
 
 
 <pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_concurrent_fungible_assets_enabled">concurrent_fungible_assets_enabled</a>(): bool <b>acquires</b> <a href="features.md#0x1_features_Features">Features</a> {
-    // concurrent fungible assets cannot be used <b>if</b> aggregator v2 api is not enabled.
-    <a href="features.md#0x1_features_is_enabled">is_enabled</a>(<a href="features.md#0x1_features_CONCURRENT_FUNGIBLE_ASSETS">CONCURRENT_FUNGIBLE_ASSETS</a>) && <a href="features.md#0x1_features_aggregator_v2_api_enabled">aggregator_v2_api_enabled</a>()
+    <a href="features.md#0x1_features_is_enabled">is_enabled</a>(<a href="features.md#0x1_features_CONCURRENT_FUNGIBLE_ASSETS">CONCURRENT_FUNGIBLE_ASSETS</a>)
 }
 </code></pre>
 
@@ -2708,7 +2763,8 @@ Lifetime: transient
 
 
 
-<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_primary_apt_fungible_store_at_user_address_feature">get_primary_apt_fungible_store_at_user_address_feature</a>(): u64
+<pre><code>#[deprecated]
+<b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_primary_apt_fungible_store_at_user_address_feature">get_primary_apt_fungible_store_at_user_address_feature</a>(): u64
 </code></pre>
 
 
@@ -2718,7 +2774,9 @@ Lifetime: transient
 
 
 <pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_primary_apt_fungible_store_at_user_address_feature">get_primary_apt_fungible_store_at_user_address_feature</a>(
-): u64 { <a href="features.md#0x1_features_PRIMARY_APT_FUNGIBLE_STORE_AT_USER_ADDRESS">PRIMARY_APT_FUNGIBLE_STORE_AT_USER_ADDRESS</a> }
+): u64 {
+    <b>abort</b> <a href="error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="features.md#0x1_features_EINVALID_FEATURE">EINVALID_FEATURE</a>)
+}
 </code></pre>
 
 
@@ -2731,7 +2789,8 @@ Lifetime: transient
 
 
 
-<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_primary_apt_fungible_store_at_user_address_enabled">primary_apt_fungible_store_at_user_address_enabled</a>(): bool
+<pre><code>#[deprecated]
+<b>public</b> <b>fun</b> <a href="features.md#0x1_features_primary_apt_fungible_store_at_user_address_enabled">primary_apt_fungible_store_at_user_address_enabled</a>(): bool
 </code></pre>
 
 
@@ -2747,6 +2806,30 @@ Lifetime: transient
 
 
 
+</details>
+
+<a id="0x1_features_aggregator_v2_is_at_least_api_enabled"></a>
+
+## Function `aggregator_v2_is_at_least_api_enabled`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_aggregator_v2_is_at_least_api_enabled">aggregator_v2_is_at_least_api_enabled</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_aggregator_v2_is_at_least_api_enabled">aggregator_v2_is_at_least_api_enabled</a>(): bool <b>acquires</b> <a href="features.md#0x1_features_Features">Features</a> {
+    <a href="features.md#0x1_features_is_enabled">is_enabled</a>(<a href="features.md#0x1_features_AGGREGATOR_V2_IS_AT_LEAST_API">AGGREGATOR_V2_IS_AT_LEAST_API</a>)
+}
+</code></pre>
+
+
+
 </details>
 
 <a id="0x1_features_get_object_native_derived_address_feature"></a>
@@ -2839,6 +2922,236 @@ Lifetime: transient
 
 
 
+</details>
+
+<a id="0x1_features_get_new_accounts_default_to_fa_apt_store_feature"></a>
+
+## Function `get_new_accounts_default_to_fa_apt_store_feature`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_new_accounts_default_to_fa_apt_store_feature">get_new_accounts_default_to_fa_apt_store_feature</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_new_accounts_default_to_fa_apt_store_feature">get_new_accounts_default_to_fa_apt_store_feature</a>(): u64 { <a href="features.md#0x1_features_NEW_ACCOUNTS_DEFAULT_TO_FA_APT_STORE">NEW_ACCOUNTS_DEFAULT_TO_FA_APT_STORE</a> }
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_new_accounts_default_to_fa_apt_store_enabled"></a>
+
+## Function `new_accounts_default_to_fa_apt_store_enabled`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_new_accounts_default_to_fa_apt_store_enabled">new_accounts_default_to_fa_apt_store_enabled</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_new_accounts_default_to_fa_apt_store_enabled">new_accounts_default_to_fa_apt_store_enabled</a>(): bool <b>acquires</b> <a href="features.md#0x1_features_Features">Features</a> {
+    <a href="features.md#0x1_features_is_enabled">is_enabled</a>(<a href="features.md#0x1_features_NEW_ACCOUNTS_DEFAULT_TO_FA_APT_STORE">NEW_ACCOUNTS_DEFAULT_TO_FA_APT_STORE</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_get_operations_default_to_fa_apt_store_feature"></a>
+
+## Function `get_operations_default_to_fa_apt_store_feature`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_operations_default_to_fa_apt_store_feature">get_operations_default_to_fa_apt_store_feature</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_operations_default_to_fa_apt_store_feature">get_operations_default_to_fa_apt_store_feature</a>(): u64 { <a href="features.md#0x1_features_OPERATIONS_DEFAULT_TO_FA_APT_STORE">OPERATIONS_DEFAULT_TO_FA_APT_STORE</a> }
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_operations_default_to_fa_apt_store_enabled"></a>
+
+## Function `operations_default_to_fa_apt_store_enabled`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_operations_default_to_fa_apt_store_enabled">operations_default_to_fa_apt_store_enabled</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_operations_default_to_fa_apt_store_enabled">operations_default_to_fa_apt_store_enabled</a>(): bool <b>acquires</b> <a href="features.md#0x1_features_Features">Features</a> {
+    <a href="features.md#0x1_features_is_enabled">is_enabled</a>(<a href="features.md#0x1_features_OPERATIONS_DEFAULT_TO_FA_APT_STORE">OPERATIONS_DEFAULT_TO_FA_APT_STORE</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_get_concurrent_fungible_balance_feature"></a>
+
+## Function `get_concurrent_fungible_balance_feature`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_concurrent_fungible_balance_feature">get_concurrent_fungible_balance_feature</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_concurrent_fungible_balance_feature">get_concurrent_fungible_balance_feature</a>(): u64 { <a href="features.md#0x1_features_CONCURRENT_FUNGIBLE_BALANCE">CONCURRENT_FUNGIBLE_BALANCE</a> }
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_concurrent_fungible_balance_enabled"></a>
+
+## Function `concurrent_fungible_balance_enabled`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_concurrent_fungible_balance_enabled">concurrent_fungible_balance_enabled</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_concurrent_fungible_balance_enabled">concurrent_fungible_balance_enabled</a>(): bool <b>acquires</b> <a href="features.md#0x1_features_Features">Features</a> {
+    <a href="features.md#0x1_features_is_enabled">is_enabled</a>(<a href="features.md#0x1_features_CONCURRENT_FUNGIBLE_BALANCE">CONCURRENT_FUNGIBLE_BALANCE</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_get_default_to_concurrent_fungible_balance_feature"></a>
+
+## Function `get_default_to_concurrent_fungible_balance_feature`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_default_to_concurrent_fungible_balance_feature">get_default_to_concurrent_fungible_balance_feature</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_default_to_concurrent_fungible_balance_feature">get_default_to_concurrent_fungible_balance_feature</a>(): u64 { <a href="features.md#0x1_features_DEFAULT_TO_CONCURRENT_FUNGIBLE_BALANCE">DEFAULT_TO_CONCURRENT_FUNGIBLE_BALANCE</a> }
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_default_to_concurrent_fungible_balance_enabled"></a>
+
+## Function `default_to_concurrent_fungible_balance_enabled`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_default_to_concurrent_fungible_balance_enabled">default_to_concurrent_fungible_balance_enabled</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_default_to_concurrent_fungible_balance_enabled">default_to_concurrent_fungible_balance_enabled</a>(): bool <b>acquires</b> <a href="features.md#0x1_features_Features">Features</a> {
+    <a href="features.md#0x1_features_is_enabled">is_enabled</a>(<a href="features.md#0x1_features_DEFAULT_TO_CONCURRENT_FUNGIBLE_BALANCE">DEFAULT_TO_CONCURRENT_FUNGIBLE_BALANCE</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_get_abort_if_multisig_payload_mismatch_feature"></a>
+
+## Function `get_abort_if_multisig_payload_mismatch_feature`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_abort_if_multisig_payload_mismatch_feature">get_abort_if_multisig_payload_mismatch_feature</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_abort_if_multisig_payload_mismatch_feature">get_abort_if_multisig_payload_mismatch_feature</a>(): u64 { <a href="features.md#0x1_features_ABORT_IF_MULTISIG_PAYLOAD_MISMATCH">ABORT_IF_MULTISIG_PAYLOAD_MISMATCH</a> }
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_abort_if_multisig_payload_mismatch_enabled"></a>
+
+## Function `abort_if_multisig_payload_mismatch_enabled`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_abort_if_multisig_payload_mismatch_enabled">abort_if_multisig_payload_mismatch_enabled</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_abort_if_multisig_payload_mismatch_enabled">abort_if_multisig_payload_mismatch_enabled</a>(): bool <b>acquires</b> <a href="features.md#0x1_features_Features">Features</a> {
+    <a href="features.md#0x1_features_is_enabled">is_enabled</a>(<a href="features.md#0x1_features_ABORT_IF_MULTISIG_PAYLOAD_MISMATCH">ABORT_IF_MULTISIG_PAYLOAD_MISMATCH</a>)
+}
+</code></pre>
+
+
+
 </details>
 
 <a id="0x1_features_change_feature_flags"></a>
@@ -3280,6 +3593,35 @@ Helper to check whether a feature flag is enabled.
 
 
 
+
+<a id="0x1_features_spec_abort_if_multisig_payload_mismatch_enabled"></a>
+
+
+<pre><code><b>fun</b> <a href="features.md#0x1_features_spec_abort_if_multisig_payload_mismatch_enabled">spec_abort_if_multisig_payload_mismatch_enabled</a>(): bool {
+   <a href="features.md#0x1_features_spec_is_enabled">spec_is_enabled</a>(<a href="features.md#0x1_features_ABORT_IF_MULTISIG_PAYLOAD_MISMATCH">ABORT_IF_MULTISIG_PAYLOAD_MISMATCH</a>)
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_abort_if_multisig_payload_mismatch_enabled"></a>
+
+### Function `abort_if_multisig_payload_mismatch_enabled`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_abort_if_multisig_payload_mismatch_enabled">abort_if_multisig_payload_mismatch_enabled</a>(): bool
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> [abstract] <b>false</b>;
+<b>ensures</b> [abstract] result == <a href="features.md#0x1_features_spec_abort_if_multisig_payload_mismatch_enabled">spec_abort_if_multisig_payload_mismatch_enabled</a>();
+</code></pre>
+
+
+
 <a id="@Specification_1_change_feature_flags_internal"></a>
 
 ### Function `change_feature_flags_internal`
@@ -3349,6 +3691,17 @@ Helper to check whether a feature flag is enabled.
 
 
 
+
+<a id="0x1_features_spec_sha_512_and_ripemd_160_enabled"></a>
+
+
+<pre><code><b>fun</b> <a href="features.md#0x1_features_spec_sha_512_and_ripemd_160_enabled">spec_sha_512_and_ripemd_160_enabled</a>(): bool {
+   <a href="features.md#0x1_features_spec_is_enabled">spec_is_enabled</a>(<a href="features.md#0x1_features_SHA_512_AND_RIPEMD_160_NATIVES">SHA_512_AND_RIPEMD_160_NATIVES</a>)
+}
+</code></pre>
+
+
+
 <a id="@Specification_1_is_enabled"></a>
 
 ### Function `is_enabled`
diff --git a/aptos-move/framework/move-stdlib/sources/bcs.move b/aptos-move/framework/move-stdlib/sources/bcs.move
index 79b4c988906f2..478cbed627f24 100644
--- a/aptos-move/framework/move-stdlib/sources/bcs.move
+++ b/aptos-move/framework/move-stdlib/sources/bcs.move
@@ -3,9 +3,14 @@
 /// published on-chain. See https://github.com/aptos-labs/bcs#binary-canonical-serialization-bcs for more
 /// details on BCS.
 module std::bcs {
-    /// Return the binary representation of `v` in BCS (Binary Canonical Serialization) format
+    /// Returns the binary representation of `v` in BCS (Binary Canonical Serialization) format.
+    /// Aborts with `0x1c5` error code if serialization fails.
     native public fun to_bytes<MoveValue>(v: &MoveValue): vector<u8>;
 
+    /// Returns the size of the binary representation of `v` in BCS (Binary Canonical Serialization) format.
+    /// Aborts with `0x1c5` error code if there is a failure when calculating serialized size.
+    native public fun serialized_size<MoveValue>(v: &MoveValue): u64;
+
     // ==============================
     // Module Specification
     spec module {} // switch to module documentation context
@@ -14,4 +19,9 @@ module std::bcs {
         /// Native function which is defined in the prover's prelude.
         native fun serialize<MoveValue>(v: &MoveValue): vector<u8>;
     }
+
+    spec serialized_size<MoveValue>(v: &MoveValue): u64 {
+        pragma opaque;
+        ensures result == len(serialize(v));
+    }
 }
diff --git a/aptos-move/framework/move-stdlib/sources/configs/features.move b/aptos-move/framework/move-stdlib/sources/configs/features.move
index 514721e9238de..a1e55fc0653d0 100644
--- a/aptos-move/framework/move-stdlib/sources/configs/features.move
+++ b/aptos-move/framework/move-stdlib/sources/configs/features.move
@@ -29,6 +29,8 @@ module std::features {
 
     const EINVALID_FEATURE: u64 = 1;
     const EAPI_DISABLED: u64 = 2;
+    /// Deployed to production, and disabling is deprecated.
+    const EFEATURE_CANNOT_BE_DISABLED: u64 = 3;
 
     // --------------------------------------------------------------------------------------------
     // Code Publishing
@@ -222,10 +224,12 @@ module std::features {
     /// Lifetime: transient
     const APTOS_UNIQUE_IDENTIFIERS: u64 = 23;
 
-    public fun get_auids(): u64 { APTOS_UNIQUE_IDENTIFIERS }
+    public fun get_auids(): u64 {
+        error::invalid_argument(EFEATURE_CANNOT_BE_DISABLED)
+     }
 
-    public fun auids_enabled(): bool acquires Features {
-        is_enabled(APTOS_UNIQUE_IDENTIFIERS)
+    public fun auids_enabled(): bool {
+        true
     }
 
     /// Whether the Bulletproofs zero-knowledge range proof module is enabled, and the related native function is
@@ -264,15 +268,12 @@ module std::features {
     /// Lifetime: transient
     const SIGNATURE_CHECKER_V2_SCRIPT_FIX: u64 = 29;
 
-    /// Whether the Aggregator V2 API feature is enabled.
-    /// Once enabled, the functions from aggregator_v2.move will be available for use.
-    /// Lifetime: transient
-    const AGGREGATOR_V2_API: u64 = 30;
-
-    public fun get_aggregator_v2_api_feature(): u64 { AGGREGATOR_V2_API }
+    public fun get_aggregator_v2_api_feature(): u64 {
+        abort error::invalid_argument(EFEATURE_CANNOT_BE_DISABLED)
+    }
 
-    public fun aggregator_v2_api_enabled(): bool acquires Features {
-        is_enabled(AGGREGATOR_V2_API)
+    public fun aggregator_v2_api_enabled(): bool {
+        true
     }
 
     #[deprecated]
@@ -303,31 +304,22 @@ module std::features {
 
     const FEE_PAYER_ACCOUNT_OPTIONAL: u64 = 35;
 
-    /// Whether the Aggregator V2 delayed fields feature is enabled.
-    /// Once enabled, Aggregator V2 functions become parallel.
-    /// Lifetime: transient
-    const AGGREGATOR_V2_DELAYED_FIELDS: u64 = 36;
-
-    /// Whether enable TokenV2 collection creation and Fungible Asset creation
-    /// to create higher throughput concurrent variants.
-    /// Lifetime: transient
-    const CONCURRENT_TOKEN_V2: u64 = 37;
-
-    public fun get_concurrent_token_v2_feature(): u64 { CONCURRENT_TOKEN_V2 }
+    public fun get_concurrent_token_v2_feature(): u64 {
+        error::invalid_argument(EFEATURE_CANNOT_BE_DISABLED)
+    }
 
-    public fun concurrent_token_v2_enabled(): bool acquires Features {
-        // concurrent token v2 cannot be used if aggregator v2 api is not enabled.
-        is_enabled(CONCURRENT_TOKEN_V2) && aggregator_v2_api_enabled()
+    public fun concurrent_token_v2_enabled(): bool {
+        true
     }
 
     #[deprecated]
     public fun get_concurrent_assets_feature(): u64 {
-        abort error::invalid_argument(EINVALID_FEATURE)
+        abort error::invalid_argument(EFEATURE_CANNOT_BE_DISABLED)
     }
 
     #[deprecated]
     public fun concurrent_assets_enabled(): bool {
-        abort error::invalid_argument(EINVALID_FEATURE)
+        abort error::invalid_argument(EFEATURE_CANNOT_BE_DISABLED)
     }
 
     const LIMIT_MAX_IDENTIFIER_LENGTH: u64 = 38;
@@ -415,8 +407,7 @@ module std::features {
     public fun get_concurrent_fungible_assets_feature(): u64 { CONCURRENT_FUNGIBLE_ASSETS }
 
     public fun concurrent_fungible_assets_enabled(): bool acquires Features {
-        // concurrent fungible assets cannot be used if aggregator v2 api is not enabled.
-        is_enabled(CONCURRENT_FUNGIBLE_ASSETS) && aggregator_v2_api_enabled()
+        is_enabled(CONCURRENT_FUNGIBLE_ASSETS)
     }
 
     /// Whether deploying to objects is enabled.
@@ -503,13 +494,23 @@ module std::features {
 
     const PRIMARY_APT_FUNGIBLE_STORE_AT_USER_ADDRESS: u64 = 61;
 
+    #[deprecated]
     public fun get_primary_apt_fungible_store_at_user_address_feature(
-    ): u64 { PRIMARY_APT_FUNGIBLE_STORE_AT_USER_ADDRESS }
+    ): u64 {
+        abort error::invalid_argument(EINVALID_FEATURE)
+    }
 
+    #[deprecated]
     public fun primary_apt_fungible_store_at_user_address_enabled(): bool acquires Features {
         is_enabled(PRIMARY_APT_FUNGIBLE_STORE_AT_USER_ADDRESS)
     }
 
+    const AGGREGATOR_V2_IS_AT_LEAST_API: u64 = 66;
+
+    public fun aggregator_v2_is_at_least_api_enabled(): bool acquires Features {
+        is_enabled(AGGREGATOR_V2_IS_AT_LEAST_API)
+    }
+
     /// Whether we use more efficient native implementation of computing object derived address
     const OBJECT_NATIVE_DERIVED_ADDRESS: u64 = 62;
 
@@ -530,6 +531,57 @@ module std::features {
         is_enabled(DISPATCHABLE_FUNGIBLE_ASSET)
     }
 
+    /// Lifetime: transient
+    const NEW_ACCOUNTS_DEFAULT_TO_FA_APT_STORE: u64 = 64;
+
+    public fun get_new_accounts_default_to_fa_apt_store_feature(): u64 { NEW_ACCOUNTS_DEFAULT_TO_FA_APT_STORE }
+
+    public fun new_accounts_default_to_fa_apt_store_enabled(): bool acquires Features {
+        is_enabled(NEW_ACCOUNTS_DEFAULT_TO_FA_APT_STORE)
+    }
+
+    /// Lifetime: transient
+    const OPERATIONS_DEFAULT_TO_FA_APT_STORE: u64 = 65;
+
+    public fun get_operations_default_to_fa_apt_store_feature(): u64 { OPERATIONS_DEFAULT_TO_FA_APT_STORE }
+
+    public fun operations_default_to_fa_apt_store_enabled(): bool acquires Features {
+        is_enabled(OPERATIONS_DEFAULT_TO_FA_APT_STORE)
+    }
+
+    /// Whether enable concurent Fungible Balance
+    /// to create higher throughput concurrent variants.
+    /// Lifetime: transient
+    const CONCURRENT_FUNGIBLE_BALANCE: u64 = 67;
+
+    public fun get_concurrent_fungible_balance_feature(): u64 { CONCURRENT_FUNGIBLE_BALANCE }
+
+    public fun concurrent_fungible_balance_enabled(): bool acquires Features {
+        is_enabled(CONCURRENT_FUNGIBLE_BALANCE)
+    }
+
+    /// Whether to default new Fungible Store to the concurrent variant.
+    /// Lifetime: transient
+    const DEFAULT_TO_CONCURRENT_FUNGIBLE_BALANCE: u64 = 68;
+
+    public fun get_default_to_concurrent_fungible_balance_feature(): u64 { DEFAULT_TO_CONCURRENT_FUNGIBLE_BALANCE }
+
+    public fun default_to_concurrent_fungible_balance_enabled(): bool acquires Features {
+        is_enabled(DEFAULT_TO_CONCURRENT_FUNGIBLE_BALANCE)
+    }
+
+    /// Whether the multisig v2 fix is enabled. Once enabled, the multisig transaction execution will explicitly
+    /// abort if the provided payload does not match the payload stored on-chain.
+    ///
+    /// Lifetime: transient
+    const ABORT_IF_MULTISIG_PAYLOAD_MISMATCH: u64 = 70;
+
+    public fun get_abort_if_multisig_payload_mismatch_feature(): u64 { ABORT_IF_MULTISIG_PAYLOAD_MISMATCH }
+
+    public fun abort_if_multisig_payload_mismatch_enabled(): bool acquires Features {
+        is_enabled(ABORT_IF_MULTISIG_PAYLOAD_MISMATCH)
+    }
+
     // ============================================================================================
     // Feature Flag Implementation
 
diff --git a/aptos-move/framework/move-stdlib/sources/configs/features.spec.move b/aptos-move/framework/move-stdlib/sources/configs/features.spec.move
index 8779c94835b22..2823108154016 100644
--- a/aptos-move/framework/move-stdlib/sources/configs/features.spec.move
+++ b/aptos-move/framework/move-stdlib/sources/configs/features.spec.move
@@ -96,6 +96,16 @@ spec std::features {
         ensures [abstract] result == spec_module_event_enabled();
     }
 
+    spec fun spec_abort_if_multisig_payload_mismatch_enabled(): bool {
+        spec_is_enabled(ABORT_IF_MULTISIG_PAYLOAD_MISMATCH)
+    }
+
+    spec abort_if_multisig_payload_mismatch_enabled {
+        pragma opaque;
+        aborts_if [abstract] false;
+        ensures [abstract] result == spec_abort_if_multisig_payload_mismatch_enabled();
+    }
+
     spec on_new_epoch(framework: &signer) {
         requires @std == signer::address_of(framework);
         let features_pending = global<PendingFeatures>(@std).features;
@@ -103,4 +113,8 @@ spec std::features {
         ensures exists<PendingFeatures>(@std) ==> features_std == features_pending;
         aborts_if false;
     }
+
+    spec fun spec_sha_512_and_ripemd_160_enabled(): bool {
+        spec_is_enabled(SHA_512_AND_RIPEMD_160_NATIVES)
+    }
 }
diff --git a/aptos-move/framework/move-stdlib/src/natives/bcs.rs b/aptos-move/framework/move-stdlib/src/natives/bcs.rs
index c5941a401e06c..283e890c1cdf7 100644
--- a/aptos-move/framework/move-stdlib/src/natives/bcs.rs
+++ b/aptos-move/framework/move-stdlib/src/natives/bcs.rs
@@ -16,6 +16,8 @@ use move_core_types::{
 use move_vm_runtime::native_functions::NativeFunction;
 use move_vm_types::{
     loaded_data::runtime_types::Type,
+    natives::function::PartialVMResult,
+    value_serde::serialized_size_allowing_delayed_values,
     values::{values_impl::Reference, Value},
 };
 use smallvec::{smallvec, SmallVec};
@@ -42,11 +44,9 @@ fn native_to_bytes(
     debug_assert!(ty_args.len() == 1);
     debug_assert!(args.len() == 1);
 
-    // pop type and value
     let ref_to_val = safely_pop_arg!(args, Reference);
     let arg_type = ty_args.pop().unwrap();
 
-    // get type layout
     let layout = match context.type_to_type_layout(&arg_type) {
         Ok(layout) => layout,
         Err(_) => {
@@ -57,8 +57,10 @@ fn native_to_bytes(
         },
     };
 
-    // serialize value
+    // TODO(#14175): Reading the reference performs a deep copy, and we can
+    //               implement it in a more efficient way.
     let val = ref_to_val.read_ref()?;
+
     let serialized_value = match val.simple_serialize(&layout) {
         Some(serialized_value) => serialized_value,
         None => {
@@ -74,13 +76,66 @@ fn native_to_bytes(
     Ok(smallvec![Value::vector_u8(serialized_value)])
 }
 
+/***************************************************************************************************
+ * native fun serialized_size
+ *
+ *   gas cost: size_of(output)
+ *
+ *   If the getting the type layout or serialization results in error, a special failure
+ *   cost is charged.
+ *
+ **************************************************************************************************/
+fn native_serialized_size(
+    context: &mut SafeNativeContext,
+    mut ty_args: Vec<Type>,
+    mut args: VecDeque<Value>,
+) -> SafeNativeResult<SmallVec<[Value; 1]>> {
+    debug_assert!(ty_args.len() == 1);
+    debug_assert!(args.len() == 1);
+
+    context.charge(BCS_SERIALIZED_SIZE_BASE)?;
+
+    let reference = safely_pop_arg!(args, Reference);
+    let ty = ty_args.pop().unwrap();
+
+    let serialized_size = match serialized_size_impl(context, reference, &ty) {
+        Ok(serialized_size) => serialized_size as u64,
+        Err(_) => {
+            context.charge(BCS_SERIALIZED_SIZE_FAILURE)?;
+
+            // Re-use the same abort code as bcs::to_bytes.
+            return Err(SafeNativeError::Abort {
+                abort_code: NFE_BCS_SERIALIZATION_FAILURE,
+            });
+        },
+    };
+    context.charge(BCS_SERIALIZED_SIZE_PER_BYTE_SERIALIZED * NumBytes::new(serialized_size))?;
+
+    Ok(smallvec![Value::u64(serialized_size)])
+}
+
+fn serialized_size_impl(
+    context: &mut SafeNativeContext,
+    reference: Reference,
+    ty: &Type,
+) -> PartialVMResult<usize> {
+    // TODO(#14175): Reading the reference performs a deep copy, and we can
+    //               implement it in a more efficient way.
+    let value = reference.read_ref()?;
+    let ty_layout = context.type_to_type_layout(ty)?;
+    serialized_size_allowing_delayed_values(&value, &ty_layout)
+}
+
 /***************************************************************************************************
  * module
  **************************************************************************************************/
 pub fn make_all(
     builder: &SafeNativeBuilder,
 ) -> impl Iterator<Item = (String, NativeFunction)> + '_ {
-    let funcs = [("to_bytes", native_to_bytes as RawSafeNative)];
+    let funcs = [
+        ("to_bytes", native_to_bytes as RawSafeNative),
+        ("serialized_size", native_serialized_size),
+    ];
 
     builder.make_named_natives(funcs)
 }
diff --git a/aptos-move/framework/move-stdlib/tests/bcs_tests.move b/aptos-move/framework/move-stdlib/tests/bcs_tests.move
index 72437ebb00fd6..367f504044694 100644
--- a/aptos-move/framework/move-stdlib/tests/bcs_tests.move
+++ b/aptos-move/framework/move-stdlib/tests/bcs_tests.move
@@ -1,6 +1,7 @@
 #[test_only]
 module std::bcs_tests {
     use std::bcs;
+    use std::vector;
 
     struct Box<T> has copy, drop, store { x: T }
     struct Box3<T> has copy, drop, store { x: Box<Box<T>> }
@@ -10,44 +11,61 @@ module std::bcs_tests {
     struct Box63<T> has copy, drop, store { x: Box31<Box31<T>> }
     struct Box127<T> has copy, drop, store { x: Box63<Box63<T>> }
 
-    /* Deactivated because of address size dependency
-    #[test]
-    fun bcs_address() {
-        let addr = @0x89b9f9d1fadc027cf9532d6f99041522;
-        let expected_output = x"89b9f9d1fadc027cf9532d6f99041522";
-        assert!(bcs::to_bytes(&addr) == expected_output, 0);
-    }
-    */
-
     #[test]
     fun bcs_bool() {
-        let expected_output = x"01";
-        assert!(bcs::to_bytes(&true) == expected_output, 0);
+        let expected_bytes = x"01";
+        let actual_bytes = bcs::to_bytes(&true);
+        assert!(actual_bytes == expected_bytes, 0);
+
+        let expected_size = vector::length(&actual_bytes);
+        let actual_size = bcs::serialized_size(&true);
+        assert!(actual_size == expected_size, 1);
     }
 
     #[test]
     fun bcs_u8() {
-        let expected_output = x"01";
-        assert!(bcs::to_bytes(&1u8) == expected_output, 0);
+        let expected_bytes = x"01";
+        let actual_bytes = bcs::to_bytes(&1u8);
+        assert!(actual_bytes == expected_bytes, 0);
+
+        let expected_size = vector::length(&actual_bytes);
+        let actual_size = bcs::serialized_size(&1u8);
+        assert!(actual_size == expected_size, 1);
     }
 
     #[test]
     fun bcs_u64() {
-        let expected_output = x"0100000000000000";
-        assert!(bcs::to_bytes(&1) == expected_output, 0);
+        let expected_bytes = x"0100000000000000";
+        let actual_bytes = bcs::to_bytes(&1);
+        assert!(actual_bytes == expected_bytes, 0);
+
+        let expected_size = vector::length(&actual_bytes);
+        let actual_size = bcs::serialized_size(&1);
+        assert!(actual_size == expected_size, 1);
     }
 
     #[test]
     fun bcs_u128() {
-        let expected_output = x"01000000000000000000000000000000";
-        assert!(bcs::to_bytes(&1u128) == expected_output, 0);
+        let expected_bytes = x"01000000000000000000000000000000";
+        let actual_bytes = bcs::to_bytes(&1u128);
+        assert!(actual_bytes == expected_bytes, 0);
+
+        let expected_size = vector::length(&actual_bytes);
+        let actual_size = bcs::serialized_size(&1u128);
+        assert!(actual_size == expected_size, 1);
     }
 
     #[test]
     fun bcs_vec_u8() {
         let v = x"0f";
-        let expected_output = x"010f";
-        assert!(bcs::to_bytes(&v) == expected_output, 0);
+
+        let expected_bytes = x"010f";
+        let actual_bytes = bcs::to_bytes(&v);
+        assert!(actual_bytes == expected_bytes, 0);
+
+        let expected_size = vector::length(&actual_bytes);
+        let actual_size = bcs::serialized_size(&v);
+        assert!(actual_size == expected_size, 1);
     }
 
     fun box3<T>(x: T): Box3<T> {
@@ -76,14 +94,12 @@ module std::bcs_tests {
 
     #[test]
     fun encode_128() {
-        bcs::to_bytes(&box127(true));
-    }
+        let box = box127(true);
 
-    /* Deactivated because we now limit the depth of values you could create inside the VM
-    #[test]
-    #[expected_failure(abort_code = 453, location = std::bcs)]
-    fun encode_129() {
-        bcs::to_bytes(&Box { x: box127(true) });
+        let bytes = bcs::to_bytes(&box);
+        let expected_size = vector::length(&bytes);
+
+        let actual_size = bcs::serialized_size(&box);
+        assert!(actual_size == expected_size, 0);
     }
-    */
 }
diff --git a/aptos-move/framework/move-stdlib/tests/compiler-v2-doc/acl.md b/aptos-move/framework/move-stdlib/tests/compiler-v2-doc/acl.md
new file mode 100644
index 0000000000000..5310909afc734
--- /dev/null
+++ b/aptos-move/framework/move-stdlib/tests/compiler-v2-doc/acl.md
@@ -0,0 +1,320 @@
+
+<a id="0x1_acl"></a>
+
+# Module `0x1::acl`
+
+Access control list (acl) module. An acl is a list of account addresses who
+have the access permission to a certain object.
+This module uses a <code><a href="vector.md#0x1_vector">vector</a></code> to represent the list, but can be refactored to
+use a "set" instead when it's available in the language in the future.
+
+
+-  [Struct `ACL`](#0x1_acl_ACL)
+-  [Constants](#@Constants_0)
+-  [Function `empty`](#0x1_acl_empty)
+-  [Function `add`](#0x1_acl_add)
+-  [Function `remove`](#0x1_acl_remove)
+-  [Function `contains`](#0x1_acl_contains)
+-  [Function `assert_contains`](#0x1_acl_assert_contains)
+-  [Specification](#@Specification_1)
+    -  [Struct `ACL`](#@Specification_1_ACL)
+    -  [Function `add`](#@Specification_1_add)
+    -  [Function `remove`](#@Specification_1_remove)
+    -  [Function `contains`](#@Specification_1_contains)
+    -  [Function `assert_contains`](#@Specification_1_assert_contains)
+
+
+<pre><code><b>use</b> <a href="error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="vector.md#0x1_vector">0x1::vector</a>;
+</code></pre>
+
+
+
+<a id="0x1_acl_ACL"></a>
+
+## Struct `ACL`
+
+
+
+<pre><code><b>struct</b> <a href="acl.md#0x1_acl_ACL">ACL</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>list: <a href="vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_acl_ECONTAIN"></a>
+
+The ACL already contains the address.
+
+
+<pre><code><b>const</b> <a href="acl.md#0x1_acl_ECONTAIN">ECONTAIN</a>: u64 = 0;
+</code></pre>
+
+
+
+<a id="0x1_acl_ENOT_CONTAIN"></a>
+
+The ACL does not contain the address.
+
+
+<pre><code><b>const</b> <a href="acl.md#0x1_acl_ENOT_CONTAIN">ENOT_CONTAIN</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_acl_empty"></a>
+
+## Function `empty`
+
+Return an empty ACL.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="acl.md#0x1_acl_empty">empty</a>(): <a href="acl.md#0x1_acl_ACL">acl::ACL</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="acl.md#0x1_acl_empty">empty</a>(): <a href="acl.md#0x1_acl_ACL">ACL</a> {
+    <a href="acl.md#0x1_acl_ACL">ACL</a>{ list: <a href="vector.md#0x1_vector_empty">vector::empty</a>&lt;<b>address</b>&gt;() }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_acl_add"></a>
+
+## Function `add`
+
+Add the address to the ACL.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="acl.md#0x1_acl_add">add</a>(<a href="acl.md#0x1_acl">acl</a>: &<b>mut</b> <a href="acl.md#0x1_acl_ACL">acl::ACL</a>, addr: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="acl.md#0x1_acl_add">add</a>(<a href="acl.md#0x1_acl">acl</a>: &<b>mut</b> <a href="acl.md#0x1_acl_ACL">ACL</a>, addr: <b>address</b>) {
+    <b>assert</b>!(!<a href="vector.md#0x1_vector_contains">vector::contains</a>(&<b>mut</b> <a href="acl.md#0x1_acl">acl</a>.list, &addr), <a href="error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="acl.md#0x1_acl_ECONTAIN">ECONTAIN</a>));
+    <a href="vector.md#0x1_vector_push_back">vector::push_back</a>(&<b>mut</b> <a href="acl.md#0x1_acl">acl</a>.list, addr);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_acl_remove"></a>
+
+## Function `remove`
+
+Remove the address from the ACL.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="acl.md#0x1_acl_remove">remove</a>(<a href="acl.md#0x1_acl">acl</a>: &<b>mut</b> <a href="acl.md#0x1_acl_ACL">acl::ACL</a>, addr: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="acl.md#0x1_acl_remove">remove</a>(<a href="acl.md#0x1_acl">acl</a>: &<b>mut</b> <a href="acl.md#0x1_acl_ACL">ACL</a>, addr: <b>address</b>) {
+    <b>let</b> (found, index) = <a href="vector.md#0x1_vector_index_of">vector::index_of</a>(&<b>mut</b> <a href="acl.md#0x1_acl">acl</a>.list, &addr);
+    <b>assert</b>!(found, <a href="error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="acl.md#0x1_acl_ENOT_CONTAIN">ENOT_CONTAIN</a>));
+    <a href="vector.md#0x1_vector_remove">vector::remove</a>(&<b>mut</b> <a href="acl.md#0x1_acl">acl</a>.list, index);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_acl_contains"></a>
+
+## Function `contains`
+
+Return true iff the ACL contains the address.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="acl.md#0x1_acl_contains">contains</a>(<a href="acl.md#0x1_acl">acl</a>: &<a href="acl.md#0x1_acl_ACL">acl::ACL</a>, addr: <b>address</b>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="acl.md#0x1_acl_contains">contains</a>(<a href="acl.md#0x1_acl">acl</a>: &<a href="acl.md#0x1_acl_ACL">ACL</a>, addr: <b>address</b>): bool {
+    <a href="vector.md#0x1_vector_contains">vector::contains</a>(&<a href="acl.md#0x1_acl">acl</a>.list, &addr)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_acl_assert_contains"></a>
+
+## Function `assert_contains`
+
+assert! that the ACL has the address.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="acl.md#0x1_acl_assert_contains">assert_contains</a>(<a href="acl.md#0x1_acl">acl</a>: &<a href="acl.md#0x1_acl_ACL">acl::ACL</a>, addr: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="acl.md#0x1_acl_assert_contains">assert_contains</a>(<a href="acl.md#0x1_acl">acl</a>: &<a href="acl.md#0x1_acl_ACL">ACL</a>, addr: <b>address</b>) {
+    <b>assert</b>!(<a href="acl.md#0x1_acl_contains">contains</a>(<a href="acl.md#0x1_acl">acl</a>, addr), <a href="error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="acl.md#0x1_acl_ENOT_CONTAIN">ENOT_CONTAIN</a>));
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+<a id="@Specification_1_ACL"></a>
+
+### Struct `ACL`
+
+
+<pre><code><b>struct</b> <a href="acl.md#0x1_acl_ACL">ACL</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<dl>
+<dt>
+<code>list: <a href="vector.md#0x1_vector">vector</a>&lt;<b>address</b>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+
+<pre><code><b>invariant</b> <b>forall</b> i in 0..len(list), j in 0..len(list): list[i] == list[j] ==&gt; i == j;
+</code></pre>
+
+
+
+
+<a id="0x1_acl_spec_contains"></a>
+
+
+<pre><code><b>fun</b> <a href="acl.md#0x1_acl_spec_contains">spec_contains</a>(<a href="acl.md#0x1_acl">acl</a>: <a href="acl.md#0x1_acl_ACL">ACL</a>, addr: <b>address</b>): bool {
+   <b>exists</b> a in <a href="acl.md#0x1_acl">acl</a>.list: a == addr
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_add"></a>
+
+### Function `add`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="acl.md#0x1_acl_add">add</a>(<a href="acl.md#0x1_acl">acl</a>: &<b>mut</b> <a href="acl.md#0x1_acl_ACL">acl::ACL</a>, addr: <b>address</b>)
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <a href="acl.md#0x1_acl_spec_contains">spec_contains</a>(<a href="acl.md#0x1_acl">acl</a>, addr) <b>with</b> <a href="error.md#0x1_error_INVALID_ARGUMENT">error::INVALID_ARGUMENT</a>;
+<b>ensures</b> <a href="acl.md#0x1_acl_spec_contains">spec_contains</a>(<a href="acl.md#0x1_acl">acl</a>, addr);
+</code></pre>
+
+
+
+<a id="@Specification_1_remove"></a>
+
+### Function `remove`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="acl.md#0x1_acl_remove">remove</a>(<a href="acl.md#0x1_acl">acl</a>: &<b>mut</b> <a href="acl.md#0x1_acl_ACL">acl::ACL</a>, addr: <b>address</b>)
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<a href="acl.md#0x1_acl_spec_contains">spec_contains</a>(<a href="acl.md#0x1_acl">acl</a>, addr) <b>with</b> <a href="error.md#0x1_error_INVALID_ARGUMENT">error::INVALID_ARGUMENT</a>;
+<b>ensures</b> !<a href="acl.md#0x1_acl_spec_contains">spec_contains</a>(<a href="acl.md#0x1_acl">acl</a>, addr);
+</code></pre>
+
+
+
+<a id="@Specification_1_contains"></a>
+
+### Function `contains`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="acl.md#0x1_acl_contains">contains</a>(<a href="acl.md#0x1_acl">acl</a>: &<a href="acl.md#0x1_acl_ACL">acl::ACL</a>, addr: <b>address</b>): bool
+</code></pre>
+
+
+
+
+<pre><code><b>ensures</b> result == <a href="acl.md#0x1_acl_spec_contains">spec_contains</a>(<a href="acl.md#0x1_acl">acl</a>, addr);
+</code></pre>
+
+
+
+<a id="@Specification_1_assert_contains"></a>
+
+### Function `assert_contains`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="acl.md#0x1_acl_assert_contains">assert_contains</a>(<a href="acl.md#0x1_acl">acl</a>: &<a href="acl.md#0x1_acl_ACL">acl::ACL</a>, addr: <b>address</b>)
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> !<a href="acl.md#0x1_acl_spec_contains">spec_contains</a>(<a href="acl.md#0x1_acl">acl</a>, addr) <b>with</b> <a href="error.md#0x1_error_INVALID_ARGUMENT">error::INVALID_ARGUMENT</a>;
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/move-stdlib/tests/compiler-v2-doc/bcs.md b/aptos-move/framework/move-stdlib/tests/compiler-v2-doc/bcs.md
new file mode 100644
index 0000000000000..9bdcf7f45f7d3
--- /dev/null
+++ b/aptos-move/framework/move-stdlib/tests/compiler-v2-doc/bcs.md
@@ -0,0 +1,103 @@
+
+<a id="0x1_bcs"></a>
+
+# Module `0x1::bcs`
+
+Utility for converting a Move value to its binary representation in BCS (Binary Canonical
+Serialization). BCS is the binary encoding for Move resources and other non-module values
+published on-chain. See https://github.com/aptos-labs/bcs#binary-canonical-serialization-bcs for more
+details on BCS.
+
+
+-  [Function `to_bytes`](#0x1_bcs_to_bytes)
+-  [Function `serialized_size`](#0x1_bcs_serialized_size)
+-  [Specification](#@Specification_0)
+    -  [Function `serialized_size`](#@Specification_0_serialized_size)
+
+
+<pre><code></code></pre>
+
+
+
+<a id="0x1_bcs_to_bytes"></a>
+
+## Function `to_bytes`
+
+Returns the binary representation of <code>v</code> in BCS (Binary Canonical Serialization) format.
+Aborts with <code>0x1c5</code> error code if serialization fails.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bcs.md#0x1_bcs_to_bytes">to_bytes</a>&lt;MoveValue&gt;(v: &MoveValue): <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>public</b> <b>fun</b> <a href="bcs.md#0x1_bcs_to_bytes">to_bytes</a>&lt;MoveValue&gt;(v: &MoveValue): <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_bcs_serialized_size"></a>
+
+## Function `serialized_size`
+
+Returns the size of the binary representation of <code>v</code> in BCS (Binary Canonical Serialization) format.
+Aborts with <code>0x1c5</code> error code if there is a failure when calculating serialized size.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bcs.md#0x1_bcs_serialized_size">serialized_size</a>&lt;MoveValue&gt;(v: &MoveValue): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>public</b> <b>fun</b> <a href="bcs.md#0x1_bcs_serialized_size">serialized_size</a>&lt;MoveValue&gt;(v: &MoveValue): u64;
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_0"></a>
+
+## Specification
+
+
+
+Native function which is defined in the prover's prelude.
+
+
+<a id="0x1_bcs_serialize"></a>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="bcs.md#0x1_bcs_serialize">serialize</a>&lt;MoveValue&gt;(v: &MoveValue): <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+</code></pre>
+
+
+
+<a id="@Specification_0_serialized_size"></a>
+
+### Function `serialized_size`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bcs.md#0x1_bcs_serialized_size">serialized_size</a>&lt;MoveValue&gt;(v: &MoveValue): u64
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>ensures</b> result == len(<a href="bcs.md#0x1_bcs_serialize">serialize</a>(v));
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/move-stdlib/tests/compiler-v2-doc/bit_vector.md b/aptos-move/framework/move-stdlib/tests/compiler-v2-doc/bit_vector.md
new file mode 100644
index 0000000000000..316dd066b223f
--- /dev/null
+++ b/aptos-move/framework/move-stdlib/tests/compiler-v2-doc/bit_vector.md
@@ -0,0 +1,553 @@
+
+<a id="0x1_bit_vector"></a>
+
+# Module `0x1::bit_vector`
+
+
+
+-  [Struct `BitVector`](#0x1_bit_vector_BitVector)
+-  [Constants](#@Constants_0)
+-  [Function `new`](#0x1_bit_vector_new)
+-  [Function `set`](#0x1_bit_vector_set)
+-  [Function `unset`](#0x1_bit_vector_unset)
+-  [Function `shift_left`](#0x1_bit_vector_shift_left)
+-  [Function `is_index_set`](#0x1_bit_vector_is_index_set)
+-  [Function `length`](#0x1_bit_vector_length)
+-  [Function `longest_set_sequence_starting_at`](#0x1_bit_vector_longest_set_sequence_starting_at)
+-  [Specification](#@Specification_1)
+    -  [Struct `BitVector`](#@Specification_1_BitVector)
+    -  [Function `new`](#@Specification_1_new)
+    -  [Function `set`](#@Specification_1_set)
+    -  [Function `unset`](#@Specification_1_unset)
+    -  [Function `shift_left`](#@Specification_1_shift_left)
+    -  [Function `is_index_set`](#@Specification_1_is_index_set)
+    -  [Function `longest_set_sequence_starting_at`](#@Specification_1_longest_set_sequence_starting_at)
+
+
+<pre><code></code></pre>
+
+
+
+<a id="0x1_bit_vector_BitVector"></a>
+
+## Struct `BitVector`
+
+
+
+<pre><code><b>struct</b> <a href="bit_vector.md#0x1_bit_vector_BitVector">BitVector</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>length: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>bit_field: <a href="vector.md#0x1_vector">vector</a>&lt;bool&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_bit_vector_EINDEX"></a>
+
+The provided index is out of bounds
+
+
+<pre><code><b>const</b> <a href="bit_vector.md#0x1_bit_vector_EINDEX">EINDEX</a>: u64 = 131072;
+</code></pre>
+
+
+
+<a id="0x1_bit_vector_ELENGTH"></a>
+
+An invalid length of bitvector was given
+
+
+<pre><code><b>const</b> <a href="bit_vector.md#0x1_bit_vector_ELENGTH">ELENGTH</a>: u64 = 131073;
+</code></pre>
+
+
+
+<a id="0x1_bit_vector_MAX_SIZE"></a>
+
+The maximum allowed bitvector size
+
+
+<pre><code><b>const</b> <a href="bit_vector.md#0x1_bit_vector_MAX_SIZE">MAX_SIZE</a>: u64 = 1024;
+</code></pre>
+
+
+
+<a id="0x1_bit_vector_WORD_SIZE"></a>
+
+
+
+<pre><code><b>const</b> <a href="bit_vector.md#0x1_bit_vector_WORD_SIZE">WORD_SIZE</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_bit_vector_new"></a>
+
+## Function `new`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_new">new</a>(length: u64): <a href="bit_vector.md#0x1_bit_vector_BitVector">bit_vector::BitVector</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_new">new</a>(length: u64): <a href="bit_vector.md#0x1_bit_vector_BitVector">BitVector</a> {
+    <b>assert</b>!(length &gt; 0, <a href="bit_vector.md#0x1_bit_vector_ELENGTH">ELENGTH</a>);
+    <b>assert</b>!(<a href="bit_vector.md#0x1_bit_vector_length">length</a> &lt; <a href="bit_vector.md#0x1_bit_vector_MAX_SIZE">MAX_SIZE</a>, <a href="bit_vector.md#0x1_bit_vector_ELENGTH">ELENGTH</a>);
+    <b>let</b> counter = 0;
+    <b>let</b> bit_field = <a href="vector.md#0x1_vector_empty">vector::empty</a>();
+    <b>while</b> ({<b>spec</b> {
+        <b>invariant</b> counter &lt;= length;
+        <b>invariant</b> len(bit_field) == counter;
+    };
+        (counter &lt; length)}) {
+        <a href="vector.md#0x1_vector_push_back">vector::push_back</a>(&<b>mut</b> bit_field, <b>false</b>);
+        counter = counter + 1;
+    };
+    <b>spec</b> {
+        <b>assert</b> counter == length;
+        <b>assert</b> len(bit_field) == length;
+    };
+
+    <a href="bit_vector.md#0x1_bit_vector_BitVector">BitVector</a> {
+        length,
+        bit_field,
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_bit_vector_set"></a>
+
+## Function `set`
+
+Set the bit at <code>bit_index</code> in the <code>bitvector</code> regardless of its previous state.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_set">set</a>(bitvector: &<b>mut</b> <a href="bit_vector.md#0x1_bit_vector_BitVector">bit_vector::BitVector</a>, bit_index: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_set">set</a>(bitvector: &<b>mut</b> <a href="bit_vector.md#0x1_bit_vector_BitVector">BitVector</a>, bit_index: u64) {
+    <b>assert</b>!(bit_index &lt; <a href="vector.md#0x1_vector_length">vector::length</a>(&bitvector.bit_field), <a href="bit_vector.md#0x1_bit_vector_EINDEX">EINDEX</a>);
+    <b>let</b> x = <a href="vector.md#0x1_vector_borrow_mut">vector::borrow_mut</a>(&<b>mut</b> bitvector.bit_field, bit_index);
+    *x = <b>true</b>;
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_bit_vector_unset"></a>
+
+## Function `unset`
+
+Unset the bit at <code>bit_index</code> in the <code>bitvector</code> regardless of its previous state.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_unset">unset</a>(bitvector: &<b>mut</b> <a href="bit_vector.md#0x1_bit_vector_BitVector">bit_vector::BitVector</a>, bit_index: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_unset">unset</a>(bitvector: &<b>mut</b> <a href="bit_vector.md#0x1_bit_vector_BitVector">BitVector</a>, bit_index: u64) {
+    <b>assert</b>!(bit_index &lt; <a href="vector.md#0x1_vector_length">vector::length</a>(&bitvector.bit_field), <a href="bit_vector.md#0x1_bit_vector_EINDEX">EINDEX</a>);
+    <b>let</b> x = <a href="vector.md#0x1_vector_borrow_mut">vector::borrow_mut</a>(&<b>mut</b> bitvector.bit_field, bit_index);
+    *x = <b>false</b>;
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_bit_vector_shift_left"></a>
+
+## Function `shift_left`
+
+Shift the <code>bitvector</code> left by <code>amount</code>. If <code>amount</code> is greater than the
+bitvector's length the bitvector will be zeroed out.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_shift_left">shift_left</a>(bitvector: &<b>mut</b> <a href="bit_vector.md#0x1_bit_vector_BitVector">bit_vector::BitVector</a>, amount: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_shift_left">shift_left</a>(bitvector: &<b>mut</b> <a href="bit_vector.md#0x1_bit_vector_BitVector">BitVector</a>, amount: u64) {
+    <b>if</b> (amount &gt;= bitvector.length) {
+        <a href="vector.md#0x1_vector_for_each_mut">vector::for_each_mut</a>(&<b>mut</b> bitvector.bit_field, |elem| {
+            *elem = <b>false</b>;
+        });
+    } <b>else</b> {
+        <b>let</b> i = amount;
+
+        <b>while</b> (i &lt; bitvector.length) {
+            <b>if</b> (<a href="bit_vector.md#0x1_bit_vector_is_index_set">is_index_set</a>(bitvector, i)) <a href="bit_vector.md#0x1_bit_vector_set">set</a>(bitvector, i - amount)
+            <b>else</b> <a href="bit_vector.md#0x1_bit_vector_unset">unset</a>(bitvector, i - amount);
+            i = i + 1;
+        };
+
+        i = bitvector.length - amount;
+
+        <b>while</b> (i &lt; bitvector.length) {
+            <a href="bit_vector.md#0x1_bit_vector_unset">unset</a>(bitvector, i);
+            i = i + 1;
+        };
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_bit_vector_is_index_set"></a>
+
+## Function `is_index_set`
+
+Return the value of the bit at <code>bit_index</code> in the <code>bitvector</code>. <code><b>true</b></code>
+represents "1" and <code><b>false</b></code> represents a 0
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_is_index_set">is_index_set</a>(bitvector: &<a href="bit_vector.md#0x1_bit_vector_BitVector">bit_vector::BitVector</a>, bit_index: u64): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_is_index_set">is_index_set</a>(bitvector: &<a href="bit_vector.md#0x1_bit_vector_BitVector">BitVector</a>, bit_index: u64): bool {
+    <b>assert</b>!(bit_index &lt; <a href="vector.md#0x1_vector_length">vector::length</a>(&bitvector.bit_field), <a href="bit_vector.md#0x1_bit_vector_EINDEX">EINDEX</a>);
+    *<a href="vector.md#0x1_vector_borrow">vector::borrow</a>(&bitvector.bit_field, bit_index)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_bit_vector_length"></a>
+
+## Function `length`
+
+Return the length (number of usable bits) of this bitvector
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_length">length</a>(bitvector: &<a href="bit_vector.md#0x1_bit_vector_BitVector">bit_vector::BitVector</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_length">length</a>(bitvector: &<a href="bit_vector.md#0x1_bit_vector_BitVector">BitVector</a>): u64 {
+    <a href="vector.md#0x1_vector_length">vector::length</a>(&bitvector.bit_field)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_bit_vector_longest_set_sequence_starting_at"></a>
+
+## Function `longest_set_sequence_starting_at`
+
+Returns the length of the longest sequence of set bits starting at (and
+including) <code>start_index</code> in the <code>bitvector</code>. If there is no such
+sequence, then <code>0</code> is returned.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_longest_set_sequence_starting_at">longest_set_sequence_starting_at</a>(bitvector: &<a href="bit_vector.md#0x1_bit_vector_BitVector">bit_vector::BitVector</a>, start_index: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_longest_set_sequence_starting_at">longest_set_sequence_starting_at</a>(bitvector: &<a href="bit_vector.md#0x1_bit_vector_BitVector">BitVector</a>, start_index: u64): u64 {
+    <b>assert</b>!(start_index &lt; bitvector.length, <a href="bit_vector.md#0x1_bit_vector_EINDEX">EINDEX</a>);
+    <b>let</b> index = start_index;
+
+    // Find the greatest index in the <a href="vector.md#0x1_vector">vector</a> such that all indices less than it are set.
+    <b>while</b> ({
+        <b>spec</b> {
+            <b>invariant</b> index &gt;= start_index;
+            <b>invariant</b> index == start_index || <a href="bit_vector.md#0x1_bit_vector_is_index_set">is_index_set</a>(bitvector, index - 1);
+            <b>invariant</b> index == start_index || index - 1 &lt; <a href="vector.md#0x1_vector_length">vector::length</a>(bitvector.bit_field);
+            <b>invariant</b> <b>forall</b> j in start_index..index: <a href="bit_vector.md#0x1_bit_vector_is_index_set">is_index_set</a>(bitvector, j);
+            <b>invariant</b> <b>forall</b> j in start_index..index: j &lt; <a href="vector.md#0x1_vector_length">vector::length</a>(bitvector.bit_field);
+        };
+        index &lt; bitvector.length
+    }) {
+        <b>if</b> (!<a href="bit_vector.md#0x1_bit_vector_is_index_set">is_index_set</a>(bitvector, index)) <b>break</b>;
+        index = index + 1;
+    };
+
+    index - start_index
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+<a id="@Specification_1_BitVector"></a>
+
+### Struct `BitVector`
+
+
+<pre><code><b>struct</b> <a href="bit_vector.md#0x1_bit_vector_BitVector">BitVector</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<dl>
+<dt>
+<code>length: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>bit_field: <a href="vector.md#0x1_vector">vector</a>&lt;bool&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+
+<pre><code><b>invariant</b> length == len(bit_field);
+</code></pre>
+
+
+
+<a id="@Specification_1_new"></a>
+
+### Function `new`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_new">new</a>(length: u64): <a href="bit_vector.md#0x1_bit_vector_BitVector">bit_vector::BitVector</a>
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="bit_vector.md#0x1_bit_vector_NewAbortsIf">NewAbortsIf</a>;
+<b>ensures</b> result.length == length;
+<b>ensures</b> len(result.bit_field) == length;
+</code></pre>
+
+
+
+
+<a id="0x1_bit_vector_NewAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="bit_vector.md#0x1_bit_vector_NewAbortsIf">NewAbortsIf</a> {
+    length: u64;
+    <b>aborts_if</b> <a href="bit_vector.md#0x1_bit_vector_length">length</a> &lt;= 0 <b>with</b> <a href="bit_vector.md#0x1_bit_vector_ELENGTH">ELENGTH</a>;
+    <b>aborts_if</b> length &gt;= <a href="bit_vector.md#0x1_bit_vector_MAX_SIZE">MAX_SIZE</a> <b>with</b> <a href="bit_vector.md#0x1_bit_vector_ELENGTH">ELENGTH</a>;
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_set"></a>
+
+### Function `set`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_set">set</a>(bitvector: &<b>mut</b> <a href="bit_vector.md#0x1_bit_vector_BitVector">bit_vector::BitVector</a>, bit_index: u64)
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="bit_vector.md#0x1_bit_vector_SetAbortsIf">SetAbortsIf</a>;
+<b>ensures</b> bitvector.bit_field[bit_index];
+</code></pre>
+
+
+
+
+<a id="0x1_bit_vector_SetAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="bit_vector.md#0x1_bit_vector_SetAbortsIf">SetAbortsIf</a> {
+    bitvector: <a href="bit_vector.md#0x1_bit_vector_BitVector">BitVector</a>;
+    bit_index: u64;
+    <b>aborts_if</b> bit_index &gt;= <a href="bit_vector.md#0x1_bit_vector_length">length</a>(bitvector) <b>with</b> <a href="bit_vector.md#0x1_bit_vector_EINDEX">EINDEX</a>;
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_unset"></a>
+
+### Function `unset`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_unset">unset</a>(bitvector: &<b>mut</b> <a href="bit_vector.md#0x1_bit_vector_BitVector">bit_vector::BitVector</a>, bit_index: u64)
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="bit_vector.md#0x1_bit_vector_UnsetAbortsIf">UnsetAbortsIf</a>;
+<b>ensures</b> !bitvector.bit_field[bit_index];
+</code></pre>
+
+
+
+
+<a id="0x1_bit_vector_UnsetAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="bit_vector.md#0x1_bit_vector_UnsetAbortsIf">UnsetAbortsIf</a> {
+    bitvector: <a href="bit_vector.md#0x1_bit_vector_BitVector">BitVector</a>;
+    bit_index: u64;
+    <b>aborts_if</b> bit_index &gt;= <a href="bit_vector.md#0x1_bit_vector_length">length</a>(bitvector) <b>with</b> <a href="bit_vector.md#0x1_bit_vector_EINDEX">EINDEX</a>;
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_shift_left"></a>
+
+### Function `shift_left`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_shift_left">shift_left</a>(bitvector: &<b>mut</b> <a href="bit_vector.md#0x1_bit_vector_BitVector">bit_vector::BitVector</a>, amount: u64)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_is_index_set"></a>
+
+### Function `is_index_set`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_is_index_set">is_index_set</a>(bitvector: &<a href="bit_vector.md#0x1_bit_vector_BitVector">bit_vector::BitVector</a>, bit_index: u64): bool
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="bit_vector.md#0x1_bit_vector_IsIndexSetAbortsIf">IsIndexSetAbortsIf</a>;
+<b>ensures</b> result == bitvector.bit_field[bit_index];
+</code></pre>
+
+
+
+
+<a id="0x1_bit_vector_IsIndexSetAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="bit_vector.md#0x1_bit_vector_IsIndexSetAbortsIf">IsIndexSetAbortsIf</a> {
+    bitvector: <a href="bit_vector.md#0x1_bit_vector_BitVector">BitVector</a>;
+    bit_index: u64;
+    <b>aborts_if</b> bit_index &gt;= <a href="bit_vector.md#0x1_bit_vector_length">length</a>(bitvector) <b>with</b> <a href="bit_vector.md#0x1_bit_vector_EINDEX">EINDEX</a>;
+}
+</code></pre>
+
+
+
+
+<a id="0x1_bit_vector_spec_is_index_set"></a>
+
+
+<pre><code><b>fun</b> <a href="bit_vector.md#0x1_bit_vector_spec_is_index_set">spec_is_index_set</a>(bitvector: <a href="bit_vector.md#0x1_bit_vector_BitVector">BitVector</a>, bit_index: u64): bool {
+   <b>if</b> (bit_index &gt;= <a href="bit_vector.md#0x1_bit_vector_length">length</a>(bitvector)) {
+       <b>false</b>
+   } <b>else</b> {
+       bitvector.bit_field[bit_index]
+   }
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_longest_set_sequence_starting_at"></a>
+
+### Function `longest_set_sequence_starting_at`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_longest_set_sequence_starting_at">longest_set_sequence_starting_at</a>(bitvector: &<a href="bit_vector.md#0x1_bit_vector_BitVector">bit_vector::BitVector</a>, start_index: u64): u64
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> start_index &gt;= bitvector.length;
+<b>ensures</b> <b>forall</b> i in start_index..result: <a href="bit_vector.md#0x1_bit_vector_is_index_set">is_index_set</a>(bitvector, i);
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/move-stdlib/tests/compiler-v2-doc/error.md b/aptos-move/framework/move-stdlib/tests/compiler-v2-doc/error.md
new file mode 100644
index 0000000000000..0aa82d86871a4
--- /dev/null
+++ b/aptos-move/framework/move-stdlib/tests/compiler-v2-doc/error.md
@@ -0,0 +1,500 @@
+
+<a id="0x1_error"></a>
+
+# Module `0x1::error`
+
+This module defines a set of canonical error codes which are optional to use by applications for the
+<code><b>abort</b></code> and <code><b>assert</b>!</code> features.
+
+Canonical error codes use the 3 lowest bytes of the u64 abort code range (the upper 5 bytes are free for other use).
+Of those, the highest byte represents the *error category* and the lower two bytes the *error reason*.
+Given an error category <code>0x1</code> and a reason <code>0x3</code>, a canonical abort code looks as <code>0x10003</code>.
+
+A module can use a canonical code with a constant declaration of the following form:
+
+```
+///  An invalid ASCII character was encountered when creating a string.
+const EINVALID_CHARACTER: u64 = 0x010003;
+```
+
+This code is both valid in the worlds with and without canonical errors. It can be used as a plain module local
+error reason understand by the existing error map tooling, or as a canonical code.
+
+The actual canonical categories have been adopted from Google's canonical error codes, which in turn are derived
+from Unix error codes [see here](https://cloud.google.com/apis/design/errors#handling_errors). Each code has an
+associated HTTP error code which can be used in REST apis. The mapping from error code to http code is not 1:1;
+error codes here are a bit richer than HTTP codes.
+
+
+-  [Constants](#@Constants_0)
+-  [Function `canonical`](#0x1_error_canonical)
+-  [Function `invalid_argument`](#0x1_error_invalid_argument)
+-  [Function `out_of_range`](#0x1_error_out_of_range)
+-  [Function `invalid_state`](#0x1_error_invalid_state)
+-  [Function `unauthenticated`](#0x1_error_unauthenticated)
+-  [Function `permission_denied`](#0x1_error_permission_denied)
+-  [Function `not_found`](#0x1_error_not_found)
+-  [Function `aborted`](#0x1_error_aborted)
+-  [Function `already_exists`](#0x1_error_already_exists)
+-  [Function `resource_exhausted`](#0x1_error_resource_exhausted)
+-  [Function `internal`](#0x1_error_internal)
+-  [Function `not_implemented`](#0x1_error_not_implemented)
+-  [Function `unavailable`](#0x1_error_unavailable)
+-  [Specification](#@Specification_1)
+    -  [Function `canonical`](#@Specification_1_canonical)
+
+
+<pre><code></code></pre>
+
+
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_error_ABORTED"></a>
+
+Concurrency conflict, such as read-modify-write conflict (http: 409)
+
+
+<pre><code><b>const</b> <a href="error.md#0x1_error_ABORTED">ABORTED</a>: u64 = 7;
+</code></pre>
+
+
+
+<a id="0x1_error_ALREADY_EXISTS"></a>
+
+The resource that a client tried to create already exists (http: 409)
+
+
+<pre><code><b>const</b> <a href="error.md#0x1_error_ALREADY_EXISTS">ALREADY_EXISTS</a>: u64 = 8;
+</code></pre>
+
+
+
+<a id="0x1_error_CANCELLED"></a>
+
+Request cancelled by the client (http: 499)
+
+
+<pre><code><b>const</b> <a href="error.md#0x1_error_CANCELLED">CANCELLED</a>: u64 = 10;
+</code></pre>
+
+
+
+<a id="0x1_error_INTERNAL"></a>
+
+Internal error (http: 500)
+
+
+<pre><code><b>const</b> <a href="error.md#0x1_error_INTERNAL">INTERNAL</a>: u64 = 11;
+</code></pre>
+
+
+
+<a id="0x1_error_INVALID_ARGUMENT"></a>
+
+Caller specified an invalid argument (http: 400)
+
+
+<pre><code><b>const</b> <a href="error.md#0x1_error_INVALID_ARGUMENT">INVALID_ARGUMENT</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_error_INVALID_STATE"></a>
+
+The system is not in a state where the operation can be performed (http: 400)
+
+
+<pre><code><b>const</b> <a href="error.md#0x1_error_INVALID_STATE">INVALID_STATE</a>: u64 = 3;
+</code></pre>
+
+
+
+<a id="0x1_error_NOT_FOUND"></a>
+
+A specified resource is not found (http: 404)
+
+
+<pre><code><b>const</b> <a href="error.md#0x1_error_NOT_FOUND">NOT_FOUND</a>: u64 = 6;
+</code></pre>
+
+
+
+<a id="0x1_error_NOT_IMPLEMENTED"></a>
+
+Feature not implemented (http: 501)
+
+
+<pre><code><b>const</b> <a href="error.md#0x1_error_NOT_IMPLEMENTED">NOT_IMPLEMENTED</a>: u64 = 12;
+</code></pre>
+
+
+
+<a id="0x1_error_OUT_OF_RANGE"></a>
+
+An input or result of a computation is out of range (http: 400)
+
+
+<pre><code><b>const</b> <a href="error.md#0x1_error_OUT_OF_RANGE">OUT_OF_RANGE</a>: u64 = 2;
+</code></pre>
+
+
+
+<a id="0x1_error_PERMISSION_DENIED"></a>
+
+client does not have sufficient permission (http: 403)
+
+
+<pre><code><b>const</b> <a href="error.md#0x1_error_PERMISSION_DENIED">PERMISSION_DENIED</a>: u64 = 5;
+</code></pre>
+
+
+
+<a id="0x1_error_RESOURCE_EXHAUSTED"></a>
+
+Out of gas or other forms of quota (http: 429)
+
+
+<pre><code><b>const</b> <a href="error.md#0x1_error_RESOURCE_EXHAUSTED">RESOURCE_EXHAUSTED</a>: u64 = 9;
+</code></pre>
+
+
+
+<a id="0x1_error_UNAUTHENTICATED"></a>
+
+Request not authenticated due to missing, invalid, or expired auth token (http: 401)
+
+
+<pre><code><b>const</b> <a href="error.md#0x1_error_UNAUTHENTICATED">UNAUTHENTICATED</a>: u64 = 4;
+</code></pre>
+
+
+
+<a id="0x1_error_UNAVAILABLE"></a>
+
+The service is currently unavailable. Indicates that a retry could solve the issue (http: 503)
+
+
+<pre><code><b>const</b> <a href="error.md#0x1_error_UNAVAILABLE">UNAVAILABLE</a>: u64 = 13;
+</code></pre>
+
+
+
+<a id="0x1_error_canonical"></a>
+
+## Function `canonical`
+
+Construct a canonical error code from a category and a reason.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_canonical">canonical</a>(category: u64, reason: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_canonical">canonical</a>(category: u64, reason: u64): u64 {
+  (category &lt;&lt; 16) + reason
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_error_invalid_argument"></a>
+
+## Function `invalid_argument`
+
+Functions to construct a canonical error code of the given category.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_invalid_argument">invalid_argument</a>(r: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_invalid_argument">invalid_argument</a>(r: u64): u64 {  <a href="error.md#0x1_error_canonical">canonical</a>(<a href="error.md#0x1_error_INVALID_ARGUMENT">INVALID_ARGUMENT</a>, r) }
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_error_out_of_range"></a>
+
+## Function `out_of_range`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_out_of_range">out_of_range</a>(r: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_out_of_range">out_of_range</a>(r: u64): u64 {  <a href="error.md#0x1_error_canonical">canonical</a>(<a href="error.md#0x1_error_OUT_OF_RANGE">OUT_OF_RANGE</a>, r) }
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_error_invalid_state"></a>
+
+## Function `invalid_state`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_invalid_state">invalid_state</a>(r: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_invalid_state">invalid_state</a>(r: u64): u64 {  <a href="error.md#0x1_error_canonical">canonical</a>(<a href="error.md#0x1_error_INVALID_STATE">INVALID_STATE</a>, r) }
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_error_unauthenticated"></a>
+
+## Function `unauthenticated`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_unauthenticated">unauthenticated</a>(r: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_unauthenticated">unauthenticated</a>(r: u64): u64 { <a href="error.md#0x1_error_canonical">canonical</a>(<a href="error.md#0x1_error_UNAUTHENTICATED">UNAUTHENTICATED</a>, r) }
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_error_permission_denied"></a>
+
+## Function `permission_denied`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_permission_denied">permission_denied</a>(r: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_permission_denied">permission_denied</a>(r: u64): u64 { <a href="error.md#0x1_error_canonical">canonical</a>(<a href="error.md#0x1_error_PERMISSION_DENIED">PERMISSION_DENIED</a>, r) }
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_error_not_found"></a>
+
+## Function `not_found`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_not_found">not_found</a>(r: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_not_found">not_found</a>(r: u64): u64 { <a href="error.md#0x1_error_canonical">canonical</a>(<a href="error.md#0x1_error_NOT_FOUND">NOT_FOUND</a>, r) }
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_error_aborted"></a>
+
+## Function `aborted`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_aborted">aborted</a>(r: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_aborted">aborted</a>(r: u64): u64 { <a href="error.md#0x1_error_canonical">canonical</a>(<a href="error.md#0x1_error_ABORTED">ABORTED</a>, r) }
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_error_already_exists"></a>
+
+## Function `already_exists`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_already_exists">already_exists</a>(r: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_already_exists">already_exists</a>(r: u64): u64 { <a href="error.md#0x1_error_canonical">canonical</a>(<a href="error.md#0x1_error_ALREADY_EXISTS">ALREADY_EXISTS</a>, r) }
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_error_resource_exhausted"></a>
+
+## Function `resource_exhausted`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_resource_exhausted">resource_exhausted</a>(r: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_resource_exhausted">resource_exhausted</a>(r: u64): u64 {  <a href="error.md#0x1_error_canonical">canonical</a>(<a href="error.md#0x1_error_RESOURCE_EXHAUSTED">RESOURCE_EXHAUSTED</a>, r) }
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_error_internal"></a>
+
+## Function `internal`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <b>internal</b>(r: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <b>internal</b>(r: u64): u64 {  <a href="error.md#0x1_error_canonical">canonical</a>(<a href="error.md#0x1_error_INTERNAL">INTERNAL</a>, r) }
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_error_not_implemented"></a>
+
+## Function `not_implemented`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_not_implemented">not_implemented</a>(r: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_not_implemented">not_implemented</a>(r: u64): u64 {  <a href="error.md#0x1_error_canonical">canonical</a>(<a href="error.md#0x1_error_NOT_IMPLEMENTED">NOT_IMPLEMENTED</a>, r) }
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_error_unavailable"></a>
+
+## Function `unavailable`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_unavailable">unavailable</a>(r: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_unavailable">unavailable</a>(r: u64): u64 { <a href="error.md#0x1_error_canonical">canonical</a>(<a href="error.md#0x1_error_UNAVAILABLE">UNAVAILABLE</a>, r) }
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+<a id="@Specification_1_canonical"></a>
+
+### Function `canonical`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_canonical">canonical</a>(category: u64, reason: u64): u64
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque = <b>true</b>;
+<b>let</b> shl_res = category &lt;&lt; 16;
+<b>ensures</b> [concrete] result == shl_res + reason;
+<b>aborts_if</b> [abstract] <b>false</b>;
+<b>ensures</b> [abstract] result == category;
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/move-stdlib/tests/compiler-v2-doc/features.md b/aptos-move/framework/move-stdlib/tests/compiler-v2-doc/features.md
new file mode 100644
index 0000000000000..da20859bd51e0
--- /dev/null
+++ b/aptos-move/framework/move-stdlib/tests/compiler-v2-doc/features.md
@@ -0,0 +1,3803 @@
+
+<a id="0x1_features"></a>
+
+# Module `0x1::features`
+
+Defines feature flags for Aptos. Those are used in Aptos specific implementations of features in
+the Move stdlib, the Aptos stdlib, and the Aptos framework.
+
+============================================================================================
+Feature Flag Definitions
+
+Each feature flag should come with documentation which justifies the need of the flag.
+Introduction of a new feature flag requires approval of framework owners. Be frugal when
+introducing new feature flags, as too many can make it hard to understand the code.
+
+Each feature flag should come with a specification of a lifetime:
+
+- a *transient* feature flag is only needed until a related code rollout has happened. This
+is typically associated with the introduction of new native Move functions, and is only used
+from Move code. The owner of this feature is obliged to remove it once this can be done.
+
+- a *permanent* feature flag is required to stay around forever. Typically, those flags guard
+behavior in native code, and the behavior with or without the feature need to be preserved
+for playback.
+
+Note that removing a feature flag still requires the function which tests for the feature
+(like <code>code_dependency_check_enabled</code> below) to stay around for compatibility reasons, as it
+is a public function. However, once the feature flag is disabled, those functions can constantly
+return true.
+
+
+-  [Resource `Features`](#0x1_features_Features)
+-  [Resource `PendingFeatures`](#0x1_features_PendingFeatures)
+-  [Constants](#@Constants_0)
+-  [Function `code_dependency_check_enabled`](#0x1_features_code_dependency_check_enabled)
+-  [Function `treat_friend_as_private`](#0x1_features_treat_friend_as_private)
+-  [Function `get_sha_512_and_ripemd_160_feature`](#0x1_features_get_sha_512_and_ripemd_160_feature)
+-  [Function `sha_512_and_ripemd_160_enabled`](#0x1_features_sha_512_and_ripemd_160_enabled)
+-  [Function `get_aptos_stdlib_chain_id_feature`](#0x1_features_get_aptos_stdlib_chain_id_feature)
+-  [Function `aptos_stdlib_chain_id_enabled`](#0x1_features_aptos_stdlib_chain_id_enabled)
+-  [Function `get_vm_binary_format_v6`](#0x1_features_get_vm_binary_format_v6)
+-  [Function `allow_vm_binary_format_v6`](#0x1_features_allow_vm_binary_format_v6)
+-  [Function `get_collect_and_distribute_gas_fees_feature`](#0x1_features_get_collect_and_distribute_gas_fees_feature)
+-  [Function `collect_and_distribute_gas_fees`](#0x1_features_collect_and_distribute_gas_fees)
+-  [Function `multi_ed25519_pk_validate_v2_feature`](#0x1_features_multi_ed25519_pk_validate_v2_feature)
+-  [Function `multi_ed25519_pk_validate_v2_enabled`](#0x1_features_multi_ed25519_pk_validate_v2_enabled)
+-  [Function `get_blake2b_256_feature`](#0x1_features_get_blake2b_256_feature)
+-  [Function `blake2b_256_enabled`](#0x1_features_blake2b_256_enabled)
+-  [Function `get_resource_groups_feature`](#0x1_features_get_resource_groups_feature)
+-  [Function `resource_groups_enabled`](#0x1_features_resource_groups_enabled)
+-  [Function `get_multisig_accounts_feature`](#0x1_features_get_multisig_accounts_feature)
+-  [Function `multisig_accounts_enabled`](#0x1_features_multisig_accounts_enabled)
+-  [Function `get_delegation_pools_feature`](#0x1_features_get_delegation_pools_feature)
+-  [Function `delegation_pools_enabled`](#0x1_features_delegation_pools_enabled)
+-  [Function `get_cryptography_algebra_natives_feature`](#0x1_features_get_cryptography_algebra_natives_feature)
+-  [Function `cryptography_algebra_enabled`](#0x1_features_cryptography_algebra_enabled)
+-  [Function `get_bls12_381_strutures_feature`](#0x1_features_get_bls12_381_strutures_feature)
+-  [Function `bls12_381_structures_enabled`](#0x1_features_bls12_381_structures_enabled)
+-  [Function `get_periodical_reward_rate_decrease_feature`](#0x1_features_get_periodical_reward_rate_decrease_feature)
+-  [Function `periodical_reward_rate_decrease_enabled`](#0x1_features_periodical_reward_rate_decrease_enabled)
+-  [Function `get_partial_governance_voting`](#0x1_features_get_partial_governance_voting)
+-  [Function `partial_governance_voting_enabled`](#0x1_features_partial_governance_voting_enabled)
+-  [Function `get_delegation_pool_partial_governance_voting`](#0x1_features_get_delegation_pool_partial_governance_voting)
+-  [Function `delegation_pool_partial_governance_voting_enabled`](#0x1_features_delegation_pool_partial_governance_voting_enabled)
+-  [Function `fee_payer_enabled`](#0x1_features_fee_payer_enabled)
+-  [Function `get_auids`](#0x1_features_get_auids)
+-  [Function `auids_enabled`](#0x1_features_auids_enabled)
+-  [Function `get_bulletproofs_feature`](#0x1_features_get_bulletproofs_feature)
+-  [Function `bulletproofs_enabled`](#0x1_features_bulletproofs_enabled)
+-  [Function `get_signer_native_format_fix_feature`](#0x1_features_get_signer_native_format_fix_feature)
+-  [Function `signer_native_format_fix_enabled`](#0x1_features_signer_native_format_fix_enabled)
+-  [Function `get_module_event_feature`](#0x1_features_get_module_event_feature)
+-  [Function `module_event_enabled`](#0x1_features_module_event_enabled)
+-  [Function `get_aggregator_v2_api_feature`](#0x1_features_get_aggregator_v2_api_feature)
+-  [Function `aggregator_v2_api_enabled`](#0x1_features_aggregator_v2_api_enabled)
+-  [Function `get_aggregator_snapshots_feature`](#0x1_features_get_aggregator_snapshots_feature)
+-  [Function `aggregator_snapshots_enabled`](#0x1_features_aggregator_snapshots_enabled)
+-  [Function `get_sponsored_automatic_account_creation`](#0x1_features_get_sponsored_automatic_account_creation)
+-  [Function `sponsored_automatic_account_creation_enabled`](#0x1_features_sponsored_automatic_account_creation_enabled)
+-  [Function `get_concurrent_token_v2_feature`](#0x1_features_get_concurrent_token_v2_feature)
+-  [Function `concurrent_token_v2_enabled`](#0x1_features_concurrent_token_v2_enabled)
+-  [Function `get_concurrent_assets_feature`](#0x1_features_get_concurrent_assets_feature)
+-  [Function `concurrent_assets_enabled`](#0x1_features_concurrent_assets_enabled)
+-  [Function `get_operator_beneficiary_change_feature`](#0x1_features_get_operator_beneficiary_change_feature)
+-  [Function `operator_beneficiary_change_enabled`](#0x1_features_operator_beneficiary_change_enabled)
+-  [Function `get_commission_change_delegation_pool_feature`](#0x1_features_get_commission_change_delegation_pool_feature)
+-  [Function `commission_change_delegation_pool_enabled`](#0x1_features_commission_change_delegation_pool_enabled)
+-  [Function `get_bn254_strutures_feature`](#0x1_features_get_bn254_strutures_feature)
+-  [Function `bn254_structures_enabled`](#0x1_features_bn254_structures_enabled)
+-  [Function `get_reconfigure_with_dkg_feature`](#0x1_features_get_reconfigure_with_dkg_feature)
+-  [Function `reconfigure_with_dkg_enabled`](#0x1_features_reconfigure_with_dkg_enabled)
+-  [Function `get_keyless_accounts_feature`](#0x1_features_get_keyless_accounts_feature)
+-  [Function `keyless_accounts_enabled`](#0x1_features_keyless_accounts_enabled)
+-  [Function `get_keyless_but_zkless_accounts_feature`](#0x1_features_get_keyless_but_zkless_accounts_feature)
+-  [Function `keyless_but_zkless_accounts_feature_enabled`](#0x1_features_keyless_but_zkless_accounts_feature_enabled)
+-  [Function `get_jwk_consensus_feature`](#0x1_features_get_jwk_consensus_feature)
+-  [Function `jwk_consensus_enabled`](#0x1_features_jwk_consensus_enabled)
+-  [Function `get_concurrent_fungible_assets_feature`](#0x1_features_get_concurrent_fungible_assets_feature)
+-  [Function `concurrent_fungible_assets_enabled`](#0x1_features_concurrent_fungible_assets_enabled)
+-  [Function `is_object_code_deployment_enabled`](#0x1_features_is_object_code_deployment_enabled)
+-  [Function `get_max_object_nesting_check_feature`](#0x1_features_get_max_object_nesting_check_feature)
+-  [Function `max_object_nesting_check_enabled`](#0x1_features_max_object_nesting_check_enabled)
+-  [Function `get_keyless_accounts_with_passkeys_feature`](#0x1_features_get_keyless_accounts_with_passkeys_feature)
+-  [Function `keyless_accounts_with_passkeys_feature_enabled`](#0x1_features_keyless_accounts_with_passkeys_feature_enabled)
+-  [Function `get_multisig_v2_enhancement_feature`](#0x1_features_get_multisig_v2_enhancement_feature)
+-  [Function `multisig_v2_enhancement_feature_enabled`](#0x1_features_multisig_v2_enhancement_feature_enabled)
+-  [Function `get_delegation_pool_allowlisting_feature`](#0x1_features_get_delegation_pool_allowlisting_feature)
+-  [Function `delegation_pool_allowlisting_enabled`](#0x1_features_delegation_pool_allowlisting_enabled)
+-  [Function `get_module_event_migration_feature`](#0x1_features_get_module_event_migration_feature)
+-  [Function `module_event_migration_enabled`](#0x1_features_module_event_migration_enabled)
+-  [Function `get_transaction_context_extension_feature`](#0x1_features_get_transaction_context_extension_feature)
+-  [Function `transaction_context_extension_enabled`](#0x1_features_transaction_context_extension_enabled)
+-  [Function `get_coin_to_fungible_asset_migration_feature`](#0x1_features_get_coin_to_fungible_asset_migration_feature)
+-  [Function `coin_to_fungible_asset_migration_feature_enabled`](#0x1_features_coin_to_fungible_asset_migration_feature_enabled)
+-  [Function `get_primary_apt_fungible_store_at_user_address_feature`](#0x1_features_get_primary_apt_fungible_store_at_user_address_feature)
+-  [Function `primary_apt_fungible_store_at_user_address_enabled`](#0x1_features_primary_apt_fungible_store_at_user_address_enabled)
+-  [Function `aggregator_v2_is_at_least_api_enabled`](#0x1_features_aggregator_v2_is_at_least_api_enabled)
+-  [Function `get_object_native_derived_address_feature`](#0x1_features_get_object_native_derived_address_feature)
+-  [Function `object_native_derived_address_enabled`](#0x1_features_object_native_derived_address_enabled)
+-  [Function `get_dispatchable_fungible_asset_feature`](#0x1_features_get_dispatchable_fungible_asset_feature)
+-  [Function `dispatchable_fungible_asset_enabled`](#0x1_features_dispatchable_fungible_asset_enabled)
+-  [Function `get_new_accounts_default_to_fa_apt_store_feature`](#0x1_features_get_new_accounts_default_to_fa_apt_store_feature)
+-  [Function `new_accounts_default_to_fa_apt_store_enabled`](#0x1_features_new_accounts_default_to_fa_apt_store_enabled)
+-  [Function `get_operations_default_to_fa_apt_store_feature`](#0x1_features_get_operations_default_to_fa_apt_store_feature)
+-  [Function `operations_default_to_fa_apt_store_enabled`](#0x1_features_operations_default_to_fa_apt_store_enabled)
+-  [Function `get_concurrent_fungible_balance_feature`](#0x1_features_get_concurrent_fungible_balance_feature)
+-  [Function `concurrent_fungible_balance_enabled`](#0x1_features_concurrent_fungible_balance_enabled)
+-  [Function `get_default_to_concurrent_fungible_balance_feature`](#0x1_features_get_default_to_concurrent_fungible_balance_feature)
+-  [Function `default_to_concurrent_fungible_balance_enabled`](#0x1_features_default_to_concurrent_fungible_balance_enabled)
+-  [Function `get_abort_if_multisig_payload_mismatch_feature`](#0x1_features_get_abort_if_multisig_payload_mismatch_feature)
+-  [Function `abort_if_multisig_payload_mismatch_enabled`](#0x1_features_abort_if_multisig_payload_mismatch_enabled)
+-  [Function `change_feature_flags`](#0x1_features_change_feature_flags)
+-  [Function `change_feature_flags_internal`](#0x1_features_change_feature_flags_internal)
+-  [Function `change_feature_flags_for_next_epoch`](#0x1_features_change_feature_flags_for_next_epoch)
+-  [Function `on_new_epoch`](#0x1_features_on_new_epoch)
+-  [Function `is_enabled`](#0x1_features_is_enabled)
+-  [Function `set`](#0x1_features_set)
+-  [Function `contains`](#0x1_features_contains)
+-  [Function `apply_diff`](#0x1_features_apply_diff)
+-  [Function `ensure_framework_signer`](#0x1_features_ensure_framework_signer)
+-  [Specification](#@Specification_1)
+    -  [Resource `Features`](#@Specification_1_Features)
+    -  [Resource `PendingFeatures`](#@Specification_1_PendingFeatures)
+    -  [Function `periodical_reward_rate_decrease_enabled`](#@Specification_1_periodical_reward_rate_decrease_enabled)
+    -  [Function `partial_governance_voting_enabled`](#@Specification_1_partial_governance_voting_enabled)
+    -  [Function `module_event_enabled`](#@Specification_1_module_event_enabled)
+    -  [Function `abort_if_multisig_payload_mismatch_enabled`](#@Specification_1_abort_if_multisig_payload_mismatch_enabled)
+    -  [Function `change_feature_flags_internal`](#@Specification_1_change_feature_flags_internal)
+    -  [Function `change_feature_flags_for_next_epoch`](#@Specification_1_change_feature_flags_for_next_epoch)
+    -  [Function `on_new_epoch`](#@Specification_1_on_new_epoch)
+    -  [Function `is_enabled`](#@Specification_1_is_enabled)
+    -  [Function `set`](#@Specification_1_set)
+    -  [Function `contains`](#@Specification_1_contains)
+    -  [Function `apply_diff`](#@Specification_1_apply_diff)
+
+
+<pre><code><b>use</b> <a href="error.md#0x1_error">0x1::error</a>;
+<b>use</b> <a href="signer.md#0x1_signer">0x1::signer</a>;
+<b>use</b> <a href="vector.md#0x1_vector">0x1::vector</a>;
+</code></pre>
+
+
+
+<a id="0x1_features_Features"></a>
+
+## Resource `Features`
+
+The enabled features, represented by a bitset stored on chain.
+
+
+<pre><code><b>struct</b> <a href="features.md#0x1_features_Features">Features</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code><a href="features.md#0x1_features">features</a>: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="0x1_features_PendingFeatures"></a>
+
+## Resource `PendingFeatures`
+
+This resource holds the feature vec updates received in the current epoch.
+On epoch change, the updates take effect and this buffer is cleared.
+
+
+<pre><code><b>struct</b> <a href="features.md#0x1_features_PendingFeatures">PendingFeatures</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code><a href="features.md#0x1_features">features</a>: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_features_ABORT_IF_MULTISIG_PAYLOAD_MISMATCH"></a>
+
+Whether the multisig v2 fix is enabled. Once enabled, the multisig transaction execution will explicitly
+abort if the provided payload does not match the payload stored on-chain.
+
+Lifetime: transient
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_ABORT_IF_MULTISIG_PAYLOAD_MISMATCH">ABORT_IF_MULTISIG_PAYLOAD_MISMATCH</a>: u64 = 70;
+</code></pre>
+
+
+
+<a id="0x1_features_AGGREGATOR_V2_IS_AT_LEAST_API"></a>
+
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_AGGREGATOR_V2_IS_AT_LEAST_API">AGGREGATOR_V2_IS_AT_LEAST_API</a>: u64 = 66;
+</code></pre>
+
+
+
+<a id="0x1_features_APTOS_STD_CHAIN_ID_NATIVES"></a>
+
+Whether the new <code>aptos_stdlib::type_info::chain_id()</code> native for fetching the chain ID is enabled.
+This is needed because of the introduction of a new native function.
+Lifetime: transient
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_APTOS_STD_CHAIN_ID_NATIVES">APTOS_STD_CHAIN_ID_NATIVES</a>: u64 = 4;
+</code></pre>
+
+
+
+<a id="0x1_features_APTOS_UNIQUE_IDENTIFIERS"></a>
+
+Whether enable MOVE functions to call create_auid method to create AUIDs.
+Lifetime: transient
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_APTOS_UNIQUE_IDENTIFIERS">APTOS_UNIQUE_IDENTIFIERS</a>: u64 = 23;
+</code></pre>
+
+
+
+<a id="0x1_features_BLAKE2B_256_NATIVE"></a>
+
+Whether the new BLAKE2B-256 hash function native is enabled.
+This is needed because of the introduction of new native function(s).
+Lifetime: transient
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_BLAKE2B_256_NATIVE">BLAKE2B_256_NATIVE</a>: u64 = 8;
+</code></pre>
+
+
+
+<a id="0x1_features_BLS12_381_STRUCTURES"></a>
+
+Whether the generic algebra implementation for BLS12381 operations are enabled.
+
+Lifetime: transient
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_BLS12_381_STRUCTURES">BLS12_381_STRUCTURES</a>: u64 = 13;
+</code></pre>
+
+
+
+<a id="0x1_features_BN254_STRUCTURES"></a>
+
+Whether the generic algebra implementation for BN254 operations are enabled.
+
+Lifetime: transient
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_BN254_STRUCTURES">BN254_STRUCTURES</a>: u64 = 43;
+</code></pre>
+
+
+
+<a id="0x1_features_BULLETPROOFS_NATIVES"></a>
+
+Whether the Bulletproofs zero-knowledge range proof module is enabled, and the related native function is
+available. This is needed because of the introduction of a new native function.
+Lifetime: transient
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_BULLETPROOFS_NATIVES">BULLETPROOFS_NATIVES</a>: u64 = 24;
+</code></pre>
+
+
+
+<a id="0x1_features_CHARGE_INVARIANT_VIOLATION"></a>
+
+Charge invariant violation error.
+Lifetime: transient
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_CHARGE_INVARIANT_VIOLATION">CHARGE_INVARIANT_VIOLATION</a>: u64 = 20;
+</code></pre>
+
+
+
+<a id="0x1_features_CODE_DEPENDENCY_CHECK"></a>
+
+Whether validation of package dependencies is enabled, and the related native function is
+available. This is needed because of introduction of a new native function.
+Lifetime: transient
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_CODE_DEPENDENCY_CHECK">CODE_DEPENDENCY_CHECK</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_features_COIN_TO_FUNGIBLE_ASSET_MIGRATION"></a>
+
+Whether migration from coin to fungible asset feature is enabled.
+
+Lifetime: transient
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_COIN_TO_FUNGIBLE_ASSET_MIGRATION">COIN_TO_FUNGIBLE_ASSET_MIGRATION</a>: u64 = 60;
+</code></pre>
+
+
+
+<a id="0x1_features_COLLECT_AND_DISTRIBUTE_GAS_FEES"></a>
+
+Whether gas fees are collected and distributed to the block proposers.
+Lifetime: transient
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_COLLECT_AND_DISTRIBUTE_GAS_FEES">COLLECT_AND_DISTRIBUTE_GAS_FEES</a>: u64 = 6;
+</code></pre>
+
+
+
+<a id="0x1_features_COMMISSION_CHANGE_DELEGATION_POOL"></a>
+
+Whether the operator commission rate change in delegation pool is enabled.
+Lifetime: transient
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_COMMISSION_CHANGE_DELEGATION_POOL">COMMISSION_CHANGE_DELEGATION_POOL</a>: u64 = 42;
+</code></pre>
+
+
+
+<a id="0x1_features_CONCURRENT_FUNGIBLE_ASSETS"></a>
+
+Whether enable Fungible Asset creation
+to create higher throughput concurrent variants.
+Lifetime: transient
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_CONCURRENT_FUNGIBLE_ASSETS">CONCURRENT_FUNGIBLE_ASSETS</a>: u64 = 50;
+</code></pre>
+
+
+
+<a id="0x1_features_CONCURRENT_FUNGIBLE_BALANCE"></a>
+
+Whether enable concurent Fungible Balance
+to create higher throughput concurrent variants.
+Lifetime: transient
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_CONCURRENT_FUNGIBLE_BALANCE">CONCURRENT_FUNGIBLE_BALANCE</a>: u64 = 67;
+</code></pre>
+
+
+
+<a id="0x1_features_CRYPTOGRAPHY_ALGEBRA_NATIVES"></a>
+
+Whether generic algebra basic operation support in <code>crypto_algebra.<b>move</b></code> are enabled.
+
+Lifetime: transient
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_CRYPTOGRAPHY_ALGEBRA_NATIVES">CRYPTOGRAPHY_ALGEBRA_NATIVES</a>: u64 = 12;
+</code></pre>
+
+
+
+<a id="0x1_features_DEFAULT_TO_CONCURRENT_FUNGIBLE_BALANCE"></a>
+
+Whether to default new Fungible Store to the concurrent variant.
+Lifetime: transient
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_DEFAULT_TO_CONCURRENT_FUNGIBLE_BALANCE">DEFAULT_TO_CONCURRENT_FUNGIBLE_BALANCE</a>: u64 = 68;
+</code></pre>
+
+
+
+<a id="0x1_features_DELEGATION_POOLS"></a>
+
+Whether delegation pools are enabled.
+Lifetime: transient
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_DELEGATION_POOLS">DELEGATION_POOLS</a>: u64 = 11;
+</code></pre>
+
+
+
+<a id="0x1_features_DELEGATION_POOL_ALLOWLISTING"></a>
+
+Whether delegators allowlisting for delegation pools is supported.
+Lifetime: transient
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_DELEGATION_POOL_ALLOWLISTING">DELEGATION_POOL_ALLOWLISTING</a>: u64 = 56;
+</code></pre>
+
+
+
+<a id="0x1_features_DELEGATION_POOL_PARTIAL_GOVERNANCE_VOTING"></a>
+
+Whether enable paritial governance voting on delegation_pool.
+Lifetime: transient
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_DELEGATION_POOL_PARTIAL_GOVERNANCE_VOTING">DELEGATION_POOL_PARTIAL_GOVERNANCE_VOTING</a>: u64 = 21;
+</code></pre>
+
+
+
+<a id="0x1_features_DISPATCHABLE_FUNGIBLE_ASSET"></a>
+
+Whether the dispatchable fungible asset standard feature is enabled.
+
+Lifetime: transient
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_DISPATCHABLE_FUNGIBLE_ASSET">DISPATCHABLE_FUNGIBLE_ASSET</a>: u64 = 63;
+</code></pre>
+
+
+
+<a id="0x1_features_EAPI_DISABLED"></a>
+
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_EAPI_DISABLED">EAPI_DISABLED</a>: u64 = 2;
+</code></pre>
+
+
+
+<a id="0x1_features_ED25519_PUBKEY_VALIDATE_RETURN_FALSE_WRONG_LENGTH"></a>
+
+Whether native_public_key_validate aborts when a public key of the wrong length is given
+Lifetime: ephemeral
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_ED25519_PUBKEY_VALIDATE_RETURN_FALSE_WRONG_LENGTH">ED25519_PUBKEY_VALIDATE_RETURN_FALSE_WRONG_LENGTH</a>: u64 = 14;
+</code></pre>
+
+
+
+<a id="0x1_features_EFEATURE_CANNOT_BE_DISABLED"></a>
+
+Deployed to production, and disabling is deprecated.
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_EFEATURE_CANNOT_BE_DISABLED">EFEATURE_CANNOT_BE_DISABLED</a>: u64 = 3;
+</code></pre>
+
+
+
+<a id="0x1_features_EFRAMEWORK_SIGNER_NEEDED"></a>
+
+The provided signer has not a framework address.
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_EFRAMEWORK_SIGNER_NEEDED">EFRAMEWORK_SIGNER_NEEDED</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_features_EINVALID_FEATURE"></a>
+
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_EINVALID_FEATURE">EINVALID_FEATURE</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_features_FEE_PAYER_ACCOUNT_OPTIONAL"></a>
+
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_FEE_PAYER_ACCOUNT_OPTIONAL">FEE_PAYER_ACCOUNT_OPTIONAL</a>: u64 = 35;
+</code></pre>
+
+
+
+<a id="0x1_features_FEE_PAYER_ENABLED"></a>
+
+Whether alternate gas payer is supported
+Lifetime: transient
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_FEE_PAYER_ENABLED">FEE_PAYER_ENABLED</a>: u64 = 22;
+</code></pre>
+
+
+
+<a id="0x1_features_JWK_CONSENSUS"></a>
+
+Deprecated by <code>aptos_framework::jwk_consensus_config::JWKConsensusConfig</code>.
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_JWK_CONSENSUS">JWK_CONSENSUS</a>: u64 = 49;
+</code></pre>
+
+
+
+<a id="0x1_features_KEYLESS_ACCOUNTS"></a>
+
+Whether the OIDB feature is enabled, possibly with the ZK-less verification mode.
+
+Lifetime: transient
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_KEYLESS_ACCOUNTS">KEYLESS_ACCOUNTS</a>: u64 = 46;
+</code></pre>
+
+
+
+<a id="0x1_features_KEYLESS_ACCOUNTS_WITH_PASSKEYS"></a>
+
+Whether keyless accounts support passkey-based ephemeral signatures.
+
+Lifetime: transient
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_KEYLESS_ACCOUNTS_WITH_PASSKEYS">KEYLESS_ACCOUNTS_WITH_PASSKEYS</a>: u64 = 54;
+</code></pre>
+
+
+
+<a id="0x1_features_KEYLESS_BUT_ZKLESS_ACCOUNTS"></a>
+
+Whether the ZK-less mode of the keyless accounts feature is enabled.
+
+Lifetime: transient
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_KEYLESS_BUT_ZKLESS_ACCOUNTS">KEYLESS_BUT_ZKLESS_ACCOUNTS</a>: u64 = 47;
+</code></pre>
+
+
+
+<a id="0x1_features_LIMIT_MAX_IDENTIFIER_LENGTH"></a>
+
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_LIMIT_MAX_IDENTIFIER_LENGTH">LIMIT_MAX_IDENTIFIER_LENGTH</a>: u64 = 38;
+</code></pre>
+
+
+
+<a id="0x1_features_MAX_OBJECT_NESTING_CHECK"></a>
+
+Whether checking the maximum object nesting is enabled.
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_MAX_OBJECT_NESTING_CHECK">MAX_OBJECT_NESTING_CHECK</a>: u64 = 53;
+</code></pre>
+
+
+
+<a id="0x1_features_MODULE_EVENT"></a>
+
+Whether emit function in <code>event.<b>move</b></code> are enabled for module events.
+
+Lifetime: transient
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_MODULE_EVENT">MODULE_EVENT</a>: u64 = 26;
+</code></pre>
+
+
+
+<a id="0x1_features_MODULE_EVENT_MIGRATION"></a>
+
+Whether aptos_framwork enables the behavior of module event migration.
+
+Lifetime: transient
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_MODULE_EVENT_MIGRATION">MODULE_EVENT_MIGRATION</a>: u64 = 57;
+</code></pre>
+
+
+
+<a id="0x1_features_MULTISIG_ACCOUNTS"></a>
+
+Whether multisig accounts (different from accounts with multi-ed25519 auth keys) are enabled.
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_MULTISIG_ACCOUNTS">MULTISIG_ACCOUNTS</a>: u64 = 10;
+</code></pre>
+
+
+
+<a id="0x1_features_MULTISIG_V2_ENHANCEMENT"></a>
+
+Whether the Multisig V2 enhancement feature is enabled.
+
+Lifetime: transient
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_MULTISIG_V2_ENHANCEMENT">MULTISIG_V2_ENHANCEMENT</a>: u64 = 55;
+</code></pre>
+
+
+
+<a id="0x1_features_MULTI_ED25519_PK_VALIDATE_V2_NATIVES"></a>
+
+Whether the new <code>aptos_stdlib::multi_ed25519::public_key_validate_internal_v2()</code> native is enabled.
+This is needed because of the introduction of a new native function.
+Lifetime: transient
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_MULTI_ED25519_PK_VALIDATE_V2_NATIVES">MULTI_ED25519_PK_VALIDATE_V2_NATIVES</a>: u64 = 7;
+</code></pre>
+
+
+
+<a id="0x1_features_NEW_ACCOUNTS_DEFAULT_TO_FA_APT_STORE"></a>
+
+Lifetime: transient
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_NEW_ACCOUNTS_DEFAULT_TO_FA_APT_STORE">NEW_ACCOUNTS_DEFAULT_TO_FA_APT_STORE</a>: u64 = 64;
+</code></pre>
+
+
+
+<a id="0x1_features_OBJECT_CODE_DEPLOYMENT"></a>
+
+Whether deploying to objects is enabled.
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_OBJECT_CODE_DEPLOYMENT">OBJECT_CODE_DEPLOYMENT</a>: u64 = 52;
+</code></pre>
+
+
+
+<a id="0x1_features_OBJECT_NATIVE_DERIVED_ADDRESS"></a>
+
+Whether we use more efficient native implementation of computing object derived address
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_OBJECT_NATIVE_DERIVED_ADDRESS">OBJECT_NATIVE_DERIVED_ADDRESS</a>: u64 = 62;
+</code></pre>
+
+
+
+<a id="0x1_features_OPERATIONS_DEFAULT_TO_FA_APT_STORE"></a>
+
+Lifetime: transient
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_OPERATIONS_DEFAULT_TO_FA_APT_STORE">OPERATIONS_DEFAULT_TO_FA_APT_STORE</a>: u64 = 65;
+</code></pre>
+
+
+
+<a id="0x1_features_OPERATOR_BENEFICIARY_CHANGE"></a>
+
+Whether allow changing beneficiaries for operators.
+Lifetime: transient
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_OPERATOR_BENEFICIARY_CHANGE">OPERATOR_BENEFICIARY_CHANGE</a>: u64 = 39;
+</code></pre>
+
+
+
+<a id="0x1_features_PARTIAL_GOVERNANCE_VOTING"></a>
+
+Whether enable paritial governance voting on aptos_governance.
+Lifetime: transient
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_PARTIAL_GOVERNANCE_VOTING">PARTIAL_GOVERNANCE_VOTING</a>: u64 = 17;
+</code></pre>
+
+
+
+<a id="0x1_features_PERIODICAL_REWARD_RATE_DECREASE"></a>
+
+Whether reward rate decreases periodically.
+Lifetime: transient
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_PERIODICAL_REWARD_RATE_DECREASE">PERIODICAL_REWARD_RATE_DECREASE</a>: u64 = 16;
+</code></pre>
+
+
+
+<a id="0x1_features_PRIMARY_APT_FUNGIBLE_STORE_AT_USER_ADDRESS"></a>
+
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_PRIMARY_APT_FUNGIBLE_STORE_AT_USER_ADDRESS">PRIMARY_APT_FUNGIBLE_STORE_AT_USER_ADDRESS</a>: u64 = 61;
+</code></pre>
+
+
+
+<a id="0x1_features_RECONFIGURE_WITH_DKG"></a>
+
+Deprecated by <code>aptos_framework::randomness_config::RandomnessConfig</code>.
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_RECONFIGURE_WITH_DKG">RECONFIGURE_WITH_DKG</a>: u64 = 45;
+</code></pre>
+
+
+
+<a id="0x1_features_RESOURCE_GROUPS"></a>
+
+Whether resource groups are enabled.
+This is needed because of new attributes for structs and a change in storage representation.
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_RESOURCE_GROUPS">RESOURCE_GROUPS</a>: u64 = 9;
+</code></pre>
+
+
+
+<a id="0x1_features_RESOURCE_GROUPS_SPLIT_IN_VM_CHANGE_SET"></a>
+
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_RESOURCE_GROUPS_SPLIT_IN_VM_CHANGE_SET">RESOURCE_GROUPS_SPLIT_IN_VM_CHANGE_SET</a>: u64 = 41;
+</code></pre>
+
+
+
+<a id="0x1_features_SAFER_METADATA"></a>
+
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_SAFER_METADATA">SAFER_METADATA</a>: u64 = 32;
+</code></pre>
+
+
+
+<a id="0x1_features_SAFER_RESOURCE_GROUPS"></a>
+
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_SAFER_RESOURCE_GROUPS">SAFER_RESOURCE_GROUPS</a>: u64 = 31;
+</code></pre>
+
+
+
+<a id="0x1_features_SHA_512_AND_RIPEMD_160_NATIVES"></a>
+
+Whether the new SHA2-512, SHA3-512 and RIPEMD-160 hash function natives are enabled.
+This is needed because of the introduction of new native functions.
+Lifetime: transient
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_SHA_512_AND_RIPEMD_160_NATIVES">SHA_512_AND_RIPEMD_160_NATIVES</a>: u64 = 3;
+</code></pre>
+
+
+
+<a id="0x1_features_SIGNATURE_CHECKER_V2_SCRIPT_FIX"></a>
+
+Whether the fix for a counting bug in the script path of the signature checker pass is enabled.
+Lifetime: transient
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_SIGNATURE_CHECKER_V2_SCRIPT_FIX">SIGNATURE_CHECKER_V2_SCRIPT_FIX</a>: u64 = 29;
+</code></pre>
+
+
+
+<a id="0x1_features_SIGNER_NATIVE_FORMAT_FIX"></a>
+
+Fix the native formatter for signer.
+Lifetime: transient
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_SIGNER_NATIVE_FORMAT_FIX">SIGNER_NATIVE_FORMAT_FIX</a>: u64 = 25;
+</code></pre>
+
+
+
+<a id="0x1_features_SINGLE_SENDER_AUTHENTICATOR"></a>
+
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_SINGLE_SENDER_AUTHENTICATOR">SINGLE_SENDER_AUTHENTICATOR</a>: u64 = 33;
+</code></pre>
+
+
+
+<a id="0x1_features_SPONSORED_AUTOMATIC_ACCOUNT_CREATION"></a>
+
+Whether the automatic creation of accounts is enabled for sponsored transactions.
+Lifetime: transient
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_SPONSORED_AUTOMATIC_ACCOUNT_CREATION">SPONSORED_AUTOMATIC_ACCOUNT_CREATION</a>: u64 = 34;
+</code></pre>
+
+
+
+<a id="0x1_features_STRUCT_CONSTRUCTORS"></a>
+
+Whether struct constructors are enabled
+
+Lifetime: transient
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_STRUCT_CONSTRUCTORS">STRUCT_CONSTRUCTORS</a>: u64 = 15;
+</code></pre>
+
+
+
+<a id="0x1_features_TRANSACTION_CONTEXT_EXTENSION"></a>
+
+Whether the transaction context extension is enabled. This feature allows the module
+<code>transaction_context</code> to provide contextual information about the user transaction.
+
+Lifetime: transient
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_TRANSACTION_CONTEXT_EXTENSION">TRANSACTION_CONTEXT_EXTENSION</a>: u64 = 59;
+</code></pre>
+
+
+
+<a id="0x1_features_TREAT_FRIEND_AS_PRIVATE"></a>
+
+Whether during upgrade compatibility checking, friend functions should be treated similar like
+private functions.
+Lifetime: permanent
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_TREAT_FRIEND_AS_PRIVATE">TREAT_FRIEND_AS_PRIVATE</a>: u64 = 2;
+</code></pre>
+
+
+
+<a id="0x1_features_VM_BINARY_FORMAT_V6"></a>
+
+Whether to allow the use of binary format version v6.
+Lifetime: transient
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_VM_BINARY_FORMAT_V6">VM_BINARY_FORMAT_V6</a>: u64 = 5;
+</code></pre>
+
+
+
+<a id="0x1_features_VM_BINARY_FORMAT_V7"></a>
+
+
+
+<pre><code><b>const</b> <a href="features.md#0x1_features_VM_BINARY_FORMAT_V7">VM_BINARY_FORMAT_V7</a>: u64 = 40;
+</code></pre>
+
+
+
+<a id="0x1_features_code_dependency_check_enabled"></a>
+
+## Function `code_dependency_check_enabled`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_code_dependency_check_enabled">code_dependency_check_enabled</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_code_dependency_check_enabled">code_dependency_check_enabled</a>(): bool <b>acquires</b> <a href="features.md#0x1_features_Features">Features</a> {
+    <a href="features.md#0x1_features_is_enabled">is_enabled</a>(<a href="features.md#0x1_features_CODE_DEPENDENCY_CHECK">CODE_DEPENDENCY_CHECK</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_treat_friend_as_private"></a>
+
+## Function `treat_friend_as_private`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_treat_friend_as_private">treat_friend_as_private</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_treat_friend_as_private">treat_friend_as_private</a>(): bool <b>acquires</b> <a href="features.md#0x1_features_Features">Features</a> {
+    <a href="features.md#0x1_features_is_enabled">is_enabled</a>(<a href="features.md#0x1_features_TREAT_FRIEND_AS_PRIVATE">TREAT_FRIEND_AS_PRIVATE</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_get_sha_512_and_ripemd_160_feature"></a>
+
+## Function `get_sha_512_and_ripemd_160_feature`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_sha_512_and_ripemd_160_feature">get_sha_512_and_ripemd_160_feature</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_sha_512_and_ripemd_160_feature">get_sha_512_and_ripemd_160_feature</a>(): u64 { <a href="features.md#0x1_features_SHA_512_AND_RIPEMD_160_NATIVES">SHA_512_AND_RIPEMD_160_NATIVES</a> }
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_sha_512_and_ripemd_160_enabled"></a>
+
+## Function `sha_512_and_ripemd_160_enabled`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_sha_512_and_ripemd_160_enabled">sha_512_and_ripemd_160_enabled</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_sha_512_and_ripemd_160_enabled">sha_512_and_ripemd_160_enabled</a>(): bool <b>acquires</b> <a href="features.md#0x1_features_Features">Features</a> {
+    <a href="features.md#0x1_features_is_enabled">is_enabled</a>(<a href="features.md#0x1_features_SHA_512_AND_RIPEMD_160_NATIVES">SHA_512_AND_RIPEMD_160_NATIVES</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_get_aptos_stdlib_chain_id_feature"></a>
+
+## Function `get_aptos_stdlib_chain_id_feature`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_aptos_stdlib_chain_id_feature">get_aptos_stdlib_chain_id_feature</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_aptos_stdlib_chain_id_feature">get_aptos_stdlib_chain_id_feature</a>(): u64 { <a href="features.md#0x1_features_APTOS_STD_CHAIN_ID_NATIVES">APTOS_STD_CHAIN_ID_NATIVES</a> }
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_aptos_stdlib_chain_id_enabled"></a>
+
+## Function `aptos_stdlib_chain_id_enabled`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_aptos_stdlib_chain_id_enabled">aptos_stdlib_chain_id_enabled</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_aptos_stdlib_chain_id_enabled">aptos_stdlib_chain_id_enabled</a>(): bool <b>acquires</b> <a href="features.md#0x1_features_Features">Features</a> {
+    <a href="features.md#0x1_features_is_enabled">is_enabled</a>(<a href="features.md#0x1_features_APTOS_STD_CHAIN_ID_NATIVES">APTOS_STD_CHAIN_ID_NATIVES</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_get_vm_binary_format_v6"></a>
+
+## Function `get_vm_binary_format_v6`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_vm_binary_format_v6">get_vm_binary_format_v6</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_vm_binary_format_v6">get_vm_binary_format_v6</a>(): u64 { <a href="features.md#0x1_features_VM_BINARY_FORMAT_V6">VM_BINARY_FORMAT_V6</a> }
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_allow_vm_binary_format_v6"></a>
+
+## Function `allow_vm_binary_format_v6`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_allow_vm_binary_format_v6">allow_vm_binary_format_v6</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_allow_vm_binary_format_v6">allow_vm_binary_format_v6</a>(): bool <b>acquires</b> <a href="features.md#0x1_features_Features">Features</a> {
+    <a href="features.md#0x1_features_is_enabled">is_enabled</a>(<a href="features.md#0x1_features_VM_BINARY_FORMAT_V6">VM_BINARY_FORMAT_V6</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_get_collect_and_distribute_gas_fees_feature"></a>
+
+## Function `get_collect_and_distribute_gas_fees_feature`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_collect_and_distribute_gas_fees_feature">get_collect_and_distribute_gas_fees_feature</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_collect_and_distribute_gas_fees_feature">get_collect_and_distribute_gas_fees_feature</a>(): u64 { <a href="features.md#0x1_features_COLLECT_AND_DISTRIBUTE_GAS_FEES">COLLECT_AND_DISTRIBUTE_GAS_FEES</a> }
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_collect_and_distribute_gas_fees"></a>
+
+## Function `collect_and_distribute_gas_fees`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_collect_and_distribute_gas_fees">collect_and_distribute_gas_fees</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_collect_and_distribute_gas_fees">collect_and_distribute_gas_fees</a>(): bool <b>acquires</b> <a href="features.md#0x1_features_Features">Features</a> {
+    <a href="features.md#0x1_features_is_enabled">is_enabled</a>(<a href="features.md#0x1_features_COLLECT_AND_DISTRIBUTE_GAS_FEES">COLLECT_AND_DISTRIBUTE_GAS_FEES</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_multi_ed25519_pk_validate_v2_feature"></a>
+
+## Function `multi_ed25519_pk_validate_v2_feature`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_multi_ed25519_pk_validate_v2_feature">multi_ed25519_pk_validate_v2_feature</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_multi_ed25519_pk_validate_v2_feature">multi_ed25519_pk_validate_v2_feature</a>(): u64 { <a href="features.md#0x1_features_MULTI_ED25519_PK_VALIDATE_V2_NATIVES">MULTI_ED25519_PK_VALIDATE_V2_NATIVES</a> }
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_multi_ed25519_pk_validate_v2_enabled"></a>
+
+## Function `multi_ed25519_pk_validate_v2_enabled`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_multi_ed25519_pk_validate_v2_enabled">multi_ed25519_pk_validate_v2_enabled</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_multi_ed25519_pk_validate_v2_enabled">multi_ed25519_pk_validate_v2_enabled</a>(): bool <b>acquires</b> <a href="features.md#0x1_features_Features">Features</a> {
+    <a href="features.md#0x1_features_is_enabled">is_enabled</a>(<a href="features.md#0x1_features_MULTI_ED25519_PK_VALIDATE_V2_NATIVES">MULTI_ED25519_PK_VALIDATE_V2_NATIVES</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_get_blake2b_256_feature"></a>
+
+## Function `get_blake2b_256_feature`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_blake2b_256_feature">get_blake2b_256_feature</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_blake2b_256_feature">get_blake2b_256_feature</a>(): u64 { <a href="features.md#0x1_features_BLAKE2B_256_NATIVE">BLAKE2B_256_NATIVE</a> }
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_blake2b_256_enabled"></a>
+
+## Function `blake2b_256_enabled`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_blake2b_256_enabled">blake2b_256_enabled</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_blake2b_256_enabled">blake2b_256_enabled</a>(): bool <b>acquires</b> <a href="features.md#0x1_features_Features">Features</a> {
+    <a href="features.md#0x1_features_is_enabled">is_enabled</a>(<a href="features.md#0x1_features_BLAKE2B_256_NATIVE">BLAKE2B_256_NATIVE</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_get_resource_groups_feature"></a>
+
+## Function `get_resource_groups_feature`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_resource_groups_feature">get_resource_groups_feature</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_resource_groups_feature">get_resource_groups_feature</a>(): u64 { <a href="features.md#0x1_features_RESOURCE_GROUPS">RESOURCE_GROUPS</a> }
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_resource_groups_enabled"></a>
+
+## Function `resource_groups_enabled`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_resource_groups_enabled">resource_groups_enabled</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_resource_groups_enabled">resource_groups_enabled</a>(): bool <b>acquires</b> <a href="features.md#0x1_features_Features">Features</a> {
+    <a href="features.md#0x1_features_is_enabled">is_enabled</a>(<a href="features.md#0x1_features_RESOURCE_GROUPS">RESOURCE_GROUPS</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_get_multisig_accounts_feature"></a>
+
+## Function `get_multisig_accounts_feature`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_multisig_accounts_feature">get_multisig_accounts_feature</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_multisig_accounts_feature">get_multisig_accounts_feature</a>(): u64 { <a href="features.md#0x1_features_MULTISIG_ACCOUNTS">MULTISIG_ACCOUNTS</a> }
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_multisig_accounts_enabled"></a>
+
+## Function `multisig_accounts_enabled`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_multisig_accounts_enabled">multisig_accounts_enabled</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_multisig_accounts_enabled">multisig_accounts_enabled</a>(): bool <b>acquires</b> <a href="features.md#0x1_features_Features">Features</a> {
+    <a href="features.md#0x1_features_is_enabled">is_enabled</a>(<a href="features.md#0x1_features_MULTISIG_ACCOUNTS">MULTISIG_ACCOUNTS</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_get_delegation_pools_feature"></a>
+
+## Function `get_delegation_pools_feature`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_delegation_pools_feature">get_delegation_pools_feature</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_delegation_pools_feature">get_delegation_pools_feature</a>(): u64 { <a href="features.md#0x1_features_DELEGATION_POOLS">DELEGATION_POOLS</a> }
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_delegation_pools_enabled"></a>
+
+## Function `delegation_pools_enabled`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_delegation_pools_enabled">delegation_pools_enabled</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_delegation_pools_enabled">delegation_pools_enabled</a>(): bool <b>acquires</b> <a href="features.md#0x1_features_Features">Features</a> {
+    <a href="features.md#0x1_features_is_enabled">is_enabled</a>(<a href="features.md#0x1_features_DELEGATION_POOLS">DELEGATION_POOLS</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_get_cryptography_algebra_natives_feature"></a>
+
+## Function `get_cryptography_algebra_natives_feature`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_cryptography_algebra_natives_feature">get_cryptography_algebra_natives_feature</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_cryptography_algebra_natives_feature">get_cryptography_algebra_natives_feature</a>(): u64 { <a href="features.md#0x1_features_CRYPTOGRAPHY_ALGEBRA_NATIVES">CRYPTOGRAPHY_ALGEBRA_NATIVES</a> }
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_cryptography_algebra_enabled"></a>
+
+## Function `cryptography_algebra_enabled`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_cryptography_algebra_enabled">cryptography_algebra_enabled</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_cryptography_algebra_enabled">cryptography_algebra_enabled</a>(): bool <b>acquires</b> <a href="features.md#0x1_features_Features">Features</a> {
+    <a href="features.md#0x1_features_is_enabled">is_enabled</a>(<a href="features.md#0x1_features_CRYPTOGRAPHY_ALGEBRA_NATIVES">CRYPTOGRAPHY_ALGEBRA_NATIVES</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_get_bls12_381_strutures_feature"></a>
+
+## Function `get_bls12_381_strutures_feature`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_bls12_381_strutures_feature">get_bls12_381_strutures_feature</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_bls12_381_strutures_feature">get_bls12_381_strutures_feature</a>(): u64 { <a href="features.md#0x1_features_BLS12_381_STRUCTURES">BLS12_381_STRUCTURES</a> }
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_bls12_381_structures_enabled"></a>
+
+## Function `bls12_381_structures_enabled`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_bls12_381_structures_enabled">bls12_381_structures_enabled</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_bls12_381_structures_enabled">bls12_381_structures_enabled</a>(): bool <b>acquires</b> <a href="features.md#0x1_features_Features">Features</a> {
+    <a href="features.md#0x1_features_is_enabled">is_enabled</a>(<a href="features.md#0x1_features_BLS12_381_STRUCTURES">BLS12_381_STRUCTURES</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_get_periodical_reward_rate_decrease_feature"></a>
+
+## Function `get_periodical_reward_rate_decrease_feature`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_periodical_reward_rate_decrease_feature">get_periodical_reward_rate_decrease_feature</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_periodical_reward_rate_decrease_feature">get_periodical_reward_rate_decrease_feature</a>(): u64 { <a href="features.md#0x1_features_PERIODICAL_REWARD_RATE_DECREASE">PERIODICAL_REWARD_RATE_DECREASE</a> }
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_periodical_reward_rate_decrease_enabled"></a>
+
+## Function `periodical_reward_rate_decrease_enabled`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_periodical_reward_rate_decrease_enabled">periodical_reward_rate_decrease_enabled</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_periodical_reward_rate_decrease_enabled">periodical_reward_rate_decrease_enabled</a>(): bool <b>acquires</b> <a href="features.md#0x1_features_Features">Features</a> {
+    <a href="features.md#0x1_features_is_enabled">is_enabled</a>(<a href="features.md#0x1_features_PERIODICAL_REWARD_RATE_DECREASE">PERIODICAL_REWARD_RATE_DECREASE</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_get_partial_governance_voting"></a>
+
+## Function `get_partial_governance_voting`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_partial_governance_voting">get_partial_governance_voting</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_partial_governance_voting">get_partial_governance_voting</a>(): u64 { <a href="features.md#0x1_features_PARTIAL_GOVERNANCE_VOTING">PARTIAL_GOVERNANCE_VOTING</a> }
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_partial_governance_voting_enabled"></a>
+
+## Function `partial_governance_voting_enabled`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_partial_governance_voting_enabled">partial_governance_voting_enabled</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_partial_governance_voting_enabled">partial_governance_voting_enabled</a>(): bool <b>acquires</b> <a href="features.md#0x1_features_Features">Features</a> {
+    <a href="features.md#0x1_features_is_enabled">is_enabled</a>(<a href="features.md#0x1_features_PARTIAL_GOVERNANCE_VOTING">PARTIAL_GOVERNANCE_VOTING</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_get_delegation_pool_partial_governance_voting"></a>
+
+## Function `get_delegation_pool_partial_governance_voting`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_delegation_pool_partial_governance_voting">get_delegation_pool_partial_governance_voting</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_delegation_pool_partial_governance_voting">get_delegation_pool_partial_governance_voting</a>(): u64 { <a href="features.md#0x1_features_DELEGATION_POOL_PARTIAL_GOVERNANCE_VOTING">DELEGATION_POOL_PARTIAL_GOVERNANCE_VOTING</a> }
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_delegation_pool_partial_governance_voting_enabled"></a>
+
+## Function `delegation_pool_partial_governance_voting_enabled`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_delegation_pool_partial_governance_voting_enabled">delegation_pool_partial_governance_voting_enabled</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_delegation_pool_partial_governance_voting_enabled">delegation_pool_partial_governance_voting_enabled</a>(): bool <b>acquires</b> <a href="features.md#0x1_features_Features">Features</a> {
+    <a href="features.md#0x1_features_is_enabled">is_enabled</a>(<a href="features.md#0x1_features_DELEGATION_POOL_PARTIAL_GOVERNANCE_VOTING">DELEGATION_POOL_PARTIAL_GOVERNANCE_VOTING</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_fee_payer_enabled"></a>
+
+## Function `fee_payer_enabled`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_fee_payer_enabled">fee_payer_enabled</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_fee_payer_enabled">fee_payer_enabled</a>(): bool <b>acquires</b> <a href="features.md#0x1_features_Features">Features</a> {
+    <a href="features.md#0x1_features_is_enabled">is_enabled</a>(<a href="features.md#0x1_features_FEE_PAYER_ENABLED">FEE_PAYER_ENABLED</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_get_auids"></a>
+
+## Function `get_auids`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_auids">get_auids</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_auids">get_auids</a>(): u64 {
+    <a href="error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="features.md#0x1_features_EFEATURE_CANNOT_BE_DISABLED">EFEATURE_CANNOT_BE_DISABLED</a>)
+ }
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_auids_enabled"></a>
+
+## Function `auids_enabled`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_auids_enabled">auids_enabled</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_auids_enabled">auids_enabled</a>(): bool {
+    <b>true</b>
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_get_bulletproofs_feature"></a>
+
+## Function `get_bulletproofs_feature`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_bulletproofs_feature">get_bulletproofs_feature</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_bulletproofs_feature">get_bulletproofs_feature</a>(): u64 { <a href="features.md#0x1_features_BULLETPROOFS_NATIVES">BULLETPROOFS_NATIVES</a> }
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_bulletproofs_enabled"></a>
+
+## Function `bulletproofs_enabled`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_bulletproofs_enabled">bulletproofs_enabled</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_bulletproofs_enabled">bulletproofs_enabled</a>(): bool <b>acquires</b> <a href="features.md#0x1_features_Features">Features</a> {
+    <a href="features.md#0x1_features_is_enabled">is_enabled</a>(<a href="features.md#0x1_features_BULLETPROOFS_NATIVES">BULLETPROOFS_NATIVES</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_get_signer_native_format_fix_feature"></a>
+
+## Function `get_signer_native_format_fix_feature`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_signer_native_format_fix_feature">get_signer_native_format_fix_feature</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_signer_native_format_fix_feature">get_signer_native_format_fix_feature</a>(): u64 { <a href="features.md#0x1_features_SIGNER_NATIVE_FORMAT_FIX">SIGNER_NATIVE_FORMAT_FIX</a> }
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_signer_native_format_fix_enabled"></a>
+
+## Function `signer_native_format_fix_enabled`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_signer_native_format_fix_enabled">signer_native_format_fix_enabled</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_signer_native_format_fix_enabled">signer_native_format_fix_enabled</a>(): bool <b>acquires</b> <a href="features.md#0x1_features_Features">Features</a> {
+    <a href="features.md#0x1_features_is_enabled">is_enabled</a>(<a href="features.md#0x1_features_SIGNER_NATIVE_FORMAT_FIX">SIGNER_NATIVE_FORMAT_FIX</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_get_module_event_feature"></a>
+
+## Function `get_module_event_feature`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_module_event_feature">get_module_event_feature</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_module_event_feature">get_module_event_feature</a>(): u64 { <a href="features.md#0x1_features_MODULE_EVENT">MODULE_EVENT</a> }
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_module_event_enabled"></a>
+
+## Function `module_event_enabled`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_module_event_enabled">module_event_enabled</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_module_event_enabled">module_event_enabled</a>(): bool <b>acquires</b> <a href="features.md#0x1_features_Features">Features</a> {
+    <a href="features.md#0x1_features_is_enabled">is_enabled</a>(<a href="features.md#0x1_features_MODULE_EVENT">MODULE_EVENT</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_get_aggregator_v2_api_feature"></a>
+
+## Function `get_aggregator_v2_api_feature`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_aggregator_v2_api_feature">get_aggregator_v2_api_feature</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_aggregator_v2_api_feature">get_aggregator_v2_api_feature</a>(): u64 {
+    <b>abort</b> <a href="error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="features.md#0x1_features_EFEATURE_CANNOT_BE_DISABLED">EFEATURE_CANNOT_BE_DISABLED</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_aggregator_v2_api_enabled"></a>
+
+## Function `aggregator_v2_api_enabled`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_aggregator_v2_api_enabled">aggregator_v2_api_enabled</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_aggregator_v2_api_enabled">aggregator_v2_api_enabled</a>(): bool {
+    <b>true</b>
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_get_aggregator_snapshots_feature"></a>
+
+## Function `get_aggregator_snapshots_feature`
+
+
+
+<pre><code>#[deprecated]
+<b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_aggregator_snapshots_feature">get_aggregator_snapshots_feature</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_aggregator_snapshots_feature">get_aggregator_snapshots_feature</a>(): u64 {
+    <b>abort</b> <a href="error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="features.md#0x1_features_EINVALID_FEATURE">EINVALID_FEATURE</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_aggregator_snapshots_enabled"></a>
+
+## Function `aggregator_snapshots_enabled`
+
+
+
+<pre><code>#[deprecated]
+<b>public</b> <b>fun</b> <a href="features.md#0x1_features_aggregator_snapshots_enabled">aggregator_snapshots_enabled</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_aggregator_snapshots_enabled">aggregator_snapshots_enabled</a>(): bool {
+    <b>abort</b> <a href="error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="features.md#0x1_features_EINVALID_FEATURE">EINVALID_FEATURE</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_get_sponsored_automatic_account_creation"></a>
+
+## Function `get_sponsored_automatic_account_creation`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_sponsored_automatic_account_creation">get_sponsored_automatic_account_creation</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_sponsored_automatic_account_creation">get_sponsored_automatic_account_creation</a>(): u64 { <a href="features.md#0x1_features_SPONSORED_AUTOMATIC_ACCOUNT_CREATION">SPONSORED_AUTOMATIC_ACCOUNT_CREATION</a> }
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_sponsored_automatic_account_creation_enabled"></a>
+
+## Function `sponsored_automatic_account_creation_enabled`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_sponsored_automatic_account_creation_enabled">sponsored_automatic_account_creation_enabled</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_sponsored_automatic_account_creation_enabled">sponsored_automatic_account_creation_enabled</a>(): bool <b>acquires</b> <a href="features.md#0x1_features_Features">Features</a> {
+    <a href="features.md#0x1_features_is_enabled">is_enabled</a>(<a href="features.md#0x1_features_SPONSORED_AUTOMATIC_ACCOUNT_CREATION">SPONSORED_AUTOMATIC_ACCOUNT_CREATION</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_get_concurrent_token_v2_feature"></a>
+
+## Function `get_concurrent_token_v2_feature`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_concurrent_token_v2_feature">get_concurrent_token_v2_feature</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_concurrent_token_v2_feature">get_concurrent_token_v2_feature</a>(): u64 {
+    <a href="error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="features.md#0x1_features_EFEATURE_CANNOT_BE_DISABLED">EFEATURE_CANNOT_BE_DISABLED</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_concurrent_token_v2_enabled"></a>
+
+## Function `concurrent_token_v2_enabled`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_concurrent_token_v2_enabled">concurrent_token_v2_enabled</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_concurrent_token_v2_enabled">concurrent_token_v2_enabled</a>(): bool {
+    <b>true</b>
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_get_concurrent_assets_feature"></a>
+
+## Function `get_concurrent_assets_feature`
+
+
+
+<pre><code>#[deprecated]
+<b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_concurrent_assets_feature">get_concurrent_assets_feature</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_concurrent_assets_feature">get_concurrent_assets_feature</a>(): u64 {
+    <b>abort</b> <a href="error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="features.md#0x1_features_EFEATURE_CANNOT_BE_DISABLED">EFEATURE_CANNOT_BE_DISABLED</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_concurrent_assets_enabled"></a>
+
+## Function `concurrent_assets_enabled`
+
+
+
+<pre><code>#[deprecated]
+<b>public</b> <b>fun</b> <a href="features.md#0x1_features_concurrent_assets_enabled">concurrent_assets_enabled</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_concurrent_assets_enabled">concurrent_assets_enabled</a>(): bool {
+    <b>abort</b> <a href="error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="features.md#0x1_features_EFEATURE_CANNOT_BE_DISABLED">EFEATURE_CANNOT_BE_DISABLED</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_get_operator_beneficiary_change_feature"></a>
+
+## Function `get_operator_beneficiary_change_feature`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_operator_beneficiary_change_feature">get_operator_beneficiary_change_feature</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_operator_beneficiary_change_feature">get_operator_beneficiary_change_feature</a>(): u64 { <a href="features.md#0x1_features_OPERATOR_BENEFICIARY_CHANGE">OPERATOR_BENEFICIARY_CHANGE</a> }
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_operator_beneficiary_change_enabled"></a>
+
+## Function `operator_beneficiary_change_enabled`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_operator_beneficiary_change_enabled">operator_beneficiary_change_enabled</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_operator_beneficiary_change_enabled">operator_beneficiary_change_enabled</a>(): bool <b>acquires</b> <a href="features.md#0x1_features_Features">Features</a> {
+    <a href="features.md#0x1_features_is_enabled">is_enabled</a>(<a href="features.md#0x1_features_OPERATOR_BENEFICIARY_CHANGE">OPERATOR_BENEFICIARY_CHANGE</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_get_commission_change_delegation_pool_feature"></a>
+
+## Function `get_commission_change_delegation_pool_feature`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_commission_change_delegation_pool_feature">get_commission_change_delegation_pool_feature</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_commission_change_delegation_pool_feature">get_commission_change_delegation_pool_feature</a>(): u64 { <a href="features.md#0x1_features_COMMISSION_CHANGE_DELEGATION_POOL">COMMISSION_CHANGE_DELEGATION_POOL</a> }
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_commission_change_delegation_pool_enabled"></a>
+
+## Function `commission_change_delegation_pool_enabled`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_commission_change_delegation_pool_enabled">commission_change_delegation_pool_enabled</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_commission_change_delegation_pool_enabled">commission_change_delegation_pool_enabled</a>(): bool <b>acquires</b> <a href="features.md#0x1_features_Features">Features</a> {
+    <a href="features.md#0x1_features_is_enabled">is_enabled</a>(<a href="features.md#0x1_features_COMMISSION_CHANGE_DELEGATION_POOL">COMMISSION_CHANGE_DELEGATION_POOL</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_get_bn254_strutures_feature"></a>
+
+## Function `get_bn254_strutures_feature`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_bn254_strutures_feature">get_bn254_strutures_feature</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_bn254_strutures_feature">get_bn254_strutures_feature</a>(): u64 { <a href="features.md#0x1_features_BN254_STRUCTURES">BN254_STRUCTURES</a> }
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_bn254_structures_enabled"></a>
+
+## Function `bn254_structures_enabled`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_bn254_structures_enabled">bn254_structures_enabled</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_bn254_structures_enabled">bn254_structures_enabled</a>(): bool <b>acquires</b> <a href="features.md#0x1_features_Features">Features</a> {
+    <a href="features.md#0x1_features_is_enabled">is_enabled</a>(<a href="features.md#0x1_features_BN254_STRUCTURES">BN254_STRUCTURES</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_get_reconfigure_with_dkg_feature"></a>
+
+## Function `get_reconfigure_with_dkg_feature`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_reconfigure_with_dkg_feature">get_reconfigure_with_dkg_feature</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_reconfigure_with_dkg_feature">get_reconfigure_with_dkg_feature</a>(): u64 { <a href="features.md#0x1_features_RECONFIGURE_WITH_DKG">RECONFIGURE_WITH_DKG</a> }
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_reconfigure_with_dkg_enabled"></a>
+
+## Function `reconfigure_with_dkg_enabled`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_reconfigure_with_dkg_enabled">reconfigure_with_dkg_enabled</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_reconfigure_with_dkg_enabled">reconfigure_with_dkg_enabled</a>(): bool <b>acquires</b> <a href="features.md#0x1_features_Features">Features</a> {
+    <a href="features.md#0x1_features_is_enabled">is_enabled</a>(<a href="features.md#0x1_features_RECONFIGURE_WITH_DKG">RECONFIGURE_WITH_DKG</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_get_keyless_accounts_feature"></a>
+
+## Function `get_keyless_accounts_feature`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_keyless_accounts_feature">get_keyless_accounts_feature</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_keyless_accounts_feature">get_keyless_accounts_feature</a>(): u64 { <a href="features.md#0x1_features_KEYLESS_ACCOUNTS">KEYLESS_ACCOUNTS</a> }
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_keyless_accounts_enabled"></a>
+
+## Function `keyless_accounts_enabled`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_keyless_accounts_enabled">keyless_accounts_enabled</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_keyless_accounts_enabled">keyless_accounts_enabled</a>(): bool <b>acquires</b> <a href="features.md#0x1_features_Features">Features</a> {
+    <a href="features.md#0x1_features_is_enabled">is_enabled</a>(<a href="features.md#0x1_features_KEYLESS_ACCOUNTS">KEYLESS_ACCOUNTS</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_get_keyless_but_zkless_accounts_feature"></a>
+
+## Function `get_keyless_but_zkless_accounts_feature`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_keyless_but_zkless_accounts_feature">get_keyless_but_zkless_accounts_feature</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_keyless_but_zkless_accounts_feature">get_keyless_but_zkless_accounts_feature</a>(): u64 { <a href="features.md#0x1_features_KEYLESS_BUT_ZKLESS_ACCOUNTS">KEYLESS_BUT_ZKLESS_ACCOUNTS</a> }
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_keyless_but_zkless_accounts_feature_enabled"></a>
+
+## Function `keyless_but_zkless_accounts_feature_enabled`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_keyless_but_zkless_accounts_feature_enabled">keyless_but_zkless_accounts_feature_enabled</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_keyless_but_zkless_accounts_feature_enabled">keyless_but_zkless_accounts_feature_enabled</a>(): bool <b>acquires</b> <a href="features.md#0x1_features_Features">Features</a> {
+    <a href="features.md#0x1_features_is_enabled">is_enabled</a>(<a href="features.md#0x1_features_KEYLESS_BUT_ZKLESS_ACCOUNTS">KEYLESS_BUT_ZKLESS_ACCOUNTS</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_get_jwk_consensus_feature"></a>
+
+## Function `get_jwk_consensus_feature`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_jwk_consensus_feature">get_jwk_consensus_feature</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_jwk_consensus_feature">get_jwk_consensus_feature</a>(): u64 { <a href="features.md#0x1_features_JWK_CONSENSUS">JWK_CONSENSUS</a> }
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_jwk_consensus_enabled"></a>
+
+## Function `jwk_consensus_enabled`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_jwk_consensus_enabled">jwk_consensus_enabled</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_jwk_consensus_enabled">jwk_consensus_enabled</a>(): bool <b>acquires</b> <a href="features.md#0x1_features_Features">Features</a> {
+    <a href="features.md#0x1_features_is_enabled">is_enabled</a>(<a href="features.md#0x1_features_JWK_CONSENSUS">JWK_CONSENSUS</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_get_concurrent_fungible_assets_feature"></a>
+
+## Function `get_concurrent_fungible_assets_feature`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_concurrent_fungible_assets_feature">get_concurrent_fungible_assets_feature</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_concurrent_fungible_assets_feature">get_concurrent_fungible_assets_feature</a>(): u64 { <a href="features.md#0x1_features_CONCURRENT_FUNGIBLE_ASSETS">CONCURRENT_FUNGIBLE_ASSETS</a> }
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_concurrent_fungible_assets_enabled"></a>
+
+## Function `concurrent_fungible_assets_enabled`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_concurrent_fungible_assets_enabled">concurrent_fungible_assets_enabled</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_concurrent_fungible_assets_enabled">concurrent_fungible_assets_enabled</a>(): bool <b>acquires</b> <a href="features.md#0x1_features_Features">Features</a> {
+    <a href="features.md#0x1_features_is_enabled">is_enabled</a>(<a href="features.md#0x1_features_CONCURRENT_FUNGIBLE_ASSETS">CONCURRENT_FUNGIBLE_ASSETS</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_is_object_code_deployment_enabled"></a>
+
+## Function `is_object_code_deployment_enabled`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_is_object_code_deployment_enabled">is_object_code_deployment_enabled</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_is_object_code_deployment_enabled">is_object_code_deployment_enabled</a>(): bool <b>acquires</b> <a href="features.md#0x1_features_Features">Features</a> {
+    <a href="features.md#0x1_features_is_enabled">is_enabled</a>(<a href="features.md#0x1_features_OBJECT_CODE_DEPLOYMENT">OBJECT_CODE_DEPLOYMENT</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_get_max_object_nesting_check_feature"></a>
+
+## Function `get_max_object_nesting_check_feature`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_max_object_nesting_check_feature">get_max_object_nesting_check_feature</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_max_object_nesting_check_feature">get_max_object_nesting_check_feature</a>(): u64 { <a href="features.md#0x1_features_MAX_OBJECT_NESTING_CHECK">MAX_OBJECT_NESTING_CHECK</a> }
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_max_object_nesting_check_enabled"></a>
+
+## Function `max_object_nesting_check_enabled`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_max_object_nesting_check_enabled">max_object_nesting_check_enabled</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_max_object_nesting_check_enabled">max_object_nesting_check_enabled</a>(): bool <b>acquires</b> <a href="features.md#0x1_features_Features">Features</a> {
+    <a href="features.md#0x1_features_is_enabled">is_enabled</a>(<a href="features.md#0x1_features_MAX_OBJECT_NESTING_CHECK">MAX_OBJECT_NESTING_CHECK</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_get_keyless_accounts_with_passkeys_feature"></a>
+
+## Function `get_keyless_accounts_with_passkeys_feature`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_keyless_accounts_with_passkeys_feature">get_keyless_accounts_with_passkeys_feature</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_keyless_accounts_with_passkeys_feature">get_keyless_accounts_with_passkeys_feature</a>(): u64 { <a href="features.md#0x1_features_KEYLESS_ACCOUNTS_WITH_PASSKEYS">KEYLESS_ACCOUNTS_WITH_PASSKEYS</a> }
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_keyless_accounts_with_passkeys_feature_enabled"></a>
+
+## Function `keyless_accounts_with_passkeys_feature_enabled`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_keyless_accounts_with_passkeys_feature_enabled">keyless_accounts_with_passkeys_feature_enabled</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_keyless_accounts_with_passkeys_feature_enabled">keyless_accounts_with_passkeys_feature_enabled</a>(): bool <b>acquires</b> <a href="features.md#0x1_features_Features">Features</a> {
+    <a href="features.md#0x1_features_is_enabled">is_enabled</a>(<a href="features.md#0x1_features_KEYLESS_ACCOUNTS_WITH_PASSKEYS">KEYLESS_ACCOUNTS_WITH_PASSKEYS</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_get_multisig_v2_enhancement_feature"></a>
+
+## Function `get_multisig_v2_enhancement_feature`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_multisig_v2_enhancement_feature">get_multisig_v2_enhancement_feature</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_multisig_v2_enhancement_feature">get_multisig_v2_enhancement_feature</a>(): u64 { <a href="features.md#0x1_features_MULTISIG_V2_ENHANCEMENT">MULTISIG_V2_ENHANCEMENT</a> }
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_multisig_v2_enhancement_feature_enabled"></a>
+
+## Function `multisig_v2_enhancement_feature_enabled`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_multisig_v2_enhancement_feature_enabled">multisig_v2_enhancement_feature_enabled</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_multisig_v2_enhancement_feature_enabled">multisig_v2_enhancement_feature_enabled</a>(): bool <b>acquires</b> <a href="features.md#0x1_features_Features">Features</a> {
+    <a href="features.md#0x1_features_is_enabled">is_enabled</a>(<a href="features.md#0x1_features_MULTISIG_V2_ENHANCEMENT">MULTISIG_V2_ENHANCEMENT</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_get_delegation_pool_allowlisting_feature"></a>
+
+## Function `get_delegation_pool_allowlisting_feature`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_delegation_pool_allowlisting_feature">get_delegation_pool_allowlisting_feature</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_delegation_pool_allowlisting_feature">get_delegation_pool_allowlisting_feature</a>(): u64 { <a href="features.md#0x1_features_DELEGATION_POOL_ALLOWLISTING">DELEGATION_POOL_ALLOWLISTING</a> }
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_delegation_pool_allowlisting_enabled"></a>
+
+## Function `delegation_pool_allowlisting_enabled`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_delegation_pool_allowlisting_enabled">delegation_pool_allowlisting_enabled</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_delegation_pool_allowlisting_enabled">delegation_pool_allowlisting_enabled</a>(): bool <b>acquires</b> <a href="features.md#0x1_features_Features">Features</a> {
+    <a href="features.md#0x1_features_is_enabled">is_enabled</a>(<a href="features.md#0x1_features_DELEGATION_POOL_ALLOWLISTING">DELEGATION_POOL_ALLOWLISTING</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_get_module_event_migration_feature"></a>
+
+## Function `get_module_event_migration_feature`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_module_event_migration_feature">get_module_event_migration_feature</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_module_event_migration_feature">get_module_event_migration_feature</a>(): u64 { <a href="features.md#0x1_features_MODULE_EVENT_MIGRATION">MODULE_EVENT_MIGRATION</a> }
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_module_event_migration_enabled"></a>
+
+## Function `module_event_migration_enabled`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_module_event_migration_enabled">module_event_migration_enabled</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_module_event_migration_enabled">module_event_migration_enabled</a>(): bool <b>acquires</b> <a href="features.md#0x1_features_Features">Features</a> {
+    <a href="features.md#0x1_features_is_enabled">is_enabled</a>(<a href="features.md#0x1_features_MODULE_EVENT_MIGRATION">MODULE_EVENT_MIGRATION</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_get_transaction_context_extension_feature"></a>
+
+## Function `get_transaction_context_extension_feature`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_transaction_context_extension_feature">get_transaction_context_extension_feature</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_transaction_context_extension_feature">get_transaction_context_extension_feature</a>(): u64 { <a href="features.md#0x1_features_TRANSACTION_CONTEXT_EXTENSION">TRANSACTION_CONTEXT_EXTENSION</a> }
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_transaction_context_extension_enabled"></a>
+
+## Function `transaction_context_extension_enabled`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_transaction_context_extension_enabled">transaction_context_extension_enabled</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_transaction_context_extension_enabled">transaction_context_extension_enabled</a>(): bool <b>acquires</b> <a href="features.md#0x1_features_Features">Features</a> {
+    <a href="features.md#0x1_features_is_enabled">is_enabled</a>(<a href="features.md#0x1_features_TRANSACTION_CONTEXT_EXTENSION">TRANSACTION_CONTEXT_EXTENSION</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_get_coin_to_fungible_asset_migration_feature"></a>
+
+## Function `get_coin_to_fungible_asset_migration_feature`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_coin_to_fungible_asset_migration_feature">get_coin_to_fungible_asset_migration_feature</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_coin_to_fungible_asset_migration_feature">get_coin_to_fungible_asset_migration_feature</a>(): u64 { <a href="features.md#0x1_features_COIN_TO_FUNGIBLE_ASSET_MIGRATION">COIN_TO_FUNGIBLE_ASSET_MIGRATION</a> }
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_coin_to_fungible_asset_migration_feature_enabled"></a>
+
+## Function `coin_to_fungible_asset_migration_feature_enabled`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_coin_to_fungible_asset_migration_feature_enabled">coin_to_fungible_asset_migration_feature_enabled</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_coin_to_fungible_asset_migration_feature_enabled">coin_to_fungible_asset_migration_feature_enabled</a>(): bool <b>acquires</b> <a href="features.md#0x1_features_Features">Features</a> {
+    <a href="features.md#0x1_features_is_enabled">is_enabled</a>(<a href="features.md#0x1_features_COIN_TO_FUNGIBLE_ASSET_MIGRATION">COIN_TO_FUNGIBLE_ASSET_MIGRATION</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_get_primary_apt_fungible_store_at_user_address_feature"></a>
+
+## Function `get_primary_apt_fungible_store_at_user_address_feature`
+
+
+
+<pre><code>#[deprecated]
+<b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_primary_apt_fungible_store_at_user_address_feature">get_primary_apt_fungible_store_at_user_address_feature</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_primary_apt_fungible_store_at_user_address_feature">get_primary_apt_fungible_store_at_user_address_feature</a>(
+): u64 {
+    <b>abort</b> <a href="error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="features.md#0x1_features_EINVALID_FEATURE">EINVALID_FEATURE</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_primary_apt_fungible_store_at_user_address_enabled"></a>
+
+## Function `primary_apt_fungible_store_at_user_address_enabled`
+
+
+
+<pre><code>#[deprecated]
+<b>public</b> <b>fun</b> <a href="features.md#0x1_features_primary_apt_fungible_store_at_user_address_enabled">primary_apt_fungible_store_at_user_address_enabled</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_primary_apt_fungible_store_at_user_address_enabled">primary_apt_fungible_store_at_user_address_enabled</a>(): bool <b>acquires</b> <a href="features.md#0x1_features_Features">Features</a> {
+    <a href="features.md#0x1_features_is_enabled">is_enabled</a>(<a href="features.md#0x1_features_PRIMARY_APT_FUNGIBLE_STORE_AT_USER_ADDRESS">PRIMARY_APT_FUNGIBLE_STORE_AT_USER_ADDRESS</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_aggregator_v2_is_at_least_api_enabled"></a>
+
+## Function `aggregator_v2_is_at_least_api_enabled`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_aggregator_v2_is_at_least_api_enabled">aggregator_v2_is_at_least_api_enabled</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_aggregator_v2_is_at_least_api_enabled">aggregator_v2_is_at_least_api_enabled</a>(): bool <b>acquires</b> <a href="features.md#0x1_features_Features">Features</a> {
+    <a href="features.md#0x1_features_is_enabled">is_enabled</a>(<a href="features.md#0x1_features_AGGREGATOR_V2_IS_AT_LEAST_API">AGGREGATOR_V2_IS_AT_LEAST_API</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_get_object_native_derived_address_feature"></a>
+
+## Function `get_object_native_derived_address_feature`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_object_native_derived_address_feature">get_object_native_derived_address_feature</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_object_native_derived_address_feature">get_object_native_derived_address_feature</a>(): u64 { <a href="features.md#0x1_features_OBJECT_NATIVE_DERIVED_ADDRESS">OBJECT_NATIVE_DERIVED_ADDRESS</a> }
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_object_native_derived_address_enabled"></a>
+
+## Function `object_native_derived_address_enabled`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_object_native_derived_address_enabled">object_native_derived_address_enabled</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_object_native_derived_address_enabled">object_native_derived_address_enabled</a>(): bool <b>acquires</b> <a href="features.md#0x1_features_Features">Features</a> {
+    <a href="features.md#0x1_features_is_enabled">is_enabled</a>(<a href="features.md#0x1_features_OBJECT_NATIVE_DERIVED_ADDRESS">OBJECT_NATIVE_DERIVED_ADDRESS</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_get_dispatchable_fungible_asset_feature"></a>
+
+## Function `get_dispatchable_fungible_asset_feature`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_dispatchable_fungible_asset_feature">get_dispatchable_fungible_asset_feature</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_dispatchable_fungible_asset_feature">get_dispatchable_fungible_asset_feature</a>(): u64 { <a href="features.md#0x1_features_DISPATCHABLE_FUNGIBLE_ASSET">DISPATCHABLE_FUNGIBLE_ASSET</a> }
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_dispatchable_fungible_asset_enabled"></a>
+
+## Function `dispatchable_fungible_asset_enabled`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_dispatchable_fungible_asset_enabled">dispatchable_fungible_asset_enabled</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_dispatchable_fungible_asset_enabled">dispatchable_fungible_asset_enabled</a>(): bool <b>acquires</b> <a href="features.md#0x1_features_Features">Features</a> {
+    <a href="features.md#0x1_features_is_enabled">is_enabled</a>(<a href="features.md#0x1_features_DISPATCHABLE_FUNGIBLE_ASSET">DISPATCHABLE_FUNGIBLE_ASSET</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_get_new_accounts_default_to_fa_apt_store_feature"></a>
+
+## Function `get_new_accounts_default_to_fa_apt_store_feature`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_new_accounts_default_to_fa_apt_store_feature">get_new_accounts_default_to_fa_apt_store_feature</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_new_accounts_default_to_fa_apt_store_feature">get_new_accounts_default_to_fa_apt_store_feature</a>(): u64 { <a href="features.md#0x1_features_NEW_ACCOUNTS_DEFAULT_TO_FA_APT_STORE">NEW_ACCOUNTS_DEFAULT_TO_FA_APT_STORE</a> }
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_new_accounts_default_to_fa_apt_store_enabled"></a>
+
+## Function `new_accounts_default_to_fa_apt_store_enabled`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_new_accounts_default_to_fa_apt_store_enabled">new_accounts_default_to_fa_apt_store_enabled</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_new_accounts_default_to_fa_apt_store_enabled">new_accounts_default_to_fa_apt_store_enabled</a>(): bool <b>acquires</b> <a href="features.md#0x1_features_Features">Features</a> {
+    <a href="features.md#0x1_features_is_enabled">is_enabled</a>(<a href="features.md#0x1_features_NEW_ACCOUNTS_DEFAULT_TO_FA_APT_STORE">NEW_ACCOUNTS_DEFAULT_TO_FA_APT_STORE</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_get_operations_default_to_fa_apt_store_feature"></a>
+
+## Function `get_operations_default_to_fa_apt_store_feature`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_operations_default_to_fa_apt_store_feature">get_operations_default_to_fa_apt_store_feature</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_operations_default_to_fa_apt_store_feature">get_operations_default_to_fa_apt_store_feature</a>(): u64 { <a href="features.md#0x1_features_OPERATIONS_DEFAULT_TO_FA_APT_STORE">OPERATIONS_DEFAULT_TO_FA_APT_STORE</a> }
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_operations_default_to_fa_apt_store_enabled"></a>
+
+## Function `operations_default_to_fa_apt_store_enabled`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_operations_default_to_fa_apt_store_enabled">operations_default_to_fa_apt_store_enabled</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_operations_default_to_fa_apt_store_enabled">operations_default_to_fa_apt_store_enabled</a>(): bool <b>acquires</b> <a href="features.md#0x1_features_Features">Features</a> {
+    <a href="features.md#0x1_features_is_enabled">is_enabled</a>(<a href="features.md#0x1_features_OPERATIONS_DEFAULT_TO_FA_APT_STORE">OPERATIONS_DEFAULT_TO_FA_APT_STORE</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_get_concurrent_fungible_balance_feature"></a>
+
+## Function `get_concurrent_fungible_balance_feature`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_concurrent_fungible_balance_feature">get_concurrent_fungible_balance_feature</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_concurrent_fungible_balance_feature">get_concurrent_fungible_balance_feature</a>(): u64 { <a href="features.md#0x1_features_CONCURRENT_FUNGIBLE_BALANCE">CONCURRENT_FUNGIBLE_BALANCE</a> }
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_concurrent_fungible_balance_enabled"></a>
+
+## Function `concurrent_fungible_balance_enabled`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_concurrent_fungible_balance_enabled">concurrent_fungible_balance_enabled</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_concurrent_fungible_balance_enabled">concurrent_fungible_balance_enabled</a>(): bool <b>acquires</b> <a href="features.md#0x1_features_Features">Features</a> {
+    <a href="features.md#0x1_features_is_enabled">is_enabled</a>(<a href="features.md#0x1_features_CONCURRENT_FUNGIBLE_BALANCE">CONCURRENT_FUNGIBLE_BALANCE</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_get_default_to_concurrent_fungible_balance_feature"></a>
+
+## Function `get_default_to_concurrent_fungible_balance_feature`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_default_to_concurrent_fungible_balance_feature">get_default_to_concurrent_fungible_balance_feature</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_default_to_concurrent_fungible_balance_feature">get_default_to_concurrent_fungible_balance_feature</a>(): u64 { <a href="features.md#0x1_features_DEFAULT_TO_CONCURRENT_FUNGIBLE_BALANCE">DEFAULT_TO_CONCURRENT_FUNGIBLE_BALANCE</a> }
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_default_to_concurrent_fungible_balance_enabled"></a>
+
+## Function `default_to_concurrent_fungible_balance_enabled`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_default_to_concurrent_fungible_balance_enabled">default_to_concurrent_fungible_balance_enabled</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_default_to_concurrent_fungible_balance_enabled">default_to_concurrent_fungible_balance_enabled</a>(): bool <b>acquires</b> <a href="features.md#0x1_features_Features">Features</a> {
+    <a href="features.md#0x1_features_is_enabled">is_enabled</a>(<a href="features.md#0x1_features_DEFAULT_TO_CONCURRENT_FUNGIBLE_BALANCE">DEFAULT_TO_CONCURRENT_FUNGIBLE_BALANCE</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_get_abort_if_multisig_payload_mismatch_feature"></a>
+
+## Function `get_abort_if_multisig_payload_mismatch_feature`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_abort_if_multisig_payload_mismatch_feature">get_abort_if_multisig_payload_mismatch_feature</a>(): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_get_abort_if_multisig_payload_mismatch_feature">get_abort_if_multisig_payload_mismatch_feature</a>(): u64 { <a href="features.md#0x1_features_ABORT_IF_MULTISIG_PAYLOAD_MISMATCH">ABORT_IF_MULTISIG_PAYLOAD_MISMATCH</a> }
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_abort_if_multisig_payload_mismatch_enabled"></a>
+
+## Function `abort_if_multisig_payload_mismatch_enabled`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_abort_if_multisig_payload_mismatch_enabled">abort_if_multisig_payload_mismatch_enabled</a>(): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_abort_if_multisig_payload_mismatch_enabled">abort_if_multisig_payload_mismatch_enabled</a>(): bool <b>acquires</b> <a href="features.md#0x1_features_Features">Features</a> {
+    <a href="features.md#0x1_features_is_enabled">is_enabled</a>(<a href="features.md#0x1_features_ABORT_IF_MULTISIG_PAYLOAD_MISMATCH">ABORT_IF_MULTISIG_PAYLOAD_MISMATCH</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_change_feature_flags"></a>
+
+## Function `change_feature_flags`
+
+Deprecated to prevent validator set changes during DKG.
+
+Genesis/tests should use <code><a href="features.md#0x1_features_change_feature_flags_internal">change_feature_flags_internal</a>()</code> for feature vec initialization.
+
+Governance proposals should use <code><a href="features.md#0x1_features_change_feature_flags_for_next_epoch">change_feature_flags_for_next_epoch</a>()</code> to enable/disable features.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_change_feature_flags">change_feature_flags</a>(_framework: &<a href="signer.md#0x1_signer">signer</a>, _enable: <a href="vector.md#0x1_vector">vector</a>&lt;u64&gt;, _disable: <a href="vector.md#0x1_vector">vector</a>&lt;u64&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_change_feature_flags">change_feature_flags</a>(_framework: &<a href="signer.md#0x1_signer">signer</a>, _enable: <a href="vector.md#0x1_vector">vector</a>&lt;u64&gt;, _disable: <a href="vector.md#0x1_vector">vector</a>&lt;u64&gt;) {
+    <b>abort</b> (<a href="error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="features.md#0x1_features_EAPI_DISABLED">EAPI_DISABLED</a>))
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_change_feature_flags_internal"></a>
+
+## Function `change_feature_flags_internal`
+
+Update feature flags directly. Only used in genesis/tests.
+
+
+<pre><code><b>fun</b> <a href="features.md#0x1_features_change_feature_flags_internal">change_feature_flags_internal</a>(framework: &<a href="signer.md#0x1_signer">signer</a>, enable: <a href="vector.md#0x1_vector">vector</a>&lt;u64&gt;, disable: <a href="vector.md#0x1_vector">vector</a>&lt;u64&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="features.md#0x1_features_change_feature_flags_internal">change_feature_flags_internal</a>(framework: &<a href="signer.md#0x1_signer">signer</a>, enable: <a href="vector.md#0x1_vector">vector</a>&lt;u64&gt;, disable: <a href="vector.md#0x1_vector">vector</a>&lt;u64&gt;) <b>acquires</b> <a href="features.md#0x1_features_Features">Features</a> {
+    <b>assert</b>!(<a href="signer.md#0x1_signer_address_of">signer::address_of</a>(framework) == @std, <a href="error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="features.md#0x1_features_EFRAMEWORK_SIGNER_NEEDED">EFRAMEWORK_SIGNER_NEEDED</a>));
+    <b>if</b> (!<b>exists</b>&lt;<a href="features.md#0x1_features_Features">Features</a>&gt;(@std)) {
+        <b>move_to</b>&lt;<a href="features.md#0x1_features_Features">Features</a>&gt;(framework, <a href="features.md#0x1_features_Features">Features</a> { <a href="features.md#0x1_features">features</a>: <a href="vector.md#0x1_vector">vector</a>[] })
+    };
+    <b>let</b> <a href="features.md#0x1_features">features</a> = &<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="features.md#0x1_features_Features">Features</a>&gt;(@std).<a href="features.md#0x1_features">features</a>;
+    <a href="vector.md#0x1_vector_for_each_ref">vector::for_each_ref</a>(&enable, |feature| {
+        <a href="features.md#0x1_features_set">set</a>(<a href="features.md#0x1_features">features</a>, *feature, <b>true</b>);
+    });
+    <a href="vector.md#0x1_vector_for_each_ref">vector::for_each_ref</a>(&disable, |feature| {
+        <a href="features.md#0x1_features_set">set</a>(<a href="features.md#0x1_features">features</a>, *feature, <b>false</b>);
+    });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_change_feature_flags_for_next_epoch"></a>
+
+## Function `change_feature_flags_for_next_epoch`
+
+Enable and disable features for the next epoch.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_change_feature_flags_for_next_epoch">change_feature_flags_for_next_epoch</a>(framework: &<a href="signer.md#0x1_signer">signer</a>, enable: <a href="vector.md#0x1_vector">vector</a>&lt;u64&gt;, disable: <a href="vector.md#0x1_vector">vector</a>&lt;u64&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_change_feature_flags_for_next_epoch">change_feature_flags_for_next_epoch</a>(
+    framework: &<a href="signer.md#0x1_signer">signer</a>,
+    enable: <a href="vector.md#0x1_vector">vector</a>&lt;u64&gt;,
+    disable: <a href="vector.md#0x1_vector">vector</a>&lt;u64&gt;
+) <b>acquires</b> <a href="features.md#0x1_features_PendingFeatures">PendingFeatures</a>, <a href="features.md#0x1_features_Features">Features</a> {
+    <b>assert</b>!(<a href="signer.md#0x1_signer_address_of">signer::address_of</a>(framework) == @std, <a href="error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="features.md#0x1_features_EFRAMEWORK_SIGNER_NEEDED">EFRAMEWORK_SIGNER_NEEDED</a>));
+
+    // Figure out the baseline feature vec that the diff will be applied <b>to</b>.
+    <b>let</b> new_feature_vec = <b>if</b> (<b>exists</b>&lt;<a href="features.md#0x1_features_PendingFeatures">PendingFeatures</a>&gt;(@std)) {
+        // If there is a buffered feature vec, <b>use</b> it <b>as</b> the baseline.
+        <b>let</b> <a href="features.md#0x1_features_PendingFeatures">PendingFeatures</a> { <a href="features.md#0x1_features">features</a> } = <b>move_from</b>&lt;<a href="features.md#0x1_features_PendingFeatures">PendingFeatures</a>&gt;(@std);
+        <a href="features.md#0x1_features">features</a>
+    } <b>else</b> <b>if</b> (<b>exists</b>&lt;<a href="features.md#0x1_features_Features">Features</a>&gt;(@std)) {
+        // Otherwise, <b>use</b> the currently effective feature flag vec <b>as</b> the baseline, <b>if</b> it <b>exists</b>.
+        <b>borrow_global</b>&lt;<a href="features.md#0x1_features_Features">Features</a>&gt;(@std).<a href="features.md#0x1_features">features</a>
+    } <b>else</b> {
+        // Otherwise, <b>use</b> an empty feature vec.
+        <a href="vector.md#0x1_vector">vector</a>[]
+    };
+
+    // Apply the diff and save it <b>to</b> the buffer.
+    <a href="features.md#0x1_features_apply_diff">apply_diff</a>(&<b>mut</b> new_feature_vec, enable, disable);
+    <b>move_to</b>(framework, <a href="features.md#0x1_features_PendingFeatures">PendingFeatures</a> { <a href="features.md#0x1_features">features</a>: new_feature_vec });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_on_new_epoch"></a>
+
+## Function `on_new_epoch`
+
+Apply all the pending feature flag changes. Should only be used at the end of a reconfiguration with DKG.
+
+While the scope is public, it can only be usd in system transactions like <code>block_prologue</code> and governance proposals,
+who have permission to set the flag that's checked in <code>extract()</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_on_new_epoch">on_new_epoch</a>(framework: &<a href="signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_on_new_epoch">on_new_epoch</a>(framework: &<a href="signer.md#0x1_signer">signer</a>) <b>acquires</b> <a href="features.md#0x1_features_Features">Features</a>, <a href="features.md#0x1_features_PendingFeatures">PendingFeatures</a> {
+    <a href="features.md#0x1_features_ensure_framework_signer">ensure_framework_signer</a>(framework);
+    <b>if</b> (<b>exists</b>&lt;<a href="features.md#0x1_features_PendingFeatures">PendingFeatures</a>&gt;(@std)) {
+        <b>let</b> <a href="features.md#0x1_features_PendingFeatures">PendingFeatures</a> { <a href="features.md#0x1_features">features</a> } = <b>move_from</b>&lt;<a href="features.md#0x1_features_PendingFeatures">PendingFeatures</a>&gt;(@std);
+        <b>if</b> (<b>exists</b>&lt;<a href="features.md#0x1_features_Features">Features</a>&gt;(@std)) {
+            <b>borrow_global_mut</b>&lt;<a href="features.md#0x1_features_Features">Features</a>&gt;(@std).<a href="features.md#0x1_features">features</a> = <a href="features.md#0x1_features">features</a>;
+        } <b>else</b> {
+            <b>move_to</b>(framework, <a href="features.md#0x1_features_Features">Features</a> { <a href="features.md#0x1_features">features</a> })
+        }
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_is_enabled"></a>
+
+## Function `is_enabled`
+
+Check whether the feature is enabled.
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="features.md#0x1_features_is_enabled">is_enabled</a>(feature: u64): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_is_enabled">is_enabled</a>(feature: u64): bool <b>acquires</b> <a href="features.md#0x1_features_Features">Features</a> {
+    <b>exists</b>&lt;<a href="features.md#0x1_features_Features">Features</a>&gt;(@std) &&
+        <a href="features.md#0x1_features_contains">contains</a>(&<b>borrow_global</b>&lt;<a href="features.md#0x1_features_Features">Features</a>&gt;(@std).<a href="features.md#0x1_features">features</a>, feature)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_set"></a>
+
+## Function `set`
+
+Helper to include or exclude a feature flag.
+
+
+<pre><code><b>fun</b> <a href="features.md#0x1_features_set">set</a>(<a href="features.md#0x1_features">features</a>: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;, feature: u64, <b>include</b>: bool)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="features.md#0x1_features_set">set</a>(<a href="features.md#0x1_features">features</a>: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;, feature: u64, <b>include</b>: bool) {
+    <b>let</b> byte_index = feature / 8;
+    <b>let</b> bit_mask = 1 &lt;&lt; ((feature % 8) <b>as</b> u8);
+    <b>while</b> (<a href="vector.md#0x1_vector_length">vector::length</a>(<a href="features.md#0x1_features">features</a>) &lt;= byte_index) {
+        <a href="vector.md#0x1_vector_push_back">vector::push_back</a>(<a href="features.md#0x1_features">features</a>, 0)
+    };
+    <b>let</b> entry = <a href="vector.md#0x1_vector_borrow_mut">vector::borrow_mut</a>(<a href="features.md#0x1_features">features</a>, byte_index);
+    <b>if</b> (<b>include</b>)
+        *entry = *entry | bit_mask
+    <b>else</b>
+        *entry = *entry & (0xff ^ bit_mask)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_contains"></a>
+
+## Function `contains`
+
+Helper to check whether a feature flag is enabled.
+
+
+<pre><code><b>fun</b> <a href="features.md#0x1_features_contains">contains</a>(<a href="features.md#0x1_features">features</a>: &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;, feature: u64): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="features.md#0x1_features_contains">contains</a>(<a href="features.md#0x1_features">features</a>: &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;, feature: u64): bool {
+    <b>let</b> byte_index = feature / 8;
+    <b>let</b> bit_mask = 1 &lt;&lt; ((feature % 8) <b>as</b> u8);
+    byte_index &lt; <a href="vector.md#0x1_vector_length">vector::length</a>(<a href="features.md#0x1_features">features</a>) && (*<a href="vector.md#0x1_vector_borrow">vector::borrow</a>(<a href="features.md#0x1_features">features</a>, byte_index) & bit_mask) != 0
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_apply_diff"></a>
+
+## Function `apply_diff`
+
+
+
+<pre><code><b>fun</b> <a href="features.md#0x1_features_apply_diff">apply_diff</a>(<a href="features.md#0x1_features">features</a>: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;, enable: <a href="vector.md#0x1_vector">vector</a>&lt;u64&gt;, disable: <a href="vector.md#0x1_vector">vector</a>&lt;u64&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="features.md#0x1_features_apply_diff">apply_diff</a>(<a href="features.md#0x1_features">features</a>: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;, enable: <a href="vector.md#0x1_vector">vector</a>&lt;u64&gt;, disable: <a href="vector.md#0x1_vector">vector</a>&lt;u64&gt;) {
+    <a href="vector.md#0x1_vector_for_each">vector::for_each</a>(enable, |feature| {
+        <a href="features.md#0x1_features_set">set</a>(<a href="features.md#0x1_features">features</a>, feature, <b>true</b>);
+    });
+    <a href="vector.md#0x1_vector_for_each">vector::for_each</a>(disable, |feature| {
+        <a href="features.md#0x1_features_set">set</a>(<a href="features.md#0x1_features">features</a>, feature, <b>false</b>);
+    });
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_features_ensure_framework_signer"></a>
+
+## Function `ensure_framework_signer`
+
+
+
+<pre><code><b>fun</b> <a href="features.md#0x1_features_ensure_framework_signer">ensure_framework_signer</a>(account: &<a href="signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="features.md#0x1_features_ensure_framework_signer">ensure_framework_signer</a>(account: &<a href="signer.md#0x1_signer">signer</a>) {
+    <b>let</b> addr = <a href="signer.md#0x1_signer_address_of">signer::address_of</a>(account);
+    <b>assert</b>!(addr == @std, <a href="error.md#0x1_error_permission_denied">error::permission_denied</a>(<a href="features.md#0x1_features_EFRAMEWORK_SIGNER_NEEDED">EFRAMEWORK_SIGNER_NEEDED</a>));
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+<a id="@Specification_1_Features"></a>
+
+### Resource `Features`
+
+
+<pre><code><b>struct</b> <a href="features.md#0x1_features_Features">Features</a> <b>has</b> key
+</code></pre>
+
+
+
+<dl>
+<dt>
+<code><a href="features.md#0x1_features">features</a>: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+
+<pre><code><b>pragma</b> bv=b"0";
+</code></pre>
+
+
+
+<a id="@Specification_1_PendingFeatures"></a>
+
+### Resource `PendingFeatures`
+
+
+<pre><code><b>struct</b> <a href="features.md#0x1_features_PendingFeatures">PendingFeatures</a> <b>has</b> key
+</code></pre>
+
+
+
+<dl>
+<dt>
+<code><a href="features.md#0x1_features">features</a>: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+
+<pre><code><b>pragma</b> bv=b"0";
+</code></pre>
+
+
+
+<a id="@Specification_1_periodical_reward_rate_decrease_enabled"></a>
+
+### Function `periodical_reward_rate_decrease_enabled`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_periodical_reward_rate_decrease_enabled">periodical_reward_rate_decrease_enabled</a>(): bool
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> [abstract] <b>false</b>;
+<b>ensures</b> [abstract] result == <a href="features.md#0x1_features_spec_periodical_reward_rate_decrease_enabled">spec_periodical_reward_rate_decrease_enabled</a>();
+</code></pre>
+
+
+
+
+<a id="0x1_features_spec_partial_governance_voting_enabled"></a>
+
+
+<pre><code><b>fun</b> <a href="features.md#0x1_features_spec_partial_governance_voting_enabled">spec_partial_governance_voting_enabled</a>(): bool {
+   <a href="features.md#0x1_features_spec_is_enabled">spec_is_enabled</a>(<a href="features.md#0x1_features_PARTIAL_GOVERNANCE_VOTING">PARTIAL_GOVERNANCE_VOTING</a>)
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_partial_governance_voting_enabled"></a>
+
+### Function `partial_governance_voting_enabled`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_partial_governance_voting_enabled">partial_governance_voting_enabled</a>(): bool
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> [abstract] <b>false</b>;
+<b>ensures</b> [abstract] result == <a href="features.md#0x1_features_spec_partial_governance_voting_enabled">spec_partial_governance_voting_enabled</a>();
+</code></pre>
+
+
+
+<a id="@Specification_1_module_event_enabled"></a>
+
+### Function `module_event_enabled`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_module_event_enabled">module_event_enabled</a>(): bool
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> [abstract] <b>false</b>;
+<b>ensures</b> [abstract] result == <a href="features.md#0x1_features_spec_module_event_enabled">spec_module_event_enabled</a>();
+</code></pre>
+
+
+
+
+<a id="0x1_features_spec_abort_if_multisig_payload_mismatch_enabled"></a>
+
+
+<pre><code><b>fun</b> <a href="features.md#0x1_features_spec_abort_if_multisig_payload_mismatch_enabled">spec_abort_if_multisig_payload_mismatch_enabled</a>(): bool {
+   <a href="features.md#0x1_features_spec_is_enabled">spec_is_enabled</a>(<a href="features.md#0x1_features_ABORT_IF_MULTISIG_PAYLOAD_MISMATCH">ABORT_IF_MULTISIG_PAYLOAD_MISMATCH</a>)
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_abort_if_multisig_payload_mismatch_enabled"></a>
+
+### Function `abort_if_multisig_payload_mismatch_enabled`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_abort_if_multisig_payload_mismatch_enabled">abort_if_multisig_payload_mismatch_enabled</a>(): bool
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> [abstract] <b>false</b>;
+<b>ensures</b> [abstract] result == <a href="features.md#0x1_features_spec_abort_if_multisig_payload_mismatch_enabled">spec_abort_if_multisig_payload_mismatch_enabled</a>();
+</code></pre>
+
+
+
+<a id="@Specification_1_change_feature_flags_internal"></a>
+
+### Function `change_feature_flags_internal`
+
+
+<pre><code><b>fun</b> <a href="features.md#0x1_features_change_feature_flags_internal">change_feature_flags_internal</a>(framework: &<a href="signer.md#0x1_signer">signer</a>, enable: <a href="vector.md#0x1_vector">vector</a>&lt;u64&gt;, disable: <a href="vector.md#0x1_vector">vector</a>&lt;u64&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>modifies</b> <b>global</b>&lt;<a href="features.md#0x1_features_Features">Features</a>&gt;(@std);
+<b>aborts_if</b> <a href="signer.md#0x1_signer_address_of">signer::address_of</a>(framework) != @std;
+</code></pre>
+
+
+
+<a id="@Specification_1_change_feature_flags_for_next_epoch"></a>
+
+### Function `change_feature_flags_for_next_epoch`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_change_feature_flags_for_next_epoch">change_feature_flags_for_next_epoch</a>(framework: &<a href="signer.md#0x1_signer">signer</a>, enable: <a href="vector.md#0x1_vector">vector</a>&lt;u64&gt;, disable: <a href="vector.md#0x1_vector">vector</a>&lt;u64&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <a href="signer.md#0x1_signer_address_of">signer::address_of</a>(framework) != @std;
+<b>pragma</b> opaque;
+<b>modifies</b> <b>global</b>&lt;<a href="features.md#0x1_features_Features">Features</a>&gt;(@std);
+<b>modifies</b> <b>global</b>&lt;<a href="features.md#0x1_features_PendingFeatures">PendingFeatures</a>&gt;(@std);
+</code></pre>
+
+
+
+
+<a id="0x1_features_spec_contains"></a>
+
+
+<pre><code><b>fun</b> <a href="features.md#0x1_features_spec_contains">spec_contains</a>(<a href="features.md#0x1_features">features</a>: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;, feature: u64): bool {
+   ((int2bv((((1 <b>as</b> u8) &lt;&lt; ((feature % (8 <b>as</b> u64)) <b>as</b> u64)) <b>as</b> u8)) <b>as</b> u8) & <a href="features.md#0x1_features">features</a>[feature/8] <b>as</b> u8) &gt; (0 <b>as</b> u8)
+       && (feature / 8) &lt; len(<a href="features.md#0x1_features">features</a>)
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_on_new_epoch"></a>
+
+### Function `on_new_epoch`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="features.md#0x1_features_on_new_epoch">on_new_epoch</a>(framework: &<a href="signer.md#0x1_signer">signer</a>)
+</code></pre>
+
+
+
+
+<pre><code><b>requires</b> @std == <a href="signer.md#0x1_signer_address_of">signer::address_of</a>(framework);
+<b>let</b> features_pending = <b>global</b>&lt;<a href="features.md#0x1_features_PendingFeatures">PendingFeatures</a>&gt;(@std).<a href="features.md#0x1_features">features</a>;
+<b>let</b> <b>post</b> features_std = <b>global</b>&lt;<a href="features.md#0x1_features_Features">Features</a>&gt;(@std).<a href="features.md#0x1_features">features</a>;
+<b>ensures</b> <b>exists</b>&lt;<a href="features.md#0x1_features_PendingFeatures">PendingFeatures</a>&gt;(@std) ==&gt; features_std == features_pending;
+<b>aborts_if</b> <b>false</b>;
+</code></pre>
+
+
+
+
+<a id="0x1_features_spec_sha_512_and_ripemd_160_enabled"></a>
+
+
+<pre><code><b>fun</b> <a href="features.md#0x1_features_spec_sha_512_and_ripemd_160_enabled">spec_sha_512_and_ripemd_160_enabled</a>(): bool {
+   <a href="features.md#0x1_features_spec_is_enabled">spec_is_enabled</a>(<a href="features.md#0x1_features_SHA_512_AND_RIPEMD_160_NATIVES">SHA_512_AND_RIPEMD_160_NATIVES</a>)
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_is_enabled"></a>
+
+### Function `is_enabled`
+
+
+<pre><code>#[view]
+<b>public</b> <b>fun</b> <a href="features.md#0x1_features_is_enabled">is_enabled</a>(feature: u64): bool
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> [abstract] <b>false</b>;
+<b>ensures</b> [abstract] result == <a href="features.md#0x1_features_spec_is_enabled">spec_is_enabled</a>(feature);
+</code></pre>
+
+
+
+
+<a id="0x1_features_spec_is_enabled"></a>
+
+
+<pre><code><b>fun</b> <a href="features.md#0x1_features_spec_is_enabled">spec_is_enabled</a>(feature: u64): bool;
+</code></pre>
+
+
+
+
+<a id="0x1_features_spec_periodical_reward_rate_decrease_enabled"></a>
+
+
+<pre><code><b>fun</b> <a href="features.md#0x1_features_spec_periodical_reward_rate_decrease_enabled">spec_periodical_reward_rate_decrease_enabled</a>(): bool {
+   <a href="features.md#0x1_features_spec_is_enabled">spec_is_enabled</a>(<a href="features.md#0x1_features_PERIODICAL_REWARD_RATE_DECREASE">PERIODICAL_REWARD_RATE_DECREASE</a>)
+}
+</code></pre>
+
+
+
+
+<a id="0x1_features_spec_fee_payer_enabled"></a>
+
+
+<pre><code><b>fun</b> <a href="features.md#0x1_features_spec_fee_payer_enabled">spec_fee_payer_enabled</a>(): bool {
+   <a href="features.md#0x1_features_spec_is_enabled">spec_is_enabled</a>(<a href="features.md#0x1_features_FEE_PAYER_ENABLED">FEE_PAYER_ENABLED</a>)
+}
+</code></pre>
+
+
+
+
+<a id="0x1_features_spec_collect_and_distribute_gas_fees_enabled"></a>
+
+
+<pre><code><b>fun</b> <a href="features.md#0x1_features_spec_collect_and_distribute_gas_fees_enabled">spec_collect_and_distribute_gas_fees_enabled</a>(): bool {
+   <a href="features.md#0x1_features_spec_is_enabled">spec_is_enabled</a>(<a href="features.md#0x1_features_COLLECT_AND_DISTRIBUTE_GAS_FEES">COLLECT_AND_DISTRIBUTE_GAS_FEES</a>)
+}
+</code></pre>
+
+
+
+
+<a id="0x1_features_spec_module_event_enabled"></a>
+
+
+<pre><code><b>fun</b> <a href="features.md#0x1_features_spec_module_event_enabled">spec_module_event_enabled</a>(): bool {
+   <a href="features.md#0x1_features_spec_is_enabled">spec_is_enabled</a>(<a href="features.md#0x1_features_MODULE_EVENT">MODULE_EVENT</a>)
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_set"></a>
+
+### Function `set`
+
+
+<pre><code><b>fun</b> <a href="features.md#0x1_features_set">set</a>(<a href="features.md#0x1_features">features</a>: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;, feature: u64, <b>include</b>: bool)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> bv=b"0";
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> feature / 8 &lt; len(<a href="features.md#0x1_features">features</a>);
+<b>ensures</b> <b>include</b> == <a href="features.md#0x1_features_spec_contains">spec_contains</a>(<a href="features.md#0x1_features">features</a>, feature);
+</code></pre>
+
+
+
+<a id="@Specification_1_contains"></a>
+
+### Function `contains`
+
+
+<pre><code><b>fun</b> <a href="features.md#0x1_features_contains">contains</a>(<a href="features.md#0x1_features">features</a>: &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;, feature: u64): bool
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> bv=b"0";
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="features.md#0x1_features_spec_contains">spec_contains</a>(<a href="features.md#0x1_features">features</a>, feature);
+</code></pre>
+
+
+
+<a id="@Specification_1_apply_diff"></a>
+
+### Function `apply_diff`
+
+
+<pre><code><b>fun</b> <a href="features.md#0x1_features_apply_diff">apply_diff</a>(<a href="features.md#0x1_features">features</a>: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;, enable: <a href="vector.md#0x1_vector">vector</a>&lt;u64&gt;, disable: <a href="vector.md#0x1_vector">vector</a>&lt;u64&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> [abstract] <b>false</b>;
+<b>ensures</b> [abstract] <b>forall</b> i in disable: !<a href="features.md#0x1_features_spec_contains">spec_contains</a>(<a href="features.md#0x1_features">features</a>, i);
+<b>ensures</b> [abstract] <b>forall</b> i in enable: !<a href="vector.md#0x1_vector_spec_contains">vector::spec_contains</a>(disable, i)
+    ==&gt; <a href="features.md#0x1_features_spec_contains">spec_contains</a>(<a href="features.md#0x1_features">features</a>, i);
+<b>pragma</b> opaque;
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/move-stdlib/tests/compiler-v2-doc/fixed_point32.md b/aptos-move/framework/move-stdlib/tests/compiler-v2-doc/fixed_point32.md
new file mode 100644
index 0000000000000..ee8010e510ccc
--- /dev/null
+++ b/aptos-move/framework/move-stdlib/tests/compiler-v2-doc/fixed_point32.md
@@ -0,0 +1,884 @@
+
+<a id="0x1_fixed_point32"></a>
+
+# Module `0x1::fixed_point32`
+
+Defines a fixed-point numeric type with a 32-bit integer part and
+a 32-bit fractional part.
+
+
+-  [Struct `FixedPoint32`](#0x1_fixed_point32_FixedPoint32)
+-  [Constants](#@Constants_0)
+-  [Function `multiply_u64`](#0x1_fixed_point32_multiply_u64)
+-  [Function `divide_u64`](#0x1_fixed_point32_divide_u64)
+-  [Function `create_from_rational`](#0x1_fixed_point32_create_from_rational)
+-  [Function `create_from_raw_value`](#0x1_fixed_point32_create_from_raw_value)
+-  [Function `get_raw_value`](#0x1_fixed_point32_get_raw_value)
+-  [Function `is_zero`](#0x1_fixed_point32_is_zero)
+-  [Function `min`](#0x1_fixed_point32_min)
+-  [Function `max`](#0x1_fixed_point32_max)
+-  [Function `create_from_u64`](#0x1_fixed_point32_create_from_u64)
+-  [Function `floor`](#0x1_fixed_point32_floor)
+-  [Function `ceil`](#0x1_fixed_point32_ceil)
+-  [Function `round`](#0x1_fixed_point32_round)
+-  [Specification](#@Specification_1)
+    -  [Function `multiply_u64`](#@Specification_1_multiply_u64)
+    -  [Function `divide_u64`](#@Specification_1_divide_u64)
+    -  [Function `create_from_rational`](#@Specification_1_create_from_rational)
+    -  [Function `create_from_raw_value`](#@Specification_1_create_from_raw_value)
+    -  [Function `min`](#@Specification_1_min)
+    -  [Function `max`](#@Specification_1_max)
+    -  [Function `create_from_u64`](#@Specification_1_create_from_u64)
+    -  [Function `floor`](#@Specification_1_floor)
+    -  [Function `ceil`](#@Specification_1_ceil)
+    -  [Function `round`](#@Specification_1_round)
+
+
+<pre><code></code></pre>
+
+
+
+<a id="0x1_fixed_point32_FixedPoint32"></a>
+
+## Struct `FixedPoint32`
+
+Define a fixed-point numeric type with 32 fractional bits.
+This is just a u64 integer but it is wrapped in a struct to
+make a unique type. This is a binary representation, so decimal
+values may not be exactly representable, but it provides more
+than 9 decimal digits of precision both before and after the
+decimal point (18 digits total). For comparison, double precision
+floating-point has less than 16 decimal digits of precision, so
+be careful about using floating-point to convert these values to
+decimal.
+
+
+<pre><code><b>struct</b> <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>value: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_fixed_point32_MAX_U64"></a>
+
+
+
+<pre><code><b>const</b> <a href="fixed_point32.md#0x1_fixed_point32_MAX_U64">MAX_U64</a>: u128 = 18446744073709551615;
+</code></pre>
+
+
+
+<a id="0x1_fixed_point32_EDENOMINATOR"></a>
+
+The denominator provided was zero
+
+
+<pre><code><b>const</b> <a href="fixed_point32.md#0x1_fixed_point32_EDENOMINATOR">EDENOMINATOR</a>: u64 = 65537;
+</code></pre>
+
+
+
+<a id="0x1_fixed_point32_EDIVISION"></a>
+
+The quotient value would be too large to be held in a <code>u64</code>
+
+
+<pre><code><b>const</b> <a href="fixed_point32.md#0x1_fixed_point32_EDIVISION">EDIVISION</a>: u64 = 131074;
+</code></pre>
+
+
+
+<a id="0x1_fixed_point32_EDIVISION_BY_ZERO"></a>
+
+A division by zero was encountered
+
+
+<pre><code><b>const</b> <a href="fixed_point32.md#0x1_fixed_point32_EDIVISION_BY_ZERO">EDIVISION_BY_ZERO</a>: u64 = 65540;
+</code></pre>
+
+
+
+<a id="0x1_fixed_point32_EMULTIPLICATION"></a>
+
+The multiplied value would be too large to be held in a <code>u64</code>
+
+
+<pre><code><b>const</b> <a href="fixed_point32.md#0x1_fixed_point32_EMULTIPLICATION">EMULTIPLICATION</a>: u64 = 131075;
+</code></pre>
+
+
+
+<a id="0x1_fixed_point32_ERATIO_OUT_OF_RANGE"></a>
+
+The computed ratio when converting to a <code><a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a></code> would be unrepresentable
+
+
+<pre><code><b>const</b> <a href="fixed_point32.md#0x1_fixed_point32_ERATIO_OUT_OF_RANGE">ERATIO_OUT_OF_RANGE</a>: u64 = 131077;
+</code></pre>
+
+
+
+<a id="0x1_fixed_point32_multiply_u64"></a>
+
+## Function `multiply_u64`
+
+Multiply a u64 integer by a fixed-point number, truncating any
+fractional part of the product. This will abort if the product
+overflows.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_multiply_u64">multiply_u64</a>(val: u64, multiplier: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_multiply_u64">multiply_u64</a>(val: u64, multiplier: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): u64 {
+    // The product of two 64 bit values <b>has</b> 128 bits, so perform the
+    // multiplication <b>with</b> u128 types and keep the full 128 bit product
+    // <b>to</b> avoid losing accuracy.
+    <b>let</b> unscaled_product = (val <b>as</b> u128) * (multiplier.value <b>as</b> u128);
+    // The unscaled product <b>has</b> 32 fractional bits (from the multiplier)
+    // so rescale it by shifting away the low bits.
+    <b>let</b> product = unscaled_product &gt;&gt; 32;
+    // Check whether the value is too large.
+    <b>assert</b>!(product &lt;= <a href="fixed_point32.md#0x1_fixed_point32_MAX_U64">MAX_U64</a>, <a href="fixed_point32.md#0x1_fixed_point32_EMULTIPLICATION">EMULTIPLICATION</a>);
+    (product <b>as</b> u64)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fixed_point32_divide_u64"></a>
+
+## Function `divide_u64`
+
+Divide a u64 integer by a fixed-point number, truncating any
+fractional part of the quotient. This will abort if the divisor
+is zero or if the quotient overflows.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_divide_u64">divide_u64</a>(val: u64, divisor: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_divide_u64">divide_u64</a>(val: u64, divisor: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): u64 {
+    // Check for division by zero.
+    <b>assert</b>!(divisor.value != 0, <a href="fixed_point32.md#0x1_fixed_point32_EDIVISION_BY_ZERO">EDIVISION_BY_ZERO</a>);
+    // First convert <b>to</b> 128 bits and then shift left <b>to</b>
+    // add 32 fractional zero bits <b>to</b> the dividend.
+    <b>let</b> scaled_value = (val <b>as</b> u128) &lt;&lt; 32;
+    <b>let</b> quotient = scaled_value / (divisor.value <b>as</b> u128);
+    // Check whether the value is too large.
+    <b>assert</b>!(quotient &lt;= <a href="fixed_point32.md#0x1_fixed_point32_MAX_U64">MAX_U64</a>, <a href="fixed_point32.md#0x1_fixed_point32_EDIVISION">EDIVISION</a>);
+    // the value may be too large, which will cause the cast <b>to</b> fail
+    // <b>with</b> an arithmetic <a href="error.md#0x1_error">error</a>.
+    (quotient <b>as</b> u64)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fixed_point32_create_from_rational"></a>
+
+## Function `create_from_rational`
+
+Create a fixed-point value from a rational number specified by its
+numerator and denominator. Calling this function should be preferred
+for using <code><a href="fixed_point32.md#0x1_fixed_point32_create_from_raw_value">Self::create_from_raw_value</a></code> which is also available.
+This will abort if the denominator is zero. It will also
+abort if the numerator is nonzero and the ratio is not in the range
+2^-32 .. 2^32-1. When specifying decimal fractions, be careful about
+rounding errors: if you round to display N digits after the decimal
+point, you can use a denominator of 10^N to avoid numbers where the
+very small imprecision in the binary representation could change the
+rounding, e.g., 0.0125 will round down to 0.012 instead of up to 0.013.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_create_from_rational">create_from_rational</a>(numerator: u64, denominator: u64): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_create_from_rational">create_from_rational</a>(numerator: u64, denominator: u64): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a> {
+    // If the denominator is zero, this will <b>abort</b>.
+    // Scale the numerator <b>to</b> have 64 fractional bits and the denominator
+    // <b>to</b> have 32 fractional bits, so that the quotient will have 32
+    // fractional bits.
+    <b>let</b> scaled_numerator = (numerator <b>as</b> u128) &lt;&lt; 64;
+    <b>let</b> scaled_denominator = (denominator <b>as</b> u128) &lt;&lt; 32;
+    <b>assert</b>!(scaled_denominator != 0, <a href="fixed_point32.md#0x1_fixed_point32_EDENOMINATOR">EDENOMINATOR</a>);
+    <b>let</b> quotient = scaled_numerator / scaled_denominator;
+    <b>assert</b>!(quotient != 0 || numerator == 0, <a href="fixed_point32.md#0x1_fixed_point32_ERATIO_OUT_OF_RANGE">ERATIO_OUT_OF_RANGE</a>);
+    // Return the quotient <b>as</b> a fixed-point number. We first need <b>to</b> check whether the cast
+    // can succeed.
+    <b>assert</b>!(quotient &lt;= <a href="fixed_point32.md#0x1_fixed_point32_MAX_U64">MAX_U64</a>, <a href="fixed_point32.md#0x1_fixed_point32_ERATIO_OUT_OF_RANGE">ERATIO_OUT_OF_RANGE</a>);
+    <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a> { value: (quotient <b>as</b> u64) }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fixed_point32_create_from_raw_value"></a>
+
+## Function `create_from_raw_value`
+
+Create a fixedpoint value from a raw value.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_create_from_raw_value">create_from_raw_value</a>(value: u64): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_create_from_raw_value">create_from_raw_value</a>(value: u64): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a> {
+    <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a> { value }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fixed_point32_get_raw_value"></a>
+
+## Function `get_raw_value`
+
+Accessor for the raw u64 value. Other less common operations, such as
+adding or subtracting FixedPoint32 values, can be done using the raw
+values directly.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_get_raw_value">get_raw_value</a>(num: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_get_raw_value">get_raw_value</a>(num: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): u64 {
+    num.value
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fixed_point32_is_zero"></a>
+
+## Function `is_zero`
+
+Returns true if the ratio is zero.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_is_zero">is_zero</a>(num: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_is_zero">is_zero</a>(num: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): bool {
+    num.value == 0
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fixed_point32_min"></a>
+
+## Function `min`
+
+Returns the smaller of the two FixedPoint32 numbers.
+
+
+<pre><code><b>public</b> <b>fun</b> <b>min</b>(num1: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>, num2: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <b>min</b>(num1: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>, num2: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a> {
+    <b>if</b> (num1.value &lt; num2.value) {
+        num1
+    } <b>else</b> {
+        num2
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fixed_point32_max"></a>
+
+## Function `max`
+
+Returns the larger of the two FixedPoint32 numbers.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_max">max</a>(num1: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>, num2: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_max">max</a>(num1: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>, num2: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a> {
+    <b>if</b> (num1.value &gt; num2.value) {
+        num1
+    } <b>else</b> {
+        num2
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fixed_point32_create_from_u64"></a>
+
+## Function `create_from_u64`
+
+Create a fixedpoint value from a u64 value.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_create_from_u64">create_from_u64</a>(val: u64): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_create_from_u64">create_from_u64</a>(val: u64): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a> {
+    <b>let</b> value = (val <b>as</b> u128) &lt;&lt; 32;
+    <b>assert</b>!(value &lt;= <a href="fixed_point32.md#0x1_fixed_point32_MAX_U64">MAX_U64</a>, <a href="fixed_point32.md#0x1_fixed_point32_ERATIO_OUT_OF_RANGE">ERATIO_OUT_OF_RANGE</a>);
+    <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a> {value: (value <b>as</b> u64)}
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fixed_point32_floor"></a>
+
+## Function `floor`
+
+Returns the largest integer less than or equal to a given number.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_floor">floor</a>(num: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_floor">floor</a>(num: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): u64 {
+    num.value &gt;&gt; 32
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fixed_point32_ceil"></a>
+
+## Function `ceil`
+
+Rounds up the given FixedPoint32 to the next largest integer.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_ceil">ceil</a>(num: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_ceil">ceil</a>(num: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): u64 {
+    <b>let</b> floored_num = <a href="fixed_point32.md#0x1_fixed_point32_floor">floor</a>(num) &lt;&lt; 32;
+    <b>if</b> (num.value == floored_num) {
+        <b>return</b> floored_num &gt;&gt; 32
+    };
+    <b>let</b> val = ((floored_num <b>as</b> u128) + (1 &lt;&lt; 32));
+    (val &gt;&gt; 32 <b>as</b> u64)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_fixed_point32_round"></a>
+
+## Function `round`
+
+Returns the value of a FixedPoint32 to the nearest integer.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_round">round</a>(num: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_round">round</a>(num: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): u64 {
+    <b>let</b> floored_num = <a href="fixed_point32.md#0x1_fixed_point32_floor">floor</a>(num) &lt;&lt; 32;
+    <b>let</b> boundary = floored_num + ((1 &lt;&lt; 32) / 2);
+    <b>if</b> (num.value &lt; boundary) {
+        floored_num &gt;&gt; 32
+    } <b>else</b> {
+        <a href="fixed_point32.md#0x1_fixed_point32_ceil">ceil</a>(num)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+
+
+<pre><code><b>pragma</b> aborts_if_is_strict;
+</code></pre>
+
+
+
+<a id="@Specification_1_multiply_u64"></a>
+
+### Function `multiply_u64`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_multiply_u64">multiply_u64</a>(val: u64, multiplier: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>): u64
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>include</b> <a href="fixed_point32.md#0x1_fixed_point32_MultiplyAbortsIf">MultiplyAbortsIf</a>;
+<b>ensures</b> result == <a href="fixed_point32.md#0x1_fixed_point32_spec_multiply_u64">spec_multiply_u64</a>(val, multiplier);
+</code></pre>
+
+
+
+
+<a id="0x1_fixed_point32_MultiplyAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="fixed_point32.md#0x1_fixed_point32_MultiplyAbortsIf">MultiplyAbortsIf</a> {
+    val: num;
+    multiplier: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>;
+    <b>aborts_if</b> <a href="fixed_point32.md#0x1_fixed_point32_spec_multiply_u64">spec_multiply_u64</a>(val, multiplier) &gt; <a href="fixed_point32.md#0x1_fixed_point32_MAX_U64">MAX_U64</a> <b>with</b> <a href="fixed_point32.md#0x1_fixed_point32_EMULTIPLICATION">EMULTIPLICATION</a>;
+}
+</code></pre>
+
+
+
+
+<a id="0x1_fixed_point32_spec_multiply_u64"></a>
+
+
+<pre><code><b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_spec_multiply_u64">spec_multiply_u64</a>(val: num, multiplier: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): num {
+   (val * multiplier.value) &gt;&gt; 32
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_divide_u64"></a>
+
+### Function `divide_u64`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_divide_u64">divide_u64</a>(val: u64, divisor: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>): u64
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>include</b> <a href="fixed_point32.md#0x1_fixed_point32_DivideAbortsIf">DivideAbortsIf</a>;
+<b>ensures</b> result == <a href="fixed_point32.md#0x1_fixed_point32_spec_divide_u64">spec_divide_u64</a>(val, divisor);
+</code></pre>
+
+
+
+
+<a id="0x1_fixed_point32_DivideAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="fixed_point32.md#0x1_fixed_point32_DivideAbortsIf">DivideAbortsIf</a> {
+    val: num;
+    divisor: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>;
+    <b>aborts_if</b> divisor.value == 0 <b>with</b> <a href="fixed_point32.md#0x1_fixed_point32_EDIVISION_BY_ZERO">EDIVISION_BY_ZERO</a>;
+    <b>aborts_if</b> <a href="fixed_point32.md#0x1_fixed_point32_spec_divide_u64">spec_divide_u64</a>(val, divisor) &gt; <a href="fixed_point32.md#0x1_fixed_point32_MAX_U64">MAX_U64</a> <b>with</b> <a href="fixed_point32.md#0x1_fixed_point32_EDIVISION">EDIVISION</a>;
+}
+</code></pre>
+
+
+
+
+<a id="0x1_fixed_point32_spec_divide_u64"></a>
+
+
+<pre><code><b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_spec_divide_u64">spec_divide_u64</a>(val: num, divisor: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): num {
+   (val &lt;&lt; 32) / divisor.value
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_create_from_rational"></a>
+
+### Function `create_from_rational`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_create_from_rational">create_from_rational</a>(numerator: u64, denominator: u64): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>include</b> <a href="fixed_point32.md#0x1_fixed_point32_CreateFromRationalAbortsIf">CreateFromRationalAbortsIf</a>;
+<b>ensures</b> result == <a href="fixed_point32.md#0x1_fixed_point32_spec_create_from_rational">spec_create_from_rational</a>(numerator, denominator);
+</code></pre>
+
+
+
+
+<a id="0x1_fixed_point32_CreateFromRationalAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="fixed_point32.md#0x1_fixed_point32_CreateFromRationalAbortsIf">CreateFromRationalAbortsIf</a> {
+    numerator: u64;
+    denominator: u64;
+    <b>let</b> scaled_numerator = (numerator <b>as</b> u128)&lt;&lt; 64;
+    <b>let</b> scaled_denominator = (denominator <b>as</b> u128) &lt;&lt; 32;
+    <b>let</b> quotient = scaled_numerator / scaled_denominator;
+    <b>aborts_if</b> scaled_denominator == 0 <b>with</b> <a href="fixed_point32.md#0x1_fixed_point32_EDENOMINATOR">EDENOMINATOR</a>;
+    <b>aborts_if</b> quotient == 0 && scaled_numerator != 0 <b>with</b> <a href="fixed_point32.md#0x1_fixed_point32_ERATIO_OUT_OF_RANGE">ERATIO_OUT_OF_RANGE</a>;
+    <b>aborts_if</b> quotient &gt; <a href="fixed_point32.md#0x1_fixed_point32_MAX_U64">MAX_U64</a> <b>with</b> <a href="fixed_point32.md#0x1_fixed_point32_ERATIO_OUT_OF_RANGE">ERATIO_OUT_OF_RANGE</a>;
+}
+</code></pre>
+
+
+
+
+<a id="0x1_fixed_point32_spec_create_from_rational"></a>
+
+
+<pre><code><b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_spec_create_from_rational">spec_create_from_rational</a>(numerator: num, denominator: num): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a> {
+   <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>{value: (numerator &lt;&lt; 64) / (denominator &lt;&lt; 32)}
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_create_from_raw_value"></a>
+
+### Function `create_from_raw_value`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_create_from_raw_value">create_from_raw_value</a>(value: u64): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result.value == value;
+</code></pre>
+
+
+
+<a id="@Specification_1_min"></a>
+
+### Function `min`
+
+
+<pre><code><b>public</b> <b>fun</b> <b>min</b>(num1: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>, num2: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="fixed_point32.md#0x1_fixed_point32_spec_min">spec_min</a>(num1, num2);
+</code></pre>
+
+
+
+
+<a id="0x1_fixed_point32_spec_min"></a>
+
+
+<pre><code><b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_spec_min">spec_min</a>(num1: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>, num2: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a> {
+   <b>if</b> (num1.value &lt; num2.value) {
+       num1
+   } <b>else</b> {
+       num2
+   }
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_max"></a>
+
+### Function `max`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_max">max</a>(num1: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>, num2: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="fixed_point32.md#0x1_fixed_point32_spec_max">spec_max</a>(num1, num2);
+</code></pre>
+
+
+
+
+<a id="0x1_fixed_point32_spec_max"></a>
+
+
+<pre><code><b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_spec_max">spec_max</a>(num1: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>, num2: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a> {
+   <b>if</b> (num1.value &gt; num2.value) {
+       num1
+   } <b>else</b> {
+       num2
+   }
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_create_from_u64"></a>
+
+### Function `create_from_u64`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_create_from_u64">create_from_u64</a>(val: u64): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>include</b> <a href="fixed_point32.md#0x1_fixed_point32_CreateFromU64AbortsIf">CreateFromU64AbortsIf</a>;
+<b>ensures</b> result == <a href="fixed_point32.md#0x1_fixed_point32_spec_create_from_u64">spec_create_from_u64</a>(val);
+</code></pre>
+
+
+
+
+<a id="0x1_fixed_point32_CreateFromU64AbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="fixed_point32.md#0x1_fixed_point32_CreateFromU64AbortsIf">CreateFromU64AbortsIf</a> {
+    val: num;
+    <b>let</b> scaled_value = (val <b>as</b> u128) &lt;&lt; 32;
+    <b>aborts_if</b> scaled_value &gt; <a href="fixed_point32.md#0x1_fixed_point32_MAX_U64">MAX_U64</a>;
+}
+</code></pre>
+
+
+
+
+<a id="0x1_fixed_point32_spec_create_from_u64"></a>
+
+
+<pre><code><b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_spec_create_from_u64">spec_create_from_u64</a>(val: num): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a> {
+   <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a> {value: val &lt;&lt; 32}
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_floor"></a>
+
+### Function `floor`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_floor">floor</a>(num: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>): u64
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="fixed_point32.md#0x1_fixed_point32_spec_floor">spec_floor</a>(num);
+</code></pre>
+
+
+
+
+<a id="0x1_fixed_point32_spec_floor"></a>
+
+
+<pre><code><b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_spec_floor">spec_floor</a>(val: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): u64 {
+   <b>let</b> fractional = val.value % (1 &lt;&lt; 32);
+   <b>if</b> (fractional == 0) {
+       val.value &gt;&gt; 32
+   } <b>else</b> {
+       (val.value - fractional) &gt;&gt; 32
+   }
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_ceil"></a>
+
+### Function `ceil`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_ceil">ceil</a>(num: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>): u64
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify_duration_estimate = 120;
+<b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="fixed_point32.md#0x1_fixed_point32_spec_ceil">spec_ceil</a>(num);
+</code></pre>
+
+
+
+
+<a id="0x1_fixed_point32_spec_ceil"></a>
+
+
+<pre><code><b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_spec_ceil">spec_ceil</a>(val: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): u64 {
+   <b>let</b> fractional = val.value % (1 &lt;&lt; 32);
+   <b>let</b> one = 1 &lt;&lt; 32;
+   <b>if</b> (fractional == 0) {
+       val.value &gt;&gt; 32
+   } <b>else</b> {
+       (val.value - fractional + one) &gt;&gt; 32
+   }
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_round"></a>
+
+### Function `round`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_round">round</a>(num: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>): u64
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify_duration_estimate = 120;
+<b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="fixed_point32.md#0x1_fixed_point32_spec_round">spec_round</a>(num);
+</code></pre>
+
+
+
+
+<a id="0x1_fixed_point32_spec_round"></a>
+
+
+<pre><code><b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_spec_round">spec_round</a>(val: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): u64 {
+   <b>let</b> fractional = val.value % (1 &lt;&lt; 32);
+   <b>let</b> boundary = (1 &lt;&lt; 32) / 2;
+   <b>let</b> one = 1 &lt;&lt; 32;
+   <b>if</b> (fractional &lt; boundary) {
+       (val.value - fractional) &gt;&gt; 32
+   } <b>else</b> {
+       (val.value - fractional + one) &gt;&gt; 32
+   }
+}
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/move-stdlib/tests/compiler-v2-doc/hash.md b/aptos-move/framework/move-stdlib/tests/compiler-v2-doc/hash.md
new file mode 100644
index 0000000000000..71b2950158b0c
--- /dev/null
+++ b/aptos-move/framework/move-stdlib/tests/compiler-v2-doc/hash.md
@@ -0,0 +1,65 @@
+
+<a id="0x1_hash"></a>
+
+# Module `0x1::hash`
+
+Module which defines SHA hashes for byte vectors.
+
+The functions in this module are natively declared both in the Move runtime
+as in the Move prover's prelude.
+
+
+-  [Function `sha2_256`](#0x1_hash_sha2_256)
+-  [Function `sha3_256`](#0x1_hash_sha3_256)
+
+
+<pre><code></code></pre>
+
+
+
+<a id="0x1_hash_sha2_256"></a>
+
+## Function `sha2_256`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="hash.md#0x1_hash_sha2_256">sha2_256</a>(data: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>public</b> <b>fun</b> <a href="hash.md#0x1_hash_sha2_256">sha2_256</a>(data: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_hash_sha3_256"></a>
+
+## Function `sha3_256`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="hash.md#0x1_hash_sha3_256">sha3_256</a>(data: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>public</b> <b>fun</b> <a href="hash.md#0x1_hash_sha3_256">sha3_256</a>(data: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+</code></pre>
+
+
+
+</details>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/move-stdlib/tests/compiler-v2-doc/option.md b/aptos-move/framework/move-stdlib/tests/compiler-v2-doc/option.md
new file mode 100644
index 0000000000000..914a948f5c978
--- /dev/null
+++ b/aptos-move/framework/move-stdlib/tests/compiler-v2-doc/option.md
@@ -0,0 +1,1330 @@
+
+<a id="0x1_option"></a>
+
+# Module `0x1::option`
+
+This module defines the Option type and its methods to represent and handle an optional value.
+
+
+-  [Struct `Option`](#0x1_option_Option)
+-  [Constants](#@Constants_0)
+-  [Function `none`](#0x1_option_none)
+-  [Function `some`](#0x1_option_some)
+-  [Function `from_vec`](#0x1_option_from_vec)
+-  [Function `is_none`](#0x1_option_is_none)
+-  [Function `is_some`](#0x1_option_is_some)
+-  [Function `contains`](#0x1_option_contains)
+-  [Function `borrow`](#0x1_option_borrow)
+-  [Function `borrow_with_default`](#0x1_option_borrow_with_default)
+-  [Function `get_with_default`](#0x1_option_get_with_default)
+-  [Function `fill`](#0x1_option_fill)
+-  [Function `extract`](#0x1_option_extract)
+-  [Function `borrow_mut`](#0x1_option_borrow_mut)
+-  [Function `swap`](#0x1_option_swap)
+-  [Function `swap_or_fill`](#0x1_option_swap_or_fill)
+-  [Function `destroy_with_default`](#0x1_option_destroy_with_default)
+-  [Function `destroy_some`](#0x1_option_destroy_some)
+-  [Function `destroy_none`](#0x1_option_destroy_none)
+-  [Function `to_vec`](#0x1_option_to_vec)
+-  [Function `for_each`](#0x1_option_for_each)
+-  [Function `for_each_ref`](#0x1_option_for_each_ref)
+-  [Function `for_each_mut`](#0x1_option_for_each_mut)
+-  [Function `fold`](#0x1_option_fold)
+-  [Function `map`](#0x1_option_map)
+-  [Function `map_ref`](#0x1_option_map_ref)
+-  [Function `filter`](#0x1_option_filter)
+-  [Function `any`](#0x1_option_any)
+-  [Function `destroy`](#0x1_option_destroy)
+-  [Specification](#@Specification_1)
+    -  [Helper Schema](#@Helper_Schema_2)
+    -  [Struct `Option`](#@Specification_1_Option)
+    -  [Function `none`](#@Specification_1_none)
+    -  [Function `some`](#@Specification_1_some)
+    -  [Function `from_vec`](#@Specification_1_from_vec)
+    -  [Function `is_none`](#@Specification_1_is_none)
+    -  [Function `is_some`](#@Specification_1_is_some)
+    -  [Function `contains`](#@Specification_1_contains)
+    -  [Function `borrow`](#@Specification_1_borrow)
+    -  [Function `borrow_with_default`](#@Specification_1_borrow_with_default)
+    -  [Function `get_with_default`](#@Specification_1_get_with_default)
+    -  [Function `fill`](#@Specification_1_fill)
+    -  [Function `extract`](#@Specification_1_extract)
+    -  [Function `borrow_mut`](#@Specification_1_borrow_mut)
+    -  [Function `swap`](#@Specification_1_swap)
+    -  [Function `swap_or_fill`](#@Specification_1_swap_or_fill)
+    -  [Function `destroy_with_default`](#@Specification_1_destroy_with_default)
+    -  [Function `destroy_some`](#@Specification_1_destroy_some)
+    -  [Function `destroy_none`](#@Specification_1_destroy_none)
+    -  [Function `to_vec`](#@Specification_1_to_vec)
+
+
+<pre><code><b>use</b> <a href="vector.md#0x1_vector">0x1::vector</a>;
+</code></pre>
+
+
+
+<a id="0x1_option_Option"></a>
+
+## Struct `Option`
+
+Abstraction of a value that may or may not be present. Implemented with a vector of size
+zero or one because Move bytecode does not have ADTs.
+
+
+<pre><code><b>struct</b> <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt; <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>vec: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_option_EOPTION_IS_SET"></a>
+
+The <code><a href="option.md#0x1_option_Option">Option</a></code> is in an invalid state for the operation attempted.
+The <code><a href="option.md#0x1_option_Option">Option</a></code> is <code>Some</code> while it should be <code>None</code>.
+
+
+<pre><code><b>const</b> <a href="option.md#0x1_option_EOPTION_IS_SET">EOPTION_IS_SET</a>: u64 = 262144;
+</code></pre>
+
+
+
+<a id="0x1_option_EOPTION_NOT_SET"></a>
+
+The <code><a href="option.md#0x1_option_Option">Option</a></code> is in an invalid state for the operation attempted.
+The <code><a href="option.md#0x1_option_Option">Option</a></code> is <code>None</code> while it should be <code>Some</code>.
+
+
+<pre><code><b>const</b> <a href="option.md#0x1_option_EOPTION_NOT_SET">EOPTION_NOT_SET</a>: u64 = 262145;
+</code></pre>
+
+
+
+<a id="0x1_option_EOPTION_VEC_TOO_LONG"></a>
+
+Cannot construct an option from a vector with 2 or more elements.
+
+
+<pre><code><b>const</b> <a href="option.md#0x1_option_EOPTION_VEC_TOO_LONG">EOPTION_VEC_TOO_LONG</a>: u64 = 262146;
+</code></pre>
+
+
+
+<a id="0x1_option_none"></a>
+
+## Function `none`
+
+Return an empty <code><a href="option.md#0x1_option_Option">Option</a></code>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_none">none</a>&lt;Element&gt;(): <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_none">none</a>&lt;Element&gt;(): <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt; {
+    <a href="option.md#0x1_option_Option">Option</a> { vec: <a href="vector.md#0x1_vector_empty">vector::empty</a>() }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_option_some"></a>
+
+## Function `some`
+
+Return an <code><a href="option.md#0x1_option_Option">Option</a></code> containing <code>e</code>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_some">some</a>&lt;Element&gt;(e: Element): <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_some">some</a>&lt;Element&gt;(e: Element): <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt; {
+    <a href="option.md#0x1_option_Option">Option</a> { vec: <a href="vector.md#0x1_vector_singleton">vector::singleton</a>(e) }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_option_from_vec"></a>
+
+## Function `from_vec`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_from_vec">from_vec</a>&lt;Element&gt;(vec: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;): <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_from_vec">from_vec</a>&lt;Element&gt;(vec: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;): <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt; {
+    <b>assert</b>!(<a href="vector.md#0x1_vector_length">vector::length</a>(&vec) &lt;= 1, <a href="option.md#0x1_option_EOPTION_VEC_TOO_LONG">EOPTION_VEC_TOO_LONG</a>);
+    <a href="option.md#0x1_option_Option">Option</a> { vec }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_option_is_none"></a>
+
+## Function `is_none`
+
+Return true if <code>t</code> does not hold a value
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_is_none">is_none</a>&lt;Element&gt;(t: &<a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_is_none">is_none</a>&lt;Element&gt;(t: &<a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;): bool {
+    <a href="vector.md#0x1_vector_is_empty">vector::is_empty</a>(&t.vec)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_option_is_some"></a>
+
+## Function `is_some`
+
+Return true if <code>t</code> holds a value
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_is_some">is_some</a>&lt;Element&gt;(t: &<a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_is_some">is_some</a>&lt;Element&gt;(t: &<a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;): bool {
+    !<a href="vector.md#0x1_vector_is_empty">vector::is_empty</a>(&t.vec)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_option_contains"></a>
+
+## Function `contains`
+
+Return true if the value in <code>t</code> is equal to <code>e_ref</code>
+Always returns <code><b>false</b></code> if <code>t</code> does not hold a value
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_contains">contains</a>&lt;Element&gt;(t: &<a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;, e_ref: &Element): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_contains">contains</a>&lt;Element&gt;(t: &<a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;, e_ref: &Element): bool {
+    <a href="vector.md#0x1_vector_contains">vector::contains</a>(&t.vec, e_ref)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_option_borrow"></a>
+
+## Function `borrow`
+
+Return an immutable reference to the value inside <code>t</code>
+Aborts if <code>t</code> does not hold a value
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_borrow">borrow</a>&lt;Element&gt;(t: &<a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;): &Element
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_borrow">borrow</a>&lt;Element&gt;(t: &<a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;): &Element {
+    <b>assert</b>!(<a href="option.md#0x1_option_is_some">is_some</a>(t), <a href="option.md#0x1_option_EOPTION_NOT_SET">EOPTION_NOT_SET</a>);
+    <a href="vector.md#0x1_vector_borrow">vector::borrow</a>(&t.vec, 0)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_option_borrow_with_default"></a>
+
+## Function `borrow_with_default`
+
+Return a reference to the value inside <code>t</code> if it holds one
+Return <code>default_ref</code> if <code>t</code> does not hold a value
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_borrow_with_default">borrow_with_default</a>&lt;Element&gt;(t: &<a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;, default_ref: &Element): &Element
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_borrow_with_default">borrow_with_default</a>&lt;Element&gt;(t: &<a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;, default_ref: &Element): &Element {
+    <b>let</b> vec_ref = &t.vec;
+    <b>if</b> (<a href="vector.md#0x1_vector_is_empty">vector::is_empty</a>(vec_ref)) default_ref
+    <b>else</b> <a href="vector.md#0x1_vector_borrow">vector::borrow</a>(vec_ref, 0)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_option_get_with_default"></a>
+
+## Function `get_with_default`
+
+Return the value inside <code>t</code> if it holds one
+Return <code>default</code> if <code>t</code> does not hold a value
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_get_with_default">get_with_default</a>&lt;Element: <b>copy</b>, drop&gt;(t: &<a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;, default: Element): Element
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_get_with_default">get_with_default</a>&lt;Element: <b>copy</b> + drop&gt;(
+    t: &<a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;,
+    default: Element,
+): Element {
+    <b>let</b> vec_ref = &t.vec;
+    <b>if</b> (<a href="vector.md#0x1_vector_is_empty">vector::is_empty</a>(vec_ref)) default
+    <b>else</b> *<a href="vector.md#0x1_vector_borrow">vector::borrow</a>(vec_ref, 0)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_option_fill"></a>
+
+## Function `fill`
+
+Convert the none option <code>t</code> to a some option by adding <code>e</code>.
+Aborts if <code>t</code> already holds a value
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_fill">fill</a>&lt;Element&gt;(t: &<b>mut</b> <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;, e: Element)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_fill">fill</a>&lt;Element&gt;(t: &<b>mut</b> <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;, e: Element) {
+    <b>let</b> vec_ref = &<b>mut</b> t.vec;
+    <b>if</b> (<a href="vector.md#0x1_vector_is_empty">vector::is_empty</a>(vec_ref)) <a href="vector.md#0x1_vector_push_back">vector::push_back</a>(vec_ref, e)
+    <b>else</b> <b>abort</b> <a href="option.md#0x1_option_EOPTION_IS_SET">EOPTION_IS_SET</a>
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_option_extract"></a>
+
+## Function `extract`
+
+Convert a <code>some</code> option to a <code>none</code> by removing and returning the value stored inside <code>t</code>
+Aborts if <code>t</code> does not hold a value
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_extract">extract</a>&lt;Element&gt;(t: &<b>mut</b> <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;): Element
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_extract">extract</a>&lt;Element&gt;(t: &<b>mut</b> <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;): Element {
+    <b>assert</b>!(<a href="option.md#0x1_option_is_some">is_some</a>(t), <a href="option.md#0x1_option_EOPTION_NOT_SET">EOPTION_NOT_SET</a>);
+    <a href="vector.md#0x1_vector_pop_back">vector::pop_back</a>(&<b>mut</b> t.vec)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_option_borrow_mut"></a>
+
+## Function `borrow_mut`
+
+Return a mutable reference to the value inside <code>t</code>
+Aborts if <code>t</code> does not hold a value
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_borrow_mut">borrow_mut</a>&lt;Element&gt;(t: &<b>mut</b> <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;): &<b>mut</b> Element
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_borrow_mut">borrow_mut</a>&lt;Element&gt;(t: &<b>mut</b> <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;): &<b>mut</b> Element {
+    <b>assert</b>!(<a href="option.md#0x1_option_is_some">is_some</a>(t), <a href="option.md#0x1_option_EOPTION_NOT_SET">EOPTION_NOT_SET</a>);
+    <a href="vector.md#0x1_vector_borrow_mut">vector::borrow_mut</a>(&<b>mut</b> t.vec, 0)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_option_swap"></a>
+
+## Function `swap`
+
+Swap the old value inside <code>t</code> with <code>e</code> and return the old value
+Aborts if <code>t</code> does not hold a value
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_swap">swap</a>&lt;Element&gt;(t: &<b>mut</b> <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;, e: Element): Element
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_swap">swap</a>&lt;Element&gt;(t: &<b>mut</b> <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;, e: Element): Element {
+    <b>assert</b>!(<a href="option.md#0x1_option_is_some">is_some</a>(t), <a href="option.md#0x1_option_EOPTION_NOT_SET">EOPTION_NOT_SET</a>);
+    <b>let</b> vec_ref = &<b>mut</b> t.vec;
+    <b>let</b> old_value = <a href="vector.md#0x1_vector_pop_back">vector::pop_back</a>(vec_ref);
+    <a href="vector.md#0x1_vector_push_back">vector::push_back</a>(vec_ref, e);
+    old_value
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_option_swap_or_fill"></a>
+
+## Function `swap_or_fill`
+
+Swap the old value inside <code>t</code> with <code>e</code> and return the old value;
+or if there is no old value, fill it with <code>e</code>.
+Different from swap(), swap_or_fill() allows for <code>t</code> not holding a value.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_swap_or_fill">swap_or_fill</a>&lt;Element&gt;(t: &<b>mut</b> <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;, e: Element): <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_swap_or_fill">swap_or_fill</a>&lt;Element&gt;(t: &<b>mut</b> <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;, e: Element): <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt; {
+    <b>let</b> vec_ref = &<b>mut</b> t.vec;
+    <b>let</b> old_value = <b>if</b> (<a href="vector.md#0x1_vector_is_empty">vector::is_empty</a>(vec_ref)) <a href="option.md#0x1_option_none">none</a>()
+        <b>else</b> <a href="option.md#0x1_option_some">some</a>(<a href="vector.md#0x1_vector_pop_back">vector::pop_back</a>(vec_ref));
+    <a href="vector.md#0x1_vector_push_back">vector::push_back</a>(vec_ref, e);
+    old_value
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_option_destroy_with_default"></a>
+
+## Function `destroy_with_default`
+
+Destroys <code>t.</code> If <code>t</code> holds a value, return it. Returns <code>default</code> otherwise
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_destroy_with_default">destroy_with_default</a>&lt;Element: drop&gt;(t: <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;, default: Element): Element
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_destroy_with_default">destroy_with_default</a>&lt;Element: drop&gt;(t: <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;, default: Element): Element {
+    <b>let</b> <a href="option.md#0x1_option_Option">Option</a> { vec } = t;
+    <b>if</b> (<a href="vector.md#0x1_vector_is_empty">vector::is_empty</a>(&<b>mut</b> vec)) default
+    <b>else</b> <a href="vector.md#0x1_vector_pop_back">vector::pop_back</a>(&<b>mut</b> vec)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_option_destroy_some"></a>
+
+## Function `destroy_some`
+
+Unpack <code>t</code> and return its contents
+Aborts if <code>t</code> does not hold a value
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_destroy_some">destroy_some</a>&lt;Element&gt;(t: <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;): Element
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_destroy_some">destroy_some</a>&lt;Element&gt;(t: <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;): Element {
+    <b>assert</b>!(<a href="option.md#0x1_option_is_some">is_some</a>(&t), <a href="option.md#0x1_option_EOPTION_NOT_SET">EOPTION_NOT_SET</a>);
+    <b>let</b> <a href="option.md#0x1_option_Option">Option</a> { vec } = t;
+    <b>let</b> elem = <a href="vector.md#0x1_vector_pop_back">vector::pop_back</a>(&<b>mut</b> vec);
+    <a href="vector.md#0x1_vector_destroy_empty">vector::destroy_empty</a>(vec);
+    elem
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_option_destroy_none"></a>
+
+## Function `destroy_none`
+
+Unpack <code>t</code>
+Aborts if <code>t</code> holds a value
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_destroy_none">destroy_none</a>&lt;Element&gt;(t: <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_destroy_none">destroy_none</a>&lt;Element&gt;(t: <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;) {
+    <b>assert</b>!(<a href="option.md#0x1_option_is_none">is_none</a>(&t), <a href="option.md#0x1_option_EOPTION_IS_SET">EOPTION_IS_SET</a>);
+    <b>let</b> <a href="option.md#0x1_option_Option">Option</a> { vec } = t;
+    <a href="vector.md#0x1_vector_destroy_empty">vector::destroy_empty</a>(vec)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_option_to_vec"></a>
+
+## Function `to_vec`
+
+Convert <code>t</code> into a vector of length 1 if it is <code>Some</code>,
+and an empty vector otherwise
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_to_vec">to_vec</a>&lt;Element&gt;(t: <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;): <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_to_vec">to_vec</a>&lt;Element&gt;(t: <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;): <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt; {
+    <b>let</b> <a href="option.md#0x1_option_Option">Option</a> { vec } = t;
+    vec
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_option_for_each"></a>
+
+## Function `for_each`
+
+Apply the function to the optional element, consuming it. Does nothing if no value present.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_for_each">for_each</a>&lt;Element&gt;(o: <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;, f: |Element|)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="option.md#0x1_option_for_each">for_each</a>&lt;Element&gt;(o: <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;, f: |Element|) {
+    <b>if</b> (<a href="option.md#0x1_option_is_some">is_some</a>(&o)) {
+        f(<a href="option.md#0x1_option_destroy_some">destroy_some</a>(o))
+    } <b>else</b> {
+        <a href="option.md#0x1_option_destroy_none">destroy_none</a>(o)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_option_for_each_ref"></a>
+
+## Function `for_each_ref`
+
+Apply the function to the optional element reference. Does nothing if no value present.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_for_each_ref">for_each_ref</a>&lt;Element&gt;(o: &<a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;, f: |&Element|)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="option.md#0x1_option_for_each_ref">for_each_ref</a>&lt;Element&gt;(o: &<a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;, f: |&Element|) {
+    <b>if</b> (<a href="option.md#0x1_option_is_some">is_some</a>(o)) {
+        f(<a href="option.md#0x1_option_borrow">borrow</a>(o))
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_option_for_each_mut"></a>
+
+## Function `for_each_mut`
+
+Apply the function to the optional element reference. Does nothing if no value present.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_for_each_mut">for_each_mut</a>&lt;Element&gt;(o: &<b>mut</b> <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;, f: |&<b>mut</b> Element|)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="option.md#0x1_option_for_each_mut">for_each_mut</a>&lt;Element&gt;(o: &<b>mut</b> <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;, f: |&<b>mut</b> Element|) {
+    <b>if</b> (<a href="option.md#0x1_option_is_some">is_some</a>(o)) {
+        f(<a href="option.md#0x1_option_borrow_mut">borrow_mut</a>(o))
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_option_fold"></a>
+
+## Function `fold`
+
+Folds the function over the optional element.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_fold">fold</a>&lt;Accumulator, Element&gt;(o: <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;, init: Accumulator, f: |(Accumulator, Element)|Accumulator): Accumulator
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="option.md#0x1_option_fold">fold</a>&lt;Accumulator, Element&gt;(
+    o: <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;,
+    init: Accumulator,
+    f: |Accumulator,Element|Accumulator
+): Accumulator {
+    <b>if</b> (<a href="option.md#0x1_option_is_some">is_some</a>(&o)) {
+        f(init, <a href="option.md#0x1_option_destroy_some">destroy_some</a>(o))
+    } <b>else</b> {
+        <a href="option.md#0x1_option_destroy_none">destroy_none</a>(o);
+        init
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_option_map"></a>
+
+## Function `map`
+
+Maps the content of an option.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_map">map</a>&lt;Element, OtherElement&gt;(o: <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;, f: |Element|OtherElement): <a href="option.md#0x1_option_Option">option::Option</a>&lt;OtherElement&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="option.md#0x1_option_map">map</a>&lt;Element, OtherElement&gt;(o: <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;, f: |Element|OtherElement): <a href="option.md#0x1_option_Option">Option</a>&lt;OtherElement&gt; {
+    <b>if</b> (<a href="option.md#0x1_option_is_some">is_some</a>(&o)) {
+        <a href="option.md#0x1_option_some">some</a>(f(<a href="option.md#0x1_option_destroy_some">destroy_some</a>(o)))
+    } <b>else</b> {
+        <a href="option.md#0x1_option_destroy_none">destroy_none</a>(o);
+        <a href="option.md#0x1_option_none">none</a>()
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_option_map_ref"></a>
+
+## Function `map_ref`
+
+Maps the content of an option without destroying the original option.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_map_ref">map_ref</a>&lt;Element, OtherElement&gt;(o: &<a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;, f: |&Element|OtherElement): <a href="option.md#0x1_option_Option">option::Option</a>&lt;OtherElement&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="option.md#0x1_option_map_ref">map_ref</a>&lt;Element, OtherElement&gt;(
+    o: &<a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;, f: |&Element|OtherElement): <a href="option.md#0x1_option_Option">Option</a>&lt;OtherElement&gt; {
+    <b>if</b> (<a href="option.md#0x1_option_is_some">is_some</a>(o)) {
+        <a href="option.md#0x1_option_some">some</a>(f(<a href="option.md#0x1_option_borrow">borrow</a>(o)))
+    } <b>else</b> {
+        <a href="option.md#0x1_option_none">none</a>()
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_option_filter"></a>
+
+## Function `filter`
+
+Filters the content of an option
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_filter">filter</a>&lt;Element: drop&gt;(o: <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;, f: |&Element|bool): <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="option.md#0x1_option_filter">filter</a>&lt;Element:drop&gt;(o: <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;, f: |&Element|bool): <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt; {
+    <b>if</b> (<a href="option.md#0x1_option_is_some">is_some</a>(&o) && f(<a href="option.md#0x1_option_borrow">borrow</a>(&o))) {
+        o
+    } <b>else</b> {
+        <a href="option.md#0x1_option_none">none</a>()
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_option_any"></a>
+
+## Function `any`
+
+Returns true if the option contains an element which satisfies predicate.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_any">any</a>&lt;Element&gt;(o: &<a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;, p: |&Element|bool): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="option.md#0x1_option_any">any</a>&lt;Element&gt;(o: &<a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;, p: |&Element|bool): bool {
+    <a href="option.md#0x1_option_is_some">is_some</a>(o) && p(<a href="option.md#0x1_option_borrow">borrow</a>(o))
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_option_destroy"></a>
+
+## Function `destroy`
+
+Utility function to destroy an option that is not droppable.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_destroy">destroy</a>&lt;Element&gt;(o: <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;, d: |Element|)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="option.md#0x1_option_destroy">destroy</a>&lt;Element&gt;(o: <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;, d: |Element|) {
+    <b>let</b> vec = <a href="option.md#0x1_option_to_vec">to_vec</a>(o);
+    <a href="vector.md#0x1_vector_destroy">vector::destroy</a>(vec, |e| d(e));
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+
+
+<pre><code><b>pragma</b> aborts_if_is_strict;
+</code></pre>
+
+
+
+<a id="@Helper_Schema_2"></a>
+
+### Helper Schema
+
+
+
+<a id="0x1_option_AbortsIfNone"></a>
+
+
+<pre><code><b>schema</b> <a href="option.md#0x1_option_AbortsIfNone">AbortsIfNone</a>&lt;Element&gt; {
+    t: <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;;
+    <b>aborts_if</b> <a href="option.md#0x1_option_spec_is_none">spec_is_none</a>(t) <b>with</b> <a href="option.md#0x1_option_EOPTION_NOT_SET">EOPTION_NOT_SET</a>;
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_Option"></a>
+
+### Struct `Option`
+
+
+<pre><code><b>struct</b> <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt; <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<dl>
+<dt>
+<code>vec: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+The size of vector is always less than equal to 1
+because it's 0 for "none" or 1 for "some".
+
+
+<pre><code><b>invariant</b> len(vec) &lt;= 1;
+</code></pre>
+
+
+
+<a id="@Specification_1_none"></a>
+
+### Function `none`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_none">none</a>&lt;Element&gt;(): <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="option.md#0x1_option_spec_none">spec_none</a>&lt;Element&gt;();
+</code></pre>
+
+
+
+
+<a id="0x1_option_spec_none"></a>
+
+
+<pre><code><b>fun</b> <a href="option.md#0x1_option_spec_none">spec_none</a>&lt;Element&gt;(): <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt; {
+   <a href="option.md#0x1_option_Option">Option</a>{ vec: vec() }
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_some"></a>
+
+### Function `some`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_some">some</a>&lt;Element&gt;(e: Element): <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="option.md#0x1_option_spec_some">spec_some</a>(e);
+</code></pre>
+
+
+
+
+<a id="0x1_option_spec_some"></a>
+
+
+<pre><code><b>fun</b> <a href="option.md#0x1_option_spec_some">spec_some</a>&lt;Element&gt;(e: Element): <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt; {
+   <a href="option.md#0x1_option_Option">Option</a>{ vec: vec(e) }
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_from_vec"></a>
+
+### Function `from_vec`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_from_vec">from_vec</a>&lt;Element&gt;(vec: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;): <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <a href="vector.md#0x1_vector_length">vector::length</a>(vec) &gt; 1;
+</code></pre>
+
+
+
+<a id="@Specification_1_is_none"></a>
+
+### Function `is_none`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_is_none">is_none</a>&lt;Element&gt;(t: &<a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;): bool
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="option.md#0x1_option_spec_is_none">spec_is_none</a>(t);
+</code></pre>
+
+
+
+
+<a id="0x1_option_spec_is_none"></a>
+
+
+<pre><code><b>fun</b> <a href="option.md#0x1_option_spec_is_none">spec_is_none</a>&lt;Element&gt;(t: <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;): bool {
+   <a href="vector.md#0x1_vector_is_empty">vector::is_empty</a>(t.vec)
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_is_some"></a>
+
+### Function `is_some`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_is_some">is_some</a>&lt;Element&gt;(t: &<a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;): bool
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="option.md#0x1_option_spec_is_some">spec_is_some</a>(t);
+</code></pre>
+
+
+
+
+<a id="0x1_option_spec_is_some"></a>
+
+
+<pre><code><b>fun</b> <a href="option.md#0x1_option_spec_is_some">spec_is_some</a>&lt;Element&gt;(t: <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;): bool {
+   !<a href="vector.md#0x1_vector_is_empty">vector::is_empty</a>(t.vec)
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_contains"></a>
+
+### Function `contains`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_contains">contains</a>&lt;Element&gt;(t: &<a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;, e_ref: &Element): bool
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="option.md#0x1_option_spec_contains">spec_contains</a>(t, e_ref);
+</code></pre>
+
+
+
+
+<a id="0x1_option_spec_contains"></a>
+
+
+<pre><code><b>fun</b> <a href="option.md#0x1_option_spec_contains">spec_contains</a>&lt;Element&gt;(t: <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;, e: Element): bool {
+   <a href="option.md#0x1_option_is_some">is_some</a>(t) && <a href="option.md#0x1_option_borrow">borrow</a>(t) == e
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_borrow"></a>
+
+### Function `borrow`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_borrow">borrow</a>&lt;Element&gt;(t: &<a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;): &Element
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>include</b> <a href="option.md#0x1_option_AbortsIfNone">AbortsIfNone</a>&lt;Element&gt;;
+<b>ensures</b> result == <a href="option.md#0x1_option_spec_borrow">spec_borrow</a>(t);
+</code></pre>
+
+
+
+
+<a id="0x1_option_spec_borrow"></a>
+
+
+<pre><code><b>fun</b> <a href="option.md#0x1_option_spec_borrow">spec_borrow</a>&lt;Element&gt;(t: <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;): Element {
+   t.vec[0]
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_borrow_with_default"></a>
+
+### Function `borrow_with_default`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_borrow_with_default">borrow_with_default</a>&lt;Element&gt;(t: &<a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;, default_ref: &Element): &Element
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == (<b>if</b> (<a href="option.md#0x1_option_spec_is_some">spec_is_some</a>(t)) <a href="option.md#0x1_option_spec_borrow">spec_borrow</a>(t) <b>else</b> default_ref);
+</code></pre>
+
+
+
+<a id="@Specification_1_get_with_default"></a>
+
+### Function `get_with_default`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_get_with_default">get_with_default</a>&lt;Element: <b>copy</b>, drop&gt;(t: &<a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;, default: Element): Element
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == (<b>if</b> (<a href="option.md#0x1_option_spec_is_some">spec_is_some</a>(t)) <a href="option.md#0x1_option_spec_borrow">spec_borrow</a>(t) <b>else</b> default);
+</code></pre>
+
+
+
+<a id="@Specification_1_fill"></a>
+
+### Function `fill`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_fill">fill</a>&lt;Element&gt;(t: &<b>mut</b> <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;, e: Element)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <a href="option.md#0x1_option_spec_is_some">spec_is_some</a>(t) <b>with</b> <a href="option.md#0x1_option_EOPTION_IS_SET">EOPTION_IS_SET</a>;
+<b>ensures</b> <a href="option.md#0x1_option_spec_is_some">spec_is_some</a>(t);
+<b>ensures</b> <a href="option.md#0x1_option_spec_borrow">spec_borrow</a>(t) == e;
+</code></pre>
+
+
+
+<a id="@Specification_1_extract"></a>
+
+### Function `extract`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_extract">extract</a>&lt;Element&gt;(t: &<b>mut</b> <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;): Element
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>include</b> <a href="option.md#0x1_option_AbortsIfNone">AbortsIfNone</a>&lt;Element&gt;;
+<b>ensures</b> result == <a href="option.md#0x1_option_spec_borrow">spec_borrow</a>(<b>old</b>(t));
+<b>ensures</b> <a href="option.md#0x1_option_spec_is_none">spec_is_none</a>(t);
+</code></pre>
+
+
+
+<a id="@Specification_1_borrow_mut"></a>
+
+### Function `borrow_mut`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_borrow_mut">borrow_mut</a>&lt;Element&gt;(t: &<b>mut</b> <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;): &<b>mut</b> Element
+</code></pre>
+
+
+
+
+<pre><code><b>include</b> <a href="option.md#0x1_option_AbortsIfNone">AbortsIfNone</a>&lt;Element&gt;;
+<b>ensures</b> result == <a href="option.md#0x1_option_spec_borrow">spec_borrow</a>(t);
+<b>ensures</b> t == <b>old</b>(t);
+</code></pre>
+
+
+
+<a id="@Specification_1_swap"></a>
+
+### Function `swap`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_swap">swap</a>&lt;Element&gt;(t: &<b>mut</b> <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;, e: Element): Element
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>include</b> <a href="option.md#0x1_option_AbortsIfNone">AbortsIfNone</a>&lt;Element&gt;;
+<b>ensures</b> result == <a href="option.md#0x1_option_spec_borrow">spec_borrow</a>(<b>old</b>(t));
+<b>ensures</b> <a href="option.md#0x1_option_spec_is_some">spec_is_some</a>(t);
+<b>ensures</b> <a href="option.md#0x1_option_spec_borrow">spec_borrow</a>(t) == e;
+</code></pre>
+
+
+
+<a id="@Specification_1_swap_or_fill"></a>
+
+### Function `swap_or_fill`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_swap_or_fill">swap_or_fill</a>&lt;Element&gt;(t: &<b>mut</b> <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;, e: Element): <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <b>old</b>(t);
+<b>ensures</b> <a href="option.md#0x1_option_spec_borrow">spec_borrow</a>(t) == e;
+</code></pre>
+
+
+
+<a id="@Specification_1_destroy_with_default"></a>
+
+### Function `destroy_with_default`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_destroy_with_default">destroy_with_default</a>&lt;Element: drop&gt;(t: <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;, default: Element): Element
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == (<b>if</b> (<a href="option.md#0x1_option_spec_is_some">spec_is_some</a>(t)) <a href="option.md#0x1_option_spec_borrow">spec_borrow</a>(t) <b>else</b> default);
+</code></pre>
+
+
+
+<a id="@Specification_1_destroy_some"></a>
+
+### Function `destroy_some`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_destroy_some">destroy_some</a>&lt;Element&gt;(t: <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;): Element
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>include</b> <a href="option.md#0x1_option_AbortsIfNone">AbortsIfNone</a>&lt;Element&gt;;
+<b>ensures</b> result == <a href="option.md#0x1_option_spec_borrow">spec_borrow</a>(t);
+</code></pre>
+
+
+
+<a id="@Specification_1_destroy_none"></a>
+
+### Function `destroy_none`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_destroy_none">destroy_none</a>&lt;Element&gt;(t: <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <a href="option.md#0x1_option_spec_is_some">spec_is_some</a>(t) <b>with</b> <a href="option.md#0x1_option_EOPTION_IS_SET">EOPTION_IS_SET</a>;
+</code></pre>
+
+
+
+<a id="@Specification_1_to_vec"></a>
+
+### Function `to_vec`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_to_vec">to_vec</a>&lt;Element&gt;(t: <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;): <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == t.vec;
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/move-stdlib/tests/compiler-v2-doc/overview.md b/aptos-move/framework/move-stdlib/tests/compiler-v2-doc/overview.md
new file mode 100644
index 0000000000000..8eb0c67f05113
--- /dev/null
+++ b/aptos-move/framework/move-stdlib/tests/compiler-v2-doc/overview.md
@@ -0,0 +1,29 @@
+
+<a id="@Move_Stdlib_Modules_0"></a>
+
+# Move Stdlib Modules
+
+
+This is the reference documentation of the Move standard library.
+For on overview of the Move language, see the [Move Book][move-book].
+
+
+<a id="@Index_1"></a>
+
+## Index
+
+
+-  [`0x1::acl`](acl.md#0x1_acl)
+-  [`0x1::bcs`](bcs.md#0x1_bcs)
+-  [`0x1::bit_vector`](bit_vector.md#0x1_bit_vector)
+-  [`0x1::error`](error.md#0x1_error)
+-  [`0x1::features`](features.md#0x1_features)
+-  [`0x1::fixed_point32`](fixed_point32.md#0x1_fixed_point32)
+-  [`0x1::hash`](hash.md#0x1_hash)
+-  [`0x1::option`](option.md#0x1_option)
+-  [`0x1::signer`](signer.md#0x1_signer)
+-  [`0x1::string`](string.md#0x1_string)
+-  [`0x1::vector`](vector.md#0x1_vector)
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/move-stdlib/tests/compiler-v2-doc/signer.md b/aptos-move/framework/move-stdlib/tests/compiler-v2-doc/signer.md
new file mode 100644
index 0000000000000..f6de8799b571c
--- /dev/null
+++ b/aptos-move/framework/move-stdlib/tests/compiler-v2-doc/signer.md
@@ -0,0 +1,94 @@
+
+<a id="0x1_signer"></a>
+
+# Module `0x1::signer`
+
+
+
+-  [Function `borrow_address`](#0x1_signer_borrow_address)
+-  [Function `address_of`](#0x1_signer_address_of)
+-  [Specification](#@Specification_0)
+
+
+<pre><code></code></pre>
+
+
+
+<a id="0x1_signer_borrow_address"></a>
+
+## Function `borrow_address`
+
+Borrows the address of the signer
+Conceptually, you can think of the <code><a href="signer.md#0x1_signer">signer</a></code> as being a struct wrapper around an
+address
+```
+struct signer has drop { addr: address }
+```
+<code>borrow_address</code> borrows this inner field
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="signer.md#0x1_signer_borrow_address">borrow_address</a>(s: &<a href="signer.md#0x1_signer">signer</a>): &<b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>public</b> <b>fun</b> <a href="signer.md#0x1_signer_borrow_address">borrow_address</a>(s: &<a href="signer.md#0x1_signer">signer</a>): &<b>address</b>;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_signer_address_of"></a>
+
+## Function `address_of`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="signer.md#0x1_signer_address_of">address_of</a>(s: &<a href="signer.md#0x1_signer">signer</a>): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="signer.md#0x1_signer_address_of">address_of</a>(s: &<a href="signer.md#0x1_signer">signer</a>): <b>address</b> {
+    *<a href="signer.md#0x1_signer_borrow_address">borrow_address</a>(s)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_0"></a>
+
+## Specification
+
+Return true only if <code>s</code> is a transaction signer. This is a spec function only available in spec.
+
+
+<a id="0x1_signer_is_txn_signer"></a>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="signer.md#0x1_signer_is_txn_signer">is_txn_signer</a>(s: <a href="signer.md#0x1_signer">signer</a>): bool;
+</code></pre>
+
+
+Return true only if <code>a</code> is a transaction signer address. This is a spec function only available in spec.
+
+
+<a id="0x1_signer_is_txn_signer_addr"></a>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="signer.md#0x1_signer_is_txn_signer_addr">is_txn_signer_addr</a>(a: <b>address</b>): bool;
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/move-stdlib/tests/compiler-v2-doc/string.md b/aptos-move/framework/move-stdlib/tests/compiler-v2-doc/string.md
new file mode 100644
index 0000000000000..b45c55afe9902
--- /dev/null
+++ b/aptos-move/framework/move-stdlib/tests/compiler-v2-doc/string.md
@@ -0,0 +1,552 @@
+
+<a id="0x1_string"></a>
+
+# Module `0x1::string`
+
+The <code><a href="string.md#0x1_string">string</a></code> module defines the <code><a href="string.md#0x1_string_String">String</a></code> type which represents UTF8 encoded strings.
+
+
+-  [Struct `String`](#0x1_string_String)
+-  [Constants](#@Constants_0)
+-  [Function `utf8`](#0x1_string_utf8)
+-  [Function `try_utf8`](#0x1_string_try_utf8)
+-  [Function `bytes`](#0x1_string_bytes)
+-  [Function `is_empty`](#0x1_string_is_empty)
+-  [Function `length`](#0x1_string_length)
+-  [Function `append`](#0x1_string_append)
+-  [Function `append_utf8`](#0x1_string_append_utf8)
+-  [Function `insert`](#0x1_string_insert)
+-  [Function `sub_string`](#0x1_string_sub_string)
+-  [Function `index_of`](#0x1_string_index_of)
+-  [Function `internal_check_utf8`](#0x1_string_internal_check_utf8)
+-  [Function `internal_is_char_boundary`](#0x1_string_internal_is_char_boundary)
+-  [Function `internal_sub_string`](#0x1_string_internal_sub_string)
+-  [Function `internal_index_of`](#0x1_string_internal_index_of)
+-  [Specification](#@Specification_1)
+    -  [Function `internal_check_utf8`](#@Specification_1_internal_check_utf8)
+    -  [Function `internal_is_char_boundary`](#@Specification_1_internal_is_char_boundary)
+    -  [Function `internal_sub_string`](#@Specification_1_internal_sub_string)
+    -  [Function `internal_index_of`](#@Specification_1_internal_index_of)
+
+
+<pre><code><b>use</b> <a href="option.md#0x1_option">0x1::option</a>;
+<b>use</b> <a href="vector.md#0x1_vector">0x1::vector</a>;
+</code></pre>
+
+
+
+<a id="0x1_string_String"></a>
+
+## Struct `String`
+
+A <code><a href="string.md#0x1_string_String">String</a></code> holds a sequence of bytes which is guaranteed to be in utf8 format.
+
+
+<pre><code><b>struct</b> <a href="string.md#0x1_string_String">String</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>bytes: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_string_EINVALID_INDEX"></a>
+
+Index out of range.
+
+
+<pre><code><b>const</b> <a href="string.md#0x1_string_EINVALID_INDEX">EINVALID_INDEX</a>: u64 = 2;
+</code></pre>
+
+
+
+<a id="0x1_string_EINVALID_UTF8"></a>
+
+An invalid UTF8 encoding.
+
+
+<pre><code><b>const</b> <a href="string.md#0x1_string_EINVALID_UTF8">EINVALID_UTF8</a>: u64 = 1;
+</code></pre>
+
+
+
+<a id="0x1_string_utf8"></a>
+
+## Function `utf8`
+
+Creates a new string from a sequence of bytes. Aborts if the bytes do not represent valid utf8.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_utf8">utf8</a>(bytes: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_utf8">utf8</a>(bytes: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="string.md#0x1_string_String">String</a> {
+    <b>assert</b>!(<a href="string.md#0x1_string_internal_check_utf8">internal_check_utf8</a>(&bytes), <a href="string.md#0x1_string_EINVALID_UTF8">EINVALID_UTF8</a>);
+    <a href="string.md#0x1_string_String">String</a>{bytes}
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_string_try_utf8"></a>
+
+## Function `try_utf8`
+
+Tries to create a new string from a sequence of bytes.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_try_utf8">try_utf8</a>(bytes: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="option.md#0x1_option_Option">option::Option</a>&lt;<a href="string.md#0x1_string_String">string::String</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_try_utf8">try_utf8</a>(bytes: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): Option&lt;<a href="string.md#0x1_string_String">String</a>&gt; {
+    <b>if</b> (<a href="string.md#0x1_string_internal_check_utf8">internal_check_utf8</a>(&bytes)) {
+        <a href="option.md#0x1_option_some">option::some</a>(<a href="string.md#0x1_string_String">String</a>{bytes})
+    } <b>else</b> {
+        <a href="option.md#0x1_option_none">option::none</a>()
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_string_bytes"></a>
+
+## Function `bytes`
+
+Returns a reference to the underlying byte vector.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_bytes">bytes</a>(s: &<a href="string.md#0x1_string_String">string::String</a>): &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_bytes">bytes</a>(s: &<a href="string.md#0x1_string_String">String</a>): &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt; {
+    &s.bytes
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_string_is_empty"></a>
+
+## Function `is_empty`
+
+Checks whether this string is empty.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_is_empty">is_empty</a>(s: &<a href="string.md#0x1_string_String">string::String</a>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_is_empty">is_empty</a>(s: &<a href="string.md#0x1_string_String">String</a>): bool {
+    <a href="vector.md#0x1_vector_is_empty">vector::is_empty</a>(&s.bytes)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_string_length"></a>
+
+## Function `length`
+
+Returns the length of this string, in bytes.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_length">length</a>(s: &<a href="string.md#0x1_string_String">string::String</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_length">length</a>(s: &<a href="string.md#0x1_string_String">String</a>): u64 {
+    <a href="vector.md#0x1_vector_length">vector::length</a>(&s.bytes)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_string_append"></a>
+
+## Function `append`
+
+Appends a string.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_append">append</a>(s: &<b>mut</b> <a href="string.md#0x1_string_String">string::String</a>, r: <a href="string.md#0x1_string_String">string::String</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_append">append</a>(s: &<b>mut</b> <a href="string.md#0x1_string_String">String</a>, r: <a href="string.md#0x1_string_String">String</a>) {
+    <a href="vector.md#0x1_vector_append">vector::append</a>(&<b>mut</b> s.bytes, r.bytes)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_string_append_utf8"></a>
+
+## Function `append_utf8`
+
+Appends bytes which must be in valid utf8 format.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_append_utf8">append_utf8</a>(s: &<b>mut</b> <a href="string.md#0x1_string_String">string::String</a>, bytes: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_append_utf8">append_utf8</a>(s: &<b>mut</b> <a href="string.md#0x1_string_String">String</a>, bytes: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;) {
+    <a href="string.md#0x1_string_append">append</a>(s, <a href="string.md#0x1_string_utf8">utf8</a>(bytes))
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_string_insert"></a>
+
+## Function `insert`
+
+Insert the other string at the byte index in given string. The index must be at a valid utf8 char
+boundary.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_insert">insert</a>(s: &<b>mut</b> <a href="string.md#0x1_string_String">string::String</a>, at: u64, o: <a href="string.md#0x1_string_String">string::String</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_insert">insert</a>(s: &<b>mut</b> <a href="string.md#0x1_string_String">String</a>, at: u64, o: <a href="string.md#0x1_string_String">String</a>) {
+    <b>let</b> bytes = &s.bytes;
+    <b>assert</b>!(at &lt;= <a href="vector.md#0x1_vector_length">vector::length</a>(bytes) && <a href="string.md#0x1_string_internal_is_char_boundary">internal_is_char_boundary</a>(bytes, at), <a href="string.md#0x1_string_EINVALID_INDEX">EINVALID_INDEX</a>);
+    <b>let</b> l = <a href="string.md#0x1_string_length">length</a>(s);
+    <b>let</b> front = <a href="string.md#0x1_string_sub_string">sub_string</a>(s, 0, at);
+    <b>let</b> end = <a href="string.md#0x1_string_sub_string">sub_string</a>(s, at, l);
+    <a href="string.md#0x1_string_append">append</a>(&<b>mut</b> front, o);
+    <a href="string.md#0x1_string_append">append</a>(&<b>mut</b> front, end);
+    *s = front;
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_string_sub_string"></a>
+
+## Function `sub_string`
+
+Returns a sub-string using the given byte indices, where <code>i</code> is the first byte position and <code>j</code> is the start
+of the first byte not included (or the length of the string). The indices must be at valid utf8 char boundaries,
+guaranteeing that the result is valid utf8.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_sub_string">sub_string</a>(s: &<a href="string.md#0x1_string_String">string::String</a>, i: u64, j: u64): <a href="string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_sub_string">sub_string</a>(s: &<a href="string.md#0x1_string_String">String</a>, i: u64, j: u64): <a href="string.md#0x1_string_String">String</a> {
+    <b>let</b> bytes = &s.bytes;
+    <b>let</b> l = <a href="vector.md#0x1_vector_length">vector::length</a>(bytes);
+    <b>assert</b>!(
+        j &lt;= l && i &lt;= j && <a href="string.md#0x1_string_internal_is_char_boundary">internal_is_char_boundary</a>(bytes, i) && <a href="string.md#0x1_string_internal_is_char_boundary">internal_is_char_boundary</a>(bytes, j),
+        <a href="string.md#0x1_string_EINVALID_INDEX">EINVALID_INDEX</a>
+    );
+    <a href="string.md#0x1_string_String">String</a> { bytes: <a href="string.md#0x1_string_internal_sub_string">internal_sub_string</a>(bytes, i, j) }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_string_index_of"></a>
+
+## Function `index_of`
+
+Computes the index of the first occurrence of a string. Returns <code><a href="string.md#0x1_string_length">length</a>(s)</code> if no occurrence found.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_index_of">index_of</a>(s: &<a href="string.md#0x1_string_String">string::String</a>, r: &<a href="string.md#0x1_string_String">string::String</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_index_of">index_of</a>(s: &<a href="string.md#0x1_string_String">String</a>, r: &<a href="string.md#0x1_string_String">String</a>): u64 {
+    <a href="string.md#0x1_string_internal_index_of">internal_index_of</a>(&s.bytes, &r.bytes)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_string_internal_check_utf8"></a>
+
+## Function `internal_check_utf8`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_internal_check_utf8">internal_check_utf8</a>(v: &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>native</b> <b>fun</b> <a href="string.md#0x1_string_internal_check_utf8">internal_check_utf8</a>(v: &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_string_internal_is_char_boundary"></a>
+
+## Function `internal_is_char_boundary`
+
+
+
+<pre><code><b>fun</b> <a href="string.md#0x1_string_internal_is_char_boundary">internal_is_char_boundary</a>(v: &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;, i: u64): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="string.md#0x1_string_internal_is_char_boundary">internal_is_char_boundary</a>(v: &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;, i: u64): bool;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_string_internal_sub_string"></a>
+
+## Function `internal_sub_string`
+
+
+
+<pre><code><b>fun</b> <a href="string.md#0x1_string_internal_sub_string">internal_sub_string</a>(v: &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;, i: u64, j: u64): <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="string.md#0x1_string_internal_sub_string">internal_sub_string</a>(v: &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;, i: u64, j: u64): <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_string_internal_index_of"></a>
+
+## Function `internal_index_of`
+
+
+
+<pre><code><b>fun</b> <a href="string.md#0x1_string_internal_index_of">internal_index_of</a>(v: &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;, r: &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="string.md#0x1_string_internal_index_of">internal_index_of</a>(v: &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;, r: &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): u64;
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+<a id="@Specification_1_internal_check_utf8"></a>
+
+### Function `internal_check_utf8`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_internal_check_utf8">internal_check_utf8</a>(v: &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> [abstract] <b>false</b>;
+<b>ensures</b> [abstract] result == <a href="string.md#0x1_string_spec_internal_check_utf8">spec_internal_check_utf8</a>(v);
+</code></pre>
+
+
+
+<a id="@Specification_1_internal_is_char_boundary"></a>
+
+### Function `internal_is_char_boundary`
+
+
+<pre><code><b>fun</b> <a href="string.md#0x1_string_internal_is_char_boundary">internal_is_char_boundary</a>(v: &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;, i: u64): bool
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> [abstract] <b>false</b>;
+<b>ensures</b> [abstract] result == <a href="string.md#0x1_string_spec_internal_is_char_boundary">spec_internal_is_char_boundary</a>(v, i);
+</code></pre>
+
+
+
+<a id="@Specification_1_internal_sub_string"></a>
+
+### Function `internal_sub_string`
+
+
+<pre><code><b>fun</b> <a href="string.md#0x1_string_internal_sub_string">internal_sub_string</a>(v: &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;, i: u64, j: u64): <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> [abstract] <b>false</b>;
+<b>ensures</b> [abstract] result == <a href="string.md#0x1_string_spec_internal_sub_string">spec_internal_sub_string</a>(v, i, j);
+</code></pre>
+
+
+
+<a id="@Specification_1_internal_index_of"></a>
+
+### Function `internal_index_of`
+
+
+<pre><code><b>fun</b> <a href="string.md#0x1_string_internal_index_of">internal_index_of</a>(v: &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;, r: &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): u64
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> [abstract] <b>false</b>;
+<b>ensures</b> [abstract] result == <a href="string.md#0x1_string_spec_internal_index_of">spec_internal_index_of</a>(v, r);
+</code></pre>
+
+
+
+
+<a id="0x1_string_spec_utf8"></a>
+
+
+<pre><code><b>fun</b> <a href="string.md#0x1_string_spec_utf8">spec_utf8</a>(bytes: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="string.md#0x1_string_String">String</a> {
+   <a href="string.md#0x1_string_String">String</a>{bytes}
+}
+</code></pre>
+
+
+
+
+<a id="0x1_string_spec_internal_check_utf8"></a>
+
+
+<pre><code><b>fun</b> <a href="string.md#0x1_string_spec_internal_check_utf8">spec_internal_check_utf8</a>(v: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool;
+<a id="0x1_string_spec_internal_is_char_boundary"></a>
+<b>fun</b> <a href="string.md#0x1_string_spec_internal_is_char_boundary">spec_internal_is_char_boundary</a>(v: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;, i: u64): bool;
+<a id="0x1_string_spec_internal_sub_string"></a>
+<b>fun</b> <a href="string.md#0x1_string_spec_internal_sub_string">spec_internal_sub_string</a>(v: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;, i: u64, j: u64): <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+<a id="0x1_string_spec_internal_index_of"></a>
+<b>fun</b> <a href="string.md#0x1_string_spec_internal_index_of">spec_internal_index_of</a>(v: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;, r: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): u64;
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/move-stdlib/tests/compiler-v2-doc/vector.md b/aptos-move/framework/move-stdlib/tests/compiler-v2-doc/vector.md
new file mode 100644
index 0000000000000..eee7cac04edc8
--- /dev/null
+++ b/aptos-move/framework/move-stdlib/tests/compiler-v2-doc/vector.md
@@ -0,0 +1,2033 @@
+
+<a id="0x1_vector"></a>
+
+# Module `0x1::vector`
+
+A variable-sized container that can hold any type. Indexing is 0-based, and
+vectors are growable. This module has many native functions.
+Verification of modules that use this one uses model functions that are implemented
+directly in Boogie. The specification language has built-in functions operations such
+as <code>singleton_vector</code>. There are some helper functions defined here for specifications in other
+modules as well.
+
+>Note: We did not verify most of the
+Move functions here because many have loops, requiring loop invariants to prove, and
+the return on investment didn't seem worth it for these simple functions.
+
+
+-  [Constants](#@Constants_0)
+-  [Function `empty`](#0x1_vector_empty)
+-  [Function `length`](#0x1_vector_length)
+-  [Function `borrow`](#0x1_vector_borrow)
+-  [Function `push_back`](#0x1_vector_push_back)
+-  [Function `borrow_mut`](#0x1_vector_borrow_mut)
+-  [Function `pop_back`](#0x1_vector_pop_back)
+-  [Function `destroy_empty`](#0x1_vector_destroy_empty)
+-  [Function `swap`](#0x1_vector_swap)
+-  [Function `singleton`](#0x1_vector_singleton)
+-  [Function `reverse`](#0x1_vector_reverse)
+-  [Function `reverse_slice`](#0x1_vector_reverse_slice)
+-  [Function `append`](#0x1_vector_append)
+-  [Function `reverse_append`](#0x1_vector_reverse_append)
+-  [Function `trim`](#0x1_vector_trim)
+-  [Function `trim_reverse`](#0x1_vector_trim_reverse)
+-  [Function `is_empty`](#0x1_vector_is_empty)
+-  [Function `contains`](#0x1_vector_contains)
+-  [Function `index_of`](#0x1_vector_index_of)
+-  [Function `find`](#0x1_vector_find)
+-  [Function `insert`](#0x1_vector_insert)
+-  [Function `remove`](#0x1_vector_remove)
+-  [Function `remove_value`](#0x1_vector_remove_value)
+-  [Function `swap_remove`](#0x1_vector_swap_remove)
+-  [Function `for_each`](#0x1_vector_for_each)
+-  [Function `for_each_reverse`](#0x1_vector_for_each_reverse)
+-  [Function `for_each_ref`](#0x1_vector_for_each_ref)
+-  [Function `zip`](#0x1_vector_zip)
+-  [Function `zip_reverse`](#0x1_vector_zip_reverse)
+-  [Function `zip_ref`](#0x1_vector_zip_ref)
+-  [Function `enumerate_ref`](#0x1_vector_enumerate_ref)
+-  [Function `for_each_mut`](#0x1_vector_for_each_mut)
+-  [Function `zip_mut`](#0x1_vector_zip_mut)
+-  [Function `enumerate_mut`](#0x1_vector_enumerate_mut)
+-  [Function `fold`](#0x1_vector_fold)
+-  [Function `foldr`](#0x1_vector_foldr)
+-  [Function `map_ref`](#0x1_vector_map_ref)
+-  [Function `zip_map_ref`](#0x1_vector_zip_map_ref)
+-  [Function `map`](#0x1_vector_map)
+-  [Function `zip_map`](#0x1_vector_zip_map)
+-  [Function `filter`](#0x1_vector_filter)
+-  [Function `partition`](#0x1_vector_partition)
+-  [Function `rotate`](#0x1_vector_rotate)
+-  [Function `rotate_slice`](#0x1_vector_rotate_slice)
+-  [Function `stable_partition`](#0x1_vector_stable_partition)
+-  [Function `any`](#0x1_vector_any)
+-  [Function `all`](#0x1_vector_all)
+-  [Function `destroy`](#0x1_vector_destroy)
+-  [Function `range`](#0x1_vector_range)
+-  [Function `range_with_step`](#0x1_vector_range_with_step)
+-  [Function `slice`](#0x1_vector_slice)
+-  [Specification](#@Specification_1)
+    -  [Helper Functions](#@Helper_Functions_2)
+    -  [Function `singleton`](#@Specification_1_singleton)
+    -  [Function `reverse`](#@Specification_1_reverse)
+    -  [Function `reverse_slice`](#@Specification_1_reverse_slice)
+    -  [Function `append`](#@Specification_1_append)
+    -  [Function `reverse_append`](#@Specification_1_reverse_append)
+    -  [Function `trim`](#@Specification_1_trim)
+    -  [Function `trim_reverse`](#@Specification_1_trim_reverse)
+    -  [Function `is_empty`](#@Specification_1_is_empty)
+    -  [Function `contains`](#@Specification_1_contains)
+    -  [Function `index_of`](#@Specification_1_index_of)
+    -  [Function `insert`](#@Specification_1_insert)
+    -  [Function `remove`](#@Specification_1_remove)
+    -  [Function `remove_value`](#@Specification_1_remove_value)
+    -  [Function `swap_remove`](#@Specification_1_swap_remove)
+    -  [Function `rotate`](#@Specification_1_rotate)
+    -  [Function `rotate_slice`](#@Specification_1_rotate_slice)
+
+
+<pre><code></code></pre>
+
+
+
+<a id="@Constants_0"></a>
+
+## Constants
+
+
+<a id="0x1_vector_EINDEX_OUT_OF_BOUNDS"></a>
+
+The index into the vector is out of bounds
+
+
+<pre><code><b>const</b> <a href="vector.md#0x1_vector_EINDEX_OUT_OF_BOUNDS">EINDEX_OUT_OF_BOUNDS</a>: u64 = 131072;
+</code></pre>
+
+
+
+<a id="0x1_vector_EINVALID_RANGE"></a>
+
+The index into the vector is out of bounds
+
+
+<pre><code><b>const</b> <a href="vector.md#0x1_vector_EINVALID_RANGE">EINVALID_RANGE</a>: u64 = 131073;
+</code></pre>
+
+
+
+<a id="0x1_vector_EINVALID_SLICE_RANGE"></a>
+
+The range in <code>slice</code> is invalid.
+
+
+<pre><code><b>const</b> <a href="vector.md#0x1_vector_EINVALID_SLICE_RANGE">EINVALID_SLICE_RANGE</a>: u64 = 131076;
+</code></pre>
+
+
+
+<a id="0x1_vector_EINVALID_STEP"></a>
+
+The step provided in <code>range</code> is invalid, must be greater than zero.
+
+
+<pre><code><b>const</b> <a href="vector.md#0x1_vector_EINVALID_STEP">EINVALID_STEP</a>: u64 = 131075;
+</code></pre>
+
+
+
+<a id="0x1_vector_EVECTORS_LENGTH_MISMATCH"></a>
+
+The length of the vectors are not equal.
+
+
+<pre><code><b>const</b> <a href="vector.md#0x1_vector_EVECTORS_LENGTH_MISMATCH">EVECTORS_LENGTH_MISMATCH</a>: u64 = 131074;
+</code></pre>
+
+
+
+<a id="0x1_vector_empty"></a>
+
+## Function `empty`
+
+Create an empty vector.
+
+
+<pre><code>#[bytecode_instruction]
+<b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_empty">empty</a>&lt;Element&gt;(): <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_empty">empty</a>&lt;Element&gt;(): <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vector_length"></a>
+
+## Function `length`
+
+Return the length of the vector.
+
+
+<pre><code>#[bytecode_instruction]
+<b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_length">length</a>&lt;Element&gt;(v: &<a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_length">length</a>&lt;Element&gt;(v: &<a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;): u64;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vector_borrow"></a>
+
+## Function `borrow`
+
+Acquire an immutable reference to the <code>i</code>th element of the vector <code>v</code>.
+Aborts if <code>i</code> is out of bounds.
+
+
+<pre><code>#[bytecode_instruction]
+<b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_borrow">borrow</a>&lt;Element&gt;(v: &<a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, i: u64): &Element
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_borrow">borrow</a>&lt;Element&gt;(v: &<a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, i: u64): &Element;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vector_push_back"></a>
+
+## Function `push_back`
+
+Add element <code>e</code> to the end of the vector <code>v</code>.
+
+
+<pre><code>#[bytecode_instruction]
+<b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_push_back">push_back</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, e: Element)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_push_back">push_back</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, e: Element);
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vector_borrow_mut"></a>
+
+## Function `borrow_mut`
+
+Return a mutable reference to the <code>i</code>th element in the vector <code>v</code>.
+Aborts if <code>i</code> is out of bounds.
+
+
+<pre><code>#[bytecode_instruction]
+<b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_borrow_mut">borrow_mut</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, i: u64): &<b>mut</b> Element
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_borrow_mut">borrow_mut</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, i: u64): &<b>mut</b> Element;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vector_pop_back"></a>
+
+## Function `pop_back`
+
+Pop an element from the end of vector <code>v</code>.
+Aborts if <code>v</code> is empty.
+
+
+<pre><code>#[bytecode_instruction]
+<b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_pop_back">pop_back</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;): Element
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_pop_back">pop_back</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;): Element;
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vector_destroy_empty"></a>
+
+## Function `destroy_empty`
+
+Destroy the vector <code>v</code>.
+Aborts if <code>v</code> is not empty.
+
+
+<pre><code>#[bytecode_instruction]
+<b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_destroy_empty">destroy_empty</a>&lt;Element&gt;(v: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_destroy_empty">destroy_empty</a>&lt;Element&gt;(v: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;);
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vector_swap"></a>
+
+## Function `swap`
+
+Swaps the elements at the <code>i</code>th and <code>j</code>th indices in the vector <code>v</code>.
+Aborts if <code>i</code> or <code>j</code> is out of bounds.
+
+
+<pre><code>#[bytecode_instruction]
+<b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_swap">swap</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, i: u64, j: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_swap">swap</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, i: u64, j: u64);
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vector_singleton"></a>
+
+## Function `singleton`
+
+Return an vector of size one containing element <code>e</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_singleton">singleton</a>&lt;Element&gt;(e: Element): <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_singleton">singleton</a>&lt;Element&gt;(e: Element): <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt; {
+    <b>let</b> v = <a href="vector.md#0x1_vector_empty">empty</a>();
+    <a href="vector.md#0x1_vector_push_back">push_back</a>(&<b>mut</b> v, e);
+    v
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vector_reverse"></a>
+
+## Function `reverse`
+
+Reverses the order of the elements in the vector <code>v</code> in place.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_reverse">reverse</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_reverse">reverse</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;) {
+    <b>let</b> len = <a href="vector.md#0x1_vector_length">length</a>(v);
+    <a href="vector.md#0x1_vector_reverse_slice">reverse_slice</a>(v, 0, len);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vector_reverse_slice"></a>
+
+## Function `reverse_slice`
+
+Reverses the order of the elements [left, right) in the vector <code>v</code> in place.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_reverse_slice">reverse_slice</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, left: u64, right: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_reverse_slice">reverse_slice</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, left: u64, right: u64) {
+    <b>assert</b>!(left &lt;= right, <a href="vector.md#0x1_vector_EINVALID_RANGE">EINVALID_RANGE</a>);
+    <b>if</b> (left == right) <b>return</b>;
+    right = right - 1;
+    <b>while</b> (left &lt; right) {
+        <a href="vector.md#0x1_vector_swap">swap</a>(v, left, right);
+        left = left + 1;
+        right = right - 1;
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vector_append"></a>
+
+## Function `append`
+
+Pushes all of the elements of the <code>other</code> vector into the <code>lhs</code> vector.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_append">append</a>&lt;Element&gt;(lhs: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, other: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_append">append</a>&lt;Element&gt;(lhs: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, other: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;) {
+    <a href="vector.md#0x1_vector_reverse">reverse</a>(&<b>mut</b> other);
+    <a href="vector.md#0x1_vector_reverse_append">reverse_append</a>(lhs, other);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vector_reverse_append"></a>
+
+## Function `reverse_append`
+
+Pushes all of the elements of the <code>other</code> vector into the <code>lhs</code> vector.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_reverse_append">reverse_append</a>&lt;Element&gt;(lhs: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, other: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_reverse_append">reverse_append</a>&lt;Element&gt;(lhs: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, other: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;) {
+    <b>let</b> len = <a href="vector.md#0x1_vector_length">length</a>(&other);
+    <b>while</b> (len &gt; 0) {
+        <a href="vector.md#0x1_vector_push_back">push_back</a>(lhs, <a href="vector.md#0x1_vector_pop_back">pop_back</a>(&<b>mut</b> other));
+        len = len - 1;
+    };
+    <a href="vector.md#0x1_vector_destroy_empty">destroy_empty</a>(other);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vector_trim"></a>
+
+## Function `trim`
+
+Trim a vector to a smaller size, returning the evicted elements in order
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_trim">trim</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, new_len: u64): <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_trim">trim</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, new_len: u64): <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt; {
+    <b>let</b> res = <a href="vector.md#0x1_vector_trim_reverse">trim_reverse</a>(v, new_len);
+    <a href="vector.md#0x1_vector_reverse">reverse</a>(&<b>mut</b> res);
+    res
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vector_trim_reverse"></a>
+
+## Function `trim_reverse`
+
+Trim a vector to a smaller size, returning the evicted elements in reverse order
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_trim_reverse">trim_reverse</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, new_len: u64): <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_trim_reverse">trim_reverse</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, new_len: u64): <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt; {
+    <b>let</b> len = <a href="vector.md#0x1_vector_length">length</a>(v);
+    <b>assert</b>!(new_len &lt;= len, <a href="vector.md#0x1_vector_EINDEX_OUT_OF_BOUNDS">EINDEX_OUT_OF_BOUNDS</a>);
+    <b>let</b> result = <a href="vector.md#0x1_vector_empty">empty</a>();
+    <b>while</b> (new_len &lt; len) {
+        <a href="vector.md#0x1_vector_push_back">push_back</a>(&<b>mut</b> result, <a href="vector.md#0x1_vector_pop_back">pop_back</a>(v));
+        len = len - 1;
+    };
+    result
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vector_is_empty"></a>
+
+## Function `is_empty`
+
+Return <code><b>true</b></code> if the vector <code>v</code> has no elements and <code><b>false</b></code> otherwise.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_is_empty">is_empty</a>&lt;Element&gt;(v: &<a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_is_empty">is_empty</a>&lt;Element&gt;(v: &<a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;): bool {
+    <a href="vector.md#0x1_vector_length">length</a>(v) == 0
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vector_contains"></a>
+
+## Function `contains`
+
+Return true if <code>e</code> is in the vector <code>v</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_contains">contains</a>&lt;Element&gt;(v: &<a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, e: &Element): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_contains">contains</a>&lt;Element&gt;(v: &<a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, e: &Element): bool {
+    <b>let</b> i = 0;
+    <b>let</b> len = <a href="vector.md#0x1_vector_length">length</a>(v);
+    <b>while</b> (i &lt; len) {
+        <b>if</b> (<a href="vector.md#0x1_vector_borrow">borrow</a>(v, i) == e) <b>return</b> <b>true</b>;
+        i = i + 1;
+    };
+    <b>false</b>
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vector_index_of"></a>
+
+## Function `index_of`
+
+Return <code>(<b>true</b>, i)</code> if <code>e</code> is in the vector <code>v</code> at index <code>i</code>.
+Otherwise, returns <code>(<b>false</b>, 0)</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_index_of">index_of</a>&lt;Element&gt;(v: &<a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, e: &Element): (bool, u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_index_of">index_of</a>&lt;Element&gt;(v: &<a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, e: &Element): (bool, u64) {
+    <b>let</b> i = 0;
+    <b>let</b> len = <a href="vector.md#0x1_vector_length">length</a>(v);
+    <b>while</b> (i &lt; len) {
+        <b>if</b> (<a href="vector.md#0x1_vector_borrow">borrow</a>(v, i) == e) <b>return</b> (<b>true</b>, i);
+        i = i + 1;
+    };
+    (<b>false</b>, 0)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vector_find"></a>
+
+## Function `find`
+
+Return <code>(<b>true</b>, i)</code> if there's an element that matches the predicate. If there are multiple elements that match
+the predicate, only the index of the first one is returned.
+Otherwise, returns <code>(<b>false</b>, 0)</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_find">find</a>&lt;Element&gt;(v: &<a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, f: |&Element|bool): (bool, u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="vector.md#0x1_vector_find">find</a>&lt;Element&gt;(v: &<a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, f: |&Element|bool): (bool, u64) {
+    <b>let</b> find = <b>false</b>;
+    <b>let</b> found_index = 0;
+    <b>let</b> i = 0;
+    <b>let</b> len = <a href="vector.md#0x1_vector_length">length</a>(v);
+    <b>while</b> (i &lt; len) {
+        // Cannot call <b>return</b> in an inline function so we need <b>to</b> resort <b>to</b> <b>break</b> here.
+        <b>if</b> (f(<a href="vector.md#0x1_vector_borrow">borrow</a>(v, i))) {
+            find = <b>true</b>;
+            found_index = i;
+            <b>break</b>
+        };
+        i = i + 1;
+    };
+    (find, found_index)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vector_insert"></a>
+
+## Function `insert`
+
+Insert a new element at position 0 <= i <= length, using O(length - i) time.
+Aborts if out of bounds.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_insert">insert</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, i: u64, e: Element)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_insert">insert</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, i: u64, e: Element) {
+    <b>let</b> len = <a href="vector.md#0x1_vector_length">length</a>(v);
+    <b>assert</b>!(i &lt;= len, <a href="vector.md#0x1_vector_EINDEX_OUT_OF_BOUNDS">EINDEX_OUT_OF_BOUNDS</a>);
+    <a href="vector.md#0x1_vector_push_back">push_back</a>(v, e);
+    <b>while</b> (i &lt; len) {
+        <a href="vector.md#0x1_vector_swap">swap</a>(v, i, len);
+        i = i + 1;
+    };
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vector_remove"></a>
+
+## Function `remove`
+
+Remove the <code>i</code>th element of the vector <code>v</code>, shifting all subsequent elements.
+This is O(n) and preserves ordering of elements in the vector.
+Aborts if <code>i</code> is out of bounds.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_remove">remove</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, i: u64): Element
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_remove">remove</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, i: u64): Element {
+    <b>let</b> len = <a href="vector.md#0x1_vector_length">length</a>(v);
+    // i out of bounds; <b>abort</b>
+    <b>if</b> (i &gt;= len) <b>abort</b> <a href="vector.md#0x1_vector_EINDEX_OUT_OF_BOUNDS">EINDEX_OUT_OF_BOUNDS</a>;
+
+    len = len - 1;
+    <b>while</b> (i &lt; len) <a href="vector.md#0x1_vector_swap">swap</a>(v, i, { i = i + 1; i });
+    <a href="vector.md#0x1_vector_pop_back">pop_back</a>(v)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vector_remove_value"></a>
+
+## Function `remove_value`
+
+Remove the first occurrence of a given value in the vector <code>v</code> and return it in a vector, shifting all
+subsequent elements.
+This is O(n) and preserves ordering of elements in the vector.
+This returns an empty vector if the value isn't present in the vector.
+Note that this cannot return an option as option uses vector and there'd be a circular dependency between option
+and vector.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_remove_value">remove_value</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, val: &Element): <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_remove_value">remove_value</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, val: &Element): <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt; {
+    // This doesn't cost a O(2N) run time <b>as</b> index_of scans from left <b>to</b> right and stops when the element is found,
+    // <b>while</b> remove would <b>continue</b> from the identified index <b>to</b> the end of the <a href="vector.md#0x1_vector">vector</a>.
+    <b>let</b> (found, index) = <a href="vector.md#0x1_vector_index_of">index_of</a>(v, val);
+    <b>if</b> (found) {
+        <a href="vector.md#0x1_vector">vector</a>[<a href="vector.md#0x1_vector_remove">remove</a>(v, index)]
+    } <b>else</b> {
+       <a href="vector.md#0x1_vector">vector</a>[]
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vector_swap_remove"></a>
+
+## Function `swap_remove`
+
+Swap the <code>i</code>th element of the vector <code>v</code> with the last element and then pop the vector.
+This is O(1), but does not preserve ordering of elements in the vector.
+Aborts if <code>i</code> is out of bounds.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_swap_remove">swap_remove</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, i: u64): Element
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_swap_remove">swap_remove</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, i: u64): Element {
+    <b>assert</b>!(!<a href="vector.md#0x1_vector_is_empty">is_empty</a>(v), <a href="vector.md#0x1_vector_EINDEX_OUT_OF_BOUNDS">EINDEX_OUT_OF_BOUNDS</a>);
+    <b>let</b> last_idx = <a href="vector.md#0x1_vector_length">length</a>(v) - 1;
+    <a href="vector.md#0x1_vector_swap">swap</a>(v, i, last_idx);
+    <a href="vector.md#0x1_vector_pop_back">pop_back</a>(v)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vector_for_each"></a>
+
+## Function `for_each`
+
+Apply the function to each element in the vector, consuming it.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_for_each">for_each</a>&lt;Element&gt;(v: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, f: |Element|)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="vector.md#0x1_vector_for_each">for_each</a>&lt;Element&gt;(v: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, f: |Element|) {
+    <a href="vector.md#0x1_vector_reverse">reverse</a>(&<b>mut</b> v); // We need <b>to</b> reverse the <a href="vector.md#0x1_vector">vector</a> <b>to</b> consume it efficiently
+    <a href="vector.md#0x1_vector_for_each_reverse">for_each_reverse</a>(v, |e| f(e));
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vector_for_each_reverse"></a>
+
+## Function `for_each_reverse`
+
+Apply the function to each element in the vector, consuming it.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_for_each_reverse">for_each_reverse</a>&lt;Element&gt;(v: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, f: |Element|)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="vector.md#0x1_vector_for_each_reverse">for_each_reverse</a>&lt;Element&gt;(v: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, f: |Element|) {
+    <b>let</b> len = <a href="vector.md#0x1_vector_length">length</a>(&v);
+    <b>while</b> (len &gt; 0) {
+        f(<a href="vector.md#0x1_vector_pop_back">pop_back</a>(&<b>mut</b> v));
+        len = len - 1;
+    };
+    <a href="vector.md#0x1_vector_destroy_empty">destroy_empty</a>(v)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vector_for_each_ref"></a>
+
+## Function `for_each_ref`
+
+Apply the function to a reference of each element in the vector.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_for_each_ref">for_each_ref</a>&lt;Element&gt;(v: &<a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, f: |&Element|)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="vector.md#0x1_vector_for_each_ref">for_each_ref</a>&lt;Element&gt;(v: &<a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, f: |&Element|) {
+    <b>let</b> i = 0;
+    <b>let</b> len = <a href="vector.md#0x1_vector_length">length</a>(v);
+    <b>while</b> (i &lt; len) {
+        f(<a href="vector.md#0x1_vector_borrow">borrow</a>(v, i));
+        i = i + 1
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vector_zip"></a>
+
+## Function `zip`
+
+Apply the function to each pair of elements in the two given vectors, consuming them.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_zip">zip</a>&lt;Element1, Element2&gt;(v1: <a href="vector.md#0x1_vector">vector</a>&lt;Element1&gt;, v2: <a href="vector.md#0x1_vector">vector</a>&lt;Element2&gt;, f: |(Element1, Element2)|)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="vector.md#0x1_vector_zip">zip</a>&lt;Element1, Element2&gt;(v1: <a href="vector.md#0x1_vector">vector</a>&lt;Element1&gt;, v2: <a href="vector.md#0x1_vector">vector</a>&lt;Element2&gt;, f: |Element1, Element2|) {
+    // We need <b>to</b> reverse the vectors <b>to</b> consume it efficiently
+    <a href="vector.md#0x1_vector_reverse">reverse</a>(&<b>mut</b> v1);
+    <a href="vector.md#0x1_vector_reverse">reverse</a>(&<b>mut</b> v2);
+    <a href="vector.md#0x1_vector_zip_reverse">zip_reverse</a>(v1, v2, |e1, e2| f(e1, e2));
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vector_zip_reverse"></a>
+
+## Function `zip_reverse`
+
+Apply the function to each pair of elements in the two given vectors in the reverse order, consuming them.
+This errors out if the vectors are not of the same length.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_zip_reverse">zip_reverse</a>&lt;Element1, Element2&gt;(v1: <a href="vector.md#0x1_vector">vector</a>&lt;Element1&gt;, v2: <a href="vector.md#0x1_vector">vector</a>&lt;Element2&gt;, f: |(Element1, Element2)|)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="vector.md#0x1_vector_zip_reverse">zip_reverse</a>&lt;Element1, Element2&gt;(
+    v1: <a href="vector.md#0x1_vector">vector</a>&lt;Element1&gt;,
+    v2: <a href="vector.md#0x1_vector">vector</a>&lt;Element2&gt;,
+    f: |Element1, Element2|,
+) {
+    <b>let</b> len = <a href="vector.md#0x1_vector_length">length</a>(&v1);
+    // We can't <b>use</b> the constant <a href="vector.md#0x1_vector_EVECTORS_LENGTH_MISMATCH">EVECTORS_LENGTH_MISMATCH</a> here <b>as</b> all calling code would then need <b>to</b> define it
+    // due <b>to</b> how inline functions work.
+    <b>assert</b>!(len == <a href="vector.md#0x1_vector_length">length</a>(&v2), 0x20002);
+    <b>while</b> (len &gt; 0) {
+        f(<a href="vector.md#0x1_vector_pop_back">pop_back</a>(&<b>mut</b> v1), <a href="vector.md#0x1_vector_pop_back">pop_back</a>(&<b>mut</b> v2));
+        len = len - 1;
+    };
+    <a href="vector.md#0x1_vector_destroy_empty">destroy_empty</a>(v1);
+    <a href="vector.md#0x1_vector_destroy_empty">destroy_empty</a>(v2);
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vector_zip_ref"></a>
+
+## Function `zip_ref`
+
+Apply the function to the references of each pair of elements in the two given vectors.
+This errors out if the vectors are not of the same length.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_zip_ref">zip_ref</a>&lt;Element1, Element2&gt;(v1: &<a href="vector.md#0x1_vector">vector</a>&lt;Element1&gt;, v2: &<a href="vector.md#0x1_vector">vector</a>&lt;Element2&gt;, f: |(&Element1, &Element2)|)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="vector.md#0x1_vector_zip_ref">zip_ref</a>&lt;Element1, Element2&gt;(
+    v1: &<a href="vector.md#0x1_vector">vector</a>&lt;Element1&gt;,
+    v2: &<a href="vector.md#0x1_vector">vector</a>&lt;Element2&gt;,
+    f: |&Element1, &Element2|,
+) {
+    <b>let</b> len = <a href="vector.md#0x1_vector_length">length</a>(v1);
+    // We can't <b>use</b> the constant <a href="vector.md#0x1_vector_EVECTORS_LENGTH_MISMATCH">EVECTORS_LENGTH_MISMATCH</a> here <b>as</b> all calling code would then need <b>to</b> define it
+    // due <b>to</b> how inline functions work.
+    <b>assert</b>!(len == <a href="vector.md#0x1_vector_length">length</a>(v2), 0x20002);
+    <b>let</b> i = 0;
+    <b>while</b> (i &lt; len) {
+        f(<a href="vector.md#0x1_vector_borrow">borrow</a>(v1, i), <a href="vector.md#0x1_vector_borrow">borrow</a>(v2, i));
+        i = i + 1
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vector_enumerate_ref"></a>
+
+## Function `enumerate_ref`
+
+Apply the function to a reference of each element in the vector with its index.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_enumerate_ref">enumerate_ref</a>&lt;Element&gt;(v: &<a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, f: |(u64, &Element)|)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="vector.md#0x1_vector_enumerate_ref">enumerate_ref</a>&lt;Element&gt;(v: &<a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, f: |u64, &Element|) {
+    <b>let</b> i = 0;
+    <b>let</b> len = <a href="vector.md#0x1_vector_length">length</a>(v);
+    <b>while</b> (i &lt; len) {
+        f(i, <a href="vector.md#0x1_vector_borrow">borrow</a>(v, i));
+        i = i + 1;
+    };
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vector_for_each_mut"></a>
+
+## Function `for_each_mut`
+
+Apply the function to a mutable reference to each element in the vector.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_for_each_mut">for_each_mut</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, f: |&<b>mut</b> Element|)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="vector.md#0x1_vector_for_each_mut">for_each_mut</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, f: |&<b>mut</b> Element|) {
+    <b>let</b> i = 0;
+    <b>let</b> len = <a href="vector.md#0x1_vector_length">length</a>(v);
+    <b>while</b> (i &lt; len) {
+        f(<a href="vector.md#0x1_vector_borrow_mut">borrow_mut</a>(v, i));
+        i = i + 1
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vector_zip_mut"></a>
+
+## Function `zip_mut`
+
+Apply the function to mutable references to each pair of elements in the two given vectors.
+This errors out if the vectors are not of the same length.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_zip_mut">zip_mut</a>&lt;Element1, Element2&gt;(v1: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element1&gt;, v2: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element2&gt;, f: |(&<b>mut</b> Element1, &<b>mut</b> Element2)|)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="vector.md#0x1_vector_zip_mut">zip_mut</a>&lt;Element1, Element2&gt;(
+    v1: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element1&gt;,
+    v2: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element2&gt;,
+    f: |&<b>mut</b> Element1, &<b>mut</b> Element2|,
+) {
+    <b>let</b> i = 0;
+    <b>let</b> len = <a href="vector.md#0x1_vector_length">length</a>(v1);
+    // We can't <b>use</b> the constant <a href="vector.md#0x1_vector_EVECTORS_LENGTH_MISMATCH">EVECTORS_LENGTH_MISMATCH</a> here <b>as</b> all calling code would then need <b>to</b> define it
+    // due <b>to</b> how inline functions work.
+    <b>assert</b>!(len == <a href="vector.md#0x1_vector_length">length</a>(v2), 0x20002);
+    <b>while</b> (i &lt; len) {
+        f(<a href="vector.md#0x1_vector_borrow_mut">borrow_mut</a>(v1, i), <a href="vector.md#0x1_vector_borrow_mut">borrow_mut</a>(v2, i));
+        i = i + 1
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vector_enumerate_mut"></a>
+
+## Function `enumerate_mut`
+
+Apply the function to a mutable reference of each element in the vector with its index.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_enumerate_mut">enumerate_mut</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, f: |(u64, &<b>mut</b> Element)|)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="vector.md#0x1_vector_enumerate_mut">enumerate_mut</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, f: |u64, &<b>mut</b> Element|) {
+    <b>let</b> i = 0;
+    <b>let</b> len = <a href="vector.md#0x1_vector_length">length</a>(v);
+    <b>while</b> (i &lt; len) {
+        f(i, <a href="vector.md#0x1_vector_borrow_mut">borrow_mut</a>(v, i));
+        i = i + 1;
+    };
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vector_fold"></a>
+
+## Function `fold`
+
+Fold the function over the elements. For example, <code><a href="vector.md#0x1_vector_fold">fold</a>(<a href="vector.md#0x1_vector">vector</a>[1,2,3], 0, f)</code> will execute
+<code>f(f(f(0, 1), 2), 3)</code>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_fold">fold</a>&lt;Accumulator, Element&gt;(v: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, init: Accumulator, f: |(Accumulator, Element)|Accumulator): Accumulator
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="vector.md#0x1_vector_fold">fold</a>&lt;Accumulator, Element&gt;(
+    v: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;,
+    init: Accumulator,
+    f: |Accumulator,Element|Accumulator
+): Accumulator {
+    <b>let</b> accu = init;
+    <a href="vector.md#0x1_vector_for_each">for_each</a>(v, |elem| accu = f(accu, elem));
+    accu
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vector_foldr"></a>
+
+## Function `foldr`
+
+Fold right like fold above but working right to left. For example, <code><a href="vector.md#0x1_vector_fold">fold</a>(<a href="vector.md#0x1_vector">vector</a>[1,2,3], 0, f)</code> will execute
+<code>f(1, f(2, f(3, 0)))</code>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_foldr">foldr</a>&lt;Accumulator, Element&gt;(v: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, init: Accumulator, f: |(Element, Accumulator)|Accumulator): Accumulator
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="vector.md#0x1_vector_foldr">foldr</a>&lt;Accumulator, Element&gt;(
+    v: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;,
+    init: Accumulator,
+    f: |Element, Accumulator|Accumulator
+): Accumulator {
+    <b>let</b> accu = init;
+    <a href="vector.md#0x1_vector_for_each_reverse">for_each_reverse</a>(v, |elem| accu = f(elem, accu));
+    accu
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vector_map_ref"></a>
+
+## Function `map_ref`
+
+Map the function over the references of the elements of the vector, producing a new vector without modifying the
+original vector.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_map_ref">map_ref</a>&lt;Element, NewElement&gt;(v: &<a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, f: |&Element|NewElement): <a href="vector.md#0x1_vector">vector</a>&lt;NewElement&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="vector.md#0x1_vector_map_ref">map_ref</a>&lt;Element, NewElement&gt;(
+    v: &<a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;,
+    f: |&Element|NewElement
+): <a href="vector.md#0x1_vector">vector</a>&lt;NewElement&gt; {
+    <b>let</b> result = <a href="vector.md#0x1_vector">vector</a>&lt;NewElement&gt;[];
+    <a href="vector.md#0x1_vector_for_each_ref">for_each_ref</a>(v, |elem| <a href="vector.md#0x1_vector_push_back">push_back</a>(&<b>mut</b> result, f(elem)));
+    result
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vector_zip_map_ref"></a>
+
+## Function `zip_map_ref`
+
+Map the function over the references of the element pairs of two vectors, producing a new vector from the return
+values without modifying the original vectors.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_zip_map_ref">zip_map_ref</a>&lt;Element1, Element2, NewElement&gt;(v1: &<a href="vector.md#0x1_vector">vector</a>&lt;Element1&gt;, v2: &<a href="vector.md#0x1_vector">vector</a>&lt;Element2&gt;, f: |(&Element1, &Element2)|NewElement): <a href="vector.md#0x1_vector">vector</a>&lt;NewElement&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="vector.md#0x1_vector_zip_map_ref">zip_map_ref</a>&lt;Element1, Element2, NewElement&gt;(
+    v1: &<a href="vector.md#0x1_vector">vector</a>&lt;Element1&gt;,
+    v2: &<a href="vector.md#0x1_vector">vector</a>&lt;Element2&gt;,
+    f: |&Element1, &Element2|NewElement
+): <a href="vector.md#0x1_vector">vector</a>&lt;NewElement&gt; {
+    // We can't <b>use</b> the constant <a href="vector.md#0x1_vector_EVECTORS_LENGTH_MISMATCH">EVECTORS_LENGTH_MISMATCH</a> here <b>as</b> all calling code would then need <b>to</b> define it
+    // due <b>to</b> how inline functions work.
+    <b>assert</b>!(<a href="vector.md#0x1_vector_length">length</a>(v1) == <a href="vector.md#0x1_vector_length">length</a>(v2), 0x20002);
+
+    <b>let</b> result = <a href="vector.md#0x1_vector">vector</a>&lt;NewElement&gt;[];
+    <a href="vector.md#0x1_vector_zip_ref">zip_ref</a>(v1, v2, |e1, e2| <a href="vector.md#0x1_vector_push_back">push_back</a>(&<b>mut</b> result, f(e1, e2)));
+    result
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vector_map"></a>
+
+## Function `map`
+
+Map the function over the elements of the vector, producing a new vector.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_map">map</a>&lt;Element, NewElement&gt;(v: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, f: |Element|NewElement): <a href="vector.md#0x1_vector">vector</a>&lt;NewElement&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="vector.md#0x1_vector_map">map</a>&lt;Element, NewElement&gt;(
+    v: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;,
+    f: |Element|NewElement
+): <a href="vector.md#0x1_vector">vector</a>&lt;NewElement&gt; {
+    <b>let</b> result = <a href="vector.md#0x1_vector">vector</a>&lt;NewElement&gt;[];
+    <a href="vector.md#0x1_vector_for_each">for_each</a>(v, |elem| <a href="vector.md#0x1_vector_push_back">push_back</a>(&<b>mut</b> result, f(elem)));
+    result
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vector_zip_map"></a>
+
+## Function `zip_map`
+
+Map the function over the element pairs of the two vectors, producing a new vector.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_zip_map">zip_map</a>&lt;Element1, Element2, NewElement&gt;(v1: <a href="vector.md#0x1_vector">vector</a>&lt;Element1&gt;, v2: <a href="vector.md#0x1_vector">vector</a>&lt;Element2&gt;, f: |(Element1, Element2)|NewElement): <a href="vector.md#0x1_vector">vector</a>&lt;NewElement&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="vector.md#0x1_vector_zip_map">zip_map</a>&lt;Element1, Element2, NewElement&gt;(
+    v1: <a href="vector.md#0x1_vector">vector</a>&lt;Element1&gt;,
+    v2: <a href="vector.md#0x1_vector">vector</a>&lt;Element2&gt;,
+    f: |Element1, Element2|NewElement
+): <a href="vector.md#0x1_vector">vector</a>&lt;NewElement&gt; {
+    // We can't <b>use</b> the constant <a href="vector.md#0x1_vector_EVECTORS_LENGTH_MISMATCH">EVECTORS_LENGTH_MISMATCH</a> here <b>as</b> all calling code would then need <b>to</b> define it
+    // due <b>to</b> how inline functions work.
+    <b>assert</b>!(<a href="vector.md#0x1_vector_length">length</a>(&v1) == <a href="vector.md#0x1_vector_length">length</a>(&v2), 0x20002);
+
+    <b>let</b> result = <a href="vector.md#0x1_vector">vector</a>&lt;NewElement&gt;[];
+    <a href="vector.md#0x1_vector_zip">zip</a>(v1, v2, |e1, e2| <a href="vector.md#0x1_vector_push_back">push_back</a>(&<b>mut</b> result, f(e1, e2)));
+    result
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vector_filter"></a>
+
+## Function `filter`
+
+Filter the vector using the boolean function, removing all elements for which <code>p(e)</code> is not true.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_filter">filter</a>&lt;Element: drop&gt;(v: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, p: |&Element|bool): <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="vector.md#0x1_vector_filter">filter</a>&lt;Element:drop&gt;(
+    v: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;,
+    p: |&Element|bool
+): <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt; {
+    <b>let</b> result = <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;[];
+    <a href="vector.md#0x1_vector_for_each">for_each</a>(v, |elem| {
+        <b>if</b> (p(&elem)) <a href="vector.md#0x1_vector_push_back">push_back</a>(&<b>mut</b> result, elem);
+    });
+    result
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vector_partition"></a>
+
+## Function `partition`
+
+Partition, sorts all elements for which pred is true to the front.
+Preserves the relative order of the elements for which pred is true,
+BUT NOT for the elements for which pred is false.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_partition">partition</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, pred: |&Element|bool): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="vector.md#0x1_vector_partition">partition</a>&lt;Element&gt;(
+    v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;,
+    pred: |&Element|bool
+): u64 {
+    <b>let</b> i = 0;
+    <b>let</b> len = <a href="vector.md#0x1_vector_length">length</a>(v);
+    <b>while</b> (i &lt; len) {
+        <b>if</b> (!pred(<a href="vector.md#0x1_vector_borrow">borrow</a>(v, i))) <b>break</b>;
+        i = i + 1;
+    };
+    <b>let</b> p = i;
+    i = i + 1;
+    <b>while</b> (i &lt; len) {
+        <b>if</b> (pred(<a href="vector.md#0x1_vector_borrow">borrow</a>(v, i))) {
+            <a href="vector.md#0x1_vector_swap">swap</a>(v, p, i);
+            p = p + 1;
+        };
+        i = i + 1;
+    };
+    p
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vector_rotate"></a>
+
+## Function `rotate`
+
+rotate(&mut [1, 2, 3, 4, 5], 2) -> [3, 4, 5, 1, 2] in place, returns the split point
+ie. 3 in the example above
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_rotate">rotate</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, rot: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_rotate">rotate</a>&lt;Element&gt;(
+    v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;,
+    rot: u64
+): u64 {
+    <b>let</b> len = <a href="vector.md#0x1_vector_length">length</a>(v);
+    <a href="vector.md#0x1_vector_rotate_slice">rotate_slice</a>(v, 0, rot, len)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vector_rotate_slice"></a>
+
+## Function `rotate_slice`
+
+Same as above but on a sub-slice of an array [left, right) with left <= rot <= right
+returns the
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_rotate_slice">rotate_slice</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, left: u64, rot: u64, right: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_rotate_slice">rotate_slice</a>&lt;Element&gt;(
+    v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;,
+    left: u64,
+    rot: u64,
+    right: u64
+): u64 {
+    <a href="vector.md#0x1_vector_reverse_slice">reverse_slice</a>(v, left, rot);
+    <a href="vector.md#0x1_vector_reverse_slice">reverse_slice</a>(v, rot, right);
+    <a href="vector.md#0x1_vector_reverse_slice">reverse_slice</a>(v, left, right);
+    left + (right - rot)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vector_stable_partition"></a>
+
+## Function `stable_partition`
+
+Partition the array based on a predicate p, this routine is stable and thus
+preserves the relative order of the elements in the two partitions.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_stable_partition">stable_partition</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, p: |&Element|bool): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="vector.md#0x1_vector_stable_partition">stable_partition</a>&lt;Element&gt;(
+    v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;,
+    p: |&Element|bool
+): u64 {
+    <b>let</b> len = <a href="vector.md#0x1_vector_length">length</a>(v);
+    <b>let</b> t = <a href="vector.md#0x1_vector_empty">empty</a>();
+    <b>let</b> f = <a href="vector.md#0x1_vector_empty">empty</a>();
+    <b>while</b> (len &gt; 0) {
+        <b>let</b> e = <a href="vector.md#0x1_vector_pop_back">pop_back</a>(v);
+        <b>if</b> (p(&e)) {
+            <a href="vector.md#0x1_vector_push_back">push_back</a>(&<b>mut</b> t, e);
+        } <b>else</b> {
+            <a href="vector.md#0x1_vector_push_back">push_back</a>(&<b>mut</b> f, e);
+        };
+        len = len - 1;
+    };
+    <b>let</b> pos = <a href="vector.md#0x1_vector_length">length</a>(&t);
+    <a href="vector.md#0x1_vector_reverse_append">reverse_append</a>(v, t);
+    <a href="vector.md#0x1_vector_reverse_append">reverse_append</a>(v, f);
+    pos
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vector_any"></a>
+
+## Function `any`
+
+Return true if any element in the vector satisfies the predicate.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_any">any</a>&lt;Element&gt;(v: &<a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, p: |&Element|bool): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="vector.md#0x1_vector_any">any</a>&lt;Element&gt;(
+    v: &<a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;,
+    p: |&Element|bool
+): bool {
+    <b>let</b> result = <b>false</b>;
+    <b>let</b> i = 0;
+    <b>while</b> (i &lt; <a href="vector.md#0x1_vector_length">length</a>(v)) {
+        result = p(<a href="vector.md#0x1_vector_borrow">borrow</a>(v, i));
+        <b>if</b> (result) {
+            <b>break</b>
+        };
+        i = i + 1
+    };
+    result
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vector_all"></a>
+
+## Function `all`
+
+Return true if all elements in the vector satisfy the predicate.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_all">all</a>&lt;Element&gt;(v: &<a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, p: |&Element|bool): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="vector.md#0x1_vector_all">all</a>&lt;Element&gt;(
+    v: &<a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;,
+    p: |&Element|bool
+): bool {
+    <b>let</b> result = <b>true</b>;
+    <b>let</b> i = 0;
+    <b>while</b> (i &lt; <a href="vector.md#0x1_vector_length">length</a>(v)) {
+        result = p(<a href="vector.md#0x1_vector_borrow">borrow</a>(v, i));
+        <b>if</b> (!result) {
+            <b>break</b>
+        };
+        i = i + 1
+    };
+    result
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vector_destroy"></a>
+
+## Function `destroy`
+
+Destroy a vector, just a wrapper around for_each_reverse with a descriptive name
+when used in the context of destroying a vector.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_destroy">destroy</a>&lt;Element&gt;(v: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, d: |Element|)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> inline <b>fun</b> <a href="vector.md#0x1_vector_destroy">destroy</a>&lt;Element&gt;(
+    v: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;,
+    d: |Element|
+) {
+    <a href="vector.md#0x1_vector_for_each_reverse">for_each_reverse</a>(v, |e| d(e))
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vector_range"></a>
+
+## Function `range`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_range">range</a>(start: u64, end: u64): <a href="vector.md#0x1_vector">vector</a>&lt;u64&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_range">range</a>(start: u64, end: u64): <a href="vector.md#0x1_vector">vector</a>&lt;u64&gt; {
+    <a href="vector.md#0x1_vector_range_with_step">range_with_step</a>(start, end, 1)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vector_range_with_step"></a>
+
+## Function `range_with_step`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_range_with_step">range_with_step</a>(start: u64, end: u64, step: u64): <a href="vector.md#0x1_vector">vector</a>&lt;u64&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_range_with_step">range_with_step</a>(start: u64, end: u64, step: u64): <a href="vector.md#0x1_vector">vector</a>&lt;u64&gt; {
+    <b>assert</b>!(step &gt; 0, <a href="vector.md#0x1_vector_EINVALID_STEP">EINVALID_STEP</a>);
+
+    <b>let</b> vec = <a href="vector.md#0x1_vector">vector</a>[];
+    <b>while</b> (start &lt; end) {
+        <a href="vector.md#0x1_vector_push_back">push_back</a>(&<b>mut</b> vec, start);
+        start = start + step;
+    };
+    vec
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_vector_slice"></a>
+
+## Function `slice`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_slice">slice</a>&lt;Element: <b>copy</b>&gt;(v: &<a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, start: u64, end: u64): <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_slice">slice</a>&lt;Element: <b>copy</b>&gt;(
+    v: &<a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;,
+    start: u64,
+    end: u64
+): <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt; {
+    <b>assert</b>!(start &lt;= end && end &lt;= <a href="vector.md#0x1_vector_length">length</a>(v), <a href="vector.md#0x1_vector_EINVALID_SLICE_RANGE">EINVALID_SLICE_RANGE</a>);
+
+    <b>let</b> vec = <a href="vector.md#0x1_vector">vector</a>[];
+    <b>while</b> (start &lt; end) {
+        <a href="vector.md#0x1_vector_push_back">push_back</a>(&<b>mut</b> vec, *<a href="vector.md#0x1_vector_borrow">borrow</a>(v, start));
+        start = start + 1;
+    };
+    vec
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="@Specification_1"></a>
+
+## Specification
+
+
+
+<a id="@Helper_Functions_2"></a>
+
+### Helper Functions
+
+
+Check if <code>v1</code> is equal to the result of adding <code>e</code> at the end of <code>v2</code>
+
+
+<a id="0x1_vector_eq_push_back"></a>
+
+
+<pre><code><b>fun</b> <a href="vector.md#0x1_vector_eq_push_back">eq_push_back</a>&lt;Element&gt;(v1: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, v2: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, e: Element): bool {
+    len(v1) == len(v2) + 1 &&
+    v1[len(v1)-1] == e &&
+    v1[0..len(v1)-1] == v2[0..len(v2)]
+}
+</code></pre>
+
+
+Check if <code>v</code> is equal to the result of concatenating <code>v1</code> and <code>v2</code>
+
+
+<a id="0x1_vector_eq_append"></a>
+
+
+<pre><code><b>fun</b> <a href="vector.md#0x1_vector_eq_append">eq_append</a>&lt;Element&gt;(v: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, v1: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, v2: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;): bool {
+    len(v) == len(v1) + len(v2) &&
+    v[0..len(v1)] == v1 &&
+    v[len(v1)..len(v)] == v2
+}
+</code></pre>
+
+
+Check <code>v1</code> is equal to the result of removing the first element of <code>v2</code>
+
+
+<a id="0x1_vector_eq_pop_front"></a>
+
+
+<pre><code><b>fun</b> <a href="vector.md#0x1_vector_eq_pop_front">eq_pop_front</a>&lt;Element&gt;(v1: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, v2: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;): bool {
+    len(v1) + 1 == len(v2) &&
+    v1 == v2[1..len(v2)]
+}
+</code></pre>
+
+
+Check that <code>v1</code> is equal to the result of removing the element at index <code>i</code> from <code>v2</code>.
+
+
+<a id="0x1_vector_eq_remove_elem_at_index"></a>
+
+
+<pre><code><b>fun</b> <a href="vector.md#0x1_vector_eq_remove_elem_at_index">eq_remove_elem_at_index</a>&lt;Element&gt;(i: u64, v1: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, v2: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;): bool {
+    len(v1) + 1 == len(v2) &&
+    v1[0..i] == v2[0..i] &&
+    v1[i..len(v1)] == v2[i + 1..len(v2)]
+}
+</code></pre>
+
+
+Check if <code>v</code> contains <code>e</code>.
+
+
+<a id="0x1_vector_spec_contains"></a>
+
+
+<pre><code><b>fun</b> <a href="vector.md#0x1_vector_spec_contains">spec_contains</a>&lt;Element&gt;(v: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, e: Element): bool {
+    <b>exists</b> x in v: x == e
+}
+</code></pre>
+
+
+
+<a id="@Specification_1_singleton"></a>
+
+### Function `singleton`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_singleton">singleton</a>&lt;Element&gt;(e: Element): <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == vec(e);
+</code></pre>
+
+
+
+<a id="@Specification_1_reverse"></a>
+
+### Function `reverse`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_reverse">reverse</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> intrinsic = <b>true</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_reverse_slice"></a>
+
+### Function `reverse_slice`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_reverse_slice">reverse_slice</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, left: u64, right: u64)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> intrinsic = <b>true</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_append"></a>
+
+### Function `append`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_append">append</a>&lt;Element&gt;(lhs: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, other: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> intrinsic = <b>true</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_reverse_append"></a>
+
+### Function `reverse_append`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_reverse_append">reverse_append</a>&lt;Element&gt;(lhs: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, other: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> intrinsic = <b>true</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_trim"></a>
+
+### Function `trim`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_trim">trim</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, new_len: u64): <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> intrinsic = <b>true</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_trim_reverse"></a>
+
+### Function `trim_reverse`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_trim_reverse">trim_reverse</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, new_len: u64): <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> intrinsic = <b>true</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_is_empty"></a>
+
+### Function `is_empty`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_is_empty">is_empty</a>&lt;Element&gt;(v: &<a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;): bool
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> intrinsic = <b>true</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_contains"></a>
+
+### Function `contains`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_contains">contains</a>&lt;Element&gt;(v: &<a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, e: &Element): bool
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> intrinsic = <b>true</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_index_of"></a>
+
+### Function `index_of`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_index_of">index_of</a>&lt;Element&gt;(v: &<a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, e: &Element): (bool, u64)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> intrinsic = <b>true</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_insert"></a>
+
+### Function `insert`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_insert">insert</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, i: u64, e: Element)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> intrinsic = <b>true</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_remove"></a>
+
+### Function `remove`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_remove">remove</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, i: u64): Element
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> intrinsic = <b>true</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_remove_value"></a>
+
+### Function `remove_value`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_remove_value">remove_value</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, val: &Element): <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> intrinsic = <b>true</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_swap_remove"></a>
+
+### Function `swap_remove`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_swap_remove">swap_remove</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, i: u64): Element
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> intrinsic = <b>true</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_rotate"></a>
+
+### Function `rotate`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_rotate">rotate</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, rot: u64): u64
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> intrinsic = <b>true</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_rotate_slice"></a>
+
+### Function `rotate_slice`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_rotate_slice">rotate_slice</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, left: u64, rot: u64, right: u64): u64
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> intrinsic = <b>true</b>;
+</code></pre>
+
+
+[move-book]: https://aptos.dev/move/book/SUMMARY
diff --git a/aptos-move/framework/src/aptos.rs b/aptos-move/framework/src/aptos.rs
index 80753542af20e..06fa6f6dc5513 100644
--- a/aptos-move/framework/src/aptos.rs
+++ b/aptos-move/framework/src/aptos.rs
@@ -106,6 +106,7 @@ impl ReleaseTarget {
                 with_source_maps: false,
                 with_error_map: true,
                 named_addresses: Default::default(),
+                override_std: None,
                 install_dir: None,
                 with_docs: true,
                 docgen_options: Some(DocgenOptions {
@@ -116,6 +117,7 @@ impl ReleaseTarget {
                     collapsed_sections: true,
                     landing_page_template: Some("doc_template/overview.md".to_string()),
                     references_file: Some("doc_template/references.md".to_string()),
+                    output_format: None,
                 }),
                 skip_fetch_latest_git_deps: true,
                 bytecode_version: None,
@@ -124,6 +126,7 @@ impl ReleaseTarget {
                 skip_attribute_checks: false,
                 check_test_code: false,
                 known_attributes: extended_checks::get_all_attribute_names().clone(),
+                experiments: vec![],
             },
             packages: packages.iter().map(|(path, _)| path.to_owned()).collect(),
             rust_bindings: packages
diff --git a/aptos-move/framework/src/built_package.rs b/aptos-move/framework/src/built_package.rs
index 38fa59c2b829e..1b249e2b74b6a 100644
--- a/aptos-move/framework/src/built_package.rs
+++ b/aptos-move/framework/src/built_package.rs
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{
-    docgen::DocgenOptions,
+    docgen::{get_docgen_output_dir, DocgenOptions},
     extended_checks,
     natives::code::{ModuleMetadata, MoveOption, PackageDep, PackageMetadata, UpgradePolicy},
     zip_metadata, zip_metadata_str, RuntimeModuleMetadataV1, APTOS_METADATA_KEY,
@@ -26,7 +26,10 @@ use move_model::{
 };
 use move_package::{
     compilation::{compiled_package::CompiledPackage, package_layout::CompiledPackageLayout},
-    source_package::manifest_parser::{parse_move_manifest_string, parse_source_manifest},
+    source_package::{
+        manifest_parser::{parse_move_manifest_string, parse_source_manifest},
+        std_lib::StdVersion,
+    },
     BuildConfig, CompilerConfig, ModelConfig,
 };
 use serde::{Deserialize, Serialize};
@@ -73,6 +76,9 @@ pub struct BuildOptions {
     pub install_dir: Option<PathBuf>,
     #[clap(skip)] // TODO: have a parser for this; there is one in the CLI buts its  downstream
     pub named_addresses: BTreeMap<String, AccountAddress>,
+    /// Whether to override the standard library with the given version.
+    #[clap(long, value_parser)]
+    pub override_std: Option<StdVersion>,
     #[clap(skip)]
     pub docgen_options: Option<DocgenOptions>,
     #[clap(long)]
@@ -89,6 +95,8 @@ pub struct BuildOptions {
     pub check_test_code: bool,
     #[clap(skip)]
     pub known_attributes: BTreeSet<String>,
+    #[clap(skip)]
+    pub experiments: Vec<String>,
 }
 
 // Because named_addresses has no parser, we can't use clap's default impl. This must be aligned
@@ -104,6 +112,7 @@ impl Default for BuildOptions {
             with_docs: false,
             install_dir: None,
             named_addresses: Default::default(),
+            override_std: None,
             docgen_options: None,
             // This is false by default, because it could accidentally pull new dependencies
             // while in a test (and cause some havoc)
@@ -114,8 +123,30 @@ impl Default for BuildOptions {
             skip_attribute_checks: false,
             check_test_code: false,
             known_attributes: extended_checks::get_all_attribute_names().clone(),
+            experiments: vec![],
+        }
+    }
+}
+
+impl BuildOptions {
+    pub fn move_2() -> Self {
+        BuildOptions {
+            language_version: Some(LanguageVersion::V2_0),
+            compiler_version: Some(CompilerVersion::V2_0),
+            ..Self::default()
         }
     }
+
+    pub fn inferred_bytecode_version(&self) -> u32 {
+        self.language_version
+            .unwrap_or_default()
+            .infer_bytecode_version(self.bytecode_version)
+    }
+
+    pub fn with_experiment(mut self, exp: &str) -> Self {
+        self.experiments.push(exp.to_string());
+        self
+    }
 }
 
 /// Represents a built package.  It allows to extract `PackageMetadata`. Can also be used to
@@ -136,7 +167,13 @@ pub fn build_model(
     language_version: Option<LanguageVersion>,
     skip_attribute_checks: bool,
     known_attributes: BTreeSet<String>,
+    experiments: Vec<String>,
 ) -> anyhow::Result<GlobalEnv> {
+    let bytecode_version = Some(
+        language_version
+            .unwrap_or_default()
+            .infer_bytecode_version(bytecode_version),
+    );
     let build_config = BuildConfig {
         dev_mode,
         additional_named_addresses,
@@ -147,6 +184,7 @@ pub fn build_model(
         full_model_generation: false,
         install_dir: None,
         test_mode: false,
+        override_std: None,
         force_recompilation: false,
         fetch_deps_only: false,
         skip_fetch_latest_git_deps: true,
@@ -156,6 +194,7 @@ pub fn build_model(
             language_version,
             skip_attribute_checks,
             known_attributes,
+            experiments,
         },
     };
     let compiler_version = compiler_version.unwrap_or_default();
@@ -175,7 +214,7 @@ impl BuiltPackage {
     /// This function currently reports all Move compilation errors and warnings to stdout,
     /// and is not `Ok` if there was an error among those.
     pub fn build(package_path: PathBuf, options: BuildOptions) -> anyhow::Result<Self> {
-        let bytecode_version = options.bytecode_version;
+        let bytecode_version = Some(options.inferred_bytecode_version());
         let compiler_version = options.compiler_version;
         let language_version = options.language_version;
         Self::check_versions(&compiler_version, &language_version)?;
@@ -190,6 +229,7 @@ impl BuiltPackage {
             full_model_generation: options.check_test_code,
             install_dir: options.install_dir.clone(),
             test_mode: false,
+            override_std: options.override_std.clone(),
             force_recompilation: false,
             fetch_deps_only: false,
             skip_fetch_latest_git_deps: options.skip_fetch_latest_git_deps,
@@ -199,6 +239,7 @@ impl BuiltPackage {
                 language_version,
                 skip_attribute_checks,
                 known_attributes: options.known_attributes.clone(),
+                experiments: options.experiments.clone(),
             },
         };
 
@@ -248,7 +289,7 @@ impl BuiltPackage {
                         .unwrap()
                         .parent()
                         .unwrap()
-                        .join("doc")
+                        .join(get_docgen_output_dir())
                         .display()
                         .to_string()
                 })
@@ -316,9 +357,8 @@ impl BuiltPackage {
         self.package
             .root_modules()
             .map(|unit_with_source| {
-                unit_with_source
-                    .unit
-                    .serialize(self.options.bytecode_version)
+                let bytecode_version = self.options.inferred_bytecode_version();
+                unit_with_source.unit.serialize(Some(bytecode_version))
             })
             .collect()
     }
@@ -365,7 +405,7 @@ impl BuiltPackage {
             .map(|unit_with_source| {
                 unit_with_source
                     .unit
-                    .serialize(self.options.bytecode_version)
+                    .serialize(Some(self.options.inferred_bytecode_version()))
             })
             .collect()
     }
diff --git a/aptos-move/framework/src/docgen.rs b/aptos-move/framework/src/docgen.rs
index 31e9e7d8a4ba9..7b15f234d37b1 100644
--- a/aptos-move/framework/src/docgen.rs
+++ b/aptos-move/framework/src/docgen.rs
@@ -6,9 +6,15 @@ use codespan_reporting::{
     diagnostic::Severity,
     term::termcolor::{ColorChoice, StandardStream},
 };
+use move_docgen::OutputFormat;
 use move_model::model::GlobalEnv;
 use std::{path::PathBuf, sync::Mutex};
 
+pub fn get_docgen_output_dir() -> String {
+    const MVC_DOCGEN_OUTPUT_DIR: &str = "MVC_DOCGEN_OUTPUT_DIR";
+    std::env::var(MVC_DOCGEN_OUTPUT_DIR).unwrap_or_else(|_| "doc".to_owned())
+}
+
 #[derive(Debug, Clone, clap::Parser, serde::Serialize, serde::Deserialize, Default)]
 pub struct DocgenOptions {
     /// Whether to include private declarations and implementations into the generated
@@ -48,6 +54,10 @@ pub struct DocgenOptions {
     /// This can contain common markdown references fpr this package (e.g. `[move-book]: <url>`).
     #[clap(long)]
     pub references_file: Option<String>,
+
+    /// Choose the output format
+    #[clap(long)]
+    pub output_format: Option<OutputFormat>,
 }
 
 impl DocgenOptions {
@@ -65,7 +75,7 @@ impl DocgenOptions {
         let _lock = MUTEX.lock();
         let current_dir = std::env::current_dir()?.canonicalize()?;
         std::env::set_current_dir(&package_path)?;
-        let output_directory = PathBuf::from("doc");
+        let output_directory = PathBuf::from(get_docgen_output_dir());
         let doc_path = doc_path
             .into_iter()
             .filter_map(|s| {
@@ -94,6 +104,7 @@ impl DocgenOptions {
             include_dep_diagrams: self.include_dep_diagram,
             include_call_diagrams: false,
             compile_relative_to_output_dir: false,
+            output_format: self.output_format,
         };
         let output = move_docgen::Docgen::new(model, &options).gen();
         if model.diag_count(Severity::Warning) > 0 {
diff --git a/aptos-move/framework/src/extended_checks.rs b/aptos-move/framework/src/extended_checks.rs
index 4641d12fb59a3..336c5bd0d9f21 100644
--- a/aptos-move/framework/src/extended_checks.rs
+++ b/aptos-move/framework/src/extended_checks.rs
@@ -34,6 +34,8 @@ use std::{
 };
 use thiserror::Error;
 
+const ALLOW_UNSAFE_RANDOMNESS_ATTRIBUTE: &str = "lint::allow_unsafe_randomness";
+const FMT_SKIP_ATTRIBUTE: &str = "fmt::skip";
 const INIT_MODULE_FUN: &str = "init_module";
 const LEGACY_ENTRY_FUN_ATTRIBUTE: &str = "legacy_entry_fun";
 const ERROR_PREFIX: &str = "E";
@@ -46,9 +48,13 @@ const RESOURCE_GROUP_NAME: &str = "group";
 const RESOURCE_GROUP_SCOPE: &str = "scope";
 const VIEW_FUN_ATTRIBUTE: &str = "view";
 
+const RANDOMNESS_MODULE_NAME: &str = "randomness";
+
 // top-level attribute names, only.
 pub fn get_all_attribute_names() -> &'static BTreeSet<String> {
-    const ALL_ATTRIBUTE_NAMES: [&str; 6] = [
+    const ALL_ATTRIBUTE_NAMES: [&str; 8] = [
+        ALLOW_UNSAFE_RANDOMNESS_ATTRIBUTE,
+        FMT_SKIP_ATTRIBUTE,
         LEGACY_ENTRY_FUN_ATTRIBUTE,
         RESOURCE_GROUP,
         RESOURCE_GROUP_MEMBER,
@@ -97,6 +103,8 @@ struct ExtendedChecker<'a> {
     output: BTreeMap<ModuleId, RuntimeModuleMetadataV1>,
     /// The id of the module defining error categories
     error_category_module: ModuleId,
+    /// A cache for functions which are known to call or not call randomness features
+    randomness_caller_cache: BTreeMap<QualifiedId<FunId>, bool>,
 }
 
 impl<'a> ExtendedChecker<'a> {
@@ -108,17 +116,19 @@ impl<'a> ExtendedChecker<'a> {
                 AccountAddress::ONE,
                 Identifier::new("error").unwrap(),
             ),
+            randomness_caller_cache: BTreeMap::new(),
         }
     }
 
     fn run(&mut self) {
         for ref module in self.env.get_modules() {
-            if module.is_target() {
+            if module.is_primary_target() {
                 self.check_and_record_resource_groups(module);
                 self.check_and_record_resource_group_members(module);
                 self.check_and_record_view_functions(module);
                 self.check_entry_functions(module);
                 self.check_and_record_unbiasabale_entry_functions(module);
+                self.check_unsafe_randomness_usage(module);
                 self.check_and_record_events(module);
                 self.check_init_module(module);
                 self.build_error_map(module)
@@ -136,8 +146,10 @@ impl<'a> ExtendedChecker<'a> {
         let init_module_sym = self.env.symbol_pool().make(INIT_MODULE_FUN);
         if let Some(ref fun) = module.find_function(init_module_sym) {
             if fun.visibility() != Visibility::Private {
-                self.env
-                    .error(&fun.get_id_loc(), "`init_module` function must be private")
+                self.env.error(
+                    &fun.get_id_loc(),
+                    &format!("`{}` function must be private", INIT_MODULE_FUN),
+                )
             }
             for Parameter(_, ty, _) in fun.get_parameters() {
                 let ok = match ty {
@@ -148,14 +160,15 @@ impl<'a> ExtendedChecker<'a> {
                 if !ok {
                     self.env.error(
                         &fun.get_id_loc(),
-                        "`init_module` function can only take signers as parameters",
+                        &format!("`{}` function can only take values of type `signer` or `&signer` as parameters",
+                                 INIT_MODULE_FUN),
                     );
                 }
             }
             if fun.get_return_count() > 0 {
                 self.env.error(
                     &fun.get_id_loc(),
-                    "`init_module` function cannot return values",
+                    &format!("`{}` function cannot return values", INIT_MODULE_FUN),
                 )
             }
         }
@@ -177,7 +190,7 @@ impl<'a> ExtendedChecker<'a> {
                 continue;
             }
 
-            self.check_transaction_args(&fun.get_id_loc(), &fun.get_parameter_types());
+            self.check_transaction_args(&fun.get_id_loc(), &fun.get_parameters());
             if fun.get_return_count() > 0 {
                 self.env
                     .error(&fun.get_id_loc(), "entry function cannot return values")
@@ -185,9 +198,9 @@ impl<'a> ExtendedChecker<'a> {
         }
     }
 
-    fn check_transaction_args(&self, loc: &Loc, arg_tys: &[Type]) {
-        for ty in arg_tys {
-            self.check_transaction_input_type(loc, ty)
+    fn check_transaction_args(&self, _loc: &Loc, arg_tys: &[Parameter]) {
+        for Parameter(_sym, ty, param_loc) in arg_tys {
+            self.check_transaction_input_type(param_loc, ty)
         }
     }
 
@@ -214,7 +227,7 @@ impl<'a> ExtendedChecker<'a> {
                 self.env.error(
                     loc,
                     &format!(
-                        "type `{}` is not supported as a parameter type",
+                        "type `{}` is not supported as a transaction parameter type",
                         ty.display(&self.env.get_type_display_ctx())
                     ),
                 );
@@ -465,7 +478,7 @@ impl<'a> ExtendedChecker<'a> {
             let maybe_randomness_annotation = match self.get_randomness_max_gas_declaration(fun) {
                 Ok(x) => x,
                 Err(msg) => {
-                    self.env.error(&fun.get_loc(), msg.as_str());
+                    self.env.error(&fun.get_id_loc(), msg.as_str());
                     continue;
                 },
             };
@@ -551,6 +564,89 @@ impl<'a> ExtendedChecker<'a> {
     }
 }
 
+// ----------------------------------------------------------------------------------
+// Checks for unsafe usage of randomness
+
+impl<'a> ExtendedChecker<'a> {
+    /// Checks unsafe usage of the randomness feature for the given module.
+    ///
+    /// 1. Checks that no public function in the module calls randomness features. An
+    ///    attribute can be used to override this check.
+    /// 2. Check that every private entry function which uses randomness
+    ///    features has the #[randomness] attribute
+    fn check_unsafe_randomness_usage(&mut self, module: &ModuleEnv) {
+        for ref fun in module.get_functions() {
+            let fun_id = fun.module_env.get_id().qualified(fun.get_id());
+            // Check condition (2)
+            if !fun.visibility().is_public() && fun.is_entry() {
+                if !self.has_attribute(fun, RANDOMNESS_ATTRIBUTE) && self.calls_randomness(fun_id) {
+                    self.env.error(
+                        &fun.get_id_loc(),
+                        "entry function calling randomness features must \
+                    use the `#[randomness]` attribute.",
+                    )
+                }
+                continue;
+            }
+            // Check condition (1) only if function is public and if the check is not disabled.
+            // Also, only check functions which are not declared in the framework.
+            if self.is_framework_function(fun_id)
+                || !fun.visibility().is_public()
+                || self.has_attribute(fun, ALLOW_UNSAFE_RANDOMNESS_ATTRIBUTE)
+            {
+                continue;
+            }
+            if self.calls_randomness(fun_id) {
+                self.env.error(
+                    &fun.get_id_loc(),
+                    &format!(
+                        "public function exposes functionality of the `randomness` module \
+                    which can be unsafe. Consult the randomness documentation for an explanation \
+                    of this error. To skip this check, add \
+                    attribute `#[{}]`.",
+                        ALLOW_UNSAFE_RANDOMNESS_ATTRIBUTE
+                    ),
+                )
+            }
+        }
+    }
+
+    /// Checks whether given function calls randomness functionality. This walks the call graph
+    /// recursively and stops as soon as a random call is found.
+    fn calls_randomness(&mut self, fun: QualifiedId<FunId>) -> bool {
+        if let Some(is_caller) = self.randomness_caller_cache.get(&fun) {
+            return *is_caller;
+        }
+        // For building a fixpoint on cycles, set the value initially to false
+        self.randomness_caller_cache.insert(fun, false);
+        let mut is_caller = false;
+        for callee in self
+            .env
+            .get_function(fun)
+            .get_called_functions()
+            .expect("callees defined")
+        {
+            if self.is_randomness_fun(*callee) || self.calls_randomness(*callee) {
+                is_caller = true;
+                break;
+            }
+        }
+        if is_caller {
+            // If we found a randomness call, update the cache
+            self.randomness_caller_cache.insert(fun, true);
+        }
+        is_caller
+    }
+
+    /// Check whether function belongs to the randomness feature. This is done by
+    /// checking the well-known module name.
+    fn is_randomness_fun(&self, fun: QualifiedId<FunId>) -> bool {
+        let module_name = self.env.get_function(fun).module_env.get_name().clone();
+        module_name.addr().expect_numerical() == AccountAddress::ONE
+            && *self.env.symbol_pool().string(module_name.name()) == RANDOMNESS_MODULE_NAME
+    }
+}
+
 // ----------------------------------------------------------------------------------
 // View Functions
 
@@ -560,35 +656,42 @@ impl<'a> ExtendedChecker<'a> {
             if !self.has_attribute(fun, VIEW_FUN_ATTRIBUTE) {
                 continue;
             }
-            self.check_transaction_args(&fun.get_id_loc(), &fun.get_parameter_types());
+            self.check_transaction_args(&fun.get_id_loc(), &fun.get_parameters());
             if fun.get_return_count() == 0 {
                 self.env
-                    .error(&fun.get_id_loc(), "view function must return values")
+                    .error(&fun.get_id_loc(), "`#[view]` function must return values")
             }
 
-            fun.get_parameter_types()
+            fun.get_parameters()
                 .iter()
-                .for_each(|parameter_type| match parameter_type {
-                    Type::Primitive(inner) => {
-                        if inner == &PrimitiveType::Signer {
-                            self.env.error(
-                                &fun.get_id_loc(),
-                                "view function cannot use the signer paremter",
-                            )
-                        }
-                    },
-                    Type::Reference(_, inner) => {
-                        if let Type::Primitive(inner) = inner.as_ref() {
+                .for_each(
+                    |Parameter(_sym, parameter_type, param_loc)| match parameter_type {
+                        Type::Primitive(inner) => {
                             if inner == &PrimitiveType::Signer {
                                 self.env.error(
-                                    &fun.get_id_loc(),
-                                    "view function cannot use the & signer paremter",
+                                    param_loc,
+                                    "`#[view]` function cannot use a `signer` parameter",
                                 )
                             }
-                        }
+                        },
+                        Type::Reference(mutability, inner) => {
+                            if let Type::Primitive(inner) = inner.as_ref() {
+                                if inner == &PrimitiveType::Signer
+                                // Avoid a redundant error message for `&mut signer`, which is
+                                // always disallowed for transaction entries, not just for
+                                // `#[view]`.
+                                    && mutability == &ReferenceKind::Immutable
+                                {
+                                    self.env.error(
+                                        param_loc,
+                                        "`#[view]` function cannot use the `&signer` parameter",
+                                    )
+                                }
+                            }
+                        },
+                        _ => (),
                     },
-                    _ => (),
-                });
+                );
 
             // Remember the runtime info that this is a view function
             let module_id = self.get_runtime_module_id(module);
@@ -770,6 +873,16 @@ impl<'a> ExtendedChecker<'a> {
         let fun = &self.env.get_function(id);
         fun.get_full_name_with_address() == full_name_str
     }
+
+    fn is_framework_function(&self, id: QualifiedId<FunId>) -> bool {
+        self.env
+            .get_function(id)
+            .module_env
+            .get_name()
+            .addr()
+            .expect_numerical()
+            == AccountAddress::ONE
+    }
 }
 
 // ----------------------------------------------------------------------------------
diff --git a/aptos-move/framework/src/module_metadata.rs b/aptos-move/framework/src/module_metadata.rs
index 7736d60c9bf84..e0dc1d36b4fa6 100644
--- a/aptos-move/framework/src/module_metadata.rs
+++ b/aptos-move/framework/src/module_metadata.rs
@@ -3,22 +3,21 @@
 
 use crate::extended_checks::ResourceGroupScope;
 use aptos_types::{
-    on_chain_config::{FeatureFlag, Features, TimedFeatures},
+    on_chain_config::{FeatureFlag, Features, TimedFeatureFlag, TimedFeatures},
     transaction::AbortInfo,
 };
 use lru::LruCache;
 use move_binary_format::{
     access::ModuleAccess,
     file_format::{
-        Ability, AbilitySet, CompiledScript, IdentifierIndex, SignatureToken,
-        StructFieldInformation, TableIndex,
+        Ability, AbilitySet, CompiledScript, FunctionDefinition, FunctionHandle, IdentifierIndex,
+        SignatureToken, StructDefinition, StructFieldInformation, StructHandle, TableIndex,
     },
-    normalized::{Function, Struct},
     CompiledModule,
 };
 use move_core_types::{
     errmap::ErrorDescription,
-    identifier::Identifier,
+    identifier::{IdentStr, Identifier},
     language_storage::{ModuleId, StructTag},
     metadata::Metadata,
 };
@@ -313,6 +312,17 @@ pub fn get_compilation_metadata_from_compiled_module(
     }
 }
 
+/// Extract compilation metadata from a compiled script
+pub fn get_compilation_metadata_from_compiled_script(
+    module: &CompiledScript,
+) -> Option<CompilationMetadata> {
+    if let Some(data) = find_metadata_in_script(module, COMPILATION_METADATA_KEY) {
+        bcs::from_bytes::<CompilationMetadata>(&data.value).ok()
+    } else {
+        None
+    }
+}
+
 // This is mostly a copy paste of the existing function
 // get_metadata_from_compiled_module. In the API types there is a unifying trait for
 // modules and scripts called Bytecode that could help eliminate this duplication,
@@ -388,12 +398,12 @@ pub struct AttributeValidationError {
 }
 
 pub fn is_valid_unbiasable_function(
-    functions: &BTreeMap<Identifier, Function>,
+    functions: &BTreeMap<&IdentStr, (&FunctionHandle, &FunctionDefinition)>,
     fun: &str,
 ) -> Result<(), AttributeValidationError> {
     if let Ok(ident_fun) = Identifier::new(fun) {
-        if let Some(f) = functions.get(&ident_fun) {
-            if f.is_entry && !f.visibility.is_public() {
+        if let Some((_func_handle, func_def)) = functions.get(ident_fun.as_ident_str()) {
+            if func_def.is_entry && !func_def.visibility.is_public() {
                 return Ok(());
             }
         }
@@ -406,12 +416,14 @@ pub fn is_valid_unbiasable_function(
 }
 
 pub fn is_valid_view_function(
-    functions: &BTreeMap<Identifier, Function>,
+    module: &CompiledModule,
+    functions: &BTreeMap<&IdentStr, (&FunctionHandle, &FunctionDefinition)>,
     fun: &str,
 ) -> Result<(), AttributeValidationError> {
     if let Ok(ident_fun) = Identifier::new(fun) {
-        if let Some(mod_fun) = functions.get(&ident_fun) {
-            if !mod_fun.return_.is_empty() {
+        if let Some((func_handle, _func_def)) = functions.get(ident_fun.as_ident_str()) {
+            let sig = module.signature_at(func_handle.return_);
+            if !sig.0.is_empty() {
                 return Ok(());
             }
         }
@@ -424,14 +436,18 @@ pub fn is_valid_view_function(
 }
 
 pub fn is_valid_resource_group(
-    structs: &BTreeMap<Identifier, Struct>,
+    structs: &BTreeMap<&IdentStr, (&StructHandle, &StructDefinition)>,
     struct_: &str,
 ) -> Result<(), AttributeValidationError> {
     if let Ok(ident_struct) = Identifier::new(struct_) {
-        if let Some(mod_struct) = structs.get(&ident_struct) {
-            if mod_struct.abilities == AbilitySet::EMPTY
-                && mod_struct.type_parameters.is_empty()
-                && mod_struct.fields.len() == 1
+        if let Some((struct_handle, struct_def)) = structs.get(ident_struct.as_ident_str()) {
+            let num_fields = match &struct_def.field_information {
+                StructFieldInformation::Native | StructFieldInformation::DeclaredVariants(_) => 0,
+                StructFieldInformation::Declared(fields) => fields.len(),
+            };
+            if struct_handle.abilities == AbilitySet::EMPTY
+                && struct_handle.type_parameters.is_empty()
+                && num_fields == 1
             {
                 return Ok(());
             }
@@ -445,12 +461,12 @@ pub fn is_valid_resource_group(
 }
 
 pub fn is_valid_resource_group_member(
-    structs: &BTreeMap<Identifier, Struct>,
+    structs: &BTreeMap<&IdentStr, (&StructHandle, &StructDefinition)>,
     struct_: &str,
 ) -> Result<(), AttributeValidationError> {
     if let Ok(ident_struct) = Identifier::new(struct_) {
-        if let Some(mod_struct) = structs.get(&ident_struct) {
-            if mod_struct.abilities.has_ability(Ability::Key) {
+        if let Some((struct_handle, _struct_def)) = structs.get(ident_struct.as_ident_str()) {
+            if struct_handle.abilities.has_ability(Ability::Key) {
                 return Ok(());
             }
         }
@@ -465,9 +481,11 @@ pub fn is_valid_resource_group_member(
 pub fn verify_module_metadata(
     module: &CompiledModule,
     features: &Features,
-    _timed_features: &TimedFeatures,
+    timed_features: &TimedFeatures,
 ) -> Result<(), MetaDataValidationError> {
-    if features.is_enabled(FeatureFlag::SAFER_METADATA) {
+    if features.is_enabled(FeatureFlag::SAFER_METADATA)
+        && timed_features.is_enabled(TimedFeatureFlag::ModuleComplexityCheck)
+    {
         check_module_complexity(module)?;
     }
 
@@ -483,13 +501,17 @@ pub fn verify_module_metadata(
     let functions = module
         .function_defs
         .iter()
-        .map(|func_def| Function::new(module, func_def))
+        .map(|func_def| {
+            let func_handle = module.function_handle_at(func_def.function);
+            let name = module.identifier_at(func_handle.name);
+            (name, (func_handle, func_def))
+        })
         .collect::<BTreeMap<_, _>>();
 
     for (fun, attrs) in &metadata.fun_attributes {
         for attr in attrs {
             if attr.is_view_function() {
-                is_valid_view_function(&functions, fun)?;
+                is_valid_view_function(module, &functions, fun)?;
             } else if attr.is_randomness() {
                 is_valid_unbiasable_function(&functions, fun)?;
             } else {
@@ -505,7 +527,11 @@ pub fn verify_module_metadata(
     let structs = module
         .struct_defs
         .iter()
-        .map(|d| Struct::new(module, d))
+        .map(|struct_def| {
+            let struct_handle = module.struct_handle_at(struct_def.struct_handle);
+            let name = module.identifier_at(struct_handle.name);
+            (name, (struct_handle, struct_def))
+        })
         .collect::<BTreeMap<_, _>>();
 
     for (struct_, attrs) in &metadata.struct_attributes {
diff --git a/aptos-move/framework/src/natives/aggregator_natives/aggregator_v2.rs b/aptos-move/framework/src/natives/aggregator_natives/aggregator_v2.rs
index 365216f4bf67a..521d62bd6ae22 100644
--- a/aptos-move/framework/src/natives/aggregator_natives/aggregator_v2.rs
+++ b/aptos-move/framework/src/natives/aggregator_natives/aggregator_v2.rs
@@ -36,9 +36,6 @@ use std::{cell::RefMut, collections::VecDeque};
 /// The generic type supplied to aggregator snapshots is not supported.
 pub const EUNSUPPORTED_AGGREGATOR_SNAPSHOT_TYPE: u64 = 0x03_0005;
 
-/// The aggregator api feature is not enabled.
-pub const EAGGREGATOR_API_NOT_ENABLED: u64 = 0x03_0006;
-
 /// The generic type supplied to the aggregators is not supported.
 pub const EUNSUPPORTED_AGGREGATOR_TYPE: u64 = 0x03_0007;
 
@@ -54,16 +51,6 @@ pub const EAGGREGATOR_FUNCTION_NOT_YET_SUPPORTED: u64 = 0x03_0009;
 /// If we want to increase this, we need to modify BITS_FOR_SIZE in types/src/delayed_fields.rs.
 pub const DERIVED_STRING_INPUT_MAX_LENGTH: usize = 1024;
 
-macro_rules! abort_if_aggregator_api_not_enabled {
-    ($context:expr) => {
-        if !$context.aggregator_v2_api_enabled() {
-            return Err(SafeNativeError::Abort {
-                abort_code: EAGGREGATOR_API_NOT_ENABLED,
-            });
-        }
-    };
-}
-
 fn get_width_by_type(ty_arg: &Type, error_code_if_incorrect: u64) -> SafeNativeResult<u32> {
     match ty_arg {
         Type::U128 => Ok(16),
@@ -113,11 +100,7 @@ fn get_context_data<'t, 'b>(
     context: &'t mut SafeNativeContext<'_, 'b, '_, '_>,
 ) -> Option<(&'b dyn DelayedFieldResolver, RefMut<'t, DelayedFieldData>)> {
     let aggregator_context = context.extensions().get::<NativeAggregatorContext>();
-    if aggregator_context
-        .delayed_field_resolver
-        .is_delayed_field_optimization_capable()
-        && context.aggregator_v2_delayed_fields_enabled()
-    {
+    if aggregator_context.delayed_field_optimization_enabled {
         Some((
             aggregator_context.delayed_field_resolver,
             aggregator_context.delayed_field_data.borrow_mut(),
@@ -157,8 +140,6 @@ fn native_create_aggregator(
     ty_args: Vec<Type>,
     mut args: VecDeque<Value>,
 ) -> SafeNativeResult<SmallVec<[Value; 1]>> {
-    abort_if_aggregator_api_not_enabled!(context);
-
     debug_assert_eq!(args.len(), 1);
     debug_assert_eq!(ty_args.len(), 1);
     context.charge(AGGREGATOR_V2_CREATE_AGGREGATOR_BASE)?;
@@ -176,8 +157,6 @@ fn native_create_unbounded_aggregator(
     ty_args: Vec<Type>,
     args: VecDeque<Value>,
 ) -> SafeNativeResult<SmallVec<[Value; 1]>> {
-    abort_if_aggregator_api_not_enabled!(context);
-
     debug_assert_eq!(args.len(), 0);
     debug_assert_eq!(ty_args.len(), 1);
     context.charge(AGGREGATOR_V2_CREATE_AGGREGATOR_BASE)?;
@@ -194,8 +173,6 @@ fn native_try_add(
     ty_args: Vec<Type>,
     mut args: VecDeque<Value>,
 ) -> SafeNativeResult<SmallVec<[Value; 1]>> {
-    abort_if_aggregator_api_not_enabled!(context);
-
     debug_assert_eq!(args.len(), 2);
     debug_assert_eq!(ty_args.len(), 1);
     context.charge(AGGREGATOR_V2_TRY_ADD_BASE)?;
@@ -208,7 +185,13 @@ fn native_try_add(
 
     let success = if let Some((resolver, mut delayed_field_data)) = get_context_data(context) {
         let id = get_aggregator_value_as_id(&aggregator, aggregator_value_ty, resolver)?;
-        delayed_field_data.try_add_delta(id, max_value, SignedU128::Positive(rhs), resolver)?
+        delayed_field_data.try_add_or_check_delta(
+            id,
+            max_value,
+            SignedU128::Positive(rhs),
+            resolver,
+            true,
+        )?
     } else {
         let lhs = get_aggregator_value(&aggregator, aggregator_value_ty)?;
         match BoundedMath::new(max_value).unsigned_add(lhs, rhs) {
@@ -236,8 +219,6 @@ fn native_try_sub(
     ty_args: Vec<Type>,
     mut args: VecDeque<Value>,
 ) -> SafeNativeResult<SmallVec<[Value; 1]>> {
-    abort_if_aggregator_api_not_enabled!(context);
-
     debug_assert_eq!(args.len(), 2);
     debug_assert_eq!(ty_args.len(), 1);
     context.charge(AGGREGATOR_V2_TRY_SUB_BASE)?;
@@ -250,7 +231,13 @@ fn native_try_sub(
 
     let success = if let Some((resolver, mut delayed_field_data)) = get_context_data(context) {
         let id = get_aggregator_value_as_id(&aggregator, aggregator_value_ty, resolver)?;
-        delayed_field_data.try_add_delta(id, max_value, SignedU128::Negative(rhs), resolver)?
+        delayed_field_data.try_add_or_check_delta(
+            id,
+            max_value,
+            SignedU128::Negative(rhs),
+            resolver,
+            true,
+        )?
     } else {
         let lhs = get_aggregator_value(&aggregator, aggregator_value_ty)?;
         match BoundedMath::new(max_value).unsigned_subtract(lhs, rhs) {
@@ -270,6 +257,40 @@ fn native_try_sub(
     Ok(smallvec![Value::bool(success)])
 }
 
+fn native_is_at_least_impl(
+    context: &mut SafeNativeContext,
+    ty_args: Vec<Type>,
+    mut args: VecDeque<Value>,
+) -> SafeNativeResult<SmallVec<[Value; 1]>> {
+    debug_assert_eq!(args.len(), 2);
+    debug_assert_eq!(ty_args.len(), 1);
+    context.charge(AGGREGATOR_V2_IS_AT_LEAST_BASE)?;
+
+    let aggregator_value_ty = &ty_args[0];
+    let rhs = pop_value_by_type(aggregator_value_ty, &mut args, EUNSUPPORTED_AGGREGATOR_TYPE)?;
+    let aggregator = safely_pop_arg!(args, StructRef);
+
+    let max_value = get_aggregator_max_value(&aggregator, aggregator_value_ty)?;
+
+    let success = if let Some((resolver, mut delayed_field_data)) = get_context_data(context) {
+        let id = get_aggregator_value_as_id(&aggregator, aggregator_value_ty, resolver)?;
+        delayed_field_data.try_add_or_check_delta(
+            id,
+            max_value,
+            SignedU128::Negative(rhs),
+            resolver,
+            false,
+        )?
+    } else {
+        let lhs = get_aggregator_value(&aggregator, aggregator_value_ty)?;
+        BoundedMath::new(max_value)
+            .unsigned_subtract(lhs, rhs)
+            .is_ok()
+    };
+
+    Ok(smallvec![Value::bool(success)])
+}
+
 /***************************************************************************************************
  * native fun read<IntElement>(aggregator: &Aggregator<IntElement>): IntElement;
  **************************************************************************************************/
@@ -279,8 +300,6 @@ fn native_read(
     ty_args: Vec<Type>,
     mut args: VecDeque<Value>,
 ) -> SafeNativeResult<SmallVec<[Value; 1]>> {
-    abort_if_aggregator_api_not_enabled!(context);
-
     debug_assert_eq!(args.len(), 1);
     debug_assert_eq!(ty_args.len(), 1);
     context.charge(AGGREGATOR_V2_READ_BASE)?;
@@ -317,8 +336,6 @@ fn native_snapshot(
     ty_args: Vec<Type>,
     mut args: VecDeque<Value>,
 ) -> SafeNativeResult<SmallVec<[Value; 1]>> {
-    abort_if_aggregator_api_not_enabled!(context);
-
     debug_assert_eq!(args.len(), 1);
     debug_assert_eq!(ty_args.len(), 1);
     context.charge(AGGREGATOR_V2_SNAPSHOT_BASE)?;
@@ -354,8 +371,6 @@ fn native_create_snapshot(
     ty_args: Vec<Type>,
     mut args: VecDeque<Value>,
 ) -> SafeNativeResult<SmallVec<[Value; 1]>> {
-    abort_if_aggregator_api_not_enabled!(context);
-
     debug_assert_eq!(ty_args.len(), 1);
     debug_assert_eq!(args.len(), 1);
     context.charge(AGGREGATOR_V2_CREATE_SNAPSHOT_BASE)?;
@@ -390,35 +405,13 @@ fn native_create_snapshot(
  **************************************************************************************************/
 
 fn native_copy_snapshot(
-    context: &mut SafeNativeContext,
+    _context: &mut SafeNativeContext,
     _ty_args: Vec<Type>,
     _args: VecDeque<Value>,
 ) -> SafeNativeResult<SmallVec<[Value; 1]>> {
-    abort_if_aggregator_api_not_enabled!(context);
-
     Err(SafeNativeError::Abort {
         abort_code: EAGGREGATOR_FUNCTION_NOT_YET_SUPPORTED,
     })
-
-    // debug_assert_eq!(ty_args.len(), 1);
-    // debug_assert_eq!(args.len(), 1);
-    // context.charge(AGGREGATOR_V2_COPY_SNAPSHOT_BASE)?;
-
-    // let snapshot_type = SnapshotType::from_ty_arg(context, &ty_args[0])?;
-    // let snapshot_value = snapshot_type.pop_snapshot_field_by_type(&mut args)?;
-
-    // let result_value = if context.aggregator_execution_enabled() {
-    //     let id = aggregator_snapshot_value_field_as_id(snapshot_value, resolver)?;
-
-    //     // snapshots are immutable so we can just return the id
-    //     SnapshotValue::Integer(id.id() as u128)
-    // } else {
-    //     snapshot_value
-    // };
-
-    // Ok(smallvec![Value::struct_(Struct::pack(vec![
-    //     snapshot_type.create_snapshot_value_by_type(result_value)?
-    // ]))])
 }
 
 /***************************************************************************************************
@@ -430,8 +423,6 @@ fn native_read_snapshot(
     ty_args: Vec<Type>,
     mut args: VecDeque<Value>,
 ) -> SafeNativeResult<SmallVec<[Value; 1]>> {
-    abort_if_aggregator_api_not_enabled!(context);
-
     debug_assert_eq!(ty_args.len(), 1);
     debug_assert_eq!(args.len(), 1);
     context.charge(AGGREGATOR_V2_READ_SNAPSHOT_BASE)?;
@@ -457,14 +448,11 @@ fn native_read_snapshot(
  * native fun string_concat<IntElement>(before: String, snapshot: &AggregatorSnapshot<IntElement>, after: String): AggregatorSnapshot<String>;
  **************************************************************************************************/
 fn native_string_concat(
-    context: &mut SafeNativeContext,
+    _context: &mut SafeNativeContext,
     _ty_args: Vec<Type>,
     _args: VecDeque<Value>,
 ) -> SafeNativeResult<SmallVec<[Value; 1]>> {
-    abort_if_aggregator_api_not_enabled!(context);
-
     // Deprecated function in favor of `derive_string_concat`.
-
     Err(SafeNativeError::Abort {
         abort_code: EAGGREGATOR_FUNCTION_NOT_YET_SUPPORTED,
     })
@@ -479,8 +467,6 @@ fn native_read_derived_string(
     ty_args: Vec<Type>,
     mut args: VecDeque<Value>,
 ) -> SafeNativeResult<SmallVec<[Value; 1]>> {
-    abort_if_aggregator_api_not_enabled!(context);
-
     debug_assert_eq!(ty_args.len(), 0);
     debug_assert_eq!(args.len(), 1);
     context.charge(AGGREGATOR_V2_READ_SNAPSHOT_BASE)?;
@@ -506,8 +492,6 @@ fn native_create_derived_string(
     ty_args: Vec<Type>,
     mut args: VecDeque<Value>,
 ) -> SafeNativeResult<SmallVec<[Value; 1]>> {
-    abort_if_aggregator_api_not_enabled!(context);
-
     debug_assert_eq!(ty_args.len(), 0);
     debug_assert_eq!(args.len(), 1);
     context.charge(AGGREGATOR_V2_CREATE_SNAPSHOT_BASE)?;
@@ -549,8 +533,6 @@ fn native_derive_string_concat(
     ty_args: Vec<Type>,
     mut args: VecDeque<Value>,
 ) -> SafeNativeResult<SmallVec<[Value; 1]>> {
-    abort_if_aggregator_api_not_enabled!(context);
-
     debug_assert_eq!(ty_args.len(), 1);
     debug_assert_eq!(args.len(), 3);
     context.charge(AGGREGATOR_V2_STRING_CONCAT_BASE)?;
@@ -633,8 +615,9 @@ pub fn make_all(
             native_create_unbounded_aggregator,
         ),
         ("try_add", native_try_add),
-        ("read", native_read),
         ("try_sub", native_try_sub),
+        ("is_at_least_impl", native_is_at_least_impl),
+        ("read", native_read),
         ("snapshot", native_snapshot),
         ("create_snapshot", native_create_snapshot),
         ("copy_snapshot", native_copy_snapshot),
diff --git a/aptos-move/framework/src/natives/aggregator_natives/context.rs b/aptos-move/framework/src/natives/aggregator_natives/context.rs
index 38286cb82abf3..4e536394e42e3 100644
--- a/aptos-move/framework/src/natives/aggregator_natives/context.rs
+++ b/aptos-move/framework/src/natives/aggregator_natives/context.rs
@@ -49,6 +49,7 @@ pub struct NativeAggregatorContext<'a> {
     txn_hash: [u8; 32],
     pub(crate) aggregator_v1_resolver: &'a dyn AggregatorV1Resolver,
     pub(crate) aggregator_v1_data: RefCell<AggregatorData>,
+    pub(crate) delayed_field_optimization_enabled: bool,
     pub(crate) delayed_field_resolver: &'a dyn DelayedFieldResolver,
     pub(crate) delayed_field_data: RefCell<DelayedFieldData>,
 }
@@ -59,6 +60,7 @@ impl<'a> NativeAggregatorContext<'a> {
     pub fn new(
         txn_hash: [u8; 32],
         aggregator_v1_resolver: &'a dyn AggregatorV1Resolver,
+        delayed_field_optimization_enabled: bool,
         delayed_field_resolver: &'a dyn DelayedFieldResolver,
     ) -> Self {
         Self {
@@ -66,6 +68,7 @@ impl<'a> NativeAggregatorContext<'a> {
             aggregator_v1_resolver,
             aggregator_v1_data: Default::default(),
             delayed_field_resolver,
+            delayed_field_optimization_enabled,
             delayed_field_data: Default::default(),
         }
     }
@@ -220,7 +223,7 @@ mod test {
     #[test]
     fn test_v1_into_change_set() {
         let resolver = get_test_resolver_v1();
-        let context = NativeAggregatorContext::new([0; 32], &resolver, &resolver);
+        let context = NativeAggregatorContext::new([0; 32], &resolver, true, &resolver);
         test_set_up_v1(&context);
 
         let AggregatorChangeSet {
@@ -458,7 +461,7 @@ mod test {
     #[test]
     fn test_v2_into_change_set() {
         let resolver = get_test_resolver_v2();
-        let context = NativeAggregatorContext::new([0; 32], &resolver, &resolver);
+        let context = NativeAggregatorContext::new([0; 32], &resolver, true, &resolver);
         test_set_up_v2(&context);
         let delayed_field_changes = context.into_delayed_fields();
         assert!(!delayed_field_changes.contains_key(&DelayedFieldID::new_with_width(1000, 8)));
diff --git a/aptos-move/framework/src/natives/cryptography/algebra/serialization.rs b/aptos-move/framework/src/natives/cryptography/algebra/serialization.rs
index 83cf9ee34a9b9..19a6457f30aa1 100644
--- a/aptos-move/framework/src/natives/cryptography/algebra/serialization.rs
+++ b/aptos-move/framework/src/natives/cryptography/algebra/serialization.rs
@@ -10,7 +10,9 @@ use crate::{
     },
     safe_borrow_element, store_element, structure_from_ty_arg,
 };
-use aptos_gas_schedule::gas_params::natives::aptos_framework::*;
+use aptos_gas_schedule::{
+    gas_feature_versions::RELEASE_V1_16, gas_params::natives::aptos_framework::*,
+};
 use aptos_native_interface::{
     safely_pop_arg, SafeNativeContext, SafeNativeError, SafeNativeResult,
 };
@@ -73,7 +75,7 @@ macro_rules! serialize_element {
         $structure_to_match:expr,
         $format_to_match:expr,
         [$(($field_structure:pat, $field_format:pat, $field_ty:ty, $field_serialization_func:ident,$reverse:expr, $field_serialization_gas:expr)),* $(,)?],
-        [$(($curve_structure:pat,$curve_format:pat, $curve_ty:ty, $curve_serialization_func:ident, $curve_serialization_gas:expr)),* $(,)?]
+        [$(($curve_structure:pat,$curve_format:pat, $curve_ty:ty, $curve_serialization_func:ident, $curve_serialization_gas:expr, $into_affine_gas:expr)),* $(,)?]
     ) => {
         match ($structure_to_match, $format_to_match) {
         $(
@@ -101,6 +103,9 @@ macro_rules! serialize_element {
                 element_ptr,
                 element
             );
+            if $context.gas_feature_version() >= RELEASE_V1_16 {
+                $context.charge($into_affine_gas)?;
+            }
             let element_affine = element.into_affine();
             let mut buf = Vec::new();
             $context.charge($curve_serialization_gas)?;
@@ -220,56 +225,64 @@ pub fn serialize_internal(
                     SerializationFormat::BLS12381G1Uncompressed,
                     ark_bls12_381::G1Projective,
                     serialize_uncompressed,
-                    ALGEBRA_ARK_BLS12_381_G1_AFFINE_SERIALIZE_UNCOMP
+                    ALGEBRA_ARK_BLS12_381_G1_AFFINE_SERIALIZE_UNCOMP,
+                    ALGEBRA_ARK_BLS12_381_G1_PROJ_TO_AFFINE
                 ),
                 (
                     Structure::BLS12381G1,
                     SerializationFormat::BLS12381G1Compressed,
                     ark_bls12_381::G1Projective,
                     serialize_compressed,
-                    ALGEBRA_ARK_BLS12_381_G1_AFFINE_SERIALIZE_COMP
+                    ALGEBRA_ARK_BLS12_381_G1_AFFINE_SERIALIZE_COMP,
+                    ALGEBRA_ARK_BLS12_381_G1_PROJ_TO_AFFINE
                 ),
                 (
                     Structure::BLS12381G2,
                     SerializationFormat::BLS12381G2Uncompressed,
                     ark_bls12_381::G2Projective,
                     serialize_uncompressed,
-                    ALGEBRA_ARK_BLS12_381_G2_AFFINE_SERIALIZE_UNCOMP
+                    ALGEBRA_ARK_BLS12_381_G2_AFFINE_SERIALIZE_UNCOMP,
+                    ALGEBRA_ARK_BLS12_381_G2_PROJ_TO_AFFINE
                 ),
                 (
                     Structure::BLS12381G2,
                     SerializationFormat::BLS12381G2Compressed,
                     ark_bls12_381::G2Projective,
                     serialize_compressed,
-                    ALGEBRA_ARK_BLS12_381_G2_AFFINE_SERIALIZE_COMP
+                    ALGEBRA_ARK_BLS12_381_G2_AFFINE_SERIALIZE_COMP,
+                    ALGEBRA_ARK_BLS12_381_G2_PROJ_TO_AFFINE
                 ),
                 (
                     Structure::BN254G1,
                     SerializationFormat::BN254G1Uncompressed,
                     ark_bn254::G1Projective,
                     serialize_uncompressed,
-                    ALGEBRA_ARK_BN254_G1_AFFINE_SERIALIZE_UNCOMP
+                    ALGEBRA_ARK_BN254_G1_AFFINE_SERIALIZE_UNCOMP,
+                    ALGEBRA_ARK_BN254_G1_PROJ_TO_AFFINE
                 ),
                 (
                     Structure::BN254G1,
                     SerializationFormat::BN254G1Compressed,
                     ark_bn254::G1Projective,
                     serialize_compressed,
-                    ALGEBRA_ARK_BN254_G1_AFFINE_SERIALIZE_COMP
+                    ALGEBRA_ARK_BN254_G1_AFFINE_SERIALIZE_COMP,
+                    ALGEBRA_ARK_BN254_G1_PROJ_TO_AFFINE
                 ),
                 (
                     Structure::BN254G2,
                     SerializationFormat::BN254G2Uncompressed,
                     ark_bn254::G2Projective,
                     serialize_uncompressed,
-                    ALGEBRA_ARK_BN254_G2_AFFINE_SERIALIZE_UNCOMP
+                    ALGEBRA_ARK_BN254_G2_AFFINE_SERIALIZE_UNCOMP,
+                    ALGEBRA_ARK_BN254_G2_PROJ_TO_AFFINE
                 ),
                 (
                     Structure::BN254G2,
                     SerializationFormat::BN254G2Compressed,
                     ark_bn254::G2Projective,
                     serialize_compressed,
-                    ALGEBRA_ARK_BN254_G2_AFFINE_SERIALIZE_COMP
+                    ALGEBRA_ARK_BN254_G2_AFFINE_SERIALIZE_COMP,
+                    ALGEBRA_ARK_BN254_G2_PROJ_TO_AFFINE
                 ),
             ]
         )
diff --git a/aptos-move/framework/src/natives/dispatchable_fungible_asset.rs b/aptos-move/framework/src/natives/dispatchable_fungible_asset.rs
index d7d0d76a6784d..9554c5d163377 100644
--- a/aptos-move/framework/src/natives/dispatchable_fungible_asset.rs
+++ b/aptos-move/framework/src/natives/dispatchable_fungible_asset.rs
@@ -11,7 +11,7 @@ use smallvec::SmallVec;
 use std::collections::VecDeque;
 
 /***************************************************************************************************
- * native fun dispatchable_withdraw / dispatchable_deposit / dispatchable_derived_balance
+ * native fun dispatchable_withdraw / dispatchable_deposit / dispatchable_derived_balance / dispatchable_derived_supply
  *
  *   Directs control flow based on the last argument. We use the same native function implementation
  *   for all dispatching native.
@@ -54,6 +54,7 @@ pub fn make_all(
         ("dispatchable_withdraw", native_dispatch as RawSafeNative),
         ("dispatchable_deposit", native_dispatch),
         ("dispatchable_derived_balance", native_dispatch),
+        ("dispatchable_derived_supply", native_dispatch),
     ];
 
     builder.make_named_natives(natives)
diff --git a/aptos-move/framework/src/natives/function_info.rs b/aptos-move/framework/src/natives/function_info.rs
index e044b23636d0f..2884ad8c82141 100644
--- a/aptos-move/framework/src/natives/function_info.rs
+++ b/aptos-move/framework/src/natives/function_info.rs
@@ -107,15 +107,19 @@ fn native_check_dispatch_type_compatibility_impl(
         )
     };
 
-    if lhs.param_tys.is_empty() {
+    if lhs.param_tys().is_empty() {
         return Err(SafeNativeError::Abort { abort_code: 2 });
     }
 
     Ok(smallvec![Value::bool(
-        rhs.ty_param_abilities == lhs.ty_param_abilities
-            && rhs.return_tys == lhs.return_tys
-            && lhs.param_tys[0..lhs.param_tys.len() - 1] == rhs.param_tys
-            && !rhs.def_is_friend_or_private
+        rhs.ty_param_abilities() == lhs.ty_param_abilities()
+            && rhs.return_tys() == lhs.return_tys()
+            && &lhs.param_tys()[0..lhs.param_count() - 1] == rhs.param_tys()
+            && !rhs.is_friend_or_private()
+            && (!context
+                .get_feature_flags()
+                .is_enabled(aptos_types::on_chain_config::FeatureFlag::DISALLOW_USER_NATIVES)
+                || !rhs.is_native())
             && lhs_id != rhs_id
     )])
 }
diff --git a/aptos-move/framework/src/natives/mod.rs b/aptos-move/framework/src/natives/mod.rs
index bec070b996540..dcfc80407f932 100644
--- a/aptos-move/framework/src/natives/mod.rs
+++ b/aptos-move/framework/src/natives/mod.rs
@@ -24,7 +24,7 @@ pub mod util;
 
 use crate::natives::cryptography::multi_ed25519;
 use aggregator_natives::{aggregator, aggregator_factory, aggregator_v2};
-use aptos_native_interface::SafeNativeBuilder;
+use aptos_native_interface::{RawSafeNative, SafeNativeBuilder};
 use cryptography::ed25519;
 use move_core_types::account_address::AccountAddress;
 use move_vm_runtime::native_functions::{make_table_from_iter, NativeFunctionTable};
@@ -39,6 +39,7 @@ pub mod status {
 pub fn all_natives(
     framework_addr: AccountAddress,
     builder: &SafeNativeBuilder,
+    inject_create_signer_for_gov_sim: bool,
 ) -> NativeFunctionTable {
     let mut natives = vec![];
 
@@ -91,5 +92,15 @@ pub fn all_natives(
         dispatchable_fungible_asset::make_all(builder)
     );
 
+    if inject_create_signer_for_gov_sim {
+        add_natives_from_module!(
+            "aptos_governance",
+            builder.make_named_natives([(
+                "create_signer",
+                create_signer::native_create_signer as RawSafeNative
+            )])
+        );
+    }
+
     make_table_from_iter(framework_addr, natives)
 }
diff --git a/aptos-move/framework/src/natives/string_utils.rs b/aptos-move/framework/src/natives/string_utils.rs
index b724fe2c476d8..0a4c7c71583f8 100644
--- a/aptos-move/framework/src/natives/string_utils.rs
+++ b/aptos-move/framework/src/natives/string_utils.rs
@@ -308,6 +308,45 @@ fn native_format_impl(
             )?;
             out.push('}');
         },
+        MoveTypeLayout::Struct(MoveStructLayout::RuntimeVariants(variants)) => {
+            let struct_value = val.value_as::<Struct>()?;
+            let (tag, elems) = struct_value.unpack_with_tag()?;
+            if (tag as usize) >= variants.len() {
+                return Err(SafeNativeError::Abort {
+                    abort_code: EINVALID_FORMAT,
+                });
+            }
+            out.push_str(&format!("#{}{{", tag));
+            format_vector(
+                context,
+                variants[tag as usize].iter(),
+                elems.collect(),
+                depth,
+                !context.single_line,
+                out,
+            )?;
+            out.push('}');
+        },
+        MoveTypeLayout::Struct(MoveStructLayout::WithVariants(variants)) => {
+            let struct_value = val.value_as::<Struct>()?;
+            let (tag, elems) = struct_value.unpack_with_tag()?;
+            if (tag as usize) >= variants.len() {
+                return Err(SafeNativeError::Abort {
+                    abort_code: EINVALID_FORMAT,
+                });
+            }
+            let variant = &variants[tag as usize];
+            out.push_str(&format!("{}{{", variant.name));
+            format_vector(
+                context,
+                variant.fields.iter(),
+                elems.collect(),
+                depth,
+                !context.single_line,
+                out,
+            )?;
+            out.push('}');
+        },
 
         // This is unreachable because we check layout at the start. Still, return
         // an error to be safe.
diff --git a/aptos-move/framework/src/prover.rs b/aptos-move/framework/src/prover.rs
index 5351388a66ad1..c88b04596f094 100644
--- a/aptos-move/framework/src/prover.rs
+++ b/aptos-move/framework/src/prover.rs
@@ -123,6 +123,7 @@ impl ProverOptions {
         language_version: Option<LanguageVersion>,
         skip_attribute_checks: bool,
         known_attributes: &BTreeSet<String>,
+        experiments: &[String],
     ) -> anyhow::Result<()> {
         let now = Instant::now();
         let for_test = self.for_test;
@@ -136,6 +137,7 @@ impl ProverOptions {
             language_version,
             skip_attribute_checks,
             known_attributes.clone(),
+            experiments.to_vec(),
         )?;
         let mut options = self.convert_options();
         // Need to ensure a distinct output.bpl file for concurrent execution. In non-test
diff --git a/aptos-move/framework/tests/move_prover_tests.rs b/aptos-move/framework/tests/move_prover_tests.rs
index 466aea472db31..94237a2e220f2 100644
--- a/aptos-move/framework/tests/move_prover_tests.rs
+++ b/aptos-move/framework/tests/move_prover_tests.rs
@@ -62,6 +62,7 @@ pub fn run_prover_for_pkg(path_to_pkg: impl Into<String>) {
                 None,
                 skip_attribute_checks,
                 extended_checks::get_all_attribute_names(),
+                &[],
             )
             .unwrap()
     }
diff --git a/aptos-move/move-examples/aggregator_examples/Move.toml b/aptos-move/move-examples/aggregator_examples/Move.toml
new file mode 100644
index 0000000000000..0f74a21d75a76
--- /dev/null
+++ b/aptos-move/move-examples/aggregator_examples/Move.toml
@@ -0,0 +1,10 @@
+[package]
+name = "Aggregator examples"
+version = "0.0.0"
+
+[addresses]
+aggregator_examples = "0xCAFE"
+
+[dependencies]
+AptosStdlib = { local = "../../framework/aptos-stdlib" }
+AptosFramework = { local = "../../framework/aptos-framework" }
diff --git a/aptos-move/move-examples/aggregator_examples/sources/counter_with_milestone.move b/aptos-move/move-examples/aggregator_examples/sources/counter_with_milestone.move
new file mode 100644
index 0000000000000..812b2c00df81f
--- /dev/null
+++ b/aptos-move/move-examples/aggregator_examples/sources/counter_with_milestone.move
@@ -0,0 +1,64 @@
+/// This is a module that showcases how to use new AggregatorV2 parallelism and branch prediction features
+/// to create a global counter, which is checked for specific milestones,
+/// and transactions that cross the milestone have special logic to celebrate the milestone.
+/// Checking the milestone only creates a reduced parallelism right around the point where
+/// milestone is reached, and so if milestones are spread out (like a thousand or more apart),
+/// there should be no impact on throughput / parallelism overall.
+///
+/// In a very similar way, milestones for token (Digital Asset) minting can be processed,
+/// by using collection::is_total_minted_at_least call, as Digital Asset collections track their
+/// supply and total minted thus far.
+module aggregator_examples::counter_with_milestone {
+    use std::error;
+    use std::signer;
+    use aptos_framework::aggregator_v2::{Self, Aggregator};
+    use aptos_framework::event;
+
+    // Resource being modified doesn't exist
+    const ERESOURCE_NOT_PRESENT: u64 = 2;
+
+    // Incrementing a counter failed
+    const ECOUNTER_INCREMENT_FAIL: u64 = 4;
+
+    const ENOT_AUTHORIZED: u64 = 5;
+
+    struct MilestoneCounter has key {
+        next_milestone: u64,
+        milestone_every: u64,
+        count: Aggregator<u64>,
+    }
+
+    #[event]
+    struct MilestoneReached has drop, store {
+        milestone: u64,
+    }
+
+    // Create the global `MilestoneCounter`.
+    // Stored under the module publisher address.
+    public entry fun create(publisher: &signer, milestone_every: u64) {
+        assert!(
+            signer::address_of(publisher) == @aggregator_examples,
+            ENOT_AUTHORIZED,
+        );
+
+        move_to<MilestoneCounter>(
+            publisher,
+            MilestoneCounter {
+                next_milestone: milestone_every,
+                milestone_every,
+                count: aggregator_v2::create_unbounded_aggregator(),
+            }
+        );
+    }
+
+    public entry fun increment_milestone() acquires MilestoneCounter {
+        assert!(exists<MilestoneCounter>(@aggregator_examples), error::invalid_argument(ERESOURCE_NOT_PRESENT));
+        let milestone_counter = borrow_global_mut<MilestoneCounter>(@aggregator_examples);
+        assert!(aggregator_v2::try_add(&mut milestone_counter.count, 1), ECOUNTER_INCREMENT_FAIL);
+
+        if (aggregator_v2::is_at_least(&milestone_counter.count, milestone_counter.next_milestone) && !aggregator_v2::is_at_least(&milestone_counter.count, milestone_counter.next_milestone + 1)) {
+            event::emit(MilestoneReached { milestone: milestone_counter.next_milestone});
+            milestone_counter.next_milestone = milestone_counter.next_milestone + milestone_counter.milestone_every;
+        }
+    }
+}
diff --git a/aptos-move/move-examples/bonding_curve_launchpad/Move.toml b/aptos-move/move-examples/bonding_curve_launchpad/Move.toml
new file mode 100644
index 0000000000000..128146718eb52
--- /dev/null
+++ b/aptos-move/move-examples/bonding_curve_launchpad/Move.toml
@@ -0,0 +1,26 @@
+[package]
+name = "bonding_curve_launchpad"
+version = "1.0.0"
+authors = []
+upgrade_policy = "compatible"
+
+[addresses]
+bonding_curve_launchpad = "_"
+deployer = "_"
+swap = "_"
+
+[dev-addresses]
+bonding_curve_launchpad = "0x650"
+deployer = "0xaaa"
+swap = "0xcafe"
+
+
+[dependencies.AptosFramework]
+git = "https://github.com/aptos-labs/aptos-core.git"
+rev = "bbf569abd260d94bc30fe96da297d2aecb193644"
+subdir = "aptos-move/framework/aptos-framework"
+
+[dependencies.swap]
+git = "https://github.com/aptos-labs/aptos-core.git"
+rev = "bbf569abd260d94bc30fe96da297d2aecb193644"
+subdir = "aptos-move/move-examples/swap"
diff --git a/aptos-move/move-examples/bonding_curve_launchpad/README.md b/aptos-move/move-examples/bonding_curve_launchpad/README.md
new file mode 100644
index 0000000000000..ceba3f1917313
--- /dev/null
+++ b/aptos-move/move-examples/bonding_curve_launchpad/README.md
@@ -0,0 +1,126 @@
+# Bonding Curve Launchpad
+
+## Overview
+Bonding Curve Launchpad (BCL) - A fungible asset launchpad that doubles as a controlled DEX to create fairer token launches.
+
+After creation of a new FA, it can, initially, only be traded on the launchpad. Dispatchable FA features are used to support the global freezing of tokens from external transfers. The creator of the FA can not premint to gain advantages against latter participants. Additionally, the usage of virtual liquidity prevents the typical overwhelming early adopter's advantage.
+
+Once the APT threshold is met within the liquidity pair, the reserves are moved onto a public DEX, referred to as graduation. From there, the global freeze is disabled, allowing all participants to freely use their tokens.
+
+### Key terms
+**Graduation** - The process of moving the close-looped FA's liquidity reserves from the `bonding_curve_launchpad` to a public DEX, while enabling any and all transfers from FA owners. Public trading is then available, removing the need to consult the `bonding_curve_launchpad`'s held `transfer_ref` for the given FA.
+
+**Virtual Liquidity** - To prevent early adopter's advantage, a pre-defined amount of virtual liquidity is assumed to exist in all APT reserves for liquidity pairs. Since the FA and APT reserves will be closer together in value, an early transfer won't be as dramatic for the number of tokens received. 
+
+
+## This resource contains:
+* (Dispatchable) Fungible Assets.
+* Reusing stored signer vars (w/ [objects](https://aptos.dev/move/move-on-aptos/objects/)).
+* External third party dependencies.
+* E2E testing (w/ object deployments, APT creation).
+* Using `rev` to specify feature branches ([Dispatchable FA](https://github.com/aptos-labs/aptos-core/commit/bbf569abd260d94bc30fe96da297d2aecb193644)).
+* and more.
+
+## In-depth info
+### Description
+The goal of a bonding curve launchpad is to create a more direct and open environment for FA launches. What does this mean?
+* Less early adopter's advantage
+* No pre-mints
+* No allocation to private investors
+
+Due to the technical nature of the blockchain, it can be hard to determine whether an FA is impacted by 
+the above attributes. 
+Although these are not inherently negative, many users have admitted to decreased interest 
+in new FAs that include them.
+This has led to an increase interest on improving "fairness" of FA launches, and one way to approach this is through 
+a smart contract solution. 
+
+`bonding_curve_launchpad` is one instance of a smart contract-based effort that accomplishes this.
+
+### Dispatchable withdraw function
+When using the Dispatchable FA standard, one can define a custom `withdraw` function 
+(along with others, like deposit and derived_balance). This logic is executed every time the 
+default `withdraw` is called, like during an FA transfer.
+
+`bonding_curve_launchpad` takes advantage of this by conditionally checking if a liquidity 
+pair state variable is valid. More specifically, the related FA's state variable `is_frozen` must 
+be set to `false`, otherwise all withdraws will fail.
+
+This prevents any transfers from occurring that happen outside the explicit usage of `transfer_ref`. Participants will 
+be forced to only use their FAs within the context of `bonding_curve_launchpad`, until the respective FA's `is_frozen` 
+is toggled to `true` during **graduation**.
+
+### Trading function
+Constant product formula is used within `liquidity_pairs` for calculating `get_amount_out`, similar to 
+[UniswapV2 on Ethereum](https://docs.uniswap.org/contracts/v2/concepts/protocol-overview/how-uniswap-works). 
+Although chosen for familiarity and simplicity's sake, in a production environment, one may look towards other 
+trading functions.
+
+One style could encompass sublinear functions to reward early adopters more heavily.
+
+
+## Related files
+### `bonding_curve_launchpad.move`
+* Contains public methods (both entry and normal), for the end user.
+* Creates and holds references (transfer) to the launched Fungible Asset through the FA's respective Object.
+* Dispatches to `liquidity_pairs` to create a new pair between the launched FA and APT.
+* Facilitates swaps between any enabled FA and APT.
+### `liquidity_pairs.move`
+* Creates and holds references to each liquidity pair, through a named objects.
+* Contains business logic for performing swaps on each pair.
+* Performs graduation ceremony to disable liquidity pair, and move all reserves to an external, third party DEX.
+### `test_bonding_curve_launchpad.move`
+* E2E tests.
+### `move-examples/swap`
+* Fungible Asset DEX example from the `aptos-move` examples.
+
+
+### Lifecycle of launched FA
+#### Launching the FA and liquidity pair
+1. User initiates FA creation on the `bonding_curve_launchpad` through `create_fa_pair(...)`.
+   1. `bonding_curve_launchpad` creates a new dispatchable FA and assigns the `"FA Generator" Object` as the creator, by retrieving it's `signer` using a stored `extend_ref`. Importantly, the user initiating the FA does not have any permissions (mint, transfer, burn), preventing their ability to pre-mint. FA capabilities (`transfer_ref`) are stored within the FA's respective Object, for future transfers.
+   2. The dispatchable `withdraw` function is defined to disallow all transfers between FA owners, until **graduation** is met. It does this through a state value associated with the FA's soon-to-be generated liquidity pair, called `is_frozen`, which is initially set to `true`. This prevents the FA from being traded on external DEXs or through external means. Transfers are only available through the limited `transfer_ref` stored on `bonding_curve_launchpad`, and restricted to swaps on the `liquidity_pairs`'s liquidity pair. 
+   3. A pre-defined number of the FA is minted, and kept temporarily on `bonding_curve_launchpad`.
+2. `bonding_curve_launchpad` creates a liquidity pair on the `liquidity_pairs` module, which follows the constant product formula.
+   1. Liquidity pair is represented and stored as an Object. This allows for the reserves to be held directly on the object, rather than the `bonding_curve_launchpad` account.
+   2. The entirety of minted FA + a pre-defined number of **virtual liquidity** for APT is deposited into the liquidity pair object. 
+   3. Trading against the liquidity pair is enabled, but restricted to `public entry` functions found in `bonding_curve_launchpad`.
+3. Optionally, the creator can immediately initiate a swap from APT to the FA.
+#### Trading against the FA's associated liquidity pair
+1. External users can swap APT to FA, or vice versa, through `public entry` methods available on `bonding_curve_launchpad`. 
+   1. Although the normal `transfer` functionality of the FA is disabled by the custom dispatchable `withdraw` function, `bonding_curve_launchpad` can assist with swaps using it's stored `transfer_ref` from the FA's Object. `transfer_ref` is not impeded by the custom dispatchable function.
+   2. The logic for calculating the `amountOut` of a swap is based on the constant product formula for reader familiarity. In a production scenario, a sub-linear trading function can assist in incentivizing general early adoption.
+#### Graduating from `liquidity_pairs` to a public FA DEX
+1. After each swap from APT to FA, when the APT reserves are increasing, a threshold is checked for whether the liquidity pair can **graduate** or not. The threshold is a pre-defined minimum amount of APT that must exist in the reserves. Once this threshold is met during a swap, **graduation** begins.
+   1. The associated liquidity pair on the `liquidity_pairs` module is disabled by toggling `is_enabled`, preventing any more swaps against the pair. Additionally, the liquidity pair's `is_frozen` is disabled to allow owners to transfer freely. 
+   2. The reserves from the liquidity pair, both APT and FA, are moved to an external, public third-party DEX as a new liquidity pair. In this case, the `aptos-move` FA DEX example, called swap. 
+   3. To prevent any wrongdoing from the `bonding_curve_launchpad` owner, any liquidity tokens received during the creation of the new liquidity pair on the third-party DEX will be sent to a dead address. Otherwise, the tokens could be used to drain the liquidity pair, at any time.
+
+
+
+## How to test:
+```console
+aptos move test --dev
+```
+
+## Example testnet deployments
+[Bonding Curve Launchpad](https://explorer.aptoslabs.com/account/0x0bb954c7dda5fa777cb34d2e35f593ddc4749f1ab260017ee75d1d216a551841/transactions?network=testnet)
+
+[Swap DEX](https://explorer.aptoslabs.com/account/0xe26bbe169db47aaa32349d253891af42134e1f6b64fef63f60105ec9ab6b240f/transactions?network=testnet?)
+
+[Swap Deployer](https://explorer.aptoslabs.com/account/0x4d51c99abff19bfb5ca3065f1e71dfc066c38e334def24dbac2b2a38bee8b946?network=testnet)
+
+
+## How to deploy:
+0. **Note:** Since the `swap` module we're relying on as a third party DEX isn't on-chain, you'll need to first:
+    * Deploy the `swap` module on-chain. Or, if you're on the testnet, you can use the [already-deployed `swap` smart contract](https://explorer.aptoslabs.com/account/0xe26bbe169db47aaa32349d253891af42134e1f6b64fef63f60105ec9ab6b240f/transactions?network=testnet?).
+    * Rely on a different DEX for the token graduation.
+
+From there, you can follow the [object code deployment](https://preview.aptos.dev/en/build/smart-contracts/learn-move/advanced-guides/object-code-deployment) steps to deploy and set up the smart contract.
+
+### Testnet deployment
+Deploy the `bonding_curve_launchpad` to the testnet referencing the already-deployed `swap` smart contract:
+```console
+aptos move publish --profile testnet_bonding_curve_launchpad \
+--named-addresses bonding_curve_launchpad={REPLACE_WITH_YOUR_ACCOUNT},swap=0xe26bbe169db47aaa32349d253891af42134e1f6b64fef63f60105ec9ab6b240f,deployer=0x4d51c99abff19bfb5ca3065f1e71dfc066c38e334def24dbac2b2a38bee8b946
+```
\ No newline at end of file
diff --git a/aptos-move/move-examples/bonding_curve_launchpad/sources/bonding_curve_launchpad.move b/aptos-move/move-examples/bonding_curve_launchpad/sources/bonding_curve_launchpad.move
new file mode 100644
index 0000000000000..4209536d25526
--- /dev/null
+++ b/aptos-move/move-examples/bonding_curve_launchpad/sources/bonding_curve_launchpad.move
@@ -0,0 +1,270 @@
+module bonding_curve_launchpad::bonding_curve_launchpad {
+    use std::string::{Self, String};
+    use std::option;
+    use std::vector;
+    use aptos_framework::object::{Self, Object, ExtendRef};
+    use aptos_framework::fungible_asset::{Self, FungibleAsset, Metadata, TransferRef};
+    use aptos_framework::primary_fungible_store;
+    use aptos_framework::event;
+    use aptos_framework::function_info::{Self, FunctionInfo};
+    use aptos_framework::dispatchable_fungible_asset;
+    use aptos_std::math128;
+    use bonding_curve_launchpad::liquidity_pairs;
+
+    /// FA's name and symbol already exist on the launchpad.
+    const EFA_EXISTS_ALREADY: u64 = 10;
+    /// Unknown FA. Not recognized on platform.
+    const EFA_DOES_NOT_EXIST: u64 = 11;
+    /// FA is globally frozen for transfers.
+    const EFA_FROZEN: u64 = 13;
+    /// Swap amount_in is non-positive.
+    const ELIQUIDITY_PAIR_SWAP_AMOUNTIN_INVALID: u64 = 110;
+
+    //---------------------------Events---------------------------
+    #[event]
+    struct FungibleAssetCreated has store, drop {
+        name: String,
+        symbol: String,
+        max_supply: u128,
+        decimals: u8,
+        icon_uri: String,
+        project_uri: String
+    }
+
+    //---------------------------Structs---------------------------
+    struct LaunchPad has key {
+        permissioned_withdraw: FunctionInfo,
+        fa_generator_extend_ref: ExtendRef
+    }
+
+    #[resource_group_member(group = aptos_framework::object::ObjectGroup)]
+    struct FAController has key, store {
+        transfer_ref: TransferRef
+    }
+
+    //---------------------------Init---------------------------
+    fun init_module(account: &signer) {
+        // Create and store the permissioned_withdraw function (global freezing based on FA status) while access to
+        // the account signer is available.
+        let permissioned_withdraw = function_info::new_function_info(
+            account,
+            string::utf8(b"bonding_curve_launchpad"),
+            string::utf8(b"withdraw")
+        );
+        // Since the account signer can't be placed in storage, we'll use an object and it's retrievable signer for any
+        // required signer usage. Primarily, when generating new Fungible Assets.
+        let fa_generator_extend_ref = object::generate_extend_ref(
+            &object::create_named_object(account, b"FA Generator")
+        );
+        move_to(
+            account,
+            LaunchPad {
+                permissioned_withdraw,
+                fa_generator_extend_ref
+            }
+        );
+    }
+
+    //---------------------------Views---------------------------
+    // Calculate the deterministic address of an FA using it's unique name and symbol combination within the
+    // "FA Generator" object.
+    #[view]
+    public fun get_fa_obj_address(
+        name: String,
+        symbol: String
+    ): address acquires LaunchPad {
+        let launchpad = borrow_global<LaunchPad>(@bonding_curve_launchpad);
+        let fa_generator_address = object::address_from_extend_ref(&launchpad.fa_generator_extend_ref);
+        let fa_key_seed = *string::bytes(&name);
+        vector::append(&mut fa_key_seed, b"-");
+        vector::append(&mut fa_key_seed, *string::bytes(&symbol));
+        object::create_object_address(&fa_generator_address, fa_key_seed)
+    }
+
+    // Retrieve the FA balance of a given user's address.
+    #[view]
+    public fun get_balance(
+        name: String,
+        symbol: String,
+        user: address
+    ): u64 acquires LaunchPad {
+        let fa_metadata_obj: Object<Metadata> = object::address_to_object(get_fa_obj_address(name, symbol));
+        primary_fungible_store::balance(user, fa_metadata_obj)
+    }
+
+    // Retrieve the Metadata object of a given FA's unique name and symbol.
+    #[view]
+    public fun get_metadata(
+        name: String,
+        symbol: String
+    ): Object<Metadata> acquires LaunchPad {
+        object::address_to_object(get_fa_obj_address(name, symbol))
+    }
+
+    // Retrieve frozen status of a given FA's unique name and symbol, from associated `liquidity_pair` state.
+    #[view]
+    public fun get_is_frozen(
+        name: String,
+        symbol: String
+    ): bool {
+        liquidity_pairs::get_is_frozen_metadata(name, symbol)
+    }
+
+    //---------------------------Dispatchable Standard---------------------------
+    /// Follows the Dispatchable FA standard for creating custom withdraw logic.
+    /// Each created FA has transfers disabled, until the APT reserves minimum threshold on
+    /// the associated liquidity pair are met. This is referred to as graduation.
+    /// - `transfer_ref` will ignore this custom withdraw logic.
+    /// - Since `transfer_ref` is only available to our permissioned/explicit actions, participants will initially only
+    ///   have the capability to either: Hold the FA, Swap within the `bonding_curve_launchpad` context.
+    public fun withdraw<T: key>(
+        store: Object<T>, amount: u64,
+        transfer_ref: &TransferRef
+    ): FungibleAsset {
+        let metadata = fungible_asset::transfer_ref_metadata(transfer_ref);
+        let name = fungible_asset::name(metadata);
+        let symbol = fungible_asset::symbol(metadata);
+        assert!(!liquidity_pairs::get_is_frozen_metadata(name, symbol), EFA_FROZEN);
+        fungible_asset::withdraw_with_ref(transfer_ref, store, amount)
+    }
+
+    //---------------------------Bonding Curve Launchpad (BCL)---------------------------
+    /// Participants can launch new FA's and their associated liquidity pair.
+    /// Optionally, the participant can immediately perform an initial swap from APT to FA.
+    public entry fun create_fa_pair(
+        creator: &signer,
+        apt_amount_in: u64,
+        name: String,
+        symbol: String,
+        max_supply: u128,
+        decimals: u8,
+        icon_uri: String,
+        project_uri: String
+    ) acquires LaunchPad, FAController {
+        // Create, mint, and control the FA using the signer obtained from the "FA Generator" object.
+        let (fa_address, fa_minted) = create_fa(name, symbol, max_supply, decimals, icon_uri, project_uri);
+        let fa_metadata_obj = object::address_to_object(fa_address);
+        // `transfer_ref` is required for swapping in `liquidity_pair`. Otherwise, the custom withdraw function would
+        // block the transfer of APT to the creator.
+        let transfer_ref = &borrow_global<FAController>(fa_address).transfer_ref;
+        // Create the liquidity pair between APT and the new FA. Include the initial creator swap, if needed.
+        liquidity_pairs::register_liquidity_pair(
+            name,
+            symbol,
+            transfer_ref,
+            creator,
+            fa_metadata_obj,
+            apt_amount_in,
+            fa_minted,
+            max_supply
+        );
+    }
+
+    /// Swap from FA to APT, or vice versa, through `liquidity_pair`.
+    public entry fun swap(
+        account: &signer,
+        name: String,
+        symbol: String,
+        swap_to_apt: bool,
+        amount_in: u64
+    ) acquires LaunchPad, FAController {
+        // Verify the `amount_in` is valid and that the FA exists.
+        assert!(amount_in > 0, ELIQUIDITY_PAIR_SWAP_AMOUNTIN_INVALID);
+        // FA Object<Metadata> required for primary_fungible_store interactions.
+        // `transfer_ref` is used to bypass the `is_frozen` status of the FA. Without this, the defined dispatchable
+        // withdraw function would prevent the ability to transfer the participant's FA onto the liquidity pair.
+        let fa_metadata_obj = object::address_to_object(get_fa_obj_address(name, symbol));
+        let transfer_ref = &borrow_global<FAController>(get_fa_obj_address(name, symbol)).transfer_ref;
+        // Initiate the swap on the associated liquidity pair.
+        if (swap_to_apt) {
+            liquidity_pairs::swap_fa_to_apt(name, symbol, transfer_ref, account, fa_metadata_obj, amount_in);
+        } else {
+            liquidity_pairs::swap_apt_to_fa(name, symbol, transfer_ref, account, fa_metadata_obj, amount_in);
+        };
+    }
+
+    //---------------------------Internal---------------------------z
+    fun create_fa(
+        name: String,
+        symbol: String,
+        max_supply: u128,
+        decimals: u8,
+        icon_uri: String,
+        project_uri: String
+    ): (address, FungibleAsset) acquires LaunchPad {
+        // Only unique entries of the FA key (name and symbol) can be launched.
+        let does_fa_exist = object::object_exists<FAController>(get_fa_obj_address(name, symbol));
+        assert!(!does_fa_exist, EFA_EXISTS_ALREADY);
+        let launchpad = borrow_global_mut<LaunchPad>(@bonding_curve_launchpad);
+        // Obtain the signer from the "FA Generator" object, to create the FA.
+        let fa_generator_signer = object::generate_signer_for_extending(&launchpad.fa_generator_extend_ref);
+        // The FA's name and symbol is combined, to create a seed for deterministic object creation.
+        // Beneficial for retrieving the FA's object address, after the initial creation,
+        // like during `get_fa_obj_address(...)`.
+        let fa_key_seed = *string::bytes(&name);
+        vector::append(&mut fa_key_seed, b"-");
+        vector::append(&mut fa_key_seed, *string::bytes(&symbol));
+        let fa_obj_constructor_ref = &object::create_named_object(&fa_generator_signer, fa_key_seed);
+        let fa_obj_signer = object::generate_signer(fa_obj_constructor_ref);
+        // Create the FA and it's associated capabilities within the `bonding_curve_launchpad` account.
+        // Plus, mint the predefined amount of FA to be moved to `liquidity_pairs`.
+        let base_unit_max_supply = option::some(max_supply * math128::pow(10, (decimals as u128)));
+        primary_fungible_store::create_primary_store_enabled_fungible_asset(
+            fa_obj_constructor_ref,
+            base_unit_max_supply,
+            name,
+            symbol,
+            decimals,
+            icon_uri,
+            project_uri
+        );
+        let mint_ref = fungible_asset::generate_mint_ref(fa_obj_constructor_ref);
+        let transfer_ref = fungible_asset::generate_transfer_ref(fa_obj_constructor_ref);
+        let fa_minted = fungible_asset::mint(&mint_ref, (max_supply as u64));
+        // Define the dispatchable FA's withdraw as a conditionally global freezing effect.
+        dispatchable_fungible_asset::register_dispatch_functions(
+            fa_obj_constructor_ref,
+            option::some(launchpad.permissioned_withdraw),
+            option::none(),
+            option::none()
+        );
+        // Store `transfer_ref` for later usage, within the FA's object.
+        // `tranfer_ref` will be required to allow the smart contract's modules to ignore the dispatchable
+        // withdraw's frozen status for each swap of an FA on `liquidity_pair`.
+        move_to(
+            &fa_obj_signer,
+            FAController { transfer_ref }
+        );
+        event::emit(
+            FungibleAssetCreated {
+                name,
+                symbol,
+                max_supply,
+                decimals,
+                icon_uri,
+                project_uri
+            }
+        );
+        (get_fa_obj_address(name, symbol), fa_minted)
+    }
+
+    //---------------------------Tests---------------------------
+    #[test_only]
+    public fun initialize_for_test(deployer: &signer) {
+        let permissioned_withdraw = function_info::new_function_info(
+            deployer,
+            string::utf8(b"bonding_curve_launchpad"),
+            string::utf8(b"withdraw")
+        );
+        let fa_generator_extend_ref = object::generate_extend_ref(
+            &object::create_named_object(deployer, b"FA Generator")
+        );
+        move_to(
+            deployer,
+            LaunchPad {
+                permissioned_withdraw,
+                fa_generator_extend_ref
+            }
+        );
+    }
+}
diff --git a/aptos-move/move-examples/bonding_curve_launchpad/sources/liquidity_pairs.move b/aptos-move/move-examples/bonding_curve_launchpad/sources/liquidity_pairs.move
new file mode 100644
index 0000000000000..6ccf42d08f541
--- /dev/null
+++ b/aptos-move/move-examples/bonding_curve_launchpad/sources/liquidity_pairs.move
@@ -0,0 +1,422 @@
+module bonding_curve_launchpad::liquidity_pairs {
+    use std::string::{Self, String};
+    use std::vector;
+    use aptos_std::signer;
+    use aptos_std::math128;
+    use aptos_framework::coin;
+    use aptos_framework::aptos_account;
+    use aptos_framework::aptos_coin::{AptosCoin};
+    use aptos_framework::object::{Self, Object, ExtendRef};
+    use aptos_framework::event;
+    use aptos_framework::fungible_asset;
+    use aptos_framework::fungible_asset::{Metadata, TransferRef, FungibleAsset, FungibleStore};
+    use aptos_framework::primary_fungible_store;
+    use swap::router;
+    use swap::liquidity_pool;
+    use swap::coin_wrapper;
+    friend bonding_curve_launchpad::bonding_curve_launchpad;
+
+    const FA_DECIMALS: u8 = 8;
+    const INITIAL_VIRTUAL_APT_LIQUIDITY: u128 = 50_000_000_000;
+    const APT_LIQUIDITY_THRESHOLD: u128 = 600_000_000_000;
+
+    /// Swapper does not own the FA being swapped.
+    const EFA_PRIMARY_STORE_DOES_NOT_EXIST: u64 = 12;
+    /// Liquidity pair (APT/FA) being created already exists.
+    const ELIQUIDITY_PAIR_EXISTS_ALREADY: u64 = 100;
+    /// Liquidity pair does not exist.
+    const ELIQUIDITY_PAIR_DOES_NOT_EXIST: u64 = 101;
+    /// Liquidity pair has trading disabled. Graduation has already occurred.
+    const ELIQUIDITY_PAIR_DISABLED: u64 = 102;
+    /// Swap results in negligible amount out. Requires increasing amount in.
+    const ELIQUIDITY_PAIR_SWAP_AMOUNTOUT_INSIGNIFICANT: u64 = 111;
+
+    //---------------------------Events---------------------------
+    #[event]
+    struct LiquidityPairCreated has store, drop {
+        fa_object_metadata: Object<Metadata>,
+        initial_fa_reserves: u128,
+        initial_apt_reserves: u128
+    }
+
+    #[event]
+    struct LiquidityPairReservesUpdated has store, drop {
+        former_fa_reserves: u128,
+        former_apt_reserves: u128,
+        new_fa_reserves: u128,
+        new_apt_reserves: u128
+    }
+
+    #[event]
+    struct LiquidityPairSwap has store, drop {
+        is_fa_else_apt: bool,
+        gained: u128,
+        swapper_address: address
+    }
+
+    #[event]
+    struct LiquidityPairGraduated has store, drop {
+        fa_object_metadata: Object<Metadata>,
+        dex_address: address
+    }
+
+    //---------------------------Structs---------------------------
+    struct Pairs has key {
+        signer_extender: ExtendRef
+    }
+
+    #[resource_group_member(group = aptos_framework::object::ObjectGroup)]
+    struct LiquidityPair has store, key {
+        extend_ref: ExtendRef,
+        is_enabled: bool,
+        is_frozen: bool,
+        fa_reserves: u128,
+        apt_reserves: u128,
+        fa_store: Object<FungibleStore>,
+    }
+
+    //---------------------------Init---------------------------
+    fun init_module(account: &signer) {
+        let signer_extender = object::generate_extend_ref(
+            &object::create_sticky_object(@bonding_curve_launchpad)
+        );
+        move_to(account, Pairs { signer_extender });
+    }
+
+
+    //---------------------------Views---------------------------
+    // Constant Product Formula
+    // For higher emphasize on rewarding early adopters, this can be modified to support a sub-linear trading function.
+    #[view]
+    public fun get_amount_out(
+        fa_reserves: u128,
+        apt_reserves: u128,
+        swap_to_apt: bool,
+        amount_in: u64
+    ): (u64, u64, u128, u128) {
+        if (swap_to_apt) {
+            let divisor = fa_reserves + (amount_in as u128);
+            let apt_gained = (math128::mul_div(apt_reserves, (amount_in as u128), divisor) as u64);
+            let fa_updated_reserves = fa_reserves + (amount_in as u128);
+            let apt_updated_reserves = apt_reserves - (apt_gained as u128);
+            assert!(apt_gained > 0, ELIQUIDITY_PAIR_SWAP_AMOUNTOUT_INSIGNIFICANT);
+            (amount_in, apt_gained, fa_updated_reserves, apt_updated_reserves)
+        } else {
+            let divisor = apt_reserves + (amount_in as u128);
+            let fa_gained = (math128::mul_div(fa_reserves, (amount_in as u128), divisor) as u64);
+            let fa_updated_reserves = fa_reserves - (fa_gained as u128);
+            let apt_updated_reserves = apt_reserves + (amount_in as u128);
+            assert!(fa_gained > 0, ELIQUIDITY_PAIR_SWAP_AMOUNTOUT_INSIGNIFICANT);
+            (fa_gained, amount_in, fa_updated_reserves, apt_updated_reserves)
+        }
+    }
+
+    // Retrieve the frozen status of a given FA.
+    #[view]
+    public fun get_is_frozen_metadata(
+        name: String,
+        symbol: String
+    ): bool acquires Pairs, LiquidityPair {
+        assert_liquidity_pair_exists(name, symbol);
+        borrow_global<LiquidityPair>(get_pair_obj_address(name, symbol)).is_frozen
+    }
+
+    // Retrieve the address of the given FA's name and symbol.
+    #[view]
+    public fun get_pair_obj_address(
+        name: String,
+        symbol: String
+    ): address acquires Pairs {
+        let pairs = borrow_global<Pairs>(@bonding_curve_launchpad);
+        let fa_key_seed = *string::bytes(&name);
+        vector::append(&mut fa_key_seed, b"-");
+        vector::append(&mut fa_key_seed, *string::bytes(&symbol));
+        object::create_object_address(
+            &object::address_from_extend_ref(&pairs.signer_extender),
+            fa_key_seed
+        )
+    }
+
+    //---------------------------DEX-helpers---------------------------
+    inline fun assert_liquidity_pair_exists(
+        name: String,
+        symbol: String
+    ) {
+        let does_already_exist = object::is_object(get_pair_obj_address(name, symbol));
+        assert!(does_already_exist, ELIQUIDITY_PAIR_DOES_NOT_EXIST);
+    }
+
+    //---------------------------Liquidity Pair---------------------------
+    /// Creates a unique liquidity pair between a given FA and APT.
+    /// Only callable from `bonding_curve_launchpad`.
+    public(friend) fun register_liquidity_pair(
+        name: String,
+        symbol: String,
+        transfer_ref: &TransferRef,
+        swapper: &signer,
+        fa_object_metadata: Object<Metadata>,
+        apt_amount_in: u64,
+        fa_minted: FungibleAsset,
+        fa_initial_liquidity: u128
+    ) acquires Pairs, LiquidityPair {
+        // Only allow for creation of new APT-FA pairs.
+        let does_already_exist = object::is_object(get_pair_obj_address(name, symbol));
+        assert!(!does_already_exist, ELIQUIDITY_PAIR_EXISTS_ALREADY);
+        // Every new liquidity pair will have it's information stored within an Object. This object will also be used to
+        // generator signers from, for when APT or the FA needs to be transferred to and from the liquidity pair.
+        // Reserves are kept on the liquidity pair object.
+        // The object is identified by the unique combination of the FA's name and symbol.
+        let pairs = borrow_global<Pairs>(@bonding_curve_launchpad);
+        let pairs_signer = object::generate_signer_for_extending(&pairs.signer_extender);
+        let fa_key_seed = *string::bytes(&name);
+        vector::append(&mut fa_key_seed, b"-");
+        vector::append(&mut fa_key_seed, *string::bytes(&symbol));
+        let liquidity_pair_object = object::create_named_object(&pairs_signer, fa_key_seed);
+        let liquidity_pair_signer = object::generate_signer(&liquidity_pair_object);
+        let liquidity_pair_extend_ref = object::generate_extend_ref(&liquidity_pair_object);
+        // Store all minted FA inside the liquidity_pair struct, within a Fungible Store. This object is responsible
+        // for *only* it's own reserves.
+        let fa_store_obj_constructor = object::create_object(@bonding_curve_launchpad);
+        let fa_store = fungible_asset::create_store(&fa_store_obj_constructor, fa_object_metadata);
+        fungible_asset::deposit(fa_store, fa_minted);
+
+        // Define and store the state of the liquidity pair as:
+        // Reserves, FA store, global frozen status (`is_frozen`), and enabled trading (`is_enabled`).
+        // Initial APT reserves are virtual liquidity, for less extreme initial swaps (avoiding early adopter's
+        // advantage, for fairness). README covers this topic in more depth.
+        move_to(
+            &liquidity_pair_signer,
+            LiquidityPair {
+                extend_ref: liquidity_pair_extend_ref,
+                is_enabled: true,
+                is_frozen: true,
+                fa_reserves: fa_initial_liquidity,
+                apt_reserves: INITIAL_VIRTUAL_APT_LIQUIDITY,
+                fa_store
+            }
+        );
+        event::emit(
+            LiquidityPairCreated {
+                fa_object_metadata,
+                initial_fa_reserves: fa_initial_liquidity,
+                initial_apt_reserves: INITIAL_VIRTUAL_APT_LIQUIDITY
+            }
+        );
+        // Optional initial swap given to the creator of the FA.
+        if (apt_amount_in > 0) {
+            swap_apt_to_fa(name, symbol, transfer_ref, swapper, fa_object_metadata, apt_amount_in);
+        };
+    }
+
+    /// Facilitate swapping between a given FA to APT.
+    public(friend) fun swap_fa_to_apt(
+        name: String,
+        symbol: String,
+        transfer_ref: &TransferRef,
+        swapper_account: &signer,
+        fa_object_metadata: Object<Metadata>,
+        amount_in: u64
+    ) acquires Pairs, LiquidityPair {
+        // Verify the liquidity pair exists and is enabled for trading.
+        assert_liquidity_pair_exists(name, symbol);
+        let liquidity_pair = borrow_global_mut<LiquidityPair>(get_pair_obj_address(name, symbol));
+        assert!(liquidity_pair.is_enabled, ELIQUIDITY_PAIR_DISABLED);
+        // Determine the amount received of APT, when given swapper-supplied amount_in of FA.
+        let (fa_given, apt_gained, fa_updated_reserves, apt_updated_reserves) = get_amount_out(
+            liquidity_pair.fa_reserves,
+            liquidity_pair.apt_reserves,
+            true,
+            amount_in
+        );
+        // Verify the swapper holds the FA.
+        let swapper_address = signer::address_of(swapper_account);
+        let does_primary_store_exist_for_swapper = primary_fungible_store::primary_store_exists(
+            swapper_address,
+            fa_object_metadata
+        );
+        assert!(does_primary_store_exist_for_swapper, EFA_PRIMARY_STORE_DOES_NOT_EXIST);
+        // Perform the swap.
+        // Swapper sends FA to the liquidity pair object. The liquidity pair object sends APT to the swapper, in return.
+        let liquidity_pair_signer = object::generate_signer_for_extending(&liquidity_pair.extend_ref);
+        let from_swapper_store = primary_fungible_store::ensure_primary_store_exists(
+            swapper_address,
+            fungible_asset::transfer_ref_metadata(transfer_ref)
+        );
+        fungible_asset::transfer_with_ref(transfer_ref, from_swapper_store, liquidity_pair.fa_store, fa_given);
+        aptos_account::transfer(&liquidity_pair_signer, swapper_address, apt_gained);
+        // Record state changes to the liquidity pair's reserves, and emit changes as events.
+        let former_fa_reserves = liquidity_pair.fa_reserves;
+        let former_apt_reserves = liquidity_pair.apt_reserves;
+        liquidity_pair.fa_reserves = fa_updated_reserves;
+        liquidity_pair.apt_reserves = apt_updated_reserves;
+        event::emit(
+            LiquidityPairReservesUpdated {
+                former_fa_reserves,
+                former_apt_reserves,
+                new_fa_reserves: fa_updated_reserves,
+                new_apt_reserves: apt_updated_reserves
+            }
+        );
+        event::emit(
+            LiquidityPairSwap {
+                is_fa_else_apt: false,
+                gained: (apt_gained as u128),
+                swapper_address
+            }
+        );
+    }
+
+    /// Facilitate swapping between APT to a given FA.
+    public(friend) fun swap_apt_to_fa(
+        name: String,
+        symbol: String,
+        transfer_ref: &TransferRef,
+        swapper_account: &signer,
+        fa_object_metadata: Object<Metadata>,
+        amount_in: u64
+    ) acquires Pairs, LiquidityPair {
+        // Verify the liquidity pair exists and is enabled for trading.
+        assert_liquidity_pair_exists(name, symbol);
+        let liquidity_pair = borrow_global_mut<LiquidityPair>(get_pair_obj_address(name, symbol));
+        assert!(liquidity_pair.is_enabled, ELIQUIDITY_PAIR_DISABLED);
+        // Determine the amount received of FA, when given swapper-supplied amount_in of APT.
+        let (fa_gained, apt_given, fa_updated_reserves, apt_updated_reserves) = get_amount_out(
+            liquidity_pair.fa_reserves,
+            liquidity_pair.apt_reserves,
+            false,
+            amount_in
+        );
+        // Perform the swap.
+        // Swapper sends APT to the liquidity pair object. The liquidity pair object sends FA to the swapper, in return.
+        // Requires the liquidity pair object's address, which is retrieved using the stored extend_ref.
+        let swapper_address = signer::address_of(swapper_account);
+        let liquidity_pair_address = object::address_from_extend_ref(&liquidity_pair.extend_ref);
+        let to_swapper_store = primary_fungible_store::ensure_primary_store_exists(
+            swapper_address,
+            fungible_asset::transfer_ref_metadata(transfer_ref)
+        );
+        aptos_account::transfer(swapper_account, liquidity_pair_address, apt_given);
+        fungible_asset::transfer_with_ref(transfer_ref, liquidity_pair.fa_store, to_swapper_store, fa_gained);
+        // Record state changes to the liquidity pair's reserves, and emit changes as events.
+        let former_fa_reserves = liquidity_pair.fa_reserves;
+        let former_apt_reserves = liquidity_pair.apt_reserves;
+        liquidity_pair.fa_reserves = fa_updated_reserves;
+        liquidity_pair.apt_reserves = apt_updated_reserves;
+        event::emit(
+            LiquidityPairReservesUpdated {
+                former_fa_reserves,
+                former_apt_reserves,
+                new_fa_reserves: fa_updated_reserves,
+                new_apt_reserves: apt_updated_reserves
+            }
+        );
+        event::emit(
+            LiquidityPairSwap {
+                is_fa_else_apt: true,
+                gained: (fa_gained as u128),
+                swapper_address
+            }
+        );
+        // Check for graduation requirements. The APT reserves must be above the pre-defined
+        // threshold to allow for graduation.
+        if (liquidity_pair.is_enabled && apt_updated_reserves > APT_LIQUIDITY_THRESHOLD) {
+            graduate(liquidity_pair, fa_object_metadata, transfer_ref, apt_updated_reserves, fa_updated_reserves);
+        }
+    }
+
+    /// Moves the reserves of a liquidity pair on the `liquidity_pair` module to a newly created liquidity pair
+    /// on an external DEX (`swap`). The resulting liquidity provider tokens are thrown away.
+    /// Both of the FA's original liquidity pair and frozen status are disabled.
+    /// From here, participants are free to use their FA as they'd like, because the custom `withdraw` function is no
+    /// longer frozen for `transfer`.
+    fun graduate(
+        liquidity_pair: &mut LiquidityPair,
+        fa_object_metadata: Object<Metadata>,
+        transfer_ref: &TransferRef,
+        apt_updated_reserves: u128,
+        fa_updated_reserves: u128
+    ) {
+        // Disable Bonding Curve Launchpad pair and remove global freeze on FA.
+        liquidity_pair.is_enabled = false;
+        liquidity_pair.is_frozen = false;
+        // Offload onto third party, public DEX.
+        router::create_pool_coin<AptosCoin>(fa_object_metadata, false);
+        let liquidity_pair_signer = object::generate_signer_for_extending(&liquidity_pair.extend_ref);
+        add_liquidity_coin_entry_transfer_ref<AptosCoin>(
+            transfer_ref,
+            &liquidity_pair_signer,
+            liquidity_pair.fa_store,
+            fa_object_metadata,
+            false,
+            ((apt_updated_reserves - (apt_updated_reserves / 10)) as u64),
+            ((fa_updated_reserves - (fa_updated_reserves / 10)) as u64),
+            0,
+            0
+        );
+        // Send liquidity provider tokens to dead address.
+        let apt_coin_wrapped = coin_wrapper::get_wrapper<AptosCoin>();
+        let liquidity_obj = liquidity_pool::liquidity_pool(apt_coin_wrapped, fa_object_metadata, false);
+        let liquidity_pair_address = signer::address_of(&liquidity_pair_signer);
+        liquidity_pool::transfer(
+            &liquidity_pair_signer,
+            liquidity_obj,
+            @0xdead,
+            primary_fungible_store::balance(liquidity_pair_address, liquidity_obj)
+        );
+        // Emit event informing all that the liquidity pair has graduated and which DEX it graduated to.
+        event::emit(
+            LiquidityPairGraduated {
+                fa_object_metadata,
+                dex_address: @swap
+            }
+        );
+    }
+
+    //---------------------------DEX-helpers---------------------------
+    /// Add liquidity alternative that relies on `transfer_ref`, rather than the traditional transfer
+    /// found in the swap DEX.
+    fun add_liquidity_coin_entry_transfer_ref<CoinType>(
+        transfer_ref: &TransferRef,
+        lp: &signer,
+        fa_store: Object<FungibleStore>,
+        token_2: Object<Metadata>,
+        is_stable: bool,
+        amount_1_desired: u64,
+        amount_2_desired: u64,
+        amount_1_min: u64,
+        amount_2_min: u64,
+    ) {
+        // Wrap APT into a FA. Then, determine the optimal amounts for providing liquidity to the given FA - APT pair.
+        let token_1 = coin_wrapper::get_wrapper<CoinType>();
+        let (optimal_amount_1, optimal_amount_2, _) = router::optimal_liquidity_amounts(
+            token_1,
+            token_2,
+            is_stable,
+            amount_1_desired,
+            amount_2_desired,
+            amount_1_min,
+            amount_2_min,
+        );
+        // Retrieve the APT and FA from the liquidity provider.
+        // `transfer_ref` is used to avoid circular dependency during graduation. A normal transfer would require
+        // visiting `bonding_curve_launchpad` to execute the custom withdraw logic. `transfer_ref` bypasses the need to
+        // return to `bonding_curve_launchpad` by not executing the custom withdraw logic.
+        let optimal_1 = coin::withdraw<CoinType>(lp, optimal_amount_1);
+        let optimal_2 = fungible_asset::withdraw_with_ref(
+            transfer_ref,
+            fa_store,
+            optimal_amount_2
+        );
+        // Place the APT and FA into the liquidity pair.
+        router::add_liquidity_coin<CoinType>(lp, optimal_1, optimal_2, is_stable);
+    }
+
+    //---------------------------Tests---------------------------
+    #[test_only]
+    public fun initialize_for_test(deployer: &signer) {
+        let signer_extender = object::generate_extend_ref(
+            &object::create_sticky_object(@bonding_curve_launchpad)
+        );
+        move_to(deployer, Pairs { signer_extender });
+    }
+}
diff --git a/aptos-move/move-examples/bonding_curve_launchpad/sources/tests/test_bonding_curve_launchpad.move b/aptos-move/move-examples/bonding_curve_launchpad/sources/tests/test_bonding_curve_launchpad.move
new file mode 100644
index 0000000000000..1d980a1b992cb
--- /dev/null
+++ b/aptos-move/move-examples/bonding_curve_launchpad/sources/tests/test_bonding_curve_launchpad.move
@@ -0,0 +1,476 @@
+#[test_only]
+module bonding_curve_launchpad::test_bonding_curve_launchpad {
+    use aptos_std::string;
+    use aptos_std::signer;
+    use aptos_std::math64;
+    use aptos_framework::account;
+    use aptos_framework::coin;
+    use aptos_framework::aptos_coin::{Self, AptosCoin};
+    use aptos_framework::primary_fungible_store;
+    use bonding_curve_launchpad::bonding_curve_launchpad;
+    use bonding_curve_launchpad::liquidity_pairs;
+    use swap::test_helpers;
+
+    const ELIQUIDITY_PAIR_SWAP_AMOUNTOUT_INCORRECT: u64 = 1001;
+    const EUSER_APT_BALANCE_INCORRECT: u64 = 10001;
+    const EINCORRECT_FROZEN_STATUS: u64 = 10002;
+    const EUSER_FA_BALANCE_INCORRECT: u64 = 10003;
+
+    //---------------------------Test Helpers---------------------------
+    fun test_setup_accounts(
+        aptos_framework: &signer, _swap_dex_signer: &signer, bonding_curve_creator: &signer
+    ) {
+        account::create_account_for_test(@0x1);
+        account::create_account_for_test(@0xcafe);
+        account::create_account_for_test(@bonding_curve_launchpad);
+        account::create_account_for_test(@0x803);
+        coin::register<AptosCoin>(bonding_curve_creator);
+
+        let (burn_cap, mint_cap) = aptos_coin::initialize_for_test(aptos_framework);
+        let bcc_coins = coin::mint(1_000_000_000_000_000, &mint_cap);
+        let bcc_address = signer::address_of(bonding_curve_creator);
+        coin::deposit(bcc_address, bcc_coins);
+
+        coin::destroy_burn_cap(burn_cap);
+        coin::destroy_mint_cap(mint_cap);
+    }
+
+    fun test_setup_initialize_contracts(
+        swap_dex_signer: &signer, bcl_owner_signer: &signer
+    ) {
+        test_helpers::set_up(swap_dex_signer);
+        liquidity_pairs::initialize_for_test(bcl_owner_signer);
+        bonding_curve_launchpad::initialize_for_test(bcl_owner_signer);
+    }
+
+    //---------------------------Unit Tests---------------------------
+    #[test(deployer = @bonding_curve_launchpad)]
+    #[expected_failure(abort_code = liquidity_pairs::ELIQUIDITY_PAIR_DOES_NOT_EXIST, location = liquidity_pairs)]
+    public fun test_nonexistant_is_frozen(deployer: &signer) {
+        account::create_account_for_test(@0x1);
+        liquidity_pairs::initialize_for_test(deployer);
+        bonding_curve_launchpad::initialize_for_test(deployer);
+        let name = string::utf8(b"SheepyCoin");
+        let symbol = string::utf8(b"SHEEP");
+        bonding_curve_launchpad::get_is_frozen(name, symbol);
+    }
+
+    #[test(deployer = @bonding_curve_launchpad)]
+    #[expected_failure(abort_code = 393218, location = aptos_framework::object)]
+    public fun test_nonexistant_get_metadata(deployer: &signer) {
+        account::create_account_for_test(@0x1);
+        liquidity_pairs::initialize_for_test(deployer);
+        bonding_curve_launchpad::initialize_for_test(deployer);
+        let name = string::utf8(b"SheepyCoin");
+        let symbol = string::utf8(b"SHEEP");
+        bonding_curve_launchpad::get_metadata(name, symbol);
+    }
+
+    //---------------------------E2E Tests---------------------------
+    #[test(
+        aptos_framework = @0x1,
+        swap_dex_signer = @0xcafe,
+        bcl_owner_signer = @bonding_curve_launchpad,
+        bonding_curve_creator = @0x803
+    )]
+    fun test_e2e_bonding_curve_creation(
+        aptos_framework: &signer,
+        swap_dex_signer: &signer,
+        bcl_owner_signer: &signer,
+        bonding_curve_creator: &signer
+    ) {
+        test_setup_accounts(aptos_framework, swap_dex_signer, bonding_curve_creator);
+        test_setup_initialize_contracts(swap_dex_signer, bcl_owner_signer);
+        // Create FA and LiquidityPair, w.o Initial Swap.
+        let user_address = signer::address_of(bonding_curve_creator);
+        let starting_apt_balance = coin::balance<AptosCoin>(user_address);
+        let name = string::utf8(b"SheepyCoin");
+        let symbol = string::utf8(b"SHEEP");
+        bonding_curve_launchpad::create_fa_pair(
+            bonding_curve_creator,
+            0,
+            name,
+            symbol,
+            803_000_000,
+            8,
+            string::utf8(
+                b"https://t4.ftcdn.net/jpg/03/12/95/13/360_F_312951336_8LxW7gBLHslTnpbOAwxFo5FpD2R5vGxu.jpg"
+            ),
+            string::utf8(
+                b"https://t4.ftcdn.net/jpg/03/12/95/13/360_F_312951336_8LxW7gBLHslTnpbOAwxFo5FpD2R5vGxu.jpg"
+            )
+        );
+        assert!(coin::balance<AptosCoin>(user_address) == starting_apt_balance, EUSER_APT_BALANCE_INCORRECT);
+        assert!(bonding_curve_launchpad::get_balance(name, symbol, user_address) == 0, EUSER_FA_BALANCE_INCORRECT);
+    }
+
+    #[test(
+        aptos_framework = @0x1,
+        swap_dex_signer = @0xcafe,
+        bcl_owner_signer = @bonding_curve_launchpad,
+        bonding_curve_creator = @0x803
+    )]
+    fun test_e2e_bonding_curve_creation_with_initial_liquidity(
+        aptos_framework: &signer,
+        swap_dex_signer: &signer,
+        bcl_owner_signer: &signer,
+        bonding_curve_creator: &signer
+    ) {
+        test_setup_accounts(aptos_framework, swap_dex_signer, bonding_curve_creator);
+        test_setup_initialize_contracts(swap_dex_signer, bcl_owner_signer);
+        // Create FA and LiquidityPair, w/ Initial Swap.
+        let user_address = signer::address_of(bonding_curve_creator);
+        let starting_apt_balance = coin::balance<AptosCoin>(user_address);
+        let name = string::utf8(b"SheepyCoin");
+        let symbol = string::utf8(b"SHEEP");
+        bonding_curve_launchpad::create_fa_pair(
+            bonding_curve_creator,
+            1_000,
+            name,
+            symbol,
+            803_000_000,
+            8,
+            string::utf8(
+                b"https://t4.ftcdn.net/jpg/03/12/95/13/360_F_312951336_8LxW7gBLHslTnpbOAwxFo5FpD2R5vGxu.jpg"
+            ),
+            string::utf8(
+                b"https://t4.ftcdn.net/jpg/03/12/95/13/360_F_312951336_8LxW7gBLHslTnpbOAwxFo5FpD2R5vGxu.jpg"
+            )
+        );
+        assert!(coin::balance<AptosCoin>(user_address) == starting_apt_balance - 1000, EUSER_APT_BALANCE_INCORRECT);
+        assert!(bonding_curve_launchpad::get_balance(name, symbol, user_address) == 16, EUSER_FA_BALANCE_INCORRECT);
+    }
+
+    #[test(
+        aptos_framework = @0x1,
+        swap_dex_signer = @0xcafe,
+        bcl_owner_signer = @bonding_curve_launchpad,
+        bonding_curve_creator = @0x803
+    )]
+    fun test_e2e_bonding_curve_creation_multiple(
+        aptos_framework: &signer,
+        swap_dex_signer: &signer,
+        bcl_owner_signer: &signer,
+        bonding_curve_creator: &signer
+    ) {
+        test_setup_accounts(aptos_framework, swap_dex_signer, bonding_curve_creator);
+        test_setup_initialize_contracts(swap_dex_signer, bcl_owner_signer);
+        // Create FA and LiquidityPair, w.o Initial Swap.
+        let name = string::utf8(b"SheepyCoin");
+        let symbol = string::utf8(b"SHEEP");
+        bonding_curve_launchpad::create_fa_pair(
+            bonding_curve_creator,
+            0,
+            name,
+            symbol,
+            803_000_000,
+            8,
+            string::utf8(
+                b"https://t4.ftcdn.net/jpg/03/12/95/13/360_F_312951336_8LxW7gBLHslTnpbOAwxFo5FpD2R5vGxu.jpg"
+            ),
+            string::utf8(
+                b"https://t4.ftcdn.net/jpg/03/12/95/13/360_F_312951336_8LxW7gBLHslTnpbOAwxFo5FpD2R5vGxu.jpg"
+            )
+        );
+        let second_fa_name = string::utf8(b"RammyCoin");
+        let second_fa_symbol = string::utf8(b"RAM");
+        bonding_curve_launchpad::create_fa_pair(
+            bonding_curve_creator,
+            0,
+            second_fa_name,
+            second_fa_symbol,
+            803_000_000,
+            8,
+            string::utf8(
+                b"https://t4.ftcdn.net/jpg/03/12/95/13/360_F_312951336_8LxW7gBLHslTnpbOAwxFo5FpD2R5vGxu.jpg"
+            ),
+            string::utf8(
+                b"https://t4.ftcdn.net/jpg/03/12/95/13/360_F_312951336_8LxW7gBLHslTnpbOAwxFo5FpD2R5vGxu.jpg"
+            )
+        );
+    }
+
+    #[test(
+        aptos_framework = @0x1,
+        swap_dex_signer = @0xcafe,
+        bcl_owner_signer = @bonding_curve_launchpad,
+        bonding_curve_creator = @0x803
+    )]
+    fun test_e2e_directional_swaps(
+        aptos_framework: &signer,
+        swap_dex_signer: &signer,
+        bcl_owner_signer: &signer,
+        bonding_curve_creator: &signer
+    ) {
+        test_e2e_bonding_curve_creation(aptos_framework, swap_dex_signer, bcl_owner_signer, bonding_curve_creator);
+        let user_address = signer::address_of(bonding_curve_creator);
+        let name = string::utf8(b"SheepyCoin");
+        let symbol = string::utf8(b"SHEEP");
+        let starting_apt_balance = coin::balance<AptosCoin>(user_address);
+        // APT -> FA
+        bonding_curve_launchpad::swap(bonding_curve_creator, name, symbol, false, 100_000_000);
+        assert!(
+            coin::balance<AptosCoin>(user_address) == starting_apt_balance - 100_000_000,
+            EUSER_APT_BALANCE_INCORRECT
+        );
+        assert!(
+            bonding_curve_launchpad::get_balance(name, symbol, user_address) == 1_602_794,
+            ELIQUIDITY_PAIR_SWAP_AMOUNTOUT_INCORRECT
+        );
+        // FA -> APT
+        bonding_curve_launchpad::swap(bonding_curve_creator, name, symbol, true, 1_602_794);
+        assert!(
+            coin::balance<AptosCoin>(user_address) == starting_apt_balance - 26,
+            EUSER_APT_BALANCE_INCORRECT
+        ); // u256/u64 precision loss.
+        assert!(
+            bonding_curve_launchpad::get_balance(name, symbol, user_address) == 0,
+            ELIQUIDITY_PAIR_SWAP_AMOUNTOUT_INCORRECT
+        );
+    }
+
+    #[test(
+        aptos_framework = @0x1,
+        swap_dex_signer = @0xcafe,
+        bcl_owner_signer = @bonding_curve_launchpad,
+        bonding_curve_creator = @0x803
+    )]
+    fun test_e2e_graduation(
+        aptos_framework: &signer,
+        swap_dex_signer: &signer,
+        bcl_owner_signer: &signer,
+        bonding_curve_creator: &signer
+    ) {
+        test_e2e_bonding_curve_creation(aptos_framework, swap_dex_signer, bcl_owner_signer, bonding_curve_creator);
+        let grad_apt: u64 = 6_000 * math64::pow(10, (8 as u64));
+        let name = string::utf8(b"SheepyCoin");
+        let symbol = string::utf8(b"SHEEP");
+        assert!(bonding_curve_launchpad::get_is_frozen(name, symbol) == true, EINCORRECT_FROZEN_STATUS);
+        bonding_curve_launchpad::swap(
+            bonding_curve_creator,
+            name,
+            symbol,
+            false,
+            grad_apt
+        ); // Over-threshold Swap. APT -> FA
+        assert!(bonding_curve_launchpad::get_is_frozen(name, symbol) == false, EINCORRECT_FROZEN_STATUS);
+    }
+
+    fun test_e2e_swap_after_graduation(
+        aptos_framework: &signer,
+        swap_dex_signer: &signer,
+        bcl_owner_signer: &signer,
+        bonding_curve_creator: &signer
+    ) {
+        test_e2e_graduation(aptos_framework, swap_dex_signer, bcl_owner_signer, bonding_curve_creator);
+        let fa_obj_metadata =
+            bonding_curve_launchpad::get_metadata(
+                string::utf8(b"SheepyCoin"),
+                string::utf8(b"SHEEP")
+            );
+        primary_fungible_store::transfer(bonding_curve_creator, fa_obj_metadata, @0xcafe, 100);
+    }
+
+    // ----E2E EXPECTED FAILING-----
+    #[test(
+        aptos_framework = @0x1,
+        swap_dex_signer = @0xcafe,
+        bcl_owner_signer = @bonding_curve_launchpad,
+        bonding_curve_creator = @0x803
+    )]
+    #[expected_failure(abort_code = bonding_curve_launchpad::bonding_curve_launchpad::EFA_EXISTS_ALREADY, location = bonding_curve_launchpad)]
+    fun test_e2e_failing_duplicate_FA(
+        aptos_framework: &signer,
+        swap_dex_signer: &signer,
+        bcl_owner_signer: &signer,
+        bonding_curve_creator: &signer
+    ) {
+        test_e2e_bonding_curve_creation(
+            aptos_framework,
+            swap_dex_signer,
+            bcl_owner_signer,
+            bonding_curve_creator
+        ); // SheepyCoin, SHEEP
+        let name = string::utf8(b"SheepyCoin");
+        let symbol = string::utf8(b"SHEEP");
+        bonding_curve_launchpad::create_fa_pair(
+            bonding_curve_creator,
+            1_000,
+            name,
+            symbol,
+            803_000_000,
+            8,
+            string::utf8(
+                b"https://t4.ftcdn.net/jpg/03/12/95/13/360_F_312951336_8LxW7gBLHslTnpbOAwxFo5FpD2R5vGxu.jpg"
+            ),
+            string::utf8(
+                b"https://t4.ftcdn.net/jpg/03/12/95/13/360_F_312951336_8LxW7gBLHslTnpbOAwxFo5FpD2R5vGxu.jpg"
+            )
+        );
+    }
+
+    #[test(
+        aptos_framework = @0x1,
+        swap_dex_signer = @0xcafe,
+        bcl_owner_signer = @bonding_curve_launchpad,
+        bonding_curve_creator = @0x803
+    )]
+    #[expected_failure(abort_code = liquidity_pairs::ELIQUIDITY_PAIR_DISABLED, location = liquidity_pairs)]
+    fun test_e2e_failing_apt_swap_after_graduation(
+        aptos_framework: &signer,
+        swap_dex_signer: &signer,
+        bcl_owner_signer: &signer,
+        bonding_curve_creator: &signer
+    ) {
+        test_e2e_graduation(aptos_framework, swap_dex_signer, bcl_owner_signer, bonding_curve_creator);
+        bonding_curve_launchpad::swap(
+            bonding_curve_creator,
+            string::utf8(b"SheepyCoin"),
+            string::utf8(b"SHEEP"),
+            false,
+            1_000_000
+        ); // APT -> FA
+    }
+
+    #[test(
+        aptos_framework = @0x1,
+        swap_dex_signer = @0xcafe,
+        bcl_owner_signer = @bonding_curve_launchpad,
+        bonding_curve_creator = @0x803
+    )]
+    #[expected_failure(abort_code = liquidity_pairs::ELIQUIDITY_PAIR_DISABLED, location = liquidity_pairs)]
+    fun test_e2e_failing_fa_swap_after_graduation(
+        aptos_framework: &signer,
+        swap_dex_signer: &signer,
+        bcl_owner_signer: &signer,
+        bonding_curve_creator: &signer
+    ) {
+        test_e2e_graduation(aptos_framework, swap_dex_signer, bcl_owner_signer, bonding_curve_creator);
+        bonding_curve_launchpad::swap(
+            bonding_curve_creator,
+            string::utf8(b"SheepyCoin"),
+            string::utf8(b"SHEEP"),
+            false,
+            10
+        ); // FA -> APT
+    }
+
+    #[test(
+        aptos_framework = @0x1,
+        swap_dex_signer = @0xcafe,
+        bcl_owner_signer = @bonding_curve_launchpad,
+        bonding_curve_creator = @0x803
+    )]
+    #[expected_failure(abort_code = 393218, location = aptos_framework::object)]
+    fun test_e2e_failing_swap_of_nonexistant_fa(
+        aptos_framework: &signer,
+        swap_dex_signer: &signer,
+        bcl_owner_signer: &signer,
+        bonding_curve_creator: &signer
+    ) {
+        test_setup_accounts(aptos_framework, swap_dex_signer, bonding_curve_creator);
+        test_setup_initialize_contracts(swap_dex_signer, bcl_owner_signer);
+        bonding_curve_launchpad::swap(
+            bonding_curve_creator,
+            string::utf8(b"SheepyCoin"),
+            string::utf8(b"SHEEP"),
+            false,
+            1_000_000
+        );
+    }
+
+    #[test(
+        aptos_framework = @0x1,
+        swap_dex_signer = @0xcafe,
+        bcl_owner_signer = @bonding_curve_launchpad,
+        bonding_curve_creator = @0x803
+    )]
+    #[expected_failure(abort_code = bonding_curve_launchpad::bonding_curve_launchpad::EFA_FROZEN, location = bonding_curve_launchpad)]
+    fun test_e2e_failing_transfer_of_frozen_fa(
+        aptos_framework: &signer,
+        swap_dex_signer: &signer,
+        bcl_owner_signer: &signer,
+        bonding_curve_creator: &signer
+    ) {
+        test_e2e_bonding_curve_creation_with_initial_liquidity(
+            aptos_framework,
+            swap_dex_signer,
+            bcl_owner_signer,
+            bonding_curve_creator
+        );
+        let fa_obj_metadata = bonding_curve_launchpad::get_metadata(
+            string::utf8(b"SheepyCoin"),
+            string::utf8(b"SHEEP")
+        );
+        primary_fungible_store::transfer(bonding_curve_creator, fa_obj_metadata, @0xcafe, 10);
+    }
+
+    #[test(
+        aptos_framework = @0x1,
+        swap_dex_signer = @0xcafe,
+        bcl_owner_signer = @bonding_curve_launchpad,
+        bonding_curve_creator = @0x803
+    )]
+    #[expected_failure(abort_code = bonding_curve_launchpad::bonding_curve_launchpad::ELIQUIDITY_PAIR_SWAP_AMOUNTIN_INVALID, location = bonding_curve_launchpad)]
+    fun test_e2e_failing_swap_of_zero_input_apt(
+        aptos_framework: &signer,
+        swap_dex_signer: &signer,
+        bcl_owner_signer: &signer,
+        bonding_curve_creator: &signer
+    ) {
+        test_e2e_bonding_curve_creation(aptos_framework, swap_dex_signer, bcl_owner_signer, bonding_curve_creator);
+        bonding_curve_launchpad::swap(
+            bonding_curve_creator,
+            string::utf8(b"SheepyCoin"),
+            string::utf8(b"SHEEP"),
+            false,
+            0
+        ); // APT -> FA
+    }
+
+    #[test(
+        aptos_framework = @0x1,
+        swap_dex_signer = @0xcafe,
+        bcl_owner_signer = @bonding_curve_launchpad,
+        bonding_curve_creator = @0x803
+    )]
+    #[expected_failure(abort_code = bonding_curve_launchpad::bonding_curve_launchpad::ELIQUIDITY_PAIR_SWAP_AMOUNTIN_INVALID, location = bonding_curve_launchpad)]
+    fun test_e2e_failing_swap_of_zero_input_fa(
+        aptos_framework: &signer,
+        swap_dex_signer: &signer,
+        bcl_owner_signer: &signer,
+        bonding_curve_creator: &signer
+    ) {
+        test_e2e_bonding_curve_creation(aptos_framework, swap_dex_signer, bcl_owner_signer, bonding_curve_creator);
+        bonding_curve_launchpad::swap(
+            bonding_curve_creator,
+            string::utf8(b"SheepyCoin"),
+            string::utf8(b"SHEEP"),
+            false,
+            0
+        ); // Swap afer graduation, guaranteed to fail. FA -> APT
+    }
+
+    #[test(
+        aptos_framework = @0x1,
+        swap_dex_signer = @0xcafe,
+        bcl_owner_signer = @bonding_curve_launchpad,
+        bonding_curve_creator = @0x803
+    )]
+    #[expected_failure(abort_code = liquidity_pairs::EFA_PRIMARY_STORE_DOES_NOT_EXIST, location = liquidity_pairs)]
+    fun test_e2e_failing_swap_of_user_without_fa(
+        aptos_framework: &signer,
+        swap_dex_signer: &signer,
+        bcl_owner_signer: &signer,
+        bonding_curve_creator: &signer
+    ) {
+        test_e2e_bonding_curve_creation(aptos_framework, swap_dex_signer, bcl_owner_signer, bonding_curve_creator);
+        bonding_curve_launchpad::swap(
+            bonding_curve_creator,
+            string::utf8(b"SheepyCoin"),
+            string::utf8(b"SHEEP"),
+            true,
+            10000
+        ); // Swap afer graduation, guaranteed to fail. FA -> APT
+    }
+}
diff --git a/aptos-move/move-examples/bonding_curve_launchpad/sources/tests/test_liquidity_pairs.move b/aptos-move/move-examples/bonding_curve_launchpad/sources/tests/test_liquidity_pairs.move
new file mode 100644
index 0000000000000..0cba7b6ae7e65
--- /dev/null
+++ b/aptos-move/move-examples/bonding_curve_launchpad/sources/tests/test_liquidity_pairs.move
@@ -0,0 +1,19 @@
+#[test_only]
+module bonding_curve_launchpad::test_liquidity_pairs {
+    use bonding_curve_launchpad::liquidity_pairs;
+
+    //---------------------------View Tests---------------------------
+    #[test(deployer = @bonding_curve_launchpad)]
+    #[expected_failure(abort_code = liquidity_pairs::ELIQUIDITY_PAIR_SWAP_AMOUNTOUT_INSIGNIFICANT, location = liquidity_pairs)]
+    public fun test_insignificant_fa_swap(deployer: &signer) {
+        liquidity_pairs::initialize_for_test(deployer);
+        liquidity_pairs::get_amount_out(1_000_000_000, 1_000_000_000, true, 0);
+    }
+
+    #[test(deployer = @bonding_curve_launchpad)]
+    #[expected_failure(abort_code = liquidity_pairs::ELIQUIDITY_PAIR_SWAP_AMOUNTOUT_INSIGNIFICANT, location = liquidity_pairs)]
+    public fun test_insignificant_apt_swap(deployer: &signer) {
+        liquidity_pairs::initialize_for_test(deployer);
+        liquidity_pairs::get_amount_out(1_000_000_000, 1_000_000_000, false, 0);
+    }
+}
diff --git a/aptos-move/move-examples/fungible_asset/README.md b/aptos-move/move-examples/fungible_asset/README.md
index 320c89cfca126..8cec3141d2587 100644
--- a/aptos-move/move-examples/fungible_asset/README.md
+++ b/aptos-move/move-examples/fungible_asset/README.md
@@ -6,3 +6,4 @@
 * Pre-minted managed coin: an example issuing pre-minting coin based on managed fungible asset.
 * Multisig managed coin: how to use multisig account to manage fungible assets.
 * FA coin: an all-in-one module coin example using manged fungible asset with limited functionalities (only deal with primary fungible stores).
+* Managed Stablecoin: A managed fungible asset with Role management features and access control rules.
diff --git a/aptos-move/move-examples/fungible_asset/fa_coin/sources/FACoin.move b/aptos-move/move-examples/fungible_asset/fa_coin/sources/FACoin.move
index e990304e980e8..c00a23602e9f6 100644
--- a/aptos-move/move-examples/fungible_asset/fa_coin/sources/FACoin.move
+++ b/aptos-move/move-examples/fungible_asset/fa_coin/sources/FACoin.move
@@ -5,13 +5,17 @@ module FACoin::fa_coin {
     use aptos_framework::fungible_asset::{Self, MintRef, TransferRef, BurnRef, Metadata, FungibleAsset};
     use aptos_framework::object::{Self, Object};
     use aptos_framework::primary_fungible_store;
+    use aptos_framework::function_info;
+    use aptos_framework::dispatchable_fungible_asset;
     use std::error;
     use std::signer;
-    use std::string::utf8;
+    use std::string::{Self, utf8};
     use std::option;
 
     /// Only fungible asset metadata owner can make changes.
     const ENOT_OWNER: u64 = 1;
+    /// The FA coin is paused.
+    const EPAUSED: u64 = 2;
 
     const ASSET_SYMBOL: vector<u8> = b"FA";
 
@@ -23,6 +27,13 @@ module FACoin::fa_coin {
         burn_ref: BurnRef,
     }
 
+    #[resource_group_member(group = aptos_framework::object::ObjectGroup)]
+    /// Global state to pause the FA coin.
+    /// OPTIONAL
+    struct State has key {
+        paused: bool,
+    }
+
     /// Initialize metadata object and store the refs.
     // :!:>initialize
     fun init_module(admin: &signer) {
@@ -45,7 +56,34 @@ module FACoin::fa_coin {
         move_to(
             &metadata_object_signer,
             ManagedFungibleAsset { mint_ref, transfer_ref, burn_ref }
-        )// <:!:initialize
+        ); // <:!:initialize
+
+        // Create a global state to pause the FA coin and move to Metadata object.
+        move_to(
+            &metadata_object_signer,
+            State { paused: false, }
+        );
+
+        // Override the deposit and withdraw functions which mean overriding transfer.
+        // This ensures all transfer will call withdraw and deposit functions in this module
+        // and perform the necessary checks.
+        // This is OPTIONAL. It is an advanced feature and we don't NEED a global state to pause the FA coin.
+        let deposit = function_info::new_function_info(
+            admin,
+            string::utf8(b"fa_coin"),
+            string::utf8(b"deposit"),
+        );
+        let withdraw = function_info::new_function_info(
+            admin,
+            string::utf8(b"fa_coin"),
+            string::utf8(b"withdraw"),
+        );
+        dispatchable_fungible_asset::register_dispatch_functions(
+            constructor_ref,
+            option::some(withdraw),
+            option::some(deposit),
+            option::none(),
+        );
     }
 
     #[view]
@@ -55,6 +93,28 @@ module FACoin::fa_coin {
         object::address_to_object<Metadata>(asset_address)
     }
 
+    /// Deposit function override to ensure that the account is not denylisted and the FA coin is not paused.
+    /// OPTIONAL
+    public fun deposit<T: key>(
+        store: Object<T>,
+        fa: FungibleAsset,
+        transfer_ref: &TransferRef,
+    ) acquires State {
+        assert_not_paused();
+        fungible_asset::deposit_with_ref(transfer_ref, store, fa);
+    }
+
+    /// Withdraw function override to ensure that the account is not denylisted and the FA coin is not paused.
+    /// OPTIONAL
+    public fun withdraw<T: key>(
+        store: Object<T>,
+        amount: u64,
+        transfer_ref: &TransferRef,
+    ): FungibleAsset acquires State {
+        assert_not_paused();
+        fungible_asset::withdraw_with_ref(transfer_ref, store, amount)
+    }
+
     // :!:>mint
     /// Mint as the owner of metadata object.
     public entry fun mint(admin: &signer, to: address, amount: u64) acquires ManagedFungibleAsset {
@@ -66,12 +126,13 @@ module FACoin::fa_coin {
     }// <:!:mint
 
     /// Transfer as the owner of metadata object ignoring `frozen` field.
-    public entry fun transfer(admin: &signer, from: address, to: address, amount: u64) acquires ManagedFungibleAsset {
+    public entry fun transfer(admin: &signer, from: address, to: address, amount: u64) acquires ManagedFungibleAsset, State {
         let asset = get_metadata();
         let transfer_ref = &authorized_borrow_refs(admin, asset).transfer_ref;
         let from_wallet = primary_fungible_store::primary_store(from, asset);
         let to_wallet = primary_fungible_store::ensure_primary_store_exists(to, asset);
-        fungible_asset::transfer_with_ref(transfer_ref, from_wallet, to_wallet, amount);
+        let fa = withdraw(from_wallet, amount, transfer_ref);
+        deposit(to_wallet, fa, transfer_ref);
     }
 
     /// Burn fungible assets as the owner of metadata object.
@@ -98,20 +159,20 @@ module FACoin::fa_coin {
         fungible_asset::set_frozen_flag(transfer_ref, wallet, false);
     }
 
-    /// Withdraw as the owner of metadata object ignoring `frozen` field.
-    public fun withdraw(admin: &signer, amount: u64, from: address): FungibleAsset acquires ManagedFungibleAsset {
+    /// Pause or unpause the transfer of FA coin. This checks that the caller is the pauser.
+    public entry fun set_pause(pauser: &signer, paused: bool) acquires State {
         let asset = get_metadata();
-        let transfer_ref = &authorized_borrow_refs(admin, asset).transfer_ref;
-        let from_wallet = primary_fungible_store::primary_store(from, asset);
-        fungible_asset::withdraw_with_ref(transfer_ref, from_wallet, amount)
+        assert!(object::is_owner(asset, signer::address_of(pauser)), error::permission_denied(ENOT_OWNER));
+        let state = borrow_global_mut<State>(object::create_object_address(&@FACoin, ASSET_SYMBOL));
+        if (state.paused == paused) { return };
+        state.paused = paused;
     }
 
-    /// Deposit as the owner of metadata object ignoring `frozen` field.
-    public fun deposit(admin: &signer, to: address, fa: FungibleAsset) acquires ManagedFungibleAsset {
-        let asset = get_metadata();
-        let transfer_ref = &authorized_borrow_refs(admin, asset).transfer_ref;
-        let to_wallet = primary_fungible_store::ensure_primary_store_exists(to, asset);
-        fungible_asset::deposit_with_ref(transfer_ref, to_wallet, fa);
+    /// Assert that the FA coin is not paused.
+    /// OPTIONAL
+    fun assert_not_paused() acquires State {
+        let state = borrow_global<State>(object::create_object_address(&@FACoin, ASSET_SYMBOL));
+        assert!(!state.paused, EPAUSED);
     }
 
     /// Borrow the immutable reference of the refs of `metadata`.
@@ -127,7 +188,7 @@ module FACoin::fa_coin {
     #[test(creator = @FACoin)]
     fun test_basic_flow(
         creator: &signer,
-    ) acquires ManagedFungibleAsset {
+    ) acquires ManagedFungibleAsset, State {
         init_module(creator);
         let creator_address = signer::address_of(creator);
         let aaron_address = @0xface;
@@ -155,4 +216,16 @@ module FACoin::fa_coin {
         let creator_address = signer::address_of(creator);
         mint(aaron, creator_address, 100);
     }
+
+    #[test(creator = @FACoin)]
+    #[expected_failure(abort_code = 2, location = Self)]
+    fun test_paused(
+        creator: &signer,
+    ) acquires ManagedFungibleAsset, State {
+        init_module(creator);
+        let creator_address = signer::address_of(creator);
+        mint(creator, creator_address, 100);
+        set_pause(creator, true);
+        transfer(creator, creator_address, @0xface, 10);
+    }
 }
diff --git a/aptos-move/move-examples/fungible_asset/stablecoin/Move.toml b/aptos-move/move-examples/fungible_asset/stablecoin/Move.toml
new file mode 100644
index 0000000000000..336dfe51799cd
--- /dev/null
+++ b/aptos-move/move-examples/fungible_asset/stablecoin/Move.toml
@@ -0,0 +1,21 @@
+[package]
+name = "stablecoin"
+version = "0.0.0"
+
+
+[addresses]
+stablecoin = "_"
+master_minter = "_"
+minter = "_" 
+pauser = "_"
+denylister = "_"
+
+[dev-addresses]
+stablecoin = "0xcafe"
+master_minter = "0xbab"
+minter = "0xface"
+pauser = "0xdafe"
+denylister = "0xcade"
+
+[dependencies]
+AptosFramework = { local = "../../../framework/aptos-framework" }
\ No newline at end of file
diff --git a/aptos-move/move-examples/fungible_asset/stablecoin/README.md b/aptos-move/move-examples/fungible_asset/stablecoin/README.md
new file mode 100644
index 0000000000000..109e95b2bc207
--- /dev/null
+++ b/aptos-move/move-examples/fungible_asset/stablecoin/README.md
@@ -0,0 +1,20 @@
+# Introduction
+This module offers a reference implementation of a managed stablecoin with the following functionalities:
+1. Upgradable smart contract. The module can be upgraded to update existing functionalities or add new ones.
+2. Minting and burning of stablecoins. The module allows users to mint and burn stablecoins. Minter role is required to mint or burn
+3. Denylisting of accounts. The module allows the owner to denylist (freeze) and undenylist accounts.
+denylist accounts cannot transfer or get minted more.
+4. Pausing and unpausing of the contract. The owner can pause the contract to stop all mint/burn/transfer and unpause it to resume.
+
+# Deployment
+Currently only available in devnet due to requirement of AIP 73[https://github.com/aptos-foundation/AIPs/blob/main/aips/aip-73.md].
+
+1. Create a devnet profile with aptos init --profile devnet (select devnet for network)
+2. To deploy, run aptos move publish --named-addresses stablecoin=devnet,master_minter=devnet,minter=devnet,pauser=devnet,denylister=devnet --profile devnet
+3. To mint, run aptos move run --function-id devnet::usdk::mint --args address:0x8115e523937721388acbd77027da45b1c88a6313f99615c4da4c6a32ab161b1a u64:100000000  --profile devnet
+Replace 0x8115e523937721388acbd77027da45b1c88a6313f99615c4da4c6a32ab161b1a with the receiving address
+4. Alternatively you can go to https://explorer.aptoslabs.com/account/0x75f3f12f2f634ba33aefda0f2cd29119fdf9caa4fa288ac6e369f54e0611289a/modules/run/usdk/mint?network=devnet
+Make sure to replace 0x75f3f12f2f634ba33aefda0f2cd29119fdf9caa4fa288ac6e369f54e0611289a with your devnet account address.
+
+# Running tests
+aptos move test
diff --git a/aptos-move/move-examples/fungible_asset/stablecoin/sources/tests/usdk_tests.move b/aptos-move/move-examples/fungible_asset/stablecoin/sources/tests/usdk_tests.move
new file mode 100644
index 0000000000000..23c8129a4c22c
--- /dev/null
+++ b/aptos-move/move-examples/fungible_asset/stablecoin/sources/tests/usdk_tests.move
@@ -0,0 +1,65 @@
+#[test_only]
+module stablecoin::usdk_tests {
+    use std::signer;
+    use aptos_framework::primary_fungible_store;
+    use aptos_framework::dispatchable_fungible_asset;
+    use aptos_framework::fungible_asset::{Self, FungibleStore};
+    use stablecoin::usdk;
+    use aptos_framework::object;
+
+    #[test(creator = @0xcafe, minter = @0xface, master_minter = @0xbab, denylister = @0xcade)]
+    fun test_basic_flow(creator: &signer, minter: &signer, master_minter: &signer, denylister: &signer) {
+        usdk::init_for_test(creator);
+        let receiver_address = @0xcafe1;
+        let minter_address = signer::address_of(minter);
+
+        // set minter and have minter call mint, check balance
+        usdk::add_minter(master_minter, minter_address);
+        usdk::mint(minter, minter_address, 100);
+        let asset = usdk::metadata();
+        assert!(primary_fungible_store::balance(minter_address, asset) == 100, 0);
+
+        // transfer from minter to receiver, check balance
+        let minter_store = primary_fungible_store::ensure_primary_store_exists(minter_address, asset);
+        let receiver_store = primary_fungible_store::ensure_primary_store_exists(receiver_address, asset);
+        dispatchable_fungible_asset::transfer(minter, minter_store, receiver_store, 10);
+
+        // denylist account, check if account is denylisted
+        usdk::denylist(denylister, receiver_address);
+        assert!(primary_fungible_store::is_frozen(receiver_address, asset), 0);
+        usdk::undenylist(denylister, receiver_address);
+        assert!(!primary_fungible_store::is_frozen(receiver_address, asset), 0);
+
+        // burn tokens, check balance
+        usdk::burn(minter, minter_address, 90);
+        assert!(primary_fungible_store::balance(minter_address, asset) == 0, 0);
+    }
+
+
+    #[test(creator = @0xcafe, pauser = @0xdafe, minter = @0xface, master_minter = @0xbab)]
+    #[expected_failure(abort_code = 2, location = stablecoin::usdk)]
+    fun test_pause(creator: &signer, pauser: &signer, minter: &signer, master_minter: &signer) {
+        usdk::init_for_test(creator);
+        let minter_address = signer::address_of(minter);
+        usdk::set_pause(pauser, true);
+        usdk::add_minter(master_minter, minter_address);
+    }
+
+    // test the ability of a denylisted account to transfer out newly created store
+    #[test(creator = @0xcafe, denylister = @0xcade, receiver = @0xdead)]
+    #[expected_failure(abort_code = 327683, location = aptos_framework::object)]
+    fun test_untransferrable_store(creator: &signer, denylister: &signer, receiver: &signer) {
+        usdk::init_for_test(creator);
+        let receiver_address = signer::address_of(receiver);
+        let asset = usdk::metadata();
+
+        usdk::denylist(denylister, receiver_address);
+        assert!(primary_fungible_store::is_frozen(receiver_address, asset), 0);
+
+        let constructor_ref = object::create_object(receiver_address);
+        fungible_asset::create_store(&constructor_ref, asset);
+        let store = object::object_from_constructor_ref<FungibleStore>(&constructor_ref);
+
+        object::transfer(receiver, store, @0xdeadbeef);
+    }
+}
diff --git a/aptos-move/move-examples/fungible_asset/stablecoin/sources/usdk.move b/aptos-move/move-examples/fungible_asset/stablecoin/sources/usdk.move
new file mode 100644
index 0000000000000..d96baececf837
--- /dev/null
+++ b/aptos-move/move-examples/fungible_asset/stablecoin/sources/usdk.move
@@ -0,0 +1,342 @@
+/// Example of a managed stablecoin with mint, burn, freeze and pause functionalities.
+module stablecoin::usdk {
+    use aptos_framework::account;
+    use aptos_framework::dispatchable_fungible_asset;
+    use aptos_framework::event;
+    use aptos_framework::function_info;
+    use aptos_framework::fungible_asset::{Self, MintRef, TransferRef, BurnRef, Metadata, FungibleAsset, FungibleStore};
+    use aptos_framework::object::{Self, Object, ExtendRef};
+    use aptos_framework::primary_fungible_store;
+    use std::option;
+    use std::signer;
+    use std::string::{Self, utf8};
+    use std::vector;
+    use aptos_framework::chain_id;
+
+    /// Caller is not authorized to make this call
+    const EUNAUTHORIZED: u64 = 1;
+    /// No operations are allowed when contract is paused
+    const EPAUSED: u64 = 2;
+    /// The account is already a minter
+    const EALREADY_MINTER: u64 = 3;
+    /// The account is not a minter
+    const ENOT_MINTER: u64 = 4;
+    /// The account is denylisted
+    const EDENYLISTED: u64 = 5;
+
+    const ASSET_SYMBOL: vector<u8> = b"USDK";
+
+    #[resource_group_member(group = aptos_framework::object::ObjectGroup)]
+    struct Roles has key {
+        master_minter: address,
+        minters: vector<address>,
+        pauser: address,
+        denylister: address,
+    }
+
+    #[resource_group_member(group = aptos_framework::object::ObjectGroup)]
+    struct Management has key {
+        extend_ref: ExtendRef,
+        mint_ref: MintRef,
+        burn_ref: BurnRef,
+        transfer_ref: TransferRef,
+    }
+
+    #[resource_group_member(group = aptos_framework::object::ObjectGroup)]
+    struct State has key {
+        paused: bool,
+    }
+
+    struct Approval has drop {
+        owner: address,
+        to: address,
+        nonce: u64,
+        chain_id: u8,
+        spender: address,
+        amount: u64,
+    }
+
+    #[event]
+    struct Mint has drop, store {
+        minter: address,
+        to: address,
+        amount: u64,
+    }
+
+    #[event]
+    struct Burn has drop, store {
+        minter: address,
+        from: address,
+        store: Object<FungibleStore>,
+        amount: u64,
+    }
+
+    #[event]
+    struct Pause has drop, store {
+        pauser: address,
+        is_paused: bool,
+    }
+
+    #[event]
+    struct Denylist has drop, store {
+        denylister: address,
+        account: address,
+    }
+
+    #[view]
+    public fun usdk_address(): address {
+        object::create_object_address(&@stablecoin, ASSET_SYMBOL)
+    }
+
+    #[view]
+    public fun metadata(): Object<Metadata> {
+        object::address_to_object(usdk_address())
+    }
+
+    /// Called as part of deployment to initialize the stablecoin.
+    /// Note: The signer has to be the account where the module is published.
+    /// Create a stablecoin token (a new Fungible Asset)
+    /// Ensure any stores for the stablecoin are untransferable.
+    /// Store Roles, Management and State resources in the Metadata object.
+    /// Override deposit and withdraw functions of the newly created asset/token to add custom denylist logic.
+    fun init_module(usdk_signer: &signer) {
+        // Create the stablecoin with primary store support.
+        let constructor_ref = &object::create_named_object(usdk_signer, ASSET_SYMBOL);
+        primary_fungible_store::create_primary_store_enabled_fungible_asset(
+            constructor_ref,
+            option::none(),
+            utf8(ASSET_SYMBOL), /* name */
+            utf8(ASSET_SYMBOL), /* symbol */
+            8, /* decimals */
+            utf8(b"http://example.com/favicon.ico"), /* icon */
+            utf8(b"http://example.com"), /* project */
+        );
+
+        // Set ALL stores for the fungible asset to untransferable.
+        fungible_asset::set_untransferable(constructor_ref);
+
+        // All resources created will be kept in the asset metadata object.
+        let metadata_object_signer = &object::generate_signer(constructor_ref);
+        move_to(metadata_object_signer, Roles {
+            master_minter: @master_minter,
+            minters: vector[],
+            pauser: @pauser,
+            denylister: @denylister,
+        });
+
+        // Create mint/burn/transfer refs to allow creator to manage the stablecoin.
+        move_to(metadata_object_signer, Management {
+            extend_ref: object::generate_extend_ref(constructor_ref),
+            mint_ref: fungible_asset::generate_mint_ref(constructor_ref),
+            burn_ref: fungible_asset::generate_burn_ref(constructor_ref),
+            transfer_ref: fungible_asset::generate_transfer_ref(constructor_ref),
+        });
+
+        move_to(metadata_object_signer, State {
+            paused: false,
+        });
+
+        // Override the deposit and withdraw functions which mean overriding transfer.
+        // This ensures all transfer will call withdraw and deposit functions in this module and perform the necessary
+        // checks.
+        let deposit = function_info::new_function_info(
+            usdk_signer,
+            string::utf8(b"usdk"),
+            string::utf8(b"deposit"),
+        );
+        let withdraw = function_info::new_function_info(
+            usdk_signer,
+            string::utf8(b"usdk"),
+            string::utf8(b"withdraw"),
+        );
+        dispatchable_fungible_asset::register_dispatch_functions(
+            constructor_ref,
+            option::some(withdraw),
+            option::some(deposit),
+            option::none(),
+        );
+    }
+
+    /// Allow a spender to transfer tokens from the owner's account given their signed approval.
+    /// Caller needs to provide the from account's scheme and public key which can be gotten via the Aptos SDK.
+    public fun transfer_from(
+        spender: &signer,
+        proof: vector<u8>,
+        from: address,
+        from_account_scheme: u8,
+        from_public_key: vector<u8>,
+        to: address,
+        amount: u64,
+    ) acquires Management, State {
+        assert_not_paused();
+        assert_not_denylisted(from);
+        assert_not_denylisted(to);
+
+        let expected_message = Approval {
+            owner: from,
+            to: to,
+            nonce: account::get_sequence_number(from),
+            chain_id: chain_id::get(),
+            spender: signer::address_of(spender),
+            amount,
+        };
+        account::verify_signed_message(from, from_account_scheme, from_public_key, proof, expected_message);
+
+        let transfer_ref = &borrow_global<Management>(usdk_address()).transfer_ref;
+        // Only use with_ref API for primary_fungible_store (PFS) transfers in this module.
+        primary_fungible_store::transfer_with_ref(transfer_ref, from, to, amount);
+    }
+
+    /// Deposit function override to ensure that the account is not denylisted and the stablecoin is not paused.
+    public fun deposit<T: key>(
+        store: Object<T>,
+        fa: FungibleAsset,
+        transfer_ref: &TransferRef,
+    ) acquires State {
+        assert_not_paused();
+        assert_not_denylisted(object::owner(store));
+        fungible_asset::deposit_with_ref(transfer_ref, store, fa);
+    }
+
+    /// Withdraw function override to ensure that the account is not denylisted and the stablecoin is not paused.
+    public fun withdraw<T: key>(
+        store: Object<T>,
+        amount: u64,
+        transfer_ref: &TransferRef,
+    ): FungibleAsset acquires State {
+        assert_not_paused();
+        assert_not_denylisted(object::owner(store));
+        fungible_asset::withdraw_with_ref(transfer_ref, store, amount)
+    }
+
+    /// Mint new tokens to the specified account. This checks that the caller is a minter, the stablecoin is not paused,
+    /// and the account is not denylisted.
+    public entry fun mint(minter: &signer, to: address, amount: u64) acquires Management, Roles, State {
+        assert_not_paused();
+        assert_is_minter(minter);
+        assert_not_denylisted(to);
+        if (amount == 0) { return };
+
+        let management = borrow_global<Management>(usdk_address());
+        let tokens = fungible_asset::mint(&management.mint_ref, amount);
+        // Ensure not to call pfs::deposit or dfa::deposit directly in the module.
+        deposit(primary_fungible_store::ensure_primary_store_exists(to, metadata()), tokens, &management.transfer_ref);
+
+        event::emit(Mint {
+            minter: signer::address_of(minter),
+            to,
+            amount,
+        });
+    }
+
+    /// Burn tokens from the specified account. This checks that the caller is a minter and the stablecoin is not paused.
+    public entry fun burn(minter: &signer, from: address, amount: u64) acquires Management, Roles, State {
+        burn_from(minter, primary_fungible_store::ensure_primary_store_exists(from, metadata()), amount);
+    }
+
+    /// Burn tokens from the specified account's store. This checks that the caller is a minter and the stablecoin is
+    /// not paused.
+    public entry fun burn_from(
+        minter: &signer,
+        store: Object<FungibleStore>,
+        amount: u64,
+    ) acquires Management, Roles, State {
+        assert_not_paused();
+        assert_is_minter(minter);
+        if (amount == 0) { return };
+
+        let management = borrow_global<Management>(usdk_address());
+        let tokens = fungible_asset::withdraw_with_ref(
+            &management.transfer_ref,
+            store,
+            amount,
+        );
+        fungible_asset::burn(&management.burn_ref, tokens);
+
+        event::emit(Burn {
+            minter: signer::address_of(minter),
+            from: object::owner(store),
+            store,
+            amount,
+        });
+    }
+
+    /// Pause or unpause the stablecoin. This checks that the caller is the pauser.
+    public entry fun set_pause(pauser: &signer, paused: bool) acquires Roles, State {
+        let roles = borrow_global<Roles>(usdk_address());
+        assert!(signer::address_of(pauser) == roles.pauser, EUNAUTHORIZED);
+        let state = borrow_global_mut<State>(usdk_address());
+        if (state.paused == paused) { return };
+        state.paused = paused;
+
+        event::emit(Pause {
+            pauser: signer::address_of(pauser),
+            is_paused: paused,
+        });
+    }
+
+    /// Add an account to the denylist. This checks that the caller is the denylister.
+    public entry fun denylist(denylister: &signer, account: address) acquires Management, Roles, State {
+        assert_not_paused();
+        let roles = borrow_global<Roles>(usdk_address());
+        assert!(signer::address_of(denylister) == roles.denylister, EUNAUTHORIZED);
+
+        let freeze_ref = &borrow_global<Management>(usdk_address()).transfer_ref;
+        primary_fungible_store::set_frozen_flag(freeze_ref, account, true);
+
+        event::emit(Denylist {
+            denylister: signer::address_of(denylister),
+            account,
+        });
+    }
+
+    /// Remove an account from the denylist. This checks that the caller is the denylister.
+    public entry fun undenylist(denylister: &signer, account: address) acquires Management, Roles, State {
+        assert_not_paused();
+        let roles = borrow_global<Roles>(usdk_address());
+        assert!(signer::address_of(denylister) == roles.denylister, EUNAUTHORIZED);
+
+        let freeze_ref = &borrow_global<Management>(usdk_address()).transfer_ref;
+        primary_fungible_store::set_frozen_flag(freeze_ref, account, false);
+
+        event::emit(Denylist {
+            denylister: signer::address_of(denylister),
+            account,
+        });
+    }
+
+    /// Add a new minter. This checks that the caller is the master minter and the account is not already a minter.
+    public entry fun add_minter(admin: &signer, minter: address) acquires Roles, State {
+        assert_not_paused();
+        let roles = borrow_global_mut<Roles>(usdk_address());
+        assert!(signer::address_of(admin) == roles.master_minter, EUNAUTHORIZED);
+        assert!(!vector::contains(&roles.minters, &minter), EALREADY_MINTER);
+        vector::push_back(&mut roles.minters, minter);
+    }
+
+    fun assert_is_minter(minter: &signer) acquires Roles {
+        let roles = borrow_global<Roles>(usdk_address());
+        let minter_addr = signer::address_of(minter);
+        assert!(minter_addr == roles.master_minter || vector::contains(&roles.minters, &minter_addr), EUNAUTHORIZED);
+    }
+
+    fun assert_not_paused() acquires State {
+        let state = borrow_global<State>(usdk_address());
+        assert!(!state.paused, EPAUSED);
+    }
+
+    // Check that the account is not denylisted by checking the frozen flag on the primary store
+    fun assert_not_denylisted(account: address) {
+        let metadata = metadata();
+        // CANNOT call into pfs::store_exists in our withdraw/deposit hooks as it creates possibility of a circular dependency.
+        // Instead, we will call the inlined version of the function.
+        if (primary_fungible_store::primary_store_exists_inlined(account, metadata)) {
+            assert!(!fungible_asset::is_frozen(primary_fungible_store::primary_store_inlined(account, metadata)), EDENYLISTED);
+        }
+    }
+
+    #[test_only]
+    public fun init_for_test(usdk_signer: &signer) {
+        init_module(usdk_signer);
+    }
+}
diff --git a/aptos-move/move-examples/large_packages/large_package_example/sources/five.move b/aptos-move/move-examples/large_packages/large_package_example/sources/five.move
index e539adf7d0036..564715216658a 100644
--- a/aptos-move/move-examples/large_packages/large_package_example/sources/five.move
+++ b/aptos-move/move-examples/large_packages/large_package_example/sources/five.move
@@ -52,27 +52,27 @@
 ///     <ul>
 ///       <li>REST API: <a href="https://fullnode.devnet.aptoslabs.com/v1">https://fullnode.devnet.aptoslabs.com/v1</a></li>
 ///       <li>REST API Spec: <a href="https://fullnode.devnet.aptoslabs.com/v1/spec#/">https://fullnode.devnet.aptoslabs.com/v1/spec#/</a></li>
-///       <li>Indexer API: <a href="https://indexer-devnet.staging.gcp.aptosdev.com/v1/graphql">https://indexer-devnet.staging.gcp.aptosdev.com/v1/graphql</a></li>
+///       <li>Indexer API: <a href="https://api.devnet.aptoslabs.com/v1/graphql">https://api.devnet.aptoslabs.com/v1/graphql</a></li>
 ///       <li>Faucet API: <a href="https://faucet.devnet.aptoslabs.com">https://faucet.devnet.aptoslabs.com</a></li>
-///       <li><a href="https://cloud.hasura.io/public/graphiql?endpoint=https://indexer-devnet.staging.gcp.aptosdev.com/v1/graphql">Indexer GraphQL</a></li>
+///       <li><a href="https://cloud.hasura.io/public/graphiql?endpoint=https://api.devnet.aptoslabs.com/v1/graphql">Indexer GraphQL</a></li>
 ///     </ul>
 ///   </TabItem>
 ///   <TabItem value="testnet" label="Testnet">
 ///     <ul>
 ///       <li>REST API: <a href="https://fullnode.testnet.aptoslabs.com/v1">https://fullnode.testnet.aptoslabs.com/v1</a></li>
 ///       <li>REST API Spec: <a href="https://fullnode.testnet.aptoslabs.com/v1/spec#/">https://fullnode.testnet.aptoslabs.com/v1/spec#/</a></li>
-///       <li>Indexer API: <a href="https://indexer-testnet.staging.gcp.aptosdev.com/v1/graphql">https://indexer-testnet.staging.gcp.aptosdev.com/v1/graphql</a></li>
+///       <li>Indexer API: <a href="https://api.testnet.aptoslabs.com/v1/graphql">https://api.testnet.aptoslabs.com/v1/graphql</a></li>
 ///       <li>Faucet API: <a href="https://faucet.testnet.aptoslabs.com">https://faucet.testnet.aptoslabs.com</a></li>
-///       <li><a href="https://cloud.hasura.io/public/graphiql?endpoint=https://indexer-testnet.staging.gcp.aptosdev.com/v1/graphql">Indexer GraphQL</a></li>
+///       <li><a href="https://cloud.hasura.io/public/graphiql?endpoint=https://api.testnet.aptoslabs.com/v1/graphql">Indexer GraphQL</a></li>
 ///     </ul>
 ///   </TabItem>
 ///   <TabItem value="mainnet" label="Mainnet">
 ///     <ul>
 ///       <li>REST API: <a href="https://fullnode.mainnet.aptoslabs.com/v1">https://fullnode.mainnet.aptoslabs.com/v1</a></li>
 ///       <li>REST API Spec: <a href="https://fullnode.mainnet.aptoslabs.com/v1/spec#/">https://fullnode.mainnet.aptoslabs.com/v1/spec#/</a></li>
-///       <li>Indexer API: <a href="https://indexer.mainnet.aptoslabs.com/v1/graphql">https://indexer.mainnet.aptoslabs.com/v1/graphql</a></li>
+///       <li>Indexer API: <a href="https://api.mainnet.aptoslabs.com/v1/graphql">https://api.mainnet.aptoslabs.com/v1/graphql</a></li>
 ///       <li>Faucet: N/A</li>
-///       <li><a href="https://cloud.hasura.io/public/graphiql?endpoint=https://indexer.mainnet.aptoslabs.com/v1/graphql">Indexer GraphQL</a></li>
+///       <li><a href="https://cloud.hasura.io/public/graphiql?endpoint=https://api.mainnet.aptoslabs.com/v1/graphql">Indexer GraphQL</a></li>
 ///     </ul>
 ///   </TabItem>
 /// </Tabs>
diff --git a/aptos-move/move-examples/on_chain_dice/sources/dice.move b/aptos-move/move-examples/on_chain_dice/sources/dice.move
index 44db6388dbf47..bf3285c2afa86 100644
--- a/aptos-move/move-examples/on_chain_dice/sources/dice.move
+++ b/aptos-move/move-examples/on_chain_dice/sources/dice.move
@@ -7,7 +7,8 @@ module module_owner::dice {
         rolls: vector<u64>,
     }
 
-    entry fun roll_v0(_account: signer) {
+    #[lint::allow_unsafe_randomness]
+    public entry fun roll_v0(_account: signer) {
         let _ = randomness::u64_range(0, 6);
     }
 
diff --git a/aptos-move/move-examples/post_mint_reveal_nft/sources/minting.move b/aptos-move/move-examples/post_mint_reveal_nft/sources/minting.move
index aebff788ff30a..ea9e4f5dedd32 100644
--- a/aptos-move/move-examples/post_mint_reveal_nft/sources/minting.move
+++ b/aptos-move/move-examples/post_mint_reveal_nft/sources/minting.move
@@ -717,7 +717,7 @@ module post_mint_reveal_nft::minting {
     }
 
     #[test (
-        admin_account = @0xcafe,
+        admin_account = @post_mint_reveal_nft,
         wl_nft_claimer = @0x123,
         public_nft_claimer = @0x234,
         treasury_account = @0x345,
@@ -820,7 +820,7 @@ module post_mint_reveal_nft::minting {
     }
 
     #[test (
-        admin_account = @0xcafe,
+        admin_account = @post_mint_reveal_nft,
         wl_nft_claimer = @0x123,
         public_nft_claimer = @0x234,
         treasury_account = @0x345,
@@ -844,7 +844,7 @@ module post_mint_reveal_nft::minting {
     }
 
     #[test (
-        admin_account = @0xcafe,
+        admin_account = @post_mint_reveal_nft,
         wl_nft_claimer = @0x123,
         public_nft_claimer = @0x234,
         treasury_account = @0x345,
@@ -887,7 +887,7 @@ module post_mint_reveal_nft::minting {
     }
 
     #[test (
-        admin_account = @0xcafe,
+        admin_account = @post_mint_reveal_nft,
         wl_nft_claimer = @0x123,
         public_nft_claimer = @0x234,
         treasury_account = @0x345,
@@ -906,7 +906,7 @@ module post_mint_reveal_nft::minting {
     }
 
     #[test (
-        admin_account = @0xcafe,
+        admin_account = @post_mint_reveal_nft,
         wl_nft_claimer = @0x123,
         public_nft_claimer = @0x234,
         treasury_account = @0x345,
@@ -926,7 +926,7 @@ module post_mint_reveal_nft::minting {
     }
 
     #[test (
-        admin_account = @0xcafe,
+        admin_account = @post_mint_reveal_nft,
         wl_nft_claimer = @0x123,
         public_nft_claimer = @0x234,
         treasury_account = @0x345,
@@ -945,7 +945,7 @@ module post_mint_reveal_nft::minting {
     }
 
     #[test (
-        admin_account = @0xcafe,
+        admin_account = @post_mint_reveal_nft,
         wl_nft_claimer = @0x123,
         public_nft_claimer = @0x234,
         treasury_account = @0x345,
@@ -971,7 +971,7 @@ module post_mint_reveal_nft::minting {
     }
 
     #[test (
-        admin_account = @0xcafe,
+        admin_account = @post_mint_reveal_nft,
         wl_nft_claimer = @0x123,
         public_nft_claimer = @0x234,
         treasury_account = @0x345,
@@ -999,7 +999,7 @@ module post_mint_reveal_nft::minting {
     }
 
     #[test (
-        admin_account = @0xcafe,
+        admin_account = @post_mint_reveal_nft,
         wl_nft_claimer = @0x123,
         public_nft_claimer = @0x234,
         treasury_account = @0x345,
@@ -1029,7 +1029,7 @@ module post_mint_reveal_nft::minting {
     }
 
     #[test (
-        admin_account = @0xcafe,
+        admin_account = @post_mint_reveal_nft,
         wl_nft_claimer = @0x123,
         public_nft_claimer = @0x234,
         treasury_account = @0x345,
@@ -1054,7 +1054,7 @@ module post_mint_reveal_nft::minting {
     }
 
     #[test (
-        admin_account = @0xcafe,
+        admin_account = @post_mint_reveal_nft,
         wl_nft_claimer = @0x123,
         public_nft_claimer = @0x234,
         treasury_account = @0x345,
@@ -1078,7 +1078,7 @@ module post_mint_reveal_nft::minting {
     }
 
     #[test (
-        admin_account = @0xcafe,
+        admin_account = @post_mint_reveal_nft,
         wl_nft_claimer = @0x123,
         public_nft_claimer = @0x234,
         treasury_account = @0x345,
@@ -1102,7 +1102,7 @@ module post_mint_reveal_nft::minting {
     }
 
     #[test (
-        admin_account = @0xcafe,
+        admin_account = @post_mint_reveal_nft,
         wl_nft_claimer = @0x123,
         public_nft_claimer = @0x234,
         treasury_account = @0x345,
@@ -1132,7 +1132,7 @@ module post_mint_reveal_nft::minting {
     }
 
     #[test (
-        admin_account = @0xcafe,
+        admin_account = @post_mint_reveal_nft,
         wl_nft_claimer = @0x123,
         public_nft_claimer = @0x234,
         treasury_account = @0x345,
@@ -1167,7 +1167,7 @@ module post_mint_reveal_nft::minting {
     }
 
     #[test (
-        admin_account = @0xcafe,
+        admin_account = @post_mint_reveal_nft,
         wl_nft_claimer = @0x123,
         public_nft_claimer = @0x234,
         treasury_account = @0x345,
@@ -1187,7 +1187,7 @@ module post_mint_reveal_nft::minting {
     }
 
     #[test (
-        admin_account = @0xcafe,
+        admin_account = @post_mint_reveal_nft,
         wl_nft_claimer = @0x123,
         public_nft_claimer = @0x234,
         treasury_account = @0x345,
@@ -1235,7 +1235,7 @@ module post_mint_reveal_nft::minting {
     }
 
     #[test (
-        admin_account = @0xcafe,
+        admin_account = @post_mint_reveal_nft,
         wl_nft_claimer = @0x123,
         wl_nft_claimer2 = @0x234,
         treasury_account = @0x345,
@@ -1288,7 +1288,7 @@ module post_mint_reveal_nft::minting {
     }
 
     #[test (
-        admin_account = @0xcafe,
+        admin_account = @post_mint_reveal_nft,
         wl_nft_claimer = @0x123,
         wl_nft_claimer2 = @0x234,
         treasury_account = @0x345,
@@ -1315,7 +1315,7 @@ module post_mint_reveal_nft::minting {
 
 
     #[test (
-        admin_account = @0xcafe,
+        admin_account = @post_mint_reveal_nft,
         wl_nft_claimer = @0x123,
         wl_nft_claimer2 = @0x234,
         treasury_account = @0x345,
diff --git a/aptos-move/move-examples/raffle/sources/raffle.move b/aptos-move/move-examples/raffle/sources/raffle.move
index 78a6423026d11..9063bb219a3a2 100644
--- a/aptos-move/move-examples/raffle/sources/raffle.move
+++ b/aptos-move/move-examples/raffle/sources/raffle.move
@@ -5,10 +5,9 @@ module raffle::raffle {
     use aptos_framework::aptos_coin::AptosCoin;
     use aptos_framework::coin;
     use aptos_framework::randomness;
-    use aptos_std::smart_vector;
-    use aptos_std::smart_vector::SmartVector;
     use aptos_framework::coin::Coin;
     use std::signer;
+    use std::vector;
 
     // We need this friend declaration so our tests can call `init_module`.
     friend raffle::raffle_test;
@@ -25,7 +24,10 @@ module raffle::raffle {
     /// A raffle: a list of users who bought tickets.
     struct Raffle has key {
         // A list of users who bought raffle tickets (repeats allowed).
-        tickets: SmartVector<address>,
+        //
+        // **WARNING:** Using SmartVector here will make the module vulnerable to **undergasing attacks**.
+        // See [AIP-41](https://github.com/aptos-foundation/AIPs/blob/main/aips/aip-41.md#undergasing-attacks).
+        tickets: vector<address>,
         coins: Coin<AptosCoin>,
         is_closed: bool,
     }
@@ -35,7 +37,7 @@ module raffle::raffle {
         move_to(
             deployer,
             Raffle {
-                tickets: smart_vector::empty(),
+                tickets: vector::empty(),
                 coins: coin::zero(),
                 is_closed: false,
             }
@@ -60,7 +62,7 @@ module raffle::raffle {
         coin::merge(&mut raffle.coins, coins);
 
         // Issue a ticket for that user
-        smart_vector::push_back(&mut raffle.tickets, signer::address_of(user))
+        vector::push_back(&mut raffle.tickets, signer::address_of(user))
     }
 
     #[randomness]
@@ -84,11 +86,11 @@ module raffle::raffle {
     public(friend) fun randomly_pick_winner_internal(): address acquires Raffle {
         let raffle = borrow_global_mut<Raffle>(@raffle);
         assert!(!raffle.is_closed, E_RAFFLE_HAS_CLOSED);
-        assert!(!smart_vector::is_empty(&raffle.tickets), E_NO_TICKETS);
+        assert!(!vector::is_empty(&raffle.tickets), E_NO_TICKETS);
 
         // Pick a random winner in [0, |raffle.tickets|)
-        let winner_idx = randomness::u64_range(0, smart_vector::length(&raffle.tickets));
-        let winner = *smart_vector::borrow(&raffle.tickets, winner_idx);
+        let winner_idx = randomness::u64_range(0, vector::length(&raffle.tickets));
+        let winner = *vector::borrow(&raffle.tickets, winner_idx);
 
         // Pay the winner
         let coins = coin::extract_all(&mut raffle.coins);
diff --git a/aptos-move/move-examples/rewards_pool/sources/tests/test_helpers.move b/aptos-move/move-examples/rewards_pool/sources/tests/test_helpers.move
index ebec4b3d11195..db53189058bcb 100644
--- a/aptos-move/move-examples/rewards_pool/sources/tests/test_helpers.move
+++ b/aptos-move/move-examples/rewards_pool/sources/tests/test_helpers.move
@@ -16,7 +16,6 @@ module rewards_pool::test_helpers {
     use std::vector;
 
     public fun set_up() {
-        aptos_governance::toggle_features_for_test(vector[features::get_auids()], vector[]);
         timestamp::set_time_has_started_for_testing(&account::create_signer_for_test(@0x1));
         epoch::fast_forward(100);
     }
diff --git a/aptos-move/move-examples/tests/move_unit_tests.rs b/aptos-move/move-examples/tests/move_unit_tests.rs
index d143b6ce5bf4b..a27b93573131d 100644
--- a/aptos-move/move-examples/tests/move_unit_tests.rs
+++ b/aptos-move/move-examples/tests/move_unit_tests.rs
@@ -122,6 +122,11 @@ fn test_drand_lottery() {
     test_common("drand");
 }
 
+#[test]
+fn test_raffle() {
+    test_common("raffle");
+}
+
 #[test]
 fn test_marketplace() {
     test_common("marketplace")
diff --git a/aptos-move/move-examples/token_objects/guild/sources/guild.move b/aptos-move/move-examples/token_objects/guild/sources/guild.move
index 0a0b0fe45e45a..b2c936d0140c9 100644
--- a/aptos-move/move-examples/token_objects/guild/sources/guild.move
+++ b/aptos-move/move-examples/token_objects/guild/sources/guild.move
@@ -260,13 +260,8 @@ module guild::guild {
         smart_vector::contains(whitelist, &guild_master)
     }
 
-    #[test(fx = @std, admin = @guild, guild_master = @0x456, user = @0x789)]
-    public fun test_guild(fx: signer, admin: &signer, guild_master: &signer, user: address) acquires GuildToken, MemberToken, Config, Config {
-        use std::features;
-
-        let feature = features::get_auids();
-        features::change_feature_flags_for_testing(&fx, vector[feature], vector[]);
-
+    #[test(admin = @guild, guild_master = @0x456, user = @0x789)]
+    public fun test_guild(admin: &signer, guild_master: &signer, user: address) acquires GuildToken, MemberToken, Config, Config {
         // This test assumes that the creator's address is equal to @token_objects.
         assert!(signer::address_of(admin) == @guild, 0);
 
diff --git a/aptos-move/mvhashmap/src/types.rs b/aptos-move/mvhashmap/src/types.rs
index c5c8b0938e541..62cc81e30eaa6 100644
--- a/aptos-move/mvhashmap/src/types.rs
+++ b/aptos-move/mvhashmap/src/types.rs
@@ -246,13 +246,13 @@ pub(crate) mod test {
     use super::*;
     use aptos_aggregator::delta_change_set::serialize;
     use aptos_types::{
-        access_path::AccessPath,
         executable::ModulePath,
         state_store::state_value::StateValue,
         write_set::{TransactionWrite, WriteOpKind},
     };
     use bytes::Bytes;
     use claims::{assert_err, assert_ok_eq};
+    use move_core_types::{account_address::AccountAddress, identifier::IdentStr};
     use std::{fmt::Debug, hash::Hash, sync::Arc};
 
     #[derive(Clone, Eq, Hash, PartialEq, Debug)]
@@ -262,8 +262,15 @@ pub(crate) mod test {
     );
 
     impl<K: Hash + Clone + Eq + Debug> ModulePath for KeyType<K> {
-        fn module_path(&self) -> Option<AccessPath> {
-            None
+        fn is_module_path(&self) -> bool {
+            false
+        }
+
+        fn from_address_and_module_name(
+            _address: &AccountAddress,
+            _module_name: &IdentStr,
+        ) -> Self {
+            unreachable!("Irrelevant for test")
         }
     }
 
diff --git a/aptos-move/mvhashmap/src/unit_tests/mod.rs b/aptos-move/mvhashmap/src/unit_tests/mod.rs
index 728c3d4adc7c9..4575e04912158 100644
--- a/aptos-move/mvhashmap/src/unit_tests/mod.rs
+++ b/aptos-move/mvhashmap/src/unit_tests/mod.rs
@@ -16,7 +16,13 @@ use aptos_aggregator::{
     delta_change_set::{delta_add, delta_sub, DeltaOp},
     delta_math::DeltaHistory,
 };
-use aptos_types::executable::ExecutableTestType;
+use aptos_types::{
+    executable::ExecutableTestType,
+    on_chain_config::CurrentTimeMicroseconds,
+    state_store::state_value::{StateValue, StateValueMetadata},
+    write_set::WriteOpKind,
+};
+use bytes::Bytes;
 use claims::{assert_err_eq, assert_none, assert_ok_eq, assert_some_eq};
 use std::sync::Arc;
 mod proptest_types;
@@ -55,6 +61,67 @@ fn unsync_map_data_basic() {
     );
 }
 
+#[derive(Debug, Clone, PartialEq, Eq)]
+struct TestMetadataValue {
+    metadata: u64,
+}
+
+impl TransactionWrite for TestMetadataValue {
+    fn bytes(&self) -> Option<&Bytes> {
+        unimplemented!("Irrelevant for the test")
+    }
+
+    fn write_op_kind(&self) -> WriteOpKind {
+        unimplemented!("Irrelevant for the test")
+    }
+
+    fn from_state_value(_maybe_state_value: Option<StateValue>) -> Self {
+        unimplemented!("Irrelevant for the test")
+    }
+
+    fn as_state_value(&self) -> Option<StateValue> {
+        unimplemented!("Irrelevant for the test")
+    }
+
+    fn as_state_value_metadata(&self) -> Option<StateValueMetadata> {
+        Some(StateValueMetadata::legacy(
+            self.metadata,
+            &CurrentTimeMicroseconds {
+                microseconds: self.metadata,
+            },
+        ))
+    }
+
+    fn set_bytes(&mut self, _bytes: Bytes) {
+        unimplemented!("Irrelevant for the test")
+    }
+}
+
+#[test]
+fn write_metadata() {
+    let ap = KeyType(b"/foo/b".to_vec());
+
+    let mvtbl: MVHashMap<KeyType<Vec<u8>>, usize, TestMetadataValue, ExecutableTestType, ()> =
+        MVHashMap::new();
+
+    let metadata_5 = TestMetadataValue { metadata: 5 };
+    let metadata_6 = TestMetadataValue { metadata: 6 };
+
+    assert!(mvtbl
+        .data()
+        .write_metadata(ap.clone(), 10, 1, metadata_5.clone()));
+    assert!(mvtbl.data().write_metadata(ap.clone(), 10, 1, metadata_6));
+    assert!(mvtbl
+        .data()
+        .write_metadata(ap.clone(), 10, 1, metadata_5.clone()));
+    // Should be equal to recorded metadata and return false (no change).
+    assert!(!mvtbl
+        .data()
+        .write_metadata(ap.clone(), 10, 1, metadata_5.clone()));
+
+    assert!(mvtbl.data().write_metadata(ap.clone(), 11, 1, metadata_5));
+}
+
 #[test]
 fn create_write_read_placeholder_struct() {
     use MVDataError::*;
diff --git a/aptos-move/mvhashmap/src/unsync_map.rs b/aptos-move/mvhashmap/src/unsync_map.rs
index 539b95100a862..f3bbcef5f404d 100644
--- a/aptos-move/mvhashmap/src/unsync_map.rs
+++ b/aptos-move/mvhashmap/src/unsync_map.rs
@@ -242,7 +242,7 @@ impl<
 
     pub fn fetch_module(&self, key: &K) -> Option<MVModulesOutput<V, X>> {
         use MVModulesOutput::*;
-        debug_assert!(key.module_path().is_some());
+        debug_assert!(key.is_module_path());
 
         self.module_map.borrow_mut().get_mut(key).map(|entry| {
             let hash = entry.1.get_or_insert(module_hash(entry.0.as_ref()));
diff --git a/aptos-move/mvhashmap/src/versioned_data.rs b/aptos-move/mvhashmap/src/versioned_data.rs
index 6c87f14a78754..a9eb066f0617d 100644
--- a/aptos-move/mvhashmap/src/versioned_data.rs
+++ b/aptos-move/mvhashmap/src/versioned_data.rs
@@ -361,6 +361,40 @@ impl<K: Hash + Clone + Debug + Eq, V: TransactionWrite> VersionedData<K, V> {
         }));
     }
 
+    /// Versioned write of metadata at a given resource group key (and version). Returns true
+    /// if the previously stored metadata has changed as observed by later transactions (e.g.
+    /// metadata of a deletion can never be observed by later transactions).
+    pub fn write_metadata(
+        &self,
+        key: K,
+        txn_idx: TxnIndex,
+        incarnation: Incarnation,
+        data: V,
+    ) -> bool {
+        let arc_data = Arc::new(data);
+
+        let mut v = self.values.entry(key).or_default();
+        let prev_entry = v.versioned_map.insert(
+            ShiftedTxnIndex::new(txn_idx),
+            CachePadded::new(Entry::new_write_from(
+                incarnation,
+                ValueWithLayout::Exchanged(arc_data.clone(), None),
+            )),
+        );
+
+        // Changes versioned metadata that was stored.
+        prev_entry.map_or(true, |entry| -> bool {
+            if let EntryCell::Write(_, existing_v) = &entry.cell {
+                arc_data.as_state_value_metadata()
+                    != existing_v
+                        .extract_value_no_layout()
+                        .as_state_value_metadata()
+            } else {
+                unreachable!("Group metadata can't be written at AggregatorV1 key");
+            }
+        })
+    }
+
     /// When a transaction is committed, this method can be called for its delta outputs to add
     /// a 'shortcut' to the corresponding materialized aggregator value, so any subsequent reads
     /// do not have to traverse below the index. It must be guaranteed by the caller that the
diff --git a/aptos-move/mvhashmap/src/versioned_group_data.rs b/aptos-move/mvhashmap/src/versioned_group_data.rs
index 916d65eaf3c72..bf728828d64d6 100644
--- a/aptos-move/mvhashmap/src/versioned_group_data.rs
+++ b/aptos-move/mvhashmap/src/versioned_group_data.rs
@@ -15,7 +15,7 @@ use serde::Serialize;
 use std::{
     collections::{
         btree_map::{self, BTreeMap},
-        HashMap, HashSet,
+        HashMap,
     },
     fmt::Debug,
     hash::Hash,
@@ -62,6 +62,10 @@ pub(crate) struct VersionedGroupValue<T, V> {
 
     /// Group contents corresponding to the latest committed version.
     committed_group: HashMap<T, ValueWithLayout<V>>,
+
+    /// Group size has changed between speculative executions. Useful to know for the best
+    /// heuristic behavior when reading the group size (e.g. wait on the dependency or not).
+    size_changed: bool,
 }
 
 /// Maps each key (access path) to an internal VersionedValue.
@@ -77,6 +81,7 @@ impl<T: Hash + Clone + Debug + Eq + Serialize, V: TransactionWrite> Default
             versioned_map: HashMap::new(),
             idx_to_update: BTreeMap::new(),
             committed_group: HashMap::new(),
+            size_changed: false,
         }
     }
 }
@@ -170,14 +175,21 @@ impl<T: Hash + Clone + Debug + Eq + Serialize, V: TransactionWrite> VersionedGro
         let at_base_version = shifted_idx == zero_idx;
 
         // Remove any prior entries.
-        let prev_tags: HashSet<T> = self.remove(shifted_idx.clone()).into_iter().collect();
-        let mut writes_outside = false;
+        let mut prev_tag_and_sizes: HashMap<T, Option<usize>> =
+            self.remove(shifted_idx.clone()).into_iter().collect();
+
+        // Changes the set of values, or the size of the entries (that might have been
+        // used even when marked as an estimate, if self.size_changed was still false).
+        // Note: we can flag if an estimate entry's size was used, or if the group size
+        // read observed self.size_changed == false. Otherwise, as in vanilla Block-STM,
+        // it would suffice to simply check if the re-execution writes outside of the
+        // prior (group) write-set. Not implemented (yet), as for this optimization to
+        // be useful, the group metadata checks also need to be handled similarly.
+        let mut changes_behavior = false;
 
         let arc_map = values
             .map(|(tag, v)| {
-                if !prev_tags.contains(&tag) {
-                    writes_outside = true;
-                }
+                changes_behavior |= prev_tag_and_sizes.remove(&tag) != Some(v.bytes_len());
 
                 // Update versioned_map.
                 self.versioned_map.entry(tag.clone()).or_default().insert(
@@ -189,6 +201,10 @@ impl<T: Hash + Clone + Debug + Eq + Serialize, V: TransactionWrite> VersionedGro
             })
             .collect();
 
+        if !prev_tag_and_sizes.is_empty() {
+            changes_behavior = true;
+        }
+
         assert_none!(
             self.idx_to_update
                 .insert(shifted_idx, CachePadded::new(arc_map)),
@@ -201,7 +217,14 @@ impl<T: Hash + Clone + Debug + Eq + Serialize, V: TransactionWrite> VersionedGro
                 .expect("Marking storage version as committed must succeed");
         }
 
-        writes_outside
+        if changes_behavior && incarnation > 0 {
+            // Incarnation 0 sets the group contents the first time, but this is not
+            // considered as changing size between speculative executions - all later
+            // incarnations, however, are considered.
+            self.size_changed = true;
+        }
+
+        changes_behavior
     }
 
     fn mark_estimate(&mut self, txn_idx: TxnIndex) {
@@ -224,15 +247,20 @@ impl<T: Hash + Clone + Debug + Eq + Serialize, V: TransactionWrite> VersionedGro
         }
     }
 
-    fn remove(&mut self, shifted_idx: ShiftedTxnIndex) -> Vec<T> {
+    fn remove(&mut self, shifted_idx: ShiftedTxnIndex) -> Vec<(T, Option<usize>)> {
         // Remove idx updates first, then entries.
-        let idx_update_tags: Vec<T> = self
+        let idx_update_tags: Vec<(T, Option<usize>)> = self
             .idx_to_update
             .remove(&shifted_idx)
-            .map_or(vec![], |map| map.into_inner().into_keys().collect());
+            .map_or(vec![], |map| {
+                map.into_inner()
+                    .into_iter()
+                    .map(|(tag, v)| (tag, v.bytes_len()))
+                    .collect()
+            });
 
         // Similar to mark_estimate, need to remove an individual entry for each tag.
-        for tag in idx_update_tags.iter() {
+        for (tag, _) in idx_update_tags.iter() {
             assert_some!(
                 self.versioned_map
                     .get_mut(tag)
@@ -348,7 +376,11 @@ impl<T: Hash + Clone + Debug + Eq + Serialize, V: TransactionWrite> VersionedGro
                 tree.range(ShiftedTxnIndex::zero_idx()..ShiftedTxnIndex::new(txn_idx))
                     .next_back()
                     .and_then(|(idx, entry)| {
-                        if entry.flag == Flag::Estimate {
+                        // We would like to use the value in an estimated entry if size never changed
+                        // between speculative executions, i.e. to depend on estimates only when the
+                        // size has changed. In this case, execution can wait on a dependency, while
+                        // validation can short circuit to fail.
+                        if entry.flag == Flag::Estimate && self.size_changed {
                             Some(Err(MVGroupError::Dependency(
                                 idx.idx().expect("May not depend on storage version"),
                             )))
@@ -430,10 +462,12 @@ impl<
 
     /// Remove all entries from transaction 'txn_idx' at access path 'key'.
     pub fn remove(&self, key: &K, txn_idx: TxnIndex) {
-        self.group_values
-            .get_mut(key)
-            .expect("Path must exist")
-            .remove(ShiftedTxnIndex::new(txn_idx));
+        let mut group = self.group_values.get_mut(key).expect("Path must exist");
+        let removed = group.remove(ShiftedTxnIndex::new(txn_idx));
+
+        if !removed.is_empty() {
+            group.size_changed = true;
+        }
     }
 
     /// Read the latest value corresponding to a tag at a given group (identified by key).
@@ -453,11 +487,12 @@ impl<
         }
     }
 
-    /// Returns the sum of latest sizes of all group members (and their respective tags),
-    /// collected based on the list of recorded tags. If the latest entry at any tag was
-    /// marked as an estimate, a dependency is returned. Note: it would be possible to
-    /// process estimated entry sizes, but would have to mark that if after the re-execution
-    /// the entry size changes, then re-execution must reduce validation idx.
+    /// Returns the sum of latest sizes of all group members (and respective tags), collected
+    /// based on the recorded list of tags. If the latest entry at a tag is marked as estimate
+    /// and the group size has changed between speculative executions then a dependency is
+    /// returned. Otherwise, the size is computed including the sizes of estimated entries.
+    /// This works w. Block-STM, because a validation wave is triggered when any group entry
+    /// size changes after re-execution (also when an entry is added or removed).
     pub fn get_group_size(
         &self,
         key: &K,
@@ -469,6 +504,15 @@ impl<
         }
     }
 
+    pub fn validate_group_size(
+        &self,
+        key: &K,
+        txn_idx: TxnIndex,
+        group_size_to_validate: ResourceGroupSize,
+    ) -> bool {
+        self.get_group_size(key, txn_idx) == Ok(group_size_to_validate)
+    }
+
     /// For a given key that corresponds to a group, and an index of a transaction the last
     /// incarnation of which wrote to at least one tag of the group, finalizes the latest
     /// contents of the group. This method works on pointers only and is relatively lighweight,
@@ -697,6 +741,14 @@ mod test {
         let ap = KeyType(b"/foo/f".to_vec());
         let map = VersionedGroupData::<KeyType<Vec<u8>>, usize, TestValue>::new();
 
+        map.write(
+            ap.clone(),
+            5,
+            3,
+            // tags 0, 1
+            (0..2).map(|i| (i, (TestValue::creation_with_len(2), None))),
+        );
+
         map.write(
             ap.clone(),
             5,
@@ -772,6 +824,135 @@ mod test {
         assert_ok_eq!(map.get_group_size(&ap, 6), exp_size_4);
     }
 
+    #[test]
+    fn size_changed_dependency() {
+        let ap = KeyType(b"/foo/f".to_vec());
+        let map = VersionedGroupData::<KeyType<Vec<u8>>, usize, TestValue>::new();
+
+        map.write(
+            ap.clone(),
+            5,
+            0,
+            // tags 0, 1
+            (0..2).map(|i| (i, (TestValue::creation_with_len(2), None))),
+        );
+
+        map.set_raw_base_values(
+            ap.clone(),
+            // base tag 1, 2, 3, 4
+            (1..5).map(|i| (i, TestValue::creation_with_len(1))),
+        );
+        // Incarnation 0 and base values should not affect size_changed flag.
+        assert!(!map.group_values.get(&ap).unwrap().size_changed);
+
+        let tag: usize = 5;
+        let one_entry_len = TestValue::creation_with_len(1).bytes().unwrap().len();
+        let two_entry_len = TestValue::creation_with_len(2).bytes().unwrap().len();
+        let exp_size = group_size_as_sum(vec![(&tag, two_entry_len); 2].into_iter().chain(vec![
+            (
+                &tag,
+                one_entry_len
+            );
+            3
+        ]))
+        .unwrap();
+        let exp_size_with_ones =
+            group_size_as_sum(vec![(&tag, one_entry_len); 5].into_iter()).unwrap();
+
+        // Despite estimates, should still return size.
+        map.mark_estimate(&ap, 5);
+        assert_ok_eq!(map.get_group_size(&ap, 12), exp_size);
+        assert!(map.validate_group_size(&ap, 12, exp_size));
+        assert!(!map.validate_group_size(&ap, 12, exp_size_with_ones));
+
+        // Same write again won't change size.
+        map.write(
+            ap.clone(),
+            5,
+            1,
+            (0..2).map(|i| (i, (TestValue::creation_with_len(2), None))),
+        );
+        assert!(!map.group_values.get(&ap).unwrap().size_changed);
+        map.mark_estimate(&ap, 5);
+        assert_ok_eq!(map.get_group_size(&ap, 12), exp_size);
+        assert!(map.validate_group_size(&ap, 12, exp_size));
+        assert!(!map.validate_group_size(&ap, 12, exp_size_with_ones));
+
+        // Removing nothing won't change size.
+        map.remove(&ap, 6);
+        assert!(!map.group_values.get(&ap).unwrap().size_changed);
+
+        map.write(
+            ap.clone(),
+            5,
+            2,
+            (0..2).map(|i| (i, (TestValue::creation_with_len(1), None))),
+        );
+        // Size has changed between speculative writes.
+        assert!(map.group_values.get(&ap).unwrap().size_changed);
+        assert_ok_eq!(map.get_group_size(&ap, 12), exp_size_with_ones);
+        assert!(map.validate_group_size(&ap, 12, exp_size_with_ones));
+        assert!(!map.validate_group_size(&ap, 12, exp_size));
+
+        map.mark_estimate(&ap, 5);
+        assert_matches!(
+            map.get_group_size(&ap, 12),
+            Err(MVGroupError::Dependency(5))
+        );
+        assert!(!map.validate_group_size(&ap, 12, exp_size_with_ones));
+        assert!(!map.validate_group_size(&ap, 12, exp_size));
+
+        // Next check that size change gets properly set w. differing set of writes.
+        let ap_1 = KeyType(b"/foo/1".to_vec());
+        let ap_2 = KeyType(b"/foo/2".to_vec());
+        let ap_3 = KeyType(b"/foo/3".to_vec());
+
+        map.write(
+            ap_1.clone(),
+            5,
+            0,
+            // tags 0, 1
+            (0..2).map(|i| (i, (TestValue::creation_with_len(2), None))),
+        );
+        assert!(!map.group_values.get(&ap_1).unwrap().size_changed);
+        map.write(
+            ap_1.clone(),
+            5,
+            1,
+            // tags 0, 1
+            (0..1).map(|i| (i, (TestValue::creation_with_len(2), None))),
+        );
+        assert!(map.group_values.get(&ap_1).unwrap().size_changed);
+
+        map.write(
+            ap_2.clone(),
+            5,
+            0,
+            // tags 0, 1
+            (0..2).map(|i| (i, (TestValue::creation_with_len(2), None))),
+        );
+        assert!(!map.group_values.get(&ap_2).unwrap().size_changed);
+        map.write(
+            ap_2.clone(),
+            5,
+            1,
+            // tags 0, 1
+            (1..3).map(|i| (i, (TestValue::creation_with_len(2), None))),
+        );
+        assert!(map.group_values.get(&ap_2).unwrap().size_changed);
+
+        map.write(
+            ap_3.clone(),
+            5,
+            0,
+            // tags 0, 1
+            (0..2).map(|i| (i, (TestValue::creation_with_len(2), None))),
+        );
+        assert!(!map.group_values.get(&ap_3).unwrap().size_changed);
+        map.remove(&ap_3, 5);
+        assert!(map.group_values.get(&ap_3).unwrap().size_changed);
+    }
+
     fn finalize_group_as_hashmap(
         map: &VersionedGroupData<KeyType<Vec<u8>>, usize, TestValue>,
         key: &KeyType<Vec<u8>>,
diff --git a/aptos-move/vm-genesis/Cargo.toml b/aptos-move/vm-genesis/Cargo.toml
index b8d7e7efb3a11..77e2b1b99108d 100644
--- a/aptos-move/vm-genesis/Cargo.toml
+++ b/aptos-move/vm-genesis/Cargo.toml
@@ -19,9 +19,9 @@ aptos-framework =  { workspace = true }
 aptos-gas-schedule = { workspace = true } 
 aptos-types = { workspace = true }
 aptos-vm = { workspace = true }
-aptos-vm-types = { workspace = true }
 bcs = { workspace = true }
 bytes = { workspace = true }
+claims = { workspace = true }
 move-core-types = { workspace = true }
 move-vm-runtime = { workspace = true }
 move-vm-types = { workspace = true }
diff --git a/aptos-move/vm-genesis/src/lib.rs b/aptos-move/vm-genesis/src/lib.rs
index f93de13b540ca..aa36b820ada63 100644
--- a/aptos-move/vm-genesis/src/lib.rs
+++ b/aptos-move/vm-genesis/src/lib.rs
@@ -14,8 +14,7 @@ use aptos_crypto::{
 };
 use aptos_framework::{ReleaseBundle, ReleasePackage};
 use aptos_gas_schedule::{
-    AptosGasParameters, InitialGasSchedule, MiscGasParameters, NativeGasParameters,
-    ToOnChainGasSchedule, LATEST_GAS_FEATURE_VERSION,
+    AptosGasParameters, InitialGasSchedule, ToOnChainGasSchedule, LATEST_GAS_FEATURE_VERSION,
 };
 use aptos_types::{
     account_config::{self, aptos_test_root_address, events::NewEpochEvent, CORE_CODE_ADDRESS},
@@ -23,7 +22,7 @@ use aptos_types::{
     contract_event::{ContractEvent, ContractEventV1},
     jwks::{
         patch::{PatchJWKMoveStruct, PatchUpsertJWK},
-        rsa::RSA_JWK,
+        secure_test_rsa_jwk,
     },
     keyless::{
         self, test_utils::get_sample_iss, Groth16VerificationKey, DEVNET_VERIFICATION_KEY,
@@ -34,16 +33,16 @@ use aptos_types::{
         randomness_api_v0_config::{AllowCustomMaxGasFlag, RequiredGasDeposit},
         FeatureFlag, Features, GasScheduleV2, OnChainConsensusConfig, OnChainExecutionConfig,
         OnChainJWKConsensusConfig, OnChainRandomnessConfig, RandomnessConfigMoveStruct,
-        TimedFeaturesBuilder, APTOS_MAX_KNOWN_VERSION,
+        APTOS_MAX_KNOWN_VERSION,
     },
     transaction::{authenticator::AuthenticationKey, ChangeSet, Transaction, WriteSetPayload},
     write_set::TransactionWrite,
 };
 use aptos_vm::{
     data_cache::AsMoveResolver,
-    move_vm_ext::{MoveVmExt, SessionExt, SessionId},
+    move_vm_ext::{GenesisMoveVM, SessionExt},
 };
-use aptos_vm_types::storage::change_set_configs::ChangeSetConfigs;
+use claims::assert_ok;
 use move_core_types::{
     account_address::AccountAddress,
     identifier::Identifier,
@@ -123,25 +122,15 @@ pub fn encode_aptos_mainnet_genesis_transaction(
     assert!(!genesis_config.is_test, "This is mainnet!");
     validate_genesis_config(genesis_config);
 
-    // Create a Move VM session so we can invoke on-chain genesis intializations.
+    // Create a Move VM session, so we can invoke on-chain genesis initializations.
     let mut state_view = GenesisStateView::new();
     for (module_bytes, module) in framework.code_and_compiled_modules() {
         state_view.add_module(&module.self_id(), module_bytes);
     }
-    let data_cache = state_view.as_move_resolver();
-    let move_vm = MoveVmExt::new(
-        NativeGasParameters::zeros(),
-        MiscGasParameters::zeros(),
-        LATEST_GAS_FEATURE_VERSION,
-        ChainId::test().id(),
-        Features::default(),
-        TimedFeaturesBuilder::enable_all().build(),
-        &data_cache,
-        false,
-    )
-    .unwrap();
-    let id1 = HashValue::zero();
-    let mut session = move_vm.new_session(&data_cache, SessionId::genesis(id1), None);
+
+    let vm = GenesisMoveVM::new(chain_id);
+    let resolver = state_view.as_move_resolver();
+    let mut session = vm.new_genesis_session(&resolver, HashValue::zero());
 
     // On-chain genesis process.
     let consensus_config = OnChainConsensusConfig::default_for_genesis();
@@ -172,21 +161,24 @@ pub fn encode_aptos_mainnet_genesis_transaction(
     // Reconfiguration should happen after all on-chain invocations.
     emit_new_block_and_epoch_event(&mut session);
 
-    let configs = ChangeSetConfigs::unlimited_at_gas_feature_version(LATEST_GAS_FEATURE_VERSION);
-    let mut change_set = session.finish(&configs).unwrap();
+    let configs = vm.genesis_change_set_configs();
+    let (mut change_set, module_write_set) = session.finish(&configs).unwrap();
+    assert_ok!(
+        module_write_set.is_empty_or_invariant_violation(),
+        "Modules cannot be published in this session"
+    );
 
-    // Publish the framework, using a different session id, in case both scripts creates tables
+    // Publish the framework, using a different session id, in case both scripts create tables.
     let state_view = GenesisStateView::new();
-    let data_cache = state_view.as_move_resolver();
+    let resolver = state_view.as_move_resolver();
 
-    let mut id2_arr = [0u8; 32];
-    id2_arr[31] = 1;
-    let id2 = HashValue::new(id2_arr);
-    let mut session = move_vm.new_session(&data_cache, SessionId::genesis(id2), None);
+    let mut new_id = [0u8; 32];
+    new_id[31] = 1;
+    let mut session = vm.new_genesis_session(&resolver, HashValue::new(new_id));
     publish_framework(&mut session, framework);
-    let additional_change_set = session.finish(&configs).unwrap();
+    let (additional_change_set, module_write_set) = session.finish(&configs).unwrap();
     change_set
-        .squash_additional_change_set(additional_change_set, &configs)
+        .squash_additional_change_set(additional_change_set)
         .unwrap();
 
     // Publishing stdlib should not produce any deltas around aggregators and map to write ops and
@@ -202,7 +194,7 @@ pub fn encode_aptos_mainnet_genesis_transaction(
     verify_genesis_write_set(change_set.events());
 
     let change_set = change_set
-        .try_into_storage_change_set()
+        .try_combine_into_storage_change_set(module_write_set)
         .expect("Constructing a ChangeSet from VMChangeSet should always succeed at genesis");
     Transaction::GenesisTransaction(WriteSetPayload::Direct(change_set))
 }
@@ -241,25 +233,15 @@ pub fn encode_genesis_change_set(
 ) -> ChangeSet {
     validate_genesis_config(genesis_config);
 
-    // Create a Move VM session so we can invoke on-chain genesis intializations.
+    // Create a Move VM session so we can invoke on-chain genesis initializations.
     let mut state_view = GenesisStateView::new();
     for (module_bytes, module) in framework.code_and_compiled_modules() {
         state_view.add_module(&module.self_id(), module_bytes);
     }
-    let data_cache = state_view.as_move_resolver();
-    let move_vm = MoveVmExt::new(
-        NativeGasParameters::zeros(),
-        MiscGasParameters::zeros(),
-        LATEST_GAS_FEATURE_VERSION,
-        ChainId::test().id(),
-        Features::default(),
-        TimedFeaturesBuilder::enable_all().build(),
-        &data_cache,
-        false,
-    )
-    .unwrap();
-    let id1 = HashValue::zero();
-    let mut session = move_vm.new_session(&data_cache, SessionId::genesis(id1), None);
+
+    let resolver = state_view.as_move_resolver();
+    let vm = GenesisMoveVM::new(chain_id);
+    let mut session = vm.new_genesis_session(&resolver, HashValue::zero());
 
     // On-chain genesis process.
     initialize(
@@ -310,21 +292,24 @@ pub fn encode_genesis_change_set(
     // Reconfiguration should happen after all on-chain invocations.
     emit_new_block_and_epoch_event(&mut session);
 
-    let configs = ChangeSetConfigs::unlimited_at_gas_feature_version(LATEST_GAS_FEATURE_VERSION);
-    let mut change_set = session.finish(&configs).unwrap();
+    let configs = vm.genesis_change_set_configs();
+    let (mut change_set, module_write_set) = session.finish(&configs).unwrap();
+    assert_ok!(
+        module_write_set.is_empty_or_invariant_violation(),
+        "Modules cannot be published in this session"
+    );
 
     let state_view = GenesisStateView::new();
-    let data_cache = state_view.as_move_resolver();
+    let resolver = state_view.as_move_resolver();
 
-    // Publish the framework, using a different session id, in case both scripts creates tables
-    let mut id2_arr = [0u8; 32];
-    id2_arr[31] = 1;
-    let id2 = HashValue::new(id2_arr);
-    let mut session = move_vm.new_session(&data_cache, SessionId::genesis(id2), None);
+    // Publish the framework, using a different id, in case both scripts create tables.
+    let mut new_id = [0u8; 32];
+    new_id[31] = 1;
+    let mut session = vm.new_genesis_session(&resolver, HashValue::new(new_id));
     publish_framework(&mut session, framework);
-    let additional_change_set = session.finish(&configs).unwrap();
+    let (additional_change_set, module_write_set) = session.finish(&configs).unwrap();
     change_set
-        .squash_additional_change_set(additional_change_set, &configs)
+        .squash_additional_change_set(additional_change_set)
         .unwrap();
 
     // Publishing stdlib should not produce any deltas around aggregators and map to write ops and
@@ -339,8 +324,9 @@ pub fn encode_genesis_change_set(
         .concrete_write_set_iter()
         .any(|(_, op)| op.expect("expect only concrete write ops").is_deletion()));
     verify_genesis_write_set(change_set.events());
+
     change_set
-        .try_into_storage_change_set()
+        .try_combine_into_storage_change_set(module_write_set)
         .expect("Constructing a ChangeSet from VMChangeSet should always succeed at genesis")
 }
 
@@ -390,10 +376,7 @@ fn exec_function(
     let storage = TraversalStorage::new();
     session
         .execute_function_bypass_visibility(
-            &ModuleId::new(
-                account_config::CORE_CODE_ADDRESS,
-                Identifier::new(module_name).unwrap(),
-            ),
+            &ModuleId::new(CORE_CODE_ADDRESS, Identifier::new(module_name).unwrap()),
             &Identifier::new(function_name).unwrap(),
             ty_args,
             args,
@@ -669,7 +652,7 @@ fn initialize_keyless_accounts(session: &mut SessionExt, chain_id: ChainId) {
 
         let patch: PatchJWKMoveStruct = PatchUpsertJWK {
             issuer: get_sample_iss(),
-            jwk: RSA_JWK::secure_test_jwk().into(),
+            jwk: secure_test_rsa_jwk().into(),
         }
         .into();
         exec_function(
@@ -1083,21 +1066,11 @@ pub fn test_genesis_module_publishing() {
     {
         state_view.add_module(&module.self_id(), module_bytes);
     }
-    let data_cache = state_view.as_move_resolver();
-
-    let move_vm = MoveVmExt::new(
-        NativeGasParameters::zeros(),
-        MiscGasParameters::zeros(),
-        LATEST_GAS_FEATURE_VERSION,
-        ChainId::test().id(),
-        Features::default(),
-        TimedFeaturesBuilder::enable_all().build(),
-        &data_cache,
-        false,
-    )
-    .unwrap();
-    let id1 = HashValue::zero();
-    let mut session = move_vm.new_session(&data_cache, SessionId::genesis(id1), None);
+
+    let vm = GenesisMoveVM::new(ChainId::test());
+    let resolver = state_view.as_move_resolver();
+
+    let mut session = vm.new_genesis_session(&resolver, HashValue::zero());
     publish_framework(&mut session, aptos_cached_packages::head_release_bundle());
 }
 
diff --git a/aptos-move/writeset-transaction-generator/Cargo.toml b/aptos-move/writeset-transaction-generator/Cargo.toml
deleted file mode 100644
index 26933dca31782..0000000000000
--- a/aptos-move/writeset-transaction-generator/Cargo.toml
+++ /dev/null
@@ -1,30 +0,0 @@
-[package]
-name = "aptos-writeset-generator"
-description = "Generating writesets used for incident management"
-version = "0.1.0"
-
-# Workspace inherited keys
-authors = { workspace = true }
-edition = { workspace = true }
-homepage = { workspace = true }
-license = { workspace = true }
-publish = { workspace = true }
-repository = { workspace = true }
-rust-version = { workspace = true }
-
-[dependencies]
-anyhow = { workspace = true }
-aptos-cached-packages =  { workspace = true }
-aptos-crypto = { workspace = true }
-aptos-framework =  { workspace = true }
-aptos-gas-schedule = { workspace = true } 
-aptos-types = { workspace = true }
-aptos-vm = { workspace = true }
-aptos-vm-types = { workspace = true }
-handlebars = { workspace = true }
-move-compiler = { workspace = true }
-move-core-types = { workspace = true }
-move-vm-runtime = { workspace = true }
-move-vm-types = { workspace = true }
-serde = { workspace = true }
-tempfile = { workspace = true }
diff --git a/aptos-move/writeset-transaction-generator/release/artifacts.json b/aptos-move/writeset-transaction-generator/release/artifacts.json
deleted file mode 100644
index 0b2619def8012..0000000000000
--- a/aptos-move/writeset-transaction-generator/release/artifacts.json
+++ /dev/null
@@ -1,18 +0,0 @@
-[
-  {
-    "chain_id": 1,
-    "version": 15408203,
-    "commit_hash": "b99b027e142f6169fd25b2e946d553d98f3e9359",
-    "stdlib_hash": "ab590b216554b9eadca01e86ff630e760d3729c84463b650a51c3bcbe668e985",
-    "diem_version": 2,
-    "release_name": "release-1.2.0-rc0"
-  },
-  {
-    "chain_id": 1,
-    "version": 51131474,
-    "commit_hash": "70b660ab70264c775f7f0ee5835c4138332803ec",
-    "stdlib_hash": "7513478cd1fc3388969b0dd5371d237579a94b9dccac3d23b87f46f9a76f322a",
-    "diem_version": 3,
-    "release_name": "release-1.4.0-rc0"
-  }
-]
diff --git a/aptos-move/writeset-transaction-generator/release/release-1.2.0-rc0.blob b/aptos-move/writeset-transaction-generator/release/release-1.2.0-rc0.blob
deleted file mode 100644
index 40f2b9e76d646..0000000000000
Binary files a/aptos-move/writeset-transaction-generator/release/release-1.2.0-rc0.blob and /dev/null differ
diff --git a/aptos-move/writeset-transaction-generator/release/release-1.4.0-rc0.blob b/aptos-move/writeset-transaction-generator/release/release-1.4.0-rc0.blob
deleted file mode 100644
index f8c2a4f0d7f58..0000000000000
Binary files a/aptos-move/writeset-transaction-generator/release/release-1.4.0-rc0.blob and /dev/null differ
diff --git a/aptos-move/writeset-transaction-generator/src/admin_script_builder.rs b/aptos-move/writeset-transaction-generator/src/admin_script_builder.rs
deleted file mode 100644
index 0fee6788fb569..0000000000000
--- a/aptos-move/writeset-transaction-generator/src/admin_script_builder.rs
+++ /dev/null
@@ -1,120 +0,0 @@
-// Copyright © Aptos Foundation
-// Parts of the project are originally copyright © Meta Platforms, Inc.
-// SPDX-License-Identifier: Apache-2.0
-
-use anyhow::Result;
-use aptos_types::{
-    account_address::AccountAddress,
-    account_config::aptos_test_root_address,
-    transaction::{Script, WriteSetPayload},
-};
-use handlebars::Handlebars;
-use move_compiler::{compiled_unit::AnnotatedCompiledUnit, Compiler, Flags};
-use serde::Serialize;
-use std::{collections::HashMap, io::Write, path::PathBuf};
-use tempfile::NamedTempFile;
-
-/// The relative path to the scripts templates
-pub const SCRIPTS_DIR_PATH: &str = "templates";
-
-pub fn compile_script(source_file_str: String, bytecode_version: Option<u32>) -> Vec<u8> {
-    let (_files, mut compiled_program) = Compiler::from_files(
-        vec![source_file_str],
-        aptos_cached_packages::head_release_bundle()
-            .files()
-            .unwrap(),
-        aptos_framework::named_addresses().clone(),
-        Flags::empty()
-            .set_sources_shadow_deps(false)
-            .set_skip_attribute_checks(false),
-        aptos_framework::extended_checks::get_all_attribute_names(),
-    )
-    .build_and_report()
-    .unwrap();
-    assert!(compiled_program.len() == 1);
-    match compiled_program.pop().unwrap() {
-        AnnotatedCompiledUnit::Module(_) => panic!("Unexpected module when compiling script"),
-        x @ AnnotatedCompiledUnit::Script(_) => x.into_compiled_unit().serialize(bytecode_version),
-    }
-}
-
-fn compile_admin_script(input: &str, bytecode_version: Option<u32>) -> Result<Script> {
-    let mut temp_file = NamedTempFile::new()?;
-    temp_file.write_all(input.as_bytes())?;
-    let cur_path = temp_file.path().to_str().unwrap().to_owned();
-    Ok(Script::new(
-        compile_script(cur_path, bytecode_version),
-        vec![],
-        vec![],
-    ))
-}
-
-pub fn template_path() -> PathBuf {
-    let mut path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
-    path.push(SCRIPTS_DIR_PATH);
-    path
-}
-
-pub fn remove_validators_payload(
-    validators: Vec<AccountAddress>,
-    bytecode_version: Option<u32>,
-) -> WriteSetPayload {
-    assert!(!validators.is_empty(), "Unexpected validator set length");
-    let mut script = template_path();
-    script.push("remove_validators.move");
-
-    let script = {
-        let mut hb = Handlebars::new();
-        hb.set_strict_mode(true);
-        hb.register_template_file("script", script).unwrap();
-        let mut data = HashMap::new();
-        data.insert("addresses", validators);
-
-        let output = hb.render("script", &data).unwrap();
-
-        compile_admin_script(output.as_str(), bytecode_version).unwrap()
-    };
-
-    WriteSetPayload::Script {
-        script,
-        execute_as: aptos_test_root_address(),
-    }
-}
-
-pub fn custom_script<T: Serialize>(
-    script_name_in_templates: &str,
-    args: &T,
-    execute_as: Option<AccountAddress>,
-    bytecode_version: Option<u32>,
-) -> WriteSetPayload {
-    let mut script = template_path();
-    script.push(script_name_in_templates);
-
-    let script = {
-        let mut hb = Handlebars::new();
-        hb.register_template_file("script", script).unwrap();
-        hb.set_strict_mode(true);
-        let output = hb.render("script", args).unwrap();
-
-        compile_admin_script(output.as_str(), bytecode_version).unwrap()
-    };
-
-    WriteSetPayload::Script {
-        script,
-        execute_as: execute_as.unwrap_or_else(aptos_test_root_address),
-    }
-}
-
-pub fn halt_network_payload(bytecode_version: Option<u32>) -> WriteSetPayload {
-    let mut script = template_path();
-    script.push("halt_transactions.move");
-
-    WriteSetPayload::Script {
-        script: Script::new(
-            compile_script(script.to_str().unwrap().to_owned(), bytecode_version),
-            vec![],
-            vec![],
-        ),
-        execute_as: aptos_test_root_address(),
-    }
-}
diff --git a/aptos-move/writeset-transaction-generator/src/lib.rs b/aptos-move/writeset-transaction-generator/src/lib.rs
deleted file mode 100644
index a19ad0c3016a9..0000000000000
--- a/aptos-move/writeset-transaction-generator/src/lib.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright © Aptos Foundation
-// Parts of the project are originally copyright © Meta Platforms, Inc.
-// SPDX-License-Identifier: Apache-2.0
-
-mod admin_script_builder;
-
-mod writeset_builder;
-
-pub use admin_script_builder::{custom_script, halt_network_payload, remove_validators_payload};
-pub use writeset_builder::{build_changeset, GenesisSession};
diff --git a/aptos-move/writeset-transaction-generator/src/writeset_builder.rs b/aptos-move/writeset-transaction-generator/src/writeset_builder.rs
deleted file mode 100644
index 1945bd945795b..0000000000000
--- a/aptos-move/writeset-transaction-generator/src/writeset_builder.rs
+++ /dev/null
@@ -1,146 +0,0 @@
-// Copyright © Aptos Foundation
-// Parts of the project are originally copyright © Meta Platforms, Inc.
-// SPDX-License-Identifier: Apache-2.0
-
-use anyhow::format_err;
-use aptos_crypto::HashValue;
-use aptos_gas_schedule::{MiscGasParameters, NativeGasParameters, LATEST_GAS_FEATURE_VERSION};
-use aptos_types::{
-    account_address::AccountAddress,
-    account_config::{self, aptos_test_root_address},
-    on_chain_config::{Features, TimedFeaturesBuilder},
-    state_store::StateView,
-    transaction::{ChangeSet, Script, Version},
-};
-use aptos_vm::{
-    data_cache::AsMoveResolver,
-    move_vm_ext::{MoveVmExt, SessionExt, SessionId},
-};
-use aptos_vm_types::storage::change_set_configs::ChangeSetConfigs;
-use move_core_types::{
-    identifier::Identifier,
-    language_storage::{ModuleId, TypeTag},
-    transaction_argument::convert_txn_args,
-    value::{serialize_values, MoveValue},
-};
-use move_vm_runtime::module_traversal::{TraversalContext, TraversalStorage};
-use move_vm_types::gas::UnmeteredGasMeter;
-
-pub struct GenesisSession<'r, 'l>(SessionExt<'r, 'l>);
-
-impl<'r, 'l> GenesisSession<'r, 'l> {
-    pub fn exec_func(
-        &mut self,
-        module_name: &str,
-        function_name: &str,
-        ty_args: Vec<TypeTag>,
-        args: Vec<Vec<u8>>,
-    ) {
-        let traversal_storage = TraversalStorage::new();
-        self.0
-            .execute_function_bypass_visibility(
-                &ModuleId::new(
-                    account_config::CORE_CODE_ADDRESS,
-                    Identifier::new(module_name).unwrap(),
-                ),
-                &Identifier::new(function_name).unwrap(),
-                ty_args,
-                args,
-                &mut UnmeteredGasMeter,
-                &mut TraversalContext::new(&traversal_storage),
-            )
-            .unwrap_or_else(|e| {
-                panic!(
-                    "Error calling {}.{}: {}",
-                    module_name,
-                    function_name,
-                    e.into_vm_status()
-                )
-            });
-    }
-
-    pub fn exec_script(&mut self, sender: AccountAddress, script: &Script) {
-        let mut temp = vec![sender.to_vec()];
-        temp.extend(convert_txn_args(script.args()));
-        let traversal_storage = TraversalStorage::new();
-        self.0
-            .execute_script(
-                script.code().to_vec(),
-                script.ty_args().to_vec(),
-                temp,
-                &mut UnmeteredGasMeter,
-                &mut TraversalContext::new(&traversal_storage),
-            )
-            .unwrap()
-    }
-
-    fn disable_reconfiguration(&mut self) {
-        self.exec_func(
-            "Reconfiguration",
-            "disable_reconfiguration",
-            vec![],
-            serialize_values(&vec![MoveValue::Signer(aptos_test_root_address())]),
-        )
-    }
-
-    fn enable_reconfiguration(&mut self) {
-        self.exec_func(
-            "Reconfiguration",
-            "enable_reconfiguration",
-            vec![],
-            serialize_values(&vec![MoveValue::Signer(aptos_test_root_address())]),
-        )
-    }
-
-    pub fn set_aptos_version(&mut self, version: Version) {
-        self.exec_func(
-            "AptosVersion",
-            "set_version",
-            vec![],
-            serialize_values(&vec![
-                MoveValue::Signer(aptos_test_root_address()),
-                MoveValue::U64(version),
-            ]),
-        )
-    }
-}
-
-pub fn build_changeset<S: StateView, F>(state_view: &S, procedure: F, chain_id: u8) -> ChangeSet
-where
-    F: FnOnce(&mut GenesisSession),
-{
-    let resolver = state_view.as_move_resolver();
-    let move_vm = MoveVmExt::new(
-        NativeGasParameters::zeros(),
-        MiscGasParameters::zeros(),
-        LATEST_GAS_FEATURE_VERSION,
-        chain_id,
-        Features::default(),
-        TimedFeaturesBuilder::enable_all().build(),
-        &resolver,
-        false,
-    )
-    .unwrap();
-    let change_set = {
-        // TODO: specify an id by human and pass that in.
-        let genesis_id = HashValue::zero();
-        let mut session =
-            GenesisSession(move_vm.new_session(&resolver, SessionId::genesis(genesis_id), None));
-        session.disable_reconfiguration();
-        procedure(&mut session);
-        session.enable_reconfiguration();
-        session
-            .0
-            .finish(&ChangeSetConfigs::unlimited_at_gas_feature_version(
-                LATEST_GAS_FEATURE_VERSION,
-            ))
-            .map_err(|err| format_err!("Unexpected VM Error: {:?}", err))
-            .unwrap()
-    };
-
-    // Genesis never produces the delta change set.
-    assert!(change_set.aggregator_v1_delta_set().is_empty());
-    change_set
-        .try_into_storage_change_set()
-        .expect("Conversion from VMChangeSet into ChangeSet should always succeed")
-}
diff --git a/aptos-move/writeset-transaction-generator/templates/disable_parallel_execution.move b/aptos-move/writeset-transaction-generator/templates/disable_parallel_execution.move
deleted file mode 100644
index eb79b778fd4db..0000000000000
--- a/aptos-move/writeset-transaction-generator/templates/disable_parallel_execution.move
+++ /dev/null
@@ -1,6 +0,0 @@
-script {
-    use aptos_framework::parallel_execution_config;
-    fun main(aptos_root: signer, _execute_as: signer) {
-        parallel_execution_config::disable_parallel_execution(&aptos_root);
-    }
-}
diff --git a/aptos-move/writeset-transaction-generator/templates/halt_transactions.move b/aptos-move/writeset-transaction-generator/templates/halt_transactions.move
deleted file mode 100644
index a25dfa4f91687..0000000000000
--- a/aptos-move/writeset-transaction-generator/templates/halt_transactions.move
+++ /dev/null
@@ -1,6 +0,0 @@
-script {
-    use aptos_framework::transaction_publishing_option;
-    fun main(aptos_root: signer) {
-        transaction_publishing_option::halt_all_transactions(&aptos_root);
-    }
-}
diff --git a/aptos-move/writeset-transaction-generator/templates/initialize_parallel_execution.move b/aptos-move/writeset-transaction-generator/templates/initialize_parallel_execution.move
deleted file mode 100644
index a3075108f8897..0000000000000
--- a/aptos-move/writeset-transaction-generator/templates/initialize_parallel_execution.move
+++ /dev/null
@@ -1,6 +0,0 @@
-script {
-    use aptos_framework::parallel_execution_config;
-    fun main(aptos_root: signer, _execute_as: signer) {
-        parallel_execution_config::initialize_parallel_execution(&aptos_root);
-    }
-}
diff --git a/aptos-move/writeset-transaction-generator/templates/remove_validators.move b/aptos-move/writeset-transaction-generator/templates/remove_validators.move
deleted file mode 100644
index 7f762f9609a7e..0000000000000
--- a/aptos-move/writeset-transaction-generator/templates/remove_validators.move
+++ /dev/null
@@ -1,8 +0,0 @@
-script {
-    use aptos_framework::validator_set;
-    fun main(aptos_root: signer) {
-        {{#each addresses}}
-        validator_set::remove_validator(&aptos_root, @0x{{this}});
-        {{/each}}
-    }
-}
diff --git a/aptos-node/src/consensus.rs b/aptos-node/src/consensus.rs
new file mode 100644
index 0000000000000..a4d46059f5399
--- /dev/null
+++ b/aptos-node/src/consensus.rs
@@ -0,0 +1,214 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{network::ApplicationNetworkInterfaces, services};
+use aptos_admin_service::AdminService;
+use aptos_config::config::NodeConfig;
+use aptos_consensus::{
+    consensus_observer::{
+        network_message::ConsensusObserverMessage, publisher::ConsensusPublisher,
+    },
+    consensus_provider::start_consensus_observer,
+    network_interface::ConsensusMsg,
+};
+use aptos_consensus_notifications::ConsensusNotifier;
+use aptos_dkg_runtime::{start_dkg_runtime, DKGMessage};
+use aptos_event_notifications::{
+    DbBackedOnChainConfig, EventNotificationListener, ReconfigNotificationListener,
+};
+use aptos_jwk_consensus::{start_jwk_consensus_runtime, types::JWKConsensusMsg};
+use aptos_logger::debug;
+use aptos_mempool::QuorumStoreRequest;
+use aptos_safety_rules::safety_rules_manager::load_consensus_key_from_secure_storage;
+use aptos_storage_interface::DbReaderWriter;
+use aptos_validator_transaction_pool::VTxnPoolState;
+use futures::channel::mpsc::Sender;
+use std::sync::Arc;
+use tokio::runtime::Runtime;
+
+/// Creates and returns the consensus observer runtime (if either the
+/// observer or publisher is enabled).
+pub fn create_consensus_observer_runtime(
+    node_config: &NodeConfig,
+    consensus_observer_network_interfaces: Option<
+        ApplicationNetworkInterfaces<ConsensusObserverMessage>,
+    >,
+    consensus_publisher: Option<Arc<ConsensusPublisher>>,
+    consensus_notifier: ConsensusNotifier,
+    consensus_to_mempool_sender: Sender<QuorumStoreRequest>,
+    db_rw: DbReaderWriter,
+    consensus_observer_reconfig_subscription: Option<
+        ReconfigNotificationListener<DbBackedOnChainConfig>,
+    >,
+) -> Option<Runtime> {
+    if node_config
+        .consensus_observer
+        .is_observer_or_publisher_enabled()
+    {
+        // Fetch the network interfaces and reconfig subscription
+        let consensus_observer_network_interfaces = consensus_observer_network_interfaces
+            .expect("Consensus observer is enabled, but network interfaces are missing!");
+
+        // Start the consensus observer runtime
+        let consensus_observer_runtime = start_consensus_observer(
+            node_config,
+            consensus_observer_network_interfaces.network_client,
+            consensus_observer_network_interfaces.network_service_events,
+            consensus_publisher,
+            Arc::new(consensus_notifier),
+            consensus_to_mempool_sender,
+            db_rw,
+            consensus_observer_reconfig_subscription,
+        );
+        Some(consensus_observer_runtime)
+    } else {
+        None
+    }
+}
+
+/// Creates and returns the consensus publisher and runtime (if enabled)
+pub fn create_consensus_publisher(
+    node_config: &NodeConfig,
+    consensus_observer_network_interfaces: &Option<
+        ApplicationNetworkInterfaces<ConsensusObserverMessage>,
+    >,
+) -> (Option<Runtime>, Option<Arc<ConsensusPublisher>>) {
+    if node_config.consensus_observer.publisher_enabled {
+        // Get the network interfaces
+        let consensus_observer_network_interfaces = consensus_observer_network_interfaces
+            .as_ref()
+            .expect("Consensus publisher is enabled, but network interfaces are missing!");
+
+        // Create the publisher runtime
+        let runtime = aptos_runtimes::spawn_named_runtime("publisher".into(), None);
+
+        // Create the consensus publisher
+        let (consensus_publisher, outbound_message_receiver) = ConsensusPublisher::new(
+            consensus_observer_network_interfaces.network_client.clone(),
+            node_config.consensus_observer,
+        );
+
+        // Start the consensus publisher
+        runtime.spawn(consensus_publisher.clone().start(outbound_message_receiver));
+
+        // Return the runtime and publisher
+        (Some(runtime), Some(Arc::new(consensus_publisher)))
+    } else {
+        (None, None)
+    }
+}
+
+/// Creates and starts the consensus runtime (if enabled)
+pub fn create_consensus_runtime(
+    node_config: &NodeConfig,
+    db_rw: DbReaderWriter,
+    consensus_reconfig_subscription: Option<ReconfigNotificationListener<DbBackedOnChainConfig>>,
+    consensus_network_interfaces: Option<ApplicationNetworkInterfaces<ConsensusMsg>>,
+    consensus_notifier: ConsensusNotifier,
+    consensus_to_mempool_sender: Sender<QuorumStoreRequest>,
+    vtxn_pool: VTxnPoolState,
+    consensus_publisher: Option<Arc<ConsensusPublisher>>,
+    admin_service: &mut AdminService,
+) -> Option<Runtime> {
+    consensus_network_interfaces.map(|consensus_network_interfaces| {
+        let (consensus_runtime, consensus_db, quorum_store_db) = services::start_consensus_runtime(
+            node_config,
+            db_rw.clone(),
+            consensus_reconfig_subscription,
+            consensus_network_interfaces,
+            consensus_notifier.clone(),
+            consensus_to_mempool_sender.clone(),
+            vtxn_pool,
+            consensus_publisher.clone(),
+        );
+        admin_service.set_consensus_dbs(consensus_db, quorum_store_db);
+
+        consensus_runtime
+    })
+}
+
+/// Creates and starts the DKG runtime (if enabled)
+pub fn create_dkg_runtime(
+    node_config: &mut NodeConfig,
+    dkg_subscriptions: Option<(
+        ReconfigNotificationListener<DbBackedOnChainConfig>,
+        EventNotificationListener,
+    )>,
+    dkg_network_interfaces: Option<ApplicationNetworkInterfaces<DKGMessage>>,
+) -> (VTxnPoolState, Option<Runtime>) {
+    let maybe_dkg_dealer_sk =
+        load_consensus_key_from_secure_storage(&node_config.consensus.safety_rules);
+    debug!("maybe_dkg_dealer_sk={:?}", maybe_dkg_dealer_sk);
+
+    let vtxn_pool = VTxnPoolState::default();
+    let dkg_runtime = match (dkg_network_interfaces, maybe_dkg_dealer_sk) {
+        (Some(interfaces), Ok(dkg_dealer_sk)) => {
+            let ApplicationNetworkInterfaces {
+                network_client,
+                network_service_events,
+            } = interfaces;
+            let (reconfig_events, dkg_start_events) = dkg_subscriptions
+                .expect("DKG needs to listen to NewEpochEvents events and DKGStartEvents");
+            let my_addr = node_config.validator_network.as_ref().unwrap().peer_id();
+            let rb_config = node_config.consensus.rand_rb_config.clone();
+            let dkg_runtime = start_dkg_runtime(
+                my_addr,
+                dkg_dealer_sk,
+                network_client,
+                network_service_events,
+                reconfig_events,
+                dkg_start_events,
+                vtxn_pool.clone(),
+                rb_config,
+                node_config.randomness_override_seq_num,
+            );
+            Some(dkg_runtime)
+        },
+        _ => None,
+    };
+
+    (vtxn_pool, dkg_runtime)
+}
+
+/// Creates and starts the JWK consensus runtime (if enabled)
+pub fn create_jwk_consensus_runtime(
+    node_config: &mut NodeConfig,
+    jwk_consensus_subscriptions: Option<(
+        ReconfigNotificationListener<DbBackedOnChainConfig>,
+        EventNotificationListener,
+    )>,
+    jwk_consensus_network_interfaces: Option<ApplicationNetworkInterfaces<JWKConsensusMsg>>,
+    vtxn_pool: &VTxnPoolState,
+) -> Option<Runtime> {
+    let maybe_jwk_consensus_key =
+        load_consensus_key_from_secure_storage(&node_config.consensus.safety_rules);
+    debug!(
+        "jwk_consensus_key_err={:?}",
+        maybe_jwk_consensus_key.as_ref().err()
+    );
+
+    let jwk_consensus_runtime = match (jwk_consensus_network_interfaces, maybe_jwk_consensus_key) {
+        (Some(interfaces), Ok(consensus_key)) => {
+            let ApplicationNetworkInterfaces {
+                network_client,
+                network_service_events,
+            } = interfaces;
+            let (reconfig_events, onchain_jwk_updated_events) = jwk_consensus_subscriptions.expect(
+                "JWK consensus needs to listen to NewEpochEvents and OnChainJWKMapUpdated events.",
+            );
+            let my_addr = node_config.validator_network.as_ref().unwrap().peer_id();
+            let jwk_consensus_runtime = start_jwk_consensus_runtime(
+                my_addr,
+                consensus_key,
+                network_client,
+                network_service_events,
+                reconfig_events,
+                onchain_jwk_updated_events,
+                vtxn_pool.clone(),
+            );
+            Some(jwk_consensus_runtime)
+        },
+        _ => None,
+    };
+    jwk_consensus_runtime
+}
diff --git a/aptos-node/src/lib.rs b/aptos-node/src/lib.rs
index f7ce9e938591b..50a0dad5f5d32 100644
--- a/aptos-node/src/lib.rs
+++ b/aptos-node/src/lib.rs
@@ -4,6 +4,7 @@
 
 #![forbid(unsafe_code)]
 
+mod consensus;
 mod indexer;
 mod logger;
 mod network;
@@ -15,7 +16,6 @@ pub mod utils;
 #[cfg(test)]
 mod tests;
 
-use crate::network::ApplicationNetworkInterfaces;
 use anyhow::anyhow;
 use aptos_admin_service::AdminService;
 use aptos_api::bootstrap as bootstrap_api;
@@ -23,15 +23,10 @@ use aptos_build_info::build_information;
 use aptos_config::config::{
     merge_node_config, InitialSafetyRulesConfig, NodeConfig, PersistableConfig,
 };
-use aptos_consensus::consensus_provider::start_consensus_observer;
-use aptos_dkg_runtime::start_dkg_runtime;
 use aptos_framework::ReleaseBundle;
-use aptos_jwk_consensus::start_jwk_consensus_runtime;
 use aptos_logger::{prelude::*, telemetry_log_writer::TelemetryLog, Level, LoggerFilterUpdater};
-use aptos_safety_rules::safety_rules_manager::load_consensus_key_from_secure_storage;
 use aptos_state_sync_driver::driver_factory::StateSyncRuntimes;
 use aptos_types::{chain_id::ChainId, on_chain_config::OnChainJWKConsensusConfig};
-use aptos_validator_transaction_pool::VTxnPoolState;
 use clap::Parser;
 use futures::channel::mpsc;
 use hex::{FromHex, FromHexError};
@@ -200,6 +195,8 @@ pub struct AptosHandle {
     _admin_service: AdminService,
     _api_runtime: Option<Runtime>,
     _backup_runtime: Option<Runtime>,
+    _consensus_observer_runtime: Option<Runtime>,
+    _consensus_publisher_runtime: Option<Runtime>,
     _consensus_runtime: Option<Runtime>,
     _dkg_runtime: Option<Runtime>,
     _indexer_grpc_runtime: Option<Runtime>,
@@ -211,6 +208,7 @@ pub struct AptosHandle {
     _peer_monitoring_service_runtime: Runtime,
     _state_sync_runtimes: StateSyncRuntimes,
     _telemetry_runtime: Option<Runtime>,
+    _indexer_db_runtime: Option<Runtime>,
 }
 
 /// Start an Aptos node
@@ -514,7 +512,6 @@ where
 
     // Configure the validator network
     let validator_network = node_config.validator_network.as_mut().unwrap();
-    validator_network.max_concurrent_network_reqs = 1;
     validator_network.connectivity_check_interval_ms = 10000;
     validator_network.max_connection_delay_ms = 10000;
     validator_network.ping_interval_ms = 10000;
@@ -522,7 +519,6 @@ where
 
     // Configure the fullnode network
     let fullnode_network = node_config.full_node_networks.get_mut(0).unwrap();
-    fullnode_network.max_concurrent_network_reqs = 1;
     fullnode_network.connectivity_check_interval_ms = 10000;
     fullnode_network.max_connection_delay_ms = 10000;
     fullnode_network.ping_interval_ms = 10000;
@@ -604,17 +600,14 @@ pub fn setup_environment_and_start_node(
     remote_log_rx: Option<mpsc::Receiver<TelemetryLog>>,
     logger_filter_update_job: Option<LoggerFilterUpdater>,
 ) -> anyhow::Result<AptosHandle> {
-    // Set the observer mode for state sync
-    node_config.state_sync.state_sync_driver.observer_enabled =
-        node_config.consensus_observer.observer_enabled;
     // Log the node config at node startup
     node_config.log_all_configs();
 
     // Starts the admin service
-    let admin_service = services::start_admin_service(&node_config);
+    let mut admin_service = services::start_admin_service(&node_config);
 
     // Set up the storage database and any RocksDB checkpoints
-    let (db_rw, backup_service, genesis_waypoint) =
+    let (db_rw, backup_service, genesis_waypoint, indexer_db_opt) =
         storage::initialize_database_and_checkpoints(&mut node_config)?;
 
     admin_service.set_aptos_db(db_rw.clone().into());
@@ -640,6 +633,7 @@ pub fn setup_environment_and_start_node(
     let (
         mut event_subscription_service,
         mempool_reconfig_subscription,
+        consensus_observer_reconfig_subscription,
         consensus_reconfig_subscription,
         dkg_subscriptions,
         jwk_consensus_subscriptions,
@@ -650,12 +644,12 @@ pub fn setup_environment_and_start_node(
     let (
         network_runtimes,
         consensus_network_interfaces,
+        consensus_observer_network_interfaces,
         dkg_network_interfaces,
         jwk_consensus_network_interfaces,
         mempool_network_interfaces,
         peer_monitoring_service_network_interfaces,
         storage_service_network_interfaces,
-        maybe_observer_network_interfaces,
     ) = network::setup_networks_and_get_interfaces(
         &node_config,
         chain_id,
@@ -694,7 +688,8 @@ pub fn setup_environment_and_start_node(
         indexer_table_info_runtime,
         indexer_runtime,
         indexer_grpc_runtime,
-    ) = services::bootstrap_api_and_indexer(&node_config, db_rw.clone(), chain_id)?;
+        internal_indexer_db_runtime,
+    ) = services::bootstrap_api_and_indexer(&node_config, db_rw.clone(), chain_id, indexer_db_opt)?;
 
     // Create mempool and get the consensus to mempool sender
     let (mempool_runtime, consensus_to_mempool_sender) =
@@ -719,111 +714,57 @@ pub fn setup_environment_and_start_node(
         aptos_safety_rules::safety_rules_manager::storage(&node_config.consensus.safety_rules);
     }
 
-    let vtxn_pool = VTxnPoolState::default();
-    let maybe_dkg_dealer_sk =
-        load_consensus_key_from_secure_storage(&node_config.consensus.safety_rules);
-    debug!("maybe_dkg_dealer_sk={:?}", maybe_dkg_dealer_sk);
-    let dkg_runtime = match (dkg_network_interfaces, maybe_dkg_dealer_sk) {
-        (Some(interfaces), Ok(dkg_dealer_sk)) => {
-            let ApplicationNetworkInterfaces {
-                network_client,
-                network_service_events,
-            } = interfaces;
-            let (reconfig_events, dkg_start_events) = dkg_subscriptions
-                .expect("DKG needs to listen to NewEpochEvents events and DKGStartEvents");
-            let my_addr = node_config.validator_network.as_ref().unwrap().peer_id();
-            let rb_config = node_config.consensus.rand_rb_config.clone();
-            let dkg_runtime = start_dkg_runtime(
-                my_addr,
-                dkg_dealer_sk,
-                network_client,
-                network_service_events,
-                reconfig_events,
-                dkg_start_events,
-                vtxn_pool.clone(),
-                rb_config,
-                node_config.randomness_override_seq_num,
-            );
-            Some(dkg_runtime)
-        },
-        _ => None,
-    };
+    // Create the DKG runtime and get the VTxn pool
+    let (vtxn_pool, dkg_runtime) =
+        consensus::create_dkg_runtime(&mut node_config, dkg_subscriptions, dkg_network_interfaces);
 
-    let maybe_jwk_consensus_key =
-        load_consensus_key_from_secure_storage(&node_config.consensus.safety_rules);
-    debug!(
-        "jwk_consensus_key_err={:?}",
-        maybe_jwk_consensus_key.as_ref().err()
+    // Create the JWK consensus runtime
+    let jwk_consensus_runtime = consensus::create_jwk_consensus_runtime(
+        &mut node_config,
+        jwk_consensus_subscriptions,
+        jwk_consensus_network_interfaces,
+        &vtxn_pool,
     );
 
-    let jwk_consensus_runtime = match (jwk_consensus_network_interfaces, maybe_jwk_consensus_key) {
-        (Some(interfaces), Ok(consensus_key)) => {
-            let ApplicationNetworkInterfaces {
-                network_client,
-                network_service_events,
-            } = interfaces;
-            let (reconfig_events, onchain_jwk_updated_events) = jwk_consensus_subscriptions.expect(
-                "JWK consensus needs to listen to NewEpochEvents and OnChainJWKMapUpdated events.",
-            );
-            let my_addr = node_config.validator_network.as_ref().unwrap().peer_id();
-            let jwk_consensus_runtime = start_jwk_consensus_runtime(
-                my_addr,
-                consensus_key,
-                network_client,
-                network_service_events,
-                reconfig_events,
-                onchain_jwk_updated_events,
-                vtxn_pool.clone(),
-            );
-            Some(jwk_consensus_runtime)
-        },
-        _ => None,
-    };
-
     // Wait until state sync has been initialized
     debug!("Waiting until state sync is initialized!");
     state_sync_runtimes.block_until_initialized();
     debug!("State sync initialization complete.");
 
-    // Create the consensus runtime (this blocks on state sync first)
-    let consensus_runtime = match consensus_network_interfaces {
-        // validator consensus
-        Some(consensus_network_interfaces) => {
-            // Initialize and start consensus
-            let (runtime, consensus_db, quorum_store_db) = services::start_consensus_runtime(
-                &node_config,
-                db_rw,
-                consensus_reconfig_subscription,
-                consensus_network_interfaces,
-                consensus_notifier,
-                consensus_to_mempool_sender,
-                vtxn_pool,
-                maybe_observer_network_interfaces.map(|network| network.network_client),
-            );
-            admin_service.set_consensus_dbs(consensus_db, quorum_store_db);
-            Some(runtime)
-        },
-        // consensus observer
-        None if node_config.consensus_observer.observer_enabled => {
-            let observer_network_interfaces = maybe_observer_network_interfaces.unwrap();
-            let runtime = start_consensus_observer(
-                &node_config,
-                observer_network_interfaces.network_client,
-                observer_network_interfaces.network_service_events,
-                Arc::new(consensus_notifier),
-                consensus_to_mempool_sender,
-                db_rw,
-                consensus_reconfig_subscription.unwrap(),
-            );
-            Some(runtime)
-        },
-        _ => None,
-    };
+    // Create the consensus observer publisher (if enabled)
+    let (consensus_publisher_runtime, consensus_publisher) =
+        consensus::create_consensus_publisher(&node_config, &consensus_observer_network_interfaces);
+
+    // Create the consensus runtime (if enabled)
+    let consensus_runtime = consensus::create_consensus_runtime(
+        &node_config,
+        db_rw.clone(),
+        consensus_reconfig_subscription,
+        consensus_network_interfaces,
+        consensus_notifier.clone(),
+        consensus_to_mempool_sender.clone(),
+        vtxn_pool,
+        consensus_publisher.clone(),
+        &mut admin_service,
+    );
+
+    // Create the consensus observer runtime (if enabled)
+    let consensus_observer_runtime = consensus::create_consensus_observer_runtime(
+        &node_config,
+        consensus_observer_network_interfaces,
+        consensus_publisher,
+        consensus_notifier,
+        consensus_to_mempool_sender,
+        db_rw,
+        consensus_observer_reconfig_subscription,
+    );
 
     Ok(AptosHandle {
         _admin_service: admin_service,
         _api_runtime: api_runtime,
         _backup_runtime: backup_service,
+        _consensus_observer_runtime: consensus_observer_runtime,
+        _consensus_publisher_runtime: consensus_publisher_runtime,
         _consensus_runtime: consensus_runtime,
         _dkg_runtime: dkg_runtime,
         _indexer_grpc_runtime: indexer_grpc_runtime,
@@ -835,6 +776,7 @@ pub fn setup_environment_and_start_node(
         _peer_monitoring_service_runtime: peer_monitoring_service_runtime,
         _state_sync_runtimes: state_sync_runtimes,
         _telemetry_runtime: telemetry_runtime,
+        _indexer_db_runtime: internal_indexer_db_runtime,
     })
 }
 
diff --git a/aptos-node/src/network.rs b/aptos-node/src/network.rs
index 2131e8e660427..6c2289e225ad8 100644
--- a/aptos-node/src/network.rs
+++ b/aptos-node/src/network.rs
@@ -8,7 +8,8 @@ use aptos_config::{
     network_id::NetworkId,
 };
 use aptos_consensus::{
-    consensus_observer::network::ObserverMessage, network_interface::ConsensusMsg,
+    consensus_observer, consensus_observer::network_message::ConsensusObserverMessage,
+    network_interface::ConsensusMsg,
 };
 use aptos_dkg_runtime::DKGMessage;
 use aptos_event_notifications::EventSubscriptionService;
@@ -70,6 +71,7 @@ pub fn consensus_network_configuration(node_config: &NodeConfig) -> NetworkAppli
     NetworkApplicationConfig::new(network_client_config, network_service_config)
 }
 
+/// Returns the network application config for the DKG client and service
 pub fn dkg_network_configuration(node_config: &NodeConfig) -> NetworkApplicationConfig {
     let direct_send_protocols: Vec<ProtocolId> =
         aptos_dkg_runtime::network_interface::DIRECT_SEND.into();
@@ -86,6 +88,7 @@ pub fn dkg_network_configuration(node_config: &NodeConfig) -> NetworkApplication
     NetworkApplicationConfig::new(network_client_config, network_service_config)
 }
 
+/// Returns the network application config for the JWK consensus client and service
 pub fn jwk_consensus_network_configuration(node_config: &NodeConfig) -> NetworkApplicationConfig {
     let direct_send_protocols: Vec<ProtocolId> =
         aptos_jwk_consensus::network_interface::DIRECT_SEND.into();
@@ -163,23 +166,27 @@ pub fn storage_service_network_configuration(node_config: &NodeConfig) -> Networ
     NetworkApplicationConfig::new(network_client_config, network_service_config)
 }
 
-pub fn observer_service_network_configuration(
-    _node_config: &NodeConfig,
+/// Returns the network application config for the consensus observer client and server
+pub fn consensus_observer_network_configuration(
+    node_config: &NodeConfig,
 ) -> NetworkApplicationConfig {
     let direct_send_protocols = vec![ProtocolId::ConsensusObserver];
-    let rpc_protocols = vec![];
-    let max_network_channel_size = 100;
+    let rpc_protocols = vec![ProtocolId::ConsensusObserverRpc];
+    let max_network_channel_size = node_config.consensus_observer.max_network_channel_size as usize;
 
     let network_client_config =
         NetworkClientConfig::new(direct_send_protocols.clone(), rpc_protocols.clone());
     let network_service_config = NetworkServiceConfig::new(
         direct_send_protocols,
         rpc_protocols,
-        aptos_channel::Config::new(max_network_channel_size).queue_style(QueueStyle::FIFO),
+        aptos_channel::Config::new(max_network_channel_size)
+            .queue_style(QueueStyle::FIFO)
+            .counters(&consensus_observer::metrics::PENDING_CONSENSUS_OBSERVER_NETWORK_EVENTS),
     );
     NetworkApplicationConfig::new(network_client_config, network_service_config)
 }
 
+/// Returns the network application config for the netbench client and server
 pub fn netbench_network_configuration(
     node_config: &NodeConfig,
 ) -> Option<NetworkApplicationConfig> {
@@ -244,24 +251,24 @@ pub fn setup_networks_and_get_interfaces(
 ) -> (
     Vec<Runtime>,
     Option<ApplicationNetworkInterfaces<ConsensusMsg>>,
+    Option<ApplicationNetworkInterfaces<ConsensusObserverMessage>>,
     Option<ApplicationNetworkInterfaces<DKGMessage>>,
     Option<ApplicationNetworkInterfaces<JWKConsensusMsg>>,
     ApplicationNetworkInterfaces<MempoolSyncMsg>,
     ApplicationNetworkInterfaces<PeerMonitoringServiceMessage>,
     ApplicationNetworkInterfaces<StorageServiceMessage>,
-    Option<ApplicationNetworkInterfaces<ObserverMessage>>,
 ) {
     // Gather all network configs
     let network_configs = extract_network_configs(node_config);
-    let observer_enabled = node_config.consensus_observer.publisher_enabled
-        || node_config.consensus_observer.observer_enabled;
 
     // Create each network and register the application handles
     let mut network_runtimes = vec![];
     let mut consensus_network_handle = None;
+    let mut consensus_observer_network_handles: Option<
+        Vec<ApplicationNetworkHandle<ConsensusObserverMessage>>,
+    > = None;
     let mut dkg_network_handle = None;
     let mut jwk_consensus_network_handle = None;
-    let mut observer_network_handles = vec![];
     let mut mempool_network_handles = vec![];
     let mut peer_monitoring_service_network_handles = vec![];
     let mut storage_service_network_handles = vec![];
@@ -290,37 +297,64 @@ pub fn setup_networks_and_get_interfaces(
             if consensus_network_handle.is_some() {
                 panic!("There can be at most one validator network!");
             } else {
-                consensus_network_handle = Some(register_client_and_service_with_network(
+                let network_handle = register_client_and_service_with_network(
                     &mut network_builder,
                     network_id,
                     &network_config,
                     consensus_network_configuration(node_config),
-                    false,
-                ));
+                    true,
+                );
+                consensus_network_handle = Some(network_handle);
             }
 
             if dkg_network_handle.is_some() {
                 panic!("There can be at most one validator network!");
             } else {
-                dkg_network_handle = Some(register_client_and_service_with_network(
+                let network_handle = register_client_and_service_with_network(
                     &mut network_builder,
                     network_id,
                     &network_config,
                     dkg_network_configuration(node_config),
-                    false,
-                ));
+                    true,
+                );
+                dkg_network_handle = Some(network_handle);
             }
 
             if jwk_consensus_network_handle.is_some() {
                 panic!("There can be at most one validator network!");
             } else {
-                jwk_consensus_network_handle = Some(register_client_and_service_with_network(
+                let network_handle = register_client_and_service_with_network(
                     &mut network_builder,
                     network_id,
                     &network_config,
                     jwk_consensus_network_configuration(node_config),
-                    false,
-                ));
+                    true,
+                );
+                jwk_consensus_network_handle = Some(network_handle);
+            }
+        }
+
+        // Register consensus observer (both client and server) with the network
+        if node_config
+            .consensus_observer
+            .is_observer_or_publisher_enabled()
+        {
+            // Create the network handle for this network type
+            let network_handle = register_client_and_service_with_network(
+                &mut network_builder,
+                network_id,
+                &network_config,
+                consensus_observer_network_configuration(node_config),
+                false,
+            );
+
+            // Add the network handle to the set of handles
+            if let Some(consensus_observer_network_handles) =
+                &mut consensus_observer_network_handles
+            {
+                consensus_observer_network_handles.push(network_handle);
+            } else {
+                consensus_observer_network_handles = Some(vec![network_handle]);
             }
         }
 
@@ -330,7 +364,7 @@ pub fn setup_networks_and_get_interfaces(
             network_id,
             &network_config,
             mempool_network_configuration(node_config),
-            false,
+            true,
         );
         mempool_network_handles.push(mempool_network_handle);
 
@@ -340,7 +374,7 @@ pub fn setup_networks_and_get_interfaces(
             network_id,
             &network_config,
             peer_monitoring_network_configuration(node_config),
-            false,
+            true,
         );
         peer_monitoring_service_network_handles.push(peer_monitoring_service_network_handle);
 
@@ -350,29 +384,18 @@ pub fn setup_networks_and_get_interfaces(
             network_id,
             &network_config,
             storage_service_network_configuration(node_config),
-            false,
+            true,
         );
         storage_service_network_handles.push(storage_service_network_handle);
 
-        if observer_enabled {
-            let observer_network_handle = register_client_and_service_with_network(
-                &mut network_builder,
-                network_id,
-                &network_config,
-                observer_service_network_configuration(node_config),
-                true,
-            );
-            observer_network_handles.push(observer_network_handle);
-        }
-
-        // Register benchmark test service
+        // Register the network benchmark test service
         if let Some(app_config) = netbench_network_configuration(node_config) {
             let netbench_handle = register_client_and_service_with_network(
                 &mut network_builder,
                 network_id,
                 &network_config,
                 app_config,
-                false,
+                true,
             );
             netbench_handles.push(netbench_handle);
         }
@@ -390,21 +413,21 @@ pub fn setup_networks_and_get_interfaces(
     // Transform all network handles into application interfaces
     let (
         consensus_interfaces,
+        consensus_observer_interfaces,
         dkg_interfaces,
         jwk_consensus_interfaces,
         mempool_interfaces,
         peer_monitoring_service_interfaces,
         storage_service_interfaces,
-        observer_interfaces,
     ) = transform_network_handles_into_interfaces(
         node_config,
         consensus_network_handle,
+        consensus_observer_network_handles,
         dkg_network_handle,
         jwk_consensus_network_handle,
         mempool_network_handles,
         peer_monitoring_service_network_handles,
         storage_service_network_handles,
-        observer_network_handles,
         peers_and_metadata.clone(),
     );
 
@@ -421,20 +444,15 @@ pub fn setup_networks_and_get_interfaces(
         network_runtimes.push(netbench_runtime);
     }
 
-    let observer_interfaces = if observer_enabled {
-        Some(observer_interfaces)
-    } else {
-        None
-    };
     (
         network_runtimes,
         consensus_interfaces,
+        consensus_observer_interfaces,
         dkg_interfaces,
         jwk_consensus_interfaces,
         mempool_interfaces,
         peer_monitoring_service_interfaces,
         storage_service_interfaces,
-        observer_interfaces,
     )
 }
 
@@ -453,21 +471,19 @@ fn create_network_runtime(network_config: &NetworkConfig) -> Runtime {
 
 /// Registers a new application client and service with the network
 fn register_client_and_service_with_network<
-    T: Serialize + for<'de> Deserialize<'de> + Send + 'static,
+    T: Serialize + for<'de> Deserialize<'de> + Send + Sync + 'static,
 >(
     network_builder: &mut NetworkBuilder,
     network_id: NetworkId,
     network_config: &NetworkConfig,
     application_config: NetworkApplicationConfig,
-    no_parallel: bool,
+    allow_out_of_order_delivery: bool,
 ) -> ApplicationNetworkHandle<T> {
-    let max_parallel_deserialization_tasks = if no_parallel {
-        None
-    } else {
-        network_config.max_parallel_deserialization_tasks
-    };
-    let (network_sender, network_events) = network_builder
-        .add_client_and_service(&application_config, max_parallel_deserialization_tasks);
+    let (network_sender, network_events) = network_builder.add_client_and_service(
+        &application_config,
+        network_config.max_parallel_deserialization_tasks,
+        allow_out_of_order_delivery,
+    );
     ApplicationNetworkHandle {
         network_id,
         network_sender,
@@ -480,6 +496,9 @@ fn register_client_and_service_with_network<
 fn transform_network_handles_into_interfaces(
     node_config: &NodeConfig,
     consensus_network_handle: Option<ApplicationNetworkHandle<ConsensusMsg>>,
+    consensus_observer_network_handles: Option<
+        Vec<ApplicationNetworkHandle<ConsensusObserverMessage>>,
+    >,
     dkg_network_handle: Option<ApplicationNetworkHandle<DKGMessage>>,
     jwk_consensus_network_handle: Option<ApplicationNetworkHandle<JWKConsensusMsg>>,
     mempool_network_handles: Vec<ApplicationNetworkHandle<MempoolSyncMsg>>,
@@ -487,16 +506,15 @@ fn transform_network_handles_into_interfaces(
         ApplicationNetworkHandle<PeerMonitoringServiceMessage>,
     >,
     storage_service_network_handles: Vec<ApplicationNetworkHandle<StorageServiceMessage>>,
-    observer_network_handles: Vec<ApplicationNetworkHandle<ObserverMessage>>,
     peers_and_metadata: Arc<PeersAndMetadata>,
 ) -> (
     Option<ApplicationNetworkInterfaces<ConsensusMsg>>,
+    Option<ApplicationNetworkInterfaces<ConsensusObserverMessage>>,
     Option<ApplicationNetworkInterfaces<DKGMessage>>,
     Option<ApplicationNetworkInterfaces<JWKConsensusMsg>>,
     ApplicationNetworkInterfaces<MempoolSyncMsg>,
     ApplicationNetworkInterfaces<PeerMonitoringServiceMessage>,
     ApplicationNetworkInterfaces<StorageServiceMessage>,
-    ApplicationNetworkInterfaces<ObserverMessage>,
 ) {
     let consensus_interfaces = consensus_network_handle.map(|consensus_network_handle| {
         create_network_interfaces(
@@ -506,6 +524,15 @@ fn transform_network_handles_into_interfaces(
         )
     });
 
+    let consensus_observer_interfaces =
+        consensus_observer_network_handles.map(|consensus_observer_network_handles| {
+            create_network_interfaces(
+                consensus_observer_network_handles,
+                consensus_observer_network_configuration(node_config),
+                peers_and_metadata.clone(),
+            )
+        });
+
     let dkg_interfaces = dkg_network_handle.map(|handle| {
         create_network_interfaces(
             vec![handle],
@@ -527,30 +554,27 @@ fn transform_network_handles_into_interfaces(
         mempool_network_configuration(node_config),
         peers_and_metadata.clone(),
     );
+
     let peer_monitoring_service_interfaces = create_network_interfaces(
         peer_monitoring_service_network_handles,
         peer_monitoring_network_configuration(node_config),
         peers_and_metadata.clone(),
     );
+
     let storage_service_interfaces = create_network_interfaces(
         storage_service_network_handles,
         storage_service_network_configuration(node_config),
         peers_and_metadata.clone(),
     );
-    let observer_interfaces = create_network_interfaces(
-        observer_network_handles,
-        observer_service_network_configuration(node_config),
-        peers_and_metadata,
-    );
 
     (
         consensus_interfaces,
+        consensus_observer_interfaces,
         dkg_interfaces,
         jwk_consensus_interfaces,
         mempool_interfaces,
         peer_monitoring_service_interfaces,
         storage_service_interfaces,
-        observer_interfaces,
     )
 }
 
diff --git a/aptos-node/src/services.rs b/aptos-node/src/services.rs
index cea0de1b84963..dc64c14195b0d 100644
--- a/aptos-node/src/services.rs
+++ b/aptos-node/src/services.rs
@@ -6,22 +6,21 @@ use aptos_admin_service::AdminService;
 use aptos_build_info::build_information;
 use aptos_config::config::NodeConfig;
 use aptos_consensus::{
-    consensus_observer::network::ObserverMessage, network_interface::ConsensusMsg,
+    consensus_observer::publisher::ConsensusPublisher, network_interface::ConsensusMsg,
     persistent_liveness_storage::StorageWriteProxy, quorum_store::quorum_store_db::QuorumStoreDB,
 };
 use aptos_consensus_notifications::ConsensusNotifier;
 use aptos_data_client::client::AptosDataClient;
-use aptos_db_indexer::table_info_reader::TableInfoReader;
+use aptos_db_indexer::{db_indexer::InternalIndexerDB, indexer_reader::IndexerReaders};
 use aptos_event_notifications::{DbBackedOnChainConfig, ReconfigNotificationListener};
 use aptos_indexer_grpc_fullnode::runtime::bootstrap as bootstrap_indexer_grpc;
-use aptos_indexer_grpc_table_info::runtime::bootstrap as bootstrap_indexer_table_info;
+use aptos_indexer_grpc_table_info::runtime::{
+    bootstrap as bootstrap_indexer_table_info, bootstrap_internal_indexer_db,
+};
 use aptos_logger::{debug, telemetry_log_writer::TelemetryLog, LoggerFilterUpdater};
 use aptos_mempool::{network::MempoolSyncMsg, MempoolClientRequest, QuorumStoreRequest};
 use aptos_mempool_notifications::MempoolNotificationListener;
-use aptos_network::application::{
-    interface::{NetworkClient, NetworkClientInterface},
-    storage::PeersAndMetadata,
-};
+use aptos_network::application::{interface::NetworkClientInterface, storage::PeersAndMetadata};
 use aptos_network_benchmark::{run_netbench_service, NetbenchMessage};
 use aptos_peer_monitoring_service_server::{
     network::PeerMonitoringServiceNetworkEvents, storage::StorageReader,
@@ -30,7 +29,7 @@ use aptos_peer_monitoring_service_server::{
 use aptos_peer_monitoring_service_types::PeerMonitoringServiceMessage;
 use aptos_storage_interface::{DbReader, DbReaderWriter};
 use aptos_time_service::TimeService;
-use aptos_types::chain_id::ChainId;
+use aptos_types::{chain_id::ChainId, indexer::indexer_db_reader::IndexerReader};
 use aptos_validator_transaction_pool::VTxnPoolState;
 use futures::channel::{mpsc, mpsc::Sender};
 use std::{sync::Arc, time::Instant};
@@ -45,12 +44,14 @@ pub fn bootstrap_api_and_indexer(
     node_config: &NodeConfig,
     db_rw: DbReaderWriter,
     chain_id: ChainId,
+    internal_indexer_db: Option<InternalIndexerDB>,
 ) -> anyhow::Result<(
     Receiver<MempoolClientRequest>,
     Option<Runtime>,
     Option<Runtime>,
     Option<Runtime>,
     Option<Runtime>,
+    Option<Runtime>,
 )> {
     // Create the mempool client and sender
     let (mempool_client_sender, mempool_client_receiver) =
@@ -66,18 +67,27 @@ pub fn bootstrap_api_and_indexer(
         None => (None, None),
     };
 
+    let (db_indexer_runtime, txn_event_reader) =
+        match bootstrap_internal_indexer_db(node_config, db_rw.clone(), internal_indexer_db) {
+            Some((runtime, db_indexer)) => (Some(runtime), Some(db_indexer)),
+            None => (None, None),
+        };
+
+    let indexer_readers = IndexerReaders::new(indexer_async_v2, txn_event_reader);
+
     // Create the API runtime
-    let table_info_reader: Option<Arc<dyn TableInfoReader>> = indexer_async_v2.map(|arc| {
-        let trait_object: Arc<dyn TableInfoReader> = arc;
+    let indexer_reader: Option<Arc<dyn IndexerReader>> = indexer_readers.map(|readers| {
+        let trait_object: Arc<dyn IndexerReader> = Arc::new(readers);
         trait_object
     });
+
     let api_runtime = if node_config.api.enabled {
         Some(bootstrap_api(
             node_config,
             chain_id,
             db_rw.reader.clone(),
             mempool_client_sender.clone(),
-            table_info_reader.clone(),
+            indexer_reader.clone(),
         )?)
     } else {
         None
@@ -89,7 +99,7 @@ pub fn bootstrap_api_and_indexer(
         chain_id,
         db_rw.reader.clone(),
         mempool_client_sender.clone(),
-        table_info_reader,
+        indexer_reader,
     );
 
     // Create the indexer runtime
@@ -106,6 +116,7 @@ pub fn bootstrap_api_and_indexer(
         indexer_table_info_runtime,
         indexer_runtime,
         indexer_grpc,
+        db_indexer_runtime,
     ))
 }
 
@@ -118,14 +129,13 @@ pub fn start_consensus_runtime(
     consensus_notifier: ConsensusNotifier,
     consensus_to_mempool_sender: Sender<QuorumStoreRequest>,
     vtxn_pool: VTxnPoolState,
-    observer_network_client: Option<NetworkClient<ObserverMessage>>,
+    consensus_publisher: Option<Arc<ConsensusPublisher>>,
 ) -> (Runtime, Arc<StorageWriteProxy>, Arc<QuorumStoreDB>) {
     let instant = Instant::now();
-    let observer_network_client = if node_config.consensus_observer.publisher_enabled {
-        observer_network_client
-    } else {
-        None
-    };
+
+    let reconfig_subscription = consensus_reconfig_subscription
+        .expect("Consensus requires a reconfiguration subscription!");
+
     let consensus = aptos_consensus::consensus_provider::start_consensus(
         node_config,
         consensus_network_interfaces.network_client,
@@ -133,12 +143,12 @@ pub fn start_consensus_runtime(
         Arc::new(consensus_notifier),
         consensus_to_mempool_sender,
         db_rw,
-        consensus_reconfig_subscription
-            .expect("Consensus requires a reconfiguration subscription!"),
+        reconfig_subscription,
         vtxn_pool,
-        observer_network_client,
+        consensus_publisher,
     );
     debug!("Consensus started in {} ms", instant.elapsed().as_millis());
+
     consensus
 }
 
diff --git a/aptos-node/src/state_sync.rs b/aptos-node/src/state_sync.rs
index 45db82f2ac527..d98667977a0cc 100644
--- a/aptos-node/src/state_sync.rs
+++ b/aptos-node/src/state_sync.rs
@@ -46,6 +46,7 @@ pub fn create_event_subscription_service(
     EventSubscriptionService,
     ReconfigNotificationListener<DbBackedOnChainConfig>,
     Option<ReconfigNotificationListener<DbBackedOnChainConfig>>,
+    Option<ReconfigNotificationListener<DbBackedOnChainConfig>>,
     Option<(
         ReconfigNotificationListener<DbBackedOnChainConfig>,
         EventNotificationListener,
@@ -64,10 +65,20 @@ pub fn create_event_subscription_service(
         .subscribe_to_reconfigurations()
         .expect("Mempool must subscribe to reconfigurations");
 
-    // Create a reconfiguration subscription for consensus (if this is a validator)
-    let consensus_reconfig_subscription = if node_config.base.role.is_validator()
-        || node_config.state_sync.state_sync_driver.observer_enabled
-    {
+    // Create a reconfiguration subscription for consensus observer (if enabled)
+    let consensus_observer_reconfig_subscription =
+        if node_config.consensus_observer.observer_enabled {
+            Some(
+                event_subscription_service
+                    .subscribe_to_reconfigurations()
+                    .expect("Consensus observer must subscribe to reconfigurations"),
+            )
+        } else {
+            None
+        };
+
+    // Create a reconfiguration subscription for consensus
+    let consensus_reconfig_subscription = if node_config.base.role.is_validator() {
         Some(
             event_subscription_service
                 .subscribe_to_reconfigurations()
@@ -77,6 +88,7 @@ pub fn create_event_subscription_service(
         None
     };
 
+    // Create reconfiguration subscriptions for DKG
     let dkg_subscriptions = if node_config.base.role.is_validator() {
         let reconfig_events = event_subscription_service
             .subscribe_to_reconfigurations()
@@ -89,6 +101,7 @@ pub fn create_event_subscription_service(
         None
     };
 
+    // Create reconfiguration subscriptions for JWK consensus
     let jwk_consensus_subscriptions = if node_config.base.role.is_validator() {
         let reconfig_events = event_subscription_service
             .subscribe_to_reconfigurations()
@@ -104,6 +117,7 @@ pub fn create_event_subscription_service(
     (
         event_subscription_service,
         mempool_reconfig_subscription,
+        consensus_observer_reconfig_subscription,
         consensus_reconfig_subscription,
         dkg_subscriptions,
         jwk_consensus_subscriptions,
diff --git a/aptos-node/src/storage.rs b/aptos-node/src/storage.rs
index b5f6780fbab39..0089a7961b2ea 100644
--- a/aptos-node/src/storage.rs
+++ b/aptos-node/src/storage.rs
@@ -5,7 +5,9 @@ use anyhow::{anyhow, Result};
 use aptos_backup_service::start_backup_service;
 use aptos_config::{config::NodeConfig, utils::get_genesis_txn};
 use aptos_db::{fast_sync_storage_wrapper::FastSyncStorageWrapper, AptosDB};
+use aptos_db_indexer::db_indexer::InternalIndexerDB;
 use aptos_executor::db_bootstrapper::maybe_bootstrap;
+use aptos_indexer_grpc_table_info::internal_indexer_db_service::InternalIndexerDBService;
 use aptos_logger::{debug, info};
 use aptos_storage_interface::{DbReader, DbReaderWriter};
 use aptos_types::{ledger_info::LedgerInfoWithSignatures, waypoint::Waypoint};
@@ -38,9 +40,15 @@ pub(crate) fn maybe_apply_genesis(
 #[cfg(not(feature = "consensus-only-perf-test"))]
 pub(crate) fn bootstrap_db(
     node_config: &NodeConfig,
-) -> Result<(Arc<dyn DbReader>, DbReaderWriter, Option<Runtime>)> {
+) -> Result<(
+    Arc<dyn DbReader>,
+    DbReaderWriter,
+    Option<Runtime>,
+    Option<InternalIndexerDB>,
+)> {
+    let internal_indexer_db = InternalIndexerDBService::get_indexer_db(node_config);
     let (aptos_db_reader, db_rw, backup_service) =
-        match FastSyncStorageWrapper::initialize_dbs(node_config)? {
+        match FastSyncStorageWrapper::initialize_dbs(node_config, internal_indexer_db.clone())? {
             Either::Left(db) => {
                 let (db_arc, db_rw) = DbReaderWriter::wrap(db);
                 let db_backup_service = start_backup_service(
@@ -73,12 +81,10 @@ pub(crate) fn bootstrap_db(
 
                 let db_backup_service =
                     start_backup_service(node_config.storage.backup_service_address, fast_sync_db);
-
                 (db_arc as Arc<dyn DbReader>, db_rw, Some(db_backup_service))
             },
         };
-
-    Ok((aptos_db_reader, db_rw, backup_service))
+    Ok((aptos_db_reader, db_rw, backup_service, internal_indexer_db))
 }
 
 /// In consensus-only mode, return a in-memory based [FakeAptosDB] and
@@ -146,7 +152,12 @@ fn create_rocksdb_checkpoint_and_change_working_dir(
 /// the various handles.
 pub fn initialize_database_and_checkpoints(
     node_config: &mut NodeConfig,
-) -> Result<(DbReaderWriter, Option<Runtime>, Waypoint)> {
+) -> Result<(
+    DbReaderWriter,
+    Option<Runtime>,
+    Waypoint,
+    Option<InternalIndexerDB>,
+)> {
     // If required, create RocksDB checkpoints and change the working directory.
     // This is test-only.
     if let Some(working_dir) = node_config.base.working_dir.clone() {
@@ -155,7 +166,7 @@ pub fn initialize_database_and_checkpoints(
 
     // Open the database
     let instant = Instant::now();
-    let (_aptos_db, db_rw, backup_service) = bootstrap_db(node_config)?;
+    let (_aptos_db, db_rw, backup_service, indexer_db_opt) = bootstrap_db(node_config)?;
 
     // Log the duration to open storage
     debug!(
@@ -167,5 +178,6 @@ pub fn initialize_database_and_checkpoints(
         db_rw,
         backup_service,
         node_config.base.waypoint.genesis_waypoint(),
+        indexer_db_opt,
     ))
 }
diff --git a/aptos-node/src/tests.rs b/aptos-node/src/tests.rs
index 36ab33550d2a5..f41079d37c2f5 100644
--- a/aptos-node/src/tests.rs
+++ b/aptos-node/src/tests.rs
@@ -80,7 +80,7 @@ fn test_create_single_node_test_config() {
     .unwrap();
     let f = std::fs::OpenOptions::new()
         .write(true)
-        .create(true)
+        .create_new(true)
         .open(&config_override_path)
         .expect("Couldn't open file");
     serde_yaml::to_writer(f, &config_override).unwrap();
diff --git a/aptos-node/src/utils.rs b/aptos-node/src/utils.rs
index e31f0a622facd..a5153eb0c103e 100644
--- a/aptos-node/src/utils.rs
+++ b/aptos-node/src/utils.rs
@@ -6,6 +6,7 @@ use aptos_config::config::{NodeConfig, DEFAULT_EXECUTION_CONCURRENCY_LEVEL};
 use aptos_storage_interface::{state_view::LatestDbStateCheckpointView, DbReaderWriter};
 use aptos_types::{
     account_config::ChainIdResource, chain_id::ChainId, on_chain_config::OnChainConfig,
+    vm::configs::set_paranoid_type_checks,
 };
 use aptos_vm::AptosVM;
 use std::cmp::min;
@@ -45,7 +46,7 @@ pub fn fetch_chain_id(db: &DbReaderWriter) -> anyhow::Result<ChainId> {
 
 /// Sets the Aptos VM configuration based on the node configurations
 pub fn set_aptos_vm_configurations(node_config: &NodeConfig) {
-    AptosVM::set_paranoid_type_checks(node_config.execution.paranoid_type_verification);
+    set_paranoid_type_checks(node_config.execution.paranoid_type_verification);
     let effective_concurrency_level = if node_config.execution.concurrency_level == 0 {
         min(
             DEFAULT_EXECUTION_CONCURRENCY_LEVEL,
diff --git a/buildtools/packer/aws-ubuntu.pkr.hcl b/buildtools/packer/aws-ubuntu.pkr.hcl
new file mode 100644
index 0000000000000..2a7b64c17a623
--- /dev/null
+++ b/buildtools/packer/aws-ubuntu.pkr.hcl
@@ -0,0 +1,64 @@
+packer {
+  required_plugins {
+    amazon = {
+      version = ">= 1.2.8"
+      source  = "github.com/hashicorp/amazon"
+    }
+  }
+}
+
+variable "region" {
+  type = string
+}
+
+variable "ami_prefix" {
+  type = string
+}
+
+
+data "amazon-ami" "runs-on-ami-x64" {
+  filters = {
+    name                = "runs-on-v2.2-ubuntu22-full-x64-*"
+    root-device-type    = "ebs"
+    virtualization-type = "hvm"
+  }
+  most_recent = true
+  # The Runs-On AMI is in the following account
+  # ref: https://runs-on.com/guides/building-custom-ami-with-packer/
+  owners      = ["135269210855"]
+  region      = "${var.region}"
+}
+
+source "amazon-ebs" "build-ebs" {
+  ami_name       = "${var.ami_prefix}-runs-on-${formatdate("YYYY-MM-DD-hhmmss", timestamp())}"
+  instance_type  = "c7a.4xlarge"
+  region         = "${var.region}"
+  source_ami     = "${data.amazon-ami.runs-on-ami-x64.id}"
+  ssh_username   = "ubuntu"
+  user_data_file = "./user_data.sh"
+}
+
+build {
+  name = "setup-ubuntu-22.04"
+  sources = [
+    "source.amazon-ebs.build-ebs"
+  ]
+
+  provisioner "file" {
+    source      = "../../rust-toolchain.toml"
+    destination = "/tmp/rust-toolchain.toml"
+  }
+
+  provisioner "file" {
+    source      = "../../scripts"
+    destination = "/tmp/scripts"
+  }
+
+  provisioner "shell" {
+    inline = [
+      "whoami",
+      "chmod +x /tmp/scripts/dev_setup.sh",
+      "sudo -u runner /tmp/scripts/dev_setup.sh -b -r -y -P -J -t -k",
+    ]
+  }
+}
diff --git a/buildtools/packer/user_data.sh b/buildtools/packer/user_data.sh
new file mode 100644
index 0000000000000..501b4da455f51
--- /dev/null
+++ b/buildtools/packer/user_data.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+systemctl start ssh
diff --git a/clippy.toml b/clippy.toml
index f0b060c599b0c..36f13055e2511 100644
--- a/clippy.toml
+++ b/clippy.toml
@@ -6,3 +6,5 @@ type-complexity-threshold = 10000
 too-many-arguments-threshold = 14
 # Reasonably large enum variants are okay
 enum-variant-size-threshold = 1000
+# Allow unwrap in test
+allow-unwrap-in-tests = true
diff --git a/config/Cargo.toml b/config/Cargo.toml
index b36397d17fb5a..1bdf814cd7b5c 100644
--- a/config/Cargo.toml
+++ b/config/Cargo.toml
@@ -28,7 +28,6 @@ cfg-if = { workspace = true }
 get_if_addrs = { workspace = true }
 maplit = { workspace = true }
 num_cpus = { workspace = true }
-number_range = { workspace = true }
 poem-openapi = { workspace = true }
 rand = { workspace = true }
 serde = { workspace = true }
diff --git a/config/src/config/api_config.rs b/config/src/config/api_config.rs
index 4fa20a6f52b25..1758d8c227994 100644
--- a/config/src/config/api_config.rs
+++ b/config/src/config/api_config.rs
@@ -6,7 +6,7 @@ use super::transaction_filter_type::{Filter, Matcher};
 use crate::{
     config::{
         config_sanitizer::ConfigSanitizer, gas_estimation_config::GasEstimationConfig,
-        node_config_loader::NodeType, Error, NodeConfig,
+        node_config_loader::NodeType, Error, NodeConfig, MAX_RECEIVING_BLOCK_TXNS,
     },
     utils,
 };
@@ -53,6 +53,8 @@ pub struct ApiConfig {
     pub max_submit_transaction_batch_size: usize,
     /// Maximum page size for transaction paginated APIs
     pub max_transactions_page_size: u16,
+    /// Maximum page size for block transaction APIs
+    pub max_block_transactions_page_size: u16,
     /// Maximum page size for event paginated APIs
     pub max_events_page_size: u16,
     /// Maximum page size for resource paginated APIs
@@ -123,6 +125,7 @@ impl Default for ApiConfig {
             transaction_submission_enabled: default_enabled(),
             transaction_simulation_enabled: default_enabled(),
             max_submit_transaction_batch_size: DEFAULT_MAX_SUBMIT_TRANSACTION_BATCH_SIZE,
+            max_block_transactions_page_size: *MAX_RECEIVING_BLOCK_TXNS as u16,
             max_transactions_page_size: DEFAULT_MAX_PAGE_SIZE,
             max_events_page_size: DEFAULT_MAX_PAGE_SIZE,
             max_account_resources_page_size: DEFAULT_MAX_ACCOUNT_RESOURCES_PAGE_SIZE,
diff --git a/config/src/config/config_optimizer.rs b/config/src/config/config_optimizer.rs
index 8947a4c7644c6..addd1087b1435 100644
--- a/config/src/config/config_optimizer.rs
+++ b/config/src/config/config_optimizer.rs
@@ -1,7 +1,9 @@
 // Copyright © Aptos Foundation
 // SPDX-License-Identifier: Apache-2.0
 
-use super::{Identity, IdentityFromConfig, IdentitySource, IndexerGrpcConfig};
+use super::{
+    ConsensusObserverConfig, Identity, IdentityFromConfig, IdentitySource, IndexerGrpcConfig,
+};
 use crate::{
     config::{
         node_config_loader::NodeType, utils::get_config_name, AdminServiceConfig, Error,
@@ -105,6 +107,12 @@ impl ConfigOptimizer for NodeConfig {
 
         // Optimize only the relevant sub-configs
         let mut optimizers_with_modifications = vec![];
+        if AdminServiceConfig::optimize(node_config, local_config_yaml, node_type, chain_id)? {
+            optimizers_with_modifications.push(AdminServiceConfig::get_optimizer_name());
+        }
+        if ConsensusObserverConfig::optimize(node_config, local_config_yaml, node_type, chain_id)? {
+            optimizers_with_modifications.push(ConsensusObserverConfig::get_optimizer_name());
+        }
         if ExecutionConfig::optimize(node_config, local_config_yaml, node_type, chain_id)? {
             optimizers_with_modifications.push(ExecutionConfig::get_optimizer_name());
         }
@@ -114,9 +122,6 @@ impl ConfigOptimizer for NodeConfig {
         if IndexerGrpcConfig::optimize(node_config, local_config_yaml, node_type, chain_id)? {
             optimizers_with_modifications.push(IndexerGrpcConfig::get_optimizer_name());
         }
-        if AdminServiceConfig::optimize(node_config, local_config_yaml, node_type, chain_id)? {
-            optimizers_with_modifications.push(AdminServiceConfig::get_optimizer_name());
-        }
         if InspectionServiceConfig::optimize(node_config, local_config_yaml, node_type, chain_id)? {
             optimizers_with_modifications.push(InspectionServiceConfig::get_optimizer_name());
         }
diff --git a/config/src/config/config_sanitizer.rs b/config/src/config/config_sanitizer.rs
index f14428fcd6958..ffc16c3c871f1 100644
--- a/config/src/config/config_sanitizer.rs
+++ b/config/src/config/config_sanitizer.rs
@@ -1,6 +1,7 @@
 // Copyright © Aptos Foundation
 // SPDX-License-Identifier: Apache-2.0
 
+use super::internal_indexer_db_config::InternalIndexerDBConfig;
 use crate::config::{
     node_config_loader::NodeType,
     utils::{are_failpoints_enabled, get_config_name},
@@ -62,6 +63,7 @@ impl ConfigSanitizer for NodeConfig {
         NetbenchConfig::sanitize(node_config, node_type, chain_id)?;
         StateSyncConfig::sanitize(node_config, node_type, chain_id)?;
         StorageConfig::sanitize(node_config, node_type, chain_id)?;
+        InternalIndexerDBConfig::sanitize(node_config, node_type, chain_id)?;
         sanitize_validator_network_config(node_config, node_type, chain_id)?;
 
         Ok(()) // All configs passed validation
diff --git a/config/src/config/consensus_config.rs b/config/src/config/consensus_config.rs
index 240c108db5075..b10b431edd9fc 100644
--- a/config/src/config/consensus_config.rs
+++ b/config/src/config/consensus_config.rs
@@ -2,19 +2,26 @@
 // Parts of the project are originally copyright © Meta Platforms, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
+use super::DEFEAULT_MAX_BATCH_TXNS;
 use crate::config::{
     config_sanitizer::ConfigSanitizer, node_config_loader::NodeType, Error, NodeConfig,
     QuorumStoreConfig, ReliableBroadcastConfig, SafetyRulesConfig, BATCH_PADDING_BYTES,
 };
+use aptos_crypto::_once_cell::sync::Lazy;
 use aptos_types::chain_id::ChainId;
 use cfg_if::cfg_if;
 use serde::{Deserialize, Serialize};
 use std::path::PathBuf;
 
 // NOTE: when changing, make sure to update QuorumStoreBackPressureConfig::backlog_txn_limit_count as well.
-pub(crate) const MAX_SENDING_BLOCK_TXNS: u64 = 1900;
+const MAX_SENDING_BLOCK_TXNS_AFTER_FILTERING: u64 = 3000;
+const MAX_SENDING_BLOCK_TXNS: u64 = 7000;
+pub(crate) static MAX_RECEIVING_BLOCK_TXNS: Lazy<u64> =
+    Lazy::new(|| 10000.max(2 * MAX_SENDING_BLOCK_TXNS));
 // stop reducing size at this point, so 1MB transactions can still go through
 const MIN_BLOCK_BYTES_OVERRIDE: u64 = 1024 * 1024 + BATCH_PADDING_BYTES as u64;
+// We should reduce block size only until two QS batch sizes.
+const MIN_BLOCK_TXNS_AFTER_FILTERING: u64 = DEFEAULT_MAX_BATCH_TXNS as u64 * 2;
 
 #[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
 #[serde(default, deny_unknown_fields)]
@@ -22,6 +29,7 @@ pub struct ConsensusConfig {
     // length of inbound queue of messages
     pub max_network_channel_size: usize,
     pub max_sending_block_txns: u64,
+    pub max_sending_block_txns_after_filtering: u64,
     pub max_sending_block_bytes: u64,
     pub max_sending_inline_txns: u64,
     pub max_sending_inline_bytes: u64,
@@ -60,6 +68,11 @@ pub struct ConsensusConfig {
     pub intra_consensus_channel_buffer_size: usize,
     pub quorum_store: QuorumStoreConfig,
     pub vote_back_pressure_limit: u64,
+    /// If backpressure target block size is below it, update `max_txns_to_execute` instead.
+    /// Applied to execution, pipeline and chain health backpressure.
+    /// Needed as we cannot subsplit QS batches.
+    pub min_max_txns_in_block_after_filtering_from_backpressure: u64,
+    pub execution_backpressure: Option<ExecutionBackpressureConfig>,
     pub pipeline_backpressure: Vec<PipelineBackpressureValues>,
     // Used to decide if backoff is needed.
     // must match one of the CHAIN_HEALTH_WINDOW_SIZES values.
@@ -74,6 +87,7 @@ pub struct ConsensusConfig {
     pub broadcast_vote: bool,
     pub proof_cache_capacity: u64,
     pub rand_rb_config: ReliableBroadcastConfig,
+    pub num_bounded_executor_tasks: u64,
 }
 
 #[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)]
@@ -120,10 +134,40 @@ impl Default for DelayedQcAggregatorConfig {
     }
 }
 
+/// Execution backpressure which handles gas/s variance,
+/// and adjusts block sizes to "recalibrate it" to wanted range.
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
+pub struct ExecutionBackpressureConfig {
+    /// Look at execution time for this many last blocks
+    pub num_blocks_to_look_at: usize,
+
+    /// Only blocks above this threshold are treated as potentially needed recalibration
+    /// This is needed as small blocks have overheads that are irrelevant to the transactions
+    /// being executed.
+    pub min_block_time_ms_to_activate: usize,
+
+    /// Backpressure has a second check, where it only activates if
+    /// at least `min_blocks_to_activate` are above `min_block_time_ms_to_activate`
+    pub min_blocks_to_activate: usize,
+
+    /// Out of blocks in the window, take this percentile (from 0-1 range), to use for calibration.
+    /// i.e. 0.5 means take a median of last `num_blocks_to_look_at` blocks.
+    pub percentile: f64,
+    /// Recalibrating max block size, to target blocks taking this long.
+    pub target_block_time_ms: usize,
+    /// A minimal number of transactions per block, even if calibration suggests otherwise
+    /// To make sure backpressure doesn't become too aggressive.
+    pub min_calibrated_txns_per_block: u64,
+    // We compute re-calibrated block size, and use that for `max_txns_in_block`.
+    // But after execution pool and cost of overpacking being minimal - we should
+    // change so that backpressure sets `max_txns_to_execute` instead
+}
+
 #[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize)]
 pub struct PipelineBackpressureValues {
+    // At what latency does this backpressure level activate
     pub back_pressure_pipeline_latency_limit_ms: u64,
-    pub max_sending_block_txns_override: u64,
+    pub max_sending_block_txns_after_filtering_override: u64,
     pub max_sending_block_bytes_override: u64,
     // If there is backpressure, giving some more breathing room to go through the backlog,
     // and making sure rounds don't go extremely fast (even if they are smaller blocks)
@@ -131,18 +175,16 @@ pub struct PipelineBackpressureValues {
     // If we want to dynamically increase it beyond quorum_store_poll_time,
     // we need to adjust timeouts other nodes use for the backpressured round.
     pub backpressure_proposal_delay_ms: u64,
-    pub max_txns_from_block_to_execute: Option<usize>,
 }
 
 #[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize)]
 pub struct ChainHealthBackoffValues {
     pub backoff_if_below_participating_voting_power_percentage: usize,
 
-    pub max_sending_block_txns_override: u64,
+    pub max_sending_block_txns_after_filtering_override: u64,
     pub max_sending_block_bytes_override: u64,
 
     pub backoff_proposal_delay_ms: u64,
-    pub max_txns_from_block_to_execute: Option<usize>,
 }
 
 impl Default for ConsensusConfig {
@@ -150,8 +192,9 @@ impl Default for ConsensusConfig {
         ConsensusConfig {
             max_network_channel_size: 1024,
             max_sending_block_txns: MAX_SENDING_BLOCK_TXNS,
+            max_sending_block_txns_after_filtering: MAX_SENDING_BLOCK_TXNS_AFTER_FILTERING,
             max_sending_block_bytes: 3 * 1024 * 1024, // 3MB
-            max_receiving_block_txns: 10000.max(2 * MAX_SENDING_BLOCK_TXNS),
+            max_receiving_block_txns: *MAX_RECEIVING_BLOCK_TXNS,
             max_sending_inline_txns: 100,
             max_sending_inline_bytes: 200 * 1024,       // 200 KB
             max_receiving_block_bytes: 6 * 1024 * 1024, // 6MB
@@ -181,6 +224,16 @@ impl Default for ConsensusConfig {
             // Considering block gas limit and pipeline backpressure should keep number of blocks
             // in the pipline very low, we can keep this limit pretty low, too.
             vote_back_pressure_limit: 7,
+            min_max_txns_in_block_after_filtering_from_backpressure: MIN_BLOCK_TXNS_AFTER_FILTERING,
+            execution_backpressure: Some(ExecutionBackpressureConfig {
+                num_blocks_to_look_at: 12,
+                min_blocks_to_activate: 4,
+                percentile: 0.5,
+                target_block_time_ms: 250,
+                min_block_time_ms_to_activate: 100,
+                // allow at least two spreading group from reordering in a single block, to utilize paralellism
+                min_calibrated_txns_per_block: 8,
+            }),
             pipeline_backpressure: vec![
                 PipelineBackpressureValues {
                     // pipeline_latency looks how long has the oldest block still in pipeline
@@ -189,119 +242,97 @@ impl Default for ConsensusConfig {
                     // pipeline once quorum on execution result among validators has been reached
                     // (so-(badly)-called "commit certificate"), meaning 2f+1 validators have finished execution.
                     back_pressure_pipeline_latency_limit_ms: 800,
-                    max_sending_block_txns_override: MAX_SENDING_BLOCK_TXNS,
+                    max_sending_block_txns_after_filtering_override:
+                        MAX_SENDING_BLOCK_TXNS_AFTER_FILTERING,
                     max_sending_block_bytes_override: 5 * 1024 * 1024,
                     backpressure_proposal_delay_ms: 100,
-                    max_txns_from_block_to_execute: None,
                 },
                 PipelineBackpressureValues {
-                    back_pressure_pipeline_latency_limit_ms: 1100,
-                    max_sending_block_txns_override: MAX_SENDING_BLOCK_TXNS,
+                    back_pressure_pipeline_latency_limit_ms: 1200,
+                    max_sending_block_txns_after_filtering_override:
+                        MAX_SENDING_BLOCK_TXNS_AFTER_FILTERING,
                     max_sending_block_bytes_override: 5 * 1024 * 1024,
                     backpressure_proposal_delay_ms: 200,
-                    max_txns_from_block_to_execute: None,
                 },
                 PipelineBackpressureValues {
-                    back_pressure_pipeline_latency_limit_ms: 1400,
-                    max_sending_block_txns_override: 2000,
-                    max_sending_block_bytes_override: MIN_BLOCK_BYTES_OVERRIDE,
+                    back_pressure_pipeline_latency_limit_ms: 1600,
+                    max_sending_block_txns_after_filtering_override:
+                        MAX_SENDING_BLOCK_TXNS_AFTER_FILTERING,
+                    max_sending_block_bytes_override: 5 * 1024 * 1024,
                     backpressure_proposal_delay_ms: 300,
-                    max_txns_from_block_to_execute: None,
-                },
-                PipelineBackpressureValues {
-                    back_pressure_pipeline_latency_limit_ms: 1700,
-                    max_sending_block_txns_override: 1000,
-                    max_sending_block_bytes_override: MIN_BLOCK_BYTES_OVERRIDE,
-                    backpressure_proposal_delay_ms: 400,
-                    max_txns_from_block_to_execute: None,
-                },
-                PipelineBackpressureValues {
-                    back_pressure_pipeline_latency_limit_ms: 2000,
-                    max_sending_block_txns_override: 1000,
-                    max_sending_block_bytes_override: MIN_BLOCK_BYTES_OVERRIDE,
-                    backpressure_proposal_delay_ms: 500,
-                    max_txns_from_block_to_execute: Some(400),
                 },
+                // with execution backpressure, only later start reducing block size
                 PipelineBackpressureValues {
-                    back_pressure_pipeline_latency_limit_ms: 2300,
-                    max_sending_block_txns_override: 1000,
+                    back_pressure_pipeline_latency_limit_ms: 2500,
+                    max_sending_block_txns_after_filtering_override: 1000,
                     max_sending_block_bytes_override: MIN_BLOCK_BYTES_OVERRIDE,
-                    backpressure_proposal_delay_ms: 500,
-                    max_txns_from_block_to_execute: Some(150),
+                    backpressure_proposal_delay_ms: 300,
                 },
                 PipelineBackpressureValues {
-                    back_pressure_pipeline_latency_limit_ms: 2700,
-                    max_sending_block_txns_override: 1000,
+                    back_pressure_pipeline_latency_limit_ms: 3500,
+                    max_sending_block_txns_after_filtering_override: 200,
                     max_sending_block_bytes_override: MIN_BLOCK_BYTES_OVERRIDE,
-                    backpressure_proposal_delay_ms: 500,
-                    max_txns_from_block_to_execute: Some(50),
+                    backpressure_proposal_delay_ms: 300,
                 },
                 PipelineBackpressureValues {
-                    back_pressure_pipeline_latency_limit_ms: 3100,
-                    max_sending_block_txns_override: 1000,
+                    back_pressure_pipeline_latency_limit_ms: 4500,
+                    max_sending_block_txns_after_filtering_override: 30,
                     max_sending_block_bytes_override: MIN_BLOCK_BYTES_OVERRIDE,
-                    backpressure_proposal_delay_ms: 500,
-                    max_txns_from_block_to_execute: Some(20),
+                    backpressure_proposal_delay_ms: 300,
                 },
                 PipelineBackpressureValues {
-                    back_pressure_pipeline_latency_limit_ms: 3500,
-                    max_sending_block_txns_override: 1000,
-                    max_sending_block_bytes_override: MIN_BLOCK_BYTES_OVERRIDE,
-                    backpressure_proposal_delay_ms: 500,
+                    back_pressure_pipeline_latency_limit_ms: 6000,
                     // in practice, latencies and delay make it such that ~2 blocks/s is max,
                     // meaning that most aggressively we limit to ~10 TPS
                     // For transactions that are more expensive than that, we should
                     // instead rely on max gas per block to limit latency.
-                    max_txns_from_block_to_execute: Some(5),
+                    max_sending_block_txns_after_filtering_override: 5,
+                    max_sending_block_bytes_override: MIN_BLOCK_BYTES_OVERRIDE,
+                    backpressure_proposal_delay_ms: 300,
                 },
             ],
             window_for_chain_health: 100,
             chain_health_backoff: vec![
                 ChainHealthBackoffValues {
                     backoff_if_below_participating_voting_power_percentage: 80,
-                    max_sending_block_txns_override: 10000,
+                    max_sending_block_txns_after_filtering_override:
+                        MAX_SENDING_BLOCK_TXNS_AFTER_FILTERING,
                     max_sending_block_bytes_override: 5 * 1024 * 1024,
                     backoff_proposal_delay_ms: 150,
-                    max_txns_from_block_to_execute: None,
                 },
                 ChainHealthBackoffValues {
                     backoff_if_below_participating_voting_power_percentage: 78,
-                    max_sending_block_txns_override: 2000,
+                    max_sending_block_txns_after_filtering_override: 2000,
                     max_sending_block_bytes_override: MIN_BLOCK_BYTES_OVERRIDE,
                     backoff_proposal_delay_ms: 300,
-                    max_txns_from_block_to_execute: None,
                 },
                 ChainHealthBackoffValues {
                     backoff_if_below_participating_voting_power_percentage: 76,
-                    max_sending_block_txns_override: 500,
+                    max_sending_block_txns_after_filtering_override: 500,
                     max_sending_block_bytes_override: MIN_BLOCK_BYTES_OVERRIDE,
                     backoff_proposal_delay_ms: 300,
-                    max_txns_from_block_to_execute: None,
                 },
                 ChainHealthBackoffValues {
                     backoff_if_below_participating_voting_power_percentage: 74,
-                    max_sending_block_txns_override: 500,
+                    max_sending_block_txns_after_filtering_override: 100,
                     max_sending_block_bytes_override: MIN_BLOCK_BYTES_OVERRIDE,
-                    backoff_proposal_delay_ms: 500,
-                    max_txns_from_block_to_execute: Some(100),
+                    backoff_proposal_delay_ms: 300,
                 },
                 ChainHealthBackoffValues {
                     backoff_if_below_participating_voting_power_percentage: 72,
-                    max_sending_block_txns_override: 500,
+                    max_sending_block_txns_after_filtering_override: 25,
                     max_sending_block_bytes_override: MIN_BLOCK_BYTES_OVERRIDE,
-                    backoff_proposal_delay_ms: 500,
-                    max_txns_from_block_to_execute: Some(25),
+                    backoff_proposal_delay_ms: 300,
                 },
                 ChainHealthBackoffValues {
                     backoff_if_below_participating_voting_power_percentage: 70,
-                    max_sending_block_txns_override: 500,
-                    max_sending_block_bytes_override: MIN_BLOCK_BYTES_OVERRIDE,
-                    backoff_proposal_delay_ms: 500,
                     // in practice, latencies and delay make it such that ~2 blocks/s is max,
                     // meaning that most aggressively we limit to ~10 TPS
                     // For transactions that are more expensive than that, we should
                     // instead rely on max gas per block to limit latency.
-                    max_txns_from_block_to_execute: Some(5),
+                    max_sending_block_txns_after_filtering_override: 5,
+                    max_sending_block_bytes_override: MIN_BLOCK_BYTES_OVERRIDE,
+                    backoff_proposal_delay_ms: 300,
                 },
             ],
 
@@ -320,6 +351,7 @@ impl Default for ConsensusConfig {
                 backoff_policy_max_delay_ms: 10000,
                 rpc_timeout_ms: 10000,
             },
+            num_bounded_executor_tasks: 16,
         }
     }
 }
@@ -357,12 +389,12 @@ impl ConsensusConfig {
             (
                 config.max_sending_block_txns,
                 config.max_receiving_block_txns,
-                "txns",
+                "send < recv for txns",
             ),
             (
                 config.max_sending_block_bytes,
                 config.max_receiving_block_bytes,
-                "bytes",
+                "send < recv for bytes",
             ),
         ];
         for (send, recv, label) in &send_recv_pairs {
@@ -385,46 +417,41 @@ impl ConsensusConfig {
             (
                 config.quorum_store.receiver_max_batch_txns as u64,
                 config.max_sending_block_txns,
-                "txns".to_string(),
+                "QS recv batch txns < max_sending_block_txns".to_string(),
+            ),
+            (
+                config.quorum_store.receiver_max_batch_txns as u64,
+                config.max_sending_block_txns_after_filtering,
+                "QS recv batch txns < max_sending_block_txns_after_filtering ".to_string(),
+            ),
+            (
+                config.quorum_store.receiver_max_batch_txns as u64,
+                config.min_max_txns_in_block_after_filtering_from_backpressure,
+                "QS recv batch txns < min_max_txns_in_block_after_filtering_from_backpressure"
+                    .to_string(),
             ),
             (
                 config.quorum_store.receiver_max_batch_bytes as u64,
                 config.max_sending_block_bytes,
-                "bytes".to_string(),
+                "QS recv batch bytes < max_sending_block_bytes".to_string(),
             ),
         ];
         for backpressure_values in &config.pipeline_backpressure {
-            recv_batch_send_block_pairs.push((
-                config.quorum_store.receiver_max_batch_txns as u64,
-                backpressure_values.max_sending_block_txns_override,
-                format!(
-                    "backpressure {} ms: txns",
-                    backpressure_values.back_pressure_pipeline_latency_limit_ms,
-                ),
-            ));
             recv_batch_send_block_pairs.push((
                 config.quorum_store.receiver_max_batch_bytes as u64,
                 backpressure_values.max_sending_block_bytes_override,
                 format!(
-                    "backpressure {} ms: bytes",
+                    "backpressure {} ms: QS recv batch bytes < max_sending_block_bytes_override",
                     backpressure_values.back_pressure_pipeline_latency_limit_ms,
                 ),
             ));
         }
         for backoff_values in &config.chain_health_backoff {
-            recv_batch_send_block_pairs.push((
-                config.quorum_store.receiver_max_batch_txns as u64,
-                backoff_values.max_sending_block_txns_override,
-                format!(
-                    "backoff {} %: txns",
-                    backoff_values.backoff_if_below_participating_voting_power_percentage,
-                ),
-            ));
             recv_batch_send_block_pairs.push((
                 config.quorum_store.receiver_max_batch_bytes as u64,
                 backoff_values.max_sending_block_bytes_override,
                 format!(
-                    "backoff {} %: bytes",
+                    "backoff {} %: bytes: QS recv batch bytes < max_sending_block_bytes_override",
                     backoff_values.backoff_if_below_participating_voting_power_percentage,
                 ),
             ));
@@ -634,10 +661,9 @@ mod test {
             consensus: ConsensusConfig {
                 pipeline_backpressure: vec![PipelineBackpressureValues {
                     back_pressure_pipeline_latency_limit_ms: 0,
-                    max_sending_block_txns_override: 350,
+                    max_sending_block_txns_after_filtering_override: 350,
                     max_sending_block_bytes_override: 0,
                     backpressure_proposal_delay_ms: 0,
-                    max_txns_from_block_to_execute: None,
                 }],
                 quorum_store: QuorumStoreConfig {
                     receiver_max_batch_txns: 250,
@@ -665,10 +691,9 @@ mod test {
             consensus: ConsensusConfig {
                 pipeline_backpressure: vec![PipelineBackpressureValues {
                     back_pressure_pipeline_latency_limit_ms: 0,
-                    max_sending_block_txns_override: 251,
+                    max_sending_block_txns_after_filtering_override: 251,
                     max_sending_block_bytes_override: 100,
                     backpressure_proposal_delay_ms: 0,
-                    max_txns_from_block_to_execute: None,
                 }],
                 quorum_store: QuorumStoreConfig {
                     receiver_max_batch_bytes: 2_000_000,
@@ -692,10 +717,9 @@ mod test {
             consensus: ConsensusConfig {
                 chain_health_backoff: vec![ChainHealthBackoffValues {
                     backoff_if_below_participating_voting_power_percentage: 0,
-                    max_sending_block_txns_override: 100,
+                    max_sending_block_txns_after_filtering_override: 100,
                     max_sending_block_bytes_override: 0,
                     backoff_proposal_delay_ms: 0,
-                    max_txns_from_block_to_execute: None,
                 }],
                 quorum_store: QuorumStoreConfig {
                     receiver_max_batch_txns: 251,
@@ -719,10 +743,9 @@ mod test {
             consensus: ConsensusConfig {
                 chain_health_backoff: vec![ChainHealthBackoffValues {
                     backoff_if_below_participating_voting_power_percentage: 0,
-                    max_sending_block_txns_override: 0,
+                    max_sending_block_txns_after_filtering_override: 0,
                     max_sending_block_bytes_override: 100,
                     backoff_proposal_delay_ms: 0,
-                    max_txns_from_block_to_execute: None,
                 }],
                 quorum_store: QuorumStoreConfig {
                     receiver_max_batch_bytes: 2_000_000,
diff --git a/config/src/config/consensus_observer_config.rs b/config/src/config/consensus_observer_config.rs
new file mode 100644
index 0000000000000..d18c0faaca85e
--- /dev/null
+++ b/config/src/config/consensus_observer_config.rs
@@ -0,0 +1,119 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::config::{
+    config_optimizer::ConfigOptimizer, node_config_loader::NodeType, Error, NodeConfig,
+};
+use aptos_types::chain_id::ChainId;
+use serde::{Deserialize, Serialize};
+use serde_yaml::Value;
+
+// Useful constants for enabling consensus observer on different node types
+const ENABLE_ON_VALIDATORS: bool = false;
+const ENABLE_ON_VALIDATOR_FULLNODES: bool = false;
+const ENABLE_ON_PUBLIC_FULLNODES: bool = false;
+
+#[derive(Clone, Copy, Debug, Deserialize, PartialEq, Serialize)]
+#[serde(default, deny_unknown_fields)]
+pub struct ConsensusObserverConfig {
+    /// Whether the consensus observer is enabled
+    pub observer_enabled: bool,
+    /// Whether the consensus observer publisher is enabled
+    pub publisher_enabled: bool,
+
+    /// Maximum number of pending network messages
+    pub max_network_channel_size: u64,
+    /// Maximum number of parallel serialization tasks for message sends
+    pub max_parallel_serialization_tasks: usize,
+    /// Timeout (in milliseconds) for network RPC requests
+    pub network_request_timeout_ms: u64,
+
+    /// Interval (in milliseconds) to garbage collect peer state
+    pub garbage_collection_interval_ms: u64,
+    /// Maximum number of blocks to keep in memory (e.g., pending blocks, ordered blocks, etc.)
+    pub max_num_pending_blocks: u64,
+    /// Maximum timeout (in milliseconds) for active subscriptions
+    pub max_subscription_timeout_ms: u64,
+    /// Maximum timeout (in milliseconds) we'll wait for the synced version to
+    /// increase before terminating the active subscription.
+    pub max_synced_version_timeout_ms: u64,
+    /// Interval (in milliseconds) to check the optimality of the subscribed peers
+    pub peer_optimality_check_interval_ms: u64,
+    /// Interval (in milliseconds) to check progress of the consensus observer
+    pub progress_check_interval_ms: u64,
+}
+
+impl Default for ConsensusObserverConfig {
+    fn default() -> Self {
+        Self {
+            observer_enabled: false,
+            publisher_enabled: false,
+            max_network_channel_size: 1000,
+            max_parallel_serialization_tasks: num_cpus::get(), // Default to the number of CPUs
+            network_request_timeout_ms: 10_000,                // 10 seconds
+            garbage_collection_interval_ms: 60_000,            // 60 seconds
+            max_num_pending_blocks: 100,                       // 100 blocks
+            max_subscription_timeout_ms: 30_000,               // 30 seconds
+            max_synced_version_timeout_ms: 60_000,             // 60 seconds
+            peer_optimality_check_interval_ms: 60_000,         // 60 seconds
+            progress_check_interval_ms: 5_000,                 // 5 seconds
+        }
+    }
+}
+
+impl ConsensusObserverConfig {
+    /// Returns true iff the observer or publisher is enabled
+    pub fn is_observer_or_publisher_enabled(&self) -> bool {
+        self.observer_enabled || self.publisher_enabled
+    }
+}
+
+impl ConfigOptimizer for ConsensusObserverConfig {
+    fn optimize(
+        node_config: &mut NodeConfig,
+        local_config_yaml: &Value,
+        node_type: NodeType,
+        _chain_id: Option<ChainId>,
+    ) -> Result<bool, Error> {
+        let consensus_observer_config = &mut node_config.consensus_observer;
+        let local_observer_config_yaml = &local_config_yaml["consensus_observer"];
+
+        // Check if the observer configs are manually set in the local config.
+        // If they are, we don't want to override them.
+        let observer_manually_set = !local_observer_config_yaml["observer_enabled"].is_null();
+        let publisher_manually_set = !local_observer_config_yaml["publisher_enabled"].is_null();
+
+        // Enable the consensus observer and publisher based on the node type
+        let mut modified_config = false;
+        match node_type {
+            NodeType::Validator => {
+                if ENABLE_ON_VALIDATORS && !publisher_manually_set {
+                    // Only enable the publisher for validators
+                    consensus_observer_config.publisher_enabled = true;
+                    modified_config = true;
+                }
+            },
+            NodeType::ValidatorFullnode => {
+                if ENABLE_ON_VALIDATOR_FULLNODES
+                    && !observer_manually_set
+                    && !publisher_manually_set
+                {
+                    // Enable both the observer and the publisher for VFNs
+                    consensus_observer_config.observer_enabled = true;
+                    consensus_observer_config.publisher_enabled = true;
+                    modified_config = true;
+                }
+            },
+            NodeType::PublicFullnode => {
+                if ENABLE_ON_PUBLIC_FULLNODES && !observer_manually_set {
+                    // Enable both the observer and the publisher for PFNs
+                    consensus_observer_config.observer_enabled = true;
+                    consensus_observer_config.publisher_enabled = true;
+                    modified_config = true;
+                }
+            },
+        }
+
+        Ok(modified_config)
+    }
+}
diff --git a/config/src/config/internal_indexer_db_config.rs b/config/src/config/internal_indexer_db_config.rs
new file mode 100644
index 0000000000000..323d02c090b45
--- /dev/null
+++ b/config/src/config/internal_indexer_db_config.rs
@@ -0,0 +1,87 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::config::{
+    config_sanitizer::ConfigSanitizer, node_config_loader::NodeType, Error, NodeConfig,
+};
+use aptos_types::chain_id::ChainId;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Copy, Debug, Deserialize, PartialEq, Eq, Serialize)]
+#[serde(default, deny_unknown_fields)]
+pub struct InternalIndexerDBConfig {
+    pub enable_transaction: bool,
+    pub enable_event: bool,
+    pub enable_statekeys: bool,
+    pub batch_size: usize,
+}
+
+impl InternalIndexerDBConfig {
+    pub fn new(
+        enable_transaction: bool,
+        enable_event: bool,
+        enable_statekeys: bool,
+        batch_size: usize,
+    ) -> Self {
+        Self {
+            enable_transaction,
+            enable_event,
+            enable_statekeys,
+            batch_size,
+        }
+    }
+
+    pub fn enable_transaction(&self) -> bool {
+        self.enable_transaction
+    }
+
+    pub fn enable_event(&self) -> bool {
+        self.enable_event
+    }
+
+    pub fn enable_statekeys(&self) -> bool {
+        self.enable_statekeys
+    }
+
+    pub fn is_internal_indexer_db_enabled(&self) -> bool {
+        self.enable_transaction || self.enable_event || self.enable_statekeys
+    }
+
+    pub fn batch_size(&self) -> usize {
+        self.batch_size
+    }
+}
+
+impl Default for InternalIndexerDBConfig {
+    fn default() -> Self {
+        Self {
+            enable_transaction: false,
+            enable_event: false,
+            enable_statekeys: false,
+            batch_size: 10_000,
+        }
+    }
+}
+
+impl ConfigSanitizer for InternalIndexerDBConfig {
+    fn sanitize(
+        node_config: &NodeConfig,
+        _node_type: NodeType,
+        _chain_id: Option<ChainId>,
+    ) -> Result<(), Error> {
+        let sanitizer_name = Self::get_sanitizer_name();
+        let config = node_config.indexer_db_config;
+
+        // Shouldn't turn on internal indexer for db without sharding
+        if !node_config.storage.rocksdb_configs.enable_storage_sharding
+            && config.is_internal_indexer_db_enabled()
+        {
+            return Err(Error::ConfigSanitizerFailed(
+                sanitizer_name,
+                "Don't turn on internal indexer db if DB sharding is off".into(),
+            ));
+        }
+
+        Ok(())
+    }
+}
diff --git a/config/src/config/mempool_config.rs b/config/src/config/mempool_config.rs
index 0e5bc02bf0511..637bd34c52afe 100644
--- a/config/src/config/mempool_config.rs
+++ b/config/src/config/mempool_config.rs
@@ -11,6 +11,32 @@ use aptos_types::chain_id::ChainId;
 use serde::{Deserialize, Serialize};
 use serde_yaml::Value;
 
+#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize)]
+#[serde(default, deny_unknown_fields)]
+pub struct LoadBalancingThresholdConfig {
+    /// PFN load balances the traffic to multiple upstream FNs. The PFN calculates the average mempool traffic in TPS received since
+    /// the last peer udpate. If the average received mempool traffic is greater than this threshold, then the below limits are used
+    /// to decide the number of upstream peers to forward the mempool traffic.
+    pub avg_mempool_traffic_threshold_in_tps: u64,
+    /// Suppose the smallest ping latency amongst the connected upstream peers is `x`. If the average received mempool traffic is
+    /// greater than `avg_mempool_traffic_threshold_in_tps`, then the PFN will forward mempool traffic to only those upstream peers
+    /// with ping latency less than `x + latency_slack_between_top_upstream_peers`.
+    pub latency_slack_between_top_upstream_peers: u64,
+    /// If the average received mempool traffic is greater than avg_mempool_traffic_threshold_in_tps, then PFNs will forward to at most
+    /// `max_number_of_upstream_peers` upstream FNs.
+    pub max_number_of_upstream_peers: u8,
+}
+
+impl Default for LoadBalancingThresholdConfig {
+    fn default() -> LoadBalancingThresholdConfig {
+        LoadBalancingThresholdConfig {
+            avg_mempool_traffic_threshold_in_tps: 0,
+            latency_slack_between_top_upstream_peers: 50,
+            max_number_of_upstream_peers: 1,
+        }
+    }
+}
+
 #[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize)]
 #[serde(default, deny_unknown_fields)]
 pub struct MempoolConfig {
@@ -46,6 +72,8 @@ pub struct MempoolConfig {
     pub shared_mempool_peer_update_interval_ms: u64,
     /// Interval to update peer priorities in shared mempool (seconds).
     pub shared_mempool_priority_update_interval_secs: u64,
+    /// The amount of time to wait after transaction insertion to broadcast to a failover peer.
+    pub shared_mempool_failover_delay_ms: u64,
     /// Number of seconds until the transaction will be removed from the Mempool ignoring if the transaction has expired.
     ///
     /// This ensures that the Mempool isn't just full of non-expiring transactions that are way off into the future.
@@ -58,6 +86,20 @@ pub struct MempoolConfig {
     pub broadcast_buckets: Vec<u64>,
     pub eager_expire_threshold_ms: Option<u64>,
     pub eager_expire_time_ms: u64,
+    /// Uses the BroadcastTransactionsRequestWithReadyTime instead of BroadcastTransactionsRequest when sending
+    /// mempool transactions to upstream nodes.
+    pub include_ready_time_in_broadcast: bool,
+    pub usecase_stats_num_blocks_to_track: usize,
+    pub usecase_stats_num_top_to_track: usize,
+    /// We divide the transactions into buckets based on hash of the sender address.
+    /// This is the number of sender buckets we use.
+    pub num_sender_buckets: u8,
+    /// Load balancing configuration for the mempool. This is used only by PFNs.
+    pub load_balancing_thresholds: Vec<LoadBalancingThresholdConfig>,
+    /// When the load is low, PFNs send all the mempool traffic to only one upstream FN. When the load increases suddenly, PFNs will take
+    /// up to 10 minutes (shared_mempool_priority_update_interval_secs) to enable the load balancing. If this flag is enabled,
+    /// then the PFNs will always do load balancing irrespective of the load.
+    pub enable_max_load_balancing_at_any_load: bool,
 }
 
 impl Default for MempoolConfig {
@@ -79,11 +121,49 @@ impl Default for MempoolConfig {
             enable_intelligent_peer_prioritization: true,
             shared_mempool_peer_update_interval_ms: 1_000,
             shared_mempool_priority_update_interval_secs: 600, // 10 minutes (frequent reprioritization is expensive)
+            shared_mempool_failover_delay_ms: 500,
             system_transaction_timeout_secs: 600,
             system_transaction_gc_interval_ms: 60_000,
             broadcast_buckets: DEFAULT_BUCKETS.to_vec(),
-            eager_expire_threshold_ms: Some(10_000),
-            eager_expire_time_ms: 3_000,
+            eager_expire_threshold_ms: Some(15_000),
+            eager_expire_time_ms: 6_000,
+            include_ready_time_in_broadcast: false,
+            usecase_stats_num_blocks_to_track: 40,
+            usecase_stats_num_top_to_track: 5,
+            num_sender_buckets: 4,
+            load_balancing_thresholds: vec![
+                LoadBalancingThresholdConfig {
+                    avg_mempool_traffic_threshold_in_tps: 500,
+                    latency_slack_between_top_upstream_peers: 50,
+                    max_number_of_upstream_peers: 2,
+                },
+                LoadBalancingThresholdConfig {
+                    avg_mempool_traffic_threshold_in_tps: 1000,
+                    latency_slack_between_top_upstream_peers: 50,
+                    max_number_of_upstream_peers: 3,
+                },
+                LoadBalancingThresholdConfig {
+                    avg_mempool_traffic_threshold_in_tps: 1500,
+                    latency_slack_between_top_upstream_peers: 75,
+                    max_number_of_upstream_peers: 4,
+                },
+                LoadBalancingThresholdConfig {
+                    avg_mempool_traffic_threshold_in_tps: 2500,
+                    latency_slack_between_top_upstream_peers: 100,
+                    max_number_of_upstream_peers: 5,
+                },
+                LoadBalancingThresholdConfig {
+                    avg_mempool_traffic_threshold_in_tps: 3500,
+                    latency_slack_between_top_upstream_peers: 125,
+                    max_number_of_upstream_peers: 6,
+                },
+                LoadBalancingThresholdConfig {
+                    avg_mempool_traffic_threshold_in_tps: 4500,
+                    latency_slack_between_top_upstream_peers: 150,
+                    max_number_of_upstream_peers: 7,
+                },
+            ],
+            enable_max_load_balancing_at_any_load: false,
         }
     }
 }
@@ -121,6 +201,11 @@ impl ConfigOptimizer for MempoolConfig {
                 mempool_config.shared_mempool_batch_size = 200;
                 modified_config = true;
             }
+            // Set the number of sender buckets for load balancing to 1 (default is 4)
+            if local_mempool_config_yaml["num_sender_buckets"].is_null() {
+                mempool_config.num_sender_buckets = 1;
+                modified_config = true;
+            }
         }
         if node_type.is_validator_fullnode() {
             // Set the shared_mempool_max_concurrent_inbound_syncs to 16 (default is 4)
@@ -134,6 +219,12 @@ impl ConfigOptimizer for MempoolConfig {
                 mempool_config.default_failovers = 0;
                 modified_config = true;
             }
+
+            // Set the number of sender buckets for load balancing to 1 (default is 4)
+            if local_mempool_config_yaml["num_sender_buckets"].is_null() {
+                mempool_config.num_sender_buckets = 1;
+                modified_config = true;
+            }
         }
 
         Ok(modified_config)
diff --git a/config/src/config/mod.rs b/config/src/config/mod.rs
index 2ed9087a7b6d9..bc67df4381f09 100644
--- a/config/src/config/mod.rs
+++ b/config/src/config/mod.rs
@@ -9,6 +9,7 @@ mod base_config;
 mod config_optimizer;
 mod config_sanitizer;
 mod consensus_config;
+mod consensus_observer_config;
 mod dag_consensus_config;
 mod dkg_config;
 mod error;
@@ -19,6 +20,7 @@ mod indexer_config;
 mod indexer_grpc_config;
 mod indexer_table_info_config;
 mod inspection_service_config;
+pub mod internal_indexer_db_config;
 mod jwk_consensus_config;
 mod logger_config;
 mod mempool_config;
@@ -27,7 +29,6 @@ mod network_config;
 mod node_config;
 mod node_config_loader;
 mod node_startup_config;
-mod observer_config;
 mod override_node_config;
 mod peer_monitoring_config;
 mod persistable_config;
@@ -44,6 +45,7 @@ pub use admin_service_config::*;
 pub use api_config::*;
 pub use base_config::*;
 pub use consensus_config::*;
+pub use consensus_observer_config::*;
 pub use dag_consensus_config::*;
 pub use error::*;
 pub use execution_config::*;
@@ -58,7 +60,7 @@ pub use mempool_config::*;
 pub use netbench_config::*;
 pub use network_config::*;
 pub use node_config::*;
-pub use node_config_loader::sanitize_node_config;
+pub use node_config_loader::{sanitize_node_config, NodeType};
 pub use override_node_config::*;
 pub use peer_monitoring_config::*;
 pub use persistable_config::*;
diff --git a/config/src/config/network_config.rs b/config/src/config/network_config.rs
index aa69c13453b88..8ecd0964a6723 100644
--- a/config/src/config/network_config.rs
+++ b/config/src/config/network_config.rs
@@ -40,7 +40,6 @@ pub const PING_INTERVAL_MS: u64 = 10_000;
 pub const PING_TIMEOUT_MS: u64 = 20_000;
 pub const PING_FAILURES_TOLERATED: u64 = 3;
 pub const CONNECTIVITY_CHECK_INTERVAL_MS: u64 = 5000;
-pub const MAX_CONCURRENT_NETWORK_REQS: usize = 100;
 pub const MAX_CONNECTION_DELAY_MS: u64 = 60_000; /* 1 minute */
 pub const MAX_FULLNODE_OUTBOUND_CONNECTIONS: usize = 6;
 pub const MAX_INBOUND_CONNECTIONS: usize = 100;
@@ -65,8 +64,6 @@ pub struct NetworkConfig {
     pub connectivity_check_interval_ms: u64,
     /// Size of all network channels
     pub network_channel_size: usize,
-    /// Maximum number of concurrent network requests
-    pub max_concurrent_network_reqs: usize,
     /// Choose a protocol to discover and dial out to other peers on this network.
     /// `DiscoveryMethod::None` disables discovery and dialing out (unless you have
     /// seed peers configured).
@@ -153,7 +150,6 @@ impl NetworkConfig {
             max_connection_delay_ms: MAX_CONNECTION_DELAY_MS,
             connectivity_check_interval_ms: CONNECTIVITY_CHECK_INTERVAL_MS,
             network_channel_size: NETWORK_CHANNEL_SIZE,
-            max_concurrent_network_reqs: MAX_CONCURRENT_NETWORK_REQS,
             connection_backoff_base: CONNECTION_BACKOFF_BASE,
             ping_interval_ms: PING_INTERVAL_MS,
             ping_timeout_ms: PING_TIMEOUT_MS,
diff --git a/config/src/config/node_config.rs b/config/src/config/node_config.rs
index 008343fb53896..f124dee3b2a33 100644
--- a/config/src/config/node_config.rs
+++ b/config/src/config/node_config.rs
@@ -4,9 +4,10 @@
 use super::{DagConsensusConfig, IndexerTableInfoConfig};
 use crate::{
     config::{
-        dkg_config::DKGConfig, jwk_consensus_config::JWKConsensusConfig,
-        netbench_config::NetbenchConfig, node_config_loader::NodeConfigLoader,
-        node_startup_config::NodeStartupConfig, observer_config::ObserverConfig,
+        consensus_observer_config::ConsensusObserverConfig, dkg_config::DKGConfig,
+        internal_indexer_db_config::InternalIndexerDBConfig,
+        jwk_consensus_config::JWKConsensusConfig, netbench_config::NetbenchConfig,
+        node_config_loader::NodeConfigLoader, node_startup_config::NodeStartupConfig,
         persistable_config::PersistableConfig, utils::RootPath, AdminServiceConfig, ApiConfig,
         BaseConfig, ConsensusConfig, Error, ExecutionConfig, IndexerConfig, IndexerGrpcConfig,
         InspectionServiceConfig, LoggerConfig, MempoolConfig, NetworkConfig,
@@ -42,7 +43,7 @@ pub struct NodeConfig {
     #[serde(default)]
     pub consensus: ConsensusConfig,
     #[serde(default)]
-    pub consensus_observer: ObserverConfig,
+    pub consensus_observer: ConsensusObserverConfig,
     #[serde(default)]
     pub dag_consensus: DagConsensusConfig,
     #[serde(default)]
@@ -83,6 +84,8 @@ pub struct NodeConfig {
     pub storage: StorageConfig,
     #[serde(default)]
     pub validator_network: Option<NetworkConfig>,
+    #[serde(default)]
+    pub indexer_db_config: InternalIndexerDBConfig,
 }
 
 impl NodeConfig {
@@ -121,7 +124,7 @@ impl NodeConfig {
     /// Sets the data directory for this config
     pub fn set_data_dir(&mut self, data_dir: PathBuf) {
         // Set the base directory
-        self.base.data_dir = data_dir.clone();
+        self.base.data_dir.clone_from(&data_dir);
 
         // Set the data directory for each sub-module
         self.consensus.set_data_dir(data_dir.clone());
diff --git a/config/src/config/observer_config.rs b/config/src/config/observer_config.rs
deleted file mode 100644
index 6fa55707de52b..0000000000000
--- a/config/src/config/observer_config.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-use serde::{Deserialize, Serialize};
-
-#[derive(Default, Clone, Debug, Deserialize, PartialEq, Serialize)]
-#[serde(default, deny_unknown_fields)]
-pub struct ObserverConfig {
-    pub observer_enabled: bool,
-    pub publisher_enabled: bool,
-}
diff --git a/config/src/config/quorum_store_config.rs b/config/src/config/quorum_store_config.rs
index b3f98462c3e64..c17ab0690ea41 100644
--- a/config/src/config/quorum_store_config.rs
+++ b/config/src/config/quorum_store_config.rs
@@ -10,6 +10,7 @@ use serde::{Deserialize, Serialize};
 use std::time::Duration;
 
 pub const BATCH_PADDING_BYTES: usize = 160;
+pub const DEFEAULT_MAX_BATCH_TXNS: usize = 250;
 const DEFAULT_MAX_NUM_BATCHES: usize = 20;
 
 #[derive(Clone, Copy, Debug, Deserialize, PartialEq, Serialize)]
@@ -22,6 +23,7 @@ pub struct QuorumStoreBackPressureConfig {
     pub decrease_fraction: f64,
     pub dynamic_min_txn_per_s: u64,
     pub dynamic_max_txn_per_s: u64,
+    pub additive_increase_when_no_backpressure: u64,
 }
 
 impl Default for QuorumStoreBackPressureConfig {
@@ -29,14 +31,17 @@ impl Default for QuorumStoreBackPressureConfig {
         QuorumStoreBackPressureConfig {
             // QS will be backpressured if the remaining total txns is more than this number
             // Roughly, target TPS * commit latency seconds
-            backlog_txn_limit_count: 12_000,
+            backlog_txn_limit_count: 36_000,
             // QS will create batches at the max rate until this number is reached
-            backlog_per_validator_batch_limit_count: 4,
+            backlog_per_validator_batch_limit_count: 20,
             decrease_duration_ms: 1000,
             increase_duration_ms: 1000,
             decrease_fraction: 0.5,
             dynamic_min_txn_per_s: 160,
-            dynamic_max_txn_per_s: 2000,
+            dynamic_max_txn_per_s: 12000,
+            // When the QS is no longer backpressured, we increase number of txns to be pulled from mempool
+            // by this amount every second until we reach dynamic_max_txn_per_s
+            additive_increase_when_no_backpressure: 2000,
         }
     }
 }
@@ -49,15 +54,32 @@ pub struct QuorumStoreConfig {
     pub batch_generation_poll_interval_ms: usize,
     pub batch_generation_min_non_empty_interval_ms: usize,
     pub batch_generation_max_interval_ms: usize,
+    /// The maximum number of transactions that the batch generator puts in a batch.
     pub sender_max_batch_txns: usize,
+    /// The maximum number of bytes that the batch generator puts in a batch.
     pub sender_max_batch_bytes: usize,
+    /// The maximum number of batches that the batch generator creates every time it pull transactions
+    /// from the mempool. This is NOT the maximum number of batches that the batch generator can create
+    /// per second.
     pub sender_max_num_batches: usize,
+    /// The maximum number of transactions that the batch generator pulls from the mempool at a time.
+    /// After the transactions are pulled, the batch generator splits them into multiple batches. This is NOT
+    /// the maximum number of transactions the batch generator includes in batches per second.
     pub sender_max_total_txns: usize,
+    /// The maximum number of bytes that the batch generator pulls from the mempool at a time. This is NOT
+    /// the maximum number of bytes the batch generator includes in batches per second.
     pub sender_max_total_bytes: usize,
+    /// The maximum number of transactions a single batch received from peers could contain.
     pub receiver_max_batch_txns: usize,
+    /// The maximum number of bytes a single batch received from peers could contain.
     pub receiver_max_batch_bytes: usize,
+    /// The maximum number of batches a BatchMsg received from peers can contain.
     pub receiver_max_num_batches: usize,
+    /// The maximum number of transactions a BatchMsg received from peers can contain. Each BatchMsg can contain
+    /// multiple batches.
     pub receiver_max_total_txns: usize,
+    /// The maximum number of bytes a BatchMsg received from peers can contain. Each BatchMsg can contain
+    /// multiple batches.
     pub receiver_max_total_bytes: usize,
     pub batch_request_num_peers: usize,
     pub batch_request_retry_limit: usize,
@@ -74,6 +96,7 @@ pub struct QuorumStoreConfig {
     pub num_workers_for_remote_batches: usize,
     pub batch_buckets: Vec<u64>,
     pub allow_batches_without_pos_in_proposal: bool,
+    pub enable_opt_quorum_store: bool,
 }
 
 impl Default for QuorumStoreConfig {
@@ -82,9 +105,9 @@ impl Default for QuorumStoreConfig {
             channel_size: 1000,
             proof_timeout_ms: 10000,
             batch_generation_poll_interval_ms: 25,
-            batch_generation_min_non_empty_interval_ms: 200,
+            batch_generation_min_non_empty_interval_ms: 100,
             batch_generation_max_interval_ms: 250,
-            sender_max_batch_txns: 250,
+            sender_max_batch_txns: DEFEAULT_MAX_BATCH_TXNS,
             // TODO: on next release, remove BATCH_PADDING_BYTES
             sender_max_batch_bytes: 1024 * 1024 - BATCH_PADDING_BYTES,
             sender_max_num_batches: DEFAULT_MAX_NUM_BATCHES,
@@ -112,6 +135,7 @@ impl Default for QuorumStoreConfig {
             num_workers_for_remote_batches: 10,
             batch_buckets: DEFAULT_BUCKETS.to_vec(),
             allow_batches_without_pos_in_proposal: true,
+            enable_opt_quorum_store: false,
         }
     }
 }
diff --git a/config/src/config/state_sync_config.rs b/config/src/config/state_sync_config.rs
index cbad726bb770e..50ad7605d3eca 100644
--- a/config/src/config/state_sync_config.rs
+++ b/config/src/config/state_sync_config.rs
@@ -11,13 +11,13 @@ use serde::{Deserialize, Serialize};
 use serde_yaml::Value;
 
 // The maximum message size per state sync message
-const MAX_MESSAGE_SIZE: usize = 4 * 1024 * 1024; /* 4 MiB */
+const MAX_MESSAGE_SIZE: usize = 6 * 1024 * 1024; /* 6 MiB */
 
 // The maximum chunk sizes for data client requests and response
 const MAX_EPOCH_CHUNK_SIZE: u64 = 200;
 const MAX_STATE_CHUNK_SIZE: u64 = 4000;
-const MAX_TRANSACTION_CHUNK_SIZE: u64 = 2000;
-const MAX_TRANSACTION_OUTPUT_CHUNK_SIZE: u64 = 1000;
+const MAX_TRANSACTION_CHUNK_SIZE: u64 = 3000;
+const MAX_TRANSACTION_OUTPUT_CHUNK_SIZE: u64 = 3000;
 
 // The maximum number of concurrent requests to send
 const MAX_CONCURRENT_REQUESTS: u64 = 6;
@@ -120,8 +120,6 @@ pub struct StateSyncDriverConfig {
     pub max_stream_wait_time_ms: u64,
     /// The version lag we'll tolerate before snapshot syncing
     pub num_versions_to_skip_snapshot_sync: u64,
-    /// Whether consensus observer mode is enabled
-    pub observer_enabled: bool,
 }
 
 /// The default state sync driver config will be the one that gets (and keeps)
@@ -142,7 +140,6 @@ impl Default for StateSyncDriverConfig {
             max_pending_mempool_notifications: 100,
             max_stream_wait_time_ms: 5000,
             num_versions_to_skip_snapshot_sync: 100_000_000, // At 5k TPS, this allows a node to fail for about 6 hours.
-            observer_enabled: false,
         }
     }
 }
diff --git a/config/src/config/storage_config.rs b/config/src/config/storage_config.rs
index 54f8d4570bd5b..493a012240abb 100644
--- a/config/src/config/storage_config.rs
+++ b/config/src/config/storage_config.rs
@@ -6,22 +6,23 @@ use crate::{
     config::{config_sanitizer::ConfigSanitizer, node_config_loader::NodeType, Error, NodeConfig},
     utils,
 };
-use anyhow::{ensure, Result};
+use anyhow::{bail, ensure, Result};
 use aptos_logger::warn;
 use aptos_types::chain_id::ChainId;
 use arr_macro::arr;
-use number_range::NumberRangeOptions;
 use serde::{Deserialize, Serialize};
 use std::{
     collections::HashMap,
     net::{IpAddr, Ipv4Addr, SocketAddr},
     path::{Path, PathBuf},
+    str::FromStr,
 };
 
 // Lru cache will consume about 2G RAM based on this default value.
 pub const DEFAULT_MAX_NUM_NODES_PER_LRU_CACHE_SHARD: usize = 1 << 13;
 
 pub const BUFFERED_STATE_TARGET_ITEMS: usize = 100_000;
+pub const BUFFERED_STATE_TARGET_ITEMS_FOR_TEST: usize = 10;
 
 #[derive(Clone, Debug, Default, Deserialize, PartialEq, Eq, Serialize)]
 #[serde(default, deny_unknown_fields)]
@@ -49,11 +50,7 @@ impl ShardedDbPathConfig {
     pub fn get_shard_paths(&self) -> Result<HashMap<u8, PathBuf>> {
         let mut result = HashMap::new();
         for shard_path in &self.shard_paths {
-            let shard_ids = NumberRangeOptions::<u8>::new()
-                .with_list_sep(',')
-                .with_range_sep('-')
-                .parse(shard_path.shards.as_str())?
-                .collect::<Vec<u8>>();
+            let shard_ids = Self::parse(shard_path.shards.as_str())?;
             let path = &shard_path.path;
             ensure!(
                 path.is_absolute(),
@@ -74,6 +71,31 @@ impl ShardedDbPathConfig {
 
         Ok(result)
     }
+
+    fn parse(path: &str) -> Result<Vec<u8>> {
+        let mut shard_ids = vec![];
+        for p in path.split(',') {
+            let num_or_range: Vec<&str> = p.split('-').collect();
+            match num_or_range.len() {
+                1 => {
+                    let num = u8::from_str(num_or_range[0])?;
+                    ensure!(num < 16);
+                    shard_ids.push(num);
+                },
+                2 => {
+                    let range_start = u8::from_str(num_or_range[0])?;
+                    let range_end = u8::from_str(num_or_range[1])?;
+                    ensure!(range_start <= range_end && range_end < 16);
+                    for num in range_start..=range_end {
+                        shard_ids.push(num);
+                    }
+                },
+                _ => bail!("Invalid path: {path}."),
+            }
+        }
+
+        Ok(shard_ids)
+    }
 }
 
 /// Port selected RocksDB options for tuning underlying rocksdb instance of AptosDB.
@@ -344,7 +366,9 @@ impl StorageConfig {
         let mut state_merkle_db_paths = ShardedDbPaths::default();
 
         if let Some(db_path_overrides) = self.db_path_overrides.as_ref() {
-            ledger_db_path = db_path_overrides.ledger_db_path.clone();
+            db_path_overrides
+                .ledger_db_path
+                .clone_into(&mut ledger_db_path);
 
             if let Some(state_kv_db_path) = db_path_overrides.state_kv_db_path.as_ref() {
                 state_kv_db_paths = ShardedDbPaths::new(state_kv_db_path);
diff --git a/config/src/generator.rs b/config/src/generator.rs
index 7fc4aa9f53018..0035830f70bc4 100644
--- a/config/src/generator.rs
+++ b/config/src/generator.rs
@@ -47,7 +47,7 @@ pub fn validator_swarm(
     let seeds = build_seed_for_network(seed_config, PeerRole::Validator);
     for node in &mut nodes {
         let network = node.validator_network.as_mut().unwrap();
-        network.seeds = seeds.clone();
+        network.seeds.clone_from(&seeds);
     }
 
     nodes.sort_by(|a, b| {
diff --git a/config/src/network_id.rs b/config/src/network_id.rs
index bbdf8b0cd80fd..4fd7ea23a36d6 100644
--- a/config/src/network_id.rs
+++ b/config/src/network_id.rs
@@ -115,6 +115,7 @@ impl<'de> Deserialize<'de> for NetworkId {
         enum ConvertNetworkId {
             Validator,
             Public,
+            #[allow(dead_code)]
             Private(String),
             // These are here for migration, since both need to have their representation changed
             // in the 2nd step of migration, we can move to these identifiers
diff --git a/config/src/utils.rs b/config/src/utils.rs
index fe68ff87b6eef..65b5dd443a791 100644
--- a/config/src/utils.rs
+++ b/config/src/utils.rs
@@ -164,6 +164,7 @@ fn open_counter_file() -> PortCounterFiles {
                 .read(true)
                 .write(true)
                 .create(true)
+                .truncate(false)
                 .open(counter_path())
             {
                 Ok(counter_file) => return PortCounterFiles::new(counter_file, lock_file),
diff --git a/consensus/Cargo.toml b/consensus/Cargo.toml
index 79743080f4017..919ea6da34c36 100644
--- a/consensus/Cargo.toml
+++ b/consensus/Cargo.toml
@@ -36,6 +36,7 @@ aptos-logger = { workspace = true }
 aptos-mempool = { workspace = true }
 aptos-metrics-core = { workspace = true }
 aptos-network = { workspace = true }
+aptos-peer-monitoring-service-types = { workspace = true }
 aptos-reliable-broadcast = { workspace = true }
 aptos-runtimes = { workspace = true }
 aptos-safety-rules = { workspace = true }
@@ -61,6 +62,7 @@ futures = { workspace = true }
 futures-channel = { workspace = true }
 hex = { workspace = true }
 itertools = { workspace = true }
+lru = { workspace = true }
 maplit = { workspace = true }
 mini-moka = { workspace = true }
 mirai-annotations = { workspace = true }
@@ -68,6 +70,7 @@ move-core-types = { workspace = true }
 num-derive = { workspace = true }
 num-traits = { workspace = true }
 once_cell = { workspace = true }
+ordered-float = { workspace = true }
 rand = { workspace = true }
 rayon = { workspace = true }
 scopeguard = { workspace = true }
@@ -80,6 +83,7 @@ strum_macros = { workspace = true }
 thiserror = { workspace = true }
 tokio = { workspace = true }
 tokio-retry = { workspace = true }
+tokio-stream = { workspace = true }
 
 [dev-dependencies]
 aptos-cached-packages = { workspace = true }
@@ -93,8 +97,10 @@ aptos-safety-rules = { workspace = true, features = ["testing"] }
 aptos-vm = { workspace = true, features = ["fuzzing"] }
 aptos-vm-validator = { workspace = true }
 claims = { workspace = true }
+mockall = { workspace = true }
 move-core-types = { workspace = true }
 proptest = { workspace = true }
+proptest-derive = { workspace = true }
 tempfile = { workspace = true }
 
 [features]
@@ -111,3 +117,6 @@ failpoints = ["fail/failpoints"]
 
 [package.metadata.cargo-machete]
 ignored = ["serde_bytes"]
+
+[lints.clippy]
+unwrap_used = "deny"
diff --git a/consensus/consensus-types/Cargo.toml b/consensus/consensus-types/Cargo.toml
index 3d78e0c65cc45..097da10ad0369 100644
--- a/consensus/consensus-types/Cargo.toml
+++ b/consensus/consensus-types/Cargo.toml
@@ -23,6 +23,7 @@ aptos-logger = { workspace = true }
 aptos-short-hex-str = { workspace = true }
 aptos-types = { workspace = true }
 bcs = { workspace = true }
+fail = { workspace = true }
 futures = { workspace = true }
 itertools = { workspace = true }
 mini-moka = { workspace = true }
@@ -41,4 +42,5 @@ serde_json = { workspace = true }
 
 [features]
 default = []
+failpoints = ["fail/failpoints"]
 fuzzing = ["proptest", "aptos-types/fuzzing", "aptos-crypto/fuzzing"]
diff --git a/consensus/consensus-types/src/block.rs b/consensus/consensus-types/src/block.rs
index 392eb2b277f5a..e6ad6c6c15a66 100644
--- a/consensus/consensus-types/src/block.rs
+++ b/consensus/consensus-types/src/block.rs
@@ -116,6 +116,9 @@ impl Block {
                 Payload::QuorumStoreInlineHybrid(inline_batches, proof_with_data, _) => {
                     inline_batches.len() + proof_with_data.proofs.len()
                 },
+                Payload::OptQuorumStore(opt_quorum_store_payload) => {
+                    opt_quorum_store_payload.num_txns()
+                },
             },
         }
     }
@@ -495,7 +498,7 @@ impl Block {
                         )
                     })
             })
-            .map(|index| u32::try_from(index).unwrap())
+            .map(|index| u32::try_from(index).expect("Index is out of bounds for u32"))
             .collect()
     }
 }
diff --git a/consensus/consensus-types/src/block_retrieval.rs b/consensus/consensus-types/src/block_retrieval.rs
index 89e9ca0121fc9..f773a92d9e9a0 100644
--- a/consensus/consensus-types/src/block_retrieval.rs
+++ b/consensus/consensus-types/src/block_retrieval.rs
@@ -117,8 +117,10 @@ impl BlockRetrievalResponse {
         );
         ensure!(
             self.status != BlockRetrievalStatus::SucceededWithTarget
-                || (!self.blocks.is_empty()
-                    && retrieval_request.match_target_id(self.blocks.last().unwrap().id())),
+                || self
+                    .blocks
+                    .last()
+                    .map_or(false, |block| retrieval_request.match_target_id(block.id())),
             "target not found in blocks returned, expect {:?}",
             retrieval_request.target_block_id(),
         );
diff --git a/consensus/consensus-types/src/common.rs b/consensus/consensus-types/src/common.rs
index 4d0be0f31de79..fdbce2e0d4558 100644
--- a/consensus/consensus-types/src/common.rs
+++ b/consensus/consensus-types/src/common.rs
@@ -2,7 +2,11 @@
 // Parts of the project are originally copyright © Meta Platforms, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::proof_of_store::{BatchInfo, ProofCache, ProofOfStore};
+use crate::{
+    payload::{OptQuorumStorePayload, PayloadExecutionLimit},
+    proof_of_store::{BatchInfo, ProofCache, ProofOfStore},
+};
+use anyhow::bail;
 use aptos_crypto::{
     hash::{CryptoHash, CryptoHasher},
     HashValue,
@@ -18,7 +22,12 @@ use aptos_types::{
 use once_cell::sync::OnceCell;
 use rayon::prelude::*;
 use serde::{Deserialize, Serialize};
-use std::{collections::HashSet, fmt, fmt::Write, sync::Arc};
+use std::{
+    collections::HashSet,
+    fmt::{self, Write},
+    sync::Arc,
+    u64,
+};
 use tokio::sync::oneshot;
 
 /// The round of a block is a consensus-internal counter, which starts with 0 and increases
@@ -51,6 +60,36 @@ impl fmt::Display for TransactionSummary {
     }
 }
 
+#[derive(Clone, Copy, Debug, Eq, PartialEq, Deserialize, Serialize, Hash, Ord, PartialOrd)]
+pub struct TxnSummaryWithExpiration {
+    pub sender: AccountAddress,
+    pub sequence_number: u64,
+    pub expiration_timestamp_secs: u64,
+    pub hash: HashValue,
+}
+
+impl TxnSummaryWithExpiration {
+    pub fn new(
+        sender: AccountAddress,
+        sequence_number: u64,
+        expiration_timestamp_secs: u64,
+        hash: HashValue,
+    ) -> Self {
+        Self {
+            sender,
+            sequence_number,
+            expiration_timestamp_secs,
+            hash,
+        }
+    }
+}
+
+impl fmt::Display for TxnSummaryWithExpiration {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}:{}", self.sender, self.sequence_number,)
+    }
+}
+
 #[derive(Clone)]
 pub struct TransactionInProgress {
     pub gas_unit_price: u64,
@@ -135,6 +174,11 @@ impl ProofWithData {
         }
     }
 
+    pub fn empty() -> Self {
+        Self::new(vec![])
+    }
+
+    #[allow(clippy::unwrap_used)]
     pub fn extend(&mut self, other: ProofWithData) {
         let other_data_status = other.status.lock().as_mut().unwrap().take();
         self.proofs.extend(other.proofs);
@@ -168,7 +212,7 @@ impl ProofWithData {
 #[derive(Deserialize, Serialize, Clone, Debug)]
 pub struct ProofWithDataWithTxnLimit {
     pub proof_with_data: ProofWithData,
-    pub max_txns_to_execute: Option<usize>,
+    pub max_txns_to_execute: Option<u64>,
 }
 
 impl PartialEq for ProofWithDataWithTxnLimit {
@@ -181,7 +225,7 @@ impl PartialEq for ProofWithDataWithTxnLimit {
 impl Eq for ProofWithDataWithTxnLimit {}
 
 impl ProofWithDataWithTxnLimit {
-    pub fn new(proof_with_data: ProofWithData, max_txns_to_execute: Option<usize>) -> Self {
+    pub fn new(proof_with_data: ProofWithData, max_txns_to_execute: Option<u64>) -> Self {
         Self {
             proof_with_data,
             max_txns_to_execute,
@@ -197,7 +241,7 @@ impl ProofWithDataWithTxnLimit {
     }
 }
 
-fn sum_max_txns_to_execute(m1: Option<usize>, m2: Option<usize>) -> Option<usize> {
+fn sum_max_txns_to_execute(m1: Option<u64>, m2: Option<u64>) -> Option<u64> {
     match (m1, m2) {
         (None, _) => m2,
         (_, None) => m1,
@@ -214,12 +258,13 @@ pub enum Payload {
     QuorumStoreInlineHybrid(
         Vec<(BatchInfo, Vec<SignedTransaction>)>,
         ProofWithData,
-        Option<usize>,
+        Option<u64>,
     ),
+    OptQuorumStore(OptQuorumStorePayload),
 }
 
 impl Payload {
-    pub fn transform_to_quorum_store_v2(self, max_txns_to_execute: Option<usize>) -> Self {
+    pub fn transform_to_quorum_store_v2(self, max_txns_to_execute: Option<u64>) -> Self {
         match self {
             Payload::InQuorumStore(proof_with_status) => Payload::InQuorumStoreWithLimit(
                 ProofWithDataWithTxnLimit::new(proof_with_status, max_txns_to_execute),
@@ -237,6 +282,12 @@ impl Payload {
             Payload::DirectMempool(_) => {
                 panic!("Payload is in direct mempool format");
             },
+            Payload::OptQuorumStore(mut opt_qs_payload) => {
+                opt_qs_payload.set_execution_limit(PayloadExecutionLimit::max_txns_to_execute(
+                    max_txns_to_execute,
+                ));
+                Payload::OptQuorumStore(opt_qs_payload)
+            },
         }
     }
 
@@ -268,6 +319,33 @@ impl Payload {
                         .map(|(_, txns)| txns.len())
                         .sum::<usize>()
             },
+            Payload::OptQuorumStore(opt_qs_payload) => opt_qs_payload.num_txns(),
+        }
+    }
+
+    pub fn len_for_execution(&self) -> u64 {
+        match self {
+            Payload::DirectMempool(txns) => txns.len() as u64,
+            Payload::InQuorumStore(proof_with_status) => proof_with_status.len() as u64,
+            Payload::InQuorumStoreWithLimit(proof_with_status) => {
+                // here we return the actual length of the payload; limit is considered at the stage
+                // where we prepare the block from the payload
+                (proof_with_status.proof_with_data.len() as u64)
+                    .min(proof_with_status.max_txns_to_execute.unwrap_or(u64::MAX))
+            },
+            Payload::QuorumStoreInlineHybrid(
+                inline_batches,
+                proof_with_data,
+                max_txns_to_execute,
+            ) => ((proof_with_data.len()
+                + inline_batches
+                    .iter()
+                    .map(|(_, txns)| txns.len())
+                    .sum::<usize>()) as u64)
+                .min(max_txns_to_execute.unwrap_or(u64::MAX)),
+            Payload::OptQuorumStore(opt_qs_payload) => {
+                opt_qs_payload.max_txns_to_execute().unwrap_or(u64::MAX)
+            },
         }
     }
 
@@ -281,6 +359,7 @@ impl Payload {
             Payload::QuorumStoreInlineHybrid(inline_batches, proof_with_data, _) => {
                 proof_with_data.proofs.is_empty() && inline_batches.is_empty()
             },
+            Payload::OptQuorumStore(opt_qs_payload) => opt_qs_payload.is_empty(),
         }
     }
 
@@ -338,6 +417,28 @@ impl Payload {
                 p3.extend(p2);
                 Payload::QuorumStoreInlineHybrid(b2, p3, m3)
             },
+            (
+                Payload::QuorumStoreInlineHybrid(inline_batches, proofs, limit),
+                Payload::OptQuorumStore(opt_qs),
+            )
+            | (
+                Payload::OptQuorumStore(opt_qs),
+                Payload::QuorumStoreInlineHybrid(inline_batches, proofs, limit),
+            ) => {
+                let execution_limits = PayloadExecutionLimit::max_txns_to_execute(limit);
+                let converted_payload = OptQuorumStorePayload::new(
+                    inline_batches.into(),
+                    Vec::new().into(),
+                    proofs.into(),
+                    execution_limits,
+                );
+                let opt_qs3 = opt_qs.extend(converted_payload);
+                Payload::OptQuorumStore(opt_qs3)
+            },
+            (Payload::OptQuorumStore(opt_qs1), Payload::OptQuorumStore(opt_qs2)) => {
+                let opt_qs3 = opt_qs1.extend(opt_qs2);
+                Payload::OptQuorumStore(opt_qs3)
+            },
             (_, _) => unreachable!(),
         }
     }
@@ -346,7 +447,11 @@ impl Payload {
         matches!(self, Payload::DirectMempool(_))
     }
 
-    /// This is computationally expensive on the first call
+    pub fn is_quorum_store(&self) -> bool {
+        !matches!(self, Payload::DirectMempool(_))
+    }
+
+    /// This is potentially computationally expensive
     pub fn size(&self) -> usize {
         match self {
             Payload::DirectMempool(txns) => txns
@@ -365,6 +470,7 @@ impl Payload {
                         .map(|(batch_info, _)| batch_info.num_bytes() as usize)
                         .sum::<usize>()
             },
+            Payload::OptQuorumStore(opt_qs_payload) => opt_qs_payload.num_bytes(),
         }
     }
 
@@ -417,6 +523,12 @@ impl Payload {
                 }
                 Ok(())
             },
+            (true, Payload::OptQuorumStore(opt_quorum_store)) => {
+                let proof_with_data = opt_quorum_store.proof_with_data();
+                Self::verify_with_cache(&proof_with_data.batch_summary, validator, proof_cache)?;
+                // TODO(ibalajiarun): Remove this log when OptQS is enabled.
+                bail!("OptQuorumStore Payload is not expected yet");
+            },
             (_, _) => Err(anyhow::anyhow!(
                 "Wrong payload type. Expected Payload::InQuorumStore {} got {} ",
                 quorum_store_enabled,
@@ -453,6 +565,9 @@ impl fmt::Display for Payload {
                     proof_with_data.proofs.len()
                 )
             },
+            Payload::OptQuorumStore(opt_quorum_store) => {
+                write!(f, "{}", opt_quorum_store)
+            },
         }
     }
 }
@@ -563,6 +678,14 @@ impl From<&Vec<&Payload>> for PayloadFilter {
                     Payload::DirectMempool(_) => {
                         error!("DirectMempool payload in InQuorumStore filter");
                     },
+                    Payload::OptQuorumStore(opt_qs_payload) => {
+                        for batch_info in &opt_qs_payload.opt_batches().batch_summary {
+                            exclude_proofs.insert(batch_info.clone());
+                        }
+                        for proof in &opt_qs_payload.proof_with_data().batch_summary {
+                            exclude_proofs.insert(proof.info().clone());
+                        }
+                    },
                 }
             }
             PayloadFilter::InQuorumStore(exclude_proofs)
diff --git a/consensus/consensus-types/src/lib.rs b/consensus/consensus-types/src/lib.rs
index 1ae492531755c..6a9abb629c2b5 100644
--- a/consensus/consensus-types/src/lib.rs
+++ b/consensus/consensus-types/src/lib.rs
@@ -10,6 +10,10 @@ pub mod block_retrieval;
 pub mod common;
 pub mod delayed_qc_msg;
 pub mod epoch_retrieval;
+pub mod order_vote;
+pub mod order_vote_msg;
+pub mod order_vote_proposal;
+pub mod payload;
 pub mod pipeline;
 pub mod pipelined_block;
 pub mod proof_of_store;
@@ -21,7 +25,9 @@ pub mod request_response;
 pub mod safety_data;
 pub mod sync_info;
 pub mod timeout_2chain;
+pub mod utils;
 pub mod vote;
 pub mod vote_data;
 pub mod vote_msg;
 pub mod vote_proposal;
+pub mod wrapped_ledger_info;
diff --git a/consensus/consensus-types/src/order_vote.rs b/consensus/consensus-types/src/order_vote.rs
new file mode 100644
index 0000000000000..c2a257cdf83c5
--- /dev/null
+++ b/consensus/consensus-types/src/order_vote.rs
@@ -0,0 +1,83 @@
+// Copyright © Aptos Foundation
+// Parts of the project are originally copyright © Meta Platforms, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::common::Author;
+use anyhow::{ensure, Context};
+use aptos_crypto::{bls12381, HashValue};
+use aptos_short_hex_str::AsShortHexStr;
+use aptos_types::{ledger_info::LedgerInfo, validator_verifier::ValidatorVerifier};
+use serde::{Deserialize, Serialize};
+use std::fmt::{Debug, Display, Formatter};
+
+#[derive(Deserialize, Serialize, Clone)]
+pub struct OrderVote {
+    /// The identity of the voter.
+    author: Author,
+    /// LedgerInfo of a block that is going to be ordered in case this vote gathers QC.
+    ledger_info: LedgerInfo,
+    /// Signature of the LedgerInfo.
+    signature: bls12381::Signature,
+}
+
+impl Display for OrderVote {
+    fn fmt(&self, f: &mut Formatter) -> std::fmt::Result {
+        write!(
+            f,
+            "OrderVote: [author: {}, ledger_info: {}]",
+            self.author.short_str(),
+            self.ledger_info
+        )
+    }
+}
+
+// this is required by structured log
+impl Debug for OrderVote {
+    fn fmt(&self, f: &mut Formatter) -> std::fmt::Result {
+        write!(f, "{}", self)
+    }
+}
+
+impl OrderVote {
+    /// Generates a new Vote using a signature over the specified ledger_info
+    pub fn new_with_signature(
+        author: Author,
+        ledger_info: LedgerInfo,
+        signature: bls12381::Signature,
+    ) -> Self {
+        Self {
+            author,
+            ledger_info,
+            signature,
+        }
+    }
+
+    pub fn author(&self) -> Author {
+        self.author
+    }
+
+    pub fn ledger_info(&self) -> &LedgerInfo {
+        &self.ledger_info
+    }
+
+    pub fn signature(&self) -> &bls12381::Signature {
+        &self.signature
+    }
+
+    pub fn epoch(&self) -> u64 {
+        self.ledger_info.epoch()
+    }
+
+    /// Verifies the signature on LedgerInfo.
+    pub fn verify(&self, validator: &ValidatorVerifier) -> anyhow::Result<()> {
+        ensure!(
+            self.ledger_info.consensus_data_hash() == HashValue::zero(),
+            "Failed to verify OrderVote. Consensus data hash is not Zero"
+        );
+        validator
+            .verify(self.author(), &self.ledger_info, &self.signature)
+            .context("Failed to verify OrderVote")?;
+
+        Ok(())
+    }
+}
diff --git a/consensus/consensus-types/src/order_vote_msg.rs b/consensus/consensus-types/src/order_vote_msg.rs
new file mode 100644
index 0000000000000..1fae85cc25a60
--- /dev/null
+++ b/consensus/consensus-types/src/order_vote_msg.rs
@@ -0,0 +1,59 @@
+// Copyright © Aptos Foundation
+// Parts of the project are originally copyright © Meta Platforms, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{order_vote::OrderVote, quorum_cert::QuorumCert};
+use anyhow::{ensure, Context};
+use aptos_types::validator_verifier::ValidatorVerifier;
+use serde::{Deserialize, Serialize};
+use std::fmt::{Display, Formatter};
+
+#[derive(Debug, Deserialize, Serialize, Clone)]
+pub struct OrderVoteMsg {
+    order_vote: OrderVote,
+    quorum_cert: QuorumCert,
+}
+
+impl Display for OrderVoteMsg {
+    fn fmt(&self, f: &mut Formatter) -> std::fmt::Result {
+        write!(
+            f,
+            "OrderVote: [{}], QuorumCert: [{}]",
+            self.order_vote, self.quorum_cert
+        )
+    }
+}
+
+impl OrderVoteMsg {
+    pub fn new(order_vote: OrderVote, quorum_cert: QuorumCert) -> Self {
+        Self {
+            order_vote,
+            quorum_cert,
+        }
+    }
+
+    pub fn order_vote(&self) -> &OrderVote {
+        &self.order_vote
+    }
+
+    pub fn quorum_cert(&self) -> &QuorumCert {
+        &self.quorum_cert
+    }
+
+    pub fn epoch(&self) -> u64 {
+        self.order_vote.epoch()
+    }
+
+    /// This function verifies the order_vote component in the order_vote_msg.
+    /// The quorum cert is verified in the round manager when the quorum certificate is used.
+    pub fn verify_order_vote(&self, validator: &ValidatorVerifier) -> anyhow::Result<()> {
+        ensure!(
+            self.quorum_cert().certified_block() == self.order_vote().ledger_info().commit_info(),
+            "QuorumCert and OrderVote do not match"
+        );
+        self.order_vote
+            .verify(validator)
+            .context("[OrderVoteMsg] OrderVote verification failed")?;
+        Ok(())
+    }
+}
diff --git a/consensus/consensus-types/src/order_vote_proposal.rs b/consensus/consensus-types/src/order_vote_proposal.rs
new file mode 100644
index 0000000000000..f15b3b5c186a0
--- /dev/null
+++ b/consensus/consensus-types/src/order_vote_proposal.rs
@@ -0,0 +1,51 @@
+// Copyright © Aptos Foundation
+// Parts of the project are originally copyright © Meta Platforms, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{block::Block, quorum_cert::QuorumCert};
+use aptos_types::block_info::BlockInfo;
+use serde::{Deserialize, Serialize};
+use std::{
+    fmt::{Display, Formatter},
+    sync::Arc,
+};
+
+/// This structure contains all the information needed by safety rules to
+/// evaluate a QC on a block to produce an order vote.
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct OrderVoteProposal {
+    #[serde(bound(deserialize = "Block: Deserialize<'de>"))]
+    block: Block,
+    /// BlockInfo for the above block
+    block_info: BlockInfo,
+    /// QuorumCert for the above block
+    quorum_cert: Arc<QuorumCert>,
+}
+
+impl OrderVoteProposal {
+    pub fn new(block: Block, block_info: BlockInfo, quorum_cert: Arc<QuorumCert>) -> Self {
+        Self {
+            block,
+            block_info,
+            quorum_cert,
+        }
+    }
+
+    pub fn block(&self) -> &Block {
+        &self.block
+    }
+
+    pub fn block_info(&self) -> &BlockInfo {
+        &self.block_info
+    }
+
+    pub fn quorum_cert(&self) -> &QuorumCert {
+        &self.quorum_cert
+    }
+}
+
+impl Display for OrderVoteProposal {
+    fn fmt(&self, f: &mut Formatter) -> std::fmt::Result {
+        write!(f, "OrderVoteProposal[block: {}]", self.block,)
+    }
+}
diff --git a/consensus/consensus-types/src/payload.rs b/consensus/consensus-types/src/payload.rs
new file mode 100644
index 0000000000000..04482106e41ad
--- /dev/null
+++ b/consensus/consensus-types/src/payload.rs
@@ -0,0 +1,356 @@
+// Copyright (c) Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    common::{DataStatus, ProofWithData},
+    proof_of_store::{BatchInfo, ProofOfStore},
+};
+use aptos_infallible::Mutex;
+use aptos_types::{transaction::SignedTransaction, PeerId};
+use core::fmt;
+use serde::{Deserialize, Serialize};
+use std::{
+    ops::{Deref, DerefMut},
+    sync::Arc,
+};
+
+pub trait TDataInfo {
+    fn num_txns(&self) -> u64;
+
+    fn num_bytes(&self) -> u64;
+
+    fn info(&self) -> &BatchInfo;
+
+    fn signers(&self, ordered_authors: &[PeerId]) -> Vec<PeerId>;
+}
+
+#[derive(Deserialize, Serialize, Clone, Debug)]
+pub struct BatchPointer<T> {
+    pub batch_summary: Vec<T>,
+    #[serde(skip)]
+    pub status: Arc<Mutex<Option<DataStatus>>>,
+}
+
+impl<T> BatchPointer<T>
+where
+    T: TDataInfo,
+{
+    pub fn new(metadata: Vec<T>) -> Self {
+        Self {
+            batch_summary: metadata,
+            status: Arc::new(Mutex::new(None)),
+        }
+    }
+
+    pub fn extend(&mut self, other: BatchPointer<T>) {
+        let other_data_status = other.status.lock().as_mut().unwrap().take();
+        self.batch_summary.extend(other.batch_summary);
+        let mut status = self.status.lock();
+        *status = match &mut *status {
+            None => Some(other_data_status),
+            Some(status) => {
+                status.extend(other_data_status);
+                return;
+            },
+        };
+    }
+
+    pub fn num_txns(&self) -> usize {
+        self.batch_summary
+            .iter()
+            .map(|info| info.num_txns() as usize)
+            .sum()
+    }
+
+    pub fn num_bytes(&self) -> usize {
+        self.batch_summary
+            .iter()
+            .map(|info| info.num_bytes() as usize)
+            .sum()
+    }
+
+    pub fn is_empty(&self) -> bool {
+        self.batch_summary.is_empty()
+    }
+}
+
+impl<T> From<Vec<T>> for BatchPointer<T>
+where
+    T: TDataInfo,
+{
+    fn from(value: Vec<T>) -> Self {
+        Self {
+            batch_summary: value,
+            status: Arc::new(Mutex::new(None)),
+        }
+    }
+}
+
+impl<T: PartialEq> PartialEq for BatchPointer<T> {
+    fn eq(&self, other: &Self) -> bool {
+        self.batch_summary == other.batch_summary
+            && Arc::as_ptr(&self.status) == Arc::as_ptr(&other.status)
+    }
+}
+
+impl<T: Eq> Eq for BatchPointer<T> {}
+
+impl<T> Deref for BatchPointer<T> {
+    type Target = Vec<T>;
+
+    fn deref(&self) -> &Self::Target {
+        &self.batch_summary
+    }
+}
+
+impl<T> IntoIterator for BatchPointer<T> {
+    type IntoIter = std::vec::IntoIter<T>;
+    type Item = T;
+
+    fn into_iter(self) -> Self::IntoIter {
+        self.batch_summary.into_iter()
+    }
+}
+
+impl From<ProofWithData> for BatchPointer<ProofOfStore> {
+    fn from(value: ProofWithData) -> Self {
+        Self {
+            batch_summary: value.proofs,
+            status: value.status,
+        }
+    }
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]
+pub enum PayloadExecutionLimit {
+    None,
+    MaxTransactionsToExecute(u64),
+}
+
+impl PayloadExecutionLimit {
+    pub(crate) fn extend(&mut self, other: PayloadExecutionLimit) {
+        *self = match (&self, &other) {
+            (PayloadExecutionLimit::None, _) => other,
+            (_, PayloadExecutionLimit::None) => return,
+            (
+                PayloadExecutionLimit::MaxTransactionsToExecute(limit1),
+                PayloadExecutionLimit::MaxTransactionsToExecute(limit2),
+            ) => PayloadExecutionLimit::MaxTransactionsToExecute(*limit1 + *limit2),
+        };
+    }
+
+    pub(crate) fn max_txns_to_execute(limit: Option<u64>) -> Self {
+        limit.map_or(PayloadExecutionLimit::None, |val| {
+            PayloadExecutionLimit::MaxTransactionsToExecute(val)
+        })
+    }
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]
+pub struct InlineBatch {
+    batch_info: BatchInfo,
+    transactions: Vec<SignedTransaction>,
+}
+
+impl InlineBatch {
+    pub fn new(batch_info: BatchInfo, transactions: Vec<SignedTransaction>) -> Self {
+        Self {
+            batch_info,
+            transactions,
+        }
+    }
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]
+pub struct InlineBatches(Vec<InlineBatch>);
+
+impl InlineBatches {
+    fn num_txns(&self) -> usize {
+        self.0
+            .iter()
+            .map(|batch| batch.batch_info.num_txns() as usize)
+            .sum()
+    }
+
+    fn num_bytes(&self) -> usize {
+        self.0
+            .iter()
+            .map(|batch| batch.batch_info.num_bytes() as usize)
+            .sum()
+    }
+
+    fn is_empty(&self) -> bool {
+        self.0.is_empty()
+    }
+
+    pub fn transactions(&self) -> Vec<SignedTransaction> {
+        self.0
+            .iter()
+            .flat_map(|inline_batch| inline_batch.transactions.clone())
+            .collect()
+    }
+
+    pub fn batch_infos(&self) -> Vec<BatchInfo> {
+        self.0
+            .iter()
+            .map(|inline_batch| inline_batch.batch_info.clone())
+            .collect()
+    }
+}
+
+impl From<Vec<InlineBatch>> for InlineBatches {
+    fn from(value: Vec<InlineBatch>) -> Self {
+        Self(value)
+    }
+}
+
+impl From<Vec<(BatchInfo, Vec<SignedTransaction>)>> for InlineBatches {
+    fn from(value: Vec<(BatchInfo, Vec<SignedTransaction>)>) -> Self {
+        value
+            .into_iter()
+            .map(|(batch_info, transactions)| InlineBatch::new(batch_info, transactions))
+            .collect::<Vec<_>>()
+            .into()
+    }
+}
+
+impl Deref for InlineBatches {
+    type Target = Vec<InlineBatch>;
+
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+
+impl DerefMut for InlineBatches {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.0
+    }
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]
+pub struct OptQuorumStorePayloadV1 {
+    inline_batches: InlineBatches,
+    opt_batches: BatchPointer<BatchInfo>,
+    proofs: BatchPointer<ProofOfStore>,
+    execution_limits: PayloadExecutionLimit,
+}
+
+impl OptQuorumStorePayloadV1 {
+    pub fn get_all_batch_infos(self) -> Vec<BatchInfo> {
+        let Self {
+            inline_batches,
+            opt_batches,
+            proofs,
+            execution_limits: _,
+        } = self;
+        inline_batches
+            .0
+            .into_iter()
+            .map(|batch| batch.batch_info)
+            .chain(opt_batches)
+            .chain(proofs.into_iter().map(|proof| proof.info().clone()))
+            .collect()
+    }
+
+    pub fn max_txns_to_execute(&self) -> Option<u64> {
+        match self.execution_limits {
+            PayloadExecutionLimit::None => None,
+            PayloadExecutionLimit::MaxTransactionsToExecute(max) => Some(max),
+        }
+    }
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]
+pub enum OptQuorumStorePayload {
+    V1(OptQuorumStorePayloadV1),
+}
+
+impl OptQuorumStorePayload {
+    pub fn new(
+        inline_batches: InlineBatches,
+        opt_batches: BatchPointer<BatchInfo>,
+        proofs: BatchPointer<ProofOfStore>,
+        execution_limits: PayloadExecutionLimit,
+    ) -> Self {
+        Self::V1(OptQuorumStorePayloadV1 {
+            inline_batches,
+            opt_batches,
+            proofs,
+            execution_limits,
+        })
+    }
+
+    pub(crate) fn num_txns(&self) -> usize {
+        self.opt_batches.num_txns() + self.proofs.num_txns() + self.inline_batches.num_txns()
+    }
+
+    pub(crate) fn is_empty(&self) -> bool {
+        self.opt_batches.is_empty() && self.proofs.is_empty() && self.inline_batches.is_empty()
+    }
+
+    pub(crate) fn extend(mut self, other: Self) -> Self {
+        let other: OptQuorumStorePayloadV1 = other.into_inner();
+        self.inline_batches.extend(other.inline_batches.0);
+        self.opt_batches.extend(other.opt_batches);
+        self.proofs.extend(other.proofs);
+        self.execution_limits.extend(other.execution_limits);
+        self
+    }
+
+    pub(crate) fn num_bytes(&self) -> usize {
+        self.opt_batches.num_bytes() + self.proofs.num_bytes() + self.inline_batches.num_bytes()
+    }
+
+    pub fn into_inner(self) -> OptQuorumStorePayloadV1 {
+        match self {
+            OptQuorumStorePayload::V1(opt_qs_payload) => opt_qs_payload,
+        }
+    }
+
+    pub fn inline_batches(&self) -> &InlineBatches {
+        &self.inline_batches
+    }
+
+    pub fn proof_with_data(&self) -> &BatchPointer<ProofOfStore> {
+        &self.proofs
+    }
+
+    pub fn opt_batches(&self) -> &BatchPointer<BatchInfo> {
+        &self.opt_batches
+    }
+
+    pub fn set_execution_limit(&mut self, execution_limits: PayloadExecutionLimit) {
+        self.execution_limits = execution_limits;
+    }
+}
+
+impl Deref for OptQuorumStorePayload {
+    type Target = OptQuorumStorePayloadV1;
+
+    fn deref(&self) -> &Self::Target {
+        match self {
+            OptQuorumStorePayload::V1(opt_qs_payload) => opt_qs_payload,
+        }
+    }
+}
+
+impl DerefMut for OptQuorumStorePayload {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        match self {
+            OptQuorumStorePayload::V1(opt_qs_payload) => opt_qs_payload,
+        }
+    }
+}
+
+impl fmt::Display for OptQuorumStorePayload {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(
+            f,
+            "OptQuorumStorePayload(opt_batches: {}, proofs: {}, limits: {:?})",
+            self.opt_batches.num_txns(),
+            self.proofs.num_txns(),
+            self.execution_limits,
+        )
+    }
+}
diff --git a/consensus/consensus-types/src/pipeline/commit_decision.rs b/consensus/consensus-types/src/pipeline/commit_decision.rs
index 7f039cd3c4a87..102d4e0d3c5ff 100644
--- a/consensus/consensus-types/src/pipeline/commit_decision.rs
+++ b/consensus/consensus-types/src/pipeline/commit_decision.rs
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::common::Round;
-use anyhow::Context;
+use anyhow::{ensure, Context};
 use aptos_types::{ledger_info::LedgerInfoWithSignatures, validator_verifier::ValidatorVerifier};
 use serde::{Deserialize, Serialize};
 use std::fmt::{Debug, Display, Formatter};
@@ -48,6 +48,10 @@ impl CommitDecision {
     /// Verifies that the signatures carried in the message forms a valid quorum,
     /// and then verifies the signature.
     pub fn verify(&self, validator: &ValidatorVerifier) -> anyhow::Result<()> {
+        ensure!(
+            !self.ledger_info.commit_info().is_ordered_only(),
+            "Unexpected ordered only commit info"
+        );
         // We do not need to check the author because as long as the signature tree
         // is valid, the message should be valid.
         self.ledger_info
diff --git a/consensus/consensus-types/src/pipelined_block.rs b/consensus/consensus-types/src/pipelined_block.rs
index c8153263fc98e..f8fd2dbe60174 100644
--- a/consensus/consensus-types/src/pipelined_block.rs
+++ b/consensus/consensus-types/src/pipelined_block.rs
@@ -5,19 +5,25 @@
 use crate::{
     block::Block,
     common::{Payload, Round},
+    order_vote_proposal::OrderVoteProposal,
     quorum_cert::QuorumCert,
     vote_proposal::VoteProposal,
 };
-use aptos_crypto::hash::HashValue;
+use aptos_crypto::hash::{HashValue, ACCUMULATOR_PLACEHOLDER_HASH};
 use aptos_executor_types::StateComputeResult;
+use aptos_logger::{error, warn};
 use aptos_types::{
-    block_info::BlockInfo, contract_event::ContractEvent, randomness::Randomness,
-    transaction::SignedTransaction, validator_txn::ValidatorTransaction,
+    block_info::BlockInfo,
+    contract_event::ContractEvent,
+    randomness::Randomness,
+    transaction::{SignedTransaction, TransactionStatus},
+    validator_txn::ValidatorTransaction,
 };
 use once_cell::sync::OnceCell;
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use std::{
     fmt::{Debug, Display, Formatter},
+    sync::Arc,
     time::{Duration, Instant},
 };
 
@@ -36,6 +42,7 @@ pub struct PipelinedBlock {
     state_compute_result: StateComputeResult,
     randomness: OnceCell<Randomness>,
     pipeline_insertion_time: OnceCell<Instant>,
+    execution_summary: Arc<OnceCell<ExecutionSummary>>,
 }
 
 impl Serialize for PipelinedBlock {
@@ -89,6 +96,7 @@ impl<'de> Deserialize<'de> for PipelinedBlock {
             state_compute_result,
             randomness: OnceCell::new(),
             pipeline_insertion_time: OnceCell::new(),
+            execution_summary: Arc::new(OnceCell::new()),
         };
         if let Some(r) = randomness {
             block.set_randomness(r);
@@ -102,9 +110,54 @@ impl PipelinedBlock {
         mut self,
         input_transactions: Vec<SignedTransaction>,
         result: StateComputeResult,
+        execution_time: Duration,
     ) -> Self {
         self.state_compute_result = result;
         self.input_transactions = input_transactions;
+
+        let mut to_commit = 0;
+        let mut to_retry = 0;
+        for txn in self.state_compute_result.compute_status_for_input_txns() {
+            match txn {
+                TransactionStatus::Keep(_) => to_commit += 1,
+                TransactionStatus::Retry => to_retry += 1,
+                _ => {},
+            }
+        }
+
+        let execution_summary = ExecutionSummary {
+            payload_len: self
+                .block
+                .payload()
+                .map_or(0, |payload| payload.len_for_execution()),
+            to_commit,
+            to_retry,
+            execution_time,
+            root_hash: self.state_compute_result.root_hash(),
+        };
+
+        // We might be retrying execution, so it might have already been set.
+        // Because we use this for statistics, it's ok that we drop the newer value.
+        if let Some(previous) = self.execution_summary.get() {
+            if previous.root_hash == execution_summary.root_hash
+                || previous.root_hash == *ACCUMULATOR_PLACEHOLDER_HASH
+            {
+                warn!(
+                    "Skipping re-inserting execution result, from {:?} to {:?}",
+                    previous, execution_summary
+                );
+            } else {
+                error!(
+                    "Re-inserting execution result with different root hash: from {:?} to {:?}",
+                    previous, execution_summary
+                );
+            }
+        } else {
+            self.execution_summary
+                .set(execution_summary)
+                .expect("inserting into empty execution summary");
+        }
+
         self
     }
 
@@ -141,6 +194,7 @@ impl PipelinedBlock {
             state_compute_result,
             randomness: OnceCell::new(),
             pipeline_insertion_time: OnceCell::new(),
+            execution_summary: Arc::new(OnceCell::new()),
         }
     }
 
@@ -151,6 +205,7 @@ impl PipelinedBlock {
             state_compute_result: StateComputeResult::new_dummy(),
             randomness: OnceCell::new(),
             pipeline_insertion_time: OnceCell::new(),
+            execution_summary: Arc::new(OnceCell::new()),
         }
     }
 
@@ -223,6 +278,10 @@ impl PipelinedBlock {
         )
     }
 
+    pub fn order_vote_proposal(&self, quorum_cert: Arc<QuorumCert>) -> OrderVoteProposal {
+        OrderVoteProposal::new(self.block.clone(), self.block_info(), quorum_cert)
+    }
+
     pub fn subscribable_events(&self) -> Vec<ContractEvent> {
         // reconfiguration suffix don't count, the state compute result is carried over from parents
         if self.is_reconfiguration_suffix() {
@@ -244,4 +303,17 @@ impl PipelinedBlock {
     pub fn elapsed_in_pipeline(&self) -> Option<Duration> {
         self.pipeline_insertion_time.get().map(|t| t.elapsed())
     }
+
+    pub fn get_execution_summary(&self) -> Option<ExecutionSummary> {
+        self.execution_summary.get().cloned()
+    }
+}
+
+#[derive(Debug, Clone, Eq, PartialEq)]
+pub struct ExecutionSummary {
+    pub payload_len: u64,
+    pub to_commit: u64,
+    pub to_retry: u64,
+    pub execution_time: Duration,
+    pub root_hash: HashValue,
 }
diff --git a/consensus/consensus-types/src/proof_of_store.rs b/consensus/consensus-types/src/proof_of_store.rs
index 6b149c39e7741..066e5704b5d03 100644
--- a/consensus/consensus-types/src/proof_of_store.rs
+++ b/consensus/consensus-types/src/proof_of_store.rs
@@ -1,6 +1,7 @@
 // Copyright © Aptos Foundation
 // SPDX-License-Identifier: Apache-2.0
 
+use crate::{payload::TDataInfo, utils::PayloadTxnsSize};
 use anyhow::{bail, ensure, Context};
 use aptos_crypto::{bls12381, CryptoMaterialError, HashValue};
 use aptos_crypto_derive::{BCSCryptoHash, CryptoHasher};
@@ -130,6 +131,10 @@ impl BatchInfo {
         self.num_bytes
     }
 
+    pub fn size(&self) -> PayloadTxnsSize {
+        PayloadTxnsSize::new(self.num_txns, self.num_bytes)
+    }
+
     pub fn gas_bucket_start(&self) -> u64 {
         self.gas_bucket_start
     }
@@ -145,6 +150,24 @@ impl Display for BatchInfo {
     }
 }
 
+impl TDataInfo for BatchInfo {
+    fn num_txns(&self) -> u64 {
+        self.num_txns()
+    }
+
+    fn num_bytes(&self) -> u64 {
+        self.num_bytes()
+    }
+
+    fn info(&self) -> &BatchInfo {
+        self
+    }
+
+    fn signers(&self, _ordered_authors: &[PeerId]) -> Vec<PeerId> {
+        vec![self.author()]
+    }
+}
+
 #[derive(Clone, Debug, Deserialize, Serialize)]
 pub struct SignedBatchInfoMsg {
     signed_infos: Vec<SignedBatchInfo>,
@@ -269,6 +292,7 @@ pub enum SignedBatchInfoError {
     InvalidAuthor,
     NotFound,
     AlreadyCommitted,
+    NoTimeStamps,
 }
 
 #[derive(Deserialize, Serialize, Clone, Debug, PartialEq, Eq)]
@@ -350,10 +374,8 @@ impl ProofOfStore {
         result
     }
 
-    pub fn shuffled_signers(&self, validator: &ValidatorVerifier) -> Vec<PeerId> {
-        let mut ret: Vec<PeerId> = self
-            .multi_signature
-            .get_signers_addresses(&validator.get_ordered_account_addresses());
+    pub fn shuffled_signers(&self, ordered_authors: &[PeerId]) -> Vec<PeerId> {
+        let mut ret: Vec<PeerId> = self.multi_signature.get_signers_addresses(ordered_authors);
         ret.shuffle(&mut thread_rng());
         ret
     }
@@ -374,3 +396,21 @@ impl Deref for ProofOfStore {
         &self.info
     }
 }
+
+impl TDataInfo for ProofOfStore {
+    fn num_txns(&self) -> u64 {
+        self.num_txns
+    }
+
+    fn num_bytes(&self) -> u64 {
+        self.num_bytes
+    }
+
+    fn info(&self) -> &BatchInfo {
+        self.info()
+    }
+
+    fn signers(&self, ordered_authors: &[PeerId]) -> Vec<PeerId> {
+        self.shuffled_signers(ordered_authors)
+    }
+}
diff --git a/consensus/consensus-types/src/quorum_cert.rs b/consensus/consensus-types/src/quorum_cert.rs
index f411d20e99261..678bfd7c3d9dc 100644
--- a/consensus/consensus-types/src/quorum_cert.rs
+++ b/consensus/consensus-types/src/quorum_cert.rs
@@ -2,7 +2,7 @@
 // Parts of the project are originally copyright © Meta Platforms, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::vote_data::VoteData;
+use crate::{vote_data::VoteData, wrapped_ledger_info::WrappedLedgerInfo};
 use anyhow::{ensure, Context};
 use aptos_bitvec::BitVec;
 use aptos_crypto::{hash::CryptoHash, HashValue};
@@ -162,4 +162,8 @@ impl QuorumCert {
         );
         Ok(Self::new(self.vote_data.clone(), executed_ledger_info))
     }
+
+    pub fn into_wrapped_ledger_info(&self) -> WrappedLedgerInfo {
+        WrappedLedgerInfo::new(self.vote_data.clone(), self.ledger_info().clone())
+    }
 }
diff --git a/consensus/consensus-types/src/request_response.rs b/consensus/consensus-types/src/request_response.rs
index a28082b6c0c7f..c650141e7878a 100644
--- a/consensus/consensus-types/src/request_response.rs
+++ b/consensus/consensus-types/src/request_response.rs
@@ -1,47 +1,47 @@
 // Copyright © Aptos Foundation
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::common::{Payload, PayloadFilter};
+use crate::{
+    common::{Payload, PayloadFilter},
+    utils::PayloadTxnsSize,
+};
 use anyhow::Result;
 use futures::channel::oneshot;
-use std::{fmt, fmt::Formatter};
+use std::{fmt, fmt::Formatter, time::Duration};
+
+pub struct GetPayloadRequest {
+    // max number of transactions in the block
+    pub max_txns: PayloadTxnsSize,
+    // max number of transactions after filtering in the block
+    pub max_txns_after_filtering: u64,
+    // soft max number of transactions after filtering in the block (i.e. include one that crosses it)
+    pub soft_max_txns_after_filtering: u64,
+    // target txns with opt batches in max_txns as pct
+    pub opt_batch_txns_pct: u8,
+    // max number of inline transactions (transactions without a proof of store)
+    pub max_inline_txns: PayloadTxnsSize,
+    // return non full
+    pub return_non_full: bool,
+    // block payloads to exclude from the requested block
+    pub filter: PayloadFilter,
+    // callback to respond to
+    pub callback: oneshot::Sender<Result<GetPayloadResponse>>,
+    // block timestamp
+    pub block_timestamp: Duration,
+}
 
 pub enum GetPayloadCommand {
     /// Request to pull block to submit to consensus.
-    GetPayloadRequest(
-        // max block size
-        u64,
-        // max byte size
-        u64,
-        // max number of inline transactions (transactions without a proof of store)
-        u64,
-        // max byte size of inline transactions (transactions without a proof of store)
-        u64,
-        // return non full
-        bool,
-        // block payloads to exclude from the requested block
-        PayloadFilter,
-        // callback to respond to
-        oneshot::Sender<Result<GetPayloadResponse>>,
-    ),
+    GetPayloadRequest(GetPayloadRequest),
 }
 
 impl fmt::Display for GetPayloadCommand {
     fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
         match self {
-            GetPayloadCommand::GetPayloadRequest(
-                max_txns,
-                max_bytes,
-                max_inline_txns,
-                max_inline_bytes,
-                return_non_full,
-                excluded,
-                _,
-            ) => {
-                write!(
-                    f,
-                    "GetPayloadRequest [max_txns: {}, max_bytes: {}, max_inline_txns: {}, max_inline_bytes:{}, return_non_full: {},  excluded: {}]",
-                    max_txns, max_bytes, max_inline_txns, max_inline_bytes, return_non_full, excluded
+            GetPayloadCommand::GetPayloadRequest(request) => {
+                write!(f,
+                    "GetPayloadRequest [max_txns: {}, max_txns_after_filtering: {}, soft_max_txns_after_filtering: {}, max_inline_txns: {}, return_non_full: {}, block_timestamp: {:?}]",
+                    request.max_txns, request.max_txns_after_filtering, request.soft_max_txns_after_filtering, request.max_inline_txns, request.return_non_full, request.block_timestamp
                 )
             },
         }
diff --git a/consensus/consensus-types/src/safety_data.rs b/consensus/consensus-types/src/safety_data.rs
index 9e90f2870f68b..b01aa7e536df4 100644
--- a/consensus/consensus-types/src/safety_data.rs
+++ b/consensus/consensus-types/src/safety_data.rs
@@ -17,6 +17,8 @@ pub struct SafetyData {
     #[serde(default)]
     pub one_chain_round: u64,
     pub last_vote: Option<Vote>,
+    #[serde(default)]
+    pub highest_timeout_round: u64,
 }
 
 impl SafetyData {
@@ -26,6 +28,7 @@ impl SafetyData {
         preferred_round: u64,
         one_chain_round: u64,
         last_vote: Option<Vote>,
+        highest_timeout_round: u64,
     ) -> Self {
         Self {
             epoch,
@@ -33,6 +36,7 @@ impl SafetyData {
             preferred_round,
             one_chain_round,
             last_vote,
+            highest_timeout_round,
         }
     }
 }
@@ -41,8 +45,8 @@ impl fmt::Display for SafetyData {
     fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
         write!(
             f,
-            "SafetyData: [epoch: {}, last_voted_round: {}, preferred_round: {}, one_chain_round: {}]",
-            self.epoch, self.last_voted_round, self.preferred_round, self.one_chain_round
+            "SafetyData: [epoch: {}, last_voted_round: {}, preferred_round: {}, one_chain_round: {}, highest_timeout_round: {:?}]",
+            self.epoch, self.last_voted_round, self.preferred_round, self.one_chain_round, self.highest_timeout_round,
         )
     }
 }
diff --git a/consensus/consensus-types/src/sync_info.rs b/consensus/consensus-types/src/sync_info.rs
index 0fd5b76ec8bcd..f4eddf3d50ccf 100644
--- a/consensus/consensus-types/src/sync_info.rs
+++ b/consensus/consensus-types/src/sync_info.rs
@@ -2,9 +2,13 @@
 // Parts of the project are originally copyright © Meta Platforms, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::{common::Round, quorum_cert::QuorumCert, timeout_2chain::TwoChainTimeoutCertificate};
+use crate::{
+    common::Round, quorum_cert::QuorumCert, timeout_2chain::TwoChainTimeoutCertificate,
+    wrapped_ledger_info::WrappedLedgerInfo,
+};
 use anyhow::{ensure, Context};
 use aptos_types::{block_info::BlockInfo, validator_verifier::ValidatorVerifier};
+use fail::fail_point;
 use serde::{Deserialize, Serialize};
 use std::fmt::{Debug, Display, Formatter};
 
@@ -14,9 +18,9 @@ pub struct SyncInfo {
     /// Highest quorum certificate known to the peer.
     highest_quorum_cert: QuorumCert,
     /// Highest ordered cert known to the peer.
-    highest_ordered_cert: Option<QuorumCert>,
+    highest_ordered_cert: Option<WrappedLedgerInfo>,
     /// Highest commit cert (ordered cert with execution result) known to the peer.
-    highest_commit_cert: QuorumCert,
+    highest_commit_cert: WrappedLedgerInfo,
     /// Optional highest timeout certificate if available.
     highest_2chain_timeout_cert: Option<TwoChainTimeoutCertificate>,
 }
@@ -32,11 +36,14 @@ impl Display for SyncInfo {
     fn fmt(&self, f: &mut Formatter) -> std::fmt::Result {
         write!(
             f,
-            "SyncInfo[certified_round: {}, ordered_round: {}, timeout round: {}, commit_info: {}]",
+            "SyncInfo[certified_round: {}, ordered_round: {}, timeout round: {}, committed_round: {},\n hqc: {:?},\n hoc: {:?},\n hcc: {:?}]",
             self.highest_certified_round(),
             self.highest_ordered_round(),
             self.highest_timeout_round(),
-            self.highest_commit_cert().commit_info(),
+            self.highest_commit_round(),
+            self.highest_quorum_cert,
+            self.highest_ordered_cert.as_ref().map_or("None".to_string(), |cert| cert.to_string()),
+            self.highest_commit_cert,
         )
     }
 }
@@ -44,20 +51,26 @@ impl Display for SyncInfo {
 impl SyncInfo {
     pub fn new_decoupled(
         highest_quorum_cert: QuorumCert,
-        highest_ordered_cert: QuorumCert,
-        highest_commit_cert: QuorumCert,
+        highest_ordered_cert: WrappedLedgerInfo,
+        highest_commit_cert: WrappedLedgerInfo,
         highest_2chain_timeout_cert: Option<TwoChainTimeoutCertificate>,
     ) -> Self {
         // No need to include HTC if it's lower than HQC
         let highest_2chain_timeout_cert = highest_2chain_timeout_cert
             .filter(|tc| tc.round() > highest_quorum_cert.certified_block().round());
 
-        let highest_ordered_cert =
-            Some(highest_ordered_cert).filter(|hoc| hoc != &highest_quorum_cert);
+        fail_point!("consensus::ordered_only_cert", |_| {
+            Self {
+                highest_quorum_cert: highest_quorum_cert.clone(),
+                highest_ordered_cert: Some(highest_ordered_cert.clone()),
+                highest_commit_cert: highest_ordered_cert.clone(),
+                highest_2chain_timeout_cert: highest_2chain_timeout_cert.clone(),
+            }
+        });
 
         Self {
             highest_quorum_cert,
-            highest_ordered_cert,
+            highest_ordered_cert: Some(highest_ordered_cert),
             highest_commit_cert,
             highest_2chain_timeout_cert,
         }
@@ -65,7 +78,7 @@ impl SyncInfo {
 
     pub fn new(
         highest_quorum_cert: QuorumCert,
-        highest_ordered_cert: QuorumCert,
+        highest_ordered_cert: WrappedLedgerInfo,
         highest_2chain_timeout_cert: Option<TwoChainTimeoutCertificate>,
     ) -> Self {
         let highest_commit_cert = highest_ordered_cert.clone();
@@ -83,14 +96,16 @@ impl SyncInfo {
     }
 
     /// Highest ordered certificate
-    pub fn highest_ordered_cert(&self) -> &QuorumCert {
-        self.highest_ordered_cert
-            .as_ref()
-            .unwrap_or(&self.highest_quorum_cert)
+    pub fn highest_ordered_cert(&self) -> WrappedLedgerInfo {
+        if let Some(cert) = &self.highest_ordered_cert {
+            cert.clone()
+        } else {
+            self.highest_quorum_cert.into_wrapped_ledger_info()
+        }
     }
 
     /// Highest ledger info
-    pub fn highest_commit_cert(&self) -> &QuorumCert {
+    pub fn highest_commit_cert(&self) -> &WrappedLedgerInfo {
         &self.highest_commit_cert
     }
 
@@ -124,7 +139,7 @@ impl SyncInfo {
     pub fn verify(&self, validator: &ValidatorVerifier) -> anyhow::Result<()> {
         let epoch = self.highest_quorum_cert.certified_block().epoch();
         ensure!(
-            epoch == self.highest_ordered_cert().certified_block().epoch(),
+            epoch == self.highest_ordered_cert().commit_info().epoch(),
             "Multi epoch in SyncInfo - HOC and HQC"
         );
         ensure!(
@@ -137,13 +152,17 @@ impl SyncInfo {
 
         ensure!(
             self.highest_quorum_cert.certified_block().round()
-                >= self.highest_ordered_cert().certified_block().round(),
+                >= self.highest_ordered_cert().commit_info().round(),
             "HQC has lower round than HOC"
         );
 
         ensure!(
-            self.highest_ordered_cert().certified_block().round() >= self.highest_commit_round(),
-            "HOC has lower round than HLI"
+            self.highest_ordered_round() >= self.highest_commit_round(),
+            format!(
+                "HOC {} has lower round than HLI {}",
+                self.highest_ordered_cert(),
+                self.highest_commit_cert()
+            )
         );
 
         ensure!(
@@ -156,17 +175,30 @@ impl SyncInfo {
             "HLI has empty commit info"
         );
 
+        // we don't have execution in unit tests, so this check would fail
+        #[cfg(not(any(test, feature = "fuzzing")))]
+        {
+            ensure!(
+                !self.highest_commit_cert().commit_info().is_ordered_only(),
+                "HLI {} has ordered only commit info",
+                self.highest_commit_cert().commit_info()
+            );
+        }
+
         self.highest_quorum_cert
             .verify(validator)
             .and_then(|_| {
                 self.highest_ordered_cert
                     .as_ref()
                     .map_or(Ok(()), |cert| cert.verify(validator))
+                    .context("Fail to verify ordered certificate")
             })
             .and_then(|_| {
                 // we do not verify genesis ledger info
                 if self.highest_commit_cert.commit_info().round() > 0 {
-                    self.highest_commit_cert.verify(validator)?;
+                    self.highest_commit_cert
+                        .verify(validator)
+                        .context("Fail to verify commit certificate")?
                 }
                 Ok(())
             })
diff --git a/consensus/consensus-types/src/timeout_2chain.rs b/consensus/consensus-types/src/timeout_2chain.rs
index 9fc0ced6f3c50..c0d62edc6ffb3 100644
--- a/consensus/consensus-types/src/timeout_2chain.rs
+++ b/consensus/consensus-types/src/timeout_2chain.rs
@@ -167,7 +167,7 @@ impl TwoChainTimeoutCertificate {
             .rounds()
             .iter()
             .max()
-            .expect("Empty rounds");
+            .ok_or_else(|| anyhow::anyhow!("Empty rounds"))?;
         ensure!(
             hqc_round == *signed_hqc,
             "Inconsistent hqc round, qc has round {}, highest signed round {}",
diff --git a/consensus/consensus-types/src/utils.rs b/consensus/consensus-types/src/utils.rs
new file mode 100644
index 0000000000000..3f0ec02a23251
--- /dev/null
+++ b/consensus/consensus-types/src/utils.rs
@@ -0,0 +1,266 @@
+// Copyright (c) Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use anyhow::ensure;
+use aptos_logger::error;
+use core::fmt;
+use serde::Serialize;
+use std::cmp::{max, Ordering};
+
+/// This struct always ensures the following invariants:
+/// * count <= bytes
+/// * (count > 0 && bytes > 0) || (count == 0 && bytes == 0)
+#[derive(Debug, Clone, Copy, Serialize, Default)]
+pub struct PayloadTxnsSize {
+    count: u64,
+    bytes: u64,
+}
+
+impl PayloadTxnsSize {
+    pub fn new(count: u64, bytes: u64) -> Self {
+        match Self::try_new(count, bytes) {
+            Ok(txns_size) => txns_size,
+            Err(err) => {
+                error!(
+                    "Invalid input for PayloadTxnsSize. Normalizing. Count: {}, Bytes: {}, Err: {}",
+                    count, bytes, err
+                );
+                Self::new_normalized(count, bytes)
+            },
+        }
+    }
+
+    fn new_normalized(count: u64, bytes: u64) -> Self {
+        let mut count = count;
+        let mut bytes = bytes;
+        if count > bytes {
+            bytes = count;
+        }
+        if count == 0 || bytes == 0 {
+            count = 0;
+            bytes = 0;
+        }
+        Self { count, bytes }
+    }
+
+    fn try_new(count: u64, bytes: u64) -> anyhow::Result<Self> {
+        ensure!(count <= bytes);
+        ensure!((count > 0 && bytes > 0) || (count == 0 && bytes == 0));
+
+        Ok(Self { count, bytes })
+    }
+
+    pub fn zero() -> Self {
+        Self { count: 0, bytes: 0 }
+    }
+
+    pub fn count(&self) -> u64 {
+        self.count
+    }
+
+    pub fn size_in_bytes(&self) -> u64 {
+        self.bytes
+    }
+
+    pub fn compute_pct(self, pct: u8) -> Self {
+        Self::new_normalized(self.count * pct as u64 / 100, self.bytes * pct as u64 / 100)
+    }
+
+    pub fn saturating_sub(self, rhs: Self) -> Self {
+        Self::new_normalized(
+            self.count.saturating_sub(rhs.count),
+            self.bytes.saturating_sub(rhs.bytes),
+        )
+    }
+
+    pub fn set_count(&mut self, new_count: u64) {
+        if let Err(e) = self.try_set_count(new_count) {
+            error!(
+                "Invalid set count. Resetting bytes. new_count: {}, Error: {}",
+                new_count, e
+            );
+            *self = Self::new_normalized(new_count, new_count);
+        }
+    }
+
+    pub fn try_set_count(&mut self, new_count: u64) -> anyhow::Result<()> {
+        *self = Self::try_new(new_count, self.bytes)?;
+        Ok(())
+    }
+
+    /// Computes a new [PayloadTxnsSize] whose size in bytes is the passed-in value and the
+    /// count is calculated proportional to bytes. If the existing PayloadTxnsSize is zero
+    /// then the new size replaces both the count and size in bytes.
+    pub fn compute_with_bytes(&self, new_size_in_bytes: u64) -> PayloadTxnsSize {
+        let new_count = if self.bytes > 0 {
+            let factor = new_size_in_bytes as f64 / self.bytes as f64;
+            max((self.count as f64 * factor) as u64, 1u64)
+        } else {
+            // If bytes is zero, then count is zero. In this case, set the new
+            // count to be the same as bytes.
+            new_size_in_bytes
+        };
+        PayloadTxnsSize::new_normalized(new_count, new_size_in_bytes)
+    }
+
+    pub fn minimum(self, other: Self) -> Self {
+        let count = self.count.min(other.count);
+        let bytes = self.bytes.min(other.bytes);
+        PayloadTxnsSize::new_normalized(count, bytes)
+    }
+
+    pub fn maximum(self, other: Self) -> Self {
+        let count = self.count.max(other.count);
+        let bytes = self.bytes.max(other.bytes);
+        PayloadTxnsSize::new_normalized(count, bytes)
+    }
+}
+
+impl std::ops::Add for PayloadTxnsSize {
+    type Output = Self;
+
+    fn add(self, rhs: Self) -> Self::Output {
+        Self::new_normalized(self.count + rhs.count, self.bytes + rhs.bytes)
+    }
+}
+
+impl std::ops::AddAssign for PayloadTxnsSize {
+    fn add_assign(&mut self, rhs: Self) {
+        *self = Self::new_normalized(self.count + rhs.count, self.bytes + rhs.bytes);
+    }
+}
+
+impl std::ops::Sub for PayloadTxnsSize {
+    type Output = Self;
+
+    fn sub(self, rhs: Self) -> Self::Output {
+        Self::new_normalized(self.count - rhs.count, self.bytes - rhs.bytes)
+    }
+}
+
+impl std::ops::SubAssign for PayloadTxnsSize {
+    fn sub_assign(&mut self, rhs: Self) {
+        *self = Self::new_normalized(self.count - rhs.count, self.bytes - rhs.bytes);
+    }
+}
+
+impl PartialEq for PayloadTxnsSize {
+    fn eq(&self, other: &Self) -> bool {
+        self.count == other.count && self.bytes == other.bytes
+    }
+}
+
+impl PartialOrd for PayloadTxnsSize {
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+        if self.count == other.count && self.bytes == other.bytes {
+            return Some(Ordering::Equal);
+        }
+
+        if self.count > other.count || self.bytes > other.bytes {
+            return Some(Ordering::Greater);
+        }
+
+        if self.count < other.count && self.bytes < other.bytes {
+            return Some(Ordering::Less);
+        }
+
+        None
+    }
+}
+
+impl Eq for PayloadTxnsSize {}
+
+impl fmt::Display for PayloadTxnsSize {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(
+            f,
+            "PayloadTxnsSize[count: {}, bytes: {}]",
+            self.count, self.bytes
+        )
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::PayloadTxnsSize;
+
+    #[test]
+    fn test_payload_txns_size_operations() {
+        let txns_size = PayloadTxnsSize::new(100, 100);
+        assert_eq!(txns_size.compute_pct(90), PayloadTxnsSize::new(90, 90));
+        assert_eq!(txns_size.compute_pct(50), PayloadTxnsSize::new(50, 50));
+
+        let mut txns_size2 = txns_size;
+        txns_size2.set_count(50);
+        assert_eq!(txns_size2, PayloadTxnsSize::new(50, 100));
+        txns_size2.set_count(200);
+        assert_eq!(txns_size2, PayloadTxnsSize::new(200, 200));
+
+        let txns_size3 = txns_size;
+        let txns_size4 = txns_size;
+        assert_eq!(txns_size3 + txns_size4, PayloadTxnsSize::new(200, 200));
+        assert_eq!(txns_size3 - txns_size4, PayloadTxnsSize::zero());
+
+        let mut txns_size5 = txns_size;
+        txns_size5 += txns_size3;
+        assert_eq!(txns_size5, PayloadTxnsSize::new(200, 200));
+        txns_size5 -= txns_size3;
+        assert_eq!(txns_size5, PayloadTxnsSize::new(100, 100));
+
+        assert_eq!(
+            txns_size.compute_with_bytes(200),
+            PayloadTxnsSize::new(200, 200)
+        );
+        assert_eq!(
+            txns_size.compute_with_bytes(50),
+            PayloadTxnsSize::new(50, 50)
+        );
+
+        assert_eq!(
+            txns_size.saturating_sub(txns_size2),
+            PayloadTxnsSize::zero()
+        );
+        assert_eq!(
+            txns_size2.saturating_sub(txns_size),
+            PayloadTxnsSize::new(100, 100)
+        );
+
+        let txns_size5 = PayloadTxnsSize::zero();
+        assert_eq!(
+            txns_size5.compute_with_bytes(100),
+            PayloadTxnsSize::new(100, 100)
+        );
+
+        let txns_size6 = PayloadTxnsSize::new(10, 30);
+        let txns_size7 = PayloadTxnsSize::new(20, 20);
+        assert_eq!(txns_size6.minimum(txns_size7), PayloadTxnsSize::new(10, 20));
+        assert_eq!(txns_size6.maximum(txns_size7), PayloadTxnsSize::new(20, 30));
+
+        assert_eq!(
+            txns_size6.saturating_sub(txns_size7),
+            PayloadTxnsSize::zero()
+        );
+
+        assert_eq!(
+            PayloadTxnsSize::try_new(100, 0).unwrap_err().to_string(),
+            "Condition failed: `count <= bytes` (100 vs 0)"
+        );
+        assert_eq!(
+            PayloadTxnsSize::try_new(100, 10).unwrap_err().to_string(),
+            "Condition failed: `count <= bytes` (100 vs 10)"
+        );
+
+        let mut txns_size8 = txns_size;
+        assert_eq!(
+            txns_size8.try_set_count(200).unwrap_err().to_string(),
+            "Condition failed: `count <= bytes` (200 vs 100)"
+        );
+        txns_size8.set_count(200);
+        assert_eq!(txns_size8, PayloadTxnsSize::new(200, 200));
+
+        let txns_size9 = PayloadTxnsSize::new(3, 3000);
+        let txns_size10 = PayloadTxnsSize::new(2, 100);
+        let txns_size11 = PayloadTxnsSize::new(2, 200);
+        assert!(txns_size10 + txns_size11 > txns_size9);
+    }
+}
diff --git a/consensus/consensus-types/src/vote_data.rs b/consensus/consensus-types/src/vote_data.rs
index 7619b25ec5ac0..c66f619608694 100644
--- a/consensus/consensus-types/src/vote_data.rs
+++ b/consensus/consensus-types/src/vote_data.rs
@@ -39,7 +39,6 @@ impl VoteData {
         Self { proposed, parent }
     }
 
-    #[cfg(any(test, feature = "fuzzing"))]
     pub fn dummy() -> Self {
         Self {
             proposed: BlockInfo::empty(),
diff --git a/consensus/consensus-types/src/vote_msg.rs b/consensus/consensus-types/src/vote_msg.rs
index 6a071fcdfe1ba..b12785afd60d3 100644
--- a/consensus/consensus-types/src/vote_msg.rs
+++ b/consensus/consensus-types/src/vote_msg.rs
@@ -23,7 +23,11 @@ pub struct VoteMsg {
 
 impl Display for VoteMsg {
     fn fmt(&self, f: &mut Formatter) -> std::fmt::Result {
-        write!(f, "VoteMsg: [{}]", self.vote,)
+        write!(
+            f,
+            "VoteMsg: [{}], SyncInfo: [{}]",
+            self.vote, self.sync_info
+        )
     }
 }
 
diff --git a/consensus/consensus-types/src/wrapped_ledger_info.rs b/consensus/consensus-types/src/wrapped_ledger_info.rs
new file mode 100644
index 0000000000000..6125f85ca2c94
--- /dev/null
+++ b/consensus/consensus-types/src/wrapped_ledger_info.rs
@@ -0,0 +1,135 @@
+// Copyright © Aptos Foundation
+// Parts of the project are originally copyright © Meta Platforms, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{quorum_cert::QuorumCert, vote_data::VoteData};
+use anyhow::{ensure, Context};
+use aptos_crypto::hash::CryptoHash;
+use aptos_types::{
+    block_info::BlockInfo, ledger_info::LedgerInfoWithSignatures,
+    validator_verifier::ValidatorVerifier,
+};
+use serde::{Deserialize, Serialize};
+use std::fmt::{Display, Formatter};
+
+/// This struct is similar to QuorumCert, except that the verify function doesn't verify vote_data.
+/// This struct is introduced to ensure backward compatibility when upgrading the consensus to use
+/// order votes to execute blocks faster. When order votes are enabled, then vote_data and
+/// consensus_data_hash inside signed_ledger_info are not used anywhere in the code and can be set
+/// to dummy values.
+#[derive(Deserialize, Serialize, Clone, Debug, Eq, PartialEq)]
+pub struct WrappedLedgerInfo {
+    /// The VoteData here is placeholder for backwards compatibility purpose and should not be used
+    /// when order votes are enabled.
+    vote_data: VoteData,
+    /// The signed LedgerInfo of a committed block that carries the data about the certified block.
+    signed_ledger_info: LedgerInfoWithSignatures,
+}
+
+impl Display for WrappedLedgerInfo {
+    fn fmt(&self, f: &mut Formatter) -> std::fmt::Result {
+        write!(
+            f,
+            "WrappedLedgerInfo: [{}, {}]",
+            self.vote_data, self.signed_ledger_info
+        )
+    }
+}
+
+impl WrappedLedgerInfo {
+    pub fn new(vote_data: VoteData, signed_ledger_info: LedgerInfoWithSignatures) -> Self {
+        WrappedLedgerInfo {
+            vote_data,
+            signed_ledger_info,
+        }
+    }
+
+    #[cfg(any(test, feature = "fuzzing"))]
+    pub fn dummy() -> Self {
+        Self {
+            vote_data: VoteData::dummy(),
+            signed_ledger_info: LedgerInfoWithSignatures::new(
+                aptos_types::ledger_info::LedgerInfo::dummy(),
+                aptos_types::aggregate_signature::AggregateSignature::empty(),
+            ),
+        }
+    }
+
+    fn verify_consensus_data_hash(&self) -> anyhow::Result<()> {
+        let vote_hash = self.vote_data.hash();
+        ensure!(
+            self.ledger_info().ledger_info().consensus_data_hash() == vote_hash,
+            "WrappedLedgerInfo's vote data hash mismatch LedgerInfo"
+        );
+        Ok(())
+    }
+
+    pub fn certified_block(&self, order_vote_enabled: bool) -> anyhow::Result<&BlockInfo> {
+        ensure!(
+            !order_vote_enabled,
+            "wrapped_ledger_info.certified_block should not be called when order votes are enabled"
+        );
+        self.verify_consensus_data_hash()?;
+        Ok(self.vote_data.proposed())
+    }
+
+    pub fn ledger_info(&self) -> &LedgerInfoWithSignatures {
+        &self.signed_ledger_info
+    }
+
+    pub fn commit_info(&self) -> &BlockInfo {
+        self.ledger_info().ledger_info().commit_info()
+    }
+
+    /// If the QC commits reconfiguration and starts a new epoch
+    pub fn ends_epoch(&self) -> bool {
+        self.signed_ledger_info.ledger_info().ends_epoch()
+    }
+
+    pub fn verify(&self, validator: &ValidatorVerifier) -> anyhow::Result<()> {
+        // Genesis's QC is implicitly agreed upon, it doesn't have real signatures.
+        // If someone sends us a QC on a fake genesis, it'll fail to insert into BlockStore
+        // because of the round constraint.
+
+        // TODO: Earlier, we were comparing self.certified_block().round() to 0. Now, we are
+        // comparing self.ledger_info().ledger_info().round() to 0. Is this okay?
+        if self.ledger_info().ledger_info().round() == 0 {
+            ensure!(
+                self.ledger_info().get_num_voters() == 0,
+                "Genesis QC should not carry signatures"
+            );
+            return Ok(());
+        }
+        self.ledger_info()
+            .verify_signatures(validator)
+            .context("Fail to verify WrappedLedgerInfo")?;
+        Ok(())
+    }
+
+    pub fn create_merged_with_executed_state(
+        &self,
+        executed_ledger_info: LedgerInfoWithSignatures,
+    ) -> anyhow::Result<WrappedLedgerInfo> {
+        let self_commit_info = self.commit_info();
+        let executed_commit_info = executed_ledger_info.ledger_info().commit_info();
+        ensure!(
+            self_commit_info.match_ordered_only(executed_commit_info),
+            "Block info from QC and executed LI need to match, {:?} and {:?}",
+            self_commit_info,
+            executed_commit_info
+        );
+        Ok(Self::new(self.vote_data.clone(), executed_ledger_info))
+    }
+
+    pub fn into_quorum_cert(self, order_vote_enabled: bool) -> anyhow::Result<QuorumCert> {
+        ensure!(
+            !order_vote_enabled,
+            "wrapped_ledger_info.into_quorum_cert should not be called when order votes are enabled"
+        );
+        self.verify_consensus_data_hash()?;
+        Ok(QuorumCert::new(
+            self.vote_data.clone(),
+            self.signed_ledger_info.clone(),
+        ))
+    }
+}
diff --git a/consensus/safety-rules/Cargo.toml b/consensus/safety-rules/Cargo.toml
index f1f88a7943ab9..3132a07dba70d 100644
--- a/consensus/safety-rules/Cargo.toml
+++ b/consensus/safety-rules/Cargo.toml
@@ -37,6 +37,7 @@ aptos-config = { workspace = true, features = ["fuzzing"] }
 aptos-consensus-types = { workspace = true, features = ["fuzzing"] }
 aptos-proptest-helpers = { workspace = true }
 aptos-secure-storage = { workspace = true, features = ["testing"] }
+claims = { workspace = true }
 criterion = { workspace = true }
 proptest = { workspace = true }
 rusty-fork = { workspace = true }
diff --git a/consensus/safety-rules/benches/safety_rules.rs b/consensus/safety-rules/benches/safety_rules.rs
index 772df9c01747b..3ea5bb82ffc5f 100644
--- a/consensus/safety-rules/benches/safety_rules.rs
+++ b/consensus/safety-rules/benches/safety_rules.rs
@@ -2,6 +2,8 @@
 // Parts of the project are originally copyright © Meta Platforms, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
+#![allow(clippy::unwrap_used)]
+
 use aptos_consensus_types::block::block_test_utils;
 use aptos_safety_rules::{test_utils, PersistentSafetyStorage, SafetyRulesManager, TSafetyRules};
 use aptos_secure_storage::{InMemoryStorage, KVStorage, OnDiskStorage, Storage, VaultStorage};
diff --git a/consensus/safety-rules/src/counters.rs b/consensus/safety-rules/src/counters.rs
index 17f4696b817a0..91ed83c7a6f1e 100644
--- a/consensus/safety-rules/src/counters.rs
+++ b/consensus/safety-rules/src/counters.rs
@@ -2,6 +2,8 @@
 // Parts of the project are originally copyright © Meta Platforms, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
+#![allow(clippy::unwrap_used)]
+
 use aptos_metrics_core::{
     register_histogram_vec, register_int_counter_vec, register_int_gauge_vec, HistogramTimer,
     HistogramVec, IntCounterVec, IntGaugeVec,
@@ -10,6 +12,7 @@ use once_cell::sync::Lazy;
 
 pub const EPOCH: &str = "epoch";
 pub const LAST_VOTED_ROUND: &str = "last_voted_round";
+pub const HIGHEST_TIMEOUT_ROUND: &str = "highest_timeout_round";
 pub const PREFERRED_ROUND: &str = "preferred_round";
 pub const WAYPOINT_VERSION: &str = "waypoint_version";
 
diff --git a/consensus/safety-rules/src/error.rs b/consensus/safety-rules/src/error.rs
index a9baf99a7ac93..980a3269d30c8 100644
--- a/consensus/safety-rules/src/error.rs
+++ b/consensus/safety-rules/src/error.rs
@@ -2,6 +2,7 @@
 // Parts of the project are originally copyright © Meta Platforms, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
+use aptos_crypto::HashValue;
 use serde::{Deserialize, Serialize};
 use thiserror::Error;
 
@@ -30,6 +31,8 @@ pub enum Error {
     InvalidQuorumCertificate(String),
     #[error("{0} is not set, SafetyRules is not initialized")]
     NotInitialized(String),
+    #[error("Does not satisfy order vote rule. Block Round {0}, Highest Timeout Round {1}")]
+    NotSafeForOrderVote(u64, u64),
     #[error("Data not found in secure storage: {0}")]
     SecureStorageMissingDataError(String),
     #[error("Unexpected error returned by secure storage: {0}")]
@@ -56,6 +59,8 @@ pub enum Error {
     WaypointOutOfDate(u64, u64, u64, u64),
     #[error("Invalid Timeout: {0}")]
     InvalidTimeout(String),
+    #[error("Incorrect 1-chain Quorum Certificate provided for signing order votes. Quorum Certificate: {0}, block id: {1}")]
+    InvalidOneChainQuorumCertificate(HashValue, HashValue),
 }
 
 impl From<serde_json::Error> for Error {
@@ -65,6 +70,7 @@ impl From<serde_json::Error> for Error {
 }
 
 impl From<aptos_secure_net::Error> for Error {
+    #[allow(clippy::fallible_impl_from)]
     fn from(error: aptos_secure_net::Error) -> Self {
         Self::InternalError(error.to_string())
     }
diff --git a/consensus/safety-rules/src/fuzzing_utils.rs b/consensus/safety-rules/src/fuzzing_utils.rs
index c6e2b505571b8..0ed1f9a0b6735 100644
--- a/consensus/safety-rules/src/fuzzing_utils.rs
+++ b/consensus/safety-rules/src/fuzzing_utils.rs
@@ -2,7 +2,7 @@
 // Parts of the project are originally copyright © Meta Platforms, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-#![allow(clippy::arc_with_non_send_sync)]
+#![allow(clippy::arc_with_non_send_sync, clippy::unwrap_used)]
 
 use crate::serializer::SafetyRulesInput;
 #[cfg(any(test, feature = "fuzzing"))]
@@ -10,6 +10,7 @@ use aptos_consensus_types::block::Block;
 use aptos_consensus_types::{
     block_data::{BlockData, BlockType},
     common::Payload,
+    order_vote_proposal::OrderVoteProposal,
     quorum_cert::QuorumCert,
     timeout_2chain::TwoChainTimeout,
     vote_data::VoteData,
@@ -33,6 +34,7 @@ use aptos_types::{
 };
 use proptest::prelude::*;
 use rand::{rngs::StdRng, SeedableRng};
+use std::sync::Arc;
 
 const MAX_BLOCK_SIZE: usize = 10000;
 const MAX_NUM_ADDR_TO_VALIDATOR_INFO: usize = 10;
@@ -132,6 +134,32 @@ prop_compose! {
     }
 }
 
+// This generates an arbitrary OrderVoteProposal.
+prop_compose! {
+    pub fn arb_order_vote_proposal(
+    )(
+        block in arb_block(),
+        next_epoch_state in arb_epoch_state(),
+        parent_block_info_gen in any::<BlockInfoGen>(),
+        mut parent_account_info_universe in any_with::<AccountInfoUniverse>(NUM_UNIVERSE_ACCOUNTS),
+        parent_block_size in 1..MAX_BLOCK_SIZE,
+        signed_ledger_info in any::<LedgerInfoWithSignatures>(),
+    ) -> OrderVoteProposal {
+        let proposed_block_info = block.gen_block_info(
+            HashValue::zero(),
+            0,
+            next_epoch_state,
+        );
+        let parent_block_info = parent_block_info_gen.materialize(
+            &mut parent_account_info_universe,
+            parent_block_size
+        );
+        let vote_data = VoteData::new(proposed_block_info.clone(), parent_block_info);
+        let quorum_cert = QuorumCert::new(vote_data, signed_ledger_info);
+        OrderVoteProposal::new(block, proposed_block_info, Arc::new(quorum_cert))
+    }
+}
+
 // This generates an arbitrary EpochChangeProof.
 prop_compose! {
     pub fn arb_epoch_change_proof(
@@ -229,6 +257,8 @@ pub fn arb_safety_rules_input() -> impl Strategy<Value = SafetyRulesInput> {
         arb_vote_proposal().prop_map(|input| {
             SafetyRulesInput::ConstructAndSignVoteTwoChain(Box::new(input), Box::new(None))
         }),
+        arb_order_vote_proposal()
+            .prop_map(|input| { SafetyRulesInput::ConstructAndSignOrderVote(Box::new(input)) }),
         arb_block_data().prop_map(|input| { SafetyRulesInput::SignProposal(Box::new(input)) }),
         arb_timeout().prop_map(|input| {
             SafetyRulesInput::SignTimeoutWithQC(Box::new(input), Box::new(None))
@@ -240,8 +270,8 @@ pub fn arb_safety_rules_input() -> impl Strategy<Value = SafetyRulesInput> {
 pub mod fuzzing {
     use crate::{error::Error, serializer::SafetyRulesInput, test_utils, TSafetyRules};
     use aptos_consensus_types::{
-        block_data::BlockData, timeout_2chain::TwoChainTimeout, vote::Vote,
-        vote_proposal::VoteProposal,
+        block_data::BlockData, order_vote::OrderVote, order_vote_proposal::OrderVoteProposal,
+        timeout_2chain::TwoChainTimeout, vote::Vote, vote_proposal::VoteProposal,
     };
     use aptos_crypto::bls12381;
     use aptos_types::epoch_change::EpochChangeProof;
@@ -258,6 +288,13 @@ pub mod fuzzing {
         safety_rules.construct_and_sign_vote_two_chain(&vote_proposal, None)
     }
 
+    pub fn fuzz_construct_and_sign_order_vote(
+        order_vote_proposal: OrderVoteProposal,
+    ) -> Result<OrderVote, Error> {
+        let mut safety_rules = test_utils::test_safety_rules();
+        safety_rules.construct_and_sign_order_vote(&order_vote_proposal)
+    }
+
     pub fn fuzz_handle_message(safety_rules_input: SafetyRulesInput) -> Result<Vec<u8>, Error> {
         // Create a safety rules serializer test instance for fuzzing
         let mut serializer_service = test_utils::test_serializer();
@@ -291,12 +328,12 @@ pub mod fuzzing {
 mod tests {
     use crate::{
         fuzzing::{
-            fuzz_construct_and_sign_vote_two_chain, fuzz_handle_message, fuzz_initialize,
-            fuzz_sign_proposal, fuzz_sign_timeout_with_qc,
+            fuzz_construct_and_sign_order_vote, fuzz_construct_and_sign_vote_two_chain,
+            fuzz_handle_message, fuzz_initialize, fuzz_sign_proposal, fuzz_sign_timeout_with_qc,
         },
         fuzzing_utils::{
-            arb_block_data, arb_epoch_change_proof, arb_safety_rules_input, arb_timeout,
-            arb_vote_proposal,
+            arb_block_data, arb_epoch_change_proof, arb_order_vote_proposal,
+            arb_safety_rules_input, arb_timeout, arb_vote_proposal,
         },
     };
     use proptest::prelude::*;
@@ -319,6 +356,11 @@ mod tests {
             let _ = fuzz_construct_and_sign_vote_two_chain(input);
         }
 
+        #[test]
+        fn contruct_and_sign_order_vote(input in arb_order_vote_proposal()) {
+            let _ = fuzz_construct_and_sign_order_vote(input);
+        }
+
         #[test]
         fn sign_proposal_proptest(input in arb_block_data()) {
             let _ = fuzz_sign_proposal(&input);
diff --git a/consensus/safety-rules/src/local_client.rs b/consensus/safety-rules/src/local_client.rs
index 7994ef7fbe823..97ad6634f64c2 100644
--- a/consensus/safety-rules/src/local_client.rs
+++ b/consensus/safety-rules/src/local_client.rs
@@ -5,6 +5,8 @@
 use crate::{ConsensusState, Error, SafetyRules, TSafetyRules};
 use aptos_consensus_types::{
     block_data::BlockData,
+    order_vote::OrderVote,
+    order_vote_proposal::OrderVoteProposal,
     timeout_2chain::{TwoChainTimeout, TwoChainTimeoutCertificate},
     vote::Vote,
     vote_proposal::VoteProposal,
@@ -63,6 +65,15 @@ impl TSafetyRules for LocalClient {
             .construct_and_sign_vote_two_chain(vote_proposal, timeout_cert)
     }
 
+    fn construct_and_sign_order_vote(
+        &mut self,
+        order_vote_proposal: &OrderVoteProposal,
+    ) -> Result<OrderVote, Error> {
+        self.internal
+            .write()
+            .construct_and_sign_order_vote(order_vote_proposal)
+    }
+
     fn sign_commit_vote(
         &mut self,
         ledger_info: LedgerInfoWithSignatures,
diff --git a/consensus/safety-rules/src/logging.rs b/consensus/safety-rules/src/logging.rs
index e3c661e4d13cc..a19434e4947a4 100644
--- a/consensus/safety-rules/src/logging.rs
+++ b/consensus/safety-rules/src/logging.rs
@@ -15,6 +15,7 @@ pub struct SafetyLogSchema<'a> {
     round: Option<Round>,
     preferred_round: Option<u64>,
     last_voted_round: Option<u64>,
+    highest_timeout_round: Option<u64>,
     epoch: Option<u64>,
     #[schema(display)]
     error: Option<&'a Error>,
@@ -30,6 +31,7 @@ impl<'a> SafetyLogSchema<'a> {
             round: None,
             preferred_round: None,
             last_voted_round: None,
+            highest_timeout_round: None,
             epoch: None,
             error: None,
             waypoint: None,
@@ -43,7 +45,9 @@ impl<'a> SafetyLogSchema<'a> {
 pub enum LogEntry {
     ConsensusState,
     ConstructAndSignVoteTwoChain,
+    ConstructAndSignOrderVote,
     Epoch,
+    HighestTimeoutRound,
     Initialize,
     KeyReconciliation,
     LastVotedRound,
@@ -61,7 +65,9 @@ impl LogEntry {
         match self {
             LogEntry::ConsensusState => "consensus_state",
             LogEntry::ConstructAndSignVoteTwoChain => "construct_and_sign_vote_2chain",
+            LogEntry::ConstructAndSignOrderVote => "construct_and_sign_order_vote",
             LogEntry::Epoch => "epoch",
+            LogEntry::HighestTimeoutRound => "highest_timeout_round",
             LogEntry::Initialize => "initialize",
             LogEntry::LastVotedRound => "last_voted_round",
             LogEntry::KeyReconciliation => "key_reconciliation",
diff --git a/consensus/safety-rules/src/persistent_safety_storage.rs b/consensus/safety-rules/src/persistent_safety_storage.rs
index b5823970402bf..0f3c03b9daf88 100644
--- a/consensus/safety-rules/src/persistent_safety_storage.rs
+++ b/consensus/safety-rules/src/persistent_safety_storage.rs
@@ -43,7 +43,7 @@ impl PersistentSafetyStorage {
             .expect("Unable to initialize keys and accounts in storage");
 
         // Create the new persistent safety storage
-        let safety_data = SafetyData::new(1, 0, 0, 0, None);
+        let safety_data = SafetyData::new(1, 0, 0, 0, None, 0);
         let mut persisent_safety_storage = Self {
             enable_cached_safety_data,
             cached_safety_data: Some(safety_data.clone()),
@@ -131,6 +131,10 @@ impl PersistentSafetyStorage {
         let _timer = counters::start_timer("set", SAFETY_DATA);
         counters::set_state(counters::EPOCH, data.epoch as i64);
         counters::set_state(counters::LAST_VOTED_ROUND, data.last_voted_round as i64);
+        counters::set_state(
+            counters::HIGHEST_TIMEOUT_ROUND,
+            data.highest_timeout_round as i64,
+        );
         counters::set_state(counters::PREFERRED_ROUND, data.preferred_round as i64);
 
         match self.internal_store.set(SAFETY_DATA, data.clone()) {
@@ -208,7 +212,7 @@ mod tests {
         assert_eq!(counters::get_state(counters::PREFERRED_ROUND), 0);
 
         safety_storage
-            .set_safety_data(SafetyData::new(9, 8, 1, 0, None))
+            .set_safety_data(SafetyData::new(9, 8, 1, 0, None, 0))
             .unwrap();
 
         let safety_data = safety_storage.safety_data().unwrap();
diff --git a/consensus/safety-rules/src/safety_rules.rs b/consensus/safety-rules/src/safety_rules.rs
index 60b0b8cc27a05..4072dd6aa65c1 100644
--- a/consensus/safety-rules/src/safety_rules.rs
+++ b/consensus/safety-rules/src/safety_rules.rs
@@ -13,6 +13,8 @@ use crate::{
 use aptos_consensus_types::{
     block_data::BlockData,
     common::{Author, Round},
+    order_vote::OrderVote,
+    order_vote_proposal::OrderVoteProposal,
     quorum_cert::QuorumCert,
     safety_data::SafetyData,
     timeout_2chain::{TwoChainTimeout, TwoChainTimeoutCertificate},
@@ -77,6 +79,32 @@ impl SafetyRules {
             .map_err(|error| Error::InvalidAccumulatorExtension(error.to_string()))
     }
 
+    pub(crate) fn verify_order_vote_proposal(
+        &mut self,
+        order_vote_proposal: &OrderVoteProposal,
+    ) -> Result<(), Error> {
+        let proposed_block = order_vote_proposal.block();
+        let safety_data = self.persistent_storage.safety_data()?;
+
+        self.verify_epoch(proposed_block.epoch(), &safety_data)?;
+
+        let qc = order_vote_proposal.quorum_cert();
+        if qc.certified_block() != order_vote_proposal.block_info() {
+            return Err(Error::InvalidOneChainQuorumCertificate(
+                qc.certified_block().id(),
+                order_vote_proposal.block_info().id(),
+            ));
+        }
+        if qc.certified_block().id() != proposed_block.id() {
+            return Err(Error::InvalidOneChainQuorumCertificate(
+                qc.certified_block().id(),
+                proposed_block.id(),
+            ));
+        }
+        self.verify_qc(qc)?;
+        Ok(())
+    }
+
     pub(crate) fn sign<T: Serialize + CryptoHash>(
         &self,
         message: &T,
@@ -122,6 +150,20 @@ impl SafetyRules {
         updated
     }
 
+    pub(crate) fn update_highest_timeout_round(
+        &self,
+        timeout: &TwoChainTimeout,
+        safety_data: &mut SafetyData,
+    ) {
+        if timeout.round() > safety_data.highest_timeout_round {
+            safety_data.highest_timeout_round = timeout.round();
+            trace!(
+                SafetyLogSchema::new(LogEntry::HighestTimeoutRound, LogEvent::Update)
+                    .highest_timeout_round(safety_data.highest_timeout_round)
+            );
+        }
+    }
+
     /// Second voting rule
     fn verify_and_update_preferred_round(
         &mut self,
@@ -250,6 +292,7 @@ impl SafetyRules {
                     0,
                     0,
                     None,
+                    0,
                 ))?;
 
                 info!(SafetyLogSchema::new(LogEntry::Epoch, LogEvent::Update)
@@ -334,7 +377,17 @@ impl SafetyRules {
 
         let old_ledger_info = ledger_info.ledger_info();
 
-        if !old_ledger_info.commit_info().is_ordered_only() {
+        if !old_ledger_info.commit_info().is_ordered_only()
+            // When doing fast forward sync, we pull the latest blocks and quorum certs from peers
+            // and store them in storage. We then compute the root ordered cert and root commit cert
+            // from storage and start the consensus from there. But given that we are not storing the
+            // ordered cert obtained from order votes in storage, instead of obtaining the root ordered cert
+            // from storage, we set root ordered cert to commit certificate.
+            // This means, the root ordered cert will not have a dummy executed_state_id in this case.
+            // To handle this, we do not raise error if the old_ledger_info.commit_info() matches with
+            // new_ledger_info.commit_info().
+            && old_ledger_info.commit_info() != new_ledger_info.commit_info()
+        {
             return Err(Error::InvalidOrderedLedgerInfo(old_ledger_info.to_string()));
         }
 
@@ -406,6 +459,14 @@ impl TSafetyRules for SafetyRules {
         )
     }
 
+    fn construct_and_sign_order_vote(
+        &mut self,
+        order_vote_proposal: &OrderVoteProposal,
+    ) -> Result<OrderVote, Error> {
+        let cb = || self.guarded_construct_and_sign_order_vote(order_vote_proposal);
+        run_and_log(cb, |log| log, LogEntry::ConstructAndSignOrderVote)
+    }
+
     fn sign_commit_vote(
         &mut self,
         ledger_info: LedgerInfoWithSignatures,
diff --git a/consensus/safety-rules/src/safety_rules_2chain.rs b/consensus/safety-rules/src/safety_rules_2chain.rs
index b3ac49c1fde74..e93d2cd187405 100644
--- a/consensus/safety-rules/src/safety_rules_2chain.rs
+++ b/consensus/safety-rules/src/safety_rules_2chain.rs
@@ -5,6 +5,8 @@
 use crate::{error::Error, safety_rules::next_round, SafetyRules};
 use aptos_consensus_types::{
     block::Block,
+    order_vote::OrderVote,
+    order_vote_proposal::OrderVoteProposal,
     safety_data::SafetyData,
     timeout_2chain::{TwoChainTimeout, TwoChainTimeoutCertificate},
     vote::Vote,
@@ -39,8 +41,9 @@ impl SafetyRules {
         }
         if timeout.round() > safety_data.last_voted_round {
             self.verify_and_update_last_vote_round(timeout.round(), &mut safety_data)?;
-            self.persistent_storage.set_safety_data(safety_data)?;
         }
+        self.update_highest_timeout_round(timeout, &mut safety_data);
+        self.persistent_storage.set_safety_data(safety_data)?;
 
         let signature = self.sign(&timeout.signing_format())?;
         Ok(signature)
@@ -90,6 +93,30 @@ impl SafetyRules {
         Ok(vote)
     }
 
+    pub(crate) fn guarded_construct_and_sign_order_vote(
+        &mut self,
+        order_vote_proposal: &OrderVoteProposal,
+    ) -> Result<OrderVote, Error> {
+        // Exit early if we cannot sign
+        self.signer()?;
+        self.verify_order_vote_proposal(order_vote_proposal)?;
+        let proposed_block = order_vote_proposal.block();
+        let mut safety_data = self.persistent_storage.safety_data()?;
+
+        // Record 1-chain data
+        self.observe_qc(order_vote_proposal.quorum_cert(), &mut safety_data);
+
+        self.safe_for_order_vote(proposed_block, &safety_data)?;
+        // Construct and sign order vote
+        let author = self.signer()?.author();
+        let ledger_info =
+            LedgerInfo::new(order_vote_proposal.block_info().clone(), HashValue::zero());
+        let signature = self.sign(&ledger_info)?;
+        let order_vote = OrderVote::new_with_signature(author, ledger_info.clone(), signature);
+        self.persistent_storage.set_safety_data(safety_data)?;
+        Ok(order_vote)
+    }
+
     /// Core safety timeout rule for 2-chain protocol. Return success if 1 and 2 are true
     /// 1. round == timeout.qc.round + 1 || round == tc.round + 1
     /// 2. timeout.qc.round >= one_chain_round
@@ -137,6 +164,18 @@ impl SafetyRules {
         }
     }
 
+    fn safe_for_order_vote(&self, block: &Block, safety_data: &SafetyData) -> Result<(), Error> {
+        let round = block.round();
+        if round > safety_data.highest_timeout_round {
+            Ok(())
+        } else {
+            Err(Error::NotSafeForOrderVote(
+                round,
+                safety_data.highest_timeout_round,
+            ))
+        }
+    }
+
     fn verify_tc(&self, tc: &TwoChainTimeoutCertificate) -> Result<(), Error> {
         let epoch_state = self.epoch_state()?;
 
diff --git a/consensus/safety-rules/src/safety_rules_manager.rs b/consensus/safety-rules/src/safety_rules_manager.rs
index c73664be47344..f0e743d3d9dbb 100644
--- a/consensus/safety-rules/src/safety_rules_manager.rs
+++ b/consensus/safety-rules/src/safety_rules_manager.rs
@@ -52,7 +52,10 @@ pub fn storage(config: &SafetyRulesConfig) -> PersistentSafetyStorage {
             config.initial_safety_rules_config,
             InitialSafetyRulesConfig::None
         ) {
-            let identity_blob = config.initial_safety_rules_config.identity_blob().unwrap();
+            let identity_blob = config
+                .initial_safety_rules_config
+                .identity_blob()
+                .expect("No identity blob in initial safety rules config");
             let waypoint = config.initial_safety_rules_config.waypoint();
 
             let backend = &config.backend;
diff --git a/consensus/safety-rules/src/serializer.rs b/consensus/safety-rules/src/serializer.rs
index 2cef5bce865ec..e72fdc1ea28ca 100644
--- a/consensus/safety-rules/src/serializer.rs
+++ b/consensus/safety-rules/src/serializer.rs
@@ -5,6 +5,8 @@
 use crate::{counters, logging::LogEntry, ConsensusState, Error, SafetyRules, TSafetyRules};
 use aptos_consensus_types::{
     block_data::BlockData,
+    order_vote::OrderVote,
+    order_vote_proposal::OrderVoteProposal,
     timeout_2chain::{TwoChainTimeout, TwoChainTimeoutCertificate},
     vote::Vote,
     vote_proposal::VoteProposal,
@@ -28,6 +30,7 @@ pub enum SafetyRulesInput {
         Box<Option<TwoChainTimeoutCertificate>>,
     ),
     ConstructAndSignVoteTwoChain(Box<VoteProposal>, Box<Option<TwoChainTimeoutCertificate>>),
+    ConstructAndSignOrderVote(Box<OrderVoteProposal>),
     SignCommitVote(Box<LedgerInfoWithSignatures>, Box<LedgerInfo>),
 }
 
@@ -64,6 +67,11 @@ impl SerializerService {
                     ),
                 )
             },
+            SafetyRulesInput::ConstructAndSignOrderVote(order_vote_proposal) => serde_json::to_vec(
+                &self
+                    .internal
+                    .construct_and_sign_order_vote(&order_vote_proposal),
+            ),
             SafetyRulesInput::SignCommitVote(ledger_info, new_ledger_info) => serde_json::to_vec(
                 &self
                     .internal
@@ -141,6 +149,18 @@ impl TSafetyRules for SerializerClient {
         serde_json::from_slice(&response)?
     }
 
+    fn construct_and_sign_order_vote(
+        &mut self,
+        order_vote_proposal: &OrderVoteProposal,
+    ) -> Result<OrderVote, Error> {
+        let _timer =
+            counters::start_timer("external", LogEntry::ConstructAndSignOrderVote.as_str());
+        let response = self.request(SafetyRulesInput::ConstructAndSignOrderVote(Box::new(
+            order_vote_proposal.clone(),
+        )))?;
+        serde_json::from_slice(&response)?
+    }
+
     fn sign_commit_vote(
         &mut self,
         ledger_info: LedgerInfoWithSignatures,
diff --git a/consensus/safety-rules/src/t_safety_rules.rs b/consensus/safety-rules/src/t_safety_rules.rs
index 33cc1d59b204c..4dd9d6346900a 100644
--- a/consensus/safety-rules/src/t_safety_rules.rs
+++ b/consensus/safety-rules/src/t_safety_rules.rs
@@ -5,6 +5,8 @@
 use crate::{ConsensusState, Error};
 use aptos_consensus_types::{
     block_data::BlockData,
+    order_vote::OrderVote,
+    order_vote_proposal::OrderVoteProposal,
     timeout_2chain::{TwoChainTimeout, TwoChainTimeoutCertificate},
     vote::Vote,
     vote_proposal::VoteProposal,
@@ -45,6 +47,12 @@ pub trait TSafetyRules {
         timeout_cert: Option<&TwoChainTimeoutCertificate>,
     ) -> Result<Vote, Error>;
 
+    /// Attempts to create an order vote for a block given the quroum certificate for the block.
+    fn construct_and_sign_order_vote(
+        &mut self,
+        order_vote_proposal: &OrderVoteProposal,
+    ) -> Result<OrderVote, Error>;
+
     /// As the holder of the private key, SafetyRules also signs a commit vote.
     /// This returns the signature for the commit vote.
     fn sign_commit_vote(
diff --git a/consensus/safety-rules/src/tests/mod.rs b/consensus/safety-rules/src/tests/mod.rs
index 2d5c8d0b1d167..e074ae87a763d 100644
--- a/consensus/safety-rules/src/tests/mod.rs
+++ b/consensus/safety-rules/src/tests/mod.rs
@@ -2,6 +2,7 @@
 // Parts of the project are originally copyright © Meta Platforms, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
+extern crate claims;
 mod local;
 mod networking;
 mod safety_rules;
diff --git a/consensus/safety-rules/src/tests/suite.rs b/consensus/safety-rules/src/tests/suite.rs
index b0359e2268e3f..5ecc32190f748 100644
--- a/consensus/safety-rules/src/tests/suite.rs
+++ b/consensus/safety-rules/src/tests/suite.rs
@@ -2,10 +2,14 @@
 // Parts of the project are originally copyright © Meta Platforms, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::{test_utils, test_utils::make_timeout_cert, Error, TSafetyRules};
+use crate::{
+    test_utils::{self, make_timeout_cert},
+    Error, TSafetyRules,
+};
 use aptos_consensus_types::{
     block::block_test_utils::random_payload,
     common::{Payload, Round},
+    order_vote_proposal::OrderVoteProposal,
     quorum_cert::QuorumCert,
     timeout_2chain::{TwoChainTimeout, TwoChainTimeoutCertificate},
     vote_proposal::VoteProposal,
@@ -19,6 +23,8 @@ use aptos_types::{
     validator_signer::ValidatorSigner,
     validator_verifier::ValidatorVerifier,
 };
+use claims::assert_err;
+use std::sync::Arc;
 
 type Proof = test_utils::Proof;
 
@@ -69,6 +75,233 @@ pub fn run_test_suite(safety_rules: &Callback) {
     test_2chain_timeout(safety_rules);
     test_sign_commit_vote(safety_rules);
     test_bad_execution_output(safety_rules);
+    test_order_votes_correct_execution(safety_rules);
+    test_order_votes_out_of_order_execution(safety_rules);
+    test_order_votes_incorrect_qc(safety_rules);
+    test_order_votes_with_timeout(safety_rules);
+}
+
+fn test_order_votes_correct_execution(safety_rules: &Callback) {
+    let (mut safety_rules, signer) = safety_rules();
+
+    let (proof, genesis_qc) = test_utils::make_genesis(&signer);
+    let round = genesis_qc.certified_block().round();
+    let epoch = genesis_qc.certified_block().epoch();
+
+    let data = random_payload(2048);
+    //        __ tc0
+    //       /
+    // genesis -- p0 -- p1 -- p2 -- p3
+    //            \
+    //             \--  tc1
+    let p0 = test_utils::make_proposal_with_qc(round + 1, genesis_qc.clone(), &signer);
+    let tc0 = test_utils::make_timeout_cert(round + 1, p0.block().quorum_cert(), &signer);
+    let p1 = test_utils::make_proposal_with_parent(data.clone(), round + 2, &p0, None, &signer);
+    let tc1 = test_utils::make_timeout_cert(round + 2, p1.block().quorum_cert(), &signer);
+    let p2 = test_utils::make_proposal_with_parent(data.clone(), round + 3, &p1, None, &signer);
+    let p3 = test_utils::make_proposal_with_parent(data, round + 4, &p2, Some(&p0), &signer);
+
+    let ov1 = OrderVoteProposal::new(
+        p0.block().clone(),
+        p1.block().quorum_cert().certified_block().clone(),
+        Arc::new(p1.block().quorum_cert().clone()),
+    );
+    let ov2 = OrderVoteProposal::new(
+        p1.block().clone(),
+        p2.block().quorum_cert().certified_block().clone(),
+        Arc::new(p2.block().quorum_cert().clone()),
+    );
+    let ov3 = OrderVoteProposal::new(
+        p2.block().clone(),
+        p3.block().quorum_cert().certified_block().clone(),
+        Arc::new(p3.block().quorum_cert().clone()),
+    );
+
+    safety_rules.initialize(&proof).unwrap();
+
+    safety_rules.construct_and_sign_order_vote(&ov1).unwrap();
+
+    // After observing QC on block 1, can't timeout on block 0.
+    assert_err!(safety_rules.sign_timeout_with_qc(
+        &TwoChainTimeout::new(epoch, round + 1, p0.block().quorum_cert().clone()),
+        Some(&tc0),
+    ));
+
+    safety_rules.construct_and_sign_order_vote(&ov2).unwrap();
+
+    // After observing QC on block 2, can't timeout on block 1.
+    assert_err!(safety_rules.sign_timeout_with_qc(
+        &TwoChainTimeout::new(epoch, round + 2, p1.block().quorum_cert().clone()),
+        Some(&tc1),
+    ));
+
+    safety_rules.construct_and_sign_order_vote(&ov3).unwrap();
+}
+
+fn test_order_votes_out_of_order_execution(safety_rules: &Callback) {
+    let (mut safety_rules, signer) = safety_rules();
+
+    let (proof, genesis_qc) = test_utils::make_genesis(&signer);
+    let round = genesis_qc.certified_block().round();
+
+    let data = random_payload(2048);
+
+    let p0 = test_utils::make_proposal_with_qc(round + 1, genesis_qc.clone(), &signer);
+    let p1 = test_utils::make_proposal_with_parent(data.clone(), round + 2, &p0, None, &signer);
+    let p2 = test_utils::make_proposal_with_parent(data.clone(), round + 3, &p1, None, &signer);
+    let p3 = test_utils::make_proposal_with_parent(data, round + 4, &p2, Some(&p0), &signer);
+
+    let ov1 = OrderVoteProposal::new(
+        p0.block().clone(),
+        p1.block().quorum_cert().certified_block().clone(),
+        Arc::new(p1.block().quorum_cert().clone()),
+    );
+    let ov2 = OrderVoteProposal::new(
+        p1.block().clone(),
+        p2.block().quorum_cert().certified_block().clone(),
+        Arc::new(p2.block().quorum_cert().clone()),
+    );
+    let ov3 = OrderVoteProposal::new(
+        p2.block().clone(),
+        p3.block().quorum_cert().certified_block().clone(),
+        Arc::new(p3.block().quorum_cert().clone()),
+    );
+
+    safety_rules.initialize(&proof).unwrap();
+
+    safety_rules.construct_and_sign_order_vote(&ov1).unwrap();
+
+    safety_rules.construct_and_sign_order_vote(&ov3).unwrap();
+
+    safety_rules.construct_and_sign_order_vote(&ov2).unwrap();
+
+    safety_rules
+        .construct_and_sign_vote_two_chain(&p0, None)
+        .unwrap();
+    safety_rules
+        .construct_and_sign_vote_two_chain(&p1, None)
+        .unwrap();
+    safety_rules
+        .construct_and_sign_vote_two_chain(&p2, None)
+        .unwrap();
+    safety_rules
+        .construct_and_sign_vote_two_chain(&p3, None)
+        .unwrap();
+}
+
+fn test_order_votes_incorrect_qc(safety_rules: &Callback) {
+    let (mut safety_rules, signer) = safety_rules();
+
+    let (proof, genesis_qc) = test_utils::make_genesis(&signer);
+    let round = genesis_qc.certified_block().round();
+
+    let data = random_payload(2048);
+
+    let p0 = test_utils::make_proposal_with_qc(round + 1, genesis_qc.clone(), &signer);
+    let p1 = test_utils::make_proposal_with_parent(data.clone(), round + 2, &p0, None, &signer);
+    let p2 = test_utils::make_proposal_with_parent(data.clone(), round + 3, &p1, None, &signer);
+    let p3 = test_utils::make_proposal_with_parent(data, round + 4, &p2, Some(&p0), &signer);
+
+    let ov1 = OrderVoteProposal::new(
+        p0.block().clone(),
+        p1.block().quorum_cert().certified_block().clone(),
+        Arc::new(p1.block().quorum_cert().clone()),
+    );
+    let ov2 = OrderVoteProposal::new(
+        p1.block().clone(),
+        p3.block().quorum_cert().certified_block().clone(),
+        Arc::new(p2.block().quorum_cert().clone()),
+    );
+    let ov3 = OrderVoteProposal::new(
+        p2.block().clone(),
+        p2.block().quorum_cert().certified_block().clone(),
+        Arc::new(p2.block().quorum_cert().clone()),
+    );
+
+    safety_rules.initialize(&proof).unwrap();
+
+    safety_rules.construct_and_sign_order_vote(&ov1).unwrap();
+
+    assert_err!(safety_rules.construct_and_sign_order_vote(&ov2));
+
+    assert_err!(safety_rules.construct_and_sign_order_vote(&ov3));
+}
+
+fn test_order_votes_with_timeout(safety_rules: &Callback) {
+    let (mut safety_rules, signer) = safety_rules();
+
+    let (proof, genesis_qc) = test_utils::make_genesis(&signer);
+    let round = genesis_qc.certified_block().round();
+    let epoch = genesis_qc.certified_block().epoch();
+
+    let data = random_payload(2048);
+    //               __ tc1 __   __ tc3 __ p4b
+    //              /         \ /
+    // genesis --- p0          p2 -- p3 -- p4a
+
+    // ov1 orders p0
+    // ov3 orders p2
+    // ov4 orders p3
+
+    let p0 = test_utils::make_proposal_with_qc(round + 1, genesis_qc.clone(), &signer);
+    let p1 = test_utils::make_proposal_with_parent(data.clone(), round + 2, &p0, None, &signer);
+    let tc1 = test_utils::make_timeout_cert(round + 2, p1.block().quorum_cert(), &signer);
+    let p2 = test_utils::make_proposal_with_parent(data.clone(), round + 3, &p0, None, &signer);
+    let p3 = test_utils::make_proposal_with_parent(data.clone(), round + 4, &p2, None, &signer);
+    let tc3 = test_utils::make_timeout_cert(round + 4, p3.block().quorum_cert(), &signer);
+    let p4a = test_utils::make_proposal_with_parent(data.clone(), round + 5, &p3, None, &signer);
+    let p4b = test_utils::make_proposal_with_parent(data, round + 5, &p2, None, &signer);
+
+    let ov1 = OrderVoteProposal::new(
+        p0.block().clone(),
+        p1.block().quorum_cert().certified_block().clone(),
+        Arc::new(p1.block().quorum_cert().clone()),
+    );
+    let ov3 = OrderVoteProposal::new(
+        p2.block().clone(),
+        p3.block().quorum_cert().certified_block().clone(),
+        Arc::new(p3.block().quorum_cert().clone()),
+    );
+    let ov4 = OrderVoteProposal::new(
+        p3.block().clone(),
+        p4a.block().quorum_cert().certified_block().clone(),
+        Arc::new(p4a.block().quorum_cert().clone()),
+    );
+
+    safety_rules.initialize(&proof).unwrap();
+
+    safety_rules
+        .construct_and_sign_vote_two_chain(&p0, None)
+        .unwrap();
+
+    safety_rules
+        .construct_and_sign_vote_two_chain(&p2, Some(&tc1))
+        .unwrap();
+
+    // The validator hasn't signed timeout for round 2, but has received timeout certificate for round 2.
+    // The validator can still sign order vote for round 1. But all the 2f+1 validators who signed timeout certificate
+    // can't order vote for round 1. So, 2f+1 order votes can't be formed for round 1.
+    safety_rules.construct_and_sign_order_vote(&ov1).unwrap();
+
+    safety_rules
+        .sign_timeout_with_qc(
+            &TwoChainTimeout::new(epoch, round + 4, p3.block().quorum_cert().clone()),
+            Some(&tc3),
+        )
+        .unwrap();
+
+    // Cannot sign order vote for round 3 after signing timeout for round 4
+    assert_err!(safety_rules.construct_and_sign_order_vote(&ov3));
+
+    // Cannot sign vote for round 4 after signing timeout for round 4
+    assert_err!(safety_rules.construct_and_sign_vote_two_chain(&p3, None));
+
+    safety_rules
+        .construct_and_sign_vote_two_chain(&p4b, Some(&tc3))
+        .unwrap();
+
+    // Cannot sign order vote for round 4 after signing timeoiut for round 4
+    assert_err!(safety_rules.construct_and_sign_order_vote(&ov4));
 }
 
 fn test_bad_execution_output(safety_rules: &Callback) {
diff --git a/consensus/src/block_preparer.rs b/consensus/src/block_preparer.rs
index ca92f1b835e15..7e82e81647ec8 100644
--- a/consensus/src/block_preparer.rs
+++ b/consensus/src/block_preparer.rs
@@ -3,7 +3,7 @@
 
 use crate::{
     counters::{MAX_TXNS_FROM_BLOCK_TO_EXECUTE, TXN_SHUFFLE_SECONDS},
-    payload_manager::PayloadManager,
+    payload_manager::TPayloadManager,
     transaction_deduper::TransactionDeduper,
     transaction_filter::TransactionFilter,
     transaction_shuffler::TransactionShuffler,
@@ -11,10 +11,11 @@ use crate::{
 use aptos_consensus_types::block::Block;
 use aptos_executor_types::ExecutorResult;
 use aptos_types::transaction::SignedTransaction;
+use fail::fail_point;
 use std::sync::Arc;
 
 pub struct BlockPreparer {
-    payload_manager: Arc<PayloadManager>,
+    payload_manager: Arc<dyn TPayloadManager>,
     txn_filter: Arc<TransactionFilter>,
     txn_deduper: Arc<dyn TransactionDeduper>,
     txn_shuffler: Arc<dyn TransactionShuffler>,
@@ -22,7 +23,7 @@ pub struct BlockPreparer {
 
 impl BlockPreparer {
     pub fn new(
-        payload_manager: Arc<PayloadManager>,
+        payload_manager: Arc<dyn TPayloadManager>,
         txn_filter: Arc<TransactionFilter>,
         txn_deduper: Arc<dyn TransactionDeduper>,
         txn_shuffler: Arc<dyn TransactionShuffler>,
@@ -36,6 +37,12 @@ impl BlockPreparer {
     }
 
     pub async fn prepare_block(&self, block: &Block) -> ExecutorResult<Vec<SignedTransaction>> {
+        fail_point!("consensus::prepare_block", |_| {
+            use aptos_executor_types::ExecutorError;
+            use std::{thread, time::Duration};
+            thread::sleep(Duration::from_millis(10));
+            Err(ExecutorError::CouldNotGetData)
+        });
         let (txns, max_txns_from_block_to_execute) =
             self.payload_manager.get_transactions(block).await?;
         let txn_filter = self.txn_filter.clone();
@@ -54,7 +61,7 @@ impl BlockPreparer {
             };
 
             if let Some(max_txns_from_block_to_execute) = max_txns_from_block_to_execute {
-                shuffled_txns.truncate(max_txns_from_block_to_execute);
+                shuffled_txns.truncate(max_txns_from_block_to_execute as usize);
             }
             MAX_TXNS_FROM_BLOCK_TO_EXECUTE.observe(shuffled_txns.len() as f64);
             Ok(shuffled_txns)
diff --git a/consensus/src/block_storage/block_store.rs b/consensus/src/block_storage/block_store.rs
index 84611d65a46cb..8670e161602da 100644
--- a/consensus/src/block_storage/block_store.rs
+++ b/consensus/src/block_storage/block_store.rs
@@ -5,11 +5,12 @@
 use crate::{
     block_storage::{
         block_tree::BlockTree,
+        pending_blocks::PendingBlocks,
         tracing::{observe_block, BlockStage},
         BlockReader,
     },
     counters,
-    payload_manager::PayloadManager,
+    payload_manager::TPayloadManager,
     persistent_liveness_storage::{
         PersistentLivenessStorage, RecoveryData, RootInfo, RootMetadata,
     },
@@ -18,19 +19,26 @@ use crate::{
 };
 use anyhow::{bail, ensure, format_err, Context};
 use aptos_consensus_types::{
-    block::Block, common::Round, pipelined_block::PipelinedBlock, quorum_cert::QuorumCert,
-    sync_info::SyncInfo, timeout_2chain::TwoChainTimeoutCertificate,
+    block::Block,
+    common::Round,
+    pipelined_block::{ExecutionSummary, PipelinedBlock},
+    quorum_cert::QuorumCert,
+    sync_info::SyncInfo,
+    timeout_2chain::TwoChainTimeoutCertificate,
+    wrapped_ledger_info::WrappedLedgerInfo,
 };
 use aptos_crypto::{hash::ACCUMULATOR_PLACEHOLDER_HASH, HashValue};
 use aptos_executor_types::StateComputeResult;
-use aptos_infallible::RwLock;
+use aptos_infallible::{Mutex, RwLock};
 use aptos_logger::prelude::*;
 use aptos_types::ledger_info::LedgerInfoWithSignatures;
 use futures::executor::block_on;
 #[cfg(test)]
 use std::collections::VecDeque;
 #[cfg(any(test, feature = "fuzzing"))]
-use std::sync::atomic::{AtomicBool, Ordering};
+use std::sync::atomic::AtomicBool;
+#[cfg(any(test, feature = "fuzzing"))]
+use std::sync::atomic::Ordering;
 use std::{sync::Arc, time::Duration};
 
 #[cfg(test)]
@@ -72,9 +80,11 @@ pub struct BlockStore {
     time_service: Arc<dyn TimeService>,
     // consistent with round type
     vote_back_pressure_limit: Round,
-    payload_manager: Arc<PayloadManager>,
+    payload_manager: Arc<dyn TPayloadManager>,
     #[cfg(any(test, feature = "fuzzing"))]
     back_pressure_for_test: AtomicBool,
+    order_vote_enabled: bool,
+    pending_blocks: Arc<Mutex<PendingBlocks>>,
 }
 
 impl BlockStore {
@@ -85,7 +95,9 @@ impl BlockStore {
         max_pruned_blocks_in_mem: usize,
         time_service: Arc<dyn TimeService>,
         vote_back_pressure_limit: Round,
-        payload_manager: Arc<PayloadManager>,
+        payload_manager: Arc<dyn TPayloadManager>,
+        order_vote_enabled: bool,
+        pending_blocks: Arc<Mutex<PendingBlocks>>,
     ) -> Self {
         let highest_2chain_tc = initial_data.highest_2chain_timeout_certificate();
         let (root, root_metadata, blocks, quorum_certs) = initial_data.take();
@@ -101,6 +113,8 @@ impl BlockStore {
             time_service,
             vote_back_pressure_limit,
             payload_manager,
+            order_vote_enabled,
+            pending_blocks,
         ));
         block_on(block_store.try_send_for_execution());
         block_store
@@ -108,10 +122,8 @@ impl BlockStore {
 
     async fn try_send_for_execution(&self) {
         // reproduce the same batches (important for the commit phase)
-
         let mut certs = self.inner.read().get_all_quorum_certs_with_commit_info();
         certs.sort_unstable_by_key(|qc| qc.commit_info().round());
-
         for qc in certs {
             if qc.commit_info().round() > self.commit_root().round() {
                 info!(
@@ -120,7 +132,7 @@ impl BlockStore {
                     qc.ledger_info()
                 );
 
-                if let Err(e) = self.send_for_execution(qc.clone()).await {
+                if let Err(e) = self.send_for_execution(qc.into_wrapped_ledger_info()).await {
                     error!("Error in try-committing blocks. {}", e.to_string());
                 }
             }
@@ -138,7 +150,9 @@ impl BlockStore {
         max_pruned_blocks_in_mem: usize,
         time_service: Arc<dyn TimeService>,
         vote_back_pressure_limit: Round,
-        payload_manager: Arc<PayloadManager>,
+        payload_manager: Arc<dyn TPayloadManager>,
+        order_vote_enabled: bool,
+        pending_blocks: Arc<Mutex<PendingBlocks>>,
     ) -> Self {
         let RootInfo(root_block, root_qc, root_ordered_cert, root_commit_cert) = root;
 
@@ -170,6 +184,7 @@ impl BlockStore {
             vec![],                   /* compute_status */
             vec![],                   /* txn_infos */
             vec![],                   /* reconfig_events */
+            None,                     // block end info
         );
 
         let pipelined_root_block = PipelinedBlock::new(
@@ -197,15 +212,14 @@ impl BlockStore {
             payload_manager,
             #[cfg(any(test, feature = "fuzzing"))]
             back_pressure_for_test: AtomicBool::new(false),
+            order_vote_enabled,
+            pending_blocks,
         };
 
         for block in blocks {
-            block_store
-                .insert_ordered_block(block)
-                .await
-                .unwrap_or_else(|e| {
-                    panic!("[BlockStore] failed to insert block during build {:?}", e)
-                });
+            block_store.insert_block(block).await.unwrap_or_else(|e| {
+                panic!("[BlockStore] failed to insert block during build {:?}", e)
+            });
         }
         for qc in quorum_certs {
             block_store
@@ -220,7 +234,10 @@ impl BlockStore {
     }
 
     /// Send an ordered block id with the proof for execution, returns () on success or error
-    pub async fn send_for_execution(&self, finality_proof: QuorumCert) -> anyhow::Result<()> {
+    pub async fn send_for_execution(
+        &self,
+        finality_proof: WrappedLedgerInfo,
+    ) -> anyhow::Result<()> {
         let block_id_to_commit = finality_proof.commit_info().id();
         let block_to_commit = self
             .get_block(block_id_to_commit)
@@ -240,7 +257,10 @@ impl BlockStore {
 
         let block_tree = self.inner.clone();
         let storage = self.storage.clone();
-
+        let finality_proof_clone = finality_proof.clone();
+        self.pending_blocks
+            .lock()
+            .gc(finality_proof.commit_info().round());
         // This callback is invoked synchronously with and could be used for multiple batches of blocks.
         self.execution_client
             .finalize_order(
@@ -262,6 +282,9 @@ impl BlockStore {
             .expect("Failed to persist commit");
 
         self.inner.write().update_ordered_root(block_to_commit.id());
+        self.inner
+            .write()
+            .insert_ordered_cert(finality_proof_clone.clone());
         update_counters_for_ordered_blocks(&blocks_to_commit);
 
         Ok(())
@@ -274,6 +297,15 @@ impl BlockStore {
         blocks: Vec<Block>,
         quorum_certs: Vec<QuorumCert>,
     ) {
+        info!(
+            "Rebuilding block tree. root {:?}, blocks {:?}, qcs {:?}",
+            root,
+            blocks.iter().map(|b| b.id()).collect::<Vec<_>>(),
+            quorum_certs
+                .iter()
+                .map(|qc| qc.certified_block().id())
+                .collect::<Vec<_>>()
+        );
         let max_pruned_blocks_in_mem = self.inner.read().max_pruned_blocks_in_mem();
         // Rollover the previous highest TC from the old tree to the new one.
         let prev_2chain_htc = self
@@ -291,6 +323,8 @@ impl BlockStore {
             Arc::clone(&self.time_service),
             self.vote_back_pressure_limit,
             self.payload_manager.clone(),
+            self.order_vote_enabled,
+            self.pending_blocks.clone(),
         )
         .await;
 
@@ -309,7 +343,7 @@ impl BlockStore {
     /// Duplicate inserts will return the previously inserted block (
     /// note that it is considered a valid non-error case, for example, it can happen if a validator
     /// receives a certificate for a block that is currently being added).
-    pub async fn insert_ordered_block(&self, block: Block) -> anyhow::Result<Arc<PipelinedBlock>> {
+    pub async fn insert_block(&self, block: Block) -> anyhow::Result<Arc<PipelinedBlock>> {
         if let Some(existing_block) = self.get_block(block.id()) {
             return Ok(existing_block);
         }
@@ -428,10 +462,90 @@ impl BlockStore {
 
     #[cfg(any(test, feature = "fuzzing"))]
     pub fn set_back_pressure_for_test(&self, back_pressure: bool) {
+        use std::sync::atomic::Ordering;
+
         self.back_pressure_for_test
             .store(back_pressure, Ordering::Relaxed)
     }
 
+    pub fn pending_blocks(&self) -> Arc<Mutex<PendingBlocks>> {
+        self.pending_blocks.clone()
+    }
+
+    pub async fn wait_for_payload(&self, block: &Block) -> anyhow::Result<()> {
+        tokio::time::timeout(
+            Duration::from_secs(1),
+            self.payload_manager.get_transactions(block),
+        )
+        .await??;
+        Ok(())
+    }
+
+    pub fn check_payload(&self, proposal: &Block) -> bool {
+        self.payload_manager.check_payload_availability(proposal)
+    }
+}
+
+impl BlockReader for BlockStore {
+    fn block_exists(&self, block_id: HashValue) -> bool {
+        self.inner.read().block_exists(&block_id)
+    }
+
+    fn get_block(&self, block_id: HashValue) -> Option<Arc<PipelinedBlock>> {
+        self.inner.read().get_block(&block_id)
+    }
+
+    fn ordered_root(&self) -> Arc<PipelinedBlock> {
+        self.inner.read().ordered_root()
+    }
+
+    fn commit_root(&self) -> Arc<PipelinedBlock> {
+        self.inner.read().commit_root()
+    }
+
+    fn get_quorum_cert_for_block(&self, block_id: HashValue) -> Option<Arc<QuorumCert>> {
+        self.inner.read().get_quorum_cert_for_block(&block_id)
+    }
+
+    fn path_from_ordered_root(&self, block_id: HashValue) -> Option<Vec<Arc<PipelinedBlock>>> {
+        self.inner.read().path_from_ordered_root(block_id)
+    }
+
+    fn path_from_commit_root(&self, block_id: HashValue) -> Option<Vec<Arc<PipelinedBlock>>> {
+        self.inner.read().path_from_commit_root(block_id)
+    }
+
+    #[cfg(test)]
+    fn highest_certified_block(&self) -> Arc<PipelinedBlock> {
+        self.inner.read().highest_certified_block()
+    }
+
+    fn highest_quorum_cert(&self) -> Arc<QuorumCert> {
+        self.inner.read().highest_quorum_cert()
+    }
+
+    fn highest_ordered_cert(&self) -> Arc<WrappedLedgerInfo> {
+        self.inner.read().highest_ordered_cert()
+    }
+
+    fn highest_commit_cert(&self) -> Arc<WrappedLedgerInfo> {
+        self.inner.read().highest_commit_cert()
+    }
+
+    fn highest_2chain_timeout_cert(&self) -> Option<Arc<TwoChainTimeoutCertificate>> {
+        self.inner.read().highest_2chain_timeout_cert()
+    }
+
+    fn sync_info(&self) -> SyncInfo {
+        SyncInfo::new_decoupled(
+            self.highest_quorum_cert().as_ref().clone(),
+            self.highest_ordered_cert().as_ref().clone(),
+            self.highest_commit_cert().as_ref().clone(),
+            self.highest_2chain_timeout_cert()
+                .map(|tc| tc.as_ref().clone()),
+        )
+    }
+
     /// Return if the consensus is backpressured
     fn vote_back_pressure(&self) -> bool {
         #[cfg(any(test, feature = "fuzzing"))]
@@ -448,7 +562,7 @@ impl BlockStore {
         ordered_round > self.vote_back_pressure_limit + commit_round
     }
 
-    pub fn pipeline_pending_latency(&self, proposal_timestamp: Duration) -> Duration {
+    fn pipeline_pending_latency(&self, proposal_timestamp: Duration) -> Duration {
         let ordered_root = self.ordered_root();
         let commit_root = self.commit_root();
         let pending_path = self
@@ -479,7 +593,7 @@ impl BlockStore {
                 // latency not known without non-genesis blocks
                 Duration::ZERO
             } else {
-                proposal_timestamp.checked_sub(timestamp).unwrap()
+                proposal_timestamp.saturating_sub(timestamp)
             }
         }
 
@@ -505,7 +619,7 @@ impl BlockStore {
 
         counters::CONSENSUS_PROPOSAL_PENDING_ROUNDS.observe(pending_rounds as f64);
         counters::CONSENSUS_PROPOSAL_PENDING_DURATION
-            .observe(oldest_not_committed_spent_in_pipeline.as_secs_f64());
+            .observe_duration(oldest_not_committed_spent_in_pipeline);
 
         if pending_rounds > 1 {
             // TODO cleanup
@@ -519,73 +633,31 @@ impl BlockStore {
             Duration::ZERO
         }
     }
-}
 
-impl BlockReader for BlockStore {
-    fn block_exists(&self, block_id: HashValue) -> bool {
-        self.inner.read().block_exists(&block_id)
-    }
-
-    fn get_block(&self, block_id: HashValue) -> Option<Arc<PipelinedBlock>> {
-        self.inner.read().get_block(&block_id)
-    }
-
-    fn ordered_root(&self) -> Arc<PipelinedBlock> {
-        self.inner.read().ordered_root()
-    }
-
-    fn commit_root(&self) -> Arc<PipelinedBlock> {
-        self.inner.read().commit_root()
-    }
-
-    fn get_quorum_cert_for_block(&self, block_id: HashValue) -> Option<Arc<QuorumCert>> {
-        self.inner.read().get_quorum_cert_for_block(&block_id)
-    }
-
-    fn path_from_ordered_root(&self, block_id: HashValue) -> Option<Vec<Arc<PipelinedBlock>>> {
-        self.inner.read().path_from_ordered_root(block_id)
-    }
-
-    fn path_from_commit_root(&self, block_id: HashValue) -> Option<Vec<Arc<PipelinedBlock>>> {
-        self.inner.read().path_from_commit_root(block_id)
-    }
-
-    fn highest_certified_block(&self) -> Arc<PipelinedBlock> {
-        self.inner.read().highest_certified_block()
-    }
-
-    fn highest_quorum_cert(&self) -> Arc<QuorumCert> {
-        self.inner.read().highest_quorum_cert()
-    }
-
-    fn highest_ordered_cert(&self) -> Arc<QuorumCert> {
-        self.inner.read().highest_ordered_cert()
-    }
-
-    fn highest_commit_cert(&self) -> Arc<QuorumCert> {
-        self.inner.read().highest_commit_cert()
-    }
-
-    fn highest_2chain_timeout_cert(&self) -> Option<Arc<TwoChainTimeoutCertificate>> {
-        self.inner.read().highest_2chain_timeout_cert()
-    }
-
-    fn sync_info(&self) -> SyncInfo {
-        SyncInfo::new_decoupled(
-            self.highest_quorum_cert().as_ref().clone(),
-            self.highest_ordered_cert().as_ref().clone(),
-            self.highest_commit_cert().as_ref().clone(),
-            self.highest_2chain_timeout_cert()
-                .map(|tc| tc.as_ref().clone()),
-        )
-    }
-
-    fn vote_back_pressure(&self) -> bool {
-        self.vote_back_pressure()
-    }
-
-    fn pipeline_pending_latency(&self, proposal_timestamp: Duration) -> Duration {
-        self.pipeline_pending_latency(proposal_timestamp)
+    fn get_recent_block_execution_times(&self, num_blocks: usize) -> Vec<ExecutionSummary> {
+        let mut res = vec![];
+        let mut cur_block = Some(self.ordered_root());
+        loop {
+            match cur_block {
+                Some(block) => {
+                    if let Some(execution_time_and_size) = block.get_execution_summary() {
+                        info!(
+                            "Found execution time for {}, {:?}",
+                            block.id(),
+                            execution_time_and_size
+                        );
+                        res.push(execution_time_and_size);
+                        if res.len() >= num_blocks {
+                            return res;
+                        }
+                    } else {
+                        info!("Couldn't find execution time for {}", block.id());
+                    }
+                    cur_block = self.get_block(block.parent_id());
+                },
+                None => return res,
+            }
+        }
     }
 }
 
@@ -610,8 +682,9 @@ impl BlockStore {
     pub async fn insert_block_with_qc(&self, block: Block) -> anyhow::Result<Arc<PipelinedBlock>> {
         self.insert_single_quorum_cert(block.quorum_cert().clone())?;
         if self.ordered_root().round() < block.quorum_cert().commit_info().round() {
-            self.send_for_execution(block.quorum_cert().clone()).await?;
+            self.send_for_execution(block.quorum_cert().into_wrapped_ledger_info())
+                .await?;
         }
-        self.insert_ordered_block(block).await
+        self.insert_block(block).await
     }
 }
diff --git a/consensus/src/block_storage/block_store_test.rs b/consensus/src/block_storage/block_store_test.rs
index 3943aba4c9ea3..7328688f2f48e 100644
--- a/consensus/src/block_storage/block_store_test.rs
+++ b/consensus/src/block_storage/block_store_test.rs
@@ -130,7 +130,7 @@ proptest! {
                 let known_parent = block_store.block_exists(block.parent_id());
                 let certified_parent = block.quorum_cert().certified_block().id() == block.parent_id();
                 let verify_res = block.verify_well_formed();
-                let res = timed_block_on(&runtime, block_store.insert_ordered_block(block.clone()));
+                let res = timed_block_on(&runtime, block_store.insert_block(block.clone()));
                 if !certified_parent {
                     prop_assert!(verify_res.is_err());
                 } else if !known_parent {
@@ -366,9 +366,7 @@ async fn test_illegal_timestamp() {
         Vec::new(),
     )
     .unwrap();
-    let result = block_store
-        .insert_ordered_block(block_with_illegal_timestamp)
-        .await;
+    let result = block_store.insert_block(block_with_illegal_timestamp).await;
     assert!(result.is_err());
 }
 
diff --git a/consensus/src/block_storage/block_tree.rs b/consensus/src/block_storage/block_tree.rs
index 7c16b0946dc35..0edb607579c72 100644
--- a/consensus/src/block_storage/block_tree.rs
+++ b/consensus/src/block_storage/block_tree.rs
@@ -11,7 +11,7 @@ use crate::{
 use anyhow::bail;
 use aptos_consensus_types::{
     pipelined_block::PipelinedBlock, quorum_cert::QuorumCert,
-    timeout_2chain::TwoChainTimeoutCertificate,
+    timeout_2chain::TwoChainTimeoutCertificate, wrapped_ledger_info::WrappedLedgerInfo,
 };
 use aptos_crypto::HashValue;
 use aptos_logger::prelude::*;
@@ -80,9 +80,9 @@ pub struct BlockTree {
     /// The highest 2-chain timeout certificate (if any).
     highest_2chain_timeout_cert: Option<Arc<TwoChainTimeoutCertificate>>,
     /// The quorum certificate that has highest commit info.
-    highest_ordered_cert: Arc<QuorumCert>,
+    highest_ordered_cert: Arc<WrappedLedgerInfo>,
     /// The quorum certificate that has highest commit decision info.
-    highest_commit_cert: Arc<QuorumCert>,
+    highest_commit_cert: Arc<WrappedLedgerInfo>,
     /// Map of block id to its completed quorum certificate (2f + 1 votes)
     id_to_quorum_cert: HashMap<HashValue, Arc<QuorumCert>>,
     /// To keep the IDs of the elements that have been pruned from the tree but not cleaned up yet.
@@ -95,8 +95,8 @@ impl BlockTree {
     pub(super) fn new(
         root: PipelinedBlock,
         root_quorum_cert: QuorumCert,
-        root_ordered_cert: QuorumCert,
-        root_commit_cert: QuorumCert,
+        root_ordered_cert: WrappedLedgerInfo,
+        root_commit_cert: WrappedLedgerInfo,
         max_pruned_blocks_in_mem: usize,
         highest_2chain_timeout_cert: Option<Arc<TwoChainTimeoutCertificate>>,
     ) -> Self {
@@ -175,7 +175,7 @@ impl BlockTree {
 
     pub(super) fn get_block(&self, block_id: &HashValue) -> Option<Arc<PipelinedBlock>> {
         self.get_linkable_block(block_id)
-            .map(|lb| Arc::clone(lb.executed_block()))
+            .map(|lb| lb.executed_block().clone())
     }
 
     pub(super) fn ordered_root(&self) -> Arc<PipelinedBlock> {
@@ -206,11 +206,11 @@ impl BlockTree {
         self.highest_2chain_timeout_cert.replace(tc);
     }
 
-    pub(super) fn highest_ordered_cert(&self) -> Arc<QuorumCert> {
+    pub(super) fn highest_ordered_cert(&self) -> Arc<WrappedLedgerInfo> {
         Arc::clone(&self.highest_ordered_cert)
     }
 
-    pub(super) fn highest_commit_cert(&self) -> Arc<QuorumCert> {
+    pub(super) fn highest_commit_cert(&self) -> Arc<WrappedLedgerInfo> {
         Arc::clone(&self.highest_commit_cert)
     }
 
@@ -246,7 +246,7 @@ impl BlockTree {
         }
     }
 
-    fn update_highest_commit_cert(&mut self, new_commit_cert: QuorumCert) {
+    fn update_highest_commit_cert(&mut self, new_commit_cert: WrappedLedgerInfo) {
         if new_commit_cert.commit_info().round() > self.highest_commit_cert.commit_info().round() {
             self.highest_commit_cert = Arc::new(new_commit_cert);
             self.update_commit_root(self.highest_commit_cert.commit_info().id());
@@ -285,12 +285,19 @@ impl BlockTree {
             .or_insert_with(|| Arc::clone(&qc));
 
         if self.highest_ordered_cert.commit_info().round() < qc.commit_info().round() {
-            self.highest_ordered_cert = qc;
+            // Question: We are updating highest_ordered_cert but not highest_ordered_root. Is that fine?
+            self.highest_ordered_cert = Arc::new(qc.into_wrapped_ledger_info());
         }
 
         Ok(())
     }
 
+    pub fn insert_ordered_cert(&mut self, ordered_cert: WrappedLedgerInfo) {
+        if ordered_cert.commit_info().round() > self.highest_ordered_cert.commit_info().round() {
+            self.highest_ordered_cert = Arc::new(ordered_cert);
+        }
+    }
+
     /// Find the blocks to prune up to next_root_id (keep next_root_id's block). Any branches not
     /// part of the next_root_id's tree should be removed as well.
     ///
@@ -418,14 +425,14 @@ impl BlockTree {
         &mut self,
         storage: Arc<dyn PersistentLivenessStorage>,
         blocks_to_commit: &[Arc<PipelinedBlock>],
-        finality_proof: QuorumCert,
+        finality_proof: WrappedLedgerInfo,
         commit_decision: LedgerInfoWithSignatures,
     ) {
         let commit_proof = finality_proof
             .create_merged_with_executed_state(commit_decision)
             .expect("Inconsistent commit proof and evaluation decision, cannot commit block");
 
-        let block_to_commit = blocks_to_commit.last().unwrap().clone();
+        let block_to_commit = blocks_to_commit.last().expect("pipeline is empty").clone();
         update_counters_for_committed_blocks(blocks_to_commit);
         let current_round = self.commit_root().round();
         let committed_round = block_to_commit.round();
@@ -435,14 +442,14 @@ impl BlockTree {
             block_id = block_to_commit.id(),
         );
 
-        let id_to_remove = self.find_blocks_to_prune(block_to_commit.id());
-        if let Err(e) = storage.prune_tree(id_to_remove.clone().into_iter().collect()) {
+        let ids_to_remove = self.find_blocks_to_prune(block_to_commit.id());
+        if let Err(e) = storage.prune_tree(ids_to_remove.clone().into_iter().collect()) {
             // it's fine to fail here, as long as the commit succeeds, the next restart will clean
             // up dangling blocks, and we need to prune the tree to keep the root consistent with
             // executor.
             warn!(error = ?e, "fail to delete block");
         }
-        self.process_pruned_blocks(id_to_remove);
+        self.process_pruned_blocks(ids_to_remove);
         self.update_highest_commit_cert(commit_proof);
     }
 }
diff --git a/consensus/src/block_storage/mod.rs b/consensus/src/block_storage/mod.rs
index 8b553706127b8..51e6520f3d05e 100644
--- a/consensus/src/block_storage/mod.rs
+++ b/consensus/src/block_storage/mod.rs
@@ -3,15 +3,22 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use aptos_consensus_types::{
-    pipelined_block::PipelinedBlock, quorum_cert::QuorumCert, sync_info::SyncInfo,
+    pipelined_block::{ExecutionSummary, PipelinedBlock},
+    quorum_cert::QuorumCert,
+    sync_info::SyncInfo,
     timeout_2chain::TwoChainTimeoutCertificate,
+    wrapped_ledger_info::WrappedLedgerInfo,
 };
 use aptos_crypto::HashValue;
-pub use block_store::{sync_manager::BlockRetriever, BlockStore};
+pub use block_store::{
+    sync_manager::{BlockRetriever, NeedFetchResult},
+    BlockStore,
+};
 use std::{sync::Arc, time::Duration};
 
 mod block_store;
 mod block_tree;
+pub mod pending_blocks;
 pub mod tracing;
 
 pub trait BlockReader: Send + Sync {
@@ -41,19 +48,20 @@ pub trait BlockReader: Send + Sync {
     fn path_from_commit_root(&self, block_id: HashValue) -> Option<Vec<Arc<PipelinedBlock>>>;
 
     /// Return the certified block with the highest round.
+    #[cfg(test)]
     fn highest_certified_block(&self) -> Arc<PipelinedBlock>;
 
     /// Return the quorum certificate with the highest round
     fn highest_quorum_cert(&self) -> Arc<QuorumCert>;
 
-    /// Return the quorum certificate that carries ledger info with the highest round
-    fn highest_ordered_cert(&self) -> Arc<QuorumCert>;
+    /// Return the wrapped ledger info that carries ledger info with the highest round
+    fn highest_ordered_cert(&self) -> Arc<WrappedLedgerInfo>;
 
     /// Return the highest timeout certificate if available.
     fn highest_2chain_timeout_cert(&self) -> Option<Arc<TwoChainTimeoutCertificate>>;
 
-    /// Return the highest commit decision quorum certificate.
-    fn highest_commit_cert(&self) -> Arc<QuorumCert>;
+    /// Return the highest commit decision wrapped ledger info.
+    fn highest_commit_cert(&self) -> Arc<WrappedLedgerInfo>;
 
     /// Return the combination of highest quorum cert, timeout cert and commit cert.
     fn sync_info(&self) -> SyncInfo;
@@ -63,4 +71,6 @@ pub trait BlockReader: Send + Sync {
 
     // Return time difference between last committed block and new proposal
     fn pipeline_pending_latency(&self, proposal_timestamp: Duration) -> Duration;
+
+    fn get_recent_block_execution_times(&self, num_blocks: usize) -> Vec<ExecutionSummary>;
 }
diff --git a/consensus/src/block_storage/pending_blocks.rs b/consensus/src/block_storage/pending_blocks.rs
new file mode 100644
index 0000000000000..43efe53306221
--- /dev/null
+++ b/consensus/src/block_storage/pending_blocks.rs
@@ -0,0 +1,65 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::counters::BLOCK_RETRIEVAL_LOCAL_FULFILL_COUNT;
+use aptos_consensus_types::{block::Block, common::Round};
+use aptos_crypto::HashValue;
+use aptos_logger::info;
+use futures_channel::oneshot;
+use std::collections::{BTreeMap, HashMap};
+
+/// A local buffer to hold incoming blocks before it reaches round manager.
+/// Which can be used to fulfill block request from local due to out of order messages.
+pub struct PendingBlocks {
+    blocks_by_hash: HashMap<HashValue, Block>,
+    blocks_by_round: BTreeMap<Round, Block>,
+    pending_request: Option<(HashValue, oneshot::Sender<Block>)>,
+}
+
+impl PendingBlocks {
+    pub fn new() -> Self {
+        Self {
+            blocks_by_hash: HashMap::new(),
+            blocks_by_round: BTreeMap::new(),
+            pending_request: None,
+        }
+    }
+
+    pub fn insert_block(&mut self, block: Block) {
+        info!("Pending block inserted: {}", block.id());
+        self.blocks_by_hash.insert(block.id(), block.clone());
+        self.blocks_by_round.insert(block.round(), block.clone());
+        if let Some((id, tx)) = self.pending_request.take() {
+            if id == block.id() {
+                info!("FulFill block request from incoming block: {}", id);
+                BLOCK_RETRIEVAL_LOCAL_FULFILL_COUNT.inc();
+                tx.send(block).ok();
+            } else {
+                self.pending_request = Some((id, tx));
+            }
+        }
+    }
+
+    pub fn insert_request(&mut self, block_id: HashValue, tx: oneshot::Sender<Block>) {
+        if let Some(block) = self.blocks_by_hash.get(&block_id) {
+            info!("FulFill block request from existing buffer: {}", block_id);
+            BLOCK_RETRIEVAL_LOCAL_FULFILL_COUNT.inc();
+            tx.send(block.clone()).ok();
+        } else {
+            info!("Insert block request for: {}", block_id);
+            self.pending_request = Some((block_id, tx));
+        }
+    }
+
+    pub fn gc(&mut self, round: Round) {
+        let mut to_remove = vec![];
+        for (r, _) in self.blocks_by_round.range(..=round) {
+            to_remove.push(*r);
+        }
+        for r in to_remove {
+            if let Some(block) = self.blocks_by_round.remove(&r) {
+                self.blocks_by_hash.remove(&block.id());
+            }
+        }
+    }
+}
diff --git a/consensus/src/block_storage/sync_manager.rs b/consensus/src/block_storage/sync_manager.rs
index f7849a943b5fb..84e3f48481f8b 100644
--- a/consensus/src/block_storage/sync_manager.rs
+++ b/consensus/src/block_storage/sync_manager.rs
@@ -3,17 +3,27 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{
-    block_storage::{BlockReader, BlockStore},
+    block_storage::{
+        pending_blocks::PendingBlocks,
+        tracing::{observe_block, BlockStage},
+        BlockReader, BlockStore,
+    },
+    counters::{
+        BLOCKS_FETCHED_FROM_NETWORK_IN_BLOCK_RETRIEVER,
+        BLOCKS_FETCHED_FROM_NETWORK_WHILE_FAST_FORWARD_SYNC,
+        BLOCKS_FETCHED_FROM_NETWORK_WHILE_INSERTING_QUORUM_CERT, LATE_EXECUTION_WITH_ORDER_VOTE_QC,
+        SUCCESSFUL_EXECUTED_WITH_ORDER_VOTE_QC, SUCCESSFUL_EXECUTED_WITH_REGULAR_QC,
+    },
     epoch_manager::LivenessStorageData,
     logging::{LogEvent, LogSchema},
     monitor,
     network::{IncomingBlockRetrievalRequest, NetworkSender},
     network_interface::ConsensusMsg,
-    payload_manager::PayloadManager,
+    payload_manager::TPayloadManager,
     persistent_liveness_storage::{LedgerRecoveryData, PersistentLivenessStorage, RecoveryData},
     pipeline::execution_client::TExecutionClient,
 };
-use anyhow::{bail, Context};
+use anyhow::{anyhow, bail, Context};
 use aptos_consensus_types::{
     block::Block,
     block_retrieval::{
@@ -23,18 +33,21 @@ use aptos_consensus_types::{
     common::Author,
     quorum_cert::QuorumCert,
     sync_info::SyncInfo,
+    wrapped_ledger_info::WrappedLedgerInfo,
 };
 use aptos_crypto::HashValue;
+use aptos_infallible::Mutex;
 use aptos_logger::prelude::*;
 use aptos_types::{
     account_address::AccountAddress, epoch_change::EpochChangeProof,
     ledger_info::LedgerInfoWithSignatures,
 };
 use fail::fail_point;
-use futures::{stream::FuturesUnordered, StreamExt};
+use futures::{stream::FuturesUnordered, FutureExt, StreamExt};
+use futures_channel::oneshot;
 use rand::{prelude::*, Rng};
 use std::{clone::Clone, cmp::min, sync::Arc, time::Duration};
-use tokio::time;
+use tokio::{time, time::timeout};
 
 #[derive(Debug, PartialEq, Eq)]
 /// Whether we need to do block retrieval if we want to insert a Quorum Cert.
@@ -84,21 +97,51 @@ impl BlockStore {
     ) -> anyhow::Result<()> {
         self.sync_to_highest_commit_cert(
             sync_info.highest_commit_cert().ledger_info(),
-            &retriever.network,
+            retriever.network.clone(),
         )
         .await;
-        self.sync_to_highest_ordered_cert(
-            sync_info.highest_ordered_cert().clone(),
+
+        // When the local ordered round is very old than the received sync_info, this function will
+        // (1) resets the block store with highest commit cert = sync_info.highest_quorum_cert()
+        // (2) insert all the blocks between (inclusive) highest_commit_cert.commit_info().id() to
+        // highest_quorum_cert.certified_block().id() into the block store and storage
+        // (3) insert the quorum cert for all the above blocks into the block store and storage
+        // (4) executes all the blocks that are ordered while inserting the above quorum certs
+        self.sync_to_highest_quorum_cert(
+            sync_info.highest_quorum_cert().clone(),
             sync_info.highest_commit_cert().clone(),
             &mut retriever,
         )
         .await?;
 
-        self.insert_quorum_cert(sync_info.highest_ordered_cert(), &mut retriever)
+        // The insert_ordered_cert(order_cert) function call expects that order_cert.commit_info().id() block
+        // is already stored in block_store. So, we first call insert_quorum_cert(highest_quorum_cert).
+        // This call will ensure that the highest ceritified block along with all its ancestors are inserted
+        // into the block store.
+        self.insert_quorum_cert(sync_info.highest_quorum_cert(), &mut retriever)
             .await?;
 
-        self.insert_quorum_cert(sync_info.highest_quorum_cert(), &mut retriever)
+        // Even though we inserted the highest_quorum_cert (and its ancestors) in the above step,
+        // we still need to insert ordered cert explicitly. This will send the highest ordered block
+        // to execution.
+        if self.order_vote_enabled {
+            self.insert_ordered_cert(&sync_info.highest_ordered_cert())
+                .await?;
+        } else {
+            // When order votes are disabled, the highest_ordered_cert().certified_block().id() need not be
+            // one of the ancestors of highest_quorum_cert.certified_block().id() due to forks. So, we call
+            // insert_quorum_cert instead of insert_ordered_cert as in the above case. This will ensure that
+            // highest_ordered_cert().certified_block().id() is inserted the block store.
+            self.insert_quorum_cert(
+                &self
+                    .highest_ordered_cert()
+                    .as_ref()
+                    .clone()
+                    .into_quorum_cert(self.order_vote_enabled)?,
+                &mut retriever,
+            )
             .await?;
+        }
 
         if let Some(tc) = sync_info.highest_2chain_timeout_cert() {
             self.insert_2chain_timeout_certificate(Arc::new(tc.clone()))?;
@@ -118,7 +161,9 @@ impl BlockStore {
             _ => (),
         }
         if self.ordered_root().round() < qc.commit_info().round() {
-            self.send_for_execution(qc.clone()).await?;
+            SUCCESSFUL_EXECUTED_WITH_REGULAR_QC.inc();
+            self.send_for_execution(qc.into_wrapped_ledger_info())
+                .await?;
             if qc.ends_epoch() {
                 retriever
                     .network
@@ -132,6 +177,32 @@ impl BlockStore {
         Ok(())
     }
 
+    // Before calling this function, we need to maintain an invariant that ordered_cert.commit_info().id()
+    // is already in the block store. So, currently insert_ordered_cert calls are preceded by insert_quorum_cert calls
+    // to ensure this.
+    pub async fn insert_ordered_cert(
+        &self,
+        ordered_cert: &WrappedLedgerInfo,
+    ) -> anyhow::Result<()> {
+        if self.ordered_root().round() < ordered_cert.ledger_info().ledger_info().round() {
+            if let Some(ordered_block) = self.get_block(ordered_cert.commit_info().id()) {
+                if !ordered_block.block().is_nil_block() {
+                    observe_block(
+                        ordered_block.block().timestamp_usecs(),
+                        BlockStage::OC_ADDED,
+                    );
+                }
+                SUCCESSFUL_EXECUTED_WITH_ORDER_VOTE_QC.inc();
+                self.send_for_execution(ordered_cert.clone()).await?;
+            } else {
+                bail!("Ordered block not found in block store when inserting ordered cert");
+            }
+        } else {
+            LATE_EXECUTION_WITH_ORDER_VOTE_QC.inc();
+        }
+        Ok(())
+    }
+
     /// Insert the quorum certificate separately from the block, used to split the processing of
     /// updating the consensus state(with qc) and deciding whether to vote(with block)
     /// The missing ancestors are going to be retrieved from the given peer. If a given peer
@@ -147,10 +218,17 @@ impl BlockStore {
             if self.block_exists(retrieve_qc.certified_block().id()) {
                 break;
             }
+            BLOCKS_FETCHED_FROM_NETWORK_WHILE_INSERTING_QUORUM_CERT.inc_by(1);
             let mut blocks = retriever
-                .retrieve_block_for_qc(&retrieve_qc, 1, retrieve_qc.certified_block().id())
+                .retrieve_blocks_in_range(
+                    retrieve_qc.certified_block().id(),
+                    1,
+                    retrieve_qc.certified_block().id(),
+                    qc.ledger_info()
+                        .get_voters(&retriever.validator_addresses()),
+                )
                 .await?;
-            // retrieve_block_for_qc guarantees that blocks has exactly 1 element
+            // retrieve_blocks_in_range guarantees that blocks has exactly 1 element
             let block = blocks.remove(0);
             retrieve_qc = block.quorum_cert().clone();
             pending.push(block);
@@ -159,7 +237,7 @@ impl BlockStore {
         while let Some(block) = pending.pop() {
             let block_qc = block.quorum_cert().clone();
             self.insert_single_quorum_cert(block_qc)?;
-            self.insert_ordered_block(block).await?;
+            self.insert_block(block).await?;
         }
         self.insert_single_quorum_cert(qc)
     }
@@ -171,22 +249,23 @@ impl BlockStore {
     /// 2. We persist the gap blocks to storage before start sync to ensure we could restart if we
     /// crash in the middle of the sync.
     /// 3. We prune the old tree and replace with a new tree built with the 3-chain.
-    async fn sync_to_highest_ordered_cert(
+    async fn sync_to_highest_quorum_cert(
         &self,
-        highest_ordered_cert: QuorumCert,
-        highest_commit_cert: QuorumCert,
+        highest_quorum_cert: QuorumCert,
+        highest_commit_cert: WrappedLedgerInfo,
         retriever: &mut BlockRetriever,
     ) -> anyhow::Result<()> {
         if !self.need_sync_for_ledger_info(highest_commit_cert.ledger_info()) {
             return Ok(());
         }
         let (root, root_metadata, blocks, quorum_certs) = Self::fast_forward_sync(
-            &highest_ordered_cert,
+            &highest_quorum_cert,
             &highest_commit_cert,
             retriever,
             self.storage.clone(),
             self.execution_client.clone(),
             self.payload_manager.clone(),
+            self.order_vote_enabled,
         )
         .await?
         .take();
@@ -202,7 +281,7 @@ impl BlockStore {
             retriever
                 .network
                 .send_epoch_change(EpochChangeProof::new(
-                    vec![highest_ordered_cert.ledger_info().clone()],
+                    vec![highest_quorum_cert.ledger_info().clone()],
                     /* more = */ false,
                 ))
                 .await;
@@ -211,41 +290,46 @@ impl BlockStore {
     }
 
     pub async fn fast_forward_sync<'a>(
-        highest_ordered_cert: &'a QuorumCert,
-        highest_commit_cert: &'a QuorumCert,
+        highest_quorum_cert: &'a QuorumCert,
+        highest_commit_cert: &'a WrappedLedgerInfo,
         retriever: &'a mut BlockRetriever,
         storage: Arc<dyn PersistentLivenessStorage>,
         execution_client: Arc<dyn TExecutionClient>,
-        payload_manager: Arc<PayloadManager>,
+        payload_manager: Arc<dyn TPayloadManager>,
+        order_vote_enabled: bool,
     ) -> anyhow::Result<RecoveryData> {
         info!(
             LogSchema::new(LogEvent::StateSync).remote_peer(retriever.preferred_peer),
-            "Start state sync to commit cert: {}, ordered cert: {}",
+            "Start state sync to commit cert: {}, quorum cert: {}",
             highest_commit_cert,
-            highest_ordered_cert,
+            highest_quorum_cert,
         );
 
         // we fetch the blocks from
-        let num_blocks = highest_ordered_cert.certified_block().round()
+        let num_blocks = highest_quorum_cert.certified_block().round()
             - highest_commit_cert.ledger_info().ledger_info().round()
             + 1;
 
         // although unlikely, we might wrap num_blocks around on a 32-bit machine
         assert!(num_blocks < std::usize::MAX as u64);
 
+        BLOCKS_FETCHED_FROM_NETWORK_WHILE_FAST_FORWARD_SYNC.inc_by(num_blocks);
         let mut blocks = retriever
-            .retrieve_block_for_qc(
-                highest_ordered_cert,
+            .retrieve_blocks_in_range(
+                highest_quorum_cert.certified_block().id(),
                 num_blocks,
                 highest_commit_cert.commit_info().id(),
+                highest_quorum_cert
+                    .ledger_info()
+                    .get_voters(&retriever.validator_addresses()),
             )
             .await?;
 
         assert_eq!(
             blocks.first().expect("blocks are empty").id(),
-            highest_ordered_cert.certified_block().id(),
+            highest_quorum_cert.certified_block().id(),
             "Expecting in the retrieval response, first block should be {}, but got {}",
-            highest_ordered_cert.certified_block().id(),
+            highest_quorum_cert.certified_block().id(),
             blocks.first().expect("blocks are empty").id(),
         );
 
@@ -255,7 +339,7 @@ impl BlockStore {
             highest_commit_cert.commit_info().id()
         );
 
-        let mut quorum_certs = vec![highest_ordered_cert.clone()];
+        let mut quorum_certs = vec![highest_quorum_cert.clone()];
         quorum_certs.extend(
             blocks
                 .iter()
@@ -263,39 +347,54 @@ impl BlockStore {
                 .map(|block| block.quorum_cert().clone()),
         );
 
-        // check if highest_commit_cert comes from a fork
-        // if so, we need to fetch it's block as well, to have a proof of commit.
-        if !blocks
-            .iter()
-            .any(|block| block.id() == highest_commit_cert.certified_block().id())
-        {
-            info!(
-                "Found forked QC {}, fetching it as well",
-                highest_commit_cert
-            );
-            let mut additional_blocks = retriever
-                .retrieve_block_for_qc(
-                    highest_commit_cert,
-                    1,
-                    highest_commit_cert.certified_block().id(),
-                )
-                .await?;
-
-            assert_eq!(additional_blocks.len(), 1);
-            let block = additional_blocks.pop().expect("blocks are empty");
-            assert_eq!(
-                block.id(),
-                highest_commit_cert.certified_block().id(),
-                "Expecting in the retrieval response, for commit certificate fork, first block should be {}, but got {}",
-                highest_commit_cert.certified_block().id(),
-                block.id(),
-            );
-
-            blocks.push(block);
-            quorum_certs.push(highest_commit_cert.clone());
+        if !order_vote_enabled {
+            // check if highest_commit_cert comes from a fork
+            // if so, we need to fetch it's block as well, to have a proof of commit.
+            let highest_commit_certified_block_id = highest_commit_cert
+                .certified_block(order_vote_enabled)?
+                .id();
+            if !blocks
+                .iter()
+                .any(|block| block.id() == highest_commit_certified_block_id)
+            {
+                info!(
+                    "Found forked QC {}, fetching it as well",
+                    highest_commit_cert
+                );
+                BLOCKS_FETCHED_FROM_NETWORK_WHILE_FAST_FORWARD_SYNC.inc_by(1);
+                let mut additional_blocks = retriever
+                    .retrieve_blocks_in_range(
+                        highest_commit_certified_block_id,
+                        1,
+                        highest_commit_certified_block_id,
+                        highest_commit_cert
+                            .ledger_info()
+                            .get_voters(&retriever.validator_addresses()),
+                    )
+                    .await?;
+
+                assert_eq!(additional_blocks.len(), 1);
+                let block = additional_blocks.pop().expect("blocks are empty");
+                assert_eq!(
+                    block.id(),
+                    highest_commit_certified_block_id,
+                    "Expecting in the retrieval response, for commit certificate fork, first block should be {}, but got {}",
+                    highest_commit_certified_block_id,
+                    block.id(),
+                );
+                blocks.push(block);
+                quorum_certs.push(
+                    highest_commit_cert
+                        .clone()
+                        .into_quorum_cert(order_vote_enabled)?,
+                );
+            }
         }
 
         assert_eq!(blocks.len(), quorum_certs.len());
+        info!("[FastForwardSync] Fetched {} blocks. Requested num_blocks {}. Initial block hash {:?}, target block hash {:?}",
+            blocks.len(), num_blocks, highest_quorum_cert.certified_block().id(), highest_commit_cert.commit_info().id()
+        );
         for (i, block) in blocks.iter().enumerate() {
             assert_eq!(block.id(), quorum_certs[i].certified_block().id());
             if let Some(payload) = block.payload() {
@@ -305,7 +404,11 @@ impl BlockStore {
 
         // Check early that recovery will succeed, and return before corrupting our state in case it will not.
         LedgerRecoveryData::new(highest_commit_cert.ledger_info().clone())
-            .find_root(&mut blocks.clone(), &mut quorum_certs.clone())
+            .find_root(
+                &mut blocks.clone(),
+                &mut quorum_certs.clone(),
+                order_vote_enabled,
+            )
             .with_context(|| {
                 // for better readability
                 quorum_certs.sort_by_key(|qc| qc.certified_block().round());
@@ -334,7 +437,7 @@ impl BlockStore {
         // we do not need to update block_tree.highest_commit_decision_ledger_info here
         // because the block_tree is going to rebuild itself.
 
-        let recovery_data = match storage.start() {
+        let recovery_data = match storage.start(order_vote_enabled) {
             LivenessStorageData::FullRecoveryData(recovery_data) => recovery_data,
             _ => panic!("Failed to construct recovery data after fast forward sync"),
         };
@@ -346,14 +449,15 @@ impl BlockStore {
     async fn sync_to_highest_commit_cert(
         &self,
         ledger_info: &LedgerInfoWithSignatures,
-        network: &Arc<NetworkSender>,
+        network: Arc<NetworkSender>,
     ) {
         // if the block exists between commit root and ordered root
         if self.commit_root().round() < ledger_info.commit_info().round()
             && self.block_exists(ledger_info.commit_info().id())
             && self.ordered_root().round() >= ledger_info.commit_info().round()
         {
-            network.send_commit_proof(ledger_info.clone()).await
+            let proof = ledger_info.clone();
+            tokio::spawn(async move { network.send_commit_proof(proof).await });
         }
     }
 
@@ -408,6 +512,7 @@ pub struct BlockRetriever {
     preferred_peer: Author,
     validator_addresses: Vec<AccountAddress>,
     max_blocks_to_request: u64,
+    pending_blocks: Arc<Mutex<PendingBlocks>>,
 }
 
 impl BlockRetriever {
@@ -416,15 +521,21 @@ impl BlockRetriever {
         preferred_peer: Author,
         validator_addresses: Vec<AccountAddress>,
         max_blocks_to_request: u64,
+        pending_blocks: Arc<Mutex<PendingBlocks>>,
     ) -> Self {
         Self {
             network,
             preferred_peer,
             validator_addresses,
             max_blocks_to_request,
+            pending_blocks,
         }
     }
 
+    pub fn validator_addresses(&self) -> Vec<AccountAddress> {
+        self.validator_addresses.clone()
+    }
+
     async fn retrieve_block_for_id_chunk(
         &mut self,
         block_id: HashValue,
@@ -443,6 +554,27 @@ impl BlockRetriever {
         monitor!("retrieve_block_for_id_chunk", {
             let mut interval = time::interval(retry_interval);
             let mut futures = FuturesUnordered::new();
+            if retrieve_batch_size == 1 {
+                let (tx, rx) = oneshot::channel();
+                self.pending_blocks
+                    .lock()
+                    .insert_request(target_block_id, tx);
+                let author = self.network.author();
+                futures.push(
+                    async move {
+                        let response = match timeout(rpc_timeout, rx).await {
+                            Ok(Ok(block)) => Ok(BlockRetrievalResponse::new(
+                                BlockRetrievalStatus::SucceededWithTarget,
+                                vec![block],
+                            )),
+                            Ok(Err(_)) => Err(anyhow!("self retrieval cancelled")),
+                            Err(_) => Err(anyhow!("self retrieval timeout")),
+                        };
+                        (author, response)
+                    }
+                    .boxed(),
+                )
+            }
             let request = BlockRetrievalRequest::new_with_target_block_id(
                 block_id,
                 retrieve_batch_size,
@@ -483,7 +615,7 @@ impl BlockRetriever {
                                 peer,
                                 rpc_timeout,
                             );
-                            futures.push(async move { (remote_peer, future.await) });
+                            futures.push(async move { (remote_peer, future.await) }.boxed());
                         }
                     }
                     Some((peer, response)) = futures.next() => {
@@ -554,7 +686,7 @@ impl BlockRetriever {
                     // extend the result blocks
                     let batch = result.blocks().clone();
                     progress += batch.len() as u64;
-                    last_block_id = batch.last().unwrap().parent_id();
+                    last_block_id = batch.last().expect("Batch should not be empty").parent_id();
                     result_blocks.extend(batch);
                 },
                 Ok(result)
@@ -574,25 +706,27 @@ impl BlockRetriever {
                 },
             }
         }
-        assert_eq!(result_blocks.last().unwrap().id(), target_block_id);
+        assert_eq!(
+            result_blocks
+                .last()
+                .expect("Expected at least a result_block")
+                .id(),
+            target_block_id
+        );
         Ok(result_blocks)
     }
 
     /// Retrieve chain of n blocks for given QC
-    async fn retrieve_block_for_qc<'a>(
-        &'a mut self,
-        qc: &'a QuorumCert,
+    async fn retrieve_blocks_in_range(
+        &mut self,
+        initial_block_id: HashValue,
         num_blocks: u64,
         target_block_id: HashValue,
+        peers: Vec<AccountAddress>,
     ) -> anyhow::Result<Vec<Block>> {
-        let peers = qc.ledger_info().get_voters(&self.validator_addresses);
-        self.retrieve_block_for_id(
-            qc.certified_block().id(),
-            target_block_id,
-            peers,
-            num_blocks,
-        )
-        .await
+        BLOCKS_FETCHED_FROM_NETWORK_IN_BLOCK_RETRIEVER.inc_by(num_blocks);
+        self.retrieve_block_for_id(initial_block_id, target_block_id, peers, num_blocks)
+            .await
     }
 
     fn pick_peer(&self, first_atempt: bool, peers: &mut Vec<AccountAddress>) -> AccountAddress {
diff --git a/consensus/src/block_storage/tracing.rs b/consensus/src/block_storage/tracing.rs
index 098d1078d646f..4552b19bd49c2 100644
--- a/consensus/src/block_storage/tracing.rs
+++ b/consensus/src/block_storage/tracing.rs
@@ -15,7 +15,9 @@ impl BlockStage {
     pub const EPOCH_MANAGER_VERIFIED: &'static str = "epoch_manager_verified";
     pub const EXECUTED: &'static str = "executed";
     pub const NETWORK_RECEIVED: &'static str = "network_received";
+    pub const OC_ADDED: &'static str = "ordered_cert_created";
     pub const ORDERED: &'static str = "ordered";
+    pub const ORDER_VOTED: &'static str = "order_voted";
     pub const QC_ADDED: &'static str = "qc_added";
     pub const QC_AGGREGATED: &'static str = "qc_aggregated";
     pub const RAND_ADD_DECISION: &'static str = "rand_add_decision";
diff --git a/consensus/src/consensus_observer/error.rs b/consensus/src/consensus_observer/error.rs
new file mode 100644
index 0000000000000..37a516d10115c
--- /dev/null
+++ b/consensus/src/consensus_observer/error.rs
@@ -0,0 +1,54 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use aptos_network::protocols::network::RpcError;
+use thiserror::Error;
+
+#[derive(Debug, Error)]
+pub enum Error {
+    #[error("Invalid message error: {0}")]
+    InvalidMessageError(String),
+
+    #[error("Network error: {0}")]
+    NetworkError(String),
+
+    #[error("Aptos network rpc error: {0}")]
+    RpcError(#[from] RpcError),
+
+    #[error("Subscription disconnected: {0}")]
+    SubscriptionDisconnected(String),
+
+    #[error("Subscription progress stopped: {0}")]
+    SubscriptionProgressStopped(String),
+
+    #[error("Subscription suboptimal: {0}")]
+    SubscriptionSuboptimal(String),
+
+    #[error("Subscription timeout: {0}")]
+    SubscriptionTimeout(String),
+
+    #[error("Unexpected error encountered: {0}")]
+    UnexpectedError(String),
+}
+
+impl Error {
+    /// Returns a summary label for the error
+    pub fn get_label(&self) -> &'static str {
+        match self {
+            Self::InvalidMessageError(_) => "invalid_message_error",
+            Self::NetworkError(_) => "network_error",
+            Self::RpcError(_) => "rpc_error",
+            Self::SubscriptionDisconnected(_) => "subscription_disconnected",
+            Self::SubscriptionProgressStopped(_) => "subscription_progress_stopped",
+            Self::SubscriptionSuboptimal(_) => "subscription_suboptimal",
+            Self::SubscriptionTimeout(_) => "subscription_timeout",
+            Self::UnexpectedError(_) => "unexpected_error",
+        }
+    }
+}
+
+impl From<aptos_network::application::error::Error> for Error {
+    fn from(error: aptos_network::application::error::Error) -> Self {
+        Error::NetworkError(error.to_string())
+    }
+}
diff --git a/consensus/src/consensus_observer/logging.rs b/consensus/src/consensus_observer/logging.rs
new file mode 100644
index 0000000000000..bdadaf84d8eda
--- /dev/null
+++ b/consensus/src/consensus_observer/logging.rs
@@ -0,0 +1,57 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::consensus_observer::error::Error;
+use aptos_config::network_id::PeerNetworkId;
+use aptos_logger::Schema;
+use serde::Serialize;
+
+#[derive(Schema)]
+pub struct LogSchema<'a> {
+    name: LogEntry,
+    #[schema(debug)]
+    error: Option<&'a Error>,
+    event: Option<LogEvent>,
+    message: Option<&'a str>,
+    message_type: Option<&'a str>,
+    #[schema(display)]
+    peer: Option<&'a PeerNetworkId>,
+    request_id: Option<u64>,
+    request_type: Option<&'a str>,
+}
+
+impl<'a> LogSchema<'a> {
+    pub fn new(name: LogEntry) -> Self {
+        Self {
+            name,
+            error: None,
+            event: None,
+            message: None,
+            message_type: None,
+            peer: None,
+            request_id: None,
+            request_type: None,
+        }
+    }
+}
+
+#[derive(Clone, Copy, Serialize)]
+#[serde(rename_all = "snake_case")]
+pub enum LogEntry {
+    ConsensusObserver,
+    ConsensusPublisher,
+    GetDownstreamPeers,
+    SendDirectSendMessage,
+    SendRpcRequest,
+}
+
+#[derive(Clone, Copy, Serialize)]
+#[serde(rename_all = "snake_case")]
+pub enum LogEvent {
+    InvalidRpcResponse,
+    NetworkError,
+    SendDirectSendMessage,
+    SendRpcRequest,
+    Subscription,
+    UnexpectedError,
+}
diff --git a/consensus/src/consensus_observer/metrics.rs b/consensus/src/consensus_observer/metrics.rs
new file mode 100644
index 0000000000000..8cf8144d25a86
--- /dev/null
+++ b/consensus/src/consensus_observer/metrics.rs
@@ -0,0 +1,216 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+#![allow(clippy::unwrap_used)]
+
+use aptos_config::network_id::{NetworkId, PeerNetworkId};
+use aptos_metrics_core::{
+    register_histogram_vec, register_int_counter_vec, register_int_gauge_vec, HistogramVec,
+    IntCounterVec, IntGaugeVec,
+};
+use once_cell::sync::Lazy;
+
+// Useful metric labels
+pub const BLOCK_PAYLOAD_LABEL: &str = "block_payload";
+pub const COMMIT_DECISION_LABEL: &str = "commit_decision";
+pub const CREATED_SUBSCRIPTION_LABEL: &str = "created_subscription";
+pub const ORDERED_BLOCK_ENTRIES_LABEL: &str = "ordered_block_entries";
+pub const ORDERED_BLOCKS_LABEL: &str = "ordered_blocks";
+pub const PENDING_BLOCK_ENTRIES_LABEL: &str = "pending_block_entries";
+pub const PENDING_BLOCKS_LABEL: &str = "pending_blocks";
+pub const STORED_PAYLOADS_LABEL: &str = "stored_payloads";
+
+/// Counter for tracking created subscriptions for the consensus observer
+pub static OBSERVER_CREATED_SUBSCRIPTIONS: Lazy<IntCounterVec> = Lazy::new(|| {
+    register_int_counter_vec!(
+        "consensus_observer_created_subscriptions",
+        "Counters for created subscriptions for consensus observer",
+        &["creation_label", "network_id"]
+    )
+    .unwrap()
+});
+
+/// Gauge for tracking the number of active subscriptions for the consensus observer
+pub static OBSERVER_NUM_ACTIVE_SUBSCRIPTIONS: Lazy<IntGaugeVec> = Lazy::new(|| {
+    register_int_gauge_vec!(
+        "consensus_observer_num_active_subscriptions",
+        "Gauge related to active subscriptions for the consensus observer",
+        &["network_id"]
+    )
+    .unwrap()
+});
+
+/// Gauge for tracking the number of processed blocks by the consensus observer
+pub static OBSERVER_NUM_PROCESSED_BLOCKS: Lazy<IntGaugeVec> = Lazy::new(|| {
+    register_int_gauge_vec!(
+        "consensus_observer_num_processed_blocks",
+        "Gauge for tracking the number of processed blocks by the consensus observer",
+        &["processed_type"]
+    )
+    .unwrap()
+});
+
+/// Gauge for tracking the processed block rounds by the consensus observer
+pub static OBSERVER_PROCESSED_BLOCK_ROUNDS: Lazy<IntGaugeVec> = Lazy::new(|| {
+    register_int_gauge_vec!(
+        "consensus_observer_processed_block_rounds",
+        "Gauge for tracking the processed block rounds by the consensus observer",
+        &["processed_type"]
+    )
+    .unwrap()
+});
+
+/// Counter for tracking successful RPC responses received by the consensus observer
+pub static OBSERVER_RECEIVED_MESSAGE_RESPONSES: Lazy<IntCounterVec> = Lazy::new(|| {
+    register_int_counter_vec!(
+        "consensus_observer_received_message_responses",
+        "Counters related to successful RPC responses received by the consensus observer",
+        &["response_type", "network_id"]
+    )
+    .unwrap()
+});
+
+/// Counter for tracking received (direct send) messages by the consensus observer
+pub static OBSERVER_RECEIVED_MESSAGES: Lazy<IntCounterVec> = Lazy::new(|| {
+    register_int_counter_vec!(
+        "consensus_observer_received_messages",
+        "Counters related to received (direct send) messages by the consensus observer",
+        &["message_type", "network_id"]
+    )
+    .unwrap()
+});
+
+/// Gauge for tracking the rounds of received messages by the consensus observer
+pub static OBSERVER_RECEIVED_MESSAGE_ROUNDS: Lazy<IntGaugeVec> = Lazy::new(|| {
+    register_int_gauge_vec!(
+        "consensus_observer_received_message_rounds",
+        "Gauge for tracking the rounds of received messages by the consensus observer",
+        &["message_type"]
+    )
+    .unwrap()
+});
+
+/// Counter for tracking RPC request latencies sent by the consensus observer
+pub static OBSERVER_REQUEST_LATENCIES: Lazy<HistogramVec> = Lazy::new(|| {
+    register_histogram_vec!(
+        "consensus_observer_request_latencies",
+        "Counters related to RPC request latencies sent by the consensus observer",
+        &["request_type", "network_id"]
+    )
+    .unwrap()
+});
+
+/// Counter for tracking RPC error responses received by the consensus observer
+pub static OBSERVER_SENT_MESSAGE_ERRORS: Lazy<IntCounterVec> = Lazy::new(|| {
+    register_int_counter_vec!(
+        "consensus_observer_sent_message_errors",
+        "Counters related to RPC error responses received by the consensus observer",
+        &["response_type", "network_id"]
+    )
+    .unwrap()
+});
+
+/// Counter for tracking sent RPC requests by the consensus observer
+pub static OBSERVER_SENT_REQUESTS: Lazy<IntCounterVec> = Lazy::new(|| {
+    register_int_counter_vec!(
+        "consensus_observer_sent_requests",
+        "Counters related to sent RPC requests by the consensus observer",
+        &["request_type", "network_id"]
+    )
+    .unwrap()
+});
+
+/// Counter for tracking terminated subscriptions for the consensus observer
+pub static OBSERVER_TERMINATED_SUBSCRIPTIONS: Lazy<IntCounterVec> = Lazy::new(|| {
+    register_int_counter_vec!(
+        "consensus_observer_terminated_subscriptions",
+        "Counters for terminated subscriptions for consensus observer",
+        &["termination_label", "network_id"]
+    )
+    .unwrap()
+});
+
+/// Counter for pending network events for consensus observer and publisher
+pub static PENDING_CONSENSUS_OBSERVER_NETWORK_EVENTS: Lazy<IntCounterVec> = Lazy::new(|| {
+    register_int_counter_vec!(
+        "consensus_observer_pending_network_events",
+        "Counters for pending network events for consensus observer and publisher",
+        &["state"]
+    )
+    .unwrap()
+});
+
+/// Gauge for tracking the number of active subscribers for the consensus publisher
+pub static PUBLISHER_NUM_ACTIVE_SUBSCRIBERS: Lazy<IntGaugeVec> = Lazy::new(|| {
+    register_int_gauge_vec!(
+        "consensus_publisher_num_active_subscribers",
+        "Gauge related to active subscribers for the consensus publisher",
+        &["network_id"]
+    )
+    .unwrap()
+});
+
+/// Counter for tracking received RPC requests by the consensus publisher
+pub static PUBLISHER_RECEIVED_REQUESTS: Lazy<IntCounterVec> = Lazy::new(|| {
+    register_int_counter_vec!(
+        "consensus_publisher_received_requests",
+        "Counters related to received RPC requests by the consensus publisher",
+        &["request_type", "network_id"]
+    )
+    .unwrap()
+});
+
+/// Counter for tracking sent (direct send) message errors for the consensus publisher
+pub static PUBLISHER_SENT_MESSAGE_ERRORS: Lazy<IntCounterVec> = Lazy::new(|| {
+    register_int_counter_vec!(
+        "consensus_publisher_sent_message_errors",
+        "Counters related to sent (direct send) message errors for the consensus publisher",
+        &["error_type", "network_id"]
+    )
+    .unwrap()
+});
+
+/// Counter for tracking sent (direct send) messages by the consensus publisher
+pub static PUBLISHER_SENT_MESSAGES: Lazy<IntCounterVec> = Lazy::new(|| {
+    register_int_counter_vec!(
+        "consensus_publisher_sent_messages",
+        "Counters related to sent (direct send) messages by the consensus publisher",
+        &["message_type", "network_id"]
+    )
+    .unwrap()
+});
+
+/// Increments the given request counter with the provided values
+pub fn increment_request_counter(
+    counter: &Lazy<IntCounterVec>,
+    label: &str,
+    peer_network_id: &PeerNetworkId,
+) {
+    let network_id = peer_network_id.network_id();
+    counter
+        .with_label_values(&[label, network_id.as_str()])
+        .inc();
+}
+
+/// Observes the value for the provided histogram and label
+pub fn observe_value_with_label(
+    histogram: &Lazy<HistogramVec>,
+    request_label: &str,
+    peer_network_id: &PeerNetworkId,
+    value: f64,
+) {
+    let network_id = peer_network_id.network_id();
+    histogram
+        .with_label_values(&[request_label, network_id.as_str()])
+        .observe(value)
+}
+
+/// Sets the gauge with the specific network ID and value
+pub fn set_gauge(counter: &Lazy<IntGaugeVec>, network_id: &NetworkId, value: i64) {
+    counter.with_label_values(&[network_id.as_str()]).set(value);
+}
+
+/// Sets the gauge with the specific label and value
+pub fn set_gauge_with_label(counter: &Lazy<IntGaugeVec>, label: &str, value: u64) {
+    counter.with_label_values(&[label]).set(value as i64);
+}
diff --git a/consensus/src/consensus_observer/mod.rs b/consensus/src/consensus_observer/mod.rs
index ec2ef3af57548..733840cc8d3db 100644
--- a/consensus/src/consensus_observer/mod.rs
+++ b/consensus/src/consensus_observer/mod.rs
@@ -1,6 +1,15 @@
 // Copyright © Aptos Foundation
 // SPDX-License-Identifier: Apache-2.0
 
-pub mod network;
+pub mod error;
+pub mod logging;
+pub mod metrics;
+pub mod network_client;
+pub mod network_events;
+pub mod network_message;
 pub mod observer;
+pub mod ordered_blocks;
+pub mod payload_store;
+pub mod pending_blocks;
 pub mod publisher;
+mod subscription;
diff --git a/consensus/src/consensus_observer/network.rs b/consensus/src/consensus_observer/network.rs
deleted file mode 100644
index 339589ddbc824..0000000000000
--- a/consensus/src/consensus_observer/network.rs
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-use aptos_consensus_types::{
-    pipeline::commit_decision::CommitDecision, pipelined_block::PipelinedBlock,
-};
-use aptos_types::{
-    block_info::BlockInfo, ledger_info::LedgerInfoWithSignatures, transaction::SignedTransaction,
-};
-use serde::{Deserialize, Serialize};
-use std::{
-    fmt::{Display, Formatter},
-    sync::Arc,
-};
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct OrderedBlock {
-    pub blocks: Vec<Arc<PipelinedBlock>>,
-    pub ordered_proof: LedgerInfoWithSignatures,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub enum ObserverMessage {
-    OrderedBlock(OrderedBlock),
-    CommitDecision(CommitDecision),
-    Payload((BlockInfo, (Vec<SignedTransaction>, Option<usize>))),
-}
-
-impl Display for ObserverMessage {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        match self {
-            ObserverMessage::OrderedBlock(blocks) => {
-                write!(f, "OrderedBlock: {}", blocks.ordered_proof.commit_info())
-            },
-            ObserverMessage::CommitDecision(commit) => {
-                write!(f, "CommitDecision: {}", commit.ledger_info().commit_info())
-            },
-            ObserverMessage::Payload((block, (payload, limit))) => {
-                write!(f, "Payload: {} {} {:?}", block.id(), payload.len(), limit)
-            },
-        }
-    }
-}
-
-impl ObserverMessage {
-    pub fn epoch(&self) -> u64 {
-        match self {
-            ObserverMessage::OrderedBlock(blocks) => blocks.ordered_proof.commit_info().epoch(),
-            ObserverMessage::CommitDecision(commit) => commit.ledger_info().commit_info().epoch(),
-            ObserverMessage::Payload((block, _)) => block.epoch(),
-        }
-    }
-}
diff --git a/consensus/src/consensus_observer/network_client.rs b/consensus/src/consensus_observer/network_client.rs
new file mode 100644
index 0000000000000..ea6806e6afe8f
--- /dev/null
+++ b/consensus/src/consensus_observer/network_client.rs
@@ -0,0 +1,255 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::consensus_observer::{
+    error::Error,
+    logging::{LogEntry, LogEvent, LogSchema},
+    metrics,
+    network_message::{
+        ConsensusObserverDirectSend, ConsensusObserverMessage, ConsensusObserverRequest,
+        ConsensusObserverResponse,
+    },
+};
+use aptos_config::network_id::PeerNetworkId;
+use aptos_logger::{debug, warn};
+use aptos_network::application::{interface::NetworkClientInterface, storage::PeersAndMetadata};
+use aptos_time_service::{TimeService, TimeServiceTrait};
+use bytes::Bytes;
+use rand::Rng;
+use std::{sync::Arc, time::Duration};
+
+/// The interface for sending consensus publisher and observer messages
+#[derive(Clone, Debug)]
+pub struct ConsensusObserverClient<NetworkClient> {
+    network_client: NetworkClient,
+    time_service: TimeService,
+}
+
+impl<NetworkClient: NetworkClientInterface<ConsensusObserverMessage>>
+    ConsensusObserverClient<NetworkClient>
+{
+    pub fn new(network_client: NetworkClient) -> Self {
+        let time_service = TimeService::real();
+        Self {
+            network_client,
+            time_service,
+        }
+    }
+
+    /// Sends an already serialized (direct send) message to a specific peer
+    pub fn send_serialized_message_to_peer(
+        &self,
+        peer_network_id: &PeerNetworkId,
+        message: Bytes,
+        message_label: &str,
+    ) -> Result<(), Error> {
+        // Increment the message counter
+        metrics::increment_request_counter(
+            &metrics::PUBLISHER_SENT_MESSAGES,
+            message_label,
+            peer_network_id,
+        );
+
+        // Log the message being sent
+        debug!(LogSchema::new(LogEntry::SendDirectSendMessage)
+            .event(LogEvent::SendDirectSendMessage)
+            .message_type(message_label)
+            .peer(peer_network_id));
+
+        // Send the message
+        let result = self
+            .network_client
+            .send_to_peer_raw(message, *peer_network_id)
+            .map_err(|error| Error::NetworkError(error.to_string()));
+
+        // Process any error results
+        if let Err(error) = result {
+            // Log the failed send
+            warn!(LogSchema::new(LogEntry::SendDirectSendMessage)
+                .event(LogEvent::NetworkError)
+                .message_type(message_label)
+                .peer(peer_network_id)
+                .message(&format!("Failed to send message: {:?}", error)));
+
+            // Update the direct send error metrics
+            metrics::increment_request_counter(
+                &metrics::PUBLISHER_SENT_MESSAGE_ERRORS,
+                error.get_label(),
+                peer_network_id,
+            );
+
+            Err(Error::NetworkError(error.to_string()))
+        } else {
+            Ok(())
+        }
+    }
+
+    /// Serializes the given message into bytes for the specified peer
+    pub fn serialize_message_for_peer(
+        &self,
+        peer_network_id: &PeerNetworkId,
+        message: ConsensusObserverDirectSend,
+    ) -> Result<Bytes, Error> {
+        // Serialize the message into bytes
+        let message_label = message.get_label();
+        let message = ConsensusObserverMessage::DirectSend(message);
+        let result = self
+            .network_client
+            .to_bytes_by_protocol(vec![*peer_network_id], message)
+            .map_err(|error| Error::NetworkError(error.to_string()));
+
+        // Process the serialization result
+        match result {
+            Ok(peer_to_serialized_bytes) => {
+                // Get the serialized bytes for the peer
+                let serialized_bytes =
+                    peer_to_serialized_bytes
+                        .get(peer_network_id)
+                        .ok_or_else(|| {
+                            Error::NetworkError(format!(
+                                "Failed to get serialized bytes for peer: {:?}!",
+                                peer_network_id
+                            ))
+                        })?;
+
+                Ok(serialized_bytes.clone())
+            },
+            Err(error) => {
+                // Log the serialization error
+                warn!(LogSchema::new(LogEntry::SendDirectSendMessage)
+                    .event(LogEvent::NetworkError)
+                    .message_type(message_label)
+                    .peer(peer_network_id)
+                    .message(&format!("Failed to serialize message: {:?}", error)));
+
+                // Update the direct send error metrics
+                metrics::increment_request_counter(
+                    &metrics::PUBLISHER_SENT_MESSAGE_ERRORS,
+                    error.get_label(),
+                    peer_network_id,
+                );
+
+                Err(Error::NetworkError(error.to_string()))
+            },
+        }
+    }
+
+    /// Sends a RPC request to a specific peer and returns the response
+    pub async fn send_rpc_request_to_peer(
+        &self,
+        peer_network_id: &PeerNetworkId,
+        request: ConsensusObserverRequest,
+        request_timeout_ms: u64,
+    ) -> Result<ConsensusObserverResponse, Error> {
+        // Generate a random request ID
+        let request_id = rand::thread_rng().gen();
+
+        // Increment the request counter
+        metrics::increment_request_counter(
+            &metrics::OBSERVER_SENT_REQUESTS,
+            request.get_label(),
+            peer_network_id,
+        );
+
+        // Log the request being sent
+        debug!(LogSchema::new(LogEntry::SendRpcRequest)
+            .event(LogEvent::SendRpcRequest)
+            .request_type(request.get_label())
+            .request_id(request_id)
+            .peer(peer_network_id));
+
+        // Send the request and wait for the response
+        let request_label = request.get_label();
+        let result = self
+            .send_rpc_request(
+                *peer_network_id,
+                request,
+                Duration::from_millis(request_timeout_ms),
+            )
+            .await;
+
+        // Process the response
+        match result {
+            Ok(consensus_observer_response) => {
+                // Update the RPC success metrics
+                metrics::increment_request_counter(
+                    &metrics::OBSERVER_RECEIVED_MESSAGE_RESPONSES,
+                    request_label,
+                    peer_network_id,
+                );
+
+                Ok(consensus_observer_response)
+            },
+            Err(error) => {
+                // Log the failed RPC request
+                warn!(LogSchema::new(LogEntry::SendRpcRequest)
+                    .event(LogEvent::InvalidRpcResponse)
+                    .request_type(request_label)
+                    .request_id(request_id)
+                    .peer(peer_network_id)
+                    .error(&error));
+
+                // Update the RPC error metrics
+                metrics::increment_request_counter(
+                    &metrics::OBSERVER_SENT_MESSAGE_ERRORS,
+                    error.get_label(),
+                    peer_network_id,
+                );
+
+                Err(error)
+            },
+        }
+    }
+
+    /// Sends an RPC request to the specified peer with the given timeout
+    async fn send_rpc_request(
+        &self,
+        peer_network_id: PeerNetworkId,
+        request: ConsensusObserverRequest,
+        timeout: Duration,
+    ) -> Result<ConsensusObserverResponse, Error> {
+        // Start the request timer
+        let start_time = self.time_service.now();
+
+        // Send the request and wait for the response
+        let request_label = request.get_label();
+        let response = self
+            .network_client
+            .send_to_peer_rpc(
+                ConsensusObserverMessage::Request(request),
+                timeout,
+                peer_network_id,
+            )
+            .await
+            .map_err(|error| Error::NetworkError(error.to_string()))?;
+
+        // Stop the timer and calculate the duration
+        let request_duration_secs = start_time.elapsed().as_secs_f64();
+
+        // Update the RPC request metrics
+        metrics::observe_value_with_label(
+            &metrics::OBSERVER_REQUEST_LATENCIES,
+            request_label,
+            &peer_network_id,
+            request_duration_secs,
+        );
+
+        // Process the response
+        match response {
+            ConsensusObserverMessage::Response(response) => Ok(response),
+            ConsensusObserverMessage::Request(request) => Err(Error::NetworkError(format!(
+                "Got consensus observer request instead of response! Request: {:?}",
+                request
+            ))),
+            ConsensusObserverMessage::DirectSend(message) => Err(Error::NetworkError(format!(
+                "Got consensus observer direct send message instead of response! Message: {:?}",
+                message
+            ))),
+        }
+    }
+
+    /// Returns the peers and metadata struct
+    pub fn get_peers_and_metadata(&self) -> Arc<PeersAndMetadata> {
+        self.network_client.get_peers_and_metadata()
+    }
+}
diff --git a/consensus/src/consensus_observer/network_events.rs b/consensus/src/consensus_observer/network_events.rs
new file mode 100644
index 0000000000000..6f865f1568ae1
--- /dev/null
+++ b/consensus/src/consensus_observer/network_events.rs
@@ -0,0 +1,133 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::consensus_observer::network_message::{
+    ConsensusObserverMessage, ConsensusObserverResponse,
+};
+use aptos_config::network_id::{NetworkId, PeerNetworkId};
+use aptos_network::{
+    application::interface::NetworkServiceEvents,
+    protocols::{
+        network::{Event, RpcError},
+        wire::handshake::v1::ProtocolId,
+    },
+};
+use bytes::Bytes;
+use futures::{
+    future,
+    stream::{select_all, BoxStream, StreamExt},
+    Stream,
+};
+use futures_channel::oneshot;
+use std::{
+    pin::Pin,
+    task::{Context, Poll},
+};
+
+/// A simple wrapper for each network message
+pub struct NetworkMessage {
+    pub peer_network_id: PeerNetworkId,
+    pub protocol_id: Option<ProtocolId>,
+    pub consensus_observer_message: ConsensusObserverMessage,
+    pub response_sender: Option<ResponseSender>,
+}
+
+/// A stream of messages from the network. Each message also comes with
+/// a callback to send the response (if the message is an RPC request).
+pub struct ConsensusObserverNetworkEvents {
+    network_message_stream: BoxStream<'static, NetworkMessage>,
+}
+
+impl ConsensusObserverNetworkEvents {
+    pub fn new(network_service_events: NetworkServiceEvents<ConsensusObserverMessage>) -> Self {
+        // Transform the event streams to also include the network ID
+        let network_events: Vec<_> = network_service_events
+            .into_network_and_events()
+            .into_iter()
+            .map(|(network_id, events)| events.map(move |event| (network_id, event)))
+            .collect();
+        let network_events = select_all(network_events).fuse();
+
+        // Transform each event to a network message
+        let network_message_stream = network_events
+            .filter_map(|(network_id, event)| {
+                future::ready(Self::event_to_request(network_id, event))
+            })
+            .boxed();
+
+        Self {
+            network_message_stream,
+        }
+    }
+
+    /// Transforms each network event into a network message
+    fn event_to_request(
+        network_id: NetworkId,
+        network_event: Event<ConsensusObserverMessage>,
+    ) -> Option<NetworkMessage> {
+        match network_event {
+            Event::Message(peer_id, consensus_observer_message) => {
+                // Transform the direct send event into a network message
+                let peer_network_id = PeerNetworkId::new(network_id, peer_id);
+                let network_message = NetworkMessage {
+                    peer_network_id,
+                    protocol_id: None,
+                    consensus_observer_message,
+                    response_sender: None,
+                };
+                Some(network_message)
+            },
+            Event::RpcRequest(peer_id, consensus_observer_message, protocol_id, response_tx) => {
+                // Transform the RPC request event into a network message
+                let response_sender = ResponseSender::new(response_tx);
+                let peer_network_id = PeerNetworkId::new(network_id, peer_id);
+                let network_message = NetworkMessage {
+                    peer_network_id,
+                    protocol_id: Some(protocol_id),
+                    consensus_observer_message,
+                    response_sender: Some(response_sender),
+                };
+                Some(network_message)
+            },
+        }
+    }
+}
+
+impl Stream for ConsensusObserverNetworkEvents {
+    type Item = NetworkMessage;
+
+    fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
+        Pin::new(&mut self.network_message_stream).poll_next(cx)
+    }
+}
+
+/// A channel for fulfilling a pending consensus observer RPC request
+pub struct ResponseSender {
+    response_tx: oneshot::Sender<Result<Bytes, RpcError>>,
+}
+
+impl ResponseSender {
+    pub fn new(response_tx: oneshot::Sender<Result<Bytes, RpcError>>) -> Self {
+        Self { response_tx }
+    }
+
+    #[cfg(test)]
+    /// Creates a new response sender for testing purposes.
+    pub fn new_for_test() -> Self {
+        Self {
+            response_tx: oneshot::channel().0,
+        }
+    }
+
+    /// Send the response to the pending RPC request
+    pub fn send(self, response: ConsensusObserverResponse) {
+        // Create and serialize the response message
+        let consensus_observer_message = ConsensusObserverMessage::Response(response);
+        let result = bcs::to_bytes(&consensus_observer_message)
+            .map(Bytes::from)
+            .map_err(RpcError::BcsError);
+
+        // Send the response
+        let _ = self.response_tx.send(result);
+    }
+}
diff --git a/consensus/src/consensus_observer/network_message.rs b/consensus/src/consensus_observer/network_message.rs
new file mode 100644
index 0000000000000..5de19ed6d47ec
--- /dev/null
+++ b/consensus/src/consensus_observer/network_message.rs
@@ -0,0 +1,1351 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::consensus_observer::error::Error;
+use aptos_consensus_types::{
+    common::{BatchPayload, Payload},
+    pipelined_block::PipelinedBlock,
+    proof_of_store::{BatchInfo, ProofCache, ProofOfStore},
+};
+use aptos_crypto::hash::CryptoHash;
+use aptos_types::{
+    block_info::{BlockInfo, Round},
+    epoch_change::Verifier,
+    epoch_state::EpochState,
+    ledger_info::LedgerInfoWithSignatures,
+    transaction::SignedTransaction,
+};
+use serde::{Deserialize, Serialize};
+use std::{
+    fmt::{Display, Formatter},
+    slice::Iter,
+    sync::Arc,
+};
+
+/// Types of messages that can be sent between the consensus publisher and observer
+#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
+pub enum ConsensusObserverMessage {
+    Request(ConsensusObserverRequest),
+    Response(ConsensusObserverResponse),
+    DirectSend(ConsensusObserverDirectSend),
+}
+
+impl ConsensusObserverMessage {
+    /// Creates and returns a new ordered block message using the given blocks and ordered proof
+    pub fn new_ordered_block_message(
+        blocks: Vec<Arc<PipelinedBlock>>,
+        ordered_proof: LedgerInfoWithSignatures,
+    ) -> ConsensusObserverDirectSend {
+        ConsensusObserverDirectSend::OrderedBlock(OrderedBlock {
+            blocks,
+            ordered_proof,
+        })
+    }
+
+    /// Creates and returns a new commit decision message using the given commit decision
+    pub fn new_commit_decision_message(
+        commit_proof: LedgerInfoWithSignatures,
+    ) -> ConsensusObserverDirectSend {
+        ConsensusObserverDirectSend::CommitDecision(CommitDecision { commit_proof })
+    }
+
+    /// Creates and returns a new block payload message using the given block, transactions and limit
+    pub fn new_block_payload_message(
+        block: BlockInfo,
+        transaction_payload: BlockTransactionPayload,
+    ) -> ConsensusObserverDirectSend {
+        ConsensusObserverDirectSend::BlockPayload(BlockPayload {
+            block,
+            transaction_payload,
+        })
+    }
+}
+
+impl Display for ConsensusObserverMessage {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        match self {
+            ConsensusObserverMessage::Request(request) => {
+                write!(f, "ConsensusObserverRequest: {}", request)
+            },
+            ConsensusObserverMessage::Response(response) => {
+                write!(f, "ConsensusObserverResponse: {}", response)
+            },
+            ConsensusObserverMessage::DirectSend(direct_send) => {
+                write!(f, "ConsensusObserverDirectSend: {}", direct_send)
+            },
+        }
+    }
+}
+
+/// Types of requests that can be sent between the consensus publisher and observer
+#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
+pub enum ConsensusObserverRequest {
+    Subscribe,
+    Unsubscribe,
+}
+
+impl ConsensusObserverRequest {
+    /// Returns a summary label for the request
+    pub fn get_label(&self) -> &'static str {
+        match self {
+            ConsensusObserverRequest::Subscribe => "subscribe",
+            ConsensusObserverRequest::Unsubscribe => "unsubscribe",
+        }
+    }
+}
+
+impl Display for ConsensusObserverRequest {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self.get_label())
+    }
+}
+
+/// Types of responses that can be sent between the consensus publisher and observer
+#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
+pub enum ConsensusObserverResponse {
+    SubscribeAck,
+    UnsubscribeAck,
+}
+
+impl ConsensusObserverResponse {
+    /// Returns a summary label for the response
+    pub fn get_label(&self) -> &'static str {
+        match self {
+            ConsensusObserverResponse::SubscribeAck => "subscribe_ack",
+            ConsensusObserverResponse::UnsubscribeAck => "unsubscribe_ack",
+        }
+    }
+}
+
+impl Display for ConsensusObserverResponse {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self.get_label())
+    }
+}
+
+/// Types of direct sends that can be sent between the consensus publisher and observer
+#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
+pub enum ConsensusObserverDirectSend {
+    OrderedBlock(OrderedBlock),
+    CommitDecision(CommitDecision),
+    BlockPayload(BlockPayload),
+}
+
+impl ConsensusObserverDirectSend {
+    /// Returns a summary label for the direct send
+    pub fn get_label(&self) -> &'static str {
+        match self {
+            ConsensusObserverDirectSend::OrderedBlock(_) => "ordered_block",
+            ConsensusObserverDirectSend::CommitDecision(_) => "commit_decision",
+            ConsensusObserverDirectSend::BlockPayload(_) => "block_payload",
+        }
+    }
+}
+
+impl Display for ConsensusObserverDirectSend {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        match self {
+            ConsensusObserverDirectSend::OrderedBlock(ordered_block) => {
+                write!(f, "OrderedBlock: {}", ordered_block.proof_block_info())
+            },
+            ConsensusObserverDirectSend::CommitDecision(commit_decision) => {
+                write!(f, "CommitDecision: {}", commit_decision.proof_block_info())
+            },
+            ConsensusObserverDirectSend::BlockPayload(block_payload) => {
+                write!(
+                    f,
+                    "BlockPayload: {}. Number of transactions: {}, limit: {:?}, proofs: {:?}",
+                    block_payload.block,
+                    block_payload.transaction_payload.transactions().len(),
+                    block_payload.transaction_payload.limit(),
+                    block_payload.transaction_payload.payload_proofs(),
+                )
+            },
+        }
+    }
+}
+
+/// OrderedBlock message contains the ordered blocks and the proof of the ordering
+#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
+pub struct OrderedBlock {
+    blocks: Vec<Arc<PipelinedBlock>>,
+    ordered_proof: LedgerInfoWithSignatures,
+}
+
+impl OrderedBlock {
+    pub fn new(blocks: Vec<Arc<PipelinedBlock>>, ordered_proof: LedgerInfoWithSignatures) -> Self {
+        Self {
+            blocks,
+            ordered_proof,
+        }
+    }
+
+    /// Returns a reference to the ordered blocks
+    pub fn blocks(&self) -> &Vec<Arc<PipelinedBlock>> {
+        &self.blocks
+    }
+
+    /// Returns a copy of the first ordered block
+    pub fn first_block(&self) -> Arc<PipelinedBlock> {
+        self.blocks
+            .first()
+            .cloned()
+            .expect("At least one block is expected!")
+    }
+
+    /// Returns a copy of the last ordered block
+    pub fn last_block(&self) -> Arc<PipelinedBlock> {
+        self.blocks
+            .last()
+            .cloned()
+            .expect("At least one block is expected!")
+    }
+
+    /// Returns a reference to the ordered proof
+    pub fn ordered_proof(&self) -> &LedgerInfoWithSignatures {
+        &self.ordered_proof
+    }
+
+    /// Returns a reference to the ordered proof block info
+    pub fn proof_block_info(&self) -> &BlockInfo {
+        self.ordered_proof.commit_info()
+    }
+
+    /// Verifies the ordered blocks and returns an error if the data is invalid.
+    /// Note: this does not check the ordered proof.
+    pub fn verify_ordered_blocks(&self) -> Result<(), Error> {
+        // Verify that we have at least one ordered block
+        if self.blocks.is_empty() {
+            return Err(Error::InvalidMessageError(
+                "Received empty ordered block!".to_string(),
+            ));
+        }
+
+        // Verify the last block ID matches the ordered proof block ID
+        if self.last_block().id() != self.proof_block_info().id() {
+            return Err(Error::InvalidMessageError(
+                format!(
+                    "Last ordered block ID does not match the ordered proof ID! Number of blocks: {:?}, Last ordered block ID: {:?}, Ordered proof ID: {:?}",
+                    self.blocks.len(),
+                    self.last_block().id(),
+                    self.proof_block_info().id()
+                )
+            ));
+        }
+
+        // Verify the blocks are correctly chained together (from the last block to the first)
+        let mut expected_parent_id = None;
+        for block in self.blocks.iter().rev() {
+            if let Some(expected_parent_id) = expected_parent_id {
+                if block.id() != expected_parent_id {
+                    return Err(Error::InvalidMessageError(
+                        format!(
+                            "Block parent ID does not match the expected parent ID! Block ID: {:?}, Expected parent ID: {:?}",
+                            block.id(),
+                            expected_parent_id
+                        )
+                    ));
+                }
+            }
+
+            expected_parent_id = Some(block.parent_id());
+        }
+
+        Ok(())
+    }
+
+    /// Verifies the ordered proof and returns an error if the proof is invalid
+    pub fn verify_ordered_proof(&self, epoch_state: &EpochState) -> Result<(), Error> {
+        epoch_state.verify(&self.ordered_proof).map_err(|error| {
+            Error::InvalidMessageError(format!(
+                "Failed to verify ordered proof ledger info: {:?}, Error: {:?}",
+                self.proof_block_info(),
+                error
+            ))
+        })
+    }
+}
+
+/// CommitDecision message contains the commit decision proof
+#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
+pub struct CommitDecision {
+    commit_proof: LedgerInfoWithSignatures,
+}
+
+impl CommitDecision {
+    pub fn new(commit_proof: LedgerInfoWithSignatures) -> Self {
+        Self { commit_proof }
+    }
+
+    /// Returns a reference to the commit proof
+    pub fn commit_proof(&self) -> &LedgerInfoWithSignatures {
+        &self.commit_proof
+    }
+
+    /// Returns the epoch of the commit proof
+    pub fn epoch(&self) -> u64 {
+        self.commit_proof.ledger_info().epoch()
+    }
+
+    /// Returns a reference to the commit proof block info
+    pub fn proof_block_info(&self) -> &BlockInfo {
+        self.commit_proof.commit_info()
+    }
+
+    /// Returns the round of the commit proof
+    pub fn round(&self) -> Round {
+        self.commit_proof.ledger_info().round()
+    }
+
+    /// Verifies the commit proof and returns an error if the proof is invalid
+    pub fn verify_commit_proof(&self, epoch_state: &EpochState) -> Result<(), Error> {
+        epoch_state.verify(&self.commit_proof).map_err(|error| {
+            Error::InvalidMessageError(format!(
+                "Failed to verify commit proof ledger info: {:?}, Error: {:?}",
+                self.proof_block_info(),
+                error
+            ))
+        })
+    }
+}
+
+/// The transaction payload and proof of each block
+#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
+pub struct PayloadWithProof {
+    pub transactions: Vec<SignedTransaction>,
+    pub proofs: Vec<ProofOfStore>,
+}
+
+impl PayloadWithProof {
+    pub fn new(transactions: Vec<SignedTransaction>, proofs: Vec<ProofOfStore>) -> Self {
+        Self {
+            transactions,
+            proofs,
+        }
+    }
+
+    #[cfg(test)]
+    /// Returns an empty payload with proof (for testing)
+    pub fn empty() -> Self {
+        Self {
+            transactions: vec![],
+            proofs: vec![],
+        }
+    }
+}
+
+/// The transaction payload and proof of each block with a transaction limit
+#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
+pub struct PayloadWithProofAndLimit {
+    pub payload_with_proof: PayloadWithProof,
+    pub transaction_limit: Option<u64>,
+}
+
+impl PayloadWithProofAndLimit {
+    pub fn new(payload_with_proof: PayloadWithProof, limit: Option<u64>) -> Self {
+        Self {
+            payload_with_proof,
+            transaction_limit: limit,
+        }
+    }
+
+    #[cfg(test)]
+    /// Returns an empty payload with proof and limit (for testing)
+    pub fn empty() -> Self {
+        Self {
+            payload_with_proof: PayloadWithProof::empty(),
+            transaction_limit: None,
+        }
+    }
+}
+
+/// The transaction payload of each block
+#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
+pub enum BlockTransactionPayload {
+    InQuorumStore(PayloadWithProof),
+    InQuorumStoreWithLimit(PayloadWithProofAndLimit),
+    QuorumStoreInlineHybrid(PayloadWithProofAndLimit, Vec<BatchInfo>),
+    OptQuorumStore(PayloadWithProofAndLimit, Vec<BatchInfo>),
+}
+
+impl BlockTransactionPayload {
+    /// Creates a returns a new InQuorumStore transaction payload
+    pub fn new_in_quorum_store(
+        transactions: Vec<SignedTransaction>,
+        proofs: Vec<ProofOfStore>,
+    ) -> Self {
+        let payload_with_proof = PayloadWithProof::new(transactions, proofs);
+        Self::InQuorumStore(payload_with_proof)
+    }
+
+    /// Creates a returns a new InQuorumStoreWithLimit transaction payload
+    pub fn new_in_quorum_store_with_limit(
+        transactions: Vec<SignedTransaction>,
+        proofs: Vec<ProofOfStore>,
+        limit: Option<u64>,
+    ) -> Self {
+        let payload_with_proof = PayloadWithProof::new(transactions, proofs);
+        let proof_with_limit = PayloadWithProofAndLimit::new(payload_with_proof, limit);
+        Self::InQuorumStoreWithLimit(proof_with_limit)
+    }
+
+    /// Creates a returns a new QuorumStoreInlineHybrid transaction payload
+    pub fn new_quorum_store_inline_hybrid(
+        transactions: Vec<SignedTransaction>,
+        proofs: Vec<ProofOfStore>,
+        limit: Option<u64>,
+        inline_batches: Vec<BatchInfo>,
+    ) -> Self {
+        let payload_with_proof = PayloadWithProof::new(transactions, proofs);
+        let proof_with_limit = PayloadWithProofAndLimit::new(payload_with_proof, limit);
+        Self::QuorumStoreInlineHybrid(proof_with_limit, inline_batches)
+    }
+
+    pub fn new_opt_quorum_store(
+        transactions: Vec<SignedTransaction>,
+        proofs: Vec<ProofOfStore>,
+        limit: Option<u64>,
+        batch_infos: Vec<BatchInfo>,
+    ) -> Self {
+        let payload_with_proof = PayloadWithProof::new(transactions, proofs);
+        let proof_with_limit = PayloadWithProofAndLimit::new(payload_with_proof, limit);
+        Self::OptQuorumStore(proof_with_limit, batch_infos)
+    }
+
+    #[cfg(test)]
+    /// Returns an empty transaction payload (for testing)
+    pub fn empty() -> Self {
+        Self::QuorumStoreInlineHybrid(PayloadWithProofAndLimit::empty(), vec![])
+    }
+
+    /// Returns the list of inline batches in the transaction payload
+    pub fn inline_batches(&self) -> Vec<&BatchInfo> {
+        match self {
+            BlockTransactionPayload::QuorumStoreInlineHybrid(_, inline_batches) => {
+                inline_batches.iter().collect()
+            },
+            _ => vec![],
+        }
+    }
+
+    /// Returns the limit of the transaction payload
+    pub fn limit(&self) -> Option<u64> {
+        match self {
+            BlockTransactionPayload::InQuorumStore(_) => None,
+            BlockTransactionPayload::InQuorumStoreWithLimit(payload) => payload.transaction_limit,
+            BlockTransactionPayload::QuorumStoreInlineHybrid(payload, _) => {
+                payload.transaction_limit
+            },
+            BlockTransactionPayload::OptQuorumStore(payload, _) => payload.transaction_limit,
+        }
+    }
+
+    /// Returns the proofs of the transaction payload
+    pub fn payload_proofs(&self) -> Vec<ProofOfStore> {
+        match self {
+            BlockTransactionPayload::InQuorumStore(payload) => payload.proofs.clone(),
+            BlockTransactionPayload::InQuorumStoreWithLimit(payload) => {
+                payload.payload_with_proof.proofs.clone()
+            },
+            BlockTransactionPayload::QuorumStoreInlineHybrid(payload, _) => {
+                payload.payload_with_proof.proofs.clone()
+            },
+            BlockTransactionPayload::OptQuorumStore(payload, _) => {
+                payload.payload_with_proof.proofs.clone()
+            },
+        }
+    }
+
+    /// Returns the transactions in the payload
+    pub fn transactions(&self) -> Vec<SignedTransaction> {
+        match self {
+            BlockTransactionPayload::InQuorumStore(payload) => payload.transactions.clone(),
+            BlockTransactionPayload::InQuorumStoreWithLimit(payload) => {
+                payload.payload_with_proof.transactions.clone()
+            },
+            BlockTransactionPayload::QuorumStoreInlineHybrid(payload, _) => {
+                payload.payload_with_proof.transactions.clone()
+            },
+            BlockTransactionPayload::OptQuorumStore(payload, _) => {
+                payload.payload_with_proof.transactions.clone()
+            },
+        }
+    }
+
+    /// Verifies the transaction payload against the given ordered block payload
+    pub fn verify_against_ordered_payload(
+        &self,
+        ordered_block_payload: &Payload,
+    ) -> Result<(), Error> {
+        match ordered_block_payload {
+            Payload::DirectMempool(_) => {
+                return Err(Error::InvalidMessageError(
+                    "Direct mempool payloads are not supported for consensus observer!".into(),
+                ));
+            },
+            Payload::InQuorumStore(proof_with_data) => {
+                // Verify the batches in the requested block
+                self.verify_batches(&proof_with_data.proofs)?;
+            },
+            Payload::InQuorumStoreWithLimit(proof_with_data) => {
+                // Verify the batches in the requested block
+                self.verify_batches(&proof_with_data.proof_with_data.proofs)?;
+
+                // Verify the transaction limit
+                self.verify_transaction_limit(proof_with_data.max_txns_to_execute)?;
+            },
+            Payload::QuorumStoreInlineHybrid(
+                inline_batches,
+                proof_with_data,
+                max_txns_to_execute,
+            ) => {
+                // Verify the batches in the requested block
+                self.verify_batches(&proof_with_data.proofs)?;
+
+                // Verify the inline batches
+                self.verify_inline_batches(inline_batches)?;
+
+                // Verify the transaction limit
+                self.verify_transaction_limit(*max_txns_to_execute)?;
+            },
+            Payload::OptQuorumStore(opt_qs_payload) => {
+                // Verify the batches in the requested block
+                self.verify_batches(opt_qs_payload.proof_with_data())?;
+
+                // Verify the inline batches
+                self.verify_opt_batches(opt_qs_payload.opt_batches())?;
+
+                // Verify the transaction limit
+                self.verify_transaction_limit(opt_qs_payload.max_txns_to_execute())?;
+            },
+        }
+
+        Ok(())
+    }
+
+    /// Verifies the payload batches against the expected batches
+    fn verify_batches(&self, expected_proofs: &[ProofOfStore]) -> Result<(), Error> {
+        // Get the batches in the block transaction payload
+        let payload_proofs = self.payload_proofs();
+        let payload_batches: Vec<&BatchInfo> =
+            payload_proofs.iter().map(|proof| proof.info()).collect();
+
+        // Compare the expected batches against the payload batches
+        let expected_batches: Vec<&BatchInfo> =
+            expected_proofs.iter().map(|proof| proof.info()).collect();
+        if expected_batches != payload_batches {
+            return Err(Error::InvalidMessageError(format!(
+                "Transaction payload failed batch verification! Expected batches {:?}, but found {:?}!",
+                expected_batches, payload_batches
+            )));
+        }
+
+        Ok(())
+    }
+
+    /// Verifies the inline batches against the expected inline batches
+    fn verify_inline_batches(
+        &self,
+        expected_inline_batches: &[(BatchInfo, Vec<SignedTransaction>)],
+    ) -> Result<(), Error> {
+        // Get the expected inline batches
+        let expected_inline_batches: Vec<&BatchInfo> = expected_inline_batches
+            .iter()
+            .map(|(batch_info, _)| batch_info)
+            .collect();
+
+        // Get the inline batches in the payload
+        let inline_batches: Vec<&BatchInfo> = match self {
+            BlockTransactionPayload::QuorumStoreInlineHybrid(_, inline_batches) => {
+                inline_batches.iter().map(|batch_info| batch_info).collect()
+            },
+            _ => {
+                return Err(Error::InvalidMessageError(
+                    "Transaction payload does not contain inline batches!".to_string(),
+                ))
+            },
+        };
+
+        // Compare the expected inline batches against the payload inline batches
+        if expected_inline_batches != inline_batches {
+            return Err(Error::InvalidMessageError(format!(
+                "Transaction payload failed inline batch verification! Expected inline batches {:?} but found {:?}",
+                expected_inline_batches, inline_batches
+            )));
+        }
+
+        Ok(())
+    }
+
+    fn verify_opt_batches(&self, expected_opt_batches: &Vec<BatchInfo>) -> Result<(), Error> {
+        let opt_batches: &Vec<BatchInfo> = match self {
+            BlockTransactionPayload::OptQuorumStore(_, opt_batches) => opt_batches,
+            _ => {
+                return Err(Error::InvalidMessageError(
+                    "Transaction payload is not an OptQS Payload".to_string(),
+                ))
+            },
+        };
+
+        if expected_opt_batches != opt_batches {
+            return Err(Error::InvalidMessageError(format!(
+                "Transaction payload failed optimistic batch verification! Expected optimistic batches {:?} but found {:?}",
+                expected_opt_batches, opt_batches
+            )));
+        }
+        Ok(())
+    }
+
+    /// Verifies the payload limit against the expected limit
+    fn verify_transaction_limit(
+        &self,
+        expected_transaction_limit: Option<u64>,
+    ) -> Result<(), Error> {
+        // Get the payload limit
+        let limit = match self {
+            BlockTransactionPayload::InQuorumStoreWithLimit(payload) => payload.transaction_limit,
+            BlockTransactionPayload::QuorumStoreInlineHybrid(payload, _) => {
+                payload.transaction_limit
+            },
+            _ => {
+                return Err(Error::InvalidMessageError(
+                    "Transaction payload does not contain a limit!".to_string(),
+                ))
+            },
+        };
+
+        // Compare the expected limit against the payload limit
+        if expected_transaction_limit != limit {
+            return Err(Error::InvalidMessageError(format!(
+                "Transaction payload failed limit verification! Expected limit: {:?}, Found limit: {:?}",
+                expected_transaction_limit, limit
+            )));
+        }
+
+        Ok(())
+    }
+}
+
+/// Payload message contains the block and transaction payload
+#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
+pub struct BlockPayload {
+    pub block: BlockInfo,
+    pub transaction_payload: BlockTransactionPayload,
+}
+
+impl BlockPayload {
+    pub fn new(block: BlockInfo, transaction_payload: BlockTransactionPayload) -> Self {
+        Self {
+            block,
+            transaction_payload,
+        }
+    }
+
+    /// Verifies the block payload digests and returns an error if the data is invalid
+    pub fn verify_payload_digests(&self) -> Result<(), Error> {
+        // Verify the proof of store digests against the transaction
+        let transactions = self.transaction_payload.transactions();
+        let mut transactions_iter = transactions.iter();
+        for proof_of_store in &self.transaction_payload.payload_proofs() {
+            reconstruct_and_verify_batch(&mut transactions_iter, proof_of_store.info())?;
+        }
+
+        // Verify the inline batch digests against the inline batches
+        for batch_info in self.transaction_payload.inline_batches() {
+            reconstruct_and_verify_batch(&mut transactions_iter, batch_info)?;
+        }
+
+        // Verify that there are no transactions remaining
+        let remaining_transactions = transactions_iter.as_slice();
+        if !remaining_transactions.is_empty() {
+            return Err(Error::InvalidMessageError(format!(
+                "Failed to verify payload transactions! Transactions remaining: {:?}. Expected: 0",
+                remaining_transactions.len()
+            )));
+        }
+
+        Ok(()) // All digests match
+    }
+
+    /// Verifies that the block payload proofs are correctly signed according
+    /// to the current epoch state. Returns an error if the data is invalid.
+    pub fn verify_payload_signatures(&self, epoch_state: &EpochState) -> Result<(), Error> {
+        // Create a dummy proof cache to verify the proofs
+        let proof_cache = ProofCache::new(1);
+
+        // TODO: parallelize the verification of the proof signatures!
+
+        // Verify each of the proof signatures
+        let validator_verifier = &epoch_state.verifier;
+        for proof_of_store in &self.transaction_payload.payload_proofs() {
+            if let Err(error) = proof_of_store.verify(validator_verifier, &proof_cache) {
+                return Err(Error::InvalidMessageError(format!(
+                    "Failed to verify the proof of store for batch: {:?}, Error: {:?}",
+                    proof_of_store.info(),
+                    error
+                )));
+            }
+        }
+
+        Ok(()) // All proofs are correctly signed
+    }
+}
+
+/// Reconstructs and verifies the batch using the
+/// given transactions and the expected batch info.
+fn reconstruct_and_verify_batch(
+    transactions_iter: &mut Iter<SignedTransaction>,
+    expected_batch_info: &BatchInfo,
+) -> Result<(), Error> {
+    // Gather the transactions for the batch
+    let mut batch_transactions = vec![];
+    for i in 0..expected_batch_info.num_txns() {
+        let batch_transaction = match transactions_iter.next() {
+            Some(transaction) => transaction,
+            None => {
+                return Err(Error::InvalidMessageError(format!(
+                    "Failed to extract transaction during batch reconstruction! Batch: {:?}, transaction index: {:?}",
+                    expected_batch_info, i
+                )));
+            },
+        };
+        batch_transactions.push(batch_transaction.clone());
+    }
+
+    // Calculate the batch digest
+    let batch_payload = BatchPayload::new(expected_batch_info.author(), batch_transactions);
+    let batch_digest = batch_payload.hash();
+
+    // Verify the reconstructed digest against the expected digest
+    let expected_digest = expected_batch_info.digest();
+    if batch_digest != *expected_digest {
+        return Err(Error::InvalidMessageError(format!(
+            "The reconstructed batch digest does not match the expected digest!\
+             Batch: {:?}, Expected digest: {:?}, Reconstructed digest: {:?}",
+            expected_batch_info, expected_digest, batch_digest
+        )));
+    }
+
+    Ok(())
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use aptos_bitvec::BitVec;
+    use aptos_consensus_types::{
+        block::Block,
+        block_data::{BlockData, BlockType},
+        common::{Author, ProofWithData, ProofWithDataWithTxnLimit},
+        proof_of_store::BatchId,
+        quorum_cert::QuorumCert,
+    };
+    use aptos_crypto::{ed25519::Ed25519PrivateKey, HashValue, PrivateKey, SigningKey, Uniform};
+    use aptos_types::{
+        aggregate_signature::AggregateSignature,
+        chain_id::ChainId,
+        ledger_info::LedgerInfo,
+        transaction::{RawTransaction, Script, TransactionPayload},
+        validator_signer::ValidatorSigner,
+        validator_verifier::{ValidatorConsensusInfo, ValidatorVerifier},
+        PeerId,
+    };
+    use claims::assert_matches;
+    use move_core_types::account_address::AccountAddress;
+
+    #[test]
+    fn test_verify_against_ordered_payload_mempool() {
+        // Create an empty transaction payload
+        let transaction_payload = BlockTransactionPayload::new_in_quorum_store(vec![], vec![]);
+
+        // Create a direct mempool payload
+        let ordered_payload = Payload::DirectMempool(vec![]);
+
+        // Verify the transaction payload and ensure it fails (mempool payloads are not supported)
+        let error = transaction_payload
+            .verify_against_ordered_payload(&ordered_payload)
+            .unwrap_err();
+        assert_matches!(error, Error::InvalidMessageError(_));
+    }
+
+    #[test]
+    fn test_verify_against_ordered_payload_in_qs() {
+        // Create an empty transaction payload with no proofs
+        let proofs = vec![];
+        let transaction_payload =
+            BlockTransactionPayload::new_in_quorum_store(vec![], proofs.clone());
+
+        // Create a quorum store payload with a single proof
+        let batch_info = create_batch_info();
+        let proof_with_data = ProofWithData::new(vec![ProofOfStore::new(
+            batch_info,
+            AggregateSignature::empty(),
+        )]);
+        let ordered_payload = Payload::InQuorumStore(proof_with_data);
+
+        // Verify the transaction payload and ensure it fails (the batch infos don't match)
+        let error = transaction_payload
+            .verify_against_ordered_payload(&ordered_payload)
+            .unwrap_err();
+        assert_matches!(error, Error::InvalidMessageError(_));
+
+        // Create a quorum store payload with no proofs
+        let proof_with_data = ProofWithData::new(proofs);
+        let ordered_payload = Payload::InQuorumStore(proof_with_data);
+
+        // Verify the transaction payload and ensure it passes
+        transaction_payload
+            .verify_against_ordered_payload(&ordered_payload)
+            .unwrap();
+    }
+
+    #[test]
+    fn test_verify_against_ordered_payload_in_qs_limit() {
+        // Create an empty transaction payload with no proofs
+        let proofs = vec![];
+        let transaction_limit = Some(10);
+        let transaction_payload = BlockTransactionPayload::new_in_quorum_store_with_limit(
+            vec![],
+            proofs.clone(),
+            transaction_limit,
+        );
+
+        // Create a quorum store payload with a single proof
+        let batch_info = create_batch_info();
+        let proof_with_data = ProofWithDataWithTxnLimit::new(
+            ProofWithData::new(vec![ProofOfStore::new(
+                batch_info,
+                AggregateSignature::empty(),
+            )]),
+            transaction_limit,
+        );
+        let ordered_payload = Payload::InQuorumStoreWithLimit(proof_with_data);
+
+        // Verify the transaction payload and ensure it fails (the batch infos don't match)
+        let error = transaction_payload
+            .verify_against_ordered_payload(&ordered_payload)
+            .unwrap_err();
+        assert_matches!(error, Error::InvalidMessageError(_));
+
+        // Create a quorum store payload with no proofs and no transaction limit
+        let proof_with_data =
+            ProofWithDataWithTxnLimit::new(ProofWithData::new(proofs.clone()), None);
+        let ordered_payload = Payload::InQuorumStoreWithLimit(proof_with_data);
+
+        // Verify the transaction payload and ensure it fails (the transaction limit doesn't match)
+        let error = transaction_payload
+            .verify_against_ordered_payload(&ordered_payload)
+            .unwrap_err();
+        assert_matches!(error, Error::InvalidMessageError(_));
+
+        // Create a quorum store payload with no proofs and the correct limit
+        let proof_with_data =
+            ProofWithDataWithTxnLimit::new(ProofWithData::new(proofs), transaction_limit);
+        let ordered_payload = Payload::InQuorumStoreWithLimit(proof_with_data);
+
+        // Verify the transaction payload and ensure it passes
+        transaction_payload
+            .verify_against_ordered_payload(&ordered_payload)
+            .unwrap();
+    }
+
+    #[test]
+    fn test_verify_against_ordered_payload_in_qs_hybrid() {
+        // Create an empty transaction payload with no proofs and no inline batches
+        let proofs = vec![];
+        let transaction_limit = Some(100);
+        let inline_batches = vec![];
+        let transaction_payload = BlockTransactionPayload::new_quorum_store_inline_hybrid(
+            vec![],
+            proofs.clone(),
+            transaction_limit,
+            inline_batches.clone(),
+        );
+
+        // Create a quorum store payload with a single proof
+        let inline_batches = vec![];
+        let batch_info = create_batch_info();
+        let proof_with_data = ProofWithData::new(vec![ProofOfStore::new(
+            batch_info,
+            AggregateSignature::empty(),
+        )]);
+        let ordered_payload = Payload::QuorumStoreInlineHybrid(
+            inline_batches.clone(),
+            proof_with_data,
+            transaction_limit,
+        );
+
+        // Verify the transaction payload and ensure it fails (the batch infos don't match)
+        let error = transaction_payload
+            .verify_against_ordered_payload(&ordered_payload)
+            .unwrap_err();
+        assert_matches!(error, Error::InvalidMessageError(_));
+
+        // Create a quorum store payload with no transaction limit
+        let proof_with_data = ProofWithData::new(vec![]);
+        let ordered_payload =
+            Payload::QuorumStoreInlineHybrid(inline_batches.clone(), proof_with_data, None);
+
+        // Verify the transaction payload and ensure it fails (the transaction limit doesn't match)
+        let error = transaction_payload
+            .verify_against_ordered_payload(&ordered_payload)
+            .unwrap_err();
+        assert_matches!(error, Error::InvalidMessageError(_));
+
+        // Create a quorum store payload with a single inline batch
+        let proof_with_data = ProofWithData::new(vec![]);
+        let ordered_payload = Payload::QuorumStoreInlineHybrid(
+            vec![(create_batch_info(), vec![])],
+            proof_with_data,
+            transaction_limit,
+        );
+
+        // Verify the transaction payload and ensure it fails (the inline batches don't match)
+        let error = transaction_payload
+            .verify_against_ordered_payload(&ordered_payload)
+            .unwrap_err();
+        assert_matches!(error, Error::InvalidMessageError(_));
+
+        // Create an empty quorum store payload
+        let proof_with_data = ProofWithData::new(vec![]);
+        let ordered_payload =
+            Payload::QuorumStoreInlineHybrid(vec![], proof_with_data, transaction_limit);
+
+        // Verify the transaction payload and ensure it passes
+        transaction_payload
+            .verify_against_ordered_payload(&ordered_payload)
+            .unwrap();
+    }
+
+    #[test]
+    fn test_verify_commit_proof() {
+        // Create a ledger info with an empty signature set
+        let current_epoch = 0;
+        let ledger_info = create_empty_ledger_info(current_epoch);
+
+        // Create an epoch state for the current epoch (with an empty verifier)
+        let epoch_state = EpochState::new(current_epoch, ValidatorVerifier::new(vec![]));
+
+        // Create a commit decision message with the ledger info
+        let commit_decision = CommitDecision::new(ledger_info);
+
+        // Verify the commit proof and ensure it passes
+        commit_decision.verify_commit_proof(&epoch_state).unwrap();
+
+        // Create an epoch state for the current epoch (with a non-empty verifier)
+        let validator_signer = ValidatorSigner::random(None);
+        let validator_consensus_info = ValidatorConsensusInfo::new(
+            validator_signer.author(),
+            validator_signer.public_key(),
+            100,
+        );
+        let validator_verifier = ValidatorVerifier::new(vec![validator_consensus_info]);
+        let epoch_state = EpochState::new(current_epoch, validator_verifier.clone());
+
+        // Verify the commit proof and ensure it fails (the signature set is insufficient)
+        let error = commit_decision
+            .verify_commit_proof(&epoch_state)
+            .unwrap_err();
+        assert_matches!(error, Error::InvalidMessageError(_));
+    }
+
+    #[test]
+    fn test_verify_ordered_blocks() {
+        // Create an ordered block with no internal blocks
+        let current_epoch = 0;
+        let ordered_block = OrderedBlock::new(vec![], create_empty_ledger_info(current_epoch));
+
+        // Verify the ordered blocks and ensure it fails (there are no internal blocks)
+        let error = ordered_block.verify_ordered_blocks().unwrap_err();
+        assert_matches!(error, Error::InvalidMessageError(_));
+
+        // Create a pipelined block with a random block ID
+        let block_id = HashValue::random();
+        let block_info = create_block_info(current_epoch, block_id);
+        let pipelined_block = create_pipelined_block(block_info.clone());
+
+        // Create an ordered block with the pipelined block and random proof
+        let ordered_block = OrderedBlock::new(
+            vec![pipelined_block.clone()],
+            create_empty_ledger_info(current_epoch),
+        );
+
+        // Verify the ordered blocks and ensure it fails (the block IDs don't match)
+        let error = ordered_block.verify_ordered_blocks().unwrap_err();
+        assert_matches!(error, Error::InvalidMessageError(_));
+
+        // Create an ordered block proof with the same block ID
+        let ordered_proof = LedgerInfoWithSignatures::new(
+            LedgerInfo::new(block_info, HashValue::random()),
+            AggregateSignature::empty(),
+        );
+
+        // Create an ordered block with the correct proof
+        let ordered_block = OrderedBlock::new(vec![pipelined_block], ordered_proof);
+
+        // Verify the ordered block and ensure it passes
+        ordered_block.verify_ordered_blocks().unwrap();
+    }
+
+    #[test]
+    fn test_verify_ordered_blocks_chained() {
+        // Create multiple pipelined blocks not chained together
+        let current_epoch = 0;
+        let mut pipelined_blocks = vec![];
+        for _ in 0..3 {
+            // Create the pipelined block
+            let block_id = HashValue::random();
+            let block_info = create_block_info(current_epoch, block_id);
+            let pipelined_block = create_pipelined_block(block_info);
+
+            // Add the pipelined block to the list
+            pipelined_blocks.push(pipelined_block);
+        }
+
+        // Create an ordered block proof with the same block ID as the last pipelined block
+        let last_block_info = pipelined_blocks.last().unwrap().block_info().clone();
+        let ordered_proof = LedgerInfoWithSignatures::new(
+            LedgerInfo::new(last_block_info, HashValue::random()),
+            AggregateSignature::empty(),
+        );
+
+        // Create an ordered block with the pipelined blocks and proof
+        let ordered_block = OrderedBlock::new(pipelined_blocks, ordered_proof);
+
+        // Verify the ordered block and ensure it fails (the blocks are not chained)
+        let error = ordered_block.verify_ordered_blocks().unwrap_err();
+        assert_matches!(error, Error::InvalidMessageError(_));
+
+        // Create multiple pipelined blocks that are chained together
+        let mut pipelined_blocks = vec![];
+        let mut expected_parent_id = None;
+        for _ in 0..5 {
+            // Create the pipelined block
+            let block_id = HashValue::random();
+            let block_info = create_block_info(current_epoch, block_id);
+            let pipelined_block = create_pipelined_block_with_parent(
+                block_info,
+                expected_parent_id.unwrap_or_default(),
+            );
+
+            // Add the pipelined block to the list
+            pipelined_blocks.push(pipelined_block);
+
+            // Update the expected parent ID
+            expected_parent_id = Some(block_id);
+        }
+
+        // Create an ordered block proof with the same block ID as the last pipelined block
+        let last_block_info = pipelined_blocks.last().unwrap().block_info().clone();
+        let ordered_proof = LedgerInfoWithSignatures::new(
+            LedgerInfo::new(last_block_info, HashValue::random()),
+            AggregateSignature::empty(),
+        );
+
+        // Create an ordered block with the pipelined blocks and proof
+        let ordered_block = OrderedBlock::new(pipelined_blocks, ordered_proof);
+
+        // Verify the ordered block and ensure it passes
+        ordered_block.verify_ordered_blocks().unwrap();
+    }
+
+    #[test]
+    fn test_verify_ordered_proof() {
+        // Create a ledger info with an empty signature set
+        let current_epoch = 100;
+        let ledger_info = create_empty_ledger_info(current_epoch);
+
+        // Create an epoch state for the current epoch (with an empty verifier)
+        let epoch_state = EpochState::new(current_epoch, ValidatorVerifier::new(vec![]));
+
+        // Create an ordered block message with an empty block and ordered proof
+        let ordered_block = OrderedBlock::new(vec![], ledger_info);
+
+        // Verify the ordered proof and ensure it passes
+        ordered_block.verify_ordered_proof(&epoch_state).unwrap();
+
+        // Create an epoch state for the current epoch (with a non-empty verifier)
+        let validator_signer = ValidatorSigner::random(None);
+        let validator_consensus_info = ValidatorConsensusInfo::new(
+            validator_signer.author(),
+            validator_signer.public_key(),
+            100,
+        );
+        let validator_verifier = ValidatorVerifier::new(vec![validator_consensus_info]);
+        let epoch_state = EpochState::new(current_epoch, validator_verifier.clone());
+
+        // Verify the ordered proof and ensure it fails (the signature set is insufficient)
+        let error = ordered_block
+            .verify_ordered_proof(&epoch_state)
+            .unwrap_err();
+        assert_matches!(error, Error::InvalidMessageError(_));
+    }
+
+    #[test]
+    fn test_verify_payload_digests() {
+        // Create multiple signed transactions
+        let num_signed_transactions = 10;
+        let mut signed_transactions = create_signed_transactions(num_signed_transactions);
+
+        // Create multiple batch proofs with random digests
+        let num_batches = num_signed_transactions - 1;
+        let mut proofs = vec![];
+        for _ in 0..num_batches {
+            let batch_info = create_batch_info_with_digest(HashValue::random(), 1);
+            let proof = ProofOfStore::new(batch_info, AggregateSignature::empty());
+            proofs.push(proof);
+        }
+
+        // Create a single inline batch with a random digest
+        let inline_batch = create_batch_info_with_digest(HashValue::random(), 1);
+        let inline_batches = vec![inline_batch];
+
+        // Create a block payload (with the transactions, proofs and inline batches)
+        let block_payload = create_block_payload(&signed_transactions, &proofs, &inline_batches);
+
+        // Verify the block payload digests and ensure it fails (the batch digests don't match)
+        let error = block_payload.verify_payload_digests().unwrap_err();
+        assert_matches!(error, Error::InvalidMessageError(_));
+
+        // Create multiple batch proofs with the correct digests
+        let mut proofs = vec![];
+        for transaction in &signed_transactions[0..num_batches] {
+            let batch_payload = BatchPayload::new(PeerId::ZERO, vec![transaction.clone()]);
+            let batch_info = create_batch_info_with_digest(batch_payload.hash(), 1);
+            let proof = ProofOfStore::new(batch_info, AggregateSignature::empty());
+            proofs.push(proof);
+        }
+
+        // Create a block payload (with the transactions, correct proofs and inline batches)
+        let block_payload = create_block_payload(&signed_transactions, &proofs, &inline_batches);
+
+        // Verify the block payload digests and ensure it fails (the inline batch digests don't match)
+        let error = block_payload.verify_payload_digests().unwrap_err();
+        assert_matches!(error, Error::InvalidMessageError(_));
+
+        // Create a single inline batch with the correct digest
+        let inline_batch_payload = BatchPayload::new(PeerId::ZERO, vec![signed_transactions
+            .last()
+            .unwrap()
+            .clone()]);
+        let inline_batch_info = create_batch_info_with_digest(inline_batch_payload.hash(), 1);
+        let inline_batches = vec![inline_batch_info];
+
+        // Create a block payload (with the transactions, correct proofs and correct inline batches)
+        let block_payload = create_block_payload(&signed_transactions, &proofs, &inline_batches);
+
+        // Verify the block payload digests and ensure it passes
+        block_payload.verify_payload_digests().unwrap();
+
+        // Create a block payload (with too many transactions)
+        signed_transactions.append(&mut create_signed_transactions(1));
+        let block_payload = create_block_payload(&signed_transactions, &proofs, &inline_batches);
+
+        // Verify the block payload digests and ensure it fails (there are too many transactions)
+        let error = block_payload.verify_payload_digests().unwrap_err();
+        assert_matches!(error, Error::InvalidMessageError(_));
+
+        // Create a block payload (with too few transactions)
+        for _ in 0..3 {
+            signed_transactions.pop();
+        }
+        let block_payload = create_block_payload(&signed_transactions, &proofs, &inline_batches);
+
+        // Verify the block payload digests and ensure it fails (there are too few transactions)
+        let error = block_payload.verify_payload_digests().unwrap_err();
+        assert_matches!(error, Error::InvalidMessageError(_));
+    }
+
+    #[test]
+    fn test_verify_payload_signatures() {
+        // Create multiple batch info proofs (with empty signatures)
+        let mut proofs = vec![];
+        for _ in 0..3 {
+            let batch_info = create_batch_info();
+            let proof = ProofOfStore::new(batch_info, AggregateSignature::empty());
+            proofs.push(proof);
+        }
+
+        // Create a transaction payload (with the proofs)
+        let transaction_payload = BlockTransactionPayload::new_quorum_store_inline_hybrid(
+            vec![],
+            proofs.clone(),
+            None,
+            vec![],
+        );
+
+        // Create a block payload
+        let current_epoch = 50;
+        let block_info = create_block_info(current_epoch, HashValue::random());
+        let block_payload = BlockPayload::new(block_info, transaction_payload);
+
+        // Create an epoch state for the current epoch (with an empty verifier)
+        let epoch_state = EpochState::new(current_epoch, ValidatorVerifier::new(vec![]));
+
+        // Verify the block payload signatures and ensure it passes
+        block_payload
+            .verify_payload_signatures(&epoch_state)
+            .unwrap();
+
+        // Create an epoch state for the current epoch (with a non-empty verifier)
+        let validator_signer = ValidatorSigner::random(None);
+        let validator_consensus_info = ValidatorConsensusInfo::new(
+            validator_signer.author(),
+            validator_signer.public_key(),
+            100,
+        );
+        let validator_verifier = ValidatorVerifier::new(vec![validator_consensus_info]);
+        let epoch_state = EpochState::new(current_epoch, validator_verifier.clone());
+
+        // Verify the block payload signatures and ensure it fails (the signature set is insufficient)
+        let error = block_payload
+            .verify_payload_signatures(&epoch_state)
+            .unwrap_err();
+        assert_matches!(error, Error::InvalidMessageError(_));
+    }
+
+    /// Creates and returns a new batch info with random data
+    fn create_batch_info() -> BatchInfo {
+        create_batch_info_with_digest(HashValue::random(), 0)
+    }
+
+    /// Creates and returns a new batch info with the specified digest
+    fn create_batch_info_with_digest(digest: HashValue, num_transactions: u64) -> BatchInfo {
+        BatchInfo::new(
+            PeerId::ZERO,
+            BatchId::new(0),
+            10,
+            1,
+            digest,
+            num_transactions,
+            1,
+            0,
+        )
+    }
+
+    /// Creates and returns a new block with the given block info
+    fn create_block(block_info: BlockInfo) -> Block {
+        let block_data = BlockData::new_for_testing(
+            block_info.epoch(),
+            block_info.round(),
+            block_info.timestamp_usecs(),
+            QuorumCert::dummy(),
+            BlockType::Genesis,
+        );
+        Block::new_for_testing(block_info.id(), block_data, None)
+    }
+
+    /// Creates and returns a new ordered block with the given block ID
+    fn create_block_info(epoch: u64, block_id: HashValue) -> BlockInfo {
+        BlockInfo::new(epoch, 0, block_id, HashValue::random(), 0, 0, None)
+    }
+
+    /// Creates and returns a hybrid quorum store payload using the given data
+    fn create_block_payload(
+        signed_transactions: &[SignedTransaction],
+        proofs: &[ProofOfStore],
+        inline_batches: &[BatchInfo],
+    ) -> BlockPayload {
+        // Create the transaction payload
+        let transaction_payload = BlockTransactionPayload::new_quorum_store_inline_hybrid(
+            signed_transactions.to_vec(),
+            proofs.to_vec(),
+            None,
+            inline_batches.to_vec(),
+        );
+
+        // Create the block payload
+        BlockPayload::new(
+            create_block_info(0, HashValue::random()),
+            transaction_payload,
+        )
+    }
+
+    /// Creates and returns a new ledger info with an empty signature set
+    fn create_empty_ledger_info(epoch: u64) -> LedgerInfoWithSignatures {
+        LedgerInfoWithSignatures::new(
+            LedgerInfo::new(BlockInfo::random_with_epoch(epoch, 0), HashValue::random()),
+            AggregateSignature::empty(),
+        )
+    }
+
+    /// Creates and returns a new pipelined block with the given block info
+    fn create_pipelined_block(block_info: BlockInfo) -> Arc<PipelinedBlock> {
+        let block_data = BlockData::new_for_testing(
+            block_info.epoch(),
+            block_info.round(),
+            block_info.timestamp_usecs(),
+            QuorumCert::dummy(),
+            BlockType::Genesis,
+        );
+        let block = Block::new_for_testing(block_info.id(), block_data, None);
+        Arc::new(PipelinedBlock::new_ordered(block))
+    }
+
+    /// Creates and returns a new pipelined block with the given block info and parent ID
+    fn create_pipelined_block_with_parent(
+        block_info: BlockInfo,
+        parent_block_id: HashValue,
+    ) -> Arc<PipelinedBlock> {
+        // Create the block type
+        let block_type = BlockType::DAGBlock {
+            author: Author::random(),
+            failed_authors: vec![],
+            validator_txns: vec![],
+            payload: Payload::DirectMempool(vec![]),
+            node_digests: vec![],
+            parent_block_id,
+            parents_bitvec: BitVec::with_num_bits(0),
+        };
+
+        // Create the block data
+        let block_data = BlockData::new_for_testing(
+            block_info.epoch(),
+            block_info.round(),
+            block_info.timestamp_usecs(),
+            QuorumCert::dummy(),
+            block_type,
+        );
+
+        // Create the pipelined block
+        let block = Block::new_for_testing(block_info.id(), block_data, None);
+        Arc::new(PipelinedBlock::new_ordered(block))
+    }
+
+    /// Creates a returns multiple signed transactions
+    fn create_signed_transactions(num_transactions: usize) -> Vec<SignedTransaction> {
+        // Create a random sender and keypair
+        let private_key = Ed25519PrivateKey::generate_for_testing();
+        let public_key = private_key.public_key();
+        let sender = AccountAddress::random();
+
+        // Create multiple signed transactions
+        let mut transactions = vec![];
+        for i in 0..num_transactions {
+            // Create the raw transaction
+            let transaction_payload =
+                TransactionPayload::Script(Script::new(vec![], vec![], vec![]));
+            let raw_transaction = RawTransaction::new(
+                sender,
+                i as u64,
+                transaction_payload,
+                0,
+                0,
+                0,
+                ChainId::new(10),
+            );
+
+            // Create the signed transaction
+            let signed_transaction = SignedTransaction::new(
+                raw_transaction.clone(),
+                public_key.clone(),
+                private_key.sign(&raw_transaction).unwrap(),
+            );
+
+            // Save the signed transaction
+            transactions.push(signed_transaction)
+        }
+
+        transactions
+    }
+}
diff --git a/consensus/src/consensus_observer/observer.rs b/consensus/src/consensus_observer/observer.rs
index 3ae03d2eb991a..125c40838c60d 100644
--- a/consensus/src/consensus_observer/observer.rs
+++ b/consensus/src/consensus_observer/observer.rs
@@ -3,296 +3,1130 @@
 
 use crate::{
     consensus_observer::{
-        network::{ObserverMessage, OrderedBlock},
-        publisher::Publisher,
+        error::Error,
+        logging::{LogEntry, LogSchema},
+        metrics,
+        network_client::ConsensusObserverClient,
+        network_events::{ConsensusObserverNetworkEvents, NetworkMessage, ResponseSender},
+        network_message::{
+            BlockPayload, CommitDecision, ConsensusObserverDirectSend, ConsensusObserverMessage,
+            ConsensusObserverRequest, ConsensusObserverResponse, OrderedBlock,
+        },
+        ordered_blocks::OrderedBlockStore,
+        payload_store::BlockPayloadStore,
+        pending_blocks::PendingBlockStore,
+        publisher::ConsensusPublisher,
+        subscription::{self, ConsensusObserverSubscription},
     },
     dag::DagCommitSigner,
     network::{IncomingCommitRequest, IncomingRandGenRequest},
     network_interface::CommitMessage,
-    payload_manager::PayloadManager,
+    payload_manager::{
+        ConsensusObserverPayloadManager, DirectMempoolPayloadManager, TPayloadManager,
+    },
     pipeline::execution_client::TExecutionClient,
     state_replication::StateComputerCommitCallBackType,
 };
 use aptos_channels::{aptos_channel, message_queues::QueueStyle};
-use aptos_consensus_types::pipeline::commit_decision::CommitDecision;
-use aptos_crypto::{bls12381, Genesis, HashValue};
+use aptos_config::{config::NodeConfig, network_id::PeerNetworkId};
+use aptos_consensus_types::{pipeline, pipelined_block::PipelinedBlock};
+use aptos_crypto::{bls12381, Genesis};
 use aptos_event_notifications::{DbBackedOnChainConfig, ReconfigNotificationListener};
 use aptos_infallible::Mutex;
-use aptos_logger::{error, info};
-use aptos_network::protocols::{network::Event, wire::handshake::v1::ProtocolId};
+use aptos_logger::{debug, error, info, warn};
+use aptos_network::{
+    application::{interface::NetworkClient, metadata::PeerMetadata},
+    protocols::wire::handshake::v1::ProtocolId,
+};
 use aptos_reliable_broadcast::DropGuard;
+use aptos_storage_interface::DbReader;
+use aptos_time_service::TimeService;
 use aptos_types::{
     block_info::{BlockInfo, Round},
     epoch_state::EpochState,
     ledger_info::LedgerInfoWithSignatures,
     on_chain_config::{
         OnChainConsensusConfig, OnChainExecutionConfig, OnChainRandomnessConfig,
-        RandomnessConfigMoveStruct, ValidatorSet,
+        RandomnessConfigMoveStruct, RandomnessConfigSeqNum, ValidatorSet,
     },
-    transaction::SignedTransaction,
     validator_signer::ValidatorSigner,
 };
 use futures::{
     future::{AbortHandle, Abortable},
-    Stream, StreamExt,
+    StreamExt,
 };
 use futures_channel::oneshot;
 use move_core_types::account_address::AccountAddress;
-use std::{
-    collections::{hash_map::Entry, BTreeMap, HashMap},
-    mem,
-    sync::Arc,
-};
-use tokio::sync::oneshot as tokio_oneshot;
+use std::{collections::HashMap, sync::Arc, time::Duration};
+use tokio::{sync::mpsc::UnboundedSender, time::interval};
+use tokio_stream::wrappers::IntervalStream;
 
-pub enum ObserverDataStatus {
-    Requested(tokio_oneshot::Sender<(Vec<SignedTransaction>, Option<usize>)>),
-    Available((Vec<SignedTransaction>, Option<usize>)),
-}
+// Whether to log messages at the info level (useful for debugging)
+const LOG_MESSAGES_AT_INFO_LEVEL: bool = true;
 
-/// Consensus observer, get update from upstreams and propagate to execution pipeline.
-pub struct Observer {
-    epoch: u64,
-    // latest ledger info, updated with callback
+/// The consensus observer receives consensus updates and propagates them to the execution pipeline
+pub struct ConsensusObserver {
+    // The configuration of the node
+    node_config: NodeConfig,
+    // The consensus observer client to send network messages
+    consensus_observer_client:
+        Arc<ConsensusObserverClient<NetworkClient<ConsensusObserverMessage>>>,
+
+    // The current epoch state
+    epoch_state: Option<Arc<EpochState>>,
+    // Whether quorum store is enabled (updated on epoch changes)
+    quorum_store_enabled: bool,
+    // The latest ledger info (updated via a callback)
     root: Arc<Mutex<LedgerInfoWithSignatures>>,
-    // pending execute/commit blocks, also buffers when in sync mode
-    pending_blocks: Arc<Mutex<BTreeMap<Round, (OrderedBlock, Option<CommitDecision>)>>>,
-    // execution client to buffer manager
+
+    // The block payload store holds block transaction payloads
+    block_payload_store: BlockPayloadStore,
+    // The ordered block store holds ordered blocks that are ready for execution
+    ordered_block_store: OrderedBlockStore,
+    // The pending block store holds pending blocks that are without payloads
+    pending_block_store: PendingBlockStore,
+    // The execution client to the buffer manager
     execution_client: Arc<dyn TExecutionClient>,
-    // Indicate if it's in state sync mode, hold the task handle.
-    sync_handle: Option<DropGuard>,
-    // Sender to notify the observer state sync to `(Epoch, Round)` is done.
-    sync_notifier: tokio::sync::mpsc::UnboundedSender<(u64, Round)>,
-    // Reconfig event listener to reload on-chain configs.
-    reconfig_events: ReconfigNotificationListener<DbBackedOnChainConfig>,
-    // Maps between block id and its payload, the same as payload manager returns.
-    payload_store: Arc<Mutex<HashMap<HashValue, ObserverDataStatus>>>,
-    // Publisher to forward payload message.
-    publisher: Option<Publisher>,
+
+    // If the sync handle is set it indicates that we're in state sync mode.
+    // The flag indicates if we're waiting to transition to a new epoch.
+    sync_handle: Option<(DropGuard, bool)>,
+    // The sender to notify the consensus observer that state sync to the (epoch, round) is done
+    sync_notification_sender: UnboundedSender<(u64, Round)>,
+    // The reconfiguration event listener to refresh on-chain configs
+    reconfig_events: Option<ReconfigNotificationListener<DbBackedOnChainConfig>>,
+
+    // The consensus publisher to forward payload messages
+    consensus_publisher: Option<Arc<ConsensusPublisher>>,
+    // The currently active consensus observer subscription
+    active_observer_subscription: Option<ConsensusObserverSubscription>,
+    // A handle to storage (used to read the latest state and check progress)
+    db_reader: Arc<dyn DbReader>,
+    // The time service (used to check progress)
+    time_service: TimeService,
 }
 
-impl Observer {
+impl ConsensusObserver {
     pub fn new(
-        root: LedgerInfoWithSignatures,
+        node_config: NodeConfig,
+        consensus_observer_client: Arc<
+            ConsensusObserverClient<NetworkClient<ConsensusObserverMessage>>,
+        >,
+        db_reader: Arc<dyn DbReader>,
         execution_client: Arc<dyn TExecutionClient>,
-        sync_notifier: tokio::sync::mpsc::UnboundedSender<(u64, Round)>,
-        reconfig_events: ReconfigNotificationListener<DbBackedOnChainConfig>,
-        publisher: Option<Publisher>,
+        sync_notification_sender: UnboundedSender<(u64, Round)>,
+        reconfig_events: Option<ReconfigNotificationListener<DbBackedOnChainConfig>>,
+        consensus_publisher: Option<Arc<ConsensusPublisher>>,
+        time_service: TimeService,
     ) -> Self {
+        // Read the latest ledger info from storage
+        let root = db_reader
+            .get_latest_ledger_info()
+            .expect("Failed to read latest ledger info!");
+
+        // Get the consensus observer config
+        let consensus_observer_config = node_config.consensus_observer;
+
+        // Create the consensus observer
         Self {
-            epoch: root.commit_info().epoch(),
+            node_config,
+            consensus_observer_client,
+            epoch_state: None,
+            quorum_store_enabled: false, // Updated on epoch changes
             root: Arc::new(Mutex::new(root)),
-            pending_blocks: Arc::new(Mutex::new(BTreeMap::new())),
+            ordered_block_store: OrderedBlockStore::new(consensus_observer_config),
+            block_payload_store: BlockPayloadStore::new(consensus_observer_config),
+            pending_block_store: PendingBlockStore::new(consensus_observer_config),
             execution_client,
             sync_handle: None,
-            sync_notifier,
+            sync_notification_sender,
             reconfig_events,
-            payload_store: Arc::new(Mutex::new(HashMap::new())),
-            publisher,
+            consensus_publisher,
+            active_observer_subscription: None,
+            db_reader,
+            time_service,
         }
     }
 
-    fn last_block(&self) -> BlockInfo {
-        self.pending_blocks
-            .lock()
-            .last_key_value()
+    /// Returns true iff all payloads exist for the given blocks
+    fn all_payloads_exist(&self, blocks: &[Arc<PipelinedBlock>]) -> bool {
+        // If quorum store is disabled, all payloads exist (they're already in the blocks)
+        if !self.quorum_store_enabled {
+            return true;
+        }
+
+        // Otherwise, check if all the payloads exist in the payload store
+        self.block_payload_store.all_payloads_exist(blocks)
+    }
+
+    /// Checks the progress of the consensus observer
+    async fn check_progress(&mut self) {
+        debug!(LogSchema::new(LogEntry::ConsensusObserver)
+            .message("Checking consensus observer progress!"));
+
+        // If we're in state sync mode, we should wait for state sync to complete
+        if self.in_state_sync_mode() {
+            info!(
+                LogSchema::new(LogEntry::ConsensusObserver).message(&format!(
+                    "Waiting for state sync to reach target: {:?}!",
+                    self.root.lock().commit_info()
+                ))
+            );
+            return;
+        }
+
+        // Get the peer ID of the currently active subscription (if any)
+        let active_subscription_peer = self
+            .active_observer_subscription
             .as_ref()
-            .map_or_else(
-                || self.root.lock().commit_info().clone(),
-                |(_, (last_blocks, _))| last_blocks.blocks.last().unwrap().block_info(),
-            )
+            .map(|subscription| subscription.get_peer_network_id());
+
+        // If we have an active subscription, verify that the subscription
+        // is still healthy. If not, the subscription should be terminated.
+        if let Some(active_subscription_peer) = active_subscription_peer {
+            if let Err(error) = self.check_active_subscription() {
+                // Log the subscription termination
+                warn!(
+                    LogSchema::new(LogEntry::ConsensusObserver).message(&format!(
+                        "Terminating subscription to peer: {:?}! Error: {:?}",
+                        active_subscription_peer, error
+                    ))
+                );
+
+                // Unsubscribe from the peer
+                self.unsubscribe_from_peer(active_subscription_peer);
+
+                // Update the subscription termination metrics
+                self.update_subscription_termination_metrics(active_subscription_peer, error);
+            }
+        }
+
+        // If we don't have a subscription, we should select a new peer to
+        // subscribe to. If we had a previous subscription, it should be
+        // excluded from the selection process.
+        if self.active_observer_subscription.is_none() {
+            // Create a new observer subscription
+            self.create_new_observer_subscription(active_subscription_peer)
+                .await;
+
+            // If we successfully created a new subscription, clear the state and update the metrics
+            if let Some(active_subscription) = &self.active_observer_subscription {
+                // Clear the block state
+                self.clear_pending_block_state().await;
+
+                // Update the subscription creation metrics
+                self.update_subscription_creation_metrics(
+                    active_subscription.get_peer_network_id(),
+                );
+            }
+        }
     }
 
-    fn commit_callback(&self) -> StateComputerCommitCallBackType {
+    /// Checks if the active subscription is still healthy. If not, an error is returned.
+    fn check_active_subscription(&mut self) -> Result<(), Error> {
+        let active_observer_subscription = self.active_observer_subscription.take();
+        if let Some(mut active_subscription) = active_observer_subscription {
+            // Check if the peer for the subscription is still connected
+            let peer_network_id = active_subscription.get_peer_network_id();
+            let peer_still_connected = self
+                .get_connected_peers_and_metadata()
+                .map_or(false, |peers_and_metadata| {
+                    peers_and_metadata.contains_key(&peer_network_id)
+                });
+
+            // Verify the peer is still connected
+            if !peer_still_connected {
+                return Err(Error::SubscriptionDisconnected(
+                    "The peer is no longer connected!".to_string(),
+                ));
+            }
+
+            // Verify the subscription has not timed out
+            active_subscription.check_subscription_timeout()?;
+
+            // Verify that the DB is continuing to sync and commit new data
+            active_subscription.check_syncing_progress()?;
+
+            // Verify that the subscription peer is optimal
+            if let Some(peers_and_metadata) = self.get_connected_peers_and_metadata() {
+                active_subscription.check_subscription_peer_optimality(peers_and_metadata)?;
+            }
+
+            // The subscription seems healthy, we can keep it
+            self.active_observer_subscription = Some(active_subscription);
+        }
+
+        Ok(())
+    }
+
+    /// Clears the pending block state (this is useful for changing
+    /// subscriptions, where we want to wipe all state and restart).
+    async fn clear_pending_block_state(&self) {
+        // Clear the payload store
+        self.block_payload_store.clear_all_payloads();
+
+        // Clear the pending blocks
+        self.pending_block_store.clear_missing_blocks();
+
+        // Clear the ordered blocks
+        self.ordered_block_store.clear_all_ordered_blocks();
+
+        // Reset the execution pipeline for the root
+        let root = self.root.lock().clone();
+        if let Err(error) = self.execution_client.reset(&root).await {
+            error!(
+                LogSchema::new(LogEntry::ConsensusObserver).message(&format!(
+                    "Failed to reset the execution pipeline for the root! Error: {:?}",
+                    error
+                ))
+            );
+        }
+    }
+
+    /// Creates and returns a commit callback (to be called after the execution pipeline)
+    fn create_commit_callback(&self) -> StateComputerCommitCallBackType {
+        // Clone the root, pending blocks and payload store
         let root = self.root.clone();
-        let pending_blocks = self.pending_blocks.clone();
-        let payload_store = self.payload_store.clone();
+        let pending_ordered_blocks = self.ordered_block_store.clone();
+        let block_payload_store = self.block_payload_store.clone();
+
+        // Create the commit callback
         Box::new(move |blocks, ledger_info: LedgerInfoWithSignatures| {
-            {
-                let mut payload_store = payload_store.lock();
-                for block in blocks.iter() {
-                    payload_store.remove(&block.id());
-                }
+            // Remove the committed blocks from the payload and pending stores
+            block_payload_store.remove_committed_blocks(blocks);
+            pending_ordered_blocks.remove_blocks_for_commit(&ledger_info);
+
+            // Verify the ledger info is for the same epoch
+            let mut root = root.lock();
+            if ledger_info.commit_info().epoch() != root.commit_info().epoch() {
+                warn!(
+                    LogSchema::new(LogEntry::ConsensusObserver).message(&format!(
+                        "Received commit callback for a different epoch! Ledger info: {:?}, Root: {:?}",
+                        ledger_info.commit_info(),
+                        root.commit_info()
+                    ))
+                );
+                return;
             }
-            {
-                let mut pending_blocks = pending_blocks.lock();
-                *pending_blocks =
-                    pending_blocks.split_off(&(ledger_info.commit_info().round() + 1));
+
+            // Update the root ledger info. Note: we only want to do this if
+            // the new ledger info round is greater than the current root
+            // round. Otherwise, this can race with the state sync process.
+            if ledger_info.commit_info().round() > root.commit_info().round() {
+                *root = ledger_info;
             }
-            *root.lock() = ledger_info;
         })
     }
 
-    fn forward_decision(&self, decision: CommitDecision) {
-        let (tx, _rx) = oneshot::channel();
-        self.execution_client
-            // it's just a dummy rpc message
-            .send_commit_msg(AccountAddress::ONE, IncomingCommitRequest {
-                req: CommitMessage::Decision(decision),
-                protocol: ProtocolId::ConsensusDirectSendCompressed,
-                response_sender: tx,
-            })
-            .unwrap()
-    }
+    /// Creates a new observer subscription by sending subscription requests to
+    /// appropriate peers and waiting for a successful response. If `previous_subscription_peer`
+    /// is provided, it will be excluded from the selection process.
+    async fn create_new_observer_subscription(
+        &mut self,
+        previous_subscription_peer: Option<PeerNetworkId>,
+    ) {
+        // Get a set of sorted peers to service our subscription request
+        let sorted_peers = match self.sort_peers_for_subscription(previous_subscription_peer) {
+            Some(sorted_peers) => sorted_peers,
+            None => {
+                error!(LogSchema::new(LogEntry::ConsensusObserver)
+                    .message("Failed to sort peers for subscription requests!"));
+                return;
+            },
+        };
 
-    async fn process_ordered_block(&mut self, ordered_block: OrderedBlock) {
-        let OrderedBlock {
-            blocks,
-            ordered_proof,
-        } = ordered_block.clone();
-        let last_block_id = self.last_block().id();
-        // if the block is a child of the last block we have, we can insert it.
-        if last_block_id == blocks.first().unwrap().parent_id() {
+        // Verify that we have potential peers
+        if sorted_peers.is_empty() {
+            warn!(LogSchema::new(LogEntry::ConsensusObserver)
+                .message("There are no peers to subscribe to!"));
+            return;
+        }
+
+        // Go through the sorted peers and attempt to subscribe to a single peer.
+        // The first peer that responds successfully will be the selected peer.
+        for selected_peer in &sorted_peers {
             info!(
-                "[Observer] Add blocks to pending {}",
-                ordered_proof.commit_info()
+                LogSchema::new(LogEntry::ConsensusObserver).message(&format!(
+                    "Attempting to subscribe to peer: {}!",
+                    selected_peer
+                ))
+            );
+
+            // Send a subscription request to the peer and wait for the response.
+            // Note: it is fine to block here because we assume only a single active subscription.
+            let subscription_request = ConsensusObserverRequest::Subscribe;
+            let request_timeout_ms = self
+                .node_config
+                .consensus_observer
+                .network_request_timeout_ms;
+            let response = self
+                .consensus_observer_client
+                .send_rpc_request_to_peer(selected_peer, subscription_request, request_timeout_ms)
+                .await;
+
+            // Process the response and update the active subscription
+            match response {
+                Ok(ConsensusObserverResponse::SubscribeAck) => {
+                    info!(
+                        LogSchema::new(LogEntry::ConsensusObserver).message(&format!(
+                            "Successfully subscribed to peer: {}!",
+                            selected_peer
+                        ))
+                    );
+
+                    // Update the active subscription
+                    let subscription = ConsensusObserverSubscription::new(
+                        self.node_config.consensus_observer,
+                        self.db_reader.clone(),
+                        *selected_peer,
+                        self.time_service.clone(),
+                    );
+                    self.active_observer_subscription = Some(subscription);
+
+                    return; // Return after successfully subscribing
+                },
+                Ok(response) => {
+                    // We received an invalid response
+                    warn!(
+                        LogSchema::new(LogEntry::ConsensusObserver).message(&format!(
+                            "Got unexpected response type: {:?}",
+                            response.get_label()
+                        ))
+                    );
+                },
+                Err(error) => {
+                    // We encountered an error while sending the request
+                    error!(
+                        LogSchema::new(LogEntry::ConsensusObserver).message(&format!(
+                            "Failed to send subscription request to peer: {}! Error: {:?}",
+                            selected_peer, error
+                        ))
+                    );
+                },
+            }
+        }
+
+        // We failed to connect to any peers
+        warn!(
+            LogSchema::new(LogEntry::ConsensusObserver).message(&format!(
+                "Failed to subscribe to any peers! Num peers attempted: {:?}",
+                sorted_peers.len()
+            ))
+        );
+    }
+
+    /// Finalizes the ordered block by sending it to the execution pipeline
+    async fn finalize_ordered_block(&mut self, ordered_block: OrderedBlock) {
+        info!(
+            LogSchema::new(LogEntry::ConsensusObserver).message(&format!(
+                "Forwarding ordered blocks to the execution pipeline: {}",
+                ordered_block.proof_block_info()
+            ))
+        );
+
+        // Send the ordered block to the execution pipeline
+        if let Err(error) = self
+            .execution_client
+            .finalize_order(
+                ordered_block.blocks(),
+                ordered_block.ordered_proof().clone(),
+                self.create_commit_callback(),
+            )
+            .await
+        {
+            error!(
+                LogSchema::new(LogEntry::ConsensusObserver).message(&format!(
+                    "Failed to finalize ordered block! Error: {:?}",
+                    error
+                ))
             );
-            self.pending_blocks
-                .lock()
-                .insert(blocks.last().unwrap().round(), (ordered_block, None));
-            if self.sync_handle.is_none() {
-                info!("[Observer] Forward blocks {}", ordered_proof.commit_info());
-                self.execution_client
-                    .finalize_order(&blocks, ordered_proof, self.commit_callback())
-                    .await
-                    .unwrap();
+        }
+    }
+
+    /// Forwards the commit decision to the execution pipeline
+    fn forward_commit_decision(&self, commit_decision: CommitDecision) {
+        // Create a dummy RPC message
+        let (response_sender, _response_receiver) = oneshot::channel();
+        let commit_request = IncomingCommitRequest {
+            req: CommitMessage::Decision(pipeline::commit_decision::CommitDecision::new(
+                commit_decision.commit_proof().clone(),
+            )),
+            protocol: ProtocolId::ConsensusDirectSendCompressed,
+            response_sender,
+        };
+
+        // Send the message to the execution client
+        if let Err(error) = self
+            .execution_client
+            .send_commit_msg(AccountAddress::ONE, commit_request)
+        {
+            error!(
+                LogSchema::new(LogEntry::ConsensusObserver).message(&format!(
+                    "Failed to send commit decision to the execution pipeline! Error: {:?}",
+                    error
+                ))
+            )
+        };
+    }
+
+    /// Returns the current epoch state, and panics if it is not set
+    fn get_epoch_state(&self) -> Arc<EpochState> {
+        self.epoch_state
+            .clone()
+            .expect("The epoch state is not set! This should never happen!")
+    }
+
+    /// Returns the last known block
+    fn get_last_block(&self) -> BlockInfo {
+        if let Some(last_pending_block) = self.ordered_block_store.get_last_ordered_block() {
+            last_pending_block
+        } else {
+            // Return the root ledger info
+            self.root.lock().commit_info().clone()
+        }
+    }
+
+    /// Gets the connected peers and metadata. If an error occurred,
+    /// it is logged and None is returned.
+    fn get_connected_peers_and_metadata(&self) -> Option<HashMap<PeerNetworkId, PeerMetadata>> {
+        match self
+            .consensus_observer_client
+            .get_peers_and_metadata()
+            .get_connected_peers_and_metadata()
+        {
+            Ok(connected_peers_and_metadata) => Some(connected_peers_and_metadata),
+            Err(error) => {
+                error!(
+                    LogSchema::new(LogEntry::ConsensusObserver).message(&format!(
+                        "Failed to get connected peers and metadata! Error: {:?}",
+                        error
+                    ))
+                );
+                None
+            },
+        }
+    }
+
+    /// Returns true iff we are waiting for state sync to complete an epoch change
+    fn in_state_sync_epoch_change(&self) -> bool {
+        matches!(self.sync_handle, Some((_, true)))
+    }
+
+    /// Returns true iff we are waiting for state sync to complete
+    fn in_state_sync_mode(&self) -> bool {
+        self.sync_handle.is_some()
+    }
+
+    /// Orders any ready pending blocks for the given epoch and round
+    async fn order_ready_pending_block(&mut self, block_epoch: u64, block_round: Round) {
+        if let Some(ordered_block) = self.pending_block_store.remove_ready_block(
+            block_epoch,
+            block_round,
+            &self.block_payload_store,
+        ) {
+            self.process_ordered_block(ordered_block).await;
+        }
+    }
+
+    /// Processes the block payload message
+    async fn process_block_payload_message(&mut self, block_payload: BlockPayload) {
+        // Get the epoch and round for the block
+        let block_epoch = block_payload.block.epoch();
+        let block_round = block_payload.block.round();
+
+        // Update the metrics for the received block payload
+        metrics::set_gauge_with_label(
+            &metrics::OBSERVER_RECEIVED_MESSAGE_ROUNDS,
+            metrics::BLOCK_PAYLOAD_LABEL,
+            block_round,
+        );
+
+        // Verify the block payload digests
+        if let Err(error) = block_payload.verify_payload_digests() {
+            error!(
+                LogSchema::new(LogEntry::ConsensusObserver).message(&format!(
+                    "Failed to verify block payload digests! Ignoring block: {:?}. Error: {:?}",
+                    block_payload.block, error
+                ))
+            );
+            return;
+        }
+
+        // If the payload is for the current epoch, verify the proof signatures
+        let epoch_state = self.get_epoch_state();
+        let verified_payload = if block_epoch == epoch_state.epoch {
+            // Verify the block proof signatures
+            if let Err(error) = block_payload.verify_payload_signatures(&epoch_state) {
+                error!(
+                    LogSchema::new(LogEntry::ConsensusObserver).message(&format!(
+                        "Failed to verify block payload signatures! Ignoring block: {:?}. Error: {:?}",
+                        block_payload.block, error
+                    ))
+                );
+                return;
             }
+
+            true // We have successfully verified the signatures
         } else {
+            false // We can't verify the signatures yet
+        };
+
+        // Update the payload store with the payload
+        self.block_payload_store
+            .insert_block_payload(block_payload, verified_payload);
+
+        // Check if there are blocks that were missing payloads but are
+        // now ready because of the new payload. Note: this should only
+        // be done if the payload has been verified correctly.
+        if verified_payload {
+            self.order_ready_pending_block(block_epoch, block_round)
+                .await;
+        }
+    }
+
+    /// Processes the commit decision message
+    fn process_commit_decision_message(&mut self, commit_decision: CommitDecision) {
+        // Update the metrics for the received commit decision
+        metrics::set_gauge_with_label(
+            &metrics::OBSERVER_RECEIVED_MESSAGE_ROUNDS,
+            metrics::COMMIT_DECISION_LABEL,
+            commit_decision.round(),
+        );
+
+        // If the commit decision is for the current epoch, verify and process it
+        let epoch_state = self.get_epoch_state();
+        let commit_decision_epoch = commit_decision.epoch();
+        if commit_decision_epoch == epoch_state.epoch {
+            // Verify the commit decision
+            if let Err(error) = commit_decision.verify_commit_proof(&epoch_state) {
+                error!(
+                    LogSchema::new(LogEntry::ConsensusObserver).message(&format!(
+                        "Failed to verify commit decision! Ignoring: {:?}, Error: {:?}",
+                        commit_decision.proof_block_info(),
+                        error
+                    ))
+                );
+                return;
+            }
+
+            // Update the pending blocks with the commit decision
+            if self.process_commit_decision_for_pending_block(&commit_decision) {
+                return; // The commit decision was successfully processed
+            }
+        }
+
+        // TODO: identify the best way to handle an invalid commit decision
+        // for a future epoch. In such cases, we currently rely on state sync.
+
+        // Otherwise, we failed to process the commit decision. If the commit
+        // is for a future epoch or round, we need to state sync.
+        let last_block = self.get_last_block();
+        let commit_decision_round = commit_decision.round();
+        let epoch_changed = commit_decision_epoch > last_block.epoch();
+        if epoch_changed || commit_decision_round > last_block.round() {
+            // If we're waiting for state sync to transition into a new epoch,
+            // we should just wait and not issue a new state sync request.
+            if self.in_state_sync_epoch_change() {
+                info!(
+                    LogSchema::new(LogEntry::ConsensusObserver).message(&format!(
+                        "Already waiting for state sync to reach new epoch: {:?}. Dropping commit decision: {:?}!",
+                        self.root.lock().commit_info(),
+                        commit_decision.proof_block_info()
+                    ))
+                );
+                return;
+            }
+
+            // Otherwise, we should start the state sync process
             info!(
-                "[Observer] Do not have parent block, Ignore {}.",
-                ordered_proof.commit_info()
+                LogSchema::new(LogEntry::ConsensusObserver).message(&format!(
+                    "Started syncing to {}!",
+                    commit_decision.proof_block_info()
+                ))
             );
+
+            // Update the root and clear the pending blocks (up to the commit)
+            *self.root.lock() = commit_decision.commit_proof().clone();
+            self.block_payload_store
+                .remove_blocks_for_epoch_round(commit_decision_epoch, commit_decision_round);
+            self.ordered_block_store
+                .remove_blocks_for_commit(commit_decision.commit_proof());
+
+            // Start the state sync process
+            let abort_handle = sync_to_commit_decision(
+                commit_decision,
+                commit_decision_epoch,
+                commit_decision_round,
+                self.execution_client.clone(),
+                self.sync_notification_sender.clone(),
+            );
+            self.sync_handle = Some((DropGuard::new(abort_handle), epoch_changed));
         }
     }
 
-    fn process_commit_decision(&mut self, decision: CommitDecision) {
-        let mut pending_blocks = self.pending_blocks.lock();
-        let decision_epoch = decision.ledger_info().commit_info().epoch();
-        let decision_round = decision.round();
-        if let Some((ordered_blocks, maybe_decision)) = pending_blocks.get_mut(&decision_round) {
-            let payload_exist = {
-                let payload = self.payload_store.lock();
-                ordered_blocks.blocks.iter().all(|block| {
-                    matches!(
-                        payload.get(&block.id()),
-                        Some(ObserverDataStatus::Available(_))
-                    )
-                })
-            };
-            if payload_exist {
-                info!(
-                    "[Observer] Add decision to pending {}",
-                    decision.ledger_info().commit_info()
+    /// Processes the commit decision for the pending block and returns true iff
+    /// the commit decision was successfully processed. Note: this function
+    /// assumes the commit decision has already been verified.
+    fn process_commit_decision_for_pending_block(&self, commit_decision: &CommitDecision) -> bool {
+        // Get the pending block for the commit decision
+        let pending_block = self
+            .ordered_block_store
+            .get_ordered_block(commit_decision.epoch(), commit_decision.round());
+
+        // Process the pending block
+        if let Some(pending_block) = pending_block {
+            // If all payloads exist, add the commit decision to the pending blocks
+            if self.all_payloads_exist(pending_block.blocks()) {
+                debug!(
+                    LogSchema::new(LogEntry::ConsensusObserver).message(&format!(
+                        "Adding decision to pending block: {}",
+                        commit_decision.proof_block_info()
+                    ))
                 );
-                *maybe_decision = Some(decision.clone());
-                if self.sync_handle.is_none() {
+                self.ordered_block_store
+                    .update_commit_decision(commit_decision);
+
+                // If we are not in sync mode, forward the commit decision to the execution pipeline
+                if !self.in_state_sync_mode() {
                     info!(
-                        "[Observer] Forward decision to pending {}.",
-                        decision.ledger_info().commit_info()
+                        LogSchema::new(LogEntry::ConsensusObserver).message(&format!(
+                            "Forwarding commit decision to the execution pipeline: {}",
+                            commit_decision.proof_block_info()
+                        ))
                     );
-                    self.forward_decision(decision);
+                    self.forward_commit_decision(commit_decision.clone());
                 }
+
+                return true; // The commit decision was successfully processed
+            }
+        }
+
+        false // The commit decision was not processed
+    }
+
+    /// Processes a direct send message
+    async fn process_direct_send_message(
+        &mut self,
+        peer_network_id: PeerNetworkId,
+        message: ConsensusObserverDirectSend,
+    ) {
+        // Verify the message is from the peer we've subscribed to
+        if let Some(active_subscription) = &mut self.active_observer_subscription {
+            if let Err(error) = active_subscription.verify_message_sender(&peer_network_id) {
+                warn!(
+                    LogSchema::new(LogEntry::ConsensusObserver).message(&format!(
+                        "Message failed subscription sender verification! Error: {:?}",
+                        error,
+                    ))
+                );
+
+                // Send another unsubscription request to the peer
+                self.unsubscribe_from_peer(peer_network_id);
                 return;
             }
+        } else {
+            warn!(
+                LogSchema::new(LogEntry::ConsensusObserver).message(&format!(
+                    "Received message from unexpected peer: {}! No active subscription found!",
+                    peer_network_id
+                ))
+            );
+
+            // Send an unsubscription request to the peer
+            self.unsubscribe_from_peer(peer_network_id);
+            return;
+        };
+
+        // Increment the received message counter
+        metrics::increment_request_counter(
+            &metrics::OBSERVER_RECEIVED_MESSAGES,
+            message.get_label(),
+            &peer_network_id,
+        );
+
+        // Process the message based on the type
+        match message {
+            ConsensusObserverDirectSend::OrderedBlock(ordered_block) => {
+                // Log the received ordered block message
+                let log_message = format!(
+                    "Received ordered block: {}, from peer: {}!",
+                    ordered_block.proof_block_info(),
+                    peer_network_id
+                );
+                log_received_message(log_message);
+
+                // Process the ordered block message
+                self.process_ordered_block_message(ordered_block).await;
+            },
+            ConsensusObserverDirectSend::CommitDecision(commit_decision) => {
+                // Log the received commit decision message
+                let log_message = format!(
+                    "Received commit decision: {}, from peer: {}!",
+                    commit_decision.proof_block_info(),
+                    peer_network_id
+                );
+                log_received_message(log_message);
+
+                // Process the commit decision message
+                self.process_commit_decision_message(commit_decision);
+            },
+            ConsensusObserverDirectSend::BlockPayload(block_payload) => {
+                // Log the received block payload message
+                let log_message = format!(
+                    "Received block payload: {}, from peer: {}!",
+                    block_payload.block, peer_network_id
+                );
+                log_received_message(log_message);
+
+                // Process the block payload message
+                self.process_block_payload_message(block_payload).await;
+            },
         }
-        // need to drop the lock otherwise it deadlocks last_block
-        drop(pending_blocks);
-        // we don't advance to next epoch via commit, so it has to sync from here to enter new epoch
-        if decision_epoch > self.last_block().epoch() || decision_round > self.last_block().round()
-        {
-            info!(
-                "[Observer] Start sync to {}.",
-                decision.ledger_info().commit_info()
+
+        // Update the metrics for the processed blocks
+        self.update_processed_blocks_metrics();
+    }
+
+    /// Processes the ordered block
+    async fn process_ordered_block_message(&mut self, ordered_block: OrderedBlock) {
+        // Verify the ordered blocks before processing
+        if let Err(error) = ordered_block.verify_ordered_blocks() {
+            error!(
+                LogSchema::new(LogEntry::ConsensusObserver).message(&format!(
+                    "Failed to verify ordered blocks! Ignoring: {:?}, Error: {:?}",
+                    ordered_block.proof_block_info(),
+                    error
+                ))
             );
-            // enter sync mode if we are missing blocks
-            *self.root.lock() = decision.ledger_info().clone();
-            self.pending_blocks.lock().clear();
-            let execution_client = self.execution_client.clone();
-            let notify_tx = self.sync_notifier.clone();
-            let (abort_handle, abort_registration) = AbortHandle::new_pair();
-            tokio::spawn(Abortable::new(
-                async move {
-                    execution_client
-                        .clone()
-                        .sync_to(decision.ledger_info().clone())
-                        .await
-                        .unwrap(); // todo: handle error
-                    notify_tx.send((decision_epoch, decision_round)).unwrap();
-                },
-                abort_registration,
-            ));
-            self.sync_handle = Some(DropGuard::new(abort_handle));
+            return;
+        };
+
+        // If all payloads exist, process the block. Otherwise, store it
+        // in the pending block store and wait for the payloads to arrive.
+        if self.all_payloads_exist(ordered_block.blocks()) {
+            self.process_ordered_block(ordered_block).await;
+        } else {
+            self.pending_block_store.insert_pending_block(ordered_block);
         }
     }
 
-    async fn process_sync_notify(&mut self, epoch: u64, round: Round) {
-        {
-            let lock = self.root.lock();
-            let expected = (lock.commit_info().epoch(), lock.commit_info().round());
-            if expected != (epoch, round) {
+    /// Processes the ordered block. This assumes the ordered block
+    /// has been sanity checked and that all payloads exist.
+    async fn process_ordered_block(&mut self, ordered_block: OrderedBlock) {
+        // Verify the ordered block proof
+        let epoch_state = self.get_epoch_state();
+        if ordered_block.proof_block_info().epoch() == epoch_state.epoch {
+            if let Err(error) = ordered_block.verify_ordered_proof(&epoch_state) {
+                warn!(
+                    LogSchema::new(LogEntry::ConsensusObserver).message(&format!(
+                        "Failed to verify ordered proof! Ignoring: {:?}, Error: {:?}",
+                        ordered_block.proof_block_info(),
+                        error
+                    ))
+                );
                 return;
             }
-            info!("[Observer] Finish sync to {}.", lock.commit_info());
-        }
-        if epoch > self.epoch {
-            self.execution_client.end_epoch().await;
-            self.await_new_epoch().await;
+        } else {
+            // Drop the block and log an error (the block should always be for the current epoch)
+            error!(
+                LogSchema::new(LogEntry::ConsensusObserver).message(&format!(
+                    "Received ordered block for a different epoch! Ignoring: {:?}",
+                    ordered_block.proof_block_info()
+                ))
+            );
+            return;
+        };
+
+        // Verify the block payloads against the ordered block
+        if let Err(error) = self
+            .block_payload_store
+            .verify_payloads_against_ordered_block(&ordered_block)
+        {
+            error!(
+                LogSchema::new(LogEntry::ConsensusObserver).message(&format!(
+                    "Failed to verify block payloads against ordered block! Ignoring: {:?}, Error: {:?}",
+                    ordered_block.proof_block_info(),
+                    error
+                ))
+            );
+            return;
         }
-        self.sync_handle = None;
-        let pending = self.pending_blocks.lock().clone();
-        for (_, (ordered_block, maybe_decision)) in pending.into_iter() {
-            let OrderedBlock {
-                blocks,
-                ordered_proof,
-            } = ordered_block;
-            self.execution_client
-                .finalize_order(&blocks, ordered_proof.clone(), self.commit_callback())
-                .await
-                .unwrap();
-            if let Some(decision) = maybe_decision {
-                self.forward_decision(decision.clone());
+
+        // The block was verified correctly. If the block is a child of our
+        // last block, we can insert it into the ordered block store.
+        if self.get_last_block().id() == ordered_block.first_block().parent_id() {
+            // Insert the ordered block into the pending blocks
+            self.ordered_block_store
+                .insert_ordered_block(ordered_block.clone());
+
+            // If we're not in sync mode, finalize the ordered blocks
+            if !self.in_state_sync_mode() {
+                self.finalize_ordered_block(ordered_block).await;
             }
+        } else {
+            warn!(
+                LogSchema::new(LogEntry::ConsensusObserver).message(&format!(
+                    "Parent block for ordered block is missing! Ignoring: {:?}",
+                    ordered_block.proof_block_info()
+                ))
+            );
         }
     }
 
-    async fn await_new_epoch(&mut self) {
-        let reconfig_notification = self
-            .reconfig_events
-            .next()
-            .await
-            .expect("Reconfig sender dropped, unable to start new epoch");
-        let payload = reconfig_notification.on_chain_configs;
-        let validator_set: ValidatorSet = payload
-            .get()
-            .expect("failed to get ValidatorSet from payload");
-        let epoch_state = Arc::new(EpochState {
-            epoch: payload.epoch(),
-            verifier: (&validator_set).into(),
-        });
-        self.epoch = payload.epoch();
-        info!("[Observer] enter epoch: {}", self.epoch);
-        let onchain_consensus_config: anyhow::Result<OnChainConsensusConfig> = payload.get();
-        let onchain_execution_config: anyhow::Result<OnChainExecutionConfig> = payload.get();
-        let onchain_randomness_config: anyhow::Result<RandomnessConfigMoveStruct> = payload.get();
-
-        if let Err(error) = &onchain_consensus_config {
-            error!("Failed to read on-chain consensus config {}", error);
+    /// Processes a request message
+    fn process_request_message(
+        &mut self,
+        peer_network_id: PeerNetworkId,
+        request: ConsensusObserverRequest,
+        response_sender: Option<ResponseSender>,
+    ) {
+        // Ensure that the response sender is present
+        let response_sender = match response_sender {
+            Some(response_sender) => response_sender,
+            None => {
+                error!(
+                    LogSchema::new(LogEntry::ConsensusObserver).message(&format!(
+                        "Missing response sender for RCP request: {:?}",
+                        request
+                    ))
+                );
+                return; // Something has gone wrong!
+            },
+        };
+
+        // Forward the request to the consensus publisher
+        if let Some(consensus_publisher) = &self.consensus_publisher {
+            consensus_publisher.handle_subscription_request(
+                &peer_network_id,
+                request,
+                response_sender,
+            );
         }
+    }
 
-        if let Err(error) = &onchain_execution_config {
-            error!("Failed to read on-chain execution config {}", error);
+    /// Processes the sync complete notification for the given epoch and round
+    async fn process_sync_notification(&mut self, epoch: u64, round: Round) {
+        // Log the sync notification
+        info!(
+            LogSchema::new(LogEntry::ConsensusObserver).message(&format!(
+                "Received sync complete notification for epoch {}, round: {}",
+                epoch, round
+            ))
+        );
+
+        // Verify that the sync notification is for the current epoch and round
+        if !check_root_epoch_and_round(self.root.clone(), epoch, round) {
+            info!(
+                LogSchema::new(LogEntry::ConsensusObserver).message(&format!(
+                "Received invalid sync notification for epoch: {}, round: {}! Current root: {:?}",
+                epoch, round, self.root
+                ))
+            );
+            return;
         }
 
-        if let Err(error) = &onchain_randomness_config {
-            error!("Failed to read on-chain randomness config {}", error);
+        // If the epoch has changed, end the current epoch and start the new one
+        let current_epoch_state = self.get_epoch_state();
+        if epoch > current_epoch_state.epoch {
+            // Wait for the next epoch to start
+            self.execution_client.end_epoch().await;
+            self.wait_for_epoch_start().await;
+
+            // Verify the block payloads for the new epoch
+            let new_epoch_state = self.get_epoch_state();
+            let verified_payload_rounds = self
+                .block_payload_store
+                .verify_payload_signatures(&new_epoch_state);
+
+            // Order all the pending blocks that are now ready (these were buffered during state sync)
+            for payload_round in verified_payload_rounds {
+                self.order_ready_pending_block(new_epoch_state.epoch, payload_round)
+                    .await;
+            }
+        };
+
+        // Reset and drop the sync handle
+        self.sync_handle = None;
+
+        // Process all the newly ordered blocks
+        for (_, (ordered_block, commit_decision)) in
+            self.ordered_block_store.get_all_ordered_blocks()
+        {
+            // Finalize the ordered block
+            self.finalize_ordered_block(ordered_block).await;
+
+            // If a commit decision is available, forward it to the execution pipeline
+            if let Some(commit_decision) = commit_decision {
+                self.forward_commit_decision(commit_decision.clone());
+            }
         }
+    }
+
+    /// Produces a list of sorted peers to service our subscription request. Peers
+    /// are prioritized by validator distance and latency.
+    /// Note: if `previous_subscription_peer` is provided, it will be excluded
+    /// from the selection process. Likewise, all peers currently subscribed to us
+    /// will be excluded from the selection process.
+    fn sort_peers_for_subscription(
+        &mut self,
+        previous_subscription_peer: Option<PeerNetworkId>,
+    ) -> Option<Vec<PeerNetworkId>> {
+        if let Some(mut peers_and_metadata) = self.get_connected_peers_and_metadata() {
+            // Remove the previous subscription peer (if provided)
+            if let Some(previous_subscription_peer) = previous_subscription_peer {
+                let _ = peers_and_metadata.remove(&previous_subscription_peer);
+            }
+
+            // Remove any peers that are currently subscribed to us
+            if let Some(consensus_publisher) = &self.consensus_publisher {
+                for peer_network_id in consensus_publisher.get_active_subscribers() {
+                    let _ = peers_and_metadata.remove(&peer_network_id);
+                }
+            }
+
+            // Sort the peers by validator distance and latency
+            let sorted_peers = subscription::sort_peers_by_distance_and_latency(peers_and_metadata);
+
+            // Return the sorted peers
+            Some(sorted_peers)
+        } else {
+            None // No connected peers were found
+        }
+    }
+
+    /// Unsubscribes from the given peer by sending an unsubscribe request
+    fn unsubscribe_from_peer(&self, peer_network_id: PeerNetworkId) {
+        // Send an unsubscribe request to the peer and process the response.
+        // Note: we execute this asynchronously, as we don't need to wait for the response.
+        let consensus_observer_client = self.consensus_observer_client.clone();
+        let consensus_observer_config = self.node_config.consensus_observer;
+        tokio::spawn(async move {
+            // Send the unsubscribe request to the peer
+            let unsubscribe_request = ConsensusObserverRequest::Unsubscribe;
+            let response = consensus_observer_client
+                .send_rpc_request_to_peer(
+                    &peer_network_id,
+                    unsubscribe_request,
+                    consensus_observer_config.network_request_timeout_ms,
+                )
+                .await;
+
+            // Process the response
+            match response {
+                Ok(ConsensusObserverResponse::UnsubscribeAck) => {
+                    info!(
+                        LogSchema::new(LogEntry::ConsensusObserver).message(&format!(
+                            "Successfully unsubscribed from peer: {}!",
+                            peer_network_id
+                        ))
+                    );
+                },
+                Ok(response) => {
+                    // We received an invalid response
+                    warn!(
+                        LogSchema::new(LogEntry::ConsensusObserver).message(&format!(
+                            "Got unexpected response type: {:?}",
+                            response.get_label()
+                        ))
+                    );
+                },
+                Err(error) => {
+                    // We encountered an error while sending the request
+                    error!(
+                        LogSchema::new(LogEntry::ConsensusObserver).message(&format!(
+                            "Failed to send unsubscribe request to peer: {}! Error: {:?}",
+                            peer_network_id, error
+                        ))
+                    );
+                },
+            }
+        });
+    }
+
+    /// Updates the metrics for the processed blocks
+    fn update_processed_blocks_metrics(&self) {
+        // Update the payload store metrics
+        self.block_payload_store.update_payload_store_metrics();
+
+        // Update the pending block metrics
+        self.pending_block_store.update_pending_blocks_metrics();
+
+        // Update the pending block metrics
+        self.ordered_block_store.update_ordered_blocks_metrics();
+    }
+
+    /// Updates the subscription creation metrics for the given peer
+    fn update_subscription_creation_metrics(&self, peer_network_id: PeerNetworkId) {
+        // Set the number of active subscriptions
+        metrics::set_gauge(
+            &metrics::OBSERVER_NUM_ACTIVE_SUBSCRIPTIONS,
+            &peer_network_id.network_id(),
+            1,
+        );
+
+        // Update the number of created subscriptions
+        metrics::increment_request_counter(
+            &metrics::OBSERVER_CREATED_SUBSCRIPTIONS,
+            metrics::CREATED_SUBSCRIPTION_LABEL,
+            &peer_network_id,
+        );
+    }
+
+    /// Updates the subscription termination metrics for the given peer
+    fn update_subscription_termination_metrics(
+        &self,
+        peer_network_id: PeerNetworkId,
+        error: Error,
+    ) {
+        // Reset the number of active subscriptions
+        metrics::set_gauge(
+            &metrics::OBSERVER_NUM_ACTIVE_SUBSCRIPTIONS,
+            &peer_network_id.network_id(),
+            0,
+        );
+
+        // Update the number of terminated subscriptions
+        metrics::increment_request_counter(
+            &metrics::OBSERVER_TERMINATED_SUBSCRIPTIONS,
+            error.get_label(),
+            &peer_network_id,
+        );
+    }
+
+    /// Waits for a new epoch to start
+    async fn wait_for_epoch_start(&mut self) {
+        // Extract the epoch state and on-chain configs
+        let (epoch_state, consensus_config, execution_config, randomness_config) = if let Some(
+            reconfig_events,
+        ) =
+            &mut self.reconfig_events
+        {
+            extract_on_chain_configs(&self.node_config, reconfig_events).await
+        } else {
+            panic!("Reconfig events are required to wait for a new epoch to start! Something has gone wrong!")
+        };
+
+        // Update the local epoch state and quorum store config
+        self.epoch_state = Some(epoch_state.clone());
+        self.quorum_store_enabled = consensus_config.quorum_store_enabled();
+        info!(
+            LogSchema::new(LogEntry::ConsensusObserver).message(&format!(
+                "New epoch started: {:?}. Updated the epoch state! Quorum store enabled: {:?}",
+                epoch_state.epoch, self.quorum_store_enabled,
+            ))
+        );
+
+        // Create the payload manager
+        let payload_manager: Arc<dyn TPayloadManager> = if self.quorum_store_enabled {
+            Arc::new(ConsensusObserverPayloadManager::new(
+                self.block_payload_store.get_block_payloads(),
+                self.consensus_publisher.clone(),
+            ))
+        } else {
+            Arc::new(DirectMempoolPayloadManager {})
+        };
 
-        let consensus_config = onchain_consensus_config.unwrap_or_default();
-        let execution_config = onchain_execution_config
-            .unwrap_or_else(|_| OnChainExecutionConfig::default_if_missing());
-        let onchain_randomness_config = onchain_randomness_config
-            .and_then(OnChainRandomnessConfig::try_from)
-            .unwrap_or_else(|_| OnChainRandomnessConfig::default_if_missing());
+        // Start the new epoch
         let signer = Arc::new(ValidatorSigner::new(
             AccountAddress::ZERO,
             bls12381::PrivateKey::genesis(),
@@ -300,19 +1134,14 @@ impl Observer {
         let dummy_signer = Arc::new(DagCommitSigner::new(signer.clone()));
         let (_, rand_msg_rx) =
             aptos_channel::new::<AccountAddress, IncomingRandGenRequest>(QueueStyle::FIFO, 1, None);
-        let payload_manager = if consensus_config.quorum_store_enabled() {
-            PayloadManager::Observer(self.payload_store.clone(), self.publisher.clone())
-        } else {
-            PayloadManager::DirectMempool
-        };
         self.execution_client
             .start_epoch(
                 epoch_state.clone(),
                 dummy_signer,
-                Arc::new(payload_manager),
+                payload_manager,
                 &consensus_config,
                 &execution_config,
-                &onchain_randomness_config,
+                &randomness_config,
                 None,
                 None,
                 rand_msg_rx,
@@ -321,59 +1150,271 @@ impl Observer {
             .await;
     }
 
+    /// Starts the consensus observer loop that processes incoming
+    /// network messages and ensures the observer is making progress.
     pub async fn start(
         mut self,
-        mut network_events: Box<dyn Stream<Item = Event<ObserverMessage>> + Send + Unpin>,
-        mut notifier_rx: tokio::sync::mpsc::UnboundedReceiver<(u64, Round)>,
+        mut network_service_events: ConsensusObserverNetworkEvents,
+        mut sync_notification_listener: tokio::sync::mpsc::UnboundedReceiver<(u64, Round)>,
     ) {
-        info!("[Observer] starts.");
-        self.await_new_epoch().await;
+        // If the consensus publisher is enabled but the observer is disabled,
+        // we should only forward incoming requests to the consensus publisher.
+        if self.node_config.consensus_observer.publisher_enabled
+            && !self.node_config.consensus_observer.observer_enabled
+        {
+            self.start_publisher_forwarding(&mut network_service_events)
+                .await;
+            return; // We should never return from this function
+        }
+
+        // Create a progress check ticker
+        let mut progress_check_interval = IntervalStream::new(interval(Duration::from_millis(
+            self.node_config
+                .consensus_observer
+                .progress_check_interval_ms,
+        )))
+        .fuse();
+
+        // Wait for the epoch to start
+        self.wait_for_epoch_start().await;
+
+        // Start the consensus observer loop
+        info!(LogSchema::new(LogEntry::ConsensusObserver)
+            .message("Starting the consensus observer loop!"));
         loop {
             tokio::select! {
-                Some(event) = network_events.next() => {
-                    if let Event::Message(peer, msg) = event {
-                         // todo: verify messages
-                        match msg {
-                            ObserverMessage::OrderedBlock(ordered_block) => {
-                                 info!(
-                                     "[Observer] received ordered block {} from {}.",
-                                     ordered_block.ordered_proof.commit_info(),
-                                     peer,
-                                 );
-                                 self.process_ordered_block(ordered_block).await;
-                            }
-                            ObserverMessage::CommitDecision(msg) => {
-                                 info!(
-                                     "[Observer] received commit decision {} from {}.",
-                                     msg.ledger_info().commit_info(),
-                                     peer,
-                                 );
-                                 self.process_commit_decision(msg);
-                            }
-                             ObserverMessage::Payload((block, payload)) => {
-                                 info!("[Observer] received payload {} from {}", block, peer);
-                                 match self.payload_store.lock().entry(block.id()) {
-                                     Entry::Occupied(mut entry) => {
-                                         let mut status = ObserverDataStatus::Available(payload.clone());
-                                         mem::swap(entry.get_mut(), &mut status);
-                                         if let ObserverDataStatus::Requested(tx) = status {
-                                             tx.send(payload).unwrap();
-                                         }
-                                     }
-                                     Entry::Vacant(entry) => {
-                                         entry.insert(ObserverDataStatus::Available(payload));
-                                     }
-                                 }
-                            }
-                        }
+                Some(network_message) = network_service_events.next() => {
+                    // Unpack the network message
+                    let NetworkMessage {
+                        peer_network_id,
+                        protocol_id: _,
+                        consensus_observer_message,
+                        response_sender,
+                    } = network_message;
+
+                    // Process the consensus observer message
+                    match consensus_observer_message {
+                        ConsensusObserverMessage::DirectSend(message) => {
+                            self.process_direct_send_message(peer_network_id, message).await;
+                        },
+                        ConsensusObserverMessage::Request(request) => {
+                            self.process_request_message(peer_network_id, request, response_sender);
+                        },
+                        _ => {
+                            error!(LogSchema::new(LogEntry::ConsensusObserver)
+                                .message(&format!("Received unexpected message from peer: {}", peer_network_id)));
+                        },
                     }
+                }
+                Some((epoch, round)) = sync_notification_listener.recv() => {
+                    self.process_sync_notification(epoch, round).await;
                 },
-                Some((epoch, round)) = notifier_rx.recv() => {
-                    self.process_sync_notify(epoch, round).await;
-                },
-                else => break,
+                _ = progress_check_interval.select_next_some() => {
+                    self.check_progress().await;
+                }
+            else => break,
             }
         }
-        info!("[Observer] shuts down.");
+
+        // Log the exit of the consensus observer loop
+        error!(LogSchema::new(LogEntry::ConsensusObserver)
+            .message("The consensus observer loop exited unexpectedly!"));
     }
+
+    /// Starts the publisher forwarding loop that forwards incoming
+    /// requests to the consensus publisher. The rest of the consensus
+    /// observer functionality is disabled.
+    async fn start_publisher_forwarding(
+        &mut self,
+        network_service_events: &mut ConsensusObserverNetworkEvents,
+    ) {
+        // TODO: identify if there's a cleaner way to handle this!
+
+        // Start the consensus publisher forwarding loop
+        info!(LogSchema::new(LogEntry::ConsensusObserver)
+            .message("Starting the consensus publisher forwarding loop!"));
+        loop {
+            tokio::select! {
+                Some(network_message) = network_service_events.next() => {
+                    // Unpack the network message
+                    let NetworkMessage {
+                        peer_network_id,
+                        protocol_id: _,
+                        consensus_observer_message,
+                        response_sender,
+                    } = network_message;
+
+                    // Process the consensus observer message
+                    match consensus_observer_message {
+                        ConsensusObserverMessage::Request(request) => {
+                            self.process_request_message(peer_network_id, request, response_sender);
+                        },
+                        _ => {
+                            error!(LogSchema::new(LogEntry::ConsensusObserver)
+                                .message(&format!("Received unexpected message from peer: {}", peer_network_id)));
+                        },
+                    }
+                }
+            }
+        }
+    }
+}
+
+/// Checks that the epoch and round match the current root
+fn check_root_epoch_and_round(
+    root: Arc<Mutex<LedgerInfoWithSignatures>>,
+    epoch: u64,
+    round: Round,
+) -> bool {
+    // Get the expected epoch and round
+    let root = root.lock();
+    let expected_epoch = root.commit_info().epoch();
+    let expected_round = root.commit_info().round();
+
+    // Check if the expected epoch and round match
+    expected_epoch == epoch && expected_round == round
+}
+
+/// A simple helper function that extracts the on-chain configs from the reconfig events
+async fn extract_on_chain_configs(
+    node_config: &NodeConfig,
+    reconfig_events: &mut ReconfigNotificationListener<DbBackedOnChainConfig>,
+) -> (
+    Arc<EpochState>,
+    OnChainConsensusConfig,
+    OnChainExecutionConfig,
+    OnChainRandomnessConfig,
+) {
+    // Fetch the next reconfiguration notification
+    let reconfig_notification = reconfig_events
+        .next()
+        .await
+        .expect("Failed to get reconfig notification!");
+
+    // Extract the epoch state from the reconfiguration notification
+    let on_chain_configs = reconfig_notification.on_chain_configs;
+    let validator_set: ValidatorSet = on_chain_configs
+        .get()
+        .expect("Failed to get the validator set from the on-chain configs!");
+    let epoch_state = Arc::new(EpochState {
+        epoch: on_chain_configs.epoch(),
+        verifier: (&validator_set).into(),
+    });
+
+    // Extract the consensus config (or use the default if it's missing)
+    let onchain_consensus_config: anyhow::Result<OnChainConsensusConfig> = on_chain_configs.get();
+    if let Err(error) = &onchain_consensus_config {
+        error!(
+            LogSchema::new(LogEntry::ConsensusObserver).message(&format!(
+                "Failed to read on-chain consensus config! Error: {:?}",
+                error
+            ))
+        );
+    }
+    let consensus_config = onchain_consensus_config.unwrap_or_default();
+
+    // Extract the execution config (or use the default if it's missing)
+    let onchain_execution_config: anyhow::Result<OnChainExecutionConfig> = on_chain_configs.get();
+    if let Err(error) = &onchain_execution_config {
+        error!(
+            LogSchema::new(LogEntry::ConsensusObserver).message(&format!(
+                "Failed to read on-chain execution config! Error: {:?}",
+                error
+            ))
+        );
+    }
+    let execution_config =
+        onchain_execution_config.unwrap_or_else(|_| OnChainExecutionConfig::default_if_missing());
+
+    // Extract the randomness config sequence number (or use the default if it's missing)
+    let onchain_randomness_config_seq_num: anyhow::Result<RandomnessConfigSeqNum> =
+        on_chain_configs.get();
+    if let Err(error) = &onchain_randomness_config_seq_num {
+        error!(
+            LogSchema::new(LogEntry::ConsensusObserver).message(&format!(
+                "Failed to read on-chain randomness config seq num! Error: {:?}",
+                error
+            ))
+        );
+    }
+    let onchain_randomness_config_seq_num = onchain_randomness_config_seq_num
+        .unwrap_or_else(|_| RandomnessConfigSeqNum::default_if_missing());
+
+    // Extract the randomness config
+    let onchain_randomness_config: anyhow::Result<RandomnessConfigMoveStruct> =
+        on_chain_configs.get();
+    if let Err(error) = &onchain_randomness_config {
+        error!(
+            LogSchema::new(LogEntry::ConsensusObserver).message(&format!(
+                "Failed to read on-chain randomness config! Error: {:?}",
+                error
+            ))
+        );
+    }
+    let onchain_randomness_config = OnChainRandomnessConfig::from_configs(
+        node_config.randomness_override_seq_num,
+        onchain_randomness_config_seq_num.seq_num,
+        onchain_randomness_config.ok(),
+    );
+
+    // Return the extracted epoch state and on-chain configs
+    (
+        epoch_state,
+        consensus_config,
+        execution_config,
+        onchain_randomness_config,
+    )
+}
+
+/// Logs the received message using an appropriate log level
+fn log_received_message(message: String) {
+    // Log the message at the appropriate level
+    let log_schema = LogSchema::new(LogEntry::ConsensusObserver).message(&message);
+    if LOG_MESSAGES_AT_INFO_LEVEL {
+        info!(log_schema);
+    } else {
+        debug!(log_schema);
+    }
+}
+
+/// Spawns a task to sync to the given commit decision and notifies
+/// the consensus observer. Also, returns an abort handle to cancel the task.
+#[allow(clippy::unwrap_used)]
+fn sync_to_commit_decision(
+    commit_decision: CommitDecision,
+    decision_epoch: u64,
+    decision_round: Round,
+    execution_client: Arc<dyn TExecutionClient>,
+    sync_notification_sender: UnboundedSender<(u64, Round)>,
+) -> AbortHandle {
+    let (abort_handle, abort_registration) = AbortHandle::new_pair();
+    tokio::spawn(Abortable::new(
+        async move {
+            // Sync to the commit decision
+            if let Err(error) = execution_client
+                .clone()
+                .sync_to(commit_decision.commit_proof().clone())
+                .await
+            {
+                warn!(
+                    LogSchema::new(LogEntry::ConsensusObserver).message(&format!(
+                        "Failed to sync to commit decision: {:?}! Error: {:?}",
+                        commit_decision, error
+                    ))
+                );
+            }
+
+            // Notify the consensus observer that the sync is complete
+            if let Err(error) = sync_notification_sender.send((decision_epoch, decision_round)) {
+                error!(
+                    LogSchema::new(LogEntry::ConsensusObserver).message(&format!(
+                        "Failed to send sync notification for decision epoch: {:?}, round: {:?}! Error: {:?}",
+                        decision_epoch, decision_round, error
+                    ))
+                );
+            }
+        },
+        abort_registration,
+    ));
+    abort_handle
 }
diff --git a/consensus/src/consensus_observer/ordered_blocks.rs b/consensus/src/consensus_observer/ordered_blocks.rs
new file mode 100644
index 0000000000000..ae532cad9abcb
--- /dev/null
+++ b/consensus/src/consensus_observer/ordered_blocks.rs
@@ -0,0 +1,572 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::consensus_observer::{
+    logging::{LogEntry, LogSchema},
+    metrics,
+    network_message::{CommitDecision, OrderedBlock},
+};
+use aptos_config::config::ConsensusObserverConfig;
+use aptos_consensus_types::common::Round;
+use aptos_infallible::Mutex;
+use aptos_logger::{debug, warn};
+use aptos_types::{block_info::BlockInfo, ledger_info::LedgerInfoWithSignatures};
+use std::{collections::BTreeMap, sync::Arc};
+
+/// A simple struct to store ordered blocks
+#[derive(Clone)]
+pub struct OrderedBlockStore {
+    // The configuration of the consensus observer
+    consensus_observer_config: ConsensusObserverConfig,
+
+    // Ordered blocks. The key is the epoch and round of the last block in the
+    // ordered block. Each entry contains the block and the commit decision (if any).
+    ordered_blocks: Arc<Mutex<BTreeMap<(u64, Round), (OrderedBlock, Option<CommitDecision>)>>>,
+}
+
+impl OrderedBlockStore {
+    pub fn new(consensus_observer_config: ConsensusObserverConfig) -> Self {
+        Self {
+            consensus_observer_config,
+            ordered_blocks: Arc::new(Mutex::new(BTreeMap::new())),
+        }
+    }
+
+    /// Clears all ordered blocks
+    pub fn clear_all_ordered_blocks(&self) {
+        self.ordered_blocks.lock().clear();
+    }
+
+    /// Returns a copy of the ordered blocks
+    pub fn get_all_ordered_blocks(
+        &self,
+    ) -> BTreeMap<(u64, Round), (OrderedBlock, Option<CommitDecision>)> {
+        self.ordered_blocks.lock().clone()
+    }
+
+    /// Returns the last ordered block (if any)
+    pub fn get_last_ordered_block(&self) -> Option<BlockInfo> {
+        self.ordered_blocks
+            .lock()
+            .last_key_value()
+            .map(|(_, (ordered_block, _))| ordered_block.last_block().block_info())
+    }
+
+    /// Returns the ordered block for the given epoch and round (if any)
+    pub fn get_ordered_block(&self, epoch: u64, round: Round) -> Option<OrderedBlock> {
+        self.ordered_blocks
+            .lock()
+            .get(&(epoch, round))
+            .map(|(ordered_block, _)| ordered_block.clone())
+    }
+
+    /// Inserts the given ordered block into the ordered blocks. This function
+    /// assumes the block has already been checked to extend the current ordered
+    /// blocks, and that the ordered proof has been verified.
+    pub fn insert_ordered_block(&self, ordered_block: OrderedBlock) {
+        // Verify that the number of ordered blocks doesn't exceed the maximum
+        let max_num_ordered_blocks = self.consensus_observer_config.max_num_pending_blocks as usize;
+        if self.ordered_blocks.lock().len() >= max_num_ordered_blocks {
+            warn!(
+                LogSchema::new(LogEntry::ConsensusObserver).message(&format!(
+                    "Exceeded the maximum number of ordered blocks: {:?}. Dropping block: {:?}.",
+                    max_num_ordered_blocks,
+                    ordered_block.proof_block_info()
+                ))
+            );
+            return; // Drop the block if we've exceeded the maximum
+        }
+
+        // Otherwise, we can add the block to the ordered blocks
+        debug!(
+            LogSchema::new(LogEntry::ConsensusObserver).message(&format!(
+                "Adding ordered block to the ordered blocks: {:?}",
+                ordered_block.proof_block_info()
+            ))
+        );
+
+        // Get the epoch and round of the last ordered block
+        let last_block = ordered_block.last_block();
+        let last_block_epoch = last_block.epoch();
+        let last_block_round = last_block.round();
+
+        // Insert the ordered block
+        self.ordered_blocks
+            .lock()
+            .insert((last_block_epoch, last_block_round), (ordered_block, None));
+    }
+
+    /// Removes the ordered blocks for the given commit ledger info. This will
+    /// remove all blocks up to (and including) the epoch and round of the commit.
+    pub fn remove_blocks_for_commit(&self, commit_ledger_info: &LedgerInfoWithSignatures) {
+        // Determine the epoch and round to split off
+        let split_off_epoch = commit_ledger_info.ledger_info().epoch();
+        let split_off_round = commit_ledger_info.commit_info().round().saturating_add(1);
+
+        // Remove the blocks from the ordered blocks
+        let mut ordered_blocks = self.ordered_blocks.lock();
+        *ordered_blocks = ordered_blocks.split_off(&(split_off_epoch, split_off_round));
+    }
+
+    /// Updates the commit decision of the ordered block (if found)
+    pub fn update_commit_decision(&self, commit_decision: &CommitDecision) {
+        // Get the epoch and round of the commit decision
+        let commit_decision_epoch = commit_decision.epoch();
+        let commit_decision_round = commit_decision.round();
+
+        // Update the commit decision for the ordered blocks
+        let mut ordered_blocks = self.ordered_blocks.lock();
+        if let Some((_, existing_commit_decision)) =
+            ordered_blocks.get_mut(&(commit_decision_epoch, commit_decision_round))
+        {
+            *existing_commit_decision = Some(commit_decision.clone());
+        }
+    }
+
+    /// Updates the metrics for the ordered blocks
+    pub fn update_ordered_blocks_metrics(&self) {
+        // Update the number of ordered block entries
+        let ordered_blocks = self.ordered_blocks.lock();
+        let num_entries = ordered_blocks.len() as u64;
+        metrics::set_gauge_with_label(
+            &metrics::OBSERVER_NUM_PROCESSED_BLOCKS,
+            metrics::ORDERED_BLOCK_ENTRIES_LABEL,
+            num_entries,
+        );
+
+        // Update the total number of ordered blocks
+        let num_ordered_blocks = ordered_blocks
+            .values()
+            .map(|(ordered_block, _)| ordered_block.blocks().len() as u64)
+            .sum();
+        metrics::set_gauge_with_label(
+            &metrics::OBSERVER_NUM_PROCESSED_BLOCKS,
+            metrics::ORDERED_BLOCKS_LABEL,
+            num_ordered_blocks,
+        );
+
+        // Update the highest round for the ordered blocks
+        let highest_ordered_round = ordered_blocks
+            .last_key_value()
+            .map(|(_, (ordered_block, _))| ordered_block.last_block().round())
+            .unwrap_or(0);
+        metrics::set_gauge_with_label(
+            &metrics::OBSERVER_PROCESSED_BLOCK_ROUNDS,
+            metrics::ORDERED_BLOCKS_LABEL,
+            highest_ordered_round,
+        );
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use aptos_consensus_types::{
+        block::Block,
+        block_data::{BlockData, BlockType},
+        pipelined_block::PipelinedBlock,
+        quorum_cert::QuorumCert,
+    };
+    use aptos_crypto::HashValue;
+    use aptos_types::{
+        aggregate_signature::AggregateSignature, ledger_info::LedgerInfo, transaction::Version,
+    };
+
+    #[test]
+    fn test_clear_all_ordered_blocks() {
+        // Create a new ordered block store
+        let ordered_block_store = OrderedBlockStore::new(ConsensusObserverConfig::default());
+
+        // Insert several ordered blocks for the current epoch
+        let current_epoch = 0;
+        let num_ordered_blocks = 10;
+        create_and_add_ordered_blocks(&ordered_block_store, num_ordered_blocks, current_epoch);
+
+        // Clear all ordered blocks
+        ordered_block_store.clear_all_ordered_blocks();
+
+        // Check that all the ordered blocks were removed
+        assert!(ordered_block_store.ordered_blocks.lock().is_empty());
+    }
+
+    #[test]
+    fn test_get_last_ordered_block() {
+        // Create a new ordered block store
+        let ordered_block_store = OrderedBlockStore::new(ConsensusObserverConfig::default());
+
+        // Verify that we have no last ordered block
+        assert!(ordered_block_store.get_last_ordered_block().is_none());
+
+        // Insert several ordered blocks for the current epoch
+        let current_epoch = 0;
+        let num_ordered_blocks = 50;
+        let ordered_blocks =
+            create_and_add_ordered_blocks(&ordered_block_store, num_ordered_blocks, current_epoch);
+
+        // Verify the last ordered block is the block with the highest round
+        let last_ordered_block = ordered_blocks.last().unwrap();
+        let last_ordered_block_info = last_ordered_block.last_block().block_info();
+        assert_eq!(
+            last_ordered_block_info,
+            ordered_block_store.get_last_ordered_block().unwrap()
+        );
+
+        // Insert several ordered blocks for the next epoch
+        let next_epoch = current_epoch + 1;
+        let num_ordered_blocks = 50;
+        let ordered_blocks =
+            create_and_add_ordered_blocks(&ordered_block_store, num_ordered_blocks, next_epoch);
+
+        // Verify the last ordered block is the block with the highest epoch and round
+        let last_ordered_block = ordered_blocks.last().unwrap();
+        let last_ordered_block_info = last_ordered_block.last_block().block_info();
+        assert_eq!(
+            last_ordered_block_info,
+            ordered_block_store.get_last_ordered_block().unwrap()
+        );
+    }
+
+    #[test]
+    fn test_get_ordered_block() {
+        // Create a new ordered block store
+        let ordered_block_store = OrderedBlockStore::new(ConsensusObserverConfig::default());
+
+        // Insert several ordered blocks for the current epoch
+        let current_epoch = 0;
+        let num_ordered_blocks = 50;
+        let ordered_blocks =
+            create_and_add_ordered_blocks(&ordered_block_store, num_ordered_blocks, current_epoch);
+
+        // Ensure the ordered blocks were all inserted
+        let all_ordered_blocks = ordered_block_store.get_all_ordered_blocks();
+        assert_eq!(all_ordered_blocks.len(), num_ordered_blocks);
+
+        // Verify the ordered blocks can be retrieved
+        for ordered_block in &ordered_blocks {
+            let block_info = ordered_block.last_block().block_info();
+            let fetched_ordered_block = ordered_block_store
+                .get_ordered_block(block_info.epoch(), block_info.round())
+                .unwrap();
+            assert_eq!(ordered_block.clone(), fetched_ordered_block);
+        }
+
+        // Verify that a non-existent block cannot be retrieved
+        let last_block = ordered_blocks.last().unwrap();
+        let last_block_info = last_block.last_block().block_info();
+        let ordered_block = ordered_block_store.get_ordered_block(
+            last_block_info.epoch(),
+            last_block_info.round() + 1, // Request a round that doesn't exist
+        );
+        assert!(ordered_block.is_none());
+    }
+
+    #[test]
+    fn test_insert_ordered_block_limit() {
+        // Create a consensus observer config with a maximum of 10 pending blocks
+        let max_num_pending_blocks = 10;
+        let consensus_observer_config = ConsensusObserverConfig {
+            max_num_pending_blocks: max_num_pending_blocks as u64,
+            ..ConsensusObserverConfig::default()
+        };
+
+        // Create a new ordered block store
+        let ordered_block_store = OrderedBlockStore::new(consensus_observer_config);
+
+        // Insert several ordered blocks for the current epoch
+        let current_epoch = 0;
+        let num_ordered_blocks = max_num_pending_blocks * 2; // Insert more than the maximum
+        create_and_add_ordered_blocks(&ordered_block_store, num_ordered_blocks, current_epoch);
+
+        // Verify the ordered blocks were inserted up to the maximum
+        let all_ordered_blocks = ordered_block_store.get_all_ordered_blocks();
+        assert_eq!(all_ordered_blocks.len(), max_num_pending_blocks);
+
+        // Insert several ordered blocks for the next epoch
+        let next_epoch = current_epoch + 1;
+        let num_ordered_blocks = max_num_pending_blocks - 1; // Insert one less than the maximum
+        let ordered_blocks =
+            create_and_add_ordered_blocks(&ordered_block_store, num_ordered_blocks, next_epoch);
+
+        // Verify the ordered blocks were not inserted (they should have just been dropped)
+        for ordered_block in &ordered_blocks {
+            let block_info = ordered_block.last_block().block_info();
+            let fetched_ordered_block =
+                ordered_block_store.get_ordered_block(block_info.epoch(), block_info.round());
+            assert!(fetched_ordered_block.is_none());
+        }
+
+        // Verify the ordered blocks don't exceed the maximum
+        let num_ordered_blocks = ordered_block_store.get_all_ordered_blocks().len();
+        assert_eq!(num_ordered_blocks, max_num_pending_blocks);
+    }
+
+    #[test]
+    fn test_remove_blocks_for_commit() {
+        // Create a new ordered block store
+        let ordered_block_store = OrderedBlockStore::new(ConsensusObserverConfig::default());
+
+        // Insert several ordered blocks for the current epoch
+        let current_epoch = 10;
+        let num_ordered_blocks = 10;
+        let ordered_blocks =
+            create_and_add_ordered_blocks(&ordered_block_store, num_ordered_blocks, current_epoch);
+
+        // Insert several ordered blocks for the next epoch
+        let next_epoch = current_epoch + 1;
+        let num_ordered_blocks_next_epoch = 20;
+        let ordered_blocks_next_epoch = create_and_add_ordered_blocks(
+            &ordered_block_store,
+            num_ordered_blocks_next_epoch,
+            next_epoch,
+        );
+
+        // Insert several ordered blocks for a future epoch
+        let future_epoch = next_epoch + 1;
+        let num_ordered_blocks_future_epoch = 30;
+        create_and_add_ordered_blocks(
+            &ordered_block_store,
+            num_ordered_blocks_future_epoch,
+            future_epoch,
+        );
+
+        // Create a commit decision for the first ordered block
+        let first_ordered_block = ordered_blocks.first().unwrap();
+        let first_ordered_block_info = first_ordered_block.last_block().block_info();
+        let commit_decision = CommitDecision::new(LedgerInfoWithSignatures::new(
+            LedgerInfo::new(first_ordered_block_info.clone(), HashValue::random()),
+            AggregateSignature::empty(),
+        ));
+
+        // Remove the ordered blocks for the commit decision
+        ordered_block_store.remove_blocks_for_commit(commit_decision.commit_proof());
+
+        // Verify the first ordered block was removed
+        let all_ordered_blocks = ordered_block_store.get_all_ordered_blocks();
+        assert!(!all_ordered_blocks.contains_key(&(
+            first_ordered_block_info.epoch(),
+            first_ordered_block_info.round()
+        )));
+        assert_eq!(
+            all_ordered_blocks.len(),
+            num_ordered_blocks + num_ordered_blocks_next_epoch + num_ordered_blocks_future_epoch
+                - 1
+        );
+
+        // Create a commit decision for the last ordered block (in the current epoch)
+        let last_ordered_block = ordered_blocks.last().unwrap();
+        let last_ordered_block_info = last_ordered_block.last_block().block_info();
+        let commit_decision = CommitDecision::new(LedgerInfoWithSignatures::new(
+            LedgerInfo::new(last_ordered_block_info.clone(), HashValue::random()),
+            AggregateSignature::empty(),
+        ));
+
+        // Remove the ordered blocks for the commit decision
+        ordered_block_store.remove_blocks_for_commit(commit_decision.commit_proof());
+
+        // Verify the ordered blocks for the current epoch were removed
+        let all_ordered_blocks = ordered_block_store.get_all_ordered_blocks();
+        for ordered_block in ordered_blocks {
+            let block_info = ordered_block.last_block().block_info();
+            assert!(!all_ordered_blocks.contains_key(&(block_info.epoch(), block_info.round())));
+        }
+        assert_eq!(
+            all_ordered_blocks.len(),
+            num_ordered_blocks_next_epoch + num_ordered_blocks_future_epoch
+        );
+
+        // Create a commit decision for the last ordered block (in the next epoch)
+        let last_ordered_block = ordered_blocks_next_epoch.last().unwrap();
+        let last_ordered_block_info = last_ordered_block.last_block().block_info();
+        let commit_decision = CommitDecision::new(LedgerInfoWithSignatures::new(
+            LedgerInfo::new(last_ordered_block_info.clone(), HashValue::random()),
+            AggregateSignature::empty(),
+        ));
+
+        // Remove the ordered blocks for the commit decision
+        ordered_block_store.remove_blocks_for_commit(commit_decision.commit_proof());
+
+        // Verify the ordered blocks for the next epoch were removed
+        let all_ordered_blocks = ordered_block_store.get_all_ordered_blocks();
+        for ordered_block in ordered_blocks_next_epoch {
+            let block_info = ordered_block.last_block().block_info();
+            assert!(!all_ordered_blocks.contains_key(&(block_info.epoch(), block_info.round())));
+        }
+        assert_eq!(all_ordered_blocks.len(), num_ordered_blocks_future_epoch);
+    }
+
+    #[test]
+    fn test_update_commit_decision() {
+        // Create a new ordered block store
+        let ordered_block_store = OrderedBlockStore::new(ConsensusObserverConfig::default());
+
+        // Insert several ordered blocks for the current epoch
+        let current_epoch = 0;
+        let num_ordered_blocks = 10;
+        let ordered_blocks =
+            create_and_add_ordered_blocks(&ordered_block_store, num_ordered_blocks, current_epoch);
+
+        // Insert several ordered blocks for the next epoch
+        let next_epoch = current_epoch + 1;
+        let num_ordered_blocks_next_epoch = 20;
+        let ordered_blocks_next_epoch = create_and_add_ordered_blocks(
+            &ordered_block_store,
+            num_ordered_blocks_next_epoch,
+            next_epoch,
+        );
+
+        // Ensure the ordered blocks were all inserted
+        let all_ordered_blocks = ordered_block_store.get_all_ordered_blocks();
+        assert_eq!(
+            all_ordered_blocks.len(),
+            num_ordered_blocks + num_ordered_blocks_next_epoch
+        );
+
+        // Verify the ordered blocks don't have any commit decisions
+        for (_, (_, commit_decision)) in all_ordered_blocks.iter() {
+            assert!(commit_decision.is_none());
+        }
+
+        // Create a commit decision for the first ordered block
+        let first_ordered_block = ordered_blocks.first().unwrap();
+        let first_ordered_block_info = first_ordered_block.last_block().block_info();
+        let commit_decision = CommitDecision::new(LedgerInfoWithSignatures::new(
+            LedgerInfo::new(first_ordered_block_info.clone(), HashValue::random()),
+            AggregateSignature::empty(),
+        ));
+
+        // Update the commit decision for the first ordered block
+        ordered_block_store.update_commit_decision(&commit_decision);
+
+        // Verify the commit decision was updated
+        verify_commit_decision(
+            &ordered_block_store,
+            &first_ordered_block_info,
+            commit_decision,
+        );
+
+        // Create a commit decision for the last ordered block (in the current epoch)
+        let last_ordered_block = ordered_blocks.last().unwrap();
+        let last_ordered_block_info = last_ordered_block.last_block().block_info();
+        let commit_decision = CommitDecision::new(LedgerInfoWithSignatures::new(
+            LedgerInfo::new(last_ordered_block_info.clone(), HashValue::random()),
+            AggregateSignature::empty(),
+        ));
+
+        // Update the commit decision for the last ordered block
+        ordered_block_store.update_commit_decision(&commit_decision);
+
+        // Verify the commit decision was updated
+        verify_commit_decision(
+            &ordered_block_store,
+            &last_ordered_block_info,
+            commit_decision,
+        );
+
+        // Verify the commit decisions for the remaining blocks are still missing
+        let all_ordered_blocks = ordered_block_store.get_all_ordered_blocks();
+        for i in 1..9 {
+            let (_, commit_decision) = all_ordered_blocks.get(&(current_epoch, i as u64)).unwrap();
+            assert!(commit_decision.is_none());
+        }
+
+        // Create a commit decision for the last ordered block (in the next epoch)
+        let last_ordered_block = ordered_blocks_next_epoch.last().unwrap();
+        let last_ordered_block_info = last_ordered_block.last_block().block_info();
+        let commit_decision = CommitDecision::new(LedgerInfoWithSignatures::new(
+            LedgerInfo::new(last_ordered_block_info.clone(), HashValue::random()),
+            AggregateSignature::empty(),
+        ));
+
+        // Update the commit decision for the last ordered block
+        ordered_block_store.update_commit_decision(&commit_decision);
+
+        // Verify the commit decision was updated
+        verify_commit_decision(
+            &ordered_block_store,
+            &last_ordered_block_info,
+            commit_decision,
+        );
+
+        // Verify the commit decisions for the remaining blocks are still missing
+        let all_ordered_blocks = ordered_block_store.get_all_ordered_blocks();
+        for i in 1..19 {
+            let (_, commit_decision) = all_ordered_blocks.get(&(next_epoch, i as u64)).unwrap();
+            assert!(commit_decision.is_none());
+        }
+    }
+
+    /// Creates and adds the specified number of ordered blocks to the ordered blocks
+    fn create_and_add_ordered_blocks(
+        ordered_block_store: &OrderedBlockStore,
+        num_ordered_blocks: usize,
+        epoch: u64,
+    ) -> Vec<OrderedBlock> {
+        let mut ordered_blocks = vec![];
+        for i in 0..num_ordered_blocks {
+            // Create a new block info
+            let block_info = BlockInfo::new(
+                epoch,
+                i as aptos_types::block_info::Round,
+                HashValue::random(),
+                HashValue::random(),
+                i as Version,
+                i as u64,
+                None,
+            );
+
+            // Create a pipelined block
+            let block_data = BlockData::new_for_testing(
+                block_info.epoch(),
+                block_info.round(),
+                block_info.timestamp_usecs(),
+                QuorumCert::dummy(),
+                BlockType::Genesis,
+            );
+            let block = Block::new_for_testing(block_info.id(), block_data, None);
+            let pipelined_block = Arc::new(PipelinedBlock::new_ordered(block));
+
+            // Create an ordered block
+            let blocks = vec![pipelined_block];
+            let ordered_proof = create_ledger_info(epoch, i as Round);
+            let ordered_block = OrderedBlock::new(blocks, ordered_proof);
+
+            // Insert the block into the ordered block store
+            ordered_block_store.insert_ordered_block(ordered_block.clone());
+
+            // Add the block to the ordered blocks
+            ordered_blocks.push(ordered_block);
+        }
+
+        ordered_blocks
+    }
+
+    /// Creates and returns a new ledger info with the specified epoch and round
+    fn create_ledger_info(epoch: u64, round: Round) -> LedgerInfoWithSignatures {
+        LedgerInfoWithSignatures::new(
+            LedgerInfo::new(
+                BlockInfo::random_with_epoch(epoch, round),
+                HashValue::random(),
+            ),
+            AggregateSignature::empty(),
+        )
+    }
+
+    /// Verifies the commit decision for the specified block info
+    fn verify_commit_decision(
+        ordered_block_store: &OrderedBlockStore,
+        block_info: &BlockInfo,
+        commit_decision: CommitDecision,
+    ) {
+        // Get the commit decision for the block
+        let all_ordered_blocks = ordered_block_store.get_all_ordered_blocks();
+        let (_, updated_commit_decision) = all_ordered_blocks
+            .get(&(block_info.epoch(), block_info.round()))
+            .unwrap();
+
+        // Verify the commit decision is expected
+        assert_eq!(
+            commit_decision,
+            updated_commit_decision.as_ref().unwrap().clone()
+        );
+    }
+}
diff --git a/consensus/src/consensus_observer/payload_store.rs b/consensus/src/consensus_observer/payload_store.rs
new file mode 100644
index 0000000000000..047a44b182746
--- /dev/null
+++ b/consensus/src/consensus_observer/payload_store.rs
@@ -0,0 +1,1133 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::consensus_observer::{
+    error::Error,
+    logging::{LogEntry, LogSchema},
+    metrics,
+    network_message::{BlockPayload, OrderedBlock},
+};
+use aptos_config::config::ConsensusObserverConfig;
+use aptos_consensus_types::{common::Round, pipelined_block::PipelinedBlock};
+use aptos_infallible::Mutex;
+use aptos_logger::{error, warn};
+use aptos_types::epoch_state::EpochState;
+use std::{
+    collections::{btree_map::Entry, BTreeMap},
+    sync::Arc,
+};
+
+/// The status of the block payload
+pub enum BlockPayloadStatus {
+    AvailableAndVerified(BlockPayload),
+    AvailableAndUnverified(BlockPayload),
+}
+
+/// A simple struct to store the block payloads of ordered and committed blocks
+#[derive(Clone)]
+pub struct BlockPayloadStore {
+    // The configuration of the consensus observer
+    consensus_observer_config: ConsensusObserverConfig,
+
+    // Block transaction payloads (indexed by epoch and round)
+    block_payloads: Arc<Mutex<BTreeMap<(u64, Round), BlockPayloadStatus>>>,
+}
+
+impl BlockPayloadStore {
+    pub fn new(consensus_observer_config: ConsensusObserverConfig) -> Self {
+        Self {
+            consensus_observer_config,
+            block_payloads: Arc::new(Mutex::new(BTreeMap::new())),
+        }
+    }
+
+    /// Returns true iff all the payloads for the given blocks
+    /// are available and have been verified.
+    pub fn all_payloads_exist(&self, blocks: &[Arc<PipelinedBlock>]) -> bool {
+        let block_payloads = self.block_payloads.lock();
+        blocks.iter().all(|block| {
+            let epoch_and_round = (block.epoch(), block.round());
+            matches!(
+                block_payloads.get(&epoch_and_round),
+                Some(BlockPayloadStatus::AvailableAndVerified(_))
+            )
+        })
+    }
+
+    /// Clears all the payloads from the block payload store
+    pub fn clear_all_payloads(&self) {
+        self.block_payloads.lock().clear();
+    }
+
+    /// Returns a reference to the block payloads
+    pub fn get_block_payloads(&self) -> Arc<Mutex<BTreeMap<(u64, Round), BlockPayloadStatus>>> {
+        self.block_payloads.clone()
+    }
+
+    /// Inserts the given block payload data into the payload store
+    pub fn insert_block_payload(
+        &mut self,
+        block_payload: BlockPayload,
+        verified_payload_signatures: bool,
+    ) {
+        // Verify that the number of payloads doesn't exceed the maximum
+        let max_num_pending_blocks = self.consensus_observer_config.max_num_pending_blocks as usize;
+        if self.block_payloads.lock().len() >= max_num_pending_blocks {
+            warn!(
+                LogSchema::new(LogEntry::ConsensusObserver).message(&format!(
+                    "Exceeded the maximum number of payloads: {:?}. Dropping block: {:?}!",
+                    max_num_pending_blocks, block_payload.block,
+                ))
+            );
+            return; // Drop the block if we've exceeded the maximum
+        }
+
+        // Create the new payload status
+        let epoch_and_round = (block_payload.block.epoch(), block_payload.block.round());
+        let payload_status = if verified_payload_signatures {
+            BlockPayloadStatus::AvailableAndVerified(block_payload)
+        } else {
+            BlockPayloadStatus::AvailableAndUnverified(block_payload)
+        };
+
+        // Insert the new payload status
+        self.block_payloads
+            .lock()
+            .insert(epoch_and_round, payload_status);
+    }
+
+    /// Removes all blocks up to the specified epoch and round (inclusive)
+    pub fn remove_blocks_for_epoch_round(&self, epoch: u64, round: Round) {
+        // Determine the round to split off
+        let split_off_round = round.saturating_add(1);
+
+        // Remove the blocks from the payload store
+        let mut block_payloads = self.block_payloads.lock();
+        *block_payloads = block_payloads.split_off(&(epoch, split_off_round));
+    }
+
+    /// Removes the committed blocks from the payload store
+    pub fn remove_committed_blocks(&self, committed_blocks: &[Arc<PipelinedBlock>]) {
+        // Get the highest epoch and round for the committed blocks
+        let (highest_epoch, highest_round) = committed_blocks
+            .last()
+            .map_or((0, 0), |block| (block.epoch(), block.round()));
+
+        // Remove the blocks
+        self.remove_blocks_for_epoch_round(highest_epoch, highest_round);
+    }
+
+    /// Updates the metrics for the payload store
+    pub fn update_payload_store_metrics(&self) {
+        // Update the number of block payloads
+        let num_payloads = self.block_payloads.lock().len() as u64;
+        metrics::set_gauge_with_label(
+            &metrics::OBSERVER_NUM_PROCESSED_BLOCKS,
+            metrics::STORED_PAYLOADS_LABEL,
+            num_payloads,
+        );
+
+        // Update the highest round for the block payloads
+        let highest_round = self
+            .block_payloads
+            .lock()
+            .last_key_value()
+            .map(|((_, round), _)| *round)
+            .unwrap_or(0);
+        metrics::set_gauge_with_label(
+            &metrics::OBSERVER_PROCESSED_BLOCK_ROUNDS,
+            metrics::STORED_PAYLOADS_LABEL,
+            highest_round,
+        );
+    }
+
+    /// Verifies all block payloads against the given ordered block.
+    /// If verification fails, an error is returned.
+    pub fn verify_payloads_against_ordered_block(
+        &mut self,
+        ordered_block: &OrderedBlock,
+    ) -> Result<(), Error> {
+        // Verify each of the blocks in the ordered block
+        for ordered_block in ordered_block.blocks() {
+            // Get the block epoch and round
+            let block_epoch = ordered_block.epoch();
+            let block_round = ordered_block.round();
+
+            // Fetch the block payload
+            match self.block_payloads.lock().entry((block_epoch, block_round)) {
+                Entry::Occupied(entry) => {
+                    // Get the block transaction payload
+                    let transaction_payload = match entry.get() {
+                        BlockPayloadStatus::AvailableAndVerified(block_payload) => {
+                            &block_payload.transaction_payload
+                        },
+                        BlockPayloadStatus::AvailableAndUnverified(_) => {
+                            // The payload should have already been verified
+                            return Err(Error::InvalidMessageError(format!(
+                                "Payload verification failed! Block payload for epoch: {:?} and round: {:?} is unverified.",
+                                ordered_block.epoch(),
+                                ordered_block.round()
+                            )));
+                        },
+                    };
+
+                    // Get the ordered block payload
+                    let ordered_block_payload = match ordered_block.block().payload() {
+                        Some(payload) => payload,
+                        None => {
+                            return Err(Error::InvalidMessageError(format!(
+                                "Payload verification failed! Missing block payload for epoch: {:?} and round: {:?}",
+                                ordered_block.epoch(),
+                                ordered_block.round()
+                            )));
+                        },
+                    };
+
+                    // Verify the transaction payload against the ordered block payload
+                    transaction_payload.verify_against_ordered_payload(ordered_block_payload)?;
+                },
+                Entry::Vacant(_) => {
+                    // The payload is missing (this should never happen)
+                    return Err(Error::InvalidMessageError(format!(
+                        "Payload verification failed! Missing block payload for epoch: {:?} and round: {:?}",
+                        ordered_block.epoch(),
+                        ordered_block.round()
+                    )));
+                },
+            }
+        }
+
+        Ok(())
+    }
+
+    /// Verifies the block payload signatures against the given epoch state.
+    /// If verification is successful, blocks are marked as verified. Each
+    /// new verified block is
+    pub fn verify_payload_signatures(&mut self, epoch_state: &EpochState) -> Vec<Round> {
+        // Get the current epoch
+        let current_epoch = epoch_state.epoch;
+
+        // Gather the keys for the block payloads
+        let payload_epochs_and_rounds: Vec<(u64, Round)> =
+            self.block_payloads.lock().keys().cloned().collect();
+
+        // Go through all unverified blocks and attempt to verify the signatures
+        let mut verified_payloads_to_update = vec![];
+        for (epoch, round) in payload_epochs_and_rounds {
+            // Check if we can break early (BtreeMaps are sorted by key)
+            if epoch > current_epoch {
+                break;
+            }
+
+            // Otherwise, attempt to verify the payload signatures
+            if epoch == current_epoch {
+                if let Entry::Occupied(mut entry) = self.block_payloads.lock().entry((epoch, round))
+                {
+                    if let BlockPayloadStatus::AvailableAndUnverified(block_payload) =
+                        entry.get_mut()
+                    {
+                        if let Err(error) = block_payload.verify_payload_signatures(epoch_state) {
+                            // Log the verification failure
+                            error!(
+                                LogSchema::new(LogEntry::ConsensusObserver).message(&format!(
+                                    "Failed to verify the block payload signatures for epoch: {:?} and round: {:?}. Error: {:?}",
+                                    epoch, round, error
+                                ))
+                            );
+
+                            // Remove the block payload from the store
+                            entry.remove();
+                        } else {
+                            // Save the block payload for reinsertion
+                            verified_payloads_to_update.push(block_payload.clone());
+                        }
+                    }
+                }
+            }
+        }
+
+        // Collect the rounds of all newly verified blocks
+        let verified_payload_rounds: Vec<Round> = verified_payloads_to_update
+            .iter()
+            .map(|block_payload| block_payload.block.round())
+            .collect();
+
+        // Update the verified block payloads. Note: this will cause
+        // notifications to be sent to any listeners that are waiting.
+        for verified_payload in verified_payloads_to_update {
+            self.insert_block_payload(verified_payload, true);
+        }
+
+        // Return the newly verified payload rounds
+        verified_payload_rounds
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use crate::consensus_observer::network_message::BlockTransactionPayload;
+    use aptos_bitvec::BitVec;
+    use aptos_consensus_types::{
+        block::Block,
+        block_data::{BlockData, BlockType},
+        common::{Author, Payload, ProofWithData},
+        proof_of_store::{BatchId, BatchInfo, ProofOfStore},
+        quorum_cert::QuorumCert,
+    };
+    use aptos_crypto::HashValue;
+    use aptos_types::{
+        aggregate_signature::AggregateSignature,
+        block_info::{BlockInfo, Round},
+        ledger_info::{LedgerInfo, LedgerInfoWithSignatures},
+        transaction::Version,
+        validator_signer::ValidatorSigner,
+        validator_verifier::{ValidatorConsensusInfo, ValidatorVerifier},
+        PeerId,
+    };
+    use claims::assert_matches;
+    use rand::{rngs::OsRng, Rng};
+
+    #[test]
+    fn test_all_payloads_exist() {
+        // Create the consensus observer config
+        let max_num_pending_blocks = 1000;
+        let consensus_observer_config = ConsensusObserverConfig {
+            max_num_pending_blocks,
+            ..ConsensusObserverConfig::default()
+        };
+
+        // Create a new block payload store
+        let block_payload_store = BlockPayloadStore::new(consensus_observer_config);
+
+        // Add some unverified blocks to the payload store
+        let num_blocks_in_store = 100;
+        let unverified_blocks = create_and_add_blocks_to_store(
+            block_payload_store.clone(),
+            num_blocks_in_store,
+            1,
+            false,
+        );
+
+        // Verify the payloads don't exist in the block payload store
+        assert!(!block_payload_store.all_payloads_exist(&unverified_blocks));
+        assert_eq!(get_num_verified_payloads(&block_payload_store), 0);
+        assert_eq!(
+            get_num_unverified_payloads(&block_payload_store),
+            num_blocks_in_store
+        );
+
+        // Add some verified blocks to the payload store
+        let num_blocks_in_store = 100;
+        let verified_blocks = create_and_add_blocks_to_store(
+            block_payload_store.clone(),
+            num_blocks_in_store,
+            0,
+            true,
+        );
+
+        // Check that all the payloads exist in the block payload store
+        assert!(block_payload_store.all_payloads_exist(&verified_blocks));
+
+        // Check that a subset of the payloads exist in the block payload store
+        let subset_verified_blocks = &verified_blocks[0..50];
+        assert!(block_payload_store.all_payloads_exist(subset_verified_blocks));
+
+        // Remove some of the payloads from the block payload store
+        block_payload_store.remove_committed_blocks(subset_verified_blocks);
+
+        // Check that the payloads no longer exist in the block payload store
+        assert!(!block_payload_store.all_payloads_exist(subset_verified_blocks));
+
+        // Check that the remaining payloads still exist in the block payload store
+        let subset_verified_blocks = &verified_blocks[50..100];
+        assert!(block_payload_store.all_payloads_exist(subset_verified_blocks));
+
+        // Remove the remaining payloads from the block payload store
+        block_payload_store.remove_committed_blocks(subset_verified_blocks);
+
+        // Check that the payloads no longer exist in the block payload store
+        assert!(!block_payload_store.all_payloads_exist(subset_verified_blocks));
+    }
+
+    #[test]
+    fn test_all_payloads_exist_unverified() {
+        // Create a new block payload store
+        let consensus_observer_config = ConsensusObserverConfig::default();
+        let block_payload_store = BlockPayloadStore::new(consensus_observer_config);
+
+        // Add several verified blocks to the payload store
+        let num_blocks_in_store = 10;
+        let verified_blocks = create_and_add_blocks_to_store(
+            block_payload_store.clone(),
+            num_blocks_in_store,
+            0,
+            true,
+        );
+
+        // Check that the payloads exists in the block payload store
+        assert!(block_payload_store.all_payloads_exist(&verified_blocks));
+
+        // Mark the payload of the first block as unverified
+        mark_payload_as_unverified(block_payload_store.clone(), &verified_blocks[0]);
+
+        // Check that the payload no longer exists in the block payload store
+        assert!(!block_payload_store.all_payloads_exist(&verified_blocks));
+
+        // Check that the remaining payloads still exist in the block payload store
+        assert!(block_payload_store.all_payloads_exist(&verified_blocks[1..10]));
+    }
+
+    #[test]
+    fn test_clear_all_payloads() {
+        // Create a new block payload store
+        let consensus_observer_config = ConsensusObserverConfig::default();
+        let block_payload_store = BlockPayloadStore::new(consensus_observer_config);
+
+        // Add some unverified blocks to the payload store
+        let num_blocks_in_store = 30;
+        create_and_add_blocks_to_store(block_payload_store.clone(), num_blocks_in_store, 1, false);
+
+        // Add some verified blocks to the payload store
+        let verified_blocks = create_and_add_blocks_to_store(
+            block_payload_store.clone(),
+            num_blocks_in_store,
+            0,
+            true,
+        );
+
+        // Check that the payloads exist in the block payload store
+        assert!(block_payload_store.all_payloads_exist(&verified_blocks));
+
+        // Verify the number of blocks in the block payload store
+        check_num_unverified_payloads(&block_payload_store, num_blocks_in_store);
+        check_num_verified_payloads(&block_payload_store, num_blocks_in_store);
+
+        // Clear all the payloads from the block payload store
+        block_payload_store.clear_all_payloads();
+
+        // Check that the payloads no longer exist in the block payload store
+        assert!(!block_payload_store.all_payloads_exist(&verified_blocks));
+
+        // Check that the block payload store is empty
+        check_num_unverified_payloads(&block_payload_store, 0);
+        check_num_verified_payloads(&block_payload_store, 0);
+    }
+
+    #[test]
+    fn test_insert_block_payload() {
+        // Create a new block payload store
+        let consensus_observer_config = ConsensusObserverConfig::default();
+        let mut block_payload_store = BlockPayloadStore::new(consensus_observer_config);
+
+        // Add some verified blocks to the payload store
+        let num_blocks_in_store = 20;
+        let verified_blocks = create_and_add_blocks_to_store(
+            block_payload_store.clone(),
+            num_blocks_in_store,
+            0,
+            true,
+        );
+
+        // Check that the block payload store contains the new block payloads
+        assert!(block_payload_store.all_payloads_exist(&verified_blocks));
+
+        // Verify the number of blocks in the block payload store
+        check_num_unverified_payloads(&block_payload_store, 0);
+        check_num_verified_payloads(&block_payload_store, num_blocks_in_store);
+
+        // Mark the payload of the first block as unverified
+        mark_payload_as_unverified(block_payload_store.clone(), &verified_blocks[0]);
+
+        // Check that the payload no longer exists in the block payload store
+        assert!(!block_payload_store.all_payloads_exist(&verified_blocks));
+
+        // Verify the number of verified blocks in the block payload store
+        check_num_verified_payloads(&block_payload_store, num_blocks_in_store - 1);
+
+        // Insert the same block payload into the block payload store (as verified)
+        let transaction_payload = BlockTransactionPayload::empty();
+        let block_payload = BlockPayload::new(verified_blocks[0].block_info(), transaction_payload);
+        block_payload_store.insert_block_payload(block_payload, true);
+
+        // Check that the block payload store now contains the requested block payload
+        assert!(block_payload_store.all_payloads_exist(&verified_blocks));
+    }
+
+    #[test]
+    fn test_insert_block_payload_limit_verified() {
+        // Create a new config observer config
+        let max_num_pending_blocks = 10;
+        let consensus_observer_config = ConsensusObserverConfig {
+            max_num_pending_blocks,
+            ..ConsensusObserverConfig::default()
+        };
+
+        // Create a new block payload store
+        let block_payload_store = BlockPayloadStore::new(consensus_observer_config);
+
+        // Add the maximum number of verified blocks to the payload store
+        let num_blocks_in_store = max_num_pending_blocks as usize;
+        create_and_add_blocks_to_store(block_payload_store.clone(), num_blocks_in_store, 0, true);
+
+        // Verify the number of blocks in the block payload store
+        check_num_verified_payloads(&block_payload_store, num_blocks_in_store);
+        check_num_unverified_payloads(&block_payload_store, 0);
+
+        // Add more blocks to the payload store
+        let num_blocks_to_add = 5;
+        create_and_add_blocks_to_store(block_payload_store.clone(), num_blocks_to_add, 0, true);
+
+        // Verify the number of blocks in the block payload store
+        check_num_verified_payloads(&block_payload_store, max_num_pending_blocks as usize);
+        check_num_unverified_payloads(&block_payload_store, 0);
+
+        // Add a large number of blocks to the payload store
+        let num_blocks_to_add = 100;
+        create_and_add_blocks_to_store(block_payload_store.clone(), num_blocks_to_add, 0, true);
+
+        // Verify the number of blocks in the block payload store
+        check_num_verified_payloads(&block_payload_store, max_num_pending_blocks as usize);
+        check_num_unverified_payloads(&block_payload_store, 0);
+    }
+
+    #[test]
+    fn test_insert_block_payload_limit_unverified() {
+        // Create a new config observer config
+        let max_num_pending_blocks = 10;
+        let consensus_observer_config = ConsensusObserverConfig {
+            max_num_pending_blocks,
+            ..ConsensusObserverConfig::default()
+        };
+
+        // Create a new block payload store
+        let block_payload_store = BlockPayloadStore::new(consensus_observer_config);
+
+        // Add the maximum number of unverified blocks to the payload store
+        let num_blocks_in_store = max_num_pending_blocks as usize;
+        create_and_add_blocks_to_store(block_payload_store.clone(), num_blocks_in_store, 0, false);
+
+        // Verify the number of blocks in the block payload store
+        check_num_unverified_payloads(&block_payload_store, num_blocks_in_store);
+        check_num_verified_payloads(&block_payload_store, 0);
+
+        // Add more blocks to the payload store
+        let num_blocks_to_add = 5;
+        create_and_add_blocks_to_store(block_payload_store.clone(), num_blocks_to_add, 0, false);
+
+        // Verify the number of blocks in the block payload store
+        check_num_unverified_payloads(&block_payload_store, max_num_pending_blocks as usize);
+        check_num_verified_payloads(&block_payload_store, 0);
+
+        // Add a large number of blocks to the payload store
+        let num_blocks_to_add = 100;
+        create_and_add_blocks_to_store(block_payload_store.clone(), num_blocks_to_add, 0, false);
+
+        // Verify the number of blocks in the block payload store
+        check_num_unverified_payloads(&block_payload_store, max_num_pending_blocks as usize);
+        check_num_verified_payloads(&block_payload_store, 0);
+    }
+
+    #[test]
+    fn test_remove_blocks_for_epoch_round_verified() {
+        // Create a new block payload store
+        let consensus_observer_config = ConsensusObserverConfig::default();
+        let block_payload_store = BlockPayloadStore::new(consensus_observer_config);
+
+        // Add some verified blocks to the payload store for the current epoch
+        let current_epoch = 0;
+        let num_blocks_in_store = 100;
+        let verified_blocks = create_and_add_blocks_to_store(
+            block_payload_store.clone(),
+            num_blocks_in_store,
+            current_epoch,
+            true,
+        );
+
+        // Remove all the blocks for the given epoch and round
+        block_payload_store.remove_blocks_for_epoch_round(current_epoch, 49);
+
+        // Check that the block payload store no longer contains the removed blocks
+        let block_payloads = block_payload_store.get_block_payloads();
+        for verified_block in verified_blocks.iter().take(50) {
+            assert!(!block_payloads
+                .lock()
+                .contains_key(&(verified_block.epoch(), verified_block.round())));
+        }
+
+        // Verify the number of blocks in the block payload store
+        check_num_verified_payloads(&block_payload_store, num_blocks_in_store - 50);
+
+        // Remove all the blocks for the given epoch and round
+        block_payload_store
+            .remove_blocks_for_epoch_round(current_epoch, num_blocks_in_store as Round);
+
+        // Check that the block payload store no longer contains any blocks
+        let block_payloads = block_payload_store.get_block_payloads();
+        assert!(block_payloads.lock().is_empty());
+
+        // Verify the number of blocks in the block payload store
+        check_num_verified_payloads(&block_payload_store, 0);
+
+        // Add some verified blocks to the payload store for the next epoch
+        let next_epoch = current_epoch + 1;
+        create_and_add_blocks_to_store(
+            block_payload_store.clone(),
+            num_blocks_in_store,
+            next_epoch,
+            true,
+        );
+
+        // Remove all the blocks for the future epoch and round
+        let future_epoch = next_epoch + 1;
+        block_payload_store.remove_blocks_for_epoch_round(future_epoch, 0);
+
+        // Verify the store is now empty
+        check_num_verified_payloads(&block_payload_store, 0);
+    }
+
+    #[test]
+    fn test_remove_blocks_for_epoch_round_unverified() {
+        // Create a new block payload store
+        let consensus_observer_config = ConsensusObserverConfig::default();
+        let block_payload_store = BlockPayloadStore::new(consensus_observer_config);
+
+        // Add some unverified blocks to the payload store for the current epoch
+        let current_epoch = 10;
+        let num_blocks_in_store = 100;
+        let unverified_blocks = create_and_add_blocks_to_store(
+            block_payload_store.clone(),
+            num_blocks_in_store,
+            current_epoch,
+            false,
+        );
+
+        // Remove all the blocks for the given epoch and round
+        block_payload_store.remove_blocks_for_epoch_round(current_epoch, 49);
+
+        // Check that the block payload store no longer contains the removed blocks
+        for unverified_block in unverified_blocks.iter().take(50) {
+            assert!(!block_payload_store
+                .block_payloads
+                .lock()
+                .contains_key(&(unverified_block.epoch(), unverified_block.round())));
+        }
+
+        // Verify the number of blocks in the block payload store
+        check_num_unverified_payloads(&block_payload_store, num_blocks_in_store - 50);
+
+        // Remove all the blocks for the given epoch and round
+        block_payload_store
+            .remove_blocks_for_epoch_round(current_epoch, num_blocks_in_store as Round);
+
+        // Check that the block payload store no longer contains any blocks
+        assert!(block_payload_store.block_payloads.lock().is_empty());
+
+        // Verify the number of blocks in the block payload store
+        check_num_unverified_payloads(&block_payload_store, 0);
+
+        // Add some unverified blocks to the payload store for the next epoch
+        let next_epoch = current_epoch + 1;
+        create_and_add_blocks_to_store(
+            block_payload_store.clone(),
+            num_blocks_in_store,
+            next_epoch,
+            false,
+        );
+
+        // Remove all the blocks for the future epoch and round
+        let future_epoch = next_epoch + 10;
+        block_payload_store.remove_blocks_for_epoch_round(future_epoch, 0);
+
+        // Verify the store is now empty
+        check_num_unverified_payloads(&block_payload_store, 0);
+    }
+
+    #[test]
+    fn test_remove_committed_blocks_verified() {
+        // Create a new block payload store
+        let consensus_observer_config = ConsensusObserverConfig::default();
+        let block_payload_store = BlockPayloadStore::new(consensus_observer_config);
+
+        // Add some blocks to the payload store for the current epoch
+        let current_epoch = 0;
+        let num_blocks_in_store = 100;
+        let verified_blocks = create_and_add_blocks_to_store(
+            block_payload_store.clone(),
+            num_blocks_in_store,
+            current_epoch,
+            true,
+        );
+
+        // Remove the first block from the block payload store
+        block_payload_store.remove_committed_blocks(&verified_blocks[0..1]);
+
+        // Check that the block payload store no longer contains the removed block
+        let block_payloads = block_payload_store.get_block_payloads();
+        let removed_block = &verified_blocks[0];
+        assert!(!block_payloads
+            .lock()
+            .contains_key(&(removed_block.epoch(), removed_block.round())));
+
+        // Verify the number of blocks in the block payload store
+        check_num_verified_payloads(&block_payload_store, num_blocks_in_store - 1);
+
+        // Remove the last 5 blocks from the block payload store
+        block_payload_store.remove_committed_blocks(&verified_blocks[5..10]);
+
+        // Check that the block payload store no longer contains the removed blocks
+        let block_payloads = block_payload_store.get_block_payloads();
+        for verified_block in verified_blocks.iter().take(10).skip(5) {
+            assert!(!block_payloads
+                .lock()
+                .contains_key(&(verified_block.epoch(), verified_block.round())));
+        }
+
+        // Verify the number of blocks in the block payload store
+        check_num_verified_payloads(&block_payload_store, num_blocks_in_store - 10);
+
+        // Remove all the blocks from the block payload store (including some that don't exist)
+        block_payload_store.remove_committed_blocks(&verified_blocks[0..num_blocks_in_store]);
+
+        // Check that the block payload store no longer contains any blocks
+        let block_payloads = block_payload_store.get_block_payloads();
+        assert!(block_payloads.lock().is_empty());
+
+        // Verify the number of blocks in the block payload store
+        check_num_verified_payloads(&block_payload_store, 0);
+
+        // Add some blocks to the payload store for the next epoch
+        let next_epoch = 1;
+        let verified_blocks = create_and_add_blocks_to_store(
+            block_payload_store.clone(),
+            num_blocks_in_store,
+            next_epoch,
+            true,
+        );
+
+        // Remove the last committed block from the future epoch
+        block_payload_store.remove_committed_blocks(&verified_blocks[99..100]);
+
+        // Check that the block payload store is now empty
+        check_num_verified_payloads(&block_payload_store, 0);
+    }
+
+    #[test]
+    fn test_remove_committed_blocks_unverified() {
+        // Create a new block payload store
+        let consensus_observer_config = ConsensusObserverConfig::default();
+        let block_payload_store = BlockPayloadStore::new(consensus_observer_config);
+
+        // Add some blocks to the payload store for the current epoch
+        let current_epoch = 10;
+        let num_blocks_in_store = 100;
+        let unverified_blocks = create_and_add_blocks_to_store(
+            block_payload_store.clone(),
+            num_blocks_in_store,
+            current_epoch,
+            false,
+        );
+
+        // Remove the first block from the block payload store
+        block_payload_store.remove_committed_blocks(&unverified_blocks[0..1]);
+
+        // Check that the block payload store no longer contains the removed block
+        let removed_block = &unverified_blocks[0];
+        assert!(!block_payload_store
+            .block_payloads
+            .lock()
+            .contains_key(&(removed_block.epoch(), removed_block.round())));
+
+        // Verify the number of blocks in the block payload store
+        check_num_unverified_payloads(&block_payload_store, num_blocks_in_store - 1);
+
+        // Remove the last 5 blocks from the block payload store
+        block_payload_store.remove_committed_blocks(&unverified_blocks[5..10]);
+
+        // Check that the block payload store no longer contains the removed blocks
+        for verified_block in unverified_blocks.iter().take(10).skip(5) {
+            assert!(!block_payload_store
+                .block_payloads
+                .lock()
+                .contains_key(&(verified_block.epoch(), verified_block.round())));
+        }
+
+        // Verify the number of blocks in the block payload store
+        check_num_unverified_payloads(&block_payload_store, num_blocks_in_store - 10);
+
+        // Remove all the blocks from the block payload store (including some that don't exist)
+        block_payload_store.remove_committed_blocks(&unverified_blocks[0..num_blocks_in_store]);
+
+        // Check that the block payload store no longer contains any blocks
+        assert!(block_payload_store.block_payloads.lock().is_empty());
+
+        // Verify the number of blocks in the block payload store
+        check_num_unverified_payloads(&block_payload_store, 0);
+
+        // Add some blocks to the payload store for the next epoch
+        let next_epoch = 11;
+        let unverified_blocks = create_and_add_blocks_to_store(
+            block_payload_store.clone(),
+            num_blocks_in_store,
+            next_epoch,
+            false,
+        );
+
+        // Remove the last committed block from the future epoch
+        block_payload_store.remove_committed_blocks(&unverified_blocks[99..100]);
+
+        // Check that the block payload store is now empty
+        check_num_unverified_payloads(&block_payload_store, 0);
+    }
+
+    #[test]
+    fn test_verify_payload_signatures() {
+        // Create a new block payload store
+        let consensus_observer_config = ConsensusObserverConfig::default();
+        let mut block_payload_store = BlockPayloadStore::new(consensus_observer_config);
+
+        // Add some verified blocks for the current epoch
+        let current_epoch = 0;
+        let num_verified_blocks = 10;
+        create_and_add_blocks_to_store(
+            block_payload_store.clone(),
+            num_verified_blocks,
+            current_epoch,
+            true,
+        );
+
+        // Add some unverified blocks for the next epoch
+        let next_epoch = current_epoch + 1;
+        let num_unverified_blocks = 20;
+        let unverified_blocks = create_and_add_blocks_to_store(
+            block_payload_store.clone(),
+            num_unverified_blocks,
+            next_epoch,
+            false,
+        );
+
+        // Add some unverified blocks for a future epoch
+        let future_epoch = current_epoch + 30;
+        let num_future_blocks = 30;
+        let future_unverified_blocks = create_and_add_blocks_to_store(
+            block_payload_store.clone(),
+            num_future_blocks,
+            future_epoch,
+            false,
+        );
+
+        // Create an epoch state for the next epoch (with an empty verifier)
+        let epoch_state = EpochState::new(next_epoch, ValidatorVerifier::new(vec![]));
+
+        // Verify the block payload signatures
+        let verified_rounds = block_payload_store.verify_payload_signatures(&epoch_state);
+
+        // Verify the unverified payloads were moved to the verified store
+        assert!(block_payload_store.all_payloads_exist(&unverified_blocks));
+        assert_eq!(
+            get_num_verified_payloads(&block_payload_store),
+            num_verified_blocks + num_unverified_blocks
+        );
+        assert_eq!(
+            get_num_unverified_payloads(&block_payload_store),
+            num_future_blocks
+        );
+
+        // Check the rounds of the newly verified payloads
+        let expected_verified_rounds = unverified_blocks
+            .iter()
+            .map(|block| block.round())
+            .collect::<Vec<_>>();
+        assert_eq!(verified_rounds, expected_verified_rounds);
+
+        // Clear the verified blocks and check the verified blocks are empty
+        block_payload_store.remove_committed_blocks(&unverified_blocks);
+        assert_eq!(get_num_verified_payloads(&block_payload_store), 0);
+
+        // Create an epoch state for the future epoch (with an empty verifier)
+        let epoch_state = EpochState::new(future_epoch, ValidatorVerifier::new(vec![]));
+
+        // Verify the block payload signatures for a future epoch
+        let verified_rounds = block_payload_store.verify_payload_signatures(&epoch_state);
+
+        // Verify the future unverified payloads were moved to the verified store
+        assert!(block_payload_store.all_payloads_exist(&future_unverified_blocks));
+        assert_eq!(
+            get_num_verified_payloads(&block_payload_store),
+            num_future_blocks
+        );
+        assert_eq!(get_num_unverified_payloads(&block_payload_store), 0);
+
+        // Check the rounds of the newly verified payloads
+        let expected_verified_rounds = future_unverified_blocks
+            .iter()
+            .map(|block| block.round())
+            .collect::<Vec<_>>();
+        assert_eq!(verified_rounds, expected_verified_rounds);
+    }
+
+    #[test]
+    fn test_verify_payloads_against_ordered_block() {
+        // Create a new block payload store
+        let consensus_observer_config = ConsensusObserverConfig::default();
+        let mut block_payload_store = BlockPayloadStore::new(consensus_observer_config);
+
+        // Add some verified blocks for the current epoch
+        let current_epoch = 0;
+        let num_verified_blocks = 10;
+        let verified_blocks = create_and_add_blocks_to_store(
+            block_payload_store.clone(),
+            num_verified_blocks,
+            current_epoch,
+            true,
+        );
+
+        // Create an ordered block using the verified blocks
+        let ordered_block = OrderedBlock::new(
+            verified_blocks.clone(),
+            create_empty_ledger_info(current_epoch),
+        );
+
+        // Verify the ordered block and ensure it passes
+        block_payload_store
+            .verify_payloads_against_ordered_block(&ordered_block)
+            .unwrap();
+
+        // Mark the first block payload as unverified
+        mark_payload_as_unverified(block_payload_store.clone(), &verified_blocks[0]);
+
+        // Verify the ordered block and ensure it fails (since the payloads are unverified)
+        let error = block_payload_store
+            .verify_payloads_against_ordered_block(&ordered_block)
+            .unwrap_err();
+        assert_matches!(error, Error::InvalidMessageError(_));
+
+        // Clear the block payload store
+        block_payload_store.clear_all_payloads();
+
+        // Verify the ordered block and ensure it fails (since the payloads are missing)
+        let error = block_payload_store
+            .verify_payloads_against_ordered_block(&ordered_block)
+            .unwrap_err();
+        assert_matches!(error, Error::InvalidMessageError(_));
+    }
+
+    #[test]
+    fn test_verify_payload_signatures_failure() {
+        // Create a new block payload store
+        let consensus_observer_config = ConsensusObserverConfig::default();
+        let mut block_payload_store = BlockPayloadStore::new(consensus_observer_config);
+
+        // Add some verified blocks for the current epoch
+        let current_epoch = 10;
+        let num_verified_blocks = 6;
+        create_and_add_blocks_to_store(
+            block_payload_store.clone(),
+            num_verified_blocks,
+            current_epoch,
+            true,
+        );
+
+        // Add some unverified blocks for the next epoch
+        let next_epoch = current_epoch + 1;
+        let num_unverified_blocks = 15;
+        let unverified_blocks = create_and_add_blocks_to_store(
+            block_payload_store.clone(),
+            num_unverified_blocks,
+            next_epoch,
+            false,
+        );
+
+        // Add some unverified blocks for a future epoch
+        let future_epoch = next_epoch + 1;
+        let num_future_blocks = 10;
+        let unverified_future_blocks = create_and_add_blocks_to_store(
+            block_payload_store.clone(),
+            num_future_blocks,
+            future_epoch,
+            false,
+        );
+
+        // Create an epoch state for the next epoch (with a non-empty verifier)
+        let validator_signer = ValidatorSigner::random(None);
+        let validator_consensus_info = ValidatorConsensusInfo::new(
+            validator_signer.author(),
+            validator_signer.public_key(),
+            100,
+        );
+        let validator_verifier = ValidatorVerifier::new(vec![validator_consensus_info]);
+        let epoch_state = EpochState::new(next_epoch, validator_verifier.clone());
+
+        // Verify the block payload signatures (for this epoch)
+        block_payload_store.verify_payload_signatures(&epoch_state);
+
+        // Ensure the unverified payloads were not verified
+        assert!(!block_payload_store.all_payloads_exist(&unverified_blocks));
+
+        // Ensure the unverified payloads were all removed (for this epoch)
+        assert_eq!(
+            get_num_unverified_payloads(&block_payload_store),
+            num_future_blocks
+        );
+
+        // Create an epoch state for the future epoch (with a non-empty verifier)
+        let epoch_state = EpochState::new(future_epoch, validator_verifier);
+
+        // Verify the block payload signatures (for the future epoch)
+        block_payload_store.verify_payload_signatures(&epoch_state);
+
+        // Ensure the future unverified payloads were not verified
+        assert!(!block_payload_store.all_payloads_exist(&unverified_future_blocks));
+
+        // Ensure the future unverified payloads were all removed (for the future epoch)
+        assert_eq!(get_num_unverified_payloads(&block_payload_store), 0);
+    }
+
+    /// Creates and adds the given number of blocks to the block payload store
+    fn create_and_add_blocks_to_store(
+        mut block_payload_store: BlockPayloadStore,
+        num_blocks: usize,
+        epoch: u64,
+        verified_payload_signatures: bool,
+    ) -> Vec<Arc<PipelinedBlock>> {
+        let mut pipelined_blocks = vec![];
+        for i in 0..num_blocks {
+            // Create the block info
+            let block_info = BlockInfo::new(
+                epoch,
+                i as Round,
+                HashValue::random(),
+                HashValue::random(),
+                i as Version,
+                i as u64,
+                None,
+            );
+
+            // Create the block transaction payload with proofs of store
+            let mut proofs_of_store = vec![];
+            for _ in 0..10 {
+                let batch_info = BatchInfo::new(
+                    PeerId::random(),
+                    BatchId::new(0),
+                    epoch,
+                    0,
+                    HashValue::random(),
+                    0,
+                    0,
+                    0,
+                );
+                proofs_of_store.push(ProofOfStore::new(batch_info, AggregateSignature::empty()));
+            }
+            let block_transaction_payload = BlockTransactionPayload::new_quorum_store_inline_hybrid(
+                vec![],
+                proofs_of_store.clone(),
+                None,
+                vec![],
+            );
+
+            // Insert the block payload into the store
+            let block_payload = BlockPayload::new(block_info.clone(), block_transaction_payload);
+            block_payload_store.insert_block_payload(block_payload, verified_payload_signatures);
+
+            // Create the block type
+            let payload = Payload::InQuorumStore(ProofWithData::new(proofs_of_store));
+            let block_type = BlockType::DAGBlock {
+                author: Author::random(),
+                failed_authors: vec![],
+                validator_txns: vec![],
+                payload,
+                node_digests: vec![],
+                parent_block_id: HashValue::random(),
+                parents_bitvec: BitVec::with_num_bits(0),
+            };
+
+            // Create the equivalent pipelined block
+            let block_data = BlockData::new_for_testing(
+                block_info.epoch(),
+                block_info.round(),
+                block_info.timestamp_usecs(),
+                QuorumCert::dummy(),
+                block_type,
+            );
+            let block = Block::new_for_testing(block_info.id(), block_data, None);
+            let pipelined_block = Arc::new(PipelinedBlock::new_ordered(block));
+
+            // Add the pipelined block to the list
+            pipelined_blocks.push(pipelined_block.clone());
+        }
+
+        pipelined_blocks
+    }
+
+    /// Checks the number of unverified payloads in the block payload store
+    fn check_num_unverified_payloads(
+        block_payload_store: &BlockPayloadStore,
+        expected_num_payloads: usize,
+    ) {
+        let num_payloads = get_num_unverified_payloads(block_payload_store);
+        assert_eq!(num_payloads, expected_num_payloads);
+    }
+
+    /// Checks the number of verified payloads in the block payload store
+    fn check_num_verified_payloads(
+        block_payload_store: &BlockPayloadStore,
+        expected_num_payloads: usize,
+    ) {
+        let num_payloads = get_num_verified_payloads(block_payload_store);
+        assert_eq!(num_payloads, expected_num_payloads);
+    }
+
+    /// Creates and returns a new ledger info with an empty signature set
+    fn create_empty_ledger_info(epoch: u64) -> LedgerInfoWithSignatures {
+        LedgerInfoWithSignatures::new(
+            LedgerInfo::new(BlockInfo::random_with_epoch(epoch, 0), HashValue::random()),
+            AggregateSignature::empty(),
+        )
+    }
+
+    /// Generates and returns a random number (u64)
+    pub fn get_random_u64() -> u64 {
+        OsRng.gen()
+    }
+
+    /// Returns the number of unverified payloads in the block payload store
+    fn get_num_unverified_payloads(block_payload_store: &BlockPayloadStore) -> usize {
+        let mut num_unverified_payloads = 0;
+        for (_, block_payload_status) in block_payload_store.block_payloads.lock().iter() {
+            if let BlockPayloadStatus::AvailableAndUnverified(_) = block_payload_status {
+                num_unverified_payloads += 1;
+            }
+        }
+        num_unverified_payloads
+    }
+
+    /// Returns the number of verified payloads in the block payload store
+    fn get_num_verified_payloads(block_payload_store: &BlockPayloadStore) -> usize {
+        let mut num_verified_payloads = 0;
+        for (_, block_payload_status) in block_payload_store.block_payloads.lock().iter() {
+            if let BlockPayloadStatus::AvailableAndVerified(_) = block_payload_status {
+                num_verified_payloads += 1;
+            }
+        }
+        num_verified_payloads
+    }
+
+    /// Marks the payload of the given block as unverified
+    fn mark_payload_as_unverified(
+        block_payload_store: BlockPayloadStore,
+        block: &Arc<PipelinedBlock>,
+    ) {
+        // Get the payload entry for the given block
+        let block_payloads = block_payload_store.get_block_payloads();
+        let mut block_payloads = block_payloads.lock();
+        let block_payload = block_payloads
+            .get_mut(&(block.epoch(), block.round()))
+            .unwrap();
+
+        // Mark the block payload as unverified
+        *block_payload = BlockPayloadStatus::AvailableAndUnverified(BlockPayload::new(
+            block.block_info(),
+            BlockTransactionPayload::empty(),
+        ));
+    }
+}
diff --git a/consensus/src/consensus_observer/pending_blocks.rs b/consensus/src/consensus_observer/pending_blocks.rs
new file mode 100644
index 0000000000000..1f6090e220989
--- /dev/null
+++ b/consensus/src/consensus_observer/pending_blocks.rs
@@ -0,0 +1,772 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::consensus_observer::{
+    logging::{LogEntry, LogSchema},
+    metrics,
+    network_message::OrderedBlock,
+    payload_store::BlockPayloadStore,
+};
+use aptos_config::config::ConsensusObserverConfig;
+use aptos_infallible::Mutex;
+use aptos_logger::{info, warn};
+use aptos_types::block_info::Round;
+use std::{
+    collections::{btree_map::Entry, BTreeMap},
+    sync::Arc,
+};
+
+/// A simple struct to hold blocks that are waiting for payloads
+#[derive(Clone)]
+pub struct PendingBlockStore {
+    // The configuration of the consensus observer
+    consensus_observer_config: ConsensusObserverConfig,
+
+    // A map of ordered blocks that are without payloads. The key is the
+    // (epoch, round) of the first block in the ordered block.
+    blocks_without_payloads: Arc<Mutex<BTreeMap<(u64, Round), OrderedBlock>>>,
+}
+
+impl PendingBlockStore {
+    pub fn new(consensus_observer_config: ConsensusObserverConfig) -> Self {
+        Self {
+            consensus_observer_config,
+            blocks_without_payloads: Arc::new(Mutex::new(BTreeMap::new())),
+        }
+    }
+
+    /// Clears all missing blocks from the store
+    pub fn clear_missing_blocks(&self) {
+        self.blocks_without_payloads.lock().clear();
+    }
+
+    /// Inserts a block (without payloads) into the store
+    pub fn insert_pending_block(&self, ordered_block: OrderedBlock) {
+        // Get the epoch and round of the first block
+        let first_block = ordered_block.first_block();
+        let first_block_epoch_round = (first_block.epoch(), first_block.round());
+
+        // Insert the block into the store using the round of the first block
+        match self
+            .blocks_without_payloads
+            .lock()
+            .entry(first_block_epoch_round)
+        {
+            Entry::Occupied(_) => {
+                // The block is already in the store
+                warn!(
+                    LogSchema::new(LogEntry::ConsensusObserver).message(&format!(
+                        "A pending block was already found for the given epoch and round: {:?}",
+                        first_block_epoch_round
+                    ))
+                );
+            },
+            Entry::Vacant(entry) => {
+                // Insert the block into the store
+                entry.insert(ordered_block);
+            },
+        }
+
+        // Perform garbage collection if the store is too large
+        self.garbage_collect_pending_blocks();
+    }
+
+    /// Garbage collects the pending blocks store by removing
+    /// the oldest blocks if the store is too large.
+    fn garbage_collect_pending_blocks(&self) {
+        // Calculate the number of blocks to remove
+        let mut blocks_without_payloads = self.blocks_without_payloads.lock();
+        let num_pending_blocks = blocks_without_payloads.len() as u64;
+        let max_pending_blocks = self.consensus_observer_config.max_num_pending_blocks;
+        let num_blocks_to_remove = num_pending_blocks.saturating_sub(max_pending_blocks);
+
+        // Remove the oldest blocks if the store is too large
+        for _ in 0..num_blocks_to_remove {
+            if let Some((oldest_epoch_round, _)) = blocks_without_payloads.pop_first() {
+                warn!(
+                    LogSchema::new(LogEntry::ConsensusObserver).message(&format!(
+                        "The pending block store is too large: {:?} blocks. Removing the block for the oldest epoch and round: {:?}",
+                        num_pending_blocks, oldest_epoch_round
+                    ))
+                );
+            }
+        }
+    }
+
+    /// Removes and returns the block from the store that is now ready
+    /// to be processed (after the new payload has been received).
+    pub fn remove_ready_block(
+        &self,
+        received_payload_epoch: u64,
+        received_payload_round: Round,
+        block_payload_store: &BlockPayloadStore,
+    ) -> Option<OrderedBlock> {
+        // Calculate the round at which to split the blocks
+        let split_round = received_payload_round.saturating_add(1);
+
+        // Split the blocks at the epoch and round
+        let mut blocks_without_payloads = self.blocks_without_payloads.lock();
+        let mut blocks_at_higher_rounds =
+            blocks_without_payloads.split_off(&(received_payload_epoch, split_round));
+
+        // Check if the last block is ready (this should be the only ready block).
+        // Any earlier blocks are considered out-of-date and will be dropped.
+        let mut ready_block = None;
+        if let Some((epoch_and_round, ordered_block)) = blocks_without_payloads.pop_last() {
+            // If all payloads exist for the block, then the block is ready
+            if block_payload_store.all_payloads_exist(ordered_block.blocks()) {
+                ready_block = Some(ordered_block);
+            } else {
+                // Otherwise, check if we're still waiting for higher payloads for the block
+                if ordered_block.last_block().round() > received_payload_round {
+                    blocks_at_higher_rounds.insert(epoch_and_round, ordered_block);
+                }
+            }
+        }
+
+        // Check if any out-of-date blocks were dropped
+        if !blocks_without_payloads.is_empty() {
+            info!(
+                LogSchema::new(LogEntry::ConsensusObserver).message(&format!(
+                    "Dropped {:?} out-of-date pending blocks before epoch and round: {:?}",
+                    blocks_without_payloads.len(),
+                    (received_payload_epoch, received_payload_round)
+                ))
+            );
+        }
+
+        // Update the pending blocks to only include the blocks at higher rounds
+        *blocks_without_payloads = blocks_at_higher_rounds;
+
+        // Return the ready block (if one exists)
+        ready_block
+    }
+
+    /// Updates the metrics for the pending blocks
+    pub fn update_pending_blocks_metrics(&self) {
+        // Update the number of pending block entries
+        let blocks_without_payloads = self.blocks_without_payloads.lock();
+        let num_entries = blocks_without_payloads.len() as u64;
+        metrics::set_gauge_with_label(
+            &metrics::OBSERVER_NUM_PROCESSED_BLOCKS,
+            metrics::PENDING_BLOCK_ENTRIES_LABEL,
+            num_entries,
+        );
+
+        // Update the total number of pending blocks
+        let num_pending_blocks = blocks_without_payloads
+            .values()
+            .map(|block| block.blocks().len() as u64)
+            .sum();
+        metrics::set_gauge_with_label(
+            &metrics::OBSERVER_NUM_PROCESSED_BLOCKS,
+            metrics::PENDING_BLOCKS_LABEL,
+            num_pending_blocks,
+        );
+
+        // Update the highest round for the pending blocks
+        let highest_pending_round = blocks_without_payloads
+            .last_key_value()
+            .map(|(_, pending_block)| pending_block.last_block().round())
+            .unwrap_or(0);
+        metrics::set_gauge_with_label(
+            &metrics::OBSERVER_PROCESSED_BLOCK_ROUNDS,
+            metrics::PENDING_BLOCKS_LABEL,
+            highest_pending_round,
+        );
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use crate::consensus_observer::network_message::{BlockPayload, BlockTransactionPayload};
+    use aptos_consensus_types::{
+        block::Block,
+        block_data::{BlockData, BlockType},
+        pipelined_block::PipelinedBlock,
+        quorum_cert::QuorumCert,
+    };
+    use aptos_crypto::HashValue;
+    use aptos_types::{
+        aggregate_signature::AggregateSignature,
+        block_info::BlockInfo,
+        ledger_info::{LedgerInfo, LedgerInfoWithSignatures},
+    };
+    use rand::Rng;
+
+    #[test]
+    fn test_clear_missing_blocks() {
+        // Create a new pending block store
+        let max_num_pending_blocks = 10;
+        let consensus_observer_config = ConsensusObserverConfig {
+            max_num_pending_blocks: max_num_pending_blocks as u64,
+            ..ConsensusObserverConfig::default()
+        };
+        let pending_block_store = PendingBlockStore::new(consensus_observer_config);
+
+        // Insert the maximum number of blocks into the store
+        let current_epoch = 0;
+        let starting_round = 0;
+        let missing_blocks = create_and_add_pending_blocks(
+            &pending_block_store,
+            max_num_pending_blocks,
+            current_epoch,
+            starting_round,
+            5,
+        );
+
+        // Verify that the store is not empty
+        verify_pending_blocks(
+            &pending_block_store,
+            max_num_pending_blocks,
+            &missing_blocks,
+        );
+
+        // Clear the missing blocks from the store
+        pending_block_store.clear_missing_blocks();
+
+        // Verify that the store is now empty
+        let blocks_without_payloads = pending_block_store.blocks_without_payloads.lock();
+        assert!(blocks_without_payloads.is_empty());
+    }
+
+    #[test]
+    fn test_insert_pending_block() {
+        // Create a new pending block store
+        let max_num_pending_blocks = 10;
+        let consensus_observer_config = ConsensusObserverConfig {
+            max_num_pending_blocks: max_num_pending_blocks as u64,
+            ..ConsensusObserverConfig::default()
+        };
+        let pending_block_store = PendingBlockStore::new(consensus_observer_config);
+
+        // Insert the maximum number of blocks into the store
+        let current_epoch = 0;
+        let starting_round = 0;
+        let pending_blocks = create_and_add_pending_blocks(
+            &pending_block_store,
+            max_num_pending_blocks,
+            current_epoch,
+            starting_round,
+            5,
+        );
+
+        // Verify that all blocks were inserted correctly
+        verify_pending_blocks(
+            &pending_block_store,
+            max_num_pending_blocks,
+            &pending_blocks,
+        );
+
+        // Insert the maximum number of blocks into the store again
+        let starting_round = (max_num_pending_blocks * 100) as Round;
+        let pending_blocks = create_and_add_pending_blocks(
+            &pending_block_store,
+            max_num_pending_blocks,
+            current_epoch,
+            starting_round,
+            5,
+        );
+
+        // Verify that all blocks were inserted correctly
+        verify_pending_blocks(
+            &pending_block_store,
+            max_num_pending_blocks,
+            &pending_blocks,
+        );
+
+        // Insert one more block into the store (for the next epoch)
+        let next_epoch = 1;
+        let starting_round = 0;
+        let new_pending_block =
+            create_and_add_pending_blocks(&pending_block_store, 1, next_epoch, starting_round, 5);
+
+        // Verify the new block was inserted correctly
+        verify_pending_blocks(
+            &pending_block_store,
+            max_num_pending_blocks,
+            &new_pending_block,
+        );
+    }
+
+    #[test]
+    fn test_garbage_collect_pending_blocks() {
+        // Create a new pending block store
+        let max_num_pending_blocks = 100;
+        let consensus_observer_config = ConsensusObserverConfig {
+            max_num_pending_blocks: max_num_pending_blocks as u64,
+            ..ConsensusObserverConfig::default()
+        };
+        let pending_block_store = PendingBlockStore::new(consensus_observer_config);
+
+        // Insert the maximum number of blocks into the store
+        let current_epoch = 0;
+        let starting_round = 200;
+        let mut pending_blocks = create_and_add_pending_blocks(
+            &pending_block_store,
+            max_num_pending_blocks,
+            current_epoch,
+            starting_round,
+            5,
+        );
+
+        // Verify that all blocks were inserted correctly
+        verify_pending_blocks(
+            &pending_block_store,
+            max_num_pending_blocks,
+            &pending_blocks,
+        );
+
+        // Insert multiple blocks into the store (one at a time) and
+        // verify that the oldest block is garbage collected each time.
+        for i in 0..20 {
+            // Insert one more block into the store
+            let starting_round = ((max_num_pending_blocks * 10) + (i * 100)) as Round;
+            let new_pending_block = create_and_add_pending_blocks(
+                &pending_block_store,
+                1,
+                current_epoch,
+                starting_round,
+                5,
+            );
+
+            // Verify the new block was inserted correctly
+            verify_pending_blocks(
+                &pending_block_store,
+                max_num_pending_blocks,
+                &new_pending_block,
+            );
+
+            // Get the round of the oldest block (that was garbage collected)
+            let oldest_block = pending_blocks.remove(0);
+            let oldest_block_round = oldest_block.first_block().round();
+
+            // Verify that the oldest block was garbage collected
+            let blocks_without_payloads = pending_block_store.blocks_without_payloads.lock();
+            assert!(!blocks_without_payloads.contains_key(&(current_epoch, oldest_block_round)));
+        }
+
+        // Insert multiple blocks into the store (for the next epoch) and
+        // verify that the oldest block is garbage collected each time.
+        let next_epoch = 1;
+        for i in 0..20 {
+            // Insert one more block into the store
+            let starting_round = i;
+            let new_pending_block = create_and_add_pending_blocks(
+                &pending_block_store,
+                1,
+                next_epoch,
+                starting_round,
+                5,
+            );
+
+            // Verify the new block was inserted correctly
+            verify_pending_blocks(
+                &pending_block_store,
+                max_num_pending_blocks,
+                &new_pending_block,
+            );
+
+            // Get the round of the oldest block (that was garbage collected)
+            let oldest_block = pending_blocks.remove(0);
+            let oldest_block_round = oldest_block.first_block().round();
+
+            // Verify that the oldest block was garbage collected
+            let blocks_without_payloads = pending_block_store.blocks_without_payloads.lock();
+            assert!(!blocks_without_payloads.contains_key(&(current_epoch, oldest_block_round)));
+        }
+    }
+
+    #[test]
+    fn test_remove_ready_block_multiple_blocks() {
+        // Create a new pending block store
+        let max_num_pending_blocks = 40;
+        let consensus_observer_config = ConsensusObserverConfig {
+            max_num_pending_blocks: max_num_pending_blocks as u64,
+            ..ConsensusObserverConfig::default()
+        };
+        let pending_block_store = PendingBlockStore::new(consensus_observer_config);
+
+        // Insert the maximum number of blocks into the store
+        let current_epoch = 0;
+        let starting_round = 0;
+        let pending_blocks = create_and_add_pending_blocks(
+            &pending_block_store,
+            max_num_pending_blocks,
+            current_epoch,
+            starting_round,
+            5,
+        );
+
+        // Create a new block payload store and insert payloads for the second block
+        let mut block_payload_store = BlockPayloadStore::new(consensus_observer_config);
+        let second_block = pending_blocks[1].clone();
+        insert_payloads_for_ordered_block(&mut block_payload_store, &second_block);
+
+        // Remove the second block (which is now ready)
+        let payload_round = second_block.first_block().round();
+        let ready_block = pending_block_store.remove_ready_block(
+            current_epoch,
+            payload_round,
+            &block_payload_store,
+        );
+        assert_eq!(ready_block, Some(second_block));
+
+        // Verify that the first and second blocks were removed
+        verify_pending_blocks(
+            &pending_block_store,
+            max_num_pending_blocks - 2,
+            &pending_blocks[2..].to_vec(),
+        );
+
+        // Insert payloads for the last block
+        let last_block = pending_blocks.last().unwrap().clone();
+        insert_payloads_for_ordered_block(&mut block_payload_store, &last_block);
+
+        // Remove the last block (which is now ready)
+        let payload_round = last_block.first_block().round();
+        let ready_block = pending_block_store.remove_ready_block(
+            current_epoch,
+            payload_round,
+            &block_payload_store,
+        );
+
+        // Verify that the last block was removed
+        assert_eq!(ready_block, Some(last_block));
+
+        // Verify that the store is empty
+        verify_pending_blocks(&pending_block_store, 0, &vec![]);
+    }
+
+    #[test]
+    fn test_remove_ready_block_multiple_blocks_missing() {
+        // Create a new pending block store
+        let max_num_pending_blocks = 10;
+        let consensus_observer_config = ConsensusObserverConfig {
+            max_num_pending_blocks: max_num_pending_blocks as u64,
+            ..ConsensusObserverConfig::default()
+        };
+        let pending_block_store = PendingBlockStore::new(consensus_observer_config);
+
+        // Insert the maximum number of blocks into the store
+        let current_epoch = 10;
+        let starting_round = 100;
+        let pending_blocks = create_and_add_pending_blocks(
+            &pending_block_store,
+            max_num_pending_blocks,
+            current_epoch,
+            starting_round,
+            5,
+        );
+
+        // Create an empty block payload store
+        let mut block_payload_store = BlockPayloadStore::new(consensus_observer_config);
+
+        // Incrementally insert and process each payload for the first block
+        let first_block = pending_blocks.first().unwrap().clone();
+        for block in first_block.blocks().clone() {
+            // Insert the block
+            let block_payload =
+                BlockPayload::new(block.block_info(), BlockTransactionPayload::empty());
+            block_payload_store.insert_block_payload(block_payload, true);
+
+            // Attempt to remove the block (which might not be ready)
+            let payload_round = block.round();
+            let ready_block = pending_block_store.remove_ready_block(
+                current_epoch,
+                payload_round,
+                &block_payload_store,
+            );
+
+            // If the block is ready, verify that it was removed.
+            // Otherwise, verify that the block still remains.
+            if payload_round == first_block.last_block().round() {
+                // The block should be ready
+                assert_eq!(ready_block, Some(first_block.clone()));
+
+                // Verify that the block was removed
+                verify_pending_blocks(
+                    &pending_block_store,
+                    max_num_pending_blocks - 1,
+                    &pending_blocks[1..].to_vec(),
+                );
+            } else {
+                // The block should not be ready
+                assert!(ready_block.is_none());
+
+                // Verify that the block still remains
+                verify_pending_blocks(
+                    &pending_block_store,
+                    max_num_pending_blocks,
+                    &pending_blocks,
+                );
+            }
+        }
+
+        // Incrementally insert and process payloads for the last block (except one)
+        let last_block = pending_blocks.last().unwrap().clone();
+        for block in last_block.blocks().clone() {
+            // Insert the block only if this is not the first block
+            let payload_round = block.round();
+            if payload_round != last_block.first_block().round() {
+                let block_payload =
+                    BlockPayload::new(block.block_info(), BlockTransactionPayload::empty());
+                block_payload_store.insert_block_payload(block_payload, true);
+            }
+
+            // Attempt to remove the block (which might not be ready)
+            let ready_block = pending_block_store.remove_ready_block(
+                current_epoch,
+                payload_round,
+                &block_payload_store,
+            );
+
+            // The block should not be ready
+            assert!(ready_block.is_none());
+
+            // Verify that the block still remains or has been removed on the last insert
+            if payload_round == last_block.last_block().round() {
+                verify_pending_blocks(&pending_block_store, 0, &vec![]);
+            } else {
+                verify_pending_blocks(&pending_block_store, 1, &vec![last_block.clone()]);
+            }
+        }
+
+        // Verify that the store is now empty
+        verify_pending_blocks(&pending_block_store, 0, &vec![]);
+    }
+
+    #[test]
+    fn test_remove_ready_block_singular_blocks() {
+        // Create a new pending block store
+        let max_num_pending_blocks = 10;
+        let consensus_observer_config = ConsensusObserverConfig {
+            max_num_pending_blocks: max_num_pending_blocks as u64,
+            ..ConsensusObserverConfig::default()
+        };
+        let pending_block_store = PendingBlockStore::new(consensus_observer_config);
+
+        // Insert the maximum number of blocks into the store
+        let current_epoch = 0;
+        let starting_round = 0;
+        let pending_blocks = create_and_add_pending_blocks(
+            &pending_block_store,
+            max_num_pending_blocks,
+            current_epoch,
+            starting_round,
+            1,
+        );
+
+        // Create a new block payload store and insert payloads for the first block
+        let mut block_payload_store = BlockPayloadStore::new(consensus_observer_config);
+        let first_block = pending_blocks.first().unwrap().clone();
+        insert_payloads_for_ordered_block(&mut block_payload_store, &first_block);
+
+        // Remove the first block (which is now ready)
+        let payload_round = first_block.first_block().round();
+        let ready_block = pending_block_store.remove_ready_block(
+            current_epoch,
+            payload_round,
+            &block_payload_store,
+        );
+        assert_eq!(ready_block, Some(first_block));
+
+        // Verify that the first block was removed
+        verify_pending_blocks(
+            &pending_block_store,
+            max_num_pending_blocks - 1,
+            &pending_blocks[1..].to_vec(),
+        );
+
+        // Insert payloads for the second block
+        let second_block = pending_blocks[1].clone();
+        insert_payloads_for_ordered_block(&mut block_payload_store, &second_block);
+
+        // Remove the second block (which is now ready)
+        let payload_round = second_block.first_block().round();
+        let ready_block = pending_block_store.remove_ready_block(
+            current_epoch,
+            payload_round,
+            &block_payload_store,
+        );
+        assert_eq!(ready_block, Some(second_block));
+
+        // Verify that the first and second blocks were removed
+        verify_pending_blocks(
+            &pending_block_store,
+            max_num_pending_blocks - 2,
+            &pending_blocks[2..].to_vec(),
+        );
+
+        // Insert payloads for the last block
+        let last_block = pending_blocks.last().unwrap().clone();
+        insert_payloads_for_ordered_block(&mut block_payload_store, &last_block);
+
+        // Remove the last block (which is now ready)
+        let payload_round = last_block.first_block().round();
+        let ready_block = pending_block_store.remove_ready_block(
+            current_epoch,
+            payload_round,
+            &block_payload_store,
+        );
+
+        // Verify that the last block was removed
+        assert_eq!(ready_block, Some(last_block));
+
+        // Verify that the store is empty
+        verify_pending_blocks(&pending_block_store, 0, &vec![]);
+    }
+
+    #[test]
+    fn test_remove_ready_block_singular_blocks_missing() {
+        // Create a new pending block store
+        let max_num_pending_blocks = 100;
+        let consensus_observer_config = ConsensusObserverConfig {
+            max_num_pending_blocks: max_num_pending_blocks as u64,
+            ..ConsensusObserverConfig::default()
+        };
+        let pending_block_store = PendingBlockStore::new(consensus_observer_config);
+
+        // Insert the maximum number of blocks into the store
+        let current_epoch = 10;
+        let starting_round = 100;
+        let pending_blocks = create_and_add_pending_blocks(
+            &pending_block_store,
+            max_num_pending_blocks,
+            current_epoch,
+            starting_round,
+            1,
+        );
+
+        // Create an empty block payload store
+        let block_payload_store = BlockPayloadStore::new(consensus_observer_config);
+
+        // Remove the third block (which is not ready)
+        let third_block = pending_blocks[2].clone();
+        let third_block_round = third_block.first_block().round();
+        let ready_block = pending_block_store.remove_ready_block(
+            current_epoch,
+            third_block_round,
+            &block_payload_store,
+        );
+        assert!(ready_block.is_none());
+
+        // Verify that the first three blocks were removed
+        verify_pending_blocks(
+            &pending_block_store,
+            max_num_pending_blocks - 3,
+            &pending_blocks[3..].to_vec(),
+        );
+
+        // Remove the last block (which is not ready)
+        let last_block = pending_blocks.last().unwrap().clone();
+        let last_block_round = last_block.first_block().round();
+        let ready_block = pending_block_store.remove_ready_block(
+            current_epoch,
+            last_block_round,
+            &block_payload_store,
+        );
+        assert!(ready_block.is_none());
+
+        // Verify that the store is now empty
+        verify_pending_blocks(&pending_block_store, 0, &vec![]);
+    }
+
+    /// Creates and adds the specified number of blocks to the pending block store
+    fn create_and_add_pending_blocks(
+        pending_block_store: &PendingBlockStore,
+        num_pending_blocks: usize,
+        epoch: u64,
+        starting_round: Round,
+        max_pipelined_blocks: u64,
+    ) -> Vec<OrderedBlock> {
+        let mut pending_blocks = vec![];
+        for i in 0..num_pending_blocks {
+            // Create the pipelined blocks
+            let num_pipelined_blocks = rand::thread_rng().gen_range(1, max_pipelined_blocks + 1);
+            let mut pipelined_blocks = vec![];
+            for j in 0..num_pipelined_blocks {
+                // Calculate the block round
+                let round = starting_round + ((i as Round) * max_pipelined_blocks) + j; // Ensure gaps between blocks
+
+                // Create a new block info
+                let block_info = BlockInfo::new(
+                    epoch,
+                    round,
+                    HashValue::random(),
+                    HashValue::random(),
+                    round,
+                    i as u64,
+                    None,
+                );
+
+                // Create the pipelined block
+                let block_data = BlockData::new_for_testing(
+                    block_info.epoch(),
+                    block_info.round(),
+                    block_info.timestamp_usecs(),
+                    QuorumCert::dummy(),
+                    BlockType::Genesis,
+                );
+                let block = Block::new_for_testing(block_info.id(), block_data, None);
+                let pipelined_block = Arc::new(PipelinedBlock::new_ordered(block));
+
+                // Add the pipelined block to the list
+                pipelined_blocks.push(pipelined_block);
+            }
+
+            // Create an ordered block
+            let ordered_proof = LedgerInfoWithSignatures::new(
+                LedgerInfo::new(
+                    BlockInfo::random_with_epoch(epoch, starting_round),
+                    HashValue::random(),
+                ),
+                AggregateSignature::empty(),
+            );
+            let ordered_block = OrderedBlock::new(pipelined_blocks, ordered_proof.clone());
+
+            // Insert the ordered block into the pending block store
+            pending_block_store.insert_pending_block(ordered_block.clone());
+
+            // Add the ordered block to the pending blocks
+            pending_blocks.push(ordered_block);
+        }
+
+        pending_blocks
+    }
+
+    /// Inserts payloads into the payload store for the ordered block
+    fn insert_payloads_for_ordered_block(
+        block_payload_store: &mut BlockPayloadStore,
+        ordered_block: &OrderedBlock,
+    ) {
+        for block in ordered_block.blocks() {
+            let block_payload =
+                BlockPayload::new(block.block_info(), BlockTransactionPayload::empty());
+            block_payload_store.insert_block_payload(block_payload, true);
+        }
+    }
+
+    /// Verifies that the pending block store contains the expected blocks
+    fn verify_pending_blocks(
+        pending_block_store: &PendingBlockStore,
+        num_expected_blocks: usize,
+        pending_blocks: &Vec<OrderedBlock>,
+    ) {
+        // Check the number of pending blocks
+        let blocks_without_payloads = pending_block_store.blocks_without_payloads.lock();
+        assert_eq!(blocks_without_payloads.len(), num_expected_blocks);
+
+        // Check that all pending blocks are in the store
+        for pending_block in pending_blocks {
+            let first_block = pending_block.first_block();
+            assert_eq!(
+                blocks_without_payloads
+                    .get(&(first_block.epoch(), first_block.round()))
+                    .unwrap(),
+                pending_block
+            );
+        }
+    }
+}
diff --git a/consensus/src/consensus_observer/publisher.rs b/consensus/src/consensus_observer/publisher.rs
index db0b06dcb7a55..4436fda4ebed4 100644
--- a/consensus/src/consensus_observer/publisher.rs
+++ b/consensus/src/consensus_observer/publisher.rs
@@ -1,46 +1,603 @@
 // Copyright © Aptos Foundation
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::consensus_observer::network::ObserverMessage;
-use aptos_config::network_id::PeerNetworkId;
-use aptos_logger::info;
-use aptos_network::application::interface::{NetworkClient, NetworkClientInterface};
+use crate::consensus_observer::{
+    logging::{LogEntry, LogEvent, LogSchema},
+    metrics,
+    network_client::ConsensusObserverClient,
+    network_events::ResponseSender,
+    network_message::{
+        ConsensusObserverDirectSend, ConsensusObserverMessage, ConsensusObserverRequest,
+        ConsensusObserverResponse,
+    },
+};
+use aptos_config::{config::ConsensusObserverConfig, network_id::PeerNetworkId};
+use aptos_infallible::RwLock;
+use aptos_logger::{info, warn};
+use aptos_network::application::interface::NetworkClient;
+use futures::{SinkExt, StreamExt};
+use futures_channel::mpsc;
+use std::{collections::HashSet, sync::Arc, time::Duration};
+use tokio::time::interval;
+use tokio_stream::wrappers::IntervalStream;
 
-/// Publish updates to downstream observers.
+/// The consensus publisher sends consensus updates to downstream observers
 #[derive(Clone)]
-pub struct Publisher {
-    network_client: NetworkClient<ObserverMessage>,
+pub struct ConsensusPublisher {
+    // The consensus observer client to send network messages
+    consensus_observer_client:
+        Arc<ConsensusObserverClient<NetworkClient<ConsensusObserverMessage>>>,
+
+    // The configuration for the consensus observer
+    consensus_observer_config: ConsensusObserverConfig,
+
+    // The set of active subscribers that have subscribed to consensus updates
+    active_subscribers: Arc<RwLock<HashSet<PeerNetworkId>>>,
+
+    // The sender for outbound network messages
+    outbound_message_sender: mpsc::Sender<(PeerNetworkId, ConsensusObserverDirectSend)>,
 }
 
-impl Publisher {
-    pub fn new(network_client: NetworkClient<ObserverMessage>) -> Self {
-        Self { network_client }
-    }
-
-    fn get_downstream_peers(&self) -> Vec<PeerNetworkId> {
-        if let Ok(peers) = self
-            .network_client
-            .get_peers_and_metadata()
-            .get_connected_peers_and_metadata()
-        {
-            peers
-                .into_iter()
-                .filter(|(key, value)| {
-                    !key.network_id().is_validator_network()
-                        && !value.get_connection_metadata().is_outbound_connection()
+impl ConsensusPublisher {
+    pub fn new(
+        network_client: NetworkClient<ConsensusObserverMessage>,
+        consensus_observer_config: ConsensusObserverConfig,
+    ) -> (
+        Self,
+        mpsc::Receiver<(PeerNetworkId, ConsensusObserverDirectSend)>,
+    ) {
+        // Create the outbound message sender and receiver
+        let max_network_channel_size = consensus_observer_config.max_network_channel_size as usize;
+        let (outbound_message_sender, outbound_message_receiver) =
+            mpsc::channel(max_network_channel_size);
+
+        // Create the consensus publisher
+        let consensus_publisher = Self {
+            consensus_observer_client: Arc::new(ConsensusObserverClient::new(network_client)),
+            consensus_observer_config,
+            active_subscribers: Arc::new(RwLock::new(HashSet::new())),
+            outbound_message_sender,
+        };
+
+        // Return the publisher and the outbound message receiver
+        (consensus_publisher, outbound_message_receiver)
+    }
+
+    /// Garbage collect inactive subscriptions by removing peers that are no longer connected
+    fn garbage_collect_subscriptions(&self) {
+        // Get the set of active subscribers
+        let active_subscribers = self.active_subscribers.read().clone();
+
+        // Get the connected peers and metadata
+        let peers_and_metadata = self.consensus_observer_client.get_peers_and_metadata();
+        let connected_peers_and_metadata =
+            match peers_and_metadata.get_connected_peers_and_metadata() {
+                Ok(connected_peers_and_metadata) => connected_peers_and_metadata,
+                Err(error) => {
+                    // We failed to get the connected peers and metadata
+                    warn!(LogSchema::new(LogEntry::ConsensusPublisher)
+                        .event(LogEvent::UnexpectedError)
+                        .message(&format!(
+                            "Failed to get connected peers and metadata! Error: {:?}",
+                            error
+                        )));
+                    return;
+                },
+            };
+
+        // Identify the active subscribers that are no longer connected
+        let connected_peers: HashSet<PeerNetworkId> =
+            connected_peers_and_metadata.keys().cloned().collect();
+        let disconnected_subscribers: HashSet<PeerNetworkId> = active_subscribers
+            .difference(&connected_peers)
+            .cloned()
+            .collect();
+
+        // Remove any subscriptions from peers that are no longer connected
+        for peer_network_id in &disconnected_subscribers {
+            self.active_subscribers.write().remove(peer_network_id);
+            info!(LogSchema::new(LogEntry::ConsensusPublisher)
+                .event(LogEvent::Subscription)
+                .message(&format!(
+                    "Removed peer subscription due to disconnection! Peer: {:?}",
+                    peer_network_id
+                )));
+        }
+
+        // Update the number of active subscribers for each network
+        let active_subscribers = self.active_subscribers.read().clone();
+        for network_id in peers_and_metadata.get_registered_networks() {
+            // Calculate the number of active subscribers for the network
+            let num_active_subscribers = active_subscribers
+                .iter()
+                .filter(|peer_network_id| peer_network_id.network_id() == network_id)
+                .count() as i64;
+
+            // Update the active subscriber metric
+            metrics::set_gauge(
+                &metrics::PUBLISHER_NUM_ACTIVE_SUBSCRIBERS,
+                &network_id,
+                num_active_subscribers,
+            );
+        }
+    }
+
+    /// Returns a clone of the currently active subscribers
+    pub fn get_active_subscribers(&self) -> HashSet<PeerNetworkId> {
+        self.active_subscribers.read().clone()
+    }
+
+    /// Returns a copy of the consensus observer client
+    pub fn get_consensus_observer_client(
+        &self,
+    ) -> Arc<ConsensusObserverClient<NetworkClient<ConsensusObserverMessage>>> {
+        self.consensus_observer_client.clone()
+    }
+
+    /// Handles a subscription message from a peer
+    pub fn handle_subscription_request(
+        &self,
+        peer_network_id: &PeerNetworkId,
+        request: ConsensusObserverRequest,
+        response_sender: ResponseSender,
+    ) {
+        // Update the RPC request counter
+        metrics::increment_request_counter(
+            &metrics::PUBLISHER_RECEIVED_REQUESTS,
+            request.get_label(),
+            peer_network_id,
+        );
+
+        // Handle the request
+        match request {
+            ConsensusObserverRequest::Subscribe => {
+                // Add the peer to the set of active subscribers
+                self.active_subscribers.write().insert(*peer_network_id);
+                info!(LogSchema::new(LogEntry::ConsensusPublisher)
+                    .event(LogEvent::Subscription)
+                    .message(&format!(
+                        "New peer subscribed to consensus updates! Peer: {:?}",
+                        peer_network_id
+                    )));
+
+                // Send a simple subscription ACK
+                response_sender.send(ConsensusObserverResponse::SubscribeAck);
+            },
+            ConsensusObserverRequest::Unsubscribe => {
+                // Remove the peer from the set of active subscribers
+                self.active_subscribers.write().remove(peer_network_id);
+                info!(LogSchema::new(LogEntry::ConsensusPublisher)
+                    .event(LogEvent::Subscription)
+                    .message(&format!(
+                        "Peer unsubscribed from consensus updates! Peer: {:?}",
+                        peer_network_id
+                    )));
+
+                // Send a simple unsubscription ACK
+                response_sender.send(ConsensusObserverResponse::UnsubscribeAck);
+            },
+        }
+    }
+
+    /// Publishes a direct send message to all active subscribers
+    pub async fn publish_message(&self, message: ConsensusObserverDirectSend) {
+        // Get the set of active subscribers
+        let active_subscribers = self.active_subscribers.read().clone();
+
+        // Send the message to all active subscribers
+        for peer_network_id in &active_subscribers {
+            // Send the message to the outbound receiver for publishing
+            let mut outbound_message_sender = self.outbound_message_sender.clone();
+            if let Err(error) = outbound_message_sender
+                .send((*peer_network_id, message.clone()))
+                .await
+            {
+                // The message send failed
+                warn!(LogSchema::new(LogEntry::ConsensusPublisher)
+                    .event(LogEvent::SendDirectSendMessage)
+                    .message(&format!(
+                        "Failed to send outbound message to the receiver for peer {:?}! Error: {:?}",
+                        peer_network_id, error
+                    )));
+            }
+        }
+    }
+
+    /// Starts the consensus publisher
+    pub async fn start(
+        self,
+        outbound_message_receiver: mpsc::Receiver<(PeerNetworkId, ConsensusObserverDirectSend)>,
+    ) {
+        // Spawn the message serializer and sender
+        spawn_message_serializer_and_sender(
+            self.consensus_observer_client.clone(),
+            self.consensus_observer_config,
+            outbound_message_receiver,
+        );
+
+        // Create a garbage collection ticker
+        let mut garbage_collection_interval = IntervalStream::new(interval(Duration::from_millis(
+            self.consensus_observer_config
+                .garbage_collection_interval_ms,
+        )))
+        .fuse();
+
+        // Start the publisher garbage collection loop
+        info!(LogSchema::new(LogEntry::ConsensusPublisher)
+            .message("Starting the consensus publisher garbage collection loop!"));
+        loop {
+            tokio::select! {
+                _ = garbage_collection_interval.select_next_some() => {
+                    // Perform garbage collection
+                    self.garbage_collect_subscriptions();
+                },
+            }
+        }
+    }
+}
+
+/// Spawns a message serialization task that serializes outbound publisher
+/// messages in parallel but guarantees in order sends to the receiver.
+fn spawn_message_serializer_and_sender(
+    consensus_observer_client: Arc<
+        ConsensusObserverClient<NetworkClient<ConsensusObserverMessage>>,
+    >,
+    consensus_observer_config: ConsensusObserverConfig,
+    outbound_message_receiver: mpsc::Receiver<(PeerNetworkId, ConsensusObserverDirectSend)>,
+) {
+    tokio::spawn(async move {
+        // Create the message serialization task
+        let consensus_observer_client_clone = consensus_observer_client.clone();
+        let serialization_task =
+            outbound_message_receiver.map(move |(peer_network_id, message)| {
+                // Spawn a new blocking task to serialize the message
+                let consensus_observer_client_clone = consensus_observer_client_clone.clone();
+                tokio::task::spawn_blocking(move || {
+                    let message_label = message.get_label();
+                    let serialized_message = consensus_observer_client_clone
+                        .serialize_message_for_peer(&peer_network_id, message);
+                    (peer_network_id, serialized_message, message_label)
                 })
-                .map(|(key, _)| key)
-                .collect()
-        } else {
-            vec![]
+            });
+
+        // Execute the serialization task with in-order buffering
+        let consensus_observer_client_clone = consensus_observer_client.clone();
+        serialization_task
+            .buffered(consensus_observer_config.max_parallel_serialization_tasks)
+            .map(|serialization_result| {
+                // Attempt to send the serialized message to the peer
+                match serialization_result {
+                    Ok((peer_network_id, serialized_message, message_label)) => {
+                        match serialized_message {
+                            Ok(serialized_message) => {
+                                // Send the serialized message to the peer
+                                if let Err(error) = consensus_observer_client_clone
+                                    .send_serialized_message_to_peer(
+                                        &peer_network_id,
+                                        serialized_message,
+                                        message_label,
+                                    )
+                                {
+                                    // We failed to send the message
+                                    warn!(LogSchema::new(LogEntry::ConsensusPublisher)
+                                        .event(LogEvent::SendDirectSendMessage)
+                                        .message(&format!(
+                                            "Failed to send message to peer: {:?}. Error: {:?}",
+                                            peer_network_id, error
+                                        )));
+                                }
+                            },
+                            Err(error) => {
+                                // We failed to serialize the message
+                                warn!(LogSchema::new(LogEntry::ConsensusPublisher)
+                                    .event(LogEvent::SendDirectSendMessage)
+                                    .message(&format!(
+                                        "Failed to serialize message for peer: {:?}. Error: {:?}",
+                                        peer_network_id, error
+                                    )));
+                            },
+                        }
+                    },
+                    Err(error) => {
+                        // We failed to spawn the serialization task
+                        warn!(LogSchema::new(LogEntry::ConsensusPublisher)
+                            .event(LogEvent::SendDirectSendMessage)
+                            .message(&format!("Failed to spawn the serializer task: {:?}", error)));
+                    },
+                }
+            })
+            .collect::<()>()
+            .await;
+    });
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use crate::consensus_observer::network_message::BlockTransactionPayload;
+    use aptos_config::network_id::NetworkId;
+    use aptos_crypto::HashValue;
+    use aptos_network::{
+        application::{metadata::ConnectionState, storage::PeersAndMetadata},
+        transport::ConnectionMetadata,
+    };
+    use aptos_types::{
+        aggregate_signature::AggregateSignature,
+        block_info::BlockInfo,
+        ledger_info::{LedgerInfo, LedgerInfoWithSignatures},
+        PeerId,
+    };
+    use futures::FutureExt;
+    use maplit::hashmap;
+    use tokio_stream::StreamExt;
+
+    #[test]
+    pub fn test_garbage_collect_subscriptions() {
+        // Create a network client
+        let network_id = NetworkId::Public;
+        let peers_and_metadata = PeersAndMetadata::new(&[network_id]);
+        let network_client =
+            NetworkClient::new(vec![], vec![], hashmap![], peers_and_metadata.clone());
+
+        // Create a consensus publisher
+        let (consensus_publisher, _) =
+            ConsensusPublisher::new(network_client, ConsensusObserverConfig::default());
+
+        // Add a peer to the peers and metadata
+        let peer_network_id_1 = PeerNetworkId::new(network_id, PeerId::random());
+        let connection_metadata = ConnectionMetadata::mock(peer_network_id_1.peer_id());
+        peers_and_metadata
+            .insert_connection_metadata(peer_network_id_1, connection_metadata)
+            .unwrap();
+
+        // Add the peer to the active subscribers
+        process_subscription_for_peer(&consensus_publisher, &peer_network_id_1);
+
+        // Garbage collect the subscriptions and verify that the peer is still an active subscriber
+        consensus_publisher.garbage_collect_subscriptions();
+        verify_active_subscribers(&consensus_publisher, 1, vec![&peer_network_id_1], vec![]);
+
+        // Add another peer to the active subscribers
+        let peer_network_id_2 = PeerNetworkId::new(network_id, PeerId::random());
+        process_subscription_for_peer(&consensus_publisher, &peer_network_id_2);
+
+        // Garbage collect the subscriptions and verify that the second peer
+        // is removed but not the first (we have no metadata for the second peer).
+        consensus_publisher.garbage_collect_subscriptions();
+        verify_active_subscribers(&consensus_publisher, 1, vec![&peer_network_id_1], vec![
+            &peer_network_id_2,
+        ]);
+
+        // Add another peer to the peers and metadata
+        let peer_network_id_3 = PeerNetworkId::new(network_id, PeerId::random());
+        let connection_metadata = ConnectionMetadata::mock(peer_network_id_3.peer_id());
+        peers_and_metadata
+            .insert_connection_metadata(peer_network_id_3, connection_metadata)
+            .unwrap();
+
+        // Add the peer to the active subscribers
+        process_subscription_for_peer(&consensus_publisher, &peer_network_id_3);
+
+        // Garbage collect the subscriptions and verify that both peers are active
+        consensus_publisher.garbage_collect_subscriptions();
+        verify_active_subscribers(
+            &consensus_publisher,
+            2,
+            vec![&peer_network_id_1, &peer_network_id_3],
+            vec![],
+        );
+
+        // Update the connection state for the first peer (to disconnected)
+        peers_and_metadata
+            .update_connection_state(peer_network_id_1, ConnectionState::Disconnected)
+            .unwrap();
+
+        // Garbage collect the subscriptions and verify that the first peer is removed
+        consensus_publisher.garbage_collect_subscriptions();
+        verify_active_subscribers(&consensus_publisher, 1, vec![&peer_network_id_3], vec![
+            &peer_network_id_1,
+        ]);
+    }
+
+    #[test]
+    fn test_handle_subscription_request() {
+        // Create a network client
+        let network_id = NetworkId::Public;
+        let peers_and_metadata = PeersAndMetadata::new(&[network_id]);
+        let network_client =
+            NetworkClient::new(vec![], vec![], hashmap![], peers_and_metadata.clone());
+
+        // Create a consensus publisher
+        let (consensus_publisher, _) =
+            ConsensusPublisher::new(network_client, ConsensusObserverConfig::default());
+
+        // Subscribe a new peer to consensus updates and verify the subscription
+        let peer_network_id_1 = PeerNetworkId::new(network_id, PeerId::random());
+        process_subscription_for_peer(&consensus_publisher, &peer_network_id_1);
+        verify_active_subscribers(&consensus_publisher, 1, vec![&peer_network_id_1], vec![]);
+
+        // Subscribe the same peer again and verify that the subscription is still active
+        process_subscription_for_peer(&consensus_publisher, &peer_network_id_1);
+        verify_active_subscribers(&consensus_publisher, 1, vec![&peer_network_id_1], vec![]);
+
+        // Subscribe another peer to consensus updates and verify the subscription
+        let peer_network_id_2 = PeerNetworkId::new(network_id, PeerId::random());
+        process_subscription_for_peer(&consensus_publisher, &peer_network_id_2);
+        verify_active_subscribers(
+            &consensus_publisher,
+            2,
+            vec![&peer_network_id_1, &peer_network_id_2],
+            vec![],
+        );
+
+        // Unsubscribe the first peer from consensus updates and verify the unsubscription
+        process_unsubscription_for_peer(&consensus_publisher, &peer_network_id_1);
+        verify_active_subscribers(&consensus_publisher, 1, vec![&peer_network_id_2], vec![
+            &peer_network_id_1,
+        ]);
+
+        // Unsubscribe the first peer again and verify that the subscription is removed
+        process_unsubscription_for_peer(&consensus_publisher, &peer_network_id_1);
+        verify_active_subscribers(&consensus_publisher, 1, vec![&peer_network_id_2], vec![
+            &peer_network_id_1,
+        ]);
+
+        // Unsubscribe the second peer and verify that the subscription is removed
+        process_unsubscription_for_peer(&consensus_publisher, &peer_network_id_2);
+        verify_active_subscribers(&consensus_publisher, 0, vec![], vec![
+            &peer_network_id_1,
+            &peer_network_id_2,
+        ]);
+    }
+
+    #[tokio::test]
+    async fn test_publish_message() {
+        // Create a network client
+        let network_id = NetworkId::Public;
+        let peers_and_metadata = PeersAndMetadata::new(&[network_id]);
+        let network_client =
+            NetworkClient::new(vec![], vec![], hashmap![], peers_and_metadata.clone());
+
+        // Create a consensus publisher
+        let (consensus_publisher, mut outbound_message_receiver) =
+            ConsensusPublisher::new(network_client, ConsensusObserverConfig::default());
+
+        // Subscribe a new peer to consensus updates
+        let peer_network_id_1 = PeerNetworkId::new(network_id, PeerId::random());
+        process_subscription_for_peer(&consensus_publisher, &peer_network_id_1);
+
+        // Publish a message to the active subscribers
+        let ordered_block_message = ConsensusObserverMessage::new_ordered_block_message(
+            vec![],
+            LedgerInfoWithSignatures::new(
+                LedgerInfo::new(BlockInfo::empty(), HashValue::zero()),
+                AggregateSignature::empty(),
+            ),
+        );
+        consensus_publisher
+            .publish_message(ordered_block_message.clone())
+            .await;
+
+        // Verify that the message was sent to the outbound message receiver
+        let (peer_network_id, message) = outbound_message_receiver.next().await.unwrap();
+        assert_eq!(peer_network_id, peer_network_id_1);
+        assert_eq!(message, ordered_block_message);
+
+        // Add several peers to the active subscribers
+        let mut additional_peer_network_ids = vec![];
+        for _ in 0..10 {
+            let peer_network_id = PeerNetworkId::new(network_id, PeerId::random());
+            process_subscription_for_peer(&consensus_publisher, &peer_network_id);
+            additional_peer_network_ids.push(peer_network_id);
+        }
+
+        // Publish a message to the active subscribers
+        let transaction_payload = BlockTransactionPayload::new_quorum_store_inline_hybrid(
+            vec![],
+            vec![],
+            Some(10),
+            vec![],
+        );
+        let block_payload_message = ConsensusObserverMessage::new_block_payload_message(
+            BlockInfo::empty(),
+            transaction_payload,
+        );
+        consensus_publisher
+            .publish_message(block_payload_message.clone())
+            .await;
+
+        // Verify that the message was sent to all active subscribers
+        let num_expected_messages = additional_peer_network_ids.len() + 1;
+        for _ in 0..num_expected_messages {
+            let (peer_network_id, message) = outbound_message_receiver.next().await.unwrap();
+            assert!(
+                additional_peer_network_ids.contains(&peer_network_id)
+                    || peer_network_id == peer_network_id_1
+            );
+            assert_eq!(message, block_payload_message);
         }
+
+        // Unsubscribe the first peer from consensus updates
+        process_unsubscription_for_peer(&consensus_publisher, &peer_network_id_1);
+
+        // Publish another message to the active subscribers
+        let commit_decision_message =
+            ConsensusObserverMessage::new_commit_decision_message(LedgerInfoWithSignatures::new(
+                LedgerInfo::new(BlockInfo::empty(), HashValue::zero()),
+                AggregateSignature::empty(),
+            ));
+        consensus_publisher
+            .publish_message(commit_decision_message.clone())
+            .await;
+
+        // Verify that the message was sent to all active subscribers except the first peer
+        for _ in 0..additional_peer_network_ids.len() {
+            let (peer_network_id, message) = outbound_message_receiver.next().await.unwrap();
+            assert!(additional_peer_network_ids.contains(&peer_network_id));
+            assert_eq!(message, commit_decision_message);
+        }
+
+        // Unsubscribe the remaining peers from consensus updates
+        for peer_network_id in additional_peer_network_ids {
+            process_unsubscription_for_peer(&consensus_publisher, &peer_network_id);
+        }
+
+        // Publish another message to the active subscribers
+        let block_payload_message = ConsensusObserverMessage::new_block_payload_message(
+            BlockInfo::empty(),
+            BlockTransactionPayload::empty(),
+        );
+        consensus_publisher
+            .publish_message(block_payload_message.clone())
+            .await;
+
+        // Verify that no messages were sent to the outbound message receiver
+        assert!(outbound_message_receiver.next().now_or_never().is_none());
+    }
+
+    /// Processes a subscription request for the given peer
+    fn process_subscription_for_peer(
+        consensus_publisher: &ConsensusPublisher,
+        peer_network_id: &PeerNetworkId,
+    ) {
+        consensus_publisher.handle_subscription_request(
+            peer_network_id,
+            ConsensusObserverRequest::Subscribe,
+            ResponseSender::new_for_test(),
+        );
     }
 
-    pub fn publish(&self, msg: ObserverMessage) {
-        let downstream_peers = self.get_downstream_peers();
-        for peer in &downstream_peers {
-            info!("[Publisher] Sending {} to {}", msg, peer);
+    /// Processes an unsubscription request for the given peer
+    fn process_unsubscription_for_peer(
+        consensus_publisher: &ConsensusPublisher,
+        peer_network_id: &PeerNetworkId,
+    ) {
+        consensus_publisher.handle_subscription_request(
+            peer_network_id,
+            ConsensusObserverRequest::Unsubscribe,
+            ResponseSender::new_for_test(),
+        );
+    }
+
+    /// Verifies the active subscribers has the expected size and contains the expected peers
+    fn verify_active_subscribers(
+        consensus_publisher: &ConsensusPublisher,
+        expected_size: usize,
+        expected_peers: Vec<&PeerNetworkId>,
+        unexpected_peers: Vec<&PeerNetworkId>,
+    ) {
+        // Verify the number of active subscribers
+        let active_subscribers = consensus_publisher.get_active_subscribers();
+        assert_eq!(active_subscribers.len(), expected_size);
+
+        // Verify that the active subscribers contains the expected peers
+        for peer_network_id in expected_peers {
+            assert!(active_subscribers.contains(peer_network_id));
+        }
+
+        // Verify that the active subscribers does not contain the unexpected peers
+        for peer_network_id in unexpected_peers {
+            assert!(!active_subscribers.contains(peer_network_id));
         }
-        let _ = self.network_client.send_to_peers(msg, &downstream_peers);
     }
 }
diff --git a/consensus/src/consensus_observer/subscription.rs b/consensus/src/consensus_observer/subscription.rs
new file mode 100644
index 0000000000000..57aca170e59a8
--- /dev/null
+++ b/consensus/src/consensus_observer/subscription.rs
@@ -0,0 +1,648 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::consensus_observer::{
+    error::Error,
+    logging::{LogEntry, LogSchema},
+};
+use aptos_config::{config::ConsensusObserverConfig, network_id::PeerNetworkId};
+use aptos_logger::warn;
+use aptos_network::application::metadata::PeerMetadata;
+use aptos_storage_interface::DbReader;
+use aptos_time_service::{TimeService, TimeServiceTrait};
+use ordered_float::OrderedFloat;
+use std::{
+    collections::{BTreeMap, HashMap},
+    sync::Arc,
+    time::{Duration, Instant},
+};
+
+// A useful constant for representing the maximum ping latency
+const MAX_PING_LATENCY_SECS: f64 = 10_000.0;
+
+/// A single consensus observer subscription
+pub struct ConsensusObserverSubscription {
+    // The configuration of the consensus observer
+    consensus_observer_config: ConsensusObserverConfig,
+
+    // A handle to storage (used to read the latest state and check progress)
+    db_reader: Arc<dyn DbReader>,
+
+    // The peer network id of the active subscription
+    peer_network_id: PeerNetworkId,
+
+    // The timestamp of the last message received from the peer
+    last_message_receive_time: Instant,
+
+    // The timestamp of the last peer optimality check
+    last_peer_optimality_check: Instant,
+
+    // The highest synced version we've seen from storage, along with the time at which it was seen
+    highest_synced_version_and_time: (u64, Instant),
+
+    // The time service (used to check the last message receive time)
+    time_service: TimeService,
+}
+
+impl ConsensusObserverSubscription {
+    pub fn new(
+        consensus_observer_config: ConsensusObserverConfig,
+        db_reader: Arc<dyn DbReader>,
+        peer_network_id: PeerNetworkId,
+        time_service: TimeService,
+    ) -> Self {
+        let time_now = time_service.now();
+
+        Self {
+            consensus_observer_config,
+            db_reader,
+            peer_network_id,
+            last_message_receive_time: time_now,
+            last_peer_optimality_check: time_now,
+            highest_synced_version_and_time: (0, time_now),
+            time_service,
+        }
+    }
+
+    /// Verifies that the peer selected for the subscription is optimal
+    /// based on the set of currently available peers. This is done
+    /// periodically to avoid excessive subscription terminations.
+    pub fn check_subscription_peer_optimality(
+        &mut self,
+        peers_and_metadata: HashMap<PeerNetworkId, PeerMetadata>,
+    ) -> Result<(), Error> {
+        // Check if we need to perform the peer optimality check
+        let time_now = self.time_service.now();
+        let duration_since_last_check = time_now.duration_since(self.last_peer_optimality_check);
+        if duration_since_last_check
+            < Duration::from_millis(
+                self.consensus_observer_config
+                    .peer_optimality_check_interval_ms,
+            )
+        {
+            return Ok(()); // We don't need to check the peer optimality yet
+        }
+
+        // Update the last peer optimality check time
+        self.last_peer_optimality_check = time_now;
+
+        // Verify that we're subscribed to the most optimal peer
+        if let Some(optimal_peer) = sort_peers_by_distance_and_latency(peers_and_metadata).first() {
+            if *optimal_peer != self.peer_network_id {
+                return Err(Error::SubscriptionSuboptimal(format!(
+                    "Subscription to peer: {} is no longer optimal! New optimal peer: {}",
+                    self.peer_network_id, optimal_peer
+                )));
+            }
+        }
+
+        Ok(())
+    }
+
+    /// Verifies that the subscription has not timed out based
+    /// on the last received message time.
+    pub fn check_subscription_timeout(&self) -> Result<(), Error> {
+        // Calculate the duration since the last message
+        let time_now = self.time_service.now();
+        let duration_since_last_message = time_now.duration_since(self.last_message_receive_time);
+
+        // Check if the subscription has timed out
+        if duration_since_last_message
+            > Duration::from_millis(self.consensus_observer_config.max_subscription_timeout_ms)
+        {
+            return Err(Error::SubscriptionTimeout(format!(
+                "Subscription to peer: {} has timed out! No message received for: {:?}",
+                self.peer_network_id, duration_since_last_message
+            )));
+        }
+
+        Ok(())
+    }
+
+    /// Verifies that the DB is continuing to sync and commit new data
+    pub fn check_syncing_progress(&mut self) -> Result<(), Error> {
+        // Get the current synced version from storage
+        let current_synced_version =
+            self.db_reader
+                .get_latest_ledger_info_version()
+                .map_err(|error| {
+                    Error::UnexpectedError(format!(
+                        "Failed to read highest synced version: {:?}",
+                        error
+                    ))
+                })?;
+
+        // Verify that the synced version is increasing appropriately
+        let (highest_synced_version, highest_version_timestamp) =
+            self.highest_synced_version_and_time;
+        if current_synced_version <= highest_synced_version {
+            // The synced version hasn't increased. Check if we should terminate
+            // the subscription based on the last time the highest synced version was seen.
+            let time_now = self.time_service.now();
+            let duration_since_highest_seen = time_now.duration_since(highest_version_timestamp);
+            if duration_since_highest_seen
+                > Duration::from_millis(
+                    self.consensus_observer_config.max_synced_version_timeout_ms,
+                )
+            {
+                return Err(Error::SubscriptionProgressStopped(format!(
+                    "The DB is not making sync progress! Highest synced version: {}, elapsed: {:?}",
+                    highest_synced_version, duration_since_highest_seen
+                )));
+            }
+        }
+
+        // Update the highest synced version and time
+        self.highest_synced_version_and_time = (current_synced_version, self.time_service.now());
+
+        Ok(())
+    }
+
+    /// Returns the peer network id of the subscription
+    pub fn get_peer_network_id(&self) -> PeerNetworkId {
+        self.peer_network_id
+    }
+
+    /// Verifies the given message is from the expected peer
+    pub fn verify_message_sender(&mut self, peer_network_id: &PeerNetworkId) -> Result<(), Error> {
+        // Verify the message is from the expected peer
+        if self.peer_network_id != *peer_network_id {
+            return Err(Error::UnexpectedError(format!(
+                "Received message from unexpected peer: {}! Subscribed to: {}",
+                peer_network_id, self.peer_network_id
+            )));
+        }
+
+        // Update the last message receive time
+        self.last_message_receive_time = self.time_service.now();
+
+        Ok(())
+    }
+}
+
+/// Gets the distance from the validators for the specified peer from the peer metadata
+fn get_distance_for_peer(
+    peer_network_id: &PeerNetworkId,
+    peer_metadata: &PeerMetadata,
+) -> Option<u64> {
+    // Get the distance for the peer
+    let peer_monitoring_metadata = peer_metadata.get_peer_monitoring_metadata();
+    let distance = peer_monitoring_metadata
+        .latest_network_info_response
+        .as_ref()
+        .map(|response| response.distance_from_validators);
+
+    // If the distance is missing, log a warning
+    if distance.is_none() {
+        warn!(
+            LogSchema::new(LogEntry::ConsensusObserver).message(&format!(
+                "Unable to get distance for peer! Peer: {:?}",
+                peer_network_id
+            ))
+        );
+    }
+
+    distance
+}
+
+/// Gets the latency for the specified peer from the peer metadata
+fn get_latency_for_peer(
+    peer_network_id: &PeerNetworkId,
+    peer_metadata: &PeerMetadata,
+) -> Option<f64> {
+    // Get the latency for the peer
+    let peer_monitoring_metadata = peer_metadata.get_peer_monitoring_metadata();
+    let latency = peer_monitoring_metadata.average_ping_latency_secs;
+
+    // If the latency is missing, log a warning
+    if latency.is_none() {
+        warn!(
+            LogSchema::new(LogEntry::ConsensusObserver).message(&format!(
+                "Unable to get latency for peer! Peer: {:?}",
+                peer_network_id
+            ))
+        );
+    }
+
+    latency
+}
+
+/// Sorts the peers by distance from the validator set and latency.
+/// We prioritize distance over latency as we want to avoid close
+/// but not up-to-date peers. If peers don't have sufficient metadata
+/// for sorting, they are given a lower priority.
+pub fn sort_peers_by_distance_and_latency(
+    peers_and_metadata: HashMap<PeerNetworkId, PeerMetadata>,
+) -> Vec<PeerNetworkId> {
+    // Group peers and latencies by validator distance, i.e., distance -> [(peer, latency)]
+    let mut peers_and_latencies_by_distance = BTreeMap::new();
+    for (peer_network_id, peer_metadata) in peers_and_metadata {
+        // Get the distance and latency for the peer
+        let distance = get_distance_for_peer(&peer_network_id, &peer_metadata);
+        let latency = get_latency_for_peer(&peer_network_id, &peer_metadata);
+
+        // If the distance is not found, use the maximum distance
+        let distance =
+            distance.unwrap_or(aptos_peer_monitoring_service_types::MAX_DISTANCE_FROM_VALIDATORS);
+
+        // If the latency is not found, use a large latency
+        let latency = latency.unwrap_or(MAX_PING_LATENCY_SECS);
+
+        // Add the peer and latency to the distance group
+        peers_and_latencies_by_distance
+            .entry(distance)
+            .or_insert_with(Vec::new)
+            .push((peer_network_id, OrderedFloat(latency)));
+    }
+
+    // Sort the peers by distance and latency. Note: BTreeMaps are
+    // sorted by key, so the entries will be sorted by distance in ascending order.
+    let mut sorted_peers = Vec::new();
+    for (_, mut peers_and_latencies) in peers_and_latencies_by_distance {
+        // Sort the peers by latency
+        peers_and_latencies.sort_by_key(|(_, latency)| *latency);
+
+        // Add the peers to the sorted list (in sorted order)
+        sorted_peers.extend(
+            peers_and_latencies
+                .into_iter()
+                .map(|(peer_network_id, _)| peer_network_id),
+        );
+    }
+
+    sorted_peers
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use aptos_network::transport::ConnectionMetadata;
+    use aptos_peer_monitoring_service_types::{
+        response::NetworkInformationResponse, PeerMonitoringMetadata,
+    };
+    use aptos_storage_interface::Result;
+    use aptos_types::transaction::Version;
+    use mockall::mock;
+
+    // This is a simple mock of the DbReader (it generates a MockDatabaseReader)
+    mock! {
+    pub DatabaseReader {}
+    impl DbReader for DatabaseReader {
+            fn get_latest_ledger_info_version(&self) -> Result<Version>;
+        }
+    }
+
+    #[test]
+    fn check_subscription_peer_optimality() {
+        // Create a new observer subscription
+        let consensus_observer_config = ConsensusObserverConfig::default();
+        let peer_network_id = PeerNetworkId::random();
+        let time_service = TimeService::mock();
+        let mut subscription = ConsensusObserverSubscription::new(
+            consensus_observer_config,
+            Arc::new(MockDatabaseReader::new()),
+            peer_network_id,
+            time_service.clone(),
+        );
+
+        // Verify the time of the last peer optimality check
+        let current_time = time_service.now();
+        assert_eq!(subscription.last_peer_optimality_check, current_time);
+
+        // Verify that the peer is optimal (not enough time has elapsed to check)
+        assert!(subscription
+            .check_subscription_peer_optimality(HashMap::new())
+            .is_ok());
+
+        // Elapse some amount of time (but not enough to check optimality)
+        let mock_time_service = time_service.into_mock();
+        mock_time_service.advance(Duration::from_millis(
+            consensus_observer_config.peer_optimality_check_interval_ms / 2,
+        ));
+
+        // Verify that the original peer is still optimal even though it is missing metadata
+        let new_optimal_peer = PeerNetworkId::random();
+        let mut peers_and_metadata = HashMap::new();
+        peers_and_metadata.insert(
+            new_optimal_peer,
+            PeerMetadata::new_for_test(
+                ConnectionMetadata::mock(new_optimal_peer.peer_id()),
+                PeerMonitoringMetadata::new(None, None, None, None, None),
+            ),
+        );
+        assert!(subscription
+            .check_subscription_peer_optimality(peers_and_metadata.clone())
+            .is_ok());
+
+        // Elapse enough time to check optimality
+        mock_time_service.advance(Duration::from_millis(
+            consensus_observer_config.peer_optimality_check_interval_ms + 1,
+        ));
+
+        // Verify that the original peer is no longer optimal
+        assert!(subscription
+            .check_subscription_peer_optimality(peers_and_metadata.clone())
+            .is_err());
+
+        // Add the original peer to the list of peers (with optimal metadata)
+        peers_and_metadata.insert(
+            peer_network_id,
+            PeerMetadata::new_for_test(
+                ConnectionMetadata::mock(peer_network_id.peer_id()),
+                PeerMonitoringMetadata::new(Some(0.1), None, None, None, None),
+            ),
+        );
+
+        // Verify that the peer is still optimal
+        assert!(subscription
+            .check_subscription_peer_optimality(peers_and_metadata)
+            .is_ok());
+
+        // Verify the time of the last peer optimality check
+        let current_time = mock_time_service.now();
+        assert_eq!(subscription.last_peer_optimality_check, current_time);
+    }
+
+    #[test]
+    fn test_check_subscription_timeout() {
+        // Create a new observer subscription
+        let consensus_observer_config = ConsensusObserverConfig::default();
+        let peer_network_id = PeerNetworkId::random();
+        let time_service = TimeService::mock();
+        let mut subscription = ConsensusObserverSubscription::new(
+            consensus_observer_config,
+            Arc::new(MockDatabaseReader::new()),
+            peer_network_id,
+            time_service.clone(),
+        );
+
+        // Verify that the subscription has not timed out and that the last message time is updated
+        let current_time = time_service.now();
+        assert!(subscription.check_subscription_timeout().is_ok());
+        assert_eq!(subscription.last_message_receive_time, current_time);
+
+        // Elapse some amount of time (but not enough to timeout)
+        let mock_time_service = time_service.into_mock();
+        mock_time_service.advance(Duration::from_millis(
+            consensus_observer_config.max_subscription_timeout_ms / 2,
+        ));
+
+        // Verify that the subscription has not timed out
+        assert!(subscription.check_subscription_timeout().is_ok());
+
+        // Verify a new message is received successfully and that the last message time is updated
+        let current_time = mock_time_service.now();
+        subscription
+            .verify_message_sender(&peer_network_id)
+            .unwrap();
+        assert_eq!(subscription.last_message_receive_time, current_time);
+
+        // Verify that the subscription has not timed out
+        assert!(subscription.check_subscription_timeout().is_ok());
+
+        // Elapse enough time to timeout the subscription
+        mock_time_service.advance(Duration::from_millis(
+            consensus_observer_config.max_subscription_timeout_ms + 1,
+        ));
+
+        // Verify that the subscription has timed out
+        assert!(subscription.check_subscription_timeout().is_err());
+    }
+
+    #[test]
+    fn test_check_syncing_progress() {
+        // Create a mock DB reader with expectations
+        let first_synced_version = 10;
+        let second_synced_version = 20;
+        let mut mock_db_reader = MockDatabaseReader::new();
+        mock_db_reader
+            .expect_get_latest_ledger_info_version()
+            .returning(move || Ok(first_synced_version))
+            .times(2); // Only allow two calls for the first version
+        mock_db_reader
+            .expect_get_latest_ledger_info_version()
+            .returning(move || Ok(second_synced_version)); // Allow multiple calls for the second version
+
+        // Create a new observer subscription
+        let consensus_observer_config = ConsensusObserverConfig::default();
+        let peer_network_id = PeerNetworkId::random();
+        let time_service = TimeService::mock();
+        let mut subscription = ConsensusObserverSubscription::new(
+            consensus_observer_config,
+            Arc::new(mock_db_reader),
+            peer_network_id,
+            time_service.clone(),
+        );
+
+        // Verify that the DB is making sync progress and that the highest synced version is updated
+        let current_time = time_service.now();
+        assert!(subscription.check_syncing_progress().is_ok());
+        assert_eq!(
+            subscription.highest_synced_version_and_time,
+            (first_synced_version, current_time)
+        );
+
+        // Elapse some amount of time (not enough to timeout)
+        let mock_time_service = time_service.into_mock();
+        mock_time_service.advance(Duration::from_millis(
+            consensus_observer_config.max_synced_version_timeout_ms / 2,
+        ));
+
+        // Verify that the DB is still making sync progress
+        let current_time = mock_time_service.now();
+        assert!(subscription.check_syncing_progress().is_ok());
+        assert_eq!(
+            subscription.highest_synced_version_and_time,
+            (first_synced_version, current_time)
+        );
+
+        // Elapse enough time to timeout the subscription
+        mock_time_service.advance(Duration::from_millis(
+            consensus_observer_config.max_synced_version_timeout_ms + 1,
+        ));
+
+        // Verify that the DB is still making sync progress (the next version is higher)
+        let current_time = mock_time_service.now();
+        assert!(subscription.check_syncing_progress().is_ok());
+        assert_eq!(
+            subscription.highest_synced_version_and_time,
+            (second_synced_version, current_time)
+        );
+
+        // Elapse enough time to timeout the subscription
+        mock_time_service.advance(Duration::from_millis(
+            consensus_observer_config.max_synced_version_timeout_ms + 1,
+        ));
+
+        // Verify that the DB is not making sync progress and that the subscription has timed out
+        assert!(subscription.check_syncing_progress().is_err());
+    }
+
+    #[test]
+    fn test_verify_message_sender() {
+        // Create a new observer subscription
+        let consensus_observer_config = ConsensusObserverConfig::default();
+        let peer_network_id = PeerNetworkId::random();
+        let time_service = TimeService::mock();
+        let mut subscription = ConsensusObserverSubscription::new(
+            consensus_observer_config,
+            Arc::new(MockDatabaseReader::new()),
+            peer_network_id,
+            time_service.clone(),
+        );
+
+        // Verify that the message sender is valid
+        let current_time = time_service.now();
+        assert!(subscription.verify_message_sender(&peer_network_id).is_ok());
+        assert_eq!(subscription.last_message_receive_time, current_time);
+
+        // Elapse some amount of time
+        let mock_time_service = time_service.into_mock();
+        mock_time_service.advance(Duration::from_secs(10));
+
+        // Verify that the message sender is not the expected peer
+        let other_peer_network_id = PeerNetworkId::random();
+        assert!(subscription
+            .verify_message_sender(&other_peer_network_id)
+            .is_err());
+        assert_eq!(subscription.last_message_receive_time, current_time);
+
+        // Elapse more time
+        mock_time_service.advance(Duration::from_secs(10));
+
+        // Verify that the message sender is the expected peer and that the last message time is updated
+        let current_time = mock_time_service.now();
+        assert!(subscription.verify_message_sender(&peer_network_id).is_ok());
+        assert_eq!(subscription.last_message_receive_time, current_time);
+    }
+
+    #[test]
+    fn test_sort_peers_by_distance_and_latency() {
+        // Sort an empty list of peers
+        let peers_and_metadata = HashMap::new();
+        assert!(sort_peers_by_distance_and_latency(peers_and_metadata).is_empty());
+
+        // Create a list of peers with empty metadata
+        let peers_and_metadata = create_peers_and_metadata(true, true, 10);
+
+        // Sort the peers and verify the results
+        let sorted_peers = sort_peers_by_distance_and_latency(peers_and_metadata);
+        assert_eq!(sorted_peers.len(), 10);
+
+        // Create a list of peers with valid metadata
+        let peers_and_metadata = create_peers_and_metadata(false, false, 10);
+
+        // Sort the peers
+        let sorted_peers = sort_peers_by_distance_and_latency(peers_and_metadata.clone());
+
+        // Verify the order of the peers
+        verify_increasing_distance_latencies(&peers_and_metadata, &sorted_peers);
+        assert_eq!(sorted_peers.len(), 10);
+
+        // Create a list of peers with and without metadata
+        let mut peers_and_metadata = create_peers_and_metadata(false, false, 10);
+        peers_and_metadata.extend(create_peers_and_metadata(true, false, 10));
+        peers_and_metadata.extend(create_peers_and_metadata(false, true, 10));
+        peers_and_metadata.extend(create_peers_and_metadata(true, true, 10));
+
+        // Sort the peers
+        let sorted_peers = sort_peers_by_distance_and_latency(peers_and_metadata.clone());
+        assert_eq!(sorted_peers.len(), 40);
+
+        // Verify the order of the first 20 peers
+        let (first_20_peers, sorted_peers) = sorted_peers.split_at(20);
+        verify_increasing_distance_latencies(&peers_and_metadata, first_20_peers);
+
+        // Verify that the next 10 peers only have latency metadata
+        let (next_10_peers, sorted_peers) = sorted_peers.split_at(10);
+        for sorted_peer in next_10_peers {
+            let peer_metadata = peers_and_metadata.get(sorted_peer).unwrap();
+            assert!(get_distance_for_peer(sorted_peer, peer_metadata).is_none());
+            assert!(get_latency_for_peer(sorted_peer, peer_metadata).is_some());
+        }
+
+        // Verify that the last 10 peers have no metadata
+        let (last_10_peers, remaining_peers) = sorted_peers.split_at(10);
+        for sorted_peer in last_10_peers {
+            let peer_metadata = peers_and_metadata.get(sorted_peer).unwrap();
+            assert!(get_distance_for_peer(sorted_peer, peer_metadata).is_none());
+            assert!(get_latency_for_peer(sorted_peer, peer_metadata).is_none());
+        }
+        assert!(remaining_peers.is_empty());
+    }
+
+    /// Creates a new peer and metadata for testing
+    fn create_peer_and_metadata(
+        latency: Option<f64>,
+        distance_from_validators: Option<u64>,
+    ) -> (PeerNetworkId, PeerMetadata) {
+        // Create a random peer
+        let peer_network_id = PeerNetworkId::random();
+
+        // Create a new peer metadata with the given latency and distance
+        let connection_metadata = ConnectionMetadata::mock(peer_network_id.peer_id());
+        let network_information_response =
+            distance_from_validators.map(|distance| NetworkInformationResponse {
+                connected_peers: BTreeMap::new(),
+                distance_from_validators: distance,
+            });
+        let peer_monitoring_metadata =
+            PeerMonitoringMetadata::new(latency, None, network_information_response, None, None);
+        let peer_metadata =
+            PeerMetadata::new_for_test(connection_metadata, peer_monitoring_metadata);
+
+        (peer_network_id, peer_metadata)
+    }
+
+    /// Creates a list of peers and metadata for testing
+    fn create_peers_and_metadata(
+        empty_latency: bool,
+        empty_distance: bool,
+        num_peers: u64,
+    ) -> HashMap<PeerNetworkId, PeerMetadata> {
+        let mut peers_and_metadata = HashMap::new();
+        for i in 1..num_peers + 1 {
+            // Determine the distance for the peer
+            let distance = if empty_distance { None } else { Some(i) };
+
+            // Determine the latency for the peer
+            let latency = if empty_latency { None } else { Some(i as f64) };
+
+            // Create a new peer and metadata
+            let (peer_network_id, peer_metadata) = create_peer_and_metadata(latency, distance);
+            peers_and_metadata.insert(peer_network_id, peer_metadata);
+        }
+        peers_and_metadata
+    }
+
+    /// Verifies that the distance and latencies for the peers are in
+    /// increasing order (with the distance taking precedence over the latency).
+    fn verify_increasing_distance_latencies(
+        peers_and_metadata: &HashMap<PeerNetworkId, PeerMetadata>,
+        sorted_peers: &[PeerNetworkId],
+    ) {
+        let mut previous_latency = None;
+        let mut previous_distance = 0;
+        for sorted_peer in sorted_peers {
+            // Get the distance and latency for the peer
+            let peer_metadata = peers_and_metadata.get(sorted_peer).unwrap();
+            let distance = get_distance_for_peer(sorted_peer, peer_metadata).unwrap();
+            let latency = get_latency_for_peer(sorted_peer, peer_metadata);
+
+            // Verify the order of the peers
+            if distance == previous_distance {
+                if let Some(latency) = latency {
+                    if let Some(previous_latency) = previous_latency {
+                        assert!(latency >= previous_latency);
+                    }
+                }
+            } else {
+                assert!(distance > previous_distance);
+            }
+
+            // Update the previous latency and distance
+            previous_latency = latency;
+            previous_distance = distance;
+        }
+    }
+}
diff --git a/consensus/src/consensus_provider.rs b/consensus/src/consensus_provider.rs
index d61002677f167..d02d3a1739725 100644
--- a/consensus/src/consensus_provider.rs
+++ b/consensus/src/consensus_provider.rs
@@ -3,13 +3,17 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{
-    consensus_observer::{network::ObserverMessage, observer::Observer, publisher::Publisher},
+    consensus_observer::{
+        network_client::ConsensusObserverClient, network_events::ConsensusObserverNetworkEvents,
+        network_message::ConsensusObserverMessage, observer::ConsensusObserver,
+        publisher::ConsensusPublisher,
+    },
     counters,
     epoch_manager::EpochManager,
     network::NetworkTask,
     network_interface::{ConsensusMsg, ConsensusNetworkClient},
     persistent_liveness_storage::StorageWriteProxy,
-    pipeline::execution_client::ExecutionProxyClient,
+    pipeline::execution_client::{DummyExecutionClient, ExecutionProxyClient, TExecutionClient},
     quorum_store::quorum_store_db::QuorumStoreDB,
     rand::rand_gen::storage::db::RandDb,
     state_computer::ExecutionProxy,
@@ -28,14 +32,16 @@ use aptos_network::application::interface::{
     NetworkClient, NetworkClientInterface, NetworkServiceEvents,
 };
 use aptos_storage_interface::DbReaderWriter;
+use aptos_time_service::TimeService;
 use aptos_validator_transaction_pool::VTxnPoolState;
 use aptos_vm::AptosVM;
-use futures::{channel::mpsc, stream::select_all};
+use futures::channel::mpsc;
 use move_core_types::account_address::AccountAddress;
 use std::{collections::HashMap, sync::Arc};
 use tokio::runtime::Runtime;
 
 /// Helper function to start consensus based on configuration and return the runtime
+#[allow(clippy::unwrap_used)]
 pub fn start_consensus(
     node_config: &NodeConfig,
     network_client: NetworkClient<ConsensusMsg>,
@@ -45,7 +51,7 @@ pub fn start_consensus(
     aptos_db: DbReaderWriter,
     reconfig_events: ReconfigNotificationListener<DbBackedOnChainConfig>,
     vtxn_pool: VTxnPoolState,
-    observer_network: Option<NetworkClient<ObserverMessage>>,
+    consensus_publisher: Option<Arc<ConsensusPublisher>>,
 ) -> (Runtime, Arc<StorageWriteProxy>, Arc<QuorumStoreDB>) {
     let runtime = aptos_runtimes::spawn_named_runtime("consensus".into(), None);
     let storage = Arc::new(StorageWriteProxy::new(node_config, aptos_db.reader.clone()));
@@ -71,7 +77,10 @@ pub fn start_consensus(
     let (self_sender, self_receiver) =
         aptos_channels::new_unbounded(&counters::PENDING_SELF_MESSAGES);
     let consensus_network_client = ConsensusNetworkClient::new(network_client);
-    let bounded_executor = BoundedExecutor::new(8, runtime.handle().clone());
+    let bounded_executor = BoundedExecutor::new(
+        node_config.consensus.num_bounded_executor_tasks as usize,
+        runtime.handle().clone(),
+    );
     let rand_storage = Arc::new(RandDb::new(node_config.storage.dir()));
 
     let execution_client = Arc::new(ExecutionProxyClient::new(
@@ -82,7 +91,8 @@ pub fn start_consensus(
         consensus_network_client.clone(),
         bounded_executor.clone(),
         rand_storage.clone(),
-        observer_network.clone(),
+        node_config.consensus_observer,
+        consensus_publisher.clone(),
     ));
 
     let epoch_mgr = EpochManager::new(
@@ -100,7 +110,7 @@ pub fn start_consensus(
         aptos_time_service::TimeService::real(),
         vtxn_pool,
         rand_storage,
-        observer_network,
+        consensus_publisher,
     );
 
     let (network_task, network_receiver) = NetworkTask::new(network_service_events, self_receiver);
@@ -112,76 +122,95 @@ pub fn start_consensus(
     (runtime, storage, quorum_store_db)
 }
 
+/// A helper function to start the consensus observer
 pub fn start_consensus_observer(
     node_config: &NodeConfig,
-    observer_network_client: NetworkClient<ObserverMessage>,
-    observer_network_service_events: NetworkServiceEvents<ObserverMessage>,
+    observer_network_client: NetworkClient<ConsensusObserverMessage>,
+    observer_network_service_events: NetworkServiceEvents<ConsensusObserverMessage>,
+    consensus_publisher: Option<Arc<ConsensusPublisher>>,
     state_sync_notifier: Arc<dyn ConsensusNotificationSender>,
     consensus_to_mempool_sender: mpsc::Sender<QuorumStoreRequest>,
     aptos_db: DbReaderWriter,
-    reconfig_events: ReconfigNotificationListener<DbBackedOnChainConfig>,
+    reconfig_events: Option<ReconfigNotificationListener<DbBackedOnChainConfig>>,
 ) -> Runtime {
-    let publisher_enabled = node_config.consensus_observer.publisher_enabled;
+    // Create a consensus observer runtime
     let runtime = aptos_runtimes::spawn_named_runtime("observer".into(), None);
-    let root = aptos_db.reader.get_latest_ledger_info().unwrap();
-
-    let txn_notifier = Arc::new(MempoolNotifier::new(
-        consensus_to_mempool_sender.clone(),
-        node_config.consensus.mempool_executed_txn_timeout_ms,
-    ));
-
-    let execution_proxy = ExecutionProxy::new(
-        Arc::new(BlockExecutor::<AptosVM>::new(aptos_db)),
-        txn_notifier,
-        state_sync_notifier,
-        runtime.handle(),
-        TransactionFilter::new(node_config.execution.transaction_filter.clone()),
-    );
 
+    // Create the consensus observer client
+    let consensus_observer_client = if let Some(consensus_publisher) = &consensus_publisher {
+        // Get the consensus observer client from the consensus publisher
+        consensus_publisher.get_consensus_observer_client()
+    } else {
+        // Otherwise, create a new client (the publisher is not enabled)
+        Arc::new(ConsensusObserverClient::new(
+            observer_network_client.clone(),
+        ))
+    };
+
+    // Create the consensus observer network events
+    let observer_network_events =
+        ConsensusObserverNetworkEvents::new(observer_network_service_events);
+
+    // Create the (dummy) consensus network client
     let (self_sender, _self_receiver) =
         aptos_channels::new_unbounded(&counters::PENDING_SELF_MESSAGES);
-    let dummy_client = ConsensusNetworkClient::new(NetworkClient::new(
+    let consensus_network_client = ConsensusNetworkClient::new(NetworkClient::new(
         vec![],
         vec![],
         HashMap::new(),
         observer_network_client.get_peers_and_metadata(),
     ));
-    let bounded_executor = BoundedExecutor::new(32, runtime.handle().clone());
-    let rand_storage = Arc::new(RandDb::new(node_config.storage.dir()));
-
-    let execution_client = Arc::new(ExecutionProxyClient::new(
-        node_config.consensus.clone(),
-        Arc::new(execution_proxy),
-        AccountAddress::ONE,
-        self_sender.clone(),
-        dummy_client,
-        bounded_executor.clone(),
-        rand_storage.clone(),
-        if publisher_enabled {
-            Some(observer_network_client.clone())
-        } else {
-            None
-        },
-    ));
-
-    let events: Vec<_> = observer_network_service_events
-        .into_network_and_events()
-        .into_values()
-        .collect();
-    let network_events = Box::new(select_all(events));
 
+    // If the consensus observer is enabled, create the execution client.
+    // If not, stub it out with a dummy client.
+    let execution_client = if node_config.consensus_observer.observer_enabled {
+        // Create the execution proxy
+        let txn_notifier = Arc::new(MempoolNotifier::new(
+            consensus_to_mempool_sender.clone(),
+            node_config.consensus.mempool_executed_txn_timeout_ms,
+        ));
+        let execution_proxy = ExecutionProxy::new(
+            Arc::new(BlockExecutor::<AptosVM>::new(aptos_db.clone())),
+            txn_notifier,
+            state_sync_notifier,
+            runtime.handle(),
+            TransactionFilter::new(node_config.execution.transaction_filter.clone()),
+        );
+
+        // Create the execution proxy client
+        let bounded_executor = BoundedExecutor::new(32, runtime.handle().clone());
+        let rand_storage = Arc::new(RandDb::new(node_config.storage.dir()));
+        let execution_proxy_client = Arc::new(ExecutionProxyClient::new(
+            node_config.consensus.clone(),
+            Arc::new(execution_proxy),
+            AccountAddress::ONE,
+            self_sender.clone(),
+            consensus_network_client,
+            bounded_executor,
+            rand_storage.clone(),
+            node_config.consensus_observer,
+            consensus_publisher.clone(),
+        ));
+        execution_proxy_client as Arc<dyn TExecutionClient>
+    } else {
+        Arc::new(DummyExecutionClient) as Arc<dyn TExecutionClient>
+    };
+
+    // Create the consensus observer
     let (tx, rx) = tokio::sync::mpsc::unbounded_channel();
-    let observer = Observer::new(
-        root,
+    let consensus_observer = ConsensusObserver::new(
+        node_config.clone(),
+        consensus_observer_client,
+        aptos_db.reader.clone(),
         execution_client,
         tx,
         reconfig_events,
-        if publisher_enabled {
-            Some(Publisher::new(observer_network_client))
-        } else {
-            None
-        },
+        consensus_publisher,
+        TimeService::real(),
     );
-    runtime.spawn(observer.start(network_events, rx));
+
+    // Start the consensus observer
+    runtime.spawn(consensus_observer.start(observer_network_events, rx));
+
     runtime
 }
diff --git a/consensus/src/consensusdb/mod.rs b/consensus/src/consensusdb/mod.rs
index 5f5947adb8322..6f9e8eab8f786 100644
--- a/consensus/src/consensusdb/mod.rs
+++ b/consensus/src/consensusdb/mod.rs
@@ -11,9 +11,7 @@ use anyhow::Result;
 use aptos_consensus_types::{block::Block, quorum_cert::QuorumCert};
 use aptos_crypto::HashValue;
 use aptos_logger::prelude::*;
-use aptos_schemadb::{
-    schema::Schema, Options, ReadOptions, SchemaBatch, DB, DEFAULT_COLUMN_FAMILY_NAME,
-};
+use aptos_schemadb::{schema::Schema, Options, SchemaBatch, DB, DEFAULT_COLUMN_FAMILY_NAME};
 use aptos_storage_interface::AptosDbError;
 pub use schema::{
     block::BlockSchema,
@@ -202,7 +200,7 @@ impl ConsensusDB {
     }
 
     pub fn get_all<S: Schema>(&self) -> Result<Vec<(S::Key, S::Value)>, DbError> {
-        let mut iter = self.db.iter::<S>(ReadOptions::default())?;
+        let mut iter = self.db.iter::<S>()?;
         iter.seek_to_first();
         Ok(iter.collect::<Result<Vec<(S::Key, S::Value)>, AptosDbError>>()?)
     }
diff --git a/consensus/src/counters.rs b/consensus/src/counters.rs
index dadbe0219a07b..f52b60a3d43bb 100644
--- a/consensus/src/counters.rs
+++ b/consensus/src/counters.rs
@@ -2,11 +2,16 @@
 // Parts of the project are originally copyright © Meta Platforms, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
+#![allow(clippy::unwrap_used)]
+
 use crate::{
     block_storage::tracing::{observe_block, BlockStage},
     quorum_store,
 };
 use aptos_consensus_types::pipelined_block::PipelinedBlock;
+use aptos_crypto::HashValue;
+use aptos_executor_types::ExecutorError;
+use aptos_logger::prelude::{error, warn};
 use aptos_metrics_core::{
     exponential_buckets, op_counters::DurationHistogram, register_avg_counter, register_counter,
     register_gauge, register_gauge_vec, register_histogram, register_histogram_vec,
@@ -25,6 +30,8 @@ pub const TXN_COMMIT_SUCCESS_LABEL: &str = "success";
 pub const TXN_COMMIT_FAILED_LABEL: &str = "failed";
 /// Transaction commit failed (will not be retried) because of a duplicate
 pub const TXN_COMMIT_FAILED_DUPLICATE_LABEL: &str = "failed_duplicate";
+/// Transaction commit failed (will not be retried) because it expired
+pub const TXN_COMMIT_FAILED_EXPIRED_LABEL: &str = "failed_expired";
 /// Transaction commit was unsuccessful, but will be retried
 pub const TXN_COMMIT_RETRY_LABEL: &str = "retry";
 
@@ -91,6 +98,34 @@ pub static COMMITTED_TXNS_COUNT: Lazy<IntCounterVec> = Lazy::new(|| {
     .unwrap()
 });
 
+//////////////////////
+// PROPOSAL VOTE COUNTERS
+//////////////////////
+
+pub static PROPOSAL_VOTE_ADDED: Lazy<IntCounter> = Lazy::new(|| {
+    register_int_counter!(
+        "aptos_consensus_proposal_vote_added",
+        "Count of the number of proposal votes added to pending votes"
+    )
+    .unwrap()
+});
+
+pub static QC_AGGREGATED_FROM_VOTES: Lazy<IntCounter> = Lazy::new(|| {
+    register_int_counter!(
+        "aptos_consensus_qc_aggregated_from_votes",
+        "Count of the number of QC aggregated from votes"
+    )
+    .unwrap()
+});
+
+pub static PROPOSAL_VOTE_BROADCASTED: Lazy<IntCounter> = Lazy::new(|| {
+    register_int_counter!(
+        "aptos_consensus_proposal_vote_broadcasted",
+        "Count of the number of proposal votes broadcasted"
+    )
+    .unwrap()
+});
+
 //////////////////////
 // PROPOSAL ELECTION
 //////////////////////
@@ -256,11 +291,19 @@ pub static WAIT_FOR_FULL_BLOCKS_TRIGGERED: Lazy<Histogram> = Lazy::new(|| {
     )
 });
 
-/// Counts when chain_health backoff is triggered
+/// Counts when pipeline backpressure is triggered
 pub static PIPELINE_BACKPRESSURE_ON_PROPOSAL_TRIGGERED: Lazy<Histogram> = Lazy::new(|| {
     register_avg_counter(
         "aptos_pipeline_backpressure_on_proposal_triggered",
-        "Counts when chain_health backoff is triggered",
+        "Counts when pipeline backpressure is triggered",
+    )
+});
+
+/// Counts when execution backpressure is triggered
+pub static EXECUTION_BACKPRESSURE_ON_PROPOSAL_TRIGGERED: Lazy<Histogram> = Lazy::new(|| {
+    register_avg_counter(
+        "aptos_execution_backpressure_on_proposal_triggered",
+        "Counts when execution backpressure is triggered",
     )
 });
 
@@ -273,19 +316,41 @@ pub static CONSENSUS_PROPOSAL_PENDING_ROUNDS: Lazy<Histogram> = Lazy::new(|| {
 });
 
 /// duration pending when creating proposal
-pub static CONSENSUS_PROPOSAL_PENDING_DURATION: Lazy<Histogram> = Lazy::new(|| {
-    register_avg_counter(
-        "aptos_consensus_proposal_pending_duration",
-        "duration pending when creating proposal",
+pub static CONSENSUS_PROPOSAL_PENDING_DURATION: Lazy<DurationHistogram> = Lazy::new(|| {
+    DurationHistogram::new(
+        register_histogram!(
+            "aptos_consensus_proposal_pending_duration",
+            "duration pending when creating proposal",
+        )
+        .unwrap(),
     )
 });
 
 /// Amount of time (in seconds) proposal is delayed due to backpressure/backoff
-pub static PROPOSER_DELAY_PROPOSAL: Lazy<Gauge> = Lazy::new(|| {
-    register_gauge!(
+pub static PROPOSER_DELAY_PROPOSAL: Lazy<Histogram> = Lazy::new(|| {
+    register_avg_counter(
         "aptos_proposer_delay_proposal",
         "Amount of time (in seconds) proposal is delayed due to backpressure/backoff",
     )
+});
+
+/// Histogram for max number of transactions (after filtering for dedup, expirations, etc) proposer uses when creating block.
+pub static PROPOSER_MAX_BLOCK_TXNS_AFTER_FILTERING: Lazy<Histogram> = Lazy::new(|| {
+    register_histogram!(
+        "aptos_proposer_max_block_txns_after_filtering",
+        "Histogram for max number of transactions (after filtering) proposer uses when creating block.",
+        NUM_CONSENSUS_TRANSACTIONS_BUCKETS.to_vec()
+    )
+    .unwrap()
+});
+
+/// Histogram for max number of transactions to execute proposer uses when creating block.
+pub static PROPOSER_MAX_BLOCK_TXNS_TO_EXECUTE: Lazy<Histogram> = Lazy::new(|| {
+    register_histogram!(
+        "aptos_proposer_max_block_txns_to_execute",
+        "Histogram for max number of transactions to execute proposer uses when creating block.",
+        NUM_CONSENSUS_TRANSACTIONS_BUCKETS.to_vec()
+    )
     .unwrap()
 });
 
@@ -307,6 +372,16 @@ pub static PROPOSER_PENDING_BLOCKS_FILL_FRACTION: Lazy<Gauge> = Lazy::new(|| {
     .unwrap()
 });
 
+/// Histogram for max number of transactions calibrated block should have, based on the proposer
+pub static PROPOSER_ESTIMATED_CALIBRATED_BLOCK_TXNS: Lazy<Histogram> = Lazy::new(|| {
+    register_histogram!(
+        "aptos_proposer_estimated_calibrated_block_txns",
+        "Histogram for max number of transactions calibrated block should have, based on the proposer",
+        NUM_CONSENSUS_TRANSACTIONS_BUCKETS.to_vec()
+    )
+    .unwrap()
+});
+
 /// Next set of counters are computed at leader election time, with some delay.
 
 /// Current voting power fraction that participated in consensus
@@ -524,6 +599,83 @@ pub static ROUND_TIMEOUT_MS: Lazy<IntGauge> = Lazy::new(|| {
     .unwrap()
 });
 
+////////////////////////
+/// ORDER VOTE COUNTERS
+////////////////////////
+
+pub static SUCCESSFUL_EXECUTED_WITH_ORDER_VOTE_QC: Lazy<IntCounter> = Lazy::new(|| {
+    register_int_counter!(
+        "aptos_consensus_successful_executed_with_order_vote_qc",
+        "Count of the number of blocks successfully executed with order vote QC"
+    )
+    .unwrap()
+});
+
+pub static LATE_EXECUTION_WITH_ORDER_VOTE_QC: Lazy<IntCounter> = Lazy::new(|| {
+    register_int_counter!(
+        "aptos_consensus_late_execution_with_order_vote_qc",
+        "Count of the number of blocks that were executed with order vote QC after the block was already ordered"
+    )
+    .unwrap()
+});
+
+// Created order certificate from order votes. But the block isn't available in the block store.
+pub static ORDER_CERT_CREATED_WITHOUT_BLOCK_IN_BLOCK_STORE: Lazy<IntCounter> = Lazy::new(|| {
+    register_int_counter!(
+        "aptos_consensus_order_cert_created_without_block_in_block_store",
+        "Count of the number of order certificates created without the block being in the block store"
+    )
+    .unwrap()
+});
+
+pub static SUCCESSFUL_EXECUTED_WITH_REGULAR_QC: Lazy<IntCounter> = Lazy::new(|| {
+    register_int_counter!(
+        "aptos_consensus_successful_executed_with_regular_qc",
+        "Count of the number of blocks successfully executed with regular QC"
+    )
+    .unwrap()
+});
+
+pub static SYNC_TO_HIGHEST_QC: Lazy<IntCounter> = Lazy::new(|| {
+    register_int_counter!(
+        "aptos_consensus_sync_to_highest_qc",
+        "Count of the number of times we sync to highest QC"
+    )
+    .unwrap()
+});
+
+pub static ORDER_VOTE_ADDED: Lazy<IntCounter> = Lazy::new(|| {
+    register_int_counter!(
+        "aptos_consensus_order_vote_added",
+        "Count of the number of order votes added"
+    )
+    .unwrap()
+});
+
+pub static ORDER_VOTE_VERY_OLD: Lazy<IntCounter> = Lazy::new(|| {
+    register_int_counter!(
+        "aptos_consensus_order_vote_very_old",
+        "Count of the number of order votes that are very old"
+    )
+    .unwrap()
+});
+
+pub static ORDER_VOTE_OTHER_ERRORS: Lazy<IntCounter> = Lazy::new(|| {
+    register_int_counter!(
+        "aptos_consensus_order_vote_other_errors",
+        "Count of the number of order votes that have other errors"
+    )
+    .unwrap()
+});
+
+pub static ORDER_VOTE_BROADCASTED: Lazy<IntCounter> = Lazy::new(|| {
+    register_int_counter!(
+        "aptos_consensus_order_vote_broadcasted",
+        "Count of the number of order votes broadcasted"
+    )
+    .unwrap()
+});
+
 ////////////////////////
 // SYNC MANAGER COUNTERS
 ////////////////////////
@@ -536,6 +688,44 @@ pub static SYNC_INFO_MSGS_SENT_COUNT: Lazy<IntCounter> = Lazy::new(|| {
     .unwrap()
 });
 
+/// Received sync info with a newer cert
+pub static SYNC_INFO_RECEIVED_WITH_NEWER_CERT: Lazy<IntCounter> = Lazy::new(|| {
+    register_int_counter!(
+        "aptos_consensus_sync_info_received_with_newer_cert",
+        "Received sync info with a newer cert"
+    )
+    .unwrap()
+});
+
+/// Number of blocks being fetched from the network in block retriever
+pub static BLOCKS_FETCHED_FROM_NETWORK_IN_BLOCK_RETRIEVER: Lazy<IntCounter> = Lazy::new(|| {
+    register_int_counter!(
+        "aptos_consensus_blocks_fetched_from_network_in_block_retriever",
+        "Number of blocks being fetched from the network in block retriever"
+    )
+    .unwrap()
+});
+
+/// Number of blocks fetched from the network while inserting quorum cert
+pub static BLOCKS_FETCHED_FROM_NETWORK_WHILE_INSERTING_QUORUM_CERT: Lazy<IntCounter> =
+    Lazy::new(|| {
+        register_int_counter!(
+            "aptos_consensus_blocks_fetched_network_while_inserting_quorum_cert",
+            "Number of blocks fetched from the network while inserting quorum cert"
+        )
+        .unwrap()
+    });
+
+/// Number of blocks fetched from the network while fast forward sync
+pub static BLOCKS_FETCHED_FROM_NETWORK_WHILE_FAST_FORWARD_SYNC: Lazy<IntCounter> =
+    Lazy::new(|| {
+        register_int_counter!(
+            "aptos_consensus_blocks_fetched_network_while_fast_forward_sync",
+            "Number of blocks fetched from the network while fast forward sync"
+        )
+        .unwrap()
+    });
+
 //////////////////////
 // RECONFIGURATION COUNTERS
 //////////////////////
@@ -602,6 +792,16 @@ pub static NUM_TXNS_PER_BLOCK: Lazy<Histogram> = Lazy::new(|| {
     .unwrap()
 });
 
+/// Histogram for the number of bytes in the committed blocks.
+pub static NUM_BYTES_PER_BLOCK: Lazy<Histogram> = Lazy::new(|| {
+    register_histogram!(
+        "aptos_consensus_num_bytes_per_block",
+        "Histogram for the number of bytes per (committed) blocks.",
+        exponential_buckets(/*start=*/ 500.0, /*factor=*/ 1.4, /*count=*/ 32).unwrap()
+    )
+    .unwrap()
+});
+
 // Histogram buckets that expand DEFAULT_BUCKETS with more granularity:
 // * 0.3 to 2.0: step 0.1
 // * 2.0 to 4.0: step 0.2
@@ -790,6 +990,14 @@ pub static BLOCK_RETRIEVAL_TASK_MSGS: Lazy<IntCounterVec> = Lazy::new(|| {
     .unwrap()
 });
 
+pub static BLOCK_RETRIEVAL_LOCAL_FULFILL_COUNT: Lazy<IntCounter> = Lazy::new(|| {
+    register_int_counter!(
+        "aptos_consensus_block_retrieval_local_fulfill_count",
+        "Count of the number of local fulfillments of block retrieval requests"
+    )
+    .unwrap()
+});
+
 /// Count of the buffer manager retry requests since last restart.
 pub static BUFFER_MANAGER_RETRY_COUNT: Lazy<IntCounter> = Lazy::new(|| {
     register_int_counter!(
@@ -799,6 +1007,56 @@ pub static BUFFER_MANAGER_RETRY_COUNT: Lazy<IntCounter> = Lazy::new(|| {
     .unwrap()
 });
 
+/// Count of the buffer manager receiving executor error
+pub static BUFFER_MANAGER_RECEIVED_EXECUTOR_ERROR_COUNT: Lazy<IntCounterVec> = Lazy::new(|| {
+    register_int_counter_vec!(
+        "aptos_consensus_buffer_manager_received_executor_error_count",
+        "Count of the buffer manager receiving executor error",
+        &["error_type"],
+    )
+    .unwrap()
+});
+
+/// Count of the executor errors pipeline discarded
+pub static PIPELINE_DISCARDED_EXECUTOR_ERROR_COUNT: Lazy<IntCounterVec> = Lazy::new(|| {
+    register_int_counter_vec!(
+        "aptos_consensus_pipeline_discarded_executor_error_count",
+        "Count of the executor errors pipeline discarded",
+        &["error_type"],
+    )
+    .unwrap()
+});
+
+pub fn log_executor_error_occurred(
+    e: ExecutorError,
+    counter: &Lazy<IntCounterVec>,
+    block_id: HashValue,
+) {
+    match e {
+        ExecutorError::CouldNotGetData => {
+            counter.with_label_values(&["CouldNotGetData"]).inc();
+            warn!(
+                block_id = block_id,
+                "Execution error - CouldNotGetData {}", block_id
+            );
+        },
+        ExecutorError::BlockNotFound(block_id) => {
+            counter.with_label_values(&["BlockNotFound"]).inc();
+            warn!(
+                block_id = block_id,
+                "Execution error BlockNotFound {}", block_id
+            );
+        },
+        e => {
+            counter.with_label_values(&["UnexpectedError"]).inc();
+            error!(
+                block_id = block_id,
+                "Execution error {:?} for {}", e, block_id
+            );
+        },
+    }
+}
+
 const PROPSER_ELECTION_DURATION_BUCKETS: [f64; 17] = [
     0.001, 0.002, 0.003, 0.004, 0.006, 0.008, 0.01, 0.012, 0.014, 0.0175, 0.02, 0.025, 0.05, 0.25,
     0.5, 1.0, 2.0,
@@ -895,6 +1153,8 @@ pub fn update_counters_for_committed_blocks(blocks_to_commit: &[Arc<PipelinedBlo
         observe_block(block.block().timestamp_usecs(), BlockStage::COMMITTED);
         let txn_status = block.compute_result().compute_status_for_input_txns();
         NUM_TXNS_PER_BLOCK.observe(txn_status.len() as f64);
+        NUM_BYTES_PER_BLOCK
+            .observe(block.block().payload().map_or(0, |payload| payload.size()) as f64);
         COMMITTED_BLOCKS_COUNT.inc();
         LAST_COMMITTED_ROUND.set(block.round() as i64);
         LAST_COMMITTED_VERSION.set(block.compute_result().num_leaves() as i64);
@@ -920,6 +1180,8 @@ pub fn update_counters_for_committed_blocks(blocks_to_commit: &[Arc<PipelinedBlo
                         TXN_COMMIT_RETRY_LABEL
                     } else if *reason == DiscardedVMStatus::SEQUENCE_NUMBER_TOO_OLD {
                         TXN_COMMIT_FAILED_DUPLICATE_LABEL
+                    } else if *reason == DiscardedVMStatus::TRANSACTION_EXPIRED {
+                        TXN_COMMIT_FAILED_EXPIRED_LABEL
                     } else {
                         TXN_COMMIT_FAILED_LABEL
                     }
@@ -967,3 +1229,21 @@ pub static RAND_QUEUE_SIZE: Lazy<IntGauge> = Lazy::new(|| {
     )
     .unwrap()
 });
+
+pub static CONSENSUS_PROPOSAL_PAYLOAD_AVAILABILITY: Lazy<IntCounterVec> = Lazy::new(|| {
+    register_int_counter_vec!(
+        "aptos_consensus_proposal_payload_availability_count",
+        "The availability of proposal payload locally",
+        &["status"]
+    )
+    .unwrap()
+});
+
+pub static CONSENSUS_PROPOSAL_PAYLOAD_FETCH_DURATION: Lazy<HistogramVec> = Lazy::new(|| {
+    register_histogram_vec!(
+        "aptos_consensus_proposal_payload_fetch_duration",
+        "Time to fetch payload behind proposal with status",
+        &["status"]
+    )
+    .unwrap()
+});
diff --git a/consensus/src/dag/adapter.rs b/consensus/src/dag/adapter.rs
index 885c4de4d4123..36bd615345b04 100644
--- a/consensus/src/dag/adapter.rs
+++ b/consensus/src/dag/adapter.rs
@@ -141,7 +141,9 @@ impl OrderedNotifier for OrderedNotifierAdapter {
         ordered_nodes: Vec<Arc<CertifiedNode>>,
         failed_author: Vec<(Round, Author)>,
     ) {
-        let anchor = ordered_nodes.last().unwrap();
+        let anchor = ordered_nodes
+            .last()
+            .expect("ordered_nodes shuld not be empty");
         let epoch = anchor.epoch();
         let round = anchor.round();
         let timestamp = anchor.metadata().timestamp();
@@ -378,22 +380,22 @@ impl DAGStorage for StorageAdapter {
 
     fn get_latest_k_committed_events(&self, k: u64) -> anyhow::Result<Vec<CommitEvent>> {
         let timer = counters::FETCH_COMMIT_HISTORY_DURATION.start_timer();
-        let version = self.aptos_db.get_latest_version()?;
+        let version = self.aptos_db.get_latest_ledger_info_version()?;
         let resource = self.get_commit_history_resource(version)?;
         let handle = resource.table_handle();
         let mut commit_events = vec![];
         for i in 1..=std::cmp::min(k, resource.length()) {
             let idx = (resource.next_idx() + resource.max_capacity() - i as u32)
                 % resource.max_capacity();
-            let new_block_event = bcs::from_bytes::<NewBlockEvent>(
-                self.aptos_db
-                    .get_state_value_by_version(
-                        &StateKey::table_item(handle, &bcs::to_bytes(&idx).unwrap()),
-                        version,
-                    )?
-                    .ok_or_else(|| format_err!("Table item doesn't exist"))?
-                    .bytes(),
-            )?;
+            // idx is an u32, so it's not possible to fail to convert it to bytes
+            let idx_bytes = bcs::to_bytes(&idx)
+                .map_err(|e| anyhow::anyhow!("Failed to serialize index: {:?}", e))?;
+            let state_value = self
+                .aptos_db
+                .get_state_value_by_version(&StateKey::table_item(handle, &idx_bytes), version)?
+                .ok_or_else(|| anyhow::anyhow!("Table item doesn't exist"))?;
+            let new_block_event = bcs::from_bytes::<NewBlockEvent>(state_value.bytes())
+                .map_err(|e| anyhow::anyhow!("Failed to deserialize NewBlockEvent: {:?}", e))?;
             if self
                 .epoch_to_validators
                 .contains_key(&new_block_event.epoch())
diff --git a/consensus/src/dag/anchor_election/leader_reputation_adapter.rs b/consensus/src/dag/anchor_election/leader_reputation_adapter.rs
index 3d58d5cd31b47..5e58c803a8074 100644
--- a/consensus/src/dag/anchor_election/leader_reputation_adapter.rs
+++ b/consensus/src/dag/anchor_election/leader_reputation_adapter.rs
@@ -49,14 +49,25 @@ impl MetadataBackendAdapter {
 
     // TODO: we should change NewBlockEvent on LeaderReputation to take a trait
     fn convert(&self, event: CommitEvent) -> NewBlockEvent {
-        let validators = self.epoch_to_validators.get(&event.epoch()).unwrap();
+        let validators = self
+            .epoch_to_validators
+            .get(&event.epoch())
+            .expect("Event epoch should map back to validators!");
         let mut bitvec = BitVec::with_num_bits(validators.len() as u16);
         for author in event.parents() {
-            bitvec.set(*validators.get(author).unwrap() as u16);
+            bitvec.set(
+                *validators
+                    .get(author)
+                    .expect("Author should be in validators set!") as u16,
+            );
         }
         let mut failed_authors = vec![];
         for author in event.failed_authors() {
-            failed_authors.push(*validators.get(author).unwrap() as u64);
+            failed_authors.push(
+                *validators
+                    .get(author)
+                    .expect("Author should be in validators set!") as u64,
+            );
         }
         NewBlockEvent::new(
             AccountAddress::ZERO,
diff --git a/consensus/src/dag/bootstrap.rs b/consensus/src/dag/bootstrap.rs
index 1dd637237dad4..1cb4a98f21f53 100644
--- a/consensus/src/dag/bootstrap.rs
+++ b/consensus/src/dag/bootstrap.rs
@@ -32,7 +32,7 @@ use crate::{
     monitor,
     network::IncomingDAGRequest,
     payload_client::PayloadClient,
-    payload_manager::PayloadManager,
+    payload_manager::TPayloadManager,
     pipeline::{buffer_manager::OrderedBlocks, execution_client::TExecutionClient},
 };
 use aptos_bounded_executor::BoundedExecutor;
@@ -330,7 +330,7 @@ pub struct DagBootstrapper {
     dag_network_sender: Arc<dyn TDAGNetworkSender>,
     proof_notifier: Arc<dyn ProofNotifier>,
     time_service: aptos_time_service::TimeService,
-    payload_manager: Arc<PayloadManager>,
+    payload_manager: Arc<dyn TPayloadManager>,
     payload_client: Arc<dyn PayloadClient>,
     ordered_nodes_tx: UnboundedSender<OrderedBlocks>,
     execution_client: Arc<dyn TExecutionClient>,
@@ -355,7 +355,7 @@ impl DagBootstrapper {
         dag_network_sender: Arc<dyn TDAGNetworkSender>,
         proof_notifier: Arc<dyn ProofNotifier>,
         time_service: aptos_time_service::TimeService,
-        payload_manager: Arc<PayloadManager>,
+        payload_manager: Arc<dyn TPayloadManager>,
         payload_client: Arc<dyn PayloadClient>,
         ordered_nodes_tx: UnboundedSender<OrderedBlocks>,
         execution_client: Arc<dyn TExecutionClient>,
@@ -432,7 +432,12 @@ impl DagBootstrapper {
             .epoch_state
             .verifier
             .get_ordered_account_addresses_iter()
-            .map(|p| self.epoch_state.verifier.get_voting_power(&p).unwrap())
+            .map(|p| {
+                self.epoch_state
+                    .verifier
+                    .get_voting_power(&p)
+                    .expect("No voting power associated with AccountAddress!")
+            })
             .collect();
 
         Arc::new(LeaderReputationAdapter::new(
@@ -566,6 +571,7 @@ impl DagBootstrapper {
             .factor(rb_config.backoff_policy_factor)
             .max_delay(Duration::from_millis(rb_config.backoff_policy_max_delay_ms));
         let rb = Arc::new(ReliableBroadcast::new(
+            self.self_peer,
             validators.clone(),
             self.rb_network_sender.clone(),
             rb_backoff_policy,
@@ -620,6 +626,8 @@ impl DagBootstrapper {
                     .health_config
                     .pipeline_backpressure_config
                     .clone(),
+                // TODO: add pipeline backpressure based on execution speed to DAG config
+                None,
             ),
             ordered_notifier.clone(),
         );
@@ -730,7 +738,7 @@ pub(super) fn bootstrap_dag_for_test(
     dag_network_sender: Arc<dyn TDAGNetworkSender>,
     proof_notifier: Arc<dyn ProofNotifier>,
     time_service: aptos_time_service::TimeService,
-    payload_manager: Arc<PayloadManager>,
+    payload_manager: Arc<dyn TPayloadManager>,
     payload_client: Arc<dyn PayloadClient>,
     execution_client: Arc<dyn TExecutionClient>,
 ) -> (
diff --git a/consensus/src/dag/dag_driver.rs b/consensus/src/dag/dag_driver.rs
index 278f76248bb3e..2395ba30ef264 100644
--- a/consensus/src/dag/dag_driver.rs
+++ b/consensus/src/dag/dag_driver.rs
@@ -21,12 +21,15 @@ use crate::{
         },
         DAGRpcResult, RpcHandler,
     },
-    payload_client::PayloadClient,
+    payload_client::{PayloadClient, PayloadPullParameters},
 };
 use anyhow::{bail, ensure};
 use aptos_collections::BoundedVecDeque;
 use aptos_config::config::DagPayloadConfig;
-use aptos_consensus_types::common::{Author, Payload, PayloadFilter};
+use aptos_consensus_types::{
+    common::{Author, Payload, PayloadFilter},
+    utils::PayloadTxnsSize,
+};
 use aptos_crypto::hash::CryptoHash;
 use aptos_infallible::Mutex;
 use aptos_logger::{debug, error};
@@ -255,18 +258,23 @@ impl DagDriver {
         let (validator_txns, payload) = match self
             .payload_client
             .pull_payload(
-                Duration::from_millis(self.payload_config.payload_pull_max_poll_time_ms),
-                max_txns,
-                max_size_bytes,
-                // TODO: Set max_inline_items and max_inline_bytes correctly
-                100,
-                100 * 1024,
+                PayloadPullParameters {
+                    max_poll_time: Duration::from_millis(
+                        self.payload_config.payload_pull_max_poll_time_ms,
+                    ),
+                    max_txns: PayloadTxnsSize::new(max_txns, max_size_bytes),
+                    max_txns_after_filtering: max_txns,
+                    soft_max_txns_after_filtering: max_txns,
+                    max_inline_txns: PayloadTxnsSize::new(100, 100 * 1024),
+                    opt_batch_txns_pct: 0,
+                    user_txn_filter: payload_filter,
+                    pending_ordering: false,
+                    pending_uncommitted_blocks: 0,
+                    recent_max_fill_fraction: 0.0,
+                    block_timestamp: self.time_service.now_unix_time(),
+                },
                 sys_payload_filter,
-                payload_filter,
                 Box::pin(async {}),
-                false,
-                0,
-                0.0,
             )
             .await
         {
@@ -326,7 +334,9 @@ impl DagDriver {
             debug!(LogSchema::new(LogEvent::BroadcastNode), id = node.id());
 
             defer!( observe_round(timestamp, RoundStage::NodeBroadcasted); );
-            rb.broadcast(node, signature_builder).await
+            rb.broadcast(node, signature_builder)
+                .await
+                .expect("Broadcast cannot fail")
         };
         let certified_broadcast = async move {
             let Ok(certificate) = rx.await else {
@@ -346,7 +356,9 @@ impl DagDriver {
                 certified_node,
                 latest_ledger_info.get_latest_ledger_info(),
             );
-            rb2.broadcast(certified_node_msg, cert_ack_set).await
+            rb2.broadcast(certified_node_msg, cert_ack_set)
+                .await
+                .expect("Broadcast cannot fail until cancelled")
         };
         let core_task = join(node_broadcast, certified_broadcast);
         let author = self.author;
diff --git a/consensus/src/dag/dag_network.rs b/consensus/src/dag/dag_network.rs
index e63d490cb5f01..04654385613cb 100644
--- a/consensus/src/dag/dag_network.rs
+++ b/consensus/src/dag/dag_network.rs
@@ -63,6 +63,9 @@ impl Responders {
     }
 
     fn next_to_request(&mut self) -> Option<Vec<Author>> {
+        // We want to immediately stop if the number generator is not returning any value.
+        // expect will panic if the generator is not returning any value.
+        #[allow(clippy::unwrap_in_result)]
         let count = self.generator.next().expect("should return a number");
 
         if self.peers.is_empty() {
diff --git a/consensus/src/dag/dag_state_sync.rs b/consensus/src/dag/dag_state_sync.rs
index dd035e5094283..6cf55c4c5dd50 100644
--- a/consensus/src/dag/dag_state_sync.rs
+++ b/consensus/src/dag/dag_state_sync.rs
@@ -256,7 +256,9 @@ impl DagStateSynchronizer {
 
         self.execution_client.sync_to(commit_li).await?;
 
-        Ok(Arc::into_inner(sync_dag_store).unwrap())
+        let inner =
+            Arc::into_inner(sync_dag_store).expect("Only one strong reference should exists");
+        Ok(inner)
     }
 }
 
diff --git a/consensus/src/dag/dag_store.rs b/consensus/src/dag/dag_store.rs
index e22b23f762ae8..3fe94b0dcd128 100644
--- a/consensus/src/dag/dag_store.rs
+++ b/consensus/src/dag/dag_store.rs
@@ -110,6 +110,8 @@ impl InMemDag {
         );
 
         let node = Arc::new(node);
+        // Invariant violation, we must get the node ref (COMMENT ME)
+        #[allow(clippy::unwrap_in_result)]
         let round_ref = self
             .get_node_ref_mut(node.round(), node.author())
             .expect("must be present");
@@ -323,7 +325,11 @@ impl InMemDag {
         filter: impl Fn(&NodeStatus) -> bool,
     ) -> impl Iterator<Item = &NodeStatus> {
         let until = until.unwrap_or(self.lowest_round());
-        let initial_round = targets.clone().map(|t| t.round()).max().unwrap();
+        let initial_round = targets
+            .clone()
+            .map(|t| t.round())
+            .max()
+            .expect("Round should be not empty!");
         let initial = targets.map(|t| *t.digest()).collect();
 
         let mut reachable_filter = Self::reachable_filter(initial);
@@ -397,6 +403,8 @@ impl InMemDag {
         DagSnapshotBitmask::new(from_round, bitmask)
     }
 
+    /// unwrap is only used in debug mode
+    #[allow(clippy::unwrap_used)]
     pub(super) fn prune(&mut self) -> BTreeMap<u64, Vec<Option<NodeStatus>>> {
         let to_keep = self.nodes_by_round.split_off(&self.start_round);
         let to_prune = std::mem::replace(&mut self.nodes_by_round, to_keep);
diff --git a/consensus/src/dag/health/chain_health.rs b/consensus/src/dag/health/chain_health.rs
index 26e5d9af256be..6b9845407ae7b 100644
--- a/consensus/src/dag/health/chain_health.rs
+++ b/consensus/src/dag/health/chain_health.rs
@@ -84,7 +84,7 @@ impl TChainHealth for ChainHealthBackoff {
 
         chain_health_backoff.map(|value| {
             (
-                value.max_sending_block_txns_override,
+                value.max_sending_block_txns_after_filtering_override,
                 value.max_sending_block_bytes_override,
             )
         })
diff --git a/consensus/src/dag/health/pipeline_health.rs b/consensus/src/dag/health/pipeline_health.rs
index 3668fd68eec37..f3f5cf5b00fcd 100644
--- a/consensus/src/dag/health/pipeline_health.rs
+++ b/consensus/src/dag/health/pipeline_health.rs
@@ -68,7 +68,7 @@ impl TPipelineHealth for PipelineLatencyBasedBackpressure {
         let latency = self.adapter.pipeline_pending_latency();
         self.pipeline_config.get_backoff(latency).map(|config| {
             (
-                config.max_sending_block_txns_override,
+                config.max_sending_block_txns_after_filtering_override,
                 config.max_sending_block_bytes_override,
             )
         })
diff --git a/consensus/src/dag/observability/counters.rs b/consensus/src/dag/observability/counters.rs
index 2abdc9ec41a15..47a40e56250a2 100644
--- a/consensus/src/dag/observability/counters.rs
+++ b/consensus/src/dag/observability/counters.rs
@@ -1,6 +1,8 @@
 // Copyright © Aptos Foundation
 // SPDX-License-Identifier: Apache-2.0
 
+#![allow(clippy::unwrap_used)]
+
 use aptos_metrics_core::{
     register_histogram, register_histogram_vec, register_int_gauge, Histogram, HistogramVec,
     IntGauge,
diff --git a/consensus/src/dag/tests/dag_driver_tests.rs b/consensus/src/dag/tests/dag_driver_tests.rs
index 8354dd85037ea..4e8ace01b5a04 100644
--- a/consensus/src/dag/tests/dag_driver_tests.rs
+++ b/consensus/src/dag/tests/dag_driver_tests.rs
@@ -36,9 +36,10 @@ use aptos_types::{
     validator_verifier::{random_validator_verifier, ValidatorVerifier},
 };
 use async_trait::async_trait;
+use bytes::Bytes;
 use claims::{assert_ok, assert_ok_eq};
 use futures_channel::mpsc::unbounded;
-use std::{sync::Arc, time::Duration};
+use std::{collections::HashMap, sync::Arc, time::Duration};
 use tokio::{runtime::Handle, sync::oneshot};
 use tokio_retry::strategy::ExponentialBackoff;
 
@@ -48,14 +49,33 @@ struct MockNetworkSender {
 
 #[async_trait]
 impl RBNetworkSender<DAGMessage, DAGRpcResult> for MockNetworkSender {
+    async fn send_rb_rpc_raw(
+        &self,
+        _receiver: Author,
+        _messages: Bytes,
+        _timeout: Duration,
+    ) -> anyhow::Result<DAGRpcResult> {
+        Ok(DAGRpcResult(Ok(DAGMessage::TestAck(TestAck(Vec::new())))))
+    }
+
     async fn send_rb_rpc(
         &self,
         _receiver: Author,
-        _messagee: DAGMessage,
+        _message: DAGMessage,
         _timeout: Duration,
     ) -> anyhow::Result<DAGRpcResult> {
         Ok(DAGRpcResult(Ok(DAGMessage::TestAck(TestAck(Vec::new())))))
     }
+
+    fn to_bytes_by_protocol(
+        &self,
+        peers: Vec<Author>,
+        _message: DAGMessage,
+    ) -> anyhow::Result<HashMap<Author, Bytes>> {
+        Ok(peers.into_iter().map(|peer| (peer, Bytes::new())).collect())
+    }
+
+    fn sort_peers_by_latency(&self, _: &mut [Author]) {}
 }
 
 #[async_trait]
@@ -134,8 +154,10 @@ fn setup(
         TEST_DAG_WINDOW,
     ));
 
+    let validators: Vec<_> = signers.iter().map(|s| s.author()).collect();
     let rb = Arc::new(ReliableBroadcast::new(
-        signers.iter().map(|s| s.author()).collect(),
+        validators[0],
+        validators,
         network_sender.clone(),
         ExponentialBackoff::from_millis(10),
         aptos_time_service::TimeService::mock(),
diff --git a/consensus/src/dag/tests/dag_network_test.rs b/consensus/src/dag/tests/dag_network_test.rs
index 9aac0db90cb25..cecd07cd185ef 100644
--- a/consensus/src/dag/tests/dag_network_test.rs
+++ b/consensus/src/dag/tests/dag_network_test.rs
@@ -13,6 +13,7 @@ use aptos_reliable_broadcast::RBNetworkSender;
 use aptos_time_service::{TimeService, TimeServiceTrait};
 use aptos_types::validator_verifier::random_validator_verifier;
 use async_trait::async_trait;
+use bytes::Bytes;
 use claims::{assert_err, assert_ok};
 use futures::StreamExt;
 use std::{collections::HashMap, sync::Arc, time::Duration};
@@ -32,6 +33,15 @@ struct MockDAGNetworkSender {
 
 #[async_trait]
 impl RBNetworkSender<DAGMessage, DAGRpcResult> for MockDAGNetworkSender {
+    async fn send_rb_rpc_raw(
+        &self,
+        _receiver: Author,
+        _message: Bytes,
+        _timeout: Duration,
+    ) -> anyhow::Result<DAGRpcResult> {
+        unimplemented!()
+    }
+
     async fn send_rb_rpc(
         &self,
         _receiver: Author,
@@ -40,6 +50,16 @@ impl RBNetworkSender<DAGMessage, DAGRpcResult> for MockDAGNetworkSender {
     ) -> anyhow::Result<DAGRpcResult> {
         unimplemented!()
     }
+
+    fn to_bytes_by_protocol(
+        &self,
+        _peers: Vec<Author>,
+        _message: DAGMessage,
+    ) -> anyhow::Result<HashMap<Author, Bytes>> {
+        unimplemented!()
+    }
+
+    fn sort_peers_by_latency(&self, _: &mut [Author]) {}
 }
 
 #[async_trait]
diff --git a/consensus/src/dag/tests/dag_state_sync_tests.rs b/consensus/src/dag/tests/dag_state_sync_tests.rs
index 36223b82bb212..90d7d246a2e5d 100644
--- a/consensus/src/dag/tests/dag_state_sync_tests.rs
+++ b/consensus/src/dag/tests/dag_state_sync_tests.rs
@@ -31,13 +31,23 @@ use aptos_types::{
     validator_verifier::random_validator_verifier,
 };
 use async_trait::async_trait;
+use bytes::Bytes;
 use claims::assert_none;
-use std::{sync::Arc, time::Duration};
+use std::{collections::HashMap, sync::Arc, time::Duration};
 
 struct MockDAGNetworkSender {}
 
 #[async_trait]
 impl RBNetworkSender<DAGMessage, DAGRpcResult> for MockDAGNetworkSender {
+    async fn send_rb_rpc_raw(
+        &self,
+        _receiver: Author,
+        _message: Bytes,
+        _timeout: Duration,
+    ) -> anyhow::Result<DAGRpcResult> {
+        unimplemented!()
+    }
+
     async fn send_rb_rpc(
         &self,
         _receiver: Author,
@@ -46,6 +56,16 @@ impl RBNetworkSender<DAGMessage, DAGRpcResult> for MockDAGNetworkSender {
     ) -> anyhow::Result<DAGRpcResult> {
         unimplemented!()
     }
+
+    fn to_bytes_by_protocol(
+        &self,
+        _peers: Vec<Author>,
+        _message: DAGMessage,
+    ) -> anyhow::Result<HashMap<Author, Bytes>> {
+        unimplemented!()
+    }
+
+    fn sort_peers_by_latency(&self, _: &mut [Author]) {}
 }
 
 #[async_trait]
diff --git a/consensus/src/dag/tests/helpers.rs b/consensus/src/dag/tests/helpers.rs
index 5b9f2ff881b79..ff19b6876e2db 100644
--- a/consensus/src/dag/tests/helpers.rs
+++ b/consensus/src/dag/tests/helpers.rs
@@ -8,15 +8,34 @@ use crate::{
     },
     payload_manager::TPayloadManager,
 };
-use aptos_consensus_types::common::{Author, Payload, Round};
-use aptos_types::aggregate_signature::AggregateSignature;
+use aptos_consensus_types::{
+    block::Block,
+    common::{Author, Payload, Round},
+};
+use aptos_executor_types::ExecutorResult;
+use aptos_types::{aggregate_signature::AggregateSignature, transaction::SignedTransaction};
+use async_trait::async_trait;
 
 pub(super) const TEST_DAG_WINDOW: u64 = 5;
 
 pub(super) struct MockPayloadManager {}
 
+#[async_trait]
 impl TPayloadManager for MockPayloadManager {
     fn prefetch_payload_data(&self, _payload: &Payload, _timestamp: u64) {}
+
+    fn notify_commit(&self, _block_timestamp: u64, _payloads: Vec<Payload>) {}
+
+    fn check_payload_availability(&self, _block: &Block) -> bool {
+        unimplemented!()
+    }
+
+    async fn get_transactions(
+        &self,
+        _block: &Block,
+    ) -> ExecutorResult<(Vec<SignedTransaction>, Option<u64>)> {
+        Ok((Vec::new(), None))
+    }
 }
 
 pub(super) struct MockOrderRule {}
@@ -97,7 +116,7 @@ pub(crate) fn generate_dag_nodes(
                 nodes_at_round.push(None);
             }
         }
-        previous_round = nodes_at_round.clone();
+        previous_round.clone_from(&nodes_at_round);
         nodes.push(nodes_at_round);
     }
     nodes
diff --git a/consensus/src/dag/tests/integration_tests.rs b/consensus/src/dag/tests/integration_tests.rs
index e95d4bd004419..2a19bcc3e88b7 100644
--- a/consensus/src/dag/tests/integration_tests.rs
+++ b/consensus/src/dag/tests/integration_tests.rs
@@ -7,7 +7,7 @@ use crate::{
     network::{IncomingDAGRequest, NetworkSender, RpcResponder},
     network_interface::{ConsensusMsg, ConsensusNetworkClient, DIRECT_SEND, RPC},
     network_tests::{NetworkPlayground, TwinId},
-    payload_manager::PayloadManager,
+    payload_manager::DirectMempoolPayloadManager,
     pipeline::{buffer_manager::OrderedBlocks, execution_client::DummyExecutionClient},
     test_utils::{consensus_runtime, MockPayloadManager, MockStorage},
 };
@@ -78,7 +78,7 @@ impl DagBootstrapUnit {
         let network = Arc::new(network);
 
         let payload_client = Arc::new(MockPayloadManager::new(None));
-        let payload_manager = Arc::new(PayloadManager::DirectMempool);
+        let payload_manager = Arc::new(DirectMempoolPayloadManager::new());
 
         let execution_client = Arc::new(DummyExecutionClient);
 
@@ -158,7 +158,7 @@ fn create_network(
         playground.peer_protocols(),
     );
     let consensus_network_client = ConsensusNetworkClient::new(network_client);
-    let network_events = NetworkEvents::new(consensus_rx, None);
+    let network_events = NetworkEvents::new(consensus_rx, None, true);
 
     let (self_sender, self_receiver) = aptos_channels::new_unbounded_test();
     let network = NetworkSender::new(author, consensus_network_client, self_sender, validators);
diff --git a/consensus/src/dag/tests/order_rule_tests.rs b/consensus/src/dag/tests/order_rule_tests.rs
index fcd6dac5d0c16..a46ed9b7f0499 100644
--- a/consensus/src/dag/tests/order_rule_tests.rs
+++ b/consensus/src/dag/tests/order_rule_tests.rs
@@ -238,7 +238,7 @@ fn test_order_rule_basic() {
     for node in nodes.iter().flatten().flatten() {
         order_rule.process_new_node(node.metadata());
     }
-    let expected_order = vec![
+    let expected_order = [
         // anchor (1, 0) has 1 votes, anchor (3, 1) has 2 votes and a path to (1, 0)
         vec![(1, 0)],
         // anchor (2, 1) has 3 votes
diff --git a/consensus/src/dag/types.rs b/consensus/src/dag/types.rs
index 154af7d4f56c5..78b6c4f4bf9fe 100644
--- a/consensus/src/dag/types.rs
+++ b/consensus/src/dag/types.rs
@@ -579,15 +579,22 @@ impl BroadcastStatus<DAGMessage, DAGRpcResult> for Arc<SignatureBuilder> {
                 .check_voting_power(partial_signatures.signatures().keys(), true)
                 .is_ok()
         {
-            let aggregated_signature = self
+            let aggregated_signature = match self
                 .epoch_state
                 .verifier
                 .aggregate_signatures(partial_signatures)
-                .expect("Signature aggregation should succeed");
+            {
+                Ok(signature) => signature,
+                Err(_) => return Err(anyhow::anyhow!("Signature aggregation failed")),
+            };
             observe_node(self.metadata.timestamp(), NodeStage::CertAggregated);
             let certificate = NodeCertificate::new(self.metadata.clone(), aggregated_signature);
 
-            _ = tx.take().expect("must exist").send(certificate);
+            // Invariant Violation: The one-shot channel sender must exist to send the NodeCertificate
+            _ = tx
+                .take()
+                .expect("The one-shot channel sender must exist to send the NodeCertificate")
+                .send(certificate);
         }
 
         if partial_signatures.signatures().len() == self.epoch_state.verifier.len() {
@@ -885,7 +892,7 @@ impl TConsensusMsg for DAGMessage {
     fn into_network_message(self) -> ConsensusMsg {
         ConsensusMsg::DAGMessage(DAGNetworkMessage {
             epoch: self.epoch(),
-            data: bcs::to_bytes(&self).unwrap(),
+            data: bcs::to_bytes(&self).expect("ConsensusMsg should serialize to bytes"),
         })
     }
 }
@@ -927,7 +934,7 @@ impl TConsensusMsg for DAGRpcResult {
     fn into_network_message(self) -> ConsensusMsg {
         ConsensusMsg::DAGMessage(DAGNetworkMessage {
             epoch: self.epoch(),
-            data: bcs::to_bytes(&self).unwrap(),
+            data: bcs::to_bytes(&self).expect("ConsensusMsg should serialize to bytes!"),
         })
     }
 }
diff --git a/consensus/src/epoch_manager.rs b/consensus/src/epoch_manager.rs
index e68c8dedeaec8..df384c5afd48a 100644
--- a/consensus/src/epoch_manager.rs
+++ b/consensus/src/epoch_manager.rs
@@ -4,10 +4,11 @@
 
 use crate::{
     block_storage::{
+        pending_blocks::PendingBlocks,
         tracing::{observe_block, BlockStage},
         BlockStore,
     },
-    consensus_observer::{network::ObserverMessage, publisher::Publisher},
+    consensus_observer::publisher::ConsensusPublisher,
     counters,
     dag::{DagBootstrapper, DagCommitSigner, StorageAdapter},
     error::{error_kind, DbError},
@@ -36,7 +37,7 @@ use crate::{
     payload_client::{
         mixed::MixedPayloadClient, user::quorum_store_client::QuorumStoreClient, PayloadClient,
     },
-    payload_manager::PayloadManager,
+    payload_manager::{DirectMempoolPayloadManager, TPayloadManager},
     persistent_liveness_storage::{LedgerRecoveryData, PersistentLivenessStorage, RecoveryData},
     pipeline::execution_client::TExecutionClient,
     quorum_store::{
@@ -64,6 +65,7 @@ use aptos_consensus_types::{
     delayed_qc_msg::DelayedQcMsg,
     epoch_retrieval::EpochRetrievalRequest,
     proof_of_store::ProofCache,
+    utils::PayloadTxnsSize,
 };
 use aptos_crypto::bls12381;
 use aptos_dkg::{
@@ -171,14 +173,15 @@ pub struct EpochManager<P: OnChainConfigProvider> {
     dag_rpc_tx: Option<aptos_channel::Sender<AccountAddress, IncomingDAGRequest>>,
     dag_shutdown_tx: Option<oneshot::Sender<oneshot::Sender<()>>>,
     dag_config: DagConsensusConfig,
-    payload_manager: Arc<PayloadManager>,
+    payload_manager: Arc<dyn TPayloadManager>,
     rand_storage: Arc<dyn RandStorage<AugmentedData>>,
     proof_cache: ProofCache,
-    observer_network: Option<NetworkClient<ObserverMessage>>,
+    consensus_publisher: Option<Arc<ConsensusPublisher>>,
+    pending_blocks: Arc<Mutex<PendingBlocks>>,
 }
 
 impl<P: OnChainConfigProvider> EpochManager<P> {
-    #[allow(clippy::too_many_arguments)]
+    #[allow(clippy::too_many_arguments, clippy::unwrap_used)]
     pub(crate) fn new(
         node_config: &NodeConfig,
         time_service: Arc<dyn TimeService>,
@@ -194,7 +197,7 @@ impl<P: OnChainConfigProvider> EpochManager<P> {
         aptos_time_service: aptos_time_service::TimeService,
         vtxn_pool: VTxnPoolState,
         rand_storage: Arc<dyn RandStorage<AugmentedData>>,
-        observer_network: Option<NetworkClient<ObserverMessage>>,
+        consensus_publisher: Option<Arc<ConsensusPublisher>>,
     ) -> Self {
         let author = node_config.validator_network.as_ref().unwrap().peer_id();
         let config = node_config.consensus.clone();
@@ -235,14 +238,15 @@ impl<P: OnChainConfigProvider> EpochManager<P> {
             dag_shutdown_tx: None,
             aptos_time_service,
             dag_config,
-            payload_manager: Arc::new(PayloadManager::DirectMempool),
+            payload_manager: Arc::new(DirectMempoolPayloadManager::new()),
             rand_storage,
             proof_cache: Cache::builder()
                 .max_capacity(node_config.consensus.proof_cache_capacity)
                 .initial_capacity(1_000)
                 .time_to_live(Duration::from_secs(20))
                 .build(),
-            observer_network,
+            consensus_publisher,
+            pending_blocks: Arc::new(Mutex::new(PendingBlocks::new())),
         }
     }
 
@@ -341,7 +345,12 @@ impl<P: OnChainConfigProvider> EpochManager<P> {
                 let voting_powers: Vec<_> = if weight_by_voting_power {
                     proposers
                         .iter()
-                        .map(|p| epoch_state.verifier.get_voting_power(p).unwrap())
+                        .map(|p| {
+                            epoch_state
+                                .verifier
+                                .get_voting_power(p)
+                                .expect("INVARIANT VIOLATION: proposer not in verifier set")
+                        })
                         .collect()
                 } else {
                     vec![1; proposers.len()]
@@ -384,7 +393,9 @@ impl<P: OnChainConfigProvider> EpochManager<P> {
             },
             ProposerElectionType::RoundProposer(round_proposers) => {
                 // Hardcoded to the first proposer
-                let default_proposer = proposers.first().unwrap();
+                let default_proposer = proposers
+                    .first()
+                    .expect("INVARIANT VIOLATION: proposers is empty");
                 Arc::new(RoundProposer::new(
                     round_proposers.clone(),
                     *default_proposer,
@@ -539,6 +550,7 @@ impl<P: OnChainConfigProvider> EpochManager<P> {
 
         // shutdown existing processor first to avoid race condition with state sync.
         self.shutdown_current_processor().await;
+        *self.pending_blocks.lock() = PendingBlocks::new();
         // make sure storage is on this ledger_info too, it should be no-op if it's already committed
         // panic if this doesn't succeed since the current processors are already shutdown.
         self.execution_client
@@ -561,8 +573,8 @@ impl<P: OnChainConfigProvider> EpochManager<P> {
         max_blocks_allowed: u64,
     ) {
         let (request_tx, mut request_rx) = aptos_channel::new::<_, IncomingBlockRetrievalRequest>(
-            QueueStyle::LIFO,
-            1,
+            QueueStyle::KLAST,
+            10,
             Some(&counters::BLOCK_RETRIEVAL_TASK_MSGS),
         );
         let task = async move {
@@ -641,7 +653,7 @@ impl<P: OnChainConfigProvider> EpochManager<P> {
         network_sender: Arc<NetworkSender>,
     ) {
         let (recovery_manager_tx, recovery_manager_rx) = aptos_channel::new(
-            QueueStyle::LIFO,
+            QueueStyle::KLAST,
             10,
             Some(&counters::ROUND_MANAGER_CHANNEL_MSGS),
         );
@@ -657,6 +669,8 @@ impl<P: OnChainConfigProvider> EpochManager<P> {
             self.config
                 .max_blocks_per_sending_request(onchain_consensus_config.quorum_store_enabled()),
             self.payload_manager.clone(),
+            onchain_consensus_config.order_vote_enabled(),
+            self.pending_blocks.clone(),
         );
         tokio::spawn(recovery_manager.start(recovery_manager_rx, close_rx));
     }
@@ -666,7 +680,11 @@ impl<P: OnChainConfigProvider> EpochManager<P> {
         epoch_state: &EpochState,
         network_sender: NetworkSender,
         consensus_config: &OnChainConsensusConfig,
-    ) -> (Arc<PayloadManager>, QuorumStoreClient, QuorumStoreBuilder) {
+    ) -> (
+        Arc<dyn TPayloadManager>,
+        QuorumStoreClient,
+        QuorumStoreBuilder,
+    ) {
         // Start QuorumStore
         let (consensus_to_quorum_store_tx, consensus_to_quorum_store_rx) =
             mpsc::channel(self.config.intra_consensus_channel_buffer_size);
@@ -704,8 +722,8 @@ impl<P: OnChainConfigProvider> EpochManager<P> {
             ))
         };
 
-        let (payload_manager, quorum_store_msg_tx) = quorum_store_builder
-            .init_payload_manager(self.observer_network.clone().map(Publisher::new));
+        let (payload_manager, quorum_store_msg_tx) =
+            quorum_store_builder.init_payload_manager(self.consensus_publisher.clone());
         self.quorum_store_msg_tx = quorum_store_msg_tx;
         self.payload_manager = payload_manager.clone();
 
@@ -749,7 +767,7 @@ impl<P: OnChainConfigProvider> EpochManager<P> {
         onchain_jwk_consensus_config: OnChainJWKConsensusConfig,
         network_sender: Arc<NetworkSender>,
         payload_client: Arc<dyn PayloadClient>,
-        payload_manager: Arc<PayloadManager>,
+        payload_manager: Arc<dyn TPayloadManager>,
         rand_config: Option<RandConfig>,
         fast_rand_config: Option<RandConfig>,
         rand_msg_rx: aptos_channel::Receiver<AccountAddress, IncomingRandGenRequest>,
@@ -788,8 +806,10 @@ impl<P: OnChainConfigProvider> EpochManager<P> {
             self.create_proposer_election(&epoch_state, &onchain_consensus_config);
         let chain_health_backoff_config =
             ChainHealthBackoffConfig::new(self.config.chain_health_backoff.clone());
-        let pipeline_backpressure_config =
-            PipelineBackpressureConfig::new(self.config.pipeline_backpressure.clone());
+        let pipeline_backpressure_config = PipelineBackpressureConfig::new(
+            self.config.pipeline_backpressure.clone(),
+            self.config.execution_backpressure.clone(),
+        );
 
         let safety_rules_container = Arc::new(Mutex::new(safety_rules));
 
@@ -819,6 +839,8 @@ impl<P: OnChainConfigProvider> EpochManager<P> {
             Arc::clone(&self.time_service),
             self.config.vote_back_pressure_limit,
             payload_manager,
+            onchain_consensus_config.order_vote_enabled(),
+            self.pending_blocks.clone(),
         ));
 
         info!(epoch = epoch, "Create ProposalGenerator");
@@ -830,11 +852,18 @@ impl<P: OnChainConfigProvider> EpochManager<P> {
             payload_client,
             self.time_service.clone(),
             Duration::from_millis(self.config.quorum_store_poll_time_ms),
-            self.config.max_sending_block_txns,
-            self.config.max_sending_block_bytes,
-            self.config.max_sending_inline_txns,
-            self.config.max_sending_inline_bytes,
+            PayloadTxnsSize::new(
+                self.config.max_sending_block_txns,
+                self.config.max_sending_block_bytes,
+            ),
+            self.config.max_sending_block_txns_after_filtering,
+            PayloadTxnsSize::new(
+                self.config.max_sending_inline_txns,
+                self.config.max_sending_inline_bytes,
+            ),
             onchain_consensus_config.max_failed_authors_to_store(),
+            self.config
+                .min_max_txns_in_block_after_filtering_from_backpressure,
             pipeline_backpressure_config,
             chain_health_backoff_config,
             self.quorum_store_enabled,
@@ -844,7 +873,7 @@ impl<P: OnChainConfigProvider> EpochManager<P> {
                 .allow_batches_without_pos_in_proposal,
         );
         let (round_manager_tx, round_manager_rx) = aptos_channel::new(
-            QueueStyle::LIFO,
+            QueueStyle::KLAST,
             10,
             Some(&counters::ROUND_MANAGER_CHANNEL_MSGS),
         );
@@ -1141,8 +1170,8 @@ impl<P: OnChainConfigProvider> EpochManager<P> {
             .await;
 
         let (rand_msg_tx, rand_msg_rx) = aptos_channel::new::<AccountAddress, IncomingRandGenRequest>(
-            QueueStyle::FIFO,
-            100,
+            QueueStyle::KLAST,
+            10,
             None,
         );
 
@@ -1185,7 +1214,11 @@ impl<P: OnChainConfigProvider> EpochManager<P> {
         &mut self,
         epoch_state: &EpochState,
         consensus_config: &OnChainConsensusConfig,
-    ) -> (NetworkSender, Arc<dyn PayloadClient>, Arc<PayloadManager>) {
+    ) -> (
+        NetworkSender,
+        Arc<dyn PayloadClient>,
+        Arc<dyn TPayloadManager>,
+    ) {
         self.set_epoch_start_metrics(epoch_state);
         self.quorum_store_enabled = self.enable_quorum_store(consensus_config);
         let network_sender = self.create_network_sender(epoch_state);
@@ -1216,12 +1249,12 @@ impl<P: OnChainConfigProvider> EpochManager<P> {
         jwk_consensus_config: OnChainJWKConsensusConfig,
         network_sender: NetworkSender,
         payload_client: Arc<dyn PayloadClient>,
-        payload_manager: Arc<PayloadManager>,
+        payload_manager: Arc<dyn TPayloadManager>,
         rand_config: Option<RandConfig>,
         fast_rand_config: Option<RandConfig>,
         rand_msg_rx: aptos_channel::Receiver<AccountAddress, IncomingRandGenRequest>,
     ) {
-        match self.storage.start() {
+        match self.storage.start(consensus_config.order_vote_enabled()) {
             LivenessStorageData::FullRecoveryData(initial_data) => {
                 self.recovery_mode = false;
                 self.start_round_manager(
@@ -1262,7 +1295,7 @@ impl<P: OnChainConfigProvider> EpochManager<P> {
         onchain_jwk_consensus_config: OnChainJWKConsensusConfig,
         network_sender: NetworkSender,
         payload_client: Arc<dyn PayloadClient>,
-        payload_manager: Arc<PayloadManager>,
+        payload_manager: Arc<dyn TPayloadManager>,
         rand_config: Option<RandConfig>,
         fast_rand_config: Option<RandConfig>,
         rand_msg_rx: aptos_channel::Receiver<AccountAddress, IncomingRandGenRequest>,
@@ -1281,7 +1314,7 @@ impl<P: OnChainConfigProvider> EpochManager<P> {
             .storage
             .aptos_db()
             .get_latest_ledger_info()
-            .unwrap()
+            .expect("unable to get latest ledger info")
             .commit_info()
             .round();
 
@@ -1329,7 +1362,9 @@ impl<P: OnChainConfigProvider> EpochManager<P> {
             self.aptos_time_service.clone(),
             payload_manager,
             payload_client,
-            self.execution_client.get_execution_channel().unwrap(),
+            self.execution_client
+                .get_execution_channel()
+                .expect("unable to get execution channel"),
             self.execution_client.clone(),
             onchain_consensus_config.quorum_store_enabled(),
             onchain_consensus_config.effective_validator_txn_config(),
@@ -1380,7 +1415,10 @@ impl<P: OnChainConfigProvider> EpochManager<P> {
                 Err(err) => return Err(err),
             }
             // same epoch -> run well-formedness + signature check
-            let epoch_state = self.epoch_state.clone().unwrap();
+            let epoch_state = self
+                .epoch_state
+                .clone()
+                .ok_or_else(|| anyhow::anyhow!("Epoch state is not available"))?;
             let proof_cache = self.proof_cache.clone();
             let quorum_store_enabled = self.quorum_store_enabled;
             let quorum_store_msg_tx = self.quorum_store_msg_tx.clone();
@@ -1391,6 +1429,7 @@ impl<P: OnChainConfigProvider> EpochManager<P> {
             let max_batch_expiry_gap_usecs =
                 self.config.quorum_store.batch_expiry_gap_when_init_usecs;
             let payload_manager = self.payload_manager.clone();
+            let pending_blocks = self.pending_blocks.clone();
             self.bounded_executor
                 .spawn(async move {
                     match monitor!(
@@ -1413,6 +1452,7 @@ impl<P: OnChainConfigProvider> EpochManager<P> {
                                 peer_id,
                                 verified_event,
                                 payload_manager,
+                                pending_blocks,
                             );
                         },
                         Err(e) => {
@@ -1439,6 +1479,7 @@ impl<P: OnChainConfigProvider> EpochManager<P> {
             ConsensusMsg::ProposalMsg(_)
             | ConsensusMsg::SyncInfo(_)
             | ConsensusMsg::VoteMsg(_)
+            | ConsensusMsg::OrderVoteMsg(_)
             | ConsensusMsg::CommitVoteMsg(_)
             | ConsensusMsg::CommitDecisionMsg(_)
             | ConsensusMsg::BatchMsg(_)
@@ -1538,7 +1579,8 @@ impl<P: OnChainConfigProvider> EpochManager<P> {
         buffered_proposal_tx: Option<aptos_channel::Sender<Author, VerifiedEvent>>,
         peer_id: AccountAddress,
         event: VerifiedEvent,
-        payload_manager: Arc<PayloadManager>,
+        payload_manager: Arc<dyn TPayloadManager>,
+        pending_blocks: Arc<Mutex<PendingBlocks>>,
     ) {
         if let VerifiedEvent::ProposalMsg(proposal) = &event {
             observe_block(
@@ -1559,7 +1601,9 @@ impl<P: OnChainConfigProvider> EpochManager<P> {
                         payload_manager
                             .prefetch_payload_data(payload, p.proposal().timestamp_usecs());
                     }
+                    pending_blocks.lock().insert_block(p.proposal().clone());
                 }
+
                 Self::forward_event_to(buffered_proposal_tx, peer_id, proposal_event)
                     .context("proposal precheck sender")
             },
@@ -1759,7 +1803,7 @@ fn load_dkg_decrypt_key(
 }
 
 #[derive(Debug)]
-enum NoRandomnessReason {
+pub enum NoRandomnessReason {
     VTxnDisabled,
     FeatureDisabled,
     DKGStateResourceMissing(anyhow::Error),
@@ -1774,4 +1818,5 @@ enum NoRandomnessReason {
     KeyPairDeserializationError(bcs::Error),
     KeyPairSerializationError(bcs::Error),
     KeyPairPersistError(anyhow::Error),
+    // Test only reasons
 }
diff --git a/consensus/src/execution_pipeline.rs b/consensus/src/execution_pipeline.rs
index 53a50f01a4659..6610548549601 100644
--- a/consensus/src/execution_pipeline.rs
+++ b/consensus/src/execution_pipeline.rs
@@ -5,6 +5,7 @@
 
 use crate::{
     block_preparer::BlockPreparer,
+    counters::{self, log_executor_error_occurred},
     monitor,
     state_computer::{PipelineExecutionResult, StateComputeResultFut},
 };
@@ -26,9 +27,13 @@ use aptos_types::{
 use fail::fail_point;
 use once_cell::sync::Lazy;
 use rayon::iter::{IndexedParallelIterator, IntoParallelIterator, ParallelIterator};
-use std::sync::Arc;
+use std::{
+    sync::Arc,
+    time::{Duration, Instant},
+};
 use tokio::sync::{mpsc, oneshot};
 
+#[allow(clippy::unwrap_used)]
 pub static SIG_VERIFY_POOL: Lazy<Arc<rayon::ThreadPool>> = Lazy::new(|| {
     Arc::new(
         rayon::ThreadPoolBuilder::new()
@@ -48,6 +53,7 @@ impl ExecutionPipeline {
         let (prepare_block_tx, prepare_block_rx) = mpsc::unbounded_channel();
         let (execute_block_tx, execute_block_rx) = mpsc::unbounded_channel();
         let (ledger_apply_tx, ledger_apply_rx) = mpsc::unbounded_channel();
+
         runtime.spawn(Self::prepare_block_stage(
             prepare_block_rx,
             execute_block_tx,
@@ -110,18 +116,13 @@ impl ExecutionPipeline {
         debug!("prepare_block received block {}.", block.id());
         let input_txns = block_preparer.prepare_block(&block).await;
         if let Err(e) = input_txns {
-            result_tx.send(Err(e)).unwrap_or_else(|err| {
-                error!(
-                    block_id = block.id(),
-                    "Failed to send back execution result for block {}: {:?}.",
-                    block.id(),
-                    err,
-                );
+            result_tx.send(Err(e)).unwrap_or_else(|value| {
+                process_failed_to_send_result(value, block.id(), "prepare")
             });
             return;
         }
         let validator_txns = block.validator_txns().cloned().unwrap_or_default();
-        let input_txns = input_txns.unwrap();
+        let input_txns = input_txns.expect("input_txns must be Some.");
         tokio::task::spawn_blocking(move || {
             let txns_to_execute =
                 Block::combine_to_input_transactions(validator_txns, input_txns.clone(), metadata);
@@ -185,11 +186,14 @@ impl ExecutionPipeline {
                             error: "Injected error in compute".into(),
                         })
                     });
-                    executor.execute_and_state_checkpoint(
-                        block,
-                        parent_block_id,
-                        block_executor_onchain_config,
-                    )
+                    let start = Instant::now();
+                    executor
+                        .execute_and_state_checkpoint(
+                            block,
+                            parent_block_id,
+                            block_executor_onchain_config,
+                        )
+                        .map(|output| (output, start.elapsed()))
                 })
                 .await
             )
@@ -216,29 +220,30 @@ impl ExecutionPipeline {
             input_txns,
             block_id,
             parent_block_id,
-            state_checkpoint_output,
+            state_checkpoint_output: execution_result,
             result_tx,
         }) = block_rx.recv().await
         {
             debug!("ledger_apply stage received block {}.", block_id);
             let res = async {
+                let (state_checkpoint_output, execution_duration) = execution_result?;
                 let executor = executor.clone();
                 monitor!(
                     "ledger_apply",
                     tokio::task::spawn_blocking(move || {
-                        executor.ledger_update(block_id, parent_block_id, state_checkpoint_output?)
+                        executor.ledger_update(block_id, parent_block_id, state_checkpoint_output)
                     })
                 )
                 .await
                 .expect("Failed to spawn_blocking().")
+                .map(|output| (output, execution_duration))
             }
             .await;
-            let pipe_line_res = res.map(|output| PipelineExecutionResult::new(input_txns, output));
-            result_tx.send(pipe_line_res).unwrap_or_else(|err| {
-                error!(
-                    block_id = block_id,
-                    "Failed to send back execution result for block {}: {:?}", block_id, err,
-                );
+            let pipe_line_res = res.map(|(output, execution_duration)| {
+                PipelineExecutionResult::new(input_txns, output, execution_duration)
+            });
+            result_tx.send(pipe_line_res).unwrap_or_else(|value| {
+                process_failed_to_send_result(value, block_id, "ledger_apply")
             });
         }
         debug!("ledger_apply stage quitting.");
@@ -267,6 +272,26 @@ struct LedgerApplyCommand {
     input_txns: Vec<SignedTransaction>,
     block_id: HashValue,
     parent_block_id: HashValue,
-    state_checkpoint_output: ExecutorResult<StateCheckpointOutput>,
+    state_checkpoint_output: ExecutorResult<(StateCheckpointOutput, Duration)>,
     result_tx: oneshot::Sender<ExecutorResult<PipelineExecutionResult>>,
 }
+
+fn process_failed_to_send_result(
+    value: Result<PipelineExecutionResult, ExecutorError>,
+    block_id: HashValue,
+    from_stage: &str,
+) {
+    error!(
+        block_id = block_id,
+        is_err = value.is_err(),
+        "Failed to send back execution result from {from_stage} stage",
+    );
+    if let Err(e) = value {
+        // receive channel discarding error, log for debugging.
+        log_executor_error_occurred(
+            e,
+            &counters::PIPELINE_DISCARDED_EXECUTOR_ERROR_COUNT,
+            block_id,
+        );
+    }
+}
diff --git a/consensus/src/lib.rs b/consensus/src/lib.rs
index 0150bc2915d39..87eb81e0f40cc 100644
--- a/consensus/src/lib.rs
+++ b/consensus/src/lib.rs
@@ -29,6 +29,7 @@ mod network;
 #[cfg(test)]
 mod network_tests;
 mod payload_client;
+mod pending_order_votes;
 mod pending_votes;
 pub mod persistent_liveness_storage;
 mod pipeline;
diff --git a/consensus/src/liveness/leader_reputation.rs b/consensus/src/liveness/leader_reputation.rs
index 9351789e5100c..dfeabed8181bd 100644
--- a/consensus/src/liveness/leader_reputation.rs
+++ b/consensus/src/liveness/leader_reputation.rs
@@ -55,7 +55,7 @@ pub struct AptosDBBackend {
     window_size: usize,
     seek_len: usize,
     aptos_db: Arc<dyn DbReader>,
-    db_result: Mutex<(Vec<VersionedNewBlockEvent>, u64, bool)>,
+    db_result: Mutex<Option<(Vec<VersionedNewBlockEvent>, u64, bool)>>,
 }
 
 impl AptosDBBackend {
@@ -64,13 +64,13 @@ impl AptosDBBackend {
             window_size,
             seek_len,
             aptos_db,
-            db_result: Mutex::new((vec![], 0u64, true)),
+            db_result: Mutex::new(None),
         }
     }
 
     fn refresh_db_result(
         &self,
-        mut locked: MutexGuard<'_, (Vec<VersionedNewBlockEvent>, u64, bool)>,
+        locked: &mut MutexGuard<'_, Option<(Vec<VersionedNewBlockEvent>, u64, bool)>>,
         latest_db_version: u64,
     ) -> Result<(Vec<VersionedNewBlockEvent>, u64, bool)> {
         // assumes target round is not too far from latest commit
@@ -97,7 +97,7 @@ impl AptosDBBackend {
             std::cmp::max(latest_db_version, max_returned_version),
             hit_end,
         );
-        *locked = result.clone();
+        **locked = Some(result.clone());
         Ok(result)
     }
 
@@ -173,18 +173,30 @@ impl MetadataBackend for AptosDBBackend {
         target_epoch: u64,
         target_round: Round,
     ) -> (Vec<NewBlockEvent>, HashValue) {
-        let locked = self.db_result.lock();
-        let events = &locked.0;
-        let version = locked.1;
-        let hit_end = locked.2;
+        let mut locked = self.db_result.lock();
+        let latest_db_version = self.aptos_db.get_latest_ledger_info_version().unwrap_or(0);
+        // lazy init db_result
+        if locked.is_none() {
+            if let Err(e) = self.refresh_db_result(&mut locked, latest_db_version) {
+                warn!(
+                    error = ?e, "[leader reputation] Fail to initialize db result",
+                );
+                return (vec![], HashValue::zero());
+            }
+        }
+        let (events, version, hit_end) = {
+            // locked is somenthing
+            #[allow(clippy::unwrap_used)]
+            let result = locked.as_ref().unwrap();
+            (&result.0, result.1, result.2)
+        };
 
         let has_larger = events.first().map_or(false, |e| {
             (e.event.epoch(), e.event.round()) >= (target_epoch, target_round)
         });
-        let latest_db_version = self.aptos_db.get_latest_version().unwrap_or(0);
         // check if fresher data has potential to give us different result
         if !has_larger && version < latest_db_version {
-            let fresh_db_result = self.refresh_db_result(locked, latest_db_version);
+            let fresh_db_result = self.refresh_db_result(&mut locked, latest_db_version);
             match fresh_db_result {
                 Ok((events, _version, hit_end)) => {
                     self.get_from_db_result(target_epoch, target_round, &events, hit_end)
@@ -296,16 +308,8 @@ impl NewBlockEventAggregation {
 
             &history[start..]
         } else {
-            if !history.is_empty() {
-                assert!(
-                    (
-                        history.first().unwrap().epoch(),
-                        history.first().unwrap().round()
-                    ) >= (
-                        history.last().unwrap().epoch(),
-                        history.last().unwrap().round()
-                    )
-                );
+            if let (Some(first), Some(last)) = (history.first(), history.last()) {
+                assert!((first.epoch(), first.round()) >= (last.epoch(), last.round()));
             }
             let end = if history.len() > window_size {
                 window_size
@@ -594,7 +598,10 @@ impl LeaderReputation {
         history: &[NewBlockEvent],
         round: Round,
     ) -> VotingPowerRatio {
-        let candidates = self.epoch_to_proposers.get(&self.epoch).unwrap();
+        let candidates = self
+            .epoch_to_proposers
+            .get(&self.epoch)
+            .expect("Epoch should always map to proposers");
         // use f64 counter, as total voting power is u128
         let total_voting_power = self.voting_powers.iter().map(|v| *v as f64).sum();
         CHAIN_HEALTH_TOTAL_VOTING_POWER.set(total_voting_power);
diff --git a/consensus/src/liveness/leader_reputation_test.rs b/consensus/src/liveness/leader_reputation_test.rs
index 89739eb208fa5..06ba20faa77c7 100644
--- a/consensus/src/liveness/leader_reputation_test.rs
+++ b/consensus/src/liveness/leader_reputation_test.rs
@@ -499,7 +499,7 @@ impl DbReader for MockDbReader {
     }
 
     /// Returns the latest version, error on on non-bootstrapped DB.
-    fn get_latest_version(&self) -> aptos_storage_interface::Result<Version> {
+    fn get_latest_ledger_info_version(&self) -> aptos_storage_interface::Result<Version> {
         let version = *self.idx.lock();
         let mut to_add = self.to_add_event_after_call.lock();
         if let Some((epoch, round)) = *to_add {
diff --git a/consensus/src/liveness/proposal_generator.rs b/consensus/src/liveness/proposal_generator.rs
index ea2145a62d93a..411d24c7ac2fa 100644
--- a/consensus/src/liveness/proposal_generator.rs
+++ b/consensus/src/liveness/proposal_generator.rs
@@ -2,32 +2,38 @@
 // Parts of the project are originally copyright © Meta Platforms, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-use super::{
-    proposer_election::ProposerElection, unequivocal_proposer_election::UnequivocalProposerElection,
-};
+use super::proposer_election::ProposerElection;
 use crate::{
     block_storage::BlockReader,
     counters::{
-        CHAIN_HEALTH_BACKOFF_TRIGGERED, PIPELINE_BACKPRESSURE_ON_PROPOSAL_TRIGGERED,
-        PROPOSER_DELAY_PROPOSAL, PROPOSER_PENDING_BLOCKS_COUNT,
+        CHAIN_HEALTH_BACKOFF_TRIGGERED, EXECUTION_BACKPRESSURE_ON_PROPOSAL_TRIGGERED,
+        PIPELINE_BACKPRESSURE_ON_PROPOSAL_TRIGGERED, PROPOSER_DELAY_PROPOSAL,
+        PROPOSER_ESTIMATED_CALIBRATED_BLOCK_TXNS, PROPOSER_MAX_BLOCK_TXNS_AFTER_FILTERING,
+        PROPOSER_MAX_BLOCK_TXNS_TO_EXECUTE, PROPOSER_PENDING_BLOCKS_COUNT,
         PROPOSER_PENDING_BLOCKS_FILL_FRACTION,
     },
-    payload_client::PayloadClient,
+    payload_client::{PayloadClient, PayloadPullParameters},
     util::time_service::TimeService,
 };
 use anyhow::{bail, ensure, format_err, Context};
-use aptos_config::config::{ChainHealthBackoffValues, PipelineBackpressureValues};
+use aptos_config::config::{
+    ChainHealthBackoffValues, ExecutionBackpressureConfig, PipelineBackpressureValues,
+};
 use aptos_consensus_types::{
     block::Block,
     block_data::BlockData,
     common::{Author, Payload, PayloadFilter, Round},
+    pipelined_block::ExecutionSummary,
     quorum_cert::QuorumCert,
+    utils::PayloadTxnsSize,
 };
 use aptos_crypto::{hash::CryptoHash, HashValue};
-use aptos_logger::{error, sample, sample::SampleRate, warn};
+use aptos_infallible::Mutex;
+use aptos_logger::{error, info, sample, sample::SampleRate, warn};
 use aptos_types::{on_chain_config::ValidatorTxnConfig, validator_txn::ValidatorTransaction};
 use aptos_validator_transaction_pool as vtxn_pool;
 use futures::future::BoxFuture;
+use itertools::Itertools;
 use std::{
     collections::{BTreeMap, HashSet},
     sync::Arc,
@@ -95,23 +101,31 @@ impl ChainHealthBackoffConfig {
 #[derive(Clone)]
 pub struct PipelineBackpressureConfig {
     backoffs: BTreeMap<Round, PipelineBackpressureValues>,
+    execution: Option<ExecutionBackpressureConfig>,
 }
 
 impl PipelineBackpressureConfig {
-    pub fn new(backoffs: Vec<PipelineBackpressureValues>) -> Self {
+    pub fn new(
+        backoffs: Vec<PipelineBackpressureValues>,
+        execution: Option<ExecutionBackpressureConfig>,
+    ) -> Self {
         let original_len = backoffs.len();
         let backoffs = backoffs
             .into_iter()
             .map(|v| (v.back_pressure_pipeline_latency_limit_ms, v))
             .collect::<BTreeMap<_, _>>();
         assert_eq!(original_len, backoffs.len());
-        Self { backoffs }
+        Self {
+            backoffs,
+            execution,
+        }
     }
 
     #[allow(dead_code)]
     pub fn new_no_backoff() -> Self {
         Self {
             backoffs: BTreeMap::new(),
+            execution: None,
         }
     }
 
@@ -138,6 +152,74 @@ impl PipelineBackpressureConfig {
                 v
             })
     }
+
+    pub fn get_execution_block_size_backoff(
+        &self,
+        block_execution_times: &[ExecutionSummary],
+        max_block_txns: u64,
+    ) -> Option<u64> {
+        self.execution.as_ref().and_then(|config| {
+            let sizes = block_execution_times
+                .iter()
+                .flat_map(|summary| {
+                    // for each block, compute target (re-calibrated) block size
+
+                    let execution_time_ms = summary.execution_time.as_millis();
+                    // Only block above the time threshold are considered giving enough signal to support calibration
+                    // so we filter out shorter locks
+                    if execution_time_ms > config.min_block_time_ms_to_activate as u128
+                        && summary.payload_len > 0
+                    {
+                        // TODO: After cost of "retries" is reduced with execution pool, we
+                        // should be computing block gas limit here, simply as:
+                        // `config.target_block_time_ms / execution_time_ms * gas_consumed_by_block``
+                        //
+                        // Until then, we need to compute wanted block size to create.
+                        // Unfortunatelly, there is multiple layers where transactions are filtered.
+                        // After deduping/reordering logic is applied, max_txns_to_execute limits the transactions
+                        // passed to executor (`summary.payload_len` here), and then some are discarded for various
+                        // reasons, which we approximate are cheaply ignored.
+                        // For the rest, only `summary.to_commit` fraction of `summary.to_commit + summary.to_retry`
+                        // was executed. And so assuming same discard rate, we scale `summary.payload_len` with it.
+                        Some(
+                            ((config.target_block_time_ms as f64 / execution_time_ms as f64
+                                * (summary.to_commit as f64
+                                    / (summary.to_commit + summary.to_retry) as f64)
+                                * summary.payload_len as f64)
+                                .floor() as u64)
+                                .max(1),
+                        )
+                    } else {
+                        None
+                    }
+                })
+                .sorted()
+                .collect::<Vec<_>>();
+            if sizes.len() >= config.min_blocks_to_activate {
+                let calibrated_block_size = (*sizes
+                    .get(((config.percentile * sizes.len() as f64) as usize).min(sizes.len() - 1))
+                    .expect("guaranteed to be within vector size"))
+                .max(config.min_calibrated_txns_per_block);
+                PROPOSER_ESTIMATED_CALIBRATED_BLOCK_TXNS.observe(calibrated_block_size as f64);
+                // Check if calibrated block size is reduction in size, to turn on backpressure.
+                if max_block_txns > calibrated_block_size {
+                    info!(
+                        block_execution_times = format!("{:?}", block_execution_times),
+                        estimated_calibrated_block_sizes = format!("{:?}", sizes),
+                        calibrated_block_size = calibrated_block_size,
+                        "Execution backpressure recalibration: proposing reducing from {} to {}",
+                        max_block_txns,
+                        calibrated_block_size,
+                    );
+                    Some(calibrated_block_size)
+                } else {
+                    None
+                }
+            } else {
+                None
+            }
+        })
+    }
 }
 
 /// ProposalGenerator is responsible for generating the proposed block on demand: it's typically
@@ -162,22 +244,25 @@ pub struct ProposalGenerator {
     time_service: Arc<dyn TimeService>,
     // Max time for preparation of the proposal
     quorum_store_poll_time: Duration,
-    // Max number of transactions to be added to a proposed block.
-    max_block_txns: u64,
-    // Max number of bytes to be added to a proposed block.
-    max_block_bytes: u64,
-    // Max number of inline transactions to be added to a proposed block.
-    max_inline_txns: u64,
-    // Max number of inline bytes to be added to a proposed block.
-    max_inline_bytes: u64,
+    // Max number of transactions (count, bytes) to be added to a proposed block.
+    max_block_txns: PayloadTxnsSize,
+    // Max number of unique transactions to be added to a proposed block.
+    max_block_txns_after_filtering: u64,
+    // Max number of inline transactions (count, bytes) to be added to a proposed block.
+    max_inline_txns: PayloadTxnsSize,
     // Max number of failed authors to be added to a proposed block.
     max_failed_authors_to_store: usize,
 
+    /// If backpressure target block size is below it, update `max_txns_to_execute` instead.
+    /// Applied to execution, pipeline and chain health backpressure.
+    /// Needed as we cannot subsplit QS batches.
+    min_max_txns_in_block_after_filtering_from_backpressure: u64,
+
     pipeline_backpressure_config: PipelineBackpressureConfig,
     chain_health_backoff_config: ChainHealthBackoffConfig,
 
     // Last round that a proposal was generated
-    last_round_generated: Round,
+    last_round_generated: Mutex<Round>,
     quorum_store_enabled: bool,
     vtxn_config: ValidatorTxnConfig,
 
@@ -192,11 +277,11 @@ impl ProposalGenerator {
         payload_client: Arc<dyn PayloadClient>,
         time_service: Arc<dyn TimeService>,
         quorum_store_poll_time: Duration,
-        max_block_txns: u64,
-        max_block_bytes: u64,
-        max_inline_txns: u64,
-        max_inline_bytes: u64,
+        max_block_txns: PayloadTxnsSize,
+        max_block_txns_after_filtering: u64,
+        max_inline_txns: PayloadTxnsSize,
         max_failed_authors_to_store: usize,
+        min_max_txns_in_block_after_filtering_from_backpressure: u64,
         pipeline_backpressure_config: PipelineBackpressureConfig,
         chain_health_backoff_config: ChainHealthBackoffConfig,
         quorum_store_enabled: bool,
@@ -210,13 +295,13 @@ impl ProposalGenerator {
             time_service,
             quorum_store_poll_time,
             max_block_txns,
-            max_block_bytes,
+            max_block_txns_after_filtering,
+            min_max_txns_in_block_after_filtering_from_backpressure,
             max_inline_txns,
-            max_inline_bytes,
             max_failed_authors_to_store,
             pipeline_backpressure_config,
             chain_health_backoff_config,
-            last_round_generated: 0,
+            last_round_generated: Mutex::new(0),
             quorum_store_enabled,
             vtxn_config,
             allow_batches_without_pos_in_proposal,
@@ -231,7 +316,7 @@ impl ProposalGenerator {
     pub fn generate_nil_block(
         &self,
         round: Round,
-        proposer_election: &mut UnequivocalProposerElection,
+        proposer_election: Arc<dyn ProposerElection>,
     ) -> anyhow::Result<Block> {
         let hqc = self.ensure_highest_quorum_cert(round)?;
         let quorum_cert = hqc.as_ref().clone();
@@ -255,15 +340,18 @@ impl ProposalGenerator {
     /// 3. In case a given round is not greater than the calculated parent, return an OldRound
     /// error.
     pub async fn generate_proposal(
-        &mut self,
+        &self,
         round: Round,
-        proposer_election: &mut UnequivocalProposerElection,
+        proposer_election: Arc<dyn ProposerElection + Send + Sync>,
         wait_callback: BoxFuture<'static, ()>,
     ) -> anyhow::Result<BlockData> {
-        if self.last_round_generated < round {
-            self.last_round_generated = round;
-        } else {
-            bail!("Already proposed in the round {}", round);
+        {
+            let mut last_round_generated = self.last_round_generated.lock();
+            if *last_round_generated < round {
+                *last_round_generated = round;
+            } else {
+                bail!("Already proposed in the round {}", round);
+            }
         }
 
         let hqc = self.ensure_highest_quorum_cert(round)?;
@@ -312,28 +400,40 @@ impl ProposalGenerator {
 
             let voting_power_ratio = proposer_election.get_voting_power_participation_ratio(round);
 
-            let (max_block_txns, max_block_bytes, max_txns_from_block_to_execute, proposal_delay) =
-                self.calculate_max_block_sizes(voting_power_ratio, timestamp, round)
-                    .await;
+            let (
+                max_block_txns,
+                max_block_txns_after_filtering,
+                max_txns_from_block_to_execute,
+                proposal_delay,
+            ) = self
+                .calculate_max_block_sizes(voting_power_ratio, timestamp, round)
+                .await;
+
+            PROPOSER_MAX_BLOCK_TXNS_AFTER_FILTERING.observe(max_block_txns_after_filtering as f64);
+            if let Some(max_to_execute) = max_txns_from_block_to_execute {
+                PROPOSER_MAX_BLOCK_TXNS_TO_EXECUTE.observe(max_to_execute as f64);
+            }
 
-            PROPOSER_DELAY_PROPOSAL.set(proposal_delay.as_secs_f64());
+            PROPOSER_DELAY_PROPOSAL.observe(proposal_delay.as_secs_f64());
             if !proposal_delay.is_zero() {
                 tokio::time::sleep(proposal_delay).await;
             }
 
-            let max_pending_block_len = pending_blocks
-                .iter()
-                .map(|block| block.payload().map_or(0, |p| p.len()))
-                .max()
-                .unwrap_or(0);
-            let max_pending_block_bytes = pending_blocks
+            let max_pending_block_size = pending_blocks
                 .iter()
-                .map(|block| block.payload().map_or(0, |p| p.size()))
-                .max()
-                .unwrap_or(0);
+                .map(|block| {
+                    block.payload().map_or(PayloadTxnsSize::zero(), |p| {
+                        PayloadTxnsSize::new(p.len() as u64, p.size() as u64)
+                    })
+                })
+                .reduce(PayloadTxnsSize::maximum)
+                .unwrap_or_default();
             // Use non-backpressure reduced values for computing fill_fraction
-            let max_fill_fraction = (max_pending_block_len as f32 / self.max_block_txns as f32)
-                .max(max_pending_block_bytes as f32 / self.max_block_bytes as f32);
+            let max_fill_fraction =
+                (max_pending_block_size.count() as f32 / self.max_block_txns.count() as f32).max(
+                    max_pending_block_size.size_in_bytes() as f32
+                        / self.max_block_txns.size_in_bytes() as f32,
+                );
             PROPOSER_PENDING_BLOCKS_COUNT.set(pending_blocks.len() as i64);
             PROPOSER_PENDING_BLOCKS_FILL_FRACTION.set(max_fill_fraction as f64);
 
@@ -345,28 +445,33 @@ impl ProposalGenerator {
                 .collect();
             let validator_txn_filter =
                 vtxn_pool::TransactionFilter::PendingTxnHashSet(pending_validator_txn_hashes);
+
             let (validator_txns, mut payload) = self
                 .payload_client
                 .pull_payload(
-                    self.quorum_store_poll_time.saturating_sub(proposal_delay),
-                    max_block_txns,
-                    max_block_bytes,
-                    // TODO: Set max_inline_txns and max_inline_bytes correctly
-                    self.max_inline_txns,
-                    self.max_inline_bytes,
+                    PayloadPullParameters {
+                        max_poll_time: self.quorum_store_poll_time.saturating_sub(proposal_delay),
+                        max_txns: max_block_txns,
+                        max_txns_after_filtering: max_block_txns_after_filtering,
+                        soft_max_txns_after_filtering: max_txns_from_block_to_execute
+                            .unwrap_or(max_block_txns_after_filtering),
+                        max_inline_txns: self.max_inline_txns,
+                        opt_batch_txns_pct: 0,
+                        user_txn_filter: payload_filter,
+                        pending_ordering,
+                        pending_uncommitted_blocks: pending_blocks.len(),
+                        recent_max_fill_fraction: max_fill_fraction,
+                        block_timestamp: timestamp,
+                    },
                     validator_txn_filter,
-                    payload_filter,
                     wait_callback,
-                    pending_ordering,
-                    pending_blocks.len(),
-                    max_fill_fraction,
                 )
                 .await
                 .context("Fail to retrieve payload")?;
 
             if !payload.is_direct()
                 && max_txns_from_block_to_execute.is_some()
-                && payload.len() > max_txns_from_block_to_execute.unwrap()
+                && max_txns_from_block_to_execute.map_or(false, |v| payload.len() as u64 > v)
             {
                 payload = payload.transform_to_quorum_store_v2(max_txns_from_block_to_execute);
             }
@@ -406,66 +511,114 @@ impl ProposalGenerator {
     }
 
     async fn calculate_max_block_sizes(
-        &mut self,
+        &self,
         voting_power_ratio: f64,
         timestamp: Duration,
         round: Round,
-    ) -> (u64, u64, Option<usize>, Duration) {
-        let mut values_max_block_txns = vec![self.max_block_txns];
-        let mut values_max_block_bytes = vec![self.max_block_bytes];
+    ) -> (PayloadTxnsSize, u64, Option<u64>, Duration) {
+        let mut values_max_block_txns_after_filtering = vec![self.max_block_txns_after_filtering];
+        let mut values_max_block = vec![self.max_block_txns];
         let mut values_proposal_delay = vec![Duration::ZERO];
-        let mut values_max_txns_from_block_to_execute = vec![];
 
         let chain_health_backoff = self
             .chain_health_backoff_config
             .get_backoff(voting_power_ratio);
         if let Some(value) = chain_health_backoff {
-            values_max_block_txns.push(value.max_sending_block_txns_override);
-            values_max_block_bytes.push(value.max_sending_block_bytes_override);
-            if let Some(val) = value.max_txns_from_block_to_execute {
-                values_max_txns_from_block_to_execute.push(val);
-            }
+            values_max_block_txns_after_filtering
+                .push(value.max_sending_block_txns_after_filtering_override);
+            values_max_block.push(
+                self.max_block_txns
+                    .compute_with_bytes(value.max_sending_block_bytes_override),
+            );
             values_proposal_delay.push(Duration::from_millis(value.backoff_proposal_delay_ms));
             CHAIN_HEALTH_BACKOFF_TRIGGERED.observe(1.0);
         } else {
             CHAIN_HEALTH_BACKOFF_TRIGGERED.observe(0.0);
         }
 
+        let pipeline_pending_latency = self.block_store.pipeline_pending_latency(timestamp);
         let pipeline_backpressure = self
             .pipeline_backpressure_config
-            .get_backoff(self.block_store.pipeline_pending_latency(timestamp));
+            .get_backoff(pipeline_pending_latency);
         if let Some(value) = pipeline_backpressure {
-            values_max_block_txns.push(value.max_sending_block_txns_override);
-            values_max_block_bytes.push(value.max_sending_block_bytes_override);
-            if let Some(val) = value.max_txns_from_block_to_execute {
-                values_max_txns_from_block_to_execute.push(val);
-            }
+            values_max_block_txns_after_filtering
+                .push(value.max_sending_block_txns_after_filtering_override);
+            values_max_block.push(
+                self.max_block_txns
+                    .compute_with_bytes(value.max_sending_block_bytes_override),
+            );
             values_proposal_delay.push(Duration::from_millis(value.backpressure_proposal_delay_ms));
             PIPELINE_BACKPRESSURE_ON_PROPOSAL_TRIGGERED.observe(1.0);
         } else {
             PIPELINE_BACKPRESSURE_ON_PROPOSAL_TRIGGERED.observe(0.0);
         };
 
-        let max_block_txns = values_max_block_txns.into_iter().min().unwrap();
-        let max_block_bytes = values_max_block_bytes.into_iter().min().unwrap();
-        let proposal_delay = values_proposal_delay.into_iter().max().unwrap();
-        let max_txns_from_block_to_execute =
-            values_max_txns_from_block_to_execute.into_iter().min();
-        if pipeline_backpressure.is_some() || chain_health_backoff.is_some() {
-            warn!(
-                "Generating proposal: reducing limits to {} txns (filtered to {:?}) and {} bytes, due to pipeline_backpressure: {}, chain health backoff: {}. Delaying sending proposal by {}ms. Round: {}",
-                max_block_txns,
-                max_txns_from_block_to_execute,
-                max_block_bytes,
-                pipeline_backpressure.is_some(),
-                chain_health_backoff.is_some(),
-                proposal_delay.as_millis(),
-                round,
-            );
+        let mut execution_backpressure_applied = false;
+        if let Some(config) = &self.pipeline_backpressure_config.execution {
+            let execution_backpressure = self
+                .pipeline_backpressure_config
+                .get_execution_block_size_backoff(
+                    &self
+                        .block_store
+                        .get_recent_block_execution_times(config.num_blocks_to_look_at),
+                    self.max_block_txns_after_filtering,
+                );
+            if let Some(execution_backpressure_block_size) = execution_backpressure {
+                values_max_block_txns_after_filtering.push(execution_backpressure_block_size);
+                execution_backpressure_applied = true;
+            }
         }
+        EXECUTION_BACKPRESSURE_ON_PROPOSAL_TRIGGERED.observe(
+            if execution_backpressure_applied {
+                1.0
+            } else {
+                0.0
+            },
+        );
+
+        let max_block_txns_after_filtering = values_max_block_txns_after_filtering
+            .into_iter()
+            .min()
+            .expect("always initialized to at least one value");
+
+        let max_block_size = values_max_block
+            .into_iter()
+            .reduce(PayloadTxnsSize::minimum)
+            .expect("always initialized to at least one value");
+        let proposal_delay = values_proposal_delay
+            .into_iter()
+            .max()
+            .expect("always initialized to at least one value");
+
+        let (max_block_txns_after_filtering, max_txns_from_block_to_execute) = if self
+            .min_max_txns_in_block_after_filtering_from_backpressure
+            > max_block_txns_after_filtering
+        {
+            (
+                self.min_max_txns_in_block_after_filtering_from_backpressure,
+                Some(max_block_txns_after_filtering),
+            )
+        } else {
+            (max_block_txns_after_filtering, None)
+        };
+
+        warn!(
+            pipeline_pending_latency = pipeline_pending_latency.as_millis(),
+            proposal_delay_ms = proposal_delay.as_millis(),
+            max_block_txns_after_filtering = max_block_txns_after_filtering,
+            max_txns_from_block_to_execute =
+                max_txns_from_block_to_execute.unwrap_or(max_block_txns_after_filtering),
+            max_block_size = max_block_size,
+            is_pipeline_backpressure = pipeline_backpressure.is_some(),
+            is_execution_backpressure = execution_backpressure_applied,
+            is_chain_health_backoff = chain_health_backoff.is_some(),
+            round = round,
+            "Proposal generation backpressure details",
+        );
+
         (
-            max_block_txns,
-            max_block_bytes,
+            max_block_size,
+            max_block_txns_after_filtering,
             max_txns_from_block_to_execute,
             proposal_delay,
         )
@@ -494,7 +647,7 @@ impl ProposalGenerator {
         round: Round,
         previous_round: Round,
         include_cur_round: bool,
-        proposer_election: &mut UnequivocalProposerElection,
+        proposer_election: Arc<dyn ProposerElection>,
     ) -> Vec<(Round, Author)> {
         let end_round = round + u64::from(include_cur_round);
         let mut failed_authors = Vec::new();
diff --git a/consensus/src/liveness/proposal_generator_test.rs b/consensus/src/liveness/proposal_generator_test.rs
index ab4102b7a39f3..aae56dc864644 100644
--- a/consensus/src/liveness/proposal_generator_test.rs
+++ b/consensus/src/liveness/proposal_generator_test.rs
@@ -17,6 +17,7 @@ use crate::{
 use aptos_consensus_types::{
     block::{block_test_utils::certificate_for_genesis, Block},
     common::Author,
+    utils::PayloadTxnsSize,
 };
 use aptos_types::{on_chain_config::ValidatorTxnConfig, validator_signer::ValidatorSigner};
 use futures::{future::BoxFuture, FutureExt};
@@ -30,30 +31,31 @@ fn empty_callback() -> BoxFuture<'static, ()> {
 async fn test_proposal_generation_empty_tree() {
     let signer = ValidatorSigner::random(None);
     let block_store = build_empty_tree();
-    let mut proposal_generator = ProposalGenerator::new(
+    let proposal_generator = ProposalGenerator::new(
         signer.author(),
         block_store.clone(),
         Arc::new(MockPayloadManager::new(None)),
         Arc::new(SimulatedTimeService::new()),
         Duration::ZERO,
+        PayloadTxnsSize::new(1, 10),
         1,
+        PayloadTxnsSize::new(1, 10),
         10,
         1,
-        10,
-        10,
         PipelineBackpressureConfig::new_no_backoff(),
         ChainHealthBackoffConfig::new_no_backoff(),
         false,
         ValidatorTxnConfig::default_disabled(),
         true,
     );
-    let mut proposer_election =
-        UnequivocalProposerElection::new(Arc::new(RotatingProposer::new(vec![signer.author()], 1)));
+    let proposer_election = Arc::new(UnequivocalProposerElection::new(Arc::new(
+        RotatingProposer::new(vec![signer.author()], 1),
+    )));
     let genesis = block_store.ordered_root();
 
     // Generate proposals for an empty tree.
     let proposal_data = proposal_generator
-        .generate_proposal(1, &mut proposer_election, empty_callback())
+        .generate_proposal(1, proposer_election.clone(), empty_callback())
         .await
         .unwrap();
     let proposal = Block::new_proposal_from_block_data(proposal_data, &signer).unwrap();
@@ -64,7 +66,7 @@ async fn test_proposal_generation_empty_tree() {
 
     // Duplicate proposals on the same round are not allowed
     let proposal_err = proposal_generator
-        .generate_proposal(1, &mut proposer_election, empty_callback())
+        .generate_proposal(1, proposer_election.clone(), empty_callback())
         .await
         .err();
     assert!(proposal_err.is_some());
@@ -74,26 +76,25 @@ async fn test_proposal_generation_empty_tree() {
 async fn test_proposal_generation_parent() {
     let mut inserter = TreeInserter::default();
     let block_store = inserter.block_store();
-    let mut proposal_generator = ProposalGenerator::new(
+    let proposal_generator = ProposalGenerator::new(
         inserter.signer().author(),
         block_store.clone(),
         Arc::new(MockPayloadManager::new(None)),
         Arc::new(SimulatedTimeService::new()),
         Duration::ZERO,
+        PayloadTxnsSize::new(1, 1000),
         1,
-        1000,
-        1,
-        500,
+        PayloadTxnsSize::new(1, 500),
         10,
+        1,
         PipelineBackpressureConfig::new_no_backoff(),
         ChainHealthBackoffConfig::new_no_backoff(),
         false,
         ValidatorTxnConfig::default_disabled(),
         true,
     );
-    let mut proposer_election = UnequivocalProposerElection::new(Arc::new(RotatingProposer::new(
-        vec![inserter.signer().author()],
-        1,
+    let proposer_election = Arc::new(UnequivocalProposerElection::new(Arc::new(
+        RotatingProposer::new(vec![inserter.signer().author()], 1),
     )));
     let genesis = block_store.ordered_root();
     let a1 = inserter
@@ -104,7 +105,7 @@ async fn test_proposal_generation_parent() {
         .await;
 
     let original_res = proposal_generator
-        .generate_proposal(10, &mut proposer_election, empty_callback())
+        .generate_proposal(10, proposer_election.clone(), empty_callback())
         .await
         .unwrap();
     // With no certifications the parent is genesis
@@ -118,7 +119,7 @@ async fn test_proposal_generation_parent() {
     // Once a1 is certified, it should be the one to choose from
     inserter.insert_qc_for_block(a1.as_ref(), None);
     let a1_child_res = proposal_generator
-        .generate_proposal(11, &mut proposer_election, empty_callback())
+        .generate_proposal(11, proposer_election.clone(), empty_callback())
         .await
         .unwrap();
     assert_eq!(a1_child_res.parent_id(), a1.id());
@@ -133,7 +134,7 @@ async fn test_proposal_generation_parent() {
     // Once b1 is certified, it should be the one to choose from
     inserter.insert_qc_for_block(b1.as_ref(), None);
     let b1_child_res = proposal_generator
-        .generate_proposal(15, &mut proposer_election, empty_callback())
+        .generate_proposal(15, proposer_election.clone(), empty_callback())
         .await
         .unwrap();
     assert_eq!(b1_child_res.parent_id(), b1.id());
@@ -150,26 +151,25 @@ async fn test_proposal_generation_parent() {
 async fn test_old_proposal_generation() {
     let mut inserter = TreeInserter::default();
     let block_store = inserter.block_store();
-    let mut proposal_generator = ProposalGenerator::new(
+    let proposal_generator = ProposalGenerator::new(
         inserter.signer().author(),
         block_store.clone(),
         Arc::new(MockPayloadManager::new(None)),
         Arc::new(SimulatedTimeService::new()),
         Duration::ZERO,
+        PayloadTxnsSize::new(1, 1000),
         1,
-        1000,
-        1,
-        500,
+        PayloadTxnsSize::new(1, 500),
         10,
+        1,
         PipelineBackpressureConfig::new_no_backoff(),
         ChainHealthBackoffConfig::new_no_backoff(),
         false,
         ValidatorTxnConfig::default_disabled(),
         true,
     );
-    let mut proposer_election = UnequivocalProposerElection::new(Arc::new(RotatingProposer::new(
-        vec![inserter.signer().author()],
-        1,
+    let proposer_election = Arc::new(UnequivocalProposerElection::new(Arc::new(
+        RotatingProposer::new(vec![inserter.signer().author()], 1),
     )));
     let genesis = block_store.ordered_root();
     let a1 = inserter
@@ -178,7 +178,7 @@ async fn test_old_proposal_generation() {
     inserter.insert_qc_for_block(a1.as_ref(), None);
 
     let proposal_err = proposal_generator
-        .generate_proposal(1, &mut proposer_election, empty_callback())
+        .generate_proposal(1, proposer_election.clone(), empty_callback())
         .await
         .err();
     assert!(proposal_err.is_some());
@@ -191,31 +191,30 @@ async fn test_correct_failed_authors() {
     let peer1 = Author::random();
     let peer2 = Author::random();
     let block_store = inserter.block_store();
-    let mut proposal_generator = ProposalGenerator::new(
+    let proposal_generator = ProposalGenerator::new(
         author,
         block_store.clone(),
         Arc::new(MockPayloadManager::new(None)),
         Arc::new(SimulatedTimeService::new()),
         Duration::ZERO,
+        PayloadTxnsSize::new(1, 1000),
         1,
-        1000,
-        1,
-        500,
+        PayloadTxnsSize::new(1, 500),
         10,
+        1,
         PipelineBackpressureConfig::new_no_backoff(),
         ChainHealthBackoffConfig::new_no_backoff(),
         false,
         ValidatorTxnConfig::default_disabled(),
         true,
     );
-    let mut proposer_election = UnequivocalProposerElection::new(Arc::new(RotatingProposer::new(
-        vec![author, peer1, peer2],
-        1,
+    let proposer_election = Arc::new(UnequivocalProposerElection::new(Arc::new(
+        RotatingProposer::new(vec![author, peer1, peer2], 1),
     )));
     let genesis = block_store.ordered_root();
 
     let result = proposal_generator
-        .generate_proposal(6, &mut proposer_election, empty_callback())
+        .generate_proposal(6, proposer_election.clone(), empty_callback())
         .await
         .unwrap();
     // With no certifications the parent is genesis
diff --git a/consensus/src/liveness/proposer_election.rs b/consensus/src/liveness/proposer_election.rs
index d9935bd731bac..0a898a5c6ce97 100644
--- a/consensus/src/liveness/proposer_election.rs
+++ b/consensus/src/liveness/proposer_election.rs
@@ -66,7 +66,7 @@ pub(crate) fn choose_index(mut weights: Vec<u128>, state: Vec<u8>) -> usize {
                 Ordering::Greater
             }
         })
-        .unwrap_err()
+        .expect_err("Comparison never returns equals, so it's always guaranteed to be error")
 }
 
 #[test]
diff --git a/consensus/src/liveness/round_state.rs b/consensus/src/liveness/round_state.rs
index 12cb7f5061e04..ea7e6e7f5b362 100644
--- a/consensus/src/liveness/round_state.rs
+++ b/consensus/src/liveness/round_state.rs
@@ -62,18 +62,18 @@ impl fmt::Display for NewRoundEvent {
 }
 
 /// Determines the maximum round duration based on the round difference between the current
-/// round and the committed round
+/// round and the ordered round
 pub trait RoundTimeInterval: Send + Sync + 'static {
-    /// Use the index of the round after the highest quorum certificate to commit a block and
+    /// Use the index of the round after the highest quorum certificate to order a block and
     /// return the duration for this round
     ///
     /// Round indices start at 0 (round index = 0 is the first round after the round that led
-    /// to the highest committed round).  Given that round r is the highest round to commit a
+    /// to the highest ordered round).  Given that round r is the highest round to order a
     /// block, then round index 0 is round r+1.  Note that for genesis does not follow the
     /// 3-chain rule for commits, so round 1 has round index 0.  For example, if one wants
-    /// to calculate the round duration of round 6 and the highest committed round is 3 (meaning
-    /// the highest round to commit a block is round 5, then the round index is 0.
-    fn get_round_duration(&self, round_index_after_committed_qc: usize) -> Duration;
+    /// to calculate the round duration of round 6 and the highest ordered round is 3 (meaning
+    /// the highest round to order a block is round 5, then the round index is 0.
+    fn get_round_duration(&self, round_index_after_ordered_qc: usize) -> Duration;
 }
 
 /// Round durations increase exponentially
@@ -81,7 +81,7 @@ pub trait RoundTimeInterval: Send + Sync + 'static {
 /// Where power=max(rounds_since_qc, max_exponent)
 #[derive(Clone)]
 pub struct ExponentialTimeInterval {
-    // Initial time interval duration after a successful quorum commit.
+    // Initial time interval duration after a successful quorum ordering.
     base_ms: u64,
     // By how much we increase interval every time
     exponent_base: f64,
@@ -117,8 +117,8 @@ impl ExponentialTimeInterval {
 }
 
 impl RoundTimeInterval for ExponentialTimeInterval {
-    fn get_round_duration(&self, round_index_after_committed_qc: usize) -> Duration {
-        let pow = round_index_after_committed_qc.min(self.max_exponent) as u32;
+    fn get_round_duration(&self, round_index_after_ordered_qc: usize) -> Duration {
+        let pow = round_index_after_ordered_qc.min(self.max_exponent) as u32;
         let base_multiplier = self.exponent_base.powf(f64::from(pow));
         let duration_ms = ((self.base_ms as f64) * base_multiplier).ceil() as u64;
         Duration::from_millis(duration_ms)
@@ -133,20 +133,20 @@ impl RoundTimeInterval for ExponentialTimeInterval {
 /// * there is a TimeoutCertificate for round `r-1`.
 ///
 /// Round interval calculation is the responsibility of the RoundStateTimeoutInterval trait. It
-/// depends on the delta between the current round and the highest committed round (the intuition is
+/// depends on the delta between the current round and the highest ordered round (the intuition is
 /// that we want to exponentially grow the interval the further the current round is from the last
-/// committed round).
+/// ordered round).
 ///
 /// Whenever a new round starts a local timeout is set following the round interval. This local
 /// timeout is going to send the timeout events once in interval until the new round starts.
 pub struct RoundState {
-    // Determines the time interval for a round given the number of non-committed rounds since
-    // last commit.
+    // Determines the time interval for a round given the number of non-ordered rounds since
+    // last ordering.
     time_interval: Box<dyn RoundTimeInterval>,
-    // Highest known committed round as reported by the caller. The caller might choose not to
-    // inform the RoundState about certain committed rounds (e.g., NIL blocks): in this case the
-    // committed round in RoundState might lag behind the committed round of a block tree.
-    highest_committed_round: Round,
+    // Highest known ordered round as reported by the caller. The caller might choose not to
+    // inform the RoundState about certain ordered rounds (e.g., NIL blocks): in this case the
+    // ordered round in RoundState might lag behind the ordered round of a block tree.
+    highest_ordered_round: Round,
     // Current round is max{highest_qc, highest_tc} + 1.
     current_round: Round,
     // The deadline for the next local timeout event. It is reset every time a new round start, or
@@ -157,7 +157,7 @@ pub struct RoundState {
     time_service: Arc<dyn TimeService>,
     // To send local timeout events to the subscriber (e.g., SMR)
     timeout_sender: aptos_channels::Sender<Round>,
-    // Votes received fot the current round.
+    // Votes received for the current round.
     pending_votes: PendingVotes,
     // Vote sent locally for the current round.
     vote_sent: Option<Vote>,
@@ -171,7 +171,7 @@ pub struct RoundState {
 #[derive(Default, Schema)]
 pub struct RoundStateLogSchema<'a> {
     round: Option<Round>,
-    committed_round: Option<Round>,
+    highest_ordered_round: Option<Round>,
     #[schema(display)]
     pending_votes: Option<&'a PendingVotes>,
     #[schema(display)]
@@ -182,7 +182,7 @@ impl<'a> RoundStateLogSchema<'a> {
     pub fn new(state: &'a RoundState) -> Self {
         Self {
             round: Some(state.current_round),
-            committed_round: Some(state.highest_committed_round),
+            highest_ordered_round: Some(state.highest_ordered_round),
             pending_votes: Some(&state.pending_votes),
             self_vote: state.vote_sent.as_ref(),
         }
@@ -208,10 +208,9 @@ impl RoundState {
             delayed_qc_tx.clone(),
             qc_aggregator_type.clone(),
         );
-
         Self {
             time_interval,
-            highest_committed_round: 0,
+            highest_ordered_round: 0,
             current_round: 0,
             current_round_deadline: time_service.get_current_timestamp(),
             time_service,
@@ -251,11 +250,11 @@ impl RoundState {
         true
     }
 
-    /// Notify the RoundState about the potentially new QC, TC, and highest committed round.
+    /// Notify the RoundState about the potentially new QC, TC, and highest ordered round.
     /// Note that some of these values might not be available by the caller.
     pub fn process_certificates(&mut self, sync_info: SyncInfo) -> Option<NewRoundEvent> {
-        if sync_info.highest_ordered_round() > self.highest_committed_round {
-            self.highest_committed_round = sync_info.highest_ordered_round();
+        if sync_info.highest_ordered_round() > self.highest_ordered_round {
+            self.highest_ordered_round = sync_info.highest_ordered_round();
         }
         let new_round = sync_info.highest_round() + 1;
         if new_round > self.current_round {
@@ -311,7 +310,7 @@ impl RoundState {
         }
     }
 
-    pub async fn process_delayed_qc_msg(
+    pub fn process_delayed_qc_msg(
         &mut self,
         validator_verifier: &ValidatorVerifier,
         msg: DelayedQcMsg,
@@ -325,11 +324,6 @@ impl RoundState {
         self.vote_sent.clone()
     }
 
-    /// Setup a longer timeout task for leader because it enters the round earlier.
-    pub fn setup_leader_timeout(&mut self) {
-        self.setup_timeout(2);
-    }
-
     /// Setup the timeout task and return the duration of the current timeout
     fn setup_timeout(&mut self, multiplier: u32) -> Duration {
         let timeout_sender = self.timeout_sender.clone();
@@ -350,20 +344,20 @@ impl RoundState {
 
     /// Setup the current round deadline and return the duration of the current round
     fn setup_deadline(&mut self, multiplier: u32) -> Duration {
-        let round_index_after_committed_round = {
-            if self.highest_committed_round == 0 {
+        let round_index_after_ordered_round = {
+            if self.highest_ordered_round == 0 {
                 // Genesis doesn't require the 3-chain rule for commit, hence start the index at
                 // the round after genesis.
                 self.current_round - 1
-            } else if self.current_round < self.highest_committed_round + 3 {
+            } else if self.current_round < self.highest_ordered_round + 3 {
                 0
             } else {
-                self.current_round - self.highest_committed_round - 3
+                self.current_round - self.highest_ordered_round - 3
             }
         } as usize;
         let timeout = self
             .time_interval
-            .get_round_duration(round_index_after_committed_round)
+            .get_round_duration(round_index_after_ordered_round)
             * multiplier;
         let now = self.time_service.get_current_timestamp();
         debug!(
diff --git a/consensus/src/liveness/round_state_test.rs b/consensus/src/liveness/round_state_test.rs
index c29179131a8a6..03f1d245359d1 100644
--- a/consensus/src/liveness/round_state_test.rs
+++ b/consensus/src/liveness/round_state_test.rs
@@ -149,7 +149,7 @@ fn generate_sync_info(
         ),
         ledger_info,
     );
-    let commit_cert = quorum_cert.clone();
+    let commit_cert = quorum_cert.into_wrapped_ledger_info();
     let tc = TwoChainTimeoutCertificate::new(TwoChainTimeout::new(
         1,
         timeout_round,
diff --git a/consensus/src/logging.rs b/consensus/src/logging.rs
index 66952ec71af6b..27cba58a3280a 100644
--- a/consensus/src/logging.rs
+++ b/consensus/src/logging.rs
@@ -20,6 +20,7 @@ pub struct LogSchema {
 
 #[derive(Serialize)]
 pub enum LogEvent {
+    BroadcastOrderVote,
     CommitViaBlock,
     CommitViaSync,
     IncrementalProofExpired,
@@ -39,6 +40,7 @@ pub enum LogEvent {
     ReceiveProposal,
     ReceiveSyncInfo,
     ReceiveVote,
+    ReceiveOrderVote,
     RetrieveBlock,
     StateSync,
     Timeout,
diff --git a/consensus/src/metrics_safety_rules.rs b/consensus/src/metrics_safety_rules.rs
index d49d2dbf12465..eee5f21e1447c 100644
--- a/consensus/src/metrics_safety_rules.rs
+++ b/consensus/src/metrics_safety_rules.rs
@@ -8,6 +8,8 @@ use crate::{
 };
 use aptos_consensus_types::{
     block_data::BlockData,
+    order_vote::OrderVote,
+    order_vote_proposal::OrderVoteProposal,
     timeout_2chain::{TwoChainTimeout, TwoChainTimeoutCertificate},
     vote::Vote,
     vote_proposal::VoteProposal,
@@ -123,6 +125,18 @@ impl TSafetyRules for MetricsSafetyRules {
         })
     }
 
+    fn construct_and_sign_order_vote(
+        &mut self,
+        order_vote_proposal: &OrderVoteProposal,
+    ) -> Result<OrderVote, Error> {
+        self.retry(|inner| {
+            monitor!(
+                "safety_rules",
+                inner.construct_and_sign_order_vote(order_vote_proposal)
+            )
+        })
+    }
+
     fn sign_commit_vote(
         &mut self,
         ledger_info: LedgerInfoWithSignatures,
@@ -152,6 +166,8 @@ mod tests {
     use crate::{metrics_safety_rules::MetricsSafetyRules, test_utils::EmptyStorage};
     use aptos_consensus_types::{
         block_data::BlockData,
+        order_vote::OrderVote,
+        order_vote_proposal::OrderVoteProposal,
         timeout_2chain::{TwoChainTimeout, TwoChainTimeoutCertificate},
         vote::Vote,
         vote_proposal::VoteProposal,
@@ -227,6 +243,13 @@ mod tests {
             unimplemented!()
         }
 
+        fn construct_and_sign_order_vote(
+            &mut self,
+            _: &OrderVoteProposal,
+        ) -> Result<OrderVote, Error> {
+            unimplemented!()
+        }
+
         fn sign_commit_vote(
             &mut self,
             _: LedgerInfoWithSignatures,
diff --git a/consensus/src/network.rs b/consensus/src/network.rs
index d5aa29f7398a4..698e089638513 100644
--- a/consensus/src/network.rs
+++ b/consensus/src/network.rs
@@ -25,6 +25,7 @@ use aptos_config::network_id::NetworkId;
 use aptos_consensus_types::{
     block_retrieval::{BlockRetrievalRequest, BlockRetrievalResponse},
     common::Author,
+    order_vote_msg::OrderVoteMsg,
     pipeline::{commit_decision::CommitDecision, commit_vote::CommitVote},
     proof_of_store::{ProofOfStore, ProofOfStoreMsg, SignedBatchInfo, SignedBatchInfoMsg},
     proposal_msg::ProposalMsg,
@@ -52,6 +53,7 @@ use futures::{
 };
 use serde::{de::DeserializeOwned, Serialize};
 use std::{
+    collections::HashMap,
     mem::{discriminant, Discriminant},
     sync::Arc,
     time::Duration,
@@ -168,8 +170,6 @@ pub struct NetworkReceivers {
 
 #[async_trait::async_trait]
 pub trait QuorumStoreSender: Send + Clone {
-    async fn send_batch_request(&self, request: BatchRequest, recipients: Vec<Author>);
-
     async fn request_batch(
         &self,
         request: BatchRequest,
@@ -177,8 +177,6 @@ pub trait QuorumStoreSender: Send + Clone {
         timeout: Duration,
     ) -> anyhow::Result<BatchResponse>;
 
-    async fn send_batch(&self, batch: Batch, recipients: Vec<Author>);
-
     async fn send_signed_batch_info_msg(
         &self,
         signed_batch_infos: Vec<SignedBatchInfo>,
@@ -196,7 +194,7 @@ pub trait QuorumStoreSender: Send + Clone {
 #[derive(Clone)]
 pub struct NetworkSender {
     author: Author,
-    consensus_network_client: ConsensusNetworkClient<NetworkClient<ConsensusMsg>>,
+    pub(crate) consensus_network_client: ConsensusNetworkClient<NetworkClient<ConsensusMsg>>,
     // Self sender and self receivers provide a shortcut for sending the messages to itself.
     // (self sending is not supported by the networking API).
     self_sender: aptos_channels::UnboundedSender<Event<ConsensusMsg>>,
@@ -240,12 +238,7 @@ impl NetworkSender {
         counters::CONSENSUS_SENT_MSGS
             .with_label_values(&[msg.name()])
             .inc();
-        let response_msg = monitor!(
-            "block_retrieval",
-            self.consensus_network_client
-                .send_rpc(from, msg, timeout)
-                .await
-        )?;
+        let response_msg = monitor!("block_retrieval", self.send_rpc(from, msg, timeout).await)?;
         let response = match response_msg {
             ConsensusMsg::BlockRetrievalResponse(resp) => *resp,
             _ => return Err(anyhow!("Invalid response to request")),
@@ -264,6 +257,24 @@ impl NetworkSender {
         Ok(response)
     }
 
+    pub async fn send_rpc_to_self(
+        &self,
+        msg: ConsensusMsg,
+        timeout_duration: Duration,
+    ) -> anyhow::Result<ConsensusMsg> {
+        let (tx, rx) = oneshot::channel();
+        let protocol = RPC[0];
+        let self_msg = Event::RpcRequest(self.author, msg.clone(), RPC[0], tx);
+        self.self_sender.clone().send(self_msg).await?;
+        if let Ok(Ok(Ok(bytes))) = timeout(timeout_duration, rx).await {
+            let response_msg =
+                tokio::task::spawn_blocking(move || protocol.from_bytes(&bytes)).await??;
+            Ok(response_msg)
+        } else {
+            bail!("self rpc failed");
+        }
+    }
+
     pub async fn send_rpc(
         &self,
         receiver: Author,
@@ -277,15 +288,7 @@ impl NetworkSender {
             .with_label_values(&[msg.name()])
             .inc();
         if receiver == self.author() {
-            let (tx, rx) = oneshot::channel();
-            let protocol = RPC[0];
-            let self_msg = Event::RpcRequest(receiver, msg.clone(), RPC[0], tx);
-            self.self_sender.clone().send(self_msg).await?;
-            if let Ok(Ok(Ok(bytes))) = timeout(timeout_duration, rx).await {
-                Ok(protocol.from_bytes(&bytes)?)
-            } else {
-                bail!("self rpc failed");
-            }
+            self.send_rpc_to_self(msg, timeout_duration).await
         } else {
             Ok(monitor!(
                 "send_rpc",
@@ -310,34 +313,17 @@ impl NetworkSender {
             error!("Error broadcasting to self: {:?}", err);
         }
 
-        // Get the list of validators excluding our own account address. Note the
-        // ordering is not important in this case.
-        let self_author = self.author;
-        let other_validators: Vec<_> = self
-            .validators
-            .get_ordered_account_addresses_iter()
-            .filter(|author| author != &self_author)
-            .collect();
-
-        counters::CONSENSUS_SENT_MSGS
-            .with_label_values(&[msg.name()])
-            .inc_by(other_validators.len() as u64);
-        // Broadcast message over direct-send to all other validators.
-        if let Err(err) = self
-            .consensus_network_client
-            .send_to_many(other_validators.into_iter(), msg)
-        {
-            warn!(error = ?err, "Error broadcasting message");
-        }
+        self.broadcast_without_self(msg);
     }
 
     pub fn broadcast_without_self(&self, msg: ConsensusMsg) {
         let self_author = self.author;
-        let other_validators: Vec<_> = self
+        let mut other_validators: Vec<_> = self
             .validators
             .get_ordered_account_addresses_iter()
             .filter(|author| author != &self_author)
             .collect();
+        self.sort_peers_by_latency(&mut other_validators);
 
         counters::CONSENSUS_SENT_MSGS
             .with_label_values(&[msg.name()])
@@ -345,7 +331,7 @@ impl NetworkSender {
         // Broadcast message over direct-send to all other validators.
         if let Err(err) = self
             .consensus_network_client
-            .send_to_many(other_validators.into_iter(), msg)
+            .send_to_many(other_validators, msg)
         {
             warn!(error = ?err, "Error broadcasting message");
         }
@@ -370,7 +356,7 @@ impl NetworkSender {
             if let Err(e) = network_sender.send_to(peer, msg.clone()) {
                 warn!(
                     remote_peer = peer,
-                    error = ?e, "Failed to send a msg to peer",
+                    error = ?e, "Failed to send a msg {:?} to peer", msg
                 );
             }
         }
@@ -400,6 +386,7 @@ impl NetworkSender {
         self.broadcast(msg).await
     }
 
+    #[allow(dead_code)]
     pub async fn send_commit_vote(
         &self,
         commit_vote: CommitVote,
@@ -418,9 +405,19 @@ impl NetworkSender {
         self.broadcast(msg).await
     }
 
+    pub async fn broadcast_order_vote(&self, order_vote_msg: OrderVoteMsg) {
+        fail_point!("consensus::send::order_vote", |_| ());
+        let msg = ConsensusMsg::OrderVoteMsg(Box::new(order_vote_msg));
+        self.broadcast(msg).await
+    }
+
     pub async fn broadcast_fast_share(&self, share: FastShare<Share>) {
         fail_point!("consensus::send::broadcast_share", |_| ());
-        let msg = RandMessage::<Share, AugmentedData>::FastShare(share).into_network_message();
+        let msg = tokio::task::spawn_blocking(|| {
+            RandMessage::<Share, AugmentedData>::FastShare(share).into_network_message()
+        })
+        .await
+        .expect("task cannot fail to execute");
         self.broadcast(msg).await
     }
 
@@ -465,16 +462,14 @@ impl NetworkSender {
     pub fn author(&self) -> Author {
         self.author
     }
+
+    pub fn sort_peers_by_latency(&self, peers: &mut [Author]) {
+        self.consensus_network_client.sort_peers_by_latency(peers);
+    }
 }
 
 #[async_trait::async_trait]
 impl QuorumStoreSender for NetworkSender {
-    async fn send_batch_request(&self, request: BatchRequest, recipients: Vec<Author>) {
-        fail_point!("consensus::send::batch_request", |_| ());
-        let msg = ConsensusMsg::BatchRequestMsg(Box::new(request));
-        self.send(msg, recipients).await
-    }
-
     async fn request_batch(
         &self,
         request: BatchRequest,
@@ -483,10 +478,7 @@ impl QuorumStoreSender for NetworkSender {
     ) -> anyhow::Result<BatchResponse> {
         let request_digest = request.digest();
         let msg = ConsensusMsg::BatchRequestMsg(Box::new(request));
-        let response = self
-            .consensus_network_client
-            .send_rpc(recipient, msg, timeout)
-            .await?;
+        let response = self.send_rpc(recipient, msg, timeout).await?;
         match response {
             // TODO: deprecated, remove after another release (likely v1.11)
             ConsensusMsg::BatchResponse(batch) => {
@@ -504,12 +496,6 @@ impl QuorumStoreSender for NetworkSender {
         }
     }
 
-    async fn send_batch(&self, batch: Batch, recipients: Vec<Author>) {
-        fail_point!("consensus::send::batch", |_| ());
-        let msg = ConsensusMsg::BatchResponse(Box::new(batch));
-        self.send(msg, recipients).await
-    }
-
     async fn send_signed_batch_info_msg(
         &self,
         signed_batch_infos: Vec<SignedBatchInfo>,
@@ -582,16 +568,43 @@ impl TDAGNetworkSender for NetworkSender {
 impl<Req: TConsensusMsg + RBMessage + 'static, Res: TConsensusMsg + RBMessage + 'static>
     RBNetworkSender<Req, Res> for NetworkSender
 {
+    async fn send_rb_rpc_raw(
+        &self,
+        receiver: Author,
+        raw_message: Bytes,
+        timeout: Duration,
+    ) -> anyhow::Result<Res> {
+        let response_msg = self
+            .consensus_network_client
+            .send_rpc_raw(receiver, raw_message, timeout)
+            .await
+            .map_err(|e| anyhow!("invalid rpc response: {}", e))?;
+        tokio::task::spawn_blocking(|| TConsensusMsg::from_network_message(response_msg)).await?
+    }
+
     async fn send_rb_rpc(
         &self,
         receiver: Author,
         message: Req,
         timeout: Duration,
     ) -> anyhow::Result<Res> {
-        self.send_rpc(receiver, message.into_network_message(), timeout)
-            .await
-            .map_err(|e| anyhow!("invalid rpc response: {}", e))
-            .and_then(TConsensusMsg::from_network_message)
+        let consensus_msg = message.into_network_message();
+        let response_msg = self.send_rpc(receiver, consensus_msg, timeout).await?;
+        tokio::task::spawn_blocking(|| TConsensusMsg::from_network_message(response_msg)).await?
+    }
+
+    fn to_bytes_by_protocol(
+        &self,
+        peers: Vec<Author>,
+        message: Req,
+    ) -> anyhow::Result<HashMap<Author, Bytes>> {
+        let consensus_msg = message.into_network_message();
+        self.consensus_network_client
+            .to_bytes_by_protocol(peers, consensus_msg)
+    }
+
+    fn sort_peers_by_latency(&self, peers: &mut [Author]) {
+        self.sort_peers_by_latency(peers);
     }
 }
 
@@ -736,6 +749,7 @@ impl NetworkTask {
                         },
                         consensus_msg @ (ConsensusMsg::ProposalMsg(_)
                         | ConsensusMsg::VoteMsg(_)
+                        | ConsensusMsg::OrderVoteMsg(_)
                         | ConsensusMsg::SyncInfo(_)
                         | ConsensusMsg::EpochRetrievalRequest(_)
                         | ConsensusMsg::EpochChangeProof(_)) => {
diff --git a/consensus/src/network_interface.rs b/consensus/src/network_interface.rs
index 16f7d06d3587d..ea5b8646074f0 100644
--- a/consensus/src/network_interface.rs
+++ b/consensus/src/network_interface.rs
@@ -14,6 +14,7 @@ use aptos_config::network_id::{NetworkId, PeerNetworkId};
 use aptos_consensus_types::{
     block_retrieval::{BlockRetrievalRequest, BlockRetrievalResponse},
     epoch_retrieval::EpochRetrievalRequest,
+    order_vote_msg::OrderVoteMsg,
     pipeline::{commit_decision::CommitDecision, commit_vote::CommitVote},
     proof_of_store::{ProofOfStoreMsg, SignedBatchInfoMsg},
     proposal_msg::ProposalMsg,
@@ -25,9 +26,10 @@ use aptos_network::{
     ProtocolId,
 };
 use aptos_types::{epoch_change::EpochChangeProof, PeerId};
+use bytes::Bytes;
 pub use pipeline::commit_reliable_broadcast::CommitMessage;
 use serde::{Deserialize, Serialize};
-use std::time::Duration;
+use std::{collections::HashMap, time::Duration};
 
 /// Network type for consensus
 #[derive(Clone, Debug, Deserialize, Serialize)]
@@ -75,6 +77,9 @@ pub enum ConsensusMsg {
     RandGenMessage(RandGenMessage),
     /// Quorum Store: Response to the batch request.
     BatchResponseV2(Box<BatchResponse>),
+    /// OrderVoteMsg is the struct that is broadcasted by a validator on receiving quorum certificate
+    /// on a block.
+    OrderVoteMsg(Box<OrderVoteMsg>),
 }
 
 /// Network type for consensus
@@ -90,6 +95,7 @@ impl ConsensusMsg {
             ConsensusMsg::SyncInfo(_) => "SyncInfo",
             ConsensusMsg::EpochChangeProof(_) => "EpochChangeProof",
             ConsensusMsg::VoteMsg(_) => "VoteMsg",
+            ConsensusMsg::OrderVoteMsg(_) => "OrderVoteMsg",
             ConsensusMsg::CommitVoteMsg(_) => "CommitVoteMsg",
             ConsensusMsg::CommitDecisionMsg(_) => "CommitDecisionMsg",
             ConsensusMsg::BatchMsg(_) => "BatchMsg",
@@ -145,16 +151,12 @@ impl<NetworkClient: NetworkClientInterface<ConsensusMsg>> ConsensusNetworkClient
     }
 
     /// Send a single message to the destination peers
-    pub fn send_to_many(
-        &self,
-        peers: impl Iterator<Item = PeerId>,
-        message: ConsensusMsg,
-    ) -> Result<(), Error> {
+    pub fn send_to_many(&self, peers: Vec<PeerId>, message: ConsensusMsg) -> Result<(), Error> {
         let peer_network_ids: Vec<PeerNetworkId> = peers
+            .into_iter()
             .map(|peer| self.get_peer_network_id_for_peer(peer))
             .collect();
-        self.network_client
-            .send_to_peers(message, &peer_network_ids)
+        self.network_client.send_to_peers(message, peer_network_ids)
     }
 
     /// Send a RPC to the destination peer
@@ -170,9 +172,43 @@ impl<NetworkClient: NetworkClientInterface<ConsensusMsg>> ConsensusNetworkClient
             .await
     }
 
+    pub async fn send_rpc_raw(
+        &self,
+        peer: PeerId,
+        message: Bytes,
+        rpc_timeout: Duration,
+    ) -> Result<ConsensusMsg, Error> {
+        let peer_network_id = self.get_peer_network_id_for_peer(peer);
+        self.network_client
+            .send_to_peer_rpc_raw(message, rpc_timeout, peer_network_id)
+            .await
+    }
+
+    pub fn to_bytes_by_protocol(
+        &self,
+        peers: Vec<PeerId>,
+        message: ConsensusMsg,
+    ) -> anyhow::Result<HashMap<PeerId, Bytes>> {
+        let peer_network_ids: Vec<PeerNetworkId> = peers
+            .into_iter()
+            .map(|peer| self.get_peer_network_id_for_peer(peer))
+            .collect();
+        Ok(self
+            .network_client
+            .to_bytes_by_protocol(peer_network_ids, message)?
+            .into_iter()
+            .map(|(peer_network_id, bytes)| (peer_network_id.peer_id(), bytes))
+            .collect())
+    }
+
     // TODO: we shouldn't need to expose this. Migrate the code to handle
     // peer and network ids.
     fn get_peer_network_id_for_peer(&self, peer: PeerId) -> PeerNetworkId {
         PeerNetworkId::new(NetworkId::Validator, peer)
     }
+
+    pub fn sort_peers_by_latency(&self, peers: &mut [PeerId]) {
+        self.network_client
+            .sort_peers_by_latency(NetworkId::Validator, peers);
+    }
 }
diff --git a/consensus/src/network_tests.rs b/consensus/src/network_tests.rs
index b96f3d0a6b9ac..f1d18d90d6e7c 100644
--- a/consensus/src/network_tests.rs
+++ b/consensus/src/network_tests.rs
@@ -8,7 +8,7 @@ use crate::{
     test_utils::{self, consensus_runtime, placeholder_ledger_info, timed_block_on},
 };
 use aptos_channels::{self, aptos_channel, message_queues::QueueStyle};
-use aptos_config::network_id::NetworkId;
+use aptos_config::network_id::{NetworkId, PeerNetworkId};
 use aptos_consensus_types::{
     block::{block_test_utils::certificate_for_genesis, Block},
     common::Author,
@@ -21,14 +21,13 @@ use aptos_consensus_types::{
 use aptos_infallible::{Mutex, RwLock};
 use aptos_network::{
     application::storage::PeersAndMetadata,
-    peer_manager::{
-        ConnectionRequestSender, PeerManagerNotification, PeerManagerRequest,
-        PeerManagerRequestSender,
-    },
+    peer_manager::{ConnectionRequestSender, PeerManagerRequest, PeerManagerRequestSender},
     protocols::{
-        network::{NewNetworkEvents, SerializedRequest},
-        rpc::InboundRpcRequest,
-        wire::handshake::v1::ProtocolIdSet,
+        network::{NewNetworkEvents, ReceivedMessage, RpcError, SerializedRequest},
+        wire::{
+            handshake::v1::ProtocolIdSet,
+            messaging::v1::{DirectSendMsg, NetworkMessage, RpcRequest},
+        },
     },
     ProtocolId,
 };
@@ -65,16 +64,15 @@ pub struct NetworkPlayground {
     /// These events will usually be handled by the event loop spawned in
     /// `ConsensusNetworkImpl`.
     ///
-    node_consensus_txs: Arc<
-        Mutex<
-            HashMap<TwinId, aptos_channel::Sender<(PeerId, ProtocolId), PeerManagerNotification>>,
-        >,
-    >,
+    node_consensus_txs:
+        Arc<Mutex<HashMap<TwinId, aptos_channel::Sender<(PeerId, ProtocolId), ReceivedMessage>>>>,
     /// Nodes' outbound handlers forward their outbound non-rpc messages to this
     /// queue.
     outbound_msgs_tx: mpsc::Sender<(TwinId, PeerManagerRequest)>,
     /// NetworkPlayground reads all nodes' outbound messages through this queue.
     outbound_msgs_rx: mpsc::Receiver<(TwinId, PeerManagerRequest)>,
+    /// Allow test code to timeout RPC messages between peers.
+    timeout_config: Arc<RwLock<TimeoutConfig>>,
     /// Allow test code to drop direct-send messages between peers.
     drop_config: Arc<RwLock<DropConfig>>,
     /// Allow test code to drop direct-send messages between peers per round.
@@ -96,6 +94,7 @@ impl NetworkPlayground {
             node_consensus_txs: Arc::new(Mutex::new(HashMap::new())),
             outbound_msgs_tx,
             outbound_msgs_rx,
+            timeout_config: Arc::new(RwLock::new(TimeoutConfig::default())),
             drop_config: Arc::new(RwLock::new(DropConfig::default())),
             drop_config_round: DropConfigRound::default(),
             executor,
@@ -122,17 +121,13 @@ impl NetworkPlayground {
     /// Rpc messages are immediately sent to the destination for handling, so
     /// they don't block.
     async fn start_node_outbound_handler(
+        timeout_config: Arc<RwLock<TimeoutConfig>>,
         drop_config: Arc<RwLock<DropConfig>>,
         src_twin_id: TwinId,
         mut network_reqs_rx: aptos_channel::Receiver<(PeerId, ProtocolId), PeerManagerRequest>,
         mut outbound_msgs_tx: mpsc::Sender<(TwinId, PeerManagerRequest)>,
         node_consensus_txs: Arc<
-            Mutex<
-                HashMap<
-                    TwinId,
-                    aptos_channel::Sender<(PeerId, ProtocolId), PeerManagerNotification>,
-                >,
-            >,
+            Mutex<HashMap<TwinId, aptos_channel::Sender<(PeerId, ProtocolId), ReceivedMessage>>>,
         >,
         author_to_twin_ids: Arc<RwLock<AuthorToTwinIds>>,
     ) {
@@ -160,19 +155,34 @@ impl NetworkPlayground {
                         None => continue, // drop rpc
                     };
 
+                    if timeout_config
+                        .read()
+                        .is_message_timedout(&src_twin_id, dst_twin_id)
+                    {
+                        outbound_req.res_tx.send(Err(RpcError::TimedOut)).unwrap();
+                        continue;
+                    }
+
                     let node_consensus_tx =
                         node_consensus_txs.lock().get(dst_twin_id).unwrap().clone();
 
-                    let inbound_req = InboundRpcRequest {
-                        protocol_id: outbound_req.protocol_id,
-                        data: outbound_req.data,
-                        res_tx: outbound_req.res_tx,
-                    };
-
                     node_consensus_tx
                         .push(
                             (src_twin_id.author, ProtocolId::ConsensusRpcBcs),
-                            PeerManagerNotification::RecvRpc(src_twin_id.author, inbound_req),
+                            ReceivedMessage {
+                                message: NetworkMessage::RpcRequest(RpcRequest {
+                                    protocol_id: outbound_req.protocol_id,
+                                    request_id: 123,
+                                    priority: 0,
+                                    raw_request: outbound_req.data.into(),
+                                }),
+                                sender: PeerNetworkId::new(
+                                    NetworkId::Validator,
+                                    src_twin_id.author,
+                                ),
+                                receive_timestamp_micros: 0,
+                                rpc_replier: Some(Arc::new(outbound_req.res_tx)),
+                            },
                         )
                         .unwrap();
                 },
@@ -189,16 +199,18 @@ impl NetworkPlayground {
     pub fn add_node(
         &mut self,
         twin_id: TwinId,
-        consensus_tx: aptos_channel::Sender<(PeerId, ProtocolId), PeerManagerNotification>,
+        consensus_tx: aptos_channel::Sender<(PeerId, ProtocolId), ReceivedMessage>,
         network_reqs_rx: aptos_channel::Receiver<(PeerId, ProtocolId), PeerManagerRequest>,
         conn_mgr_reqs_rx: aptos_channels::Receiver<aptos_network::ConnectivityRequest>,
     ) {
         self.node_consensus_txs.lock().insert(twin_id, consensus_tx);
         self.drop_config.write().add_node(twin_id);
+        self.timeout_config.write().add_node(twin_id);
 
         self.extend_author_to_twin_ids(twin_id.author, twin_id);
 
         let fut1 = NetworkPlayground::start_node_outbound_handler(
+            Arc::clone(&self.timeout_config),
             Arc::clone(&self.drop_config),
             twin_id,
             network_reqs_rx,
@@ -217,7 +229,7 @@ impl NetworkPlayground {
         &mut self,
         src_twin_id: TwinId,
         dst_twin_id: TwinId,
-        msg_notif: PeerManagerNotification,
+        rmsg: ReceivedMessage,
     ) -> (Author, ConsensusMsg) {
         let node_consensus_tx = self
             .node_consensus_txs
@@ -227,21 +239,24 @@ impl NetworkPlayground {
             .clone();
 
         // copy message data
-        let msg_copy = match &msg_notif {
-            PeerManagerNotification::RecvMessage(src, msg) => {
-                let msg: ConsensusMsg = msg.to_message().unwrap();
-                (*src, msg)
+        let source_address = rmsg.sender.peer_id();
+        let consensus_msg = match &rmsg.message {
+            NetworkMessage::DirectSendMsg(dmsg) => dmsg
+                .protocol_id
+                .from_bytes(dmsg.raw_msg.as_slice())
+                .unwrap(),
+            wrong_message => {
+                panic!(
+                    "[network playground] Unexpected ReceivedMessage: {:?}",
+                    wrong_message
+                );
             },
-            msg_notif => panic!(
-                "[network playground] Unexpected PeerManagerNotification: {:?}",
-                msg_notif
-            ),
         };
         let _ = node_consensus_tx.push(
             (src_twin_id.author, ProtocolId::ConsensusDirectSendBcs),
-            msg_notif,
+            rmsg,
         );
-        msg_copy
+        (source_address, consensus_msg)
     }
 
     /// Wait for exactly `num_messages` to be enqueued and delivered. Return a
@@ -262,7 +277,7 @@ impl NetworkPlayground {
             let (src_twin_id, net_req) = self.outbound_msgs_rx.next().await
                 .expect("[network playground] waiting for messages, but message queue has shutdown unexpectedly");
 
-            // Convert PeerManagerRequest to corresponding PeerManagerNotification,
+            // Convert PeerManagerRequest to corresponding ReceivedMessage,
             // and extract destination peer
             let (dst, msg) = match &net_req {
                 PeerManagerRequest::SendDirectSend(dst_inner, msg_inner) => {
@@ -280,11 +295,17 @@ impl NetworkPlayground {
 
                 // Deliver and copy message if it's not dropped
                 if !self.is_message_dropped(&src_twin_id, dst_twin_id, consensus_msg) {
-                    let msg_notif =
-                        PeerManagerNotification::RecvMessage(src_twin_id.author, msg.clone());
-                    let msg_copy = self
-                        .deliver_message(src_twin_id, *dst_twin_id, msg_notif)
-                        .await;
+                    let rmsg = ReceivedMessage {
+                        message: NetworkMessage::DirectSendMsg(DirectSendMsg {
+                            protocol_id: msg.protocol_id,
+                            priority: 0,
+                            raw_msg: msg.mdata.clone().into(),
+                        }),
+                        sender: PeerNetworkId::new(NetworkId::Validator, src_twin_id.author),
+                        receive_timestamp_micros: 0,
+                        rpc_replier: None,
+                    };
+                    let msg_copy = self.deliver_message(src_twin_id, *dst_twin_id, rmsg).await;
 
                     // Only insert msg_copy once for twins (if delivered)
                     if idx == 0 && msg_inspector(&msg_copy) {
@@ -374,10 +395,14 @@ impl NetworkPlayground {
         ret
     }
 
+    pub fn timeout_config(&self) -> Arc<RwLock<TimeoutConfig>> {
+        self.timeout_config.clone()
+    }
+
     pub async fn start(mut self) {
         // Take the next queued message
         while let Some((src_twin_id, net_req)) = self.outbound_msgs_rx.next().await {
-            // Convert PeerManagerRequest to corresponding PeerManagerNotification,
+            // Convert PeerManagerRequest to corresponding ReceivedMessage,
             // and extract destination peer
             let (dst, msg) = match &net_req {
                 PeerManagerRequest::SendDirectSend(dst_inner, msg_inner) => {
@@ -392,14 +417,21 @@ impl NetworkPlayground {
             let dst_twin_ids = self.get_twin_ids(dst);
 
             for dst_twin_id in dst_twin_ids.iter() {
-                let msg_notif =
-                    PeerManagerNotification::RecvMessage(src_twin_id.author, msg.clone());
+                let rmsg = ReceivedMessage {
+                    message: NetworkMessage::DirectSendMsg(DirectSendMsg {
+                        protocol_id: msg.protocol_id,
+                        priority: 0,
+                        raw_msg: msg.mdata.clone().into(),
+                    }),
+                    sender: PeerNetworkId::new(NetworkId::Validator, src_twin_id.author),
+                    receive_timestamp_micros: 0,
+                    rpc_replier: None,
+                };
                 let consensus_msg = msg.to_message().unwrap();
 
                 // Deliver and copy message it if it's not dropped
                 if !self.is_message_dropped(&src_twin_id, dst_twin_id, consensus_msg) {
-                    self.deliver_message(src_twin_id, *dst_twin_id, msg_notif)
-                        .await;
+                    self.deliver_message(src_twin_id, *dst_twin_id, rmsg).await;
                 }
             }
         }
@@ -453,6 +485,23 @@ impl DropConfig {
     }
 }
 
+#[derive(Default)]
+pub(crate) struct TimeoutConfig(HashMap<TwinId, HashSet<TwinId>>);
+
+impl TimeoutConfig {
+    pub fn is_message_timedout(&self, src: &TwinId, dst: &TwinId) -> bool {
+        self.0.get(src).map_or(false, |set| set.contains(dst))
+    }
+
+    pub fn timeout_message_for(&mut self, src: &TwinId, dst: &TwinId) -> bool {
+        self.0.entry(*src).or_default().insert(*dst)
+    }
+
+    fn add_node(&mut self, src: TwinId) {
+        self.0.insert(src, HashSet::new());
+    }
+}
+
 /// Table of per round message dropping rules
 #[derive(Default)]
 struct DropConfigRound(HashMap<u64, DropConfig>);
@@ -496,7 +545,6 @@ mod tests {
             storage::PeersAndMetadata,
         },
         protocols::{
-            direct_send::Message,
             network,
             network::{NetworkEvents, NewNetworkSender},
         },
@@ -618,7 +666,7 @@ mod tests {
                 validator_verifier.clone(),
             );
 
-            let network_events = NetworkEvents::new(consensus_rx, None);
+            let network_events = NetworkEvents::new(consensus_rx, None, true);
             let network_service_events =
                 NetworkServiceEvents::new(hashmap! {NetworkId::Validator => network_events});
             let (task, receiver) = NetworkTask::new(network_service_events, self_receiver);
@@ -648,7 +696,11 @@ mod tests {
                 Vec::new(),
             )
             .unwrap(),
-            SyncInfo::new(previous_qc.clone(), previous_qc, None),
+            SyncInfo::new(
+                previous_qc.clone(),
+                previous_qc.into_wrapped_ledger_info(),
+                None,
+            ),
         );
         timed_block_on(&runtime, async {
             nodes[0]
@@ -730,7 +782,7 @@ mod tests {
                 validator_verifier.clone(),
             );
 
-            let network_events = NetworkEvents::new(consensus_rx, None);
+            let network_events = NetworkEvents::new(consensus_rx, None, true);
             let network_service_events =
                 NetworkServiceEvents::new(hashmap! {NetworkId::Validator => network_events});
             let (task, receiver) = NetworkTask::new(network_service_events, self_receiver);
@@ -800,7 +852,7 @@ mod tests {
 
         let (peer_mgr_notifs_tx, peer_mgr_notifs_rx) =
             aptos_channel::new(QueueStyle::FIFO, 8, None);
-        let network_events = NetworkEvents::new(peer_mgr_notifs_rx, None);
+        let network_events = NetworkEvents::new(peer_mgr_notifs_rx, None, true);
         let network_service_events =
             NetworkServiceEvents::new(hashmap! {NetworkId::Validator => network_events});
         let (self_sender, self_receiver) = aptos_channels::new_unbounded_test();
@@ -810,10 +862,16 @@ mod tests {
 
         let peer_id = PeerId::random();
         let protocol_id = ProtocolId::ConsensusDirectSendBcs;
-        let bad_msg = PeerManagerNotification::RecvMessage(peer_id, Message {
-            protocol_id,
-            mdata: Bytes::from_static(b"\xde\xad\xbe\xef"),
-        });
+        let bad_msg = ReceivedMessage {
+            message: NetworkMessage::DirectSendMsg(DirectSendMsg {
+                protocol_id,
+                priority: 0,
+                raw_msg: Bytes::from_static(b"\xde\xad\xbe\xef").into(),
+            }),
+            sender: PeerNetworkId::new(NetworkId::Validator, peer_id),
+            receive_timestamp_micros: 0,
+            rpc_replier: None,
+        };
 
         peer_mgr_notifs_tx
             .push((peer_id, protocol_id), bad_msg)
@@ -825,11 +883,17 @@ mod tests {
 
         let protocol_id = ProtocolId::ConsensusRpcJson;
         let (res_tx, _res_rx) = oneshot::channel();
-        let liveness_check_msg = PeerManagerNotification::RecvRpc(peer_id, InboundRpcRequest {
-            protocol_id,
-            data: Bytes::from(serde_json::to_vec(&liveness_check_msg).unwrap()),
-            res_tx,
-        });
+        let liveness_check_msg = ReceivedMessage {
+            message: NetworkMessage::RpcRequest(RpcRequest {
+                protocol_id,
+                request_id: 0, // TODO: seq?
+                priority: 0,
+                raw_request: Bytes::from(serde_json::to_vec(&liveness_check_msg).unwrap()).into(),
+            }),
+            sender: PeerNetworkId::new(NetworkId::Validator, peer_id),
+            receive_timestamp_micros: 0,
+            rpc_replier: Some(Arc::new(res_tx)),
+        };
 
         peer_mgr_notifs_tx
             .push((peer_id, protocol_id), liveness_check_msg)
diff --git a/consensus/src/payload_client/mixed.rs b/consensus/src/payload_client/mixed.rs
index 75575cbaab0d8..5e35b5aff6bae 100644
--- a/consensus/src/payload_client/mixed.rs
+++ b/consensus/src/payload_client/mixed.rs
@@ -1,32 +1,18 @@
 // Copyright © Aptos Foundation
 // SPDX-License-Identifier: Apache-2.0
 
-#[cfg(test)]
-use crate::payload_client::user;
-#[cfg(test)]
-use crate::payload_client::validator::DummyValidatorTxnClient;
+use super::PayloadPullParameters;
 use crate::{
     error::QuorumStoreError,
     payload_client::{user::UserPayloadClient, PayloadClient},
 };
-use aptos_consensus_types::common::{Payload, PayloadFilter};
+use aptos_consensus_types::{common::Payload, utils::PayloadTxnsSize};
 use aptos_logger::debug;
-use aptos_types::{
-    dkg::{DKGTranscript, DKGTranscriptMetadata},
-    on_chain_config::ValidatorTxnConfig,
-    validator_txn::ValidatorTransaction,
-};
-use aptos_validator_transaction_pool as vtxn_pool;
+use aptos_types::{on_chain_config::ValidatorTxnConfig, validator_txn::ValidatorTransaction};
+use aptos_validator_transaction_pool::TransactionFilter;
 use fail::fail_point;
 use futures::future::BoxFuture;
-use move_core_types::account_address::AccountAddress;
-#[cfg(test)]
-use std::collections::HashSet;
-use std::{
-    cmp::min,
-    sync::Arc,
-    time::{Duration, Instant},
-};
+use std::{cmp::min, sync::Arc, time::Instant};
 
 pub struct MixedPayloadClient {
     validator_txn_config: ValidatorTxnConfig,
@@ -51,15 +37,18 @@ impl MixedPayloadClient {
 
     /// When enabled in smoke tests, generate 2 random validator transactions, 1 valid, 1 invalid.
     fn extra_test_only_vtxns(&self) -> Vec<ValidatorTransaction> {
-        fail_point!("mixed_payload_client::extra_test_only_vtxns", |_| vec![
-            ValidatorTransaction::DKGResult(DKGTranscript {
+        fail_point!("mixed_payload_client::extra_test_only_vtxns", |_| {
+            use aptos_types::dkg::{DKGTranscript, DKGTranscriptMetadata};
+            use move_core_types::account_address::AccountAddress;
+
+            vec![ValidatorTransaction::DKGResult(DKGTranscript {
                 metadata: DKGTranscriptMetadata {
                     epoch: 999,
                     author: AccountAddress::ZERO,
                 },
                 transcript_bytes: vec![],
-            }),
-        ]);
+            })]
+        });
         vec![]
     }
 }
@@ -68,218 +57,244 @@ impl MixedPayloadClient {
 impl PayloadClient for MixedPayloadClient {
     async fn pull_payload(
         &self,
-        mut max_poll_time: Duration,
-        mut max_items: u64,
-        mut max_bytes: u64,
-        max_inline_items: u64,
-        max_inline_bytes: u64,
-        validator_txn_filter: vtxn_pool::TransactionFilter,
-        user_txn_filter: PayloadFilter,
+        params: PayloadPullParameters,
+        validator_txn_filter: TransactionFilter,
         wait_callback: BoxFuture<'static, ()>,
-        pending_ordering: bool,
-        pending_uncommitted_blocks: usize,
-        recent_max_fill_fraction: f32,
     ) -> anyhow::Result<(Vec<ValidatorTransaction>, Payload), QuorumStoreError> {
         // Pull validator txns first.
         let validator_txn_pull_timer = Instant::now();
         let mut validator_txns = self
             .validator_txn_pool_client
             .pull(
-                max_poll_time,
+                params.max_poll_time,
                 min(
-                    max_items,
+                    params.max_txns.count(),
                     self.validator_txn_config.per_block_limit_txn_count(),
                 ),
                 min(
-                    max_bytes,
+                    params.max_txns.size_in_bytes(),
                     self.validator_txn_config.per_block_limit_total_bytes(),
                 ),
                 validator_txn_filter,
             )
             .await;
+        let vtxn_size = PayloadTxnsSize::new(
+            validator_txns.len() as u64,
+            validator_txns
+                .iter()
+                .map(|txn| txn.size_in_bytes())
+                .sum::<usize>() as u64,
+        );
 
         validator_txns.extend(self.extra_test_only_vtxns());
 
         debug!("num_validator_txns={}", validator_txns.len());
         // Update constraints with validator txn pull results.
-        max_items -= validator_txns.len() as u64;
-        max_bytes -= validator_txns
-            .iter()
-            .map(|txn| txn.size_in_bytes())
-            .sum::<usize>() as u64;
-        max_poll_time = max_poll_time.saturating_sub(validator_txn_pull_timer.elapsed());
+        let mut user_txn_pull_params = params;
+        user_txn_pull_params.max_txns -= vtxn_size;
+        user_txn_pull_params.max_txns_after_filtering -= validator_txns.len() as u64;
+        user_txn_pull_params.soft_max_txns_after_filtering -= validator_txns.len() as u64;
+        user_txn_pull_params.max_poll_time = user_txn_pull_params
+            .max_poll_time
+            .saturating_sub(validator_txn_pull_timer.elapsed());
 
         // Pull user payload.
         let user_payload = self
             .user_payload_client
-            .pull(
-                max_poll_time,
-                max_items,
-                max_bytes,
-                max_inline_items,
-                max_inline_bytes,
-                user_txn_filter,
-                wait_callback,
-                pending_ordering,
-                pending_uncommitted_blocks,
-                recent_max_fill_fraction,
-            )
+            .pull(user_txn_pull_params, wait_callback)
             .await?;
 
         Ok((validator_txns, user_payload))
     }
 }
 
-#[tokio::test]
-async fn mixed_payload_client_should_prioritize_validator_txns() {
-    let all_validator_txns = vec![
-        ValidatorTransaction::dummy(b"1".to_vec()),
-        ValidatorTransaction::dummy(b"22".to_vec()),
-        ValidatorTransaction::dummy(b"333".to_vec()),
-    ];
-
-    let all_user_txns = crate::test_utils::create_vec_signed_transactions(10);
-    let client = MixedPayloadClient {
-        validator_txn_config: ValidatorTxnConfig::V1 {
-            per_block_limit_txn_count: 99,
-            per_block_limit_total_bytes: 1048576,
-        },
-        validator_txn_pool_client: Arc::new(DummyValidatorTxnClient::new(
-            all_validator_txns.clone(),
-        )),
-        user_payload_client: Arc::new(user::DummyClient::new(all_user_txns.clone())),
+#[cfg(test)]
+mod tests {
+    use crate::payload_client::{
+        mixed::MixedPayloadClient, user, validator::DummyValidatorTxnClient, PayloadClient,
+        PayloadPullParameters,
     };
+    use aptos_consensus_types::common::{Payload, PayloadFilter};
+    use aptos_types::{on_chain_config::ValidatorTxnConfig, validator_txn::ValidatorTransaction};
+    use aptos_validator_transaction_pool as vtxn_pool;
+    use std::{collections::HashSet, sync::Arc, time::Duration};
 
-    let (pulled_validator_txns, Payload::DirectMempool(pulled_user_txns)) = client
-        .pull_payload(
-            Duration::from_secs(1), // max_poll_time
-            99,                     // max_items
-            1048576,                // size limit: 1MB
-            50,
-            500000, // inline limit: 500KB
-            vtxn_pool::TransactionFilter::PendingTxnHashSet(HashSet::new()),
-            PayloadFilter::Empty,
-            Box::pin(async {}),
-            false,
-            0,
-            0.,
-        )
-        .await
-        .unwrap()
-    else {
-        unreachable!()
-    };
+    #[tokio::test]
+    async fn mixed_payload_client_should_prioritize_validator_txns() {
+        let all_validator_txns = vec![
+            ValidatorTransaction::dummy(b"1".to_vec()),
+            ValidatorTransaction::dummy(b"22".to_vec()),
+            ValidatorTransaction::dummy(b"333".to_vec()),
+        ];
 
-    assert_eq!(3, pulled_validator_txns.len());
-    assert_eq!(10, pulled_user_txns.len());
+        let all_user_txns = crate::test_utils::create_vec_signed_transactions(10);
+        let client = MixedPayloadClient {
+            validator_txn_config: ValidatorTxnConfig::V1 {
+                per_block_limit_txn_count: 99,
+                per_block_limit_total_bytes: 1048576,
+            },
+            validator_txn_pool_client: Arc::new(DummyValidatorTxnClient::new(
+                all_validator_txns.clone(),
+            )),
+            user_payload_client: Arc::new(user::DummyClient::new(all_user_txns.clone())),
+        };
 
-    let (pulled_validator_txns, Payload::DirectMempool(pulled_user_txns)) = client
-        .pull_payload(
-            Duration::from_micros(500), // max_poll_time
-            99,                         // max_items
-            1048576,                    // size limit: 1MB
-            50,
-            500000, // inline limit: 500KB
-            vtxn_pool::TransactionFilter::PendingTxnHashSet(HashSet::new()),
-            PayloadFilter::Empty,
-            Box::pin(async {}),
-            false,
-            0,
-            0.,
-        )
-        .await
-        .unwrap()
-    else {
-        unreachable!()
-    };
+        let (pulled_validator_txns, Payload::DirectMempool(pulled_user_txns)) = client
+            .pull_payload(
+                PayloadPullParameters::new_for_test(
+                    Duration::from_secs(1), // max_poll_time
+                    120,                    // max_items
+                    1048576,                // size limit: 1MB
+                    99,                     // max_unique_items
+                    99,
+                    50,
+                    500000, // inline limit: 500KB
+                    PayloadFilter::Empty,
+                    false,
+                    0,
+                    0.,
+                    aptos_infallible::duration_since_epoch(),
+                ),
+                vtxn_pool::TransactionFilter::PendingTxnHashSet(HashSet::new()),
+                Box::pin(async {}),
+            )
+            .await
+            .unwrap()
+        else {
+            unreachable!()
+        };
 
-    assert_eq!(1, pulled_validator_txns.len());
-    assert_eq!(0, pulled_user_txns.len());
+        assert_eq!(3, pulled_validator_txns.len());
+        assert_eq!(10, pulled_user_txns.len());
 
-    let (pulled_validator_txns, Payload::DirectMempool(pulled_user_txns)) = client
-        .pull_payload(
-            Duration::from_secs(1), // max_poll_time
-            1,                      // max_items
-            1048576,                // size limit: 1MB
-            0,
-            0, // inline limit: 0
-            vtxn_pool::TransactionFilter::PendingTxnHashSet(HashSet::new()),
-            PayloadFilter::Empty,
-            Box::pin(async {}),
-            false,
-            0,
-            0.,
-        )
-        .await
-        .unwrap()
-    else {
-        unreachable!()
-    };
+        let (pulled_validator_txns, Payload::DirectMempool(pulled_user_txns)) = client
+            .pull_payload(
+                PayloadPullParameters::new_for_test(
+                    Duration::from_micros(500), // max_poll_time
+                    120,                        // max_items
+                    1048576,                    // size limit: 1MB
+                    99,                         // max_unique_items
+                    99,
+                    50,
+                    500000, // inline limit: 500KB
+                    PayloadFilter::Empty,
+                    false,
+                    0,
+                    0.,
+                    aptos_infallible::duration_since_epoch(),
+                ),
+                vtxn_pool::TransactionFilter::PendingTxnHashSet(HashSet::new()),
+                Box::pin(async {}),
+            )
+            .await
+            .unwrap()
+        else {
+            unreachable!()
+        };
 
-    assert_eq!(1, pulled_validator_txns.len());
-    assert_eq!(0, pulled_user_txns.len());
+        assert_eq!(1, pulled_validator_txns.len());
+        assert_eq!(0, pulled_user_txns.len());
 
-    let (pulled_validator_txns, Payload::DirectMempool(pulled_user_txns)) = client
-        .pull_payload(
-            Duration::from_secs(1), // max_poll_time
-            99,                     // max_items
-            all_validator_txns[0].size_in_bytes() as u64,
-            50,
-            all_validator_txns[0].size_in_bytes() as u64,
-            vtxn_pool::TransactionFilter::PendingTxnHashSet(HashSet::new()),
-            PayloadFilter::Empty,
-            Box::pin(async {}),
-            false,
-            0,
-            0.,
-        )
-        .await
-        .unwrap()
-    else {
-        unreachable!()
-    };
+        let (pulled_validator_txns, Payload::DirectMempool(pulled_user_txns)) = client
+            .pull_payload(
+                PayloadPullParameters::new_for_test(
+                    Duration::from_secs(1), // max_poll_time
+                    2,                      // max_items
+                    1048576,                // size limit: 1MB
+                    2,                      // max_unique_items
+                    2,
+                    0,
+                    0, // inline limit: 0
+                    PayloadFilter::Empty,
+                    false,
+                    0,
+                    0.,
+                    aptos_infallible::duration_since_epoch(),
+                ),
+                vtxn_pool::TransactionFilter::PendingTxnHashSet(HashSet::new()),
+                Box::pin(async {}),
+            )
+            .await
+            .unwrap()
+        else {
+            unreachable!()
+        };
 
-    assert_eq!(1, pulled_validator_txns.len());
-    assert_eq!(0, pulled_user_txns.len());
-}
+        assert_eq!(2, pulled_validator_txns.len());
+        assert_eq!(0, pulled_user_txns.len());
 
-#[tokio::test]
-async fn mixed_payload_client_should_respect_validator_txn_feature_flag() {
-    let all_validator_txns = vec![
-        ValidatorTransaction::dummy(b"1".to_vec()),
-        ValidatorTransaction::dummy(b"22".to_vec()),
-        ValidatorTransaction::dummy(b"333".to_vec()),
-    ];
+        let (pulled_validator_txns, Payload::DirectMempool(pulled_user_txns)) = client
+            .pull_payload(
+                PayloadPullParameters::new_for_test(
+                    Duration::from_secs(1), // max_poll_time
+                    40,                     // max_items
+                    all_validator_txns[0].size_in_bytes() as u64,
+                    30, // max_unique_items
+                    30,
+                    10,
+                    all_validator_txns[0].size_in_bytes() as u64,
+                    PayloadFilter::Empty,
+                    false,
+                    0,
+                    0.,
+                    aptos_infallible::duration_since_epoch(),
+                ),
+                vtxn_pool::TransactionFilter::PendingTxnHashSet(HashSet::new()),
+                Box::pin(async {}),
+            )
+            .await
+            .unwrap()
+        else {
+            unreachable!()
+        };
 
-    let all_user_txns = crate::test_utils::create_vec_signed_transactions(10);
-    let client = MixedPayloadClient {
-        validator_txn_config: ValidatorTxnConfig::default_disabled(),
-        validator_txn_pool_client: Arc::new(DummyValidatorTxnClient::new(
-            all_validator_txns.clone(),
-        )),
-        user_payload_client: Arc::new(user::DummyClient::new(all_user_txns.clone())),
-    };
+        assert_eq!(1, pulled_validator_txns.len());
+        assert_eq!(0, pulled_user_txns.len());
+    }
 
-    let (pulled_validator_txns, Payload::DirectMempool(pulled_user_txns)) = client
-        .pull_payload(
-            Duration::from_millis(50), // max_poll_time
-            99,                        // max_items
-            1048576,                   // size limit: 1MB
-            50,
-            500000, // inline limit: 500KB
-            vtxn_pool::TransactionFilter::PendingTxnHashSet(HashSet::new()),
-            PayloadFilter::Empty,
-            Box::pin(async {}),
-            false,
-            0,
-            0.,
-        )
-        .await
-        .unwrap()
-    else {
-        unreachable!()
-    };
+    #[tokio::test]
+    async fn mixed_payload_client_should_respect_validator_txn_feature_flag() {
+        let all_validator_txns = vec![
+            ValidatorTransaction::dummy(b"1".to_vec()),
+            ValidatorTransaction::dummy(b"22".to_vec()),
+            ValidatorTransaction::dummy(b"333".to_vec()),
+        ];
 
-    assert_eq!(0, pulled_validator_txns.len());
-    assert_eq!(10, pulled_user_txns.len());
+        let all_user_txns = crate::test_utils::create_vec_signed_transactions(10);
+        let client = MixedPayloadClient {
+            validator_txn_config: ValidatorTxnConfig::default_disabled(),
+            validator_txn_pool_client: Arc::new(DummyValidatorTxnClient::new(
+                all_validator_txns.clone(),
+            )),
+            user_payload_client: Arc::new(user::DummyClient::new(all_user_txns.clone())),
+        };
+
+        let (pulled_validator_txns, Payload::DirectMempool(pulled_user_txns)) = client
+            .pull_payload(
+                PayloadPullParameters::new_for_test(
+                    Duration::from_millis(50), // max_poll_time
+                    120,                       // max_items
+                    1048576,                   // size limit: 1MB
+                    99,                        // max_unique_items
+                    99,
+                    50,
+                    500000, // inline limit: 500KB
+                    PayloadFilter::Empty,
+                    false,
+                    0,
+                    0.,
+                    aptos_infallible::duration_since_epoch(),
+                ),
+                vtxn_pool::TransactionFilter::PendingTxnHashSet(HashSet::new()),
+                Box::pin(async {}),
+            )
+            .await
+            .unwrap()
+        else {
+            unreachable!()
+        };
+
+        assert_eq!(0, pulled_validator_txns.len());
+        assert_eq!(10, pulled_user_txns.len());
+    }
 }
diff --git a/consensus/src/payload_client/mod.rs b/consensus/src/payload_client/mod.rs
index d37cbfbbdb5ac..1b769faa9c36a 100644
--- a/consensus/src/payload_client/mod.rs
+++ b/consensus/src/payload_client/mod.rs
@@ -2,9 +2,13 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::error::QuorumStoreError;
-use aptos_consensus_types::common::{Payload, PayloadFilter};
+use aptos_consensus_types::{
+    common::{Payload, PayloadFilter},
+    utils::PayloadTxnsSize,
+};
 use aptos_types::validator_txn::ValidatorTransaction;
 use aptos_validator_transaction_pool::TransactionFilter;
+use core::fmt;
 use futures::future::BoxFuture;
 use std::time::Duration;
 
@@ -12,22 +16,80 @@ pub mod mixed;
 pub mod user;
 pub mod validator;
 
+pub struct PayloadPullParameters {
+    pub max_poll_time: Duration,
+    pub max_txns: PayloadTxnsSize,
+    pub max_txns_after_filtering: u64,
+    pub soft_max_txns_after_filtering: u64,
+    pub max_inline_txns: PayloadTxnsSize,
+    pub opt_batch_txns_pct: u8,
+    pub user_txn_filter: PayloadFilter,
+    pub pending_ordering: bool,
+    pub pending_uncommitted_blocks: usize,
+    pub recent_max_fill_fraction: f32,
+    pub block_timestamp: Duration,
+}
+
+impl PayloadPullParameters {
+    #[cfg(test)]
+    fn new_for_test(
+        max_poll_time: Duration,
+        max_txns: u64,
+        max_txns_bytes: u64,
+        max_txns_after_filtering: u64,
+        soft_max_txns_after_filtering: u64,
+        max_inline_txns: u64,
+        max_inline_txns_bytes: u64,
+        user_txn_filter: PayloadFilter,
+        pending_ordering: bool,
+        pending_uncommitted_blocks: usize,
+        recent_max_fill_fraction: f32,
+        block_timestamp: Duration,
+    ) -> Self {
+        Self {
+            max_poll_time,
+            max_txns: PayloadTxnsSize::new(max_txns, max_txns_bytes),
+            max_txns_after_filtering,
+            soft_max_txns_after_filtering,
+            max_inline_txns: PayloadTxnsSize::new(max_inline_txns, max_inline_txns_bytes),
+            opt_batch_txns_pct: 0,
+            user_txn_filter,
+            pending_ordering,
+            pending_uncommitted_blocks,
+            recent_max_fill_fraction,
+            block_timestamp,
+        }
+    }
+}
+
+impl fmt::Debug for PayloadPullParameters {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("PayloadPullParameters")
+            .field("max_poll_time", &self.max_poll_time)
+            .field("max_items", &self.max_txns)
+            .field("max_unique_items", &self.max_txns_after_filtering)
+            .field(
+                "soft_max_txns_after_filtering",
+                &self.soft_max_txns_after_filtering,
+            )
+            .field("max_inline_items", &self.max_inline_txns)
+            .field("pending_ordering", &self.pending_ordering)
+            .field(
+                "pending_uncommitted_blocks",
+                &self.pending_uncommitted_blocks,
+            )
+            .field("recent_max_fill_fraction", &self.recent_max_fill_fraction)
+            .field("block_timestamp", &self.block_timestamp)
+            .finish()
+    }
+}
+
 #[async_trait::async_trait]
 pub trait PayloadClient: Send + Sync {
     async fn pull_payload(
         &self,
-        max_poll_time: Duration,
-        max_items: u64,
-        max_bytes: u64,
-        max_inline_items: u64,
-        max_inline_bytes: u64,
+        config: PayloadPullParameters,
         validator_txn_filter: TransactionFilter,
-        user_txn_filter: PayloadFilter,
         wait_callback: BoxFuture<'static, ()>,
-        pending_ordering: bool,
-        pending_uncommitted_blocks: usize,
-        recent_max_fill_fraction: f32,
     ) -> anyhow::Result<(Vec<ValidatorTransaction>, Payload), QuorumStoreError>;
-
-    fn trace_payloads(&self) {}
 }
diff --git a/consensus/src/payload_client/user/mod.rs b/consensus/src/payload_client/user/mod.rs
index 6a5cc6db745ff..9d6cafbed2322 100644
--- a/consensus/src/payload_client/user/mod.rs
+++ b/consensus/src/payload_client/user/mod.rs
@@ -1,11 +1,13 @@
 // Copyright © Aptos Foundation
 // SPDX-License-Identifier: Apache-2.0
 
+use super::PayloadPullParameters;
 use crate::error::QuorumStoreError;
-use aptos_consensus_types::common::{Payload, PayloadFilter};
+use aptos_consensus_types::common::Payload;
 #[cfg(test)]
 use aptos_types::transaction::SignedTransaction;
 use futures::future::BoxFuture;
+#[cfg(test)]
 use std::time::Duration;
 #[cfg(test)]
 use std::time::Instant;
@@ -16,16 +18,8 @@ use std::time::Instant;
 pub trait UserPayloadClient: Send + Sync {
     async fn pull(
         &self,
-        max_poll_time: Duration,
-        max_items: u64,
-        max_bytes: u64,
-        max_inline_items: u64,
-        max_inline_bytes: u64,
-        exclude: PayloadFilter,
+        params: PayloadPullParameters,
         wait_callback: BoxFuture<'static, ()>,
-        pending_ordering: bool,
-        pending_uncommitted_blocks: usize,
-        recent_max_fill_fraction: f32,
     ) -> anyhow::Result<Payload, QuorumStoreError>;
 }
 
@@ -47,33 +41,33 @@ impl DummyClient {
 impl UserPayloadClient for DummyClient {
     async fn pull(
         &self,
-        max_poll_time: Duration,
-        mut max_items: u64,
-        mut max_bytes: u64,
-        _max_inline_items: u64,
-        _max_inline_bytes: u64,
-        _exclude: PayloadFilter,
+        mut params: PayloadPullParameters,
         _wait_callback: BoxFuture<'static, ()>,
-        _pending_ordering: bool,
-        _pending_uncommitted_blocks: usize,
-        _recent_max_fill_fraction: f32,
     ) -> anyhow::Result<Payload, QuorumStoreError> {
+        use aptos_consensus_types::utils::PayloadTxnsSize;
+
         let timer = Instant::now();
         let mut nxt_txn_idx = 0;
         let mut txns = vec![];
-        while timer.elapsed() < max_poll_time
-            && max_items >= 1
-            && max_bytes >= 1
+        while timer.elapsed() < params.max_poll_time
+            && params.max_txns.count() >= 1
+            && params.max_txns_after_filtering >= 1
+            && params.soft_max_txns_after_filtering >= 1
+            && params.max_txns.size_in_bytes() >= 1
             && nxt_txn_idx < self.txns.len()
         {
             tokio::time::sleep(Duration::from_millis(1)).await;
             let txn = self.txns[nxt_txn_idx].clone();
             let txn_size = txn.raw_txn_bytes_len() as u64;
-            if txn_size > max_bytes {
+            if txn_size > params.max_txns.size_in_bytes() {
                 break;
             }
-            max_items -= 1;
-            max_bytes -= txn_size;
+            params.max_txns = PayloadTxnsSize::new(
+                params.max_txns.count() - 1,
+                params.max_txns.size_in_bytes() - txn_size,
+            );
+            params.max_txns_after_filtering -= 1;
+            params.soft_max_txns_after_filtering -= 1;
             nxt_txn_idx += 1;
             txns.push(txn);
         }
diff --git a/consensus/src/payload_client/user/quorum_store_client.rs b/consensus/src/payload_client/user/quorum_store_client.rs
index c6f49a2f1e6c9..b145ba1f76f61 100644
--- a/consensus/src/payload_client/user/quorum_store_client.rs
+++ b/consensus/src/payload_client/user/quorum_store_client.rs
@@ -2,12 +2,15 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{
-    counters::WAIT_FOR_FULL_BLOCKS_TRIGGERED, error::QuorumStoreError, monitor,
-    payload_client::user::UserPayloadClient,
+    counters::WAIT_FOR_FULL_BLOCKS_TRIGGERED,
+    error::QuorumStoreError,
+    monitor,
+    payload_client::{user::UserPayloadClient, PayloadPullParameters},
 };
 use aptos_consensus_types::{
     common::{Payload, PayloadFilter},
-    request_response::{GetPayloadCommand, GetPayloadResponse},
+    request_response::{GetPayloadCommand, GetPayloadRequest, GetPayloadResponse},
+    utils::PayloadTxnsSize,
 };
 use aptos_logger::info;
 use fail::fail_point;
@@ -45,23 +48,27 @@ impl QuorumStoreClient {
 
     async fn pull_internal(
         &self,
-        max_items: u64,
-        max_bytes: u64,
-        max_inline_items: u64,
-        max_inline_bytes: u64,
+        max_txns: PayloadTxnsSize,
+        max_txns_after_filtering: u64,
+        soft_max_txns_after_filtering: u64,
+        max_inline_txns: PayloadTxnsSize,
+        txns_with_proofs_pct: u8,
         return_non_full: bool,
         exclude_payloads: PayloadFilter,
+        block_timestamp: Duration,
     ) -> anyhow::Result<Payload, QuorumStoreError> {
         let (callback, callback_rcv) = oneshot::channel();
-        let req = GetPayloadCommand::GetPayloadRequest(
-            max_items,
-            max_bytes,
-            max_inline_items,
-            max_inline_bytes,
+        let req = GetPayloadCommand::GetPayloadRequest(GetPayloadRequest {
+            max_txns,
+            max_txns_after_filtering,
+            soft_max_txns_after_filtering,
+            opt_batch_txns_pct: txns_with_proofs_pct,
+            max_inline_txns,
+            filter: exclude_payloads,
             return_non_full,
-            exclude_payloads.clone(),
             callback,
-        );
+            block_timestamp,
+        });
         // send to shared mempool
         self.consensus_to_quorum_store_sender
             .clone()
@@ -86,21 +93,13 @@ impl QuorumStoreClient {
 impl UserPayloadClient for QuorumStoreClient {
     async fn pull(
         &self,
-        max_poll_time: Duration,
-        max_items: u64,
-        max_bytes: u64,
-        max_inline_items: u64,
-        max_inline_bytes: u64,
-        exclude: PayloadFilter,
+        params: PayloadPullParameters,
         wait_callback: BoxFuture<'static, ()>,
-        pending_ordering: bool,
-        pending_uncommitted_blocks: usize,
-        recent_max_fill_fraction: f32,
     ) -> anyhow::Result<Payload, QuorumStoreError> {
-        let return_non_full = recent_max_fill_fraction
+        let return_non_full = params.recent_max_fill_fraction
             < self.wait_for_full_blocks_above_recent_fill_threshold
-            && pending_uncommitted_blocks < self.wait_for_full_blocks_above_pending_blocks;
-        let return_empty = pending_ordering && return_non_full;
+            && params.pending_uncommitted_blocks < self.wait_for_full_blocks_above_pending_blocks;
+        let return_empty = params.pending_ordering && return_non_full;
 
         WAIT_FOR_FULL_BLOCKS_TRIGGERED.observe(if !return_non_full { 1.0 } else { 0.0 });
 
@@ -113,15 +112,17 @@ impl UserPayloadClient for QuorumStoreClient {
 
         let payload = loop {
             // Make sure we don't wait more than expected, due to thread scheduling delays/processing time consumed
-            let done = start_time.elapsed() >= max_poll_time;
+            let done = start_time.elapsed() >= params.max_poll_time;
             let payload = self
                 .pull_internal(
-                    max_items,
-                    max_bytes,
-                    max_inline_items,
-                    max_inline_bytes,
+                    params.max_txns,
+                    params.max_txns_after_filtering,
+                    params.soft_max_txns_after_filtering,
+                    params.max_inline_txns,
+                    params.opt_batch_txns_pct,
                     return_non_full || return_empty || done,
-                    exclude.clone(),
+                    params.user_txn_filter.clone(),
+                    params.block_timestamp,
                 )
                 .await?;
             if payload.is_empty() && !return_empty && !done {
@@ -134,14 +135,9 @@ impl UserPayloadClient for QuorumStoreClient {
             break payload;
         };
         info!(
+            pull_params = ?params,
             elapsed_time_ms = start_time.elapsed().as_millis() as u64,
-            max_poll_time_ms = max_poll_time.as_millis() as u64,
             payload_len = payload.len(),
-            max_items = max_items,
-            max_bytes = max_bytes,
-            max_inline_items = max_inline_items,
-            max_inline_bytes = max_inline_bytes,
-            pending_ordering = pending_ordering,
             return_empty = return_empty,
             return_non_full = return_non_full,
             duration_ms = start_time.elapsed().as_millis() as u64,
diff --git a/consensus/src/payload_manager.rs b/consensus/src/payload_manager.rs
index c9d1bc87ad7e9..0a8e65fb9dcda 100644
--- a/consensus/src/payload_manager.rs
+++ b/consensus/src/payload_manager.rs
@@ -3,58 +3,125 @@
 
 use crate::{
     consensus_observer::{
-        network::ObserverMessage, observer::ObserverDataStatus, publisher::Publisher,
+        network_message::{BlockTransactionPayload, ConsensusObserverMessage},
+        payload_store::BlockPayloadStatus,
+        publisher::ConsensusPublisher,
     },
     counters,
     quorum_store::{batch_store::BatchReader, quorum_store_coordinator::CoordinatorCommand},
 };
 use aptos_consensus_types::{
     block::Block,
-    common::{DataStatus, Payload, ProofWithData},
-    proof_of_store::ProofOfStore,
+    common::{DataStatus, Payload, ProofWithData, Round},
+    payload::{BatchPointer, TDataInfo},
+    proof_of_store::BatchInfo,
 };
 use aptos_crypto::HashValue;
-use aptos_executor_types::{ExecutorError::DataNotFound, *};
+use aptos_executor_types::{
+    ExecutorError::{DataNotFound, InternalError},
+    *,
+};
 use aptos_infallible::Mutex;
 use aptos_logger::prelude::*;
-use aptos_types::transaction::SignedTransaction;
+use aptos_types::{transaction::SignedTransaction, PeerId};
+use async_trait::async_trait;
 use futures::channel::mpsc::Sender;
-use itertools::Either;
 use std::{
-    collections::{hash_map::Entry, HashMap},
+    collections::{btree_map::Entry, BTreeMap},
+    ops::Deref,
     sync::Arc,
-    time::Duration,
 };
-use tokio::{sync::oneshot, time::timeout};
+use tokio::sync::oneshot;
 
+/// A trait that defines the interface for a payload manager. The payload manager is responsible for
+/// resolving the transactions in a block's payload.
+#[async_trait]
 pub trait TPayloadManager: Send + Sync {
+    /// Notify the payload manager that a block has been committed. This indicates that the
+    /// transactions in the block's payload are no longer required for consensus.
+    fn notify_commit(&self, block_timestamp: u64, payloads: Vec<Payload>);
+
+    /// Prefetch the data for a payload. This is used to ensure that the data for a payload is
+    /// available when block is executed.
     fn prefetch_payload_data(&self, payload: &Payload, timestamp: u64);
+
+    /// Check if the transactions corresponding are available. This is specific to payload
+    /// manager implementations. For optimistic quorum store, we only check if optimistic
+    /// batches are available locally.
+    fn check_payload_availability(&self, block: &Block) -> bool;
+
+    /// Get the transactions in a block's payload. This function returns a vector of transactions.
+    async fn get_transactions(
+        &self,
+        block: &Block,
+    ) -> ExecutorResult<(Vec<SignedTransaction>, Option<u64>)>;
 }
 
-/// Responsible to extract the transactions out of the payload and notify QuorumStore about commits.
-/// If QuorumStore is enabled, has to ask BatchReader for the transaction behind the proofs of availability in the payload.
-pub enum PayloadManager {
-    DirectMempool,
-    InQuorumStore(
-        Arc<dyn BatchReader>,
-        Sender<CoordinatorCommand>,
-        Option<Publisher>,
-    ),
-    Observer(
-        Arc<Mutex<HashMap<HashValue, ObserverDataStatus>>>,
-        Option<Publisher>,
-    ),
+/// A payload manager that directly returns the transactions in a block's payload.
+pub struct DirectMempoolPayloadManager {}
+
+impl DirectMempoolPayloadManager {
+    pub fn new() -> Self {
+        Self {}
+    }
 }
 
-impl TPayloadManager for PayloadManager {
-    fn prefetch_payload_data(&self, payload: &Payload, timestamp: u64) {
-        self.prefetch_payload_data(payload, timestamp);
+#[async_trait]
+impl TPayloadManager for DirectMempoolPayloadManager {
+    fn notify_commit(&self, _block_timestamp: u64, _payloads: Vec<Payload>) {}
+
+    fn prefetch_payload_data(&self, _payload: &Payload, _timestamp: u64) {}
+
+    fn check_payload_availability(&self, _block: &Block) -> bool {
+        true
     }
+
+    async fn get_transactions(
+        &self,
+        block: &Block,
+    ) -> ExecutorResult<(Vec<SignedTransaction>, Option<u64>)> {
+        let Some(payload) = block.payload() else {
+            return Ok((Vec::new(), None));
+        };
+
+        match payload {
+            Payload::DirectMempool(txns) => Ok((txns.clone(), None)),
+            _ => unreachable!(
+                "DirectMempoolPayloadManager: Unacceptable payload type {}. Epoch: {}, Round: {}, Block: {}",
+                payload,
+                block.block_data().epoch(),
+                block.block_data().round(),
+                block.id()
+            ),
+        }
+    }
+}
+
+/// A payload manager that resolves the transactions in a block's payload from the quorum store.
+pub struct QuorumStorePayloadManager {
+    batch_reader: Arc<dyn BatchReader>,
+    coordinator_tx: Sender<CoordinatorCommand>,
+    maybe_consensus_publisher: Option<Arc<ConsensusPublisher>>,
+    ordered_authors: Vec<PeerId>,
 }
 
-impl PayloadManager {
-    fn request_transactions(
-        proofs: Vec<ProofOfStore>,
+impl QuorumStorePayloadManager {
+    pub fn new(
+        batch_reader: Arc<dyn BatchReader>,
+        coordinator_tx: Sender<CoordinatorCommand>,
+        maybe_consensus_publisher: Option<Arc<ConsensusPublisher>>,
+        ordered_authors: Vec<PeerId>,
+    ) -> Self {
+        Self {
+            batch_reader,
+            coordinator_tx,
+            maybe_consensus_publisher,
+            ordered_authors,
+        }
+    }
+
+    fn request_transactions<'a>(
+        batches: impl Iterator<Item = (&'a BatchInfo, Vec<PeerId>)>,
         block_timestamp: u64,
         batch_reader: Arc<dyn BatchReader>,
     ) -> Vec<(
@@ -62,84 +129,98 @@ impl PayloadManager {
         oneshot::Receiver<ExecutorResult<Vec<SignedTransaction>>>,
     )> {
         let mut receivers = Vec::new();
-        for pos in proofs {
+        for (batch_info, responders) in batches {
             trace!(
-                "QSE: requesting pos {:?}, digest {}, time = {}",
-                pos,
-                pos.digest(),
+                "QSE: requesting batch {:?}, time = {}",
+                batch_info,
                 block_timestamp
             );
-            if block_timestamp <= pos.expiration() {
-                receivers.push((*pos.digest(), batch_reader.get_batch(pos)));
+            if block_timestamp <= batch_info.expiration() {
+                receivers.push((
+                    *batch_info.digest(),
+                    batch_reader.get_batch(
+                        *batch_info.digest(),
+                        batch_info.expiration(),
+                        responders,
+                    ),
+                ));
             } else {
-                debug!("QSE: skipped expired pos {}", pos.digest());
+                debug!("QSE: skipped expired batch {}", batch_info.digest());
             }
         }
         receivers
     }
+}
 
-    ///Pass commit information to BatchReader and QuorumStore wrapper for their internal cleanups.
-    pub fn notify_commit(&self, block_timestamp: u64, payloads: Vec<Payload>) {
-        match self {
-            PayloadManager::DirectMempool | PayloadManager::Observer(_, _) => {},
-            PayloadManager::InQuorumStore(batch_reader, coordinator_tx, _) => {
-                batch_reader.update_certified_timestamp(block_timestamp);
-
-                let batches: Vec<_> = payloads
-                    .into_iter()
-                    .flat_map(|payload| match payload {
-                        Payload::DirectMempool(_) => {
-                            unreachable!("InQuorumStore should be used");
-                        },
-                        Payload::InQuorumStore(proof_with_status) => proof_with_status
-                            .proofs
-                            .iter()
-                            .map(|proof| proof.info().clone())
-                            .collect::<Vec<_>>(),
-                        Payload::InQuorumStoreWithLimit(proof_with_status) => proof_with_status
-                            .proof_with_data
-                            .proofs
-                            .iter()
-                            .map(|proof| proof.info().clone())
-                            .collect::<Vec<_>>(),
-                        Payload::QuorumStoreInlineHybrid(inline_batches, proof_with_data, _) => {
-                            inline_batches
+#[async_trait]
+impl TPayloadManager for QuorumStorePayloadManager {
+    fn notify_commit(&self, block_timestamp: u64, payloads: Vec<Payload>) {
+        self.batch_reader
+            .update_certified_timestamp(block_timestamp);
+
+        let batches: Vec<_> = payloads
+            .into_iter()
+            .flat_map(|payload| match payload {
+                Payload::DirectMempool(_) => {
+                    unreachable!("InQuorumStore should be used");
+                },
+                Payload::InQuorumStore(proof_with_status) => proof_with_status
+                    .proofs
+                    .iter()
+                    .map(|proof| proof.info().clone())
+                    .collect::<Vec<_>>(),
+                Payload::InQuorumStoreWithLimit(proof_with_status) => proof_with_status
+                    .proof_with_data
+                    .proofs
+                    .iter()
+                    .map(|proof| proof.info().clone())
+                    .collect::<Vec<_>>(),
+                Payload::QuorumStoreInlineHybrid(inline_batches, proof_with_data, _) => {
+                    inline_batches
+                        .iter()
+                        .map(|(batch_info, _)| batch_info.clone())
+                        .chain(
+                            proof_with_data
+                                .proofs
                                 .iter()
-                                .map(|(batch_info, _)| batch_info.clone())
-                                .chain(
-                                    proof_with_data
-                                        .proofs
-                                        .iter()
-                                        .map(|proof| proof.info().clone()),
-                                )
-                                .collect::<Vec<_>>()
-                        },
-                    })
-                    .collect();
+                                .map(|proof| proof.info().clone()),
+                        )
+                        .collect::<Vec<_>>()
+                },
+                Payload::OptQuorumStore(opt_quorum_store_payload) => {
+                    opt_quorum_store_payload.into_inner().get_all_batch_infos()
+                },
+            })
+            .collect();
 
-                let mut tx = coordinator_tx.clone();
+        let mut tx = self.coordinator_tx.clone();
 
-                if let Err(e) = tx.try_send(CoordinatorCommand::CommitNotification(
-                    block_timestamp,
-                    batches,
-                )) {
-                    warn!(
-                        "CommitNotification failed. Is the epoch shutting down? error: {}",
-                        e
-                    );
-                }
-            },
+        if let Err(e) = tx.try_send(CoordinatorCommand::CommitNotification(
+            block_timestamp,
+            batches,
+        )) {
+            warn!(
+                "CommitNotification failed. Is the epoch shutting down? error: {}",
+                e
+            );
         }
     }
 
-    /// Called from consensus to pre-fetch the transaction behind the batches in the block.
-    pub fn prefetch_payload_data(&self, payload: &Payload, timestamp: u64) {
+    fn prefetch_payload_data(&self, payload: &Payload, timestamp: u64) {
+        // This is deprecated.
+        // TODO(ibalajiarun): Remove this after migrating to OptQuorumStore type
         let request_txns_and_update_status =
             move |proof_with_status: &ProofWithData, batch_reader: Arc<dyn BatchReader>| {
-                let receivers = PayloadManager::request_transactions(
-                    proof_with_status.proofs.clone(),
+                if proof_with_status.status.lock().is_some() {
+                    return;
+                }
+                let receivers = Self::request_transactions(
+                    proof_with_status
+                        .proofs
+                        .iter()
+                        .map(|proof| (proof.info(), proof.shuffled_signers(&self.ordered_authors))),
                     timestamp,
-                    batch_reader.clone(),
+                    batch_reader,
                 );
                 proof_with_status
                     .status
@@ -147,179 +228,134 @@ impl PayloadManager {
                     .replace(DataStatus::Requested(receivers));
             };
 
-        match self {
-            PayloadManager::DirectMempool | PayloadManager::Observer(_, _) => {},
-            PayloadManager::InQuorumStore(batch_reader, _, _) => match payload {
-                Payload::InQuorumStore(proof_with_status) => {
-                    request_txns_and_update_status(proof_with_status, batch_reader.clone());
-                },
-                Payload::InQuorumStoreWithLimit(proof_with_data) => {
-                    request_txns_and_update_status(
-                        &proof_with_data.proof_with_data,
-                        batch_reader.clone(),
-                    );
-                },
-                Payload::QuorumStoreInlineHybrid(_, proof_with_data, _) => {
-                    request_txns_and_update_status(proof_with_data, batch_reader.clone());
-                },
-                Payload::DirectMempool(_) => {
-                    unreachable!()
-                },
-            },
+        fn prefetch_helper<T: TDataInfo>(
+            data_pointer: &BatchPointer<T>,
+            batch_reader: Arc<dyn BatchReader>,
+            timestamp: u64,
+            ordered_authors: &[PeerId],
+        ) {
+            if data_pointer.status.lock().is_some() {
+                return;
+            }
+            let receivers = QuorumStorePayloadManager::request_transactions(
+                data_pointer
+                    .batch_summary
+                    .iter()
+                    .map(|proof| (proof.info(), proof.signers(ordered_authors))),
+                timestamp,
+                batch_reader,
+            );
+            data_pointer
+                .status
+                .lock()
+                .replace(DataStatus::Requested(receivers));
         }
-    }
 
-    /// Extract transaction from a given block
-    /// Assumes it is never called for the same block concurrently. Otherwise status can be None.
-    pub async fn get_transactions(
-        &self,
-        block: &Block,
-    ) -> ExecutorResult<(Vec<SignedTransaction>, Option<usize>)> {
-        let payload = match block.payload() {
-            Some(p) => p,
-            None => return Ok((Vec::new(), None)),
+        match payload {
+            Payload::InQuorumStore(proof_with_status) => {
+                request_txns_and_update_status(proof_with_status, self.batch_reader.clone());
+            },
+            Payload::InQuorumStoreWithLimit(proof_with_data) => {
+                request_txns_and_update_status(
+                    &proof_with_data.proof_with_data,
+                    self.batch_reader.clone(),
+                );
+            },
+            Payload::QuorumStoreInlineHybrid(_, proof_with_data, _) => {
+                request_txns_and_update_status(proof_with_data, self.batch_reader.clone());
+            },
+            Payload::DirectMempool(_) => {
+                unreachable!()
+            },
+            Payload::OptQuorumStore(opt_qs_payload) => {
+                prefetch_helper(
+                    opt_qs_payload.opt_batches(),
+                    self.batch_reader.clone(),
+                    timestamp,
+                    &self.ordered_authors,
+                );
+                prefetch_helper(
+                    opt_qs_payload.proof_with_data(),
+                    self.batch_reader.clone(),
+                    timestamp,
+                    &self.ordered_authors,
+                )
+            },
         };
+    }
 
-        if let PayloadManager::Observer(txns_pool, maybe_publisher) = self {
-            // If the data is already available, return it, otherwise put the tx in the pool and wait for it.
-            // It's important to make sure this doesn't race with the payload insertion part.
-            let result = match txns_pool.lock().entry(block.id()) {
-                Entry::Occupied(mut value) => match value.get_mut() {
-                    ObserverDataStatus::Available(data) => Either::Left(data.clone()),
-                    ObserverDataStatus::Requested(tx) => {
-                        let (new_tx, rx) = oneshot::channel();
-                        *tx = new_tx;
-                        Either::Right(rx)
-                    },
-                },
-                Entry::Vacant(entry) => {
-                    let (tx, rx) = oneshot::channel();
-                    entry.insert(ObserverDataStatus::Requested(tx));
-                    Either::Right(rx)
-                },
-            };
-            let data = match result {
-                Either::Left(data) => data,
-                Either::Right(rx) => timeout(Duration::from_millis(300), rx)
-                    .await
-                    .map_err(|_| ExecutorError::CouldNotGetData)?
-                    .map_err(|_| ExecutorError::CouldNotGetData)?,
-            };
-            if let Some(publisher) = maybe_publisher {
-                publisher.publish(ObserverMessage::Payload((
-                    block.gen_block_info(HashValue::zero(), 0, None),
-                    data.clone(),
-                )));
-            }
-            return Ok(data);
-        }
+    fn check_payload_availability(&self, block: &Block) -> bool {
+        let Some(payload) = block.payload() else {
+            return true;
+        };
 
-        async fn process_payload(
-            proof_with_data: &ProofWithData,
-            batch_reader: Arc<dyn BatchReader>,
-            block: &Block,
-        ) -> ExecutorResult<Vec<SignedTransaction>> {
-            let status = proof_with_data.status.lock().take();
-            match status.expect("Should have been updated before.") {
-                DataStatus::Cached(data) => {
-                    counters::QUORUM_BATCH_READY_COUNT.inc();
-                    proof_with_data
-                        .status
-                        .lock()
-                        .replace(DataStatus::Cached(data.clone()));
-                    Ok(data)
-                },
-                DataStatus::Requested(receivers) => {
-                    let _timer = counters::BATCH_WAIT_DURATION.start_timer();
-                    let mut vec_ret = Vec::new();
-                    if !receivers.is_empty() {
-                        debug!(
-                            "QSE: waiting for data on {} receivers, block_round {}",
-                            receivers.len(),
-                            block.round()
-                        );
-                    }
-                    for (digest, rx) in receivers {
-                        match rx.await {
-                            Err(e) => {
-                                // We probably advanced epoch already.
-                                warn!(
-                                    "Oneshot channel to get a batch was dropped with error {:?}",
-                                    e
-                                );
-                                let new_receivers = PayloadManager::request_transactions(
-                                    proof_with_data.proofs.clone(),
-                                    block.timestamp_usecs(),
-                                    batch_reader.clone(),
-                                );
-                                // Could not get all data so requested again
-                                proof_with_data
-                                    .status
-                                    .lock()
-                                    .replace(DataStatus::Requested(new_receivers));
-                                return Err(DataNotFound(digest));
-                            },
-                            Ok(Ok(data)) => {
-                                vec_ret.push(data);
-                            },
-                            Ok(Err(e)) => {
-                                let new_receivers = PayloadManager::request_transactions(
-                                    proof_with_data.proofs.clone(),
-                                    block.timestamp_usecs(),
-                                    batch_reader.clone(),
-                                );
-                                // Could not get all data so requested again
-                                proof_with_data
-                                    .status
-                                    .lock()
-                                    .replace(DataStatus::Requested(new_receivers));
-                                return Err(e);
-                            },
-                        }
+        match payload {
+            Payload::DirectMempool(_) => {
+                unreachable!("QuorumStore doesn't support DirectMempool payload")
+            },
+            Payload::InQuorumStore(_) => true,
+            Payload::InQuorumStoreWithLimit(_) => true,
+            Payload::QuorumStoreInlineHybrid(_, _, _) => true,
+            Payload::OptQuorumStore(opt_qs_payload) => {
+                for batch in opt_qs_payload.opt_batches().deref() {
+                    if self.batch_reader.exists(batch.digest()).is_none() {
+                        return false;
                     }
-                    let ret: Vec<SignedTransaction> = vec_ret.into_iter().flatten().collect();
-                    // execution asks for the data twice, so data is cached here for the second time.
-                    proof_with_data
-                        .status
-                        .lock()
-                        .replace(DataStatus::Cached(ret.clone()));
-                    Ok(ret)
-                },
-            }
+                }
+                true
+            },
         }
+    }
 
-        let result = match (self, payload) {
-            (PayloadManager::DirectMempool, Payload::DirectMempool(txns)) => (txns.clone(), None),
-            (
-                PayloadManager::InQuorumStore(batch_reader, _, _),
-                Payload::InQuorumStore(proof_with_data),
-            ) => (
-                process_payload(proof_with_data, batch_reader.clone(), block).await?,
-                None,
-            ),
-            (
-                PayloadManager::InQuorumStore(batch_reader, _, _),
-                Payload::InQuorumStoreWithLimit(proof_with_data),
-            ) => (
-                process_payload(
+    async fn get_transactions(
+        &self,
+        block: &Block,
+    ) -> ExecutorResult<(Vec<SignedTransaction>, Option<u64>)> {
+        let Some(payload) = block.payload() else {
+            return Ok((Vec::new(), None));
+        };
+
+        let transaction_payload = match payload {
+            Payload::InQuorumStore(proof_with_data) => {
+                let transactions = process_payload(
+                    proof_with_data,
+                    self.batch_reader.clone(),
+                    block,
+                    &self.ordered_authors,
+                )
+                .await?;
+                BlockTransactionPayload::new_in_quorum_store(
+                    transactions,
+                    proof_with_data.proofs.clone(),
+                )
+            },
+            Payload::InQuorumStoreWithLimit(proof_with_data) => {
+                let transactions = process_payload(
                     &proof_with_data.proof_with_data,
-                    batch_reader.clone(),
+                    self.batch_reader.clone(),
                     block,
+                    &self.ordered_authors,
                 )
-                .await?,
-                proof_with_data.max_txns_to_execute,
-            ),
-            (
-                PayloadManager::InQuorumStore(batch_reader, _, _),
-                Payload::QuorumStoreInlineHybrid(
-                    inline_batches,
-                    proof_with_data,
-                    max_txns_to_execute,
-                ),
-            ) => (
-                {
-                    let mut all_txns =
-                        process_payload(proof_with_data, batch_reader.clone(), block).await?;
+                .await?;
+                BlockTransactionPayload::new_in_quorum_store_with_limit(
+                    transactions,
+                    proof_with_data.proof_with_data.proofs.clone(),
+                    proof_with_data.max_txns_to_execute,
+                )
+            },
+            Payload::QuorumStoreInlineHybrid(
+                inline_batches,
+                proof_with_data,
+                max_txns_to_execute,
+            ) => {
+                let all_transactions = {
+                    let mut all_txns = process_payload(
+                        proof_with_data,
+                        self.batch_reader.clone(),
+                        block,
+                        &self.ordered_authors,
+                    )
+                    .await?;
                     all_txns.append(
                         &mut inline_batches
                             .iter()
@@ -328,10 +364,47 @@ impl PayloadManager {
                             .collect(),
                     );
                     all_txns
-                },
-                *max_txns_to_execute,
-            ),
-            (_, _) => unreachable!(
+                };
+                let inline_batches = inline_batches
+                    .iter()
+                    .map(|(batch_info, _)| batch_info.clone())
+                    .collect();
+                BlockTransactionPayload::new_quorum_store_inline_hybrid(
+                    all_transactions,
+                    proof_with_data.proofs.clone(),
+                    *max_txns_to_execute,
+                    inline_batches,
+                )
+            },
+            Payload::OptQuorumStore(opt_qs_payload) => {
+                let opt_batch_txns = process_payload_helper(
+                    opt_qs_payload.opt_batches(),
+                    self.batch_reader.clone(),
+                    block,
+                    &self.ordered_authors,
+                )
+                .await?;
+                let proof_batch_txns = process_payload_helper(
+                    opt_qs_payload.proof_with_data(),
+                    self.batch_reader.clone(),
+                    block,
+                    &self.ordered_authors,
+                )
+                .await?;
+                let inline_batch_txns = opt_qs_payload.inline_batches().transactions();
+                let all_txns = [opt_batch_txns, proof_batch_txns, inline_batch_txns].concat();
+                BlockTransactionPayload::new_opt_quorum_store(
+                    all_txns,
+                    opt_qs_payload.proof_with_data().deref().clone(),
+                    opt_qs_payload.max_txns_to_execute(),
+                    [
+                        opt_qs_payload.opt_batches().deref().clone(),
+                        opt_qs_payload.inline_batches().batch_infos(),
+                    ]
+                    .concat(),
+                )
+            },
+            _ => unreachable!(
                 "Wrong payload {} epoch {}, round {}, id {}",
                 payload,
                 block.block_data().epoch(),
@@ -339,12 +412,270 @@ impl PayloadManager {
                 block.id()
             ),
         };
-        if let PayloadManager::InQuorumStore(_, _, Some(publisher)) = self {
-            publisher.publish(ObserverMessage::Payload((
+
+        if let Some(consensus_publisher) = &self.maybe_consensus_publisher {
+            let message = ConsensusObserverMessage::new_block_payload_message(
                 block.gen_block_info(HashValue::zero(), 0, None),
-                result.clone(),
-            )));
+                transaction_payload.clone(),
+            );
+            consensus_publisher.publish_message(message).await;
+        }
+
+        Ok((
+            transaction_payload.transactions(),
+            transaction_payload.limit(),
+        ))
+    }
+}
+
+/// Returns the transactions for the consensus observer payload manager
+async fn get_transactions_for_observer(
+    block: &Block,
+    block_payloads: &Arc<Mutex<BTreeMap<(u64, Round), BlockPayloadStatus>>>,
+    consensus_publisher: &Option<Arc<ConsensusPublisher>>,
+) -> ExecutorResult<(Vec<SignedTransaction>, Option<u64>)> {
+    // The data should already be available (as consensus observer will only ever
+    // forward a block to the executor once the data has been received and verified).
+    let block_payload = match block_payloads.lock().entry((block.epoch(), block.round())) {
+        Entry::Occupied(mut value) => match value.get_mut() {
+            BlockPayloadStatus::AvailableAndVerified(block_payload) => block_payload.clone(),
+            BlockPayloadStatus::AvailableAndUnverified(_) => {
+                // This shouldn't happen (the payload should already be verified)
+                let error = format!(
+                    "Payload data for block epoch {}, round {} is unverified!",
+                    block.epoch(),
+                    block.round()
+                );
+                return Err(InternalError { error });
+            },
+        },
+        Entry::Vacant(_) => {
+            // This shouldn't happen (the payload should already be present)
+            let error = format!(
+                "Missing payload data for block epoch {}, round {}!",
+                block.epoch(),
+                block.round()
+            );
+            return Err(InternalError { error });
+        },
+    };
+
+    // If the payload is valid, publish it to any downstream observers
+    let transaction_payload = block_payload.transaction_payload;
+    if let Some(consensus_publisher) = consensus_publisher {
+        let message = ConsensusObserverMessage::new_block_payload_message(
+            block.gen_block_info(HashValue::zero(), 0, None),
+            transaction_payload.clone(),
+        );
+        consensus_publisher.publish_message(message).await;
+    }
+
+    // Return the transactions and the transaction limit
+    Ok((
+        transaction_payload.transactions(),
+        transaction_payload.limit(),
+    ))
+}
+
+async fn process_payload_helper<T: TDataInfo>(
+    data_ptr: &BatchPointer<T>,
+    batch_reader: Arc<dyn BatchReader>,
+    block: &Block,
+    ordered_authors: &[PeerId],
+) -> ExecutorResult<Vec<SignedTransaction>> {
+    let status = data_ptr.status.lock().take();
+    match status.expect("Should have been updated before.") {
+        DataStatus::Cached(data) => {
+            counters::QUORUM_BATCH_READY_COUNT.inc();
+            data_ptr
+                .status
+                .lock()
+                .replace(DataStatus::Cached(data.clone()));
+            Ok(data)
+        },
+        DataStatus::Requested(receivers) => {
+            let _timer = counters::BATCH_WAIT_DURATION.start_timer();
+            let mut vec_ret = Vec::new();
+            if !receivers.is_empty() {
+                debug!(
+                    "QSE: waiting for data on {} receivers, block_round {}",
+                    receivers.len(),
+                    block.round()
+                );
+            }
+            let batches_and_responders = data_ptr.batch_summary.iter().map(|proof| {
+                let mut signers = proof.signers(ordered_authors);
+                if let Some(author) = block.author() {
+                    signers.push(author);
+                }
+                (proof.info(), signers)
+            });
+            for (digest, rx) in receivers {
+                match rx.await {
+                    Err(e) => {
+                        // We probably advanced epoch already.
+                        warn!(
+                            "Oneshot channel to get a batch was dropped with error {:?}",
+                            e
+                        );
+                        let new_receivers = QuorumStorePayloadManager::request_transactions(
+                            batches_and_responders,
+                            block.timestamp_usecs(),
+                            batch_reader.clone(),
+                        );
+                        // Could not get all data so requested again
+                        data_ptr
+                            .status
+                            .lock()
+                            .replace(DataStatus::Requested(new_receivers));
+                        return Err(DataNotFound(digest));
+                    },
+                    Ok(Ok(data)) => {
+                        vec_ret.push(data);
+                    },
+                    Ok(Err(e)) => {
+                        let new_receivers = QuorumStorePayloadManager::request_transactions(
+                            batches_and_responders,
+                            block.timestamp_usecs(),
+                            batch_reader.clone(),
+                        );
+                        // Could not get all data so requested again
+                        data_ptr
+                            .status
+                            .lock()
+                            .replace(DataStatus::Requested(new_receivers));
+                        return Err(e);
+                    },
+                }
+            }
+            let ret: Vec<SignedTransaction> = vec_ret.into_iter().flatten().collect();
+            // execution asks for the data twice, so data is cached here for the second time.
+            data_ptr
+                .status
+                .lock()
+                .replace(DataStatus::Cached(ret.clone()));
+            Ok(ret)
+        },
+    }
+}
+
+/// This is deprecated. Use `process_payload_helper` instead after migrating to
+/// OptQuorumStore payload
+async fn process_payload(
+    proof_with_data: &ProofWithData,
+    batch_reader: Arc<dyn BatchReader>,
+    block: &Block,
+    ordered_authors: &[PeerId],
+) -> ExecutorResult<Vec<SignedTransaction>> {
+    let status = proof_with_data.status.lock().take();
+    match status.expect("Should have been updated before.") {
+        DataStatus::Cached(data) => {
+            counters::QUORUM_BATCH_READY_COUNT.inc();
+            proof_with_data
+                .status
+                .lock()
+                .replace(DataStatus::Cached(data.clone()));
+            Ok(data)
+        },
+        DataStatus::Requested(receivers) => {
+            let _timer = counters::BATCH_WAIT_DURATION.start_timer();
+            let mut vec_ret = Vec::new();
+            if !receivers.is_empty() {
+                debug!(
+                    "QSE: waiting for data on {} receivers, block_round {}",
+                    receivers.len(),
+                    block.round()
+                );
+            }
+            for (digest, rx) in receivers {
+                match rx.await {
+                    Err(e) => {
+                        // We probably advanced epoch already.
+                        warn!(
+                            "Oneshot channel to get a batch was dropped with error {:?}",
+                            e
+                        );
+                        let new_receivers = QuorumStorePayloadManager::request_transactions(
+                            proof_with_data.proofs.iter().map(|proof| {
+                                (proof.info(), proof.shuffled_signers(ordered_authors))
+                            }),
+                            block.timestamp_usecs(),
+                            batch_reader.clone(),
+                        );
+                        // Could not get all data so requested again
+                        proof_with_data
+                            .status
+                            .lock()
+                            .replace(DataStatus::Requested(new_receivers));
+                        return Err(DataNotFound(digest));
+                    },
+                    Ok(Ok(data)) => {
+                        vec_ret.push(data);
+                    },
+                    Ok(Err(e)) => {
+                        let new_receivers = QuorumStorePayloadManager::request_transactions(
+                            proof_with_data.proofs.iter().map(|proof| {
+                                (proof.info(), proof.shuffled_signers(ordered_authors))
+                            }),
+                            block.timestamp_usecs(),
+                            batch_reader.clone(),
+                        );
+                        // Could not get all data so requested again
+                        proof_with_data
+                            .status
+                            .lock()
+                            .replace(DataStatus::Requested(new_receivers));
+                        return Err(e);
+                    },
+                }
+            }
+            let ret: Vec<SignedTransaction> = vec_ret.into_iter().flatten().collect();
+            // execution asks for the data twice, so data is cached here for the second time.
+            proof_with_data
+                .status
+                .lock()
+                .replace(DataStatus::Cached(ret.clone()));
+            Ok(ret)
+        },
+    }
+}
+
+pub struct ConsensusObserverPayloadManager {
+    txns_pool: Arc<Mutex<BTreeMap<(u64, Round), BlockPayloadStatus>>>,
+    consensus_publisher: Option<Arc<ConsensusPublisher>>,
+}
+
+impl ConsensusObserverPayloadManager {
+    pub fn new(
+        txns_pool: Arc<Mutex<BTreeMap<(u64, Round), BlockPayloadStatus>>>,
+        consensus_publisher: Option<Arc<ConsensusPublisher>>,
+    ) -> Self {
+        Self {
+            txns_pool,
+            consensus_publisher,
         }
-        Ok(result)
+    }
+}
+
+#[async_trait]
+impl TPayloadManager for ConsensusObserverPayloadManager {
+    fn notify_commit(&self, _block_timestamp: u64, _payloads: Vec<Payload>) {
+        // noop
+    }
+
+    fn prefetch_payload_data(&self, _payload: &Payload, _timestamp: u64) {
+        // noop
+    }
+
+    fn check_payload_availability(&self, _block: &Block) -> bool {
+        unreachable!("this method isn't used in ConsensusObserver")
+    }
+
+    async fn get_transactions(
+        &self,
+        block: &Block,
+    ) -> ExecutorResult<(Vec<SignedTransaction>, Option<u64>)> {
+        return get_transactions_for_observer(block, &self.txns_pool, &self.consensus_publisher)
+            .await;
     }
 }
diff --git a/consensus/src/pending_order_votes.rs b/consensus/src/pending_order_votes.rs
new file mode 100644
index 0000000000000..7420b565ce3c1
--- /dev/null
+++ b/consensus/src/pending_order_votes.rs
@@ -0,0 +1,238 @@
+// Copyright © Aptos Foundation
+// Parts of the project are originally copyright © Meta Platforms, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+use aptos_consensus_types::{common::Author, order_vote::OrderVote};
+use aptos_crypto::{hash::CryptoHash, HashValue};
+use aptos_logger::prelude::*;
+use aptos_types::{
+    aggregate_signature::PartialSignatures,
+    ledger_info::{LedgerInfo, LedgerInfoWithPartialSignatures, LedgerInfoWithSignatures},
+    validator_verifier::{ValidatorVerifier, VerifyError},
+};
+use std::collections::HashMap;
+
+/// Result of the order vote processing. The failure case (Verification error) is returned
+/// as the Error part of the result.
+#[derive(Debug, PartialEq, Eq)]
+pub enum OrderVoteReceptionResult {
+    /// The vote has been added but QC has not been formed yet. Return the amount of voting power
+    /// QC currently has.
+    VoteAdded(u128),
+    /// This block has just been certified after adding the vote.
+    NewLedgerInfoWithSignatures(LedgerInfoWithSignatures),
+    /// There might be some issues adding a vote
+    ErrorAddingVote(VerifyError),
+    /// Error happens when aggregating signature
+    ErrorAggregatingSignature(VerifyError),
+    /// The author of the order vote is unknown
+    UnknownAuthor(Author),
+}
+
+#[derive(Debug, PartialEq, Eq)]
+enum OrderVoteStatus {
+    EnoughVotes(LedgerInfoWithSignatures),
+    NotEnoughVotes(LedgerInfoWithPartialSignatures),
+}
+
+/// A PendingVotes structure keep track of order votes for the last few rounds
+pub struct PendingOrderVotes {
+    /// Maps LedgerInfo digest to associated signatures (contained in a partial LedgerInfoWithSignatures).
+    /// Order vote status stores caches the information on whether the votes are enough to form a QC.
+    li_digest_to_votes: HashMap<HashValue /* LedgerInfo digest */, OrderVoteStatus>,
+}
+
+impl PendingOrderVotes {
+    /// Creates an empty PendingOrderVotes structure
+    pub fn new() -> Self {
+        Self {
+            li_digest_to_votes: HashMap::new(),
+        }
+    }
+
+    /// Add a vote to the pending votes
+    // TODO: Should we add any counters here?
+    pub fn insert_order_vote(
+        &mut self,
+        order_vote: &OrderVote,
+        validator_verifier: &ValidatorVerifier,
+    ) -> OrderVoteReceptionResult {
+        // derive data from order vote
+        let li_digest = order_vote.ledger_info().hash();
+
+        // obtain the ledger info with signatures associated to the order vote's ledger info
+        let status = self.li_digest_to_votes.entry(li_digest).or_insert_with(|| {
+            // if the ledger info with signatures doesn't exist yet, create it
+            OrderVoteStatus::NotEnoughVotes(LedgerInfoWithPartialSignatures::new(
+                order_vote.ledger_info().clone(),
+                PartialSignatures::empty(),
+            ))
+        });
+
+        match status {
+            OrderVoteStatus::EnoughVotes(li_with_sig) => {
+                // we already have enough votes for this ledger info
+                OrderVoteReceptionResult::NewLedgerInfoWithSignatures(li_with_sig.clone())
+            },
+            OrderVoteStatus::NotEnoughVotes(li_with_sig) => {
+                // we don't have enough votes for this ledger info yet
+                let validator_voting_power =
+                    validator_verifier.get_voting_power(&order_vote.author());
+                if validator_voting_power.is_none() {
+                    warn!(
+                        "Received order vote from an unknown author: {}",
+                        order_vote.author()
+                    );
+                    return OrderVoteReceptionResult::UnknownAuthor(order_vote.author());
+                }
+                let validator_voting_power =
+                    validator_voting_power.expect("Author must exist in the validator set.");
+
+                if validator_voting_power == 0 {
+                    warn!(
+                        "Received vote with no voting power, from {}",
+                        order_vote.author()
+                    );
+                }
+                li_with_sig.add_signature(order_vote.author(), order_vote.signature().clone());
+                // check if we have enough signatures to create a QC
+                match validator_verifier.check_voting_power(li_with_sig.signatures().keys(), true) {
+                    // a quorum of signature was reached, a new QC is formed
+                    Ok(aggregated_voting_power) => {
+                        assert!(
+                            aggregated_voting_power >= validator_verifier.quorum_voting_power(),
+                            "QC aggregation should not be triggered if we don't have enough votes to form a QC"
+                        );
+                        match li_with_sig.aggregate_signatures(validator_verifier) {
+                            Ok(ledger_info_with_sig) => {
+                                *status =
+                                    OrderVoteStatus::EnoughVotes(ledger_info_with_sig.clone());
+                                OrderVoteReceptionResult::NewLedgerInfoWithSignatures(
+                                    ledger_info_with_sig,
+                                )
+                            },
+                            Err(e) => OrderVoteReceptionResult::ErrorAggregatingSignature(e),
+                        }
+                    },
+
+                    // not enough votes
+                    Err(VerifyError::TooLittleVotingPower { voting_power, .. }) => {
+                        OrderVoteReceptionResult::VoteAdded(voting_power)
+                    },
+
+                    // error
+                    Err(error) => {
+                        error!(
+                            "MUST_FIX: order vote received could not be added: {}, order vote: {}",
+                            error, order_vote
+                        );
+                        OrderVoteReceptionResult::ErrorAddingVote(error)
+                    },
+                }
+            },
+        }
+    }
+
+    // Removes votes older than highest_ordered_round
+    pub fn garbage_collect(&mut self, highest_ordered_round: u64) {
+        self.li_digest_to_votes.retain(|_, status| match status {
+            OrderVoteStatus::EnoughVotes(li_with_sig) => {
+                li_with_sig.ledger_info().round() > highest_ordered_round
+            },
+            OrderVoteStatus::NotEnoughVotes(li_with_sig) => {
+                li_with_sig.ledger_info().round() > highest_ordered_round
+            },
+        });
+    }
+
+    pub fn has_enough_order_votes(&self, ledger_info: &LedgerInfo) -> bool {
+        let li_digest = ledger_info.hash();
+        if let Some(OrderVoteStatus::EnoughVotes(_)) = self.li_digest_to_votes.get(&li_digest) {
+            return true;
+        }
+        false
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::{OrderVoteReceptionResult, PendingOrderVotes};
+    use aptos_consensus_types::order_vote::OrderVote;
+    use aptos_crypto::HashValue;
+    use aptos_types::{
+        block_info::BlockInfo, ledger_info::LedgerInfo,
+        validator_verifier::random_validator_verifier,
+    };
+
+    /// Creates a random ledger info for epoch 1 and round 1.
+    fn random_ledger_info() -> LedgerInfo {
+        LedgerInfo::new(
+            BlockInfo::new(1, 0, HashValue::random(), HashValue::random(), 0, 0, None),
+            HashValue::random(),
+        )
+    }
+
+    #[test]
+    fn order_vote_aggregation() {
+        ::aptos_logger::Logger::init_for_testing();
+        // set up 4 validators
+        let (signers, validator) = random_validator_verifier(4, Some(2), false);
+
+        let mut pending_order_votes = PendingOrderVotes::new();
+
+        // create random vote from validator[0]
+        let li1 = random_ledger_info();
+        let order_vote_1_author_0 = OrderVote::new_with_signature(
+            signers[0].author(),
+            li1.clone(),
+            signers[0].sign(&li1).expect("Unable to sign ledger info"),
+        );
+
+        // first time a new order vote is added -> OrderVoteAdded
+        assert_eq!(
+            pending_order_votes.insert_order_vote(&order_vote_1_author_0, &validator),
+            OrderVoteReceptionResult::VoteAdded(1)
+        );
+
+        // same author voting for the same thing -> OrderVoteAdded
+        assert_eq!(
+            pending_order_votes.insert_order_vote(&order_vote_1_author_0, &validator),
+            OrderVoteReceptionResult::VoteAdded(1)
+        );
+
+        // same author voting for a different result -> EquivocateVote
+        let li2 = random_ledger_info();
+        let order_vote_2_author_1 = OrderVote::new_with_signature(
+            signers[1].author(),
+            li2.clone(),
+            signers[1].sign(&li2).expect("Unable to sign ledger info"),
+        );
+        assert_eq!(
+            pending_order_votes.insert_order_vote(&order_vote_2_author_1, &validator),
+            OrderVoteReceptionResult::VoteAdded(1)
+        );
+
+        assert!(!pending_order_votes.has_enough_order_votes(&li1));
+        assert!(!pending_order_votes.has_enough_order_votes(&li2));
+
+        let order_vote_2_author_2 = OrderVote::new_with_signature(
+            signers[2].author(),
+            li2.clone(),
+            signers[2].sign(&li2).expect("Unable to sign ledger info"),
+        );
+        match pending_order_votes.insert_order_vote(&order_vote_2_author_2, &validator) {
+            OrderVoteReceptionResult::NewLedgerInfoWithSignatures(li_with_sig) => {
+                assert!(li_with_sig.check_voting_power(&validator).is_ok());
+            },
+            _ => {
+                panic!("No QC formed.");
+            },
+        };
+        assert!(!pending_order_votes.has_enough_order_votes(&li1));
+        assert!(pending_order_votes.has_enough_order_votes(&li2));
+
+        pending_order_votes.garbage_collect(0);
+        assert!(!pending_order_votes.has_enough_order_votes(&li1));
+        assert!(!pending_order_votes.has_enough_order_votes(&li2));
+    }
+}
diff --git a/consensus/src/pending_votes.rs b/consensus/src/pending_votes.rs
index 56af5416a3a20..ff8bc37a1ae70 100644
--- a/consensus/src/pending_votes.rs
+++ b/consensus/src/pending_votes.rs
@@ -291,23 +291,35 @@ impl PendingVotes {
         vote: Vote,
     ) -> VoteReceptionResult {
         let li_digest = vote.ledger_info().hash();
-        let (_, li_with_sig) = self.li_digest_to_votes.get_mut(&li_digest).unwrap();
-        match validator_verifier.check_voting_power(li_with_sig.signatures().keys(), true) {
-            // a quorum of signature was reached, a new QC is formed
-            Ok(_) => Self::aggregate_qc_now(validator_verifier, li_with_sig, vote.vote_data()),
-
-            // not enough votes
-            Err(VerifyError::TooLittleVotingPower { .. }) => {
-                panic!("Delayed QC aggregation should not be triggered if we don't have enough votes to form a QC");
-            },
+        match self.li_digest_to_votes.get_mut(&li_digest) {
+            Some((_, li_with_sig)) => {
+                match validator_verifier.check_voting_power(li_with_sig.signatures().keys(), true) {
+                    // a quorum of signature was reached, a new QC is formed
+                    Ok(_) => {
+                        Self::aggregate_qc_now(validator_verifier, li_with_sig, vote.vote_data())
+                    },
+
+                    // not enough votes
+                    Err(VerifyError::TooLittleVotingPower { .. }) => {
+                        panic!("Delayed QC aggregation should not be triggered if we don't have enough votes to form a QC");
+                    },
 
-            // error
-            Err(error) => {
+                    // error
+                    Err(error) => {
+                        error!(
+                            "MUST_FIX: vote received could not be added: {}, vote: {}",
+                            error, vote
+                        );
+                        VoteReceptionResult::ErrorAddingVote(error)
+                    },
+                }
+            },
+            None => {
                 error!(
-                    "MUST_FIX: vote received could not be added: {}, vote: {}",
-                    error, vote
+                    "No LedgerInfoWithSignatures found for the given digest: {}",
+                    li_digest
                 );
-                VoteReceptionResult::ErrorAddingVote(error)
+                VoteReceptionResult::ErrorAddingVote(VerifyError::EmptySignature)
             },
         }
     }
diff --git a/consensus/src/persistent_liveness_storage.rs b/consensus/src/persistent_liveness_storage.rs
index d00f86852d473..7e69b3304f653 100644
--- a/consensus/src/persistent_liveness_storage.rs
+++ b/consensus/src/persistent_liveness_storage.rs
@@ -7,6 +7,7 @@ use anyhow::{format_err, Context, Result};
 use aptos_config::config::NodeConfig;
 use aptos_consensus_types::{
     block::Block, quorum_cert::QuorumCert, timeout_2chain::TwoChainTimeoutCertificate, vote::Vote,
+    vote_data::VoteData, wrapped_ledger_info::WrappedLedgerInfo,
 };
 use aptos_crypto::HashValue;
 use aptos_logger::prelude::*;
@@ -15,7 +16,7 @@ use aptos_types::{
     block_info::Round, epoch_change::EpochChangeProof, ledger_info::LedgerInfoWithSignatures,
     proof::TransactionAccumulatorSummary, transaction::Version,
 };
-use std::{cmp::max, collections::HashSet, sync::Arc};
+use std::{cmp::max, collections::HashSet, fmt::Debug, sync::Arc};
 
 /// PersistentLivenessStorage is essential for maintaining liveness when a node crashes.  Specifically,
 /// upon a restart, a correct node will recover.  Even if all nodes crash, liveness is
@@ -36,7 +37,7 @@ pub trait PersistentLivenessStorage: Send + Sync {
     fn recover_from_ledger(&self) -> LedgerRecoveryData;
 
     /// Construct necessary data to start consensus.
-    fn start(&self) -> LivenessStorageData;
+    fn start(&self, order_vote_enabled: bool) -> LivenessStorageData;
 
     /// Persist the highest 2chain timeout certificate for improved liveness - proof for other replicas
     /// to jump to this round
@@ -60,10 +61,20 @@ pub trait PersistentLivenessStorage: Send + Sync {
 pub struct RootInfo(
     pub Box<Block>,
     pub QuorumCert,
-    pub QuorumCert,
-    pub QuorumCert,
+    pub WrappedLedgerInfo,
+    pub WrappedLedgerInfo,
 );
 
+impl Debug for RootInfo {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(
+            f,
+            "RootInfo: [block: {}, quorum_cert: {}, ordered_cert: {}, commit_cert: {}]",
+            self.0, self.1, self.2, self.3
+        )
+    }
+}
+
 /// LedgerRecoveryData is a subset of RecoveryData that we can get solely from ledger info.
 #[derive(Clone)]
 pub struct LedgerRecoveryData {
@@ -87,6 +98,7 @@ impl LedgerRecoveryData {
         &self,
         blocks: &mut Vec<Block>,
         quorum_certs: &mut Vec<QuorumCert>,
+        order_vote_enabled: bool,
     ) -> Result<RootInfo> {
         info!(
             "The last committed block id as recorded in storage: {}",
@@ -127,18 +139,28 @@ impl LedgerRecoveryData {
             .find(|qc| qc.certified_block().id() == root_block.id())
             .ok_or_else(|| format_err!("No QC found for root: {}", root_id))?
             .clone();
-        let root_ordered_cert = quorum_certs
-            .iter()
-            .find(|qc| qc.commit_info().id() == root_block.id())
-            .ok_or_else(|| format_err!("No LI found for root: {}", root_id))?
-            .clone();
 
+        let (root_ordered_cert, root_commit_cert) = if order_vote_enabled {
+            // We are setting ordered_root same as commit_root. As every committed block is also ordered, this is fine.
+            // As the block store inserts all the fetched blocks and quorum certs and execute the blocks, the block store
+            // updates highest_ordered_cert accordingly.
+            let root_ordered_cert =
+                WrappedLedgerInfo::new(VoteData::dummy(), latest_ledger_info_sig.clone());
+            (root_ordered_cert.clone(), root_ordered_cert)
+        } else {
+            let root_ordered_cert = quorum_certs
+                .iter()
+                .find(|qc| qc.commit_info().id() == root_block.id())
+                .ok_or_else(|| format_err!("No LI found for root: {}", root_id))?
+                .clone()
+                .into_wrapped_ledger_info();
+            let root_commit_cert = root_ordered_cert
+                .create_merged_with_executed_state(latest_ledger_info_sig)
+                .expect("Inconsistent commit proof and evaluation decision, cannot commit block");
+            (root_ordered_cert, root_commit_cert)
+        };
         info!("Consensus root block is {}", root_block);
 
-        let root_commit_cert = root_ordered_cert
-            .create_merged_with_executed_state(latest_ledger_info_sig)
-            .expect("Inconsistent commit proof and evaluation decision, cannot commit block");
-
         Ok(RootInfo(
             Box::new(root_block),
             root_quorum_cert,
@@ -204,9 +226,10 @@ impl RecoveryData {
         root_metadata: RootMetadata,
         mut quorum_certs: Vec<QuorumCert>,
         highest_2chain_timeout_cert: Option<TwoChainTimeoutCertificate>,
+        order_vote_enabled: bool,
     ) -> Result<Self> {
         let root = ledger_recovery_data
-            .find_root(&mut blocks, &mut quorum_certs)
+            .find_root(&mut blocks, &mut quorum_certs, order_vote_enabled)
             .with_context(|| {
                 // for better readability
                 blocks.sort_by_key(|block| block.round());
@@ -348,7 +371,7 @@ impl PersistentLivenessStorage for StorageWriteProxy {
         LedgerRecoveryData::new(latest_ledger_info)
     }
 
-    fn start(&self) -> LivenessStorageData {
+    fn start(&self, order_vote_enabled: bool) -> LivenessStorageData {
         info!("Start consensus recovery.");
         let raw_data = self
             .db
@@ -377,7 +400,6 @@ impl PersistentLivenessStorage for StorageWriteProxy {
             "The following quorum certs were restored from ConsensusDB: {}",
             qc_repr.concat()
         );
-
         // find the block corresponding to storage latest ledger info
         let latest_ledger_info = self
             .aptos_db
@@ -396,6 +418,7 @@ impl PersistentLivenessStorage for StorageWriteProxy {
             accumulator_summary.into(),
             quorum_certs,
             highest_2chain_timeout_cert,
+            order_vote_enabled,
         ) {
             Ok(mut initial_data) => {
                 (self as &dyn PersistentLivenessStorage)
diff --git a/consensus/src/pipeline/buffer.rs b/consensus/src/pipeline/buffer.rs
index 29ead7aba94d8..ed4514bd20d6d 100644
--- a/consensus/src/pipeline/buffer.rs
+++ b/consensus/src/pipeline/buffer.rs
@@ -48,6 +48,7 @@ impl<T: Hashable> Buffer<T> {
         &self.tail
     }
 
+    #[allow(clippy::unwrap_used)]
     pub fn push_back(&mut self, elem: T) {
         self.count = self.count.checked_add(1).unwrap();
         let t_hash = elem.hash();
@@ -63,6 +64,7 @@ impl<T: Hashable> Buffer<T> {
         self.head.get_or_insert(t_hash);
     }
 
+    #[allow(clippy::unwrap_used)]
     pub fn pop_front(&mut self) -> Option<T> {
         self.head.take().map(|head| {
             let mut item = self.map.remove(&head).unwrap();
@@ -77,10 +79,12 @@ impl<T: Hashable> Buffer<T> {
     }
 
     // utils - assuming item is not None
+    #[allow(clippy::unwrap_used)]
     pub fn get_next(&self, cursor: &Cursor) -> Cursor {
         self.map.get(cursor.as_ref().unwrap()).unwrap().next
     }
 
+    #[allow(clippy::unwrap_used)]
     pub fn get(&self, cursor: &Cursor) -> &T {
         self.map
             .get(cursor.as_ref().unwrap())
@@ -90,6 +94,7 @@ impl<T: Hashable> Buffer<T> {
             .unwrap()
     }
 
+    #[allow(clippy::unwrap_used)]
     pub fn set(&mut self, cursor: &Cursor, new_val: T) {
         self.map
             .get_mut(cursor.as_ref().unwrap())
@@ -98,6 +103,7 @@ impl<T: Hashable> Buffer<T> {
             .replace(new_val);
     }
 
+    #[allow(clippy::unwrap_used)]
     pub fn take(&mut self, cursor: &Cursor) -> T {
         self.map
             .get_mut(cursor.as_ref().unwrap())
@@ -130,7 +136,7 @@ impl<T: Hashable> Buffer<T> {
     /// we make sure that the element found by the key is after `cursor`
     /// if `cursor` is None, this function returns None (same as find_elem)
     pub fn find_elem_by_key(&self, cursor: Cursor, key: HashValue) -> Cursor {
-        let cursor_order = self.map.get(cursor.as_ref()?).unwrap().index;
+        let cursor_order = self.map.get(cursor.as_ref()?)?.index;
         let item = self.map.get(&key)?;
         if item.index >= cursor_order {
             Some(key)
diff --git a/consensus/src/pipeline/buffer_item.rs b/consensus/src/pipeline/buffer_item.rs
index d251e97e80fa0..7499090b82094 100644
--- a/consensus/src/pipeline/buffer_item.rs
+++ b/consensus/src/pipeline/buffer_item.rs
@@ -24,10 +24,15 @@ use tokio::time::Instant;
 fn generate_commit_ledger_info(
     commit_info: &BlockInfo,
     ordered_proof: &LedgerInfoWithSignatures,
+    order_vote_enabled: bool,
 ) -> LedgerInfo {
     LedgerInfo::new(
         commit_info.clone(),
-        ordered_proof.ledger_info().consensus_data_hash(),
+        if order_vote_enabled {
+            HashValue::zero()
+        } else {
+            ordered_proof.ledger_info().consensus_data_hash()
+        },
     )
 }
 
@@ -58,10 +63,11 @@ fn generate_executed_item_from_ordered(
     verified_signatures: PartialSignatures,
     callback: StateComputerCommitCallBackType,
     ordered_proof: LedgerInfoWithSignatures,
+    order_vote_enabled: bool,
 ) -> BufferItem {
     debug!("{} advance to executed from ordered", commit_info);
     let partial_commit_proof = LedgerInfoWithPartialSignatures::new(
-        generate_commit_ledger_info(&commit_info, &ordered_proof),
+        generate_commit_ledger_info(&commit_info, &ordered_proof, order_vote_enabled),
         verified_signatures,
     );
     BufferItem::Executed(Box::new(ExecutedItem {
@@ -154,6 +160,7 @@ impl BufferItem {
         executed_blocks: Vec<PipelinedBlock>,
         validator: &ValidatorVerifier,
         epoch_end_timestamp: Option<u64>,
+        order_vote_enabled: bool,
     ) -> Self {
         match self {
             Self::Ordered(ordered_item) => {
@@ -167,10 +174,16 @@ impl BufferItem {
                 for (b1, b2) in zip_eq(ordered_blocks.iter(), executed_blocks.iter()) {
                     assert_eq!(b1.id(), b2.id());
                 }
-                let mut commit_info = executed_blocks.last().unwrap().block_info();
+                let mut commit_info = executed_blocks
+                    .last()
+                    .expect("execute_blocks should not be empty!")
+                    .block_info();
                 match epoch_end_timestamp {
                     Some(timestamp) if commit_info.timestamp_usecs() != timestamp => {
-                        assert!(executed_blocks.last().unwrap().is_reconfiguration_suffix());
+                        assert!(executed_blocks
+                            .last()
+                            .expect("")
+                            .is_reconfiguration_suffix());
                         commit_info.change_timestamp(timestamp);
                     },
                     _ => (),
@@ -189,8 +202,11 @@ impl BufferItem {
                         callback,
                     }))
                 } else {
-                    let commit_ledger_info =
-                        generate_commit_ledger_info(&commit_info, &ordered_proof);
+                    let commit_ledger_info = generate_commit_ledger_info(
+                        &commit_info,
+                        &ordered_proof,
+                        order_vote_enabled,
+                    );
 
                     let verified_signatures =
                         verify_signatures(unverified_signatures, validator, &commit_ledger_info);
@@ -218,6 +234,7 @@ impl BufferItem {
                             verified_signatures,
                             callback,
                             ordered_proof,
+                            order_vote_enabled,
                         )
                     }
                 }
@@ -381,7 +398,10 @@ impl BufferItem {
     }
 
     pub fn block_id(&self) -> HashValue {
-        self.get_blocks().last().unwrap().id()
+        self.get_blocks()
+            .last()
+            .expect("Vec<PipelinedBlock> should not be empty")
+            .id()
     }
 
     pub fn add_signature_if_matched(&mut self, vote: CommitVote) -> anyhow::Result<()> {
diff --git a/consensus/src/pipeline/buffer_manager.rs b/consensus/src/pipeline/buffer_manager.rs
index 746ec14c2bdbc..8b78995eb16dc 100644
--- a/consensus/src/pipeline/buffer_manager.rs
+++ b/consensus/src/pipeline/buffer_manager.rs
@@ -5,10 +5,10 @@
 use crate::{
     block_storage::tracing::{observe_block, BlockStage},
     consensus_observer::{
-        network::{ObserverMessage, OrderedBlock as ObserverBlock},
-        publisher::Publisher,
+        network_message::ConsensusObserverMessage, publisher::ConsensusPublisher,
     },
-    counters, monitor,
+    counters::{self, log_executor_error_occurred},
+    monitor,
     network::{IncomingCommitRequest, NetworkSender},
     network_interface::ConsensusMsg,
     pipeline::{
@@ -24,11 +24,9 @@ use crate::{
     state_replication::StateComputerCommitCallBackType,
 };
 use aptos_bounded_executor::BoundedExecutor;
-use aptos_consensus_types::{
-    common::Author, pipeline::commit_decision::CommitDecision, pipelined_block::PipelinedBlock,
-};
+use aptos_config::config::ConsensusObserverConfig;
+use aptos_consensus_types::{common::Author, pipelined_block::PipelinedBlock};
 use aptos_crypto::HashValue;
-use aptos_executor_types::ExecutorError;
 use aptos_logger::prelude::*;
 use aptos_network::protocols::{rpc::error::RpcError, wire::handshake::v1::ProtocolId};
 use aptos_reliable_broadcast::{DropGuard, ReliableBroadcast};
@@ -118,6 +116,11 @@ pub struct BufferManager {
 
     block_rx: UnboundedReceiver<OrderedBlocks>,
     reset_rx: UnboundedReceiver<ResetRequest>,
+
+    // self channel to retry execution schedule phase
+    execution_schedule_retry_tx: UnboundedSender<()>,
+    execution_schedule_retry_rx: UnboundedReceiver<()>,
+
     stop: bool,
 
     epoch_state: Arc<EpochState>,
@@ -134,8 +137,11 @@ pub struct BufferManager {
     previous_commit_time: Instant,
     reset_flag: Arc<AtomicBool>,
     bounded_executor: BoundedExecutor,
-    // Publisher for downstream observers.
-    publisher: Option<Publisher>,
+    order_vote_enabled: bool,
+
+    // Consensus publisher for downstream observers.
+    consensus_observer_config: ConsensusObserverConfig,
+    consensus_publisher: Option<Arc<ConsensusPublisher>>,
 }
 
 impl BufferManager {
@@ -160,13 +166,18 @@ impl BufferManager {
         ongoing_tasks: Arc<AtomicU64>,
         reset_flag: Arc<AtomicBool>,
         executor: BoundedExecutor,
-        publisher: Option<Publisher>,
+        order_vote_enabled: bool,
+        consensus_observer_config: ConsensusObserverConfig,
+        consensus_publisher: Option<Arc<ConsensusPublisher>>,
     ) -> Self {
         let buffer = Buffer::<BufferItem>::new();
 
         let rb_backoff_policy = ExponentialBackoff::from_millis(2)
             .factor(50)
             .max_delay(Duration::from_secs(5));
+
+        let (tx, rx) = unbounded();
+
         Self {
             author,
 
@@ -183,6 +194,7 @@ impl BufferManager {
             signing_phase_rx,
 
             reliable_broadcast: ReliableBroadcast::new(
+                author,
                 epoch_state.verifier.get_ordered_account_addresses(),
                 commit_msg_tx.clone(),
                 rb_backoff_policy,
@@ -198,6 +210,10 @@ impl BufferManager {
 
             block_rx,
             reset_rx,
+
+            execution_schedule_retry_tx: tx,
+            execution_schedule_retry_rx: rx,
+
             stop: false,
 
             epoch_state,
@@ -206,11 +222,20 @@ impl BufferManager {
             previous_commit_time: Instant::now(),
             reset_flag,
             bounded_executor: executor,
-            publisher,
+            order_vote_enabled,
+
+            consensus_observer_config,
+            consensus_publisher,
         }
     }
 
-    fn do_reliable_broadcast(&self, message: CommitMessage) -> DropGuard {
+    fn do_reliable_broadcast(&self, message: CommitMessage) -> Option<DropGuard> {
+        // If consensus observer is enabled, we don't need to broadcast
+        if self.consensus_observer_config.observer_enabled {
+            return None;
+        }
+
+        // Otherwise, broadcast the message and return the drop guard
         let (abort_handle, abort_registration) = AbortHandle::new_pair();
         let task = self.reliable_broadcast.broadcast(
             message,
@@ -221,7 +246,7 @@ impl BufferManager {
             ),
         );
         tokio::spawn(Abortable::new(task, abort_registration));
-        DropGuard::new(abort_handle)
+        Some(DropGuard::new(abort_handle))
     }
 
     fn create_new_request<Request>(&self, req: Request) -> CountedRequest<Request> {
@@ -262,11 +287,12 @@ impl BufferManager {
             ordered_blocks: ordered_blocks.clone(),
             lifetime_guard: self.create_new_request(()),
         });
-        if let Some(publisher) = &self.publisher {
-            publisher.publish(ObserverMessage::OrderedBlock(ObserverBlock {
-                blocks: ordered_blocks.clone().into_iter().map(Arc::new).collect(),
-                ordered_proof: ordered_proof.clone(),
-            }));
+        if let Some(consensus_publisher) = &self.consensus_publisher {
+            let message = ConsensusObserverMessage::new_ordered_block_message(
+                ordered_blocks.clone().into_iter().map(Arc::new).collect(),
+                ordered_proof.clone(),
+            );
+            consensus_publisher.publish_message(message).await;
         }
         self.execution_schedule_phase_tx
             .send(request)
@@ -279,33 +305,27 @@ impl BufferManager {
 
     /// Set the execution root to the first not executed item (Ordered) and send execution request
     /// Set to None if not exist
-    async fn advance_execution_root(&mut self) {
+    /// Return Some(block_id) if the block needs to be scheduled for retry
+    fn advance_execution_root(&mut self) -> Option<HashValue> {
         let cursor = self.execution_root;
         self.execution_root = self
             .buffer
             .find_elem_from(cursor.or_else(|| *self.buffer.head_cursor()), |item| {
                 item.is_ordered()
             });
-        info!(
-            "Advance execution root from {:?} to {:?}",
-            cursor, self.execution_root
-        );
         if self.execution_root.is_some() && cursor == self.execution_root {
             // Schedule retry.
-            // NOTE: probably should schedule retry for all ordered blocks, but since execution error
-            // is not expected nor retryable in reality, I'd rather remove retrying or do it more
-            // properly than complicating it here.
-            let ordered_blocks = self.buffer.get(&self.execution_root).get_blocks().clone();
-            let request = self.create_new_request(ExecutionRequest {
-                ordered_blocks,
-                lifetime_guard: self.create_new_request(()),
-            });
-            let sender = self.execution_schedule_phase_tx.clone();
-            Self::spawn_retry_request(sender, request, Duration::from_millis(100));
+            self.execution_root
+        } else {
+            info!(
+                "Advance execution root from {:?} to {:?}",
+                cursor, self.execution_root
+            );
+            // Otherwise do nothing, because the execution wait phase is driven by the response of
+            // the execution schedule phase, which is in turn fed as soon as the ordered blocks
+            // come in.
+            None
         }
-        // Otherwise do nothing, because the execution wait phase is driven by the response of
-        // the execution schedule phase, which is in turn fed as soon as the ordered blocks
-        // come in.
     }
 
     /// Set the signing root to the first not signed item (Executed) and send execution request
@@ -360,28 +380,24 @@ impl BufferManager {
             }
             if item.block_id() == target_block_id {
                 let aggregated_item = item.unwrap_aggregated();
-                let block = aggregated_item.executed_blocks.last().unwrap().block();
+                let block = aggregated_item
+                    .executed_blocks
+                    .last()
+                    .expect("executed_blocks should be not empty")
+                    .block();
                 observe_block(block.timestamp_usecs(), BlockStage::COMMIT_CERTIFIED);
-                // TODO: As all the validators broadcast commit votes directly to all other validators,
-                // the proposer do not have to broadcast commit decision again. Remove this if block.
-                // if we're the proposer for the block, we're responsible to broadcast the commit decision.
-                if block.author() == Some(self.author) {
-                    let commit_decision = CommitMessage::Decision(CommitDecision::new(
-                        aggregated_item.commit_proof.clone(),
-                    ));
-                    self.commit_proof_rb_handle
-                        .replace(self.do_reliable_broadcast(commit_decision));
-                }
+                // As all the validators broadcast commit votes directly to all other validators,
+                // the proposer do not have to broadcast commit decision again.
                 let commit_proof = aggregated_item.commit_proof.clone();
                 if commit_proof.ledger_info().ends_epoch() {
                     // the epoch ends, reset to avoid executing more blocks, execute after
                     // this persisting request will result in BlockNotFound
                     self.reset().await;
                 }
-                if let Some(publisher) = &self.publisher {
-                    publisher.publish(ObserverMessage::CommitDecision(CommitDecision::new(
-                        commit_proof.clone(),
-                    )));
+                if let Some(consensus_publisher) = &self.consensus_publisher {
+                    let message =
+                        ConsensusObserverMessage::new_commit_decision_message(commit_proof.clone());
+                    consensus_publisher.publish_message(message).await;
                 }
                 self.persisting_phase_tx
                     .send(self.create_new_request(PersistingRequest {
@@ -450,7 +466,30 @@ impl BufferManager {
             .expect("Failed to send execution wait request.");
     }
 
+    async fn retry_schedule_phase(&mut self) {
+        let mut cursor = self.execution_root;
+        let mut count = 0;
+        while cursor.is_some() {
+            let ordered_blocks = self.buffer.get(&cursor).get_blocks().clone();
+            let request = self.create_new_request(ExecutionRequest {
+                ordered_blocks,
+                lifetime_guard: self.create_new_request(()),
+            });
+            count += 1;
+            self.execution_schedule_phase_tx
+                .send(request)
+                .await
+                .expect("Failed to send execution schedule request.");
+            cursor = self.buffer.get_next(&cursor);
+        }
+        info!(
+            "Reschedule {} execution requests from {:?}",
+            count, self.execution_root
+        );
+    }
+
     /// If the response is successful, advance the item to Executed, otherwise panic (TODO fix).
+    #[allow(clippy::unwrap_used)]
     async fn process_execution_response(&mut self, response: ExecutionResponse) {
         let ExecutionResponse { block_id, inner } = response;
         // find the corresponding item, may not exist if a reset or aggregated happened
@@ -461,12 +500,12 @@ impl BufferManager {
 
         let executed_blocks = match inner {
             Ok(result) => result,
-            Err(ExecutorError::CouldNotGetData) => {
-                warn!("Execution error - CouldNotGetData");
-                return;
-            },
             Err(e) => {
-                error!("Execution error {:?}", e);
+                log_executor_error_occurred(
+                    e,
+                    &counters::BUFFER_MANAGER_RECEIVED_EXECUTOR_ERROR_COUNT,
+                    block_id,
+                );
                 return;
             },
         };
@@ -506,6 +545,7 @@ impl BufferManager {
             executed_blocks,
             &self.epoch_state.verifier,
             self.end_epoch_timestamp.get().cloned(),
+            self.order_vote_enabled,
         );
         let aggregated = new_item.is_aggregated();
         self.buffer.set(&current_cursor, new_item);
@@ -544,9 +584,9 @@ impl BufferManager {
                 let signed_item_mut = signed_item.unwrap_signed_mut();
                 let commit_vote = signed_item_mut.commit_vote.clone();
                 let commit_vote = CommitMessage::Vote(commit_vote);
-                signed_item_mut
-                    .rb_handle
-                    .replace((Instant::now(), self.do_reliable_broadcast(commit_vote)));
+                signed_item_mut.rb_handle = self
+                    .do_reliable_broadcast(commit_vote)
+                    .map(|handle| (Instant::now(), handle));
                 self.buffer.set(&current_cursor, signed_item);
             } else {
                 self.buffer.set(&current_cursor, item);
@@ -672,9 +712,9 @@ impl BufferManager {
                 };
                 if re_broadcast {
                     let commit_vote = CommitMessage::Vote(signed_item.commit_vote.clone());
-                    signed_item
-                        .rb_handle
-                        .replace((Instant::now(), self.do_reliable_broadcast(commit_vote)));
+                    signed_item.rb_handle = self
+                        .do_reliable_broadcast(commit_vote)
+                        .map(|handle| (Instant::now(), handle));
                     count += 1;
                 }
                 self.buffer.set(&cursor, item);
@@ -755,7 +795,7 @@ impl BufferManager {
                     monitor!("buffer_manager_process_ordered", {
                     self.process_ordered_blocks(blocks).await;
                     if self.execution_root.is_none() {
-                        self.advance_execution_root().await;
+                        self.advance_execution_root();
                     }});
                 },
                 reset_event = self.reset_rx.select_next_some() => {
@@ -768,12 +808,27 @@ impl BufferManager {
                 })},
                 response = self.execution_wait_phase_rx.select_next_some() => {
                     monitor!("buffer_manager_process_execution_wait_response", {
+                    let response_block_id = response.block_id;
                     self.process_execution_response(response).await;
-                    self.advance_execution_root().await;
+                    if let Some(block_id) = self.advance_execution_root() {
+                        // if the response is for the current execution root, retry the schedule phase
+                        if response_block_id == block_id {
+                            let mut tx = self.execution_schedule_retry_tx.clone();
+                            tokio::spawn(async move {
+                                tokio::time::sleep(Duration::from_millis(100)).await;
+                                // buffer manager can be dropped at the point of sending retry
+                                let _ = tx.send(()).await;
+                            });
+                        }
+                    }
                     if self.signing_root.is_none() {
                         self.advance_signing_root().await;
                     }});
                 },
+                _ = self.execution_schedule_retry_rx.select_next_some() => {
+                    monitor!("buffer_manager_process_execution_schedule_retry",
+                    self.retry_schedule_phase().await);
+                },
                 response = self.signing_phase_rx.select_next_some() => {
                     monitor!("buffer_manager_process_signing_response", {
                     self.process_signing_response(response).await;
@@ -785,7 +840,7 @@ impl BufferManager {
                     if let Some(aggregated_block_id) = self.process_commit_message(rpc_request) {
                         self.advance_head(aggregated_block_id).await;
                         if self.execution_root.is_none() {
-                            self.advance_execution_root().await;
+                            self.advance_execution_root();
                         }
                         if self.signing_root.is_none() {
                             self.advance_signing_root().await;
diff --git a/consensus/src/pipeline/commit_reliable_broadcast.rs b/consensus/src/pipeline/commit_reliable_broadcast.rs
index 3ee9606fc5ff1..3b21310cba1a5 100644
--- a/consensus/src/pipeline/commit_reliable_broadcast.rs
+++ b/consensus/src/pipeline/commit_reliable_broadcast.rs
@@ -9,10 +9,15 @@ use aptos_consensus_types::{
 };
 use aptos_infallible::Mutex;
 use aptos_reliable_broadcast::{BroadcastStatus, RBMessage, RBNetworkSender};
-use aptos_types::validator_verifier::ValidatorVerifier;
+use aptos_types::{validator_verifier::ValidatorVerifier, PeerId};
 use async_trait::async_trait;
+use bytes::Bytes;
 use serde::{Deserialize, Serialize};
-use std::{collections::HashSet, sync::Arc, time::Duration};
+use std::{
+    collections::{HashMap, HashSet},
+    sync::Arc,
+    time::Duration,
+};
 
 #[derive(Clone, Debug, Serialize, Deserialize)]
 /// Network message for the pipeline phase
@@ -96,18 +101,56 @@ impl BroadcastStatus<CommitMessage> for Arc<AckState> {
 
 #[async_trait]
 impl RBNetworkSender<CommitMessage> for NetworkSender {
+    async fn send_rb_rpc_raw(
+        &self,
+        receiver: Author,
+        raw_message: Bytes,
+        timeout_duration: Duration,
+    ) -> anyhow::Result<CommitMessage> {
+        let response = match self
+            .consensus_network_client
+            .send_rpc_raw(receiver, raw_message, timeout_duration)
+            .await?
+        {
+            ConsensusMsg::CommitMessage(resp) if matches!(*resp, CommitMessage::Ack(_)) => *resp,
+            ConsensusMsg::CommitMessage(resp) if matches!(*resp, CommitMessage::Nack) => {
+                bail!("Received nack, will retry")
+            },
+            _ => bail!("Invalid response to request"),
+        };
+
+        Ok(response)
+    }
+
     async fn send_rb_rpc(
         &self,
         receiver: Author,
         message: CommitMessage,
-        timeout_duration: Duration,
+        timeout: Duration,
     ) -> anyhow::Result<CommitMessage> {
-        let msg = ConsensusMsg::CommitMessage(Box::new(message));
-        let response = match self.send_rpc(receiver, msg, timeout_duration).await? {
+        let req = ConsensusMsg::CommitMessage(Box::new(message));
+        let response = match self.send_rpc(receiver, req, timeout).await? {
             ConsensusMsg::CommitMessage(resp) if matches!(*resp, CommitMessage::Ack(_)) => *resp,
+            ConsensusMsg::CommitMessage(resp) if matches!(*resp, CommitMessage::Nack) => {
+                bail!("Received nack, will retry")
+            },
             _ => bail!("Invalid response to request"),
         };
 
         Ok(response)
     }
+
+    fn to_bytes_by_protocol(
+        &self,
+        peers: Vec<Author>,
+        message: CommitMessage,
+    ) -> Result<HashMap<Author, bytes::Bytes>, anyhow::Error> {
+        let msg = ConsensusMsg::CommitMessage(Box::new(message));
+        self.consensus_network_client
+            .to_bytes_by_protocol(peers, msg)
+    }
+
+    fn sort_peers_by_latency(&self, peers: &mut [PeerId]) {
+        self.sort_peers_by_latency(peers);
+    }
 }
diff --git a/consensus/src/pipeline/decoupled_execution_utils.rs b/consensus/src/pipeline/decoupled_execution_utils.rs
index 68e9f97e0e37d..368346e96153d 100644
--- a/consensus/src/pipeline/decoupled_execution_utils.rs
+++ b/consensus/src/pipeline/decoupled_execution_utils.rs
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{
-    consensus_observer::publisher::Publisher,
+    consensus_observer::publisher::ConsensusPublisher,
     network::{IncomingCommitRequest, NetworkSender},
     pipeline::{
         buffer_manager::{create_channel, BufferManager, OrderedBlocks, ResetRequest},
@@ -17,6 +17,7 @@ use crate::{
 };
 use aptos_bounded_executor::BoundedExecutor;
 use aptos_channels::aptos_channel::Receiver;
+use aptos_config::config::ConsensusObserverConfig;
 use aptos_consensus_types::common::Author;
 use aptos_types::{account_address::AccountAddress, epoch_state::EpochState};
 use futures::channel::mpsc::UnboundedReceiver;
@@ -37,7 +38,9 @@ pub fn prepare_phases_and_buffer_manager(
     sync_rx: UnboundedReceiver<ResetRequest>,
     epoch_state: Arc<EpochState>,
     bounded_executor: BoundedExecutor,
-    publisher: Option<Publisher>,
+    order_vote_enabled: bool,
+    consensus_observer_config: ConsensusObserverConfig,
+    consensus_publisher: Option<Arc<ConsensusPublisher>>,
 ) -> (
     PipelinePhase<ExecutionSchedulePhase>,
     PipelinePhase<ExecutionWaitPhase>,
@@ -121,7 +124,9 @@ pub fn prepare_phases_and_buffer_manager(
             ongoing_tasks,
             reset_flag.clone(),
             bounded_executor,
-            publisher,
+            order_vote_enabled,
+            consensus_observer_config,
+            consensus_publisher,
         ),
     )
 }
diff --git a/consensus/src/pipeline/execution_client.rs b/consensus/src/pipeline/execution_client.rs
index 565229c798064..95dddba956c2b 100644
--- a/consensus/src/pipeline/execution_client.rs
+++ b/consensus/src/pipeline/execution_client.rs
@@ -3,12 +3,12 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{
-    consensus_observer::{network::ObserverMessage, publisher::Publisher},
+    consensus_observer::publisher::ConsensusPublisher,
     counters,
     error::StateSyncError,
     network::{IncomingCommitRequest, IncomingRandGenRequest, NetworkSender},
     network_interface::{ConsensusMsg, ConsensusNetworkClient},
-    payload_manager::PayloadManager,
+    payload_manager::TPayloadManager,
     pipeline::{
         buffer_manager::{OrderedBlocks, ResetAck, ResetRequest, ResetSignal},
         decoupled_execution_utils::prepare_phases_and_buffer_manager,
@@ -28,7 +28,7 @@ use crate::{
 use anyhow::Result;
 use aptos_bounded_executor::BoundedExecutor;
 use aptos_channels::{aptos_channel, message_queues::QueueStyle};
-use aptos_config::config::ConsensusConfig;
+use aptos_config::config::{ConsensusConfig, ConsensusObserverConfig};
 use aptos_consensus_types::{
     common::{Author, Round},
     pipelined_block::PipelinedBlock,
@@ -60,14 +60,14 @@ pub trait TExecutionClient: Send + Sync {
         &self,
         epoch_state: Arc<EpochState>,
         commit_signer_provider: Arc<dyn CommitSignerProvider>,
-        payload_manager: Arc<PayloadManager>,
+        payload_manager: Arc<dyn TPayloadManager>,
         onchain_consensus_config: &OnChainConsensusConfig,
         onchain_execution_config: &OnChainExecutionConfig,
         onchain_randomness_config: &OnChainRandomnessConfig,
         rand_config: Option<RandConfig>,
         fast_rand_config: Option<RandConfig>,
         rand_msg_rx: aptos_channel::Receiver<AccountAddress, IncomingRandGenRequest>,
-        highest_ordered_round: Round,
+        highest_committed_round: Round,
     );
 
     /// This is needed for some DAG tests. Clean this up as a TODO.
@@ -90,6 +90,9 @@ pub trait TExecutionClient: Send + Sync {
     /// Synchronize to a commit that not present locally.
     async fn sync_to(&self, target: LedgerInfoWithSignatures) -> Result<(), StateSyncError>;
 
+    /// Resets the internal state of the rand and buffer managers.
+    async fn reset(&self, target: &LedgerInfoWithSignatures) -> Result<()>;
+
     /// Shutdown the current processor at the end of the epoch.
     async fn end_epoch(&self);
 }
@@ -148,7 +151,8 @@ pub struct ExecutionProxyClient {
     // channels to buffer manager
     handle: Arc<RwLock<BufferManagerHandle>>,
     rand_storage: Arc<dyn RandStorage<AugmentedData>>,
-    observer_network: Option<NetworkClient<ObserverMessage>>,
+    consensus_observer_config: ConsensusObserverConfig,
+    consensus_publisher: Option<Arc<ConsensusPublisher>>,
 }
 
 impl ExecutionProxyClient {
@@ -160,7 +164,8 @@ impl ExecutionProxyClient {
         network_sender: ConsensusNetworkClient<NetworkClient<ConsensusMsg>>,
         bounded_executor: BoundedExecutor,
         rand_storage: Arc<dyn RandStorage<AugmentedData>>,
-        observer_network: Option<NetworkClient<ObserverMessage>>,
+        consensus_observer_config: ConsensusObserverConfig,
+        consensus_publisher: Option<Arc<ConsensusPublisher>>,
     ) -> Self {
         Self {
             consensus_config,
@@ -171,7 +176,8 @@ impl ExecutionProxyClient {
             bounded_executor,
             handle: Arc::new(RwLock::new(BufferManagerHandle::new())),
             rand_storage,
-            observer_network,
+            consensus_observer_config,
+            consensus_publisher,
         }
     }
 
@@ -181,9 +187,11 @@ impl ExecutionProxyClient {
         epoch_state: Arc<EpochState>,
         rand_config: Option<RandConfig>,
         fast_rand_config: Option<RandConfig>,
+        onchain_consensus_config: &OnChainConsensusConfig,
         rand_msg_rx: aptos_channel::Receiver<AccountAddress, IncomingRandGenRequest>,
-        highest_ordered_round: Round,
-        publisher: Option<Publisher>,
+        highest_committed_round: Round,
+        consensus_observer_config: ConsensusObserverConfig,
+        consensus_publisher: Option<Arc<ConsensusPublisher>>,
     ) {
         let network_sender = NetworkSender::new(
             self.author,
@@ -230,7 +238,7 @@ impl ExecutionProxyClient {
                     rand_msg_rx,
                     reset_rand_manager_rx,
                     self.bounded_executor.clone(),
-                    highest_ordered_round,
+                    highest_committed_round,
                 ));
 
                 (
@@ -267,7 +275,9 @@ impl ExecutionProxyClient {
             reset_buffer_manager_rx,
             epoch_state,
             self.bounded_executor.clone(),
-            publisher,
+            onchain_consensus_config.order_vote_enabled(),
+            consensus_observer_config,
+            consensus_publisher,
         );
 
         tokio::spawn(execution_schedule_phase.start());
@@ -284,23 +294,25 @@ impl TExecutionClient for ExecutionProxyClient {
         &self,
         epoch_state: Arc<EpochState>,
         commit_signer_provider: Arc<dyn CommitSignerProvider>,
-        payload_manager: Arc<PayloadManager>,
+        payload_manager: Arc<dyn TPayloadManager>,
         onchain_consensus_config: &OnChainConsensusConfig,
         onchain_execution_config: &OnChainExecutionConfig,
         onchain_randomness_config: &OnChainRandomnessConfig,
         rand_config: Option<RandConfig>,
         fast_rand_config: Option<RandConfig>,
         rand_msg_rx: aptos_channel::Receiver<AccountAddress, IncomingRandGenRequest>,
-        highest_ordered_round: Round,
+        highest_committed_round: Round,
     ) {
         let maybe_rand_msg_tx = self.spawn_decoupled_execution(
             commit_signer_provider,
             epoch_state.clone(),
             rand_config,
             fast_rand_config,
+            onchain_consensus_config,
             rand_msg_rx,
-            highest_ordered_round,
-            self.observer_network.clone().map(Publisher::new),
+            highest_committed_round,
+            self.consensus_observer_config,
+            self.consensus_publisher.clone(),
         );
 
         let transaction_shuffler =
@@ -334,19 +346,19 @@ impl TExecutionClient for ExecutionProxyClient {
         callback: StateComputerCommitCallBackType,
     ) -> ExecutorResult<()> {
         assert!(!blocks.is_empty());
-        let execute_tx = self.handle.read().execute_tx.clone();
-
-        if execute_tx.is_none() {
-            debug!("Failed to send to buffer manager, maybe epoch ends");
-            return Ok(());
-        }
+        let mut execute_tx = match self.handle.read().execute_tx.clone() {
+            Some(tx) => tx,
+            None => {
+                debug!("Failed to send to buffer manager, maybe epoch ends");
+                return Ok(());
+            },
+        };
 
         for block in blocks {
             block.set_insertion_time();
         }
 
         if execute_tx
-            .unwrap()
             .send(OrderedBlocks {
                 ordered_blocks: blocks
                     .iter()
@@ -384,6 +396,16 @@ impl TExecutionClient for ExecutionProxyClient {
             Err(anyhow::anyhow!("Injected error in sync_to").into())
         });
 
+        // Reset the rand and buffer managers to the target round
+        self.reset(&target).await?;
+
+        // TODO: handle the sync error, should re-push the ordered blocks to buffer manager
+        // when it's reset but sync fails.
+        self.execution_proxy.sync_to(target).await?;
+        Ok(())
+    }
+
+    async fn reset(&self, target: &LedgerInfoWithSignatures) -> Result<()> {
         let (reset_tx_to_rand_manager, reset_tx_to_buffer_manager) = {
             let handle = self.handle.read();
             (
@@ -417,9 +439,6 @@ impl TExecutionClient for ExecutionProxyClient {
             rx.await.map_err(|_| Error::ResetDropped)?;
         }
 
-        // TODO: handle the sync error, should re-push the ordered blocks to buffer manager
-        // when it's reset but sync fails.
-        self.execution_proxy.sync_to(target).await?;
         Ok(())
     }
 
@@ -466,14 +485,14 @@ impl TExecutionClient for DummyExecutionClient {
         &self,
         _epoch_state: Arc<EpochState>,
         _commit_signer_provider: Arc<dyn CommitSignerProvider>,
-        _payload_manager: Arc<PayloadManager>,
+        _payload_manager: Arc<dyn TPayloadManager>,
         _onchain_consensus_config: &OnChainConsensusConfig,
         _onchain_execution_config: &OnChainExecutionConfig,
         _onchain_randomness_config: &OnChainRandomnessConfig,
         _rand_config: Option<RandConfig>,
         _fast_rand_config: Option<RandConfig>,
         _rand_msg_rx: aptos_channel::Receiver<AccountAddress, IncomingRandGenRequest>,
-        _highest_ordered_round: Round,
+        _highest_committed_round: Round,
     ) {
     }
 
@@ -498,5 +517,9 @@ impl TExecutionClient for DummyExecutionClient {
         Ok(())
     }
 
+    async fn reset(&self, _: &LedgerInfoWithSignatures) -> Result<()> {
+        Ok(())
+    }
+
     async fn end_epoch(&self) {}
 }
diff --git a/consensus/src/pipeline/execution_schedule_phase.rs b/consensus/src/pipeline/execution_schedule_phase.rs
index 96586273649c1..29dc57dacfd12 100644
--- a/consensus/src/pipeline/execution_schedule_phase.rs
+++ b/consensus/src/pipeline/execution_schedule_phase.rs
@@ -11,7 +11,7 @@ use crate::{
 };
 use aptos_consensus_types::pipelined_block::PipelinedBlock;
 use aptos_crypto::HashValue;
-use aptos_executor_types::ExecutorError;
+use aptos_executor_types::{ExecutorError, ExecutorResult};
 use aptos_logger::debug;
 use async_trait::async_trait;
 use futures::TryFutureExt;
@@ -66,14 +66,15 @@ impl StatelessPipeline for ExecutionSchedulePhase {
             lifetime_guard,
         } = req;
 
-        if ordered_blocks.is_empty() {
-            return ExecutionWaitRequest {
-                block_id: HashValue::zero(),
-                fut: Box::pin(async { Err(aptos_executor_types::ExecutorError::EmptyBlocks) }),
-            };
-        }
-
-        let block_id = ordered_blocks.last().unwrap().id();
+        let block_id = match ordered_blocks.last() {
+            Some(block) => block.id(),
+            None => {
+                return ExecutionWaitRequest {
+                    block_id: HashValue::zero(),
+                    fut: Box::pin(async { Err(aptos_executor_types::ExecutorError::EmptyBlocks) }),
+                }
+            },
+        };
 
         // Call schedule_compute() for each block here (not in the fut being returned) to
         // make sure they are scheduled in order.
@@ -91,11 +92,22 @@ impl StatelessPipeline for ExecutionSchedulePhase {
         //      ExecutionWait phase is never kicked off.
         let fut = tokio::task::spawn(async move {
             let mut results = vec![];
-            for (block, fut) in itertools::zip_eq(ordered_blocks, futs) {
+            // wait for all futs so that lifetime_guard is guaranteed to be dropped only
+            // after all executor calls are over
+            for (block, fut) in itertools::zip_eq(&ordered_blocks, futs) {
                 debug!("try to receive compute result for block {}", block.id());
-                let PipelineExecutionResult { input_txns, result } = fut.await?;
-                results.push(block.set_execution_result(input_txns, result));
+                results.push(fut.await)
             }
+            let results = itertools::zip_eq(ordered_blocks, results)
+                .map(|(block, res)| {
+                    let PipelineExecutionResult {
+                        input_txns,
+                        result,
+                        execution_time,
+                    } = res?;
+                    Ok(block.set_execution_result(input_txns, result, execution_time))
+                })
+                .collect::<ExecutorResult<Vec<_>>>()?;
             drop(lifetime_guard);
             Ok(results)
         })
diff --git a/consensus/src/pipeline/tests/buffer_manager_tests.rs b/consensus/src/pipeline/tests/buffer_manager_tests.rs
index ac30ada2b97d4..8e6aee8bbed18 100644
--- a/consensus/src/pipeline/tests/buffer_manager_tests.rs
+++ b/consensus/src/pipeline/tests/buffer_manager_tests.rs
@@ -26,7 +26,7 @@ use crate::{
 };
 use aptos_bounded_executor::BoundedExecutor;
 use aptos_channels::{aptos_channel, message_queues::QueueStyle};
-use aptos_config::network_id::NetworkId;
+use aptos_config::{config::ConsensusObserverConfig, network_id::NetworkId};
 use aptos_consensus_types::{
     block::block_test_utils::certificate_for_genesis, pipelined_block::PipelinedBlock,
     vote_proposal::VoteProposal,
@@ -156,6 +156,8 @@ pub fn prepare_buffer_manager(
             verifier: validators.clone(),
         }),
         bounded_executor,
+        false,
+        ConsensusObserverConfig::default(),
         None,
     );
 
@@ -253,16 +255,24 @@ async fn assert_results(
     batches: Vec<Vec<PipelinedBlock>>,
     result_rx: &mut Receiver<OrderedBlocks>,
 ) {
-    for (i, batch) in enumerate(batches) {
+    let total_batches = batches.iter().flatten().count();
+    let mut blocks: Vec<PipelinedBlock> = Vec::new();
+    while blocks.len() < total_batches {
         let OrderedBlocks { ordered_blocks, .. } = result_rx.next().await.unwrap();
-        assert_eq!(
-            ordered_blocks.last().unwrap().id(),
-            batch.last().unwrap().id(),
-            "Inconsistent Block IDs (expected {} got {}) for {}-th block",
-            batch.last().unwrap().id(),
-            ordered_blocks.last().unwrap().id(),
-            i,
-        );
+        blocks.extend(ordered_blocks.into_iter());
+    }
+
+    for (i, batch) in enumerate(batches) {
+        for (idx, ordered_block) in blocks.drain(..batch.len()).enumerate() {
+            assert_eq!(
+                ordered_block.id(),
+                batch[idx].id(),
+                "Inconsistent Block IDs (expected {} got {}) for {}-th block",
+                batch[idx].id(),
+                ordered_block.id(),
+                i,
+            );
+        }
     }
 }
 
@@ -318,8 +328,9 @@ fn buffer_manager_happy_path_test() {
                 .ok();
         }
 
-        // commit decision will be sent too, so 3 * 2
-        for _ in 0..6 {
+        // Only commit votes are sent, so 3 commit votes are expected
+        // Commit decision is no longer broadcasted
+        for _ in 0..3 {
             if let Some(msg) = self_loop_rx.next().await {
                 loopback_commit_vote(msg, &msg_tx, &verifier).await;
             }
diff --git a/consensus/src/pipeline/tests/signing_phase_tests.rs b/consensus/src/pipeline/tests/signing_phase_tests.rs
index e5c5b534b6f0f..6e16aa11b3b7d 100644
--- a/consensus/src/pipeline/tests/signing_phase_tests.rs
+++ b/consensus/src/pipeline/tests/signing_phase_tests.rs
@@ -73,6 +73,7 @@ fn add_signing_phase_test_cases(
     );
 
     let (_, executed_ledger_info) = prepare_executed_blocks_with_executed_ledger_info(&signers[0]);
+    let executed_commit_ledger_info = executed_ledger_info.ledger_info().clone();
     let inconsistent_commit_ledger_info =
         LedgerInfo::new(BlockInfo::random(1), HashValue::from_u64(0xBEEF));
 
@@ -90,17 +91,15 @@ fn add_signing_phase_test_cases(
         }),
     );
 
-    // not ordered-only
+    // ordered ledger info same as commit ledger info
     phase_tester.add_test_case(
         SigningRequest {
             ordered_ledger_info: executed_ledger_info.clone(),
             commit_ledger_info: executed_ledger_info.ledger_info().clone(),
         },
         Box::new(move |resp| {
-            assert!(matches!(
-                resp.signature_result,
-                Err(Error::InvalidOrderedLedgerInfo(_))
-            ));
+            assert!(resp.signature_result.is_ok());
+            assert_eq!(resp.commit_ledger_info, executed_commit_ledger_info);
         }),
     );
 
diff --git a/consensus/src/pipeline/tests/test_utils.rs b/consensus/src/pipeline/tests/test_utils.rs
index 014cd3ed08bcd..95a6cfd85f0aa 100644
--- a/consensus/src/pipeline/tests/test_utils.rs
+++ b/consensus/src/pipeline/tests/test_utils.rs
@@ -106,6 +106,7 @@ pub fn prepare_executed_blocks_with_ledger_info(
         vec![],
         vec![],
         vec![],
+        None, // block end info
     );
 
     let li = LedgerInfo::new(
diff --git a/consensus/src/quorum_store/batch_coordinator.rs b/consensus/src/quorum_store/batch_coordinator.rs
index 177e8d102c6e9..6bc8f2fc15eb5 100644
--- a/consensus/src/quorum_store/batch_coordinator.rs
+++ b/consensus/src/quorum_store/batch_coordinator.rs
@@ -76,7 +76,12 @@ impl BatchCoordinator {
             let peer_id = persist_requests[0].author();
             let batches = persist_requests
                 .iter()
-                .map(|persisted_value| persisted_value.batch_info().clone())
+                .map(|persisted_value| {
+                    (
+                        persisted_value.batch_info().clone(),
+                        persisted_value.summary(),
+                    )
+                })
                 .collect();
             let signed_batch_infos = batch_store.persist(persist_requests);
             if !signed_batch_infos.is_empty() {
diff --git a/consensus/src/quorum_store/batch_generator.rs b/consensus/src/quorum_store/batch_generator.rs
index 97157ae9c6720..65805bb356ffd 100644
--- a/consensus/src/quorum_store/batch_generator.rs
+++ b/consensus/src/quorum_store/batch_generator.rs
@@ -336,7 +336,7 @@ impl BatchGenerator {
             .mempool_proxy
             .pull_internal(
                 max_count,
-                self.config.sender_max_batch_bytes as u64,
+                self.config.sender_max_total_bytes as u64,
                 self.txns_in_progress_sorted.clone(),
             )
             .await
@@ -425,18 +425,22 @@ impl BatchGenerator {
                             trace!("QS: dynamic_max_pull_txn_per_s: {}", dynamic_pull_txn_per_s);
                         }
                         counters::QS_BACKPRESSURE_TXN_COUNT.observe(1.0);
+                        counters::QS_BACKPRESSURE_MAKE_STRICTER_TXN_COUNT.observe(1.0);
                         counters::QS_BACKPRESSURE_DYNAMIC_MAX.observe(dynamic_pull_txn_per_s as f64);
                     } else {
                         // additive increase, every second
                         if back_pressure_increase_latest.elapsed() >= back_pressure_increase_duration {
                             back_pressure_increase_latest = tick_start;
                             dynamic_pull_txn_per_s = std::cmp::min(
-                                dynamic_pull_txn_per_s + self.config.back_pressure.dynamic_min_txn_per_s,
+                                dynamic_pull_txn_per_s + self.config.back_pressure.additive_increase_when_no_backpressure,
                                 self.config.back_pressure.dynamic_max_txn_per_s,
                             );
                             trace!("QS: dynamic_max_pull_txn_per_s: {}", dynamic_pull_txn_per_s);
                         }
-                        counters::QS_BACKPRESSURE_TXN_COUNT.observe(0.0);
+                        counters::QS_BACKPRESSURE_TXN_COUNT.observe(
+                            if dynamic_pull_txn_per_s < self.config.back_pressure.dynamic_max_txn_per_s { 1.0 } else { 0.0 }
+                        );
+                        counters::QS_BACKPRESSURE_MAKE_STRICTER_TXN_COUNT.observe(0.0);
                         counters::QS_BACKPRESSURE_DYNAMIC_MAX.observe(dynamic_pull_txn_per_s as f64);
                     }
                     if self.back_pressure.proof_count {
diff --git a/consensus/src/quorum_store/batch_requester.rs b/consensus/src/quorum_store/batch_requester.rs
index 3e136c6f1efb1..01b5e47c7f003 100644
--- a/consensus/src/quorum_store/batch_requester.rs
+++ b/consensus/src/quorum_store/batch_requester.rs
@@ -6,10 +6,10 @@ use crate::{
     network::QuorumStoreSender,
     quorum_store::{
         counters,
-        types::{BatchRequest, BatchResponse},
+        types::{BatchRequest, BatchResponse, PersistedValue},
     },
 };
-use aptos_consensus_types::proof_of_store::{BatchInfo, ProofOfStore};
+use aptos_consensus_types::proof_of_store::BatchInfo;
 use aptos_crypto::HashValue;
 use aptos_executor_types::*;
 use aptos_logger::prelude::*;
@@ -130,14 +130,14 @@ impl<T: QuorumStoreSender + Sync + 'static> BatchRequester<T> {
 
     pub(crate) async fn request_batch(
         &self,
-        proof: ProofOfStore,
+        digest: HashValue,
+        expiration: u64,
+        responders: Vec<PeerId>,
         ret_tx: oneshot::Sender<ExecutorResult<Vec<SignedTransaction>>>,
+        mut subscriber_rx: oneshot::Receiver<PersistedValue>,
     ) -> Option<(BatchInfo, Vec<SignedTransaction>)> {
-        let digest = *proof.digest();
-        let expiration = proof.expiration();
-        let signers = proof.shuffled_signers(&self.validator_verifier);
         let validator_verifier = self.validator_verifier.clone();
-        let mut request_state = BatchRequesterState::new(signers, ret_tx, self.retry_limit);
+        let mut request_state = BatchRequesterState::new(responders, ret_tx, self.retry_limit);
         let network_sender = self.network_sender.clone();
         let request_num_peers = self.request_num_peers;
         let my_peer_id = self.my_peer_id;
@@ -191,6 +191,19 @@ impl<T: QuorumStoreSender + Sync + 'static> BatchRequester<T> {
                             }
                         }
                     },
+                    result = &mut subscriber_rx => {
+                        match result {
+                            Ok(persisted_value) => {
+                                counters::RECEIVED_BATCH_FROM_SUBSCRIPTION_COUNT.inc();
+                                let (info, maybe_payload) = persisted_value.unpack();
+                                request_state.serve_request(*info.digest(), maybe_payload);
+                                return None;
+                            }
+                            Err(err) => {
+                                debug!("channel closed: {}", err);
+                            }
+                        };
+                    },
                 }
             }
             counters::RECEIVED_BATCH_REQUEST_TIMEOUT_COUNT.inc();
diff --git a/consensus/src/quorum_store/batch_store.rs b/consensus/src/quorum_store/batch_store.rs
index e6a38aa2314b0..7ae887ea08f37 100644
--- a/consensus/src/quorum_store/batch_store.rs
+++ b/consensus/src/quorum_store/batch_store.rs
@@ -12,7 +12,7 @@ use crate::{
     },
 };
 use anyhow::bail;
-use aptos_consensus_types::proof_of_store::{ProofOfStore, SignedBatchInfo};
+use aptos_consensus_types::proof_of_store::SignedBatchInfo;
 use aptos_crypto::HashValue;
 use aptos_executor_types::{ExecutorError, ExecutorResult};
 use aptos_logger::prelude::*;
@@ -116,6 +116,7 @@ pub struct BatchStore {
     db_quota: usize,
     batch_quota: usize,
     validator_signer: ValidatorSigner,
+    persist_subscribers: DashMap<HashValue, Vec<oneshot::Sender<PersistedValue>>>,
 }
 
 impl BatchStore {
@@ -140,6 +141,7 @@ impl BatchStore {
             db_quota,
             batch_quota,
             validator_signer,
+            persist_subscribers: DashMap::new(),
         };
         let db_content = db_clone
             .get_all_batches()
@@ -172,13 +174,15 @@ impl BatchStore {
             "QS: Batchreader recovery expired keys len {}",
             expired_keys.len()
         );
-        db_clone.delete_batches(expired_keys).unwrap();
+        db_clone
+            .delete_batches(expired_keys)
+            .expect("Deletion of expired keys should not fail");
 
         batch_store
     }
 
     fn epoch(&self) -> u64 {
-        *self.epoch.get().unwrap()
+        *self.epoch.get().expect("Epoch should always be set")
     }
 
     fn free_quota(&self, value: PersistedValue) {
@@ -244,10 +248,13 @@ impl BatchStore {
         }
 
         // Add expiration for the inserted entry, no need to be atomic w. insertion.
-        self.expirations
-            .lock()
-            .unwrap()
-            .add_item(digest, expiration_time);
+        #[allow(clippy::unwrap_used)]
+        {
+            self.expirations
+                .lock()
+                .unwrap()
+                .add_item(digest, expiration_time);
+        }
         Ok(true)
     }
 
@@ -274,6 +281,7 @@ impl BatchStore {
     }
 
     // pub(crate) for testing
+    #[allow(clippy::unwrap_used)]
     pub(crate) fn clear_expired_payload(&self, certified_time: u64) -> Vec<HashValue> {
         let expired_digests = self.expirations.lock().unwrap().expire(certified_time);
         let mut ret = Vec::new();
@@ -284,6 +292,7 @@ impl BatchStore {
                     // digest with a higher expiration would update the persisted value and
                     // effectively extend the expiration.
                     if entry.get().expiration() <= certified_time {
+                        self.persist_subscribers.remove(entry.get().digest());
                         Some(entry.remove())
                     } else {
                         None
@@ -306,6 +315,7 @@ impl BatchStore {
                 let batch_info = persist_request.batch_info().clone();
                 trace!("QS: sign digest {}", persist_request.digest());
                 if needs_db {
+                    #[allow(clippy::unwrap_in_result)]
                     self.db
                         .save_batch(persist_request)
                         .expect("Could not write to DB");
@@ -371,13 +381,39 @@ impl BatchStore {
             Err(ExecutorError::CouldNotGetData)
         }
     }
+
+    /// This calls lets the caller subscribe to a batch being added to the batch store.
+    /// This can be useful in cases where there are multiple flows to add a batch (like
+    /// direct from author batch / batch requester fetch) to the batch store and either
+    /// flow needs to subscribe to the other.
+    fn subscribe(&self, digest: HashValue) -> oneshot::Receiver<PersistedValue> {
+        let (tx, rx) = oneshot::channel();
+        self.persist_subscribers.entry(digest).or_default().push(tx);
+
+        // This is to account for the race where this subscribe call happens after the
+        // persist call.
+        if let Ok(value) = self.get_batch_from_local(&digest) {
+            self.notify_subscribers(value)
+        }
+
+        rx
+    }
+
+    fn notify_subscribers(&self, value: PersistedValue) {
+        if let Some((_, subscribers)) = self.persist_subscribers.remove(value.digest()) {
+            for subscriber in subscribers {
+                subscriber.send(value.clone()).ok();
+            }
+        }
+    }
 }
 
 impl BatchWriter for BatchStore {
     fn persist(&self, persist_requests: Vec<PersistedValue>) -> Vec<SignedBatchInfo> {
         let mut signed_infos = vec![];
         for persist_request in persist_requests.into_iter() {
-            if let Some(signed_info) = self.persist_inner(persist_request) {
+            if let Some(signed_info) = self.persist_inner(persist_request.clone()) {
+                self.notify_subscribers(persist_request);
                 signed_infos.push(signed_info);
             }
         }
@@ -391,7 +427,9 @@ pub trait BatchReader: Send + Sync {
 
     fn get_batch(
         &self,
-        proof: ProofOfStore,
+        digest: HashValue,
+        expiration: u64,
+        signers: Vec<PeerId>,
     ) -> oneshot::Receiver<ExecutorResult<Vec<SignedTransaction>>>;
 
     fn update_certified_timestamp(&self, certified_time: u64);
@@ -421,26 +459,31 @@ impl<T: QuorumStoreSender + Clone + Send + Sync + 'static> BatchReader for Batch
 
     fn get_batch(
         &self,
-        proof: ProofOfStore,
+        digest: HashValue,
+        expiration: u64,
+        signers: Vec<PeerId>,
     ) -> oneshot::Receiver<ExecutorResult<Vec<SignedTransaction>>> {
         let (tx, rx) = oneshot::channel();
         let batch_store = self.batch_store.clone();
         let batch_requester = self.batch_requester.clone();
         tokio::spawn(async move {
-            if let Ok(mut value) = batch_store.get_batch_from_local(proof.digest()) {
+            if let Ok(mut value) = batch_store.get_batch_from_local(&digest) {
                 if tx
                     .send(Ok(value.take_payload().expect("Must have payload")))
                     .is_err()
                 {
                     debug!(
                         "Receiver of local batch not available for digest {}",
-                        proof.digest()
+                        digest,
                     )
                 };
             } else {
                 // Quorum store metrics
                 counters::MISSED_BATCHES_COUNT.inc();
-                if let Some((batch_info, payload)) = batch_requester.request_batch(proof, tx).await
+                let subscriber_rx = batch_store.subscribe(digest);
+                if let Some((batch_info, payload)) = batch_requester
+                    .request_batch(digest, expiration, signers, tx, subscriber_rx)
+                    .await
                 {
                     batch_store.persist(vec![PersistedValue::new(batch_info, Some(payload))]);
                 }
diff --git a/consensus/src/quorum_store/counters.rs b/consensus/src/quorum_store/counters.rs
index 74f179e1fb3d6..31de4d8a2114c 100644
--- a/consensus/src/quorum_store/counters.rs
+++ b/consensus/src/quorum_store/counters.rs
@@ -1,6 +1,8 @@
 // Copyright © Aptos Foundation
 // SPDX-License-Identifier: Apache-2.0
 
+#![allow(clippy::unwrap_used)]
+
 use aptos_metrics_core::{
     exponential_buckets, op_counters::DurationHistogram, register_avg_counter, register_histogram,
     register_histogram_vec, register_int_counter, register_int_counter_vec, Histogram,
@@ -28,6 +30,14 @@ static TRANSACTION_COUNT_BUCKETS: Lazy<Vec<f64>> = Lazy::new(|| {
     .unwrap()
 });
 
+static PROOF_COUNT_BUCKETS: Lazy<Vec<f64>> = Lazy::new(|| {
+    [
+        1.0, 3.0, 5.0, 7.0, 10.0, 12.0, 15.0, 20.0, 25.0, 30.0, 40.0, 50.0, 60.0, 75.0, 100.0,
+        125.0, 150.0, 200.0, 250.0, 300.0, 500.0,
+    ]
+    .to_vec()
+});
+
 static BYTE_BUCKETS: Lazy<Vec<f64>> = Lazy::new(|| {
     exponential_buckets(
         /*start=*/ 500.0, /*factor=*/ 1.5, /*count=*/ 25,
@@ -82,6 +92,46 @@ pub static PROOF_MANAGER_MAIN_LOOP: Lazy<DurationHistogram> = Lazy::new(|| {
     )
 });
 
+pub static PROOF_QUEUE_ADD_BATCH_SUMMARIES_DURATION: Lazy<DurationHistogram> = Lazy::new(|| {
+    DurationHistogram::new(
+        register_histogram!(
+            "quorum_store_proof_queue_add_batch_summaries_duration",
+            "Duration of adding batch summaries to proof queue"
+        )
+        .unwrap(),
+    )
+});
+
+pub static PROOF_QUEUE_COMMIT_DURATION: Lazy<DurationHistogram> = Lazy::new(|| {
+    DurationHistogram::new(
+        register_histogram!(
+            "quorum_store_proof_queue_commit_duration",
+            "Duration of committing proofs from proof queue"
+        )
+        .unwrap(),
+    )
+});
+
+pub static PROOF_QUEUE_UPDATE_TIMESTAMP_DURATION: Lazy<DurationHistogram> = Lazy::new(|| {
+    DurationHistogram::new(
+        register_histogram!(
+            "quorum_store_proof_queue_update_block_timestamp_duration",
+            "Duration of updating block timestamp in proof queue"
+        )
+        .unwrap(),
+    )
+});
+
+pub static PROOF_QUEUE_REMAINING_TXNS_DURATION: Lazy<DurationHistogram> = Lazy::new(|| {
+    DurationHistogram::new(
+        register_histogram!(
+            "quorum_store_proof_queue_remaining_txns_duration",
+            "Duration of calculating remaining txns in proof queue"
+        )
+        .unwrap(),
+    )
+});
+
 /// Duration of each run of the event loop.
 pub static BATCH_GENERATOR_MAIN_LOOP: Lazy<DurationHistogram> = Lazy::new(|| {
     DurationHistogram::new(
@@ -136,6 +186,24 @@ pub static BLOCK_SIZE_WHEN_PULL: Lazy<Histogram> = Lazy::new(|| {
     .unwrap()
 });
 
+pub static TOTAL_BLOCK_SIZE_WHEN_PULL: Lazy<Histogram> = Lazy::new(|| {
+    register_histogram!(
+        "quorum_store_total_block_size_when_pull",
+        "Histogram for the total size of transactions per block when pulled for consensus.",
+        BYTE_BUCKETS.clone(),
+    )
+    .unwrap()
+});
+
+pub static KNOWN_DUPLICATE_TXNS_WHEN_PULL: Lazy<Histogram> = Lazy::new(|| {
+    register_histogram!(
+        "quorum_store_known_duplicate_txns_when_pull",
+        "Histogram for the number of known duplicate transactions in a block when pulled for consensus.",
+        TRANSACTION_COUNT_BUCKETS.clone(),
+    )
+    .unwrap()
+});
+
 pub static NUM_INLINE_BATCHES: Lazy<Histogram> = Lazy::new(|| {
     register_histogram!(
         "num_inline_batches_in_block_proposal",
@@ -304,6 +372,71 @@ pub fn pos_to_commit(bucket: u64, secs: f64) {
         .observe(secs);
 }
 
+//////////////////////
+// Proof Queue
+//////////////////////
+
+pub static PROOFS_WITHOUT_BATCH_SUMMARY: Lazy<Histogram> = Lazy::new(|| {
+    register_histogram!(
+        "quorum_store_proofs_without_batch_data",
+        "Number of proofs received without batch data",
+        PROOF_COUNT_BUCKETS.clone(),
+    )
+    .unwrap()
+});
+
+pub static PROOFS_WITH_BATCH_SUMMARY: Lazy<Histogram> = Lazy::new(|| {
+    register_histogram!(
+        "quorum_store_proofs_with_batch_data",
+        "Number of proofs received without batch data",
+        PROOF_COUNT_BUCKETS.clone(),
+    )
+    .unwrap()
+});
+
+pub static TXNS_WITH_DUPLICATE_BATCHES: Lazy<Histogram> = Lazy::new(|| {
+    register_histogram!(
+        "quorum_store_txns_with_duplicate_batches",
+        "Number of transactions received with duplicate batches",
+        TRANSACTION_COUNT_BUCKETS.clone(),
+    )
+    .unwrap()
+});
+
+pub static TXNS_IN_PROOFS_WITH_SUMMARIES: Lazy<Histogram> = Lazy::new(|| {
+    register_histogram!(
+        "quorum_store_txns_in_proof_queue_with_summaries",
+        "Number of transactions in the proof queue",
+        TRANSACTION_COUNT_BUCKETS.clone(),
+    )
+    .unwrap()
+});
+
+pub static TXNS_IN_PROOFS_WITHOUT_SUMMARIES: Lazy<Histogram> = Lazy::new(|| {
+    register_histogram!(
+        "quorum_store_txns_in_proof_queue_without_summaries",
+        "Number of transactions in the proof queue",
+        TRANSACTION_COUNT_BUCKETS.clone(),
+    )
+    .unwrap()
+});
+
+pub static NUM_PROOFS_IN_PROOF_QUEUE_AFTER_PULL: Lazy<Histogram> = Lazy::new(|| {
+    register_histogram!(
+        "quorum_store_num_proofs_left_in_proof_queue_after_pull",
+        "Histogram for the number of proofs left in the proof queue after block proposal generation.",
+        PROOF_COUNT_BUCKETS.clone(),
+    ).unwrap()
+});
+
+pub static NUM_TXNS_IN_PROOF_QUEUE_AFTER_PULL: Lazy<Histogram> = Lazy::new(|| {
+    register_histogram!(
+        "quorum_store_num_txns_left_in_proof_queue_after_pull",
+        "Histogram for the number of transactions left in the proof queue after block proposal generation.",
+        TRANSACTION_COUNT_BUCKETS.clone(),
+    ).unwrap()
+});
+
 /// Histogram for the number of total txns left after adding or cleaning batches.
 pub static NUM_TOTAL_TXNS_LEFT_ON_UPDATE: Lazy<Histogram> = Lazy::new(|| {
     register_avg_counter(
@@ -312,6 +445,14 @@ pub static NUM_TOTAL_TXNS_LEFT_ON_UPDATE: Lazy<Histogram> = Lazy::new(|| {
     )
 });
 
+pub static NUM_UNIQUE_TOTAL_TXNS_LEFT_ON_UPDATE: Lazy<Histogram> = Lazy::new(|| {
+    register_histogram!(
+        "quorum_store_num_unique_total_txns_left_on_update",
+        "Histogram for the number of total txns left after adding or cleaning batches, without duplicates.",
+        TRANSACTION_COUNT_BUCKETS.clone()
+    ).unwrap()
+});
+
 /// Histogram for the number of total batches/PoS left after adding or cleaning batches.
 pub static NUM_TOTAL_PROOFS_LEFT_ON_UPDATE: Lazy<Histogram> = Lazy::new(|| {
     register_avg_counter(
@@ -606,6 +747,14 @@ pub static RECEIVED_BATCH_RESPONSE_ERROR_COUNT: Lazy<IntCounter> = Lazy::new(||
     .unwrap()
 });
 
+pub static RECEIVED_BATCH_FROM_SUBSCRIPTION_COUNT: Lazy<IntCounter> = Lazy::new(|| {
+    register_int_counter!(
+        "quorum_store_batch_from_subscription_count",
+        "Count of the number of batches received via batch store subscription."
+    )
+    .unwrap()
+});
+
 pub static QS_BACKPRESSURE_TXN_COUNT: Lazy<Histogram> = Lazy::new(|| {
     register_avg_counter(
         "quorum_store_backpressure_txn_count",
@@ -613,6 +762,13 @@ pub static QS_BACKPRESSURE_TXN_COUNT: Lazy<Histogram> = Lazy::new(|| {
     )
 });
 
+pub static QS_BACKPRESSURE_MAKE_STRICTER_TXN_COUNT: Lazy<Histogram> = Lazy::new(|| {
+    register_avg_counter(
+        "quorum_store_backpressure_make_stricter_txn_count",
+        "Indicator of whether Quorum Store txn count backpressure is being made stricter.",
+    )
+});
+
 pub static QS_BACKPRESSURE_PROOF_COUNT: Lazy<Histogram> = Lazy::new(|| {
     register_avg_counter(
         "quorum_store_backpressure_proof_count",
diff --git a/consensus/src/quorum_store/direct_mempool_quorum_store.rs b/consensus/src/quorum_store/direct_mempool_quorum_store.rs
index 661ff46a1d4dd..0728f333bb883 100644
--- a/consensus/src/quorum_store/direct_mempool_quorum_store.rs
+++ b/consensus/src/quorum_store/direct_mempool_quorum_store.rs
@@ -137,21 +137,13 @@ impl DirectMempoolQuorumStore {
 
     async fn handle_consensus_request(&self, req: GetPayloadCommand) {
         match req {
-            GetPayloadCommand::GetPayloadRequest(
-                max_txns,
-                max_bytes,
-                _max_inline_txns,
-                _max_inline_bytes,
-                return_non_full,
-                payload_filter,
-                callback,
-            ) => {
+            GetPayloadCommand::GetPayloadRequest(request) => {
                 self.handle_block_request(
-                    max_txns,
-                    max_bytes,
-                    return_non_full,
-                    payload_filter,
-                    callback,
+                    request.max_txns_after_filtering,
+                    request.max_txns.size_in_bytes(),
+                    request.return_non_full,
+                    request.filter,
+                    request.callback,
                 )
                 .await;
             },
diff --git a/consensus/src/quorum_store/proof_coordinator.rs b/consensus/src/quorum_store/proof_coordinator.rs
index bffd7f53e6692..d3bed4298a933 100644
--- a/consensus/src/quorum_store/proof_coordinator.rs
+++ b/consensus/src/quorum_store/proof_coordinator.rs
@@ -195,6 +195,7 @@ impl ProofCoordinator {
             signed_batch_info.batch_info().clone(),
             IncrementalProofState::new(signed_batch_info.batch_info().clone()),
         );
+        #[allow(deprecated)]
         self.batch_info_to_time
             .entry(signed_batch_info.batch_info().clone())
             .or_insert(chrono::Utc::now().naive_utc().timestamp_micros() as u64);
@@ -228,11 +229,15 @@ impl ProofCoordinator {
                 self.proof_cache
                     .insert(proof.info().clone(), proof.multi_signature().clone());
                 // quorum store measurements
+                #[allow(deprecated)]
                 let duration = chrono::Utc::now().naive_utc().timestamp_micros() as u64
                     - self
                         .batch_info_to_time
                         .remove(signed_batch_info.batch_info())
-                        .expect("Batch created without recording the time!");
+                        .ok_or(
+                            // Batch created without recording the time!
+                            SignedBatchInfoError::NoTimeStamps,
+                        )?;
                 counters::BATCH_TO_POS_DURATION.observe_duration(Duration::from_micros(duration));
                 return Ok(Some(proof));
             }
diff --git a/consensus/src/quorum_store/proof_manager.rs b/consensus/src/quorum_store/proof_manager.rs
index 3cdac9a768ad3..6f23f6d8c4032 100644
--- a/consensus/src/quorum_store/proof_manager.rs
+++ b/consensus/src/quorum_store/proof_manager.rs
@@ -11,9 +11,11 @@ use crate::{
     },
 };
 use aptos_consensus_types::{
-    common::{Payload, PayloadFilter, ProofWithData},
+    common::{Payload, PayloadFilter, ProofWithData, TxnSummaryWithExpiration},
+    payload::{OptQuorumStorePayload, PayloadExecutionLimit},
     proof_of_store::{BatchInfo, ProofOfStore, ProofOfStoreMsg},
     request_response::{GetPayloadCommand, GetPayloadResponse},
+    utils::PayloadTxnsSize,
 };
 use aptos_logger::prelude::*;
 use aptos_types::{transaction::SignedTransaction, PeerId};
@@ -24,12 +26,13 @@ use std::{
     cmp::min,
     collections::{BTreeMap, HashMap, HashSet},
     sync::Arc,
+    time::Duration,
 };
 
 #[derive(Debug)]
 pub enum ProofManagerCommand {
     ReceiveProofs(ProofOfStoreMsg),
-    ReceiveBatches(Vec<BatchInfo>),
+    ReceiveBatches(Vec<(BatchInfo, Vec<TxnSummaryWithExpiration>)>),
     CommitNotification(u64, Vec<BatchInfo>),
     Shutdown(tokio::sync::oneshot::Sender<()>),
 }
@@ -79,13 +82,11 @@ impl BatchQueue {
 
     pub fn pull_batches(
         &mut self,
-        max_txns: u64,
-        max_bytes: u64,
+        max_txns: PayloadTxnsSize,
         excluded_batches: Vec<BatchInfo>,
-    ) -> Vec<(BatchInfo, Vec<SignedTransaction>)> {
+    ) -> (Vec<(BatchInfo, Vec<SignedTransaction>)>, PayloadTxnsSize) {
         let mut result: Vec<(BatchInfo, Vec<SignedTransaction>)> = vec![];
-        let mut num_txns = 0;
-        let mut num_bytes = 0;
+        let mut num_txns = PayloadTxnsSize::zero();
         let mut iters = vec![];
         let mut full = false;
         for (_, batches) in self.author_to_batches.iter() {
@@ -100,15 +101,13 @@ impl BatchQueue {
                 if let Some((_sort_key, batch)) = iter.next() {
                     if excluded_batches.contains(batch) {
                         true
-                    } else if num_txns + batch.num_txns() <= max_txns
-                        && num_bytes + batch.num_bytes() <= max_bytes
+                    } else if num_txns + batch.size() <= max_txns
                     {
                         if let Ok(mut persisted_value) =
                             self.batch_store.get_batch_from_local(batch.digest())
                         {
                             if let Some(txns) = persisted_value.take_payload() {
-                                num_txns += batch.num_txns();
-                                num_bytes += batch.num_bytes();
+                                num_txns += batch.size();
                                 result.push((batch.clone(), txns.clone()));
                             }
                         } else {
@@ -124,7 +123,7 @@ impl BatchQueue {
                 }
             })
         }
-        result
+        (result, num_txns)
     }
 }
 
@@ -136,6 +135,7 @@ pub struct ProofManager {
     back_pressure_total_proof_limit: u64,
     remaining_total_proof_num: u64,
     allow_batches_without_pos_in_proposal: bool,
+    enable_opt_quorum_store: bool,
 }
 
 impl ProofManager {
@@ -145,6 +145,7 @@ impl ProofManager {
         back_pressure_total_proof_limit: u64,
         batch_store: Arc<BatchStore>,
         allow_batches_without_pos_in_proposal: bool,
+        enable_opt_quorum_store: bool,
     ) -> Self {
         Self {
             proofs_for_consensus: ProofQueue::new(my_peer_id),
@@ -154,6 +155,7 @@ impl ProofManager {
             back_pressure_total_proof_limit,
             remaining_total_proof_num: 0,
             allow_batches_without_pos_in_proposal,
+            enable_opt_quorum_store,
         }
     }
 
@@ -166,10 +168,19 @@ impl ProofManager {
             self.proofs_for_consensus.remaining_txns_and_proofs();
     }
 
-    pub(crate) fn receive_batches(&mut self, batches: Vec<BatchInfo>) {
+    pub(crate) fn receive_batches(
+        &mut self,
+        batch_summaries: Vec<(BatchInfo, Vec<TxnSummaryWithExpiration>)>,
+    ) {
         if self.allow_batches_without_pos_in_proposal {
+            let batches = batch_summaries
+                .iter()
+                .map(|(batch_info, _)| batch_info.clone())
+                .collect();
             self.batch_queue.add_batches(batches);
         }
+        self.proofs_for_consensus
+            .add_batch_summaries(batch_summaries);
     }
 
     pub(crate) fn handle_commit_notification(
@@ -194,16 +205,8 @@ impl ProofManager {
 
     pub(crate) fn handle_proposal_request(&mut self, msg: GetPayloadCommand) {
         match msg {
-            GetPayloadCommand::GetPayloadRequest(
-                max_txns,
-                max_bytes,
-                max_inline_txns,
-                max_inline_bytes,
-                return_non_full,
-                filter,
-                callback,
-            ) => {
-                let excluded_batches: HashSet<_> = match filter {
+            GetPayloadCommand::GetPayloadRequest(request) => {
+                let excluded_batches: HashSet<_> = match request.filter {
                     PayloadFilter::Empty => HashSet::new(),
                     PayloadFilter::DirectMempool(_) => {
                         unreachable!()
@@ -211,61 +214,101 @@ impl ProofManager {
                     PayloadFilter::InQuorumStore(proofs) => proofs,
                 };
 
-                let (proof_block, proof_queue_fully_utilized) = self
-                    .proofs_for_consensus
-                    .pull_proofs(&excluded_batches, max_txns, max_bytes, return_non_full);
+                let max_txns_with_proof = request
+                    .max_txns
+                    .compute_pct(100 - request.opt_batch_txns_pct);
+
+                let (
+                    proof_block,
+                    txns_with_proof_size,
+                    cur_unique_txns,
+                    proof_queue_fully_utilized,
+                ) = self.proofs_for_consensus.pull_proofs(
+                    &excluded_batches,
+                    max_txns_with_proof,
+                    request.max_txns_after_filtering,
+                    request.soft_max_txns_after_filtering,
+                    request.return_non_full,
+                    request.block_timestamp,
+                );
 
                 counters::NUM_BATCHES_WITHOUT_PROOF_OF_STORE.observe(self.batch_queue.len() as f64);
                 counters::PROOF_QUEUE_FULLY_UTILIZED
                     .observe(if proof_queue_fully_utilized { 1.0 } else { 0.0 });
 
-                let mut inline_block: Vec<(BatchInfo, Vec<SignedTransaction>)> = vec![];
-                let cur_txns: u64 = proof_block.iter().map(|p| p.num_txns()).sum();
-                let cur_bytes: u64 = proof_block.iter().map(|p| p.num_bytes()).sum();
+                let excluded_batches: Vec<_> = excluded_batches.iter().cloned().collect();
+
+                let (opt_batches, opt_batch_txns_size) = if self.enable_opt_quorum_store {
+                    // TODO(ibalajiarun): Support unique txn calculation
+                    let max_opt_batch_txns_size = request.max_txns - txns_with_proof_size;
+                    let (opt_batches, size) = self
+                        .batch_queue
+                        .pull_batches(max_opt_batch_txns_size, excluded_batches.clone());
 
-                if self.allow_batches_without_pos_in_proposal && proof_queue_fully_utilized {
-                    inline_block = self.batch_queue.pull_batches(
-                        min(max_txns - cur_txns, max_inline_txns),
-                        min(max_bytes - cur_bytes, max_inline_bytes),
-                        excluded_batches
-                            .iter()
-                            .cloned()
-                            .chain(proof_block.iter().map(|proof| proof.info().clone()))
+                    (
+                        opt_batches
+                            .into_iter()
+                            .map(|(batch_info, _)| batch_info)
                             .collect(),
-                    );
-                }
-                let inline_txns = inline_block
-                    .iter()
-                    .map(|(_, txns)| txns.len())
-                    .sum::<usize>();
-                counters::NUM_INLINE_BATCHES.observe(inline_block.len() as f64);
-                counters::NUM_INLINE_TXNS.observe(inline_txns as f64);
+                        size,
+                    )
+                } else {
+                    (Vec::new(), PayloadTxnsSize::zero())
+                };
 
-                let res = GetPayloadResponse::GetPayloadResponse(
-                    if proof_block.is_empty() && inline_block.is_empty() {
-                        Payload::empty(true, self.allow_batches_without_pos_in_proposal)
-                    } else if inline_block.is_empty() {
-                        trace!(
-                            "QS: GetBlockRequest excluded len {}, block len {}",
-                            excluded_batches.len(),
-                            proof_block.len()
-                        );
-                        Payload::InQuorumStore(ProofWithData::new(proof_block))
-                    } else {
-                        trace!(
-                            "QS: GetBlockRequest excluded len {}, block len {}, inline len {}",
-                            excluded_batches.len(),
-                            proof_block.len(),
-                            inline_block.len()
-                        );
-                        Payload::QuorumStoreInlineHybrid(
-                            inline_block,
-                            ProofWithData::new(proof_block),
-                            None,
+                let cur_txns = txns_with_proof_size + opt_batch_txns_size;
+                let (inline_block, inline_block_size) =
+                    if self.allow_batches_without_pos_in_proposal && proof_queue_fully_utilized {
+                        let mut max_inline_txns_to_pull = request
+                            .max_txns
+                            .saturating_sub(cur_txns)
+                            .minimum(request.max_inline_txns);
+                        max_inline_txns_to_pull.set_count(min(
+                            max_inline_txns_to_pull.count(),
+                            request
+                                .max_txns_after_filtering
+                                .saturating_sub(cur_unique_txns),
+                        ));
+                        self.batch_queue.pull_batches(
+                            max_inline_txns_to_pull,
+                            excluded_batches
+                                .iter()
+                                .cloned()
+                                .chain(proof_block.iter().map(|proof| proof.info().clone()))
+                                .collect(),
                         )
-                    },
-                );
-                match callback.send(Ok(res)) {
+                    } else {
+                        (Vec::new(), PayloadTxnsSize::zero())
+                    };
+                counters::NUM_INLINE_BATCHES.observe(inline_block_size.count() as f64);
+                counters::NUM_INLINE_TXNS.observe(inline_block_size.size_in_bytes() as f64);
+
+                let response = if self.enable_opt_quorum_store {
+                    let inline_batches = inline_block.into();
+                    Payload::OptQuorumStore(OptQuorumStorePayload::new(
+                        inline_batches,
+                        opt_batches.into(),
+                        proof_block.into(),
+                        PayloadExecutionLimit::None,
+                    ))
+                } else if proof_block.is_empty() && inline_block.is_empty() {
+                    Payload::empty(true, self.allow_batches_without_pos_in_proposal)
+                } else {
+                    trace!(
+                        "QS: GetBlockRequest excluded len {}, block len {}, inline len {}",
+                        excluded_batches.len(),
+                        proof_block.len(),
+                        inline_block.len()
+                    );
+                    Payload::QuorumStoreInlineHybrid(
+                        inline_block,
+                        ProofWithData::new(proof_block),
+                        None,
+                    )
+                };
+
+                let res = GetPayloadResponse::GetPayloadResponse(response);
+                match request.callback.send(Ok(res)) {
                     Ok(_) => (),
                     Err(err) => debug!("BlockResponse receiver not available! error {:?}", err),
                 }
@@ -275,6 +318,21 @@ impl ProofManager {
 
     /// return true when quorum store is back pressured
     pub(crate) fn qs_back_pressure(&self) -> BackPressure {
+        if self.remaining_total_txn_num > self.back_pressure_total_txn_limit
+            || self.remaining_total_proof_num > self.back_pressure_total_proof_limit
+        {
+            sample!(
+                SampleRate::Duration(Duration::from_millis(200)),
+                info!(
+                    "Quorum store is back pressured with {} txns, limit: {}, proofs: {}, limit: {}",
+                    self.remaining_total_txn_num,
+                    self.back_pressure_total_txn_limit,
+                    self.remaining_total_proof_num,
+                    self.back_pressure_total_proof_limit
+                );
+            );
+        }
+
         BackPressure {
             txn_count: self.remaining_total_txn_num > self.back_pressure_total_txn_limit,
             proof_count: self.remaining_total_proof_num > self.back_pressure_total_proof_limit,
diff --git a/consensus/src/quorum_store/quorum_store_builder.rs b/consensus/src/quorum_store/quorum_store_builder.rs
index 957c33eddfd2b..3b0fecdb75833 100644
--- a/consensus/src/quorum_store/quorum_store_builder.rs
+++ b/consensus/src/quorum_store/quorum_store_builder.rs
@@ -3,11 +3,11 @@
 
 use super::quorum_store_db::QuorumStoreStorage;
 use crate::{
-    consensus_observer::publisher::Publisher,
+    consensus_observer::publisher::ConsensusPublisher,
     error::error_kind,
     network::{IncomingBatchRetrievalRequest, NetworkSender},
     network_interface::ConsensusMsg,
-    payload_manager::PayloadManager,
+    payload_manager::{DirectMempoolPayloadManager, QuorumStorePayloadManager, TPayloadManager},
     quorum_store::{
         batch_coordinator::{BatchCoordinator, BatchCoordinatorCommand},
         batch_generator::{BackPressure, BatchGenerator, BatchGeneratorCommand},
@@ -49,14 +49,16 @@ pub enum QuorumStoreBuilder {
 impl QuorumStoreBuilder {
     pub fn init_payload_manager(
         &mut self,
-        publisher: Option<Publisher>,
+        consensus_publisher: Option<Arc<ConsensusPublisher>>,
     ) -> (
-        Arc<PayloadManager>,
+        Arc<dyn TPayloadManager>,
         Option<aptos_channel::Sender<AccountAddress, VerifiedEvent>>,
     ) {
         match self {
             QuorumStoreBuilder::DirectMempool(inner) => inner.init_payload_manager(),
-            QuorumStoreBuilder::QuorumStore(inner) => inner.init_payload_manager(publisher),
+            QuorumStoreBuilder::QuorumStore(inner) => {
+                inner.init_payload_manager(consensus_publisher)
+            },
         }
     }
 
@@ -98,10 +100,10 @@ impl DirectMempoolInnerBuilder {
     fn init_payload_manager(
         &mut self,
     ) -> (
-        Arc<PayloadManager>,
+        Arc<dyn TPayloadManager>,
         Option<aptos_channel::Sender<AccountAddress, VerifiedEvent>>,
     ) {
-        (Arc::from(PayloadManager::DirectMempool), None)
+        (Arc::from(DirectMempoolPayloadManager::new()), None)
     }
 
     fn start(self) {
@@ -266,6 +268,7 @@ impl InnerBuilder {
         batch_reader
     }
 
+    #[allow(clippy::unwrap_used)]
     fn spawn_quorum_store(
         mut self,
     ) -> (
@@ -362,6 +365,7 @@ impl InnerBuilder {
                 * self.num_validators,
             self.batch_store.clone().unwrap(),
             self.config.allow_batches_without_pos_in_proposal,
+            self.config.enable_opt_quorum_store,
         );
         spawn_named!(
             "proof_manager",
@@ -428,19 +432,20 @@ impl InnerBuilder {
 
     fn init_payload_manager(
         &mut self,
-        publisher: Option<Publisher>,
+        consensus_publisher: Option<Arc<ConsensusPublisher>>,
     ) -> (
-        Arc<PayloadManager>,
+        Arc<dyn TPayloadManager>,
         Option<aptos_channel::Sender<AccountAddress, VerifiedEvent>>,
     ) {
         let batch_reader = self.create_batch_store();
 
         (
-            Arc::from(PayloadManager::InQuorumStore(
+            Arc::from(QuorumStorePayloadManager::new(
                 batch_reader,
                 // TODO: remove after splitting out clean requests
                 self.coordinator_tx.clone(),
-                publisher,
+                consensus_publisher,
+                self.verifier.get_ordered_account_addresses(),
             )),
             Some(self.quorum_store_msg_tx.clone()),
         )
diff --git a/consensus/src/quorum_store/quorum_store_db.rs b/consensus/src/quorum_store/quorum_store_db.rs
index e9b8c1e7619bb..fccb002fc0b32 100644
--- a/consensus/src/quorum_store/quorum_store_db.rs
+++ b/consensus/src/quorum_store/quorum_store_db.rs
@@ -12,7 +12,7 @@ use anyhow::Result;
 use aptos_consensus_types::proof_of_store::BatchId;
 use aptos_crypto::HashValue;
 use aptos_logger::prelude::*;
-use aptos_schemadb::{Options, ReadOptions, SchemaBatch, DB};
+use aptos_schemadb::{Options, SchemaBatch, DB};
 use std::{collections::HashMap, path::Path, time::Instant};
 
 pub trait QuorumStoreStorage: Sync + Send {
@@ -73,7 +73,7 @@ impl QuorumStoreStorage for QuorumStoreDB {
     }
 
     fn get_all_batches(&self) -> Result<HashMap<HashValue, PersistedValue>> {
-        let mut iter = self.db.iter::<BatchSchema>(ReadOptions::default())?;
+        let mut iter = self.db.iter::<BatchSchema>()?;
         iter.seek_to_first();
         iter.map(|res| res.map_err(Into::into))
             .collect::<Result<HashMap<HashValue, PersistedValue>>>()
@@ -100,7 +100,7 @@ impl QuorumStoreStorage for QuorumStoreDB {
     }
 
     fn clean_and_get_batch_id(&self, current_epoch: u64) -> Result<Option<BatchId>, DbError> {
-        let mut iter = self.db.iter::<BatchIdSchema>(ReadOptions::default())?;
+        let mut iter = self.db.iter::<BatchIdSchema>()?;
         iter.seek_to_first();
         let epoch_batch_id = iter
             .map(|res| res.map_err(Into::into))
@@ -109,8 +109,7 @@ impl QuorumStoreStorage for QuorumStoreDB {
         for (epoch, batch_id) in epoch_batch_id {
             assert!(current_epoch >= epoch);
             if epoch < current_epoch {
-                self.delete_batch_id(epoch)
-                    .expect("Could not delete from db");
+                self.delete_batch_id(epoch)?;
             } else {
                 ret = Some(batch_id);
             }
@@ -123,41 +122,53 @@ impl QuorumStoreStorage for QuorumStoreDB {
     }
 }
 
-pub(crate) struct MockQuorumStoreDB {}
+#[cfg(test)]
+pub(crate) use mock::MockQuorumStoreDB;
 
-impl MockQuorumStoreDB {
-    #[cfg(test)]
-    pub fn new() -> Self {
-        Self {}
-    }
-}
+#[cfg(test)]
+pub mod mock {
+    use super::*;
+    pub struct MockQuorumStoreDB {}
 
-impl QuorumStoreStorage for MockQuorumStoreDB {
-    fn delete_batches(&self, _: Vec<HashValue>) -> Result<(), DbError> {
-        Ok(())
+    impl MockQuorumStoreDB {
+        pub fn new() -> Self {
+            Self {}
+        }
     }
 
-    fn get_all_batches(&self) -> Result<HashMap<HashValue, PersistedValue>> {
-        Ok(HashMap::new())
+    impl Default for MockQuorumStoreDB {
+        fn default() -> Self {
+            Self::new()
+        }
     }
 
-    fn save_batch(&self, _: PersistedValue) -> Result<(), DbError> {
-        Ok(())
-    }
+    impl QuorumStoreStorage for MockQuorumStoreDB {
+        fn delete_batches(&self, _: Vec<HashValue>) -> Result<(), DbError> {
+            Ok(())
+        }
 
-    fn get_batch(&self, _: &HashValue) -> Result<Option<PersistedValue>, DbError> {
-        Ok(None)
-    }
+        fn get_all_batches(&self) -> Result<HashMap<HashValue, PersistedValue>> {
+            Ok(HashMap::new())
+        }
 
-    fn delete_batch_id(&self, _: u64) -> Result<(), DbError> {
-        Ok(())
-    }
+        fn save_batch(&self, _: PersistedValue) -> Result<(), DbError> {
+            Ok(())
+        }
 
-    fn clean_and_get_batch_id(&self, _: u64) -> Result<Option<BatchId>, DbError> {
-        Ok(Some(BatchId::new_for_test(0)))
-    }
+        fn get_batch(&self, _: &HashValue) -> Result<Option<PersistedValue>, DbError> {
+            Ok(None)
+        }
 
-    fn save_batch_id(&self, _: u64, _: BatchId) -> Result<(), DbError> {
-        Ok(())
+        fn delete_batch_id(&self, _: u64) -> Result<(), DbError> {
+            Ok(())
+        }
+
+        fn clean_and_get_batch_id(&self, _: u64) -> Result<Option<BatchId>, DbError> {
+            Ok(Some(BatchId::new_for_test(0)))
+        }
+
+        fn save_batch_id(&self, _: u64, _: BatchId) -> Result<(), DbError> {
+            Ok(())
+        }
     }
 }
diff --git a/consensus/src/quorum_store/tests/batch_requester_test.rs b/consensus/src/quorum_store/tests/batch_requester_test.rs
index aaf5ff6bf4528..e9975b35eaeef 100644
--- a/consensus/src/quorum_store/tests/batch_requester_test.rs
+++ b/consensus/src/quorum_store/tests/batch_requester_test.rs
@@ -14,7 +14,7 @@ use aptos_consensus_types::{
 };
 use aptos_crypto::HashValue;
 use aptos_types::{
-    aggregate_signature::{AggregateSignature, PartialSignatures},
+    aggregate_signature::PartialSignatures,
     block_info::BlockInfo,
     ledger_info::{LedgerInfo, LedgerInfoWithSignatures},
     validator_signer::ValidatorSigner,
@@ -22,6 +22,7 @@ use aptos_types::{
 };
 use move_core_types::account_address::AccountAddress;
 use std::time::{Duration, Instant};
+use tokio::sync::oneshot;
 
 #[derive(Clone)]
 struct MockBatchRequester {
@@ -36,10 +37,6 @@ impl MockBatchRequester {
 
 #[async_trait::async_trait]
 impl QuorumStoreSender for MockBatchRequester {
-    async fn send_batch_request(&self, _request: BatchRequest, _recipients: Vec<Author>) {
-        unimplemented!()
-    }
-
     async fn request_batch(
         &self,
         _request: BatchRequest,
@@ -49,10 +46,6 @@ impl QuorumStoreSender for MockBatchRequester {
         Ok(self.return_value.clone())
     }
 
-    async fn send_batch(&self, _batch: Batch, _recipients: Vec<Author>) {
-        unimplemented!()
-    }
-
     async fn send_signed_batch_info_msg(
         &self,
         _signed_batch_infos: Vec<SignedBatchInfo>,
@@ -99,13 +92,14 @@ async fn test_batch_request_exists() {
         ValidatorVerifier::new_single(validator_signer.author(), validator_signer.public_key()),
     );
 
+    let (_, subscriber_rx) = oneshot::channel();
     let result = batch_requester
         .request_batch(
-            ProofOfStore::new(
-                batch.batch_info().clone(),
-                AggregateSignature::new(vec![u8::MAX].into(), None),
-            ),
+            *batch.digest(),
+            batch.expiration(),
+            vec![AccountAddress::random()],
             tx,
+            subscriber_rx,
         )
         .await;
     assert!(result.is_some());
@@ -194,13 +188,14 @@ async fn test_batch_request_not_exists_not_expired() {
     );
 
     let request_start = Instant::now();
+    let (_, subscriber_rx) = oneshot::channel();
     let result = batch_requester
         .request_batch(
-            ProofOfStore::new(
-                batch.batch_info().clone(),
-                AggregateSignature::new(vec![u8::MAX].into(), None),
-            ),
+            *batch.digest(),
+            batch.expiration(),
+            vec![AccountAddress::random()],
             tx,
+            subscriber_rx,
         )
         .await;
     let request_duration = request_start.elapsed();
@@ -241,13 +236,14 @@ async fn test_batch_request_not_exists_expired() {
     );
 
     let request_start = Instant::now();
+    let (_, subscriber_rx) = oneshot::channel();
     let result = batch_requester
         .request_batch(
-            ProofOfStore::new(
-                batch.batch_info().clone(),
-                AggregateSignature::new(vec![u8::MAX].into(), None),
-            ),
+            *batch.digest(),
+            batch.expiration(),
+            vec![AccountAddress::random()],
             tx,
+            subscriber_rx,
         )
         .await;
     let request_duration = request_start.elapsed();
diff --git a/consensus/src/quorum_store/tests/direct_mempool_quorum_store_test.rs b/consensus/src/quorum_store/tests/direct_mempool_quorum_store_test.rs
index 03a5e903a554c..7f04c4abf71ca 100644
--- a/consensus/src/quorum_store/tests/direct_mempool_quorum_store_test.rs
+++ b/consensus/src/quorum_store/tests/direct_mempool_quorum_store_test.rs
@@ -4,7 +4,8 @@
 use crate::quorum_store::direct_mempool_quorum_store::DirectMempoolQuorumStore;
 use aptos_consensus_types::{
     common::PayloadFilter,
-    request_response::{GetPayloadCommand, GetPayloadResponse},
+    request_response::{GetPayloadCommand, GetPayloadRequest, GetPayloadResponse},
+    utils::PayloadTxnsSize,
 };
 use aptos_mempool::{QuorumStoreRequest, QuorumStoreResponse};
 use futures::{
@@ -29,15 +30,17 @@ async fn test_block_request_no_txns() {
 
     let (consensus_callback, consensus_callback_rcv) = oneshot::channel();
     consensus_to_quorum_store_sender
-        .try_send(GetPayloadCommand::GetPayloadRequest(
-            100,
-            1000,
-            50,
-            500,
-            true,
-            PayloadFilter::DirectMempool(vec![]),
-            consensus_callback,
-        ))
+        .try_send(GetPayloadCommand::GetPayloadRequest(GetPayloadRequest {
+            max_txns: PayloadTxnsSize::new(100, 1000),
+            max_txns_after_filtering: 100,
+            soft_max_txns_after_filtering: 100,
+            max_inline_txns: PayloadTxnsSize::new(50, 500),
+            opt_batch_txns_pct: 0,
+            return_non_full: true,
+            filter: PayloadFilter::DirectMempool(vec![]),
+            callback: consensus_callback,
+            block_timestamp: aptos_infallible::duration_since_epoch(),
+        }))
         .unwrap();
 
     if let QuorumStoreRequest::GetBatchRequest(
diff --git a/consensus/src/quorum_store/tests/proof_coordinator_test.rs b/consensus/src/quorum_store/tests/proof_coordinator_test.rs
index cf7567bbe3e18..2a2a2378ee9b2 100644
--- a/consensus/src/quorum_store/tests/proof_coordinator_test.rs
+++ b/consensus/src/quorum_store/tests/proof_coordinator_test.rs
@@ -10,9 +10,7 @@ use crate::{
     },
     test_utils::{create_vec_signed_transactions, mock_quorum_store_sender::MockQuorumStoreSender},
 };
-use aptos_consensus_types::proof_of_store::{
-    BatchId, ProofOfStore, SignedBatchInfo, SignedBatchInfoMsg,
-};
+use aptos_consensus_types::proof_of_store::{BatchId, SignedBatchInfo, SignedBatchInfoMsg};
 use aptos_crypto::HashValue;
 use aptos_executor_types::ExecutorResult;
 use aptos_types::{
@@ -20,7 +18,7 @@ use aptos_types::{
 };
 use mini_moka::sync::Cache;
 use std::sync::Arc;
-use tokio::sync::{mpsc::channel, oneshot::Receiver};
+use tokio::sync::mpsc::channel;
 
 pub struct MockBatchReader {
     peer: PeerId,
@@ -31,7 +29,12 @@ impl BatchReader for MockBatchReader {
         Some(self.peer)
     }
 
-    fn get_batch(&self, _proof: ProofOfStore) -> Receiver<ExecutorResult<Vec<SignedTransaction>>> {
+    fn get_batch(
+        &self,
+        _digest: HashValue,
+        _expiration: u64,
+        _signers: Vec<PeerId>,
+    ) -> tokio::sync::oneshot::Receiver<ExecutorResult<Vec<SignedTransaction>>> {
         unimplemented!()
     }
 
diff --git a/consensus/src/quorum_store/tests/proof_manager_test.rs b/consensus/src/quorum_store/tests/proof_manager_test.rs
index 812a854f62d9c..cf87abfecba84 100644
--- a/consensus/src/quorum_store/tests/proof_manager_test.rs
+++ b/consensus/src/quorum_store/tests/proof_manager_test.rs
@@ -7,16 +7,17 @@ use crate::quorum_store::{
 use aptos_consensus_types::{
     common::{Payload, PayloadFilter},
     proof_of_store::{BatchId, BatchInfo, ProofOfStore},
-    request_response::{GetPayloadCommand, GetPayloadResponse},
+    request_response::{GetPayloadCommand, GetPayloadRequest, GetPayloadResponse},
+    utils::PayloadTxnsSize,
 };
 use aptos_crypto::HashValue;
 use aptos_types::{aggregate_signature::AggregateSignature, PeerId};
 use futures::channel::oneshot;
-use std::collections::HashSet;
+use std::{cmp::max, collections::HashSet};
 
 fn create_proof_manager() -> ProofManager {
     let batch_store = batch_store_for_test(5 * 1024 * 1024);
-    ProofManager::new(PeerId::random(), 10, 10, batch_store, true)
+    ProofManager::new(PeerId::random(), 10, 10, batch_store, true, false)
 }
 
 fn create_proof(author: PeerId, expiration: u64, batch_sequence: u64) -> ProofOfStore {
@@ -53,15 +54,17 @@ async fn get_proposal(
 ) -> Payload {
     let (callback_tx, callback_rx) = oneshot::channel();
     let filter_set = HashSet::from_iter(filter.iter().cloned());
-    let req = GetPayloadCommand::GetPayloadRequest(
-        max_txns,
-        1000000,
-        max_txns / 2,
-        100000,
-        true,
-        PayloadFilter::InQuorumStore(filter_set),
-        callback_tx,
-    );
+    let req = GetPayloadCommand::GetPayloadRequest(GetPayloadRequest {
+        max_txns: PayloadTxnsSize::new(max_txns, 1000000),
+        max_txns_after_filtering: max_txns,
+        soft_max_txns_after_filtering: max_txns,
+        max_inline_txns: PayloadTxnsSize::new(max(max_txns / 2, 1), 100000),
+        filter: PayloadFilter::InQuorumStore(filter_set),
+        callback: callback_tx,
+        block_timestamp: aptos_infallible::duration_since_epoch(),
+        opt_batch_txns_pct: 0,
+        return_non_full: true,
+    });
     proof_manager.handle_proposal_request(req);
     let GetPayloadResponse::GetPayloadResponse(payload) = callback_rx.await.unwrap().unwrap();
     payload
@@ -70,7 +73,7 @@ async fn get_proposal(
 fn assert_payload_response(
     payload: Payload,
     expected: &[ProofOfStore],
-    max_txns_from_block_to_execute: Option<usize>,
+    max_txns_from_block_to_execute: Option<u64>,
 ) {
     match payload {
         Payload::InQuorumStore(proofs) => {
diff --git a/consensus/src/quorum_store/tests/utils.rs b/consensus/src/quorum_store/tests/utils.rs
index 922ae1d67a3af..17fc76305c142 100644
--- a/consensus/src/quorum_store/tests/utils.rs
+++ b/consensus/src/quorum_store/tests/utils.rs
@@ -2,19 +2,29 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::quorum_store::utils::ProofQueue;
-use aptos_consensus_types::proof_of_store::{BatchId, BatchInfo, ProofOfStore};
+use aptos_consensus_types::{
+    common::TxnSummaryWithExpiration,
+    proof_of_store::{BatchId, BatchInfo, ProofOfStore},
+    utils::PayloadTxnsSize,
+};
 use aptos_crypto::HashValue;
 use aptos_types::{aggregate_signature::AggregateSignature, PeerId};
 use maplit::hashset;
+use std::{collections::HashSet, time::Duration};
 
 /// Return a ProofOfStore with minimal fields used by ProofQueue tests.
-fn proof_of_store(author: PeerId, batch_id: BatchId, gas_bucket_start: u64) -> ProofOfStore {
+fn proof_of_store(
+    author: PeerId,
+    batch_id: BatchId,
+    gas_bucket_start: u64,
+    expiration: u64,
+) -> ProofOfStore {
     ProofOfStore::new(
         BatchInfo::new(
             author,
             batch_id,
             0,
-            0,
+            expiration,
             HashValue::random(),
             1,
             1,
@@ -24,6 +34,28 @@ fn proof_of_store(author: PeerId, batch_id: BatchId, gas_bucket_start: u64) -> P
     )
 }
 
+fn proof_of_store_with_size(
+    author: PeerId,
+    batch_id: BatchId,
+    gas_bucket_start: u64,
+    expiration: u64,
+    num_txns: u64,
+) -> ProofOfStore {
+    ProofOfStore::new(
+        BatchInfo::new(
+            author,
+            batch_id,
+            0,
+            expiration,
+            HashValue::random(),
+            num_txns,
+            num_txns,
+            gas_bucket_start,
+        ),
+        AggregateSignature::empty(),
+    )
+}
+
 #[test]
 fn test_proof_queue_sorting() {
     let my_peer_id = PeerId::random();
@@ -33,26 +65,33 @@ fn test_proof_queue_sorting() {
     let author_1 = PeerId::random();
 
     let author_0_batches = vec![
-        proof_of_store(author_0, BatchId::new_for_test(0), 100),
-        proof_of_store(author_0, BatchId::new_for_test(1), 200),
-        proof_of_store(author_0, BatchId::new_for_test(2), 50),
-        proof_of_store(author_0, BatchId::new_for_test(3), 300),
+        proof_of_store(author_0, BatchId::new_for_test(0), 100, 1),
+        proof_of_store(author_0, BatchId::new_for_test(1), 200, 1),
+        proof_of_store(author_0, BatchId::new_for_test(2), 50, 1),
+        proof_of_store(author_0, BatchId::new_for_test(3), 300, 1),
     ];
     for batch in author_0_batches {
         proof_queue.push(batch);
     }
     let author_1_batches = vec![
-        proof_of_store(author_1, BatchId::new_for_test(4), 500),
-        proof_of_store(author_1, BatchId::new_for_test(5), 400),
-        proof_of_store(author_1, BatchId::new_for_test(6), 600),
-        proof_of_store(author_1, BatchId::new_for_test(7), 50),
+        proof_of_store(author_1, BatchId::new_for_test(4), 500, 1),
+        proof_of_store(author_1, BatchId::new_for_test(5), 400, 1),
+        proof_of_store(author_1, BatchId::new_for_test(6), 600, 1),
+        proof_of_store(author_1, BatchId::new_for_test(7), 50, 1),
     ];
     for batch in author_1_batches {
         proof_queue.push(batch);
     }
 
     // Expect: [600, 300]
-    let (pulled, _) = proof_queue.pull_proofs(&hashset![], 2, 2, true);
+    let (pulled, _, num_unique_txns, _) = proof_queue.pull_proofs(
+        &hashset![],
+        PayloadTxnsSize::new(4, 10),
+        2,
+        2,
+        true,
+        aptos_infallible::duration_since_epoch(),
+    );
     let mut count_author_0 = 0;
     let mut count_author_1 = 0;
     let mut prev: Option<&ProofOfStore> = None;
@@ -71,9 +110,17 @@ fn test_proof_queue_sorting() {
     }
     assert_eq!(count_author_0, 1);
     assert_eq!(count_author_1, 1);
+    assert_eq!(num_unique_txns, 2);
 
     // Expect: [600, 500, 300, 100]
-    let (pulled, _) = proof_queue.pull_proofs(&hashset![], 4, 4, true);
+    let (pulled, _, num_unique_txns, _) = proof_queue.pull_proofs(
+        &hashset![],
+        PayloadTxnsSize::new(6, 10),
+        4,
+        4,
+        true,
+        aptos_infallible::duration_since_epoch(),
+    );
     let mut count_author_0 = 0;
     let mut count_author_1 = 0;
     let mut prev: Option<&ProofOfStore> = None;
@@ -90,6 +137,554 @@ fn test_proof_queue_sorting() {
         }
         prev = Some(batch);
     }
+    assert_eq!(num_unique_txns, 4);
     assert_eq!(count_author_0, 2);
     assert_eq!(count_author_1, 2);
 }
+
+#[test]
+fn test_proof_calculate_remaining_txns_and_proofs() {
+    let my_peer_id = PeerId::random();
+    let mut proof_queue = ProofQueue::new(my_peer_id);
+    let now_in_secs = aptos_infallible::duration_since_epoch().as_secs() as u64;
+    let now_in_usecs = aptos_infallible::duration_since_epoch().as_micros() as u64;
+    let author_0 = PeerId::random();
+    let author_1 = PeerId::random();
+    let txns = vec![
+        TxnSummaryWithExpiration::new(PeerId::ONE, 0, now_in_secs + 1, HashValue::zero()),
+        TxnSummaryWithExpiration::new(PeerId::ONE, 1, now_in_secs + 1, HashValue::zero()),
+        TxnSummaryWithExpiration::new(PeerId::ONE, 2, now_in_secs + 1, HashValue::zero()),
+        TxnSummaryWithExpiration::new(PeerId::ONE, 3, now_in_secs + 1, HashValue::zero()),
+    ];
+
+    let author_0_batches = vec![
+        proof_of_store(
+            author_0,
+            BatchId::new_for_test(0),
+            100,
+            now_in_usecs + 50000,
+        ),
+        proof_of_store(
+            author_0,
+            BatchId::new_for_test(1),
+            200,
+            now_in_usecs + 70000,
+        ),
+        proof_of_store(author_0, BatchId::new_for_test(2), 50, now_in_usecs + 20000),
+        proof_of_store(
+            author_0,
+            BatchId::new_for_test(3),
+            300,
+            now_in_usecs + 10000,
+        ),
+    ];
+
+    let author_1_batches = vec![
+        proof_of_store(
+            author_1,
+            BatchId::new_for_test(4),
+            500,
+            now_in_usecs + 20000,
+        ),
+        proof_of_store(
+            author_1,
+            BatchId::new_for_test(5),
+            400,
+            now_in_usecs + 30000,
+        ),
+        proof_of_store(
+            author_1,
+            BatchId::new_for_test(6),
+            600,
+            now_in_usecs + 50000,
+        ),
+        proof_of_store(author_1, BatchId::new_for_test(7), 50, now_in_usecs + 60000),
+    ];
+
+    let info_1 = author_0_batches[0].info().clone();
+    let info_2 = author_0_batches[1].info().clone();
+    let info_3 = author_0_batches[2].info().clone();
+    let info_4 = author_0_batches[3].info().clone();
+    let info_5 = author_1_batches[0].info().clone();
+    let info_6 = author_1_batches[1].info().clone();
+    let info_7 = author_1_batches[2].info().clone();
+    let info_8 = author_1_batches[3].info().clone();
+
+    proof_queue.add_batch_summaries(vec![(info_1.clone(), vec![txns[0]])]);
+    // batch_summaries: [1 -> txn_0]
+    assert_eq!(proof_queue.remaining_txns_and_proofs(), (0, 0));
+    assert_eq!(proof_queue.batch_summaries_len(), 1);
+
+    proof_queue.push(author_0_batches[0].clone());
+    // txns: [txn_0]
+    // proofs: [1]
+    // batch_summaries: [1 -> txn_0]
+    assert_eq!(proof_queue.remaining_txns_and_proofs(), (1, 1));
+    assert_eq!(proof_queue.batch_summaries_len(), 1);
+
+    proof_queue.push(author_0_batches[1].clone());
+    // txns: [txn_0] + txns(proof_2)
+    // proofs: [1, 2]
+    // batch_summaries: [1 -> txn_0]
+    assert_eq!(proof_queue.remaining_txns_and_proofs(), (2, 2));
+    assert_eq!(proof_queue.batch_summaries_len(), 1);
+
+    proof_queue.add_batch_summaries(vec![(info_2, vec![txns[1]])]);
+    // txns: [txn_0, txn_1]
+    // proofs: [1, 2]
+    // batch_summaries: [1 -> txn_0, 2 -> txn_1]
+    assert_eq!(proof_queue.remaining_txns_and_proofs(), (2, 2));
+    assert_eq!(proof_queue.batch_summaries_len(), 2);
+
+    proof_queue.add_batch_summaries(vec![(info_3.clone(), vec![txns[0]])]);
+    // txns: [txn_0, txn_1]
+    // proofs: [1, 2]
+    // batch_summaries: [1 -> txn_0, 2 -> txn_1, 3 -> txn_0]
+    assert_eq!(proof_queue.remaining_txns_and_proofs(), (2, 2));
+    assert_eq!(proof_queue.batch_summaries_len(), 3);
+
+    // Adding the batch again shouldn't have an effect
+    proof_queue.add_batch_summaries(vec![(info_3.clone(), vec![txns[0]])]);
+    // txns: [txn_0, txn_1]
+    // proofs: [1, 2]
+    // batch_summaries: [1 -> txn_0, 2 -> txn_1, 3 -> txn_0]
+    assert_eq!(proof_queue.remaining_txns_and_proofs(), (2, 2));
+    assert_eq!(proof_queue.batch_summaries_len(), 3);
+
+    proof_queue.push(author_0_batches[2].clone());
+    // txns: [txn_0, txn_1]
+    // proofs: [1, 2, 3]
+    // batch_summaries: [1 -> txn_0, 2 -> txn_1, 3 -> txn_0]
+    assert_eq!(proof_queue.remaining_txns_and_proofs(), (2, 3));
+    assert_eq!(proof_queue.batch_summaries_len(), 3);
+
+    // Adding the batch again shouldn't have an effect
+    proof_queue.add_batch_summaries(vec![(info_3.clone(), vec![txns[0]])]);
+    // txns: [txn_0, txn_1]
+    // proofs: [1, 2, 3]
+    // batch_summaries: [1 -> txn_0, 2 -> txn_1, 3 -> txn_0]
+    assert_eq!(proof_queue.remaining_txns_and_proofs(), (2, 3));
+    assert_eq!(proof_queue.batch_summaries_len(), 3);
+
+    proof_queue.push(author_1_batches[0].clone());
+    // txns: [txn_0, txn_1] + txns(proof_5)
+    // proofs: [1, 2, 3, 5]
+    // batch_summaries: [1 -> txn_0, 2 -> txn_1, 3 -> txn_0]
+    assert_eq!(proof_queue.remaining_txns_and_proofs(), (3, 4));
+    assert_eq!(proof_queue.batch_summaries_len(), 3);
+
+    proof_queue.add_batch_summaries(vec![(info_5, vec![txns[1]])]);
+    // txns: [txn_0, txn_1]
+    // proofs: [1, 2, 3, 5]
+    // batch_summaries: [1 -> txn_0, 2 -> txn_1, 3 -> txn_0, 5 -> txn_1]
+    assert_eq!(proof_queue.remaining_txns_and_proofs(), (2, 4));
+    assert_eq!(proof_queue.batch_summaries_len(), 4);
+
+    proof_queue.add_batch_summaries(vec![(info_4, vec![txns[2]])]);
+    // txns: [txn_0, txn_1]
+    // proofs: [1, 2, 3, 5]
+    // batch_summaries: [1 -> txn_0, 2 -> txn_1, 3 -> txn_0, 4 -> txn_2, 5 -> txn_1]
+    assert_eq!(proof_queue.remaining_txns_and_proofs(), (2, 4));
+    assert_eq!(proof_queue.batch_summaries_len(), 5);
+
+    proof_queue.push(author_0_batches[3].clone());
+    // txns: [txn_0, txn_1, txn_2]
+    // proofs: [1, 2, 3, 4, 5]
+    // batch_summaries: [1 -> txn_0, 2 -> txn_1, 3 -> txn_0, 4 -> txn_2, 5 -> txn_1]
+    assert_eq!(proof_queue.remaining_txns_and_proofs(), (3, 5));
+    assert_eq!(proof_queue.batch_summaries_len(), 5);
+
+    proof_queue.mark_committed(vec![info_1.clone()]);
+    // txns: [txn_0, txn_1, txn_2]
+    // proofs: [2, 3, 4, 5]
+    // batch_summaries: [2 -> txn_1, 3 -> txn_0, 4 -> txn_2, 5 -> txn_1]
+    assert_eq!(proof_queue.remaining_txns_and_proofs(), (3, 4));
+    assert_eq!(proof_queue.batch_summaries_len(), 4);
+
+    proof_queue.push(author_1_batches[1].clone());
+    // txns: [txn_0, txn_1, txn_2] + txns(proof_6)
+    // proofs: [2, 3, 4, 5, 6]
+    // batch_summaries: [2 -> txn_1, 3 -> txn_0, 4 -> txn_2, 5 -> txn_1]
+    assert_eq!(proof_queue.remaining_txns_and_proofs(), (4, 5));
+    assert_eq!(proof_queue.batch_summaries_len(), 4);
+
+    proof_queue.handle_updated_block_timestamp(now_in_usecs + 20000);
+    // Expires info_3, info_4, info_5
+    // txns: [txn_1] + txns(proof_6)
+    // proofs: [2, 6]
+    // batch_summaries: [2 -> txn_1]
+    assert_eq!(proof_queue.remaining_txns_and_proofs(), (2, 2));
+    assert_eq!(proof_queue.batch_summaries_len(), 1);
+
+    // Adding an expired batch again
+    proof_queue.add_batch_summaries(vec![(info_3, vec![txns[0]])]);
+    // txns: [txn_1] + txns(proof_6)
+    // proofs: [2, 6]
+    // batch_summaries: [2 -> txn_1, 3 -> txn_0]
+    assert_eq!(proof_queue.remaining_txns_and_proofs(), (2, 2));
+    assert_eq!(proof_queue.batch_summaries_len(), 2);
+
+    // Adding an expired proof again. Should have no effect
+    proof_queue.push(author_0_batches[2].clone());
+    // txns: [txn_1] + txns(proof_6)
+    // proofs: [2, 6]
+    // batch_summaries: [2 -> txn_1, 3 -> txn_0]
+    assert_eq!(proof_queue.remaining_txns_and_proofs(), (2, 2));
+    assert_eq!(proof_queue.batch_summaries_len(), 2);
+
+    proof_queue.add_batch_summaries(vec![(info_7, vec![txns[3]])]);
+    // txns: [txn_1] + txns(proof_6)
+    // proofs: [2, 6]
+    // batch_summaries: [2 -> txn_1, 7 -> txn_3, 3 -> txn_0]
+    assert_eq!(proof_queue.remaining_txns_and_proofs(), (2, 2));
+    assert_eq!(proof_queue.batch_summaries_len(), 3);
+
+    proof_queue.handle_updated_block_timestamp(now_in_usecs + 30000);
+    // Expires info_6
+    // txns: [txn_1]
+    // proofs: [2]
+    // batch_summaries: [2 -> txn_1, 7 -> txn_3, 3 -> txn_0]
+    assert_eq!(proof_queue.remaining_txns_and_proofs(), (1, 1));
+    assert_eq!(proof_queue.batch_summaries_len(), 3);
+
+    proof_queue.add_batch_summaries(vec![(info_6, vec![txns[0]])]);
+    // Expired batch not added to batch summaries
+    // txns: [txn_1]
+    // proofs: [2]
+    // batch_summaries: [2 -> txn_1, 7 -> txn_3, 3 -> txn_0, 6 -> txn_0]
+    assert_eq!(proof_queue.remaining_txns_and_proofs(), (1, 1));
+    assert_eq!(proof_queue.batch_summaries_len(), 4);
+
+    proof_queue.push(author_1_batches[2].clone());
+    // txns: [txn_1, txn_3]
+    // proofs: [2, 7]
+    // batch_summaries: [2 -> txn_1, 7 -> txn_3, 3 -> txn_0, 6 -> txn_0]
+    assert_eq!(proof_queue.remaining_txns_and_proofs(), (2, 2));
+    assert_eq!(proof_queue.batch_summaries_len(), 4);
+
+    proof_queue.push(author_1_batches[3].clone());
+    // txns: [txn_1, txn_3] + txns(proof_8)
+    // proofs: [2, 7, 8]
+    // batch_summaries: [2 -> txn_1, 7 -> txn_3, 3 -> txn_0, 6 -> txn_0]
+    assert_eq!(proof_queue.remaining_txns_and_proofs(), (3, 3));
+    assert_eq!(proof_queue.batch_summaries_len(), 4);
+
+    proof_queue.mark_committed(vec![info_8.clone()]);
+    // txns: [txn_1, txn_3]
+    // proofs: [2, 7]
+    // batch_summaries: [2 -> txn_1, 7 -> txn_3, 3 -> txn_0, 6 -> txn_0]
+    assert_eq!(proof_queue.remaining_txns_and_proofs(), (2, 2));
+    assert_eq!(proof_queue.batch_summaries_len(), 4);
+
+    proof_queue.add_batch_summaries(vec![(info_8, vec![txns[0]])]);
+    // Committed batch not added to batch summaries
+    // txns: [txn_1, txn_3]
+    // proofs: [2, 7]
+    // batch_summaries: [2 -> txn_1, 7 -> txn_3, 3 -> txn_0, 6 -> txn_0, 8 -> txn_0]
+    assert_eq!(proof_queue.remaining_txns_and_proofs(), (2, 2));
+    assert_eq!(proof_queue.batch_summaries_len(), 5);
+
+    proof_queue.push(author_1_batches[3].clone());
+    // Committed proof added again. Should have no effect
+    // txns: [txn_1, txn_3]
+    // proofs: [2, 7, 8]
+    // batch_summaries: [2 -> txn_1, 7 -> txn_3, 3 -> txn_0, 6 -> txn_0, 8 -> txn_0]
+    assert_eq!(proof_queue.remaining_txns_and_proofs(), (2, 2));
+    assert_eq!(proof_queue.batch_summaries_len(), 5);
+
+    proof_queue.handle_updated_block_timestamp(now_in_usecs + 70000);
+    // Expires info_2, info_7
+    // txns: []
+    // proofs: []
+    // batch_summaries: [3 -> txn_0, 6 -> txn_0, 8 -> txn_0]
+    assert_eq!(proof_queue.remaining_txns_and_proofs(), (0, 0));
+    assert_eq!(proof_queue.batch_summaries_len(), 3);
+}
+
+#[test]
+fn test_proof_pull_proofs_with_duplicates() {
+    let my_peer_id = PeerId::random();
+    let mut proof_queue = ProofQueue::new(my_peer_id);
+    let now_in_secs = aptos_infallible::duration_since_epoch().as_secs() as u64;
+    let now_in_usecs = now_in_secs * 1_000_000;
+    let txns = vec![
+        TxnSummaryWithExpiration::new(PeerId::ONE, 0, now_in_secs + 2, HashValue::zero()),
+        TxnSummaryWithExpiration::new(PeerId::ONE, 1, now_in_secs + 1, HashValue::zero()),
+        TxnSummaryWithExpiration::new(PeerId::ONE, 2, now_in_secs + 3, HashValue::zero()),
+        TxnSummaryWithExpiration::new(PeerId::ONE, 3, now_in_secs + 4, HashValue::zero()),
+    ];
+
+    let author_0 = PeerId::random();
+    let author_1 = PeerId::random();
+
+    let author_0_batches = vec![
+        proof_of_store(
+            author_0,
+            BatchId::new_for_test(0),
+            100,
+            now_in_usecs + 1_100_000,
+        ),
+        proof_of_store(
+            author_0,
+            BatchId::new_for_test(1),
+            200,
+            now_in_usecs + 3_000_000,
+        ),
+        proof_of_store(
+            author_0,
+            BatchId::new_for_test(2),
+            50,
+            now_in_usecs + 5_000_000,
+        ),
+        proof_of_store(
+            author_0,
+            BatchId::new_for_test(3),
+            300,
+            now_in_usecs + 4_000_000,
+        ),
+    ];
+
+    let author_1_batches = vec![
+        proof_of_store(
+            author_1,
+            BatchId::new_for_test(4),
+            500,
+            now_in_usecs + 4_000_000,
+        ),
+        proof_of_store(
+            author_1,
+            BatchId::new_for_test(5),
+            400,
+            now_in_usecs + 2_500_000,
+        ),
+        proof_of_store(
+            author_1,
+            BatchId::new_for_test(6),
+            600,
+            now_in_usecs + 3_500_000,
+        ),
+        proof_of_store(
+            author_1,
+            BatchId::new_for_test(7),
+            50,
+            now_in_usecs + 4_500_000,
+        ),
+    ];
+
+    let info_0 = author_0_batches[0].info().clone();
+    let info_7 = author_1_batches[2].info().clone();
+
+    proof_queue.add_batch_summaries(vec![(author_0_batches[0].info().clone(), vec![txns[0]])]);
+    proof_queue.add_batch_summaries(vec![(author_0_batches[1].info().clone(), vec![txns[1]])]);
+    proof_queue.add_batch_summaries(vec![(author_0_batches[2].info().clone(), vec![txns[2]])]);
+    proof_queue.add_batch_summaries(vec![(author_0_batches[3].info().clone(), vec![txns[0]])]);
+
+    for batch in author_0_batches {
+        proof_queue.push(batch);
+    }
+
+    proof_queue.add_batch_summaries(vec![(author_1_batches[0].info().clone(), vec![txns[1]])]);
+    proof_queue.add_batch_summaries(vec![(author_1_batches[1].info().clone(), vec![txns[2]])]);
+    proof_queue.add_batch_summaries(vec![(author_1_batches[2].info().clone(), vec![txns[3]])]);
+    proof_queue.add_batch_summaries(vec![(author_1_batches[3].info().clone(), vec![txns[0]])]);
+
+    for batch in author_1_batches {
+        proof_queue.push(batch);
+    }
+    assert_eq!(proof_queue.remaining_txns_and_proofs(), (4, 8));
+
+    let result = proof_queue.pull_proofs(
+        &hashset![],
+        PayloadTxnsSize::new(8, 400),
+        4,
+        4,
+        true,
+        Duration::from_micros(now_in_usecs),
+    );
+    assert_eq!(result.2, 4);
+
+    let mut pulled_txns = HashSet::new();
+    for proof in result.0 {
+        match proof.batch_id() {
+            BatchId { id: 0, nonce: 0 } => pulled_txns.insert(0),
+            BatchId { id: 1, nonce: 0 } => pulled_txns.insert(1),
+            BatchId { id: 2, nonce: 0 } => pulled_txns.insert(2),
+            BatchId { id: 3, nonce: 0 } => pulled_txns.insert(0),
+            BatchId { id: 4, nonce: 0 } => pulled_txns.insert(1),
+            BatchId { id: 5, nonce: 0 } => pulled_txns.insert(2),
+            BatchId { id: 6, nonce: 0 } => pulled_txns.insert(3),
+            BatchId { id: 7, nonce: 0 } => pulled_txns.insert(0),
+            _ => panic!("Unexpected batch id"),
+        };
+    }
+    assert_eq!(pulled_txns.len(), 4);
+
+    let result = proof_queue.pull_proofs(
+        &hashset![info_0.clone()],
+        PayloadTxnsSize::new(8, 400),
+        4,
+        4,
+        true,
+        Duration::from_micros(now_in_usecs),
+    );
+    assert_eq!(result.0.len(), 7);
+    // filtered_txns: txn_0 (included in excluded batches)
+    assert_eq!(result.2, 3);
+
+    proof_queue.handle_updated_block_timestamp(now_in_usecs + 500_000);
+    // Nothing changes
+    let result = proof_queue.pull_proofs(
+        &hashset![],
+        PayloadTxnsSize::new(8, 400),
+        5,
+        5,
+        true,
+        Duration::from_micros(now_in_usecs + 500_100),
+    );
+    assert_eq!(result.2, 4);
+
+    proof_queue.handle_updated_block_timestamp(now_in_usecs + 1_000_000);
+    // txn_1 expired
+    let result = proof_queue.pull_proofs(
+        &hashset![],
+        PayloadTxnsSize::new(8, 400),
+        5,
+        5,
+        true,
+        Duration::from_micros(now_in_usecs + 1_000_100),
+    );
+    assert_eq!(result.0.len(), 8);
+    assert_eq!(result.2, 3);
+
+    proof_queue.handle_updated_block_timestamp(now_in_usecs + 1_200_000);
+    // author_0_batches[0] is removed. txn_1 expired.
+    let result = proof_queue.pull_proofs(
+        &hashset![],
+        PayloadTxnsSize::new(8, 400),
+        4,
+        4,
+        true,
+        Duration::from_micros(now_in_usecs + 1_200_100),
+    );
+    assert_eq!(result.0.len(), 7);
+    assert_eq!(result.2, 3);
+
+    proof_queue.handle_updated_block_timestamp(now_in_usecs + 2_000_000);
+    // author_0_batches[0] is removed. txn_0, txn_1 are expired.
+    let result = proof_queue.pull_proofs(
+        &hashset![],
+        PayloadTxnsSize::new(8, 400),
+        4,
+        4,
+        true,
+        Duration::from_micros(now_in_usecs + 2_000_100),
+    );
+    assert_eq!(result.0.len(), 7);
+    assert_eq!(result.2, 2);
+
+    proof_queue.handle_updated_block_timestamp(now_in_usecs + 2_500_000);
+    // author_0_batches[0], author_1_batches[1] is removed. txn_0, txn_1 is expired.
+    let result = proof_queue.pull_proofs(
+        &hashset![],
+        PayloadTxnsSize::new(8, 400),
+        4,
+        4,
+        true,
+        Duration::from_micros(now_in_usecs + 2_500_100),
+    );
+    assert_eq!(result.0.len(), 6);
+    assert_eq!(result.2, 2);
+
+    let result = proof_queue.pull_proofs(
+        &hashset![info_7],
+        PayloadTxnsSize::new(8, 400),
+        4,
+        4,
+        true,
+        Duration::from_micros(now_in_usecs + 2_500_100),
+    );
+    // author_0_batches[0], author_1_batches[1] is removed. author_1_batches[2] is excluded. txn_0, txn_1 are expired.
+    assert_eq!(result.0.len(), 5);
+    assert_eq!(result.2, 1);
+
+    proof_queue.handle_updated_block_timestamp(now_in_usecs + 3_000_000);
+    let result = proof_queue.pull_proofs(
+        &hashset![],
+        PayloadTxnsSize::new(8, 400),
+        8,
+        8,
+        true,
+        Duration::from_micros(now_in_usecs + 3_000_100),
+    );
+    // author_0_batches[0], author_0_batches[1], author_1_batches[1] are removed. txn_0, txn_1, txn_2 are expired.
+    assert_eq!(result.0.len(), 5);
+    assert_eq!(result.2, 1);
+
+    proof_queue.handle_updated_block_timestamp(now_in_usecs + 3_500_000);
+    let result = proof_queue.pull_proofs(
+        &hashset![],
+        PayloadTxnsSize::new(8, 400),
+        4,
+        4,
+        true,
+        Duration::from_micros(now_in_usecs + 3_500_100),
+    );
+    // author_0_batches[0], author_0_batches[1], author_1_batches[1], author_1_batches[2] are removed. txn_0, txn_1, txn_0 are expired.
+    assert_eq!(result.0.len(), 4);
+    assert_eq!(result.2, 0);
+
+    proof_queue.handle_updated_block_timestamp(now_in_usecs + 4_000_000);
+    let result = proof_queue.pull_proofs(
+        &hashset![],
+        PayloadTxnsSize::new(8, 400),
+        4,
+        4,
+        true,
+        Duration::from_micros(now_in_usecs + 4_000_100),
+    );
+    // author_0_batches[0], author_0_batches[1], author_0_batches[3], author_1_batches[0], author_1_batches[1], author_1_batches[2] are removed.
+    // txn_0, txn_1, txn_2 are expired.
+    assert_eq!(result.0.len(), 2);
+    assert_eq!(result.2, 0);
+}
+
+#[test]
+fn test_proof_queue_soft_limit() {
+    let my_peer_id = PeerId::random();
+    let mut proof_queue = ProofQueue::new(my_peer_id);
+
+    let author = PeerId::random();
+
+    let author_batches = vec![
+        proof_of_store_with_size(author, BatchId::new_for_test(0), 100, 1, 10),
+        proof_of_store_with_size(author, BatchId::new_for_test(1), 200, 1, 10),
+        proof_of_store_with_size(author, BatchId::new_for_test(2), 200, 1, 10),
+    ];
+    for batch in author_batches {
+        proof_queue.push(batch);
+    }
+
+    let (pulled, _, num_unique_txns, _) = proof_queue.pull_proofs(
+        &hashset![],
+        PayloadTxnsSize::new(100, 100),
+        12,
+        12,
+        true,
+        aptos_infallible::duration_since_epoch(),
+    );
+
+    assert_eq!(pulled.len(), 1);
+    assert_eq!(num_unique_txns, 10);
+
+    let (pulled, _, num_unique_txns, _) = proof_queue.pull_proofs(
+        &hashset![],
+        PayloadTxnsSize::new(100, 100),
+        30,
+        12,
+        true,
+        aptos_infallible::duration_since_epoch(),
+    );
+
+    assert_eq!(pulled.len(), 2);
+    assert_eq!(num_unique_txns, 20);
+}
diff --git a/consensus/src/quorum_store/types.rs b/consensus/src/quorum_store/types.rs
index ae8f960cef920..96b6324c39a14 100644
--- a/consensus/src/quorum_store/types.rs
+++ b/consensus/src/quorum_store/types.rs
@@ -3,7 +3,7 @@
 
 use anyhow::ensure;
 use aptos_consensus_types::{
-    common::BatchPayload,
+    common::{BatchPayload, TxnSummaryWithExpiration},
     proof_of_store::{BatchId, BatchInfo},
 };
 use aptos_crypto::{hash::CryptoHash, HashValue};
@@ -45,6 +45,7 @@ impl PersistedValue {
         self.maybe_payload.take()
     }
 
+    #[allow(dead_code)]
     pub(crate) fn remove_payload(&mut self) {
         self.maybe_payload = None;
     }
@@ -56,6 +57,27 @@ impl PersistedValue {
     pub fn payload(&self) -> &Option<Vec<SignedTransaction>> {
         &self.maybe_payload
     }
+
+    pub fn summary(&self) -> Vec<TxnSummaryWithExpiration> {
+        if let Some(payload) = &self.maybe_payload {
+            return payload
+                .iter()
+                .map(|txn| {
+                    TxnSummaryWithExpiration::new(
+                        txn.sender(),
+                        txn.sequence_number(),
+                        txn.expiration_timestamp_secs(),
+                        txn.committed_hash(),
+                    )
+                })
+                .collect();
+        }
+        vec![]
+    }
+
+    pub fn unpack(self) -> (BatchInfo, Option<Vec<SignedTransaction>>) {
+        (self.info, self.maybe_payload)
+    }
 }
 
 impl Deref for PersistedValue {
diff --git a/consensus/src/quorum_store/utils.rs b/consensus/src/quorum_store/utils.rs
index 7ee291da35e6c..7e915f41f9192 100644
--- a/consensus/src/quorum_store/utils.rs
+++ b/consensus/src/quorum_store/utils.rs
@@ -3,8 +3,9 @@
 
 use crate::{monitor, quorum_store::counters};
 use aptos_consensus_types::{
-    common::{TransactionInProgress, TransactionSummary},
+    common::{TransactionInProgress, TransactionSummary, TxnSummaryWithExpiration},
     proof_of_store::{BatchId, BatchInfo, ProofOfStore},
+    utils::PayloadTxnsSize,
 };
 use aptos_logger::prelude::*;
 use aptos_mempool::{QuorumStoreRequest, QuorumStoreResponse};
@@ -33,12 +34,14 @@ impl<T> Timeouts<T> {
     }
 
     pub(crate) fn add(&mut self, value: T, timeout: usize) {
+        #[allow(deprecated)]
         let expiry = Utc::now().naive_utc().timestamp_millis() + timeout as i64;
         self.timeouts.push_back((expiry, value));
     }
 
     pub(crate) fn expire(&mut self) -> Vec<T> {
-        let cur_time = chrono::Utc::now().naive_utc().timestamp_millis();
+        #[allow(deprecated)]
+        let cur_time = Utc::now().naive_utc().timestamp_millis();
         trace!(
             "QS: expire cur time {} timeouts len {}",
             cur_time,
@@ -73,6 +76,8 @@ impl<I: Ord + Hash> TimeExpirations<I> {
     }
 
     /// Expire and return items corresponding to expiration <= given certified time.
+    /// Unwrap is safe because peek() is called in loop condition.
+    #[allow(clippy::unwrap_used)]
     pub(crate) fn expire(&mut self, certified_time: u64) -> HashSet<I> {
         let mut ret = HashSet::new();
         while let Some((Reverse(t), _)) = self.expiries.peek() {
@@ -140,7 +145,7 @@ impl MempoolProxy {
     }
 }
 
-#[derive(PartialEq, Eq, Hash, Clone)]
+#[derive(PartialEq, Eq, Hash, Clone, Debug)]
 pub struct BatchKey {
     author: PeerId,
     batch_id: BatchId,
@@ -155,7 +160,7 @@ impl BatchKey {
     }
 }
 
-#[derive(PartialEq, Eq, Clone, Hash)]
+#[derive(PartialEq, Eq, Clone, Hash, Debug)]
 pub struct BatchSortKey {
     batch_key: BatchKey,
     gas_bucket_start: u64,
@@ -198,10 +203,18 @@ pub struct ProofQueue {
     author_to_batches: HashMap<PeerId, BTreeMap<BatchSortKey, BatchInfo>>,
     // ProofOfStore and insertion_time. None if committed
     batch_to_proof: HashMap<BatchKey, Option<(ProofOfStore, Instant)>>,
+    // Number of unexpired and uncommitted proofs in which the txn_summary = (sender, sequence number, hash, expiration)
+    // has been included. We only count those batches that are in both batch_to_proof and author_to_batches.
+    txn_summary_num_occurrences: HashMap<TxnSummaryWithExpiration, u64>,
+    // List of transaction summaries for each batch, along with expiration time and a boolean stating whether a proof for the
+    // batch has been received. If the boolean is true, then all the transaction summaries in the batch have
+    // been added to txn_summary_num_occurrences. The boolean has been added to avoid double counting when a
+    // batch summary is received multiple times.
+    batch_summaries: HashMap<BatchKey, (Vec<TxnSummaryWithExpiration>, u64, bool)>,
     // Expiration index
     expirations: TimeExpirations<BatchSortKey>,
     latest_block_timestamp: u64,
-    remaining_txns: u64,
+    remaining_txns_with_duplicates: u64,
     remaining_proofs: u64,
     remaining_local_txns: u64,
     remaining_local_proofs: u64,
@@ -213,9 +226,11 @@ impl ProofQueue {
             my_peer_id,
             author_to_batches: HashMap::new(),
             batch_to_proof: HashMap::new(),
+            txn_summary_num_occurrences: HashMap::new(),
+            batch_summaries: HashMap::new(),
             expirations: TimeExpirations::new(),
             latest_block_timestamp: 0,
-            remaining_txns: 0,
+            remaining_txns_with_duplicates: 0,
             remaining_proofs: 0,
             remaining_local_txns: 0,
             remaining_local_proofs: 0,
@@ -224,7 +239,7 @@ impl ProofQueue {
 
     #[inline]
     fn inc_remaining(&mut self, author: &AccountAddress, num_txns: u64) {
-        self.remaining_txns += num_txns;
+        self.remaining_txns_with_duplicates += num_txns;
         self.remaining_proofs += 1;
         if *author == self.my_peer_id {
             self.remaining_local_txns += num_txns;
@@ -234,7 +249,7 @@ impl ProofQueue {
 
     #[inline]
     fn dec_remaining(&mut self, author: &AccountAddress, num_txns: u64) {
-        self.remaining_txns -= num_txns;
+        self.remaining_txns_with_duplicates -= num_txns;
         self.remaining_proofs -= 1;
         if *author == self.my_peer_id {
             self.remaining_local_txns -= num_txns;
@@ -242,17 +257,53 @@ impl ProofQueue {
         }
     }
 
+    #[cfg(test)]
+    pub(crate) fn batch_summaries_len(&self) -> usize {
+        self.batch_summaries.len()
+    }
+
+    fn remaining_txns_without_duplicates(&self) -> u64 {
+        // txn_summary_num_occurrences counts all the unexpired and uncommitted proofs that have txn summaries
+        // in batch_summaries.
+        let mut remaining_txns = self.txn_summary_num_occurrences.len() as u64;
+
+        // For the unexpired and uncommitted proofs that don't have transaction summaries in batch_summaries,
+        // we need to add the proof.num_txns() to the remaining_txns.
+        remaining_txns += self
+            .author_to_batches
+            .values()
+            .map(|batches| {
+                batches
+                    .keys()
+                    .map(|batch_sort_key| {
+                        if !self.batch_summaries.contains_key(&batch_sort_key.batch_key) {
+                            if let Some(Some((proof, _))) =
+                                self.batch_to_proof.get(&batch_sort_key.batch_key)
+                            {
+                                // The batch is included in author_to_batches, batch_to_proof, but not in batch_summaries
+                                return proof.num_txns();
+                            }
+                        }
+                        0
+                    })
+                    .sum::<u64>()
+            })
+            .sum::<u64>();
+
+        remaining_txns
+    }
+
+    /// Add the ProofOfStore to proof queue.
     pub(crate) fn push(&mut self, proof: ProofOfStore) {
-        if proof.expiration() < self.latest_block_timestamp {
+        if proof.expiration() <= self.latest_block_timestamp {
             counters::inc_rejected_pos_count(counters::POS_EXPIRED_LABEL);
             return;
         }
         let batch_key = BatchKey::from_info(proof.info());
-        if self.batch_to_proof.get(&batch_key).is_some() {
+        if self.batch_to_proof.contains_key(&batch_key) {
             counters::inc_rejected_pos_count(counters::POS_DUPLICATE_LABEL);
             return;
         }
-
         let author = proof.author();
         let bucket = proof.gas_bucket_start();
         let num_txns = proof.num_txns();
@@ -263,15 +314,141 @@ impl ProofQueue {
         queue.insert(batch_sort_key.clone(), proof.info().clone());
         self.expirations.add_item(batch_sort_key, expiration);
         self.batch_to_proof
-            .insert(batch_key, Some((proof, Instant::now())));
+            .insert(batch_key.clone(), Some((proof, Instant::now())));
+
+        if let Some((txn_summaries, _expiration, added)) = self.batch_summaries.get_mut(&batch_key)
+        {
+            if !*added {
+                for txn_summary in txn_summaries {
+                    *self
+                        .txn_summary_num_occurrences
+                        .entry(*txn_summary)
+                        .or_insert(0) += 1;
+                }
+                *added = true;
+            }
+        }
 
         if author == self.my_peer_id {
             counters::inc_local_pos_count(bucket);
         } else {
             counters::inc_remote_pos_count(bucket);
         }
-
         self.inc_remaining(&author, num_txns);
+
+        sample!(
+            SampleRate::Duration(Duration::from_millis(500)),
+            self.gc_expired_batch_summaries_without_proofs()
+        );
+    }
+
+    pub(crate) fn add_batch_summaries(
+        &mut self,
+        batch_summaries: Vec<(BatchInfo, Vec<TxnSummaryWithExpiration>)>,
+    ) {
+        let start = Instant::now();
+        for (batch_info, txn_summaries) in batch_summaries {
+            // As txn_summary_num_occurrences count the number of times the txn_summary occurred in the
+            // remaining proofs, we need to update the txn_summary_num_occurrences only if the batch is already
+            // in author_to_batches and batch_to_proof.
+            let batch_sort_key = BatchSortKey::from_info(&batch_info);
+            let proof_exists_in_author_to_batches = self
+                .author_to_batches
+                .get(&batch_info.author())
+                .map_or(false, |batches| batches.contains_key(&batch_sort_key));
+            let proof_exists_in_batch_to_proof = self
+                .batch_to_proof
+                .get(&batch_sort_key.batch_key)
+                .map_or(false, Option::is_some);
+            let batch_summary_not_already_added = self
+                .batch_summaries
+                .get(&batch_sort_key.batch_key)
+                .map_or(true, |(_, _, added)| !*added);
+            if proof_exists_in_author_to_batches
+                && proof_exists_in_batch_to_proof
+                && batch_summary_not_already_added
+            {
+                for txn_summary in &txn_summaries {
+                    *self
+                        .txn_summary_num_occurrences
+                        .entry(*txn_summary)
+                        .or_insert(0) += 1;
+                }
+            }
+            if batch_summary_not_already_added {
+                self.batch_summaries.insert(
+                    batch_sort_key.batch_key,
+                    (
+                        txn_summaries,
+                        batch_info.expiration(),
+                        proof_exists_in_author_to_batches && proof_exists_in_batch_to_proof,
+                    ),
+                );
+            }
+        }
+        sample!(
+            SampleRate::Duration(Duration::from_millis(500)),
+            self.gc_expired_batch_summaries_without_proofs()
+        );
+        counters::PROOF_QUEUE_ADD_BATCH_SUMMARIES_DURATION.observe_duration(start.elapsed());
+    }
+
+    // If the validator receives the batch from batch coordinator, but doesn't receive the corresponding
+    // proof before the batch expires, the batch summary will be garbage collected.
+    fn gc_expired_batch_summaries_without_proofs(&mut self) {
+        self.batch_summaries
+            .retain(|_, (_, expiration, proof_received)| {
+                *proof_received
+                    || *expiration > (aptos_infallible::duration_since_epoch().as_micros() as u64)
+            });
+    }
+
+    fn log_remaining_data_after_pull(
+        &self,
+        excluded_batches: &HashSet<BatchInfo>,
+        pulled_proofs: &[ProofOfStore],
+    ) {
+        let mut num_proofs_remaining_after_pull = 0;
+        let mut num_txns_remaining_after_pull = 0;
+        let excluded_batch_keys = excluded_batches
+            .iter()
+            .map(BatchKey::from_info)
+            .collect::<HashSet<_>>();
+
+        let remaining_batches = self
+            .author_to_batches
+            .iter()
+            .flat_map(|(_, batches)| batches)
+            .filter(|(batch_sort_key, _)| {
+                !excluded_batch_keys.contains(&batch_sort_key.batch_key)
+                    && !pulled_proofs
+                        .iter()
+                        .any(|p| BatchKey::from_info(p.info()) == batch_sort_key.batch_key)
+            })
+            .filter_map(|(batch_sort_key, batch)| {
+                if let Some(Some(_)) = self.batch_to_proof.get(&batch_sort_key.batch_key) {
+                    Some(batch)
+                } else {
+                    None
+                }
+            });
+
+        for batch in remaining_batches {
+            num_proofs_remaining_after_pull += 1;
+            num_txns_remaining_after_pull += batch.num_txns();
+        }
+
+        let pulled_txns = pulled_proofs.iter().map(|p| p.num_txns()).sum::<u64>();
+        info!(
+            "pulled_proofs: {}, pulled_txns: {}, remaining_proofs: {:?}, remaining_txns: {:?}",
+            pulled_proofs.len(),
+            pulled_txns,
+            num_proofs_remaining_after_pull,
+            num_txns_remaining_after_pull,
+        );
+        counters::NUM_PROOFS_IN_PROOF_QUEUE_AFTER_PULL
+            .observe(num_proofs_remaining_after_pull as f64);
+        counters::NUM_TXNS_IN_PROOF_QUEUE_AFTER_PULL.observe(num_txns_remaining_after_pull as f64);
     }
 
     // gets excluded and iterates over the vector returning non excluded or expired entries.
@@ -279,18 +456,32 @@ impl ProofQueue {
     // The flag in the second return argument is true iff the entire proof queue is fully utilized
     // when pulling the proofs. If any proof from proof queue cannot be included due to size limits,
     // this flag is set false.
+    // Returns the proofs, the number of unique transactions in the proofs, and a flag indicating
+    // whether the proof queue is fully utilized.
     pub(crate) fn pull_proofs(
         &mut self,
         excluded_batches: &HashSet<BatchInfo>,
-        max_txns: u64,
-        max_bytes: u64,
+        max_txns: PayloadTxnsSize,
+        max_txns_after_filtering: u64,
+        soft_max_txns_after_filtering: u64,
         return_non_full: bool,
-    ) -> (Vec<ProofOfStore>, bool) {
+        block_timestamp: Duration,
+    ) -> (Vec<ProofOfStore>, PayloadTxnsSize, u64, bool) {
         let mut ret = vec![];
-        let mut cur_bytes = 0;
-        let mut cur_txns = 0;
+        let mut cur_unique_txns = 0;
+        let mut cur_all_txns = PayloadTxnsSize::zero();
         let mut excluded_txns = 0;
         let mut full = false;
+        // Set of all the excluded transactions and all the transactions included in the result
+        let mut filtered_txns = HashSet::new();
+        for batch_info in excluded_batches {
+            let batch_key = BatchKey::from_info(batch_info);
+            if let Some((txn_summaries, _, _)) = self.batch_summaries.get(&batch_key) {
+                for txn_summary in txn_summaries {
+                    filtered_txns.insert(*txn_summary);
+                }
+            }
+        }
 
         let mut iters = vec![];
         for (_, batches) in self.author_to_batches.iter() {
@@ -303,24 +494,59 @@ impl ProofQueue {
                 if full {
                     return false;
                 }
+
                 if let Some((sort_key, batch)) = iter.next() {
                     if excluded_batches.contains(batch) {
                         excluded_txns += batch.num_txns();
                     } else if let Some(Some((proof, insertion_time))) =
                         self.batch_to_proof.get(&sort_key.batch_key)
                     {
-                        cur_bytes += batch.num_bytes();
-                        cur_txns += batch.num_txns();
-                        if cur_bytes > max_bytes || cur_txns > max_txns {
+                        // Calculate the number of unique transactions if this batch is included in the result
+                        let unique_txns = if let Some((txn_summaries, _, _)) =
+                            self.batch_summaries.get(&sort_key.batch_key)
+                        {
+                            cur_unique_txns
+                                + txn_summaries
+                                    .iter()
+                                    .filter(|txn_summary| {
+                                        !filtered_txns.contains(txn_summary)
+                                            && block_timestamp.as_secs()
+                                                < txn_summary.expiration_timestamp_secs
+                                    })
+                                    .count() as u64
+                        } else {
+                            cur_unique_txns + batch.num_txns()
+                        };
+                        if cur_all_txns + batch.size() > max_txns
+                            || unique_txns > max_txns_after_filtering
+                        {
                             // Exceeded the limit for requested bytes or number of transactions.
                             full = true;
                             return false;
                         }
+                        cur_all_txns += batch.size();
+                        // Add this batch to filtered_txns and calculate the number of
+                        // unique transactions added in the result so far.
+                        cur_unique_txns += self.batch_summaries.get(&sort_key.batch_key).map_or(
+                            batch.num_txns(),
+                            |(summaries, _, _)| {
+                                summaries
+                                    .iter()
+                                    .filter(|summary| {
+                                        filtered_txns.insert(**summary)
+                                            && block_timestamp.as_secs()
+                                                < summary.expiration_timestamp_secs
+                                    })
+                                    .count() as u64
+                            },
+                        );
                         let bucket = proof.gas_bucket_start();
                         ret.push(proof.clone());
                         counters::pos_to_pull(bucket, insertion_time.elapsed().as_secs_f64());
-                        if cur_bytes == max_bytes || cur_txns == max_txns {
-                            // Exactly the limit for requested bytes or number of transactions.
+                        if cur_all_txns == max_txns
+                            || cur_unique_txns == max_txns_after_filtering
+                            || cur_unique_txns >= soft_max_txns_after_filtering
+                        {
                             full = true;
                             return false;
                         }
@@ -333,8 +559,11 @@ impl ProofQueue {
         }
         info!(
             // before non full check
-            byte_size = cur_bytes,
-            block_size = cur_txns,
+            block_total_txns = cur_all_txns,
+            block_unique_txns = cur_unique_txns,
+            max_txns = max_txns,
+            max_txns_after_filtering = max_txns_after_filtering,
+            soft_max_txns_after_filtering = soft_max_txns_after_filtering,
             batch_count = ret.len(),
             full = full,
             return_non_full = return_non_full,
@@ -342,19 +571,25 @@ impl ProofQueue {
         );
 
         if full || return_non_full {
-            counters::BLOCK_SIZE_WHEN_PULL.observe(cur_txns as f64);
-            counters::BLOCK_BYTES_WHEN_PULL.observe(cur_bytes as f64);
+            counters::BLOCK_SIZE_WHEN_PULL.observe(cur_unique_txns as f64);
+            counters::TOTAL_BLOCK_SIZE_WHEN_PULL.observe(cur_all_txns.count() as f64);
+            counters::KNOWN_DUPLICATE_TXNS_WHEN_PULL
+                .observe((cur_all_txns.count().saturating_sub(cur_unique_txns)) as f64);
+            counters::BLOCK_BYTES_WHEN_PULL.observe(cur_all_txns.size_in_bytes() as f64);
             counters::PROOF_SIZE_WHEN_PULL.observe(ret.len() as f64);
             counters::EXCLUDED_TXNS_WHEN_PULL.observe(excluded_txns as f64);
+            // Number of proofs remaining in proof queue after the pull
+            self.log_remaining_data_after_pull(excluded_batches, &ret);
             // Stable sort, so the order of proofs within an author will not change.
             ret.sort_by_key(|proof| Reverse(proof.gas_bucket_start()));
-            (ret, !full)
+            (ret, cur_all_txns, cur_unique_txns, !full)
         } else {
-            (Vec::new(), !full)
+            (Vec::new(), PayloadTxnsSize::zero(), 0, !full)
         }
     }
 
     pub(crate) fn handle_updated_block_timestamp(&mut self, block_timestamp: u64) {
+        let start = Instant::now();
         assert!(
             self.latest_block_timestamp <= block_timestamp,
             "Decreasing block timestamp"
@@ -376,6 +611,21 @@ impl ProofQueue {
                         num_expired_but_not_committed += 1;
                         counters::GAP_BETWEEN_BATCH_EXPIRATION_AND_CURRENT_TIME_WHEN_COMMIT
                             .observe((block_timestamp - batch.expiration()) as f64);
+                        if let Some((txn_summaries, _, true)) =
+                            self.batch_summaries.get(&key.batch_key)
+                        {
+                            for txn_summary in txn_summaries {
+                                if let Some(count) =
+                                    self.txn_summary_num_occurrences.get_mut(txn_summary)
+                                {
+                                    *count -= 1;
+                                    if *count == 0 {
+                                        self.txn_summary_num_occurrences.remove(txn_summary);
+                                    }
+                                };
+                            }
+                        }
+                        self.batch_summaries.remove(&key.batch_key);
                         self.dec_remaining(&batch.author(), batch.num_txns());
                     }
                     claims::assert_some!(self.batch_to_proof.remove(&key.batch_key));
@@ -385,22 +635,93 @@ impl ProofQueue {
                 }
             }
         }
+        counters::PROOF_QUEUE_UPDATE_TIMESTAMP_DURATION.observe_duration(start.elapsed());
         counters::NUM_PROOFS_EXPIRED_WHEN_COMMIT.inc_by(num_expired_but_not_committed);
     }
 
+    // Number of unexpired and uncommitted proofs in the pipeline without txn summaries in
+    // batch_summaries
+    fn num_proofs_without_batch_summary(&self) -> u64 {
+        let mut count = 0;
+        self.author_to_batches.values().for_each(|batches| {
+            count += batches
+                .iter()
+                .filter(|(sort_key, _)| {
+                    !self.batch_summaries.contains_key(&sort_key.batch_key)
+                        && self
+                            .batch_to_proof
+                            .get(&sort_key.batch_key)
+                            .map_or(false, Option::is_some)
+                })
+                .count() as u64;
+        });
+        count
+    }
+
+    // Number of unexpired and uncommitted proofs in the pipeline with txn summaries in
+    // batch_summaries
+    fn num_proofs_with_batch_summary(&self) -> u64 {
+        let mut count = 0;
+        self.author_to_batches.values().for_each(|batches| {
+            count += batches
+                .iter()
+                .filter(|(sort_key, _)| {
+                    self.batch_summaries.contains_key(&sort_key.batch_key)
+                        && self
+                            .batch_to_proof
+                            .get(&sort_key.batch_key)
+                            .map_or(false, Option::is_some)
+                })
+                .count() as u64;
+        });
+        count
+    }
+
     pub(crate) fn remaining_txns_and_proofs(&self) -> (u64, u64) {
-        counters::NUM_TOTAL_TXNS_LEFT_ON_UPDATE.observe(self.remaining_txns as f64);
+        let start = Instant::now();
+        counters::NUM_TOTAL_TXNS_LEFT_ON_UPDATE.observe(self.remaining_txns_with_duplicates as f64);
         counters::NUM_TOTAL_PROOFS_LEFT_ON_UPDATE.observe(self.remaining_proofs as f64);
         counters::NUM_LOCAL_TXNS_LEFT_ON_UPDATE.observe(self.remaining_local_txns as f64);
         counters::NUM_LOCAL_PROOFS_LEFT_ON_UPDATE.observe(self.remaining_local_proofs as f64);
 
-        (self.remaining_txns, self.remaining_proofs)
+        let remaining_txns_without_duplicates = self.remaining_txns_without_duplicates();
+        counters::NUM_UNIQUE_TOTAL_TXNS_LEFT_ON_UPDATE
+            .observe(remaining_txns_without_duplicates as f64);
+
+        // Number of txns with more than one batches
+        sample!(
+            SampleRate::Duration(Duration::from_secs(3)),
+            counters::TXNS_WITH_DUPLICATE_BATCHES.observe(
+                self.txn_summary_num_occurrences
+                    .iter()
+                    .filter(|(_, count)| **count > 1)
+                    .count() as f64,
+            );
+        );
+
+        // Number of txns in unexpired and uncommitted proofs with summaries in batch_summaries
+        counters::TXNS_IN_PROOFS_WITH_SUMMARIES
+            .observe(self.txn_summary_num_occurrences.len() as f64);
+
+        // Number of txns in unexpired and uncommitted proofs without summaries in batch_summaries
+        counters::TXNS_IN_PROOFS_WITHOUT_SUMMARIES.observe(
+            remaining_txns_without_duplicates
+                .saturating_sub(self.txn_summary_num_occurrences.len() as u64) as f64,
+        );
+
+        counters::PROOFS_WITHOUT_BATCH_SUMMARY
+            .observe(self.num_proofs_without_batch_summary() as f64);
+        counters::PROOFS_WITH_BATCH_SUMMARY.observe(self.num_proofs_with_batch_summary() as f64);
+
+        counters::PROOF_QUEUE_REMAINING_TXNS_DURATION.observe_duration(start.elapsed());
+        (remaining_txns_without_duplicates, self.remaining_proofs)
     }
 
     // Mark in the hashmap committed PoS, but keep them until they expire
     pub(crate) fn mark_committed(&mut self, batches: Vec<BatchInfo>) {
-        for batch in batches {
-            let batch_key = BatchKey::from_info(&batch);
+        let start = Instant::now();
+        for batch in &batches {
+            let batch_key = BatchKey::from_info(batch);
             if let Some(Some((proof, insertion_time))) = self.batch_to_proof.get(&batch_key) {
                 counters::pos_to_commit(
                     proof.gas_bucket_start(),
@@ -408,7 +729,19 @@ impl ProofQueue {
                 );
                 self.dec_remaining(&batch.author(), batch.num_txns());
             }
-            self.batch_to_proof.insert(batch_key, None);
+            self.batch_to_proof.insert(batch_key.clone(), None);
+            if let Some((txn_summaries, _, true)) = self.batch_summaries.get(&batch_key) {
+                for txn_summary in txn_summaries {
+                    if let Some(count) = self.txn_summary_num_occurrences.get_mut(txn_summary) {
+                        *count -= 1;
+                        if *count == 0 {
+                            self.txn_summary_num_occurrences.remove(txn_summary);
+                        }
+                    };
+                }
+            }
+            self.batch_summaries.remove(&batch_key);
         }
+        counters::PROOF_QUEUE_COMMIT_DURATION.observe_duration(start.elapsed());
     }
 }
diff --git a/consensus/src/rand/rand_gen/block_queue.rs b/consensus/src/rand/rand_gen/block_queue.rs
index 16522cfe5a9b2..c76d9b92bb292 100644
--- a/consensus/src/rand/rand_gen/block_queue.rs
+++ b/consensus/src/rand/rand_gen/block_queue.rs
@@ -40,12 +40,16 @@ impl QueueItem {
         self.blocks().len()
     }
 
+    #[allow(clippy::unwrap_used)]
     pub fn first_round(&self) -> u64 {
         self.blocks().first().unwrap().block().round()
     }
 
     pub fn offset(&self, round: Round) -> usize {
-        *self.offsets_by_round.get(&round).unwrap()
+        *self
+            .offsets_by_round
+            .get(&round)
+            .expect("Round should be in the queue")
     }
 
     pub fn num_undecided(&self) -> usize {
@@ -106,6 +110,8 @@ impl BlockQueue {
     }
 
     /// Dequeue all ordered blocks prefix that have randomness
+    /// Unwrap is safe because the queue is not empty
+    #[allow(clippy::unwrap_used)]
     pub fn dequeue_rand_ready_prefix(&mut self) -> Vec<OrderedBlocks> {
         let mut rand_ready_prefix = vec![];
         while let Some((_starting_round, item)) = self.queue.first_key_value() {
diff --git a/consensus/src/rand/rand_gen/network_messages.rs b/consensus/src/rand/rand_gen/network_messages.rs
index 2e5adf01a3255..09a3edfa463af 100644
--- a/consensus/src/rand/rand_gen/network_messages.rs
+++ b/consensus/src/rand/rand_gen/network_messages.rs
@@ -82,6 +82,7 @@ impl<S: TShare, D: TAugmentedData> TConsensusMsg for RandMessage<S, D> {
         }
     }
 
+    #[allow(clippy::unwrap_used)]
     fn into_network_message(self) -> ConsensusMsg {
         ConsensusMsg::RandGenMessage(RandGenMessage {
             epoch: self.epoch(),
diff --git a/consensus/src/rand/rand_gen/rand_manager.rs b/consensus/src/rand/rand_gen/rand_manager.rs
index cd31917211fa2..623faf15b51f7 100644
--- a/consensus/src/rand/rand_gen/rand_manager.rs
+++ b/consensus/src/rand/rand_gen/rand_manager.rs
@@ -23,7 +23,7 @@ use aptos_channels::aptos_channel;
 use aptos_config::config::ReliableBroadcastConfig;
 use aptos_consensus_types::common::{Author, Round};
 use aptos_infallible::Mutex;
-use aptos_logger::{debug, error, info, spawn_named, warn};
+use aptos_logger::{error, info, spawn_named, trace, warn};
 use aptos_network::{protocols::network::RpcError, ProtocolId};
 use aptos_reliable_broadcast::{DropGuard, ReliableBroadcast};
 use aptos_time_service::TimeService;
@@ -86,6 +86,7 @@ impl<S: TShare, D: TAugmentedData> RandManager<S, D> {
             .factor(rb_config.backoff_policy_factor)
             .max_delay(Duration::from_millis(rb_config.backoff_policy_max_delay_ms));
         let reliable_broadcast = Arc::new(ReliableBroadcast::new(
+            author,
             epoch_state.verifier.get_ordered_account_addresses(),
             network_sender.clone(),
             rb_backoff_policy,
@@ -211,7 +212,10 @@ impl<S: TShare, D: TAugmentedData> RandManager<S, D> {
         message: RandMessage<S, D>,
     ) {
         let msg = message.into_network_message();
-        let _ = sender.send(Ok(protocol.to_bytes(&msg).unwrap().into()));
+        let _ = sender.send(Ok(protocol
+            .to_bytes(&msg)
+            .expect("Message should be serializable into protocol")
+            .into()));
     }
 
     async fn verification_task(
@@ -283,7 +287,9 @@ impl<S: TShare, D: TAugmentedData> RandManager<S, D> {
                     "[RandManager] Start broadcasting share request for {}",
                     targets.len(),
                 );
-                rb.multicast(request, aggregate_state, targets).await;
+                rb.multicast(request, aggregate_state, targets)
+                    .await
+                    .expect("Broadcast cannot fail");
                 info!(
                     epoch = epoch,
                     round = round,
@@ -319,7 +325,7 @@ impl<S: TShare, D: TAugmentedData> RandManager<S, D> {
             info!(LogSchema::new(LogEvent::BroadcastAugData)
                 .author(*data.author())
                 .epoch(data.epoch()));
-            let certified_data = rb.broadcast(data, aug_ack).await;
+            let certified_data = rb.broadcast(data, aug_ack).await.expect("cannot fail");
             info!("[RandManager] Finish broadcasting aug data");
             certified_data
         };
@@ -329,7 +335,9 @@ impl<S: TShare, D: TAugmentedData> RandManager<S, D> {
                 .author(*certified_data.author())
                 .epoch(certified_data.epoch()));
             info!("[RandManager] Start broadcasting certified aug data");
-            rb2.broadcast(certified_data, ack_state).await;
+            rb2.broadcast(certified_data, ack_state)
+                .await
+                .expect("Broadcast cannot fail");
             info!("[RandManager] Finish broadcasting certified aug data");
         });
         let (abort_handle, abort_registration) = AbortHandle::new_pair();
@@ -343,7 +351,7 @@ impl<S: TShare, D: TAugmentedData> RandManager<S, D> {
         incoming_rpc_request: aptos_channel::Receiver<Author, IncomingRandGenRequest>,
         mut reset_rx: Receiver<ResetRequest>,
         bounded_executor: BoundedExecutor,
-        highest_ordered_round: Round,
+        highest_known_round: Round,
     ) {
         info!("RandManager started");
         let (verified_msg_tx, mut verified_msg_rx) = unbounded();
@@ -352,7 +360,7 @@ impl<S: TShare, D: TAugmentedData> RandManager<S, D> {
         let fast_rand_config = self.fast_config.clone();
         self.rand_store
             .lock()
-            .update_highest_known_round(highest_ordered_round);
+            .update_highest_known_round(highest_known_round);
         spawn_named!(
             "rand manager verification",
             Self::verification_task(
@@ -404,7 +412,7 @@ impl<S: TShare, D: TAugmentedData> RandManager<S, D> {
                             }
                         }
                         RandMessage::Share(share) => {
-                            debug!(LogSchema::new(LogEvent::ReceiveProactiveRandShare)
+                            trace!(LogSchema::new(LogEvent::ReceiveProactiveRandShare)
                                 .author(self.author)
                                 .epoch(share.epoch())
                                 .round(share.metadata().round)
@@ -415,7 +423,7 @@ impl<S: TShare, D: TAugmentedData> RandManager<S, D> {
                             }
                         }
                         RandMessage::FastShare(share) => {
-                            debug!(LogSchema::new(LogEvent::ReceiveRandShareFastPath)
+                            trace!(LogSchema::new(LogEvent::ReceiveRandShareFastPath)
                                 .author(self.author)
                                 .epoch(share.epoch())
                                 .round(share.metadata().round)
diff --git a/consensus/src/rand/rand_gen/rand_store.rs b/consensus/src/rand/rand_gen/rand_store.rs
index e107245d744c2..99c63b7a40b0f 100644
--- a/consensus/src/rand/rand_gen/rand_store.rs
+++ b/consensus/src/rand/rand_gen/rand_store.rs
@@ -486,7 +486,7 @@ mod tests {
     async fn test_rand_item() {
         let ctxt = TestContext::new(vec![1, 2, 3], 1);
         let (tx, _rx) = unbounded();
-        let shares = vec![
+        let shares = [
             create_share_for_round(ctxt.target_epoch, 2, ctxt.authors[0]),
             create_share_for_round(ctxt.target_epoch, 1, ctxt.authors[1]),
             create_share_for_round(ctxt.target_epoch, 1, ctxt.authors[2]),
@@ -528,7 +528,7 @@ mod tests {
             decision_tx,
         );
 
-        let rounds = vec![vec![1], vec![2, 3], vec![5, 8, 13]];
+        let rounds = [vec![1], vec![2, 3], vec![5, 8, 13]];
         let blocks_1 = QueueItem::new(create_ordered_blocks(rounds[0].clone()), None);
         let blocks_2 = QueueItem::new(create_ordered_blocks(rounds[1].clone()), None);
         let metadata_1 = blocks_1.all_rand_metadata();
diff --git a/consensus/src/rand/rand_gen/storage/db.rs b/consensus/src/rand/rand_gen/storage/db.rs
index 94421b7c07e17..9ef658212aa4d 100644
--- a/consensus/src/rand/rand_gen/storage/db.rs
+++ b/consensus/src/rand/rand_gen/storage/db.rs
@@ -16,7 +16,7 @@ use crate::{
 };
 use anyhow::Result;
 use aptos_logger::info;
-use aptos_schemadb::{schema::Schema, Options, ReadOptions, SchemaBatch, DB};
+use aptos_schemadb::{schema::Schema, Options, SchemaBatch, DB};
 use std::{path::Path, sync::Arc, time::Instant};
 
 pub struct RandDb {
@@ -71,7 +71,7 @@ impl RandDb {
     }
 
     fn get_all<S: Schema>(&self) -> Result<Vec<(S::Key, S::Value)>, DbError> {
-        let mut iter = self.db.iter::<S>(ReadOptions::default())?;
+        let mut iter = self.db.iter::<S>()?;
         iter.seek_to_first();
         Ok(iter
             .filter_map(|e| match e {
diff --git a/consensus/src/rand/rand_gen/types.rs b/consensus/src/rand/rand_gen/types.rs
index 0ff28cdd5eb80..9c996ca140c95 100644
--- a/consensus/src/rand/rand_gen/types.rs
+++ b/consensus/src/rand/rand_gen/types.rs
@@ -65,7 +65,9 @@ impl TShare for Share {
             WVUF::verify_share(
                 &rand_config.vuf_pp,
                 apk,
-                bcs::to_bytes(&rand_metadata).unwrap().as_slice(),
+                bcs::to_bytes(&rand_metadata)
+                    .map_err(|e| anyhow!("Serialization failed: {}", e))?
+                    .as_slice(),
                 &self.share,
             )?;
         } else {
@@ -78,6 +80,7 @@ impl TShare for Share {
         Ok(())
     }
 
+    #[allow(clippy::unwrap_used)]
     fn generate(rand_config: &RandConfig, rand_metadata: RandMetadata) -> RandShare<Self>
     where
         Self: Sized,
@@ -629,7 +632,7 @@ impl RandConfig {
             .validator
             .address_to_validator_index()
             .get(peer)
-            .unwrap()
+            .expect("Peer should be in the index!")
     }
 
     pub fn get_certified_apk(&self, peer: &Author) -> Option<&APK> {
diff --git a/consensus/src/recovery_manager.rs b/consensus/src/recovery_manager.rs
index 897424d4ed4a3..57e308570f93d 100644
--- a/consensus/src/recovery_manager.rs
+++ b/consensus/src/recovery_manager.rs
@@ -2,12 +2,12 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{
-    block_storage::{BlockRetriever, BlockStore},
+    block_storage::{pending_blocks::PendingBlocks, BlockRetriever, BlockStore},
     counters,
     error::error_kind,
     monitor,
     network::NetworkSender,
-    payload_manager::PayloadManager,
+    payload_manager::TPayloadManager,
     persistent_liveness_storage::{PersistentLivenessStorage, RecoveryData},
     pipeline::execution_client::TExecutionClient,
     round_manager::VerifiedEvent,
@@ -17,6 +17,7 @@ use aptos_channels::aptos_channel;
 use aptos_consensus_types::{
     common::Author, proposal_msg::ProposalMsg, sync_info::SyncInfo, vote_msg::VoteMsg,
 };
+use aptos_infallible::Mutex;
 use aptos_logger::prelude::*;
 use aptos_types::{block_info::Round, epoch_state::EpochState};
 use futures::{FutureExt, StreamExt};
@@ -32,7 +33,9 @@ pub struct RecoveryManager {
     execution_client: Arc<dyn TExecutionClient>,
     last_committed_round: Round,
     max_blocks_to_request: u64,
-    payload_manager: Arc<PayloadManager>,
+    payload_manager: Arc<dyn TPayloadManager>,
+    order_vote_enabled: bool,
+    pending_blocks: Arc<Mutex<PendingBlocks>>,
 }
 
 impl RecoveryManager {
@@ -43,7 +46,9 @@ impl RecoveryManager {
         execution_client: Arc<dyn TExecutionClient>,
         last_committed_round: Round,
         max_blocks_to_request: u64,
-        payload_manager: Arc<PayloadManager>,
+        payload_manager: Arc<dyn TPayloadManager>,
+        order_vote_enabled: bool,
+        pending_blocks: Arc<Mutex<PendingBlocks>>,
     ) -> Self {
         RecoveryManager {
             epoch_state,
@@ -53,6 +58,8 @@ impl RecoveryManager {
             last_committed_round,
             max_blocks_to_request,
             payload_manager,
+            order_vote_enabled,
+            pending_blocks,
         }
     }
 
@@ -89,14 +96,16 @@ impl RecoveryManager {
                 .get_ordered_account_addresses_iter()
                 .collect(),
             self.max_blocks_to_request,
+            self.pending_blocks.clone(),
         );
         let recovery_data = BlockStore::fast_forward_sync(
-            sync_info.highest_ordered_cert(),
+            sync_info.highest_quorum_cert(),
             sync_info.highest_commit_cert(),
             &mut retriever,
             self.storage.clone(),
             self.execution_client.clone(),
             self.payload_manager.clone(),
+            self.order_vote_enabled,
         )
         .await?;
 
diff --git a/consensus/src/round_manager.rs b/consensus/src/round_manager.rs
index 07d9e7c8094ba..ad1742149e5f8 100644
--- a/consensus/src/round_manager.rs
+++ b/consensus/src/round_manager.rs
@@ -5,9 +5,14 @@
 use crate::{
     block_storage::{
         tracing::{observe_block, BlockStage},
-        BlockReader, BlockRetriever, BlockStore,
+        BlockReader, BlockRetriever, BlockStore, NeedFetchResult,
+    },
+    counters::{
+        self, ORDER_CERT_CREATED_WITHOUT_BLOCK_IN_BLOCK_STORE, ORDER_VOTE_ADDED,
+        ORDER_VOTE_BROADCASTED, ORDER_VOTE_OTHER_ERRORS, ORDER_VOTE_VERY_OLD, PROPOSAL_VOTE_ADDED,
+        PROPOSAL_VOTE_BROADCASTED, PROPOSED_VTXN_BYTES, PROPOSED_VTXN_COUNT,
+        QC_AGGREGATED_FROM_VOTES, SYNC_INFO_RECEIVED_WITH_NEWER_CERT,
     },
-    counters::{self, PROPOSED_VTXN_BYTES, PROPOSED_VTXN_COUNT},
     error::{error_kind, VerifyError},
     liveness::{
         proposal_generator::ProposalGenerator,
@@ -20,6 +25,7 @@ use crate::{
     monitor,
     network::NetworkSender,
     network_interface::ConsensusMsg,
+    pending_order_votes::{OrderVoteReceptionResult, PendingOrderVotes},
     pending_votes::VoteReceptionResult,
     persistent_liveness_storage::PersistentLivenessStorage,
     quorum_store::types::BatchMsg,
@@ -34,20 +40,25 @@ use aptos_consensus_types::{
     block_data::BlockType,
     common::{Author, Round},
     delayed_qc_msg::DelayedQcMsg,
+    order_vote_msg::OrderVoteMsg,
     proof_of_store::{ProofCache, ProofOfStoreMsg, SignedBatchInfoMsg},
     proposal_msg::ProposalMsg,
     quorum_cert::QuorumCert,
     sync_info::SyncInfo,
     timeout_2chain::TwoChainTimeoutCertificate,
     vote::Vote,
+    vote_data::VoteData,
     vote_msg::VoteMsg,
+    wrapped_ledger_info::WrappedLedgerInfo,
 };
+use aptos_crypto::HashValue;
 use aptos_infallible::{checked, Mutex};
 use aptos_logger::prelude::*;
 #[cfg(test)]
 use aptos_safety_rules::ConsensusState;
 use aptos_safety_rules::TSafetyRules;
 use aptos_types::{
+    block_info::BlockInfo,
     epoch_state::EpochState,
     on_chain_config::{
         OnChainConsensusConfig, OnChainJWKConsensusConfig, OnChainRandomnessConfig,
@@ -58,10 +69,11 @@ use aptos_types::{
     PeerId,
 };
 use fail::fail_point;
-use futures::{channel::oneshot, FutureExt, StreamExt};
+use futures::{channel::oneshot, stream::FuturesUnordered, Future, FutureExt, StreamExt};
 use futures_channel::mpsc::UnboundedReceiver;
+use lru::LruCache;
 use serde::Serialize;
-use std::{mem::Discriminant, sync::Arc, time::Duration};
+use std::{mem::Discriminant, pin::Pin, sync::Arc, time::Duration};
 use tokio::{
     sync::oneshot as TokioOneshot,
     time::{sleep, Instant},
@@ -71,6 +83,7 @@ use tokio::{
 pub enum UnverifiedEvent {
     ProposalMsg(Box<ProposalMsg>),
     VoteMsg(Box<VoteMsg>),
+    OrderVoteMsg(Box<OrderVoteMsg>),
     SyncInfo(Box<SyncInfo>),
     BatchMsg(Box<BatchMsg>),
     SignedBatchInfo(Box<SignedBatchInfoMsg>),
@@ -111,6 +124,15 @@ impl UnverifiedEvent {
                 }
                 VerifiedEvent::VoteMsg(v)
             },
+            UnverifiedEvent::OrderVoteMsg(v) => {
+                if !self_message {
+                    v.verify_order_vote(validator)?;
+                    counters::VERIFY_MSG
+                        .with_label_values(&["order_vote"])
+                        .observe(start_time.elapsed().as_secs_f64());
+                }
+                VerifiedEvent::OrderVoteMsg(v)
+            },
             // sync info verification is on-demand (verified when it's used)
             UnverifiedEvent::SyncInfo(s) => VerifiedEvent::UnverifiedSyncInfo(s),
             UnverifiedEvent::BatchMsg(b) => {
@@ -152,6 +174,7 @@ impl UnverifiedEvent {
         match self {
             UnverifiedEvent::ProposalMsg(p) => Ok(p.epoch()),
             UnverifiedEvent::VoteMsg(v) => Ok(v.epoch()),
+            UnverifiedEvent::OrderVoteMsg(v) => Ok(v.epoch()),
             UnverifiedEvent::SyncInfo(s) => Ok(s.epoch()),
             UnverifiedEvent::BatchMsg(b) => b.epoch(),
             UnverifiedEvent::SignedBatchInfo(sd) => sd.epoch(),
@@ -165,6 +188,7 @@ impl From<ConsensusMsg> for UnverifiedEvent {
         match value {
             ConsensusMsg::ProposalMsg(m) => UnverifiedEvent::ProposalMsg(m),
             ConsensusMsg::VoteMsg(m) => UnverifiedEvent::VoteMsg(m),
+            ConsensusMsg::OrderVoteMsg(m) => UnverifiedEvent::OrderVoteMsg(m),
             ConsensusMsg::SyncInfo(m) => UnverifiedEvent::SyncInfo(m),
             ConsensusMsg::BatchMsg(m) => UnverifiedEvent::BatchMsg(m),
             ConsensusMsg::SignedBatchInfo(m) => UnverifiedEvent::SignedBatchInfo(m),
@@ -180,6 +204,7 @@ pub enum VerifiedEvent {
     ProposalMsg(Box<ProposalMsg>),
     VerifiedProposalMsg(Box<Block>),
     VoteMsg(Box<VoteMsg>),
+    OrderVoteMsg(Box<OrderVoteMsg>),
     UnverifiedSyncInfo(Box<SyncInfo>),
     BatchMsg(Box<BatchMsg>),
     SignedBatchInfo(Box<SignedBatchInfoMsg>),
@@ -207,8 +232,8 @@ pub struct RoundManager {
     epoch_state: Arc<EpochState>,
     block_store: Arc<BlockStore>,
     round_state: RoundState,
-    proposer_election: UnequivocalProposerElection,
-    proposal_generator: ProposalGenerator,
+    proposer_election: Arc<UnequivocalProposerElection>,
+    proposal_generator: Arc<ProposalGenerator>,
     safety_rules: Arc<Mutex<MetricsSafetyRules>>,
     network: Arc<NetworkSender>,
     storage: Arc<dyn PersistentLivenessStorage>,
@@ -219,6 +244,15 @@ pub struct RoundManager {
     randomness_config: OnChainRandomnessConfig,
     jwk_consensus_config: OnChainJWKConsensusConfig,
     fast_rand_config: Option<RandConfig>,
+    // Stores the order votes from all the rounds above highest_ordered_round
+    pending_order_votes: PendingOrderVotes,
+    // Round manager broadcasts fast shares when forming a QC or when receiving a proposal.
+    // To avoid duplicate broadcasts for the same block, we keep track of blocks for
+    // which we recently broadcasted fast shares.
+    blocks_with_broadcasted_fast_shares: LruCache<HashValue, ()>,
+    futures: FuturesUnordered<
+        Pin<Box<dyn Future<Output = (anyhow::Result<()>, Block, Instant)> + Send>>,
+    >,
 }
 
 impl RoundManager {
@@ -253,8 +287,8 @@ impl RoundManager {
             epoch_state,
             block_store,
             round_state,
-            proposer_election: UnequivocalProposerElection::new(proposer_election),
-            proposal_generator,
+            proposer_election: Arc::new(UnequivocalProposerElection::new(proposer_election)),
+            proposal_generator: Arc::new(proposal_generator),
             safety_rules,
             network,
             storage,
@@ -265,6 +299,9 @@ impl RoundManager {
             randomness_config,
             jwk_consensus_config,
             fast_rand_config,
+            pending_order_votes: PendingOrderVotes::new(),
+            blocks_with_broadcasted_fast_shares: LruCache::new(5),
+            futures: FuturesUnordered::new(),
         }
     }
 
@@ -279,6 +316,7 @@ impl RoundManager {
                 .collect(),
             self.local_config
                 .max_blocks_per_sending_request(self.onchain_config.quorum_store_enabled()),
+            self.block_store.pending_blocks(),
         )
     }
 
@@ -312,28 +350,76 @@ impl RoundManager {
             self.new_log(LogEvent::NewRound),
             reason = new_round_event.reason
         );
+        self.pending_order_votes
+            .garbage_collect(self.block_store.sync_info().highest_ordered_round());
 
         if self
             .proposer_election
             .is_valid_proposer(self.proposal_generator.author(), new_round_event.round)
         {
-            self.log_collected_vote_stats(&new_round_event);
-            self.round_state.setup_leader_timeout();
-            let proposal_msg = self.generate_proposal(new_round_event).await?;
-            #[cfg(feature = "failpoints")]
-            {
-                if self.check_whether_to_inject_reconfiguration_error() {
-                    self.attempt_to_inject_reconfiguration_error(&proposal_msg)
-                        .await?;
+            let epoch_state = self.epoch_state.clone();
+            let network = self.network.clone();
+            let sync_info = self.block_store.sync_info();
+            let proposal_generator = self.proposal_generator.clone();
+            let safety_rules = self.safety_rules.clone();
+            let proposer_election = self.proposer_election.clone();
+            tokio::spawn(async move {
+                if let Err(e) = Self::generate_and_send_proposal(
+                    epoch_state,
+                    new_round_event,
+                    network,
+                    sync_info,
+                    proposal_generator,
+                    safety_rules,
+                    proposer_election,
+                )
+                .await
+                {
+                    warn!("Error generating and sending proposal: {}", e);
                 }
-            }
-            self.network.broadcast_proposal(proposal_msg).await;
-            counters::PROPOSALS_COUNT.inc();
+            });
         }
         Ok(())
     }
 
-    fn log_collected_vote_stats(&self, new_round_event: &NewRoundEvent) {
+    async fn generate_and_send_proposal(
+        epoch_state: Arc<EpochState>,
+        new_round_event: NewRoundEvent,
+        network: Arc<NetworkSender>,
+        sync_info: SyncInfo,
+        proposal_generator: Arc<ProposalGenerator>,
+        safety_rules: Arc<Mutex<MetricsSafetyRules>>,
+        proposer_election: Arc<dyn ProposerElection + Send + Sync>,
+    ) -> anyhow::Result<()> {
+        let epoch = epoch_state.epoch;
+        Self::log_collected_vote_stats(epoch_state.clone(), &new_round_event);
+        let proposal_msg = Self::generate_proposal(
+            epoch,
+            new_round_event,
+            sync_info,
+            network.clone(),
+            proposal_generator,
+            safety_rules,
+            proposer_election,
+        )
+        .await?;
+        #[cfg(feature = "failpoints")]
+        {
+            if Self::check_whether_to_inject_reconfiguration_error() {
+                Self::attempt_to_inject_reconfiguration_error(
+                    epoch_state,
+                    network.clone(),
+                    &proposal_msg,
+                )
+                .await?;
+            }
+        };
+        network.broadcast_proposal(proposal_msg).await;
+        counters::PROPOSALS_COUNT.inc();
+        Ok(())
+    }
+
+    fn log_collected_vote_stats(epoch_state: Arc<EpochState>, new_round_event: &NewRoundEvent) {
         let prev_round_votes_for_li = new_round_event
             .prev_round_votes
             .iter()
@@ -342,7 +428,7 @@ impl RoundManager {
                     .signatures()
                     .keys()
                     .map(|author| {
-                        self.epoch_state
+                        epoch_state
                             .verifier
                             .get_voting_power(author)
                             .map(|voting_power| (voting_power as u128, 1))
@@ -371,7 +457,7 @@ impl RoundManager {
                 let (voting_power, votes): (Vec<_>, Vec<_>) = timeout_votes
                     .signers()
                     .map(|author| {
-                        self.epoch_state
+                        epoch_state
                             .verifier
                             .get_voting_power(author)
                             .map(|voting_power| (voting_power as u128, 1))
@@ -389,9 +475,9 @@ impl RoundManager {
         counters::PROPOSER_COLLECTED_TIMEOUT_VOTING_POWER.inc_by(timeout_voting_power as f64);
 
         info!(
-            epoch = self.epoch_state.epoch,
+            epoch = epoch_state.epoch,
             round = new_round_event.round,
-            total_voting_power = ?self.epoch_state.verifier.total_voting_power(),
+            total_voting_power = ?epoch_state.verifier.total_voting_power(),
             max_voting_power = ?max_voting_power,
             max_num_votes = max_num_votes,
             conflicting_voting_power = ?conflicting_voting_power,
@@ -402,31 +488,51 @@ impl RoundManager {
         );
     }
 
+    #[cfg(feature = "fuzzing")]
+    async fn generate_proposal_for_test(
+        &self,
+        new_round_event: NewRoundEvent,
+    ) -> anyhow::Result<ProposalMsg> {
+        Self::generate_proposal(
+            self.epoch_state().epoch,
+            new_round_event,
+            self.block_store.sync_info(),
+            self.network.clone(),
+            self.proposal_generator.clone(),
+            self.safety_rules.clone(),
+            self.proposer_election.clone(),
+        )
+        .await
+    }
+
     async fn generate_proposal(
-        &mut self,
+        epoch: u64,
         new_round_event: NewRoundEvent,
+        sync_info: SyncInfo,
+        network: Arc<NetworkSender>,
+        proposal_generator: Arc<ProposalGenerator>,
+        safety_rules: Arc<Mutex<MetricsSafetyRules>>,
+        proposer_election: Arc<dyn ProposerElection + Send + Sync>,
     ) -> anyhow::Result<ProposalMsg> {
         // Proposal generator will ensure that at most one proposal is generated per round
-        let sync_info = self.block_store.sync_info();
-        let sender = self.network.clone();
+        let callback_sync_info = sync_info.clone();
         let callback = async move {
-            sender.broadcast_sync_info(sync_info).await;
+            network.broadcast_sync_info(callback_sync_info).await;
         }
         .boxed();
 
-        let proposal = self
-            .proposal_generator
-            .generate_proposal(new_round_event.round, &mut self.proposer_election, callback)
+        let proposal = proposal_generator
+            .generate_proposal(new_round_event.round, proposer_election, callback)
             .await?;
-        let signature = self.safety_rules.lock().sign_proposal(&proposal)?;
+        let signature = safety_rules.lock().sign_proposal(&proposal)?;
         let signed_proposal =
             Block::new_proposal_from_block_data_and_signature(proposal, signature);
         observe_block(signed_proposal.timestamp_usecs(), BlockStage::SIGNED);
-        info!(self.new_log(LogEvent::Propose), "{}", signed_proposal);
-        Ok(ProposalMsg::new(
-            signed_proposal,
-            self.block_store.sync_info(),
-        ))
+        info!(
+            Self::new_log_with_round_epoch(LogEvent::Propose, new_round_event.round, epoch),
+            "{}", signed_proposal
+        );
+        Ok(ProposalMsg::new(signed_proposal, sync_info))
     }
 
     /// Process the proposal message:
@@ -449,23 +555,20 @@ impl RoundManager {
             block_parent_hash = proposal_msg.proposal().quorum_cert().certified_block().id(),
         );
 
-        if self
-            .ensure_round_and_sync_up(
+        ensure!(
+            self.ensure_round_and_sync_up(
                 proposal_msg.proposal().round(),
                 proposal_msg.sync_info(),
                 proposal_msg.proposer(),
             )
             .await
-            .context("[RoundManager] Process proposal")?
-        {
-            self.process_proposal(proposal_msg.take_proposal()).await
-        } else {
-            bail!(
-                "Stale proposal {}, current round {}",
-                proposal_msg.proposal(),
-                self.round_state.current_round()
-            );
-        }
+            .context("[RoundManager] Process proposal")?,
+            "Stale proposal {}, current round {}",
+            proposal_msg.proposal(),
+            self.round_state.current_round()
+        );
+
+        self.process_proposal(proposal_msg.take_proposal()).await
     }
 
     pub async fn process_delayed_proposal_msg(&mut self, proposal: Block) -> anyhow::Result<()> {
@@ -490,8 +593,7 @@ impl RoundManager {
         let vote = msg.vote().clone();
         let vote_reception_result = self
             .round_state
-            .process_delayed_qc_msg(&self.epoch_state.verifier, msg)
-            .await;
+            .process_delayed_qc_msg(&self.epoch_state.verifier, msg);
         trace!(
             "Received delayed QC message and vote reception result is {:?}",
             vote_reception_result
@@ -507,7 +609,7 @@ impl RoundManager {
             info!(
                 self.new_log(LogEvent::ReceiveNewCertificate)
                     .remote_peer(author),
-                "Local state {}, remote state {}", local_sync_info, sync_info
+                "Local state {},\n remote state {}", local_sync_info, sync_info
             );
             // Some information in SyncInfo is ahead of what we have locally.
             // First verify the SyncInfo (didn't verify it in the yet).
@@ -522,6 +624,7 @@ impl RoundManager {
                     );
                     VerifyError::from(e)
                 })?;
+            SYNC_INFO_RECEIVED_WITH_NEWER_CERT.inc();
             let result = self
                 .block_store
                 .add_certs(sync_info, self.create_block_retriever(author))
@@ -552,9 +655,11 @@ impl RoundManager {
         self.sync_up(sync_info, author).await?;
         ensure!(
             message_round == self.round_state.current_round(),
-            "After sync, round {} doesn't match local {}",
+            "After sync, round {} doesn't match local {}. Local Sync Info: {}. Remote Sync Info: {}",
             message_round,
-            self.round_state.current_round()
+            self.round_state.current_round(),
+            self.block_store.sync_info(),
+            sync_info,
         );
         Ok(true)
     }
@@ -580,6 +685,9 @@ impl RoundManager {
 
     fn sync_only(&self) -> bool {
         let sync_or_not = self.local_config.sync_only || self.block_store.vote_back_pressure();
+        if self.block_store.vote_back_pressure() {
+            warn!("Vote back pressure is set");
+        }
         counters::OP_COUNTERS
             .gauge("sync_only")
             .set(sync_or_not as i64);
@@ -615,13 +723,13 @@ impl RoundManager {
                 // Didn't vote in this round yet, generate a backup vote
                 let nil_block = self
                     .proposal_generator
-                    .generate_nil_block(round, &mut self.proposer_election)?;
+                    .generate_nil_block(round, self.proposer_election.clone())?;
                 info!(
                     self.new_log(LogEvent::VoteNIL),
                     "Planning to vote for a NIL block {}", nil_block
                 );
                 counters::VOTE_NIL_COUNT.inc();
-                let nil_vote = self.execute_and_vote(nil_block).await?;
+                let nil_vote = self.vote_block(nil_block).await?;
                 (true, nil_vote)
             },
         };
@@ -760,7 +868,7 @@ impl RoundManager {
             proposal.round(),
             proposal.quorum_cert().certified_block().round(),
             false,
-            &mut self.proposer_election,
+            self.proposer_election.clone(),
         );
         ensure!(
             proposal.block_data().failed_authors().map_or(false, |failed_authors| *failed_authors == expected_failed_authors),
@@ -781,6 +889,41 @@ impl RoundManager {
         );
 
         observe_block(proposal.timestamp_usecs(), BlockStage::SYNCED);
+
+        let block_store = self.block_store.clone();
+        if !block_store.check_payload(&proposal) {
+            debug!("Payload not available locally for block: {}", proposal.id());
+            counters::CONSENSUS_PROPOSAL_PAYLOAD_AVAILABILITY
+                .with_label_values(&["missing"])
+                .inc();
+            let start_time = Instant::now();
+            let future = async move {
+                (
+                    block_store.wait_for_payload(&proposal).await,
+                    proposal,
+                    start_time,
+                )
+            }
+            .boxed();
+            self.futures.push(future);
+            return Ok(());
+        }
+
+        counters::CONSENSUS_PROPOSAL_PAYLOAD_AVAILABILITY
+            .with_label_values(&["available"])
+            .inc();
+
+        self.check_backpressure_and_process_proposal(proposal).await
+    }
+
+    async fn check_backpressure_and_process_proposal(
+        &mut self,
+        proposal: Block,
+    ) -> anyhow::Result<()> {
+        let author = proposal
+            .author()
+            .expect("Proposal should be verified having an author");
+
         if self.block_store.vote_back_pressure() {
             counters::CONSENSUS_WITHOLD_VOTE_BACKPRESSURE_TRIGGERED.observe(1.0);
             // In case of back pressure, we delay processing proposal. This is done by resending the
@@ -793,33 +936,34 @@ impl RoundManager {
             // tries to add the same block again, which is okay as `execute_and_insert_block` call
             // is idempotent.
             self.block_store
-                .insert_ordered_block(proposal.clone())
+                .insert_block(proposal.clone())
                 .await
                 .context("[RoundManager] Failed to execute_and_insert the block")?;
-            self.resend_verified_proposal_to_self(
+            Self::resend_verified_proposal_to_self(
+                self.block_store.clone(),
+                self.buffered_proposal_tx.clone(),
                 proposal,
                 author,
                 BACK_PRESSURE_POLLING_INTERVAL_MS,
                 self.local_config.round_initial_timeout_ms,
             )
             .await;
-            Ok(())
-        } else {
-            counters::CONSENSUS_WITHOLD_VOTE_BACKPRESSURE_TRIGGERED.observe(0.0);
-            self.process_verified_proposal(proposal).await
+            return Ok(());
         }
+
+        counters::CONSENSUS_WITHOLD_VOTE_BACKPRESSURE_TRIGGERED.observe(0.0);
+        self.process_verified_proposal(proposal).await
     }
 
     async fn resend_verified_proposal_to_self(
-        &self,
+        block_store: Arc<BlockStore>,
+        self_sender: aptos_channel::Sender<Author, VerifiedEvent>,
         proposal: Block,
         author: Author,
         polling_interval_ms: u64,
         timeout_ms: u64,
     ) {
         let start = Instant::now();
-        let block_store = self.block_store.clone();
-        let self_sender = self.buffered_proposal_tx.clone();
         let event = VerifiedEvent::VerifiedProposalMsg(Box::new(proposal));
         tokio::spawn(async move {
             while start.elapsed() < Duration::from_millis(timeout_ms) {
@@ -834,22 +978,17 @@ impl RoundManager {
         });
     }
 
-    pub async fn process_verified_proposal(&mut self, proposal: Block) -> anyhow::Result<()> {
-        let proposal_round = proposal.round();
-        let vote = self
-            .execute_and_vote(proposal)
-            .await
-            .context("[RoundManager] Process proposal")?;
-        self.round_state.record_vote(vote.clone());
-        let vote_msg = VoteMsg::new(vote.clone(), self.block_store.sync_info());
-
+    async fn broadcast_fast_shares(&mut self, block_info: &BlockInfo) {
         // generate and multicast randomness share for the fast path
         if let Some(fast_config) = &self.fast_rand_config {
-            let ledger_info = vote.ledger_info();
-            if !ledger_info.is_dummy() {
+            if !block_info.is_empty()
+                && !self
+                    .blocks_with_broadcasted_fast_shares
+                    .contains(&block_info.id())
+            {
                 let metadata = RandMetadata {
-                    epoch: ledger_info.epoch(),
-                    round: ledger_info.round(),
+                    epoch: block_info.epoch(),
+                    round: block_info.round(),
                 };
                 let self_share = Share::generate(fast_config, metadata);
                 let fast_share = FastShare::new(self_share);
@@ -857,11 +996,27 @@ impl RoundManager {
                     .epoch(fast_share.epoch())
                     .round(fast_share.round()));
                 self.network.broadcast_fast_share(fast_share).await;
+                self.blocks_with_broadcasted_fast_shares
+                    .put(block_info.id(), ());
             }
         }
+    }
+
+    pub async fn process_verified_proposal(&mut self, proposal: Block) -> anyhow::Result<()> {
+        let proposal_round = proposal.round();
+        let vote = self
+            .vote_block(proposal)
+            .await
+            .context("[RoundManager] Process proposal")?;
+        self.round_state.record_vote(vote.clone());
+        let vote_msg = VoteMsg::new(vote.clone(), self.block_store.sync_info());
+
+        self.broadcast_fast_shares(vote.ledger_info().commit_info())
+            .await;
 
         if self.local_config.broadcast_vote {
             info!(self.new_log(LogEvent::Vote), "{}", vote);
+            PROPOSAL_VOTE_BROADCASTED.inc();
             self.network.broadcast_vote(vote_msg).await;
         } else {
             let recipient = self
@@ -877,14 +1032,14 @@ impl RoundManager {
     }
 
     /// The function generates a VoteMsg for a given proposed_block:
-    /// * first execute the block and add it to the block store
+    /// * add the block to the block store
     /// * then verify the voting rules
     /// * save the updated state to consensus DB
     /// * return a VoteMsg with the LedgerInfo to be committed in case the vote gathers QC.
-    async fn execute_and_vote(&mut self, proposed_block: Block) -> anyhow::Result<Vote> {
-        let executed_block = self
+    async fn vote_block(&mut self, proposed_block: Block) -> anyhow::Result<Vote> {
+        let block_arc = self
             .block_store
-            .insert_ordered_block(proposed_block)
+            .insert_block(proposed_block)
             .await
             .context("[RoundManager] Failed to execute_and_insert the block")?;
 
@@ -900,17 +1055,17 @@ impl RoundManager {
             "[RoundManager] sync_only flag is set, stop voting"
         );
 
-        let vote_proposal = executed_block.vote_proposal();
+        let vote_proposal = block_arc.vote_proposal();
         let vote_result = self.safety_rules.lock().construct_and_sign_vote_two_chain(
             &vote_proposal,
             self.block_store.highest_2chain_timeout_cert().as_deref(),
         );
         let vote = vote_result.context(format!(
             "[RoundManager] SafetyRules Rejected {}",
-            executed_block.block()
+            block_arc.block()
         ))?;
-        if !executed_block.block().is_nil_block() {
-            observe_block(executed_block.block().timestamp_usecs(), BlockStage::VOTED);
+        if !block_arc.block().is_nil_block() {
+            observe_block(block_arc.block().timestamp_usecs(), BlockStage::VOTED);
         }
 
         self.storage
@@ -920,6 +1075,83 @@ impl RoundManager {
         Ok(vote)
     }
 
+    async fn process_order_vote_msg(&mut self, order_vote_msg: OrderVoteMsg) -> anyhow::Result<()> {
+        if self.onchain_config.order_vote_enabled() {
+            fail_point!("consensus::process_order_vote_msg", |_| {
+                Err(anyhow::anyhow!("Injected error in process_order_vote_msg"))
+            });
+
+            let order_vote = order_vote_msg.order_vote();
+            self.new_qc_from_order_vote_msg(&order_vote_msg).await?;
+
+            debug!(
+                self.new_log(LogEvent::ReceiveOrderVote)
+                    .remote_peer(order_vote.author()),
+                epoch = order_vote.ledger_info().epoch(),
+                round = order_vote.ledger_info().round(),
+                id = order_vote.ledger_info().consensus_block_id(),
+            );
+
+            if self
+                .pending_order_votes
+                .has_enough_order_votes(order_vote_msg.order_vote().ledger_info())
+            {
+                return Ok(());
+            }
+
+            if order_vote_msg.order_vote().ledger_info().round()
+                > self.block_store.sync_info().highest_ordered_round()
+            {
+                let vote_reception_result = self
+                    .pending_order_votes
+                    .insert_order_vote(order_vote_msg.order_vote(), &self.epoch_state.verifier);
+                self.process_order_vote_reception_result(vote_reception_result)
+                    .await?;
+            } else {
+                ORDER_VOTE_VERY_OLD.inc();
+                info!(
+                    "Received old order vote. Order vote round: {:?}, Highest ordered round: {:?}",
+                    order_vote_msg.order_vote().ledger_info().round(),
+                    self.block_store.sync_info().highest_ordered_round()
+                );
+            }
+        }
+        Ok(())
+    }
+
+    async fn broadcast_order_vote(
+        &mut self,
+        vote: &Vote,
+        qc: Arc<QuorumCert>,
+    ) -> anyhow::Result<()> {
+        if let Some(proposed_block) = self.block_store.get_block(vote.vote_data().proposed().id()) {
+            // Generate an order vote with ledger_info = proposed_block
+            let order_vote_proposal = proposed_block.order_vote_proposal(qc.clone());
+            let order_vote_result = self
+                .safety_rules
+                .lock()
+                .construct_and_sign_order_vote(&order_vote_proposal);
+            let order_vote = order_vote_result.context(format!(
+                "[RoundManager] SafetyRules Rejected {} for order vote",
+                proposed_block.block()
+            ))?;
+            if !proposed_block.block().is_nil_block() {
+                observe_block(
+                    proposed_block.block().timestamp_usecs(),
+                    BlockStage::ORDER_VOTED,
+                );
+            }
+            let order_vote_msg = OrderVoteMsg::new(order_vote.clone(), qc.as_ref().clone());
+            info!(
+                self.new_log(LogEvent::BroadcastOrderVote),
+                "{}", order_vote_msg
+            );
+            self.network.broadcast_order_vote(order_vote_msg).await;
+            ORDER_VOTE_BROADCASTED.inc();
+        }
+        Ok(())
+    }
+
     /// Upon new vote:
     /// 1. Ensures we're processing the vote from the same round as local round
     /// 2. Filter out votes for rounds that should not be processed by this validator (to avoid
@@ -954,16 +1186,26 @@ impl RoundManager {
     async fn process_vote(&mut self, vote: &Vote) -> anyhow::Result<()> {
         let round = vote.vote_data().proposed().round();
 
-        debug!(
-            self.new_log(LogEvent::ReceiveVote)
-                .remote_peer(vote.author()),
-            vote = %vote,
-            vote_epoch = vote.vote_data().proposed().epoch(),
-            vote_round = vote.vote_data().proposed().round(),
-            vote_id = vote.vote_data().proposed().id(),
-            vote_state = vote.vote_data().proposed().executed_state_id(),
-            is_timeout = vote.is_timeout(),
-        );
+        if vote.is_timeout() {
+            info!(
+                self.new_log(LogEvent::ReceiveVote)
+                    .remote_peer(vote.author()),
+                vote = %vote,
+                epoch = vote.vote_data().proposed().epoch(),
+                round = vote.vote_data().proposed().round(),
+                id = vote.vote_data().proposed().id(),
+                state = vote.vote_data().proposed().executed_state_id(),
+                is_timeout = vote.is_timeout(),
+            );
+        } else {
+            debug!(
+                self.new_log(LogEvent::ReceiveVote)
+                    .remote_peer(vote.author()),
+                epoch = vote.vote_data().proposed().epoch(),
+                round = vote.vote_data().proposed().round(),
+                id = vote.vote_data().proposed().id(),
+            );
+        }
 
         if !self.local_config.broadcast_vote && !vote.is_timeout() {
             // Unlike timeout votes regular votes are sent to the leaders of the next round only.
@@ -1007,7 +1249,35 @@ impl RoundManager {
                         BlockStage::QC_AGGREGATED,
                     );
                 }
-                self.new_qc_aggregated(qc, vote.author()).await
+                QC_AGGREGATED_FROM_VOTES.inc();
+                self.new_qc_aggregated(qc.clone(), vote.author())
+                    .await
+                    .context(format!(
+                        "[RoundManager] Unable to process the created QC {:?}",
+                        qc
+                    ))?;
+                if self.onchain_config.order_vote_enabled() {
+                    // This check is already done in safety rules. As printing the "failed to broadcast order vote"
+                    // in humio logs could sometimes look scary, we are doing the same check again here.
+                    if let Some(last_sent_vote) = self.round_state.vote_sent() {
+                        if let Some((two_chain_timeout, _)) = last_sent_vote.two_chain_timeout() {
+                            if round <= two_chain_timeout.round() {
+                                return Ok(());
+                            }
+                        }
+                    }
+                    // Broadcast order vote if the QC is successfully aggregated
+                    // Even if broadcast order vote fails, the function will return Ok
+                    if let Err(e) = self.broadcast_order_vote(vote, qc.clone()).await {
+                        warn!(
+                            "Failed to broadcast order vote for QC {:?}. Error: {:?}",
+                            qc, e
+                        );
+                    } else {
+                        self.broadcast_fast_shares(qc.certified_block()).await;
+                    }
+                }
+                Ok(())
             },
             VoteReceptionResult::New2ChainTimeoutCertificate(tc) => {
                 self.new_2chain_tc_aggregated(tc).await
@@ -1015,14 +1285,40 @@ impl RoundManager {
             VoteReceptionResult::EchoTimeout(_) if !self.round_state.is_vote_timeout() => {
                 self.process_local_timeout(round).await
             },
-            VoteReceptionResult::VoteAdded(_)
-            | VoteReceptionResult::VoteAddedQCDelayed(_)
+            VoteReceptionResult::VoteAdded(_) => {
+                PROPOSAL_VOTE_ADDED.inc();
+                Ok(())
+            },
+            VoteReceptionResult::VoteAddedQCDelayed(_)
             | VoteReceptionResult::EchoTimeout(_)
             | VoteReceptionResult::DuplicateVote => Ok(()),
             e => Err(anyhow::anyhow!("{:?}", e)),
         }
     }
 
+    async fn process_order_vote_reception_result(
+        &mut self,
+        result: OrderVoteReceptionResult,
+    ) -> anyhow::Result<()> {
+        match result {
+            OrderVoteReceptionResult::NewLedgerInfoWithSignatures(ledger_info_with_signatures) => {
+                self.new_ordered_cert(WrappedLedgerInfo::new(
+                    VoteData::dummy(),
+                    ledger_info_with_signatures,
+                ))
+                .await
+            },
+            OrderVoteReceptionResult::VoteAdded(_) => {
+                ORDER_VOTE_ADDED.inc();
+                Ok(())
+            },
+            e => {
+                ORDER_VOTE_OTHER_ERRORS.inc();
+                Err(anyhow::anyhow!("{:?}", e))
+            },
+        }
+    }
+
     async fn new_qc_aggregated(
         &mut self,
         qc: Arc<QuorumCert>,
@@ -1037,6 +1333,60 @@ impl RoundManager {
         result
     }
 
+    async fn new_qc_from_order_vote_msg(
+        &mut self,
+        order_vote_msg: &OrderVoteMsg,
+    ) -> anyhow::Result<()> {
+        if let NeedFetchResult::QCAlreadyExist = self
+            .block_store
+            .need_fetch_for_quorum_cert(order_vote_msg.quorum_cert())
+        {
+            return Ok(());
+        }
+
+        let start = Instant::now();
+        order_vote_msg
+            .quorum_cert()
+            .verify(&self.epoch_state().verifier)
+            .context("[OrderVoteMsg QuorumCert verification failed")?;
+        counters::VERIFY_MSG
+            .with_label_values(&["order_vote_qc"])
+            .observe(start.elapsed().as_secs_f64());
+
+        let result = self
+            .block_store
+            .insert_quorum_cert(
+                order_vote_msg.quorum_cert(),
+                &mut self.create_block_retriever(order_vote_msg.order_vote().author()),
+            )
+            .await
+            .context("[RoundManager] Failed to process the QC from order vote msg");
+        self.process_certificates().await?;
+        result
+    }
+
+    // Insert ordered certificate formed by aggregating order votes
+    async fn new_ordered_cert(&mut self, ordered_cert: WrappedLedgerInfo) -> anyhow::Result<()> {
+        if self
+            .block_store
+            .get_block(ordered_cert.commit_info().id())
+            .is_none()
+        {
+            ORDER_CERT_CREATED_WITHOUT_BLOCK_IN_BLOCK_STORE.inc();
+            error!(
+                "Ordered certificate created without block in block store: {:?}",
+                ordered_cert
+            );
+        }
+        let result = self
+            .block_store
+            .insert_ordered_cert(&ordered_cert)
+            .await
+            .context("[RoundManager] Failed to process a new OrderCert formed by order votes");
+        self.process_certificates().await?;
+        result
+    }
+
     async fn new_2chain_tc_aggregated(
         &mut self,
         tc: Arc<TwoChainTimeoutCertificate>,
@@ -1083,12 +1433,19 @@ impl RoundManager {
     }
 
     fn new_log(&self, event: LogEvent) -> LogSchema {
-        LogSchema::new(event)
-            .round(self.round_state.current_round())
-            .epoch(self.epoch_state.epoch)
+        Self::new_log_with_round_epoch(
+            event,
+            self.round_state().current_round(),
+            self.epoch_state().epoch,
+        )
+    }
+
+    fn new_log_with_round_epoch(event: LogEvent, round: Round, epoch: u64) -> LogSchema {
+        LogSchema::new(event).round(round).epoch(epoch)
     }
 
     /// Mainloop of processing messages.
+    #[allow(clippy::unwrap_used)]
     pub async fn start(
         mut self,
         mut event_rx: aptos_channel::Receiver<
@@ -1167,11 +1524,29 @@ impl RoundManager {
                         }
                     }
                 },
+                Some((result, block, start_time)) = self.futures.next() => {
+                    let elapsed = start_time.elapsed().as_secs_f64();
+                    match result {
+                        Ok(()) => {
+                            counters::CONSENSUS_PROPOSAL_PAYLOAD_FETCH_DURATION.with_label_values(&["success"]).observe(elapsed);
+                            if let Err(e) = monitor!("payload_fetch_proposal_process", self.check_backpressure_and_process_proposal(block)).await {
+                                warn!("error {}", e);
+                            }
+                        },
+                        Err(err) => {
+                            counters::CONSENSUS_PROPOSAL_PAYLOAD_FETCH_DURATION.with_label_values(&["error"]).observe(elapsed);
+                            warn!("unable to get transactions: {}", err);
+                        },
+                    };
+                },
                 (peer_id, event) = event_rx.select_next_some() => {
                     let result = match event {
                         VerifiedEvent::VoteMsg(vote_msg) => {
                             monitor!("process_vote", self.process_vote_msg(*vote_msg).await)
                         }
+                        VerifiedEvent::OrderVoteMsg(order_vote_msg) => {
+                            monitor!("process_order_vote", self.process_order_vote_msg(*order_vote_msg).await)
+                        }
                         VerifiedEvent::UnverifiedSyncInfo(sync_info) => {
                             monitor!(
                                 "process_sync_info",
@@ -1194,14 +1569,14 @@ impl RoundManager {
                             warn!(error = ?e, kind = error_kind(&e), RoundStateLogSchema::new(round_state));
                         }
                     }
-                }
+                },
             }
         }
         info!(epoch = self.epoch_state().epoch, "RoundManager stopped");
     }
 
     #[cfg(feature = "failpoints")]
-    fn check_whether_to_inject_reconfiguration_error(&self) -> bool {
+    fn check_whether_to_inject_reconfiguration_error() -> bool {
         fail_point!("consensus::inject_reconfiguration_error", |_| true);
         false
     }
@@ -1213,7 +1588,8 @@ impl RoundManager {
     /// It's only enabled with fault injection (failpoints feature).
     #[cfg(feature = "failpoints")]
     async fn attempt_to_inject_reconfiguration_error(
-        &self,
+        epoch_state: Arc<EpochState>,
+        network: Arc<NetworkSender>,
         proposal_msg: &ProposalMsg,
     ) -> anyhow::Result<()> {
         let block_data = proposal_msg.proposal().block_data();
@@ -1226,13 +1602,12 @@ impl RoundManager {
             block_data.round() == block_data.quorum_cert().certified_block().round() + 1;
         let should_inject = direct_suffix && continuous_round;
         if should_inject {
-            let mut half_peers: Vec<_> = self
-                .epoch_state
+            let mut half_peers: Vec<_> = epoch_state
                 .verifier
                 .get_ordered_account_addresses_iter()
                 .collect();
             half_peers.truncate(half_peers.len() / 2);
-            self.network
+            network
                 .send_proposal(proposal_msg.clone(), half_peers)
                 .await;
             Err(anyhow::anyhow!("Injected error in reconfiguration suffix"))
diff --git a/consensus/src/round_manager_fuzzing.rs b/consensus/src/round_manager_fuzzing.rs
index 338209e477e61..ab7a14740624f 100644
--- a/consensus/src/round_manager_fuzzing.rs
+++ b/consensus/src/round_manager_fuzzing.rs
@@ -2,8 +2,10 @@
 // Parts of the project are originally copyright © Meta Platforms, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
+#![allow(clippy::unwrap_used)]
+
 use crate::{
-    block_storage::BlockStore,
+    block_storage::{pending_blocks::PendingBlocks, BlockStore},
     liveness::{
         proposal_generator::{
             ChainHealthBackoffConfig, PipelineBackpressureConfig, ProposalGenerator,
@@ -14,7 +16,7 @@ use crate::{
     metrics_safety_rules::MetricsSafetyRules,
     network::NetworkSender,
     network_interface::{ConsensusNetworkClient, DIRECT_SEND, RPC},
-    payload_manager::PayloadManager,
+    payload_manager::DirectMempoolPayloadManager,
     persistent_liveness_storage::{PersistentLivenessStorage, RecoveryData},
     pipeline::execution_client::DummyExecutionClient,
     round_manager::RoundManager,
@@ -26,7 +28,7 @@ use aptos_config::{
     config::{ConsensusConfig, QcAggregatorType},
     network_id::NetworkId,
 };
-use aptos_consensus_types::proposal_msg::ProposalMsg;
+use aptos_consensus_types::{proposal_msg::ProposalMsg, utils::PayloadTxnsSize};
 use aptos_infallible::Mutex;
 use aptos_network::{
     application::{interface::NetworkClient, storage::PeersAndMetadata},
@@ -56,10 +58,10 @@ use tokio::runtime::Runtime;
 
 // This generates a proposal for round 1
 pub fn generate_corpus_proposal() -> Vec<u8> {
-    let mut round_manager = create_node_for_fuzzing();
+    let round_manager = create_node_for_fuzzing();
     block_on(async {
         let proposal = round_manager
-            .generate_proposal(NewRoundEvent {
+            .generate_proposal_for_test(NewRoundEvent {
                 round: 1,
                 reason: NewRoundReason::QCReady,
                 timeout: std::time::Duration::new(5, 0),
@@ -90,7 +92,9 @@ fn build_empty_store(
         10, // max pruned blocks in mem
         Arc::new(SimulatedTimeService::new()),
         10,
-        Arc::from(PayloadManager::DirectMempool),
+        Arc::from(DirectMempoolPayloadManager::new()),
+        false,
+        Arc::new(Mutex::new(PendingBlocks::new())),
     ))
 }
 
@@ -180,11 +184,11 @@ fn create_node_for_fuzzing() -> RoundManager {
         Arc::new(MockPayloadManager::new(None)),
         time_service,
         Duration::ZERO,
+        PayloadTxnsSize::new(1, 1024),
         1,
-        1024,
-        1,
-        1024,
+        PayloadTxnsSize::new(1, 1024),
         10,
+        1,
         PipelineBackpressureConfig::new_no_backoff(),
         ChainHealthBackoffConfig::new_no_backoff(),
         false,
diff --git a/consensus/src/round_manager_test.rs b/consensus/src/round_manager_test.rs
index 52a289e7b5ac9..cf34840d95a15 100644
--- a/consensus/src/round_manager_test.rs
+++ b/consensus/src/round_manager_test.rs
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{
-    block_storage::{BlockReader, BlockStore},
+    block_storage::{pending_blocks::PendingBlocks, BlockReader, BlockStore},
     liveness::{
         proposal_generator::{
             ChainHealthBackoffConfig, PipelineBackpressureConfig, ProposalGenerator,
@@ -16,7 +16,7 @@ use crate::{
     network::{IncomingBlockRetrievalRequest, NetworkSender},
     network_interface::{CommitMessage, ConsensusMsg, ConsensusNetworkClient, DIRECT_SEND, RPC},
     network_tests::{NetworkPlayground, TwinId},
-    payload_manager::PayloadManager,
+    payload_manager::DirectMempoolPayloadManager,
     persistent_liveness_storage::RecoveryData,
     pipeline::buffer_manager::OrderedBlocks,
     round_manager::RoundManager,
@@ -43,6 +43,7 @@ use aptos_consensus_types::{
     proposal_msg::ProposalMsg,
     sync_info::SyncInfo,
     timeout_2chain::{TwoChainTimeout, TwoChainTimeoutWithPartialSignatures},
+    utils::PayloadTxnsSize,
     vote_msg::VoteMsg,
 };
 use aptos_crypto::HashValue;
@@ -146,7 +147,21 @@ impl NodeSetup {
         onchain_randomness_config: Option<OnChainRandomnessConfig>,
         onchain_jwk_consensus_config: Option<OnChainJWKConsensusConfig>,
     ) -> Vec<Self> {
-        let onchain_consensus_config = onchain_consensus_config.unwrap_or_default();
+        let mut onchain_consensus_config = onchain_consensus_config.unwrap_or_default();
+        // With order votes feature, the validators additionally send order votes.
+        // next_proposal and next_vote functions could potentially break because of it.
+        if let OnChainConsensusConfig::V3 {
+            alg:
+                ConsensusAlgorithmConfig::JolteonV2 {
+                    main: _,
+                    quorum_store_enabled: _,
+                    order_vote_enabled,
+                },
+            vtxn: _,
+        } = &mut onchain_consensus_config
+        {
+            *order_vote_enabled = false;
+        }
         let onchain_randomness_config =
             onchain_randomness_config.unwrap_or_else(OnChainRandomnessConfig::default_if_missing);
         let onchain_jwk_consensus_config = onchain_jwk_consensus_config
@@ -243,7 +258,7 @@ impl NodeSetup {
             playground.peer_protocols(),
         );
         let consensus_network_client = ConsensusNetworkClient::new(network_client);
-        let network_events = NetworkEvents::new(consensus_rx, None);
+        let network_events = NetworkEvents::new(consensus_rx, None, true);
         let author = signer.author();
 
         let twin_id = TwinId { id, author };
@@ -277,7 +292,9 @@ impl NodeSetup {
             10, // max pruned blocks in mem
             time_service.clone(),
             10,
-            Arc::from(PayloadManager::DirectMempool),
+            Arc::from(DirectMempoolPayloadManager::new()),
+            false,
+            Arc::new(Mutex::new(PendingBlocks::new())),
         ));
 
         let proposer_election = Self::create_proposer_election(proposers.clone());
@@ -287,11 +304,11 @@ impl NodeSetup {
             Arc::new(MockPayloadManager::new(None)),
             time_service.clone(),
             Duration::ZERO,
+            PayloadTxnsSize::new(20, 1000),
             10,
-            1000,
-            5,
-            500,
+            PayloadTxnsSize::new(5, 500),
             10,
+            1,
             PipelineBackpressureConfig::new_no_backoff(),
             ChainHealthBackoffConfig::new_no_backoff(),
             false,
@@ -349,7 +366,7 @@ impl NodeSetup {
     pub fn restart(self, playground: &mut NetworkPlayground, executor: Handle) -> Self {
         let recover_data = self
             .storage
-            .try_start()
+            .try_start(self.onchain_consensus_config.order_vote_enabled())
             .unwrap_or_else(|e| panic!("fail to restart due to: {}", e));
         Self::new(
             playground,
@@ -905,7 +922,11 @@ fn no_vote_on_mismatch_round() {
     timed_block_on(&runtime, async {
         let bad_proposal = ProposalMsg::new(
             block_skip_round,
-            SyncInfo::new(genesis_qc.clone(), genesis_qc.clone(), None),
+            SyncInfo::new(
+                genesis_qc.clone(),
+                genesis_qc.into_wrapped_ledger_info(),
+                None,
+            ),
         );
         assert!(node
             .round_manager
@@ -914,7 +935,11 @@ fn no_vote_on_mismatch_round() {
             .is_err());
         let good_proposal = ProposalMsg::new(
             correct_block.clone(),
-            SyncInfo::new(genesis_qc.clone(), genesis_qc.clone(), None),
+            SyncInfo::new(
+                genesis_qc.clone(),
+                genesis_qc.into_wrapped_ledger_info(),
+                None,
+            ),
         );
         node.round_manager
             .process_proposal_msg(good_proposal)
@@ -970,7 +995,7 @@ fn sync_info_carried_on_timeout_vote() {
             .round_state
             .process_certificates(SyncInfo::new(
                 block_0_quorum_cert.clone(),
-                block_0_quorum_cert.clone(),
+                block_0_quorum_cert.into_wrapped_ledger_info(),
                 None,
             ));
         node.round_manager
@@ -1027,7 +1052,11 @@ fn no_vote_on_invalid_proposer() {
     timed_block_on(&runtime, async {
         let bad_proposal = ProposalMsg::new(
             block_incorrect_proposer,
-            SyncInfo::new(genesis_qc.clone(), genesis_qc.clone(), None),
+            SyncInfo::new(
+                genesis_qc.clone(),
+                genesis_qc.into_wrapped_ledger_info(),
+                None,
+            ),
         );
         assert!(node
             .round_manager
@@ -1036,7 +1065,11 @@ fn no_vote_on_invalid_proposer() {
             .is_err());
         let good_proposal = ProposalMsg::new(
             correct_block.clone(),
-            SyncInfo::new(genesis_qc.clone(), genesis_qc.clone(), None),
+            SyncInfo::new(
+                genesis_qc.clone(),
+                genesis_qc.into_wrapped_ledger_info(),
+                None,
+            ),
         );
 
         node.round_manager
@@ -1096,7 +1129,11 @@ fn new_round_on_timeout_certificate() {
     timed_block_on(&runtime, async {
         let skip_round_proposal = ProposalMsg::new(
             block_skip_round,
-            SyncInfo::new(genesis_qc.clone(), genesis_qc.clone(), Some(tc)),
+            SyncInfo::new(
+                genesis_qc.clone(),
+                genesis_qc.into_wrapped_ledger_info(),
+                Some(tc),
+            ),
         );
         node.round_manager
             .process_proposal_msg(skip_round_proposal)
@@ -1104,7 +1141,11 @@ fn new_round_on_timeout_certificate() {
             .unwrap();
         let old_good_proposal = ProposalMsg::new(
             correct_block.clone(),
-            SyncInfo::new(genesis_qc.clone(), genesis_qc.clone(), None),
+            SyncInfo::new(
+                genesis_qc.clone(),
+                genesis_qc.into_wrapped_ledger_info(),
+                None,
+            ),
         );
         assert!(node
             .round_manager
@@ -1160,7 +1201,7 @@ fn reject_invalid_failed_authors() {
             block,
             SyncInfo::new(
                 genesis_qc.clone(),
-                genesis_qc.clone(),
+                genesis_qc.into_wrapped_ledger_info(),
                 if round > 1 {
                     Some(create_timeout(round - 1))
                 } else {
@@ -1241,7 +1282,14 @@ fn response_on_block_retrieval() {
     )
     .unwrap();
     let block_id = block.id();
-    let proposal = ProposalMsg::new(block, SyncInfo::new(genesis_qc.clone(), genesis_qc, None));
+    let proposal = ProposalMsg::new(
+        block,
+        SyncInfo::new(
+            genesis_qc.clone(),
+            genesis_qc.into_wrapped_ledger_info(),
+            None,
+        ),
+    );
 
     timed_block_on(&runtime, async {
         node.round_manager
@@ -1379,7 +1427,7 @@ fn recover_on_restart() {
                 proposal.clone(),
                 SyncInfo::new(
                     proposal.quorum_cert().clone(),
-                    genesis_qc.clone(),
+                    genesis_qc.into_wrapped_ledger_info(),
                     Some(tc.clone()),
                 ),
             );
@@ -1534,7 +1582,11 @@ fn sync_on_partial_newer_sync_info() {
             None,
         );
         // Create a sync info with newer quorum cert but older commit cert
-        let sync_info = SyncInfo::new(block_4_qc.clone(), certificate_for_genesis(), None);
+        let sync_info = SyncInfo::new(
+            block_4_qc.clone(),
+            certificate_for_genesis().into_wrapped_ledger_info(),
+            None,
+        );
         node.round_manager
             .ensure_round_and_sync_up(
                 sync_info.highest_round() + 1,
@@ -1802,6 +1854,75 @@ fn block_retrieval_test() {
     });
 }
 
+#[test]
+fn block_retrieval_timeout_test() {
+    let runtime = consensus_runtime();
+    let mut playground = NetworkPlayground::new(runtime.handle().clone());
+    let mut nodes = NodeSetup::create_nodes(
+        &mut playground,
+        runtime.handle().clone(),
+        4,
+        Some(vec![0, 1]),
+        None,
+        None,
+        None,
+        None,
+    );
+    let timeout_config = playground.timeout_config();
+    runtime.spawn(playground.start());
+
+    for i in 0..4 {
+        info!("processing {}", i);
+        process_and_vote_on_proposal(
+            &runtime,
+            &mut nodes,
+            i as usize % 2,
+            &[3],
+            true,
+            None,
+            true,
+            i + 1,
+            i.saturating_sub(1),
+            0,
+        );
+    }
+
+    timed_block_on(&runtime, async {
+        let mut behind_node = nodes.pop().unwrap();
+
+        for node in nodes.iter() {
+            timeout_config.write().timeout_message_for(
+                &TwinId {
+                    id: behind_node.id,
+                    author: behind_node.signer.author(),
+                },
+                &TwinId {
+                    id: node.id,
+                    author: node.signer.author(),
+                },
+            );
+        }
+
+        // Drain the queue on other nodes
+        for node in nodes.iter_mut() {
+            let _ = node.next_proposal().await;
+        }
+
+        info!(
+            "Processing proposals for behind node {}",
+            behind_node.identity_desc()
+        );
+
+        let proposal_msg = behind_node.next_proposal().await;
+        behind_node
+            .round_manager
+            .process_proposal_msg(proposal_msg)
+            .await
+            .unwrap_err();
+    });
+}
+
+#[ignore] // TODO: turn this test back on once the flakes have resolved.
 #[test]
 pub fn forking_retrieval_test() {
     let runtime = consensus_runtime();
@@ -2193,9 +2314,10 @@ fn no_vote_on_proposal_ext_when_receiving_limit_exceeded() {
     let runtime = consensus_runtime();
     let mut playground = NetworkPlayground::new(runtime.handle().clone());
 
-    let alg_config = ConsensusAlgorithmConfig::Jolteon {
+    let alg_config = ConsensusAlgorithmConfig::JolteonV2 {
         main: ConsensusConfigV1::default(),
         quorum_store_enabled: true,
+        order_vote_enabled: false,
     };
     let vtxn_config = ValidatorTxnConfig::V1 {
         per_block_limit_txn_count: 5,
diff --git a/consensus/src/state_computer.rs b/consensus/src/state_computer.rs
index 2b635c06f94af..c4d155d622b54 100644
--- a/consensus/src/state_computer.rs
+++ b/consensus/src/state_computer.rs
@@ -9,7 +9,7 @@ use crate::{
     error::StateSyncError,
     execution_pipeline::ExecutionPipeline,
     monitor,
-    payload_manager::PayloadManager,
+    payload_manager::TPayloadManager,
     state_replication::{StateComputer, StateComputerCommitCallBackType},
     transaction_deduper::TransactionDeduper,
     transaction_filter::TransactionFilter,
@@ -34,7 +34,7 @@ use aptos_types::{
 };
 use fail::fail_point;
 use futures::{future::BoxFuture, SinkExt, StreamExt};
-use std::{boxed::Box, sync::Arc};
+use std::{boxed::Box, sync::Arc, time::Duration};
 use tokio::sync::Mutex as AsyncMutex;
 
 pub type StateComputeResultFut = BoxFuture<'static, ExecutorResult<PipelineExecutionResult>>;
@@ -43,11 +43,20 @@ pub type StateComputeResultFut = BoxFuture<'static, ExecutorResult<PipelineExecu
 pub struct PipelineExecutionResult {
     pub input_txns: Vec<SignedTransaction>,
     pub result: StateComputeResult,
+    pub execution_time: Duration,
 }
 
 impl PipelineExecutionResult {
-    pub fn new(input_txns: Vec<SignedTransaction>, result: StateComputeResult) -> Self {
-        Self { input_txns, result }
+    pub fn new(
+        input_txns: Vec<SignedTransaction>,
+        result: StateComputeResult,
+        execution_time: Duration,
+    ) -> Self {
+        Self {
+            input_txns,
+            result,
+            execution_time,
+        }
     }
 }
 
@@ -72,7 +81,7 @@ impl LogicalTime {
 #[derive(Clone)]
 struct MutableState {
     validators: Arc<[AccountAddress]>,
-    payload_manager: Arc<PayloadManager>,
+    payload_manager: Arc<dyn TPayloadManager>,
     transaction_shuffler: Arc<dyn TransactionShuffler>,
     block_executor_onchain_config: BlockExecutorConfigFromOnchain,
     transaction_deduper: Arc<dyn TransactionDeduper>,
@@ -304,7 +313,7 @@ impl StateComputer for ExecutionProxy {
             "commit_block",
             tokio::task::spawn_blocking(move || {
                 executor
-                    .commit_blocks_ext(block_ids, proof, false)
+                    .commit_blocks(block_ids, proof)
                     .expect("Failed to commit blocks");
             })
             .await
@@ -382,7 +391,7 @@ impl StateComputer for ExecutionProxy {
     fn new_epoch(
         &self,
         epoch_state: &EpochState,
-        payload_manager: Arc<PayloadManager>,
+        payload_manager: Arc<dyn TPayloadManager>,
         transaction_shuffler: Arc<dyn TransactionShuffler>,
         block_executor_onchain_config: BlockExecutorConfigFromOnchain,
         transaction_deduper: Arc<dyn TransactionDeduper>,
@@ -412,7 +421,8 @@ impl StateComputer for ExecutionProxy {
 #[tokio::test]
 async fn test_commit_sync_race() {
     use crate::{
-        error::MempoolError, transaction_deduper::create_transaction_deduper,
+        error::MempoolError, payload_manager::DirectMempoolPayloadManager,
+        transaction_deduper::create_transaction_deduper,
         transaction_shuffler::create_transaction_shuffler,
     };
     use aptos_config::config::transaction_filter_type::Filter;
@@ -468,11 +478,10 @@ async fn test_commit_sync_race() {
             todo!()
         }
 
-        fn commit_blocks_ext(
+        fn commit_blocks(
             &self,
             _block_ids: Vec<HashValue>,
             ledger_info_with_sigs: LedgerInfoWithSignatures,
-            _save_state_snapshots: bool,
         ) -> ExecutorResult<()> {
             *self.time.lock() = LogicalTime::new(
                 ledger_info_with_sigs.ledger_info().epoch(),
@@ -544,7 +553,7 @@ async fn test_commit_sync_race() {
 
     executor.new_epoch(
         &EpochState::empty(),
-        Arc::new(PayloadManager::DirectMempool),
+        Arc::new(DirectMempoolPayloadManager {}),
         create_transaction_shuffler(TransactionShufflerType::NoShuffling),
         BlockExecutorConfigFromOnchain::new_no_block_limit(),
         create_transaction_deduper(TransactionDeduperType::NoDedup),
diff --git a/consensus/src/state_computer_tests.rs b/consensus/src/state_computer_tests.rs
index 308eeeaea8729..4a2affadfc0b2 100644
--- a/consensus/src/state_computer_tests.rs
+++ b/consensus/src/state_computer_tests.rs
@@ -2,10 +2,10 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{
-    error::MempoolError, payload_manager::PayloadManager, state_computer::ExecutionProxy,
-    state_replication::StateComputer, transaction_deduper::NoOpDeduper,
-    transaction_filter::TransactionFilter, transaction_shuffler::NoOpShuffler,
-    txn_notifier::TxnNotifier,
+    error::MempoolError, payload_manager::DirectMempoolPayloadManager,
+    state_computer::ExecutionProxy, state_replication::StateComputer,
+    transaction_deduper::NoOpDeduper, transaction_filter::TransactionFilter,
+    transaction_shuffler::NoOpShuffler, txn_notifier::TxnNotifier,
 };
 use aptos_config::config::transaction_filter_type::Filter;
 use aptos_consensus_notifications::{ConsensusNotificationSender, Error};
@@ -121,11 +121,10 @@ impl BlockExecutorTrait for DummyBlockExecutor {
         Ok(StateComputeResult::new_dummy())
     }
 
-    fn commit_blocks_ext(
+    fn commit_blocks(
         &self,
         _block_ids: Vec<HashValue>,
         _ledger_info_with_sigs: LedgerInfoWithSignatures,
-        _save_state_snapshots: bool,
     ) -> ExecutorResult<()> {
         Ok(())
     }
@@ -136,6 +135,8 @@ impl BlockExecutorTrait for DummyBlockExecutor {
 #[tokio::test]
 #[cfg(test)]
 async fn schedule_compute_should_discover_validator_txns() {
+    use crate::payload_manager::DirectMempoolPayloadManager;
+
     let executor = Arc::new(DummyBlockExecutor::new());
 
     let execution_policy = ExecutionProxy::new(
@@ -162,7 +163,7 @@ async fn schedule_compute_should_discover_validator_txns() {
 
     execution_policy.new_epoch(
         &epoch_state,
-        Arc::new(PayloadManager::DirectMempool),
+        Arc::new(DirectMempoolPayloadManager::new()),
         Arc::new(NoOpShuffler {}),
         BlockExecutorConfigFromOnchain::new_no_block_limit(),
         Arc::new(NoOpDeduper {}),
@@ -228,7 +229,7 @@ async fn commit_should_discover_validator_txns() {
 
     execution_policy.new_epoch(
         &epoch_state,
-        Arc::new(PayloadManager::DirectMempool),
+        Arc::new(DirectMempoolPayloadManager::new()),
         Arc::new(NoOpShuffler {}),
         BlockExecutorConfigFromOnchain::new_no_block_limit(),
         Arc::new(NoOpDeduper {}),
diff --git a/consensus/src/state_replication.rs b/consensus/src/state_replication.rs
index 26da5fa80d163..881213fca6d09 100644
--- a/consensus/src/state_replication.rs
+++ b/consensus/src/state_replication.rs
@@ -3,11 +3,8 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{
-    error::StateSyncError,
-    payload_manager::PayloadManager,
-    state_computer::{PipelineExecutionResult, StateComputeResultFut},
-    transaction_deduper::TransactionDeduper,
-    transaction_shuffler::TransactionShuffler,
+    error::StateSyncError, payload_manager::TPayloadManager, state_computer::StateComputeResultFut,
+    transaction_deduper::TransactionDeduper, transaction_shuffler::TransactionShuffler,
 };
 use anyhow::Result;
 use aptos_consensus_types::{block::Block, pipelined_block::PipelinedBlock};
@@ -27,22 +24,6 @@ pub type StateComputerCommitCallBackType =
 /// StateComputer is using proposed block ids for identifying the transactions.
 #[async_trait::async_trait]
 pub trait StateComputer: Send + Sync {
-    /// How to execute a sequence of transactions and obtain the next state. While some of the
-    /// transactions succeed, some of them can fail.
-    /// In case all the transactions are failed, new_state_id is equal to the previous state id.
-    async fn compute(
-        &self,
-        // The block that will be computed.
-        block: &Block,
-        // The parent block root hash.
-        parent_block_id: HashValue,
-        randomness: Option<Randomness>,
-    ) -> ExecutorResult<PipelineExecutionResult> {
-        self.schedule_compute(block, parent_block_id, randomness)
-            .await
-            .await
-    }
-
     async fn schedule_compute(
         &self,
         // The block that will be computed.
@@ -72,7 +53,7 @@ pub trait StateComputer: Send + Sync {
     fn new_epoch(
         &self,
         epoch_state: &EpochState,
-        payload_manager: Arc<PayloadManager>,
+        payload_manager: Arc<dyn TPayloadManager>,
         transaction_shuffler: Arc<dyn TransactionShuffler>,
         block_executor_onchain_config: BlockExecutorConfigFromOnchain,
         transaction_deduper: Arc<dyn TransactionDeduper>,
diff --git a/consensus/src/test_utils/mock_execution_client.rs b/consensus/src/test_utils/mock_execution_client.rs
index 02a20aba62acb..30063920d5d83 100644
--- a/consensus/src/test_utils/mock_execution_client.rs
+++ b/consensus/src/test_utils/mock_execution_client.rs
@@ -5,7 +5,7 @@
 use crate::{
     error::StateSyncError,
     network::{IncomingCommitRequest, IncomingRandGenRequest},
-    payload_manager::PayloadManager,
+    payload_manager::{DirectMempoolPayloadManager, TPayloadManager},
     pipeline::{
         buffer_manager::OrderedBlocks, execution_client::TExecutionClient,
         signing_phase::CommitSignerProvider,
@@ -40,7 +40,7 @@ pub struct MockExecutionClient {
     executor_channel: UnboundedSender<OrderedBlocks>,
     consensus_db: Arc<MockStorage>,
     block_cache: Mutex<HashMap<HashValue, Payload>>,
-    payload_manager: Arc<PayloadManager>,
+    payload_manager: Arc<dyn TPayloadManager>,
 }
 
 impl MockExecutionClient {
@@ -54,7 +54,7 @@ impl MockExecutionClient {
             executor_channel,
             consensus_db,
             block_cache: Mutex::new(HashMap::new()),
-            payload_manager: Arc::from(PayloadManager::DirectMempool),
+            payload_manager: Arc::from(DirectMempoolPayloadManager::new()),
         }
     }
 
@@ -96,14 +96,14 @@ impl TExecutionClient for MockExecutionClient {
         &self,
         _epoch_state: Arc<EpochState>,
         _commit_signer_provider: Arc<dyn CommitSignerProvider>,
-        _payload_manager: Arc<PayloadManager>,
+        _payload_manager: Arc<dyn TPayloadManager>,
         _onchain_consensus_config: &OnChainConsensusConfig,
         _onchain_execution_config: &OnChainExecutionConfig,
         _onchain_randomness_config: &OnChainRandomnessConfig,
         _rand_config: Option<RandConfig>,
         _fast_rand_config: Option<RandConfig>,
         _rand_msg_rx: aptos_channel::Receiver<AccountAddress, IncomingRandGenRequest>,
-        _highest_ordered_round: Round,
+        _highest_committed_round: Round,
     ) {
     }
 
@@ -171,5 +171,9 @@ impl TExecutionClient for MockExecutionClient {
         Ok(())
     }
 
+    async fn reset(&self, _target: &LedgerInfoWithSignatures) -> Result<()> {
+        Ok(())
+    }
+
     async fn end_epoch(&self) {}
 }
diff --git a/consensus/src/test_utils/mock_payload_manager.rs b/consensus/src/test_utils/mock_payload_manager.rs
index d28337e51ebfe..e62ec85b1ea9a 100644
--- a/consensus/src/test_utils/mock_payload_manager.rs
+++ b/consensus/src/test_utils/mock_payload_manager.rs
@@ -3,13 +3,13 @@
 
 use crate::{
     error::QuorumStoreError,
-    payload_client::{user::quorum_store_client::QuorumStoreClient, PayloadClient},
+    payload_client::{
+        user::quorum_store_client::QuorumStoreClient, PayloadClient, PayloadPullParameters,
+    },
 };
 use anyhow::Result;
 use aptos_consensus_types::{
-    block::block_test_utils::random_payload,
-    common::{Payload, PayloadFilter},
-    request_response::GetPayloadCommand,
+    block::block_test_utils::random_payload, common::Payload, request_response::GetPayloadCommand,
 };
 use aptos_types::{
     transaction::{ExecutionStatus, TransactionStatus},
@@ -19,7 +19,6 @@ use aptos_types::{
 use aptos_validator_transaction_pool as vtxn_pool;
 use futures::{channel::mpsc, future::BoxFuture};
 use rand::Rng;
-use std::time::Duration;
 
 #[allow(dead_code)]
 pub struct MockPayloadManager {
@@ -56,17 +55,9 @@ impl PayloadClient for MockPayloadManager {
     /// The returned future is fulfilled with the vector of SignedTransactions
     async fn pull_payload(
         &self,
-        _max_poll_time: Duration,
-        _max_size: u64,
-        _max_bytes: u64,
-        _max_inline_size: u64,
-        _max_inline_bytes: u64,
+        _params: PayloadPullParameters,
         _validator_txn_filter: vtxn_pool::TransactionFilter,
-        _user_txn_filter: PayloadFilter,
         _wait_callback: BoxFuture<'static, ()>,
-        _pending_ordering: bool,
-        _pending_uncommitted_blocks: usize,
-        _recent_fill_fraction: f32,
     ) -> Result<(Vec<ValidatorTransaction>, Payload), QuorumStoreError> {
         // generate 1k txn is too slow with coverage instrumentation
         Ok((
diff --git a/consensus/src/test_utils/mock_quorum_store_sender.rs b/consensus/src/test_utils/mock_quorum_store_sender.rs
index affff1103b49e..bd962d348b51f 100644
--- a/consensus/src/test_utils/mock_quorum_store_sender.rs
+++ b/consensus/src/test_utils/mock_quorum_store_sender.rs
@@ -26,13 +26,6 @@ impl MockQuorumStoreSender {
 
 #[async_trait::async_trait]
 impl QuorumStoreSender for MockQuorumStoreSender {
-    async fn send_batch_request(&self, request: BatchRequest, recipients: Vec<Author>) {
-        self.tx
-            .send((ConsensusMsg::BatchRequestMsg(Box::new(request)), recipients))
-            .await
-            .expect("could not send");
-    }
-
     async fn request_batch(
         &self,
         _request: BatchRequest,
@@ -42,13 +35,6 @@ impl QuorumStoreSender for MockQuorumStoreSender {
         unimplemented!();
     }
 
-    async fn send_batch(&self, batch: Batch, recipients: Vec<Author>) {
-        self.tx
-            .send((ConsensusMsg::BatchResponse(Box::new(batch)), recipients))
-            .await
-            .expect("could not send");
-    }
-
     async fn send_signed_batch_info_msg(
         &self,
         signed_batch_infos: Vec<SignedBatchInfo>,
@@ -76,7 +62,7 @@ impl QuorumStoreSender for MockQuorumStoreSender {
                 vec![],
             ))
             .await
-            .unwrap();
+            .expect("We should be able to send the proof of store message");
     }
 
     async fn send_proof_of_store_msg_to_self(&mut self, _proof_of_stores: Vec<ProofOfStore>) {
diff --git a/consensus/src/test_utils/mock_state_computer.rs b/consensus/src/test_utils/mock_state_computer.rs
index aeef2a0ef6e97..50d377fa7d794 100644
--- a/consensus/src/test_utils/mock_state_computer.rs
+++ b/consensus/src/test_utils/mock_state_computer.rs
@@ -4,7 +4,7 @@
 
 use crate::{
     error::StateSyncError,
-    payload_manager::PayloadManager,
+    payload_manager::TPayloadManager,
     pipeline::buffer_manager::OrderedBlocks,
     state_computer::{PipelineExecutionResult, StateComputeResultFut},
     state_replication::{StateComputer, StateComputerCommitCallBackType},
@@ -22,7 +22,7 @@ use aptos_types::{
 };
 use futures::SinkExt;
 use futures_channel::mpsc::UnboundedSender;
-use std::sync::Arc;
+use std::{sync::Arc, time::Duration};
 
 pub struct EmptyStateComputer {
     executor_channel: UnboundedSender<OrderedBlocks>,
@@ -36,18 +36,6 @@ impl EmptyStateComputer {
 
 #[async_trait::async_trait]
 impl StateComputer for EmptyStateComputer {
-    async fn compute(
-        &self,
-        _block: &Block,
-        _parent_block_id: HashValue,
-        _randomness: Option<Randomness>,
-    ) -> ExecutorResult<PipelineExecutionResult> {
-        Ok(PipelineExecutionResult::new(
-            vec![],
-            StateComputeResult::new_dummy(),
-        ))
-    }
-
     async fn commit(
         &self,
         blocks: &[Arc<PipelinedBlock>],
@@ -83,7 +71,7 @@ impl StateComputer for EmptyStateComputer {
     fn new_epoch(
         &self,
         _: &EpochState,
-        _: Arc<PayloadManager>,
+        _: Arc<dyn TPayloadManager>,
         _: Arc<dyn TransactionShuffler>,
         _: BlockExecutorConfigFromOnchain,
         _: Arc<dyn TransactionDeduper>,
@@ -129,7 +117,8 @@ impl StateComputer for RandomComputeResultStateComputer {
                 self.random_compute_result_root_hash,
             ))
         };
-        let pipeline_execution_res = res.map(|res| PipelineExecutionResult::new(vec![], res));
+        let pipeline_execution_res =
+            res.map(|res| PipelineExecutionResult::new(vec![], res, Duration::from_secs(0)));
         Box::pin(async move { pipeline_execution_res })
     }
 
@@ -149,7 +138,7 @@ impl StateComputer for RandomComputeResultStateComputer {
     fn new_epoch(
         &self,
         _: &EpochState,
-        _: Arc<PayloadManager>,
+        _: Arc<dyn TPayloadManager>,
         _: Arc<dyn TransactionShuffler>,
         _: BlockExecutorConfigFromOnchain,
         _: Arc<dyn TransactionDeduper>,
diff --git a/consensus/src/test_utils/mock_storage.rs b/consensus/src/test_utils/mock_storage.rs
index 8f3e67c3ccffb..76b56d8a1b5ba 100644
--- a/consensus/src/test_utils/mock_storage.rs
+++ b/consensus/src/test_utils/mock_storage.rs
@@ -100,7 +100,7 @@ impl MockStorage {
         ))
     }
 
-    pub fn try_start(&self) -> Result<RecoveryData> {
+    pub fn try_start(&self, order_vote_enabled: bool) -> Result<RecoveryData> {
         let ledger_recovery_data = self.get_ledger_recovery_data();
         let mut blocks: Vec<_> = self
             .shared_storage
@@ -130,18 +130,20 @@ impl MockStorage {
             RootMetadata::new_empty(),
             quorum_certs,
             qc,
+            order_vote_enabled,
         )
     }
 
     pub fn verify_consistency(&self) -> Result<()> {
-        self.try_start().map(|_| ())
+        // TODO: Also test by setting order_vote_enabled to true
+        self.try_start(false).map(|_| ())
     }
 
     pub fn start_for_testing(validator_set: ValidatorSet) -> (RecoveryData, Arc<Self>) {
         let shared_storage = Arc::new(MockSharedStorage::new(validator_set.clone()));
         let genesis_li = LedgerInfo::mock_genesis(Some(validator_set));
         let storage = Self::new_with_ledger_info(shared_storage, genesis_li);
-        let recovery_data = match storage.start() {
+        let recovery_data = match storage.start(false) {
             LivenessStorageData::FullRecoveryData(recovery_data) => recovery_data,
             _ => panic!("Mock storage should never fail constructing recovery data"),
         };
@@ -201,8 +203,8 @@ impl PersistentLivenessStorage for MockStorage {
         self.get_ledger_recovery_data()
     }
 
-    fn start(&self) -> LivenessStorageData {
-        match self.try_start() {
+    fn start(&self, order_vote_enabled: bool) -> LivenessStorageData {
+        match self.try_start(order_vote_enabled) {
             Ok(recovery_data) => LivenessStorageData::FullRecoveryData(recovery_data),
             Err(_) => LivenessStorageData::PartialRecoveryData(self.recover_from_ledger()),
         }
@@ -249,7 +251,7 @@ impl EmptyStorage {
 
     pub fn start_for_testing() -> (RecoveryData, Arc<Self>) {
         let storage = Arc::new(EmptyStorage::new());
-        let recovery_data = match storage.start() {
+        let recovery_data = match storage.start(false) {
             LivenessStorageData::FullRecoveryData(recovery_data) => recovery_data,
             _ => panic!("Mock storage should never fail constructing recovery data"),
         };
@@ -277,7 +279,7 @@ impl PersistentLivenessStorage for EmptyStorage {
         ))
     }
 
-    fn start(&self) -> LivenessStorageData {
+    fn start(&self, order_vote_enabled: bool) -> LivenessStorageData {
         match RecoveryData::new(
             None,
             self.recover_from_ledger(),
@@ -285,6 +287,7 @@ impl PersistentLivenessStorage for EmptyStorage {
             RootMetadata::new_empty(),
             vec![],
             None,
+            order_vote_enabled,
         ) {
             Ok(recovery_data) => LivenessStorageData::FullRecoveryData(recovery_data),
             Err(e) => {
diff --git a/consensus/src/test_utils/mod.rs b/consensus/src/test_utils/mod.rs
index 453ee65b9b0f8..b556d9bfc7ed8 100644
--- a/consensus/src/test_utils/mod.rs
+++ b/consensus/src/test_utils/mod.rs
@@ -2,7 +2,11 @@
 // Parts of the project are originally copyright © Meta Platforms, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::block_storage::{BlockReader, BlockStore};
+#![allow(clippy::unwrap_used)]
+use crate::{
+    block_storage::{BlockReader, BlockStore},
+    payload_manager::DirectMempoolPayloadManager,
+};
 use aptos_consensus_types::{
     block::{block_test_utils::certificate_for_genesis, Block},
     common::{Author, Round},
@@ -25,11 +29,12 @@ mod mock_state_computer;
 mod mock_storage;
 
 use crate::{
-    payload_manager::PayloadManager, pipeline::execution_client::DummyExecutionClient,
+    block_storage::pending_blocks::PendingBlocks, pipeline::execution_client::DummyExecutionClient,
     util::mock_time_service::SimulatedTimeService,
 };
 use aptos_consensus_types::{block::block_test_utils::gen_test_certificate, common::Payload};
 use aptos_crypto::ed25519::{Ed25519PrivateKey, Ed25519Signature};
+use aptos_infallible::Mutex;
 use aptos_types::{
     block_info::BlockInfo,
     chain_id::ChainId,
@@ -88,7 +93,9 @@ pub fn build_empty_tree() -> Arc<BlockStore> {
         10, // max pruned blocks in mem
         Arc::new(SimulatedTimeService::new()),
         10,
-        Arc::from(PayloadManager::DirectMempool),
+        Arc::from(DirectMempoolPayloadManager::new()),
+        false,
+        Arc::new(Mutex::new(PendingBlocks::new())),
     ))
 }
 
@@ -201,7 +208,11 @@ pub fn placeholder_ledger_info() -> LedgerInfo {
 }
 
 pub fn placeholder_sync_info() -> SyncInfo {
-    SyncInfo::new(certificate_for_genesis(), certificate_for_genesis(), None)
+    SyncInfo::new(
+        certificate_for_genesis(),
+        certificate_for_genesis().into_wrapped_ledger_info(),
+        None,
+    )
 }
 
 fn nocapture() -> bool {
diff --git a/consensus/src/transaction_shuffler/fairness/conflict_key/entry_fun.rs b/consensus/src/transaction_shuffler/deprecated_fairness/conflict_key/entry_fun.rs
similarity index 94%
rename from consensus/src/transaction_shuffler/fairness/conflict_key/entry_fun.rs
rename to consensus/src/transaction_shuffler/deprecated_fairness/conflict_key/entry_fun.rs
index 140191b1d523f..7a3363dd9e959 100644
--- a/consensus/src/transaction_shuffler/fairness/conflict_key/entry_fun.rs
+++ b/consensus/src/transaction_shuffler/deprecated_fairness/conflict_key/entry_fun.rs
@@ -1,7 +1,7 @@
 // Copyright © Aptos Foundation
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::transaction_shuffler::fairness::conflict_key::ConflictKey;
+use crate::transaction_shuffler::deprecated_fairness::conflict_key::ConflictKey;
 use aptos_types::transaction::{SignedTransaction, TransactionPayload};
 use move_core_types::{identifier::Identifier, language_storage::ModuleId};
 
diff --git a/consensus/src/transaction_shuffler/fairness/conflict_key/entry_fun_module.rs b/consensus/src/transaction_shuffler/deprecated_fairness/conflict_key/entry_fun_module.rs
similarity index 93%
rename from consensus/src/transaction_shuffler/fairness/conflict_key/entry_fun_module.rs
rename to consensus/src/transaction_shuffler/deprecated_fairness/conflict_key/entry_fun_module.rs
index 56979f98d6d29..948d2e8baa330 100644
--- a/consensus/src/transaction_shuffler/fairness/conflict_key/entry_fun_module.rs
+++ b/consensus/src/transaction_shuffler/deprecated_fairness/conflict_key/entry_fun_module.rs
@@ -1,7 +1,7 @@
 // Copyright © Aptos Foundation
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::transaction_shuffler::fairness::conflict_key::ConflictKey;
+use crate::transaction_shuffler::deprecated_fairness::conflict_key::ConflictKey;
 use aptos_types::transaction::{SignedTransaction, TransactionPayload};
 use move_core_types::language_storage::ModuleId;
 
diff --git a/consensus/src/transaction_shuffler/deprecated_fairness/conflict_key/mod.rs b/consensus/src/transaction_shuffler/deprecated_fairness/conflict_key/mod.rs
new file mode 100644
index 0000000000000..1e233dbdc29fc
--- /dev/null
+++ b/consensus/src/transaction_shuffler/deprecated_fairness/conflict_key/mod.rs
@@ -0,0 +1,117 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::transaction_shuffler::deprecated_fairness::TxnIdx;
+use std::{collections::HashMap, hash::Hash};
+
+pub(crate) mod entry_fun;
+pub(crate) mod entry_fun_module;
+pub(crate) mod txn_sender;
+
+#[cfg(test)]
+pub(crate) mod test_utils;
+
+/// `ConflictKey::extract_from(txn)` extracts a key from a transaction. For example,
+/// `TxnSenderKey::extract_from(txn)` returns the transaction sender's address. The key is used by
+/// the shuffler to determine whether two close by transactions conflict with each other.
+///
+/// `ConflictKey::conflict_exempt(&key)` returns if this specific key is exempt from conflict.
+/// For example, we can exempt transaction sender 0x1, so that consecutive transactions sent by
+/// 0x1 are not seen as a conflict by the shuffler.
+pub(crate) trait ConflictKey<Txn>: Eq + Hash + PartialEq {
+    fn extract_from(txn: &Txn) -> Self;
+
+    fn conflict_exempt(&self) -> bool;
+}
+
+#[derive(Clone, Copy, Debug)]
+pub(crate) struct ConflictKeyId(usize);
+
+impl ConflictKeyId {
+    pub fn as_idx(&self) -> usize {
+        self.0
+    }
+}
+
+/// `ConflictKeyRegistry::build::<K: ConflictKey>()` goes through a block of transactions and
+/// extract the conflict keys from each transaction. In that process, each unique conflict key is
+/// assigned a unique `ConflictKeyId`, essentially a sequence number, and the registry remembers which
+/// key was extracted from each transaction. After that, we can query the registry to get the key
+/// represented by the id, which is 1. cheaper than calling `ConflictKey::extract_from(txn)` again;
+/// 2. enables vector based `MapByKeyId` which is cheaper than a `HashMap`; and 3. eliminates the typing
+/// information and easier to use in the shuffler.
+#[derive(Debug)]
+pub(crate) struct ConflictKeyRegistry {
+    id_by_txn: Vec<ConflictKeyId>,
+    is_exempt_by_id: Vec<bool>,
+}
+
+// Provided `ConflictKeyId`s managed by `ConflictKeyRegistry`s are consecutive integers starting
+// from 0, a map can be implemented based on a vector, which is cheapter than a hash map.
+#[derive(Debug, Eq, PartialEq)]
+pub(crate) struct MapByKeyId<T> {
+    inner: Vec<T>,
+}
+
+impl<T: Default> MapByKeyId<T> {
+    pub fn new(size: usize) -> Self {
+        let mut inner = Vec::with_capacity(size);
+        inner.resize_with(size, Default::default);
+
+        Self { inner }
+    }
+
+    pub fn get(&self, key_id: ConflictKeyId) -> &T {
+        &self.inner[key_id.as_idx()]
+    }
+
+    pub fn get_mut(&mut self, key_id: ConflictKeyId) -> &mut T {
+        &mut self.inner[key_id.as_idx()]
+    }
+}
+
+impl ConflictKeyRegistry {
+    pub fn build<K, Txn>(txns: &[Txn]) -> Self
+    where
+        K: ConflictKey<Txn>,
+    {
+        let mut registry = HashMap::<K, ConflictKeyId>::new();
+        let mut is_exempt_by_id = Vec::new();
+
+        let id_by_txn = txns
+            .iter()
+            .map(|txn| {
+                let key = K::extract_from(txn);
+                *registry.entry(key).or_insert_with_key(|key| {
+                    is_exempt_by_id.push(key.conflict_exempt());
+                    ConflictKeyId(is_exempt_by_id.len() - 1)
+                })
+            })
+            .collect();
+
+        Self {
+            id_by_txn,
+            is_exempt_by_id,
+        }
+    }
+
+    fn num_ids(&self) -> usize {
+        self.is_exempt_by_id.len()
+    }
+
+    pub fn num_txns(&self) -> usize {
+        self.id_by_txn.len()
+    }
+
+    pub fn new_map_by_id<T: Default>(&self) -> MapByKeyId<T> {
+        MapByKeyId::new(self.num_ids())
+    }
+
+    pub fn key_id_for_txn(&self, txn_idx: TxnIdx) -> ConflictKeyId {
+        self.id_by_txn[txn_idx]
+    }
+
+    pub fn is_conflict_exempt(&self, key_id: ConflictKeyId) -> bool {
+        self.is_exempt_by_id[key_id.0]
+    }
+}
diff --git a/consensus/src/transaction_shuffler/deprecated_fairness/conflict_key/test_utils.rs b/consensus/src/transaction_shuffler/deprecated_fairness/conflict_key/test_utils.rs
new file mode 100644
index 0000000000000..fec79e2c33617
--- /dev/null
+++ b/consensus/src/transaction_shuffler/deprecated_fairness/conflict_key/test_utils.rs
@@ -0,0 +1,190 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::transaction_shuffler::deprecated_fairness::conflict_key::{
+    ConflictKey, ConflictKeyId, ConflictKeyRegistry,
+};
+use proptest::prelude::*;
+use std::hash::Hash;
+
+impl ConflictKeyId {
+    pub fn new_for_test(idx: usize) -> Self {
+        Self(idx)
+    }
+}
+
+impl ConflictKeyRegistry {
+    pub fn all_exempt(num_txns: usize) -> Self {
+        ConflictKeyRegistry {
+            id_by_txn: vec![ConflictKeyId::new_for_test(0); num_txns],
+            is_exempt_by_id: vec![true],
+        }
+    }
+
+    pub fn non_conflict(num_txns: usize) -> Self {
+        ConflictKeyRegistry {
+            id_by_txn: (0..num_txns).map(ConflictKeyId::new_for_test).collect(),
+            is_exempt_by_id: vec![false; num_txns],
+        }
+    }
+
+    pub fn full_conflict(num_txns: usize) -> Self {
+        ConflictKeyRegistry {
+            id_by_txn: vec![ConflictKeyId::new_for_test(0); num_txns],
+            is_exempt_by_id: vec![false],
+        }
+    }
+
+    pub fn nums_per_key<const NUM_KEYS: usize>(nums_per_key: [usize; NUM_KEYS]) -> Self {
+        Self::nums_per_round_per_key([nums_per_key])
+    }
+
+    pub fn nums_per_round_per_key<const NUM_KEYS: usize, const NUM_ROUNDS: usize>(
+        nums_per_round_per_key: [[usize; NUM_KEYS]; NUM_ROUNDS],
+    ) -> Self {
+        let mut seq = (0..NUM_ROUNDS).flat_map(|_| 0..NUM_KEYS);
+        let nums_per_key = nums_per_round_per_key.into_iter().flatten();
+
+        ConflictKeyRegistry {
+            id_by_txn: nums_per_key
+                .flat_map(|num| {
+                    let s = seq.next().unwrap();
+                    vec![ConflictKeyId::new_for_test(s); num]
+                })
+                .collect(),
+            is_exempt_by_id: vec![false; NUM_KEYS],
+        }
+    }
+}
+
+#[derive(Debug)]
+struct FakeAccount {
+    id: usize,
+}
+
+impl Arbitrary for FakeAccount {
+    type Parameters = ();
+    type Strategy = BoxedStrategy<Self>;
+
+    fn arbitrary_with(_args: Self::Parameters) -> Self::Strategy {
+        (0..10usize).prop_map(|id| FakeAccount { id }).boxed()
+    }
+}
+
+#[derive(Debug)]
+struct FakeModule {
+    id: usize,
+}
+
+impl FakeModule {
+    pub fn exempt(&self) -> bool {
+        self.id % 3 == 0
+    }
+}
+
+impl Arbitrary for FakeModule {
+    type Parameters = ();
+    type Strategy = BoxedStrategy<Self>;
+
+    fn arbitrary_with(_args: Self::Parameters) -> Self::Strategy {
+        (0..10usize).prop_map(|id| FakeModule { id }).boxed()
+    }
+}
+
+#[derive(Debug)]
+struct FakeEntryFun {
+    module: FakeModule,
+    id: usize,
+}
+
+impl Arbitrary for FakeEntryFun {
+    type Parameters = ();
+    type Strategy = BoxedStrategy<Self>;
+
+    fn arbitrary_with(_args: Self::Parameters) -> Self::Strategy {
+        (any::<FakeModule>(), 0..3usize)
+            .prop_map(|(module, id)| FakeEntryFun { module, id })
+            .boxed()
+    }
+}
+
+#[derive(Debug)]
+pub struct FakeTxn {
+    sender: FakeAccount,
+    entry_fun: FakeEntryFun,
+}
+
+impl Arbitrary for FakeTxn {
+    type Parameters = ();
+    type Strategy = BoxedStrategy<Self>;
+
+    fn arbitrary_with(_args: Self::Parameters) -> Self::Strategy {
+        (any::<FakeAccount>(), any::<FakeEntryFun>())
+            .prop_map(|(sender, entry_fun)| FakeTxn { sender, entry_fun })
+            .boxed()
+    }
+}
+
+#[derive(Eq, Hash, PartialEq)]
+pub(crate) struct FakeSenderKey {
+    id: usize,
+}
+
+impl ConflictKey<FakeTxn> for FakeSenderKey {
+    fn extract_from(txn: &FakeTxn) -> Self {
+        Self { id: txn.sender.id }
+    }
+
+    fn conflict_exempt(&self) -> bool {
+        false
+    }
+}
+
+#[derive(Eq, Hash, PartialEq)]
+pub(crate) enum FakeEntryFunModuleKey {
+    Module(usize),
+    Exempt,
+}
+
+impl ConflictKey<FakeTxn> for FakeEntryFunModuleKey {
+    fn extract_from(txn: &FakeTxn) -> Self {
+        if txn.entry_fun.module.exempt() {
+            Self::Exempt
+        } else {
+            Self::Module(txn.entry_fun.module.id)
+        }
+    }
+
+    fn conflict_exempt(&self) -> bool {
+        match self {
+            Self::Exempt => true,
+            Self::Module(..) => false,
+        }
+    }
+}
+
+#[derive(Eq, Hash, PartialEq)]
+pub(crate) enum FakeEntryFunKey {
+    EntryFun { module: usize, function: usize },
+    Exempt,
+}
+
+impl ConflictKey<FakeTxn> for FakeEntryFunKey {
+    fn extract_from(txn: &FakeTxn) -> Self {
+        if txn.entry_fun.module.exempt() {
+            Self::Exempt
+        } else {
+            Self::EntryFun {
+                module: txn.entry_fun.module.id,
+                function: txn.entry_fun.id,
+            }
+        }
+    }
+
+    fn conflict_exempt(&self) -> bool {
+        match self {
+            Self::Exempt => true,
+            Self::EntryFun { .. } => false,
+        }
+    }
+}
diff --git a/consensus/src/transaction_shuffler/fairness/conflict_key/txn_sender.rs b/consensus/src/transaction_shuffler/deprecated_fairness/conflict_key/txn_sender.rs
similarity index 85%
rename from consensus/src/transaction_shuffler/fairness/conflict_key/txn_sender.rs
rename to consensus/src/transaction_shuffler/deprecated_fairness/conflict_key/txn_sender.rs
index 3ec1905d869cb..a742e7c240573 100644
--- a/consensus/src/transaction_shuffler/fairness/conflict_key/txn_sender.rs
+++ b/consensus/src/transaction_shuffler/deprecated_fairness/conflict_key/txn_sender.rs
@@ -1,7 +1,7 @@
 // Copyright © Aptos Foundation
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::transaction_shuffler::fairness::conflict_key::ConflictKey;
+use crate::transaction_shuffler::deprecated_fairness::conflict_key::ConflictKey;
 use aptos_types::transaction::SignedTransaction;
 use move_core_types::account_address::AccountAddress;
 
diff --git a/consensus/src/transaction_shuffler/fairness/conflict_zone.rs b/consensus/src/transaction_shuffler/deprecated_fairness/conflict_zone.rs
similarity index 85%
rename from consensus/src/transaction_shuffler/fairness/conflict_zone.rs
rename to consensus/src/transaction_shuffler/deprecated_fairness/conflict_zone.rs
index 983baaadedfb9..a685cf701ac07 100644
--- a/consensus/src/transaction_shuffler/fairness/conflict_zone.rs
+++ b/consensus/src/transaction_shuffler/deprecated_fairness/conflict_zone.rs
@@ -1,7 +1,7 @@
 // Copyright © Aptos Foundation
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::transaction_shuffler::fairness::{
+use crate::transaction_shuffler::deprecated_fairness::{
     conflict_key::{ConflictKeyId, ConflictKeyRegistry, MapByKeyId},
     TxnIdx,
 };
@@ -57,11 +57,12 @@ impl<'a> ConflictZone<'a> {
         *self.counts_by_id.get_mut(key_id) += 1;
         self.sliding_window.push_back(key_id);
         if self.sliding_window.len() > self.sliding_window_size {
-            let removed_key_id = self.sliding_window.pop_front().unwrap();
-            let count = self.counts_by_id.get_mut(removed_key_id);
-            *count -= 1;
-            if *count == 0 && !self.key_registry.is_conflict_exempt(removed_key_id) {
-                return Some(removed_key_id);
+            if let Some(removed_key_id) = self.sliding_window.pop_front() {
+                let count = self.counts_by_id.get_mut(removed_key_id);
+                *count -= 1;
+                if *count == 0 && !self.key_registry.is_conflict_exempt(removed_key_id) {
+                    return Some(removed_key_id);
+                }
             }
         }
         None
diff --git a/consensus/src/transaction_shuffler/deprecated_fairness/mod.rs b/consensus/src/transaction_shuffler/deprecated_fairness/mod.rs
new file mode 100644
index 0000000000000..03cc1eb1c6d18
--- /dev/null
+++ b/consensus/src/transaction_shuffler/deprecated_fairness/mod.rs
@@ -0,0 +1,220 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::transaction_shuffler::{
+    deprecated_fairness::{
+        conflict_key::{
+            entry_fun::EntryFunKey, entry_fun_module::EntryFunModuleKey, txn_sender::TxnSenderKey,
+            ConflictKeyRegistry,
+        },
+        conflict_zone::ConflictZone,
+        pending_zone::PendingZone,
+    },
+    TransactionShuffler,
+};
+use aptos_types::transaction::SignedTransaction;
+use itertools::zip_eq;
+use selection_tracker::SelectionTracker;
+use std::collections::BTreeSet;
+
+pub(crate) mod conflict_key;
+mod conflict_zone;
+mod pending_zone;
+mod selection_tracker;
+
+#[cfg(test)]
+mod tests;
+
+type TxnIdx = usize;
+
+#[derive(Debug)]
+pub struct FairnessShuffler {
+    pub sender_conflict_window_size: usize,
+    pub module_conflict_window_size: usize,
+    pub entry_fun_conflict_window_size: usize,
+}
+
+impl FairnessShuffler {
+    fn conflict_key_registries(txns: &[SignedTransaction]) -> [ConflictKeyRegistry; 3] {
+        [
+            ConflictKeyRegistry::build::<TxnSenderKey, SignedTransaction>(txns),
+            ConflictKeyRegistry::build::<EntryFunModuleKey, SignedTransaction>(txns),
+            ConflictKeyRegistry::build::<EntryFunKey, SignedTransaction>(txns),
+        ]
+    }
+
+    fn window_sizes(&self) -> [usize; 3] {
+        [
+            self.sender_conflict_window_size,
+            self.module_conflict_window_size,
+            self.entry_fun_conflict_window_size,
+        ]
+    }
+}
+
+impl TransactionShuffler for FairnessShuffler {
+    fn shuffle(&self, txns: Vec<SignedTransaction>) -> Vec<SignedTransaction> {
+        let conflict_key_registries = Self::conflict_key_registries(&txns);
+        let order =
+            FairnessShufflerImpl::new(&conflict_key_registries, self.window_sizes()).shuffle();
+        reorder(txns, &order)
+    }
+}
+
+fn reorder<T: Clone>(txns: Vec<T>, order: &[TxnIdx]) -> Vec<T> {
+    assert_eq!(txns.len(), order.len());
+    order.iter().map(|idx| txns[*idx].clone()).collect()
+}
+
+struct FairnessShufflerImpl<'a, const NUM_CONFLICT_ZONES: usize> {
+    conflict_zones: [ConflictZone<'a>; NUM_CONFLICT_ZONES],
+    pending_zones: [PendingZone<'a>; NUM_CONFLICT_ZONES],
+    selected_order: Vec<TxnIdx>,
+    selection_tracker: SelectionTracker,
+}
+
+impl<'a, const NUM_CONFLICT_ZONES: usize> FairnessShufflerImpl<'a, NUM_CONFLICT_ZONES> {
+    pub fn new(
+        conflict_key_registries: &'a [ConflictKeyRegistry; NUM_CONFLICT_ZONES],
+        window_sizes: [usize; NUM_CONFLICT_ZONES],
+    ) -> Self {
+        let num_txns = conflict_key_registries[0].num_txns();
+        assert!(conflict_key_registries
+            .iter()
+            .skip(1)
+            .all(|r| r.num_txns() == num_txns));
+
+        Self {
+            selected_order: Vec::with_capacity(num_txns),
+            selection_tracker: SelectionTracker::new(num_txns),
+            conflict_zones: ConflictZone::build_zones(conflict_key_registries, window_sizes),
+            pending_zones: PendingZone::build_zones(conflict_key_registries),
+        }
+    }
+
+    /// Spread (delay) transactions that have conflicts with adjacent previous transactions
+    /// according to multiple dimensions (`ConflictKey`s). Invariant is held that for each conflict
+    /// key, i.e. the transaction sender, the module, and the entry function, etc., the order of
+    /// transactions with the same key is preserved -- unless the key is exempt from conflict.
+    ///
+    /// For example, all transactions from a single sender will preserve their order; all transactions
+    /// from the same module will preserve their order, unless they are of the aptos framework
+    /// module -- p2p transfers of APT can violate this invariant.
+    ///
+    /// Each transaction comes at most once out of `self.selection_tracker.next_unselected()` for
+    /// both passes, that's O(2n). And each transaction comes out of each conflict zones at most
+    /// once, that's O(3n). In either case, the transaction is examined by going through all 3
+    /// conflict zones and all 3 pending zones. So the time complexity is O(9n) = O(n). Or if we
+    /// consider `NUM_CONFLICT_ZONES = m`, the time complexity is O(m*m*n).
+    pub fn shuffle(mut self) -> Vec<TxnIdx> {
+        // First pass, only select transactions with no conflicts in all conflict zones
+        while let Some(txn_idx) = self.selection_tracker.next_unselected() {
+            if !self.is_conflict(txn_idx) && !self.is_head_of_line_blocked(txn_idx) {
+                self.select_and_select_unconflicted(txn_idx, false /* is_pending */)
+            } else {
+                self.add_pending(txn_idx);
+            }
+        }
+
+        // Second pass, select previously pending txns in order,
+        //   with newly un-conflicted txns jumping the line
+        self.selection_tracker.new_pass();
+        while let Some(txn_idx) = self.selection_tracker.next_unselected() {
+            self.select_and_select_unconflicted(txn_idx, true /* is_pending */);
+        }
+
+        self.selected_order
+    }
+
+    fn select_and_select_unconflicted(&mut self, txn_idx: TxnIdx, is_pending: bool) {
+        let mut maybe_unconflicted = self.select(txn_idx, is_pending);
+        while let Some(txn_idx) = maybe_unconflicted.pop_first() {
+            if !self.is_conflict(txn_idx) && !self.is_head_of_line_blocked(txn_idx) {
+                maybe_unconflicted.extend(self.select(txn_idx, true /* is_pending */))
+            }
+        }
+    }
+
+    /// Select a transaction and return potentially un-conflicted transactions
+    fn select(&mut self, txn_idx: TxnIdx, is_pending: bool) -> BTreeSet<TxnIdx> {
+        self.selection_tracker.mark_selected(txn_idx);
+        self.selected_order.push(txn_idx);
+        if is_pending {
+            self.pop_pending(txn_idx);
+        }
+
+        let mut maybe_unconflicted = BTreeSet::new();
+        for (conflict_zone, pending_zone) in
+            zip_eq(&mut self.conflict_zones, &mut self.pending_zones)
+        {
+            if let Some(key_id) = conflict_zone.add(txn_idx) {
+                if let Some(pending) = pending_zone.first_pending_on_key(key_id) {
+                    maybe_unconflicted.insert(pending);
+                }
+            }
+        }
+
+        maybe_unconflicted
+    }
+
+    fn is_conflict(&self, txn_idx: TxnIdx) -> bool {
+        self.conflict_zones.iter().any(|z| z.is_conflict(txn_idx))
+    }
+
+    fn is_head_of_line_blocked(&self, txn_idx: TxnIdx) -> bool {
+        self.pending_zones
+            .iter()
+            .any(|z| z.head_of_line_blocked(txn_idx))
+    }
+
+    fn add_pending(&mut self, txn_idx: TxnIdx) {
+        self.pending_zones.iter_mut().for_each(|z| z.add(txn_idx));
+    }
+
+    fn pop_pending(&mut self, txn_idx: TxnIdx) {
+        self.pending_zones.iter_mut().for_each(|z| z.pop(txn_idx));
+    }
+}
+
+#[cfg(test)]
+mod test_utils {
+    use crate::transaction_shuffler::deprecated_fairness::FairnessShuffler;
+    use proptest::prelude::*;
+
+    impl FairnessShuffler {
+        pub fn new_for_test(
+            sender_conflict_window_size: usize,
+            module_conflict_window_size: usize,
+            entry_fun_conflict_window_size: usize,
+        ) -> Self {
+            Self {
+                sender_conflict_window_size,
+                module_conflict_window_size,
+                entry_fun_conflict_window_size,
+            }
+        }
+    }
+
+    impl Arbitrary for FairnessShuffler {
+        type Parameters = ();
+        type Strategy = BoxedStrategy<Self>;
+
+        fn arbitrary_with(_args: Self::Parameters) -> Self::Strategy {
+            (0..10usize, 0..10usize, 0..10usize)
+                .prop_map(
+                    |(
+                        sender_conflict_window_size,
+                        module_conflict_window_size,
+                        entry_fun_conflict_window_size,
+                    )| {
+                        FairnessShuffler {
+                            sender_conflict_window_size,
+                            module_conflict_window_size,
+                            entry_fun_conflict_window_size,
+                        }
+                    },
+                )
+                .boxed()
+        }
+    }
+}
diff --git a/consensus/src/transaction_shuffler/fairness/pending_zone.rs b/consensus/src/transaction_shuffler/deprecated_fairness/pending_zone.rs
similarity index 97%
rename from consensus/src/transaction_shuffler/fairness/pending_zone.rs
rename to consensus/src/transaction_shuffler/deprecated_fairness/pending_zone.rs
index 8de932b65e601..eb9c2af18455f 100644
--- a/consensus/src/transaction_shuffler/fairness/pending_zone.rs
+++ b/consensus/src/transaction_shuffler/deprecated_fairness/pending_zone.rs
@@ -1,7 +1,7 @@
 // Copyright © Aptos Foundation
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::transaction_shuffler::fairness::{
+use crate::transaction_shuffler::deprecated_fairness::{
     conflict_key::{ConflictKeyId, ConflictKeyRegistry, MapByKeyId},
     TxnIdx,
 };
diff --git a/consensus/src/transaction_shuffler/fairness/selection_tracker.rs b/consensus/src/transaction_shuffler/deprecated_fairness/selection_tracker.rs
similarity index 93%
rename from consensus/src/transaction_shuffler/fairness/selection_tracker.rs
rename to consensus/src/transaction_shuffler/deprecated_fairness/selection_tracker.rs
index 571f817656ab8..3e10d4368642f 100644
--- a/consensus/src/transaction_shuffler/fairness/selection_tracker.rs
+++ b/consensus/src/transaction_shuffler/deprecated_fairness/selection_tracker.rs
@@ -1,7 +1,7 @@
 // Copyright © Aptos Foundation
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::transaction_shuffler::fairness::TxnIdx;
+use crate::transaction_shuffler::deprecated_fairness::TxnIdx;
 
 pub struct SelectionTracker {
     selected_markers: Vec<bool>,
diff --git a/consensus/src/transaction_shuffler/deprecated_fairness/tests/manual.rs b/consensus/src/transaction_shuffler/deprecated_fairness/tests/manual.rs
new file mode 100644
index 0000000000000..753ca542a8d3f
--- /dev/null
+++ b/consensus/src/transaction_shuffler/deprecated_fairness/tests/manual.rs
@@ -0,0 +1,169 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::transaction_shuffler::deprecated_fairness::{
+    conflict_key::ConflictKeyRegistry, FairnessShuffler, FairnessShufflerImpl,
+};
+
+struct TestCase {
+    shuffler: FairnessShuffler,
+    conflict_key_registries: [ConflictKeyRegistry; 3],
+    expected_order: Vec<usize>,
+}
+
+impl TestCase {
+    fn run(self) {
+        let Self {
+            shuffler,
+            conflict_key_registries,
+            expected_order,
+        } = self;
+
+        let order =
+            FairnessShufflerImpl::new(&conflict_key_registries, shuffler.window_sizes()).shuffle();
+        assert_eq!(order, expected_order);
+    }
+}
+
+#[test]
+fn test_all_exempt() {
+    TestCase {
+        shuffler: FairnessShuffler::new_for_test(2, 2, 2),
+        conflict_key_registries: [
+            ConflictKeyRegistry::all_exempt(9),
+            ConflictKeyRegistry::all_exempt(9),
+            ConflictKeyRegistry::all_exempt(9),
+        ],
+        expected_order: (0..9).collect(),
+    }
+    .run()
+}
+
+#[test]
+fn test_non_conflict() {
+    TestCase {
+        shuffler: FairnessShuffler::new_for_test(2, 2, 2),
+        conflict_key_registries: [
+            ConflictKeyRegistry::non_conflict(9),
+            ConflictKeyRegistry::non_conflict(9),
+            ConflictKeyRegistry::non_conflict(9),
+        ],
+        expected_order: (0..9).collect(),
+    }
+    .run()
+}
+
+#[test]
+fn test_full_conflict() {
+    TestCase {
+        shuffler: FairnessShuffler::new_for_test(2, 2, 2),
+        conflict_key_registries: [
+            ConflictKeyRegistry::full_conflict(9),
+            ConflictKeyRegistry::full_conflict(9),
+            ConflictKeyRegistry::full_conflict(9),
+        ],
+        expected_order: (0..9).collect(),
+    }
+    .run()
+}
+
+#[test]
+fn test_modules_ignored_by_window_size() {
+    TestCase {
+        shuffler: FairnessShuffler::new_for_test(2, 0, 2),
+        conflict_key_registries: [
+            // [A0, A1, A2, ...]
+            ConflictKeyRegistry::non_conflict(8),
+            // [M0, M0, M0, M0, M1, M1, M2, M2]
+            ConflictKeyRegistry::nums_per_key([4, 2, 2]),
+            // [M0::E0, M0::E1, M0::E0, M0::E1, M1::E0, M1::E0, M2::E0, M2::E0]
+            ConflictKeyRegistry::nums_per_round_per_key([[1, 1, 0], [1, 1, 4]]),
+        ],
+        // [M0::E0, M0::E1, M1::E0, M0::E0, M0::E1, M1::E0, M2::E0, M2::E0]
+        expected_order: vec![0, 1, 4, 2, 3, 5, 6, 7],
+    }
+    .run()
+}
+
+#[test]
+fn test_modules_and_entry_funs_ignored_by_window_size() {
+    TestCase {
+        shuffler: FairnessShuffler::new_for_test(2, 0, 0),
+        conflict_key_registries: [
+            // [A0, A1, A2, ...]
+            ConflictKeyRegistry::non_conflict(8),
+            // [M0, M0, M0, M0, M1, M1, M1, M1]
+            ConflictKeyRegistry::nums_per_key([4, 4]),
+            // [M0::E0, M0::E0, M0::E1, M0::E1, M1::E0, M1::E0, M1::E1, M1::E1]
+            ConflictKeyRegistry::nums_per_key([2, 2, 2, 2]),
+        ],
+        expected_order: (0..8).collect(),
+    }
+    .run()
+}
+
+#[test]
+fn test_exempted_modules() {
+    // think "full block of p2p txns"
+    TestCase {
+        shuffler: FairnessShuffler::new_for_test(3, 2, 2),
+        conflict_key_registries: [
+            // [0:A0, 1:A0, 2:A0, 3:A0, 4:A1, 5:A1, 6:A1, 7:A2, 8:A2, 9:A3]
+            ConflictKeyRegistry::nums_per_key([4, 3, 2, 1]),
+            ConflictKeyRegistry::all_exempt(10),
+            ConflictKeyRegistry::all_exempt(10),
+        ],
+        // [A0, A1, A2, A3, A0, A1, A2, A0, A1]
+        expected_order: vec![0, 4, 7, 9, 1, 5, 8, 2, 3, 6],
+    }
+    .run()
+}
+
+#[test]
+fn test_dominating_module() {
+    TestCase {
+        shuffler: FairnessShuffler::new_for_test(4, 1, 1),
+        conflict_key_registries: [
+            ConflictKeyRegistry::non_conflict(7),
+            // [M0, M0, M0, M1, M2, M3, M4]
+            ConflictKeyRegistry::nums_per_key([3, 1, 1, 1, 1]),
+            ConflictKeyRegistry::nums_per_key([3, 1, 1, 1, 1]),
+        ],
+        // [M0, M1, M0, M2, M0, M3, M4]
+        expected_order: vec![0, 3, 1, 4, 2, 5, 6],
+    }
+    .run()
+}
+
+#[test]
+fn test_dominating_module2() {
+    TestCase {
+        shuffler: FairnessShuffler::new_for_test(4, 1, 1),
+        conflict_key_registries: [
+            ConflictKeyRegistry::non_conflict(8),
+            // [M0, M0, M0, M1, M2, M3, M4, M0]
+            ConflictKeyRegistry::nums_per_round_per_key([[3, 1, 1, 1, 1], [1, 0, 0, 0, 0]]),
+            ConflictKeyRegistry::nums_per_round_per_key([[3, 1, 1, 1, 1], [1, 0, 0, 0, 0]]),
+        ],
+        // [M0, M1, M0, M2, M0, M3, M4, M0]
+        expected_order: vec![0, 3, 1, 4, 2, 5, 6, 7],
+    }
+    .run()
+}
+
+#[test]
+fn test_multiple_entry_funs() {
+    TestCase {
+        shuffler: FairnessShuffler::new_for_test(4, 1, 2),
+        conflict_key_registries: [
+            ConflictKeyRegistry::non_conflict(10),
+            // [M0, M0, M0, M0, M1, M1, M1, M1, M2, M2]
+            ConflictKeyRegistry::nums_per_key([4, 4, 2]),
+            // [M0::E0, M0::E1, M0::E0, M0::E1, M1::E0, M1::E0, M1::E0, M1::E0, M2::E0, M2::E0]
+            ConflictKeyRegistry::nums_per_round_per_key([[1, 1, 0, 0], [1, 1, 4, 2]]),
+        ],
+        // [M0::E0, M1::E0, M0::E1, M2::E0, M0::E0, M1::E0, M0:E1, M2::E0, M1::E0, M1::E0]
+        expected_order: vec![0, 4, 1, 8, 2, 5, 3, 9, 6, 7],
+    }
+    .run()
+}
diff --git a/consensus/src/transaction_shuffler/fairness/tests/mod.rs b/consensus/src/transaction_shuffler/deprecated_fairness/tests/mod.rs
similarity index 100%
rename from consensus/src/transaction_shuffler/fairness/tests/mod.rs
rename to consensus/src/transaction_shuffler/deprecated_fairness/tests/mod.rs
diff --git a/consensus/src/transaction_shuffler/deprecated_fairness/tests/proptests.rs b/consensus/src/transaction_shuffler/deprecated_fairness/tests/proptests.rs
new file mode 100644
index 0000000000000..6d111b03d28e6
--- /dev/null
+++ b/consensus/src/transaction_shuffler/deprecated_fairness/tests/proptests.rs
@@ -0,0 +1,104 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::transaction_shuffler::deprecated_fairness::{
+    conflict_key::{
+        test_utils::{FakeEntryFunKey, FakeEntryFunModuleKey, FakeSenderKey, FakeTxn},
+        ConflictKeyRegistry, MapByKeyId,
+    },
+    reorder, FairnessShuffler, FairnessShufflerImpl, TxnIdx,
+};
+use proptest::{collection::vec, prelude::*};
+use std::collections::BTreeSet;
+
+fn arb_order(num_txns: usize) -> impl Strategy<Value = Vec<TxnIdx>> {
+    Just((0..num_txns).collect::<Vec<_>>()).prop_shuffle()
+}
+
+#[derive(Debug, Default, Eq, PartialEq)]
+enum OrderOrSet {
+    #[default]
+    Empty,
+    Order(Vec<TxnIdx>),
+    Set(BTreeSet<TxnIdx>),
+}
+
+impl OrderOrSet {
+    fn add(&mut self, idx: TxnIdx, is_conflict_exempt: bool) {
+        if self.is_empty() {
+            *self = if is_conflict_exempt {
+                Self::Set(BTreeSet::new())
+            } else {
+                Self::Order(Vec::new())
+            };
+        }
+
+        match self {
+            Self::Order(order) => order.push(idx),
+            Self::Set(set) => {
+                set.insert(idx);
+            },
+            Self::Empty => unreachable!(),
+        }
+    }
+
+    fn is_empty(&self) -> bool {
+        matches!(self, Self::Empty)
+    }
+}
+
+fn sort_by_key(
+    order: impl IntoIterator<Item = TxnIdx>,
+    registry: &ConflictKeyRegistry,
+) -> MapByKeyId<OrderOrSet> {
+    let mut map: MapByKeyId<OrderOrSet> = registry.new_map_by_id();
+
+    for txn_idx in order {
+        let key_id = registry.key_id_for_txn(txn_idx);
+        let is_exempt = registry.is_conflict_exempt(key_id);
+
+        map.get_mut(key_id).add(txn_idx, is_exempt);
+    }
+
+    map
+}
+
+fn assert_invariants(txns: &[FakeTxn], order: Vec<TxnIdx>, registry: &ConflictKeyRegistry) {
+    let num_txns = txns.len();
+    let original_sorted = sort_by_key(0..num_txns, registry);
+    let result_sorted = sort_by_key(order, registry);
+
+    assert_eq!(result_sorted, original_sorted);
+}
+
+fn registries(txns: &[FakeTxn]) -> [ConflictKeyRegistry; 3] {
+    [
+        ConflictKeyRegistry::build::<FakeSenderKey, FakeTxn>(txns),
+        ConflictKeyRegistry::build::<FakeEntryFunModuleKey, FakeTxn>(txns),
+        ConflictKeyRegistry::build::<FakeEntryFunKey, FakeTxn>(txns),
+    ]
+}
+
+proptest! {
+    #[test]
+    fn test_reorder( order in (0..1000usize).prop_flat_map(arb_order) ) {
+        let num_txns = order.len();
+        let txns = (0..num_txns).collect::<Vec<_>>();
+
+        let reordered = reorder(txns, &order);
+        prop_assert_eq!(reordered, order);
+    }
+
+    #[test]
+    fn test_fairness_shuffler(
+        txns in vec(any::<FakeTxn>(), 0..1000),
+        shuffler in any::<FairnessShuffler>(),
+    ) {
+        let registries = registries(&txns);
+        let order = FairnessShufflerImpl::new(&registries, shuffler.window_sizes()).shuffle();
+
+        for registry in &registries {
+            assert_invariants(&txns, order.clone(), registry);
+        }
+    }
+}
diff --git a/consensus/src/transaction_shuffler/fairness/conflict_key/mod.rs b/consensus/src/transaction_shuffler/fairness/conflict_key/mod.rs
deleted file mode 100644
index 63dc3d58cedee..0000000000000
--- a/consensus/src/transaction_shuffler/fairness/conflict_key/mod.rs
+++ /dev/null
@@ -1,117 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::transaction_shuffler::fairness::TxnIdx;
-use std::{collections::HashMap, hash::Hash};
-
-pub(crate) mod entry_fun;
-pub(crate) mod entry_fun_module;
-pub(crate) mod txn_sender;
-
-#[cfg(test)]
-pub(crate) mod test_utils;
-
-/// `ConflictKey::extract_from(txn)` extracts a key from a transaction. For example,
-/// `TxnSenderKey::extract_from(txn)` returns the transaction sender's address. The key is used by
-/// the shuffler to determine whether two close by transactions conflict with each other.
-///
-/// `ConflictKey::conflict_exempt(&key)` returns if this specific key is exempt from conflict.
-/// For example, we can exempt transaction sender 0x1, so that consecutive transactions sent by
-/// 0x1 are not seen as a conflict by the shuffler.
-pub(crate) trait ConflictKey<Txn>: Eq + Hash + PartialEq {
-    fn extract_from(txn: &Txn) -> Self;
-
-    fn conflict_exempt(&self) -> bool;
-}
-
-#[derive(Clone, Copy, Debug)]
-pub(crate) struct ConflictKeyId(usize);
-
-impl ConflictKeyId {
-    pub fn as_idx(&self) -> usize {
-        self.0
-    }
-}
-
-/// `ConflictKeyRegistry::build::<K: ConflictKey>()` goes through a block of transactions and
-/// extract the conflict keys from each transaction. In that process, each unique conflict key is
-/// assigned a unique `ConflictKeyId`, essentially a sequence number, and the registry remembers which
-/// key was extracted from each transaction. After that, we can query the registry to get the key
-/// represented by the id, which is 1. cheaper than calling `ConflictKey::extract_from(txn)` again;
-/// 2. enables vector based `MapByKeyId` which is cheaper than a `HashMap`; and 3. eliminates the typing
-/// information and easier to use in the shuffler.
-#[derive(Debug)]
-pub(crate) struct ConflictKeyRegistry {
-    id_by_txn: Vec<ConflictKeyId>,
-    is_exempt_by_id: Vec<bool>,
-}
-
-// Provided `ConflictKeyId`s managed by `ConflictKeyRegistry`s are consecutive integers starting
-// from 0, a map can be implemented based on a vector, which is cheapter than a hash map.
-#[derive(Debug, Eq, PartialEq)]
-pub(crate) struct MapByKeyId<T> {
-    inner: Vec<T>,
-}
-
-impl<T: Default> MapByKeyId<T> {
-    pub fn new(size: usize) -> Self {
-        let mut inner = Vec::with_capacity(size);
-        inner.resize_with(size, Default::default);
-
-        Self { inner }
-    }
-
-    pub fn get(&self, key_id: ConflictKeyId) -> &T {
-        &self.inner[key_id.as_idx()]
-    }
-
-    pub fn get_mut(&mut self, key_id: ConflictKeyId) -> &mut T {
-        &mut self.inner[key_id.as_idx()]
-    }
-}
-
-impl ConflictKeyRegistry {
-    pub fn build<K: ConflictKey<Txn>, Txn>(txns: &[Txn]) -> Self
-    where
-        K: ConflictKey<Txn>,
-    {
-        let mut registry = HashMap::<K, ConflictKeyId>::new();
-        let mut is_exempt_by_id = Vec::new();
-
-        let id_by_txn = txns
-            .iter()
-            .map(|txn| {
-                let key = K::extract_from(txn);
-                *registry.entry(key).or_insert_with_key(|key| {
-                    is_exempt_by_id.push(key.conflict_exempt());
-                    ConflictKeyId(is_exempt_by_id.len() - 1)
-                })
-            })
-            .collect();
-
-        Self {
-            id_by_txn,
-            is_exempt_by_id,
-        }
-    }
-
-    fn num_ids(&self) -> usize {
-        self.is_exempt_by_id.len()
-    }
-
-    pub fn num_txns(&self) -> usize {
-        self.id_by_txn.len()
-    }
-
-    pub fn new_map_by_id<T: Default>(&self) -> MapByKeyId<T> {
-        MapByKeyId::new(self.num_ids())
-    }
-
-    pub fn key_id_for_txn(&self, txn_idx: TxnIdx) -> ConflictKeyId {
-        self.id_by_txn[txn_idx]
-    }
-
-    pub fn is_conflict_exempt(&self, key_id: ConflictKeyId) -> bool {
-        self.is_exempt_by_id[key_id.0]
-    }
-}
diff --git a/consensus/src/transaction_shuffler/fairness/conflict_key/test_utils.rs b/consensus/src/transaction_shuffler/fairness/conflict_key/test_utils.rs
deleted file mode 100644
index f9b9e9e72fd22..0000000000000
--- a/consensus/src/transaction_shuffler/fairness/conflict_key/test_utils.rs
+++ /dev/null
@@ -1,190 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::transaction_shuffler::fairness::conflict_key::{
-    ConflictKey, ConflictKeyId, ConflictKeyRegistry,
-};
-use proptest::prelude::*;
-use std::hash::Hash;
-
-impl ConflictKeyId {
-    pub fn new_for_test(idx: usize) -> Self {
-        Self(idx)
-    }
-}
-
-impl ConflictKeyRegistry {
-    pub fn all_exempt(num_txns: usize) -> Self {
-        ConflictKeyRegistry {
-            id_by_txn: vec![ConflictKeyId::new_for_test(0); num_txns],
-            is_exempt_by_id: vec![true],
-        }
-    }
-
-    pub fn non_conflict(num_txns: usize) -> Self {
-        ConflictKeyRegistry {
-            id_by_txn: (0..num_txns).map(ConflictKeyId::new_for_test).collect(),
-            is_exempt_by_id: vec![false; num_txns],
-        }
-    }
-
-    pub fn full_conflict(num_txns: usize) -> Self {
-        ConflictKeyRegistry {
-            id_by_txn: vec![ConflictKeyId::new_for_test(0); num_txns],
-            is_exempt_by_id: vec![false],
-        }
-    }
-
-    pub fn nums_per_key<const NUM_KEYS: usize>(nums_per_key: [usize; NUM_KEYS]) -> Self {
-        Self::nums_per_round_per_key([nums_per_key])
-    }
-
-    pub fn nums_per_round_per_key<const NUM_KEYS: usize, const NUM_ROUNDS: usize>(
-        nums_per_round_per_key: [[usize; NUM_KEYS]; NUM_ROUNDS],
-    ) -> Self {
-        let mut seq = (0..NUM_ROUNDS).flat_map(|_| 0..NUM_KEYS);
-        let nums_per_key = nums_per_round_per_key.into_iter().flatten();
-
-        ConflictKeyRegistry {
-            id_by_txn: nums_per_key
-                .flat_map(|num| {
-                    let s = seq.next().unwrap();
-                    vec![ConflictKeyId::new_for_test(s); num]
-                })
-                .collect(),
-            is_exempt_by_id: vec![false; NUM_KEYS],
-        }
-    }
-}
-
-#[derive(Debug)]
-struct FakeAccount {
-    id: usize,
-}
-
-impl Arbitrary for FakeAccount {
-    type Parameters = ();
-    type Strategy = BoxedStrategy<Self>;
-
-    fn arbitrary_with(_args: Self::Parameters) -> Self::Strategy {
-        (0..10usize).prop_map(|id| FakeAccount { id }).boxed()
-    }
-}
-
-#[derive(Debug)]
-struct FakeModule {
-    id: usize,
-}
-
-impl FakeModule {
-    pub fn exempt(&self) -> bool {
-        self.id % 3 == 0
-    }
-}
-
-impl Arbitrary for FakeModule {
-    type Parameters = ();
-    type Strategy = BoxedStrategy<Self>;
-
-    fn arbitrary_with(_args: Self::Parameters) -> Self::Strategy {
-        (0..10usize).prop_map(|id| FakeModule { id }).boxed()
-    }
-}
-
-#[derive(Debug)]
-struct FakeEntryFun {
-    module: FakeModule,
-    id: usize,
-}
-
-impl Arbitrary for FakeEntryFun {
-    type Parameters = ();
-    type Strategy = BoxedStrategy<Self>;
-
-    fn arbitrary_with(_args: Self::Parameters) -> Self::Strategy {
-        (any::<FakeModule>(), 0..3usize)
-            .prop_map(|(module, id)| FakeEntryFun { module, id })
-            .boxed()
-    }
-}
-
-#[derive(Debug)]
-pub struct FakeTxn {
-    sender: FakeAccount,
-    entry_fun: FakeEntryFun,
-}
-
-impl Arbitrary for FakeTxn {
-    type Parameters = ();
-    type Strategy = BoxedStrategy<Self>;
-
-    fn arbitrary_with(_args: Self::Parameters) -> Self::Strategy {
-        (any::<FakeAccount>(), any::<FakeEntryFun>())
-            .prop_map(|(sender, entry_fun)| FakeTxn { sender, entry_fun })
-            .boxed()
-    }
-}
-
-#[derive(Eq, Hash, PartialEq)]
-pub(crate) struct FakeSenderKey {
-    id: usize,
-}
-
-impl ConflictKey<FakeTxn> for FakeSenderKey {
-    fn extract_from(txn: &FakeTxn) -> Self {
-        Self { id: txn.sender.id }
-    }
-
-    fn conflict_exempt(&self) -> bool {
-        false
-    }
-}
-
-#[derive(Eq, Hash, PartialEq)]
-pub(crate) enum FakeEntryFunModuleKey {
-    Module(usize),
-    Exempt,
-}
-
-impl ConflictKey<FakeTxn> for FakeEntryFunModuleKey {
-    fn extract_from(txn: &FakeTxn) -> Self {
-        if txn.entry_fun.module.exempt() {
-            Self::Exempt
-        } else {
-            Self::Module(txn.entry_fun.module.id)
-        }
-    }
-
-    fn conflict_exempt(&self) -> bool {
-        match self {
-            Self::Exempt => true,
-            Self::Module(..) => false,
-        }
-    }
-}
-
-#[derive(Eq, Hash, PartialEq)]
-pub(crate) enum FakeEntryFunKey {
-    EntryFun { module: usize, function: usize },
-    Exempt,
-}
-
-impl ConflictKey<FakeTxn> for FakeEntryFunKey {
-    fn extract_from(txn: &FakeTxn) -> Self {
-        if txn.entry_fun.module.exempt() {
-            Self::Exempt
-        } else {
-            Self::EntryFun {
-                module: txn.entry_fun.module.id,
-                function: txn.entry_fun.id,
-            }
-        }
-    }
-
-    fn conflict_exempt(&self) -> bool {
-        match self {
-            Self::Exempt => true,
-            Self::EntryFun { .. } => false,
-        }
-    }
-}
diff --git a/consensus/src/transaction_shuffler/fairness/mod.rs b/consensus/src/transaction_shuffler/fairness/mod.rs
deleted file mode 100644
index fef6a42a67306..0000000000000
--- a/consensus/src/transaction_shuffler/fairness/mod.rs
+++ /dev/null
@@ -1,220 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::transaction_shuffler::{
-    fairness::{
-        conflict_key::{
-            entry_fun::EntryFunKey, entry_fun_module::EntryFunModuleKey, txn_sender::TxnSenderKey,
-            ConflictKeyRegistry,
-        },
-        conflict_zone::ConflictZone,
-        pending_zone::PendingZone,
-    },
-    TransactionShuffler,
-};
-use aptos_types::transaction::SignedTransaction;
-use itertools::zip_eq;
-use selection_tracker::SelectionTracker;
-use std::collections::BTreeSet;
-
-pub(crate) mod conflict_key;
-mod conflict_zone;
-mod pending_zone;
-mod selection_tracker;
-
-#[cfg(test)]
-mod tests;
-
-type TxnIdx = usize;
-
-#[derive(Debug)]
-pub struct FairnessShuffler {
-    pub sender_conflict_window_size: usize,
-    pub module_conflict_window_size: usize,
-    pub entry_fun_conflict_window_size: usize,
-}
-
-impl FairnessShuffler {
-    fn conflict_key_registries(txns: &[SignedTransaction]) -> [ConflictKeyRegistry; 3] {
-        [
-            ConflictKeyRegistry::build::<TxnSenderKey, SignedTransaction>(txns),
-            ConflictKeyRegistry::build::<EntryFunModuleKey, SignedTransaction>(txns),
-            ConflictKeyRegistry::build::<EntryFunKey, SignedTransaction>(txns),
-        ]
-    }
-
-    fn window_sizes(&self) -> [usize; 3] {
-        [
-            self.sender_conflict_window_size,
-            self.module_conflict_window_size,
-            self.entry_fun_conflict_window_size,
-        ]
-    }
-}
-
-impl TransactionShuffler for FairnessShuffler {
-    fn shuffle(&self, txns: Vec<SignedTransaction>) -> Vec<SignedTransaction> {
-        let conflict_key_registries = Self::conflict_key_registries(&txns);
-        let order =
-            FairnessShufflerImpl::new(&conflict_key_registries, self.window_sizes()).shuffle();
-        reorder(txns, &order)
-    }
-}
-
-fn reorder<T: Clone>(txns: Vec<T>, order: &[TxnIdx]) -> Vec<T> {
-    assert_eq!(txns.len(), order.len());
-    order.iter().map(|idx| txns[*idx].clone()).collect()
-}
-
-struct FairnessShufflerImpl<'a, const NUM_CONFLICT_ZONES: usize> {
-    conflict_zones: [ConflictZone<'a>; NUM_CONFLICT_ZONES],
-    pending_zones: [PendingZone<'a>; NUM_CONFLICT_ZONES],
-    selected_order: Vec<TxnIdx>,
-    selection_tracker: SelectionTracker,
-}
-
-impl<'a, const NUM_CONFLICT_ZONES: usize> FairnessShufflerImpl<'a, NUM_CONFLICT_ZONES> {
-    pub fn new(
-        conflict_key_registries: &'a [ConflictKeyRegistry; NUM_CONFLICT_ZONES],
-        window_sizes: [usize; NUM_CONFLICT_ZONES],
-    ) -> Self {
-        let num_txns = conflict_key_registries[0].num_txns();
-        assert!(conflict_key_registries
-            .iter()
-            .skip(1)
-            .all(|r| r.num_txns() == num_txns));
-
-        Self {
-            selected_order: Vec::with_capacity(num_txns),
-            selection_tracker: SelectionTracker::new(num_txns),
-            conflict_zones: ConflictZone::build_zones(conflict_key_registries, window_sizes),
-            pending_zones: PendingZone::build_zones(conflict_key_registries),
-        }
-    }
-
-    /// Spread (delay) transactions that have conflicts with adjacent previous transactions
-    /// according to multiple dimensions (`ConflictKey`s). Invariant is held that for each conflict
-    /// key, i.e. the transaction sender, the module, and the entry function, etc., the order of
-    /// transactions with the same key is preserved -- unless the key is exempt from conflict.
-    ///
-    /// For example, all transactions from a single sender will preserve their order; all transactions
-    /// from the same module will preserve their order, unless they are of the aptos framework
-    /// module -- p2p transfers of APT can violate this invariant.
-    ///
-    /// Each transaction comes at most once out of `self.selection_tracker.next_unselected()` for
-    /// both passes, that's O(2n). And each transaction comes out of each conflict zones at most
-    /// once, that's O(3n). In either case, the transaction is examined by going through all 3
-    /// conflict zones and all 3 pending zones. So the time complexity is O(9n) = O(n). Or if we
-    /// consider `NUM_CONFLICT_ZONES = m`, the time complexity is O(m*m*n).
-    pub fn shuffle(mut self) -> Vec<TxnIdx> {
-        // First pass, only select transactions with no conflicts in all conflict zones
-        while let Some(txn_idx) = self.selection_tracker.next_unselected() {
-            if !self.is_conflict(txn_idx) && !self.is_head_of_line_blocked(txn_idx) {
-                self.select_and_select_unconflicted(txn_idx, false /* is_pending */)
-            } else {
-                self.add_pending(txn_idx);
-            }
-        }
-
-        // Second pass, select previously pending txns in order,
-        //   with newly un-conflicted txns jumping the line
-        self.selection_tracker.new_pass();
-        while let Some(txn_idx) = self.selection_tracker.next_unselected() {
-            self.select_and_select_unconflicted(txn_idx, true /* is_pending */);
-        }
-
-        self.selected_order
-    }
-
-    fn select_and_select_unconflicted(&mut self, txn_idx: TxnIdx, is_pending: bool) {
-        let mut maybe_unconflicted = self.select(txn_idx, is_pending);
-        while let Some(txn_idx) = maybe_unconflicted.pop_first() {
-            if !self.is_conflict(txn_idx) && !self.is_head_of_line_blocked(txn_idx) {
-                maybe_unconflicted.extend(self.select(txn_idx, true /* is_pending */))
-            }
-        }
-    }
-
-    /// Select a transaction and return potentially un-conflicted transactions
-    fn select(&mut self, txn_idx: TxnIdx, is_pending: bool) -> BTreeSet<TxnIdx> {
-        self.selection_tracker.mark_selected(txn_idx);
-        self.selected_order.push(txn_idx);
-        if is_pending {
-            self.pop_pending(txn_idx);
-        }
-
-        let mut maybe_unconflicted = BTreeSet::new();
-        for (conflict_zone, pending_zone) in
-            zip_eq(&mut self.conflict_zones, &mut self.pending_zones)
-        {
-            if let Some(key_id) = conflict_zone.add(txn_idx) {
-                if let Some(pending) = pending_zone.first_pending_on_key(key_id) {
-                    maybe_unconflicted.insert(pending);
-                }
-            }
-        }
-
-        maybe_unconflicted
-    }
-
-    fn is_conflict(&self, txn_idx: TxnIdx) -> bool {
-        self.conflict_zones.iter().any(|z| z.is_conflict(txn_idx))
-    }
-
-    fn is_head_of_line_blocked(&self, txn_idx: TxnIdx) -> bool {
-        self.pending_zones
-            .iter()
-            .any(|z| z.head_of_line_blocked(txn_idx))
-    }
-
-    fn add_pending(&mut self, txn_idx: TxnIdx) {
-        self.pending_zones.iter_mut().for_each(|z| z.add(txn_idx));
-    }
-
-    fn pop_pending(&mut self, txn_idx: TxnIdx) {
-        self.pending_zones.iter_mut().for_each(|z| z.pop(txn_idx));
-    }
-}
-
-#[cfg(test)]
-mod test_utils {
-    use crate::transaction_shuffler::fairness::FairnessShuffler;
-    use proptest::prelude::*;
-
-    impl FairnessShuffler {
-        pub fn new_for_test(
-            sender_conflict_window_size: usize,
-            module_conflict_window_size: usize,
-            entry_fun_conflict_window_size: usize,
-        ) -> Self {
-            Self {
-                sender_conflict_window_size,
-                module_conflict_window_size,
-                entry_fun_conflict_window_size,
-            }
-        }
-    }
-
-    impl Arbitrary for FairnessShuffler {
-        type Parameters = ();
-        type Strategy = BoxedStrategy<Self>;
-
-        fn arbitrary_with(_args: Self::Parameters) -> Self::Strategy {
-            (0..10usize, 0..10usize, 0..10usize)
-                .prop_map(
-                    |(
-                        sender_conflict_window_size,
-                        module_conflict_window_size,
-                        entry_fun_conflict_window_size,
-                    )| {
-                        FairnessShuffler {
-                            sender_conflict_window_size,
-                            module_conflict_window_size,
-                            entry_fun_conflict_window_size,
-                        }
-                    },
-                )
-                .boxed()
-        }
-    }
-}
diff --git a/consensus/src/transaction_shuffler/fairness/tests/manual.rs b/consensus/src/transaction_shuffler/fairness/tests/manual.rs
deleted file mode 100644
index 69cd94c141216..0000000000000
--- a/consensus/src/transaction_shuffler/fairness/tests/manual.rs
+++ /dev/null
@@ -1,169 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::transaction_shuffler::fairness::{
-    conflict_key::ConflictKeyRegistry, FairnessShuffler, FairnessShufflerImpl,
-};
-
-struct TestCase {
-    shuffler: FairnessShuffler,
-    conflict_key_registries: [ConflictKeyRegistry; 3],
-    expected_order: Vec<usize>,
-}
-
-impl TestCase {
-    fn run(self) {
-        let Self {
-            shuffler,
-            conflict_key_registries,
-            expected_order,
-        } = self;
-
-        let order =
-            FairnessShufflerImpl::new(&conflict_key_registries, shuffler.window_sizes()).shuffle();
-        assert_eq!(order, expected_order);
-    }
-}
-
-#[test]
-fn test_all_exempt() {
-    TestCase {
-        shuffler: FairnessShuffler::new_for_test(2, 2, 2),
-        conflict_key_registries: [
-            ConflictKeyRegistry::all_exempt(9),
-            ConflictKeyRegistry::all_exempt(9),
-            ConflictKeyRegistry::all_exempt(9),
-        ],
-        expected_order: (0..9).collect(),
-    }
-    .run()
-}
-
-#[test]
-fn test_non_conflict() {
-    TestCase {
-        shuffler: FairnessShuffler::new_for_test(2, 2, 2),
-        conflict_key_registries: [
-            ConflictKeyRegistry::non_conflict(9),
-            ConflictKeyRegistry::non_conflict(9),
-            ConflictKeyRegistry::non_conflict(9),
-        ],
-        expected_order: (0..9).collect(),
-    }
-    .run()
-}
-
-#[test]
-fn test_full_conflict() {
-    TestCase {
-        shuffler: FairnessShuffler::new_for_test(2, 2, 2),
-        conflict_key_registries: [
-            ConflictKeyRegistry::full_conflict(9),
-            ConflictKeyRegistry::full_conflict(9),
-            ConflictKeyRegistry::full_conflict(9),
-        ],
-        expected_order: (0..9).collect(),
-    }
-    .run()
-}
-
-#[test]
-fn test_modules_ignored_by_window_size() {
-    TestCase {
-        shuffler: FairnessShuffler::new_for_test(2, 0, 2),
-        conflict_key_registries: [
-            // [A0, A1, A2, ...]
-            ConflictKeyRegistry::non_conflict(8),
-            // [M0, M0, M0, M0, M1, M1, M2, M2]
-            ConflictKeyRegistry::nums_per_key([4, 2, 2]),
-            // [M0::E0, M0::E1, M0::E0, M0::E1, M1::E0, M1::E0, M2::E0, M2::E0]
-            ConflictKeyRegistry::nums_per_round_per_key([[1, 1, 0], [1, 1, 4]]),
-        ],
-        // [M0::E0, M0::E1, M1::E0, M0::E0, M0::E1, M1::E0, M2::E0, M2::E0]
-        expected_order: vec![0, 1, 4, 2, 3, 5, 6, 7],
-    }
-    .run()
-}
-
-#[test]
-fn test_modules_and_entry_funs_ignored_by_window_size() {
-    TestCase {
-        shuffler: FairnessShuffler::new_for_test(2, 0, 0),
-        conflict_key_registries: [
-            // [A0, A1, A2, ...]
-            ConflictKeyRegistry::non_conflict(8),
-            // [M0, M0, M0, M0, M1, M1, M1, M1]
-            ConflictKeyRegistry::nums_per_key([4, 4]),
-            // [M0::E0, M0::E0, M0::E1, M0::E1, M1::E0, M1::E0, M1::E1, M1::E1]
-            ConflictKeyRegistry::nums_per_key([2, 2, 2, 2]),
-        ],
-        expected_order: (0..8).collect(),
-    }
-    .run()
-}
-
-#[test]
-fn test_exempted_modules() {
-    // think "full block of p2p txns"
-    TestCase {
-        shuffler: FairnessShuffler::new_for_test(3, 2, 2),
-        conflict_key_registries: [
-            // [0:A0, 1:A0, 2:A0, 3:A0, 4:A1, 5:A1, 6:A1, 7:A2, 8:A2, 9:A3]
-            ConflictKeyRegistry::nums_per_key([4, 3, 2, 1]),
-            ConflictKeyRegistry::all_exempt(10),
-            ConflictKeyRegistry::all_exempt(10),
-        ],
-        // [A0, A1, A2, A3, A0, A1, A2, A0, A1]
-        expected_order: vec![0, 4, 7, 9, 1, 5, 8, 2, 3, 6],
-    }
-    .run()
-}
-
-#[test]
-fn test_dominating_module() {
-    TestCase {
-        shuffler: FairnessShuffler::new_for_test(4, 1, 1),
-        conflict_key_registries: [
-            ConflictKeyRegistry::non_conflict(7),
-            // [M0, M0, M0, M1, M2, M3, M4]
-            ConflictKeyRegistry::nums_per_key([3, 1, 1, 1, 1]),
-            ConflictKeyRegistry::nums_per_key([3, 1, 1, 1, 1]),
-        ],
-        // [M0, M1, M0, M2, M0, M3, M4]
-        expected_order: vec![0, 3, 1, 4, 2, 5, 6],
-    }
-    .run()
-}
-
-#[test]
-fn test_dominating_module2() {
-    TestCase {
-        shuffler: FairnessShuffler::new_for_test(4, 1, 1),
-        conflict_key_registries: [
-            ConflictKeyRegistry::non_conflict(8),
-            // [M0, M0, M0, M1, M2, M3, M4, M0]
-            ConflictKeyRegistry::nums_per_round_per_key([[3, 1, 1, 1, 1], [1, 0, 0, 0, 0]]),
-            ConflictKeyRegistry::nums_per_round_per_key([[3, 1, 1, 1, 1], [1, 0, 0, 0, 0]]),
-        ],
-        // [M0, M1, M0, M2, M0, M3, M4, M0]
-        expected_order: vec![0, 3, 1, 4, 2, 5, 6, 7],
-    }
-    .run()
-}
-
-#[test]
-fn test_multiple_entry_funs() {
-    TestCase {
-        shuffler: FairnessShuffler::new_for_test(4, 1, 2),
-        conflict_key_registries: [
-            ConflictKeyRegistry::non_conflict(10),
-            // [M0, M0, M0, M0, M1, M1, M1, M1, M2, M2]
-            ConflictKeyRegistry::nums_per_key([4, 4, 2]),
-            // [M0::E0, M0::E1, M0::E0, M0::E1, M1::E0, M1::E0, M1::E0, M1::E0, M2::E0, M2::E0]
-            ConflictKeyRegistry::nums_per_round_per_key([[1, 1, 0, 0], [1, 1, 4, 2]]),
-        ],
-        // [M0::E0, M1::E0, M0::E1, M2::E0, M0::E0, M1::E0, M0:E1, M2::E0, M1::E0, M1::E0]
-        expected_order: vec![0, 4, 1, 8, 2, 5, 3, 9, 6, 7],
-    }
-    .run()
-}
diff --git a/consensus/src/transaction_shuffler/fairness/tests/proptests.rs b/consensus/src/transaction_shuffler/fairness/tests/proptests.rs
deleted file mode 100644
index 0195997fbf768..0000000000000
--- a/consensus/src/transaction_shuffler/fairness/tests/proptests.rs
+++ /dev/null
@@ -1,104 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::transaction_shuffler::fairness::{
-    conflict_key::{
-        test_utils::{FakeEntryFunKey, FakeEntryFunModuleKey, FakeSenderKey, FakeTxn},
-        ConflictKeyRegistry, MapByKeyId,
-    },
-    reorder, FairnessShuffler, FairnessShufflerImpl, TxnIdx,
-};
-use proptest::{collection::vec, prelude::*};
-use std::collections::BTreeSet;
-
-fn arb_order(num_txns: usize) -> impl Strategy<Value = Vec<TxnIdx>> {
-    Just((0..num_txns).collect::<Vec<_>>()).prop_shuffle()
-}
-
-#[derive(Debug, Default, Eq, PartialEq)]
-enum OrderOrSet {
-    #[default]
-    Empty,
-    Order(Vec<TxnIdx>),
-    Set(BTreeSet<TxnIdx>),
-}
-
-impl OrderOrSet {
-    fn add(&mut self, idx: TxnIdx, is_conflict_exempt: bool) {
-        if self.is_empty() {
-            *self = if is_conflict_exempt {
-                Self::Set(BTreeSet::new())
-            } else {
-                Self::Order(Vec::new())
-            };
-        }
-
-        match self {
-            Self::Order(order) => order.push(idx),
-            Self::Set(set) => {
-                set.insert(idx);
-            },
-            Self::Empty => unreachable!(),
-        }
-    }
-
-    fn is_empty(&self) -> bool {
-        matches!(self, Self::Empty)
-    }
-}
-
-fn sort_by_key(
-    order: impl IntoIterator<Item = TxnIdx>,
-    registry: &ConflictKeyRegistry,
-) -> MapByKeyId<OrderOrSet> {
-    let mut map: MapByKeyId<OrderOrSet> = registry.new_map_by_id();
-
-    for txn_idx in order {
-        let key_id = registry.key_id_for_txn(txn_idx);
-        let is_exempt = registry.is_conflict_exempt(key_id);
-
-        map.get_mut(key_id).add(txn_idx, is_exempt);
-    }
-
-    map
-}
-
-fn assert_invariants(txns: &[FakeTxn], order: Vec<TxnIdx>, registry: &ConflictKeyRegistry) {
-    let num_txns = txns.len();
-    let original_sorted = sort_by_key(0..num_txns, registry);
-    let result_sorted = sort_by_key(order, registry);
-
-    assert_eq!(result_sorted, original_sorted);
-}
-
-fn registries(txns: &[FakeTxn]) -> [ConflictKeyRegistry; 3] {
-    [
-        ConflictKeyRegistry::build::<FakeSenderKey, FakeTxn>(txns),
-        ConflictKeyRegistry::build::<FakeEntryFunModuleKey, FakeTxn>(txns),
-        ConflictKeyRegistry::build::<FakeEntryFunKey, FakeTxn>(txns),
-    ]
-}
-
-proptest! {
-    #[test]
-    fn test_reorder( order in (0..1000usize).prop_flat_map(arb_order) ) {
-        let num_txns = order.len();
-        let txns = (0..num_txns).collect::<Vec<_>>();
-
-        let reordered = reorder(txns, &order);
-        prop_assert_eq!(reordered, order);
-    }
-
-    #[test]
-    fn test_fairness_shuffler(
-        txns in vec(any::<FakeTxn>(), 0..1000),
-        shuffler in any::<FairnessShuffler>(),
-    ) {
-        let registries = registries(&txns);
-        let order = FairnessShufflerImpl::new(&registries, shuffler.window_sizes()).shuffle();
-
-        for registry in &registries {
-            assert_invariants(&txns, order.clone(), registry);
-        }
-    }
-}
diff --git a/consensus/src/transaction_shuffler/mod.rs b/consensus/src/transaction_shuffler/mod.rs
index 5cc43f2a2e8da..a75ce60e0cdd6 100644
--- a/consensus/src/transaction_shuffler/mod.rs
+++ b/consensus/src/transaction_shuffler/mod.rs
@@ -2,18 +2,13 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use aptos_logger::info;
-use aptos_types::{
-    on_chain_config::{
-        TransactionShufflerType,
-        TransactionShufflerType::{DeprecatedSenderAwareV1, NoShuffling, SenderAwareV2},
-    },
-    transaction::SignedTransaction,
-};
+use aptos_types::{on_chain_config::TransactionShufflerType, transaction::SignedTransaction};
 use sender_aware::SenderAwareShuffler;
 use std::sync::Arc;
 
-mod fairness;
+mod deprecated_fairness;
 mod sender_aware;
+mod use_case_aware;
 
 /// Interface to shuffle transactions
 pub trait TransactionShuffler: Send + Sync {
@@ -32,6 +27,8 @@ impl TransactionShuffler for NoOpShuffler {
 pub fn create_transaction_shuffler(
     shuffler_type: TransactionShufflerType,
 ) -> Arc<dyn TransactionShuffler> {
+    use TransactionShufflerType::*;
+
     match shuffler_type {
         NoShuffling => {
             info!("Using no-op transaction shuffling");
@@ -48,7 +45,7 @@ pub fn create_transaction_shuffler(
             );
             Arc::new(SenderAwareShuffler::new(conflict_window_size as usize))
         },
-        TransactionShufflerType::Fairness {
+        DeprecatedFairness {
             sender_conflict_window_size,
             module_conflict_window_size,
             entry_fun_conflict_window_size,
@@ -59,11 +56,27 @@ pub fn create_transaction_shuffler(
                 module_conflict_window_size,
                 entry_fun_conflict_window_size
             );
-            Arc::new(fairness::FairnessShuffler {
+            Arc::new(deprecated_fairness::FairnessShuffler {
                 sender_conflict_window_size: sender_conflict_window_size as usize,
                 module_conflict_window_size: module_conflict_window_size as usize,
                 entry_fun_conflict_window_size: entry_fun_conflict_window_size as usize,
             })
         },
+        UseCaseAware {
+            sender_spread_factor,
+            platform_use_case_spread_factor,
+            user_use_case_spread_factor,
+        } => {
+            let config = use_case_aware::Config {
+                sender_spread_factor,
+                platform_use_case_spread_factor,
+                user_use_case_spread_factor,
+            };
+            info!(
+                config = ?config,
+                "Using use case aware transaction shuffling."
+            );
+            Arc::new(use_case_aware::UseCaseAwareShuffler { config })
+        },
     }
 }
diff --git a/consensus/src/transaction_shuffler/sender_aware.rs b/consensus/src/transaction_shuffler/sender_aware.rs
index 936a9f7e9d0a5..1f1a4ffeabc8d 100644
--- a/consensus/src/transaction_shuffler/sender_aware.rs
+++ b/consensus/src/transaction_shuffler/sender_aware.rs
@@ -70,7 +70,9 @@ impl TransactionShuffler for SenderAwareShuffler {
 
             // If we can't find any candidate in above steps, then lastly
             // add pending transactions in the order if we can't find any other candidate
-            pending_txns.remove_first_pending().unwrap()
+            pending_txns
+                .remove_first_pending()
+                .expect("Pending should return a transaction")
         };
         while sliding_window.num_txns() < num_transactions {
             let txn = next_to_add(&mut sliding_window);
@@ -131,11 +133,10 @@ impl PendingTransactions {
     pub fn remove_first_pending(&mut self) -> Option<SignedTransaction> {
         while let Some(txn) = self.ordered_txns.pop_front() {
             let sender = txn.sender();
-            // We don't remove the txns from ordered_txns when remove_pending_from_sender is called.
-            // So it is possible that the ordered_txns has some transactions that are not pending
-            // anymore.
-            if Some(txn).as_ref() == self.txns_by_senders.get(&sender).unwrap().front() {
-                return self.remove_pending_from_sender(sender);
+            if let Some(sender_queue) = self.txns_by_senders.get(&sender) {
+                if Some(txn).as_ref() == sender_queue.front() {
+                    return self.remove_pending_from_sender(sender);
+                }
             }
         }
         None
@@ -197,11 +198,18 @@ impl SlidingWindowState {
 
     /// Returns the sender which was dropped off of the conflict window in previous iteration.
     pub fn last_dropped_sender(&self) -> Option<AccountAddress> {
-        let prev_start_index = self.start_index - 1;
-        if prev_start_index >= 0 {
-            let last_sender = self.txns.get(prev_start_index as usize).unwrap().sender();
-            if *self.senders_in_window.get(&last_sender).unwrap() == 0 {
-                return Some(last_sender);
+        if self.start_index > 0 {
+            let prev_start_index = self.start_index - 1;
+            if let Some(last_sender) = self
+                .txns
+                .get(prev_start_index as usize)
+                .map(|txn| txn.sender())
+            {
+                if let Some(&count) = self.senders_in_window.get(&last_sender) {
+                    if count == 0 {
+                        return Some(last_sender);
+                    }
+                }
             }
         }
         None
diff --git a/consensus/src/transaction_shuffler/use_case_aware/delayed_queue.rs b/consensus/src/transaction_shuffler/use_case_aware/delayed_queue.rs
new file mode 100644
index 0000000000000..f79cc03b51246
--- /dev/null
+++ b/consensus/src/transaction_shuffler/use_case_aware/delayed_queue.rs
@@ -0,0 +1,540 @@
+// Copyright (c) Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::transaction_shuffler::use_case_aware::{
+    types::{InputIdx, OutputIdx},
+    utils::StrictMap,
+    Config,
+};
+use aptos_types::transaction::use_case::{UseCaseAwareTransaction, UseCaseKey};
+use move_core_types::account_address::AccountAddress;
+use std::{
+    collections::{hash_map, BTreeMap, HashMap, VecDeque},
+    fmt::Debug,
+};
+
+/// Key used in priority queues.
+/// Part of the key is a txn's input index which guarantees in any priority queue, of use cases or
+/// accounts, there are not two entries that share the same delay key. Also, when `try_delay_till`
+/// is identical, an entry relating to a earlier txn is prioritized.
+#[derive(Clone, Copy, Eq, Ord, PartialEq, PartialOrd)]
+struct DelayKey {
+    try_delay_till: OutputIdx,
+    input_idx: InputIdx,
+}
+
+impl DelayKey {
+    fn new(try_delay_till: OutputIdx, input_idx: InputIdx) -> Self {
+        Self {
+            try_delay_till,
+            input_idx,
+        }
+    }
+}
+
+impl Debug for DelayKey {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "DelayKey({}, {})", self.try_delay_till, self.input_idx)
+    }
+}
+
+struct TxnWithInputIdx<Txn> {
+    input_idx: InputIdx,
+    txn: Txn,
+}
+
+impl<Txn> Debug for TxnWithInputIdx<Txn>
+where
+    Txn: Debug,
+{
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "Txn({}: {:?})", self.input_idx, self.txn)
+    }
+}
+
+#[derive(Debug)]
+struct Account<Txn> {
+    try_delay_till: OutputIdx,
+    /// Head txn input_idx, tracked for use when the txns queue is empty, in which case
+    /// it keeps the value before the last txn was dequeued.
+    input_idx: InputIdx,
+    txns: VecDeque<TxnWithInputIdx<Txn>>,
+}
+
+impl<Txn> Account<Txn>
+where
+    Txn: UseCaseAwareTransaction,
+{
+    fn new_with_txn(try_delay_till: OutputIdx, input_idx: InputIdx, txn: Txn) -> Self {
+        let txns = vec![TxnWithInputIdx { input_idx, txn }].into();
+        Self {
+            try_delay_till,
+            input_idx,
+            txns,
+        }
+    }
+
+    fn new_empty(try_delay_till: OutputIdx, input_idx: InputIdx) -> Self {
+        Self {
+            try_delay_till,
+            input_idx,
+            txns: VecDeque::new(),
+        }
+    }
+
+    fn is_empty(&self) -> bool {
+        self.txns.is_empty()
+    }
+
+    fn delay_key(&self) -> DelayKey {
+        DelayKey {
+            try_delay_till: self.try_delay_till,
+            input_idx: self.input_idx,
+        }
+    }
+
+    fn expect_first_txn(&self) -> &TxnWithInputIdx<Txn> {
+        self.txns.front().expect("Must exist.")
+    }
+
+    fn expect_use_case_key(&self) -> UseCaseKey {
+        self.expect_first_txn().txn.parse_use_case()
+    }
+
+    fn queue_txn(&mut self, input_idx: InputIdx, txn: Txn) {
+        if let Some(last_txn) = self.txns.back() {
+            assert!(last_txn.input_idx < input_idx);
+        } else {
+            self.input_idx = input_idx;
+        }
+        self.txns.push_back(TxnWithInputIdx { input_idx, txn });
+    }
+
+    fn expect_dequeue_txn(&mut self) -> TxnWithInputIdx<Txn> {
+        let txn = self.txns.pop_front().expect("Must exist.");
+        if let Some(next_txn) = self.txns.front() {
+            self.input_idx = next_txn.input_idx;
+        }
+        txn
+    }
+
+    fn update_try_delay_till(&mut self, try_delay_till: OutputIdx) {
+        self.try_delay_till = try_delay_till;
+    }
+}
+
+#[derive(Debug)]
+struct UseCase {
+    try_delay_till: OutputIdx,
+    /// Head account input_idx, tracked for use when the accounts queue is empty, in which case
+    /// it keeps the value before the last account was removed.
+    input_idx: InputIdx,
+    account_by_delay: BTreeMap<DelayKey, AccountAddress>,
+}
+
+impl UseCase {
+    fn new_empty(try_delay_till: OutputIdx, input_idx: InputIdx) -> Self {
+        Self {
+            try_delay_till,
+            input_idx,
+            account_by_delay: BTreeMap::new(),
+        }
+    }
+
+    fn new_with_account<Txn>(
+        try_delay_till: OutputIdx,
+        address: AccountAddress,
+        account: &Account<Txn>,
+    ) -> Self
+    where
+        Txn: UseCaseAwareTransaction,
+    {
+        let mut account_by_delay = BTreeMap::new();
+        account_by_delay.strict_insert(account.delay_key(), address);
+        Self {
+            try_delay_till,
+            input_idx: account.input_idx,
+            account_by_delay,
+        }
+    }
+
+    fn is_empty(&self) -> bool {
+        self.account_by_delay.is_empty()
+    }
+
+    fn delay_key(&self) -> DelayKey {
+        // If head account will be ready later than the use case itself, respect that.
+        let try_delay_till = std::cmp::max(
+            self.try_delay_till,
+            self.account_by_delay
+                .first_key_value()
+                .map_or(0, |(k, _)| k.try_delay_till),
+        );
+
+        DelayKey {
+            try_delay_till,
+            input_idx: self.input_idx,
+        }
+    }
+
+    /// Expects head account to exist (otherwise panic) and return both the DelayKey and the
+    /// account address for the entry.
+    fn expect_pop_head_account(&mut self) -> (DelayKey, AccountAddress) {
+        let (account_delay_key, address) = self.account_by_delay.pop_first().expect("Must exist.");
+        if let Some((next_account_delay_key, _)) = self.account_by_delay.first_key_value() {
+            self.input_idx = next_account_delay_key.input_idx;
+        }
+        (account_delay_key, address)
+    }
+
+    fn update_try_delay_till(&mut self, try_delay_till: OutputIdx) {
+        self.try_delay_till = try_delay_till;
+    }
+
+    fn add_account<Txn>(&mut self, address: AccountAddress, account: &Account<Txn>)
+    where
+        Txn: UseCaseAwareTransaction,
+    {
+        let account_delay_key = account.delay_key();
+        self.account_by_delay
+            .strict_insert(account_delay_key, address);
+        let (_, head_address) = self
+            .account_by_delay
+            .first_key_value()
+            .expect("Must exist.");
+        if head_address == &address {
+            self.input_idx = account_delay_key.input_idx;
+        }
+    }
+}
+
+/// Structure to track:
+///     1. all use cases and accounts that are subject to delaying, no matter they have pending txns
+/// associated or not.
+///     2. all txns that are examined and delayed previously.
+///
+/// Note:
+///     A delayed txn is attached to an account and the account is attached to a priority queue in a use
+/// case, which has an entry in the main priority queue.
+///     Empty accounts and use cases are still tracked for the delay so that a next txn in the
+/// input stream is properly delayed if associated with such an account or use case.
+#[derive(Debug, Default)]
+pub(crate) struct DelayedQueue<Txn> {
+    /// Registry of all accounts, each of which includes the expected output_idx to delay until and
+    /// a queue (might be empty) of txns by that sender.
+    ///
+    /// An empty account address is tracked in `account_placeholders_by_delay` while a non-empty
+    /// account address is tracked under `use_cases`.
+    accounts: HashMap<AccountAddress, Account<Txn>>,
+    /// Registry of all use cases, each of which includes the expected output_idx to delay until and
+    /// a priority queue (might be empty) of non-empty accounts whose head txn belongs to that use case.
+    ///
+    /// An empty use case is tracked in `use_case_placeholders_by_delay` while a non-empty use case
+    /// is tracked in the top level `use_cases_by_delay`.
+    use_cases: HashMap<UseCaseKey, UseCase>,
+
+    /// Main delay queue of txns. All use cases are non-empty of non-empty accounts.
+    /// All pending txns are reachable from this nested structure.
+    ///
+    /// The DelayKey is derived from the head account's DelayKey combined with the use case's own
+    /// DelayKey.
+    ///
+    /// The head txn of the head account of the head use case in this nested structure is the
+    /// next txn to be possibly ready.
+    use_cases_by_delay: BTreeMap<DelayKey, UseCaseKey>,
+    /// Empty account addresses by the DelayKey (those w/o known delayed txns), kept to track the delay.
+    account_placeholders_by_delay: BTreeMap<DelayKey, AccountAddress>,
+    /// Empty UseCaseKeys by the DelayKey (those w/o known delayed txns), kept to track the delay.
+    use_case_placeholders_by_delay: BTreeMap<DelayKey, UseCaseKey>,
+
+    /// Externally set output index; when an item has try_delay_till <= output_idx, it's deemed ready
+    output_idx: OutputIdx,
+
+    config: Config,
+}
+
+impl<Txn> DelayedQueue<Txn>
+where
+    Txn: UseCaseAwareTransaction,
+{
+    pub fn new(config: Config) -> Self {
+        Self {
+            accounts: HashMap::new(),
+            use_cases: HashMap::new(),
+
+            account_placeholders_by_delay: BTreeMap::new(),
+            use_case_placeholders_by_delay: BTreeMap::new(),
+
+            use_cases_by_delay: BTreeMap::new(),
+
+            output_idx: 0,
+
+            config,
+        }
+    }
+
+    /// Remove stale (empty use cases and accounts with try_delay_till <= self.output_idx) placeholders.
+    fn drain_placeholders(&mut self) {
+        let least_to_keep = DelayKey::new(self.output_idx + 1, 0);
+
+        let remaining_use_case_placeholders = self
+            .use_case_placeholders_by_delay
+            .split_off(&least_to_keep);
+        let remaining_account_placeholders =
+            self.account_placeholders_by_delay.split_off(&least_to_keep);
+
+        self.use_case_placeholders_by_delay
+            .iter()
+            .for_each(|(_delay_key, use_case_key)| self.use_cases.strict_remove(use_case_key));
+        self.account_placeholders_by_delay
+            .iter()
+            .for_each(|(_delay_key, address)| self.accounts.strict_remove(address));
+
+        self.use_case_placeholders_by_delay = remaining_use_case_placeholders;
+        self.account_placeholders_by_delay = remaining_account_placeholders;
+    }
+
+    pub fn bump_output_idx(&mut self, output_idx: OutputIdx) {
+        assert!(output_idx >= self.output_idx);
+        // It's possible that the queue returned nothing last round hence the output idx didn't move.
+        if output_idx > self.output_idx {
+            self.output_idx = output_idx;
+            self.drain_placeholders();
+        }
+    }
+
+    pub fn pop_head(&mut self, only_if_ready: bool) -> Option<Txn> {
+        // See if any delayed txn exists. If not, return None.
+        let use_case_entry = match self.use_cases_by_delay.first_entry() {
+            None => {
+                return None;
+            },
+            Some(occupied_entry) => occupied_entry,
+        };
+        let use_case_delay_key = use_case_entry.key();
+
+        // Check readiness.
+        if only_if_ready && use_case_delay_key.try_delay_till > self.output_idx {
+            return None;
+        }
+
+        // Gonna return the front txn of the front account of the front use case.
+
+        // First, both the use case and account need to be removed from the priority queues.
+        let use_case_delay_key = *use_case_delay_key;
+        let use_case_key = use_case_entry.remove();
+        let use_case = self.use_cases.expect_mut(&use_case_key);
+        let (account_delay_key, address) = use_case.expect_pop_head_account();
+        assert!(account_delay_key.try_delay_till <= use_case_delay_key.try_delay_till);
+        assert_eq!(account_delay_key.input_idx, use_case_delay_key.input_idx);
+
+        // Pop first txn from account (for returning it later).
+        let account = self.accounts.expect_mut(&address);
+        let txn = account.expect_dequeue_txn();
+
+        // Update priorities.
+        account.update_try_delay_till(self.output_idx + 1 + self.config.sender_spread_factor());
+        use_case.update_try_delay_till(
+            self.output_idx + 1 + self.config.use_case_spread_factor(&use_case_key),
+        );
+
+        // Add account and original use case back to delay queues.
+
+        if account.is_empty() {
+            self.account_placeholders_by_delay
+                .strict_insert(account.delay_key(), address);
+            if use_case.is_empty() {
+                self.use_case_placeholders_by_delay
+                    .strict_insert(use_case.delay_key(), use_case_key.clone());
+            } else {
+                self.use_cases_by_delay
+                    .strict_insert(use_case.delay_key(), use_case_key.clone());
+            }
+        } else {
+            // See if account now belongs to a different use case.
+            let new_use_case_key = account.expect_use_case_key();
+            if new_use_case_key == use_case_key {
+                use_case.add_account(address, account);
+                self.use_cases_by_delay
+                    .strict_insert(use_case.delay_key(), use_case_key.clone());
+            } else {
+                // Account now belongs to a different use case.
+
+                // Add original use case back to delay queue.
+                if use_case.is_empty() {
+                    self.use_case_placeholders_by_delay
+                        .strict_insert(use_case.delay_key(), use_case_key.clone());
+                } else {
+                    self.use_cases_by_delay
+                        .strict_insert(use_case.delay_key(), use_case_key.clone());
+                }
+
+                // Add the account to the new use case.
+                match self.use_cases.entry(new_use_case_key.clone()) {
+                    hash_map::Entry::Occupied(mut occupied_entry) => {
+                        // Existing use case, remove from priority queues.
+                        let new_use_case = occupied_entry.get_mut();
+                        if new_use_case.is_empty() {
+                            self.use_case_placeholders_by_delay
+                                .strict_remove(&new_use_case.delay_key());
+                        } else {
+                            self.use_cases_by_delay
+                                .strict_remove(&new_use_case.delay_key());
+                        }
+                        // Add account to use case.
+                        new_use_case.add_account(address, account);
+                        // Add new use case back to delay queue.
+                        self.use_cases_by_delay
+                            .strict_insert(new_use_case.delay_key(), new_use_case_key.clone());
+                    },
+                    hash_map::Entry::Vacant(entry) => {
+                        // Use case not tracked previously, try_delay_till = output_idx + 1
+                        let new_use_case = entry.insert(UseCase::new_with_account(
+                            self.output_idx + 1,
+                            address,
+                            account,
+                        ));
+                        self.use_cases_by_delay
+                            .strict_insert(new_use_case.delay_key(), new_use_case_key.clone());
+                    },
+                }
+            }
+        }
+
+        Some(txn.txn)
+    }
+
+    /// Txn has to be delayed, attach it to respective account and use case.
+    fn queue_txn(
+        &mut self,
+        input_idx: InputIdx,
+        address: AccountAddress,
+        use_case_key: UseCaseKey,
+        txn: Txn,
+    ) {
+        match self.accounts.get_mut(&address) {
+            Some(account) => {
+                if account.is_empty() {
+                    // Account placeholder exists, move it from the placeholder queue to the main queue.
+                    self.account_placeholders_by_delay
+                        .remove(&account.delay_key());
+                    account.queue_txn(input_idx, txn);
+                    match self.use_cases.entry(use_case_key.clone()) {
+                        hash_map::Entry::Occupied(occupied) => {
+                            let use_case = occupied.into_mut();
+                            if use_case.is_empty() {
+                                self.use_case_placeholders_by_delay
+                                    .strict_remove(&use_case.delay_key());
+                            } else {
+                                self.use_cases_by_delay.strict_remove(&use_case.delay_key());
+                            }
+                            use_case.add_account(address, account);
+                            self.use_cases_by_delay
+                                .strict_insert(use_case.delay_key(), use_case_key.clone());
+                        },
+                        hash_map::Entry::Vacant(vacant) => {
+                            // Use case not tracked previously, the use case is ready at the current
+                            // output_idx, instead of output_idx +1 -- it makes a difference if
+                            // a txn later in the input queue that's of the same use case but not
+                            // blocked by account delay is tested for readiness.
+                            let use_case =
+                                UseCase::new_with_account(self.output_idx, address, account);
+                            self.use_cases_by_delay
+                                .strict_insert(use_case.delay_key(), use_case_key.clone());
+                            vacant.insert(use_case);
+                        },
+                    }
+                } else {
+                    // Account tracked and not empty, so appending a new txn to it won't affect positions
+                    // in delay queues
+                    account.queue_txn(input_idx, txn);
+                }
+            },
+            None => {
+                // Account not previously tracked.
+                let account = Account::new_with_txn(self.output_idx + 1, input_idx, txn);
+                // Account didn't exist before, so use case must have been tracked, otherwise the
+                // txn whould've been selected for output, bypassing the queue.
+                let use_case = self.use_cases.expect_mut(&use_case_key);
+                if use_case.is_empty() {
+                    self.use_case_placeholders_by_delay
+                        .strict_remove(&use_case.delay_key());
+                } else {
+                    self.use_cases_by_delay.strict_remove(&use_case.delay_key());
+                }
+                use_case.add_account(address, &account);
+
+                self.accounts.strict_insert(address, account);
+                self.use_cases_by_delay
+                    .strict_insert(use_case.delay_key(), use_case_key.clone());
+            },
+        }
+    }
+
+    /// Txn from input queue directly selected for output, needs to bump delays for relevant
+    /// account and use case.
+    fn update_delays_for_selected_txn(
+        &mut self,
+        input_idx: InputIdx,
+        address: AccountAddress,
+        use_case_key: UseCaseKey,
+    ) {
+        let account_try_delay_till = self.output_idx + 1 + self.config.sender_spread_factor();
+        let use_case_try_delay_till =
+            self.output_idx + 1 + self.config.use_case_spread_factor(&use_case_key);
+
+        match self.use_cases.entry(use_case_key.clone()) {
+            hash_map::Entry::Occupied(occupied) => {
+                let use_case = occupied.into_mut();
+                // Txn wouldn't have been selected for output if the use case is empty (tracking
+                // for a try_delay_till > self.output_idx)
+                assert!(!use_case.is_empty());
+
+                self.use_cases_by_delay.strict_remove(&use_case.delay_key());
+                use_case.update_try_delay_till(use_case_try_delay_till);
+                self.use_cases_by_delay
+                    .strict_insert(use_case.delay_key(), use_case_key);
+            },
+            hash_map::Entry::Vacant(vacant) => {
+                let use_case = UseCase::new_empty(use_case_try_delay_till, input_idx);
+                self.use_case_placeholders_by_delay
+                    .strict_insert(use_case.delay_key(), use_case_key);
+                vacant.insert(use_case);
+            },
+        }
+
+        // Notice this function is called after the txn is selected for output due to no delaying
+        // needed, so the account must not have been tracked before, otherwise it wouldn't have been
+        // selected for output.
+        let new_account = Account::new_empty(account_try_delay_till, input_idx);
+        let new_account_delay_key = new_account.delay_key();
+        self.accounts.strict_insert(address, new_account);
+        self.account_placeholders_by_delay
+            .strict_insert(new_account_delay_key, address);
+    }
+
+    /// Return the txn back if relevant use case and sender are not subject to delaying. Otherwise,
+    /// Queue it up.
+    pub fn queue_or_return(&mut self, input_idx: InputIdx, txn: Txn) -> Option<Txn> {
+        let address = txn.parse_sender();
+        let account_opt = self.accounts.get_mut(&address);
+        let use_case_key = txn.parse_use_case();
+        let use_case_opt = self.use_cases.get_mut(&use_case_key);
+
+        let account_should_delay = account_opt.as_ref().map_or(false, |account| {
+            !account.is_empty()  // needs delaying due to queued txns under the same account
+                    || account.try_delay_till > self.output_idx
+        });
+        let use_case_should_delay = use_case_opt
+            .as_ref()
+            .map_or(false, |use_case| use_case.try_delay_till > self.output_idx);
+
+        if account_should_delay || use_case_should_delay {
+            self.queue_txn(input_idx, address, use_case_key, txn);
+            None
+        } else {
+            self.update_delays_for_selected_txn(input_idx, address, use_case_key);
+            Some(txn)
+        }
+    }
+}
diff --git a/consensus/src/transaction_shuffler/use_case_aware/iterator.rs b/consensus/src/transaction_shuffler/use_case_aware/iterator.rs
new file mode 100644
index 0000000000000..b7cfa0fd1412b
--- /dev/null
+++ b/consensus/src/transaction_shuffler/use_case_aware/iterator.rs
@@ -0,0 +1,79 @@
+// Copyright (c) Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::transaction_shuffler::use_case_aware::{
+    delayed_queue::DelayedQueue,
+    types::{InputIdx, OutputIdx},
+    Config,
+};
+use aptos_types::transaction::use_case::UseCaseAwareTransaction;
+use std::{collections::VecDeque, fmt::Debug};
+
+#[derive(Debug)]
+pub(super) struct ShuffledTransactionIterator<Txn> {
+    input_queue: VecDeque<Txn>,
+    delayed_queue: DelayedQueue<Txn>,
+    input_idx: InputIdx,
+    output_idx: OutputIdx,
+}
+
+impl<Txn> ShuffledTransactionIterator<Txn>
+where
+    Txn: UseCaseAwareTransaction + Debug,
+{
+    pub(super) fn new(config: Config) -> Self {
+        Self {
+            input_queue: VecDeque::new(),
+            delayed_queue: DelayedQueue::new(config),
+            input_idx: 0,
+            output_idx: 0,
+        }
+    }
+
+    pub(super) fn extended_with(mut self, txns: impl IntoIterator<Item = Txn>) -> Self {
+        self.input_queue.extend(txns);
+        self
+    }
+
+    pub(super) fn select_next_txn(&mut self) -> Option<Txn> {
+        let ret = self.select_next_txn_inner();
+        if ret.is_some() {
+            self.output_idx += 1;
+        }
+        ret
+    }
+
+    pub(super) fn select_next_txn_inner(&mut self) -> Option<Txn> {
+        self.delayed_queue.bump_output_idx(self.output_idx);
+
+        // 1. if anything delayed became ready, return it
+        if let Some(txn) = self.delayed_queue.pop_head(true) {
+            return Some(txn);
+        }
+
+        // 2. Otherwise, seek in the input queue for something that shouldn't be delayed due to either
+        // the sender or the use case.
+        while let Some(txn) = self.input_queue.pop_front() {
+            let input_idx = self.input_idx;
+            self.input_idx += 1;
+
+            if let Some(txn) = self.delayed_queue.queue_or_return(input_idx, txn) {
+                return Some(txn);
+            }
+        }
+
+        // 3. If nothing is ready, return the next eligible from the delay queue
+        self.delayed_queue.pop_head(false)
+    }
+}
+
+impl<Txn> Iterator for ShuffledTransactionIterator<Txn>
+where
+    Txn: UseCaseAwareTransaction + Debug,
+{
+    type Item = Txn;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        self.select_next_txn()
+    }
+}
diff --git a/consensus/src/transaction_shuffler/use_case_aware/mod.rs b/consensus/src/transaction_shuffler/use_case_aware/mod.rs
new file mode 100644
index 0000000000000..2c268e7e8a90c
--- /dev/null
+++ b/consensus/src/transaction_shuffler/use_case_aware/mod.rs
@@ -0,0 +1,48 @@
+// Copyright (c) Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::transaction_shuffler::TransactionShuffler;
+use aptos_types::transaction::{use_case::UseCaseKey, SignedTransaction};
+use iterator::ShuffledTransactionIterator;
+
+pub(crate) mod iterator;
+pub(crate) mod types;
+pub(crate) mod utils;
+
+pub(crate) mod delayed_queue;
+#[cfg(test)]
+mod tests;
+
+#[derive(Clone, Debug, Default)]
+pub(crate) struct Config {
+    pub sender_spread_factor: usize,
+    pub platform_use_case_spread_factor: usize,
+    pub user_use_case_spread_factor: usize,
+}
+
+impl Config {
+    pub(crate) fn sender_spread_factor(&self) -> usize {
+        self.sender_spread_factor
+    }
+
+    pub(crate) fn use_case_spread_factor(&self, use_case_key: &UseCaseKey) -> usize {
+        use UseCaseKey::*;
+
+        match use_case_key {
+            Platform => self.platform_use_case_spread_factor,
+            ContractAddress(..) | Others => self.user_use_case_spread_factor,
+        }
+    }
+}
+
+pub struct UseCaseAwareShuffler {
+    pub config: Config,
+}
+
+impl TransactionShuffler for UseCaseAwareShuffler {
+    fn shuffle(&self, txns: Vec<SignedTransaction>) -> Vec<SignedTransaction> {
+        ShuffledTransactionIterator::new(self.config.clone())
+            .extended_with(txns)
+            .collect()
+    }
+}
diff --git a/consensus/src/transaction_shuffler/use_case_aware/tests/manual.rs b/consensus/src/transaction_shuffler/use_case_aware/tests/manual.rs
new file mode 100644
index 0000000000000..5b2a7d1a25c83
--- /dev/null
+++ b/consensus/src/transaction_shuffler/use_case_aware/tests/manual.rs
@@ -0,0 +1,203 @@
+// Copyright (c) Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::transaction_shuffler::use_case_aware::{
+    iterator::ShuffledTransactionIterator,
+    tests,
+    tests::{Account, Contract},
+    Config,
+};
+use itertools::Itertools;
+
+const PP: Contract = Contract::Platform;
+const OO: Contract = Contract::Others;
+const C1: Contract = Contract::User(0xF1);
+const C2: Contract = Contract::User(0xF2);
+const C3: Contract = Contract::User(0xF3);
+const A1: Account = Account(1);
+const A2: Account = Account(2);
+const A3: Account = Account(3);
+const A4: Account = Account(4);
+
+fn assert_shuffle_result(
+    config: Config,
+    txns: impl IntoIterator<Item = (Contract, Account)>,
+    expected_order: impl IntoIterator<Item = usize>,
+) {
+    let txns = tests::into_txns(txns);
+    let actual_order = ShuffledTransactionIterator::new(config)
+        .extended_with(txns)
+        .map(|txn| txn.original_idx)
+        .collect_vec();
+    let expected_order = expected_order.into_iter().collect_vec();
+    assert_eq!(actual_order, expected_order, "actual != expected");
+}
+
+fn three_senders_txns() -> [(Contract, Account); 10] {
+    [
+        // 5 txns from A1
+        (PP, A1),
+        (OO, A1),
+        (C1, A1),
+        (C2, A1),
+        (C3, A1),
+        // 3 txns from A2
+        (PP, A2),
+        (PP, A2),
+        (PP, A2),
+        // 2 txns from A3
+        (C1, A3),
+        (C1, A3),
+    ]
+}
+
+#[test]
+fn test_no_spreading() {
+    let config = Config {
+        sender_spread_factor: 0,
+        platform_use_case_spread_factor: 0,
+        user_use_case_spread_factor: 0,
+    };
+    let txns = three_senders_txns();
+
+    assert_shuffle_result(config, txns, [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]);
+}
+
+#[test]
+fn test_spread_by_sender_1() {
+    let config = Config {
+        sender_spread_factor: 1,
+        // ignore use case conflicts
+        platform_use_case_spread_factor: 0,
+        // ignore use case conflicts
+        user_use_case_spread_factor: 0,
+    };
+    let txns = three_senders_txns();
+
+    assert_shuffle_result(config, txns, [0, 5, 1, 6, 2, 7, 3, 8, 4, 9]);
+}
+
+#[test]
+fn test_spread_by_sender_by_large_factor() {
+    for sender_spread_factor in [2, 3, 4] {
+        let config = Config {
+            sender_spread_factor,
+            platform_use_case_spread_factor: 0,
+            user_use_case_spread_factor: 0,
+        };
+        let txns = three_senders_txns();
+
+        assert_shuffle_result(config, txns, [0, 5, 8, 1, 6, 9, 2, 7, 3, 4]);
+    }
+}
+
+fn three_contracts_txns() -> [(Contract, Account); 10] {
+    [
+        // 5 txns from C1
+        (C1, A1),
+        (C1, A1),
+        (C1, A1),
+        (C1, A1),
+        (C1, A1),
+        // 3 txns from C2
+        (C2, A2),
+        (C2, A2),
+        (C2, A2),
+        // 2 txns from C3
+        (C3, A3),
+        (C3, A3),
+    ]
+}
+
+#[test]
+fn test_spread_by_use_case_1() {
+    let config = Config {
+        sender_spread_factor: 0,
+        platform_use_case_spread_factor: 0,
+        user_use_case_spread_factor: 1,
+    };
+    let txns = three_contracts_txns();
+
+    assert_shuffle_result(config, txns, [0, 5, 1, 6, 2, 7, 3, 8, 4, 9]);
+}
+
+#[test]
+fn test_spread_by_use_case_by_large_factor() {
+    for user_use_case_spread_factor in [2, 3, 4] {
+        let config = Config {
+            sender_spread_factor: 0,
+            platform_use_case_spread_factor: 0,
+            user_use_case_spread_factor,
+        };
+        let txns = three_contracts_txns();
+
+        assert_shuffle_result(config, txns, [0, 5, 8, 1, 6, 9, 2, 7, 3, 4]);
+    }
+}
+
+fn user_and_platform_use_cases() -> [(Contract, Account); 10] {
+    [
+        // 5 txns from C1
+        (C1, A1),
+        (C1, A1),
+        (C1, A1),
+        (C1, A1),
+        (C1, A1),
+        // 3 txns from C2
+        (PP, A2),
+        (PP, A2),
+        (PP, A2),
+        // 2 txns from C3
+        (PP, A3),
+        (PP, A3),
+    ]
+}
+
+#[test]
+fn test_platform_txn_priority_0() {
+    let config = Config {
+        sender_spread_factor: 0,
+        platform_use_case_spread_factor: 0,
+        user_use_case_spread_factor: 3,
+    };
+    let txns = user_and_platform_use_cases();
+
+    assert_shuffle_result(config, txns, [0, 5, 6, 7, 1, 8, 9, 2, 3, 4]);
+}
+
+#[test]
+fn test_platform_txn_priority_1() {
+    let config = Config {
+        sender_spread_factor: 0,
+        platform_use_case_spread_factor: 1,
+        user_use_case_spread_factor: 3,
+    };
+    let txns = user_and_platform_use_cases();
+
+    assert_shuffle_result(config, txns, [0, 5, 6, 1, 7, 8, 2, 9, 3, 4]);
+}
+
+#[test]
+fn test_spread_sender_within_use_case() {
+    let config = Config {
+        sender_spread_factor: 2,
+        platform_use_case_spread_factor: 0,
+        user_use_case_spread_factor: 1,
+    };
+    let txns = [
+        // 5 txns from C1
+        (C1, A1),
+        (C1, A1),
+        (C1, A2),
+        (C1, A2),
+        (C1, A2),
+        // 3 txns from C2
+        (C2, A3),
+        (C2, A3),
+        (C2, A3),
+        (C2, A4),
+        (C2, A4),
+    ];
+
+    assert_shuffle_result(config, txns, [0, 5, 2, 8, 1, 6, 3, 9, 4, 7]);
+}
diff --git a/consensus/src/transaction_shuffler/use_case_aware/tests/mod.rs b/consensus/src/transaction_shuffler/use_case_aware/tests/mod.rs
new file mode 100644
index 0000000000000..e409ae9772ce9
--- /dev/null
+++ b/consensus/src/transaction_shuffler/use_case_aware/tests/mod.rs
@@ -0,0 +1,94 @@
+// Copyright (c) Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use aptos_types::transaction::use_case::{UseCaseAwareTransaction, UseCaseKey};
+use move_core_types::account_address::AccountAddress;
+use proptest_derive::Arbitrary;
+use std::fmt::Debug;
+
+mod manual;
+mod proptests;
+
+#[derive(Arbitrary)]
+enum Contract {
+    Platform,
+    Others,
+    User(u8),
+}
+
+impl Debug for Contract {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        use Contract::*;
+
+        write!(f, "c{}", match self {
+            Platform => "PP".to_string(),
+            Others => "OO".to_string(),
+            User(addr) => hex::encode_upper(addr.to_be_bytes()),
+        })
+    }
+}
+
+#[derive(Arbitrary)]
+struct Account(u8);
+
+impl Debug for Account {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "a{}", hex::encode_upper(self.0.to_be_bytes()))
+    }
+}
+
+impl Account {
+    fn as_account_address(&self) -> AccountAddress {
+        let mut addr = [0u8; 32];
+        addr[31..].copy_from_slice(&self.0.to_be_bytes());
+        AccountAddress::new(addr)
+    }
+}
+
+struct Transaction {
+    contract: Contract,
+    sender: Account,
+    original_idx: usize,
+}
+
+impl Debug for Transaction {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(
+            f,
+            "t{}:{:?}{:?}",
+            self.original_idx, self.contract, self.sender
+        )
+    }
+}
+
+impl UseCaseAwareTransaction for Transaction {
+    fn parse_sender(&self) -> AccountAddress {
+        self.sender.as_account_address()
+    }
+
+    fn parse_use_case(&self) -> UseCaseKey {
+        use UseCaseKey::*;
+
+        match self.contract {
+            Contract::Platform => Platform,
+            Contract::Others => Others,
+            Contract::User(c) => ContractAddress(Account(c).as_account_address()),
+        }
+    }
+}
+
+fn into_txns(txns: impl IntoIterator<Item = (Contract, Account)>) -> Vec<Transaction> {
+    let mut original_idx = 0;
+    txns.into_iter()
+        .map(|(contract, sender)| {
+            let txn = Transaction {
+                contract,
+                sender,
+                original_idx,
+            };
+
+            original_idx += 1;
+            txn
+        })
+        .collect()
+}
diff --git a/consensus/src/transaction_shuffler/use_case_aware/tests/proptests.rs b/consensus/src/transaction_shuffler/use_case_aware/tests/proptests.rs
new file mode 100644
index 0000000000000..ef84499776d34
--- /dev/null
+++ b/consensus/src/transaction_shuffler/use_case_aware/tests/proptests.rs
@@ -0,0 +1,49 @@
+// Copyright (c) Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::transaction_shuffler::use_case_aware::{
+    iterator::ShuffledTransactionIterator,
+    tests::{into_txns, Account, Contract, Transaction},
+    Config,
+};
+use itertools::Itertools;
+use proptest::{collection::vec, prelude::*};
+use std::collections::HashMap;
+
+fn txn_indices_by_account(txns: &[Transaction]) -> HashMap<u8, Vec<usize>> {
+    txns.iter()
+        .map(|txn| (txn.sender.0, txn.original_idx))
+        .into_group_map()
+}
+
+proptest! {
+    #[test]
+    fn test_no_panic(
+        txns in vec(any::<(Contract, Account)>(), 0..100)
+        .prop_map(into_txns),
+        sender_factor in 0..100usize,
+        platform_factor in 0..100usize,
+        user_contract_factor in 0..100usize,
+    ) {
+        let num_txns = txns.len();
+        let txns_by_account = txn_indices_by_account(&txns);
+
+        let config = Config {
+            sender_spread_factor: sender_factor,
+            platform_use_case_spread_factor: platform_factor,
+            user_use_case_spread_factor: user_contract_factor,
+        };
+
+        let shuffled_txns = ShuffledTransactionIterator::new(config)
+            .extended_with(txns)
+            .collect_vec();
+
+        prop_assert_eq!(
+            txn_indices_by_account(&shuffled_txns),
+            txns_by_account
+        );
+
+        let txn_indices = shuffled_txns.into_iter().map(|txn| txn.original_idx).sorted().collect_vec();
+        prop_assert_eq!(txn_indices, (0..num_txns).collect_vec());
+    }
+}
diff --git a/consensus/src/transaction_shuffler/use_case_aware/types.rs b/consensus/src/transaction_shuffler/use_case_aware/types.rs
new file mode 100644
index 0000000000000..d68b67d8ffaa1
--- /dev/null
+++ b/consensus/src/transaction_shuffler/use_case_aware/types.rs
@@ -0,0 +1,5 @@
+// Copyright (c) Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+pub(crate) type InputIdx = usize;
+pub(crate) type OutputIdx = usize;
diff --git a/consensus/src/transaction_shuffler/use_case_aware/utils.rs b/consensus/src/transaction_shuffler/use_case_aware/utils.rs
new file mode 100644
index 0000000000000..a0e75d075766e
--- /dev/null
+++ b/consensus/src/transaction_shuffler/use_case_aware/utils.rs
@@ -0,0 +1,43 @@
+// Copyright (c) Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use std::{
+    collections::{BTreeMap, HashMap},
+    hash::Hash,
+};
+
+pub(crate) trait StrictMap<K, V> {
+    fn strict_insert(&mut self, key: K, value: V);
+
+    fn strict_remove(&mut self, key: &K);
+
+    fn expect_mut(&mut self, key: &K) -> &mut V;
+}
+
+impl<K: Eq + Hash, V> StrictMap<K, V> for HashMap<K, V> {
+    fn strict_insert(&mut self, key: K, value: V) {
+        assert!(self.insert(key, value).is_none())
+    }
+
+    fn strict_remove(&mut self, key: &K) {
+        assert!(self.remove(key).is_some())
+    }
+
+    fn expect_mut(&mut self, key: &K) -> &mut V {
+        self.get_mut(key).expect("Known to exist.")
+    }
+}
+
+impl<K: Ord, V> StrictMap<K, V> for BTreeMap<K, V> {
+    fn strict_insert(&mut self, key: K, value: V) {
+        assert!(self.insert(key, value).is_none())
+    }
+
+    fn strict_remove(&mut self, key: &K) {
+        assert!(self.remove(key).is_some())
+    }
+
+    fn expect_mut(&mut self, key: &K) -> &mut V {
+        self.get_mut(key).expect("Known to exist.")
+    }
+}
diff --git a/consensus/src/twins/twins_node.rs b/consensus/src/twins/twins_node.rs
index c0ce9d6090e63..a1b511cb8c915 100644
--- a/consensus/src/twins/twins_node.rs
+++ b/consensus/src/twins/twins_node.rs
@@ -8,7 +8,7 @@ use crate::{
     network::NetworkTask,
     network_interface::{ConsensusNetworkClient, DIRECT_SEND, RPC},
     network_tests::{NetworkPlayground, TwinId},
-    payload_manager::PayloadManager,
+    payload_manager::DirectMempoolPayloadManager,
     pipeline::buffer_manager::OrderedBlocks,
     quorum_store::quorum_store_db::MockQuorumStoreDB,
     rand::rand_gen::storage::in_memory::InMemRandDb,
@@ -98,7 +98,7 @@ impl SMRNode {
             playground.peer_protocols(),
         );
         let consensus_network_client = ConsensusNetworkClient::new(network_client);
-        let network_events = NetworkEvents::new(consensus_rx, None);
+        let network_events = NetworkEvents::new(consensus_rx, None, true);
         let network_service_events =
             NetworkServiceEvents::new(hashmap! {NetworkId::Validator => network_events});
 
@@ -118,7 +118,7 @@ impl SMRNode {
         let reconfig_listener = ReconfigNotificationListener {
             notification_receiver: reconfig_events,
         };
-        let _commit_notifier = Arc::from(PayloadManager::DirectMempool);
+        let _commit_notifier = Arc::from(DirectMempoolPayloadManager::new());
         let mut configs = HashMap::new();
         configs.insert(
             ValidatorSet::CONFIG_ID,
diff --git a/consensus/src/util/db_tool.rs b/consensus/src/util/db_tool.rs
index 5809747c4bcb7..6ae051b251997 100644
--- a/consensus/src/util/db_tool.rs
+++ b/consensus/src/util/db_tool.rs
@@ -1,6 +1,8 @@
 // Copyright © Aptos Foundation
 // SPDX-License-Identifier: Apache-2.0
 
+#![allow(clippy::unwrap_used)]
+
 use crate::{
     consensusdb::ConsensusDB,
     quorum_store::{
@@ -9,7 +11,7 @@ use crate::{
     },
 };
 use anyhow::{bail, Result};
-use aptos_consensus_types::{block::Block, common::Payload, proof_of_store::ProofOfStore};
+use aptos_consensus_types::{block::Block, common::Payload};
 use aptos_crypto::HashValue;
 use aptos_types::transaction::{SignedTransaction, Transaction};
 use clap::Parser;
@@ -44,6 +46,7 @@ impl Command {
         let mut txns = Vec::new();
         for block in blocks {
             let id = block.id();
+            #[allow(clippy::unwrap_in_result)]
             if self.block_id.is_none() || id == self.block_id.unwrap() {
                 txns.extend(
                     extract_txns_from_block(&block, &all_batches)?
@@ -58,49 +61,78 @@ impl Command {
     }
 }
 
+fn extract_txns_from_quorum_store(
+    digests: impl Iterator<Item = HashValue>,
+    all_batches: &HashMap<HashValue, PersistedValue>,
+) -> anyhow::Result<Vec<&SignedTransaction>> {
+    let mut block_txns = Vec::new();
+    for digest in digests {
+        if let Some(batch) = all_batches.get(&digest) {
+            if let Some(txns) = batch.payload() {
+                block_txns.extend(txns);
+            } else {
+                bail!("Payload is not found for batch ({digest}).");
+            }
+        } else {
+            bail!("Batch ({digest}) is not found.");
+        }
+    }
+    Ok(block_txns)
+}
+
 pub fn extract_txns_from_block<'a>(
     block: &'a Block,
     all_batches: &'a HashMap<HashValue, PersistedValue>,
 ) -> anyhow::Result<Vec<&'a SignedTransaction>> {
     match block.payload().as_ref() {
-        Some(payload) => {
-            let mut block_txns = Vec::new();
-
-            let extract_txns_from_proof_stores = move |proofs: &Vec<ProofOfStore>| {
-                for proof in proofs {
-                    let digest = proof.digest();
-                    if let Some(batch) = all_batches.get(digest) {
-                        if let Some(txns) = batch.payload() {
-                            block_txns.extend(txns);
-                        } else {
-                            bail!("Payload is not found for batch ({digest}).");
-                        }
-                    } else {
-                        bail!("Batch ({digest}) is not found.");
-                    }
+        Some(payload) => match payload {
+            Payload::DirectMempool(_) => {
+                bail!("DirectMempool is not supported.");
+            },
+            Payload::InQuorumStore(proof_with_data) => extract_txns_from_quorum_store(
+                proof_with_data.proofs.iter().map(|proof| *proof.digest()),
+                all_batches,
+            ),
+            Payload::InQuorumStoreWithLimit(proof_with_data) => extract_txns_from_quorum_store(
+                proof_with_data
+                    .proof_with_data
+                    .proofs
+                    .iter()
+                    .map(|proof| *proof.digest()),
+                all_batches,
+            ),
+            Payload::QuorumStoreInlineHybrid(inline_batches, proof_with_data, _) => {
+                let mut all_txns = extract_txns_from_quorum_store(
+                    proof_with_data.proofs.iter().map(|proof| *proof.digest()),
+                    all_batches,
+                )
+                .unwrap();
+                for (_, txns) in inline_batches {
+                    all_txns.extend(txns);
                 }
-                Ok(block_txns)
-            };
-
-            match payload {
-                Payload::DirectMempool(_) => {
-                    bail!("DirectMempool is not supported.");
-                },
-                Payload::InQuorumStore(proof_with_data) => {
-                    extract_txns_from_proof_stores(&proof_with_data.proofs)
-                },
-                Payload::InQuorumStoreWithLimit(proof_with_data) => {
-                    extract_txns_from_proof_stores(&proof_with_data.proof_with_data.proofs)
-                },
-                Payload::QuorumStoreInlineHybrid(inline_batches, proof_with_data, _) => {
-                    let mut all_txns =
-                        extract_txns_from_proof_stores(&proof_with_data.proofs).unwrap();
-                    for (_, txns) in inline_batches {
-                        all_txns.extend(txns);
-                    }
-                    Ok(all_txns)
-                },
-            }
+                Ok(all_txns)
+            },
+            Payload::OptQuorumStore(opt_qs_payload) => {
+                let mut all_txns = extract_txns_from_quorum_store(
+                    opt_qs_payload
+                        .proof_with_data()
+                        .iter()
+                        .map(|proof| *proof.digest()),
+                    all_batches,
+                )
+                .unwrap();
+                all_txns.extend(
+                    extract_txns_from_quorum_store(
+                        opt_qs_payload
+                            .opt_batches()
+                            .iter()
+                            .map(|info| *info.digest()),
+                        all_batches,
+                    )
+                    .unwrap(),
+                );
+                Ok(all_txns)
+            },
         },
         None => Ok(vec![]),
     }
diff --git a/consensus/src/util/time_service.rs b/consensus/src/util/time_service.rs
index d90fd6a54c008..2114f479dc04d 100644
--- a/consensus/src/util/time_service.rs
+++ b/consensus/src/util/time_service.rs
@@ -80,8 +80,14 @@ where
     T: Send + 'static,
 {
     fn run(&mut self) -> Pin<Box<dyn Future<Output = ()> + Send>> {
-        let mut sender = self.sender.take().unwrap();
-        let message = self.message.take().unwrap();
+        let mut sender = self
+            .sender
+            .take()
+            .expect("Expect to be able to take sender");
+        let message = self
+            .message
+            .take()
+            .expect("Expect to be able to take message");
         let r = async move {
             if let Err(e) = sender.send(message).await {
                 error!("Error on send: {:?}", e);
diff --git a/crates/aptos-admin-service/src/server/consensus/mod.rs b/crates/aptos-admin-service/src/server/consensus/mod.rs
index fd20bcd6d8701..dc662af859e5a 100644
--- a/crates/aptos-admin-service/src/server/consensus/mod.rs
+++ b/crates/aptos-admin-service/src/server/consensus/mod.rs
@@ -152,7 +152,6 @@ fn dump_consensus_db(consensus_db: &dyn PersistentLivenessStorage) -> anyhow::Re
     for qc in consensus_qcs {
         body.push_str(&format!("{qc:?}\n\n"));
     }
-
     Ok(body)
 }
 
diff --git a/crates/aptos-api-tester/src/utils.rs b/crates/aptos-api-tester/src/utils.rs
index 3141583b6e632..fb1ad99d72ae0 100644
--- a/crates/aptos-api-tester/src/utils.rs
+++ b/crates/aptos-api-tester/src/utils.rs
@@ -16,7 +16,7 @@ use aptos_logger::{error, info};
 use aptos_rest_client::{error::RestError, Client, FaucetClient};
 use aptos_sdk::types::LocalAccount;
 use aptos_types::account_address::AccountAddress;
-use std::{env, num::ParseIntError, str::FromStr};
+use std::{env, fmt::Display, num::ParseIntError, str::FromStr};
 
 // Test failure
 
@@ -71,14 +71,14 @@ impl TestName {
     }
 }
 
-impl ToString for TestName {
-    fn to_string(&self) -> String {
+impl Display for TestName {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match &self {
-            TestName::NewAccount => "new_account".to_string(),
-            TestName::CoinTransfer => "coin_transfer".to_string(),
-            TestName::TokenV1Transfer => "tokenv1_transfer".to_string(),
-            TestName::PublishModule => "publish_module".to_string(),
-            TestName::ViewFunction => "view_function".to_string(),
+            TestName::NewAccount => write!(f, "new_account"),
+            TestName::CoinTransfer => write!(f, "coin_transfer"),
+            TestName::TokenV1Transfer => write!(f, "tokenv1_transfer"),
+            TestName::PublishModule => write!(f, "publish_module"),
+            TestName::ViewFunction => write!(f, "view_function"),
         }
     }
 }
@@ -91,11 +91,11 @@ pub enum NetworkName {
     Devnet,
 }
 
-impl ToString for NetworkName {
-    fn to_string(&self) -> String {
+impl Display for NetworkName {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match &self {
-            NetworkName::Testnet => "testnet".to_string(),
-            NetworkName::Devnet => "devnet".to_string(),
+            NetworkName::Testnet => write!(f, "testnet"),
+            NetworkName::Devnet => write!(f, "devnet"),
         }
     }
 }
diff --git a/crates/aptos-build-info/build.rs b/crates/aptos-build-info/build.rs
index b3339b0eec60f..222f8098919ea 100644
--- a/crates/aptos-build-info/build.rs
+++ b/crates/aptos-build-info/build.rs
@@ -9,6 +9,11 @@ fn main() -> shadow_rs::SdResult<()> {
         std::env::var("CARGO_CFG_TOKIO_UNSTABLE").is_ok()
     );
     println!("cargo:rerun-if-changed=build.rs");
-    println!("cargo:rerun-if-changed=../../.git/HEAD");
+    // Check for this path first, otherwise it will force a rebuild every time
+    // https://github.com/rust-lang/cargo/issues/4213
+    let git_head = std::path::Path::new("../../.git/HEAD");
+    if git_head.exists() {
+        println!("cargo:rerun-if-changed=../../.git/HEAD");
+    }
     shadow_rs::new()
 }
diff --git a/crates/aptos-compression/src/client.rs b/crates/aptos-compression/src/client.rs
index 354930125dc9e..8d984d546c47f 100644
--- a/crates/aptos-compression/src/client.rs
+++ b/crates/aptos-compression/src/client.rs
@@ -7,6 +7,7 @@
 #[derive(Clone, Copy, Debug)]
 pub enum CompressionClient {
     Consensus,
+    ConsensusObserver,
     DKG,
     JWKConsensus,
     Mempool,
@@ -18,6 +19,7 @@ impl CompressionClient {
     pub fn get_label(&self) -> &'static str {
         match self {
             Self::Consensus => "consensus",
+            Self::ConsensusObserver => "consensus_observer",
             Self::DKG => "dkg",
             Self::JWKConsensus => "jwk_consensus",
             Self::Mempool => "mempool",
diff --git a/crates/aptos-compression/src/metrics.rs b/crates/aptos-compression/src/metrics.rs
index 9dda43025df71..e6869c2018b4b 100644
--- a/crates/aptos-compression/src/metrics.rs
+++ b/crates/aptos-compression/src/metrics.rs
@@ -95,8 +95,8 @@ fn observe_operation_time(operation: &str, client: &CompressionClient, start_tim
 /// Updates the compression metrics for the given data sets
 pub fn update_compression_metrics(
     client: &CompressionClient,
-    raw_data: &Vec<u8>,
-    compressed_data: &Vec<u8>,
+    raw_data: &[u8],
+    compressed_data: &[u8],
 ) {
     update_operation_metrics(COMPRESS, client, raw_data, compressed_data);
 }
@@ -104,8 +104,8 @@ pub fn update_compression_metrics(
 /// Updates the decompression metrics for the given data sets
 pub fn update_decompression_metrics(
     client: &CompressionClient,
-    compressed_data: &Vec<u8>,
-    raw_data: &Vec<u8>,
+    compressed_data: &[u8],
+    raw_data: &[u8],
 ) {
     update_operation_metrics(DECOMPRESS, client, raw_data, compressed_data);
 }
@@ -115,8 +115,8 @@ pub fn update_decompression_metrics(
 fn update_operation_metrics(
     operation: &str,
     client: &CompressionClient,
-    raw_data: &Vec<u8>,
-    compressed_data: &Vec<u8>,
+    raw_data: &[u8],
+    compressed_data: &[u8],
 ) {
     increment_compression_byte_count(operation, RAW_BYTES, client, raw_data.len() as u64);
     increment_compression_byte_count(
diff --git a/crates/aptos-crypto/src/hash.rs b/crates/aptos-crypto/src/hash.rs
index 9b38b0ae89405..c4674e7479d01 100644
--- a/crates/aptos-crypto/src/hash.rs
+++ b/crates/aptos-crypto/src/hash.rs
@@ -636,6 +636,16 @@ define_hasher! {
     )
 }
 
+define_hasher! {
+    /// The hasher used to compute the hash of an internal node in the Sparse Merkle Tree.
+    (
+        HexyHasher,
+        HEXY_HASHER,
+        HEXY_SEED,
+        b"Hexy"
+    )
+}
+
 define_hasher! {
     /// The hasher used as a placeholder.
     (
@@ -666,6 +676,10 @@ pub static ACCUMULATOR_PLACEHOLDER_HASH: Lazy<HashValue> =
 pub static SPARSE_MERKLE_PLACEHOLDER_HASH: Lazy<HashValue> =
     Lazy::new(|| create_literal_hash("SPARSE_MERKLE_PLACEHOLDER_HASH"));
 
+/// Placeholder hash of hot state tier Merkle Tree.
+pub static HOT_STATE_PLACE_HOLDER_HASH: Lazy<HashValue> =
+    Lazy::new(|| create_literal_hash("HOT_STATE_PLACEHOLDER_HASH"));
+
 /// Block id reserved as the id of parent block of the genesis block.
 pub static PRE_GENESIS_BLOCK_ID: Lazy<HashValue> =
     Lazy::new(|| create_literal_hash("PRE_GENESIS_BLOCK_ID"));
diff --git a/crates/aptos-crypto/src/poseidon_bn254/keyless.rs b/crates/aptos-crypto/src/poseidon_bn254/keyless.rs
index b280413e84988..3ae52fbe8e32c 100644
--- a/crates/aptos-crypto/src/poseidon_bn254/keyless.rs
+++ b/crates/aptos-crypto/src/poseidon_bn254/keyless.rs
@@ -2,8 +2,12 @@
 // SPDX-License-Identifier: Apache-2.0
 
 //! Implements keyless-specific domain-separated hash functions from Poseidon scalar hashing.
-use crate::{poseidon_bn254, poseidon_bn254::MAX_NUM_INPUT_SCALARS};
+use crate::{
+    poseidon_bn254,
+    poseidon_bn254::{hash_scalars, MAX_NUM_INPUT_SCALARS},
+};
 use anyhow::bail;
+use ark_bn254::Fr;
 use ark_ff::{BigInteger, PrimeField};
 
 /// A BN254 scalar is 254 bits which means it can only store up to 31 bytes of data. We could use a
@@ -11,6 +15,9 @@ use ark_ff::{BigInteger, PrimeField};
 /// us to keep our SNARK circuits simpler.
 pub const BYTES_PACKED_PER_SCALAR: usize = 31;
 
+/// `BYTES_PACKED_PER_SCALAR` but for u64s.
+pub const LIMBS_PACKED_PER_SCALAR: usize = 3;
+
 /// The maximum number of bytes that can be given as input to the byte-oriented variant of the
 /// Poseidon-BN254 hash function exposed in `pad_and_hash_bytes`.
 ///
@@ -21,11 +28,14 @@ pub const BYTES_PACKED_PER_SCALAR: usize = 31;
 /// SNARK circuits would have to implement this more complicated packing).
 pub const MAX_NUM_INPUT_BYTES: usize = MAX_NUM_INPUT_SCALARS * BYTES_PACKED_PER_SCALAR;
 
+/// `MAX_NUM_INPUT_BYTES` but for u64s.
+pub const MAX_NUM_INPUT_LIMBS: usize = MAX_NUM_INPUT_SCALARS * LIMBS_PACKED_PER_SCALAR;
+
 /// Given a string and `max_bytes`, it pads the byte array of the string with zeros up to size `max_bytes`,
 /// packs it to scalars, and returns the hash of the scalars.
 ///
 /// This function calls `pad_and_pack_bytes_to_scalars_no_len` safely as strings will not contain the zero byte except to terminate.
-pub fn pad_and_hash_string(str: &str, max_bytes: usize) -> anyhow::Result<ark_bn254::Fr> {
+pub fn pad_and_hash_string(str: &str, max_bytes: usize) -> anyhow::Result<Fr> {
     pad_and_hash_bytes_with_len(str.as_bytes(), max_bytes)
 }
 
@@ -53,6 +63,23 @@ pub(crate) fn pack_bytes_to_scalars(bytes: &[u8]) -> anyhow::Result<Vec<ark_bn25
     Ok(scalars)
 }
 
+fn pack_limbs_to_scalars(limbs: &[u64]) -> anyhow::Result<Vec<Fr>> {
+    if limbs.len() > MAX_NUM_INPUT_LIMBS {
+        bail!(
+            "Cannot hash more than {} limbs. Was given {} limbs.",
+            MAX_NUM_INPUT_LIMBS,
+            limbs.len()
+        );
+    }
+
+    let scalars = limbs
+        .chunks(LIMBS_PACKED_PER_SCALAR)
+        .map(|chunk| pack_limbs_to_one_scalar(chunk).expect("chunk converts to scalar"))
+        .collect::<Vec<Fr>>();
+
+    Ok(scalars)
+}
+
 /// Given $n$ bytes, this function left pads bytes with 'max_bytes'- $n$ zeros and returns $k+1$ field elements that pack those bytes as tightly as
 /// possible where $e_(0)$ is $n$ and $k$ is the ceiling of `max_bytes`/`BYTES_PACKED_PER_SCALAR`.
 pub fn pad_and_pack_bytes_to_scalars_with_len(
@@ -83,6 +110,35 @@ pub fn pad_and_pack_bytes_to_scalars_with_len(
     Ok(scalars)
 }
 
+/// `pad_and_pack_bytes_to_scalars_with_len` but for u64s.
+pub fn pad_and_pack_limbs_to_scalars_with_len(
+    limbs: &[u64],
+    max_limbs: usize,
+) -> anyhow::Result<Vec<Fr>> {
+    let len = limbs.len();
+    if max_limbs > MAX_NUM_INPUT_LIMBS {
+        bail!(
+            "Cannot hash more than {} limbs. Was given {} limbs.",
+            MAX_NUM_INPUT_LIMBS,
+            len
+        );
+    }
+    if len > max_limbs {
+        bail!(
+            "Limb array length of {} is NOT <= max length of {} limbs.",
+            limbs.len(),
+            max_limbs
+        );
+    }
+
+    let len_scalar = From::from(len as u64);
+    let scalars = pad_and_pack_limbs_to_scalars_no_len(limbs, max_limbs)?
+        .into_iter()
+        .chain([len_scalar])
+        .collect::<Vec<Fr>>();
+    Ok(scalars)
+}
+
 /// Given $n$ bytes, this function left pads bytes with 'max_bytes'- $n$ zeros and returns $k$ field elements that pack those bytes as tightly as
 /// possible, where $k$ is the ceiling of `max_bytes`/`BYTES_PACKED_PER_SCALAR`.
 pub(crate) fn pad_and_pack_bytes_to_scalars_no_len(
@@ -110,6 +166,31 @@ pub(crate) fn pad_and_pack_bytes_to_scalars_no_len(
     Ok(scalars)
 }
 
+fn pad_and_pack_limbs_to_scalars_no_len(
+    limbs: &[u64],
+    max_limbs: usize,
+) -> anyhow::Result<Vec<ark_bn254::Fr>> {
+    let len = limbs.len();
+    if max_limbs > MAX_NUM_INPUT_LIMBS {
+        bail!(
+            "Cannot hash more than {} limbs. Was given {} limbs.",
+            MAX_NUM_INPUT_LIMBS,
+            len
+        );
+    }
+    if limbs.len() > max_limbs {
+        bail!(
+            "Limb array length of {} is NOT <= max length of {} limbs.",
+            limbs.len(),
+            max_limbs
+        );
+    }
+
+    let padded = zero_pad_limbs(limbs, max_limbs)?;
+    let scalars = pack_limbs_to_scalars(padded.as_slice())?;
+    Ok(scalars)
+}
+
 /// Packs the bytes to a vector of scalars (see `pack_bytes_to_scalars`) and hashes the scalars via
 /// `hash_scalars`.
 ///
@@ -132,22 +213,24 @@ fn hash_bytes(bytes: &[u8]) -> anyhow::Result<ark_bn254::Fr> {
 /// example ASCII strings. Otherwise unexpected collisions can occur.
 ///
 /// Due to risk of collisions due to improper use by the caller, it is not exposed.
-#[allow(unused)]
-fn pad_and_hash_bytes_no_len(bytes: &[u8], max_bytes: usize) -> anyhow::Result<ark_bn254::Fr> {
+pub fn pad_and_hash_bytes_no_len(bytes: &[u8], max_bytes: usize) -> anyhow::Result<ark_bn254::Fr> {
     let scalars = pad_and_pack_bytes_to_scalars_no_len(bytes, max_bytes)?;
-    poseidon_bn254::hash_scalars(scalars)
+    hash_scalars(scalars)
 }
 
 /// Given `bytes`, if the length of `bytes` is less than `max_bytes`, pads `bytes` with zeros to length `max_bytes`.
 /// Then it packs these padded `bytes` and preserves the original length as the first scalar and returns the hash of the scalars via `hash_scalars`.
 ///
 /// This is used when we want to preserve the length of the `bytes` to prevent collisions where `bytes` could terminate in 0's.
-pub fn pad_and_hash_bytes_with_len(
-    bytes: &[u8],
-    max_bytes: usize,
-) -> anyhow::Result<ark_bn254::Fr> {
+pub fn pad_and_hash_bytes_with_len(bytes: &[u8], max_bytes: usize) -> anyhow::Result<Fr> {
     let scalars = pad_and_pack_bytes_to_scalars_with_len(bytes, max_bytes)?;
-    poseidon_bn254::hash_scalars(scalars)
+    hash_scalars(scalars)
+}
+
+/// `pad_and_hash_bytes_with_len` but for u64s.
+pub fn pad_and_hash_limbs_with_len(limbs: &[u64], max_limbs: usize) -> anyhow::Result<Fr> {
+    let scalars = pad_and_pack_limbs_to_scalars_with_len(limbs, max_limbs)?;
+    hash_scalars(scalars)
 }
 
 /// We often have to pad byte arrays with 0s, up to a maximum length.
@@ -171,6 +254,24 @@ fn zero_pad_bytes(bytes: &[u8], size: usize) -> anyhow::Result<Vec<u8>> {
     Ok(padded)
 }
 
+fn zero_pad_limbs(limbs: &[u64], size: usize) -> anyhow::Result<Vec<u64>> {
+    if size > MAX_NUM_INPUT_LIMBS {
+        bail!(
+            "Cannot pad to more than {} limbs. Requested size is {}.",
+            MAX_NUM_INPUT_LIMBS,
+            size
+        );
+    }
+
+    if limbs.len() > size {
+        bail!("Cannot pad {} limb(s) to size {}", limbs.len(), size);
+    }
+
+    let mut padded = limbs.to_vec();
+    padded.resize(size, 0);
+    Ok(padded)
+}
+
 /// Converts the chunk of bytes into a scalar, assuming it is of size less than or equal to `BYTES_PACKED_PER_SCALAR`.
 pub fn pack_bytes_to_one_scalar(chunk: &[u8]) -> anyhow::Result<ark_bn254::Fr> {
     if chunk.len() > BYTES_PACKED_PER_SCALAR {
@@ -184,6 +285,23 @@ pub fn pack_bytes_to_one_scalar(chunk: &[u8]) -> anyhow::Result<ark_bn254::Fr> {
     Ok(fr)
 }
 
+/// `pack_bytes_to_one_scalar` but for u64s.
+pub fn pack_limbs_to_one_scalar(chunk: &[u64]) -> anyhow::Result<Fr> {
+    if chunk.len() > LIMBS_PACKED_PER_SCALAR {
+        bail!(
+            "Cannot convert chunk to scalar. Max chunk size is {} limbs. Was given {} limbs.",
+            LIMBS_PACKED_PER_SCALAR,
+            chunk.len(),
+        );
+    }
+    let bytes_chunk: Vec<u8> = chunk
+        .iter()
+        .flat_map(|&limb| limb.to_le_bytes().into_iter())
+        .collect();
+    let fr = ark_bn254::Fr::from_le_bytes_mod_order(bytes_chunk.as_slice());
+    Ok(fr)
+}
+
 /// Utility method to convert an Fr to a 32-byte slice.
 pub fn fr_to_bytes_le(fr: &ark_bn254::Fr) -> [u8; 32] {
     fr.into_bigint()
diff --git a/crates/aptos-crypto/src/poseidon_bn254/mod.rs b/crates/aptos-crypto/src/poseidon_bn254/mod.rs
index bbb124aff8ffd..bb61bfb19019d 100644
--- a/crates/aptos-crypto/src/poseidon_bn254/mod.rs
+++ b/crates/aptos-crypto/src/poseidon_bn254/mod.rs
@@ -97,8 +97,7 @@ fn hash_bytes(bytes: &[u8]) -> anyhow::Result<ark_bn254::Fr> {
 /// example ASCII strings. Otherwise, unexpected collisions can occur.
 ///
 /// We do not expose this to minimize the risk of collisions due to improper use by the caller.
-#[allow(unused)]
-fn pad_and_hash_bytes_no_len(bytes: &[u8], max_bytes: usize) -> anyhow::Result<ark_bn254::Fr> {
+pub fn pad_and_hash_bytes_no_len(bytes: &[u8], max_bytes: usize) -> anyhow::Result<ark_bn254::Fr> {
     let scalars = pad_and_pack_bytes_to_scalars_no_len(bytes, max_bytes)?;
     hash_scalars(scalars)
 }
diff --git a/crates/aptos-crypto/src/unit_tests/bls12381_test.rs b/crates/aptos-crypto/src/unit_tests/bls12381_test.rs
index 2977c398b1c72..40be873cfa414 100644
--- a/crates/aptos-crypto/src/unit_tests/bls12381_test.rs
+++ b/crates/aptos-crypto/src/unit_tests/bls12381_test.rs
@@ -204,19 +204,19 @@ fn bls12381_aggsig_zero_messages_or_pks_does_not_verify() {
 
     // aggsig should NOT verify on zero messages and zero PKs
     let pubkeys: Vec<&PublicKey> = vec![];
-    let messages = vec![];
+    let messages = [];
     let msgs_refs = messages.iter().collect::<Vec<&TestAptosCrypto>>();
     assert!(aggsig.verify_aggregate(&msgs_refs, &pubkeys).is_err());
 
     // aggsig should NOT verify on zero PKs
     let pubkeys: Vec<&PublicKey> = vec![];
-    let messages = vec![message];
+    let messages = [message];
     let msgs_refs = messages.iter().collect::<Vec<&TestAptosCrypto>>();
     assert!(aggsig.verify_aggregate(&msgs_refs, &pubkeys).is_err());
 
     // aggsig should NOT verify on zero messages
     let pubkeys: Vec<&PublicKey> = vec![&key_pair.public_key];
-    let messages = vec![];
+    let messages = [];
     let msgs_refs = messages.iter().collect::<Vec<&TestAptosCrypto>>();
     assert!(aggsig.verify_aggregate(&msgs_refs, &pubkeys).is_err());
 }
diff --git a/crates/aptos-debugger/Cargo.toml b/crates/aptos-debugger/Cargo.toml
index 463a359be7366..d6a99932a3105 100644
--- a/crates/aptos-debugger/Cargo.toml
+++ b/crates/aptos-debugger/Cargo.toml
@@ -20,4 +20,5 @@ aptos-logger = { workspace = true }
 aptos-move-debugger = { workspace = true }
 aptos-push-metrics = { workspace = true }
 clap = { workspace = true }
+jemallocator = { workspace = true }
 tokio = { workspace = true }
diff --git a/crates/aptos-debugger/src/main.rs b/crates/aptos-debugger/src/main.rs
index 4df804804d703..61faf75634528 100644
--- a/crates/aptos-debugger/src/main.rs
+++ b/crates/aptos-debugger/src/main.rs
@@ -7,6 +7,10 @@ use aptos_logger::{Level, Logger};
 use aptos_push_metrics::MetricsPusher;
 use clap::Parser;
 
+#[cfg(unix)]
+#[global_allocator]
+static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;
+
 #[tokio::main]
 async fn main() -> Result<()> {
     Logger::new().level(Level::Info).init();
diff --git a/crates/aptos-dkg/Cargo.toml b/crates/aptos-dkg/Cargo.toml
index 67f8660a49e3c..e6463336d1805 100644
--- a/crates/aptos-dkg/Cargo.toml
+++ b/crates/aptos-dkg/Cargo.toml
@@ -2,7 +2,7 @@
 name = "aptos-dkg"
 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/crates/aptos-dkg/benches/crypto.rs b/crates/aptos-dkg/benches/crypto.rs
index f465d1d0940bf..c9f73c629e05e 100644
--- a/crates/aptos-dkg/benches/crypto.rs
+++ b/crates/aptos-dkg/benches/crypto.rs
@@ -45,7 +45,11 @@ pub fn crypto_group(c: &mut Criterion) {
         fft_assign_bench(thresh, &mut group);
 
         gt_multiexp_naive(thresh, &mut group);
+        g1_multiexp_naive(thresh, &mut group);
+        g2_multiexp_naive(thresh, &mut group);
+
         g1_multiexp(thresh, &mut group);
+        n_g1_double_exp(thresh, &mut group);
         g2_multiexp(thresh, &mut group);
 
         accumulator_poly(thresh, &mut group);
@@ -54,7 +58,7 @@ pub fn crypto_group(c: &mut Criterion) {
 
     // Derived from `print_best_worst_avg_case_subsets` in `tests/secret_sharing_config.rs`.
     const AVG_CASE: usize = 74;
-    for n in [1, 2, 4, 8, 16, 32, 64, AVG_CASE, 128] {
+    for n in [1, 2, 3, 4, 8, 16, 32, 64, AVG_CASE, 128] {
         multipairing(n, &mut group);
         for num_threads in [1, 2, 4, 8, 16, 32] {
             parallel_multipairing(n, &mut group, num_threads);
@@ -460,6 +464,31 @@ fn g1_multiexp<M: Measurement>(n: usize, g: &mut BenchmarkGroup<M>) {
     });
 }
 
+fn n_g1_double_exp<M: Measurement>(n: usize, g: &mut BenchmarkGroup<M>) {
+    let mut rng = thread_rng();
+
+    g.throughput(Throughput::Elements(n as u64));
+
+    g.bench_function(BenchmarkId::new("n_g1_double_exp", n), move |b| {
+        b.iter_with_setup(
+            || {
+                let mut points_and_scalars = Vec::with_capacity(n);
+                for _ in 0..n {
+                    points_and_scalars
+                        .push((random_g1_points(2, &mut rng), random_scalars(2, &mut rng)));
+                }
+
+                points_and_scalars
+            },
+            |points_and_scalars| {
+                for (points, scalars) in points_and_scalars {
+                    g1_multi_exp(points.as_slice(), scalars.as_ref());
+                }
+            },
+        )
+    });
+}
+
 fn g2_multiexp<M: Measurement>(n: usize, g: &mut BenchmarkGroup<M>) {
     let mut rng = thread_rng();
 
@@ -506,6 +535,56 @@ fn gt_multiexp_naive<M: Measurement>(n: usize, g: &mut BenchmarkGroup<M>) {
     });
 }
 
+fn g1_multiexp_naive<M: Measurement>(n: usize, g: &mut BenchmarkGroup<M>) {
+    let mut rng = thread_rng();
+
+    g.throughput(Throughput::Elements(n as u64));
+
+    g.bench_function(BenchmarkId::new("g1_multiexp_naive", n), move |b| {
+        b.iter_with_setup(
+            || {
+                let points = random_g1_points(n, &mut rng);
+
+                let scalars = random_scalars(n, &mut rng);
+
+                (points, scalars)
+            },
+            |(points, scalars)| {
+                points
+                    .into_iter()
+                    .zip(scalars.into_iter())
+                    .map(|(p, s)| p.mul(s))
+                    .sum::<G1Projective>()
+            },
+        )
+    });
+}
+
+fn g2_multiexp_naive<M: Measurement>(n: usize, g: &mut BenchmarkGroup<M>) {
+    let mut rng = thread_rng();
+
+    g.throughput(Throughput::Elements(n as u64));
+
+    g.bench_function(BenchmarkId::new("g2_multiexp_naive", n), move |b| {
+        b.iter_with_setup(
+            || {
+                let points = random_g2_points(n, &mut rng);
+
+                let scalars = random_scalars(n, &mut rng);
+
+                (points, scalars)
+            },
+            |(points, scalars)| {
+                points
+                    .into_iter()
+                    .zip(scalars.into_iter())
+                    .map(|(p, s)| p.mul(s))
+                    .sum::<G2Projective>()
+            },
+        )
+    });
+}
+
 criterion_group!(
     name = benches;
     config = Criterion::default().sample_size(10);
diff --git a/crates/aptos-dkg/benches/pvss.rs b/crates/aptos-dkg/benches/pvss.rs
index bcf76ca05b648..1bca3a728d919 100644
--- a/crates/aptos-dkg/benches/pvss.rs
+++ b/crates/aptos-dkg/benches/pvss.rs
@@ -6,6 +6,7 @@
 
 use aptos_crypto::Uniform;
 use aptos_dkg::{
+    algebra::evaluation_domain::BatchEvaluationDomain,
     pvss,
     pvss::{
         test_utils,
@@ -17,7 +18,7 @@ use aptos_dkg::{
             transcript::{MalleableTranscript, Transcript},
             SecretSharingConfig,
         },
-        WeightedConfig,
+        LowDegreeTest, WeightedConfig,
     },
 };
 use criterion::{
@@ -43,6 +44,33 @@ pub fn all_groups(c: &mut Criterion) {
         // let d = pvss_group::<GenericWeighting<pvss::das::Transcript>>(&wc, c);
         // weighted_pvss_group(&wc, d, c);
     }
+
+    // LDT
+    ldt_group(c);
+}
+
+pub fn ldt_group(c: &mut Criterion) {
+    let mut rng = thread_rng();
+
+    for sc in get_threshold_configs_for_benchmarking() {
+        let mut group = c.benchmark_group("ldt");
+
+        group.bench_function(format!("dual_code_word/{}", sc), move |b| {
+            b.iter_with_setup(
+                || {
+                    let n = sc.get_total_num_players();
+                    let t = sc.get_threshold();
+                    let batch_dom = BatchEvaluationDomain::new(n);
+
+                    (n, t, batch_dom)
+                },
+                |(n, t, batch_dom)| {
+                    let ldt = LowDegreeTest::random(&mut rng, t, n, true, &batch_dom);
+                    ldt.dual_code_word();
+                },
+            )
+        });
+    }
 }
 
 pub fn pvss_group<T: MalleableTranscript>(
diff --git a/crates/aptos-dkg/benches/weighted_vuf.rs b/crates/aptos-dkg/benches/weighted_vuf.rs
index d838f910222bd..81bf126e7e8ed 100644
--- a/crates/aptos-dkg/benches/weighted_vuf.rs
+++ b/crates/aptos-dkg/benches/weighted_vuf.rs
@@ -26,17 +26,16 @@ use aptos_runtimes::spawn_rayon_thread_pool;
 use blstrs::{G1Projective, G2Projective, Scalar};
 use core::iter::zip;
 use criterion::{
-    criterion_group, criterion_main,
-    measurement::{Measurement, WallTime},
-    BenchmarkGroup, Criterion,
+    black_box, criterion_group, criterion_main, measurement::WallTime, BenchmarkGroup, Criterion,
 };
 use rand::{rngs::ThreadRng, thread_rng};
+use std::time::Instant;
 
 const BENCH_MSG: &[u8; 36] = b"some dummy message for the benchmark";
 
 pub fn all_groups(c: &mut Criterion) {
     let mut group = c.benchmark_group("wvuf/das-pinkas-sk-in-g1");
-    let bench_cases = wvuf_benches::<das::WeightedTranscript, PinkasWUF, WallTime>(&mut group);
+    let bench_cases = wvuf_benches::<das::WeightedTranscript, PinkasWUF>(&mut group);
     group.finish();
 
     let mut group = c.benchmark_group("wvuf/das-pinkas-sk-in-g1");
@@ -44,7 +43,7 @@ pub fn all_groups(c: &mut Criterion) {
     group.finish();
 
     let mut group = c.benchmark_group("wvuf/insecure-field-bls");
-    wvuf_benches::<GenericWeighting<insecure_field::Transcript>, bls::BlsWUF, WallTime>(&mut group);
+    wvuf_benches::<GenericWeighting<insecure_field::Transcript>, bls::BlsWUF>(&mut group);
     group.finish();
 }
 
@@ -125,9 +124,8 @@ pub fn wvuf_benches<
         PubKeyShare = WT::DealtPubKeyShare,
         SecretKeyShare = WT::DealtSecretKeyShare,
     >,
-    M: Measurement,
 >(
-    group: &mut BenchmarkGroup<M>,
+    group: &mut BenchmarkGroup<WallTime>,
 ) -> Vec<(
     WeightedConfig,
     <WVUF as WeightedVUF>::PublicParameters,
@@ -198,20 +196,63 @@ where
     }
 
     for (wc, vuf_pp, sk, pk, sks, pks, asks, apks, deltas) in &bench_cases {
-        wvuf_augment_random_keypair::<WT, WVUF, ThreadRng, M>(
+        wvuf_augment_random_keypair::<WT, WVUF, ThreadRng>(
             &wc, &vuf_pp, &sks, &pks, group, &mut rng,
         );
 
-        wvuf_augment_all_pubkeys::<WT, WVUF, ThreadRng, M>(&wc, &vuf_pp, &pks, &deltas, group);
+        wvuf_augment_all_pubkeys::<WT, WVUF, ThreadRng>(&wc, &vuf_pp, &pks, &deltas, group);
 
-        wvuf_augment_random_pubkey::<WT, WVUF, ThreadRng, M>(
+        wvuf_augment_random_pubkey::<WT, WVUF, ThreadRng>(
             &wc, &vuf_pp, &pks, &deltas, group, &mut rng,
         );
 
-        wvuf_create_share::<WT, WVUF, ThreadRng, M>(&wc, &asks, group, &mut rng);
+        wvuf_create_share_random::<WT, WVUF, ThreadRng>(&wc, &asks, group, &mut rng);
+        wvuf_create_share_average::<WT, WVUF, ThreadRng>(&wc, &asks, group);
 
-        wvuf_verify_share::<WT, WVUF, ThreadRng, M>(&wc, &vuf_pp, &asks, &apks, group, &mut rng);
+        let min_weight_player = wc.get_min_weight_player();
+        wvuf_create_share_specific::<WT, WVUF, ThreadRng>(
+            &wc,
+            &asks,
+            group,
+            &min_weight_player,
+            "min-weight",
+        );
+        let max_weight_player = wc.get_max_weight_player();
+        wvuf_create_share_specific::<WT, WVUF, ThreadRng>(
+            &wc,
+            &asks,
+            group,
+            &max_weight_player,
+            "max-weight",
+        );
 
+        // TODO: should change WVUF trait to support some kind of multi-threaded share verification,
+        //  since in practice that's what we would do on the validators
+        //  i.e., https://github.com/aptos-labs/aptos-core/blob/8ff40c8dd6505dea5e4b2a28cbbe7b97723b0ec2/consensus/src/rand/rand_gen/rand_manager.rs#L221
+        wvuf_verify_share_random::<WT, WVUF, ThreadRng>(
+            &wc, &vuf_pp, &asks, &apks, group, &mut rng,
+        );
+        wvuf_verify_share_average::<WT, WVUF, ThreadRng>(&wc, &vuf_pp, &asks, &apks, group);
+        wvuf_verify_share_specific::<WT, WVUF, ThreadRng>(
+            &wc,
+            &vuf_pp,
+            &asks,
+            &apks,
+            &min_weight_player,
+            "min-weight",
+            group,
+        );
+        wvuf_verify_share_specific::<WT, WVUF, ThreadRng>(
+            &wc,
+            &vuf_pp,
+            &asks,
+            &apks,
+            &max_weight_player,
+            "max-weight",
+            group,
+        );
+
+        // benchmarks the sequence of WVUF::verify_share calls on shares from a specific subset of players
         let bc: Vec<(fn(&WeightedConfig, &mut ThreadRng) -> Vec<Player>, String)> = vec![
             (
                 WeightedConfig::get_random_eligible_subset_of_players,
@@ -228,8 +269,7 @@ where
         ];
 
         for (pick_subset_fn, subset_type) in bc {
-            // best-case aggregation times (pick players with largest weights)
-            wvuf_aggregate_shares::<WT, WVUF, ThreadRng, M>(
+            wvuf_aggregate_shares::<WT, WVUF, ThreadRng>(
                 &wc,
                 &asks,
                 &apks,
@@ -239,7 +279,18 @@ where
                 &subset_type,
             );
 
-            wvuf_verify_proof::<WT, WVUF, ThreadRng, M>(
+            wvuf_many_verify_shares::<WT, WVUF, ThreadRng>(
+                &wc,
+                &vuf_pp,
+                &asks,
+                &apks,
+                pick_subset_fn,
+                &subset_type,
+                group,
+                &mut rng,
+            );
+
+            wvuf_verify_proof::<WT, WVUF, ThreadRng>(
                 &wc,
                 &vuf_pp,
                 &pk,
@@ -252,7 +303,7 @@ where
             );
 
             for num_threads in [1, 2, 4, 8, 16, 32] {
-                wvuf_derive_eval::<WT, WVUF, ThreadRng, M>(
+                wvuf_derive_eval::<WT, WVUF, ThreadRng>(
                     &wc,
                     &vuf_pp,
                     &asks,
@@ -266,7 +317,7 @@ where
             }
         }
 
-        wvuf_eval::<WT, WVUF, M>(&wc, &sk, group);
+        wvuf_eval::<WT, WVUF>(&wc, &sk, group);
     }
 
     bench_cases
@@ -280,14 +331,13 @@ fn wvuf_augment_random_keypair<
         SecretKeyShare = WT::DealtSecretKeyShare,
     >,
     R: rand_core::RngCore + rand_core::CryptoRng,
-    M: Measurement,
 >(
     // For efficiency, we re-use the PVSS transcript
     wc: &WeightedConfig,
     vuf_pp: &WVUF::PublicParameters,
     sks: &Vec<WT::DealtSecretKeyShare>,
     pks: &Vec<WT::DealtPubKeyShare>,
-    group: &mut BenchmarkGroup<M>,
+    group: &mut BenchmarkGroup<WallTime>,
     rng: &mut R,
 ) where
     WVUF::PublicParameters: for<'a> From<&'a WT::PublicParameters>,
@@ -312,14 +362,13 @@ fn wvuf_augment_all_pubkeys<
         SecretKeyShare = WT::DealtSecretKeyShare,
     >,
     R: rand_core::RngCore + rand_core::CryptoRng,
-    M: Measurement,
 >(
     // For efficiency, we re-use the PVSS transcript
     wc: &WeightedConfig,
     vuf_pp: &WVUF::PublicParameters,
     pks: &Vec<WVUF::PubKeyShare>,
     deltas: &Vec<WVUF::Delta>,
-    group: &mut BenchmarkGroup<M>,
+    group: &mut BenchmarkGroup<WallTime>,
 ) where
     WVUF::PublicParameters: for<'a> From<&'a WT::PublicParameters>,
 {
@@ -343,14 +392,13 @@ fn wvuf_augment_random_pubkey<
         SecretKeyShare = WT::DealtSecretKeyShare,
     >,
     R: rand_core::RngCore + rand_core::CryptoRng,
-    M: Measurement,
 >(
     // For efficiency, we re-use the PVSS transcript
     wc: &WeightedConfig,
     vuf_pp: &WVUF::PublicParameters,
     pks: &Vec<WVUF::PubKeyShare>,
     deltas: &Vec<WVUF::Delta>,
-    group: &mut BenchmarkGroup<M>,
+    group: &mut BenchmarkGroup<WallTime>,
     rng: &mut R,
 ) where
     WVUF::PublicParameters: for<'a> From<&'a WT::PublicParameters>,
@@ -370,7 +418,7 @@ fn wvuf_augment_random_pubkey<
     });
 }
 
-fn wvuf_create_share<
+fn wvuf_create_share_random<
     WT: Transcript<SecretSharingConfig = WeightedConfig>,
     WVUF: WeightedVUF<
         SecretKey = WT::DealtSecretKey,
@@ -378,16 +426,15 @@ fn wvuf_create_share<
         SecretKeyShare = WT::DealtSecretKeyShare,
     >,
     R: rand_core::RngCore + rand_core::CryptoRng,
-    M: Measurement,
 >(
     wc: &WeightedConfig,
     asks: &Vec<WVUF::AugmentedSecretKeyShare>,
-    group: &mut BenchmarkGroup<M>,
+    group: &mut BenchmarkGroup<WallTime>,
     rng: &mut R,
 ) where
     WVUF::PublicParameters: for<'a> From<&'a WT::PublicParameters>,
 {
-    group.bench_function(format!("create_share/{}", wc), move |b| {
+    group.bench_function(format!("create_share_random/{}", wc), move |b| {
         b.iter_with_setup(
             || {
                 let player = wc.get_random_player(rng);
@@ -398,7 +445,74 @@ fn wvuf_create_share<
     });
 }
 
-fn wvuf_verify_share<
+fn wvuf_create_share_specific<
+    WT: Transcript<SecretSharingConfig = WeightedConfig>,
+    WVUF: WeightedVUF<
+        SecretKey = WT::DealtSecretKey,
+        PubKeyShare = WT::DealtPubKeyShare,
+        SecretKeyShare = WT::DealtSecretKeyShare,
+    >,
+    R: rand_core::RngCore + rand_core::CryptoRng,
+>(
+    wc: &WeightedConfig,
+    asks: &Vec<WVUF::AugmentedSecretKeyShare>,
+    group: &mut BenchmarkGroup<WallTime>,
+    player: &Player,
+    name: &str,
+) where
+    WVUF::PublicParameters: for<'a> From<&'a WT::PublicParameters>,
+{
+    group.bench_function(format!("create_share_specific/{}/{}", name, wc), move |b| {
+        b.iter_with_setup(
+            || &asks[player.id],
+            |ask| WVUF::create_share(ask, BENCH_MSG),
+        )
+    });
+}
+
+fn wvuf_create_share_average<
+    WT: Transcript<SecretSharingConfig = WeightedConfig>,
+    WVUF: WeightedVUF<
+        SecretKey = WT::DealtSecretKey,
+        PubKeyShare = WT::DealtPubKeyShare,
+        SecretKeyShare = WT::DealtSecretKeyShare,
+    >,
+    R: rand_core::RngCore + rand_core::CryptoRng,
+>(
+    wc: &WeightedConfig,
+    asks: &Vec<WVUF::AugmentedSecretKeyShare>,
+    group: &mut BenchmarkGroup<WallTime>,
+) where
+    WVUF::PublicParameters: for<'a> From<&'a WT::PublicParameters>,
+{
+    group.bench_function(format!("create_share_average/{}", wc), move |b| {
+        let n = wc.get_total_num_players();
+        b.iter_custom(|iters| {
+            let shares: Vec<_> = (0..n)
+                .map(|i| {
+                    let player = wc.get_player(i);
+                    &asks[player.id]
+                })
+                .collect();
+
+            let start = Instant::now();
+            for _i in 0..iters {
+                black_box(
+                    shares
+                        .iter()
+                        .map(|ask| {
+                            WVUF::create_share(ask, BENCH_MSG);
+                        })
+                        .collect::<Vec<_>>(),
+                );
+            }
+            let total_duration = start.elapsed();
+            total_duration / (n as u32)
+        })
+    });
+}
+
+fn wvuf_verify_share_random<
     WT: Transcript<SecretSharingConfig = WeightedConfig>,
     WVUF: WeightedVUF<
         SecretKey = WT::DealtSecretKey,
@@ -406,18 +520,17 @@ fn wvuf_verify_share<
         SecretKeyShare = WT::DealtSecretKeyShare,
     >,
     R: rand_core::RngCore + rand_core::CryptoRng,
-    M: Measurement,
 >(
     wc: &WeightedConfig,
     vuf_pp: &WVUF::PublicParameters,
     asks: &Vec<WVUF::AugmentedSecretKeyShare>,
     apks: &Vec<WVUF::AugmentedPubKeyShare>,
-    group: &mut BenchmarkGroup<M>,
+    group: &mut BenchmarkGroup<WallTime>,
     rng: &mut R,
 ) where
     WVUF::PublicParameters: for<'a> From<&'a WT::PublicParameters>,
 {
-    group.bench_function(format!("verify_share/{}", wc), move |b| {
+    group.bench_function(format!("verify_share_random/{}", wc), move |b| {
         b.iter_with_setup(
             || {
                 let player = wc.get_random_player(rng);
@@ -430,6 +543,112 @@ fn wvuf_verify_share<
     });
 }
 
+fn wvuf_verify_share_average<
+    WT: Transcript<SecretSharingConfig = WeightedConfig>,
+    WVUF: WeightedVUF<
+        SecretKey = WT::DealtSecretKey,
+        PubKeyShare = WT::DealtPubKeyShare,
+        SecretKeyShare = WT::DealtSecretKeyShare,
+    >,
+    R: rand_core::RngCore + rand_core::CryptoRng,
+>(
+    wc: &WeightedConfig,
+    vuf_pp: &WVUF::PublicParameters,
+    asks: &Vec<WVUF::AugmentedSecretKeyShare>,
+    apks: &Vec<WVUF::AugmentedPubKeyShare>,
+    group: &mut BenchmarkGroup<WallTime>,
+) where
+    WVUF::PublicParameters: for<'a> From<&'a WT::PublicParameters>,
+{
+    group.bench_function(format!("verify_share_average/{}", wc), move |b| {
+        let n = wc.get_total_num_players();
+        b.iter_custom(|iters| {
+            let shares: Vec<_> = (0..n)
+                .map(|i| {
+                    let player = wc.get_player(i);
+                    let ask = &asks[player.id];
+                    (WVUF::create_share(ask, BENCH_MSG), &apks[player.id])
+                })
+                .collect();
+
+            let start = Instant::now();
+            for _i in 0..iters {
+                black_box(
+                    shares
+                        .iter()
+                        .map(|(proof, apk)| WVUF::verify_share(vuf_pp, apk, BENCH_MSG, &proof))
+                        .collect::<Vec<anyhow::Result<()>>>(),
+                );
+            }
+            let total_duration = start.elapsed();
+            total_duration / (n as u32)
+        })
+    });
+}
+
+fn wvuf_many_verify_shares<
+    WT: Transcript<SecretSharingConfig = WeightedConfig>,
+    WVUF: WeightedVUF<
+        SecretKey = WT::DealtSecretKey,
+        PubKeyShare = WT::DealtPubKeyShare,
+        SecretKeyShare = WT::DealtSecretKeyShare,
+        PubKey = WT::DealtPubKey,
+    >,
+    R: rand_core::RngCore + rand_core::CryptoRng,
+>(
+    wc: &WeightedConfig,
+    vuf_pp: &WVUF::PublicParameters,
+    asks: &Vec<WVUF::AugmentedSecretKeyShare>,
+    apks: &Vec<WVUF::AugmentedPubKeyShare>,
+    pick_subset_fn: fn(&WeightedConfig, &mut R) -> Vec<Player>,
+    name: &str,
+    group: &mut BenchmarkGroup<WallTime>,
+    rng: &mut R,
+) where
+    WVUF::PublicParameters: for<'a> From<&'a WT::PublicParameters>,
+{
+    group.bench_function(format!("many_verify_shares/{}/{}", name, wc), move |b| {
+        b.iter_with_setup(
+            || get_apks_and_proofs::<WT, WVUF, R>(&wc, &asks, apks, rng, pick_subset_fn),
+            |apks_and_proofs| {
+                for (_, apk, proof) in apks_and_proofs {
+                    WVUF::verify_share(vuf_pp, &apk, BENCH_MSG, &proof).unwrap();
+                }
+            },
+        )
+    });
+}
+
+fn wvuf_verify_share_specific<
+    WT: Transcript<SecretSharingConfig = WeightedConfig>,
+    WVUF: WeightedVUF<
+        SecretKey = WT::DealtSecretKey,
+        PubKeyShare = WT::DealtPubKeyShare,
+        SecretKeyShare = WT::DealtSecretKeyShare,
+    >,
+    R: rand_core::RngCore + rand_core::CryptoRng,
+>(
+    wc: &WeightedConfig,
+    vuf_pp: &WVUF::PublicParameters,
+    asks: &Vec<WVUF::AugmentedSecretKeyShare>,
+    apks: &Vec<WVUF::AugmentedPubKeyShare>,
+    player: &Player,
+    name: &str,
+    group: &mut BenchmarkGroup<WallTime>,
+) where
+    WVUF::PublicParameters: for<'a> From<&'a WT::PublicParameters>,
+{
+    println!("Player weight: {:?}", wc.get_player_weight(player));
+    let ask = &asks[player.id];
+    let apk = &apks[player.id];
+    group.bench_function(format!("verify_share_specific/{}/{}", name, wc), move |b| {
+        b.iter_with_setup(
+            || WVUF::create_share(ask, BENCH_MSG),
+            |proof| WVUF::verify_share(vuf_pp, apk, BENCH_MSG, &proof),
+        )
+    });
+}
+
 fn wvuf_aggregate_shares<
     WT: Transcript<SecretSharingConfig = WeightedConfig>,
     WVUF: WeightedVUF<
@@ -439,13 +658,12 @@ fn wvuf_aggregate_shares<
         SecretKeyShare = WT::DealtSecretKeyShare,
     >,
     R: rand_core::RngCore + rand_core::CryptoRng,
-    M: Measurement,
 >(
     // For efficiency, we re-use the PVSS transcript
     wc: &WeightedConfig,
     asks: &Vec<WVUF::AugmentedSecretKeyShare>,
     apks: &Vec<WVUF::AugmentedPubKeyShare>,
-    group: &mut BenchmarkGroup<M>,
+    group: &mut BenchmarkGroup<WallTime>,
     rng: &mut R,
     pick_subset_fn: fn(&WeightedConfig, &mut R) -> Vec<Player>,
     subset_type: &String,
@@ -474,7 +692,6 @@ fn wvuf_verify_proof<
         SecretKeyShare = WT::DealtSecretKeyShare,
     >,
     R: rand_core::RngCore + rand_core::CryptoRng,
-    M: Measurement,
 >(
     // For efficiency, we re-use the PVSS transcript
     wc: &WeightedConfig,
@@ -482,7 +699,7 @@ fn wvuf_verify_proof<
     pk: &WVUF::PubKey,
     asks: &Vec<WVUF::AugmentedSecretKeyShare>,
     apks: &Vec<WVUF::AugmentedPubKeyShare>,
-    group: &mut BenchmarkGroup<M>,
+    group: &mut BenchmarkGroup<WallTime>,
     rng: &mut R,
     pick_subset_fn: fn(&WeightedConfig, &mut R) -> Vec<Player>,
     subset_type: &String,
@@ -519,14 +736,13 @@ fn wvuf_derive_eval<
         SecretKeyShare = WT::DealtSecretKeyShare,
     >,
     R: rand_core::RngCore + rand_core::CryptoRng,
-    M: Measurement,
 >(
     // For efficiency, we re-use the PVSS transcript
     wc: &WeightedConfig,
     pp: &WVUF::PublicParameters,
     asks: &Vec<WVUF::AugmentedSecretKeyShare>,
     apks: &Vec<WVUF::AugmentedPubKeyShare>,
-    group: &mut BenchmarkGroup<M>,
+    group: &mut BenchmarkGroup<WallTime>,
     rng: &mut R,
     pick_subset_fn: fn(&WeightedConfig, &mut R) -> Vec<Player>,
     subset_type: &String,
@@ -565,13 +781,12 @@ fn wvuf_derive_eval<
 
 fn pinkas_wvuf_derive_eval_collect_lagrange_shares_and_rks<
     R: rand_core::RngCore + rand_core::CryptoRng,
-    M: Measurement,
 >(
     // For efficiency, we re-use the PVSS transcript
     wc: &WeightedConfig,
     asks: &Vec<<PinkasWUF as WeightedVUF>::AugmentedSecretKeyShare>,
     apks: &Vec<<PinkasWUF as WeightedVUF>::AugmentedPubKeyShare>,
-    group: &mut BenchmarkGroup<M>,
+    group: &mut BenchmarkGroup<WallTime>,
     rng: &mut R,
     pick_subset_fn: fn(&WeightedConfig, &mut R) -> Vec<Player>,
     subset_type: &str,
@@ -606,15 +821,12 @@ fn pinkas_wvuf_derive_eval_collect_lagrange_shares_and_rks<
     );
 }
 
-fn pinkas_wvuf_derive_eval_rks_multiexps<
-    R: rand_core::RngCore + rand_core::CryptoRng,
-    M: Measurement,
->(
+fn pinkas_wvuf_derive_eval_rks_multiexps<R: rand_core::RngCore + rand_core::CryptoRng>(
     // For efficiency, we re-use the PVSS transcript
     wc: &WeightedConfig,
     asks: &Vec<<PinkasWUF as WeightedVUF>::AugmentedSecretKeyShare>,
     apks: &Vec<<PinkasWUF as WeightedVUF>::AugmentedPubKeyShare>,
-    group: &mut BenchmarkGroup<M>,
+    group: &mut BenchmarkGroup<WallTime>,
     rng: &mut R,
     pick_subset_fn: fn(&WeightedConfig, &mut R) -> Vec<Player>,
     subset_type: &str,
@@ -667,13 +879,10 @@ fn pinkas_wvuf_derive_eval_rks_multiexps<
     );
 }
 
-fn pinkas_wvuf_derive_eval_multipairing<
-    R: rand_core::RngCore + rand_core::CryptoRng,
-    M: Measurement,
->(
+fn pinkas_wvuf_derive_eval_multipairing<R: rand_core::RngCore + rand_core::CryptoRng>(
     // For efficiency, we re-use the PVSS transcript
     wc: &WeightedConfig,
-    group: &mut BenchmarkGroup<M>,
+    group: &mut BenchmarkGroup<WallTime>,
     rng: &mut R,
     pick_subset_fn: fn(&WeightedConfig, &mut R) -> Vec<Player>,
     subset_type: &str,
@@ -742,11 +951,10 @@ fn wvuf_eval<
         PubKeyShare = WT::DealtPubKeyShare,
         SecretKeyShare = WT::DealtSecretKeyShare,
     >,
-    M: Measurement,
 >(
     wc: &WeightedConfig,
     sk: &WVUF::SecretKey,
-    group: &mut BenchmarkGroup<M>,
+    group: &mut BenchmarkGroup<WallTime>,
 ) where
     WVUF::PublicParameters: for<'a> From<&'a WT::PublicParameters>,
 {
diff --git a/crates/aptos-dkg/src/pvss/das/unweighted_protocol.rs b/crates/aptos-dkg/src/pvss/das/unweighted_protocol.rs
index 97e80a4dc5afe..932df7c299b31 100644
--- a/crates/aptos-dkg/src/pvss/das/unweighted_protocol.rs
+++ b/crates/aptos-dkg/src/pvss/das/unweighted_protocol.rs
@@ -164,6 +164,7 @@ impl traits::Transcript for Transcript {
         }
 
         // Derive challenges deterministically via Fiat-Shamir; easier to debug for distributed systems
+        // TODO: benchmark this
         let (f, extra) = fiat_shamir::fiat_shamir(
             self,
             sc,
@@ -199,6 +200,7 @@ impl traits::Transcript for Transcript {
 
         // TODO(Performance): Change the Fiat-Shamir transform to use 128-bit random exponents.
         // r_i = \tau^i, \forall i \in [n]
+        // TODO: benchmark this
         let taus = get_nonzero_powers_of_tau(&extra[1], sc.n);
 
         // Compute the multiexps from above.
diff --git a/crates/aptos-dkg/src/pvss/fiat_shamir.rs b/crates/aptos-dkg/src/pvss/fiat_shamir.rs
index 30fe2c06eb725..57929b397b414 100644
--- a/crates/aptos-dkg/src/pvss/fiat_shamir.rs
+++ b/crates/aptos-dkg/src/pvss/fiat_shamir.rs
@@ -46,6 +46,8 @@ pub trait FiatShamirProtocol<T: Transcript> {
     /// Returns one or more scalars `r` useful for doing linear combinations (e.g., combining
     /// pairings in the SCRAPE multipairing check using coefficients $1, r, r^2, r^3, \ldots$
     fn challenge_linear_combination_scalars(&mut self, num_scalars: usize) -> Vec<Scalar>;
+
+    #[allow(dead_code)]
     fn challenge_linear_combination_128bit(&mut self, num_scalars: usize) -> Vec<Scalar>;
 }
 
diff --git a/crates/aptos-dkg/src/pvss/low_degree_test.rs b/crates/aptos-dkg/src/pvss/low_degree_test.rs
index feabcd43f58b3..930820213a600 100644
--- a/crates/aptos-dkg/src/pvss/low_degree_test.rs
+++ b/crates/aptos-dkg/src/pvss/low_degree_test.rs
@@ -192,7 +192,7 @@ impl<'a> LowDegreeTest<'a> {
     /// [CD17e] SCRAPE: Scalable Randomness Attested by Public Entities; by Ignacio Cascudo and
     /// Bernardo David; in Cryptology ePrint Archive, Report 2017/216; 2017;
     /// https://eprint.iacr.org/2017/216
-    fn dual_code_word(self) -> Vec<Scalar> {
+    pub fn dual_code_word(self) -> Vec<Scalar> {
         // println!("dual_code_word   > t: {t}, n: {n}, includes_zero: {includes_zero}");
 
         // Accounts for the size of `f` being the `n` evaluations of f(X) at the roots-of-unity and f(0)
diff --git a/crates/aptos-dkg/src/pvss/schnorr.rs b/crates/aptos-dkg/src/pvss/schnorr.rs
index 03a26da2b62d2..d8d51783908ab 100644
--- a/crates/aptos-dkg/src/pvss/schnorr.rs
+++ b/crates/aptos-dkg/src/pvss/schnorr.rs
@@ -47,7 +47,7 @@ where
 /// Computes the Fiat-Shamir challenge in the Schnorr PoK protocol given an instance $(g, pk = g^a)$
 /// and the commitment $R = g^r$.
 #[allow(non_snake_case)]
-fn schnorr_hash<Gr: Serialize>(c: Challenge<Gr>) -> Scalar
+fn schnorr_hash<Gr>(c: Challenge<Gr>) -> Scalar
 where
     Gr: Serialize,
 {
diff --git a/crates/aptos-dkg/src/pvss/test_utils.rs b/crates/aptos-dkg/src/pvss/test_utils.rs
index 5b3c871622b5c..0a8a87b168af4 100644
--- a/crates/aptos-dkg/src/pvss/test_utils.rs
+++ b/crates/aptos-dkg/src/pvss/test_utils.rs
@@ -172,7 +172,11 @@ pub fn get_weighted_configs_for_testing() -> Vec<WeightedConfig> {
 }
 
 pub fn get_threshold_configs_for_benchmarking() -> Vec<ThresholdConfig> {
+    // [XDL+24] The Latency Price of Threshold Cryptosystem in Blockchains; by Zhuolun Xiang et al; 2024
     vec![
+        ThresholdConfig::new(143, 254).unwrap(), // from XDL+24
+        ThresholdConfig::new(184, 254).unwrap(), // from XDL+24
+        ThresholdConfig::new(548, 821).unwrap(), // from initial deployment
         ThresholdConfig::new(333, 1_000).unwrap(),
         ThresholdConfig::new(666, 1_000).unwrap(),
         ThresholdConfig::new(3_333, 10_000).unwrap(),
diff --git a/crates/aptos-dkg/src/pvss/weighted/weighted_config.rs b/crates/aptos-dkg/src/pvss/weighted/weighted_config.rs
index 77a0fd00e760a..f5adc881040e2 100644
--- a/crates/aptos-dkg/src/pvss/weighted/weighted_config.rs
+++ b/crates/aptos-dkg/src/pvss/weighted/weighted_config.rs
@@ -29,7 +29,9 @@ pub struct WeightedConfig {
     /// `W[a, a + weight[player])`. Useful during weighted secret reconstruction.
     starting_index: Vec<usize>,
     /// The maximum weight of any player.
-    max_player_weight: usize,
+    max_weight: usize,
+    /// The minimum weight of any player.
+    min_weight: usize,
 }
 
 impl WeightedConfig {
@@ -46,7 +48,8 @@ impl WeightedConfig {
         if weights.is_empty() {
             return Err(anyhow!("expected a non-empty vector of player weights"));
         }
-        let max_player_weight = *weights.iter().max().unwrap();
+        let max_weight = *weights.iter().max().unwrap();
+        let min_weight = *weights.iter().min().unwrap();
 
         let n = weights.len();
         let W = weights.iter().sum();
@@ -70,12 +73,47 @@ impl WeightedConfig {
             num_players: n,
             weight: weights,
             starting_index,
-            max_player_weight,
+            max_weight,
+            min_weight,
         })
     }
 
-    pub fn get_max_player_weight(&self) -> usize {
-        self.max_player_weight
+    pub fn get_min_weight(&self) -> usize {
+        self.min_weight
+    }
+
+    /// Returns _a_ player who has the smallest weight.
+    pub fn get_min_weight_player(&self) -> Player {
+        if let Some((i, _weight)) = self
+            .weight
+            .iter()
+            .enumerate()
+            .min_by_key(|&(_, &weight)| weight)
+        {
+            // println!("Player {} has the smallest weight: {}", i, _weight);
+            self.get_player(i)
+        } else {
+            panic!("Weights vector should not be empty");
+        }
+    }
+
+    /// Returns _a_ player who has the largest weight.
+    pub fn get_max_weight_player(&self) -> Player {
+        if let Some((i, _weight)) = self
+            .weight
+            .iter()
+            .enumerate()
+            .max_by_key(|&(_, &weight)| weight)
+        {
+            // println!("Player {} has the largest weight: {}", i, _weight);
+            self.get_player(i)
+        } else {
+            panic!("Weights vector should not be empty");
+        }
+    }
+
+    pub fn get_max_weight(&self) -> usize {
+        self.max_weight
     }
 
     pub fn get_threshold_config(&self) -> &ThresholdConfig {
diff --git a/crates/aptos-dkg/src/weighted_vuf/bls/mod.rs b/crates/aptos-dkg/src/weighted_vuf/bls/mod.rs
index c085640fb4d9a..11235ceafadd9 100644
--- a/crates/aptos-dkg/src/weighted_vuf/bls/mod.rs
+++ b/crates/aptos-dkg/src/weighted_vuf/bls/mod.rs
@@ -2,10 +2,10 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{
-    algebra::lagrange::lagrange_coefficients,
+    algebra::{lagrange::lagrange_coefficients, polynomials::get_powers_of_tau},
     pvss,
     pvss::{Player, WeightedConfig},
-    utils::{g1_multi_exp, multi_pairing, random::random_scalars, HasMultiExp},
+    utils::{g1_multi_exp, multi_pairing, random::random_scalar, HasMultiExp},
     weighted_vuf::traits::WeightedVUF,
 };
 use anyhow::bail;
@@ -82,13 +82,14 @@ impl WeightedVUF for BlsWUF {
         proof: &Self::ProofShare,
     ) -> anyhow::Result<()> {
         let hash = Self::hash_to_curve(msg);
-        // TODO: Use Fiat-Shamir
-        let coeffs = random_scalars(apk.len(), &mut thread_rng());
+        // TODO: Use Fiat-Shamir instead of random_scalar
+        let coeffs = get_powers_of_tau(&random_scalar(&mut thread_rng()), apk.len());
 
         let pks = apk
             .iter()
             .map(|pk| *pk.as_group_element())
             .collect::<Vec<G2Projective>>();
+        // TODO: Calling multi-exp seems to decrease performance by 100+ microseconds even when |coeffs| = 1 and the coefficient is 1. Not sure what's going on here.
         let agg_pk = G2Projective::multi_exp_slice(pks.as_slice(), coeffs.as_slice());
         let agg_sig = G1Projective::multi_exp_slice(proof.to_vec().as_slice(), coeffs.as_slice());
 
diff --git a/crates/aptos-drop-helper/src/lib.rs b/crates/aptos-drop-helper/src/lib.rs
index d9a4f79ea6717..ce91987bf6525 100644
--- a/crates/aptos-drop-helper/src/lib.rs
+++ b/crates/aptos-drop-helper/src/lib.rs
@@ -10,3 +10,9 @@ mod metrics;
 
 pub static DEFAULT_DROPPER: Lazy<AsyncConcurrentDropper> =
     Lazy::new(|| AsyncConcurrentDropper::new("default", 32, 8));
+
+/// Arc<T: ArcAsyncDrop> will be `Send + 'static`, which is requried to be able to drop Arc<T>
+/// in another thread
+pub trait ArcAsyncDrop: Send + Sync + 'static {}
+
+impl<T: Send + Sync + 'static> ArcAsyncDrop for T {}
diff --git a/crates/aptos-faucet/core/src/endpoints/captcha.rs b/crates/aptos-faucet/core/src/endpoints/captcha.rs
index 168222b3d787f..0975ec93e7915 100644
--- a/crates/aptos-faucet/core/src/endpoints/captcha.rs
+++ b/crates/aptos-faucet/core/src/endpoints/captcha.rs
@@ -34,7 +34,7 @@ impl CaptchaApi {
         path = "/request_captcha",
         method = "get",
         operation_id = "request_captcha",
-        response_header(name = "CAPTCHA_KEY", type = "u32", description = "Captcha key"),
+        response_header(name = "CAPTCHA_KEY", ty = "u32", description = "Captcha key"),
         tag = "ApiTags::Captcha"
     )]
     async fn request_captcha(&self) -> Result<Response<Binary<Vec<u8>>>, AptosTapErrorResponse> {
diff --git a/crates/aptos-faucet/doc/spec.json b/crates/aptos-faucet/doc/spec.json
index 069900cb2c627..3dbda9f3ae6ce 100644
--- a/crates/aptos-faucet/doc/spec.json
+++ b/crates/aptos-faucet/doc/spec.json
@@ -15,7 +15,7 @@
   },
   "servers": [
     {
-      "url": "/v1"
+      "url": "/"
     }
   ],
   "tags": [
diff --git a/crates/aptos-faucet/doc/spec.yaml b/crates/aptos-faucet/doc/spec.yaml
index 7dd142230d439..2fff2dcd61713 100644
--- a/crates/aptos-faucet/doc/spec.yaml
+++ b/crates/aptos-faucet/doc/spec.yaml
@@ -10,7 +10,7 @@ info:
     name: Apache 2.0
     url: https://www.apache.org/licenses/LICENSE-2.0.html
 servers:
-- url: /v1
+- url: /
 tags:
 - name: Captcha
   description: Captcha API
diff --git a/crates/aptos-genesis/src/builder.rs b/crates/aptos-genesis/src/builder.rs
index 46ff5f6778c22..9a5b8586d7cbd 100644
--- a/crates/aptos-genesis/src/builder.rs
+++ b/crates/aptos-genesis/src/builder.rs
@@ -528,6 +528,7 @@ impl Builder {
 
         // Generate validator configs
         let template = NodeConfig::get_default_validator_config();
+
         let mut validators: Vec<ValidatorNodeConfig> = (0..self.num_validators.get())
             .map(|i| self.generate_validator_config(i, &mut rng, &template))
             .collect::<anyhow::Result<Vec<ValidatorNodeConfig>>>()?;
diff --git a/crates/aptos-genesis/src/lib.rs b/crates/aptos-genesis/src/lib.rs
index b9cb747aebe3a..3a0cb84696545 100644
--- a/crates/aptos-genesis/src/lib.rs
+++ b/crates/aptos-genesis/src/lib.rs
@@ -168,6 +168,7 @@ impl GenesisInfo {
             false, /* indexer */
             BUFFERED_STATE_TARGET_ITEMS,
             DEFAULT_MAX_NUM_NODES_PER_LRU_CACHE_SHARD,
+            None,
         )?;
         let db_rw = DbReaderWriter::new(aptosdb);
         aptos_executor::db_bootstrapper::generate_waypoint::<AptosVM>(&db_rw, genesis)
diff --git a/crates/aptos-genesis/src/mainnet.rs b/crates/aptos-genesis/src/mainnet.rs
index b2226b3d35cf0..a3a1d27b6048d 100644
--- a/crates/aptos-genesis/src/mainnet.rs
+++ b/crates/aptos-genesis/src/mainnet.rs
@@ -158,6 +158,7 @@ impl MainnetGenesisInfo {
             false, /* indexer */
             BUFFERED_STATE_TARGET_ITEMS,
             DEFAULT_MAX_NUM_NODES_PER_LRU_CACHE_SHARD,
+            None,
         )?;
         let db_rw = DbReaderWriter::new(aptosdb);
         aptos_executor::db_bootstrapper::generate_waypoint::<AptosVM>(&db_rw, genesis)
diff --git a/crates/aptos-genesis/src/test_utils.rs b/crates/aptos-genesis/src/test_utils.rs
index 1baf43bbc9544..17698c250699b 100644
--- a/crates/aptos-genesis/src/test_utils.rs
+++ b/crates/aptos-genesis/src/test_utils.rs
@@ -5,12 +5,22 @@ use crate::builder::InitGenesisConfigFn;
 use aptos_config::config::{IdentityBlob, NodeConfig};
 use aptos_crypto::ed25519::Ed25519PrivateKey;
 use aptos_temppath::TempPath;
+use aptos_types::on_chain_config::Features;
 use rand::{rngs::StdRng, SeedableRng};
+use std::sync::Arc;
 
 pub fn test_config() -> (NodeConfig, Ed25519PrivateKey) {
     test_config_with_custom_onchain(None)
 }
 
+pub fn test_config_with_custom_features(
+    init_features: Features,
+) -> (NodeConfig, Ed25519PrivateKey) {
+    test_config_with_custom_onchain(Some(Arc::new(move |config| {
+        config.initial_features_override = Some(init_features.clone());
+    })))
+}
+
 pub fn test_config_with_custom_onchain(
     init_genesis_config: Option<InitGenesisConfigFn>,
 ) -> (NodeConfig, Ed25519PrivateKey) {
diff --git a/crates/aptos-id-generator/src/lib.rs b/crates/aptos-id-generator/src/lib.rs
index 96f11c5804198..30778048c04b1 100644
--- a/crates/aptos-id-generator/src/lib.rs
+++ b/crates/aptos-id-generator/src/lib.rs
@@ -35,6 +35,7 @@ impl U32IdGenerator {
         }
     }
 }
+
 impl IdGenerator<u32> for U32IdGenerator {
     /// Retrieves the next ID, wrapping on overflow
     #[inline]
@@ -43,6 +44,12 @@ impl IdGenerator<u32> for U32IdGenerator {
     }
 }
 
+impl Default for U32IdGenerator {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 /// A generic in order [`IdGenerator`] using an [`AtomicU64`] to guarantee uniqueness
 #[derive(Debug, Default)]
 pub struct U64IdGenerator {
diff --git a/crates/aptos-jwk-consensus/Cargo.toml b/crates/aptos-jwk-consensus/Cargo.toml
index 6b5ee170715d8..b5bf11ad1948d 100644
--- a/crates/aptos-jwk-consensus/Cargo.toml
+++ b/crates/aptos-jwk-consensus/Cargo.toml
@@ -23,6 +23,7 @@ aptos-crypto = { workspace = true }
 aptos-enum-conversion-derive = { workspace = true }
 aptos-event-notifications = { workspace = true }
 aptos-infallible = { workspace = true }
+aptos-jwk-utils = { workspace = true }
 aptos-logger = { workspace = true }
 aptos-metrics-core = { workspace = true }
 aptos-network = { workspace = true }
@@ -38,9 +39,7 @@ futures-channel = { workspace = true }
 futures-util = { workspace = true }
 move-core-types = { workspace = true }
 once_cell = { workspace = true }
-reqwest = { workspace = true }
 serde = { workspace = true }
-serde_json = { workspace = true }
 tokio = { workspace = true }
 tokio-retry = { workspace = true }
 
diff --git a/crates/aptos-jwk-consensus/src/epoch_manager.rs b/crates/aptos-jwk-consensus/src/epoch_manager.rs
index 9ffb748991f7e..31609b06504fd 100644
--- a/crates/aptos-jwk-consensus/src/epoch_manager.rs
+++ b/crates/aptos-jwk-consensus/src/epoch_manager.rs
@@ -201,6 +201,7 @@ impl<P: OnChainConfigProvider> EpochManager<P> {
                 self.self_sender.clone(),
             );
             let rb = ReliableBroadcast::new(
+                self.my_addr,
                 epoch_state.verifier.get_ordered_account_addresses(),
                 Arc::new(network_sender),
                 ExponentialBackoff::from_millis(5),
diff --git a/crates/aptos-jwk-consensus/src/jwk_manager/mod.rs b/crates/aptos-jwk-consensus/src/jwk_manager/mod.rs
index 992a9fa95502b..fbaaa86f002fd 100644
--- a/crates/aptos-jwk-consensus/src/jwk_manager/mod.rs
+++ b/crates/aptos-jwk-consensus/src/jwk_manager/mod.rs
@@ -10,13 +10,13 @@ use crate::{
 use anyhow::{anyhow, bail, Result};
 use aptos_channels::{aptos_channel, message_queues::QueueStyle};
 use aptos_crypto::{bls12381::PrivateKey, SigningKey};
-use aptos_logger::{debug, error, info};
+use aptos_logger::{debug, error, info, warn};
 use aptos_types::{
     account_address::AccountAddress,
     epoch_state::EpochState,
     jwks::{
-        jwk::JWKMoveStruct, AllProvidersJWKs, Issuer, ObservedJWKs, ObservedJWKsUpdated,
-        ProviderJWKs, QuorumCertifiedUpdate, SupportedOIDCProviders,
+        jwk::JWKMoveStruct, AllProvidersJWKs, Issuer, OIDCProvider, ObservedJWKs,
+        ObservedJWKsUpdated, ProviderJWKs, QuorumCertifiedUpdate, SupportedOIDCProviders,
     },
     validator_txn::{Topic, ValidatorTransaction},
 };
@@ -103,15 +103,27 @@ impl JWKManager {
             .unwrap_or_default()
             .into_provider_vec()
             .into_iter()
-            .map(|provider| {
-                JWKObserver::spawn(
-                    self.epoch_state.epoch,
-                    self.my_addr,
-                    provider.name.clone(),
-                    provider.config_url.clone(),
-                    Duration::from_secs(10),
-                    local_observation_tx.clone(),
-                )
+            .filter_map(|provider| {
+                let OIDCProvider { name, config_url } = provider;
+                let maybe_issuer = String::from_utf8(name);
+                let maybe_config_url = String::from_utf8(config_url);
+                match (maybe_issuer, maybe_config_url) {
+                    (Ok(issuer), Ok(config_url)) => Some(JWKObserver::spawn(
+                        self.epoch_state.epoch,
+                        self.my_addr,
+                        issuer,
+                        config_url,
+                        Duration::from_secs(10),
+                        local_observation_tx.clone(),
+                    )),
+                    (maybe_issuer, maybe_config_url) => {
+                        warn!(
+                            "unable to spawn observer, issuer={:?}, config_url={:?}",
+                            maybe_issuer, maybe_config_url
+                        );
+                        None
+                    },
+                }
             })
             .collect();
 
diff --git a/crates/aptos-jwk-consensus/src/jwk_observer.rs b/crates/aptos-jwk-consensus/src/jwk_observer.rs
index 199318426d062..c680e2da2dd09 100644
--- a/crates/aptos-jwk-consensus/src/jwk_observer.rs
+++ b/crates/aptos-jwk-consensus/src/jwk_observer.rs
@@ -2,55 +2,16 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::counters::OBSERVATION_SECONDS;
-use anyhow::Result;
+use anyhow::{anyhow, Result};
 use aptos_channels::aptos_channel;
+use aptos_jwk_utils::{fetch_jwks_from_jwks_uri, fetch_jwks_uri_from_openid_config};
 use aptos_logger::{debug, info};
 use aptos_types::jwks::{jwk::JWK, Issuer};
 use futures::{FutureExt, StreamExt};
 use move_core_types::account_address::AccountAddress;
-use serde::{Deserialize, Serialize};
 use std::time::{Duration, Instant};
 use tokio::{sync::oneshot, task::JoinHandle, time::MissedTickBehavior};
 
-#[derive(Serialize, Deserialize)]
-struct OpenIDConfiguration {
-    issuer: String,
-    jwks_uri: String,
-}
-
-#[derive(Serialize, Deserialize)]
-struct JWKsResponse {
-    keys: Vec<serde_json::Value>,
-}
-
-/// Given an Open ID configuration URL, fetch its JWKs.
-pub async fn fetch_jwks(my_addr: AccountAddress, config_url: Vec<u8>) -> Result<Vec<JWK>> {
-    if cfg!(feature = "smoke-test") {
-        use reqwest::header;
-        let maybe_url = String::from_utf8(config_url);
-        let jwk_url = maybe_url?;
-        let client = reqwest::Client::new();
-        let JWKsResponse { keys } = client
-            .get(jwk_url.as_str())
-            .header(header::COOKIE, my_addr.to_hex())
-            .send()
-            .await?
-            .json()
-            .await?;
-        let jwks = keys.into_iter().map(JWK::from).collect();
-        Ok(jwks)
-    } else {
-        let maybe_url = String::from_utf8(config_url);
-        let config_url = maybe_url?;
-        let client = reqwest::Client::new();
-        let OpenIDConfiguration { jwks_uri, .. } =
-            client.get(config_url.as_str()).send().await?.json().await?;
-        let JWKsResponse { keys } = client.get(jwks_uri.as_str()).send().await?.json().await?;
-        let jwks = keys.into_iter().map(JWK::from).collect();
-        Ok(jwks)
-    }
-}
-
 /// A process thread that periodically fetch JWKs of a provider and push it back to JWKManager.
 pub struct JWKObserver {
     close_tx: oneshot::Sender<()>,
@@ -61,8 +22,8 @@ impl JWKObserver {
     pub fn spawn(
         epoch: u64,
         my_addr: AccountAddress,
-        issuer: Issuer,
-        config_url: Vec<u8>,
+        issuer: String,
+        config_url: String,
         fetch_interval: Duration,
         observation_tx: aptos_channel::Sender<(), (Issuer, Vec<JWK>)>,
     ) -> Self {
@@ -77,8 +38,8 @@ impl JWKObserver {
         ));
         info!(
             epoch = epoch,
-            issuer = String::from_utf8(issuer).ok(),
-            config_url = String::from_utf8(config_url).ok(),
+            issuer = issuer,
+            config_url = config_url,
             "JWKObserver spawned."
         );
         Self {
@@ -90,29 +51,35 @@ impl JWKObserver {
     async fn start(
         fetch_interval: Duration,
         my_addr: AccountAddress,
-        issuer: Issuer,
-        open_id_config_url: Vec<u8>,
+        issuer: String,
+        open_id_config_url: String,
         observation_tx: aptos_channel::Sender<(), (Issuer, Vec<JWK>)>,
         close_rx: oneshot::Receiver<()>,
     ) {
-        let issuer_str =
-            String::from_utf8(issuer.clone()).unwrap_or_else(|_e| "UNKNOWN_ISSUER".to_string());
         let mut interval = tokio::time::interval(fetch_interval);
         interval.set_missed_tick_behavior(MissedTickBehavior::Delay);
         let mut close_rx = close_rx.into_stream();
+        let my_addr = if cfg!(feature = "smoke-test") {
+            // Include self validator address in JWK request,
+            // so dummy OIDC providers in smoke tests can do things like "key A for validator 1, key B for validator 2".
+            Some(my_addr)
+        } else {
+            None
+        };
+
         loop {
             tokio::select! {
                 _ = interval.tick().fuse() => {
                     let timer = Instant::now();
-                    let result = fetch_jwks(my_addr, open_id_config_url.clone()).await;
+                    let result = fetch_jwks(open_id_config_url.as_str(), my_addr).await;
+                    debug!(issuer = issuer, "observe_result={:?}", result);
                     let secs = timer.elapsed().as_secs_f64();
-                    debug!(issuer = issuer_str, "observe_result={:?}", result);
                     if let Ok(mut jwks) = result {
-                        OBSERVATION_SECONDS.with_label_values(&[&issuer_str, "ok"]).observe(secs);
+                        OBSERVATION_SECONDS.with_label_values(&[issuer.as_str(), "ok"]).observe(secs);
                         jwks.sort();
-                        let _ = observation_tx.push((), (issuer.clone(), jwks));
+                        let _ = observation_tx.push((), (issuer.as_bytes().to_vec(), jwks));
                     } else {
-                        OBSERVATION_SECONDS.with_label_values(&[&issuer_str, "err"]).observe(secs);
+                        OBSERVATION_SECONDS.with_label_values(&[issuer.as_str(), "err"]).observe(secs);
                     }
                 },
                 _ = close_rx.select_next_some() => {
@@ -132,16 +99,12 @@ impl JWKObserver {
     }
 }
 
-#[ignore]
-#[tokio::test]
-async fn test_fetch_real_jwks() {
-    let jwks = fetch_jwks(
-        AccountAddress::ZERO,
-        "https://www.facebook.com/.well-known/openid-configuration/"
-            .as_bytes()
-            .to_vec(),
-    )
-    .await
-    .unwrap();
-    println!("{:?}", jwks);
+async fn fetch_jwks(open_id_config_url: &str, my_addr: Option<AccountAddress>) -> Result<Vec<JWK>> {
+    let jwks_uri = fetch_jwks_uri_from_openid_config(open_id_config_url)
+        .await
+        .map_err(|e| anyhow!("fetch_jwks failed with open-id config request: {e}"))?;
+    let jwks = fetch_jwks_from_jwks_uri(my_addr, jwks_uri.as_str())
+        .await
+        .map_err(|e| anyhow!("fetch_jwks failed with jwks uri request: {e}"))?;
+    Ok(jwks)
 }
diff --git a/crates/aptos-jwk-consensus/src/network.rs b/crates/aptos-jwk-consensus/src/network.rs
index cbdd1db65f807..09128e037f422 100644
--- a/crates/aptos-jwk-consensus/src/network.rs
+++ b/crates/aptos-jwk-consensus/src/network.rs
@@ -28,8 +28,7 @@ use futures_util::{
 };
 #[cfg(test)]
 use std::sync::Arc;
-use std::time::Duration;
-use tokio::time::timeout;
+use std::{collections::HashMap, time::Duration};
 
 pub struct IncomingRpcRequest {
     pub msg: JWKConsensusMsg,
@@ -59,29 +58,56 @@ impl NetworkSender {
 
 #[async_trait::async_trait]
 impl RBNetworkSender<JWKConsensusMsg> for NetworkSender {
+    async fn send_rb_rpc_raw(
+        &self,
+        receiver: AccountAddress,
+        raw_message: Bytes,
+        timeout: Duration,
+    ) -> anyhow::Result<JWKConsensusMsg> {
+        Ok(self
+            .jwk_network_client
+            .send_rpc_raw(receiver, raw_message, timeout)
+            .await?)
+    }
+
     async fn send_rb_rpc(
         &self,
-        receiver: Author,
-        msg: JWKConsensusMsg,
-        time_limit: Duration,
+        receiver: AccountAddress,
+        message: JWKConsensusMsg,
+        timeout: Duration,
     ) -> anyhow::Result<JWKConsensusMsg> {
         if receiver == self.author {
             let (tx, rx) = oneshot::channel();
-            let self_msg = Event::RpcRequest(receiver, msg, RPC[0], tx);
+            let protocol = RPC[0];
+            let self_msg = Event::RpcRequest(self.author, message, protocol, tx);
             self.self_sender.clone().send(self_msg).await?;
-            if let Ok(Ok(Ok(bytes))) = timeout(time_limit, rx).await {
-                Ok(RPC[0].from_bytes(&bytes)?)
+            if let Ok(Ok(Ok(bytes))) = tokio::time::timeout(timeout, rx).await {
+                let response_msg =
+                    tokio::task::spawn_blocking(move || protocol.from_bytes(&bytes)).await??;
+                Ok(response_msg)
             } else {
                 bail!("self rpc failed");
             }
         } else {
             let result = self
                 .jwk_network_client
-                .send_rpc(receiver, msg, time_limit)
+                .send_rpc(receiver, message, timeout)
                 .await?;
             Ok(result)
         }
     }
+
+    fn to_bytes_by_protocol(
+        &self,
+        peers: Vec<Author>,
+        message: JWKConsensusMsg,
+    ) -> Result<HashMap<Author, bytes::Bytes>, anyhow::Error> {
+        self.jwk_network_client.to_bytes_by_protocol(peers, message)
+    }
+
+    fn sort_peers_by_latency(&self, peers: &mut [AccountAddress]) {
+        self.jwk_network_client.sort_peers_by_latency(peers)
+    }
 }
 
 pub trait RpcResponseSender: Send + Sync {
diff --git a/crates/aptos-jwk-consensus/src/network_interface.rs b/crates/aptos-jwk-consensus/src/network_interface.rs
index 80df5b3378c04..8d23002c6fa93 100644
--- a/crates/aptos-jwk-consensus/src/network_interface.rs
+++ b/crates/aptos-jwk-consensus/src/network_interface.rs
@@ -7,8 +7,9 @@ use aptos_network::{
     application::{error::Error, interface::NetworkClientInterface},
     ProtocolId,
 };
+use bytes::Bytes;
 use move_core_types::account_address::AccountAddress as PeerId;
-use std::time::Duration;
+use std::{collections::HashMap, time::Duration};
 
 /// Supported protocols in preferred order (from highest priority to lowest).
 pub const DIRECT_SEND: &[ProtocolId] = &[
@@ -42,9 +43,48 @@ impl<NetworkClient: NetworkClientInterface<JWKConsensusMsg>>
         message: JWKConsensusMsg,
         rpc_timeout: Duration,
     ) -> Result<JWKConsensusMsg, Error> {
-        let peer_network_id = PeerNetworkId::new(NetworkId::Validator, peer);
+        let peer_network_id = self.get_peer_network_id_for_peer(peer);
         self.network_client
             .send_to_peer_rpc(message, rpc_timeout, peer_network_id)
             .await
     }
+
+    pub async fn send_rpc_raw(
+        &self,
+        peer: PeerId,
+        message: Bytes,
+        rpc_timeout: Duration,
+    ) -> Result<JWKConsensusMsg, Error> {
+        let peer_network_id = self.get_peer_network_id_for_peer(peer);
+        self.network_client
+            .send_to_peer_rpc_raw(message, rpc_timeout, peer_network_id)
+            .await
+    }
+
+    pub fn to_bytes_by_protocol(
+        &self,
+        peers: Vec<PeerId>,
+        message: JWKConsensusMsg,
+    ) -> anyhow::Result<HashMap<PeerId, Bytes>> {
+        let peer_network_ids: Vec<PeerNetworkId> = peers
+            .into_iter()
+            .map(|peer| self.get_peer_network_id_for_peer(peer))
+            .collect();
+        Ok(self
+            .network_client
+            .to_bytes_by_protocol(peer_network_ids, message)?
+            .into_iter()
+            .map(|(peer_network_id, bytes)| (peer_network_id.peer_id(), bytes))
+            .collect())
+    }
+
+    // TODO: we shouldn't need to expose this. Migrate the code to handle peer and network ids.
+    fn get_peer_network_id_for_peer(&self, peer: PeerId) -> PeerNetworkId {
+        PeerNetworkId::new(NetworkId::Validator, peer)
+    }
+
+    pub fn sort_peers_by_latency(&self, peers: &mut [PeerId]) {
+        self.network_client
+            .sort_peers_by_latency(NetworkId::Validator, peers)
+    }
 }
diff --git a/crates/aptos-jwk-consensus/src/update_certifier.rs b/crates/aptos-jwk-consensus/src/update_certifier.rs
index 0a7b6dc821619..ae990364e5b02 100644
--- a/crates/aptos-jwk-consensus/src/update_certifier.rs
+++ b/crates/aptos-jwk-consensus/src/update_certifier.rs
@@ -64,7 +64,7 @@ impl TUpdateCertifier for UpdateCertifier {
         };
         let agg_state = Arc::new(ObservationAggregationState::new(epoch_state, payload));
         let task = async move {
-            let qc_update = rb.broadcast(req, agg_state).await;
+            let qc_update = rb.broadcast(req, agg_state).await.expect("cannot fail");
             info!(
                 epoch = epoch,
                 issuer = String::from_utf8(issuer.clone()).ok(),
diff --git a/crates/aptos-logger/src/aptos_logger.rs b/crates/aptos-logger/src/aptos_logger.rs
index fccad69b2af44..9d6843e7a289a 100644
--- a/crates/aptos-logger/src/aptos_logger.rs
+++ b/crates/aptos-logger/src/aptos_logger.rs
@@ -13,7 +13,8 @@ use crate::{
     sample,
     sample::SampleRate,
     telemetry_log_writer::{TelemetryLog, TelemetryLogWriter},
-    Event, Filter, Key, Level, LevelFilter, Metadata,
+    Event, Filter, Key, Level, LevelFilter, Metadata, ERROR_LOG_COUNT, INFO_LOG_COUNT,
+    WARN_LOG_COUNT,
 };
 use aptos_infallible::RwLock;
 use backtrace::Backtrace;
@@ -604,6 +605,12 @@ impl LoggerService {
             match event {
                 LoggerServiceEvent::LogEntry(entry) => {
                     PROCESSED_STRUCT_LOG_COUNT.inc();
+                    match entry.metadata.level() {
+                        Level::Error => ERROR_LOG_COUNT.inc(),
+                        Level::Warn => WARN_LOG_COUNT.inc(),
+                        Level::Info => INFO_LOG_COUNT.inc(),
+                        _ => {},
+                    }
 
                     if let Some(printer) = &mut self.printer {
                         if self
diff --git a/crates/aptos-logger/src/counters.rs b/crates/aptos-logger/src/counters.rs
index eae4d8a8c15ac..0e0e530b98821 100644
--- a/crates/aptos-logger/src/counters.rs
+++ b/crates/aptos-logger/src/counters.rs
@@ -20,9 +20,13 @@ pub static PROCESSED_STRUCT_LOG_COUNT: Lazy<IntCounter> = Lazy::new(|| {
     .unwrap()
 });
 
-/// Count of error!() logs
+/// Counts of logs
 pub static ERROR_LOG_COUNT: Lazy<IntCounter> =
     Lazy::new(|| register_int_counter!("aptos_error_log_count", "Count of error!() logs").unwrap());
+pub static WARN_LOG_COUNT: Lazy<IntCounter> =
+    Lazy::new(|| register_int_counter!("aptos_warn_log_count", "Count of warn!() logs").unwrap());
+pub static INFO_LOG_COUNT: Lazy<IntCounter> =
+    Lazy::new(|| register_int_counter!("aptos_info_log_count", "Count of info!() logs").unwrap());
 
 /// Metric for when we fail to log during sending to the queue
 pub static STRUCT_LOG_QUEUE_ERROR_COUNT: Lazy<IntCounter> = Lazy::new(|| {
diff --git a/crates/aptos-logger/src/lib.rs b/crates/aptos-logger/src/lib.rs
index 86dcfa5909317..26a5d0ad15ec0 100644
--- a/crates/aptos-logger/src/lib.rs
+++ b/crates/aptos-logger/src/lib.rs
@@ -169,4 +169,4 @@ pub use metadata::{Level, Metadata};
 pub use security::SecurityEvent;
 
 mod counters;
-pub use counters::ERROR_LOG_COUNT;
+pub use counters::{ERROR_LOG_COUNT, INFO_LOG_COUNT, WARN_LOG_COUNT};
diff --git a/crates/aptos-logger/src/macros.rs b/crates/aptos-logger/src/macros.rs
index f43c9d8406485..b79dc0fd82125 100644
--- a/crates/aptos-logger/src/macros.rs
+++ b/crates/aptos-logger/src/macros.rs
@@ -60,10 +60,6 @@ macro_rules! log {
             concat!(file!(), ':', line!()),
         );
 
-        if METADATA.level() == $crate::Level::Error {
-            $crate::ERROR_LOG_COUNT.inc();
-        }
-
         if METADATA.enabled() {
             $crate::Event::dispatch(
                 &METADATA,
diff --git a/crates/aptos-logger/src/security.rs b/crates/aptos-logger/src/security.rs
index 81e7b71af4f47..0eeb6d5018d3f 100644
--- a/crates/aptos-logger/src/security.rs
+++ b/crates/aptos-logger/src/security.rs
@@ -41,6 +41,9 @@ pub enum SecurityEvent {
     /// Consensus received an equivocating vote
     ConsensusEquivocatingVote,
 
+    /// Consensus received an equivocating order vote
+    ConsensusEquivocatingOrderVote,
+
     /// Consensus received an invalid proposal
     InvalidConsensusProposal,
 
diff --git a/crates/aptos-metrics-core/src/lib.rs b/crates/aptos-metrics-core/src/lib.rs
index 3b7c7b63b2d61..075451356f45c 100644
--- a/crates/aptos-metrics-core/src/lib.rs
+++ b/crates/aptos-metrics-core/src/lib.rs
@@ -18,12 +18,18 @@ pub mod op_counters;
 
 pub trait TimerHelper {
     fn timer_with(&self, labels: &[&str]) -> HistogramTimer;
+
+    fn observe_with(&self, labels: &[&str], val: f64);
 }
 
 impl TimerHelper for HistogramVec {
     fn timer_with(&self, vals: &[&str]) -> HistogramTimer {
         self.with_label_values(vals).start_timer()
     }
+
+    fn observe_with(&self, labels: &[&str], val: f64) {
+        self.with_label_values(labels).observe(val)
+    }
 }
 
 pub trait IntGaugeHelper {
@@ -37,11 +43,21 @@ impl IntGaugeHelper for IntGaugeVec {
 }
 
 pub trait IntCounterHelper {
+    type IntType;
+
     fn inc_with(&self, labels: &[&str]);
+
+    fn inc_with_by(&self, labels: &[&str], by: Self::IntType);
 }
 
 impl IntCounterHelper for IntCounterVec {
+    type IntType = u64;
+
     fn inc_with(&self, labels: &[&str]) {
         self.with_label_values(labels).inc()
     }
+
+    fn inc_with_by(&self, labels: &[&str], v: Self::IntType) {
+        self.with_label_values(labels).inc_by(v)
+    }
 }
diff --git a/crates/aptos-openapi/Cargo.toml b/crates/aptos-openapi/Cargo.toml
index 0cf328dcb665c..352c79181ec65 100644
--- a/crates/aptos-openapi/Cargo.toml
+++ b/crates/aptos-openapi/Cargo.toml
@@ -13,7 +13,6 @@ repository = { workspace = true }
 rust-version = { workspace = true }
 
 [dependencies]
-async-trait = { workspace = true }
 percent-encoding = { workspace = true }
 poem = { workspace = true }
 poem-openapi = { workspace = true }
diff --git a/crates/aptos-openapi/src/helpers.rs b/crates/aptos-openapi/src/helpers.rs
index c5aa830adea58..9763e53958721 100644
--- a/crates/aptos-openapi/src/helpers.rs
+++ b/crates/aptos-openapi/src/helpers.rs
@@ -12,7 +12,7 @@
 //!     too unrelated, or even worse, in a totally different crate (the move
 //!     types are a great example of this).
 //!   - The type is not expressible via OpenAPI. For example, an enum that
-//!     has some enum variants with values and others without values.This is
+//!     has some enum variants with values and others without values. This is
 //!     not allowed in OpenAPI, types must be either unions (variants with
 //!     values) or enums (variants without values).
 //!   - We would prefer to serialize the data differently than its standard
@@ -136,6 +136,8 @@ macro_rules! impl_poem_type {
                 ::poem::http::HeaderValue::from_str(&string).ok()
             }
         }
+
+        impl ::poem_openapi::types::IsObjectType for $ty {}
     };
 }
 
@@ -156,7 +158,6 @@ macro_rules! impl_poem_parameter {
             }
         }
 
-        #[async_trait::async_trait]
         impl ::poem_openapi::types::ParseFromMultipartField for $ty {
             async fn parse_from_multipart(field: Option<::poem::web::Field>) -> ::poem_openapi::types::ParseResult<Self> {
                 match field {
diff --git a/crates/aptos-rest-client/src/lib.rs b/crates/aptos-rest-client/src/lib.rs
index 153b745ff6a68..199023c8771e6 100644
--- a/crates/aptos-rest-client/src/lib.rs
+++ b/crates/aptos-rest-client/src/lib.rs
@@ -1605,7 +1605,7 @@ impl Client {
         base: &str,
         limit_per_request: u64,
         ledger_version: Option<u64>,
-        cursor: Option<String>,
+        cursor: &Option<String>,
     ) -> AptosResult<Url> {
         let mut path = format!("{}?limit={}", base, limit_per_request);
         if let Some(ledger_version) = ledger_version {
@@ -1637,11 +1637,11 @@ impl Client {
                 base_path,
                 limit_per_request,
                 ledger_version,
-                cursor,
+                &cursor,
             )?;
             let raw_response = self.inner.get(url).send().await?;
             let response: Response<Vec<T>> = self.json(raw_response).await?;
-            cursor = response.state().cursor.clone();
+            cursor.clone_from(&response.state().cursor);
             if cursor.is_none() {
                 break Ok(response.map(|mut v| {
                     result.append(&mut v);
@@ -1670,13 +1670,13 @@ impl Client {
                 base_path,
                 limit_per_request,
                 ledger_version,
-                cursor,
+                &cursor,
             )?;
             let response: Response<BTreeMap<T, Vec<u8>>> = self
                 .get_bcs(url)
                 .await?
                 .and_then(|inner| bcs::from_bytes(&inner))?;
-            cursor = response.state().cursor.clone();
+            cursor.clone_from(&response.state().cursor);
             if cursor.is_none() {
                 break Ok(response.map(|mut v| {
                     result.append(&mut v);
diff --git a/crates/aptos-rosetta/Cargo.toml b/crates/aptos-rosetta/Cargo.toml
index 97ca86f6cdc71..b38cf9466b527 100644
--- a/crates/aptos-rosetta/Cargo.toml
+++ b/crates/aptos-rosetta/Cargo.toml
@@ -35,7 +35,6 @@ once_cell = { workspace = true }
 reqwest = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
-serde_yaml = { workspace = true }
 tokio = { workspace = true }
 url = { workspace = true }
 warp = { workspace = true }
diff --git a/crates/aptos-rosetta/src/account.rs b/crates/aptos-rosetta/src/account.rs
index 004a1506924e6..f60151ce37279 100644
--- a/crates/aptos-rosetta/src/account.rs
+++ b/crates/aptos-rosetta/src/account.rs
@@ -60,12 +60,14 @@ async fn account_balance(
         get_block_index_from_request(&server_context, request.block_identifier.clone()).await?;
 
     // Version to grab is the last entry in the block (balance is at end of block)
+    // NOTE: In Rosetta, we always do balances by block here rather than ledger version.
     let block_info = server_context
         .block_cache()?
         .get_block_info_by_height(block_height, server_context.chain_id)
         .await?;
     let balance_version = block_info.last_version;
 
+    // Retrieve all metadata we want to provide as an on-demand lookup
     let (sequence_number, operators, balances, lockup_expiration) = get_balances(
         &rest_client,
         request.account_identifier,
@@ -100,6 +102,7 @@ async fn get_balances(
     let mut lockup_expiration: u64 = 0;
     let mut total_requested_balance: Option<u64> = None;
 
+    // Lookup the delegation pool, if it's provided in the account information
     if pool_address.is_some() {
         match get_delegation_stake_balances(
             rest_client,
@@ -135,6 +138,7 @@ async fn get_balances(
     }
 
     // Retrieve all account resources
+    // TODO: This will need to change for FungibleAssets, will need to lookup on a list of known FAs
     if let Ok(response) = rest_client
         .get_account_resources_at_version_bcs(owner_address, version)
         .await
@@ -150,10 +154,14 @@ async fn get_balances(
                 struct_tag.module.as_str(),
                 struct_tag.name.as_str(),
             ) {
+                // Retrieve the sequence number from the account resource
+                // TODO: Make a separate call for this
                 (AccountAddress::ONE, ACCOUNT_MODULE, ACCOUNT_RESOURCE) => {
                     let account: AccountResource = bcs::from_bytes(&bytes)?;
                     maybe_sequence_number = Some(account.sequence_number())
                 },
+                // Parse all associated coin stores
+                // TODO: This would need to be expanded to support other coin stores
                 (AccountAddress::ONE, COIN_MODULE, COIN_STORE_RESOURCE) => {
                     // Only show coins on the base account
                     if account.is_base_account() {
@@ -169,6 +177,7 @@ async fn get_balances(
                         }
                     }
                 },
+                // Parse all staking contract data to know the underlying balances of the pools
                 (AccountAddress::ONE, STAKING_CONTRACT_MODULE, STORE_RESOURCE) => {
                     if account.is_base_account() || pool_address.is_some() {
                         continue;
@@ -229,6 +238,8 @@ async fn get_balances(
             }
         }
 
+        // Retrieves the sequence number accordingly
+        // TODO: Sequence number should be 0 if it isn't retrieved probably
         let sequence_number = if let Some(sequence_number) = maybe_sequence_number {
             sequence_number
         } else {
@@ -266,6 +277,8 @@ async fn get_balances(
             lockup_expiration,
         ))
     } else {
+        // If it fails, we return 0
+        // TODO: This should probably be fixed to check if the account exists.  Then if the account doesn't exist, return empty balance, otherwise error
         Ok((
             0,
             None,
diff --git a/crates/aptos-rosetta/src/block.rs b/crates/aptos-rosetta/src/block.rs
index 6ee61a6f218a4..59b41c2a637b0 100644
--- a/crates/aptos-rosetta/src/block.rs
+++ b/crates/aptos-rosetta/src/block.rs
@@ -27,8 +27,8 @@ pub fn block_route(
 
 /// Retrieves a block (in this case a single transaction) given it's identifier.
 ///
-/// Our implementation allows for by `index`, which is the ledger `version` or by
-/// transaction `hash`.
+/// Our implementation allows for by `index`(block height) or by transaction `hash`.
+/// If both are provided, `index` is used
 ///
 /// [API Spec](https://www.rosetta-api.org/docs/BlockApi.html#block)
 async fn block(request: BlockRequest, server_context: RosettaContext) -> ApiResult<BlockResponse> {
@@ -41,7 +41,7 @@ async fn block(request: BlockRequest, server_context: RosettaContext) -> ApiResu
 
     check_network(request.network_identifier, &server_context)?;
 
-    // Retrieve by block or by hash, both or neither is not allowed
+    // Retrieve by block index or by hash, neither is not allowed
     let block_index =
         get_block_index_from_request(&server_context, request.block_identifier).await?;
 
@@ -52,11 +52,15 @@ async fn block(request: BlockRequest, server_context: RosettaContext) -> ApiResu
     )
     .await?;
 
+    // A hack to reduce overhead, if set, it will drop empty transactions (no operations0 from the
+    // block to reduce traffic sent
     let keep_empty_transactions = request
         .metadata
         .as_ref()
         .and_then(|inner| inner.keep_empty_transactions)
         .unwrap_or_default();
+
+    // Build the block accordingly from the input data
     let block = build_block(
         &server_context,
         parent_transaction,
@@ -77,7 +81,7 @@ async fn build_block(
     chain_id: ChainId,
     keep_empty_transactions: bool,
 ) -> ApiResult<Block> {
-    // note: timestamps are in microseconds, so we convert to milliseconds
+    // NOTE: timestamps are in microseconds, so we convert to milliseconds for Rosetta
     let timestamp = get_timestamp(block.block_timestamp);
     let block_identifier = BlockIdentifier::from_block(&block, chain_id);
 
@@ -85,15 +89,19 @@ async fn build_block(
     let mut transactions: Vec<Transaction> = Vec::new();
     // TODO: Parallelize these and then sort at end
     if let Some(txns) = block.transactions {
+        // Convert transactions to Rosetta format
         for txn in txns {
             let transaction = Transaction::from_transaction(server_context, txn).await?;
+
+            // Skip transactions that don't have any operations, since that's the only thing that's being used by Rosetta
             if keep_empty_transactions || !transaction.operations.is_empty() {
                 transactions.push(transaction)
             }
         }
     }
 
-    // Ensure the transactions are sorted in order
+    // Ensure the transactions are sorted in order, this is required by Rosetta
+    // NOTE: sorting may be pretty expensive, depending on the size of the block
     transactions.sort_by(|first, second| first.metadata.version.0.cmp(&second.metadata.version.0));
 
     Ok(Block {
@@ -104,7 +112,7 @@ async fn build_block(
     })
 }
 
-/// Retrieves a block by its index
+/// Retrieves a block by its index (block height)
 async fn get_block_by_index(
     block_cache: &BlockRetriever,
     block_height: u64,
@@ -132,6 +140,7 @@ async fn get_block_by_index(
     }
 }
 
+/// Abbreviated information about a Block without transactions
 #[derive(Clone, Debug)]
 pub struct BlockInfo {
     /// Block identifier (block hash & block height)
@@ -170,6 +179,7 @@ impl BlockRetriever {
         }
     }
 
+    /// Retrieves block abbreviated info by height
     pub async fn get_block_info_by_height(
         &self,
         height: u64,
@@ -191,11 +201,14 @@ impl BlockRetriever {
         Ok(BlockInfo::from_block(&block, chain_id))
     }
 
+    /// Retrieves the block by height
     pub async fn get_block_by_height(
         &self,
         height: u64,
         with_transactions: bool,
     ) -> ApiResult<aptos_rest_client::aptos_api_types::BcsBlock> {
+        // If we request transactions, we have to provide the page size, it ideally is bigger than
+        // the maximum block size.  If not, transactions will be missed.
         if with_transactions {
             Ok(self
                 .rest_client
diff --git a/crates/aptos-rosetta/src/common.rs b/crates/aptos-rosetta/src/common.rs
index a3e760605c4f3..b078f455a02c7 100644
--- a/crates/aptos-rosetta/src/common.rs
+++ b/crates/aptos-rosetta/src/common.rs
@@ -27,6 +27,9 @@ pub const Y2K_MS: u64 = 946713600000;
 pub const BLOCKCHAIN: &str = "aptos";
 
 /// Checks the request network matches the server network
+///
+/// These fields are passed in on every request, and basically prevents non-Aptos and matching chain-id
+/// requests from going through and messing things up.
 pub fn check_network(
     network_identifier: NetworkIdentifier,
     server_context: &RosettaContext,
@@ -49,6 +52,7 @@ pub fn with_context(
     warp::any().map(move || context.clone())
 }
 
+/// Fills in an empty request for any REST API path that doesn't take any input body
 pub fn with_empty_request() -> impl Filter<Extract = (MetadataRequest,), Error = Infallible> + Clone
 {
     warp::any().map(move || MetadataRequest {})
@@ -92,6 +96,7 @@ where
     }
 }
 
+/// Retrieves an account's information by its address
 pub async fn get_account(
     rest_client: &aptos_rest_client::Client,
     address: AccountAddress,
@@ -119,16 +124,20 @@ pub fn strip_hex_prefix(str: &str) -> &str {
     str.strip_prefix("0x").unwrap_or(str)
 }
 
+/// Encodes the object into BCS, handling errors
 pub fn encode_bcs<T: Serialize>(obj: &T) -> ApiResult<String> {
     let bytes = bcs::to_bytes(obj)?;
     Ok(hex::encode(bytes))
 }
 
+/// Decodes the object from BCS, handling errors
 pub fn decode_bcs<T: DeserializeOwned>(str: &str, type_name: &'static str) -> ApiResult<T> {
     let bytes = hex::decode(str)?;
     bcs::from_bytes(&bytes).map_err(|_| ApiError::deserialization_failed(type_name))
 }
 
+/// Decodes a CryptoMaterial (key, signature, etc.) from Hex
+/// TODO: Rename to decode_crypto_material
 pub fn decode_key<T: DeserializeOwned + ValidCryptoMaterial>(
     str: &str,
     type_name: &'static str,
@@ -139,6 +148,7 @@ pub fn decode_key<T: DeserializeOwned + ValidCryptoMaterial>(
 const DEFAULT_COIN: &str = "APT";
 const DEFAULT_DECIMALS: u8 = 8;
 
+/// Provides the [Currency] for 0x1::aptos_coin::AptosCoin aka APT
 pub fn native_coin() -> Currency {
     Currency {
         symbol: DEFAULT_COIN.to_string(),
@@ -149,6 +159,7 @@ pub fn native_coin() -> Currency {
     }
 }
 
+/// Provides the [TypeTag] for 0x1::aptos_coin::AptosCoin aka APT
 pub fn native_coin_tag() -> TypeTag {
     TypeTag::Struct(Box::new(StructTag {
         address: AccountAddress::ONE,
@@ -158,6 +169,9 @@ pub fn native_coin_tag() -> TypeTag {
     }))
 }
 
+/// Tells us whether the coin is APT and errors if it's not
+///
+/// TODO: This is the function that needs to be replaced to handle more coin types
 pub fn is_native_coin(currency: &Currency) -> ApiResult<()> {
     if currency == &native_coin() {
         Ok(())
@@ -167,25 +181,35 @@ pub fn is_native_coin(currency: &Currency) -> ApiResult<()> {
 }
 
 /// Determines which block to pull for the request
+///
+/// Inputs can give hash, index, or both
 pub async fn get_block_index_from_request(
     server_context: &RosettaContext,
     partial_block_identifier: Option<PartialBlockIdentifier>,
 ) -> ApiResult<u64> {
     Ok(match partial_block_identifier {
+        // If Index and hash are provided, we use index, because it's easier to use.
+        // Note, we don't handle if they mismatch.
+        //
+        // This is required.  Rosetta originally only took one or the other, and this failed in
+        // integration testing.
         Some(PartialBlockIdentifier {
             index: Some(block_index),
             hash: Some(_),
         }) => block_index,
+
         // Lookup by block index
         Some(PartialBlockIdentifier {
             index: Some(block_index),
             hash: None,
         }) => block_index,
+
         // Lookup by block hash
         Some(PartialBlockIdentifier {
             index: None,
             hash: Some(hash),
         }) => BlockHash::from_str(&hash)?.block_height(server_context.chain_id)?,
+
         // Lookup latest version
         _ => {
             let response = server_context
@@ -199,6 +223,10 @@ pub async fn get_block_index_from_request(
     })
 }
 
+/// BlockHash is not actually the block hash!  This was a hack put in, since we don't actually have
+/// [BlockHash] indexable.  Instead, it just returns the combination of [ChainId] and the block_height (aka index).
+///
+/// The [BlockHash] string format is `chain_id-block_height`
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
 pub struct BlockHash {
     chain_id: ChainId,
@@ -213,6 +241,9 @@ impl BlockHash {
         }
     }
 
+    /// Fetch the block height
+    ///
+    /// We verify the chain_id to ensure it is the correct network
     pub fn block_height(&self, expected_chain_id: ChainId) -> ApiResult<u64> {
         if expected_chain_id != self.chain_id {
             Err(ApiError::InvalidInput(Some(format!(
@@ -228,9 +259,11 @@ impl BlockHash {
 impl FromStr for BlockHash {
     type Err = ApiError;
 
+    /// Parses `chain_id-block_height`
     fn from_str(str: &str) -> Result<Self, Self::Err> {
         let mut iter = str.split('-');
 
+        // It must start with a chain-id
         let chain_id = if let Some(maybe_chain_id) = iter.next() {
             ChainId::from_str(maybe_chain_id).map_err(|_| {
                 ApiError::InvalidInput(Some(format!(
@@ -245,6 +278,7 @@ impl FromStr for BlockHash {
             ))));
         };
 
+        // Chain id must be followed after a `-` with block height
         let block_height = if let Some(maybe_block_height) = iter.next() {
             u64::from_str(maybe_block_height).map_err(|_| {
                 ApiError::InvalidInput(Some(format!(
@@ -259,6 +293,7 @@ impl FromStr for BlockHash {
             ))));
         };
 
+        // Don't allow any more hyphens or characters
         if iter.next().is_some() {
             Err(ApiError::InvalidInput(Some(format!(
                 "Invalid block hash, too many hyphens {}",
@@ -282,6 +317,7 @@ pub fn to_hex_lower<T: LowerHex>(obj: &T) -> String {
 
 /// Retrieves the currency from the given parameters
 /// TODO: What do do about the type params?
+/// TODO: Handle other currencies, will need to be passed in as a config file or something on startup
 pub fn parse_currency(address: AccountAddress, module: &str, name: &str) -> ApiResult<Currency> {
     match (address, module, name) {
         (AccountAddress::ONE, APTOS_COIN_MODULE, APTOS_COIN_RESOURCE) => Ok(native_coin()),
diff --git a/crates/aptos-rosetta/src/construction.rs b/crates/aptos-rosetta/src/construction.rs
index b104c2b725eec..6a5bdc2ca3b91 100644
--- a/crates/aptos-rosetta/src/construction.rs
+++ b/crates/aptos-rosetta/src/construction.rs
@@ -9,12 +9,12 @@
 //!
 //! This is broken down in the following flow:
 //!
-//! * Preprocess (based on operations) gets information to fetch from metadata (onchchain)
-//! * Metadata fetches onchain information e.g. sequence number
+//! * Preprocess (based on operations) gets information to fetch from metadata (on-chain)
+//! * Metadata fetches on-chain information e.g. sequence number
 //! * Payloads generates an unsigned transaction
-//! * Application outside signs the payload from the transactino
+//! * Application outside signs the payload from the transaction
 //! * Combine puts the signed transaction payload with the unsigned transaction
-//! * Submit submits the signed transaciton to the blockchain
+//! * Submit submits the signed transaction to the blockchain
 //!
 //! There are also 2 other sometimes used APIs
 //! * Derive (get an account from the private key)
@@ -139,7 +139,9 @@ pub fn submit_route(
 
 /// Construction combine command (OFFLINE)
 ///
-/// This combines signatures, and a raw txn
+/// This combines signatures, and a raw transaction
+///
+/// This currently only supports the original Ed25519 with single signer.
 ///
 /// [API Spec](https://www.rosetta-api.org/docs/ConstructionApi.html#constructioncombine)
 async fn construction_combine(
@@ -149,6 +151,7 @@ async fn construction_combine(
     debug!("/construction/combine {:?}", request);
     check_network(request.network_identifier, &server_context)?;
 
+    // Decode the unsigned transaction from BCS in the input
     let unsigned_txn: RawTransaction =
         decode_bcs(&request.unsigned_transaction, "UnsignedTransaction")?;
 
@@ -162,16 +165,19 @@ async fn construction_combine(
 
     let signature = &request.signatures[0];
 
+    // Only support Ed25519
     if signature.signature_type != SignatureType::Ed25519
         || signature.public_key.curve_type != CurveType::Edwards25519
     {
         return Err(ApiError::InvalidSignatureType);
     }
 
+    // Decode the key and signature accordingly
     let public_key: Ed25519PublicKey =
         decode_key(&signature.public_key.hex_bytes, "Ed25519PublicKey")?;
     let signature: Ed25519Signature = decode_key(&signature.hex_bytes, "Ed25519Signature")?;
 
+    // Combine them into a signed transaction, and encode it as BCS to return
     let signed_txn = SignedTransaction::new(unsigned_txn, public_key, signature);
 
     Ok(ConstructionCombineResponse {
@@ -185,6 +191,9 @@ async fn construction_combine(
 /// Note: This only works for new accounts.  After the account is created, all APIs should provide
 /// both account and key.
 ///
+/// Note: if the accounts are handled ONLY by Rosetta, then this will always work.  It only stops working
+/// if it is one of many other types of keys / a rotated account.
+///
 /// [API Spec](https://www.rosetta-api.org/docs/ConstructionApi.html#constructionderive)
 async fn construction_derive(
     request: ConstructionDeriveRequest,
@@ -193,6 +202,8 @@ async fn construction_derive(
     debug!("/construction/derive {:?}", request);
     check_network(request.network_identifier, &server_context)?;
 
+    // The input must be an Ed25519 Public key and will only derive the Address for the original
+    // Aptos Ed25519 authentication scheme
     let public_key: Ed25519PublicKey =
         decode_key(&request.public_key.hex_bytes, "Ed25519PublicKey")?;
     let address = AuthenticationKey::ed25519(&public_key).account_address();
@@ -214,6 +225,8 @@ async fn construction_hash(
     debug!("/construction/hash {:?}", request);
     check_network(request.network_identifier, &server_context)?;
 
+    // Decode the SignedTransaction and hash it accordingly.  This in theory works for any transaction
+    // but it is expected to only be UserTransactions
     let signed_transaction: SignedTransaction =
         decode_bcs(&request.signed_transaction, "SignedTransaction")?;
 
@@ -222,11 +235,13 @@ async fn construction_hash(
     })
 }
 
-/// Fills in the operator for actions that require it but don't have one
+/// Fills in the operator for actions that require it but don't have one on an [InternalOperation]
+/// TODO: move this onto [InternalOperation] and not in this file
 async fn fill_in_operator(
     rest_client: &aptos_rest_client::Client,
     mut internal_operation: InternalOperation,
 ) -> ApiResult<InternalOperation> {
+    // TODO: Refactor so there's not duplicate code below
     match &mut internal_operation {
         InternalOperation::SetOperator(op) => {
             // If there was no old operator set, and there is only one, we should use that
@@ -290,6 +305,13 @@ async fn fill_in_operator(
     Ok(internal_operation)
 }
 
+/// Simulates a transaction for gas estimation purposes
+///
+/// Only the original Ed25519 accounts on Aptos are supported
+///
+/// Will only simulate if it does not have max gas amount
+///
+/// Will only estimate gas price
 async fn simulate_transaction(
     rest_client: &aptos_rest_client::Client,
     chain_id: ChainId,
@@ -301,6 +323,7 @@ async fn simulate_transaction(
     let mut transaction_factory = TransactionFactory::new(chain_id);
 
     // If we have a gas unit price, let's not estimate
+    // TODO: Split into separate function
     if let Some(gas_unit_price) = options.gas_price_per_unit.as_ref() {
         transaction_factory = transaction_factory.with_gas_unit_price(gas_unit_price.0);
     } else {
@@ -342,7 +365,6 @@ async fn simulate_transaction(
         .build();
 
     // Read and fill in public key as necessary, this is required for simulation!
-    // TODO: Only single signer supported
     let public_key =
         if let Some(public_key) = options.public_keys.as_ref().and_then(|inner| inner.first()) {
             Ed25519PublicKey::from_encoded_string(&public_key.hex_bytes).map_err(|err| {
@@ -424,7 +446,7 @@ async fn simulate_transaction(
 
 /// Construction metadata command
 ///
-/// Retrieve sequence number for submitting transactions
+/// Retrieves sequence number, gas price, max gas, gas estimate for the transaction
 ///
 /// [API Spec](https://www.rosetta-api.org/docs/ConstructionApi.html#constructionmetadata)
 async fn construction_metadata(
@@ -443,10 +465,10 @@ async fn construction_metadata(
         return Err(ApiError::ChainIdMismatch);
     }
 
+    // Retrieve the sequence number from the rest server if one wasn't provided
     let sequence_number = if let Some(sequence_number) = request.options.sequence_number {
         sequence_number.0
     } else {
-        // Retrieve the sequence number from the rest server if one wasn't provided
         response.inner().sequence_number
     };
 
@@ -490,6 +512,8 @@ async fn construction_parse(
 ) -> ApiResult<ConstructionParseResponse> {
     debug!("/construction/parse {:?}", request);
     check_network(request.network_identifier, &server_context)?;
+
+    // For signed transactions, we can pull the signers and the raw transaction
     let metadata;
     let (account_identifier_signers, unsigned_txn) = if request.signed {
         let signed_txn: SignedTransaction = decode_bcs(&request.transaction, "SignedTransaction")?;
@@ -509,6 +533,7 @@ async fn construction_parse(
             signed_txn.into_raw_transaction(),
         )
     } else {
+        // For unsigned transactions,w e can only pull the transaction
         let unsigned_txn: RawTransaction = decode_bcs(&request.transaction, "UnsignedTransaction")?;
         metadata = Some(ConstructionParseMetadata {
             unsigned_transaction: Some(unsigned_txn.clone()),
@@ -516,9 +541,12 @@ async fn construction_parse(
         });
         (None, unsigned_txn)
     };
+
+    // The sender however should always be present, even if not signed
     let sender = unsigned_txn.sender();
 
-    // This is messy, but all we can do
+    // This is messy, but all we can do is to manually go through and check the entry functions associated to convert to Rosetta operations
+    // TODO: We should centralize all this operation -> entry function / entry function -> operation code
     let operations = match unsigned_txn.into_payload() {
         TransactionPayload::EntryFunction(inner) => {
             let (module, function_name, type_args, args) = inner.into_inner();
@@ -602,6 +630,7 @@ async fn construction_parse(
     })
 }
 
+/// Parses 0x1::aptos_account::create(auth_key: address)
 fn parse_create_account_operation(
     sender: AccountAddress,
     type_args: &[TypeTag],
@@ -632,6 +661,7 @@ fn parse_create_account_operation(
     }
 }
 
+/// Parses 0x1::coin::transfer<CoinType>(receiver: address, amount: u64)
 fn parse_transfer_operation(
     sender: AccountAddress,
     type_args: &[TypeTag],
@@ -640,7 +670,6 @@ fn parse_transfer_operation(
     let mut operations = Vec::new();
 
     // Check coin is the native coin
-
     let currency = match type_args.first() {
         Some(TypeTag::Struct(struct_tag)) => {
             let StructTag {
@@ -660,7 +689,6 @@ fn parse_transfer_operation(
     };
 
     // Retrieve the args for the operations
-
     let receiver: AccountAddress = if let Some(receiver) = args.first() {
         bcs::from_bytes(receiver)?
     } else {
@@ -693,6 +721,7 @@ fn parse_transfer_operation(
     Ok(operations)
 }
 
+/// Parses 0x1::aptos_account::transfer(receiver: address, amount: u64)
 fn parse_account_transfer_operation(
     sender: AccountAddress,
     type_args: &[TypeTag],
@@ -708,7 +737,7 @@ fn parse_account_transfer_operation(
     let mut operations = Vec::new();
 
     // Retrieve the args for the operations
-
+    // TODO: This is the same as coin::transfer, we should combine them
     let receiver: AccountAddress = if let Some(receiver) = args.first() {
         bcs::from_bytes(receiver)?
     } else {
@@ -741,6 +770,7 @@ fn parse_account_transfer_operation(
     Ok(operations)
 }
 
+/// Parses a specific BCS function argument to the given type
 pub fn parse_function_arg<T: DeserializeOwned>(
     name: &str,
     args: &[Vec<u8>],
@@ -758,6 +788,7 @@ pub fn parse_function_arg<T: DeserializeOwned>(
     ))))
 }
 
+/// Parses 0x1::staking_contract::switch_operator_with_same_commission(old_operator: address, new_operator: address)
 pub fn parse_set_operator_operation(
     sender: AccountAddress,
     type_args: &[TypeTag],
@@ -782,6 +813,7 @@ pub fn parse_set_operator_operation(
     )])
 }
 
+/// Parses 0x1::staking_contract::update_voter(operator: address, new_voter: address)
 pub fn parse_set_voter_operation(
     sender: AccountAddress,
     type_args: &[TypeTag],
@@ -805,6 +837,7 @@ pub fn parse_set_voter_operation(
     )])
 }
 
+/// Parses 0x1::staking_contract::create_staking_contract(operator: address, voter: address, amount: u64, commission_percentage: u64)
 pub fn parse_create_stake_pool_operation(
     sender: AccountAddress,
     type_args: &[TypeTag],
@@ -832,6 +865,7 @@ pub fn parse_create_stake_pool_operation(
     )])
 }
 
+/// Parses 0x1::staking_contract::reset_lockup(operator: address)
 pub fn parse_reset_lockup_operation(
     sender: AccountAddress,
     type_args: &[TypeTag],
@@ -853,6 +887,7 @@ pub fn parse_reset_lockup_operation(
     )])
 }
 
+/// Parses 0x1::staking_contract::unlock_stake(operator: address, amount: u64)
 pub fn parse_unlock_stake_operation(
     sender: AccountAddress,
     type_args: &[TypeTag],
@@ -877,6 +912,7 @@ pub fn parse_unlock_stake_operation(
     )])
 }
 
+/// Parses 0x1::staking_contract::update_commission(operator: address, new_commission_percentage: u64)
 pub fn parse_update_commission_operation(
     sender: AccountAddress,
     type_args: &[TypeTag],
@@ -901,6 +937,7 @@ pub fn parse_update_commission_operation(
     )])
 }
 
+/// Parses 0x1::staking_contract::distribute(staker: address, operator: address)
 pub fn parse_distribute_staking_rewards_operation(
     sender: AccountAddress,
     type_args: &[TypeTag],
@@ -925,6 +962,7 @@ pub fn parse_distribute_staking_rewards_operation(
     )])
 }
 
+/// Parses 0x1::delegation_pool::add_stake(pool_address: address, amount: u64)
 pub fn parse_delegation_pool_add_stake_operation(
     delegator: AccountAddress,
     type_args: &[TypeTag],
@@ -949,6 +987,7 @@ pub fn parse_delegation_pool_add_stake_operation(
     )])
 }
 
+/// Parses 0x1::delegation_pool::unlock(pool_address: address, amount: u64)
 pub fn parse_delegation_pool_unlock_operation(
     delegator: AccountAddress,
     type_args: &[TypeTag],
@@ -973,6 +1012,7 @@ pub fn parse_delegation_pool_unlock_operation(
     )])
 }
 
+/// Parses 0x1::delegation_pool::withdraw(pool_address: address, amount: u64)
 pub fn parse_delegation_pool_withdraw_operation(
     delegator: AccountAddress,
     type_args: &[TypeTag],
@@ -999,7 +1039,7 @@ pub fn parse_delegation_pool_withdraw_operation(
 
 /// Construction payloads command (OFFLINE)
 ///
-/// Constructs payloads for given known operations
+/// Constructs payloads for given known operations.  This converts Rosetta [Operation]s to a [RawTransaction]
 ///
 /// [API Spec](https://www.rosetta-api.org/docs/ConstructionApi.html#constructionpayloads)
 async fn construction_payloads(
@@ -1009,8 +1049,11 @@ async fn construction_payloads(
     debug!("/construction/payloads {:?}", request);
     check_network(request.network_identifier, &server_context)?;
 
-    // Retrieve the real operation we're doing
+    // Retrieve the real operation we're doing, this identifies the sub-operations to a function
     let mut operation = InternalOperation::extract(&request.operations)?;
+
+    // For some reason, metadata is optional on the Rosetta spec, we enforce it here, otherwise we
+    // can't build the [RawTransaction] offline.
     let metadata = if let Some(ref metadata) = request.metadata {
         metadata
     } else {
@@ -1018,6 +1061,8 @@ async fn construction_payloads(
     };
 
     // This is a hack to ensure that the payloads actually have overridden operators if not provided
+    // It ensures that the operations provided match the metadata provided.
+    // TODO: Move this to a separate function
     match &mut operation {
         InternalOperation::CreateAccount(_) => {
             if operation != metadata.internal_operation {
@@ -1225,6 +1270,7 @@ async fn construction_payloads(
     }
     let unsigned_transaction = txn_builder.build();
 
+    // Build a signing message so that an external signer can sign with Ed25519 without knowing BCS
     let signing_message = hex::encode(signing_message(&unsigned_transaction).map_err(|err| {
         ApiError::InvalidInput(Some(format!(
             "Invalid transaction, can't build into a signing message {}",
@@ -1246,7 +1292,8 @@ async fn construction_payloads(
 
 /// Construction preprocess command (OFFLINE)
 ///
-/// This creates the request needed to fetch metadata
+/// This creates the request needed to fetch metadata.  It basically verifies that the inputs are
+/// valid for calling on-chain data.
 ///
 /// [API Spec](https://www.rosetta-api.org/docs/ConstructionApi.html#constructionpreprocess)
 async fn construction_preprocess(
@@ -1256,9 +1303,13 @@ async fn construction_preprocess(
     debug!("/construction/preprocess {:?}", request);
     check_network(request.network_identifier, &server_context)?;
 
+    // Determine the actual operation from the collection of Rosetta [Operation]
     let internal_operation = InternalOperation::extract(&request.operations)?;
+
+    // Provide the accounts that need public keys (there's only one supported today)
     let required_public_keys = vec![AccountIdentifier::base_account(internal_operation.sender())];
 
+    // Verify that the max gas value is valid
     if let Some(max_gas) = request
         .metadata
         .as_ref()
@@ -1270,11 +1321,14 @@ async fn construction_preprocess(
             )));
         }
     }
+
+    // Verify that expiration time is valid
     if let Some(expiry_time_secs) = request
         .metadata
         .as_ref()
         .and_then(|inner| inner.expiry_time_secs)
     {
+        // Probably should be greater than now + some amount of time, but for now it's valid
         if expiry_time_secs.0
             <= SystemTime::now()
                 .duration_since(UNIX_EPOCH)
@@ -1291,12 +1345,12 @@ async fn construction_preprocess(
     }
 
     // Check gas input options
-
     let public_keys = request
         .metadata
         .as_ref()
         .and_then(|inner| inner.public_keys.as_ref());
 
+    // A public key can be provided for simulation, otherwise, a max gas amount would be given.
     if request
         .metadata
         .as_ref()
@@ -1313,6 +1367,8 @@ async fn construction_preprocess(
         )));
     }
 
+    // Convert it to an input to the metadata call
+    // TODO: Refactor so that it only does `request.metadata.as_ref()` once
     Ok(ConstructionPreprocessResponse {
         options: MetadataOptions {
             internal_operation,
@@ -1360,6 +1416,7 @@ async fn construction_submit(
 
     let rest_client = server_context.rest_client()?;
 
+    // Submits the transaction, and returns the hash of the transaction
     let txn: SignedTransaction = decode_bcs(&request.signed_transaction, "SignedTransaction")?;
     let hash = txn.committed_hash();
     rest_client.submit_bcs(&txn).await?;
diff --git a/crates/aptos-rosetta/src/error.rs b/crates/aptos-rosetta/src/error.rs
index 3f0ca50462bee..d1e9fffab7d50 100644
--- a/crates/aptos-rosetta/src/error.rs
+++ b/crates/aptos-rosetta/src/error.rs
@@ -9,8 +9,11 @@ use serde::{Deserialize, Serialize};
 use std::fmt::Formatter;
 use warp::{http::StatusCode, reply::Reply};
 
+/// Result for Rosetta API errors
 pub type ApiResult<T> = Result<T, ApiError>;
 
+/// All Rosetta API errors.  Note that all details must be `Option<T>` to make it easier to list all
+/// error messages in the `ApiError::all()` call required by the Rosetta spec.
 #[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize)]
 pub enum ApiError {
     TransactionIsPending,
@@ -60,6 +63,7 @@ impl std::fmt::Display for ApiError {
 impl std::error::Error for ApiError {}
 
 impl ApiError {
+    /// Returns every single API errors so the messages can be returned
     pub fn all() -> Vec<ApiError> {
         use ApiError::*;
         vec![
@@ -100,6 +104,7 @@ impl ApiError {
         ]
     }
 
+    /// All errors are required to have a code.  These are just in order that they were added, and no specific grouping.
     pub fn code(&self) -> u32 {
         use ApiError::*;
         match self {
@@ -140,6 +145,8 @@ impl ApiError {
         }
     }
 
+    /// Retriable errors will allow for Rosetta upstreams to retry.  These are only for temporary
+    /// state blockers.  Note, there is a possibility that some of these could be retriable forever (e.g. an account is never created).
     pub fn retriable(&self) -> bool {
         use ApiError::*;
         matches!(
@@ -152,8 +159,8 @@ impl ApiError {
         )
     }
 
+    /// All Rosetta errors must be 500s (and retriable tells you if it's actually retriable)
     pub fn status_code(&self) -> StatusCode {
-        // Per Rosetta guidelines, all errors are 500s
         StatusCode::INTERNAL_SERVER_ERROR
     }
 
@@ -197,6 +204,7 @@ impl ApiError {
         }
     }
 
+    /// Details are optional, but give more details for each error message
     pub fn details(self) -> Option<ErrorDetails> {
         match self {
             ApiError::DeserializationFailed(inner) => inner,
@@ -233,6 +241,7 @@ impl ApiError {
         ApiError::DeserializationFailed(Some(type_.to_string()))
     }
 
+    /// Converts API Error into the wire representation
     pub fn into_error(self) -> types::Error {
         self.into()
     }
@@ -253,6 +262,7 @@ impl From<ApiError> for types::Error {
     }
 }
 
+// Converts Node API errors to Rosetta API errors
 impl From<RestError> for ApiError {
     fn from(err: RestError) -> Self {
         match err {
@@ -344,6 +354,7 @@ impl From<std::num::ParseIntError> for ApiError {
     }
 }
 
+// Must implement to ensure rejections are provided when returning errors
 impl warp::reject::Reject for ApiError {}
 
 impl Reply for ApiError {
diff --git a/crates/aptos-rosetta/src/lib.rs b/crates/aptos-rosetta/src/lib.rs
index a23693081e59f..792084f9edf4f 100644
--- a/crates/aptos-rosetta/src/lib.rs
+++ b/crates/aptos-rosetta/src/lib.rs
@@ -9,13 +9,12 @@ use crate::{
     block::BlockRetriever,
     common::{handle_request, with_context},
     error::{ApiError, ApiResult},
-    types::Store,
 };
 use aptos_config::config::ApiConfig;
-use aptos_logger::{debug, warn};
+use aptos_logger::debug;
 use aptos_types::{account_address::AccountAddress, chain_id::ChainId};
 use aptos_warp_webserver::{logger, Error, WebServer};
-use std::{collections::BTreeMap, convert::Infallible, sync::Arc};
+use std::{convert::Infallible, sync::Arc};
 use tokio::task::JoinHandle;
 use warp::{
     http::{HeaderValue, Method, StatusCode},
@@ -44,8 +43,6 @@ pub struct RosettaContext {
     pub chain_id: ChainId,
     /// Block index cache
     pub block_cache: Option<Arc<BlockRetriever>>,
-    pub owner_addresses: Vec<AccountAddress>,
-    pub pool_address_to_owner: BTreeMap<AccountAddress, AccountAddress>,
 }
 
 impl RosettaContext {
@@ -53,40 +50,11 @@ impl RosettaContext {
         rest_client: Option<Arc<aptos_rest_client::Client>>,
         chain_id: ChainId,
         block_cache: Option<Arc<BlockRetriever>>,
-        owner_addresses: Vec<AccountAddress>,
     ) -> Self {
-        let mut pool_address_to_owner = BTreeMap::new();
-        if let Some(ref rest_client) = rest_client {
-            // We have to now fill in all of the mappings of owner to pool address
-            for owner_address in owner_addresses.iter() {
-                if let Ok(store) = rest_client
-                    .get_account_resource_bcs::<Store>(
-                        *owner_address,
-                        "0x1::staking_contract::Store",
-                    )
-                    .await
-                {
-                    let store = store.into_inner();
-                    let pool_addresses: Vec<_> = store
-                        .staking_contracts
-                        .iter()
-                        .map(|(_, pool)| pool.pool_address)
-                        .collect();
-                    for pool_address in pool_addresses {
-                        pool_address_to_owner.insert(pool_address, *owner_address);
-                    }
-                } else {
-                    warn!("Did not find a pool for owner: {}", owner_address);
-                }
-            }
-        }
-
         RosettaContext {
             rest_client,
             chain_id,
             block_cache,
-            owner_addresses,
-            pool_address_to_owner,
         }
     }
 
@@ -112,18 +80,12 @@ pub fn bootstrap(
     chain_id: ChainId,
     api_config: ApiConfig,
     rest_client: Option<aptos_rest_client::Client>,
-    owner_addresses: Vec<AccountAddress>,
 ) -> anyhow::Result<tokio::runtime::Runtime> {
     let runtime = aptos_runtimes::spawn_named_runtime("rosetta".into(), None);
 
     debug!("Starting up Rosetta server with {:?}", api_config);
 
-    runtime.spawn(bootstrap_async(
-        chain_id,
-        api_config,
-        rest_client,
-        owner_addresses,
-    ));
+    runtime.spawn(bootstrap_async(chain_id, api_config, rest_client));
     Ok(runtime)
 }
 
@@ -132,7 +94,6 @@ pub async fn bootstrap_async(
     chain_id: ChainId,
     api_config: ApiConfig,
     rest_client: Option<aptos_rest_client::Client>,
-    owner_addresses: Vec<AccountAddress>,
 ) -> anyhow::Result<JoinHandle<()>> {
     debug!("Starting up Rosetta server with {:?}", api_config);
 
@@ -153,6 +114,8 @@ pub async fn bootstrap_async(
     let handle = tokio::spawn(async move {
         // If it's Online mode, add the block cache
         let rest_client = rest_client.map(Arc::new);
+
+        // TODO: The BlockRetriever has no cache, and should probably be renamed from block_cache
         let block_cache = rest_client.as_ref().map(|rest_client| {
             Arc::new(BlockRetriever::new(
                 api_config.max_transactions_page_size,
@@ -160,8 +123,7 @@ pub async fn bootstrap_async(
             ))
         });
 
-        let context =
-            RosettaContext::new(rest_client.clone(), chain_id, block_cache, owner_addresses).await;
+        let context = RosettaContext::new(rest_client.clone(), chain_id, block_cache).await;
         api.serve(routes(context)).await;
     });
     Ok(handle)
diff --git a/crates/aptos-rosetta/src/main.rs b/crates/aptos-rosetta/src/main.rs
index d267b0eabb65c..1e136ae75f017 100644
--- a/crates/aptos-rosetta/src/main.rs
+++ b/crates/aptos-rosetta/src/main.rs
@@ -1,17 +1,17 @@
 // Copyright © Aptos Foundation
 // SPDX-License-Identifier: Apache-2.0
 
+//! Runs the Rosetta server directly.
+
 #![forbid(unsafe_code)]
 
 use aptos_config::config::{ApiConfig, DEFAULT_MAX_PAGE_SIZE};
 use aptos_logger::prelude::*;
 use aptos_node::AptosNodeArgs;
 use aptos_rosetta::bootstrap;
-use aptos_sdk::move_types::account_address::AccountAddress;
 use aptos_types::chain_id::ChainId;
 use clap::Parser;
 use std::{
-    fs::read_to_string,
     net::SocketAddr,
     path::PathBuf,
     sync::{
@@ -85,13 +85,8 @@ async fn main() {
 
     println!("aptos-rosetta: Starting rosetta");
     // Ensure runtime for Rosetta is up and running
-    let _rosetta = bootstrap(
-        args.chain_id(),
-        args.api_config(),
-        args.rest_client(),
-        args.owner_addresses(),
-    )
-    .expect("aptos-rosetta: Should bootstrap rosetta server");
+    let _rosetta = bootstrap(args.chain_id(), args.api_config(), args.rest_client())
+        .expect("aptos-rosetta: Should bootstrap rosetta server");
 
     println!("aptos-rosetta: Rosetta started");
     // Run until there is an interrupt
@@ -111,9 +106,6 @@ trait ServerArgs {
 
     /// Retrieve the chain id
     fn chain_id(&self) -> ChainId;
-
-    /// Retrieve owner addresses
-    fn owner_addresses(&self) -> Vec<AccountAddress>;
 }
 
 /// Aptos Rosetta API Server
@@ -154,14 +146,6 @@ impl ServerArgs for CommandArgs {
             CommandArgs::Online(args) => args.chain_id(),
         }
     }
-
-    fn owner_addresses(&self) -> Vec<AccountAddress> {
-        match self {
-            CommandArgs::OnlineRemote(args) => args.owner_addresses(),
-            CommandArgs::Offline(args) => args.owner_addresses(),
-            CommandArgs::Online(args) => args.owner_addresses(),
-        }
-    }
 }
 
 #[derive(Debug, Parser)]
@@ -208,10 +192,6 @@ impl ServerArgs for OfflineArgs {
     fn chain_id(&self) -> ChainId {
         self.chain_id
     }
-
-    fn owner_addresses(&self) -> Vec<AccountAddress> {
-        vec![]
-    }
 }
 
 #[derive(Debug, Parser)]
@@ -221,7 +201,7 @@ pub struct OnlineRemoteArgs {
     /// URL for the Aptos REST API. e.g. https://fullnode.devnet.aptoslabs.com
     #[clap(long, default_value = "http://localhost:8080")]
     rest_api_url: url::Url,
-    /// Owner addresses file as a YAML file with a list
+    /// DEPRECATED: Owner addresses file as a YAML file with a list
     #[clap(long, value_parser)]
     owner_address_file: Option<PathBuf>,
 }
@@ -238,17 +218,6 @@ impl ServerArgs for OnlineRemoteArgs {
     fn chain_id(&self) -> ChainId {
         self.offline_args.chain_id
     }
-
-    fn owner_addresses(&self) -> Vec<AccountAddress> {
-        if let Some(ref path) = self.owner_address_file {
-            serde_yaml::from_str(
-                &read_to_string(path.as_path()).expect("Failed to read owner address file"),
-            )
-            .expect("Owner address file is in an invalid format")
-        } else {
-            vec![]
-        }
-    }
 }
 
 #[derive(Debug, Parser)]
@@ -273,10 +242,6 @@ impl ServerArgs for OnlineLocalArgs {
     fn chain_id(&self) -> ChainId {
         self.online_args.offline_args.chain_id
     }
-
-    fn owner_addresses(&self) -> Vec<AccountAddress> {
-        self.online_args.owner_addresses()
-    }
 }
 
 #[test]
diff --git a/crates/aptos-rosetta/src/network.rs b/crates/aptos-rosetta/src/network.rs
index 926ee55192c38..a9d3256334072 100644
--- a/crates/aptos-rosetta/src/network.rs
+++ b/crates/aptos-rosetta/src/network.rs
@@ -58,6 +58,7 @@ async fn network_list(
         "network_list",
     );
 
+    // Rosetta server always only supports one chain at a time
     let response = NetworkListResponse {
         network_identifiers: vec![server_context.chain_id.into()],
     };
@@ -91,6 +92,7 @@ async fn network_options(
         middleware_version: "0.1.0".to_string(),
     };
 
+    // Collect all possible responses allowed
     let operation_statuses = OperationStatusType::all()
         .into_iter()
         .map(|status| status.into())
@@ -108,10 +110,14 @@ async fn network_options(
         operation_statuses,
         operation_types,
         errors,
+        // Historical balances are allowed to be looked up (pruning is handled on the API)
         historical_balance_lookup: true,
+        // Timestamp starts on block 2 technically, since block 0 is genesis, and block 1 is the first block (without a timestamp)
         timestamp_start_index: 2,
+        // No call methods supported, possibly could be used for view functions in the future
         call_methods: vec![],
         balance_exemptions: vec![],
+        // Mempool lookup not supported
         mempool_coins: false,
     };
 
@@ -140,10 +146,14 @@ async fn network_status(
     let chain_id = server_context.chain_id;
     let rest_client = server_context.rest_client()?;
     let block_cache = server_context.block_cache()?;
+
+    // Retrieve the genesis block info
     let genesis_block_identifier = block_cache
         .get_block_info_by_height(0, chain_id)
         .await?
         .block_id;
+
+    // Retrieve current ledger state
     let response = rest_client.get_ledger_information().await?;
     let state = response.state();
 
diff --git a/crates/aptos-rosetta/src/types/identifiers.rs b/crates/aptos-rosetta/src/types/identifiers.rs
index e6ac9a79b908a..42abe9d611308 100644
--- a/crates/aptos-rosetta/src/types/identifiers.rs
+++ b/crates/aptos-rosetta/src/types/identifiers.rs
@@ -36,6 +36,7 @@ impl AccountIdentifier {
         str_to_account_address(self.address.as_str())
     }
 
+    /// Retrieve the pool address from an [`AccountIdentifier`], if it exists
     pub fn pool_address(&self) -> ApiResult<Option<AccountAddress>> {
         if let Some(sub_account) = &self.sub_account {
             if let Some(metadata) = &sub_account.metadata {
@@ -46,6 +47,7 @@ impl AccountIdentifier {
         Ok(None)
     }
 
+    /// Builds a normal account [`AccountIdentifier`] for a given address
     pub fn base_account(address: AccountAddress) -> Self {
         AccountIdentifier {
             address: to_hex_lower(&address),
@@ -53,6 +55,7 @@ impl AccountIdentifier {
         }
     }
 
+    /// Builds a stake account [`AccountIdentifier`] for a given address to retrieve stake balances
     pub fn total_stake_account(address: AccountAddress) -> Self {
         AccountIdentifier {
             address: to_hex_lower(&address),
@@ -60,6 +63,7 @@ impl AccountIdentifier {
         }
     }
 
+    /// Builds a pending active stake account [`AccountIdentifier`] for a given address to retrieve pending active stake balances
     pub fn pending_active_stake_account(address: AccountAddress) -> Self {
         AccountIdentifier {
             address: to_hex_lower(&address),
@@ -67,6 +71,7 @@ impl AccountIdentifier {
         }
     }
 
+    /// Builds a active stake account [`AccountIdentifier`] for a given address to retrieve active stake balances
     pub fn active_stake_account(address: AccountAddress) -> Self {
         AccountIdentifier {
             address: to_hex_lower(&address),
@@ -74,6 +79,7 @@ impl AccountIdentifier {
         }
     }
 
+    /// Builds a pending inactive stake account [`AccountIdentifier`] for a given address to retrieve pending inactive stake balances
     pub fn pending_inactive_stake_account(address: AccountAddress) -> Self {
         AccountIdentifier {
             address: to_hex_lower(&address),
@@ -81,6 +87,7 @@ impl AccountIdentifier {
         }
     }
 
+    /// Builds a inactive stake account [`AccountIdentifier`] for a given address to retrieve inactive stake balances
     pub fn inactive_stake_account(address: AccountAddress) -> Self {
         AccountIdentifier {
             address: to_hex_lower(&address),
@@ -88,6 +95,7 @@ impl AccountIdentifier {
         }
     }
 
+    /// Builds an operator stake account [`AccountIdentifier`] for a given address to retrieve operator stake balances
     pub fn operator_stake_account(
         address: AccountAddress,
         operator_address: AccountAddress,
@@ -98,6 +106,7 @@ impl AccountIdentifier {
         }
     }
 
+    /// Returns true if the account doesn't have a sub account
     pub fn is_base_account(&self) -> bool {
         self.sub_account.is_none()
     }
@@ -178,6 +187,7 @@ impl AccountIdentifier {
         }
     }
 
+    /// Retrieves the operator address if it has one in the sub-account
     pub fn operator_address(&self) -> ApiResult<AccountAddress> {
         if let Some(ref inner) = self.sub_account {
             inner.operator_address()
@@ -189,14 +199,16 @@ impl AccountIdentifier {
     }
 }
 
+/// Converts a string to an account address with error handling
 fn str_to_account_address(address: &str) -> Result<AccountAddress, ApiError> {
     AccountAddress::from_str(address)
         .map_err(|_| ApiError::InvalidInput(Some("Invalid account address".to_string())))
 }
 
-/// There are two types of SubAccountIdentifiers
+/// There are many types of SubAccountIdentifiers
 /// 1. `stake` which is the total stake
 /// 2. `stake-<operator>` which is the stake on the operator
+/// 3. And more for pool addresses and various stake types
 #[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
 pub struct SubAccountIdentifier {
     /// Hex encoded AccountAddress beginning with 0x
@@ -356,7 +368,7 @@ impl SubAccountIdentifierMetadata {
     }
 }
 
-/// Identifier for a "block".  In aptos, we use a transaction model, so the index
+/// Identifier for a "block".  On Aptos, we use a transaction model, so the index
 /// represents multiple transactions in a "block" grouping of transactions
 ///
 /// [API Spec](https://www.rosetta-api.org/docs/models/BlockIdentifier.html)
@@ -364,7 +376,7 @@ impl SubAccountIdentifierMetadata {
 pub struct BlockIdentifier {
     /// Block index, which points to a txn at the beginning of a "block"
     pub index: u64,
-    /// Accumulator hash at the beginning of the block
+    /// A fake hash, that is actually `chain_id-block_height`
     pub hash: String,
 }
 
diff --git a/crates/aptos-rosetta/src/types/misc.rs b/crates/aptos-rosetta/src/types/misc.rs
index d7e49c0205949..ed0151417f34c 100644
--- a/crates/aptos-rosetta/src/types/misc.rs
+++ b/crates/aptos-rosetta/src/types/misc.rs
@@ -17,6 +17,7 @@ use std::{
     str::FromStr,
 };
 
+// TODO: Move these to `move_types.rs`
 static DELEGATION_POOL_GET_STAKE_FUNCTION: Lazy<EntryFunctionId> =
     Lazy::new(|| "0x1::delegation_pool::get_stake".parse().unwrap());
 static STAKE_GET_LOCKUP_SECS_FUNCTION: Lazy<EntryFunctionId> =
@@ -29,6 +30,8 @@ static STAKING_CONTRACT_AMOUNTS_FUNCTION: Lazy<EntryFunctionId> = Lazy::new(|| {
 
 /// Errors that can be returned by the API
 ///
+/// Internally [`ApiError`] is used, but it is converted to this for on wire representation
+///
 /// [API Spec](https://www.rosetta-api.org/docs/models/Error.html)
 #[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
 pub struct Error {
@@ -59,7 +62,7 @@ pub struct OperationStatus {
     pub successful: bool,
 }
 
-/// Represents a Peer, used for discovery
+/// UNUSED Represents a Peer, used for discovery
 ///
 /// [API Spec](https://www.rosetta-api.org/docs/models/Peer.html)
 #[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
@@ -67,6 +70,8 @@ pub struct Peer {
     peer_id: String,
 }
 
+/// UNUSED Represents the current status of the node vs expected state
+///
 /// [API Spec](https://www.rosetta-api.org/docs/models/SyncStatus.html)
 #[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
 pub struct SyncStatus {
@@ -101,6 +106,10 @@ pub struct BalanceResult {
 }
 
 /// An internal enum to support Operation typing
+///
+/// NOTE: Order is important here for sorting later, this order must not change, and if there are new
+/// types added, they should be added before Fee.  We sort the sub operations so that they have a
+/// stable order for things like transfers.
 #[derive(Clone, Debug, Deserialize, Eq, Hash, Ord, PartialEq, PartialOrd, Serialize)]
 pub enum OperationType {
     // Create must always be first for ordering
@@ -140,6 +149,7 @@ impl OperationType {
     const WITHDRAW: &'static str = "withdraw";
     const WITHDRAW_UNDELEGATED_FUNDS: &'static str = "withdraw_undelegated_funds";
 
+    /// Returns all operations types, order doesn't matter.
     pub fn all() -> Vec<OperationType> {
         use OperationType::*;
         vec![
@@ -165,6 +175,7 @@ impl FromStr for OperationType {
     type Err = ApiError;
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
+        // Handles string to operation Rust typing
         match s.to_lowercase().trim() {
             Self::CREATE_ACCOUNT => Ok(OperationType::CreateAccount),
             Self::DEPOSIT => Ok(OperationType::Deposit),
@@ -276,6 +287,7 @@ impl Display for OperationStatusType {
     }
 }
 
+/// Retrieves stake balances for an owner with the associated pool
 pub async fn get_stake_balances(
     rest_client: &aptos_rest_client::Client,
     owner_account: &AccountIdentifier,
@@ -283,6 +295,8 @@ pub async fn get_stake_balances(
     version: u64,
 ) -> ApiResult<Option<BalanceResult>> {
     const STAKE_POOL: &str = "0x1::stake::StakePool";
+
+    // Retreive the pool resource
     if let Ok(response) = rest_client
         .get_account_resource_at_version_bcs::<StakePool>(pool_address, STAKE_POOL, version)
         .await
@@ -362,6 +376,7 @@ pub async fn get_stake_balances(
     }
 }
 
+/// Retrieve delegation stake balances for a given owner, pool, and version
 pub async fn get_delegation_stake_balances(
     rest_client: &aptos_rest_client::Client,
     account_identifier: &AccountIdentifier,
diff --git a/crates/aptos-rosetta/src/types/move_types.rs b/crates/aptos-rosetta/src/types/move_types.rs
index 1701e5ceaa295..eff18d095fbb4 100644
--- a/crates/aptos-rosetta/src/types/move_types.rs
+++ b/crates/aptos-rosetta/src/types/move_types.rs
@@ -39,7 +39,8 @@ pub const SWITCH_OPERATOR_WITH_SAME_COMMISSION_FUNCTION: &str =
     "switch_operator_with_same_commission";
 pub const UPDATE_VOTER_FUNCTION: &str = "update_voter";
 pub const UNLOCK_STAKE_FUNCTION: &str = "unlock_stake";
-// TODO fix the typo in function name. commision -> commission
+// TODO fix the typo in function name. commision -> commission (this has to be done on-chain first)
+// TODO: Handle update_commission and update_commision
 pub const UPDATE_COMMISSION_FUNCTION: &str = "update_commision";
 pub const DISTRIBUTE_STAKING_REWARDS_FUNCTION: &str = "distribute";
 
@@ -239,7 +240,7 @@ pub struct UndelegationEvent {
 }
 
 #[derive(Debug, Serialize, Deserialize)]
-pub struct WithdrawUndelegedEvent {
+pub struct WithdrawUndelegatedEvent {
     pub pool_address: AccountAddress,
     pub delegator_address: AccountAddress,
     pub amount_withdrawn: u64,
diff --git a/crates/aptos-rosetta/src/types/objects.rs b/crates/aptos-rosetta/src/types/objects.rs
index 6e8d17c7cc6bc..29122925f66d6 100644
--- a/crates/aptos-rosetta/src/types/objects.rs
+++ b/crates/aptos-rosetta/src/types/objects.rs
@@ -106,7 +106,7 @@ impl Amount {
 #[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
 pub struct BalanceExemption {}
 
-/// Representation of a Block for a blockchain.  For aptos it is the version
+/// Representation of a Block for a blockchain.
 ///
 /// [API Spec](https://www.rosetta-api.org/docs/models/Block.html)
 #[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
@@ -856,6 +856,7 @@ pub enum TransactionType {
     BlockMetadataExt,
     StateCheckpoint,
     Validator,
+    BlockEpilogue,
 }
 
 impl Display for TransactionType {
@@ -868,6 +869,7 @@ impl Display for TransactionType {
             BlockMetadataExt => "BlockResourceExt",
             StateCheckpoint => "StateCheckpoint",
             Validator => "Validator",
+            BlockEpilogue => "BlockEpilogue",
         })
     }
 }
@@ -877,6 +879,7 @@ impl Transaction {
         server_context: &RosettaContext,
         txn: TransactionOnChainData,
     ) -> ApiResult<Transaction> {
+        // Parses the events, changesets, and metadata out of each transaction
         use aptos_types::transaction::Transaction::*;
         let (txn_type, maybe_user_txn, txn_info, events) = match &txn.transaction {
             UserTransaction(user_txn) => {
@@ -892,6 +895,7 @@ impl Transaction {
             ),
             StateCheckpoint(_) => (TransactionType::StateCheckpoint, None, txn.info, vec![]),
             ValidatorTransaction(_) => (TransactionType::Validator, None, txn.info, txn.events),
+            BlockEpilogue(_) => (TransactionType::BlockEpilogue, None, txn.info, vec![]),
         };
 
         // Operations must be sequential and operation index must always be in the same order
@@ -962,6 +966,8 @@ impl Transaction {
             ));
         }
 
+        // TODO: Handle storage gas refund (though nothing currently in Rosetta refunds)
+
         Ok(Transaction {
             transaction_identifier: (&txn_info).into(),
             operations,
@@ -1152,6 +1158,7 @@ fn parse_failed_operations_from_txn_payload(
     operations
 }
 
+/// Parses a 0x1::coin::transfer to a Withdraw and Deposit
 fn parse_transfer_from_txn_payload(
     payload: &EntryFunction,
     currency: Currency,
@@ -1291,6 +1298,7 @@ async fn parse_operations_from_write_set(
     }
 }
 
+/// Parses any account resource changes, in this case only create account is supported
 fn parse_account_resource_changes(
     version: u64,
     address: AccountAddress,
@@ -1527,6 +1535,7 @@ fn parse_stake_pool_resource_changes(
     Ok(operations)
 }
 
+/// Handles 0x1::staking_contract resource changes
 async fn parse_staking_contract_resource_changes(
     owner_address: AccountAddress,
     data: &[u8],
@@ -1679,6 +1688,7 @@ async fn parse_staking_contract_resource_changes(
     Ok(operations)
 }
 
+/// Parses 0x1::staking_contract commission updates
 async fn parse_update_commission(
     _owner_address: AccountAddress,
     data: &[u8],
@@ -1724,6 +1734,7 @@ async fn parse_update_commission(
     Ok(operations)
 }
 
+/// Parses delegation pool changes to resources
 async fn parse_delegation_pool_resource_changes(
     _owner_address: AccountAddress,
     _data: &[u8],
@@ -1745,7 +1756,7 @@ async fn parse_delegation_pool_resource_changes(
             struct_tag.name.as_str(),
         ) {
             (AccountAddress::ONE, DELEGATION_POOL_MODULE, WITHDRAW_STAKE_EVENT) => {
-                let event: WithdrawUndelegedEvent =
+                let event: WithdrawUndelegatedEvent =
                     if let Ok(event) = bcs::from_bytes(e.event_data()) {
                         event
                     } else {
@@ -1773,6 +1784,7 @@ async fn parse_delegation_pool_resource_changes(
     Ok(operations)
 }
 
+/// Parses coin store direct changes, for withdraws and deposits
 async fn parse_coinstore_changes(
     currency: Currency,
     version: u64,
@@ -1793,6 +1805,8 @@ async fn parse_coinstore_changes(
 
     let mut operations = vec![];
 
+    // TODO: Handle Event V2 here for migration from Event V1
+
     // Skip if there is no currency that can be found
     let withdraw_amounts = get_amount_from_event(events, coin_store.withdraw_events().key());
     for amount in withdraw_amounts {
@@ -1852,6 +1866,7 @@ fn get_fee_statement_from_event(events: &[ContractEvent]) -> Vec<FeeStatement> {
         .collect()
 }
 
+/// Filters events given a specific event key
 fn filter_events<F: Fn(&EventKey, &ContractEvent) -> Option<T>, T>(
     events: &[ContractEvent],
     event_key: &EventKey,
@@ -1901,8 +1916,10 @@ pub enum InternalOperation {
 
 impl InternalOperation {
     /// Pulls the [`InternalOperation`] from the set of [`Operation`]
+    /// TODO: this needs to be broken up
     pub fn extract(operations: &Vec<Operation>) -> ApiResult<InternalOperation> {
         match operations.len() {
+            // Single operation actions
             1 => {
                 if let Some(operation) = operations.first() {
                     match OperationType::from_str(&operation.operation_type) {
@@ -2147,7 +2164,9 @@ impl InternalOperation {
                     operations
                 ))))
             },
+            // Double operation actions (only coin transfer)
             2 => Ok(Self::Transfer(Transfer::extract_transfer(operations)?)),
+            // Anything else is not expected
             _ => Err(ApiError::InvalidOperations(Some(format!(
                 "Unrecognized operation combination {:?}",
                 operations
diff --git a/crates/aptos-rosetta/src/types/requests.rs b/crates/aptos-rosetta/src/types/requests.rs
index 32d74addcff11..e88637f08e60c 100644
--- a/crates/aptos-rosetta/src/types/requests.rs
+++ b/crates/aptos-rosetta/src/types/requests.rs
@@ -58,7 +58,8 @@ pub struct AccountBalanceMetadata {
     pub operators: Option<Vec<AccountAddress>>,
     pub lockup_expiration_time_utc: U64,
 }
-/// Reqyest a block (version) on the account
+
+/// Request a block (version) on the account
 ///
 /// With neither value for PartialBlockIdentifier, get the latest version
 ///
diff --git a/crates/aptos-speculative-state-helper/src/tests/proptests.rs b/crates/aptos-speculative-state-helper/src/tests/proptests.rs
index a07c79dde1bc3..f0d7aa2b3f9f5 100644
--- a/crates/aptos-speculative-state-helper/src/tests/proptests.rs
+++ b/crates/aptos-speculative-state-helper/src/tests/proptests.rs
@@ -74,7 +74,7 @@ fn prepare_work(
     let mut counter_values = vec![0; num_counters];
 
     // Pre-process indices and deltas and put them into worker tasks.
-    let mut worker_tasks: Vec<Vec<Operator>> = vec![Vec::with_capacity(200); 4];
+    let mut worker_tasks: Vec<Vec<Operator>> = (0..4).map(|_| Vec::with_capacity(200)).collect();
 
     for (i, (mut idx, mut delta)) in counter_ops.iter().enumerate() {
         // Group based on modulo (num_counters + 1). Last group is for testing out of bounds.
diff --git a/crates/aptos-telemetry-service/Cargo.toml b/crates/aptos-telemetry-service/Cargo.toml
index 8b1eb1320b9a7..defcc87ec0467 100644
--- a/crates/aptos-telemetry-service/Cargo.toml
+++ b/crates/aptos-telemetry-service/Cargo.toml
@@ -47,6 +47,9 @@ url = { workspace = true }
 uuid = { workspace = true }
 warp = { workspace = true }
 
+[features]
+bigquery_integration_tests = []
+
 [dev-dependencies]
 claims = { workspace = true }
 httpmock = { workspace = true }
diff --git a/crates/aptos-telemetry-service/src/clients/mod.rs b/crates/aptos-telemetry-service/src/clients/mod.rs
index cdfce66ce7531..e357f60b4f141 100644
--- a/crates/aptos-telemetry-service/src/clients/mod.rs
+++ b/crates/aptos-telemetry-service/src/clients/mod.rs
@@ -12,16 +12,43 @@ pub mod victoria_metrics_api {
     use url::Url;
     use warp::hyper::body::Bytes;
 
+    #[derive(Clone)]
+    pub enum AuthToken {
+        Bearer(String),
+        Basic(String, String),
+    }
+
+    impl From<&String> for AuthToken {
+        fn from(token: &String) -> Self {
+            // TODO(ibalajiarun): Auth type must be read from config
+            if token.split(':').count() == 2 {
+                let mut parts = token.split(':');
+                AuthToken::Basic(
+                    parts.next().unwrap().to_string(),
+                    parts.next().unwrap().to_string(),
+                )
+            } else {
+                AuthToken::Bearer(token.to_string())
+            }
+        }
+    }
+
+    impl From<&str> for AuthToken {
+        fn from(token: &str) -> Self {
+            AuthToken::from(&token.to_string())
+        }
+    }
+
     /// Client implementation to export metrics to Victoria Metrics
     #[derive(Clone)]
     pub struct Client {
         inner: ClientWithMiddleware,
         base_url: Url,
-        auth_token: String,
+        auth_token: AuthToken,
     }
 
     impl Client {
-        pub fn new(base_url: Url, auth_token: String) -> Self {
+        pub fn new(base_url: Url, auth_token: AuthToken) -> Self {
             let retry_policy = ExponentialBackoff::builder().build_with_max_retries(3);
             let inner = ClientBuilder::new(ReqwestClient::new())
                 .with(RetryTransientMiddleware::new_with_policy(retry_policy))
@@ -33,6 +60,13 @@ pub mod victoria_metrics_api {
             }
         }
 
+        pub fn is_selfhosted_vm_client(&self) -> bool {
+            self.base_url
+                .host_str()
+                .unwrap_or_default()
+                .contains("aptos-all.vm")
+        }
+
         pub async fn post_prometheus_metrics(
             &self,
             raw_metrics_body: Bytes,
@@ -44,10 +78,17 @@ pub mod victoria_metrics_api {
                 .map(|label| ("extra_label".into(), label.into()))
                 .collect();
 
-            self.inner
-                .post(format!("{}api/v1/import/prometheus", self.base_url))
-                .bearer_auth(self.auth_token.clone())
-                .header(CONTENT_ENCODING, encoding)
+            let req = self
+                .inner
+                .post(format!("{}api/v1/import/prometheus", self.base_url));
+            let req = match &self.auth_token {
+                AuthToken::Bearer(token) => req.bearer_auth(token.clone()),
+                AuthToken::Basic(username, password) => {
+                    req.basic_auth(username.clone(), Some(password.clone()))
+                },
+            };
+
+            req.header(CONTENT_ENCODING, encoding)
                 .query(&labels)
                 .body(raw_metrics_body)
                 .send()
diff --git a/crates/aptos-telemetry-service/src/context.rs b/crates/aptos-telemetry-service/src/context.rs
index fe6d9d60d9a52..70004d057e688 100644
--- a/crates/aptos-telemetry-service/src/context.rs
+++ b/crates/aptos-telemetry-service/src/context.rs
@@ -3,6 +3,7 @@
 
 use crate::{
     clients::{big_query::TableWriteClient, humio, victoria_metrics_api::Client as MetricsClient},
+    peer_location::PeerLocation,
     types::common::EpochedPeerStore,
     LogIngestConfig, MetricsEndpointsConfig,
 };
@@ -165,6 +166,7 @@ pub struct Context {
     jwt_service: JsonWebTokenService,
     log_env_map: HashMap<ChainId, HashMap<PeerId, String>>,
     peer_identities: HashMap<ChainId, HashMap<PeerId, String>>,
+    peer_locations: Arc<RwLock<HashMap<PeerId, PeerLocation>>>,
 }
 
 impl Context {
@@ -175,6 +177,7 @@ impl Context {
         jwt_service: JsonWebTokenService,
         log_env_map: HashMap<ChainId, HashMap<PeerId, String>>,
         peer_identities: HashMap<ChainId, HashMap<PeerId, String>>,
+        peer_locations: Arc<RwLock<HashMap<PeerId, PeerLocation>>>,
     ) -> Self {
         Self {
             noise_config: Arc::new(noise::NoiseConfig::new(private_key)),
@@ -183,6 +186,7 @@ impl Context {
             jwt_service,
             log_env_map,
             peer_identities,
+            peer_locations,
         }
     }
 
@@ -223,6 +227,10 @@ impl Context {
         &self.peer_identities
     }
 
+    pub(crate) fn peer_locations(&self) -> &Arc<RwLock<HashMap<PeerId, PeerLocation>>> {
+        &self.peer_locations
+    }
+
     pub fn chain_set(&self) -> HashSet<ChainId> {
         self.peers.validators.read().keys().cloned().collect()
     }
diff --git a/crates/aptos-telemetry-service/src/lib.rs b/crates/aptos-telemetry-service/src/lib.rs
index 3128e5dbd547d..ff3c9ad4c411a 100644
--- a/crates/aptos-telemetry-service/src/lib.rs
+++ b/crates/aptos-telemetry-service/src/lib.rs
@@ -6,6 +6,7 @@ use crate::{
     context::{ClientTuple, Context, JsonWebTokenService, LogIngestClients, PeerStoreTuple},
     index::routes,
     metrics::PrometheusExporter,
+    peer_location::PeerLocationUpdater,
     validator_cache::PeerSetCacheUpdater,
 };
 use aptos_crypto::{x25519, ValidCryptoMaterialStringExt};
@@ -40,6 +41,7 @@ mod index;
 mod jwt_auth;
 mod log_ingest;
 mod metrics;
+mod peer_location;
 mod prometheus_push_metrics;
 mod remote_config;
 #[cfg(test)]
@@ -78,9 +80,11 @@ impl AptosTelemetryServiceArgs {
                 .expect("environment variable GOOGLE_APPLICATION_CREDENTIALS must be set")
                 .as_str(),
         )
-        .await;
-        let bigquery_client = big_query::TableWriteClient::new(
-            bigquery_client,
+        .await
+        .expect("Failed to create BigQuery client");
+
+        let bigquery_table_client = big_query::TableWriteClient::new(
+            bigquery_client.clone(),
             config.custom_event_config.project_id.clone(),
             config.custom_event_config.dataset_id.clone(),
             config.custom_event_config.table_id.clone(),
@@ -105,6 +109,7 @@ impl AptosTelemetryServiceArgs {
 
         let validators = Arc::new(aptos_infallible::RwLock::new(HashMap::new()));
         let validator_fullnodes = Arc::new(aptos_infallible::RwLock::new(HashMap::new()));
+        let peer_locations = Arc::new(aptos_infallible::RwLock::new(HashMap::new()));
         let public_fullnodes = config.pfn_allowlist.clone();
 
         let context = Context::new(
@@ -115,13 +120,14 @@ impl AptosTelemetryServiceArgs {
                 public_fullnodes,
             ),
             ClientTuple::new(
-                Some(bigquery_client),
+                Some(bigquery_table_client),
                 Some(metrics_clients),
                 Some(log_ingest_clients),
             ),
             jwt_service,
             config.log_env_map.clone(),
             config.peer_identities.clone(),
+            peer_locations.clone(),
         );
 
         PeerSetCacheUpdater::new(
@@ -132,6 +138,12 @@ impl AptosTelemetryServiceArgs {
         )
         .run();
 
+        if let Err(err) =
+            PeerLocationUpdater::new(bigquery_client.clone(), peer_locations.clone()).run()
+        {
+            error!("Failed to start PeerLocationUpdater: {:?}", err);
+        }
+
         PrometheusExporter::new(telemetry_metrics_client).run();
 
         Self::serve(&config, routes(context)).await;
@@ -197,13 +209,10 @@ impl MetricsEndpoint {
                     panic!(
                         "environment variable {} is missing secret for {}",
                         self.keys_env_var.clone(),
-                        name,
+                        name
                     )
                 });
-                (
-                    name.clone(),
-                    MetricsClient::new(url.clone(), secret.clone()),
-                )
+                (name.clone(), MetricsClient::new(url.clone(), secret.into()))
             })
             .collect()
     }
diff --git a/crates/aptos-telemetry-service/src/metrics.rs b/crates/aptos-telemetry-service/src/metrics.rs
index 324bea3fe2f5b..8e97f16def7dc 100644
--- a/crates/aptos-telemetry-service/src/metrics.rs
+++ b/crates/aptos-telemetry-service/src/metrics.rs
@@ -11,7 +11,8 @@ use crate::{
 };
 use anyhow::anyhow;
 use aptos_metrics_core::{
-    register_histogram_vec, register_int_counter_vec, HistogramVec, IntCounterVec,
+    register_histogram_vec, register_int_counter, register_int_counter_vec, HistogramVec,
+    IntCounter, IntCounterVec,
 };
 use flate2::{write::GzEncoder, Compression};
 use once_cell::sync::Lazy;
@@ -57,6 +58,22 @@ pub(crate) static BIG_QUERY_BACKEND_REQUEST_DURATION: Lazy<HistogramVec> = Lazy:
     .unwrap()
 });
 
+pub(crate) static BIG_QUERY_REQUEST_TOTAL: Lazy<IntCounter> = Lazy::new(|| {
+    register_int_counter!(
+        "big_query_request_total",
+        "Total number of big query requests"
+    )
+    .unwrap()
+});
+
+pub(crate) static BIG_QUERY_REQUEST_FAILURES_TOTAL: Lazy<IntCounter> = Lazy::new(|| {
+    register_int_counter!(
+        "big_query_request_failures_total",
+        "Total number of big query request failures"
+    )
+    .unwrap()
+});
+
 pub(crate) static METRICS_EXPORT_DURATION: Lazy<HistogramVec> = Lazy::new(|| {
     register_histogram_vec!(
         "telemetry_web_service_metrics_export_duration",
diff --git a/crates/aptos-telemetry-service/src/peer_location.rs b/crates/aptos-telemetry-service/src/peer_location.rs
new file mode 100644
index 0000000000000..37ccf8622b0ec
--- /dev/null
+++ b/crates/aptos-telemetry-service/src/peer_location.rs
@@ -0,0 +1,142 @@
+// Copyright (c) Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::metrics::{BIG_QUERY_REQUEST_FAILURES_TOTAL, BIG_QUERY_REQUEST_TOTAL};
+use aptos_infallible::RwLock;
+use aptos_types::{chain_id::ChainId, PeerId};
+use gcp_bigquery_client::{
+    model::{query_request::QueryRequest, query_response::ResultSet},
+    Client as BigQueryClient,
+};
+use std::{collections::HashMap, env, str::FromStr, sync::Arc, time::Duration};
+
+const ANALYTICS_PROJECT_ID: &str = "analytics-test-345723";
+
+#[derive(Clone, Debug)]
+pub struct PeerLocation {
+    pub peer_id: PeerId,
+    pub country: Option<String>,
+    pub region: Option<String>,
+    pub geo_updated_at: Option<String>,
+}
+
+pub struct PeerLocationUpdater {
+    client: BigQueryClient,
+    peer_locations: Arc<RwLock<HashMap<PeerId, PeerLocation>>>,
+}
+
+impl PeerLocationUpdater {
+    pub fn new(
+        client: BigQueryClient,
+        peer_locations: Arc<RwLock<HashMap<PeerId, PeerLocation>>>,
+    ) -> Self {
+        Self {
+            client,
+            peer_locations,
+        }
+    }
+
+    pub fn run(self) -> anyhow::Result<()> {
+        tokio::spawn(async move {
+            loop {
+                match query_peer_locations(&self.client).await {
+                    Ok(locations) => {
+                        let mut peer_locations = self.peer_locations.write();
+                        *peer_locations = locations;
+                    },
+                    Err(e) => {
+                        aptos_logger::error!("Failed to query peer locations: {}", e);
+                    },
+                }
+                tokio::time::sleep(Duration::from_secs(3600)).await; // 1 hour
+            }
+        });
+        Ok(())
+    }
+}
+
+fn get_chain_id() -> ChainId {
+    match env::var("GCP_METADATA_PROJECT_ID") {
+        Ok(val) if val == "aptos-telemetry-svc-mainnet" => ChainId::mainnet(),
+        Ok(val) if val == "aptos-telemetry-svc-dev" => ChainId::testnet(),
+        _ => {
+            aptos_logger::warn!("Unknown GCP_METADATA_PROJECT_ID, defaulting to test");
+            ChainId::test()
+        },
+    }
+}
+
+fn process_row(
+    res: &mut ResultSet,
+    current_chain_id: &str,
+    map: &mut HashMap<PeerId, PeerLocation>,
+) -> anyhow::Result<()> {
+    let peer_id_raw = res
+        .get_string_by_name("peer_id")?
+        .ok_or_else(|| anyhow::anyhow!("Missing peer_id"))?;
+    let chain_id = res.get_string_by_name("chain_id")?;
+
+    if chain_id.as_deref() != Some(current_chain_id) {
+        return Ok(());
+    }
+
+    let peer_id = PeerId::from_str(&peer_id_raw)?;
+    let location = PeerLocation {
+        peer_id,
+        geo_updated_at: res.get_string_by_name("update_timestamp")?,
+        country: res.get_string_by_name("country")?,
+        region: res.get_string_by_name("region")?,
+    };
+    map.entry(peer_id).or_insert(location);
+    Ok(())
+}
+
+pub async fn query_peer_locations(
+    client: &BigQueryClient,
+) -> anyhow::Result<HashMap<PeerId, PeerLocation>> {
+    let current_chain_id = get_chain_id().id().to_string();
+    let query = env::var("PEER_LOCATION_QUERY")?;
+
+    let req = QueryRequest::new(query);
+    let req = QueryRequest {
+        timeout_ms: Some(10000),
+        ..req
+    };
+
+    BIG_QUERY_REQUEST_TOTAL.inc();
+
+    let mut res = client
+        .job()
+        .query(ANALYTICS_PROJECT_ID, req)
+        .await
+        .map_err(|e| {
+            BIG_QUERY_REQUEST_FAILURES_TOTAL.inc();
+            aptos_logger::error!("Failed to query peer locations: {}", e);
+            e
+        })?;
+
+    let mut map = HashMap::new();
+    while res.next_row() {
+        process_row(&mut res, &current_chain_id, &mut map)?;
+    }
+    Ok(map)
+}
+
+#[cfg(feature = "bigquery_integration_tests")]
+mod tests {
+    use super::*;
+    use gcp_bigquery_client::Client as BigQueryClient;
+
+    #[tokio::test]
+    async fn test_query() {
+        env::set_var("GCP_METADATA_PROJECT_ID", "aptos-telemetry-svc-dev");
+        env::set_var("PEER_LOCATION_QUERY", "<QUERY>");
+
+        let client = BigQueryClient::from_application_default_credentials()
+            .await
+            .unwrap();
+        let result = query_peer_locations(&client).await.unwrap();
+        println!("{:?}", result);
+        assert!(!result.is_empty());
+    }
+}
diff --git a/crates/aptos-telemetry-service/src/prometheus_push_metrics.rs b/crates/aptos-telemetry-service/src/prometheus_push_metrics.rs
index 0e17c6f9d67b3..4a4bc2f4151f9 100644
--- a/crates/aptos-telemetry-service/src/prometheus_push_metrics.rs
+++ b/crates/aptos-telemetry-service/src/prometheus_push_metrics.rs
@@ -10,8 +10,10 @@ use crate::{
     metrics::METRICS_INGEST_BACKEND_REQUEST_DURATION,
     types::{auth::Claims, common::NodeType},
 };
+use aptos_types::PeerId;
+use rand::Rng;
 use reqwest::{header::CONTENT_ENCODING, StatusCode};
-use std::time::Duration;
+use std::{env, time::Duration};
 use tokio::time::Instant;
 use warp::{filters::BoxedFilter, hyper::body::Bytes, reject, reply, Filter, Rejection, Reply};
 
@@ -43,13 +45,34 @@ pub async fn handle_metrics_ingest(
 ) -> anyhow::Result<impl Reply, Rejection> {
     debug!("handling prometheus metrics ingest");
 
-    let extra_labels = claims_to_extra_labels(
-        &claims,
-        context
-            .peer_identities()
-            .get(&claims.chain_id)
-            .and_then(|peers| peers.get(&claims.peer_id)),
-    );
+    let enable_random_label = env::var("FEATURE_RANDOM_LABEL_ENABLED")
+        .map(|val| val.parse::<bool>().unwrap_or(false))
+        .unwrap_or(false);
+
+    let max_random_value = env::var("FEATURE_RANDOM_LABEL_MAX_VALUE")
+        .map(|val| val.parse::<i32>().unwrap_or(20))
+        .unwrap_or(20);
+
+    let extra_labels = [
+        claims_to_extra_labels(
+            &claims,
+            context
+                .peer_identities()
+                .get(&claims.chain_id)
+                .and_then(|peers| peers.get(&claims.peer_id)),
+        ),
+        peer_location_labels(&context, &claims.peer_id),
+    ]
+    .concat();
+
+    let extra_labels_with_random_label = if enable_random_label {
+        let random_num = rand::thread_rng().gen_range(0, max_random_value);
+        let mut labels = extra_labels.clone();
+        labels.push(format!("random_label={}", random_num));
+        labels
+    } else {
+        extra_labels.clone()
+    };
 
     let client = match claims.node_type {
         NodeType::UnknownValidator | NodeType::UnknownFullNode => {
@@ -61,6 +84,11 @@ pub async fn handle_metrics_ingest(
     let start_timer = Instant::now();
 
     let post_futures = client.iter().map(|(name, client)| async {
+        let extra_labels = if client.is_selfhosted_vm_client() {
+            extra_labels_with_random_label.clone()
+        } else {
+            extra_labels.clone()
+        };
         let result = tokio::time::timeout(
             Duration::from_secs(MAX_METRICS_POST_WAIT_DURATION_SECS),
             client.post_prometheus_metrics(
@@ -155,10 +183,29 @@ fn claims_to_extra_labels(claims: &Claims, common_name: Option<&String>) -> Vec<
     ]
 }
 
+fn sanitize_location(location: &str) -> String {
+    location.to_lowercase().replace(' ', "_")
+}
+
+fn peer_location_labels(context: &Context, peer_id: &PeerId) -> Vec<String> {
+    let peer_locations = context.peer_locations().read();
+    let peer_location = peer_locations.get(peer_id);
+    let mut labels = vec![];
+    if let Some(location) = peer_location {
+        if let Some(country) = &location.country {
+            labels.push(format!("country={}", sanitize_location(country)));
+        }
+        if let Some(region) = &location.region {
+            labels.push(format!("region={}", sanitize_location(region)));
+        }
+    }
+    labels
+}
+
 #[cfg(test)]
 mod test {
     use super::*;
-    use crate::{tests::test_context, MetricsClient};
+    use crate::{peer_location::PeerLocation, tests::test_context, MetricsClient};
     use aptos_types::{chain_id::ChainId, PeerId};
     use httpmock::MockServer;
     use reqwest::Url;
@@ -319,4 +366,24 @@ mod test {
         mock2.assert();
         assert!(result.is_err());
     }
+
+    #[tokio::test]
+    async fn test_peer_location_labels() {
+        let test_context = test_context::new_test_context().await;
+        let peer_id = PeerId::from_str("0x1").unwrap();
+        {
+            let mut peer_locations = test_context.inner.peer_locations().write();
+            peer_locations.insert(peer_id, PeerLocation {
+                geo_updated_at: Some("1985-04-12T23:20:50.52Z".to_string()),
+                country: Some("United Kingdom".to_string()),
+                region: Some("Western_Europe".to_string()),
+                peer_id,
+            });
+        }
+        let labels = peer_location_labels(&test_context.inner, &peer_id);
+        assert_eq!(labels, vec![
+            "country=united_kingdom",
+            "region=western_europe"
+        ]);
+    }
 }
diff --git a/crates/aptos-telemetry-service/src/tests/test_context.rs b/crates/aptos-telemetry-service/src/tests/test_context.rs
index dc7f93219b929..896204c9dab6b 100644
--- a/crates/aptos-telemetry-service/src/tests/test_context.rs
+++ b/crates/aptos-telemetry-service/src/tests/test_context.rs
@@ -6,11 +6,12 @@ use crate::{
     index, CustomEventConfig, LogIngestConfig, MetricsEndpointsConfig, TelemetryServiceConfig,
 };
 use aptos_crypto::{x25519, Uniform};
+use aptos_infallible::RwLock;
 use aptos_rest_client::aptos_api_types::mime_types;
 use rand::SeedableRng;
 use reqwest::header::AUTHORIZATION;
 use serde_json::Value;
-use std::collections::HashMap;
+use std::{collections::HashMap, sync::Arc};
 use warp::{
     http::{header::CONTENT_TYPE, Response},
     hyper::body::Bytes,
@@ -50,6 +51,7 @@ pub async fn new_test_context() -> TestContext {
             jwt_service,
             HashMap::new(),
             HashMap::new(),
+            Arc::new(RwLock::new(HashMap::new())),
         ),
     )
 }
diff --git a/crates/aptos/CHANGELOG.md b/crates/aptos/CHANGELOG.md
index 092229fb56e19..e2a67e481ff6e 100644
--- a/crates/aptos/CHANGELOG.md
+++ b/crates/aptos/CHANGELOG.md
@@ -3,6 +3,37 @@
 All notable changes to the Aptos CLI will be captured in this file. This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html) and the format set out by [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## Unreleased
+- Add `aptos update movefmt`. This installs / updates the `movefmt` binary, which is needed for the new `aptos move fmt` subcommand.
+- Integrate the Move formatter `movefmt` which is now available via `aptos move fmt`
+
+## [4.0.0] - 2024/08/13
+- **Breaking Change**: change key rotation options such that user has to either pass the name of a new profile or explicitly flag that no profile should be generated, since without this update the interactive profile generator could fail out after the key has already been rotated. This forces the check for new profile validity before doing anything onchain.
+- Add support for key rotation to/from Ledger hardware wallets.
+- Fixes a bug in the Move Prover leading to internal error in generated boogie (error 'global `#0_info` cannot be accessed')
+- **Breaking Change**: A new native function to compute serialized size of a Move value is now supported.
+
+## [3.5.1] - 2024/07/21
+- Upgraded indexer processors for localnet from 5244b84fa5ed872e5280dc8df032d744d62ad29d to fa1ce4947f4c2be57529f1c9732529e05a06cb7f. Upgraded Hasura metadata accordingly.
+- Upgraded Hasura image from 2.36.1 to 2.40.2-ce. Note that we use the Community Edition, so the console won't ask users to upgrade to enterprise anymore / hint at any enterprise features.
+- Fixes a bug in the Move compiler (both v1 and v2) which disallowed `match` as a name for a function or for a variable.
+
+## [3.5.0] - 2024/07/06
+- Add balance command to easily get account balances for APT currently
+- Add network to config file
+- Add explorer links to initialized accounts, and transaction submissions
+- Alias some move commands as common misnomers (e.g. build -> compile, deploy -> publish)
+- Add "hello_blockchain" template to move init command
+
+## [3.4.1] - 2024/05/31
+- Upgraded indexer processors for localnet from ca60e51b53c3be6f9517de7c73d4711e9c1f7236 to 5244b84fa5ed872e5280dc8df032d744d62ad29d. Upgraded Hasura metadata accordingly.
+
+## [3.4.0] - 2024/05/30
+- Adds a check for safe usage of randomness features. Public functions are not allowed to call randomness features unless explicitly allowed via attribute `#[lint::allow_unsafe_randomness]`.
+- The Move syntax now supports structured attribute names, as in `#[attribute_area::attribute_name]`.
+- Upgraded indexer processors for localnet from a11f0b6532349aa6b9a80c9a1d77524f02d8a013 to ca60e51b53c3be6f9517de7c73d4711e9c1f7236. Upgraded Hasura metadata accordingly.
+
+## [3.3.1] - 2024/05/21
+- Fixed incompatibility bug that broken local simulation and gas profiling.
 
 ## [3.3.0] - 2024/05/03
 - **Breaking Change** Update View functions to use BCS for submission.  Allows for all arguments to be supported in view functions.  Note some input arguments that were previously inputted as strings may be handled differently.
diff --git a/crates/aptos/Cargo.toml b/crates/aptos/Cargo.toml
index 69d8112f01d8f..1d0ad2e9d13be 100644
--- a/crates/aptos/Cargo.toml
+++ b/crates/aptos/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "aptos"
 description = "Aptos tool for management of nodes and interacting with the blockchain"
-version = "3.3.0"
+version = "4.0.0"
 
 # Workspace inherited keys
 authors = { workspace = true }
@@ -83,14 +83,15 @@ pathsearch = { workspace = true }
 poem = { workspace = true }
 # We set default-features to false so we don't onboard the libpq dep. See more here:
 # https://github.com/aptos-labs/aptos-core/pull/12568
-processor = { git = "https://github.com/aptos-labs/aptos-indexer-processors.git", rev = "a11f0b6532349aa6b9a80c9a1d77524f02d8a013", default-features = false }
+processor = { git = "https://github.com/aptos-labs/aptos-indexer-processors.git", rev = "fa1ce4947f4c2be57529f1c9732529e05a06cb7f", default-features = false }
 rand = { workspace = true }
+regex = { workspace = true }
 reqwest = { workspace = true }
 self_update = { git = "https://github.com/banool/self_update.git", rev = "8306158ad0fd5b9d4766a3c6bf967e7ef0ea5c4b", features = ["archive-zip", "compression-zip-deflate"] }
 serde = { workspace = true }
 serde_json = { workspace = true }
 serde_yaml = { workspace = true }
-server-framework = { git = "https://github.com/aptos-labs/aptos-indexer-processors.git", rev = "a11f0b6532349aa6b9a80c9a1d77524f02d8a013" }
+server-framework = { git = "https://github.com/aptos-labs/aptos-indexer-processors.git", rev = "fa1ce4947f4c2be57529f1c9732529e05a06cb7f" }
 tempfile = { workspace = true }
 thiserror = { workspace = true }
 tokio = { workspace = true }
diff --git a/crates/aptos/e2e/cases/account.py b/crates/aptos/e2e/cases/account.py
index 34dba7d71a334..ffe301b30d629 100644
--- a/crates/aptos/e2e/cases/account.py
+++ b/crates/aptos/e2e/cases/account.py
@@ -10,7 +10,7 @@
 
 
 @test_case
-def test_account_fund_with_faucet(run_helper: RunHelper, test_name=None):
+async def test_account_fund_with_faucet(run_helper: RunHelper, test_name=None):
     amount_in_octa = 100000000000
 
     # Fund the account.
@@ -29,7 +29,7 @@ def test_account_fund_with_faucet(run_helper: RunHelper, test_name=None):
 
     # Assert it has the requested balance.
     balance = int(
-        run_helper.api_client.account_balance(
+        await run_helper.api_client.account_balance(
             run_helper.get_account_info().account_address
         )
     )
@@ -40,7 +40,7 @@ def test_account_fund_with_faucet(run_helper: RunHelper, test_name=None):
 
 
 @test_case
-def test_account_create_and_transfer(run_helper: RunHelper, test_name=None):
+async def test_account_create_and_transfer(run_helper: RunHelper, test_name=None):
     # Create the new account.
     run_helper.run_command(
         test_name,
@@ -56,7 +56,7 @@ def test_account_create_and_transfer(run_helper: RunHelper, test_name=None):
 
     # Assert it exists and has zero balance.
     balance = int(
-        run_helper.api_client.account_balance(OTHER_ACCOUNT_ONE.account_address)
+        await run_helper.api_client.account_balance(OTHER_ACCOUNT_ONE.account_address)
     )
     if balance != 0:
         raise TestError(
@@ -80,7 +80,7 @@ def test_account_create_and_transfer(run_helper: RunHelper, test_name=None):
     )
 
     balance = int(
-        run_helper.api_client.account_balance(OTHER_ACCOUNT_ONE.account_address)
+        await run_helper.api_client.account_balance(OTHER_ACCOUNT_ONE.account_address)
     )
 
     if balance != transfer_amount:
@@ -154,14 +154,14 @@ def test_account_rotate_key(run_helper: RunHelper, test_name=None):
             "rotate-key",
             "--new-private-key",
             new_private_key,
+            "--skip-saving-profile",
             "--assume-yes",
         ],
-        input="no\n",
     )
 
     if '"success": true' not in result.stdout:
         raise TestError(
-            f"[aptos account rotate-key --new-private-key {new_private_key} --assume-yes] failed"
+            f"[aptos account rotate-key --new-private-key {new_private_key} --skip-saving-profile --assume-yes] failed"
         )
 
     new_profile = run_helper.get_account_info()
diff --git a/crates/aptos/e2e/cases/stake.py b/crates/aptos/e2e/cases/stake.py
index 3585c4c3db642..80693404e7fb4 100644
--- a/crates/aptos/e2e/cases/stake.py
+++ b/crates/aptos/e2e/cases/stake.py
@@ -1,13 +1,19 @@
 # Copyright © Aptos Foundation
 # SPDX-License-Identifier: Apache-2.0
 
+import asyncio
 import json
+import logging
 
+from aptos_sdk.account_address import AccountAddress
 from common import TestError
 from test_helpers import RunHelper
 from test_results import test_case
 
 
+LOG = logging.getLogger(__name__)
+
+
 @test_case
 def test_stake_initialize_stake_owner(run_helper: RunHelper, test_name=None):
     # run the initialize-stake-owner command
@@ -200,7 +206,10 @@ def test_stake_set_voter(run_helper: RunHelper, test_name=None):
 
 
 @test_case
-def test_stake_create_staking_contract(run_helper: RunHelper, test_name=None):
+async def test_stake_create_staking_contract(run_helper: RunHelper, test_name=None):
+    # First wait for reconfiguration to finish.
+    await wait_for_reconfiguration(run_helper)
+
     # run the set-operator command
     # Note: This command has to run after set-operator and set-voter
     # because it needs to know the operator and voter addresses
@@ -227,32 +236,6 @@ def test_stake_create_staking_contract(run_helper: RunHelper, test_name=None):
         raise TestError("Did not set create staking contract successfully")
 
 
-@test_case
-def test_stake_create_staking_contract(run_helper: RunHelper, test_name=None):
-    # run the set-operator command
-    response = run_helper.run_command(
-        test_name,
-        [
-            "aptos",
-            "stake",
-            "create-staking-contract",
-            "--operator",
-            "operator",
-            "--voter",
-            "voter",
-            "--amount",
-            "1000000",
-            "--commission-percentage",
-            "1",
-            "--assume-yes",
-        ],
-    )
-
-    result = json.loads(response.stdout)["Result"]
-    if result.get("success") != True:
-        raise TestError("Did not set create staking contract successfully")
-
-
 @test_case
 def test_stake_increase_lockup(run_helper: RunHelper, test_name=None):
     # run the set-operator command
@@ -285,7 +268,9 @@ def test_stake_unlock_stake(run_helper: RunHelper, test_name=None):
 
 
 @test_case
-def test_stake_withdraw_stake_after_unlock(run_helper: RunHelper, test_name=None):
+async def test_stake_withdraw_stake_after_unlock(run_helper: RunHelper, test_name=None):
+    await wait_for_reconfiguration(run_helper)
+
     # get the current stake amount
     response = run_helper.run_command(
         test_name,
@@ -416,3 +401,21 @@ def test_stake_request_commission(run_helper: RunHelper, test_name=None):
     result = json.loads(response.stdout)["Result"]
     if result.get("success") != True:
         raise TestError("Did not execute [request-commission] successfully")
+
+
+async def wait_for_reconfiguration(run_helper: RunHelper):
+    # First wait for reconfiguration to finish.
+    LOG.info("Waiting for reconfiguration to finish...")
+    attempts = 0
+    while True:
+        response = await run_helper.api_client.account_resource(
+            AccountAddress.from_str("0x1"),
+            "0x1::reconfiguration_state::State",
+        )
+        if response["data"]["variant"]["data"] == "0x00":
+            break
+        attempts += 1
+        if attempts > 20:
+            raise TestError("Reconfiguration did not finish in time")
+        await asyncio.sleep(0.5)
+    LOG.info("Reconfiguration finished")
diff --git a/crates/aptos/e2e/local_testnet.py b/crates/aptos/e2e/local_testnet.py
index bd07122f9a095..3d024219ba9fc 100644
--- a/crates/aptos/e2e/local_testnet.py
+++ b/crates/aptos/e2e/local_testnet.py
@@ -69,12 +69,13 @@ def run_node(network: Network, image_repo_with_project: str, pull=True):
     ]
 
     # Run the container.
+    LOG.debug("Running command: %s", " ".join(args))
     subprocess.run(
         args,
         **kwargs,
     )
 
-    LOG.info(f"Running aptos CLI localnet from image: {image_name}")
+    LOG.info(f"Running aptos CLI localnet from image: {image_name}. Container name: {container_name}")
     return container_name
 
 
diff --git a/crates/aptos/e2e/main.py b/crates/aptos/e2e/main.py
index 26364219e1fe7..46bf3078e2b4e 100644
--- a/crates/aptos/e2e/main.py
+++ b/crates/aptos/e2e/main.py
@@ -24,6 +24,7 @@
 """
 
 import argparse
+import asyncio
 import logging
 import os
 import pathlib
@@ -33,8 +34,8 @@
 
 from cases.account import (
     test_account_create_and_transfer,
-    test_account_list,
     test_account_fund_with_faucet,
+    test_account_list,
     test_account_lookup_address,
     test_account_resource_account,
     test_account_rotate_key,
@@ -53,6 +54,7 @@
     test_node_update_consensus_key,
     test_node_update_validator_network_address,
 )
+"""
 from cases.stake import (
     test_stake_add_stake,
     test_stake_create_staking_contract,
@@ -65,6 +67,7 @@
     test_stake_withdraw_stake_after_unlock,
     test_stake_withdraw_stake_before_unlock,
 )
+"""
 from common import Network
 from local_testnet import run_node, stop_node, wait_for_startup
 from test_helpers import RunHelper
@@ -134,7 +137,7 @@ def parse_args():
     return args
 
 
-def run_tests(run_helper):
+async def run_tests(run_helper):
     # Make sure the metrics port is accessible.
     test_metrics_accessible(run_helper)
 
@@ -145,8 +148,8 @@ def run_tests(run_helper):
     test_config_show_profiles(run_helper)
 
     # Run account tests.
-    test_account_fund_with_faucet(run_helper)
-    test_account_create_and_transfer(run_helper)
+    await test_account_fund_with_faucet(run_helper)
+    await test_account_create_and_transfer(run_helper)
     test_account_list(run_helper)
     test_account_lookup_address(run_helper)
     test_account_resource_account(run_helper)
@@ -162,16 +165,18 @@ def run_tests(run_helper):
     test_move_view(run_helper)
 
     # Run stake subcommand group tests.
+    """
     test_stake_initialize_stake_owner(run_helper)
     test_stake_add_stake(run_helper)
     test_stake_withdraw_stake_before_unlock(run_helper)
     test_stake_unlock_stake(run_helper)
-    test_stake_withdraw_stake_after_unlock(run_helper)
+    await test_stake_withdraw_stake_after_unlock(run_helper)
     test_stake_increase_lockup(run_helper)
     test_stake_set_operator(run_helper)
     test_stake_set_voter(run_helper)
-    test_stake_create_staking_contract(run_helper)
+    await test_stake_create_staking_contract(run_helper)
     test_stake_request_commission(run_helper)
+    """
 
     # Run node subcommand group tests.
     test_node_show_validator_set(run_helper)
@@ -182,7 +187,7 @@ def run_tests(run_helper):
     test_account_rotate_key(run_helper)
 
 
-def main():
+async def main():
     args = parse_args()
 
     if args.debug:
@@ -197,7 +202,10 @@ def main():
 
     # If we're on Mac and DOCKER_DEFAULT_PLATFORM is not already set, set it to
     # linux/amd64 since we only publish images for that platform.
-    if platform.system().lower() == "darwin" and platform.processor().lower().startswith("arm"):
+    if (
+        platform.system().lower() == "darwin"
+        and platform.processor().lower().startswith("arm")
+    ):
         if not os.environ.get("DOCKER_DEFAULT_PLATFORM"):
             os.environ["DOCKER_DEFAULT_PLATFORM"] = "linux/amd64"
             LOG.info(
@@ -229,7 +237,7 @@ def main():
         run_helper.prepare()
 
         # Run tests.
-        run_tests(run_helper)
+        await run_tests(run_helper)
     finally:
         # Stop the node + faucet.
         stop_node(container_name)
@@ -257,7 +265,7 @@ def main():
 
 
 if __name__ == "__main__":
-    if main():
+    if asyncio.run(main()):
         sys.exit(0)
     else:
         sys.exit(1)
diff --git a/crates/aptos/e2e/poetry.lock b/crates/aptos/e2e/poetry.lock
index bd8def62ff7ce..fdcae8345acce 100644
--- a/crates/aptos/e2e/poetry.lock
+++ b/crates/aptos/e2e/poetry.lock
@@ -1,41 +1,185 @@
 # This file is automatically @generated by Poetry 1.7.1 and should not be changed by hand.
 
+[[package]]
+name = "aiohttp"
+version = "3.9.5"
+description = "Async http client/server framework (asyncio)"
+optional = false
+python-versions = ">=3.8"
+files = [
+    {file = "aiohttp-3.9.5-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:fcde4c397f673fdec23e6b05ebf8d4751314fa7c24f93334bf1f1364c1c69ac7"},
+    {file = "aiohttp-3.9.5-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:5d6b3f1fabe465e819aed2c421a6743d8debbde79b6a8600739300630a01bf2c"},
+    {file = "aiohttp-3.9.5-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:6ae79c1bc12c34082d92bf9422764f799aee4746fd7a392db46b7fd357d4a17a"},
+    {file = "aiohttp-3.9.5-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4d3ebb9e1316ec74277d19c5f482f98cc65a73ccd5430540d6d11682cd857430"},
+    {file = "aiohttp-3.9.5-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:84dabd95154f43a2ea80deffec9cb44d2e301e38a0c9d331cc4aa0166fe28ae3"},
+    {file = "aiohttp-3.9.5-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c8a02fbeca6f63cb1f0475c799679057fc9268b77075ab7cf3f1c600e81dd46b"},
+    {file = "aiohttp-3.9.5-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c26959ca7b75ff768e2776d8055bf9582a6267e24556bb7f7bd29e677932be72"},
+    {file = "aiohttp-3.9.5-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:714d4e5231fed4ba2762ed489b4aec07b2b9953cf4ee31e9871caac895a839c0"},
+    {file = "aiohttp-3.9.5-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:e7a6a8354f1b62e15d48e04350f13e726fa08b62c3d7b8401c0a1314f02e3558"},
+    {file = "aiohttp-3.9.5-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:c413016880e03e69d166efb5a1a95d40f83d5a3a648d16486592c49ffb76d0db"},
+    {file = "aiohttp-3.9.5-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:ff84aeb864e0fac81f676be9f4685f0527b660f1efdc40dcede3c251ef1e867f"},
+    {file = "aiohttp-3.9.5-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:ad7f2919d7dac062f24d6f5fe95d401597fbb015a25771f85e692d043c9d7832"},
+    {file = "aiohttp-3.9.5-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:702e2c7c187c1a498a4e2b03155d52658fdd6fda882d3d7fbb891a5cf108bb10"},
+    {file = "aiohttp-3.9.5-cp310-cp310-win32.whl", hash = "sha256:67c3119f5ddc7261d47163ed86d760ddf0e625cd6246b4ed852e82159617b5fb"},
+    {file = "aiohttp-3.9.5-cp310-cp310-win_amd64.whl", hash = "sha256:471f0ef53ccedec9995287f02caf0c068732f026455f07db3f01a46e49d76bbb"},
+    {file = "aiohttp-3.9.5-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:e0ae53e33ee7476dd3d1132f932eeb39bf6125083820049d06edcdca4381f342"},
+    {file = "aiohttp-3.9.5-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:c088c4d70d21f8ca5c0b8b5403fe84a7bc8e024161febdd4ef04575ef35d474d"},
+    {file = "aiohttp-3.9.5-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:639d0042b7670222f33b0028de6b4e2fad6451462ce7df2af8aee37dcac55424"},
+    {file = "aiohttp-3.9.5-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f26383adb94da5e7fb388d441bf09c61e5e35f455a3217bfd790c6b6bc64b2ee"},
+    {file = "aiohttp-3.9.5-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:66331d00fb28dc90aa606d9a54304af76b335ae204d1836f65797d6fe27f1ca2"},
+    {file = "aiohttp-3.9.5-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:4ff550491f5492ab5ed3533e76b8567f4b37bd2995e780a1f46bca2024223233"},
+    {file = "aiohttp-3.9.5-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f22eb3a6c1080d862befa0a89c380b4dafce29dc6cd56083f630073d102eb595"},
+    {file = "aiohttp-3.9.5-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a81b1143d42b66ffc40a441379387076243ef7b51019204fd3ec36b9f69e77d6"},
+    {file = "aiohttp-3.9.5-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:f64fd07515dad67f24b6ea4a66ae2876c01031de91c93075b8093f07c0a2d93d"},
+    {file = "aiohttp-3.9.5-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:93e22add827447d2e26d67c9ac0161756007f152fdc5210277d00a85f6c92323"},
+    {file = "aiohttp-3.9.5-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:55b39c8684a46e56ef8c8d24faf02de4a2b2ac60d26cee93bc595651ff545de9"},
+    {file = "aiohttp-3.9.5-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:4715a9b778f4293b9f8ae7a0a7cef9829f02ff8d6277a39d7f40565c737d3771"},
+    {file = "aiohttp-3.9.5-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:afc52b8d969eff14e069a710057d15ab9ac17cd4b6753042c407dcea0e40bf75"},
+    {file = "aiohttp-3.9.5-cp311-cp311-win32.whl", hash = "sha256:b3df71da99c98534be076196791adca8819761f0bf6e08e07fd7da25127150d6"},
+    {file = "aiohttp-3.9.5-cp311-cp311-win_amd64.whl", hash = "sha256:88e311d98cc0bf45b62fc46c66753a83445f5ab20038bcc1b8a1cc05666f428a"},
+    {file = "aiohttp-3.9.5-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:c7a4b7a6cf5b6eb11e109a9755fd4fda7d57395f8c575e166d363b9fc3ec4678"},
+    {file = "aiohttp-3.9.5-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:0a158704edf0abcac8ac371fbb54044f3270bdbc93e254a82b6c82be1ef08f3c"},
+    {file = "aiohttp-3.9.5-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:d153f652a687a8e95ad367a86a61e8d53d528b0530ef382ec5aaf533140ed00f"},
+    {file = "aiohttp-3.9.5-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:82a6a97d9771cb48ae16979c3a3a9a18b600a8505b1115cfe354dfb2054468b4"},
+    {file = "aiohttp-3.9.5-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:60cdbd56f4cad9f69c35eaac0fbbdf1f77b0ff9456cebd4902f3dd1cf096464c"},
+    {file = "aiohttp-3.9.5-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:8676e8fd73141ded15ea586de0b7cda1542960a7b9ad89b2b06428e97125d4fa"},
+    {file = "aiohttp-3.9.5-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:da00da442a0e31f1c69d26d224e1efd3a1ca5bcbf210978a2ca7426dfcae9f58"},
+    {file = "aiohttp-3.9.5-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:18f634d540dd099c262e9f887c8bbacc959847cfe5da7a0e2e1cf3f14dbf2daf"},
+    {file = "aiohttp-3.9.5-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:320e8618eda64e19d11bdb3bd04ccc0a816c17eaecb7e4945d01deee2a22f95f"},
+    {file = "aiohttp-3.9.5-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:2faa61a904b83142747fc6a6d7ad8fccff898c849123030f8e75d5d967fd4a81"},
+    {file = "aiohttp-3.9.5-cp312-cp312-musllinux_1_1_ppc64le.whl", hash = "sha256:8c64a6dc3fe5db7b1b4d2b5cb84c4f677768bdc340611eca673afb7cf416ef5a"},
+    {file = "aiohttp-3.9.5-cp312-cp312-musllinux_1_1_s390x.whl", hash = "sha256:393c7aba2b55559ef7ab791c94b44f7482a07bf7640d17b341b79081f5e5cd1a"},
+    {file = "aiohttp-3.9.5-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:c671dc117c2c21a1ca10c116cfcd6e3e44da7fcde37bf83b2be485ab377b25da"},
+    {file = "aiohttp-3.9.5-cp312-cp312-win32.whl", hash = "sha256:5a7ee16aab26e76add4afc45e8f8206c95d1d75540f1039b84a03c3b3800dd59"},
+    {file = "aiohttp-3.9.5-cp312-cp312-win_amd64.whl", hash = "sha256:5ca51eadbd67045396bc92a4345d1790b7301c14d1848feaac1d6a6c9289e888"},
+    {file = "aiohttp-3.9.5-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:694d828b5c41255e54bc2dddb51a9f5150b4eefa9886e38b52605a05d96566e8"},
+    {file = "aiohttp-3.9.5-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0605cc2c0088fcaae79f01c913a38611ad09ba68ff482402d3410bf59039bfb8"},
+    {file = "aiohttp-3.9.5-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:4558e5012ee03d2638c681e156461d37b7a113fe13970d438d95d10173d25f78"},
+    {file = "aiohttp-3.9.5-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9dbc053ac75ccc63dc3a3cc547b98c7258ec35a215a92bd9f983e0aac95d3d5b"},
+    {file = "aiohttp-3.9.5-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4109adee842b90671f1b689901b948f347325045c15f46b39797ae1bf17019de"},
+    {file = "aiohttp-3.9.5-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a6ea1a5b409a85477fd8e5ee6ad8f0e40bf2844c270955e09360418cfd09abac"},
+    {file = "aiohttp-3.9.5-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f3c2890ca8c59ee683fd09adf32321a40fe1cf164e3387799efb2acebf090c11"},
+    {file = "aiohttp-3.9.5-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3916c8692dbd9d55c523374a3b8213e628424d19116ac4308e434dbf6d95bbdd"},
+    {file = "aiohttp-3.9.5-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:8d1964eb7617907c792ca00b341b5ec3e01ae8c280825deadbbd678447b127e1"},
+    {file = "aiohttp-3.9.5-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:d5ab8e1f6bee051a4bf6195e38a5c13e5e161cb7bad83d8854524798bd9fcd6e"},
+    {file = "aiohttp-3.9.5-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:52c27110f3862a1afbcb2af4281fc9fdc40327fa286c4625dfee247c3ba90156"},
+    {file = "aiohttp-3.9.5-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:7f64cbd44443e80094309875d4f9c71d0401e966d191c3d469cde4642bc2e031"},
+    {file = "aiohttp-3.9.5-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:8b4f72fbb66279624bfe83fd5eb6aea0022dad8eec62b71e7bf63ee1caadeafe"},
+    {file = "aiohttp-3.9.5-cp38-cp38-win32.whl", hash = "sha256:6380c039ec52866c06d69b5c7aad5478b24ed11696f0e72f6b807cfb261453da"},
+    {file = "aiohttp-3.9.5-cp38-cp38-win_amd64.whl", hash = "sha256:da22dab31d7180f8c3ac7c7635f3bcd53808f374f6aa333fe0b0b9e14b01f91a"},
+    {file = "aiohttp-3.9.5-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:1732102949ff6087589408d76cd6dea656b93c896b011ecafff418c9661dc4ed"},
+    {file = "aiohttp-3.9.5-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:c6021d296318cb6f9414b48e6a439a7f5d1f665464da507e8ff640848ee2a58a"},
+    {file = "aiohttp-3.9.5-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:239f975589a944eeb1bad26b8b140a59a3a320067fb3cd10b75c3092405a1372"},
+    {file = "aiohttp-3.9.5-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3b7b30258348082826d274504fbc7c849959f1989d86c29bc355107accec6cfb"},
+    {file = "aiohttp-3.9.5-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:cd2adf5c87ff6d8b277814a28a535b59e20bfea40a101db6b3bdca7e9926bc24"},
+    {file = "aiohttp-3.9.5-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:e9a3d838441bebcf5cf442700e3963f58b5c33f015341f9ea86dcd7d503c07e2"},
+    {file = "aiohttp-3.9.5-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9e3a1ae66e3d0c17cf65c08968a5ee3180c5a95920ec2731f53343fac9bad106"},
+    {file = "aiohttp-3.9.5-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9c69e77370cce2d6df5d12b4e12bdcca60c47ba13d1cbbc8645dd005a20b738b"},
+    {file = "aiohttp-3.9.5-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:0cbf56238f4bbf49dab8c2dc2e6b1b68502b1e88d335bea59b3f5b9f4c001475"},
+    {file = "aiohttp-3.9.5-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:d1469f228cd9ffddd396d9948b8c9cd8022b6d1bf1e40c6f25b0fb90b4f893ed"},
+    {file = "aiohttp-3.9.5-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:45731330e754f5811c314901cebdf19dd776a44b31927fa4b4dbecab9e457b0c"},
+    {file = "aiohttp-3.9.5-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:3fcb4046d2904378e3aeea1df51f697b0467f2aac55d232c87ba162709478c46"},
+    {file = "aiohttp-3.9.5-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:8cf142aa6c1a751fcb364158fd710b8a9be874b81889c2bd13aa8893197455e2"},
+    {file = "aiohttp-3.9.5-cp39-cp39-win32.whl", hash = "sha256:7b179eea70833c8dee51ec42f3b4097bd6370892fa93f510f76762105568cf09"},
+    {file = "aiohttp-3.9.5-cp39-cp39-win_amd64.whl", hash = "sha256:38d80498e2e169bc61418ff36170e0aad0cd268da8b38a17c4cf29d254a8b3f1"},
+    {file = "aiohttp-3.9.5.tar.gz", hash = "sha256:edea7d15772ceeb29db4aff55e482d4bcfb6ae160ce144f2682de02f6d693551"},
+]
+
+[package.dependencies]
+aiosignal = ">=1.1.2"
+async-timeout = {version = ">=4.0,<5.0", markers = "python_version < \"3.11\""}
+attrs = ">=17.3.0"
+frozenlist = ">=1.1.1"
+multidict = ">=4.5,<7.0"
+yarl = ">=1.0,<2.0"
+
+[package.extras]
+speedups = ["Brotli", "aiodns", "brotlicffi"]
+
+[[package]]
+name = "aiosignal"
+version = "1.3.1"
+description = "aiosignal: a list of registered asynchronous callbacks"
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "aiosignal-1.3.1-py3-none-any.whl", hash = "sha256:f8376fb07dd1e86a584e4fcdec80b36b7f81aac666ebc724e2c090300dd83b17"},
+    {file = "aiosignal-1.3.1.tar.gz", hash = "sha256:54cd96e15e1649b75d6c87526a6ff0b6c1b0dd3459f43d9ca11d48c339b68cfc"},
+]
+
+[package.dependencies]
+frozenlist = ">=1.1.0"
+
 [[package]]
 name = "anyio"
-version = "3.7.1"
+version = "4.3.0"
 description = "High level compatibility layer for multiple asynchronous event loop implementations"
 optional = false
-python-versions = ">=3.7"
+python-versions = ">=3.8"
 files = [
-    {file = "anyio-3.7.1-py3-none-any.whl", hash = "sha256:91dee416e570e92c64041bd18b900d1d6fa78dff7048769ce5ac5ddad004fbb5"},
-    {file = "anyio-3.7.1.tar.gz", hash = "sha256:44a3c9aba0f5defa43261a8b3efb97891f2bd7d804e0e1f56419befa1adfc780"},
+    {file = "anyio-4.3.0-py3-none-any.whl", hash = "sha256:048e05d0f6caeed70d731f3db756d35dcc1f35747c8c403364a8332c630441b8"},
+    {file = "anyio-4.3.0.tar.gz", hash = "sha256:f75253795a87df48568485fd18cdd2a3fa5c4f7c5be8e5e36637733fce06fed6"},
 ]
 
 [package.dependencies]
-exceptiongroup = {version = "*", markers = "python_version < \"3.11\""}
+exceptiongroup = {version = ">=1.0.2", markers = "python_version < \"3.11\""}
 idna = ">=2.8"
 sniffio = ">=1.1"
-typing-extensions = {version = "*", markers = "python_version < \"3.8\""}
+typing-extensions = {version = ">=4.1", markers = "python_version < \"3.11\""}
 
 [package.extras]
-doc = ["Sphinx", "packaging", "sphinx-autodoc-typehints (>=1.2.0)", "sphinx-rtd-theme (>=1.2.2)", "sphinxcontrib-jquery"]
-test = ["anyio[trio]", "coverage[toml] (>=4.5)", "hypothesis (>=4.0)", "mock (>=4)", "psutil (>=5.9)", "pytest (>=7.0)", "pytest-mock (>=3.6.1)", "trustme", "uvloop (>=0.17)"]
-trio = ["trio (<0.22)"]
+doc = ["Sphinx (>=7)", "packaging", "sphinx-autodoc-typehints (>=1.2.0)", "sphinx-rtd-theme"]
+test = ["anyio[trio]", "coverage[toml] (>=7)", "exceptiongroup (>=1.2.0)", "hypothesis (>=4.0)", "psutil (>=5.9)", "pytest (>=7.0)", "pytest-mock (>=3.6.1)", "trustme", "uvloop (>=0.17)"]
+trio = ["trio (>=0.23)"]
 
 [[package]]
 name = "aptos-sdk"
-version = "0.5.1"
-description = ""
+version = "0.8.6"
+description = "Aptos SDK"
 optional = false
-python-versions = ">=3.7"
+python-versions = ">=3.8.1"
 files = [
-    {file = "aptos_sdk-0.5.1.tar.gz", hash = "sha256:3711ad2bf1120fff463cd5f494162c4658f03dd6bfbf1f523ee9aea01a4cb0f0"},
+    {file = "aptos_sdk-0.8.6-py3-none-any.whl", hash = "sha256:94818c54ac18b5eb631e744edfb5dcf721b8fdf28aa8b471814bcab3c6f6f7a5"},
+    {file = "aptos_sdk-0.8.6.tar.gz", hash = "sha256:57fe71d966903b096933b905c94f0c835e57ca0781c098e38b637bf861c4470c"},
 ]
 
 [package.dependencies]
-httpx = ">=0.23.0,<0.24.0"
-mypy = ">=0.982,<0.983"
+ecdsa = "0.18.0"
+httpx = ">=0.27.0,<0.28.0"
 PyNaCl = ">=1.5.0,<2.0.0"
+python-graphql-client = ">=0.4.3,<0.5.0"
+tomli = ">=2.0.1,<3.0.0"
+typing-extensions = ">=4.4.0,<5.0.0"
+
+[[package]]
+name = "async-timeout"
+version = "4.0.3"
+description = "Timeout context manager for asyncio programs"
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "async-timeout-4.0.3.tar.gz", hash = "sha256:4640d96be84d82d02ed59ea2b7105a0f7b33abe8703703cd0ab0bf87c427522f"},
+    {file = "async_timeout-4.0.3-py3-none-any.whl", hash = "sha256:7405140ff1230c310e51dc27b3145b9092d659ce68ff733fb0cefe3ee42be028"},
+]
+
+[[package]]
+name = "attrs"
+version = "23.2.0"
+description = "Classes Without Boilerplate"
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "attrs-23.2.0-py3-none-any.whl", hash = "sha256:99b87a485a5820b23b879f04c2305b44b951b502fd64be915879d77a7e8fc6f1"},
+    {file = "attrs-23.2.0.tar.gz", hash = "sha256:935dc3b529c262f6cf76e50877d35a4bd3c1de194fd41f47a2b7ae8f19971f30"},
+]
+
+[package.extras]
+cov = ["attrs[tests]", "coverage[toml] (>=5.3)"]
+dev = ["attrs[tests]", "pre-commit"]
+docs = ["furo", "myst-parser", "sphinx", "sphinx-notfound-page", "sphinxcontrib-towncrier", "towncrier", "zope-interface"]
+tests = ["attrs[tests-no-zope]", "zope-interface"]
+tests-mypy = ["mypy (>=1.6)", "pytest-mypy-plugins"]
+tests-no-zope = ["attrs[tests-mypy]", "cloudpickle", "hypothesis", "pympler", "pytest (>=4.3.0)", "pytest-xdist[psutil]"]
 
 [[package]]
 name = "black"
@@ -64,7 +208,6 @@ mypy-extensions = ">=0.4.3"
 pathspec = ">=0.9.0"
 platformdirs = ">=2"
 tomli = {version = ">=1.1.0", markers = "python_full_version < \"3.11.0a7\""}
-typed-ast = {version = ">=1.4.2", markers = "python_version < \"3.8\" and implementation_name == \"cpython\""}
 typing-extensions = {version = ">=3.10.0.0", markers = "python_version < \"3.10\""}
 
 [package.extras]
@@ -75,86 +218,74 @@ uvloop = ["uvloop (>=0.15.2)"]
 
 [[package]]
 name = "certifi"
-version = "2023.11.17"
+version = "2024.2.2"
 description = "Python package for providing Mozilla's CA Bundle."
 optional = false
 python-versions = ">=3.6"
 files = [
-    {file = "certifi-2023.11.17-py3-none-any.whl", hash = "sha256:e036ab49d5b79556f99cfc2d9320b34cfbe5be05c5871b51de9329f0603b0474"},
-    {file = "certifi-2023.11.17.tar.gz", hash = "sha256:9b469f3a900bf28dc19b8cfbf8019bf47f7fdd1a65a1d4ffb98fc14166beb4d1"},
+    {file = "certifi-2024.2.2-py3-none-any.whl", hash = "sha256:dc383c07b76109f368f6106eee2b593b04a011ea4d55f652c6ca24a754d1cdd1"},
+    {file = "certifi-2024.2.2.tar.gz", hash = "sha256:0569859f95fc761b18b45ef421b1290a0f65f147e92a1e5eb3e635f9a5e4e66f"},
 ]
 
 [[package]]
 name = "cffi"
-version = "1.15.1"
+version = "1.16.0"
 description = "Foreign Function Interface for Python calling C code."
 optional = false
-python-versions = "*"
+python-versions = ">=3.8"
 files = [
-    {file = "cffi-1.15.1-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:a66d3508133af6e8548451b25058d5812812ec3798c886bf38ed24a98216fab2"},
-    {file = "cffi-1.15.1-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:470c103ae716238bbe698d67ad020e1db9d9dba34fa5a899b5e21577e6d52ed2"},
-    {file = "cffi-1.15.1-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:9ad5db27f9cabae298d151c85cf2bad1d359a1b9c686a275df03385758e2f914"},
-    {file = "cffi-1.15.1-cp27-cp27m-win32.whl", hash = "sha256:b3bbeb01c2b273cca1e1e0c5df57f12dce9a4dd331b4fa1635b8bec26350bde3"},
-    {file = "cffi-1.15.1-cp27-cp27m-win_amd64.whl", hash = "sha256:e00b098126fd45523dd056d2efba6c5a63b71ffe9f2bbe1a4fe1716e1d0c331e"},
-    {file = "cffi-1.15.1-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:d61f4695e6c866a23a21acab0509af1cdfd2c013cf256bbf5b6b5e2695827162"},
-    {file = "cffi-1.15.1-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:ed9cb427ba5504c1dc15ede7d516b84757c3e3d7868ccc85121d9310d27eed0b"},
-    {file = "cffi-1.15.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:39d39875251ca8f612b6f33e6b1195af86d1b3e60086068be9cc053aa4376e21"},
-    {file = "cffi-1.15.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:285d29981935eb726a4399badae8f0ffdff4f5050eaa6d0cfc3f64b857b77185"},
-    {file = "cffi-1.15.1-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3eb6971dcff08619f8d91607cfc726518b6fa2a9eba42856be181c6d0d9515fd"},
-    {file = "cffi-1.15.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:21157295583fe8943475029ed5abdcf71eb3911894724e360acff1d61c1d54bc"},
-    {file = "cffi-1.15.1-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5635bd9cb9731e6d4a1132a498dd34f764034a8ce60cef4f5319c0541159392f"},
-    {file = "cffi-1.15.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2012c72d854c2d03e45d06ae57f40d78e5770d252f195b93f581acf3ba44496e"},
-    {file = "cffi-1.15.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dd86c085fae2efd48ac91dd7ccffcfc0571387fe1193d33b6394db7ef31fe2a4"},
-    {file = "cffi-1.15.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:fa6693661a4c91757f4412306191b6dc88c1703f780c8234035eac011922bc01"},
-    {file = "cffi-1.15.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:59c0b02d0a6c384d453fece7566d1c7e6b7bae4fc5874ef2ef46d56776d61c9e"},
-    {file = "cffi-1.15.1-cp310-cp310-win32.whl", hash = "sha256:cba9d6b9a7d64d4bd46167096fc9d2f835e25d7e4c121fb2ddfc6528fb0413b2"},
-    {file = "cffi-1.15.1-cp310-cp310-win_amd64.whl", hash = "sha256:ce4bcc037df4fc5e3d184794f27bdaab018943698f4ca31630bc7f84a7b69c6d"},
-    {file = "cffi-1.15.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:3d08afd128ddaa624a48cf2b859afef385b720bb4b43df214f85616922e6a5ac"},
-    {file = "cffi-1.15.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:3799aecf2e17cf585d977b780ce79ff0dc9b78d799fc694221ce814c2c19db83"},
-    {file = "cffi-1.15.1-cp311-cp311-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a591fe9e525846e4d154205572a029f653ada1a78b93697f3b5a8f1f2bc055b9"},
-    {file = "cffi-1.15.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3548db281cd7d2561c9ad9984681c95f7b0e38881201e157833a2342c30d5e8c"},
-    {file = "cffi-1.15.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:91fc98adde3d7881af9b59ed0294046f3806221863722ba7d8d120c575314325"},
-    {file = "cffi-1.15.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:94411f22c3985acaec6f83c6df553f2dbe17b698cc7f8ae751ff2237d96b9e3c"},
-    {file = "cffi-1.15.1-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:03425bdae262c76aad70202debd780501fabeaca237cdfddc008987c0e0f59ef"},
-    {file = "cffi-1.15.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:cc4d65aeeaa04136a12677d3dd0b1c0c94dc43abac5860ab33cceb42b801c1e8"},
-    {file = "cffi-1.15.1-cp311-cp311-win32.whl", hash = "sha256:a0f100c8912c114ff53e1202d0078b425bee3649ae34d7b070e9697f93c5d52d"},
-    {file = "cffi-1.15.1-cp311-cp311-win_amd64.whl", hash = "sha256:04ed324bda3cda42b9b695d51bb7d54b680b9719cfab04227cdd1e04e5de3104"},
-    {file = "cffi-1.15.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:50a74364d85fd319352182ef59c5c790484a336f6db772c1a9231f1c3ed0cbd7"},
-    {file = "cffi-1.15.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e263d77ee3dd201c3a142934a086a4450861778baaeeb45db4591ef65550b0a6"},
-    {file = "cffi-1.15.1-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:cec7d9412a9102bdc577382c3929b337320c4c4c4849f2c5cdd14d7368c5562d"},
-    {file = "cffi-1.15.1-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:4289fc34b2f5316fbb762d75362931e351941fa95fa18789191b33fc4cf9504a"},
-    {file = "cffi-1.15.1-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:173379135477dc8cac4bc58f45db08ab45d228b3363adb7af79436135d028405"},
-    {file = "cffi-1.15.1-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:6975a3fac6bc83c4a65c9f9fcab9e47019a11d3d2cf7f3c0d03431bf145a941e"},
-    {file = "cffi-1.15.1-cp36-cp36m-win32.whl", hash = "sha256:2470043b93ff09bf8fb1d46d1cb756ce6132c54826661a32d4e4d132e1977adf"},
-    {file = "cffi-1.15.1-cp36-cp36m-win_amd64.whl", hash = "sha256:30d78fbc8ebf9c92c9b7823ee18eb92f2e6ef79b45ac84db507f52fbe3ec4497"},
-    {file = "cffi-1.15.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:198caafb44239b60e252492445da556afafc7d1e3ab7a1fb3f0584ef6d742375"},
-    {file = "cffi-1.15.1-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5ef34d190326c3b1f822a5b7a45f6c4535e2f47ed06fec77d3d799c450b2651e"},
-    {file = "cffi-1.15.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8102eaf27e1e448db915d08afa8b41d6c7ca7a04b7d73af6514df10a3e74bd82"},
-    {file = "cffi-1.15.1-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5df2768244d19ab7f60546d0c7c63ce1581f7af8b5de3eb3004b9b6fc8a9f84b"},
-    {file = "cffi-1.15.1-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a8c4917bd7ad33e8eb21e9a5bbba979b49d9a97acb3a803092cbc1133e20343c"},
-    {file = "cffi-1.15.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0e2642fe3142e4cc4af0799748233ad6da94c62a8bec3a6648bf8ee68b1c7426"},
-    {file = "cffi-1.15.1-cp37-cp37m-win32.whl", hash = "sha256:e229a521186c75c8ad9490854fd8bbdd9a0c9aa3a524326b55be83b54d4e0ad9"},
-    {file = "cffi-1.15.1-cp37-cp37m-win_amd64.whl", hash = "sha256:a0b71b1b8fbf2b96e41c4d990244165e2c9be83d54962a9a1d118fd8657d2045"},
-    {file = "cffi-1.15.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:320dab6e7cb2eacdf0e658569d2575c4dad258c0fcc794f46215e1e39f90f2c3"},
-    {file = "cffi-1.15.1-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1e74c6b51a9ed6589199c787bf5f9875612ca4a8a0785fb2d4a84429badaf22a"},
-    {file = "cffi-1.15.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a5c84c68147988265e60416b57fc83425a78058853509c1b0629c180094904a5"},
-    {file = "cffi-1.15.1-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3b926aa83d1edb5aa5b427b4053dc420ec295a08e40911296b9eb1b6170f6cca"},
-    {file = "cffi-1.15.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:87c450779d0914f2861b8526e035c5e6da0a3199d8f1add1a665e1cbc6fc6d02"},
-    {file = "cffi-1.15.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4f2c9f67e9821cad2e5f480bc8d83b8742896f1242dba247911072d4fa94c192"},
-    {file = "cffi-1.15.1-cp38-cp38-win32.whl", hash = "sha256:8b7ee99e510d7b66cdb6c593f21c043c248537a32e0bedf02e01e9553a172314"},
-    {file = "cffi-1.15.1-cp38-cp38-win_amd64.whl", hash = "sha256:00a9ed42e88df81ffae7a8ab6d9356b371399b91dbdf0c3cb1e84c03a13aceb5"},
-    {file = "cffi-1.15.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:54a2db7b78338edd780e7ef7f9f6c442500fb0d41a5a4ea24fff1c929d5af585"},
-    {file = "cffi-1.15.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:fcd131dd944808b5bdb38e6f5b53013c5aa4f334c5cad0c72742f6eba4b73db0"},
-    {file = "cffi-1.15.1-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7473e861101c9e72452f9bf8acb984947aa1661a7704553a9f6e4baa5ba64415"},
-    {file = "cffi-1.15.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6c9a799e985904922a4d207a94eae35c78ebae90e128f0c4e521ce339396be9d"},
-    {file = "cffi-1.15.1-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3bcde07039e586f91b45c88f8583ea7cf7a0770df3a1649627bf598332cb6984"},
-    {file = "cffi-1.15.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:33ab79603146aace82c2427da5ca6e58f2b3f2fb5da893ceac0c42218a40be35"},
-    {file = "cffi-1.15.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5d598b938678ebf3c67377cdd45e09d431369c3b1a5b331058c338e201f12b27"},
-    {file = "cffi-1.15.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:db0fbb9c62743ce59a9ff687eb5f4afbe77e5e8403d6697f7446e5f609976f76"},
-    {file = "cffi-1.15.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:98d85c6a2bef81588d9227dde12db8a7f47f639f4a17c9ae08e773aa9c697bf3"},
-    {file = "cffi-1.15.1-cp39-cp39-win32.whl", hash = "sha256:40f4774f5a9d4f5e344f31a32b5096977b5d48560c5592e2f3d2c4374bd543ee"},
-    {file = "cffi-1.15.1-cp39-cp39-win_amd64.whl", hash = "sha256:70df4e3b545a17496c9b3f41f5115e69a4f2e77e94e1d2a8e1070bc0c38c8a3c"},
-    {file = "cffi-1.15.1.tar.gz", hash = "sha256:d400bfb9a37b1351253cb402671cea7e89bdecc294e8016a707f6d1d8ac934f9"},
+    {file = "cffi-1.16.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:6b3d6606d369fc1da4fd8c357d026317fbb9c9b75d36dc16e90e84c26854b088"},
+    {file = "cffi-1.16.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:ac0f5edd2360eea2f1daa9e26a41db02dd4b0451b48f7c318e217ee092a213e9"},
+    {file = "cffi-1.16.0-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7e61e3e4fa664a8588aa25c883eab612a188c725755afff6289454d6362b9673"},
+    {file = "cffi-1.16.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a72e8961a86d19bdb45851d8f1f08b041ea37d2bd8d4fd19903bc3083d80c896"},
+    {file = "cffi-1.16.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5b50bf3f55561dac5438f8e70bfcdfd74543fd60df5fa5f62d94e5867deca684"},
+    {file = "cffi-1.16.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:7651c50c8c5ef7bdb41108b7b8c5a83013bfaa8a935590c5d74627c047a583c7"},
+    {file = "cffi-1.16.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e4108df7fe9b707191e55f33efbcb2d81928e10cea45527879a4749cbe472614"},
+    {file = "cffi-1.16.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:32c68ef735dbe5857c810328cb2481e24722a59a2003018885514d4c09af9743"},
+    {file = "cffi-1.16.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:673739cb539f8cdaa07d92d02efa93c9ccf87e345b9a0b556e3ecc666718468d"},
+    {file = "cffi-1.16.0-cp310-cp310-win32.whl", hash = "sha256:9f90389693731ff1f659e55c7d1640e2ec43ff725cc61b04b2f9c6d8d017df6a"},
+    {file = "cffi-1.16.0-cp310-cp310-win_amd64.whl", hash = "sha256:e6024675e67af929088fda399b2094574609396b1decb609c55fa58b028a32a1"},
+    {file = "cffi-1.16.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:b84834d0cf97e7d27dd5b7f3aca7b6e9263c56308ab9dc8aae9784abb774d404"},
+    {file = "cffi-1.16.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:1b8ebc27c014c59692bb2664c7d13ce7a6e9a629be20e54e7271fa696ff2b417"},
+    {file = "cffi-1.16.0-cp311-cp311-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ee07e47c12890ef248766a6e55bd38ebfb2bb8edd4142d56db91b21ea68b7627"},
+    {file = "cffi-1.16.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d8a9d3ebe49f084ad71f9269834ceccbf398253c9fac910c4fd7053ff1386936"},
+    {file = "cffi-1.16.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e70f54f1796669ef691ca07d046cd81a29cb4deb1e5f942003f401c0c4a2695d"},
+    {file = "cffi-1.16.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:5bf44d66cdf9e893637896c7faa22298baebcd18d1ddb6d2626a6e39793a1d56"},
+    {file = "cffi-1.16.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7b78010e7b97fef4bee1e896df8a4bbb6712b7f05b7ef630f9d1da00f6444d2e"},
+    {file = "cffi-1.16.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:c6a164aa47843fb1b01e941d385aab7215563bb8816d80ff3a363a9f8448a8dc"},
+    {file = "cffi-1.16.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:e09f3ff613345df5e8c3667da1d918f9149bd623cd9070c983c013792a9a62eb"},
+    {file = "cffi-1.16.0-cp311-cp311-win32.whl", hash = "sha256:2c56b361916f390cd758a57f2e16233eb4f64bcbeee88a4881ea90fca14dc6ab"},
+    {file = "cffi-1.16.0-cp311-cp311-win_amd64.whl", hash = "sha256:db8e577c19c0fda0beb7e0d4e09e0ba74b1e4c092e0e40bfa12fe05b6f6d75ba"},
+    {file = "cffi-1.16.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:fa3a0128b152627161ce47201262d3140edb5a5c3da88d73a1b790a959126956"},
+    {file = "cffi-1.16.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:68e7c44931cc171c54ccb702482e9fc723192e88d25a0e133edd7aff8fcd1f6e"},
+    {file = "cffi-1.16.0-cp312-cp312-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:abd808f9c129ba2beda4cfc53bde801e5bcf9d6e0f22f095e45327c038bfe68e"},
+    {file = "cffi-1.16.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:88e2b3c14bdb32e440be531ade29d3c50a1a59cd4e51b1dd8b0865c54ea5d2e2"},
+    {file = "cffi-1.16.0-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:fcc8eb6d5902bb1cf6dc4f187ee3ea80a1eba0a89aba40a5cb20a5087d961357"},
+    {file = "cffi-1.16.0-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b7be2d771cdba2942e13215c4e340bfd76398e9227ad10402a8767ab1865d2e6"},
+    {file = "cffi-1.16.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e715596e683d2ce000574bae5d07bd522c781a822866c20495e52520564f0969"},
+    {file = "cffi-1.16.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:2d92b25dbf6cae33f65005baf472d2c245c050b1ce709cc4588cdcdd5495b520"},
+    {file = "cffi-1.16.0-cp312-cp312-win32.whl", hash = "sha256:b2ca4e77f9f47c55c194982e10f058db063937845bb2b7a86c84a6cfe0aefa8b"},
+    {file = "cffi-1.16.0-cp312-cp312-win_amd64.whl", hash = "sha256:68678abf380b42ce21a5f2abde8efee05c114c2fdb2e9eef2efdb0257fba1235"},
+    {file = "cffi-1.16.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0c9ef6ff37e974b73c25eecc13952c55bceed9112be2d9d938ded8e856138bcc"},
+    {file = "cffi-1.16.0-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a09582f178759ee8128d9270cd1344154fd473bb77d94ce0aeb2a93ebf0feaf0"},
+    {file = "cffi-1.16.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e760191dd42581e023a68b758769e2da259b5d52e3103c6060ddc02c9edb8d7b"},
+    {file = "cffi-1.16.0-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:80876338e19c951fdfed6198e70bc88f1c9758b94578d5a7c4c91a87af3cf31c"},
+    {file = "cffi-1.16.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a6a14b17d7e17fa0d207ac08642c8820f84f25ce17a442fd15e27ea18d67c59b"},
+    {file = "cffi-1.16.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6602bc8dc6f3a9e02b6c22c4fc1e47aa50f8f8e6d3f78a5e16ac33ef5fefa324"},
+    {file = "cffi-1.16.0-cp38-cp38-win32.whl", hash = "sha256:131fd094d1065b19540c3d72594260f118b231090295d8c34e19a7bbcf2e860a"},
+    {file = "cffi-1.16.0-cp38-cp38-win_amd64.whl", hash = "sha256:31d13b0f99e0836b7ff893d37af07366ebc90b678b6664c955b54561fc36ef36"},
+    {file = "cffi-1.16.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:582215a0e9adbe0e379761260553ba11c58943e4bbe9c36430c4ca6ac74b15ed"},
+    {file = "cffi-1.16.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:b29ebffcf550f9da55bec9e02ad430c992a87e5f512cd63388abb76f1036d8d2"},
+    {file = "cffi-1.16.0-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:dc9b18bf40cc75f66f40a7379f6a9513244fe33c0e8aa72e2d56b0196a7ef872"},
+    {file = "cffi-1.16.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9cb4a35b3642fc5c005a6755a5d17c6c8b6bcb6981baf81cea8bfbc8903e8ba8"},
+    {file = "cffi-1.16.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b86851a328eedc692acf81fb05444bdf1891747c25af7529e39ddafaf68a4f3f"},
+    {file = "cffi-1.16.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c0f31130ebc2d37cdd8e44605fb5fa7ad59049298b3f745c74fa74c62fbfcfc4"},
+    {file = "cffi-1.16.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8f8e709127c6c77446a8c0a8c8bf3c8ee706a06cd44b1e827c3e6a2ee6b8c098"},
+    {file = "cffi-1.16.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:748dcd1e3d3d7cd5443ef03ce8685043294ad6bd7c02a38d1bd367cfd968e000"},
+    {file = "cffi-1.16.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:8895613bcc094d4a1b2dbe179d88d7fb4a15cee43c052e8885783fac397d91fe"},
+    {file = "cffi-1.16.0-cp39-cp39-win32.whl", hash = "sha256:ed86a35631f7bfbb28e108dd96773b9d5a6ce4811cf6ea468bb6a359b256b1e4"},
+    {file = "cffi-1.16.0-cp39-cp39-win_amd64.whl", hash = "sha256:3686dffb02459559c74dd3d81748269ffb0eb027c39a6fc99502de37d501faa8"},
+    {file = "cffi-1.16.0.tar.gz", hash = "sha256:bcb3ef43e58665bbda2fb198698fcae6776483e0c4a631aa5647806c25e02cc0"},
 ]
 
 [package.dependencies]
@@ -272,7 +403,6 @@ files = [
 
 [package.dependencies]
 colorama = {version = "*", markers = "platform_system == \"Windows\""}
-importlib-metadata = {version = "*", markers = "python_version < \"3.8\""}
 
 [[package]]
 name = "colorama"
@@ -285,20 +415,124 @@ files = [
     {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"},
 ]
 
+[[package]]
+name = "ecdsa"
+version = "0.18.0"
+description = "ECDSA cryptographic signature library (pure python)"
+optional = false
+python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*"
+files = [
+    {file = "ecdsa-0.18.0-py2.py3-none-any.whl", hash = "sha256:80600258e7ed2f16b9aa1d7c295bd70194109ad5a30fdee0eaeefef1d4c559dd"},
+    {file = "ecdsa-0.18.0.tar.gz", hash = "sha256:190348041559e21b22a1d65cee485282ca11a6f81d503fddb84d5017e9ed1e49"},
+]
+
+[package.dependencies]
+six = ">=1.9.0"
+
+[package.extras]
+gmpy = ["gmpy"]
+gmpy2 = ["gmpy2"]
+
 [[package]]
 name = "exceptiongroup"
-version = "1.2.0"
+version = "1.2.1"
 description = "Backport of PEP 654 (exception groups)"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "exceptiongroup-1.2.0-py3-none-any.whl", hash = "sha256:4bfd3996ac73b41e9b9628b04e079f193850720ea5945fc96a08633c66912f14"},
-    {file = "exceptiongroup-1.2.0.tar.gz", hash = "sha256:91f5c769735f051a4290d52edd0858999b57e5876e9f85937691bd4c9fa3ed68"},
+    {file = "exceptiongroup-1.2.1-py3-none-any.whl", hash = "sha256:5258b9ed329c5bbdd31a309f53cbfb0b155341807f6ff7606a1e801a891b29ad"},
+    {file = "exceptiongroup-1.2.1.tar.gz", hash = "sha256:a4785e48b045528f5bfe627b6ad554ff32def154f42372786903b7abcfe1aa16"},
 ]
 
 [package.extras]
 test = ["pytest (>=6)"]
 
+[[package]]
+name = "frozenlist"
+version = "1.4.1"
+description = "A list-like structure which implements collections.abc.MutableSequence"
+optional = false
+python-versions = ">=3.8"
+files = [
+    {file = "frozenlist-1.4.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:f9aa1878d1083b276b0196f2dfbe00c9b7e752475ed3b682025ff20c1c1f51ac"},
+    {file = "frozenlist-1.4.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:29acab3f66f0f24674b7dc4736477bcd4bc3ad4b896f5f45379a67bce8b96868"},
+    {file = "frozenlist-1.4.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:74fb4bee6880b529a0c6560885fce4dc95936920f9f20f53d99a213f7bf66776"},
+    {file = "frozenlist-1.4.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:590344787a90ae57d62511dd7c736ed56b428f04cd8c161fcc5e7232c130c69a"},
+    {file = "frozenlist-1.4.1-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:068b63f23b17df8569b7fdca5517edef76171cf3897eb68beb01341131fbd2ad"},
+    {file = "frozenlist-1.4.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:5c849d495bf5154cd8da18a9eb15db127d4dba2968d88831aff6f0331ea9bd4c"},
+    {file = "frozenlist-1.4.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9750cc7fe1ae3b1611bb8cfc3f9ec11d532244235d75901fb6b8e42ce9229dfe"},
+    {file = "frozenlist-1.4.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a9b2de4cf0cdd5bd2dee4c4f63a653c61d2408055ab77b151c1957f221cabf2a"},
+    {file = "frozenlist-1.4.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:0633c8d5337cb5c77acbccc6357ac49a1770b8c487e5b3505c57b949b4b82e98"},
+    {file = "frozenlist-1.4.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:27657df69e8801be6c3638054e202a135c7f299267f1a55ed3a598934f6c0d75"},
+    {file = "frozenlist-1.4.1-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:f9a3ea26252bd92f570600098783d1371354d89d5f6b7dfd87359d669f2109b5"},
+    {file = "frozenlist-1.4.1-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:4f57dab5fe3407b6c0c1cc907ac98e8a189f9e418f3b6e54d65a718aaafe3950"},
+    {file = "frozenlist-1.4.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:e02a0e11cf6597299b9f3bbd3f93d79217cb90cfd1411aec33848b13f5c656cc"},
+    {file = "frozenlist-1.4.1-cp310-cp310-win32.whl", hash = "sha256:a828c57f00f729620a442881cc60e57cfcec6842ba38e1b19fd3e47ac0ff8dc1"},
+    {file = "frozenlist-1.4.1-cp310-cp310-win_amd64.whl", hash = "sha256:f56e2333dda1fe0f909e7cc59f021eba0d2307bc6f012a1ccf2beca6ba362439"},
+    {file = "frozenlist-1.4.1-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:a0cb6f11204443f27a1628b0e460f37fb30f624be6051d490fa7d7e26d4af3d0"},
+    {file = "frozenlist-1.4.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:b46c8ae3a8f1f41a0d2ef350c0b6e65822d80772fe46b653ab6b6274f61d4a49"},
+    {file = "frozenlist-1.4.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:fde5bd59ab5357e3853313127f4d3565fc7dad314a74d7b5d43c22c6a5ed2ced"},
+    {file = "frozenlist-1.4.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:722e1124aec435320ae01ee3ac7bec11a5d47f25d0ed6328f2273d287bc3abb0"},
+    {file = "frozenlist-1.4.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:2471c201b70d58a0f0c1f91261542a03d9a5e088ed3dc6c160d614c01649c106"},
+    {file = "frozenlist-1.4.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c757a9dd70d72b076d6f68efdbb9bc943665ae954dad2801b874c8c69e185068"},
+    {file = "frozenlist-1.4.1-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f146e0911cb2f1da549fc58fc7bcd2b836a44b79ef871980d605ec392ff6b0d2"},
+    {file = "frozenlist-1.4.1-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4f9c515e7914626b2a2e1e311794b4c35720a0be87af52b79ff8e1429fc25f19"},
+    {file = "frozenlist-1.4.1-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:c302220494f5c1ebeb0912ea782bcd5e2f8308037b3c7553fad0e48ebad6ad82"},
+    {file = "frozenlist-1.4.1-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:442acde1e068288a4ba7acfe05f5f343e19fac87bfc96d89eb886b0363e977ec"},
+    {file = "frozenlist-1.4.1-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:1b280e6507ea8a4fa0c0a7150b4e526a8d113989e28eaaef946cc77ffd7efc0a"},
+    {file = "frozenlist-1.4.1-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:fe1a06da377e3a1062ae5fe0926e12b84eceb8a50b350ddca72dc85015873f74"},
+    {file = "frozenlist-1.4.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:db9e724bebd621d9beca794f2a4ff1d26eed5965b004a97f1f1685a173b869c2"},
+    {file = "frozenlist-1.4.1-cp311-cp311-win32.whl", hash = "sha256:e774d53b1a477a67838a904131c4b0eef6b3d8a651f8b138b04f748fccfefe17"},
+    {file = "frozenlist-1.4.1-cp311-cp311-win_amd64.whl", hash = "sha256:fb3c2db03683b5767dedb5769b8a40ebb47d6f7f45b1b3e3b4b51ec8ad9d9825"},
+    {file = "frozenlist-1.4.1-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:1979bc0aeb89b33b588c51c54ab0161791149f2461ea7c7c946d95d5f93b56ae"},
+    {file = "frozenlist-1.4.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:cc7b01b3754ea68a62bd77ce6020afaffb44a590c2289089289363472d13aedb"},
+    {file = "frozenlist-1.4.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:c9c92be9fd329ac801cc420e08452b70e7aeab94ea4233a4804f0915c14eba9b"},
+    {file = "frozenlist-1.4.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5c3894db91f5a489fc8fa6a9991820f368f0b3cbdb9cd8849547ccfab3392d86"},
+    {file = "frozenlist-1.4.1-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ba60bb19387e13597fb059f32cd4d59445d7b18b69a745b8f8e5db0346f33480"},
+    {file = "frozenlist-1.4.1-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:8aefbba5f69d42246543407ed2461db31006b0f76c4e32dfd6f42215a2c41d09"},
+    {file = "frozenlist-1.4.1-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:780d3a35680ced9ce682fbcf4cb9c2bad3136eeff760ab33707b71db84664e3a"},
+    {file = "frozenlist-1.4.1-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9acbb16f06fe7f52f441bb6f413ebae6c37baa6ef9edd49cdd567216da8600cd"},
+    {file = "frozenlist-1.4.1-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:23b701e65c7b36e4bf15546a89279bd4d8675faabc287d06bbcfac7d3c33e1e6"},
+    {file = "frozenlist-1.4.1-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:3e0153a805a98f5ada7e09826255ba99fb4f7524bb81bf6b47fb702666484ae1"},
+    {file = "frozenlist-1.4.1-cp312-cp312-musllinux_1_1_ppc64le.whl", hash = "sha256:dd9b1baec094d91bf36ec729445f7769d0d0cf6b64d04d86e45baf89e2b9059b"},
+    {file = "frozenlist-1.4.1-cp312-cp312-musllinux_1_1_s390x.whl", hash = "sha256:1a4471094e146b6790f61b98616ab8e44f72661879cc63fa1049d13ef711e71e"},
+    {file = "frozenlist-1.4.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:5667ed53d68d91920defdf4035d1cdaa3c3121dc0b113255124bcfada1cfa1b8"},
+    {file = "frozenlist-1.4.1-cp312-cp312-win32.whl", hash = "sha256:beee944ae828747fd7cb216a70f120767fc9f4f00bacae8543c14a6831673f89"},
+    {file = "frozenlist-1.4.1-cp312-cp312-win_amd64.whl", hash = "sha256:64536573d0a2cb6e625cf309984e2d873979709f2cf22839bf2d61790b448ad5"},
+    {file = "frozenlist-1.4.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:20b51fa3f588ff2fe658663db52a41a4f7aa6c04f6201449c6c7c476bd255c0d"},
+    {file = "frozenlist-1.4.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:410478a0c562d1a5bcc2f7ea448359fcb050ed48b3c6f6f4f18c313a9bdb1826"},
+    {file = "frozenlist-1.4.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:c6321c9efe29975232da3bd0af0ad216800a47e93d763ce64f291917a381b8eb"},
+    {file = "frozenlist-1.4.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:48f6a4533887e189dae092f1cf981f2e3885175f7a0f33c91fb5b7b682b6bab6"},
+    {file = "frozenlist-1.4.1-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:6eb73fa5426ea69ee0e012fb59cdc76a15b1283d6e32e4f8dc4482ec67d1194d"},
+    {file = "frozenlist-1.4.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:fbeb989b5cc29e8daf7f976b421c220f1b8c731cbf22b9130d8815418ea45887"},
+    {file = "frozenlist-1.4.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:32453c1de775c889eb4e22f1197fe3bdfe457d16476ea407472b9442e6295f7a"},
+    {file = "frozenlist-1.4.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:693945278a31f2086d9bf3df0fe8254bbeaef1fe71e1351c3bd730aa7d31c41b"},
+    {file = "frozenlist-1.4.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:1d0ce09d36d53bbbe566fe296965b23b961764c0bcf3ce2fa45f463745c04701"},
+    {file = "frozenlist-1.4.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:3a670dc61eb0d0eb7080890c13de3066790f9049b47b0de04007090807c776b0"},
+    {file = "frozenlist-1.4.1-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:dca69045298ce5c11fd539682cff879cc1e664c245d1c64da929813e54241d11"},
+    {file = "frozenlist-1.4.1-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:a06339f38e9ed3a64e4c4e43aec7f59084033647f908e4259d279a52d3757d09"},
+    {file = "frozenlist-1.4.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:b7f2f9f912dca3934c1baec2e4585a674ef16fe00218d833856408c48d5beee7"},
+    {file = "frozenlist-1.4.1-cp38-cp38-win32.whl", hash = "sha256:e7004be74cbb7d9f34553a5ce5fb08be14fb33bc86f332fb71cbe5216362a497"},
+    {file = "frozenlist-1.4.1-cp38-cp38-win_amd64.whl", hash = "sha256:5a7d70357e7cee13f470c7883a063aae5fe209a493c57d86eb7f5a6f910fae09"},
+    {file = "frozenlist-1.4.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:bfa4a17e17ce9abf47a74ae02f32d014c5e9404b6d9ac7f729e01562bbee601e"},
+    {file = "frozenlist-1.4.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:b7e3ed87d4138356775346e6845cccbe66cd9e207f3cd11d2f0b9fd13681359d"},
+    {file = "frozenlist-1.4.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:c99169d4ff810155ca50b4da3b075cbde79752443117d89429595c2e8e37fed8"},
+    {file = "frozenlist-1.4.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:edb678da49d9f72c9f6c609fbe41a5dfb9a9282f9e6a2253d5a91e0fc382d7c0"},
+    {file = "frozenlist-1.4.1-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:6db4667b187a6742b33afbbaf05a7bc551ffcf1ced0000a571aedbb4aa42fc7b"},
+    {file = "frozenlist-1.4.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:55fdc093b5a3cb41d420884cdaf37a1e74c3c37a31f46e66286d9145d2063bd0"},
+    {file = "frozenlist-1.4.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:82e8211d69a4f4bc360ea22cd6555f8e61a1bd211d1d5d39d3d228b48c83a897"},
+    {file = "frozenlist-1.4.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:89aa2c2eeb20957be2d950b85974b30a01a762f3308cd02bb15e1ad632e22dc7"},
+    {file = "frozenlist-1.4.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:9d3e0c25a2350080e9319724dede4f31f43a6c9779be48021a7f4ebde8b2d742"},
+    {file = "frozenlist-1.4.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:7268252af60904bf52c26173cbadc3a071cece75f873705419c8681f24d3edea"},
+    {file = "frozenlist-1.4.1-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:0c250a29735d4f15321007fb02865f0e6b6a41a6b88f1f523ca1596ab5f50bd5"},
+    {file = "frozenlist-1.4.1-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:96ec70beabbd3b10e8bfe52616a13561e58fe84c0101dd031dc78f250d5128b9"},
+    {file = "frozenlist-1.4.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:23b2d7679b73fe0e5a4560b672a39f98dfc6f60df63823b0a9970525325b95f6"},
+    {file = "frozenlist-1.4.1-cp39-cp39-win32.whl", hash = "sha256:a7496bfe1da7fb1a4e1cc23bb67c58fab69311cc7d32b5a99c2007b4b2a0e932"},
+    {file = "frozenlist-1.4.1-cp39-cp39-win_amd64.whl", hash = "sha256:e6a20a581f9ce92d389a8c7d7c3dd47c81fd5d6e655c8dddf341e14aa48659d0"},
+    {file = "frozenlist-1.4.1-py3-none-any.whl", hash = "sha256:04ced3e6a46b4cfffe20f9ae482818e34eba9b5fb0ce4056e4cc9b6e212d09b7"},
+    {file = "frozenlist-1.4.1.tar.gz", hash = "sha256:c037a86e8513059a2613aaba4d817bb90b9d9b6b69aace3ce9c877e8c8ed402b"},
+]
+
 [[package]]
 name = "h11"
 version = "0.14.0"
@@ -310,145 +544,175 @@ files = [
     {file = "h11-0.14.0.tar.gz", hash = "sha256:8f19fbbe99e72420ff35c00b27a34cb9937e902a8b810e2c88300c6f0a3b699d"},
 ]
 
-[package.dependencies]
-typing-extensions = {version = "*", markers = "python_version < \"3.8\""}
-
 [[package]]
 name = "httpcore"
-version = "0.16.3"
+version = "1.0.5"
 description = "A minimal low-level HTTP client."
 optional = false
-python-versions = ">=3.7"
+python-versions = ">=3.8"
 files = [
-    {file = "httpcore-0.16.3-py3-none-any.whl", hash = "sha256:da1fb708784a938aa084bde4feb8317056c55037247c787bd7e19eb2c2949dc0"},
-    {file = "httpcore-0.16.3.tar.gz", hash = "sha256:c5d6f04e2fc530f39e0c077e6a30caa53f1451096120f1f38b954afd0b17c0cb"},
+    {file = "httpcore-1.0.5-py3-none-any.whl", hash = "sha256:421f18bac248b25d310f3cacd198d55b8e6125c107797b609ff9b7a6ba7991b5"},
+    {file = "httpcore-1.0.5.tar.gz", hash = "sha256:34a38e2f9291467ee3b44e89dd52615370e152954ba21721378a87b2960f7a61"},
 ]
 
 [package.dependencies]
-anyio = ">=3.0,<5.0"
 certifi = "*"
 h11 = ">=0.13,<0.15"
-sniffio = "==1.*"
 
 [package.extras]
+asyncio = ["anyio (>=4.0,<5.0)"]
 http2 = ["h2 (>=3,<5)"]
 socks = ["socksio (==1.*)"]
+trio = ["trio (>=0.22.0,<0.26.0)"]
 
 [[package]]
 name = "httpx"
-version = "0.23.3"
+version = "0.27.0"
 description = "The next generation HTTP client."
 optional = false
-python-versions = ">=3.7"
+python-versions = ">=3.8"
 files = [
-    {file = "httpx-0.23.3-py3-none-any.whl", hash = "sha256:a211fcce9b1254ea24f0cd6af9869b3d29aba40154e947d2a07bb499b3e310d6"},
-    {file = "httpx-0.23.3.tar.gz", hash = "sha256:9818458eb565bb54898ccb9b8b251a28785dd4a55afbc23d0eb410754fe7d0f9"},
+    {file = "httpx-0.27.0-py3-none-any.whl", hash = "sha256:71d5465162c13681bff01ad59b2cc68dd838ea1f10e51574bac27103f00c91a5"},
+    {file = "httpx-0.27.0.tar.gz", hash = "sha256:a0cb88a46f32dc874e04ee956e4c2764aba2aa228f650b06788ba6bda2962ab5"},
 ]
 
 [package.dependencies]
+anyio = "*"
 certifi = "*"
-httpcore = ">=0.15.0,<0.17.0"
-rfc3986 = {version = ">=1.3,<2", extras = ["idna2008"]}
+httpcore = "==1.*"
+idna = "*"
 sniffio = "*"
 
 [package.extras]
 brotli = ["brotli", "brotlicffi"]
-cli = ["click (==8.*)", "pygments (==2.*)", "rich (>=10,<13)"]
+cli = ["click (==8.*)", "pygments (==2.*)", "rich (>=10,<14)"]
 http2 = ["h2 (>=3,<5)"]
 socks = ["socksio (==1.*)"]
 
 [[package]]
 name = "idna"
-version = "3.6"
+version = "3.7"
 description = "Internationalized Domain Names in Applications (IDNA)"
 optional = false
 python-versions = ">=3.5"
 files = [
-    {file = "idna-3.6-py3-none-any.whl", hash = "sha256:c05567e9c24a6b9faaa835c4821bad0590fbb9d5779e7caa6e1cc4978e7eb24f"},
-    {file = "idna-3.6.tar.gz", hash = "sha256:9ecdbbd083b06798ae1e86adcbfe8ab1479cf864e4ee30fe4e46a003d12491ca"},
+    {file = "idna-3.7-py3-none-any.whl", hash = "sha256:82fee1fc78add43492d3a1898bfa6d8a904cc97d8427f683ed8e798d07761aa0"},
+    {file = "idna-3.7.tar.gz", hash = "sha256:028ff3aadf0609c1fd278d8ea3089299412a7a8b9bd005dd08b9f8285bcb5cfc"},
 ]
 
-[[package]]
-name = "importlib-metadata"
-version = "6.7.0"
-description = "Read metadata from Python packages"
-optional = false
-python-versions = ">=3.7"
-files = [
-    {file = "importlib_metadata-6.7.0-py3-none-any.whl", hash = "sha256:cb52082e659e97afc5dac71e79de97d8681de3aa07ff18578330904a9d18e5b5"},
-    {file = "importlib_metadata-6.7.0.tar.gz", hash = "sha256:1aaf550d4f73e5d6783e7acb77aec43d49da8017410afae93822cc9cca98c4d4"},
-]
-
-[package.dependencies]
-typing-extensions = {version = ">=3.6.4", markers = "python_version < \"3.8\""}
-zipp = ">=0.5"
-
-[package.extras]
-docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"]
-perf = ["ipython"]
-testing = ["flufl.flake8", "importlib-resources (>=1.3)", "packaging", "pyfakefs", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-mypy (>=0.9.1)", "pytest-perf (>=0.9.2)", "pytest-ruff"]
-
 [[package]]
 name = "isort"
-version = "5.11.5"
+version = "5.13.2"
 description = "A Python utility / library to sort Python imports."
 optional = false
-python-versions = ">=3.7.0"
+python-versions = ">=3.8.0"
 files = [
-    {file = "isort-5.11.5-py3-none-any.whl", hash = "sha256:ba1d72fb2595a01c7895a5128f9585a5cc4b6d395f1c8d514989b9a7eb2a8746"},
-    {file = "isort-5.11.5.tar.gz", hash = "sha256:6be1f76a507cb2ecf16c7cf14a37e41609ca082330be4e3436a18ef74add55db"},
+    {file = "isort-5.13.2-py3-none-any.whl", hash = "sha256:8ca5e72a8d85860d5a3fa69b8745237f2939afe12dbf656afbcb47fe72d947a6"},
+    {file = "isort-5.13.2.tar.gz", hash = "sha256:48fdfcb9face5d58a4f6dde2e72a1fb8dcaf8ab26f95ab49fab84c2ddefb0109"},
 ]
 
 [package.extras]
-colors = ["colorama (>=0.4.3,<0.5.0)"]
-pipfile-deprecated-finder = ["pip-shims (>=0.5.2)", "pipreqs", "requirementslib"]
-plugins = ["setuptools"]
-requirements-deprecated-finder = ["pip-api", "pipreqs"]
+colors = ["colorama (>=0.4.6)"]
 
 [[package]]
-name = "mypy"
-version = "0.982"
-description = "Optional static typing for Python"
+name = "multidict"
+version = "6.0.5"
+description = "multidict implementation"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "mypy-0.982-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:5085e6f442003fa915aeb0a46d4da58128da69325d8213b4b35cc7054090aed5"},
-    {file = "mypy-0.982-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:41fd1cf9bc0e1c19b9af13a6580ccb66c381a5ee2cf63ee5ebab747a4badeba3"},
-    {file = "mypy-0.982-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:f793e3dd95e166b66d50e7b63e69e58e88643d80a3dcc3bcd81368e0478b089c"},
-    {file = "mypy-0.982-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:86ebe67adf4d021b28c3f547da6aa2cce660b57f0432617af2cca932d4d378a6"},
-    {file = "mypy-0.982-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:175f292f649a3af7082fe36620369ffc4661a71005aa9f8297ea473df5772046"},
-    {file = "mypy-0.982-cp310-cp310-win_amd64.whl", hash = "sha256:8ee8c2472e96beb1045e9081de8e92f295b89ac10c4109afdf3a23ad6e644f3e"},
-    {file = "mypy-0.982-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:58f27ebafe726a8e5ccb58d896451dd9a662a511a3188ff6a8a6a919142ecc20"},
-    {file = "mypy-0.982-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d6af646bd46f10d53834a8e8983e130e47d8ab2d4b7a97363e35b24e1d588947"},
-    {file = "mypy-0.982-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:e7aeaa763c7ab86d5b66ff27f68493d672e44c8099af636d433a7f3fa5596d40"},
-    {file = "mypy-0.982-cp37-cp37m-win_amd64.whl", hash = "sha256:724d36be56444f569c20a629d1d4ee0cb0ad666078d59bb84f8f887952511ca1"},
-    {file = "mypy-0.982-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:14d53cdd4cf93765aa747a7399f0961a365bcddf7855d9cef6306fa41de01c24"},
-    {file = "mypy-0.982-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:26ae64555d480ad4b32a267d10cab7aec92ff44de35a7cd95b2b7cb8e64ebe3e"},
-    {file = "mypy-0.982-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:6389af3e204975d6658de4fb8ac16f58c14e1bacc6142fee86d1b5b26aa52bda"},
-    {file = "mypy-0.982-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7b35ce03a289480d6544aac85fa3674f493f323d80ea7226410ed065cd46f206"},
-    {file = "mypy-0.982-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:c6e564f035d25c99fd2b863e13049744d96bd1947e3d3d2f16f5828864506763"},
-    {file = "mypy-0.982-cp38-cp38-win_amd64.whl", hash = "sha256:cebca7fd333f90b61b3ef7f217ff75ce2e287482206ef4a8b18f32b49927b1a2"},
-    {file = "mypy-0.982-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:a705a93670c8b74769496280d2fe6cd59961506c64f329bb179970ff1d24f9f8"},
-    {file = "mypy-0.982-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:75838c649290d83a2b83a88288c1eb60fe7a05b36d46cbea9d22efc790002146"},
-    {file = "mypy-0.982-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:91781eff1f3f2607519c8b0e8518aad8498af1419e8442d5d0afb108059881fc"},
-    {file = "mypy-0.982-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:eaa97b9ddd1dd9901a22a879491dbb951b5dec75c3b90032e2baa7336777363b"},
-    {file = "mypy-0.982-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:a692a8e7d07abe5f4b2dd32d731812a0175626a90a223d4b58f10f458747dd8a"},
-    {file = "mypy-0.982-cp39-cp39-win_amd64.whl", hash = "sha256:eb7a068e503be3543c4bd329c994103874fa543c1727ba5288393c21d912d795"},
-    {file = "mypy-0.982-py3-none-any.whl", hash = "sha256:1021c241e8b6e1ca5a47e4d52601274ac078a89845cfde66c6d5f769819ffa1d"},
-    {file = "mypy-0.982.tar.gz", hash = "sha256:85f7a343542dc8b1ed0a888cdd34dca56462654ef23aa673907305b260b3d746"},
+    {file = "multidict-6.0.5-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:228b644ae063c10e7f324ab1ab6b548bdf6f8b47f3ec234fef1093bc2735e5f9"},
+    {file = "multidict-6.0.5-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:896ebdcf62683551312c30e20614305f53125750803b614e9e6ce74a96232604"},
+    {file = "multidict-6.0.5-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:411bf8515f3be9813d06004cac41ccf7d1cd46dfe233705933dd163b60e37600"},
+    {file = "multidict-6.0.5-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1d147090048129ce3c453f0292e7697d333db95e52616b3793922945804a433c"},
+    {file = "multidict-6.0.5-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:215ed703caf15f578dca76ee6f6b21b7603791ae090fbf1ef9d865571039ade5"},
+    {file = "multidict-6.0.5-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:7c6390cf87ff6234643428991b7359b5f59cc15155695deb4eda5c777d2b880f"},
+    {file = "multidict-6.0.5-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:21fd81c4ebdb4f214161be351eb5bcf385426bf023041da2fd9e60681f3cebae"},
+    {file = "multidict-6.0.5-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3cc2ad10255f903656017363cd59436f2111443a76f996584d1077e43ee51182"},
+    {file = "multidict-6.0.5-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:6939c95381e003f54cd4c5516740faba40cf5ad3eeff460c3ad1d3e0ea2549bf"},
+    {file = "multidict-6.0.5-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:220dd781e3f7af2c2c1053da9fa96d9cf3072ca58f057f4c5adaaa1cab8fc442"},
+    {file = "multidict-6.0.5-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:766c8f7511df26d9f11cd3a8be623e59cca73d44643abab3f8c8c07620524e4a"},
+    {file = "multidict-6.0.5-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:fe5d7785250541f7f5019ab9cba2c71169dc7d74d0f45253f8313f436458a4ef"},
+    {file = "multidict-6.0.5-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:c1c1496e73051918fcd4f58ff2e0f2f3066d1c76a0c6aeffd9b45d53243702cc"},
+    {file = "multidict-6.0.5-cp310-cp310-win32.whl", hash = "sha256:7afcdd1fc07befad18ec4523a782cde4e93e0a2bf71239894b8d61ee578c1319"},
+    {file = "multidict-6.0.5-cp310-cp310-win_amd64.whl", hash = "sha256:99f60d34c048c5c2fabc766108c103612344c46e35d4ed9ae0673d33c8fb26e8"},
+    {file = "multidict-6.0.5-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:f285e862d2f153a70586579c15c44656f888806ed0e5b56b64489afe4a2dbfba"},
+    {file = "multidict-6.0.5-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:53689bb4e102200a4fafa9de9c7c3c212ab40a7ab2c8e474491914d2305f187e"},
+    {file = "multidict-6.0.5-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:612d1156111ae11d14afaf3a0669ebf6c170dbb735e510a7438ffe2369a847fd"},
+    {file = "multidict-6.0.5-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7be7047bd08accdb7487737631d25735c9a04327911de89ff1b26b81745bd4e3"},
+    {file = "multidict-6.0.5-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:de170c7b4fe6859beb8926e84f7d7d6c693dfe8e27372ce3b76f01c46e489fcf"},
+    {file = "multidict-6.0.5-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:04bde7a7b3de05732a4eb39c94574db1ec99abb56162d6c520ad26f83267de29"},
+    {file = "multidict-6.0.5-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:85f67aed7bb647f93e7520633d8f51d3cbc6ab96957c71272b286b2f30dc70ed"},
+    {file = "multidict-6.0.5-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:425bf820055005bfc8aa9a0b99ccb52cc2f4070153e34b701acc98d201693733"},
+    {file = "multidict-6.0.5-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:d3eb1ceec286eba8220c26f3b0096cf189aea7057b6e7b7a2e60ed36b373b77f"},
+    {file = "multidict-6.0.5-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:7901c05ead4b3fb75113fb1dd33eb1253c6d3ee37ce93305acd9d38e0b5f21a4"},
+    {file = "multidict-6.0.5-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:e0e79d91e71b9867c73323a3444724d496c037e578a0e1755ae159ba14f4f3d1"},
+    {file = "multidict-6.0.5-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:29bfeb0dff5cb5fdab2023a7a9947b3b4af63e9c47cae2a10ad58394b517fddc"},
+    {file = "multidict-6.0.5-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:e030047e85cbcedbfc073f71836d62dd5dadfbe7531cae27789ff66bc551bd5e"},
+    {file = "multidict-6.0.5-cp311-cp311-win32.whl", hash = "sha256:2f4848aa3baa109e6ab81fe2006c77ed4d3cd1e0ac2c1fbddb7b1277c168788c"},
+    {file = "multidict-6.0.5-cp311-cp311-win_amd64.whl", hash = "sha256:2faa5ae9376faba05f630d7e5e6be05be22913782b927b19d12b8145968a85ea"},
+    {file = "multidict-6.0.5-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:51d035609b86722963404f711db441cf7134f1889107fb171a970c9701f92e1e"},
+    {file = "multidict-6.0.5-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:cbebcd5bcaf1eaf302617c114aa67569dd3f090dd0ce8ba9e35e9985b41ac35b"},
+    {file = "multidict-6.0.5-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:2ffc42c922dbfddb4a4c3b438eb056828719f07608af27d163191cb3e3aa6cc5"},
+    {file = "multidict-6.0.5-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ceb3b7e6a0135e092de86110c5a74e46bda4bd4fbfeeb3a3bcec79c0f861e450"},
+    {file = "multidict-6.0.5-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:79660376075cfd4b2c80f295528aa6beb2058fd289f4c9252f986751a4cd0496"},
+    {file = "multidict-6.0.5-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:e4428b29611e989719874670fd152b6625500ad6c686d464e99f5aaeeaca175a"},
+    {file = "multidict-6.0.5-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d84a5c3a5f7ce6db1f999fb9438f686bc2e09d38143f2d93d8406ed2dd6b9226"},
+    {file = "multidict-6.0.5-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:76c0de87358b192de7ea9649beb392f107dcad9ad27276324c24c91774ca5271"},
+    {file = "multidict-6.0.5-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:79a6d2ba910adb2cbafc95dad936f8b9386e77c84c35bc0add315b856d7c3abb"},
+    {file = "multidict-6.0.5-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:92d16a3e275e38293623ebf639c471d3e03bb20b8ebb845237e0d3664914caef"},
+    {file = "multidict-6.0.5-cp312-cp312-musllinux_1_1_ppc64le.whl", hash = "sha256:fb616be3538599e797a2017cccca78e354c767165e8858ab5116813146041a24"},
+    {file = "multidict-6.0.5-cp312-cp312-musllinux_1_1_s390x.whl", hash = "sha256:14c2976aa9038c2629efa2c148022ed5eb4cb939e15ec7aace7ca932f48f9ba6"},
+    {file = "multidict-6.0.5-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:435a0984199d81ca178b9ae2c26ec3d49692d20ee29bc4c11a2a8d4514c67eda"},
+    {file = "multidict-6.0.5-cp312-cp312-win32.whl", hash = "sha256:9fe7b0653ba3d9d65cbe7698cca585bf0f8c83dbbcc710db9c90f478e175f2d5"},
+    {file = "multidict-6.0.5-cp312-cp312-win_amd64.whl", hash = "sha256:01265f5e40f5a17f8241d52656ed27192be03bfa8764d88e8220141d1e4b3556"},
+    {file = "multidict-6.0.5-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:19fe01cea168585ba0f678cad6f58133db2aa14eccaf22f88e4a6dccadfad8b3"},
+    {file = "multidict-6.0.5-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6bf7a982604375a8d49b6cc1b781c1747f243d91b81035a9b43a2126c04766f5"},
+    {file = "multidict-6.0.5-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:107c0cdefe028703fb5dafe640a409cb146d44a6ae201e55b35a4af8e95457dd"},
+    {file = "multidict-6.0.5-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:403c0911cd5d5791605808b942c88a8155c2592e05332d2bf78f18697a5fa15e"},
+    {file = "multidict-6.0.5-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:aeaf541ddbad8311a87dd695ed9642401131ea39ad7bc8cf3ef3967fd093b626"},
+    {file = "multidict-6.0.5-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e4972624066095e52b569e02b5ca97dbd7a7ddd4294bf4e7247d52635630dd83"},
+    {file = "multidict-6.0.5-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:d946b0a9eb8aaa590df1fe082cee553ceab173e6cb5b03239716338629c50c7a"},
+    {file = "multidict-6.0.5-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:b55358304d7a73d7bdf5de62494aaf70bd33015831ffd98bc498b433dfe5b10c"},
+    {file = "multidict-6.0.5-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:a3145cb08d8625b2d3fee1b2d596a8766352979c9bffe5d7833e0503d0f0b5e5"},
+    {file = "multidict-6.0.5-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:d65f25da8e248202bd47445cec78e0025c0fe7582b23ec69c3b27a640dd7a8e3"},
+    {file = "multidict-6.0.5-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:c9bf56195c6bbd293340ea82eafd0071cb3d450c703d2c93afb89f93b8386ccc"},
+    {file = "multidict-6.0.5-cp37-cp37m-win32.whl", hash = "sha256:69db76c09796b313331bb7048229e3bee7928eb62bab5e071e9f7fcc4879caee"},
+    {file = "multidict-6.0.5-cp37-cp37m-win_amd64.whl", hash = "sha256:fce28b3c8a81b6b36dfac9feb1de115bab619b3c13905b419ec71d03a3fc1423"},
+    {file = "multidict-6.0.5-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:76f067f5121dcecf0d63a67f29080b26c43c71a98b10c701b0677e4a065fbd54"},
+    {file = "multidict-6.0.5-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:b82cc8ace10ab5bd93235dfaab2021c70637005e1ac787031f4d1da63d493c1d"},
+    {file = "multidict-6.0.5-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:5cb241881eefd96b46f89b1a056187ea8e9ba14ab88ba632e68d7a2ecb7aadf7"},
+    {file = "multidict-6.0.5-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e8e94e6912639a02ce173341ff62cc1201232ab86b8a8fcc05572741a5dc7d93"},
+    {file = "multidict-6.0.5-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:09a892e4a9fb47331da06948690ae38eaa2426de97b4ccbfafbdcbe5c8f37ff8"},
+    {file = "multidict-6.0.5-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:55205d03e8a598cfc688c71ca8ea5f66447164efff8869517f175ea632c7cb7b"},
+    {file = "multidict-6.0.5-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:37b15024f864916b4951adb95d3a80c9431299080341ab9544ed148091b53f50"},
+    {file = "multidict-6.0.5-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f2a1dee728b52b33eebff5072817176c172050d44d67befd681609b4746e1c2e"},
+    {file = "multidict-6.0.5-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:edd08e6f2f1a390bf137080507e44ccc086353c8e98c657e666c017718561b89"},
+    {file = "multidict-6.0.5-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:60d698e8179a42ec85172d12f50b1668254628425a6bd611aba022257cac1386"},
+    {file = "multidict-6.0.5-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:3d25f19500588cbc47dc19081d78131c32637c25804df8414463ec908631e453"},
+    {file = "multidict-6.0.5-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:4cc0ef8b962ac7a5e62b9e826bd0cd5040e7d401bc45a6835910ed699037a461"},
+    {file = "multidict-6.0.5-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:eca2e9d0cc5a889850e9bbd68e98314ada174ff6ccd1129500103df7a94a7a44"},
+    {file = "multidict-6.0.5-cp38-cp38-win32.whl", hash = "sha256:4a6a4f196f08c58c59e0b8ef8ec441d12aee4125a7d4f4fef000ccb22f8d7241"},
+    {file = "multidict-6.0.5-cp38-cp38-win_amd64.whl", hash = "sha256:0275e35209c27a3f7951e1ce7aaf93ce0d163b28948444bec61dd7badc6d3f8c"},
+    {file = "multidict-6.0.5-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:e7be68734bd8c9a513f2b0cfd508802d6609da068f40dc57d4e3494cefc92929"},
+    {file = "multidict-6.0.5-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:1d9ea7a7e779d7a3561aade7d596649fbecfa5c08a7674b11b423783217933f9"},
+    {file = "multidict-6.0.5-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:ea1456df2a27c73ce51120fa2f519f1bea2f4a03a917f4a43c8707cf4cbbae1a"},
+    {file = "multidict-6.0.5-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cf590b134eb70629e350691ecca88eac3e3b8b3c86992042fb82e3cb1830d5e1"},
+    {file = "multidict-6.0.5-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5c0631926c4f58e9a5ccce555ad7747d9a9f8b10619621f22f9635f069f6233e"},
+    {file = "multidict-6.0.5-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:dce1c6912ab9ff5f179eaf6efe7365c1f425ed690b03341911bf4939ef2f3046"},
+    {file = "multidict-6.0.5-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c0868d64af83169e4d4152ec612637a543f7a336e4a307b119e98042e852ad9c"},
+    {file = "multidict-6.0.5-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:141b43360bfd3bdd75f15ed811850763555a251e38b2405967f8e25fb43f7d40"},
+    {file = "multidict-6.0.5-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:7df704ca8cf4a073334e0427ae2345323613e4df18cc224f647f251e5e75a527"},
+    {file = "multidict-6.0.5-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:6214c5a5571802c33f80e6c84713b2c79e024995b9c5897f794b43e714daeec9"},
+    {file = "multidict-6.0.5-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:cd6c8fca38178e12c00418de737aef1261576bd1b6e8c6134d3e729a4e858b38"},
+    {file = "multidict-6.0.5-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:e02021f87a5b6932fa6ce916ca004c4d441509d33bbdbeca70d05dff5e9d2479"},
+    {file = "multidict-6.0.5-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:ebd8d160f91a764652d3e51ce0d2956b38efe37c9231cd82cfc0bed2e40b581c"},
+    {file = "multidict-6.0.5-cp39-cp39-win32.whl", hash = "sha256:04da1bb8c8dbadf2a18a452639771951c662c5ad03aefe4884775454be322c9b"},
+    {file = "multidict-6.0.5-cp39-cp39-win_amd64.whl", hash = "sha256:d6f6d4f185481c9669b9447bf9d9cf3b95a0e9df9d169bbc17e363b7d5487755"},
+    {file = "multidict-6.0.5-py3-none-any.whl", hash = "sha256:0d63c74e3d7ab26de115c49bffc92cc77ed23395303d496eae515d4204a625e7"},
+    {file = "multidict-6.0.5.tar.gz", hash = "sha256:f7e301075edaf50500f0b341543c41194d8df3ae5caf4702f2095f3ca73dd8da"},
 ]
 
-[package.dependencies]
-mypy-extensions = ">=0.4.3"
-tomli = {version = ">=1.1.0", markers = "python_version < \"3.11\""}
-typed-ast = {version = ">=1.4.0,<2", markers = "python_version < \"3.8\""}
-typing-extensions = ">=3.10"
-
-[package.extras]
-dmypy = ["psutil (>=4.0)"]
-python2 = ["typed-ast (>=1.4.0,<2)"]
-reports = ["lxml"]
-
 [[package]]
 name = "mypy-extensions"
 version = "1.0.0"
@@ -462,42 +726,40 @@ files = [
 
 [[package]]
 name = "pathspec"
-version = "0.11.2"
+version = "0.12.1"
 description = "Utility library for gitignore style pattern matching of file paths."
 optional = false
-python-versions = ">=3.7"
+python-versions = ">=3.8"
 files = [
-    {file = "pathspec-0.11.2-py3-none-any.whl", hash = "sha256:1d6ed233af05e679efb96b1851550ea95bbb64b7c490b0f5aa52996c11e92a20"},
-    {file = "pathspec-0.11.2.tar.gz", hash = "sha256:e0d8d0ac2f12da61956eb2306b69f9469b42f4deb0f3cb6ed47b9cce9996ced3"},
+    {file = "pathspec-0.12.1-py3-none-any.whl", hash = "sha256:a0d503e138a4c123b27490a4f7beda6a01c6f288df0e4a8b79c7eb0dc7b4cc08"},
+    {file = "pathspec-0.12.1.tar.gz", hash = "sha256:a482d51503a1ab33b1c67a6c3813a26953dbdc71c31dacaef9a838c4e29f5712"},
 ]
 
 [[package]]
 name = "platformdirs"
-version = "4.0.0"
-description = "A small Python package for determining appropriate platform-specific dirs, e.g. a \"user data dir\"."
+version = "4.2.2"
+description = "A small Python package for determining appropriate platform-specific dirs, e.g. a `user data dir`."
 optional = false
-python-versions = ">=3.7"
+python-versions = ">=3.8"
 files = [
-    {file = "platformdirs-4.0.0-py3-none-any.whl", hash = "sha256:118c954d7e949b35437270383a3f2531e99dd93cf7ce4dc8340d3356d30f173b"},
-    {file = "platformdirs-4.0.0.tar.gz", hash = "sha256:cb633b2bcf10c51af60beb0ab06d2f1d69064b43abf4c185ca6b28865f3f9731"},
+    {file = "platformdirs-4.2.2-py3-none-any.whl", hash = "sha256:2d7a1657e36a80ea911db832a8a6ece5ee53d8de21edd5cc5879af6530b1bfee"},
+    {file = "platformdirs-4.2.2.tar.gz", hash = "sha256:38b7b51f512eed9e84a22788b4bce1de17c0adb134d6becb09836e37d8654cd3"},
 ]
 
-[package.dependencies]
-typing-extensions = {version = ">=4.7.1", markers = "python_version < \"3.8\""}
-
 [package.extras]
-docs = ["furo (>=2023.7.26)", "proselint (>=0.13)", "sphinx (>=7.1.1)", "sphinx-autodoc-typehints (>=1.24)"]
-test = ["appdirs (==1.4.4)", "covdefaults (>=2.3)", "pytest (>=7.4)", "pytest-cov (>=4.1)", "pytest-mock (>=3.11.1)"]
+docs = ["furo (>=2023.9.10)", "proselint (>=0.13)", "sphinx (>=7.2.6)", "sphinx-autodoc-typehints (>=1.25.2)"]
+test = ["appdirs (==1.4.4)", "covdefaults (>=2.3)", "pytest (>=7.4.3)", "pytest-cov (>=4.1)", "pytest-mock (>=3.12)"]
+type = ["mypy (>=1.8)"]
 
 [[package]]
 name = "pycparser"
-version = "2.21"
+version = "2.22"
 description = "C parser in Python"
 optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+python-versions = ">=3.8"
 files = [
-    {file = "pycparser-2.21-py2.py3-none-any.whl", hash = "sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9"},
-    {file = "pycparser-2.21.tar.gz", hash = "sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206"},
+    {file = "pycparser-2.22-py3-none-any.whl", hash = "sha256:c3702b6d3dd8c7abc1afa565d7e63d53a1d0bd86cdc24edd75470f4de499cfcc"},
+    {file = "pycparser-2.22.tar.gz", hash = "sha256:491c8be9c040f5390f5bf44a5b07752bd07f56edf992381b05c701439eec10f6"},
 ]
 
 [[package]]
@@ -526,15 +788,34 @@ cffi = ">=1.4.1"
 docs = ["sphinx (>=1.6.5)", "sphinx-rtd-theme"]
 tests = ["hypothesis (>=3.27.0)", "pytest (>=3.2.1,!=3.3.0)"]
 
+[[package]]
+name = "python-graphql-client"
+version = "0.4.3"
+description = "Python GraphQL Client"
+optional = false
+python-versions = "*"
+files = [
+    {file = "python_graphql_client-0.4.3-py3-none-any.whl", hash = "sha256:c5eb996702acf46110b352f61819c46065ea4f4f106158535cd471e66490b25e"},
+    {file = "python_graphql_client-0.4.3.tar.gz", hash = "sha256:fdbd03115dde8776db02e60414b83b018d7d95e5752d6d5fabf21c99265f5b9d"},
+]
+
+[package.dependencies]
+aiohttp = ">=3.0,<4.0"
+requests = ">=2.0,<3.0"
+websockets = ">=5.0"
+
+[package.extras]
+dev = ["black", "flake8", "flake8-black", "flake8-docstrings", "flake8-isort", "gitchangelog", "pre-commit", "pystache"]
+
 [[package]]
 name = "requests"
-version = "2.31.0"
+version = "2.32.2"
 description = "Python HTTP for Humans."
 optional = false
-python-versions = ">=3.7"
+python-versions = ">=3.8"
 files = [
-    {file = "requests-2.31.0-py3-none-any.whl", hash = "sha256:58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f"},
-    {file = "requests-2.31.0.tar.gz", hash = "sha256:942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1"},
+    {file = "requests-2.32.2-py3-none-any.whl", hash = "sha256:fc06670dd0ed212426dfeb94fc1b983d917c4f9847c863f313c9dfaaffb7c23c"},
+    {file = "requests-2.32.2.tar.gz", hash = "sha256:dd951ff5ecf3e3b3aa26b40703ba77495dab41da839ae72ef3c8e5d8e2433289"},
 ]
 
 [package.dependencies]
@@ -548,31 +829,25 @@ socks = ["PySocks (>=1.5.6,!=1.5.7)"]
 use-chardet-on-py3 = ["chardet (>=3.0.2,<6)"]
 
 [[package]]
-name = "rfc3986"
-version = "1.5.0"
-description = "Validating URI References per RFC 3986"
+name = "six"
+version = "1.16.0"
+description = "Python 2 and 3 compatibility utilities"
 optional = false
-python-versions = "*"
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*"
 files = [
-    {file = "rfc3986-1.5.0-py2.py3-none-any.whl", hash = "sha256:a86d6e1f5b1dc238b218b012df0aa79409667bb209e58da56d0b94704e712a97"},
-    {file = "rfc3986-1.5.0.tar.gz", hash = "sha256:270aaf10d87d0d4e095063c65bf3ddbc6ee3d0b226328ce21e036f946e421835"},
+    {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"},
+    {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"},
 ]
 
-[package.dependencies]
-idna = {version = "*", optional = true, markers = "extra == \"idna2008\""}
-
-[package.extras]
-idna2008 = ["idna"]
-
 [[package]]
 name = "sniffio"
-version = "1.3.0"
+version = "1.3.1"
 description = "Sniff out which async library your code is running under"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "sniffio-1.3.0-py3-none-any.whl", hash = "sha256:eecefdce1e5bbfb7ad2eeaabf7c1eeb404d7757c379bd1f7e5cce9d8bf425384"},
-    {file = "sniffio-1.3.0.tar.gz", hash = "sha256:e60305c5e5d314f5389259b7f22aaa33d8f7dee49763119234af3755c55b9101"},
+    {file = "sniffio-1.3.1-py3-none-any.whl", hash = "sha256:2f6da418d1f1e0fddd844478f41680e794e6051915791a034ff65e5f100525a2"},
+    {file = "sniffio-1.3.1.tar.gz", hash = "sha256:f4324edc670a0f49750a81b895f35c3adb843cca46f0530f79fc1babb23789dc"},
 ]
 
 [[package]]
@@ -586,100 +861,219 @@ files = [
     {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"},
 ]
 
-[[package]]
-name = "typed-ast"
-version = "1.5.5"
-description = "a fork of Python 2 and 3 ast modules with type comment support"
-optional = false
-python-versions = ">=3.6"
-files = [
-    {file = "typed_ast-1.5.5-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:4bc1efe0ce3ffb74784e06460f01a223ac1f6ab31c6bc0376a21184bf5aabe3b"},
-    {file = "typed_ast-1.5.5-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:5f7a8c46a8b333f71abd61d7ab9255440d4a588f34a21f126bbfc95f6049e686"},
-    {file = "typed_ast-1.5.5-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:597fc66b4162f959ee6a96b978c0435bd63791e31e4f410622d19f1686d5e769"},
-    {file = "typed_ast-1.5.5-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d41b7a686ce653e06c2609075d397ebd5b969d821b9797d029fccd71fdec8e04"},
-    {file = "typed_ast-1.5.5-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:5fe83a9a44c4ce67c796a1b466c270c1272e176603d5e06f6afbc101a572859d"},
-    {file = "typed_ast-1.5.5-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:d5c0c112a74c0e5db2c75882a0adf3133adedcdbfd8cf7c9d6ed77365ab90a1d"},
-    {file = "typed_ast-1.5.5-cp310-cp310-win_amd64.whl", hash = "sha256:e1a976ed4cc2d71bb073e1b2a250892a6e968ff02aa14c1f40eba4f365ffec02"},
-    {file = "typed_ast-1.5.5-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:c631da9710271cb67b08bd3f3813b7af7f4c69c319b75475436fcab8c3d21bee"},
-    {file = "typed_ast-1.5.5-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:b445c2abfecab89a932b20bd8261488d574591173d07827c1eda32c457358b18"},
-    {file = "typed_ast-1.5.5-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cc95ffaaab2be3b25eb938779e43f513e0e538a84dd14a5d844b8f2932593d88"},
-    {file = "typed_ast-1.5.5-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:61443214d9b4c660dcf4b5307f15c12cb30bdfe9588ce6158f4a005baeb167b2"},
-    {file = "typed_ast-1.5.5-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:6eb936d107e4d474940469e8ec5b380c9b329b5f08b78282d46baeebd3692dc9"},
-    {file = "typed_ast-1.5.5-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:e48bf27022897577d8479eaed64701ecaf0467182448bd95759883300ca818c8"},
-    {file = "typed_ast-1.5.5-cp311-cp311-win_amd64.whl", hash = "sha256:83509f9324011c9a39faaef0922c6f720f9623afe3fe220b6d0b15638247206b"},
-    {file = "typed_ast-1.5.5-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:44f214394fc1af23ca6d4e9e744804d890045d1643dd7e8229951e0ef39429b5"},
-    {file = "typed_ast-1.5.5-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:118c1ce46ce58fda78503eae14b7664163aa735b620b64b5b725453696f2a35c"},
-    {file = "typed_ast-1.5.5-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:be4919b808efa61101456e87f2d4c75b228f4e52618621c77f1ddcaae15904fa"},
-    {file = "typed_ast-1.5.5-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:fc2b8c4e1bc5cd96c1a823a885e6b158f8451cf6f5530e1829390b4d27d0807f"},
-    {file = "typed_ast-1.5.5-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:16f7313e0a08c7de57f2998c85e2a69a642e97cb32f87eb65fbfe88381a5e44d"},
-    {file = "typed_ast-1.5.5-cp36-cp36m-win_amd64.whl", hash = "sha256:2b946ef8c04f77230489f75b4b5a4a6f24c078be4aed241cfabe9cbf4156e7e5"},
-    {file = "typed_ast-1.5.5-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:2188bc33d85951ea4ddad55d2b35598b2709d122c11c75cffd529fbc9965508e"},
-    {file = "typed_ast-1.5.5-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0635900d16ae133cab3b26c607586131269f88266954eb04ec31535c9a12ef1e"},
-    {file = "typed_ast-1.5.5-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:57bfc3cf35a0f2fdf0a88a3044aafaec1d2f24d8ae8cd87c4f58d615fb5b6311"},
-    {file = "typed_ast-1.5.5-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:fe58ef6a764de7b4b36edfc8592641f56e69b7163bba9f9c8089838ee596bfb2"},
-    {file = "typed_ast-1.5.5-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:d09d930c2d1d621f717bb217bf1fe2584616febb5138d9b3e8cdd26506c3f6d4"},
-    {file = "typed_ast-1.5.5-cp37-cp37m-win_amd64.whl", hash = "sha256:d40c10326893ecab8a80a53039164a224984339b2c32a6baf55ecbd5b1df6431"},
-    {file = "typed_ast-1.5.5-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:fd946abf3c31fb50eee07451a6aedbfff912fcd13cf357363f5b4e834cc5e71a"},
-    {file = "typed_ast-1.5.5-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:ed4a1a42df8a3dfb6b40c3d2de109e935949f2f66b19703eafade03173f8f437"},
-    {file = "typed_ast-1.5.5-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:045f9930a1550d9352464e5149710d56a2aed23a2ffe78946478f7b5416f1ede"},
-    {file = "typed_ast-1.5.5-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:381eed9c95484ceef5ced626355fdc0765ab51d8553fec08661dce654a935db4"},
-    {file = "typed_ast-1.5.5-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:bfd39a41c0ef6f31684daff53befddae608f9daf6957140228a08e51f312d7e6"},
-    {file = "typed_ast-1.5.5-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:8c524eb3024edcc04e288db9541fe1f438f82d281e591c548903d5b77ad1ddd4"},
-    {file = "typed_ast-1.5.5-cp38-cp38-win_amd64.whl", hash = "sha256:7f58fabdde8dcbe764cef5e1a7fcb440f2463c1bbbec1cf2a86ca7bc1f95184b"},
-    {file = "typed_ast-1.5.5-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:042eb665ff6bf020dd2243307d11ed626306b82812aba21836096d229fdc6a10"},
-    {file = "typed_ast-1.5.5-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:622e4a006472b05cf6ef7f9f2636edc51bda670b7bbffa18d26b255269d3d814"},
-    {file = "typed_ast-1.5.5-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1efebbbf4604ad1283e963e8915daa240cb4bf5067053cf2f0baadc4d4fb51b8"},
-    {file = "typed_ast-1.5.5-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f0aefdd66f1784c58f65b502b6cf8b121544680456d1cebbd300c2c813899274"},
-    {file = "typed_ast-1.5.5-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:48074261a842acf825af1968cd912f6f21357316080ebaca5f19abbb11690c8a"},
-    {file = "typed_ast-1.5.5-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:429ae404f69dc94b9361bb62291885894b7c6fb4640d561179548c849f8492ba"},
-    {file = "typed_ast-1.5.5-cp39-cp39-win_amd64.whl", hash = "sha256:335f22ccb244da2b5c296e6f96b06ee9bed46526db0de38d2f0e5a6597b81155"},
-    {file = "typed_ast-1.5.5.tar.gz", hash = "sha256:94282f7a354f36ef5dbce0ef3467ebf6a258e370ab33d5b40c249fa996e590dd"},
-]
-
 [[package]]
 name = "typing-extensions"
-version = "4.7.1"
-description = "Backported and Experimental Type Hints for Python 3.7+"
+version = "4.11.0"
+description = "Backported and Experimental Type Hints for Python 3.8+"
 optional = false
-python-versions = ">=3.7"
+python-versions = ">=3.8"
 files = [
-    {file = "typing_extensions-4.7.1-py3-none-any.whl", hash = "sha256:440d5dd3af93b060174bf433bccd69b0babc3b15b1a8dca43789fd7f61514b36"},
-    {file = "typing_extensions-4.7.1.tar.gz", hash = "sha256:b75ddc264f0ba5615db7ba217daeb99701ad295353c45f9e95963337ceeeffb2"},
+    {file = "typing_extensions-4.11.0-py3-none-any.whl", hash = "sha256:c1f94d72897edaf4ce775bb7558d5b79d8126906a14ea5ed1635921406c0387a"},
+    {file = "typing_extensions-4.11.0.tar.gz", hash = "sha256:83f085bd5ca59c80295fc2a82ab5dac679cbe02b9f33f7d83af68e241bea51b0"},
 ]
 
 [[package]]
 name = "urllib3"
-version = "2.0.7"
+version = "2.2.1"
 description = "HTTP library with thread-safe connection pooling, file post, and more."
 optional = false
-python-versions = ">=3.7"
+python-versions = ">=3.8"
 files = [
-    {file = "urllib3-2.0.7-py3-none-any.whl", hash = "sha256:fdb6d215c776278489906c2f8916e6e7d4f5a9b602ccbcfdf7f016fc8da0596e"},
-    {file = "urllib3-2.0.7.tar.gz", hash = "sha256:c97dfde1f7bd43a71c8d2a58e369e9b2bf692d1334ea9f9cae55add7d0dd0f84"},
+    {file = "urllib3-2.2.1-py3-none-any.whl", hash = "sha256:450b20ec296a467077128bff42b73080516e71b56ff59a60a02bef2232c4fa9d"},
+    {file = "urllib3-2.2.1.tar.gz", hash = "sha256:d0570876c61ab9e520d776c38acbbb5b05a776d3f9ff98a5c8fd5162a444cf19"},
 ]
 
 [package.extras]
 brotli = ["brotli (>=1.0.9)", "brotlicffi (>=0.8.0)"]
-secure = ["certifi", "cryptography (>=1.9)", "idna (>=2.0.0)", "pyopenssl (>=17.1.0)", "urllib3-secure-extra"]
+h2 = ["h2 (>=4,<5)"]
 socks = ["pysocks (>=1.5.6,!=1.5.7,<2.0)"]
 zstd = ["zstandard (>=0.18.0)"]
 
 [[package]]
-name = "zipp"
-version = "3.15.0"
-description = "Backport of pathlib-compatible object wrapper for zip files"
+name = "websockets"
+version = "12.0"
+description = "An implementation of the WebSocket Protocol (RFC 6455 & 7692)"
+optional = false
+python-versions = ">=3.8"
+files = [
+    {file = "websockets-12.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:d554236b2a2006e0ce16315c16eaa0d628dab009c33b63ea03f41c6107958374"},
+    {file = "websockets-12.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:2d225bb6886591b1746b17c0573e29804619c8f755b5598d875bb4235ea639be"},
+    {file = "websockets-12.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:eb809e816916a3b210bed3c82fb88eaf16e8afcf9c115ebb2bacede1797d2547"},
+    {file = "websockets-12.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c588f6abc13f78a67044c6b1273a99e1cf31038ad51815b3b016ce699f0d75c2"},
+    {file = "websockets-12.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5aa9348186d79a5f232115ed3fa9020eab66d6c3437d72f9d2c8ac0c6858c558"},
+    {file = "websockets-12.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6350b14a40c95ddd53e775dbdbbbc59b124a5c8ecd6fbb09c2e52029f7a9f480"},
+    {file = "websockets-12.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:70ec754cc2a769bcd218ed8d7209055667b30860ffecb8633a834dde27d6307c"},
+    {file = "websockets-12.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:6e96f5ed1b83a8ddb07909b45bd94833b0710f738115751cdaa9da1fb0cb66e8"},
+    {file = "websockets-12.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:4d87be612cbef86f994178d5186add3d94e9f31cc3cb499a0482b866ec477603"},
+    {file = "websockets-12.0-cp310-cp310-win32.whl", hash = "sha256:befe90632d66caaf72e8b2ed4d7f02b348913813c8b0a32fae1cc5fe3730902f"},
+    {file = "websockets-12.0-cp310-cp310-win_amd64.whl", hash = "sha256:363f57ca8bc8576195d0540c648aa58ac18cf85b76ad5202b9f976918f4219cf"},
+    {file = "websockets-12.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:5d873c7de42dea355d73f170be0f23788cf3fa9f7bed718fd2830eefedce01b4"},
+    {file = "websockets-12.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:3f61726cae9f65b872502ff3c1496abc93ffbe31b278455c418492016e2afc8f"},
+    {file = "websockets-12.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:ed2fcf7a07334c77fc8a230755c2209223a7cc44fc27597729b8ef5425aa61a3"},
+    {file = "websockets-12.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8e332c210b14b57904869ca9f9bf4ca32f5427a03eeb625da9b616c85a3a506c"},
+    {file = "websockets-12.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5693ef74233122f8ebab026817b1b37fe25c411ecfca084b29bc7d6efc548f45"},
+    {file = "websockets-12.0-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6e9e7db18b4539a29cc5ad8c8b252738a30e2b13f033c2d6e9d0549b45841c04"},
+    {file = "websockets-12.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:6e2df67b8014767d0f785baa98393725739287684b9f8d8a1001eb2839031447"},
+    {file = "websockets-12.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:bea88d71630c5900690fcb03161ab18f8f244805c59e2e0dc4ffadae0a7ee0ca"},
+    {file = "websockets-12.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:dff6cdf35e31d1315790149fee351f9e52978130cef6c87c4b6c9b3baf78bc53"},
+    {file = "websockets-12.0-cp311-cp311-win32.whl", hash = "sha256:3e3aa8c468af01d70332a382350ee95f6986db479ce7af14d5e81ec52aa2b402"},
+    {file = "websockets-12.0-cp311-cp311-win_amd64.whl", hash = "sha256:25eb766c8ad27da0f79420b2af4b85d29914ba0edf69f547cc4f06ca6f1d403b"},
+    {file = "websockets-12.0-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:0e6e2711d5a8e6e482cacb927a49a3d432345dfe7dea8ace7b5790df5932e4df"},
+    {file = "websockets-12.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:dbcf72a37f0b3316e993e13ecf32f10c0e1259c28ffd0a85cee26e8549595fbc"},
+    {file = "websockets-12.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:12743ab88ab2af1d17dd4acb4645677cb7063ef4db93abffbf164218a5d54c6b"},
+    {file = "websockets-12.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7b645f491f3c48d3f8a00d1fce07445fab7347fec54a3e65f0725d730d5b99cb"},
+    {file = "websockets-12.0-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9893d1aa45a7f8b3bc4510f6ccf8db8c3b62120917af15e3de247f0780294b92"},
+    {file = "websockets-12.0-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1f38a7b376117ef7aff996e737583172bdf535932c9ca021746573bce40165ed"},
+    {file = "websockets-12.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:f764ba54e33daf20e167915edc443b6f88956f37fb606449b4a5b10ba42235a5"},
+    {file = "websockets-12.0-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:1e4b3f8ea6a9cfa8be8484c9221ec0257508e3a1ec43c36acdefb2a9c3b00aa2"},
+    {file = "websockets-12.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:9fdf06fd06c32205a07e47328ab49c40fc1407cdec801d698a7c41167ea45113"},
+    {file = "websockets-12.0-cp312-cp312-win32.whl", hash = "sha256:baa386875b70cbd81798fa9f71be689c1bf484f65fd6fb08d051a0ee4e79924d"},
+    {file = "websockets-12.0-cp312-cp312-win_amd64.whl", hash = "sha256:ae0a5da8f35a5be197f328d4727dbcfafa53d1824fac3d96cdd3a642fe09394f"},
+    {file = "websockets-12.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:5f6ffe2c6598f7f7207eef9a1228b6f5c818f9f4d53ee920aacd35cec8110438"},
+    {file = "websockets-12.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:9edf3fc590cc2ec20dc9d7a45108b5bbaf21c0d89f9fd3fd1685e223771dc0b2"},
+    {file = "websockets-12.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:8572132c7be52632201a35f5e08348137f658e5ffd21f51f94572ca6c05ea81d"},
+    {file = "websockets-12.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:604428d1b87edbf02b233e2c207d7d528460fa978f9e391bd8aaf9c8311de137"},
+    {file = "websockets-12.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1a9d160fd080c6285e202327aba140fc9a0d910b09e423afff4ae5cbbf1c7205"},
+    {file = "websockets-12.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:87b4aafed34653e465eb77b7c93ef058516cb5acf3eb21e42f33928616172def"},
+    {file = "websockets-12.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:b2ee7288b85959797970114deae81ab41b731f19ebcd3bd499ae9ca0e3f1d2c8"},
+    {file = "websockets-12.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:7fa3d25e81bfe6a89718e9791128398a50dec6d57faf23770787ff441d851967"},
+    {file = "websockets-12.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:a571f035a47212288e3b3519944f6bf4ac7bc7553243e41eac50dd48552b6df7"},
+    {file = "websockets-12.0-cp38-cp38-win32.whl", hash = "sha256:3c6cc1360c10c17463aadd29dd3af332d4a1adaa8796f6b0e9f9df1fdb0bad62"},
+    {file = "websockets-12.0-cp38-cp38-win_amd64.whl", hash = "sha256:1bf386089178ea69d720f8db6199a0504a406209a0fc23e603b27b300fdd6892"},
+    {file = "websockets-12.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:ab3d732ad50a4fbd04a4490ef08acd0517b6ae6b77eb967251f4c263011a990d"},
+    {file = "websockets-12.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:a1d9697f3337a89691e3bd8dc56dea45a6f6d975f92e7d5f773bc715c15dde28"},
+    {file = "websockets-12.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:1df2fbd2c8a98d38a66f5238484405b8d1d16f929bb7a33ed73e4801222a6f53"},
+    {file = "websockets-12.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:23509452b3bc38e3a057382c2e941d5ac2e01e251acce7adc74011d7d8de434c"},
+    {file = "websockets-12.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2e5fc14ec6ea568200ea4ef46545073da81900a2b67b3e666f04adf53ad452ec"},
+    {file = "websockets-12.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:46e71dbbd12850224243f5d2aeec90f0aaa0f2dde5aeeb8fc8df21e04d99eff9"},
+    {file = "websockets-12.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:b81f90dcc6c85a9b7f29873beb56c94c85d6f0dac2ea8b60d995bd18bf3e2aae"},
+    {file = "websockets-12.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:a02413bc474feda2849c59ed2dfb2cddb4cd3d2f03a2fedec51d6e959d9b608b"},
+    {file = "websockets-12.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:bbe6013f9f791944ed31ca08b077e26249309639313fff132bfbf3ba105673b9"},
+    {file = "websockets-12.0-cp39-cp39-win32.whl", hash = "sha256:cbe83a6bbdf207ff0541de01e11904827540aa069293696dd528a6640bd6a5f6"},
+    {file = "websockets-12.0-cp39-cp39-win_amd64.whl", hash = "sha256:fc4e7fa5414512b481a2483775a8e8be7803a35b30ca805afa4998a84f9fd9e8"},
+    {file = "websockets-12.0-pp310-pypy310_pp73-macosx_10_9_x86_64.whl", hash = "sha256:248d8e2446e13c1d4326e0a6a4e9629cb13a11195051a73acf414812700badbd"},
+    {file = "websockets-12.0-pp310-pypy310_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f44069528d45a933997a6fef143030d8ca8042f0dfaad753e2906398290e2870"},
+    {file = "websockets-12.0-pp310-pypy310_pp73-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c4e37d36f0d19f0a4413d3e18c0d03d0c268ada2061868c1e6f5ab1a6d575077"},
+    {file = "websockets-12.0-pp310-pypy310_pp73-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3d829f975fc2e527a3ef2f9c8f25e553eb7bc779c6665e8e1d52aa22800bb38b"},
+    {file = "websockets-12.0-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:2c71bd45a777433dd9113847af751aae36e448bc6b8c361a566cb043eda6ec30"},
+    {file = "websockets-12.0-pp38-pypy38_pp73-macosx_10_9_x86_64.whl", hash = "sha256:0bee75f400895aef54157b36ed6d3b308fcab62e5260703add87f44cee9c82a6"},
+    {file = "websockets-12.0-pp38-pypy38_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:423fc1ed29f7512fceb727e2d2aecb952c46aa34895e9ed96071821309951123"},
+    {file = "websockets-12.0-pp38-pypy38_pp73-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:27a5e9964ef509016759f2ef3f2c1e13f403725a5e6a1775555994966a66e931"},
+    {file = "websockets-12.0-pp38-pypy38_pp73-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c3181df4583c4d3994d31fb235dc681d2aaad744fbdbf94c4802485ececdecf2"},
+    {file = "websockets-12.0-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:b067cb952ce8bf40115f6c19f478dc71c5e719b7fbaa511359795dfd9d1a6468"},
+    {file = "websockets-12.0-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:00700340c6c7ab788f176d118775202aadea7602c5cc6be6ae127761c16d6b0b"},
+    {file = "websockets-12.0-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e469d01137942849cff40517c97a30a93ae79917752b34029f0ec72df6b46399"},
+    {file = "websockets-12.0-pp39-pypy39_pp73-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ffefa1374cd508d633646d51a8e9277763a9b78ae71324183693959cf94635a7"},
+    {file = "websockets-12.0-pp39-pypy39_pp73-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ba0cab91b3956dfa9f512147860783a1829a8d905ee218a9837c18f683239611"},
+    {file = "websockets-12.0-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:2cb388a5bfb56df4d9a406783b7f9dbefb888c09b71629351cc6b036e9259370"},
+    {file = "websockets-12.0-py3-none-any.whl", hash = "sha256:dc284bbc8d7c78a6c69e0c7325ab46ee5e40bb4d50e494d8131a07ef47500e9e"},
+    {file = "websockets-12.0.tar.gz", hash = "sha256:81df9cbcbb6c260de1e007e58c011bfebe2dafc8435107b0537f393dd38c8b1b"},
+]
+
+[[package]]
+name = "yarl"
+version = "1.9.4"
+description = "Yet another URL library"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "zipp-3.15.0-py3-none-any.whl", hash = "sha256:48904fc76a60e542af151aded95726c1a5c34ed43ab4134b597665c86d7ad556"},
-    {file = "zipp-3.15.0.tar.gz", hash = "sha256:112929ad649da941c23de50f356a2b5570c954b65150642bccdd66bf194d224b"},
+    {file = "yarl-1.9.4-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:a8c1df72eb746f4136fe9a2e72b0c9dc1da1cbd23b5372f94b5820ff8ae30e0e"},
+    {file = "yarl-1.9.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:a3a6ed1d525bfb91b3fc9b690c5a21bb52de28c018530ad85093cc488bee2dd2"},
+    {file = "yarl-1.9.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:c38c9ddb6103ceae4e4498f9c08fac9b590c5c71b0370f98714768e22ac6fa66"},
+    {file = "yarl-1.9.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d9e09c9d74f4566e905a0b8fa668c58109f7624db96a2171f21747abc7524234"},
+    {file = "yarl-1.9.4-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b8477c1ee4bd47c57d49621a062121c3023609f7a13b8a46953eb6c9716ca392"},
+    {file = "yarl-1.9.4-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d5ff2c858f5f6a42c2a8e751100f237c5e869cbde669a724f2062d4c4ef93551"},
+    {file = "yarl-1.9.4-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:357495293086c5b6d34ca9616a43d329317feab7917518bc97a08f9e55648455"},
+    {file = "yarl-1.9.4-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:54525ae423d7b7a8ee81ba189f131054defdb122cde31ff17477951464c1691c"},
+    {file = "yarl-1.9.4-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:801e9264d19643548651b9db361ce3287176671fb0117f96b5ac0ee1c3530d53"},
+    {file = "yarl-1.9.4-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:e516dc8baf7b380e6c1c26792610230f37147bb754d6426462ab115a02944385"},
+    {file = "yarl-1.9.4-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:7d5aaac37d19b2904bb9dfe12cdb08c8443e7ba7d2852894ad448d4b8f442863"},
+    {file = "yarl-1.9.4-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:54beabb809ffcacbd9d28ac57b0db46e42a6e341a030293fb3185c409e626b8b"},
+    {file = "yarl-1.9.4-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:bac8d525a8dbc2a1507ec731d2867025d11ceadcb4dd421423a5d42c56818541"},
+    {file = "yarl-1.9.4-cp310-cp310-win32.whl", hash = "sha256:7855426dfbddac81896b6e533ebefc0af2f132d4a47340cee6d22cac7190022d"},
+    {file = "yarl-1.9.4-cp310-cp310-win_amd64.whl", hash = "sha256:848cd2a1df56ddbffeb375535fb62c9d1645dde33ca4d51341378b3f5954429b"},
+    {file = "yarl-1.9.4-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:35a2b9396879ce32754bd457d31a51ff0a9d426fd9e0e3c33394bf4b9036b099"},
+    {file = "yarl-1.9.4-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:4c7d56b293cc071e82532f70adcbd8b61909eec973ae9d2d1f9b233f3d943f2c"},
+    {file = "yarl-1.9.4-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:d8a1c6c0be645c745a081c192e747c5de06e944a0d21245f4cf7c05e457c36e0"},
+    {file = "yarl-1.9.4-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4b3c1ffe10069f655ea2d731808e76e0f452fc6c749bea04781daf18e6039525"},
+    {file = "yarl-1.9.4-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:549d19c84c55d11687ddbd47eeb348a89df9cb30e1993f1b128f4685cd0ebbf8"},
+    {file = "yarl-1.9.4-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a7409f968456111140c1c95301cadf071bd30a81cbd7ab829169fb9e3d72eae9"},
+    {file = "yarl-1.9.4-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e23a6d84d9d1738dbc6e38167776107e63307dfc8ad108e580548d1f2c587f42"},
+    {file = "yarl-1.9.4-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d8b889777de69897406c9fb0b76cdf2fd0f31267861ae7501d93003d55f54fbe"},
+    {file = "yarl-1.9.4-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:03caa9507d3d3c83bca08650678e25364e1843b484f19986a527630ca376ecce"},
+    {file = "yarl-1.9.4-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:4e9035df8d0880b2f1c7f5031f33f69e071dfe72ee9310cfc76f7b605958ceb9"},
+    {file = "yarl-1.9.4-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:c0ec0ed476f77db9fb29bca17f0a8fcc7bc97ad4c6c1d8959c507decb22e8572"},
+    {file = "yarl-1.9.4-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:ee04010f26d5102399bd17f8df8bc38dc7ccd7701dc77f4a68c5b8d733406958"},
+    {file = "yarl-1.9.4-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:49a180c2e0743d5d6e0b4d1a9e5f633c62eca3f8a86ba5dd3c471060e352ca98"},
+    {file = "yarl-1.9.4-cp311-cp311-win32.whl", hash = "sha256:81eb57278deb6098a5b62e88ad8281b2ba09f2f1147c4767522353eaa6260b31"},
+    {file = "yarl-1.9.4-cp311-cp311-win_amd64.whl", hash = "sha256:d1d2532b340b692880261c15aee4dc94dd22ca5d61b9db9a8a361953d36410b1"},
+    {file = "yarl-1.9.4-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:0d2454f0aef65ea81037759be5ca9947539667eecebca092733b2eb43c965a81"},
+    {file = "yarl-1.9.4-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:44d8ffbb9c06e5a7f529f38f53eda23e50d1ed33c6c869e01481d3fafa6b8142"},
+    {file = "yarl-1.9.4-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:aaaea1e536f98754a6e5c56091baa1b6ce2f2700cc4a00b0d49eca8dea471074"},
+    {file = "yarl-1.9.4-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3777ce5536d17989c91696db1d459574e9a9bd37660ea7ee4d3344579bb6f129"},
+    {file = "yarl-1.9.4-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:9fc5fc1eeb029757349ad26bbc5880557389a03fa6ada41703db5e068881e5f2"},
+    {file = "yarl-1.9.4-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:ea65804b5dc88dacd4a40279af0cdadcfe74b3e5b4c897aa0d81cf86927fee78"},
+    {file = "yarl-1.9.4-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:aa102d6d280a5455ad6a0f9e6d769989638718e938a6a0a2ff3f4a7ff8c62cc4"},
+    {file = "yarl-1.9.4-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:09efe4615ada057ba2d30df871d2f668af661e971dfeedf0c159927d48bbeff0"},
+    {file = "yarl-1.9.4-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:008d3e808d03ef28542372d01057fd09168419cdc8f848efe2804f894ae03e51"},
+    {file = "yarl-1.9.4-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:6f5cb257bc2ec58f437da2b37a8cd48f666db96d47b8a3115c29f316313654ff"},
+    {file = "yarl-1.9.4-cp312-cp312-musllinux_1_1_ppc64le.whl", hash = "sha256:992f18e0ea248ee03b5a6e8b3b4738850ae7dbb172cc41c966462801cbf62cf7"},
+    {file = "yarl-1.9.4-cp312-cp312-musllinux_1_1_s390x.whl", hash = "sha256:0e9d124c191d5b881060a9e5060627694c3bdd1fe24c5eecc8d5d7d0eb6faabc"},
+    {file = "yarl-1.9.4-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:3986b6f41ad22988e53d5778f91855dc0399b043fc8946d4f2e68af22ee9ff10"},
+    {file = "yarl-1.9.4-cp312-cp312-win32.whl", hash = "sha256:4b21516d181cd77ebd06ce160ef8cc2a5e9ad35fb1c5930882baff5ac865eee7"},
+    {file = "yarl-1.9.4-cp312-cp312-win_amd64.whl", hash = "sha256:a9bd00dc3bc395a662900f33f74feb3e757429e545d831eef5bb280252631984"},
+    {file = "yarl-1.9.4-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:63b20738b5aac74e239622d2fe30df4fca4942a86e31bf47a81a0e94c14df94f"},
+    {file = "yarl-1.9.4-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d7d7f7de27b8944f1fee2c26a88b4dabc2409d2fea7a9ed3df79b67277644e17"},
+    {file = "yarl-1.9.4-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:c74018551e31269d56fab81a728f683667e7c28c04e807ba08f8c9e3bba32f14"},
+    {file = "yarl-1.9.4-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:ca06675212f94e7a610e85ca36948bb8fc023e458dd6c63ef71abfd482481aa5"},
+    {file = "yarl-1.9.4-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5aef935237d60a51a62b86249839b51345f47564208c6ee615ed2a40878dccdd"},
+    {file = "yarl-1.9.4-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2b134fd795e2322b7684155b7855cc99409d10b2e408056db2b93b51a52accc7"},
+    {file = "yarl-1.9.4-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:d25039a474c4c72a5ad4b52495056f843a7ff07b632c1b92ea9043a3d9950f6e"},
+    {file = "yarl-1.9.4-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:f7d6b36dd2e029b6bcb8a13cf19664c7b8e19ab3a58e0fefbb5b8461447ed5ec"},
+    {file = "yarl-1.9.4-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:957b4774373cf6f709359e5c8c4a0af9f6d7875db657adb0feaf8d6cb3c3964c"},
+    {file = "yarl-1.9.4-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:d7eeb6d22331e2fd42fce928a81c697c9ee2d51400bd1a28803965883e13cead"},
+    {file = "yarl-1.9.4-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:6a962e04b8f91f8c4e5917e518d17958e3bdee71fd1d8b88cdce74dd0ebbf434"},
+    {file = "yarl-1.9.4-cp37-cp37m-win32.whl", hash = "sha256:f3bc6af6e2b8f92eced34ef6a96ffb248e863af20ef4fde9448cc8c9b858b749"},
+    {file = "yarl-1.9.4-cp37-cp37m-win_amd64.whl", hash = "sha256:ad4d7a90a92e528aadf4965d685c17dacff3df282db1121136c382dc0b6014d2"},
+    {file = "yarl-1.9.4-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:ec61d826d80fc293ed46c9dd26995921e3a82146feacd952ef0757236fc137be"},
+    {file = "yarl-1.9.4-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:8be9e837ea9113676e5754b43b940b50cce76d9ed7d2461df1af39a8ee674d9f"},
+    {file = "yarl-1.9.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:bef596fdaa8f26e3d66af846bbe77057237cb6e8efff8cd7cc8dff9a62278bbf"},
+    {file = "yarl-1.9.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2d47552b6e52c3319fede1b60b3de120fe83bde9b7bddad11a69fb0af7db32f1"},
+    {file = "yarl-1.9.4-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:84fc30f71689d7fc9168b92788abc977dc8cefa806909565fc2951d02f6b7d57"},
+    {file = "yarl-1.9.4-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:4aa9741085f635934f3a2583e16fcf62ba835719a8b2b28fb2917bb0537c1dfa"},
+    {file = "yarl-1.9.4-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:206a55215e6d05dbc6c98ce598a59e6fbd0c493e2de4ea6cc2f4934d5a18d130"},
+    {file = "yarl-1.9.4-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:07574b007ee20e5c375a8fe4a0789fad26db905f9813be0f9fef5a68080de559"},
+    {file = "yarl-1.9.4-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:5a2e2433eb9344a163aced6a5f6c9222c0786e5a9e9cac2c89f0b28433f56e23"},
+    {file = "yarl-1.9.4-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:6ad6d10ed9b67a382b45f29ea028f92d25bc0bc1daf6c5b801b90b5aa70fb9ec"},
+    {file = "yarl-1.9.4-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:6fe79f998a4052d79e1c30eeb7d6c1c1056ad33300f682465e1b4e9b5a188b78"},
+    {file = "yarl-1.9.4-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:a825ec844298c791fd28ed14ed1bffc56a98d15b8c58a20e0e08c1f5f2bea1be"},
+    {file = "yarl-1.9.4-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:8619d6915b3b0b34420cf9b2bb6d81ef59d984cb0fde7544e9ece32b4b3043c3"},
+    {file = "yarl-1.9.4-cp38-cp38-win32.whl", hash = "sha256:686a0c2f85f83463272ddffd4deb5e591c98aac1897d65e92319f729c320eece"},
+    {file = "yarl-1.9.4-cp38-cp38-win_amd64.whl", hash = "sha256:a00862fb23195b6b8322f7d781b0dc1d82cb3bcac346d1e38689370cc1cc398b"},
+    {file = "yarl-1.9.4-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:604f31d97fa493083ea21bd9b92c419012531c4e17ea6da0f65cacdcf5d0bd27"},
+    {file = "yarl-1.9.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:8a854227cf581330ffa2c4824d96e52ee621dd571078a252c25e3a3b3d94a1b1"},
+    {file = "yarl-1.9.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:ba6f52cbc7809cd8d74604cce9c14868306ae4aa0282016b641c661f981a6e91"},
+    {file = "yarl-1.9.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a6327976c7c2f4ee6816eff196e25385ccc02cb81427952414a64811037bbc8b"},
+    {file = "yarl-1.9.4-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:8397a3817d7dcdd14bb266283cd1d6fc7264a48c186b986f32e86d86d35fbac5"},
+    {file = "yarl-1.9.4-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:e0381b4ce23ff92f8170080c97678040fc5b08da85e9e292292aba67fdac6c34"},
+    {file = "yarl-1.9.4-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:23d32a2594cb5d565d358a92e151315d1b2268bc10f4610d098f96b147370136"},
+    {file = "yarl-1.9.4-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ddb2a5c08a4eaaba605340fdee8fc08e406c56617566d9643ad8bf6852778fc7"},
+    {file = "yarl-1.9.4-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:26a1dc6285e03f3cc9e839a2da83bcbf31dcb0d004c72d0730e755b33466c30e"},
+    {file = "yarl-1.9.4-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:18580f672e44ce1238b82f7fb87d727c4a131f3a9d33a5e0e82b793362bf18b4"},
+    {file = "yarl-1.9.4-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:29e0f83f37610f173eb7e7b5562dd71467993495e568e708d99e9d1944f561ec"},
+    {file = "yarl-1.9.4-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:1f23e4fe1e8794f74b6027d7cf19dc25f8b63af1483d91d595d4a07eca1fb26c"},
+    {file = "yarl-1.9.4-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:db8e58b9d79200c76956cefd14d5c90af54416ff5353c5bfd7cbe58818e26ef0"},
+    {file = "yarl-1.9.4-cp39-cp39-win32.whl", hash = "sha256:c7224cab95645c7ab53791022ae77a4509472613e839dab722a72abe5a684575"},
+    {file = "yarl-1.9.4-cp39-cp39-win_amd64.whl", hash = "sha256:824d6c50492add5da9374875ce72db7a0733b29c2394890aef23d533106e2b15"},
+    {file = "yarl-1.9.4-py3-none-any.whl", hash = "sha256:928cecb0ef9d5a7946eb6ff58417ad2fe9375762382f1bf5c55e61645f2c43ad"},
+    {file = "yarl-1.9.4.tar.gz", hash = "sha256:566db86717cf8080b99b58b083b773a908ae40f06681e87e589a976faf8246bf"},
 ]
 
-[package.extras]
-docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"]
-testing = ["big-O", "flake8 (<5)", "jaraco.functools", "jaraco.itertools", "more-itertools", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-flake8", "pytest-mypy (>=0.9.1)"]
+[package.dependencies]
+idna = ">=2.0"
+multidict = ">=4.0"
 
 [metadata]
 lock-version = "2.0"
-python-versions = ">=3.7 <=4"
-content-hash = "a521ce7dc5692587334cf5116fa19b834a12ab556c1ab32cd8f6793dd5d5568c"
+python-versions = ">=3.8.1,<=4"
+content-hash = "494e13a2e2742cb22d504ba34cf18391f5727928283ad845214ac0b84f9bd3ec"
diff --git a/crates/aptos/e2e/pyproject.toml b/crates/aptos/e2e/pyproject.toml
index 23b3274f6d7f0..8368895122074 100644
--- a/crates/aptos/e2e/pyproject.toml
+++ b/crates/aptos/e2e/pyproject.toml
@@ -6,8 +6,8 @@ authors = ["Aptos Labs <opensource@aptoslabs.com>"]
 license = "Apache-2.0"
 
 [tool.poetry.dependencies]
-python = ">=3.7 <=4"
-aptos-sdk = "^0.5.1"
+python = ">=3.8.1,<=4"
+aptos-sdk = "^0.8.6"
 requests = "^2.31.0"
 
 [tool.poetry.dev-dependencies]
diff --git a/crates/aptos/e2e/test_helpers.py b/crates/aptos/e2e/test_helpers.py
index 3dac76c93868c..67d2655674f3f 100644
--- a/crates/aptos/e2e/test_helpers.py
+++ b/crates/aptos/e2e/test_helpers.py
@@ -10,7 +10,7 @@
 import traceback
 from dataclasses import dataclass
 
-from aptos_sdk.client import RestClient
+from aptos_sdk.async_client import RestClient
 from common import METRICS_PORT, NODE_PORT, AccountInfo, Network, build_image_name
 
 LOG = logging.getLogger(__name__)
diff --git a/crates/aptos/src/account/balance.rs b/crates/aptos/src/account/balance.rs
new file mode 100644
index 0000000000000..dbb6dd193148a
--- /dev/null
+++ b/crates/aptos/src/account/balance.rs
@@ -0,0 +1,97 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::common::types::{
+    CliCommand, CliConfig, CliError, CliTypedResult, ConfigSearchMode, ProfileOptions, RestOptions,
+};
+use aptos_api_types::ViewFunction;
+use aptos_types::{account_address::AccountAddress, APTOS_COIN_TYPE};
+use async_trait::async_trait;
+use clap::Parser;
+use move_core_types::{ident_str, language_storage::ModuleId, parser::parse_type_tag};
+use serde::Serialize;
+
+/// Show the account's balance of different coins
+///
+/// TODO: Fungible assets
+#[derive(Debug, Parser)]
+pub struct Balance {
+    /// Address of the account you want to list resources/modules/balance for
+    #[clap(long, value_parser = crate::common::types::load_account_arg)]
+    pub(crate) account: Option<AccountAddress>,
+
+    /// Coin type to lookup.  Defaults to 0x1::aptos_coin::AptosCoin
+    #[clap(long)]
+    pub(crate) coin_type: Option<String>,
+
+    #[clap(flatten)]
+    pub(crate) rest_options: RestOptions,
+    #[clap(flatten)]
+    pub(crate) profile_options: ProfileOptions,
+}
+
+#[derive(Debug, Clone, Serialize)]
+pub struct AccountBalance {
+    asset_type: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    coin_type: Option<String>,
+    balance: u64,
+}
+
+#[async_trait]
+impl CliCommand<Vec<AccountBalance>> for Balance {
+    fn command_name(&self) -> &'static str {
+        "Balance"
+    }
+
+    async fn execute(self) -> CliTypedResult<Vec<AccountBalance>> {
+        let account = if let Some(account) = self.account {
+            account
+        } else if let Some(Some(account)) = CliConfig::load_profile(
+            self.profile_options.profile_name(),
+            ConfigSearchMode::CurrentDirAndParents,
+        )?
+        .map(|p| p.account)
+        {
+            account
+        } else {
+            return Err(CliError::CommandArgumentError(
+                "Please provide an account using --account or run aptos init".to_string(),
+            ));
+        };
+
+        let coin_type = if let Some(coin) = self.coin_type {
+            parse_type_tag(&coin).map_err(|err| {
+                CliError::CommandArgumentError(format!("Invalid coin type '{}': {:#?}", coin, err))
+            })?
+        } else {
+            // If nothing is given, use the default APT
+            APTOS_COIN_TYPE.to_owned()
+        };
+
+        let client = self.rest_options.client(&self.profile_options)?;
+        let response = client
+            .view_bcs_with_json_response(
+                &ViewFunction {
+                    module: ModuleId::new(AccountAddress::ONE, ident_str!("coin").to_owned()),
+                    function: ident_str!("balance").to_owned(),
+                    ty_args: vec![coin_type.clone()],
+                    args: vec![account.to_vec()],
+                },
+                None,
+            )
+            .await?;
+
+        let balance = response.inner()[0]
+            .as_str()
+            .unwrap()
+            .parse::<u64>()
+            .unwrap();
+
+        return Ok(vec![AccountBalance {
+            asset_type: "coin".to_string(),
+            coin_type: Some(coin_type.to_string()),
+            balance,
+        }]);
+    }
+}
diff --git a/crates/aptos/src/account/key_rotation.rs b/crates/aptos/src/account/key_rotation.rs
index e964d4e93ee4c..0d26e85a97856 100644
--- a/crates/aptos/src/account/key_rotation.rs
+++ b/crates/aptos/src/account/key_rotation.rs
@@ -1,14 +1,11 @@
 // Copyright © Aptos Foundation
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::common::{
-    types::{
-        account_address_from_auth_key, account_address_from_public_key,
-        AuthenticationKeyInputOptions, CliCommand, CliConfig, CliError, CliTypedResult,
-        ConfigSearchMode, EncodingOptions, ExtractPublicKey, ParsePrivateKey, ProfileConfig,
-        ProfileOptions, PublicKeyInputOptions, RestOptions, TransactionOptions, TransactionSummary,
-    },
-    utils::{prompt_yes, prompt_yes_with_override, read_line},
+use crate::common::types::{
+    account_address_from_auth_key, account_address_from_public_key, AuthenticationKeyInputOptions,
+    CliCommand, CliConfig, CliError, CliTypedResult, ConfigSearchMode, EncodingOptions,
+    ExtractPublicKey, HardwareWalletOptions, ParsePrivateKey, ProfileConfig, ProfileOptions,
+    PublicKeyInputOptions, RestOptions, TransactionOptions, TransactionSummary,
 };
 use aptos_cached_packages::aptos_stdlib;
 use aptos_crypto::{
@@ -16,6 +13,7 @@ use aptos_crypto::{
     encoding_type::EncodingType,
     PrivateKey, SigningKey,
 };
+use aptos_ledger;
 use aptos_rest_client::{
     aptos_api_types::{AptosError, AptosErrorCode},
     error::{AptosErrorResponse, RestError},
@@ -27,7 +25,7 @@ use aptos_types::{
     transaction::authenticator::AuthenticationKey,
 };
 use async_trait::async_trait;
-use clap::Parser;
+use clap::{Args, Parser};
 use serde::{Deserialize, Serialize};
 use std::{collections::BTreeMap, path::PathBuf};
 
@@ -38,31 +36,57 @@ use std::{collections::BTreeMap, path::PathBuf};
 /// rotated you will need to use the original account address, with the
 /// new private key.  There is an interactive prompt to help you add it
 /// to a new profile.
+///
+/// If you wish to rotate from a ledger wallet, it must have its own
+/// profile. If you wish to rotate to a ledger wallet, specify the new
+/// derivation path or index accordingly.
 #[derive(Debug, Parser)]
 pub struct RotateKey {
     #[clap(flatten)]
     pub(crate) txn_options: TransactionOptions,
 
+    #[clap(flatten)]
+    pub(crate) new_auth_key_options: NewAuthKeyOptions,
+
+    #[clap(flatten)]
+    pub(crate) new_profile_options: NewProfileOptions,
+}
+
+#[derive(Args, Debug)]
+#[group(required = true, multiple = false)]
+pub(crate) struct NewAuthKeyOptions {
     /// File name that contains the new private key encoded in the type from `--encoding`
-    #[clap(long, group = "new_private_key_inputs", value_parser)]
+    #[clap(long, value_parser)]
     pub(crate) new_private_key_file: Option<PathBuf>,
 
     /// New private key encoded in the type from `--encoding`
-    #[clap(long, group = "new_private_key_inputs")]
+    #[clap(long)]
     pub(crate) new_private_key: Option<String>,
 
-    /// Name of the profile to save the new private key
+    /// BIP44 derivation path of hardware wallet account, e.g. `m/44'/637'/0'/0'/0'`
     ///
-    /// If not provided, it will interactively have you save a profile,
-    /// unless `--skip_saving_profile` is provided
+    /// Note you may need to escape single quotes in your shell, for example
+    /// `m/44'/637'/0'/0'/0'` would be `m/44\'/637\'/0\'/0\'/0\'`
     #[clap(long)]
-    pub(crate) save_to_profile: Option<String>,
+    pub(crate) new_derivation_path: Option<String>,
 
-    /// Skip saving profile
+    /// BIP44 account index of hardware wallet account, e.g. `0`
     ///
-    /// This skips the interactive profile saving after rotating the authentication key
+    /// Given index `n` maps to BIP44 derivation path `m/44'/637'/n'/0'/0`
+    #[clap(long)]
+    pub(crate) new_derivation_index: Option<String>,
+}
+
+#[derive(Args, Debug)]
+#[group(required = true, multiple = false)]
+pub(crate) struct NewProfileOptions {
+    /// Only specify if you do not want to save a new profile
     #[clap(long)]
     pub(crate) skip_saving_profile: bool,
+
+    /// Name of new the profile to save for the new authentication key
+    #[clap(long)]
+    pub(crate) save_to_profile: Option<String>,
 }
 
 impl ParsePrivateKey for RotateKey {}
@@ -75,8 +99,8 @@ impl RotateKey {
     ) -> CliTypedResult<Option<Ed25519PrivateKey>> {
         self.parse_private_key(
             encoding,
-            self.new_private_key_file.clone(),
-            self.new_private_key.clone(),
+            self.new_auth_key_options.new_private_key_file.clone(),
+            self.new_auth_key_options.new_private_key.clone(),
         )
     }
 }
@@ -94,56 +118,147 @@ impl CliCommand<RotateSummary> for RotateKey {
     }
 
     async fn execute(self) -> CliTypedResult<RotateSummary> {
-        let new_private_key = self
-            .extract_private_key(self.txn_options.encoding_options.encoding)?
-            .ok_or_else(|| {
-                CliError::CommandArgumentError(
-                    "One of ['--new-private-key', '--new-private-key-file'] must be used"
-                        .to_string(),
-                )
-            })?;
-
-        let (current_private_key, sender_address) = self.txn_options.get_key_and_address()?;
-
-        if new_private_key == current_private_key {
+        // Verify profile name before executing rotation operation, to avoid erroring out in a
+        // manner that results in corrupted config state.
+        if let Some(ref new_profile_name) = self.new_profile_options.save_to_profile {
+            if new_profile_name.is_empty() {
+                return Err(CliError::CommandArgumentError(
+                    "New profile name may not be empty".to_string(),
+                ));
+            };
+
+            // Verify that config exists by attempting to load it.
+            let config = CliConfig::load(ConfigSearchMode::CurrentDirAndParents)?;
+
+            // Verify that the new profile name does not already exist in the config.
+            if let Some(profiles) = config.profiles {
+                if profiles.contains_key(new_profile_name) {
+                    return Err(CliError::CommandArgumentError(format!(
+                        "Profile {} already exists",
+                        new_profile_name
+                    )));
+                };
+            }
+        };
+
+        // Get current signer options.
+        let current_derivation_path = if self.txn_options.profile_options.profile.is_some() {
+            self.txn_options.profile_options.derivation_path()?
+        } else {
+            None
+        };
+        let (current_private_key, current_address, current_public_key) = if current_derivation_path
+            .is_some()
+        {
+            (
+                None,
+                self.txn_options.profile_options.account_address()?,
+                self.txn_options.profile_options.public_key()?,
+            )
+        } else {
+            let (current_private_key, current_address) = self.txn_options.get_key_and_address()?;
+            (
+                Some(current_private_key),
+                current_address,
+                self.txn_options.get_public_key()?,
+            )
+        };
+
+        // Get new signer options.
+        let new_hardware_wallet_options = HardwareWalletOptions {
+            derivation_path: self.new_auth_key_options.new_derivation_path.clone(),
+            derivation_index: self.new_auth_key_options.new_derivation_index.clone(),
+        };
+        let new_derivation_path = new_hardware_wallet_options.extract_derivation_path()?;
+        let (new_private_key, new_public_key) = if new_derivation_path.is_some() {
+            (
+                None,
+                aptos_ledger::get_public_key(new_derivation_path.clone().unwrap().as_str(), false)?,
+            )
+        } else {
+            let new_private_key = self
+                .extract_private_key(self.txn_options.encoding_options.encoding)?
+                .ok_or_else(|| {
+                    CliError::CommandArgumentError("Unable to parse new private key".to_string())
+                })?;
+            (Some(new_private_key.clone()), new_private_key.public_key())
+        };
+
+        // Check that public key is actually changing.
+        if new_public_key == current_public_key {
             return Err(CliError::CommandArgumentError(
-                "New private key cannot be the same as the current private key".to_string(),
+                "New public key cannot be the same as the current public key".to_string(),
             ));
         }
 
-        // Get sequence number for account
-        let sequence_number = self.txn_options.sequence_number(sender_address).await?;
-        let auth_key = self.txn_options.auth_key(sender_address).await?;
-
+        // Construct rotation proof challenge.
+        let sequence_number = self.txn_options.sequence_number(current_address).await?;
+        let auth_key = self.txn_options.auth_key(current_address).await?;
         let rotation_proof = RotationProofChallenge {
             account_address: CORE_CODE_ADDRESS,
             module_name: "account".to_string(),
             struct_name: "RotationProofChallenge".to_string(),
             sequence_number,
-            originator: sender_address,
+            originator: current_address,
             current_auth_key: AccountAddress::from_bytes(auth_key)
                 .map_err(|err| CliError::UnableToParse("auth_key", err.to_string()))?,
-            new_public_key: new_private_key.public_key().to_bytes().to_vec(),
+            new_public_key: new_public_key.to_bytes().to_vec(),
         };
-
         let rotation_msg =
             bcs::to_bytes(&rotation_proof).map_err(|err| CliError::BCS("rotation_proof", err))?;
 
-        // Signs the struct using both the current private key and the next private key
+        // Determine if current and new keys are hardware wallets, for better user feedback.
+        let current_is_hardware_wallet = current_derivation_path.is_some();
+        let new_is_hardware_wallet = new_derivation_path.is_some();
+
+        // Sign the struct using both the current private key and the new private key.
         let rotation_proof_signed_by_current_private_key =
-            current_private_key.sign_arbitrary_message(&rotation_msg.clone());
+            if let Some(current_derivation_path) = current_derivation_path.clone() {
+                eprintln!("Sign rotation proof challenge on your Ledger device (current key)");
+                let challenge_signature = aptos_ledger::sign_message(
+                    current_derivation_path.as_str(),
+                    &rotation_msg.clone(),
+                )?;
+                eprintln!("Rotation proof challenge successfully signed (current key)");
+                if !new_is_hardware_wallet {
+                    eprintln!("You will still need to sign the transaction on your Ledger device");
+                }
+                challenge_signature
+            } else {
+                current_private_key
+                    .unwrap()
+                    .sign_arbitrary_message(&rotation_msg.clone())
+            };
         let rotation_proof_signed_by_new_private_key =
-            new_private_key.sign_arbitrary_message(&rotation_msg);
-
+            if let Some(new_derivation_path) = new_derivation_path.clone() {
+                eprintln!("Sign rotation proof challenge on your Ledger device (new key)");
+                let challenge_signature = aptos_ledger::sign_message(
+                    new_derivation_path.clone().as_str(),
+                    &rotation_msg.clone(),
+                )?;
+                eprintln!("Rotation proof challenge successfully signed (new key)");
+                if current_is_hardware_wallet {
+                    eprintln!("You will still need to sign the transaction on your Ledger device");
+                }
+                challenge_signature
+            } else {
+                new_private_key
+                    .clone()
+                    .unwrap()
+                    .sign_arbitrary_message(&rotation_msg.clone())
+            };
+
+        // Submit transaction.
+        if current_derivation_path.is_some() {
+            eprintln!("Approve transaction on your Ledger device");
+        };
         let txn_summary = self
             .txn_options
             .submit_transaction(aptos_stdlib::account_rotate_authentication_key(
                 0,
-                // Existing public key
-                current_private_key.public_key().to_bytes().to_vec(),
+                current_public_key.to_bytes().to_vec(),
                 0,
-                // New public key
-                new_private_key.public_key().to_bytes().to_vec(),
+                new_public_key.to_bytes().to_vec(),
                 rotation_proof_signed_by_current_private_key
                     .to_bytes()
                     .to_vec(),
@@ -152,10 +267,9 @@ impl CliCommand<RotateSummary> for RotateKey {
             .await
             .map(TransactionSummary::from)?;
 
-        let string = serde_json::to_string_pretty(&txn_summary)
+        let txn_string = serde_json::to_string_pretty(&txn_summary)
             .map_err(|err| CliError::UnableToParse("transaction summary", err.to_string()))?;
-
-        eprintln!("{}", string);
+        eprintln!("{}", txn_string);
 
         if let Some(txn_success) = txn_summary.success {
             if !txn_success {
@@ -169,87 +283,48 @@ impl CliCommand<RotateSummary> for RotateKey {
             ));
         }
 
-        let mut profile_name: String;
-
-        if self.save_to_profile.is_none() {
-            if self.skip_saving_profile
-                || !prompt_yes("Do you want to create a profile for the new key?")
-            {
-                return Ok(RotateSummary {
-                    transaction: txn_summary,
-                    message: None,
-                });
-            }
-
-            eprintln!("Enter the name for the profile");
-            profile_name = read_line("Profile name")?.trim().to_string();
-        } else {
-            // We can safely unwrap here
-            profile_name = self.save_to_profile.unwrap();
+        if self.new_profile_options.skip_saving_profile {
+            return Ok(RotateSummary {
+                transaction: txn_summary,
+                message: None,
+            });
         }
 
-        // Check if profile name exists
-        let mut config = CliConfig::load(ConfigSearchMode::CurrentDirAndParents)?;
+        // Can safe unwrap here since NewProfileOptions arg group requires either that
+        // skip_saving_profile is set, or that a new profile name is specified. If a new profile is
+        // specified, then it will have already been error checked above.
+        let new_profile_name = self.new_profile_options.save_to_profile.unwrap();
 
-        if let Some(ref profiles) = config.profiles {
-            if profiles.contains_key(&profile_name) {
-                if let Err(cli_err) = prompt_yes_with_override(
-                    format!(
-                        "Profile {} exits. Do you want to provide a new profile name?",
-                        profile_name
-                    )
-                    .as_str(),
-                    self.txn_options.prompt_options,
-                ) {
-                    match cli_err {
-                        CliError::AbortedError => {
-                            return Ok(RotateSummary {
-                                transaction: txn_summary,
-                                message: None,
-                            });
-                        },
-                        _ => {
-                            return Err(cli_err);
-                        },
-                    }
-                }
-
-                eprintln!("Enter the name for the profile");
-                profile_name = read_line("Profile name")?.trim().to_string();
-            }
-        }
-
-        if profile_name.is_empty() {
-            return Err(CliError::AbortedError);
+        // If no config exists, then the error should've been caught earlier during the profile
+        // name verification step.
+        let mut config = CliConfig::load(ConfigSearchMode::CurrentDirAndParents)?;
+        if config.profiles.is_none() {
+            config.profiles = Some(BTreeMap::new());
         }
 
-        let mut profile_config = ProfileConfig {
-            private_key: Some(new_private_key.clone()),
-            public_key: Some(new_private_key.public_key()),
-            account: Some(sender_address),
+        // Create new config.
+        let mut new_profile_config = ProfileConfig {
+            public_key: Some(new_public_key),
+            account: Some(current_address),
+            private_key: new_private_key,
+            derivation_path: new_derivation_path,
             ..self.txn_options.profile_options.profile()?
         };
 
         if let Some(url) = self.txn_options.rest_options.url {
-            profile_config.rest_url = Some(url.into());
-        }
-
-        if config.profiles.is_none() {
-            config.profiles = Some(BTreeMap::new());
+            new_profile_config.rest_url = Some(url.into());
         }
 
         config
             .profiles
             .as_mut()
             .unwrap()
-            .insert(profile_name.clone(), profile_config);
+            .insert(new_profile_name.clone(), new_profile_config);
         config.save()?;
 
-        eprintln!("Profile {} is saved.", profile_name);
-
         Ok(RotateSummary {
             transaction: txn_summary,
-            message: Some(format!("Profile {} is saved.", profile_name)),
+            message: Some(format!("Saved new profile {}", new_profile_name)),
         })
     }
 }
diff --git a/crates/aptos/src/account/mod.rs b/crates/aptos/src/account/mod.rs
index 2421a74327360..18e769ecad85b 100644
--- a/crates/aptos/src/account/mod.rs
+++ b/crates/aptos/src/account/mod.rs
@@ -4,6 +4,7 @@
 use crate::common::types::{CliCommand, CliResult};
 use clap::Subcommand;
 
+pub mod balance;
 pub mod create;
 pub mod create_resource_account;
 pub mod derive_resource_account;
@@ -23,6 +24,7 @@ pub enum AccountTool {
     CreateResourceAccount(create_resource_account::CreateResourceAccount),
     DeriveResourceAccountAddress(derive_resource_account::DeriveResourceAccount),
     FundWithFaucet(fund::FundWithFaucet),
+    Balance(balance::Balance),
     List(list::ListAccount),
     LookupAddress(key_rotation::LookupAddress),
     RotateKey(key_rotation::RotateKey),
@@ -36,6 +38,7 @@ impl AccountTool {
             AccountTool::CreateResourceAccount(tool) => tool.execute_serialized().await,
             AccountTool::DeriveResourceAccountAddress(tool) => tool.execute_serialized().await,
             AccountTool::FundWithFaucet(tool) => tool.execute_serialized().await,
+            AccountTool::Balance(tool) => tool.execute_serialized().await,
             AccountTool::List(tool) => tool.execute_serialized().await,
             AccountTool::LookupAddress(tool) => tool.execute_serialized().await,
             AccountTool::RotateKey(tool) => tool.execute_serialized().await,
diff --git a/crates/aptos/src/common/init.rs b/crates/aptos/src/common/init.rs
index ae9c12a040489..46a5a7da8f6ad 100644
--- a/crates/aptos/src/common/init.rs
+++ b/crates/aptos/src/common/init.rs
@@ -9,7 +9,7 @@ use crate::{
             ConfigSearchMode, EncodingOptions, HardwareWalletOptions, PrivateKeyInputOptions,
             ProfileConfig, ProfileOptions, PromptOptions, RngArgs, DEFAULT_PROFILE,
         },
-        utils::{fund_account, prompt_yes_with_override, read_line},
+        utils::{explorer_account_link, fund_account, prompt_yes_with_override, read_line},
     },
 };
 use aptos_crypto::{ed25519::Ed25519PrivateKey, PrivateKey, ValidCryptoMaterialStringExt};
@@ -22,7 +22,11 @@ use async_trait::async_trait;
 use clap::Parser;
 use reqwest::Url;
 use serde::{Deserialize, Serialize};
-use std::{collections::BTreeMap, str::FromStr};
+use std::{
+    collections::BTreeMap,
+    fmt::{Display, Formatter},
+    str::FromStr,
+};
 
 /// 1 APT (might not actually get that much, depending on the faucet)
 const NUM_DEFAULT_OCTAS: u64 = 100000000;
@@ -122,6 +126,9 @@ impl CliCommand<()> for InitTool {
             }
         };
 
+        // Ensure the config contains the network used
+        profile_config.network = Some(network);
+
         // Ensure that there is at least a REST URL set for the network
         match network {
             Network::Mainnet => {
@@ -183,7 +190,7 @@ impl CliCommand<()> for InitTool {
         };
 
         // Set the derivation_path to the one user chose
-        profile_config.derivation_path = derivation_path.clone();
+        profile_config.derivation_path.clone_from(&derivation_path);
 
         // Private key
         let private_key = if self.is_hardware_wallet() {
@@ -337,7 +344,16 @@ impl CliCommand<()> for InitTool {
             .expect("Must have profiles, as created above")
             .insert(profile_name.to_string(), profile_config);
         config.save()?;
-        eprintln!("\n---\nAptos CLI is now set up for account {} as profile {}!  Run `aptos --help` for more information about commands", address, self.profile_options.profile_name().unwrap_or(DEFAULT_PROFILE));
+        let profile_name = self
+            .profile_options
+            .profile_name()
+            .unwrap_or(DEFAULT_PROFILE);
+        eprintln!(
+            "\n---\nAptos CLI is now set up for account {} as profile {}!\n See the account here: {}\n Run `aptos --help` for more information about commands",
+            address,
+            profile_name,
+            explorer_account_link(address, Some(network))
+        );
         Ok(())
     }
 }
@@ -431,6 +447,18 @@ pub enum Network {
     Custom,
 }
 
+impl Display for Network {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", match self {
+            Network::Mainnet => "mainnet",
+            Network::Testnet => "testnet",
+            Network::Devnet => "devnet",
+            Network::Local => "local",
+            Network::Custom => "custom",
+        })
+    }
+}
+
 impl FromStr for Network {
     type Err = CliError;
 
diff --git a/crates/aptos/src/common/local_simulation.rs b/crates/aptos/src/common/local_simulation.rs
index f25d6a943a31d..8828445011b48 100644
--- a/crates/aptos/src/common/local_simulation.rs
+++ b/crates/aptos/src/common/local_simulation.rs
@@ -19,11 +19,10 @@ pub fn run_transaction_using_debugger(
     _hash: HashValue,
 ) -> CliTypedResult<(VMStatus, VMOutput)> {
     let state_view = debugger.state_view_at_version(version);
-    let resolver = state_view.as_move_resolver();
-
-    let vm = AptosVM::new(&resolver, None);
-    let log_context = AdapterLogSchema::new(resolver.id(), 0);
+    let vm = AptosVM::new(&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, &transaction, &log_context);
 
     Ok((vm_status, vm_output))
@@ -36,11 +35,10 @@ pub fn benchmark_transaction_using_debugger(
     _hash: HashValue,
 ) -> CliTypedResult<(VMStatus, VMOutput)> {
     let state_view = debugger.state_view_at_version(version);
-    let resolver = state_view.as_move_resolver();
-
-    let vm = AptosVM::new(&resolver, None);
-    let log_context = AdapterLogSchema::new(resolver.id(), 0);
+    let vm = AptosVM::new(&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, &transaction, &log_context);
 
     let time_cold = {
@@ -50,8 +48,8 @@ pub fn benchmark_transaction_using_debugger(
         for _i in 0..n {
             // Create a new VM each time so to include code loading as part of the
             // total running time.
-            let vm = AptosVM::new(&resolver, None);
-            let log_context = AdapterLogSchema::new(resolver.id(), 0);
+            let vm = AptosVM::new(&state_view);
+            let log_context = AdapterLogSchema::new(state_view.id(), 0);
 
             let t1 = Instant::now();
             std::hint::black_box(vm.execute_user_transaction(
@@ -85,6 +83,7 @@ pub fn benchmark_transaction_using_debugger(
 
             times.push(t2 - t1);
         }
+        times.sort();
 
         times[n / 2]
     };
@@ -107,7 +106,7 @@ pub fn profile_transaction_using_debugger(
             CliError::UnexpectedError(format!("failed to simulate txn with gas profiler: {}", err))
         })?;
 
-    // Generate a humen-readable name for the report
+    // Generate a human-readable name for the report
     let entry_point = gas_log.entry_point();
 
     let human_readable_name = match entry_point {
diff --git a/crates/aptos/src/common/types.rs b/crates/aptos/src/common/types.rs
index 354a49ac0023a..65b41952d119b 100644
--- a/crates/aptos/src/common/types.rs
+++ b/crates/aptos/src/common/types.rs
@@ -1,7 +1,7 @@
 // Copyright © Aptos Foundation
 // SPDX-License-Identifier: Apache-2.0
 
-use super::utils::fund_account;
+use super::utils::{explorer_transaction_link, fund_account};
 use crate::{
     common::{
         init::Network,
@@ -53,6 +53,7 @@ use move_core_types::{
     account_address::AccountAddress, language_storage::TypeTag, vm_status::VMStatus,
 };
 use move_model::metadata::{CompilerVersion, LanguageVersion};
+use move_package::source_package::std_lib::StdVersion;
 use serde::{Deserialize, Serialize};
 #[cfg(unix)]
 use std::os::unix::fs::OpenOptionsExt;
@@ -231,6 +232,7 @@ pub const CONFIG_FOLDER: &str = ".aptos";
 /// An individual profile
 #[derive(Debug, Default, Serialize, Deserialize)]
 pub struct ProfileConfig {
+    /// Name of network being used, if setup from aptos init
     #[serde(skip_serializing_if = "Option::is_none")]
     pub network: Option<Network>,
     /// Private key for commands.
@@ -674,18 +676,17 @@ pub trait ParsePrivateKey {
 
 #[derive(Debug, Default, Parser)]
 pub struct HardwareWalletOptions {
-    /// Derivation Path of your account in hardware wallet
+    /// BIP44 derivation path of hardware wallet account, e.g. `m/44'/637'/0'/0'/0'`
     ///
-    /// e.g format - m/44\'/637\'/0\'/0\'/0\'
-    /// Make sure your wallet is unlocked and have Aptos opened
-    #[clap(long)]
+    /// Note you may need to escape single quotes in your shell, for example
+    /// `m/44'/637'/0'/0'/0'` would be `m/44\'/637\'/0\'/0\'/0\'`
+    #[clap(long, conflicts_with = "derivation_index")]
     pub derivation_path: Option<String>,
 
-    /// Index of your account in hardware wallet
+    /// BIP44 account index of hardware wallet account, e.g. `0`
     ///
-    /// This is the simpler version of derivation path e.g `format - [0]`
-    /// we will translate this index into `[m/44'/637'/0'/0'/0]`
-    #[clap(long)]
+    /// Given index `n` maps to BIP44 derivation path `m/44'/637'/n'/0'/0`
+    #[clap(long, conflicts_with = "derivation_path")]
     pub derivation_index: Option<String>,
 }
 
@@ -1048,6 +1049,10 @@ pub struct MovePackageDir {
     #[clap(long, value_parser = crate::common::utils::parse_map::<String, AccountAddressWrapper>, default_value = "")]
     pub(crate) named_addresses: BTreeMap<String, AccountAddressWrapper>,
 
+    /// Override the standard library version by mainnet/testnet/devnet
+    #[clap(long, value_parser)]
+    pub override_std: Option<StdVersion>,
+
     /// Skip pulling the latest git dependencies
     ///
     /// If you don't have a network connection, the compiler may fail due
@@ -1088,6 +1093,7 @@ impl MovePackageDir {
             package_dir: Some(package_dir),
             output_dir: None,
             named_addresses: Default::default(),
+            override_std: None,
             skip_fetch_latest_git_deps: true,
             bytecode_version: None,
             compiler_version: None,
@@ -1346,17 +1352,29 @@ impl From<&Transaction> for TransactionSummary {
                 pending: None,
                 sequence_number: None,
             },
-            Transaction::ValidatorTransaction(txn) => TransactionSummary {
+            Transaction::BlockEpilogueTransaction(txn) => TransactionSummary {
                 transaction_hash: txn.info.hash,
+                success: Some(txn.info.success),
+                version: Some(txn.info.version.0),
+                vm_status: Some(txn.info.vm_status.clone()),
+                timestamp_us: Some(txn.timestamp.0),
+                sender: None,
+                gas_used: None,
+                gas_unit_price: None,
+                pending: None,
+                sequence_number: None,
+            },
+            Transaction::ValidatorTransaction(txn) => TransactionSummary {
+                transaction_hash: txn.transaction_info().hash,
                 gas_used: None,
                 gas_unit_price: None,
                 pending: None,
                 sender: None,
                 sequence_number: None,
-                success: Some(txn.info.success),
-                timestamp_us: Some(txn.timestamp.0),
-                version: Some(txn.info.version.0),
-                vm_status: Some(txn.info.vm_status.clone()),
+                success: Some(txn.transaction_info().success),
+                timestamp_us: Some(txn.timestamp().0),
+                version: Some(txn.transaction_info().version.0),
+                vm_status: Some(txn.transaction_info().vm_status.clone()),
             },
         }
     }
@@ -1698,25 +1716,19 @@ impl TransactionOptions {
             adjusted_max_gas
         };
 
-        // Sign and submit transaction
+        // Build a transaction
         let transaction_factory = TransactionFactory::new(chain_id)
             .with_gas_unit_price(gas_unit_price)
             .with_max_gas_amount(max_gas)
             .with_transaction_expiration_time(self.gas_options.expiration_secs);
 
-        match self.get_transaction_account_type() {
+        // Sign it with the appropriate signer
+        let transaction = match self.get_transaction_account_type() {
             Ok(AccountType::Local) => {
                 let (private_key, _) = self.get_key_and_address()?;
                 let sender_account =
                     &mut LocalAccount::new(sender_address, private_key, sequence_number);
-                let transaction = sender_account
-                    .sign_with_transaction_builder(transaction_factory.payload(payload));
-                let response = client
-                    .submit_and_wait(&transaction)
-                    .await
-                    .map_err(|err| CliError::ApiError(err.to_string()))?;
-
-                Ok(response.into_inner())
+                sender_account.sign_with_transaction_builder(transaction_factory.payload(payload))
             },
             Ok(AccountType::HardwareWallet) => {
                 let sender_account = &mut HardwareWalletAccount::new(
@@ -1729,17 +1741,33 @@ impl TransactionOptions {
                     HardwareWalletType::Ledger,
                     sequence_number,
                 );
-                let transaction = sender_account
-                    .sign_with_transaction_builder(transaction_factory.payload(payload))?;
-                let response = client
-                    .submit_and_wait(&transaction)
-                    .await
-                    .map_err(|err| CliError::ApiError(err.to_string()))?;
-
-                Ok(response.into_inner())
+                sender_account
+                    .sign_with_transaction_builder(transaction_factory.payload(payload))?
             },
-            Err(err) => Err(err),
-        }
+            Err(err) => return Err(err),
+        };
+
+        // Submit the transaction, printing out a useful transaction link
+        client
+            .submit_bcs(&transaction)
+            .await
+            .map_err(|err| CliError::ApiError(err.to_string()))?;
+        let transaction_hash = transaction.clone().committed_hash();
+        let network = self
+            .profile_options
+            .profile()
+            .ok()
+            .and_then(|profile| profile.network);
+        eprintln!(
+            "Transaction submitted: {}",
+            explorer_transaction_link(transaction_hash, network)
+        );
+        let response = client
+            .wait_for_signed_transaction(&transaction)
+            .await
+            .map_err(|err| CliError::ApiError(err.to_string()))?;
+
+        Ok(response.into_inner())
     }
 
     /// Simulates a transaction locally, using the debugger to fetch required data from remote.
diff --git a/crates/aptos/src/common/utils.rs b/crates/aptos/src/common/utils.rs
index 9fcd7bc507c08..fcdaf59d4267f 100644
--- a/crates/aptos/src/common/utils.rs
+++ b/crates/aptos/src/common/utils.rs
@@ -2,9 +2,12 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{
-    common::types::{
-        account_address_from_public_key, CliError, CliTypedResult, PromptOptions,
-        TransactionOptions, TransactionSummary,
+    common::{
+        init::Network,
+        types::{
+            account_address_from_public_key, CliError, CliTypedResult, PromptOptions,
+            TransactionOptions, TransactionSummary,
+        },
     },
     config::GlobalConfig,
     CliResult,
@@ -563,3 +566,31 @@ pub fn view_json_option_str(option_ref: &serde_json::Value) -> CliTypedResult<Op
         )))
     }
 }
+
+pub fn explorer_account_link(hash: AccountAddress, network: Option<Network>) -> String {
+    // For now, default to what the browser is already on, though the link could be wrong
+    if let Some(network) = network {
+        format!(
+            "https://explorer.aptoslabs.com/account/{}?network={}",
+            hash, network
+        )
+    } else {
+        format!("https://explorer.aptoslabs.com/account/{}", hash)
+    }
+}
+
+pub fn explorer_transaction_link(
+    hash: aptos_crypto::HashValue,
+    network: Option<Network>,
+) -> String {
+    // For now, default to what the browser is already on, though the link could be wrong
+    if let Some(network) = network {
+        format!(
+            "https://explorer.aptoslabs.com/txn/{}?network={}",
+            hash.to_hex_literal(),
+            network
+        )
+    } else {
+        format!("https://explorer.aptoslabs.com/txn/{}", hash)
+    }
+}
diff --git a/crates/aptos/src/genesis/mod.rs b/crates/aptos/src/genesis/mod.rs
index f4f0fddd7c46e..7dabbc9c609e5 100644
--- a/crates/aptos/src/genesis/mod.rs
+++ b/crates/aptos/src/genesis/mod.rs
@@ -637,19 +637,19 @@ fn validate_validators(
 
         if !initialized_accounts.contains_key(&validator.owner_account_address.into()) {
             errors.push(CliError::UnexpectedError(format!(
-                "Owner {} in validator {} is is not in the balances.yaml file",
+                "Owner {} in validator {} is not in the balances.yaml file",
                 validator.owner_account_address, name
             )));
         }
         if !initialized_accounts.contains_key(&validator.operator_account_address.into()) {
             errors.push(CliError::UnexpectedError(format!(
-                "Operator {} in validator {} is is not in the balances.yaml file",
+                "Operator {} in validator {} is not in the balances.yaml file",
                 validator.operator_account_address, name
             )));
         }
         if !initialized_accounts.contains_key(&validator.voter_account_address.into()) {
             errors.push(CliError::UnexpectedError(format!(
-                "Voter {} in validator {} is is not in the balances.yaml file",
+                "Voter {} in validator {} is not in the balances.yaml file",
                 validator.voter_account_address, name
             )));
         }
@@ -905,25 +905,25 @@ fn validate_employee_accounts(
 
         if !initialized_accounts.contains_key(&pool.validator.validator.owner_address) {
             return Err(CliError::UnexpectedError(format!(
-                "Owner address {} in employee pool #{} is is not in the balances.yaml file",
+                "Owner address {} in employee pool #{} is not in the balances.yaml file",
                 pool.validator.validator.owner_address, i
             )));
         }
         if !initialized_accounts.contains_key(&pool.validator.validator.operator_address) {
             return Err(CliError::UnexpectedError(format!(
-                "Operator address {} in employee pool #{} is is not in the balances.yaml file",
+                "Operator address {} in employee pool #{} is not in the balances.yaml file",
                 pool.validator.validator.operator_address, i
             )));
         }
         if !initialized_accounts.contains_key(&pool.validator.validator.voter_address) {
             return Err(CliError::UnexpectedError(format!(
-                "Voter address {} in employee pool #{} is is not in the balances.yaml file",
+                "Voter address {} in employee pool #{} is not in the balances.yaml file",
                 pool.validator.validator.voter_address, i
             )));
         }
         if !initialized_accounts.contains_key(&pool.beneficiary_resetter) {
             return Err(CliError::UnexpectedError(format!(
-                "Beneficiary resetter {} in employee pool #{} is is not in the balances.yaml file",
+                "Beneficiary resetter {} in employee pool #{} is not in the balances.yaml file",
                 pool.beneficiary_resetter, i
             )));
         }
diff --git a/crates/aptos/src/governance/mod.rs b/crates/aptos/src/governance/mod.rs
index 9f5c60681c250..092c88c6ae0e0 100644
--- a/crates/aptos/src/governance/mod.rs
+++ b/crates/aptos/src/governance/mod.rs
@@ -769,7 +769,7 @@ impl std::fmt::Display for ProposalMetadata {
     }
 }
 
-fn compile_in_temp_dir(
+pub fn compile_in_temp_dir(
     script_name: &str,
     script_path: &Path,
     framework_package_args: &FrameworkPackageArgs,
@@ -1001,6 +1001,7 @@ impl CliCommand<()> for GenerateUpgradeProposal {
             move_options.dev,
             move_options.skip_fetch_latest_git_deps,
             move_options.named_addresses(),
+            move_options.override_std,
             move_options.bytecode_version,
             move_options.compiler_version,
             move_options.language_version,
diff --git a/crates/aptos/src/move_tool/bytecode.rs b/crates/aptos/src/move_tool/bytecode.rs
index c883783f02a51..7a80844d5b55f 100644
--- a/crates/aptos/src/move_tool/bytecode.rs
+++ b/crates/aptos/src/move_tool/bytecode.rs
@@ -214,6 +214,7 @@ impl BytecodeCommand {
             only_externally_visible: false,
             print_basic_blocks: true,
             print_locals: true,
+            print_bytecode_stats: false,
         };
         let no_loc = Spanned::unsafe_no_loc(()).loc;
         let module: CompiledModule;
diff --git a/crates/aptos/src/move_tool/fmt.rs b/crates/aptos/src/move_tool/fmt.rs
new file mode 100644
index 0000000000000..a86171701cdcf
--- /dev/null
+++ b/crates/aptos/src/move_tool/fmt.rs
@@ -0,0 +1,143 @@
+// Copyright (c) Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    common::types::{CliCommand, CliError, CliTypedResult},
+    update::get_movefmt_path,
+};
+use async_trait::async_trait;
+use clap::{Args, Parser};
+use std::{collections::BTreeMap, path::PathBuf, process::Command};
+
+/// Format the Move source code.
+#[derive(Debug, Parser)]
+pub struct Fmt {
+    #[clap(flatten)]
+    pub command: FmtCommand,
+}
+
+#[derive(clap::ValueEnum, Clone, Copy, Debug, Eq, PartialEq, PartialOrd)]
+pub enum EmitMode {
+    Overwrite,
+    NewFile,
+    StdOut,
+    Diff,
+}
+
+#[derive(Debug, Args)]
+#[clap(group(clap::ArgGroup::new("input")
+.required(true)
+.multiple(false)
+.args(&["file_path", "dir_path"]),
+))]
+pub struct FmtCommand {
+    /// How to generate and show the result after reformatting
+    #[clap(long, value_enum, default_value = "overwrite")]
+    emit_mode: EmitMode,
+
+    /// Path to the file to be formatted
+    #[clap(long, group = "input")]
+    file_path: Option<PathBuf>,
+
+    /// Path to the directory to be formatted
+    /// if neither file_path or dir_path is set, all move files in the current folder will be formatted
+    #[clap(long, group = "input")]
+    dir_path: Option<PathBuf>,
+
+    /// Path for the configuration file
+    /// Recursively searches the given path for the
+    /// movefmt.toml config file
+    #[clap(long, value_parser)]
+    pub config_path: Option<PathBuf>,
+
+    /// Set options from command line. These settings take
+    /// priority over movefmt.toml.
+    /// Config options can be found at https://github.com/movebit/movefmt/blob/develop/doc/how_to_use.md
+    #[clap(long, value_parser = crate::common::utils::parse_map::<String, String>, default_value = "")]
+    pub(crate) config: BTreeMap<String, String>,
+
+    #[clap(long, short)]
+    /// Print verbose output
+    pub verbose: bool,
+
+    #[clap(long, short)]
+    /// Print less output
+    pub quiet: bool,
+}
+
+#[async_trait]
+impl CliCommand<String> for Fmt {
+    fn command_name(&self) -> &'static str {
+        "Fmt"
+    }
+
+    async fn execute(mut self) -> CliTypedResult<String> {
+        self.command.execute().await
+    }
+}
+
+impl FmtCommand {
+    async fn execute(self) -> CliTypedResult<String> {
+        let exe = get_movefmt_path()?;
+        let mut cmd = Command::new(exe.as_path());
+        let input_opt = self.file_path;
+        let dir_opt = self.dir_path;
+        let config_path_opt = self.config_path;
+        let config_map = self.config;
+        let verbose_flag = self.verbose;
+        let quiet_flag = self.quiet;
+        let emit_mode = match self.emit_mode {
+            EmitMode::Overwrite => "overwrite",
+            EmitMode::NewFile => "new_file",
+            EmitMode::StdOut => "stdout",
+            EmitMode::Diff => "diff",
+        };
+        cmd.arg(format!("--emit={}", emit_mode));
+        if let Some(config_path) = config_path_opt {
+            cmd.arg(format!("--config-path={}", config_path.as_path().display()));
+        }
+        if verbose_flag {
+            cmd.arg("-v");
+        } else if quiet_flag {
+            cmd.arg("-q");
+        }
+        if !config_map.is_empty() {
+            let mut config_map_str_vec = vec![];
+            for (key, value) in config_map {
+                config_map_str_vec.push(format!("{}={}", key, value));
+            }
+            cmd.arg(format!("--config={}", config_map_str_vec.join(",")));
+        }
+        if let Some(file_path) = input_opt {
+            cmd.arg(format!("--file-path={}", file_path.as_path().display()));
+        } else {
+            let dir_path = if let Some(dir_path) = dir_opt {
+                dir_path.as_path().display().to_string()
+            } else {
+                "./".to_string()
+            };
+            cmd.arg(format!("--dir-path={}", dir_path));
+        }
+        let to_cli_error = |e| CliError::IO(exe.display().to_string(), e);
+        let out = cmd.output().map_err(to_cli_error)?;
+        if out.status.success() {
+            // let string_res = String::from_utf8(out.stdout);
+            match String::from_utf8(out.stdout) {
+                Ok(output) => {
+                    eprint!("{}", output);
+                    Ok("ok".to_string())
+                },
+                Err(err) => Err(CliError::UnexpectedError(format!(
+                    "output generated by formatter is not valid utf8: {}",
+                    err
+                ))),
+            }
+        } else {
+            Err(CliError::UnexpectedError(format!(
+                "formatter exited with status {}: {}",
+                out.status,
+                String::from_utf8(out.stderr).unwrap_or_default()
+            )))
+        }
+    }
+}
diff --git a/crates/aptos/src/move_tool/mod.rs b/crates/aptos/src/move_tool/mod.rs
index 5d31321d96c05..9b12c70d8f2e8 100644
--- a/crates/aptos/src/move_tool/mod.rs
+++ b/crates/aptos/src/move_tool/mod.rs
@@ -21,6 +21,7 @@ use crate::{
     move_tool::{
         bytecode::{Decompile, Disassemble},
         coverage::SummaryCoverage,
+        fmt::Fmt,
         manifest::{Dependency, ManifestNamedAddress, MovePackageManifest, PackageInfo},
     },
     CliCommand, CliResult,
@@ -50,7 +51,10 @@ use move_cli::{self, base::test::UnitTestResult};
 use move_command_line_common::env::MOVE_HOME;
 use move_core_types::{identifier::Identifier, language_storage::ModuleId, u256::U256};
 use move_model::metadata::{CompilerVersion, LanguageVersion};
-use move_package::{source_package::layout::SourcePackageLayout, BuildConfig, CompilerConfig};
+use move_package::{
+    source_package::{layout::SourcePackageLayout, std_lib::StdVersion},
+    BuildConfig, CompilerConfig,
+};
 use move_unit_test::UnitTestingConfig;
 pub use package_hooks::*;
 use serde::{Deserialize, Serialize};
@@ -68,12 +72,17 @@ use url::Url;
 mod aptos_debug_natives;
 mod bytecode;
 pub mod coverage;
+mod fmt;
 mod manifest;
 pub mod package_hooks;
 mod show;
 pub mod stored_package;
 
-/// Tool for Move related operations
+const HELLO_BLOCKCHAIN_EXAMPLE: &str = include_str!(
+    "../../../../aptos-move/move-examples/hello_blockchain/sources/hello_blockchain.move"
+);
+
+/// Tool for Move smart contract related operations
 ///
 /// This tool lets you compile, test, and publish Move code, in addition
 /// to run any other tools that help run, verify, or provide information
@@ -82,20 +91,26 @@ pub mod stored_package;
 pub enum MoveTool {
     BuildPublishPayload(BuildPublishPayload),
     Clean(CleanPackage),
+    #[clap(alias = "build")]
     Compile(CompilePackage),
+    #[clap(alias = "build-script")]
     CompileScript(CompileScript),
     #[clap(subcommand)]
     Coverage(coverage::CoveragePackage),
     CreateObjectAndPublishPackage(CreateObjectAndPublishPackage),
     UpgradeObjectPackage(UpgradeObjectPackage),
+    DeployObject(DeployObjectCode),
+    UpgradeObject(UpgradeCodeObject),
     CreateResourceAccountAndPublishPackage(CreateResourceAccountAndPublishPackage),
     Disassemble(Disassemble),
     Decompile(Decompile),
+    #[clap(alias = "doc")]
     Document(DocumentPackage),
     Download(DownloadPackage),
     Init(InitPackage),
     List(ListPackage),
     Prove(ProvePackage),
+    #[clap(alias = "deploy")]
     Publish(PublishPackage),
     Run(RunFunction),
     RunScript(RunScript),
@@ -105,6 +120,7 @@ pub enum MoveTool {
     VerifyPackage(VerifyPackage),
     View(ViewFunction),
     Replay(Replay),
+    Fmt(Fmt),
 }
 
 impl MoveTool {
@@ -119,6 +135,8 @@ impl MoveTool {
                 tool.execute_serialized_success().await
             },
             MoveTool::UpgradeObjectPackage(tool) => tool.execute_serialized_success().await,
+            MoveTool::DeployObject(tool) => tool.execute_serialized_success().await,
+            MoveTool::UpgradeObject(tool) => tool.execute_serialized_success().await,
             MoveTool::CreateResourceAccountAndPublishPackage(tool) => {
                 tool.execute_serialized_success().await
             },
@@ -137,6 +155,7 @@ impl MoveTool {
             MoveTool::VerifyPackage(tool) => tool.execute_serialized().await,
             MoveTool::View(tool) => tool.execute_serialized().await,
             MoveTool::Replay(tool) => tool.execute_serialized().await,
+            MoveTool::Fmt(tool) => tool.execute_serialized().await,
         }
     }
 }
@@ -241,6 +260,11 @@ impl FrameworkPackageArgs {
     }
 }
 
+#[derive(ValueEnum, Clone, Copy, Debug)]
+pub enum Template {
+    HelloBlockchain,
+}
+
 /// Creates a new Move package at the given location
 ///
 /// This will create a directory for a Move package and a corresponding
@@ -269,6 +293,10 @@ pub struct InitPackage {
     )]
     pub(crate) named_addresses: BTreeMap<String, MoveManifestAccountWrapper>,
 
+    /// Template name for initialization
+    #[clap(long)]
+    pub(crate) template: Option<Template>,
+
     #[clap(flatten)]
     pub(crate) prompt_options: PromptOptions,
 
@@ -284,18 +312,48 @@ impl CliCommand<()> for InitPackage {
 
     async fn execute(self) -> CliTypedResult<()> {
         let package_dir = dir_default_to_current(self.package_dir.clone())?;
-        let addresses = self
+        let mut addresses: BTreeMap<String, ManifestNamedAddress> = self
             .named_addresses
             .into_iter()
             .map(|(key, value)| (key, value.account_address.into()))
             .collect();
 
-        self.framework_package_args.init_move_dir(
-            package_dir.as_path(),
-            &self.name,
-            addresses,
-            self.prompt_options,
-        )
+        // Add in any template associated
+        match self.template {
+            None => {
+                // Initialize move directory
+                // TODO: Communicate this breaking change before filling in the template as default
+                let package_dir_path = package_dir.as_path();
+                self.framework_package_args.init_move_dir(
+                    package_dir_path,
+                    &self.name,
+                    addresses,
+                    self.prompt_options,
+                )
+            },
+            Some(Template::HelloBlockchain) => {
+                // Setup the Hello blockchain template
+                // Note: We have to override the addresses
+                addresses.insert("hello_blockchain".to_string(), None.into());
+
+                // Initialize move directory
+                let package_dir_path = package_dir.as_path();
+                self.framework_package_args.init_move_dir(
+                    package_dir_path,
+                    "HelloBlockchainExample",
+                    addresses,
+                    self.prompt_options,
+                )?;
+
+                write_to_file(
+                    package_dir_path
+                        .join("sources/hello_blockchain.move")
+                        .as_path(),
+                    "hello_blockchain.move",
+                    HELLO_BLOCKCHAIN_EXAMPLE.as_bytes(),
+                )
+            },
+        }
     }
 }
 
@@ -331,6 +389,7 @@ impl CliCommand<Vec<String>> for CompilePackage {
                     self.move_options.dev,
                     self.move_options.skip_fetch_latest_git_deps,
                     self.move_options.named_addresses(),
+                    self.move_options.override_std.clone(),
                     self.move_options.bytecode_version,
                     self.move_options.compiler_version,
                     self.move_options.language_version,
@@ -394,6 +453,7 @@ impl CompileScript {
                 self.move_options.dev,
                 self.move_options.skip_fetch_latest_git_deps,
                 self.move_options.named_addresses(),
+                self.move_options.override_std.clone(),
                 self.move_options.bytecode_version,
                 self.move_options.compiler_version,
                 self.move_options.language_version,
@@ -483,6 +543,7 @@ impl CliCommand<&'static str> for TestPackage {
                 known_attributes: known_attributes.clone(),
                 skip_attribute_checks: self.move_options.skip_attribute_checks,
                 compiler_version: self.move_options.compiler_version,
+                language_version: self.move_options.language_version,
                 ..Default::default()
             },
             ..Default::default()
@@ -568,6 +629,7 @@ impl CliCommand<&'static str> for ProvePackage {
                 move_options.language_version,
                 move_options.skip_attribute_checks,
                 extended_checks::get_all_attribute_names(),
+                &[],
             )
         })
         .await
@@ -611,6 +673,7 @@ impl CliCommand<&'static str> for DocumentPackage {
             with_docs: true,
             install_dir: None,
             named_addresses: move_options.named_addresses(),
+            override_std: move_options.override_std.clone(),
             docgen_options: Some(docgen_options),
             skip_fetch_latest_git_deps: move_options.skip_fetch_latest_git_deps,
             bytecode_version: move_options.bytecode_version,
@@ -619,6 +682,7 @@ impl CliCommand<&'static str> for DocumentPackage {
             skip_attribute_checks: move_options.skip_attribute_checks,
             check_test_code: move_options.check_test_code,
             known_attributes: extended_checks::get_all_attribute_names().clone(),
+            experiments: vec![],
         };
         BuiltPackage::build(move_options.get_package_path()?, build_options)?;
         Ok("succeeded")
@@ -682,6 +746,7 @@ impl TryInto<PackagePublicationData> for &PublishPackage {
                 self.move_options.dev,
                 self.move_options.skip_fetch_latest_git_deps,
                 self.move_options.named_addresses(),
+                self.move_options.override_std.clone(),
                 self.move_options.bytecode_version,
                 self.move_options.compiler_version,
                 self.move_options.language_version,
@@ -753,6 +818,7 @@ impl IncludedArtifacts {
         dev: bool,
         skip_fetch_latest_git_deps: bool,
         named_addresses: BTreeMap<String, AccountAddress>,
+        override_std: Option<StdVersion>,
         bytecode_version: Option<u32>,
         compiler_version: Option<CompilerVersion>,
         language_version: Option<LanguageVersion>,
@@ -769,6 +835,7 @@ impl IncludedArtifacts {
                 // Always enable error map bytecode injection
                 with_error_map: true,
                 named_addresses,
+                override_std,
                 skip_fetch_latest_git_deps,
                 bytecode_version,
                 compiler_version,
@@ -785,6 +852,7 @@ impl IncludedArtifacts {
                 with_source_maps: false,
                 with_error_map: true,
                 named_addresses,
+                override_std,
                 skip_fetch_latest_git_deps,
                 bytecode_version,
                 compiler_version,
@@ -801,6 +869,7 @@ impl IncludedArtifacts {
                 with_source_maps: true,
                 with_error_map: true,
                 named_addresses,
+                override_std,
                 skip_fetch_latest_git_deps,
                 bytecode_version,
                 compiler_version,
@@ -923,6 +992,7 @@ impl CliCommand<TransactionSummary> for CreateObjectAndPublishPackage {
                 self.move_options.dev,
                 self.move_options.skip_fetch_latest_git_deps,
                 self.move_options.named_addresses(),
+                self.move_options.override_std.clone(),
                 self.move_options.bytecode_version,
                 self.move_options.compiler_version,
                 self.move_options.language_version,
@@ -1000,6 +1070,7 @@ impl CliCommand<TransactionSummary> for UpgradeObjectPackage {
                 self.move_options.dev,
                 self.move_options.skip_fetch_latest_git_deps,
                 self.move_options.named_addresses(),
+                self.move_options.override_std.clone(),
                 self.move_options.bytecode_version,
                 self.move_options.compiler_version,
                 self.move_options.language_version,
@@ -1065,6 +1136,187 @@ impl CliCommand<TransactionSummary> for UpgradeObjectPackage {
     }
 }
 
+/// Publishes the modules in a Move package to the Aptos blockchain, under an object.
+#[derive(Parser)]
+pub struct DeployObjectCode {
+    /// The named address for compiling and using in the contract
+    ///
+    /// This will take the derived account address for the object and put it in this location
+    #[clap(long)]
+    pub(crate) address_name: String,
+    #[clap(flatten)]
+    pub(crate) override_size_check_option: OverrideSizeCheckOption,
+    #[clap(flatten)]
+    pub(crate) included_artifacts_args: IncludedArtifactsArgs,
+    #[clap(flatten)]
+    pub(crate) move_options: MovePackageDir,
+    #[clap(flatten)]
+    pub(crate) txn_options: TransactionOptions,
+}
+
+#[async_trait]
+impl CliCommand<TransactionSummary> for DeployObjectCode {
+    fn command_name(&self) -> &'static str {
+        "DeployObject"
+    }
+
+    async fn execute(mut self) -> CliTypedResult<TransactionSummary> {
+        let sender_address = self.txn_options.get_public_key_and_address()?.1;
+        let sequence_number = self.txn_options.sequence_number(sender_address).await? + 1;
+        let object_address = create_object_code_deployment_address(sender_address, sequence_number);
+
+        self.move_options
+            .add_named_address(self.address_name, object_address.to_string());
+
+        let package =
+            build_package_options(&self.move_options, &self.included_artifacts_args).unwrap();
+        let message = format!(
+            "Do you want to deploy this package at object address {}",
+            object_address
+        );
+        prompt_yes_with_override(&message, self.txn_options.prompt_options)?;
+
+        let payload = aptos_cached_packages::aptos_stdlib::object_code_deployment_publish(
+            bcs::to_bytes(&package.extract_metadata()?)
+                .expect("Failed to serialize PackageMetadata"),
+            package.extract_code(),
+        );
+
+        submit_tx_and_check(
+            &self.txn_options,
+            payload,
+            &object_address.to_string(),
+            self.override_size_check_option.override_size_check,
+            "Code was successfully deployed to object address {}.",
+        )
+        .await
+    }
+}
+
+#[derive(Parser)]
+pub struct UpgradeCodeObject {
+    /// The named address for compiling and using in the contract
+    #[clap(long)]
+    pub(crate) address_name: String,
+    /// Address of the object the package was deployed to
+    ///
+    /// This must be an already deployed object containing the package
+    /// if the package is not already created, it will fail.
+    #[clap(long, value_parser = crate::common::types::load_account_arg)]
+    pub(crate) object_address: AccountAddress,
+    #[clap(flatten)]
+    pub(crate) override_size_check_option: OverrideSizeCheckOption,
+    #[clap(flatten)]
+    pub(crate) included_artifacts_args: IncludedArtifactsArgs,
+    #[clap(flatten)]
+    pub(crate) move_options: MovePackageDir,
+    #[clap(flatten)]
+    pub(crate) txn_options: TransactionOptions,
+}
+
+#[async_trait]
+impl CliCommand<TransactionSummary> for UpgradeCodeObject {
+    fn command_name(&self) -> &'static str {
+        "UpgradeObject"
+    }
+
+    async fn execute(mut self) -> CliTypedResult<TransactionSummary> {
+        self.move_options
+            .add_named_address(self.address_name, self.object_address.to_string());
+
+        let package =
+            build_package_options(&self.move_options, &self.included_artifacts_args).unwrap();
+        let url = self
+            .txn_options
+            .rest_options
+            .url(&self.txn_options.profile_options)?;
+
+        // Get the `PackageRegistry` at the given code object address.
+        let registry = CachedPackageRegistry::create(url, self.object_address, false).await?;
+        let package_info = registry
+            .get_package(package.name())
+            .await
+            .map_err(|s| CliError::CommandArgumentError(s.to_string()))?;
+
+        if package_info.upgrade_policy() == UpgradePolicy::immutable() {
+            return Err(CliError::CommandArgumentError(
+                "A code package with upgrade policy `immutable` cannot be upgraded".to_owned(),
+            ));
+        }
+
+        let message = format!(
+            "Do you want to upgrade the code package '{}' at object address {}",
+            package_info.name(),
+            self.object_address
+        );
+        prompt_yes_with_override(&message, self.txn_options.prompt_options)?;
+
+        let payload = aptos_cached_packages::aptos_stdlib::object_code_deployment_upgrade(
+            bcs::to_bytes(&package.extract_metadata()?)
+                .expect("Failed to serialize PackageMetadata"),
+            package.extract_code(),
+            self.object_address,
+        );
+
+        submit_tx_and_check(
+            &self.txn_options,
+            payload,
+            &self.object_address.to_string(),
+            self.override_size_check_option.override_size_check,
+            "Code was successfully upgraded at object address {}.",
+        )
+        .await
+    }
+}
+
+fn build_package_options(
+    move_options: &MovePackageDir,
+    included_artifacts_args: &IncludedArtifactsArgs,
+) -> anyhow::Result<BuiltPackage> {
+    let options = included_artifacts_args.included_artifacts.build_options(
+        move_options.dev,
+        move_options.skip_fetch_latest_git_deps,
+        move_options.named_addresses(),
+        move_options.override_std.clone(),
+        move_options.bytecode_version,
+        move_options.compiler_version,
+        move_options.language_version,
+        move_options.skip_attribute_checks,
+        move_options.check_test_code,
+    );
+    BuiltPackage::build(move_options.get_package_path()?, options)
+}
+
+async fn submit_tx_and_check(
+    txn_options: &TransactionOptions,
+    payload: TransactionPayload,
+    object_address: &str,
+    override_size_check: bool,
+    success_message: &str,
+) -> CliTypedResult<TransactionSummary> {
+    let size = bcs::serialized_size(&payload)?;
+    println!("package size {} bytes", size);
+
+    if !override_size_check && size > MAX_PUBLISH_PACKAGE_SIZE {
+        return Err(CliError::UnexpectedError(format!(
+            "The package is larger than {} bytes ({} bytes)! To lower the size \
+            you may want to include fewer artifacts via `--included-artifacts`. \
+            You can also override this check with `--override-size-check",
+            MAX_PUBLISH_PACKAGE_SIZE, size
+        )));
+    }
+
+    let result = txn_options
+        .submit_transaction(payload)
+        .await
+        .map(TransactionSummary::from);
+
+    if result.is_ok() {
+        println!("{} {}", success_message, object_address);
+    }
+    result
+}
+
 /// Publishes the modules in a Move package to the Aptos blockchain under a resource account
 #[derive(Parser)]
 pub struct CreateResourceAccountAndPublishPackage {
@@ -1125,6 +1377,7 @@ impl CliCommand<TransactionSummary> for CreateResourceAccountAndPublishPackage {
             move_options.dev,
             move_options.skip_fetch_latest_git_deps,
             move_options.named_addresses(),
+            move_options.override_std,
             move_options.bytecode_version,
             move_options.compiler_version,
             move_options.language_version,
@@ -1277,6 +1530,7 @@ impl CliCommand<&'static str> for VerifyPackage {
                 self.move_options.dev,
                 self.move_options.skip_fetch_latest_git_deps,
                 self.move_options.named_addresses(),
+                self.move_options.override_std.clone(),
                 self.move_options.bytecode_version,
                 self.move_options.compiler_version,
                 self.move_options.language_version,
diff --git a/crates/aptos/src/move_tool/show.rs b/crates/aptos/src/move_tool/show.rs
index bb763334dab60..1a910b322d70f 100644
--- a/crates/aptos/src/move_tool/show.rs
+++ b/crates/aptos/src/move_tool/show.rs
@@ -63,6 +63,7 @@ impl CliCommand<Vec<EntryABI>> for ShowAbi {
                     self.move_options.dev,
                     self.move_options.skip_fetch_latest_git_deps,
                     self.move_options.named_addresses(),
+                    self.move_options.override_std.clone(),
                     self.move_options.bytecode_version,
                     self.move_options.compiler_version,
                     self.move_options.language_version,
diff --git a/crates/aptos/src/node/analyze/analyze_validators.rs b/crates/aptos/src/node/analyze/analyze_validators.rs
index 26deff503040c..abfd7e64f4a11 100644
--- a/crates/aptos/src/node/analyze/analyze_validators.rs
+++ b/crates/aptos/src/node/analyze/analyze_validators.rs
@@ -4,6 +4,7 @@
 use super::fetch_metadata::ValidatorInfo;
 use anyhow::Result;
 use aptos_bitvec::BitVec;
+use aptos_logger::error;
 use aptos_rest_client::VersionedNewBlockEvent;
 use aptos_storage_interface::{DbReader, Order};
 use aptos_types::{
@@ -11,7 +12,13 @@ use aptos_types::{
     account_config::{new_block_event_key, NewBlockEvent},
 };
 use itertools::Itertools;
-use std::{cmp::Ordering, collections::HashMap, convert::TryFrom, ops::Add};
+use std::{
+    cmp::Ordering,
+    collections::{BTreeMap, HashMap, VecDeque},
+    convert::TryFrom,
+    ops::Add,
+    time::Duration,
+};
 
 /// Single validator stats
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
@@ -100,6 +107,26 @@ impl Add for ValidatorStats {
     }
 }
 
+#[derive(Clone, Debug, Eq, PartialEq, Ord, PartialOrd)]
+pub enum TpsInterval {
+    Blocks(usize),
+    Seconds(u32),
+}
+
+#[derive(Clone)]
+pub struct MaxTpsStats {
+    /// Max TPS
+    pub tps: f32,
+    /// End version of the interval at which Max TPS was achieved
+    pub end_version: u64,
+    /// Number of transactions in the interval at which Max TPS was achieved
+    pub txns: u32,
+    /// Number of blocks in which Max TPS was achieved
+    pub blocks: usize,
+    /// Duration of the interval in which Max TPS was achieved
+    pub duration: f32,
+}
+
 /// Statistics for all validators
 #[derive(Clone)]
 pub struct EpochStats {
@@ -117,6 +144,8 @@ pub struct EpochStats {
     pub nil_blocks: u32,
     /// Total voting power
     pub total_voting_power: u128,
+    /// Max TPS per block interval
+    pub max_tps_per_block_interval: BTreeMap<TpsInterval, MaxTpsStats>,
 }
 
 impl EpochStats {
@@ -182,10 +211,98 @@ impl Add for EpochStats {
             nil_blocks: self.nil_blocks + other.nil_blocks,
             total_transactions: self.total_transactions + other.total_transactions,
             total_voting_power: 0,
+            max_tps_per_block_interval: self
+                .max_tps_per_block_interval
+                .into_iter()
+                .map(|(k, v)| {
+                    let other_v = other.max_tps_per_block_interval.get(&k).unwrap();
+                    (
+                        k,
+                        if v.tps > other_v.tps {
+                            v
+                        } else {
+                            other_v.clone()
+                        },
+                    )
+                })
+                .collect(),
         }
     }
 }
 
+pub struct RunningAvg {
+    sum: f64,
+    count: u64,
+}
+
+impl RunningAvg {
+    fn empty() -> Self {
+        Self { sum: 0.0, count: 0 }
+    }
+
+    fn observe(&mut self, value: f32) {
+        self.sum += value as f64;
+        self.count += 1;
+    }
+
+    pub fn get(&self) -> f64 {
+        if self.count > 0 {
+            self.sum / self.count as f64
+        } else {
+            0.0
+        }
+    }
+}
+
+pub struct GapSummary {
+    pub max_gap: f32,
+    at_version: u64,
+    avg: RunningAvg,
+}
+
+impl GapSummary {
+    fn empty() -> Self {
+        Self {
+            max_gap: 0.0,
+            at_version: 0,
+            avg: RunningAvg::empty(),
+        }
+    }
+
+    fn observe(&mut self, gap: f32, version: u64) {
+        if gap > self.max_gap {
+            self.max_gap = gap;
+            self.at_version = version;
+        }
+        self.avg.observe(gap)
+    }
+
+    pub fn to_string_as_round(&self) -> String {
+        format!(
+            "{} rounds at version {} (avg {:.2})",
+            self.max_gap as u64,
+            self.at_version,
+            self.avg.get(),
+        )
+    }
+
+    pub fn to_string_as_time(&self) -> String {
+        format!(
+            "{:.2}s no progress at version {} (avg {:.2}s)",
+            self.max_gap,
+            self.at_version,
+            self.avg.get(),
+        )
+    }
+}
+
+pub struct MaxGapInfo {
+    pub non_epoch_round_gap: GapSummary,
+    pub epoch_round_gap: GapSummary,
+    pub non_epoch_time_gap: GapSummary,
+    pub epoch_time_gap: GapSummary,
+}
+
 /// Analyze validator performance
 pub struct AnalyzeValidators {}
 
@@ -267,6 +384,33 @@ impl AnalyzeValidators {
         let mut votes = HashMap::<AccountAddress, u32>::new();
         let mut transactions = HashMap::<AccountAddress, u32>::new();
 
+        // because we measure based on block timestamp, we need interval larger than when backpressure
+        // kicks in, to make sure we are measuring end-to-end throughput, not just ordering throughput.
+        let mut max_tps_tuples = vec![
+            TpsInterval::Blocks(15),
+            TpsInterval::Blocks(30),
+            TpsInterval::Blocks(45),
+            TpsInterval::Blocks(60),
+            TpsInterval::Seconds(60),
+            TpsInterval::Seconds(120),
+            TpsInterval::Seconds(180),
+            TpsInterval::Seconds(300),
+            TpsInterval::Seconds(600),
+            TpsInterval::Seconds(1200),
+            TpsInterval::Seconds(1800),
+            TpsInterval::Seconds(3600),
+        ]
+        .into_iter()
+        .map(|v| {
+            (v, VecDeque::new(), MaxTpsStats {
+                tps: 0.0,
+                end_version: 0,
+                txns: 0,
+                blocks: 0,
+                duration: 0.0,
+            })
+        })
+        .collect::<Vec<_>>();
         let mut trimmed_rounds = 0;
         let mut nil_blocks = 0;
         let mut previous_round = 0;
@@ -313,6 +457,7 @@ impl AnalyzeValidators {
             let cur_transactions_option = blocks
                 .get(pos + 1)
                 .map(|next| u32::try_from(next.version - block.version - 2).unwrap());
+            let cur_next_block_option = blocks.get(pos + 1);
             if let Some(cur_transactions) = cur_transactions_option {
                 if is_nil {
                     assert_eq!(
@@ -325,6 +470,47 @@ impl AnalyzeValidators {
                 }
                 *transactions.entry(event.proposer()).or_insert(0) += cur_transactions;
             }
+
+            if let (Some(cur_transactions), Some(cur_next_block)) =
+                (cur_transactions_option, cur_next_block_option)
+            {
+                let cur_end_timestamp = cur_next_block.event.proposed_time();
+                for (interval, max_tps_deque, max_tps) in &mut max_tps_tuples {
+                    max_tps_deque.push_back((cur_transactions, event.proposed_time()));
+
+                    match interval {
+                        TpsInterval::Blocks(num_blocks_for_max_tps) => {
+                            while max_tps_deque.len() > *num_blocks_for_max_tps {
+                                max_tps_deque.pop_front();
+                            }
+                        },
+                        TpsInterval::Seconds(num_seconds_for_max_tps) => {
+                            while let Some((_, front_ts)) = max_tps_deque.front() {
+                                let passed = (cur_end_timestamp - front_ts) as f32 / 1000000.0;
+                                if passed > *num_seconds_for_max_tps as f32 {
+                                    max_tps_deque.pop_front();
+                                } else {
+                                    break;
+                                }
+                            }
+                        },
+                    }
+
+                    if !max_tps_deque.is_empty() {
+                        let passed = (cur_end_timestamp - max_tps_deque.front().unwrap().1) as f32
+                            / 1000000.0;
+                        let txns: u32 = max_tps_deque.iter().map(|(txns, _)| *txns).sum();
+                        let tps = txns as f32 / passed;
+                        if tps > max_tps.tps {
+                            max_tps.tps = tps;
+                            max_tps.duration = passed;
+                            max_tps.end_version = cur_next_block.version - 1;
+                            max_tps.blocks = max_tps_deque.len();
+                            max_tps.txns = txns;
+                        }
+                    }
+                }
+            }
         }
         let total_successes: u32 = successes.values().sum();
         let total_failures: u32 = failures.values().sum();
@@ -362,9 +548,84 @@ impl AnalyzeValidators {
                 .iter()
                 .map(|validator| validator.voting_power as u128)
                 .sum(),
+            max_tps_per_block_interval: max_tps_tuples
+                .into_iter()
+                .map(|(num_blocks_for_max_tps, _, max_tps)| (num_blocks_for_max_tps, max_tps))
+                .collect(),
         };
     }
 
+    pub fn analyze_gap<'a, I>(blocks: I) -> MaxGapInfo
+    where
+        I: Iterator<Item = &'a VersionedNewBlockEvent>,
+    {
+        let mut non_epoch_round_gap = GapSummary::empty();
+        let mut epoch_round_gap = GapSummary::empty();
+
+        let mut non_epoch_time_gap = GapSummary::empty();
+        let mut epoch_time_gap = GapSummary::empty();
+
+        let mut prev_non_nil_block = None;
+        let mut prev_non_nil_ts = 0;
+        let mut failed_from_nil = 0;
+        let mut epoch_from_nil = false;
+        let mut previous_epooch = 0;
+        let mut previous_round = 0;
+        for block in blocks {
+            let is_nil = block.event.proposer() == AccountAddress::ZERO;
+
+            let (current_gap, current_epoch_change) = if previous_epooch == block.event.epoch() {
+                (block.event.round() - previous_round - 1, false)
+            } else {
+                (block.event.failed_proposer_indices().len() as u64, true)
+            };
+
+            if is_nil {
+                failed_from_nil += current_gap;
+                epoch_from_nil |= current_epoch_change;
+            } else {
+                if prev_non_nil_ts > 0 {
+                    let round_gap = current_gap + failed_from_nil;
+                    let time_gap = block.event.proposed_time() as i64 - prev_non_nil_ts as i64;
+                    let epoch_change = current_epoch_change || epoch_from_nil;
+
+                    let (round_gap_summary, time_gap_summary) = if epoch_change {
+                        (&mut epoch_round_gap, &mut epoch_time_gap)
+                    } else {
+                        (&mut non_epoch_round_gap, &mut non_epoch_time_gap)
+                    };
+
+                    round_gap_summary.observe(round_gap as f32, block.version);
+
+                    if time_gap < 0 {
+                        error!(
+                            "Clock went backwards? {}, {:?}, {:?}",
+                            time_gap, block, prev_non_nil_block
+                        );
+                    } else {
+                        let time_gap_secs = Duration::from_micros(time_gap as u64).as_secs_f32();
+                        time_gap_summary.observe(time_gap_secs, block.version);
+                    }
+                }
+
+                failed_from_nil = 0;
+                epoch_from_nil = false;
+                prev_non_nil_ts = block.event.proposed_time();
+                prev_non_nil_block = Some(block);
+            }
+
+            previous_epooch = block.event.epoch();
+            previous_round = block.event.round();
+        }
+
+        MaxGapInfo {
+            non_epoch_round_gap,
+            epoch_round_gap,
+            non_epoch_time_gap,
+            epoch_time_gap,
+        }
+    }
+
     /// Print validator stats in a table
     pub fn print_detailed_epoch_table(
         epoch_stats: &EpochStats,
@@ -537,4 +798,22 @@ impl AnalyzeValidators {
             );
         }
     }
+
+    pub fn print_gap<'a, I>(blocks: I)
+    where
+        I: Iterator<Item = &'a VersionedNewBlockEvent>,
+    {
+        let gap_info = Self::analyze_gap(blocks);
+
+        println!(
+            "Max non-epoch-change gaps: {}, {}.",
+            gap_info.non_epoch_round_gap.to_string_as_round(),
+            gap_info.non_epoch_time_gap.to_string_as_time(),
+        );
+        println!(
+            "Max epoch-change gaps: {}, {}.",
+            gap_info.epoch_round_gap.to_string_as_round(),
+            gap_info.epoch_time_gap.to_string_as_time(),
+        );
+    }
 }
diff --git a/crates/aptos/src/node/local_testnet/hasura_metadata.json b/crates/aptos/src/node/local_testnet/hasura_metadata.json
index fa6f9669101a7..7a4906b33ecd4 100644
--- a/crates/aptos/src/node/local_testnet/hasura_metadata.json
+++ b/crates/aptos/src/node/local_testnet/hasura_metadata.json
@@ -1,5 +1,5 @@
 {
-  "resource_version": 385,
+  "resource_version": 11,
   "metadata": {
     "version": 3,
     "sources": [
@@ -7,226 +7,16 @@
         "name": "indexer-v2",
         "kind": "postgres",
         "tables": [
-          {
-            "table": {
-              "name": "account_transactions",
-              "schema": "public"
-            },
-            "array_relationships": [
-              {
-                "name": "coin_activities",
-                "using": {
-                  "manual_configuration": {
-                    "column_mapping": {
-                      "transaction_version": "transaction_version"
-                    },
-                    "insertion_order": null,
-                    "remote_table": {
-                      "name": "coin_activities",
-                      "schema": "public"
-                    }
-                  }
-                }
-              },
-              {
-                "name": "delegated_staking_activities",
-                "using": {
-                  "manual_configuration": {
-                    "column_mapping": {
-                      "transaction_version": "transaction_version"
-                    },
-                    "insertion_order": null,
-                    "remote_table": {
-                      "name": "delegated_staking_activities",
-                      "schema": "public"
-                    }
-                  }
-                }
-              },
-              {
-                "name": "fungible_asset_activities",
-                "using": {
-                  "manual_configuration": {
-                    "column_mapping": {
-                      "transaction_version": "transaction_version"
-                    },
-                    "insertion_order": null,
-                    "remote_table": {
-                      "name": "fungible_asset_activities",
-                      "schema": "public"
-                    }
-                  }
-                }
-              },
-              {
-                "name": "token_activities",
-                "using": {
-                  "manual_configuration": {
-                    "column_mapping": {
-                      "transaction_version": "transaction_version"
-                    },
-                    "insertion_order": null,
-                    "remote_table": {
-                      "name": "token_activities",
-                      "schema": "public"
-                    }
-                  }
-                }
-              },
-              {
-                "name": "token_activities_v2",
-                "using": {
-                  "manual_configuration": {
-                    "column_mapping": {
-                      "transaction_version": "transaction_version"
-                    },
-                    "insertion_order": null,
-                    "remote_table": {
-                      "name": "token_activities_v2",
-                      "schema": "public"
-                    }
-                  }
-                }
-              }
-            ],
-            "select_permissions": [
-              {
-                "role": "anonymous",
-                "permission": {
-                  "columns": [
-                    "account_address",
-                    "transaction_version"
-                  ],
-                  "filter": {},
-                  "limit": 100,
-                  "allow_aggregations": true
-                }
-              }
-            ]
-          },
-          {
-            "table": {
-              "name": "address_events_summary",
-              "schema": "public"
-            },
-            "object_relationships": [
-              {
-                "name": "block_metadata",
-                "using": {
-                  "manual_configuration": {
-                    "column_mapping": {
-                      "min_block_height": "block_height"
-                    },
-                    "insertion_order": null,
-                    "remote_table": {
-                      "name": "block_metadata_transactions",
-                      "schema": "public"
-                    }
-                  }
-                }
-              }
-            ],
-            "select_permissions": [
-              {
-                "role": "anonymous",
-                "permission": {
-                  "columns": [
-                    "min_block_height",
-                    "num_distinct_versions",
-                    "account_address"
-                  ],
-                  "filter": {},
-                  "limit": 100
-                }
-              }
-            ]
-          },
-          {
-            "table": {
-              "name": "address_version_from_events",
-              "schema": "public"
-            },
-            "array_relationships": [
-              {
-                "name": "coin_activities",
-                "using": {
-                  "manual_configuration": {
-                    "column_mapping": {
-                      "transaction_version": "transaction_version"
-                    },
-                    "insertion_order": null,
-                    "remote_table": {
-                      "name": "coin_activities",
-                      "schema": "public"
-                    }
-                  }
-                }
-              },
-              {
-                "name": "delegated_staking_activities",
-                "using": {
-                  "manual_configuration": {
-                    "column_mapping": {
-                      "transaction_version": "transaction_version"
-                    },
-                    "insertion_order": null,
-                    "remote_table": {
-                      "name": "delegated_staking_activities",
-                      "schema": "public"
-                    }
-                  }
-                }
-              },
-              {
-                "name": "token_activities",
-                "using": {
-                  "manual_configuration": {
-                    "column_mapping": {
-                      "transaction_version": "transaction_version"
-                    },
-                    "insertion_order": null,
-                    "remote_table": {
-                      "name": "token_activities",
-                      "schema": "public"
-                    }
-                  }
-                }
-              },
-              {
-                "name": "token_activities_v2",
-                "using": {
-                  "manual_configuration": {
-                    "column_mapping": {
-                      "transaction_version": "transaction_version"
-                    },
-                    "insertion_order": null,
-                    "remote_table": {
-                      "name": "token_activities_v2",
-                      "schema": "public"
-                    }
-                  }
-                }
-              }
-            ],
-            "select_permissions": [
-              {
-                "role": "anonymous",
-                "permission": {
-                  "columns": [
-                    "account_address",
-                    "transaction_version"
-                  ],
-                  "filter": {},
-                  "limit": 100,
-                  "allow_aggregations": true
-                }
-              }
-            ]
-          },
           {
             "table": {
               "name": "address_version_from_move_resources",
-              "schema": "public"
+              "schema": "legacy_migration_v1"
+            },
+            "configuration": {
+              "column_config": {},
+              "custom_column_names": {},
+              "custom_name": "address_version_from_move_resources",
+              "custom_root_fields": {}
             },
             "array_relationships": [
               {
@@ -239,7 +29,7 @@
                     "insertion_order": null,
                     "remote_table": {
                       "name": "coin_activities",
-                      "schema": "public"
+                      "schema": "legacy_migration_v1"
                     }
                   }
                 }
@@ -269,7 +59,7 @@
                     "insertion_order": null,
                     "remote_table": {
                       "name": "token_activities",
-                      "schema": "public"
+                      "schema": "legacy_migration_v1"
                     }
                   }
                 }
@@ -305,36 +95,16 @@
               }
             ]
           },
-          {
-            "table": {
-              "name": "block_metadata_transactions",
-              "schema": "public"
-            },
-            "select_permissions": [
-              {
-                "role": "anonymous",
-                "permission": {
-                  "columns": [
-                    "block_height",
-                    "epoch",
-                    "failed_proposer_indices",
-                    "id",
-                    "previous_block_votes_bitvec",
-                    "proposer",
-                    "round",
-                    "timestamp",
-                    "version"
-                  ],
-                  "filter": {},
-                  "limit": 100
-                }
-              }
-            ]
-          },
           {
             "table": {
               "name": "coin_activities",
-              "schema": "public"
+              "schema": "legacy_migration_v1"
+            },
+            "configuration": {
+              "column_config": {},
+              "custom_column_names": {},
+              "custom_name": "coin_activities",
+              "custom_root_fields": {}
             },
             "object_relationships": [
               {
@@ -347,7 +117,7 @@
                     "insertion_order": null,
                     "remote_table": {
                       "name": "coin_infos",
-                      "schema": "public"
+                      "schema": "legacy_migration_v1"
                     }
                   }
                 }
@@ -401,7 +171,13 @@
           {
             "table": {
               "name": "coin_balances",
-              "schema": "public"
+              "schema": "legacy_migration_v1"
+            },
+            "configuration": {
+              "column_config": {},
+              "custom_column_names": {},
+              "custom_name": "coin_balances",
+              "custom_root_fields": {}
             },
             "select_permissions": [
               {
@@ -424,7 +200,13 @@
           {
             "table": {
               "name": "coin_infos",
-              "schema": "public"
+              "schema": "legacy_migration_v1"
+            },
+            "configuration": {
+              "column_config": {},
+              "custom_column_names": {},
+              "custom_name": "coin_infos",
+              "custom_root_fields": {}
             },
             "select_permissions": [
               {
@@ -450,31 +232,14 @@
           },
           {
             "table": {
-              "name": "coin_supply",
-              "schema": "public"
+              "name": "collection_datas",
+              "schema": "legacy_migration_v1"
             },
-            "select_permissions": [
-              {
-                "role": "anonymous",
-                "permission": {
-                  "columns": [
-                    "coin_type",
-                    "coin_type_hash",
-                    "supply",
-                    "transaction_epoch",
-                    "transaction_timestamp",
-                    "transaction_version"
-                  ],
-                  "filter": {},
-                  "limit": 100
-                }
-              }
-            ]
-          },
-          {
-            "table": {
-              "name": "collection_datas",
-              "schema": "public"
+            "configuration": {
+              "column_config": {},
+              "custom_column_names": {},
+              "custom_name": "collection_datas",
+              "custom_root_fields": {}
             },
             "select_permissions": [
               {
@@ -504,7 +269,13 @@
           {
             "table": {
               "name": "current_ans_lookup",
-              "schema": "public"
+              "schema": "legacy_migration_v1"
+            },
+            "configuration": {
+              "column_config": {},
+              "custom_column_names": {},
+              "custom_name": "current_ans_lookup",
+              "custom_root_fields": {}
             },
             "array_relationships": [
               {
@@ -517,7 +288,7 @@
                     "insertion_order": null,
                     "remote_table": {
                       "name": "current_token_ownerships",
-                      "schema": "public"
+                      "schema": "legacy_migration_v1"
                     }
                   }
                 }
@@ -544,43 +315,167 @@
           },
           {
             "table": {
-              "name": "current_ans_lookup_v2",
-              "schema": "public"
+              "name": "current_coin_balances",
+              "schema": "legacy_migration_v1"
             },
+            "configuration": {
+              "column_config": {},
+              "custom_column_names": {},
+              "custom_name": "current_coin_balances",
+              "custom_root_fields": {}
+            },
+            "object_relationships": [
+              {
+                "name": "coin_info",
+                "using": {
+                  "manual_configuration": {
+                    "column_mapping": {
+                      "coin_type_hash": "coin_type_hash"
+                    },
+                    "insertion_order": null,
+                    "remote_table": {
+                      "name": "coin_infos",
+                      "schema": "legacy_migration_v1"
+                    }
+                  }
+                }
+              }
+            ],
             "select_permissions": [
               {
                 "role": "anonymous",
                 "permission": {
                   "columns": [
-                    "domain",
-                    "expiration_timestamp",
-                    "is_deleted",
+                    "amount",
+                    "coin_type",
+                    "coin_type_hash",
+                    "last_transaction_timestamp",
                     "last_transaction_version",
-                    "registered_address",
-                    "subdomain",
-                    "token_name",
-                    "token_standard"
+                    "owner_address"
                   ],
                   "filter": {},
                   "limit": 100
-                },
-                "comment": ""
+                }
               }
             ]
           },
           {
             "table": {
-              "name": "current_aptos_names",
-              "schema": "public"
+              "name": "current_collection_datas",
+              "schema": "legacy_migration_v1"
+            },
+            "configuration": {
+              "column_config": {},
+              "custom_column_names": {},
+              "custom_name": "current_collection_datas",
+              "custom_root_fields": {
+                "select": "current_collection_datas"
+              }
+            },
+            "select_permissions": [
+              {
+                "role": "anonymous",
+                "permission": {
+                  "columns": [
+                    "collection_data_id_hash",
+                    "collection_name",
+                    "creator_address",
+                    "description",
+                    "description_mutable",
+                    "last_transaction_timestamp",
+                    "last_transaction_version",
+                    "maximum",
+                    "maximum_mutable",
+                    "metadata_uri",
+                    "supply",
+                    "table_handle",
+                    "uri_mutable"
+                  ],
+                  "filter": {},
+                  "limit": 100
+                }
+              }
+            ]
+          },
+          {
+            "table": {
+              "name": "current_token_datas",
+              "schema": "legacy_migration_v1"
+            },
+            "configuration": {
+              "column_config": {},
+              "custom_column_names": {},
+              "custom_name": "current_token_datas",
+              "custom_root_fields": {}
             },
             "object_relationships": [
               {
-                "name": "is_domain_owner",
+                "name": "current_collection_data",
                 "using": {
                   "manual_configuration": {
                     "column_mapping": {
-                      "domain_with_suffix": "token_name",
-                      "owner_address": "owner_address"
+                      "collection_data_id_hash": "collection_data_id_hash"
+                    },
+                    "insertion_order": null,
+                    "remote_table": {
+                      "name": "current_collection_datas",
+                      "schema": "legacy_migration_v1"
+                    }
+                  }
+                }
+              }
+            ],
+            "select_permissions": [
+              {
+                "role": "anonymous",
+                "permission": {
+                  "columns": [
+                    "collection_data_id_hash",
+                    "collection_name",
+                    "creator_address",
+                    "default_properties",
+                    "description",
+                    "description_mutable",
+                    "largest_property_version",
+                    "last_transaction_timestamp",
+                    "last_transaction_version",
+                    "maximum",
+                    "maximum_mutable",
+                    "metadata_uri",
+                    "name",
+                    "payee_address",
+                    "properties_mutable",
+                    "royalty_mutable",
+                    "royalty_points_denominator",
+                    "royalty_points_numerator",
+                    "supply",
+                    "token_data_id_hash",
+                    "uri_mutable"
+                  ],
+                  "filter": {},
+                  "limit": 100
+                }
+              }
+            ]
+          },
+          {
+            "table": {
+              "name": "current_token_ownerships",
+              "schema": "legacy_migration_v1"
+            },
+            "configuration": {
+              "column_config": {},
+              "custom_column_names": {},
+              "custom_name": "current_token_ownerships",
+              "custom_root_fields": {}
+            },
+            "object_relationships": [
+              {
+                "name": "aptos_name",
+                "using": {
+                  "manual_configuration": {
+                    "column_mapping": {
+                      "name": "token_name"
                     },
                     "insertion_order": null,
                     "remote_table": {
@@ -589,6 +484,36 @@
                     }
                   }
                 }
+              },
+              {
+                "name": "current_collection_data",
+                "using": {
+                  "manual_configuration": {
+                    "column_mapping": {
+                      "collection_data_id_hash": "collection_data_id_hash"
+                    },
+                    "insertion_order": null,
+                    "remote_table": {
+                      "name": "current_collection_datas",
+                      "schema": "legacy_migration_v1"
+                    }
+                  }
+                }
+              },
+              {
+                "name": "current_token_data",
+                "using": {
+                  "manual_configuration": {
+                    "column_mapping": {
+                      "token_data_id_hash": "token_data_id_hash"
+                    },
+                    "insertion_order": null,
+                    "remote_table": {
+                      "name": "current_token_datas",
+                      "schema": "legacy_migration_v1"
+                    }
+                  }
+                }
               }
             ],
             "select_permissions": [
@@ -596,21 +521,583 @@
                 "role": "anonymous",
                 "permission": {
                   "columns": [
+                    "amount",
+                    "collection_data_id_hash",
+                    "collection_name",
+                    "creator_address",
+                    "last_transaction_timestamp",
                     "last_transaction_version",
-                    "is_active",
-                    "is_primary",
-                    "domain",
+                    "name",
                     "owner_address",
-                    "registered_address",
-                    "subdomain",
-                    "token_name",
-                    "token_standard",
-                    "domain_with_suffix",
-                    "expiration_timestamp"
+                    "property_version",
+                    "table_type",
+                    "token_data_id_hash",
+                    "token_properties"
+                  ],
+                  "filter": {},
+                  "limit": 100,
+                  "allow_aggregations": true
+                }
+              }
+            ]
+          },
+          {
+            "table": {
+              "name": "move_resources",
+              "schema": "legacy_migration_v1"
+            },
+            "configuration": {
+              "column_config": {},
+              "custom_column_names": {},
+              "custom_name": "move_resources",
+              "custom_root_fields": {}
+            },
+            "select_permissions": [
+              {
+                "role": "anonymous",
+                "permission": {
+                  "columns": [
+                    "address",
+                    "transaction_version"
                   ],
                   "filter": {},
                   "limit": 100,
                   "allow_aggregations": true
+                }
+              }
+            ]
+          },
+          {
+            "table": {
+              "name": "token_activities",
+              "schema": "legacy_migration_v1"
+            },
+            "configuration": {
+              "column_config": {},
+              "custom_column_names": {},
+              "custom_name": "token_activities",
+              "custom_root_fields": {}
+            },
+            "object_relationships": [
+              {
+                "name": "current_token_data",
+                "using": {
+                  "manual_configuration": {
+                    "column_mapping": {
+                      "token_data_id_hash": "token_data_id_hash"
+                    },
+                    "insertion_order": null,
+                    "remote_table": {
+                      "name": "current_token_datas",
+                      "schema": "legacy_migration_v1"
+                    }
+                  }
+                }
+              }
+            ],
+            "array_relationships": [
+              {
+                "name": "aptos_names_owner",
+                "using": {
+                  "manual_configuration": {
+                    "column_mapping": {
+                      "event_account_address": "registered_address"
+                    },
+                    "insertion_order": null,
+                    "remote_table": {
+                      "name": "current_aptos_names",
+                      "schema": "public"
+                    }
+                  }
+                }
+              },
+              {
+                "name": "aptos_names_to",
+                "using": {
+                  "manual_configuration": {
+                    "column_mapping": {
+                      "to_address": "registered_address"
+                    },
+                    "insertion_order": null,
+                    "remote_table": {
+                      "name": "current_aptos_names",
+                      "schema": "public"
+                    }
+                  }
+                }
+              }
+            ],
+            "select_permissions": [
+              {
+                "role": "anonymous",
+                "permission": {
+                  "columns": [
+                    "coin_amount",
+                    "coin_type",
+                    "collection_data_id_hash",
+                    "collection_name",
+                    "creator_address",
+                    "event_account_address",
+                    "event_creation_number",
+                    "event_index",
+                    "event_sequence_number",
+                    "from_address",
+                    "name",
+                    "property_version",
+                    "to_address",
+                    "token_amount",
+                    "token_data_id_hash",
+                    "transaction_timestamp",
+                    "transaction_version",
+                    "transfer_type"
+                  ],
+                  "filter": {},
+                  "limit": 100,
+                  "allow_aggregations": true
+                }
+              }
+            ]
+          },
+          {
+            "table": {
+              "name": "token_datas",
+              "schema": "legacy_migration_v1"
+            },
+            "configuration": {
+              "column_config": {},
+              "custom_column_names": {},
+              "custom_name": "token_datas",
+              "custom_root_fields": {}
+            },
+            "select_permissions": [
+              {
+                "role": "anonymous",
+                "permission": {
+                  "columns": [
+                    "collection_data_id_hash",
+                    "collection_name",
+                    "creator_address",
+                    "default_properties",
+                    "description",
+                    "description_mutable",
+                    "largest_property_version",
+                    "maximum",
+                    "maximum_mutable",
+                    "metadata_uri",
+                    "name",
+                    "payee_address",
+                    "properties_mutable",
+                    "royalty_mutable",
+                    "royalty_points_denominator",
+                    "royalty_points_numerator",
+                    "supply",
+                    "token_data_id_hash",
+                    "transaction_timestamp",
+                    "transaction_version",
+                    "uri_mutable"
+                  ],
+                  "filter": {},
+                  "limit": 100
+                }
+              }
+            ]
+          },
+          {
+            "table": {
+              "name": "token_ownerships",
+              "schema": "legacy_migration_v1"
+            },
+            "configuration": {
+              "column_config": {},
+              "custom_column_names": {},
+              "custom_name": "token_ownerships",
+              "custom_root_fields": {}
+            },
+            "select_permissions": [
+              {
+                "role": "anonymous",
+                "permission": {
+                  "columns": [
+                    "amount",
+                    "collection_data_id_hash",
+                    "collection_name",
+                    "creator_address",
+                    "name",
+                    "owner_address",
+                    "property_version",
+                    "table_handle",
+                    "table_type",
+                    "token_data_id_hash",
+                    "transaction_timestamp",
+                    "transaction_version"
+                  ],
+                  "filter": {},
+                  "limit": 100
+                }
+              }
+            ]
+          },
+          {
+            "table": {
+              "name": "tokens",
+              "schema": "legacy_migration_v1"
+            },
+            "configuration": {
+              "column_config": {},
+              "custom_column_names": {},
+              "custom_name": "tokens",
+              "custom_root_fields": {}
+            },
+            "select_permissions": [
+              {
+                "role": "anonymous",
+                "permission": {
+                  "columns": [
+                    "collection_data_id_hash",
+                    "collection_name",
+                    "creator_address",
+                    "name",
+                    "property_version",
+                    "token_data_id_hash",
+                    "token_properties",
+                    "transaction_timestamp",
+                    "transaction_version"
+                  ],
+                  "filter": {},
+                  "limit": 100
+                }
+              }
+            ]
+          },
+          {
+            "table": {
+              "name": "parsed_asset_uris",
+              "schema": "nft_metadata_crawler"
+            },
+            "select_permissions": [
+              {
+                "role": "anonymous",
+                "permission": {
+                  "columns": [
+                    "animation_optimizer_retry_count",
+                    "asset_uri",
+                    "cdn_animation_uri",
+                    "cdn_image_uri",
+                    "cdn_json_uri",
+                    "image_optimizer_retry_count",
+                    "json_parser_retry_count",
+                    "raw_animation_uri",
+                    "raw_image_uri"
+                  ],
+                  "filter": {},
+                  "limit": 100
+                }
+              }
+            ]
+          },
+          {
+            "table": {
+              "name": "account_transactions",
+              "schema": "public"
+            },
+            "object_relationships": [
+              {
+                "name": "user_transaction",
+                "using": {
+                  "manual_configuration": {
+                    "column_mapping": {
+                      "transaction_version": "version"
+                    },
+                    "insertion_order": null,
+                    "remote_table": {
+                      "name": "user_transactions",
+                      "schema": "public"
+                    }
+                  }
+                }
+              }
+            ],
+            "array_relationships": [
+              {
+                "name": "coin_activities",
+                "using": {
+                  "manual_configuration": {
+                    "column_mapping": {
+                      "transaction_version": "transaction_version"
+                    },
+                    "insertion_order": null,
+                    "remote_table": {
+                      "name": "coin_activities",
+                      "schema": "legacy_migration_v1"
+                    }
+                  }
+                }
+              },
+              {
+                "name": "delegated_staking_activities",
+                "using": {
+                  "manual_configuration": {
+                    "column_mapping": {
+                      "transaction_version": "transaction_version"
+                    },
+                    "insertion_order": null,
+                    "remote_table": {
+                      "name": "delegated_staking_activities",
+                      "schema": "public"
+                    }
+                  }
+                }
+              },
+              {
+                "name": "fungible_asset_activities",
+                "using": {
+                  "manual_configuration": {
+                    "column_mapping": {
+                      "transaction_version": "transaction_version"
+                    },
+                    "insertion_order": null,
+                    "remote_table": {
+                      "name": "fungible_asset_activities",
+                      "schema": "public"
+                    }
+                  }
+                }
+              },
+              {
+                "name": "token_activities",
+                "using": {
+                  "manual_configuration": {
+                    "column_mapping": {
+                      "transaction_version": "transaction_version"
+                    },
+                    "insertion_order": null,
+                    "remote_table": {
+                      "name": "token_activities",
+                      "schema": "legacy_migration_v1"
+                    }
+                  }
+                }
+              },
+              {
+                "name": "token_activities_v2",
+                "using": {
+                  "manual_configuration": {
+                    "column_mapping": {
+                      "transaction_version": "transaction_version"
+                    },
+                    "insertion_order": null,
+                    "remote_table": {
+                      "name": "token_activities_v2",
+                      "schema": "public"
+                    }
+                  }
+                }
+              }
+            ],
+            "select_permissions": [
+              {
+                "role": "anonymous",
+                "permission": {
+                  "columns": [
+                    "account_address",
+                    "transaction_version"
+                  ],
+                  "filter": {},
+                  "limit": 100,
+                  "allow_aggregations": true
+                }
+              }
+            ]
+          },
+          {
+            "table": {
+              "name": "address_events_summary",
+              "schema": "public"
+            },
+            "object_relationships": [
+              {
+                "name": "block_metadata",
+                "using": {
+                  "manual_configuration": {
+                    "column_mapping": {
+                      "min_block_height": "block_height"
+                    },
+                    "insertion_order": null,
+                    "remote_table": {
+                      "name": "block_metadata_transactions",
+                      "schema": "public"
+                    }
+                  }
+                }
+              }
+            ],
+            "select_permissions": [
+              {
+                "role": "anonymous",
+                "permission": {
+                  "columns": [
+                    "min_block_height",
+                    "num_distinct_versions",
+                    "account_address"
+                  ],
+                  "filter": {},
+                  "limit": 100
+                }
+              }
+            ]
+          },
+          {
+            "table": {
+              "name": "address_version_from_events",
+              "schema": "public"
+            },
+            "array_relationships": [
+              {
+                "name": "coin_activities",
+                "using": {
+                  "manual_configuration": {
+                    "column_mapping": {
+                      "transaction_version": "transaction_version"
+                    },
+                    "insertion_order": null,
+                    "remote_table": {
+                      "name": "coin_activities",
+                      "schema": "legacy_migration_v1"
+                    }
+                  }
+                }
+              },
+              {
+                "name": "delegated_staking_activities",
+                "using": {
+                  "manual_configuration": {
+                    "column_mapping": {
+                      "transaction_version": "transaction_version"
+                    },
+                    "insertion_order": null,
+                    "remote_table": {
+                      "name": "delegated_staking_activities",
+                      "schema": "public"
+                    }
+                  }
+                }
+              },
+              {
+                "name": "token_activities",
+                "using": {
+                  "manual_configuration": {
+                    "column_mapping": {
+                      "transaction_version": "transaction_version"
+                    },
+                    "insertion_order": null,
+                    "remote_table": {
+                      "name": "token_activities",
+                      "schema": "legacy_migration_v1"
+                    }
+                  }
+                }
+              },
+              {
+                "name": "token_activities_v2",
+                "using": {
+                  "manual_configuration": {
+                    "column_mapping": {
+                      "transaction_version": "transaction_version"
+                    },
+                    "insertion_order": null,
+                    "remote_table": {
+                      "name": "token_activities_v2",
+                      "schema": "public"
+                    }
+                  }
+                }
+              }
+            ],
+            "select_permissions": [
+              {
+                "role": "anonymous",
+                "permission": {
+                  "columns": [
+                    "account_address",
+                    "transaction_version"
+                  ],
+                  "filter": {},
+                  "limit": 100,
+                  "allow_aggregations": true
+                }
+              }
+            ]
+          },
+          {
+            "table": {
+              "name": "block_metadata_transactions",
+              "schema": "public"
+            },
+            "select_permissions": [
+              {
+                "role": "anonymous",
+                "permission": {
+                  "columns": [
+                    "block_height",
+                    "epoch",
+                    "failed_proposer_indices",
+                    "id",
+                    "previous_block_votes_bitvec",
+                    "proposer",
+                    "round",
+                    "timestamp",
+                    "version"
+                  ],
+                  "filter": {},
+                  "limit": 100
+                }
+              }
+            ]
+          },
+          {
+            "table": {
+              "name": "coin_supply",
+              "schema": "public"
+            },
+            "select_permissions": [
+              {
+                "role": "anonymous",
+                "permission": {
+                  "columns": [
+                    "coin_type",
+                    "coin_type_hash",
+                    "supply",
+                    "transaction_epoch",
+                    "transaction_timestamp",
+                    "transaction_version"
+                  ],
+                  "filter": {},
+                  "limit": 100
+                }
+              }
+            ]
+          },
+          {
+            "table": {
+              "name": "current_ans_lookup_v2",
+              "schema": "public"
+            },
+            "select_permissions": [
+              {
+                "role": "anonymous",
+                "permission": {
+                  "columns": [
+                    "domain",
+                    "expiration_timestamp",
+                    "is_deleted",
+                    "last_transaction_version",
+                    "registered_address",
+                    "subdomain",
+                    "token_name",
+                    "token_standard"
+                  ],
+                  "filter": {},
+                  "limit": 100
                 },
                 "comment": ""
               }
@@ -618,20 +1105,21 @@
           },
           {
             "table": {
-              "name": "current_coin_balances",
+              "name": "current_aptos_names",
               "schema": "public"
             },
             "object_relationships": [
               {
-                "name": "coin_info",
+                "name": "is_domain_owner",
                 "using": {
                   "manual_configuration": {
                     "column_mapping": {
-                      "coin_type_hash": "coin_type_hash"
+                      "domain_with_suffix": "token_name",
+                      "owner_address": "owner_address"
                     },
                     "insertion_order": null,
                     "remote_table": {
-                      "name": "coin_infos",
+                      "name": "current_aptos_names",
                       "schema": "public"
                     }
                   }
@@ -643,46 +1131,25 @@
                 "role": "anonymous",
                 "permission": {
                   "columns": [
-                    "amount",
-                    "coin_type",
-                    "coin_type_hash",
-                    "last_transaction_timestamp",
-                    "last_transaction_version",
-                    "owner_address"
-                  ],
-                  "filter": {},
-                  "limit": 100
-                }
-              }
-            ]
-          },
-          {
-            "table": {
-              "name": "current_collection_datas",
-              "schema": "public"
-            },
-            "select_permissions": [
-              {
-                "role": "anonymous",
-                "permission": {
-                  "columns": [
-                    "collection_data_id_hash",
-                    "collection_name",
-                    "creator_address",
-                    "description",
-                    "description_mutable",
-                    "last_transaction_timestamp",
+                    "domain",
+                    "domain_expiration_timestamp",
+                    "domain_with_suffix",
+                    "expiration_timestamp",
+                    "is_active",
+                    "is_primary",
                     "last_transaction_version",
-                    "maximum",
-                    "maximum_mutable",
-                    "metadata_uri",
-                    "supply",
-                    "table_handle",
-                    "uri_mutable"
+                    "owner_address",
+                    "registered_address",
+                    "subdomain",
+                    "subdomain_expiration_policy",
+                    "token_name",
+                    "token_standard"
                   ],
                   "filter": {},
-                  "limit": 100
-                }
+                  "limit": 100,
+                  "allow_aggregations": true
+                },
+                "comment": ""
               }
             ]
           },
@@ -734,7 +1201,23 @@
               "name": "current_collections_v2",
               "schema": "public"
             },
-            "object_relationships": [],
+            "object_relationships": [
+              {
+                "name": "cdn_asset_uris",
+                "using": {
+                  "manual_configuration": {
+                    "column_mapping": {
+                      "uri": "asset_uri"
+                    },
+                    "insertion_order": null,
+                    "remote_table": {
+                      "name": "parsed_asset_uris",
+                      "schema": "nft_metadata_crawler"
+                    }
+                  }
+                }
+              }
+            ],
             "select_permissions": [
               {
                 "role": "anonymous",
@@ -866,50 +1349,6 @@
               }
             ]
           },
-          {
-            "table": {
-              "name": "current_fungible_asset_balances",
-              "schema": "public"
-            },
-            "object_relationships": [
-              {
-                "name": "metadata",
-                "using": {
-                  "manual_configuration": {
-                    "column_mapping": {
-                      "asset_type": "asset_type"
-                    },
-                    "insertion_order": null,
-                    "remote_table": {
-                      "name": "fungible_asset_metadata",
-                      "schema": "public"
-                    }
-                  }
-                }
-              }
-            ],
-            "select_permissions": [
-              {
-                "role": "anonymous",
-                "permission": {
-                  "columns": [
-                    "amount",
-                    "asset_type",
-                    "is_frozen",
-                    "is_primary",
-                    "last_transaction_timestamp",
-                    "last_transaction_version",
-                    "owner_address",
-                    "storage_id",
-                    "token_standard"
-                  ],
-                  "filter": {},
-                  "limit": 100,
-                  "allow_aggregations": true
-                }
-              }
-            ]
-          },
           {
             "table": {
               "name": "current_objects",
@@ -998,76 +1437,36 @@
           },
           {
             "table": {
-              "name": "current_token_datas",
+              "name": "current_token_datas_v2",
               "schema": "public"
             },
             "object_relationships": [
               {
-                "name": "current_collection_data",
+                "name": "aptos_name",
                 "using": {
                   "manual_configuration": {
                     "column_mapping": {
-                      "collection_data_id_hash": "collection_data_id_hash"
+                      "token_name": "token_name"
                     },
                     "insertion_order": null,
                     "remote_table": {
-                      "name": "current_collection_datas",
+                      "name": "current_aptos_names",
                       "schema": "public"
                     }
                   }
                 }
-              }
-            ],
-            "select_permissions": [
-              {
-                "role": "anonymous",
-                "permission": {
-                  "columns": [
-                    "collection_data_id_hash",
-                    "collection_name",
-                    "creator_address",
-                    "default_properties",
-                    "description",
-                    "description_mutable",
-                    "largest_property_version",
-                    "last_transaction_timestamp",
-                    "last_transaction_version",
-                    "maximum",
-                    "maximum_mutable",
-                    "metadata_uri",
-                    "name",
-                    "payee_address",
-                    "properties_mutable",
-                    "royalty_mutable",
-                    "royalty_points_denominator",
-                    "royalty_points_numerator",
-                    "supply",
-                    "token_data_id_hash",
-                    "uri_mutable"
-                  ],
-                  "filter": {},
-                  "limit": 100
-                }
-              }
-            ]
-          },
-          {
-            "table": {
-              "name": "current_token_datas_v2",
-              "schema": "public"
-            },
-            "object_relationships": [
+              },
               {
-                "name": "aptos_name",
+                "name": "cdn_asset_uris",
                 "using": {
                   "manual_configuration": {
                     "column_mapping": {
-                      "token_name": "token_name"
+                      "token_uri": "asset_uri"
                     },
                     "insertion_order": null,
                     "remote_table": {
-                      "name": "current_aptos_names",
-                      "schema": "public"
+                      "name": "parsed_asset_uris",
+                      "schema": "nft_metadata_crawler"
                     }
                   }
                 }
@@ -1086,9 +1485,11 @@
                     }
                   }
                 }
-              },
+              }
+            ],
+            "array_relationships": [
               {
-                "name": "current_token_ownership",
+                "name": "current_token_ownerships",
                 "using": {
                   "manual_configuration": {
                     "column_mapping": {
@@ -1109,7 +1510,9 @@
                 "permission": {
                   "columns": [
                     "collection_id",
+                    "decimals",
                     "description",
+                    "is_deleted_v2",
                     "is_fungible_v2",
                     "largest_property_version_v1",
                     "last_transaction_timestamp",
@@ -1128,83 +1531,6 @@
               }
             ]
           },
-          {
-            "table": {
-              "name": "current_token_ownerships",
-              "schema": "public"
-            },
-            "object_relationships": [
-              {
-                "name": "aptos_name",
-                "using": {
-                  "manual_configuration": {
-                    "column_mapping": {
-                      "name": "token_name"
-                    },
-                    "insertion_order": null,
-                    "remote_table": {
-                      "name": "current_aptos_names",
-                      "schema": "public"
-                    }
-                  }
-                }
-              },
-              {
-                "name": "current_collection_data",
-                "using": {
-                  "manual_configuration": {
-                    "column_mapping": {
-                      "collection_data_id_hash": "collection_data_id_hash"
-                    },
-                    "insertion_order": null,
-                    "remote_table": {
-                      "name": "current_collection_datas",
-                      "schema": "public"
-                    }
-                  }
-                }
-              },
-              {
-                "name": "current_token_data",
-                "using": {
-                  "manual_configuration": {
-                    "column_mapping": {
-                      "token_data_id_hash": "token_data_id_hash"
-                    },
-                    "insertion_order": null,
-                    "remote_table": {
-                      "name": "current_token_datas",
-                      "schema": "public"
-                    }
-                  }
-                }
-              }
-            ],
-            "select_permissions": [
-              {
-                "role": "anonymous",
-                "permission": {
-                  "columns": [
-                    "amount",
-                    "collection_data_id_hash",
-                    "collection_name",
-                    "creator_address",
-                    "last_transaction_timestamp",
-                    "last_transaction_version",
-                    "name",
-                    "owner_address",
-                    "property_version",
-                    "table_type",
-                    "token_data_id_hash",
-                    "token_properties"
-                  ],
-                  "filter": {},
-                  "limit": 100,
-                  "allow_aggregations": true
-                }
-              }
-            ]
-          },
           {
             "table": {
               "name": "current_token_ownerships_v2",
@@ -1254,6 +1580,7 @@
                     "is_soulbound_v2",
                     "last_transaction_timestamp",
                     "last_transaction_version",
+                    "non_transferrable_by_owner",
                     "owner_address",
                     "property_version_v1",
                     "storage_id",
@@ -1285,7 +1612,7 @@
                     "insertion_order": null,
                     "remote_table": {
                       "name": "current_collection_datas",
-                      "schema": "public"
+                      "schema": "legacy_migration_v1"
                     }
                   }
                 }
@@ -1315,7 +1642,7 @@
                     "insertion_order": null,
                     "remote_table": {
                       "name": "current_token_datas",
-                      "schema": "public"
+                      "schema": "legacy_migration_v1"
                     }
                   }
                 }
@@ -1347,7 +1674,7 @@
                     "insertion_order": null,
                     "remote_table": {
                       "name": "tokens",
-                      "schema": "public"
+                      "schema": "legacy_migration_v1"
                     }
                   }
                 }
@@ -1379,6 +1706,57 @@
               }
             ]
           },
+          {
+            "table": {
+              "name": "current_unified_fungible_asset_balances_to_be_renamed",
+              "schema": "public"
+            },
+            "configuration": {
+              "column_config": {},
+              "custom_column_names": {},
+              "custom_name": "current_fungible_asset_balances",
+              "custom_root_fields": {}
+            },
+            "object_relationships": [
+              {
+                "name": "metadata",
+                "using": {
+                  "manual_configuration": {
+                    "column_mapping": {
+                      "asset_type": "asset_type"
+                    },
+                    "insertion_order": null,
+                    "remote_table": {
+                      "name": "fungible_asset_metadata",
+                      "schema": "public"
+                    }
+                  }
+                }
+              }
+            ],
+            "select_permissions": [
+              {
+                "role": "anonymous",
+                "permission": {
+                  "columns": [
+                    "amount",
+                    "asset_type",
+                    "is_frozen",
+                    "is_primary",
+                    "last_transaction_timestamp",
+                    "last_transaction_version",
+                    "owner_address",
+                    "storage_id",
+                    "token_standard"
+                  ],
+                  "filter": {},
+                  "limit": 100,
+                  "allow_aggregations": true
+                },
+                "comment": ""
+              }
+            ]
+          },
           {
             "table": {
               "name": "delegated_staking_activities",
@@ -1625,10 +2003,12 @@
                     "icon_uri",
                     "last_transaction_timestamp",
                     "last_transaction_version",
+                    "maximum_v2",
                     "name",
                     "project_uri",
                     "supply_aggregator_table_handle_v1",
                     "supply_aggregator_table_key_v1",
+                    "supply_v2",
                     "symbol",
                     "token_standard"
                   ],
@@ -1674,26 +2054,6 @@
               }
             ]
           },
-          {
-            "table": {
-              "name": "move_resources",
-              "schema": "public"
-            },
-            "select_permissions": [
-              {
-                "role": "anonymous",
-                "permission": {
-                  "columns": [
-                    "address",
-                    "transaction_version"
-                  ],
-                  "filter": {},
-                  "limit": 100,
-                  "allow_aggregations": true
-                }
-              }
-            ]
-          },
           {
             "table": {
               "name": "num_active_delegator_per_pool",
@@ -1761,7 +2121,7 @@
           },
           {
             "table": {
-              "name": "table_items",
+              "name": "signatures",
               "schema": "public"
             },
             "select_permissions": [
@@ -1769,22 +2129,28 @@
                 "role": "anonymous",
                 "permission": {
                   "columns": [
-                    "decoded_key",
-                    "decoded_value",
-                    "key",
-                    "table_handle",
+                    "is_sender_primary",
+                    "multi_agent_index",
+                    "multi_sig_index",
+                    "public_key",
+                    "public_key_indices",
+                    "signature",
+                    "signer",
+                    "threshold",
+                    "transaction_block_height",
                     "transaction_version",
-                    "write_set_change_index"
+                    "type"
                   ],
                   "filter": {},
                   "limit": 100
-                }
+                },
+                "comment": ""
               }
             ]
           },
           {
             "table": {
-              "name": "table_metadatas",
+              "name": "table_items",
               "schema": "public"
             },
             "select_permissions": [
@@ -1792,9 +2158,12 @@
                 "role": "anonymous",
                 "permission": {
                   "columns": [
-                    "handle",
-                    "key_type",
-                    "value_type"
+                    "decoded_key",
+                    "decoded_value",
+                    "key",
+                    "table_handle",
+                    "transaction_version",
+                    "write_set_change_index"
                   ],
                   "filter": {},
                   "limit": 100
@@ -1804,85 +2173,20 @@
           },
           {
             "table": {
-              "name": "token_activities",
+              "name": "table_metadatas",
               "schema": "public"
             },
-            "object_relationships": [
-              {
-                "name": "current_token_data",
-                "using": {
-                  "manual_configuration": {
-                    "column_mapping": {
-                      "token_data_id_hash": "token_data_id_hash"
-                    },
-                    "insertion_order": null,
-                    "remote_table": {
-                      "name": "current_token_datas",
-                      "schema": "public"
-                    }
-                  }
-                }
-              }
-            ],
-            "array_relationships": [
-              {
-                "name": "aptos_names_owner",
-                "using": {
-                  "manual_configuration": {
-                    "column_mapping": {
-                      "event_account_address": "registered_address"
-                    },
-                    "insertion_order": null,
-                    "remote_table": {
-                      "name": "current_aptos_names",
-                      "schema": "public"
-                    }
-                  }
-                }
-              },
-              {
-                "name": "aptos_names_to",
-                "using": {
-                  "manual_configuration": {
-                    "column_mapping": {
-                      "to_address": "registered_address"
-                    },
-                    "insertion_order": null,
-                    "remote_table": {
-                      "name": "current_aptos_names",
-                      "schema": "public"
-                    }
-                  }
-                }
-              }
-            ],
             "select_permissions": [
               {
                 "role": "anonymous",
                 "permission": {
                   "columns": [
-                    "coin_amount",
-                    "coin_type",
-                    "collection_data_id_hash",
-                    "collection_name",
-                    "creator_address",
-                    "event_account_address",
-                    "event_creation_number",
-                    "event_index",
-                    "event_sequence_number",
-                    "from_address",
-                    "name",
-                    "property_version",
-                    "to_address",
-                    "token_amount",
-                    "token_data_id_hash",
-                    "transaction_timestamp",
-                    "transaction_version",
-                    "transfer_type"
+                    "handle",
+                    "key_type",
+                    "value_type"
                   ],
                   "filter": {},
-                  "limit": 100,
-                  "allow_aggregations": true
+                  "limit": 100
                 }
               }
             ]
@@ -1969,99 +2273,6 @@
               }
             ]
           },
-          {
-            "table": {
-              "name": "token_datas",
-              "schema": "public"
-            },
-            "select_permissions": [
-              {
-                "role": "anonymous",
-                "permission": {
-                  "columns": [
-                    "collection_data_id_hash",
-                    "collection_name",
-                    "creator_address",
-                    "default_properties",
-                    "description",
-                    "description_mutable",
-                    "largest_property_version",
-                    "maximum",
-                    "maximum_mutable",
-                    "metadata_uri",
-                    "name",
-                    "payee_address",
-                    "properties_mutable",
-                    "royalty_mutable",
-                    "royalty_points_denominator",
-                    "royalty_points_numerator",
-                    "supply",
-                    "token_data_id_hash",
-                    "transaction_timestamp",
-                    "transaction_version",
-                    "uri_mutable"
-                  ],
-                  "filter": {},
-                  "limit": 100
-                }
-              }
-            ]
-          },
-          {
-            "table": {
-              "name": "token_ownerships",
-              "schema": "public"
-            },
-            "select_permissions": [
-              {
-                "role": "anonymous",
-                "permission": {
-                  "columns": [
-                    "amount",
-                    "collection_data_id_hash",
-                    "collection_name",
-                    "creator_address",
-                    "name",
-                    "owner_address",
-                    "property_version",
-                    "table_handle",
-                    "table_type",
-                    "token_data_id_hash",
-                    "transaction_timestamp",
-                    "transaction_version"
-                  ],
-                  "filter": {},
-                  "limit": 100
-                }
-              }
-            ]
-          },
-          {
-            "table": {
-              "name": "tokens",
-              "schema": "public"
-            },
-            "select_permissions": [
-              {
-                "role": "anonymous",
-                "permission": {
-                  "columns": [
-                    "collection_data_id_hash",
-                    "collection_name",
-                    "creator_address",
-                    "name",
-                    "property_version",
-                    "token_data_id_hash",
-                    "token_properties",
-                    "transaction_timestamp",
-                    "transaction_version"
-                  ],
-                  "filter": {},
-                  "limit": 100
-                }
-              }
-            ]
-          },
           {
             "table": {
               "name": "user_transactions",
@@ -2136,7 +2347,7 @@
           "GET"
         ],
         "name": "Latest Processor Status",
-        "url": "get_lastest_processor_status"
+        "url": "get_latest_processor_status"
       }
     ],
     "api_limits": {
@@ -2155,4 +2366,4 @@
       "analyze_response_body": true
     }
   }
-}
+}
\ No newline at end of file
diff --git a/crates/aptos/src/node/local_testnet/indexer_api.rs b/crates/aptos/src/node/local_testnet/indexer_api.rs
index b723a7fc8f638..1967b1ceb2540 100644
--- a/crates/aptos/src/node/local_testnet/indexer_api.rs
+++ b/crates/aptos/src/node/local_testnet/indexer_api.rs
@@ -24,11 +24,11 @@ use std::{collections::HashSet, path::PathBuf};
 use tracing::{info, warn};
 
 const INDEXER_API_CONTAINER_NAME: &str = "local-testnet-indexer-api";
-const HASURA_IMAGE: &str = "hasura/graphql-engine:v2.36.1";
+const HASURA_IMAGE: &str = "hasura/graphql-engine:v2.40.2-ce";
 
 /// This Hasura metadata originates from the aptos-indexer-processors repo.
 ///
-/// This metadata is from revision: 4801acae7aea30d7e96bbfbe5ec5b04056dfa4cf.
+/// This metadata here should come from the same revision as the `processor` dep.
 ///
 /// The metadata file is not taken verbatim, it is currently edited by hand to remove
 /// any references to tables that aren't created by the Rust processor migrations.
diff --git a/crates/aptos/src/node/local_testnet/processors.rs b/crates/aptos/src/node/local_testnet/processors.rs
index 985ed49735cb7..efd9baf8c8924 100644
--- a/crates/aptos/src/node/local_testnet/processors.rs
+++ b/crates/aptos/src/node/local_testnet/processors.rs
@@ -9,10 +9,10 @@ use diesel::Connection;
 use diesel_async::{async_connection_wrapper::AsyncConnectionWrapper, pg::AsyncPgConnection};
 use maplit::hashset;
 use processor::{
+    gap_detectors::DEFAULT_GAP_DETECTION_BATCH_SIZE,
     processors::{
         objects_processor::ObjectsProcessorConfig, stake_processor::StakeProcessorConfig,
-        token_processor::TokenProcessorConfig, token_v2_processor::TokenV2ProcessorConfig,
-        ProcessorConfig, ProcessorName,
+        token_v2_processor::TokenV2ProcessorConfig, ProcessorConfig, ProcessorName,
     },
     utils::database::run_pending_migrations,
     IndexerGrpcProcessorConfig,
@@ -37,13 +37,11 @@ pub struct ProcessorArgs {
         value_enum,
         default_values_t = vec![
             ProcessorName::AccountTransactionsProcessor,
-            ProcessorName::CoinProcessor,
             ProcessorName::DefaultProcessor,
             ProcessorName::EventsProcessor,
             ProcessorName::FungibleAssetProcessor,
             ProcessorName::ObjectsProcessor,
             ProcessorName::StakeProcessor,
-            ProcessorName::TokenProcessor,
             ProcessorName::TokenV2Processor,
             ProcessorName::TransactionMetadataProcessor,
             ProcessorName::UserTransactionProcessor,
@@ -73,7 +71,6 @@ impl ProcessorManager {
             ProcessorName::AnsProcessor => {
                 bail!("ANS processor is not supported in the localnet")
             },
-            ProcessorName::CoinProcessor => ProcessorConfig::CoinProcessor,
             ProcessorName::DefaultProcessor => ProcessorConfig::DefaultProcessor,
             ProcessorName::EventsProcessor => ProcessorConfig::EventsProcessor,
             ProcessorName::FungibleAssetProcessor => ProcessorConfig::FungibleAssetProcessor,
@@ -89,20 +86,18 @@ impl ProcessorManager {
                     query_retry_delay_ms: Default::default(),
                 })
             },
+            ProcessorName::ParquetDefaultProcessor => {
+                bail!("ParquetDefaultProcessor is not supported in the localnet")
+            },
+            ProcessorName::ParquetFungibleAssetProcessor => {
+                bail!("ParquetFungibleAssetProcessor is not supported in the localnet")
+            },
             ProcessorName::StakeProcessor => {
                 ProcessorConfig::StakeProcessor(StakeProcessorConfig {
                     query_retries: Default::default(),
                     query_retry_delay_ms: Default::default(),
                 })
             },
-            ProcessorName::TokenProcessor => {
-                ProcessorConfig::TokenProcessor(TokenProcessorConfig {
-                    // This NFT points contract doesn't exist on localnets.
-                    nft_points_contract: None,
-                    query_retries: Default::default(),
-                    query_retry_delay_ms: Default::default(),
-                })
-            },
             ProcessorName::TokenV2Processor => {
                 ProcessorConfig::TokenV2Processor(TokenV2ProcessorConfig {
                     query_retries: Default::default(),
@@ -131,6 +126,9 @@ impl ProcessorManager {
             pb_channel_txn_chunk_size: 100_000,
             per_table_chunk_sizes: Default::default(),
             transaction_filter: Default::default(),
+            grpc_response_item_timeout_in_secs: 10,
+            deprecated_tables: Default::default(),
+            parquet_gap_detection_batch_size: DEFAULT_GAP_DETECTION_BATCH_SIZE,
         };
         let manager = Self {
             config,
diff --git a/crates/aptos/src/node/mod.rs b/crates/aptos/src/node/mod.rs
index d4dc575f102e7..c9fe8c9a1bacf 100644
--- a/crates/aptos/src/node/mod.rs
+++ b/crates/aptos/src/node/mod.rs
@@ -1193,6 +1193,8 @@ pub enum AnalyzeMode {
     /// For each epoch summarize how many validators were in
     /// each of the reliability buckets.
     NetworkHealthOverTime,
+    /// Max TPS
+    MaxTps,
 }
 
 #[async_trait]
@@ -1211,7 +1213,9 @@ impl CliCommand<()> for AnalyzeValidatorPerformance {
 
         let print_detailed = self.analyze_mode == AnalyzeMode::DetailedEpochTable
             || self.analyze_mode == AnalyzeMode::All;
-        for epoch_info in epochs {
+        let print_max_tps =
+            self.analyze_mode == AnalyzeMode::MaxTps || self.analyze_mode == AnalyzeMode::All;
+        for epoch_info in &epochs {
             let mut epoch_stats =
                 AnalyzeValidators::analyze(&epoch_info.blocks, &epoch_info.validators);
             if !self.pool_addresses.is_empty() {
@@ -1243,6 +1247,21 @@ impl CliCommand<()> for AnalyzeValidatorPerformance {
                     true,
                 );
             }
+            if print_max_tps {
+                for (num_blocks_for_max_tps, max_tps) in &epoch_stats.max_tps_per_block_interval {
+                    println!(
+                        "In {}epoch {}: during consecutive {:?}, found peak of {} TPS, ending on version: {}, {} txns over {}s and {} blocks",
+                        if epoch_info.partial { "partial " } else { "" },
+                        epoch_info.epoch,
+                        num_blocks_for_max_tps,
+                        max_tps.tps,
+                        max_tps.end_version,
+                        max_tps.txns,
+                        max_tps.duration,
+                        max_tps.blocks,
+                    );
+                }
+            }
             if !epoch_info.partial {
                 stats.insert(epoch_info.epoch, epoch_stats);
             }
@@ -1261,6 +1280,19 @@ impl CliCommand<()> for AnalyzeValidatorPerformance {
             );
             AnalyzeValidators::print_detailed_epoch_table(&total_stats, None, true);
         }
+        if print_max_tps {
+            for (num_blocks_for_max_tps, max_tps) in &total_stats.max_tps_per_block_interval {
+                println!(
+                    "Across all epochs: during consecutive {:?}, found peak of {} TPS, ending on version: {}, {} txns over {}s and {} blocks",
+                    num_blocks_for_max_tps,
+                    max_tps.tps,
+                    max_tps.end_version,
+                    max_tps.txns,
+                    max_tps.duration,
+                    max_tps.blocks,
+                );
+            }
+        }
         let all_validators: Vec<_> = total_stats.validator_stats.keys().cloned().collect();
         if self.analyze_mode == AnalyzeMode::ValidatorHealthOverTime
             || self.analyze_mode == AnalyzeMode::All
@@ -1281,6 +1313,8 @@ impl CliCommand<()> for AnalyzeValidatorPerformance {
                 stats.keys().max().unwrap()
             );
             AnalyzeValidators::print_network_health_over_time(&stats, &all_validators);
+
+            AnalyzeValidators::print_gap(epochs.iter().flat_map(|epoch| epoch.blocks.iter()));
         }
         Ok(())
     }
@@ -1434,6 +1468,7 @@ pub struct Time {
 
 impl Time {
     pub fn new(time: Duration) -> Self {
+        #[allow(deprecated)]
         let date_time =
             NaiveDateTime::from_timestamp_opt(time.as_secs() as i64, time.subsec_nanos()).unwrap();
         #[allow(deprecated)]
diff --git a/crates/aptos/src/test/mod.rs b/crates/aptos/src/test/mod.rs
index b85f55ff7d8d0..3012b0c148e65 100644
--- a/crates/aptos/src/test/mod.rs
+++ b/crates/aptos/src/test/mod.rs
@@ -5,7 +5,9 @@ use crate::{
     account::{
         create::{CreateAccount, DEFAULT_FUNDED_COINS},
         fund::FundWithFaucet,
-        key_rotation::{LookupAddress, RotateKey, RotateSummary},
+        key_rotation::{
+            LookupAddress, NewAuthKeyOptions, NewProfileOptions, RotateKey, RotateSummary,
+        },
         list::{ListAccount, ListQuery},
         transfer::{TransferCoins, TransferSummary},
     },
@@ -264,10 +266,16 @@ impl CliTestFramework {
                 prompt_options: PromptOptions::yes(),
                 ..Default::default()
             },
-            new_private_key: Some(new_private_key),
-            save_to_profile: None,
-            new_private_key_file: None,
-            skip_saving_profile: true,
+            new_auth_key_options: NewAuthKeyOptions {
+                new_private_key: Some(new_private_key),
+                new_private_key_file: None,
+                new_derivation_path: None,
+                new_derivation_index: None,
+            },
+            new_profile_options: NewProfileOptions {
+                skip_saving_profile: true,
+                save_to_profile: None,
+            },
         }
         .execute()
         .await?;
@@ -828,6 +836,7 @@ impl CliTestFramework {
                 framework_local_dir: framework_dir,
                 skip_fetch_latest_git_deps: false,
             },
+            template: None,
         }
         .execute()
         .await
@@ -1090,6 +1099,7 @@ impl CliTestFramework {
             package_dir: Some(self.move_dir()),
             output_dir: None,
             named_addresses: Self::named_addresses(account_strs),
+            override_std: None,
             skip_fetch_latest_git_deps: true,
             bytecode_version: None,
             compiler_version: None,
diff --git a/crates/aptos/src/update/mod.rs b/crates/aptos/src/update/mod.rs
index fe784c91efdda..f854bca2219fe 100644
--- a/crates/aptos/src/update/mod.rs
+++ b/crates/aptos/src/update/mod.rs
@@ -6,12 +6,15 @@
 
 mod aptos;
 mod helpers;
+mod movefmt;
 mod revela;
 mod tool;
+mod update_helper;
 
 use crate::common::types::CliTypedResult;
 use anyhow::{anyhow, Context, Result};
 pub use helpers::get_additional_binaries_dir;
+pub use movefmt::get_movefmt_path;
 pub use revela::get_revela_path;
 use self_update::{update::ReleaseUpdate, version::bump_is_greater, Status};
 pub use tool::UpdateTool;
@@ -84,10 +87,21 @@ pub struct UpdateRequiredInfo {
 impl UpdateRequiredInfo {
     pub fn update_required(&self) -> Result<bool> {
         match self.current_version {
-            Some(ref current_version) => bump_is_greater(current_version, &self.target_version)
-                .context(
+            Some(ref current_version) => {
+                // ignore ".beta" or ".rc" for version comparison
+                // because bump_is_greater only supports comparison bewteen `x.y.z`
+                // as a result, `1.0.0.rc1` cannot be updated to `1.0.0.rc2`
+                let target_version = if self.target_version.ends_with(".beta") {
+                    &self.target_version[0..self.target_version.len() - 5]
+                } else if self.target_version.ends_with(".rc") {
+                    &self.target_version[0..self.target_version.len() - 3]
+                } else {
+                    &self.target_version
+                };
+                bump_is_greater(current_version, target_version).context(
                     "Failed to compare current and latest CLI versions, please update manually",
-                ),
+                )
+            },
             None => Ok(true),
         }
     }
diff --git a/crates/aptos/src/update/movefmt.rs b/crates/aptos/src/update/movefmt.rs
new file mode 100644
index 0000000000000..a1a77d549f322
--- /dev/null
+++ b/crates/aptos/src/update/movefmt.rs
@@ -0,0 +1,131 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use super::{update_binary, BinaryUpdater, UpdateRequiredInfo};
+use crate::{
+    common::types::{CliCommand, CliTypedResult},
+    update::update_helper::{build_updater, get_path},
+};
+use anyhow::{Context, Result};
+use async_trait::async_trait;
+use clap::Parser;
+use self_update::update::ReleaseUpdate;
+use std::path::PathBuf;
+
+const FORMATTER_BINARY_NAME: &str = "movefmt";
+const TARGET_FORMATTER_VERSION: &str = "1.0.0.beta";
+
+const FORMATTER_EXE_ENV: &str = "FORMATTER_EXE";
+#[cfg(target_os = "windows")]
+const FORMATTER_EXE: &str = "movefmt.exe";
+#[cfg(not(target_os = "windows"))]
+const FORMATTER_EXE: &str = "movefmt";
+
+/// Update Movefmt, the tool used for formatting Move code.
+#[derive(Debug, Parser)]
+pub struct FormatterUpdateTool {
+    /// The owner of the repo to download the binary from.
+    #[clap(long, default_value = "movebit")]
+    repo_owner: String,
+
+    /// The name of the repo to download the binary from.
+    #[clap(long, default_value = "movefmt")]
+    repo_name: String,
+
+    /// The version to install, e.g. 1.0.1. Use with caution, the default value is a
+    /// version that is tested for compatibility with the version of the CLI you are
+    /// using.
+    #[clap(long, default_value = TARGET_FORMATTER_VERSION)]
+    target_version: String,
+
+    /// Where to install the binary. Make sure this directory is on your PATH. If not
+    /// given we will put it in a standard location for your OS that the CLI will use
+    /// later when the tool is required.
+    #[clap(long)]
+    install_dir: Option<PathBuf>,
+
+    /// If set, it will check if there are updates for the tool, but not actually update
+    #[clap(long, default_value_t = false)]
+    check: bool,
+}
+
+fn extract_movefmt_version(input: &str) -> String {
+    use regex::Regex;
+    let re = Regex::new(r"movefmt v\d+\.\d+\.\d+").unwrap();
+    if let Some(caps) = re.captures(input) {
+        let version = caps.get(0).unwrap().as_str().to_string();
+        return version.trim_start_matches("movefmt v").to_string();
+    }
+    String::new()
+}
+
+impl BinaryUpdater for FormatterUpdateTool {
+    fn check(&self) -> bool {
+        self.check
+    }
+
+    fn pretty_name(&self) -> &'static str {
+        "movefmt"
+    }
+
+    /// Return information about whether an update is required.
+    fn get_update_info(&self) -> Result<UpdateRequiredInfo> {
+        // Get the current version, if any.
+        let fmt_path = get_movefmt_path();
+        let current_version = match fmt_path {
+            Ok(path) => {
+                let output = std::process::Command::new(path)
+                    .arg("--version")
+                    .output()
+                    .context("Failed to get current version of movefmt")?;
+                let stdout = String::from_utf8(output.stdout)
+                    .context("Failed to parse current version of movefmt as UTF-8")?;
+                let version = extract_movefmt_version(&stdout);
+                if !version.is_empty() {
+                    Some(version)
+                } else {
+                    None
+                }
+            },
+            Err(_) => None,
+        };
+
+        Ok(UpdateRequiredInfo {
+            current_version,
+            target_version: self.target_version.trim_start_matches('v').to_string(),
+        })
+    }
+
+    fn build_updater(&self, info: &UpdateRequiredInfo) -> Result<Box<dyn ReleaseUpdate>> {
+        build_updater(
+            info,
+            self.install_dir.clone(),
+            self.repo_owner.clone(),
+            self.repo_name.clone(),
+            FORMATTER_BINARY_NAME,
+            "unknown-linux-gnu",
+            "apple-darwin",
+            "windows",
+        )
+    }
+}
+
+#[async_trait]
+impl CliCommand<String> for FormatterUpdateTool {
+    fn command_name(&self) -> &'static str {
+        "UpdateMovefmt"
+    }
+
+    async fn execute(self) -> CliTypedResult<String> {
+        update_binary(self).await
+    }
+}
+
+pub fn get_movefmt_path() -> Result<PathBuf> {
+    get_path(
+        FORMATTER_BINARY_NAME,
+        FORMATTER_EXE_ENV,
+        FORMATTER_BINARY_NAME,
+        FORMATTER_EXE,
+    )
+}
diff --git a/crates/aptos/src/update/revela.rs b/crates/aptos/src/update/revela.rs
index c6b27571dd32a..84fb0674793a3 100644
--- a/crates/aptos/src/update/revela.rs
+++ b/crates/aptos/src/update/revela.rs
@@ -1,16 +1,15 @@
 // Copyright © Aptos Foundation
 // SPDX-License-Identifier: Apache-2.0
 
-use super::{get_additional_binaries_dir, update_binary, BinaryUpdater, UpdateRequiredInfo};
-use crate::common::{
-    types::{CliCommand, CliTypedResult},
-    utils::cli_build_information,
+use super::{update_binary, BinaryUpdater, UpdateRequiredInfo};
+use crate::{
+    common::types::{CliCommand, CliTypedResult},
+    update::update_helper::{build_updater, get_path},
 };
-use anyhow::{anyhow, bail, Context, Result};
-use aptos_build_info::BUILD_OS;
+use anyhow::{Context, Result};
 use async_trait::async_trait;
 use clap::Parser;
-use self_update::{backends::github::Update, update::ReleaseUpdate};
+use self_update::update::ReleaseUpdate;
 use std::path::PathBuf;
 
 const REVELA_BINARY_NAME: &str = "revela";
@@ -91,44 +90,16 @@ impl BinaryUpdater for RevelaUpdateTool {
     }
 
     fn build_updater(&self, info: &UpdateRequiredInfo) -> Result<Box<dyn ReleaseUpdate>> {
-        // Determine the target we should download based on how the CLI itself was built.
-        let arch_str = get_arch();
-        let build_info = cli_build_information();
-        let target = match build_info.get(BUILD_OS).context("Failed to determine build info of current CLI")?.as_str() {
-            "linux-aarch64" | "linux-x86_64" => "unknown-linux-gnu",
-            "macos-aarch64" | "macos-x86_64" => "apple-darwin",
-            "windows-x86_64" => "pc-windows-gnu",
-            wildcard => bail!("Self-updating is not supported on your OS ({}) right now, please download the binary manually", wildcard),
-        };
-
-        let target = format!("{}-{}", arch_str, target);
-
-        let install_dir = match self.install_dir.clone() {
-            Some(dir) => dir,
-            None => {
-                let dir = get_additional_binaries_dir();
-                // Make the directory if it doesn't already exist.
-                std::fs::create_dir_all(&dir)
-                    .with_context(|| format!("Failed to create directory: {:?}", dir))?;
-                dir
-            },
-        };
-
-        let current_version = match &info.current_version {
-            Some(version) => version,
-            None => "0.0.0",
-        };
-
-        Update::configure()
-            .bin_install_dir(install_dir)
-            .bin_name(REVELA_BINARY_NAME)
-            .repo_owner(&self.repo_owner)
-            .repo_name(&self.repo_name)
-            .current_version(current_version)
-            .target_version_tag(&format!("v{}", info.target_version))
-            .target(&target)
-            .build()
-            .map_err(|e| anyhow!("Failed to build self-update configuration: {:#}", e))
+        build_updater(
+            info,
+            self.install_dir.clone(),
+            self.repo_owner.clone(),
+            self.repo_name.clone(),
+            REVELA_BINARY_NAME,
+            "unknown-linux-gnu",
+            "apple-darwin",
+            "pc-windows-gnu",
+        )
     }
 }
 
@@ -143,43 +114,6 @@ impl CliCommand<String> for RevelaUpdateTool {
     }
 }
 
-#[cfg(target_arch = "x86_64")]
-fn get_arch() -> &'static str {
-    "x86_64"
-}
-
-#[cfg(target_arch = "aarch64")]
-fn get_arch() -> &'static str {
-    "aarch64"
-}
-
-#[cfg(not(any(target_arch = "x86_64", target_arch = "aarch64")))]
-fn get_arch() -> &'static str {
-    unimplemented!("Self-updating is not supported on your CPU architecture right now, please download the binary manually")
-}
-
 pub fn get_revela_path() -> Result<PathBuf> {
-    // Look at the environment variable first.
-    if let Ok(path) = std::env::var(REVELA_EXE_ENV) {
-        return Ok(PathBuf::from(path));
-    }
-
-    // See if it is present in the path where we usually install additional binaries.
-    let path = get_additional_binaries_dir().join(REVELA_BINARY_NAME);
-    if path.exists() && path.is_file() {
-        return Ok(path);
-    }
-
-    // See if we can find the binary in the PATH.
-    if let Some(path) = pathsearch::find_executable_in_path(REVELA_EXE) {
-        return Ok(path);
-    }
-
-    Err(anyhow!(
-        "Cannot locate the decompiler executable. \
-            Environment variable `{}` is not set, and `{}` is not in the PATH. \
-            Try running `aptos update revela` to download it.",
-        REVELA_EXE_ENV,
-        REVELA_EXE
-    ))
+    get_path("decompiler", REVELA_EXE_ENV, REVELA_BINARY_NAME, REVELA_EXE)
 }
diff --git a/crates/aptos/src/update/tool.rs b/crates/aptos/src/update/tool.rs
index 60c0c2a5e6b08..c56fd9f58b65b 100644
--- a/crates/aptos/src/update/tool.rs
+++ b/crates/aptos/src/update/tool.rs
@@ -2,7 +2,10 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use super::{aptos::AptosUpdateTool, revela::RevelaUpdateTool};
-use crate::common::types::{CliCommand, CliResult};
+use crate::{
+    common::types::{CliCommand, CliResult},
+    update::movefmt::FormatterUpdateTool,
+};
 use clap::Subcommand;
 
 /// Update the CLI or other tools it depends on.
@@ -10,6 +13,7 @@ use clap::Subcommand;
 pub enum UpdateTool {
     Aptos(AptosUpdateTool),
     Revela(RevelaUpdateTool),
+    Movefmt(FormatterUpdateTool),
 }
 
 impl UpdateTool {
@@ -17,6 +21,7 @@ impl UpdateTool {
         match self {
             UpdateTool::Aptos(tool) => tool.execute_serialized().await,
             UpdateTool::Revela(tool) => tool.execute_serialized().await,
+            UpdateTool::Movefmt(tool) => tool.execute_serialized().await,
         }
     }
 }
diff --git a/crates/aptos/src/update/update_helper.rs b/crates/aptos/src/update/update_helper.rs
new file mode 100644
index 0000000000000..50797eae0e85f
--- /dev/null
+++ b/crates/aptos/src/update/update_helper.rs
@@ -0,0 +1,106 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    cli_build_information,
+    update::{get_additional_binaries_dir, UpdateRequiredInfo},
+};
+use anyhow::{anyhow, bail, Context, Result};
+use aptos_build_info::BUILD_OS;
+use self_update::{backends::github::Update, update::ReleaseUpdate};
+use std::path::PathBuf;
+
+#[cfg(target_arch = "x86_64")]
+pub fn get_arch() -> &'static str {
+    "x86_64"
+}
+
+#[cfg(target_arch = "aarch64")]
+pub fn get_arch() -> &'static str {
+    "aarch64"
+}
+
+#[cfg(not(any(target_arch = "x86_64", target_arch = "aarch64")))]
+pub fn get_arch() -> &'static str {
+    unimplemented!("Self-updating is not supported on your CPU architecture right now, please download the binary manually")
+}
+
+pub fn build_updater(
+    info: &UpdateRequiredInfo,
+    install_dir: Option<PathBuf>,
+    repo_owner: String,
+    repo_name: String,
+    binary_name: &str,
+    linux_name: &str,
+    mac_os_name: &str,
+    windows_name: &str,
+) -> Result<Box<dyn ReleaseUpdate>> {
+    // Determine the target we should download based on how the CLI itself was built.
+    let arch_str = get_arch();
+    let build_info = cli_build_information();
+    let target = match build_info.get(BUILD_OS).context("Failed to determine build info of current CLI")?.as_str() {
+        "linux-aarch64" | "linux-x86_64" => linux_name,
+        "macos-aarch64" | "macos-x86_64" => mac_os_name,
+        "windows-x86_64" => windows_name,
+        wildcard => bail!("Self-updating is not supported on your OS ({}) right now, please download the binary manually", wildcard),
+    };
+
+    let target = format!("{}-{}", arch_str, target);
+
+    let install_dir = match install_dir.clone() {
+        Some(dir) => dir,
+        None => {
+            let dir = get_additional_binaries_dir();
+            // Make the directory if it doesn't already exist.
+            std::fs::create_dir_all(&dir)
+                .with_context(|| format!("Failed to create directory: {:?}", dir))?;
+            dir
+        },
+    };
+
+    let current_version = match &info.current_version {
+        Some(version) => version,
+        None => "0.0.0",
+    };
+
+    Update::configure()
+        .bin_install_dir(install_dir)
+        .bin_name(binary_name)
+        .repo_owner(&repo_owner)
+        .repo_name(&repo_name)
+        .current_version(current_version)
+        .target_version_tag(&format!("v{}", info.target_version))
+        .target(&target)
+        .build()
+        .map_err(|e| anyhow!("Failed to build self-update configuration: {:#}", e))
+}
+
+pub fn get_path(name: &str, exe_env: &str, binary_name: &str, exe: &str) -> Result<PathBuf> {
+    // Look at the environment variable first.
+    if let Ok(path) = std::env::var(exe_env) {
+        return Ok(PathBuf::from(path));
+    }
+
+    // See if it is present in the path where we usually install additional binaries.
+    let path = get_additional_binaries_dir().join(binary_name);
+    if path.exists() && path.is_file() {
+        return Ok(path);
+    }
+
+    // See if we can find the binary in the PATH.
+    if let Some(path) = pathsearch::find_executable_in_path(exe) {
+        return Ok(path);
+    }
+
+    Err(anyhow!(
+        "Cannot locate the {} executable. \
+            Environment variable `{}` is not set, and `{}` is not in the PATH. \
+            Try running `aptos update {}` to download it and then \
+            updating the environment variable `{}` or adding the executable to PATH",
+        name,
+        exe_env,
+        exe,
+        exe,
+        exe_env
+    ))
+}
diff --git a/crates/bounded-executor/src/concurrent_stream.rs b/crates/bounded-executor/src/concurrent_stream.rs
index 30463cf46eca4..890da0e2b46fd 100644
--- a/crates/bounded-executor/src/concurrent_stream.rs
+++ b/crates/bounded-executor/src/concurrent_stream.rs
@@ -35,6 +35,7 @@ where
 }
 
 #[rustversion::since(1.75)]
+#[allow(dead_code)]
 pub trait ConcurrentStream: Stream {
     fn concurrent_map<Fut, F>(
         self,
diff --git a/crates/channel/src/message_queues_test.rs b/crates/channel/src/message_queues_test.rs
index 8e77906e021da..7a7e474c2f04f 100644
--- a/crates/channel/src/message_queues_test.rs
+++ b/crates/channel/src/message_queues_test.rs
@@ -12,12 +12,6 @@ struct ProposalMsg {
     msg: String,
 }
 
-/// This represents a vote message from a validator
-#[derive(Debug, PartialEq, Eq)]
-struct VoteMsg {
-    msg: String,
-}
-
 #[test]
 fn test_fifo() {
     let mut q = PerKeyQueue::new(QueueStyle::FIFO, NonZeroUsize!(3), None);
diff --git a/crates/indexer/src/indexer/fetcher.rs b/crates/indexer/src/indexer/fetcher.rs
index aa622c01abb0c..26418d1e207ef 100644
--- a/crates/indexer/src/indexer/fetcher.rs
+++ b/crates/indexer/src/indexer/fetcher.rs
@@ -242,7 +242,7 @@ async fn fetch_nexts(
     let mut block_height_bcs = aptos_api_types::U64::from(block_height);
 
     let state_view = context.latest_state_view().unwrap();
-    let converter = state_view.as_converter(context.db.clone(), context.table_info_reader.clone());
+    let converter = state_view.as_converter(context.db.clone(), context.indexer_reader.clone());
 
     let mut transactions = vec![];
     for (ind, raw_txn) in raw_txns.into_iter().enumerate() {
@@ -264,7 +264,7 @@ async fn fetch_nexts(
                 block_height_bcs = aptos_api_types::U64::from(block_height);
             }
         }
-        match converter
+        let res = converter
             .try_into_onchain_transaction(timestamp, raw_txn)
             .map(|mut txn| {
                 match txn {
@@ -287,13 +287,19 @@ async fn fetch_nexts(
                         sct.info.block_height = Some(block_height_bcs);
                         sct.info.epoch = Some(epoch_bcs);
                     },
+                    Transaction::BlockEpilogueTransaction(ref mut bet) => {
+                        bet.info.block_height = Some(block_height_bcs);
+                        bet.info.epoch = Some(epoch_bcs);
+                    },
                     Transaction::ValidatorTransaction(ref mut st) => {
-                        st.info.block_height = Some(block_height_bcs);
-                        st.info.epoch = Some(epoch_bcs);
+                        let info = st.transaction_info_mut();
+                        info.block_height = Some(block_height_bcs);
+                        info.epoch = Some(epoch_bcs);
                     },
                 };
                 txn
-            }) {
+            });
+        match res {
             Ok(transaction) => transactions.push(transaction),
             Err(err) => {
                 UNABLE_TO_FETCH_TRANSACTION.inc();
diff --git a/crates/indexer/src/models/coin_models/coin_activities.rs b/crates/indexer/src/models/coin_models/coin_activities.rs
index a5f03c59dcf6b..50a419a966c48 100644
--- a/crates/indexer/src/models/coin_models/coin_activities.rs
+++ b/crates/indexer/src/models/coin_models/coin_activities.rs
@@ -87,6 +87,7 @@ impl CoinActivity {
         let mut all_event_to_coin_type: EventToCoinType = HashMap::new();
         let mut all_coin_supply = Vec::new();
 
+        #[allow(deprecated)]
         let (txn_info, writesets, events, maybe_user_request, txn_timestamp) = match &transaction {
             APITransaction::GenesisTransaction(inner) => (
                 &inner.info,
diff --git a/crates/indexer/src/models/transactions.rs b/crates/indexer/src/models/transactions.rs
index 95f3142d8010e..52a1f2bca5c5e 100644
--- a/crates/indexer/src/models/transactions.rs
+++ b/crates/indexer/src/models/transactions.rs
@@ -219,12 +219,26 @@ impl Transaction {
                 vec![],
                 vec![],
             ),
+            APITransaction::BlockEpilogueTransaction(block_epilogue_txn) => (
+                Self::from_transaction_info(
+                    &block_epilogue_txn.info,
+                    None,
+                    transaction.type_str().to_string(),
+                    0,
+                    block_height,
+                    epoch,
+                ),
+                None,
+                vec![],
+                vec![],
+                vec![],
+            ),
             APITransaction::PendingTransaction(..) => {
                 unreachable!()
             },
             APITransaction::ValidatorTransaction(validator_txn) => (
                 Self::from_transaction_info(
-                    &validator_txn.info,
+                    validator_txn.transaction_info(),
                     None,
                     transaction.type_str().to_string(),
                     0,
diff --git a/crates/indexer/src/runtime.rs b/crates/indexer/src/runtime.rs
index c3bf5a0516c0d..0a51d732ad1a5 100644
--- a/crates/indexer/src/runtime.rs
+++ b/crates/indexer/src/runtime.rs
@@ -39,7 +39,7 @@ impl MovingAverage {
     }
 
     pub fn tick_now(&mut self, value: u64) {
-        let now = chrono::Utc::now().naive_utc().timestamp_millis() as u64;
+        let now = chrono::Utc::now().timestamp_millis() as u64;
         self.tick(now, value);
     }
 
diff --git a/crates/indexer/src/util.rs b/crates/indexer/src/util.rs
index 21ed52378190e..9105bc5251dc0 100644
--- a/crates/indexer/src/util.rs
+++ b/crates/indexer/src/util.rs
@@ -50,11 +50,13 @@ pub fn parse_timestamp(ts: u64, version: i64) -> chrono::NaiveDateTime {
             ts, version
         )
     });
+    #[allow(deprecated)]
     chrono::NaiveDateTime::from_timestamp_opt(seconds as i64, ns)
         .unwrap_or_else(|| panic!("Could not parse timestamp {:?} for version {}", ts, version))
 }
 
 pub fn parse_timestamp_secs(ts: u64, version: i64) -> chrono::NaiveDateTime {
+    #[allow(deprecated)]
     chrono::NaiveDateTime::from_timestamp_opt(
         std::cmp::min(ts, MAX_TIMESTAMP_SECS as u64) as i64,
         0,
@@ -222,7 +224,7 @@ mod tests {
     #[test]
     fn test_parse_timestamp() {
         let ts = parse_timestamp(1649560602763949, 1);
-        assert_eq!(ts.timestamp(), 1649560602);
+        assert_eq!(ts.and_utc().timestamp(), 1649560602);
         assert_eq!(ts.nanosecond(), 763949000);
         assert_eq!(ts.year(), 2022);
 
@@ -230,7 +232,7 @@ mod tests {
         assert_eq!(ts2.year(), 9999);
 
         let ts3 = parse_timestamp_secs(1659386386, 2);
-        assert_eq!(ts3.timestamp(), 1659386386);
+        assert_eq!(ts3.and_utc().timestamp(), 1659386386);
     }
 
     #[test]
diff --git a/crates/jwk-utils/Cargo.toml b/crates/jwk-utils/Cargo.toml
new file mode 100644
index 0000000000000..c7b001aff20e6
--- /dev/null
+++ b/crates/jwk-utils/Cargo.toml
@@ -0,0 +1,23 @@
+[package]
+name = "aptos-jwk-utils"
+description = "JWK utils"
+version = "0.1.0"
+
+# Workspace inherited keys
+authors = { workspace = true }
+edition = { workspace = true }
+homepage = { workspace = true }
+license = { workspace = true }
+publish = { workspace = true }
+repository = { workspace = true }
+rust-version = { workspace = true }
+
+[dependencies]
+anyhow = { workspace = true }
+aptos-types = { workspace = true }
+http = { workspace = true }
+move-core-types = { workspace = true }
+reqwest = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+tokio = { workspace = true }
diff --git a/crates/jwk-utils/src/lib.rs b/crates/jwk-utils/src/lib.rs
new file mode 100644
index 0000000000000..12b507aae0743
--- /dev/null
+++ b/crates/jwk-utils/src/lib.rs
@@ -0,0 +1,58 @@
+// Copyright (c) Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use anyhow::Result;
+use aptos_types::jwks::jwk::JWK;
+use http::header::COOKIE;
+use move_core_types::account_address::AccountAddress;
+use serde::{Deserialize, Serialize};
+
+#[derive(Serialize, Deserialize)]
+struct OpenIDConfiguration {
+    issuer: String,
+    jwks_uri: String,
+}
+
+#[derive(Serialize, Deserialize)]
+struct JWKsResponse {
+    keys: Vec<serde_json::Value>,
+}
+
+/// Given a JWK URL, fetch its JWKs.
+///
+/// Optionally, if an address is given, send it as the cookie payload.
+/// The optional logic is only used in smoke tests, e.g., `jwk_consensus_basic`.
+pub async fn fetch_jwks_from_jwks_uri(
+    my_addr: Option<AccountAddress>,
+    jwks_uri: &str,
+) -> Result<Vec<JWK>> {
+    let client = reqwest::Client::new();
+    let mut request_builder = client.get(jwks_uri);
+    if let Some(addr) = my_addr {
+        request_builder = request_builder.header(COOKIE, addr.to_hex());
+    }
+    let JWKsResponse { keys } = request_builder.send().await?.json().await?;
+    let jwks = keys.into_iter().map(JWK::from).collect();
+    Ok(jwks)
+}
+
+/// Given an Open ID configuration URL, fetch its JWK url.
+pub async fn fetch_jwks_uri_from_openid_config(config_url: &str) -> Result<String> {
+    let client = reqwest::Client::new();
+    let OpenIDConfiguration { jwks_uri, .. } = client.get(config_url).send().await?.json().await?;
+    Ok(jwks_uri)
+}
+
+#[ignore]
+#[tokio::test]
+async fn test_fetch_real_jwks() {
+    let jwks_uri = fetch_jwks_uri_from_openid_config(
+        "https://www.facebook.com/.well-known/openid-configuration/",
+    )
+    .await
+    .unwrap();
+    let jwks = fetch_jwks_from_jwks_uri(None, jwks_uri.as_str())
+        .await
+        .unwrap();
+    println!("{:?}", jwks);
+}
diff --git a/crates/reliable-broadcast/Cargo.toml b/crates/reliable-broadcast/Cargo.toml
index 87b4b6843a398..d16d37b05bf4b 100644
--- a/crates/reliable-broadcast/Cargo.toml
+++ b/crates/reliable-broadcast/Cargo.toml
@@ -22,6 +22,8 @@ aptos-logger = { workspace = true }
 aptos-time-service = { workspace = true }
 aptos-types = { workspace = true }
 async-trait = { workspace = true }
+bytes = { workspace = true }
+claims = { workspace = true }
 futures = { workspace = true }
 futures-channel = { workspace = true }
 tokio = { workspace = true }
diff --git a/crates/reliable-broadcast/src/lib.rs b/crates/reliable-broadcast/src/lib.rs
index 61308a8e8f9be..a46e806f9aca9 100644
--- a/crates/reliable-broadcast/src/lib.rs
+++ b/crates/reliable-broadcast/src/lib.rs
@@ -6,6 +6,7 @@ use aptos_consensus_types::common::Author;
 use aptos_logger::{debug, sample, sample::SampleRate, warn};
 use aptos_time_service::{TimeService, TimeServiceTrait};
 use async_trait::async_trait;
+use bytes::Bytes;
 use futures::{
     stream::{AbortHandle, FuturesUnordered},
     Future, FutureExt, StreamExt,
@@ -16,12 +17,28 @@ pub trait RBMessage: Send + Sync + Clone {}
 
 #[async_trait]
 pub trait RBNetworkSender<Req: RBMessage, Res: RBMessage = Req>: Send + Sync {
+    async fn send_rb_rpc_raw(
+        &self,
+        receiver: Author,
+        message: Bytes,
+        timeout: Duration,
+    ) -> anyhow::Result<Res>;
+
     async fn send_rb_rpc(
         &self,
         receiver: Author,
         message: Req,
         timeout: Duration,
     ) -> anyhow::Result<Res>;
+
+    /// Serializes the given message into bytes using each peers' preferred protocol.
+    fn to_bytes_by_protocol(
+        &self,
+        peers: Vec<Author>,
+        message: Req,
+    ) -> anyhow::Result<HashMap<Author, Bytes>>;
+
+    fn sort_peers_by_latency(&self, peers: &mut [Author]);
 }
 
 pub trait BroadcastStatus<Req: RBMessage, Res: RBMessage = Req>: Send + Sync + Clone {
@@ -37,6 +54,7 @@ pub trait BroadcastStatus<Req: RBMessage, Res: RBMessage = Req>: Send + Sync + C
 }
 
 pub struct ReliableBroadcast<Req: RBMessage, TBackoff, Res: RBMessage = Req> {
+    self_author: Author,
     validators: Vec<Author>,
     network_sender: Arc<dyn RBNetworkSender<Req, Res>>,
     backoff_policy: TBackoff,
@@ -52,6 +70,7 @@ where
     Res: RBMessage + 'static,
 {
     pub fn new(
+        self_author: Author,
         validators: Vec<Author>,
         network_sender: Arc<dyn RBNetworkSender<Req, Res>>,
         backoff_policy: TBackoff,
@@ -60,6 +79,7 @@ where
         executor: BoundedExecutor,
     ) -> Self {
         Self {
+            self_author,
             validators,
             network_sender,
             backoff_policy,
@@ -73,7 +93,7 @@ where
         &self,
         message: S::Message,
         aggregating: S,
-    ) -> impl Future<Output = S::Aggregated> + 'static
+    ) -> impl Future<Output = anyhow::Result<S::Aggregated>> + 'static
     where
         <<S as BroadcastStatus<Req, Res>>::Response as TryFrom<Res>>::Error: Debug,
     {
@@ -86,7 +106,7 @@ where
         message: S::Message,
         aggregating: S,
         receivers: Vec<Author>,
-    ) -> impl Future<Output = S::Aggregated> + 'static
+    ) -> impl Future<Output = anyhow::Result<S::Aggregated>> + 'static
     where
         <<S as BroadcastStatus<Req, Res>>::Response as TryFrom<Res>>::Error: Debug,
     {
@@ -100,28 +120,49 @@ where
             .map(|author| (author, self.backoff_policy.clone()))
             .collect();
         let executor = self.executor.clone();
+        let self_author = self.self_author;
         async move {
-            let send_message = |receiver, message, sleep_duration: Option<Duration>| {
+            let message: Req = message.into();
+
+            let peers = receivers.clone();
+            let sender = network_sender.clone();
+            let message_clone = message.clone();
+            let protocols = Arc::new(
+                tokio::task::spawn_blocking(move || {
+                    sender.to_bytes_by_protocol(peers, message_clone)
+                })
+                .await??,
+            );
+
+            let send_message = |receiver, sleep_duration: Option<Duration>| {
                 let network_sender = network_sender.clone();
                 let time_service = time_service.clone();
+                let message = message.clone();
+                let protocols = protocols.clone();
                 async move {
                     if let Some(duration) = sleep_duration {
                         time_service.sleep(duration).await;
                     }
-                    (
-                        receiver,
-                        network_sender
-                            .send_rb_rpc(receiver, message, rpc_timeout_duration)
-                            .await,
-                    )
+                    let send_fut = if receiver == self_author {
+                        network_sender.send_rb_rpc(receiver, message, rpc_timeout_duration)
+                    } else if let Some(raw_message) = protocols.get(&receiver).cloned() {
+                        network_sender.send_rb_rpc_raw(receiver, raw_message, rpc_timeout_duration)
+                    } else {
+                        network_sender.send_rb_rpc(receiver, message, rpc_timeout_duration)
+                    };
+                    (receiver, send_fut.await)
                 }
                 .boxed()
             };
-            let message: Req = message.into();
+
             let mut rpc_futures = FuturesUnordered::new();
             let mut aggregate_futures = FuturesUnordered::new();
+
+            let mut receivers = receivers;
+            network_sender.sort_peers_by_latency(&mut receivers);
+
             for receiver in receivers {
-                rpc_futures.push(send_message(receiver, message.clone(), None));
+                rpc_futures.push(send_message(receiver, None));
             }
             loop {
                 tokio::select! {
@@ -144,7 +185,7 @@ where
                         match result {
                             Ok(may_be_aggragated) => {
                                 if let Some(aggregated) = may_be_aggragated {
-                                    return aggregated;
+                                    return Ok(aggregated);
                                 }
                             },
                             Err(e) => {
@@ -155,7 +196,7 @@ where
                                     .expect("should be present");
                                 let duration = backoff_strategy.next().expect("should produce value");
                                 rpc_futures
-                                    .push(send_message(receiver, message.clone(), Some(duration)));
+                                    .push(send_message(receiver, Some(duration)));
                             },
                         }
                     },
@@ -170,12 +211,12 @@ fn log_rpc_failure(error: anyhow::Error, receiver: Author) {
     // Log a sampled warning (to prevent spam)
     sample!(
         SampleRate::Duration(Duration::from_secs(1)),
-        warn!(error = ?error, "rpc to {} failed", receiver)
+        warn!(error = ?error, "rpc to {} failed, error {}", receiver, error)
     );
 
     // Log at the debug level (this is useful for debugging
     // and won't spam the logs in a production environment).
-    debug!(error = ?error, "rpc to {} failed", receiver);
+    debug!(error = ?error, "rpc to {} failed, error {}", receiver, error);
 }
 
 pub struct DropGuard {
diff --git a/crates/reliable-broadcast/src/tests.rs b/crates/reliable-broadcast/src/tests.rs
index 89bc67cbb21f5..826f0607a4f1d 100644
--- a/crates/reliable-broadcast/src/tests.rs
+++ b/crates/reliable-broadcast/src/tests.rs
@@ -10,6 +10,8 @@ use aptos_infallible::Mutex;
 use aptos_time_service::TimeService;
 use aptos_types::validator_verifier::random_validator_verifier;
 use async_trait::async_trait;
+use bytes::Bytes;
+use claims::assert_ok_eq;
 use futures::{
     stream::{AbortHandle, Abortable},
     FutureExt,
@@ -27,6 +29,7 @@ use tokio_retry::strategy::FixedInterval;
 #[derive(Clone)]
 struct TestMessage(Vec<u8>);
 
+#[allow(unused)]
 #[derive(Clone)]
 struct TestAck(Vec<u8>);
 
@@ -89,10 +92,10 @@ where
     TestAck: TryFrom<M> + Into<M>,
     TestMessage: TryFrom<M, Error = anyhow::Error> + Into<M>,
 {
-    async fn send_rb_rpc(
+    async fn send_rb_rpc_raw(
         &self,
         receiver: Author,
-        message: M,
+        raw_message: Bytes,
         _timeout: Duration,
     ) -> anyhow::Result<M> {
         match self.failures.lock().entry(receiver) {
@@ -106,19 +109,47 @@ where
             },
             Entry::Vacant(_) => (),
         };
-        let message: TestMessage = message.try_into()?;
+        let message = TestMessage(raw_message.to_vec());
         self.received.lock().insert(receiver, message.clone());
         Ok(TestAck(message.0).into())
     }
+
+    async fn send_rb_rpc(
+        &self,
+        author: Author,
+        message: M,
+        timeout: Duration,
+    ) -> anyhow::Result<M> {
+        let message: TestMessage = message.try_into()?;
+        let raw_message: Bytes = message.0.into();
+        self.send_rb_rpc_raw(author, raw_message, timeout).await
+    }
+
+    fn to_bytes_by_protocol(
+        &self,
+        peers: Vec<Author>,
+        message: M,
+    ) -> anyhow::Result<HashMap<Author, Bytes>> {
+        let message: TestMessage = message.try_into()?;
+        let raw_message: Bytes = message.0.into();
+        Ok(peers
+            .into_iter()
+            .map(|peer| (peer, raw_message.clone()))
+            .collect())
+    }
+
+    fn sort_peers_by_latency(&self, _: &mut [Author]) {}
 }
 
 #[tokio::test]
 async fn test_reliable_broadcast() {
     let (_, validator_verifier) = random_validator_verifier(5, None, false);
     let validators = validator_verifier.get_ordered_account_addresses();
+    let self_author = validators[0];
     let failures = HashMap::from([(validators[0], 1), (validators[2], 3)]);
     let sender = Arc::new(TestRBSender::<TestRBMessage>::new(failures));
     let rb = ReliableBroadcast::new(
+        self_author,
         validators.clone(),
         sender,
         FixedInterval::from_millis(10),
@@ -132,16 +163,18 @@ async fn test_reliable_broadcast() {
         received: Arc::new(Mutex::new(HashSet::new())),
     });
     let fut = rb.broadcast(message, aggregating);
-    assert_eq!(fut.await, validators.into_iter().collect());
+    assert_ok_eq!(fut.await, validators.into_iter().collect());
 }
 
 #[tokio::test]
 async fn test_chaining_reliable_broadcast() {
     let (_, validator_verifier) = random_validator_verifier(5, None, false);
     let validators = validator_verifier.get_ordered_account_addresses();
+    let self_author = validators[0];
     let failures = HashMap::from([(validators[0], 1), (validators[2], 3)]);
     let sender = Arc::new(TestRBSender::<TestRBMessage>::new(failures));
     let rb = Arc::new(ReliableBroadcast::new(
+        self_author,
         validators.clone(),
         sender,
         FixedInterval::from_millis(10),
@@ -159,23 +192,25 @@ async fn test_chaining_reliable_broadcast() {
     let fut = rb1
         .broadcast(message.clone(), aggregating)
         .then(|aggregated| async move {
-            assert_eq!(aggregated, expected);
+            assert_ok_eq!(aggregated, expected);
             let aggregating = Arc::new(TestBroadcastStatus {
                 threshold: validator_verifier.len(),
                 received: Arc::new(Mutex::new(HashSet::new())),
             });
             rb.broadcast(message, aggregating).await
         });
-    assert_eq!(fut.await, validators.into_iter().collect());
+    assert_ok_eq!(fut.await, validators.into_iter().collect());
 }
 
 #[tokio::test]
 async fn test_abort_reliable_broadcast() {
     let (_, validator_verifier) = random_validator_verifier(5, None, false);
     let validators = validator_verifier.get_ordered_account_addresses();
+    let self_author = validators[0];
     let failures = HashMap::from([(validators[0], 1), (validators[2], 3)]);
     let sender = Arc::new(TestRBSender::<TestRBMessage>::new(failures));
     let rb = Arc::new(ReliableBroadcast::new(
+        self_author,
         validators.clone(),
         sender,
         FixedInterval::from_millis(10),
diff --git a/crates/transaction-emitter-lib/src/args.rs b/crates/transaction-emitter-lib/src/args.rs
index 45fe819576cbb..99ff392327ac5 100644
--- a/crates/transaction-emitter-lib/src/args.rs
+++ b/crates/transaction-emitter-lib/src/args.rs
@@ -194,7 +194,7 @@ pub struct EmitArgs {
 
     #[clap(long, default_value = "false")]
     /// Skip minting account during initialization
-    pub skip_minting_accounts: bool,
+    pub skip_funding_accounts: bool,
 
     #[clap(long)]
     pub latency_polling_interval_s: Option<f32>,
diff --git a/crates/transaction-emitter-lib/src/cluster.rs b/crates/transaction-emitter-lib/src/cluster.rs
index b0cd4e73a4be5..a1584b3ef992f 100644
--- a/crates/transaction-emitter-lib/src/cluster.rs
+++ b/crates/transaction-emitter-lib/src/cluster.rs
@@ -1,7 +1,7 @@
 // Copyright © Aptos Foundation
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::{emitter::query_sequence_number, instance::Instance, ClusterArgs};
+use crate::{emitter::load_specific_account, instance::Instance, ClusterArgs};
 use anyhow::{anyhow, bail, format_err, Result};
 use aptos_crypto::{
     ed25519::{Ed25519PrivateKey, Ed25519PublicKey},
@@ -9,9 +9,7 @@ use aptos_crypto::{
 };
 use aptos_logger::{info, warn};
 use aptos_rest_client::{Client as RestClient, State};
-use aptos_sdk::types::{
-    account_config::aptos_test_root_address, chain_id::ChainId, AccountKey, LocalAccount,
-};
+use aptos_sdk::types::{chain_id::ChainId, AccountKey, LocalAccount};
 use futures::{stream::FuturesUnordered, StreamExt};
 use rand::seq::SliceRandom;
 use std::{convert::TryFrom, time::Instant};
@@ -200,22 +198,7 @@ impl Cluster {
     }
 
     pub async fn load_coin_source_account(&self, client: &RestClient) -> Result<LocalAccount> {
-        let account_key = self.account_key();
-        let address = if self.coin_source_is_root {
-            aptos_test_root_address()
-        } else {
-            account_key.authentication_key().account_address()
-        };
-
-        let sequence_number = query_sequence_number(client, address).await.map_err(|e| {
-            format_err!(
-                "query_sequence_number on {:?} for account {} failed: {:?}",
-                client,
-                address,
-                e
-            )
-        })?;
-        Ok(LocalAccount::new(address, account_key, sequence_number))
+        load_specific_account(self.account_key(), self.coin_source_is_root, client).await
     }
 
     pub fn random_instance(&self) -> Instance {
diff --git a/crates/transaction-emitter-lib/src/emitter/account_minter.rs b/crates/transaction-emitter-lib/src/emitter/account_minter.rs
index a96e91d11eb1d..4409dfa93b383 100644
--- a/crates/transaction-emitter-lib/src/emitter/account_minter.rs
+++ b/crates/transaction-emitter-lib/src/emitter/account_minter.rs
@@ -1,8 +1,13 @@
 // Copyright © Aptos Foundation
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::{emitter::local_account_generator::LocalAccountGenerator, EmitJobRequest};
+use super::{
+    local_account_generator::LocalAccountGenerator, parse_seed,
+    transaction_executor::RestApiReliableTransactionSubmitter,
+};
+use crate::EmitJobRequest;
 use anyhow::{anyhow, bail, format_err, Context, Result};
+use aptos_config::config::DEFAULT_MAX_SUBMIT_TRANSACTION_BATCH_SIZE;
 use aptos_crypto::{
     ed25519::{Ed25519PrivateKey, Ed25519PublicKey},
     encoding_type::EncodingType,
@@ -16,13 +21,11 @@ use aptos_sdk::{
     },
 };
 use aptos_transaction_generator_lib::{
-    CounterState, ReliableTransactionSubmitter, RootAccountHandle, SEND_AMOUNT,
-};
-use core::{
-    cmp::min,
-    result::Result::{Err, Ok},
+    CounterState, ReliableTransactionSubmitter, RootAccountHandle,
 };
-use futures::StreamExt;
+use aptos_types::account_address::AccountAddress;
+use core::result::Result::{Err, Ok};
+use futures::{future::try_join_all, StreamExt};
 use rand::{rngs::StdRng, Rng, SeedableRng};
 use std::{
     path::Path,
@@ -31,9 +34,10 @@ use std::{
 };
 
 pub struct SourceAccountManager<'t> {
-    pub source_account: &'t LocalAccount,
+    pub source_account: Arc<LocalAccount>,
     pub txn_executor: &'t dyn ReliableTransactionSubmitter,
-    pub req: &'t EmitJobRequest,
+    pub mint_to_root: bool,
+    pub prompt_before_spending: bool,
     pub txn_factory: TransactionFactory,
 }
 
@@ -43,19 +47,23 @@ impl<'t> RootAccountHandle for SourceAccountManager<'t> {
         self.check_approve_funds(amount, reason).await.unwrap();
     }
 
-    fn get_root_account(&self) -> &LocalAccount {
-        self.source_account
+    fn get_root_account(&self) -> Arc<LocalAccount> {
+        self.source_account.clone()
     }
 }
 
 impl<'t> SourceAccountManager<'t> {
+    fn source_account_address(&self) -> AccountAddress {
+        self.source_account.address()
+    }
+
     // returns true if we might want to recheck the volume, as it was auto-approved.
     async fn check_approve_funds(&self, amount: u64, reason: &str) -> Result<bool> {
         let balance = self
             .txn_executor
-            .get_account_balance(self.source_account.address())
+            .get_account_balance(self.source_account_address())
             .await?;
-        Ok(if self.req.mint_to_root {
+        Ok(if self.mint_to_root {
             // We have a root account, so amount of funds minted is not a problem
             // We can have multiple txn emitter running simultaneously, each coming to this check at the same time.
             // So they might all pass the check, but not be able to consume funds they need. So we check more conservatively
@@ -63,7 +71,7 @@ impl<'t> SourceAccountManager<'t> {
             if balance < amount.checked_mul(100).unwrap_or(u64::MAX / 2) {
                 info!(
                     "Mint account {} current balance is {}, needing {} for {}, minting to refil it fully",
-                    self.source_account.address(),
+                    self.source_account_address(),
                     balance,
                     amount,
                     reason,
@@ -74,7 +82,7 @@ impl<'t> SourceAccountManager<'t> {
             } else {
                 info!(
                     "Mint account {} current balance is {}, needing {} for {}. Proceeding without minting, as balance would overflow otherwise",
-                    self.source_account.address(),
+                    self.source_account_address(),
                     balance,
                     amount,
                     reason,
@@ -85,7 +93,7 @@ impl<'t> SourceAccountManager<'t> {
         } else {
             info!(
                 "Source account {} current balance is {}, needed {} coins for {}, or {:.3}% of its balance",
-                self.source_account.address(),
+                self.source_account_address(),
                 balance,
                 amount,
                 reason,
@@ -95,14 +103,14 @@ impl<'t> SourceAccountManager<'t> {
             if balance < amount {
                 return Err(anyhow!(
                     "Source ({}) doesn't have enough coins, balance {} < needed {} for {}",
-                    self.source_account.address(),
+                    self.source_account_address(),
                     balance,
                     amount,
                     reason
                 ));
             }
 
-            if self.req.prompt_before_spending {
+            if self.prompt_before_spending {
                 if !prompt_yes(&format!(
                     "plan will consume in total {} balance for {}, are you sure you want to proceed",
                     amount,
@@ -128,7 +136,7 @@ impl<'t> SourceAccountManager<'t> {
         let txn = self
             .source_account
             .sign_with_transaction_builder(self.txn_factory.payload(
-                aptos_stdlib::aptos_coin_mint(self.source_account.address(), amount),
+                aptos_stdlib::aptos_coin_mint(self.source_account_address(), amount),
             ));
 
         if let Err(e) = txn_executor.execute_transactions(&[txn]).await {
@@ -136,7 +144,7 @@ impl<'t> SourceAccountManager<'t> {
             // so check on failure if another emitter has refilled it instead
 
             let balance = txn_executor
-                .get_account_balance(self.source_account.address())
+                .get_account_balance(self.source_account_address())
                 .await?;
             if balance > u64::MAX / 2 {
                 Ok(())
@@ -151,7 +159,7 @@ impl<'t> SourceAccountManager<'t> {
 
 pub struct AccountMinter<'t> {
     txn_factory: TransactionFactory,
-    rng: StdRng,
+    account_rng: StdRng,
     source_account: &'t SourceAccountManager<'t>,
 }
 
@@ -159,39 +167,12 @@ impl<'t> AccountMinter<'t> {
     pub fn new(
         source_account: &'t SourceAccountManager<'t>,
         txn_factory: TransactionFactory,
-        rng: StdRng,
+        account_rng: StdRng,
     ) -> Self {
         Self {
             source_account,
             txn_factory,
-            rng,
-        }
-    }
-
-    pub fn get_needed_balance_per_account(&self, req: &EmitJobRequest, num_accounts: usize) -> u64 {
-        if let Some(val) = req.coins_per_account_override {
-            info!("    with {} balance each because of override", val);
-            val
-        } else {
-            // round up:
-            let txnx_per_account =
-                (req.expected_max_txns + num_accounts as u64 - 1) / num_accounts as u64;
-            let min_balance = req.max_gas_per_txn * req.gas_price;
-            let coins_per_account = txnx_per_account
-                .checked_mul(SEND_AMOUNT + req.get_expected_gas_per_txn() * req.gas_price)
-                .unwrap()
-                .checked_add(min_balance)
-                .unwrap(); // extra coins for secure to pay none zero gas price
-
-            info!(
-                "    with {} balance each because of expecting {} txns per account, with {} gas at {} gas price per txn, and min balance {}",
-                coins_per_account,
-                txnx_per_account,
-                req.get_expected_gas_per_txn(),
-                req.gas_price,
-                min_balance,
-            );
-            coins_per_account
+            account_rng,
         }
     }
 
@@ -249,23 +230,22 @@ impl<'t> AccountMinter<'t> {
     pub async fn create_and_fund_accounts(
         &mut self,
         txn_executor: &dyn ReliableTransactionSubmitter,
-        req: &EmitJobRequest,
-        account_generator: Box<dyn LocalAccountGenerator>,
-        max_submit_batch_size: usize,
+        seed_accounts: Vec<Arc<LocalAccount>>,
         local_accounts: Vec<Arc<LocalAccount>>,
+        coins_per_account: u64,
+        max_submit_batch_size: usize,
+        mint_to_root: bool,
+        create_secondary_source_account: bool,
     ) -> Result<()> {
         let num_accounts = local_accounts.len();
 
         info!(
-            "Account creation plan created for {} accounts and {} txns:",
-            num_accounts, req.expected_max_txns,
+            "Account creation plan created for {} accounts and {} coins per account",
+            num_accounts, coins_per_account,
         );
 
-        let expected_num_seed_accounts =
-            (num_accounts / 50).clamp(1, (num_accounts as f32).sqrt() as usize + 1);
-        let coins_per_account = self.get_needed_balance_per_account(req, num_accounts);
         let expected_children_per_seed_account =
-            (num_accounts + expected_num_seed_accounts - 1) / expected_num_seed_accounts;
+            (num_accounts + seed_accounts.len() - 1) / seed_accounts.len();
 
         let coins_per_seed_account = Self::funds_needed_for_multi_transfer(
             "seed",
@@ -275,8 +255,8 @@ impl<'t> AccountMinter<'t> {
             self.txn_factory.get_gas_unit_price(),
         );
         let coins_for_source = Self::funds_needed_for_multi_transfer(
-            if req.mint_to_root { "root" } else { "source" },
-            expected_num_seed_accounts as u64,
+            if mint_to_root { "root" } else { "source" },
+            seed_accounts.len() as u64,
             coins_per_seed_account,
             self.txn_factory.get_max_gas_amount(),
             self.txn_factory.get_gas_unit_price(),
@@ -288,8 +268,8 @@ impl<'t> AccountMinter<'t> {
             .await?
         {
             // recheck value makes sense for auto-approval.
-            let max_allowed = (3 * req.expected_max_txns as u128)
-                .checked_mul((req.get_expected_gas_per_txn() * req.gas_price).into())
+            let max_allowed = (3 * coins_per_account as u128)
+                .checked_mul(num_accounts as u128)
                 .unwrap();
             assert!(coins_for_source as u128 <= max_allowed,
                 "Overhead too large to consume funds without approval - estimated total coins needed for load test ({}) are larger than expected_max_txns * expected_gas_per_txn, multiplied by 3 to account for rounding up and overheads ({})",
@@ -298,7 +278,7 @@ impl<'t> AccountMinter<'t> {
             );
         }
 
-        let new_source_account = if !req.coordination_delay_between_instances.is_zero() {
+        let new_source_account = if create_secondary_source_account {
             Some(
                 self.create_new_source_account(txn_executor, coins_for_source)
                     .await?,
@@ -313,18 +293,15 @@ impl<'t> AccountMinter<'t> {
 
         // Create seed accounts with which we can create actual accounts concurrently. Adding
         // additional fund for paying gas fees later.
-        let seed_accounts = self
-            .create_and_fund_seed_accounts(
-                new_source_account,
-                txn_executor,
-                account_generator,
-                expected_num_seed_accounts,
-                coins_per_seed_account,
-                max_submit_batch_size,
-                &request_counters,
-            )
-            .await?;
-        let actual_num_seed_accounts = seed_accounts.len();
+        self.create_and_fund_seed_accounts(
+            new_source_account,
+            txn_executor,
+            &seed_accounts,
+            coins_per_seed_account,
+            max_submit_batch_size,
+            &request_counters,
+        )
+        .await?;
 
         info!(
             "Completed creating {} seed accounts in {}s, each with {} coins, request stats: {}",
@@ -344,7 +321,7 @@ impl<'t> AccountMinter<'t> {
         let request_counters = txn_executor.create_counter_state();
 
         let approx_accounts_per_seed =
-            (num_accounts + actual_num_seed_accounts - 1) / actual_num_seed_accounts;
+            (num_accounts + seed_accounts.len() - 1) / seed_accounts.len();
 
         let local_accounts_by_seed: Vec<Vec<Arc<LocalAccount>>> = local_accounts
             .chunks(approx_accounts_per_seed)
@@ -393,36 +370,29 @@ impl<'t> AccountMinter<'t> {
 
     pub async fn create_and_fund_seed_accounts(
         &mut self,
-        mut new_source_account: Option<LocalAccount>,
+        new_source_account: Option<LocalAccount>,
         txn_executor: &dyn ReliableTransactionSubmitter,
-        account_generator: Box<dyn LocalAccountGenerator>,
-        seed_account_num: usize,
+        seed_accounts: &[Arc<LocalAccount>],
         coins_per_seed_account: u64,
         max_submit_batch_size: usize,
         counters: &CounterState,
-    ) -> Result<Vec<LocalAccount>> {
+    ) -> Result<()> {
         info!(
             "Creating and funding seeds accounts (txn {} gas price)",
             self.txn_factory.get_gas_unit_price()
         );
-        let mut i = 0;
-        let mut seed_accounts = vec![];
-        while i < seed_account_num {
-            let batch_size = min(max_submit_batch_size, seed_account_num - i);
-            let mut rng = StdRng::from_rng(self.rng()).unwrap();
-            let mut batch = account_generator
-                .gen_local_accounts(txn_executor, batch_size, &mut rng)
-                .await?;
+        let source_account = match new_source_account {
+            None => self.source_account.get_root_account().clone(),
+            Some(param_account) => Arc::new(param_account),
+        };
+
+        for chunk in seed_accounts.chunks(max_submit_batch_size) {
             let txn_factory = &self.txn_factory;
-            let create_requests: Vec<_> = batch
+            let create_requests: Vec<_> = chunk
                 .iter()
                 .map(|account| {
                     create_and_fund_account_request(
-                        if let Some(account) = &mut new_source_account {
-                            account
-                        } else {
-                            self.source_account.get_root_account()
-                        },
+                        source_account.clone(),
                         coins_per_seed_account,
                         account.public_key(),
                         txn_factory,
@@ -432,12 +402,9 @@ impl<'t> AccountMinter<'t> {
             txn_executor
                 .execute_transactions_with_counter(&create_requests, counters)
                 .await?;
-
-            i += batch_size;
-            seed_accounts.append(&mut batch);
         }
 
-        Ok(seed_accounts)
+        Ok(())
     }
 
     pub async fn load_vasp_account(
@@ -470,16 +437,17 @@ impl<'t> AccountMinter<'t> {
         coins_for_source: u64,
     ) -> Result<LocalAccount> {
         const NUM_TRIES: usize = 3;
+        let root_account = self.source_account.get_root_account();
+        let root_address = root_account.address();
         for i in 0..NUM_TRIES {
-            self.source_account.get_root_account().set_sequence_number(
-                txn_executor
-                    .query_sequence_number(self.source_account.get_root_account().address())
-                    .await?,
-            );
+            {
+                let new_sequence_number = txn_executor.query_sequence_number(root_address).await?;
+                root_account.set_sequence_number(new_sequence_number);
+            }
 
-            let new_source_account = LocalAccount::generate(self.rng());
+            let new_source_account = LocalAccount::generate(self.account_rng());
             let txn = create_and_fund_account_request(
-                self.source_account.get_root_account(),
+                root_account.clone(),
                 coins_for_source,
                 new_source_account.public_key(),
                 &self.txn_factory,
@@ -510,15 +478,15 @@ impl<'t> AccountMinter<'t> {
         bail!("Couldn't create new source account");
     }
 
-    pub fn rng(&mut self) -> &mut StdRng {
-        &mut self.rng
+    pub fn account_rng(&mut self) -> &mut StdRng {
+        &mut self.account_rng
     }
 }
 
 /// Create `num_new_accounts` by transferring coins from `source_account`. Return Vec of created
 /// accounts
 async fn create_and_fund_new_accounts(
-    source_account: LocalAccount,
+    source_account: Arc<LocalAccount>,
     accounts: Vec<Arc<LocalAccount>>,
     coins_per_new_account: u64,
     max_num_accounts_per_batch: usize,
@@ -530,12 +498,13 @@ async fn create_and_fund_new_accounts(
         .chunks(max_num_accounts_per_batch)
         .map(|chunk| chunk.to_vec())
         .collect::<Vec<_>>();
+    let source_address = source_account.address();
     for batch in accounts_by_batch {
         let creation_requests: Vec<_> = batch
             .iter()
             .map(|account| {
                 create_and_fund_account_request(
-                    &source_account,
+                    source_account.clone(),
                     coins_per_new_account,
                     account.public_key(),
                     txn_factory,
@@ -546,13 +515,13 @@ async fn create_and_fund_new_accounts(
         txn_executor
             .execute_transactions_with_counter(&creation_requests, counters)
             .await
-            .with_context(|| format!("Account {} couldn't mint", source_account.address()))?;
+            .with_context(|| format!("Account {} couldn't mint", source_address))?;
     }
     Ok(())
 }
 
 pub fn create_and_fund_account_request(
-    creation_account: &LocalAccount,
+    creation_account: Arc<LocalAccount>,
     amount: u64,
     pubkey: &Ed25519PublicKey,
     txn_factory: &TransactionFactory,
@@ -585,3 +554,170 @@ pub fn prompt_yes(prompt: &str) -> bool {
     }
     result.unwrap()
 }
+
+pub struct BulkAccountCreationConfig {
+    max_submit_batch_size: usize,
+    skip_funding_accounts: bool,
+    seed: Option<[u8; 32]>,
+    mint_to_root: bool,
+    prompt_before_spending: bool,
+    create_secondary_source_account: bool,
+    expected_gas_per_transfer: u64,
+    expected_gas_per_account_create: u64,
+}
+
+impl BulkAccountCreationConfig {
+    pub fn new(
+        max_submit_batch_size: usize,
+        skip_funding_accounts: bool,
+        seed: Option<&str>,
+        mint_to_root: bool,
+        prompt_before_spending: bool,
+        create_secondary_source_account: bool,
+        expected_gas_per_transfer: u64,
+        expected_gas_per_account_create: u64,
+    ) -> Self {
+        Self {
+            max_submit_batch_size,
+            skip_funding_accounts,
+            seed: seed.map(parse_seed),
+            mint_to_root,
+            prompt_before_spending,
+            create_secondary_source_account,
+            expected_gas_per_transfer,
+            expected_gas_per_account_create,
+        }
+    }
+}
+
+impl From<&EmitJobRequest> for BulkAccountCreationConfig {
+    fn from(req: &EmitJobRequest) -> Self {
+        Self {
+            max_submit_batch_size: DEFAULT_MAX_SUBMIT_TRANSACTION_BATCH_SIZE,
+            skip_funding_accounts: req.skip_funding_accounts,
+            seed: req.account_minter_seed,
+            mint_to_root: req.mint_to_root,
+            prompt_before_spending: req.prompt_before_spending,
+            create_secondary_source_account: !req.coordination_delay_between_instances.is_zero(),
+            expected_gas_per_transfer: req.get_expected_gas_per_transfer(),
+            expected_gas_per_account_create: req.get_expected_gas_per_account_create(),
+        }
+    }
+}
+
+pub async fn bulk_create_accounts(
+    coin_source_account: Arc<LocalAccount>,
+    txn_executor: &RestApiReliableTransactionSubmitter,
+    txn_factory: &TransactionFactory,
+    account_generator: Box<dyn LocalAccountGenerator>,
+    config: BulkAccountCreationConfig,
+    num_accounts: usize,
+    coins_per_account: u64,
+) -> Result<Vec<LocalAccount>> {
+    let source_account_manager = SourceAccountManager {
+        source_account: coin_source_account,
+        txn_executor,
+        mint_to_root: config.mint_to_root,
+        prompt_before_spending: config.prompt_before_spending,
+        txn_factory: txn_factory.clone(),
+    };
+
+    let seed = config.seed.unwrap_or_else(|| {
+        let mut rng = StdRng::from_entropy();
+        rng.gen()
+    });
+    info!(
+        "AccountMinter Seed (reuse accounts by passing into --account-minter-seed): {:?}",
+        seed
+    );
+
+    let mut rng = StdRng::from_seed(seed);
+
+    let num_seed_accounts = (num_accounts / 50).clamp(1, (num_accounts as f32).sqrt() as usize + 1);
+    let seed_accounts = account_generator
+        .gen_local_accounts(txn_executor, num_seed_accounts, &mut rng)
+        .await?;
+
+    let accounts = account_generator
+        .gen_local_accounts(txn_executor, num_accounts, &mut rng)
+        .await?;
+
+    info!(
+        "Generated and fetched re-usable accounts for seed {:?}",
+        seed
+    );
+
+    let all_accounts_already_exist = accounts.iter().all(|account| account.sequence_number() > 0);
+    let all_seed_accounts_already_exist = seed_accounts
+        .iter()
+        .all(|account| account.sequence_number() > 0);
+
+    info!(
+        "Accounts exist: {}, seed accounts exist: {}",
+        all_accounts_already_exist, all_seed_accounts_already_exist
+    );
+
+    let send_money_gas = if all_accounts_already_exist && all_seed_accounts_already_exist {
+        config.expected_gas_per_transfer
+    } else {
+        config.expected_gas_per_account_create
+    };
+
+    let mut account_minter = AccountMinter::new(
+        &source_account_manager,
+        txn_factory.clone().with_max_gas_amount(send_money_gas),
+        // Wrap seed once, to not have conflicts between worker and seed accounts.
+        // We also don't want to continue from the same rng, as number of accounts will affect
+        // seed accounts.
+        StdRng::from_seed(StdRng::from_seed(seed).gen()),
+    );
+
+    if !config.skip_funding_accounts {
+        let accounts: Vec<_> = accounts.into_iter().map(Arc::new).collect();
+        let seed_accounts: Vec<_> = seed_accounts.into_iter().map(Arc::new).collect();
+
+        account_minter
+            .create_and_fund_accounts(
+                txn_executor,
+                seed_accounts.clone(),
+                accounts.clone(),
+                coins_per_account,
+                config.max_submit_batch_size,
+                config.mint_to_root,
+                config.create_secondary_source_account,
+            )
+            .await?;
+        let accounts: Vec<_> = accounts
+            .into_iter()
+            .map(|a| Arc::try_unwrap(a).unwrap())
+            .collect();
+        info!("Accounts created and funded");
+        Ok(accounts)
+    } else {
+        info!(
+            "Account reuse plan created for {} accounts and min balance {}",
+            accounts.len(),
+            coins_per_account,
+        );
+
+        let balance_futures = accounts
+            .iter()
+            .map(|account| txn_executor.get_account_balance(account.address()));
+        let balances: Vec<_> = try_join_all(balance_futures).await?;
+        accounts
+            .iter()
+            .zip(balances)
+            .for_each(|(account, balance)| {
+                assert!(
+                    balance >= coins_per_account,
+                    "Account {} has balance {} < needed_min_balance {}",
+                    account.address(),
+                    balance,
+                    coins_per_account
+                );
+            });
+
+        info!("Skipping funding accounts");
+        Ok(accounts)
+    }
+}
diff --git a/crates/transaction-emitter-lib/src/emitter/mod.rs b/crates/transaction-emitter-lib/src/emitter/mod.rs
index 532b89ef77683..b1f827751620b 100644
--- a/crates/transaction-emitter-lib/src/emitter/mod.rs
+++ b/crates/transaction-emitter-lib/src/emitter/mod.rs
@@ -8,8 +8,8 @@ pub mod submission_worker;
 pub mod transaction_executor;
 
 use crate::emitter::{
-    account_minter::{AccountMinter, SourceAccountManager},
-    local_account_generator::{create_account_generator, LocalAccountGenerator},
+    account_minter::{bulk_create_accounts, SourceAccountManager},
+    local_account_generator::create_account_generator,
     stats::{DynamicStatsTracking, TxnStats},
     submission_worker::SubmissionWorker,
     transaction_executor::RestApiReliableTransactionSubmitter,
@@ -17,19 +17,24 @@ use crate::emitter::{
 use again::RetryPolicy;
 use anyhow::{ensure, format_err, Result};
 use aptos_config::config::DEFAULT_MAX_SUBMIT_TRANSACTION_BATCH_SIZE;
-use aptos_logger::{debug, error, info, sample, sample::SampleRate, warn};
+use aptos_logger::{error, info, sample, sample::SampleRate, warn};
 use aptos_rest_client::{aptos_api_types::AptosErrorCode, error::RestError, Client as RestClient};
 use aptos_sdk::{
     move_types::account_address::AccountAddress,
     transaction_builder::{aptos_stdlib, TransactionFactory},
-    types::{transaction::SignedTransaction, LocalAccount},
+    types::{transaction::SignedTransaction, AccountKey, LocalAccount},
 };
 use aptos_transaction_generator_lib::{
-    create_txn_generator_creator, AccountType, ReliableTransactionSubmitter, TransactionType,
+    create_txn_generator_creator, AccountType, TransactionType, SEND_AMOUNT,
 };
+use aptos_types::account_config::aptos_test_root_address;
 use futures::future::{try_join_all, FutureExt};
 use once_cell::sync::Lazy;
-use rand::{rngs::StdRng, seq::IteratorRandom, Rng};
+use rand::{
+    rngs::StdRng,
+    seq::{IteratorRandom, SliceRandom},
+    Rng,
+};
 use rand_core::SeedableRng;
 use std::{
     cmp::{max, min},
@@ -46,15 +51,18 @@ use tokio::{runtime::Handle, task::JoinHandle, time};
 // Max is 100k TPS for 3 hours
 const MAX_TXNS: u64 = 1_000_000_000;
 
+// TODO Transfer cost increases during Coin => FA migration, we can reduce back later.
+pub const EXPECTED_GAS_PER_TRANSFER: u64 = 10;
+pub const EXPECTED_GAS_PER_ACCOUNT_CREATE: u64 = 2000 + 8;
+
 const MAX_RETRIES: usize = 12;
 
-// This retry policy is used for important client calls necessary for setting
-// up the test (e.g. account creation) and collecting its results (e.g. checking
-// account sequence numbers). If these fail, the whole test fails. We do not use
-// this for submitting transactions, as we have a way to handle when that fails.
-// This retry policy means an operation will take 8 seconds at most.
-pub static RETRY_POLICY: Lazy<RetryPolicy> = Lazy::new(|| {
-    RetryPolicy::exponential(Duration::from_millis(125))
+// This retry policy is used for querying sequence numbers and account balances in the initialization step.
+// If these fail, the whole test fails. Backoff is large, as generally only other side
+// throttling our requests is the cause for failures.
+// We do not use this for submitting transactions, as we have a way to handle when that fails.
+static FETCH_ACCOUNT_RETRY_POLICY: Lazy<RetryPolicy> = Lazy::new(|| {
+    RetryPolicy::exponential(Duration::from_secs(1))
         .with_max_retries(MAX_RETRIES)
         .with_jitter(true)
 });
@@ -92,7 +100,11 @@ pub enum EmitJobMode {
     },
     WaveTps {
         average_tps: usize,
+        // amount of traffic that is oscilating:
+        // 1.0 means it oscilates between [0, 2 * average_tps]
+        // 0.3 means it oscilates between [0.7 * average_tps, 1.3 * average_tps]
         wave_ratio: f32,
+        // number of waves within the wait_millis interval (which is txn_expiration_time + 180s)
         num_waves: usize,
     },
 }
@@ -144,6 +156,7 @@ pub struct EmitJobRequest {
 
     transaction_mix_per_phase: Vec<Vec<(TransactionType, usize)>>,
     account_type: AccountType,
+
     max_gas_per_txn: u64,
     init_max_gas_per_txn: Option<u64>,
 
@@ -159,7 +172,7 @@ pub struct EmitJobRequest {
     init_gas_price_multiplier: u64,
 
     mint_to_root: bool,
-    skip_minting_accounts: bool,
+    skip_funding_accounts: bool,
 
     txn_expiration_time_secs: u64,
     init_expiration_multiplier: f64,
@@ -171,6 +184,8 @@ pub struct EmitJobRequest {
     coordination_delay_between_instances: Duration,
 
     latency_polling_interval: Duration,
+    // Default additional wait is (txn_expiration_time_secs + 5). Override to wait for different length.
+    tps_wait_after_expiration_secs: Option<u64>,
 
     account_minter_seed: Option<[u8; 32]>,
 }
@@ -189,18 +204,19 @@ impl Default for EmitJobRequest {
             init_max_gas_per_txn: None,
             init_gas_price_multiplier: 2,
             mint_to_root: false,
-            skip_minting_accounts: false,
+            skip_funding_accounts: false,
             txn_expiration_time_secs: 60,
             init_expiration_multiplier: 3.0,
             init_retry_interval: Duration::from_secs(10),
             num_accounts_mode: NumAccountsMode::TransactionsPerAccount(20),
             expected_max_txns: MAX_TXNS,
             expected_gas_per_txn: None,
-            expected_gas_per_transfer: 10,
-            expected_gas_per_account_create: 2000 + 5,
+            expected_gas_per_transfer: EXPECTED_GAS_PER_TRANSFER,
+            expected_gas_per_account_create: EXPECTED_GAS_PER_ACCOUNT_CREATE,
             prompt_before_spending: false,
             coordination_delay_between_instances: Duration::from_secs(0),
             latency_polling_interval: Duration::from_millis(300),
+            tps_wait_after_expiration_secs: None,
             account_minter_seed: None,
             coins_per_account_override: None,
         }
@@ -227,6 +243,11 @@ impl EmitJobRequest {
         self
     }
 
+    pub fn init_expiration_multiplier(mut self, init_expiration_multiplier: f64) -> Self {
+        self.init_expiration_multiplier = init_expiration_multiplier;
+        self
+    }
+
     pub fn init_max_gas_per_txn(mut self, init_max_gas_per_txn: u64) -> Self {
         self.init_max_gas_per_txn = Some(init_max_gas_per_txn);
         self
@@ -332,8 +353,8 @@ impl EmitJobRequest {
         self
     }
 
-    pub fn skip_minting_accounts(mut self) -> Self {
-        self.skip_minting_accounts = true;
+    pub fn skip_funding_accounts(mut self) -> Self {
+        self.skip_funding_accounts = true;
         self
     }
 
@@ -433,7 +454,12 @@ impl EmitJobRequest {
                 // That's why we set wait_seconds conservativelly, to make sure all processing and
                 // client calls finish within that time.
 
-                let wait_seconds = self.txn_expiration_time_secs + 180;
+                let wait_seconds =
+                    if let Some(wait_after_expiration) = self.tps_wait_after_expiration_secs {
+                        self.txn_expiration_time_secs + wait_after_expiration
+                    } else {
+                        self.txn_expiration_time_secs * 2 + 5
+                    };
                 // In case we set a very low TPS, we need to still be able to spread out
                 // transactions, at least to the seconds granularity, so we reduce transactions_per_account
                 // if needed.
@@ -460,7 +486,7 @@ impl EmitJobRequest {
                 };
 
                 info!(
-                    " Transaction emitter targeting {} TPS, expecting {} TPS",
+                    " Transaction emitter targetting {} TPS, expecting {} TPS",
                     tps,
                     num_accounts * transactions_per_account / wait_seconds as usize
                 );
@@ -645,7 +671,7 @@ impl EmitJob {
     }
 }
 
-#[derive(Debug)]
+#[derive(Clone, Debug)]
 pub struct TxnEmitter {
     txn_factory: TransactionFactory,
     rng: StdRng,
@@ -669,7 +695,7 @@ impl TxnEmitter {
 
     pub async fn start_job(
         &mut self,
-        root_account: &LocalAccount,
+        root_account: Arc<LocalAccount>,
         req: EmitJobRequest,
         stats_tracking_phases: usize,
     ) -> Result<EmitJob> {
@@ -699,20 +725,21 @@ impl TxnEmitter {
             .with_transaction_expiration_time(init_expiration_time);
         let init_retries: usize =
             usize::try_from(init_expiration_time / req.init_retry_interval.as_secs()).unwrap();
-        let seed = req.account_minter_seed.unwrap_or_else(|| self.rng.gen());
 
         let account_generator = create_account_generator(req.account_type);
 
-        let mut all_accounts = create_accounts(
-            root_account,
+        let mut all_accounts = bulk_create_accounts(
+            root_account.clone(),
+            &RestApiReliableTransactionSubmitter::new(
+                req.rest_clients.clone(),
+                init_retries,
+                req.init_retry_interval,
+            ),
             &init_txn_factory,
             account_generator,
-            &req,
-            mode_params.max_submit_batch_size,
-            req.skip_minting_accounts,
-            seed,
+            (&req).into(),
             num_accounts,
-            init_retries,
+            get_needed_balance_per_account_from_req(&req, num_accounts),
         )
         .await?;
 
@@ -720,16 +747,17 @@ impl TxnEmitter {
         let stats = Arc::new(DynamicStatsTracking::new(stats_tracking_phases));
         let tokio_handle = Handle::current();
 
-        let txn_executor = RestApiReliableTransactionSubmitter {
-            rest_clients: req.rest_clients.clone(),
-            max_retries: init_retries,
-            retry_after: req.init_retry_interval,
-        };
+        let txn_executor = RestApiReliableTransactionSubmitter::new(
+            req.rest_clients.clone(),
+            init_retries,
+            req.init_retry_interval,
+        );
         let source_account_manager = SourceAccountManager {
-            source_account: root_account,
+            source_account: root_account.clone(),
             txn_executor: &txn_executor,
-            req: &req,
             txn_factory: init_txn_factory.clone(),
+            mint_to_root: req.mint_to_root,
+            prompt_before_spending: req.prompt_before_spending,
         };
         let (txn_generator_creator, _, _) = create_txn_generator_creator(
             &req.transaction_mix_per_phase,
@@ -773,8 +801,10 @@ impl TxnEmitter {
         // traffic pattern to be correct.
         info!("Tx emitter creating workers");
         let mut submission_workers = Vec::with_capacity(num_accounts);
+        let all_clients = Arc::new(req.rest_clients.clone());
         for index in 0..num_accounts {
-            let client = &req.rest_clients[index % req.rest_clients.len()];
+            let main_client_index = index % all_clients.len();
+
             let accounts = all_accounts.split_off(all_accounts.len() - 1);
             let stop = stop.clone();
             let stats = Arc::clone(&stats);
@@ -783,7 +813,8 @@ impl TxnEmitter {
 
             let worker = SubmissionWorker::new(
                 accounts,
-                client.clone(),
+                all_clients.clone(),
+                main_client_index,
                 stop,
                 mode_params.clone(),
                 stats,
@@ -815,7 +846,7 @@ impl TxnEmitter {
 
     async fn emit_txn_for_impl(
         mut self,
-        source_account: &LocalAccount,
+        source_account: Arc<LocalAccount>,
         emit_job_request: EmitJobRequest,
         duration: Duration,
         print_stats_interval: Option<u64>,
@@ -851,7 +882,7 @@ impl TxnEmitter {
 
     pub async fn emit_txn_for(
         self,
-        source_account: &mut LocalAccount,
+        source_account: Arc<LocalAccount>,
         emit_job_request: EmitJobRequest,
         duration: Duration,
     ) -> Result<TxnStats> {
@@ -861,7 +892,7 @@ impl TxnEmitter {
 
     pub async fn emit_txn_for_with_stats(
         self,
-        source_account: &LocalAccount,
+        source_account: Arc<LocalAccount>,
         emit_job_request: EmitJobRequest,
         duration: Duration,
         interval_secs: u64,
@@ -889,6 +920,11 @@ impl TxnEmitter {
     }
 }
 
+#[allow(dead_code)]
+fn pick_client(clients: &Vec<RestClient>) -> &RestClient {
+    clients.choose(&mut rand::thread_rng()).unwrap()
+}
+
 /// This function waits for the submitted transactions to be committed, up to
 /// a wait_timeout (counted from the start_time passed in, not from the function call).
 /// It returns number of transactions that expired without being committed,
@@ -978,78 +1014,6 @@ async fn wait_for_accounts_sequence(
     (latest_fetched_counts, sum_of_completion_timestamps_millis)
 }
 
-fn update_seq_num_and_get_num_expired(
-    accounts: &mut [LocalAccount],
-    account_to_start_and_end_seq_num: HashMap<AccountAddress, (u64, u64)>,
-    latest_fetched_counts: HashMap<AccountAddress, u64>,
-) -> (usize, usize) {
-    accounts.iter_mut().for_each(|account| {
-        let (start_seq_num, end_seq_num) =
-            if let Some(pair) = account_to_start_and_end_seq_num.get(&account.address()) {
-                pair
-            } else {
-                return;
-            };
-        assert!(account.sequence_number() == *end_seq_num);
-
-        match latest_fetched_counts.get(&account.address()) {
-            Some(count) => {
-                if *count != account.sequence_number() {
-                    assert!(account.sequence_number() > *count);
-                    debug!(
-                        "Stale sequence_number for {}, expected {}, setting to {}",
-                        account.address(),
-                        account.sequence_number(),
-                        count
-                    );
-                    account.set_sequence_number(*count);
-                }
-            },
-            None => {
-                debug!(
-                    "Couldn't fetch sequence_number for {}, expected {}, setting to {}",
-                    account.address(),
-                    account.sequence_number(),
-                    start_seq_num
-                );
-                account.set_sequence_number(*start_seq_num);
-            },
-        }
-    });
-
-    account_to_start_and_end_seq_num
-        .iter()
-        .map(
-            |(address, (start_seq_num, end_seq_num))| match latest_fetched_counts.get(address) {
-                Some(count) => {
-                    assert!(
-                        *count <= *end_seq_num,
-                        "{address} :: {count} > {end_seq_num}"
-                    );
-                    if *count >= *start_seq_num {
-                        (
-                            (*count - *start_seq_num) as usize,
-                            (*end_seq_num - *count) as usize,
-                        )
-                    } else {
-                        debug!(
-                            "Stale sequence_number fetched for {}, start_seq_num {}, fetched {}",
-                            address, start_seq_num, *count
-                        );
-                        (0, (*end_seq_num - *start_seq_num) as usize)
-                    }
-                },
-                None => (0, (end_seq_num - start_seq_num) as usize),
-            },
-        )
-        .fold(
-            (0, 0),
-            |(committed, expired), (cur_committed, cur_expired)| {
-                (committed + cur_committed, expired + cur_expired)
-            },
-        )
-}
-
 pub async fn query_sequence_number(client: &RestClient, address: AccountAddress) -> Result<u64> {
     Ok(query_sequence_numbers(client, [address].iter()).await?.0[0].1)
 }
@@ -1062,8 +1026,9 @@ pub async fn query_sequence_numbers<'a, I>(
 where
     I: Iterator<Item = &'a AccountAddress>,
 {
-    let futures = addresses
-        .map(|address| RETRY_POLICY.retry(move || get_account_if_exists(client, *address)));
+    let futures = addresses.map(|address| {
+        FETCH_ACCOUNT_RETRY_POLICY.retry(move || get_account_address_and_seq_num(client, *address))
+    });
 
     let (seq_nums, timestamps): (Vec<_>, Vec<_>) = try_join_all(futures)
         .await
@@ -1076,14 +1041,23 @@ where
     Ok((seq_nums, timestamps.into_iter().min().unwrap()))
 }
 
-async fn get_account_if_exists(
+async fn get_account_address_and_seq_num(
     client: &RestClient,
     address: AccountAddress,
 ) -> Result<((AccountAddress, u64), u64)> {
+    get_account_seq_num(client, address)
+        .await
+        .map(|(seq_num, ts)| ((address, seq_num), ts))
+}
+
+pub async fn get_account_seq_num(
+    client: &RestClient,
+    address: AccountAddress,
+) -> Result<(u64, u64)> {
     let result = client.get_account_bcs(address).await;
     match &result {
         Ok(resp) => Ok((
-            (address, resp.inner().sequence_number()),
+            resp.inner().sequence_number(),
             Duration::from_micros(resp.state().timestamp_usecs).as_secs(),
         )),
         Err(e) => {
@@ -1091,7 +1065,7 @@ async fn get_account_if_exists(
             if let RestError::Api(api_error) = e {
                 if let AptosErrorCode::AccountNotFound = api_error.error.error_code {
                     return Ok((
-                        (address, 0),
+                        0,
                         Duration::from_micros(api_error.state.as_ref().unwrap().timestamp_usecs)
                             .as_secs(),
                     ));
@@ -1103,6 +1077,28 @@ async fn get_account_if_exists(
     }
 }
 
+pub async fn load_specific_account(
+    account_key: AccountKey,
+    is_root: bool,
+    client: &RestClient,
+) -> Result<LocalAccount> {
+    let address = if is_root {
+        aptos_test_root_address()
+    } else {
+        account_key.authentication_key().account_address()
+    };
+
+    let sequence_number = query_sequence_number(client, address).await.map_err(|e| {
+        format_err!(
+            "query_sequence_number on {:?} for account {} failed: {:?}",
+            client,
+            address,
+            e
+        )
+    })?;
+    Ok(LocalAccount::new(address, account_key, sequence_number))
+}
+
 pub fn gen_transfer_txn_request(
     sender: &mut LocalAccount,
     receiver: &AccountAddress,
@@ -1128,103 +1124,50 @@ pub fn parse_seed(seed_string: &str) -> [u8; 32] {
         .expect("failed to convert to array")
 }
 
-pub async fn create_accounts(
-    root_account: &LocalAccount,
-    txn_factory: &TransactionFactory,
-    account_generator: Box<dyn LocalAccountGenerator>,
-    req: &EmitJobRequest,
-    max_submit_batch_size: usize,
-    skip_minting_accounts: bool,
-    seed: [u8; 32],
+pub fn get_needed_balance_per_account(
+    num_workload_transactions: u64,
+    gas_per_workload_transaction: u64,
+    octas_per_workload_transaction: u64,
     num_accounts: usize,
-    retries: usize,
-) -> Result<Vec<LocalAccount>> {
-    info!(
-        "Using reliable/retriable init transaction executor with {} retries, every {}s",
-        retries,
-        req.init_retry_interval.as_secs_f32()
-    );
+    gas_price: u64,
+    max_gas_per_txn: u64,
+) -> u64 {
+    // round up:
+    let txnx_per_account =
+        (num_workload_transactions + num_accounts as u64 - 1) / num_accounts as u64;
+    let coins_per_account = txnx_per_account
+        .checked_mul(octas_per_workload_transaction + gas_per_workload_transaction * gas_price)
+        .unwrap()
+        .checked_add(max_gas_per_txn * gas_price)
+        .unwrap();
 
     info!(
-        "AccountMinter Seed (reuse accounts by passing into --account-minter-seed): {:?}",
-        seed
-    );
-    let txn_executor = RestApiReliableTransactionSubmitter {
-        rest_clients: req.rest_clients.clone(),
-        max_retries: retries,
-        retry_after: req.init_retry_interval,
-    };
-    let source_account_manager = SourceAccountManager {
-        source_account: root_account,
-        txn_executor: &txn_executor,
-        req,
-        txn_factory: txn_factory.clone(),
-    };
-
-    let mut rng = StdRng::from_seed(seed);
-
-    let accounts = account_generator
-        .gen_local_accounts(&txn_executor, num_accounts, &mut rng)
-        .await?;
-
-    info!("Generated re-usable accounts for seed {:?}", seed);
-
-    let all_accounts_already_exist = accounts.iter().all(|account| account.sequence_number() > 0);
-    let send_money_gas = if all_accounts_already_exist {
-        req.get_expected_gas_per_transfer()
-    } else {
-        req.get_expected_gas_per_account_create()
-    };
-
-    let mut account_minter = AccountMinter::new(
-        &source_account_manager,
-        txn_factory.clone().with_max_gas_amount(send_money_gas),
-        StdRng::from_seed(seed),
+        "Needed {} balance for each account because of expecting {} txns per account with {} gas and {} octas, with leaving {} gas for max_txn_gas, all at {} gas price",
+        coins_per_account,
+        txnx_per_account,
+        gas_per_workload_transaction,
+        octas_per_workload_transaction,
+        max_gas_per_txn,
+        gas_price,
     );
+    coins_per_account
+}
 
-    if !skip_minting_accounts {
-        let accounts: Vec<_> = accounts.into_iter().map(Arc::new).collect();
-        account_minter
-            .create_and_fund_accounts(
-                &txn_executor,
-                req,
-                account_generator,
-                max_submit_batch_size,
-                accounts.clone(),
-            )
-            .await?;
-        let accounts: Vec<_> = accounts
-            .into_iter()
-            .map(|a| Arc::try_unwrap(a).unwrap())
-            .collect();
-        info!("Accounts created and funded");
-        Ok(accounts)
-    } else {
+pub fn get_needed_balance_per_account_from_req(req: &EmitJobRequest, num_accounts: usize) -> u64 {
+    if let Some(val) = req.coins_per_account_override {
         info!(
-            "Account reuse plan created for {} accounts and {} txns:",
-            accounts.len(),
-            req.expected_max_txns,
+            "Needed {} balance for each account because of override",
+            val
         );
-
-        let needed_min_balance = account_minter.get_needed_balance_per_account(req, accounts.len());
-        let balance_futures = accounts
-            .iter()
-            .map(|account| txn_executor.get_account_balance(account.address()));
-        let balances: Vec<_> = try_join_all(balance_futures).await?;
-        accounts
-            .iter()
-            .zip(balances)
-            .for_each(|(account, balance)| {
-                assert!(
-                    balance >= needed_min_balance,
-                    "Account {} has balance {} < needed_min_balance {}",
-                    account.address(),
-                    balance,
-                    needed_min_balance
-                );
-            });
-
-        info!("Skipping minting accounts");
-        Ok(accounts)
+        val
+    } else {
+        get_needed_balance_per_account(
+            req.expected_max_txns,
+            req.get_expected_gas_per_txn(),
+            SEND_AMOUNT,
+            num_accounts,
+            req.gas_price,
+            req.max_gas_per_txn,
+        )
     }
 }
diff --git a/crates/transaction-emitter-lib/src/emitter/stats.rs b/crates/transaction-emitter-lib/src/emitter/stats.rs
index a129f8678528c..d91fc5da69153 100644
--- a/crates/transaction-emitter-lib/src/emitter/stats.rs
+++ b/crates/transaction-emitter-lib/src/emitter/stats.rs
@@ -40,11 +40,11 @@ impl fmt::Display for TxnStatsRate {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(
             f,
-            "committed: {} txn/s{}{}{}, latency: {} ms, (p50: {} ms, p90: {} ms, p99: {} ms), latency samples: {}",
+            "committed: {:.2} txn/s{}{}{}, latency: {:.2} ms, (p50: {} ms, p90: {} ms, p99: {} ms), latency samples: {}",
             self.committed,
-            if self.submitted != self.committed { format!(", submitted: {} txn/s", self.submitted) } else { "".to_string()},
-            if self.failed_submission != 0.0 { format!(", failed submission: {} txn/s", self.failed_submission) } else { "".to_string()},
-            if self.expired != 0.0 { format!(", expired: {} txn/s", self.expired) } else { "".to_string()},
+            if self.submitted != self.committed { format!(", submitted: {:.2} txn/s", self.submitted) } else { "".to_string()},
+            if self.failed_submission != 0.0 { format!(", failed submission: {:.2} txn/s", self.failed_submission) } else { "".to_string()},
+            if self.expired != 0.0 { format!(", expired: {:.2} txn/s", self.expired) } else { "".to_string()},
             self.latency, self.p50_latency, self.p90_latency, self.p99_latency, self.latency_samples,
         )
     }
diff --git a/crates/transaction-emitter-lib/src/emitter/submission_worker.rs b/crates/transaction-emitter-lib/src/emitter/submission_worker.rs
index 0f636147ada78..b51b6cba1d0c0 100644
--- a/crates/transaction-emitter-lib/src/emitter/submission_worker.rs
+++ b/crates/transaction-emitter-lib/src/emitter/submission_worker.rs
@@ -4,11 +4,11 @@
 use crate::{
     emitter::{
         stats::{DynamicStatsTracking, StatsAccumulator},
-        update_seq_num_and_get_num_expired, wait_for_accounts_sequence,
+        wait_for_accounts_sequence,
     },
     EmitModeParams,
 };
-use aptos_logger::{info, sample, sample::SampleRate, warn};
+use aptos_logger::{debug, error, info, sample, sample::SampleRate, warn};
 use aptos_rest_client::Client as RestClient;
 use aptos_sdk::{
     move_types::account_address::AccountAddress,
@@ -25,6 +25,7 @@ use futures::future::join_all;
 use itertools::Itertools;
 use rand::seq::IteratorRandom;
 use std::{
+    borrow::Borrow,
     collections::HashMap,
     sync::{atomic::AtomicU64, Arc},
     time::Instant,
@@ -32,8 +33,10 @@ use std::{
 use tokio::time::sleep;
 
 pub struct SubmissionWorker {
-    pub(crate) accounts: Vec<LocalAccount>,
-    client: RestClient,
+    pub(crate) accounts: Vec<Arc<LocalAccount>>,
+    clients: Arc<Vec<RestClient>>,
+    /// Main one is used to submit requests, all are used for querying/latency
+    main_client_index: usize,
     stop: Arc<AtomicBool>,
     params: EmitModeParams,
     stats: Arc<DynamicStatsTracking>,
@@ -46,7 +49,8 @@ pub struct SubmissionWorker {
 impl SubmissionWorker {
     pub fn new(
         accounts: Vec<LocalAccount>,
-        client: RestClient,
+        clients: Arc<Vec<RestClient>>,
+        main_client_index: usize,
         stop: Arc<AtomicBool>,
         params: EmitModeParams,
         stats: Arc<DynamicStatsTracking>,
@@ -55,9 +59,11 @@ impl SubmissionWorker {
         skip_latency_stats: bool,
         rng: ::rand::rngs::StdRng,
     ) -> Self {
+        let accounts = accounts.into_iter().map(Arc::new).collect();
         Self {
             accounts,
-            client,
+            clients,
+            main_client_index,
             stop,
             params,
             stats,
@@ -68,6 +74,10 @@ impl SubmissionWorker {
         }
     }
 
+    fn client(&self) -> &RestClient {
+        &self.clients[self.main_client_index]
+    }
+
     #[allow(clippy::collapsible_if)]
     pub(crate) async fn run(mut self, start_instant: Instant) -> Vec<LocalAccount> {
         let mut wait_until = start_instant + self.start_sleep_duration;
@@ -87,10 +97,10 @@ impl SubmissionWorker {
                 && loop_start_time.duration_since(wait_until) > Duration::from_secs(5)
             {
                 sample!(
-                    SampleRate::Duration(Duration::from_secs(120)),
-                    warn!(
-                        "[{:?}] txn_emitter worker drifted out of sync too much: {}s",
-                        self.client.path_prefix_string(),
+                    SampleRate::Duration(Duration::from_secs(5)),
+                    error!(
+                        "[{:?}] txn_emitter worker drifted out of sync too much: {}s. Is expiration too short, or 5s buffer on top of it?",
+                        self.client().path_prefix_string(),
                         loop_start_time.duration_since(wait_until).as_secs()
                     )
                 );
@@ -121,7 +131,7 @@ impl SubmissionWorker {
                     SampleRate::Duration(Duration::from_secs(300)),
                     info!(
                         "[{:?}] txn_emitter worker: handling {} accounts, generated txns for: {}",
-                        self.client.path_prefix_string(),
+                        self.client().path_prefix_string(),
                         self.accounts.len(),
                         account_to_start_and_end_seq_num.len(),
                     )
@@ -140,7 +150,7 @@ impl SubmissionWorker {
                         .chunks(self.params.max_submit_batch_size)
                         .map(|reqs| {
                             submit_transactions(
-                                &self.client,
+                                self.client(),
                                 reqs,
                                 loop_start_time,
                                 txn_offset_time.clone(),
@@ -153,10 +163,10 @@ impl SubmissionWorker {
                 let submitted_after = loop_start_time.elapsed();
                 if submitted_after.as_secs() > 5 {
                     sample!(
-                        SampleRate::Duration(Duration::from_secs(120)),
+                        SampleRate::Duration(Duration::from_secs(30)),
                         warn!(
                             "[{:?}] txn_emitter worker waited for more than 5s to submit transactions: {}s after loop start",
-                            self.client.path_prefix_string(),
+                            self.client().path_prefix_string(),
                             submitted_after.as_secs(),
                         )
                     );
@@ -166,7 +176,7 @@ impl SubmissionWorker {
                     // we also don't want to be stuck waiting for txn_expiration_time_secs
                     // after stop is called, so we sleep until time or stop is set.
                     self.sleep_check_done(Duration::from_secs(
-                        self.params.txn_expiration_time_secs + 20,
+                        self.params.txn_expiration_time_secs + 3,
                     ))
                     .await
                 }
@@ -200,6 +210,9 @@ impl SubmissionWorker {
         }
 
         self.accounts
+            .into_iter()
+            .map(|account_arc_mutex| Arc::into_inner(account_arc_mutex).unwrap())
+            .collect()
     }
 
     // returns true if it returned early
@@ -236,28 +249,32 @@ impl SubmissionWorker {
         let (latest_fetched_counts, sum_of_completion_timestamps_millis) =
             wait_for_accounts_sequence(
                 start_time,
-                &self.client,
+                self.client(),
                 &account_to_start_and_end_seq_num,
                 txn_expiration_ts_secs,
                 check_account_sleep_duration,
             )
             .await;
 
-        let (num_committed, num_expired) = update_seq_num_and_get_num_expired(
-            &mut self.accounts,
-            account_to_start_and_end_seq_num,
-            latest_fetched_counts,
-        );
+        for account in self.accounts.iter_mut() {
+            update_account_seq_num(
+                Arc::get_mut(account).unwrap(),
+                &account_to_start_and_end_seq_num,
+                &latest_fetched_counts,
+            );
+        }
+        let (num_committed, num_expired) =
+            count_committed_expired_stats(account_to_start_and_end_seq_num, latest_fetched_counts);
 
         if num_expired > 0 {
             loop_stats
                 .expired
                 .fetch_add(num_expired as u64, Ordering::Relaxed);
             sample!(
-                SampleRate::Duration(Duration::from_secs(120)),
+                SampleRate::Duration(Duration::from_secs(60)),
                 warn!(
                     "[{:?}] Transactions were not committed before expiration: {:?}, for {:?}",
-                    self.client.path_prefix_string(),
+                    self.client().path_prefix_string(),
                     num_expired,
                     self.accounts
                         .iter()
@@ -306,12 +323,87 @@ impl SubmissionWorker {
             .into_iter()
             .flat_map(|account| {
                 self.txn_generator
-                    .generate_transactions(account, self.params.transactions_per_account)
+                    .generate_transactions(account.borrow(), self.params.transactions_per_account)
             })
             .collect()
     }
 }
 
+fn update_account_seq_num(
+    account: &mut LocalAccount,
+    account_to_start_and_end_seq_num: &HashMap<AccountAddress, (u64, u64)>,
+    latest_fetched_counts: &HashMap<AccountAddress, u64>,
+) {
+    let (start_seq_num, end_seq_num) =
+        if let Some(pair) = account_to_start_and_end_seq_num.get(&account.address()) {
+            pair
+        } else {
+            return;
+        };
+    assert!(account.sequence_number() == *end_seq_num);
+
+    match latest_fetched_counts.get(&account.address()) {
+        Some(count) => {
+            if *count != account.sequence_number() {
+                assert!(account.sequence_number() > *count);
+                debug!(
+                    "Stale sequence_number for {}, expected {}, setting to {}",
+                    account.address(),
+                    account.sequence_number(),
+                    count
+                );
+                account.set_sequence_number(*count);
+            }
+        },
+        None => {
+            debug!(
+                "Couldn't fetch sequence_number for {}, expected {}, setting to {}",
+                account.address(),
+                account.sequence_number(),
+                start_seq_num
+            );
+            account.set_sequence_number(*start_seq_num);
+        },
+    }
+}
+
+fn count_committed_expired_stats(
+    account_to_start_and_end_seq_num: HashMap<AccountAddress, (u64, u64)>,
+    latest_fetched_counts: HashMap<AccountAddress, u64>,
+) -> (usize, usize) {
+    account_to_start_and_end_seq_num
+        .iter()
+        .map(
+            |(address, (start_seq_num, end_seq_num))| match latest_fetched_counts.get(address) {
+                Some(count) => {
+                    assert!(
+                        *count <= *end_seq_num,
+                        "{address} :: {count} > {end_seq_num}"
+                    );
+                    if *count >= *start_seq_num {
+                        (
+                            (*count - *start_seq_num) as usize,
+                            (*end_seq_num - *count) as usize,
+                        )
+                    } else {
+                        debug!(
+                            "Stale sequence_number fetched for {}, start_seq_num {}, fetched {}",
+                            address, start_seq_num, *count
+                        );
+                        (0, (*end_seq_num - *start_seq_num) as usize)
+                    }
+                },
+                None => (0, (end_seq_num - start_seq_num) as usize),
+            },
+        )
+        .fold(
+            (0, 0),
+            |(committed, expired), (cur_committed, cur_expired)| {
+                (committed + cur_committed, expired + cur_expired)
+            },
+        )
+}
+
 pub async fn submit_transactions(
     client: &RestClient,
     txns: &[SignedTransaction],
diff --git a/crates/transaction-emitter-lib/src/emitter/transaction_executor.rs b/crates/transaction-emitter-lib/src/emitter/transaction_executor.rs
index 9db067bbe6e0f..63d72060dfb29 100644
--- a/crates/transaction-emitter-lib/src/emitter/transaction_executor.rs
+++ b/crates/transaction-emitter-lib/src/emitter/transaction_executor.rs
@@ -1,9 +1,9 @@
 // Copyright © Aptos Foundation
 // SPDX-License-Identifier: Apache-2.0
 
-use super::RETRY_POLICY;
+use super::FETCH_ACCOUNT_RETRY_POLICY;
 use anyhow::{Context, Result};
-use aptos_logger::{debug, sample, sample::SampleRate, warn};
+use aptos_logger::{debug, info, sample, sample::SampleRate, warn};
 use aptos_rest_client::{aptos_api_types::AptosErrorCode, error::RestError, Client as RestClient};
 use aptos_sdk::{
     move_types::account_address::AccountAddress, types::transaction::SignedTransaction,
@@ -19,12 +19,25 @@ use std::{
 
 // Reliable/retrying transaction executor, used for initializing
 pub struct RestApiReliableTransactionSubmitter {
-    pub rest_clients: Vec<RestClient>,
-    pub max_retries: usize,
-    pub retry_after: Duration,
+    rest_clients: Vec<RestClient>,
+    max_retries: usize,
+    retry_after: Duration,
 }
 
 impl RestApiReliableTransactionSubmitter {
+    pub fn new(rest_clients: Vec<RestClient>, max_retries: usize, retry_after: Duration) -> Self {
+        info!(
+            "Using reliable/retriable init transaction executor with {} retries, every {}s",
+            max_retries,
+            retry_after.as_secs_f32()
+        );
+        Self {
+            rest_clients,
+            max_retries,
+            retry_after,
+        }
+    }
+
     fn random_rest_client(&self) -> &RestClient {
         let mut rng = thread_rng();
         self.rest_clients.choose(&mut rng).unwrap()
@@ -256,7 +269,7 @@ pub async fn query_sequence_number_with_client(
     rest_client: &RestClient,
     account_address: AccountAddress,
 ) -> Result<u64> {
-    let result = RETRY_POLICY
+    let result = FETCH_ACCOUNT_RETRY_POLICY
         .retry_if(
             move || rest_client.get_account_bcs(account_address),
             |error: &RestError| !is_account_not_found(error),
@@ -281,7 +294,7 @@ fn is_account_not_found(error: &RestError) -> bool {
 #[async_trait]
 impl ReliableTransactionSubmitter for RestApiReliableTransactionSubmitter {
     async fn get_account_balance(&self, account_address: AccountAddress) -> Result<u64> {
-        Ok(RETRY_POLICY
+        Ok(FETCH_ACCOUNT_RETRY_POLICY
             .retry(move || {
                 self.random_rest_client()
                     .get_account_balance(account_address)
diff --git a/crates/transaction-emitter-lib/src/wrappers.rs b/crates/transaction-emitter-lib/src/wrappers.rs
index 9f6659e5e9b98..4314371229bbb 100644
--- a/crates/transaction-emitter-lib/src/wrappers.rs
+++ b/crates/transaction-emitter-lib/src/wrappers.rs
@@ -5,19 +5,23 @@ use crate::{
     args::{ClusterArgs, EmitArgs},
     cluster::Cluster,
     emitter::{
-        create_accounts, local_account_generator::PrivateKeyAccountGenerator, parse_seed,
-        stats::TxnStats, EmitJobMode, EmitJobRequest, NumAccountsMode, TxnEmitter,
+        account_minter::bulk_create_accounts, get_needed_balance_per_account_from_req,
+        local_account_generator::PrivateKeyAccountGenerator, stats::TxnStats,
+        transaction_executor::RestApiReliableTransactionSubmitter, EmitJobMode, EmitJobRequest,
+        NumAccountsMode, TxnEmitter,
     },
     instance::Instance,
     CreateAccountsArgs,
 };
 use anyhow::{bail, Context, Result};
-use aptos_config::config::DEFAULT_MAX_SUBMIT_TRANSACTION_BATCH_SIZE;
 use aptos_logger::{error, info};
 use aptos_sdk::transaction_builder::TransactionFactory;
 use aptos_transaction_generator_lib::{args::TransactionTypeArg, WorkflowProgress};
-use rand::{rngs::StdRng, Rng, SeedableRng};
-use std::time::{Duration, Instant};
+use rand::{rngs::StdRng, SeedableRng};
+use std::{
+    sync::Arc,
+    time::{Duration, Instant},
+};
 
 pub async fn emit_transactions(
     cluster_args: &ClusterArgs,
@@ -153,13 +157,14 @@ pub async fn emit_transactions_with_cluster(
             .latency_polling_interval(Duration::from_secs_f32(latency_polling_interval_s));
     }
 
-    if args.skip_minting_accounts {
-        emit_job_request = emit_job_request.skip_minting_accounts();
+    if args.skip_funding_accounts {
+        emit_job_request = emit_job_request.skip_funding_accounts();
     }
 
+    let coin_source_account = std::sync::Arc::new(coin_source_account);
     let stats = emitter
         .emit_txn_for_with_stats(
-            &coin_source_account,
+            coin_source_account,
             emit_job_request,
             duration,
             (args.duration / 10).clamp(1, 10),
@@ -177,33 +182,36 @@ pub async fn create_accounts_command(
         .context("Failed to build cluster")?;
     let client = cluster.random_instance().rest_client();
     let coin_source_account = cluster.load_coin_source_account(&client).await?;
+    let coin_source_account = Arc::new(coin_source_account);
     let txn_factory = TransactionFactory::new(cluster.chain_id)
         .with_transaction_expiration_time(60)
         .with_max_gas_amount(create_accounts_args.max_gas_per_txn);
-    let emit_job_request =
-        EmitJobRequest::new(cluster.all_instances().map(Instance::rest_client).collect())
-            .init_gas_price_multiplier(1)
-            .expected_gas_per_txn(create_accounts_args.max_gas_per_txn)
-            .max_gas_per_txn(create_accounts_args.max_gas_per_txn)
-            .coins_per_account_override(0)
-            .expected_max_txns(0)
-            .prompt_before_spending();
-    let seed = match &create_accounts_args.account_minter_seed {
-        Some(str) => parse_seed(str),
-        None => StdRng::from_entropy().gen(),
-    };
-
-    create_accounts(
-        &coin_source_account,
+    let rest_clients = cluster
+        .all_instances()
+        .map(Instance::rest_client)
+        .collect::<Vec<_>>();
+    let mut emit_job_request = EmitJobRequest::new(rest_clients.clone())
+        .init_gas_price_multiplier(1)
+        .expected_gas_per_txn(create_accounts_args.max_gas_per_txn)
+        .max_gas_per_txn(create_accounts_args.max_gas_per_txn)
+        .coins_per_account_override(0)
+        .expected_max_txns(0)
+        .prompt_before_spending();
+
+    if let Some(seed) = &create_accounts_args.account_minter_seed {
+        emit_job_request = emit_job_request.account_minter_seed(seed);
+    }
+
+    bulk_create_accounts(
+        coin_source_account,
+        &RestApiReliableTransactionSubmitter::new(rest_clients, 6, Duration::from_secs(10)),
         &txn_factory,
         Box::new(PrivateKeyAccountGenerator),
-        &emit_job_request,
-        DEFAULT_MAX_SUBMIT_TRANSACTION_BATCH_SIZE,
-        false,
-        seed,
+        (&emit_job_request).into(),
         create_accounts_args.count,
-        4,
+        get_needed_balance_per_account_from_req(&emit_job_request, create_accounts_args.count),
     )
     .await?;
+
     Ok(())
 }
diff --git a/crates/transaction-generator-lib/src/accounts_pool_wrapper.rs b/crates/transaction-generator-lib/src/accounts_pool_wrapper.rs
index 06aab2e1f8577..1dee749e5f019 100644
--- a/crates/transaction-generator-lib/src/accounts_pool_wrapper.rs
+++ b/crates/transaction-generator-lib/src/accounts_pool_wrapper.rs
@@ -40,17 +40,16 @@ impl TransactionGenerator for AccountsPoolWrapperGenerator {
         _account: &LocalAccount,
         num_to_create: usize,
     ) -> Vec<SignedTransaction> {
-        let mut accounts_to_use =
+        let accounts_to_use =
             self.source_accounts_pool
                 .take_from_pool(num_to_create, true, &mut self.rng);
         if accounts_to_use.is_empty() {
             return Vec::new();
         }
         let txns = accounts_to_use
-            .iter_mut()
+            .iter()
             .flat_map(|account| self.generator.generate_transactions(account, 1))
             .collect();
-
         if let Some(destination_accounts_pool) = &self.destination_accounts_pool {
             destination_accounts_pool.add_to_pool(accounts_to_use);
         }
diff --git a/crates/transaction-generator-lib/src/args.rs b/crates/transaction-generator-lib/src/args.rs
index 80064e5a90107..29bcf6dce82df 100644
--- a/crates/transaction-generator-lib/src/args.rs
+++ b/crates/transaction-generator-lib/src/args.rs
@@ -14,6 +14,7 @@ pub enum TransactionTypeArg {
     // custom
     #[default]
     CoinTransfer,
+    AptFaTransfer,
     CoinTransferWithInvalid,
     NonConflictingCoinTransfer,
     AccountGeneration,
@@ -35,6 +36,7 @@ pub enum TransactionTypeArg {
     ModifyGlobalResourceAggV2,
     ModifyGlobalFlagAggV2,
     ModifyGlobalBoundedAggV2,
+    ModifyGlobalMilestoneAggV2,
     // Complex EntryPoints
     CreateObjects10,
     CreateObjects10WithPayload10k,
@@ -83,20 +85,38 @@ impl TransactionTypeArg {
         sender_use_account_pool: bool,
         workflow_progress_type: WorkflowProgress,
     ) -> TransactionType {
+        let call_custom_module = |entry_point: EntryPoints| -> TransactionType {
+            TransactionType::CallCustomModules {
+                entry_point,
+                num_modules: module_working_set_size,
+                use_account_pool: sender_use_account_pool,
+            }
+        };
+
         match self {
             TransactionTypeArg::CoinTransfer => TransactionType::CoinTransfer {
                 invalid_transaction_ratio: 0,
                 sender_use_account_pool,
+                non_conflicting: false,
+                use_fa_transfer: false,
             },
-            TransactionTypeArg::NonConflictingCoinTransfer => {
-                TransactionType::NonConflictingCoinTransfer {
-                    invalid_transaction_ratio: 0,
-                    sender_use_account_pool,
-                }
+            TransactionTypeArg::AptFaTransfer => TransactionType::CoinTransfer {
+                invalid_transaction_ratio: 0,
+                sender_use_account_pool,
+                non_conflicting: false,
+                use_fa_transfer: true,
+            },
+            TransactionTypeArg::NonConflictingCoinTransfer => TransactionType::CoinTransfer {
+                invalid_transaction_ratio: 0,
+                sender_use_account_pool,
+                non_conflicting: true,
+                use_fa_transfer: false,
             },
             TransactionTypeArg::CoinTransferWithInvalid => TransactionType::CoinTransfer {
                 invalid_transaction_ratio: 10,
                 sender_use_account_pool,
+                non_conflicting: false,
+                use_fa_transfer: false,
             },
             TransactionTypeArg::AccountGeneration => TransactionType::AccountGeneration {
                 add_created_accounts_to_pool: true,
@@ -114,236 +134,131 @@ impl TransactionTypeArg {
             TransactionTypeArg::Batch100Transfer => {
                 TransactionType::BatchTransfer { batch_size: 100 }
             },
-            TransactionTypeArg::AccountResource32B => TransactionType::CallCustomModules {
-                entry_point: EntryPoints::BytesMakeOrChange {
+            TransactionTypeArg::AccountResource32B => {
+                call_custom_module(EntryPoints::BytesMakeOrChange {
                     data_length: Some(32),
-                },
-                num_modules: module_working_set_size,
-                use_account_pool: sender_use_account_pool,
+                })
             },
-            TransactionTypeArg::AccountResource1KB => TransactionType::CallCustomModules {
-                entry_point: EntryPoints::BytesMakeOrChange {
+            TransactionTypeArg::AccountResource1KB => {
+                call_custom_module(EntryPoints::BytesMakeOrChange {
                     data_length: Some(1024),
-                },
-                num_modules: module_working_set_size,
-                use_account_pool: sender_use_account_pool,
+                })
             },
-            TransactionTypeArg::AccountResource10KB => TransactionType::CallCustomModules {
-                entry_point: EntryPoints::BytesMakeOrChange {
+            TransactionTypeArg::AccountResource10KB => {
+                call_custom_module(EntryPoints::BytesMakeOrChange {
                     data_length: Some(10 * 1024),
-                },
-                num_modules: module_working_set_size,
-                use_account_pool: sender_use_account_pool,
-            },
-            TransactionTypeArg::ModifyGlobalResource => TransactionType::CallCustomModules {
-                entry_point: EntryPoints::IncGlobal,
-                num_modules: module_working_set_size,
-                use_account_pool: sender_use_account_pool,
+                })
             },
-            TransactionTypeArg::ModifyGlobalResourceAggV2 => TransactionType::CallCustomModules {
-                entry_point: EntryPoints::IncGlobalAggV2,
-                num_modules: module_working_set_size,
-                use_account_pool: sender_use_account_pool,
+            TransactionTypeArg::ModifyGlobalResource => call_custom_module(EntryPoints::IncGlobal),
+            TransactionTypeArg::ModifyGlobalResourceAggV2 => {
+                call_custom_module(EntryPoints::IncGlobalAggV2)
             },
-            TransactionTypeArg::ModifyGlobalFlagAggV2 => TransactionType::CallCustomModules {
+            TransactionTypeArg::ModifyGlobalFlagAggV2 => call_custom_module(
                 // 100 is max, so equivalent to flag
-                entry_point: EntryPoints::ModifyGlobalBoundedAggV2 { step: 100 },
-                num_modules: module_working_set_size,
-                use_account_pool: sender_use_account_pool,
-            },
-            TransactionTypeArg::ModifyGlobalBoundedAggV2 => TransactionType::CallCustomModules {
-                entry_point: EntryPoints::ModifyGlobalBoundedAggV2 { step: 10 },
-                num_modules: module_working_set_size,
-                use_account_pool: sender_use_account_pool,
-            },
-            TransactionTypeArg::NoOp => TransactionType::CallCustomModules {
-                entry_point: EntryPoints::Nop,
-                num_modules: module_working_set_size,
-                use_account_pool: sender_use_account_pool,
-            },
-            TransactionTypeArg::NoOpFeePayer => TransactionType::CallCustomModules {
-                entry_point: EntryPoints::NopFeePayer,
-                num_modules: module_working_set_size,
-                use_account_pool: sender_use_account_pool,
-            },
-            TransactionTypeArg::NoOp2Signers => TransactionType::CallCustomModules {
-                entry_point: EntryPoints::Nop,
-                num_modules: module_working_set_size,
-                use_account_pool: sender_use_account_pool,
-            },
-            TransactionTypeArg::NoOp5Signers => TransactionType::CallCustomModules {
-                entry_point: EntryPoints::Nop,
-                num_modules: module_working_set_size,
-                use_account_pool: sender_use_account_pool,
-            },
-            TransactionTypeArg::Loop100k => TransactionType::CallCustomModules {
-                entry_point: EntryPoints::Loop {
-                    loop_count: Some(100000),
-                    loop_type: LoopType::NoOp,
-                },
-                num_modules: module_working_set_size,
-                use_account_pool: sender_use_account_pool,
-            },
-            TransactionTypeArg::Loop10kArithmetic => TransactionType::CallCustomModules {
-                entry_point: EntryPoints::Loop {
-                    loop_count: Some(10000),
-                    loop_type: LoopType::Arithmetic,
-                },
-                num_modules: module_working_set_size,
-                use_account_pool: sender_use_account_pool,
-            },
-            TransactionTypeArg::Loop1kBcs1k => TransactionType::CallCustomModules {
-                entry_point: EntryPoints::Loop {
-                    loop_count: Some(1000),
-                    loop_type: LoopType::BcsToBytes { len: 1024 },
-                },
-                num_modules: module_working_set_size,
-                use_account_pool: sender_use_account_pool,
-            },
-            TransactionTypeArg::CreateObjects10 => TransactionType::CallCustomModules {
-                entry_point: EntryPoints::CreateObjects {
-                    num_objects: 10,
-                    object_payload_size: 0,
-                },
-                num_modules: module_working_set_size,
-                use_account_pool: sender_use_account_pool,
-            },
+                EntryPoints::ModifyGlobalBoundedAggV2 { step: 100 },
+            ),
+            TransactionTypeArg::ModifyGlobalBoundedAggV2 => {
+                call_custom_module(EntryPoints::ModifyGlobalBoundedAggV2 { step: 10 })
+            },
+            TransactionTypeArg::ModifyGlobalMilestoneAggV2 => {
+                call_custom_module(EntryPoints::IncGlobalMilestoneAggV2 {
+                    milestone_every: 1000,
+                })
+            },
+            TransactionTypeArg::NoOp => call_custom_module(EntryPoints::Nop),
+            TransactionTypeArg::NoOpFeePayer => call_custom_module(EntryPoints::NopFeePayer),
+            TransactionTypeArg::NoOp2Signers => call_custom_module(EntryPoints::Nop),
+            TransactionTypeArg::NoOp5Signers => call_custom_module(EntryPoints::Nop),
+            TransactionTypeArg::Loop100k => call_custom_module(EntryPoints::Loop {
+                loop_count: Some(100000),
+                loop_type: LoopType::NoOp,
+            }),
+            TransactionTypeArg::Loop10kArithmetic => call_custom_module(EntryPoints::Loop {
+                loop_count: Some(10000),
+                loop_type: LoopType::Arithmetic,
+            }),
+            TransactionTypeArg::Loop1kBcs1k => call_custom_module(EntryPoints::Loop {
+                loop_count: Some(1000),
+                loop_type: LoopType::BcsToBytes { len: 1024 },
+            }),
+            TransactionTypeArg::CreateObjects10 => call_custom_module(EntryPoints::CreateObjects {
+                num_objects: 10,
+                object_payload_size: 0,
+            }),
             TransactionTypeArg::CreateObjects10WithPayload10k => {
-                TransactionType::CallCustomModules {
-                    entry_point: EntryPoints::CreateObjects {
-                        num_objects: 10,
-                        object_payload_size: 10 * 1024,
-                    },
-                    num_modules: module_working_set_size,
-                    use_account_pool: sender_use_account_pool,
-                }
+                call_custom_module(EntryPoints::CreateObjects {
+                    num_objects: 10,
+                    object_payload_size: 10 * 1024,
+                })
             },
             TransactionTypeArg::CreateObjectsConflict10WithPayload10k => {
-                TransactionType::CallCustomModules {
-                    entry_point: EntryPoints::CreateObjectsConflict {
-                        num_objects: 10,
-                        object_payload_size: 10 * 1024,
-                    },
-                    num_modules: module_working_set_size,
-                    use_account_pool: sender_use_account_pool,
-                }
-            },
-            TransactionTypeArg::CreateObjects100 => TransactionType::CallCustomModules {
-                entry_point: EntryPoints::CreateObjects {
+                call_custom_module(EntryPoints::CreateObjectsConflict {
+                    num_objects: 10,
+                    object_payload_size: 10 * 1024,
+                })
+            },
+            TransactionTypeArg::CreateObjects100 => {
+                call_custom_module(EntryPoints::CreateObjects {
                     num_objects: 100,
                     object_payload_size: 0,
-                },
-                num_modules: module_working_set_size,
-                use_account_pool: sender_use_account_pool,
+                })
             },
             TransactionTypeArg::CreateObjects100WithPayload10k => {
-                TransactionType::CallCustomModules {
-                    entry_point: EntryPoints::CreateObjects {
-                        num_objects: 100,
-                        object_payload_size: 10 * 1024,
-                    },
-                    num_modules: module_working_set_size,
-                    use_account_pool: sender_use_account_pool,
-                }
+                call_custom_module(EntryPoints::CreateObjects {
+                    num_objects: 100,
+                    object_payload_size: 10 * 1024,
+                })
             },
             TransactionTypeArg::CreateObjectsConflict100WithPayload10k => {
-                TransactionType::CallCustomModules {
-                    entry_point: EntryPoints::CreateObjectsConflict {
-                        num_objects: 100,
-                        object_payload_size: 10 * 1024,
-                    },
-                    num_modules: module_working_set_size,
-                    use_account_pool: sender_use_account_pool,
-                }
+                call_custom_module(EntryPoints::CreateObjectsConflict {
+                    num_objects: 100,
+                    object_payload_size: 10 * 1024,
+                })
             },
             TransactionTypeArg::ResourceGroupsGlobalWriteTag1KB => {
-                TransactionType::CallCustomModules {
-                    entry_point: EntryPoints::ResourceGroupsGlobalWriteTag {
-                        string_length: 1024,
-                    },
-                    num_modules: module_working_set_size,
-                    use_account_pool: sender_use_account_pool,
-                }
+                call_custom_module(EntryPoints::ResourceGroupsGlobalWriteTag {
+                    string_length: 1024,
+                })
             },
             TransactionTypeArg::ResourceGroupsGlobalWriteAndReadTag1KB => {
-                TransactionType::CallCustomModules {
-                    entry_point: EntryPoints::ResourceGroupsGlobalWriteAndReadTag {
-                        string_length: 1024,
-                    },
-                    num_modules: module_working_set_size,
-                    use_account_pool: sender_use_account_pool,
-                }
+                call_custom_module(EntryPoints::ResourceGroupsGlobalWriteAndReadTag {
+                    string_length: 1024,
+                })
             },
             TransactionTypeArg::ResourceGroupsSenderWriteTag1KB => {
-                TransactionType::CallCustomModules {
-                    entry_point: EntryPoints::ResourceGroupsSenderWriteTag {
-                        string_length: 1024,
-                    },
-                    num_modules: module_working_set_size,
-                    use_account_pool: sender_use_account_pool,
-                }
+                call_custom_module(EntryPoints::ResourceGroupsSenderWriteTag {
+                    string_length: 1024,
+                })
             },
             TransactionTypeArg::ResourceGroupsSenderMultiChange1KB => {
-                TransactionType::CallCustomModules {
-                    entry_point: EntryPoints::ResourceGroupsSenderMultiChange {
-                        string_length: 1024,
-                    },
-                    num_modules: module_working_set_size,
-                    use_account_pool: sender_use_account_pool,
-                }
+                call_custom_module(EntryPoints::ResourceGroupsSenderMultiChange {
+                    string_length: 1024,
+                })
             },
             TransactionTypeArg::TokenV1NFTMintAndStoreSequential => {
-                TransactionType::CallCustomModules {
-                    entry_point: EntryPoints::TokenV1MintAndStoreNFTSequential,
-                    num_modules: module_working_set_size,
-                    use_account_pool: sender_use_account_pool,
-                }
+                call_custom_module(EntryPoints::TokenV1MintAndStoreNFTSequential)
             },
             TransactionTypeArg::TokenV1NFTMintAndTransferSequential => {
-                TransactionType::CallCustomModules {
-                    entry_point: EntryPoints::TokenV1MintAndTransferNFTSequential,
-                    num_modules: module_working_set_size,
-                    use_account_pool: sender_use_account_pool,
-                }
+                call_custom_module(EntryPoints::TokenV1MintAndTransferNFTSequential)
             },
             TransactionTypeArg::TokenV1NFTMintAndStoreParallel => {
-                TransactionType::CallCustomModules {
-                    entry_point: EntryPoints::TokenV1MintAndStoreNFTParallel,
-                    num_modules: module_working_set_size,
-                    use_account_pool: sender_use_account_pool,
-                }
+                call_custom_module(EntryPoints::TokenV1MintAndStoreNFTParallel)
             },
             TransactionTypeArg::TokenV1NFTMintAndTransferParallel => {
-                TransactionType::CallCustomModules {
-                    entry_point: EntryPoints::TokenV1MintAndTransferNFTParallel,
-                    num_modules: module_working_set_size,
-                    use_account_pool: sender_use_account_pool,
-                }
-            },
-            TransactionTypeArg::TokenV1FTMintAndStore => TransactionType::CallCustomModules {
-                entry_point: EntryPoints::TokenV1MintAndStoreFT,
-                num_modules: module_working_set_size,
-                use_account_pool: sender_use_account_pool,
+                call_custom_module(EntryPoints::TokenV1MintAndTransferNFTParallel)
             },
-            TransactionTypeArg::TokenV1FTMintAndTransfer => TransactionType::CallCustomModules {
-                entry_point: EntryPoints::TokenV1MintAndTransferFT,
-                num_modules: module_working_set_size,
-                use_account_pool: sender_use_account_pool,
+            TransactionTypeArg::TokenV1FTMintAndStore => {
+                call_custom_module(EntryPoints::TokenV1MintAndStoreFT)
             },
-            TransactionTypeArg::CoinInitAndMint => TransactionType::CallCustomModules {
-                entry_point: EntryPoints::CoinInitAndMint,
-                num_modules: module_working_set_size,
-                use_account_pool: sender_use_account_pool,
+            TransactionTypeArg::TokenV1FTMintAndTransfer => {
+                call_custom_module(EntryPoints::TokenV1MintAndTransferFT)
             },
-            TransactionTypeArg::FungibleAssetMint => TransactionType::CallCustomModules {
-                entry_point: EntryPoints::FungibleAssetMint,
-                num_modules: module_working_set_size,
-                use_account_pool: sender_use_account_pool,
+            TransactionTypeArg::CoinInitAndMint => call_custom_module(EntryPoints::CoinInitAndMint),
+            TransactionTypeArg::FungibleAssetMint => {
+                call_custom_module(EntryPoints::FungibleAssetMint)
             },
-            TransactionTypeArg::TokenV2AmbassadorMint => TransactionType::CallCustomModules {
-                entry_point: EntryPoints::TokenV2AmbassadorMint { numbered: true },
-                num_modules: module_working_set_size,
-                use_account_pool: sender_use_account_pool,
+            TransactionTypeArg::TokenV2AmbassadorMint => {
+                call_custom_module(EntryPoints::TokenV2AmbassadorMint { numbered: true })
             },
             TransactionTypeArg::TokenV2AmbassadorMintAndBurn1M => TransactionType::Workflow {
                 workflow_kind: WorkflowKind::CreateMintBurn {
@@ -354,91 +269,55 @@ impl TransactionTypeArg {
                 use_account_pool: sender_use_account_pool,
                 progress_type: workflow_progress_type,
             },
-            TransactionTypeArg::LiquidityPoolSwap => TransactionType::CallCustomModules {
-                entry_point: EntryPoints::LiquidityPoolSwap { is_stable: false },
-                num_modules: module_working_set_size,
-                use_account_pool: sender_use_account_pool,
+            TransactionTypeArg::LiquidityPoolSwap => {
+                call_custom_module(EntryPoints::LiquidityPoolSwap { is_stable: false })
             },
-            TransactionTypeArg::LiquidityPoolSwapStable => TransactionType::CallCustomModules {
-                entry_point: EntryPoints::LiquidityPoolSwap { is_stable: true },
-                num_modules: module_working_set_size,
-                use_account_pool: sender_use_account_pool,
+            TransactionTypeArg::LiquidityPoolSwapStable => {
+                call_custom_module(EntryPoints::LiquidityPoolSwap { is_stable: true })
             },
-            TransactionTypeArg::VectorPictureCreate30k => TransactionType::CallCustomModules {
-                entry_point: EntryPoints::InitializeVectorPicture { length: 30 * 1024 },
-                num_modules: module_working_set_size,
-                use_account_pool: sender_use_account_pool,
+            TransactionTypeArg::VectorPictureCreate30k => {
+                call_custom_module(EntryPoints::InitializeVectorPicture { length: 30 * 1024 })
             },
-            TransactionTypeArg::VectorPicture30k => TransactionType::CallCustomModules {
-                entry_point: EntryPoints::VectorPicture { length: 30 * 1024 },
-                num_modules: module_working_set_size,
-                use_account_pool: sender_use_account_pool,
+            TransactionTypeArg::VectorPicture30k => {
+                call_custom_module(EntryPoints::VectorPicture { length: 30 * 1024 })
             },
-            TransactionTypeArg::VectorPictureRead30k => TransactionType::CallCustomModules {
-                entry_point: EntryPoints::VectorPictureRead { length: 30 * 1024 },
-                num_modules: module_working_set_size,
-                use_account_pool: sender_use_account_pool,
+            TransactionTypeArg::VectorPictureRead30k => {
+                call_custom_module(EntryPoints::VectorPictureRead { length: 30 * 1024 })
             },
-            TransactionTypeArg::VectorPictureCreate40 => TransactionType::CallCustomModules {
-                entry_point: EntryPoints::InitializeVectorPicture { length: 40 },
-                num_modules: module_working_set_size,
-                use_account_pool: sender_use_account_pool,
+            TransactionTypeArg::VectorPictureCreate40 => {
+                call_custom_module(EntryPoints::InitializeVectorPicture { length: 40 })
             },
-            TransactionTypeArg::VectorPicture40 => TransactionType::CallCustomModules {
-                entry_point: EntryPoints::VectorPicture { length: 40 },
-                num_modules: module_working_set_size,
-                use_account_pool: sender_use_account_pool,
+            TransactionTypeArg::VectorPicture40 => {
+                call_custom_module(EntryPoints::VectorPicture { length: 40 })
             },
-            TransactionTypeArg::VectorPictureRead40 => TransactionType::CallCustomModules {
-                entry_point: EntryPoints::VectorPictureRead { length: 40 },
-                num_modules: module_working_set_size,
-                use_account_pool: sender_use_account_pool,
+            TransactionTypeArg::VectorPictureRead40 => {
+                call_custom_module(EntryPoints::VectorPictureRead { length: 40 })
             },
             TransactionTypeArg::SmartTablePicture30KWith200Change => {
-                TransactionType::CallCustomModules {
-                    entry_point: EntryPoints::SmartTablePicture {
-                        length: 30 * 1024,
-                        num_points_per_txn: 200,
-                    },
-                    num_modules: module_working_set_size,
-                    use_account_pool: sender_use_account_pool,
-                }
+                call_custom_module(EntryPoints::SmartTablePicture {
+                    length: 30 * 1024,
+                    num_points_per_txn: 200,
+                })
             },
             TransactionTypeArg::SmartTablePicture1MWith256Change => {
-                TransactionType::CallCustomModules {
-                    entry_point: EntryPoints::SmartTablePicture {
-                        length: 1024 * 1024,
-                        num_points_per_txn: 256,
-                    },
-                    num_modules: module_working_set_size,
-                    use_account_pool: sender_use_account_pool,
-                }
+                call_custom_module(EntryPoints::SmartTablePicture {
+                    length: 1024 * 1024,
+                    num_points_per_txn: 256,
+                })
             },
             TransactionTypeArg::SmartTablePicture1BWith256Change => {
-                TransactionType::CallCustomModules {
-                    entry_point: EntryPoints::SmartTablePicture {
-                        length: 1024 * 1024 * 1024,
-                        num_points_per_txn: 256,
-                    },
-                    num_modules: module_working_set_size,
-                    use_account_pool: sender_use_account_pool,
-                }
+                call_custom_module(EntryPoints::SmartTablePicture {
+                    length: 1024 * 1024 * 1024,
+                    num_points_per_txn: 256,
+                })
             },
             TransactionTypeArg::SmartTablePicture1MWith1KChangeExceedsLimit => {
-                TransactionType::CallCustomModules {
-                    entry_point: EntryPoints::SmartTablePicture {
-                        length: 1024 * 1024,
-                        num_points_per_txn: 1024,
-                    },
-                    num_modules: module_working_set_size,
-                    use_account_pool: sender_use_account_pool,
-                }
-            },
-            TransactionTypeArg::DeserializeU256 => TransactionType::CallCustomModules {
-                entry_point: EntryPoints::DeserializeU256,
-                num_modules: module_working_set_size,
-                use_account_pool: sender_use_account_pool,
+                call_custom_module(EntryPoints::SmartTablePicture {
+                    length: 1024 * 1024,
+                    num_points_per_txn: 1024,
+                })
             },
+            TransactionTypeArg::DeserializeU256 => call_custom_module(EntryPoints::DeserializeU256),
         }
     }
 
diff --git a/crates/transaction-generator-lib/src/call_custom_modules.rs b/crates/transaction-generator-lib/src/call_custom_modules.rs
index 71537fee71213..c2d06a9da2057 100644
--- a/crates/transaction-generator-lib/src/call_custom_modules.rs
+++ b/crates/transaction-generator-lib/src/call_custom_modules.rs
@@ -6,14 +6,14 @@ use crate::{
     create_account_transaction, publishing::publish_util::PackageHandler, RootAccountHandle,
     TransactionGenerator, TransactionGeneratorCreator,
 };
-use aptos_logger::info;
+use aptos_logger::{error, info};
 use aptos_sdk::{
     transaction_builder::TransactionFactory,
     types::{transaction::SignedTransaction, LocalAccount},
 };
 use async_trait::async_trait;
 use rand::{rngs::StdRng, seq::SliceRandom, SeedableRng};
-use std::sync::Arc;
+use std::{borrow::Borrow, sync::Arc};
 
 // Fn + Send + Sync, as it will be called from multiple threads simultaneously
 // if you need any coordination, use Arc<RwLock<X>> fields
@@ -161,7 +161,7 @@ impl CustomModulesDelegationGeneratorCreator {
         init_txn_factory: TransactionFactory,
         root_account: &dyn RootAccountHandle,
         txn_executor: &dyn ReliableTransactionSubmitter,
-        packages: &mut Vec<(Package, LocalAccount)>,
+        packages: &mut [(Package, LocalAccount)],
         workload: &mut dyn UserModuleTransactionGenerator,
     ) -> Arc<TransactionGeneratorWorker> {
         let mut rng = StdRng::from_entropy();
@@ -220,7 +220,7 @@ impl CustomModulesDelegationGeneratorCreator {
             let publisher = LocalAccount::generate(&mut rng);
             let publisher_address = publisher.address();
             requests_create.push(create_account_transaction(
-                root_account.get_root_account(),
+                root_account.get_root_account().borrow(),
                 publisher_address,
                 &init_txn_factory,
                 publisher_balance,
@@ -235,15 +235,29 @@ impl CustomModulesDelegationGeneratorCreator {
             packages.push((package, publisher));
         }
         info!("Creating {} publisher accounts", requests_create.len());
-        txn_executor
-            .execute_transactions(&requests_create)
-            .await
-            .unwrap();
+        // all publishers are created from root account, split it up.
+        for req_chunk in requests_create.chunks(100) {
+            txn_executor
+                .execute_transactions(req_chunk)
+                .await
+                .inspect_err(|err| {
+                    error!(
+                        "Failed to execute creation of publisher accounts: {:#}",
+                        err
+                    )
+                })
+                .unwrap();
+        }
 
-        info!("Publishing {} packages", requests_publish.len());
+        info!(
+            "Publishing {} copies of package {}",
+            requests_publish.len(),
+            package_name
+        );
         txn_executor
             .execute_transactions(&requests_publish)
             .await
+            .inspect_err(|err| error!("Failed to publish test package {}: {:#}", package_name, err))
             .unwrap();
 
         info!("Done publishing {} packages", packages.len());
diff --git a/crates/transaction-generator-lib/src/entry_points.rs b/crates/transaction-generator-lib/src/entry_points.rs
index 1b4dd4927cac3..6c5f5a014243e 100644
--- a/crates/transaction-generator-lib/src/entry_points.rs
+++ b/crates/transaction-generator-lib/src/entry_points.rs
@@ -17,7 +17,7 @@ use aptos_sdk::{
 };
 use async_trait::async_trait;
 use rand::rngs::StdRng;
-use std::sync::Arc;
+use std::{borrow::Borrow, sync::Arc};
 
 pub struct EntryPointTransactionGenerator {
     pub entry_point: EntryPoints,
@@ -75,7 +75,7 @@ impl UserModuleTransactionGenerator for EntryPointTransactionGenerator {
                             .iter()
                             .map(|to| {
                                 create_account_transaction(
-                                    root_account.get_root_account(),
+                                    root_account.get_root_account().borrow(),
                                     to.address(),
                                     txn_factory,
                                     0,
diff --git a/crates/transaction-generator-lib/src/lib.rs b/crates/transaction-generator-lib/src/lib.rs
index 364c6f8421eef..f9094ba4266ab 100644
--- a/crates/transaction-generator-lib/src/lib.rs
+++ b/crates/transaction-generator-lib/src/lib.rs
@@ -56,13 +56,11 @@ pub const SEND_AMOUNT: u64 = 1;
 
 #[derive(Debug, Copy, Clone)]
 pub enum TransactionType {
-    NonConflictingCoinTransfer {
-        invalid_transaction_ratio: usize,
-        sender_use_account_pool: bool,
-    },
     CoinTransfer {
         invalid_transaction_ratio: usize,
         sender_use_account_pool: bool,
+        non_conflicting: bool,
+        use_fa_transfer: bool,
     },
     AccountGeneration {
         add_created_accounts_to_pool: bool,
@@ -213,15 +211,15 @@ impl CounterState {
 pub trait RootAccountHandle: Send + Sync {
     async fn approve_funds(&self, amount: u64, reason: &str);
 
-    fn get_root_account(&self) -> &LocalAccount;
+    fn get_root_account(&self) -> Arc<LocalAccount>;
 }
 
-pub struct AlwaysApproveRootAccountHandle<'t> {
-    pub root_account: &'t LocalAccount,
+pub struct AlwaysApproveRootAccountHandle {
+    pub root_account: Arc<LocalAccount>,
 }
 
 #[async_trait::async_trait]
-impl<'t> RootAccountHandle for AlwaysApproveRootAccountHandle<'t> {
+impl RootAccountHandle for AlwaysApproveRootAccountHandle {
     async fn approve_funds(&self, amount: u64, reason: &str) {
         println!(
             "Consuming funds from root/source account: up to {} for {}",
@@ -229,8 +227,8 @@ impl<'t> RootAccountHandle for AlwaysApproveRootAccountHandle<'t> {
         );
     }
 
-    fn get_root_account(&self) -> &LocalAccount {
-        self.root_account
+    fn get_root_account(&self) -> Arc<LocalAccount> {
+        self.root_account.clone()
     }
 }
 
@@ -283,30 +281,23 @@ pub async fn create_txn_generator_creator(
         for (transaction_type, weight) in transaction_mix {
             let txn_generator_creator: Box<dyn TransactionGeneratorCreator> = match transaction_type
             {
-                TransactionType::NonConflictingCoinTransfer {
-                    invalid_transaction_ratio,
-                    sender_use_account_pool,
-                } => wrap_accounts_pool(
-                    Box::new(P2PTransactionGeneratorCreator::new(
-                        txn_factory.clone(),
-                        SEND_AMOUNT,
-                        addresses_pool.clone(),
-                        *invalid_transaction_ratio,
-                        SamplingMode::BurnAndRecycle(addresses_pool.len() / 2),
-                    )),
-                    *sender_use_account_pool,
-                    &accounts_pool,
-                ),
                 TransactionType::CoinTransfer {
                     invalid_transaction_ratio,
                     sender_use_account_pool,
+                    non_conflicting,
+                    use_fa_transfer,
                 } => wrap_accounts_pool(
                     Box::new(P2PTransactionGeneratorCreator::new(
                         txn_factory.clone(),
                         SEND_AMOUNT,
                         addresses_pool.clone(),
                         *invalid_transaction_ratio,
-                        SamplingMode::Basic,
+                        *use_fa_transfer,
+                        if *non_conflicting {
+                            SamplingMode::BurnAndRecycle(addresses_pool.len() / 2)
+                        } else {
+                            SamplingMode::Basic
+                        },
                     )),
                     *sender_use_account_pool,
                     &accounts_pool,
diff --git a/crates/transaction-generator-lib/src/p2p_transaction_generator.rs b/crates/transaction-generator-lib/src/p2p_transaction_generator.rs
index 0175865a3f634..81c5ae7dc94b9 100644
--- a/crates/transaction-generator-lib/src/p2p_transaction_generator.rs
+++ b/crates/transaction-generator-lib/src/p2p_transaction_generator.rs
@@ -149,6 +149,7 @@ pub struct P2PTransactionGenerator {
     all_addresses: Arc<ObjectPool<AccountAddress>>,
     sampler: Box<dyn Sampler<AccountAddress>>,
     invalid_transaction_ratio: usize,
+    use_fa_transfer: bool,
 }
 
 impl P2PTransactionGenerator {
@@ -158,6 +159,7 @@ impl P2PTransactionGenerator {
         txn_factory: TransactionFactory,
         all_addresses: Arc<ObjectPool<AccountAddress>>,
         invalid_transaction_ratio: usize,
+        use_fa_transfer: bool,
         sampler: Box<dyn Sampler<AccountAddress>>,
     ) -> Self {
         Self {
@@ -167,6 +169,7 @@ impl P2PTransactionGenerator {
             all_addresses,
             sampler,
             invalid_transaction_ratio,
+            use_fa_transfer,
         }
     }
 
@@ -178,7 +181,13 @@ impl P2PTransactionGenerator {
         txn_factory: &TransactionFactory,
     ) -> SignedTransaction {
         from.sign_with_transaction_builder(
-            txn_factory.payload(aptos_stdlib::aptos_coin_transfer(*to, num_coins)),
+            if self.use_fa_transfer {
+                txn_factory.payload(aptos_stdlib::aptos_account_fungible_transfer_only(
+                    *to, num_coins,
+                ))
+            } else {
+                txn_factory.payload(aptos_stdlib::aptos_coin_transfer(*to, num_coins))
+            },
         )
     }
 
@@ -297,6 +306,7 @@ pub struct P2PTransactionGeneratorCreator {
     amount: u64,
     all_addresses: Arc<ObjectPool<AccountAddress>>,
     invalid_transaction_ratio: usize,
+    use_fa_transfer: bool,
     sampling_mode: SamplingMode,
 }
 
@@ -306,6 +316,7 @@ impl P2PTransactionGeneratorCreator {
         amount: u64,
         all_addresses: Arc<ObjectPool<AccountAddress>>,
         invalid_transaction_ratio: usize,
+        use_fa_transfer: bool,
         sampling_mode: SamplingMode,
     ) -> Self {
         let mut rng = StdRng::from_entropy();
@@ -316,6 +327,7 @@ impl P2PTransactionGeneratorCreator {
             amount,
             all_addresses,
             invalid_transaction_ratio,
+            use_fa_transfer,
             sampling_mode,
         }
     }
@@ -336,6 +348,7 @@ impl TransactionGeneratorCreator for P2PTransactionGeneratorCreator {
             self.txn_factory.clone(),
             self.all_addresses.clone(),
             self.invalid_transaction_ratio,
+            self.use_fa_transfer,
             sampler,
         ))
     }
diff --git a/crates/transaction-generator-lib/src/publishing/module_simple.rs b/crates/transaction-generator-lib/src/publishing/module_simple.rs
index 2399a1919037d..3f2e234d220d1 100644
--- a/crates/transaction-generator-lib/src/publishing/module_simple.rs
+++ b/crates/transaction-generator-lib/src/publishing/module_simple.rs
@@ -181,14 +181,21 @@ pub enum EntryPoints {
         max_offset: u64,
         max_count: u64,
     },
-    /// Increment global (publisher) resource - COUNTER_STEP
+    /// Increment global (publisher) resource
     IncGlobal,
-    /// Increment global (publisher) AggregatorV2 resource - COUNTER_STEP
+    /// Increment global (publisher) AggregatorV2 resource
     IncGlobalAggV2,
     /// Modify (try_add(step) or try_sub(step)) AggregatorV2 bounded counter (counter with max_value=100)
     ModifyGlobalBoundedAggV2 {
         step: u64,
     },
+    /// Increment global (publisher) AggregatorV2 resource with Milestone (and conflict) every `milestone_every` increments.
+    IncGlobalMilestoneAggV2 {
+        milestone_every: u64,
+    },
+    CreateGlobalMilestoneAggV2 {
+        milestone_every: u64,
+    },
 
     /// Modifying a single random tag in a resource group (which contains 8 tags),
     /// from a global resource (at module publishers' address)
@@ -313,6 +320,8 @@ impl EntryPoints {
             | EntryPoints::VectorPictureRead { .. }
             | EntryPoints::InitializeSmartTablePicture
             | EntryPoints::SmartTablePicture { .. } => "complex",
+            EntryPoints::IncGlobalMilestoneAggV2 { .. }
+            | EntryPoints::CreateGlobalMilestoneAggV2 { .. } => "aggregator_examples",
             EntryPoints::DeserializeU256 => "bcs_stream",
         }
     }
@@ -370,6 +379,8 @@ impl EntryPoints {
             EntryPoints::InitializeSmartTablePicture | EntryPoints::SmartTablePicture { .. } => {
                 "smart_table_picture"
             },
+            EntryPoints::IncGlobalMilestoneAggV2 { .. }
+            | EntryPoints::CreateGlobalMilestoneAggV2 { .. } => "counter_with_milestone",
             EntryPoints::DeserializeU256 => "bcs_stream",
         }
     }
@@ -476,10 +487,32 @@ impl EntryPoints {
                     ],
                 )
             },
-            EntryPoints::IncGlobal => inc_global(module_id),
-            EntryPoints::IncGlobalAggV2 => inc_global_agg_v2(module_id),
+            EntryPoints::IncGlobal => {
+                get_payload(module_id, ident_str!("increment").to_owned(), vec![])
+            },
+            EntryPoints::IncGlobalAggV2 => {
+                get_payload(module_id, ident_str!("increment_agg_v2").to_owned(), vec![])
+            },
             EntryPoints::ModifyGlobalBoundedAggV2 { step } => {
-                modify_bounded_agg_v2(module_id, rng.expect("Must provide RNG"), *step)
+                let rng = rng.expect("Must provide RNG");
+                get_payload(
+                    module_id,
+                    ident_str!("modify_bounded_agg_v2").to_owned(),
+                    vec![
+                        bcs::to_bytes(&rng.gen::<bool>()).unwrap(),
+                        bcs::to_bytes(&step).unwrap(),
+                    ],
+                )
+            },
+            EntryPoints::IncGlobalMilestoneAggV2 { .. } => get_payload(
+                module_id,
+                ident_str!("increment_milestone").to_owned(),
+                vec![],
+            ),
+            EntryPoints::CreateGlobalMilestoneAggV2 { milestone_every } => {
+                get_payload(module_id, ident_str!("create").to_owned(), vec![
+                    bcs::to_bytes(&milestone_every).unwrap(),
+                ])
             },
             EntryPoints::CreateObjects {
                 num_objects,
@@ -711,6 +744,11 @@ impl EntryPoints {
                 Some(EntryPoints::InitializeVectorPicture { length: *length })
             },
             EntryPoints::SmartTablePicture { .. } => Some(EntryPoints::InitializeSmartTablePicture),
+            EntryPoints::IncGlobalMilestoneAggV2 { milestone_every } => {
+                Some(EntryPoints::CreateGlobalMilestoneAggV2 {
+                    milestone_every: *milestone_every,
+                })
+            },
             _ => None,
         }
     }
@@ -729,6 +767,7 @@ impl EntryPoints {
                 MultiSigConfig::Publisher
             },
             EntryPoints::LiquidityPoolSwap { .. } => MultiSigConfig::Publisher,
+            EntryPoints::CreateGlobalMilestoneAggV2 { .. } => MultiSigConfig::Publisher,
             _ => MultiSigConfig::None,
         }
     }
@@ -788,6 +827,8 @@ impl EntryPoints {
             EntryPoints::InitializeSmartTablePicture => AutomaticArgs::Signer,
             EntryPoints::SmartTablePicture { .. } => AutomaticArgs::None,
             EntryPoints::DeserializeU256 => AutomaticArgs::None,
+            EntryPoints::IncGlobalMilestoneAggV2 { .. } => AutomaticArgs::None,
+            EntryPoints::CreateGlobalMilestoneAggV2 { .. } => AutomaticArgs::Signer,
         }
     }
 }
@@ -880,31 +921,6 @@ fn minimize(module_id: ModuleId, other: &AccountAddress) -> TransactionPayload {
     ])
 }
 
-fn inc_global(module_id: ModuleId) -> TransactionPayload {
-    get_payload(module_id, ident_str!("increment").to_owned(), vec![])
-}
-
-fn inc_global_agg_v2(module_id: ModuleId) -> TransactionPayload {
-    get_payload(module_id, ident_str!("increment_agg_v2").to_owned(), vec![])
-}
-
-fn modify_bounded_agg_v2(module_id: ModuleId, rng: &mut StdRng, step: u64) -> TransactionPayload {
-    get_payload(
-        module_id,
-        ident_str!("modify_bounded_agg_v2").to_owned(),
-        vec![
-            bcs::to_bytes(&rng.gen::<bool>()).unwrap(),
-            bcs::to_bytes(&step).unwrap(),
-        ],
-    )
-}
-
-fn mint_new_token(module_id: ModuleId, other: AccountAddress) -> TransactionPayload {
-    get_payload(module_id, ident_str!("mint_new_token").to_owned(), vec![
-        bcs::to_bytes(&other).unwrap(),
-    ])
-}
-
 fn rand_string(rng: &mut StdRng, len: usize) -> String {
     let res = rng
         .sample_iter(&Alphanumeric)
diff --git a/crates/transaction-generator-lib/src/publishing/raw_module_data.rs b/crates/transaction-generator-lib/src/publishing/raw_module_data.rs
index 3e1685098ee7f..c46f5cacc01b3 100644
--- a/crates/transaction-generator-lib/src/publishing/raw_module_data.rs
+++ b/crates/transaction-generator-lib/src/publishing/raw_module_data.rs
@@ -1777,6 +1777,96 @@ pub static MODULES_AMBASSADOR_TOKEN: Lazy<Vec<Vec<u8>>> = Lazy::new(|| { vec![
 	MODULE_AMBASSADOR_TOKEN_AMBASSADOR.to_vec(),
 ]});
 #[rustfmt::skip]
+pub static PACKAGE_AGGREGATOR_EXAMPLES_METADATA: Lazy<Vec<u8>> = Lazy::new(|| {
+	vec![
+		19, 65, 103, 103, 114, 101, 103, 97, 116, 111, 114, 32, 101, 120, 97, 109, 112, 108,
+		101, 115, 1, 0, 0, 0, 0, 0, 0, 0, 0, 64, 69, 55, 68, 49, 68, 70,
+		69, 51, 70, 65, 54, 67, 56, 55, 55, 68, 48, 69, 68, 68, 50, 57, 51, 52,
+		54, 55, 67, 49, 51, 49, 53, 53, 51, 50, 52, 57, 56, 49, 53, 48, 67, 68,
+		69, 51, 52, 50, 68, 50, 65, 66, 50, 66, 50, 53, 57, 52, 53, 50, 52, 68,
+		69, 51, 70, 48, 162, 1, 31, 139, 8, 0, 0, 0, 0, 0, 2, 255, 141, 142,
+		65, 10, 195, 32, 16, 69, 247, 158, 66, 220, 215, 244, 2, 93, 72, 105, 46, 208,
+		101, 8, 101, 170, 83, 145, 24, 21, 71, 218, 64, 233, 221, 171, 41, 201, 186, 204,
+		108, 62, 255, 61, 248, 67, 2, 61, 129, 197, 145, 5, 152, 145, 159, 184, 80, 214,
+		102, 180, 80, 98, 230, 184, 192, 156, 60, 146, 96, 79, 204, 228, 98, 104, 253, 81,
+		214, 19, 140, 13, 96, 76, 70, 34, 164, 145, 193, 238, 220, 54, 103, 69, 151, 179,
+		234, 47, 141, 53, 152, 48, 24, 12, 218, 53, 92, 165, 18, 233, 90, 140, 119, 247,
+		138, 189, 185, 143, 26, 124, 19, 164, 236, 234, 63, 114, 157, 242, 138, 121, 234, 160,
+		129, 7, 90, 73, 193, 63, 63, 177, 223, 234, 127, 220, 61, 55, 253, 11, 194, 232,
+		76, 11, 237, 0, 0, 0, 1, 22, 99, 111, 117, 110, 116, 101, 114, 95, 119, 105,
+		116, 104, 95, 109, 105, 108, 101, 115, 116, 111, 110, 101, 0, 0, 0, 3, 0, 0,
+		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 14, 65, 112, 116, 111, 115,
+		70, 114, 97, 109, 101, 119, 111, 114, 107, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+		0, 0, 0, 0, 1, 11, 65, 112, 116, 111, 115, 83, 116, 100, 108, 105, 98, 0,
+		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 10, 77, 111, 118, 101,
+		83, 116, 100, 108, 105, 98, 0,
+	]
+});
+
+#[rustfmt::skip]
+pub static MODULE_AGGREGATOR_EXAMPLES_COUNTER_WITH_MILESTONE: Lazy<Vec<u8>> = Lazy::new(|| {
+	vec![
+		161, 28, 235, 11, 6, 0, 0, 0, 12, 1, 0, 10, 2, 10, 14, 3, 24, 44,
+		4, 68, 8, 5, 76, 49, 7, 125, 128, 2, 8, 253, 2, 64, 6, 189, 3, 64,
+		16, 253, 3, 132, 1, 10, 129, 5, 17, 12, 146, 5, 164, 1, 13, 182, 6, 6,
+		0, 0, 1, 1, 1, 2, 1, 3, 1, 4, 0, 5, 8, 0, 0, 6, 6, 0,
+		1, 12, 6, 1, 0, 0, 0, 7, 0, 1, 0, 0, 8, 1, 1, 0, 4, 14,
+		2, 3, 0, 1, 15, 1, 5, 1, 3, 2, 16, 4, 4, 0, 1, 17, 7, 8,
+		1, 0, 1, 18, 9, 8, 1, 0, 3, 19, 11, 1, 1, 6, 3, 4, 5, 4,
+		6, 4, 7, 10, 2, 6, 12, 3, 0, 1, 6, 12, 1, 5, 1, 3, 1, 11,
+		2, 1, 9, 0, 2, 1, 7, 8, 0, 2, 7, 11, 2, 1, 9, 0, 9, 0,
+		1, 1, 2, 6, 11, 2, 1, 9, 0, 9, 0, 1, 8, 1, 1, 9, 0, 22,
+		99, 111, 117, 110, 116, 101, 114, 95, 119, 105, 116, 104, 95, 109, 105, 108, 101, 115,
+		116, 111, 110, 101, 13, 97, 103, 103, 114, 101, 103, 97, 116, 111, 114, 95, 118, 50,
+		5, 101, 114, 114, 111, 114, 5, 101, 118, 101, 110, 116, 6, 115, 105, 103, 110, 101,
+		114, 16, 77, 105, 108, 101, 115, 116, 111, 110, 101, 67, 111, 117, 110, 116, 101, 114,
+		16, 77, 105, 108, 101, 115, 116, 111, 110, 101, 82, 101, 97, 99, 104, 101, 100, 6,
+		99, 114, 101, 97, 116, 101, 19, 105, 110, 99, 114, 101, 109, 101, 110, 116, 95, 109,
+		105, 108, 101, 115, 116, 111, 110, 101, 14, 110, 101, 120, 116, 95, 109, 105, 108, 101,
+		115, 116, 111, 110, 101, 15, 109, 105, 108, 101, 115, 116, 111, 110, 101, 95, 101, 118,
+		101, 114, 121, 5, 99, 111, 117, 110, 116, 10, 65, 103, 103, 114, 101, 103, 97, 116,
+		111, 114, 9, 109, 105, 108, 101, 115, 116, 111, 110, 101, 10, 97, 100, 100, 114, 101,
+		115, 115, 95, 111, 102, 27, 99, 114, 101, 97, 116, 101, 95, 117, 110, 98, 111, 117,
+		110, 100, 101, 100, 95, 97, 103, 103, 114, 101, 103, 97, 116, 111, 114, 16, 105, 110,
+		118, 97, 108, 105, 100, 95, 97, 114, 103, 117, 109, 101, 110, 116, 7, 116, 114, 121,
+		95, 97, 100, 100, 11, 105, 115, 95, 97, 116, 95, 108, 101, 97, 115, 116, 4, 101,
+		109, 105, 116, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 202, 254, 0,
+		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 3, 8, 4, 0, 0,
+		0, 0, 0, 0, 0, 3, 8, 5, 0, 0, 0, 0, 0, 0, 0, 3, 8, 2,
+		0, 0, 0, 0, 0, 0, 0, 5, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+		0, 0, 0, 202, 254, 18, 97, 112, 116, 111, 115, 58, 58, 109, 101, 116, 97, 100,
+		97, 116, 97, 95, 118, 49, 112, 3, 2, 0, 0, 0, 0, 0, 0, 0, 21, 69,
+		82, 69, 83, 79, 85, 82, 67, 69, 95, 78, 79, 84, 95, 80, 82, 69, 83, 69,
+		78, 84, 0, 4, 0, 0, 0, 0, 0, 0, 0, 23, 69, 67, 79, 85, 78, 84,
+		69, 82, 95, 73, 78, 67, 82, 69, 77, 69, 78, 84, 95, 70, 65, 73, 76, 0,
+		5, 0, 0, 0, 0, 0, 0, 0, 15, 69, 78, 79, 84, 95, 65, 85, 84, 72,
+		79, 82, 73, 90, 69, 68, 0, 1, 16, 77, 105, 108, 101, 115, 116, 111, 110, 101,
+		82, 101, 97, 99, 104, 101, 100, 1, 4, 0, 0, 0, 2, 3, 9, 3, 10, 3,
+		11, 11, 2, 1, 3, 1, 2, 1, 13, 3, 0, 1, 4, 0, 1, 17, 10, 0,
+		17, 2, 7, 3, 33, 4, 6, 5, 10, 11, 0, 1, 7, 1, 39, 11, 0, 10,
+		1, 11, 1, 56, 0, 18, 0, 45, 0, 2, 1, 1, 4, 1, 0, 6, 61, 7,
+		3, 41, 0, 4, 4, 5, 7, 7, 2, 17, 4, 39, 7, 3, 42, 0, 12, 1,
+		10, 1, 15, 0, 6, 1, 0, 0, 0, 0, 0, 0, 0, 56, 1, 4, 16, 5,
+		20, 11, 1, 1, 7, 0, 39, 10, 1, 16, 0, 10, 1, 16, 1, 20, 56, 2,
+		4, 38, 10, 1, 16, 0, 10, 1, 16, 1, 20, 6, 1, 0, 0, 0, 0, 0,
+		0, 0, 22, 56, 2, 32, 12, 0, 5, 40, 9, 12, 0, 11, 0, 4, 58, 10,
+		1, 16, 1, 20, 18, 1, 56, 3, 10, 1, 16, 1, 20, 10, 1, 16, 2, 20,
+		22, 11, 1, 15, 1, 21, 5, 60, 11, 1, 1, 2, 0, 2, 0, 0, 0, 1,
+		0,
+	]
+});
+
+#[rustfmt::skip]
+pub static MODULES_AGGREGATOR_EXAMPLES: Lazy<Vec<Vec<u8>>> = Lazy::new(|| { vec![
+	MODULE_AGGREGATOR_EXAMPLES_COUNTER_WITH_MILESTONE.to_vec(),
+]});
+#[rustfmt::skip]
 pub static PACKAGE_BCS_STREAM_METADATA: Lazy<Vec<u8>> = Lazy::new(|| {
 	vec![
 		9, 66, 67, 83, 83, 116, 114, 101, 97, 109, 1, 0, 0, 0, 0, 0, 0, 0,
@@ -1991,6 +2081,7 @@ pub static PACKAGE_TO_METADATA: Lazy<HashMap<String, Vec<u8>>> = Lazy::new(|| {
 	("simple".to_string(), PACKAGE_SIMPLE_METADATA.to_vec()),
 	("framework_usecases".to_string(), PACKAGE_FRAMEWORK_USECASES_METADATA.to_vec()),
 	("ambassador_token".to_string(), PACKAGE_AMBASSADOR_TOKEN_METADATA.to_vec()),
+	("aggregator_examples".to_string(), PACKAGE_AGGREGATOR_EXAMPLES_METADATA.to_vec()),
 	("bcs_stream".to_string(), PACKAGE_BCS_STREAM_METADATA.to_vec()),
 ])});
 
@@ -2000,5 +2091,6 @@ pub static PACKAGE_TO_MODULES: Lazy<HashMap<String, Vec<Vec<u8>>>> = Lazy::new(|
 	("simple".to_string(), MODULES_SIMPLE.to_vec()),
 	("framework_usecases".to_string(), MODULES_FRAMEWORK_USECASES.to_vec()),
 	("ambassador_token".to_string(), MODULES_AMBASSADOR_TOKEN.to_vec()),
+	("aggregator_examples".to_string(), MODULES_AGGREGATOR_EXAMPLES.to_vec()),
 	("bcs_stream".to_string(), MODULES_BCS_STREAM.to_vec()),
 ])});
diff --git a/deny.toml b/deny.toml
new file mode 100644
index 0000000000000..bd3bc094749cf
--- /dev/null
+++ b/deny.toml
@@ -0,0 +1,40 @@
+# This is a configuration file for cargo deny, the tool we use to prevent accidentally
+# onboarding dependencies with licenses we don't want to use. To test this config, try
+# running a command like this:
+#
+# cargo deny check licenses --hide-inclusion-graph
+
+[licenses]
+version = 2
+allow = [
+    "Apache-2.0",
+    "Apache-2.0 WITH LLVM-exception",
+    "BSD-2-Clause",
+    "BSD-3-Clause",
+    "CC0-1.0",
+    "CDDL-1.0",
+    "ISC",
+    "MIT",
+    "MIT-0",
+    "MPL-2.0",
+    "OpenSSL",
+    "Unicode-DFS-2016",
+    "Unlicense",
+    "Zlib",
+]
+
+# Since the tool cannot determine the license of this crate, we need to clarify it.
+[[licenses.clarify]]
+name = "ring"
+expression = "MIT AND ISC AND OpenSSL"
+license-files = [
+    { path = "LICENSE", hash = 0xbd0eed23 }
+]
+
+[licenses.private]
+ignore = true
+ignore-sources = [
+    # This is for the macros crate from diesel_async_migrations. It is MIT licensed, but
+    # uses an irregular license file name.
+    "https://github.com/niroco/diesel_async_migrations"
+]
diff --git a/devtools/aptos-cargo-cli/Cargo.toml b/devtools/aptos-cargo-cli/Cargo.toml
index 760f51ce320c4..a0218ad17c260 100644
--- a/devtools/aptos-cargo-cli/Cargo.toml
+++ b/devtools/aptos-cargo-cli/Cargo.toml
@@ -15,6 +15,7 @@ rust-version = { workspace = true }
 [dependencies]
 anyhow = { workspace = true }
 camino = { workspace = true }
+chrono = { workspace = true }
 clap = { workspace = true }
 clap-verbosity-flag = { workspace = true }
 determinator = { workspace = true }
diff --git a/devtools/aptos-cargo-cli/src/common.rs b/devtools/aptos-cargo-cli/src/common.rs
index 7c881770a8623..e0435abfd53bd 100644
--- a/devtools/aptos-cargo-cli/src/common.rs
+++ b/devtools/aptos-cargo-cli/src/common.rs
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use anyhow::anyhow;
+use chrono::DateTime;
 use clap::Args;
 use determinator::{
     rules::{DeterminatorMarkChanged, DeterminatorPostRule, DeterminatorRules, PathRule},
@@ -14,15 +15,19 @@ use guppy::{
     },
     CargoMetadata, MetadataCommand,
 };
-use log::{debug, info};
+use log::{debug, info, warn};
+use reqwest::Error;
 use std::{
     fs,
     io::Read,
-    path::{Path, PathBuf},
-    process::Command,
+    path::Path,
+    process::{Command, Output},
 };
 use url::Url;
 
+// The target directory for the devtool
+const DEVTOOL_TARGET_DIRECTORY: &str = "target/aptos-x-tool";
+
 // File types in `aptos-core` that are not relevant to the rust build and test process.
 // Note: this is a best effort list and will need to be updated as time goes on.
 const IGNORED_DETERMINATOR_FILE_TYPES: [&str; 4] = ["*.json", "*.md", "*.yaml", "*.yml"];
@@ -40,10 +45,15 @@ const IGNORED_DETERMINATOR_PATHS: [&str; 8] = [
     "terraform/*",
 ];
 
+// The maximum number of days allowed since the merge-base commit for the branch
+const MAX_NUM_DAYS_SINCE_MERGE_BASE: u64 = 7;
+
 // The delimiter used to separate the package path and the package name.
 pub const PACKAGE_NAME_DELIMITER: &str = "#";
 
-fn workspace_dir() -> PathBuf {
+/// Returns the workspace directory for the current project
+fn workspace_dir() -> String {
+    // Get the cargo path for the current project
     let output = Command::new("cargo")
         .arg("locate-project")
         .arg("--workspace")
@@ -52,7 +62,13 @@ fn workspace_dir() -> PathBuf {
         .unwrap()
         .stdout;
     let cargo_path = Path::new(std::str::from_utf8(&output).unwrap().trim());
-    cargo_path.parent().unwrap().to_path_buf()
+
+    // Parse the workspace directory from the cargo path
+    let workspace_dir = cargo_path.parent().unwrap().to_path_buf();
+    workspace_dir
+        .to_str()
+        .expect("Failed to parse workspace directory!")
+        .into()
 }
 
 #[derive(Args, Debug, Clone)]
@@ -90,36 +106,94 @@ impl SelectedPackageArgs {
     }
 
     fn fetch_remote_metadata(&self, merge_base: &str) -> anyhow::Result<CargoMetadata> {
+        // Get the local metadata file path
         let base_sha = self.git_rev_parse(merge_base);
         let file_name = format!("metadata-{}.json", base_sha);
-        let dir_path = format!(
-            "{}/target/aptos-x-tool",
-            workspace_dir().to_str().expect("invalid UTF-8")
+        let dir_path = format!("{}/{}", workspace_dir(), DEVTOOL_TARGET_DIRECTORY);
+        let local_metadata_file_path = format!("{}/{}", dir_path, file_name);
+
+        // Read the metadata from the local file (if it exists)
+        debug!(
+            "Attempting to read metadata from local file: {:?}",
+            local_metadata_file_path
         );
-        let file_path = format!("{}/{}", dir_path, file_name);
-        let mut contents = String::new();
+        if let Some(metadata) = read_metadata_from_local_file(&local_metadata_file_path) {
+            return Ok(metadata);
+        }
+
+        // Otherwise, attempt to read the metadata from the GCS bucket
+        debug!(
+            "Attempting to fetch metadata from GCS bucket! File path {:?}",
+            file_name
+        );
+        if let Some(metadata) =
+            read_metadata_from_gcs(merge_base, file_name, &local_metadata_file_path)
+        {
+            return Ok(metadata);
+        }
 
-        // Check if the file exists in the local directory
-        if let Ok(file) = fs::File::open(&file_path) {
-            let mut buf_reader = std::io::BufReader::new(file);
-            buf_reader.read_to_string(&mut contents)?;
+        // Otherwise, attempt to recompute the metadata locally
+        debug!(
+            "Attempting to recompute metadata locally for merge-base commit: {:?}",
+            merge_base
+        );
+        if let Some(metadata) =
+            recompute_merge_base_metadata(merge_base, &dir_path, &local_metadata_file_path)
+        {
+            return Ok(metadata);
+        }
+
+        // Return an error (nothing else can be done)
+        Err(anyhow!(
+            "Failed to fetch or recompute remote metadata for merge-base commit: {:?}",
+            merge_base
+        ))
+    }
+
+    /// Ensures the merge base is not too old
+    pub fn check_merge_base(&self) -> anyhow::Result<()> {
+        // Identify the merge base
+        let merge_base = self.identify_merge_base()?;
+
+        // Get the commit timestamp of the merge-base
+        let commit_timestamp_output = Command::new("git")
+            .arg("show")
+            .arg("-s")
+            .arg("--format=%cI")
+            .arg(&merge_base)
+            .output()
+            .expect("failed to execute git show");
+        let commit_timestamp = parse_string_from_output(commit_timestamp_output);
+
+        // Log the merge-base and commit timestamp
+        info!(
+            "Identified the merge base: {:?} (commit date: {:?})",
+            merge_base, commit_timestamp
+        );
+
+        // Calculate the time difference between the merge-base and the current time (in days)
+        let commit_datetime = DateTime::parse_from_rfc3339(&commit_timestamp)
+            .expect("failed to parse commit timestamp");
+        let current_datetime = DateTime::parse_from_rfc3339(&chrono::Utc::now().to_rfc3339())
+            .expect("failed to parse current timestamp");
+        let time_difference_days = current_datetime
+            .signed_duration_since(commit_datetime)
+            .num_days() as u64;
+
+        // Check if the merge-base is too old
+        if time_difference_days >= MAX_NUM_DAYS_SINCE_MERGE_BASE {
+            return Err(anyhow!(
+                "The merge base is too old! Maximum: {:?} (days), Merge-base: {:?} (days)! Please rebase your branch!",
+                MAX_NUM_DAYS_SINCE_MERGE_BASE, time_difference_days
+            ));
         } else {
-            // Make an HTTP call to the GCS bucket to get the file contents
-            let url = format!(
-                "https://storage.googleapis.com/aptos-core-cargo-metadata-public/{}",
-                file_name
+            info!(
+                "The merge base is within the maximum number of days. Maximum: {:?} (days), Merge-base: {:?} (days)",
+                MAX_NUM_DAYS_SINCE_MERGE_BASE, time_difference_days
             );
-            let response = reqwest::blocking::get(url)?.error_for_status()?;
-            let response = response.text()?;
-            contents = response.clone();
-
-            // Write the contents of the file to the local directory
-            fs::create_dir_all("target/aptos-x-tool")?;
-            fs::write(file_path, response)?;
         }
 
-        // Return the contents of the file
-        Ok(CargoMetadata::parse_json(&contents)?)
+        Ok(())
     }
 
     /// Identifies the changed files compared to the merge base, and
@@ -128,10 +202,9 @@ impl SelectedPackageArgs {
         &self,
     ) -> anyhow::Result<(PackageGraph, PackageGraph, Utf8Paths0)> {
         // Determine the merge base
-        let merge_base = self.identify_merge_base();
-        info!("Identified the merge base: {:?}", merge_base);
+        let merge_base = self.identify_merge_base()?;
 
-        // Download merge base metadata
+        // Download the merge base metadata
         let base_metadata = self.fetch_remote_metadata(&merge_base)?;
         let base_package_graph = base_metadata.build_graph().unwrap();
 
@@ -143,7 +216,6 @@ impl SelectedPackageArgs {
 
         // Compute changed files
         let changed_files = self.compute_changed_files(&merge_base)?;
-        debug!("Identified the changed files: {:?}", changed_files);
 
         // Return the package graphs and the changed files
         Ok((base_package_graph, head_package_graph, changed_files))
@@ -151,21 +223,21 @@ impl SelectedPackageArgs {
 
     /// Identifies the merge base to compare against. This is done by identifying
     /// the commit at which the current branch forked off origin/main.
-    /// TODO: do we need to make this more intelligent?
-    fn identify_merge_base(&self) -> String {
+    ///
+    /// Note: if the merge-base is too old, an error will be returned.
+    fn identify_merge_base(&self) -> anyhow::Result<String> {
         // Run the git merge-base command
-        let output = Command::new("git")
+        let merge_base_output = Command::new("git")
             .arg("merge-base")
             .arg("HEAD")
             .arg("origin/main")
             .output()
             .expect("failed to execute git merge-base");
+        let merge_base = parse_string_from_output(merge_base_output);
 
-        // Return the output
-        String::from_utf8(output.stdout)
-            .expect("invalid UTF-8")
-            .trim()
-            .to_owned()
+        // Log and return the merge base
+        info!("Identified the merge base: {:?}", merge_base);
+        Ok(merge_base)
     }
 
     /// Computes the affected target packages based on the
@@ -188,6 +260,7 @@ impl SelectedPackageArgs {
         // Set the cargo options for the determinator
         let mut cargo_options = CargoOptions::new();
         cargo_options.set_resolver(CargoResolverVersion::V2);
+        cargo_options.set_include_dev(true); // Include dev-dependencies to ensure test-only packages are handled correctly
         determinator.set_cargo_options(&cargo_options);
 
         // Set the ignore rules for the determinator
@@ -227,3 +300,192 @@ impl SelectedPackageArgs {
         Ok(package_set)
     }
 }
+
+/// Parses the cargo metadata from the given contents
+fn parse_cargo_metadata(metadata_contents: &String) -> Option<CargoMetadata> {
+    match CargoMetadata::parse_json(metadata_contents) {
+        Ok(cargo_metadata) => {
+            // The metadata was successfully parsed from the file
+            Some(cargo_metadata)
+        },
+        Err(error) => {
+            warn!("Error parsing metadata from contents: {:?}", error);
+            None
+        },
+    }
+}
+
+/// Parses a UTF-8 string from the given command output
+fn parse_string_from_output(output: Output) -> String {
+    String::from_utf8(output.stdout)
+        .expect("invalid UTF-8")
+        .trim()
+        .to_owned()
+}
+
+/// Prints a warning message for the failed fetch of the remote metadata
+fn print_metadata_fetch_error(merge_base: &str, error: Error) {
+    warn!(
+        "Failed to fetch remote metadata for merge-base commit: {:?}! Error: {:?}\
+                            \nRebasing your branch may fix this error!",
+        merge_base, error
+    );
+}
+
+/// Attempt to read the cargo metadata from the local file (if it exists)
+fn read_metadata_from_local_file(local_metadata_file_path: &String) -> Option<CargoMetadata> {
+    if let Ok(file) = fs::File::open(local_metadata_file_path) {
+        // Read the file and parse the contents
+        let mut contents = String::new();
+        let mut buf_reader = std::io::BufReader::new(file);
+        match buf_reader.read_to_string(&mut contents) {
+            Ok(_) => {
+                // Parse the contents as cargo metadata
+                parse_cargo_metadata(&contents)
+            },
+            Err(error) => {
+                warn!(
+                    "Error reading metadata file from local path: {:?}. Error: {:?}",
+                    local_metadata_file_path, error
+                );
+                None
+            },
+        }
+    } else {
+        None
+    }
+}
+
+/// Attempt to read the cargo metadata from the GCS bucket (if it exists)
+fn read_metadata_from_gcs(
+    merge_base: &str,
+    remote_file_name: String,
+    local_metadata_file_path: &String,
+) -> Option<CargoMetadata> {
+    // Make a request to the GCS bucket to fetch the metadata file
+    let url = format!(
+        "https://storage.googleapis.com/aptos-core-cargo-metadata-public/{}",
+        remote_file_name
+    );
+    let response = match reqwest::blocking::get(url) {
+        Ok(response) => response.error_for_status(),
+        Err(error) => {
+            print_metadata_fetch_error(merge_base, error);
+            return None;
+        },
+    };
+
+    // Parse the metadata response
+    match response {
+        Ok(response) => {
+            // Get the response text
+            match response.text() {
+                Ok(response) => {
+                    // Parse the contents as JSON
+                    let cargo_metadata = parse_cargo_metadata(&response);
+
+                    // If the metadata was successfully parsed, write it to the local directory
+                    if cargo_metadata.is_some() {
+                        write_metadata_locally(local_metadata_file_path, response);
+                    }
+
+                    // Return the metadata
+                    return cargo_metadata;
+                },
+                Err(error) => {
+                    print_metadata_fetch_error(merge_base, error);
+                    return None;
+                },
+            }
+        },
+        Err(error) => {
+            print_metadata_fetch_error(merge_base, error);
+        },
+    }
+
+    None // Unable to read the metadata from the GCS bucket
+}
+
+/// Recomputes and returns the metadata for the merge base commit locally
+fn recompute_merge_base_metadata(
+    merge_base: &str,
+    local_dir_path: &String,
+    local_metadata_file_path: &String,
+) -> Option<CargoMetadata> {
+    // Clone the aptos-core repository to the local directory
+    debug!(
+        "Cloning aptos-core repository to local directory: {:?}",
+        local_dir_path
+    );
+    let clone_directory = format!("{}/aptos-core", local_dir_path);
+    Command::new("git")
+        .arg("clone")
+        .arg("--depth")
+        .arg("500") // Clone the last 500 commits to ensure the merge base is included
+        .arg("https://github.com/aptos-labs/aptos-core.git")
+        .arg(clone_directory.clone())
+        .output()
+        .expect("failed to execute git clone");
+
+    // Check out the merge base commit for the aptos-core clone
+    debug!(
+        "Checking out merge base commit for aptos-core clone: {:?}",
+        merge_base
+    );
+    Command::new("git")
+        .current_dir(clone_directory.clone())
+        .arg("checkout")
+        .arg(merge_base)
+        .output()
+        .expect("failed to execute git checkout");
+
+    // Recompute the metadata for the merge base commit
+    let output = Command::new("cargo")
+        .current_dir(clone_directory.clone())
+        .arg("metadata")
+        .arg("--all-features")
+        .output()
+        .expect("failed to execute cargo metadata");
+    let output = parse_string_from_output(output);
+
+    // Parse the metadata from the output
+    let cargo_metadata = parse_cargo_metadata(&output);
+
+    // If the metadata was successfully parsed, write it to the local directory
+    if cargo_metadata.is_some() {
+        write_metadata_locally(local_metadata_file_path, output);
+    }
+
+    // Delete the aptos-core clone
+    debug!("Deleting aptos-core clone directory: {:?}", clone_directory);
+    if let Err(error) = fs::remove_dir_all(clone_directory.clone()) {
+        warn!(
+            "Error deleting aptos-core clone directory: {:?}. Error: {:?}",
+            clone_directory, error
+        );
+    }
+
+    // Return the metadata
+    cargo_metadata
+}
+
+/// Writes the metadata to the local filesystem (at the specified path)
+fn write_metadata_locally(local_file_path: &String, metadata: String) {
+    // Create the directory for the file
+    if let Err(error) = fs::create_dir_all(DEVTOOL_TARGET_DIRECTORY) {
+        warn!(
+            "Error creating directory for file: {:?}. Error: {:?}",
+            local_file_path, error
+        );
+        return;
+    }
+
+    // Write the contents of the file
+    debug!("Writing metadata to local file: {:?}", local_file_path);
+    if let Err(error) = fs::write(local_file_path.clone(), metadata) {
+        warn!(
+            "Error writing file: {:?}. Error: {:?}",
+            local_file_path, error
+        );
+    }
+}
diff --git a/devtools/aptos-cargo-cli/src/lib.rs b/devtools/aptos-cargo-cli/src/lib.rs
index 293b2dba356fa..15688ea0aceb5 100644
--- a/devtools/aptos-cargo-cli/src/lib.rs
+++ b/devtools/aptos-cargo-cli/src/lib.rs
@@ -45,7 +45,8 @@ const RELEVANT_PACKAGES_FOR_FRAMEWORK_UPGRADE_TESTS: [&str; 2] =
     ["aptos-framework", "aptos-release-builder"];
 
 // The targeted unit test packages to ignore (these will be run separately, by other jobs)
-const TARGETED_UNIT_TEST_PACKAGES_TO_IGNORE: [&str; 2] = ["aptos-testcases", "smoke-test"];
+const TARGETED_UNIT_TEST_PACKAGES_TO_IGNORE: [&str; 3] =
+    ["aptos-testcases", "smoke-test", "aptos-keyless-circuit"];
 
 #[derive(Args, Clone, Debug)]
 #[command(disable_help_flag = true)]
@@ -70,6 +71,7 @@ pub enum AptosCargoCommand {
     AffectedPackages(CommonArgs),
     ChangedFiles(CommonArgs),
     Check(CommonArgs),
+    CheckMergeBase(CommonArgs),
     Xclippy(CommonArgs),
     Fmt(CommonArgs),
     Nextest(CommonArgs),
@@ -98,6 +100,7 @@ impl AptosCargoCommand {
             AptosCargoCommand::AffectedPackages(args) => args,
             AptosCargoCommand::ChangedFiles(args) => args,
             AptosCargoCommand::Check(args) => args,
+            AptosCargoCommand::CheckMergeBase(args) => args,
             AptosCargoCommand::Xclippy(args) => args,
             AptosCargoCommand::Fmt(args) => args,
             AptosCargoCommand::Nextest(args) => args,
@@ -162,6 +165,10 @@ impl AptosCargoCommand {
                 let (_, _, changed_files) = package_args.identify_changed_files()?;
                 output_changed_files(changed_files)
             },
+            AptosCargoCommand::CheckMergeBase(_) => {
+                // Check the merge base
+                package_args.check_merge_base()
+            },
             AptosCargoCommand::TargetedCLITests(_) => {
                 // Run the targeted CLI tests (if necessary).
                 // First, start by calculating the affected packages.
@@ -474,7 +481,7 @@ fn output_affected_packages(packages: Vec<String>) -> anyhow::Result<()> {
     if packages.is_empty() {
         println!("No packages were affected!");
     } else {
-        println!("Affected packages detected:");
+        println!("Affected packages detected ({:?} total):", packages.len());
         for package in packages {
             println!("\t{:?}", package)
         }
diff --git a/dkg/src/agg_trx_producer.rs b/dkg/src/agg_trx_producer.rs
index a7f86146ddec0..bbe537cea5b9d 100644
--- a/dkg/src/agg_trx_producer.rs
+++ b/dkg/src/agg_trx_producer.rs
@@ -61,7 +61,10 @@ impl<DKG: DKGTrait + 'static> TAggTranscriptProducer<DKG> for AggTranscriptProdu
             epoch_state,
         ));
         let task = async move {
-            let agg_trx = rb.broadcast(req, agg_state).await;
+            let agg_trx = rb
+                .broadcast(req, agg_state)
+                .await
+                .expect("broadcast cannot fail");
             info!(
                 epoch = epoch,
                 my_addr = my_addr,
diff --git a/dkg/src/epoch_manager.rs b/dkg/src/epoch_manager.rs
index 6f4e4994ed814..464b9a98d471c 100644
--- a/dkg/src/epoch_manager.rs
+++ b/dkg/src/epoch_manager.rs
@@ -206,6 +206,7 @@ impl<P: OnChainConfigProvider> EpochManager<P> {
 
             let network_sender = self.create_network_sender();
             let rb = ReliableBroadcast::new(
+                self.my_addr,
                 epoch_state.verifier.get_ordered_account_addresses(),
                 Arc::new(network_sender),
                 ExponentialBackoff::from_millis(self.rb_config.backoff_policy_base_ms)
diff --git a/dkg/src/network.rs b/dkg/src/network.rs
index 85a6995024447..6d66dc6a92bcf 100644
--- a/dkg/src/network.rs
+++ b/dkg/src/network.rs
@@ -24,7 +24,7 @@ use futures::{
 };
 use futures_channel::oneshot;
 use move_core_types::account_address::AccountAddress;
-use std::{sync::Arc, time::Duration};
+use std::{collections::HashMap, sync::Arc, time::Duration};
 use tokio::time::timeout;
 
 pub struct IncomingRpcRequest {
@@ -69,10 +69,12 @@ impl NetworkSender {
         if receiver == self.author() {
             let (tx, rx) = oneshot::channel();
             let protocol = RPC[0];
-            let self_msg = Event::RpcRequest(receiver, msg.clone(), RPC[0], tx);
+            let self_msg = Event::RpcRequest(self.author, msg.clone(), RPC[0], tx);
             self.self_sender.clone().send(self_msg).await?;
             if let Ok(Ok(Ok(bytes))) = timeout(timeout_duration, rx).await {
-                Ok(protocol.from_bytes(&bytes)?)
+                let response_msg =
+                    tokio::task::spawn_blocking(move || protocol.from_bytes(&bytes)).await??;
+                Ok(response_msg)
             } else {
                 bail!("self rpc failed");
             }
@@ -87,6 +89,18 @@ impl NetworkSender {
 
 #[async_trait]
 impl RBNetworkSender<DKGMessage> for NetworkSender {
+    async fn send_rb_rpc_raw(
+        &self,
+        receiver: AccountAddress,
+        raw_message: Bytes,
+        timeout: Duration,
+    ) -> anyhow::Result<DKGMessage> {
+        Ok(self
+            .dkg_network_client
+            .send_rpc_raw(receiver, raw_message, timeout)
+            .await?)
+    }
+
     async fn send_rb_rpc(
         &self,
         receiver: AccountAddress,
@@ -95,6 +109,18 @@ impl RBNetworkSender<DKGMessage> for NetworkSender {
     ) -> anyhow::Result<DKGMessage> {
         self.send_rpc(receiver, message, timeout).await
     }
+
+    fn to_bytes_by_protocol(
+        &self,
+        peers: Vec<AccountAddress>,
+        message: DKGMessage,
+    ) -> anyhow::Result<HashMap<AccountAddress, Bytes>> {
+        self.dkg_network_client.to_bytes_by_protocol(peers, message)
+    }
+
+    fn sort_peers_by_latency(&self, peers: &mut [AccountAddress]) {
+        self.dkg_network_client.sort_peers_by_latency(peers)
+    }
 }
 
 pub struct NetworkReceivers {
diff --git a/dkg/src/network_interface.rs b/dkg/src/network_interface.rs
index b553c46f077e0..849f821db5843 100644
--- a/dkg/src/network_interface.rs
+++ b/dkg/src/network_interface.rs
@@ -8,7 +8,8 @@ use aptos_network::{
     ProtocolId,
 };
 use aptos_types::PeerId;
-use std::time::Duration;
+use bytes::Bytes;
+use std::{collections::HashMap, time::Duration};
 
 pub const RPC: &[ProtocolId] = &[
     ProtocolId::DKGRpcCompressed,
@@ -33,7 +34,6 @@ impl<NetworkClient: NetworkClientInterface<DKGMessage>> DKGNetworkClient<Network
         Self { network_client }
     }
 
-    /// Send a RPC to the destination peer
     pub async fn send_rpc(
         &self,
         peer: PeerId,
@@ -46,8 +46,43 @@ impl<NetworkClient: NetworkClientInterface<DKGMessage>> DKGNetworkClient<Network
             .await
     }
 
+    /// Send a RPC to the destination peer
+    pub async fn send_rpc_raw(
+        &self,
+        peer: PeerId,
+        message: Bytes,
+        rpc_timeout: Duration,
+    ) -> Result<DKGMessage, Error> {
+        let peer_network_id = self.get_peer_network_id_for_peer(peer);
+        self.network_client
+            .send_to_peer_rpc_raw(message, rpc_timeout, peer_network_id)
+            .await
+    }
+
+    pub fn to_bytes_by_protocol(
+        &self,
+        peers: Vec<PeerId>,
+        message: DKGMessage,
+    ) -> anyhow::Result<HashMap<PeerId, Bytes>> {
+        let peer_network_ids: Vec<PeerNetworkId> = peers
+            .into_iter()
+            .map(|peer| self.get_peer_network_id_for_peer(peer))
+            .collect();
+        Ok(self
+            .network_client
+            .to_bytes_by_protocol(peer_network_ids, message)?
+            .into_iter()
+            .map(|(peer_network_id, bytes)| (peer_network_id.peer_id(), bytes))
+            .collect())
+    }
+
     // TODO: we shouldn't need to expose this. Migrate the code to handle peer and network ids.
     fn get_peer_network_id_for_peer(&self, peer: PeerId) -> PeerNetworkId {
         PeerNetworkId::new(NetworkId::Validator, peer)
     }
+
+    pub fn sort_peers_by_latency(&self, peers: &mut [PeerId]) {
+        self.network_client
+            .sort_peers_by_latency(NetworkId::Validator, peers)
+    }
 }
diff --git a/docker/builder/build-indexer.sh b/docker/builder/build-indexer.sh
index 9152cc6661210..0bde16450815e 100755
--- a/docker/builder/build-indexer.sh
+++ b/docker/builder/build-indexer.sh
@@ -16,7 +16,7 @@ cargo build --locked --profile=$PROFILE \
     -p aptos-indexer-grpc-file-store \
     -p aptos-indexer-grpc-data-service \
     -p aptos-nft-metadata-crawler-parser \
-    -p aptos-indexer-grpc-in-memory-cache-benchmark \
+    -p aptos-indexer-grpc-file-store-backfiller \
     "$@"
 
 # After building, copy the binaries we need to `dist` since the `target` directory is used as docker cache mount and only available during the RUN step
@@ -25,7 +25,7 @@ BINS=(
     aptos-indexer-grpc-file-store
     aptos-indexer-grpc-data-service
     aptos-nft-metadata-crawler-parser
-    aptos-indexer-grpc-in-memory-cache-benchmark
+    aptos-indexer-grpc-file-store-backfiller
 )
 
 mkdir dist
diff --git a/docker/builder/builder.Dockerfile b/docker/builder/builder.Dockerfile
index 08575c90d9637..4654ad64dff09 100644
--- a/docker/builder/builder.Dockerfile
+++ b/docker/builder/builder.Dockerfile
@@ -53,7 +53,6 @@ FROM builder-base as aptos-node-builder
 RUN --mount=type=secret,id=GIT_CREDENTIALS,target=/root/.git-credentials \
     --mount=type=cache,target=/usr/local/cargo/git,id=node-builder-cargo-git-cache \
     --mount=type=cache,target=/usr/local/cargo/registry,id=node-builder-cargo-registry-cache \
-    --mount=type=cache,target=/aptos/target,id=node-builder-target-cache \
     docker/builder/build-node.sh
 
 FROM builder-base as tools-builder
@@ -61,7 +60,6 @@ FROM builder-base as tools-builder
 RUN --mount=type=secret,id=GIT_CREDENTIALS,target=/root/.git-credentials \
     --mount=type=cache,target=/usr/local/cargo/git,id=tools-builder-cargo-git-cache \
     --mount=type=cache,target=/usr/local/cargo/registry,id=tools-builder-cargo-registry-cache \
-    --mount=type=cache,target=/aptos/target,id=tools-builder-target-cache \
     docker/builder/build-tools.sh
 
 FROM builder-base as indexer-builder
@@ -69,5 +67,4 @@ FROM builder-base as indexer-builder
 RUN --mount=type=secret,id=GIT_CREDENTIALS,target=/root/.git-credentials \
     --mount=type=cache,target=/usr/local/cargo/git,id=indexer-builder-cargo-git-cache \
     --mount=type=cache,target=/usr/local/cargo/registry,id=indexer-builder-cargo-registry-cache \
-    --mount=type=cache,target=/aptos/target,id=indexer-builder-target-cache \
     docker/builder/build-indexer.sh
diff --git a/docker/builder/docker-bake-rust-all.hcl b/docker/builder/docker-bake-rust-all.hcl
index bc98466dc481c..b6a09908ea24f 100644
--- a/docker/builder/docker-bake-rust-all.hcl
+++ b/docker/builder/docker-bake-rust-all.hcl
@@ -69,7 +69,7 @@ target "debian-base" {
   dockerfile = "docker/builder/debian-base.Dockerfile"
   contexts = {
     # Run `docker buildx imagetools inspect debian:bullseye` to find the latest multi-platform hash
-    debian = "docker-image://debian:bullseye@sha256:f860cec7ccaf31b42cd60b6a409f9dad9510ea27fca9c2864741087b4298a1e3"
+    debian = "docker-image://debian:bullseye@sha256:7aef2e7d061743fdb57973dac3ddbceb0b0912746ca7e0ee7535016c38286561"
   }
 }
 
@@ -78,8 +78,8 @@ target "builder-base" {
   target     = "builder-base"
   context    = "."
   contexts = {
-    # Run `docker buildx imagetools inspect rust:1.75.0-bullseye` to find the latest multi-platform hash
-    rust = "docker-image://rust:1.75.0-bullseye@sha256:2576095c947f6d9cfb5f19d51b822cdeb557c5a5b6de9460f2bf1f913d0434ca"
+    # Run `docker buildx imagetools inspect rust:1.78.0-bullseye` to find the latest multi-platform hash
+    rust = "docker-image://rust:1.78.0-bullseye@sha256:c8f85185bd2e482d88e1b8a90705435309ca9d54ccc3bcccf24a32378b8ff1a8"
   }
   args = {
     PROFILE            = "${PROFILE}"
diff --git a/docker/builder/forge.Dockerfile b/docker/builder/forge.Dockerfile
index 202ced9e16bd2..3abb3df30b327 100644
--- a/docker/builder/forge.Dockerfile
+++ b/docker/builder/forge.Dockerfile
@@ -26,6 +26,7 @@ ENV PATH "$PATH:/root/bin"
 
 WORKDIR /aptos
 COPY --link --from=node-builder /aptos/dist/forge /usr/local/bin/forge
+
 ### Get Aptos Framework Release for forge framework upgrade testing
 COPY --link --from=tools-builder /aptos/aptos-move/framework/ /aptos/aptos-move/framework/
 COPY --link --from=tools-builder /aptos/aptos-move/aptos-release-builder/ /aptos/aptos-move/aptos-release-builder/
diff --git a/docker/builder/indexer-grpc.Dockerfile b/docker/builder/indexer-grpc.Dockerfile
index ae6714ca6b9bd..255293fd3e27c 100644
--- a/docker/builder/indexer-grpc.Dockerfile
+++ b/docker/builder/indexer-grpc.Dockerfile
@@ -17,7 +17,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
 COPY --link --from=indexer-builder /aptos/dist/aptos-indexer-grpc-cache-worker /usr/local/bin/aptos-indexer-grpc-cache-worker
 COPY --link --from=indexer-builder /aptos/dist/aptos-indexer-grpc-file-store /usr/local/bin/aptos-indexer-grpc-file-store
 COPY --link --from=indexer-builder /aptos/dist/aptos-indexer-grpc-data-service /usr/local/bin/aptos-indexer-grpc-data-service
-COPY --link --from=indexer-builder /aptos/dist/aptos-indexer-grpc-in-memory-cache-benchmark /usr/local/bin/aptos-indexer-grpc-in-memory-cache-benchmark
+COPY --link --from=indexer-builder /aptos/dist/aptos-indexer-grpc-file-store-backfiller /usr/local/bin/aptos-indexer-grpc-file-store-backfiller
 
 # The health check port
 EXPOSE 8080
diff --git a/docker/builder/tools.Dockerfile b/docker/builder/tools.Dockerfile
index b275a602e5282..a62e67e099f0c 100644
--- a/docker/builder/tools.Dockerfile
+++ b/docker/builder/tools.Dockerfile
@@ -17,7 +17,14 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
     ca-certificates \
     socat \
     python3-botocore/bullseye \
-    awscli/bullseye
+    awscli/bullseye \
+    gnupg2 \
+    pigz
+
+RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] http://packages.cloud.google.com/apt cloud-sdk main" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list && \
+    curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key --keyring /usr/share/keyrings/cloud.google.gpg add - && \
+    apt-get -y update && \
+    apt-get -y install google-cloud-sdk
 
 RUN ln -s /usr/bin/python3 /usr/local/bin/python
 COPY --link docker/tools/boto.cfg /etc/boto.cfg
diff --git a/docker/compose/aptos-node/docker-compose-fullnode.yaml b/docker/compose/aptos-node/docker-compose-fullnode.yaml
index dea934f0d79f7..e9c5c3198c0a6 100644
--- a/docker/compose/aptos-node/docker-compose-fullnode.yaml
+++ b/docker/compose/aptos-node/docker-compose-fullnode.yaml
@@ -4,7 +4,7 @@
 version: "3.8"
 services:
   haproxy:
-    image: haproxytech/haproxy-debian:2.2.29
+    image: haproxy:3.0.2
     volumes:
       - type: bind
         source: ./haproxy-fullnode.cfg
diff --git a/docker/compose/aptos-node/docker-compose-src.yaml b/docker/compose/aptos-node/docker-compose-src.yaml
index 6ece4e94e0363..9297007e97d02 100644
--- a/docker/compose/aptos-node/docker-compose-src.yaml
+++ b/docker/compose/aptos-node/docker-compose-src.yaml
@@ -4,7 +4,7 @@
 version: "3.8"
 services:
   haproxy:
-    image: haproxytech/haproxy-debian:2.2.29
+    image: haproxy:3.0.2
     volumes:
       - type: bind
         source: ./haproxy.cfg
diff --git a/docker/compose/aptos-node/docker-compose.yaml b/docker/compose/aptos-node/docker-compose.yaml
index 01cf47c77cc84..4b3ea8c985008 100644
--- a/docker/compose/aptos-node/docker-compose.yaml
+++ b/docker/compose/aptos-node/docker-compose.yaml
@@ -4,7 +4,7 @@
 version: "3.8"
 services:
   haproxy:
-    image: haproxytech/haproxy-debian:2.2.29
+    image: haproxy:3.0.2
     volumes:
       - type: bind
         source: ./haproxy.cfg
diff --git a/docker/compose/aptos-node/haproxy-fullnode.cfg b/docker/compose/aptos-node/haproxy-fullnode.cfg
index 5bc2605df2b75..c11598752e018 100644
--- a/docker/compose/aptos-node/haproxy-fullnode.cfg
+++ b/docker/compose/aptos-node/haproxy-fullnode.cfg
@@ -1,38 +1,41 @@
+# Config manual: https://www.haproxy.com/documentation/haproxy-configuration-manual/latest/
+
+## Global settings
 global
+    # Specify the stdout log format and size
     log stdout len 10240 format raw local0
 
-    # Config manual: https://cbonte.github.io/haproxy-dconv/2.5/configuration.html
-    # magic values : terraform/helm/aptos-node/values.yaml
-
-    maxconn 8192
-    # This limits the whole HA Proxy impacting both fullnodes and other frontends
-    # maxconnrate 128
-    nbthread 4
+    # Limit the maximum number of connections to 500 (this is ~5x the validator set size)
+    maxconn 500
 
-    #4MB for client facing sndbuf/rcvbuf. -- 100Mb/s with 300 mili latency (e.g., us-asia)
-    tune.sndbuf.client 4194304	#tcpBufSize
-    tune.rcvbuf.client 4194304	#tcpBufSize
+    # Limit the maximum number of connections per second to 300 (this is ~3x the validator set size)
+    maxconnrate 300
 
-    user nobody
+    # Limit user privileges
+    user haproxy
 
-## TCP port defaults
+## Default settings
 defaults
+    # Enable logging of events and traffic
     log global
+
+    # Set the default mode to TCP
     mode tcp
-    #option tcplog
+
+    # Don't log normal events
     option dontlog-normal
-    log-format "%ci:%cp - %sp[%rt] [%t] %ft %Tw/%Tc/%Tt %B [%ts] %ac/%fc/%bc/%sc/%rc %sq/%bq"
-    maxconn 8192		#Validator network mesh + FN x2
-    retries 3
-    timeout queue 5s  #limits num of concurrent connections. Not clear if t/o connect is needed. #https://www.papertrail.com/solution/tips/haproxy-logging-how-to-tune-timeouts-for-performance/
-    timeout connect 5s
-    # enough for 1 successfull + 5 unsuccessfull HB(10 sec interval) + 20 sec timeout
-    timeout server 80s
-    timeout client 80s
-
-    timeout client-fin 3s #How long to hold an interrupted client connection.
-    timeout server-fin 1s
 
+    # Set timeouts for connections
+    timeout client 60s
+    timeout connect 10s
+    timeout server 60s
+    timeout queue 10s
+
+    # Prevent long-running HTTP requests
+    timeout http-request 60s
+    timeout http-keep-alive 5s
+
+## Specify the public network frontend
 frontend fullnode-fn
     mode tcp
     bind :6182
@@ -41,59 +44,40 @@ frontend fullnode-fn
     # Deny requests from blocked IPs
     tcp-request connection reject if { src -n -f /usr/local/etc/haproxy/blocked.ips }
 
-    # We deem a connection rate high when an IP is attempting to reconnect more than twice a min
-    acl ip_high_conn_rate sc0_conn_rate gt 12
-
-    stick-table type ip size 128K expire 30m store gpc1,conn_rate(1m),bytes_out_cnt	##about 500MB of memory
-    tcp-request connection track-sc0 src 						   #update table with src ip as key, store in sc0
-
-    #We Count rate-limit manualy -- Will be more CPU intensieve but will allow whitelists to enter and up to rateLimitSession non blacklisted IPs.
-    tcp-request connection track-sc1 int(1) table CONN_RATE
-
-    #This connection is silently dropped no reason to count it for rateLimitSession
-    tcp-request connection sc-inc-gpc1(1) unless ip_high_conn_rate
+    # Create TCP request bandwidth limits of 25 MB/s (per TCP stream)
+    filter bwlim-in incoming-limit default-limit 25m default-period 1s
+    filter bwlim-out outgoing-limit default-limit 25m default-period 1s
+    tcp-request content set-bandwidth-limit incoming-limit
+    tcp-request content set-bandwidth-limit outgoing-limit
 
-    # IP rejeceted due to to many unsucsessfull tcp attempts
-    #-1- Enforce connection rate limit
-    tcp-request connection silent-drop if ip_high_conn_rate
-
-    #an IP that had a sucessfull connection.
-    #-2- Allow Whitelist
-    tcp-request connection accept if { sc0_get_gpc1() ge 1 }
-
-    #-3- Enforce RateLimit. Connection attempts by *new* IPs/sec
-    tcp-request connection reject if { sc1_gpc1_rate(CONN_RATE) gt  256 } #rateLimitSession
-
-    # This is a successfull connection i.e., was sent more than 16K bytes in the last 30 min
-    #tcp-request session sc-set-gpt0(0) int(...)  if { sc0_kbytes_out gt 16 }
-    #<2> Mark Whitelist
-    tcp-request session sc-inc-gpc1(0) if { sc0_kbytes_out gt 4 }
+    # Create TCP request bandwidth limits of 50 MB/s (per source IP)
+    filter bwlim-in incoming-src-limit key src table limit-by-src limit 50m
+    filter bwlim-out outgoing-src-limit key src table limit-by-src limit 50m
+    tcp-request content set-bandwidth-limit incoming-src-limit
+    tcp-request content set-bandwidth-limit outgoing-src-limit
 
 
+## Specify the public network backend
 backend fullnode
-    default-server maxconn 128
     server fullnode fullnode:6182
 
-#CONNRATE holds only entry with key 1: used for determening global conn rate
-backend CONN_RATE
-    stick-table type integer size 1 expire 1m store gpc1,gpc1_rate(1s)
-
-##################  HTTP: metrics & API
-defaults
-        retries 3
-        timeout queue 5s  #limits num of concurrent connections. Not clear if t/o connect is needed. #https://www.papertrail.com/solution/tips/haproxy-logging-how-to-tune-timeouts-for-performance/
-        timeout connect 5s
-        timeout server 60s #what makes sense? for silence between nodes?
-        timeout client 60s
-
-        timeout client-fin 3s #How long to hold an interrupted client connection.
-        timeout server-fin 1s
+    # Create TCP response bandwidth limits of 25 MB/s (per TCP stream)
+    filter bwlim-in incoming-limit default-limit 25m default-period 1s
+    filter bwlim-out outgoing-limit default-limit 25m default-period 1s
+    tcp-response content set-bandwidth-limit incoming-limit
+    tcp-response content set-bandwidth-limit outgoing-limit
 
-	timeout http-request 60s #len of http request
-	timeout http-keep-alive 2s
+    # Create TCP response bandwidth limits of 50 MB/s (per source IP)
+    filter bwlim-in incoming-src-limit key src table limit-by-src limit 50m
+    filter bwlim-out outgoing-src-limit key src table limit-by-src limit 50m
+    tcp-response content set-bandwidth-limit incoming-src-limit
+    tcp-response content set-bandwidth-limit outgoing-src-limit
 
-        rate-limit sessions 256
+## Specify the source IP filter backend
+backend limit-by-src
+    stick-table type ip size 1m expire 300s store bytes_out_rate(1s),bytes_in_rate(1s)
 
+## Specify the metrics frontend
 frontend fullnode-metrics
     mode http
     option httplog
@@ -102,13 +86,16 @@ frontend fullnode-metrics
 
     # Deny requests from blocked IPs
     tcp-request connection reject if { src -n -f /usr/local/etc/haproxy/blocked.ips }
+
+    ## Add the forwarded header
     http-request add-header Forwarded "for=%ci"
 
+## Specify the metrics backend
 backend fullnode-metrics
     mode http
-    default-server maxconn 16
     server fullnode fullnode:9101
 
+## Specify the API frontend
 frontend fullnode-api
     mode http
     option httplog
@@ -117,17 +104,19 @@ frontend fullnode-api
 
     # Deny requests from blocked IPs
     tcp-request connection reject if { src -n -f /usr/local/etc/haproxy/blocked.ips }
+
+    ## Add the forwarded header
     http-request add-header Forwarded "for=%ci"
 
+## Specify the API backend
 backend fullnode-api
     mode http
-    default-server maxconn 16
     server fullnode fullnode:8080
 
+## Specify the stats frontend
 frontend stats
     mode http
     bind :9102
-    option http-use-htx
     http-request use-service prometheus-exporter if { path /metrics }
     stats enable
     stats uri /stats
diff --git a/docker/compose/aptos-node/haproxy.cfg b/docker/compose/aptos-node/haproxy.cfg
index cdb7090c5e6a0..3794b569daa52 100644
--- a/docker/compose/aptos-node/haproxy.cfg
+++ b/docker/compose/aptos-node/haproxy.cfg
@@ -1,39 +1,41 @@
+# Config manual: https://www.haproxy.com/documentation/haproxy-configuration-manual/latest/
+
+## Global settings
 global
+    # Specify the stdout log format and size
     log stdout len 10240 format raw local0
 
-    # Config manual: https://cbonte.github.io/haproxy-dconv/2.5/configuration.html
-    # magic values : terraform/helm/aptos-node/values.yaml
-
-    # 256 connections/sec * upgrade_to(30 sec)
-    maxconn 8192
-    # This limits the whole HA Proxy impacting both validators and other frontends
-    # maxconnrate 128
-    nbthread 4
+    # Limit the maximum number of connections to 500 (this is ~5x the validator set size)
+    maxconn 500
 
-    #4MB for client facing sndbuf/rcvbuf. -- 100Mb/s with 300 mili latency (e.g., us-asia)
-    tune.sndbuf.client 4194304	#tcpBufSize
-    tune.rcvbuf.client 4194304	#tcpBufSize
+    # Limit the maximum number of connections per second to 300 (this is ~3x the validator set size)
+    maxconnrate 300
 
-    user nobody
+    # Limit user privileges
+    user haproxy
 
-## TCP port defaults
+## Default settings
 defaults
+    # Enable logging of events and traffic
     log global
+
+    # Set the default mode to TCP
     mode tcp
-    #option tcplog
+
+    # Don't log normal events
     option dontlog-normal
-    log-format "%ci:%cp - %sp[%rt] [%t] %ft %Tw/%Tc/%Tt %B [%ts] %ac/%fc/%bc/%sc/%rc %sq/%bq"
-    maxconn 8192		#Validator network mesh + FN x2
-    retries 3
-    timeout queue 5s  #limits num of concurrent connections. Not clear if t/o connect is needed. #https://www.papertrail.com/solution/tips/haproxy-logging-how-to-tune-timeouts-for-performance/
-    timeout connect 5s
-    # enough for 1 successfull + 5 unsuccessfull HB(10 sec interval) + 20 sec timeout
-    timeout server 80s
-    timeout client 80s
-
-    timeout client-fin 3s #How long to hold an interrupted client connection.
-    timeout server-fin 1s
 
+    # Set timeouts for connections
+    timeout client 60s
+    timeout connect 10s
+    timeout server 60s
+    timeout queue 10s
+
+    # Prevent long-running HTTP requests
+    timeout http-request 60s
+    timeout http-keep-alive 5s
+
+## Specify the validator network frontend
 frontend fe-validator
     bind :6180
     default_backend validator
@@ -41,39 +43,39 @@ frontend fe-validator
     # Deny requests from blocked IPs
     tcp-request connection silent-drop if { src -n -f /usr/local/etc/haproxy/blocked.ips }
 
-    # We deem a connection rate high when an IP is attempting to reconnect more than twice a min
-    acl ip_high_conn_rate sc0_conn_rate gt 12
-
-    stick-table type ip size 128K expire 30m store gpc1,conn_rate(1m),bytes_out_cnt	##about 500MB of memory
-    tcp-request connection track-sc0 src 						   #update table with src ip as key, store in sc0
-
-    #We Count rate-limit manualy -- Will be more CPU intensieve but will allow whitelists to enter and up to rateLimitSession non blacklisted IPs.
-    tcp-request connection track-sc1 int(1) table CONN_RATE
+    # Create TCP request bandwidth limits of 25 MB/s (per TCP stream)
+    filter bwlim-in incoming-limit default-limit 25m default-period 1s
+    filter bwlim-out outgoing-limit default-limit 25m default-period 1s
+    tcp-request content set-bandwidth-limit incoming-limit
+    tcp-request content set-bandwidth-limit outgoing-limit
 
-    #This connection is silently dropped no reason to count it for rateLimitSession
-    tcp-request connection sc-inc-gpc1(1) unless ip_high_conn_rate
+    # Create TCP request bandwidth limits of 50 MB/s (per source IP)
+    filter bwlim-in incoming-src-limit key src table limit-by-src limit 50m
+    filter bwlim-out outgoing-src-limit key src table limit-by-src limit 50m
+    tcp-request content set-bandwidth-limit incoming-src-limit
+    tcp-request content set-bandwidth-limit outgoing-src-limit
 
-    # an IP is rejected due to to many unsucsessfull tcp attempts
-    #-1- Enforce connection rate limit
-    tcp-request connection silent-drop if ip_high_conn_rate
-
-    #an IP that had a sucessfull connection.
-    #-2- Allow Whitelist
-    tcp-request connection accept if { sc0_get_gpc1() ge 1 }
-
-    #-3- Enforce RateLimit. Connection attempts by *new* IPs/sec
-    tcp-request connection reject if { sc1_gpc1_rate(CONN_RATE) gt  256 } #rateLimitSession
+## Specify the validator network backend
+backend validator
+    server validator validator:6180
 
-    # This is a successfull connection i.e., was sent more than 16K bytes in the last 30 min
-    #tcp-request session sc-set-gpt0(0) int(...)  if { sc0_kbytes_out gt 16 }
-    #<2> Mark Whitelist
-    tcp-request session sc-inc-gpc1(0) if { sc0_kbytes_out gt 4 }
+    # Create TCP response bandwidth limits of 25 MB/s (per TCP stream)
+    filter bwlim-in incoming-limit default-limit 25m default-period 1s
+    filter bwlim-out outgoing-limit default-limit 25m default-period 1s
+    tcp-response content set-bandwidth-limit incoming-limit
+    tcp-response content set-bandwidth-limit outgoing-limit
 
+    # Create TCP response bandwidth limits of 50 MB/s (per source IP)
+    filter bwlim-in incoming-src-limit key src table limit-by-src limit 50m
+    filter bwlim-out outgoing-src-limit key src table limit-by-src limit 50m
+    tcp-response content set-bandwidth-limit incoming-src-limit
+    tcp-response content set-bandwidth-limit outgoing-src-limit
 
-backend validator
-    default-server maxconn 8192
-    server validator validator:6180
+## Specify the source IP filter backend
+backend limit-by-src
+    stick-table type ip size 1m expire 300s store bytes_out_rate(1s),bytes_in_rate(1s)
 
+## Specify the VFN network frontend
 frontend fe-fullnode
     bind :6181
     default_backend validator-fn
@@ -81,59 +83,11 @@ frontend fe-fullnode
     # Deny requests from blocked IPs
     tcp-request connection silent-drop if { src -n -f /usr/local/etc/haproxy/blocked.ips }
 
-    acl ip_high_conn_rate sc0_conn_rate gt 12
-
-    stick-table type ip size 128K expire 30m store gpc0,gpc1,conn_rate(1m),bytes_out_cnt	##about 500MB of memory
-    tcp-request connection track-sc0 src 						   #update table with src ip as key, store in sc0
-
-    #We Count rate-limit manualy -- Will be more CPU intensieve but will allow whitelists to enter and up to rateLimitSession non blacklisted IPs.
-    tcp-request connection track-sc1 int(1) table CONN_RATE
-
-    #This connection is silently dropped no reason to count it for rateLimitSession
-    tcp-request connection sc-inc-gpc1(1) unless ip_high_conn_rate
-
-    # an IP is rejected due to to many unsucsessfull tcp attempts
-    #-1- Enforce connection rate limit
-    tcp-request connection silent-drop if ip_high_conn_rate
-
-    #an IP that had a sucessfull connection.
-    #-2- Allow Whitelist
-    tcp-request connection accept if { sc0_get_gpc1() ge 1 }
-
-    #-3- Enforce RateLimit. Connection attempts by *new* IPs/sec
-    tcp-request connection reject if { sc1_gpc1_rate(CONN_RATE) gt  256 } #rateLimitSession
-
-    # This is a successfull connection i.e., was sent more than 16K bytes in the last 30 min
-    #tcp-request session sc-set-gpt0(0) int(...)  if { sc0_kbytes_out gt 16 }
-    #<2> Mark Whitelist
-    tcp-request session sc-inc-gpc1(0) if { sc0_kbytes_out gt 4 }
-
-
+## Specify the VFN network backend
 backend validator-fn
-    default-server maxconn 16
     server validator validator:6181
 
-#CONNRATE holds only entry with key 1: used for determening global conn rate
-backend CONN_RATE
-    stick-table type integer size 1 expire 10m store gpc1,gpc1_rate(1s)
-
-##################  HTTP: metrics & API
-defaults
-	mode http
-        retries 3
-        timeout queue 5s  #limits num of concurrent connections. Not clear if t/o connect is needed. #https://www.papertrail.com/solution/tips/haproxy-logging-how-to-tune-timeouts-for-performance/
-        timeout connect 5s
-        timeout server 60s #what makes sense? for silence between nodes?
-        timeout client 60s
-
-        timeout client-fin 3s #How long to hold an interrupted client connection.
-        timeout server-fin 1s
-
-	timeout http-request 60s #len of http request
-	timeout http-keep-alive 2s
-
-        rate-limit sessions 256
-
+## Specify the metrics frontend
 frontend validator-metrics
     mode http
     option httplog
@@ -142,13 +96,16 @@ frontend validator-metrics
 
     # Deny requests from blocked IPs
     tcp-request connection reject if { src -n -f /usr/local/etc/haproxy/blocked.ips }
+
+    ## Add the forwarded header
     http-request add-header Forwarded "for=%ci"
 
+## Specify the metrics backend
 backend validator-metrics
     mode http
-    default-server maxconn 8
     server validator validator:9101
 
+## Specify the API frontend
 frontend validator-api
     mode http
     option httplog
@@ -157,19 +114,20 @@ frontend validator-api
 
     # Deny requests from blocked IPs
     tcp-request connection reject if { src -n -f /usr/local/etc/haproxy/blocked.ips }
+
+    ## Add the forwarded header
     http-request add-header Forwarded "for=%ci"
 
+## Specify the API backend
 backend validator-api
     mode http
-    default-server maxconn 128
     server validator validator:8080
 
+## Specify the stats frontend
 frontend stats
     mode http
     bind :9102
-    option http-use-htx
     http-request use-service prometheus-exporter if { path /metrics }
     stats enable
     stats uri /stats
     monitor-uri /healthy
-
diff --git a/docker/release-images.mjs b/docker/release-images.mjs
index ce8f743ceb0f4..47c20d07646cc 100755
--- a/docker/release-images.mjs
+++ b/docker/release-images.mjs
@@ -219,11 +219,6 @@ async function main() {
   // dry run
   console.log(`INFO: dry run: ${parsedArgs.DRY_RUN}`);
 
-  // Assert if we have a release version that the version matches the cargo version
-  if (isReleaseImage(parsedArgs.IMAGE_TAG_PREFIX)) {
-    assertTagMatchesSourceVersion(parsedArgs.IMAGE_TAG_PREFIX);
-  }
-
   // get the appropriate release group based on the image tag prefix
   const imageReleaseGroup = getImageReleaseGroupByImageTagPrefix(parsedArgs.IMAGE_TAG_PREFIX);
   console.log(`INFO: image release group: ${imageReleaseGroup}`);
@@ -359,4 +354,4 @@ if (import.meta.jest === undefined) {
   // Because we do this weird import in order to test we also have to resolve imports
   // However we force the caller to actually install pnpm first here
   await lazyImports();
-}
\ No newline at end of file
+}
diff --git a/ecosystem/indexer-grpc/indexer-grpc-data-service/Cargo.toml b/ecosystem/indexer-grpc/indexer-grpc-data-service/Cargo.toml
index c378e10000297..ae70ba89314fe 100644
--- a/ecosystem/indexer-grpc/indexer-grpc-data-service/Cargo.toml
+++ b/ecosystem/indexer-grpc/indexer-grpc-data-service/Cargo.toml
@@ -19,6 +19,7 @@ aptos-indexer-grpc-utils = { workspace = true }
 aptos-metrics-core = { workspace = true }
 aptos-moving-average = { workspace = true }
 aptos-protos = { workspace = true }
+aptos-transaction-filter = { workspace = true }
 async-trait = { workspace = true }
 clap = { workspace = true }
 futures = { workspace = true }
diff --git a/ecosystem/indexer-grpc/indexer-grpc-data-service/src/config.rs b/ecosystem/indexer-grpc/indexer-grpc-data-service/src/config.rs
index 71460c361f1fa..c5f621fcde703 100644
--- a/ecosystem/indexer-grpc/indexer-grpc-data-service/src/config.rs
+++ b/ecosystem/indexer-grpc/indexer-grpc-data-service/src/config.rs
@@ -5,15 +5,17 @@ use crate::service::RawDataServerWrapper;
 use anyhow::{bail, Result};
 use aptos_indexer_grpc_server_framework::RunnableConfig;
 use aptos_indexer_grpc_utils::{
-    compression_util::StorageFormat, config::IndexerGrpcFileStoreConfig, types::RedisUrl,
+    compression_util::StorageFormat, config::IndexerGrpcFileStoreConfig,
+    in_memory_cache::InMemoryCacheConfig, types::RedisUrl,
 };
 use aptos_protos::{
     indexer::v1::FILE_DESCRIPTOR_SET as INDEXER_V1_FILE_DESCRIPTOR_SET,
     transaction::v1::FILE_DESCRIPTOR_SET as TRANSACTION_V1_TESTING_FILE_DESCRIPTOR_SET,
     util::timestamp::FILE_DESCRIPTOR_SET as UTIL_TIMESTAMP_FILE_DESCRIPTOR_SET,
 };
+use aptos_transaction_filter::BooleanTransactionFilter;
 use serde::{Deserialize, Serialize};
-use std::{collections::HashSet, net::SocketAddr, sync::Arc};
+use std::{net::SocketAddr, sync::Arc};
 use tonic::{codec::CompressionEncoding, transport::Server};
 
 pub const SERVER_NAME: &str = "idxdatasvc";
@@ -66,9 +68,20 @@ pub struct IndexerGrpcDataServiceConfig {
     /// Support compressed cache data.
     #[serde(default = "IndexerGrpcDataServiceConfig::default_enable_cache_compression")]
     pub enable_cache_compression: bool,
-    /// Sender addresses to ignore. Transactions from these addresses will not be indexed.
-    #[serde(default = "IndexerGrpcDataServiceConfig::default_sender_addresses_to_ignore")]
-    pub sender_addresses_to_ignore: Vec<String>,
+    #[serde(default)]
+    pub in_memory_cache_config: InMemoryCacheConfig,
+    /// Any transaction that matches this filter will be stripped. This means we remove
+    /// the payload, signature, events, and writesets from it before sending it
+    /// downstream. This should only be used in an emergency situation, e.g. when txns
+    /// related to a certain module are too large and are causing issues for the data
+    /// service. Learn more here:
+    ///
+    /// https://www.notion.so/aptoslabs/Runbook-c006a37259394ac2ba904d6b54d180fa?pvs=4#171c210964ec42a89574fc80154f9e85
+    ///
+    /// Generally you will want to start with this with an OR, and then list out
+    /// separate filters that describe each type of txn we want to strip.
+    #[serde(default = "IndexerGrpcDataServiceConfig::default_txns_to_strip_filter")]
+    pub txns_to_strip_filter: BooleanTransactionFilter,
 }
 
 impl IndexerGrpcDataServiceConfig {
@@ -80,7 +93,8 @@ impl IndexerGrpcDataServiceConfig {
         file_store_config: IndexerGrpcFileStoreConfig,
         redis_read_replica_address: RedisUrl,
         enable_cache_compression: bool,
-        sender_addresses_to_ignore: Vec<String>,
+        in_memory_cache_config: InMemoryCacheConfig,
+        txns_to_strip_filter: BooleanTransactionFilter,
     ) -> Self {
         Self {
             data_service_grpc_tls_config,
@@ -92,7 +106,8 @@ impl IndexerGrpcDataServiceConfig {
             file_store_config,
             redis_read_replica_address,
             enable_cache_compression,
-            sender_addresses_to_ignore,
+            in_memory_cache_config,
+            txns_to_strip_filter,
         }
     }
 
@@ -104,8 +119,9 @@ impl IndexerGrpcDataServiceConfig {
         false
     }
 
-    pub const fn default_sender_addresses_to_ignore() -> Vec<String> {
-        vec![]
+    pub fn default_txns_to_strip_filter() -> BooleanTransactionFilter {
+        // This filter matches no txns.
+        BooleanTransactionFilter::new_or(vec![])
     }
 }
 
@@ -117,6 +133,7 @@ impl RunnableConfig for IndexerGrpcDataServiceConfig {
         {
             bail!("At least one of data_service_grpc_non_tls_config and data_service_grpc_tls_config must be set");
         }
+        self.in_memory_cache_config.validate()?;
         Ok(())
     }
 
@@ -131,7 +148,10 @@ impl RunnableConfig for IndexerGrpcDataServiceConfig {
             .register_encoded_file_descriptor_set(TRANSACTION_V1_TESTING_FILE_DESCRIPTOR_SET)
             .register_encoded_file_descriptor_set(UTIL_TIMESTAMP_FILE_DESCRIPTOR_SET)
             .build()
-            .map_err(|e| anyhow::anyhow!("Failed to build reflection service: {}", e))?;
+            .map_err(|e| anyhow::anyhow!("Failed to build reflection service: {}", e))?
+            .send_compressed(CompressionEncoding::Zstd)
+            .accept_compressed(CompressionEncoding::Zstd)
+            .accept_compressed(CompressionEncoding::Gzip);
 
         let cache_storage_format: StorageFormat = if self.enable_cache_compression {
             StorageFormat::Lz4CompressedProto
@@ -139,33 +159,38 @@ impl RunnableConfig for IndexerGrpcDataServiceConfig {
             StorageFormat::Base64UncompressedProto
         };
 
+        println!(
+            ">>>> Starting Redis connection: {:?}",
+            &self.redis_read_replica_address.0
+        );
         let redis_conn = redis::Client::open(self.redis_read_replica_address.0.clone())?
             .get_tokio_connection_manager()
             .await?;
-
+        println!(">>>> Redis connection established");
         // InMemoryCache.
         let in_memory_cache =
             aptos_indexer_grpc_utils::in_memory_cache::InMemoryCache::new_with_redis_connection(
+                self.in_memory_cache_config.clone(),
                 redis_conn,
                 cache_storage_format,
             )
             .await?;
+        println!(">>>> InMemoryCache established");
         // Add authentication interceptor.
         let server = RawDataServerWrapper::new(
             self.redis_read_replica_address.clone(),
             self.file_store_config.clone(),
             self.data_service_response_channel_size,
-            self.sender_addresses_to_ignore
-                .clone()
-                .into_iter()
-                .collect::<HashSet<_>>(),
+            self.txns_to_strip_filter.clone(),
             cache_storage_format,
             Arc::new(in_memory_cache),
         )?;
         let svc = aptos_protos::indexer::v1::raw_data_server::RawDataServer::new(server)
-            .send_compressed(CompressionEncoding::Gzip)
-            .accept_compressed(CompressionEncoding::Gzip)
-            .accept_compressed(CompressionEncoding::Zstd);
+            .send_compressed(CompressionEncoding::Zstd)
+            .accept_compressed(CompressionEncoding::Zstd)
+            .accept_compressed(CompressionEncoding::Gzip);
+        println!(">>>> Starting gRPC server: {:?}", &svc);
+
         let svc_clone = svc.clone();
         let reflection_service_clone = reflection_service.clone();
 
diff --git a/ecosystem/indexer-grpc/indexer-grpc-data-service/src/metrics.rs b/ecosystem/indexer-grpc/indexer-grpc-data-service/src/metrics.rs
index 75c1b91a84288..4813efda1aed9 100644
--- a/ecosystem/indexer-grpc/indexer-grpc-data-service/src/metrics.rs
+++ b/ecosystem/indexer-grpc/indexer-grpc-data-service/src/metrics.rs
@@ -15,7 +15,13 @@ pub static LATEST_PROCESSED_VERSION_PER_PROCESSOR: Lazy<IntGaugeVec> = Lazy::new
     register_int_gauge_vec!(
         "indexer_grpc_data_service_with_user_latest_processed_version",
         "Latest processed transaction version",
-        &["identifier", "processor"],
+        &[
+            "identifier_type",
+            "identifier",
+            "email",
+            "application_name",
+            "processor"
+        ],
     )
     .unwrap()
 });
@@ -25,7 +31,13 @@ pub static PROCESSED_VERSIONS_COUNT_PER_PROCESSOR: Lazy<IntCounterVec> = Lazy::n
     register_int_counter_vec!(
         "indexer_grpc_data_service_with_user_processed_versions",
         "Number of transactions that have been processed by data service",
-        &["identifier", "processor"],
+        &[
+            "identifier_type",
+            "identifier",
+            "email",
+            "application_name",
+            "processor"
+        ],
     )
     .unwrap()
 });
@@ -45,7 +57,13 @@ pub static PROCESSED_LATENCY_IN_SECS_PER_PROCESSOR: Lazy<GaugeVec> = Lazy::new(|
     register_gauge_vec!(
         "indexer_grpc_data_service_with_user_latest_data_latency_in_secs",
         "Latency of data service based on latest processed transaction",
-        &["identifier", "processor"],
+        &[
+            "identifier_type",
+            "identifier",
+            "email",
+            "application_name",
+            "processor"
+        ],
     )
     .unwrap()
 });
@@ -55,7 +73,13 @@ pub static CONNECTION_COUNT: Lazy<IntCounterVec> = Lazy::new(|| {
     register_int_counter_vec!(
         "indexer_grpc_data_service_connection_count_v2",
         "Count of connections that data service has established",
-        &["identifier", "processor"],
+        &[
+            "identifier_type",
+            "identifier",
+            "email",
+            "application_name",
+            "processor"
+        ],
     )
     .unwrap()
 });
@@ -65,18 +89,76 @@ pub static SHORT_CONNECTION_COUNT: Lazy<IntCounterVec> = Lazy::new(|| {
     register_int_counter_vec!(
         "indexer_grpc_data_service_short_connection_by_user_processor_count",
         "Count of the short connections; i.e., < 10 seconds",
-        &["identifier", "processor"],
+        &[
+            "identifier_type",
+            "identifier",
+            "email",
+            "application_name",
+            "processor"
+        ],
     )
     .unwrap()
 });
 
-/// Count of bytes transfered to the client. This only represents the bytes prepared and ready
-/// to send to the client. It does not represent the bytes actually sent to the client.
+/// Count of bytes transfered to the client. This only represents the bytes prepared and
+/// ready to send to the client. This only t It does not represent the bytes actually
+/// sent to the client.
+///
+/// This is pre stripping, so it may include bytes for transactions that were later
+/// stripped. See BYTES_READY_TO_TRANSFER_FROM_SERVER_AFTER_STRIPPING for post
+/// stirpping.
 pub static BYTES_READY_TO_TRANSFER_FROM_SERVER: Lazy<IntCounterVec> = Lazy::new(|| {
     register_int_counter_vec!(
         "indexer_grpc_data_service_bytes_ready_to_transfer_from_server",
-        "Count of bytes ready to transfer to the client",
-        &["identifier", "processor"],
+        "Count of bytes ready to transfer to the client (pre stripping)",
+        &[
+            "identifier_type",
+            "identifier",
+            "email",
+            "application_name",
+            "processor"
+        ],
+    )
+    .unwrap()
+});
+
+/// Count of bytes transfered to the client. This only represents the bytes prepared and
+/// ready to send to the client. This only t It does not represent the bytes actually
+/// sent to the client.
+///
+/// This is post stripping, meaning some transactions may have been stripped (removing
+/// things such as events, writesets, payload, signature). Compare this with
+/// BYTES_READY_TO_TRANSFER_FROM_SERVER to see how many bytes were stripped.
+pub static BYTES_READY_TO_TRANSFER_FROM_SERVER_AFTER_STRIPPING: Lazy<IntCounterVec> =
+    Lazy::new(|| {
+        register_int_counter_vec!(
+            "indexer_grpc_data_service_bytes_ready_to_transfer_from_server_after_stripping",
+            "Count of bytes ready to transfer to the client (post stripping)",
+            &[
+                "identifier_type",
+                "identifier",
+                "email",
+                "application_name",
+                "processor"
+            ],
+        )
+        .unwrap()
+    });
+
+/// The number of transactions that had data (such as events, writesets, payload,
+/// signature) stripped from them due to the `txns_to_strip_filter`. See
+/// `strip_transactions` for more.
+pub static NUM_TRANSACTIONS_STRIPPED: Lazy<IntCounterVec> = Lazy::new(|| {
+    register_int_counter_vec!(
+        "indexer_grpc_data_service_num_transactions_stripped",
+        "Number of transactions that had data (such as events, writesets, payload, signature) stripped from them",
+        &[
+            "identifier_type",
+            "identifier",
+            "email",
+            "application_name",
+            "processor"
+        ],
     )
     .unwrap()
 });
diff --git a/ecosystem/indexer-grpc/indexer-grpc-data-service/src/service.rs b/ecosystem/indexer-grpc/indexer-grpc-data-service/src/service.rs
index dd18079e4698a..f2faf42408631 100644
--- a/ecosystem/indexer-grpc/indexer-grpc-data-service/src/service.rs
+++ b/ecosystem/indexer-grpc/indexer-grpc-data-service/src/service.rs
@@ -2,8 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::metrics::{
-    BYTES_READY_TO_TRANSFER_FROM_SERVER, CONNECTION_COUNT, ERROR_COUNT,
-    LATEST_PROCESSED_VERSION_PER_PROCESSOR, PROCESSED_LATENCY_IN_SECS_PER_PROCESSOR,
+    BYTES_READY_TO_TRANSFER_FROM_SERVER, BYTES_READY_TO_TRANSFER_FROM_SERVER_AFTER_STRIPPING,
+    CONNECTION_COUNT, ERROR_COUNT, LATEST_PROCESSED_VERSION_PER_PROCESSOR,
+    NUM_TRANSACTIONS_STRIPPED, PROCESSED_LATENCY_IN_SECS_PER_PROCESSOR,
     PROCESSED_VERSIONS_COUNT_PER_PROCESSOR, SHORT_CONNECTION_COUNT,
 };
 use anyhow::{Context, Result};
@@ -14,7 +15,8 @@ use aptos_indexer_grpc_utils::{
     config::IndexerGrpcFileStoreConfig,
     constants::{
         IndexerGrpcRequestMetadata, GRPC_AUTH_TOKEN_HEADER, GRPC_REQUEST_NAME_HEADER,
-        MESSAGE_SIZE_LIMIT,
+        MESSAGE_SIZE_LIMIT, REQUEST_HEADER_APTOS_APPLICATION_NAME, REQUEST_HEADER_APTOS_EMAIL,
+        REQUEST_HEADER_APTOS_IDENTIFIER, REQUEST_HEADER_APTOS_IDENTIFIER_TYPE,
     },
     counters::{log_grpc_step, IndexerGrpcStep, NUM_MULTI_FETCH_OVERLAPPED_VERSIONS},
     file_store_operator::FileStoreOperator,
@@ -27,11 +29,12 @@ use aptos_protos::{
     indexer::v1::{raw_data_server::RawData, GetTransactionsRequest, TransactionsResponse},
     transaction::v1::{transaction::TxnData, Transaction},
 };
+use aptos_transaction_filter::{BooleanTransactionFilter, Filterable};
 use futures::Stream;
 use prost::Message;
 use redis::Client;
 use std::{
-    collections::{HashMap, HashSet},
+    collections::HashMap,
     pin::Pin,
     str::FromStr,
     sync::Arc,
@@ -61,9 +64,6 @@ const RESPONSE_CHANNEL_SEND_TIMEOUT: Duration = Duration::from_secs(120);
 
 const SHORT_CONNECTION_DURATION_IN_SECS: u64 = 10;
 
-/// This comes from API Gateway. The identifier uniquely identifies the requester, which
-/// in the case of indexer-grpc is always an application.
-const REQUEST_HEADER_APTOS_IDENTIFIER: &str = "x-aptos-identifier";
 const RESPONSE_HEADER_APTOS_CONNECTION_ID_HEADER: &str = "x-aptos-connection-id";
 const SERVICE_TYPE: &str = "data_service";
 
@@ -79,17 +79,33 @@ pub struct RawDataServerWrapper {
     pub redis_client: Arc<redis::Client>,
     pub file_store_config: IndexerGrpcFileStoreConfig,
     pub data_service_response_channel_size: usize,
-    pub sender_addresses_to_ignore: HashSet<String>,
+    pub txns_to_strip_filter: BooleanTransactionFilter,
     pub cache_storage_format: StorageFormat,
     in_memory_cache: Arc<InMemoryCache>,
 }
 
+// Exclude in_memory-cache
+impl std::fmt::Debug for RawDataServerWrapper {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("RawDataServerWrapper")
+            .field("redis_client", &"Arc<redis::Client>")
+            .field("file_store_config", &self.file_store_config)
+            .field(
+                "data_service_response_channel_size",
+                &self.data_service_response_channel_size,
+            )
+            .field("txns_to_strip_filter", &self.txns_to_strip_filter)
+            .field("cache_storage_format", &self.cache_storage_format)
+            .finish()
+    }
+}
+
 impl RawDataServerWrapper {
     pub fn new(
         redis_address: RedisUrl,
         file_store_config: IndexerGrpcFileStoreConfig,
         data_service_response_channel_size: usize,
-        sender_addresses_to_ignore: HashSet<String>,
+        txns_to_strip_filter: BooleanTransactionFilter,
         cache_storage_format: StorageFormat,
         in_memory_cache: Arc<InMemoryCache>,
     ) -> anyhow::Result<Self> {
@@ -101,7 +117,7 @@ impl RawDataServerWrapper {
             ),
             file_store_config,
             data_service_response_channel_size,
-            sender_addresses_to_ignore,
+            txns_to_strip_filter,
             cache_storage_format,
             in_memory_cache,
         })
@@ -139,10 +155,7 @@ impl RawData for RawDataServerWrapper {
             _ => return Result::Err(Status::aborted("Invalid request token")),
         };
         CONNECTION_COUNT
-            .with_label_values(&[
-                &request_metadata.request_identifier,
-                &request_metadata.processor_name,
-            ])
+            .with_label_values(&request_metadata.get_label_values())
             .inc();
         let request = req.into_inner();
 
@@ -152,9 +165,12 @@ impl RawData for RawDataServerWrapper {
         let (tx, rx) = channel(self.data_service_response_channel_size);
         let current_version = match &request.starting_version {
             Some(version) => *version,
-            None => {
-                return Result::Err(Status::aborted("Starting version is not set"));
-            },
+            // Live mode if starting version isn't specified
+            None => self
+                .in_memory_cache
+                .latest_version()
+                .await
+                .saturating_sub(1),
         };
 
         let file_store_operator: Box<dyn FileStoreOperator> = self.file_store_config.create();
@@ -177,7 +193,7 @@ impl RawData for RawDataServerWrapper {
         let redis_client = self.redis_client.clone();
         let cache_storage_format = self.cache_storage_format;
         let request_metadata = Arc::new(request_metadata);
-        let sender_addresses_to_ignore = self.sender_addresses_to_ignore.clone();
+        let txns_to_strip_filter = self.txns_to_strip_filter.clone();
         let in_memory_cache = self.in_memory_cache.clone();
         tokio::spawn({
             let request_metadata = request_metadata.clone();
@@ -189,7 +205,7 @@ impl RawData for RawDataServerWrapper {
                     request_metadata,
                     transactions_count,
                     tx,
-                    sender_addresses_to_ignore,
+                    txns_to_strip_filter,
                     current_version,
                     in_memory_cache,
                 )
@@ -377,7 +393,7 @@ async fn data_fetcher_task(
     request_metadata: Arc<IndexerGrpcRequestMetadata>,
     transactions_count: Option<u64>,
     tx: tokio::sync::mpsc::Sender<Result<TransactionsResponse, Status>>,
-    sender_addresses_to_ignore: HashSet<String>,
+    txns_to_strip_filter: BooleanTransactionFilter,
     mut current_version: u64,
     in_memory_cache: Arc<InMemoryCache>,
 ) {
@@ -507,19 +523,27 @@ async fn data_fetcher_task(
             .map(|t| t.encoded_len())
             .sum::<usize>();
         BYTES_READY_TO_TRANSFER_FROM_SERVER
-            .with_label_values(&[
-                &request_metadata.request_identifier,
-                &request_metadata.processor_name,
-            ])
+            .with_label_values(&request_metadata.get_label_values())
             .inc_by(bytes_ready_to_transfer as u64);
         // 2. Push the data to the response channel, i.e. stream the data to the client.
         let current_batch_size = transaction_data.as_slice().len();
         let end_of_batch_version = transaction_data.as_slice().last().unwrap().version;
-        let resp_items = get_transactions_responses_builder(
+        let (resp_items, num_stripped) = get_transactions_responses_builder(
             transaction_data,
             chain_id as u32,
-            &sender_addresses_to_ignore,
+            &txns_to_strip_filter,
         );
+        NUM_TRANSACTIONS_STRIPPED
+            .with_label_values(&request_metadata.get_label_values())
+            .inc_by(num_stripped as u64);
+        let bytes_ready_to_transfer_after_stripping = resp_items
+            .iter()
+            .flat_map(|response| &response.transactions)
+            .map(|t| t.encoded_len())
+            .sum::<usize>();
+        BYTES_READY_TO_TRANSFER_FROM_SERVER_AFTER_STRIPPING
+            .with_label_values(&request_metadata.get_label_values())
+            .inc_by(bytes_ready_to_transfer_after_stripping as u64);
         let data_latency_in_secs = resp_items
             .last()
             .unwrap()
@@ -534,25 +558,16 @@ async fn data_fetcher_task(
             .await
         {
             Ok(_) => {
-                // TODO: Reasses whether this metric useful
+                // TODO: Reasses whether this metric is useful.
                 LATEST_PROCESSED_VERSION_PER_PROCESSOR
-                    .with_label_values(&[
-                        request_metadata.request_identifier.as_str(),
-                        request_metadata.processor_name.as_str(),
-                    ])
+                    .with_label_values(&request_metadata.get_label_values())
                     .set(end_of_batch_version as i64);
                 PROCESSED_VERSIONS_COUNT_PER_PROCESSOR
-                    .with_label_values(&[
-                        request_metadata.request_identifier.as_str(),
-                        request_metadata.processor_name.as_str(),
-                    ])
+                    .with_label_values(&request_metadata.get_label_values())
                     .inc_by(current_batch_size as u64);
                 if let Some(data_latency_in_secs) = data_latency_in_secs {
                     PROCESSED_LATENCY_IN_SECS_PER_PROCESSOR
-                        .with_label_values(&[
-                            request_metadata.request_identifier.as_str(),
-                            request_metadata.processor_name.as_str(),
-                        ])
+                        .with_label_values(&request_metadata.get_label_values())
                         .set(data_latency_in_secs);
                 }
             },
@@ -579,10 +594,7 @@ async fn data_fetcher_task(
     if let Some(start_time) = connection_start_time {
         if start_time.elapsed().as_secs() < SHORT_CONNECTION_DURATION_IN_SECS {
             SHORT_CONNECTION_COUNT
-                .with_label_values(&[
-                    request_metadata.request_identifier.as_str(),
-                    request_metadata.processor_name.as_str(),
-                ])
+                .with_label_values(&request_metadata.get_label_values())
                 .inc();
         }
     }
@@ -614,14 +626,14 @@ fn ensure_sequential_transactions(mut batches: Vec<Vec<Transaction>>) -> Vec<Tra
             // If this batch is fully contained within the previous batch, skip it
             if prev_start <= start_version && prev_end >= end_version {
                 NUM_MULTI_FETCH_OVERLAPPED_VERSIONS
-                    .with_label_values(&[SERVICE_TYPE, &"full"])
+                    .with_label_values(&[SERVICE_TYPE, "full"])
                     .inc_by(end_version - start_version);
                 continue;
             }
             // If this batch overlaps with the previous batch, combine them
             if prev_end >= start_version {
                 NUM_MULTI_FETCH_OVERLAPPED_VERSIONS
-                    .with_label_values(&[SERVICE_TYPE, &"partial"])
+                    .with_label_values(&[SERVICE_TYPE, "partial"])
                     .inc_by(prev_end - start_version + 1);
                 tracing::debug!(
                     batch_first_version = first_version,
@@ -639,7 +651,7 @@ fn ensure_sequential_transactions(mut batches: Vec<Vec<Transaction>>) -> Vec<Tra
             // Otherwise there is a gap
             if prev_end + 1 != start_version {
                 NUM_MULTI_FETCH_OVERLAPPED_VERSIONS
-                    .with_label_values(&[SERVICE_TYPE, &"gap"])
+                    .with_label_values(&[SERVICE_TYPE, "gap"])
                     .inc_by(prev_end - start_version + 1);
 
                 tracing::error!(
@@ -670,22 +682,26 @@ fn ensure_sequential_transactions(mut batches: Vec<Vec<Transaction>>) -> Vec<Tra
     transactions
 }
 
-/// Builds the response for the get transactions request. Partial batch is ok, i.e., a batch with transactions < 1000.
+/// Builds the response for the get transactions request. Partial batch is ok, i.e., a
+/// batch with transactions < 1000.
+///
+/// It also returns the number of txns that were stripped.
 fn get_transactions_responses_builder(
     transactions: Vec<Transaction>,
     chain_id: u32,
-    sender_addresses_to_ignore: &HashSet<String>,
-) -> Vec<TransactionsResponse> {
-    let filtered_transactions =
-        filter_transactions_for_sender_addresses(transactions, sender_addresses_to_ignore);
-    let chunks = chunk_transactions(filtered_transactions, MESSAGE_SIZE_LIMIT);
-    chunks
+    txns_to_strip_filter: &BooleanTransactionFilter,
+) -> (Vec<TransactionsResponse>, usize) {
+    let (stripped_transactions, num_stripped) =
+        strip_transactions(transactions, txns_to_strip_filter);
+    let chunks = chunk_transactions(stripped_transactions, MESSAGE_SIZE_LIMIT);
+    let responses = chunks
         .into_iter()
         .map(|chunk| TransactionsResponse {
             chain_id: Some(chain_id as u64),
             transactions: chunk,
         })
-        .collect()
+        .collect();
+    (responses, num_stripped)
 }
 
 // This is a CPU bound operation, so we spawn_blocking
@@ -845,7 +861,16 @@ fn get_request_metadata(
     req: &Request<GetTransactionsRequest>,
 ) -> tonic::Result<IndexerGrpcRequestMetadata> {
     let request_metadata_pairs = vec![
+        (
+            "request_identifier_type",
+            REQUEST_HEADER_APTOS_IDENTIFIER_TYPE,
+        ),
         ("request_identifier", REQUEST_HEADER_APTOS_IDENTIFIER),
+        ("request_email", REQUEST_HEADER_APTOS_EMAIL),
+        (
+            "request_application_name",
+            REQUEST_HEADER_APTOS_APPLICATION_NAME,
+        ),
         ("request_token", GRPC_AUTH_TOKEN_HEADER),
         ("processor_name", GRPC_REQUEST_NAME_HEADER),
     ];
@@ -945,37 +970,90 @@ async fn channel_send_multiple_with_timeout(
     Ok(())
 }
 
-fn filter_transactions_for_sender_addresses(
+/// This function strips transactions that match the given filter. Stripping means we
+/// remove the payload, signature, events, and writesets. Note, the filter can be
+/// composed of many conditions, see `BooleanTransactionFilter` for more.
+///
+/// This returns the mutated txns and the number of txns that were stripped.
+fn strip_transactions(
     transactions: Vec<Transaction>,
-    sender_addresses_to_ignore: &HashSet<String>,
-) -> Vec<Transaction> {
-    transactions
+    txns_to_strip_filter: &BooleanTransactionFilter,
+) -> (Vec<Transaction>, usize) {
+    let mut stripped_count = 0;
+
+    let stripped_transactions: Vec<Transaction> = transactions
         .into_iter()
         .map(|mut txn| {
-            if let Some(TxnData::User(user_transaction)) = txn.txn_data.as_mut() {
-                if let Some(utr) = user_transaction.request.as_mut() {
-                    if sender_addresses_to_ignore.contains(&utr.sender) {
+            // Note: `is_allowed` means the txn matches the filter, in which case
+            // we strip it.
+            if txns_to_strip_filter.is_allowed(&txn) {
+                stripped_count += 1;
+                if let Some(info) = txn.info.as_mut() {
+                    info.changes = vec![];
+                }
+                if let Some(TxnData::User(user_transaction)) = txn.txn_data.as_mut() {
+                    user_transaction.events = vec![];
+                    if let Some(utr) = user_transaction.request.as_mut() {
                         // Wipe the payload and signature.
                         utr.payload = None;
                         utr.signature = None;
-                        user_transaction.events = vec![];
-                        txn.info.as_mut().unwrap().changes = vec![];
                     }
                 }
             }
             txn
         })
-        .collect()
+        .collect();
+
+    (stripped_transactions, stripped_count)
 }
 
 #[cfg(test)]
 mod tests {
-    use super::{ensure_sequential_transactions, filter_transactions_for_sender_addresses};
+    use super::*;
     use aptos_protos::transaction::v1::{
-        transaction::TxnData, Event, Signature, Transaction, TransactionInfo, TransactionPayload,
+        transaction::TxnData, transaction_payload::Payload, EntryFunctionId, EntryFunctionPayload,
+        Event, MoveModuleId, Signature, Transaction, TransactionInfo, TransactionPayload,
         UserTransaction, UserTransactionRequest, WriteSetChange,
     };
-    use std::collections::HashSet;
+    use aptos_transaction_filter::{
+        boolean_transaction_filter::APIFilter, filters::UserTransactionFilterBuilder,
+        EntryFunctionFilterBuilder, UserTransactionPayloadFilterBuilder,
+    };
+
+    fn create_test_transaction(
+        module_address: String,
+        module_name: String,
+        function_name: String,
+    ) -> Transaction {
+        Transaction {
+            version: 1,
+            txn_data: Some(TxnData::User(UserTransaction {
+                request: Some(UserTransactionRequest {
+                    payload: Some(TransactionPayload {
+                        r#type: 1,
+                        payload: Some(Payload::EntryFunctionPayload(EntryFunctionPayload {
+                            function: Some(EntryFunctionId {
+                                module: Some(MoveModuleId {
+                                    address: module_address,
+                                    name: module_name,
+                                }),
+                                name: function_name,
+                            }),
+                            ..Default::default()
+                        })),
+                    }),
+                    signature: Some(Signature::default()),
+                    ..Default::default()
+                }),
+                events: vec![Event::default()],
+            })),
+            info: Some(TransactionInfo {
+                changes: vec![WriteSetChange::default()],
+                ..Default::default()
+            }),
+            ..Default::default()
+        }
+    }
 
     #[test]
     fn test_ensure_sequential_transactions_merges_and_sorts() {
@@ -1022,8 +1100,12 @@ mod tests {
         assert_eq!(transactions1.last().unwrap().version, 11);
     }
 
+    const MODULE_ADDRESS: &str = "0x1234";
+    const MODULE_NAME: &str = "module";
+    const FUNCTION_NAME: &str = "function";
+
     #[test]
-    fn test_transactions_are_filter_correctly() {
+    fn test_transactions_are_stripped_correctly_sender_addresses() {
         let sender_address = "0x1234".to_string();
         // Create a transaction with a user transaction
         let txn = Transaction {
@@ -1043,12 +1125,148 @@ mod tests {
             }),
             ..Default::default()
         };
-        // create ignore list.
-        let ignore_hash_set: HashSet<String> = vec![sender_address].into_iter().collect();
 
-        let filtered_txn = filter_transactions_for_sender_addresses(vec![txn], &ignore_hash_set);
-        assert_eq!(filtered_txn.len(), 1);
-        let txn = filtered_txn.first().unwrap();
+        // Create filter for senders to ignore.
+        let sender_filters = vec![sender_address]
+            .into_iter()
+            .map(|address| {
+                BooleanTransactionFilter::from(APIFilter::UserTransactionFilter(
+                    UserTransactionFilterBuilder::default()
+                        .sender(address)
+                        .build()
+                        .unwrap(),
+                ))
+            })
+            .collect();
+        let filter = BooleanTransactionFilter::new_or(sender_filters);
+
+        let (filtered_txns, num_stripped) = strip_transactions(vec![txn], &filter);
+        assert_eq!(num_stripped, 1);
+        assert_eq!(filtered_txns.len(), 1);
+        let txn = filtered_txns.first().unwrap();
+        let user_transaction = match &txn.txn_data {
+            Some(TxnData::User(user_transaction)) => user_transaction,
+            _ => panic!("Expected user transaction"),
+        };
+        assert_eq!(user_transaction.request.as_ref().unwrap().payload, None);
+        assert_eq!(user_transaction.request.as_ref().unwrap().signature, None);
+        assert_eq!(user_transaction.events.len(), 0);
+        assert_eq!(txn.info.as_ref().unwrap().changes.len(), 0);
+    }
+
+    #[test]
+    fn test_transactions_are_stripped_correctly_module_address() {
+        let txn = create_test_transaction(
+            MODULE_ADDRESS.to_string(),
+            MODULE_NAME.to_string(),
+            FUNCTION_NAME.to_string(),
+        );
+        // Testing filter with only address set
+        let filter = BooleanTransactionFilter::new_or(vec![BooleanTransactionFilter::from(
+            APIFilter::UserTransactionFilter(
+                UserTransactionFilterBuilder::default()
+                    .payload(
+                        UserTransactionPayloadFilterBuilder::default()
+                            .function(
+                                EntryFunctionFilterBuilder::default()
+                                    .address(MODULE_ADDRESS.to_string())
+                                    .build()
+                                    .unwrap(),
+                            )
+                            .build()
+                            .unwrap(),
+                    )
+                    .build()
+                    .unwrap(),
+            ),
+        )]);
+
+        let (filtered_txns, num_stripped) = strip_transactions(vec![txn.clone()], &filter);
+        assert_eq!(num_stripped, 1);
+        assert_eq!(filtered_txns.len(), 1);
+        let txn = filtered_txns.first().unwrap();
+        let user_transaction = match &txn.txn_data {
+            Some(TxnData::User(user_transaction)) => user_transaction,
+            _ => panic!("Expected user transaction"),
+        };
+        assert_eq!(user_transaction.request.as_ref().unwrap().payload, None);
+        assert_eq!(user_transaction.request.as_ref().unwrap().signature, None);
+        assert_eq!(user_transaction.events.len(), 0);
+        assert_eq!(txn.info.as_ref().unwrap().changes.len(), 0);
+    }
+
+    #[test]
+    fn test_transactions_are_stripped_correctly_module_name() {
+        let txn = create_test_transaction(
+            MODULE_ADDRESS.to_string(),
+            MODULE_NAME.to_string(),
+            FUNCTION_NAME.to_string(),
+        );
+        // Testing filter with only module set
+        let filter = BooleanTransactionFilter::new_or(vec![BooleanTransactionFilter::from(
+            APIFilter::UserTransactionFilter(
+                UserTransactionFilterBuilder::default()
+                    .payload(
+                        UserTransactionPayloadFilterBuilder::default()
+                            .function(
+                                EntryFunctionFilterBuilder::default()
+                                    .module(MODULE_NAME.to_string())
+                                    .build()
+                                    .unwrap(),
+                            )
+                            .build()
+                            .unwrap(),
+                    )
+                    .build()
+                    .unwrap(),
+            ),
+        )]);
+
+        let (filtered_txns, num_stripped) = strip_transactions(vec![txn.clone()], &filter);
+        assert_eq!(num_stripped, 1);
+        assert_eq!(filtered_txns.len(), 1);
+        let txn = filtered_txns.first().unwrap();
+        let user_transaction = match &txn.txn_data {
+            Some(TxnData::User(user_transaction)) => user_transaction,
+            _ => panic!("Expected user transaction"),
+        };
+        assert_eq!(user_transaction.request.as_ref().unwrap().payload, None);
+        assert_eq!(user_transaction.request.as_ref().unwrap().signature, None);
+        assert_eq!(user_transaction.events.len(), 0);
+        assert_eq!(txn.info.as_ref().unwrap().changes.len(), 0);
+    }
+
+    #[test]
+    fn test_transactions_are_stripped_correctly_function_name() {
+        let txn = create_test_transaction(
+            MODULE_ADDRESS.to_string(),
+            MODULE_NAME.to_string(),
+            FUNCTION_NAME.to_string(),
+        );
+        // Testing filter with only function set
+        let filter = BooleanTransactionFilter::new_or(vec![BooleanTransactionFilter::from(
+            APIFilter::UserTransactionFilter(
+                UserTransactionFilterBuilder::default()
+                    .payload(
+                        UserTransactionPayloadFilterBuilder::default()
+                            .function(
+                                EntryFunctionFilterBuilder::default()
+                                    .function(FUNCTION_NAME.to_string())
+                                    .build()
+                                    .unwrap(),
+                            )
+                            .build()
+                            .unwrap(),
+                    )
+                    .build()
+                    .unwrap(),
+            ),
+        )]);
+
+        let (filtered_txns, num_stripped) = strip_transactions(vec![txn.clone()], &filter);
+        assert_eq!(num_stripped, 1);
+        assert_eq!(filtered_txns.len(), 1);
+        let txn = filtered_txns.first().unwrap();
         let user_transaction = match &txn.txn_data {
             Some(TxnData::User(user_transaction)) => user_transaction,
             _ => panic!("Expected user transaction"),
@@ -1058,4 +1276,44 @@ mod tests {
         assert_eq!(user_transaction.events.len(), 0);
         assert_eq!(txn.info.as_ref().unwrap().changes.len(), 0);
     }
+    #[test]
+    fn test_transactions_are_not_stripped() {
+        let txn = create_test_transaction(
+            MODULE_ADDRESS.to_string(),
+            MODULE_NAME.to_string(),
+            FUNCTION_NAME.to_string(),
+        );
+        // Testing filter with wrong filter
+        let filter = BooleanTransactionFilter::new_or(vec![BooleanTransactionFilter::from(
+            APIFilter::UserTransactionFilter(
+                UserTransactionFilterBuilder::default()
+                    .payload(
+                        UserTransactionPayloadFilterBuilder::default()
+                            .function(
+                                EntryFunctionFilterBuilder::default()
+                                    .function("0xrandom".to_string())
+                                    .build()
+                                    .unwrap(),
+                            )
+                            .build()
+                            .unwrap(),
+                    )
+                    .build()
+                    .unwrap(),
+            ),
+        )]);
+
+        let (filtered_txns, num_stripped) = strip_transactions(vec![txn.clone()], &filter);
+        assert_eq!(num_stripped, 0);
+        assert_eq!(filtered_txns.len(), 1);
+        let txn = filtered_txns.first().unwrap();
+        let user_transaction = match &txn.txn_data {
+            Some(TxnData::User(user_transaction)) => user_transaction,
+            _ => panic!("Expected user transaction"),
+        };
+        assert_ne!(user_transaction.request.as_ref().unwrap().payload, None);
+        assert_ne!(user_transaction.request.as_ref().unwrap().signature, None);
+        assert_ne!(user_transaction.events.len(), 0);
+        assert_ne!(txn.info.as_ref().unwrap().changes.len(), 0);
+    }
 }
diff --git a/ecosystem/indexer-grpc/indexer-grpc-file-store-backfiller/Cargo.toml b/ecosystem/indexer-grpc/indexer-grpc-file-store-backfiller/Cargo.toml
new file mode 100644
index 0000000000000..399ddb7c3f074
--- /dev/null
+++ b/ecosystem/indexer-grpc/indexer-grpc-file-store-backfiller/Cargo.toml
@@ -0,0 +1,31 @@
+[package]
+name = "aptos-indexer-grpc-file-store-backfiller"
+description = "Indexer gRPC file store backfiller from fullnode."
+version = "1.0.0"
+
+# Workspace inherited keys
+authors = { workspace = true }
+edition = { workspace = true }
+homepage = { workspace = true }
+license = { workspace = true }
+publish = { workspace = true }
+repository = { workspace = true }
+rust-version = { workspace = true }
+
+[dependencies]
+anyhow = { workspace = true }
+aptos-indexer-grpc-server-framework = { workspace = true }
+aptos-indexer-grpc-utils = { workspace = true }
+aptos-protos = { workspace = true }
+async-trait = { workspace = true }
+clap = { workspace = true }
+futures = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+tokio = { workspace = true }
+tonic = { workspace = true }
+tracing = { workspace = true }
+url = { workspace = true }
+
+[target.'cfg(unix)'.dependencies]
+jemallocator = { workspace = true }
diff --git a/ecosystem/indexer-grpc/indexer-grpc-file-store-backfiller/README.md b/ecosystem/indexer-grpc/indexer-grpc-file-store-backfiller/README.md
new file mode 100644
index 0000000000000..3a642b6c82342
--- /dev/null
+++ b/ecosystem/indexer-grpc/indexer-grpc-file-store-backfiller/README.md
@@ -0,0 +1,35 @@
+# Indexer GRPC file store
+
+File store backfiller.
+
+# Why you need a backfiller?
+
+In rare case, upstream changes that don't reflect in proto schema require backfill.
+To mitigate the issue, you need a backfiller to reply transactions against the new proto
+schema so that the changes can surface up. 
+
+## Prerequisite
+
+* A running archival fullnode with `index` enabled. You can check more from [here](https://aptos.dev/en/network/nodes/configure/state-sync#archival-pfns) and [fullnode config](https://github.com/aptos-labs/aptos-core/tree/main/ecosystem/indexer-grpc/indexer-grpc-fullnode).
+
+
+## How to run it.
+
+Example of config: 
+
+```
+health_check_port: 8081
+    server_config:
+      fullnode_grpc_address: >-
+        http://your.node.address:50051
+      file_store_config:
+        file_store_type: GcsFileStore
+        gcs_file_store_bucket_name: your-gcs-bucket-name
+        gcs_file_store_service_account_key_path: /secrets/your-service-account-key
+        enable_compression: true
+      progress_file_path: /path-to-file/progress_tracker.json
+      chain_id: 2
+      starting_version: 0
+      transactions_count: 100000000
+      enable_cache_compression: true
+```
diff --git a/ecosystem/indexer-grpc/indexer-grpc-file-store-backfiller/src/lib.rs b/ecosystem/indexer-grpc/indexer-grpc-file-store-backfiller/src/lib.rs
new file mode 100644
index 0000000000000..b7d82cec7d5e6
--- /dev/null
+++ b/ecosystem/indexer-grpc/indexer-grpc-file-store-backfiller/src/lib.rs
@@ -0,0 +1,76 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod processor;
+
+use anyhow::Result;
+use aptos_indexer_grpc_server_framework::RunnableConfig;
+use aptos_indexer_grpc_utils::config::IndexerGrpcFileStoreConfig;
+use processor::Processor;
+use serde::{Deserialize, Serialize};
+use url::Url;
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+#[serde(deny_unknown_fields)]
+pub struct IndexerGrpcFileStoreBackfillerConfig {
+    pub file_store_config: IndexerGrpcFileStoreConfig,
+    pub fullnode_grpc_address: Url,
+    pub progress_file_path: String,
+    pub enable_expensive_logging: Option<bool>,
+    pub chain_id: u64,
+    #[serde(default = "default_enable_cache_compression")]
+    pub enable_cache_compression: bool,
+    pub starting_version: Option<u64>,
+    pub transactions_count: Option<u64>,
+    #[serde(default = "default_validation_mode")]
+    pub validation_mode: bool,
+    #[serde(default = "default_backfill_processing_task_count")]
+    pub backfill_processing_task_count: usize,
+    #[serde(default = "default_validating_task_count")]
+    pub validating_task_count: usize,
+}
+
+const fn default_enable_cache_compression() -> bool {
+    true
+}
+
+const fn default_validation_mode() -> bool {
+    false
+}
+
+const fn default_backfill_processing_task_count() -> usize {
+    20
+}
+
+const fn default_validating_task_count() -> usize {
+    50
+}
+
+#[async_trait::async_trait]
+impl RunnableConfig for IndexerGrpcFileStoreBackfillerConfig {
+    async fn run(&self) -> Result<()> {
+        let mut processor = Processor::new(
+            self.fullnode_grpc_address.clone(),
+            self.file_store_config.clone(),
+            self.chain_id,
+            self.enable_cache_compression,
+            self.progress_file_path.clone(),
+            self.starting_version,
+            self.transactions_count,
+            self.validation_mode,
+            self.backfill_processing_task_count,
+            self.validating_task_count,
+        )
+        .await
+        .expect("Failed to create file store processor");
+        processor
+            .run()
+            .await
+            .expect("File store processor exited unexpectedly");
+        Ok(())
+    }
+
+    fn get_server_name(&self) -> String {
+        "idxfilestore".to_string()
+    }
+}
diff --git a/ecosystem/indexer-grpc/indexer-grpc-file-store-backfiller/src/main.rs b/ecosystem/indexer-grpc/indexer-grpc-file-store-backfiller/src/main.rs
new file mode 100644
index 0000000000000..95d85c3546c13
--- /dev/null
+++ b/ecosystem/indexer-grpc/indexer-grpc-file-store-backfiller/src/main.rs
@@ -0,0 +1,20 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use anyhow::Result;
+use aptos_indexer_grpc_file_store_backfiller::IndexerGrpcFileStoreBackfillerConfig;
+use aptos_indexer_grpc_server_framework::ServerArgs;
+use clap::Parser;
+
+#[cfg(unix)]
+#[global_allocator]
+static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;
+
+#[tokio::main]
+async fn main() -> Result<()> {
+    let args = ServerArgs::parse();
+    args.run::<IndexerGrpcFileStoreBackfillerConfig>()
+        .await
+        .expect("Failed to run server");
+    Ok(())
+}
diff --git a/ecosystem/indexer-grpc/indexer-grpc-file-store-backfiller/src/processor.rs b/ecosystem/indexer-grpc/indexer-grpc-file-store-backfiller/src/processor.rs
new file mode 100644
index 0000000000000..823046d28d83d
--- /dev/null
+++ b/ecosystem/indexer-grpc/indexer-grpc-file-store-backfiller/src/processor.rs
@@ -0,0 +1,387 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use anyhow::{ensure, Context, Result};
+use aptos_indexer_grpc_utils::{
+    compression_util::StorageFormat, config::IndexerGrpcFileStoreConfig, create_grpc_client,
+    file_store_operator::FileStoreOperator,
+};
+use aptos_protos::{
+    internal::fullnode::v1::{
+        stream_status::StatusType, transactions_from_node_response::Response,
+        GetTransactionsFromNodeRequest, TransactionsFromNodeResponse,
+    },
+    transaction::v1::Transaction,
+};
+use futures::StreamExt;
+use serde::{Deserialize, Serialize};
+use std::{
+    collections::{BTreeMap, BTreeSet},
+    process::exit,
+    sync::Arc,
+    time::Duration,
+};
+use tokio::sync::Mutex;
+
+/// Processor tails the data in cache and stores the data in file store.
+pub struct Processor {
+    file_store_operator: Box<dyn FileStoreOperator>,
+    chain_id: u64,
+    grpc_stream: Option<tonic::Streaming<TransactionsFromNodeResponse>>,
+    starting_version: u64,
+    progress_file_path: String,
+    ending_version: Option<u64>,
+    validation_mode: bool,
+    backfill_processing_task_count: usize,
+    validating_task_count: usize,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct ProgressFile {
+    version: u64,
+}
+
+impl Processor {
+    pub async fn new(
+        fullnode_grpc_address: url::Url,
+        file_store_config: IndexerGrpcFileStoreConfig,
+        chain_id: u64,
+        enable_cache_compression: bool,
+        progress_file_path: String,
+        starting_version: Option<u64>,
+        transactions_count: Option<u64>,
+        validation_mode: bool,
+        backfill_processing_task_count: usize,
+        validating_task_count: usize,
+    ) -> Result<Self> {
+        let _cache_storage_format = if enable_cache_compression {
+            StorageFormat::Lz4CompressedProto
+        } else {
+            StorageFormat::Base64UncompressedProto
+        };
+        if validation_mode {
+            return Ok(Self {
+                file_store_operator: file_store_config.create(),
+                chain_id,
+                grpc_stream: None,
+                starting_version: starting_version.unwrap_or(0),
+                progress_file_path,
+                ending_version: transactions_count.map(|c| starting_version.unwrap_or(0) + c),
+                validation_mode,
+                backfill_processing_task_count,
+                validating_task_count,
+            });
+        }
+
+        let starting_version = starting_version.unwrap_or(0);
+        let expected_end_version = transactions_count.map(|c| starting_version + c);
+        // Resume from the progress file if the file exists. If not, create an empty one.
+        let progress_file: ProgressFile = match std::fs::read(&progress_file_path) {
+            Ok(bytes) => serde_json::from_slice(&bytes).context("Failed to parse progress file")?,
+            Err(_) => {
+                let progress_file = ProgressFile {
+                    version: starting_version,
+                };
+                let bytes = serde_json::to_vec(&progress_file)
+                    .context("Failed to serialize progress file")?;
+                std::fs::write(&progress_file_path, bytes)
+                    .context("Failed to write progress file")?;
+                progress_file
+            },
+        };
+        let expected_starting_version = std::cmp::max(starting_version, progress_file.version);
+        tracing::info!(
+            starting_version = expected_starting_version,
+            "Starting backfill.",
+        );
+        if let Some(expected_end_version) = expected_end_version {
+            if expected_starting_version >= expected_end_version {
+                tracing::info!("Backfill is already done.");
+                // Backfill is already done.
+                exit(0);
+            }
+        }
+
+        // Create a grpc client to the fullnode.
+        let mut grpc_client = create_grpc_client(fullnode_grpc_address.clone()).await;
+        let request = tonic::Request::new(GetTransactionsFromNodeRequest {
+            starting_version: Some(expected_starting_version),
+            transactions_count,
+        });
+        let stream = grpc_client
+            .get_transactions_from_node(request)
+            .await?
+            .into_inner();
+        let file_store_operator: Box<dyn FileStoreOperator> = file_store_config.create();
+        file_store_operator.verify_storage_bucket_existence().await;
+        // Metadata is guaranteed to exist now
+        let metadata = file_store_operator.get_file_store_metadata().await.unwrap();
+        ensure!(metadata.chain_id == chain_id, "Chain ID mismatch.");
+        Ok(Self {
+            file_store_operator,
+            chain_id,
+            grpc_stream: Some(stream),
+            starting_version: expected_starting_version,
+            progress_file_path,
+            ending_version: expected_end_version,
+            validation_mode,
+            backfill_processing_task_count,
+            validating_task_count,
+        })
+    }
+
+    pub async fn run(&mut self) -> Result<()> {
+        if self.validation_mode {
+            self.validate().await?;
+        } else {
+            self.backfill().await?;
+        }
+        Ok(())
+    }
+
+    pub async fn backfill(&mut self) -> Result<()> {
+        let (sender, receiver) = tokio::sync::mpsc::channel::<Vec<Transaction>>(1000);
+        // Get the stream out.
+        // This is required, since the batch returned by the stream is not guaranteed to be 1000.
+        let mut transactions_buffer = BTreeMap::new();
+        let mut next_version_to_process = self.starting_version;
+        // TODO: Use a more efficient data structure, like channel to manage the processed versions.
+        let finished_starting_versions = Arc::new(Mutex::new(BTreeSet::new()));
+        let chain_id = self.chain_id;
+        let ending_version = self.ending_version;
+
+        let mut grpc_stream = self.grpc_stream.take().expect("Stream is not initialized.");
+        let init_frame = grpc_stream
+            .next()
+            .await
+            .expect("Failed to get the first frame")?
+            .response
+            .unwrap();
+        match init_frame {
+            Response::Status(signal) => {
+                if signal.r#type() != StatusType::Init {
+                    anyhow::bail!("Unexpected status signal type");
+                }
+            },
+            _ => {
+                anyhow::bail!("Unexpected response type");
+            },
+        }
+        let mut tasks = Vec::new();
+        let receiver_ref = std::sync::Arc::new(Mutex::new(receiver));
+        let file_store_operator = self.file_store_operator.clone_box();
+        for _ in 0..self.backfill_processing_task_count {
+            tracing::info!("Creating a new task");
+            let mut current_file_store_operator = file_store_operator.clone_box();
+            let current_finished_starting_versions = finished_starting_versions.clone();
+            let receiver_ref = receiver_ref.clone();
+            let task = tokio::spawn(async move {
+                tracing::info!("Task started");
+                loop {
+                    let transactions = {
+                        let mut receiver = receiver_ref.lock().await;
+                        // Connection may end.
+                        let transactions = match receiver.recv().await {
+                            Some(transactions) => transactions,
+                            None => return Ok(()),
+                        };
+                        // Data quality check.
+                        ensure!(transactions.len() == 1000, "Unexpected transaction count");
+                        ensure!(
+                            transactions[0].version % 1000 == 0,
+                            "Unexpected starting version"
+                        );
+                        for (ide, t) in transactions.iter().enumerate() {
+                            ensure!(
+                                t.version == transactions[0].version + ide as u64,
+                                "Unexpected version"
+                            );
+                        }
+                        transactions
+                    };
+                    let starting_version = transactions[0].version;
+                    // If uploading failure, crash the process and let k8s restart it.
+                    current_file_store_operator
+                        .upload_transaction_batch(chain_id, transactions)
+                        .await
+                        .unwrap();
+                    {
+                        let mut finished_starting_versions =
+                            current_finished_starting_versions.lock().await;
+                        finished_starting_versions.insert(starting_version);
+                    }
+                }
+            });
+            tasks.push(task);
+        }
+        let progress_file_path = self.progress_file_path.clone();
+        let task = tokio::spawn(async move {
+            loop {
+                tokio::time::sleep(Duration::from_millis(5000)).await;
+                {
+                    {
+                        let mut finished_starting_versions =
+                            finished_starting_versions.lock().await;
+                        let mut need_to_update = false;
+                        loop {
+                            if finished_starting_versions.contains(&next_version_to_process) {
+                                finished_starting_versions.remove(&next_version_to_process);
+                                next_version_to_process += 1000;
+                                need_to_update = true;
+                            } else {
+                                break;
+                            }
+                        }
+                        if !need_to_update {
+                            continue;
+                        }
+                    }
+                    // Update the progress file.
+                    let progress_file = ProgressFile {
+                        version: next_version_to_process,
+                    };
+                    let bytes = serde_json::to_vec(&progress_file)
+                        .context("Failed to serialize progress file")?;
+                    std::fs::write(&progress_file_path, &bytes)
+                        .context("Failed to write progress file")?;
+                    tracing::info!(
+                        "Progress file updated to version {}",
+                        next_version_to_process
+                    );
+                    if let Some(ending_version) = ending_version {
+                        if ending_version <= next_version_to_process {
+                            // Backfill is done.
+                            std::process::exit(0);
+                        }
+                    }
+                }
+            }
+        });
+        tasks.push(task);
+
+        // Clone the sender to extend its lifetime.
+        let sender = sender.clone();
+        // Start the stream.
+        loop {
+            let item = grpc_stream.next().await;
+            let item = item.unwrap();
+            let response = match item {
+                Ok(response) => response,
+                Err(e) => {
+                    tracing::error!("Failed to get response: {:?}", e);
+                    panic!("Failed to get response: {:?}", e);
+                },
+            };
+
+            let resp = response.response.unwrap();
+            match resp {
+                Response::Data(txns) => {
+                    let transactions = txns.transactions;
+                    for txn in transactions {
+                        let version = txn.version;
+                        // Partial batch may be received; split and insert into buffer.
+                        transactions_buffer.insert(version, txn);
+                    }
+                },
+                Response::Status(signal) => {
+                    if signal.r#type() != StatusType::BatchEnd {
+                        anyhow::bail!("Unexpected status signal type");
+                    }
+                    while transactions_buffer.len() >= 1000 {
+                        // Take the first 1000 transactions.
+                        let mut transactions = Vec::new();
+                        // Pop the first 1000 transactions from buffer.
+                        for _ in 0..1000 {
+                            let (_, txn) = transactions_buffer.pop_first().unwrap();
+                            transactions.push(txn);
+                        }
+                        sender.send(transactions).await?;
+                    }
+                },
+            }
+        }
+    }
+
+    pub async fn validate(&mut self) -> Result<()> {
+        let progress_file = {
+            let bytes =
+                std::fs::read(&self.progress_file_path).context("Failed to read progress file");
+            match bytes {
+                Ok(bytes) => {
+                    serde_json::from_slice(&bytes).context("Failed to parse progress file")?
+                },
+                _ => ProgressFile { version: 0 },
+            }
+        };
+        let start_version = std::cmp::max(self.starting_version, progress_file.version);
+        let mut current_version = start_version;
+        let expected_end_version = self.ending_version.unwrap();
+        if start_version >= expected_end_version {
+            // Validation is already done.
+            exit(0);
+        }
+        let version_allocator = Arc::new(Mutex::new(start_version));
+        let gap_detector = Arc::new(Mutex::new(BTreeSet::new()));
+        let mut tasks = Vec::new();
+
+        for _ in 0..self.validating_task_count {
+            let version_allocator = version_allocator.clone();
+            let gap_detector = gap_detector.clone();
+            let file_operator = self.file_store_operator.clone_box();
+
+            let task = tokio::spawn(async move {
+                loop {
+                    let version = {
+                        let mut version_allocator = version_allocator.lock().await;
+                        let version = *version_allocator;
+                        if version >= expected_end_version {
+                            return Ok(());
+                        }
+                        *version_allocator += 1000;
+                        version
+                    };
+                    let transactions = file_operator.get_transactions(version, 1).await.unwrap();
+                    for (idx, t) in transactions.iter().enumerate() {
+                        ensure!(t.version == version + idx as u64, "Unexpected version");
+                    }
+
+                    let mut gap_detector = gap_detector.lock().await;
+                    gap_detector.insert(version);
+                }
+            });
+            tasks.push(task);
+        }
+        let progress_file_path = self.progress_file_path.clone();
+        // Check the gap detector and update the progress file.
+        let task = tokio::spawn(async move {
+            loop {
+                tokio::time::sleep(Duration::from_millis(5000)).await;
+                loop {
+                    if current_version >= expected_end_version {
+                        return Ok(());
+                    }
+                    let mut gap_detector = gap_detector.lock().await;
+                    if gap_detector.contains(&current_version) {
+                        gap_detector.remove(&current_version);
+                        current_version += 1000;
+                    } else {
+                        break;
+                    }
+                }
+                let progress_file = ProgressFile {
+                    version: current_version,
+                };
+                let bytes = serde_json::to_vec(&progress_file)
+                    .context("Failed to serialize progress file")?;
+                std::fs::write(&progress_file_path, &bytes).context("io error")?;
+            }
+        });
+        tasks.push(task);
+        // join all tasks
+        for task in tasks {
+            task.await??;
+        }
+
+        Ok(())
+    }
+}
diff --git a/ecosystem/indexer-grpc/indexer-grpc-fullnode/Cargo.toml b/ecosystem/indexer-grpc/indexer-grpc-fullnode/Cargo.toml
index 15aacecc24094..99587b126974d 100644
--- a/ecosystem/indexer-grpc/indexer-grpc-fullnode/Cargo.toml
+++ b/ecosystem/indexer-grpc/indexer-grpc-fullnode/Cargo.toml
@@ -33,7 +33,6 @@ aptos-api = { workspace = true }
 aptos-api-types = { workspace = true }
 aptos-bitvec = { workspace = true }
 aptos-config = { workspace = true }
-aptos-db-indexer = { workspace = true }
 aptos-indexer-grpc-utils = { workspace = true }
 aptos-logger = { workspace = true }
 aptos-mempool = { workspace = true }
diff --git a/ecosystem/indexer-grpc/indexer-grpc-fullnode/src/convert.rs b/ecosystem/indexer-grpc/indexer-grpc-fullnode/src/convert.rs
index 5c2a2e157b624..893933e2354c0 100644
--- a/ecosystem/indexer-grpc/indexer-grpc-fullnode/src/convert.rs
+++ b/ecosystem/indexer-grpc/indexer-grpc-fullnode/src/convert.rs
@@ -2,23 +2,29 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use aptos_api_types::{
-    AccountSignature, DeleteModule, DeleteResource, Ed25519Signature, EntryFunctionId,
-    EntryFunctionPayload, Event, GenesisPayload, MoveAbility, MoveFunction,
-    MoveFunctionGenericTypeParam, MoveFunctionVisibility, MoveModule, MoveModuleBytecode,
-    MoveModuleId, MoveScriptBytecode, MoveStruct, MoveStructField, MoveStructTag, MoveType,
-    MultiEd25519Signature, MultiKeySignature, MultisigPayload, MultisigTransactionPayload,
-    PublicKey, ScriptPayload, Signature, SingleKeySignature, Transaction, TransactionInfo,
-    TransactionPayload, TransactionSignature, WriteSet, WriteSetChange,
+    transaction::ValidatorTransaction as ApiValidatorTransactionEnum, AccountSignature,
+    DeleteModule, DeleteResource, Ed25519Signature, EntryFunctionId, EntryFunctionPayload, Event,
+    GenesisPayload, MoveAbility, MoveFunction, MoveFunctionGenericTypeParam,
+    MoveFunctionVisibility, MoveModule, MoveModuleBytecode, MoveModuleId, MoveScriptBytecode,
+    MoveStruct, MoveStructField, MoveStructTag, MoveType, MultiEd25519Signature, MultiKeySignature,
+    MultisigPayload, MultisigTransactionPayload, PublicKey, ScriptPayload, Signature,
+    SingleKeySignature, Transaction, TransactionInfo, TransactionPayload, TransactionSignature,
+    WriteSet, WriteSetChange,
 };
 use aptos_bitvec::BitVec;
 use aptos_logger::warn;
 use aptos_protos::{
-    transaction::{
-        v1 as transaction,
-        v1::{any_signature, Ed25519, Keyless, Secp256k1Ecdsa, TransactionSizeInfo, WebAuthn},
+    transaction::v1::{
+        self as transaction, any_signature, validator_transaction,
+        validator_transaction::observed_jwk_update::exported_provider_jw_ks::{
+            jwk::{JwkType, Rsa, UnsupportedJwk},
+            Jwk as ProtoJwk,
+        },
+        Ed25519, Keyless, Secp256k1Ecdsa, TransactionSizeInfo, WebAuthn,
     },
     util::timestamp,
 };
+use aptos_types::jwks::jwk::JWK;
 use hex;
 use move_binary_format::file_format::Ability;
 use std::time::Duration;
@@ -50,6 +56,7 @@ pub fn convert_move_struct(move_struct: &MoveStruct) -> transaction::MoveStruct
     transaction::MoveStruct {
         name: move_struct.name.0.to_string(),
         is_native: move_struct.is_native,
+        is_event: move_struct.is_event,
         abilities: move_struct
             .abilities
             .iter()
@@ -581,32 +588,32 @@ fn convert_signature(signature: &Signature) -> transaction::AnySignature {
     match signature {
         Signature::Ed25519(s) => transaction::AnySignature {
             r#type: transaction::any_signature::Type::Ed25519 as i32,
-            signature: s.0.clone(),
+            signature: s.value.clone().into(),
             signature_variant: Some(any_signature::SignatureVariant::Ed25519(Ed25519 {
-                signature: s.0.clone(),
+                signature: s.value.clone().into(),
             })),
         },
         Signature::Secp256k1Ecdsa(s) => transaction::AnySignature {
             r#type: transaction::any_signature::Type::Secp256k1Ecdsa as i32,
-            signature: s.0.clone(),
+            signature: s.value.clone().into(),
             signature_variant: Some(any_signature::SignatureVariant::Secp256k1Ecdsa(
                 Secp256k1Ecdsa {
-                    signature: s.0.clone(),
+                    signature: s.value.clone().into(),
                 },
             )),
         },
         Signature::WebAuthn(s) => transaction::AnySignature {
             r#type: transaction::any_signature::Type::Webauthn as i32,
-            signature: s.0.clone(),
+            signature: s.value.clone().into(),
             signature_variant: Some(any_signature::SignatureVariant::Webauthn(WebAuthn {
-                signature: s.0.clone(),
+                signature: s.value.clone().into(),
             })),
         },
         Signature::Keyless(s) => transaction::AnySignature {
             r#type: transaction::any_signature::Type::Keyless as i32,
-            signature: s.0.clone(),
+            signature: s.value.clone().into(),
             signature_variant: Some(any_signature::SignatureVariant::Keyless(Keyless {
-                signature: s.0.clone(),
+                signature: s.value.clone().into(),
             })),
         },
     }
@@ -616,19 +623,19 @@ fn convert_public_key(public_key: &PublicKey) -> transaction::AnyPublicKey {
     match public_key {
         PublicKey::Ed25519(p) => transaction::AnyPublicKey {
             r#type: transaction::any_public_key::Type::Ed25519 as i32,
-            public_key: p.0.clone(),
+            public_key: p.value.clone().into(),
         },
         PublicKey::Secp256k1Ecdsa(p) => transaction::AnyPublicKey {
             r#type: transaction::any_public_key::Type::Secp256k1Ecdsa as i32,
-            public_key: p.0.clone(),
+            public_key: p.value.clone().into(),
         },
         PublicKey::Secp256r1Ecdsa(p) => transaction::AnyPublicKey {
             r#type: transaction::any_public_key::Type::Secp256r1Ecdsa as i32,
-            public_key: p.0.clone(),
+            public_key: p.value.clone().into(),
         },
         PublicKey::Keyless(p) => transaction::AnyPublicKey {
             r#type: transaction::any_public_key::Type::Keyless as i32,
-            public_key: p.0.clone(),
+            public_key: p.value.clone().into(),
         },
     }
 }
@@ -753,6 +760,9 @@ pub fn convert_transaction(
         Transaction::StateCheckpointTransaction(_) => {
             transaction::transaction::TransactionType::StateCheckpoint
         },
+        Transaction::BlockEpilogueTransaction(_) => {
+            transaction::transaction::TransactionType::BlockEpilogue
+        },
         Transaction::PendingTransaction(_) => panic!("PendingTransaction is not supported"),
         Transaction::ValidatorTransaction(_) => {
             transaction::transaction::TransactionType::Validator
@@ -762,6 +772,7 @@ pub fn convert_transaction(
     let txn_data = match &transaction {
         Transaction::UserTransaction(ut) => {
             timestamp = Some(convert_timestamp_usecs(ut.timestamp.0));
+            #[allow(deprecated)]
             let expiration_timestamp_secs = Some(convert_timestamp_secs(std::cmp::min(
                 ut.request.expiration_timestamp_secs.0,
                 chrono::NaiveDateTime::MAX.timestamp() as u64,
@@ -806,9 +817,25 @@ pub fn convert_transaction(
                 transaction::StateCheckpointTransaction {},
             )
         },
+        Transaction::BlockEpilogueTransaction(block_epilogue) => {
+            transaction::transaction::TxnData::BlockEpilogue(
+                transaction::BlockEpilogueTransaction {
+                    block_end_info: block_epilogue
+                        .block_end_info
+                        .as_ref()
+                        .map(|block_end_info| transaction::BlockEndInfo {
+                            block_gas_limit_reached: block_end_info.block_gas_limit_reached,
+                            block_output_limit_reached: block_end_info.block_output_limit_reached,
+                            block_effective_block_gas_units: block_end_info
+                                .block_effective_block_gas_units,
+                            block_approx_output_size: block_end_info.block_approx_output_size,
+                        }),
+                },
+            )
+        },
         Transaction::PendingTransaction(_) => panic!("PendingTransaction not supported"),
-        Transaction::ValidatorTransaction(_) => {
-            transaction::transaction::TxnData::Validator(transaction::ValidatorTransaction {})
+        Transaction::ValidatorTransaction(api_validator_txn) => {
+            convert_validator_transaction(api_validator_txn)
         },
     };
 
@@ -837,3 +864,82 @@ pub fn convert_transaction(
         size_info: Some(size_info),
     }
 }
+
+fn convert_validator_transaction(
+    api_validator_txn: &aptos_api_types::transaction::ValidatorTransaction,
+) -> transaction::transaction::TxnData {
+    transaction::transaction::TxnData::Validator(transaction::ValidatorTransaction {
+        validator_transaction_type: match api_validator_txn {
+            ApiValidatorTransactionEnum::DkgResult(dgk_result) => {
+                Some(
+                    validator_transaction::ValidatorTransactionType::DkgUpdate(
+                        validator_transaction::DkgUpdate {
+                            dkg_transcript: Some(validator_transaction::dkg_update::DkgTranscript {
+                                author: dgk_result.dkg_transcript.author.to_string(),
+                                epoch: dgk_result.dkg_transcript.epoch.0,
+                                payload: dgk_result.dkg_transcript.payload.0.clone(),
+                            }),
+                        },
+                    )
+                )
+            },
+            ApiValidatorTransactionEnum::ObservedJwkUpdate(observed_jwk_update) => {
+                Some(
+                    validator_transaction::ValidatorTransactionType::ObservedJwkUpdate(
+                        validator_transaction::ObservedJwkUpdate {
+                            quorum_certified_update: Some(
+                                validator_transaction::observed_jwk_update::QuorumCertifiedUpdate {
+                                    update: Some(
+                                        validator_transaction::observed_jwk_update::ExportedProviderJwKs {
+                                            issuer: observed_jwk_update.quorum_certified_update.update.issuer.clone(),
+                                            version: observed_jwk_update.quorum_certified_update.update.version,
+                                            jwks: observed_jwk_update.quorum_certified_update.update.jwks.iter().map(|jwk| {
+                                                match jwk {
+                                                    JWK::RSA(rsa) => {
+                                                        ProtoJwk {
+                                                            jwk_type: Some(
+                                                                JwkType::Rsa(
+                                                                    Rsa {
+                                                                        kid: rsa.kid.clone(),
+                                                                        n: rsa.n.clone(),
+                                                                        e: rsa.e.clone(),
+                                                                        kty: rsa.kty.clone(),
+                                                                        alg: rsa.alg.clone(),
+                                                                    }
+                                                                )
+                                                            )
+                                                        }
+                                                    },
+                                                    JWK::Unsupported(unsupported) => {
+                                                        ProtoJwk {
+                                                            jwk_type: Some(
+                                                                JwkType::UnsupportedJwk(
+                                                                    UnsupportedJwk {
+                                                                        id: unsupported.id.clone(),
+                                                                        payload: unsupported.payload.clone()
+                                                                    }
+                                                                )
+                                                            )
+                                                        }
+                                                    }
+                                                }
+                                            }).collect(),
+                                        }
+                                    ),
+                                    multi_sig: Some(aptos_protos::transaction::v1::validator_transaction::observed_jwk_update::ExportedAggregateSignature {
+                                        signer_indices: observed_jwk_update.quorum_certified_update.multi_sig.signer_indices.clone().into_iter().map(|i| i as u64).collect(),
+                                        sig: match &observed_jwk_update.quorum_certified_update.multi_sig.sig {
+                                            Some(sig) =>  sig.0.clone(),
+                                            None => vec![],
+                                        },
+                                    }),
+                                }
+                            )
+                        },
+                    )
+                )
+            },
+        },
+        events: convert_events(api_validator_txn.events()),
+    })
+}
diff --git a/ecosystem/indexer-grpc/indexer-grpc-fullnode/src/runtime.rs b/ecosystem/indexer-grpc/indexer-grpc-fullnode/src/runtime.rs
index 39345992ac8fc..ec74174693fc5 100644
--- a/ecosystem/indexer-grpc/indexer-grpc-fullnode/src/runtime.rs
+++ b/ecosystem/indexer-grpc/indexer-grpc-fullnode/src/runtime.rs
@@ -7,7 +7,6 @@ use crate::{
 };
 use aptos_api::context::Context;
 use aptos_config::config::NodeConfig;
-use aptos_db_indexer::table_info_reader::TableInfoReader;
 use aptos_logger::info;
 use aptos_mempool::MempoolClientSender;
 use aptos_protos::{
@@ -19,7 +18,7 @@ use aptos_protos::{
     util::timestamp::FILE_DESCRIPTOR_SET as UTIL_TIMESTAMP_FILE_DESCRIPTOR_SET,
 };
 use aptos_storage_interface::DbReader;
-use aptos_types::chain_id::ChainId;
+use aptos_types::{chain_id::ChainId, indexer::indexer_db_reader::IndexerReader};
 use std::{net::ToSocketAddrs, sync::Arc};
 use tokio::runtime::Runtime;
 use tonic::{codec::CompressionEncoding, transport::Server};
@@ -35,7 +34,7 @@ pub fn bootstrap(
     chain_id: ChainId,
     db: Arc<dyn DbReader>,
     mp_sender: MempoolClientSender,
-    table_info_reader: Option<Arc<dyn TableInfoReader>>,
+    indexer_reader: Option<Arc<dyn IndexerReader>>,
 ) -> Option<Runtime> {
     if !config.indexer_grpc.enabled {
         return None;
@@ -57,7 +56,7 @@ pub fn bootstrap(
             db,
             mp_sender,
             node_config,
-            table_info_reader,
+            indexer_reader,
         ));
         let service_context = ServiceContext {
             context: context.clone(),
@@ -93,16 +92,16 @@ pub fn bootstrap(
         let router = match use_data_service_interface {
             false => {
                 let svc = FullnodeDataServer::new(server)
-                    .send_compressed(CompressionEncoding::Gzip)
-                    .accept_compressed(CompressionEncoding::Gzip)
-                    .accept_compressed(CompressionEncoding::Zstd);
+                    .send_compressed(CompressionEncoding::Zstd)
+                    .accept_compressed(CompressionEncoding::Zstd)
+                    .accept_compressed(CompressionEncoding::Gzip);
                 tonic_server.add_service(svc)
             },
             true => {
                 let svc = RawDataServer::new(localnet_data_server)
-                    .send_compressed(CompressionEncoding::Gzip)
-                    .accept_compressed(CompressionEncoding::Gzip)
-                    .accept_compressed(CompressionEncoding::Zstd);
+                    .send_compressed(CompressionEncoding::Zstd)
+                    .accept_compressed(CompressionEncoding::Zstd)
+                    .accept_compressed(CompressionEncoding::Gzip);
                 tonic_server.add_service(svc)
             },
         };
diff --git a/ecosystem/indexer-grpc/indexer-grpc-fullnode/src/stream_coordinator.rs b/ecosystem/indexer-grpc/indexer-grpc-fullnode/src/stream_coordinator.rs
index 23826888a1ac7..ce190dc2d2e4b 100644
--- a/ecosystem/indexer-grpc/indexer-grpc-fullnode/src/stream_coordinator.rs
+++ b/ecosystem/indexer-grpc/indexer-grpc-fullnode/src/stream_coordinator.rs
@@ -32,7 +32,7 @@ use tonic::Status;
 type EndVersion = u64;
 
 const SERVICE_TYPE: &str = "indexer_fullnode";
-const MINIMUM_TASK_LOAD_SIZE_IN_BYTES: usize = 1_000_000;
+const MINIMUM_TASK_LOAD_SIZE_IN_BYTES: usize = 100_000;
 
 // Basically a handler for a single GRPC stream request
 pub struct IndexerStreamCoordinator {
@@ -339,8 +339,7 @@ impl IndexerStreamCoordinator {
 
         let first_version = raw_txns.first().map(|txn| txn.version).unwrap();
         let state_view = context.latest_state_view().unwrap();
-        let converter =
-            state_view.as_converter(context.db.clone(), context.table_info_reader.clone());
+        let converter = state_view.as_converter(context.db.clone(), context.indexer_reader.clone());
 
         // Enrich data with block metadata
         let (_, _, block_event) = context
@@ -379,7 +378,7 @@ impl IndexerStreamCoordinator {
                 }
             }
             let size_info = Self::get_size_info(&raw_txn);
-            match converter
+            let res = converter
                 .try_into_onchain_transaction(timestamp, raw_txn)
                 .map(|mut txn| {
                     match txn {
@@ -404,13 +403,19 @@ impl IndexerStreamCoordinator {
                             sct.info.block_height = Some(block_height_bcs);
                             sct.info.epoch = Some(epoch_bcs);
                         },
+                        APITransaction::BlockEpilogueTransaction(ref mut bet) => {
+                            bet.info.block_height = Some(block_height_bcs);
+                            bet.info.epoch = Some(epoch_bcs);
+                        },
                         APITransaction::ValidatorTransaction(ref mut vt) => {
-                            vt.info.block_height = Some(block_height_bcs);
-                            vt.info.epoch = Some(epoch_bcs);
+                            let info = vt.transaction_info_mut();
+                            info.block_height = Some(block_height_bcs);
+                            info.epoch = Some(epoch_bcs);
                         },
                     };
                     txn
-                }) {
+                });
+            match res {
                 Ok(transaction) => transactions.push((transaction, size_info)),
                 Err(err) => {
                     UNABLE_TO_FETCH_TRANSACTION.inc();
diff --git a/ecosystem/indexer-grpc/indexer-grpc-in-memory-cache-benchmark/src/main.rs b/ecosystem/indexer-grpc/indexer-grpc-in-memory-cache-benchmark/src/main.rs
index d5efe9f0e5835..46aa6b554dbd3 100644
--- a/ecosystem/indexer-grpc/indexer-grpc-in-memory-cache-benchmark/src/main.rs
+++ b/ecosystem/indexer-grpc/indexer-grpc-in-memory-cache-benchmark/src/main.rs
@@ -10,7 +10,7 @@
 
 use aptos_indexer_grpc_utils::{
     compression_util::{CacheEntry, StorageFormat},
-    in_memory_cache::{InMemoryCache, MAX_REDIS_FETCH_BATCH_SIZE},
+    in_memory_cache::{InMemoryCache, InMemoryCacheConfig, MAX_REDIS_FETCH_BATCH_SIZE},
 };
 use aptos_protos::transaction::v1::{Transaction, TransactionInfo};
 use lazy_static::lazy_static;
@@ -132,6 +132,7 @@ async fn run_transaction_test(
     let redis_connection = create_mock_redis(transaction_size);
     let cache = Arc::new(
         InMemoryCache::new_with_redis_connection(
+            InMemoryCacheConfig::default(),
             redis_connection,
             StorageFormat::Lz4CompressedProto,
         )
diff --git a/ecosystem/indexer-grpc/indexer-grpc-integration-tests/Cargo.toml b/ecosystem/indexer-grpc/indexer-grpc-integration-tests/Cargo.toml
deleted file mode 100644
index 0f157e9922c9f..0000000000000
--- a/ecosystem/indexer-grpc/indexer-grpc-integration-tests/Cargo.toml
+++ /dev/null
@@ -1,28 +0,0 @@
-[package]
-name = "aptos-indexer-grpc-integration-tests"
-version = "0.1.0"
-edition = "2021"
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-anyhow = { workspace = true }
-aptos-config = { workspace = true }
-aptos-indexer-grpc-cache-worker = { workspace = true }
-aptos-indexer-grpc-file-store = { workspace = true }
-aptos-indexer-grpc-server-framework = { workspace = true }
-aptos-indexer-grpc-utils = { workspace = true }
-aptos-logger = { workspace = true }
-aptos-transaction-emitter-lib = { workspace = true }
-aptos-transaction-generator-lib = { workspace = true }
-aptos-types = { workspace = true }
-once_cell = { workspace = true }
-redis = { workspace = true }
-regex = { workspace = true }
-reqwest = { workspace = true }
-tempfile = { workspace = true }
-tokio = { workspace = true }
-tracing = { workspace = true }
-url = { workspace = true }
-
-[features]
-integration-tests = []
diff --git a/ecosystem/indexer-grpc/indexer-grpc-integration-tests/src/lib.rs b/ecosystem/indexer-grpc/indexer-grpc-integration-tests/src/lib.rs
deleted file mode 100644
index 41eeab05b7c79..0000000000000
--- a/ecosystem/indexer-grpc/indexer-grpc-integration-tests/src/lib.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-// We hide these tests behind a feature flag because these are not standard unit tests,
-// these are integration tests that rely on a variety of outside pieces such as a local
-// testnet and a running Redis instance.
-#[cfg(feature = "integration-tests")]
-mod tests;
diff --git a/ecosystem/indexer-grpc/indexer-grpc-integration-tests/src/tests/fullnode_tests.rs b/ecosystem/indexer-grpc/indexer-grpc-integration-tests/src/tests/fullnode_tests.rs
deleted file mode 100644
index 3bfdd86dc2429..0000000000000
--- a/ecosystem/indexer-grpc/indexer-grpc-integration-tests/src/tests/fullnode_tests.rs
+++ /dev/null
@@ -1,362 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-use anyhow::{bail, Context, Result};
-use aptos_indexer_grpc_cache_worker::IndexerGrpcCacheWorkerConfig;
-use aptos_indexer_grpc_file_store::IndexerGrpcFileStoreWorkerConfig;
-use aptos_indexer_grpc_server_framework::{
-    run_server_with_config, setup_logging, setup_panic_handler, GenericConfig, RunnableConfig,
-};
-use aptos_indexer_grpc_utils::{
-    cache_operator::CacheOperator,
-    config::{IndexerGrpcFileStoreConfig, LocalFileStore},
-    constants::BLOB_STORAGE_SIZE,
-    file_store_operator::{FileStoreOperator, LocalFileStoreOperator},
-    types::RedisUrl,
-};
-use aptos_transaction_emitter_lib::{emit_transactions, ClusterArgs, CoinSourceArgs, EmitArgs};
-use aptos_transaction_generator_lib::args::TransactionTypeArg;
-use aptos_types::chain_id::ChainId;
-use once_cell::sync::Lazy;
-use regex::Regex;
-use std::{fs::File, io::Write, path::PathBuf, str::FromStr};
-use tempfile::TempDir;
-use tokio::task::JoinHandle;
-use tracing::info;
-use url::Url;
-
-static TESTNET_REST_API_URL: Lazy<Url> =
-    Lazy::new(|| Url::from_str("http://127.0.0.1:8080").unwrap());
-static TESTNET_FULLNODE_GRPC_URL: Lazy<Url> =
-    Lazy::new(|| Url::from_str("http://127.0.0.1:50051").unwrap());
-static REDIS_PRIMARY_URL: Lazy<RedisUrl> =
-    Lazy::new(|| RedisUrl::from_str("redis://127.0.0.1:6379").unwrap());
-
-static MINT_KEY_FILE_NAME: &str = "mint.key";
-
-/// Get the name of docker containers that match the given regex
-/// This works around different docker compose v1 and v2 naming conventions
-fn get_container_by_name_regex(name_regex: Regex) -> Result<Vec<String>> {
-    let containers = std::process::Command::new("docker")
-        .args(&["ps", "--format", "{{.Names}}"])
-        .output()?;
-    let containers = String::from_utf8(containers.stdout)?;
-    let ret = containers
-        .split("\n")
-        .map(|x| x.to_string())
-        .filter(|x| name_regex.is_match(x))
-        .collect::<Vec<String>>();
-    Ok(ret)
-}
-
-/// Connects to the local redis running in docker and resets it
-async fn reset_redis() -> Result<()> {
-    let redis_containers = get_container_by_name_regex(Regex::new(r".*redis.*")?)?;
-    for container in redis_containers {
-        let _ = std::process::Command::new("docker")
-            .args(&["exec", &container, "redis-cli", "FLUSHALL"])
-            .output()?;
-    }
-
-    let conn = redis::Client::open(REDIS_PRIMARY_URL.0.clone())
-        .expect("Create redis client failed.")
-        .get_async_connection()
-        .await
-        .expect("Create redis connection failed.");
-    let mut cache_operator = CacheOperator::new(conn);
-    match cache_operator.get_latest_version().await {
-        Ok(x) => {
-            bail!(
-                "Redis did not scale down properly. There's still stuff in the cache. Latest version: {}",
-                x
-            );
-        },
-        Err(_) => info!("Redis scaled down properly"),
-    }
-    Ok(())
-}
-
-/// Fetch the mint key from the running localnet and dump it into the path specified
-async fn dump_mint_key_to_file(path: &PathBuf) -> Result<String> {
-    let validator_containers =
-        get_container_by_name_regex(Regex::new(r"validator-testnet.*validator.*")?)?;
-    if validator_containers.len() != 1 {
-        bail!(
-            "Expected 1 validator container, found {}",
-            validator_containers.len()
-        );
-    }
-    let validator = &validator_containers[0];
-    let output = std::process::Command::new("docker")
-        .args(&["exec", validator, "cat", "/opt/aptos/var/mint.key"])
-        .output()?;
-    let output_stdout = output.stdout;
-    info!("Mint key: {:?}", output_stdout);
-    let mint_key_path = path.join(MINT_KEY_FILE_NAME);
-    let mint_key_path_string = mint_key_path.display().to_string();
-    let mut file = File::create(mint_key_path).context("Could not create mint key in path")?;
-    file.write_all(&output_stdout)
-        .context("Could not write mint key to file")?;
-    Ok(mint_key_path_string)
-}
-
-/// Emit transactions to the localnet to invoke certain indexer actions, such as writing
-/// to filestore
-async fn emit_transactions_for_test() -> Result<()> {
-    // dump the key to a tempfile
-    let path_buf = TempDir::new()
-        .context("Could not create temp dir")?
-        .into_path();
-    let mint_key_file_path = dump_mint_key_to_file(&path_buf)
-        .await
-        .expect("Failed to fetch mint key");
-    info!("Mint key file path: {}", mint_key_file_path);
-
-    // emit some transactions
-    let duration = 10;
-    let target_tps = BLOB_STORAGE_SIZE / duration;
-    let cluster_args = ClusterArgs {
-        targets: Some(vec![(*TESTNET_REST_API_URL).clone()]),
-        targets_file: None,
-        reuse_accounts: false,
-        chain_id: ChainId::test(),
-        coin_source_args: CoinSourceArgs {
-            mint_file: Some(mint_key_file_path),
-            ..CoinSourceArgs::default()
-        },
-    };
-    let emit_args = EmitArgs {
-        // mempool_backlog: None,
-        target_tps: Some(target_tps),
-        txn_expiration_time_secs: 30,
-        duration: duration.try_into().unwrap(),
-        transaction_type: vec![TransactionTypeArg::default()],
-        ..EmitArgs::default()
-    };
-
-    info!(
-        "Emitting transactions: {} tps for {} seconds...",
-        target_tps, duration
-    );
-
-    let stats = emit_transactions(&cluster_args, &emit_args)
-        .await
-        .map_err(|e| panic!("Emit transactions failed {:?}", e))
-        .unwrap();
-    info!("Total stats: {}", stats);
-    info!("Average rate: {}", stats.rate());
-    Ok(())
-}
-
-async fn start_server<T: RunnableConfig>(
-    server_config: T,
-) -> Result<(u16, JoinHandle<Result<()>>)> {
-    let health_check_port = aptos_config::utils::get_available_port();
-    let config = GenericConfig {
-        health_check_port,
-        server_config,
-    };
-    let server_name = config.server_config.get_server_name();
-    info!(
-        "Starting server {} with healtheck port {}",
-        server_name, health_check_port
-    );
-    let runtime_handle = tokio::runtime::Handle::current();
-
-    // runs the component's run, but we need the server run
-    let join_handle = runtime_handle.spawn(async move { run_server_with_config(config).await });
-    let startup_timeout_secs = 30;
-    for i in 0..startup_timeout_secs {
-        match reqwest::get(format!("http://localhost:{}/metrics", health_check_port)).await {
-            Ok(_) => break,
-            Err(e) => {
-                if i == startup_timeout_secs - 1 {
-                    let msg = if join_handle.is_finished() {
-                        format!("Server failed on startup: {:#?}", join_handle.await)
-                    } else {
-                        "Server was still starting up".to_string()
-                    };
-                    bail!(
-                        "Server didn't come up within given timeout: {:#?} {}",
-                        e,
-                        msg
-                    );
-                }
-            },
-        }
-        if join_handle.is_finished() {
-            bail!(
-                "Server returned error while starting up: {:#?}",
-                join_handle.await
-            );
-        }
-        tokio::time::sleep(std::time::Duration::from_secs(1)).await;
-    }
-    Ok((health_check_port, join_handle))
-}
-
-async fn setup_test() {
-    // we're going to run both cache worker and file store worker in the same process
-    // so we need to centrally set up logging and panic handler, whereas they are usually done in the same service
-    setup_logging();
-    setup_panic_handler();
-    reset_redis().await.expect("Failed to reset redis for test");
-
-    // aptos_logger too
-    aptos_logger::Logger::init_for_testing();
-}
-
-// These tests expect that the local environment has a running fullnode
-// This can be done by using the docker-compose
-// We will then simulate chaos by using (1) docker exec (2) docker-compose scale <service>=<num_replicas>
-#[tokio::test]
-pub async fn verify_docker_compose_setup() {
-    let url = format!("{}v1", *TESTNET_REST_API_URL);
-    reqwest::get(&url)
-        .await
-        .unwrap()
-        .error_for_status()
-        .unwrap(); // we just want a good status code
-}
-
-/// Test that the cache worker can start from scratch and make progress.
-/// This is a cold start because there is no existing cache and also it is unable to read from the file store
-/// about the latest state prior to starting.
-#[tokio::test]
-async fn test_cold_start_cache_worker_progress() {
-    setup_test().await;
-
-    let tmp_dir = TempDir::new().expect("Could not create temp dir"); // start with a new file store each time
-    let cache_worker_config = IndexerGrpcCacheWorkerConfig {
-        fullnode_grpc_address: (*TESTNET_FULLNODE_GRPC_URL).clone(),
-        file_store_config: IndexerGrpcFileStoreConfig::LocalFileStore(LocalFileStore {
-            local_file_store_path: tmp_dir.path().to_path_buf(),
-        }),
-        redis_main_instance_address: (*REDIS_PRIMARY_URL).clone(),
-    };
-
-    let (_cache_worker_port, _cache_worker_handle) =
-        start_server::<IndexerGrpcCacheWorkerConfig>(cache_worker_config)
-            .await
-            .expect("Failed to start CacheWorker");
-
-    let conn = redis::Client::open((*REDIS_PRIMARY_URL).0.clone())
-        .expect("Create redis client failed.")
-        .get_async_connection()
-        .await
-        .expect("Create redis connection failed.");
-
-    let check_cache_secs = 30;
-    let check_cache_frequency_secs = 5;
-    let tries = check_cache_secs / check_cache_frequency_secs;
-
-    // check that the cache was written to
-    let mut cache_operator = CacheOperator::new(conn);
-    let mut chain_id = 0;
-    for _ in 0..tries {
-        match cache_operator.get_chain_id().await {
-            Ok(x) => {
-                chain_id = x;
-                info!("Chain id: {}", x);
-                break;
-            },
-            Err(_) => {
-                tokio::time::sleep(std::time::Duration::from_secs(check_cache_frequency_secs))
-                    .await;
-            },
-        }
-    }
-    assert!(chain_id == 4);
-
-    // check that the cache worker is making progress
-    let mut latest_version = 0;
-    let mut new_latest_version;
-    for _ in 0..tries {
-        tokio::time::sleep(std::time::Duration::from_secs(check_cache_frequency_secs)).await;
-        new_latest_version = cache_operator.get_latest_version().await.unwrap();
-        info!(
-            "Processed {} versions since last check {}s ago...",
-            new_latest_version - latest_version,
-            check_cache_frequency_secs
-        );
-        assert!(new_latest_version > latest_version);
-        latest_version = new_latest_version;
-    }
-}
-
-/// Test that the file store worker can start from scratch and make progress.
-/// This is a cold start since the file store and the cache start as empty. And the file store is generally the source of truth
-/// between the two. We expect the file store to be written to
-#[tokio::test]
-async fn test_cold_start_file_store_worker_progress() {
-    setup_test().await;
-
-    let tmp_dir = TempDir::new().expect("Could not create temp dir"); // start with a new file store each time
-
-    let cache_worker_config = IndexerGrpcCacheWorkerConfig {
-        fullnode_grpc_address: (*TESTNET_FULLNODE_GRPC_URL).clone(),
-        file_store_config: IndexerGrpcFileStoreConfig::LocalFileStore(LocalFileStore {
-            local_file_store_path: tmp_dir.path().to_path_buf(),
-        }),
-        redis_main_instance_address: (*REDIS_PRIMARY_URL).clone(),
-    };
-
-    let file_store_worker_config = IndexerGrpcFileStoreWorkerConfig {
-        redis_main_instance_address: (*REDIS_PRIMARY_URL).clone(),
-        file_store_config: IndexerGrpcFileStoreConfig::LocalFileStore(LocalFileStore {
-            local_file_store_path: tmp_dir.path().to_path_buf(),
-        }),
-    };
-
-    let (_cache_worker_port, _cache_worker_handle) =
-        start_server::<IndexerGrpcCacheWorkerConfig>(cache_worker_config.clone())
-            .await
-            .expect("Failed to start CacheWorker");
-
-    // XXX: wait some time before file store starts up. we should resolve the boot dependency cycle
-    tokio::time::sleep(std::time::Duration::from_secs(1)).await;
-
-    let (_file_store_port, _file_store_handle) =
-        start_server::<IndexerGrpcFileStoreWorkerConfig>(file_store_worker_config)
-            .await
-            .expect("Failed to start FileStoreWorker");
-
-    // wait until file store writes its first metadata
-    let file_store_operator = LocalFileStoreOperator::new(tmp_dir.path().to_path_buf());
-    let tries = 6;
-    for _ in 0..tries {
-        match file_store_operator.get_file_store_metadata().await {
-            Some(_) => {
-                info!("File store metadata found");
-                break;
-            },
-            None => {
-                tokio::time::sleep(std::time::Duration::from_secs(1)).await;
-            },
-        }
-    }
-
-    // inspect the files at boot. there should at least be the metadata file specifying that it has 0 versions processed
-    info!(
-        "Expecting file store to have files {}",
-        tmp_dir.path().display()
-    );
-    let file_store_metadata = file_store_operator.get_file_store_metadata().await;
-    assert!(file_store_metadata.is_some());
-
-    // emit transactions, enough to write to file store
-    emit_transactions_for_test()
-        .await
-        .expect("Emit transactions failed");
-
-    // after a while, expect the metadata file to be updated with the latest version
-    let file_store_metadata = file_store_operator
-        .get_file_store_metadata()
-        .await
-        .expect("Failed to get file store metadata");
-    info!(
-        "[Indexer Cache] File store metadata: {:?}",
-        file_store_metadata
-    );
-    assert!(file_store_metadata.version > 0);
-}
diff --git a/ecosystem/indexer-grpc/indexer-grpc-server-framework/src/lib.rs b/ecosystem/indexer-grpc/indexer-grpc-server-framework/src/lib.rs
index 8b93d8d9f1adb..ce4a68249e82a 100644
--- a/ecosystem/indexer-grpc/indexer-grpc-server-framework/src/lib.rs
+++ b/ecosystem/indexer-grpc/indexer-grpc-server-framework/src/lib.rs
@@ -166,6 +166,7 @@ pub fn setup_logging(make_writer: Option<Box<dyn Fn() -> Box<dyn std::io::Write>
 
     let subscriber = tracing_subscriber::fmt()
         .json()
+        .flatten_event(true)
         .with_file(true)
         .with_line_number(true)
         .with_thread_ids(true)
diff --git a/ecosystem/indexer-grpc/indexer-grpc-table-info/src/internal_indexer_db_service.rs b/ecosystem/indexer-grpc/indexer-grpc-table-info/src/internal_indexer_db_service.rs
new file mode 100644
index 0000000000000..4fc49928c9a4c
--- /dev/null
+++ b/ecosystem/indexer-grpc/indexer-grpc-table-info/src/internal_indexer_db_service.rs
@@ -0,0 +1,203 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use anyhow::Result;
+use aptos_config::config::{internal_indexer_db_config::InternalIndexerDBConfig, NodeConfig};
+use aptos_db_indexer::{
+    db_indexer::{DBIndexer, InternalIndexerDB},
+    db_ops::open_internal_indexer_db,
+    indexer_reader::IndexerReaders,
+};
+use aptos_indexer_grpc_utils::counters::{log_grpc_step, IndexerGrpcStep};
+use aptos_storage_interface::DbReader;
+use aptos_types::{indexer::indexer_db_reader::IndexerReader, transaction::Version};
+use std::{
+    path::{Path, PathBuf},
+    sync::Arc,
+};
+use tokio::runtime::Handle;
+
+const SERVICE_TYPE: &str = "internal_indexer_db_service";
+const INTERNAL_INDEXER_DB: &str = "internal_indexer_db";
+
+pub struct InternalIndexerDBService {
+    pub db_indexer: Arc<DBIndexer>,
+}
+
+impl InternalIndexerDBService {
+    pub fn new(db_reader: Arc<dyn DbReader>, internal_indexer_db: InternalIndexerDB) -> Self {
+        let internal_db_indexer = Arc::new(DBIndexer::new(internal_indexer_db, db_reader));
+        Self {
+            db_indexer: internal_db_indexer,
+        }
+    }
+
+    pub fn get_indexer_db_for_restore(db_dir: &Path) -> Option<InternalIndexerDB> {
+        let db_path_buf = PathBuf::from(db_dir).join(INTERNAL_INDEXER_DB);
+        let rocksdb_config = NodeConfig::default()
+            .storage
+            .rocksdb_configs
+            .index_db_config;
+        let arc_db = Arc::new(
+            open_internal_indexer_db(db_path_buf.as_path(), &rocksdb_config)
+                .expect("Failed to open internal indexer db"),
+        );
+
+        let internal_indexer_db_config = InternalIndexerDBConfig::new(false, false, true, 10_000);
+        Some(InternalIndexerDB::new(arc_db, internal_indexer_db_config))
+    }
+
+    pub fn get_indexer_db(node_config: &NodeConfig) -> Option<InternalIndexerDB> {
+        if !node_config
+            .indexer_db_config
+            .is_internal_indexer_db_enabled()
+        {
+            return None;
+        }
+        let db_path_buf = node_config
+            .storage
+            .get_dir_paths()
+            .default_root_path()
+            .join(INTERNAL_INDEXER_DB);
+        let rocksdb_config = node_config.storage.rocksdb_configs.index_db_config;
+        let db_path = db_path_buf.as_path();
+
+        let arc_db = Arc::new(
+            open_internal_indexer_db(db_path, &rocksdb_config)
+                .expect("Failed to open internal indexer db"),
+        );
+        Some(InternalIndexerDB::new(
+            arc_db,
+            node_config.indexer_db_config,
+        ))
+    }
+
+    pub fn get_db_indexer(&self) -> Arc<DBIndexer> {
+        Arc::clone(&self.db_indexer)
+    }
+
+    pub async fn get_start_version(&self, node_config: &NodeConfig) -> Result<Version> {
+        let fast_sync_enabled = node_config
+            .state_sync
+            .state_sync_driver
+            .bootstrapping_mode
+            .is_fast_sync();
+        let mut main_db_synced_version = self.db_indexer.main_db_reader.get_synced_version()?;
+
+        // Wait till fast sync is done
+        while fast_sync_enabled && main_db_synced_version == 0 {
+            tokio::time::sleep(std::time::Duration::from_secs(1)).await;
+            main_db_synced_version = self.db_indexer.main_db_reader.get_synced_version()?;
+        }
+
+        let start_version = self
+            .db_indexer
+            .indexer_db
+            .get_persisted_version()?
+            .map_or(0, |v| v + 1);
+
+        if node_config.indexer_db_config.enable_statekeys() {
+            let state_start_version = self
+                .db_indexer
+                .indexer_db
+                .get_state_version()?
+                .map_or(0, |v| v + 1);
+            if start_version != state_start_version {
+                panic!("Cannot start state indexer because the progress doesn't match.");
+            }
+        }
+
+        if node_config.indexer_db_config.enable_transaction() {
+            let transaction_start_version = self
+                .db_indexer
+                .indexer_db
+                .get_transaction_version()?
+                .map_or(0, |v| v + 1);
+            if start_version != transaction_start_version {
+                panic!("Cannot start transaction indexer because the progress doesn't match.");
+            }
+        }
+
+        if node_config.indexer_db_config.enable_event() {
+            let event_start_version = self
+                .db_indexer
+                .indexer_db
+                .get_event_version()?
+                .map_or(0, |v| v + 1);
+            if start_version != event_start_version {
+                panic!("Cannot start event indexer because the progress doesn't match.");
+            }
+        }
+
+        Ok(start_version)
+    }
+
+    pub async fn run(&mut self, node_config: &NodeConfig) -> Result<()> {
+        let mut start_version = self.get_start_version(node_config).await?;
+
+        loop {
+            let start_time: std::time::Instant = std::time::Instant::now();
+            let next_version = self.db_indexer.process_a_batch(start_version)?;
+
+            if next_version == start_version {
+                tokio::time::sleep(std::time::Duration::from_millis(100)).await;
+                continue;
+            }
+            log_grpc_step(
+                SERVICE_TYPE,
+                IndexerGrpcStep::InternalIndexerDBProcessed,
+                Some(start_version as i64),
+                Some(next_version as i64),
+                None,
+                None,
+                Some(start_time.elapsed().as_secs_f64()),
+                None,
+                Some((next_version - start_version) as i64),
+                None,
+            );
+            start_version = next_version;
+        }
+    }
+}
+
+pub struct MockInternalIndexerDBService {
+    pub indexer_readers: Option<IndexerReaders>,
+    pub _handle: Option<Handle>,
+}
+
+impl MockInternalIndexerDBService {
+    pub fn new_for_test(db_reader: Arc<dyn DbReader>, node_config: &NodeConfig) -> Self {
+        if !node_config
+            .indexer_db_config
+            .is_internal_indexer_db_enabled()
+        {
+            return Self {
+                indexer_readers: None,
+                _handle: None,
+            };
+        }
+
+        let db = InternalIndexerDBService::get_indexer_db(node_config).unwrap();
+        let handle = Handle::current();
+        let mut internal_indexer_db_service = InternalIndexerDBService::new(db_reader, db);
+        let db_indexer = internal_indexer_db_service.get_db_indexer();
+        let config_clone = node_config.to_owned();
+        handle.spawn(async move {
+            internal_indexer_db_service
+                .run(&config_clone)
+                .await
+                .unwrap();
+        });
+        Self {
+            indexer_readers: IndexerReaders::new(None, Some(db_indexer)),
+            _handle: Some(handle),
+        }
+    }
+
+    pub fn get_indexer_reader(&self) -> Option<Arc<dyn IndexerReader>> {
+        if let Some(indexer_reader) = &self.indexer_readers {
+            return Some(Arc::new(indexer_reader.to_owned()));
+        }
+        None
+    }
+}
diff --git a/ecosystem/indexer-grpc/indexer-grpc-table-info/src/lib.rs b/ecosystem/indexer-grpc/indexer-grpc-table-info/src/lib.rs
index 2d311d0902e48..2fa7aa4af3f65 100644
--- a/ecosystem/indexer-grpc/indexer-grpc-table-info/src/lib.rs
+++ b/ecosystem/indexer-grpc/indexer-grpc-table-info/src/lib.rs
@@ -2,5 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 pub mod backup_restore;
+pub mod internal_indexer_db_service;
 pub mod runtime;
 pub mod table_info_service;
diff --git a/ecosystem/indexer-grpc/indexer-grpc-table-info/src/runtime.rs b/ecosystem/indexer-grpc/indexer-grpc-table-info/src/runtime.rs
index cb5aa9531e880..29b2d7afa108f 100644
--- a/ecosystem/indexer-grpc/indexer-grpc-table-info/src/runtime.rs
+++ b/ecosystem/indexer-grpc/indexer-grpc-table-info/src/runtime.rs
@@ -1,10 +1,16 @@
 // Copyright © Aptos Foundation
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::table_info_service::TableInfoService;
+use crate::{
+    internal_indexer_db_service::InternalIndexerDBService, table_info_service::TableInfoService,
+};
 use aptos_api::context::Context;
 use aptos_config::config::NodeConfig;
-use aptos_db_indexer::{db_ops::open_db, db_v2::IndexerAsyncV2};
+use aptos_db_indexer::{
+    db_indexer::{DBIndexer, InternalIndexerDB},
+    db_ops::open_db,
+    db_v2::IndexerAsyncV2,
+};
 use aptos_mempool::MempoolClientSender;
 use aptos_storage_interface::DbReaderWriter;
 use aptos_types::chain_id::ChainId;
@@ -13,6 +19,28 @@ use tokio::runtime::Runtime;
 
 const INDEX_ASYNC_V2_DB_NAME: &str = "index_indexer_async_v2_db";
 
+pub fn bootstrap_internal_indexer_db(
+    config: &NodeConfig,
+    db_rw: DbReaderWriter,
+    internal_indexer_db: Option<InternalIndexerDB>,
+) -> Option<(Runtime, Arc<DBIndexer>)> {
+    if !config.indexer_db_config.is_internal_indexer_db_enabled() || internal_indexer_db.is_none() {
+        return None;
+    }
+    let runtime = aptos_runtimes::spawn_named_runtime("index-db".to_string(), None);
+    // Set up db config and open up the db initially to read metadata
+    let mut indexer_service =
+        InternalIndexerDBService::new(db_rw.reader, internal_indexer_db.unwrap());
+    let db_indexer = indexer_service.get_db_indexer();
+    // Spawn task for db indexer
+    let config_clone = config.to_owned();
+    runtime.spawn(async move {
+        indexer_service.run(&config_clone).await.unwrap();
+    });
+
+    Some((runtime, db_indexer))
+}
+
 /// Creates a runtime which creates a thread pool which sets up fullnode indexer table info service
 /// Returns corresponding Tokio runtime
 pub fn bootstrap(
diff --git a/ecosystem/indexer-grpc/indexer-grpc-utils/src/config.rs b/ecosystem/indexer-grpc/indexer-grpc-utils/src/config.rs
index 31f6b41941dd9..56e32a33ab591 100644
--- a/ecosystem/indexer-grpc/indexer-grpc-utils/src/config.rs
+++ b/ecosystem/indexer-grpc/indexer-grpc-utils/src/config.rs
@@ -8,6 +8,7 @@ use std::path::PathBuf;
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct GcsFileStore {
     pub gcs_file_store_bucket_name: String,
+    pub gcs_file_store_bucket_sub_dir: Option<PathBuf>,
     // Required to operate on GCS.
     pub gcs_file_store_service_account_key_path: String,
     #[serde(default = "default_enable_compression")]
@@ -47,6 +48,7 @@ impl IndexerGrpcFileStoreConfig {
             IndexerGrpcFileStoreConfig::GcsFileStore(gcs_file_store) => {
                 Box::new(crate::file_store_operator::gcs::GcsFileStoreOperator::new(
                     gcs_file_store.gcs_file_store_bucket_name.clone(),
+                    gcs_file_store.gcs_file_store_bucket_sub_dir.clone(),
                     gcs_file_store
                         .gcs_file_store_service_account_key_path
                         .clone(),
diff --git a/ecosystem/indexer-grpc/indexer-grpc-utils/src/constants.rs b/ecosystem/indexer-grpc/indexer-grpc-utils/src/constants.rs
index 5d06abeaf18f5..bc65ee1f35c3c 100644
--- a/ecosystem/indexer-grpc/indexer-grpc-utils/src/constants.rs
+++ b/ecosystem/indexer-grpc/indexer-grpc-utils/src/constants.rs
@@ -14,13 +14,50 @@ pub const GRPC_API_GATEWAY_API_KEY_HEADER: &str = "authorization";
 // Limit the message size to 15MB. By default the downstream can receive up to 15MB.
 pub const MESSAGE_SIZE_LIMIT: usize = 1024 * 1024 * 15;
 
+// These come from API Gateway, see here:
+// https://github.com/aptos-labs/api-gateway/blob/0aae1c17fbd0f5e9b50bdb416f62b48d3d1d5e6b/src/common.rs
+
+/// The type of the auth identity. For example, "anonymous IP" or "application" (API
+/// key). For now all data service connections must be from an application, but we
+/// include this for future-proofing.
+pub const REQUEST_HEADER_APTOS_IDENTIFIER_TYPE: &str = "x-aptos-identifier-type";
+/// The identifier uniquely identifies the requester. For an application, this is the
+/// application ID, a UUID4.
+pub const REQUEST_HEADER_APTOS_IDENTIFIER: &str = "x-aptos-identifier";
+/// The email of the requester. For an application, this is the email of the user who
+/// created the application. When looking at metrics based on this label, you should
+/// also parallelize based on the application name. Or just use the identifier.
+pub const REQUEST_HEADER_APTOS_EMAIL: &str = "x-aptos-email";
+/// The name of the application, e.g. something like "Graffio Testnet".
+pub const REQUEST_HEADER_APTOS_APPLICATION_NAME: &str = "x-aptos-application-name";
+
 #[derive(Clone, Serialize, Deserialize, Debug)]
 pub struct IndexerGrpcRequestMetadata {
     pub processor_name: String,
+    /// See `REQUEST_HEADER_APTOS_IDENTIFIER_TYPE` for more information.
+    pub request_identifier_type: String,
     /// See `REQUEST_HEADER_APTOS_IDENTIFIER` for more information.
     pub request_identifier: String,
+    /// See `REQUEST_HEADER_APTOS_EMAIL` for more information.
+    pub request_email: String,
+    /// See `REQUEST_HEADER_APTOS_APPLICATION_NAME` for more information.
+    pub request_application_name: String,
     pub request_connection_id: String,
     // Token is no longer needed behind api gateway.
     #[deprecated]
     pub request_token: String,
 }
+
+impl IndexerGrpcRequestMetadata {
+    /// Get the label values for use with metrics that use these labels. Note, the
+    /// order must match the order in metrics.rs.
+    pub fn get_label_values(&self) -> Vec<&str> {
+        vec![
+            &self.request_identifier_type,
+            &self.request_identifier,
+            &self.request_email,
+            &self.request_application_name,
+            &self.processor_name,
+        ]
+    }
+}
diff --git a/ecosystem/indexer-grpc/indexer-grpc-utils/src/counters.rs b/ecosystem/indexer-grpc/indexer-grpc-utils/src/counters.rs
index 434bdb5cf613c..b3746eee88f20 100644
--- a/ecosystem/indexer-grpc/indexer-grpc-utils/src/counters.rs
+++ b/ecosystem/indexer-grpc/indexer-grpc-utils/src/counters.rs
@@ -58,6 +58,8 @@ pub enum IndexerGrpcStep {
     TableInfoProcessedBatch,
     // [Indexer Table Info] Processed transactions from fullnode
     TableInfoProcessed,
+    // [Indexer Indices] Processed transactions from AptosDB
+    InternalIndexerDBProcessed,
 }
 
 impl IndexerGrpcStep {
@@ -91,6 +93,7 @@ impl IndexerGrpcStep {
             // Table info service steps
             IndexerGrpcStep::TableInfoProcessedBatch => "1",
             IndexerGrpcStep::TableInfoProcessed => "2",
+            IndexerGrpcStep::InternalIndexerDBProcessed => "1",
         }
     }
 
@@ -136,6 +139,9 @@ impl IndexerGrpcStep {
             IndexerGrpcStep::TableInfoProcessed => {
                 "[Indexer Table Info] Processed successfully"
             }
+            IndexerGrpcStep::InternalIndexerDBProcessed => {
+                "[Indexer DB indices] Processed successfully"
+            }
         }
     }
 }
@@ -278,8 +284,11 @@ pub fn log_grpc_step(
             duration_in_secs,
             size_in_bytes,
             // Request metadata variables
-            request_identifier = &request_metadata.request_identifier,
             processor_name = &request_metadata.processor_name,
+            request_identifier_type = &request_metadata.request_identifier_type,
+            request_identifier = &request_metadata.request_identifier,
+            request_email = &request_metadata.request_email,
+            request_application_name = &request_metadata.request_application_name,
             connection_id = &request_metadata.request_connection_id,
             service_type,
             step = step.get_step(),
diff --git a/ecosystem/indexer-grpc/indexer-grpc-utils/src/file_store_operator/gcs.rs b/ecosystem/indexer-grpc/indexer-grpc-utils/src/file_store_operator/gcs.rs
index 444791cc23c63..2b6361f8bdecc 100644
--- a/ecosystem/indexer-grpc/indexer-grpc-utils/src/file_store_operator/gcs.rs
+++ b/ecosystem/indexer-grpc/indexer-grpc-utils/src/file_store_operator/gcs.rs
@@ -9,7 +9,7 @@ use crate::{
 use anyhow::bail;
 use aptos_protos::transaction::v1::Transaction;
 use cloud_storage::{Bucket, Object};
-use std::env;
+use std::{env, path::PathBuf};
 
 const JSON_FILE_TYPE: &str = "application/json";
 // The environment variable to set the service account path.
@@ -19,13 +19,16 @@ const FILE_STORE_METADATA_TIMEOUT_MILLIS: u128 = 200;
 #[derive(Clone)]
 pub struct GcsFileStoreOperator {
     bucket_name: String,
+    bucket_sub_dir: Option<PathBuf>,
     file_store_metadata_last_updated: std::time::Instant,
     storage_format: StorageFormat,
+    metadata_file_path: PathBuf,
 }
 
 impl GcsFileStoreOperator {
     pub fn new(
         bucket_name: String,
+        bucket_sub_dir: Option<PathBuf>,
         service_account_path: String,
         enable_compression: bool,
     ) -> Self {
@@ -35,10 +38,39 @@ impl GcsFileStoreOperator {
         } else {
             StorageFormat::JsonBase64UncompressedProto
         };
+        let metadata_file_path = match &bucket_sub_dir {
+            Some(sub_dir) => {
+                let mut metadata_file_path = sub_dir.clone();
+                metadata_file_path.push(METADATA_FILE_NAME);
+                metadata_file_path
+            },
+            None => {
+                let mut metadata_file_path = PathBuf::new();
+                metadata_file_path.push(METADATA_FILE_NAME);
+                metadata_file_path
+            },
+        };
         Self {
             bucket_name,
+            bucket_sub_dir,
             file_store_metadata_last_updated: std::time::Instant::now(),
             storage_format,
+            metadata_file_path,
+        }
+    }
+
+    /// Given a version number, builds the key path for the file entry. This is dependent on the storage format and whether we opt
+    /// to use a sub directory, in the case of a shared bucket. The key path can be used directly as a GCS bucket file path.
+    fn get_file_entry_key_path(&self, version: u64) -> String {
+        let file_entry_key = FileEntry::build_key(version, self.storage_format).to_string();
+        // If the sub directory is set, the file entry key will be prefixed with the sub directory.
+        match &self.bucket_sub_dir {
+            Some(sub_dir) => {
+                let mut file_entry_key_path = sub_dir.clone();
+                file_entry_key_path.push(file_entry_key);
+                file_entry_key_path.to_string_lossy().into_owned()
+            },
+            None => file_entry_key,
         }
     }
 }
@@ -66,8 +98,8 @@ impl FileStoreOperator for GcsFileStoreOperator {
     }
 
     async fn get_raw_file(&self, version: u64) -> anyhow::Result<Vec<u8>> {
-        let file_entry_key = FileEntry::build_key(version, self.storage_format).to_string();
-        match Object::download(&self.bucket_name, file_entry_key.as_str()).await {
+        let file_entry_key_path = self.get_file_entry_key_path(version);
+        match Object::download(&self.bucket_name, file_entry_key_path.as_str()).await {
             Ok(file) => Ok(file),
             Err(cloud_storage::Error::Other(err)) => {
                 if err.contains("No such object: ") {
@@ -90,7 +122,14 @@ impl FileStoreOperator for GcsFileStoreOperator {
 
     /// Gets the metadata from the file store. Operator will panic if error happens when accessing the metadata file(except not found).
     async fn get_file_store_metadata(&self) -> Option<FileStoreMetadata> {
-        match Object::download(&self.bucket_name, METADATA_FILE_NAME).await {
+        match Object::download(
+            &self.bucket_name,
+            self.metadata_file_path
+                .to_str()
+                .expect("Expected metadata file path to be valid."),
+        )
+        .await
+        {
             Ok(metadata) => {
                 let metadata: FileStoreMetadata =
                     serde_json::from_slice(&metadata).expect("Expected metadata to be valid JSON.");
@@ -150,7 +189,9 @@ impl FileStoreOperator for GcsFileStoreOperator {
         Object::create(
             self.bucket_name.as_str(),
             serde_json::to_vec(&metadata).unwrap(),
-            METADATA_FILE_NAME,
+            self.metadata_file_path
+                .to_str()
+                .expect("Expected metadata file path to be valid."),
             JSON_FILE_TYPE,
         )
         .await?;
@@ -179,7 +220,7 @@ impl FileStoreOperator for GcsFileStoreOperator {
         let start_time = std::time::Instant::now();
         let bucket_name = self.bucket_name.clone();
         let file_entry = FileEntry::from_transactions(transactions, self.storage_format);
-        let file_entry_key = FileEntry::build_key(start_version, self.storage_format).to_string();
+        let file_entry_key_path = self.get_file_entry_key_path(start_version);
         log_grpc_step(
             "file_worker",
             IndexerGrpcStep::FileStoreEncodedTxns,
@@ -195,7 +236,7 @@ impl FileStoreOperator for GcsFileStoreOperator {
         Object::create(
             bucket_name.clone().as_str(),
             file_entry.into_inner(),
-            file_entry_key.as_str(),
+            file_entry_key_path.as_str(),
             JSON_FILE_TYPE,
         )
         .await?;
diff --git a/ecosystem/indexer-grpc/indexer-grpc-utils/src/in_memory_cache.rs b/ecosystem/indexer-grpc/indexer-grpc-utils/src/in_memory_cache.rs
index 6f8534a18bfc4..fe39317376ab9 100644
--- a/ecosystem/indexer-grpc/indexer-grpc-utils/src/in_memory_cache.rs
+++ b/ecosystem/indexer-grpc/indexer-grpc-utils/src/in_memory_cache.rs
@@ -8,21 +8,75 @@ use dashmap::DashMap;
 use itertools::Itertools;
 use prost::Message;
 use redis::AsyncCommands;
+use serde::{Deserialize, Serialize};
 use std::sync::Arc;
 use tokio::sync::RwLock;
 
 // Internal lookup retry interval for in-memory cache.
 const IN_MEMORY_CACHE_LOOKUP_RETRY_INTERVAL_MS: u64 = 10;
 const IN_MEMORY_CACHE_GC_INTERVAL_MS: u64 = 100;
-// Max cache size in bytes: 3 GB.
-const IN_MEMORY_CACHE_TARGET_MAX_CAPACITY_IN_BYTES: u64 = 3_000_000_000;
-// Eviction cache size in bytes: 3.5 GB. Evict the map to 3 GB.
-const IN_MEMORY_CACHE_EVICTION_TRIGGER_SIZE_IN_BYTES: u64 = 3_500_000_000;
 // Max cache entry TTL: 30 seconds.
 // const MAX_IN_MEMORY_CACHE_ENTRY_TTL: u64 = 30;
 // Warm-up cache entries. Pre-fetch the cache entries to warm up the cache.
-pub const WARM_UP_CACHE_ENTRIES: u64 = 20_000;
+pub const WARM_UP_CACHE_ENTRIES: u64 = 100;
 pub const MAX_REDIS_FETCH_BATCH_SIZE: usize = 500;
+pub const MAX_FETCH_BATCH_SIZE: usize = 5000;
+
+/// Configuration for when we want to explicitly declare how large the cache should be.
+#[derive(Clone, Debug, Deserialize, Serialize)]
+#[serde(deny_unknown_fields)]
+#[serde(default)]
+pub struct InMemoryCacheSizeConfig {
+    /// The maximum size of the cache in bytes.
+    cache_target_size_bytes: u64,
+    /// The maximum size of the cache in bytes before eviction is triggered, at which
+    /// point we reduce the size of the cache back to `cache_target_size_bytes`.
+    cache_eviction_trigger_size_bytes: u64,
+}
+
+impl Default for InMemoryCacheSizeConfig {
+    fn default() -> Self {
+        Self {
+            // 3 GB.
+            cache_target_size_bytes: 3_000_000_000,
+            // 3.5 GB.
+            cache_eviction_trigger_size_bytes: 3_500_000_000,
+        }
+    }
+}
+
+impl InMemoryCacheSizeConfig {
+    pub fn validate(&self) -> anyhow::Result<()> {
+        if self.cache_target_size_bytes == 0 {
+            return Err(anyhow::anyhow!("Cache target size must be greater than 0"));
+        }
+        if self.cache_eviction_trigger_size_bytes == 0 {
+            return Err(anyhow::anyhow!(
+                "Cache eviction trigger size must be greater than 0"
+            ));
+        }
+        if self.cache_eviction_trigger_size_bytes < self.cache_target_size_bytes {
+            return Err(anyhow::anyhow!(
+                "Cache eviction trigger size must be greater than cache target size"
+            ));
+        }
+        Ok(())
+    }
+}
+
+/// Configuration for the in memory cache.
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
+#[serde(deny_unknown_fields)]
+#[serde(default)]
+pub struct InMemoryCacheConfig {
+    size_config: InMemoryCacheSizeConfig,
+}
+
+impl InMemoryCacheConfig {
+    pub fn validate(&self) -> anyhow::Result<()> {
+        self.size_config.validate()
+    }
+}
 
 #[derive(Debug, Clone, Copy)]
 struct CacheMetadata {
@@ -32,6 +86,7 @@ struct CacheMetadata {
 }
 
 /// InMemoryCache is a simple in-memory cache that stores the protobuf Transaction.
+#[derive(Debug)]
 pub struct InMemoryCache {
     /// Cache maps the cache key to the deserialized Transaction.
     cache: Arc<DashMap<u64, Arc<Transaction>>>,
@@ -41,6 +96,7 @@ pub struct InMemoryCache {
 
 impl InMemoryCache {
     pub async fn new_with_redis_connection<C>(
+        cache_config: InMemoryCacheConfig,
         conn: C,
         storage_format: StorageFormat,
     ) -> anyhow::Result<Self>
@@ -68,6 +124,7 @@ impl InMemoryCache {
             cancellation_token.clone(),
         );
         spawn_cleanup_task(
+            cache_config.size_config.clone(),
             cache.clone(),
             cache_metadata.clone(),
             cancellation_token.clone(),
@@ -80,7 +137,7 @@ impl InMemoryCache {
         })
     }
 
-    async fn latest_version(&self) -> u64 {
+    pub async fn latest_version(&self) -> u64 {
         self.cache_metadata.read().await.latest_version
     }
 
@@ -101,7 +158,7 @@ impl InMemoryCache {
             // This is to avoid fetching too many transactions at once.
             let ending_version = std::cmp::min(
                 latest_version,
-                starting_version + MAX_REDIS_FETCH_BATCH_SIZE as u64,
+                starting_version + MAX_FETCH_BATCH_SIZE as u64,
             );
             break (
                 (starting_version..ending_version).collect::<Vec<u64>>(),
@@ -199,7 +256,7 @@ fn spawn_update_task<C>(
             }
             let end_version = std::cmp::min(
                 current_latest_version,
-                in_cache_latest_version + 10 * MAX_REDIS_FETCH_BATCH_SIZE as u64,
+                in_cache_latest_version + 10 * MAX_FETCH_BATCH_SIZE as u64,
             );
             let versions_to_fetch = (in_cache_latest_version..end_version).collect();
             let transactions = batch_get_transactions(&mut conn, versions_to_fetch, storage_format)
@@ -228,6 +285,7 @@ fn spawn_update_task<C>(
 }
 
 fn spawn_cleanup_task(
+    cache_size_config: InMemoryCacheSizeConfig,
     cache: Arc<DashMap<u64, Arc<Transaction>>>,
     cache_metadata: Arc<RwLock<CacheMetadata>>,
     cancellation_token: tokio_util::sync::CancellationToken,
@@ -241,7 +299,7 @@ fn spawn_cleanup_task(
             let mut current_cache_metadata = { *cache_metadata.read().await };
             let should_evict = current_cache_metadata
                 .total_size_in_bytes
-                .saturating_sub(IN_MEMORY_CACHE_EVICTION_TRIGGER_SIZE_IN_BYTES)
+                .saturating_sub(cache_size_config.cache_eviction_trigger_size_bytes)
                 > 0;
             if !should_evict {
                 tokio::time::sleep(std::time::Duration::from_millis(
@@ -253,7 +311,7 @@ fn spawn_cleanup_task(
             let mut actual_bytes_removed = 0;
             let mut bytes_to_remove = current_cache_metadata
                 .total_size_in_bytes
-                .saturating_sub(IN_MEMORY_CACHE_TARGET_MAX_CAPACITY_IN_BYTES);
+                .saturating_sub(cache_size_config.cache_target_size_bytes);
             while bytes_to_remove > 0 {
                 let key_to_remove = current_cache_metadata.first_version;
                 let (_k, v) = cache
@@ -374,6 +432,7 @@ mod tests {
             Ok(0),
         )]);
         let in_memory_cache = InMemoryCache::new_with_redis_connection(
+            InMemoryCacheConfig::default(),
             mock_connection.clone(),
             StorageFormat::Base64UncompressedProto,
         )
@@ -401,6 +460,7 @@ mod tests {
             ),
         ]);
         let in_memory_cache = InMemoryCache::new_with_redis_connection(
+            InMemoryCacheConfig::default(),
             mock_connection.clone(),
             StorageFormat::Base64UncompressedProto,
         )
@@ -445,6 +505,7 @@ mod tests {
             MockCmd::new(redis::cmd("GET").arg("latest_version"), Ok(2)),
         ]);
         let in_memory_cache = InMemoryCache::new_with_redis_connection(
+            InMemoryCacheConfig::default(),
             mock_connection.clone(),
             StorageFormat::Base64UncompressedProto,
         )
diff --git a/ecosystem/indexer-grpc/indexer-grpc-utils/src/lib.rs b/ecosystem/indexer-grpc/indexer-grpc-utils/src/lib.rs
index 5163a4f53d379..d76fdc5108225 100644
--- a/ecosystem/indexer-grpc/indexer-grpc-utils/src/lib.rs
+++ b/ecosystem/indexer-grpc/indexer-grpc-utils/src/lib.rs
@@ -41,7 +41,7 @@ pub async fn create_grpc_client(address: Url) -> GrpcClientType {
                 Ok(client
                     .max_decoding_message_size(usize::MAX)
                     .max_encoding_message_size(usize::MAX)
-                    .send_compressed(CompressionEncoding::Gzip)
+                    .send_compressed(CompressionEncoding::Zstd)
                     .accept_compressed(CompressionEncoding::Gzip)
                     .accept_compressed(CompressionEncoding::Zstd))
             },
@@ -116,6 +116,7 @@ pub fn timestamp_to_unixtime(timestamp: &Timestamp) -> f64 {
 }
 
 pub fn parse_timestamp(ts: &Timestamp, version: i64) -> chrono::NaiveDateTime {
+    #[allow(deprecated)]
     chrono::NaiveDateTime::from_timestamp_opt(ts.seconds, ts.nanos as u32)
         .unwrap_or_else(|| panic!("Could not parse timestamp {:?} for version {}", ts, version))
 }
diff --git a/ecosystem/indexer-grpc/transaction-filter/.gitattributes b/ecosystem/indexer-grpc/transaction-filter/.gitattributes
new file mode 100644
index 0000000000000..2bf52227c88c2
--- /dev/null
+++ b/ecosystem/indexer-grpc/transaction-filter/.gitattributes
@@ -0,0 +1,3 @@
+fixtures/compressed_files_lz4_00008bc1d5adcf862d3967c1410001fb_705101000.pb.lz4 filter=lfs diff=lfs merge=lfs -text
+fixtures/compressed_files_lz4_0013c194ec4fdbfb8db7306170aac083_445907000.pb.lz4 filter=lfs diff=lfs merge=lfs -text
+fixtures/compressed_files_lz4_f3d880d9700c70d71fefe71aa9218aa9_301616000.pb.lz4 filter=lfs diff=lfs merge=lfs -text
diff --git a/ecosystem/indexer-grpc/transaction-filter/Cargo.toml b/ecosystem/indexer-grpc/transaction-filter/Cargo.toml
new file mode 100644
index 0000000000000..1ecc81a9e243b
--- /dev/null
+++ b/ecosystem/indexer-grpc/transaction-filter/Cargo.toml
@@ -0,0 +1,31 @@
+[package]
+name = "aptos-transaction-filter"
+version = "0.1.0"
+
+# Workspace inherited keys
+authors = { workspace = true }
+edition = { workspace = true }
+homepage = { workspace = true }
+license = { workspace = true }
+publish = { workspace = true }
+repository = { workspace = true }
+rust-version = { workspace = true }
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+anyhow = { workspace = true }
+aptos-protos = { workspace = true }
+
+derive_builder = { workspace = true }
+
+prost = { workspace = true }
+
+serde = { workspace = true }
+serde_json = { workspace = true }
+serde_yaml = { workspace = true }
+
+thiserror = { workspace = true }
+
+[dev-dependencies]
+# we only decompress the fixture protos in test
+lz4 = { workspace = true }
diff --git a/ecosystem/indexer-grpc/transaction-filter/README.md b/ecosystem/indexer-grpc/transaction-filter/README.md
new file mode 100644
index 0000000000000..492c8923f56e1
--- /dev/null
+++ b/ecosystem/indexer-grpc/transaction-filter/README.md
@@ -0,0 +1,145 @@
+# Transaction Filter
+
+## Overview
+
+The goal of **transaction filtering** is to be able to save resources downstream of wherever filtering is used.
+For this to be true, the filtering itself must be **fast and use minimal resources**, and so we do a few things:
+
+1. We avoid clones, copies, etc as much as possible
+2. We do a single pass over the transaction data
+
+## Transaction Filtering
+
+There are a few different parts of a transaction that are queryable:
+
+1. The "root" level. This includes:
+    - Transaction type
+    - Success
+2. User Transactions. Each user transaction has:
+    - Sender
+    - Payload: we only support the entry function payload
+    - Entry function (address, module, name)
+    - Entry function ID string
+3. Events. Each event has:
+    - Key
+    - Type
+
+### Usage & Examples
+
+There are two different patterns for building a filter- you can either use the `TransactionFilterBuilder` or
+the `TransactionFilter` struct directly.
+
+The `TransactionFilterBuilder` is a more ergonomic way to build a filter, and is not significantly worse construction
+performance, assuming this is being done infrequently.
+
+```
+use transaction_filter::filters::EventFilterBuilder;
+
+let ef = EventFilterBuilder::default()
+  .data("spins")
+  .struct_type(
+    MoveStructTagFilterBuilder::default()
+      .address("0x0077")
+      .module("roulette")
+      .name("spin")
+      .build()?,
+  )
+  .build()?;
+```
+
+The `TransactionFilter` struct is also available, but requires direct construction of the structs.
+
+```
+use transaction_filter::filters::EventFilter;
+
+let ef = EventFilter {
+  data: Some("spins".into()),
+  struct_type: Some(MoveStructTagFilter {
+    address: Some("0x0077".into()),
+    module: Some("roulette".into()),
+    name: Some("spin".into()),
+  }),
+};
+```
+
+Once you have some filters built, you can combine them with the boolean operators `and`, `or`, and `not`.
+
+```
+let trf = TransactionRootFilterBuilder::default()
+  .success(true).build()?;
+
+let utf = UserTransactionFilterBuilder::default()
+  .sender("0x0011".into()).build()?;
+
+let ef = EventFilterBuilder::default()
+  .struct_type(
+    MoveStructTagFilterBuilder::default()
+      .address("0x0077")
+      .module("roulette")
+      .name("spin")
+      .build()?,
+  )
+  .build()?;
+
+// Combine filters using logical operators!
+// (trf OR utf)
+let trf_or_utf = BooleanTransactionFilter::from(trf).or(utf);
+// ((trf OR utf) AND ef)
+let query = trf_or_utf.and(ef);
+
+let transactions: Vec<Transaction> = transaction_stream.next().await;
+let filtered_transactions = query.filter_vec(transactions);
+```
+
+## API & Serialization
+
+`BooleanTransactionFilter` is the top level filter struct, and it uses `serde` for serialization and deserialization.
+
+This means we can use it across all of our projects, whether they be GRPC services, REST services, or CLI tools.
+
+The above example can be serialized to JSON like so:
+
+```json
+{
+  "and": [
+    {
+      "or": [
+        {
+          "type": "TransactionRootFilter",
+          "success": true
+        },
+        {
+          "type": "UserTransactionFilter",
+          "sender": "0x0011"
+        }
+      ]
+    },
+    {
+      "type": "EventFilter",
+      "struct_type": {
+        "address": "0x0077",
+        "module": "roulette",
+        "name": "spin"
+      }
+    }
+  ]
+}
+```
+
+Or, if you prefer, as yaml:
+
+```yaml
+---
+and:
+  - or:
+      - type: TransactionRootFilter
+        success: true
+      - type: UserTransactionFilter
+        sender: '0x0011'
+  - type: EventFilter
+    struct_type:
+      address: '0x0077'
+      module: roulette
+      name: spin
+```
+
diff --git a/ecosystem/indexer-grpc/transaction-filter/fixtures/compressed_files_lz4_00008bc1d5adcf862d3967c1410001fb_705101000.pb.lz4 b/ecosystem/indexer-grpc/transaction-filter/fixtures/compressed_files_lz4_00008bc1d5adcf862d3967c1410001fb_705101000.pb.lz4
new file mode 100644
index 0000000000000..a9fd957207f3c
--- /dev/null
+++ b/ecosystem/indexer-grpc/transaction-filter/fixtures/compressed_files_lz4_00008bc1d5adcf862d3967c1410001fb_705101000.pb.lz4
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dedf23a08bc7bd9fc9c96dc5d45741fe52c225ccfc2f7c72030240585a531dc3
+size 465907
diff --git a/ecosystem/indexer-grpc/transaction-filter/fixtures/compressed_files_lz4_0013c194ec4fdbfb8db7306170aac083_445907000.pb.lz4 b/ecosystem/indexer-grpc/transaction-filter/fixtures/compressed_files_lz4_0013c194ec4fdbfb8db7306170aac083_445907000.pb.lz4
new file mode 100644
index 0000000000000..96dafb6ba39c5
--- /dev/null
+++ b/ecosystem/indexer-grpc/transaction-filter/fixtures/compressed_files_lz4_0013c194ec4fdbfb8db7306170aac083_445907000.pb.lz4
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:596c2e0582123c36e06c3be8ded161afa63b39c742acdbf279da8d97bfa8ccd3
+size 3039165
diff --git a/ecosystem/indexer-grpc/transaction-filter/fixtures/compressed_files_lz4_f3d880d9700c70d71fefe71aa9218aa9_301616000.pb.lz4 b/ecosystem/indexer-grpc/transaction-filter/fixtures/compressed_files_lz4_f3d880d9700c70d71fefe71aa9218aa9_301616000.pb.lz4
new file mode 100644
index 0000000000000..a0c3916e80854
--- /dev/null
+++ b/ecosystem/indexer-grpc/transaction-filter/fixtures/compressed_files_lz4_f3d880d9700c70d71fefe71aa9218aa9_301616000.pb.lz4
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:55750a530523ed097005e2c95e832d2f1ef8c50f535a65f3d4d025073f635e9a
+size 40801877
diff --git a/ecosystem/indexer-grpc/transaction-filter/src/boolean_transaction_filter.rs b/ecosystem/indexer-grpc/transaction-filter/src/boolean_transaction_filter.rs
new file mode 100644
index 0000000000000..4adaad60e5e0a
--- /dev/null
+++ b/ecosystem/indexer-grpc/transaction-filter/src/boolean_transaction_filter.rs
@@ -0,0 +1,422 @@
+// Copyright (c) Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    errors::FilterError,
+    filters::{EventFilter, TransactionRootFilter, UserTransactionFilter},
+    traits::Filterable,
+};
+use aptos_protos::transaction::v1::{transaction::TxnData, Transaction};
+use serde::{Deserialize, Serialize};
+use std::fmt::Debug;
+
+/// BooleanTransactionFilter is the top level filter
+#[derive(Clone, Debug, Deserialize, Serialize)]
+#[serde(untagged)]
+pub enum BooleanTransactionFilter {
+    And(LogicalAnd),
+    Or(LogicalOr),
+    Not(LogicalNot),
+    Filter(APIFilter),
+}
+
+impl From<APIFilter> for BooleanTransactionFilter {
+    fn from(filter: APIFilter) -> Self {
+        BooleanTransactionFilter::Filter(filter)
+    }
+}
+
+impl From<TransactionRootFilter> for BooleanTransactionFilter {
+    fn from(filter: TransactionRootFilter) -> Self {
+        BooleanTransactionFilter::Filter(APIFilter::TransactionRootFilter(filter))
+    }
+}
+
+impl From<UserTransactionFilter> for BooleanTransactionFilter {
+    fn from(filter: UserTransactionFilter) -> Self {
+        BooleanTransactionFilter::Filter(APIFilter::UserTransactionFilter(filter))
+    }
+}
+
+impl From<EventFilter> for BooleanTransactionFilter {
+    fn from(filter: EventFilter) -> Self {
+        BooleanTransactionFilter::Filter(APIFilter::EventFilter(filter))
+    }
+}
+
+impl BooleanTransactionFilter {
+    /// Combines the current filter with another filter using a logical AND.
+    /// Returns a new `BooleanTransactionFilter` representing the conjunction.
+    ///
+    /// # Example
+    ///
+    /// ```
+    /// use aptos_transaction_filter::BooleanTransactionFilter;
+    /// use aptos_transaction_filter::filters::{EventFilterBuilder, MoveStructTagFilterBuilder, UserTransactionFilterBuilder};
+    ///
+    /// fn example() -> Result<BooleanTransactionFilter, anyhow::Error> {
+    ///   // Create a filter for user transactions where the sender is "0x1"
+    ///   let user_sender_filter = UserTransactionFilterBuilder::default()
+    ///       .sender("0x1")
+    ///       .build()?;
+    ///   // Create a filter where the event struct address Is 0x0fff
+    ///   let event_filter = EventFilterBuilder::default()
+    ///       .struct_type(
+    ///           MoveStructTagFilterBuilder::default()
+    ///           .address("0x0fff").build()?
+    ///       ).build()?;
+    ///   // Combine the two using logical AND
+    ///  Ok(BooleanTransactionFilter::from(user_sender_filter).and(event_filter))
+    /// }
+    /// ```
+    pub fn and<Other: Into<BooleanTransactionFilter>>(self, other: Other) -> Self {
+        BooleanTransactionFilter::And(LogicalAnd {
+            and: vec![self, other.into()],
+        })
+    }
+
+    /// Combines the current filter with another filter using a logical OR.
+    /// Returns a new `BooleanTransactionFilter` representing the disjunction.
+    ///
+    /// # Example
+    ///
+    /// ```
+    /// use aptos_transaction_filter::BooleanTransactionFilter;
+    /// use aptos_transaction_filter::filters::{EventFilterBuilder, MoveStructTagFilterBuilder, UserTransactionFilterBuilder};
+    ///
+    /// fn example() -> Result<BooleanTransactionFilter, anyhow::Error> {
+    ///   // Create a filter for user transactions where the sender is "0x1"
+    ///   let user_sender_filter = UserTransactionFilterBuilder::default()
+    ///       .sender("0x1")
+    ///       .build()?;
+    ///   // Create a filter where the event struct address Is 0x0fff
+    ///   let event_filter = EventFilterBuilder::default()
+    ///       .struct_type(
+    ///           MoveStructTagFilterBuilder::default()
+    ///           .address("0x0fff").build()?
+    ///       ).build()?;
+    ///   // Combine the two using logical OR
+    ///   Ok(BooleanTransactionFilter::from(user_sender_filter).or(event_filter))
+    /// }
+    /// ```
+    pub fn or<Other: Into<BooleanTransactionFilter>>(self, other: Other) -> Self {
+        BooleanTransactionFilter::Or(LogicalOr {
+            or: vec![self, other.into()],
+        })
+    }
+
+    /// Negates the current filter.
+    /// Returns a new `BooleanTransactionFilter` representing the negation.
+    ///
+    /// # Example
+    ///
+    /// ```
+    /// use aptos_transaction_filter::BooleanTransactionFilter;
+    /// use aptos_transaction_filter::filters::{EventFilterBuilder, MoveStructTagFilterBuilder, UserTransactionFilterBuilder};
+    ///
+    /// fn example() -> Result<BooleanTransactionFilter, anyhow::Error> {
+    ///   // Create a filter for user transactions where the sender is "0x1"
+    ///   let user_sender_filter = UserTransactionFilterBuilder::default()
+    ///       .sender("0x1")
+    ///       .build()?;
+    ///
+    ///   // Negate the filter; this now matches transactions where the submitter != 0x1
+    ///   Ok(BooleanTransactionFilter::from(user_sender_filter).not())
+    /// }
+    /// ```
+    #[allow(clippy::should_implement_trait)]
+    pub fn not(self) -> Self {
+        BooleanTransactionFilter::Not(LogicalNot {
+            not: Box::new(self),
+        })
+    }
+
+    /// Creates a new `BooleanTransactionFilter` representing a conjunction of multiple filters.
+    pub fn new_and(and: Vec<BooleanTransactionFilter>) -> Self {
+        BooleanTransactionFilter::And(LogicalAnd { and })
+    }
+
+    /// Creates a new `BooleanTransactionFilter` representing a disjunction of multiple filters.
+    pub fn new_or(or: Vec<BooleanTransactionFilter>) -> Self {
+        BooleanTransactionFilter::Or(LogicalOr { or })
+    }
+
+    /// Creates a new `BooleanTransactionFilter` representing the negation of a filter.
+    pub fn new_not(not: BooleanTransactionFilter) -> Self {
+        BooleanTransactionFilter::Not(LogicalNot { not: Box::new(not) })
+    }
+
+    /// Wraps an APIFilter into a `BooleanTransactionFilter`.
+    pub fn new_filter(filter: APIFilter) -> Self {
+        BooleanTransactionFilter::Filter(filter)
+    }
+}
+
+impl Filterable<Transaction> for BooleanTransactionFilter {
+    fn validate_state(&self) -> Result<(), FilterError> {
+        match self {
+            BooleanTransactionFilter::And(and) => and.is_valid(),
+            BooleanTransactionFilter::Or(or) => or.is_valid(),
+            BooleanTransactionFilter::Not(not) => not.is_valid(),
+            BooleanTransactionFilter::Filter(filter) => filter.is_valid(),
+        }
+    }
+
+    fn is_allowed(&self, item: &Transaction) -> bool {
+        match self {
+            BooleanTransactionFilter::And(and) => and.is_allowed(item),
+            BooleanTransactionFilter::Or(or) => or.is_allowed(item),
+            BooleanTransactionFilter::Not(not) => not.is_allowed(item),
+            BooleanTransactionFilter::Filter(filter) => filter.is_allowed(item),
+        }
+    }
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct LogicalAnd {
+    and: Vec<BooleanTransactionFilter>,
+}
+
+impl Filterable<Transaction> for LogicalAnd {
+    fn validate_state(&self) -> Result<(), FilterError> {
+        for filter in &self.and {
+            filter.is_valid()?;
+        }
+        Ok(())
+    }
+
+    fn is_allowed(&self, item: &Transaction) -> bool {
+        self.and.iter().all(|filter| filter.is_allowed(item))
+    }
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct LogicalOr {
+    or: Vec<BooleanTransactionFilter>,
+}
+
+impl Filterable<Transaction> for LogicalOr {
+    fn validate_state(&self) -> Result<(), FilterError> {
+        for filter in &self.or {
+            filter.is_valid()?;
+        }
+        Ok(())
+    }
+
+    fn is_allowed(&self, item: &Transaction) -> bool {
+        self.or.iter().any(|filter| filter.is_allowed(item))
+    }
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct LogicalNot {
+    not: Box<BooleanTransactionFilter>,
+}
+
+impl Filterable<Transaction> for LogicalNot {
+    fn validate_state(&self) -> Result<(), FilterError> {
+        self.not.is_valid()
+    }
+
+    fn is_allowed(&self, item: &Transaction) -> bool {
+        !self.not.is_allowed(item)
+    }
+}
+
+/// These are filters we would expect to be exposed via API
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
+#[serde(deny_unknown_fields)]
+#[serde(tag = "type")]
+pub enum APIFilter {
+    TransactionRootFilter(TransactionRootFilter),
+    UserTransactionFilter(UserTransactionFilter),
+    EventFilter(EventFilter),
+}
+
+impl From<TransactionRootFilter> for APIFilter {
+    fn from(filter: TransactionRootFilter) -> Self {
+        APIFilter::TransactionRootFilter(filter)
+    }
+}
+
+impl From<UserTransactionFilter> for APIFilter {
+    fn from(filter: UserTransactionFilter) -> Self {
+        APIFilter::UserTransactionFilter(filter)
+    }
+}
+
+impl From<EventFilter> for APIFilter {
+    fn from(filter: EventFilter) -> Self {
+        APIFilter::EventFilter(filter)
+    }
+}
+
+impl Filterable<Transaction> for APIFilter {
+    fn validate_state(&self) -> Result<(), FilterError> {
+        match self {
+            APIFilter::TransactionRootFilter(filter) => filter.is_valid(),
+            APIFilter::UserTransactionFilter(filter) => filter.is_valid(),
+            APIFilter::EventFilter(filter) => filter.is_valid(),
+        }
+    }
+
+    fn is_allowed(&self, txn: &Transaction) -> bool {
+        match self {
+            APIFilter::TransactionRootFilter(filter) => filter.is_allowed(txn),
+            APIFilter::UserTransactionFilter(ut_filter) => ut_filter.is_allowed(txn),
+            APIFilter::EventFilter(events_filter) => {
+                if let Some(txn_data) = &txn.txn_data {
+                    let events = match txn_data {
+                        TxnData::BlockMetadata(bm) => &bm.events,
+                        TxnData::Genesis(g) => &g.events,
+                        TxnData::StateCheckpoint(_) => return false,
+                        TxnData::User(u) => &u.events,
+                        TxnData::Validator(_) => return false,
+                        TxnData::BlockEpilogue(_) => return false,
+                    };
+                    events_filter.is_allowed_vec(events)
+                } else {
+                    false
+                }
+            },
+        }
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use crate::filters::{
+        event::EventFilterBuilder, move_module::MoveStructTagFilterBuilder,
+        /*user_transaction::EntryFunctionFilter,*/ TransactionRootFilterBuilder,
+        UserTransactionFilterBuilder, /*UserTransactionPayloadFilterBuilder,*/
+    };
+
+    // Disabled for now while we investigate an issue with lz4 in aptos-core:
+    // https://aptos-org.slack.com/archives/C04PF1X2UKY/p1718995777239809?thread_ts=1718969817.705389&cid=C04PF1X2UKY
+    /*
+    #[test]
+    pub fn test_query_parsing() {
+        let trf = TransactionRootFilter {
+            success: Some(true),
+            txn_type: Some(aptos_protos::transaction::v1::transaction::TransactionType::User),
+        };
+
+        let utf = UserTransactionFilterBuilder::default()
+            .sender("0x0011")
+            .payload(
+                UserTransactionPayloadFilterBuilder::default()
+                    .function(EntryFunctionFilter {
+                        address: Some("0x007".into()),
+                        module: Some("roulette".into()),
+                        function: None,
+                    })
+                    .build()
+                    .unwrap(),
+            )
+            .build()
+            .unwrap();
+
+        let ef = EventFilterBuilder::default()
+            .struct_type(
+                MoveStructTagFilterBuilder::default()
+                    .address("0x0077")
+                    .module("roulette")
+                    .name("spin")
+                    .build()
+                    .unwrap(),
+            )
+            .build()
+            .unwrap();
+
+        // (trf OR utf)
+        let trf_or_utf = BooleanTransactionFilter::from(trf).or(utf);
+        // ((trf OR utf) AND ef)
+        let query = trf_or_utf.and(ef);
+
+        println!(
+            "JSON RESULT (QUERY 1):\n {}",
+            serde_json::to_string_pretty(&query).unwrap()
+        );
+
+        let txns = load_graffio_fixture();
+
+        // Benchmark how long it takes to do this 100 times
+        let start = std::time::Instant::now();
+        const LOOPS: i32 = 1000;
+        for _ in 0..LOOPS {
+            for txn in &txns.transactions {
+                query.is_allowed(txn);
+            }
+        }
+        let elapsed = start.elapsed();
+
+        let total_txn = LOOPS * txns.transactions.len() as i32;
+        println!(
+            "BENCH: Took {:?} for {} transactions ({:?} each)",
+            elapsed,
+            total_txn,
+            elapsed / total_txn as u32
+        );
+
+        let ef_econia = EventFilterBuilder::default()
+            .struct_type(
+                MoveStructTagFilterBuilder::default()
+                    .address("0x00ECONIA")
+                    .build()
+                    .unwrap(),
+            )
+            .build()
+            .unwrap();
+        let ef_aries = EventFilterBuilder::default()
+            .struct_type(
+                MoveStructTagFilterBuilder::default()
+                    .address("0x00ARIES")
+                    .build()
+                    .unwrap(),
+            )
+            .build()
+            .unwrap();
+
+        let query = BooleanTransactionFilter::from(ef_econia).or(ef_aries);
+        println!(
+            "JSON RESULT (QUERY 2):\n {}",
+            serde_json::to_string_pretty(&query).unwrap()
+        );
+    }
+    */
+
+    #[test]
+    fn test_serialization() {
+        let trf = TransactionRootFilterBuilder::default()
+            .success(true)
+            .build()
+            .unwrap();
+
+        let utf = UserTransactionFilterBuilder::default()
+            .sender("0x0011")
+            .build()
+            .unwrap();
+
+        let ef = EventFilterBuilder::default()
+            .struct_type(
+                MoveStructTagFilterBuilder::default()
+                    .address("0x0077")
+                    .module("roulette")
+                    .name("spin")
+                    .build()
+                    .unwrap(),
+            )
+            .build()
+            .unwrap();
+
+        // Combine filters using logical operators!
+        // (trf OR utf)
+        let trf_or_utf = BooleanTransactionFilter::from(trf).or(utf);
+        // ((trf OR utf) AND ef)
+        let query = trf_or_utf.and(ef);
+
+        let yaml = serde_yaml::to_string(&query).unwrap();
+        println!("YAML: \n{}", yaml);
+    }
+}
diff --git a/ecosystem/indexer-grpc/transaction-filter/src/errors.rs b/ecosystem/indexer-grpc/transaction-filter/src/errors.rs
new file mode 100644
index 0000000000000..01d07d3349bb4
--- /dev/null
+++ b/ecosystem/indexer-grpc/transaction-filter/src/errors.rs
@@ -0,0 +1,97 @@
+// Copyright (c) Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use serde::{Serialize, Serializer};
+use std::fmt::Display;
+use thiserror::Error as ThisError;
+
+#[derive(Debug, Serialize)]
+pub struct FilterStepTrace {
+    pub serialized_filter: String,
+    pub filter_type: String,
+}
+
+impl Display for FilterStepTrace {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}:   {}", self.filter_type, self.serialized_filter)
+    }
+}
+#[derive(Debug)]
+pub struct SerializableError {
+    pub inner: Box<dyn std::error::Error + Send + Sync>,
+}
+
+impl Display for SerializableError {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self.inner)
+    }
+}
+
+impl std::error::Error for SerializableError {
+    fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
+        Some(&*self.inner)
+    }
+}
+
+/// Custom error that allows for keeping track of the filter type/path that caused the error
+#[derive(Debug, Serialize, ThisError)]
+pub struct FilterError {
+    pub filter_path: Vec<FilterStepTrace>,
+    #[source]
+    pub error: SerializableError,
+}
+
+impl FilterError {
+    pub fn new(error: Box<dyn std::error::Error + Send + Sync>) -> Self {
+        Self {
+            filter_path: Vec::new(),
+            error: SerializableError::new(error),
+        }
+    }
+
+    pub fn add_trace(&mut self, serialized_filter: String, filter_type: String) {
+        self.filter_path.push(FilterStepTrace {
+            serialized_filter,
+            filter_type,
+        });
+    }
+}
+
+impl From<anyhow::Error> for FilterError {
+    fn from(error: anyhow::Error) -> Self {
+        Self::new(error.into())
+    }
+}
+
+impl Display for FilterError {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        let trace_path = self
+            .filter_path
+            .iter()
+            .map(|trace| format!("{}", trace))
+            .collect::<Vec<String>>()
+            .join("\n");
+        write!(
+            f,
+            "Filter Error: {:?}\nTrace Path:\n{}",
+            self.error.inner, trace_path
+        )
+    }
+}
+
+impl SerializableError {
+    fn new(error: Box<dyn std::error::Error + Send + Sync>) -> Self {
+        SerializableError { inner: error }
+    }
+}
+
+// Implement Serialize for the wrapper
+impl Serialize for SerializableError {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        // Serialize the error as its string representation
+        serializer.serialize_str(&self.inner.to_string())
+    }
+}
diff --git a/ecosystem/indexer-grpc/transaction-filter/src/filters/event.rs b/ecosystem/indexer-grpc/transaction-filter/src/filters/event.rs
new file mode 100644
index 0000000000000..8dcbca5ab45a9
--- /dev/null
+++ b/ecosystem/indexer-grpc/transaction-filter/src/filters/event.rs
@@ -0,0 +1,69 @@
+// Copyright (c) Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{errors::FilterError, filters::MoveStructTagFilter, traits::Filterable};
+use anyhow::Error;
+use aptos_protos::transaction::v1::{move_type::Content, Event};
+use serde::{Deserialize, Serialize};
+
+/// Example:
+/// ```
+/// use aptos_transaction_filter::{EventFilterBuilder, MoveStructTagFilterBuilder};
+///
+/// let move_struct_tag_filter = MoveStructTagFilterBuilder::default()
+///   .address("0x0077")
+///   .module("roulette")
+///   .name("spin")
+///   .build()
+///   .unwrap();
+/// let filter = EventFilterBuilder::default()
+///   .struct_type(move_struct_tag_filter)
+///   .build()
+///   .unwrap();
+/// ```
+#[derive(Clone, Default, Debug, Serialize, Deserialize, PartialEq)]
+#[serde(deny_unknown_fields)]
+#[derive(derive_builder::Builder)]
+#[builder(setter(strip_option), default)]
+pub struct EventFilter {
+    #[serde(skip_serializing_if = "Option::is_none")]
+    #[builder(setter(into, strip_option), default)]
+    pub data: Option<String>,
+    // Only for events that have a struct as their generic
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub struct_type: Option<MoveStructTagFilter>,
+}
+
+impl Filterable<Event> for EventFilter {
+    #[inline]
+    fn validate_state(&self) -> Result<(), FilterError> {
+        if self.data.is_none() && self.struct_type.is_none() {
+            return Err(Error::msg("At least one of data or struct_type must be set").into());
+        };
+
+        self.data.is_valid()?;
+        self.struct_type.is_valid()?;
+        Ok(())
+    }
+
+    #[inline]
+    fn is_allowed(&self, item: &Event) -> bool {
+        if let Some(struct_type_filter) = &self.struct_type {
+            if let Some(Content::Struct(struct_tag)) =
+                &item.r#type.as_ref().and_then(|t| t.content.as_ref())
+            {
+                if !struct_type_filter.is_allowed(struct_tag) {
+                    return false;
+                }
+            } else {
+                return false;
+            }
+        }
+
+        if !self.data.is_allowed(&item.data) {
+            return false;
+        }
+
+        true
+    }
+}
diff --git a/ecosystem/indexer-grpc/transaction-filter/src/filters/mod.rs b/ecosystem/indexer-grpc/transaction-filter/src/filters/mod.rs
new file mode 100644
index 0000000000000..289a629c65c79
--- /dev/null
+++ b/ecosystem/indexer-grpc/transaction-filter/src/filters/mod.rs
@@ -0,0 +1,19 @@
+// Copyright (c) Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod event;
+pub mod move_module;
+pub mod transaction_root;
+pub mod user_transaction;
+
+// Re-export for easier use
+pub use event::EventFilter;
+// Re-export the builders
+pub use event::EventFilterBuilder;
+pub use move_module::{MoveStructTagFilter, MoveStructTagFilterBuilder};
+pub use transaction_root::{TransactionRootFilter, TransactionRootFilterBuilder};
+pub use user_transaction::{
+    EntryFunctionFilter, EntryFunctionFilterBuilder, UserTransactionFilter,
+    UserTransactionFilterBuilder, UserTransactionPayloadFilter,
+    UserTransactionPayloadFilterBuilder,
+};
diff --git a/ecosystem/indexer-grpc/transaction-filter/src/filters/move_module.rs b/ecosystem/indexer-grpc/transaction-filter/src/filters/move_module.rs
new file mode 100644
index 0000000000000..c78fb5da1e6af
--- /dev/null
+++ b/ecosystem/indexer-grpc/transaction-filter/src/filters/move_module.rs
@@ -0,0 +1,48 @@
+// Copyright (c) Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{errors::FilterError, traits::Filterable};
+use anyhow::anyhow;
+use aptos_protos::transaction::v1::MoveStructTag;
+use serde::{Deserialize, Serialize};
+
+/// Example:
+/// ```
+/// use aptos_transaction_filter::MoveStructTagFilterBuilder;
+///
+/// let filter = MoveStructTagFilterBuilder::default()
+///   .address("0x0000000000000000000000000000000000000000000000000000000000000004")
+///   .module("aptos_token")
+///   .name("Token")
+///   .build()
+///   .unwrap();
+/// ```
+#[derive(Clone, Debug, Default, Deserialize, PartialEq, Serialize)]
+#[serde(deny_unknown_fields)]
+#[derive(derive_builder::Builder)]
+#[builder(setter(into, strip_option), default)]
+pub struct MoveStructTagFilter {
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub address: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub module: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub name: Option<String>,
+}
+
+impl Filterable<MoveStructTag> for MoveStructTagFilter {
+    #[inline]
+    fn validate_state(&self) -> Result<(), FilterError> {
+        if self.address.is_none() && self.module.is_none() && self.name.is_none() {
+            return Err(anyhow!("At least one of address, module or name must be set").into());
+        };
+        Ok(())
+    }
+
+    #[inline]
+    fn is_allowed(&self, struct_tag: &MoveStructTag) -> bool {
+        self.address.is_allowed(&struct_tag.address)
+            && self.module.is_allowed(&struct_tag.module)
+            && self.name.is_allowed(&struct_tag.name)
+    }
+}
diff --git a/ecosystem/indexer-grpc/transaction-filter/src/filters/transaction_root.rs b/ecosystem/indexer-grpc/transaction-filter/src/filters/transaction_root.rs
new file mode 100644
index 0000000000000..8cc684d13f4b7
--- /dev/null
+++ b/ecosystem/indexer-grpc/transaction-filter/src/filters/transaction_root.rs
@@ -0,0 +1,57 @@
+// Copyright (c) Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{errors::FilterError, traits::Filterable};
+use anyhow::Error;
+use aptos_protos::transaction::v1::{transaction::TransactionType, Transaction};
+use serde::{Deserialize, Serialize};
+
+/// Example:
+/// ```
+/// use aptos_transaction_filter::TransactionRootFilterBuilder;
+///
+/// let filter = TransactionRootFilterBuilder::default()
+///   .success(true)
+///   .build()
+///   .unwrap();
+/// ```
+#[derive(Clone, Debug, Default, Deserialize, PartialEq, Serialize)]
+#[serde(deny_unknown_fields)]
+#[derive(derive_builder::Builder)]
+#[builder(setter(strip_option), default)]
+pub struct TransactionRootFilter {
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub success: Option<bool>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub txn_type: Option<TransactionType>,
+}
+
+impl Filterable<Transaction> for TransactionRootFilter {
+    #[inline]
+    fn validate_state(&self) -> Result<(), FilterError> {
+        if self.success.is_none() && self.txn_type.is_none() {
+            return Err(Error::msg("At least one of success or txn_types must be set").into());
+        };
+        Ok(())
+    }
+
+    #[inline]
+    fn is_allowed(&self, item: &Transaction) -> bool {
+        if !self
+            .success
+            .is_allowed_opt(&item.info.as_ref().map(|i| i.success))
+        {
+            return false;
+        }
+
+        if let Some(txn_type) = &self.txn_type {
+            if txn_type
+                != &TransactionType::try_from(item.r#type).expect("Invalid transaction type")
+            {
+                return false;
+            }
+        }
+
+        true
+    }
+}
diff --git a/ecosystem/indexer-grpc/transaction-filter/src/filters/user_transaction.rs b/ecosystem/indexer-grpc/transaction-filter/src/filters/user_transaction.rs
new file mode 100644
index 0000000000000..7e95b790f03c3
--- /dev/null
+++ b/ecosystem/indexer-grpc/transaction-filter/src/filters/user_transaction.rs
@@ -0,0 +1,197 @@
+// Copyright (c) Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{errors::FilterError, traits::Filterable};
+use anyhow::{anyhow, Error};
+use aptos_protos::transaction::v1::{
+    multisig_transaction_payload, transaction::TxnData, transaction_payload, EntryFunctionId,
+    EntryFunctionPayload, Transaction, TransactionPayload,
+};
+use serde::{Deserialize, Serialize};
+
+/// We use this for UserTransactions.
+/// We support UserPayload and MultisigPayload
+///
+/// Example:
+/// ```
+/// use aptos_transaction_filter::UserTransactionFilterBuilder;
+///
+/// let address = "0x806b27f3d7824a1d78c4291b6d0371aa693437f9eb3393c6440519c0ffaa627f";
+/// let filter = UserTransactionFilterBuilder::default().sender(address).build().unwrap();
+/// ```
+#[derive(Clone, Debug, Default, Deserialize, PartialEq, Serialize)]
+#[serde(deny_unknown_fields)]
+#[derive(derive_builder::Builder)]
+#[builder(setter(strip_option), default)]
+pub struct UserTransactionFilter {
+    #[serde(skip_serializing_if = "Option::is_none")]
+    #[builder(setter(into, strip_option), default)]
+    pub sender: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub payload: Option<UserTransactionPayloadFilter>,
+}
+
+impl Filterable<Transaction> for UserTransactionFilter {
+    #[inline]
+    fn validate_state(&self) -> Result<(), FilterError> {
+        if self.sender.is_none() && self.payload.is_none() {
+            return Err(Error::msg("At least one of sender or payload must be set").into());
+        };
+        self.payload.is_valid()?;
+        Ok(())
+    }
+
+    #[inline]
+    fn is_allowed(&self, txn: &Transaction) -> bool {
+        let user_request = if let Some(TxnData::User(u)) = txn.txn_data.as_ref() {
+            if let Some(user_request) = u.request.as_ref() {
+                user_request
+            } else {
+                return false;
+            }
+        } else {
+            return false;
+        };
+
+        if let Some(sender_filter) = &self.sender {
+            if &user_request.sender != sender_filter {
+                return false;
+            }
+        }
+
+        if let Some(payload_filter) = &self.payload {
+            // Get the entry_function_payload from both UserPayload and MultisigPayload
+            let entry_function_payload = user_request
+                .payload
+                .as_ref()
+                .and_then(get_entry_function_payload_from_transaction_payload);
+            if let Some(payload) = entry_function_payload {
+                // Here we have an actual EntryFunctionPayload
+                if !payload_filter.is_allowed(payload) {
+                    return false;
+                }
+            }
+        }
+
+        true
+    }
+}
+
+/// Example:
+/// ```
+/// use aptos_transaction_filter::EntryFunctionFilterBuilder;
+///
+/// let filter = EntryFunctionFilterBuilder::default()
+///   .address("0x0000000000000000000000000000000000000000000000000000000000000001")
+///   .module("coin")
+///   .function("transfer")
+///   .build()
+///   .unwrap();
+/// ```
+#[derive(Clone, Debug, Default, Deserialize, PartialEq, Serialize)]
+#[serde(deny_unknown_fields)]
+#[derive(derive_builder::Builder)]
+#[builder(setter(into, strip_option), default)]
+pub struct EntryFunctionFilter {
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub address: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub module: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub function: Option<String>,
+}
+
+impl Filterable<EntryFunctionId> for EntryFunctionFilter {
+    #[inline]
+    fn validate_state(&self) -> Result<(), FilterError> {
+        if self.address.is_none() && self.module.is_none() && self.function.is_none() {
+            return Err(anyhow!("At least one of address, name or function must be set").into());
+        };
+        Ok(())
+    }
+
+    #[inline]
+    fn is_allowed(&self, module_id: &EntryFunctionId) -> bool {
+        if !self.function.is_allowed(&module_id.name) {
+            return false;
+        }
+
+        if self.address.is_some() || self.function.is_some() {
+            if let Some(module) = &module_id.module.as_ref() {
+                if !(self.address.is_allowed(&module.address)
+                    && self.module.is_allowed(&module.name))
+                {
+                    return false;
+                }
+            } else {
+                return false;
+            }
+        }
+
+        true
+    }
+}
+
+/// Example:
+/// ```
+/// use aptos_transaction_filter::{EntryFunctionFilterBuilder, UserTransactionPayloadFilterBuilder};
+///
+/// let entry_function_filter = EntryFunctionFilterBuilder::default()
+///   .address("0x0000000000000000000000000000000000000000000000000000000000000001")
+///   .module("coin")
+///   .function("transfer")
+///   .build()
+///   .unwrap();
+/// let filter = UserTransactionPayloadFilterBuilder::default()
+///   .function(entry_function_filter)
+///   .build()
+///   .unwrap();
+/// ```
+#[derive(Clone, Debug, Default, Deserialize, PartialEq, Serialize)]
+#[serde(deny_unknown_fields)]
+#[derive(derive_builder::Builder)]
+#[builder(setter(strip_option), default)]
+pub struct UserTransactionPayloadFilter {
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub function: Option<EntryFunctionFilter>,
+}
+
+impl Filterable<EntryFunctionPayload> for UserTransactionPayloadFilter {
+    #[inline]
+    fn validate_state(&self) -> Result<(), FilterError> {
+        if self.function.is_none() {
+            return Err(Error::msg("At least function must be set").into());
+        };
+        self.function.is_valid()?;
+        Ok(())
+    }
+
+    #[inline]
+    fn is_allowed(&self, payload: &EntryFunctionPayload) -> bool {
+        self.function.is_allowed_opt(&payload.function)
+    }
+}
+
+/// Get the entry_function_payload from both UserPayload and MultisigPayload
+fn get_entry_function_payload_from_transaction_payload(
+    payload: &TransactionPayload,
+) -> Option<&EntryFunctionPayload> {
+    let z = if let Some(payload) = &payload.payload {
+        match payload {
+            transaction_payload::Payload::EntryFunctionPayload(ef_payload) => Some(ef_payload),
+            transaction_payload::Payload::MultisigPayload(ms_payload) => ms_payload
+                .transaction_payload
+                .as_ref()
+                .and_then(|tp| tp.payload.as_ref())
+                .map(|payload| match payload {
+                    multisig_transaction_payload::Payload::EntryFunctionPayload(ef_payload) => {
+                        ef_payload
+                    },
+                }),
+            _ => None,
+        }
+    } else {
+        None
+    };
+    z
+}
diff --git a/ecosystem/indexer-grpc/transaction-filter/src/lib.rs b/ecosystem/indexer-grpc/transaction-filter/src/lib.rs
new file mode 100644
index 0000000000000..fecb7e30dacc6
--- /dev/null
+++ b/ecosystem/indexer-grpc/transaction-filter/src/lib.rs
@@ -0,0 +1,22 @@
+// Copyright (c) Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod boolean_transaction_filter;
+pub mod errors;
+pub mod filters;
+pub mod traits;
+
+// Re-exports for convenience.
+pub use boolean_transaction_filter::BooleanTransactionFilter;
+pub use filters::*;
+pub use traits::Filterable;
+
+#[cfg(test)]
+pub mod test_lib;
+
+#[cfg(test)]
+mod tests {
+
+    #[test]
+    fn it_works() {}
+}
diff --git a/ecosystem/indexer-grpc/transaction-filter/src/test_lib/mod.rs b/ecosystem/indexer-grpc/transaction-filter/src/test_lib/mod.rs
new file mode 100644
index 0000000000000..76c44c07b625b
--- /dev/null
+++ b/ecosystem/indexer-grpc/transaction-filter/src/test_lib/mod.rs
@@ -0,0 +1,38 @@
+// Copyright (c) Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use aptos_protos::indexer::v1::TransactionsInStorage;
+use prost::Message;
+use std::io::Read;
+
+pub fn decompress_fixture(bytes: &[u8]) -> TransactionsInStorage {
+    let mut decompressor = lz4::Decoder::new(bytes).expect("Lz4 decompression failed.");
+    let mut decompressed = Vec::new();
+    decompressor
+        .read_to_end(&mut decompressed)
+        .expect("Lz4 decompression failed.");
+    TransactionsInStorage::decode(decompressed.as_slice()).expect("Failed to parse transaction")
+}
+
+#[allow(dead_code)]
+pub fn load_taptos_fixture() -> TransactionsInStorage {
+    let data = include_bytes!(
+        "../../fixtures/compressed_files_lz4_00008bc1d5adcf862d3967c1410001fb_705101000.pb.lz4"
+    );
+    decompress_fixture(data)
+}
+
+#[allow(dead_code)]
+pub fn load_random_april_3mb_fixture() -> TransactionsInStorage {
+    let data = include_bytes!(
+        "../../fixtures/compressed_files_lz4_0013c194ec4fdbfb8db7306170aac083_445907000.pb.lz4"
+    );
+    decompress_fixture(data)
+}
+
+pub fn load_graffio_fixture() -> TransactionsInStorage {
+    let data = include_bytes!(
+        "../../fixtures/compressed_files_lz4_f3d880d9700c70d71fefe71aa9218aa9_301616000.pb.lz4"
+    );
+    decompress_fixture(data)
+}
diff --git a/ecosystem/indexer-grpc/transaction-filter/src/traits.rs b/ecosystem/indexer-grpc/transaction-filter/src/traits.rs
new file mode 100644
index 0000000000000..e259201a12c80
--- /dev/null
+++ b/ecosystem/indexer-grpc/transaction-filter/src/traits.rs
@@ -0,0 +1,201 @@
+// Copyright (c) Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::errors::FilterError;
+use serde::Serialize;
+use std::fmt::Debug;
+
+/// Simple trait to allow for filtering of items of type T
+pub trait Filterable<T>
+where
+    Self: Debug + Serialize,
+{
+    /// Whether this filter is correctly configured/initialized
+    /// Any call to `validate_state` is responsible for recursively checking the validity of any nested filters *by calling `is_valid`*
+    /// The actual public API is via `is_valid` which will call `validate_state` and return an error if it fails, but annotated with the filter type/path
+    fn validate_state(&self) -> Result<(), FilterError>;
+
+    /// This is a convenience method to allow for the error to be annotated with the filter type/path at each level
+    /// This is the public API for checking the validity of a filter!
+    /// Example output looks like:
+    /// ```text
+    /// FilterError: This is a test error!.
+    /// Trace Path:
+    /// transaction_filter::traits::test::InnerStruct:   {"a":"test"}
+    /// core::option::Option<transaction_filter::traits::test::InnerStruct>:   {"a":"test"}
+    /// transaction_filter::traits::test::OuterStruct:   {"inner":{"a":"test"}}
+    ///  ```
+    ///
+    #[inline]
+    fn is_valid(&self) -> Result<(), FilterError> {
+        // T
+        self.validate_state().map_err(|mut e| {
+            e.add_trace(
+                serde_json::to_string(self).unwrap(),
+                std::any::type_name::<Self>().to_string(),
+            );
+            e
+        })
+    }
+
+    /// Whether the item is allowed by this filter
+    /// This is the core method that should be implemented by any filter
+    /// This is the method that should be called by any parent filter to determine if an item is allowed
+    /// *If a filter doesn't explicitly prevent an item, then it should be allowed*
+    /// This forces the logic of `if !child_filter.is_allowed(item) { return false; }` for any parent filter
+    fn is_allowed(&self, item: &T) -> bool;
+
+    #[inline]
+    fn is_allowed_vec(&self, items: &[T]) -> bool {
+        items.iter().all(|item| self.is_allowed(item))
+    }
+
+    #[inline]
+    fn is_allowed_opt(&self, item: &Option<T>) -> bool {
+        match item {
+            Some(item) => self.is_allowed(item),
+            None => false,
+        }
+    }
+
+    #[inline]
+    fn is_allowed_opt_vec(&self, items: &Option<&Vec<T>>) -> bool {
+        match items {
+            Some(items) => self.is_allowed_vec(items),
+            None => false,
+        }
+    }
+
+    #[inline]
+    fn filter_vec(&self, items: Vec<T>) -> Vec<T> {
+        items
+            .into_iter()
+            .filter(|item| self.is_allowed(item))
+            .collect()
+    }
+}
+
+/// This allows for `Option<Filterable>` to always return true: i.e if the filter is None, then all items are allowed.
+impl<T, F> Filterable<T> for Option<F>
+where
+    F: Filterable<T>,
+{
+    #[inline]
+    fn validate_state(&self) -> Result<(), FilterError> {
+        match self {
+            Some(filter) => filter.is_valid(),
+            None => Ok(()),
+        }
+    }
+
+    #[inline]
+    fn is_allowed(&self, item: &T) -> bool {
+        match self {
+            Some(filter) => filter.is_allowed(item),
+            None => true,
+        }
+    }
+
+    #[inline]
+    fn is_allowed_opt(&self, item: &Option<T>) -> bool {
+        match self {
+            Some(filter) => filter.is_allowed_opt(item),
+            None => true,
+        }
+    }
+}
+
+impl Filterable<String> for Option<String> {
+    #[inline]
+    fn validate_state(&self) -> Result<(), FilterError> {
+        Ok(())
+    }
+
+    #[inline]
+    fn is_allowed(&self, item: &String) -> bool {
+        match self {
+            Some(filter) => filter == item,
+            None => true,
+        }
+    }
+}
+
+impl Filterable<i32> for Option<i32> {
+    #[inline]
+    fn validate_state(&self) -> Result<(), FilterError> {
+        Ok(())
+    }
+
+    #[inline]
+    fn is_allowed(&self, item: &i32) -> bool {
+        match self {
+            Some(filter) => filter == item,
+            None => true,
+        }
+    }
+}
+
+impl Filterable<bool> for Option<bool> {
+    #[inline]
+    fn validate_state(&self) -> Result<(), FilterError> {
+        Ok(())
+    }
+
+    #[inline]
+    fn is_allowed(&self, item: &bool) -> bool {
+        match self {
+            Some(filter) => filter == item,
+            None => true,
+        }
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use anyhow::anyhow;
+
+    #[derive(Debug, Serialize, PartialEq)]
+    pub struct InnerStruct {
+        pub a: Option<String>,
+    }
+
+    impl Filterable<InnerStruct> for InnerStruct {
+        fn validate_state(&self) -> Result<(), FilterError> {
+            Err(anyhow!("This is a test error!").into())
+        }
+
+        fn is_allowed(&self, _item: &InnerStruct) -> bool {
+            true
+        }
+    }
+
+    #[derive(Debug, PartialEq, Serialize)]
+    pub struct OuterStruct {
+        pub inner: Option<InnerStruct>,
+    }
+
+    impl Filterable<InnerStruct> for OuterStruct {
+        fn validate_state(&self) -> Result<(), FilterError> {
+            self.inner.is_valid()?;
+            Ok(())
+        }
+
+        fn is_allowed(&self, item: &InnerStruct) -> bool {
+            self.inner.is_allowed(item)
+        }
+    }
+
+    #[test]
+    fn test_error_prop() {
+        let inner = InnerStruct {
+            a: Some("test".to_string()),
+        };
+        let outer = OuterStruct { inner: Some(inner) };
+
+        let res = outer.is_valid();
+        assert!(res.is_err());
+        let error = res.unwrap_err();
+        assert_eq!(error.to_string(), "Filter Error: This is a test error!\nTrace Path:\naptos_transaction_filter::traits::test::InnerStruct:   {\"a\":\"test\"}\ncore::option::Option<aptos_transaction_filter::traits::test::InnerStruct>:   {\"a\":\"test\"}\naptos_transaction_filter::traits::test::OuterStruct:   {\"inner\":{\"a\":\"test\"}}");
+    }
+}
diff --git a/ecosystem/nft-metadata-crawler-parser/Cargo.toml b/ecosystem/nft-metadata-crawler-parser/Cargo.toml
index e04313d4c92ec..21aa48782c2f8 100644
--- a/ecosystem/nft-metadata-crawler-parser/Cargo.toml
+++ b/ecosystem/nft-metadata-crawler-parser/Cargo.toml
@@ -17,6 +17,7 @@ anyhow = { workspace = true }
 aptos-indexer-grpc-server-framework = { workspace = true }
 aptos-metrics-core = { workspace = true }
 async-trait = { workspace = true }
+axum = { workspace = true }
 backoff = { workspace = true }
 bytes = { workspace = true }
 chrono = { workspace = true }
@@ -29,6 +30,7 @@ diesel = { workspace = true, features = [
     "serde_json",
 ] }
 diesel_migrations = { workspace = true }
+enum_dispatch = { workspace = true }
 field_count = { workspace = true }
 futures = { workspace = true }
 google-cloud-storage = { workspace = true }
@@ -42,4 +44,3 @@ sha256 = { workspace = true }
 tokio = { workspace = true }
 tracing = { workspace = true }
 url = { workspace = true }
-warp = { workspace = true }
diff --git a/ecosystem/nft-metadata-crawler-parser/src/asset_uploader.rs b/ecosystem/nft-metadata-crawler-parser/src/asset_uploader.rs
new file mode 100644
index 0000000000000..70bf41b7b6acb
--- /dev/null
+++ b/ecosystem/nft-metadata-crawler-parser/src/asset_uploader.rs
@@ -0,0 +1,194 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    config::{AssetUploaderConfig, Server},
+    models::nft_metadata_crawler_uris::NFTMetadataCrawlerURIs,
+    utils::{
+        constants::{MAX_ASSET_UPLOAD_RETRY_SECONDS, MAX_RETRY_TIME_SECONDS},
+        database::upsert_uris,
+    },
+};
+use anyhow::Context;
+use axum::{routing::post, Extension, Json, Router};
+use backoff::{future::retry, ExponentialBackoff};
+use diesel::{
+    r2d2::{ConnectionManager, Pool},
+    PgConnection,
+};
+use futures::{future::try_join_all, FutureExt};
+use reqwest::{multipart::Form, Client};
+use serde::{Deserialize, Serialize};
+use std::{sync::Arc, time::Duration};
+use tracing::{info, warn};
+use url::Url;
+
+#[derive(Clone)]
+pub struct AssetUploaderContext {
+    pub asset_uploader_config: Arc<AssetUploaderConfig>,
+    pub pool: Pool<ConnectionManager<PgConnection>>,
+}
+
+// Structs below are for accessing relevant data in a typed way for Cloudflare API calls
+#[derive(Debug, Deserialize)]
+struct CloudflareImageUploadResponseResult {
+    id: String,
+}
+
+#[derive(Debug, Deserialize)]
+struct CloudflareImageUploadResponse {
+    result: CloudflareImageUploadResponseResult,
+}
+
+#[derive(Debug, Deserialize)]
+struct AssetUploaderRequest {
+    urls: Vec<Url>,
+}
+
+#[derive(Debug, Serialize)]
+struct AssetUploaderResponse {
+    successes: Vec<String>,
+    failures: Vec<String>,
+}
+
+impl AssetUploaderContext {
+    pub fn new(
+        asset_uploader_config: AssetUploaderConfig,
+        pool: Pool<ConnectionManager<PgConnection>>,
+    ) -> Self {
+        Self {
+            asset_uploader_config: Arc::new(asset_uploader_config),
+            pool,
+        }
+    }
+
+    /// Uploads an asset to Cloudflare and returns the CDN URL used to access it
+    /// The CDN URL uses the default variant specified in the config
+    async fn upload_asset(&self, url: Url) -> anyhow::Result<String> {
+        let hashed_url = sha256::digest(url.to_string());
+        let op = || {
+            async {
+                let client = Client::builder()
+                    .timeout(Duration::from_secs(MAX_ASSET_UPLOAD_RETRY_SECONDS))
+                    .build()
+                    .context("Failed to build reqwest client")?;
+
+                let form = Form::new()
+                    .text("id", hashed_url.clone()) // Replace with actual metadata
+                    .text("url", url.to_string());
+
+                info!(
+                    asset_uri = ?url,
+                    "[Asset Uploader] Uploading asset to Cloudflare"
+                );
+
+                let res = client
+                    .post(format!(
+                        "https://api.cloudflare.com/client/v4/accounts/{}/images/v1",
+                        self.asset_uploader_config.cloudflare_account_id
+                    ))
+                    .header(
+                        "Authorization",
+                        format!("Bearer {}", self.asset_uploader_config.cloudflare_auth_key),
+                    )
+                    .multipart(form)
+                    .send()
+                    .await
+                    .context("Failed to send request to Cloudflare API")?;
+
+                let res_text = res.text().await.context("Failed to get response text")?;
+                info!(response = ?res_text, "[Asset Uploader] Received response from Cloudflare");
+
+                let res = serde_json::from_str::<CloudflareImageUploadResponse>(&res_text)
+                    .context("Failed to parse response to CloudflareImageUploadResponse")?;
+
+                Ok(format!(
+                    "{}/{}/{}/{}",
+                    self.asset_uploader_config.cloudflare_image_delivery_prefix,
+                    self.asset_uploader_config.cloudflare_account_hash,
+                    res.result.id,
+                    self.asset_uploader_config.cloudflare_default_variant,
+                ))
+            }
+            .boxed()
+        };
+
+        let backoff = ExponentialBackoff {
+            max_elapsed_time: Some(Duration::from_secs(MAX_RETRY_TIME_SECONDS)),
+            ..Default::default()
+        };
+
+        match retry(backoff, op).await {
+            Ok(result) => Ok(result),
+            Err(e) => Err(e),
+        }
+    }
+
+    async fn handle_urls(
+        Extension(context): Extension<Arc<Self>>,
+        Json(urls): Json<AssetUploaderRequest>,
+    ) -> Json<AssetUploaderResponse> {
+        // Spawn a task for each URL
+        let mut tasks = Vec::with_capacity(urls.urls.len());
+        let self_clone = context.clone();
+        for url in urls.urls.clone() {
+            let self_clone = self_clone.clone();
+            tasks.push(tokio::spawn(async move {
+                match self_clone.upload_asset(url.clone()).await {
+                    Ok(cdn_url) => {
+                        info!(
+                            asset_uri = ?url,
+                            cdn_uri = cdn_url,
+                            "[Asset Uploader] Writing to Postgres"
+                        );
+                        let mut model = NFTMetadataCrawlerURIs::new(url.as_ref());
+                        model.set_cdn_image_uri(Some(cdn_url.clone()));
+
+                        let mut conn = self_clone.pool.get().context("Failed to get connection")?;
+                        upsert_uris(&mut conn, &model, -1).context("Failed to upsert URIs")?;
+
+                        Ok(cdn_url)
+                    },
+                    Err(e) => {
+                        warn!(error = ?e, asset_uri = ?url, "[Asset Uploader] Failed to upload asset");
+                        Err(e)
+                    },
+                }
+            }));
+        }
+
+        // Wait for all tasks to finish
+        match try_join_all(tasks).await {
+            Ok(uris) => {
+                let mut successes = Vec::new();
+                let mut failures = Vec::new();
+
+                for (i, uri) in uris.iter().enumerate() {
+                    match uri {
+                        Ok(uri) => successes.push(uri.clone()),
+                        Err(_) => failures.push(urls.urls[i].to_string()),
+                    }
+                }
+
+                info!(successes = ?successes, failures = ?failures, "[Asset Uploader] Uploaded assets");
+                Json(AssetUploaderResponse {
+                    successes,
+                    failures,
+                })
+            },
+            Err(_) => Json(AssetUploaderResponse {
+                successes: vec![],
+                failures: urls.urls.iter().map(|url| url.to_string()).collect(),
+            }),
+        }
+    }
+}
+
+impl Server for AssetUploaderContext {
+    fn build_router(&self) -> Router {
+        let self_arc = Arc::new(self.clone());
+        Router::new()
+            .route("/", post(Self::handle_urls))
+            .layer(Extension(self_arc.clone()))
+    }
+}
diff --git a/ecosystem/nft-metadata-crawler-parser/src/config.rs b/ecosystem/nft-metadata-crawler-parser/src/config.rs
index f1409c6b26fca..ed21836d1ce02 100644
--- a/ecosystem/nft-metadata-crawler-parser/src/config.rs
+++ b/ecosystem/nft-metadata-crawler-parser/src/config.rs
@@ -2,57 +2,87 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{
+    asset_uploader::AssetUploaderContext,
+    parser::ParserContext,
     utils::{
         constants::{
             DEFAULT_IMAGE_QUALITY, DEFAULT_MAX_FILE_SIZE_BYTES, DEFAULT_MAX_IMAGE_DIMENSIONS,
             DEFAULT_MAX_NUM_PARSE_RETRIES,
         },
-        counters::{
-            GOT_CONNECTION_COUNT, PARSER_FAIL_COUNT, PARSER_INVOCATIONS_COUNT,
-            PUBSUB_ACK_SUCCESS_COUNT, SKIP_URI_COUNT, UNABLE_TO_GET_CONNECTION_COUNT,
-        },
-        database::{check_or_update_chain_id, establish_connection_pool, run_migrations},
+        database::{establish_connection_pool, run_migrations},
     },
-    worker::Worker,
 };
 use aptos_indexer_grpc_server_framework::RunnableConfig;
-use bytes::Bytes;
+use axum::Router;
 use diesel::{
     r2d2::{ConnectionManager, Pool},
     PgConnection,
 };
-use google_cloud_storage::client::{Client as GCSClient, ClientConfig as GCSClientConfig};
+use enum_dispatch::enum_dispatch;
 use serde::{Deserialize, Serialize};
-use std::sync::Arc;
-use tracing::{error, info, warn};
-use warp::Filter;
+use tracing::info;
+
+/// Trait for building a router for axum
+#[enum_dispatch]
+pub trait Server: Send + Sync {
+    fn build_router(&self) -> Router;
+}
+
+/// Required account data and auth keys for Cloudflare
+#[derive(Clone, Debug, Deserialize, Serialize)]
+#[serde(deny_unknown_fields)]
+pub struct AssetUploaderConfig {
+    /// Cloudflare API key
+    pub cloudflare_auth_key: String,
+    /// Cloudflare Account ID provided at the images home page used to authenticate requests
+    pub cloudflare_account_id: String,
+    /// Cloudflare Account Hash provided at the images home page used for generating the CDN image URLs
+    pub cloudflare_account_hash: String,
+    /// Cloudflare Image Delivery URL prefix provided at the images home page used for generating the CDN image URLs
+    pub cloudflare_image_delivery_prefix: String,
+    /// In addition to on the fly transformations, Cloudflare images can be returned in preset variants. This is the default variant used with the saved CDN image URLs.
+    pub cloudflare_default_variant: String,
+}
 
-/// Structs to hold config from YAML
 #[derive(Clone, Debug, Deserialize, Serialize)]
 #[serde(deny_unknown_fields)]
 pub struct ParserConfig {
     pub google_application_credentials: Option<String>,
     pub bucket: String,
-    pub database_url: String,
     pub cdn_prefix: String,
     pub ipfs_prefix: String,
     pub ipfs_auth_key: Option<String>,
-    #[serde(default = "ParserConfig::default_max_file_size_bytes")]
+    #[serde(default = "NFTMetadataCrawlerConfig::default_max_file_size_bytes")]
     pub max_file_size_bytes: u32,
-    #[serde(default = "ParserConfig::default_image_quality")]
+    #[serde(default = "NFTMetadataCrawlerConfig::default_image_quality")]
     pub image_quality: u8, // Quality up to 100
-    #[serde(default = "ParserConfig::default_max_image_dimensions")]
+    #[serde(default = "NFTMetadataCrawlerConfig::default_max_image_dimensions")]
     pub max_image_dimensions: u32,
-    #[serde(default = "ParserConfig::default_max_num_parse_retries")]
-    pub max_num_parse_retries: i32,
     #[serde(default)]
     pub ack_parsed_uris: bool,
     #[serde(default)]
     pub uri_blacklist: Vec<String>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(tag = "type")]
+pub enum ServerConfig {
+    Parser(ParserConfig),
+    AssetUploader(AssetUploaderConfig),
+}
+
+/// Structs to hold config from YAML
+#[derive(Clone, Debug, Deserialize, Serialize)]
+#[serde(deny_unknown_fields)]
+pub struct NFTMetadataCrawlerConfig {
+    pub database_url: String,
+    #[serde(default = "NFTMetadataCrawlerConfig::default_max_num_parse_retries")]
+    pub max_num_parse_retries: i32,
     pub server_port: u16,
+    pub server_config: ServerConfig,
 }
 
-impl ParserConfig {
+impl NFTMetadataCrawlerConfig {
     pub const fn default_max_file_size_bytes() -> u32 {
         DEFAULT_MAX_FILE_SIZE_BYTES
     }
@@ -70,8 +100,32 @@ impl ParserConfig {
     }
 }
 
+#[derive(Clone)]
+#[enum_dispatch(Server)]
+pub enum ServerContext {
+    Parser(ParserContext),
+    AssetUploader(AssetUploaderContext),
+}
+
+impl ServerConfig {
+    pub async fn build_context(
+        &self,
+        pool: Pool<ConnectionManager<PgConnection>>,
+        max_num_retries: i32,
+    ) -> ServerContext {
+        match self {
+            ServerConfig::Parser(parser_config) => ServerContext::Parser(
+                ParserContext::new(parser_config.clone(), pool, max_num_retries).await,
+            ),
+            ServerConfig::AssetUploader(asset_uploader_config) => ServerContext::AssetUploader(
+                AssetUploaderContext::new(asset_uploader_config.clone(), pool),
+            ),
+        }
+    }
+}
+
 #[async_trait::async_trait]
-impl RunnableConfig for ParserConfig {
+impl RunnableConfig for NFTMetadataCrawlerConfig {
     /// Main driver function that establishes a connection to Pubsub and parses the Pubsub entries in parallel
     async fn run(&self) -> anyhow::Result<()> {
         info!(
@@ -87,44 +141,16 @@ impl RunnableConfig for ParserConfig {
         run_migrations(&pool);
         info!("[NFT Metadata Crawler] Finished migrations");
 
-        if let Some(google_application_credentials) = &self.google_application_credentials {
-            info!(
-                "[NFT Metadata Crawler] Google Application Credentials path found, setting env var"
-            );
-            std::env::set_var(
-                "GOOGLE_APPLICATION_CREDENTIALS",
-                google_application_credentials,
-            );
-        }
-
-        // Establish GCS client
-        let gcs_config = GCSClientConfig::default()
-            .with_auth()
-            .await
-            .unwrap_or_else(|e| {
-                error!(
-                    error = ?e,
-                    "[NFT Metadata Crawler] Failed to create gRPC client config"
-                );
-                panic!();
-            });
-
         // Create request context
-        let context = Arc::new(ServerContext {
-            parser_config: Arc::new(self.clone()),
-            pool,
-            gcs_client: Arc::new(GCSClient::new(gcs_config)),
-        });
-
-        // Create web server
-        let route = warp::post()
-            .and(warp::path::end())
-            .and(warp::body::bytes())
-            .and(warp::any().map(move || context.clone()))
-            .and_then(handle_root);
-        warp::serve(route)
-            .run(([0, 0, 0, 0], self.server_port))
+        let context = self
+            .server_config
+            .build_context(pool, self.max_num_parse_retries)
             .await;
+        let listener = tokio::net::TcpListener::bind(format!("0.0.0.0:{}", self.server_port))
+            .await
+            .expect("Failed to bind TCP listener");
+        axum::serve(listener, context.build_router()).await.unwrap();
+
         Ok(())
     }
 
@@ -132,151 +158,3 @@ impl RunnableConfig for ParserConfig {
         "parser".to_string()
     }
 }
-
-/// Struct to hold context required for parsing
-#[derive(Clone)]
-pub struct ServerContext {
-    pub parser_config: Arc<ParserConfig>,
-    pub pool: Pool<ConnectionManager<PgConnection>>,
-    pub gcs_client: Arc<GCSClient>,
-}
-
-/// Repeatedly pulls workers from Channel and perform parsing operations
-async fn spawn_parser(
-    parser_config: Arc<ParserConfig>,
-    msg_base64: Bytes,
-    pool: Pool<ConnectionManager<PgConnection>>,
-    gcs_client: Arc<GCSClient>,
-) {
-    PARSER_INVOCATIONS_COUNT.inc();
-    let pubsub_message = String::from_utf8(msg_base64.to_vec())
-        .unwrap_or_else(|e| {
-            error!(
-                error = ?e,
-                "[NFT Metadata Crawler] Failed to parse PubSub message"
-            );
-            panic!();
-        })
-        .replace('\u{0000}', "")
-        .replace("\\u0000", "");
-
-    info!(
-        pubsub_message = pubsub_message,
-        "[NFT Metadata Crawler] Received message from PubSub"
-    );
-
-    // Skips message if it does not have 5 commas (likely malformed URI)
-    if pubsub_message.matches(',').count() != 5 {
-        // Sends ack to PubSub only if ack_parsed_uris flag is true
-        info!(
-            pubsub_message = pubsub_message,
-            "[NFT Metadata Crawler] Number of commans != 5, skipping message"
-        );
-        SKIP_URI_COUNT.with_label_values(&["invalid"]).inc();
-        return;
-    }
-
-    // Parse PubSub message
-    let parts: Vec<&str> = pubsub_message.split(',').collect();
-
-    // Perform chain id check
-    // If chain id is not set, set it
-    let mut conn = pool.get().unwrap_or_else(|e| {
-        error!(
-                pubsub_message = pubsub_message,
-                error = ?e,
-                "[NFT Metadata Crawler] Failed to get DB connection from pool");
-        UNABLE_TO_GET_CONNECTION_COUNT.inc();
-        panic!();
-    });
-    GOT_CONNECTION_COUNT.inc();
-
-    let grpc_chain_id = parts[4].parse::<u64>().unwrap_or_else(|e| {
-        error!(
-            error = ?e,
-            "[NFT Metadata Crawler] Failed to parse chain id from PubSub message"
-        );
-        panic!();
-    });
-
-    // Panic if chain id of PubSub message does not match chain id in DB
-    check_or_update_chain_id(&mut conn, grpc_chain_id as i64).expect("Chain id should match");
-
-    // Spawn worker
-    let last_transaction_version = parts[2].to_string().parse().unwrap_or_else(|e| {
-        error!(
-            error = ?e,
-            "[NFT Metadata Crawler] Failed to parse last transaction version from PubSub message"
-        );
-        panic!();
-    });
-    let last_transaction_timestamp =
-        chrono::NaiveDateTime::parse_from_str(parts[3], "%Y-%m-%d %H:%M:%S %Z").unwrap_or(
-            chrono::NaiveDateTime::parse_from_str(parts[3], "%Y-%m-%d %H:%M:%S%.f %Z")
-                .unwrap_or_else(|e| {
-                    error!(
-                        error = ?e,
-                        "[NFT Metadata Crawler] Failed to parse timestamp from PubSub message"
-                    );
-                    panic!();
-                }),
-        );
-    let mut worker = Worker::new(
-        parser_config.clone(),
-        conn,
-        gcs_client.clone(),
-        &pubsub_message,
-        parts[0],
-        parts[1],
-        last_transaction_version,
-        last_transaction_timestamp,
-        parts[5].parse::<bool>().unwrap_or(false),
-    );
-
-    info!(
-        pubsub_message = pubsub_message,
-        "[NFT Metadata Crawler] Starting worker"
-    );
-
-    if let Err(e) = worker.parse().await {
-        warn!(
-            pubsub_message = pubsub_message,
-            error = ?e,
-            "[NFT Metadata Crawler] Parsing failed"
-        );
-        PARSER_FAIL_COUNT.inc();
-    }
-
-    info!(
-        pubsub_message = pubsub_message,
-        "[NFT Metadata Crawler] Worker finished"
-    );
-}
-
-/// Handles calling parser for the root endpoint
-async fn handle_root(
-    msg: Bytes,
-    context: Arc<ServerContext>,
-) -> Result<impl warp::Reply, warp::Rejection> {
-    // Use spawn_blocking to run the function on a separate thread.
-    let _ = tokio::spawn(spawn_parser(
-        context.parser_config.clone(),
-        msg,
-        context.pool.clone(),
-        context.gcs_client.clone(),
-    ))
-    .await;
-
-    if !context.parser_config.ack_parsed_uris {
-        return Ok(warp::reply::with_status(
-            warp::reply(),
-            warp::http::StatusCode::BAD_REQUEST,
-        ));
-    }
-
-    PUBSUB_ACK_SUCCESS_COUNT.inc();
-    Ok(warp::reply::with_status(
-        warp::reply(),
-        warp::http::StatusCode::OK,
-    ))
-}
diff --git a/ecosystem/nft-metadata-crawler-parser/src/lib.rs b/ecosystem/nft-metadata-crawler-parser/src/lib.rs
index 4beffe0b9d5b5..c75310b61093e 100644
--- a/ecosystem/nft-metadata-crawler-parser/src/lib.rs
+++ b/ecosystem/nft-metadata-crawler-parser/src/lib.rs
@@ -1,17 +1,19 @@
 // Copyright © Aptos Foundation
 // SPDX-License-Identifier: Apache-2.0
 
+use anyhow::Context;
+use reqwest::{header, Client};
+use std::time::Duration;
+use utils::constants::MAX_HEAD_REQUEST_RETRY_SECONDS;
+
+pub mod asset_uploader;
 pub mod config;
 pub mod models;
+pub mod parser;
 pub mod schema;
 pub mod utils;
 pub mod worker;
 
-use anyhow::Context;
-use reqwest::{header, Client};
-use std::time::Duration;
-use utils::constants::MAX_HEAD_REQUEST_RETRY_SECONDS;
-
 /// HEAD request to get MIME type and size of content
 pub async fn get_uri_metadata(url: &str) -> anyhow::Result<(String, u32)> {
     let client = Client::builder()
diff --git a/ecosystem/nft-metadata-crawler-parser/src/main.rs b/ecosystem/nft-metadata-crawler-parser/src/main.rs
index 13dfb560742a1..9c050bce8f154 100644
--- a/ecosystem/nft-metadata-crawler-parser/src/main.rs
+++ b/ecosystem/nft-metadata-crawler-parser/src/main.rs
@@ -2,10 +2,10 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use aptos_indexer_grpc_server_framework::ServerArgs;
-use aptos_nft_metadata_crawler_parser::config::ParserConfig;
+use aptos_nft_metadata_crawler_parser::config::NFTMetadataCrawlerConfig;
 
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
     let args = <ServerArgs as clap::Parser>::parse();
-    args.run::<ParserConfig>().await
+    args.run::<NFTMetadataCrawlerConfig>().await
 }
diff --git a/ecosystem/nft-metadata-crawler-parser/src/parser.rs b/ecosystem/nft-metadata-crawler-parser/src/parser.rs
new file mode 100644
index 0000000000000..8997f4dc019b2
--- /dev/null
+++ b/ecosystem/nft-metadata-crawler-parser/src/parser.rs
@@ -0,0 +1,208 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    config::{ParserConfig, Server},
+    utils::{
+        counters::{
+            GOT_CONNECTION_COUNT, PARSER_FAIL_COUNT, PARSER_INVOCATIONS_COUNT,
+            PUBSUB_ACK_SUCCESS_COUNT, SKIP_URI_COUNT, UNABLE_TO_GET_CONNECTION_COUNT,
+        },
+        database::check_or_update_chain_id,
+    },
+    worker::Worker,
+};
+use axum::{http::StatusCode, response::Response, routing::post, Router};
+use bytes::Bytes;
+use diesel::{
+    r2d2::{ConnectionManager, Pool},
+    PgConnection,
+};
+use google_cloud_storage::client::{Client as GCSClient, ClientConfig as GCSClientConfig};
+use std::sync::Arc;
+use tracing::{error, info, warn};
+
+/// Struct to hold context required for parsing
+#[derive(Clone)]
+pub struct ParserContext {
+    pub parser_config: Arc<ParserConfig>,
+    pub pool: Pool<ConnectionManager<PgConnection>>,
+    pub gcs_client: Arc<GCSClient>,
+    pub max_num_retries: i32,
+}
+
+impl ParserContext {
+    pub async fn new(
+        parser_config: ParserConfig,
+        pool: Pool<ConnectionManager<PgConnection>>,
+        max_num_retries: i32,
+    ) -> Self {
+        if let Some(google_application_credentials) = &parser_config.google_application_credentials
+        {
+            info!(
+                "[NFT Metadata Crawler] Google Application Credentials path found, setting env var"
+            );
+            std::env::set_var(
+                "GOOGLE_APPLICATION_CREDENTIALS",
+                google_application_credentials,
+            );
+        }
+
+        // Establish GCS client
+        let gcs_config = GCSClientConfig::default()
+            .with_auth()
+            .await
+            .unwrap_or_else(|e| {
+                error!(
+                    error = ?e,
+                    "[NFT Metadata Crawler] Failed to create gRPC client config"
+                );
+                panic!();
+            });
+
+        Self {
+            parser_config: Arc::new(parser_config),
+            pool,
+            gcs_client: Arc::new(GCSClient::new(gcs_config)),
+            max_num_retries,
+        }
+    }
+
+    /// Repeatedly pulls workers from Channel and perform parsing operations
+    async fn spawn_parser(&self, msg_base64: Bytes) {
+        PARSER_INVOCATIONS_COUNT.inc();
+        let pubsub_message = String::from_utf8(msg_base64.to_vec())
+            .unwrap_or_else(|e| {
+                error!(
+                    error = ?e,
+                    "[NFT Metadata Crawler] Failed to parse PubSub message"
+                );
+                panic!();
+            })
+            .replace('\u{0000}', "")
+            .replace("\\u0000", "");
+
+        info!(
+            pubsub_message = pubsub_message,
+            "[NFT Metadata Crawler] Received message from PubSub"
+        );
+
+        // Skips message if it does not have 5 commas (likely malformed URI)
+        if pubsub_message.matches(',').count() != 5 {
+            // Sends ack to PubSub only if ack_parsed_uris flag is true
+            info!(
+                pubsub_message = pubsub_message,
+                "[NFT Metadata Crawler] Number of commans != 5, skipping message"
+            );
+            SKIP_URI_COUNT.with_label_values(&["invalid"]).inc();
+            return;
+        }
+
+        // Parse PubSub message
+        let parts: Vec<&str> = pubsub_message.split(',').collect();
+
+        // Perform chain id check
+        // If chain id is not set, set it
+        let mut conn = self.pool.get().unwrap_or_else(|e| {
+            error!(
+                pubsub_message = pubsub_message,
+                error = ?e,
+                "[NFT Metadata Crawler] Failed to get DB connection from pool");
+            UNABLE_TO_GET_CONNECTION_COUNT.inc();
+            panic!();
+        });
+        GOT_CONNECTION_COUNT.inc();
+
+        let grpc_chain_id = parts[4].parse::<u64>().unwrap_or_else(|e| {
+            error!(
+                pubsub_message = pubsub_message,
+                error = ?e,
+                "[NFT Metadata Crawler] Failed to parse chain id from PubSub message"
+            );
+            panic!();
+        });
+
+        // Panic if chain id of PubSub message does not match chain id in DB
+        check_or_update_chain_id(&mut conn, grpc_chain_id as i64).expect("Chain id should match");
+
+        // Spawn worker
+        let last_transaction_version = parts[2].to_string().parse().unwrap_or_else(|e| {
+            error!(
+                pubsub_message = pubsub_message,
+                error = ?e,
+                "[NFT Metadata Crawler] Failed to parse last transaction version from PubSub message"
+            );
+            panic!();
+        });
+
+        let last_transaction_timestamp =
+            chrono::NaiveDateTime::parse_from_str(parts[3], "%Y-%m-%d %H:%M:%S %Z").unwrap_or(
+                chrono::NaiveDateTime::parse_from_str(parts[3], "%Y-%m-%d %H:%M:%S%.f %Z")
+                    .unwrap_or_else(|e| {
+                        error!(
+                            pubsub_message = pubsub_message,
+                            error = ?e,
+                            "[NFT Metadata Crawler] Failed to parse timestamp from PubSub message"
+                        );
+                        panic!();
+                    }),
+            );
+
+        let mut worker = Worker::new(
+            self.parser_config.clone(),
+            conn,
+            self.max_num_retries,
+            self.gcs_client.clone(),
+            &pubsub_message,
+            parts[0],
+            parts[1],
+            last_transaction_version,
+            last_transaction_timestamp,
+            parts[5].parse::<bool>().unwrap_or(false),
+        );
+
+        info!(
+            pubsub_message = pubsub_message,
+            "[NFT Metadata Crawler] Starting worker"
+        );
+
+        if let Err(e) = worker.parse().await {
+            warn!(
+                pubsub_message = pubsub_message,
+                error = ?e,
+                "[NFT Metadata Crawler] Parsing failed"
+            );
+            PARSER_FAIL_COUNT.inc();
+        }
+
+        info!(
+            pubsub_message = pubsub_message,
+            "[NFT Metadata Crawler] Worker finished"
+        );
+    }
+}
+
+impl Server for ParserContext {
+    fn build_router(&self) -> Router {
+        let self_arc = Arc::new(self.clone());
+        Router::new().route(
+            "/",
+            post(|bytes| async move {
+                self_arc.spawn_parser(bytes).await;
+
+                if !self_arc.parser_config.ack_parsed_uris {
+                    return Response::builder()
+                        .status(StatusCode::BAD_REQUEST)
+                        .body("".to_string())
+                        .unwrap();
+                }
+
+                PUBSUB_ACK_SUCCESS_COUNT.inc();
+                Response::builder()
+                    .status(StatusCode::OK)
+                    .body("".to_string())
+                    .unwrap()
+            }),
+        )
+    }
+}
diff --git a/ecosystem/nft-metadata-crawler-parser/src/utils/constants.rs b/ecosystem/nft-metadata-crawler-parser/src/utils/constants.rs
index 4a7078b6283c3..7bb0b4f5169c6 100644
--- a/ecosystem/nft-metadata-crawler-parser/src/utils/constants.rs
+++ b/ecosystem/nft-metadata-crawler-parser/src/utils/constants.rs
@@ -13,6 +13,9 @@ pub const MAX_JSON_REQUEST_RETRY_SECONDS: u64 = 30;
 /// Allocate 90 seconds for downloading large image files
 pub const MAX_IMAGE_REQUEST_RETRY_SECONDS: u64 = 90;
 
+/// Allocate 180 seconds for uploading large image files
+pub const MAX_ASSET_UPLOAD_RETRY_SECONDS: u64 = 180;
+
 /// Max number of retries for a given asset_uri
 pub const DEFAULT_MAX_NUM_PARSE_RETRIES: i32 = 3;
 
diff --git a/ecosystem/nft-metadata-crawler-parser/src/worker.rs b/ecosystem/nft-metadata-crawler-parser/src/worker.rs
index 885a40ec55787..85d221fec12f5 100644
--- a/ecosystem/nft-metadata-crawler-parser/src/worker.rs
+++ b/ecosystem/nft-metadata-crawler-parser/src/worker.rs
@@ -33,34 +33,37 @@ use url::Url;
 
 /// Stuct that represents a parser for a single entry from queue
 pub struct Worker {
-    config: Arc<ParserConfig>,
+    parser_config: Arc<ParserConfig>,
     conn: PooledConnection<ConnectionManager<PgConnection>>,
+    max_num_retries: i32,
     gcs_client: Arc<GCSClient>,
     pubsub_message: String,
     model: NFTMetadataCrawlerURIs,
     asset_data_id: String,
     asset_uri: String,
-    last_transaction_version: i32,
+    last_transaction_version: i64,
     last_transaction_timestamp: chrono::NaiveDateTime,
     force: bool,
 }
 
 impl Worker {
     pub fn new(
-        config: Arc<ParserConfig>,
+        parser_config: Arc<ParserConfig>,
         conn: PooledConnection<ConnectionManager<PgConnection>>,
+        max_num_retries: i32,
         gcs_client: Arc<GCSClient>,
         pubsub_message: &str,
         asset_data_id: &str,
         asset_uri: &str,
-        last_transaction_version: i32,
+        last_transaction_version: i64,
         last_transaction_timestamp: chrono::NaiveDateTime,
         force: bool,
     ) -> Self {
         let model = NFTMetadataCrawlerURIs::new(asset_uri);
         let worker = Self {
-            config,
+            parser_config,
             conn,
+            max_num_retries,
             gcs_client,
             pubsub_message: pubsub_message.to_string(),
             model,
@@ -112,9 +115,9 @@ impl Worker {
             // Parse asset_uri
             self.log_info("Parsing asset_uri");
             let json_uri = URIParser::parse(
-                &self.config.ipfs_prefix,
+                &self.parser_config.ipfs_prefix,
                 &self.model.get_asset_uri(),
-                self.config.ipfs_auth_key.as_deref(),
+                self.parser_config.ipfs_auth_key.as_deref(),
             )
             .unwrap_or_else(|_| {
                 self.log_warn("Failed to parse asset_uri", None);
@@ -125,7 +128,7 @@ impl Worker {
             // Parse JSON for raw_image_uri and raw_animation_uri
             self.log_info("Starting JSON parsing");
             let (raw_image_uri, raw_animation_uri, json) =
-                JSONParser::parse(json_uri, self.config.max_file_size_bytes)
+                JSONParser::parse(json_uri, self.parser_config.max_file_size_bytes)
                     .await
                     .unwrap_or_else(|e| {
                         // Increment retry count if JSON parsing fails
@@ -141,7 +144,7 @@ impl Worker {
             if json != Value::Null {
                 self.log_info("Writing JSON to GCS");
                 let cdn_json_uri_result = write_json_to_gcs(
-                    &self.config.bucket,
+                    &self.parser_config.bucket,
                     &self.asset_uri,
                     &json,
                     &self.gcs_client,
@@ -156,7 +159,7 @@ impl Worker {
                 }
 
                 let cdn_json_uri = cdn_json_uri_result
-                    .map(|value| format!("{}{}", self.config.cdn_prefix, value))
+                    .map(|value| format!("{}{}", self.parser_config.cdn_prefix, value))
                     .ok();
                 self.model.set_cdn_json_uri(cdn_json_uri);
             }
@@ -213,9 +216,9 @@ impl Worker {
             }
 
             let img_uri = URIParser::parse(
-                &self.config.ipfs_prefix,
+                &self.parser_config.ipfs_prefix,
                 &raw_image_uri,
-                self.config.ipfs_auth_key.as_deref(),
+                self.parser_config.ipfs_auth_key.as_deref(),
             )
             .unwrap_or_else(|_| {
                 self.log_warn("Failed to parse raw_image_uri", None);
@@ -230,9 +233,9 @@ impl Worker {
                 .inc();
             let (image, format) = ImageOptimizer::optimize(
                 &img_uri,
-                self.config.max_file_size_bytes,
-                self.config.image_quality,
-                self.config.max_image_dimensions,
+                self.parser_config.max_file_size_bytes,
+                self.parser_config.image_quality,
+                self.parser_config.max_image_dimensions,
             )
             .await
             .unwrap_or_else(|e| {
@@ -247,7 +250,7 @@ impl Worker {
                 self.log_info("Writing image to GCS");
                 let cdn_image_uri_result = write_image_to_gcs(
                     format,
-                    &self.config.bucket,
+                    &self.parser_config.bucket,
                     &raw_image_uri,
                     image,
                     &self.gcs_client,
@@ -262,7 +265,7 @@ impl Worker {
                 }
 
                 let cdn_image_uri = cdn_image_uri_result
-                    .map(|value| format!("{}{}", self.config.cdn_prefix, value))
+                    .map(|value| format!("{}{}", self.parser_config.cdn_prefix, value))
                     .ok();
                 self.model.set_cdn_image_uri(cdn_image_uri);
                 self.model.reset_json_parser_retry_count();
@@ -306,9 +309,9 @@ impl Worker {
         if let Some(raw_animation_uri) = raw_animation_uri_option {
             self.log_info("Parsing raw_animation_uri");
             let animation_uri = URIParser::parse(
-                &self.config.ipfs_prefix,
+                &self.parser_config.ipfs_prefix,
                 &raw_animation_uri,
-                self.config.ipfs_auth_key.as_deref(),
+                self.parser_config.ipfs_auth_key.as_deref(),
             )
             .unwrap_or_else(|_| {
                 self.log_warn("Failed to parse raw_animation_uri", None);
@@ -323,9 +326,9 @@ impl Worker {
                 .inc();
             let (animation, format) = ImageOptimizer::optimize(
                 &animation_uri,
-                self.config.max_file_size_bytes,
-                self.config.image_quality,
-                self.config.max_image_dimensions,
+                self.parser_config.max_file_size_bytes,
+                self.parser_config.image_quality,
+                self.parser_config.max_image_dimensions,
             )
             .await
             .unwrap_or_else(|e| {
@@ -340,7 +343,7 @@ impl Worker {
                 self.log_info("Writing animation to GCS");
                 let cdn_animation_uri_result = write_image_to_gcs(
                     format,
-                    &self.config.bucket,
+                    &self.parser_config.bucket,
                     &raw_animation_uri,
                     animation,
                     &self.gcs_client,
@@ -352,7 +355,7 @@ impl Worker {
                 }
 
                 let cdn_animation_uri = cdn_animation_uri_result
-                    .map(|value| format!("{}{}", self.config.cdn_prefix, value))
+                    .map(|value| format!("{}{}", self.parser_config.cdn_prefix, value))
                     .ok();
                 self.model.set_cdn_animation_uri(cdn_animation_uri);
             }
@@ -362,9 +365,9 @@ impl Worker {
             self.upsert();
         }
 
-        if self.model.get_json_parser_retry_count() >= self.config.max_num_parse_retries
-            || self.model.get_image_optimizer_retry_count() >= self.config.max_num_parse_retries
-            || self.model.get_animation_optimizer_retry_count() >= self.config.max_num_parse_retries
+        if self.model.get_json_parser_retry_count() >= self.max_num_retries
+            || self.model.get_image_optimizer_retry_count() >= self.max_num_retries
+            || self.model.get_animation_optimizer_retry_count() >= self.max_num_retries
         {
             self.log_info("Retry count exceeded, marking as do_not_parse");
             self.model.set_do_not_parse(true);
@@ -376,19 +379,16 @@ impl Worker {
     }
 
     fn upsert(&mut self) {
-        upsert_uris(
-            &mut self.conn,
-            &self.model,
-            self.last_transaction_version as i64,
-        )
-        .unwrap_or_else(|e| {
-            self.log_error("Commit to Postgres failed", &e);
-            panic!();
-        });
+        upsert_uris(&mut self.conn, &self.model, self.last_transaction_version).unwrap_or_else(
+            |e| {
+                self.log_error("Commit to Postgres failed", &e);
+                panic!();
+            },
+        );
     }
 
     fn is_blacklisted_uri(&mut self, uri: &str) -> bool {
-        self.config
+        self.parser_config
             .uri_blacklist
             .iter()
             .any(|blacklist_uri| uri.contains(blacklist_uri))
diff --git a/ecosystem/node-checker/fn-check-client/src/big_query.rs b/ecosystem/node-checker/fn-check-client/src/big_query.rs
index 43c770aa818ef..e95a98f2188cc 100644
--- a/ecosystem/node-checker/fn-check-client/src/big_query.rs
+++ b/ecosystem/node-checker/fn-check-client/src/big_query.rs
@@ -105,7 +105,7 @@ pub async fn write_to_big_query(
             .to_str()
             .context("Big query key path was invalid")?,
     )
-    .await;
+    .await?;
 
     info!(
         "Creating dataset if necessary: {}",
diff --git a/ecosystem/typescript/sdk/SPEC.md b/ecosystem/typescript/sdk/SPEC.md
index 1c3adf31c3b9b..116c7574d5bad 100644
--- a/ecosystem/typescript/sdk/SPEC.md
+++ b/ecosystem/typescript/sdk/SPEC.md
@@ -73,7 +73,7 @@ We do not use the fourth **`won't`** level in this specification.
   - [ ] **2.2.1** The SDK **must** support pagination with optional `offset` and `limit` parameters to Indexer API request.
   - [ ] **2.2.2** The SDK **must** validate the account address when interacting with the Indexer API.
     - [ ] **2.2.2.1** The SDK **must** validate an account address is a 64 character hex string with a leading `0x`.
-  - [ ] **2.2.3** The SDK **must** handle premade GraphQL queries https://cloud.hasura.io/public/graphiql?endpoint=https://indexer.mainnet.aptoslabs.com/v1/graphql.
+  - [ ] **2.2.3** The SDK **must** handle premade GraphQL queries https://cloud.hasura.io/public/graphiql?endpoint=https://api.mainnet.aptoslabs.com/v1/graphql.
   - [ ] **2.2.3** The SDK **should** allow the user to pass in a custom GraphQL query.
 - [ ] **2.3** The SDK **should** support interactions with Aptos devnet, testnet and mainnet networks.
 - [ ] **2.4** The SDK **should** support interactions with a custom URL.
diff --git a/ecosystem/typescript/sdk/src/generated/index.ts b/ecosystem/typescript/sdk/src/generated/index.ts
index 860dbb5232369..d58133dc2eb18 100644
--- a/ecosystem/typescript/sdk/src/generated/index.ts
+++ b/ecosystem/typescript/sdk/src/generated/index.ts
@@ -12,6 +12,8 @@ export type { Address } from './models/Address';
 export type { AptosError } from './models/AptosError';
 export { AptosErrorCode } from './models/AptosErrorCode';
 export type { Block } from './models/Block';
+export type { BlockEndInfo } from './models/BlockEndInfo';
+export type { BlockEpilogueTransaction } from './models/BlockEpilogueTransaction';
 export type { BlockMetadataTransaction } from './models/BlockMetadataTransaction';
 export type { DecodedTableData } from './models/DecodedTableData';
 export type { DeletedTableData } from './models/DeletedTableData';
@@ -20,6 +22,7 @@ export type { DeleteResource } from './models/DeleteResource';
 export type { DeleteTableItem } from './models/DeleteTableItem';
 export type { DeprecatedModuleBundlePayload } from './models/DeprecatedModuleBundlePayload';
 export type { DirectWriteSet } from './models/DirectWriteSet';
+export type { Ed25519 } from './models/Ed25519';
 export type { Ed25519Signature } from './models/Ed25519Signature';
 export type { EncodeSubmissionRequest } from './models/EncodeSubmissionRequest';
 export type { EntryFunctionId } from './models/EntryFunctionId';
@@ -37,6 +40,7 @@ export type { HexEncodedBytes } from './models/HexEncodedBytes';
 export type { IdentifierWrapper } from './models/IdentifierWrapper';
 export type { IndexedSignature } from './models/IndexedSignature';
 export type { IndexResponse } from './models/IndexResponse';
+export type { Keyless } from './models/Keyless';
 export type { MoveAbility } from './models/MoveAbility';
 export type { MoveFunction } from './models/MoveFunction';
 export type { MoveFunctionGenericTypeParam } from './models/MoveFunctionGenericTypeParam';
@@ -61,19 +65,28 @@ export type { MultisigTransactionPayload } from './models/MultisigTransactionPay
 export type { MultisigTransactionPayload_EntryFunctionPayload } from './models/MultisigTransactionPayload_EntryFunctionPayload';
 export type { PendingTransaction } from './models/PendingTransaction';
 export type { PublicKey } from './models/PublicKey';
-export type { PublicKey_string_HexEncodedBytes_ } from './models/PublicKey_string_HexEncodedBytes_';
+export type { PublicKey_Ed25519 } from './models/PublicKey_Ed25519';
+export type { PublicKey_Keyless } from './models/PublicKey_Keyless';
+export type { PublicKey_Secp256k1Ecdsa } from './models/PublicKey_Secp256k1Ecdsa';
+export type { PublicKey_Secp256r1Ecdsa } from './models/PublicKey_Secp256r1Ecdsa';
 export type { RawTableItemRequest } from './models/RawTableItemRequest';
 export { RoleType } from './models/RoleType';
 export type { ScriptPayload } from './models/ScriptPayload';
 export type { ScriptWriteSet } from './models/ScriptWriteSet';
+export type { Secp256k1Ecdsa } from './models/Secp256k1Ecdsa';
+export type { Secp256r1Ecdsa } from './models/Secp256r1Ecdsa';
 export type { Signature } from './models/Signature';
-export type { Signature_string_HexEncodedBytes_ } from './models/Signature_string_HexEncodedBytes_';
+export type { Signature_Ed25519 } from './models/Signature_Ed25519';
+export type { Signature_Keyless } from './models/Signature_Keyless';
+export type { Signature_Secp256k1Ecdsa } from './models/Signature_Secp256k1Ecdsa';
+export type { Signature_WebAuthn } from './models/Signature_WebAuthn';
 export type { SingleKeySignature } from './models/SingleKeySignature';
 export type { StateCheckpointTransaction } from './models/StateCheckpointTransaction';
 export type { StateKeyWrapper } from './models/StateKeyWrapper';
 export type { SubmitTransactionRequest } from './models/SubmitTransactionRequest';
 export type { TableItemRequest } from './models/TableItemRequest';
 export type { Transaction } from './models/Transaction';
+export type { Transaction_BlockEpilogueTransaction } from './models/Transaction_BlockEpilogueTransaction';
 export type { Transaction_BlockMetadataTransaction } from './models/Transaction_BlockMetadataTransaction';
 export type { Transaction_GenesisTransaction } from './models/Transaction_GenesisTransaction';
 export type { Transaction_PendingTransaction } from './models/Transaction_PendingTransaction';
@@ -100,6 +113,7 @@ export type { UserTransaction } from './models/UserTransaction';
 export type { ValidatorTransaction } from './models/ValidatorTransaction';
 export type { VersionedEvent } from './models/VersionedEvent';
 export type { ViewRequest } from './models/ViewRequest';
+export type { WebAuthn } from './models/WebAuthn';
 export type { WriteModule } from './models/WriteModule';
 export type { WriteResource } from './models/WriteResource';
 export type { WriteSet } from './models/WriteSet';
diff --git a/ecosystem/typescript/sdk/src/generated/models/BlockEndInfo.ts b/ecosystem/typescript/sdk/src/generated/models/BlockEndInfo.ts
new file mode 100644
index 0000000000000..ebea2c204ec78
--- /dev/null
+++ b/ecosystem/typescript/sdk/src/generated/models/BlockEndInfo.ts
@@ -0,0 +1,11 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+export type BlockEndInfo = {
+    block_gas_limit_reached: boolean;
+    block_output_limit_reached: boolean;
+    block_effective_block_gas_units: number;
+    block_approx_output_size: number;
+};
+
diff --git a/ecosystem/typescript/sdk/src/generated/models/BlockEpilogueTransaction.ts b/ecosystem/typescript/sdk/src/generated/models/BlockEpilogueTransaction.ts
new file mode 100644
index 0000000000000..3314ed8e960fd
--- /dev/null
+++ b/ecosystem/typescript/sdk/src/generated/models/BlockEpilogueTransaction.ts
@@ -0,0 +1,36 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { BlockEndInfo } from './BlockEndInfo';
+import type { HashValue } from './HashValue';
+import type { U64 } from './U64';
+import type { WriteSetChange } from './WriteSetChange';
+
+/**
+ * A block epilogue transaction
+ */
+export type BlockEpilogueTransaction = {
+    version: U64;
+    hash: HashValue;
+    state_change_hash: HashValue;
+    event_root_hash: HashValue;
+    state_checkpoint_hash?: HashValue;
+    gas_used: U64;
+    /**
+     * Whether the transaction was successful
+     */
+    success: boolean;
+    /**
+     * The VM status of the transaction, can tell useful information in a failure
+     */
+    vm_status: string;
+    accumulator_root_hash: HashValue;
+    /**
+     * Final state of resources changed by the transaction
+     */
+    changes: Array<WriteSetChange>;
+    timestamp: U64;
+    block_end_info?: BlockEndInfo;
+};
+
diff --git a/ecosystem/typescript/sdk/src/generated/models/Ed25519.ts b/ecosystem/typescript/sdk/src/generated/models/Ed25519.ts
new file mode 100644
index 0000000000000..585d5abb76fd4
--- /dev/null
+++ b/ecosystem/typescript/sdk/src/generated/models/Ed25519.ts
@@ -0,0 +1,10 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { HexEncodedBytes } from './HexEncodedBytes';
+
+export type Ed25519 = {
+    value: HexEncodedBytes;
+};
+
diff --git a/ecosystem/typescript/sdk/src/generated/models/Keyless.ts b/ecosystem/typescript/sdk/src/generated/models/Keyless.ts
new file mode 100644
index 0000000000000..e7917b795bab2
--- /dev/null
+++ b/ecosystem/typescript/sdk/src/generated/models/Keyless.ts
@@ -0,0 +1,10 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { HexEncodedBytes } from './HexEncodedBytes';
+
+export type Keyless = {
+    value: HexEncodedBytes;
+};
+
diff --git a/ecosystem/typescript/sdk/src/generated/models/PublicKey.ts b/ecosystem/typescript/sdk/src/generated/models/PublicKey.ts
index e9611882147b1..e058f28669ea5 100644
--- a/ecosystem/typescript/sdk/src/generated/models/PublicKey.ts
+++ b/ecosystem/typescript/sdk/src/generated/models/PublicKey.ts
@@ -2,7 +2,10 @@
 /* tslint:disable */
 /* eslint-disable */
 
-import type { PublicKey_string_HexEncodedBytes_ } from './PublicKey_string_HexEncodedBytes_';
+import type { PublicKey_Ed25519 } from './PublicKey_Ed25519';
+import type { PublicKey_Keyless } from './PublicKey_Keyless';
+import type { PublicKey_Secp256k1Ecdsa } from './PublicKey_Secp256k1Ecdsa';
+import type { PublicKey_Secp256r1Ecdsa } from './PublicKey_Secp256r1Ecdsa';
 
-export type PublicKey = PublicKey_string_HexEncodedBytes_;
+export type PublicKey = (PublicKey_Ed25519 | PublicKey_Secp256k1Ecdsa | PublicKey_Secp256r1Ecdsa | PublicKey_Keyless);
 
diff --git a/ecosystem/typescript/sdk/src/generated/models/PublicKey_Ed25519.ts b/ecosystem/typescript/sdk/src/generated/models/PublicKey_Ed25519.ts
new file mode 100644
index 0000000000000..aba535a16f4ad
--- /dev/null
+++ b/ecosystem/typescript/sdk/src/generated/models/PublicKey_Ed25519.ts
@@ -0,0 +1,10 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { Ed25519 } from './Ed25519';
+
+export type PublicKey_Ed25519 = ({
+    type: string;
+} & Ed25519);
+
diff --git a/ecosystem/typescript/sdk/src/generated/models/PublicKey_Keyless.ts b/ecosystem/typescript/sdk/src/generated/models/PublicKey_Keyless.ts
new file mode 100644
index 0000000000000..1125c14e96587
--- /dev/null
+++ b/ecosystem/typescript/sdk/src/generated/models/PublicKey_Keyless.ts
@@ -0,0 +1,10 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { Keyless } from './Keyless';
+
+export type PublicKey_Keyless = ({
+    type: string;
+} & Keyless);
+
diff --git a/ecosystem/typescript/sdk/src/generated/models/PublicKey_Secp256k1Ecdsa.ts b/ecosystem/typescript/sdk/src/generated/models/PublicKey_Secp256k1Ecdsa.ts
new file mode 100644
index 0000000000000..b517615973cfe
--- /dev/null
+++ b/ecosystem/typescript/sdk/src/generated/models/PublicKey_Secp256k1Ecdsa.ts
@@ -0,0 +1,10 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { Secp256k1Ecdsa } from './Secp256k1Ecdsa';
+
+export type PublicKey_Secp256k1Ecdsa = ({
+    type: string;
+} & Secp256k1Ecdsa);
+
diff --git a/ecosystem/typescript/sdk/src/generated/models/PublicKey_Secp256r1Ecdsa.ts b/ecosystem/typescript/sdk/src/generated/models/PublicKey_Secp256r1Ecdsa.ts
new file mode 100644
index 0000000000000..ba43033f1f67a
--- /dev/null
+++ b/ecosystem/typescript/sdk/src/generated/models/PublicKey_Secp256r1Ecdsa.ts
@@ -0,0 +1,10 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { Secp256r1Ecdsa } from './Secp256r1Ecdsa';
+
+export type PublicKey_Secp256r1Ecdsa = ({
+    type: string;
+} & Secp256r1Ecdsa);
+
diff --git a/ecosystem/typescript/sdk/src/generated/models/PublicKey_string_HexEncodedBytes_.ts b/ecosystem/typescript/sdk/src/generated/models/PublicKey_string_HexEncodedBytes_.ts
deleted file mode 100644
index 488809a28110a..0000000000000
--- a/ecosystem/typescript/sdk/src/generated/models/PublicKey_string_HexEncodedBytes_.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { HexEncodedBytes } from './HexEncodedBytes';
-
-export type PublicKey_string_HexEncodedBytes_ = ({
-    type: string;
-} & HexEncodedBytes);
-
diff --git a/ecosystem/typescript/sdk/src/generated/models/Secp256k1Ecdsa.ts b/ecosystem/typescript/sdk/src/generated/models/Secp256k1Ecdsa.ts
new file mode 100644
index 0000000000000..e00324c277a19
--- /dev/null
+++ b/ecosystem/typescript/sdk/src/generated/models/Secp256k1Ecdsa.ts
@@ -0,0 +1,10 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { HexEncodedBytes } from './HexEncodedBytes';
+
+export type Secp256k1Ecdsa = {
+    value: HexEncodedBytes;
+};
+
diff --git a/ecosystem/typescript/sdk/src/generated/models/Secp256r1Ecdsa.ts b/ecosystem/typescript/sdk/src/generated/models/Secp256r1Ecdsa.ts
new file mode 100644
index 0000000000000..992c8445ccae1
--- /dev/null
+++ b/ecosystem/typescript/sdk/src/generated/models/Secp256r1Ecdsa.ts
@@ -0,0 +1,10 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { HexEncodedBytes } from './HexEncodedBytes';
+
+export type Secp256r1Ecdsa = {
+    value: HexEncodedBytes;
+};
+
diff --git a/ecosystem/typescript/sdk/src/generated/models/Signature.ts b/ecosystem/typescript/sdk/src/generated/models/Signature.ts
index ebd65c20a1d20..b3375090db5dd 100644
--- a/ecosystem/typescript/sdk/src/generated/models/Signature.ts
+++ b/ecosystem/typescript/sdk/src/generated/models/Signature.ts
@@ -2,7 +2,10 @@
 /* tslint:disable */
 /* eslint-disable */
 
-import type { Signature_string_HexEncodedBytes_ } from './Signature_string_HexEncodedBytes_';
+import type { Signature_Ed25519 } from './Signature_Ed25519';
+import type { Signature_Keyless } from './Signature_Keyless';
+import type { Signature_Secp256k1Ecdsa } from './Signature_Secp256k1Ecdsa';
+import type { Signature_WebAuthn } from './Signature_WebAuthn';
 
-export type Signature = Signature_string_HexEncodedBytes_;
+export type Signature = (Signature_Ed25519 | Signature_Secp256k1Ecdsa | Signature_WebAuthn | Signature_Keyless);
 
diff --git a/ecosystem/typescript/sdk/src/generated/models/Signature_Ed25519.ts b/ecosystem/typescript/sdk/src/generated/models/Signature_Ed25519.ts
new file mode 100644
index 0000000000000..c76b89fe9501d
--- /dev/null
+++ b/ecosystem/typescript/sdk/src/generated/models/Signature_Ed25519.ts
@@ -0,0 +1,10 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { Ed25519 } from './Ed25519';
+
+export type Signature_Ed25519 = ({
+    type: string;
+} & Ed25519);
+
diff --git a/ecosystem/typescript/sdk/src/generated/models/Signature_Keyless.ts b/ecosystem/typescript/sdk/src/generated/models/Signature_Keyless.ts
new file mode 100644
index 0000000000000..24d0d746964f8
--- /dev/null
+++ b/ecosystem/typescript/sdk/src/generated/models/Signature_Keyless.ts
@@ -0,0 +1,10 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { Keyless } from './Keyless';
+
+export type Signature_Keyless = ({
+    type: string;
+} & Keyless);
+
diff --git a/ecosystem/typescript/sdk/src/generated/models/Signature_Secp256k1Ecdsa.ts b/ecosystem/typescript/sdk/src/generated/models/Signature_Secp256k1Ecdsa.ts
new file mode 100644
index 0000000000000..5a6609fde59d2
--- /dev/null
+++ b/ecosystem/typescript/sdk/src/generated/models/Signature_Secp256k1Ecdsa.ts
@@ -0,0 +1,10 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { Secp256k1Ecdsa } from './Secp256k1Ecdsa';
+
+export type Signature_Secp256k1Ecdsa = ({
+    type: string;
+} & Secp256k1Ecdsa);
+
diff --git a/ecosystem/typescript/sdk/src/generated/models/Signature_WebAuthn.ts b/ecosystem/typescript/sdk/src/generated/models/Signature_WebAuthn.ts
new file mode 100644
index 0000000000000..19109c21bbb91
--- /dev/null
+++ b/ecosystem/typescript/sdk/src/generated/models/Signature_WebAuthn.ts
@@ -0,0 +1,10 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { WebAuthn } from './WebAuthn';
+
+export type Signature_WebAuthn = ({
+    type: string;
+} & WebAuthn);
+
diff --git a/ecosystem/typescript/sdk/src/generated/models/Signature_string_HexEncodedBytes_.ts b/ecosystem/typescript/sdk/src/generated/models/Signature_string_HexEncodedBytes_.ts
deleted file mode 100644
index 74cc378d7c04b..0000000000000
--- a/ecosystem/typescript/sdk/src/generated/models/Signature_string_HexEncodedBytes_.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { HexEncodedBytes } from './HexEncodedBytes';
-
-export type Signature_string_HexEncodedBytes_ = ({
-    type: string;
-} & HexEncodedBytes);
-
diff --git a/ecosystem/typescript/sdk/src/generated/models/Transaction.ts b/ecosystem/typescript/sdk/src/generated/models/Transaction.ts
index 6cbd41ca39a96..9332b69176960 100644
--- a/ecosystem/typescript/sdk/src/generated/models/Transaction.ts
+++ b/ecosystem/typescript/sdk/src/generated/models/Transaction.ts
@@ -2,6 +2,7 @@
 /* tslint:disable */
 /* eslint-disable */
 
+import type { Transaction_BlockEpilogueTransaction } from './Transaction_BlockEpilogueTransaction';
 import type { Transaction_BlockMetadataTransaction } from './Transaction_BlockMetadataTransaction';
 import type { Transaction_GenesisTransaction } from './Transaction_GenesisTransaction';
 import type { Transaction_PendingTransaction } from './Transaction_PendingTransaction';
@@ -12,5 +13,5 @@ import type { Transaction_ValidatorTransaction } from './Transaction_ValidatorTr
 /**
  * Enum of the different types of transactions in Aptos
  */
-export type Transaction = (Transaction_PendingTransaction | Transaction_UserTransaction | Transaction_GenesisTransaction | Transaction_BlockMetadataTransaction | Transaction_StateCheckpointTransaction | Transaction_ValidatorTransaction);
+export type Transaction = (Transaction_PendingTransaction | Transaction_UserTransaction | Transaction_GenesisTransaction | Transaction_BlockMetadataTransaction | Transaction_StateCheckpointTransaction | Transaction_BlockEpilogueTransaction | Transaction_ValidatorTransaction);
 
diff --git a/ecosystem/typescript/sdk/src/generated/models/Transaction_BlockEpilogueTransaction.ts b/ecosystem/typescript/sdk/src/generated/models/Transaction_BlockEpilogueTransaction.ts
new file mode 100644
index 0000000000000..e4988c5f4449b
--- /dev/null
+++ b/ecosystem/typescript/sdk/src/generated/models/Transaction_BlockEpilogueTransaction.ts
@@ -0,0 +1,10 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { BlockEpilogueTransaction } from './BlockEpilogueTransaction';
+
+export type Transaction_BlockEpilogueTransaction = ({
+    type: string;
+} & BlockEpilogueTransaction);
+
diff --git a/ecosystem/typescript/sdk/src/generated/models/WebAuthn.ts b/ecosystem/typescript/sdk/src/generated/models/WebAuthn.ts
new file mode 100644
index 0000000000000..26d588211971b
--- /dev/null
+++ b/ecosystem/typescript/sdk/src/generated/models/WebAuthn.ts
@@ -0,0 +1,10 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { HexEncodedBytes } from './HexEncodedBytes';
+
+export type WebAuthn = {
+    value: HexEncodedBytes;
+};
+
diff --git a/ecosystem/typescript/sdk/src/indexer/codegen.yml b/ecosystem/typescript/sdk/src/indexer/codegen.yml
index a9e72503f4012..06c810eb6a25d 100644
--- a/ecosystem/typescript/sdk/src/indexer/codegen.yml
+++ b/ecosystem/typescript/sdk/src/indexer/codegen.yml
@@ -1,6 +1,6 @@
 overwrite: true
 documents: src/indexer/queries/**/*.graphql
-schema: https://indexer.mainnet.aptoslabs.com/v1/graphql
+schema: https://api.mainnet.aptoslabs.com/v1/graphql
 generates:
   src/indexer/generated/types.ts:
     plugins:
diff --git a/ecosystem/typescript/sdk/src/providers/indexer.ts b/ecosystem/typescript/sdk/src/providers/indexer.ts
index c65b78dfae4ba..11ddaa5c3ea22 100644
--- a/ecosystem/typescript/sdk/src/providers/indexer.ts
+++ b/ecosystem/typescript/sdk/src/providers/indexer.ts
@@ -106,7 +106,7 @@ export type GraphqlQuery = {
 /**
  * Provides methods for retrieving data from Aptos Indexer.
  * For more detailed Queries specification see
- * {@link https://cloud.hasura.io/public/graphiql?endpoint=https://indexer.mainnet.aptoslabs.com/v1/graphql}
+ * {@link https://cloud.hasura.io/public/graphiql?endpoint=https://api.mainnet.aptoslabs.com/v1/graphql}
  *
  * Some methods support optional extra arguments, such as - TokenStandard, IndexerSortBy, IndexerPaginationArgs
  *
diff --git a/ecosystem/typescript/sdk/src/utils/api-endpoints.ts b/ecosystem/typescript/sdk/src/utils/api-endpoints.ts
index 642bb43d3abcf..8495fd6aa50ba 100644
--- a/ecosystem/typescript/sdk/src/utils/api-endpoints.ts
+++ b/ecosystem/typescript/sdk/src/utils/api-endpoints.ts
@@ -1,7 +1,7 @@
 export const NetworkToIndexerAPI: Record<string, string> = {
-  mainnet: "https://indexer.mainnet.aptoslabs.com/v1/graphql",
-  testnet: "https://indexer-testnet.staging.gcp.aptosdev.com/v1/graphql",
-  devnet: "https://indexer-devnet.staging.gcp.aptosdev.com/v1/graphql",
+  mainnet: "https://api.mainnet.aptoslabs.com/v1/graphql",
+  testnet: "https://api.testnet.aptoslabs.com/v1/graphql",
+  devnet: "https://api.devnet.aptoslabs.com/v1/graphql",
   local: "http://127.0.0.1:8090/v1/graphql",
 };
 
diff --git a/execution/block-partitioner/src/test_utils.rs b/execution/block-partitioner/src/test_utils.rs
index 24f21261014bc..28738795ca6c9 100644
--- a/execution/block-partitioner/src/test_utils.rs
+++ b/execution/block-partitioner/src/test_utils.rs
@@ -150,10 +150,7 @@ impl P2PBlockGenerator {
 ///
 /// Also print a summary of the partitioning result.
 #[cfg(test)]
-pub fn verify_partitioner_output(
-    input: &Vec<AnalyzedTransaction>,
-    output: &PartitionedTransactions,
-) {
+pub fn verify_partitioner_output(input: &[AnalyzedTransaction], output: &PartitionedTransactions) {
     let old_txn_id_by_txn_hash: HashMap<HashValue, usize> = HashMap::from_iter(
         input
             .iter()
@@ -309,7 +306,7 @@ pub fn verify_partitioner_output(
 }
 
 #[cfg(test)]
-fn is_sorted(arr: &Vec<usize>) -> bool {
+fn is_sorted(arr: &[usize]) -> bool {
     let num = arr.len();
     for i in 1..num {
         if arr[i - 1] >= arr[i] {
diff --git a/execution/block-partitioner/src/v2/load_balance.rs b/execution/block-partitioner/src/v2/load_balance.rs
index 16d2898b892ba..b40af19ac48c1 100644
--- a/execution/block-partitioner/src/v2/load_balance.rs
+++ b/execution/block-partitioner/src/v2/load_balance.rs
@@ -8,10 +8,7 @@ use std::collections::BinaryHeap;
 /// Time complexity: O(num_tasks * log2(num_workers))
 ///
 /// Read more at https://en.wikipedia.org/wiki/Longest-processing-time-first_scheduling.
-pub fn longest_processing_time_first(
-    task_costs: &Vec<u64>,
-    num_workers: usize,
-) -> (u64, Vec<usize>) {
+pub fn longest_processing_time_first(task_costs: &[u64], num_workers: usize) -> (u64, Vec<usize>) {
     assert!(num_workers >= 1);
     let num_tasks = task_costs.len();
     let mut cost_tid_pairs: Vec<(u64, usize)> = task_costs
@@ -39,22 +36,22 @@ pub fn longest_processing_time_first(
 
 #[test]
 fn test_longest_processing_time_first() {
-    let (actual, assignment) = longest_processing_time_first(&vec![1, 2, 3, 4, 5], 1);
+    let (actual, assignment) = longest_processing_time_first(&[1, 2, 3, 4, 5], 1);
     assert_eq!(15, actual);
     println!("{:?}", assignment);
-    let (actual, assignment) = longest_processing_time_first(&vec![1, 2, 3, 4, 5], 2);
+    let (actual, assignment) = longest_processing_time_first(&[1, 2, 3, 4, 5], 2);
     assert_eq!(8, actual);
     println!("{:?}", assignment);
-    let (actual, assignment) = longest_processing_time_first(&vec![1, 2, 3, 4, 5], 3);
+    let (actual, assignment) = longest_processing_time_first(&[1, 2, 3, 4, 5], 3);
     assert_eq!(5, actual);
     println!("{:?}", assignment);
-    let (actual, assignment) = longest_processing_time_first(&vec![1, 2, 3, 4, 5], 4);
+    let (actual, assignment) = longest_processing_time_first(&[1, 2, 3, 4, 5], 4);
     assert_eq!(5, actual);
     println!("{:?}", assignment);
-    let (actual, assignment) = longest_processing_time_first(&vec![1, 2, 3, 4, 5], 5);
+    let (actual, assignment) = longest_processing_time_first(&[1, 2, 3, 4, 5], 5);
     assert_eq!(5, actual);
     println!("{:?}", assignment);
-    let (actual, assignment) = longest_processing_time_first(&vec![6, 7, 8, 4, 5], 2);
+    let (actual, assignment) = longest_processing_time_first(&[6, 7, 8, 4, 5], 2);
     assert_eq!(17, actual);
     println!("{:?}", assignment);
 }
diff --git a/execution/executor-benchmark/src/db_generator.rs b/execution/executor-benchmark/src/db_generator.rs
index a9fe87b29fae8..626b07687205d 100644
--- a/execution/executor-benchmark/src/db_generator.rs
+++ b/execution/executor-benchmark/src/db_generator.rs
@@ -16,6 +16,7 @@ use aptos_executor::{
     db_bootstrapper::{generate_waypoint, maybe_bootstrap},
 };
 use aptos_storage_interface::DbReaderWriter;
+use aptos_types::on_chain_config::Features;
 use aptos_vm::AptosVM;
 use std::{fs, path::Path};
 
@@ -28,6 +29,7 @@ pub fn create_db_with_accounts<V>(
     verify_sequence_numbers: bool,
     enable_storage_sharding: bool,
     pipeline_config: PipelineConfig,
+    init_features: Features,
 ) where
     V: TransactionBlockExecutor + 'static,
 {
@@ -39,7 +41,7 @@ pub fn create_db_with_accounts<V>(
     // create if not exists
     fs::create_dir_all(db_dir.as_ref()).unwrap();
 
-    bootstrap_with_genesis(&db_dir, enable_storage_sharding);
+    bootstrap_with_genesis(&db_dir, enable_storage_sharding, init_features.clone());
 
     println!(
         "Finished empty DB creation, DB dir: {}. Creating accounts now...",
@@ -56,11 +58,17 @@ pub fn create_db_with_accounts<V>(
         verify_sequence_numbers,
         enable_storage_sharding,
         pipeline_config,
+        init_features,
     );
 }
 
-fn bootstrap_with_genesis(db_dir: impl AsRef<Path>, enable_storage_sharding: bool) {
-    let (config, _genesis_key) = aptos_genesis::test_utils::test_config();
+fn bootstrap_with_genesis(
+    db_dir: impl AsRef<Path>,
+    enable_storage_sharding: bool,
+    init_features: Features,
+) {
+    let (config, _genesis_key) =
+        aptos_genesis::test_utils::test_config_with_custom_features(init_features);
 
     let mut rocksdb_configs = RocksdbConfigs::default();
     rocksdb_configs.state_merkle_db_config.max_open_files = -1;
@@ -74,6 +82,7 @@ fn bootstrap_with_genesis(db_dir: impl AsRef<Path>, enable_storage_sharding: boo
             false, /* indexer */
             BUFFERED_STATE_TARGET_ITEMS,
             DEFAULT_MAX_NUM_NODES_PER_LRU_CACHE_SHARD,
+            None,
         )
         .expect("DB should open."),
     );
diff --git a/execution/executor-benchmark/src/ledger_update_stage.rs b/execution/executor-benchmark/src/ledger_update_stage.rs
index ec92f8287f5b1..fe9d528aaf046 100644
--- a/execution/executor-benchmark/src/ledger_update_stage.rs
+++ b/execution/executor-benchmark/src/ledger_update_stage.rs
@@ -8,10 +8,16 @@ use aptos_executor_types::BlockExecutorTrait;
 use aptos_types::transaction::Version;
 use std::sync::{mpsc, Arc};
 
+pub enum CommitProcessing {
+    SendToQueue(mpsc::SyncSender<CommitBlockMessage>),
+    #[allow(dead_code)]
+    ExecuteInline,
+    Skip,
+}
+
 pub struct LedgerUpdateStage<V> {
     executor: Arc<BlockExecutor<V>>,
-    // If commit_sender is `None`, we will commit all the execution result immediately in this struct.
-    commit_sender: Option<mpsc::SyncSender<CommitBlockMessage>>,
+    commit_processing: CommitProcessing,
     version: Version,
 }
 
@@ -21,13 +27,13 @@ where
 {
     pub fn new(
         executor: Arc<BlockExecutor<V>>,
-        commit_sender: Option<mpsc::SyncSender<CommitBlockMessage>>,
+        commit_processing: CommitProcessing,
         version: Version,
     ) -> Self {
         Self {
             executor,
             version,
-            commit_sender,
+            commit_processing,
         }
     }
 
@@ -50,26 +56,30 @@ where
 
         self.version += output.transactions_to_commit_len() as Version;
 
-        if let Some(commit_sender) = &self.commit_sender {
-            let msg = CommitBlockMessage {
-                block_id,
-                root_hash: output.root_hash(),
-                first_block_start_time,
-                current_block_start_time,
-                partition_time,
-                execution_time,
-                num_txns: output.transactions_to_commit_len(),
-            };
-            commit_sender.send(msg).unwrap();
-        } else {
-            let ledger_info_with_sigs = super::transaction_committer::gen_li_with_sigs(
-                block_id,
-                output.root_hash(),
-                self.version,
-            );
-            self.executor
-                .commit_blocks(vec![block_id], ledger_info_with_sigs)
-                .unwrap();
+        match &self.commit_processing {
+            CommitProcessing::SendToQueue(commit_sender) => {
+                let msg = CommitBlockMessage {
+                    block_id,
+                    root_hash: output.root_hash(),
+                    first_block_start_time,
+                    current_block_start_time,
+                    partition_time,
+                    execution_time,
+                    num_txns: output.transactions_to_commit_len(),
+                };
+                commit_sender.send(msg).unwrap();
+            },
+            CommitProcessing::ExecuteInline => {
+                let ledger_info_with_sigs = super::transaction_committer::gen_li_with_sigs(
+                    block_id,
+                    output.root_hash(),
+                    self.version,
+                );
+                self.executor
+                    .commit_blocks(vec![block_id], ledger_info_with_sigs)
+                    .unwrap();
+            },
+            CommitProcessing::Skip => {},
         }
     }
 }
diff --git a/execution/executor-benchmark/src/lib.rs b/execution/executor-benchmark/src/lib.rs
index 17e7b073863a1..9a8efd0ba5c6b 100644
--- a/execution/executor-benchmark/src/lib.rs
+++ b/execution/executor-benchmark/src/lib.rs
@@ -40,8 +40,9 @@ use aptos_sdk::types::LocalAccount;
 use aptos_storage_interface::{state_view::LatestDbStateCheckpointView, DbReader, DbReaderWriter};
 use aptos_transaction_generator_lib::{
     create_txn_generator_creator, AlwaysApproveRootAccountHandle, TransactionGeneratorCreator,
-    TransactionType::{self, NonConflictingCoinTransfer},
+    TransactionType::{self, CoinTransfer},
 };
+use aptos_types::on_chain_config::Features;
 use db_reliable_submitter::DbReliableTransactionSubmitter;
 use pipeline::PipelineConfig;
 use std::{
@@ -66,6 +67,7 @@ where
             false,
             config.storage.buffered_state_target_items,
             config.storage.max_num_nodes_per_lru_cache_shard,
+            None,
         )
         .expect("DB should open."),
     );
@@ -108,6 +110,7 @@ pub fn run_benchmark<V>(
     pruner_config: PrunerConfig,
     enable_storage_sharding: bool,
     pipeline_config: PipelineConfig,
+    init_features: Features,
 ) where
     V: TransactionBlockExecutor + 'static,
 {
@@ -116,14 +119,14 @@ pub fn run_benchmark<V>(
         checkpoint_dir.as_ref(),
         enable_storage_sharding,
     );
-
-    let (mut config, genesis_key) = aptos_genesis::test_utils::test_config();
+    let (mut config, genesis_key) =
+        aptos_genesis::test_utils::test_config_with_custom_features(init_features);
     config.storage.dir = checkpoint_dir.as_ref().to_path_buf();
     config.storage.storage_pruner_config = pruner_config;
     config.storage.rocksdb_configs.enable_storage_sharding = enable_storage_sharding;
-
     let (db, executor) = init_db_and_executor::<V>(&config);
-    let mut root_account = TransactionGenerator::read_root_account(genesis_key, &db);
+    let root_account = TransactionGenerator::read_root_account(genesis_key, &db);
+    let root_account = Arc::new(root_account);
     let transaction_generators = transaction_mix.clone().map(|transaction_mix| {
         let num_existing_accounts = TransactionGenerator::read_meta(&source_dir);
         let num_accounts_to_be_loaded = std::cmp::min(
@@ -133,7 +136,7 @@ pub fn run_benchmark<V>(
 
         let mut num_accounts_to_skip = 0;
         for (transaction_type, _) in &transaction_mix {
-            if let NonConflictingCoinTransfer{..} = transaction_type {
+            if matches!(transaction_type, CoinTransfer { non_conflicting, .. } if *non_conflicting) {
                 // In case of random non-conflicting coin transfer using `P2PTransactionGenerator`,
                 // `3*block_size` addresses is required:
                 // `block_size` number of signers, and 2 groups of burn-n-recycle recipients used alternatively.
@@ -151,7 +154,7 @@ pub fn run_benchmark<V>(
 
         let (transaction_generator_creator, phase) = init_workload::<V>(
             transaction_mix,
-            &mut root_account,
+            root_account.clone(),
             main_signer_accounts,
             burner_accounts,
             db.clone(),
@@ -163,7 +166,7 @@ pub fn run_benchmark<V>(
         ((0..pipeline_config.num_generator_workers).map(|_| transaction_generator_creator.create_transaction_generator()).collect::<Vec<_>>(), phase)
     });
 
-    let version = db.reader.get_latest_version().unwrap();
+    let version = db.reader.get_synced_version().unwrap();
 
     let (pipeline, block_sender) =
         Pipeline::new(executor, version, &pipeline_config, Some(num_blocks));
@@ -171,7 +174,8 @@ pub fn run_benchmark<V>(
     let mut num_accounts_to_load = num_main_signer_accounts;
     if let Some(mix) = &transaction_mix {
         for (transaction_type, _) in mix {
-            if let NonConflictingCoinTransfer { .. } = transaction_type {
+            if matches!(transaction_type, CoinTransfer { non_conflicting, .. } if *non_conflicting)
+            {
                 // In case of non-conflicting coin transfer,
                 // `aptos_executor_benchmark::transaction_generator::TransactionGenerator` needs to hold
                 // at least `block_size` number of accounts, all as signer only.
@@ -185,6 +189,7 @@ pub fn run_benchmark<V>(
             }
         }
     }
+    let root_account = Arc::into_inner(root_account).unwrap();
     let mut generator = TransactionGenerator::new_with_existing_db(
         db.clone(),
         root_account,
@@ -230,22 +235,24 @@ pub fn run_benchmark<V>(
         }
     );
 
-    let num_txns = db.reader.get_latest_version().unwrap() - version - num_blocks_created as u64;
-    overall_measuring.print_end("Overall", num_txns);
+    if !pipeline_config.skip_commit {
+        let num_txns =
+            db.reader.get_synced_version().unwrap() - version - num_blocks_created as u64;
+        overall_measuring.print_end("Overall", num_txns);
 
-    if verify_sequence_numbers {
-        generator.verify_sequence_numbers(db.reader.clone());
+        if verify_sequence_numbers {
+            generator.verify_sequence_numbers(db.reader.clone());
+        }
+        log_total_supply(&db.reader);
     }
 
     // Assert there were no error log lines in the run.
     assert_eq!(0, aptos_logger::ERROR_LOG_COUNT.get());
-
-    log_total_supply(&db.reader);
 }
 
 fn init_workload<V>(
     transaction_mix: Vec<(TransactionType, usize)>,
-    root_account: &mut LocalAccount,
+    root_account: Arc<LocalAccount>,
     mut main_signer_accounts: Vec<LocalAccount>,
     burner_accounts: Vec<LocalAccount>,
     db: DbReaderWriter,
@@ -254,7 +261,7 @@ fn init_workload<V>(
 where
     V: TransactionBlockExecutor + 'static,
 {
-    let version = db.reader.get_latest_version().unwrap();
+    let version = db.reader.get_synced_version().unwrap();
     let (pipeline, block_sender) = Pipeline::<V>::new(
         BlockExecutor::new(db.clone()),
         version,
@@ -300,6 +307,7 @@ pub fn add_accounts<V>(
     verify_sequence_numbers: bool,
     enable_storage_sharding: bool,
     pipeline_config: PipelineConfig,
+    init_features: Features,
 ) where
     V: TransactionBlockExecutor + 'static,
 {
@@ -319,6 +327,7 @@ pub fn add_accounts<V>(
         verify_sequence_numbers,
         enable_storage_sharding,
         pipeline_config,
+        init_features,
     );
 }
 
@@ -332,16 +341,18 @@ fn add_accounts_impl<V>(
     verify_sequence_numbers: bool,
     enable_storage_sharding: bool,
     pipeline_config: PipelineConfig,
+    init_features: Features,
 ) where
     V: TransactionBlockExecutor + 'static,
 {
-    let (mut config, genesis_key) = aptos_genesis::test_utils::test_config();
+    let (mut config, genesis_key) =
+        aptos_genesis::test_utils::test_config_with_custom_features(init_features);
     config.storage.dir = output_dir.as_ref().to_path_buf();
     config.storage.storage_pruner_config = pruner_config;
     config.storage.rocksdb_configs.enable_storage_sharding = enable_storage_sharding;
     let (db, executor) = init_db_and_executor::<V>(&config);
 
-    let start_version = db.reader.get_latest_version().unwrap();
+    let start_version = db.reader.get_latest_ledger_info_version().unwrap();
 
     let (pipeline, block_sender) = Pipeline::new(
         executor,
@@ -372,7 +383,7 @@ fn add_accounts_impl<V>(
     pipeline.join();
 
     let elapsed = start_time.elapsed().as_secs_f32();
-    let now_version = db.reader.get_latest_version().unwrap();
+    let now_version = db.reader.get_latest_ledger_info_version().unwrap();
     let delta_v = now_version - start_version;
     info!(
         "Overall TPS: create_db: account creation: {} txn/s",
@@ -418,6 +429,8 @@ struct GasMeasurement {
     pub io_gas: f64,
     pub execution_gas: f64,
 
+    pub storage_fee: f64,
+
     pub approx_block_output: f64,
 
     pub gas_count: u64,
@@ -439,11 +452,17 @@ impl GasMeasurement {
     pub fn now() -> GasMeasurement {
         let gas = Self::sequential_gas_counter(GasType::NON_STORAGE_GAS).get_sample_sum()
             + Self::parallel_gas_counter(GasType::NON_STORAGE_GAS).get_sample_sum();
+
         let io_gas = Self::sequential_gas_counter(GasType::IO_GAS).get_sample_sum()
             + Self::parallel_gas_counter(GasType::IO_GAS).get_sample_sum();
         let execution_gas = Self::sequential_gas_counter(GasType::EXECUTION_GAS).get_sample_sum()
             + Self::parallel_gas_counter(GasType::EXECUTION_GAS).get_sample_sum();
 
+        let storage_fee = Self::sequential_gas_counter(GasType::STORAGE_FEE).get_sample_sum()
+            + Self::parallel_gas_counter(GasType::STORAGE_FEE).get_sample_sum()
+            - (Self::sequential_gas_counter(GasType::STORAGE_FEE_REFUND).get_sample_sum()
+                + Self::parallel_gas_counter(GasType::STORAGE_FEE_REFUND).get_sample_sum());
+
         let gas_count = Self::sequential_gas_counter(GasType::NON_STORAGE_GAS).get_sample_count()
             + Self::parallel_gas_counter(GasType::NON_STORAGE_GAS).get_sample_count();
 
@@ -468,6 +487,7 @@ impl GasMeasurement {
             effective_block_gas,
             io_gas,
             execution_gas,
+            storage_fee,
             approx_block_output,
             gas_count,
             speculative_abort_count,
@@ -482,6 +502,7 @@ impl GasMeasurement {
             effective_block_gas: end.effective_block_gas - self.effective_block_gas,
             io_gas: end.io_gas - self.io_gas,
             execution_gas: end.execution_gas - self.execution_gas,
+            storage_fee: end.storage_fee - self.storage_fee,
             approx_block_output: end.approx_block_output - self.approx_block_output,
             gas_count: end.gas_count - self.gas_count,
             speculative_abort_count: end.speculative_abort_count - self.speculative_abort_count,
@@ -634,6 +655,11 @@ impl OverallMeasuring {
             prefix,
             delta_gas.gas / (delta_gas.gas_count as f64).max(1.0)
         );
+        info!(
+            "{} Storage fee: {} octas/txn",
+            prefix,
+            delta_gas.storage_fee / (delta_gas.gas_count as f64).max(1.0)
+        );
         info!(
             "{} approx_output: {} bytes/s",
             prefix,
@@ -707,6 +733,7 @@ mod tests {
     use aptos_executor::block_executor::TransactionBlockExecutor;
     use aptos_temppath::TempPath;
     use aptos_transaction_generator_lib::{args::TransactionTypeArg, WorkflowProgress};
+    use aptos_types::on_chain_config::Features;
     use aptos_vm::AptosVM;
 
     fn test_generic_benchmark<E>(
@@ -732,6 +759,7 @@ mod tests {
             verify_sequence_numbers,
             false,
             PipelineConfig::default(),
+            Features::default(),
         );
 
         println!("run_benchmark");
@@ -753,6 +781,7 @@ mod tests {
             NO_OP_STORAGE_PRUNER_CONFIG,
             false,
             PipelineConfig::default(),
+            Features::default(),
         );
     }
 
@@ -768,7 +797,7 @@ mod tests {
         AptosVM::set_processed_transactions_detailed_counters();
         NativeExecutor::set_concurrency_level_once(4);
         test_generic_benchmark::<AptosVM>(
-            Some(TransactionTypeArg::ResourceGroupsGlobalWriteTag1KB),
+            Some(TransactionTypeArg::ModifyGlobalMilestoneAggV2),
             true,
         );
     }
diff --git a/execution/executor-benchmark/src/main.rs b/execution/executor-benchmark/src/main.rs
index 4b7a31751b5fc..f904cacc9bf08 100644
--- a/execution/executor-benchmark/src/main.rs
+++ b/execution/executor-benchmark/src/main.rs
@@ -23,6 +23,10 @@ use aptos_metrics_core::{register_int_gauge, IntGauge};
 use aptos_profiler::{ProfilerConfig, ProfilerHandler};
 use aptos_push_metrics::MetricsPusher;
 use aptos_transaction_generator_lib::{args::TransactionTypeArg, WorkflowProgress};
+use aptos_types::{
+    on_chain_config::{FeatureFlag, Features},
+    vm::configs::set_paranoid_type_checks,
+};
 use aptos_vm::AptosVM;
 use clap::{ArgGroup, Parser, Subcommand};
 use once_cell::sync::Lazy;
@@ -288,6 +292,22 @@ enum Command {
 
         #[clap(long, default_value_t = 10000000000)]
         init_account_balance: u64,
+
+        #[clap(
+            long,
+            num_args=1..,
+            value_delimiter = ' ',
+            help = "Optional custom enabling/disabling of the feature flags in the Move source. Enable / disable flags cannot overlap.\
+            Sample usage: --enable-feature=V1 --disable-feature=V2 V3 where V1, V2, V3 are FeatureFlag enum variants.")]
+        enable_feature: Vec<FeatureFlag>,
+
+        #[clap(
+            long,
+            num_args=1..,
+            value_delimiter = ' ',
+            help = "Optional custom enabling/disabling of the feature flags in the Move source. Enable / disable flags cannot overlap.\
+            Sample usage: --enable-feature=V1 --disable-feature=V2 V3 where V1, V2, V3 are FeatureFlag enum variants.")]
+        disable_feature: Vec<FeatureFlag>,
     },
     RunExecutor {
         /// number of transfer blocks to run
@@ -324,6 +344,22 @@ enum Command {
 
         #[clap(long, value_parser)]
         checkpoint_dir: PathBuf,
+
+        #[clap(
+            long,
+            num_args=1..,
+            value_delimiter = ' ',
+            help = "Optional custom enabling/disabling of the feature flags in the Move source. Enable / disable flags cannot overlap.\
+            Sample usage: --enable-feature=V1 --disable-feature=V2 V3 where V1, V2, V3 are FeatureFlag enum variants.")]
+        enable_feature: Vec<FeatureFlag>,
+
+        #[clap(
+            long,
+            num_args=1..,
+            value_delimiter = ' ',
+            help = "Optional custom enabling/disabling of the feature flags in the Move source. Enable / disable flags cannot overlap.\
+            Sample usage: --enable-feature=V1 --disable-feature=V2 V3 where V1, V2, V3 are FeatureFlag enum variants.")]
+        disable_feature: Vec<FeatureFlag>,
     },
     AddAccounts {
         #[clap(long, value_parser)]
@@ -340,6 +376,26 @@ enum Command {
     },
 }
 
+fn get_init_features(
+    enable_feature: Vec<FeatureFlag>,
+    disable_feature: Vec<FeatureFlag>,
+) -> Features {
+    // this check is O(|enable_feature| * |disable_feature|)
+    assert!(
+        enable_feature.iter().all(|f| !disable_feature.contains(f)),
+        "Enable and disable feature flags cannot overlap."
+    );
+
+    let mut init_features = Features::default();
+    for feature in enable_feature.iter() {
+        init_features.enable(*feature);
+    }
+    for feature in disable_feature.iter() {
+        init_features.disable(*feature);
+    }
+    init_features
+}
+
 fn run<E>(opt: Opt)
 where
     E: TransactionBlockExecutor + 'static,
@@ -349,6 +405,8 @@ where
             data_dir,
             num_accounts,
             init_account_balance,
+            enable_feature,
+            disable_feature,
         } => {
             aptos_executor_benchmark::db_generator::create_db_with_accounts::<E>(
                 num_accounts,
@@ -359,6 +417,7 @@ where
                 opt.verify_sequence_numbers,
                 opt.enable_storage_sharding,
                 opt.pipeline_opt.pipeline_config(),
+                get_init_features(enable_feature, disable_feature),
             );
         },
         Command::RunExecutor {
@@ -371,7 +430,14 @@ where
             use_sender_account_pool,
             data_dir,
             checkpoint_dir,
+            enable_feature,
+            disable_feature,
         } => {
+            // aptos_types::on_chain_config::hack_enable_default_features_for_genesis(enable_feature);
+            // aptos_types::on_chain_config::hack_disable_default_features_for_genesis(
+            //     disable_feature,
+            // );
+
             let transaction_mix = if transaction_type.is_empty() {
                 None
             } else {
@@ -389,7 +455,9 @@ where
 
             if let Some(hotspot_probability) = opt.hotspot_probability {
                 if !(0.5..1.0).contains(&hotspot_probability) {
-                    panic!("Parameter hotspot-probability has to a decimal number in [0.5, 1.0).");
+                    panic!(
+                        "Parameter hotspot-probability has to be a decimal number in [0.5, 1.0)."
+                    );
                 }
             }
 
@@ -409,6 +477,7 @@ where
                 opt.pruner_opt.pruner_config(),
                 opt.enable_storage_sharding,
                 opt.pipeline_opt.pipeline_config(),
+                get_init_features(enable_feature, disable_feature),
             );
         },
         Command::AddAccounts {
@@ -427,6 +496,7 @@ where
                 opt.verify_sequence_numbers,
                 opt.enable_storage_sharding,
                 opt.pipeline_opt.pipeline_config(),
+                Features::default(),
             );
         },
     }
@@ -491,7 +561,7 @@ fn main() {
     }
 
     if opt.skip_paranoid_checks {
-        AptosVM::set_paranoid_type_checks(false);
+        set_paranoid_type_checks(false);
     }
     AptosVM::set_num_shards_once(execution_shards);
     AptosVM::set_concurrency_level_once(execution_threads_per_shard);
diff --git a/execution/executor-benchmark/src/native_executor.rs b/execution/executor-benchmark/src/native_executor.rs
index 4fec67e77ef33..463777bfed0c2 100644
--- a/execution/executor-benchmark/src/native_executor.rs
+++ b/execution/executor-benchmark/src/native_executor.rs
@@ -426,6 +426,7 @@ impl TransactionBlockExecutor for NativeExecutor {
             transactions: transactions.into_iter().map(|t| t.into_inner()).collect(),
             transaction_outputs,
             state_cache: state_view.into_state_cache(),
+            block_end_info: None,
         })
     }
 }
diff --git a/execution/executor-benchmark/src/pipeline.rs b/execution/executor-benchmark/src/pipeline.rs
index 81db3c2e8a019..8d4efaf380d70 100644
--- a/execution/executor-benchmark/src/pipeline.rs
+++ b/execution/executor-benchmark/src/pipeline.rs
@@ -2,8 +2,10 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{
-    block_preparation::BlockPreparationStage, ledger_update_stage::LedgerUpdateStage,
-    metrics::NUM_TXNS, OverallMeasuring, TransactionCommitter, TransactionExecutor,
+    block_preparation::BlockPreparationStage,
+    ledger_update_stage::{CommitProcessing, LedgerUpdateStage},
+    metrics::NUM_TXNS,
+    OverallMeasuring, TransactionCommitter, TransactionExecutor,
 };
 use aptos_block_partitioner::v2::config::PartitionerV2Config;
 use aptos_crypto::HashValue;
@@ -85,7 +87,7 @@ where
             );
 
         let (commit_sender, commit_receiver) = mpsc::sync_channel::<CommitBlockMessage>(
-            if config.split_stages || config.skip_commit {
+            if config.split_stages {
                 (num_blocks.unwrap() + 1).max(3)
             } else {
                 3
@@ -99,7 +101,7 @@ where
             (None, None)
         };
 
-        let (start_commit_tx, start_commit_rx) = if config.split_stages || config.skip_commit {
+        let (start_commit_tx, start_commit_rx) = if config.split_stages {
             let (start_commit_tx, start_commit_rx) = mpsc::sync_channel::<()>(1);
             (Some(start_commit_tx), Some(start_commit_rx))
         } else {
@@ -120,8 +122,13 @@ where
             config.allow_retries,
         );
 
+        let commit_processing = if config.skip_commit {
+            CommitProcessing::Skip
+        } else {
+            CommitProcessing::SendToQueue(commit_sender)
+        };
         let mut ledger_update_stage =
-            LedgerUpdateStage::new(executor_2, Some(commit_sender), version);
+            LedgerUpdateStage::new(executor_2, commit_processing, version);
 
         let (executable_block_sender, executable_block_receiver) =
             mpsc::sync_channel::<ExecuteBlockMessage>(3);
@@ -191,7 +198,9 @@ where
                     );
                 }
 
-                overall_measuring.print_end("Overall execution", executed);
+                if num_blocks.is_some() {
+                    overall_measuring.print_end("Overall execution", executed);
+                }
                 start_commit_tx.map(|tx| tx.send(()));
             })
             .expect("Failed to spawn transaction executor thread.");
@@ -212,21 +221,19 @@ where
             .expect("Failed to spawn ledger update thread.");
         join_handles.push(ledger_update_thread);
 
-        let skip_commit = config.skip_commit;
-
-        let commit_thread = std::thread::Builder::new()
-            .name("txn_committer".to_string())
-            .spawn(move || {
-                start_commit_rx.map(|rx| rx.recv());
-                info!("Starting commit thread");
-                if !skip_commit {
+        if !config.skip_commit {
+            let commit_thread = std::thread::Builder::new()
+                .name("txn_committer".to_string())
+                .spawn(move || {
+                    start_commit_rx.map(|rx| rx.recv());
+                    info!("Starting commit thread");
                     let mut committer =
                         TransactionCommitter::new(executor_3, version, commit_receiver);
                     committer.run();
-                }
-            })
-            .expect("Failed to spawn transaction committer thread.");
-        join_handles.push(commit_thread);
+                })
+                .expect("Failed to spawn transaction committer thread.");
+            join_handles.push(commit_thread);
+        }
 
         (
             Self {
diff --git a/execution/executor-benchmark/src/transaction_committer.rs b/execution/executor-benchmark/src/transaction_committer.rs
index c1c0ee495a6e4..ed87e4611a761 100644
--- a/execution/executor-benchmark/src/transaction_committer.rs
+++ b/execution/executor-benchmark/src/transaction_committer.rs
@@ -91,7 +91,7 @@ where
             let commit_start = std::time::Instant::now();
             let ledger_info_with_sigs = gen_li_with_sigs(block_id, root_hash, self.version);
             self.executor
-                .commit_blocks_ext(vec![block_id], ledger_info_with_sigs, false)
+                .commit_blocks(vec![block_id], ledger_info_with_sigs)
                 .unwrap();
 
             report_block(
diff --git a/execution/executor-types/src/ledger_update_output.rs b/execution/executor-types/src/ledger_update_output.rs
index 07ce7f276a6b7..169fbe77c1aaa 100644
--- a/execution/executor-types/src/ledger_update_output.rs
+++ b/execution/executor-types/src/ledger_update_output.rs
@@ -13,7 +13,10 @@ use aptos_types::{
     ledger_info::LedgerInfoWithSignatures,
     proof::accumulator::InMemoryTransactionAccumulator,
     state_store::{combine_or_add_sharded_state_updates, ShardedStateUpdates},
-    transaction::{Transaction, TransactionInfo, TransactionStatus, TransactionToCommit, Version},
+    transaction::{
+        block_epilogue::BlockEndInfo, TransactionInfo, TransactionStatus, TransactionToCommit,
+        Version,
+    },
 };
 use itertools::zip_eq;
 use std::sync::Arc;
@@ -29,6 +32,7 @@ pub struct LedgerUpdateOutput {
     /// The in-memory Merkle Accumulator representing a blockchain state consistent with the
     /// `state_tree`.
     pub transaction_accumulator: Arc<InMemoryTransactionAccumulator>,
+    pub block_end_info: Option<BlockEndInfo>,
 }
 
 impl LedgerUpdateOutput {
@@ -60,10 +64,9 @@ impl LedgerUpdateOutput {
     /// block.
     pub fn ensure_ends_with_state_checkpoint(&self) -> Result<()> {
         ensure!(
-            self.to_commit.last().map_or(true, |txn| matches!(
-                txn.transaction(),
-                Transaction::StateCheckpoint(_)
-            )),
+            self.to_commit
+                .last()
+                .map_or(true, |txn| txn.transaction().is_non_reconfig_block_ending()),
             "Block not ending with a state checkpoint.",
         );
         Ok(())
@@ -173,10 +176,13 @@ impl LedgerUpdateOutput {
             self.statuses_for_input_txns.clone(),
             self.transaction_info_hashes.clone(),
             self.subscribable_events.clone(),
+            self.block_end_info.clone(),
         )
     }
 
     pub fn combine(&mut self, rhs: Self) {
+        assert!(self.block_end_info.is_none());
+        assert!(rhs.block_end_info.is_none());
         let Self {
             statuses_for_input_txns,
             to_commit,
@@ -185,6 +191,7 @@ impl LedgerUpdateOutput {
             state_updates_until_last_checkpoint: state_updates_before_last_checkpoint,
             sharded_state_cache,
             transaction_accumulator,
+            block_end_info: _block_end_info,
         } = rhs;
 
         if let Some(updates) = state_updates_before_last_checkpoint {
diff --git a/execution/executor-types/src/lib.rs b/execution/executor-types/src/lib.rs
index 44365a22d1d94..d1033528b9407 100644
--- a/execution/executor-types/src/lib.rs
+++ b/execution/executor-types/src/lib.rs
@@ -21,6 +21,7 @@ use aptos_types::{
     proof::{AccumulatorExtensionProof, SparseMerkleProofExt},
     state_store::{state_key::StateKey, state_value::StateValue},
     transaction::{
+        block_epilogue::{BlockEndInfo, BlockEpiloguePayload},
         ExecutionStatus, Transaction, TransactionInfo, TransactionListWithProof,
         TransactionOutputListWithProof, TransactionStatus, Version,
     },
@@ -174,24 +175,11 @@ pub trait BlockExecutorTrait: Send + Sync {
     /// and only `C` and `E` have signatures, we will send `A`, `B` and `C` in the first batch,
     /// then `D` and `E` later in the another batch.
     /// Commits a block and all its ancestors in a batch manner.
-    fn commit_blocks_ext(
-        &self,
-        block_ids: Vec<HashValue>,
-        ledger_info_with_sigs: LedgerInfoWithSignatures,
-        save_state_snapshots: bool,
-    ) -> ExecutorResult<()>;
-
     fn commit_blocks(
         &self,
         block_ids: Vec<HashValue>,
         ledger_info_with_sigs: LedgerInfoWithSignatures,
-    ) -> ExecutorResult<()> {
-        self.commit_blocks_ext(
-            block_ids,
-            ledger_info_with_sigs,
-            true, /* save_state_snapshots */
-        )
-    }
+    ) -> ExecutorResult<()>;
 
     /// Finishes the block executor by releasing memory held by inner data structures(SMT).
     fn finish(&self);
@@ -329,6 +317,8 @@ pub struct StateComputeResult {
     transaction_info_hashes: Vec<HashValue>,
 
     subscribable_events: Vec<ContractEvent>,
+
+    block_end_info: Option<BlockEndInfo>,
 }
 
 impl StateComputeResult {
@@ -342,6 +332,7 @@ impl StateComputeResult {
         compute_status_for_input_txns: Vec<TransactionStatus>,
         transaction_info_hashes: Vec<HashValue>,
         subscribable_events: Vec<ContractEvent>,
+        block_end_info: Option<BlockEndInfo>,
     ) -> Self {
         Self {
             root_hash,
@@ -353,6 +344,7 @@ impl StateComputeResult {
             compute_status_for_input_txns,
             transaction_info_hashes,
             subscribable_events,
+            block_end_info,
         }
     }
 
@@ -370,6 +362,7 @@ impl StateComputeResult {
             compute_status_for_input_txns: vec![],
             transaction_info_hashes: vec![],
             subscribable_events: vec![],
+            block_end_info: None,
         }
     }
 
@@ -387,6 +380,7 @@ impl StateComputeResult {
             ],
             transaction_info_hashes: vec![],
             subscribable_events: vec![],
+            block_end_info: None,
         }
     }
 
@@ -404,9 +398,7 @@ impl StateComputeResult {
         ret.compute_status_for_input_txns = compute_status;
         ret
     }
-}
 
-impl StateComputeResult {
     pub fn version(&self) -> Version {
         max(self.num_leaves, 1)
             .checked_sub(1)
@@ -422,8 +414,11 @@ impl StateComputeResult {
     }
 
     pub fn transactions_to_commit_len(&self) -> usize {
-        // StateCheckpoint/BlockEpilogue is added if there is no reconfiguration
-        self.compute_status_for_input_txns().len()
+        self.compute_status_for_input_txns()
+            .iter()
+            .filter(|status| matches!(status, TransactionStatus::Keep(_)))
+            .count()
+            // StateCheckpoint/BlockEpilogue is added if there is no reconfiguration
             + (if self.has_reconfiguration() { 0 } else { 1 })
     }
 
@@ -444,7 +439,7 @@ impl StateComputeResult {
         let output = itertools::zip_eq(input_txns, self.compute_status_for_input_txns())
             .filter_map(|(txn, status)| {
                 assert!(
-                    !matches!(txn, Transaction::StateCheckpoint(_)),
+                    !txn.is_non_reconfig_block_ending(),
                     "{:?}: {:?}",
                     txn,
                     status
@@ -454,12 +449,24 @@ impl StateComputeResult {
                     _ => None,
                 }
             })
-            .chain((!self.has_reconfiguration()).then_some(Transaction::StateCheckpoint(block_id)))
+            .chain(
+                (!self.has_reconfiguration()).then_some(self.block_end_info.clone().map_or(
+                    Transaction::StateCheckpoint(block_id),
+                    |block_end_info| {
+                        Transaction::BlockEpilogue(BlockEpiloguePayload::V0 {
+                            block_id,
+                            block_end_info,
+                        })
+                    },
+                )),
+            )
             .collect::<Vec<_>>();
 
         assert!(
             self.has_reconfiguration()
-                || matches!(output.last(), Some(Transaction::StateCheckpoint(_))),
+                || output
+                    .last()
+                    .map_or(false, Transaction::is_non_reconfig_block_ending),
             "{:?}",
             output.last()
         );
diff --git a/execution/executor-types/src/parsed_transaction_output.rs b/execution/executor-types/src/parsed_transaction_output.rs
index f97fea0e4d4d4..05828e280d498 100644
--- a/execution/executor-types/src/parsed_transaction_output.rs
+++ b/execution/executor-types/src/parsed_transaction_output.rs
@@ -140,7 +140,9 @@ impl TransactionsWithParsedOutput {
             | Transaction::BlockMetadataExt(_)
             | Transaction::UserTransaction(_)
             | Transaction::ValidatorTransaction(_) => false,
-            Transaction::GenesisTransaction(_) | Transaction::StateCheckpoint(_) => true,
+            Transaction::GenesisTransaction(_)
+            | Transaction::StateCheckpoint(_)
+            | Transaction::BlockEpilogue(_) => true,
         }
     }
 
diff --git a/execution/executor-types/src/state_checkpoint_output.rs b/execution/executor-types/src/state_checkpoint_output.rs
index e8e08c4288fe4..b8bb881f4ed6d 100644
--- a/execution/executor-types/src/state_checkpoint_output.rs
+++ b/execution/executor-types/src/state_checkpoint_output.rs
@@ -7,7 +7,10 @@ use crate::parsed_transaction_output::TransactionsWithParsedOutput;
 use anyhow::{ensure, Result};
 use aptos_crypto::HashValue;
 use aptos_storage_interface::cached_state_view::ShardedStateCache;
-use aptos_types::{state_store::ShardedStateUpdates, transaction::TransactionStatus};
+use aptos_types::{
+    state_store::ShardedStateUpdates,
+    transaction::{block_epilogue::BlockEndInfo, TransactionStatus},
+};
 use itertools::zip_eq;
 
 #[derive(Default)]
@@ -65,6 +68,7 @@ pub struct StateCheckpointOutput {
     state_checkpoint_hashes: Vec<Option<HashValue>>,
     state_updates_before_last_checkpoint: Option<ShardedStateUpdates>,
     sharded_state_cache: ShardedStateCache,
+    block_end_info: Option<BlockEndInfo>,
 }
 
 impl StateCheckpointOutput {
@@ -74,6 +78,7 @@ impl StateCheckpointOutput {
         state_checkpoint_hashes: Vec<Option<HashValue>>,
         state_updates_before_last_checkpoint: Option<ShardedStateUpdates>,
         sharded_state_cache: ShardedStateCache,
+        block_end_info: Option<BlockEndInfo>,
     ) -> Self {
         Self {
             txns,
@@ -81,6 +86,7 @@ impl StateCheckpointOutput {
             state_checkpoint_hashes,
             state_updates_before_last_checkpoint,
             sharded_state_cache,
+            block_end_info,
         }
     }
 
@@ -100,6 +106,7 @@ impl StateCheckpointOutput {
         Vec<Option<HashValue>>,
         Option<ShardedStateUpdates>,
         ShardedStateCache,
+        Option<BlockEndInfo>,
     ) {
         (
             self.txns,
@@ -107,6 +114,7 @@ impl StateCheckpointOutput {
             self.state_checkpoint_hashes,
             self.state_updates_before_last_checkpoint,
             self.sharded_state_cache,
+            self.block_end_info,
         )
     }
 
diff --git a/execution/executor/Cargo.toml b/execution/executor/Cargo.toml
index aec6c3ca9ae54..fcc3213c594bb 100644
--- a/execution/executor/Cargo.toml
+++ b/execution/executor/Cargo.toml
@@ -20,10 +20,12 @@ aptos-drop-helper = { workspace = true }
 aptos-executor-service = { workspace = true }
 aptos-executor-types = { workspace = true }
 aptos-experimental-runtimes = { workspace = true }
+aptos-indexer-grpc-table-info = { workspace = true }
 aptos-infallible = { workspace = true }
 aptos-logger = { workspace = true }
 aptos-metrics-core = { workspace = true }
 aptos-scratchpad = { workspace = true }
+aptos-sdk = { workspace = true }
 aptos-storage-interface = { workspace = true }
 aptos-types = { workspace = true }
 aptos-vm = { workspace = true }
@@ -42,6 +44,8 @@ serde = { workspace = true }
 aptos-cached-packages = { workspace = true }
 aptos-config = { workspace = true }
 aptos-db = { workspace = true }
+aptos-db-indexer = { workspace = true, features = ["fuzzing"] }
+aptos-db-indexer-schemas = { workspace = true, features = ["fuzzing"] }
 aptos-executor-test-helpers = { workspace = true }
 aptos-genesis = { workspace = true }
 aptos-storage-interface = { workspace = true }
diff --git a/execution/executor/src/block_executor.rs b/execution/executor/src/block_executor.rs
index e6b872b9d2c58..18fa57557dab5 100644
--- a/execution/executor/src/block_executor.rs
+++ b/execution/executor/src/block_executor.rs
@@ -137,17 +137,16 @@ where
             .ledger_update(block_id, parent_block_id, state_checkpoint_output)
     }
 
-    fn commit_blocks_ext(
+    fn commit_blocks(
         &self,
         block_ids: Vec<HashValue>,
         ledger_info_with_sigs: LedgerInfoWithSignatures,
-        save_state_snapshots: bool,
     ) -> ExecutorResult<()> {
         self.inner
             .read()
             .as_ref()
             .expect("BlockExecutor is not reset")
-            .commit_blocks_ext(block_ids, ledger_info_with_sigs, save_state_snapshots)
+            .commit_blocks(block_ids, ledger_info_with_sigs)
     }
 
     fn finish(&self) {
@@ -329,11 +328,10 @@ where
         Ok(state_compute_result)
     }
 
-    fn commit_blocks_ext(
+    fn commit_blocks(
         &self,
         block_ids: Vec<HashValue>,
         ledger_info_with_sigs: LedgerInfoWithSignatures,
-        sync_commit: bool,
     ) -> ExecutorResult<()> {
         let _timer = APTOS_EXECUTOR_COMMIT_BLOCKS_SECONDS.start_timer();
 
@@ -405,7 +403,7 @@ where
                 } else {
                     None
                 },
-                sync_commit,
+                false, // sync_commit
                 result_in_memory_state,
                 // TODO(grao): Avoid this clone.
                 block
diff --git a/execution/executor/src/components/apply_chunk_output.rs b/execution/executor/src/components/apply_chunk_output.rs
index 7cb11697cbf1e..9f6e3a6d02ba1 100644
--- a/execution/executor/src/components/apply_chunk_output.rs
+++ b/execution/executor/src/components/apply_chunk_output.rs
@@ -28,6 +28,7 @@ use aptos_types::{
     proof::accumulator::{InMemoryEventAccumulator, InMemoryTransactionAccumulator},
     state_store::ShardedStateUpdates,
     transaction::{
+        block_epilogue::{BlockEndInfo, BlockEpiloguePayload},
         ExecutionStatus, Transaction, TransactionAuxiliaryData, TransactionInfo, TransactionOutput,
         TransactionStatus, TransactionToCommit,
     },
@@ -50,6 +51,7 @@ impl ApplyChunkOutput {
             state_cache,
             transactions,
             transaction_outputs,
+            block_end_info,
         } = chunk_output;
         let (new_epoch, statuses_for_input_txns, to_commit, to_discard, to_retry) = {
             let _timer = APTOS_EXECUTOR_OTHER_TIMERS_SECONDS
@@ -61,6 +63,7 @@ impl ApplyChunkOutput {
                 transactions,
                 transaction_outputs,
                 append_state_checkpoint_to_block,
+                block_end_info.clone(),
             )?
         };
 
@@ -91,6 +94,7 @@ impl ApplyChunkOutput {
             state_checkpoint_hashes,
             state_updates_before_last_checkpoint,
             sharded_state_cache,
+            block_end_info,
         );
 
         // On state sync/replay, we generate state checkpoints only periodically, for the
@@ -115,6 +119,7 @@ impl ApplyChunkOutput {
             state_checkpoint_hashes,
             state_updates_before_last_checkpoint,
             sharded_state_cache,
+            block_end_info,
         ) = state_checkpoint_output.into_inner();
 
         let (statuses_for_input_txns, to_commit, to_discard, to_retry) = txns.into_inner();
@@ -153,6 +158,7 @@ impl ApplyChunkOutput {
                 state_updates_until_last_checkpoint: state_updates_before_last_checkpoint,
                 sharded_state_cache,
                 transaction_accumulator,
+                block_end_info,
             },
             to_discard.into_txns(),
             to_retry.into_txns(),
@@ -193,6 +199,7 @@ impl ApplyChunkOutput {
         mut transactions: Vec<Transaction>,
         transaction_outputs: Vec<TransactionOutput>,
         append_state_checkpoint_to_block: Option<HashValue>,
+        block_end_info: Option<BlockEndInfo>,
     ) -> Result<(
         bool,
         Vec<TransactionStatus>,
@@ -244,7 +251,13 @@ impl ApplyChunkOutput {
 
         // Append the StateCheckpoint transaction to the end of to_keep
         if let Some(block_id) = state_checkpoint_to_add {
-            let state_checkpoint_txn = Transaction::StateCheckpoint(block_id);
+            let state_checkpoint_txn =
+                block_end_info.map_or(Transaction::StateCheckpoint(block_id), |block_end_info| {
+                    Transaction::BlockEpilogue(BlockEpiloguePayload::V0 {
+                        block_id,
+                        block_end_info,
+                    })
+                });
             let state_checkpoint_txn_output: ParsedTransactionOutput =
                 Into::into(TransactionOutput::new(
                     WriteSet::default(),
diff --git a/execution/executor/src/components/chunk_output.rs b/execution/executor/src/components/chunk_output.rs
index 22eb65cc01688..e31b71197ae46 100644
--- a/execution/executor/src/components/chunk_output.rs
+++ b/execution/executor/src/components/chunk_output.rs
@@ -28,6 +28,7 @@ use aptos_types::{
     epoch_state::EpochState,
     transaction::{
         authenticator::AccountAuthenticator,
+        block_epilogue::BlockEndInfo,
         signature_verified_transaction::{SignatureVerifiedTransaction, TransactionProvider},
         BlockOutput, ExecutionStatus, Transaction, TransactionOutput, TransactionOutputProvider,
         TransactionStatus,
@@ -47,6 +48,8 @@ pub struct ChunkOutput {
     /// execution result is processed; as well as all the accounts touched during execution, together
     /// with their proofs.
     pub state_cache: StateCache,
+    /// Optional StateCheckpoint payload
+    pub block_end_info: Option<BlockEndInfo>,
 }
 
 impl ChunkOutput {
@@ -72,12 +75,12 @@ impl ChunkOutput {
     ) -> Result<Self> {
         let block_output = Self::execute_block::<V>(&transactions, &state_view, onchain_config)?;
 
-        let transaction_outputs = block_output.into_inner();
-        // TODO add block_limit_info to ChunkOutput, to add it to StateCheckpoint
+        let (transaction_outputs, block_end_info) = block_output.into_inner();
         Ok(Self {
             transactions: transactions.into_iter().map(|t| t.into_inner()).collect(),
             transaction_outputs,
             state_cache: state_view.into_state_cache(),
+            block_end_info,
         })
     }
 
@@ -105,6 +108,7 @@ impl ChunkOutput {
                 .collect(),
             transaction_outputs,
             state_cache: state_view.into_state_cache(),
+            block_end_info: None,
         })
     }
 
@@ -130,6 +134,7 @@ impl ChunkOutput {
             transactions,
             transaction_outputs,
             state_cache: state_view.into_state_cache(),
+            block_end_info: None,
         })
     }
 
@@ -307,6 +312,10 @@ pub fn update_counters_for_processed_chunk<T, O>(
                     // Specialize duplicate txns for alerts
                     if *discard_status_code == StatusCode::SEQUENCE_NUMBER_TOO_OLD {
                         "discard_sequence_number_too_old"
+                    } else if *discard_status_code == StatusCode::SEQUENCE_NUMBER_TOO_NEW {
+                        "discard_sequence_number_too_new"
+                    } else if *discard_status_code == StatusCode::TRANSACTION_EXPIRED {
+                        "discard_transaction_expired"
                     } else {
                         "discard"
                     },
@@ -327,6 +336,7 @@ pub fn update_counters_for_processed_chunk<T, O>(
             Some(Transaction::BlockMetadata(_)) => "block_metadata",
             Some(Transaction::BlockMetadataExt(_)) => "block_metadata_ext",
             Some(Transaction::StateCheckpoint(_)) => "state_checkpoint",
+            Some(Transaction::BlockEpilogue(_)) => "block_epilogue",
             Some(Transaction::ValidatorTransaction(_)) => "validator_transaction",
             None => "unknown",
         };
diff --git a/execution/executor/src/fuzzing.rs b/execution/executor/src/fuzzing.rs
index 2d499e79201eb..a405cfac73b55 100644
--- a/execution/executor/src/fuzzing.rs
+++ b/execution/executor/src/fuzzing.rs
@@ -93,7 +93,7 @@ impl VMExecutor for FakeVM {
         _state_view: &impl StateView,
         _onchain_config: BlockExecutorConfigFromOnchain,
     ) -> Result<BlockOutput<TransactionOutput>, VMStatus> {
-        Ok(BlockOutput::new(vec![]))
+        Ok(BlockOutput::new(vec![], None))
     }
 }
 
@@ -101,7 +101,7 @@ impl VMExecutor for FakeVM {
 pub struct FakeDb;
 
 impl DbReader for FakeDb {
-    fn get_latest_version(&self) -> aptos_storage_interface::Result<Version> {
+    fn get_latest_ledger_info_version(&self) -> aptos_storage_interface::Result<Version> {
         Ok(self.get_latest_ledger_info()?.ledger_info().version())
     }
 
diff --git a/execution/executor/src/mock_vm/mod.rs b/execution/executor/src/mock_vm/mod.rs
index 9c0401887f6e6..bba3c7891da84 100644
--- a/execution/executor/src/mock_vm/mod.rs
+++ b/execution/executor/src/mock_vm/mod.rs
@@ -186,7 +186,7 @@ impl VMExecutor for MockVM {
             }
         }
 
-        Ok(BlockOutput::new(outputs))
+        Ok(BlockOutput::new(outputs, None))
     }
 
     fn execute_block_sharded<S: StateView + Sync + Send + 'static, E: ExecutorClient<S>>(
diff --git a/execution/executor/src/tests/chunk_executor_tests.rs b/execution/executor/src/tests/chunk_executor_tests.rs
index 003d2f14948b9..38e1efbe74198 100644
--- a/execution/executor/src/tests/chunk_executor_tests.rs
+++ b/execution/executor/src/tests/chunk_executor_tests.rs
@@ -106,7 +106,7 @@ fn test_executor_execute_or_apply_and_commit_chunk() {
         } = TestExecutor::new();
         execute_and_commit_chunks(chunks, ledger_info.clone(), &db, &executor);
 
-        let ledger_version = db.reader.get_latest_version().unwrap();
+        let ledger_version = db.reader.get_synced_version().unwrap();
         let output1 = db
             .reader
             .get_transaction_outputs(first_batch_start, first_batch_size, ledger_version)
diff --git a/execution/executor/src/tests/mod.rs b/execution/executor/src/tests/mod.rs
index 9a9b0bf0d4fc9..e780678e0aaea 100644
--- a/execution/executor/src/tests/mod.rs
+++ b/execution/executor/src/tests/mod.rs
@@ -493,6 +493,7 @@ fn apply_transaction_by_writeset(
         state_updates_until_last_checkpoint: state_updates_before_last_checkpoint,
         sharded_state_cache,
         transaction_accumulator: _,
+        block_end_info: _,
     } = ledger_update_output;
 
     db.writer
@@ -710,6 +711,7 @@ fn run_transactions_naive(
             state_updates_until_last_checkpoint: state_updates_before_last_checkpoint,
             sharded_state_cache,
             transaction_accumulator: _,
+            block_end_info: _,
         } = ledger_update_output;
         db.writer
             .save_transactions(
@@ -781,7 +783,7 @@ proptest! {
 
             // get txn_infos from db
             let db = executor.db.reader.clone();
-            prop_assert_eq!(db.get_latest_version().unwrap(), ledger_version);
+            prop_assert_eq!(db.get_synced_version().unwrap(), ledger_version);
             let txn_list = db.get_transactions(1 /* start version */, ledger_version, ledger_version /* ledger version */, false /* fetch events */).unwrap();
             prop_assert_eq!(&block.inner_txns(), &txn_list.transactions[..num_input_txns as usize]);
             let txn_infos = txn_list.proof.transaction_infos;
diff --git a/execution/executor/tests/internal_indexer_test.rs b/execution/executor/tests/internal_indexer_test.rs
new file mode 100644
index 0000000000000..7e85cc90c9752
--- /dev/null
+++ b/execution/executor/tests/internal_indexer_test.rs
@@ -0,0 +1,197 @@
+// Copyright (c) Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use aptos_cached_packages::aptos_stdlib;
+use aptos_db::AptosDB;
+use aptos_db_indexer::db_indexer::DBIndexer;
+use aptos_executor_test_helpers::{
+    gen_block_id, gen_ledger_info_with_sigs, integration_test_impl::create_db_and_executor,
+};
+use aptos_executor_types::BlockExecutorTrait;
+use aptos_indexer_grpc_table_info::internal_indexer_db_service::InternalIndexerDBService;
+use aptos_sdk::{
+    transaction_builder::TransactionFactory,
+    types::{AccountKey, LocalAccount},
+};
+use aptos_storage_interface::DbReader;
+use aptos_temppath::TempPath;
+use aptos_types::{
+    account_address::AccountAddress,
+    account_config::aptos_test_root_address,
+    block_metadata::BlockMetadata,
+    chain_id::ChainId,
+    state_store::state_key::prefix::StateKeyPrefix,
+    test_helpers::transaction_test_helpers::TEST_BLOCK_EXECUTOR_ONCHAIN_CONFIG,
+    transaction::{
+        signature_verified_transaction::into_signature_verified_block,
+        Transaction::{self, UserTransaction},
+        WriteSetPayload,
+    },
+};
+use rand::SeedableRng;
+use std::sync::Arc;
+
+const B: u64 = 1_000_000_000;
+
+#[cfg(test)]
+pub fn create_test_db() -> (Arc<AptosDB>, LocalAccount) {
+    // create test db
+    let path = aptos_temppath::TempPath::new();
+    let (genesis, validators) = aptos_vm_genesis::test_genesis_change_set_and_validators(Some(1));
+    let genesis_txn = Transaction::GenesisTransaction(WriteSetPayload::Direct(genesis));
+    let core_resources_account: LocalAccount = LocalAccount::new(
+        aptos_test_root_address(),
+        AccountKey::from_private_key(aptos_vm_genesis::GENESIS_KEYPAIR.0.clone()),
+        0,
+    );
+    let (aptos_db, _db, executor, _waypoint) =
+        create_db_and_executor(path.path(), &genesis_txn, true);
+    let parent_block_id = executor.committed_block_id();
+
+    // This generates accounts that do not overlap with genesis
+    let seed = [3u8; 32];
+    let mut rng = ::rand::rngs::StdRng::from_seed(seed);
+    let signer = aptos_types::validator_signer::ValidatorSigner::new(
+        validators[0].data.owner_address,
+        validators[0].consensus_key.clone(),
+    );
+    let account1 = LocalAccount::generate(&mut rng);
+    let account2 = LocalAccount::generate(&mut rng);
+    let account3 = LocalAccount::generate(&mut rng);
+
+    let txn_factory = TransactionFactory::new(ChainId::test());
+
+    let block1_id = gen_block_id(1);
+    let block1_meta = Transaction::BlockMetadata(BlockMetadata::new(
+        block1_id,
+        1,
+        0,
+        signer.author(),
+        vec![0],
+        vec![],
+        1,
+    ));
+    let tx1 = core_resources_account
+        .sign_with_transaction_builder(txn_factory.create_user_account(account1.public_key()));
+    let tx2 = core_resources_account
+        .sign_with_transaction_builder(txn_factory.create_user_account(account2.public_key()));
+    let tx3 = core_resources_account
+        .sign_with_transaction_builder(txn_factory.create_user_account(account3.public_key()));
+    // Create account1 with 2T coins.
+    let txn1 = core_resources_account
+        .sign_with_transaction_builder(txn_factory.mint(account1.address(), 2_000 * B));
+    // Create account2 with 1.2T coins.
+    let txn2 = core_resources_account
+        .sign_with_transaction_builder(txn_factory.mint(account2.address(), 1_200 * B));
+    // Create account3 with 1T coins.
+    let txn3 = core_resources_account
+        .sign_with_transaction_builder(txn_factory.mint(account3.address(), 1_000 * B));
+
+    // Transfer 20B coins from account1 to account2.
+    // balance: <1.98T, 1.22T, 1T
+    let txn4 =
+        account1.sign_with_transaction_builder(txn_factory.transfer(account2.address(), 20 * B));
+
+    // Transfer 10B coins from account2 to account3.
+    // balance: <1.98T, <1.21T, 1.01T
+    let txn5 =
+        account2.sign_with_transaction_builder(txn_factory.transfer(account3.address(), 10 * B));
+
+    // Transfer 70B coins from account1 to account3.
+    // balance: <1.91T, <1.21T, 1.08T
+    let txn6 =
+        account1.sign_with_transaction_builder(txn_factory.transfer(account3.address(), 70 * B));
+
+    let reconfig1 = core_resources_account.sign_with_transaction_builder(
+        txn_factory.payload(aptos_stdlib::aptos_governance_force_end_epoch_test_only()),
+    );
+
+    let block1: Vec<_> = into_signature_verified_block(vec![
+        block1_meta,
+        UserTransaction(tx1),
+        UserTransaction(tx2),
+        UserTransaction(tx3),
+        UserTransaction(txn1),
+        UserTransaction(txn2),
+        UserTransaction(txn3),
+        UserTransaction(txn4),
+        UserTransaction(txn5),
+        UserTransaction(txn6),
+        UserTransaction(reconfig1),
+    ]);
+    let output1 = executor
+        .execute_block(
+            (block1_id, block1.clone()).into(),
+            parent_block_id,
+            TEST_BLOCK_EXECUTOR_ONCHAIN_CONFIG,
+        )
+        .unwrap();
+    let li1 = gen_ledger_info_with_sigs(1, &output1, block1_id, &[signer.clone()]);
+    executor.commit_blocks(vec![block1_id], li1).unwrap();
+    (aptos_db, core_resources_account)
+}
+
+#[test]
+fn test_db_indexer_data() {
+    use std::{thread, time::Duration};
+    // create test db
+    let (aptos_db, core_account) = create_test_db();
+    let total_version = aptos_db.get_synced_version().unwrap();
+    assert_eq!(total_version, 11);
+    let temp_path = TempPath::new();
+    let mut node_config = aptos_config::config::NodeConfig::default();
+    node_config.storage.dir = temp_path.path().to_path_buf();
+    node_config.indexer_db_config.enable_event = true;
+    node_config.indexer_db_config.enable_transaction = true;
+    node_config.indexer_db_config.enable_statekeys = true;
+
+    let internal_indexer_db = InternalIndexerDBService::get_indexer_db(&node_config).unwrap();
+
+    let db_indexer = DBIndexer::new(internal_indexer_db.clone(), aptos_db.clone());
+    // assert the data matches the expected data
+    let version = internal_indexer_db.get_persisted_version().unwrap();
+    assert_eq!(version, None);
+    let mut start_version = version.map_or(0, |v| v + 1);
+    while start_version < total_version {
+        start_version = db_indexer.process_a_batch(start_version).unwrap();
+    }
+    // wait for the commit to finish
+    thread::sleep(Duration::from_millis(100));
+    // indexer has process all the transactions
+    assert_eq!(
+        internal_indexer_db.get_persisted_version().unwrap(),
+        Some(total_version)
+    );
+
+    let txn_iter = internal_indexer_db
+        .get_account_transaction_version_iter(core_account.address(), 0, 1000, total_version)
+        .unwrap();
+    let res: Vec<_> = txn_iter.collect();
+
+    // core account submitted 7 transactions including last reconfig txn, and the first transaction is version 2
+    assert!(res.len() == 7);
+    assert!(res[0].as_ref().unwrap().1 == 2);
+
+    let x = internal_indexer_db.get_event_by_key_iter().unwrap();
+    let res: Vec<_> = x.collect();
+    assert_eq!(res.len(), 27);
+
+    let core_kv_iter = db_indexer
+        .get_prefixed_state_value_iterator(
+            &StateKeyPrefix::from(core_account.address()),
+            None,
+            total_version,
+        )
+        .unwrap();
+    let core_kv_res: Vec<_> = core_kv_iter.collect();
+    assert_eq!(core_kv_res.len(), 5);
+    let address_one_kv_iter = db_indexer
+        .get_prefixed_state_value_iterator(
+            &StateKeyPrefix::from(AccountAddress::from_hex_literal("0x1").unwrap()),
+            None,
+            total_version,
+        )
+        .unwrap();
+    let address_one_kv_res: Vec<_> = address_one_kv_iter.collect();
+    assert_eq!(address_one_kv_res.len(), 152);
+}
diff --git a/execution/executor/tests/storage_integration_test.rs b/execution/executor/tests/storage_integration_test.rs
index 5e63e7da8b3df..7a037cb4f83d8 100644
--- a/execution/executor/tests/storage_integration_test.rs
+++ b/execution/executor/tests/storage_integration_test.rs
@@ -46,7 +46,7 @@ fn test_genesis() {
         .reader
         .get_state_value_with_proof_by_version(&account_resource_path, 0)
         .unwrap();
-    let latest_version = db.reader.get_latest_version().unwrap();
+    let latest_version = db.reader.get_latest_ledger_info_version().unwrap();
     assert_eq!(latest_version, 0);
     let txn_info = db
         .reader
diff --git a/experimental/execution/ptx-executor/src/common.rs b/experimental/execution/ptx-executor/src/common.rs
index fd742dd6fa231..b1c9b21adc2bb 100644
--- a/experimental/execution/ptx-executor/src/common.rs
+++ b/experimental/execution/ptx-executor/src/common.rs
@@ -21,6 +21,7 @@ pub(crate) use hashbrown::{hash_map::Entry, HashMap, HashSet};
 pub(crate) trait VersionedKeyHelper {
     fn key(&self) -> &StateKey;
 
+    #[allow(unused)]
     fn txn_idx(&self) -> TxnIdx;
 
     fn txn_idx_shifted(&self) -> TxnIdx;
diff --git a/experimental/execution/ptx-executor/src/lib.rs b/experimental/execution/ptx-executor/src/lib.rs
index bb4704db39bd9..e41474632c007 100644
--- a/experimental/execution/ptx-executor/src/lib.rs
+++ b/experimental/execution/ptx-executor/src/lib.rs
@@ -101,7 +101,7 @@ impl VMExecutor for PtxBlockExecutor {
             ret_clone.lock().replace(txn_outputs);
         });
         let ret = ret.lock().take().unwrap();
-        Ok(BlockOutput::new(ret))
+        Ok(BlockOutput::new(ret, None))
     }
 
     fn execute_block_sharded<S: StateView + Sync + Send + 'static, E: ExecutorClient<S>>(
diff --git a/experimental/execution/ptx-executor/src/runner.rs b/experimental/execution/ptx-executor/src/runner.rs
index b214906c459c2..d3cbf50b695fc 100644
--- a/experimental/execution/ptx-executor/src/runner.rs
+++ b/experimental/execution/ptx-executor/src/runner.rs
@@ -19,7 +19,7 @@ use aptos_types::{
     transaction::signature_verified_transaction::SignatureVerifiedTransaction,
     write_set::TransactionWrite,
 };
-use aptos_vm::{data_cache::AsMoveResolver, AptosVM};
+use aptos_vm::AptosVM;
 use aptos_vm_logging::log_schema::AdapterLogSchema;
 use rayon::Scope;
 use std::sync::mpsc::{channel, Receiver, Sender};
@@ -235,10 +235,7 @@ impl<'scope, 'view: 'scope, BaseView: StateView + Sync> Worker<'view, BaseView>
         // TODO(ptx): maybe warm up vm like done in AptosExecutorTask
         let vm = {
             let _timer = PER_WORKER_TIMER.timer_with(&[&idx, "vm_init"]);
-            AptosVM::new(
-                &self.base_view.as_move_resolver(),
-                /*override_is_delayed_field_optimization_capable=*/ None,
-            )
+            AptosVM::new(&self.base_view)
         };
 
         loop {
@@ -277,7 +274,7 @@ impl<'scope, 'view: 'scope, BaseView: StateView + Sync> Worker<'view, BaseView>
 
                     // inform output state values to the manager
                     // TODO use try_into_storage_change_set() instead, and ChangeSet it returns, instead of VMOutput.
-                    for (key, op) in vm_output.change_set().concrete_write_set_iter() {
+                    for (key, op) in vm_output.concrete_write_set_iter() {
                         self.scheduler.try_inform_state_value(
                             (key.clone(), txn_idx),
                             op.expect("PTX executor currently doesn't support non-concrete writes")
diff --git a/experimental/storage/hexy/Cargo.toml b/experimental/storage/hexy/Cargo.toml
new file mode 100644
index 0000000000000..e25478e6f90d7
--- /dev/null
+++ b/experimental/storage/hexy/Cargo.toml
@@ -0,0 +1,32 @@
+[package]
+name = "aptos-experimental-hexy"
+description = "Aptos Hexy"
+version = "0.1.0"
+
+# Workspace inherited keys
+authors = { workspace = true }
+edition = { workspace = true }
+homepage = { workspace = true }
+license = { workspace = true }
+publish = { workspace = true }
+repository = { workspace = true }
+rust-version = { workspace = true }
+
+[dependencies]
+anyhow = { workspace = true }
+aptos-crypto = { workspace = true }
+aptos-experimental-layered-map = { workspace = true }
+aptos-metrics-core = { workspace = true }
+itertools = { workspace = true }
+once_cell = { workspace = true }
+
+[dev-dependencies]
+aptos-crypto = { workspace = true, features = ["fuzzing"] }
+criterion = { workspace = true }
+jemallocator = { workspace = true }
+proptest = { workspace = true }
+rand = { workspace = true }
+
+[[bench]]
+name = "sort_dedup"
+harness = false
diff --git a/experimental/storage/hexy/benches/sort_dedup.rs b/experimental/storage/hexy/benches/sort_dedup.rs
new file mode 100644
index 0000000000000..d1ea78fc71386
--- /dev/null
+++ b/experimental/storage/hexy/benches/sort_dedup.rs
@@ -0,0 +1,47 @@
+// Copyright (c) Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use aptos_experimental_hexy::utils::sort_dedup;
+use criterion::{criterion_group, criterion_main, BatchSize, Criterion};
+use itertools::Itertools;
+use std::collections::BTreeMap;
+
+#[cfg(unix)]
+#[global_allocator]
+static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;
+
+fn bench(c: &mut Criterion) {
+    let mut group = c.benchmark_group("sort_dedup");
+
+    const SET_SIZE: usize = 100000;
+
+    let data = std::iter::repeat_with(rand::random::<(u32, u64)>)
+        .take(SET_SIZE)
+        .collect_vec();
+    group.throughput(criterion::Throughput::Elements(SET_SIZE as u64));
+
+    group.bench_function("my_sort_dedup", |b| {
+        b.iter_batched(|| data.clone(), sort_dedup, BatchSize::SmallInput);
+    });
+
+    group.bench_function("btree_sort_dedup", |b| {
+        b.iter_batched(
+            || data.clone(),
+            |data| {
+                data.into_iter()
+                    .collect::<BTreeMap<_, _>>()
+                    .into_iter()
+                    .collect_vec()
+            },
+            BatchSize::SmallInput,
+        );
+    });
+}
+
+criterion_group!(
+    name = benches;
+    config = Criterion::default();
+    targets = bench
+);
+
+criterion_main!(benches);
diff --git a/experimental/storage/hexy/src/hashing.rs b/experimental/storage/hexy/src/hashing.rs
new file mode 100644
index 0000000000000..7aca792770b11
--- /dev/null
+++ b/experimental/storage/hexy/src/hashing.rs
@@ -0,0 +1,31 @@
+// Copyright (c) Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::ARITY;
+use anyhow::{ensure, Result};
+use aptos_crypto::{
+    hash::{CryptoHasher, HexyHasher},
+    HashValue,
+};
+
+#[derive(Default)]
+pub struct HexyHashBuilder {
+    hasher: HexyHasher,
+    seen_children: usize,
+}
+
+impl HexyHashBuilder {
+    pub fn add_child(&mut self, hash: &HashValue) -> Result<()> {
+        ensure!(self.seen_children < ARITY, "Too many children");
+
+        self.hasher.update(hash.as_ref());
+        self.seen_children += 1;
+
+        Ok(())
+    }
+
+    pub fn finish(self) -> Result<HashValue> {
+        ensure!(self.seen_children == ARITY, "Not enough children");
+        Ok(self.hasher.finish())
+    }
+}
diff --git a/experimental/storage/hexy/src/in_mem/base.rs b/experimental/storage/hexy/src/in_mem/base.rs
new file mode 100644
index 0000000000000..3b35b7fe4bf8a
--- /dev/null
+++ b/experimental/storage/hexy/src/in_mem/base.rs
@@ -0,0 +1,133 @@
+// Copyright (c) Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{NodePosition, ARITY};
+use anyhow::{ensure, Result};
+use aptos_crypto::{hash::HOT_STATE_PLACE_HOLDER_HASH, HashValue};
+
+struct BigVector<T> {
+    chunks: Vec<Vec<T>>,
+}
+
+impl<T> BigVector<T>
+where
+    T: Clone,
+{
+    const CHUNK_SIZE: usize = 1024 * 1024;
+
+    pub fn allocate(template: &T, size: usize) -> Self {
+        let mut chunks = vec![];
+        let mut remainder = size;
+        while remainder > 0 {
+            let chunk_size = Self::CHUNK_SIZE.min(remainder);
+            chunks.push(vec![template.clone(); chunk_size]);
+            remainder -= chunk_size;
+        }
+        Self { chunks }
+    }
+
+    pub fn len(&self) -> usize {
+        if let Some(last_chunk) = self.chunks.last() {
+            (self.chunks.len() - 1) * Self::CHUNK_SIZE + last_chunk.len()
+        } else {
+            0
+        }
+    }
+
+    pub fn expect(&self, index: usize) -> &T {
+        let chunk = index / Self::CHUNK_SIZE;
+        let offset = index % Self::CHUNK_SIZE;
+        &self.chunks[chunk][offset]
+    }
+}
+
+pub struct HexyBase {
+    levels_by_height: Vec<BigVector<HashValue>>,
+}
+
+impl HexyBase {
+    pub fn allocate(num_leaves: u32) -> Self {
+        assert!(num_leaves > 0);
+
+        let mut levels_by_height = vec![];
+        let mut level_size = num_leaves as usize;
+        loop {
+            let level = BigVector::allocate(&*HOT_STATE_PLACE_HOLDER_HASH, level_size);
+            levels_by_height.push(level);
+
+            if level_size == 1 {
+                break;
+            } else {
+                level_size = level_size / ARITY + (level_size % ARITY != 0) as usize;
+            }
+        }
+
+        Self { levels_by_height }
+    }
+
+    pub fn num_leaves(&self) -> usize {
+        self.levels_by_height[0].len()
+    }
+
+    pub fn height(&self) -> usize {
+        self.levels_by_height.len()
+    }
+
+    pub fn height_u8(&self) -> u8 {
+        self.height() as u8
+    }
+
+    pub fn get_hash(&self, position: NodePosition) -> Result<HashValue> {
+        ensure!(
+            position.level_height < self.height_u8(),
+            "level_height out of bound. num_of_leaves: {:?}, requested position: {:?}",
+            self.num_leaves(),
+            position,
+        );
+
+        let level = self.expect_level(position);
+        if position.index_in_level < level.len() as u32 {
+            Ok(*level.expect(position.index_in_level as usize))
+        } else {
+            ensure!(
+                position.level_height < self.height_u8(),
+                "index_in_level out of bound. num_of_leaves: {:?}, requested position: {:?}",
+                self.num_leaves(),
+                position,
+            );
+
+            let parent_position = position.parent();
+            let parent_level = self.expect_level(parent_position);
+
+            ensure!(
+                parent_position.index_in_level < parent_level.len() as u32,
+                "index_in_level out of bound. num_of_leaves: {:?}, requested position: {:?}",
+                self.num_leaves(),
+                position,
+            );
+
+            Ok(*HOT_STATE_PLACE_HOLDER_HASH)
+        }
+    }
+
+    fn expect_level(&self, position: NodePosition) -> &BigVector<HashValue> {
+        &self.levels_by_height[position.level_height as usize]
+    }
+
+    pub fn expect_hash(&self, position: NodePosition) -> HashValue {
+        self.get_hash(position).expect("Failed to get hash.")
+    }
+
+    pub fn root_position(&self) -> NodePosition {
+        NodePosition {
+            level_height: self.height_u8() - 1,
+            index_in_level: 0,
+        }
+    }
+
+    pub fn root_hash(&self) -> HashValue {
+        self.levels_by_height
+            .last()
+            .map_or(*HOT_STATE_PLACE_HOLDER_HASH, |level| *level.expect(0))
+    }
+}
diff --git a/experimental/storage/hexy/src/in_mem/mod.rs b/experimental/storage/hexy/src/in_mem/mod.rs
new file mode 100644
index 0000000000000..d58e5c8de6e41
--- /dev/null
+++ b/experimental/storage/hexy/src/in_mem/mod.rs
@@ -0,0 +1,6 @@
+// Copyright (c) Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod base;
+pub mod overlay;
+pub mod view;
diff --git a/experimental/storage/hexy/src/in_mem/overlay.rs b/experimental/storage/hexy/src/in_mem/overlay.rs
new file mode 100644
index 0000000000000..f4c83ec43fafc
--- /dev/null
+++ b/experimental/storage/hexy/src/in_mem/overlay.rs
@@ -0,0 +1,37 @@
+// Copyright (c) Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    in_mem::{base::HexyBase, view::HexyView},
+    NodePosition,
+};
+use aptos_crypto::HashValue;
+use aptos_experimental_layered_map::MapLayer;
+use std::sync::Arc;
+
+#[derive(Clone)]
+pub struct HexyOverlay {
+    pub(crate) overlay: MapLayer<NodePosition, HashValue>,
+    /// Can be derived if a View is constructed, but storing it here might make it easier.
+    pub(crate) root_hash: HashValue,
+}
+
+impl HexyOverlay {
+    pub fn new_empty(base: &Arc<HexyBase>) -> Self {
+        let overlay = MapLayer::new_family("hexy");
+        let root_hash = base.root_hash();
+
+        Self { overlay, root_hash }
+    }
+
+    pub fn view(&self, base: &Arc<HexyBase>, base_overlay: &HexyOverlay) -> HexyView {
+        HexyView::new(
+            base.clone(),
+            self.overlay.view_layers_since(&base_overlay.overlay),
+        )
+    }
+
+    pub fn root_hash(&self) -> HashValue {
+        self.root_hash
+    }
+}
diff --git a/experimental/storage/hexy/src/in_mem/view.rs b/experimental/storage/hexy/src/in_mem/view.rs
new file mode 100644
index 0000000000000..ed2e8c5f0a3ca
--- /dev/null
+++ b/experimental/storage/hexy/src/in_mem/view.rs
@@ -0,0 +1,130 @@
+// Copyright (c) Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    hashing::HexyHashBuilder,
+    in_mem::{base::HexyBase, overlay::HexyOverlay},
+    metrics::TIMER,
+    utils::sort_dedup,
+    LeafIdx, NodePosition, ARITY,
+};
+use anyhow::Result;
+use aptos_crypto::{hash::HOT_STATE_PLACE_HOLDER_HASH, HashValue};
+use aptos_experimental_layered_map::LayeredMap;
+use aptos_metrics_core::TimerHelper;
+use itertools::Itertools;
+use std::sync::Arc;
+
+pub struct HexyView {
+    base: Arc<HexyBase>,
+    overlay: LayeredMap<NodePosition, HashValue>,
+}
+
+impl HexyView {
+    pub fn new(base: Arc<HexyBase>, overlay: LayeredMap<NodePosition, HashValue>) -> Self {
+        Self { base, overlay }
+    }
+
+    pub fn new_overlay(&self, leaves: Vec<(LeafIdx, HashValue)>) -> Result<HexyOverlay> {
+        // Sort and dedup leaves.
+        let sorted_leaves = sort_dedup(leaves);
+
+        // Reserve space for all hashes to be updated.
+        let estimated_total_hashes =
+            Self::estimate_total_hashes(sorted_leaves.len(), self.base.height());
+        let mut updates = Vec::with_capacity(estimated_total_hashes);
+        let mut this_level_updates = Vec::with_capacity(sorted_leaves.len());
+
+        // Fill in leaf level updates.
+        updates.extend(
+            sorted_leaves
+                .into_iter()
+                .map(|(leaf_idx, hash)| (NodePosition::leaf(leaf_idx), hash)),
+        );
+
+        // Iteratively calculate updates by level.
+        let mut prev_level_begin = 0;
+        for height in 1..self.base.height() {
+            for (parent_idx_in_level, updated_children) in &updates[prev_level_begin..]
+                .iter()
+                .chunk_by(|upd| upd.0.parent_index_in_level())
+            {
+                let mut hasher = HexyHashBuilder::default();
+
+                let parent_position =
+                    NodePosition::height_and_index(height, parent_idx_in_level as usize);
+                let mut next_child = 0;
+                for (updated_child_position, updated_child_hash) in updated_children.into_iter() {
+                    let updated_child = updated_child_position.index_in_siblings();
+                    for child in next_child..updated_child {
+                        hasher.add_child(&self.expect_hash(parent_position.child(child)))?;
+                    }
+                    // n.b. There's the rule of "16 placeholders hash to the placeholder", and
+                    // it seems a waste to detect that.
+                    assert_ne!(updated_child_hash, &*HOT_STATE_PLACE_HOLDER_HASH);
+                    hasher.add_child(updated_child_hash)?;
+                    next_child = updated_child + 1;
+                }
+                for child in next_child..ARITY {
+                    hasher.add_child(&self.expect_hash(parent_position.child(child)))?;
+                }
+                this_level_updates.push((parent_position, hasher.finish()?))
+            } // end for children per parent
+
+            prev_level_begin = updates.len();
+            updates.append(&mut this_level_updates); // note: this drains `this_level_updates`
+        } // end for each level above leaf level
+
+        let root_hash = updates.last().map_or_else(
+            || {
+                self.overlay
+                    .get(&self.base.root_position())
+                    .unwrap_or(self.base.root_hash())
+            },
+            |(pos, hash)| {
+                assert_eq!(pos, &self.base.root_position());
+                *hash
+            },
+        );
+
+        let overlay = self.overlay.new_layer(&updates);
+        Self::maybe_log_hashing_under_estimation(estimated_total_hashes, updates);
+
+        Ok(HexyOverlay { overlay, root_hash })
+    }
+
+    fn maybe_log_hashing_under_estimation(
+        estimated_total_hashes: usize,
+        updates: Vec<(NodePosition, HashValue)>,
+    ) {
+        if updates.len() > estimated_total_hashes {
+            TIMER.observe_with(
+                &["num_hashing_under_est"],
+                (updates.len() - estimated_total_hashes) as f64,
+            )
+        }
+    }
+
+    /// To avoid re-allocation (hence copying of `HashValue`s), we estimate the total number of
+    /// hashes that will be updated given the size of the update batch and allocate at once.
+    fn estimate_total_hashes(num_leaves: usize, height: usize) -> usize {
+        if num_leaves == 0 {
+            return 0;
+        }
+        let fully_updated_levels = (num_leaves.ilog(ARITY) + 1) as usize;
+        let remaining_levels = height.max(fully_updated_levels) - fully_updated_levels;
+
+        num_leaves * (remaining_levels + 1)
+    }
+
+    pub fn num_leaves(&self) -> usize {
+        self.base.num_leaves()
+    }
+
+    fn expect_hash(&self, position: NodePosition) -> HashValue {
+        match self.overlay.get(&position) {
+            Some(hash) => hash,
+            None => self.base.expect_hash(position),
+        }
+    }
+}
diff --git a/experimental/storage/hexy/src/lib.rs b/experimental/storage/hexy/src/lib.rs
new file mode 100644
index 0000000000000..07bf6bd497f05
--- /dev/null
+++ b/experimental/storage/hexy/src/lib.rs
@@ -0,0 +1,63 @@
+// Copyright (c) Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod hashing;
+pub mod in_mem;
+mod metrics;
+#[cfg(test)]
+pub(crate) mod tests;
+pub mod utils;
+
+pub const ARITY: usize = 16;
+
+pub type LeafIdx = u32;
+
+#[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
+pub struct NodePosition {
+    level_height: u8,
+    index_in_level: u32,
+}
+
+impl NodePosition {
+    const LEAF_LEVEL_HEIGHT: u8 = 0;
+
+    pub fn leaf(index: LeafIdx) -> Self {
+        Self {
+            index_in_level: index,
+            level_height: Self::LEAF_LEVEL_HEIGHT,
+        }
+    }
+
+    pub fn height_and_index(level_height: usize, index_in_level: usize) -> Self {
+        Self {
+            index_in_level: index_in_level as u32,
+            level_height: level_height as u8,
+        }
+    }
+
+    pub fn parent_index_in_level(&self) -> u32 {
+        self.index_in_level / ARITY as u32
+    }
+
+    pub fn index_in_siblings(&self) -> usize {
+        self.index_in_level as usize % ARITY
+    }
+
+    pub fn index_in_level(&self) -> usize {
+        self.index_in_level as usize
+    }
+
+    pub fn parent(&self) -> Self {
+        Self {
+            index_in_level: self.parent_index_in_level(),
+            level_height: self.level_height + 1,
+        }
+    }
+
+    pub fn child(&self, idx_in_siblings: usize) -> Self {
+        Self {
+            index_in_level: self.index_in_level * ARITY as u32 + idx_in_siblings as u32,
+            level_height: self.level_height - 1,
+        }
+    }
+}
diff --git a/experimental/storage/hexy/src/metrics.rs b/experimental/storage/hexy/src/metrics.rs
new file mode 100644
index 0000000000000..abbb2cbf23f7d
--- /dev/null
+++ b/experimental/storage/hexy/src/metrics.rs
@@ -0,0 +1,17 @@
+// Copyright (c) Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+use aptos_metrics_core::{exponential_buckets, register_histogram_vec, HistogramVec};
+use once_cell::sync::Lazy;
+
+pub static TIMER: Lazy<HistogramVec> = Lazy::new(|| {
+    register_histogram_vec!(
+        "aptos_hexy_timer_seconds",
+        "Various timers for performance analysis.",
+        &["name"],
+        exponential_buckets(/*start=*/ 1e-6, /*factor=*/ 2.0, /*count=*/ 22).unwrap(),
+    )
+    .unwrap()
+});
diff --git a/experimental/storage/hexy/src/tests/mod.rs b/experimental/storage/hexy/src/tests/mod.rs
new file mode 100644
index 0000000000000..3950ab410ae79
--- /dev/null
+++ b/experimental/storage/hexy/src/tests/mod.rs
@@ -0,0 +1,96 @@
+// Copyright (c) Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    in_mem::{base::HexyBase, overlay::HexyOverlay},
+    utils::sort_dedup,
+    LeafIdx, ARITY,
+};
+use aptos_crypto::{
+    hash::{CryptoHasher, HexyHasher, HOT_STATE_PLACE_HOLDER_HASH},
+    HashValue,
+};
+use itertools::Itertools;
+use proptest::{collection::vec, prelude::*};
+use std::{collections::BTreeMap, sync::Arc};
+
+fn arb_test_case() -> impl Strategy<Value = (LeafIdx, Vec<Vec<(LeafIdx, HashValue)>>)> {
+    (1u32..1000).prop_flat_map(|num_leaves| {
+        (
+            Just(num_leaves),
+            vec(
+                vec((0..(num_leaves as LeafIdx), any::<HashValue>()), 0..100),
+                0..100,
+            ),
+        )
+    })
+}
+
+fn naive_root_hash(num_leaves: LeafIdx, updates: &[Vec<(LeafIdx, HashValue)>]) -> HashValue {
+    let mut hashes = vec![*HOT_STATE_PLACE_HOLDER_HASH; num_leaves as usize];
+    let all_updates = updates
+        .iter()
+        .flatten()
+        .cloned()
+        .collect::<BTreeMap<_, _>>();
+    all_updates
+        .into_iter()
+        .for_each(|(idx, hash)| hashes[idx as usize] = hash);
+
+    while hashes.len() > 1 {
+        hashes = hashes
+            .into_iter()
+            .chunks(ARITY)
+            .into_iter()
+            .map(|chunk| {
+                let mut children = chunk.into_iter().collect_vec();
+                children.resize_with(ARITY, || *HOT_STATE_PLACE_HOLDER_HASH);
+
+                if children
+                    .iter()
+                    .all(|hash| hash == &*HOT_STATE_PLACE_HOLDER_HASH)
+                {
+                    *HOT_STATE_PLACE_HOLDER_HASH
+                } else {
+                    let mut hasher = HexyHasher::default();
+                    for child in children {
+                        hasher.update(child.as_slice())
+                    }
+                    hasher.finish()
+                }
+            })
+            .collect_vec()
+    }
+
+    hashes
+        .first()
+        .cloned()
+        .unwrap_or(*HOT_STATE_PLACE_HOLDER_HASH)
+}
+
+proptest! {
+    #[test]
+    fn test_sort_dedup(data in vec(any::<(u16, u16)>(), 0..100)) {
+        let sort_debuped = sort_dedup(data.clone());
+        let expected = data.into_iter().collect::<BTreeMap<_, _>>().into_iter().collect_vec();
+
+        assert_eq!(sort_debuped, expected);
+    }
+
+    #[test]
+    fn test_update((num_leaves, updates) in arb_test_case()) {
+        let base = Arc::new(HexyBase::allocate(num_leaves));
+        let bottom_overlay = HexyOverlay::new_empty(&base);
+        let mut top_overlay = bottom_overlay.clone();
+
+        for batch in updates.iter() {
+            let view = top_overlay.view(&base, &bottom_overlay);
+            top_overlay = view.new_overlay(batch.clone()).unwrap();
+        }
+
+        prop_assert_eq!(
+            top_overlay.root_hash,
+            naive_root_hash(num_leaves, &updates)
+        )
+    }
+}
diff --git a/experimental/storage/hexy/src/utils.rs b/experimental/storage/hexy/src/utils.rs
new file mode 100644
index 0000000000000..df5f3ac97ebc1
--- /dev/null
+++ b/experimental/storage/hexy/src/utils.rs
@@ -0,0 +1,26 @@
+// Copyright (c) Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+/// Sorta vector of key-value pairs by the keep and then deduplicate items, keeping the last value
+/// for each key.
+pub fn sort_dedup<K: Ord, V>(mut data: Vec<(K, V)>) -> Vec<(K, V)> {
+    // Stable sort by key.
+    data.sort_by(|a, b| key(a).cmp(key(b)));
+
+    // Dedup keeping the last value.
+    let mut out_cur = 0;
+    for in_cur in 1..=data.len() {
+        if in_cur == data.len() || key(&data[in_cur]) != key(&data[in_cur - 1]) {
+            if in_cur != out_cur + 1 {
+                data.swap(in_cur - 1, out_cur);
+            }
+            out_cur += 1;
+        }
+    }
+    data.truncate(out_cur);
+    data
+}
+
+fn key<'k, 'kv: 'k, K: 'k, V>(kv: &'kv (K, V)) -> &'k K {
+    &kv.0
+}
diff --git a/experimental/storage/layered-map/Cargo.toml b/experimental/storage/layered-map/Cargo.toml
index 64592bc7902f2..2f0afde035190 100644
--- a/experimental/storage/layered-map/Cargo.toml
+++ b/experimental/storage/layered-map/Cargo.toml
@@ -13,12 +13,22 @@ repository = { workspace = true }
 rust-version = { workspace = true }
 
 [dependencies]
+ahash = { workspace = true }
 aptos-crypto = { workspace = true }
 aptos-drop-helper = { workspace = true }
 aptos-infallible = { workspace = true }
 aptos-metrics-core = { workspace = true }
 bitvec = "1.0.1"
+itertools = { workspace = true }
 once_cell = { workspace = true }
 
 [dev-dependencies]
+criterion = { workspace = true }
+itertools = { workspace = true }
+jemallocator = { workspace = true }
 proptest = { workspace = true }
+rand = { workspace = true }
+
+[[bench]]
+name = "sorting"
+harness = false
diff --git a/experimental/storage/layered-map/benches/sorting.rs b/experimental/storage/layered-map/benches/sorting.rs
new file mode 100644
index 0000000000000..651a1b5b9d165
--- /dev/null
+++ b/experimental/storage/layered-map/benches/sorting.rs
@@ -0,0 +1,205 @@
+// Copyright (c) Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use bitvec::{index::BitIdx, prelude::*};
+use criterion::{criterion_group, criterion_main, BatchSize, Criterion};
+use itertools::Itertools;
+
+#[cfg(unix)]
+#[global_allocator]
+static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;
+
+fn recursive_bin_search(sorted_data: &[u64], depth: u8) {
+    if sorted_data.len() <= 1 || depth >= 64 {
+        return;
+    }
+
+    let pivot = sorted_data.partition_point(|key| get_bit(*key, depth));
+    recursive_bin_search(&sorted_data[..pivot], depth + 1);
+    recursive_bin_search(&sorted_data[pivot..], depth + 1);
+}
+
+fn get_bit(value: u64, bit: u8) -> bool {
+    value.get_bit::<Msb0>(BitIdx::new(bit).unwrap())
+}
+
+fn partition(data: &mut [u64], depth: u8) -> usize {
+    if data.is_empty() {
+        return 0;
+    }
+
+    let mut zero_cur = 0;
+    let mut one_cur = data.len() - 1;
+
+    loop {
+        while zero_cur <= one_cur && !get_bit(data[zero_cur], depth) {
+            zero_cur += 1;
+        }
+        while one_cur > zero_cur && get_bit(data[one_cur], depth) {
+            one_cur -= 1;
+        }
+        if zero_cur >= one_cur {
+            return zero_cur;
+        }
+        data.swap(zero_cur, one_cur);
+    }
+}
+
+fn recursive_partition(data: &mut [u64], depth: u8) {
+    if data.len() <= 1 || depth >= 64 {
+        return;
+    }
+
+    let pivot = partition(data, depth);
+    recursive_partition(&mut data[..pivot], depth + 1);
+    recursive_partition(&mut data[pivot..], depth + 1);
+}
+
+fn partition_stable(data: &mut [u64], buffer: &mut [u64], depth: u8) -> usize {
+    if buffer.is_empty() {
+        return 0;
+    }
+
+    let mut zero_cur = 0;
+    let mut one_cur = 0;
+    for cur in 0..data.len() {
+        if !get_bit(data[cur], depth) {
+            // zero
+            data[zero_cur] = data[cur];
+            zero_cur += 1;
+        } else {
+            buffer[one_cur] = data[cur];
+            one_cur += 1;
+        }
+    }
+    data[zero_cur..].copy_from_slice(&buffer[..one_cur]);
+    zero_cur
+}
+
+fn recursive_partition_stable(data: &mut [u64], buffer: &mut [u64], depth: u8) {
+    if data.len() <= 1 || depth >= 64 {
+        return;
+    }
+
+    let pivot = partition_stable(data, buffer, depth);
+    recursive_partition_stable(&mut data[..pivot], &mut buffer[..pivot], depth + 1);
+    recursive_partition_stable(&mut data[pivot..], &mut buffer[pivot..], depth + 1);
+}
+
+fn compare_sorting(c: &mut Criterion) {
+    let mut group = c.benchmark_group("sorting");
+
+    const SET_SIZE: usize = 100000;
+
+    let data = std::iter::repeat_with(rand::random::<u64>)
+        .take(SET_SIZE)
+        .collect_vec();
+    group.throughput(criterion::Throughput::Elements(SET_SIZE as u64));
+
+    let mut data_sorted = data.clone();
+    data_sorted.sort();
+
+    group.bench_function("sort_then_bin_search", |b| {
+        b.iter_batched(
+            || data.clone(),
+            |mut data| {
+                data.sort();
+                recursive_bin_search(&data, 0);
+                data
+            },
+            BatchSize::SmallInput,
+        );
+    });
+
+    group.bench_function("recursive_partition", |b| {
+        b.iter_batched(
+            || data.clone(),
+            |mut data| {
+                recursive_partition(&mut data, 0);
+                if data != data_sorted {
+                    panic!()
+                }
+                data
+            },
+            BatchSize::SmallInput,
+        )
+    });
+
+    group.bench_function("recursive_partition_stable", |b| {
+        b.iter_batched(
+            || data.clone(),
+            |mut data| {
+                let mut buffer = vec![0; data.len()];
+                recursive_partition_stable(&mut data, &mut buffer, 0);
+                if data != data_sorted {
+                    panic!()
+                }
+                data
+            },
+            BatchSize::SmallInput,
+        )
+    });
+
+    let mut data = data;
+    data.sort();
+
+    group.bench_function("sort_then_bin_search_pre_sorted", |b| {
+        b.iter_batched(
+            || data.clone(),
+            |mut data| {
+                data.sort();
+                recursive_bin_search(&data, 0);
+                data
+            },
+            BatchSize::SmallInput,
+        );
+    });
+
+    group.bench_function("bin_search_pre_sorted", |b| {
+        b.iter_batched(
+            || data.clone(),
+            |data| {
+                recursive_bin_search(&data, 0);
+                data
+            },
+            BatchSize::SmallInput,
+        );
+    });
+
+    group.bench_function("recursive_partition_pre_sorted", |b| {
+        b.iter_batched(
+            || data.clone(),
+            |mut data| {
+                recursive_partition(&mut data, 0);
+                if data != data_sorted {
+                    panic!()
+                }
+                data
+            },
+            BatchSize::SmallInput,
+        )
+    });
+
+    group.bench_function("recursive_partition_stable_pre_sorted", |b| {
+        b.iter_batched(
+            || data.clone(),
+            |mut data| {
+                let mut buffer = vec![0; data.len()];
+                recursive_partition_stable(&mut data, &mut buffer, 0);
+                if data != data_sorted {
+                    panic!()
+                }
+                data
+            },
+            BatchSize::SmallInput,
+        )
+    });
+}
+
+criterion_group!(
+    name = sorting;
+    config = Criterion::default();
+    targets = compare_sorting
+);
+
+criterion_main!(sorting);
diff --git a/experimental/storage/layered-map/src/layer.rs b/experimental/storage/layered-map/src/layer.rs
new file mode 100644
index 0000000000000..5bfbbdb4ca704
--- /dev/null
+++ b/experimental/storage/layered-map/src/layer.rs
@@ -0,0 +1,149 @@
+// Copyright (c) Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    dropper::DROPPER,
+    map::{DefaultHashBuilder, LayeredMap},
+    metrics::LAYER,
+    node::NodeRef,
+};
+use aptos_crypto::HashValue;
+use aptos_drop_helper::ArcAsyncDrop;
+use aptos_infallible::Mutex;
+use aptos_metrics_core::IntGaugeHelper;
+use std::{marker::PhantomData, sync::Arc};
+
+#[derive(Debug)]
+struct LayerInner<K: ArcAsyncDrop, V: ArcAsyncDrop> {
+    root: NodeRef<K, V>,
+    children: Mutex<Vec<Arc<LayerInner<K, V>>>>,
+    use_case: &'static str,
+    family: HashValue,
+    layer: u64,
+    // Oldest layer viewable when self is created -- self won't even weak-link to a node created in
+    // a layer older than this.
+    base_layer: u64,
+}
+
+impl<K: ArcAsyncDrop, V: ArcAsyncDrop> Drop for LayerInner<K, V> {
+    fn drop(&mut self) {
+        // Drop the tree nodes in a different thread, because that's the slowest part.
+        DROPPER.schedule_drop(self.root.take_for_drop());
+
+        let mut stack = self.drain_children_for_drop();
+        while let Some(descendant) = stack.pop() {
+            if Arc::strong_count(&descendant) == 1 {
+                // The only ref is the one we are now holding, so the
+                // descendant will be dropped after we free the `Arc`, which results in a chain
+                // of such structures being dropped recursively and that might trigger a stack
+                // overflow. To prevent that we follow the chain further to disconnect things
+                // beforehand.
+                stack.extend(descendant.drain_children_for_drop());
+            }
+        }
+        self.log_layer("dropped");
+    }
+}
+
+impl<K: ArcAsyncDrop, V: ArcAsyncDrop> LayerInner<K, V> {
+    fn new_family(use_case: &'static str) -> Arc<Self> {
+        let family = HashValue::random();
+        Arc::new(Self {
+            root: NodeRef::Empty,
+            children: Mutex::new(Vec::new()),
+            use_case,
+            family,
+            layer: 0,
+            base_layer: 0,
+        })
+    }
+
+    fn spawn(self: &Arc<Self>, child_root: NodeRef<K, V>, base_layer: u64) -> Arc<Self> {
+        let child = Arc::new(Self {
+            root: child_root,
+            children: Mutex::new(Vec::new()),
+            use_case: self.use_case,
+            family: self.family,
+            layer: self.layer + 1,
+            base_layer,
+        });
+        self.children.lock().push(child.clone());
+        child.log_layer("spawn");
+
+        child
+    }
+
+    fn drain_children_for_drop(&self) -> Vec<Arc<Self>> {
+        self.children.lock().drain(..).collect()
+    }
+
+    fn log_layer(&self, event: &'static str) {
+        LAYER.set_with(&[self.use_case, event], self.layer as i64);
+    }
+}
+
+#[derive(Debug)]
+pub struct MapLayer<K: ArcAsyncDrop, V: ArcAsyncDrop, S = DefaultHashBuilder> {
+    inner: Arc<LayerInner<K, V>>,
+    /// Carried only for type safety: a LayeredMap can only be with layers of the same hasher type.
+    _hash_builder: PhantomData<S>,
+}
+
+/// Manual implementation because `LayerInner` is deliberately not `Clone`.
+impl<K: ArcAsyncDrop, V: ArcAsyncDrop> Clone for MapLayer<K, V> {
+    fn clone(&self) -> Self {
+        Self::new(self.inner.clone())
+    }
+}
+
+impl<K: ArcAsyncDrop, V: ArcAsyncDrop> MapLayer<K, V> {
+    pub fn new_family(use_case: &'static str) -> Self {
+        Self::new(LayerInner::new_family(use_case))
+    }
+
+    fn new(inner: Arc<LayerInner<K, V>>) -> Self {
+        Self {
+            inner,
+            _hash_builder: PhantomData,
+        }
+    }
+
+    pub fn into_layers_view_since(self, bottom_layer: MapLayer<K, V>) -> LayeredMap<K, V> {
+        assert!(bottom_layer.is_family(&self));
+        assert!(bottom_layer.inner.layer >= self.inner.base_layer);
+        assert!(bottom_layer.inner.layer <= self.inner.layer);
+
+        self.log_layer("view");
+        bottom_layer.log_layer("ancestor_ref");
+
+        LayeredMap::new(bottom_layer, self)
+    }
+
+    pub fn view_layers_since(&self, bottom_layer: &MapLayer<K, V>) -> LayeredMap<K, V> {
+        self.clone().into_layers_view_since(bottom_layer.clone())
+    }
+
+    pub fn log_layer(&self, name: &'static str) {
+        self.inner.log_layer(name)
+    }
+
+    fn is_family(&self, other: &Self) -> bool {
+        self.inner.family == other.inner.family
+    }
+
+    pub(crate) fn layer(&self) -> u64 {
+        self.inner.layer
+    }
+
+    pub(crate) fn root(&self) -> &NodeRef<K, V> {
+        &self.inner.root
+    }
+
+    pub(crate) fn use_case(&self) -> &'static str {
+        self.inner.use_case
+    }
+
+    pub(crate) fn spawn(&self, child_root: NodeRef<K, V>, base_layer: u64) -> Self {
+        Self::new(self.inner.spawn(child_root, base_layer))
+    }
+}
diff --git a/experimental/storage/layered-map/src/lib.rs b/experimental/storage/layered-map/src/lib.rs
index 3f9237d3b69fe..4ee5252be334a 100644
--- a/experimental/storage/layered-map/src/lib.rs
+++ b/experimental/storage/layered-map/src/lib.rs
@@ -1,17 +1,14 @@
 // Copyright © Aptos Foundation
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::{
-    dropper::DROPPER,
-    metrics::{LAYER, TIMER},
-    node::{NodeRef, NodeStrongRef},
-};
-use aptos_crypto::HashValue;
-use aptos_infallible::Mutex;
-use aptos_metrics_core::{IntGaugeHelper, TimerHelper};
-use std::sync::Arc;
+use bitvec::prelude::*;
+pub use layer::MapLayer;
+pub use map::LayeredMap;
+use std::hash::Hash;
 
 mod dropper;
+mod layer;
+mod map;
 mod metrics;
 mod node;
 pub(crate) mod r#ref;
@@ -19,282 +16,36 @@ pub(crate) mod r#ref;
 #[cfg(test)]
 mod tests;
 
-/// When recursively creating a new `MapLayer` (a crit bit tree overlay), passing down `Vec<(K, Option<V>)>`
-/// That's why we require `Key: Clone` and clone the key and value only when the leaf node is
-/// created.
-pub trait Key: Clone + Send + Sync + Eq + 'static {
-    fn iter_bits(&self) -> impl Iterator<Item = bool>;
+/// When recursively creating a new `MapLayer` (a crit bit tree overlay), partitioning and passing
+/// down `Vec<(K, Option<V>)>` would mean a lot of memory allocation. That's why we require
+/// `Key: Clone` and clone the key and value only when the leaf node is created.
+pub trait Key: Clone + Hash + Eq + Ord {}
 
-    fn bit(&self, depth: usize) -> bool;
-}
+impl<T: Clone + Hash + Eq + Ord> Key for T {}
 
 /// Similar to `Key`, we require `Value: Clone`, another reason being it's tricky to figure out the
 /// lifetime if `get()` returns a reference to the value -- we simply clone the value.
-pub trait Value: Clone + Send + Sync + 'static {}
-
-#[derive(Debug)]
-struct LayerInner<K: Key, V: Value> {
-    root: NodeRef<K, V>,
-    children: Mutex<Vec<Arc<LayerInner<K, V>>>>,
-    use_case: &'static str,
-    family: HashValue,
-    layer: u64,
-    // Oldest layer viewable when self is created -- self won't even weak-link to a node created in
-    // a layer older than this.
-    base_layer: u64,
-}
-
-impl<K: Key, V: Value> Drop for LayerInner<K, V> {
-    fn drop(&mut self) {
-        // Drop the tree nodes in a different thread, because that's the slowest part.
-        DROPPER.schedule_drop(self.root.take_for_drop());
-
-        let mut stack = self.drain_children_for_drop();
-        while let Some(descendant) = stack.pop() {
-            if Arc::strong_count(&descendant) == 1 {
-                // The only ref is the one we are now holding, so the
-                // descendant will be dropped after we free the `Arc`, which results in a chain
-                // of such structures being dropped recursively and that might trigger a stack
-                // overflow. To prevent that we follow the chain further to disconnect things
-                // beforehand.
-                stack.extend(descendant.drain_children_for_drop());
-            }
-        }
-        self.log_layer("dropped");
-    }
-}
-
-impl<K: Key, V: Value> LayerInner<K, V> {
-    fn new_family(use_case: &'static str) -> Arc<Self> {
-        let family = HashValue::random();
-        Arc::new(Self {
-            root: NodeRef::Empty,
-            children: Mutex::new(Vec::new()),
-            use_case,
-            family,
-            layer: 0,
-            base_layer: 0,
-        })
-    }
-
-    fn spawn(self: &Arc<Self>, child_root: NodeRef<K, V>, base_layer: u64) -> Arc<Self> {
-        let child = Arc::new(Self {
-            root: child_root,
-            children: Mutex::new(Vec::new()),
-            use_case: self.use_case,
-            family: self.family,
-            layer: self.layer + 1,
-            base_layer,
-        });
-        self.children.lock().push(child.clone());
-        child.log_layer("spawn");
-
-        child
-    }
-
-    fn drain_children_for_drop(&self) -> Vec<Arc<Self>> {
-        self.children.lock().drain(..).collect()
-    }
-
-    fn log_layer(&self, event: &'static str) {
-        LAYER.set_with(&[self.use_case, event], self.layer as i64);
-    }
-}
-
-#[derive(Debug)]
-pub struct MapLayer<K: Key, V: Value> {
-    inner: Arc<LayerInner<K, V>>,
-}
-
-/// Manual implementation because `LayerInner` is deliberately not `Clone`.
-impl<K: Key, V: Value> Clone for MapLayer<K, V> {
-    fn clone(&self) -> Self {
-        Self {
-            inner: self.inner.clone(),
-        }
-    }
-}
-
-impl<K: Key, V: Value> MapLayer<K, V> {
-    pub fn new_family(use_case: &'static str) -> Self {
-        Self {
-            inner: LayerInner::new_family(use_case),
-        }
-    }
-
-    pub fn into_layers_view_since(self, bottom_layer: MapLayer<K, V>) -> LayeredMap<K, V> {
-        assert!(bottom_layer.is_family(&self));
-        assert!(bottom_layer.inner.layer >= self.inner.base_layer);
-        assert!(bottom_layer.inner.layer <= self.inner.layer);
-
-        self.log_layer("view");
-        bottom_layer.log_layer("ancestor_ref");
-
-        LayeredMap {
-            bottom_layer,
-            top_layer: self,
-        }
-    }
-
-    pub fn view_layers_since(&self, bottom_layer: &MapLayer<K, V>) -> LayeredMap<K, V> {
-        self.clone().into_layers_view_since(bottom_layer.clone())
-    }
-
-    pub fn log_layer(&self, name: &'static str) {
-        self.inner.log_layer(name)
-    }
-
-    fn is_family(&self, other: &Self) -> bool {
-        self.inner.family == other.inner.family
-    }
-}
-
-#[derive(Clone, Debug)]
-pub struct LayeredMap<K: Key, V: Value> {
-    bottom_layer: MapLayer<K, V>,
-    top_layer: MapLayer<K, V>,
-}
-
-impl<K: Key, V: Value> LayeredMap<K, V>
-where
-    K: Key,
-    V: Value,
-{
-    pub fn unpack(self) -> (MapLayer<K, V>, MapLayer<K, V>) {
-        let Self {
-            bottom_layer,
-            top_layer,
-        } = self;
-
-        (bottom_layer, top_layer)
-    }
-
-    fn bottom_layer(&self) -> u64 {
-        self.bottom_layer.inner.layer
-    }
-
-    fn top_layer(&self) -> u64 {
-        self.top_layer.inner.layer
-    }
-
-    fn get_node_strong(&self, node_ref: &NodeRef<K, V>) -> NodeStrongRef<K, V> {
-        node_ref.get_strong_with_min_layer(self.bottom_layer())
-    }
-
-    fn root(&self) -> NodeStrongRef<K, V> {
-        self.get_node_strong(&self.top_layer.inner.root)
-    }
-
-    pub fn get(&self, key: &K) -> Option<V> {
-        let mut cur_node = self.root();
-        let mut bits = key.iter_bits();
-
-        loop {
-            match cur_node {
-                NodeStrongRef::Empty => return None,
-                NodeStrongRef::Leaf(leaf) => {
-                    return if &leaf.key == key {
-                        leaf.value.clone()
-                    } else {
-                        None
-                    }
-                },
-                NodeStrongRef::Internal(internal) => match bits.next() {
-                    None => {
-                        unreachable!("value on key-prefix not supported.");
-                    },
-                    Some(bit) => {
-                        if bit {
-                            cur_node = self.get_node_strong(&internal.right);
-                        } else {
-                            cur_node = self.get_node_strong(&internal.left);
-                        }
-                    },
-                },
-            } // end match cur_node
-        } // end loop
-    }
-
-    fn new_leaf(&self, item: &(K, Option<V>)) -> NodeRef<K, V> {
-        let (key, value) = item.clone();
-        NodeRef::new_leaf(key, value, self.top_layer() + 1)
-    }
-
-    fn new_internal(&self, left: NodeRef<K, V>, right: NodeRef<K, V>) -> NodeRef<K, V> {
-        NodeRef::new_internal(left, right, self.top_layer() + 1)
-    }
-
-    fn branch_down(
-        &self,
-        depth: usize,
-        node: NodeStrongRef<K, V>,
-    ) -> (NodeStrongRef<K, V>, NodeStrongRef<K, V>) {
-        use NodeStrongRef::*;
-
-        match &node {
-            Empty => (Empty, Empty),
-            Leaf(leaf) => {
-                if leaf.key.bit(depth) {
-                    (Empty, node)
-                } else {
-                    (node, Empty)
-                }
-            },
-            Internal(internal) => (
-                self.get_node_strong(&internal.left),
-                self.get_node_strong(&internal.right),
-            ),
-        }
-    }
-
-    fn merge_up(&self, left: NodeRef<K, V>, right: NodeRef<K, V>) -> NodeRef<K, V> {
-        use NodeRef::*;
-
-        match (&left, &right) {
-            (Empty, Leaf(..)) => right,
-            (Leaf(..), Empty) => left,
-            (Empty, Empty) => unreachable!("merge_up with two empty nodes"),
-            _ => self.new_internal(left, right),
-        }
-    }
+pub trait Value: Clone {}
 
-    fn create_tree(
-        &self,
-        depth: usize,
-        current_root: NodeStrongRef<K, V>,
-        items: &[(K, Option<V>)],
-    ) -> NodeRef<K, V> {
-        if items.is_empty() {
-            return current_root.weak_ref();
-        }
+impl<T: Clone> Value for T {}
 
-        if items.len() == 1 {
-            match &current_root {
-                NodeStrongRef::Empty => return self.new_leaf(&items[0]),
-                NodeStrongRef::Leaf(leaf) => {
-                    let (key, _value) = &items[0];
-                    if &leaf.key == key {
-                        return self.new_leaf(&items[0]);
-                    }
-                },
-                NodeStrongRef::Internal(_) => {},
-            }
-        }
+/// Wrapper for the hash value of a key.
+///
+/// Addressing bits in the order of MSB to LSB, so that sorting by the numeric order is the same
+/// as sorting by bits.
+#[derive(Copy, Clone, Debug, Eq, Ord, PartialEq, PartialOrd)]
+pub(crate) struct KeyHash(u64);
 
-        let pivot = items.partition_point(|(key, _value)| !key.bit(depth));
-        let (left_items, right_items) = items.split_at(pivot);
-        let (left_root, right_root) = self.branch_down(depth, current_root);
-        self.merge_up(
-            self.create_tree(depth + 1, left_root, left_items),
-            self.create_tree(depth + 1, right_root, right_items),
-        )
+impl KeyHash {
+    fn bit(&self, n: usize) -> bool {
+        *self
+            .0
+            .view_bits::<Msb0>()
+            .get(n)
+            .expect("Caller guarantees range.")
     }
 
-    pub fn new_layer(&self, items: &[(K, Option<V>)]) -> MapLayer<K, V> {
-        let _timer = TIMER.timer_with(&[self.top_layer.inner.use_case, "new_layer"]);
-        let root = self.create_tree(0, self.root(), items);
-        MapLayer {
-            inner: self.top_layer.inner.spawn(root, self.bottom_layer()),
-        }
+    fn iter_bits(&self) -> impl Iterator<Item = bool> + '_ {
+        self.0.view_bits::<Msb0>().iter().by_vals()
     }
 }
diff --git a/experimental/storage/layered-map/src/map.rs b/experimental/storage/layered-map/src/map.rs
new file mode 100644
index 0000000000000..87cda37cc48cc
--- /dev/null
+++ b/experimental/storage/layered-map/src/map.rs
@@ -0,0 +1,281 @@
+// Copyright (c) Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    metrics::TIMER,
+    node::{CollisionCell, LeafContent, LeafNode, NodeRef, NodeStrongRef},
+    Key, KeyHash, MapLayer, Value,
+};
+use aptos_drop_helper::ArcAsyncDrop;
+use aptos_metrics_core::TimerHelper;
+use itertools::Itertools;
+use std::{collections::BTreeMap, marker::PhantomData};
+
+pub(crate) type DefaultHashBuilder = core::hash::BuildHasherDefault<ahash::AHasher>;
+
+#[derive(Clone, Debug)]
+pub struct LayeredMap<K: ArcAsyncDrop, V: ArcAsyncDrop, S = DefaultHashBuilder> {
+    bottom_layer: MapLayer<K, V>,
+    top_layer: MapLayer<K, V>,
+    /// Hasher is needed only for spawning a new layer, i.e. for a read only map there's no need to
+    /// pay the overhead of constructing it.
+    _hash_builder: PhantomData<S>,
+}
+
+impl<K, V, S> LayeredMap<K, V, S>
+where
+    K: ArcAsyncDrop,
+    V: ArcAsyncDrop,
+{
+    pub fn new(bottom_layer: MapLayer<K, V>, top_layer: MapLayer<K, V>) -> Self {
+        Self {
+            bottom_layer,
+            top_layer,
+            _hash_builder: PhantomData,
+        }
+    }
+
+    pub fn unpack(self) -> (MapLayer<K, V>, MapLayer<K, V>) {
+        let Self {
+            bottom_layer,
+            top_layer,
+            _hash_builder,
+        } = self;
+
+        (bottom_layer, top_layer)
+    }
+
+    fn bottom_layer(&self) -> u64 {
+        self.bottom_layer.layer()
+    }
+
+    fn top_layer(&self) -> u64 {
+        self.top_layer.layer()
+    }
+
+    fn get_node_strong(&self, node_ref: &NodeRef<K, V>) -> NodeStrongRef<K, V> {
+        node_ref.get_strong_with_min_layer(self.bottom_layer())
+    }
+
+    fn root(&self) -> NodeStrongRef<K, V> {
+        self.get_node_strong(self.top_layer.root())
+    }
+}
+
+impl<K, V, S> LayeredMap<K, V, S>
+where
+    K: ArcAsyncDrop + Key,
+    V: ArcAsyncDrop + Value,
+{
+    pub fn get_with_hasher(&self, key: &K, hash_builder: &S) -> Option<V>
+    where
+        S: core::hash::BuildHasher,
+    {
+        let mut cur_node = self.root();
+        let key_hash = KeyHash(hash_builder.hash_one(key));
+        let mut bits = key_hash.iter_bits();
+
+        loop {
+            match cur_node {
+                NodeStrongRef::Empty => return None,
+                NodeStrongRef::Leaf(leaf) => {
+                    return leaf.get_value(key, self.bottom_layer()).cloned()
+                },
+                NodeStrongRef::Internal(internal) => match bits.next() {
+                    None => {
+                        unreachable!("value on key-prefix not supported.");
+                    },
+                    Some(bit) => {
+                        if bit {
+                            cur_node = self.get_node_strong(&internal.right);
+                        } else {
+                            cur_node = self.get_node_strong(&internal.left);
+                        }
+                    },
+                },
+            } // end match cur_node
+        } // end loop
+    }
+
+    pub fn get(&self, key: &K) -> Option<V>
+    where
+        S: core::hash::BuildHasher + Default,
+    {
+        self.get_with_hasher(key, &Default::default())
+    }
+
+    fn new_leaf(&self, key_hash: KeyHash, items: &[Item<K, V>]) -> NodeRef<K, V> {
+        let new_layer = self.top_layer() + 1;
+        NodeRef::new_leaf(key_hash, to_leaf_content(items, new_layer), new_layer)
+    }
+
+    fn new_leaf_overwriting_old(
+        &self,
+        key_hash: KeyHash,
+        old_leaf: &LeafNode<K, V>,
+        new_items: &[Item<K, V>],
+    ) -> NodeRef<K, V> {
+        let new_layer = self.top_layer() + 1;
+
+        let old = old_leaf.content.clone();
+        let new = to_leaf_content(new_items, new_layer);
+        let content = old.combined_with(old_leaf.layer, new, new_layer, self.bottom_layer());
+
+        NodeRef::new_leaf(key_hash, content, new_layer)
+    }
+
+    fn new_internal(&self, left: NodeRef<K, V>, right: NodeRef<K, V>) -> NodeRef<K, V> {
+        NodeRef::new_internal(left, right, self.top_layer() + 1)
+    }
+
+    fn branch_down(
+        &self,
+        depth: usize,
+        node: NodeStrongRef<K, V>,
+    ) -> (NodeStrongRef<K, V>, NodeStrongRef<K, V>) {
+        use crate::node::NodeStrongRef::*;
+
+        match &node {
+            Empty => (Empty, Empty),
+            Leaf(leaf) => {
+                if leaf.key_hash.bit(depth) {
+                    (Empty, node)
+                } else {
+                    (node, Empty)
+                }
+            },
+            Internal(internal) => (
+                self.get_node_strong(&internal.left),
+                self.get_node_strong(&internal.right),
+            ),
+        }
+    }
+
+    fn merge_up(&self, left: NodeRef<K, V>, right: NodeRef<K, V>) -> NodeRef<K, V> {
+        use crate::node::NodeRef::*;
+
+        match (&left, &right) {
+            (Empty, Leaf(..)) => right,
+            (Leaf(..), Empty) => left,
+            (Empty, Empty) => unreachable!("merge_up with two empty nodes"),
+            _ => self.new_internal(left, right),
+        }
+    }
+
+    fn create_tree(
+        &self,
+        depth: usize,
+        current_root: NodeStrongRef<K, V>,
+        items: &[Item<K, V>],
+    ) -> NodeRef<K, V> {
+        if items.is_empty() {
+            return current_root.weak_ref();
+        }
+
+        // See if the whole range is of the same key hash, which maps to a leaf node
+        let first_key_hash = items[0].key_hash();
+        if first_key_hash == items[items.len() - 1].key_hash() {
+            match &current_root {
+                NodeStrongRef::Empty => return self.new_leaf(first_key_hash, items),
+                NodeStrongRef::Leaf(leaf) => {
+                    if leaf.key_hash == first_key_hash {
+                        return self.new_leaf_overwriting_old(first_key_hash, leaf, items);
+                    }
+                },
+                NodeStrongRef::Internal(_) => {},
+            }
+        }
+
+        let pivot = items.partition_point(|item| !item.key_hash.bit(depth));
+        let (left_items, right_items) = items.split_at(pivot);
+        let (left_root, right_root) = self.branch_down(depth, current_root);
+        self.merge_up(
+            self.create_tree(depth + 1, left_root, left_items),
+            self.create_tree(depth + 1, right_root, right_items),
+        )
+    }
+
+    pub fn new_layer_with_hasher(&self, kvs: &[(K, V)], hash_builder: &S) -> MapLayer<K, V>
+    where
+        S: core::hash::BuildHasher,
+    {
+        let _timer = TIMER.timer_with(&[self.top_layer.use_case(), "new_layer"]);
+
+        // Hash the keys and sort items in key hash order.
+        //
+        // n.b. no need to dedup at this point, as we will do it anyway at the leaf level.
+        let items = kvs
+            .iter()
+            .map(|kv| {
+                let key = &kv.0;
+                let key_hash = KeyHash(hash_builder.hash_one(key));
+                Item { key_hash, kv }
+            })
+            .sorted_by_key(Item::full_key)
+            .collect_vec();
+
+        let root = self.create_tree(0, self.root(), &items);
+
+        self.top_layer.spawn(root, self.bottom_layer())
+    }
+
+    pub fn new_layer(&self, items: &[(K, V)]) -> MapLayer<K, V>
+    where
+        S: core::hash::BuildHasher + Default,
+    {
+        self.new_layer_with_hasher(items, &Default::default())
+    }
+}
+
+pub(crate) struct Item<'a, K, V> {
+    key_hash: KeyHash,
+    kv: &'a (K, V),
+}
+
+impl<'a, K, V> Item<'a, K, V> {
+    fn key_hash(&self) -> KeyHash {
+        self.key_hash
+    }
+
+    fn key(&self) -> &'a K {
+        &self.kv.0
+    }
+
+    /// Full key used for sorting and deduplication.
+    ///
+    /// Inequality is detected if key hash is different, keys only need to be compared in case of
+    /// hash collision.
+    fn full_key(&self) -> (KeyHash, &'a K) {
+        (self.key_hash(), self.key())
+    }
+
+    fn kv(&self) -> &(K, V) {
+        self.kv
+    }
+}
+
+fn to_leaf_content<K: Key, V: Value>(items: &[Item<K, V>], layer: u64) -> LeafContent<K, V> {
+    assert!(!items.is_empty());
+    if items.len() == 1 {
+        let (key, value) = items[0].kv().clone();
+        LeafContent::UniqueLatest { key, value }
+    } else {
+        // deduplication
+        let mut map: BTreeMap<_, _> = items
+            .iter()
+            .map(|item| {
+                let (key, value) = item.kv().clone();
+                (key, CollisionCell { value, layer })
+            })
+            .collect();
+        if map.len() == 1 {
+            let (key, cell) = map.pop_first().unwrap();
+            LeafContent::UniqueLatest {
+                key,
+                value: cell.value,
+            }
+        } else {
+            LeafContent::Collision(map)
+        }
+    }
+}
diff --git a/experimental/storage/layered-map/src/metrics.rs b/experimental/storage/layered-map/src/metrics.rs
index de421777530a1..1cd0b2f874616 100644
--- a/experimental/storage/layered-map/src/metrics.rs
+++ b/experimental/storage/layered-map/src/metrics.rs
@@ -1,5 +1,4 @@
-// Copyright © Aptos Foundation
-// Parts of the project are originally copyright © Meta Platforms, Inc.
+// Copyright (c) Aptos Foundation
 // SPDX-License-Identifier: Apache-2.0
 
 #![forbid(unsafe_code)]
diff --git a/experimental/storage/layered-map/src/node.rs b/experimental/storage/layered-map/src/node.rs
index 397c20299d7ca..d560c1c1ef0a8 100644
--- a/experimental/storage/layered-map/src/node.rs
+++ b/experimental/storage/layered-map/src/node.rs
@@ -1,8 +1,10 @@
 // Copyright © Aptos Foundation
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::r#ref::Ref;
-use std::sync::Arc;
+use crate::{metrics::TIMER, r#ref::Ref, KeyHash};
+use aptos_metrics_core::TimerHelper;
+use itertools::Either;
+use std::{collections::BTreeMap, sync::Arc};
 
 #[derive(Debug)]
 pub(crate) struct InternalNode<K, V> {
@@ -11,13 +13,106 @@ pub(crate) struct InternalNode<K, V> {
     pub layer: u64,
 }
 
+#[derive(Clone, Debug)]
+pub(crate) struct CollisionCell<V> {
+    pub value: V,
+    pub layer: u64,
+}
+
+#[derive(Clone, Debug)]
+pub(crate) enum LeafContent<K, V> {
+    UniqueLatest { key: K, value: V },
+    Collision(BTreeMap<K, CollisionCell<V>>),
+}
+
+impl<K, V> LeafContent<K, V> {
+    fn into_iter(self, layer: u64) -> impl Iterator<Item = (K, CollisionCell<V>)> {
+        match self {
+            LeafContent::UniqueLatest { key, value } => {
+                Either::Left(std::iter::once((key, CollisionCell { value, layer })))
+            },
+            LeafContent::Collision(map) => Either::Right(map.into_iter()),
+        }
+    }
+
+    pub fn combined_with(self, layer: u64, other: Self, other_layer: u64, base_layer: u64) -> Self
+    where
+        K: Clone + Eq + Ord,
+        V: Clone,
+    {
+        use LeafContent::*;
+
+        match (self, other) {
+            // Collision should be rare, this is likely.
+            (UniqueLatest { key: old_key, .. }, UniqueLatest { key, value }) if old_key == key => {
+                UniqueLatest { key, value }
+            },
+            (myself, other) => {
+                let _timer = TIMER.timer_with(&["_", "leaf_content_collision"]);
+
+                let map: BTreeMap<_, _> = myself
+                    .into_iter(layer)
+                    .chain(other.into_iter(other_layer))
+                    // retire entries that's older than the base_layer
+                    .filter(|(_key, cell)| cell.layer >= base_layer)
+                    .collect();
+
+                assert!(!map.is_empty());
+                if map.len() == 1 {
+                    let (key, cell) = map.into_iter().next().unwrap();
+                    assert_eq!(cell.layer, other_layer);
+                    UniqueLatest {
+                        key,
+                        value: cell.value,
+                    }
+                } else {
+                    Collision(map)
+                }
+            },
+        }
+    }
+
+    fn get(&self, key: &K, min_layer: u64) -> Option<&V>
+    where
+        K: Eq + Ord,
+    {
+        use LeafContent::*;
+
+        match self {
+            UniqueLatest { key: k, value } => {
+                if k == key {
+                    Some(value)
+                } else {
+                    None
+                }
+            },
+            Collision(map) => map.get(key).and_then(|cell| {
+                if cell.layer >= min_layer {
+                    Some(&cell.value)
+                } else {
+                    None
+                }
+            }),
+        }
+    }
+}
+
 #[derive(Debug)]
 pub(crate) struct LeafNode<K, V> {
-    pub key: K,
-    pub value: Option<V>,
+    pub key_hash: KeyHash,
+    pub content: LeafContent<K, V>,
     pub layer: u64,
 }
 
+impl<K, V> LeafNode<K, V> {
+    pub fn get_value(&self, key: &K, min_layer: u64) -> Option<&V>
+    where
+        K: Eq + Ord,
+    {
+        self.content.get(key, min_layer)
+    }
+}
+
 #[derive(Clone, Debug)]
 pub(crate) enum NodeRef<K, V> {
     Empty,
@@ -26,8 +121,12 @@ pub(crate) enum NodeRef<K, V> {
 }
 
 impl<K, V> NodeRef<K, V> {
-    pub fn new_leaf(key: K, value: Option<V>, layer: u64) -> Self {
-        Self::Leaf(Ref::Strong(Arc::new(LeafNode { key, value, layer })))
+    pub fn new_leaf(key_hash: KeyHash, content: LeafContent<K, V>, layer: u64) -> Self {
+        Self::Leaf(Ref::Strong(Arc::new(LeafNode {
+            key_hash,
+            content,
+            layer,
+        })))
     }
 
     pub fn new_internal(left: Self, right: Self, layer: u64) -> Self {
diff --git a/experimental/storage/layered-map/src/tests.rs b/experimental/storage/layered-map/src/tests.rs
index 4c2a4963f0e87..3105731f89069 100644
--- a/experimental/storage/layered-map/src/tests.rs
+++ b/experimental/storage/layered-map/src/tests.rs
@@ -1,55 +1,57 @@
 // Copyright © Aptos Foundation
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::MapLayer;
-use bitvec::{order::Msb0, view::BitView};
-use proptest::{
-    collection::{btree_map, vec},
-    prelude::*,
+use crate::{layer::MapLayer, KeyHash};
+use itertools::Itertools;
+use proptest::{collection::vec, prelude::*};
+use std::{
+    collections::BTreeMap,
+    hash::{Hash, Hasher},
 };
-use std::collections::BTreeMap;
 
-impl crate::Key for u8 {
-    fn iter_bits(&self) -> impl Iterator<Item = bool> {
-        self.view_bits::<Msb0>().iter().by_vals()
-    }
+#[derive(Clone, Copy, Debug, Eq, Ord, PartialEq, PartialOrd)]
+struct HashCollide(u8);
 
-    fn bit(&self, depth: usize) -> bool {
-        self.view_bits::<Msb0>()
-            .get(depth)
-            .map(|b| *b)
-            .unwrap_or(false)
+impl Hash for HashCollide {
+    fn hash<H: Hasher>(&self, state: &mut H) {
+        // artificially make collision
+        state.write_u8(self.0 >> 2);
     }
 }
 
-impl crate::Value for u8 {}
-
-fn naive_view_layers<K: Ord, V>(
-    layers: impl Iterator<Item = BTreeMap<K, Option<V>>>,
-) -> BTreeMap<K, Option<V>> {
+fn naive_view_layers<K: Ord, V>(layers: impl Iterator<Item = Vec<(K, V)>>) -> BTreeMap<K, V> {
     layers.flat_map(|layer| layer.into_iter()).collect()
 }
 
-fn arb_test_case() -> impl Strategy<Value = (Vec<BTreeMap<u8, Option<u8>>>, usize, usize, usize)> {
-    vec(btree_map(any::<u8>(), any::<Option<u8>>(), 0..100), 1..100).prop_flat_map(
-        |items_per_layer| {
-            let num_layers = items_per_layer.len();
-            let items_per_layer = items_per_layer.clone();
-            vec(0..num_layers, 3).prop_map(move |mut layer_indices| {
-                layer_indices.sort();
-                let ancestor = layer_indices[0];
-                let bottom = layer_indices[1];
-                let top = layer_indices[2];
-                (items_per_layer.clone(), ancestor, bottom, top)
-            })
-        },
-    )
+fn arb_test_case() -> impl Strategy<Value = (Vec<Vec<(HashCollide, u8)>>, usize, usize, usize)> {
+    vec(vec(any::<(u8, u8)>(), 0..100), 1..100).prop_flat_map(|items_per_layer| {
+        let num_layers = items_per_layer.len();
+        let items_per_layer = items_per_layer.clone();
+        vec(0..num_layers, 3).prop_map(move |mut layer_indices| {
+            layer_indices.sort();
+            let ancestor = layer_indices[0];
+            let bottom = layer_indices[1];
+            let top = layer_indices[2];
+
+            let items_per_layer = items_per_layer
+                .iter()
+                .map(|items| {
+                    items
+                        .iter()
+                        .map(|(key, value)| (HashCollide(*key), *value))
+                        .collect_vec()
+                })
+                .collect_vec();
+
+            (items_per_layer, ancestor, bottom, top)
+        })
+    })
 }
 
 fn layers(
-    items_per_layer: &[BTreeMap<u8, Option<u8>>],
+    items_per_layer: &[Vec<(HashCollide, u8)>],
     max_base_layer: u64,
-) -> Vec<MapLayer<u8, u8>> {
+) -> Vec<MapLayer<HashCollide, u8>> {
     let mut base_layer = MapLayer::new_family("test");
     let mut latest_layer = base_layer.clone();
 
@@ -63,7 +65,7 @@ fn layers(
             .new_layer(&items_vec);
         layers.push(latest_layer.clone());
 
-        // advance base layer occationally to expose more edge cases
+        // advance base layer occasionally to expose more edge cases
         if base_layer_idx < max_base_layer as usize && layer_idx % 2 == 1 {
             base_layer_idx += 1;
             base_layer = layers[base_layer_idx].clone();
@@ -85,12 +87,23 @@ proptest! {
 
         let layered_map = top_layer.into_layers_view_since(bottom_layer);
 
-        for (key, value ) in naive_view_layers(
+        for (key, value_opt) in naive_view_layers(
             items_per_layer.drain(bottom..=top)
         ) {
-            prop_assert_eq!(layered_map.get(&key), value);
+            prop_assert_eq!(layered_map.get(&key), Some(value_opt));
         }
 
         // TODO(aldenhu): test that layered_map doesn't have any unexpected keys -- need ability to traverse
     }
+
+    #[test]
+    fn test_key_hash_order(nums in vec(any::<u64>(), 0..100)) {
+        let mut a = nums.into_iter().map(KeyHash).collect_vec();
+        let mut b = a.clone();
+
+        a.sort();
+        b.sort_by_key(|num| num.iter_bits().collect_vec() );
+
+        prop_assert_eq!(a, b);
+    }
 }
diff --git a/testsuite/dos/http_test/docker/blocked.ips b/keyless/circuit/.circuit-root
similarity index 100%
rename from testsuite/dos/http_test/docker/blocked.ips
rename to keyless/circuit/.circuit-root
diff --git a/keyless/circuit/.gitignore b/keyless/circuit/.gitignore
new file mode 100644
index 0000000000000..fe28d346d0ade
--- /dev/null
+++ b/keyless/circuit/.gitignore
@@ -0,0 +1,4 @@
+aptos-keyless-trusted-setup-contributions-may-2024
+templates/main.r1cs
+templates/main.sym
+templates/main_js
diff --git a/keyless/circuit/Cargo.toml b/keyless/circuit/Cargo.toml
new file mode 100644
index 0000000000000..662d69d6fee95
--- /dev/null
+++ b/keyless/circuit/Cargo.toml
@@ -0,0 +1,36 @@
+[package]
+name = "aptos-keyless-circuit"
+description = "Aptos Keyless circuit"
+version = "0.1.0"
+
+# Workspace inherited keys
+authors = { workspace = true }
+edition = { workspace = true }
+homepage = { workspace = true }
+license = { workspace = true }
+publish = { workspace = true }
+repository = { workspace = true }
+rust-version = { workspace = true }
+
+[dependencies]
+anyhow = { workspace = true }
+aptos-crypto = { workspace = true }
+aptos-keyless-common = { workspace = true }
+aptos-logger = { workspace = true }
+ark-bn254 = { workspace = true }
+ark-ff = { workspace = true }
+base64 = { workspace = true }
+itertools = { workspace = true }
+num-traits = { workspace = true }
+rand = { workspace = true }
+serde_json = { workspace = true }
+sha2 = { workspace = true }
+tempfile = { workspace = true }
+
+[dev-dependencies]
+hex = { workspace = true }
+num-bigint = { workspace = true }
+num-modular = { version = "0.6.1", features = ["num-bigint", "num-integer", "num-traits", "std"] }
+rand_chacha = "0.3.1"
+rsa = { version = "0.9.6", features = ["sha2"] }
+tokio = { workspace = true }
diff --git a/keyless/circuit/LICENSE b/keyless/circuit/LICENSE
new file mode 100644
index 0000000000000..2abe7dd0a5b4f
--- /dev/null
+++ b/keyless/circuit/LICENSE
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2024 Aptos Foundation
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/keyless/circuit/README.md b/keyless/circuit/README.md
new file mode 100644
index 0000000000000..c62c9dcd31c7b
--- /dev/null
+++ b/keyless/circuit/README.md
@@ -0,0 +1,51 @@
+# Aptos Keyless circuit
+
+## Installing dependencies
+
+The scripts in this repository will not work without installing the dependencies.
+
+To install, please run:
+
+```
+. ./tools/install-deps.sh
+```
+
+## Run sub-circuit unittests
+
+```bash
+cargo test -p aptos-keyless-circuit
+```
+
+## Generating the proving key
+
+To generate a sample prover and verifier key pair, run the following commands:
+
+```
+./tools/trusted-setup.sh sample_keypair
+```
+
+## Testing
+
+Unit testing located in `src` may be run using `cargo test`. 
+
+## Generating a sample proof
+
+TODO: update `create-proofs-for-testing.sh` to match the latest circuit, then provide instructions.
+
+## Circuit stats
+
+Command:
+```
+circom -l `npm root -g` templates/main.circom --r1cs
+```
+
+Output:
+```
+non-linear constraints: 1376867
+linear constraints: 0
+public inputs: 1
+private inputs: 7858 (7745 belong to witness)
+public outputs: 0
+wires: 1343588
+labels: 6286968
+```
diff --git a/keyless/circuit/package.json b/keyless/circuit/package.json
new file mode 100644
index 0000000000000..61aeb916ca844
--- /dev/null
+++ b/keyless/circuit/package.json
@@ -0,0 +1,7 @@
+{
+  "name": "tools",
+  "version": "1.0.0",
+  "type": "commonjs",
+  "dependencies": {
+  }
+}
diff --git a/keyless/circuit/src/arrays.rs b/keyless/circuit/src/arrays.rs
new file mode 100644
index 0000000000000..69d7ab73d66b1
--- /dev/null
+++ b/keyless/circuit/src/arrays.rs
@@ -0,0 +1,1259 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::TestCircuitHandle;
+use aptos_crypto::poseidon_bn254;
+use aptos_keyless_common::input_processing::{
+    circuit_input_signals::CircuitInputSignals, config::CircuitPaddingConfig,
+};
+use ark_bn254::Fr;
+use ark_ff::{One, Zero};
+use rand::{thread_rng, Rng};
+
+fn build_array_selector_output(len: u32, start: u32, end: u32) -> Vec<u8> {
+    let len = len as usize;
+    let start = start as usize;
+    let end = end as usize;
+    [vec![0; start], vec![1; end - start], vec![0; len - end]].concat()
+}
+
+#[test]
+fn array_selector_test() {
+    let circuit_handle = TestCircuitHandle::new("arrays/array_selector_test.circom").unwrap();
+    let out_len = 8;
+    for start in 0..out_len {
+        for end in start + 1..=out_len {
+            let output = build_array_selector_output(out_len, start, end);
+            let config =
+                CircuitPaddingConfig::new().max_length("expected_output", out_len as usize);
+            let circuit_input_signals = CircuitInputSignals::new()
+                .u64_input("start_index", start as u64)
+                .u64_input("end_index", end as u64)
+                .bytes_input("expected_output", &output[..])
+                .pad(&config)
+                .unwrap();
+            let result = circuit_handle.gen_witness(circuit_input_signals);
+            assert!(result.is_ok());
+        }
+    }
+}
+
+#[test]
+fn array_selector_test_large() {
+    let circuit_handle = TestCircuitHandle::new("arrays/array_selector_test_large.circom").unwrap();
+    for _i in 0..10 {
+        let mut rng = thread_rng();
+
+        let out_len = 2000;
+        let start = rng.gen_range(0, 2000);
+        let end = rng.gen_range(start + 1, 2001);
+
+        let output = build_array_selector_output(out_len, start, end);
+        let config = CircuitPaddingConfig::new().max_length("expected_output", out_len as usize);
+        let circuit_input_signals = CircuitInputSignals::new()
+            .u64_input("start_index", start as u64)
+            .u64_input("end_index", end as u64)
+            .bytes_input("expected_output", &output)
+            .pad(&config)
+            .unwrap();
+
+        let result = circuit_handle.gen_witness(circuit_input_signals);
+        assert!(result.is_ok());
+    }
+}
+
+#[test]
+fn array_selector_test_small() {
+    let circuit_handle = TestCircuitHandle::new("arrays/array_selector_test_small.circom").unwrap();
+    let out_len = 2;
+    let start = 0;
+    let end = 1;
+    let output = build_array_selector_output(out_len, start, end);
+    let config = CircuitPaddingConfig::new().max_length("expected_output", out_len as usize);
+    let circuit_input_signals = CircuitInputSignals::new()
+        .u64_input("start_index", start as u64)
+        .u64_input("end_index", end as u64)
+        .bytes_input("expected_output", &output)
+        .pad(&config)
+        .unwrap();
+
+    let result = circuit_handle.gen_witness(circuit_input_signals);
+    assert!(result.is_ok());
+}
+
+#[test]
+#[should_panic]
+fn array_selector_test_wrong_start() {
+    let circuit_handle = TestCircuitHandle::new("arrays/array_selector_test.circom").unwrap();
+    let out_len = 8;
+    let start = 3;
+    let end = 3;
+    let output = build_array_selector_output(out_len, start, end);
+    let config = CircuitPaddingConfig::new().max_length("expected_output", out_len as usize);
+    let circuit_input_signals = CircuitInputSignals::new()
+        .u64_input("start_index", start as u64)
+        .u64_input("end_index", end as u64)
+        .bytes_input("expected_output", &output)
+        .pad(&config)
+        .unwrap();
+
+    let result = circuit_handle.gen_witness(circuit_input_signals);
+    assert!(result.is_ok());
+}
+
+#[test]
+fn array_selector_test_complex() {
+    let circuit_handle =
+        TestCircuitHandle::new("arrays/array_selector_complex_test.circom").unwrap();
+    let out_len = 8;
+    // Fails when start = 0 by design
+    for start in 1..out_len {
+        for end in start + 1..=out_len {
+            let output = build_array_selector_output(out_len, start, end);
+            let config =
+                CircuitPaddingConfig::new().max_length("expected_output", out_len as usize);
+            let circuit_input_signals = CircuitInputSignals::new()
+                .u64_input("start_index", start as u64)
+                .u64_input("end_index", end as u64)
+                .bytes_input("expected_output", &output[..])
+                .pad(&config)
+                .unwrap();
+            let result = circuit_handle.gen_witness(circuit_input_signals);
+            assert!(result.is_ok());
+        }
+    }
+}
+
+#[test]
+fn array_selector_test_complex_large() {
+    let circuit_handle =
+        TestCircuitHandle::new("arrays/array_selector_complex_large_test.circom").unwrap();
+    let out_len = 2000;
+    let start = 157;
+    let end = 1143;
+    let output = build_array_selector_output(out_len, start, end);
+    let config = CircuitPaddingConfig::new().max_length("expected_output", out_len as usize);
+    let circuit_input_signals = CircuitInputSignals::new()
+        .u64_input("start_index", start as u64)
+        .u64_input("end_index", end as u64)
+        .bytes_input("expected_output", &output)
+        .pad(&config)
+        .unwrap();
+
+    let result = circuit_handle.gen_witness(circuit_input_signals);
+    assert!(result.is_ok());
+}
+
+#[test]
+fn array_selector_test_complex_small() {
+    let circuit_handle =
+        TestCircuitHandle::new("arrays/array_selector_complex_small_test.circom").unwrap();
+    let out_len = 3;
+    let start = 1;
+    let end = 2;
+    let output = build_array_selector_output(out_len, start, end);
+    let config = CircuitPaddingConfig::new().max_length("expected_output", out_len as usize);
+    let circuit_input_signals = CircuitInputSignals::new()
+        .u64_input("start_index", start as u64)
+        .u64_input("end_index", end as u64)
+        .bytes_input("expected_output", &output)
+        .pad(&config)
+        .unwrap();
+
+    let result = circuit_handle.gen_witness(circuit_input_signals);
+    assert!(result.is_ok());
+}
+
+#[test]
+#[should_panic]
+fn array_selector_test_complex_wrong_start() {
+    let circuit_handle = TestCircuitHandle::new("arrays/array_selector_test.circom").unwrap();
+    let out_len = 8;
+    let start = 3;
+    let end = 3;
+    let output = build_array_selector_output(out_len, start, end);
+    let config = CircuitPaddingConfig::new().max_length("expected_output", out_len as usize);
+    let circuit_input_signals = CircuitInputSignals::new()
+        .u64_input("start_index", start as u64)
+        .u64_input("end_index", end as u64)
+        .bytes_input("expected_output", &output)
+        .pad(&config)
+        .unwrap();
+
+    let result = circuit_handle.gen_witness(circuit_input_signals);
+    assert!(result.is_ok());
+}
+
+fn build_left_array_selector_output(len: u32, index: u32) -> Vec<u8> {
+    let len = len as usize;
+    let index = index as usize;
+    [vec![1; index], vec![0; len - index]].concat()
+}
+
+#[test]
+fn left_array_selector_test() {
+    let circuit_handle = TestCircuitHandle::new("arrays/left_array_selector_test.circom").unwrap();
+    let out_len = 8;
+    for index in 0..=out_len {
+        let output = build_left_array_selector_output(out_len, index);
+        let config = CircuitPaddingConfig::new().max_length("expected_output", out_len as usize);
+        let circuit_input_signals = CircuitInputSignals::new()
+            .u64_input("index", index as u64)
+            .bytes_input("expected_output", &output[..])
+            .pad(&config)
+            .unwrap();
+        let result = circuit_handle.gen_witness(circuit_input_signals);
+        assert!(result.is_ok());
+    }
+}
+
+#[test]
+fn left_array_selector_test_large() {
+    let circuit_handle =
+        TestCircuitHandle::new("arrays/left_array_selector_large_test.circom").unwrap();
+    let out_len = 2000;
+    let mut rng = thread_rng();
+    let index = rng.gen_range(0, 2000);
+    let output = build_left_array_selector_output(out_len, index);
+    let config = CircuitPaddingConfig::new().max_length("expected_output", out_len as usize);
+    let circuit_input_signals = CircuitInputSignals::new()
+        .u64_input("index", index as u64)
+        .bytes_input("expected_output", &output)
+        .pad(&config)
+        .unwrap();
+
+    let result = circuit_handle.gen_witness(circuit_input_signals);
+    assert!(result.is_ok());
+}
+
+#[test]
+fn left_array_selector_test_small() {
+    let circuit_handle =
+        TestCircuitHandle::new("arrays/left_array_selector_small_test.circom").unwrap();
+    let out_len = 1;
+    let index = 0;
+    let output = build_left_array_selector_output(out_len, index);
+    let config = CircuitPaddingConfig::new().max_length("expected_output", out_len as usize);
+    let circuit_input_signals = CircuitInputSignals::new()
+        .u64_input("index", index as u64)
+        .bytes_input("expected_output", &output)
+        .pad(&config)
+        .unwrap();
+
+    let result = circuit_handle.gen_witness(circuit_input_signals);
+    assert!(result.is_ok());
+}
+
+fn build_right_array_selector_output(len: usize, index: usize) -> Vec<u8> {
+    if index < len {
+        [vec![0; index + 1], vec![1; len - index - 1]].concat()
+    } else {
+        vec![0; len]
+    }
+}
+
+#[test]
+fn right_array_selector_test() {
+    let circuit_handle = TestCircuitHandle::new("arrays/right_array_selector_test.circom").unwrap();
+    let out_len = 8;
+    for index in 0..=out_len {
+        let output = build_right_array_selector_output(out_len, index);
+        let config = CircuitPaddingConfig::new().max_length("expected_output", out_len);
+        let circuit_input_signals = CircuitInputSignals::new()
+            .u64_input("index", index as u64)
+            .bytes_input("expected_output", &output[..])
+            .pad(&config)
+            .unwrap();
+        let result = circuit_handle.gen_witness(circuit_input_signals);
+        assert!(result.is_ok());
+    }
+}
+
+#[test]
+fn right_array_selector_test_large() {
+    let circuit_handle =
+        TestCircuitHandle::new("arrays/right_array_selector_large_test.circom").unwrap();
+    let out_len = 2000;
+    let mut rng = rand::thread_rng();
+    let index = rng.gen_range(0, 2001);
+    let output = build_right_array_selector_output(out_len, index);
+    let config = CircuitPaddingConfig::new().max_length("expected_output", out_len);
+    let circuit_input_signals = CircuitInputSignals::new()
+        .u64_input("index", index as u64)
+        .bytes_input("expected_output", &output)
+        .pad(&config)
+        .unwrap();
+
+    let result = circuit_handle.gen_witness(circuit_input_signals);
+    assert!(result.is_ok());
+}
+
+#[test]
+fn right_array_selector_test_small() {
+    let circuit_handle =
+        TestCircuitHandle::new("arrays/right_array_selector_small_test.circom").unwrap();
+    let out_len = 1;
+    let index = 0;
+    let output = build_left_array_selector_output(out_len, index);
+    let config = CircuitPaddingConfig::new().max_length("expected_output", out_len as usize);
+    let circuit_input_signals = CircuitInputSignals::new()
+        .u64_input("index", index as u64)
+        .bytes_input("expected_output", &output)
+        .pad(&config)
+        .unwrap();
+
+    let result = circuit_handle.gen_witness(circuit_input_signals);
+    assert!(result.is_ok());
+}
+
+fn build_single_one_array_output(len: usize, index: usize) -> Vec<u8> {
+    let mut output = vec![0; len];
+
+    if index < len {
+        output[index] = 1;
+    }
+    output
+}
+
+#[test]
+fn single_one_array_test() {
+    let circuit_handle = TestCircuitHandle::new("arrays/single_one_array_test.circom").unwrap();
+    let out_len = 8;
+    for index in 0..=out_len {
+        let output = build_single_one_array_output(out_len, index);
+        let config = CircuitPaddingConfig::new().max_length("expected_output", out_len);
+        let circuit_input_signals = CircuitInputSignals::new()
+            .u64_input("index", index as u64)
+            .bytes_input("expected_output", &output)
+            .pad(&config)
+            .unwrap();
+
+        let result = circuit_handle.gen_witness(circuit_input_signals);
+        assert!(result.is_ok());
+    }
+}
+
+#[test]
+fn single_one_array_large_test() {
+    let circuit_handle =
+        TestCircuitHandle::new("arrays/single_one_array_large_test.circom").unwrap();
+    let out_len = 2000;
+    let mut rng = rand::thread_rng();
+    let index = rng.gen_range(0, 2001);
+    let output = build_single_one_array_output(out_len, index);
+    let config = CircuitPaddingConfig::new().max_length("expected_output", out_len);
+    let circuit_input_signals = CircuitInputSignals::new()
+        .u64_input("index", index as u64)
+        .bytes_input("expected_output", &output)
+        .pad(&config)
+        .unwrap();
+
+    let result = circuit_handle.gen_witness(circuit_input_signals);
+    assert!(result.is_ok());
+}
+
+#[test]
+fn single_one_array_small_test() {
+    let circuit_handle =
+        TestCircuitHandle::new("arrays/single_one_array_small_test.circom").unwrap();
+    let out_len = 1;
+    let index = 0;
+    let output = build_single_one_array_output(out_len, index);
+    let config = CircuitPaddingConfig::new().max_length("expected_output", out_len);
+    let circuit_input_signals = CircuitInputSignals::new()
+        .u64_input("index", index as u64)
+        .bytes_input("expected_output", &output)
+        .pad(&config)
+        .unwrap();
+
+    let result = circuit_handle.gen_witness(circuit_input_signals);
+    assert!(result.is_ok());
+}
+
+#[test]
+fn select_array_value_test() {
+    let circuit_handle = TestCircuitHandle::new("arrays/select_array_value_test.circom").unwrap();
+    let mut rng = rand::thread_rng();
+    let array: Vec<u8> = (0..8).map(|_| rng.gen_range(0, 250)).collect();
+
+    let in_len = array.len();
+    for index in 0..in_len {
+        let output = array[index];
+        let config = CircuitPaddingConfig::new().max_length("array", in_len);
+        let circuit_input_signals = CircuitInputSignals::new()
+            .u64_input("index", index as u64)
+            .bytes_input("array", &array[..])
+            .u64_input("expected_output", output as u64)
+            .pad(&config)
+            .unwrap();
+
+        let result = circuit_handle.gen_witness(circuit_input_signals);
+        assert!(result.is_ok());
+    }
+}
+
+#[test]
+fn select_array_value_large_test() {
+    let circuit_handle =
+        TestCircuitHandle::new("arrays/select_array_value_large_test.circom").unwrap();
+    let mut rng = rand::thread_rng();
+    let input: Vec<u8> = (0..2000).map(|_| rng.gen_range(0, 250)).collect();
+
+    let index = 1567;
+    let in_len = input.len();
+    let output = input[index];
+    let config = CircuitPaddingConfig::new().max_length("array", in_len);
+    let circuit_input_signals = CircuitInputSignals::new()
+        .u64_input("index", index as u64)
+        .bytes_input("array", &input)
+        .u64_input("expected_output", output as u64)
+        .pad(&config)
+        .unwrap();
+
+    let result = circuit_handle.gen_witness(circuit_input_signals);
+    assert!(result.is_ok());
+}
+
+#[test]
+fn select_array_value_small_test() {
+    let circuit_handle =
+        TestCircuitHandle::new("arrays/select_array_value_small_test.circom").unwrap();
+    let mut rng = rand::thread_rng();
+    let array: Vec<u8> = (0..1).map(|_| rng.gen_range(0, 250)).collect();
+    let index = 0;
+    let in_len = array.len();
+    let output = array[index];
+    let config = CircuitPaddingConfig::new().max_length("array", in_len);
+    let circuit_input_signals = CircuitInputSignals::new()
+        .u64_input("index", index as u64)
+        .bytes_input("array", &array)
+        .u64_input("expected_output", output as u64)
+        .pad(&config)
+        .unwrap();
+
+    let result = circuit_handle.gen_witness(circuit_input_signals);
+    assert!(result.is_ok());
+}
+
+#[test]
+#[should_panic]
+fn select_array_value_test_wrong_index() {
+    let circuit_handle = TestCircuitHandle::new("arrays/select_array_value_test.circom").unwrap();
+    let out_len = 8;
+    let index = 8;
+    let mut rng = rand::thread_rng();
+    let output: Vec<u8> = (0..8).map(|_| rng.gen_range(0, 250)).collect();
+
+    let config = CircuitPaddingConfig::new().max_length("expected_output", out_len as usize);
+    let circuit_input_signals = CircuitInputSignals::new()
+        .u64_input("index", index as u64)
+        .bytes_input("expected_output", &output)
+        .pad(&config)
+        .unwrap();
+
+    let result = circuit_handle.gen_witness(circuit_input_signals);
+    assert!(result.is_ok());
+}
+
+fn build_single_neg_one_array_output(len: usize, index: usize) -> Vec<Fr> {
+    let mut output = vec![Fr::zero(); len];
+    if index < len {
+        output[index] = Fr::zero() - Fr::one();
+    }
+    output
+}
+
+#[test]
+fn single_neg_one_array_test() {
+    let circuit_handle = TestCircuitHandle::new("arrays/single_neg_one_array_test.circom").unwrap();
+    let out_len = 8;
+    for index in 0..=out_len {
+        let output = build_single_neg_one_array_output(out_len, index);
+        let config = CircuitPaddingConfig::new().max_length("expected_output", out_len);
+        let circuit_input_signals = CircuitInputSignals::new()
+            .u64_input("index", index as u64)
+            .frs_input("expected_output", &output)
+            .pad(&config)
+            .unwrap();
+
+        let result = circuit_handle.gen_witness(circuit_input_signals);
+        assert!(result.is_ok());
+    }
+}
+
+#[test]
+fn single_neg_one_array_large_test() {
+    let circuit_handle =
+        TestCircuitHandle::new("arrays/single_neg_one_array_large_test.circom").unwrap();
+    let out_len = 2000;
+    let mut rng = rand::thread_rng();
+    let index = rng.gen_range(0, 2001);
+    let output = build_single_neg_one_array_output(out_len, index);
+    let config = CircuitPaddingConfig::new().max_length("expected_output", out_len);
+    let circuit_input_signals = CircuitInputSignals::new()
+        .u64_input("index", index as u64)
+        .frs_input("expected_output", &output)
+        .pad(&config)
+        .unwrap();
+
+    let result = circuit_handle.gen_witness(circuit_input_signals);
+    assert!(result.is_ok());
+}
+
+#[test]
+fn single_neg_one_array_small_test() {
+    let circuit_handle =
+        TestCircuitHandle::new("arrays/single_neg_one_array_small_test.circom").unwrap();
+    let out_len = 1;
+    let index = 0;
+    let output = build_single_neg_one_array_output(out_len, index);
+    let config = CircuitPaddingConfig::new().max_length("expected_output", out_len);
+    let circuit_input_signals = CircuitInputSignals::new()
+        .u64_input("index", index as u64)
+        .frs_input("expected_output", &output)
+        .pad(&config)
+        .unwrap();
+
+    let result = circuit_handle.gen_witness(circuit_input_signals);
+    assert!(result.is_ok());
+}
+
+#[test]
+fn check_substr_inclusion_poly_test() {
+    let circuit_handle =
+        TestCircuitHandle::new("arrays/check_substr_inclusion_poly_test.circom").unwrap();
+
+    let max_str_len = 100;
+    let max_substr_len = 20;
+    let config = CircuitPaddingConfig::new()
+        .max_length("str", max_str_len)
+        .max_length("substr", max_substr_len);
+    let string = "Hello World!";
+    let string_len = string.len();
+    let string_hash = poseidon_bn254::pad_and_hash_string(string, max_str_len).unwrap();
+    for substring_len in 1..string_len {
+        for start_index in 0..string_len - substring_len {
+            let substring = &string[start_index..start_index + substring_len]; //"lo Wor";
+
+            let circuit_input_signals = CircuitInputSignals::new()
+                .str_input("str", string)
+                .str_input("substr", substring)
+                .u64_input("substr_len", substring_len as u64)
+                .u64_input("start_index", start_index as u64)
+                .fr_input("str_hash", string_hash)
+                .pad(&config)
+                .unwrap();
+
+            let result = circuit_handle.gen_witness(circuit_input_signals);
+            assert!(result.is_ok());
+        }
+    }
+}
+
+#[test]
+fn check_substr_inclusion_poly_no_padding_test() {
+    let circuit_handle =
+        TestCircuitHandle::new("arrays/check_substr_inclusion_poly_no_padding_test.circom")
+            .unwrap();
+
+    let string = "Hello World!";
+    let max_str_len = string.len();
+    let max_substr_len = 11;
+    let config = CircuitPaddingConfig::new()
+        .max_length("str", max_str_len)
+        .max_length("substr", max_substr_len);
+    let string_len = string.len();
+    let string_hash = poseidon_bn254::pad_and_hash_string(string, max_str_len).unwrap();
+    let substring_len = 3;
+    for start_index in 0..string_len - substring_len {
+        let substring = &string[start_index..start_index + substring_len]; //"lo Wor";
+
+        let circuit_input_signals = CircuitInputSignals::new()
+            .str_input("str", string)
+            .str_input("substr", substring)
+            .u64_input("substr_len", substring_len as u64)
+            .u64_input("start_index", start_index as u64)
+            .fr_input("str_hash", string_hash)
+            .pad(&config)
+            .unwrap();
+
+        let result = circuit_handle.gen_witness(circuit_input_signals);
+        assert!(result.is_ok());
+    }
+}
+
+#[test]
+fn check_substr_inclusion_poly_same_test() {
+    let circuit_handle =
+        TestCircuitHandle::new("arrays/check_substr_inclusion_poly_test.circom").unwrap();
+
+    let string = "Hello World!";
+    let max_str_len = 100;
+    let max_substr_len = 20;
+    let config = CircuitPaddingConfig::new()
+        .max_length("str", max_str_len)
+        .max_length("substr", max_substr_len);
+    let string_hash = poseidon_bn254::pad_and_hash_string(string, max_str_len).unwrap();
+    let substring = string;
+    let substring_len = substring.len();
+    let start_index = 0;
+
+    let circuit_input_signals = CircuitInputSignals::new()
+        .str_input("str", string)
+        .str_input("substr", substring)
+        .u64_input("substr_len", substring_len as u64)
+        .u64_input("start_index", start_index as u64)
+        .fr_input("str_hash", string_hash)
+        .pad(&config)
+        .unwrap();
+
+    let result = circuit_handle.gen_witness(circuit_input_signals);
+    assert!(result.is_ok());
+}
+
+#[test]
+fn check_substr_inclusion_poly_large_test() {
+    let circuit_handle =
+        TestCircuitHandle::new("arrays/check_substr_inclusion_poly_large_test.circom").unwrap();
+
+    let max_str_len = 2000;
+    let max_substr_len = 1000;
+    let config = CircuitPaddingConfig::new()
+        .max_length("str", max_str_len)
+        .max_length("substr", max_substr_len);
+    let string = "Once upon a midnight dreary, while I pondered, weak and weary,
+Over many a quaint and curious volume of forgotten lore—
+    While I nodded, nearly napping, suddenly there came a tapping,
+As of some one gently rapping, rapping at my chamber door.
+“’Tis some visitor,” I muttered, “tapping at my chamber door—";
+    let string_hash = poseidon_bn254::pad_and_hash_string("dummy string", 30).unwrap(); // Hash is not checked in the substring inclusion protocol and so can be arbitrary here
+    let substring = &string[45..70];
+    let substring_len = substring.len();
+    let start_index = 45;
+
+    let circuit_input_signals = CircuitInputSignals::new()
+        .str_input("str", string)
+        .str_input("substr", substring)
+        .u64_input("substr_len", substring_len as u64)
+        .u64_input("start_index", start_index)
+        .fr_input("str_hash", string_hash)
+        .pad(&config)
+        .unwrap();
+
+    let result = circuit_handle.gen_witness(circuit_input_signals);
+    assert!(result.is_ok());
+}
+
+#[test]
+fn check_substr_inclusion_poly_small_test() {
+    let circuit_handle =
+        TestCircuitHandle::new("arrays/check_substr_inclusion_poly_test.circom").unwrap();
+
+    let max_str_len = 100;
+    let max_substr_len = 20;
+    let config = CircuitPaddingConfig::new()
+        .max_length("str", max_str_len)
+        .max_length("substr", max_substr_len);
+    let string = "a";
+    let string_hash = poseidon_bn254::pad_and_hash_string("dummy string", 30).unwrap(); // Hash is not checked in the substring inclusion protocol and so can be arbitrary here
+    let substring = "a";
+    let substring_len = substring.len();
+    let start_index = 0;
+
+    let circuit_input_signals = CircuitInputSignals::new()
+        .str_input("str", string)
+        .str_input("substr", substring)
+        .u64_input("substr_len", substring_len as u64)
+        .u64_input("start_index", start_index)
+        .fr_input("str_hash", string_hash)
+        .pad(&config)
+        .unwrap();
+
+    let result = circuit_handle.gen_witness(circuit_input_signals);
+    assert!(result.is_ok());
+}
+
+#[test]
+fn check_substr_inclusion_poly_edge_case_test() {
+    let circuit_handle = TestCircuitHandle::new("check_substr_inclusion_poly_test.circom").unwrap();
+
+    let test_str: &'static [u8] = &[
+        4u8, 233, 24, 159, 105, 83, 145, 69, 245, 99, 150, 28, 197, 219, 186, 204, 47, 219, 5, 139,
+        89, 15, 216, 169, 206, 145, 224, 32, 59, 0, 178, 44, 116, 149, 61, 64, 149, 134, 204, 103,
+        18, 57, 87, 168, 144, 26, 173, 48, 219, 125, 64, 211, 131, 159, 76, 29, 154, 118, 163, 18,
+        38, 24, 44, 191, 196, 36, 240, 250, 82, 176, 94, 86, 202, 67, 142, 19, 115, 237, 104, 190,
+        28, 122, 44, 252, 139, 106, 125, 145, 135, 1, 181, 127, 0, 242, 187, 80, 208, 51, 22, 1,
+        194, 159, 218, 16, 33, 113, 220, 214, 209, 168, 195, 83, 177, 149, 74, 20, 7, 28, 124, 175,
+        212, 240, 55, 96, 155, 163, 158, 94, 64, 141, 154, 111, 89, 219, 90, 16, 142, 139, 215,
+        124, 141, 19, 94, 73, 24, 213, 204, 15, 221, 86, 52, 132, 246, 58, 133, 94, 193, 36, 12,
+        232, 37, 209, 171, 118, 85, 13, 154, 180, 124, 188, 81, 235, 254, 114, 114, 101, 75, 161,
+        208, 227, 71, 22, 48, 204, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 192,
+    ];
+    let str_hash = poseidon_bn254::pad_and_hash_bytes_with_len(test_str, 256).unwrap();
+    let substr: &'static [u8] = &[0u8, 0, 0, 0, 0, 0, 5, 192];
+    let start_index = 248;
+
+    let config = CircuitPaddingConfig::new()
+        .max_length("str", 256)
+        .max_length("substr", 8);
+
+    let circuit_input_signals = CircuitInputSignals::new()
+        .bytes_input("str", test_str)
+        .fr_input("str_hash", str_hash)
+        .bytes_input("substr", substr)
+        .usize_input("substr_len", substr.len())
+        .usize_input("start_index", start_index)
+        .pad(&config)
+        .unwrap();
+
+    let result = circuit_handle.gen_witness(circuit_input_signals);
+
+    assert!(result.is_ok());
+}
+
+#[test]
+fn check_substr_inclusion_poly_boolean_test() {
+    let circuit_handle =
+        TestCircuitHandle::new("arrays/check_substr_inclusion_poly_boolean_test.circom").unwrap();
+
+    let max_str_len = 100;
+    let max_substr_len = 20;
+    let config = CircuitPaddingConfig::new()
+        .max_length("str", max_str_len)
+        .max_length("substr", max_substr_len);
+    let string = "Hello World!";
+    let string_len = string.len();
+    let string_hash = poseidon_bn254::pad_and_hash_string(string, max_str_len).unwrap();
+    for substring_len in 1..string_len {
+        for start_index in 0..string_len - substring_len {
+            let substring = &string[start_index..start_index + substring_len];
+
+            let circuit_input_signals = CircuitInputSignals::new()
+                .str_input("str", string)
+                .str_input("substr", substring)
+                .u64_input("substr_len", substring_len as u64)
+                .u64_input("start_index", start_index as u64)
+                .fr_input("str_hash", string_hash)
+                .u64_input("expected_output", 1)
+                .pad(&config)
+                .unwrap();
+
+            let result = circuit_handle.gen_witness(circuit_input_signals);
+            assert!(result.is_ok());
+        }
+    }
+}
+
+#[test]
+fn check_substr_inclusion_poly_no_padding_boolean_test() {
+    let circuit_handle =
+        TestCircuitHandle::new("arrays/check_substr_inclusion_poly_boolean_no_padding_test.circom")
+            .unwrap();
+
+    let string = "Hello World!";
+    let max_str_len = string.len();
+    let max_substr_len = 11;
+    let config = CircuitPaddingConfig::new()
+        .max_length("str", max_str_len)
+        .max_length("substr", max_substr_len);
+    let string_len = string.len();
+    let string_hash = poseidon_bn254::pad_and_hash_string(string, max_str_len).unwrap();
+    let substring_len = 3;
+    for start_index in 0..string_len - substring_len {
+        let substring = &string[start_index..start_index + substring_len]; //"lo Wor";
+
+        let circuit_input_signals = CircuitInputSignals::new()
+            .str_input("str", string)
+            .str_input("substr", substring)
+            .u64_input("substr_len", substring_len as u64)
+            .u64_input("start_index", start_index as u64)
+            .fr_input("str_hash", string_hash)
+            .u64_input("expected_output", 1)
+            .pad(&config)
+            .unwrap();
+
+        let result = circuit_handle.gen_witness(circuit_input_signals);
+        assert!(result.is_ok());
+    }
+}
+
+#[test]
+fn check_substr_inclusion_poly_same_boolean_test() {
+    let circuit_handle =
+        TestCircuitHandle::new("arrays/check_substr_inclusion_poly_boolean_test.circom").unwrap();
+
+    let string = "Hello World!";
+    let max_str_len = 100;
+    let max_substr_len = 20;
+    let config = CircuitPaddingConfig::new()
+        .max_length("str", max_str_len)
+        .max_length("substr", max_substr_len);
+    let string_hash = poseidon_bn254::pad_and_hash_string(string, max_str_len).unwrap();
+    let substring = string;
+    let substring_len = substring.len();
+    let start_index = 0;
+
+    let circuit_input_signals = CircuitInputSignals::new()
+        .str_input("str", string)
+        .str_input("substr", substring)
+        .u64_input("substr_len", substring_len as u64)
+        .u64_input("start_index", start_index as u64)
+        .fr_input("str_hash", string_hash)
+        .u64_input("expected_output", 1)
+        .pad(&config)
+        .unwrap();
+
+    let result = circuit_handle.gen_witness(circuit_input_signals);
+    assert!(result.is_ok());
+}
+
+#[test]
+fn check_substr_inclusion_poly_large_boolean_test() {
+    let circuit_handle =
+        TestCircuitHandle::new("arrays/check_substr_inclusion_poly_boolean_large_test.circom")
+            .unwrap();
+
+    let max_str_len = 2000;
+    let max_substr_len = 1000;
+    let config = CircuitPaddingConfig::new()
+        .max_length("str", max_str_len)
+        .max_length("substr", max_substr_len);
+    let string = "Once upon a midnight dreary, while I pondered, weak and weary,
+Over many a quaint and curious volume of forgotten lore—
+    While I nodded, nearly napping, suddenly there came a tapping,
+As of some one gently rapping, rapping at my chamber door.
+“’Tis some visitor,” I muttered, “tapping at my chamber door—";
+    let string_hash = poseidon_bn254::pad_and_hash_string("dummy string", 30).unwrap(); // Hash is not checked in the substring inclusion protocol and so can be arbitrary here
+    let substring = &string[45..70];
+    let substring_len = substring.len();
+    let start_index = 45;
+
+    let circuit_input_signals = CircuitInputSignals::new()
+        .str_input("str", string)
+        .str_input("substr", substring)
+        .u64_input("substr_len", substring_len as u64)
+        .u64_input("start_index", start_index)
+        .fr_input("str_hash", string_hash)
+        .u64_input("expected_output", 1)
+        .pad(&config)
+        .unwrap();
+
+    let result = circuit_handle.gen_witness(circuit_input_signals);
+    assert!(result.is_ok());
+}
+
+#[test]
+fn check_substr_inclusion_poly_small_boolean_test() {
+    let circuit_handle =
+        TestCircuitHandle::new("arrays/check_substr_inclusion_poly_boolean_test.circom").unwrap();
+
+    let max_str_len = 100;
+    let max_substr_len = 20;
+    let config = CircuitPaddingConfig::new()
+        .max_length("str", max_str_len)
+        .max_length("substr", max_substr_len);
+    let string = "a";
+    let string_hash = poseidon_bn254::pad_and_hash_string("dummy string", 30).unwrap(); // Hash is not checked in the substring inclusion protocol and so can be arbitrary here
+    let substring = "a";
+    let substring_len = substring.len();
+    let start_index = 0;
+
+    let circuit_input_signals = CircuitInputSignals::new()
+        .str_input("str", string)
+        .str_input("substr", substring)
+        .u64_input("substr_len", substring_len as u64)
+        .u64_input("start_index", start_index)
+        .fr_input("str_hash", string_hash)
+        .u64_input("expected_output", 1)
+        .pad(&config)
+        .unwrap();
+
+    let result = circuit_handle.gen_witness(circuit_input_signals);
+    assert!(result.is_ok());
+}
+
+#[test]
+fn concatenation_check_test() {
+    let circuit_handle = TestCircuitHandle::new("arrays/concatenation_check_test.circom").unwrap();
+
+    let max_full_str_len = 100;
+    let max_left_str_len = 70;
+    let max_right_str_len = 70;
+    let config = CircuitPaddingConfig::new()
+        .max_length("full_string", max_full_str_len)
+        .max_length("left", max_left_str_len)
+        .max_length("right", max_right_str_len);
+    let full_string = "Hello World!";
+    let str_len = full_string.len();
+    // Subcircuit fails if the left string is empty
+    for sep_index in 1..str_len {
+        let left_string = &full_string[0..sep_index];
+        let right_string = &full_string[sep_index..full_string.len()];
+        let left_len = left_string.len();
+        let right_len = right_string.len();
+        let circuit_input_signals = CircuitInputSignals::new()
+            .str_input("full_string", full_string)
+            .str_input("left", left_string)
+            .str_input("right", right_string)
+            .u64_input("left_len", left_len as u64)
+            .u64_input("right_len", right_len as u64)
+            .pad(&config)
+            .unwrap();
+
+        let result = circuit_handle.gen_witness(circuit_input_signals);
+        assert!(result.is_ok());
+    }
+}
+
+#[test]
+#[should_panic]
+fn concatenation_check_left_len_wrong_test() {
+    let circuit_handle = TestCircuitHandle::new("arrays/concatenation_check_test.circom").unwrap();
+
+    let max_full_str_len = 100;
+    let max_left_str_len = 70;
+    let max_right_str_len = 70;
+    let config = CircuitPaddingConfig::new()
+        .max_length("full_string", max_full_str_len)
+        .max_length("left", max_left_str_len)
+        .max_length("right", max_right_str_len);
+    let full_string = "Hello World!";
+    let str_len = full_string.len();
+    let sep_index = 3;
+    let left_string = &full_string[0..sep_index];
+    let right_string = &full_string[sep_index..str_len];
+    let left_len = 72;
+    let right_len = right_string.len();
+    let circuit_input_signals = CircuitInputSignals::new()
+        .str_input("full_string", full_string)
+        .str_input("left", left_string)
+        .str_input("right", right_string)
+        .u64_input("left_len", left_len as u64)
+        .u64_input("right_len", right_len as u64)
+        .pad(&config)
+        .unwrap();
+
+    let result = circuit_handle.gen_witness(circuit_input_signals);
+    assert!(result.is_ok());
+}
+
+#[test]
+#[should_panic]
+fn concatenation_check_left_string_wrong_test() {
+    let circuit_handle = TestCircuitHandle::new("arrays/concatenation_check_test.circom").unwrap();
+
+    let max_full_str_len = 100;
+    let max_left_str_len = 70;
+    let max_right_str_len = 70;
+    let config = CircuitPaddingConfig::new()
+        .max_length("full_string", max_full_str_len)
+        .max_length("left", max_left_str_len)
+        .max_length("right", max_right_str_len);
+    let full_string = "Hello World!";
+    let str_len = full_string.len();
+    let sep_index = 3;
+    let left_string = &full_string[0..sep_index - 1];
+    let right_string = &full_string[sep_index..str_len];
+    let left_len = left_string.len();
+    let right_len = right_string.len();
+    let circuit_input_signals = CircuitInputSignals::new()
+        .str_input("full_string", full_string)
+        .str_input("left", left_string)
+        .str_input("right", right_string)
+        .u64_input("left_len", left_len as u64)
+        .u64_input("right_len", right_len as u64)
+        .pad(&config)
+        .unwrap();
+
+    let result = circuit_handle.gen_witness(circuit_input_signals);
+    assert!(result.is_ok());
+}
+
+#[test]
+#[should_panic]
+fn concatenation_check_right_string_wrong_test() {
+    let circuit_handle = TestCircuitHandle::new("arrays/concatenation_check_test.circom").unwrap();
+
+    let max_full_str_len = 100;
+    let max_left_str_len = 70;
+    let max_right_str_len = 70;
+    let config = CircuitPaddingConfig::new()
+        .max_length("full_string", max_full_str_len)
+        .max_length("left", max_left_str_len)
+        .max_length("right", max_right_str_len);
+    let full_string = "Hello World!";
+    let str_len = full_string.len();
+    // Subcircuit fails if the left string is empty
+    let sep_index = 3;
+    let left_string = &full_string[0..sep_index];
+    let right_string = &full_string[sep_index..str_len - 1];
+    let left_len = left_string.len();
+    let right_len = right_string.len();
+    let circuit_input_signals = CircuitInputSignals::new()
+        .str_input("full_string", full_string)
+        .str_input("left", left_string)
+        .str_input("right", right_string)
+        .u64_input("left_len", left_len as u64)
+        .u64_input("right_len", right_len as u64)
+        .pad(&config)
+        .unwrap();
+
+    let result = circuit_handle.gen_witness(circuit_input_signals);
+    assert!(result.is_ok());
+}
+
+#[test]
+fn concatenation_check_small_test() {
+    let circuit_handle =
+        TestCircuitHandle::new("arrays/concatenation_check_small_test.circom").unwrap();
+
+    let max_full_str_len = 2;
+    let max_left_str_len = 1;
+    let max_right_str_len = 1;
+    let config = CircuitPaddingConfig::new()
+        .max_length("full_string", max_full_str_len)
+        .max_length("left", max_left_str_len)
+        .max_length("right", max_right_str_len);
+    let full_string = "ab";
+    let str_len = full_string.len();
+    let sep_index = 1;
+    let left_string = &full_string[0..sep_index];
+    let right_string = &full_string[sep_index..str_len];
+    let left_len = left_string.len();
+    let right_len = right_string.len();
+    let circuit_input_signals = CircuitInputSignals::new()
+        .str_input("full_string", full_string)
+        .str_input("left", left_string)
+        .str_input("right", right_string)
+        .u64_input("left_len", left_len as u64)
+        .u64_input("right_len", right_len as u64)
+        .pad(&config)
+        .unwrap();
+
+    let result = circuit_handle.gen_witness(circuit_input_signals);
+    assert!(result.is_ok());
+}
+
+#[test]
+fn concatenation_check_large_test() {
+    let circuit_handle =
+        TestCircuitHandle::new("arrays/concatenation_check_large_test.circom").unwrap();
+
+    let max_full_str_len = 1600;
+    let max_left_str_len = 1000;
+    let max_right_str_len = 1000;
+    let config = CircuitPaddingConfig::new()
+        .max_length("full_string", max_full_str_len)
+        .max_length("left", max_left_str_len)
+        .max_length("right", max_right_str_len);
+    let full_string = "Once upon a midnight dreary, while I pondered, weak and weary,
+    Over many a quaint and curious volume of forgotten lore—
+    While I nodded, nearly napping, suddenly there came a tapping,
+    As of some one gently rapping, rapping at my chamber door.
+    “’Tis some visitor,” I muttered, “tapping at my chamber door—";
+    let str_len = full_string.len();
+    let sep_index = 31;
+    let left_string = &full_string[0..sep_index];
+    let right_string = &full_string[sep_index..str_len];
+    let left_len = left_string.len();
+    let right_len = right_string.len();
+    let circuit_input_signals = CircuitInputSignals::new()
+        .str_input("full_string", full_string)
+        .str_input("left", left_string)
+        .str_input("right", right_string)
+        .u64_input("left_len", left_len as u64)
+        .u64_input("right_len", right_len as u64)
+        .pad(&config)
+        .unwrap();
+
+    let result = circuit_handle.gen_witness(circuit_input_signals);
+    assert!(result.is_ok());
+}
+
+#[test]
+fn check_are_ascii_digits_test() {
+    let circuit_handle =
+        TestCircuitHandle::new("arrays/check_are_ascii_digits_test.circom").unwrap();
+    let max_input_len = 20;
+
+    let mut rng = rand::thread_rng();
+    let digits: Vec<u8> = (0..5).map(|_| rng.gen_range(0, 9)).collect();
+    let mut input_arr = digits_to_ascii_digits(digits.to_vec());
+    let mut not_digits: Vec<u8> = (0..8 - 5).map(|_| rng.gen_range(0, 250)).collect();
+    input_arr.append(&mut not_digits);
+
+    let len = 5;
+    let config = CircuitPaddingConfig::new().max_length("in", max_input_len);
+    let circuit_input_signals = CircuitInputSignals::new()
+        .u64_input("len", len)
+        .bytes_input("in", &input_arr)
+        .pad(&config)
+        .unwrap();
+
+    let result = circuit_handle.gen_witness(circuit_input_signals);
+    assert!(result.is_ok());
+}
+
+#[test]
+fn check_are_ascii_digits_max_len_test() {
+    let circuit_handle =
+        TestCircuitHandle::new("arrays/check_are_ascii_digits_max_len_test.circom").unwrap();
+    let max_input_len = 8;
+    let mut rng = rand::thread_rng();
+    let digits: Vec<u8> = (0..8).map(|_| rng.gen_range(0, 9)).collect();
+    let input_arr = digits_to_ascii_digits(digits.to_vec());
+    let len = input_arr.len();
+    let config = CircuitPaddingConfig::new().max_length("in", max_input_len);
+    let circuit_input_signals = CircuitInputSignals::new()
+        .u64_input("len", len as u64)
+        .bytes_input("in", &input_arr)
+        .pad(&config)
+        .unwrap();
+
+    let result = circuit_handle.gen_witness(circuit_input_signals);
+    assert!(result.is_ok());
+}
+
+#[test]
+fn check_are_ascii_digits_small_test() {
+    let circuit_handle =
+        TestCircuitHandle::new("arrays/check_are_ascii_digits_test.circom").unwrap();
+    let max_input_len = 20;
+    let mut rng = rand::thread_rng();
+    let digits: Vec<u8> = (0..1).map(|_| rng.gen_range(0, 9)).collect();
+    let input_arr = digits_to_ascii_digits(digits.to_vec());
+    let len = 1;
+    let config = CircuitPaddingConfig::new().max_length("in", max_input_len);
+    let circuit_input_signals = CircuitInputSignals::new()
+        .u64_input("len", len)
+        .bytes_input("in", &input_arr)
+        .pad(&config)
+        .unwrap();
+
+    let result = circuit_handle.gen_witness(circuit_input_signals);
+    assert!(result.is_ok());
+}
+
+#[test]
+fn check_are_ascii_digits_large_test() {
+    let circuit_handle =
+        TestCircuitHandle::new("arrays/check_are_ascii_digits_large_test.circom").unwrap();
+    let max_input_len = 2000;
+    let mut rng = rand::thread_rng();
+    let digits: Vec<u8> = (0..1523).map(|_| rng.gen_range(0, 9)).collect();
+    let input_arr = digits_to_ascii_digits(digits.to_vec());
+
+    let len = input_arr.len();
+    let config = CircuitPaddingConfig::new().max_length("in", max_input_len);
+    let circuit_input_signals = CircuitInputSignals::new()
+        .u64_input("len", len as u64)
+        .bytes_input("in", &input_arr)
+        .pad(&config)
+        .unwrap();
+
+    let result = circuit_handle.gen_witness(circuit_input_signals);
+    assert!(result.is_ok());
+}
+
+fn digits_to_ascii_digits(digits: Vec<u8>) -> Vec<u8> {
+    let mut result = digits.clone();
+    for digit in &mut result {
+        *digit += 48;
+    }
+    result
+}
+
+#[test]
+fn ascii_digits_to_field_test() {
+    let circuit_handle =
+        TestCircuitHandle::new("arrays/ascii_digits_to_field_test.circom").unwrap();
+    let max_input_len = 20;
+    let digits = [2, 1, 2, 4, 7];
+
+    let ascii_digits = digits_to_ascii_digits(digits.to_vec());
+    let len = 5;
+    let expected_output = 21247;
+    let config = CircuitPaddingConfig::new().max_length("digits", max_input_len);
+    let circuit_input_signals = CircuitInputSignals::new()
+        .u64_input("len", len)
+        .bytes_input("digits", &ascii_digits)
+        .u64_input("expected_output", expected_output)
+        .pad(&config)
+        .unwrap();
+
+    let result = circuit_handle.gen_witness(circuit_input_signals);
+    assert!(result.is_ok());
+}
+
+#[test]
+fn ascii_digits_to_field_small_test() {
+    let circuit_handle =
+        TestCircuitHandle::new("arrays/ascii_digits_to_field_small_test.circom").unwrap();
+    let max_input_len = 2;
+    let digits = [7, 89];
+    let ascii_digits = digits_to_ascii_digits(digits.to_vec());
+    let len = 1;
+    let expected_output = 7;
+    let config = CircuitPaddingConfig::new().max_length("digits", max_input_len);
+    let circuit_input_signals = CircuitInputSignals::new()
+        .u64_input("len", len)
+        .bytes_input("digits", &ascii_digits)
+        .u64_input("expected_output", expected_output)
+        .pad(&config)
+        .unwrap();
+
+    let result = circuit_handle.gen_witness(circuit_input_signals);
+    assert!(result.is_ok());
+}
+
+#[test]
+fn ascii_digits_to_field_large_test() {
+    let circuit_handle =
+        TestCircuitHandle::new("arrays/ascii_digits_to_field_large_test.circom").unwrap();
+    let max_input_len = 2000;
+    // let mut rng = rand::thread_rng();
+    // let digits: Vec<u8> = (0..19).map(|_| rng.gen_range(0, 9)).collect();
+
+    let digits = [
+        2, 1, 2, 4, 7, 4, 8, 0, 1, 9, 2, 1, 8, 3, 6, 7, 4, 1, 5, 14, 41, 180, 1, 31, 47, 2, 3, 6,
+        7, 31, 35,
+    ];
+    let ascii_digits = digits_to_ascii_digits(digits.to_vec());
+
+    let len = 19;
+    let expected_output = 2124748019218367415;
+    let config = CircuitPaddingConfig::new().max_length("digits", max_input_len);
+    let circuit_input_signals = CircuitInputSignals::new()
+        .u64_input("len", len)
+        .bytes_input("digits", &ascii_digits)
+        .u64_input("expected_output", expected_output)
+        .pad(&config)
+        .unwrap();
+
+    let result = circuit_handle.gen_witness(circuit_input_signals);
+    assert!(result.is_ok());
+}
+
+#[test]
+#[should_panic]
+fn ascii_digits_to_field_not_ascii_digits_test() {
+    let circuit_handle =
+        TestCircuitHandle::new("arrays/ascii_digits_to_field_test.circom").unwrap();
+    let max_input_len = 20;
+    let digits = [2, 1, 24, 4, 7];
+    let ascii_digits = digits_to_ascii_digits(digits.to_vec());
+    let len = 5;
+    let expected_output = 21247;
+    let config = CircuitPaddingConfig::new().max_length("digits", max_input_len);
+    let circuit_input_signals = CircuitInputSignals::new()
+        .u64_input("len", len)
+        .bytes_input("digits", &ascii_digits)
+        .u64_input("expected_output", expected_output)
+        .pad(&config)
+        .unwrap();
+
+    let result = circuit_handle.gen_witness(circuit_input_signals);
+    assert!(result.is_ok());
+}
diff --git a/keyless/circuit/src/base64.rs b/keyless/circuit/src/base64.rs
new file mode 100644
index 0000000000000..7464b551a4854
--- /dev/null
+++ b/keyless/circuit/src/base64.rs
@@ -0,0 +1,159 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::TestCircuitHandle;
+use aptos_keyless_common::input_processing::{
+    circuit_input_signals::CircuitInputSignals, config::CircuitPaddingConfig,
+};
+use itertools::*;
+
+fn expected_decoded(b64: &str) -> Vec<u8> {
+    base64::decode_config(b64, base64::URL_SAFE_NO_PAD).unwrap()
+}
+
+fn expected_lookup(b64_char: u8) -> u8 {
+    match b64_char {
+        b'A'..=b'Z' => b64_char - b'A',
+        b'a'..=b'z' => b64_char - b'a' + 26,
+        b'0'..=b'9' => b64_char - b'0' + 52,
+        b'-' => 62,
+        b'_' => 63,
+        _ => panic!("Tried to lookup a non-base64 char."),
+    }
+}
+
+#[test]
+fn base64_decode_test() {
+    let circuit_handle = TestCircuitHandle::new("base64_decode_test.circom").unwrap();
+
+    let jwt_payload = "eyJpc3MiOiJ0ZXN0Lm9pZGMucHJvdmlkZXIiLCJhenAiOiI1MTEyNzY0NTY4ODAtaTdpNDc4N2MxODYzZGFtdG82ODk5dHM5ODlqMmUzNXIuYXBwcy5nb29nbGV1c2VyY29udGVudC5jb20iLCJhdWQiOiI1MTEyNzY0NTY4ODAtaTdpNDc4N2MxODYzZGFtdG82ODk5dHM5ODlqMmUzNXIuYXBwcy5nb29nbGV1c2VyY29udGVudC5jb20iLCJzdWIiOiIxMDI5MDQ2MzAxNzE1OTI1MjA1OTIiLCJlbWFpbCI6Imhlcm8xMjAwMDkxQGdtYWlsLmNvbSIsImVtYWlsX3ZlcmlmaWVkIjp0cnVlLCJub25jZSI6IjEyNzcyMTIzMTUwODA5NDk2ODYwMTkzNDU3OTc2OTM3MTgyOTY0Mjk3MjgzNjMzNzA1ODcyMzkxNTM0OTQ2ODY2NzE5NjgxOTA0MzExIiwibmJmIjoxNzExNTUyMzMwLCJuYW1lIjoi44Kz44Oz44OJ44Km44OP44Or44KtIiwicGljdHVyZSI6Imh0dHBzOi8vbGgzLmdvb2dsZXVzZXJjb250ZW50LmNvbS9hL0FDZzhvY0lNWmZJa05XR1JCVEQ5MjR4bF9pZWZwTWNjTGd1d2RNSWluTVB6YWo1TDRRPXM5Ni1jIiwiZ2l2ZW5fbmFtZSI6IuODq-OCrSIsImZhbWlseV9uYW1lIjoi44Kz44Oz44OJ44KmIiwiaWF0IjoxNzExNTUyNjMwLCJleHAiOjE5MTE1NTYyMzB9";
+
+    let ascii_jwt_payload = expected_decoded(jwt_payload);
+
+    let max_jwt_payload_len = 192 * 8 - 64;
+    let max_ascii_jwt_payload_len = 3 * max_jwt_payload_len / 4;
+    let config = CircuitPaddingConfig::new()
+        .max_length("jwt_payload", max_jwt_payload_len)
+        .max_length("ascii_jwt_payload", max_ascii_jwt_payload_len);
+
+    let circuit_input_signals = CircuitInputSignals::new()
+        .str_input("jwt_payload", jwt_payload)
+        .bytes_input("ascii_jwt_payload", &ascii_jwt_payload)
+        .pad(&config)
+        .unwrap();
+    let result = circuit_handle.gen_witness(circuit_input_signals);
+    println!("result={:?}", result);
+    assert!(result.is_ok());
+}
+
+#[test]
+fn base64_lookup_test() {
+    let circuit_handle = TestCircuitHandle::new("base64_lookup_test.circom").unwrap();
+
+    let base64_chars = (b'A'..=b'Z')
+        .chain(b'a'..=b'z')
+        .chain(b'0'..=b'9')
+        .chain([b'-', b'_']);
+
+    for in_b64_char in base64_chars {
+        let config = CircuitPaddingConfig::new();
+
+        let circuit_input_signals = CircuitInputSignals::new()
+            .byte_input("in_b64_char", in_b64_char)
+            .byte_input("out_num", expected_lookup(in_b64_char))
+            .pad(&config)
+            .unwrap();
+
+        let result = circuit_handle.gen_witness(circuit_input_signals);
+        assert!(result.is_ok());
+    }
+}
+
+#[test]
+fn base64_decode_test_short_all_dashes() {
+    let circuit_handle = TestCircuitHandle::new("base64_decode_test_short.circom").unwrap();
+
+    let jwt_payload = "----";
+
+    let ascii_jwt_payload = expected_decoded(jwt_payload);
+
+    let max_jwt_payload_len = 4;
+    let max_ascii_jwt_payload_len = 3 * max_jwt_payload_len / 4;
+    let config = CircuitPaddingConfig::new()
+        .max_length("jwt_payload", max_jwt_payload_len)
+        .max_length("ascii_jwt_payload", max_ascii_jwt_payload_len);
+
+    let circuit_input_signals = CircuitInputSignals::new()
+        .str_input("jwt_payload", jwt_payload)
+        .bytes_input("ascii_jwt_payload", &ascii_jwt_payload)
+        .pad(&config)
+        .unwrap();
+
+    let result = circuit_handle.gen_witness(circuit_input_signals);
+    assert!(result.is_ok());
+}
+
+#[test]
+fn base64_decode_test_short_three_chars() {
+    let circuit_handle = TestCircuitHandle::new("base64_decode_test_short.circom").unwrap();
+
+    // Last character must have ascii encoding with two trailing zeros, since we are encoding
+    // 16 bits
+    let jwt_payload = "--E";
+
+    let ascii_jwt_payload = expected_decoded(jwt_payload);
+
+    let max_jwt_payload_len = 4;
+    let max_ascii_jwt_payload_len = 3 * max_jwt_payload_len / 4;
+    let config = CircuitPaddingConfig::new()
+        .max_length("jwt_payload", max_jwt_payload_len)
+        .max_length("ascii_jwt_payload", max_ascii_jwt_payload_len);
+
+    let circuit_input_signals = CircuitInputSignals::new()
+        .str_input("jwt_payload", jwt_payload)
+        .bytes_input("ascii_jwt_payload", &ascii_jwt_payload)
+        .pad(&config)
+        .unwrap();
+
+    let result = circuit_handle.gen_witness(circuit_input_signals);
+    assert!(result.is_ok());
+}
+
+// ignoring b/c takes forever
+#[test]
+#[ignore]
+fn base64_decode_test_short_exhaustive() {
+    let circuit_handle = TestCircuitHandle::new("base64_decode_test_short.circom").unwrap();
+
+    let base64_chars = ('A'..='Z')
+        .chain('a'..='z')
+        .chain('0'..='9')
+        .chain(['-', '_']);
+
+    let exhaustive_iter = (0..=3)
+        .map(|_| base64_chars.clone())
+        .multi_cartesian_product()
+        .map(|s| s.into_iter().collect::<String>());
+    //.collect();
+
+    for jwt_payload in exhaustive_iter {
+        println!("{jwt_payload}");
+
+        let ascii_jwt_payload = expected_decoded(&jwt_payload);
+
+        let max_jwt_payload_len = 4;
+        let max_ascii_jwt_payload_len = 3 * max_jwt_payload_len / 4;
+        let config = CircuitPaddingConfig::new()
+            .max_length("jwt_payload", max_jwt_payload_len)
+            .max_length("ascii_jwt_payload", max_ascii_jwt_payload_len);
+
+        let circuit_input_signals = CircuitInputSignals::new()
+            .str_input("jwt_payload", &jwt_payload)
+            .bytes_input("ascii_jwt_payload", &ascii_jwt_payload)
+            .pad(&config)
+            .unwrap();
+
+        let result = circuit_handle.gen_witness(circuit_input_signals);
+        assert!(result.is_ok());
+    }
+}
diff --git a/keyless/circuit/src/bigint.rs b/keyless/circuit/src/bigint.rs
new file mode 100644
index 0000000000000..827cabbabce5f
--- /dev/null
+++ b/keyless/circuit/src/bigint.rs
@@ -0,0 +1,138 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::TestCircuitHandle;
+use aptos_keyless_common::input_processing::{
+    circuit_input_signals::CircuitInputSignals, config::CircuitPaddingConfig,
+};
+use aptos_logger::info;
+use rand::{thread_rng, Rng};
+
+/// Given a non-negative integer `x`, generate a non-negative integer `y` that satisfies `y < x`.
+/// `x` and `y` are both encoded to byte array with the most significant byte first.
+fn rand_big<R: Rng>(rng: &mut R, x_bytes_be: &[u8]) -> Vec<u8> {
+    let n = x_bytes_be.len();
+    let non_zero_idxs: Vec<usize> = x_bytes_be
+        .iter()
+        .copied()
+        .enumerate()
+        .filter_map(|(idx, byte)| if byte == 0 { None } else { Some(idx) })
+        .collect();
+    let diff_idx = non_zero_idxs[rng.gen_range(0, non_zero_idxs.len())]; // will be the first byte in y that's smaller than the same position in x.
+
+    let y_diff_byte = rng.gen_range(0, x_bytes_be[diff_idx]);
+
+    let mut random_bytes = vec![0; n - (diff_idx + 1)];
+    rng.fill_bytes(random_bytes.as_mut_slice());
+
+    [
+        x_bytes_be[0..diff_idx].to_vec(),
+        vec![y_diff_byte],
+        random_bytes,
+    ]
+    .concat()
+}
+
+fn bytes_le_into_limbs_le(mut bytes: Vec<u8>) -> Vec<u64> {
+    let num_bytes = bytes.len();
+    let num_limbs = num_bytes.div_ceil(8);
+    let num_pad_zeros = num_limbs * 8 - num_bytes;
+    bytes.extend(vec![0; num_pad_zeros]);
+    let mut ret = vec![0; num_limbs];
+    for i in 0..num_limbs {
+        let arr = <[u8; 8]>::try_from(bytes[i * 8..(i + 1) * 8].to_vec()).unwrap();
+        ret[i] = u64::from_le_bytes(arr);
+    }
+    ret
+}
+
+/// Sample a random integer in range [0, 2^2048) and return its big-endian byte representation.
+/// Some special ranges get higher weight.
+fn sample_big_be<R: Rng>(rng: &mut R) -> Vec<u8> {
+    let byte_len: usize = {
+        let sample = rng.gen_range(0.0, 1.0);
+        if sample < 0.2 {
+            rng.gen_range(1, 9)
+        } else if sample < 0.4 {
+            rng.gen_range(248, 257)
+        } else {
+            rng.gen_range(1, 33) * 8
+        }
+    };
+    let mut ret: Vec<u8> = vec![0; byte_len];
+    rng.fill_bytes(ret.as_mut_slice());
+    if let Some(byte) = ret.first_mut() {
+        *byte = rng.gen_range(0, 255) + 1;
+    }
+    ret
+}
+
+fn common<F: FnMut() -> (Vec<u8>, Vec<u8>)>(mut a_b_provider: F, expected_output: bool) {
+    let circuit = TestCircuitHandle::new("bigint/big_less_than_test.circom").unwrap();
+    let num_iterations = std::env::var("NUM_ITERATIONS")
+        .unwrap_or("100".to_string())
+        .parse::<usize>()
+        .unwrap_or(100);
+    for i in 0..num_iterations {
+        info!("Iteration {i} starts. Generate big numbers.");
+        let (a_bytes_be, b_bytes_be) = a_b_provider();
+        println!("a_hex={}", hex::encode(&a_bytes_be));
+        println!("b_hex={}", hex::encode(&b_bytes_be));
+        let a_bytes_le: Vec<u8> = a_bytes_be.into_iter().rev().collect();
+        let a_limbs_le = bytes_le_into_limbs_le(a_bytes_le);
+        let b_bytes_le: Vec<u8> = b_bytes_be.into_iter().rev().collect();
+        let b_limbs_le = bytes_le_into_limbs_le(b_bytes_le);
+
+        let config = CircuitPaddingConfig::new()
+            .max_length("a", 32)
+            .max_length("b", 32);
+        let circuit_input_signals = CircuitInputSignals::new()
+            .limbs_input("a", a_limbs_le.as_slice())
+            .limbs_input("b", b_limbs_le.as_slice())
+            .bool_input("expected_output", expected_output)
+            .pad(&config)
+            .unwrap();
+        let result = circuit.gen_witness(circuit_input_signals);
+        println!("result={:?}", result);
+        assert!(result.is_ok());
+    }
+}
+
+#[test]
+fn big_less_than_should_return_1_if_a_lt_b() {
+    let mut rng = thread_rng();
+    common(
+        || {
+            let b_bytes_be = sample_big_be(&mut rng);
+            let a_bytes_be = rand_big(&mut rng, b_bytes_be.as_slice());
+            (a_bytes_be, b_bytes_be)
+        },
+        true,
+    );
+}
+
+#[test]
+fn big_less_than_should_return_0_if_a_gt_b() {
+    let mut rng = thread_rng();
+    common(
+        || {
+            let a_bytes_be = sample_big_be(&mut rng);
+            let b_bytes_be = rand_big(&mut rng, a_bytes_be.as_slice());
+            (a_bytes_be, b_bytes_be)
+        },
+        false,
+    );
+}
+
+#[test]
+fn big_less_than_should_return_0_if_a_eq_b() {
+    let mut rng = thread_rng();
+    common(
+        || {
+            let b_bytes_be = sample_big_be(&mut rng);
+            let a_bytes_be = b_bytes_be.clone();
+            (a_bytes_be, b_bytes_be)
+        },
+        false,
+    );
+}
diff --git a/keyless/circuit/src/hash_to_field.rs b/keyless/circuit/src/hash_to_field.rs
new file mode 100644
index 0000000000000..98e43cbfbb18f
--- /dev/null
+++ b/keyless/circuit/src/hash_to_field.rs
@@ -0,0 +1,245 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::TestCircuitHandle;
+use aptos_crypto::{
+    poseidon_bn254::{
+        keyless::{pad_and_hash_limbs_with_len, BYTES_PACKED_PER_SCALAR, LIMBS_PACKED_PER_SCALAR},
+        pad_and_hash_bytes_no_len, pad_and_hash_bytes_with_len, MAX_NUM_INPUT_SCALARS,
+    },
+    test_utils::random_bytes,
+};
+use aptos_keyless_common::input_processing::{
+    circuit_input_signals::CircuitInputSignals, config::CircuitPaddingConfig,
+};
+use ark_bn254::Fr;
+use ark_ff::Field;
+use rand::{thread_rng, Rng};
+
+#[test]
+fn hash_bytes_to_field_with_len() {
+    let circuit_src_template = r#"
+pragma circom 2.1.3;
+
+include "helpers/hashtofield.circom";
+
+template hash_bytes_to_field_with_len_test(max_len) {
+    signal input in[max_len];
+    signal input len;
+    signal input expected_output;
+    component c1 = HashBytesToFieldWithLen(max_len);
+    c1.in <== in;
+    c1.len <== len;
+    expected_output === c1.hash;
+}
+
+component main = hash_bytes_to_field_with_len_test(__MAX_LEN__);
+"#;
+
+    // Have to save 1 scalar slot for the length.
+    let max_supported_byte_len = (MAX_NUM_INPUT_SCALARS - 1) * BYTES_PACKED_PER_SCALAR;
+
+    let mut rng = thread_rng();
+    let num_iterations = std::env::var("NUM_ITERATIONS")
+        .unwrap_or("10".to_string())
+        .parse::<usize>()
+        .unwrap_or(10);
+
+    //TODO: hardcode some interesting circuit dimensions that's widely used in keyless.
+
+    for i in 0..num_iterations {
+        println!();
+        println!("Iteration {} starts.", i);
+        let num_bytes_circuit_capacity: usize = rng.gen_range(1, max_supported_byte_len);
+        println!("num_bytes_circuit_capacity={}", num_bytes_circuit_capacity);
+        let circuit_src = circuit_src_template.replace(
+            "__MAX_LEN__",
+            num_bytes_circuit_capacity.to_string().as_str(),
+        );
+        let circuit = TestCircuitHandle::new_from_str(circuit_src.as_str()).unwrap();
+        let input_len = rng.gen_range(0, num_bytes_circuit_capacity + 1);
+        println!("input_len={}", input_len);
+        let msg = random_bytes(&mut rng, input_len);
+        let expected_output =
+            pad_and_hash_bytes_with_len(msg.as_slice(), num_bytes_circuit_capacity).unwrap();
+        println!("expected_output={}", expected_output);
+        let config = CircuitPaddingConfig::new().max_length("in", num_bytes_circuit_capacity);
+        let circuit_input_signals = CircuitInputSignals::new()
+            .bytes_input("in", msg.as_slice())
+            .usize_input("len", msg.len())
+            .fr_input("expected_output", expected_output)
+            .pad(&config)
+            .unwrap();
+        let result = circuit.gen_witness(circuit_input_signals);
+        println!("gen_witness_result={:?}", result);
+        assert!(result.is_ok());
+    }
+}
+
+#[test]
+fn hash_bytes_to_field_no_len() {
+    let circuit_src_template = r#"
+pragma circom 2.1.3;
+
+include "helpers/hashtofield.circom";
+
+template HashBytesToFieldTest(max_len) {
+    signal input in[max_len];
+    signal input expected_output;
+    component c1 = HashBytesToField(max_len);
+    c1.in <== in;
+    expected_output === c1.hash;
+}
+
+component main = HashBytesToFieldTest(__MAX_LEN__);
+"#;
+
+    let max_supported_byte_len = MAX_NUM_INPUT_SCALARS * BYTES_PACKED_PER_SCALAR;
+
+    let mut rng = thread_rng();
+    let num_iterations = std::env::var("NUM_ITERATIONS")
+        .unwrap_or("10".to_string())
+        .parse::<usize>()
+        .unwrap_or(10);
+
+    //TODO: hardcode some interesting circuit dimensions that's widely used in keyless.
+
+    for i in 0..num_iterations {
+        println!();
+        println!("Iteration {} starts.", i);
+        let num_bytes_circuit_capacity: usize = rng.gen_range(1, max_supported_byte_len);
+        println!("num_bytes_circuit_capacity={}", num_bytes_circuit_capacity);
+        let circuit_src = circuit_src_template.replace(
+            "__MAX_LEN__",
+            num_bytes_circuit_capacity.to_string().as_str(),
+        );
+        let circuit = TestCircuitHandle::new_from_str(circuit_src.as_str()).unwrap();
+        let input_len = rng.gen_range(0, num_bytes_circuit_capacity + 1);
+        println!("input_len={}", input_len);
+        let msg = random_bytes(&mut rng, input_len);
+        let expected_output =
+            pad_and_hash_bytes_no_len(msg.as_slice(), num_bytes_circuit_capacity).unwrap();
+        println!("expected_output={}", expected_output);
+        let config = CircuitPaddingConfig::new().max_length("in", num_bytes_circuit_capacity);
+        let circuit_input_signals = CircuitInputSignals::new()
+            .bytes_input("in", msg.as_slice())
+            .fr_input("expected_output", expected_output)
+            .pad(&config)
+            .unwrap();
+        let result = circuit.gen_witness(circuit_input_signals);
+        println!("gen_witness_result={:?}", result);
+        assert!(result.is_ok());
+    }
+}
+
+#[test]
+fn hash_limbs_to_field_with_len() {
+    let circuit_src_template = r#"
+pragma circom 2.1.3;
+
+include "helpers/hashtofield.circom";
+
+template Hash64BitLimbsToFieldWithLenTest(max_len) {
+    signal input in[max_len];
+    signal input len;
+    signal input expected_output;
+    component c1 = Hash64BitLimbsToFieldWithLen(max_len);
+    c1.in <== in;
+    c1.len <== len;
+    expected_output === c1.hash;
+}
+
+component main = Hash64BitLimbsToFieldWithLenTest(__MAX_LEN__);
+"#;
+
+    // Have to save 1 scalar slot for the length.
+    let max_supported_limb_len = (MAX_NUM_INPUT_SCALARS - 1) * LIMBS_PACKED_PER_SCALAR;
+
+    let mut rng = thread_rng();
+    let num_iterations = std::env::var("NUM_ITERATIONS")
+        .unwrap_or("10".to_string())
+        .parse::<usize>()
+        .unwrap_or(10);
+
+    //TODO: hardcode some interesting circuit dimensions that's widely used in keyless.
+
+    for i in 0..num_iterations {
+        println!();
+        println!("Iteration {} starts.", i);
+        let num_limbs_circuit_capacity: usize = rng.gen_range(1, max_supported_limb_len);
+        println!("num_limbs_circuit_capacity={}", num_limbs_circuit_capacity);
+        let circuit_src = circuit_src_template.replace(
+            "__MAX_LEN__",
+            num_limbs_circuit_capacity.to_string().as_str(),
+        );
+        let circuit = TestCircuitHandle::new_from_str(circuit_src.as_str()).unwrap();
+        let input_len = rng.gen_range(0, num_limbs_circuit_capacity + 1);
+        println!("input_len={}", input_len);
+        let limbs: Vec<u64> = (0..input_len).map(|_| rng.gen()).collect();
+        let expected_output =
+            pad_and_hash_limbs_with_len(limbs.as_slice(), num_limbs_circuit_capacity).unwrap();
+        println!("expected_output={}", expected_output);
+        let config = CircuitPaddingConfig::new().max_length("in", num_limbs_circuit_capacity);
+        let circuit_input_signals = CircuitInputSignals::new()
+            .limbs_input("in", limbs.as_slice())
+            .usize_input("len", limbs.len())
+            .fr_input("expected_output", expected_output)
+            .pad(&config)
+            .unwrap();
+        let result = circuit.gen_witness(circuit_input_signals);
+        println!("gen_witness_result={:?}", result);
+        assert!(result.is_ok());
+    }
+}
+
+#[test]
+fn check_are_64bit_limbs_should_pass_with_valid_limbs() {
+    let mut rng = thread_rng();
+    let circuit_src_template = r#"
+pragma circom 2.1.3;
+include "helpers/hashtofield.circom";
+component main = CheckAre64BitLimbs(__NUM_LIMBS__);
+"#;
+
+    for num_limbs in 0..60 {
+        println!();
+        println!("Iteration {} starts.", num_limbs);
+        let circuit_src =
+            circuit_src_template.replace("__NUM_LIMBS__", num_limbs.to_string().as_str());
+        let circuit = TestCircuitHandle::new_from_str(circuit_src.as_str()).unwrap();
+        let limbs: Vec<u64> = (0..num_limbs).map(|_| rng.gen()).collect();
+        let config = CircuitPaddingConfig::new().max_length("in", num_limbs);
+        let circuit_input_signals = CircuitInputSignals::new()
+            .limbs_input("in", limbs.as_slice())
+            .pad(&config)
+            .unwrap();
+        let result = circuit.gen_witness(circuit_input_signals);
+        println!("gen_witness_result={:?}", result);
+        assert!(result.is_ok());
+    }
+}
+
+#[test]
+fn check_are_64bit_limbs_should_fail_with_invalid_limbs() {
+    let circuit_src_template = r#"
+pragma circom 2.1.3;
+include "helpers/hashtofield.circom";
+component main = CheckAre64BitLimbs(__NUM_LIMBS__);
+"#;
+
+    for num_limbs in 1..60 {
+        let circuit_src =
+            circuit_src_template.replace("__NUM_LIMBS__", num_limbs.to_string().as_str());
+        let circuit = TestCircuitHandle::new_from_str(circuit_src.as_str()).unwrap();
+        let invalid_limb_value = Fr::from(u64::MAX) + Fr::ONE;
+        let frs = vec![invalid_limb_value; num_limbs];
+        let config = CircuitPaddingConfig::new().max_length("in", num_limbs);
+        let circuit_input_signals = CircuitInputSignals::new()
+            .frs_input("in", frs.as_slice())
+            .pad(&config)
+            .unwrap();
+        let result = circuit.gen_witness(circuit_input_signals);
+        println!("gen_witness_result={:?}", result);
+        assert!(result.is_err());
+    }
+}
diff --git a/keyless/circuit/src/jwt_field_parsing.rs b/keyless/circuit/src/jwt_field_parsing.rs
new file mode 100644
index 0000000000000..ad70343f391cb
--- /dev/null
+++ b/keyless/circuit/src/jwt_field_parsing.rs
@@ -0,0 +1,436 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{misc::calc_string_bodies, TestCircuitHandle};
+use aptos_keyless_common::input_processing::{
+    circuit_input_signals::CircuitInputSignals, config::CircuitPaddingConfig,
+};
+
+struct JWTField<T> {
+    whole_field: T,
+    name: T,
+    value: T,
+}
+
+struct JWTFieldMaliciousIndices<T> {
+    whole_field: T,
+    name: T,
+    value: T,
+    whole_field_len: usize,
+    name_len: usize,
+    value_index: usize,
+    value_len: usize,
+    colon_index: usize,
+}
+
+trait JWTFieldIndices {
+    fn whole_field_len(&self) -> usize;
+    fn name_len(&self) -> usize;
+    fn value_index(&self) -> usize;
+    fn value_len(&self) -> usize;
+    fn colon_index(&self) -> usize;
+}
+
+trait JWTFieldStr {
+    fn whole_field(&self) -> &str;
+    fn name(&self) -> &str;
+    fn value(&self) -> &str;
+}
+
+impl JWTFieldIndices for JWTField<String> {
+    fn whole_field_len(&self) -> usize {
+        self.whole_field.len()
+    }
+
+    fn name_len(&self) -> usize {
+        self.name.len()
+    }
+
+    fn value_index(&self) -> usize {
+        self.whole_field.find(&self.value).unwrap()
+    }
+
+    fn value_len(&self) -> usize {
+        self.value.len()
+    }
+
+    fn colon_index(&self) -> usize {
+        self.whole_field.find(':').unwrap()
+    }
+}
+
+impl JWTFieldStr for JWTField<String> {
+    fn whole_field(&self) -> &str {
+        &self.whole_field
+    }
+
+    fn name(&self) -> &str {
+        &self.name
+    }
+
+    fn value(&self) -> &str {
+        &self.value
+    }
+}
+
+impl JWTFieldIndices for JWTFieldMaliciousIndices<String> {
+    fn whole_field_len(&self) -> usize {
+        self.whole_field_len
+    }
+
+    fn name_len(&self) -> usize {
+        self.name_len
+    }
+
+    fn value_index(&self) -> usize {
+        self.value_index
+    }
+
+    fn value_len(&self) -> usize {
+        self.value_len
+    }
+
+    fn colon_index(&self) -> usize {
+        self.colon_index
+    }
+}
+
+impl JWTFieldStr for JWTFieldMaliciousIndices<String> {
+    fn whole_field(&self) -> &str {
+        &self.whole_field
+    }
+
+    fn name(&self) -> &str {
+        &self.name
+    }
+
+    fn value(&self) -> &str {
+        &self.value
+    }
+}
+
+fn jwt_field_str(whole_field: &str, name: &str, value: &str) -> JWTField<String> {
+    JWTField {
+        whole_field: String::from(whole_field),
+        name: String::from(name),
+        value: String::from(value),
+    }
+}
+
+fn jwt_field_str_malicious_indices(
+    whole_field: &str,
+    name: &str,
+    value: &str,
+) -> JWTFieldMaliciousIndices<String> {
+    JWTFieldMaliciousIndices {
+        whole_field: String::from(whole_field),
+        name: String::from(name),
+        value: String::from(value),
+        whole_field_len: whole_field.len(),
+        name_len: name.len(),
+        value_index: whole_field.find(value).unwrap_or(0),
+        value_len: value.len(),
+        colon_index: whole_field.find(':').unwrap(),
+    }
+}
+
+fn email_verified_test<T: JWTFieldIndices + JWTFieldStr>(
+    field: T,
+    test_circom_file: &str,
+) -> Result<tempfile::NamedTempFile, anyhow::Error> {
+    let circuit_handle = TestCircuitHandle::new(test_circom_file).unwrap();
+
+    let config = CircuitPaddingConfig::new()
+        .max_length("field", 30)
+        .max_length("name", 20)
+        .max_length("value", 10);
+
+    let circuit_input_signals = CircuitInputSignals::new()
+        .str_input("field", field.whole_field())
+        .str_input("name", field.name())
+        .str_input("value", field.value())
+        .usize_input("field_len", field.whole_field_len())
+        .usize_input("name_len", field.name_len())
+        .usize_input("value_index", field.value_index())
+        .usize_input("value_len", field.value_len())
+        .usize_input("colon_index", field.colon_index())
+        .pad(&config)
+        .unwrap();
+
+    let result = circuit_handle.gen_witness(circuit_input_signals);
+    println!("{:?}", result);
+    result
+}
+
+fn unquoted_test<T: JWTFieldIndices + JWTFieldStr>(
+    field: T,
+    test_circom_file: &str,
+) -> Result<tempfile::NamedTempFile, anyhow::Error> {
+    let circuit_handle = TestCircuitHandle::new(test_circom_file).unwrap();
+
+    let config = CircuitPaddingConfig::new()
+        .max_length("field", 60)
+        .max_length("name", 30)
+        .max_length("value", 30);
+
+    let circuit_input_signals = CircuitInputSignals::new()
+        .str_input("field", field.whole_field())
+        .str_input("name", field.name())
+        .str_input("value", field.value())
+        .usize_input("field_len", field.whole_field_len())
+        .usize_input("name_len", field.name_len())
+        .usize_input("value_index", field.value_index())
+        .usize_input("value_len", field.value_len())
+        .usize_input("colon_index", field.colon_index())
+        .pad(&config)
+        .unwrap();
+
+    let result = circuit_handle.gen_witness(circuit_input_signals);
+    println!("{:?}", result);
+    result
+}
+
+fn quoted_test<T: JWTFieldIndices + JWTFieldStr>(
+    field: T,
+    test_circom_file: &str,
+) -> Result<tempfile::NamedTempFile, anyhow::Error> {
+    let circuit_handle = TestCircuitHandle::new(test_circom_file).unwrap();
+
+    let config = CircuitPaddingConfig::new()
+        .max_length("field", 60)
+        .max_length("field_string_bodies", 60)
+        .max_length("name", 30)
+        .max_length("value", 30);
+
+    let circuit_input_signals = CircuitInputSignals::new()
+        .str_input("field", field.whole_field())
+        .str_input("name", field.name())
+        .str_input("value", field.value())
+        .usize_input("field_len", field.whole_field_len())
+        .bools_input(
+            "field_string_bodies",
+            &calc_string_bodies(field.whole_field()),
+        )
+        .usize_input("name_len", field.name_len())
+        .usize_input("value_index", field.value_index())
+        .usize_input("value_len", field.value_len())
+        .usize_input("colon_index", field.colon_index())
+        .pad(&config)
+        .unwrap();
+
+    let result = circuit_handle.gen_witness(circuit_input_signals);
+    println!("{:?}", result);
+    result
+}
+
+fn should_pass_quoted<T: JWTFieldIndices + JWTFieldStr>(field: T) {
+    assert!(quoted_test(field, "jwt_field_parsing/parse_quoted_test.circom").is_ok());
+}
+
+fn should_pass_unquoted<T: JWTFieldIndices + JWTFieldStr>(field: T) {
+    assert!(unquoted_test(field, "jwt_field_parsing/parse_unquoted_test.circom").is_ok());
+}
+
+fn should_pass_ev<T: JWTFieldIndices + JWTFieldStr>(field: T) {
+    assert!(email_verified_test(
+        field,
+        "jwt_field_parsing/parse_email_verified_field_test.circom"
+    )
+    .is_ok());
+}
+
+fn should_fail_quoted<T: JWTFieldIndices + JWTFieldStr>(field: T) {
+    assert!(quoted_test(field, "jwt_field_parsing/parse_quoted_test.circom").is_err());
+}
+
+fn should_fail_unquoted<T: JWTFieldIndices + JWTFieldStr>(field: T) {
+    assert!(unquoted_test(field, "jwt_field_parsing/parse_unquoted_test.circom").is_err());
+}
+
+#[allow(dead_code)]
+fn should_fail_ev<T: JWTFieldIndices + JWTFieldStr>(field: T) {
+    assert!(email_verified_test(
+        field,
+        "jwt_field_parsing/parse_email_verified_field_test.circom"
+    )
+    .is_err());
+}
+
+// The tests
+
+#[test]
+fn simple_quoted() {
+    should_pass_quoted(jwt_field_str("\"name\": \"value\",", "name", "value"));
+}
+
+#[test]
+fn simple_unquoted() {
+    should_pass_unquoted(jwt_field_str("\"name\": value,", "name", "value"));
+}
+
+#[test]
+fn no_whitespace_quoted() {
+    should_pass_quoted(jwt_field_str("\"name\":\"value\",", "name", "value"));
+}
+
+#[test]
+fn no_whitespace_unquoted() {
+    should_pass_unquoted(jwt_field_str("\"name\":value,", "name", "value"));
+}
+
+// fails to parse now with StringBodies logic
+#[test]
+fn malicious_value_1() {
+    let mut field = jwt_field_str_malicious_indices("\"sub\": \"a\\\",b\",", "sub", "a\\");
+    field.whole_field_len = field.whole_field.find(',').unwrap() + 1;
+    should_fail_quoted(field);
+}
+
+// fails to parse now with StringBodies logic
+#[test]
+fn malicious_value_2() {
+    should_fail_quoted(jwt_field_str(
+        "\"name1\":\"value1\",\"name2\":\"value2\",",
+        "name1",
+        "value1\",\"name2\":\"value2",
+    ));
+}
+
+#[test]
+fn end_with_curly_bracket() {
+    should_pass_quoted(jwt_field_str("\"name\": \"value\"}", "name", "value"));
+}
+
+#[test]
+fn end_with_curly_bracket_unquoted() {
+    should_pass_unquoted(jwt_field_str("\"name\": value}", "name", "value"));
+}
+
+#[test]
+fn should_fail_when_name_has_no_first_quote() {
+    should_fail_quoted(jwt_field_str("name\": \"value\",", "name", "value"));
+}
+
+#[test]
+fn should_fail_when_name_has_no_second_quote() {
+    should_fail_quoted(jwt_field_str("\"name: \"value\",", "name", "value"));
+}
+
+#[test]
+fn should_fail_when_name_has_no_quotes() {
+    should_fail_quoted(jwt_field_str("name: \"value\",", "name", "value"));
+}
+
+#[test]
+fn should_fail_when_name_not_equal_quoted() {
+    should_fail_quoted(jwt_field_str("\"name\": \"value\",", "fake", "value"));
+}
+
+#[test]
+fn should_fail_when_name_not_equal_unquoted() {
+    should_fail_unquoted(jwt_field_str("\"name\": value,", "fake", "value"));
+}
+
+#[test]
+fn should_fail_when_value_not_equal_quoted() {
+    let mut field = jwt_field_str_malicious_indices("\"name\": \"value\",", "name", "fake");
+    field.whole_field_len = field.whole_field.len();
+    field.value_index = field.whole_field.find("value").unwrap();
+    should_fail_quoted(field);
+}
+
+#[test]
+fn should_fail_when_value_not_equal_unquoted() {
+    let mut field = jwt_field_str_malicious_indices("\"name\": value,", "name", "fake");
+    field.whole_field_len = field.whole_field.len();
+    field.value_index = field.whole_field.find("value").unwrap();
+    should_fail_unquoted(field);
+}
+
+// ref: Circuit Bug #3, https://www.notion.so/aptoslabs/JWTFieldCheck-does-not-properly-constrain-field_len-which-can-cause-the-circuit-to-accept-field-val-9943c152e7274f35a1669a6cb416c7bf?pvs=4
+#[test]
+fn malicious_field_len() {
+    let mut field = jwt_field_str_malicious_indices("\"name\":\",value\"", "name", ",value");
+    field.whole_field_len = field.whole_field.find(',').unwrap() + 1;
+    field.value_index = field.whole_field.find(',').unwrap();
+    assert_ne!(field.whole_field_len, field.whole_field.len());
+
+    should_fail_quoted(field);
+}
+
+// ref: Circuit Bug #4, https://www.notion.so/aptoslabs/JWTFieldCheck-allows-for-maliciously-truncating-field-values-at-any-character-f8695dcd397a4bc2b66d52349388499f?pvs=4
+#[test]
+fn malicious_value_len_1() {
+    let mut field = jwt_field_str_malicious_indices("\"sub\":\"user,fake\",", "sub", "user");
+
+    field.whole_field_len = field.whole_field.find(',').unwrap() + 1;
+
+    should_fail_quoted(field);
+}
+
+#[test]
+fn malicious_value_len_2() {
+    let mut field = jwt_field_str_malicious_indices("\"sub\":user,fake,", "sub", "user");
+
+    field.whole_field_len = field.whole_field.find(',').unwrap() + 1;
+
+    should_pass_unquoted(field);
+
+    let field = jwt_field_str_malicious_indices("\"sub\":user,fake,", "sub", "user,fake");
+
+    should_fail_unquoted(field);
+}
+
+#[test]
+fn ev_unquoted_no_spaces() {
+    should_pass_ev(jwt_field_str(
+        "\"email_verified\":true,",
+        "email_verified",
+        "true",
+    ));
+}
+
+#[test]
+fn ev_unquoted_spaces() {
+    should_pass_ev(jwt_field_str(
+        "\"email_verified\": true ,",
+        "email_verified",
+        "true",
+    ));
+}
+
+#[test]
+fn ev_unquoted_spaces_2() {
+    should_pass_ev(jwt_field_str(
+        "\"email_verified\":  true  ,",
+        "email_verified",
+        "true",
+    ));
+}
+
+#[test]
+fn ev_quoted_no_spaces() {
+    should_pass_ev(jwt_field_str(
+        "\"email_verified\":\"true\",",
+        "email_verified",
+        "true",
+    ));
+}
+
+#[test]
+fn ev_quoted_spaces() {
+    should_pass_ev(jwt_field_str(
+        "\"email_verified\": \"true\" ,",
+        "email_verified",
+        "true",
+    ));
+}
+
+#[test]
+fn ev_quoted_spaces_2() {
+    should_pass_ev(jwt_field_str(
+        "\"email_verified\":  \"true\"  ,",
+        "email_verified",
+        "true",
+    ));
+}
diff --git a/keyless/circuit/src/lib.rs b/keyless/circuit/src/lib.rs
new file mode 100644
index 0000000000000..7f7bd7ebf48c8
--- /dev/null
+++ b/keyless/circuit/src/lib.rs
@@ -0,0 +1,105 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+extern crate core;
+
+use anyhow::ensure;
+use aptos_keyless_common::input_processing::{
+    circuit_input_signals::{CircuitInputSignals, Padded},
+    witness_gen::witness_gen,
+};
+use std::{env, fs, fs::File, io::Write, path::PathBuf, process::Command};
+use tempfile::{tempdir, NamedTempFile, TempDir};
+
+#[cfg(test)]
+mod arrays;
+#[cfg(test)]
+mod base64;
+#[cfg(test)]
+mod bigint;
+#[cfg(test)]
+mod hash_to_field;
+#[cfg(test)]
+mod jwt_field_parsing;
+#[cfg(test)]
+mod misc;
+#[cfg(test)]
+mod packing;
+#[cfg(test)]
+mod rsa;
+#[cfg(test)]
+mod sha;
+
+pub struct TestCircuitHandle {
+    dir: TempDir,
+}
+
+impl TestCircuitHandle {
+    /// Compile the circuit in the given file using BN254 as the underlying curve.
+    pub fn new(file_name: &str) -> anyhow::Result<Self> {
+        let cargo_manifest_dir = PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap());
+        let include_root_dir = cargo_manifest_dir.join("./templates");
+        let src_circuit_path = include_root_dir.join("tests").join(file_name);
+        let content = fs::read_to_string(src_circuit_path)?;
+        Self::new_from_str(content.as_str())
+    }
+
+    pub fn new_from_str(circuit_src: &str) -> anyhow::Result<Self> {
+        let dir = tempdir()?;
+        let cargo_manifest_dir = PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap());
+        let include_root_dir = cargo_manifest_dir.join("./templates");
+        let tmp_circuit_path = dir.path().to_owned().join("circuit.circom");
+        let mut tmp_circuit_file = File::create(&tmp_circuit_path)?;
+        let global_node_modules_path =
+            String::from_utf8(Command::new("npm").args(["root", "-g"]).output()?.stdout).unwrap();
+        tmp_circuit_file.write_all(circuit_src.as_bytes())?;
+        let output = Command::new("circom")
+            .args([
+                "-l",
+                include_root_dir.to_str().unwrap(),
+                "-l",
+                global_node_modules_path.trim(),
+                tmp_circuit_path.to_str().unwrap(),
+                "--c",
+                "--wasm",
+                "-o",
+                dir.path().to_str().unwrap(),
+            ])
+            .output()?;
+        println!("{}", String::from_utf8_lossy(&output.stdout));
+        println!("{}", String::from_utf8_lossy(&output.stderr));
+        ensure!(output.status.success());
+        Ok(Self { dir })
+    }
+
+    pub fn gen_witness(
+        &self,
+        input_signals: CircuitInputSignals<Padded>,
+    ) -> anyhow::Result<NamedTempFile> {
+        let formatted_input_str = serde_json::to_string(&input_signals.to_json_value())?;
+        witness_gen(
+            self.witness_gen_js_path().to_str().unwrap(),
+            self.witness_gen_wasm_path().to_str().unwrap(),
+            &formatted_input_str,
+        )
+    }
+
+    fn witness_gen_js_path(&self) -> PathBuf {
+        self.dir
+            .path()
+            .to_owned()
+            .join("circuit_js/generate_witness.js")
+    }
+
+    fn witness_gen_wasm_path(&self) -> PathBuf {
+        self.dir.path().to_owned().join("circuit_js/circuit.wasm")
+    }
+}
+
+// pub fn run_circuit_test(circuit_name: &str, circuit_input_signals: CircuitInputSignals<Padded>) {
+//     // compute circuit input signals (input.json)
+//     let formatted_input_str = serde_json::to_string(&circuit_input_signals.to_json_value()).unwrap();
+//     // run witness generation phase for `circuit_name`
+//     let compile_circuit();
+//     witness_gen(witness_gen_js_path, witness_gen_wasm_path, &formatted_input_str).unwrap();
+// }
diff --git a/keyless/circuit/src/misc.rs b/keyless/circuit/src/misc.rs
new file mode 100644
index 0000000000000..3454bce37fac4
--- /dev/null
+++ b/keyless/circuit/src/misc.rs
@@ -0,0 +1,350 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::TestCircuitHandle;
+use aptos_keyless_common::input_processing::{
+    circuit_input_signals::CircuitInputSignals, config::CircuitPaddingConfig,
+};
+use ark_bn254::Fr;
+use ark_ff::PrimeField;
+use rand::{distributions::Alphanumeric, rngs::ThreadRng, Rng}; // 0.8
+use std::iter::zip;
+
+fn generate_string_bodies_input() -> String {
+    let mut rng = rand::thread_rng();
+
+    let len = 13;
+
+    let mut s: Vec<u8> = rng
+        .sample_iter(&Alphanumeric)
+        .take(len)
+        .collect::<String>()
+        .as_bytes()
+        .into();
+
+    let num_to_replace = rng.gen_range(0, len);
+    let to_replace: Vec<usize> = (0..num_to_replace).map(|_| rng.gen_range(0, len)).collect();
+    let replace_with_escaped_quote: Vec<bool> =
+        (0..num_to_replace).map(|_| rng.gen_bool(0.5)).collect();
+
+    for (i, should_replace_with_escaped_quote) in zip(to_replace, replace_with_escaped_quote) {
+        if should_replace_with_escaped_quote && i > 0 {
+            s[i - 1] = b'\\';
+            s[i] = b'"';
+        } else {
+            s[i] = b'"';
+        }
+    }
+
+    String::from_utf8_lossy(&s).into_owned()
+}
+
+fn format_quotes_array(q: &[bool]) -> String {
+    q.iter()
+        .map(|b| match b {
+            true => "1",
+            false => "0",
+        })
+        .collect::<Vec<&str>>()
+        .concat()
+}
+
+pub fn calc_string_bodies(s: &str) -> Vec<bool> {
+    let bytes = s.as_bytes();
+    let mut string_bodies = vec![false; s.len()];
+    let mut quotes = vec![false; s.len()];
+    let mut quote_parity = vec![false; s.len()];
+
+    quotes[0] = bytes[0] == b'"';
+    quote_parity[0] = bytes[0] == b'"';
+    for i in 1..bytes.len() {
+        let mut prev_is_odd_backslash = false;
+        for j in (0..i).rev() {
+            if bytes[j] != b'\\' {
+                break;
+            }
+            println!("{}: {}", j, bytes[j]);
+            prev_is_odd_backslash = !prev_is_odd_backslash;
+        }
+        quotes[i] = bytes[i] == b'"' && !prev_is_odd_backslash;
+        quote_parity[i] = if quotes[i] {
+            !quote_parity[i - 1]
+        } else {
+            quote_parity[i - 1]
+        };
+    }
+
+    string_bodies[0] = false;
+    for i in 1..bytes.len() {
+        string_bodies[i] = quote_parity[i] && quote_parity[i - 1];
+    }
+
+    println!("string       : {}", s);
+    println!("quote_parity : {}", format_quotes_array(&quote_parity));
+    println!("string_bodies: {}", format_quotes_array(&string_bodies));
+
+    string_bodies
+}
+
+#[test]
+fn is_whitespace_test() {
+    let circuit_handle = TestCircuitHandle::new("misc/is_whitespace_test.circom").unwrap();
+
+    for c in 0u8..=127u8 {
+        let config = CircuitPaddingConfig::new();
+
+        let circuit_input_signals = CircuitInputSignals::new()
+            .byte_input("char", c)
+            .bool_input("result", (c as char).is_whitespace())
+            .pad(&config)
+            .unwrap();
+
+        let result = circuit_handle.gen_witness(circuit_input_signals);
+        println!("{}: {:?}", c, result);
+        assert!(result.is_ok());
+    }
+}
+
+#[test]
+fn string_bodies_test() {
+    let circuit_handle = TestCircuitHandle::new("misc/string_bodies_test.circom").unwrap();
+
+    let s = "\"123\" 456 \"7\"";
+    let quotes = &[0u8, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0];
+    let quotes_b: Vec<bool> = quotes.iter().map(|b| b == &1u8).collect();
+
+    assert_eq!(quotes_b, calc_string_bodies(s));
+
+    let config = CircuitPaddingConfig::new()
+        .max_length("in", 13)
+        .max_length("out", 13);
+
+    let circuit_input_signals = CircuitInputSignals::new()
+        .str_input("in", s)
+        .bytes_input("out", quotes)
+        .pad(&config)
+        .unwrap();
+
+    let result = circuit_handle.gen_witness(circuit_input_signals);
+    println!("{:?}", result);
+    assert!(result.is_ok());
+}
+
+#[test]
+fn string_bodies_test_2() {
+    let circuit_handle = TestCircuitHandle::new("misc/string_bodies_test.circom").unwrap();
+
+    let s = "\"12\\\"456\" \"7\"";
+    let quotes = &[0u8, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0];
+    let quotes_b: Vec<bool> = quotes.iter().map(|b| b == &1u8).collect();
+
+    assert_eq!(quotes_b, calc_string_bodies(s));
+
+    let config = CircuitPaddingConfig::new()
+        .max_length("in", 13)
+        .max_length("out", 13);
+
+    let circuit_input_signals = CircuitInputSignals::new()
+        .str_input("in", s)
+        .bytes_input("out", quotes)
+        .pad(&config)
+        .unwrap();
+
+    let result = circuit_handle.gen_witness(circuit_input_signals);
+    println!("{:?}", result);
+    assert!(result.is_ok());
+}
+
+#[test]
+fn string_bodies_test_random() {
+    let circuit_handle = TestCircuitHandle::new("misc/string_bodies_test.circom").unwrap();
+
+    for _iter in 0..128 {
+        let s = generate_string_bodies_input();
+        let quotes = calc_string_bodies(&s);
+
+        let config = CircuitPaddingConfig::new()
+            .max_length("in", 13)
+            .max_length("out", 13);
+
+        let circuit_input_signals = CircuitInputSignals::new()
+            .str_input("in", &s)
+            .bools_input("out", &quotes)
+            .pad(&config)
+            .unwrap();
+
+        let result = circuit_handle.gen_witness(circuit_input_signals);
+        println!("{:?}", result);
+        assert!(result.is_ok());
+    }
+}
+
+#[test]
+fn string_bodies_test_prefix_quotes() {
+    let circuit_handle = TestCircuitHandle::new("misc/string_bodies_test.circom").unwrap();
+
+    for i in 0..13 {
+        let mut bytes = vec![b'a'; 13];
+        for byte in bytes.iter_mut().take(i) {
+            *byte = b'"';
+        }
+        let s = String::from_utf8_lossy(&bytes);
+
+        let quotes = calc_string_bodies(&s);
+
+        let config = CircuitPaddingConfig::new()
+            .max_length("in", 13)
+            .max_length("out", 13);
+
+        let circuit_input_signals = CircuitInputSignals::new()
+            .str_input("in", &s)
+            .bools_input("out", &quotes)
+            .pad(&config)
+            .unwrap();
+
+        let result = circuit_handle.gen_witness(circuit_input_signals);
+        println!("{:?}", result);
+        assert!(result.is_ok());
+    }
+}
+
+#[test]
+fn string_bodies_test_zjma() {
+    let circuit_handle = TestCircuitHandle::new("misc/string_bodies_test.circom").unwrap();
+
+    let s = "\"abc\\\\\"";
+    let quotes = calc_string_bodies(s);
+
+    let config = CircuitPaddingConfig::new()
+        .max_length("in", 13)
+        .max_length("out", 13);
+
+    let circuit_input_signals = CircuitInputSignals::new()
+        .str_input("in", s)
+        .bools_input("out", &quotes)
+        .pad(&config)
+        .unwrap();
+
+    let result = circuit_handle.gen_witness(circuit_input_signals);
+    println!("{:?}", result);
+    assert!(result.is_ok());
+}
+
+#[test]
+fn calculate_total_test() {
+    let circuit_handle = TestCircuitHandle::new("misc/calculate_total_test.circom").unwrap();
+
+    let mut rng = rand::thread_rng();
+
+    for _i in 0..256 {
+        let nums: Vec<Fr> = (0..10).map(|_| Fr::from(rng.gen::<u64>())).collect();
+
+        let sum: Fr = nums.iter().sum();
+
+        let config = CircuitPaddingConfig::new().max_length("nums", 10);
+
+        let circuit_input_signals = CircuitInputSignals::new()
+            .frs_input("nums", &nums)
+            .fr_input("sum", sum)
+            .pad(&config)
+            .unwrap();
+
+        let result = circuit_handle.gen_witness(circuit_input_signals);
+        println!("{:?}", result);
+        assert!(result.is_ok());
+    }
+}
+
+#[test]
+fn assert_equal_if_true_test() {
+    fn rand_fr(rng: &mut ThreadRng) -> Fr {
+        let bytes: [u8; 32] = rng.gen();
+        Fr::from_le_bytes_mod_order(&bytes)
+    }
+
+    let circuit_handle = TestCircuitHandle::new("misc/assert_equal_if_true_test.circom").unwrap();
+
+    let mut rng = rand::thread_rng();
+
+    for _i in 0..256 {
+        let (nums, are_equal) = if rng.gen_bool(0.5) {
+            let nums: Vec<Fr> = (0..2).map(|_| rand_fr(&mut rng)).collect();
+
+            let mut are_equal = nums[0] == nums[1];
+
+            if rng.gen_bool(0.5) {
+                are_equal = true;
+            }
+
+            (nums, are_equal)
+        } else {
+            let num = rand_fr(&mut rng);
+            let nums: Vec<Fr> = vec![num, num];
+
+            (nums, true)
+        };
+
+        let config = CircuitPaddingConfig::new().max_length("in", 2);
+
+        let circuit_input_signals = CircuitInputSignals::new()
+            .frs_input("in", &nums)
+            .bool_input("bool", are_equal)
+            .pad(&config)
+            .unwrap();
+
+        let result = circuit_handle.gen_witness(circuit_input_signals);
+        println!("{:?}", result);
+        if are_equal == (nums[0] == nums[1]) {
+            assert!(result.is_ok());
+        } else {
+            assert!(result.is_err());
+        }
+    }
+}
+
+#[test]
+fn email_verified_check_test() {
+    let circuit_handle = TestCircuitHandle::new("misc/email_verified_check_test.circom").unwrap();
+
+    let testcases = [
+        ("email_verified", "true", "email", true, true),
+        // Note that this template doesn't actually check that ev_name is exactly equal to
+        // "email_verified". It only checks that it starts with this string. I believe that this
+        // is not an issue because ParseEmailVerifiedField enforces that ev_name has len == 14.
+        ("email_verified000", "true", "email", true, true),
+        ("email_verified", "false", "email", true, false),
+        ("email_verified", "true", "sub", false, true),
+        ("email_verified", "false", "sub", false, true),
+    ];
+
+    for t in testcases {
+        let ev_name = t.0;
+        let ev_value = t.1;
+        let uid_name = t.2;
+        let expected_uid_is_email = t.3;
+        let test_should_pass = t.4;
+
+        let config = CircuitPaddingConfig::new()
+            .max_length("ev_name", 20)
+            .max_length("ev_value", 10)
+            .max_length("uid_name", 30);
+
+        let circuit_input_signals = CircuitInputSignals::new()
+            .str_input("ev_name", ev_name)
+            .str_input("ev_value", ev_value)
+            .str_input("uid_name", uid_name)
+            .usize_input("ev_value_len", ev_value.len())
+            .usize_input("uid_name_len", uid_name.len())
+            .bool_input("uid_is_email", expected_uid_is_email)
+            .pad(&config)
+            .unwrap();
+
+        let result = circuit_handle.gen_witness(circuit_input_signals);
+        println!("{:?}", result);
+        if test_should_pass {
+            assert!(result.is_ok());
+        } else {
+            assert!(result.is_err());
+        }
+    }
+}
diff --git a/keyless/circuit/src/packing.rs b/keyless/circuit/src/packing.rs
new file mode 100644
index 0000000000000..00ec0339621d2
--- /dev/null
+++ b/keyless/circuit/src/packing.rs
@@ -0,0 +1,150 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::TestCircuitHandle;
+use aptos_keyless_common::input_processing::{
+    circuit_input_signals::CircuitInputSignals, config::CircuitPaddingConfig,
+};
+use ark_bn254::Fr;
+use ark_ff::{BigInteger, PrimeField};
+use rand_chacha::{
+    rand_core::{RngCore as _, SeedableRng as _},
+    ChaCha20Rng,
+};
+
+const TEST_RNG_SEED: u64 = 6896401633680249901;
+
+fn expected_num2bits_be(n: u64, size: usize) -> Vec<bool> {
+    let mut bits_le = Vec::new();
+    for i in 0..size {
+        bits_le.push(((n >> i) & 1) == 1);
+    }
+    bits_le.into_iter().rev().collect()
+}
+
+fn bits_to_field_elems(bits: &[bool], bits_per_field_elem: usize) -> Vec<Fr> {
+    bits.chunks(bits_per_field_elem)
+        .map(bits_to_field_elem)
+        .collect()
+}
+
+fn bits_to_field_elem(bits: &[bool]) -> Fr {
+    let bigint = BigInteger::from_bits_be(bits);
+    Fr::from_bigint(bigint).unwrap()
+}
+
+#[test]
+fn num2bits_be_test() {
+    let circuit_handle = TestCircuitHandle::new("packing/num2bits_be_test.circom").unwrap();
+    let bits_max_size = 8;
+
+    for n in 0..=255 {
+        let config = CircuitPaddingConfig::new().max_length("bits_out", bits_max_size);
+
+        let circuit_input_signals = CircuitInputSignals::new()
+            .byte_input("num_in", n)
+            .bools_input("bits_out", &expected_num2bits_be(n as u64, bits_max_size))
+            .pad(&config)
+            .unwrap();
+
+        let result = circuit_handle.gen_witness(circuit_input_signals);
+        println!("n: {}, {:?}", n, result);
+        assert!(result.is_ok());
+    }
+}
+
+#[test]
+fn bits2num_big_endian_test() {
+    let circuit_handle = TestCircuitHandle::new("packing/bits2num_big_endian_test.circom").unwrap();
+    let mut rng = ChaCha20Rng::seed_from_u64(TEST_RNG_SEED);
+    let bits_max_size = 64;
+
+    for i in 0..=255 {
+        let expected_n = rng.next_u64();
+
+        let config = CircuitPaddingConfig::new().max_length("bits_in", bits_max_size);
+
+        let circuit_input_signals = CircuitInputSignals::new()
+            .bools_input("bits_in", &expected_num2bits_be(expected_n, bits_max_size))
+            .u64_input("num_out", expected_n)
+            .pad(&config)
+            .unwrap();
+
+        let result = circuit_handle.gen_witness(circuit_input_signals);
+        println!("i: {}, {:?}", i, result);
+        assert!(result.is_ok());
+    }
+}
+
+#[test]
+fn bytes_to_bits_test() {
+    let circuit_handle = TestCircuitHandle::new("packing/bytes_to_bits_test.circom").unwrap();
+
+    let mut rng = ChaCha20Rng::seed_from_u64(TEST_RNG_SEED);
+    const BYTES_MAX_SIZE: usize = 10;
+    const BITS_MAX_SIZE: usize = BYTES_MAX_SIZE * 8;
+
+    for i in 0..=255 {
+        let bytes: &mut [u8] = &mut [0u8; BYTES_MAX_SIZE];
+        rng.fill_bytes(bytes);
+
+        let expected_bits: Vec<bool> = bytes
+            .iter()
+            .flat_map(|byte| expected_num2bits_be(*byte as u64, 8))
+            .collect();
+
+        let config = CircuitPaddingConfig::new()
+            .max_length("bytes_in", BYTES_MAX_SIZE)
+            .max_length("bits_out", BITS_MAX_SIZE);
+
+        let circuit_input_signals = CircuitInputSignals::new()
+            .bytes_input("bytes_in", bytes)
+            .bools_input("bits_out", &expected_bits)
+            .pad(&config)
+            .unwrap();
+
+        let result = circuit_handle.gen_witness(circuit_input_signals);
+        println!("i: {}, {:?}", i, result);
+        assert!(result.is_ok());
+    }
+}
+
+#[test]
+fn bits_to_field_elems_test() {
+    let circuit_handle = TestCircuitHandle::new("packing/bits_to_field_elems_test.circom").unwrap();
+
+    let mut rng = ChaCha20Rng::seed_from_u64(TEST_RNG_SEED);
+
+    // Keeping both of these constant makes sense here, since the circuit only ever uses these two
+    // particular parameters when calling this template
+    const MAX_BITS_LEN: usize = 256;
+    const BITS_PER_FIELD_ELEM: usize = 64;
+    let num_field_elems = MAX_BITS_LEN.div_ceil(BITS_PER_FIELD_ELEM);
+
+    for i in 0..=255 {
+        let bytes: &mut [u8] = &mut [0u8; MAX_BITS_LEN / 8];
+        rng.fill_bytes(bytes);
+
+        let bits: Vec<bool> = bytes
+            .iter()
+            .flat_map(|byte| expected_num2bits_be(*byte as u64, 8))
+            .collect();
+
+        let expected_field_elems = bits_to_field_elems(&bits, BITS_PER_FIELD_ELEM);
+        println!("{}", expected_field_elems.len());
+
+        let config = CircuitPaddingConfig::new()
+            .max_length("bits_in", MAX_BITS_LEN)
+            .max_length("field_elems_out", num_field_elems);
+
+        let circuit_input_signals = CircuitInputSignals::new()
+            .bools_input("bits_in", &bits)
+            .frs_input("field_elems_out", &expected_field_elems)
+            .pad(&config)
+            .unwrap();
+
+        let result = circuit_handle.gen_witness(circuit_input_signals);
+        println!("i: {}, {:?}", i, result);
+        assert!(result.is_ok());
+    }
+}
diff --git a/keyless/circuit/src/rsa.rs b/keyless/circuit/src/rsa.rs
new file mode 100644
index 0000000000000..33905f3832e4f
--- /dev/null
+++ b/keyless/circuit/src/rsa.rs
@@ -0,0 +1,135 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::TestCircuitHandle;
+use aptos_keyless_common::input_processing::{
+    circuit_input_signals::CircuitInputSignals, config::CircuitPaddingConfig,
+};
+use aptos_logger::info;
+use num_bigint::BigUint;
+use num_traits::FromPrimitive;
+use rand::{thread_rng, Rng};
+use rsa::{
+    pkcs1v15::SigningKey,
+    sha2::{Digest, Sha256},
+    signature::{RandomizedSigner, SignatureEncoding},
+    traits::{PrivateKeyParts, PublicKeyParts},
+    RsaPrivateKey,
+};
+use std::convert::TryInto;
+
+const EXPONENT: u64 = 65537;
+
+#[test]
+fn rsa_verify_should_pass_with_valid_input() {
+    common(|_, _, _| {}, true)
+}
+
+#[test]
+fn rsa_verify_should_fail_with_invalid_signature() {
+    common(
+        |sig_limbs, _, _| {
+            flip_random_bit(sig_limbs);
+        },
+        false,
+    );
+}
+
+#[test]
+fn rsa_verify_should_fail_with_invalid_modulus() {
+    common(
+        |_, modulus_limbs, _| {
+            flip_random_bit(modulus_limbs);
+        },
+        false,
+    );
+}
+
+#[test]
+fn rsa_verify_should_fail_with_invalid_hased_msg() {
+    common(
+        |_, _, hashed_msg_limbs| {
+            flip_random_bit(hashed_msg_limbs);
+        },
+        false,
+    );
+}
+
+fn common<F: Fn(&mut Vec<u64>, &mut Vec<u64>, &mut Vec<u64>)>(
+    update_signals: F,
+    witness_gen_should_pass: bool,
+) {
+    // Default #iterations to 1 but allow customization.
+    let num_iterations = std::env::var("NUM_ITERATIONS")
+        .unwrap_or("1".to_string())
+        .parse::<usize>()
+        .unwrap_or(1);
+
+    let circuit = TestCircuitHandle::new("rsa_verify_test.circom").unwrap();
+    let mut rng = thread_rng();
+    let e = rsa::BigUint::from_u64(EXPONENT).unwrap();
+
+    for i in 0..num_iterations {
+        info!("Iteration {i} starts. Generate RSA key pairs.");
+        let private_key =
+            RsaPrivateKey::new_with_exp(&mut rand_chacha::rand_core::OsRng, 2048, &e).unwrap();
+        info!(
+            "Key pair generated, d={:?}, n={:?}.",
+            private_key.d(),
+            private_key.n()
+        );
+        let modulus = BigUint::from_bytes_be(&private_key.to_public_key().n().to_bytes_be());
+        let mut modulus_limbs = modulus.to_u64_digits();
+        let signing_key = SigningKey::<Sha256>::new(private_key);
+
+        info!("Generate a random message.");
+        let msg_len: usize = rng.gen_range(0, 9999);
+        let message: Vec<u8> = vec![0; msg_len];
+
+        info!("Message generated, msg_hex={}", hex::encode(&message));
+        let mut hasher = Sha256::new();
+        hasher.update(&message);
+        let hashed_msg = hasher.finalize().to_vec();
+
+        let mut hashed_msg_limbs: Vec<u64> = hashed_msg
+            .chunks(8)
+            .map(|bytes| bytes.try_into())
+            .collect::<Result<Vec<[u8; 8]>, _>>()
+            .unwrap()
+            .into_iter()
+            .map(u64::from_be_bytes)
+            .rev()
+            .collect();
+
+        let signature = BigUint::from_bytes_be(
+            &signing_key
+                .sign_with_rng(&mut rand_chacha::rand_core::OsRng, message.as_slice())
+                .to_bytes(),
+        );
+        let mut signature_limbs = signature.to_u64_digits();
+
+        let config = CircuitPaddingConfig::new();
+
+        update_signals(
+            &mut signature_limbs,
+            &mut modulus_limbs,
+            &mut hashed_msg_limbs,
+        );
+
+        let circuit_input_signals = CircuitInputSignals::new()
+            .limbs_input("sign", signature_limbs.as_slice())
+            .limbs_input("modulus", modulus_limbs.as_slice())
+            .limbs_input("hashed", hashed_msg_limbs.as_slice())
+            .pad(&config)
+            .unwrap();
+        let result = circuit.gen_witness(circuit_input_signals);
+        assert_eq!(witness_gen_should_pass, result.is_ok());
+    }
+}
+
+fn flip_random_bit(limbs: &mut [u64]) {
+    let mut rng = thread_rng();
+    let limb_idx = rng.gen_range(0, limbs.len());
+    let bit_idx = rng.gen_range(0, 64);
+    *limbs.get_mut(limb_idx).unwrap() ^= 1_u64 << bit_idx;
+}
diff --git a/keyless/circuit/src/sha.rs b/keyless/circuit/src/sha.rs
new file mode 100644
index 0000000000000..0349b331dd6b1
--- /dev/null
+++ b/keyless/circuit/src/sha.rs
@@ -0,0 +1,95 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::TestCircuitHandle;
+use aptos_keyless_common::input_processing::{
+    circuit_input_signals::CircuitInputSignals, config::CircuitPaddingConfig, sha,
+};
+use rand_chacha::{
+    rand_core::{RngCore as _, SeedableRng as _},
+    ChaCha20Rng,
+};
+use sha2::Digest;
+use std::sync::Arc;
+
+const TEST_RNG_SEED: u64 = 13673030044145830633;
+
+fn byte_to_bits_msb(byte: u8) -> Vec<bool> {
+    (0..8).map(|i| (byte >> (7 - i)) & 1 != 0).collect()
+}
+
+pub fn bytes_to_bits_msb(msg: Vec<u8>) -> Vec<bool> {
+    msg.into_iter().flat_map(byte_to_bits_msb).collect()
+}
+
+#[test]
+fn sha_test() {
+    let mut rng = ChaCha20Rng::seed_from_u64(TEST_RNG_SEED);
+    let circuit_handle = Arc::new(TestCircuitHandle::new("sha_test.circom").unwrap());
+
+    // TODO: figure out how to parallelize and why `tokio::task::spawn()` does not work.
+    // Is it supported to do multiple `node generate_witness.js xxx` in parallel at all?
+    for input_byte_len in 0..248 {
+        let mut input = vec![0; input_byte_len];
+        rng.fill_bytes(&mut input);
+        let padded_input = sha::with_sha_padding_bytes(&input);
+        let padded_input_bits = bytes_to_bits_msb(padded_input);
+
+        let mut hasher = sha2::Sha256::new();
+        hasher.update(input);
+        let expected_output = hasher.finalize().to_vec();
+        let expected_output_bits = bytes_to_bits_msb(expected_output);
+
+        let config = CircuitPaddingConfig::new()
+            .max_length("padded_input_bits", 2048) // should align with the `max_num_blocks=4` in `sha_test.circom`.
+            .max_length("expected_digest_bits", 256);
+
+        let circuit_input_signals = CircuitInputSignals::new()
+            .bits_input("padded_input_bits", padded_input_bits.as_slice())
+            .usize_input("input_bit_len", padded_input_bits.len())
+            .bits_input("expected_digest_bits", expected_output_bits.as_slice())
+            .pad(&config)
+            .unwrap();
+        let result = circuit_handle.gen_witness(circuit_input_signals);
+        println!("input_byte_len={}, result={:?}", input_byte_len, result);
+        assert!(result.is_ok());
+    }
+}
+
+#[test]
+fn sha_padding_verify_test() {
+    let mut rng = ChaCha20Rng::seed_from_u64(TEST_RNG_SEED);
+    let circuit_handle =
+        Arc::new(TestCircuitHandle::new("sha2_padding_verify_test.circom").unwrap());
+
+    for input_byte_len in 180..248 {
+        let input_bit_len = input_byte_len * 8;
+        let mut input = vec![0; input_byte_len];
+        rng.fill_bytes(&mut input);
+        let padded_input = sha::with_sha_padding_bytes(&input);
+        let padded_input_byte_len = padded_input.len();
+        let config = CircuitPaddingConfig::new()
+            .max_length("in", 256)
+            .max_length("L_byte_encoded", 8)
+            .max_length("padding_without_len", 64);
+
+        let circuit_input_signals = CircuitInputSignals::new()
+            .bytes_input("in", padded_input.as_slice())
+            .usize_input("num_blocks", padded_input_byte_len / 64)
+            .usize_input("padding_start", input_byte_len)
+            .bytes_input(
+                "L_byte_encoded",
+                (input_bit_len as u64).to_be_bytes().as_slice(),
+            )
+            .bytes_input(
+                "padding_without_len",
+                &padded_input[input_byte_len..(padded_input_byte_len - 8)],
+            )
+            .pad(&config)
+            .unwrap();
+        println!("circuit_input_signals={:?}", circuit_input_signals);
+        let result = circuit_handle.gen_witness(circuit_input_signals);
+        println!("input_byte_len={}, result={:?}", input_byte_len, result);
+        assert!(result.is_ok());
+    }
+}
diff --git a/keyless/circuit/templates/.gitignore b/keyless/circuit/templates/.gitignore
new file mode 100644
index 0000000000000..9f9eea6064653
--- /dev/null
+++ b/keyless/circuit/templates/.gitignore
@@ -0,0 +1,2 @@
+tags
+*.swp
diff --git a/keyless/circuit/templates/helpers/arrays.circom b/keyless/circuit/templates/helpers/arrays.circom
new file mode 100644
index 0000000000000..54fe02a449b12
--- /dev/null
+++ b/keyless/circuit/templates/helpers/arrays.circom
@@ -0,0 +1,323 @@
+pragma circom 2.1.3;
+
+include "circomlib/circuits/multiplexer.circom";
+include "circomlib/circuits/comparators.circom";
+include "./hashtofield.circom";
+include "./misc.circom";
+
+// Outputs a bit array where indices [start_index, end_index) (inclusive of start_index, exclusive of end_index) are all 1, and all other bits are 0. Does not work if end_index is greater than `len`
+template ArraySelector(len) {
+    signal input start_index;
+    signal input end_index;
+    signal output out[len];
+    assert(end_index > start_index);
+
+    signal start_selector[len] <== SingleOneArray(len)(start_index);
+    signal end_selector[len] <== SingleNegOneArray(len)(end_index);
+
+    out[0] <== start_selector[0];
+    for (var i = 1; i < len; i++) {
+        out[i] <== out[i-1] + start_selector[i] + end_selector[i];
+    }
+}
+
+// Similar to ArraySelector, but works when end_index > start_index is not satisfied, in which
+// case an array of all 0s is returned. Does not work when start_index is 0
+template ArraySelectorComplex(len) {
+    signal input start_index;
+    signal input end_index;
+    signal output out[len];
+
+    signal right_bits[len] <== RightArraySelector(len)(start_index-1);
+    signal left_bits[len] <== LeftArraySelector(len)(end_index);
+
+    for (var i = 0; i < len; i++) {
+        out[i] <== right_bits[i] * left_bits[i]; 
+    }
+
+}
+
+// Outputs a bit array where all bits to the right of `index` are 0, and all other bits are 1
+template LeftArraySelector(len) {
+    signal input index;
+    signal output out[len];
+
+    signal bits[len] <== SingleOneArray(len)(index);
+    var sum;
+    for (var i = 0; i < len; i++) {
+        sum = sum + bits[i];
+    }
+
+    out[len-1] <== 1 - sum;
+    for (var i = len-2; i >= 0; i--) {
+        out[i] <== out[i+1] + bits[i+1];
+    }
+}
+
+// Outputs a bit array where all bits to the left of `index` are 0, and all other bits are 1
+template RightArraySelector(len) {
+    signal input index;
+    signal output out[len];
+
+    signal bits[len] <== SingleOneArray(len)(index);
+
+    out[0] <== 0;
+    for (var i = 1; i < len; i++) {
+        out[i] <== out[i-1] + bits[i-1];
+    }
+}
+
+// Similar to Decoder template from circomlib/circuits/multiplexer.circom
+// Returns a bit array `out` with a 1 at index `index`, and 0s everywhere else
+template SingleOneArray(len) {
+    signal input index;
+
+    signal output out[len];
+    signal success;
+    var lc = 0;
+
+    for (var i = 0; i < len; i++) {
+        out[i] <-- (index == i) ? 1 : 0;
+        out[i] * (index-i) === 0;
+        lc = lc + out[i];
+    }
+    lc ==> success;
+    // support array sizes up to a million. Being conservative here b/c according to Michael this template is very cheap
+    signal should_be_all_zeros <== GreaterEqThan(20)([index, len]);
+    success === 1 * (1 - should_be_all_zeros);
+}
+
+// Given an array 'arr', returns the value at index `index`
+template SelectArrayValue(len) {
+    signal input arr[len];
+    signal input index;
+    signal output out;
+
+    signal selector[len] <== SingleOneArray(len)(index);
+
+    out <== EscalarProduct(len)(arr, selector);
+}
+
+// Similar to Decoder template from circomlib/circuits/multiplexer.circom
+// Returns a bit array `out` with a -1 at index `index`, and 0s everywhere else
+template SingleNegOneArray(len) {
+    signal input index;
+    signal output out[len];
+    signal success;
+    var lc = 0;
+
+    for (var i = 0; i < len; i++) {
+        out[i] <-- (index == i) ? -1 : 0;
+        out[i] * (index-i) === 0;
+        lc = lc + out[i];
+    }
+    lc ==> success;
+    // support array sizes up to a million. Being conservative here b/c according to Michael this template is very cheap
+    signal should_be_all_zeros <== GreaterEqThan(20)([index, len]);
+    success === -1 * (1 - should_be_all_zeros);
+}
+
+// Checks that `substr` of length `substr_len` matches `str` beginning at `start_index`
+// Assumes `random_challenge` is computed by the Fiat-Shamir transform
+// Takes in hash of the full string as an optimization, to prevent it being hashed 
+// multiple times if the template is invoked on that string more than once
+template CheckSubstrInclusionPoly(maxStrLen, maxSubstrLen) {
+    signal input str[maxStrLen];
+    signal input str_hash;
+    signal input substr[maxSubstrLen];
+    signal input substr_len;
+    signal input start_index;
+
+    signal substr_hash <== HashBytesToFieldWithLen(maxSubstrLen)(substr, substr_len);
+    signal random_challenge <== Poseidon(4)([str_hash, substr_hash, substr_len, start_index]);
+
+    signal challenge_powers[maxStrLen];
+    challenge_powers[0] <== 1;
+    challenge_powers[1] <== random_challenge;
+    for (var i = 2; i < maxStrLen; i++) {
+        challenge_powers[i] <== challenge_powers[i-1] * random_challenge;
+    }
+
+    signal selector_bits[maxStrLen] <== ArraySelector(maxStrLen)(start_index, start_index+substr_len); 
+
+    signal selected_str[maxStrLen];
+    for (var i = 0; i < maxStrLen; i++) {
+        selected_str[i] <== selector_bits[i] * str[i];
+    }
+    
+    signal str_poly[maxStrLen];
+    for (var i = 0; i < maxStrLen; i++) {
+        str_poly[i] <== selected_str[i] * challenge_powers[i];
+    }
+
+    signal substr_poly[maxSubstrLen];
+    for (var i = 0; i < maxSubstrLen; i++) {
+        substr_poly[i] <== substr[i] * challenge_powers[i];
+    }
+
+    signal str_poly_eval <== CalculateTotal(maxStrLen)(str_poly);
+    signal substr_poly_eval <== CalculateTotal(maxSubstrLen)(substr_poly);
+
+    var distinguishing_value = SelectArrayValue(maxStrLen)(challenge_powers, start_index);
+
+    str_poly_eval === distinguishing_value * substr_poly_eval;
+}
+
+// Checks that `substr` of length `substr_len` matches `str` beginning at `start_index`
+// Assumes `random_challenge` is computed by the Fiat-Shamir transform
+// Takes in hash of the full string as an optimization, to prevent it being hashed 
+// multiple times if the template is invoked on that string more than once
+// Returns '1' if the check passes, '0' otherwise
+template CheckSubstrInclusionPolyBoolean(maxStrLen, maxSubstrLen) {
+    signal input str[maxStrLen];
+    signal input str_hash;
+    signal input substr[maxSubstrLen];
+    signal input substr_len;
+    signal input start_index;
+    signal output check_passes;
+
+    signal substr_hash <== HashBytesToFieldWithLen(maxSubstrLen)(substr, substr_len);
+    signal random_challenge <== Poseidon(4)([str_hash, substr_hash, substr_len, start_index]);
+
+    signal challenge_powers[maxStrLen];
+    challenge_powers[0] <== 1;
+    challenge_powers[1] <== random_challenge;
+    for (var i = 2; i < maxStrLen; i++) {
+        challenge_powers[i] <== challenge_powers[i-1] * random_challenge;
+    }
+    signal selector_bits[maxStrLen] <== ArraySelector(maxStrLen)(start_index, start_index+substr_len); 
+
+    signal selected_str[maxStrLen];
+    for (var i = 0; i < maxStrLen; i++) {
+        selected_str[i] <== selector_bits[i] * str[i];
+    }
+    
+    signal str_poly[maxStrLen];
+    for (var i = 0; i < maxStrLen; i++) {
+        str_poly[i] <== selected_str[i] * challenge_powers[i];
+    }
+
+    signal substr_poly[maxSubstrLen];
+    for (var i = 0; i < maxSubstrLen; i++) {
+        substr_poly[i] <== substr[i] * challenge_powers[i];
+    }
+
+    signal str_poly_eval <== CalculateTotal(maxStrLen)(str_poly);
+    signal substr_poly_eval <== CalculateTotal(maxSubstrLen)(substr_poly);
+
+    var distinguishing_value = SelectArrayValue(maxStrLen)(challenge_powers, start_index);
+
+    signal right_eq <== distinguishing_value * substr_poly_eval;
+    check_passes <== IsEqual()([str_poly_eval, right_eq]);
+}
+
+// Given `full_string`, `left`, and `right`, checks that full_string = left || right 
+// `random_challenge` is expected to be computed by the Fiat-Shamir transform
+// Assumes `right_len` has been validated to be correct outside of this subcircuit
+template ConcatenationCheck(maxFullStringLen, maxLeftStringLen, maxRightStringLen) {
+    signal input full_string[maxFullStringLen];
+    signal input left[maxLeftStringLen];
+    signal input right[maxRightStringLen];
+    signal input left_len;
+    signal input right_len;
+    
+    signal left_hash <== HashBytesToFieldWithLen(maxLeftStringLen)(left, left_len); 
+    signal right_hash <== HashBytesToFieldWithLen(maxRightStringLen)(right, right_len);
+    signal full_hash <== HashBytesToFieldWithLen(maxFullStringLen)(full_string, left_len+right_len);
+    signal random_challenge <== Poseidon(4)([left_hash, right_hash, full_hash, left_len]);
+
+    // Enforce that all values to the right of `left_len` in `left` are 0-padding. Otherwise an attacker could place the leftmost part of `right` at the end of `left` and still have the polynomial check pass
+    signal left_selector[maxLeftStringLen] <== RightArraySelector(maxLeftStringLen)(left_len-1);
+    for (var i = 0; i < maxLeftStringLen; i++) {
+        left_selector[i] * left[i] === 0;
+    }
+        
+
+    signal challenge_powers[maxFullStringLen];
+    challenge_powers[0] <== 1;
+    challenge_powers[1] <== random_challenge;
+    for (var i = 2; i < maxFullStringLen; i++) {
+       challenge_powers[i] <== challenge_powers[i-1] * random_challenge; 
+    }
+    
+    signal left_poly[maxLeftStringLen];
+    for (var i = 0; i < maxLeftStringLen; i++) {
+       left_poly[i] <== left[i] * challenge_powers[i];
+    }
+
+    signal right_poly[maxRightStringLen];
+    for (var i = 0; i < maxRightStringLen; i++) {
+        right_poly[i] <== right[i] * challenge_powers[i];
+    }
+
+    signal full_poly[maxFullStringLen];
+    for (var i = 0; i < maxFullStringLen; i++) {
+        full_poly[i] <== full_string[i] * challenge_powers[i];
+    }
+
+    signal left_poly_eval <== CalculateTotal(maxLeftStringLen)(left_poly);
+    signal right_poly_eval <== CalculateTotal(maxRightStringLen)(right_poly);
+    signal full_poly_eval <== CalculateTotal(maxFullStringLen)(full_poly);
+
+    var distinguishing_value = SelectArrayValue(maxFullStringLen)(challenge_powers, left_len);
+
+    full_poly_eval === left_poly_eval + distinguishing_value * right_poly_eval;
+}
+
+// Checks every scalar in `in` between 0 and len-1 are valid ASCII digits, i.e. are between
+// 48 and 57 inclusive
+template CheckAreASCIIDigits(maxNumDigits) {
+    signal input in[maxNumDigits];
+    signal input len;
+    
+    signal selector[maxNumDigits] <== ArraySelector(maxNumDigits)(0, len);
+    for (var i = 0; i < maxNumDigits; i++) {
+        var is_less_than_max = LessThan(9)([in[i], 58]);
+        var is_greater_than_min = GreaterThan(9)([in[i], 47]);
+        var is_ascii_digit = AND()(is_less_than_max, is_greater_than_min);
+        (1-is_ascii_digit) * selector[i] === 0;
+    }
+}
+
+// Given a string of digits in ASCII format, returns the digits represented as a single field element
+// Assumes the number represented by the ASCII digits is smaller than the scalar field used by the circuit
+// Does not work when maxLen = 1
+template ASCIIDigitsToField(maxLen) {
+    signal input digits[maxLen]; 
+    signal input len; 
+    signal output out;
+
+    CheckAreASCIIDigits(maxLen)(digits, len);
+    // Set to 0 everywhere except len-1, which is 1
+    signal index_eq[maxLen - 1];
+
+    // For ASCII digits ['1','2','3','4','5'], acc_shifts[0..3] is [12,123,1234]
+    signal acc_shifts[maxLen - 1];
+    // accumulators[i] = acc_shifts[i-1] for all i < len, otherwise accumulators[i] = accumulators[i-1]
+    signal accumulators[maxLen];
+
+    signal success;
+    var index_eq_sum = 0;
+    // `s` is initally set to 1 and is 0 after len == i
+    var s = 1; 
+
+    accumulators[0] <== digits[0]-48;
+    for (var i=1; i<maxLen; i++) {
+        index_eq[i-1] <-- (len == i) ? 1 : 0;
+        index_eq[i-1] * (len-i) === 0;
+
+        s = s - index_eq[i-1];
+        index_eq_sum = index_eq_sum + index_eq[i-1];
+
+        acc_shifts[i-1] <== 10 * accumulators[i-1] + (digits[i]-48);
+        // // This implements a conditional assignment: accumulators[i] = (s == 0 ? accumulators[i-1] : acc_shifts[i-1]);
+        accumulators[i] <== (acc_shifts[i-1] - accumulators[i-1])*s + accumulators[i-1];
+    }
+
+    index_eq_sum ==> success;
+    // Guarantee at most one element of index_eq is equal to 1
+    success === 1;
+
+    out <== accumulators[maxLen - 1];
+}
+
diff --git a/keyless/circuit/templates/helpers/base64.circom b/keyless/circuit/templates/helpers/base64.circom
new file mode 100644
index 0000000000000..b6793e8d6f1f1
--- /dev/null
+++ b/keyless/circuit/templates/helpers/base64.circom
@@ -0,0 +1,145 @@
+pragma circom 2.1.3;
+
+// File taken from https://github.com/zkemail/zk-email-verify/blob/main/packages/circuits/helpers/base64.circom
+
+include "circomlib/circuits/comparators.circom";
+
+// http://0x80.pl/notesen/2016-01-17-sse-base64-decoding.html#vector-lookup-base
+// Modified to support Base64URL format instead of Base64
+// Also accepts zero padding, which is not in the Base64/Base64URL format
+template Base64URLLookup() {
+    signal input in;
+    signal output out;
+
+    // ['A', 'Z']
+    component le_Z = LessThan(8);
+    le_Z.in[0] <== in;
+    le_Z.in[1] <== 90+1;
+
+    component ge_A = GreaterThan(8);
+    ge_A.in[0] <== in;
+    ge_A.in[1] <== 65-1;
+
+    signal range_AZ <== ge_A.out * le_Z.out;
+    signal sum_AZ <== range_AZ * (in - 65);
+
+    // ['a', 'z']
+    component le_z = LessThan(8);
+    le_z.in[0] <== in;
+    le_z.in[1] <== 122+1;
+
+    component ge_a = GreaterThan(8);
+    ge_a.in[0] <== in;
+    ge_a.in[1] <== 97-1;
+
+    signal range_az <== ge_a.out * le_z.out;
+    signal sum_az <== sum_AZ + range_az * (in - 71);
+
+    // ['0', '9']
+    component le_9 = LessThan(8);
+    le_9.in[0] <== in;
+    le_9.in[1] <== 57+1;
+
+    component ge_0 = GreaterThan(8);
+    ge_0.in[0] <== in;
+    ge_0.in[1] <== 48-1;
+
+    signal range_09 <== ge_0.out * le_9.out;
+    signal sum_09 <== sum_az + range_09 * (in + 4);
+
+    // '-'
+    component equal_minus = IsZero();
+    equal_minus.in <== in - 45;
+    // https://www.cs.cmu.edu/~pattis/15-1XX/common/handouts/ascii.html ascii '-' (45)
+    // https://base64.guru/learn/base64-characters  == 62 in base64
+    signal sum_minus <== sum_09 + equal_minus.out * 62;
+
+    // '_'
+    component equal_underscore = IsZero();
+    equal_underscore.in <== in - 95;
+    // https://www.cs.cmu.edu/~pattis/15-1XX/common/handouts/ascii.html ascii '_' (95)
+    // https://base64.guru/learn/base64-characters == 63 in base64
+    signal sum_underscore <== sum_minus + equal_underscore.out * 63;
+
+    out <== sum_underscore;
+    //log("sum_underscore (out): ", out);
+
+    // '='
+    component equal_eqsign = IsZero();
+    equal_eqsign.in <== in - 61;
+
+    // Also decode zero padding as zero padding
+    component zero_padding = IsZero();
+    zero_padding.in <== in;
+
+
+    //log("zero_padding.out: ", zero_padding.out);
+    //log("equal_eqsign.out: ", equal_eqsign.out);
+    //log("equal_underscore.out: ", equal_underscore.out);
+    //log("equal_minus.out: ", equal_minus.out);
+    //log("range_09: ", range_09);
+    //log("range_az: ", range_az);
+    //log("range_AZ: ", range_AZ);
+    //log("< end Base64URLLookup");
+
+    signal result <== range_AZ + range_az + range_09 + equal_minus.out + equal_underscore.out + equal_eqsign.out + zero_padding.out;
+    1 === result;
+}
+
+template Base64Decode(N) {
+    //var N = ((3*M)\4)+2; // TODO: Make sure this is ok
+    var M = 4*((N+2)\3);
+    signal input in[M];
+    signal output out[N];
+
+    component bits_in[M\4][4];
+    component bits_out[M\4][3];
+    component translate[M\4][4];
+
+    var idx = 0;
+    for (var i = 0; i < M; i += 4) {
+        for (var j = 0; j < 3; j++) {
+            bits_out[i\4][j] = Bits2Num(8);
+        }
+
+
+        //     log("range_AZ: ", range_AZ);
+        for (var j = 0; j < 4; j++) {
+            bits_in[i\4][j] = Num2Bits(6);
+
+            //log(">> calling into Base64URLLookup");
+            //log("translate[i\\4][j].in: ", in[i+j]);
+
+            translate[i\4][j] = Base64URLLookup();
+            translate[i\4][j].in <== in[i+j];
+            translate[i\4][j].out ==> bits_in[i\4][j].in;
+        }
+
+        // Do the re-packing from four 6-bit words to three 8-bit words.
+        for (var j = 0; j < 6; j++) {
+            bits_out[i\4][0].in[j+2] <== bits_in[i\4][0].out[j];
+        }
+        bits_out[i\4][0].in[0] <== bits_in[i\4][1].out[4];
+        bits_out[i\4][0].in[1] <== bits_in[i\4][1].out[5];
+
+        for (var j = 0; j < 4; j++) {
+            bits_out[i\4][1].in[j+4] <== bits_in[i\4][1].out[j];
+        }
+        for (var j = 0; j < 4; j++) {
+            bits_out[i\4][1].in[j] <== bits_in[i\4][2].out[j+2];
+        }
+
+        bits_out[i\4][2].in[6] <== bits_in[i\4][2].out[0];
+        bits_out[i\4][2].in[7] <== bits_in[i\4][2].out[1];
+        for (var j = 0; j < 6; j++) {
+            bits_out[i\4][2].in[j] <== bits_in[i\4][3].out[j];
+        }
+
+        for (var j = 0; j < 3; j++) {
+            if (idx+j < N) {
+                out[idx+j] <== bits_out[i\4][j].out;
+            }
+        }
+        idx += 3;
+    }
+}
diff --git a/keyless/circuit/templates/helpers/hashtofield.circom b/keyless/circuit/templates/helpers/hashtofield.circom
new file mode 100644
index 0000000000000..ebd53322e370a
--- /dev/null
+++ b/keyless/circuit/templates/helpers/hashtofield.circom
@@ -0,0 +1,208 @@
+pragma circom 2.1.3;
+
+include "circomlib/circuits/poseidon.circom";
+include "circomlib/circuits/comparators.circom";
+
+// Enforces that each scalar in the input array `in` will fit in a byte
+template CheckAreBytes(numBytes) {
+    signal input in[numBytes];
+
+    for (var i = 0; i < numBytes; i++) {
+        var is_byte = LessThan(9)([in[i], 256]);
+        is_byte === 1;
+    }
+}
+
+// Enforces that each scalar in the input array `in` will fit in a limb of size 64
+template CheckAre64BitLimbs(numLimbs) {
+    signal input in[numLimbs];
+
+    for (var i = 0; i < numLimbs; i++) {
+        var is_byte = LessThan(65)([in[i], 2**64]);
+        is_byte === 1;
+    }
+}
+
+// Hashes multiple bytes to one field element using a Poseidon hash
+// We hash the length of the input as well to prevent collisions
+// Currently does not work with greater than 64*31=1984 bytes
+//
+// Warning: `numBytes` cannot be 0.
+template HashBytesToFieldWithLen(numBytes) {
+    signal input in[numBytes];
+    signal input len;
+    signal output hash;
+
+    CheckAreBytes(numBytes)(in);
+
+    var num_elems = numBytes%31 == 0 ? numBytes\31 : numBytes\31 + 1; 
+
+    signal input_packed[num_elems] <== ChunksToFieldElems(numBytes, 31, 8)(in); // Pack 31 bytes per field element
+
+    signal input_with_len[num_elems+1];
+    for (var i = 0; i < num_elems; i++) {
+        input_with_len[i] <== input_packed[i];
+    }
+    input_with_len[num_elems] <== len;
+
+    hash <== HashElemsToField(num_elems+1)(input_with_len);
+}
+
+// Hashes multiple bytes to one field element using a Poseidon hash
+// We hash the length of the input as well to prevent collisions
+// Currently does not work with greater than 64*31=1984 bytes
+//
+// Warning: `numBytes` cannot be 0.
+template HashBytesToField(numBytes) {
+    signal input in[numBytes];
+    signal output hash;
+
+    CheckAreBytes(numBytes)(in);
+
+    var num_elems = numBytes%31 == 0 ? numBytes\31 : numBytes\31 + 1; 
+
+    signal input_packed[num_elems] <== ChunksToFieldElems(numBytes, 31, 8)(in); // Pack 31 bytes per field element
+
+    hash <== HashElemsToField(num_elems)(input_packed);
+}
+
+// Hashes multiple field elements to one using Poseidon. Works up to 64 input elements
+template HashElemsToField(numElems) {
+    signal input in[numElems];
+    signal output hash;
+
+    if (numElems <= 16) { 
+        hash <== Poseidon(numElems)(in);
+    } else if (numElems <= 32) {
+        signal inputs_one[16];
+        for (var i = 0; i < 16; i++) {
+            inputs_one[i] <== in[i];
+        }
+        signal inputs_two[numElems-16];
+        for (var i = 16; i < numElems; i++) {
+            inputs_two[i-16] <== in[i];
+        }
+        signal h1 <== Poseidon(16)(inputs_one);
+        signal h2 <== Poseidon(numElems-16)(inputs_two);
+        hash <== Poseidon(2)([h1, h2]);
+    } else if (numElems <= 48) {
+        signal inputs_one[16];
+        for (var i = 0; i < 16; i++) {
+            inputs_one[i] <== in[i];
+        }
+        signal inputs_two[16];
+        for (var i = 16; i < 32; i++) {
+            inputs_two[i-16] <== in[i];
+        }
+        signal inputs_three[numElems-32];
+        for (var i = 32; i < numElems; i++) {
+            inputs_three[i-32] <== in[i];
+        }
+        signal h1 <== Poseidon(16)(inputs_one);
+        signal h2 <== Poseidon(16)(inputs_two);
+        signal h3 <== Poseidon(numElems-32)(inputs_three);
+        hash <== Poseidon(3)([h1, h2, h3]); 
+    } else if (numElems <= 64) {
+        signal inputs_one[16];
+        for (var i = 0; i < 16; i++) {
+            inputs_one[i] <== in[i];
+        }
+        signal inputs_two[16];
+        for (var i = 16; i < 32; i++) {
+            inputs_two[i-16] <== in[i];
+        }
+        signal inputs_three[16];
+        for (var i = 32; i < 48; i++) {
+            inputs_three[i-32] <== in[i];
+        }
+        signal inputs_four[numElems-48];
+        for (var i = 48; i < numElems; i++) {
+            inputs_four[i-48] <== in[i];
+        }
+        signal h1 <== Poseidon(16)(inputs_one);
+        signal h2 <== Poseidon(16)(inputs_two);
+        signal h3 <== Poseidon(16)(inputs_three);
+        signal h4 <== Poseidon(numElems-48)(inputs_four);
+        hash <== Poseidon(4)([h1, h2, h3, h4]);  
+    } else {
+        1 === 0;
+    }
+
+}
+
+// Hashes multiple 64 bit limbs to one field element using a Poseidon hash
+// We hash the length of the input as well to avoid collisions
+//
+// Warning: `numLimbs` cannot be 0.
+template Hash64BitLimbsToFieldWithLen(numLimbs) {
+    signal input in[numLimbs];
+    signal input len;
+
+    CheckAre64BitLimbs(numLimbs)(in);
+
+    var num_elems = numLimbs%3 == 0 ? numLimbs\3 : numLimbs\3 + 1; 
+
+    signal input_packed[num_elems] <== ChunksToFieldElems(numLimbs, 3, 64)(in); // Pack 3 64-bit limbs per field element
+
+    signal input_with_len[num_elems+1];
+    for (var i = 0; i < num_elems; i++) {
+        input_with_len[i] <== input_packed[i];
+    }
+    input_with_len[num_elems] <== len;
+
+    signal output hash <== Poseidon(num_elems+1)(input_with_len);
+}
+
+// Inspired by `Bits2Num` in circomlib. Packs chunks of bits into a single field element
+template ChunksToFieldElem(numChunks, bitsPerChunk) {
+    signal input in[numChunks];
+ 
+    signal output out;
+    var lc1 = in[0];
+
+    var e2 = 2**bitsPerChunk;
+    for (var i = 1; i<numChunks; i++) {
+        lc1 += in[i] * e2;
+        e2 = e2 * (2**bitsPerChunk);
+    }
+
+    lc1 ==> out;
+}
+
+// Packs chunks into multiple field elements
+// `inputLen` cannot be 0.
+template ChunksToFieldElems(inputLen, chunksPerFieldElem, bitsPerChunk) {
+    signal input in[inputLen];
+    var num_elems = inputLen%chunksPerFieldElem == 0 ? inputLen \ chunksPerFieldElem : (inputLen\chunksPerFieldElem) + 1; // '\' is the quotient operation - we add 1 if there are extra bits past the full chunks
+    signal output elems[num_elems];
+    component chunks_2_field[num_elems]; 
+    for (var i = 0; i < num_elems-1; i++) {
+        chunks_2_field[i] = ChunksToFieldElem(chunksPerFieldElem, bitsPerChunk); // assign circuit component
+    }
+
+    // If we have an extra chunk that isn't full of bits, we truncate the Bits2NumBigEndian component size for that chunk. This is equivalent to 0 padding the end of the array
+    var num_extra_chunks = inputLen % chunksPerFieldElem;
+    if (num_extra_chunks == 0) {
+        num_extra_chunks = chunksPerFieldElem; // The last field element is full
+        chunks_2_field[num_elems-1] = ChunksToFieldElem(chunksPerFieldElem, bitsPerChunk);
+    } else {
+        chunks_2_field[num_elems-1] = ChunksToFieldElem(num_extra_chunks, bitsPerChunk);
+    }
+
+    // Assign all but the last field element
+    for (var i = 0; i < num_elems-1; i++) {
+        for (var j = 0; j < chunksPerFieldElem; j++) {
+            var index = (i * chunksPerFieldElem) + j;
+            chunks_2_field[i].in[j] <== in[index];
+        }
+        chunks_2_field[i].out ==> elems[i];
+    }
+
+    // Assign the last field element
+    var i = num_elems-1;
+    for (var j = 0; j < num_extra_chunks; j++) {
+        var index = (i*chunksPerFieldElem) + j;
+        chunks_2_field[num_elems-1].in[j] <== in[index];
+    }
+    chunks_2_field[i].out ==> elems[i];
+}
diff --git a/keyless/circuit/templates/helpers/jwt_field_parsing.circom b/keyless/circuit/templates/helpers/jwt_field_parsing.circom
new file mode 100644
index 0000000000000..7cd3ccb9b993b
--- /dev/null
+++ b/keyless/circuit/templates/helpers/jwt_field_parsing.circom
@@ -0,0 +1,186 @@
+pragma circom 2.1.3;
+
+include "./misc.circom";
+include "./arrays.circom";
+include "./hashtofield.circom";
+include "./packing.circom";
+include "circomlib/circuits/gates.circom";
+include "circomlib/circuits/bitify.circom";
+
+template ParseJWTFieldSharedLogic(maxKVPairLen, maxNameLen, maxValueLen) {
+    signal input field[maxKVPairLen]; // ASCII
+    signal input name[maxNameLen];
+    signal input value[maxValueLen];
+    signal input field_len; // ASCII
+    signal input name_len;
+    signal input value_index; // index of value within `field`
+    signal input value_len;
+    signal input colon_index; // index of colon within `field`
+
+    // Enforce that end of name < colon < start of value and that field_len >=
+    // name_len + value_len + 1 (where the +1 is for the colon), so that the
+    // parts of the JWT field are in the correct order
+    signal colon_greater_name <== LessThan(20)([name_len, colon_index]);
+    colon_greater_name === 1;
+    signal colon_less_value <== LessThan(20)([colon_index, value_index]);
+    colon_less_value === 1;
+    signal field_len_ok <== GreaterEqThan(20)([field_len, name_len + value_len + 1]);
+    field_len_ok === 1;
+
+    signal field_hash <== HashBytesToFieldWithLen(maxKVPairLen)(field, field_len);
+
+    signal name_first_quote <== SelectArrayValue(maxKVPairLen)(field, 0);
+    name_first_quote === 34; // '"'
+    CheckSubstrInclusionPoly(maxKVPairLen, maxNameLen)(field, field_hash, name, name_len, 1);
+    signal name_second_quote <== SelectArrayValue(maxKVPairLen)(field, name_len+1);
+    name_second_quote === 34; // '"'
+
+    signal colon <== SelectArrayValue(maxKVPairLen)(field, colon_index);
+    colon === 58; // ':'
+
+    CheckSubstrInclusionPoly(maxKVPairLen, maxValueLen)(field, field_hash, value, value_len, value_index);
+
+    // Enforce last character of `field` is comma or end brace
+    signal last_char <== SelectArrayValue(maxKVPairLen)(field, field_len-1);
+    (last_char - 44) * (last_char - 125) === 0; // ',' or '}'
+}
+
+// Checks the given jwt key value pair has a colon in between the name and value, a comma or endbrace at the end, and only whitespace in between the name and colon, colon and value, and value and end character. Returns the name and value fields 
+// We did this instead of a polynomial concatenation check to avoid having to implement a multi-variable concatenation check
+template ParseJWTFieldWithQuotedValue(maxKVPairLen, maxNameLen, maxValueLen) {
+    signal input field[maxKVPairLen]; // ASCII
+    signal input name[maxNameLen];
+    signal input value[maxValueLen];
+    signal input field_string_bodies[maxKVPairLen];
+    signal input field_len; // ASCII
+    signal input name_len;
+    signal input value_index; // index of value within `field`
+    signal input value_len;
+    signal input colon_index; // index of colon within `field`
+
+    ParseJWTFieldSharedLogic(maxKVPairLen, maxNameLen, maxValueLen)(field, name, value, field_len, name_len, value_index, value_len, colon_index);
+
+    signal value_first_quote <== SelectArrayValue(maxKVPairLen)(field, value_index-1);
+    value_first_quote === 34; // '"'
+    signal value_second_quote <== SelectArrayValue(maxKVPairLen)(field, value_index+value_len);
+    value_second_quote === 34; // '"'
+
+
+    // Verify whitespace is in right places, and that only name and value are inside string bodies
+    signal is_whitespace[maxKVPairLen];
+    for (var i = 0; i < maxKVPairLen; i++) {
+        is_whitespace[i] <== isWhitespace()(field[i]);
+    }
+
+    signal whitespace_selector_one[maxKVPairLen] <== ArraySelectorComplex(maxKVPairLen)(name_len+2, colon_index); // Skip 2 quotes around name, stop 1 index before the colon
+    signal whitespace_selector_two[maxKVPairLen] <== ArraySelectorComplex(maxKVPairLen)(colon_index+1, value_index-1); // Skip 2 quotes around value, stop 1 index before the value
+    signal whitespace_selector_three[maxKVPairLen] <== ArraySelectorComplex(maxKVPairLen)(value_index+value_len+1, field_len-1); // Skip 2 quotes in the value, stop just before the comma/end brace
+    signal name_selector[maxKVPairLen] <== ArraySelector(maxKVPairLen)(1, name_len+1);
+    signal value_selector[maxKVPairLen] <== ArraySelector(maxKVPairLen)(value_index, value_index+value_len);
+
+
+    for (var i = 0; i < maxKVPairLen; i++) {
+        (whitespace_selector_one[i] + whitespace_selector_two[i] + whitespace_selector_three[i]) * (1 - is_whitespace[i]) === 0;
+        
+        // Check that only the name and value parts of the field are inside string bodies, and nothing else is
+        (name_selector[i] + value_selector[i]) * (1 - field_string_bodies[i]) === 0;
+        (1 - (name_selector[i] + value_selector[i])) * field_string_bodies[i] === 0;
+    }
+
+
+
+}
+
+template ParseJWTFieldWithUnquotedValue(maxKVPairLen, maxNameLen, maxValueLen) {
+    signal input field[maxKVPairLen]; // ASCII
+    signal input name[maxNameLen];
+    signal input value[maxValueLen];
+    signal input field_len; // ASCII
+    signal input name_len;
+    signal input value_index; // index of value within `field`
+    signal input value_len;
+    signal input colon_index; // index of colon within `field`
+
+    ParseJWTFieldSharedLogic(maxKVPairLen, maxNameLen, maxValueLen)(field, name, value, field_len, name_len, value_index, value_len, colon_index);
+
+    // Verify whitespace is in right places
+    signal is_whitespace[maxKVPairLen];
+    for (var i = 0; i < maxKVPairLen; i++) {
+        is_whitespace[i] <== isWhitespace()(field[i]);
+    }
+
+    signal whitespace_selector_one[maxKVPairLen] <== ArraySelectorComplex(maxKVPairLen)(name_len+2, colon_index); // Skip 2 quotes around name, stop 1 index before the colon
+    signal whitespace_selector_two[maxKVPairLen] <== ArraySelectorComplex(maxKVPairLen)(colon_index+1, value_index); // no quote this time, so check whitespace until the value start
+    signal whitespace_selector_three[maxKVPairLen] <== ArraySelectorComplex(maxKVPairLen)(value_index+value_len, field_len-1); // and directly after the value end
+
+    for (var i = 0; i < maxKVPairLen; i++) {
+        (whitespace_selector_one[i] + whitespace_selector_two[i] + whitespace_selector_three[i]) * (1 - is_whitespace[i]) === 0;
+    }
+
+    // Verify value does not contain comma, end brace, or quote
+    signal value_selector[maxKVPairLen] <== ArraySelector(maxKVPairLen)(value_index, value_index+value_len);
+
+    for (var i = 0; i < maxKVPairLen; i++) {
+        var is_comma = IsEqual()([field[i], 44]);
+        var is_end_brace = IsEqual()([field[i], 125]);
+        var is_quote = IsEqual()([field[i], 34]);
+        value_selector[i] * (is_comma + is_end_brace + is_quote) === 0;
+    }
+}
+
+template ParseEmailVerifiedField(maxKVPairLen, maxNameLen, maxValueLen) {
+    signal input field[maxKVPairLen]; // ASCII
+    signal input name[maxNameLen];
+    signal input value[maxValueLen];
+    signal input field_len; // ASCII
+    signal input name_len;
+    signal input value_index; // index of value within `field`
+    signal input value_len;
+    signal input colon_index; // index of colon within `field`
+
+
+    ParseJWTFieldSharedLogic(maxKVPairLen, maxNameLen, maxValueLen)(field, name, value, field_len, name_len, value_index, value_len, colon_index);
+
+
+    signal char_before_value <== SelectArrayValue(maxKVPairLen)(field, value_index-1);
+    signal before_is_quote      <== IsEqual()([char_before_value, 34]);
+    signal before_is_whitespace <== isWhitespace()(char_before_value);
+    signal before_is_whitespace_or_quote <== OR()(before_is_quote, before_is_whitespace);
+    // Check the char before is either quote or whitespace, OR that it is the colon
+    (1 - before_is_whitespace_or_quote)*(value_index-1-colon_index) === 0;
+    signal char_after_value <== SelectArrayValue(maxKVPairLen)(field, value_index+value_len);
+    signal after_is_quote       <== IsEqual()([char_after_value, 34]);
+    signal after_is_whitespace  <== isWhitespace()(char_after_value);
+    // check OR(after_is_quote, after_is_whitespace) === 1.
+    signal after_is_whitespace_or_quote <== OR()(after_is_quote, after_is_whitespace);
+    // Check the char after is either quote or whitespace, OR that it is the field delimiter
+    (1 - after_is_whitespace_or_quote)*(field_len-1-value_index-value_len) === 0;
+
+    // Check that field value doesn't have mismatched quotes
+    signal and_1 <== AND()(before_is_quote,after_is_whitespace);
+    signal and_2 <== AND()(before_is_whitespace,after_is_quote);
+    and_1 + and_2 === 0;
+
+
+    signal is_whitespace[maxKVPairLen];
+    for (var i = 0; i < maxKVPairLen; i++) {
+        is_whitespace[i] <== isWhitespace()(field[i]);
+    }
+
+    signal whitespace_selector_one[maxKVPairLen] <== ArraySelectorComplex(maxKVPairLen)(name_len+2, colon_index); // Skip 2 quotes around name, stop 1 index before the colon
+    signal whitespace_selector_two[maxKVPairLen] <== ArraySelectorComplex(maxKVPairLen)(colon_index+1, value_index-1); // There could potentially be quotes around the value, so we don't contstrain the character before value_index to be whitespace
+    signal whitespace_selector_three[maxKVPairLen] <== ArraySelectorComplex(maxKVPairLen)(value_index+value_len+1, field_len-1); // similarly to before, don't constrain character just after value end
+
+
+    signal name_selector[maxKVPairLen] <== ArraySelector(maxKVPairLen)(1, name_len+1);
+    signal value_selector[maxKVPairLen] <== ArraySelector(maxKVPairLen)(value_index, value_index+value_len);
+
+
+    for (var i = 0; i < maxKVPairLen; i++) {
+        (whitespace_selector_one[i] + whitespace_selector_two[i] + whitespace_selector_three[i]) * (1 - is_whitespace[i]) === 0;
+    }
+}
+
+
+
+
diff --git a/keyless/circuit/templates/helpers/misc.circom b/keyless/circuit/templates/helpers/misc.circom
new file mode 100644
index 0000000000000..109e824fa6d76
--- /dev/null
+++ b/keyless/circuit/templates/helpers/misc.circom
@@ -0,0 +1,174 @@
+pragma circom 2.1.3;
+
+include "./arrays.circom";
+include "./hashtofield.circom";
+include "./packing.circom";
+include "circomlib/circuits/gates.circom";
+include "circomlib/circuits/bitify.circom";
+
+// Checks if character 'char' is a whitespace character. Returns 1 if so, 0 otherwise
+// Assumes char is a valid ascii character. Does not check for non-ascii unicode whitespace chars.
+template isWhitespace() {
+   signal input char;  
+                       
+   signal is_tab <== IsEqual()([char, 9]); // character is a tab space
+
+   signal is_line_break_part_1 <== GreaterEqThan(8)([char, 10]); // ASCII bytes values between 10 ...
+   signal is_line_break_part_2 <== LessEqThan(8)([char, 13]); //    ... and 13 inclusive are line break characters
+   signal is_line_break <== is_line_break_part_1 * is_line_break_part_2;
+
+   signal is_space <== IsEqual()([char, 32]); // ' '
+                       
+   signal output is_whitespace <== is_tab + is_line_break + is_space;
+}
+
+// https://github.com/TheFrozenFire/snark-jwt-verify/blob/master/circuits/calculate_total.circom
+// This circuit returns the sum of the inputs.
+// n must be greater than 0.
+template CalculateTotal(n) {
+    signal input nums[n];
+    signal output sum;
+
+    signal sums[n];
+    sums[0] <== nums[0];
+
+    for (var i=1; i < n; i++) {
+        sums[i] <== sums[i - 1] + nums[i];
+    }
+
+    sum <== sums[n - 1];
+}
+
+// Given input `in`, enforces that `in[0] === in[1]` if `bool` is 1
+template AssertEqualIfTrue() {
+    signal input in[2];
+    signal input bool;
+
+    (in[0]-in[1]) * bool === 0;
+}
+
+// Enforce that if uid name is "email", the email verified field is either true or "true"
+template EmailVerifiedCheck(maxEVNameLen, maxEVValueLen, maxUIDNameLen) {
+    signal input ev_name[maxEVNameLen];
+    signal input ev_value[maxEVValueLen];
+    signal input ev_value_len;
+    signal input uid_name[maxUIDNameLen];
+    signal input uid_name_len;
+    signal output uid_is_email;
+
+    var email[5] = [101, 109, 97, 105, 108]; // email
+
+    var uid_starts_with_email_0 = IsEqual()([email[0], uid_name[0]]);
+    var uid_starts_with_email_1 = IsEqual()([email[1], uid_name[1]]);
+    var uid_starts_with_email_2 = IsEqual()([email[2], uid_name[2]]);
+    var uid_starts_with_email_3 = IsEqual()([email[3], uid_name[3]]);
+    var uid_starts_with_email_4 = IsEqual()([email[4], uid_name[4]]);
+
+    var uid_starts_with_email = MultiAND(5)([uid_starts_with_email_0, uid_starts_with_email_1, uid_starts_with_email_2, uid_starts_with_email_3, uid_starts_with_email_4]);
+
+
+    signal uid_name_len_is_5 <== IsEqual()([uid_name_len, 5]);
+    uid_is_email <== AND()(uid_starts_with_email, uid_name_len_is_5); // '1' if uid_name is "email" with length 5. This guarantees uid_name is in fact "email" (with quotes) combined with the logic in `JWTFieldCheck`
+
+    var required_ev_name[14] = [101, 109, 97, 105, 108, 95, 118, 101, 114, 105, 102, 105, 101, 100];    // email_verified
+
+    // If uid name is "email", enforce ev_name is "email_verified"
+    for (var i = 0; i < 14; i++) {
+        AssertEqualIfTrue()([ev_name[i], required_ev_name[i]], uid_is_email);
+    }
+
+    signal ev_val_len_is_4 <== IsEqual()([ev_value_len, 4]);
+    signal ev_val_len_is_6 <== IsEqual()([ev_value_len, 6]);
+    var ev_val_len_is_correct = OR()(ev_val_len_is_4, ev_val_len_is_6);
+
+    signal not_uid_is_email <== NOT()(uid_is_email);
+    signal is_ok <== OR()(not_uid_is_email, ev_val_len_is_correct);
+    is_ok === 1;
+    
+    var required_ev_val_len_4[4] = [116, 114, 117, 101]; // true
+    signal check_ev_val_bool <== AND()(ev_val_len_is_4, uid_is_email);
+    for (var i = 0; i < 4; i ++) {
+        AssertEqualIfTrue()([required_ev_val_len_4[i], ev_value[i]], check_ev_val_bool);
+    }
+
+    var required_ev_val_len_6[6] = [34, 116, 114, 117, 101, 34]; // "true"
+    signal check_ev_val_str <== AND()(ev_val_len_is_6, uid_is_email);
+    for (var i = 0; i < 6; i++) {
+        AssertEqualIfTrue()([required_ev_val_len_6[i], ev_value[i]], check_ev_val_str);
+    }
+}
+
+
+template StringBodies(len) {
+  signal input in[len];
+  signal output out[len];
+
+
+  signal quotes[len];
+  signal quote_parity[len];
+  signal quote_parity_1[len];
+  signal quote_parity_2[len];
+
+  signal backslashes[len];
+  signal adjacent_backslash_parity[len];
+
+  quotes[0] <== IsEqual()([in[0], 34]); 
+  quote_parity[0] <== IsEqual()([in[0], 34]); 
+
+  backslashes[0] <== IsEqual()([in[0], 92]);
+  adjacent_backslash_parity[0] <== IsEqual()([in[0], 92]);
+
+  for (var i = 1; i < len; i++) {
+    backslashes[i] <== IsEqual()([in[i], 92]);
+    adjacent_backslash_parity[i] <== backslashes[i] * (1 - adjacent_backslash_parity[i-1]);
+  }
+
+  for (var i = 1; i < len; i++) {
+    var is_quote = IsEqual()([in[i], 34]); 
+    var prev_is_odd_backslash = adjacent_backslash_parity[i-1];
+    quotes[i] <== is_quote * (1 - prev_is_odd_backslash);
+    quote_parity_1[i] <== quotes[i] * (1 - quote_parity[i-1]);
+    quote_parity_2[i] <== (1 - quotes[i]) * quote_parity[i-1];
+    quote_parity[i] <== quote_parity_1[i] + quote_parity_2[i];
+  }
+
+
+  out[0] <== 0;
+
+  for (var i = 1; i < len; i++) {
+    out[i] <== AND()(quote_parity[i-1], quote_parity[i]);
+  }
+}
+
+
+// Given a base64-encoded array `in`, max length `maxN`, and actual unpadded length `n`, returns
+// the actual length of the decoded string
+template Base64DecodedLength(maxN) {
+    var max_q = (3 * maxN) \ 4;
+    //signal input in[maxN];
+    signal input n; // actual lenght
+    signal output decoded_len;
+    signal q <-- 3*n \ 4;
+    signal r <-- 3*n % 4;
+
+    3*n - 4*q - r === 0;
+    signal r_correct_reminder <== LessThan(2)([r, 4]);
+    r_correct_reminder === 1;
+
+    // use log function to compute log(max_q)
+    signal q_correct_quotient <== LessThan(252)([q, max_q]);
+    q_correct_quotient === 1;
+
+    // var eq = 61;
+    // assumes valid encoding (if last != "=" then second to last is also
+    // != "=")
+    // TODO: We don't seem to need this, as the jwt spec removes b64 padding
+    // see https://datatracker.ietf.org/doc/html/rfc7515#page-54
+    //signal l <== SelectArrayValue(maxN)(in, n - 1);
+    //signal s2l <== SelectArrayValue(maxN)(in, n - 2);
+    //signal s_l <== IsEqual()([l, eq]);
+    //signal s_s2l <== IsEqual()([s2l, eq]);
+    //signal reducer <== -1*s_l -1*s_s2l;
+    //decoded_len <== q + reducer;
+    //log("decoded_len", decoded_len);
+}
diff --git a/keyless/circuit/templates/helpers/packing.circom b/keyless/circuit/templates/helpers/packing.circom
new file mode 100644
index 0000000000000..a34b856edd9e7
--- /dev/null
+++ b/keyless/circuit/templates/helpers/packing.circom
@@ -0,0 +1,93 @@
+pragma circom 2.1.3;
+
+include "./arrays.circom";
+
+// Based on `Num2Bits` in circomlib
+template Num2BitsBE(n) {
+    signal input in;
+    signal output out[n];
+    var lc1 = 0;
+   
+    var e2 = 1;
+    for (var i = 0; i < n; i++) {
+        var idx = (n - 1) - i;
+        out[idx] <-- (in >> i) & 1;
+        out[idx] * (out[idx] - 1 ) === 0;
+        lc1 += out[idx] * e2;
+        e2 = e2 + e2;
+    }
+    lc1 === in;
+}
+
+// Converts a bit array into a big endian integer
+// Inspired by Bits2Num in https://github.com/iden3/circomlib/blob/master/circuits/bitify.circom
+template Bits2NumBigEndian(n) { 
+    signal input in[n];
+    signal output out;
+    var lc1=0;
+    
+    var e2 = 1;
+    for (var i = 0; i < n; i++) {
+        var index = n-1-i;
+        lc1 += in[index] * e2;
+        e2 = e2 + e2;
+    }
+    lc1 ==> out;
+}
+
+
+// Converts byte array `in` into a bit array
+template BytesToBits(inputLen) {
+    signal input in[inputLen];
+    var byte_len = 8;
+    signal output bits[byte_len*inputLen];
+    component num2bits[inputLen];
+    for (var i = 0; i < inputLen; i++) {
+        num2bits[i] = Num2BitsBE(byte_len);
+        num2bits[i].in <== in[i];
+        for (var j = 0; j < byte_len; j++) {
+            var index = (i*byte_len)+j;
+            num2bits[i].out[j] ==> bits[index];
+        }
+    }
+}
+
+
+// Converts bit array 'in' into an array of field elements of size `bitsPerFieldElem` each
+// Example: with inputLen=11, bitsPerFieldElem=4, [0,0,0,0, 0,0,0,1, 0,1,1,] ==> [0, 1, 6]
+template BitsToFieldElems(inputLen, bitsPerFieldElem) {
+    signal input in[inputLen];
+    var num_elems = inputLen%bitsPerFieldElem == 0 ? inputLen \ bitsPerFieldElem : (inputLen\bitsPerFieldElem) + 1; // '\' is the quotient operation - we add 1 if there are extra bits past the full bytes
+    signal output elems[num_elems];
+    component bits_2_num_be[num_elems]; 
+    for (var i = 0; i < num_elems-1; i++) {
+        bits_2_num_be[i] = Bits2NumBigEndian(bitsPerFieldElem); // assign circuit component
+    }
+
+    // If we have an extra byte that isn't full of bits, we truncate the Bits2NumBigEndian component size for that byte. This is equivalent to 0 padding the end of the array
+    var num_extra_bits = inputLen % bitsPerFieldElem;
+    if (num_extra_bits == 0) {
+        num_extra_bits = bitsPerFieldElem; // The last field element is full
+        bits_2_num_be[num_elems-1] = Bits2NumBigEndian(bitsPerFieldElem);
+    } else {
+        bits_2_num_be[num_elems-1] = Bits2NumBigEndian(num_extra_bits);
+    }
+
+    // Assign all but the last field element
+    for (var i = 0; i < num_elems-1; i++) {
+        for (var j = 0; j < bitsPerFieldElem; j++) {
+            var index = (i * bitsPerFieldElem) + j;
+            bits_2_num_be[i].in[j] <== in[index];
+        }
+        bits_2_num_be[i].out ==> elems[i];
+    }
+
+    // Assign the last field element
+    for (var j = 0; j < num_extra_bits; j++) {
+        var i = num_elems-1;
+        var index = (i*bitsPerFieldElem) + j;
+        bits_2_num_be[num_elems-1].in[j] <== in[index];
+    }
+    bits_2_num_be[num_elems-1].out ==> elems[num_elems-1];
+}
+
diff --git a/keyless/circuit/templates/helpers/rsa/bigint.circom b/keyless/circuit/templates/helpers/rsa/bigint.circom
new file mode 100644
index 0000000000000..55fa7a453c860
--- /dev/null
+++ b/keyless/circuit/templates/helpers/rsa/bigint.circom
@@ -0,0 +1,563 @@
+pragma circom 2.0.2;
+
+// File copied from https://github.com/doubleblind-xyz/circom-rsa/blob/master/circuits/bigint.circom
+
+include "circomlib/circuits/comparators.circom";
+include "circomlib/circuits/bitify.circom";
+include "circomlib/circuits/gates.circom";
+
+include "./bigint_func.circom";
+
+// addition mod 2**n with carry bit
+template ModSum(n) {
+    assert(n <= 252);
+    signal input a;
+    signal input b;
+    signal output sum;
+    signal output carry;
+
+    component n2b = Num2Bits(n + 1);
+    n2b.in <== a + b;
+    carry <== n2b.out[n];
+    sum <== a + b - carry * (1 << n);
+}
+
+// a - b
+template ModSub(n) {
+    assert(n <= 252);
+    signal input a;
+    signal input b;
+    signal output out;
+    signal output borrow;
+    component lt = LessThan(n);
+    lt.in[0] <== a;
+    lt.in[1] <== b;
+    borrow <== lt.out;
+    out <== borrow * (1 << n) + a - b;
+}
+
+// a - b - c
+// assume a - b - c + 2**n >= 0
+template ModSubThree(n) {
+    assert(n + 2 <= 253);
+    signal input a;
+    signal input b;
+    signal input c;
+    assert(a - b - c + (1 << n) >= 0);
+    signal output out;
+    signal output borrow;
+    signal b_plus_c;
+    b_plus_c <== b + c;
+    component lt = LessThan(n + 1);
+    lt.in[0] <== a;
+    lt.in[1] <== b_plus_c;
+    borrow <== lt.out;
+    out <== borrow * (1 << n) + a - b_plus_c;
+}
+
+template ModSumThree(n) {
+    assert(n + 2 <= 253);
+    signal input a;
+    signal input b;
+    signal input c;
+    signal output sum;
+    signal output carry;
+
+    component n2b = Num2Bits(n + 2);
+    n2b.in <== a + b + c;
+    carry <== n2b.out[n] + 2 * n2b.out[n + 1];
+    sum <== a + b + c - carry * (1 << n);
+}
+
+template ModSumFour(n) {
+    assert(n + 2 <= 253);
+    signal input a;
+    signal input b;
+    signal input c;
+    signal input d;
+    signal output sum;
+    signal output carry;
+
+    component n2b = Num2Bits(n + 2);
+    n2b.in <== a + b + c + d;
+    carry <== n2b.out[n] + 2 * n2b.out[n + 1];
+    sum <== a + b + c + d - carry * (1 << n);
+}
+
+// product mod 2**n with carry
+template ModProd(n) {
+    assert(n <= 126);
+    signal input a;
+    signal input b;
+    signal output prod;
+    signal output carry;
+
+    component n2b = Num2Bits(2 * n);
+    n2b.in <== a * b;
+
+    component b2n1 = Bits2Num(n);
+    component b2n2 = Bits2Num(n);
+    var i;
+    for (i = 0; i < n; i++) {
+        b2n1.in[i] <== n2b.out[i];
+        b2n2.in[i] <== n2b.out[i + n];
+    }
+    prod <== b2n1.out;
+    carry <== b2n2.out;
+}
+
+// split a n + m bit input into two outputs
+template Split(n, m) {
+    assert(n <= 126);
+    signal input in;
+    signal output small;
+    signal output big;
+
+    small <-- in % (1 << n);
+    big <-- in \ (1 << n);
+
+    component n2b_small = Num2Bits(n);
+    n2b_small.in <== small;
+    component n2b_big = Num2Bits(m);
+    n2b_big.in <== big;
+
+    in === small + big * (1 << n);
+}
+
+// split a n + m + k bit input into three outputs
+template SplitThree(n, m, k) {
+    assert(n <= 126);
+    signal input in;
+    signal output small;
+    signal output medium;
+    signal output big;
+
+    small <-- in % (1 << n);
+    medium <-- (in \ (1 << n)) % (1 << m);
+    big <-- in \ (1 << n + m);
+
+    component n2b_small = Num2Bits(n);
+    n2b_small.in <== small;
+    component n2b_medium = Num2Bits(m);
+    n2b_medium.in <== medium;
+    component n2b_big = Num2Bits(k);
+    n2b_big.in <== big;
+
+    in === small + medium * (1 << n) + big * (1 << n + m);
+}
+
+// a[i], b[i] in 0... 2**n-1
+// represent a = a[0] + a[1] * 2**n + .. + a[k - 1] * 2**(n * k)
+template BigAdd(n, k) {
+    assert(n <= 252);
+    signal input a[k];
+    signal input b[k];
+    signal output out[k + 1];
+
+    component unit0 = ModSum(n);
+    unit0.a <== a[0];
+    unit0.b <== b[0];
+    out[0] <== unit0.sum;
+
+    component unit[k - 1];
+    for (var i = 1; i < k; i++) {
+        unit[i - 1] = ModSumThree(n);
+        unit[i - 1].a <== a[i];
+        unit[i - 1].b <== b[i];
+        if (i == 1) {
+            unit[i - 1].c <== unit0.carry;
+        } else {
+            unit[i - 1].c <== unit[i - 2].carry;
+        }
+        out[i] <== unit[i - 1].sum;
+    }
+    out[k] <== unit[k - 2].carry;
+}
+
+// a and b have n-bit registers
+// a has ka registers, each with NONNEGATIVE ma-bit values (ma can be > n)
+// b has kb registers, each with NONNEGATIVE mb-bit values (mb can be > n)
+// out has ka + kb - 1 registers, each with (ma + mb + ceil(log(max(ka, kb))))-bit values
+template BigMultNoCarry(n, ma, mb, ka, kb) {
+    assert(ma + mb <= 253);
+    signal input a[ka];
+    signal input b[kb];
+    signal output out[ka + kb - 1];
+
+    var prod_val[ka + kb - 1];
+    for (var i = 0; i < ka + kb - 1; i++) {
+        prod_val[i] = 0;
+    }
+    for (var i = 0; i < ka; i++) {
+        for (var j = 0; j < kb; j++) {
+            prod_val[i + j] += a[i] * b[j];
+        }
+    }
+    for (var i = 0; i < ka + kb - 1; i++) {
+        out[i] <-- prod_val[i];
+    }
+
+    var a_poly[ka + kb - 1];
+    var b_poly[ka + kb - 1];
+    var out_poly[ka + kb - 1];
+    for (var i = 0; i < ka + kb - 1; i++) {
+        out_poly[i] = 0;
+        a_poly[i] = 0;
+        b_poly[i] = 0;
+        for (var j = 0; j < ka + kb - 1; j++) {
+            out_poly[i] = out_poly[i] + out[j] * (i ** j);
+        }
+        for (var j = 0; j < ka; j++) {
+            a_poly[i] = a_poly[i] + a[j] * (i ** j);
+        }
+        for (var j = 0; j < kb; j++) {
+            b_poly[i] = b_poly[i] + b[j] * (i ** j);
+        }
+    }
+    for (var i = 0; i < ka + kb - 1; i++) {
+        out_poly[i] === a_poly[i] * b_poly[i];
+    }
+}
+
+
+// in[i] contains longs
+// out[i] contains shorts
+template LongToShortNoEndCarry(n, k) {
+    assert(n <= 126);
+    signal input in[k];
+    signal output out[k+1];
+
+    var split[k][3];
+    for (var i = 0; i < k; i++) {
+        split[i] = SplitThreeFn(in[i], n, n, n);
+    }
+
+    var carry[k];
+    carry[0] = 0;
+    out[0] <-- split[0][0];
+    if (k == 1) {
+	out[1] <-- split[0][1];
+    }
+    if (k > 1) {
+        var sumAndCarry[2] = SplitFn(split[0][1] + split[1][0], n, n);
+        out[1] <-- sumAndCarry[0];
+        carry[1] = sumAndCarry[1];
+    }
+    if (k == 2) {
+	out[2] <-- split[1][1] + split[0][2] + carry[1];
+    }
+    if (k > 2) {
+        for (var i = 2; i < k; i++) {
+            var sumAndCarry[2] = SplitFn(split[i][0] + split[i-1][1] + split[i-2][2] + carry[i-1], n, n);
+            out[i] <-- sumAndCarry[0];
+            carry[i] = sumAndCarry[1];
+        }
+        out[k] <-- split[k-1][1] + split[k-2][2] + carry[k-1];
+    }
+
+    component outRangeChecks[k+1];
+    for (var i = 0; i < k+1; i++) {
+        outRangeChecks[i] = Num2Bits(n);
+        outRangeChecks[i].in <== out[i];
+    }
+
+    signal runningCarry[k];
+    component runningCarryRangeChecks[k];
+    runningCarry[0] <-- (in[0] - out[0]) / (1 << n);
+    runningCarryRangeChecks[0] = Num2Bits(n + log_ceil(k));
+    runningCarryRangeChecks[0].in <== runningCarry[0];
+    runningCarry[0] * (1 << n) === in[0] - out[0];
+    for (var i = 1; i < k; i++) {
+        runningCarry[i] <-- (in[i] - out[i] + runningCarry[i-1]) / (1 << n);
+        runningCarryRangeChecks[i] = Num2Bits(n + log_ceil(k));
+        runningCarryRangeChecks[i].in <== runningCarry[i];
+        runningCarry[i] * (1 << n) === in[i] - out[i] + runningCarry[i-1];
+    }
+    runningCarry[k-1] === out[k];
+}
+
+template BigMult(n, k) {
+    signal input a[k];
+    signal input b[k];
+    signal output out[2 * k];
+
+    component mult = BigMultNoCarry(n, n, n, k, k);
+    for (var i = 0; i < k; i++) {
+        mult.a[i] <== a[i];
+        mult.b[i] <== b[i];
+    }
+
+    // no carry is possible in the highest order register
+    component longshort = LongToShortNoEndCarry(n, 2 * k - 1);
+    for (var i = 0; i < 2 * k - 1; i++) {
+        longshort.in[i] <== mult.out[i];
+    }
+    for (var i = 0; i < 2 * k; i++) {
+        out[i] <== longshort.out[i];
+    }
+}
+
+template BigLessThan(n, k){
+    signal input a[k];
+    signal input b[k];
+    signal output out;
+
+    component lt[k];
+    component eq[k];
+    for (var i = 0; i < k; i++) {
+        lt[i] = LessThan(n);
+        lt[i].in[0] <== a[i];
+        lt[i].in[1] <== b[i];
+        eq[i] = IsEqual();
+        eq[i].in[0] <== a[i];
+        eq[i].in[1] <== b[i];
+    }
+
+    // ors[i] holds (lt[k - 1] || (eq[k - 1] && lt[k - 2]) .. || (eq[k - 1] && .. && lt[i]))
+    // ands[i] holds (eq[k - 1] && .. && lt[i])
+    // eq_ands[i] holds (eq[k - 1] && .. && eq[i])
+    component ors[k - 1];
+    component ands[k - 1];
+    component eq_ands[k - 1];
+    for (var i = k - 2; i >= 0; i--) {
+        ands[i] = AND();
+        eq_ands[i] = AND();
+        ors[i] = OR();
+
+        if (i == k - 2) {
+           ands[i].a <== eq[k - 1].out;
+           ands[i].b <== lt[k - 2].out;
+           eq_ands[i].a <== eq[k - 1].out;
+           eq_ands[i].b <== eq[k - 2].out;
+           ors[i].a <== lt[k - 1].out;
+           ors[i].b <== ands[i].out;
+        } else {
+           ands[i].a <== eq_ands[i + 1].out;
+           ands[i].b <== lt[i].out;
+           eq_ands[i].a <== eq_ands[i + 1].out;
+           eq_ands[i].b <== eq[i].out;
+           ors[i].a <== ors[i + 1].out;
+           ors[i].b <== ands[i].out;
+        }
+     }
+     out <== ors[0].out;
+}
+
+template BigIsEqual(k){
+    signal input in[2][k];
+    signal output out;
+    component isEqual[k+1];
+    var sum = 0;
+    for(var i = 0; i < k; i++){
+        isEqual[i] = IsEqual();
+        isEqual[i].in[0] <== in[0][i];
+        isEqual[i].in[1] <== in[1][i];
+        sum = sum + isEqual[i].out;
+    }
+
+    isEqual[k] = IsEqual();
+    isEqual[k].in[0] <== sum;
+    isEqual[k].in[1] <== k;
+    out <== isEqual[k].out;
+}
+
+// leading register of b should be non-zero
+template BigMod(n, k) {
+    assert(n <= 126);
+    signal input a[2 * k];
+    signal input b[k];
+
+    signal output div[k + 1];
+    signal output mod[k];
+
+    var longdiv[2][100] = long_div(n, k, k, a, b);
+    for (var i = 0; i < k; i++) {
+        div[i] <-- longdiv[0][i];
+        mod[i] <-- longdiv[1][i];
+    }
+    div[k] <-- longdiv[0][k];
+    component range_checks[k + 1];
+    for (var i = 0; i <= k; i++) {
+        range_checks[i] = Num2Bits(n);
+        range_checks[i].in <== div[i];
+    }
+
+    component mul = BigMult(n, k + 1);
+    for (var i = 0; i < k; i++) {
+        mul.a[i] <== div[i];
+        mul.b[i] <== b[i];
+    }
+    mul.a[k] <== div[k];
+    mul.b[k] <== 0;
+
+    component add = BigAdd(n, 2 * k + 2);
+    for (var i = 0; i < 2 * k; i++) {
+        add.a[i] <== mul.out[i];
+        if (i < k) {
+            add.b[i] <== mod[i];
+        } else {
+            add.b[i] <== 0;
+        }
+    }
+    add.a[2 * k] <== mul.out[2 * k];
+    add.a[2 * k + 1] <== mul.out[2 * k + 1];
+    add.b[2 * k] <== 0;
+    add.b[2 * k + 1] <== 0;
+
+    for (var i = 0; i < 2 * k; i++) {
+        add.out[i] === a[i];
+    }
+    add.out[2 * k] === 0;
+    add.out[2 * k + 1] === 0;
+
+    component lt = BigLessThan(n, k);
+    for (var i = 0; i < k; i++) {
+        lt.a[i] <== mod[i];
+        lt.b[i] <== b[i];
+    }
+    lt.out === 1;
+}
+
+// a[i], b[i] in 0... 2**n-1
+// represent a = a[0] + a[1] * 2**n + .. + a[k - 1] * 2**(n * k)
+// assume a >= b
+template BigSub(n, k) {
+    assert(n <= 252);
+    signal input a[k];
+    signal input b[k];
+    signal output out[k];
+    signal output underflow;
+
+    component unit0 = ModSub(n);
+    unit0.a <== a[0];
+    unit0.b <== b[0];
+    out[0] <== unit0.out;
+
+    component unit[k - 1];
+    for (var i = 1; i < k; i++) {
+        unit[i - 1] = ModSubThree(n);
+        unit[i - 1].a <== a[i];
+        unit[i - 1].b <== b[i];
+        if (i == 1) {
+            unit[i - 1].c <== unit0.borrow;
+        } else {
+            unit[i - 1].c <== unit[i - 2].borrow;
+        }
+        out[i] <== unit[i - 1].out;
+    }
+    underflow <== unit[k - 2].borrow;
+}
+
+// calculates (a - b) % p, where a, b < p
+// note: does not assume a >= b
+template BigSubModP(n, k){
+    assert(n <= 252);
+    signal input a[k];
+    signal input b[k];
+    signal input p[k];
+    signal output out[k];
+    component sub = BigSub(n, k);
+    for (var i = 0; i < k; i++){
+        sub.a[i] <== a[i];
+        sub.b[i] <== b[i];
+    }
+    signal flag;
+    flag <== sub.underflow;
+    component add = BigAdd(n, k);
+    for (var i = 0; i < k; i++){
+        add.a[i] <== sub.out[i];
+        add.b[i] <== flag * p[i];
+    }
+    for (var i = 0; i < k; i++){
+        out[i] <== add.out[i];
+    }
+}
+
+template BigMultModP(n, k) {
+    assert(n <= 252);
+    signal input a[k];
+    signal input b[k];
+    signal input p[k];
+    signal output out[k];
+
+    component big_mult = BigMult(n, k);
+    for (var i = 0; i < k; i++) {
+        big_mult.a[i] <== a[i];
+        big_mult.b[i] <== b[i];
+    }
+    component big_mod = BigMod(n, k);
+    for (var i = 0; i < 2 * k; i++) {
+        big_mod.a[i] <== big_mult.out[i];
+    }
+    for (var i = 0; i < k; i++) {
+        big_mod.b[i] <== p[i];
+    }
+    for (var i = 0; i < k; i++) {
+        out[i] <== big_mod.mod[i];
+    }
+}
+
+template BigModInv(n, k) {
+    assert(n <= 252);
+    signal input in[k];
+    signal input p[k];
+    signal output out[k];
+
+    // length k
+    var inv[100] = mod_inv(n, k, in, p);
+    for (var i = 0; i < k; i++) {
+        out[i] <-- inv[i];
+    }
+    component range_checks[k];
+    for (var i = 0; i < k; i++) {
+        range_checks[i] = Num2Bits(n);
+        range_checks[i].in <== out[i];
+    }
+
+    component mult = BigMult(n, k);
+    for (var i = 0; i < k; i++) {
+        mult.a[i] <== in[i];
+        mult.b[i] <== out[i];
+    }
+    component mod = BigMod(n, k);
+    for (var i = 0; i < 2 * k; i++) {
+        mod.a[i] <== mult.out[i];
+    }
+    for (var i = 0; i < k; i++) {
+        mod.b[i] <== p[i];
+    }
+    mod.mod[0] === 1;
+    for (var i = 1; i < k; i++) {
+        mod.mod[i] === 0;
+    }
+}
+
+// in[i] contains values in the range -2^(m-1) to 2^(m-1)
+// constrain that in[] as a big integer is zero
+// each limbs is n bits
+template CheckCarryToZero(n, m, k) {
+    assert(k >= 2);
+    
+    var EPSILON = 3;
+    
+    assert(m + EPSILON <= 253);
+
+    signal input in[k];
+    
+    signal carry[k];
+    component carryRangeChecks[k];
+    for (var i = 0; i < k-1; i++){
+        carryRangeChecks[i] = Num2Bits(m + EPSILON - n); 
+        if( i == 0 ){
+            carry[i] <-- in[i] / (1<<n);
+            in[i] === carry[i] * (1<<n);
+        }
+        else{
+            carry[i] <-- (in[i]+carry[i-1]) / (1<<n);
+            in[i] + carry[i-1] === carry[i] * (1<<n);
+        }
+        // checking carry is in the range of - 2^(m-n-1+eps), 2^(m+-n-1+eps)
+        carryRangeChecks[i].in <== carry[i] + ( 1<< (m + EPSILON - n - 1));
+    }
+    in[k-1] + carry[k-2] === 0;   
+}
diff --git a/keyless/circuit/templates/helpers/rsa/bigint_func.circom b/keyless/circuit/templates/helpers/rsa/bigint_func.circom
new file mode 100644
index 0000000000000..1f620b12efda9
--- /dev/null
+++ b/keyless/circuit/templates/helpers/rsa/bigint_func.circom
@@ -0,0 +1,444 @@
+pragma circom 2.0.2;
+
+// File copied from https://github.com/doubleblind-xyz/circom-rsa/blob/master/circuits/bigint_func.circom
+
+function isNegative(x) {
+    // half babyjubjub field size
+    return x > 10944121435919637611123202872628637544274182200208017171849102093287904247808 ? 1 : 0;
+}
+
+function div_ceil(m, n) {
+    var ret = 0;
+    if (m % n == 0) {
+        ret = m \ n;
+    } else {
+        ret = m \ n + 1;
+    }
+    return ret;
+}
+
+function log_ceil(n) {
+   var n_temp = n;
+   for (var i = 0; i < 254; i++) {
+       if (n_temp == 0) {
+          return i;
+       }
+       n_temp = n_temp \ 2;
+   }
+   return 254;
+}
+
+function SplitFn(in, n, m) {
+    return [in % (1 << n), (in \ (1 << n)) % (1 << m)];
+}
+
+function SplitThreeFn(in, n, m, k) {
+    return [in % (1 << n), (in \ (1 << n)) % (1 << m), (in \ (1 << n + m)) % (1 << k)];
+}
+
+// m bits per overflowed register (values are potentially negative)
+// n bits per properly-sized register
+// in has k registers
+// out has k + ceil(m/n) - 1 + 1 registers. highest-order potentially negative,
+// all others are positive
+// - 1 since the last register is included in the last ceil(m/n) array
+// + 1 since the carries from previous registers could push you over
+function getProperRepresentation(m, n, k, in) {
+    var ceilMN = div_ceil(m, n);
+
+    var out[100]; // should be out[k + ceilMN]
+    assert(k + ceilMN < 100);
+    for (var i = 0; i < k; i++) {
+        out[i] = in[i];
+    }
+    for (var i = k; i < 100; i++) {
+        out[i] = 0;
+    }
+    assert(n <= m);
+    for (var i = 0; i+1 < k + ceilMN; i++) {
+        assert((1 << m) >= out[i] && out[i] >= -(1 << m));
+        var shifted_val = out[i] + (1 << m);
+        assert(0 <= shifted_val && shifted_val <= (1 << (m+1)));
+        out[i] = shifted_val & ((1 << n) - 1);
+        out[i+1] += (shifted_val >> n) - (1 << (m - n));
+    }
+
+    return out;
+}
+
+// Evaluate polynomial a at point x
+function poly_eval(len, a, x) {
+    var v = 0;
+    for (var i = 0; i < len; i++) {
+        v += a[i] * (x ** i);
+    }
+    return v;
+}
+
+// Interpolate a degree len-1 polynomial given its evaluations at 0..len-1
+function poly_interp(len, v) {
+    assert(len <= 200);
+    var out[200];
+    for (var i = 0; i < len; i++) {
+        out[i] = 0;
+    }
+
+    // Product_{i=0..len-1} (x-i)
+    var full_poly[201];
+    full_poly[0] = 1;
+    for (var i = 0; i < len; i++) {
+        full_poly[i+1] = 0;
+        for (var j = i; j >= 0; j--) {
+            full_poly[j+1] += full_poly[j];
+            full_poly[j] *= -i;
+        }
+    }
+
+    for (var i = 0; i < len; i++) {
+        var cur_v = 1;
+        for (var j = 0; j < len; j++) {
+            if (i == j) {
+                // do nothing
+            } else {
+                cur_v *= i-j;
+            }
+        }
+        cur_v = v[i] / cur_v;
+
+        var cur_rem = full_poly[len];
+        for (var j = len-1; j >= 0; j--) {
+            out[j] += cur_v * cur_rem;
+            cur_rem = full_poly[j] + i * cur_rem;
+        }
+        assert(cur_rem == 0);
+    }
+
+    return out;
+}
+
+// 1 if true, 0 if false
+function long_gt(n, k, a, b) {
+    for (var i = k - 1; i >= 0; i--) {
+        if (a[i] > b[i]) {
+            return 1;
+        }
+        if (a[i] < b[i]) {
+            return 0;
+        }
+    }
+    return 0;
+}
+
+// n bits per register
+// a has k registers
+// b has k registers
+// a >= b
+function long_sub(n, k, a, b) {
+    var diff[100];
+    var borrow[100];
+    for (var i = 0; i < k; i++) {
+        if (i == 0) {
+           if (a[i] >= b[i]) {
+               diff[i] = a[i] - b[i];
+               borrow[i] = 0;
+            } else {
+               diff[i] = a[i] - b[i] + (1 << n);
+               borrow[i] = 1;
+            }
+        } else {
+            if (a[i] >= b[i] + borrow[i - 1]) {
+               diff[i] = a[i] - b[i] - borrow[i - 1];
+               borrow[i] = 0;
+            } else {
+               diff[i] = (1 << n) + a[i] - b[i] - borrow[i - 1];
+               borrow[i] = 1;
+            }
+        }
+    }
+    return diff;
+}
+
+// a is a n-bit scalar
+// b has k registers
+function long_scalar_mult(n, k, a, b) {
+    var out[100];
+    for (var i = 0; i < 100; i++) {
+        out[i] = 0;
+    }
+    for (var i = 0; i < k; i++) {
+        var temp = out[i] + (a * b[i]);
+        out[i] = temp % (1 << n);
+        out[i + 1] = out[i + 1] + temp \ (1 << n);
+    }
+    return out;
+}
+
+
+// n bits per register
+// a has k + m registers
+// b has k registers
+// out[0] has length m + 1 -- quotient
+// out[1] has length k -- remainder
+// implements algorithm of https://people.eecs.berkeley.edu/~fateman/282/F%20Wright%20notes/week4.pdf
+function long_div(n, k, m, a, b){
+    var out[2][100];
+    m += k;
+    while (b[k-1] == 0) {
+        out[1][k] = 0;
+        k--;
+        assert(k > 0);
+    }
+    m -= k;
+
+    var remainder[200];
+    for (var i = 0; i < m + k; i++) {
+        remainder[i] = a[i];
+    }
+
+    var mult[200];
+    var dividend[200];
+    for (var i = m; i >= 0; i--) {
+        if (i == m) {
+            dividend[k] = 0;
+            for (var j = k - 1; j >= 0; j--) {
+                dividend[j] = remainder[j + m];
+            }
+        } else {
+            for (var j = k; j >= 0; j--) {
+                dividend[j] = remainder[j + i];
+            }
+        }
+
+        out[0][i] = short_div(n, k, dividend, b);
+
+        var mult_shift[100] = long_scalar_mult(n, k, out[0][i], b);
+        var subtrahend[200];
+        for (var j = 0; j < m + k; j++) {
+            subtrahend[j] = 0;
+        }
+        for (var j = 0; j <= k; j++) {
+            if (i + j < m + k) {
+               subtrahend[i + j] = mult_shift[j];
+            }
+        }
+        remainder = long_sub(n, m + k, remainder, subtrahend);
+    }
+    for (var i = 0; i < k; i++) {
+        out[1][i] = remainder[i];
+    }
+    out[1][k] = 0;
+
+    return out;
+}
+
+// n bits per register
+// a has k + 1 registers
+// b has k registers
+// assumes leading digit of b is at least 2 ** (n - 1)
+// 0 <= a < (2**n) * b
+function short_div_norm(n, k, a, b) {
+   var qhat = (a[k] * (1 << n) + a[k - 1]) \ b[k - 1];
+   if (qhat > (1 << n) - 1) {
+      qhat = (1 << n) - 1;
+   }
+
+   var mult[100] = long_scalar_mult(n, k, qhat, b);
+   if (long_gt(n, k + 1, mult, a) == 1) {
+      mult = long_sub(n, k + 1, mult, b);
+      if (long_gt(n, k + 1, mult, a) == 1) {
+         return qhat - 2;
+      } else {
+         return qhat - 1;
+      }
+   } else {
+       return qhat;
+   }
+}
+
+// n bits per register
+// a has k + 1 registers
+// b has k registers
+// assumes leading digit of b is non-zero
+// 0 <= a < (2**n) * b
+function short_div(n, k, a, b) {
+   var scale = (1 << n) \ (1 + b[k - 1]);
+
+   // k + 2 registers now
+   var norm_a[200] = long_scalar_mult(n, k + 1, scale, a);
+   // k + 1 registers now
+   var norm_b[200] = long_scalar_mult(n, k, scale, b);
+
+   var ret;
+   if (norm_b[k] != 0) {
+       ret = short_div_norm(n, k + 1, norm_a, norm_b);
+   } else {
+       ret = short_div_norm(n, k, norm_a, norm_b);
+   }
+   return ret;
+}
+
+// n bits per register
+// a and b both have k registers
+// out[0] has length 2 * k
+// adapted from BigMulShortLong and LongToShortNoEndCarry2 witness computation
+function prod(n, k, a, b) {
+    // first compute the intermediate values. taken from BigMulShortLong
+    var prod_val[100]; // length is 2 * k - 1
+    for (var i = 0; i < 2 * k - 1; i++) {
+        prod_val[i] = 0;
+        if (i < k) {
+            for (var a_idx = 0; a_idx <= i; a_idx++) {
+                prod_val[i] = prod_val[i] + a[a_idx] * b[i - a_idx];
+            }
+        } else {
+            for (var a_idx = i - k + 1; a_idx < k; a_idx++) {
+                prod_val[i] = prod_val[i] + a[a_idx] * b[i - a_idx];
+            }
+        }
+    }
+
+    // now do a bunch of carrying to make sure registers not overflowed. taken from LongToShortNoEndCarry2
+    var out[100]; // length is 2 * k
+
+    var split[100][3]; // first dimension has length 2 * k - 1
+    for (var i = 0; i < 2 * k - 1; i++) {
+        split[i] = SplitThreeFn(prod_val[i], n, n, n);
+    }
+
+    var carry[100]; // length is 2 * k - 1
+    carry[0] = 0;
+    out[0] = split[0][0];
+    if (2 * k - 1 > 1) {
+        var sumAndCarry[2] = SplitFn(split[0][1] + split[1][0], n, n);
+        out[1] = sumAndCarry[0];
+        carry[1] = sumAndCarry[1];
+    }
+    if (2 * k - 1 > 2) {
+        for (var i = 2; i < 2 * k - 1; i++) {
+            var sumAndCarry[2] = SplitFn(split[i][0] + split[i-1][1] + split[i-2][2] + carry[i-1], n, n);
+            out[i] = sumAndCarry[0];
+            carry[i] = sumAndCarry[1];
+        }
+        out[2 * k - 1] = split[2*k-2][1] + split[2*k-3][2] + carry[2*k-2];
+    }
+    return out;
+}
+
+// n bits per register
+// a has k registers
+// p has k registers
+// e has k registers
+// k * n <= 500
+// p is a prime
+// computes a^e mod p
+function mod_exp(n, k, a, p, e) {
+    var eBits[500]; // length is k * n
+    for (var i = 0; i < k; i++) {
+        for (var j = 0; j < n; j++) {
+            eBits[j + n * i] = (e[i] >> j) & 1;
+        }
+    }
+
+    var out[100]; // length is k
+    for (var i = 0; i < 100; i++) {
+        out[i] = 0;
+    }
+    out[0] = 1;
+
+    // repeated squaring
+    for (var i = k * n - 1; i >= 0; i--) {
+        // multiply by a if bit is 0
+        if (eBits[i] == 1) {
+            var temp[200]; // length 2 * k
+            temp = prod(n, k, out, a);
+            var temp2[2][100];
+            temp2 = long_div(n, k, k, temp, p);
+            out = temp2[1];
+        }
+
+        // square, unless we're at the end
+        if (i > 0) {
+            var temp[200]; // length 2 * k
+            temp = prod(n, k, out, out);
+            var temp2[2][100];
+            temp2 = long_div(n, k, k, temp, p);
+            out = temp2[1];
+        }
+
+    }
+    return out;
+}
+
+// n bits per register
+// a has k registers
+// p has k registers
+// k * n <= 500
+// p is a prime
+// if a == 0 mod p, returns 0
+// else computes inv = a^(p-2) mod p
+function mod_inv(n, k, a, p) {
+    var isZero = 1;
+    for (var i = 0; i < k; i++) {
+        if (a[i] != 0) {
+            isZero = 0;
+        }
+    }
+    if (isZero == 1) {
+        var ret[100];
+        for (var i = 0; i < k; i++) {
+            ret[i] = 0;
+        }
+        return ret;
+    }
+
+    var pCopy[100];
+    for (var i = 0; i < 100; i++) {
+        if (i < k) {
+            pCopy[i] = p[i];
+        } else {
+            pCopy[i] = 0;
+        }
+    }
+
+    var two[100];
+    for (var i = 0; i < 100; i++) {
+        two[i] = 0;
+    }
+    two[0] = 2;
+
+    var pMinusTwo[100];
+    pMinusTwo = long_sub(n, k, pCopy, two); // length k
+    var out[100];
+    out = mod_exp(n, k, a, pCopy, pMinusTwo);
+    return out;
+}
+
+// a, b and out are all n bits k registers
+function long_sub_mod_p(n, k, a, b, p){
+    var gt = long_gt(n, k, a, b);
+    var tmp[100];
+    if(gt){
+        tmp = long_sub(n, k, a, b);
+    }
+    else{
+        tmp = long_sub(n, k, b, a);
+    }
+    var out[2][100];
+    for(var i = k;i < 2 * k; i++){
+        tmp[i] = 0;
+    }
+    out = long_div(n, k, k, tmp, p);
+    if(gt==0){
+        tmp = long_sub(n, k, p, out[1]);
+    }
+    return tmp;
+}
+
+// a, b, p and out are all n bits k registers
+function prod_mod_p(n, k, a, b, p){
+    var tmp[100];
+    var result[2][100];
+    tmp = prod(n, k, a, b);
+    result = long_div(n, k, k, tmp, p);
+    return result[1];
+}
diff --git a/keyless/circuit/templates/helpers/rsa/fp.circom b/keyless/circuit/templates/helpers/rsa/fp.circom
new file mode 100644
index 0000000000000..9f0d4508960ed
--- /dev/null
+++ b/keyless/circuit/templates/helpers/rsa/fp.circom
@@ -0,0 +1,86 @@
+pragma circom 2.0.3;
+
+// File copied from https://github.com/doubleblind-xyz/circom-rsa/blob/master/circuits/fp.circom
+
+include "circomlib/circuits/bitify.circom";
+
+include "./bigint.circom";
+include "./bigint_func.circom";
+
+// These functions operate over values in Z/Zp for some integer p (typically,
+// but not necessarily prime). Values are stored as standard bignums with k
+// chunks of n bits, but intermediate values often have "overflow" bits inside
+// various chunks.
+//
+// These Fp functions will always correctly generate witnesses mod p, but they
+// do not *check* that values are normalized to < p; they only check that
+// values are correct mod p. This is to save the comparison circuit.
+// They *will* always check for intended results mod p (soundness), but it may
+// not have a unique intermediate signal.
+//
+// Conversely, some templates may not be satisfiable if the input witnesses are
+// not < p. This does not break completeness, as honest provers will always
+// generate witnesses which are canonical (between 0 and p).
+
+// a * b = r mod p
+// a * b - p * q - r for some q
+template FpMul(n, k) {
+    assert(n + n + log_ceil(k) + 2 <= 252);
+    signal input a[k];
+    signal input b[k];
+    signal input p[k];
+
+    signal output out[k];
+
+    signal v_ab[2*k-1];
+    for (var x = 0; x < 2*k-1; x++) {
+        var v_a = poly_eval(k, a, x);
+        var v_b = poly_eval(k, b, x);
+        v_ab[x] <== v_a * v_b;
+    }
+
+    var ab[200] = poly_interp(2*k-1, v_ab);
+    // ab_proper has length 2*k
+    var ab_proper[200] = getProperRepresentation(n + n + log_ceil(k), n, 2*k-1, ab);
+
+    var long_div_out[2][100] = long_div(n, k, k, ab_proper, p);
+
+    // Since we're only computing a*b, we know that q < p will suffice, so we
+    // know it fits into k chunks and can do size n range checks.
+    signal q[k];
+    component q_range_check[k];
+    signal r[k];
+    component r_range_check[k];
+    for (var i = 0; i < k; i++) {
+        q[i] <-- long_div_out[0][i];
+        q_range_check[i] = Num2Bits(n);
+        q_range_check[i].in <== q[i];
+
+        r[i] <-- long_div_out[1][i];
+        r_range_check[i] = Num2Bits(n);
+        r_range_check[i].in <== r[i];
+    }
+
+    signal v_pq_r[2*k-1];
+    for (var x = 0; x < 2*k-1; x++) {
+        var v_p = poly_eval(k, p, x);
+        var v_q = poly_eval(k, q, x);
+        var v_r = poly_eval(k, r, x);
+        v_pq_r[x] <== v_p * v_q + v_r;
+    }
+
+    signal v_t[2*k-1];
+    for (var x = 0; x < 2*k-1; x++) {
+        v_t[x] <== v_ab[x] - v_pq_r[x];
+    }
+
+    var t[200] = poly_interp(2*k-1, v_t);
+    component tCheck = CheckCarryToZero(n, n + n + log_ceil(k) + 2, 2*k-1);
+    for (var i = 0; i < 2*k-1; i++) {
+        tCheck.in[i] <== t[i];
+    }
+
+    for (var i = 0; i < k; i++) {
+        out[i] <== r[i];
+    }
+}
diff --git a/keyless/circuit/templates/helpers/rsa/rsa_verify.circom b/keyless/circuit/templates/helpers/rsa/rsa_verify.circom
new file mode 100644
index 0000000000000..57702d5d899bd
--- /dev/null
+++ b/keyless/circuit/templates/helpers/rsa/rsa_verify.circom
@@ -0,0 +1,111 @@
+pragma circom 2.0.0;
+
+// File copied and modified from https://github.com/zkp-application/circom-rsa-verify/blob/main/circuits/rsa_verify.circom, except for the `FpPow65537Mod` template. The only difference is using `FpPow65537Mod` for exponentiation instead of the tempalte provided in the original repo, as it is more efficient
+
+include "./fp.circom";
+
+template NumToBits(n) {
+    signal input in;
+    signal output out[n];
+    var lc1=0;
+
+    var e2=1;
+    for (var i = 0; i<n; i++) {
+        out[i] <-- (in >> i) & 1;
+        out[i] * (out[i] -1 ) === 0;
+        lc1 += out[i] * e2;
+        e2 = e2+e2;
+    }
+
+    lc1 === in;
+}
+
+// Template copied from https://github.com/doubleblind-xyz/circom-rsa/blob/master/circuits/rsa.circom
+template FpPow65537Mod(n, k) {
+    signal input base[k];
+    // Exponent is hardcoded at 65537
+    signal input modulus[k];
+    signal output out[k];
+
+    component doublers[16];
+    component adder = FpMul(n, k);
+    for (var i = 0; i < 16; i++) {
+        doublers[i] = FpMul(n, k);
+    }
+
+    for (var j = 0; j < k; j++) {
+        adder.p[j] <== modulus[j];
+        for (var i = 0; i < 16; i++) {
+            doublers[i].p[j] <== modulus[j];
+        }
+    }
+    for (var j = 0; j < k; j++) {
+        doublers[0].a[j] <== base[j];
+        doublers[0].b[j] <== base[j];
+    }
+    for (var i = 0; i + 1 < 16; i++) {
+        for (var j = 0; j < k; j++) {
+            doublers[i + 1].a[j] <== doublers[i].out[j];
+            doublers[i + 1].b[j] <== doublers[i].out[j];
+        }
+    }
+    for (var j = 0; j < k; j++) {
+        adder.a[j] <== base[j];
+        adder.b[j] <== doublers[15].out[j];
+    }
+    for (var j = 0; j < k; j++) {
+        out[j] <== adder.out[j];
+    }
+}
+
+
+
+// Pkcs1v15 + Sha256
+// exp 65537
+template RsaVerifyPkcs1v15(w, nb) {
+    //signal input exp[nb];
+    signal input sign[nb];      // least-significant-limb first
+    signal input modulus[nb];   // least-significant-limb first
+
+    signal input hashed[4];     // least-significant-limb first
+
+    // sign ** exp mod modulus
+    component pm = FpPow65537Mod(w, nb);
+    for (var i  = 0; i < nb; i++) {
+        pm.base[i] <== sign[i];
+        //pm.exp[i] <== exp[i];
+        pm.modulus[i] <== modulus[i];
+    }
+
+    // 1. Check hashed data
+    // 64 * 4 = 256 bit. the first 4 numbers
+    for (var i = 0; i < 4; i++) {
+        hashed[i] === pm.out[i];
+    }
+    
+    // 2. Check hash prefix and 1 byte 0x00
+    // sha256/152 bit
+    // 0b00110000001100010011000000001101000001100000100101100000100001100100100000000001011001010000001100000100000000100000000100000101000000000000010000100000
+    pm.out[4] === 217300885422736416;
+    pm.out[5] === 938447882527703397;
+    // // remain 24 bit
+    component num2bits_6 = NumToBits(w);
+    num2bits_6.in <== pm.out[6];
+    var remainsBits[32] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 0];
+    for (var i = 0; i < 32; i++) {
+        num2bits_6.out[i] === remainsBits[31 - i];
+    }
+
+    // 3. Check PS and em[1] = 1. the same code like golang std lib rsa.VerifyPKCS1v15
+    for (var i = 32; i < w; i++) {
+        num2bits_6.out[i] === 1;
+    }
+
+    for (var i = 7; i < 31; i++) {
+        // 0b1111111111111111111111111111111111111111111111111111111111111111
+        pm.out[i] === 18446744073709551615;
+    }
+    // 0b1111111111111111111111111111111111111111111111111
+    pm.out[31] === 562949953421311;
+}
+
diff --git a/keyless/circuit/templates/helpers/sha.circom b/keyless/circuit/templates/helpers/sha.circom
new file mode 100644
index 0000000000000..75627e7450a21
--- /dev/null
+++ b/keyless/circuit/templates/helpers/sha.circom
@@ -0,0 +1,112 @@
+pragma circom 2.1.3;
+
+include "circomlib/circuits/sha256/constants.circom";
+include "circomlib/circuits/sha256/sha256compression.circom";
+include "circomlib/circuits/comparators.circom";
+include "./misc.circom";
+
+// Similar to `sha256_unsafe` in https://github.com/TheFrozenFire/snark-jwt-verify/blob/master/circuits/sha256.circom
+// Hashes a bit array message using SHA2_256, hashing every block up to and including `tBlock`. All blocks after `tBlock` are ignored in the output
+// Expects the bit array input to be padded according to https://www.rfc-editor.org/rfc/rfc4634.html#section-4.1 up to tBlock. 
+template Sha2_256_prepadded_varlen(maxNumBlocks) {
+    signal input in[maxNumBlocks * 512];
+    signal input tBlock;
+    
+    signal output out[256];
+
+    component ha0 = H(0);
+    component hb0 = H(1);
+    component hc0 = H(2);
+    component hd0 = H(3);
+    component he0 = H(4);
+    component hf0 = H(5);
+    component hg0 = H(6);
+    component hh0 = H(7);
+
+    component sha256compression[maxNumBlocks];
+
+    for(var i=0; i < maxNumBlocks; i++) {
+
+        sha256compression[i] = Sha256compression();
+
+        if (i==0) {
+            for(var k = 0; k < 32; k++) {
+                sha256compression[i].hin[0*32+k] <== ha0.out[k];
+                sha256compression[i].hin[1*32+k] <== hb0.out[k];
+                sha256compression[i].hin[2*32+k] <== hc0.out[k];
+                sha256compression[i].hin[3*32+k] <== hd0.out[k];
+                sha256compression[i].hin[4*32+k] <== he0.out[k];
+                sha256compression[i].hin[5*32+k] <== hf0.out[k];
+                sha256compression[i].hin[6*32+k] <== hg0.out[k];
+                sha256compression[i].hin[7*32+k] <== hh0.out[k];
+            }
+        } else {
+            for(var k = 0; k < 32; k++) {
+                sha256compression[i].hin[32*0+k] <== sha256compression[i-1].out[32*0+31-k];
+                sha256compression[i].hin[32*1+k] <== sha256compression[i-1].out[32*1+31-k];
+                sha256compression[i].hin[32*2+k] <== sha256compression[i-1].out[32*2+31-k];
+                sha256compression[i].hin[32*3+k] <== sha256compression[i-1].out[32*3+31-k];
+                sha256compression[i].hin[32*4+k] <== sha256compression[i-1].out[32*4+31-k];
+                sha256compression[i].hin[32*5+k] <== sha256compression[i-1].out[32*5+31-k];
+                sha256compression[i].hin[32*6+k] <== sha256compression[i-1].out[32*6+31-k];
+                sha256compression[i].hin[32*7+k] <== sha256compression[i-1].out[32*7+31-k];
+            }
+        }
+
+        for (var k = 0; k < 512; k++) {
+            sha256compression[i].inp[k] <== in[i*512 + k];
+        }
+    }
+    
+    // Collapse the hashing result at the terminating data block
+    component calcTotal[256];
+    signal eqs[maxNumBlocks] <== SingleOneArray(maxNumBlocks)(tBlock);
+
+    // For each bit of the output
+    for(var k = 0; k < 256; k++) {
+        calcTotal[k] = CalculateTotal(maxNumBlocks);
+        
+        // For each possible block
+        for (var i = 0; i < maxNumBlocks; i++) {
+
+            // eqs[i] is 1 if the index matches. As such, at most one input to calcTotal is not 0.
+            // The bit corresponding to the terminating data block will be raised
+            calcTotal[k].nums[i] <== eqs[i] * sha256compression[i].out[k];
+        }
+        
+        out[k] <== calcTotal[k].sum;
+    }
+}
+
+// Verifies SHA2_256 input padding according to https://www.rfc-editor.org/rfc/rfc4634.html#section-4.1
+template Sha2PaddingVerify(maxInputLen) {
+    signal input in[maxInputLen]; // byte array
+    signal input num_blocks; // Number of 512-bit blocks in `in` including sha padding
+    signal input padding_start; // equivalent to L/8, where L is the length of the unpadded message in bits as specified in RFC4634
+    signal input L_byte_encoded[8]; // 64-bit encoding of L
+    signal input padding_without_len[64]; // padding_without_len[0] = 1, followed by K 0s. Length K+1, max length 512 bits. Does not include the 64-bit encoding of L
+
+    var len_bits = num_blocks * 512;
+    var padding_start_bits = padding_start * 8;
+    var K = len_bits - padding_start_bits - 1 - 64; 
+
+    // Ensure K is smallest value below 512 that satisfies above equation
+    signal K_is_correct <== LessThan(10)([K,512]);
+    K_is_correct === 1;
+
+    signal in_hash <== HashBytesToFieldWithLen(maxInputLen)(in, num_blocks*64);
+    // 4.1.a
+    CheckSubstrInclusionPoly(maxInputLen, 64)(in, in_hash, padding_without_len, (1+K)/8, padding_start);
+    padding_without_len[0] === 128; // 10000000
+
+    // 4.1.b
+    for (var i = 1; i < 64; i++) {
+        padding_without_len[i] === 0;
+    }
+
+    // 4.1.c
+    CheckSubstrInclusionPoly(maxInputLen, 8)(in, in_hash, L_byte_encoded, 8, padding_start+(K+1)/8);
+    signal L_bits[64] <== BytesToBits(8)(L_byte_encoded);
+    signal L_decoded <== Bits2NumBigEndian(64)(L_bits);
+    L_decoded === 8*padding_start;
+}
diff --git a/keyless/circuit/templates/main.circom b/keyless/circuit/templates/main.circom
new file mode 100644
index 0000000000000..862166be2de2b
--- /dev/null
+++ b/keyless/circuit/templates/main.circom
@@ -0,0 +1,28 @@
+pragma circom 2.1.3;
+
+include "mainTemplate.circom";
+
+component main { public [public_inputs_hash] } = identity(
+    192*8,      // maxJWTLen
+    300,        // maxJWTHeaderLen
+    192*8-64,   // maxJWTPayloadLen
+    140,        // maxAudKVPairLen
+    40,         // maxAudNameLen
+    120,        // maxAudValueLen
+    140,        // maxIssKVPairLen
+    40,         // maxIssNameLen
+    120,        // maxIssValueLen
+    50,         // maxIatKVPairLen
+    10,         // maxIatNameLen
+    45,         // maxIatValueLen
+    105,        // maxNonceKVPairLen
+    10,         // maxNonceNameLen
+    100,        // maxNonceValueLen
+    30,         // maxEVKVPairLen (email_verified field)
+    20,         // maxEVNameLen
+    10,         // maxEVValueLen
+    350,        // maxUIDKVPairLen
+    30,         // maxUIDNameLen
+    330,        // maxUIDValueLen
+    350         // maxEFKVPairLen
+);
diff --git a/keyless/circuit/templates/mainTemplate.circom b/keyless/circuit/templates/mainTemplate.circom
new file mode 100644
index 0000000000000..8810ec6e0f023
--- /dev/null
+++ b/keyless/circuit/templates/mainTemplate.circom
@@ -0,0 +1,334 @@
+pragma circom 2.1.3;
+
+include "helpers/base64.circom";
+include "helpers/arrays.circom";
+include "helpers/misc.circom";
+include "helpers/packing.circom";
+include "helpers/hashtofield.circom";
+include "helpers/sha.circom";
+include "helpers/rsa/rsa_verify.circom";
+include "helpers/jwt_field_parsing.circom";
+include "helpers/rsa/bigint.circom";
+include "../node_modules/circomlib/circuits/poseidon.circom";
+include "../node_modules/circomlib/circuits/bitify.circom";
+
+// The main Aptos Keyless circuit
+template identity(
+    maxJWTLen,          // Max byte length of the full base64 JWT with SHA2 padding
+    maxJWTHeaderLen,    // Max byte length of the full base64 JWT header with separator
+    maxJWTPayloadLen,   // Max byte length of the full base64 JWT payload with SHA2 padding
+    maxAudKVPairLen,    // Max byte length of the ASCII aud field
+    maxAudNameLen,      // Max byte length of the ASCII aud name    
+    maxAudValueLen,     // Max byte length of the ASCII aud value
+    maxIssKVPairLen,    // Max byte length of the ASCII iss field
+    maxIssNameLen,      // Max byte length of the ASCII iss name
+    maxIssValueLen,     // Max byte length of the ASCII iss value
+    maxIatKVPairLen,    // Max byte length of the ASCII iat field
+    maxIatNameLen,      // Max byte length of the ASCII iat name
+    maxIatValueLen,     // Max byte length of the ASCII iat value
+    maxNonceKVPairLen,  // Max byte length of the ASCII nonce field
+    maxNonceNameLen,    // Max byte length of the ASCII nonce name
+    maxNonceValueLen,   // Max byte length of the ASCII nonce value
+    maxEVKVPairLen,     // Max byte length of the ASCII email verified field
+    maxEVNameLen,       // Max byte length of the ASCII email verified name
+    maxEVValueLen,      // Max byte length of the ASCII email verified value
+    maxUIDKVPairLen,    // Max byte length of the ASCII uid field
+    maxUIDNameLen,      // Max byte length of the ASCII uid name
+    maxUIDValueLen,     // Max byte length of the ASCII uid value
+    maxEFKVPairLen      // Max byte length of the ASCII extra field
+) {
+
+    signal input jwt[maxJWTLen]; // maxJWTLen is in bytes. Base64 format
+
+    signal input jwt_header_with_separator[maxJWTHeaderLen]; // jwt header + '.'
+    signal input jwt_payload[maxJWTPayloadLen];
+
+
+    signal input header_len_with_separator;
+    signal input b64_payload_len; 
+
+    ConcatenationCheck(maxJWTLen, maxJWTHeaderLen, maxJWTPayloadLen)(jwt, jwt_header_with_separator, jwt_payload, header_len_with_separator, b64_payload_len);
+
+    var byte_len = 8;
+
+    // Convert jwt bytes into bits for SHA256 hashing
+    signal jwt_bits[byte_len*maxJWTLen] <== BytesToBits(maxJWTLen)(jwt);
+
+
+    signal input jwt_num_sha2_blocks;
+    signal input jwt_len_bit_encoded[8]; // 64 bit encoding of the jwt len, in bits
+    signal input padding_without_len[64]; // 1 followed by K 0s, where K is the smallest positive integer solution to L + 1 + K = 448, and L is the jwt length in bits. Max length is 512 bits
+
+    Sha2PaddingVerify(maxJWTLen)(jwt, jwt_num_sha2_blocks, header_len_with_separator+b64_payload_len, jwt_len_bit_encoded, padding_without_len);
+
+    var max_num_jwt_blocks = (maxJWTLen*8)\512; // A SHA2 block is 512 bits. '\' performs division rounding up to a whole integer
+
+    // Compute hash of JWT
+    signal jwt_sha_hash[256] <== Sha2_256_prepadded_varlen(max_num_jwt_blocks)(jwt_bits, jwt_num_sha2_blocks-1); 
+
+    var dot = SelectArrayValue(maxJWTLen)(jwt, header_len_with_separator-1);
+
+    dot === 46; // '.'
+
+    var signature_len = 32;
+    var size_limbs = 64; // The size of limbs used in the big integer implementation leveraged by RSAVerify65537
+    // Pack hash bits into 4 64-bit values
+    signal packed_jwt_hash[4] <== BitsToFieldElems(256, size_limbs)(jwt_sha_hash); // (input length, byte size of outputs)
+
+    // Verify signature over hash of JWT using modulus input
+    signal input signature[signature_len];
+    CheckAre64BitLimbs(signature_len)(signature);
+    signal input pubkey_modulus[signature_len];
+    // RSA verification assumes the signature is less than the pubkey modulus
+    signal sig_ok <== BigLessThan(252, signature_len)(signature, pubkey_modulus);
+    sig_ok === 1;
+
+    var hash_le[4];
+    for (var i = 0; i < 4; i++) {
+        hash_le[i] = packed_jwt_hash[3-i];
+    }
+
+    RsaVerifyPkcs1v15(size_limbs, signature_len)(signature, pubkey_modulus, hash_le);
+
+    var max_ascii_jwt_payload_len = (3*maxJWTPayloadLen)\4; //TODO: Describe constraints this puts on max payload size. This equation comes from the implementation of Base64Decode - base64 encoding is about 33% larger than the originally encoded data
+    signal input jwt_payload_without_sha_padding[maxJWTPayloadLen];
+    signal jwt_payload_hash <== HashBytesToFieldWithLen(maxJWTPayloadLen)(jwt_payload, b64_payload_len);
+
+    CheckSubstrInclusionPoly(maxJWTPayloadLen, maxJWTPayloadLen)(jwt_payload, jwt_payload_hash, jwt_payload_without_sha_padding, b64_payload_len, 0); // index is 0
+
+    log("jwt_payload_without_sha_padding: ");
+    signal ascii_jwt_payload[max_ascii_jwt_payload_len] <== Base64Decode(max_ascii_jwt_payload_len)(jwt_payload_without_sha_padding);
+
+    signal ascii_payload_len <== Base64DecodedLength(maxJWTPayloadLen)(b64_payload_len);
+
+    signal ascii_jwt_payload_hash <== HashBytesToFieldWithLen(max_ascii_jwt_payload_len)(ascii_jwt_payload, ascii_payload_len);
+
+
+    signal string_bodies[max_ascii_jwt_payload_len] <== StringBodies(max_ascii_jwt_payload_len)(ascii_jwt_payload);
+
+    // Check aud field is in the JWT
+    signal input aud_field[maxAudKVPairLen]; // ASCII
+    signal input aud_field_string_bodies[maxAudKVPairLen]; // ASCII
+    signal input aud_field_len; // ASCII
+    signal input aud_index; // index of aud field in ASCII jwt
+    CheckSubstrInclusionPoly(max_ascii_jwt_payload_len, maxAudKVPairLen)(ascii_jwt_payload, ascii_jwt_payload_hash, aud_field, aud_field_len, aud_index); 
+    CheckSubstrInclusionPoly(max_ascii_jwt_payload_len, maxAudKVPairLen)(string_bodies, ascii_jwt_payload_hash, aud_field_string_bodies, aud_field_len, aud_index); 
+
+    // Perform necessary checks on aud field
+    var aud_name_len = 3;
+    signal input aud_value_index;
+    signal input aud_colon_index;
+    signal input aud_name[maxAudNameLen];
+    signal input use_aud_override;
+    use_aud_override * (1-use_aud_override) === 0;
+
+    signal aud_value[maxAudValueLen];
+    signal input private_aud_value[maxAudValueLen];
+    signal input override_aud_value[maxAudValueLen];
+    signal input private_aud_value_len;
+    signal input override_aud_value_len;
+    
+    var s = use_aud_override;
+    s * (s-1) === 0; // Ensure s = 0 or s = 1
+    for (var i = 0; i < maxAudValueLen; i++) {
+        aud_value[i] <== (override_aud_value[i]-private_aud_value[i]) * s + private_aud_value[i];
+    }
+    signal aud_value_len;
+    aud_value_len <== (override_aud_value_len-private_aud_value_len) * s + private_aud_value_len;
+
+    ParseJWTFieldWithQuotedValue(maxAudKVPairLen, maxAudNameLen, maxAudValueLen)(aud_field, aud_name, aud_value, aud_field_string_bodies, aud_field_len, aud_name_len, aud_value_index, aud_value_len, aud_colon_index);
+
+    // Check aud name is correct
+    var required_aud_name[aud_name_len] = [97, 117, 100]; // aud
+    for (var i = 0; i < aud_name_len; i++) {
+        aud_name[i] === required_aud_name[i];
+    }
+
+    // Check user id field is in the JWT
+    signal input uid_field[maxUIDKVPairLen];
+    signal input uid_field_string_bodies[maxUIDKVPairLen];
+    signal input uid_field_len;
+    signal input uid_index;
+    CheckSubstrInclusionPoly(max_ascii_jwt_payload_len, maxUIDKVPairLen)(ascii_jwt_payload, ascii_jwt_payload_hash, uid_field, uid_field_len, uid_index);
+    CheckSubstrInclusionPoly(max_ascii_jwt_payload_len, maxUIDKVPairLen)(string_bodies, ascii_jwt_payload_hash, uid_field_string_bodies, uid_field_len, uid_index);
+
+    // Perform necessary checks on user id field. Some fields this might be in practice are "sub" or "email"
+    signal input uid_name_len;
+    signal input uid_value_index;
+    signal input uid_value_len;
+    signal input uid_colon_index;
+    signal input uid_name[maxUIDNameLen];
+    signal input uid_value[maxUIDValueLen];
+
+    ParseJWTFieldWithQuotedValue(maxUIDKVPairLen, maxUIDNameLen, maxUIDValueLen)(uid_field, uid_name, uid_value, uid_field_string_bodies, uid_field_len, uid_name_len, uid_value_index, uid_value_len, uid_colon_index);
+
+    // Check extra field is in the JWT
+    signal input extra_field[maxEFKVPairLen];
+    signal input extra_field_len;
+    signal input extra_index;
+    signal input use_extra_field;
+    use_extra_field * (use_extra_field-1) === 0; // Ensure 0 or 1
+
+    signal ef_passes <== CheckSubstrInclusionPolyBoolean(max_ascii_jwt_payload_len, maxEFKVPairLen)(ascii_jwt_payload, ascii_jwt_payload_hash, extra_field, extra_field_len, extra_index);
+
+    // Fail if use_extra_field = 1 and ef_passes = 0
+    signal not_ef_passes <== NOT()(ef_passes);
+    signal ef_fail <== AND()(use_extra_field, not_ef_passes);
+    ef_fail === 0;
+
+    // Check that ef is not inside a string body
+    signal ef_start_char <== SelectArrayValue(max_ascii_jwt_payload_len)(string_bodies, extra_index);
+    ef_start_char === 0;
+
+    // Check email verified field
+    signal input ev_field[maxEVKVPairLen];
+    signal input ev_field_len;
+    signal input ev_index;
+
+    var ev_name_len = 14;
+    signal input ev_value_index;
+    signal input ev_value_len;
+    signal input ev_colon_index;
+    signal input ev_name[maxEVNameLen];
+    signal input ev_value[maxEVValueLen];
+
+    // Boolean truth table for checking whether we should fail on the results of 'EmailVerifiedCheck'
+    // and `CheckSubstrInclusionPolyBoolean`. We must fail if the uid name is 'email', and the provided
+    // `ev_field` is not in the full JWT according to the substring check
+    // uid_is_email | ev_in_jwt | ev_fail
+    //     1        |     1     |   1 
+    //     1        |     0     |   0
+    //     0        |     1     |   1
+    //     0        |     0     |   1
+    signal uid_is_email <== EmailVerifiedCheck(maxEVNameLen, maxEVValueLen, maxUIDNameLen)(ev_name, ev_value, ev_value_len, uid_name, uid_name_len);
+    signal ev_in_jwt <== CheckSubstrInclusionPolyBoolean(max_ascii_jwt_payload_len, maxEVKVPairLen)(ascii_jwt_payload, ascii_jwt_payload_hash, ev_field, ev_field_len, ev_index);
+    signal not_ev_in_jwt <== NOT()(ev_in_jwt);
+    signal ev_fail <== AND()(uid_is_email, not_ev_in_jwt);
+    ev_fail === 0;
+
+    // Need custom logic here because some providers apparently do not follow the OIDC spec and put the email_verified value in quotes
+    ParseEmailVerifiedField(maxEVKVPairLen, maxEVNameLen, maxEVValueLen)(ev_field, ev_name, ev_value, ev_field_len, ev_name_len, ev_value_index, ev_value_len, ev_colon_index);
+
+    // Check iss field is in the JWT
+    // Note that because `iss_field` is a public input, we assume the verifier will perform correctness checks on it outside of the circuit. 
+    signal input iss_field[maxIssKVPairLen];
+    signal input iss_field_string_bodies[maxIssKVPairLen];
+    signal input iss_field_len;
+    signal input iss_index;
+    CheckSubstrInclusionPoly(max_ascii_jwt_payload_len, maxIssKVPairLen)(ascii_jwt_payload, ascii_jwt_payload_hash, iss_field, iss_field_len, iss_index);
+    CheckSubstrInclusionPoly(max_ascii_jwt_payload_len, maxIssKVPairLen)(string_bodies, ascii_jwt_payload_hash, iss_field_string_bodies, iss_field_len, iss_index);
+
+    // Perform necessary checks on iss field
+    var iss_name_len = 3; // iss
+    signal input iss_value_index;
+    signal input iss_value_len;
+    signal input iss_colon_index;
+    signal input iss_name[maxIssNameLen];
+    signal input iss_value[maxIssValueLen];
+
+    ParseJWTFieldWithQuotedValue(maxIssKVPairLen, maxIssNameLen, maxIssValueLen)(iss_field, iss_name, iss_value, iss_field_string_bodies, iss_field_len, iss_name_len, iss_value_index, iss_value_len, iss_colon_index);
+
+    // Check name of the iss field is correct
+    var required_iss_name[iss_name_len] = [105, 115, 115]; // iss
+    for (var i = 0; i < iss_name_len; i++) {
+        iss_name[i] === required_iss_name[i];
+    }
+
+    // Check iat field is in the JWT
+    signal input iat_field[maxIatKVPairLen];
+    signal input iat_field_len;
+    signal input iat_index;
+    CheckSubstrInclusionPoly(max_ascii_jwt_payload_len, maxIatKVPairLen)(ascii_jwt_payload, ascii_jwt_payload_hash, iat_field, iat_field_len, iat_index);
+
+    // Perform necessary checks on iat field
+    var iat_name_len = 3; // iat
+    signal input iat_value_index;
+    signal input iat_value_len;
+    signal input iat_colon_index;
+    signal input iat_name[maxIatNameLen];
+    signal input iat_value[maxIatValueLen];
+
+    ParseJWTFieldWithUnquotedValue(maxIatKVPairLen, maxIatNameLen, maxIatValueLen)(iat_field, iat_name, iat_value, iat_field_len, iat_name_len, iat_value_index, iat_value_len, iat_colon_index);
+
+    // Check that iat is not inside a string body
+    signal iat_start_char <== SelectArrayValue(max_ascii_jwt_payload_len)(string_bodies, iat_index);
+    iat_start_char === 0;
+
+    // Check name of the iat field is correct
+    var required_iat_name[iat_name_len] = [105, 97, 116]; // iat
+    for (var i = 0; i < iat_name_len; i++) {
+        iat_name[i] === required_iat_name[i];
+    }
+    
+    signal iat_field_elem <== ASCIIDigitsToField(maxIatValueLen)(iat_value, iat_value_len);
+    
+    signal input exp_date;
+    signal input exp_delta;
+    signal jwt_not_expired <== LessThan(252)([exp_date, iat_field_elem + exp_delta]);
+    jwt_not_expired === 1;
+
+    // Check nonce field is in the JWT
+    signal input nonce_field[maxNonceKVPairLen];
+    signal input nonce_field_string_bodies[maxNonceKVPairLen];
+    signal input nonce_field_len;
+    signal input nonce_index;
+    CheckSubstrInclusionPoly(max_ascii_jwt_payload_len, maxNonceKVPairLen)(ascii_jwt_payload, ascii_jwt_payload_hash, nonce_field, nonce_field_len, nonce_index);
+    CheckSubstrInclusionPoly(max_ascii_jwt_payload_len, maxNonceKVPairLen)(string_bodies, ascii_jwt_payload_hash, nonce_field_string_bodies, nonce_field_len, nonce_index);
+
+    // Perform necessary checks on nonce field
+    var nonce_name_len = 5; // nonce
+    signal input nonce_value_index;
+    signal input nonce_value_len;
+    signal input nonce_colon_index;
+    signal input nonce_name[maxNonceNameLen];
+    signal input nonce_value[maxNonceValueLen];
+
+    ParseJWTFieldWithQuotedValue(maxNonceKVPairLen, maxNonceNameLen, maxNonceValueLen)(nonce_field, nonce_name, nonce_value, nonce_field_string_bodies, nonce_field_len, nonce_name_len, nonce_value_index, nonce_value_len, nonce_colon_index);
+
+    // Check name of the nonce field is correct
+    var required_nonce_name[nonce_name_len] = [110, 111, 110, 99, 101]; // nonce
+    for (var i = 0; i < nonce_name_len; i++) {
+        nonce_name[i] === required_nonce_name[i];
+    }
+
+    // Calculate nonce
+    signal input temp_pubkey[3]; // Represented as 3 elements of up to 31 bytes each to allow for pubkeys of up to 64 bytes each
+    signal input temp_pubkey_len; // This is public and checked by the verifier. Included in nonce hash to prevent collisions
+    signal input jwt_randomness;
+    signal computed_nonce <== Poseidon(6)([temp_pubkey[0], temp_pubkey[1], temp_pubkey[2], temp_pubkey_len, exp_date, jwt_randomness]);
+    log("computed nonce is: ", computed_nonce);
+
+    // Check nonce is correct
+    signal nonce_field_elem <== ASCIIDigitsToField(maxNonceValueLen)(nonce_value, nonce_value_len);
+    
+    nonce_field_elem === computed_nonce;
+
+    // Compute the address seed
+    signal input pepper;
+    signal private_aud_val_hashed <== HashBytesToFieldWithLen(maxAudValueLen)(private_aud_value, private_aud_value_len);
+    log("private aud val hash is: ", private_aud_val_hashed);
+    signal uid_value_hashed <== HashBytesToFieldWithLen(maxUIDValueLen)(uid_value, uid_value_len);
+    log("uid val hash is: ", uid_value_hashed);
+    signal uid_name_hashed <== HashBytesToFieldWithLen(maxUIDNameLen)(uid_name, uid_name_len);
+    log("uid name hash is: ", uid_name_hashed);
+    signal addr_seed <== Poseidon(4)([pepper, private_aud_val_hashed, uid_value_hashed, uid_name_hashed]);
+    log("addr seed is: ", addr_seed);
+
+    // Check public inputs are correct 
+
+    signal override_aud_val_hashed <== HashBytesToFieldWithLen(maxAudValueLen)(override_aud_value, override_aud_value_len);
+    log("override aud val hash is: ", override_aud_val_hashed);
+    signal hashed_jwt_header <== HashBytesToFieldWithLen(maxJWTHeaderLen)(jwt_header_with_separator, header_len_with_separator);
+    log("jwt header hash is: ", hashed_jwt_header);
+    signal hashed_pubkey_modulus <== Hash64BitLimbsToFieldWithLen(signature_len)(pubkey_modulus, 256); // 256 bytes per signature
+    log("pubkey hash is: ", hashed_pubkey_modulus);
+    signal hashed_iss_value <== HashBytesToFieldWithLen(maxIssValueLen)(iss_value, iss_value_len);
+    log("iss field hash is: ", hashed_iss_value);
+    signal hashed_extra_field <== HashBytesToFieldWithLen(maxEFKVPairLen)(extra_field, extra_field_len);
+    log("extra field hash is: ", hashed_extra_field);
+    signal computed_public_inputs_hash <== Poseidon(14)([temp_pubkey[0], temp_pubkey[1], temp_pubkey[2], temp_pubkey_len, addr_seed, exp_date, exp_delta, hashed_iss_value, use_extra_field, hashed_extra_field, hashed_jwt_header, hashed_pubkey_modulus, override_aud_val_hashed, use_aud_override]);
+    log("public inputs hash is: ", computed_public_inputs_hash);
+    
+    signal input public_inputs_hash;
+    public_inputs_hash === computed_public_inputs_hash;
+}
diff --git a/keyless/circuit/templates/tests/array_selector_test.circom b/keyless/circuit/templates/tests/array_selector_test.circom
new file mode 100644
index 0000000000000..0c5f9464eec53
--- /dev/null
+++ b/keyless/circuit/templates/tests/array_selector_test.circom
@@ -0,0 +1,21 @@
+pragma circom 2.1.3;
+
+include "helpers/arrays.circom";
+
+template array_selector_test() {
+    var len = 8;
+
+    signal input start_index;
+    signal input end_index;
+    signal input expected_out[len];
+
+    component array_selector = ArraySelector(len);
+
+    array_selector.start_index <== start_index;
+    array_selector.end_index <== end_index;
+
+    array_selector.out === expected_out;
+
+}
+
+component main = array_selector_test();
diff --git a/keyless/circuit/templates/tests/arrays/array_selector_complex_large_test.circom b/keyless/circuit/templates/tests/arrays/array_selector_complex_large_test.circom
new file mode 100644
index 0000000000000..1a60a335eea10
--- /dev/null
+++ b/keyless/circuit/templates/tests/arrays/array_selector_complex_large_test.circom
@@ -0,0 +1,16 @@
+pragma circom 2.1.3;
+
+include "helpers/arrays.circom";
+
+template array_selector_complex_test(len) {
+    signal input start_index;
+    signal input end_index;
+    signal input expected_output[len];
+    
+    signal out[len] <== ArraySelectorComplex(len)(start_index, end_index);
+    out === expected_output;
+}
+
+component main = array_selector_complex_test(
+   2000
+);
diff --git a/keyless/circuit/templates/tests/arrays/array_selector_complex_small_test.circom b/keyless/circuit/templates/tests/arrays/array_selector_complex_small_test.circom
new file mode 100644
index 0000000000000..00461642a37d7
--- /dev/null
+++ b/keyless/circuit/templates/tests/arrays/array_selector_complex_small_test.circom
@@ -0,0 +1,16 @@
+pragma circom 2.1.3;
+
+include "helpers/arrays.circom";
+
+template array_selector_complex_test(len) {
+    signal input start_index;
+    signal input end_index;
+    signal input expected_output[len];
+    
+    signal out[len] <== ArraySelectorComplex(len)(start_index, end_index);
+    out === expected_output;
+}
+
+component main = array_selector_complex_test(
+   3
+);
diff --git a/keyless/circuit/templates/tests/arrays/array_selector_complex_test.circom b/keyless/circuit/templates/tests/arrays/array_selector_complex_test.circom
new file mode 100644
index 0000000000000..4f1deca591b40
--- /dev/null
+++ b/keyless/circuit/templates/tests/arrays/array_selector_complex_test.circom
@@ -0,0 +1,16 @@
+pragma circom 2.1.3;
+
+include "helpers/arrays.circom";
+
+template array_selector_complex_test(len) {
+    signal input start_index;
+    signal input end_index;
+    signal input expected_output[len];
+    
+    signal out[len] <== ArraySelectorComplex(len)(start_index, end_index);
+    out === expected_output;
+}
+
+component main = array_selector_complex_test(
+   8
+);
diff --git a/keyless/circuit/templates/tests/arrays/array_selector_test.circom b/keyless/circuit/templates/tests/arrays/array_selector_test.circom
new file mode 100644
index 0000000000000..be200df729ef5
--- /dev/null
+++ b/keyless/circuit/templates/tests/arrays/array_selector_test.circom
@@ -0,0 +1,16 @@
+pragma circom 2.1.3;
+
+include "helpers/arrays.circom";
+
+template array_selector_test(len) {
+    signal input start_index;
+    signal input end_index;
+    signal input expected_output[len];
+    
+    signal out[len] <== ArraySelector(len)(start_index, end_index);
+    out === expected_output;
+}
+
+component main = array_selector_test(
+   8
+);
diff --git a/keyless/circuit/templates/tests/arrays/array_selector_test_large.circom b/keyless/circuit/templates/tests/arrays/array_selector_test_large.circom
new file mode 100644
index 0000000000000..85c5d771411b0
--- /dev/null
+++ b/keyless/circuit/templates/tests/arrays/array_selector_test_large.circom
@@ -0,0 +1,16 @@
+pragma circom 2.1.3;
+
+include "helpers/arrays.circom";
+
+template array_selector_test(len) {
+    signal input start_index;
+    signal input end_index;
+    signal input expected_output[len];
+    
+    signal out[len] <== ArraySelector(len)(start_index, end_index);
+    out === expected_output;
+}
+
+component main = array_selector_test(
+   2000
+);
diff --git a/keyless/circuit/templates/tests/arrays/array_selector_test_small.circom b/keyless/circuit/templates/tests/arrays/array_selector_test_small.circom
new file mode 100644
index 0000000000000..228f63bef714c
--- /dev/null
+++ b/keyless/circuit/templates/tests/arrays/array_selector_test_small.circom
@@ -0,0 +1,16 @@
+pragma circom 2.1.3;
+
+include "helpers/arrays.circom";
+
+template array_selector_test(len) {
+    signal input start_index;
+    signal input end_index;
+    signal input expected_output[len];
+    
+    signal out[len] <== ArraySelector(len)(start_index, end_index);
+    out === expected_output;
+}
+
+component main = array_selector_test(
+   2
+);
diff --git a/keyless/circuit/templates/tests/arrays/ascii_digits_to_field_large_test.circom b/keyless/circuit/templates/tests/arrays/ascii_digits_to_field_large_test.circom
new file mode 100644
index 0000000000000..a9f169479de3b
--- /dev/null
+++ b/keyless/circuit/templates/tests/arrays/ascii_digits_to_field_large_test.circom
@@ -0,0 +1,16 @@
+pragma circom 2.1.3;
+
+include "helpers/arrays.circom";
+
+template check_are_ascii_digits_test(maxLen) {
+    signal input digits[maxLen];
+    signal input len;
+    signal input expected_output;
+    
+    signal out <== ASCIIDigitsToField(maxLen)(digits, len);
+    expected_output === out;
+}
+
+component main = check_are_ascii_digits_test(
+   2000
+);
diff --git a/keyless/circuit/templates/tests/arrays/ascii_digits_to_field_small_test.circom b/keyless/circuit/templates/tests/arrays/ascii_digits_to_field_small_test.circom
new file mode 100644
index 0000000000000..c1ee83e5f7737
--- /dev/null
+++ b/keyless/circuit/templates/tests/arrays/ascii_digits_to_field_small_test.circom
@@ -0,0 +1,16 @@
+pragma circom 2.1.3;
+
+include "helpers/arrays.circom";
+
+template check_are_ascii_digits_test(maxLen) {
+    signal input digits[maxLen];
+    signal input len;
+    signal input expected_output;
+    
+    signal out <== ASCIIDigitsToField(maxLen)(digits, len);
+    expected_output === out;
+}
+
+component main = check_are_ascii_digits_test(
+   2
+);
diff --git a/keyless/circuit/templates/tests/arrays/ascii_digits_to_field_test.circom b/keyless/circuit/templates/tests/arrays/ascii_digits_to_field_test.circom
new file mode 100644
index 0000000000000..ea53bcb013a91
--- /dev/null
+++ b/keyless/circuit/templates/tests/arrays/ascii_digits_to_field_test.circom
@@ -0,0 +1,16 @@
+pragma circom 2.1.3;
+
+include "helpers/arrays.circom";
+
+template check_are_ascii_digits_test(maxLen) {
+    signal input digits[maxLen];
+    signal input len;
+    signal input expected_output;
+    
+    signal out <== ASCIIDigitsToField(maxLen)(digits, len);
+    expected_output === out;
+}
+
+component main = check_are_ascii_digits_test(
+   20
+);
diff --git a/keyless/circuit/templates/tests/arrays/check_are_ascii_digits_large_test.circom b/keyless/circuit/templates/tests/arrays/check_are_ascii_digits_large_test.circom
new file mode 100644
index 0000000000000..35ce35a8a5351
--- /dev/null
+++ b/keyless/circuit/templates/tests/arrays/check_are_ascii_digits_large_test.circom
@@ -0,0 +1,14 @@
+pragma circom 2.1.3;
+
+include "helpers/arrays.circom";
+
+template check_are_ascii_digits_test(maxNumDigits) {
+    signal input in[maxNumDigits];
+    signal input len;
+    
+    CheckAreASCIIDigits(maxNumDigits)(in, len);
+}
+
+component main = check_are_ascii_digits_test(
+   2000
+);
diff --git a/keyless/circuit/templates/tests/arrays/check_are_ascii_digits_max_len_test.circom b/keyless/circuit/templates/tests/arrays/check_are_ascii_digits_max_len_test.circom
new file mode 100644
index 0000000000000..3454934fb9512
--- /dev/null
+++ b/keyless/circuit/templates/tests/arrays/check_are_ascii_digits_max_len_test.circom
@@ -0,0 +1,14 @@
+pragma circom 2.1.3;
+
+include "helpers/arrays.circom";
+
+template check_are_ascii_digits_test(maxNumDigits) {
+    signal input in[maxNumDigits];
+    signal input len;
+    
+    CheckAreASCIIDigits(maxNumDigits)(in, len);
+}
+
+component main = check_are_ascii_digits_test(
+   8
+);
diff --git a/keyless/circuit/templates/tests/arrays/check_are_ascii_digits_test.circom b/keyless/circuit/templates/tests/arrays/check_are_ascii_digits_test.circom
new file mode 100644
index 0000000000000..336a6a64bfa14
--- /dev/null
+++ b/keyless/circuit/templates/tests/arrays/check_are_ascii_digits_test.circom
@@ -0,0 +1,14 @@
+pragma circom 2.1.3;
+
+include "helpers/arrays.circom";
+
+template check_are_ascii_digits_test(maxNumDigits) {
+    signal input in[maxNumDigits];
+    signal input len;
+    
+    CheckAreASCIIDigits(maxNumDigits)(in, len);
+}
+
+component main = check_are_ascii_digits_test(
+   20
+);
diff --git a/keyless/circuit/templates/tests/arrays/check_substr_inclusion_poly_boolean_large_test.circom b/keyless/circuit/templates/tests/arrays/check_substr_inclusion_poly_boolean_large_test.circom
new file mode 100644
index 0000000000000..da54e2ed2d687
--- /dev/null
+++ b/keyless/circuit/templates/tests/arrays/check_substr_inclusion_poly_boolean_large_test.circom
@@ -0,0 +1,19 @@
+pragma circom 2.1.3;
+
+include "helpers/arrays.circom";
+
+template check_substr_inclusion_poly_boolean_test(maxStrLen, maxSubstrLen) {
+    signal input str[maxStrLen];
+    signal input str_hash;
+    signal input substr[maxSubstrLen];
+    signal input substr_len;
+    signal input start_index;
+    signal input expected_output;
+    
+    signal out <== CheckSubstrInclusionPolyBoolean(maxStrLen, maxSubstrLen)(str, str_hash, substr, substr_len, start_index);
+    expected_output === out;
+}
+
+component main = check_substr_inclusion_poly_boolean_test(
+   2000, 1000
+);
diff --git a/keyless/circuit/templates/tests/arrays/check_substr_inclusion_poly_boolean_no_padding_test.circom b/keyless/circuit/templates/tests/arrays/check_substr_inclusion_poly_boolean_no_padding_test.circom
new file mode 100644
index 0000000000000..8a5cfe6f19547
--- /dev/null
+++ b/keyless/circuit/templates/tests/arrays/check_substr_inclusion_poly_boolean_no_padding_test.circom
@@ -0,0 +1,19 @@
+pragma circom 2.1.3;
+
+include "helpers/arrays.circom";
+
+template check_substr_inclusion_poly_boolean_test(maxStrLen, maxSubstrLen) {
+    signal input str[maxStrLen];
+    signal input str_hash;
+    signal input substr[maxSubstrLen];
+    signal input substr_len;
+    signal input start_index;
+    signal input expected_output;
+    
+    signal out <== CheckSubstrInclusionPolyBoolean(maxStrLen, maxSubstrLen)(str, str_hash, substr, substr_len, start_index);
+    expected_output === out;
+}
+
+component main = check_substr_inclusion_poly_boolean_test(
+   12, 11
+);
diff --git a/keyless/circuit/templates/tests/arrays/check_substr_inclusion_poly_boolean_small_test.circom b/keyless/circuit/templates/tests/arrays/check_substr_inclusion_poly_boolean_small_test.circom
new file mode 100644
index 0000000000000..2bbb16eadbbee
--- /dev/null
+++ b/keyless/circuit/templates/tests/arrays/check_substr_inclusion_poly_boolean_small_test.circom
@@ -0,0 +1,19 @@
+pragma circom 2.1.3;
+
+include "helpers/arrays.circom";
+
+template check_substr_inclusion_poly_boolean_test(maxStrLen, maxSubstrLen) {
+    signal input str[maxStrLen];
+    signal input str_hash;
+    signal input substr[maxSubstrLen];
+    signal input substr_len;
+    signal input start_index;
+    signal input expected_output;
+    
+    signal out <== CheckSubstrInclusionPolyBoolean(maxStrLen, maxSubstrLen)(str, str_hash, substr, substr_len, start_index);
+    expected_output === out;
+}
+
+component main = check_substr_inclusion_poly_boolean_test(
+   100, 20
+);
diff --git a/keyless/circuit/templates/tests/arrays/check_substr_inclusion_poly_boolean_test.circom b/keyless/circuit/templates/tests/arrays/check_substr_inclusion_poly_boolean_test.circom
new file mode 100644
index 0000000000000..2bbb16eadbbee
--- /dev/null
+++ b/keyless/circuit/templates/tests/arrays/check_substr_inclusion_poly_boolean_test.circom
@@ -0,0 +1,19 @@
+pragma circom 2.1.3;
+
+include "helpers/arrays.circom";
+
+template check_substr_inclusion_poly_boolean_test(maxStrLen, maxSubstrLen) {
+    signal input str[maxStrLen];
+    signal input str_hash;
+    signal input substr[maxSubstrLen];
+    signal input substr_len;
+    signal input start_index;
+    signal input expected_output;
+    
+    signal out <== CheckSubstrInclusionPolyBoolean(maxStrLen, maxSubstrLen)(str, str_hash, substr, substr_len, start_index);
+    expected_output === out;
+}
+
+component main = check_substr_inclusion_poly_boolean_test(
+   100, 20
+);
diff --git a/keyless/circuit/templates/tests/arrays/check_substr_inclusion_poly_large_test.circom b/keyless/circuit/templates/tests/arrays/check_substr_inclusion_poly_large_test.circom
new file mode 100644
index 0000000000000..d5a25bef97415
--- /dev/null
+++ b/keyless/circuit/templates/tests/arrays/check_substr_inclusion_poly_large_test.circom
@@ -0,0 +1,17 @@
+pragma circom 2.1.3;
+
+include "helpers/arrays.circom";
+
+template check_substr_inclusion_poly_test(maxStrLen, maxSubstrLen) {
+    signal input str[maxStrLen];
+    signal input str_hash;
+    signal input substr[maxSubstrLen];
+    signal input substr_len;
+    signal input start_index;
+    
+    CheckSubstrInclusionPoly(maxStrLen, maxSubstrLen)(str, str_hash, substr, substr_len, start_index);
+}
+
+component main = check_substr_inclusion_poly_test(
+   2000, 1000
+);
diff --git a/keyless/circuit/templates/tests/arrays/check_substr_inclusion_poly_no_padding_test.circom b/keyless/circuit/templates/tests/arrays/check_substr_inclusion_poly_no_padding_test.circom
new file mode 100644
index 0000000000000..2b93f3ef863ac
--- /dev/null
+++ b/keyless/circuit/templates/tests/arrays/check_substr_inclusion_poly_no_padding_test.circom
@@ -0,0 +1,17 @@
+pragma circom 2.1.3;
+
+include "helpers/arrays.circom";
+
+template check_substr_inclusion_poly_test(maxStrLen, maxSubstrLen) {
+    signal input str[maxStrLen];
+    signal input str_hash;
+    signal input substr[maxSubstrLen];
+    signal input substr_len;
+    signal input start_index;
+    
+    CheckSubstrInclusionPoly(maxStrLen, maxSubstrLen)(str, str_hash, substr, substr_len, start_index);
+}
+
+component main = check_substr_inclusion_poly_test(
+   12, 11
+);
diff --git a/keyless/circuit/templates/tests/arrays/check_substr_inclusion_poly_test.circom b/keyless/circuit/templates/tests/arrays/check_substr_inclusion_poly_test.circom
new file mode 100644
index 0000000000000..daa35523f6cae
--- /dev/null
+++ b/keyless/circuit/templates/tests/arrays/check_substr_inclusion_poly_test.circom
@@ -0,0 +1,17 @@
+pragma circom 2.1.3;
+
+include "helpers/arrays.circom";
+
+template check_substr_inclusion_poly_test(maxStrLen, maxSubstrLen) {
+    signal input str[maxStrLen];
+    signal input str_hash;
+    signal input substr[maxSubstrLen];
+    signal input substr_len;
+    signal input start_index;
+    
+    CheckSubstrInclusionPoly(maxStrLen, maxSubstrLen)(str, str_hash, substr, substr_len, start_index);
+}
+
+component main = check_substr_inclusion_poly_test(
+   100, 20
+);
diff --git a/keyless/circuit/templates/tests/arrays/concatenation_check_large_test.circom b/keyless/circuit/templates/tests/arrays/concatenation_check_large_test.circom
new file mode 100644
index 0000000000000..0a7c75a37607c
--- /dev/null
+++ b/keyless/circuit/templates/tests/arrays/concatenation_check_large_test.circom
@@ -0,0 +1,18 @@
+pragma circom 2.1.3;
+
+include "helpers/arrays.circom";
+
+template concatenation_check_test(maxFullStringLen, maxLeftStringLen, maxRightStringLen) {
+    signal input full_string[maxFullStringLen];
+    signal input left[maxLeftStringLen];
+    signal input right[maxRightStringLen];
+    signal input left_len;
+    signal input right_len;
+    
+    log("silly test string");
+    ConcatenationCheck(maxFullStringLen, maxLeftStringLen, maxRightStringLen)(full_string, left, right, left_len, right_len);
+}
+
+component main = concatenation_check_test(
+   1600, 1000, 1000
+);
diff --git a/keyless/circuit/templates/tests/arrays/concatenation_check_small_test.circom b/keyless/circuit/templates/tests/arrays/concatenation_check_small_test.circom
new file mode 100644
index 0000000000000..70c2a6fb510e8
--- /dev/null
+++ b/keyless/circuit/templates/tests/arrays/concatenation_check_small_test.circom
@@ -0,0 +1,17 @@
+pragma circom 2.1.3;
+
+include "helpers/arrays.circom";
+
+template concatenation_check_test(maxFullStringLen, maxLeftStringLen, maxRightStringLen) {
+    signal input full_string[maxFullStringLen];
+    signal input left[maxLeftStringLen];
+    signal input right[maxRightStringLen];
+    signal input left_len;
+    signal input right_len;
+    
+    ConcatenationCheck(maxFullStringLen, maxLeftStringLen, maxRightStringLen)(full_string, left, right, left_len, right_len);
+}
+
+component main = concatenation_check_test(
+   2, 1, 1
+);
diff --git a/keyless/circuit/templates/tests/arrays/concatenation_check_test.circom b/keyless/circuit/templates/tests/arrays/concatenation_check_test.circom
new file mode 100644
index 0000000000000..dfc25eaa84a3e
--- /dev/null
+++ b/keyless/circuit/templates/tests/arrays/concatenation_check_test.circom
@@ -0,0 +1,17 @@
+pragma circom 2.1.3;
+
+include "helpers/arrays.circom";
+
+template concatenation_check_test(maxFullStringLen, maxLeftStringLen, maxRightStringLen) {
+    signal input full_string[maxFullStringLen];
+    signal input left[maxLeftStringLen];
+    signal input right[maxRightStringLen];
+    signal input left_len;
+    signal input right_len;
+    
+    ConcatenationCheck(maxFullStringLen, maxLeftStringLen, maxRightStringLen)(full_string, left, right, left_len, right_len);
+}
+
+component main = concatenation_check_test(
+   100, 70, 70
+);
diff --git a/keyless/circuit/templates/tests/arrays/left_array_selector_large_test.circom b/keyless/circuit/templates/tests/arrays/left_array_selector_large_test.circom
new file mode 100644
index 0000000000000..ea703bba130ce
--- /dev/null
+++ b/keyless/circuit/templates/tests/arrays/left_array_selector_large_test.circom
@@ -0,0 +1,15 @@
+pragma circom 2.1.3;
+
+include "helpers/arrays.circom";
+
+template left_array_selector_test(len) {
+    signal input index;
+    signal input expected_output[len];
+    
+    signal out[len] <== LeftArraySelector(len)(index);
+    out === expected_output;
+}
+
+component main = left_array_selector_test(
+   2000
+);
diff --git a/keyless/circuit/templates/tests/arrays/left_array_selector_small_test.circom b/keyless/circuit/templates/tests/arrays/left_array_selector_small_test.circom
new file mode 100644
index 0000000000000..015a0db265810
--- /dev/null
+++ b/keyless/circuit/templates/tests/arrays/left_array_selector_small_test.circom
@@ -0,0 +1,15 @@
+pragma circom 2.1.3;
+
+include "helpers/arrays.circom";
+
+template left_array_selector_test(len) {
+    signal input index;
+    signal input expected_output[len];
+    
+    signal out[len] <== LeftArraySelector(len)(index);
+    out === expected_output;
+}
+
+component main = left_array_selector_test(
+   1
+);
diff --git a/keyless/circuit/templates/tests/arrays/left_array_selector_test.circom b/keyless/circuit/templates/tests/arrays/left_array_selector_test.circom
new file mode 100644
index 0000000000000..e8e9af0ab722c
--- /dev/null
+++ b/keyless/circuit/templates/tests/arrays/left_array_selector_test.circom
@@ -0,0 +1,15 @@
+pragma circom 2.1.3;
+
+include "helpers/arrays.circom";
+
+template left_array_selector_test(len) {
+    signal input index;
+    signal input expected_output[len];
+    
+    signal out[len] <== LeftArraySelector(len)(index);
+    out === expected_output;
+}
+
+component main = left_array_selector_test(
+   8
+);
diff --git a/keyless/circuit/templates/tests/arrays/right_array_selector_large_test.circom b/keyless/circuit/templates/tests/arrays/right_array_selector_large_test.circom
new file mode 100644
index 0000000000000..057dffd47e3cc
--- /dev/null
+++ b/keyless/circuit/templates/tests/arrays/right_array_selector_large_test.circom
@@ -0,0 +1,15 @@
+pragma circom 2.1.3;
+
+include "helpers/arrays.circom";
+
+template right_array_selector_test(len) {
+    signal input index;
+    signal input expected_output[len];
+    
+    signal out[len] <== RightArraySelector(len)(index);
+    out === expected_output;
+}
+
+component main = right_array_selector_test(
+   2000
+);
diff --git a/keyless/circuit/templates/tests/arrays/right_array_selector_small_test.circom b/keyless/circuit/templates/tests/arrays/right_array_selector_small_test.circom
new file mode 100644
index 0000000000000..c893813e77370
--- /dev/null
+++ b/keyless/circuit/templates/tests/arrays/right_array_selector_small_test.circom
@@ -0,0 +1,15 @@
+pragma circom 2.1.3;
+
+include "helpers/arrays.circom";
+
+template right_array_selector_test(len) {
+    signal input index;
+    signal input expected_output[len];
+    
+    signal out[len] <== RightArraySelector(len)(index);
+    out === expected_output;
+}
+
+component main = right_array_selector_test(
+   1
+);
diff --git a/keyless/circuit/templates/tests/arrays/right_array_selector_test.circom b/keyless/circuit/templates/tests/arrays/right_array_selector_test.circom
new file mode 100644
index 0000000000000..a19534a9f7958
--- /dev/null
+++ b/keyless/circuit/templates/tests/arrays/right_array_selector_test.circom
@@ -0,0 +1,15 @@
+pragma circom 2.1.3;
+
+include "helpers/arrays.circom";
+
+template right_array_selector_test(len) {
+    signal input index;
+    signal input expected_output[len];
+    
+    signal out[len] <== RightArraySelector(len)(index);
+    out === expected_output;
+}
+
+component main = right_array_selector_test(
+   8
+);
diff --git a/keyless/circuit/templates/tests/arrays/select_array_value_large_test.circom b/keyless/circuit/templates/tests/arrays/select_array_value_large_test.circom
new file mode 100644
index 0000000000000..ff2a1b3982aaf
--- /dev/null
+++ b/keyless/circuit/templates/tests/arrays/select_array_value_large_test.circom
@@ -0,0 +1,16 @@
+pragma circom 2.1.3;
+
+include "helpers/arrays.circom";
+
+template select_array_value_test(len) {
+    signal input array[len];
+    signal input index;
+    signal input expected_output;
+    
+    signal out <== SelectArrayValue(len)(array, index);
+    out === expected_output;
+}
+
+component main = select_array_value_test(
+   2000
+);
diff --git a/keyless/circuit/templates/tests/arrays/select_array_value_small_test.circom b/keyless/circuit/templates/tests/arrays/select_array_value_small_test.circom
new file mode 100644
index 0000000000000..32f330e064ae7
--- /dev/null
+++ b/keyless/circuit/templates/tests/arrays/select_array_value_small_test.circom
@@ -0,0 +1,16 @@
+pragma circom 2.1.3;
+
+include "helpers/arrays.circom";
+
+template select_array_value_test(len) {
+    signal input array[len];
+    signal input index;
+    signal input expected_output;
+    
+    signal out <== SelectArrayValue(len)(array, index);
+    out === expected_output;
+}
+
+component main = select_array_value_test(
+   1
+);
diff --git a/keyless/circuit/templates/tests/arrays/select_array_value_test.circom b/keyless/circuit/templates/tests/arrays/select_array_value_test.circom
new file mode 100644
index 0000000000000..693380c569c9c
--- /dev/null
+++ b/keyless/circuit/templates/tests/arrays/select_array_value_test.circom
@@ -0,0 +1,16 @@
+pragma circom 2.1.3;
+
+include "helpers/arrays.circom";
+
+template select_array_value_test(len) {
+    signal input array[len];
+    signal input index;
+    signal input expected_output;
+    
+    signal out <== SelectArrayValue(len)(array, index);
+    out === expected_output;
+}
+
+component main = select_array_value_test(
+   8
+);
diff --git a/keyless/circuit/templates/tests/arrays/single_neg_one_array_large_test.circom b/keyless/circuit/templates/tests/arrays/single_neg_one_array_large_test.circom
new file mode 100644
index 0000000000000..d535b327c0a8d
--- /dev/null
+++ b/keyless/circuit/templates/tests/arrays/single_neg_one_array_large_test.circom
@@ -0,0 +1,15 @@
+pragma circom 2.1.3;
+
+include "helpers/arrays.circom";
+
+template single_neg_one_array_test(len) {
+    signal input index;
+    signal input expected_output[len];
+    
+    signal out[len] <== SingleNegOneArray(len)(index);
+    out === expected_output;
+}
+
+component main = single_neg_one_array_test(
+   2000
+);
diff --git a/keyless/circuit/templates/tests/arrays/single_neg_one_array_small_test.circom b/keyless/circuit/templates/tests/arrays/single_neg_one_array_small_test.circom
new file mode 100644
index 0000000000000..2fb74b2343bd7
--- /dev/null
+++ b/keyless/circuit/templates/tests/arrays/single_neg_one_array_small_test.circom
@@ -0,0 +1,15 @@
+pragma circom 2.1.3;
+
+include "helpers/arrays.circom";
+
+template single_neg_one_array_test(len) {
+    signal input index;
+    signal input expected_output[len];
+    
+    signal out[len] <== SingleNegOneArray(len)(index);
+    out === expected_output;
+}
+
+component main = single_neg_one_array_test(
+   1
+);
diff --git a/keyless/circuit/templates/tests/arrays/single_neg_one_array_test.circom b/keyless/circuit/templates/tests/arrays/single_neg_one_array_test.circom
new file mode 100644
index 0000000000000..cbd9669a48dbf
--- /dev/null
+++ b/keyless/circuit/templates/tests/arrays/single_neg_one_array_test.circom
@@ -0,0 +1,15 @@
+pragma circom 2.1.3;
+
+include "helpers/arrays.circom";
+
+template single_neg_one_array_test(len) {
+    signal input index;
+    signal input expected_output[len];
+    
+    signal out[len] <== SingleNegOneArray(len)(index);
+    out === expected_output;
+}
+
+component main = single_neg_one_array_test(
+   8
+);
diff --git a/keyless/circuit/templates/tests/arrays/single_one_array_large_test.circom b/keyless/circuit/templates/tests/arrays/single_one_array_large_test.circom
new file mode 100644
index 0000000000000..330495f6bf873
--- /dev/null
+++ b/keyless/circuit/templates/tests/arrays/single_one_array_large_test.circom
@@ -0,0 +1,15 @@
+pragma circom 2.1.3;
+
+include "helpers/arrays.circom";
+
+template single_one_array_test(len) {
+    signal input index;
+    signal input expected_output[len];
+    
+    signal out[len] <== SingleOneArray(len)(index);
+    out === expected_output;
+}
+
+component main = single_one_array_test(
+   2000
+);
diff --git a/keyless/circuit/templates/tests/arrays/single_one_array_small_test.circom b/keyless/circuit/templates/tests/arrays/single_one_array_small_test.circom
new file mode 100644
index 0000000000000..39a2d154c3ff5
--- /dev/null
+++ b/keyless/circuit/templates/tests/arrays/single_one_array_small_test.circom
@@ -0,0 +1,15 @@
+pragma circom 2.1.3;
+
+include "helpers/arrays.circom";
+
+template single_one_array_test(len) {
+    signal input index;
+    signal input expected_output[len];
+    
+    signal out[len] <== SingleOneArray(len)(index);
+    out === expected_output;
+}
+
+component main = single_one_array_test(
+   1
+);
diff --git a/keyless/circuit/templates/tests/arrays/single_one_array_test.circom b/keyless/circuit/templates/tests/arrays/single_one_array_test.circom
new file mode 100644
index 0000000000000..ac083c7a387b6
--- /dev/null
+++ b/keyless/circuit/templates/tests/arrays/single_one_array_test.circom
@@ -0,0 +1,15 @@
+pragma circom 2.1.3;
+
+include "helpers/arrays.circom";
+
+template single_one_array_test(len) {
+    signal input index;
+    signal input expected_output[len];
+    
+    signal out[len] <== SingleOneArray(len)(index);
+    out === expected_output;
+}
+
+component main = single_one_array_test(
+   8
+);
diff --git a/keyless/circuit/templates/tests/base64_decode_test.circom b/keyless/circuit/templates/tests/base64_decode_test.circom
new file mode 100644
index 0000000000000..a40d11626c709
--- /dev/null
+++ b/keyless/circuit/templates/tests/base64_decode_test.circom
@@ -0,0 +1,17 @@
+pragma circom 2.1.3;
+
+include "helpers/base64.circom";
+
+template base64_decode_test(maxJWTPayloadLen) {
+    var max_ascii_jwt_payload_len = (3*maxJWTPayloadLen)\4;
+    signal input jwt_payload[maxJWTPayloadLen];
+    signal input ascii_jwt_payload[max_ascii_jwt_payload_len];
+    component base64decode = Base64Decode(max_ascii_jwt_payload_len);
+    base64decode.in <== jwt_payload;
+    ascii_jwt_payload === base64decode.out;
+
+}
+
+component main = base64_decode_test(
+    192*8-64   // maxJWTPayloadLen
+);
diff --git a/keyless/circuit/templates/tests/base64_decode_test_short.circom b/keyless/circuit/templates/tests/base64_decode_test_short.circom
new file mode 100644
index 0000000000000..a23e0c53ec020
--- /dev/null
+++ b/keyless/circuit/templates/tests/base64_decode_test_short.circom
@@ -0,0 +1,17 @@
+pragma circom 2.1.3;
+
+include "helpers/base64.circom";
+
+template base64_decode_test(maxJWTPayloadLen) {
+    var max_ascii_jwt_payload_len = (3*maxJWTPayloadLen)\4;
+    signal input jwt_payload[maxJWTPayloadLen];
+    signal input ascii_jwt_payload[max_ascii_jwt_payload_len];
+    component base64decode = Base64Decode(max_ascii_jwt_payload_len);
+    base64decode.in <== jwt_payload;
+    ascii_jwt_payload === base64decode.out;
+
+}
+
+component main = base64_decode_test(
+   4
+);
diff --git a/keyless/circuit/templates/tests/base64_lookup_test.circom b/keyless/circuit/templates/tests/base64_lookup_test.circom
new file mode 100644
index 0000000000000..89ab269af72b5
--- /dev/null
+++ b/keyless/circuit/templates/tests/base64_lookup_test.circom
@@ -0,0 +1,15 @@
+
+pragma circom 2.1.3;
+
+include "helpers/base64.circom";
+
+template base64_lookup_test() {
+    signal input in_b64_char;
+    signal input out_num;
+    component base64_url_lookup = Base64URLLookup();
+    base64_url_lookup.in <== in_b64_char;
+    out_num === base64_url_lookup.out;
+
+}
+
+component main = base64_lookup_test();
diff --git a/keyless/circuit/templates/tests/bigint/big_less_than_test.circom b/keyless/circuit/templates/tests/bigint/big_less_than_test.circom
new file mode 100644
index 0000000000000..736e813c7599c
--- /dev/null
+++ b/keyless/circuit/templates/tests/bigint/big_less_than_test.circom
@@ -0,0 +1,16 @@
+pragma circom 2.1.3;
+
+include "helpers/rsa/bigint.circom";
+
+template big_less_than_test() {
+    signal input a[32];
+    signal input b[32];
+    signal input expected_output;
+    component c1 = BigLessThan(252, 32); // mainTemplate usage
+    c1.a <== a;
+    c1.b <== b;
+    expected_output === c1.out;
+    log("hi", c1.out);
+}
+
+component main = big_less_than_test();
diff --git a/keyless/circuit/templates/tests/check_substr_inclusion_poly_boolean_test.circom b/keyless/circuit/templates/tests/check_substr_inclusion_poly_boolean_test.circom
new file mode 100644
index 0000000000000..02be2768724ae
--- /dev/null
+++ b/keyless/circuit/templates/tests/check_substr_inclusion_poly_boolean_test.circom
@@ -0,0 +1,28 @@
+
+
+pragma circom 2.1.3;
+
+include "helpers/arrays.circom";
+
+template check_substr_inclusion_poly_boolean_test() {
+    var max_str_len = 256;
+    var max_substr_len = 8;
+
+    signal input str[max_str_len];
+    signal input str_hash;
+    signal input substr[max_substr_len];
+    signal input substr_len;
+    signal input start_index;
+    signal input check_passes;
+
+    component check_substr_inclusion_poly_boolean = CheckSubstrInclusionPolyBoolean(max_str_len, max_substr_len);
+
+    check_substr_inclusion_poly_boolean.str <== str;
+    check_substr_inclusion_poly_boolean.str_hash <== str_hash;
+    check_substr_inclusion_poly_boolean.substr <== substr;
+    check_substr_inclusion_poly_boolean.substr_len <== substr_len;
+    check_substr_inclusion_poly_boolean.start_index <== start_index;
+    check_substr_inclusion_poly_boolean.check_passes === check_passes;
+}
+
+component main = check_substr_inclusion_poly_boolean_test();
diff --git a/keyless/circuit/templates/tests/check_substr_inclusion_poly_test.circom b/keyless/circuit/templates/tests/check_substr_inclusion_poly_test.circom
new file mode 100644
index 0000000000000..6b8ef13521476
--- /dev/null
+++ b/keyless/circuit/templates/tests/check_substr_inclusion_poly_test.circom
@@ -0,0 +1,25 @@
+
+pragma circom 2.1.3;
+
+include "helpers/arrays.circom";
+
+template check_substr_inclusion_poly_test() {
+    var max_str_len = 256;
+    var max_substr_len = 8;
+
+    signal input str[max_str_len];
+    signal input str_hash;
+    signal input substr[max_substr_len];
+    signal input substr_len;
+    signal input start_index;
+
+    component check_substr_inclusion_poly = CheckSubstrInclusionPoly(max_str_len, max_substr_len);
+
+    check_substr_inclusion_poly.str <== str;
+    check_substr_inclusion_poly.str_hash <== str_hash;
+    check_substr_inclusion_poly.substr <== substr;
+    check_substr_inclusion_poly.substr_len <== substr_len;
+    check_substr_inclusion_poly.start_index <== start_index;
+}
+
+component main = check_substr_inclusion_poly_test();
diff --git a/keyless/circuit/templates/tests/jwt_field_parsing/parse_email_verified_field_test.circom b/keyless/circuit/templates/tests/jwt_field_parsing/parse_email_verified_field_test.circom
new file mode 100644
index 0000000000000..6467f1b1d1292
--- /dev/null
+++ b/keyless/circuit/templates/tests/jwt_field_parsing/parse_email_verified_field_test.circom
@@ -0,0 +1,7 @@
+
+pragma circom 2.1.3;
+
+include "helpers/jwt_field_parsing.circom";
+
+
+component main = ParseEmailVerifiedField(30, 20, 10);
diff --git a/keyless/circuit/templates/tests/jwt_field_parsing/parse_quoted_test.circom b/keyless/circuit/templates/tests/jwt_field_parsing/parse_quoted_test.circom
new file mode 100644
index 0000000000000..da3f9b619c057
--- /dev/null
+++ b/keyless/circuit/templates/tests/jwt_field_parsing/parse_quoted_test.circom
@@ -0,0 +1,6 @@
+pragma circom 2.1.3;
+
+include "helpers/jwt_field_parsing.circom";
+
+
+component main = ParseJWTFieldWithQuotedValue(60, 30, 30);
diff --git a/keyless/circuit/templates/tests/jwt_field_parsing/parse_unquoted_test.circom b/keyless/circuit/templates/tests/jwt_field_parsing/parse_unquoted_test.circom
new file mode 100644
index 0000000000000..51b5b08b1b466
--- /dev/null
+++ b/keyless/circuit/templates/tests/jwt_field_parsing/parse_unquoted_test.circom
@@ -0,0 +1,6 @@
+pragma circom 2.1.3;
+
+include "helpers/jwt_field_parsing.circom";
+
+
+component main = ParseJWTFieldWithUnquotedValue(60, 30, 30);
diff --git a/keyless/circuit/templates/tests/misc/assert_equal_if_true_test.circom b/keyless/circuit/templates/tests/misc/assert_equal_if_true_test.circom
new file mode 100644
index 0000000000000..ea6a917289e97
--- /dev/null
+++ b/keyless/circuit/templates/tests/misc/assert_equal_if_true_test.circom
@@ -0,0 +1,7 @@
+
+pragma circom 2.1.3;
+
+include "helpers/misc.circom";
+
+
+component main = AssertEqualIfTrue();
diff --git a/keyless/circuit/templates/tests/misc/calculate_total_test.circom b/keyless/circuit/templates/tests/misc/calculate_total_test.circom
new file mode 100644
index 0000000000000..4094ba2f6e771
--- /dev/null
+++ b/keyless/circuit/templates/tests/misc/calculate_total_test.circom
@@ -0,0 +1,17 @@
+
+pragma circom 2.1.3;
+
+include "helpers/misc.circom";
+
+template calculate_total_test() {
+    var len = 10;
+    signal input nums[len];
+    signal input sum;
+    component calculate_total = CalculateTotal(len);
+    calculate_total.nums <== nums;
+    calculate_total.sum === sum;
+
+}
+
+component main = calculate_total_test(
+);
diff --git a/keyless/circuit/templates/tests/misc/email_verified_check_test.circom b/keyless/circuit/templates/tests/misc/email_verified_check_test.circom
new file mode 100644
index 0000000000000..b2e6e76242448
--- /dev/null
+++ b/keyless/circuit/templates/tests/misc/email_verified_check_test.circom
@@ -0,0 +1,29 @@
+
+pragma circom 2.1.3;
+
+include "helpers/misc.circom";
+
+template email_verified_check_test() {
+    var maxEVNameLen = 20;
+    var maxEVValueLen = 10;
+    var maxUIDNameLen = 30;
+    signal input ev_name[maxEVNameLen];
+    signal input ev_value[maxEVValueLen];
+    signal input ev_value_len;
+    signal input uid_name[maxUIDNameLen];
+    signal input uid_name_len;
+    signal input uid_is_email;
+    component email_verified_check = EmailVerifiedCheck(maxEVNameLen, maxEVValueLen, maxUIDNameLen);
+    email_verified_check.ev_name <== ev_name;
+    email_verified_check.ev_value <== ev_value;
+    email_verified_check.ev_value_len <== ev_value_len;
+    email_verified_check.uid_name <== uid_name;
+    email_verified_check.uid_name_len <== uid_name_len;
+    email_verified_check.uid_is_email === uid_is_email;
+
+}
+
+component main = email_verified_check_test(
+);
+
+
diff --git a/keyless/circuit/templates/tests/misc/is_whitespace_test.circom b/keyless/circuit/templates/tests/misc/is_whitespace_test.circom
new file mode 100644
index 0000000000000..1f74c192623fc
--- /dev/null
+++ b/keyless/circuit/templates/tests/misc/is_whitespace_test.circom
@@ -0,0 +1,16 @@
+
+pragma circom 2.1.3;
+
+include "helpers/misc.circom";
+
+template is_whitespace_test() {
+    signal input char;
+    signal input result;
+    component is_whitespace = isWhitespace();
+    is_whitespace.char <== char;
+    is_whitespace.is_whitespace === result;
+
+}
+
+component main = is_whitespace_test(
+);
diff --git a/keyless/circuit/templates/tests/misc/string_bodies_test.circom b/keyless/circuit/templates/tests/misc/string_bodies_test.circom
new file mode 100644
index 0000000000000..32f36df73a64d
--- /dev/null
+++ b/keyless/circuit/templates/tests/misc/string_bodies_test.circom
@@ -0,0 +1,18 @@
+
+
+pragma circom 2.1.3;
+
+include "helpers/misc.circom";
+
+template string_bodies_test() {
+    var len = 13;
+    signal input in[len];
+    signal input out[len];
+    component string_bodies = StringBodies(len);
+    string_bodies.in <== in;
+    string_bodies.out === out;
+
+}
+
+component main = string_bodies_test(
+);
diff --git a/keyless/circuit/templates/tests/packing/bits2num_big_endian_test.circom b/keyless/circuit/templates/tests/packing/bits2num_big_endian_test.circom
new file mode 100644
index 0000000000000..83295344f4a66
--- /dev/null
+++ b/keyless/circuit/templates/tests/packing/bits2num_big_endian_test.circom
@@ -0,0 +1,21 @@
+
+
+pragma circom 2.1.3;
+
+include "helpers/packing.circom";
+
+template bits2num_big_endian_test() {
+    var max_bits_len = 64;
+    signal input bits_in[max_bits_len];
+    signal input num_out;
+    component num2bits_be = Bits2NumBigEndian(max_bits_len);
+    num2bits_be.in <== bits_in;
+    for (var i = 0; i < max_bits_len; i++ ) {
+      log(num2bits_be.in[i]);
+    }
+    log("output:", num2bits_be.out);
+    num2bits_be.out === num_out;
+
+}
+
+component main = bits2num_big_endian_test();
diff --git a/keyless/circuit/templates/tests/packing/bits_to_field_elems_test.circom b/keyless/circuit/templates/tests/packing/bits_to_field_elems_test.circom
new file mode 100644
index 0000000000000..29121a5bf36b2
--- /dev/null
+++ b/keyless/circuit/templates/tests/packing/bits_to_field_elems_test.circom
@@ -0,0 +1,18 @@
+
+pragma circom 2.1.3;
+
+include "helpers/packing.circom";
+
+template bits_to_field_elems_test() {
+    var max_bits_len = 256;
+    var bits_per_field_elem = 64;
+    var num_field_elems = max_bits_len%bits_per_field_elem == 0 ? max_bits_len \ bits_per_field_elem : (max_bits_len\bits_per_field_elem) + 1; // '\' is the quotient operation - we add 1 if there are extra bits past the full bytes
+    signal input bits_in[max_bits_len];
+    signal input field_elems_out[num_field_elems];
+    component bits_to_field_elems = BitsToFieldElems(max_bits_len, bits_per_field_elem);
+    bits_to_field_elems.in <== bits_in;
+    bits_to_field_elems.elems === field_elems_out;
+
+}
+
+component main = bits_to_field_elems_test();
diff --git a/keyless/circuit/templates/tests/packing/bytes_to_bits_test.circom b/keyless/circuit/templates/tests/packing/bytes_to_bits_test.circom
new file mode 100644
index 0000000000000..c5fc8fe6ffb6a
--- /dev/null
+++ b/keyless/circuit/templates/tests/packing/bytes_to_bits_test.circom
@@ -0,0 +1,16 @@
+pragma circom 2.1.3;
+
+include "helpers/packing.circom";
+
+template bytes_to_bits_test() {
+    var max_bytes_len = 10;
+    var max_bits_len = max_bytes_len * 8;
+    signal input bytes_in[max_bytes_len];
+    signal input bits_out[max_bits_len];
+    component bytes_to_bits = BytesToBits(max_bytes_len);
+    bytes_to_bits.in <== bytes_in;
+    bytes_to_bits.bits === bits_out;
+
+}
+
+component main = bytes_to_bits_test();
diff --git a/keyless/circuit/templates/tests/packing/num2bits_be_test.circom b/keyless/circuit/templates/tests/packing/num2bits_be_test.circom
new file mode 100644
index 0000000000000..0f0697db94d09
--- /dev/null
+++ b/keyless/circuit/templates/tests/packing/num2bits_be_test.circom
@@ -0,0 +1,16 @@
+
+pragma circom 2.1.3;
+
+include "helpers/packing.circom";
+
+template num2bits_be_test() {
+    var max_bits_len = 8;
+    signal input num_in;
+    signal input bits_out[max_bits_len];
+    component num2bits_be = Num2BitsBE(max_bits_len);
+    num2bits_be.in <== num_in;
+    num2bits_be.out === bits_out;
+
+}
+
+component main = num2bits_be_test();
diff --git a/keyless/circuit/templates/tests/rsa_verify_test.circom b/keyless/circuit/templates/tests/rsa_verify_test.circom
new file mode 100644
index 0000000000000..d862e04de832f
--- /dev/null
+++ b/keyless/circuit/templates/tests/rsa_verify_test.circom
@@ -0,0 +1,5 @@
+pragma circom 2.1.3;
+
+include "helpers/rsa/rsa_verify.circom";
+
+component main = RsaVerifyPkcs1v15(64, 32);
diff --git a/keyless/circuit/templates/tests/sha2_padding_verify_test.circom b/keyless/circuit/templates/tests/sha2_padding_verify_test.circom
new file mode 100644
index 0000000000000..c14580f11945f
--- /dev/null
+++ b/keyless/circuit/templates/tests/sha2_padding_verify_test.circom
@@ -0,0 +1,5 @@
+pragma circom 2.1.3;
+
+include "helpers/sha.circom";
+
+component main = Sha2PaddingVerify(256); // 4 blocks
diff --git a/keyless/circuit/templates/tests/sha_test.circom b/keyless/circuit/templates/tests/sha_test.circom
new file mode 100644
index 0000000000000..6dae907e73cb0
--- /dev/null
+++ b/keyless/circuit/templates/tests/sha_test.circom
@@ -0,0 +1,15 @@
+pragma circom 2.1.3;
+
+include "helpers/sha.circom";
+
+template sha_test(max_num_blocks) {
+    signal input padded_input_bits[max_num_blocks * 512];
+    signal input input_bit_len;
+    signal input expected_digest_bits[256];
+    component c1 = Sha2_256_prepadded_varlen(max_num_blocks);
+    c1.in <== padded_input_bits;
+    c1.tBlock <== (input_bit_len / 512) - 1;
+    expected_digest_bits === c1.out;
+}
+
+component main = sha_test(4);
diff --git a/keyless/circuit/templates/update_ctags.sh b/keyless/circuit/templates/update_ctags.sh
new file mode 100755
index 0000000000000..1aaaa73a2a752
--- /dev/null
+++ b/keyless/circuit/templates/update_ctags.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+find . -name "*.circom" | ctags --language-force=C -L-
diff --git a/keyless/circuit/tools/create-proofs-for-testing.sh b/keyless/circuit/tools/create-proofs-for-testing.sh
new file mode 100755
index 0000000000000..fda40dec8a689
--- /dev/null
+++ b/keyless/circuit/tools/create-proofs-for-testing.sh
@@ -0,0 +1,126 @@
+#!/bin/bash
+
+#
+# TODO: update `create-proofs-for-testing.sh` to match the latest circuit, then provide instructions.
+#
+
+set -e
+
+scriptdir="$(cd "$(dirname "$0")" >/dev/null 2>&1 && pwd)"
+repodir=$scriptdir
+
+echo "Executing from directory: $scriptdir"
+
+print_usage() {
+cat <<DONE
+Usage: `basename $0` <keyless-circuit-branch> <prover_key_path> [<output_dir>]
+
+Creates proofs for the inputs generated by the keyless-circuit's input_gen.py 
+script. We use these proofs to test our Rust verifier.
+
+Uses <prover_key_path> as the path to the prover key.
+
+If <keyless-circuit-branch> is --local then uses the current repo rather than 
+cloning a remote branch inside $scriptdir/tmp/keyless-circuit-<branch-name>.
+
+Proofs are stored in <output_dir> which defaults to the root of the repository (i.e., $repodir)
+DONE
+}
+
+pushd() {
+    command pushd "$@" > /dev/null
+}
+
+popd() {
+    command popd "$@" > /dev/null
+}
+
+proofgen() {
+    branch=$1
+    prover_key=$2
+    outdir=$3
+    
+    if [ ! -f $prover_key ]; then
+        echo "$prover_key is not a file (may be a directory?)"
+        exit 1
+    fi
+
+    prover_key=`realpath $prover_key`
+
+    echo
+    echo "Using proving key from $prover_key"
+
+    tmpdir=tmp
+    mkdir -p $tmpdir
+    pushd $tmpdir/ 
+    {
+        if [ $branch == "--local" ]; then
+            echo
+            echo "Using current repo in $repodir"
+            keylessrepo=$repodir
+        else
+            keylessrepo=aptos-keyless-circuit-$(echo $branch | tr / -)
+            echo
+            echo "Cloning or updating aptos-keyless-circuit:$branch in $keylessrepo..."
+            if [ -d $keylessrepo ]; then 
+                echo "Looks like repo is cloned. Updating..."
+                pushd $keylessrepo; git checkout $branch; popd
+            else
+                echo "Cloning..."
+                git clone git@github.com:aptos-labs/aptos-keyless-circuit $keylessrepo
+                pushd $keylessrepo; git checkout $branch; popd
+            fi
+        fi
+        pushd $keylessrepo 
+        {
+            echo
+            echo "Creating python3 virtual env w/ deps..."
+            virtualenv ig
+            source ./ig/bin/activate
+
+            pip3 install pyjwt pycryptodome cryptography
+    
+            pushd templates/
+            {
+                echo
+                echo "(Re)compiling circuit. This will take several seconds..."
+                circom -l . main.circom --r1cs --wasm --sym 
+            }
+            popd
+
+            echo
+            echo "Running input_gen.py..."
+            touch input.json
+            python3 input_gen.py
+            pushd templates/main_js
+            {
+                echo
+                echo "Generating witness..."
+                node generate_witness.js main.wasm ../../input.json witness.wtns
+            }
+            popd
+
+            echo
+            echo "Generating proof. Should take around 30 seconds..."
+            rm -f $outdir/proof.json
+            rm -f $outdir/public.json
+            snarkjs groth16 prove $prover_key templates/main_js/witness.wtns $outdir/proof.json $outdir/public.json
+
+            echo
+            echo "Done. Find the {input,proof,public}.json output files in `pwd`"
+        }
+        popd
+    }
+    popd
+}
+
+if [ "$#" -lt 2 ]; then
+    print_usage
+    exit 1
+fi
+
+outdir=${3:-$repodir}
+mkdir -p $outdir
+pushd $repodir/
+    proofgen "$1" "$2" "$outdir"
+popd
diff --git a/keyless/circuit/tools/input_gen.py b/keyless/circuit/tools/input_gen.py
new file mode 100755
index 0000000000000..df5cbc471b922
--- /dev/null
+++ b/keyless/circuit/tools/input_gen.py
@@ -0,0 +1,618 @@
+#!/usr/bin/env python3
+
+# WARNING: This code is guaranteed to work only for the hardcoded JWT present, and is meant only to be used to provide a quick and easy way to run the full Keyless circuit. Detailed unit tests can be found in `circuit/src`.
+
+import json
+import os
+from typing import Any
+
+import jwt
+from Crypto.Util.number import bytes_to_long
+from cryptography.hazmat.primitives.asymmetric import rsa
+from cryptography.hazmat.backends import default_backend as crypto_default_backend
+import base64
+from Crypto.PublicKey import RSA
+from Crypto.Signature.pkcs1_15 import PKCS115_SigScheme
+from Crypto.Hash import SHA256
+import Crypto
+import pprint 
+
+def calc_string_bodies(string):
+    string_bodies = [0] * len(string)
+    string_bodies[1] = int(string[0] == '"')
+
+    for i in range(2,len(string)):
+        if not string_bodies[i-2] and string[i-1] == '"' and string[i-2] != '\\':
+            string_bodies[i] = 1
+        elif string_bodies[i-1] and string[i] == '"' and string[i-1] != '\\':
+            string_bodies[i] = 0
+        else:
+            string_bodies[i] = string_bodies[i-1]
+    return string_bodies
+
+# Returns JSON array of bytes representing the input `string`, 0 padded to `maxLen`
+def pad_string_new(string, maxLen, n="", use_ord=False):
+    if use_ord:
+        result = [ord(c) for c in string]
+    else:
+        result = [b for b in bytes(string, 'utf-8')]
+
+    # pad to maxLen
+    string_to_pad = maxLen - len(result)
+    for i in range(string_to_pad):
+        result.append(0)
+
+    if "family_name" in string:
+        print("family_name")
+
+    result = json.dumps([str(x) for x in result], separators=(",", ":"))
+    print(">>>N>", f"{n} '{string}'", f"'{result}'")
+    if n:
+        print("")  # f"len({n}): {len(result)}")
+    return result
+
+
+# Returns JSON array of bytes representing the input `string`, 0 padded to `maxLen`
+def pad_string(string, maxLen, n="", use_ord=True):
+    string_len = len(string)
+    string_to_pad = maxLen - string_len
+
+    result = "["
+    for c in string:
+        if use_ord:
+            result = result + '"' + str(ord(c)) + '",'
+        else:
+            result = result + '"' + str(c) + '",'
+
+    for i in range(string_to_pad):
+        result = result + '"' + '0' + '",'
+
+    result = result[:-1]  # remove last unnecessary ','
+    result += "]"
+    print(">>>O>", f"{n} '{string}'", f"'{result}'")
+    return result
+
+def format_output(dictionary):
+    res = "{"
+    for key in dictionary:
+        res = res + key + " : " + str(dictionary[key]) + ","
+    res = res[:-1] + "}"
+    return res
+
+
+MAX = 2048
+BASE = 64
+
+
+def long_to_limbs(n):
+    '''Limbs are in l-endian.'''
+    limbs = []
+    for i in range(int(MAX / BASE)):  # split into 32 64-bit limbs
+        idx = i * BASE
+
+        limbs.append((n >> idx) & ((1 << BASE) - 1))
+
+    return limbs
+
+
+def limbs_to_long(limbs):
+    val = 0
+    base = 2 ** BASE
+    for (i, l) in enumerate(limbs):
+        val += l * (base ** i)
+
+    return val
+
+
+# iat_value = "1700255944" # Friday, November 17, 2023
+iat_value = "1719866138"
+
+exp_date_num = 111_111_111_111
+exp_date = str(exp_date_num)  # 12-21-5490
+exp_horizon_num = 999_999_999_999  # ~31,710 years
+exp_horizon = str(exp_horizon_num)
+# nonce_value = "2284473333442251804379681643965308154311773667525398119496797545594705356495"
+nonce_value = "2284473333442251804379681643965308154311773667525398119496797545594705356495"
+public_inputs_hash_value = '"' + str(
+    990250399590304032496786539443088814495837679250179990478424822100531016130) + '"'
+
+nonce = int(nonce_value)
+
+jwt_max_len = 192 * 8
+
+# jwt_dict = {
+#  "iss": "test.oidc.provider",
+#  "azp": "511276456880-i7i4787c1863damto6899ts989j2e35r.apps.googleusercontent.com",
+#  "aud": "511276456880-i7i4787c1863damto6899ts989j2e35r.apps.googleusercontent.com",
+#  "sub": "102904630171592520592",
+#  "email": "hero1200091@gmail.com",
+#  "email_verified": True,
+#  "nonce": "12772123150809496860193457976937182964297283633705872391534946866719681904311",
+#  "nbf": 1711552330,
+#  "name": "コンドウハルキ",
+#  "picture": "https://lh3.googleusercontent.com/a/ACg8ocIMZfIkNWGRBTD924xl_iefpMccLguwdMIinMPzaj5L4Q=s96-c",
+#  "given_name": "ルキ",
+#  "family_name": "コンドウ",
+#  "iat": 1711552630,
+#  "exp": 1911556230
+# }
+
+#jwt_dict = {
+#        "iss":"https://accounts.google.com",
+#        "azp":"407408718192.apps.googleusercontent.com",
+#        "aud":"407408718192.apps.googleusercontent.com",
+#        "sub":"113990307082899718775",
+#        "at_hash":"lVeD4xP6Q1ZGrL3gFcCQLQ",
+#        "name":"Michael Straka",
+#        "picture":"https://lh3.googleusercontent.com/a/ACg8ocLVn8F8VnXKNNJhROhTpQuLLjFEdv_uhoe-DUaRTlxKEy9e4w=s96-c",
+#        "given_name":"Michael",
+#        "family_name":"Straka",
+#        "iat":1719866138,
+#        "exp":1719869738,
+#        "nonce":"2284473333442251804379681643965308154311773667525398119496797545594705356495"
+#        }
+
+
+#original_b64 = "eyJpc3MiOiJ0ZXN0Lm9pZGMucHJvdmlkZXIiLCJhenAiOiI1MTEyNzY0NTY4ODAtaTdpNDc4N2MxODYzZGFtdG82ODk5dHM5ODlqMmUzNXIuYXBwcy5nb29nbGV1c2VyY29udGVudC5jb20iLCJhdWQiOiI1MTEyNzY0NTY4ODAtaTdpNDc4N2MxODYzZGFtdG82ODk5dHM5ODlqMmUzNXIuYXBwcy5nb29nbGV1c2VyY29udGVudC5jb20iLCJzdWIiOiIxMDI5MDQ2MzAxNzE1OTI1MjA1OTIiLCJlbWFpbCI6Imhlcm8xMjAwMDkxQGdtYWlsLmNvbSIsImVtYWlsX3ZlcmlmaWVkIjp0cnVlLCJub25jZSI6IjEyNzcyMTIzMTUwODA5NDk2ODYwMTkzNDU3OTc2OTM3MTgyOTY0Mjk3MjgzNjMzNzA1ODcyMzkxNTM0OTQ2ODY2NzE5NjgxOTA0MzExIiwibmJmIjoxNzExNTUyMzMwLCJuYW1lIjoi44Kz44Oz44OJ44Km44OP44Or44KtIiwicGljdHVyZSI6Imh0dHBzOi8vbGgzLmdvb2dsZXVzZXJjb250ZW50LmNvbS9hL0FDZzhvY0lNWmZJa05XR1JCVEQ5MjR4bF9pZWZwTWNjTGd1d2RNSWluTVB6YWo1TDRRPXM5Ni1jIiwiZ2l2ZW5fbmFtZSI6IuODq-OCrSIsImZhbWlseV9uYW1lIjoi44Kz44Oz44OJ44KmIiwiaWF0IjoxNzExNTUyNjMwLCJleHAiOjE5MTE1NTYyMzB9"
+original_b64 = "eyJpc3MiOiJodHRwczovL2FjY291bnRzLmdvb2dsZS5jb20iLCJhenAiOiI0MDc0MDg3MTgxOTIuYXBwcy5nb29nbGV1c2VyY29udGVudC5jb20iLCJhdWQiOiI0MDc0MDg3MTgxOTIuYXBwcy5nb29nbGV1c2VyY29udGVudC5jb20iLCJzdWIiOiIxMTM5OTAzMDcwODI4OTk3MTg3NzUiLCJhdF9oYXNoIjoibFZlRDR4UDZRMVpHckwzZ0ZjQ1FMUSIsIm5hbWUiOiJNaWNoYWVsIFN0cmFrYSIsInBpY3R1cmUiOiJodHRwczovL2xoMy5nb29nbGV1c2VyY29udGVudC5jb20vYS9BQ2c4b2NMVm44RjhWblhLTk5KaFJPaFRwUXVMTGpGRWR2X3Vob2UtRFVhUlRseEtFeTllNHc9czk2LWMiLCJnaXZlbl9uYW1lIjoiTWljaGFlbCIsImZhbWlseV9uYW1lIjoiU3RyYWthIiwiaWF0IjoxNzE5ODY2MTM4LCJleHAiOjE3MTk4Njk3MzgsIm5vbmNlIjoiMjI4NDQ3MzMzMzQ0MjI1MTgwNDM3OTY4MTY0Mzk2NTMwODE1NDMxMTc3MzY2NzUyNTM5ODExOTQ5Njc5NzU0NTU5NDcwNTM1NjQ5NSJ9"
+original_str = base64.urlsafe_b64decode(original_b64)
+print("original_str bytes", original_str)
+jwt_dict = json.loads(original_str)
+
+#jwt_dict['iat'] = int(iat_value)  # WARNING: the code assumes this is NOT the last field
+#jwt_dict['nonce'] = nonce_value  # WARNING: the code assumes this is the last field
+
+secret = rsa.generate_private_key(
+    backend=crypto_default_backend(),
+    public_exponent=65537,
+    key_size=2048
+)
+
+
+class MyPyJWT(jwt.PyJWT):
+    def _encode_payload(
+            self,
+            payload: dict[str, Any],
+            headers: dict[str, Any] | None = None,
+            json_encoder: type[json.JSONEncoder] | None = None,
+    ) -> bytes:
+        return original_str  # json.dumps(payload, separators=(",", ":"), ).encode("utf-8")
+
+
+signed_b64_jwt_string = MyPyJWT().encode(jwt_dict, secret, algorithm="RS256", headers={"kid": "test_jwk"})
+unsigned_b64_jwt_string = signed_b64_jwt_string[:signed_b64_jwt_string.rfind(".")]
+
+# public_key = secret.public_key().public_bytes(
+#    crypto_serialization.Encoding.OpenSSH,
+#    crypto_serialization.PublicFormat.OpenSSH
+# )
+jwt_payload_b64 = unsigned_b64_jwt_string[unsigned_b64_jwt_string.rfind(".") + 1:]
+print(jwt_payload_b64)
+jwt_payload = base64.urlsafe_b64decode(jwt_payload_b64)
+jwt_payload = jwt_payload.decode('utf-8')
+print("\njwt_payload bytes  ", jwt_payload, "\n")
+jwt_max_header_len = 300
+jwt_header_string = unsigned_b64_jwt_string[:unsigned_b64_jwt_string.find(".") + 1]
+
+header_value = pad_string(jwt_header_string, jwt_max_header_len)
+
+header_len_with_separator_value = '"' + str(len(jwt_header_string)) + '"'
+
+maxAudKVPairLen = 140
+maxAudNameLen = 40
+maxAudValueLen = 120
+aud_field_string = "\"aud\":\"407408718192.apps.googleusercontent.com\","
+#aud_field_string = "\"aud\":\"511276456880-i7i4787c1863damto6899ts989j2e35r.apps.googleusercontent.com\","
+aud_string_bodies = calc_string_bodies(aud_field_string)
+aud_string_bodies_value = pad_string(aud_string_bodies, maxAudKVPairLen, use_ord=False)
+aud_field_value = pad_string(aud_field_string, maxAudKVPairLen)
+aud_field_len_value = '"' + str(len(aud_field_string)) + '"'
+aud_index_value = '"' + str(jwt_payload.index("aud") - 1) + '"'  # First '"' character in aud field index in payload
+aud_colon_index = aud_field_string.index(":")
+aud_colon_index_value = '"' + str(aud_colon_index) + '"'
+aud_value_index_value = '"' + str(aud_colon_index + 2) + '"'  # TODO: This doesn't work if there's whitespace
+aud_name = "aud"
+aud_value = "407408718192.apps.googleusercontent.com"
+#aud_value = "511276456880-i7i4787c1863damto6899ts989j2e35r.apps.googleusercontent.com"
+aud_name_value = pad_string(aud_name, maxAudNameLen)
+aud_value_value = pad_string(aud_value, maxAudValueLen)
+aud_value_len_value = '"' + str(len(aud_value)) + '"'
+
+private_aud_value_value = aud_value_value
+override_aud_value_value = pad_string("", maxAudValueLen)
+private_aud_value_len_value = aud_value_len_value
+override_aud_value_len_value = '"' + "0" + '"'
+use_aud_override_value = '"' + "0" + '"'
+
+maxIatKVPairLen = 50
+maxIatNameLen = 10
+maxIatValueLen = 45
+iat_field_string = "\"iat\":" + iat_value + ","
+print("iat_field_string")
+print(iat_field_string)
+iat_field_value = pad_string(iat_field_string, maxIatKVPairLen)
+iat_field_len_value = '"' + str(len(iat_field_string)) + '"'
+iat_index_value = '"' + str(jwt_payload.index("iat") - 1) + '"'  # First '"' character in aud field index in payload
+iat_colon_index = iat_field_string.index(":")
+iat_colon_index_value = '"' + str(iat_colon_index) + '"'
+iat_value_index_value = '"' + str(iat_colon_index + 1) + '"'  # TODO: This doesn't work if there's whitespace
+iat_name = "iat"
+iat_name_value = pad_string(iat_name, maxIatNameLen)
+iat_value_value = pad_string(iat_value, maxIatValueLen)
+iat_value_len_value = '"' + str(len(iat_value)) + '"'
+exp_date_value = '"' + exp_date + '"'
+exp_horizon_value = '"' + exp_horizon + '"'
+
+maxUidKVPairLen = 350
+maxUidNameLen = 30
+maxUidValueLen = 330
+uid_field_string = "\"sub\":\"113990307082899718775\","
+#uid_field_string = "\"sub\":\"102904630171592520592\","
+uid_string_bodies = calc_string_bodies(uid_field_string)
+uid_string_bodies_value = pad_string(uid_string_bodies, maxUidKVPairLen, use_ord=False)
+uid_field_value = pad_string(uid_field_string, maxUidKVPairLen)
+uid_field_len_value = '"' + str(len(uid_field_string)) + '"'
+uid_index_value = '"' + str(jwt_payload.index("sub") - 1) + '"'  # This doesn't work for non-sub user id fields
+
+uid_name_len_value = '"' + str(3) + '"'  # sub
+uid_colon_index = uid_field_string.index(":")
+uid_colon_index_value = '"' + str(uid_colon_index) + '"'
+uid_value_index_value = '"' + str(uid_colon_index + 2) + '"'
+uid_name = "sub"
+uid_value = "113990307082899718775"
+#uid_value = "102904630171592520592"
+uid_name_value = pad_string(uid_name, maxUidNameLen)
+uid_value_value = pad_string(uid_value, maxUidValueLen)
+uid_value_len_value = '"' + str(len(uid_value)) + '"'
+
+# Extra revealed public JWT field
+maxEFKVPairLen = 350
+maxEFNameLen = 30
+maxEFValueLen = 330
+extra_field_string = f"\"family_name\":\"{jwt_dict['family_name']}\","
+extra_field_value = pad_string_new(extra_field_string, maxEFKVPairLen)
+extra_field_len_value = '"' + str(len(extra_field_string)) + '"'
+extra_index_value = '"' + str(jwt_payload.index("family_name") - 1) + '"'
+
+extra_name_len_value = '"' + str(11) + '"'  # family_name
+extra_colon_index = extra_field_string.index(":")
+extra_colon_index_value = '"' + str(extra_colon_index) + '"'
+extra_value_index_value = '"' + str(extra_colon_index + 2) + '"'
+extra_name = "family_name"
+extra_value = "Straka";
+#extra_value = "コンドウ"
+extra_name_value = pad_string_new(extra_name, maxEFNameLen)
+extra_value_value = pad_string_new(extra_value, maxEFValueLen)
+extra_value_len_value = '"' + str(len(extra_value)) + '"'
+use_extra_field_value = '"' + str(0) + '"'
+
+maxEVKVPairLen = 30
+maxEVNameLen = 20
+maxEVValueLen = 10
+ev_field_string = "\"email_verified\":true,"
+ev_field_value = pad_string(ev_field_string, maxEVKVPairLen)
+ev_field_len_value = '"' + str(len(ev_field_string)) + '"'
+ev_index_value = '"' + str(0) + '"'
+
+ev_colon_index = 16
+ev_colon_index_value = '"' + str(ev_colon_index) + '"'
+ev_value_index_value = '"' + str(ev_colon_index + 1) + '"'  # TODO: Doesn't work with whitespace
+ev_name = "email_verified"
+ev_value = "true"
+ev_name_value = pad_string(ev_name, maxEVNameLen)
+ev_value_value = pad_string(ev_value, maxEVValueLen)
+ev_value_len_value = '"' + str(len(ev_value)) + '"'
+
+maxIssKVPairLen = 140
+maxIssNameLen = 40
+maxIssValueLen = 120
+iss_field_string = "\"iss\":\"https://accounts.google.com\","
+#iss_field_string = "\"iss\":\"test.oidc.provider\","
+iss_string_bodies = calc_string_bodies(iss_field_string)
+iss_string_bodies_value = pad_string(iss_string_bodies, maxIssKVPairLen, use_ord=False)
+iss_field_value = pad_string(iss_field_string, maxIssKVPairLen)
+iss_field_len_value = '"' + str(len(iss_field_string)) + '"'
+iss_index_value = '"' + str(jwt_payload.index("iss") - 1) + '"'
+
+iss_colon_index = iss_field_string.index(":")
+iss_colon_index_value = '"' + str(iss_colon_index) + '"'
+iss_value_index_value = '"' + str(iss_colon_index + 2) + '"'  # TODO: Doesn't work with whitespace
+iss_name = "iss"
+iss_value = "https://accounts.google.com"
+#iss_value = "test.oidc.provider"
+iss_name_value = pad_string(iss_name, maxIssNameLen)
+iss_value_value = pad_string(iss_value, maxIssValueLen)
+iss_value_len_value = '"' + str(len(iss_value)) + '"'
+
+# Values used in nonce
+temp_pubkey_0 = 242984842061174104272170180221318235913385474778206477109637294427650138112
+temp_pubkey_1 = 4497911
+temp_pubkey_2 = 0
+temp_pubkey_len = 34
+jwt_randomness = 42
+nonce_bitstring = format(nonce, 'b')
+temp_pubkey_value = "[ \"" + str(temp_pubkey_0) + '"' + ',\"' + str(temp_pubkey_1) + '"' + ',\"' + str(
+    temp_pubkey_2) + '"]'
+temp_pubkey_len_value = '"' + str(temp_pubkey_len) + '"'
+jwt_randomness_value = '"' + str(jwt_randomness) + '"'
+
+maxNonceKVPairLen = 105
+maxNonceNameLen = 10
+maxNonceValueLen = 100
+nonce_field_string = "\"nonce\":\"" + nonce_value + "\"}"
+nonce_string_bodies = calc_string_bodies(nonce_field_string)
+nonce_string_bodies_value = pad_string(nonce_string_bodies, maxNonceKVPairLen, use_ord=False)
+nonce_field_value = pad_string(nonce_field_string, maxNonceKVPairLen)
+nonce_field_len_value = '"' + str(len(nonce_field_string)) + '"'
+nonce_index_value = '"' + str(jwt_payload.index("nonce") - 1) + '"'
+
+nonce_colon_index = nonce_field_string.index(":")
+nonce_colon_index_value = '"' + str(nonce_colon_index) + '"'
+nonce_value_index_value = '"' + str(nonce_colon_index + 2) + '"'  # TODO: Doesn't work with whitespace
+nonce_name = "nonce"
+nonce_value_reversed = nonce_value[::-1]
+nonce_name_value = pad_string(nonce_name, maxNonceNameLen)
+nonce_value_value = pad_string(nonce_value, maxNonceValueLen)
+nonce_value_len_value = '"' + str(len(nonce_value)) + '"'
+
+pepper = 76
+pepper_value = '"' + str(pepper) + '"'
+
+jwt_payload_string_no_padding = unsigned_b64_jwt_string[unsigned_b64_jwt_string.find(".") + 1:]
+print("\n\n")
+print("original_b64 payload         ", original_b64)
+print("jwt_payload_string_no_padding", jwt_payload_string_no_padding)
+
+print("original_b64 bytes                 ", base64.urlsafe_b64decode(original_b64))
+print("jwt_payload_string_no_padding bytes", base64.urlsafe_b64decode(jwt_payload_string_no_padding))
+print("\n\n")
+
+jwt_max_payload_len = 192 * 8 - 64
+
+jwt_payload_string_no_padding_value = pad_string(jwt_payload_string_no_padding, jwt_max_payload_len,
+                                                 n="jwt_payload_string_no_padding_value")
+
+payload_len = len(jwt_payload_string_no_padding)
+payload_len_value = '"' + str(payload_len) + '"'
+
+# Add SHA2 padding to the end of the b64 jwt string
+unsigned_b64_jwt_bits = ""
+for c in unsigned_b64_jwt_string:
+    bits = bin(ord(c))
+    bits = bits[2:].zfill(8)
+    unsigned_b64_jwt_bits += bits
+
+L = len(unsigned_b64_jwt_bits)
+
+# Used as circuit input
+L_bit_encoded = format(L, 'b').zfill(64)
+print("L_bit_encoded: ", L_bit_encoded)
+
+L_byte_encoded = ""
+for i in range(8):
+    idx = i * 8
+    bits = L_bit_encoded[idx:idx + 8]
+    ascii_char = chr(int(bits, 2))
+    L_byte_encoded += ascii_char
+
+print("L_byte_encoded: ", L_byte_encoded.encode('utf-8'))
+L_byte_encoded_value = pad_string(L_byte_encoded, 8, n="L_byte_encoded_value", use_ord=True)
+
+L_mod = L % 512
+# https://www.rfc-editor.org/rfc/rfc4634.html#section-4.1
+# 4.1.a append '1'
+unsigned_b64_jwt_bits += '1'
+
+# 4.1.b Append 'K' 0s where K is the smallest non-negative integer solution to L+1+K = 448 mod 512, and L is the length of the message in bits
+K = 448 - L_mod - 1
+
+# Used as a circuit input
+padding_without_len = '1' + '0' * K
+padding_without_len = padding_without_len.ljust(512, '0')
+
+padding_without_len_bytes = ""
+for i in range(64):
+    idx = i * 8
+    bits = padding_without_len[idx:idx + 8]
+    ascii_char = chr(int(bits, 2))
+    padding_without_len_bytes += ascii_char
+
+padding_without_len_bytes_value = pad_string(padding_without_len_bytes, 64, n="padding_without_len_bytes", use_ord=True)
+
+unsigned_b64_jwt_bits_sha_padded = unsigned_b64_jwt_bits + '0' * K
+
+# 4.1.c Append L in binary form as 64 bits
+L_bits = format(L, 'b').zfill(64)
+
+unsigned_b64_jwt_bits_sha_padded += L_bits
+
+unsigned_b64_jwt_string_sha_padded = ""
+for i in range(int(len(unsigned_b64_jwt_bits_sha_padded) / 8)):
+    idx = i * 8
+    bits = unsigned_b64_jwt_bits_sha_padded[idx:idx + 8]
+    ascii_char = chr(int(bits, 2))
+    unsigned_b64_jwt_string_sha_padded += ascii_char
+
+print("unsigned_b64_jwt_bits_sha_padded", unsigned_b64_jwt_bits_sha_padded)
+
+jwt_value = pad_string(unsigned_b64_jwt_string_sha_padded, jwt_max_len, n="jwt_value")
+
+jwt_num_sha2_blocks = int((len(unsigned_b64_jwt_string_sha_padded) * 8) / 512)  # SHA2 uses 512-bit blocks
+jwt_num_sha2_blocks_value = '"' + str(jwt_num_sha2_blocks) + '"'
+
+jwt_payload_string = unsigned_b64_jwt_string_sha_padded[unsigned_b64_jwt_string_sha_padded.find(".") + 1:]
+
+payload_value = pad_string(jwt_payload_string, jwt_max_payload_len)
+
+# Compute RSA signature over the full unsigned JWT
+with open(f"tools/test_rsa_privkey.pem", 'rb') as f:
+    privkey_str = f.read()
+    f.close()
+keyPair = Crypto.PublicKey.RSA.import_key(privkey_str)
+# keyPair = RSA.generate(bits=2048)
+
+
+jwt_byte_encoding = str.encode(unsigned_b64_jwt_string)
+hash = SHA256.new(jwt_byte_encoding)
+signer = PKCS115_SigScheme(keyPair)
+signature = signer.sign(hash)
+
+sig_long = bytes_to_long(signature)
+sig_limbs = long_to_limbs(sig_long)
+##print(limbs_to_long(sig_limbs) == sig_long)
+sig_value = "["
+for l in sig_limbs:
+    sig_value += '"' + str(l) + '"' + ","
+sig_value = sig_value[:-1] + "]"
+
+mod_limbs = long_to_limbs(keyPair.n)
+##print(limbs_to_long(mod_limbs) == keyPair.n)
+
+mod_value = "["
+for l in mod_limbs:
+    mod_value += '"' + str(l) + '"' + ","
+mod_value = mod_value[:-1] + "]"
+
+hash_limbs = long_to_limbs(bytes_to_long(hash.digest()))[:4]
+##print(hash_limbs)
+
+json_dict = {
+    "\"jwt\"": jwt_value,
+    "\"jwt_header_with_separator\"": header_value,
+    "\"jwt_payload\"": payload_value,
+    "\"public_inputs_hash\"": public_inputs_hash_value,
+    "\"header_len_with_separator\"": header_len_with_separator_value,
+    "\"signature\"": sig_value,
+    "\"pubkey_modulus\"": mod_value,
+    "\"aud_field\"": aud_field_value,
+    "\"aud_field_string_bodies\"": aud_string_bodies_value,
+    "\"aud_field_len\"": aud_field_len_value,
+    "\"aud_index\"": aud_index_value,
+    "\"aud_value_index\"": aud_value_index_value,
+    "\"aud_colon_index\"": aud_colon_index_value,
+    "\"aud_name\"": aud_name_value,
+    "\"uid_field\"": uid_field_value,
+    "\"uid_field_string_bodies\"": uid_string_bodies_value,
+    "\"uid_field_len\"": uid_field_len_value,
+    "\"uid_index\"": uid_index_value,
+    "\"uid_name_len\"": uid_name_len_value,
+    "\"uid_value_index\"": uid_value_index_value,
+    "\"uid_value_len\"": uid_value_len_value,
+    "\"uid_colon_index\"": uid_colon_index_value,
+    "\"uid_name\"": uid_name_value,
+    "\"uid_value\"": uid_value_value,
+    "\"ev_field\"": ev_field_value,
+    "\"ev_field_len\"": ev_field_len_value,
+    "\"ev_index\"": ev_index_value,
+    "\"ev_value_index\"": ev_value_index_value,
+    "\"ev_value_len\"": ev_value_len_value,
+    "\"ev_colon_index\"": ev_colon_index_value,
+    "\"ev_name\"": ev_name_value,
+    "\"ev_value\"": ev_value_value,
+    "\"iss_field\"": iss_field_value,
+    "\"iss_field_string_bodies\"": iss_string_bodies_value,
+    "\"iss_field_len\"": iss_field_len_value,
+    "\"iss_index\"": iss_index_value,
+    "\"iss_value_index\"": iss_value_index_value,
+    "\"iss_value_len\"": iss_value_len_value,
+    "\"iss_colon_index\"": iss_colon_index_value,
+    "\"iss_name\"": iss_name_value,
+    "\"iss_value\"": iss_value_value,
+    "\"nonce_field\"": nonce_field_value,
+    "\"nonce_field_string_bodies\"": nonce_string_bodies_value,
+    "\"nonce_field_len\"": nonce_field_len_value,
+    "\"nonce_index\"": nonce_index_value,
+    "\"nonce_value_index\"": nonce_value_index_value,
+    "\"nonce_value_len\"": nonce_value_len_value,
+    "\"nonce_colon_index\"": nonce_colon_index_value,
+    "\"nonce_name\"": nonce_name_value,
+    "\"nonce_value\"": nonce_value_value,
+    "\"temp_pubkey\"": temp_pubkey_value,
+    "\"jwt_randomness\"": jwt_randomness_value,
+    "\"pepper\"": pepper_value,
+    "\"jwt_num_sha2_blocks\"": jwt_num_sha2_blocks_value,
+    "\"iat_field\"": iat_field_value,
+    "\"iat_field_len\"": iat_field_len_value,
+    "\"iat_index\"": iat_index_value,
+    "\"iat_value_index\"": iat_value_index_value,
+    "\"iat_value_len\"": iat_value_len_value,
+    "\"iat_colon_index\"": iat_colon_index_value,
+    "\"iat_name\"": iat_name_value,
+    "\"iat_value\"": iat_value_value,
+    "\"exp_date\"": exp_date_value,
+    "\"exp_delta\"": exp_horizon_value,
+    "\"b64_payload_len\"": payload_len_value,
+    "\"jwt_len_bit_encoded\"": L_byte_encoded_value,
+    "\"padding_without_len\"": padding_without_len_bytes_value,
+    "\"temp_pubkey_len\"": temp_pubkey_len_value,
+    "\"private_aud_value\"": private_aud_value_value,
+    "\"override_aud_value\"": override_aud_value_value,
+    "\"private_aud_value_len\"": private_aud_value_len_value,
+    "\"override_aud_value_len\"": override_aud_value_len_value,
+    "\"use_aud_override\"": use_aud_override_value,
+    "\"extra_field\"": extra_field_value,
+    "\"extra_field_len\"": extra_field_len_value,
+    "\"extra_index\"": extra_index_value,
+    "\"jwt_payload_without_sha_padding\"": jwt_payload_string_no_padding_value,
+    "\"use_extra_field\"": use_extra_field_value
+}
+inputs_dot_json = format_output(json_dict)
+
+# print(inputs_dot_json)
+print("Writing circuit inputs to input.json...")
+if os.path.exists("input.json"):
+    os.remove("input.json")
+f = open("input.json", "a")
+f.write(inputs_dot_json)
+f.close()
+# print(format(int(binascii.hexlify(hash.digest()),16), 'b'))
+##print(K)
+# os.remove("privkey.pem")
+# privkeyfile = open("privkey.pem", "wb")
+# privkeyfile.write(keyPair.exportKey("PEM"))
+# privkeyfile.close()
+
+##print("signed jwt: " + signed_b64_jwt_string)
+##print("unsigned signed jwt: " + unsigned_b64_jwt_string)
+##print(ev_colon_index)
+##print(ev_value_index_value)
+
+print("Results")
+print("-------")
+
+print("\nIssued at:")
+print(iat_value)
+
+print("\nExpiration date:")
+print(exp_date)
+
+print("\nExpiration horizon:")
+print(exp_horizon)
+
+print("\nPepper")
+print(pepper)
+
+print("\nExtra field")
+print(extra_field_string)
+
+print("\nEPK blinder (JWT randomness)")
+print(jwt_randomness_value)
+
+print("\nbase64url-encoded RSA modulus")
+modulus_bytes = keyPair.n.to_bytes((keyPair.n.bit_length() + 7) // 8, byteorder='big')
+print(base64.urlsafe_b64encode(modulus_bytes))
+
+print("\nPublic inputs hash")
+print(public_inputs_hash_value)
+
+print("\nbase64url-encoded JWT header:")
+print(jwt_header_string[:-1])
+
+print("\nDecoded JWT header:")
+print(base64.urlsafe_b64decode(jwt_header_string[:-1] + "=="))
+
+print("\nDecoded JWT payload:")
+print(jwt_payload)
+
+print("\nPretty-printed JWT payload:")
+jwt_parsed = json.loads(jwt_payload)
diff --git a/keyless/circuit/tools/install-deps.sh b/keyless/circuit/tools/install-deps.sh
new file mode 100755
index 0000000000000..a0487d6958bc8
--- /dev/null
+++ b/keyless/circuit/tools/install-deps.sh
@@ -0,0 +1,65 @@
+#!/bin/sh
+
+set -e
+install_node() {
+    echo "nodejs installation started."
+    curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | bash
+    export NVM_DIR="$HOME/.nvm"
+    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
+    [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
+    nvm install --lts
+    node -v
+    npm -v
+    echo "nodejs installation finished."
+}
+
+install_git_lfs() {
+    echo "git lfs installation started."
+    if which brew > /dev/null; then
+        brew install git-lfs
+    elif which apt-get > /dev/null; then
+        sudo apt-get install git-lfs
+    else
+        echo "Can't figure out what platform you are on. Currently this script only supports MacOS and Debian."
+    fi
+    git lfs install
+    echo "git lfs installation finished."
+}
+
+install_circom() {
+    echo "circom installation started."
+    original_dir=$(pwd)
+    cd `mktemp -d`
+    git clone https://github.com/iden3/circom
+    cd circom
+    git switch -d v2.1.7
+    cargo build --release
+    cargo install --path circom
+    cd "$original_dir"
+    echo "circom installation finished."
+}
+
+install_pip3_deps() {
+    echo "pip3 deps installation started."
+    sudo apt install python3-venv -y
+    echo "pip3 deps installation finished."
+}
+
+install_npm_deps() {
+    echo "snarkjs installation started."
+    npm install -g snarkjs
+    echo "snarkjs installation finished."
+}
+
+install_circomlib() {
+    echo "circomlib@2.0.5 installation started."
+    npm install -g circomlib@2.0.5
+    echo "circomlib@2.0.5 installation finished."
+}
+
+install_node
+install_pip3_deps
+install_npm_deps
+install_circomlib
+install_circom
+install_git_lfs
diff --git a/keyless/circuit/tools/test_rsa_privkey.pem b/keyless/circuit/tools/test_rsa_privkey.pem
new file mode 100644
index 0000000000000..3af92c2eb7b71
--- /dev/null
+++ b/keyless/circuit/tools/test_rsa_privkey.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEwAIBADANBgkqhkiG9w0BAQEFAASCBKowggSmAgEAAoIBAQDpLtqxS7OrlD/d
+T2tuz4+QNUh2OCa2Bat4bmpY+wL3FdkqIxXUCJX0tfKpCwBikKoQMzddt+ZmoZvj
+zIuFv9eploqBJhoL+HYOMzuWCshACn33TZGvx9SYs3aK+vm2cvFRQ6cw5zZJC2v1
+2DNM41hblm7c/DK8BaTkPq54hSEu1jOlwH562g10vcivbvjoojL9VSwPAAzt2Gup
+IrxTbEUIaVq7iKQ5O2/MOjCcAwcyt8TurUHpZlAMBCUGbFFCzIqWfkMiwq/rFq42
+wdGAEApy1TFkbwzhAkjHdLoC6CF3dFkLgJrkB7193wvyaU1gEKtCE5nt1LR/hq3h
+quUtxqO3AgMBAAECggEBANX6C+7EA/TADrbcCT7fMuNnMb5iGovPuiDCWc6bUIZC
+Q0yac45l7o1nZWzfzpOkIprJFNZoSgIF7NJmQeYTPCjAHwsSVraDYnn3Y4d1D3tM
+5XjJcpX2bs1NactxMTLOWUl0JnkGwtbWp1Qq+DBnMw6ghc09lKTbHQvhxSKNL/0U
+C+YmCYT5ODmxzLBwkzN5RhxQZNqol/4LYVdji9bS7N/UITw5E6LGDOo/hZHWqJsE
+fgrJTPsuCyrYlwrNkgmV2KpRrGz5MpcRM7XHgnqVym+HyD/r9E7MEFdTLEaiiHcm
+Ish1usJDEJMFIWkF+rnEoJkQHbqiKlQBcoqSbCmoMWECgYEA/4379mMPF0JJ/EER
+4VH7/ZYxjdyphenx2VYCWY/uzT0KbCWQF8KXckuoFrHAIP3EuFn6JNoIbja0NbhI
+HGrU29BZkATG8h/xjFy/zPBauxTQmM+yS2T37XtMoXNZNS/ubz2lJXMOapQQiXVR
+l/tzzpyWaCe9j0NT7DAU0ZFmDbECgYEA6ZbjkcOs2jwHsOwwfamFm4VpUFxYtED7
+9vKzq5d7+Ii1kPKHj5fDnYkZd+mNwNZ02O6OGxh40EDML+i6nOABPg/FmXeVCya9
+Vump2Yqr2fAK3xm6QY5KxAjWWq2kVqmdRmICSL2Z9rBzpXmD5o06y9viOwd2bhBo
+0wB02416GecCgYEA+S/ZoEa3UFazDeXlKXBn5r2tVEb2hj24NdRINkzC7h23K/z0
+pDZ6tlhPbtGkJodMavZRk92GmvF8h2VJ62vAYxamPmhqFW5Qei12WL+FuSZywI7F
+q/6oQkkYT9XKBrLWLGJPxlSKmiIGfgKHrUrjgXPutWEK1ccw7f10T2UXvgECgYEA
+nXqLa58G7o4gBUgGnQFnwOSdjn7jkoppFCClvp4/BtxrxA+uEsGXMKLYV75OQd6T
+IhkaFuxVrtiwj/APt2lRjRym9ALpqX3xkiGvz6ismR46xhQbPM0IXMc0dCeyrnZl
+QKkcrxucK/Lj1IBqy0kVhZB1IaSzVBqeAPrCza3AzqsCgYEAvSiEjDvGLIlqoSvK
+MHEVe8PBGOZYLcAdq4YiOIBgddoYyRsq5bzHtTQFgYQVK99Cnxo+PQAvzGb+dpjN
+/LIEAS2LuuWHGtOrZlwef8ZpCQgrtmp/phXfVi6llcZx4mMm7zYmGhh2AsA9yEQc
+acgc4kgDThAjD7VlXad9UHpNMO8=
+-----END PRIVATE KEY-----
diff --git a/keyless/circuit/tools/trusted-setup.sh b/keyless/circuit/tools/trusted-setup.sh
new file mode 100755
index 0000000000000..8a0d419a2a3f5
--- /dev/null
+++ b/keyless/circuit/tools/trusted-setup.sh
@@ -0,0 +1,84 @@
+#!/bin/bash
+
+set -e
+
+if [ ! -e ".circuit-root" ]; then
+  echo "Error: the current working directory is not circuit package root (the directory that contains `.circuit-root`)"
+  exit 1
+fi
+
+print_usage() {
+cat <<DONE
+Usage: `basename $0` <output-dir>
+DONE
+}
+
+pushd() {
+    command pushd "$@" > /dev/null
+}
+
+popd() {
+    command popd "$@" > /dev/null
+}
+
+trusted_setup() {
+    outdir=$1
+
+    mkdir -p $outdir
+    outdir=`realpath $outdir`
+
+    echo
+    echo "Generating proving key and verification key in $outdir"
+
+    ptau_repo=aptos-keyless-trusted-setup-contributions-may-2024
+    ptau_file=powersOfTau28_hez_final_21.ptau
+    if [ ! -d "$ptau_repo" ]; then
+        echo
+        echo "You haven't downloaded the .ptau file yet. Downloading now..."
+        GIT_LFS_SKIP_SMUDGE=1 git clone git@github.com:aptos-labs/$ptau_repo.git
+        pushd $ptau_repo/
+        {
+            echo
+            echo "Downloading ~2.4 GiB file. This will take a while..."
+            git lfs pull --include $ptau_file
+            echo "Done downloading .ptau file."
+        }
+        popd
+    fi
+    ptaudir=`realpath $ptau_repo`
+
+    pushd templates/
+    {
+        echo
+        echo "Re-compiling circuit. This will take several seconds..."
+        circom -l . -l $(npm root -g) main.circom --r1cs --wasm --sym
+
+        rm -f $outdir/prover_key.zkey
+        rm -f $outdir/verification_key.json
+
+        echo
+        echo "Running dummy phase-2 setup..."
+        echo "This will take several minutes..."
+        time snarkjs groth16 setup main.r1cs $ptaudir/$ptau_file $outdir/prover_key.zkey
+
+        echo
+        echo "Exporting verification key..."
+        snarkjs zkey export verificationkey $outdir/prover_key.zkey $outdir/verification_key.json
+    }
+    popd
+
+    echo
+    echo "Done. Find the prover_key.zkey and verification_key.json files in $outdir"
+}
+
+if [ "$#" -ne 1 ]; then
+    print_usage
+    exit 2
+fi
+
+if [ -e "$1" ]; then
+  echo "Error: output path already exists."
+  exit 3
+fi
+
+trusted_setup "$1"
diff --git a/keyless/common/Cargo.toml b/keyless/common/Cargo.toml
new file mode 100644
index 0000000000000..7c594c68dc56b
--- /dev/null
+++ b/keyless/common/Cargo.toml
@@ -0,0 +1,26 @@
+[package]
+name = "aptos-keyless-common"
+description = "Aptos Keyless circuit tests"
+version = "0.1.0"
+
+# Workspace inherited keys
+authors = { workspace = true }
+edition = { workspace = true }
+homepage = { workspace = true }
+license = { workspace = true }
+publish = { workspace = true }
+repository = { workspace = true }
+rust-version = { workspace = true }
+
+[dependencies]
+anyhow = { workspace = true }
+aptos-types = { workspace = true }
+ark-bn254 = { workspace = true }
+ark-ff = { workspace = true }
+base64 = { workspace = true }
+hex = { workspace = true }
+num-bigint = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+tempfile = { workspace = true }
+tracing = { workspace = true }
diff --git a/keyless/common/src/api.rs b/keyless/common/src/api.rs
new file mode 100644
index 0000000000000..5f812bb629c63
--- /dev/null
+++ b/keyless/common/src/api.rs
@@ -0,0 +1,46 @@
+// Copyright (c) Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use aptos_types::{
+    keyless::{Groth16Proof, Pepper},
+    transaction::authenticator::EphemeralPublicKey,
+};
+use serde::{Deserialize, Serialize};
+
+//#[derive(Clone, Debug, Eq, PartialEq, Hash, Serialize, Deserialize)]
+//pub struct EphemeralPublicKeyBlinder(pub(crate) Vec<u8>);
+
+pub type EphemeralPublicKeyBlinder = Vec<u8>;
+
+// TODO can I wrap this in a struct while preserving serialization format?
+pub type PoseidonHash = [u8; 32];
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct RequestInput {
+    pub jwt_b64: String,
+    pub epk: EphemeralPublicKey,
+    #[serde(with = "hex")]
+    pub epk_blinder: EphemeralPublicKeyBlinder,
+    pub exp_date_secs: u64,
+    pub exp_horizon_secs: u64,
+    pub pepper: Pepper,
+    pub uid_key: String,
+    pub extra_field: Option<String>,
+    pub idc_aud: Option<String>,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+#[serde(untagged)]
+#[allow(clippy::large_enum_variant)] // EphemeralSignature has the WebAuthn (Passkey) variant which is large.
+pub enum ProverServiceResponse {
+    Success {
+        proof: Groth16Proof,
+        #[serde(with = "hex")]
+        public_inputs_hash: PoseidonHash,
+        #[serde(with = "hex")]
+        training_wheels_signature: Vec<u8>,
+    },
+    Error {
+        message: String,
+    },
+}
diff --git a/keyless/common/src/input_processing/bits.rs b/keyless/common/src/input_processing/bits.rs
new file mode 100644
index 0000000000000..f683037ade289
--- /dev/null
+++ b/keyless/common/src/input_processing/bits.rs
@@ -0,0 +1,100 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use anyhow::{bail, Result};
+use std::ops::{self, Add, AddAssign};
+
+/// Type for bit representation during conversion. Represents bits using strings, for easy
+/// manipulation:
+/// ```ignore
+/// use prover_service::input_processing::bits::Bits;
+/// let b = Bits::raw("00001111");
+/// assert_eq!(b.as_bytes().unwrap()[0], 15u8);
+/// ```
+///
+/// This struct is mainly used for the sha padding computation.
+#[derive(Debug, Eq, PartialEq)]
+pub struct Bits {
+    pub(crate) b: String,
+}
+
+impl Default for Bits {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl Bits {
+    pub fn new() -> Self {
+        Bits { b: String::new() }
+    }
+
+    /// Input: Bits in BIG-ENDIAN order
+    /// Output: bytes in BIG_ENDIAN order
+    pub fn as_bytes(self) -> Result<Vec<u8>> {
+        if self.b.len() % 8 != 0 {
+            bail!("Tried to convert bits to bytes, where bit length is not divisible by 8")
+        } else {
+            let mut bytes = Vec::new();
+
+            for i in 0..(self.b.len() / 8) {
+                let idx = i * 8;
+                let bits_for_chunk: &str = &self[idx..idx + 8];
+                let chunk_byte =
+                    u8::from_str_radix(bits_for_chunk, 2).expect("Binary string should parse");
+
+                bytes.push(chunk_byte);
+            }
+
+            Ok(bytes)
+        }
+    }
+
+    pub fn bit_representation_of_str(s: &str) -> Self {
+        let mut bits = Bits::new();
+        for byte in s.as_bytes() {
+            bits.b += &format!("{byte:08b}");
+        }
+        bits
+    }
+
+    pub fn bit_representation_of_bytes(s: &[u8]) -> Self {
+        let mut bits = Bits::new();
+        for byte in s {
+            bits.b += &format!("{byte:08b}");
+        }
+        bits
+    }
+
+    pub fn raw(b: &str) -> Self {
+        Bits { b: String::from(b) }
+    }
+}
+
+impl ops::Index<ops::Range<usize>> for Bits {
+    type Output = str;
+
+    fn index(&self, index: ops::Range<usize>) -> &str {
+        self.b.index(index)
+    }
+}
+
+impl AddAssign<Bits> for Bits {
+    fn add_assign(&mut self, rhs: Bits) {
+        self.b += &rhs.b;
+    }
+}
+
+impl Add<Bits> for Bits {
+    type Output = Bits;
+
+    fn add(self, rhs: Bits) -> Self::Output {
+        Bits { b: self.b + &rhs.b }
+    }
+}
+
+impl From<Bits> for String {
+    fn from(value: Bits) -> Self {
+        value.b
+    }
+}
diff --git a/keyless/common/src/input_processing/circuit_input_signals.rs b/keyless/common/src/input_processing/circuit_input_signals.rs
new file mode 100644
index 0000000000000..c30146fd2da26
--- /dev/null
+++ b/keyless/common/src/input_processing/circuit_input_signals.rs
@@ -0,0 +1,237 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use super::config::CircuitPaddingConfig;
+use anyhow::{anyhow, bail, Result};
+use ark_bn254::Fr;
+use serde_json::Value;
+use std::{collections::BTreeMap, marker::PhantomData};
+
+#[derive(Debug)]
+pub enum CircuitInputSignal {
+    U64(u64),
+    Fr(Fr),
+    Frs(Vec<Fr>),
+    Limbs(Vec<u64>),
+    Bytes(Vec<u8>),
+}
+
+pub struct Unpadded;
+
+#[derive(Debug)]
+pub struct Padded;
+
+#[derive(Debug)]
+pub struct CircuitInputSignals<T> {
+    signals: BTreeMap<String, CircuitInputSignal>,
+    t: PhantomData<T>,
+}
+
+impl Default for CircuitInputSignals<Unpadded> {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl CircuitInputSignals<Unpadded> {
+    pub fn new() -> Self {
+        Self {
+            signals: BTreeMap::new(),
+            t: PhantomData,
+        }
+    }
+
+    pub fn bytes_input(mut self, signal_name: &str, signal_value: &[u8]) -> Self {
+        self.signals.insert(
+            String::from(signal_name),
+            CircuitInputSignal::Bytes(Vec::from(signal_value)),
+        );
+        self
+    }
+
+    pub fn byte_input(mut self, signal_name: &str, signal_value: u8) -> Self {
+        self.signals.insert(
+            String::from(signal_name),
+            CircuitInputSignal::U64(signal_value as u64),
+        );
+        self
+    }
+
+    pub fn bits_input(self, signal_name: &str, signal_value: &[bool]) -> Self {
+        let bytes: Vec<u8> = signal_value.iter().map(|&val| val as u8).collect();
+        self.bytes_input(signal_name, bytes.as_slice())
+    }
+
+    pub fn str_input(mut self, signal_name: &str, signal_value: &str) -> Self {
+        self.signals.insert(
+            String::from(signal_name),
+            CircuitInputSignal::Bytes(Vec::from(signal_value.as_bytes())),
+        );
+        self
+    }
+
+    pub fn usize_input(mut self, signal_name: &str, signal_value: usize) -> Self {
+        self.signals.insert(
+            String::from(signal_name),
+            CircuitInputSignal::U64(signal_value as u64),
+        );
+        self
+    }
+
+    pub fn limbs_input(mut self, signal_name: &str, signal_value: &[u64]) -> Self {
+        self.signals.insert(
+            String::from(signal_name),
+            CircuitInputSignal::Limbs(Vec::from(signal_value)),
+        );
+        self
+    }
+
+    pub fn u64_input(mut self, signal_name: &str, signal_value: u64) -> Self {
+        self.signals.insert(
+            String::from(signal_name),
+            CircuitInputSignal::U64(signal_value),
+        );
+        self
+    }
+
+    pub fn frs_input(mut self, signal_name: &str, signal_value: &[Fr]) -> Self {
+        self.signals.insert(
+            String::from(signal_name),
+            CircuitInputSignal::Frs(Vec::from(signal_value)),
+        );
+        self
+    }
+
+    pub fn fr_input(mut self, signal_name: &str, signal_value: Fr) -> Self {
+        self.signals.insert(
+            String::from(signal_name),
+            CircuitInputSignal::Fr(signal_value),
+        );
+        self
+    }
+
+    pub fn bools_input(mut self, signal_name: &str, signal_value: &[bool]) -> Self {
+        self.signals.insert(
+            String::from(signal_name),
+            CircuitInputSignal::Bytes(signal_value.iter().map(|b| *b as u8).collect::<Vec<u8>>()),
+        );
+        self
+    }
+
+    pub fn bool_input(mut self, signal_name: &str, signal_value: bool) -> Self {
+        self.signals.insert(
+            String::from(signal_name),
+            CircuitInputSignal::U64(signal_value as u64),
+        );
+        self
+    }
+
+    pub fn merge(mut self, to_merge: CircuitInputSignals<Unpadded>) -> Result<Self> {
+        for (key, _) in self.signals.iter() {
+            if to_merge.signals.contains_key(key) {
+                bail!("Cannot redefine a signal input that is already defined.")
+            }
+        }
+
+        self.signals.extend(to_merge.signals);
+
+        Ok(Self {
+            signals: self.signals,
+            t: PhantomData,
+        })
+    }
+
+    pub fn pad(self, config: &CircuitPaddingConfig) -> Result<CircuitInputSignals<Padded>> {
+        let padded_signals_vec: Result<Vec<(String, CircuitInputSignal)>> = self
+            .signals
+            .into_iter()
+            .map(|(k, v)| {
+                anyhow::Ok((String::from(&k), pad_if_needed(&k, v, &config.max_lengths)?))
+            })
+            .collect();
+
+        let padded_signals: BTreeMap<String, CircuitInputSignal> =
+            BTreeMap::from_iter(padded_signals_vec?);
+
+        Ok(CircuitInputSignals {
+            signals: padded_signals,
+            t: PhantomData,
+        })
+    }
+}
+
+// padding helper functions
+
+fn pad_if_needed(
+    k: &str,
+    v: CircuitInputSignal,
+    global_input_max_lengths: &BTreeMap<String, usize>,
+) -> Result<CircuitInputSignal, anyhow::Error> {
+    Ok(match v {
+        CircuitInputSignal::U64(x) => CircuitInputSignal::U64(x),
+        CircuitInputSignal::Fr(x) => CircuitInputSignal::Fr(x),
+        CircuitInputSignal::Frs(x) => CircuitInputSignal::Frs(x),
+        CircuitInputSignal::Limbs(mut x) => {
+            let zeros_needed =
+                global_input_max_lengths.get(k).copied().unwrap_or(x.len()) - x.len();
+            x.extend(vec![0; zeros_needed]);
+            CircuitInputSignal::Limbs(x)
+        },
+
+        CircuitInputSignal::Bytes(b) => {
+            CircuitInputSignal::Bytes(pad_bytes(&b, global_input_max_lengths[k])?)
+        },
+    })
+}
+
+fn pad_bytes(unpadded_bytes: &[u8], max_size: usize) -> Result<Vec<u8>, anyhow::Error> {
+    let mut bytes = Vec::from(unpadded_bytes);
+
+    println!("size: {}", bytes.len());
+    println!("max size: {}", max_size);
+    println!("{:?}", String::from_utf8_lossy(&bytes));
+
+    if max_size < bytes.len() {
+        Err(anyhow!("max_size exceeded"))
+    } else {
+        bytes.extend([0].repeat(max_size - bytes.len()));
+        Ok(bytes)
+    }
+}
+
+/// Can only serialize a CircuitInputSignals struct if padding has been added
+impl CircuitInputSignals<Padded> {
+    pub fn to_json_value(self) -> serde_json::Value {
+        Value::from(serde_json::Map::from_iter(
+            self.signals.into_iter().map(|(k, v)| (k, stringify(v))),
+        ))
+    }
+}
+
+fn stringify_vec<T: ToString>(v: &[T]) -> Vec<String> {
+    v.iter().map(|num| num.to_string()).collect()
+}
+
+fn stringify_vec_fr(v: &[Fr]) -> Vec<String> {
+    v.iter().map(fr_to_string).collect()
+}
+
+fn stringify(input: CircuitInputSignal) -> Value {
+    match input {
+        CircuitInputSignal::U64(x) => Value::from(x.to_string()),
+        CircuitInputSignal::Fr(x) => Value::from(fr_to_string(&x)),
+        CircuitInputSignal::Frs(x) => Value::from(stringify_vec_fr(&x)),
+        CircuitInputSignal::Limbs(x) => Value::from(stringify_vec(&x)),
+        CircuitInputSignal::Bytes(x) => Value::from(stringify_vec(&x)),
+    }
+}
+
+/// Annoyingly, Fr serializes 0 to the empty string. Mitigate this here
+fn fr_to_string(fr: &Fr) -> String {
+    let s = fr.to_string();
+    if s.is_empty() {
+        String::from("0")
+    } else {
+        s
+    }
+}
diff --git a/keyless/common/src/input_processing/config.rs b/keyless/common/src/input_processing/config.rs
new file mode 100644
index 0000000000000..f881e0abc4da1
--- /dev/null
+++ b/keyless/common/src/input_processing/config.rs
@@ -0,0 +1,24 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use serde::{Deserialize, Serialize};
+use std::collections::BTreeMap;
+
+#[derive(Serialize, Deserialize, Clone)]
+pub struct CircuitPaddingConfig {
+    pub max_lengths: BTreeMap<String, usize>,
+}
+
+impl CircuitPaddingConfig {
+    #[allow(clippy::new_without_default)]
+    pub fn new() -> Self {
+        Self {
+            max_lengths: BTreeMap::new(),
+        }
+    }
+
+    pub fn max_length(mut self, signal: &str, l: usize) -> Self {
+        self.max_lengths.insert(String::from(signal), l);
+        self
+    }
+}
diff --git a/keyless/common/src/input_processing/encoding.rs b/keyless/common/src/input_processing/encoding.rs
new file mode 100644
index 0000000000000..d74dea6a71e05
--- /dev/null
+++ b/keyless/common/src/input_processing/encoding.rs
@@ -0,0 +1,213 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::api::{EphemeralPublicKeyBlinder, PoseidonHash};
+use anyhow::{anyhow, Result};
+use aptos_types::{
+    jwks::rsa::RSA_JWK, keyless::Pepper, transaction::authenticator::EphemeralPublicKey,
+};
+use ark_bn254::Fr;
+use ark_ff::{BigInteger, PrimeField};
+use num_bigint::BigUint;
+use serde::{Deserialize, Serialize};
+
+pub type RsaSignature = BigUint;
+
+pub trait AsFr {
+    fn as_fr(&self) -> Fr;
+}
+
+pub trait FromFr {
+    fn from_fr(fr: &Fr) -> Self;
+}
+
+pub trait TryFromFr: Sized {
+    fn try_from_fr(fr: &Fr) -> Result<Self>;
+}
+
+impl AsFr for PoseidonHash {
+    fn as_fr(&self) -> Fr {
+        Fr::from_le_bytes_mod_order(self.as_slice())
+    }
+}
+
+impl TryFromFr for PoseidonHash {
+    fn try_from_fr(fr: &Fr) -> Result<Self> {
+        let v = fr.into_bigint().to_bytes_le();
+        let arr: PoseidonHash = v
+            .try_into()
+            .map_err(|_| anyhow!("Conversion from Fr to bytes failed"))?;
+        Ok(arr)
+    }
+}
+
+impl AsFr for EphemeralPublicKeyBlinder {
+    fn as_fr(&self) -> Fr {
+        Fr::from_le_bytes_mod_order(self)
+    }
+}
+
+impl FromFr for EphemeralPublicKeyBlinder {
+    fn from_fr(fr: &Fr) -> Self {
+        fr.into_bigint().to_bytes_le()
+    }
+}
+
+impl AsFr for Pepper {
+    fn as_fr(&self) -> Fr {
+        Fr::from_le_bytes_mod_order(self.to_bytes())
+    }
+}
+
+pub trait FromB64 {
+    fn from_b64(s: &str) -> Result<Self>
+    where
+        Self: Sized;
+}
+
+impl FromB64 for RsaSignature {
+    /// JWT signature is encoded in big-endian.
+    fn from_b64(s: &str) -> Result<Self> {
+        Ok(BigUint::from_bytes_be(&base64::decode_config(
+            s,
+            base64::URL_SAFE_NO_PAD,
+        )?))
+    }
+}
+
+pub trait FromHex {
+    fn from_hex(s: &str) -> Result<Self>
+    where
+        Self: Sized;
+}
+
+impl FromHex for EphemeralPublicKey {
+    fn from_hex(s: &str) -> Result<Self>
+    where
+        Self: Sized,
+    {
+        Ok(EphemeralPublicKey::try_from(hex::decode(s)?.as_slice())?)
+    }
+}
+
+#[derive(Debug)]
+pub struct JwtParts {
+    header: String,
+    payload: String,
+    signature: String,
+}
+
+#[derive(Serialize, Deserialize)]
+pub struct JwtHeader {
+    pub kid: String,
+}
+
+#[derive(Serialize, Deserialize)]
+pub struct JwtPayload {
+    pub iss: String,
+    pub iat: u64,
+    pub nonce: String,
+    pub sub: Option<String>,
+    pub email: Option<String>,
+    pub aud: Option<String>,
+}
+
+impl FromB64 for JwtParts {
+    fn from_b64(s: &str) -> Result<Self>
+    where
+        Self: Sized,
+    {
+        let jwt_parts: Vec<&str> = s.split('.').collect();
+        Ok(Self {
+            header: String::from(
+                *jwt_parts
+                    .first()
+                    .ok_or_else(|| anyhow!("JWT did not parse correctly"))?,
+            ),
+            payload: String::from(
+                *jwt_parts
+                    .get(1)
+                    .ok_or_else(|| anyhow!("JWT did not parse correctly"))?,
+            ),
+            signature: String::from(
+                *jwt_parts
+                    .get(2)
+                    .ok_or_else(|| anyhow!("JWT did not parse correctly"))?,
+            ),
+        })
+    }
+}
+
+impl JwtParts {
+    pub fn unsigned_undecoded(&self) -> String {
+        String::from(&self.header) + "." + &self.payload
+    }
+
+    pub fn payload_undecoded(&self) -> String {
+        String::from(&self.payload)
+    }
+
+    pub fn header_undecoded_with_dot(&self) -> String {
+        String::from(&self.header) + "."
+    }
+
+    pub fn header_decoded(&self) -> Result<String> {
+        Ok(String::from_utf8(base64::decode_config(
+            &self.header,
+            base64::URL_SAFE_NO_PAD,
+        )?)?)
+    }
+
+    pub fn payload_decoded(&self) -> Result<String> {
+        Ok(String::from_utf8(base64::decode_config(
+            &self.payload,
+            base64::URL_SAFE_NO_PAD,
+        )?)?)
+    }
+
+    pub fn signature(&self) -> Result<RsaSignature> {
+        RsaSignature::from_b64(&self.signature)
+    }
+}
+
+pub struct UnsignedJwtPartsWithPadding {
+    b: Vec<u8>,
+}
+
+impl UnsignedJwtPartsWithPadding {
+    pub fn from_b64_bytes_with_padding(b: &[u8]) -> Self {
+        Self { b: Vec::from(b) }
+    }
+
+    pub fn payload_with_padding(&self) -> Result<Vec<u8>> {
+        let first_dot = self
+            .b
+            .iter()
+            .position(|c| c == &b'.')
+            .ok_or_else(|| anyhow!("Not a valid jwt; has no \".\""))?;
+
+        Ok(Vec::from(&self.b[first_dot + 1..]))
+    }
+}
+
+/// Trait which signals that this type allows conversion into 64-bit limbs. Used for JWT signature
+/// and JWK modulus.
+pub trait As64BitLimbs {
+    fn as_64bit_limbs(&self) -> Vec<u64>;
+}
+
+impl As64BitLimbs for RSA_JWK {
+    fn as_64bit_limbs(&self) -> Vec<u64> {
+        let modulus_bytes = base64::decode_config(&self.n, base64::URL_SAFE_NO_PAD)
+            .expect("JWK should always have a properly-encoded modulus");
+        // JWKs encode modulus in big-endian order
+        let modulus_biguint: BigUint = BigUint::from_bytes_be(&modulus_bytes);
+        modulus_biguint.to_u64_digits()
+    }
+}
+
+impl As64BitLimbs for RsaSignature {
+    fn as_64bit_limbs(&self) -> Vec<u64> {
+        self.to_u64_digits()
+    }
+}
diff --git a/keyless/common/src/input_processing/mod.rs b/keyless/common/src/input_processing/mod.rs
new file mode 100644
index 0000000000000..461913f077516
--- /dev/null
+++ b/keyless/common/src/input_processing/mod.rs
@@ -0,0 +1,9 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod bits;
+pub mod circuit_input_signals;
+pub mod config;
+pub mod encoding;
+pub mod sha;
+pub mod witness_gen;
diff --git a/keyless/common/src/input_processing/sha.rs b/keyless/common/src/input_processing/sha.rs
new file mode 100644
index 0000000000000..3127d664a95bf
--- /dev/null
+++ b/keyless/common/src/input_processing/sha.rs
@@ -0,0 +1,75 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+#![allow(non_upper_case_globals)]
+#![allow(non_camel_case_types)]
+#![allow(non_snake_case)]
+
+use super::bits::Bits;
+use tracing::debug;
+
+pub fn jwt_bit_len(jwt: &[u8]) -> usize {
+    jwt.len() * 8
+}
+
+/// input: jwt as base64 without padding.
+/// output: length of bit representation of jwt, encoded in big-endian as 8 bits.
+pub fn jwt_bit_len_binary(jwt_unsigned: &[u8]) -> Bits {
+    let L = jwt_bit_len(jwt_unsigned);
+
+    Bits::raw(&format!("{L:064b}"))
+}
+
+/// input: jwt as base64 without padding.
+/// output: bit representation of sha padding
+pub fn compute_sha_padding(jwt_unsigned: &[u8]) -> Bits {
+    let mut padding_bits = Bits::new();
+    let L = jwt_bit_len(jwt_unsigned);
+    // Following the spec linked here:
+    //https://www.rfc-editor.org/rfc/rfc4634.html#section-4.1
+    // Step 4.1.a: add bit '1'
+    padding_bits += Bits::raw("1");
+    // Step 4.1.b Append K '0' bits where K is the smallest non-negative integer solution to L+1+K = 448 mod 512, and L is the length of the message in bits
+    // i.e., K is smallest non-neg integer such that L + K + 1 + 64 == 0 mod 512
+    // we never expect this to cause an error, so unwrapping here is ok
+    // There was a bug here, which is why we are logging so much
+    let K_before_mod = 448 - (L as i64) - 1;
+    debug!("Computing sha padding: K_before_mod={}", K_before_mod);
+    let K_i64 = K_before_mod.rem_euclid(512);
+    debug!("Computing sha padding: K_i64={}", K_i64);
+    let K_usize = usize::try_from(K_i64).unwrap();
+    debug!("Computing sha padding: K_usize={}", K_usize);
+    padding_bits += Bits::raw(&("0".repeat(K_usize)));
+    // 4.1.c Append L in binary form (big-endian) as 64 bits
+    padding_bits += jwt_bit_len_binary(jwt_unsigned);
+
+    padding_bits
+}
+
+pub fn compute_sha_padding_without_len(jwt_unsigned: &[u8]) -> Bits {
+    let mut padding_bits = Bits::new();
+    let L = jwt_bit_len(jwt_unsigned);
+    // Following the spec linked here:
+    //https://www.rfc-editor.org/rfc/rfc4634.html#section-4.1
+    // Step 4.1.a: add bit '1'
+    padding_bits += Bits::raw("1");
+    // Step 4.1.b Append K '0' bits where K is the smallest non-negative integer solution to L+1+K = 448 mod 512, and L is the length of the message in bits
+    // i.e., K is smallest non-neg integer such that L + K + 1 + 64 == 0 mod 512
+    // we never expect this to cause an error, so unwrapping here is ok
+    // There was a bug here, which is why we are logging so much
+    let K_before_mod = 448 - (L as i64) - 1;
+    debug!("Computing sha padding: K_before_mod={}", K_before_mod);
+    let K_i64 = K_before_mod.rem_euclid(512);
+    debug!("Computing sha padding: K_i64={}", K_i64);
+    let K_usize = usize::try_from(K_i64).unwrap();
+    debug!("Computing sha padding: K_usize={}", K_usize);
+    padding_bits += Bits::raw(&("0".repeat(K_usize)));
+    // Skip 4.1.c
+    padding_bits
+}
+
+pub fn with_sha_padding_bytes(jwt_unsigned: &[u8]) -> Vec<u8> {
+    (Bits::bit_representation_of_bytes(jwt_unsigned) + compute_sha_padding(jwt_unsigned))
+        .as_bytes()
+        .expect("Should have length a multiple of 8")
+}
diff --git a/keyless/common/src/input_processing/witness_gen.rs b/keyless/common/src/input_processing/witness_gen.rs
new file mode 100644
index 0000000000000..baaf2e783e6ff
--- /dev/null
+++ b/keyless/common/src/input_processing/witness_gen.rs
@@ -0,0 +1,67 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use anyhow::{anyhow, bail, Result};
+use std::{fs, process::Command};
+use tempfile::NamedTempFile;
+use tracing::info_span;
+
+pub trait PathStr {
+    fn path_str(&self) -> Result<&str>;
+}
+
+impl PathStr for NamedTempFile {
+    fn path_str(&self) -> Result<&str> {
+        self.path().to_str().ok_or(anyhow!("tempfile path error"))
+    }
+}
+
+pub fn witness_gen(
+    witness_gen_js_path: &str,
+    witness_gen_wasm_path: &str,
+    body: &str,
+) -> Result<NamedTempFile> {
+    let span = info_span!("Generating witness");
+    let _enter = span.enter();
+    let input_file = NamedTempFile::new()?;
+    let witness_file = NamedTempFile::new()?;
+    fs::write(input_file.path(), body.as_bytes())?;
+    let mut cmd = get_witness_command(
+        witness_gen_js_path,
+        witness_gen_wasm_path,
+        input_file.path_str()?,
+        witness_file.path_str()?,
+    );
+    let output = cmd.output()?;
+    // Check if the command executed successfully
+    if output.status.success() {
+        // if config.enable_dangerous_logging {
+        //     // Convert the output bytes to a string
+        //     let stdout = String::from_utf8_lossy(&output.stdout);
+        //     // Print the output
+        //     println!("Command output:\n{}", stdout);
+        // }
+        Ok(witness_file)
+    } else {
+        // Print the error message if the command failed
+        let stderr = String::from_utf8_lossy(&output.stderr);
+        let stdout = String::from_utf8_lossy(&output.stdout);
+        bail!("Command failed:\n{}\n{}", stdout, stderr)
+    }
+}
+
+fn get_witness_command(
+    witness_gen_js_path: &str,
+    witness_gen_wasm_path: &str,
+    input_file_path: &str,
+    witness_file_path: &str,
+) -> Command {
+    let mut c = Command::new("node");
+    c.args(&[
+        witness_gen_js_path.to_string(),
+        witness_gen_wasm_path.to_string(),
+        String::from(input_file_path),
+        String::from(witness_file_path),
+    ]);
+    c
+}
diff --git a/keyless/common/src/lib.rs b/keyless/common/src/lib.rs
new file mode 100644
index 0000000000000..2e9931583c27e
--- /dev/null
+++ b/keyless/common/src/lib.rs
@@ -0,0 +1,5 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod api;
+pub mod input_processing;
diff --git a/keyless/pepper/common/src/account_recovery_db.rs b/keyless/pepper/common/src/account_recovery_db.rs
new file mode 100644
index 0000000000000..f419562d89807
--- /dev/null
+++ b/keyless/pepper/common/src/account_recovery_db.rs
@@ -0,0 +1,40 @@
+// Copyright (c) Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{Deserialize, Serialize};
+use aptos_crypto::compat::Sha3_256;
+use ed25519_dalek::Digest;
+
+/// The schema used in the account recovery DB.
+#[derive(Debug, Serialize, Deserialize)]
+pub struct AccountRecoveryDbEntry {
+    pub iss: String,
+    pub aud: String,
+    pub uid_key: String,
+    pub uid_val: String,
+
+    pub num_requests: Option<u64>,
+
+    /// First request time in unix milliseconds, but minus 1 quadrillion (10^15).
+    ///
+    /// See comments in function `update_account_recovery_db` for more context.
+    pub first_request_unix_ms_minus_1q: Option<i64>,
+    pub last_request_unix_ms: Option<u64>,
+}
+
+impl AccountRecoveryDbEntry {
+    /// Derive a unique ID for a document/data entry.
+    pub fn document_id(&self) -> String {
+        let mut hasher = Sha3_256::new();
+        hasher.update((self.iss.len() as u64).to_be_bytes());
+        hasher.update(&self.iss);
+        hasher.update((self.aud.len() as u64).to_be_bytes());
+        hasher.update(&self.aud);
+        hasher.update((self.uid_key.len() as u64).to_be_bytes());
+        hasher.update(&self.uid_key);
+        hasher.update((self.uid_val.len() as u64).to_be_bytes());
+        hasher.update(&self.uid_val);
+        let digest = hasher.finalize();
+        hex::encode(digest.as_slice())
+    }
+}
diff --git a/keyless/pepper/common/src/lib.rs b/keyless/pepper/common/src/lib.rs
index 3affded4451bb..8dba837ff5cbb 100644
--- a/keyless/pepper/common/src/lib.rs
+++ b/keyless/pepper/common/src/lib.rs
@@ -4,6 +4,7 @@
 use aptos_types::transaction::authenticator::EphemeralPublicKey;
 use serde::{de::Error, Deserialize, Deserializer, Serialize, Serializer};
 
+pub mod account_recovery_db;
 pub mod jwt;
 pub mod vuf;
 
@@ -25,6 +26,27 @@ where
     hex::decode(s).map_err(D::Error::custom)
 }
 
+/// Custom serialization function to convert Vec<u8> into a hex string with the 0x prefix.
+fn serialize_bytes_to_hex_with_0x<S>(bytes: &Vec<u8>, serializer: S) -> Result<S::Ok, S::Error>
+where
+    S: Serializer,
+{
+    let hex_string = format!("0x{}", hex::encode(bytes));
+    serializer.serialize_str(&hex_string)
+}
+
+/// Custom deserialization function to convert a hex string with the 0x prefix back into Vec<u8>.
+fn deserialize_bytes_from_hex_with_0x<'de, D>(deserializer: D) -> Result<Vec<u8>, D::Error>
+where
+    D: Deserializer<'de>,
+{
+    let s = String::deserialize(deserializer)?;
+    if !s.starts_with("0x") {
+        return Err(D::Error::custom("String is not prefixed by '0x'"));
+    }
+    hex::decode(&s[2..]).map_err(D::Error::custom)
+}
+
 /// Custom serialization function to convert `EphemeralPublicKey` into a hex string.
 fn serialize_epk_to_hex<S>(epk: &EphemeralPublicKey, serializer: S) -> Result<S::Ok, S::Error>
 where
@@ -75,54 +97,26 @@ pub struct PepperRequest {
 /// The response to `PepperRequest`, which contains either the pepper or a processing error.
 #[derive(Debug, Deserialize, Serialize)]
 pub struct PepperResponse {
-    #[serde(
-        serialize_with = "serialize_bytes_to_hex",
-        deserialize_with = "deserialize_bytes_from_hex"
-    )]
-    pub signature: Vec<u8>, // unique BLS signature
     #[serde(
         serialize_with = "serialize_bytes_to_hex",
         deserialize_with = "deserialize_bytes_from_hex"
     )]
     pub pepper: Vec<u8>,
     #[serde(
-        serialize_with = "serialize_bytes_to_hex",
-        deserialize_with = "deserialize_bytes_from_hex"
+        serialize_with = "serialize_bytes_to_hex_with_0x",
+        deserialize_with = "deserialize_bytes_from_hex_with_0x"
     )]
     pub address: Vec<u8>,
 }
 
-/// A pepper scheme where:
-/// - The pepper input contains `JWT, epk, blinder, expiry_time, uid_key, aud_override`, wrapped in type `PepperRequestV1`.
-/// - `epk` variant is `EphemeralPublicKey::Ed25519`.
-/// - The pepper output is the `BLS12381_G1_BLS` VUF output of the input, encrypted by `epk`, wrapped in type `PepperResponseV1`.
-#[derive(Debug, Deserialize, Serialize)]
-pub struct PepperRequestV1 {
-    #[serde(rename = "jwt_b64")]
-    pub jwt: String,
-    pub epk: EphemeralPublicKey,
-    pub exp_date_secs: u64,
-    #[serde(
-        serialize_with = "serialize_bytes_to_hex",
-        deserialize_with = "deserialize_bytes_from_hex"
-    )]
-    pub epk_blinder: Vec<u8>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub uid_key: Option<String>,
-    /// The `aud` to compute pepper against.
-    /// If not present, default to the `aud` in the given `jwt`.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub aud: Option<String>,
-}
-
-/// The response to `PepperRequestV1`, which contains either the pepper encrypted or a processing error.
+/// The response to /signature, which contains the VUF signature.
 #[derive(Debug, Deserialize, Serialize)]
-pub struct PepperResponseV1 {
+pub struct SignatureResponse {
     #[serde(
         serialize_with = "serialize_bytes_to_hex",
         deserialize_with = "deserialize_bytes_from_hex"
     )]
-    pub signature_encrypted: Vec<u8>, // unique BLS signature encrypted
+    pub signature: Vec<u8>, // unique BLS signature
 }
 
 /// The response to `/v0/vuf-pub-key`.
diff --git a/keyless/pepper/example-client-rust/Cargo.toml b/keyless/pepper/example-client-rust/Cargo.toml
index d3f0beecb46d5..3311ef0e924de 100644
--- a/keyless/pepper/example-client-rust/Cargo.toml
+++ b/keyless/pepper/example-client-rust/Cargo.toml
@@ -14,11 +14,13 @@ rust-version = { workspace = true }
 
 [dependencies]
 aptos-crypto = { workspace = true }
+aptos-infallible = { workspace = true }
 aptos-keyless-pepper-common = { workspace = true }
 aptos-types = { workspace = true }
 ark-bls12-381 = { workspace = true }
 ark-serialize = { workspace = true }
 bcs = { workspace = true }
+firestore = { workspace = true }
 hex = { workspace = true }
 reqwest = { workspace = true }
 serde_json = { workspace = true }
diff --git a/keyless/pepper/example-client-rust/src/main.rs b/keyless/pepper/example-client-rust/src/main.rs
index 8c99a23e40653..a1c7e416b8e45 100644
--- a/keyless/pepper/example-client-rust/src/main.rs
+++ b/keyless/pepper/example-client-rust/src/main.rs
@@ -2,16 +2,19 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use aptos_crypto::ed25519::{Ed25519PrivateKey, Ed25519PublicKey};
+use aptos_infallible::duration_since_epoch;
 use aptos_keyless_pepper_common::{
+    account_recovery_db::AccountRecoveryDbEntry,
     jwt,
     vuf::{self, VUF},
-    PepperInput, PepperRequest, PepperResponse, PepperV0VufPubKey,
+    PepperInput, PepperRequest, PepperResponse, PepperV0VufPubKey, SignatureResponse,
 };
 use aptos_types::{
     keyless::{Configuration, OpenIdSig},
     transaction::authenticator::EphemeralPublicKey,
 };
 use ark_serialize::CanonicalDeserialize;
+use firestore::{path, paths, FirestoreDb, FirestoreDbOptions};
 use reqwest::StatusCode;
 use std::{fs, io::stdin};
 
@@ -69,6 +72,7 @@ async fn main() {
     println!();
     let vuf_pub_key_url = format!("{url}/v0/vuf-pub-key");
     let fetch_url = format!("{url}/v0/fetch");
+    let sig_url = format!("{url}/v0/signature");
     println!();
     println!(
         "Action 1: fetch its verification key with a GET request to {}",
@@ -101,7 +105,7 @@ async fn main() {
 
     println!();
     println!("Action 4: decide an expiry unix time.");
-    let epk_expiry_time_secs = 1721397501;
+    let epk_expiry_time_secs = duration_since_epoch().as_secs() + 3600;
     println!("expiry_time_sec={}", epk_expiry_time_secs);
 
     let esk_bytes =
@@ -148,24 +152,37 @@ async fn main() {
         fetch_url,
         serde_json::to_string_pretty(&pepper_request).unwrap()
     );
-    let raw_response = client
+    let pepper_raw_response = client
         .post(fetch_url)
         .json(&pepper_request)
         .send()
         .await
         .unwrap();
-    assert_eq!(StatusCode::OK, raw_response.status());
-    let pepper_response = raw_response.json::<PepperResponse>().await.unwrap();
+    assert_eq!(StatusCode::OK, pepper_raw_response.status());
+    let pepper_response = pepper_raw_response.json::<PepperResponse>().await.unwrap();
     println!();
     println!(
         "pepper_service_response={}",
         serde_json::to_string_pretty(&pepper_response).unwrap()
     );
-    let PepperResponse {
-        signature,
-        pepper,
-        address,
-    } = pepper_response;
+    let PepperResponse { pepper, address } = pepper_response;
+
+    let signature_raw_response = client
+        .post(sig_url)
+        .json(&pepper_request)
+        .send()
+        .await
+        .unwrap();
+    assert_eq!(StatusCode::OK, signature_raw_response.status());
+    let signature_response = signature_raw_response
+        .json::<SignatureResponse>()
+        .await
+        .unwrap();
+    println!(
+        "signature_response={}",
+        serde_json::to_string_pretty(&signature_response).unwrap()
+    );
+    let SignatureResponse { signature } = signature_response;
     println!("signature={:?}", hex::encode(signature.clone()));
     println!("pepper={:?}", hex::encode(pepper.clone()));
     println!("address={:?}", hex::encode(address.clone()));
@@ -182,4 +199,38 @@ async fn main() {
     vuf::bls12381_g1_bls::Bls12381G1Bls::verify(&vuf_pk, &pepper_input_bytes, &signature, &[])
         .unwrap();
     println!("Pepper verification succeeded!");
+
+    println!("Checking firestore records.");
+    let google_project_id = std::env::var("PROJECT_ID").unwrap();
+    let database_id = std::env::var("DATABASE_ID").unwrap();
+    let options = FirestoreDbOptions {
+        google_project_id,
+        database_id,
+        max_retries: 1,
+        firebase_api_url: None,
+    };
+    let db = FirestoreDb::with_options(options).await.unwrap();
+    let docs: Vec<AccountRecoveryDbEntry> = db
+        .fluent()
+        .select()
+        .fields(paths!(AccountRecoveryDbEntry::{iss, aud, uid_key, uid_val, last_request_unix_ms, first_request_unix_ms_minus_1q, num_requests}))
+        .from("accounts")
+        .filter(|q| {
+            q.for_all([
+                q.field(path!(AccountRecoveryDbEntry::iss))
+                    .eq(pepper_input.iss.clone()),
+                q.field(path!(AccountRecoveryDbEntry::aud))
+                    .eq(pepper_input.aud.clone()),
+                q.field(path!(AccountRecoveryDbEntry::uid_key))
+                    .eq(pepper_input.uid_key.clone()),
+                q.field(path!(AccountRecoveryDbEntry::uid_val))
+                    .eq(pepper_input.uid_val.clone()),
+            ])
+        })
+        .obj()
+        .query()
+        .await
+        .unwrap();
+    println!("docs={docs:?}");
+    assert_eq!(1, docs.len());
 }
diff --git a/keyless/pepper/readme.md b/keyless/pepper/readme.md
index 7e548ee1da5f9..493650962e0c7 100644
--- a/keyless/pepper/readme.md
+++ b/keyless/pepper/readme.md
@@ -1,16 +1,54 @@
-## Quickstart
+## Dev guide
 
-Start the pepper service in terminal 1.
+### Prepare dependency: a firestore instance.
+
+Pepper service now depends on an account recovery DB, which is deployed as a firestore on GCP.
+You must have a GCP project in order to run firestore emulator locally.
+You also need to create a service account, grant firestore access to it, and download its credential file.
+
+In terminal 0, start a local firestore emulator.
 ```bash
-ACCOUNT_MANAGER_0_ISSUER=https://accounts.google.com \
-  ACCOUNT_MANAGER_0_AUD=407408718192.apps.googleusercontent.com \
-  VUF_KEY_SEED_HEX=ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff \
-  cargo run -p aptos-keyless-pepper-service
+gcloud emulators firestore start --host-port=localhost:8081
+```
+
+In terminal 1, set up the environment variables and start the pepper service.
+```bash
+# If specified, firestore library connects to the local emulator instead of the real GCP API.
+export FIRESTORE_EMULATOR_HOST=localhost:8081
+
+export GOOGLE_APPLICATION_CREDENTIALS="<path-to-your-service-account-credential>"
+
+# Specify the account recovery DB location.
+export PROJECT_ID=$(gcloud config get-value project)
+export DATABASE_ID='(default)' # the default name of a local firestore emulator
+
+# Specify an account manager.
+export ACCOUNT_MANAGER_0_ISSUER=https://accounts.google.com
+export ACCOUNT_MANAGER_0_AUD=407408718192.apps.googleusercontent.com
+# To specify more, do the following:
+#   export ACCOUNT_MANAGER_1_ISSUER=https://www.facebook.com
+#   export ACCOUNT_MANAGER_1_AUD=999999999.apps.fbusercontent.com
+#   export ACCOUNT_MANAGER_2_ISSUER=https://appleid.apple.com
+#   export ACCOUNT_MANAGER_2_AUD=88888888.apps.appleusercontent.com
+
+# Specify the VUF private key.
+export VUF_KEY_SEED_HEX=ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+
+# Start the pepper service.
+cargo run -p aptos-keyless-pepper-service
 ```
-NOTE: `ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00` is a dummy VUF private key seed.
 
 Run the example client in terminal 2.
 ```bash
+# In addition to sending a pepper request and verify the response,
+# the example client also connects to the account recovery DB and verifies that it was correctly updated by the pepper service.
+# So here it relies on the same firestore-related parameters as `aptos-keyless-pepper-service` does.
+export FIRESTORE_EMULATOR_HOST=localhost:8081
+export GOOGLE_APPLICATION_CREDENTIALS="<path-to-your-service-account-credential>"
+export PROJECT_ID=$(gcloud config get-value project)
+export DATABASE_ID='(default)' # the default name of a local firestore emulator
+
+# Start the example client.
 cargo run -p aptos-keyless-pepper-example-client-rust
 ```
 This is an interactive console program.
diff --git a/third_party/move/tools/move-cli/tests/metatests/dummy/test_1/args.exp b/keyless/pepper/scripts/install-deps.sh
similarity index 100%
rename from third_party/move/tools/move-cli/tests/metatests/dummy/test_1/args.exp
rename to keyless/pepper/scripts/install-deps.sh
diff --git a/keyless/pepper/service/Cargo.toml b/keyless/pepper/service/Cargo.toml
index 61c7bc9e29ad7..3dc8adf9044b9 100644
--- a/keyless/pepper/service/Cargo.toml
+++ b/keyless/pepper/service/Cargo.toml
@@ -16,6 +16,7 @@ rust-version = { workspace = true }
 aes-gcm = { workspace = true }
 anyhow = { workspace = true }
 aptos-crypto = { workspace = true }
+aptos-infallible = { workspace = true }
 aptos-inspection-service = { workspace = true }
 aptos-keyless-pepper-common = { workspace = true }
 aptos-logger = { workspace = true }
@@ -27,6 +28,7 @@ ark-ff = { workspace = true }
 ark-serialize = { workspace = true }
 bcs = { workspace = true }
 dashmap = { workspace = true }
+firestore = { workspace = true }
 hex = { workspace = true }
 hyper = { workspace = true }
 jsonwebtoken = { workspace = true }
diff --git a/keyless/pepper/service/src/account_db.rs b/keyless/pepper/service/src/account_db.rs
new file mode 100644
index 0000000000000..d9dd3500702c4
--- /dev/null
+++ b/keyless/pepper/service/src/account_db.rs
@@ -0,0 +1,37 @@
+// Copyright (c) Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use aptos_logger::warn;
+use firestore::{FirestoreDb, FirestoreDbOptions, FirestoreResult};
+use once_cell::sync::Lazy;
+use tokio::sync::OnceCell;
+
+/// A GCP firestore that holds all account address pre-images
+pub static ACCOUNT_RECOVERY_DB: Lazy<OnceCell<FirestoreResult<FirestoreDb>>> =
+    Lazy::new(OnceCell::new);
+
+pub async fn init_account_db() -> FirestoreResult<FirestoreDb> {
+    let google_project_id = match std::env::var("PROJECT_ID") {
+        Ok(id) => id,
+        Err(e) => {
+            warn!("Could not load envvar `PROJECT_ID`: {e}");
+            "unknown_project".to_string()
+        },
+    };
+
+    let database_id = match std::env::var("DATABASE_ID") {
+        Ok(id) => id,
+        Err(e) => {
+            warn!("Could not load envvar `DATABASE_ID`: {e}");
+            "unknown_database".to_string()
+        },
+    };
+
+    let option = FirestoreDbOptions {
+        google_project_id,
+        database_id,
+        max_retries: 1,
+        firebase_api_url: None,
+    };
+    FirestoreDb::with_options(option).await
+}
diff --git a/keyless/pepper/service/src/account_managers.rs b/keyless/pepper/service/src/account_managers.rs
index 9eb628c1b70c0..58844e1aba257 100644
--- a/keyless/pepper/service/src/account_managers.rs
+++ b/keyless/pepper/service/src/account_managers.rs
@@ -1,8 +1,6 @@
 // Copyright © Aptos Foundation
 // SPDX-License-Identifier: Apache-2.0
 
-// Copyright © Aptos Foundation
-
 use aptos_logger::info;
 use once_cell::sync::Lazy;
 use regex::Regex;
diff --git a/keyless/pepper/service/src/jwk.rs b/keyless/pepper/service/src/jwk.rs
index 3f81fd2566ba5..0406eac07c2bd 100644
--- a/keyless/pepper/service/src/jwk.rs
+++ b/keyless/pepper/service/src/jwk.rs
@@ -5,10 +5,7 @@ use crate::{metrics::JWK_FETCH_SECONDS, Issuer, KeyID};
 use anyhow::{anyhow, Result};
 use aptos_logger::warn;
 use dashmap::DashMap;
-use jsonwebtoken::{
-    jwk::{Jwk, JwkSet},
-    DecodingKey,
-};
+use jsonwebtoken::{jwk::JwkSet, DecodingKey};
 use once_cell::sync::Lazy;
 use std::{sync::Arc, time::Duration};
 use tokio::time::Instant;
@@ -26,8 +23,12 @@ pub async fn fetch_jwks(jwk_url: &str) -> Result<DashMap<KeyID, Arc<DecodingKey>
         .text()
         .await
         .map_err(|e| anyhow!("error while getting response as text: {}", e))?;
-    let JwkSet { keys } = serde_json::from_str(text.as_str())
-        .map_err(|e| anyhow!("error while parsing json: {}", e))?;
+    parse_jwks(&text)
+}
+
+pub fn parse_jwks(text: &str) -> Result<DashMap<KeyID, Arc<DecodingKey>>> {
+    let JwkSet { keys } =
+        serde_json::from_str(text).map_err(|e| anyhow!("error while parsing json: {}", e))?;
     let key_map: DashMap<KeyID, Arc<DecodingKey>> = keys
         .into_iter()
         .filter_map(
@@ -78,20 +79,6 @@ pub fn start_jwk_refresh_loop(issuer: &str, jwk_url: &str, refresh_interval: Dur
 }
 
 pub fn cached_decoding_key(issuer: &String, kid: &String) -> Result<Arc<DecodingKey>> {
-    let test_jwk = r#"{
-        "kid": "test_jwk",
-        "kty": "RSA",
-        "alg": "RS256",
-        "use": "sig",
-        "n": "6S7asUuzq5Q_3U9rbs-PkDVIdjgmtgWreG5qWPsC9xXZKiMV1AiV9LXyqQsAYpCqEDM3XbfmZqGb48yLhb_XqZaKgSYaC_h2DjM7lgrIQAp9902Rr8fUmLN2ivr5tnLxUUOnMOc2SQtr9dgzTONYW5Zu3PwyvAWk5D6ueIUhLtYzpcB-etoNdL3Ir2746KIy_VUsDwAM7dhrqSK8U2xFCGlau4ikOTtvzDownAMHMrfE7q1B6WZQDAQlBmxRQsyKln5DIsKv6xauNsHRgBAKctUxZG8M4QJIx3S6Aughd3RZC4Ca5Ae9fd8L8mlNYBCrQhOZ7dS0f4at4arlLcajtw",
-        "e": "AQAB"
-    }"#;
-    if kid.eq("test_jwk") {
-        let key = serde_json::from_str::<Jwk>(test_jwk)
-            .map_err(|e| anyhow!("error while parsing json: {}", e))?;
-        let decoding_key = DecodingKey::from_jwk(&key)?;
-        return Ok(Arc::new(decoding_key));
-    }
     let key_set = DECODING_KEY_CACHE
         .get(issuer)
         .ok_or_else(|| anyhow!("unknown issuer: {}", issuer))?;
diff --git a/keyless/pepper/service/src/lib.rs b/keyless/pepper/service/src/lib.rs
index 8eb1953b4e1c1..0ac7f9510faef 100644
--- a/keyless/pepper/service/src/lib.rs
+++ b/keyless/pepper/service/src/lib.rs
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{
+    account_db::{init_account_db, ACCOUNT_RECOVERY_DB},
     account_managers::ACCOUNT_MANAGERS,
     vuf_keys::VUF_SK,
     ProcessingFailure::{BadRequest, InternalError},
@@ -9,7 +10,9 @@ use crate::{
 use aptos_crypto::asymmetric_encryption::{
     elgamal_curve25519_aes256_gcm::ElGamalCurve25519Aes256Gcm, AsymmetricEncryption,
 };
+use aptos_infallible::duration_since_epoch;
 use aptos_keyless_pepper_common::{
+    account_recovery_db::AccountRecoveryDbEntry,
     jwt::Claims,
     vuf::{
         self,
@@ -17,14 +20,15 @@ use aptos_keyless_pepper_common::{
         slip_10::{get_aptos_derivation_path, ExtendedPepper},
         VUF,
     },
-    PepperInput, PepperRequest, PepperRequestV1, PepperResponse, PepperResponseV1,
+    PepperInput, PepperRequest, PepperResponse, SignatureResponse,
 };
-use aptos_logger::info;
+use aptos_logger::{info, warn};
 use aptos_types::{
     account_address::AccountAddress,
     keyless::{Configuration, IdCommitment, KeylessPublicKey, OpenIdSig},
     transaction::authenticator::{AnyPublicKey, AuthenticationKey, EphemeralPublicKey},
 };
+use firestore::{async_trait, paths, struct_path::path};
 use jsonwebtoken::{Algorithm::RS256, Validation};
 use rand::thread_rng;
 use serde::{Deserialize, Serialize};
@@ -32,6 +36,7 @@ use std::time::{SystemTime, UNIX_EPOCH};
 use uuid::Uuid;
 
 pub mod about;
+pub mod account_db;
 pub mod account_managers;
 pub mod jwk;
 pub mod metrics;
@@ -48,63 +53,83 @@ pub enum ProcessingFailure {
 
 pub const DEFAULT_DERIVATION_PATH: &str = "m/44'/637'/0'/0'/0'";
 
-pub fn process_v0(request: PepperRequest) -> Result<PepperResponse, ProcessingFailure> {
-    let session_id = Uuid::new_v4();
-    let PepperRequest {
-        jwt,
-        epk,
-        exp_date_secs,
-        epk_blinder,
-        uid_key,
-        derivation_path,
-    } = request;
-
-    let (pepper_base, pepper, address) = process_common(
-        &session_id,
-        jwt,
-        epk,
-        exp_date_secs,
-        epk_blinder,
-        uid_key,
-        derivation_path,
-        false,
-        None,
-    )?;
-
-    Ok(PepperResponse {
-        signature: pepper_base,
-        pepper,
-        address: address.to_vec(),
-    })
+#[async_trait]
+pub trait HandlerTrait<REQ, RES>: Send + Sync {
+    async fn handle(&self, request: REQ) -> Result<RES, ProcessingFailure>;
 }
 
-pub fn process_v1(request: PepperRequestV1) -> Result<PepperResponseV1, ProcessingFailure> {
-    let session_id = Uuid::new_v4();
-    let PepperRequestV1 {
-        jwt,
-        epk,
-        exp_date_secs,
-        epk_blinder,
-        uid_key,
-        aud,
-    } = request;
-    let (pepper_base_encrypted, _pepper_encrypted, _address) = process_common(
-        &session_id,
-        jwt,
-        epk,
-        exp_date_secs,
-        epk_blinder,
-        uid_key,
-        None,
-        true,
-        aud,
-    )?;
-    Ok(PepperResponseV1 {
-        signature_encrypted: pepper_base_encrypted,
-    })
+pub struct V0FetchHandler;
+
+#[async_trait]
+impl HandlerTrait<PepperRequest, PepperResponse> for V0FetchHandler {
+    async fn handle(&self, request: PepperRequest) -> Result<PepperResponse, ProcessingFailure> {
+        let session_id = Uuid::new_v4();
+        let PepperRequest {
+            jwt,
+            epk,
+            exp_date_secs,
+            epk_blinder,
+            uid_key,
+            derivation_path,
+        } = request;
+
+        let (_pepper_base, pepper, address) = process_common(
+            &session_id,
+            jwt,
+            epk,
+            exp_date_secs,
+            epk_blinder,
+            uid_key,
+            derivation_path,
+            false,
+            None,
+            true,
+        )
+        .await?;
+
+        Ok(PepperResponse {
+            pepper,
+            address: address.to_vec(),
+        })
+    }
+}
+
+pub struct V0SignatureHandler;
+
+#[async_trait]
+impl HandlerTrait<PepperRequest, SignatureResponse> for V0SignatureHandler {
+    async fn handle(&self, request: PepperRequest) -> Result<SignatureResponse, ProcessingFailure> {
+        let session_id = Uuid::new_v4();
+        let PepperRequest {
+            jwt,
+            epk,
+            exp_date_secs,
+            epk_blinder,
+            uid_key,
+            derivation_path,
+        } = request;
+
+        let (pepper_base, _pepper, _address) = process_common(
+            &session_id,
+            jwt,
+            epk,
+            exp_date_secs,
+            epk_blinder,
+            uid_key,
+            derivation_path,
+            false,
+            None,
+            false,
+        )
+        .await?;
+
+        Ok(SignatureResponse {
+            signature: pepper_base,
+        })
+    }
 }
 
-fn process_common(
+async fn process_common(
     session_id: &Uuid,
     jwt: String,
     epk: EphemeralPublicKey,
@@ -114,6 +139,7 @@ fn process_common(
     derivation_path: Option<String>,
     encrypts_pepper: bool,
     aud: Option<String>,
+    should_update_account_recovery_db: bool,
 ) -> Result<(Vec<u8>, Vec<u8>, AccountAddress), ProcessingFailure> {
     let config = Configuration::new_for_devnet();
 
@@ -194,11 +220,13 @@ fn process_common(
     ) // Signature verification happens here.
     .map_err(|e| BadRequest(format!("JWT signature verification failed: {e}")))?;
 
-    // If the pepper request is at V1, is from an account manager, and has a target aud specified, compute the pepper for the target aud.
+    // If the pepper request is is from an account manager, and has a target aud specified, compute the pepper for the target aud.
+    let mut aud_overridden = false;
     let mut final_aud = claims.claims.aud.clone();
     if ACCOUNT_MANAGERS.contains(&(claims.claims.iss.clone(), claims.claims.aud.clone())) {
         if let Some(aud) = aud {
             final_aud = aud;
+            aud_overridden = true;
         }
     };
 
@@ -208,14 +236,21 @@ fn process_common(
         uid_val,
         aud: final_aud,
     };
-    info!(
-        session_id = session_id,
-        iss = input.iss,
-        aud = input.aud,
-        uid_val = input.uid_val,
-        uid_key = input.uid_key,
-        "PepperInput is available."
-    );
+
+    if !aud_overridden {
+        info!(
+            session_id = session_id,
+            iss = input.iss.clone(),
+            aud = input.aud.clone(),
+            uid_val = input.uid_val.clone(),
+            uid_key = input.uid_key.clone(),
+            "PepperInput is available."
+        );
+        if should_update_account_recovery_db {
+            update_account_recovery_db(&input).await?;
+        }
+    }
+
     let input_bytes = bcs::to_bytes(&input).unwrap();
     let (pepper_base, vuf_proof) = vuf::bls12381_g1_bls::Bls12381G1Bls::eval(&VUF_SK, &input_bytes)
         .map_err(|e| InternalError(format!("bls12381_g1_bls eval error: {e}")))?;
@@ -268,3 +303,80 @@ fn process_common(
         Ok((pepper_base, derived_pepper.to_bytes().to_vec(), address))
     }
 }
+
+/// Save a pepper request into the account recovery DB.
+///
+/// TODO: once the account recovery DB flow is verified working e2e, DB error should not be ignored.
+async fn update_account_recovery_db(input: &PepperInput) -> Result<(), ProcessingFailure> {
+    match ACCOUNT_RECOVERY_DB.get_or_init(init_account_db).await {
+        Ok(db) => {
+            let entry = AccountRecoveryDbEntry {
+                iss: input.iss.clone(),
+                aud: input.aud.clone(),
+                uid_key: input.uid_key.clone(),
+                uid_val: input.uid_val.clone(),
+                first_request_unix_ms_minus_1q: None,
+                last_request_unix_ms: None,
+                num_requests: None,
+            };
+            let doc_id = entry.document_id();
+            let now_unix_ms = duration_since_epoch().as_millis() as i64;
+
+            // The update transactions use the following strategy.
+            // 1. If not exists, create the document for the user identifier `(iss, aud, uid_key, uid_val)`.
+            //    but leave counter/time fields unspecified.
+            // 2. `num_requests += 1`, assuming the default value is 0.
+            // 3. `last_request_unix_ms = max(last_request_unix_ms, now)`, assuming the default value is 0.
+            // 4. `first_request_unix_ms = min(first_request_unix_ms, now)`, assuming the default value is +inf.
+            //
+            // This strategy is preferred because all the operations can be made server-side,
+            // which means the txn should require only 1 RTT,
+            // better than using read-compute-write pattern that requires 2 RTTs.
+            //
+            // This strategy does not work directly:
+            // in firestore, the default value of a number field is 0, and we do not know a way to customize it for op 4.
+            // The workaround here is apply an offset so 0 becomes a legitimate default value.
+            // So we work with `first_request_unix_ms_minus_1q` instead,
+            // which is defined as `first_request_unix_ms - 1_000_000_000_000_000`,
+            // where 1_000_000_000_000_000 milliseconds is roughly 31710 years.
+
+            let mut txn = db
+                .begin_transaction()
+                .await
+                .map_err(|e| InternalError(format!("begin_transaction error: {e}")))?;
+            db.fluent()
+                .update()
+                .fields(paths!(AccountRecoveryDbEntry::{iss, aud, uid_key, uid_val}))
+                .in_col("accounts")
+                .document_id(&doc_id)
+                .object(&entry) // op 1
+                .transforms(|builder| {
+                    builder.fields([
+                        builder
+                            .field(path!(AccountRecoveryDbEntry::num_requests))
+                            .increment(1), // op 2
+                        builder
+                            .field(path!(AccountRecoveryDbEntry::last_request_unix_ms))
+                            .maximum(now_unix_ms), // op 3
+                        builder
+                            .field(path!(
+                                AccountRecoveryDbEntry::first_request_unix_ms_minus_1q
+                            ))
+                            .minimum(now_unix_ms - 1_000_000_000_000_000), // op 4
+                    ])
+                })
+                .add_to_transaction(&mut txn)
+                .map_err(|e| InternalError(format!("add_to_transaction error: {e}")))?;
+            let txn_result = txn.commit().await;
+
+            if let Err(e) = txn_result {
+                warn!("ACCOUNT_RECOVERY_DB operation failed: {e}");
+            }
+            Ok(())
+        },
+        Err(e) => {
+            warn!("ACCOUNT_RECOVERY_DB client failed to init: {e}");
+            Ok(())
+        },
+    }
+}
diff --git a/keyless/pepper/service/src/main.rs b/keyless/pepper/service/src/main.rs
index fa1dc1a7e038f..51661e088242f 100644
--- a/keyless/pepper/service/src/main.rs
+++ b/keyless/pepper/service/src/main.rs
@@ -4,15 +4,17 @@
 use aptos_keyless_pepper_common::BadPepperRequestError;
 use aptos_keyless_pepper_service::{
     about::ABOUT_JSON,
+    account_db::{init_account_db, ACCOUNT_RECOVERY_DB},
     account_managers::ACCOUNT_MANAGERS,
-    jwk,
+    jwk::{self, parse_jwks, DECODING_KEY_CACHE},
     metrics::start_metric_server,
-    process_v0, process_v1,
     vuf_keys::{PEPPER_VUF_VERIFICATION_KEY_JSON, VUF_SK},
-    ProcessingFailure,
+    HandlerTrait,
     ProcessingFailure::{BadRequest, InternalError},
+    V0FetchHandler, V0SignatureHandler,
 };
-use aptos_logger::info;
+use aptos_logger::{error, info};
+use aptos_types::keyless::test_utils::get_sample_iss;
 use hyper::{
     header::{
         ACCESS_CONTROL_ALLOW_CREDENTIALS, ACCESS_CONTROL_ALLOW_HEADERS,
@@ -35,13 +37,15 @@ async fn handle_request(req: Request<Body>) -> Result<Response<Body>, Infallible
         (&Method::GET, "/about") => {
             build_response(origin, StatusCode::OK, ABOUT_JSON.deref().clone())
         },
-        (&Method::GET, "/v0/vuf-pub-key") | (&Method::GET, "/v1/vuf-pub-key") => build_response(
+        (&Method::GET, "/v0/vuf-pub-key") => build_response(
             origin,
             StatusCode::OK,
             PEPPER_VUF_VERIFICATION_KEY_JSON.deref().clone(),
         ),
-        (&Method::POST, "/v0/fetch") => handle_fetch_common(origin, req, process_v0).await,
-        (&Method::POST, "/v1/fetch") => handle_fetch_common(origin, req, process_v1).await,
+        (&Method::POST, "/v0/signature") => {
+            generate_response(origin, req, &V0SignatureHandler).await
+        },
+        (&Method::POST, "/v0/fetch") => generate_response(origin, req, &V0FetchHandler).await,
         (&Method::OPTIONS, _) => hyper::Response::builder()
             .status(StatusCode::OK)
             .header(ACCESS_CONTROL_ALLOW_ORIGIN, origin)
@@ -64,7 +68,9 @@ async fn main() {
     // Trigger private key loading.
     let _ = VUF_SK.deref();
     let _ = ACCOUNT_MANAGERS.deref();
-
+    {
+        let _db = ACCOUNT_RECOVERY_DB.get_or_init(init_account_db).await;
+    }
     aptos_logger::Logger::new().init();
     start_metric_server();
 
@@ -75,14 +81,15 @@ async fn main() {
         Duration::from_secs(10),
     );
     jwk::start_jwk_refresh_loop(
-        "https://www.facebook.com",
-        "https://www.facebook.com/.well-known/oauth/openid/jwks",
+        "https://appleid.apple.com",
+        "https://appleid.apple.com/auth/keys",
         Duration::from_secs(10),
     );
-    jwk::start_jwk_refresh_loop(
-        "https://id.twitch.tv/oauth2",
-        "https://id.twitch.tv/oauth2/keys",
-        Duration::from_secs(10),
+
+    let test_jwk = include_str!("../../../../types/src/jwks/rsa/secure_test_jwk.json");
+    DECODING_KEY_CACHE.insert(
+        get_sample_iss(),
+        parse_jwks(test_jwk).expect("test jwk should parse"),
     );
 
     let addr = SocketAddr::from(([0, 0, 0, 0], 8000));
@@ -97,41 +104,57 @@ async fn main() {
     }
 }
 
-async fn handle_fetch_common<PREQ, PRES>(
+/// Feed a request into a handler and wrap the output as an HTTP response.
+async fn generate_response<PREQ, PRES, HDLR>(
     origin: String,
     req: Request<Body>,
-    process_func: fn(PREQ) -> Result<PRES, ProcessingFailure>,
+    handler: &HDLR,
 ) -> Response<Body>
 where
     PREQ: Debug + Serialize + DeserializeOwned,
     PRES: Debug + Serialize,
+    HDLR: HandlerTrait<PREQ, PRES> + Send + Sync,
 {
     let body = req.into_body();
     let body_bytes = hyper::body::to_bytes(body).await.unwrap_or_default();
     let pepper_request = serde_json::from_slice::<PREQ>(&body_bytes);
-    info!("pepper_request={:?}", pepper_request);
-    let pepper_response = pepper_request.map(process_func);
-    info!("pepper_response={:?}", pepper_response);
-    let (status_code, body_json) = match pepper_response {
-        Ok(Ok(pepper_response)) => (
-            StatusCode::OK,
-            serde_json::to_string_pretty(&pepper_response).unwrap(),
-        ),
-        Ok(Err(BadRequest(err))) => (
-            StatusCode::BAD_REQUEST,
-            serde_json::to_string_pretty(&BadPepperRequestError {
-                message: err.to_string(),
-            })
-            .unwrap(),
-        ),
-        Ok(Err(InternalError(_))) => (StatusCode::INTERNAL_SERVER_ERROR, String::new()),
-        Err(err) => (
-            StatusCode::BAD_REQUEST,
-            serde_json::to_string_pretty(&BadPepperRequestError {
-                message: err.to_string(),
-            })
-            .unwrap(),
-        ),
+    let (status_code, body_json) = match pepper_request {
+        Ok(request) => {
+            let pepper_response = handler.handle(request).await;
+            match pepper_response {
+                Ok(pepper_response) => {
+                    info!("Request processed normally.");
+                    (
+                        StatusCode::OK,
+                        serde_json::to_string_pretty(&pepper_response).unwrap(),
+                    )
+                },
+                Err(BadRequest(err)) => {
+                    info!("Processing failed with bad request: {err}");
+                    (
+                        StatusCode::BAD_REQUEST,
+                        serde_json::to_string_pretty(&BadPepperRequestError {
+                            message: err.to_string(),
+                        })
+                        .unwrap(),
+                    )
+                },
+                Err(InternalError(e)) => {
+                    error!("Processing failed with internal error: {e}");
+                    (StatusCode::INTERNAL_SERVER_ERROR, String::new())
+                },
+            }
+        },
+        Err(err) => {
+            error!("Processing did not start due to bad request: {err}");
+            (
+                StatusCode::BAD_REQUEST,
+                serde_json::to_string_pretty(&BadPepperRequestError {
+                    message: err.to_string(),
+                })
+                .unwrap(),
+            )
+        },
     };
 
     build_response(origin, status_code, body_json)
diff --git a/mempool/Cargo.toml b/mempool/Cargo.toml
index f8710ed3168fe..dede31a831943 100644
--- a/mempool/Cargo.toml
+++ b/mempool/Cargo.toml
@@ -20,7 +20,6 @@ aptos-config = { workspace = true }
 aptos-consensus-types = { workspace = true }
 aptos-crypto = { workspace = true }
 aptos-event-notifications = { workspace = true }
-aptos-experimental-runtimes = { workspace = true }
 aptos-infallible = { workspace = true }
 aptos-logger = { workspace = true }
 aptos-mempool-notifications = { workspace = true }
diff --git a/mempool/src/core_mempool/index.rs b/mempool/src/core_mempool/index.rs
index 22e46ff1d1277..959f3ca091120 100644
--- a/mempool/src/core_mempool/index.rs
+++ b/mempool/src/core_mempool/index.rs
@@ -7,7 +7,7 @@ use crate::core_mempool::transaction::{MempoolTransaction, SequenceInfo, Timelin
 use crate::{
     counters,
     logging::{LogEntry, LogSchema},
-    shared_mempool::types::MultiBucketTimelineIndexIds,
+    shared_mempool::types::{MultiBucketTimelineIndexIds, TimelineIndexIdentifier},
 };
 use aptos_consensus_types::common::TransactionSummary;
 use aptos_crypto::HashValue;
@@ -17,9 +17,10 @@ use rand::seq::SliceRandom;
 use std::{
     cmp::Ordering,
     collections::{btree_set::Iter, BTreeMap, BTreeSet, HashMap},
+    hash::Hash,
     iter::Rev,
     ops::Bound,
-    time::{Duration, SystemTime},
+    time::{Duration, Instant, SystemTime},
 };
 
 pub type AccountTransactions = BTreeMap<u64, MempoolTransaction>;
@@ -59,6 +60,7 @@ impl PriorityIndex {
         OrderedQueueKey {
             gas_ranking_score: txn.ranking_score,
             expiration_time: txn.expiration_time,
+            insertion_time: txn.insertion_info.insertion_time,
             address: txn.get_sender(),
             sequence_number: txn.sequence_info,
             hash: txn.get_committed_hash(),
@@ -78,6 +80,7 @@ impl PriorityIndex {
 pub struct OrderedQueueKey {
     pub gas_ranking_score: u64,
     pub expiration_time: Duration,
+    pub insertion_time: SystemTime,
     pub address: AccountAddress,
     pub sequence_number: SequenceInfo,
     pub hash: HashValue,
@@ -95,7 +98,7 @@ impl Ord for OrderedQueueKey {
             Ordering::Equal => {},
             ordering => return ordering,
         }
-        match self.expiration_time.cmp(&other.expiration_time).reverse() {
+        match self.insertion_time.cmp(&other.insertion_time).reverse() {
             Ordering::Equal => {},
             ordering => return ordering,
         }
@@ -208,7 +211,7 @@ impl Ord for TTLOrderingKey {
 /// logical reference to transaction content in main storage.
 pub struct TimelineIndex {
     timeline_id: u64,
-    timeline: BTreeMap<u64, (AccountAddress, u64)>,
+    timeline: BTreeMap<u64, (AccountAddress, u64, Instant)>,
 }
 
 impl TimelineIndex {
@@ -221,20 +224,27 @@ impl TimelineIndex {
 
     /// Read all transactions from the timeline since <timeline_id>.
     /// At most `count` transactions will be returned.
+    /// If `before` is set, only transactions inserted before this time will be returned.
     pub(crate) fn read_timeline(
         &self,
         timeline_id: u64,
         count: usize,
+        before: Option<Instant>,
     ) -> Vec<(AccountAddress, u64)> {
         let mut batch = vec![];
-        for (_id, &(address, sequence_number)) in self
+        for (_id, &(address, sequence_number, insertion_time)) in self
             .timeline
             .range((Bound::Excluded(timeline_id), Bound::Unbounded))
         {
-            batch.push((address, sequence_number));
+            if let Some(before) = before {
+                if insertion_time >= before {
+                    break;
+                }
+            }
             if batch.len() == count {
                 break;
             }
+            batch.push((address, sequence_number));
         }
         batch
     }
@@ -243,8 +253,7 @@ impl TimelineIndex {
     pub(crate) fn timeline_range(&self, start_id: u64, end_id: u64) -> Vec<(AccountAddress, u64)> {
         self.timeline
             .range((Bound::Excluded(start_id), Bound::Included(end_id)))
-            .map(|(_idx, txn)| txn)
-            .cloned()
+            .map(|(_idx, &(address, sequence, _))| (address, sequence))
             .collect()
     }
 
@@ -254,6 +263,7 @@ impl TimelineIndex {
             (
                 txn.get_sender(),
                 txn.sequence_info.transaction_sequence_number,
+                Instant::now(),
             ),
         );
         txn.timeline_state = TimelineState::Ready(self.timeline_id);
@@ -310,6 +320,7 @@ impl MultiBucketTimelineIndex {
         &self,
         timeline_id: &MultiBucketTimelineIndexIds,
         count: usize,
+        before: Option<Instant>,
     ) -> Vec<Vec<(AccountAddress, u64)>> {
         assert!(timeline_id.id_per_bucket.len() == self.bucket_mins.len());
 
@@ -321,7 +332,7 @@ impl MultiBucketTimelineIndex {
             .zip(timeline_id.id_per_bucket.iter())
             .rev()
         {
-            let txns = timeline.read_timeline(timeline_id, count - added);
+            let txns = timeline.read_timeline(timeline_id, count - added, before);
             added += txns.len();
             returned.push(txns);
 
@@ -338,13 +349,18 @@ impl MultiBucketTimelineIndex {
     /// Read transactions from the timeline from `start_id` (exclusive) to `end_id` (inclusive).
     pub(crate) fn timeline_range(
         &self,
-        start_end_pairs: &Vec<(u64, u64)>,
+        start_end_pairs: HashMap<TimelineIndexIdentifier, (u64, u64)>,
     ) -> Vec<(AccountAddress, u64)> {
         assert_eq!(start_end_pairs.len(), self.timelines.len());
 
         let mut all_txns = vec![];
-        for (timeline, &(start_id, end_id)) in self.timelines.iter().zip(start_end_pairs.iter()) {
-            let mut txns = timeline.timeline_range(start_id, end_id);
+        for (timeline_index_identifier, (start_id, end_id)) in start_end_pairs {
+            let mut txns = self
+                .timelines
+                .get(timeline_index_identifier as usize)
+                .map_or_else(Vec::new, |timeline| {
+                    timeline.timeline_range(start_id, end_id)
+                });
             all_txns.append(&mut txns);
         }
         all_txns
diff --git a/mempool/src/core_mempool/mempool.rs b/mempool/src/core_mempool/mempool.rs
index 45e9810ebe074..bf6d52a462aa0 100644
--- a/mempool/src/core_mempool/mempool.rs
+++ b/mempool/src/core_mempool/mempool.rs
@@ -8,11 +8,14 @@ use crate::{
     core_mempool::{
         index::TxnPointer,
         transaction::{InsertionInfo, MempoolTransaction, TimelineState},
-        transaction_store::TransactionStore,
+        transaction_store::{sender_bucket, TransactionStore},
     },
     counters,
     logging::{LogEntry, LogSchema, TxnsLog},
-    shared_mempool::types::MultiBucketTimelineIndexIds,
+    network::BroadcastPeerPriority,
+    shared_mempool::types::{
+        MempoolSenderBucket, MultiBucketTimelineIndexIds, TimelineIndexIdentifier,
+    },
 };
 use aptos_config::config::NodeConfig;
 use aptos_consensus_types::common::{TransactionInProgress, TransactionSummary};
@@ -21,11 +24,11 @@ use aptos_logger::prelude::*;
 use aptos_types::{
     account_address::AccountAddress,
     mempool_status::{MempoolStatus, MempoolStatusCode},
-    transaction::SignedTransaction,
+    transaction::{use_case::UseCaseKey, SignedTransaction},
     vm_status::DiscardedVMStatus,
 };
 use std::{
-    collections::{BTreeMap, HashSet},
+    collections::{BTreeMap, HashMap, HashSet},
     sync::atomic::Ordering,
     time::{Duration, Instant, SystemTime},
 };
@@ -57,18 +60,19 @@ impl Mempool {
         &self,
         sender: &AccountAddress,
         sequence_number: u64,
+        tracked_use_case: Option<(UseCaseKey, &String)>,
         block_timestamp: Duration,
     ) {
         trace!(
             LogSchema::new(LogEntry::RemoveTxn).txns(TxnsLog::new_txn(*sender, sequence_number)),
             is_rejected = false
         );
-        self.log_commit_latency(*sender, sequence_number, block_timestamp);
+        self.log_commit_latency(*sender, sequence_number, tracked_use_case, block_timestamp);
         if let Some(ranking_score) = self.transactions.get_ranking_score(sender, sequence_number) {
             counters::core_mempool_txn_ranking_score(
                 counters::REMOVE_LABEL,
                 counters::COMMIT_ACCEPTED_LABEL,
-                self.transactions.get_bucket(ranking_score),
+                self.transactions.get_bucket(ranking_score, sender).as_str(),
                 ranking_score,
             );
         }
@@ -90,7 +94,7 @@ impl Mempool {
             counters::core_mempool_txn_ranking_score(
                 counters::REMOVE_LABEL,
                 reason_label,
-                self.transactions.get_bucket(ranking_score),
+                self.transactions.get_bucket(ranking_score, sender).as_str(),
                 ranking_score,
             );
         }
@@ -123,6 +127,7 @@ impl Mempool {
         insertion_info: &InsertionInfo,
         bucket: &str,
         stage: &'static str,
+        priority: &str,
     ) {
         if let Ok(time_delta) = SystemTime::now().duration_since(insertion_info.insertion_time) {
             counters::core_mempool_txn_commit_latency(
@@ -130,20 +135,28 @@ impl Mempool {
                 insertion_info.submitted_by_label(),
                 bucket,
                 time_delta,
+                priority,
             );
         }
     }
 
     fn log_consensus_pulled_latency(&self, account: AccountAddress, sequence_number: u64) {
-        if let Some((insertion_info, bucket)) = self
+        if let Some((insertion_info, bucket, priority)) = self
             .transactions
             .get_insertion_info_and_bucket(&account, sequence_number)
         {
             let prev_count = insertion_info
                 .consensus_pulled_counter
                 .fetch_add(1, Ordering::Relaxed);
-            Self::log_txn_latency(insertion_info, bucket, counters::CONSENSUS_PULLED_LABEL);
-            counters::CORE_MEMPOOL_TXN_CONSENSUS_PULLED.observe((prev_count + 1) as f64);
+            Self::log_txn_latency(
+                insertion_info,
+                bucket.as_str(),
+                counters::CONSENSUS_PULLED_LABEL,
+                priority.as_str(),
+            );
+            counters::CORE_MEMPOOL_TXN_CONSENSUS_PULLED_BY_BUCKET
+                .with_label_values(&[bucket.as_str()])
+                .observe((prev_count + 1) as f64);
         }
     }
 
@@ -153,15 +166,20 @@ impl Mempool {
         sequence_number: u64,
         stage: &'static str,
     ) {
-        if let Some((insertion_info, bucket)) = self
+        if let Some((insertion_info, bucket, priority)) = self
             .transactions
             .get_insertion_info_and_bucket(&account, sequence_number)
         {
-            Self::log_txn_latency(insertion_info, bucket, stage);
+            Self::log_txn_latency(insertion_info, bucket.as_str(), stage, priority.as_str());
         }
     }
 
-    fn log_commit_and_parked_latency(insertion_info: &InsertionInfo, bucket: &str) {
+    fn log_commit_and_parked_latency(
+        insertion_info: &InsertionInfo,
+        bucket: &str,
+        priority: &str,
+        tracked_use_case: Option<(UseCaseKey, &String)>,
+    ) {
         let parked_duration = if let Some(park_time) = insertion_info.park_time {
             let parked_duration = insertion_info
                 .ready_time
@@ -172,6 +190,7 @@ impl Mempool {
                 insertion_info.submitted_by_label(),
                 bucket,
                 parked_duration,
+                priority,
             );
             parked_duration
         } else {
@@ -188,7 +207,24 @@ impl Mempool {
                 insertion_info.submitted_by_label(),
                 bucket,
                 commit_minus_parked,
+                priority,
             );
+
+            if insertion_info.park_time.is_none() {
+                let use_case_label = tracked_use_case
+                    .as_ref()
+                    .map_or("entry_user_other", |(_, use_case_name)| {
+                        use_case_name.as_str()
+                    });
+
+                counters::TXN_E2E_USE_CASE_COMMIT_LATENCY
+                    .with_label_values(&[
+                        use_case_label,
+                        insertion_info.submitted_by_label(),
+                        bucket,
+                    ])
+                    .observe(commit_duration.as_secs_f64());
+            }
         }
     }
 
@@ -196,14 +232,25 @@ impl Mempool {
         &self,
         account: AccountAddress,
         sequence_number: u64,
+        tracked_use_case: Option<(UseCaseKey, &String)>,
         block_timestamp: Duration,
     ) {
-        if let Some((insertion_info, bucket)) = self
+        if let Some((insertion_info, bucket, priority)) = self
             .transactions
             .get_insertion_info_and_bucket(&account, sequence_number)
         {
-            Self::log_txn_latency(insertion_info, bucket, counters::COMMIT_ACCEPTED_LABEL);
-            Self::log_commit_and_parked_latency(insertion_info, bucket);
+            Self::log_txn_latency(
+                insertion_info,
+                bucket.as_str(),
+                counters::COMMIT_ACCEPTED_LABEL,
+                priority.as_str(),
+            );
+            Self::log_commit_and_parked_latency(
+                insertion_info,
+                bucket.as_str(),
+                priority.as_str(),
+                tracked_use_case,
+            );
 
             let insertion_timestamp =
                 aptos_infallible::duration_since_epoch_at(&insertion_info.insertion_time);
@@ -211,8 +258,9 @@ impl Mempool {
                 counters::core_mempool_txn_commit_latency(
                     counters::COMMIT_ACCEPTED_BLOCK_LABEL,
                     insertion_info.submitted_by_label(),
-                    bucket,
+                    bucket.as_str(),
                     insertion_to_block,
+                    priority.to_string().as_str(),
                 );
             }
         }
@@ -231,6 +279,11 @@ impl Mempool {
         db_sequence_number: u64,
         timeline_state: TimelineState,
         client_submitted: bool,
+        // The time at which the transaction was inserted into the mempool of the
+        // downstream node (sender of the mempool transaction) in millis since epoch
+        ready_time_at_sender: Option<u64>,
+        // The prority of this node for the peer that sent the transaction
+        priority: Option<BroadcastPeerPriority>,
     ) -> MempoolStatus {
         trace!(
             LogSchema::new(LogEntry::AddTxn)
@@ -251,21 +304,50 @@ impl Mempool {
         let expiration_time =
             aptos_infallible::duration_since_epoch_at(&now) + self.system_transaction_timeout;
 
+        let sender = txn.sender();
         let txn_info = MempoolTransaction::new(
-            txn,
+            txn.clone(),
             expiration_time,
             ranking_score,
             timeline_state,
             db_sequence_number,
             now,
             client_submitted,
+            priority.clone(),
         );
 
+        let submitted_by_label = txn_info.insertion_info.submitted_by_label();
         let status = self.transactions.insert(txn_info);
+        let now = aptos_infallible::duration_since_epoch().as_millis() as u64;
+
+        if status.code == MempoolStatusCode::Accepted {
+            counters::SENDER_BUCKET_FREQUENCIES
+                .with_label_values(&[sender_bucket(
+                    &sender,
+                    self.transactions.num_sender_buckets(),
+                )
+                .to_string()
+                .as_str()])
+                .inc();
+            if let Some(ready_time_at_sender) = ready_time_at_sender {
+                let bucket = self.transactions.get_bucket(ranking_score, &sender);
+                counters::core_mempool_txn_commit_latency(
+                    counters::BROADCAST_RECEIVED_LABEL,
+                    submitted_by_label,
+                    bucket.as_str(),
+                    Duration::from_millis(now.saturating_sub(ready_time_at_sender)),
+                    priority
+                        .map_or_else(|| "Unknown".to_string(), |priority| priority.to_string())
+                        .as_str(),
+                );
+            }
+        }
         counters::core_mempool_txn_ranking_score(
             counters::INSERT_LABEL,
             status.code.to_string().as_str(),
-            self.transactions.get_bucket(ranking_score),
+            self.transactions
+                .get_bucket(ranking_score, &sender)
+                .as_str(),
             ranking_score,
         );
         status
@@ -352,7 +434,7 @@ impl Mempool {
                 // check if we can now include some transactions
                 // that were skipped before for given account
                 let mut skipped_txn = (txn.address, tx_seq + 1);
-                while skipped.contains(&skipped_txn) {
+                while skipped.remove(&skipped_txn) {
                     inserted.insert(skipped_txn);
                     result.push(skipped_txn);
                     if (result.len() as u64) == max_txns {
@@ -388,7 +470,9 @@ impl Mempool {
                 counters::core_mempool_txn_ranking_score(
                     counters::CONSENSUS_PULLED_LABEL,
                     counters::CONSENSUS_PULLED_LABEL,
-                    self.transactions.get_bucket(ranking_score),
+                    self.transactions
+                        .get_bucket(ranking_score, &sender)
+                        .as_str(),
                     ranking_score,
                 );
             }
@@ -454,21 +538,50 @@ impl Mempool {
         self.transactions.gc_by_expiration_time(block_time);
     }
 
-    /// Returns block of transactions and new last_timeline_id.
+    /// Returns block of transactions and new last_timeline_id. For each transaction, the output includes
+    /// the transaction ready time in millis since epoch
     pub(crate) fn read_timeline(
         &self,
+        sender_bucket: MempoolSenderBucket,
         timeline_id: &MultiBucketTimelineIndexIds,
         count: usize,
-    ) -> (Vec<SignedTransaction>, MultiBucketTimelineIndexIds) {
-        self.transactions.read_timeline(timeline_id, count)
+        before: Option<Instant>,
+        priority_of_receiver: BroadcastPeerPriority,
+    ) -> (Vec<(SignedTransaction, u64)>, MultiBucketTimelineIndexIds) {
+        self.transactions.read_timeline(
+            sender_bucket,
+            timeline_id,
+            count,
+            before,
+            priority_of_receiver,
+        )
     }
 
-    /// Read transactions from timeline from `start_id` (exclusive) to `end_id` (inclusive).
+    /// Read transactions from timeline from `start_id` (exclusive) to `end_id` (inclusive),
+    /// along with their ready times in millis since poch
     pub(crate) fn timeline_range(
         &self,
-        start_end_pairs: &Vec<(u64, u64)>,
-    ) -> Vec<SignedTransaction> {
-        self.transactions.timeline_range(start_end_pairs)
+        sender_bucket: MempoolSenderBucket,
+        start_end_pairs: HashMap<TimelineIndexIdentifier, (u64, u64)>,
+    ) -> Vec<(SignedTransaction, u64)> {
+        self.transactions
+            .timeline_range(sender_bucket, start_end_pairs)
+    }
+
+    pub(crate) fn timeline_range_of_message(
+        &self,
+        sender_start_end_pairs: HashMap<
+            MempoolSenderBucket,
+            HashMap<TimelineIndexIdentifier, (u64, u64)>,
+        >,
+    ) -> Vec<(SignedTransaction, u64)> {
+        sender_start_end_pairs
+            .iter()
+            .flat_map(|(sender_bucket, start_end_pairs)| {
+                self.transactions
+                    .timeline_range(*sender_bucket, start_end_pairs.clone())
+            })
+            .collect()
     }
 
     pub fn gen_snapshot(&self) -> TxnsLog {
diff --git a/mempool/src/core_mempool/mod.rs b/mempool/src/core_mempool/mod.rs
index 0ee61b3aa7acb..df324a8dfa5a5 100644
--- a/mempool/src/core_mempool/mod.rs
+++ b/mempool/src/core_mempool/mod.rs
@@ -4,12 +4,15 @@
 
 mod index;
 mod mempool;
-mod transaction;
+pub mod transaction;
 mod transaction_store;
 
-#[cfg(test)]
-pub use self::transaction::{MempoolTransaction, SubmittedBy};
 pub use self::{
     mempool::Mempool as CoreMempool, transaction::TimelineState,
     transaction_store::TXN_INDEX_ESTIMATED_BYTES,
 };
+#[cfg(test)]
+pub use self::{
+    transaction::{MempoolTransaction, SubmittedBy},
+    transaction_store::sender_bucket,
+};
diff --git a/mempool/src/core_mempool/transaction.rs b/mempool/src/core_mempool/transaction.rs
index 703722936eb57..6e1434dafadf4 100644
--- a/mempool/src/core_mempool/transaction.rs
+++ b/mempool/src/core_mempool/transaction.rs
@@ -2,7 +2,7 @@
 // Parts of the project are originally copyright © Meta Platforms, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::{core_mempool::TXN_INDEX_ESTIMATED_BYTES, counters};
+use crate::{core_mempool::TXN_INDEX_ESTIMATED_BYTES, counters, network::BroadcastPeerPriority};
 use aptos_crypto::HashValue;
 use aptos_types::{account_address::AccountAddress, transaction::SignedTransaction};
 use serde::{Deserialize, Serialize};
@@ -25,6 +25,8 @@ pub struct MempoolTransaction {
     pub sequence_info: SequenceInfo,
     pub insertion_info: InsertionInfo,
     pub was_parked: bool,
+    // The priority of this node for the sender of this transaction.
+    pub priority_of_sender: Option<BroadcastPeerPriority>,
 }
 
 impl MempoolTransaction {
@@ -36,6 +38,7 @@ impl MempoolTransaction {
         seqno: u64,
         insertion_time: SystemTime,
         client_submitted: bool,
+        priority_of_sender: Option<BroadcastPeerPriority>,
     ) -> Self {
         Self {
             sequence_info: SequenceInfo {
@@ -48,6 +51,7 @@ impl MempoolTransaction {
             timeline_state,
             insertion_info: InsertionInfo::new(insertion_time, client_submitted, timeline_state),
             was_parked: false,
+            priority_of_sender,
         }
     }
 
@@ -150,7 +154,10 @@ impl InsertionInfo {
 
 #[cfg(test)]
 mod test {
-    use crate::core_mempool::{MempoolTransaction, TimelineState};
+    use crate::{
+        core_mempool::{MempoolTransaction, TimelineState},
+        network::BroadcastPeerPriority,
+    };
     use aptos_crypto::{ed25519::Ed25519PrivateKey, PrivateKey, SigningKey, Uniform};
     use aptos_types::{
         account_address::AccountAddress,
@@ -178,6 +185,7 @@ mod test {
             0,
             SystemTime::now(),
             false,
+            Some(BroadcastPeerPriority::Primary),
         )
     }
 
diff --git a/mempool/src/core_mempool/transaction_store.rs b/mempool/src/core_mempool/transaction_store.rs
index 399cb641fb4de..6f7b1d6547b71 100644
--- a/mempool/src/core_mempool/transaction_store.rs
+++ b/mempool/src/core_mempool/transaction_store.rs
@@ -11,10 +11,12 @@ use crate::{
         mempool::Mempool,
         transaction::{InsertionInfo, MempoolTransaction, TimelineState},
     },
-    counters,
-    counters::{BROADCAST_BATCHED_LABEL, BROADCAST_READY_LABEL, CONSENSUS_READY_LABEL},
+    counters::{self, BROADCAST_BATCHED_LABEL, BROADCAST_READY_LABEL, CONSENSUS_READY_LABEL},
     logging::{LogEntry, LogEvent, LogSchema, TxnsLog},
-    shared_mempool::types::MultiBucketTimelineIndexIds,
+    network::BroadcastPeerPriority,
+    shared_mempool::types::{
+        MempoolSenderBucket, MultiBucketTimelineIndexIds, TimelineIndexIdentifier,
+    },
 };
 use aptos_config::config::MempoolConfig;
 use aptos_crypto::HashValue;
@@ -29,7 +31,7 @@ use std::{
     collections::HashMap,
     mem::size_of,
     ops::Bound,
-    time::{Duration, SystemTime},
+    time::{Duration, Instant, SystemTime},
 };
 
 /// Estimated per-txn overhead of indexes. Needs to be updated if additional indexes are added.
@@ -38,6 +40,13 @@ pub const TXN_INDEX_ESTIMATED_BYTES: usize = size_of::<crate::core_mempool::inde
     + (size_of::<u64>() * 3 + size_of::<AccountAddress>()) // timeline_index
     + (size_of::<HashValue>() + size_of::<u64>() + size_of::<AccountAddress>()); // hash_index
 
+pub fn sender_bucket(
+    address: &AccountAddress,
+    num_sender_buckets: MempoolSenderBucket,
+) -> MempoolSenderBucket {
+    address.as_ref()[address.as_ref().len() - 1] as MempoolSenderBucket % num_sender_buckets
+}
+
 /// TransactionStore is in-memory storage for all transactions in mempool.
 pub struct TransactionStore {
     // main DS
@@ -54,8 +63,12 @@ pub struct TransactionStore {
     // we keep it separate from `expiration_time_index` so Mempool can't be clogged
     //  by old transactions even if it hasn't received commit callbacks for a while
     system_ttl_index: TTLIndex,
-    // Broadcast-ready transactions, with a timeline per bucket.
-    timeline_index: MultiBucketTimelineIndex,
+    // Broadcast-ready transactions.
+    // For each sender bucket, we maintain a timeline per txn fee range.
+    timeline_index: HashMap<MempoolSenderBucket, MultiBucketTimelineIndex>,
+    // We divide the senders into buckets and maintain a separate set of timelines for each sender bucket.
+    // This is the number of sender buckets.
+    num_sender_buckets: MempoolSenderBucket,
     // keeps track of "non-ready" txns (transactions that can't be included in next block)
     parking_lot_index: ParkingLotIndex,
     // Index for looking up transaction by hash.
@@ -80,6 +93,13 @@ pub struct TransactionStore {
 
 impl TransactionStore {
     pub(crate) fn new(config: &MempoolConfig) -> Self {
+        let mut timeline_index = HashMap::new();
+        for sender_bucket in 0..config.num_sender_buckets {
+            timeline_index.insert(
+                sender_bucket,
+                MultiBucketTimelineIndex::new(config.broadcast_buckets.clone()).unwrap(),
+            );
+        }
         Self {
             // main DS
             transactions: HashMap::new(),
@@ -91,8 +111,8 @@ impl TransactionStore {
                 Duration::from_secs(t.txn.expiration_timestamp_secs())
             })),
             priority_index: PriorityIndex::new(),
-            timeline_index: MultiBucketTimelineIndex::new(config.broadcast_buckets.clone())
-                .unwrap(),
+            timeline_index,
+            num_sender_buckets: config.num_sender_buckets,
             parking_lot_index: ParkingLotIndex::new(),
             hash_index: HashMap::new(),
             // estimated size in bytes
@@ -156,9 +176,15 @@ impl TransactionStore {
         &self,
         address: &AccountAddress,
         sequence_number: u64,
-    ) -> Option<(&InsertionInfo, &str)> {
+    ) -> Option<(&InsertionInfo, String, String)> {
         if let Some(txn) = self.get_mempool_txn(address, sequence_number) {
-            return Some((&txn.insertion_info, self.get_bucket(txn.ranking_score)));
+            return Some((
+                &txn.insertion_info,
+                self.get_bucket(txn.ranking_score, address),
+                txn.priority_of_sender
+                    .clone()
+                    .map_or_else(|| "Unknown".to_string(), |priority| priority.to_string()),
+            ));
         }
         None
     }
@@ -175,14 +201,25 @@ impl TransactionStore {
     }
 
     #[inline]
-    pub(crate) fn get_bucket(&self, ranking_score: u64) -> &str {
-        self.timeline_index.get_bucket(ranking_score)
+    pub(crate) fn get_bucket(&self, ranking_score: u64, sender: &AccountAddress) -> String {
+        let sender_bucket = sender_bucket(sender, self.num_sender_buckets);
+        let bucket = self
+            .timeline_index
+            .get(&sender_bucket)
+            .unwrap()
+            .get_bucket(ranking_score)
+            .to_string();
+        format!("{}_{}", sender_bucket, bucket)
     }
 
     pub(crate) fn get_sequence_number(&self, address: &AccountAddress) -> Option<&u64> {
         self.sequence_numbers.get(address)
     }
 
+    pub(crate) fn num_sender_buckets(&self) -> MempoolSenderBucket {
+        self.num_sender_buckets
+    }
+
     /// Insert transaction into TransactionStore. Performs validation checks and updates indexes.
     pub(crate) fn insert(&mut self, txn: MempoolTransaction) -> MempoolStatus {
         let address = txn.get_sender();
@@ -288,9 +325,22 @@ impl TransactionStore {
         );
         counters::core_mempool_index_size(
             counters::TIMELINE_INDEX_LABEL,
-            self.timeline_index.size(),
+            self.timeline_index
+                .values()
+                .map(|timelines| timelines.size())
+                .sum(),
         );
-        counters::core_mempool_timeline_index_size(&self.timeline_index.get_sizes());
+
+        let mut bucket_min_size_pairs = vec![];
+        for (sender_bucket, timelines) in self.timeline_index.iter() {
+            for (timeline_index_identifier, size) in timelines.get_sizes() {
+                bucket_min_size_pairs.push((
+                    format!("{}_{}", sender_bucket, timeline_index_identifier),
+                    size,
+                ));
+            }
+        }
+        counters::core_mempool_timeline_index_size(bucket_min_size_pairs);
         counters::core_mempool_index_size(
             counters::TRANSACTION_HASH_INDEX_LABEL,
             self.hash_index.len(),
@@ -362,6 +412,7 @@ impl TransactionStore {
         bucket: &str,
         insertion_info: &mut InsertionInfo,
         broadcast_ready: bool,
+        priority: &str,
     ) {
         insertion_info.ready_time = SystemTime::now();
         if let Ok(time_delta) = SystemTime::now().duration_since(insertion_info.insertion_time) {
@@ -372,12 +423,14 @@ impl TransactionStore {
                     submitted_by,
                     bucket,
                     time_delta,
+                    priority,
                 );
                 counters::core_mempool_txn_commit_latency(
                     BROADCAST_READY_LABEL,
                     submitted_by,
                     bucket,
                     time_delta,
+                    priority,
                 );
             } else {
                 counters::core_mempool_txn_commit_latency(
@@ -385,6 +438,7 @@ impl TransactionStore {
                     submitted_by,
                     bucket,
                     time_delta,
+                    priority,
                 );
             }
         }
@@ -411,24 +465,41 @@ impl TransactionStore {
     ///   TimelineIndex (txns for SharedMempool).
     /// - Other txns are considered to be "non-ready" and should be added to ParkingLotIndex.
     fn process_ready_transactions(&mut self, address: &AccountAddress, sequence_num: u64) {
+        let sender_bucket = sender_bucket(address, self.num_sender_buckets);
         if let Some(txns) = self.transactions.get_mut(address) {
             let mut min_seq = sequence_num;
 
             while let Some(txn) = txns.get_mut(&min_seq) {
                 let process_ready = !self.priority_index.contains(txn);
+
                 self.priority_index.insert(txn);
 
                 let process_broadcast_ready = txn.timeline_state == TimelineState::NotReady;
                 if process_broadcast_ready {
-                    self.timeline_index.insert(txn);
+                    self.timeline_index
+                        .get_mut(&sender_bucket)
+                        .unwrap()
+                        .insert(txn);
                 }
 
                 if process_ready {
+                    let bucket = self
+                        .timeline_index
+                        .get(&sender_bucket)
+                        .unwrap()
+                        .get_bucket(txn.ranking_score)
+                        .to_string();
+                    let bucket = format!("{}_{}", sender_bucket, bucket);
+
                     Self::log_ready_transaction(
                         txn.ranking_score,
-                        self.timeline_index.get_bucket(txn.ranking_score),
+                        bucket.as_str(),
                         &mut txn.insertion_info,
                         process_broadcast_ready,
+                        txn.priority_of_sender
+                            .clone()
+                            .map_or_else(|| "Unknown".to_string(), |priority| priority.to_string())
+                            .as_str(),
                     );
                 }
 
@@ -536,7 +607,16 @@ impl TransactionStore {
         self.system_ttl_index.remove(txn);
         self.expiration_time_index.remove(txn);
         self.priority_index.remove(txn);
-        self.timeline_index.remove(txn);
+        let sender_bucket = sender_bucket(&txn.get_sender(), self.num_sender_buckets);
+        self.timeline_index
+            .get_mut(&sender_bucket)
+            .unwrap_or_else(|| {
+                panic!(
+                    "Unable to get the timeline index for the sender bucket {}",
+                    sender_bucket
+                )
+            })
+            .remove(txn);
         self.parking_lot_index.remove(txn);
         self.hash_index.remove(&txn.get_committed_hash());
         self.size_bytes -= txn.get_estimated_bytes();
@@ -555,12 +635,17 @@ impl TransactionStore {
 
     /// Read at most `count` transactions from timeline since `timeline_id`.
     /// This method takes into account the max number of bytes per transaction batch.
-    /// Returns block of transactions and new last_timeline_id.
+    /// Returns block of transactions along with their transaction ready times
+    /// and new last_timeline_id.
     pub(crate) fn read_timeline(
         &self,
+        sender_bucket: MempoolSenderBucket,
         timeline_id: &MultiBucketTimelineIndexIds,
         count: usize,
-    ) -> (Vec<SignedTransaction>, MultiBucketTimelineIndexIds) {
+        before: Option<Instant>,
+        // The priority of the receipient of the transactions
+        priority_of_receiver: BroadcastPeerPriority,
+    ) -> (Vec<(SignedTransaction, u64)>, MultiBucketTimelineIndexIds) {
         let mut batch = vec![];
         let mut batch_total_bytes: u64 = 0;
         let mut last_timeline_id = timeline_id.id_per_bucket.clone();
@@ -568,7 +653,14 @@ impl TransactionStore {
         // Add as many transactions to the batch as possible
         for (i, bucket) in self
             .timeline_index
-            .read_timeline(timeline_id, count)
+            .get(&sender_bucket)
+            .unwrap_or_else(|| {
+                panic!(
+                    "Unable to get the timeline index for the sender bucket {}",
+                    sender_bucket
+                )
+            })
+            .read_timeline(timeline_id, count, before)
             .iter()
             .enumerate()
             .rev()
@@ -579,21 +671,28 @@ impl TransactionStore {
                     if batch_total_bytes.saturating_add(transaction_bytes) > self.max_batch_bytes {
                         break; // The batch is full
                     } else {
-                        batch.push(txn.txn.clone());
+                        batch.push((
+                            txn.txn.clone(),
+                            aptos_infallible::duration_since_epoch_at(
+                                &txn.insertion_info.ready_time,
+                            )
+                            .as_millis() as u64,
+                        ));
                         batch_total_bytes = batch_total_bytes.saturating_add(transaction_bytes);
                         if let TimelineState::Ready(timeline_id) = txn.timeline_state {
                             last_timeline_id[i] = timeline_id;
                         }
-                        let bucket = self.timeline_index.get_bucket(txn.ranking_score);
+                        let bucket = self.get_bucket(txn.ranking_score, &txn.get_sender());
                         Mempool::log_txn_latency(
                             &txn.insertion_info,
-                            bucket,
+                            bucket.as_str(),
                             BROADCAST_BATCHED_LABEL,
+                            priority_of_receiver.to_string().as_str(),
                         );
                         counters::core_mempool_txn_ranking_score(
                             BROADCAST_BATCHED_LABEL,
                             BROADCAST_BATCHED_LABEL,
-                            bucket,
+                            bucket.as_str(),
                             txn.ranking_score,
                         );
                     }
@@ -606,16 +705,32 @@ impl TransactionStore {
 
     pub(crate) fn timeline_range(
         &self,
-        start_end_pairs: &Vec<(u64, u64)>,
-    ) -> Vec<SignedTransaction> {
+        sender_bucket: MempoolSenderBucket,
+        start_end_pairs: HashMap<TimelineIndexIdentifier, (u64, u64)>,
+    ) -> Vec<(SignedTransaction, u64)> {
         self.timeline_index
+            .get(&sender_bucket)
+            .unwrap_or_else(|| {
+                panic!(
+                    "Unable to get the timeline index for the sender bucket {}",
+                    sender_bucket
+                )
+            })
             .timeline_range(start_end_pairs)
             .iter()
             .filter_map(|(account, sequence_number)| {
                 self.transactions
                     .get(account)
                     .and_then(|txns| txns.get(sequence_number))
-                    .map(|txn| txn.txn.clone())
+                    .map(|txn| {
+                        (
+                            txn.txn.clone(),
+                            aptos_infallible::duration_since_epoch_at(
+                                &txn.insertion_info.ready_time,
+                            )
+                            .as_millis() as u64,
+                        )
+                    })
             })
             .collect()
     }
@@ -701,7 +816,16 @@ impl TransactionStore {
                 for (_, t) in txns.range_mut((park_range_start, park_range_end)) {
                     self.parking_lot_index.insert(t);
                     self.priority_index.remove(t);
-                    self.timeline_index.remove(t);
+                    let sender_bucket = sender_bucket(&t.get_sender(), self.num_sender_buckets);
+                    self.timeline_index
+                        .get_mut(&sender_bucket)
+                        .unwrap_or_else(|| {
+                            panic!(
+                                "Unable to get the timeline index for the sender bucket {}",
+                                sender_bucket
+                            )
+                        })
+                        .remove(t);
                     if let TimelineState::Ready(_) = t.timeline_state {
                         t.timeline_state = TimelineState::NotReady;
                     }
diff --git a/mempool/src/counters.rs b/mempool/src/counters.rs
index c4508ee208889..dba59738223e3 100644
--- a/mempool/src/counters.rs
+++ b/mempool/src/counters.rs
@@ -23,6 +23,7 @@ pub const TRANSACTION_HASH_INDEX_LABEL: &str = "transaction_hash";
 pub const SIZE_BYTES_LABEL: &str = "size_bytes";
 
 // Core mempool stages labels
+pub const BROADCAST_RECEIVED_LABEL: &str = "broadcast_received";
 pub const COMMIT_ACCEPTED_LABEL: &str = "commit_accepted";
 pub const COMMIT_ACCEPTED_BLOCK_LABEL: &str = "commit_accepted_block";
 pub const COMMIT_REJECTED_LABEL: &str = "commit_rejected";
@@ -140,6 +141,15 @@ pub fn core_mempool_index_size(label: &'static str, size: usize) {
         .set(size as i64)
 }
 
+pub static SENDER_BUCKET_FREQUENCIES: Lazy<IntGaugeVec> = Lazy::new(|| {
+    register_int_gauge_vec!(
+        "aptos_core_mempool_sender_bucket_frequencies",
+        "Frequency of each sender bucket in core mempool",
+        &["sender_bucket"]
+    )
+    .unwrap()
+});
+
 /// Counter tracking size of each bucket in timeline index
 static CORE_MEMPOOL_TIMELINE_INDEX_SIZE: Lazy<IntGaugeVec> = Lazy::new(|| {
     register_int_gauge_vec!(
@@ -150,10 +160,10 @@ static CORE_MEMPOOL_TIMELINE_INDEX_SIZE: Lazy<IntGaugeVec> = Lazy::new(|| {
     .unwrap()
 });
 
-pub fn core_mempool_timeline_index_size(bucket_min_size_pairs: &Vec<(&str, usize)>) {
-    for &(bucket_min, size) in bucket_min_size_pairs {
+pub fn core_mempool_timeline_index_size(bucket_min_size_pairs: Vec<(String, usize)>) {
+    for (bucket_min, size) in bucket_min_size_pairs {
         CORE_MEMPOOL_TIMELINE_INDEX_SIZE
-            .with_label_values(&[bucket_min])
+            .with_label_values(&[bucket_min.as_str()])
             .set(size as i64)
     }
 }
@@ -190,10 +200,15 @@ pub fn core_mempool_txn_commit_latency(
     submitted_by: &'static str,
     bucket: &str,
     latency: Duration,
+    priority: &str,
 ) {
     CORE_MEMPOOL_TXN_COMMIT_LATENCY
         .with_label_values(&[stage, submitted_by, bucket])
         .observe(latency.as_secs_f64());
+
+    CORE_MEMPOOL_TXN_LATENCIES
+        .with_label_values(&[stage, submitted_by, bucket, priority])
+        .observe(latency.as_secs_f64());
 }
 
 /// Counter tracking latency of txns reaching various stages in committing
@@ -208,6 +223,28 @@ static CORE_MEMPOOL_TXN_COMMIT_LATENCY: Lazy<HistogramVec> = Lazy::new(|| {
     .unwrap()
 });
 
+/// Counter tracking latency of txns reaching various stages
+/// (e.g. time from txn entering core mempool to being pulled in consensus block)
+static CORE_MEMPOOL_TXN_LATENCIES: Lazy<HistogramVec> = Lazy::new(|| {
+    register_histogram_vec!(
+        "aptos_core_mempool_txn_latencies",
+        "Latency of txn reaching various stages in mempool",
+        &["stage", "submitted_by", "bucket", "priority"],
+        MEMPOOL_LATENCY_BUCKETS.to_vec()
+    )
+    .unwrap()
+});
+
+pub static TXN_E2E_USE_CASE_COMMIT_LATENCY: Lazy<HistogramVec> = Lazy::new(|| {
+    register_histogram_vec!(
+        "aptos_txn_e2e_use_case_commit_latency",
+        "Latency of txn commit_accept, by use_case",
+        &["use_case", "submitted_by", "bucket"],
+        MEMPOOL_LATENCY_BUCKETS.to_vec()
+    )
+    .unwrap()
+});
+
 pub fn core_mempool_txn_ranking_score(
     stage: &'static str,
     status: &str,
@@ -269,10 +306,11 @@ pub static CORE_MEMPOOL_GC_LATENCY: Lazy<HistogramVec> = Lazy::new(|| {
     .unwrap()
 });
 
-pub static CORE_MEMPOOL_TXN_CONSENSUS_PULLED: Lazy<Histogram> = Lazy::new(|| {
-    register_histogram!(
-        "aptos_core_mempool_txn_consensus_pulled",
+pub static CORE_MEMPOOL_TXN_CONSENSUS_PULLED_BY_BUCKET: Lazy<HistogramVec> = Lazy::new(|| {
+    register_histogram_vec!(
+        "aptos_core_mempool_txn_consensus_pulled_by_bucket",
         "Number of times a txn was pulled from core mempool by consensus",
+        &["bucket"],
         TXN_CONSENSUS_PULLED_BUCKETS.to_vec()
     )
     .unwrap()
diff --git a/mempool/src/logging.rs b/mempool/src/logging.rs
index 00c681fb68690..ceab4fb96c227 100644
--- a/mempool/src/logging.rs
+++ b/mempool/src/logging.rs
@@ -2,7 +2,7 @@
 // Parts of the project are originally copyright © Meta Platforms, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::shared_mempool::types::{MultiBatchId, QuorumStoreRequest};
+use crate::shared_mempool::types::{MempoolMessageId, QuorumStoreRequest};
 use anyhow::Error;
 use aptos_config::network_id::{NetworkId, PeerNetworkId};
 use aptos_logger::Schema;
@@ -112,7 +112,7 @@ pub struct LogSchema<'a> {
     network_level: Option<usize>,
     upstream_network: Option<&'a NetworkId>,
     #[schema(debug)]
-    batch_id: Option<&'a MultiBatchId>,
+    message_id: Option<&'a MempoolMessageId>,
     backpressure: Option<bool>,
     num_txns: Option<usize>,
 }
@@ -139,7 +139,7 @@ impl<'a> LogSchema<'a> {
             state_sync_msg: None,
             network_level: None,
             upstream_network: None,
-            batch_id: None,
+            message_id: None,
             backpressure: None,
             num_txns: None,
         }
diff --git a/mempool/src/shared_mempool/coordinator.rs b/mempool/src/shared_mempool/coordinator.rs
index 94d2b84c64b35..76a36e699cd79 100644
--- a/mempool/src/shared_mempool/coordinator.rs
+++ b/mempool/src/shared_mempool/coordinator.rs
@@ -8,11 +8,14 @@ use crate::{
     core_mempool::{CoreMempool, TimelineState},
     counters,
     logging::{LogEntry, LogEvent, LogSchema},
-    network::MempoolSyncMsg,
+    network::{BroadcastPeerPriority, MempoolSyncMsg},
     shared_mempool::{
-        tasks,
-        tasks::process_committed_transactions,
-        types::{notify_subscribers, ScheduledBroadcast, SharedMempool, SharedMempoolNotification},
+        tasks::{self, process_committed_transactions},
+        types::{
+            notify_subscribers, MempoolMessageId, ScheduledBroadcast, SharedMempool,
+            SharedMempoolNotification,
+        },
+        use_case_history::UseCaseHistory,
     },
     MempoolEventsReceiver, QuorumStoreRequest,
 };
@@ -29,7 +32,11 @@ use aptos_network::{
     },
     protocols::network::Event,
 };
-use aptos_types::on_chain_config::{OnChainConfigPayload, OnChainConfigProvider};
+use aptos_types::{
+    on_chain_config::{OnChainConfigPayload, OnChainConfigProvider},
+    transaction::SignedTransaction,
+    PeerId,
+};
 use aptos_vm_validator::vm_validator::TransactionValidation;
 use futures::{
     channel::mpsc,
@@ -37,7 +44,10 @@ use futures::{
     FutureExt, StreamExt,
 };
 use std::{
-    sync::Arc,
+    sync::{
+        atomic::{AtomicU64, Ordering},
+        Arc,
+    },
     time::{Duration, Instant, SystemTime},
 };
 use tokio::{runtime::Handle, time::interval};
@@ -134,10 +144,21 @@ fn spawn_commit_notification_handler<NetworkClient, TransactionValidator>(
 {
     let mempool = smp.mempool.clone();
     let mempool_validator = smp.validator.clone();
+    let use_case_history = smp.use_case_history.clone();
+    let num_committed_txns_recieved_since_peers_updated = smp
+        .network_interface
+        .num_committed_txns_received_since_peers_updated
+        .clone();
 
     tokio::spawn(async move {
         while let Some(commit_notification) = mempool_listener.next().await {
-            handle_commit_notification(&mempool, &mempool_validator, commit_notification);
+            handle_commit_notification(
+                &mempool,
+                &mempool_validator,
+                &use_case_history,
+                commit_notification,
+                &num_committed_txns_recieved_since_peers_updated,
+            );
         }
     });
 }
@@ -164,6 +185,8 @@ async fn handle_client_request<NetworkClient, TransactionValidator>(
                 counters::CLIENT_EVENT_LABEL,
                 counters::START_LABEL,
             );
+            smp.network_interface
+                .num_mempool_txns_received_since_peers_updated += 1;
             bounded_executor
                 .spawn(tasks::process_client_transaction_submission(
                     smp.clone(),
@@ -202,7 +225,9 @@ async fn handle_client_request<NetworkClient, TransactionValidator>(
 fn handle_commit_notification<TransactionValidator>(
     mempool: &Arc<Mutex<CoreMempool>>,
     mempool_validator: &Arc<RwLock<TransactionValidator>>,
+    use_case_history: &Arc<Mutex<UseCaseHistory>>,
     msg: MempoolCommitNotification,
+    num_committed_txns_recieved_since_peers_updated: &Arc<AtomicU64>,
 ) where
     TransactionValidator: TransactionValidation,
 {
@@ -218,7 +243,14 @@ fn handle_commit_notification<TransactionValidator>(
         counters::COMMIT_STATE_SYNC_LABEL,
         msg.transactions.len(),
     );
-    process_committed_transactions(mempool, msg.transactions, msg.block_timestamp_usecs);
+    num_committed_txns_recieved_since_peers_updated
+        .fetch_add(msg.transactions.len() as u64, Ordering::Relaxed);
+    process_committed_transactions(
+        mempool,
+        use_case_history,
+        msg.transactions,
+        msg.block_timestamp_usecs,
+    );
     mempool_validator.write().notify_commit();
     let latency = start_time.elapsed();
     counters::mempool_service_latency(
@@ -254,6 +286,57 @@ async fn handle_mempool_reconfig_event<NetworkClient, TransactionValidator, Conf
         .await;
 }
 
+async fn process_received_txns<NetworkClient, TransactionValidator>(
+    bounded_executor: &BoundedExecutor,
+    smp: &mut SharedMempool<NetworkClient, TransactionValidator>,
+    network_id: NetworkId,
+    message_id: MempoolMessageId,
+    transactions: Vec<(
+        SignedTransaction,
+        Option<u64>,
+        Option<BroadcastPeerPriority>,
+    )>,
+    peer_id: PeerId,
+) where
+    NetworkClient: NetworkClientInterface<MempoolSyncMsg> + 'static,
+    TransactionValidator: TransactionValidation + 'static,
+{
+    smp.network_interface
+        .num_mempool_txns_received_since_peers_updated += transactions.len() as u64;
+    let smp_clone = smp.clone();
+    let peer = PeerNetworkId::new(network_id, peer_id);
+    let ineligible_for_broadcast = (smp.network_interface.is_validator()
+        && !smp.broadcast_within_validator_network())
+        || smp.network_interface.is_upstream_peer(&peer, None);
+    let timeline_state = if ineligible_for_broadcast {
+        TimelineState::NonQualified
+    } else {
+        TimelineState::NotReady
+    };
+    // This timer measures how long it took for the bounded executor to
+    // *schedule* the task.
+    let _timer = counters::task_spawn_latency_timer(
+        counters::PEER_BROADCAST_EVENT_LABEL,
+        counters::SPAWN_LABEL,
+    );
+    // This timer measures how long it took for the task to go from scheduled
+    // to started.
+    let task_start_timer = counters::task_spawn_latency_timer(
+        counters::PEER_BROADCAST_EVENT_LABEL,
+        counters::START_LABEL,
+    );
+    bounded_executor
+        .spawn(tasks::process_transaction_broadcast(
+            smp_clone,
+            transactions,
+            message_id,
+            timeline_state,
+            peer,
+            task_start_timer,
+        ))
+        .await;
+}
+
 /// Handles all network messages.
 /// - Network messages follow a simple Request/Response framework to accept new transactions
 /// TODO: Move to RPC off of DirectSend
@@ -271,51 +354,45 @@ async fn handle_network_event<NetworkClient, TransactionValidator>(
             counters::shared_mempool_event_inc("message");
             match msg {
                 MempoolSyncMsg::BroadcastTransactionsRequest {
-                    request_id,
+                    message_id,
                     transactions,
                 } => {
-                    let smp_clone = smp.clone();
-                    let peer = PeerNetworkId::new(network_id, peer_id);
-                    let ineligible_for_broadcast = (smp.network_interface.is_validator()
-                        && !smp.broadcast_within_validator_network())
-                        || smp.network_interface.is_upstream_peer(&peer, None);
-                    let timeline_state = if ineligible_for_broadcast {
-                        TimelineState::NonQualified
-                    } else {
-                        TimelineState::NotReady
-                    };
-                    // This timer measures how long it took for the bounded executor to
-                    // *schedule* the task.
-                    let _timer = counters::task_spawn_latency_timer(
-                        counters::PEER_BROADCAST_EVENT_LABEL,
-                        counters::SPAWN_LABEL,
-                    );
-                    // This timer measures how long it took for the task to go from scheduled
-                    // to started.
-                    let task_start_timer = counters::task_spawn_latency_timer(
-                        counters::PEER_BROADCAST_EVENT_LABEL,
-                        counters::START_LABEL,
-                    );
-                    bounded_executor
-                        .spawn(tasks::process_transaction_broadcast(
-                            smp_clone,
-                            transactions,
-                            request_id,
-                            timeline_state,
-                            peer,
-                            task_start_timer,
-                        ))
-                        .await;
+                    process_received_txns(
+                        bounded_executor,
+                        smp,
+                        network_id,
+                        message_id,
+                        transactions.into_iter().map(|t| (t, None, None)).collect(),
+                        peer_id,
+                    )
+                    .await;
+                },
+                MempoolSyncMsg::BroadcastTransactionsRequestWithReadyTime {
+                    message_id,
+                    transactions,
+                } => {
+                    process_received_txns(
+                        bounded_executor,
+                        smp,
+                        network_id,
+                        message_id,
+                        transactions
+                            .into_iter()
+                            .map(|t| (t.0, Some(t.1), Some(t.2)))
+                            .collect(),
+                        peer_id,
+                    )
+                    .await;
                 },
                 MempoolSyncMsg::BroadcastTransactionsResponse {
-                    request_id,
+                    message_id,
                     retry,
                     backoff,
                 } => {
                     let ack_timestamp = SystemTime::now();
                     smp.network_interface.process_broadcast_ack(
                         PeerNetworkId::new(network_id, peer_id),
-                        request_id,
+                        message_id,
                         retry,
                         backoff,
                         ack_timestamp,
diff --git a/mempool/src/shared_mempool/mod.rs b/mempool/src/shared_mempool/mod.rs
index 78063e9cdea1a..676f38e6eebcc 100644
--- a/mempool/src/shared_mempool/mod.rs
+++ b/mempool/src/shared_mempool/mod.rs
@@ -11,3 +11,4 @@ pub use runtime::bootstrap;
 pub(crate) use runtime::start_shared_mempool;
 mod coordinator;
 pub(crate) mod tasks;
+pub(crate) mod use_case_history;
diff --git a/mempool/src/shared_mempool/network.rs b/mempool/src/shared_mempool/network.rs
index 943eb40314d6d..7736e8f1bdd84 100644
--- a/mempool/src/shared_mempool/network.rs
+++ b/mempool/src/shared_mempool/network.rs
@@ -11,13 +11,13 @@ use crate::{
         priority::PrioritizedPeersState,
         tasks,
         types::{
-            notify_subscribers, MultiBatchId, PeerSyncState, SharedMempool,
-            SharedMempoolNotification,
+            notify_subscribers, MempoolMessageId, MempoolSenderBucket, PeerSyncState,
+            SharedMempool, SharedMempoolNotification,
         },
     },
 };
 use aptos_config::{
-    config::{MempoolConfig, RoleType},
+    config::{MempoolConfig, NodeType},
     network_id::PeerNetworkId,
 };
 use aptos_infallible::RwLock;
@@ -34,8 +34,12 @@ use fail::fail_point;
 use serde::{Deserialize, Serialize};
 use std::{
     collections::{BTreeMap, BTreeSet, HashMap},
+    fmt::Display,
     ops::Add,
-    sync::Arc,
+    sync::{
+        atomic::{AtomicU64, Ordering},
+        Arc,
+    },
     time::{Duration, Instant, SystemTime},
 };
 use thiserror::Error;
@@ -46,18 +50,28 @@ pub enum MempoolSyncMsg {
     /// Broadcast request issued by the sender.
     BroadcastTransactionsRequest {
         /// Unique id of sync request. Can be used by sender for rebroadcast analysis
-        request_id: MultiBatchId,
+        message_id: MempoolMessageId,
         transactions: Vec<SignedTransaction>,
     },
     /// Broadcast ack issued by the receiver.
     BroadcastTransactionsResponse {
-        request_id: MultiBatchId,
+        message_id: MempoolMessageId,
         /// Retry signal from recipient if there are txns in corresponding broadcast
         /// that were rejected from mempool but may succeed on resend.
         retry: bool,
         /// A backpressure signal from the recipient when it is overwhelmed (e.g., mempool is full).
         backoff: bool,
     },
+    /// Broadcast request issued by the sender.
+    BroadcastTransactionsRequestWithReadyTime {
+        /// Unique id of sync request. Can be used by sender for rebroadcast analysis
+        message_id: MempoolMessageId,
+        /// For each transaction, we also include the time at which the transaction is ready
+        /// in the current node in millis since epoch. The upstream node can then calculate
+        /// (SystemTime::now() - ready_time) to calculate the time it took for the transaction
+        /// to reach the upstream node.
+        transactions: Vec<(SignedTransaction, u64, BroadcastPeerPriority)>,
+    },
 }
 
 #[derive(Debug, Error)]
@@ -76,29 +90,48 @@ pub enum BroadcastError {
     TooManyPendingBroadcasts(PeerNetworkId),
 }
 
+#[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Eq)]
+pub enum BroadcastPeerPriority {
+    Primary,
+    Failover,
+}
+
+impl Display for BroadcastPeerPriority {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            BroadcastPeerPriority::Primary => write!(f, "Primary"),
+            BroadcastPeerPriority::Failover => write!(f, "Failover"),
+        }
+    }
+}
+
 #[derive(Clone, Debug)]
 pub(crate) struct MempoolNetworkInterface<NetworkClient> {
     network_client: NetworkClient,
     sync_states: Arc<RwLock<HashMap<PeerNetworkId, PeerSyncState>>>,
-    role: RoleType,
+    node_type: NodeType,
     mempool_config: MempoolConfig,
     prioritized_peers_state: PrioritizedPeersState,
+    pub num_mempool_txns_received_since_peers_updated: u64,
+    pub num_committed_txns_received_since_peers_updated: Arc<AtomicU64>,
 }
 
 impl<NetworkClient: NetworkClientInterface<MempoolSyncMsg>> MempoolNetworkInterface<NetworkClient> {
     pub(crate) fn new(
         network_client: NetworkClient,
-        role: RoleType,
+        node_type: NodeType,
         mempool_config: MempoolConfig,
     ) -> MempoolNetworkInterface<NetworkClient> {
         let prioritized_peers_state =
-            PrioritizedPeersState::new(mempool_config.clone(), TimeService::real());
+            PrioritizedPeersState::new(mempool_config.clone(), node_type, TimeService::real());
         Self {
             network_client,
             sync_states: Arc::new(RwLock::new(HashMap::new())),
-            role,
+            node_type,
             mempool_config,
             prioritized_peers_state,
+            num_mempool_txns_received_since_peers_updated: 0,
+            num_committed_txns_received_since_peers_updated: Arc::new(AtomicU64::new(0)),
         }
     }
 
@@ -139,7 +172,10 @@ impl<NetworkClient: NetworkClientInterface<MempoolSyncMsg>> MempoolNetworkInterf
             counters::active_upstream_peers(&peer.network_id()).inc();
             sync_states.insert(
                 peer,
-                PeerSyncState::new(self.mempool_config.broadcast_buckets.len()),
+                PeerSyncState::new(
+                    self.mempool_config.broadcast_buckets.len(),
+                    self.mempool_config.num_sender_buckets,
+                ),
             );
         }
         for peer in to_disable {
@@ -158,7 +194,11 @@ impl<NetworkClient: NetworkClientInterface<MempoolSyncMsg>> MempoolNetworkInterf
     ) -> (Vec<PeerNetworkId>, Vec<PeerNetworkId>) {
         // Get the upstream peers to add or disable, using a read lock
         let (to_add, to_disable) = self.get_upstream_peers_to_add_and_disable(all_connected_peers);
-
+        info!(
+            "Mempool peers added: {:?}, Mempool peers disabled: {:?}",
+            to_add.iter().map(|(peer, _)| peer).collect::<Vec<_>>(),
+            to_disable
+        );
         // If there are updates, apply using a write lock
         self.add_and_disable_upstream_peers(&to_add, &to_disable);
 
@@ -178,7 +218,7 @@ impl<NetworkClient: NetworkClientInterface<MempoolSyncMsg>> MempoolNetworkInterf
         peers_changed: bool,
     ) {
         // Only fullnodes should prioritize peers (e.g., VFNs and PFNs)
-        if self.role.is_validator() {
+        if self.node_type.is_validator() {
             return;
         }
 
@@ -203,12 +243,20 @@ impl<NetworkClient: NetworkClientInterface<MempoolSyncMsg>> MempoolNetworkInterf
             .collect();
 
         // Update the prioritized peers list
-        self.prioritized_peers_state
-            .update_prioritized_peers(peers_and_metadata);
+        self.prioritized_peers_state.update_prioritized_peers(
+            peers_and_metadata,
+            self.num_mempool_txns_received_since_peers_updated,
+            self.num_committed_txns_received_since_peers_updated
+                .load(Ordering::Relaxed),
+        );
+        // Resetting the counter
+        self.num_mempool_txns_received_since_peers_updated = 0;
+        self.num_committed_txns_received_since_peers_updated
+            .store(0, Ordering::SeqCst);
     }
 
     pub fn is_validator(&self) -> bool {
-        self.role.is_validator()
+        self.node_type.is_validator()
     }
 
     pub fn is_upstream_peer(
@@ -232,7 +280,7 @@ impl<NetworkClient: NetworkClientInterface<MempoolSyncMsg>> MempoolNetworkInterf
     pub fn process_broadcast_ack(
         &self,
         peer: PeerNetworkId,
-        batch_id: MultiBatchId,
+        message_id: MempoolMessageId,
         retry: bool,
         backoff: bool,
         timestamp: SystemTime,
@@ -246,7 +294,7 @@ impl<NetworkClient: NetworkClientInterface<MempoolSyncMsg>> MempoolNetworkInterf
             return;
         };
 
-        if let Some(sent_timestamp) = sync_state.broadcast_info.sent_batches.remove(&batch_id) {
+        if let Some(sent_timestamp) = sync_state.broadcast_info.sent_messages.remove(&message_id) {
             let rtt = timestamp
                 .duration_since(sent_timestamp)
                 .expect("failed to calculate mempool broadcast RTT");
@@ -261,8 +309,8 @@ impl<NetworkClient: NetworkClientInterface<MempoolSyncMsg>> MempoolNetworkInterf
             trace!(
                 LogSchema::new(LogEntry::ReceiveACK)
                     .peer(&peer)
-                    .batch_id(&batch_id),
-                "batch ID does not exist or expired"
+                    .message_id(&message_id),
+                "request ID does not exist or expired"
             );
             return;
         }
@@ -270,14 +318,14 @@ impl<NetworkClient: NetworkClientInterface<MempoolSyncMsg>> MempoolNetworkInterf
         trace!(
             LogSchema::new(LogEntry::ReceiveACK)
                 .peer(&peer)
-                .batch_id(&batch_id)
+                .message_id(&message_id)
                 .backpressure(backoff),
             retry = retry,
         );
         tasks::update_ack_counter(&peer, counters::RECEIVED_LABEL, retry, backoff);
 
         if retry {
-            sync_state.broadcast_info.retry_batches.insert(batch_id);
+            sync_state.broadcast_info.retry_messages.insert(message_id);
         }
 
         // Backoff mode can only be turned off by executing a broadcast that was scheduled
@@ -297,19 +345,6 @@ impl<NetworkClient: NetworkClientInterface<MempoolSyncMsg>> MempoolNetworkInterf
         }
     }
 
-    /// Peers are prioritized when the local is a validator, or it's within the default failovers.
-    /// One is added for the primary peer
-    fn check_peer_prioritized(&self, peer: PeerNetworkId) -> Result<(), BroadcastError> {
-        if !self.role.is_validator() {
-            let peer_priority = self.prioritized_peers_state.get_peer_priority(&peer);
-            if peer_priority > self.mempool_config.default_failovers {
-                return Err(BroadcastError::PeerNotPrioritized(peer, peer_priority));
-            }
-        }
-
-        Ok(())
-    }
-
     /// Determines the broadcast batch.  There are three types of batches:
     /// * Expired -> This timed out waiting for a response and needs to be resent
     /// * Retry -> This received a response telling it to retry later
@@ -319,16 +354,20 @@ impl<NetworkClient: NetworkClientInterface<MempoolSyncMsg>> MempoolNetworkInterf
         peer: PeerNetworkId,
         scheduled_backoff: bool,
         smp: &mut SharedMempool<NetworkClient, TransactionValidator>,
-    ) -> Result<(MultiBatchId, Vec<SignedTransaction>, Option<&str>), BroadcastError> {
+    ) -> Result<
+        (
+            MempoolMessageId,
+            Vec<(SignedTransaction, u64, BroadcastPeerPriority)>,
+            Option<&str>,
+        ),
+        BroadcastError,
+    > {
         let mut sync_states = self.sync_states.write();
         // If we don't have any info about the node, we shouldn't broadcast to it
         let state = sync_states
             .get_mut(&peer)
             .ok_or(BroadcastError::PeerNotFound(peer))?;
 
-        // If the peer isn't prioritized, lets not broadcast
-        self.check_peer_prioritized(peer)?;
-
         // If backoff mode is on for this peer, only execute broadcasts that were scheduled as a backoff broadcast.
         // This is to ensure the backoff mode is actually honored (there is a chance a broadcast was scheduled
         // in non-backoff mode before backoff mode was turned on - ignore such scheduled broadcasts).
@@ -340,35 +379,43 @@ impl<NetworkClient: NetworkClientInterface<MempoolSyncMsg>> MempoolNetworkInterf
         // A pending or retry broadcast might become empty if the corresponding txns were committed through
         // another peer, so don't track broadcasts for committed txns.
         let mempool = smp.mempool.lock();
-        state.broadcast_info.sent_batches = state
+        state.broadcast_info.sent_messages = state
             .broadcast_info
-            .sent_batches
+            .sent_messages
             .clone()
             .into_iter()
-            .filter(|(id, _batch)| !mempool.timeline_range(&id.0).is_empty())
-            .collect::<BTreeMap<MultiBatchId, SystemTime>>();
-        state.broadcast_info.retry_batches = state
+            .filter(|(message_id, _batch)| {
+                !mempool
+                    .timeline_range_of_message(message_id.decode())
+                    .is_empty()
+            })
+            .collect::<BTreeMap<MempoolMessageId, SystemTime>>();
+        state.broadcast_info.retry_messages = state
             .broadcast_info
-            .retry_batches
+            .retry_messages
             .clone()
             .into_iter()
-            .filter(|id| !mempool.timeline_range(&id.0).is_empty())
-            .collect::<BTreeSet<MultiBatchId>>();
+            .filter(|message_id| {
+                !mempool
+                    .timeline_range_of_message(message_id.decode())
+                    .is_empty()
+            })
+            .collect::<BTreeSet<MempoolMessageId>>();
 
         // Check for batch to rebroadcast:
         // 1. Batch that did not receive ACK in configured window of time
         // 2. Batch that an earlier ACK marked as retriable
         let mut pending_broadcasts = 0;
-        let mut expired_batch_id = None;
+        let mut expired_message_id = None;
 
-        // Find earliest batch in timeline index that expired.
-        // Note that state.broadcast_info.sent_batches is ordered in decreasing order in the timeline index
-        for (batch, sent_time) in state.broadcast_info.sent_batches.iter() {
+        // Find earliest message in timeline index that expired.
+        // Note that state.broadcast_info.sent_messages is ordered in decreasing order in the timeline index
+        for (message, sent_time) in state.broadcast_info.sent_messages.iter() {
             let deadline = sent_time.add(Duration::from_millis(
                 self.mempool_config.shared_mempool_ack_timeout_ms,
             ));
             if SystemTime::now().duration_since(deadline).is_ok() {
-                expired_batch_id = Some(batch);
+                expired_message_id = Some(message);
             } else {
                 pending_broadcasts += 1;
             }
@@ -382,29 +429,118 @@ impl<NetworkClient: NetworkClientInterface<MempoolSyncMsg>> MempoolNetworkInterf
                 return Err(BroadcastError::TooManyPendingBroadcasts(peer));
             }
         }
-        let retry_batch_id = state.broadcast_info.retry_batches.iter().next_back();
+        let retry_message_id = state.broadcast_info.retry_messages.iter().next_back();
 
-        let (batch_id, transactions, metric_label) =
-            match std::cmp::max(expired_batch_id, retry_batch_id) {
-                Some(id) => {
-                    let metric_label = if Some(id) == expired_batch_id {
+        let (message_id, transactions, metric_label) =
+            match std::cmp::max(expired_message_id, retry_message_id) {
+                Some(message_id) => {
+                    let metric_label = if Some(message_id) == expired_message_id {
                         Some(counters::EXPIRED_BROADCAST_LABEL)
                     } else {
                         Some(counters::RETRY_BROADCAST_LABEL)
                     };
 
-                    let txns = mempool.timeline_range(&id.0);
-                    (id.clone(), txns, metric_label)
+                    let txns = message_id
+                        .decode()
+                        .into_iter()
+                        .flat_map(|(sender_bucket, start_end_pairs)| {
+                            if self.node_type.is_validator() {
+                                mempool
+                                    .timeline_range(sender_bucket, start_end_pairs)
+                                    .into_iter()
+                                    .map(|(txn, ready_time)| {
+                                        (txn, ready_time, BroadcastPeerPriority::Primary)
+                                    })
+                                    .collect::<Vec<_>>()
+                            } else {
+                                self.prioritized_peers_state
+                                    .get_sender_bucket_priority_for_peer(&peer, sender_bucket)
+                                    .map_or_else(Vec::new, |priority| {
+                                        mempool
+                                            .timeline_range(sender_bucket, start_end_pairs)
+                                            .into_iter()
+                                            .map(|(txn, ready_time)| {
+                                                (txn, ready_time, priority.clone())
+                                            })
+                                            .collect::<Vec<_>>()
+                                    })
+                            }
+                        })
+                        .collect::<Vec<_>>();
+                    (message_id.clone(), txns, metric_label)
                 },
                 None => {
                     // Fresh broadcast
-                    let (txns, new_timeline_id) = mempool.read_timeline(
-                        &state.timeline_id,
-                        self.mempool_config.shared_mempool_batch_size,
-                    );
+
+                    // If the peer doesn't have any sender_buckets assigned, let's not broadcast to the peer
+                    let mut sender_buckets: Vec<(MempoolSenderBucket, BroadcastPeerPriority)> =
+                        if self.node_type.is_validator() {
+                            (0..self.mempool_config.num_sender_buckets)
+                                .map(|sender_bucket| {
+                                    (sender_bucket, BroadcastPeerPriority::Primary)
+                                })
+                                .collect()
+                        } else {
+                            self.prioritized_peers_state
+                                .get_sender_buckets_for_peer(&peer)
+                                .ok_or_else(|| {
+                                    BroadcastError::PeerNotPrioritized(
+                                        peer,
+                                        self.prioritized_peers_state.get_peer_priority(&peer),
+                                    )
+                                })?
+                                .clone()
+                                .into_iter()
+                                .collect()
+                        };
+                    // Sort sender_buckets based on priority. Primary peer should be first.
+                    sender_buckets.sort_by(|(_, priority_a), (_, priority_b)| {
+                        if priority_a == priority_b {
+                            std::cmp::Ordering::Equal
+                        } else if *priority_a == BroadcastPeerPriority::Primary {
+                            std::cmp::Ordering::Less
+                        } else {
+                            std::cmp::Ordering::Greater
+                        }
+                    });
+
+                    let max_txns = self.mempool_config.shared_mempool_batch_size;
+                    let mut output_txns = vec![];
+                    let mut output_updates = vec![];
+                    for (sender_bucket, peer_priority) in sender_buckets {
+                        let before = match peer_priority {
+                            BroadcastPeerPriority::Primary => None,
+                            BroadcastPeerPriority::Failover => Some(
+                                Instant::now()
+                                    - Duration::from_millis(
+                                        self.mempool_config.shared_mempool_failover_delay_ms,
+                                    ),
+                            ),
+                        };
+                        if max_txns > 0 {
+                            let old_timeline_id = state.timelines.get(&sender_bucket).unwrap();
+                            let (txns, new_timeline_id) = mempool.read_timeline(
+                                sender_bucket,
+                                old_timeline_id,
+                                max_txns,
+                                before,
+                                peer_priority.clone(),
+                            );
+                            output_txns.extend(
+                                txns.into_iter()
+                                    .map(|(txn, ready_time)| {
+                                        (txn, ready_time, peer_priority.clone())
+                                    })
+                                    .collect::<Vec<_>>(),
+                            );
+                            output_updates
+                                .push((sender_bucket, (old_timeline_id.clone(), new_timeline_id)));
+                        }
+                    }
+
                     (
-                        MultiBatchId::from_timeline_ids(&state.timeline_id, &new_timeline_id),
-                        txns,
+                        MempoolMessageId::from_timeline_ids(output_updates),
+                        output_txns,
                         None,
                     )
                 },
@@ -414,19 +550,27 @@ impl<NetworkClient: NetworkClientInterface<MempoolSyncMsg>> MempoolNetworkInterf
             return Err(BroadcastError::NoTransactions(peer));
         }
 
-        Ok((batch_id, transactions, metric_label))
+        Ok((message_id, transactions, metric_label))
     }
 
     /// Sends a batch to the given peer
     async fn send_batch_to_peer(
         &self,
         peer: PeerNetworkId,
-        batch_id: MultiBatchId,
-        transactions: Vec<SignedTransaction>,
+        message_id: MempoolMessageId,
+        // For each transaction, we include the ready time in millis since epoch
+        transactions: Vec<(SignedTransaction, u64, BroadcastPeerPriority)>,
     ) -> Result<(), BroadcastError> {
-        let request = MempoolSyncMsg::BroadcastTransactionsRequest {
-            request_id: batch_id,
-            transactions,
+        let request = if self.mempool_config.include_ready_time_in_broadcast {
+            MempoolSyncMsg::BroadcastTransactionsRequestWithReadyTime {
+                message_id,
+                transactions,
+            }
+        } else {
+            MempoolSyncMsg::BroadcastTransactionsRequest {
+                message_id,
+                transactions: transactions.into_iter().map(|(txn, _, _)| txn).collect(),
+            }
         };
 
         if let Err(e) = self.network_client.send_to_peer(request, peer) {
@@ -453,7 +597,7 @@ impl<NetworkClient: NetworkClientInterface<MempoolSyncMsg>> MempoolNetworkInterf
     fn update_broadcast_state(
         &self,
         peer: PeerNetworkId,
-        batch_id: MultiBatchId,
+        message_id: MempoolMessageId,
         send_time: SystemTime,
     ) -> Result<usize, BroadcastError> {
         let mut sync_states = self.sync_states.write();
@@ -462,15 +606,15 @@ impl<NetworkClient: NetworkClientInterface<MempoolSyncMsg>> MempoolNetworkInterf
             .ok_or(BroadcastError::PeerNotFound(peer))?;
 
         // Update peer sync state with info from above broadcast.
-        state.timeline_id.update(&batch_id);
+        state.update(&message_id);
         // Turn off backoff mode after every broadcast.
         state.broadcast_info.backoff_mode = false;
-        state.broadcast_info.retry_batches.remove(&batch_id);
+        state.broadcast_info.retry_messages.remove(&message_id);
         state
             .broadcast_info
-            .sent_batches
-            .insert(batch_id, send_time);
-        Ok(state.broadcast_info.sent_batches.len())
+            .sent_messages
+            .insert(message_id, send_time);
+        Ok(state.broadcast_info.sent_messages.len())
     }
 
     pub async fn execute_broadcast<TransactionValidator: TransactionValidation>(
@@ -481,15 +625,14 @@ impl<NetworkClient: NetworkClientInterface<MempoolSyncMsg>> MempoolNetworkInterf
     ) -> Result<(), BroadcastError> {
         // Start timer for tracking broadcast latency.
         let start_time = Instant::now();
-        let (batch_id, transactions, metric_label) =
+        let (message_id, transactions, metric_label) =
             self.determine_broadcast_batch(peer, scheduled_backoff, smp)?;
-
         let num_txns = transactions.len();
         let send_time = SystemTime::now();
-        self.send_batch_to_peer(peer, batch_id.clone(), transactions)
+        self.send_batch_to_peer(peer, message_id.clone(), transactions)
             .await?;
         let num_pending_broadcasts =
-            self.update_broadcast_state(peer, batch_id.clone(), send_time)?;
+            self.update_broadcast_state(peer, message_id.clone(), send_time)?;
         notify_subscribers(SharedMempoolNotification::Broadcast, &smp.subscribers);
 
         // Log all the metrics
@@ -497,7 +640,7 @@ impl<NetworkClient: NetworkClientInterface<MempoolSyncMsg>> MempoolNetworkInterf
         trace!(
             LogSchema::event_log(LogEntry::BroadcastTransaction, LogEvent::Success)
                 .peer(&peer)
-                .batch_id(&batch_id)
+                .message_id(&message_id)
                 .backpressure(scheduled_backoff)
                 .num_txns(num_txns)
         );
diff --git a/mempool/src/shared_mempool/priority.rs b/mempool/src/shared_mempool/priority.rs
index 0d034be080cab..9a7c23c40cbac 100644
--- a/mempool/src/shared_mempool/priority.rs
+++ b/mempool/src/shared_mempool/priority.rs
@@ -1,9 +1,10 @@
 // Copyright © Aptos Foundation
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::counters;
+use super::types::MempoolSenderBucket;
+use crate::{counters, network::BroadcastPeerPriority};
 use aptos_config::{
-    config::MempoolConfig,
+    config::{MempoolConfig, NodeType},
     network_id::{NetworkId, PeerNetworkId},
 };
 use aptos_infallible::RwLock;
@@ -12,8 +13,8 @@ use aptos_peer_monitoring_service_types::PeerMonitoringMetadata;
 use aptos_time_service::{TimeService, TimeServiceTrait};
 use itertools::Itertools;
 use std::{
-    cmp::Ordering,
-    collections::hash_map::RandomState,
+    cmp::{max, min, Ordering},
+    collections::{hash_map::RandomState, HashMap},
     hash::{BuildHasher, Hasher},
     sync::Arc,
     time::Instant,
@@ -36,8 +37,8 @@ impl PrioritizedPeersComparator {
     /// Higher priority peers are greater than lower priority peers.
     fn compare_simple(
         &self,
-        peer_a: &(PeerNetworkId, Option<PeerMonitoringMetadata>),
-        peer_b: &(PeerNetworkId, Option<PeerMonitoringMetadata>),
+        peer_a: &(PeerNetworkId, Option<&PeerMonitoringMetadata>),
+        peer_b: &(PeerNetworkId, Option<&PeerMonitoringMetadata>),
     ) -> Ordering {
         // Deconstruct the peer tuples
         let (peer_network_id_a, _) = peer_a;
@@ -60,8 +61,8 @@ impl PrioritizedPeersComparator {
     /// Higher priority peers are greater than lower priority peers.
     fn compare_intelligent(
         &self,
-        peer_a: &(PeerNetworkId, Option<PeerMonitoringMetadata>),
-        peer_b: &(PeerNetworkId, Option<PeerMonitoringMetadata>),
+        peer_a: &(PeerNetworkId, Option<&PeerMonitoringMetadata>),
+        peer_b: &(PeerNetworkId, Option<&PeerMonitoringMetadata>),
     ) -> Ordering {
         // Deconstruct the peer tuples
         let (peer_network_id_a, monitoring_metadata_a) = peer_a;
@@ -123,6 +124,13 @@ pub struct PrioritizedPeersState {
     // The current list of prioritized peers
     prioritized_peers: Arc<RwLock<Vec<PeerNetworkId>>>,
 
+    // We divide mempool transactions into buckets based on hash of the sender.
+    // For load balancing, we send transactions from a subset of buckets to a peer.
+    // This map stores the buckets that are sent to a peer and the priority of the peer
+    // for that bucket.
+    peer_to_sender_buckets:
+        HashMap<PeerNetworkId, HashMap<MempoolSenderBucket, BroadcastPeerPriority>>,
+
     // The comparator used to prioritize peers
     peer_comparator: PrioritizedPeersComparator,
 
@@ -134,10 +142,17 @@ pub struct PrioritizedPeersState {
 
     // The time service used to fetch timestamps
     time_service: TimeService,
+
+    // The type of node (Validator, ValidatorFullNode, PublicFullnode)
+    node_type: NodeType,
 }
 
 impl PrioritizedPeersState {
-    pub fn new(mempool_config: MempoolConfig, time_service: TimeService) -> Self {
+    pub fn new(
+        mempool_config: MempoolConfig,
+        node_type: NodeType,
+        time_service: TimeService,
+    ) -> Self {
         Self {
             mempool_config,
             prioritized_peers: Arc::new(RwLock::new(Vec::new())),
@@ -145,6 +160,8 @@ impl PrioritizedPeersState {
             observed_all_ping_latencies: false,
             last_peer_priority_update: None,
             time_service,
+            peer_to_sender_buckets: HashMap::new(),
+            node_type,
         }
     }
 
@@ -158,6 +175,16 @@ impl PrioritizedPeersState {
             .map_or(usize::MAX, |(position, _)| position)
     }
 
+    pub fn get_sender_bucket_priority_for_peer(
+        &self,
+        peer: &PeerNetworkId,
+        sender_bucket: MempoolSenderBucket,
+    ) -> Option<BroadcastPeerPriority> {
+        self.peer_to_sender_buckets
+            .get(peer)
+            .and_then(|buckets| buckets.get(&sender_bucket).cloned())
+    }
+
     /// Returns true iff the prioritized peers list is ready for another update
     pub fn ready_for_update(&self, peers_changed: bool) -> bool {
         // If intelligent peer prioritization is disabled, we should only
@@ -187,11 +214,18 @@ impl PrioritizedPeersState {
         }
     }
 
+    pub(crate) fn get_sender_buckets_for_peer(
+        &self,
+        peer: &PeerNetworkId,
+    ) -> Option<&HashMap<MempoolSenderBucket, BroadcastPeerPriority>> {
+        self.peer_to_sender_buckets.get(peer)
+    }
+
     /// Sorts the given peers by priority using the prioritized peer comparator.
     /// The peers are sorted in descending order (i.e., higher values are prioritized).
     fn sort_peers_by_priority(
         &self,
-        peers_and_metadata: &[(PeerNetworkId, Option<PeerMonitoringMetadata>)],
+        peers_and_metadata: &[(PeerNetworkId, Option<&PeerMonitoringMetadata>)],
     ) -> Vec<PeerNetworkId> {
         peers_and_metadata
             .iter()
@@ -208,11 +242,178 @@ impl PrioritizedPeersState {
             .collect()
     }
 
+    fn update_sender_bucket_for_peers(
+        &mut self,
+        peer_monitoring_data: &HashMap<PeerNetworkId, Option<&PeerMonitoringMetadata>>,
+        num_mempool_txns_received_since_peers_updated: u64,
+        num_committed_txns_received_since_peers_updated: u64,
+    ) {
+        // TODO: If the top peer set didn't change, then don't change the Primary sender bucket assignment.
+        // TODO: (Minor) If the load is low, don't do load balancing for Failover buckets.
+        assert!(self.prioritized_peers.read().len() == peer_monitoring_data.len());
+
+        // Obtain the top peers to assign the sender buckets with Primary priority
+        let mut top_peers = vec![];
+        let secs_elapsed_since_last_update =
+            self.last_peer_priority_update.map_or(0, |last_update| {
+                self.time_service
+                    .now()
+                    .duration_since(last_update)
+                    .as_secs()
+            });
+
+        // When the node is in state sync mode, it will receive more mempool commit notifications than the actual
+        // commits that happens on the blockchain during the same time period. As secs_elapsed_since_last_update is
+        // local time and not the on chain time, the average_committed_traffic_observed is only a local estimate of
+        // the traffic and could differ from the actual traffic observed by the blockchain. If the estimate differs
+        // from the actual traffic observed on the blockchain, we could end up load balancing more or less than required.
+        let average_mempool_traffic_observed = num_mempool_txns_received_since_peers_updated as f64
+            / max(1, secs_elapsed_since_last_update) as f64;
+        let average_committed_traffic_observed = num_committed_txns_received_since_peers_updated
+            as f64
+            / max(1, secs_elapsed_since_last_update) as f64;
+
+        // Obtain the highest threshold from mempool_config.load_balancing_thresholds for which avg_mempool_traffic_threshold_in_tps exceeds average_mempool_traffic_observed
+        let threshold_config = self
+            .mempool_config
+            .load_balancing_thresholds
+            .clone()
+            .into_iter()
+            .rev()
+            .find(|threshold_config| {
+                threshold_config.avg_mempool_traffic_threshold_in_tps
+                    <= max(
+                        average_mempool_traffic_observed as u64,
+                        average_committed_traffic_observed as u64,
+                    )
+            })
+            .unwrap_or_default();
+
+        let num_top_peers = max(
+            1,
+            min(
+                self.mempool_config.num_sender_buckets,
+                if self.mempool_config.enable_max_load_balancing_at_any_load {
+                    u8::MAX
+                } else {
+                    threshold_config.max_number_of_upstream_peers
+                },
+            ),
+        );
+        info!(
+            "Time elapsed since last peer update: {:?}\n
+            Number of mempool transactions received since last peer update: {:?},\n
+            Average mempool traffic observed: {:?},\n
+            Number of committed transactions received since last peer update: {:?},\n
+            Average committed traffic observed: {:?},\n
+            Load balancing threshold config: {:?},\n
+            Number of top peers picked: {:?}",
+            secs_elapsed_since_last_update,
+            num_mempool_txns_received_since_peers_updated,
+            average_mempool_traffic_observed,
+            num_committed_txns_received_since_peers_updated,
+            average_committed_traffic_observed,
+            threshold_config,
+            num_top_peers
+        );
+
+        if self.node_type.is_validator_fullnode() {
+            // Use the peer on the VFN network with lowest ping latency as the primary peer
+            let peers_in_vfn_network = self
+                .prioritized_peers
+                .read()
+                .iter()
+                .cloned()
+                .filter(|peer| peer.network_id() == NetworkId::Vfn)
+                .collect::<Vec<_>>();
+
+            if !peers_in_vfn_network.is_empty() {
+                top_peers = vec![peers_in_vfn_network[0]];
+            }
+        }
+
+        if top_peers.is_empty() {
+            let base_ping_latency = self.prioritized_peers.read().first().and_then(|peer| {
+                peer_monitoring_data
+                    .get(peer)
+                    .and_then(|metadata| get_peer_ping_latency(metadata))
+            });
+
+            // Extract top peers with ping latency less than base_ping_latency + 50 ms
+            for peer in self.prioritized_peers.read().iter() {
+                if top_peers.len() >= num_top_peers as usize {
+                    break;
+                }
+
+                let ping_latency = peer_monitoring_data
+                    .get(peer)
+                    .and_then(|metadata| get_peer_ping_latency(metadata));
+
+                if base_ping_latency.is_none()
+                    || ping_latency.is_none()
+                    || ping_latency.unwrap()
+                        < base_ping_latency.unwrap()
+                            + (threshold_config.latency_slack_between_top_upstream_peers as f64)
+                                / 1000.0
+                {
+                    top_peers.push(*peer);
+                }
+            }
+        }
+        info!(
+            "Identified top peers: {:?}, node_type: {:?}",
+            top_peers, self.node_type
+        );
+
+        assert!(top_peers.len() <= num_top_peers as usize);
+        // Top peers shouldn't be empty if prioritized_peers is not zero
+        assert!(self.prioritized_peers.read().is_empty() || !top_peers.is_empty());
+
+        self.peer_to_sender_buckets = HashMap::new();
+        if !self.prioritized_peers.read().is_empty() {
+            // Assign sender buckets with Primary priority
+            let mut peer_index = 0;
+            for bucket_index in 0..self.mempool_config.num_sender_buckets {
+                self.peer_to_sender_buckets
+                    .entry(*top_peers.get(peer_index).unwrap())
+                    .or_default()
+                    .insert(bucket_index, BroadcastPeerPriority::Primary);
+                peer_index = (peer_index + 1) % top_peers.len();
+            }
+
+            // Assign sender buckets with Failover priority. Use Round Robin.
+            peer_index = 0;
+            let num_prioritized_peers = self.prioritized_peers.read().len();
+            for _ in 0..self.mempool_config.default_failovers {
+                for bucket_index in 0..self.mempool_config.num_sender_buckets {
+                    // Find the first peer that already doesn't have the sender bucket, and add the bucket
+                    for _ in 0..num_prioritized_peers {
+                        let peer = self.prioritized_peers.read()[peer_index];
+                        let sender_bucket_list =
+                            self.peer_to_sender_buckets.entry(peer).or_default();
+                        if let std::collections::hash_map::Entry::Vacant(e) =
+                            sender_bucket_list.entry(bucket_index)
+                        {
+                            e.insert(BroadcastPeerPriority::Failover);
+                            break;
+                        }
+                        peer_index = (peer_index + 1) % num_prioritized_peers;
+                    }
+                }
+            }
+        }
+    }
+
     /// Updates the prioritized peers list
     pub fn update_prioritized_peers(
         &mut self,
-        peers_and_metadata: Vec<(PeerNetworkId, Option<PeerMonitoringMetadata>)>,
+        peers_and_metadata: Vec<(PeerNetworkId, Option<&PeerMonitoringMetadata>)>,
+        num_mempool_txns_received_since_peers_updated: u64,
+        num_committed_txns_recieved_since_peers_updated: u64,
     ) {
+        let peer_monitoring_data: HashMap<PeerNetworkId, Option<&PeerMonitoringMetadata>> =
+            peers_and_metadata.clone().into_iter().collect();
+
         // Calculate the new set of prioritized peers
         let new_prioritized_peers = self.sort_peers_by_priority(&peers_and_metadata);
 
@@ -229,8 +430,28 @@ impl PrioritizedPeersState {
                 .all(|(_, metadata)| get_peer_ping_latency(metadata).is_some());
         }
 
+        // Divide the sender buckets amongst the top peers
+        self.update_sender_bucket_for_peers(
+            &peer_monitoring_data,
+            num_mempool_txns_received_since_peers_updated,
+            num_committed_txns_recieved_since_peers_updated,
+        );
+
         // Set the last peer priority update time
         self.last_peer_priority_update = Some(self.time_service.now());
+        info!(
+            "Updated prioritized peers. Peer count: {:?}, Latencies: {:?},\n Prioritized peers: {:?},\n Sender bucket assignment: {:?}",
+            peers_and_metadata.len(),
+            peers_and_metadata
+                .iter()
+                .map(|(peer, metadata)| (
+                    peer,
+                    metadata.map(|metadata| metadata.average_ping_latency_secs)
+                ))
+                .collect::<Vec<_>>(),
+            self.prioritized_peers.read(),
+            self.peer_to_sender_buckets,
+        );
     }
 
     /// Updates the prioritized peer metrics based on the new prioritization
@@ -257,9 +478,9 @@ impl PrioritizedPeersState {
 /// Returns the distance from the validators for the
 /// given monitoring metadata (if one exists).
 fn get_distance_from_validators(
-    monitoring_metadata: &Option<PeerMonitoringMetadata>,
+    monitoring_metadata: &Option<&PeerMonitoringMetadata>,
 ) -> Option<u64> {
-    monitoring_metadata.as_ref().and_then(|metadata| {
+    monitoring_metadata.and_then(|metadata| {
         metadata
             .latest_network_info_response
             .as_ref()
@@ -269,10 +490,8 @@ fn get_distance_from_validators(
 
 /// Returns the ping latency for the given monitoring
 /// metadata (if one exists).
-fn get_peer_ping_latency(monitoring_metadata: &Option<PeerMonitoringMetadata>) -> Option<f64> {
-    monitoring_metadata
-        .as_ref()
-        .and_then(|metadata| metadata.average_ping_latency_secs)
+fn get_peer_ping_latency(monitoring_metadata: &Option<&PeerMonitoringMetadata>) -> Option<f64> {
+    monitoring_metadata.and_then(|metadata| metadata.average_ping_latency_secs)
 }
 
 /// Compares the network ID for the given pair of peers.
@@ -285,8 +504,8 @@ fn compare_network_id(network_id_a: &NetworkId, network_id_b: &NetworkId) -> Ord
 /// Compares the ping latency for the given pair of monitoring metadata.
 /// The peer with the lowest ping latency is prioritized.
 fn compare_ping_latency(
-    monitoring_metadata_a: &Option<PeerMonitoringMetadata>,
-    monitoring_metadata_b: &Option<PeerMonitoringMetadata>,
+    monitoring_metadata_a: &Option<&PeerMonitoringMetadata>,
+    monitoring_metadata_b: &Option<&PeerMonitoringMetadata>,
 ) -> Ordering {
     // Get the ping latency from the monitoring metadata
     let ping_latency_a = get_peer_ping_latency(monitoring_metadata_a);
@@ -313,8 +532,8 @@ fn compare_ping_latency(
 /// Compares the validator distance for the given pair of monitoring metadata.
 /// The peer with the lowest validator distance is prioritized.
 fn compare_validator_distance(
-    monitoring_metadata_a: &Option<PeerMonitoringMetadata>,
-    monitoring_metadata_b: &Option<PeerMonitoringMetadata>,
+    monitoring_metadata_a: &Option<&PeerMonitoringMetadata>,
+    monitoring_metadata_b: &Option<&PeerMonitoringMetadata>,
 ) -> Ordering {
     // Get the validator distance from the monitoring metadata
     let validator_distance_a = get_distance_from_validators(monitoring_metadata_a);
@@ -342,7 +561,7 @@ fn compare_validator_distance(
 mod test {
     use super::*;
     use aptos_config::{
-        config::MempoolConfig,
+        config::{MempoolConfig, NodeType},
         network_id::{NetworkId, PeerNetworkId},
     };
     use aptos_peer_monitoring_service_types::{
@@ -387,7 +606,10 @@ mod test {
         // Verify that the metadata is equal
         assert_eq!(
             Ordering::Equal,
-            compare_validator_distance(&Some(monitoring_metadata_1), &Some(monitoring_metadata_2))
+            compare_validator_distance(
+                &Some(&monitoring_metadata_1),
+                &Some(&monitoring_metadata_2)
+            )
         );
 
         // Create monitoring metadata with different distances
@@ -398,13 +620,16 @@ mod test {
         assert_eq!(
             Ordering::Greater,
             compare_validator_distance(
-                &Some(monitoring_metadata_1.clone()),
-                &Some(monitoring_metadata_2.clone())
+                &Some(&monitoring_metadata_1),
+                &Some(&monitoring_metadata_2)
             )
         );
         assert_eq!(
             Ordering::Less,
-            compare_validator_distance(&Some(monitoring_metadata_2), &Some(monitoring_metadata_1))
+            compare_validator_distance(
+                &Some(&monitoring_metadata_2),
+                &Some(&monitoring_metadata_1)
+            )
         );
 
         // Create monitoring metadata with and without distances
@@ -415,26 +640,26 @@ mod test {
         assert_eq!(
             Ordering::Greater,
             compare_validator_distance(
-                &Some(monitoring_metadata_1.clone()),
-                &Some(monitoring_metadata_2.clone())
+                &Some(&monitoring_metadata_1),
+                &Some(&monitoring_metadata_2)
             )
         );
         assert_eq!(
             Ordering::Less,
             compare_validator_distance(
-                &Some(monitoring_metadata_2.clone()),
-                &Some(monitoring_metadata_1.clone())
+                &Some(&monitoring_metadata_2),
+                &Some(&monitoring_metadata_1)
             )
         );
 
         // Compare monitoring metadata that is missing entirely
         assert_eq!(
             Ordering::Greater,
-            compare_validator_distance(&Some(monitoring_metadata_1.clone()), &None)
+            compare_validator_distance(&Some(&monitoring_metadata_1), &None)
         );
         assert_eq!(
             Ordering::Less,
-            compare_validator_distance(&None, &Some(monitoring_metadata_1))
+            compare_validator_distance(&None, &Some(&monitoring_metadata_1))
         );
     }
 
@@ -447,7 +672,7 @@ mod test {
         // Verify that the metadata is equal
         assert_eq!(
             Ordering::Equal,
-            compare_ping_latency(&Some(monitoring_metadata_1), &Some(monitoring_metadata_2))
+            compare_ping_latency(&Some(&monitoring_metadata_1), &Some(&monitoring_metadata_2))
         );
 
         // Create monitoring metadata with different ping latencies
@@ -457,14 +682,11 @@ mod test {
         // Verify that the metadata has different ordering
         assert_eq!(
             Ordering::Greater,
-            compare_ping_latency(
-                &Some(monitoring_metadata_1.clone()),
-                &Some(monitoring_metadata_2.clone())
-            )
+            compare_ping_latency(&Some(&monitoring_metadata_1), &Some(&monitoring_metadata_2))
         );
         assert_eq!(
             Ordering::Less,
-            compare_ping_latency(&Some(monitoring_metadata_2), &Some(monitoring_metadata_1))
+            compare_ping_latency(&Some(&monitoring_metadata_2), &Some(&monitoring_metadata_1))
         );
 
         // Create monitoring metadata with and without ping latencies
@@ -474,35 +696,32 @@ mod test {
         // Verify that the metadata with a ping latency has a higher ordering
         assert_eq!(
             Ordering::Greater,
-            compare_ping_latency(
-                &Some(monitoring_metadata_1.clone()),
-                &Some(monitoring_metadata_2.clone())
-            )
+            compare_ping_latency(&Some(&monitoring_metadata_1), &Some(&monitoring_metadata_2))
         );
         assert_eq!(
             Ordering::Less,
-            compare_ping_latency(
-                &Some(monitoring_metadata_2.clone()),
-                &Some(monitoring_metadata_1.clone())
-            )
+            compare_ping_latency(&Some(&monitoring_metadata_2), &Some(&monitoring_metadata_1))
         );
 
         // Compare monitoring metadata that is missing entirely
         assert_eq!(
             Ordering::Greater,
-            compare_ping_latency(&Some(monitoring_metadata_1.clone()), &None)
+            compare_ping_latency(&Some(&monitoring_metadata_1), &None)
         );
         assert_eq!(
             Ordering::Less,
-            compare_ping_latency(&None, &Some(monitoring_metadata_1))
+            compare_ping_latency(&None, &Some(&monitoring_metadata_1))
         );
     }
 
     #[test]
     fn test_get_peer_priority() {
         // Create a prioritized peer state
-        let prioritized_peers_state =
-            PrioritizedPeersState::new(MempoolConfig::default(), TimeService::mock());
+        let prioritized_peers_state = PrioritizedPeersState::new(
+            MempoolConfig::default(),
+            NodeType::PublicFullnode,
+            TimeService::mock(),
+        );
 
         // Create a list of peers
         let validator_peer = create_validator_peer();
@@ -511,7 +730,10 @@ mod test {
 
         // Set the prioritized peers
         let prioritized_peers = vec![validator_peer, vfn_peer, public_peer];
-        *prioritized_peers_state.prioritized_peers.write() = prioritized_peers.clone();
+        prioritized_peers_state
+            .prioritized_peers
+            .write()
+            .clone_from(&prioritized_peers);
 
         // Verify that the peer priorities are correct
         for (index, peer) in prioritized_peers.iter().enumerate() {
@@ -521,6 +743,146 @@ mod test {
         }
     }
 
+    fn prioritized_peer_state_well_formed(
+        prioritized_peers_state: &PrioritizedPeersState,
+        num_sender_buckets: u8,
+    ) {
+        // There is exists a peer with primary priority for each bucket
+        for bucket in 0..num_sender_buckets {
+            assert!(prioritized_peers_state.peer_to_sender_buckets.iter().any(
+                |(_, sender_buckets)| {
+                    sender_buckets.contains_key(&bucket)
+                        && sender_buckets.get(&bucket).unwrap() == &BroadcastPeerPriority::Primary
+                }
+            ));
+        }
+
+        // There is exists a peer with failover priority for each bucket
+        for bucket in 0..num_sender_buckets {
+            assert!(prioritized_peers_state.peer_to_sender_buckets.iter().any(
+                |(_, sender_buckets)| {
+                    sender_buckets.contains_key(&bucket)
+                        && sender_buckets.get(&bucket).unwrap() == &BroadcastPeerPriority::Failover
+                }
+            ));
+        }
+    }
+
+    fn all_sender_buckets_assigned_to_vfn_network(
+        prioritized_peers_state: &PrioritizedPeersState,
+        num_sender_buckets: u8,
+    ) {
+        for bucket in 0..num_sender_buckets {
+            assert!(prioritized_peers_state.peer_to_sender_buckets.iter().any(
+                |(peer, sender_buckets)| {
+                    peer.network_id() == NetworkId::Vfn
+                        && sender_buckets.contains_key(&bucket)
+                        && sender_buckets.get(&bucket).unwrap() == &BroadcastPeerPriority::Primary
+                }
+            ));
+        }
+    }
+
+    #[test]
+    fn test_all_sender_buckets_assigned_for_vfns() {
+        let mempool_config = MempoolConfig::default();
+        let mut prioritized_peers_state = PrioritizedPeersState::new(
+            mempool_config.clone(),
+            NodeType::ValidatorFullnode,
+            TimeService::mock(),
+        );
+
+        let peer_metadata_1 = create_metadata_with_distance_and_latency(1, 0.5);
+        let peer_1 = (create_public_peer(), Some(&peer_metadata_1));
+
+        let peer_metadata_2 = create_metadata_with_distance_and_latency(1, 0.31);
+        let peer_2 = (create_vfn_peer(), Some(&peer_metadata_2));
+
+        // let peer_metadata_3 = create_metadata_with_distance_and_latency(1, 0.5);
+        let peer_3 = (create_public_peer(), None);
+
+        let peer_metadata_4 = create_metadata_with_distance_and_latency(1, 0.22);
+        let peer_4 = (create_public_peer(), Some(&peer_metadata_4));
+
+        let all_peers = vec![peer_1, peer_2, peer_3, peer_4];
+        prioritized_peers_state.update_prioritized_peers(all_peers, 5000, 7000);
+        assert!(!prioritized_peers_state.peer_to_sender_buckets.is_empty());
+        prioritized_peer_state_well_formed(
+            &prioritized_peers_state,
+            mempool_config.num_sender_buckets,
+        );
+        all_sender_buckets_assigned_to_vfn_network(
+            &prioritized_peers_state,
+            mempool_config.num_sender_buckets,
+        );
+
+        let all_peers = vec![peer_1, peer_2, peer_4];
+        prioritized_peers_state.update_prioritized_peers(all_peers, 3000, 7000);
+        assert!(!prioritized_peers_state.peer_to_sender_buckets.is_empty());
+        prioritized_peer_state_well_formed(
+            &prioritized_peers_state,
+            mempool_config.num_sender_buckets,
+        );
+        all_sender_buckets_assigned_to_vfn_network(
+            &prioritized_peers_state,
+            mempool_config.num_sender_buckets,
+        );
+
+        let all_peers = vec![peer_3, peer_1];
+        prioritized_peers_state.update_prioritized_peers(all_peers, 0, 0);
+        assert!(!prioritized_peers_state.peer_to_sender_buckets.is_empty());
+        prioritized_peer_state_well_formed(
+            &prioritized_peers_state,
+            mempool_config.num_sender_buckets,
+        );
+    }
+
+    #[test]
+    fn test_all_sender_buckets_assigned_for_pfns() {
+        let mempool_config = MempoolConfig::default();
+        let mut prioritized_peers_state = PrioritizedPeersState::new(
+            mempool_config.clone(),
+            NodeType::PublicFullnode,
+            TimeService::mock(),
+        );
+
+        let peer_metadata_1 = create_metadata_with_distance_and_latency(1, 0.5);
+        let peer_1 = (create_public_peer(), Some(&peer_metadata_1));
+
+        let peer_metadata_2 = create_metadata_with_distance_and_latency(1, 0.31);
+        let peer_2 = (create_vfn_peer(), Some(&peer_metadata_2));
+
+        // let peer_metadata_3 = create_metadata_with_distance_and_latency(1, 0.5);
+        let peer_3 = (create_public_peer(), None);
+
+        let peer_metadata_4 = create_metadata_with_distance_and_latency(1, 0.22);
+        let peer_4 = (create_public_peer(), Some(&peer_metadata_4));
+
+        let all_peers = vec![peer_1, peer_2, peer_3, peer_4];
+        prioritized_peers_state.update_prioritized_peers(all_peers, 5000, 2000);
+        assert!(!prioritized_peers_state.peer_to_sender_buckets.is_empty());
+        prioritized_peer_state_well_formed(
+            &prioritized_peers_state,
+            mempool_config.num_sender_buckets,
+        );
+
+        let all_peers = vec![peer_1, peer_2, peer_4];
+        prioritized_peers_state.update_prioritized_peers(all_peers, 3000, 2000);
+        assert!(!prioritized_peers_state.peer_to_sender_buckets.is_empty());
+        prioritized_peer_state_well_formed(
+            &prioritized_peers_state,
+            mempool_config.num_sender_buckets,
+        );
+
+        let all_peers = vec![peer_3, peer_1];
+        prioritized_peers_state.update_prioritized_peers(all_peers, 0, 0);
+        assert!(!prioritized_peers_state.peer_to_sender_buckets.is_empty());
+        prioritized_peer_state_well_formed(
+            &prioritized_peers_state,
+            mempool_config.num_sender_buckets,
+        );
+    }
+
     #[test]
     fn test_ready_for_update_intelligent() {
         // Create a mempool configuration with intelligent peer prioritization enabled
@@ -534,8 +896,11 @@ mod test {
 
         // Create a prioritized peer state
         let time_service = TimeService::mock();
-        let mut prioritized_peers_state =
-            PrioritizedPeersState::new(mempool_config.clone(), time_service.clone());
+        let mut prioritized_peers_state = PrioritizedPeersState::new(
+            mempool_config.clone(),
+            NodeType::PublicFullnode,
+            time_service.clone(),
+        );
 
         // Verify that the prioritized peers should be updated (no prior update time)
         let peers_changed = false;
@@ -581,8 +946,11 @@ mod test {
 
         // Create a prioritized peers state
         let time_service = TimeService::mock();
-        let prioritized_peers_state =
-            PrioritizedPeersState::new(mempool_config.clone(), time_service.clone());
+        let prioritized_peers_state = PrioritizedPeersState::new(
+            mempool_config.clone(),
+            NodeType::PublicFullnode,
+            time_service.clone(),
+        );
 
         // Verify that the prioritized peers is updated when the peers change
         for _ in 0..10 {
@@ -613,8 +981,11 @@ mod test {
         };
 
         // Create a prioritized peer state
-        let prioritized_peers_state =
-            PrioritizedPeersState::new(mempool_config, TimeService::mock());
+        let prioritized_peers_state = PrioritizedPeersState::new(
+            mempool_config,
+            NodeType::PublicFullnode,
+            TimeService::mock(),
+        );
 
         // Create a list of peers (without metadata)
         let validator_peer = (create_validator_peer(), None);
@@ -622,40 +993,29 @@ mod test {
         let public_peer = (create_public_peer(), None);
 
         // Verify that peers are prioritized by network ID first
-        let all_peers = vec![
-            vfn_peer.clone(),
-            public_peer.clone(),
-            validator_peer.clone(),
-        ];
+        let all_peers = vec![vfn_peer, public_peer, validator_peer];
         let prioritized_peers = prioritized_peers_state.sort_peers_by_priority(&all_peers);
         let expected_peers = vec![validator_peer.0, vfn_peer.0, public_peer.0];
         assert_eq!(prioritized_peers, expected_peers);
 
         // Create a list of peers with the same network ID, but different validator distances
-        let public_peer_1 = (
-            create_public_peer(),
-            Some(create_metadata_with_distance(Some(1))),
-        );
+        let peer_metadata_1 = create_metadata_with_distance(Some(1));
+        let public_peer_1 = (create_public_peer(), Some(&peer_metadata_1));
+
+        let peer_metadata_2 = create_metadata_with_distance(None);
         let public_peer_2 = (
             create_public_peer(),
-            Some(create_metadata_with_distance(None)), // No validator distance
-        );
-        let public_peer_3 = (
-            create_public_peer(),
-            Some(create_metadata_with_distance(Some(0))),
-        );
-        let public_peer_4 = (
-            create_public_peer(),
-            Some(create_metadata_with_distance(Some(2))),
+            Some(&peer_metadata_2), // No validator distance
         );
 
+        let peer_metadata_3 = create_metadata_with_distance(Some(0));
+        let public_peer_3 = (create_public_peer(), Some(&peer_metadata_3));
+
+        let peer_metadata_4 = create_metadata_with_distance(Some(2));
+        let public_peer_4 = (create_public_peer(), Some(&peer_metadata_4));
+
         // Verify that peers on the same network ID are prioritized by validator distance
-        let all_peers = vec![
-            public_peer_1.clone(),
-            public_peer_2.clone(),
-            public_peer_3.clone(),
-            public_peer_4.clone(),
-        ];
+        let all_peers = vec![public_peer_1, public_peer_2, public_peer_3, public_peer_4];
         let prioritized_peers = prioritized_peers_state.sort_peers_by_priority(&all_peers);
         let expected_peers = vec![
             public_peer_3.0,
@@ -666,30 +1026,23 @@ mod test {
         assert_eq!(prioritized_peers, expected_peers);
 
         // Create a list of peers with the same network ID and validator distance, but different ping latencies
-        let public_peer_1 = (
-            create_public_peer(),
-            Some(create_metadata_with_distance_and_latency(1, 0.5)),
-        );
-        let public_peer_2 = (
-            create_public_peer(),
-            Some(create_metadata_with_distance_and_latency(1, 2.0)),
-        );
-        let public_peer_3 = (
-            create_public_peer(),
-            Some(create_metadata_with_distance_and_latency(1, 0.4)),
-        );
+        let peer_metadata_1 = create_metadata_with_distance_and_latency(1, 0.5);
+        let public_peer_1 = (create_public_peer(), Some(&peer_metadata_1));
+
+        let peer_metadata_2 = create_metadata_with_distance_and_latency(1, 2.0);
+        let public_peer_2 = (create_public_peer(), Some(&peer_metadata_2));
+
+        let peer_metadata_3 = create_metadata_with_distance_and_latency(1, 0.4);
+        let public_peer_3 = (create_public_peer(), Some(&peer_metadata_3));
+
+        let peer_metadata_4 = create_metadata_with_distance(Some(1));
         let public_peer_4 = (
             create_public_peer(),
-            Some(create_metadata_with_distance(Some(1))), // No ping latency
+            Some(&peer_metadata_4), // No ping latency
         );
 
         // Verify that peers on the same network ID and validator distance are prioritized by ping latency
-        let all_peers = vec![
-            public_peer_1.clone(),
-            public_peer_2.clone(),
-            public_peer_3.clone(),
-            public_peer_4.clone(),
-        ];
+        let all_peers = vec![public_peer_1, public_peer_2, public_peer_3, public_peer_4];
         let prioritized_peers = prioritized_peers_state.sort_peers_by_priority(&all_peers);
         let expected_peers = vec![
             public_peer_3.0,
@@ -710,8 +1063,11 @@ mod test {
         };
 
         // Create a prioritized peer state
-        let prioritized_peers_state =
-            PrioritizedPeersState::new(mempool_config, TimeService::mock());
+        let prioritized_peers_state = PrioritizedPeersState::new(
+            mempool_config,
+            NodeType::PublicFullnode,
+            TimeService::mock(),
+        );
 
         // Create a list of peers (without metadata)
         let validator_peer = (create_validator_peer(), None);
@@ -719,11 +1075,7 @@ mod test {
         let public_peer = (create_public_peer(), None);
 
         // Verify that peers are prioritized by network ID first
-        let all_peers = vec![
-            vfn_peer.clone(),
-            public_peer.clone(),
-            validator_peer.clone(),
-        ];
+        let all_peers = vec![vfn_peer, public_peer, validator_peer];
         let prioritized_peers = prioritized_peers_state.sort_peers_by_priority(&all_peers);
         let expected_peers = vec![validator_peer.0, vfn_peer.0, public_peer.0];
         assert_eq!(prioritized_peers, expected_peers);
@@ -753,38 +1105,34 @@ mod test {
 
         // Create a prioritized peer state
         let time_service = TimeService::mock();
-        let mut prioritized_peers_state =
-            PrioritizedPeersState::new(mempool_config, time_service.clone());
+        let mut prioritized_peers_state = PrioritizedPeersState::new(
+            mempool_config,
+            NodeType::PublicFullnode,
+            time_service.clone(),
+        );
 
         // Verify that the last peer priority update time is not set
         assert!(prioritized_peers_state.last_peer_priority_update.is_none());
 
         // Create a list of peers with and without ping latencies
-        let public_peer_1 = (
-            create_public_peer(),
-            Some(create_metadata_with_distance_and_latency(1, 0.5)),
-        );
-        let public_peer_2 = (
-            create_public_peer(),
-            Some(create_metadata_with_distance_and_latency(1, 2.0)),
-        );
-        let public_peer_3 = (
-            create_public_peer(),
-            Some(create_metadata_with_distance_and_latency(1, 0.4)),
-        );
+        let peer_metadata_1 = create_metadata_with_distance_and_latency(1, 0.5);
+        let public_peer_1 = (create_public_peer(), Some(&peer_metadata_1));
+
+        let peer_metadata_2 = create_metadata_with_distance_and_latency(1, 2.0);
+        let public_peer_2 = (create_public_peer(), Some(&peer_metadata_2));
+
+        let peer_metadata_3 = create_metadata_with_distance_and_latency(1, 0.4);
+        let public_peer_3 = (create_public_peer(), Some(&peer_metadata_3));
+
+        let peer_metadata_4 = create_metadata_with_distance(Some(1));
         let public_peer_4 = (
             create_public_peer(),
-            Some(create_metadata_with_distance(Some(1))), // No ping latency
+            Some(&peer_metadata_4), // No ping latency
         );
 
         // Update the prioritized peers
-        let all_peers = vec![
-            public_peer_1.clone(),
-            public_peer_2.clone(),
-            public_peer_3.clone(),
-            public_peer_4.clone(),
-        ];
-        prioritized_peers_state.update_prioritized_peers(all_peers);
+        let all_peers = vec![public_peer_1, public_peer_2, public_peer_3, public_peer_4];
+        prioritized_peers_state.update_prioritized_peers(all_peers, 5000, 7000);
 
         // Verify that the prioritized peers were updated correctly
         let expected_peers = vec![
@@ -810,12 +1158,8 @@ mod test {
         time_service.advance_secs(100);
 
         // Update the prioritized peers for only peers with ping latencies
-        let all_peers = vec![
-            public_peer_1.clone(),
-            public_peer_2.clone(),
-            public_peer_3.clone(),
-        ];
-        prioritized_peers_state.update_prioritized_peers(all_peers);
+        let all_peers = vec![public_peer_1, public_peer_2, public_peer_3];
+        prioritized_peers_state.update_prioritized_peers(all_peers, 5000, 1000);
 
         // Verify that the prioritized peers were updated correctly
         let expected_peers = vec![public_peer_3.0, public_peer_1.0, public_peer_2.0];
@@ -843,8 +1187,11 @@ mod test {
 
         // Create a prioritized peer state
         let time_service = TimeService::mock();
-        let mut prioritized_peers_state =
-            PrioritizedPeersState::new(mempool_config, time_service.clone());
+        let mut prioritized_peers_state = PrioritizedPeersState::new(
+            mempool_config,
+            NodeType::PublicFullnode,
+            time_service.clone(),
+        );
 
         // Create a list of peers with different network IDs
         let validator_peer = (create_validator_peer(), None);
@@ -852,12 +1199,8 @@ mod test {
         let public_peer = (create_public_peer(), None);
 
         // Update the prioritized peers
-        let all_peers = vec![
-            validator_peer.clone(),
-            vfn_peer.clone(),
-            public_peer.clone(),
-        ];
-        prioritized_peers_state.update_prioritized_peers(all_peers);
+        let all_peers = vec![validator_peer, vfn_peer, public_peer];
+        prioritized_peers_state.update_prioritized_peers(all_peers, 5000, 2000);
 
         // Verify that the prioritized peers were updated correctly
         let expected_peers = vec![validator_peer.0, vfn_peer.0, public_peer.0];
@@ -865,18 +1208,20 @@ mod test {
         assert_eq!(prioritized_peers, expected_peers);
 
         // Create a list of peers with the same network ID but different metadata
-        let mut all_peers = vec![];
+        let mut all_metadata = Vec::new();
         for i in 0..100 {
-            all_peers.push((
-                create_public_peer(),
-                Some(create_metadata_with_distance_and_latency(i, i as f64)),
-            ));
+            let metadata = create_metadata_with_distance_and_latency(i, i as f64);
+            all_metadata.push(metadata);
         }
+        let all_peers: Vec<_> = all_metadata
+            .iter()
+            .map(|metadata| (create_public_peer(), Some(metadata)))
+            .collect();
 
         // Update the prioritized peers multiple times and verify that the order is consistent
         let prioritized_peers = prioritized_peers_state.sort_peers_by_priority(&all_peers);
         for _ in 0..10 {
-            prioritized_peers_state.update_prioritized_peers(all_peers.clone());
+            prioritized_peers_state.update_prioritized_peers(all_peers.clone(), 5000, 2000);
             let new_prioritized_peers = prioritized_peers_state.prioritized_peers.read().clone();
             assert_eq!(prioritized_peers, new_prioritized_peers);
         }
@@ -910,7 +1255,7 @@ mod test {
             });
 
         // Create the peer monitoring metadata
-        PeerMonitoringMetadata::new(None, network_info_response, None, None)
+        PeerMonitoringMetadata::new(None, None, network_info_response, None, None)
     }
 
     /// Creates a peer monitoring metadata with the given distance and latency
@@ -928,7 +1273,7 @@ mod test {
         average_ping_latency_secs: Option<f64>,
     ) -> PeerMonitoringMetadata {
         // Create the peer monitoring metadata
-        PeerMonitoringMetadata::new(average_ping_latency_secs, None, None, None)
+        PeerMonitoringMetadata::new(average_ping_latency_secs, None, None, None, None)
     }
 
     /// Creates a validator peer with a random peer ID
diff --git a/mempool/src/shared_mempool/runtime.rs b/mempool/src/shared_mempool/runtime.rs
index d2814cc954c18..7fedbb050d6f6 100644
--- a/mempool/src/shared_mempool/runtime.rs
+++ b/mempool/src/shared_mempool/runtime.rs
@@ -11,7 +11,7 @@ use crate::{
     },
     QuorumStoreRequest,
 };
-use aptos_config::config::NodeConfig;
+use aptos_config::config::{NodeConfig, NodeType};
 use aptos_event_notifications::{DbBackedOnChainConfig, ReconfigNotificationListener};
 use aptos_infallible::{Mutex, RwLock};
 use aptos_logger::Level;
@@ -50,6 +50,7 @@ pub(crate) fn start_shared_mempool<TransactionValidator, ConfigProvider>(
     TransactionValidator: TransactionValidation + 'static,
     ConfigProvider: OnChainConfigProvider,
 {
+    let node_type = NodeType::extract_from_config(config);
     let smp: SharedMempool<NetworkClient<MempoolSyncMsg>, TransactionValidator> =
         SharedMempool::new(
             mempool.clone(),
@@ -58,7 +59,7 @@ pub(crate) fn start_shared_mempool<TransactionValidator, ConfigProvider>(
             db,
             validator,
             subscribers,
-            config.base.role,
+            node_type,
         );
 
     executor.spawn(coordinator(
diff --git a/mempool/src/shared_mempool/tasks.rs b/mempool/src/shared_mempool/tasks.rs
index 1d151c991ec89..e919190c0ece8 100644
--- a/mempool/src/shared_mempool/tasks.rs
+++ b/mempool/src/shared_mempool/tasks.rs
@@ -3,14 +3,18 @@
 // SPDX-License-Identifier: Apache-2.0
 
 //! Tasks that are executed by coordinators (short-lived compared to coordinators)
+use super::types::MempoolMessageId;
 use crate::{
     core_mempool::{CoreMempool, TimelineState},
     counters,
     logging::{LogEntry, LogEvent, LogSchema},
-    network::{BroadcastError, MempoolSyncMsg},
-    shared_mempool::types::{
-        notify_subscribers, MultiBatchId, ScheduledBroadcast, SharedMempool,
-        SharedMempoolNotification, SubmissionStatusBundle,
+    network::{BroadcastError, BroadcastPeerPriority, MempoolSyncMsg},
+    shared_mempool::{
+        types::{
+            notify_subscribers, ScheduledBroadcast, SharedMempool, SharedMempoolNotification,
+            SubmissionStatusBundle,
+        },
+        use_case_history::UseCaseHistory,
     },
     thread_pool::IO_POOL,
     QuorumStoreRequest, QuorumStoreResponse, SubmissionStatus,
@@ -19,7 +23,6 @@ use anyhow::Result;
 use aptos_config::network_id::PeerNetworkId;
 use aptos_consensus_types::common::RejectedTransactionSummary;
 use aptos_crypto::HashValue;
-use aptos_experimental_runtimes::thread_manager::optimal_min_len;
 use aptos_infallible::{Mutex, RwLock};
 use aptos_logger::prelude::*;
 use aptos_mempool_notifications::CommittedTransaction;
@@ -128,7 +131,13 @@ pub(crate) async fn process_client_transaction_submission<NetworkClient, Transac
     } else {
         TimelineState::NotReady
     };
-    let statuses = process_incoming_transactions(&smp, vec![transaction], timeline_state, true);
+    let statuses: Vec<(SignedTransaction, (MempoolStatus, Option<StatusCode>))> =
+        process_incoming_transactions(
+            &smp,
+            vec![(transaction, None, Some(BroadcastPeerPriority::Primary))],
+            timeline_state,
+            true,
+        );
     log_txn_process_results(&statuses, None);
 
     if let Some(status) = statuses.first() {
@@ -168,8 +177,15 @@ pub(crate) async fn process_client_get_transaction<NetworkClient, TransactionVal
 /// Processes transactions from other nodes.
 pub(crate) async fn process_transaction_broadcast<NetworkClient, TransactionValidator>(
     smp: SharedMempool<NetworkClient, TransactionValidator>,
-    transactions: Vec<SignedTransaction>,
-    request_id: MultiBatchId,
+    // The sender of the transactions can send the time at which the transactions were inserted
+    // in the sender's mempool. The sender can also send the priority of this node for the sender
+    // of the transactions.
+    transactions: Vec<(
+        SignedTransaction,
+        Option<u64>,
+        Option<BroadcastPeerPriority>,
+    )>,
+    message_id: MempoolMessageId,
     timeline_state: TimelineState,
     peer: PeerNetworkId,
     timer: HistogramTimer,
@@ -182,7 +198,7 @@ pub(crate) async fn process_transaction_broadcast<NetworkClient, TransactionVali
     let results = process_incoming_transactions(&smp, transactions, timeline_state, false);
     log_txn_process_results(&results, Some(peer));
 
-    let ack_response = gen_ack_response(request_id, results, &peer);
+    let ack_response = gen_ack_response(message_id, results, &peer);
 
     // Respond to the peer with an ack. Note: ack response messages should be
     // small enough that they always fit within the maximum network message
@@ -204,7 +220,7 @@ pub(crate) async fn process_transaction_broadcast<NetworkClient, TransactionVali
 
 /// If `MempoolIsFull` on any of the transactions, provide backpressure to the downstream peer.
 fn gen_ack_response(
-    request_id: MultiBatchId,
+    message_id: MempoolMessageId,
     results: Vec<SubmissionStatusBundle>,
     peer: &PeerNetworkId,
 ) -> MempoolSyncMsg {
@@ -223,7 +239,7 @@ fn gen_ack_response(
         backoff_and_retry,
     );
     MempoolSyncMsg::BroadcastTransactionsResponse {
-        request_id,
+        message_id,
         retry: backoff_and_retry,
         backoff: backoff_and_retry,
     }
@@ -255,7 +271,11 @@ pub(crate) fn update_ack_counter(
 /// and returns a vector containing [SubmissionStatusBundle].
 pub(crate) fn process_incoming_transactions<NetworkClient, TransactionValidator>(
     smp: &SharedMempool<NetworkClient, TransactionValidator>,
-    transactions: Vec<SignedTransaction>,
+    transactions: Vec<(
+        SignedTransaction,
+        Option<u64>,
+        Option<BroadcastPeerPriority>,
+    )>,
     timeline_state: TimelineState,
     client_submitted: bool,
 ) -> Vec<SubmissionStatusBundle>
@@ -275,7 +295,7 @@ where
     let seq_numbers = IO_POOL.install(|| {
         transactions
             .par_iter()
-            .map(|t| {
+            .map(|(t, _, _)| {
                 get_account_sequence_number(&state_view, t.sender()).map_err(|e| {
                     error!(LogSchema::new(LogEntry::DBError).error(&e));
                     counters::DB_ERROR.inc();
@@ -293,10 +313,10 @@ where
     let transactions: Vec<_> = transactions
         .into_iter()
         .enumerate()
-        .filter_map(|(idx, t)| {
+        .filter_map(|(idx, (t, ready_time_at_sender, priority))| {
             if let Ok(sequence_num) = seq_numbers[idx] {
                 if t.sequence_number() >= sequence_num {
-                    return Some((t, sequence_num));
+                    return Some((t, sequence_num, ready_time_at_sender, priority));
                 } else {
                     statuses.push((
                         t,
@@ -335,7 +355,12 @@ where
 /// validation into the mempool.
 #[cfg(not(feature = "consensus-only-perf-test"))]
 fn validate_and_add_transactions<NetworkClient, TransactionValidator>(
-    transactions: Vec<(SignedTransaction, u64)>,
+    transactions: Vec<(
+        SignedTransaction,
+        u64,
+        Option<u64>,
+        Option<BroadcastPeerPriority>,
+    )>,
     smp: &SharedMempool<NetworkClient, TransactionValidator>,
     timeline_state: TimelineState,
     statuses: &mut Vec<(SignedTransaction, (MempoolStatus, Option<StatusCode>))>,
@@ -350,13 +375,14 @@ fn validate_and_add_transactions<NetworkClient, TransactionValidator>(
         .start_timer();
     let validation_results = transactions
         .par_iter()
-        .with_min_len(optimal_min_len(transactions.len(), 32))
         .map(|t| smp.validator.read().validate_transaction(t.0.clone()))
         .collect::<Vec<_>>();
     vm_validation_timer.stop_and_record();
     {
         let mut mempool = smp.mempool.lock();
-        for (idx, (transaction, sequence_info)) in transactions.into_iter().enumerate() {
+        for (idx, (transaction, sequence_info, ready_time_at_sender, priority)) in
+            transactions.into_iter().enumerate()
+        {
             if let Ok(validation_result) = &validation_results[idx] {
                 match validation_result.status() {
                     None => {
@@ -367,6 +393,8 @@ fn validate_and_add_transactions<NetworkClient, TransactionValidator>(
                             sequence_info,
                             timeline_state,
                             client_submitted,
+                            ready_time_at_sender,
+                            priority.clone(),
                         );
                         statuses.push((transaction, (mempool_status, None)));
                     },
@@ -402,23 +430,34 @@ fn validate_and_add_transactions<NetworkClient, TransactionValidator>(
 /// outstanding sequence numbers.
 #[cfg(feature = "consensus-only-perf-test")]
 fn validate_and_add_transactions<NetworkClient, TransactionValidator>(
-    transactions: Vec<(SignedTransaction, u64)>,
+    transactions: Vec<(SignedTransaction, u64, Option<u64>)>,
     smp: &SharedMempool<NetworkClient, TransactionValidator>,
     timeline_state: TimelineState,
-    statuses: &mut Vec<(SignedTransaction, (MempoolStatus, Option<StatusCode>))>,
+    statuses: &mut Vec<(
+        SignedTransaction,
+        (
+            MempoolStatus,
+            Option<StatusCode>,
+            Option<BroadcastPeerPriority>,
+        ),
+    )>,
     client_submitted: bool,
 ) where
     NetworkClient: NetworkClientInterface<MempoolSyncMsg>,
     TransactionValidator: TransactionValidation,
 {
+    use super::priority;
+
     let mut mempool = smp.mempool.lock();
-    for (transaction, sequence_info) in transactions.into_iter() {
+    for (transaction, sequence_info, ready_time_at_sender, priority) in transactions.into_iter() {
         let mempool_status = mempool.add_txn(
             transaction.clone(),
             0,
             sequence_info,
             timeline_state,
             client_submitted,
+            read_time_at_sender,
+            priority,
         );
         statuses.push((transaction, (mempool_status, None)));
     }
@@ -547,16 +586,26 @@ pub(crate) fn process_quorum_store_request<NetworkClient, TransactionValidator>(
 /// Remove transactions that are committed (or rejected) so that we can stop broadcasting them.
 pub(crate) fn process_committed_transactions(
     mempool: &Mutex<CoreMempool>,
+    use_case_history: &Mutex<UseCaseHistory>,
     transactions: Vec<CommittedTransaction>,
     block_timestamp_usecs: u64,
 ) {
     let mut pool = mempool.lock();
     let block_timestamp = Duration::from_micros(block_timestamp_usecs);
 
+    let tracking_usecases = {
+        let mut history = use_case_history.lock();
+        history.update_usecases(&transactions);
+        history.compute_tracking_set()
+    };
+
     for transaction in transactions {
         pool.log_commit_transaction(
             &transaction.sender,
             transaction.sequence_number,
+            tracking_usecases
+                .get(&transaction.use_case)
+                .map(|name| (transaction.use_case.clone(), name)),
             block_timestamp,
         );
         pool.commit_transaction(&transaction.sender, transaction.sequence_number);
diff --git a/mempool/src/shared_mempool/types.rs b/mempool/src/shared_mempool/types.rs
index 2164c2fadd0e2..8f92858ad1873 100644
--- a/mempool/src/shared_mempool/types.rs
+++ b/mempool/src/shared_mempool/types.rs
@@ -6,10 +6,11 @@
 use crate::{
     core_mempool::CoreMempool,
     network::{MempoolNetworkInterface, MempoolSyncMsg},
+    shared_mempool::use_case_history::UseCaseHistory,
 };
 use anyhow::Result;
 use aptos_config::{
-    config::{MempoolConfig, RoleType},
+    config::{MempoolConfig, NodeType},
     network_id::PeerNetworkId,
 };
 use aptos_consensus_types::common::{
@@ -31,7 +32,7 @@ use futures::{
 use serde::{Deserialize, Serialize};
 use std::{
     cmp::Ordering,
-    collections::{BTreeMap, BTreeSet},
+    collections::{BTreeMap, BTreeSet, HashMap},
     fmt,
     pin::Pin,
     sync::Arc,
@@ -40,6 +41,9 @@ use std::{
 };
 use tokio::runtime::Handle;
 
+pub type MempoolSenderBucket = u8;
+pub type TimelineIndexIdentifier = u8;
+
 /// Struct that owns all dependencies required by shared mempool routines.
 #[derive(Clone)]
 pub(crate) struct SharedMempool<NetworkClient, TransactionValidator> {
@@ -50,6 +54,7 @@ pub(crate) struct SharedMempool<NetworkClient, TransactionValidator> {
     pub validator: Arc<RwLock<TransactionValidator>>,
     pub subscribers: Vec<UnboundedSender<SharedMempoolNotification>>,
     pub broadcast_within_validator_network: Arc<RwLock<bool>>,
+    pub use_case_history: Arc<Mutex<UseCaseHistory>>,
 }
 
 impl<
@@ -64,9 +69,14 @@ impl<
         db: Arc<dyn DbReader>,
         validator: Arc<RwLock<TransactionValidator>>,
         subscribers: Vec<UnboundedSender<SharedMempoolNotification>>,
-        role: RoleType,
+        node_type: NodeType,
     ) -> Self {
-        let network_interface = MempoolNetworkInterface::new(network_client, role, config.clone());
+        let network_interface =
+            MempoolNetworkInterface::new(network_client, node_type, config.clone());
+        let use_case_history = UseCaseHistory::new(
+            config.usecase_stats_num_blocks_to_track,
+            config.usecase_stats_num_top_to_track,
+        );
         SharedMempool {
             mempool,
             config,
@@ -75,6 +85,7 @@ impl<
             validator,
             subscribers,
             broadcast_within_validator_network: Arc::new(RwLock::new(true)),
+            use_case_history: Arc::new(Mutex::new(use_case_history)),
         }
     }
 
@@ -236,17 +247,34 @@ pub type MempoolEventsReceiver = mpsc::Receiver<MempoolClientRequest>;
 /// `is_alive` - is connection healthy
 #[derive(Clone, Debug)]
 pub(crate) struct PeerSyncState {
-    pub timeline_id: MultiBucketTimelineIndexIds,
+    pub timelines: HashMap<MempoolSenderBucket, MultiBucketTimelineIndexIds>,
     pub broadcast_info: BroadcastInfo,
 }
 
 impl PeerSyncState {
-    pub fn new(num_broadcast_buckets: usize) -> Self {
+    pub fn new(num_broadcast_buckets: usize, num_sender_buckets: MempoolSenderBucket) -> Self {
+        let mut timelines = HashMap::new();
+        for i in 0..num_sender_buckets {
+            timelines.insert(
+                i as MempoolSenderBucket,
+                MultiBucketTimelineIndexIds::new(num_broadcast_buckets),
+            );
+        }
         PeerSyncState {
-            timeline_id: MultiBucketTimelineIndexIds::new(num_broadcast_buckets),
+            timelines,
             broadcast_info: BroadcastInfo::new(),
         }
     }
+
+    // TODO: Need to be updated
+    pub(crate) fn update(&mut self, message_id: &MempoolMessageId) {
+        let decoded_message = message_id.decode();
+        for (sender, batch_id) in decoded_message {
+            if let Some(timeline) = self.timelines.get_mut(&sender) {
+                timeline.update(batch_id);
+            }
+        }
+    }
 }
 
 /// Identifier for a broadcasted batch of txns.
@@ -279,13 +307,20 @@ impl MultiBucketTimelineIndexIds {
         }
     }
 
-    pub(crate) fn update(&mut self, batch_id: &MultiBatchId) {
-        if self.id_per_bucket.len() != batch_id.0.len() {
+    pub(crate) fn update(&mut self, start_end_pairs: HashMap<TimelineIndexIdentifier, (u64, u64)>) {
+        if self.id_per_bucket.len() != start_end_pairs.len() {
             return;
         }
 
-        for (cur, &(_start, end)) in self.id_per_bucket.iter_mut().zip(batch_id.0.iter()) {
-            *cur = std::cmp::max(*cur, end)
+        for index_identifier in start_end_pairs.keys() {
+            if *index_identifier as usize >= self.id_per_bucket.len() {
+                return;
+            }
+        }
+
+        for (index_identifier, (_start, end)) in start_end_pairs {
+            self.id_per_bucket[index_identifier as usize] =
+                std::cmp::max(self.id_per_bucket[index_identifier as usize], end);
         }
     }
 }
@@ -298,33 +333,77 @@ impl From<Vec<u64>> for MultiBucketTimelineIndexIds {
     }
 }
 
+// MempoolMessageId is used to identify a mempool message (set of transactions) sent to a peer.
+// Each tuple (a, b) indicates a range of the timeline index IDs read from the core mempool
+// timeline index that produced the txns in this message.
+// Each tuple (a, b) is encoded as follows:
+// The first byte of a, b indicates the sender bucket (hash of the sender address).
+// Each sender bucket is further subdivided into timelines (One timeline per range of txn fees).
+// A timeline is a queue of transactions.
+// The second byte of a, b indicates the index of the timeline inside the sender bucket.
+// The remaining bytes of a, b indicate the start and end pointers inside the timeline.
 #[derive(Clone, Debug, Deserialize, Eq, Hash, PartialEq, Serialize)]
-pub struct MultiBatchId(pub Vec<(u64, u64)>);
+pub struct MempoolMessageId(pub Vec<(u64, u64)>);
 
-impl MultiBatchId {
+impl MempoolMessageId {
     pub(crate) fn from_timeline_ids(
-        old: &MultiBucketTimelineIndexIds,
-        new: &MultiBucketTimelineIndexIds,
+        timeline_ids: Vec<(
+            MempoolSenderBucket,
+            (MultiBucketTimelineIndexIds, MultiBucketTimelineIndexIds),
+        )>,
     ) -> Self {
         Self(
-            old.id_per_bucket
+            timeline_ids
                 .iter()
-                .cloned()
-                .zip(new.id_per_bucket.iter().cloned())
+                .flat_map(|(sender_bucket, (old, new))| {
+                    old.id_per_bucket
+                        .iter()
+                        .cloned()
+                        .zip(new.id_per_bucket.iter().cloned())
+                        .enumerate()
+                        .map(move |(index, (old, new))| {
+                            let sender_bucket = *sender_bucket as u64;
+                            let timeline_index_identifier = index as u64;
+                            assert!(timeline_index_identifier < 128);
+                            assert!(sender_bucket < 128);
+                            (
+                                sender_bucket << 56 | timeline_index_identifier << 48 | old,
+                                sender_bucket << 56 | timeline_index_identifier << 48 | new,
+                            )
+                        })
+                })
                 .collect(),
         )
     }
+
+    pub(crate) fn decode(
+        &self,
+    ) -> HashMap<MempoolSenderBucket, HashMap<TimelineIndexIdentifier, (u64, u64)>> {
+        let mut result = HashMap::new();
+        for (start, end) in self.0.iter() {
+            let sender_bucket = (start >> 56) as MempoolSenderBucket;
+            let timeline_index_identifier = (start >> 48 & 0xFF) as TimelineIndexIdentifier;
+            // Remove the leading two bytes that indicates the sender bucket.
+            let start = start & 0x0000FFFFFFFFFFFF;
+            let end = end & 0x0000FFFFFFFFFFFF;
+            result
+                .entry(sender_bucket)
+                .or_insert_with(HashMap::new)
+                .insert(timeline_index_identifier, (start, end));
+        }
+        result
+    }
 }
 
-impl PartialOrd for MultiBatchId {
-    fn partial_cmp(&self, other: &MultiBatchId) -> Option<std::cmp::Ordering> {
+impl PartialOrd for MempoolMessageId {
+    fn partial_cmp(&self, other: &MempoolMessageId) -> Option<std::cmp::Ordering> {
         Some(self.cmp(other))
     }
 }
 
 // Note: in rev order to check significant pairs first (right -> left)
-impl Ord for MultiBatchId {
-    fn cmp(&self, other: &MultiBatchId) -> std::cmp::Ordering {
+impl Ord for MempoolMessageId {
+    fn cmp(&self, other: &MempoolMessageId) -> std::cmp::Ordering {
         for (&self_pair, &other_pair) in self.0.iter().rev().zip(other.0.iter().rev()) {
             let ordering = self_pair.cmp(&other_pair);
             if ordering != Ordering::Equal {
@@ -337,24 +416,46 @@ impl Ord for MultiBatchId {
 
 #[cfg(test)]
 mod test {
-    use crate::shared_mempool::types::{MultiBatchId, MultiBucketTimelineIndexIds};
+    use crate::shared_mempool::types::{
+        MempoolMessageId, MultiBucketTimelineIndexIds, TimelineIndexIdentifier,
+    };
+    use std::collections::HashMap;
 
     #[test]
     fn test_multi_bucket_timeline_ids_update() {
         let mut timeline_ids = MultiBucketTimelineIndexIds {
             id_per_bucket: vec![1, 2, 3],
         };
-        let batch_id = MultiBatchId(vec![(1, 3), (1, 1), (3, 6)]);
-        timeline_ids.update(&batch_id);
+        let mut batch_id = HashMap::<TimelineIndexIdentifier, (u64, u64)>::new();
+        batch_id.insert(0, (1, 3));
+        batch_id.insert(1, (1, 1));
+        batch_id.insert(2, (3, 6));
+        timeline_ids.update(batch_id);
         assert_eq!(vec![3, 2, 6], timeline_ids.id_per_bucket);
     }
 
     #[test]
-    fn test_multi_batch_id_ordering() {
-        let left = MultiBatchId(vec![(0, 3), (1, 4), (2, 5)]);
-        let right = MultiBatchId(vec![(2, 5), (1, 4), (0, 3)]);
+    fn test_message_id_ordering() {
+        let left = MempoolMessageId(vec![(0, 3), (1, 4), (2, 5)]);
+        let right = MempoolMessageId(vec![(2, 5), (1, 4), (0, 3)]);
+        assert!(left > right);
 
+        let left = MempoolMessageId(vec![(0, 3), (1, 4), (2, 5)]);
+        let sender = 1 << 56;
+        let right = MempoolMessageId(vec![(2, 5), (1, 4), (sender, 3)]);
+        assert!(right > left);
+
+        let left = MempoolMessageId(vec![(sender, 3), (1 | sender, 4), (2 | sender, 3)]);
+        let right = MempoolMessageId(vec![(2 | sender, 5), (1, 4), (0, 5)]);
+        assert!(left > right);
+
+        let left = MempoolMessageId(vec![(sender, 3), (1 | sender, 4), (2, 3)]);
+        let right = MempoolMessageId(vec![(2 | sender, 5), (1, 4), (2, 3)]);
         assert!(left > right);
+
+        let left = MempoolMessageId(vec![(sender, 3), (1 | sender, 3), (2, 3)]);
+        let right = MempoolMessageId(vec![(2 | sender, 5), (1 | sender, 4), (2, 3)]);
+        assert!(right > left);
     }
 }
 
@@ -362,9 +463,9 @@ mod test {
 #[derive(Clone, Debug)]
 pub struct BroadcastInfo {
     // Sent broadcasts that have not yet received an ack.
-    pub sent_batches: BTreeMap<MultiBatchId, SystemTime>,
+    pub sent_messages: BTreeMap<MempoolMessageId, SystemTime>,
     // Broadcasts that have received a retry ack and are pending a resend.
-    pub retry_batches: BTreeSet<MultiBatchId>,
+    pub retry_messages: BTreeSet<MempoolMessageId>,
     // Whether broadcasting to this peer is in backoff mode, e.g. broadcasting at longer intervals.
     pub backoff_mode: bool,
 }
@@ -372,8 +473,8 @@ pub struct BroadcastInfo {
 impl BroadcastInfo {
     fn new() -> Self {
         Self {
-            sent_batches: BTreeMap::new(),
-            retry_batches: BTreeSet::new(),
+            sent_messages: BTreeMap::new(),
+            retry_messages: BTreeSet::new(),
             backoff_mode: false,
         }
     }
diff --git a/mempool/src/shared_mempool/use_case_history.rs b/mempool/src/shared_mempool/use_case_history.rs
new file mode 100644
index 0000000000000..8e75f445e397e
--- /dev/null
+++ b/mempool/src/shared_mempool/use_case_history.rs
@@ -0,0 +1,214 @@
+// Copyright (c) Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use aptos_logger::info;
+use aptos_mempool_notifications::CommittedTransaction;
+use aptos_types::transaction::use_case::UseCaseKey;
+use std::{
+    cmp::Ordering,
+    collections::{BinaryHeap, HashMap, VecDeque},
+};
+
+pub(crate) struct UseCaseHistory {
+    window_size: usize,
+    num_top_to_track: usize,
+    recent: VecDeque<HashMap<UseCaseKey, usize>>,
+    total: HashMap<UseCaseKey, usize>,
+}
+
+impl UseCaseHistory {
+    pub(crate) fn new(window_size: usize, num_top_to_track: usize) -> Self {
+        Self {
+            window_size,
+            num_top_to_track,
+            recent: VecDeque::with_capacity(window_size + 1),
+            total: HashMap::new(),
+        }
+    }
+
+    fn add_to_recent(&mut self, count_by_usecase: HashMap<UseCaseKey, usize>) {
+        for (use_case, count) in &count_by_usecase {
+            assert!(*count > 0);
+            *self.total.entry(use_case.clone()).or_insert(0) += *count;
+        }
+        self.recent.push_back(count_by_usecase);
+
+        while self.recent.len() > self.window_size {
+            let to_remove = self.recent.pop_front().expect("non-empty after size check");
+            for (use_case, count) in to_remove {
+                assert!(count > 0);
+
+                use std::collections::hash_map::Entry;
+                match self.total.entry(use_case) {
+                    Entry::Occupied(mut o) => {
+                        assert!(*o.get() >= count);
+                        *o.get_mut() -= count;
+                        if *o.get() == 0 {
+                            o.remove_entry();
+                        }
+                    },
+                    Entry::Vacant(e) => {
+                        panic!("Entry present in recent cannot be missing in total {:?}", e)
+                    },
+                }
+            }
+        }
+    }
+
+    pub fn compute_tracking_set(&self) -> HashMap<UseCaseKey, String> {
+        let mut result = HashMap::new();
+        result.insert(UseCaseKey::Platform, "entry_platform".to_string());
+        result.insert(UseCaseKey::Others, "non_entry".to_string());
+
+        let mut max_heap: BinaryHeap<UseCaseByCount> = self
+            .total
+            .iter()
+            .filter(|(use_case, _)| {
+                *use_case != &UseCaseKey::Platform && *use_case != &UseCaseKey::Others
+            })
+            .map(|(use_case, count)| UseCaseByCount {
+                use_case: use_case.clone(),
+                count: *count,
+            })
+            .collect::<BinaryHeap<_>>();
+
+        let mut list_to_print = Vec::new();
+
+        for i in 0..self.num_top_to_track {
+            if let Some(UseCaseByCount { use_case, count }) = max_heap.pop() {
+                let name = format!("entry_user_top_{}", i + 1);
+
+                list_to_print.push((use_case.clone(), name.clone(), count));
+                result.insert(use_case, name);
+            }
+        }
+        info!("Computed new use case tracking set: {:?}", list_to_print);
+
+        result
+    }
+
+    pub(crate) fn update_usecases(&mut self, transactions: &[CommittedTransaction]) {
+        let mut count_by_usecase = HashMap::new();
+        for transaction in transactions {
+            *count_by_usecase
+                .entry(transaction.use_case.clone())
+                .or_insert(0) += 1;
+        }
+
+        self.add_to_recent(count_by_usecase);
+    }
+}
+
+#[derive(Eq, PartialEq)]
+struct UseCaseByCount {
+    use_case: UseCaseKey,
+    count: usize,
+}
+
+impl Ord for UseCaseByCount {
+    fn cmp(&self, other: &Self) -> Ordering {
+        self.count.cmp(&other.count)
+    }
+}
+
+impl PartialOrd for UseCaseByCount {
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+        Some(self.cmp(other))
+    }
+}
+
+#[test]
+fn test_use_case_history() {
+    use aptos_types::account_address::AccountAddress;
+    let ct = |use_case: UseCaseKey| -> CommittedTransaction {
+        CommittedTransaction {
+            sender: AccountAddress::ONE,
+            sequence_number: 0,
+            use_case,
+        }
+    };
+
+    let expected_from_top2 =
+        |top_1: UseCaseKey, top_2: UseCaseKey| -> HashMap<UseCaseKey, String> {
+            HashMap::from([
+                (Platform, "entry_platform".into()),
+                (Others, "non_entry".into()),
+                (top_1, "entry_user_top_1".into()),
+                (top_2, "entry_user_top_2".into()),
+            ])
+        };
+
+    let usecase1 = ContractAddress(AccountAddress::random());
+    let usecase2 = ContractAddress(AccountAddress::random());
+    let usecase3 = ContractAddress(AccountAddress::random());
+
+    use UseCaseKey::*;
+
+    let mut history = UseCaseHistory::new(2, 2);
+
+    history.update_usecases(&[ct(Platform)]);
+    assert_eq!(
+        history.compute_tracking_set(),
+        HashMap::from([
+            (Platform, "entry_platform".into()),
+            (Others, "non_entry".into())
+        ])
+    );
+
+    history.update_usecases(&[
+        ct(Platform),
+        ct(Platform),
+        ct(usecase1.clone()),
+        ct(usecase1.clone()),
+        ct(usecase2.clone()),
+    ]);
+    assert_eq!(
+        history.compute_tracking_set(),
+        expected_from_top2(usecase1.clone(), usecase2.clone()),
+    );
+
+    history.update_usecases(&[
+        ct(usecase1.clone()),
+        ct(usecase2.clone()),
+        ct(usecase3.clone()),
+    ]);
+    assert_eq!(
+        history.compute_tracking_set(),
+        expected_from_top2(usecase1.clone(), usecase2.clone()),
+    );
+
+    history.update_usecases(&[
+        ct(usecase2.clone()),
+        ct(usecase2.clone()),
+        ct(usecase2.clone()),
+        ct(usecase3.clone()),
+    ]);
+    assert_eq!(
+        history.compute_tracking_set(),
+        expected_from_top2(usecase2.clone(), usecase3.clone()),
+    );
+
+    history.update_usecases(&[
+        ct(usecase2.clone()),
+        ct(usecase2.clone()),
+        ct(usecase3.clone()),
+        ct(usecase3.clone()),
+        ct(usecase3.clone()),
+    ]);
+    assert_eq!(
+        history.compute_tracking_set(),
+        expected_from_top2(usecase2.clone(), usecase3.clone()),
+    );
+
+    history.update_usecases(&[
+        ct(ContractAddress(AccountAddress::random())),
+        ct(ContractAddress(AccountAddress::random())),
+        ct(ContractAddress(AccountAddress::random())),
+        ct(ContractAddress(AccountAddress::random())),
+        ct(ContractAddress(AccountAddress::random())),
+    ]);
+    assert_eq!(
+        history.compute_tracking_set(),
+        expected_from_top2(usecase3.clone(), usecase2.clone()),
+    );
+}
diff --git a/mempool/src/tests/common.rs b/mempool/src/tests/common.rs
index f652ba3eb0629..9d94785a920fe 100644
--- a/mempool/src/tests/common.rs
+++ b/mempool/src/tests/common.rs
@@ -4,7 +4,7 @@
 
 use crate::{
     core_mempool::{CoreMempool, TimelineState},
-    network::MempoolSyncMsg,
+    network::{BroadcastPeerPriority, MempoolSyncMsg},
 };
 use anyhow::{format_err, Result};
 use aptos_compression::client::CompressionClient;
@@ -123,6 +123,8 @@ pub(crate) fn add_txns_to_mempool(
             transaction.account_seqno,
             TimelineState::NotReady,
             false,
+            None,
+            Some(BroadcastPeerPriority::Primary),
         );
         transactions.push(txn);
     }
@@ -151,6 +153,8 @@ pub(crate) fn add_signed_txn(pool: &mut CoreMempool, transaction: SignedTransact
             0,
             TimelineState::NotReady,
             false,
+            None,
+            Some(BroadcastPeerPriority::Primary),
         )
         .code
     {
diff --git a/mempool/src/tests/core_mempool_test.rs b/mempool/src/tests/core_mempool_test.rs
index e65ceb33fb1d7..86b0c33d46316 100644
--- a/mempool/src/tests/core_mempool_test.rs
+++ b/mempool/src/tests/core_mempool_test.rs
@@ -3,13 +3,14 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{
-    core_mempool::{CoreMempool, MempoolTransaction, SubmittedBy, TimelineState},
+    core_mempool::{sender_bucket, CoreMempool, MempoolTransaction, SubmittedBy, TimelineState},
+    network::BroadcastPeerPriority,
     tests::common::{
         add_signed_txn, add_txn, add_txns_to_mempool, setup_mempool,
         setup_mempool_with_broadcast_buckets, txn_bytes_len, TestTransaction,
     },
 };
-use aptos_config::config::NodeConfig;
+use aptos_config::config::{MempoolConfig, NodeConfig};
 use aptos_consensus_types::common::{TransactionInProgress, TransactionSummary};
 use aptos_crypto::HashValue;
 use aptos_types::{
@@ -17,7 +18,7 @@ use aptos_types::{
 };
 use itertools::Itertools;
 use maplit::btreemap;
-use std::time::{Duration, SystemTime};
+use std::time::{Duration, Instant, SystemTime};
 
 #[test]
 fn test_transaction_ordering_only_seqnos() {
@@ -75,6 +76,8 @@ fn test_transaction_metrics() {
         0,
         TimelineState::NotReady,
         false,
+        None,
+        Some(BroadcastPeerPriority::Primary),
     );
     let txn = TestTransaction::new(1, 0, 1).make_signed_transaction();
     mempool.add_txn(
@@ -83,6 +86,8 @@ fn test_transaction_metrics() {
         0,
         TimelineState::NonQualified,
         false,
+        None,
+        Some(BroadcastPeerPriority::Primary),
     );
     let txn = TestTransaction::new(2, 0, 1).make_signed_transaction();
     mempool.add_txn(
@@ -91,23 +96,25 @@ fn test_transaction_metrics() {
         0,
         TimelineState::NotReady,
         true,
+        None,
+        Some(BroadcastPeerPriority::Primary),
     );
 
     // Check timestamp returned as end-to-end for broadcast-able transaction
-    let (insertion_info, _bucket) = mempool
+    let (insertion_info, _bucket, _priority) = mempool
         .get_transaction_store()
         .get_insertion_info_and_bucket(&TestTransaction::get_address(0), 0)
         .unwrap();
     assert_eq!(insertion_info.submitted_by, SubmittedBy::Downstream);
 
     // Check timestamp returned as not end-to-end for non-broadcast-able transaction
-    let (insertion_info, _bucket) = mempool
+    let (insertion_info, _bucket, _priority) = mempool
         .get_transaction_store()
         .get_insertion_info_and_bucket(&TestTransaction::get_address(1), 0)
         .unwrap();
     assert_eq!(insertion_info.submitted_by, SubmittedBy::PeerValidator);
 
-    let (insertion_info, _bucket) = mempool
+    let (insertion_info, _bucket, _priority) = mempool
         .get_transaction_store()
         .get_insertion_info_and_bucket(&TestTransaction::get_address(2), 0)
         .unwrap();
@@ -317,7 +324,7 @@ fn test_commit_callback() {
 #[test]
 fn test_reset_sequence_number_on_failure() {
     let mut pool = setup_mempool().0;
-    let txns = vec![TestTransaction::new(1, 0, 1), TestTransaction::new(1, 1, 1)];
+    let txns = [TestTransaction::new(1, 0, 1), TestTransaction::new(1, 1, 1)];
     let hashes: Vec<_> = txns
         .iter()
         .cloned()
@@ -347,9 +354,9 @@ fn test_reset_sequence_number_on_failure() {
     assert!(add_txn(&mut pool, TestTransaction::new(1, 0, 1)).is_ok());
 }
 
-fn view(txns: Vec<SignedTransaction>) -> Vec<u64> {
+fn view(txns: Vec<(SignedTransaction, u64)>) -> Vec<u64> {
     txns.iter()
-        .map(SignedTransaction::sequence_number)
+        .map(|(txn, _)| txn.sequence_number())
         .sorted()
         .collect()
 }
@@ -357,82 +364,223 @@ fn view(txns: Vec<SignedTransaction>) -> Vec<u64> {
 #[test]
 fn test_timeline() {
     let mut pool = setup_mempool().0;
-    add_txns_to_mempool(&mut pool, vec![
+    let txns = add_txns_to_mempool(&mut pool, vec![
         TestTransaction::new(1, 0, 1),
         TestTransaction::new(1, 1, 1),
         TestTransaction::new(1, 3, 1),
         TestTransaction::new(1, 5, 1),
     ]);
+    let sender_bucket = sender_bucket(
+        &txns[0].sender(),
+        MempoolConfig::default().num_sender_buckets,
+    );
 
-    let (timeline, _) = pool.read_timeline(&vec![0].into(), 10);
+    let (timeline, _) = pool.read_timeline(
+        sender_bucket,
+        &vec![0].into(),
+        10,
+        None,
+        BroadcastPeerPriority::Primary,
+    );
     assert_eq!(view(timeline), vec![0, 1]);
     // Txns 3 and 5 should be in parking lot.
     assert_eq!(2, pool.get_parking_lot_size());
 
     // Add txn 2 to unblock txn3.
     add_txns_to_mempool(&mut pool, vec![TestTransaction::new(1, 2, 1)]);
-    let (timeline, _) = pool.read_timeline(&vec![0].into(), 10);
+    let (timeline, _) = pool.read_timeline(
+        sender_bucket,
+        &vec![0].into(),
+        10,
+        None,
+        BroadcastPeerPriority::Primary,
+    );
     assert_eq!(view(timeline), vec![0, 1, 2, 3]);
     // Txn 5 should be in parking lot.
     assert_eq!(1, pool.get_parking_lot_size());
 
     // Try different start read position.
-    let (timeline, _) = pool.read_timeline(&vec![2].into(), 10);
+    let (timeline, _) = pool.read_timeline(
+        sender_bucket,
+        &vec![2].into(),
+        10,
+        None,
+        BroadcastPeerPriority::Primary,
+    );
     assert_eq!(view(timeline), vec![2, 3]);
 
     // Simulate callback from consensus to unblock txn 5.
     pool.commit_transaction(&TestTransaction::get_address(1), 4);
-    let (timeline, _) = pool.read_timeline(&vec![0].into(), 10);
+    let (timeline, _) = pool.read_timeline(
+        sender_bucket,
+        &vec![0].into(),
+        10,
+        None,
+        BroadcastPeerPriority::Primary,
+    );
     assert_eq!(view(timeline), vec![5]);
     // check parking lot is empty
     assert_eq!(0, pool.get_parking_lot_size());
 }
 
+#[test]
+fn test_timeline_before() {
+    let mut pool = setup_mempool().0;
+    let txns = add_txns_to_mempool(&mut pool, vec![
+        TestTransaction::new(1, 0, 1),
+        TestTransaction::new(1, 1, 1),
+        TestTransaction::new(1, 3, 1),
+        TestTransaction::new(1, 5, 1),
+    ]);
+    let sender_bucket = sender_bucket(
+        &txns[0].sender(),
+        MempoolConfig::default().num_sender_buckets,
+    );
+    let insertion_done_time = Instant::now();
+
+    let (timeline, _) = pool.read_timeline(
+        sender_bucket,
+        &vec![0].into(),
+        10,
+        Some(insertion_done_time - Duration::from_millis(200)),
+        BroadcastPeerPriority::Primary,
+    );
+    assert!(timeline.is_empty());
+
+    let (timeline, _) = pool.read_timeline(
+        sender_bucket,
+        &vec![0].into(),
+        10,
+        Some(insertion_done_time),
+        BroadcastPeerPriority::Primary,
+    );
+    assert_eq!(view(timeline), vec![0, 1]);
+
+    let (timeline, _) = pool.read_timeline(
+        sender_bucket,
+        &vec![0].into(),
+        10,
+        Some(insertion_done_time + Duration::from_millis(200)),
+        BroadcastPeerPriority::Primary,
+    );
+    assert_eq!(view(timeline), vec![0, 1]);
+}
+
 #[test]
 fn test_multi_bucket_timeline() {
     let mut pool = setup_mempool_with_broadcast_buckets(vec![0, 101, 201]).0;
-    add_txns_to_mempool(&mut pool, vec![
+    let txns = add_txns_to_mempool(&mut pool, vec![
         TestTransaction::new(1, 0, 1),   // bucket 0
         TestTransaction::new(1, 1, 100), // bucket 0
         TestTransaction::new(1, 3, 200), // bucket 1
         TestTransaction::new(1, 5, 300), // bucket 2
     ]);
+    let sender_bucket = sender_bucket(
+        &txns[0].sender(),
+        MempoolConfig::default().num_sender_buckets,
+    );
 
-    let (timeline, _) = pool.read_timeline(&vec![0, 0, 0].into(), 10);
+    let (timeline, _) = pool.read_timeline(
+        sender_bucket,
+        &vec![0, 0, 0].into(),
+        10,
+        None,
+        BroadcastPeerPriority::Primary,
+    );
     assert_eq!(view(timeline), vec![0, 1]);
     // Txns 3 and 5 should be in parking lot.
     assert_eq!(2, pool.get_parking_lot_size());
 
     // Add txn 2 to unblock txn3.
     add_txns_to_mempool(&mut pool, vec![TestTransaction::new(1, 2, 1)]);
-    let (timeline, _) = pool.read_timeline(&vec![0, 0, 0].into(), 10);
+    let (timeline, _) = pool.read_timeline(
+        sender_bucket,
+        &vec![0, 0, 0].into(),
+        10,
+        None,
+        BroadcastPeerPriority::Primary,
+    );
     assert_eq!(view(timeline), vec![0, 1, 2, 3]);
     // Txn 5 should be in parking lot.
     assert_eq!(1, pool.get_parking_lot_size());
 
     // Try different start read positions. Expected buckets: [[0, 1, 2], [3], []]
-    let (timeline, _) = pool.read_timeline(&vec![1, 0, 0].into(), 10);
+    let (timeline, _) = pool.read_timeline(
+        sender_bucket,
+        &vec![1, 0, 0].into(),
+        10,
+        None,
+        BroadcastPeerPriority::Primary,
+    );
     assert_eq!(view(timeline), vec![1, 2, 3]);
-    let (timeline, _) = pool.read_timeline(&vec![2, 0, 0].into(), 10);
+    let (timeline, _) = pool.read_timeline(
+        sender_bucket,
+        &vec![2, 0, 0].into(),
+        10,
+        None,
+        BroadcastPeerPriority::Primary,
+    );
     assert_eq!(view(timeline), vec![2, 3]);
-    let (timeline, _) = pool.read_timeline(&vec![0, 1, 0].into(), 10);
+    let (timeline, _) = pool.read_timeline(
+        sender_bucket,
+        &vec![0, 1, 0].into(),
+        10,
+        None,
+        BroadcastPeerPriority::Primary,
+    );
     assert_eq!(view(timeline), vec![0, 1, 2]);
-    let (timeline, _) = pool.read_timeline(&vec![1, 1, 0].into(), 10);
+    let (timeline, _) = pool.read_timeline(
+        sender_bucket,
+        &vec![1, 1, 0].into(),
+        10,
+        None,
+        BroadcastPeerPriority::Primary,
+    );
     assert_eq!(view(timeline), vec![1, 2]);
-    let (timeline, _) = pool.read_timeline(&vec![2, 1, 0].into(), 10);
+    let (timeline, _) = pool.read_timeline(
+        sender_bucket,
+        &vec![2, 1, 0].into(),
+        10,
+        None,
+        BroadcastPeerPriority::Primary,
+    );
     assert_eq!(view(timeline), vec![2]);
-    let (timeline, _) = pool.read_timeline(&vec![3, 0, 0].into(), 10);
+    let (timeline, _) = pool.read_timeline(
+        sender_bucket,
+        &vec![3, 0, 0].into(),
+        10,
+        None,
+        BroadcastPeerPriority::Primary,
+    );
     assert_eq!(view(timeline), vec![3]);
-    let (timeline, _) = pool.read_timeline(&vec![3, 1, 0].into(), 10);
+    let (timeline, _) = pool.read_timeline(
+        sender_bucket,
+        &vec![3, 1, 0].into(),
+        10,
+        None,
+        BroadcastPeerPriority::Primary,
+    );
     assert!(view(timeline).is_empty());
 
     // Ensure high gas is prioritized.
-    let (timeline, _) = pool.read_timeline(&vec![0, 0, 0].into(), 1);
+    let (timeline, _) = pool.read_timeline(
+        sender_bucket,
+        &vec![0, 0, 0].into(),
+        1,
+        None,
+        BroadcastPeerPriority::Primary,
+    );
     assert_eq!(view(timeline), vec![3]);
 
     // Simulate callback from consensus to unblock txn 5.
     pool.commit_transaction(&TestTransaction::get_address(1), 4);
-    let (timeline, _) = pool.read_timeline(&vec![0, 0, 0].into(), 10);
+    let (timeline, _) = pool.read_timeline(
+        sender_bucket,
+        &vec![0, 0, 0].into(),
+        10,
+        None,
+        BroadcastPeerPriority::Primary,
+    );
     assert_eq!(view(timeline), vec![5]);
     // check parking lot is empty
     assert_eq!(0, pool.get_parking_lot_size());
@@ -441,64 +589,138 @@ fn test_multi_bucket_timeline() {
 #[test]
 fn test_multi_bucket_gas_ranking_update() {
     let mut pool = setup_mempool_with_broadcast_buckets(vec![0, 101, 201]).0;
-    add_txns_to_mempool(&mut pool, vec![
+    let txns = add_txns_to_mempool(&mut pool, vec![
         TestTransaction::new(1, 0, 1),   // bucket 0
         TestTransaction::new(1, 1, 100), // bucket 0
         TestTransaction::new(1, 2, 101), // bucket 1
         TestTransaction::new(1, 3, 200), // bucket 1
     ]);
+    let sender_bucket = sender_bucket(
+        &txns[0].sender(),
+        MempoolConfig::default().num_sender_buckets,
+    );
 
     // txn 2 and 3 are prioritized
-    let (timeline, _) = pool.read_timeline(&vec![0, 0, 0].into(), 2);
+    let (timeline, _) = pool.read_timeline(
+        sender_bucket,
+        &vec![0, 0, 0].into(),
+        2,
+        None,
+        BroadcastPeerPriority::Primary,
+    );
     assert_eq!(view(timeline), vec![2, 3]);
     // read only bucket 2
-    let (timeline, _) = pool.read_timeline(&vec![10, 10, 0].into(), 10);
+    let (timeline, _) = pool.read_timeline(
+        sender_bucket,
+        &vec![10, 10, 0].into(),
+        10,
+        None,
+        BroadcastPeerPriority::Primary,
+    );
     assert!(view(timeline).is_empty());
 
     // resubmit with higher gas: move txn 2 to bucket 2
     add_txns_to_mempool(&mut pool, vec![TestTransaction::new(1, 2, 400)]);
 
     // txn 2 is now prioritized
-    let (timeline, _) = pool.read_timeline(&vec![0, 0, 0].into(), 1);
+    let (timeline, _) = pool.read_timeline(
+        sender_bucket,
+        &vec![0, 0, 0].into(),
+        1,
+        None,
+        BroadcastPeerPriority::Primary,
+    );
     assert_eq!(view(timeline), vec![2]);
     // then txn 3 is prioritized
-    let (timeline, _) = pool.read_timeline(&vec![0, 0, 0].into(), 2);
+    let (timeline, _) = pool.read_timeline(
+        sender_bucket,
+        &vec![0, 0, 0].into(),
+        2,
+        None,
+        BroadcastPeerPriority::Primary,
+    );
     assert_eq!(view(timeline), vec![2, 3]);
     // read only bucket 2
-    let (timeline, _) = pool.read_timeline(&vec![10, 10, 0].into(), 10);
+    let (timeline, _) = pool.read_timeline(
+        sender_bucket,
+        &vec![10, 10, 0].into(),
+        10,
+        None,
+        BroadcastPeerPriority::Primary,
+    );
     assert_eq!(view(timeline), vec![2]);
     // read only bucket 1
-    let (timeline, _) = pool.read_timeline(&vec![10, 0, 10].into(), 10);
+    let (timeline, _) = pool.read_timeline(
+        sender_bucket,
+        &vec![10, 0, 10].into(),
+        10,
+        None,
+        BroadcastPeerPriority::Primary,
+    );
     assert_eq!(view(timeline), vec![3]);
 }
 
 #[test]
 fn test_multi_bucket_removal() {
     let mut pool = setup_mempool_with_broadcast_buckets(vec![0, 101, 201]).0;
-    add_txns_to_mempool(&mut pool, vec![
+    let txns = add_txns_to_mempool(&mut pool, vec![
         TestTransaction::new(1, 0, 1),   // bucket 0
         TestTransaction::new(1, 1, 100), // bucket 0
         TestTransaction::new(1, 2, 300), // bucket 2
         TestTransaction::new(1, 3, 200), // bucket 1
     ]);
+    let sender_bucket = sender_bucket(
+        &txns[0].sender(),
+        MempoolConfig::default().num_sender_buckets,
+    );
 
-    let (timeline, _) = pool.read_timeline(&vec![0, 0, 0].into(), 10);
+    let (timeline, _) = pool.read_timeline(
+        sender_bucket,
+        &vec![0, 0, 0].into(),
+        10,
+        None,
+        BroadcastPeerPriority::Primary,
+    );
     assert_eq!(view(timeline), vec![0, 1, 2, 3]);
 
     pool.commit_transaction(&TestTransaction::get_address(1), 0);
-    let (timeline, _) = pool.read_timeline(&vec![0, 0, 0].into(), 10);
+    let (timeline, _) = pool.read_timeline(
+        sender_bucket,
+        &vec![0, 0, 0].into(),
+        10,
+        None,
+        BroadcastPeerPriority::Primary,
+    );
     assert_eq!(view(timeline), vec![1, 2, 3]);
 
     pool.commit_transaction(&TestTransaction::get_address(1), 1);
-    let (timeline, _) = pool.read_timeline(&vec![0, 0, 0].into(), 10);
+    let (timeline, _) = pool.read_timeline(
+        sender_bucket,
+        &vec![0, 0, 0].into(),
+        10,
+        None,
+        BroadcastPeerPriority::Primary,
+    );
     assert_eq!(view(timeline), vec![2, 3]);
 
     pool.commit_transaction(&TestTransaction::get_address(1), 2);
-    let (timeline, _) = pool.read_timeline(&vec![0, 0, 0].into(), 10);
+    let (timeline, _) = pool.read_timeline(
+        sender_bucket,
+        &vec![0, 0, 0].into(),
+        10,
+        None,
+        BroadcastPeerPriority::Primary,
+    );
     assert_eq!(view(timeline), vec![3]);
 
     pool.commit_transaction(&TestTransaction::get_address(1), 3);
-    let (timeline, _) = pool.read_timeline(&vec![0, 0, 0].into(), 10);
+    let (timeline, _) = pool.read_timeline(
+        sender_bucket,
+        &vec![0, 0, 0].into(),
+        10,
+        None,
+        BroadcastPeerPriority::Primary,
+    );
     assert!(view(timeline).is_empty());
 }
 
@@ -566,6 +788,8 @@ fn test_capacity_bytes() {
                 txn.sequence_info.account_sequence_number,
                 txn.timeline_state,
                 false,
+                None,
+                Some(BroadcastPeerPriority::Primary),
             );
             assert_eq!(status.code, MempoolStatusCode::Accepted);
         });
@@ -577,6 +801,8 @@ fn test_capacity_bytes() {
                 txn.sequence_info.account_sequence_number,
                 txn.timeline_state,
                 false,
+                None,
+                Some(BroadcastPeerPriority::Primary),
             );
             assert_eq!(status.code, MempoolStatusCode::MempoolIsFull);
         }
@@ -595,6 +821,7 @@ fn new_test_mempool_transaction(address: usize, sequence_number: u64) -> Mempool
         0,
         SystemTime::now(),
         false,
+        Some(BroadcastPeerPriority::Primary),
     )
 }
 
@@ -663,7 +890,17 @@ fn test_gc_ready_transaction() {
 
     // Insert in the middle transaction that's going to be expired.
     let txn = TestTransaction::new(1, 1, 1).make_signed_transaction_with_expiration_time(0);
-    pool.add_txn(txn, 1, 0, TimelineState::NotReady, false);
+    let sender_bucket = sender_bucket(&txn.sender(), MempoolConfig::default().num_sender_buckets);
+
+    pool.add_txn(
+        txn,
+        1,
+        0,
+        TimelineState::NotReady,
+        false,
+        None,
+        Some(BroadcastPeerPriority::Primary),
+    );
 
     // Insert few transactions after it.
     // They are supposed to be ready because there's a sequential path from 0 to them.
@@ -671,7 +908,13 @@ fn test_gc_ready_transaction() {
     add_txn(&mut pool, TestTransaction::new(1, 3, 1)).unwrap();
 
     // Check that all txns are ready.
-    let (timeline, _) = pool.read_timeline(&vec![0].into(), 10);
+    let (timeline, _) = pool.read_timeline(
+        sender_bucket,
+        &vec![0].into(),
+        10,
+        None,
+        BroadcastPeerPriority::Primary,
+    );
     assert_eq!(timeline.len(), 4);
 
     // GC expired transaction.
@@ -682,15 +925,27 @@ fn test_gc_ready_transaction() {
     assert_eq!(block.len(), 1);
     assert_eq!(block[0].sequence_number(), 0);
 
-    let (timeline, _) = pool.read_timeline(&vec![0].into(), 10);
+    let (timeline, _) = pool.read_timeline(
+        sender_bucket,
+        &vec![0].into(),
+        10,
+        None,
+        BroadcastPeerPriority::Primary,
+    );
     assert_eq!(timeline.len(), 1);
-    assert_eq!(timeline[0].sequence_number(), 0);
+    assert_eq!(timeline[0].0.sequence_number(), 0);
 
     // Resubmit txn 1
     add_txn(&mut pool, TestTransaction::new(1, 1, 1)).unwrap();
 
     // Make sure txns 2 and 3 can be broadcast after txn 1 is resubmitted
-    let (timeline, _) = pool.read_timeline(&vec![0].into(), 10);
+    let (timeline, _) = pool.read_timeline(
+        sender_bucket,
+        &vec![0].into(),
+        10,
+        None,
+        BroadcastPeerPriority::Primary,
+    );
     assert_eq!(timeline.len(), 4);
 }
 
@@ -702,7 +957,15 @@ fn test_clean_stuck_transactions() {
     }
     let db_sequence_number = 10;
     let txn = TestTransaction::new(0, db_sequence_number, 1).make_signed_transaction();
-    pool.add_txn(txn, 1, db_sequence_number, TimelineState::NotReady, false);
+    pool.add_txn(
+        txn,
+        1,
+        db_sequence_number,
+        TimelineState::NotReady,
+        false,
+        None,
+        Some(BroadcastPeerPriority::Primary),
+    );
     let block = pool.get_batch(1, 1024, true, btreemap![]);
     assert_eq!(block.len(), 1);
     assert_eq!(block[0].sequence_number(), 10);
@@ -719,6 +982,8 @@ fn test_get_transaction_by_hash() {
         db_sequence_number,
         TimelineState::NotReady,
         false,
+        None,
+        Some(BroadcastPeerPriority::Primary),
     );
     let hash = txn.committed_hash();
     let ret = pool.get_by_hash(hash);
@@ -739,6 +1004,8 @@ fn test_get_transaction_by_hash_after_the_txn_is_updated() {
         db_sequence_number,
         TimelineState::NotReady,
         false,
+        None,
+        Some(BroadcastPeerPriority::Primary),
     );
     let hash = txn.committed_hash();
 
@@ -750,6 +1017,8 @@ fn test_get_transaction_by_hash_after_the_txn_is_updated() {
         db_sequence_number,
         TimelineState::NotReady,
         false,
+        None,
+        Some(BroadcastPeerPriority::Primary),
     );
     let new_txn_hash = new_txn.committed_hash();
 
diff --git a/mempool/src/tests/fuzzing.rs b/mempool/src/tests/fuzzing.rs
index 2b756bcb6a33f..d978ecaf6c4ec 100644
--- a/mempool/src/tests/fuzzing.rs
+++ b/mempool/src/tests/fuzzing.rs
@@ -4,10 +4,13 @@
 
 use crate::{
     core_mempool::{CoreMempool, TimelineState},
-    network::MempoolSyncMsg,
+    network::{BroadcastPeerPriority, MempoolSyncMsg},
     shared_mempool::{tasks, types::SharedMempool},
 };
-use aptos_config::{config::NodeConfig, network_id::NetworkId};
+use aptos_config::{
+    config::{NodeConfig, NodeType},
+    network_id::NetworkId,
+};
 use aptos_infallible::{Mutex, RwLock};
 use aptos_network::{
     application::{interface::NetworkClient, storage::PeersAndMetadata},
@@ -23,10 +26,38 @@ use proptest::{
 };
 use std::{collections::HashMap, sync::Arc};
 
-pub fn mempool_incoming_transactions_strategy(
-) -> impl Strategy<Value = (Vec<SignedTransaction>, TimelineState)> {
+impl Arbitrary for BroadcastPeerPriority {
+    type Parameters = ();
+    type Strategy = BoxedStrategy<Self>;
+
+    fn arbitrary_with(_args: Self::Parameters) -> Self::Strategy {
+        prop_oneof![
+            Just(BroadcastPeerPriority::Primary),
+            Just(BroadcastPeerPriority::Failover),
+        ]
+        .boxed()
+    }
+}
+
+pub fn mempool_incoming_transactions_strategy() -> impl Strategy<
+    Value = (
+        Vec<(
+            SignedTransaction,
+            Option<u64>,
+            Option<BroadcastPeerPriority>,
+        )>,
+        TimelineState,
+    ),
+> {
     (
-        proptest::collection::vec(any::<SignedTransaction>(), 0..100),
+        proptest::collection::vec(
+            any::<(
+                SignedTransaction,
+                Option<u64>,
+                Option<BroadcastPeerPriority>,
+            )>(),
+            0..100,
+        ),
         prop_oneof![
             Just(TimelineState::NotReady),
             Just(TimelineState::NonQualified)
@@ -35,7 +66,11 @@ pub fn mempool_incoming_transactions_strategy(
 }
 
 pub fn test_mempool_process_incoming_transactions_impl(
-    txns: Vec<SignedTransaction>,
+    txns: Vec<(
+        SignedTransaction,
+        Option<u64>,
+        Option<BroadcastPeerPriority>,
+    )>,
     timeline_state: TimelineState,
 ) {
     let config = NodeConfig::default();
@@ -54,7 +89,7 @@ pub fn test_mempool_process_incoming_transactions_impl(
         Arc::new(mock_db),
         vm_validator,
         vec![],
-        config.base.role,
+        NodeType::extract_from_config(&config),
     );
 
     let _ = tasks::process_incoming_transactions(&smp, txns, timeline_state, false);
diff --git a/mempool/src/tests/mocks.rs b/mempool/src/tests/mocks.rs
index 486950aca5f9e..65ac4f1462cc4 100644
--- a/mempool/src/tests/mocks.rs
+++ b/mempool/src/tests/mocks.rs
@@ -4,6 +4,7 @@
 
 use crate::{
     core_mempool::{CoreMempool, TimelineState},
+    network::BroadcastPeerPriority,
     shared_mempool::start_shared_mempool,
     MempoolClientSender, QuorumStoreRequest,
 };
@@ -125,7 +126,7 @@ impl MockSharedMempool {
             PeerManagerRequestSender::new(network_reqs_tx),
             ConnectionRequestSender::new(connection_reqs_tx),
         );
-        let network_events = NetworkEvents::new(network_notifs_rx, None);
+        let network_events = NetworkEvents::new(network_notifs_rx, None, true);
         let (ac_client, client_events) = mpsc::channel(1_024);
         let (quorum_store_sender, quorum_store_receiver) = mpsc::channel(1_024);
         let (mempool_notifier, mempool_listener) =
@@ -184,6 +185,8 @@ impl MockSharedMempool {
                         0,
                         TimelineState::NotReady,
                         false,
+                        None,
+                        Some(BroadcastPeerPriority::Primary),
                     )
                     .code
                     != MempoolStatusCode::Accepted
diff --git a/mempool/src/tests/multi_node_test.rs b/mempool/src/tests/multi_node_test.rs
index 220c971a871ca..af3163fafa889 100644
--- a/mempool/src/tests/multi_node_test.rs
+++ b/mempool/src/tests/multi_node_test.rs
@@ -20,7 +20,12 @@ use aptos_config::{
 };
 use aptos_netcore::transport::ConnectionOrigin;
 use aptos_network::{
-    peer_manager::{PeerManagerNotification, PeerManagerRequest},
+    peer_manager::PeerManagerRequest,
+    protocols::{
+        direct_send::Message,
+        network::ReceivedMessage,
+        wire::messaging::v1::{DirectSendMsg, NetworkMessage},
+    },
     ProtocolId,
 };
 use aptos_types::{transaction::SignedTransaction, PeerId};
@@ -294,6 +299,81 @@ impl TestHarness {
             .check_no_network_messages_sent(network_id);
     }
 
+    fn handle_txns(
+        &mut self,
+        transactions: Vec<SignedTransaction>,
+        sender_id: &NodeId,
+        network_id: NetworkId,
+        num_transactions_in_message: Option<usize>, // If specified, checks the number of txns in the message
+        max_num_transactions_in_message: Option<usize>, // If specified, checks the max number of txns in the message
+        check_txns_in_mempool: bool, // Check whether all txns in this broadcast are accepted into recipient's mempool
+        execute_send: bool, // If true, actually delivers msg to remote peer; else, drop the message (useful for testing unreliable msg delivery)
+        drop_ack: bool,     // If true, drop ack from remote peer to this peer
+        remote_peer_id: PeerId,
+        msg: Message,
+    ) -> (Vec<SignedTransaction>, PeerId) {
+        let sender = self.mut_node(sender_id);
+        let sender_peer_id = sender.peer_id(network_id);
+
+        // Check that the number of received transactions exactly matches
+        if let Some(num_transactions_in_message) = num_transactions_in_message {
+            assert_eq!(num_transactions_in_message, transactions.len());
+        }
+
+        // Check that the number of transactions in the message is within than the max
+        if let Some(max_num_transactions_in_message) = max_num_transactions_in_message {
+            assert!(transactions.len() <= max_num_transactions_in_message);
+        }
+
+        // If we don't want to forward the request, let's just drop it
+        if !execute_send {
+            return (transactions, remote_peer_id);
+        }
+
+        // Otherwise, let's forward it
+        let lookup_peer_network_id = match network_id {
+            NetworkId::Vfn => {
+                // If this is a validator broadcasting on Vfn we have a problem
+                assert!(!sender.supported_networks().contains(&NetworkId::Validator));
+                // VFN should have same PeerId but different network from validator
+                PeerNetworkId::new(NetworkId::Validator, sender.peer_id(NetworkId::Public))
+            },
+            _ => PeerNetworkId::new(network_id, remote_peer_id),
+        };
+        let receiver_id = *self.peer_to_node_id.get(&lookup_peer_network_id).unwrap();
+        let receiver = self.mut_node(&receiver_id);
+        let rmsg = ReceivedMessage {
+            message: NetworkMessage::DirectSendMsg(DirectSendMsg {
+                protocol_id: msg.protocol_id,
+                priority: 0,
+                raw_msg: msg.mdata.into(),
+            }),
+            sender: PeerNetworkId::new(network_id, sender_peer_id),
+            receive_timestamp_micros: 0,
+            rpc_replier: None,
+        };
+
+        receiver.send_network_req(network_id, ProtocolId::MempoolDirectSend, rmsg);
+        receiver.wait_for_event(SharedMempoolNotification::NewTransactions);
+
+        // Verify transaction was inserted into Mempool
+        if check_txns_in_mempool {
+            let block = self
+                .node(sender_id)
+                .mempool()
+                .get_batch(100, 102400, true, btreemap![]);
+            for txn in transactions.iter() {
+                assert!(block.contains(txn));
+            }
+        }
+
+        // Sends an ACK response
+        if !drop_ack {
+            self.deliver_response(&receiver_id, network_id);
+        }
+        (transactions, remote_peer_id)
+    }
+
     /// Broadcast Transactions queued up in the local mempool of the sender
     fn broadcast_txns(
         &mut self,
@@ -315,7 +395,6 @@ impl TestHarness {
 
         // Get the outgoing network request on the sender
         let sender = self.mut_node(sender_id);
-        let sender_peer_id = sender.peer_id(network_id);
         let network_req = sender.get_next_network_req(network_id);
 
         // Handle outgoing message
@@ -325,70 +404,34 @@ impl TestHarness {
                 match mempool_message {
                     MempoolSyncMsg::BroadcastTransactionsRequest {
                         transactions,
-                        request_id: _request_id,
-                    } => {
-                        // Check that the number of received transactions exactly matches
-                        if let Some(num_transactions_in_message) = num_transactions_in_message {
-                            assert_eq!(num_transactions_in_message, transactions.len());
-                        }
-
-                        // Check that the number of transactions in the message is within than the max
-                        if let Some(max_num_transactions_in_message) =
-                            max_num_transactions_in_message
-                        {
-                            assert!(transactions.len() <= max_num_transactions_in_message);
-                        }
-
-                        // If we don't want to forward the request, let's just drop it
-                        if !execute_send {
-                            return (transactions, remote_peer_id);
-                        }
-
-                        // Otherwise, let's forward it
-                        let lookup_peer_network_id = match network_id {
-                            NetworkId::Vfn => {
-                                // If this is a validator broadcasting on Vfn we have a problem
-                                assert!(!sender
-                                    .supported_networks()
-                                    .contains(&NetworkId::Validator));
-                                // VFN should have same PeerId but different network from validator
-                                PeerNetworkId::new(
-                                    NetworkId::Validator,
-                                    sender.peer_id(NetworkId::Public),
-                                )
-                            },
-                            _ => PeerNetworkId::new(network_id, remote_peer_id),
-                        };
-                        let receiver_id =
-                            *self.peer_to_node_id.get(&lookup_peer_network_id).unwrap();
-                        let receiver = self.mut_node(&receiver_id);
-
-                        receiver.send_network_req(
-                            network_id,
-                            ProtocolId::MempoolDirectSend,
-                            PeerManagerNotification::RecvMessage(sender_peer_id, msg),
-                        );
-                        receiver.wait_for_event(SharedMempoolNotification::NewTransactions);
-
-                        // Verify transaction was inserted into Mempool
-                        if check_txns_in_mempool {
-                            let block = self.node(sender_id).mempool().get_batch(
-                                100,
-                                102400,
-                                true,
-                                btreemap![],
-                            );
-                            for txn in transactions.iter() {
-                                assert!(block.contains(txn));
-                            }
-                        }
-
-                        // Sends an ACK response
-                        if !drop_ack {
-                            self.deliver_response(&receiver_id, network_id);
-                        }
-                        (transactions, remote_peer_id)
-                    },
+                        message_id: _message_id,
+                    } => self.handle_txns(
+                        transactions,
+                        sender_id,
+                        network_id,
+                        num_transactions_in_message,
+                        max_num_transactions_in_message,
+                        check_txns_in_mempool,
+                        execute_send,
+                        drop_ack,
+                        remote_peer_id,
+                        msg,
+                    ),
+                    MempoolSyncMsg::BroadcastTransactionsRequestWithReadyTime {
+                        message_id: _message_id,
+                        transactions,
+                    } => self.handle_txns(
+                        transactions.into_iter().map(|(txn, _, _)| txn).collect(),
+                        sender_id,
+                        network_id,
+                        num_transactions_in_message,
+                        max_num_transactions_in_message,
+                        check_txns_in_mempool,
+                        execute_send,
+                        drop_ack,
+                        remote_peer_id,
+                        msg,
+                    ),
                     req => {
                         panic!("Unexpected broadcast transactions response {:?}", req)
                     },
@@ -432,11 +475,18 @@ impl TestHarness {
                         let receiver_id =
                             *self.peer_to_node_id.get(&lookup_peer_network_id).unwrap();
                         let receiver = self.mut_node(&receiver_id);
-                        receiver.send_network_req(
-                            network_id,
-                            ProtocolId::MempoolDirectSend,
-                            PeerManagerNotification::RecvMessage(sender_peer_id, msg),
-                        );
+                        let rmsg = ReceivedMessage {
+                            message: NetworkMessage::DirectSendMsg(DirectSendMsg {
+                                protocol_id: msg.protocol_id,
+                                priority: 0,
+                                raw_msg: msg.mdata.into(),
+                            }),
+                            sender: PeerNetworkId::new(network_id, sender_peer_id),
+                            receive_timestamp_micros: 0,
+                            rpc_replier: None,
+                        };
+
+                        receiver.send_network_req(network_id, ProtocolId::MempoolDirectSend, rmsg);
                     },
                     request => panic!(
                         "did not receive expected broadcast ACK, instead got {:?}",
diff --git a/mempool/src/tests/node.rs b/mempool/src/tests/node.rs
index ff3d9b7167c87..a86c55f5bee0c 100644
--- a/mempool/src/tests/node.rs
+++ b/mempool/src/tests/node.rs
@@ -4,7 +4,7 @@
 
 use crate::{
     core_mempool::{CoreMempool, TimelineState},
-    network::MempoolSyncMsg,
+    network::{BroadcastPeerPriority, MempoolSyncMsg},
     shared_mempool::{start_shared_mempool, types::SharedMempoolNotification},
     tests::common::TestTransaction,
 };
@@ -22,12 +22,11 @@ use aptos_network::{
         interface::{NetworkClient, NetworkServiceEvents},
         storage::PeersAndMetadata,
     },
-    peer_manager::{
-        ConnectionRequestSender, PeerManagerNotification, PeerManagerRequest,
-        PeerManagerRequestSender,
-    },
+    peer_manager::{ConnectionRequestSender, PeerManagerRequest, PeerManagerRequestSender},
     protocols::{
-        network::{NetworkEvents, NetworkSender, NewNetworkEvents, NewNetworkSender},
+        network::{
+            NetworkEvents, NetworkSender, NewNetworkEvents, NewNetworkSender, ReceivedMessage,
+        },
         wire::handshake::v1::ProtocolId::MempoolDirectSend,
     },
     transport::ConnectionMetadata,
@@ -383,6 +382,8 @@ impl Node {
                 0,
                 TimelineState::NotReady,
                 false,
+                None,
+                Some(BroadcastPeerPriority::Primary),
             );
         }
     }
@@ -449,12 +450,12 @@ impl Node {
             .get_next_network_req(runtime)
     }
 
-    /// Send network request `PeerManagerNotification` from a remote peer to the local node
+    /// Send network request `ReceivedMessage` from a remote peer to the local node
     pub fn send_network_req(
         &mut self,
         network_id: NetworkId,
         protocol: ProtocolId,
-        notif: PeerManagerNotification,
+        notif: ReceivedMessage,
     ) {
         self.get_network_interface(network_id)
             .send_network_req(protocol, notif);
@@ -467,8 +468,7 @@ pub struct NodeNetworkInterface {
     /// Peer request receiver for messages
     pub(crate) network_reqs_rx: aptos_channel::Receiver<(PeerId, ProtocolId), PeerManagerRequest>,
     /// Peer notification sender for sending outgoing messages to other peers
-    pub(crate) network_notifs_tx:
-        aptos_channel::Sender<(PeerId, ProtocolId), PeerManagerNotification>,
+    pub(crate) network_notifs_tx: aptos_channel::Sender<(PeerId, ProtocolId), ReceivedMessage>,
 }
 
 impl NodeNetworkInterface {
@@ -476,11 +476,8 @@ impl NodeNetworkInterface {
         runtime.block_on(self.network_reqs_rx.next()).unwrap()
     }
 
-    fn send_network_req(&mut self, protocol: ProtocolId, message: PeerManagerNotification) {
-        let remote_peer_id = match &message {
-            PeerManagerNotification::RecvRpc(peer_id, _) => *peer_id,
-            PeerManagerNotification::RecvMessage(peer_id, _) => *peer_id,
-        };
+    fn send_network_req(&mut self, protocol: ProtocolId, message: ReceivedMessage) {
+        let remote_peer_id = message.sender.peer_id();
 
         self.network_notifs_tx
             .push((remote_peer_id, protocol), message)
@@ -548,7 +545,7 @@ fn setup_node_network_interface(
         PeerManagerRequestSender::new(network_reqs_tx),
         ConnectionRequestSender::new(connection_reqs_tx),
     );
-    let network_events = NetworkEvents::new(network_notifs_rx, None);
+    let network_events = NetworkEvents::new(network_notifs_rx, None, true);
 
     (
         NodeNetworkInterface {
diff --git a/mempool/src/tests/shared_mempool_test.rs b/mempool/src/tests/shared_mempool_test.rs
index 4b8b5a2d702d2..fb6adb4b1a99e 100644
--- a/mempool/src/tests/shared_mempool_test.rs
+++ b/mempool/src/tests/shared_mempool_test.rs
@@ -3,10 +3,13 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{
+    core_mempool::sender_bucket,
     mocks::MockSharedMempool,
+    network::BroadcastPeerPriority,
     tests::common::{batch_add_signed_txn, TestTransaction},
     QuorumStoreRequest,
 };
+use aptos_config::config::MempoolConfig;
 use aptos_consensus_types::common::RejectedTransactionSummary;
 use aptos_mempool_notifications::MempoolNotificationSender;
 use aptos_types::{transaction::Transaction, vm_status::DiscardedVMStatus};
@@ -22,12 +25,17 @@ async fn test_consensus_events_rejected_txns() {
     // Txn 2: not committed with different address
     // Txn 3: not committed with same address
     let rejected_txn = TestTransaction::new(0, 0, 1).make_signed_transaction();
-    let kept_txn = TestTransaction::new(1, 0, 1).make_signed_transaction();
-    let txns = vec![
-        rejected_txn.clone(),
-        kept_txn.clone(),
-        TestTransaction::new(0, 1, 1).make_signed_transaction(),
-    ];
+    let kept_txn_1 = TestTransaction::new(1, 0, 1).make_signed_transaction();
+    let kept_txn_2 = TestTransaction::new(0, 1, 1).make_signed_transaction();
+    let txns = vec![rejected_txn.clone(), kept_txn_1.clone(), kept_txn_2.clone()];
+    let sender_bucket_1 = sender_bucket(
+        &kept_txn_1.sender(),
+        MempoolConfig::default().num_sender_buckets,
+    );
+    let sender_bucket_2 = sender_bucket(
+        &kept_txn_2.sender(),
+        MempoolConfig::default().num_sender_buckets,
+    );
     // Add txns to mempool
     {
         let mut pool = smp.mempool.lock();
@@ -48,9 +56,38 @@ async fn test_consensus_events_rejected_txns() {
 
     let pool = smp.mempool.lock();
     // TODO: make less brittle to broadcast buckets changes
-    let (timeline, _) = pool.read_timeline(&vec![0; 10].into(), 10);
-    assert_eq!(timeline.len(), 2);
-    assert_eq!(timeline.first().unwrap(), &kept_txn);
+    if sender_bucket_1 != sender_bucket_2 {
+        let (timeline, _) = pool.read_timeline(
+            sender_bucket_1,
+            &vec![0; 10].into(),
+            10,
+            None,
+            BroadcastPeerPriority::Primary,
+        );
+        assert_eq!(timeline.len(), 1);
+        assert_eq!(timeline.first().unwrap().0, kept_txn_1);
+
+        let (timeline, _) = pool.read_timeline(
+            sender_bucket_2,
+            &vec![0; 10].into(),
+            10,
+            None,
+            BroadcastPeerPriority::Primary,
+        );
+        assert_eq!(timeline.len(), 1);
+        assert_eq!(timeline.first().unwrap().0, kept_txn_2);
+    } else {
+        let (timeline, _) = pool.read_timeline(
+            sender_bucket_1,
+            &vec![0; 10].into(),
+            10,
+            None,
+            BroadcastPeerPriority::Primary,
+        );
+        assert_eq!(timeline.len(), 2);
+        assert_eq!(timeline[0].0, kept_txn_1);
+        assert_eq!(timeline[1].0, kept_txn_2);
+    }
 }
 
 #[allow(clippy::await_holding_lock)] // This appears to be a false positive!
@@ -71,6 +108,10 @@ async fn test_mempool_notify_committed_txns() {
         TestTransaction::new(0, 1, 1).make_signed_transaction_with_expiration_time(0),
         kept_txn.clone(),
     ];
+    let sender_bucket = sender_bucket(
+        &kept_txn.sender(),
+        MempoolConfig::default().num_sender_buckets,
+    );
     // Add txns to mempool
     {
         let mut pool = smp.mempool.lock();
@@ -89,8 +130,14 @@ async fn test_mempool_notify_committed_txns() {
     let wait_for_commit = async {
         let pool = smp.mempool.lock();
         // TODO: make less brittle to broadcast buckets changes
-        let (timeline, _) = pool.read_timeline(&vec![0; 10].into(), 10);
-        if timeline.len() == 10 && timeline.first().unwrap() == &kept_txn {
+        let (timeline, _) = pool.read_timeline(
+            sender_bucket,
+            &vec![0; 10].into(),
+            10,
+            None,
+            BroadcastPeerPriority::Primary,
+        );
+        if timeline.len() == 10 && timeline.first().unwrap().0 == kept_txn {
             return; // Mempool handled the commit notification
         }
         drop(pool);
diff --git a/mempool/src/tests/test_framework.rs b/mempool/src/tests/test_framework.rs
index 92e901f2a767b..ddddbb944f21b 100644
--- a/mempool/src/tests/test_framework.rs
+++ b/mempool/src/tests/test_framework.rs
@@ -4,8 +4,11 @@
 
 use crate::{
     core_mempool::CoreMempool,
-    shared_mempool::{start_shared_mempool, types::MultiBatchId},
-    tests::{common, common::TestTransaction},
+    shared_mempool::{
+        start_shared_mempool,
+        types::{MempoolMessageId, MempoolSenderBucket},
+    },
+    tests::common::{self, TestTransaction},
     MempoolClientRequest, MempoolClientSender, MempoolSyncMsg, QuorumStoreRequest,
 };
 use aptos_channels::{aptos_channel, message_queues::QueueStyle};
@@ -22,15 +25,15 @@ use aptos_network::{
         interface::{NetworkClient, NetworkServiceEvents},
         storage::PeersAndMetadata,
     },
-    peer_manager::{
-        ConnectionRequestSender, PeerManagerNotification, PeerManagerRequest,
-        PeerManagerRequestSender,
-    },
+    peer_manager::{ConnectionRequestSender, PeerManagerRequest, PeerManagerRequestSender},
     protocols::{
-        direct_send::Message,
-        network::{NetworkEvents, NetworkSender, NewNetworkEvents, NewNetworkSender},
-        rpc::InboundRpcRequest,
-        wire::handshake::v1::ProtocolId::MempoolDirectSend,
+        network::{
+            NetworkEvents, NetworkSender, NewNetworkEvents, NewNetworkSender, ReceivedMessage,
+        },
+        wire::{
+            handshake::v1::ProtocolId::MempoolDirectSend,
+            messaging::v1::{DirectSendMsg, NetworkMessage, RpcRequest},
+        },
     },
     testutils::{
         builder::TestFrameworkBuilder,
@@ -254,28 +257,43 @@ impl MempoolNode {
         let network_id = remote_peer_network_id.network_id();
         let remote_peer_id = remote_peer_network_id.peer_id();
         let inbound_handle = self.get_inbound_handle(network_id);
-        let batch_id = MultiBatchId::from_timeline_ids(&vec![1].into(), &vec![10].into());
+        let message_id_in_request = MempoolMessageId::from_timeline_ids(vec![(
+            0 as MempoolSenderBucket,
+            (vec![1].into(), vec![10].into()),
+        )]);
         let msg = MempoolSyncMsg::BroadcastTransactionsRequest {
-            request_id: batch_id.clone(),
+            message_id: message_id_in_request.clone(),
             transactions: sign_transactions(txns),
         };
-        let data = protocol_id.to_bytes(&msg).unwrap().into();
+        let data = protocol_id.to_bytes(&msg).unwrap();
         let (notif, maybe_receiver) = match protocol_id {
             ProtocolId::MempoolDirectSend => (
-                PeerManagerNotification::RecvMessage(remote_peer_id, Message {
-                    protocol_id,
-                    mdata: data,
-                }),
+                ReceivedMessage {
+                    message: NetworkMessage::DirectSendMsg(DirectSendMsg {
+                        protocol_id,
+                        priority: 0,
+                        raw_msg: data,
+                    }),
+                    sender: PeerNetworkId::new(network_id, remote_peer_id),
+                    receive_timestamp_micros: 0,
+                    rpc_replier: None,
+                },
                 None,
             ),
             ProtocolId::MempoolRpc => {
                 let (res_tx, res_rx) = oneshot::channel();
-                let notif = PeerManagerNotification::RecvRpc(remote_peer_id, InboundRpcRequest {
-                    protocol_id,
-                    data,
-                    res_tx,
-                });
-                (notif, Some(res_rx))
+                let rmsg = ReceivedMessage {
+                    message: NetworkMessage::RpcRequest(RpcRequest {
+                        protocol_id,
+                        request_id: 0,
+                        priority: 0,
+                        raw_request: data,
+                    }),
+                    sender: PeerNetworkId::new(network_id, remote_peer_id),
+                    receive_timestamp_micros: 0,
+                    rpc_replier: Some(Arc::new(res_tx)),
+                };
+                (rmsg, Some(res_rx))
             },
 
             protocol_id => panic!("Invalid protocol id found: {:?}", protocol_id),
@@ -298,12 +316,12 @@ impl MempoolNode {
             }
         };
         if let MempoolSyncMsg::BroadcastTransactionsResponse {
-            request_id,
+            message_id: message_id_in_response,
             retry,
             backoff,
         } = response
         {
-            assert_eq!(batch_id, request_id);
+            assert_eq!(message_id_in_response, message_id_in_request);
             assert!(!retry);
             assert!(!backoff);
         } else {
@@ -362,9 +380,9 @@ impl MempoolNode {
         };
         assert_eq!(peer_id, expected_peer_id);
         let mempool_message = common::decompress_and_deserialize(&data.to_vec());
-        let request_id = match mempool_message {
+        let message_id = match mempool_message {
             MempoolSyncMsg::BroadcastTransactionsRequest {
-                request_id,
+                message_id,
                 transactions,
             } => {
                 if !block_only_contains_transactions(&transactions, expected_txns) {
@@ -387,14 +405,42 @@ impl MempoolNode {
                         txns, expected_txns
                     );
                 }
-                request_id
+                message_id
+            },
+            MempoolSyncMsg::BroadcastTransactionsRequestWithReadyTime {
+                message_id,
+                transactions,
+            } => {
+                let transactions: Vec<_> =
+                    transactions.iter().map(|(txn, _, _)| txn.clone()).collect();
+                if !block_only_contains_transactions(&transactions, expected_txns) {
+                    let txns: Vec<_> = transactions
+                        .iter()
+                        .map(|txn| (txn.sender(), txn.sequence_number()))
+                        .collect();
+                    let expected_txns: Vec<_> = expected_txns
+                        .iter()
+                        .map(|txn| {
+                            (
+                                TestTransaction::get_address(txn.address),
+                                txn.sequence_number,
+                            )
+                        })
+                        .collect();
+
+                    panic!(
+                        "Request doesn't match. Actual: {:?} Expected: {:?}",
+                        txns, expected_txns
+                    );
+                }
+                message_id
             },
             MempoolSyncMsg::BroadcastTransactionsResponse { .. } => {
                 panic!("We aren't supposed to be getting as response here");
             },
         };
         let response = MempoolSyncMsg::BroadcastTransactionsResponse {
-            request_id,
+            message_id,
             retry,
             backoff,
         };
@@ -403,10 +449,16 @@ impl MempoolNode {
         if let Some(rpc_sender) = maybe_rpc_sender {
             rpc_sender.send(Ok(bytes.into())).unwrap();
         } else {
-            let notif = PeerManagerNotification::RecvMessage(peer_id, Message {
-                protocol_id,
-                mdata: bytes.into(),
-            });
+            let notif = ReceivedMessage {
+                message: NetworkMessage::DirectSendMsg(DirectSendMsg {
+                    protocol_id,
+                    priority: 0,
+                    raw_msg: bytes,
+                }),
+                sender: PeerNetworkId::new(network_id, peer_id),
+                receive_timestamp_micros: 0,
+                rpc_replier: None,
+            };
             inbound_handle
                 .inbound_message_sender
                 .push((peer_id, protocol_id), notif)
@@ -546,7 +598,7 @@ fn setup_network(
         PeerManagerRequestSender::new(reqs_outbound_sender),
         ConnectionRequestSender::new(connection_outbound_sender),
     );
-    let network_events = NetworkEvents::new(reqs_inbound_receiver, None);
+    let network_events = NetworkEvents::new(reqs_inbound_receiver, None, true);
 
     (
         network_sender,
diff --git a/network/builder/src/builder.rs b/network/builder/src/builder.rs
index d8ea149a2f1fe..a4b941cef6a22 100644
--- a/network/builder/src/builder.rs
+++ b/network/builder/src/builder.rs
@@ -13,9 +13,8 @@
 use aptos_config::{
     config::{
         DiscoveryMethod, NetworkConfig, Peer, PeerRole, PeerSet, RoleType, CONNECTION_BACKOFF_BASE,
-        CONNECTIVITY_CHECK_INTERVAL_MS, MAX_CONCURRENT_NETWORK_REQS, MAX_CONNECTION_DELAY_MS,
-        MAX_FRAME_SIZE, MAX_FULLNODE_OUTBOUND_CONNECTIONS, MAX_INBOUND_CONNECTIONS,
-        NETWORK_CHANNEL_SIZE,
+        CONNECTIVITY_CHECK_INTERVAL_MS, MAX_CONNECTION_DELAY_MS, MAX_FRAME_SIZE,
+        MAX_FULLNODE_OUTBOUND_CONNECTIONS, MAX_INBOUND_CONNECTIONS, NETWORK_CHANNEL_SIZE,
     },
     network_id::NetworkContext,
 };
@@ -84,7 +83,6 @@ impl NetworkBuilder {
         max_message_size: usize,
         enable_proxy_protocol: bool,
         network_channel_size: usize,
-        max_concurrent_network_reqs: usize,
         inbound_connection_limit: usize,
         tcp_buffer_cfg: TCPBufferCfg,
     ) -> Self {
@@ -98,7 +96,6 @@ impl NetworkBuilder {
             peers_and_metadata.clone(),
             authentication_mode,
             network_channel_size,
-            max_concurrent_network_reqs,
             max_frame_size,
             max_message_size,
             enable_proxy_protocol,
@@ -141,7 +138,6 @@ impl NetworkBuilder {
             MAX_MESSAGE_SIZE,
             false, /* Disable proxy protocol */
             NETWORK_CHANNEL_SIZE,
-            MAX_CONCURRENT_NETWORK_REQS,
             MAX_INBOUND_CONNECTIONS,
             TCPBufferCfg::default(),
         );
@@ -192,7 +188,6 @@ impl NetworkBuilder {
             config.max_message_size,
             config.enable_proxy_protocol,
             config.network_channel_size,
-            config.max_concurrent_network_reqs,
             config.max_inbound_connections,
             TCPBufferCfg::new_configs(
                 config.inbound_rx_buffer_size_bytes,
@@ -412,6 +407,7 @@ impl NetworkBuilder {
         let (hc_network_tx, hc_network_rx) = self.add_client_and_service(
             &health_checker::health_checker_network_config(),
             max_parallel_deserialization_tasks,
+            true,
         );
         self.health_checker_builder = Some(HealthCheckerBuilder::new(
             self.network_context(),
@@ -437,12 +433,14 @@ impl NetworkBuilder {
         &mut self,
         config: &NetworkApplicationConfig,
         max_parallel_deserialization_tasks: Option<usize>,
+        allow_out_of_order_delivery: bool,
     ) -> (SenderT, EventsT) {
         (
             self.add_client(&config.network_client_config),
             self.add_service(
                 &config.network_service_config,
                 max_parallel_deserialization_tasks,
+                allow_out_of_order_delivery,
             ),
         )
     }
@@ -461,9 +459,14 @@ impl NetworkBuilder {
         &mut self,
         config: &NetworkServiceConfig,
         max_parallel_deserialization_tasks: Option<usize>,
+        allow_out_of_order_delivery: bool,
     ) -> EventsT {
         let peer_mgr_reqs_rx = self.peer_manager_builder.add_service(config);
-        EventsT::new(peer_mgr_reqs_rx, max_parallel_deserialization_tasks)
+        EventsT::new(
+            peer_mgr_reqs_rx,
+            max_parallel_deserialization_tasks,
+            allow_out_of_order_delivery,
+        )
     }
 }
 
diff --git a/network/builder/src/dummy.rs b/network/builder/src/dummy.rs
index fc96594ed2efe..1d19e80e2776b 100644
--- a/network/builder/src/dummy.rs
+++ b/network/builder/src/dummy.rs
@@ -112,7 +112,7 @@ pub fn setup_network() -> DummyNetwork {
     );
 
     let (listener_sender, listener_events) = network_builder
-        .add_client_and_service::<_, DummyNetworkEvents>(&dummy_network_config(), None);
+        .add_client_and_service::<_, DummyNetworkEvents>(&dummy_network_config(), None, true);
     network_builder.build(runtime.handle().clone()).start();
     let listener_network_client = NetworkClient::new(
         vec![TEST_DIRECT_SEND_PROTOCOL],
@@ -147,7 +147,7 @@ pub fn setup_network() -> DummyNetwork {
     let mut connection_events = peers_and_metadata.subscribe();
 
     let (dialer_sender, dialer_events) = network_builder
-        .add_client_and_service::<_, DummyNetworkEvents>(&dummy_network_config(), None);
+        .add_client_and_service::<_, DummyNetworkEvents>(&dummy_network_config(), None, true);
     network_builder.build(runtime.handle().clone()).start();
     let dialer_network_client = NetworkClient::new(
         vec![TEST_DIRECT_SEND_PROTOCOL],
diff --git a/network/framework/src/application/interface.rs b/network/framework/src/application/interface.rs
index 940a42df3a690..6ccb2cf36354e 100644
--- a/network/framework/src/application/interface.rs
+++ b/network/framework/src/application/interface.rs
@@ -11,8 +11,9 @@ use crate::{
 };
 use aptos_config::network_id::{NetworkId, PeerNetworkId};
 use aptos_logger::{prelude::*, sample, sample::SampleRate};
-use aptos_types::network_address::NetworkAddress;
+use aptos_types::{network_address::NetworkAddress, PeerId};
 use async_trait::async_trait;
+use bytes::Bytes;
 use itertools::Itertools;
 use std::{collections::HashMap, fmt::Debug, sync::Arc, time::Duration};
 
@@ -52,9 +53,13 @@ pub trait NetworkClientInterface<Message: NetworkMessageTrait>: Clone + Send + S
     /// method does not guarantee message delivery or handle responses.
     fn send_to_peer(&self, _message: Message, _peer: PeerNetworkId) -> Result<(), Error>;
 
+    /// Sends the given message bytes to the specified peer. Note: this
+    /// method does not guarantee message delivery or handle responses.
+    fn send_to_peer_raw(&self, _message: Bytes, _peer: PeerNetworkId) -> Result<(), Error>;
+
     /// Sends the given message to each peer in the specified peer list.
     /// Note: this method does not guarantee message delivery or handle responses.
-    fn send_to_peers(&self, _message: Message, _peers: &[PeerNetworkId]) -> Result<(), Error>;
+    fn send_to_peers(&self, _message: Message, _peers: Vec<PeerNetworkId>) -> Result<(), Error>;
 
     /// Sends the given message to the specified peer with the corresponding
     /// timeout. Awaits a response from the peer, or hits the timeout
@@ -65,6 +70,21 @@ pub trait NetworkClientInterface<Message: NetworkMessageTrait>: Clone + Send + S
         _rpc_timeout: Duration,
         _peer: PeerNetworkId,
     ) -> Result<Message, Error>;
+
+    async fn send_to_peer_rpc_raw(
+        &self,
+        _message: Bytes,
+        _rpc_timeout: Duration,
+        _peer: PeerNetworkId,
+    ) -> Result<Message, Error>;
+
+    fn to_bytes_by_protocol(
+        &self,
+        _peers: Vec<PeerNetworkId>,
+        _message: Message,
+    ) -> anyhow::Result<HashMap<PeerNetworkId, Bytes>>;
+
+    fn sort_peers_by_latency(&self, _network: NetworkId, _peers: &mut [PeerId]);
 }
 
 /// A network component that can be used by client applications (e.g., consensus,
@@ -132,6 +152,39 @@ impl<Message: NetworkMessageTrait + Clone> NetworkClient<Message> {
             peer, protocols_supported_by_peer
         )))
     }
+
+    fn group_peers_by_protocol(
+        &self,
+        peers: Vec<PeerNetworkId>,
+    ) -> HashMap<ProtocolId, Vec<PeerNetworkId>> {
+        // Sort peers by protocol
+        let mut peers_per_protocol = HashMap::new();
+        let mut peers_without_a_protocol = vec![];
+        for peer in peers {
+            match self
+                .get_preferred_protocol_for_peer(&peer, &self.direct_send_protocols_and_preferences)
+            {
+                Ok(protocol) => peers_per_protocol
+                    .entry(protocol)
+                    .or_insert_with(Vec::new)
+                    .push(peer),
+                Err(_) => peers_without_a_protocol.push(peer),
+            }
+        }
+
+        // We only periodically log any unavailable peers (to prevent log spamming)
+        if !peers_without_a_protocol.is_empty() {
+            sample!(
+                SampleRate::Duration(Duration::from_secs(10)),
+                warn!(
+                    "Unavailable peers (without a common network protocol): {:?}",
+                    peers_without_a_protocol
+                )
+            );
+        }
+
+        peers_per_protocol
+    }
 }
 
 #[async_trait]
@@ -170,38 +223,21 @@ impl<Message: NetworkMessageTrait> NetworkClientInterface<Message> for NetworkCl
         Ok(network_sender.send_to(peer.peer_id(), direct_send_protocol_id, message)?)
     }
 
-    fn send_to_peers(&self, message: Message, peers: &[PeerNetworkId]) -> Result<(), Error> {
-        // Sort peers by protocol
-        let mut peers_per_protocol = HashMap::new();
-        let mut peers_without_a_protocol = vec![];
-        for peer in peers {
-            match self
-                .get_preferred_protocol_for_peer(peer, &self.direct_send_protocols_and_preferences)
-            {
-                Ok(protocol) => peers_per_protocol
-                    .entry(protocol)
-                    .or_insert_with(Vec::new)
-                    .push(peer),
-                Err(_) => peers_without_a_protocol.push(peer),
-            }
-        }
+    fn send_to_peer_raw(&self, message: Bytes, peer: PeerNetworkId) -> Result<(), Error> {
+        let network_sender = self.get_sender_for_network_id(&peer.network_id())?;
+        let direct_send_protocol_id = self
+            .get_preferred_protocol_for_peer(&peer, &self.direct_send_protocols_and_preferences)?;
+        Ok(network_sender.send_to_raw(peer.peer_id(), direct_send_protocol_id, message)?)
+    }
 
-        // We only periodically log any unavailable peers (to prevent log spamming)
-        if !peers_without_a_protocol.is_empty() {
-            sample!(
-                SampleRate::Duration(Duration::from_secs(10)),
-                warn!(
-                    "Unavailable peers (without a common network protocol): {:?}",
-                    peers_without_a_protocol
-                )
-            );
-        }
+    fn send_to_peers(&self, message: Message, peers: Vec<PeerNetworkId>) -> Result<(), Error> {
+        let peers_per_protocol = self.group_peers_by_protocol(peers);
 
         // Send to all peers in each protocol group and network
         for (protocol_id, peers) in peers_per_protocol {
             for (network_id, peers) in &peers
                 .iter()
-                .group_by(|peer_network_id| peer_network_id.network_id())
+                .chunk_by(|peer_network_id| peer_network_id.network_id())
             {
                 let network_sender = self.get_sender_for_network_id(&network_id)?;
                 let peer_ids = peers.map(|peer_network_id| peer_network_id.peer_id());
@@ -224,6 +260,43 @@ impl<Message: NetworkMessageTrait> NetworkClientInterface<Message> for NetworkCl
             .send_rpc(peer.peer_id(), rpc_protocol_id, message, rpc_timeout)
             .await?)
     }
+
+    async fn send_to_peer_rpc_raw(
+        &self,
+        message: Bytes,
+        rpc_timeout: Duration,
+        peer: PeerNetworkId,
+    ) -> Result<Message, Error> {
+        let network_sender = self.get_sender_for_network_id(&peer.network_id())?;
+        let rpc_protocol_id =
+            self.get_preferred_protocol_for_peer(&peer, &self.rpc_protocols_and_preferences)?;
+        Ok(network_sender
+            .send_rpc_raw(peer.peer_id(), rpc_protocol_id, message, rpc_timeout)
+            .await?)
+    }
+
+    fn to_bytes_by_protocol(
+        &self,
+        peers: Vec<PeerNetworkId>,
+        message: Message,
+    ) -> anyhow::Result<HashMap<PeerNetworkId, Bytes>> {
+        let peers_per_protocol = self.group_peers_by_protocol(peers);
+        // Convert to bytes per protocol
+        let mut bytes_per_peer = HashMap::new();
+        for (protocol_id, peers) in peers_per_protocol {
+            let bytes: Bytes = protocol_id.to_bytes(&message)?.into();
+            for peer in peers {
+                bytes_per_peer.insert(peer, bytes.clone());
+            }
+        }
+
+        Ok(bytes_per_peer)
+    }
+
+    fn sort_peers_by_latency(&self, network_id: NetworkId, peers: &mut [PeerId]) {
+        self.peers_and_metadata
+            .sort_peers_by_latency(network_id, peers)
+    }
 }
 
 /// A network component that can be used by server applications (e.g., consensus,
diff --git a/network/framework/src/application/metadata.rs b/network/framework/src/application/metadata.rs
index a206edd5b289d..0c417262e625e 100644
--- a/network/framework/src/application/metadata.rs
+++ b/network/framework/src/application/metadata.rs
@@ -85,8 +85,8 @@ impl PeerMetadata {
         self.connection_metadata.clone()
     }
 
-    /// Returns a copy of the peer monitoring metadata
-    pub fn get_peer_monitoring_metadata(&self) -> PeerMonitoringMetadata {
-        self.peer_monitoring_metadata.clone()
+    /// Returns a reference to the peer monitoring metadata
+    pub fn get_peer_monitoring_metadata(&self) -> &PeerMonitoringMetadata {
+        &self.peer_monitoring_metadata
     }
 }
diff --git a/network/framework/src/application/storage.rs b/network/framework/src/application/storage.rs
index c9ad1f19de347..070ec8253f45f 100644
--- a/network/framework/src/application/storage.rs
+++ b/network/framework/src/application/storage.rs
@@ -7,6 +7,7 @@ use crate::{
         error::Error,
         metadata::{ConnectionState, PeerMetadata},
     },
+    counters,
     peer_manager::ConnectionNotification,
     transport::{ConnectionId, ConnectionMetadata},
     ProtocolId,
@@ -440,6 +441,34 @@ impl PeersAndMetadata {
 
         (peers_and_metadata, trusted_peers, cached_peers_and_metadata)
     }
+
+    /// Sorts the give peer slice in the order of decreasing latency.
+    pub fn sort_peers_by_latency(&self, network_id: NetworkId, peers: &mut [PeerId]) {
+        let _timer = counters::OP_MEASURE
+            .with_label_values(&["sort_peers"])
+            .start_timer();
+
+        let cached_peers_and_metadata = self.cached_peers_and_metadata.load();
+
+        peers.sort_unstable_by(|peer_network_a, peer_network_b| {
+            let get_latency = |&network_id, peer| -> f64 {
+                cached_peers_and_metadata
+                    .get(&network_id)
+                    .and_then(|peers| peers.get(peer))
+                    .and_then(|peer| {
+                        peer.get_peer_monitoring_metadata()
+                            .average_ping_latency_secs
+                    })
+                    .unwrap_or_default()
+            };
+
+            let a_latency = get_latency(&network_id, peer_network_a);
+            let b_latency = get_latency(&network_id, peer_network_b);
+            b_latency
+                .partial_cmp(&a_latency)
+                .expect("latency is never NaN")
+        })
+    }
 }
 
 /// Returns the peer metadata for the given network
diff --git a/network/framework/src/application/tests.rs b/network/framework/src/application/tests.rs
index 1c82b90c966aa..e98232a2da0be 100644
--- a/network/framework/src/application/tests.rs
+++ b/network/framework/src/application/tests.rs
@@ -10,13 +10,18 @@ use crate::{
         storage::PeersAndMetadata,
     },
     peer_manager::{
-        ConnectionNotification, ConnectionRequestSender, PeerManagerNotification,
-        PeerManagerRequest, PeerManagerRequestSender,
+        ConnectionNotification, ConnectionRequestSender, PeerManagerRequest,
+        PeerManagerRequestSender,
     },
     protocols::{
-        network::{Event, NetworkEvents, NetworkSender, NewNetworkEvents, NewNetworkSender},
-        rpc::InboundRpcRequest,
-        wire::handshake::v1::{ProtocolId, ProtocolIdSet},
+        network::{
+            Event, NetworkEvents, NetworkSender, NewNetworkEvents, NewNetworkSender,
+            ReceivedMessage,
+        },
+        wire::{
+            handshake::v1::{ProtocolId, ProtocolIdSet},
+            messaging::v1::{DirectSendMsg, NetworkMessage, RpcRequest},
+        },
     },
     transport::ConnectionMetadata,
 };
@@ -27,7 +32,6 @@ use aptos_config::{
 };
 use aptos_peer_monitoring_service_types::PeerMonitoringMetadata;
 use aptos_types::{account_address::AccountAddress, PeerId};
-use futures::channel::oneshot;
 use futures_util::StreamExt;
 use maplit::hashmap;
 use serde::{Deserialize, Serialize};
@@ -390,8 +394,13 @@ fn test_peers_and_metadata_caching() {
     );
 
     // Update the peer metadata for peer 1
-    let peer_monitoring_metadata =
-        PeerMonitoringMetadata::new(Some(1010101.0), None, None, Some("Internal string".into()));
+    let peer_monitoring_metadata = PeerMonitoringMetadata::new(
+        Some(1010101.0),
+        None,
+        None,
+        None,
+        Some("Internal string".into()),
+    );
     peers_and_metadata
         .update_peer_monitoring_metadata(peer_network_id_1, peer_monitoring_metadata.clone())
         .unwrap();
@@ -683,7 +692,7 @@ async fn test_network_client_missing_network_sender() {
 
     // Verify that sending a message to all peers without a network simply logs the errors
     network_client
-        .send_to_peers(DummyMessage::new_empty(), &[bad_peer_network_id])
+        .send_to_peers(DummyMessage::new_empty(), vec![bad_peer_network_id])
         .unwrap();
 }
 
@@ -815,7 +824,7 @@ async fn test_network_client_network_senders_direct_send() {
     // Verify that broadcast messages are sent on matching networks and protocols
     let dummy_message = DummyMessage::new(2323);
     network_client
-        .send_to_peers(dummy_message.clone(), &[
+        .send_to_peers(dummy_message.clone(), vec![
             peer_network_id_1,
             peer_network_id_2,
         ])
@@ -1006,7 +1015,7 @@ fn create_network_sender_and_events(
     HashMap<NetworkId, NetworkSender<DummyMessage>>,
     NetworkServiceEvents<DummyMessage>,
     HashMap<NetworkId, aptos_channel::Receiver<(PeerId, ProtocolId), PeerManagerRequest>>,
-    HashMap<NetworkId, aptos_channel::Sender<(PeerId, ProtocolId), PeerManagerNotification>>,
+    HashMap<NetworkId, aptos_channel::Sender<(PeerId, ProtocolId), ReceivedMessage>>,
 ) {
     let mut network_senders = HashMap::new();
     let mut network_and_events = HashMap::new();
@@ -1024,7 +1033,7 @@ fn create_network_sender_and_events(
             PeerManagerRequestSender::new(outbound_request_sender),
             ConnectionRequestSender::new(connection_outbound_sender),
         );
-        let network_events = NetworkEvents::new(inbound_request_receiver, None);
+        let network_events = NetworkEvents::new(inbound_request_receiver, None, true);
 
         // Save the sender, events and receivers
         network_senders.insert(*network_id, network_sender);
@@ -1173,7 +1182,7 @@ async fn wait_for_network_event(
     >,
     inbound_request_senders: &mut HashMap<
         NetworkId,
-        aptos_channel::Sender<(PeerId, ProtocolId), PeerManagerNotification>,
+        aptos_channel::Sender<(PeerId, ProtocolId), ReceivedMessage>,
     >,
     network_events: &mut NetworkEvents<DummyMessage>,
     is_rpc_request: bool,
@@ -1201,12 +1210,18 @@ async fn wait_for_network_event(
                     assert_eq!(outbound_rpc_request.timeout, message_wait_time);
 
                     // Create and return the peer manager notification
-                    let inbound_rpc_request = InboundRpcRequest {
-                        protocol_id: outbound_rpc_request.protocol_id,
-                        data: outbound_rpc_request.data,
-                        res_tx: oneshot::channel().0,
+                    let rmsg = ReceivedMessage {
+                        message: NetworkMessage::RpcRequest(RpcRequest{
+                            protocol_id: outbound_rpc_request.protocol_id,
+                            request_id: 0,
+                            priority: 0,
+                            raw_request: outbound_rpc_request.data.into(),
+                        }),
+                        sender: PeerNetworkId::new(expected_network_id, peer_id),
+                        receive_timestamp_micros: 0,
+                        rpc_replier: Some(Arc::new(outbound_rpc_request.res_tx)),
                     };
-                    (outbound_rpc_request.protocol_id, PeerManagerNotification::RecvRpc(peer_id, inbound_rpc_request))
+                    (outbound_rpc_request.protocol_id, rmsg)
                 }
                 PeerManagerRequest::SendDirectSend(peer_id, message) => {
                     // Verify the request is correct
@@ -1215,7 +1230,17 @@ async fn wait_for_network_event(
                     assert_eq!(Some(message.protocol_id), expected_direct_send_protocol_id);
 
                     // Create and return the peer manager notification
-                    (message.protocol_id, PeerManagerNotification::RecvMessage(peer_id, message))
+                    let rmsg = ReceivedMessage {
+                        message: NetworkMessage::DirectSendMsg(DirectSendMsg{
+                            protocol_id: message.protocol_id,
+                            priority: 0,
+                            raw_msg: message.mdata.into(),
+                        }),
+                        sender: PeerNetworkId::new(expected_network_id, peer_id),
+                        receive_timestamp_micros: 0,
+                        rpc_replier: None,
+                    };
+                    (message.protocol_id, rmsg)
                 }
             };
 
diff --git a/network/framework/src/constants.rs b/network/framework/src/constants.rs
index 6cdcc779f4194..ad4954f58278f 100644
--- a/network/framework/src/constants.rs
+++ b/network/framework/src/constants.rs
@@ -20,5 +20,4 @@ pub const MAX_CONCURRENT_INBOUND_RPCS: u32 = 100;
 pub const NETWORK_CHANNEL_SIZE: usize = 1024;
 pub const MAX_FRAME_SIZE: usize = 4 * 1024 * 1024; /* 4 MiB */
 pub const MAX_MESSAGE_SIZE: usize = 64 * 1024 * 1024; /* 64 MiB */
-pub const MAX_CONCURRENT_NETWORK_REQS: usize = 100;
 pub const MAX_CONCURRENT_NETWORK_NOTIFS: usize = 100;
diff --git a/network/framework/src/counters.rs b/network/framework/src/counters.rs
index e5b5b68c8aacd..d381264061383 100644
--- a/network/framework/src/counters.rs
+++ b/network/framework/src/counters.rs
@@ -26,6 +26,7 @@ pub const RECEIVED_LABEL: &str = "received";
 pub const SENT_LABEL: &str = "sent";
 pub const SUCCEEDED_LABEL: &str = "succeeded";
 pub const FAILED_LABEL: &str = "failed";
+pub const UNKNOWN_LABEL: &str = "unknown";
 
 // Direction labels
 pub const INBOUND_LABEL: &str = "inbound";
@@ -415,10 +416,11 @@ pub static PENDING_PEER_MANAGER_DIAL_REQUESTS: Lazy<IntGauge> = Lazy::new(|| {
 });
 
 /// Counter of messages pending in queue to be sent out on the wire.
-pub static PENDING_WIRE_MESSAGES: Lazy<IntGauge> = Lazy::new(|| {
-    register_int_gauge!(
+pub static PENDING_WIRE_MESSAGES: Lazy<IntCounterVec> = Lazy::new(|| {
+    register_int_counter_vec!(
         "aptos_network_pending_wire_messages",
-        "Number of pending wire messages"
+        "Number of pending wire messages",
+        &["state"],
     )
     .unwrap()
 });
@@ -628,3 +630,28 @@ fn observe_ping_time(network_context: &NetworkContext, ping_latency_secs: f64, l
         .with_label_values(&[network_context.network_id().as_str(), label])
         .observe(ping_latency_secs);
 }
+
+pub static OP_MEASURE: Lazy<HistogramVec> = Lazy::new(|| {
+    register_histogram_vec!(
+        "aptos_network_measure",
+        "Measures the time and count of an operation",
+        &["op"]
+    )
+    .unwrap()
+});
+
+pub static INBOUND_QUEUE_DELAY: Lazy<HistogramVec> = Lazy::new(|| {
+    register_histogram_vec!(
+        "aptos_network_inbound_queue_time",
+        "Time a message sits in queue between peer socket and app code",
+        &["protocol_id"],
+        exponential_buckets(/*start=*/ 1e-6, /*factor=*/ 2.0, /*count=*/ 20).unwrap(),
+    )
+    .unwrap()
+});
+
+pub fn inbound_queue_delay_observe(protocol_id: ProtocolId, seconds: f64) {
+    INBOUND_QUEUE_DELAY
+        .with_label_values(&[protocol_id.as_str()])
+        .observe(seconds)
+}
diff --git a/network/framework/src/peer/fuzzing.rs b/network/framework/src/peer/fuzzing.rs
index 3e213d220ca8d..9ab4b85bd2e1e 100644
--- a/network/framework/src/peer/fuzzing.rs
+++ b/network/framework/src/peer/fuzzing.rs
@@ -21,7 +21,7 @@ use aptos_time_service::TimeService;
 use aptos_types::{network_address::NetworkAddress, PeerId};
 use futures::{executor::block_on, future, io::AsyncReadExt, sink::SinkExt, stream::StreamExt};
 use proptest::{arbitrary::any, collection::vec};
-use std::time::Duration;
+use std::{collections::HashMap, sync::Arc, time::Duration};
 
 /// Generate a sequence of `MultiplexMessage`, bcs serialize them, and write them
 /// out to a buffer using our length-prefixed message codec.
@@ -92,7 +92,7 @@ pub fn fuzz(data: &[u8]) {
     let channel_size = 8;
 
     let (peer_reqs_tx, peer_reqs_rx) = aptos_channel::new(QueueStyle::FIFO, channel_size, None);
-    let (peer_notifs_tx, peer_notifs_rx) = aptos_channel::new(QueueStyle::FIFO, channel_size, None);
+    let upstream_handlers = Arc::new(HashMap::new());
 
     // Spin up a new `Peer` actor
     let peer = Peer::new(
@@ -102,7 +102,7 @@ pub fn fuzz(data: &[u8]) {
         connection,
         connection_notifs_tx,
         peer_reqs_rx,
-        peer_notifs_tx,
+        upstream_handlers,
         Duration::from_millis(constants::INBOUND_RPC_TIMEOUT_MS),
         constants::MAX_CONCURRENT_INBOUND_RPCS,
         constants::MAX_CONCURRENT_OUTBOUND_RPCS,
@@ -120,7 +120,6 @@ pub fn fuzz(data: &[u8]) {
         // ACK the "remote" d/c and drop our handle to the Peer actor. Then wait
         // for all network notifs to drain out and finish.
         drop(peer_reqs_tx);
-        peer_notifs_rx.collect::<Vec<_>>().await;
     });
 }
 
diff --git a/network/framework/src/peer/mod.rs b/network/framework/src/peer/mod.rs
index 3033365382ba4..094e3d70c0421 100644
--- a/network/framework/src/peer/mod.rs
+++ b/network/framework/src/peer/mod.rs
@@ -18,13 +18,14 @@
 use crate::{
     counters::{
         self, network_application_inbound_traffic, network_application_outbound_traffic,
-        FAILED_LABEL, RECEIVED_LABEL, SENT_LABEL,
+        DECLINED_LABEL, FAILED_LABEL, RECEIVED_LABEL, SENT_LABEL, UNKNOWN_LABEL,
     },
     logging::NetworkSchema,
     peer_manager::{PeerManagerError, TransportNotification},
     protocols::{
         direct_send::Message,
-        rpc::{error::RpcError, InboundRpcRequest, InboundRpcs, OutboundRpcRequest, OutboundRpcs},
+        network::ReceivedMessage,
+        rpc::{error::RpcError, InboundRpcs, OutboundRpcRequest, OutboundRpcs},
         stream::{InboundStreamBuffer, OutboundStream, StreamMessage},
         wire::messaging::v1::{
             DirectSendMsg, ErrorCode, MultiplexMessage, MultiplexMessageSink,
@@ -34,13 +35,12 @@ use crate::{
     transport::{self, Connection, ConnectionMetadata},
     ProtocolId,
 };
-use aptos_channels::aptos_channel;
-use aptos_config::network_id::NetworkContext;
+use aptos_channels::{aptos_channel, message_queues::QueueStyle};
+use aptos_config::network_id::{NetworkContext, PeerNetworkId};
 use aptos_logger::prelude::*;
 use aptos_short_hex_str::AsShortHexStr;
 use aptos_time_service::{TimeService, TimeServiceTrait};
 use aptos_types::PeerId;
-use bytes::Bytes;
 use futures::{
     self,
     channel::oneshot,
@@ -50,8 +50,8 @@ use futures::{
 };
 use futures_util::stream::select;
 use serde::Serialize;
-use std::{fmt, panic, time::Duration};
-use tokio::runtime::Handle;
+use std::{collections::HashMap, fmt, panic, sync::Arc, time::Duration};
+use tokio::{runtime::Handle, time::timeout};
 use tokio_util::compat::{
     FuturesAsyncReadCompatExt, TokioAsyncReadCompatExt, TokioAsyncWriteCompatExt,
 };
@@ -71,15 +71,6 @@ pub enum PeerRequest {
     SendDirectSend(Message),
 }
 
-/// Notifications that [`Peer`] sends to the [`PeerManager`](crate::peer_manager::PeerManager).
-#[derive(Debug, PartialEq)]
-pub enum PeerNotification {
-    /// A new RPC request has been received from peer.
-    RecvRpc(InboundRpcRequest),
-    /// A new message has been received from peer.
-    RecvMessage(Message),
-}
-
 /// The reason for closing a connection.
 ///
 /// For example, if the remote peer closed the connection or the connection was
@@ -124,8 +115,9 @@ pub struct Peer<TSocket> {
     connection_notifs_tx: aptos_channels::Sender<TransportNotification<TSocket>>,
     /// Channel to receive requests from PeerManager to send messages and rpcs.
     peer_reqs_rx: aptos_channel::Receiver<ProtocolId, PeerRequest>,
-    /// Channel to notifty PeerManager of new inbound messages and rpcs.
-    peer_notifs_tx: aptos_channel::Sender<ProtocolId, PeerNotification>,
+    /// Where to send inbound messages and rpcs.
+    upstream_handlers:
+        Arc<HashMap<ProtocolId, aptos_channel::Sender<(PeerId, ProtocolId), ReceivedMessage>>>,
     /// Inbound rpc request queue for handling requests from remote peer.
     inbound_rpcs: InboundRpcs,
     /// Outbound rpc request queue for sending requests to remote peer and handling responses.
@@ -152,7 +144,9 @@ where
         connection: Connection<TSocket>,
         connection_notifs_tx: aptos_channels::Sender<TransportNotification<TSocket>>,
         peer_reqs_rx: aptos_channel::Receiver<ProtocolId, PeerRequest>,
-        peer_notifs_tx: aptos_channel::Sender<ProtocolId, PeerNotification>,
+        upstream_handlers: Arc<
+            HashMap<ProtocolId, aptos_channel::Sender<(PeerId, ProtocolId), ReceivedMessage>>,
+        >,
         inbound_rpc_timeout: Duration,
         max_concurrent_inbound_rpcs: u32,
         max_concurrent_outbound_rpcs: u32,
@@ -173,7 +167,7 @@ where
             connection: Some(socket),
             connection_notifs_tx,
             peer_reqs_rx,
-            peer_notifs_tx,
+            upstream_handlers,
             inbound_rpcs: InboundRpcs::new(
                 network_context,
                 time_service.clone(),
@@ -240,7 +234,7 @@ where
                 // Handle a new outbound request from the PeerManager.
                 maybe_request = self.peer_reqs_rx.next() => {
                     match maybe_request {
-                        Some(request) => self.handle_outbound_request(request, &mut write_reqs_tx).await,
+                        Some(request) => self.handle_outbound_request(request, &mut write_reqs_tx),
                         // The PeerManager is requesting this connection to close
                         // by dropping the corresponding peer_reqs_tx handle.
                         None => self.shutdown(DisconnectReason::Requested),
@@ -251,7 +245,7 @@ where
                 maybe_message = reader.next() => {
                     match maybe_message {
                         Some(message) =>  {
-                            if let Err(err) = self.handle_inbound_message(message, &mut write_reqs_tx).await {
+                            if let Err(err) = self.handle_inbound_message(message, &mut write_reqs_tx) {
                                 warn!(
                                     NetworkSchema::new(&self.network_context)
                                         .connection_metadata(&self.connection_metadata),
@@ -277,7 +271,7 @@ where
                     };
 
                     // Send the response to the remote peer
-                    if let Err(error) = self.inbound_rpcs.send_outbound_response(&mut write_reqs_tx, maybe_response).await {
+                    if let Err(error) = self.inbound_rpcs.send_outbound_response(&mut write_reqs_tx, maybe_response) {
                         // It's quite common for applications to drop an RPC request.
                         // If this happens, we want to avoid logging a warning/error
                         // (as it makes the logs noisy). Otherwise, we log normally.
@@ -312,7 +306,8 @@ where
 
         // Finish shutting down the connection. Close the writer task and notify
         // PeerManager that this connection has shutdown.
-        self.do_shutdown(writer_close_tx, reason).await;
+        self.do_shutdown(write_reqs_tx, writer_close_tx, reason)
+            .await;
     }
 
     // Start a new task on the given executor which is responsible for writing outbound messages on
@@ -330,30 +325,44 @@ where
         mut writer: MultiplexMessageSink<impl AsyncWrite + Unpin + Send + 'static>,
         max_frame_size: usize,
         max_message_size: usize,
-    ) -> (aptos_channels::Sender<NetworkMessage>, oneshot::Sender<()>) {
+    ) -> (
+        aptos_channel::Sender<(), NetworkMessage>,
+        oneshot::Sender<()>,
+    ) {
         let remote_peer_id = connection_metadata.remote_peer_id;
-        let (write_reqs_tx, mut write_reqs_rx): (aptos_channels::Sender<NetworkMessage>, _) =
-            aptos_channels::new(1024, &counters::PENDING_WIRE_MESSAGES);
+        let (write_reqs_tx, mut write_reqs_rx): (aptos_channel::Sender<(), NetworkMessage>, _) =
+            aptos_channel::new(
+                QueueStyle::KLAST,
+                1024,
+                Some(&counters::PENDING_WIRE_MESSAGES),
+            );
         let (close_tx, mut close_rx) = oneshot::channel();
 
         let (mut msg_tx, msg_rx) = aptos_channels::new(1024, &counters::PENDING_MULTIPLEX_MESSAGE);
         let (stream_msg_tx, stream_msg_rx) =
             aptos_channels::new(1024, &counters::PENDING_MULTIPLEX_STREAM);
 
-        // this task ends when the multiplex task ends (by dropping the senders)
+        // this task ends when the multiplex task ends (by dropping the senders) or receiving a close instruction
         let writer_task = async move {
             let mut stream = select(msg_rx, stream_msg_rx);
             let log_context =
                 NetworkSchema::new(&network_context).connection_metadata(&connection_metadata);
-            while let Some(message) = stream.next().await {
-                if let Err(err) = writer.send(&message).await {
-                    warn!(
-                        log_context,
-                        error = %err,
-                        "{} Error in sending message to peer: {}",
-                        network_context,
-                        remote_peer_id.short_str(),
-                    );
+            loop {
+                futures::select! {
+                    message = stream.select_next_some() => {
+                        if let Err(err) = timeout(transport::TRANSPORT_TIMEOUT,writer.send(&message)).await {
+                            warn!(
+                                log_context,
+                                error = %err,
+                                "{} Error in sending message to peer: {}",
+                                network_context,
+                                remote_peer_id.short_str(),
+                            );
+                        }
+                    }
+                    _ = close_rx => {
+                        break;
+                    }
                 }
             }
             info!(
@@ -399,30 +408,27 @@ where
                 },
             }
         };
+        // the task ends when the write_reqs_tx is dropped
         let multiplex_task = async move {
             let mut outbound_stream =
                 OutboundStream::new(max_frame_size, max_message_size, stream_msg_tx);
-            loop {
-                futures::select! {
-                    message = write_reqs_rx.select_next_some() => {
-                        // either channel full would block the other one
-                        let result = if outbound_stream.should_stream(&message) {
-                            outbound_stream.stream_message(message).await
-                        } else {
-                            msg_tx.send(MultiplexMessage::Message(message)).await.map_err(|_| anyhow::anyhow!("Writer task ended"))
-                        };
-                        if let Err(err) = result {
-                            warn!(
-                                error = %err,
-                                "{} Error in sending message to peer: {}",
-                                network_context,
-                                remote_peer_id.short_str(),
-                            );
-                        }
-                    },
-                    _ = close_rx => {
-                        break;
-                    }
+            while let Some(message) = write_reqs_rx.next().await {
+                // either channel full would block the other one
+                let result = if outbound_stream.should_stream(&message) {
+                    outbound_stream.stream_message(message).await
+                } else {
+                    msg_tx
+                        .send(MultiplexMessage::Message(message))
+                        .await
+                        .map_err(|_| anyhow::anyhow!("Writer task ended"))
+                };
+                if let Err(err) = result {
+                    warn!(
+                        error = %err,
+                        "{} Error in sending message to peer: {}",
+                        network_context,
+                        remote_peer_id.short_str(),
+                    );
                 }
             }
         };
@@ -431,12 +437,53 @@ where
         (write_reqs_tx, close_tx)
     }
 
-    async fn handle_inbound_network_message(
+    fn handle_inbound_network_message(
         &mut self,
         message: NetworkMessage,
     ) -> Result<(), PeerManagerError> {
-        match message {
-            NetworkMessage::DirectSendMsg(message) => self.handle_inbound_direct_send(message),
+        match &message {
+            NetworkMessage::DirectSendMsg(direct) => {
+                let data_len = direct.raw_msg.len();
+                network_application_inbound_traffic(
+                    self.network_context,
+                    direct.protocol_id,
+                    data_len as u64,
+                );
+                match self.upstream_handlers.get(&direct.protocol_id) {
+                    None => {
+                        counters::direct_send_messages(&self.network_context, UNKNOWN_LABEL).inc();
+                        counters::direct_send_bytes(&self.network_context, UNKNOWN_LABEL)
+                            .inc_by(data_len as u64);
+                    },
+                    Some(handler) => {
+                        let key = (self.connection_metadata.remote_peer_id, direct.protocol_id);
+                        let sender = self.connection_metadata.remote_peer_id;
+                        let network_id = self.network_context.network_id();
+                        let sender = PeerNetworkId::new(network_id, sender);
+                        match handler.push(key, ReceivedMessage::new(message, sender)) {
+                            Err(_err) => {
+                                // NOTE: aptos_channel never returns other than Ok(()), but we might switch to tokio::sync::mpsc and then this would work
+                                counters::direct_send_messages(
+                                    &self.network_context,
+                                    DECLINED_LABEL,
+                                )
+                                .inc();
+                                counters::direct_send_bytes(&self.network_context, DECLINED_LABEL)
+                                    .inc_by(data_len as u64);
+                            },
+                            Ok(_) => {
+                                counters::direct_send_messages(
+                                    &self.network_context,
+                                    RECEIVED_LABEL,
+                                )
+                                .inc();
+                                counters::direct_send_bytes(&self.network_context, RECEIVED_LABEL)
+                                    .inc_by(data_len as u64);
+                            },
+                        }
+                    },
+                }
+            },
             NetworkMessage::Error(error_msg) => {
                 warn!(
                     NetworkSchema::new(&self.network_context)
@@ -449,28 +496,44 @@ where
                 );
             },
             NetworkMessage::RpcRequest(request) => {
-                if let Err(err) = self
-                    .inbound_rpcs
-                    .handle_inbound_request(&mut self.peer_notifs_tx, request)
-                {
-                    warn!(
-                        NetworkSchema::new(&self.network_context)
-                            .connection_metadata(&self.connection_metadata),
-                        error = %err,
-                        "{} Error handling inbound rpc request: {}",
-                        self.network_context,
-                        err
-                    );
+                match self.upstream_handlers.get(&request.protocol_id) {
+                    None => {
+                        counters::direct_send_messages(&self.network_context, UNKNOWN_LABEL).inc();
+                        counters::direct_send_bytes(&self.network_context, UNKNOWN_LABEL)
+                            .inc_by(request.raw_request.len() as u64);
+                    },
+                    Some(handler) => {
+                        let sender = self.connection_metadata.remote_peer_id;
+                        let network_id = self.network_context.network_id();
+                        let sender = PeerNetworkId::new(network_id, sender);
+                        if let Err(err) = self
+                            .inbound_rpcs
+                            .handle_inbound_request(handler, ReceivedMessage::new(message, sender))
+                        {
+                            warn!(
+                                NetworkSchema::new(&self.network_context)
+                                    .connection_metadata(&self.connection_metadata),
+                                error = %err,
+                                "{} Error handling inbound rpc request: {}",
+                                self.network_context,
+                                err
+                            );
+                        }
+                    },
                 }
             },
-            NetworkMessage::RpcResponse(response) => {
+            NetworkMessage::RpcResponse(_) => {
+                // non-reference cast identical to this match case
+                let NetworkMessage::RpcResponse(response) = message else {
+                    unreachable!("NetworkMessage type changed between match and let")
+                };
                 self.outbound_rpcs.handle_inbound_response(response)
             },
         };
         Ok(())
     }
 
-    async fn handle_inbound_stream_message(
+    fn handle_inbound_stream_message(
         &mut self,
         message: StreamMessage,
     ) -> Result<(), PeerManagerError> {
@@ -480,17 +543,17 @@ where
             },
             StreamMessage::Fragment(fragment) => {
                 if let Some(message) = self.inbound_stream.append_fragment(fragment)? {
-                    self.handle_inbound_network_message(message).await?;
+                    self.handle_inbound_network_message(message)?;
                 }
             },
         }
         Ok(())
     }
 
-    async fn handle_inbound_message(
+    fn handle_inbound_message(
         &mut self,
         message: Result<MultiplexMessage, ReadError>,
-        write_reqs_tx: &mut aptos_channels::Sender<NetworkMessage>,
+        write_reqs_tx: &mut aptos_channel::Sender<(), NetworkMessage>,
     ) -> Result<(), PeerManagerError> {
         trace!(
             NetworkSchema::new(&self.network_context)
@@ -512,7 +575,7 @@ where
                     let error_code = ErrorCode::parsing_error(*message_type, *protocol_id);
                     let message = NetworkMessage::Error(error_code);
 
-                    write_reqs_tx.send(message).await?;
+                    write_reqs_tx.push((), message)?;
                     return Err(err.into());
                 },
                 ReadError::IoError(_) => {
@@ -524,61 +587,15 @@ where
         };
 
         match message {
-            MultiplexMessage::Message(message) => {
-                self.handle_inbound_network_message(message).await
-            },
-            MultiplexMessage::Stream(message) => self.handle_inbound_stream_message(message).await,
+            MultiplexMessage::Message(message) => self.handle_inbound_network_message(message),
+            MultiplexMessage::Stream(message) => self.handle_inbound_stream_message(message),
         }
     }
 
-    /// Handle an inbound DirectSendMsg from the remote peer. There's not much to
-    /// do here other than bump some counters and forward the message up to the
-    /// PeerManager.
-    fn handle_inbound_direct_send(&mut self, message: DirectSendMsg) {
-        let peer_id = self.remote_peer_id();
-        let protocol_id = message.protocol_id;
-        let data = message.raw_msg;
-
-        trace!(
-            NetworkSchema::new(&self.network_context).remote_peer(&peer_id),
-            protocol_id = protocol_id,
-            "{} DirectSend: Received inbound message from peer {} for protocol {:?}",
-            self.network_context,
-            peer_id.short_str(),
-            protocol_id
-        );
-        self.update_inbound_direct_send_metrics(message.protocol_id, data.len() as u64);
-
-        let notif = PeerNotification::RecvMessage(Message {
-            protocol_id,
-            mdata: Bytes::from(data),
-        });
-
-        if let Err(err) = self.peer_notifs_tx.push(protocol_id, notif) {
-            warn!(
-                NetworkSchema::new(&self.network_context),
-                error = ?err,
-                "{} Failed to notify PeerManager about inbound DirectSend message. Error: {:?}",
-                self.network_context,
-                err
-            );
-        }
-    }
-
-    /// Updates the inbound direct send metrics (e.g., messages and bytes received)
-    fn update_inbound_direct_send_metrics(&self, protocol_id: ProtocolId, data_len: u64) {
-        // Update the metrics for the received direct send message
-        counters::direct_send_messages(&self.network_context, RECEIVED_LABEL).inc();
-        counters::direct_send_bytes(&self.network_context, RECEIVED_LABEL).inc_by(data_len);
-
-        // Update the general network traffic metrics
-        network_application_inbound_traffic(self.network_context, protocol_id, data_len);
-    }
-
-    async fn handle_outbound_request(
+    fn handle_outbound_request(
         &mut self,
         request: PeerRequest,
-        write_reqs_tx: &mut aptos_channels::Sender<NetworkMessage>,
+        write_reqs_tx: &mut aptos_channel::Sender<(), NetworkMessage>,
     ) {
         trace!(
             "Peer {} PeerRequest::{:?}",
@@ -598,7 +615,7 @@ where
                     raw_msg: Vec::from(message.mdata.as_ref()),
                 });
 
-                match write_reqs_tx.send(message).await {
+                match write_reqs_tx.push((), message) {
                     Ok(_) => {
                         self.update_outbound_direct_send_metrics(protocol_id, message_len as u64);
                     },
@@ -621,7 +638,6 @@ where
                 if let Err(e) = self
                     .outbound_rpcs
                     .handle_outbound_request(request, write_reqs_tx)
-                    .await
                 {
                     warn!(
                         NetworkSchema::new(&self.network_context)
@@ -653,9 +669,30 @@ where
         self.state = State::ShuttingDown(reason);
     }
 
-    async fn do_shutdown(mut self, writer_close_tx: oneshot::Sender<()>, reason: DisconnectReason) {
-        let remote_peer_id = self.remote_peer_id();
+    async fn do_shutdown(
+        mut self,
+        write_req_tx: aptos_channel::Sender<(), NetworkMessage>,
+        writer_close_tx: oneshot::Sender<()>,
+        reason: DisconnectReason,
+    ) {
+        // Drop the sender to shut down multiplex task.
+        drop(write_req_tx);
 
+        // Send a close instruction to the writer task. On receipt of this
+        // instruction, the writer task drops all pending outbound messages and
+        // closes the connection.
+        if let Err(e) = writer_close_tx.send(()) {
+            info!(
+                NetworkSchema::new(&self.network_context)
+                    .connection_metadata(&self.connection_metadata),
+                error = ?e,
+                "{} Failed to send close instruction to writer task. It must already be terminating/terminated. Error: {:?}",
+                self.network_context,
+                e
+            );
+        }
+
+        let remote_peer_id = self.remote_peer_id();
         // Send a PeerDisconnected event to PeerManager.
         if let Err(e) = self
             .connection_notifs_tx
@@ -676,20 +713,6 @@ where
             );
         }
 
-        // Send a close instruction to the writer task. On receipt of this
-        // instruction, the writer task drops all pending outbound messages and
-        // closes the connection.
-        if let Err(e) = writer_close_tx.send(()) {
-            info!(
-                NetworkSchema::new(&self.network_context)
-                    .connection_metadata(&self.connection_metadata),
-                error = ?e,
-                "{} Failed to send close instruction to writer task. It must already be terminating/terminated. Error: {:?}",
-                self.network_context,
-                e
-            );
-        }
-
         trace!(
             NetworkSchema::new(&self.network_context)
                 .connection_metadata(&self.connection_metadata),
diff --git a/network/framework/src/peer/test.rs b/network/framework/src/peer/test.rs
index e1b14ce51b148..cf70f40bbe618 100644
--- a/network/framework/src/peer/test.rs
+++ b/network/framework/src/peer/test.rs
@@ -7,11 +7,12 @@ use crate::{
         INBOUND_RPC_TIMEOUT_MS, MAX_CONCURRENT_INBOUND_RPCS, MAX_CONCURRENT_OUTBOUND_RPCS,
         MAX_FRAME_SIZE, MAX_MESSAGE_SIZE, NETWORK_CHANNEL_SIZE,
     },
-    peer::{DisconnectReason, Peer, PeerNotification, PeerRequest},
+    peer::{DisconnectReason, Peer, PeerRequest},
     peer_manager::TransportNotification,
     protocols::{
         direct_send::Message,
-        rpc::{error::RpcError, InboundRpcRequest, OutboundRpcRequest},
+        network::ReceivedMessage,
+        rpc::{error::RpcError, OutboundRpcRequest},
         wire::{
             handshake::v1::{MessagingProtocolVersion, ProtocolIdSet},
             messaging::v1::{
@@ -25,6 +26,7 @@ use crate::{
 };
 use aptos_channels::{self, aptos_channel, message_queues::QueueStyle};
 use aptos_config::{config::PeerRole, network_id::NetworkContext};
+use aptos_logger::info;
 use aptos_memsocket::MemorySocket;
 use aptos_netcore::transport::ConnectionOrigin;
 use aptos_time_service::{MockTimeService, TimeService};
@@ -37,7 +39,12 @@ use futures::{
     stream::{StreamExt, TryStreamExt},
     SinkExt,
 };
-use std::{collections::HashSet, str::FromStr, time::Duration};
+use std::{
+    collections::{HashMap, HashSet},
+    str::FromStr,
+    sync::Arc,
+    time::Duration,
+};
 use tokio::runtime::{Handle, Runtime};
 use tokio_util::compat::{
     FuturesAsyncReadCompatExt, TokioAsyncReadCompatExt, TokioAsyncWriteCompatExt,
@@ -49,12 +56,14 @@ fn build_test_peer(
     executor: Handle,
     time_service: TimeService,
     origin: ConnectionOrigin,
+    upstream_handlers: Arc<
+        HashMap<ProtocolId, aptos_channel::Sender<(PeerId, ProtocolId), ReceivedMessage>>,
+    >,
 ) -> (
     Peer<MemorySocket>,
     PeerHandle,
     MemorySocket,
     aptos_channels::Receiver<TransportNotification<MemorySocket>>,
-    aptos_channel::Receiver<ProtocolId, PeerNotification>,
 ) {
     let (a, b) = MemorySocket::new_pair();
     let peer_id = PeerId::random();
@@ -74,8 +83,6 @@ fn build_test_peer(
     let (connection_notifs_tx, connection_notifs_rx) = aptos_channels::new_test(1);
     let (peer_reqs_tx, peer_reqs_rx) =
         aptos_channel::new(QueueStyle::FIFO, NETWORK_CHANNEL_SIZE, None);
-    let (peer_notifs_tx, peer_notifs_rx) =
-        aptos_channel::new(QueueStyle::FIFO, NETWORK_CHANNEL_SIZE, None);
 
     let peer = Peer::new(
         NetworkContext::mock(),
@@ -84,7 +91,7 @@ fn build_test_peer(
         connection,
         connection_notifs_tx,
         peer_reqs_rx,
-        peer_notifs_tx,
+        upstream_handlers,
         Duration::from_millis(INBOUND_RPC_TIMEOUT_MS),
         MAX_CONCURRENT_INBOUND_RPCS,
         MAX_CONCURRENT_OUTBOUND_RPCS,
@@ -93,50 +100,48 @@ fn build_test_peer(
     );
     let peer_handle = PeerHandle(peer_reqs_tx);
 
-    (peer, peer_handle, b, connection_notifs_rx, peer_notifs_rx)
+    (peer, peer_handle, b, connection_notifs_rx)
 }
 
 fn build_test_connected_peers(
     executor: Handle,
     time_service: TimeService,
+    upstream_handlers_a: Arc<
+        HashMap<ProtocolId, aptos_channel::Sender<(PeerId, ProtocolId), ReceivedMessage>>,
+    >,
+    upstream_handlers_b: Arc<
+        HashMap<ProtocolId, aptos_channel::Sender<(PeerId, ProtocolId), ReceivedMessage>>,
+    >,
 ) -> (
     (
         Peer<MemorySocket>,
         PeerHandle,
         aptos_channels::Receiver<TransportNotification<MemorySocket>>,
-        aptos_channel::Receiver<ProtocolId, PeerNotification>,
     ),
     (
         Peer<MemorySocket>,
         PeerHandle,
         aptos_channels::Receiver<TransportNotification<MemorySocket>>,
-        aptos_channel::Receiver<ProtocolId, PeerNotification>,
     ),
 ) {
-    let (peer_a, peer_handle_a, connection_a, connection_notifs_rx_a, peer_notifs_rx_a) =
-        build_test_peer(
-            executor.clone(),
-            time_service.clone(),
-            ConnectionOrigin::Inbound,
-        );
-    let (mut peer_b, peer_handle_b, _connection_b, connection_notifs_rx_b, peer_notifs_rx_b) =
-        build_test_peer(executor, time_service, ConnectionOrigin::Outbound);
+    let (peer_a, peer_handle_a, connection_a, connection_notifs_rx_a) = build_test_peer(
+        executor.clone(),
+        time_service.clone(),
+        ConnectionOrigin::Inbound,
+        upstream_handlers_a,
+    );
+    let (mut peer_b, peer_handle_b, _connection_b, connection_notifs_rx_b) = build_test_peer(
+        executor,
+        time_service,
+        ConnectionOrigin::Outbound,
+        upstream_handlers_b,
+    );
 
     // Make sure both peers are connected
     peer_b.connection = Some(connection_a);
     (
-        (
-            peer_a,
-            peer_handle_a,
-            connection_notifs_rx_a,
-            peer_notifs_rx_a,
-        ),
-        (
-            peer_b,
-            peer_handle_b,
-            connection_notifs_rx_b,
-            peer_notifs_rx_b,
-        ),
+        (peer_a, peer_handle_a, connection_notifs_rx_a),
+        (peer_b, peer_handle_b, connection_notifs_rx_b),
     )
 }
 
@@ -200,12 +205,13 @@ impl PeerHandle {
 fn peer_send_message() {
     ::aptos_logger::Logger::init_for_testing();
     let rt = Runtime::new().unwrap();
-    let (peer, mut peer_handle, mut connection, _connection_notifs_rx, _peer_notifs_rx) =
-        build_test_peer(
-            rt.handle().clone(),
-            TimeService::mock(),
-            ConnectionOrigin::Inbound,
-        );
+    let upstream_handlers = Arc::new(HashMap::new());
+    let (peer, mut peer_handle, mut connection, _connection_notifs_rx) = build_test_peer(
+        rt.handle().clone(),
+        TimeService::mock(),
+        ConnectionOrigin::Inbound,
+        upstream_handlers,
+    );
     let (mut client_sink, mut client_stream) = build_network_sink_stream(&mut connection);
 
     let send_msg = Message {
@@ -237,47 +243,67 @@ fn peer_send_message() {
     rt.block_on(future::join3(peer.start(), server, client));
 }
 
+fn test_upstream_handlers() -> (
+    Arc<HashMap<ProtocolId, aptos_channel::Sender<(PeerId, ProtocolId), ReceivedMessage>>>,
+    aptos_channel::Receiver<(PeerId, ProtocolId), ReceivedMessage>,
+) {
+    let mut upstream_handlers = HashMap::new();
+    let (sender, receiver) = aptos_channel::new(QueueStyle::FIFO, 100, None);
+    upstream_handlers.insert(PROTOCOL, sender);
+    let upstream_handlers = Arc::new(upstream_handlers);
+    (upstream_handlers, receiver)
+}
+
 // Reading an inbound DirectSendMsg off the wire should notify the PeerManager of
 // an inbound DirectSend.
 #[test]
 fn peer_recv_message() {
     ::aptos_logger::Logger::init_for_testing();
     let rt = Runtime::new().unwrap();
-    let (peer, _peer_handle, connection, _connection_notifs_rx, mut peer_notifs_rx) =
-        build_test_peer(
-            rt.handle().clone(),
-            TimeService::mock(),
-            ConnectionOrigin::Inbound,
-        );
+    let (upstream_handlers, mut receiver) = test_upstream_handlers();
+    let (peer, _peer_handle, connection, _connection_notifs_rx) = build_test_peer(
+        rt.handle().clone(),
+        TimeService::mock(),
+        ConnectionOrigin::Inbound,
+        upstream_handlers,
+    );
 
     let send_msg = MultiplexMessage::Message(NetworkMessage::DirectSendMsg(DirectSendMsg {
         protocol_id: PROTOCOL,
         priority: 0,
         raw_msg: Vec::from("hello world"),
     }));
-    let recv_msg = PeerNotification::RecvMessage(Message {
+    let recv_msg = NetworkMessage::DirectSendMsg(DirectSendMsg {
         protocol_id: PROTOCOL,
-        mdata: Bytes::from("hello world"),
+        priority: 0,
+        raw_msg: Vec::from("hello world"),
     });
 
     let client = async move {
+        info!("client start");
         let mut connection = MultiplexMessageSink::new(connection, MAX_FRAME_SIZE);
         for _ in 0..30 {
             // The client should then send the network message.
             connection.send(&send_msg).await.unwrap();
         }
+        info!("client sent");
         // Client then closes connection.
         connection.close().await.unwrap();
+        info!("client exiting");
     };
 
     let server = async move {
+        info!("server start");
         for _ in 0..30 {
             // Wait to receive notification of DirectSendMsg from Peer.
-            let received = peer_notifs_rx.next().await.unwrap();
-            assert_eq!(recv_msg, received);
+            let received = receiver.next().await.unwrap();
+            assert_eq!(recv_msg, received.message);
         }
+        info!("server exiting");
     };
+    info!("waiting");
     rt.block_on(future::join3(peer.start(), server, client));
+    info!("done");
 }
 
 // Two connected Peer actors should be able to send/recv a DirectSend from each
@@ -286,10 +312,17 @@ fn peer_recv_message() {
 fn peers_send_message_concurrent() {
     ::aptos_logger::Logger::init_for_testing();
     let rt = Runtime::new().unwrap();
+    let (upstream_handlers_a, mut prot_a_rx) = test_upstream_handlers();
+    let (upstream_handlers_b, mut prot_b_rx) = test_upstream_handlers();
     let (
-        (peer_a, mut peer_handle_a, mut connection_notifs_rx_a, mut peer_notifs_rx_a),
-        (peer_b, mut peer_handle_b, mut connection_notifs_rx_b, mut peer_notifs_rx_b),
-    ) = build_test_connected_peers(rt.handle().clone(), TimeService::mock());
+        (peer_a, mut peer_handle_a, mut connection_notifs_rx_a),
+        (peer_b, mut peer_handle_b, mut connection_notifs_rx_b),
+    ) = build_test_connected_peers(
+        rt.handle().clone(),
+        TimeService::mock(),
+        upstream_handlers_a,
+        upstream_handlers_b,
+    );
 
     let remote_peer_id_a = peer_a.remote_peer_id();
     let remote_peer_id_b = peer_b.remote_peer_id();
@@ -310,10 +343,24 @@ fn peers_send_message_concurrent() {
         peer_handle_b.send_direct_send(msg_b.clone());
 
         // Check that each peer received the other's message
-        let notif_a = peer_notifs_rx_a.next().await;
-        let notif_b = peer_notifs_rx_b.next().await;
-        assert_eq!(notif_a, Some(PeerNotification::RecvMessage(msg_b)));
-        assert_eq!(notif_b, Some(PeerNotification::RecvMessage(msg_a)));
+        let notif_a = prot_a_rx.next().await;
+        let notif_b = prot_b_rx.next().await;
+        assert_eq!(
+            notif_a.unwrap().message,
+            NetworkMessage::DirectSendMsg(DirectSendMsg {
+                protocol_id: PROTOCOL,
+                priority: 0,
+                raw_msg: msg_b.mdata.into(),
+            })
+        );
+        assert_eq!(
+            notif_b.unwrap().message,
+            NetworkMessage::DirectSendMsg(DirectSendMsg {
+                protocol_id: PROTOCOL,
+                priority: 0,
+                raw_msg: msg_a.mdata.into(),
+            })
+        );
 
         // Shut one peers and the other should shutdown due to ConnectionLost
         drop(peer_handle_a);
@@ -340,12 +387,13 @@ fn peers_send_message_concurrent() {
 fn peer_recv_rpc() {
     ::aptos_logger::Logger::init_for_testing();
     let rt = Runtime::new().unwrap();
-    let (peer, _peer_handle, mut connection, _connection_notifs_rx, mut peer_notifs_rx) =
-        build_test_peer(
-            rt.handle().clone(),
-            TimeService::mock(),
-            ConnectionOrigin::Inbound,
-        );
+    let (upstream_handlers, mut prot_rx) = test_upstream_handlers();
+    let (peer, _peer_handle, mut connection, _connection_notifs_rx) = build_test_peer(
+        rt.handle().clone(),
+        TimeService::mock(),
+        ConnectionOrigin::Inbound,
+        upstream_handlers,
+    );
     let (mut client_sink, mut client_stream) = build_network_sink_stream(&mut connection);
 
     let send_msg = MultiplexMessage::Message(NetworkMessage::RpcRequest(RpcRequest {
@@ -354,11 +402,6 @@ fn peer_recv_rpc() {
         priority: 0,
         raw_request: Vec::from("hello world"),
     }));
-    let recv_msg = PeerNotification::RecvRpc(InboundRpcRequest {
-        protocol_id: PROTOCOL,
-        data: Bytes::from("hello world"),
-        res_tx: oneshot::channel().0,
-    });
     let resp_msg = MultiplexMessage::Message(NetworkMessage::RpcResponse(RpcResponse {
         request_id: 123,
         priority: 0,
@@ -379,16 +422,32 @@ fn peer_recv_rpc() {
     let server = async move {
         for _ in 0..30 {
             // Wait to receive RpcRequest from Peer.
-            let received = peer_notifs_rx.next().await.unwrap();
-            assert_eq!(recv_msg, received);
+            let received = prot_rx.next().await.unwrap();
+            let ReceivedMessage {
+                message,
+                sender: _sender,
+                receive_timestamp_micros: _rx_at,
+                rpc_replier,
+            } = received;
+            assert_eq!(
+                message,
+                NetworkMessage::RpcRequest(RpcRequest {
+                    protocol_id: PROTOCOL,
+                    request_id: 123,
+                    priority: 0,
+                    raw_request: Vec::from("hello world"),
+                })
+            );
 
             // Send response to rpc.
-            match received {
-                PeerNotification::RecvRpc(req) => {
+            match message {
+                NetworkMessage::RpcRequest(_req) => {
                     let response = Ok(Bytes::from("goodbye world"));
-                    req.res_tx.send(response).unwrap()
+                    let rpc_replier = Arc::into_inner(rpc_replier.expect("rpc without replier"))
+                        .expect("Arc unpack fail");
+                    rpc_replier.send(response).expect("rpc reply send fail")
                 },
-                _ => panic!("Unexpected PeerNotification: {:?}", received),
+                msg => panic!("Unexpected NetworkMessage: {:?}", msg),
             }
         }
     };
@@ -399,12 +458,13 @@ fn peer_recv_rpc() {
 fn peer_recv_rpc_concurrent() {
     ::aptos_logger::Logger::init_for_testing();
     let rt = Runtime::new().unwrap();
-    let (peer, _peer_handle, mut connection, _connection_notifs_rx, mut peer_notifs_rx) =
-        build_test_peer(
-            rt.handle().clone(),
-            TimeService::mock(),
-            ConnectionOrigin::Inbound,
-        );
+    let (upstream_handlers, mut prot_rx) = test_upstream_handlers();
+    let (peer, _peer_handle, mut connection, _connection_notifs_rx) = build_test_peer(
+        rt.handle().clone(),
+        TimeService::mock(),
+        ConnectionOrigin::Inbound,
+        upstream_handlers,
+    );
     let (mut client_sink, mut client_stream) = build_network_sink_stream(&mut connection);
 
     let send_msg = MultiplexMessage::Message(NetworkMessage::RpcRequest(RpcRequest {
@@ -413,11 +473,6 @@ fn peer_recv_rpc_concurrent() {
         priority: 0,
         raw_request: Vec::from("hello world"),
     }));
-    let recv_msg = PeerNotification::RecvRpc(InboundRpcRequest {
-        protocol_id: PROTOCOL,
-        data: Bytes::from("hello world"),
-        res_tx: oneshot::channel().0,
-    });
     let resp_msg = MultiplexMessage::Message(NetworkMessage::RpcResponse(RpcResponse {
         request_id: 123,
         priority: 0,
@@ -444,11 +499,15 @@ fn peer_recv_rpc_concurrent() {
 
         // Wait to receive RpcRequests from Peer.
         for _ in 0..30 {
-            let received = peer_notifs_rx.next().await.unwrap();
-            assert_eq!(recv_msg, received);
-            match received {
-                PeerNotification::RecvRpc(req) => res_txs.push(req.res_tx),
-                _ => panic!("Unexpected PeerNotification: {:?}", received),
+            let received = prot_rx.next().await.unwrap();
+            match &received.message {
+                NetworkMessage::RpcRequest(req) => {
+                    assert_eq!(Vec::from("hello world"), req.raw_request);
+                    let arcsender = received.rpc_replier.unwrap();
+                    let sender = Arc::into_inner(arcsender).unwrap();
+                    res_txs.push(sender)
+                },
+                _ => panic!("Unexpected NetworkMessage: {:?}", received),
             };
         }
 
@@ -466,12 +525,13 @@ fn peer_recv_rpc_timeout() {
     ::aptos_logger::Logger::init_for_testing();
     let rt = Runtime::new().unwrap();
     let mock_time = MockTimeService::new();
-    let (peer, _peer_handle, mut connection, _connection_notifs_rx, mut peer_notifs_rx) =
-        build_test_peer(
-            rt.handle().clone(),
-            mock_time.clone().into(),
-            ConnectionOrigin::Inbound,
-        );
+    let (upstream_handlers, mut prot_rx) = test_upstream_handlers();
+    let (peer, _peer_handle, mut connection, _connection_notifs_rx) = build_test_peer(
+        rt.handle().clone(),
+        mock_time.clone().into(),
+        ConnectionOrigin::Inbound,
+        upstream_handlers,
+    );
     let (mut client_sink, client_stream) = build_network_sink_stream(&mut connection);
 
     let send_msg = MultiplexMessage::Message(NetworkMessage::RpcRequest(RpcRequest {
@@ -480,24 +540,22 @@ fn peer_recv_rpc_timeout() {
         priority: 0,
         raw_request: Vec::from("hello world"),
     }));
-    let recv_msg = PeerNotification::RecvRpc(InboundRpcRequest {
-        protocol_id: PROTOCOL,
-        data: Bytes::from("hello world"),
-        res_tx: oneshot::channel().0,
-    });
 
     let test = async move {
         // Client sends the rpc request.
         client_sink.send(&send_msg).await.unwrap();
 
         // Server receives the rpc request from client.
-        let received = peer_notifs_rx.next().await.unwrap();
-        assert_eq!(received, recv_msg);
+        let received = prot_rx.next().await.unwrap();
 
         // Pull out the request completion handle.
-        let mut res_tx = match received {
-            PeerNotification::RecvRpc(req) => req.res_tx,
-            _ => panic!("Unexpected PeerNotification: {:?}", received),
+        let mut res_tx = match &received.message {
+            NetworkMessage::RpcRequest(req) => {
+                assert_eq!(Vec::from("hello world"), req.raw_request);
+                let arcsender = received.rpc_replier.unwrap();
+                Arc::into_inner(arcsender).unwrap()
+            },
+            _ => panic!("Unexpected NetworkMessage: {:?}", received),
         };
 
         // The rpc response channel should still be open since we haven't timed out yet.
@@ -524,12 +582,13 @@ fn peer_recv_rpc_timeout() {
 fn peer_recv_rpc_cancel() {
     ::aptos_logger::Logger::init_for_testing();
     let rt = Runtime::new().unwrap();
-    let (peer, _peer_handle, mut connection, _connection_notifs_rx, mut peer_notifs_rx) =
-        build_test_peer(
-            rt.handle().clone(),
-            TimeService::mock(),
-            ConnectionOrigin::Inbound,
-        );
+    let (upstream_handlers, mut prot_rx) = test_upstream_handlers();
+    let (peer, _peer_handle, mut connection, _connection_notifs_rx) = build_test_peer(
+        rt.handle().clone(),
+        TimeService::mock(),
+        ConnectionOrigin::Inbound,
+        upstream_handlers,
+    );
     let (mut client_sink, client_stream) = build_network_sink_stream(&mut connection);
 
     let send_msg = MultiplexMessage::Message(NetworkMessage::RpcRequest(RpcRequest {
@@ -538,24 +597,22 @@ fn peer_recv_rpc_cancel() {
         priority: 0,
         raw_request: Vec::from("hello world"),
     }));
-    let recv_msg = PeerNotification::RecvRpc(InboundRpcRequest {
-        protocol_id: PROTOCOL,
-        data: Bytes::from("hello world"),
-        res_tx: oneshot::channel().0,
-    });
 
     let test = async move {
         // Client sends the rpc request.
         client_sink.send(&send_msg).await.unwrap();
 
         // Server receives the rpc request from client.
-        let received = peer_notifs_rx.next().await.unwrap();
-        assert_eq!(received, recv_msg);
+        let received = prot_rx.next().await.unwrap();
 
         // Pull out the request completion handle.
-        let res_tx = match received {
-            PeerNotification::RecvRpc(req) => req.res_tx,
-            _ => panic!("Unexpected PeerNotification: {:?}", received),
+        let res_tx = match &received.message {
+            NetworkMessage::RpcRequest(req) => {
+                assert_eq!(Vec::from("hello world"), req.raw_request);
+                let arcsender = received.rpc_replier.unwrap();
+                Arc::into_inner(arcsender).unwrap()
+            },
+            _ => panic!("Unexpected NetworkMessage: {:?}", received),
         };
 
         // The rpc response channel should still be open since we haven't timed out yet.
@@ -578,12 +635,13 @@ fn peer_recv_rpc_cancel() {
 fn peer_send_rpc() {
     ::aptos_logger::Logger::init_for_testing();
     let rt = Runtime::new().unwrap();
-    let (peer, mut peer_handle, mut connection, _connection_notifs_rx, _peer_notifs_rx) =
-        build_test_peer(
-            rt.handle().clone(),
-            TimeService::mock(),
-            ConnectionOrigin::Inbound,
-        );
+    let upstream_handlers = Arc::new(HashMap::new());
+    let (peer, mut peer_handle, mut connection, _connection_notifs_rx) = build_test_peer(
+        rt.handle().clone(),
+        TimeService::mock(),
+        ConnectionOrigin::Inbound,
+        upstream_handlers,
+    );
     let (mut server_sink, mut server_stream) = build_network_sink_stream(&mut connection);
     let timeout = Duration::from_millis(10_000);
 
@@ -637,12 +695,13 @@ fn peer_send_rpc() {
 fn peer_send_rpc_concurrent() {
     ::aptos_logger::Logger::init_for_testing();
     let rt = Runtime::new().unwrap();
-    let (peer, peer_handle, mut connection, _connection_notifs_rx, _peer_notifs_rx) =
-        build_test_peer(
-            rt.handle().clone(),
-            TimeService::mock(),
-            ConnectionOrigin::Inbound,
-        );
+    let upstream_handlers = Arc::new(HashMap::new());
+    let (peer, peer_handle, mut connection, _connection_notifs_rx) = build_test_peer(
+        rt.handle().clone(),
+        TimeService::mock(),
+        ConnectionOrigin::Inbound,
+        upstream_handlers,
+    );
     let (mut server_sink, mut server_stream) = build_network_sink_stream(&mut connection);
     let timeout = Duration::from_millis(10_000);
 
@@ -706,12 +765,13 @@ fn peer_send_rpc_concurrent() {
 fn peer_send_rpc_cancel() {
     ::aptos_logger::Logger::init_for_testing();
     let rt = Runtime::new().unwrap();
-    let (peer, peer_handle, mut connection, _connection_notifs_rx, _peer_notifs_rx) =
-        build_test_peer(
-            rt.handle().clone(),
-            TimeService::mock(),
-            ConnectionOrigin::Inbound,
-        );
+    let upstream_handlers = Arc::new(HashMap::new());
+    let (peer, peer_handle, mut connection, _connection_notifs_rx) = build_test_peer(
+        rt.handle().clone(),
+        TimeService::mock(),
+        ConnectionOrigin::Inbound,
+        upstream_handlers,
+    );
     let (mut server_sink, mut server_stream) = build_network_sink_stream(&mut connection);
     let timeout = Duration::from_millis(10_000);
 
@@ -767,12 +827,13 @@ fn peer_send_rpc_timeout() {
     ::aptos_logger::Logger::init_for_testing();
     let rt = Runtime::new().unwrap();
     let mock_time = MockTimeService::new();
-    let (peer, peer_handle, mut connection, _connection_notifs_rx, _peer_notifs_rx) =
-        build_test_peer(
-            rt.handle().clone(),
-            mock_time.clone().into(),
-            ConnectionOrigin::Inbound,
-        );
+    let upstream_handlers = Arc::new(HashMap::new());
+    let (peer, peer_handle, mut connection, _connection_notifs_rx) = build_test_peer(
+        rt.handle().clone(),
+        mock_time.clone().into(),
+        ConnectionOrigin::Inbound,
+        upstream_handlers,
+    );
     let (mut server_sink, mut server_stream) = build_network_sink_stream(&mut connection);
     let timeout = Duration::from_millis(10_000);
 
@@ -831,12 +892,13 @@ fn peer_send_rpc_timeout() {
 fn peer_disconnect_request() {
     ::aptos_logger::Logger::init_for_testing();
     let rt = Runtime::new().unwrap();
-    let (peer, peer_handle, _connection, mut connection_notifs_rx, _peer_notifs_rx) =
-        build_test_peer(
-            rt.handle().clone(),
-            TimeService::mock(),
-            ConnectionOrigin::Inbound,
-        );
+    let upstream_handlers = Arc::new(HashMap::new());
+    let (peer, peer_handle, _connection, mut connection_notifs_rx) = build_test_peer(
+        rt.handle().clone(),
+        TimeService::mock(),
+        ConnectionOrigin::Inbound,
+        upstream_handlers,
+    );
     let remote_peer_id = peer.remote_peer_id();
 
     let test = async move {
@@ -857,12 +919,13 @@ fn peer_disconnect_request() {
 fn peer_disconnect_connection_lost() {
     ::aptos_logger::Logger::init_for_testing();
     let rt = Runtime::new().unwrap();
-    let (peer, _peer_handle, mut connection, mut connection_notifs_rx, _peer_notifs_rx) =
-        build_test_peer(
-            rt.handle().clone(),
-            TimeService::mock(),
-            ConnectionOrigin::Inbound,
-        );
+    let upstream_handlers = Arc::new(HashMap::new());
+    let (peer, _peer_handle, mut connection, mut connection_notifs_rx) = build_test_peer(
+        rt.handle().clone(),
+        TimeService::mock(),
+        ConnectionOrigin::Inbound,
+        upstream_handlers,
+    );
     let remote_peer_id = peer.remote_peer_id();
 
     let test = async move {
@@ -881,10 +944,12 @@ fn peer_disconnect_connection_lost() {
 fn peer_terminates_when_request_tx_has_dropped() {
     ::aptos_logger::Logger::init_for_testing();
     let rt = Runtime::new().unwrap();
-    let (peer, peer_handle, _connection, _connection_notifs_rx, _peer_notifs_rx) = build_test_peer(
+    let upstream_handlers = Arc::new(HashMap::new());
+    let (peer, peer_handle, _connection, _connection_notifs_rx) = build_test_peer(
         rt.handle().clone(),
         TimeService::mock(),
         ConnectionOrigin::Inbound,
+        upstream_handlers,
     );
 
     let drop = async move {
@@ -898,10 +963,17 @@ fn peer_terminates_when_request_tx_has_dropped() {
 fn peers_send_multiplex() {
     ::aptos_logger::Logger::init_for_testing();
     let rt = Runtime::new().unwrap();
+    let (upstream_handlers_a, mut prot_a_rx) = test_upstream_handlers();
+    let (upstream_handlers_b, mut prot_b_rx) = test_upstream_handlers();
     let (
-        (peer_a, mut peer_handle_a, mut connection_notifs_rx_a, mut peer_notifs_rx_a),
-        (peer_b, mut peer_handle_b, mut connection_notifs_rx_b, mut peer_notifs_rx_b),
-    ) = build_test_connected_peers(rt.handle().clone(), TimeService::mock());
+        (peer_a, mut peer_handle_a, mut connection_notifs_rx_a),
+        (peer_b, mut peer_handle_b, mut connection_notifs_rx_b),
+    ) = build_test_connected_peers(
+        rt.handle().clone(),
+        TimeService::mock(),
+        upstream_handlers_a,
+        upstream_handlers_b,
+    );
 
     let remote_peer_id_a = peer_a.remote_peer_id();
     let remote_peer_id_b = peer_b.remote_peer_id();
@@ -922,10 +994,24 @@ fn peers_send_multiplex() {
         peer_handle_b.send_direct_send(msg_b.clone());
 
         // Check that each peer received the other's message
-        let notif_a = peer_notifs_rx_a.next().await;
-        let notif_b = peer_notifs_rx_b.next().await;
-        assert_eq!(notif_a, Some(PeerNotification::RecvMessage(msg_b)));
-        assert_eq!(notif_b, Some(PeerNotification::RecvMessage(msg_a)));
+        let notif_a = prot_a_rx.next().await;
+        let notif_b = prot_b_rx.next().await;
+        assert_eq!(
+            notif_a.unwrap().message,
+            NetworkMessage::DirectSendMsg(DirectSendMsg {
+                protocol_id: PROTOCOL,
+                priority: 0,
+                raw_msg: msg_b.mdata.into(),
+            })
+        );
+        assert_eq!(
+            notif_b.unwrap().message,
+            NetworkMessage::DirectSendMsg(DirectSendMsg {
+                protocol_id: PROTOCOL,
+                priority: 0,
+                raw_msg: msg_a.mdata.into(),
+            })
+        );
 
         // Shut one peers and the other should shutdown due to ConnectionLost
         drop(peer_handle_a);
diff --git a/network/framework/src/peer_manager/builder.rs b/network/framework/src/peer_manager/builder.rs
index da40894b646f3..6277ef9637bf3 100644
--- a/network/framework/src/peer_manager/builder.rs
+++ b/network/framework/src/peer_manager/builder.rs
@@ -8,10 +8,10 @@ use crate::{
     noise::{stream::NoiseStream, HandshakeAuthMode},
     peer_manager::{
         conn_notifs_channel, ConnectionRequest, ConnectionRequestSender, PeerManager,
-        PeerManagerNotification, PeerManagerRequest, PeerManagerRequestSender,
+        PeerManagerRequest, PeerManagerRequestSender,
     },
     protocols::{
-        network::{NetworkClientConfig, NetworkServiceConfig},
+        network::{NetworkClientConfig, NetworkServiceConfig, ReceivedMessage},
         wire::handshake::v1::ProtocolIdSet,
     },
     transport::{self, AptosNetTransport, Connection, APTOS_TCP_TRANSPORT},
@@ -70,10 +70,9 @@ struct PeerManagerContext {
 
     peers_and_metadata: Arc<PeersAndMetadata>,
     upstream_handlers:
-        HashMap<ProtocolId, aptos_channel::Sender<(PeerId, ProtocolId), PeerManagerNotification>>,
+        HashMap<ProtocolId, aptos_channel::Sender<(PeerId, ProtocolId), ReceivedMessage>>,
     connection_event_handlers: Vec<conn_notifs_channel::Sender>,
 
-    max_concurrent_network_reqs: usize,
     channel_size: usize,
     max_frame_size: usize,
     max_message_size: usize,
@@ -92,11 +91,10 @@ impl PeerManagerContext {
         peers_and_metadata: Arc<PeersAndMetadata>,
         upstream_handlers: HashMap<
             ProtocolId,
-            aptos_channel::Sender<(PeerId, ProtocolId), PeerManagerNotification>,
+            aptos_channel::Sender<(PeerId, ProtocolId), ReceivedMessage>,
         >,
         connection_event_handlers: Vec<conn_notifs_channel::Sender>,
 
-        max_concurrent_network_reqs: usize,
         channel_size: usize,
         max_frame_size: usize,
         max_message_size: usize,
@@ -113,7 +111,6 @@ impl PeerManagerContext {
             upstream_handlers,
             connection_event_handlers,
 
-            max_concurrent_network_reqs,
             channel_size,
             max_frame_size,
             max_message_size,
@@ -125,7 +122,7 @@ impl PeerManagerContext {
     fn add_upstream_handler(
         &mut self,
         protocol_id: ProtocolId,
-        channel: aptos_channel::Sender<(PeerId, ProtocolId), PeerManagerNotification>,
+        channel: aptos_channel::Sender<(PeerId, ProtocolId), ReceivedMessage>,
     ) -> &mut Self {
         self.upstream_handlers.insert(protocol_id, channel);
         self
@@ -171,7 +168,6 @@ impl PeerManagerBuilder {
         peers_and_metadata: Arc<PeersAndMetadata>,
         authentication_mode: AuthenticationMode,
         channel_size: usize,
-        max_concurrent_network_reqs: usize,
         max_frame_size: usize,
         max_message_size: usize,
         enable_proxy_protocol: bool,
@@ -206,7 +202,6 @@ impl PeerManagerBuilder {
                 peers_and_metadata,
                 HashMap::new(),
                 Vec::new(),
-                max_concurrent_network_reqs,
                 channel_size,
                 max_frame_size,
                 max_message_size,
@@ -342,7 +337,6 @@ impl PeerManagerBuilder {
             pm_context.upstream_handlers,
             pm_context.connection_event_handlers,
             pm_context.channel_size,
-            pm_context.max_concurrent_network_reqs,
             pm_context.max_frame_size,
             pm_context.max_message_size,
             pm_context.inbound_connection_limit,
@@ -417,7 +411,7 @@ impl PeerManagerBuilder {
     pub fn add_service(
         &mut self,
         config: &NetworkServiceConfig,
-    ) -> aptos_channel::Receiver<(PeerId, ProtocolId), PeerManagerNotification> {
+    ) -> aptos_channel::Receiver<(PeerId, ProtocolId), ReceivedMessage> {
         // Register the direct send and rpc protocols
         self.transport_context()
             .add_protocols(&config.direct_send_protocols_and_preferences);
diff --git a/network/framework/src/peer_manager/mod.rs b/network/framework/src/peer_manager/mod.rs
index ed1b469bf0f43..4ee50778121fb 100644
--- a/network/framework/src/peer_manager/mod.rs
+++ b/network/framework/src/peer_manager/mod.rs
@@ -15,7 +15,7 @@ use crate::{
     constants,
     counters::{self},
     logging::*,
-    peer::{Peer, PeerNotification, PeerRequest},
+    peer::{Peer, PeerRequest},
     transport::{
         Connection, ConnectionId, ConnectionMetadata, TSocket as TransportTSocket,
         TRANSPORT_TIMEOUT,
@@ -56,7 +56,7 @@ pub use self::error::PeerManagerError;
 use crate::{
     application::{error::Error, storage::PeersAndMetadata},
     peer_manager::transport::{TransportHandler, TransportRequest},
-    protocols::network::SerializedRequest,
+    protocols::network::{ReceivedMessage, SerializedRequest},
 };
 use aptos_config::config::PeerRole;
 use aptos_types::account_address::AccountAddress;
@@ -93,7 +93,7 @@ where
     /// Upstream handlers for RPC and DirectSend protocols. The handlers are promised fair delivery
     /// of messages across (PeerId, ProtocolId).
     upstream_handlers:
-        HashMap<ProtocolId, aptos_channel::Sender<(PeerId, ProtocolId), PeerManagerNotification>>,
+        Arc<HashMap<ProtocolId, aptos_channel::Sender<(PeerId, ProtocolId), ReceivedMessage>>>,
     /// Channels to send NewPeer/LostPeer notifications to.
     connection_event_handlers: Vec<conn_notifs_channel::Sender>,
     /// Channel used to send Dial requests to the ConnectionHandler actor
@@ -109,8 +109,6 @@ where
         HashMap<ConnectionId, oneshot::Sender<Result<(), PeerManagerError>>>,
     /// Pin the transport type corresponding to this PeerManager instance
     phantom_transport: PhantomData<TTransport>,
-    /// Maximum concurrent network requests to any peer.
-    max_concurrent_network_reqs: usize,
     /// Size of channels between different actors.
     channel_size: usize,
     /// Max network frame size
@@ -139,11 +137,10 @@ where
         connection_reqs_rx: aptos_channel::Receiver<PeerId, ConnectionRequest>,
         upstream_handlers: HashMap<
             ProtocolId,
-            aptos_channel::Sender<(PeerId, ProtocolId), PeerManagerNotification>,
+            aptos_channel::Sender<(PeerId, ProtocolId), ReceivedMessage>,
         >,
         connection_event_handlers: Vec<conn_notifs_channel::Sender>,
         channel_size: usize,
-        max_concurrent_network_reqs: usize,
         max_frame_size: usize,
         max_message_size: usize,
         inbound_connection_limit: usize,
@@ -182,9 +179,8 @@ where
             transport_notifs_rx,
             outstanding_disconnect_requests: HashMap::new(),
             phantom_transport: PhantomData,
-            upstream_handlers,
+            upstream_handlers: Arc::new(upstream_handlers),
             connection_event_handlers,
-            max_concurrent_network_reqs,
             channel_size,
             max_frame_size,
             max_message_size,
@@ -650,12 +646,6 @@ where
             self.channel_size,
             Some(&counters::PENDING_NETWORK_REQUESTS),
         );
-        // TODO: Add label for peer.
-        let (peer_notifs_tx, peer_notifs_rx) = aptos_channel::new(
-            QueueStyle::FIFO,
-            self.channel_size,
-            Some(&counters::PENDING_NETWORK_NOTIFICATIONS),
-        );
 
         // Initialize a new Peer actor for this connection.
         let peer = Peer::new(
@@ -665,7 +655,7 @@ where
             connection,
             self.transport_notifs_tx.clone(),
             peer_reqs_rx,
-            peer_notifs_tx,
+            self.upstream_handlers.clone(),
             Duration::from_millis(constants::INBOUND_RPC_TIMEOUT_MS),
             constants::MAX_CONCURRENT_INBOUND_RPCS,
             constants::MAX_CONCURRENT_OUTBOUND_RPCS,
@@ -674,9 +664,6 @@ where
         );
         self.executor.spawn(peer.start());
 
-        // Start background task to handle events (RPCs and DirectSend messages) received from
-        // peer.
-        self.spawn_peer_network_events_handler(peer_id, peer_notifs_rx);
         // Save PeerRequest sender to `active_peers`.
         self.active_peers
             .insert(peer_id, (conn_meta.clone(), peer_reqs_tx));
@@ -712,69 +699,4 @@ where
             }
         }
     }
-
-    fn spawn_peer_network_events_handler(
-        &self,
-        peer_id: PeerId,
-        network_events: aptos_channel::Receiver<ProtocolId, PeerNotification>,
-    ) {
-        let mut upstream_handlers = self.upstream_handlers.clone();
-        let network_context = self.network_context;
-        self.executor.spawn(network_events.for_each_concurrent(
-            self.max_concurrent_network_reqs,
-            move |inbound_event| {
-                handle_inbound_request(
-                    network_context,
-                    inbound_event,
-                    peer_id,
-                    &mut upstream_handlers,
-                );
-                futures::future::ready(())
-            },
-        ));
-    }
-}
-
-/// A task for consuming inbound network messages
-fn handle_inbound_request(
-    network_context: NetworkContext,
-    inbound_event: PeerNotification,
-    peer_id: PeerId,
-    upstream_handlers: &mut HashMap<
-        ProtocolId,
-        aptos_channel::Sender<(PeerId, ProtocolId), PeerManagerNotification>,
-    >,
-) {
-    let (protocol_id, notification) = match inbound_event {
-        PeerNotification::RecvMessage(msg) => (
-            msg.protocol_id(),
-            PeerManagerNotification::RecvMessage(peer_id, msg),
-        ),
-        PeerNotification::RecvRpc(req) => (
-            req.protocol_id(),
-            PeerManagerNotification::RecvRpc(peer_id, req),
-        ),
-    };
-
-    if let Some(handler) = upstream_handlers.get_mut(&protocol_id) {
-        // Send over aptos channel for fairness.
-        if let Err(err) = handler.push((peer_id, protocol_id), notification) {
-            warn!(
-                NetworkSchema::new(&network_context),
-                error = ?err,
-                protocol_id = protocol_id,
-                "{} Upstream handler unable to handle message for protocol: {}. Error: {:?}",
-                network_context, protocol_id, err
-            );
-        }
-    } else {
-        debug!(
-            NetworkSchema::new(&network_context),
-            protocol_id = protocol_id,
-            message = format!("{:?}", notification),
-            "{} Received network message for unregistered protocol: {:?}",
-            network_context,
-            notification,
-        );
-    }
 }
diff --git a/network/framework/src/peer_manager/tests.rs b/network/framework/src/peer_manager/tests.rs
index d9c9c76d7f911..712ab9160aa9f 100644
--- a/network/framework/src/peer_manager/tests.rs
+++ b/network/framework/src/peer_manager/tests.rs
@@ -8,7 +8,7 @@ use crate::{
     peer::DisconnectReason,
     peer_manager::{
         conn_notifs_channel, error::PeerManagerError, ConnectionNotification, ConnectionRequest,
-        PeerManager, PeerManagerNotification, PeerManagerRequest, TransportNotification,
+        PeerManager, PeerManagerRequest, TransportNotification,
     },
     protocols::wire::{
         handshake::v1::{MessagingProtocolVersion, ProtocolIdSet},
@@ -89,13 +89,12 @@ fn build_test_peer_manager(
     >,
     aptos_channel::Sender<(PeerId, ProtocolId), PeerManagerRequest>,
     aptos_channel::Sender<PeerId, ConnectionRequest>,
-    aptos_channel::Receiver<(PeerId, ProtocolId), PeerManagerNotification>,
     conn_notifs_channel::Receiver,
 ) {
     let (peer_manager_request_tx, peer_manager_request_rx) =
         aptos_channel::new(QueueStyle::FIFO, 1, None);
     let (connection_reqs_tx, connection_reqs_rx) = aptos_channel::new(QueueStyle::FIFO, 1, None);
-    let (hello_tx, hello_rx) = aptos_channel::new(QueueStyle::FIFO, 1, None);
+    let (hello_tx, _hello_rx) = aptos_channel::new(QueueStyle::FIFO, 1, None);
     let (conn_status_tx, conn_status_rx) = conn_notifs_channel::new();
 
     let network_id = NetworkId::Validator;
@@ -114,7 +113,6 @@ fn build_test_peer_manager(
             .collect(),
         vec![conn_status_tx],
         constants::NETWORK_CHANNEL_SIZE,
-        constants::MAX_CONCURRENT_NETWORK_REQS,
         constants::MAX_FRAME_SIZE,
         constants::MAX_MESSAGE_SIZE,
         MAX_INBOUND_CONNECTIONS,
@@ -124,7 +122,6 @@ fn build_test_peer_manager(
         peer_manager,
         peer_manager_request_tx,
         connection_reqs_tx,
-        hello_rx,
         conn_status_rx,
     )
 }
@@ -255,7 +252,7 @@ fn peer_manager_simultaneous_dial_two_inbound() {
 
     // Create a list of ordered PeerIds so we can ensure how PeerIds will be compared.
     let ids = ordered_peer_ids(2);
-    let (mut peer_manager, _request_tx, _connection_reqs_tx, _hello_rx, _conn_statux_rx) =
+    let (mut peer_manager, _request_tx, _connection_reqs_tx, _conn_statux_rx) =
         build_test_peer_manager(runtime.handle().clone(), ids[1]);
 
     let test = async move {
@@ -305,7 +302,7 @@ fn peer_manager_simultaneous_dial_inbound_outbound_remote_id_larger() {
 
     // Create a list of ordered PeerIds so we can ensure how PeerIds will be compared.
     let ids = ordered_peer_ids(2);
-    let (mut peer_manager, _request_tx, _connection_reqs_tx, _hello_rx, _conn_status_rx) =
+    let (mut peer_manager, _request_tx, _connection_reqs_tx, _conn_status_rx) =
         build_test_peer_manager(runtime.handle().clone(), ids[0]);
 
     let test = async move {
@@ -356,7 +353,7 @@ fn peer_manager_simultaneous_dial_inbound_outbound_own_id_larger() {
 
     // Create a list of ordered PeerIds so we can ensure how PeerIds will be compared.
     let ids = ordered_peer_ids(2);
-    let (mut peer_manager, _request_tx, _connection_reqs_tx, _hello_rx, _conn_status_rx) =
+    let (mut peer_manager, _request_tx, _connection_reqs_tx, _conn_status_rx) =
         build_test_peer_manager(runtime.handle().clone(), ids[1]);
 
     let test = async move {
@@ -407,7 +404,7 @@ fn peer_manager_simultaneous_dial_outbound_inbound_remote_id_larger() {
 
     // Create a list of ordered PeerIds so we can ensure how PeerIds will be compared.
     let ids = ordered_peer_ids(2);
-    let (mut peer_manager, _request_tx, _connection_reqs_tx, _hello_rx, _conn_status_rx) =
+    let (mut peer_manager, _request_tx, _connection_reqs_tx, _conn_status_rx) =
         build_test_peer_manager(runtime.handle().clone(), ids[0]);
 
     let test = async move {
@@ -458,7 +455,7 @@ fn peer_manager_simultaneous_dial_outbound_inbound_own_id_larger() {
 
     // Create a list of ordered PeerIds so we can ensure how PeerIds will be compared.
     let ids = ordered_peer_ids(2);
-    let (mut peer_manager, _request_tx, _connection_reqs_tx, _hello_rx, _conn_status_rx) =
+    let (mut peer_manager, _request_tx, _connection_reqs_tx, _conn_status_rx) =
         build_test_peer_manager(runtime.handle().clone(), ids[1]);
 
     let test = async move {
@@ -509,7 +506,7 @@ fn peer_manager_simultaneous_dial_two_outbound() {
 
     // Create a list of ordered PeerIds so we can ensure how PeerIds will be compared.
     let ids = ordered_peer_ids(2);
-    let (mut peer_manager, _request_tx, _connection_reqs_tx, _hello_rx, _conn_status_rx) =
+    let (mut peer_manager, _request_tx, _connection_reqs_tx, _conn_status_rx) =
         build_test_peer_manager(runtime.handle().clone(), ids[1]);
 
     let test = async move {
@@ -556,7 +553,7 @@ fn peer_manager_simultaneous_dial_disconnect_event() {
 
     // Create a list of ordered PeerIds so we can ensure how PeerIds will be compared.
     let ids = ordered_peer_ids(2);
-    let (mut peer_manager, _request_tx, _connection_reqs_tx, _hello_rx, _conn_status_rx) =
+    let (mut peer_manager, _request_tx, _connection_reqs_tx, _conn_status_rx) =
         build_test_peer_manager(runtime.handle().clone(), ids[1]);
 
     let test = async move {
@@ -600,7 +597,7 @@ fn test_dial_disconnect() {
 
     // Create a list of ordered PeerIds so we can ensure how PeerIds will be compared.
     let ids = ordered_peer_ids(2);
-    let (mut peer_manager, _request_tx, _connection_reqs_tx, _hello_rx, mut conn_status_rx) =
+    let (mut peer_manager, _request_tx, _connection_reqs_tx, mut conn_status_rx) =
         build_test_peer_manager(runtime.handle().clone(), ids[1]);
 
     let test = async move {
diff --git a/network/framework/src/peer_manager/types.rs b/network/framework/src/peer_manager/types.rs
index c41d2c4c3f82e..006465c7e9073 100644
--- a/network/framework/src/peer_manager/types.rs
+++ b/network/framework/src/peer_manager/types.rs
@@ -4,10 +4,7 @@
 use crate::{
     peer::DisconnectReason,
     peer_manager::PeerManagerError,
-    protocols::{
-        direct_send::Message,
-        rpc::{InboundRpcRequest, OutboundRpcRequest},
-    },
+    protocols::{direct_send::Message, rpc::OutboundRpcRequest},
     transport::{Connection, ConnectionMetadata},
 };
 use aptos_config::network_id::NetworkId;
@@ -25,25 +22,6 @@ pub enum PeerManagerRequest {
     SendDirectSend(PeerId, #[serde(skip)] Message),
 }
 
-/// Notifications sent by PeerManager to upstream actors.
-#[derive(Debug)]
-pub enum PeerManagerNotification {
-    /// A new RPC request has been received from a remote peer.
-    RecvRpc(PeerId, InboundRpcRequest),
-    /// A new message has been received from a remote peer.
-    RecvMessage(PeerId, Message),
-}
-
-impl PeerManagerNotification {
-    /// Returns the peer ID of the notification
-    pub fn get_peer_id(&self) -> PeerId {
-        match self {
-            PeerManagerNotification::RecvRpc(peer_id, _) => *peer_id,
-            PeerManagerNotification::RecvMessage(peer_id, _) => *peer_id,
-        }
-    }
-}
-
 #[derive(Debug, Serialize)]
 pub enum ConnectionRequest {
     DialPeer(
diff --git a/network/framework/src/protocols/health_checker/mod.rs b/network/framework/src/protocols/health_checker/mod.rs
index a7c9edd92ed87..fea7da738dd95 100644
--- a/network/framework/src/protocols/health_checker/mod.rs
+++ b/network/framework/src/protocols/health_checker/mod.rs
@@ -48,6 +48,7 @@ use futures::{
 use rand::{rngs::SmallRng, Rng, SeedableRng};
 use serde::{Deserialize, Serialize};
 use std::time::Duration;
+use tokio::time::timeout;
 
 pub mod builder;
 mod interface;
@@ -56,10 +57,8 @@ mod test;
 
 /// The interface from Network to HealthChecker layer.
 ///
-/// `HealthCheckerNetworkEvents` is a `Stream` of `PeerManagerNotification` where the
-/// raw `Bytes` rpc messages are deserialized into
-/// `HealthCheckerMsg` types. `HealthCheckerNetworkEvents` is a thin wrapper
-/// around an `channel::Receiver<PeerManagerNotification>`.
+/// `HealthCheckerNetworkEvents` is a `Stream` of `HealthCheckerMsg`.
+/// (Behind the scenes, network messages are being deserialized)
 pub type HealthCheckerNetworkEvents = NetworkEvents<HealthCheckerMsg>;
 
 /// Returns a network application config for the health check client and service
@@ -165,6 +164,8 @@ impl<NetworkClient: NetworkClientInterface<HealthCheckerMsg> + Unpin> HealthChec
         let mut connection_events =
             tokio_stream::wrappers::ReceiverStream::new(connection_events).fuse();
 
+        let self_network_id = self.network_context.network_id();
+
         loop {
             futures::select! {
                 maybe_event = self.network_interface.next() => {
@@ -207,15 +208,21 @@ impl<NetworkClient: NetworkClientInterface<HealthCheckerMsg> + Unpin> HealthChec
                 }
                 conn_event = connection_events.select_next_some() => {
                     match conn_event {
-                        ConnectionNotification::NewPeer(metadata, _network_id) => {
-                            self.network_interface.create_peer_and_health_data(
-                                metadata.remote_peer_id, self.round
-                            );
+                        ConnectionNotification::NewPeer(metadata, network_id) => {
+                            // PeersAndMetadata is a global singleton across all networks; filter connect/disconnect events to the NetworkId that this HealthChecker instance is watching
+                            if network_id == self_network_id {
+                                self.network_interface.create_peer_and_health_data(
+                                    metadata.remote_peer_id, self.round
+                                );
+                            }
                         }
-                        ConnectionNotification::LostPeer(metadata, _network_id) => {
-                            self.network_interface.remove_peer_and_health_data(
-                                &metadata.remote_peer_id
-                            );
+                        ConnectionNotification::LostPeer(metadata, network_id) => {
+                            // PeersAndMetadata is a global singleton across all networks; filter connect/disconnect events to the NetworkId that this HealthChecker instance is watching
+                            if network_id == self_network_id {
+                                self.network_interface.remove_peer_and_health_data(
+                                    &metadata.remote_peer_id
+                                );
+                            }
                         }
                     }
                 }
@@ -365,10 +372,11 @@ impl<NetworkClient: NetworkClientInterface<HealthCheckerMsg> + Unpin> HealthChec
                     );
                     let peer_network_id =
                         PeerNetworkId::new(self.network_context.network_id(), peer_id);
-                    if let Err(err) = self
-                        .network_interface
-                        .disconnect_peer(peer_network_id)
-                        .await
+                    if let Err(err) = timeout(
+                        Duration::from_millis(50),
+                        self.network_interface.disconnect_peer(peer_network_id),
+                    )
+                    .await
                     {
                         warn!(
                             NetworkSchema::new(&self.network_context)
diff --git a/network/framework/src/protocols/health_checker/test.rs b/network/framework/src/protocols/health_checker/test.rs
index ec489ad93eb97..0027655e57a9c 100644
--- a/network/framework/src/protocols/health_checker/test.rs
+++ b/network/framework/src/protocols/health_checker/test.rs
@@ -6,18 +6,21 @@ use super::*;
 use crate::{
     application::{interface::NetworkClient, storage::PeersAndMetadata},
     peer_manager::{
-        self, ConnectionRequest, ConnectionRequestSender, PeerManagerNotification,
-        PeerManagerRequest, PeerManagerRequestSender,
+        self, ConnectionRequest, ConnectionRequestSender, PeerManagerRequest,
+        PeerManagerRequestSender,
     },
     protocols::{
-        network::{NetworkSender, NewNetworkEvents, NewNetworkSender},
-        rpc::InboundRpcRequest,
-        wire::handshake::v1::{ProtocolId::HealthCheckerRpc, ProtocolIdSet},
+        network::{NetworkSender, NewNetworkEvents, NewNetworkSender, ReceivedMessage},
+        wire::{
+            handshake::v1::{ProtocolId::HealthCheckerRpc, ProtocolIdSet},
+            messaging::v1::{NetworkMessage, RpcRequest},
+        },
     },
     transport::ConnectionMetadata,
     ProtocolId,
 };
 use aptos_channels::{aptos_channel, message_queues::QueueStyle};
+use aptos_config::network_id::NetworkId;
 use aptos_time_service::{MockTimeService, TimeService};
 use futures::future;
 use maplit::hashmap;
@@ -29,7 +32,7 @@ const PING_TIMEOUT: Duration = Duration::from_millis(500);
 struct TestHarness {
     mock_time: MockTimeService,
     peer_mgr_reqs_rx: aptos_channel::Receiver<(PeerId, ProtocolId), PeerManagerRequest>,
-    peer_mgr_notifs_tx: aptos_channel::Sender<(PeerId, ProtocolId), PeerManagerNotification>,
+    peer_mgr_notifs_tx: aptos_channel::Sender<(PeerId, ProtocolId), ReceivedMessage>,
     connection_reqs_rx: aptos_channel::Receiver<PeerId, ConnectionRequest>,
     connection_notifs_tx: tokio::sync::mpsc::Sender<ConnectionNotification>,
     peers_and_metadata: Arc<PeersAndMetadata>,
@@ -53,7 +56,7 @@ impl TestHarness {
             PeerManagerRequestSender::new(peer_mgr_reqs_tx),
             ConnectionRequestSender::new(connection_reqs_tx),
         );
-        let hc_network_rx = HealthCheckerNetworkEvents::new(peer_mgr_notifs_rx, None);
+        let hc_network_rx = HealthCheckerNetworkEvents::new(peer_mgr_notifs_rx, None, true);
 
         let network_context = NetworkContext::mock();
         let peers_and_metadata = PeersAndMetadata::new(&[network_context.network_id()]);
@@ -132,21 +135,24 @@ impl TestHarness {
         ping: u32,
     ) -> oneshot::Receiver<Result<Bytes, RpcError>> {
         let protocol_id = ProtocolId::HealthCheckerRpc;
-        let data = bcs::to_bytes(&HealthCheckerMsg::Ping(Ping(ping)))
-            .unwrap()
-            .into();
+        let data = bcs::to_bytes(&HealthCheckerMsg::Ping(Ping(ping))).unwrap();
         let (res_tx, res_rx) = oneshot::channel();
-        let inbound_rpc_req = InboundRpcRequest {
-            protocol_id,
-            data,
-            res_tx,
-        };
         let key = (peer_id, ProtocolId::HealthCheckerRpc);
         let (delivered_tx, delivered_rx) = oneshot::channel();
         self.peer_mgr_notifs_tx
             .push_with_feedback(
                 key,
-                PeerManagerNotification::RecvRpc(peer_id, inbound_rpc_req),
+                ReceivedMessage {
+                    message: NetworkMessage::RpcRequest(RpcRequest {
+                        protocol_id,
+                        request_id: 0,
+                        priority: 0,
+                        raw_request: data,
+                    }),
+                    sender: PeerNetworkId::new(NetworkId::Validator, peer_id),
+                    receive_timestamp_micros: 0,
+                    rpc_replier: Some(Arc::new(res_tx)),
+                },
                 Some(delivered_tx),
             )
             .unwrap();
diff --git a/network/framework/src/protocols/network/mod.rs b/network/framework/src/protocols/network/mod.rs
index d2559d4796cff..786b9ff033800 100644
--- a/network/framework/src/protocols/network/mod.rs
+++ b/network/framework/src/protocols/network/mod.rs
@@ -7,10 +7,12 @@
 pub use crate::protocols::rpc::error::RpcError;
 use crate::{
     error::NetworkError,
-    peer_manager::{ConnectionRequestSender, PeerManagerNotification, PeerManagerRequestSender},
+    peer_manager::{ConnectionRequestSender, PeerManagerRequestSender},
+    protocols::wire::messaging::v1::{IncomingRequest, NetworkMessage},
     ProtocolId,
 };
-use aptos_channels::{aptos_channel, message_queues::QueueStyle};
+use aptos_channels::aptos_channel;
+use aptos_config::network_id::PeerNetworkId;
 use aptos_logger::prelude::*;
 use aptos_short_hex_str::AsShortHexStr;
 use aptos_types::{network_address::NetworkAddress, PeerId};
@@ -20,26 +22,20 @@ use futures::{
     stream::{FusedStream, Stream, StreamExt},
     task::{Context, Poll},
 };
-use futures_util::FutureExt;
+use futures_util::ready;
 use pin_project::pin_project;
 use serde::{de::DeserializeOwned, Serialize};
-use std::{cmp::min, fmt::Debug, marker::PhantomData, pin::Pin, time::Duration};
+use std::{cmp::min, fmt::Debug, future, marker::PhantomData, pin::Pin, sync::Arc, time::Duration};
 
 pub trait Message: DeserializeOwned + Serialize {}
 impl<T: DeserializeOwned + Serialize> Message for T {}
 
-// TODO: do we want to make this configurable?
-const MAX_DESERIALIZATION_QUEUE_SIZE_PER_PEER: usize = 50;
-
 /// Events received by network clients in a validator
 ///
-/// An enumeration of the various types of messages that the network will be sending
-/// to its clients. This differs from [`PeerNotification`] since the contents are deserialized
-/// into the type `TMessage` over which `Event` is generic. Note that we assume here that for every
-/// consumer of this API there's a singleton message type, `TMessage`,  which encapsulates all the
-/// messages and RPCs that are received by that consumer.
-///
-/// [`PeerNotification`]: crate::peer::PeerNotification
+/// We assume here that for every consumer of this API there's a singleton message type, `TMessage`,
+/// which encapsulates all the messages and RPCs that are received by that consumer.
+/// This struct is received by application code after a message of bytes has been deserialized
+/// into the application code's TMessage struct type.
 #[derive(Debug)]
 pub enum Event<TMessage> {
     /// New inbound direct-send message from peer.
@@ -136,76 +132,111 @@ impl NetworkApplicationConfig {
     }
 }
 
+#[derive(Debug, Clone)]
+pub struct ReceivedMessage {
+    pub message: NetworkMessage,
+    pub sender: PeerNetworkId,
+
+    // unix microseconds
+    pub receive_timestamp_micros: u64,
+
+    pub rpc_replier: Option<Arc<oneshot::Sender<Result<Bytes, RpcError>>>>,
+}
+
+impl ReceivedMessage {
+    pub fn new(message: NetworkMessage, sender: PeerNetworkId) -> Self {
+        let rx_at = unix_micros();
+        Self {
+            message,
+            sender,
+            receive_timestamp_micros: rx_at,
+            rpc_replier: None,
+        }
+    }
+
+    pub fn protocol_id(&self) -> Option<ProtocolId> {
+        match &self.message {
+            NetworkMessage::Error(_e) => None,
+            NetworkMessage::RpcRequest(req) => Some(req.protocol_id),
+            NetworkMessage::RpcResponse(_response) => {
+                // design of RpcResponse lacking ProtocolId requires global rpc counter (or at least per-peer) and requires reply matching globally or per-peer
+                None
+            },
+            NetworkMessage::DirectSendMsg(msg) => Some(msg.protocol_id),
+        }
+    }
+
+    pub fn protocol_id_as_str(&self) -> &'static str {
+        match &self.message {
+            NetworkMessage::Error(_) => "error",
+            NetworkMessage::RpcRequest(rr) => rr.protocol_id.as_str(),
+            NetworkMessage::RpcResponse(_) => "rpc response",
+            NetworkMessage::DirectSendMsg(dm) => dm.protocol_id.as_str(),
+        }
+    }
+}
+
+impl PartialEq for ReceivedMessage {
+    fn eq(&self, other: &Self) -> bool {
+        (self.message == other.message)
+            && (self.receive_timestamp_micros == other.receive_timestamp_micros)
+            && (self.sender == other.sender)
+    }
+}
+
 /// A `Stream` of `Event<TMessage>` from the lower network layer to an upper
 /// network application that deserializes inbound network direct-send and rpc
 /// messages into `TMessage`. Inbound messages that fail to deserialize are logged
 /// and dropped.
-///
-/// `NetworkEvents` is really just a thin wrapper around a
-/// `channel::Receiver<PeerNotification>` that deserializes inbound messages.
 #[pin_project]
 pub struct NetworkEvents<TMessage> {
     #[pin]
-    event_stream: aptos_channel::Receiver<PeerId, Event<TMessage>>,
+    event_stream: Pin<Box<dyn Stream<Item = Event<TMessage>> + Send + Sync + 'static>>,
+    done: bool,
     _marker: PhantomData<TMessage>,
 }
 
 /// Trait specifying the signature for `new()` `NetworkEvents`
 pub trait NewNetworkEvents {
     fn new(
-        peer_mgr_notifs_rx: aptos_channel::Receiver<(PeerId, ProtocolId), PeerManagerNotification>,
+        peer_mgr_notifs_rx: aptos_channel::Receiver<(PeerId, ProtocolId), ReceivedMessage>,
         max_parallel_deserialization_tasks: Option<usize>,
+        allow_out_of_order_delivery: bool,
     ) -> Self;
 }
 
-impl<TMessage: Message + Send + 'static> NewNetworkEvents for NetworkEvents<TMessage> {
+impl<TMessage: Message + Send + Sync + 'static> NewNetworkEvents for NetworkEvents<TMessage> {
     fn new(
-        peer_mgr_notifs_rx: aptos_channel::Receiver<(PeerId, ProtocolId), PeerManagerNotification>,
+        peer_mgr_notifs_rx: aptos_channel::Receiver<(PeerId, ProtocolId), ReceivedMessage>,
         max_parallel_deserialization_tasks: Option<usize>,
+        allow_out_of_order_delivery: bool,
     ) -> Self {
-        // Create a channel for deserialized messages
-        let (deserialized_message_sender, deserialized_message_receiver) = aptos_channel::new(
-            QueueStyle::FIFO,
-            MAX_DESERIALIZATION_QUEUE_SIZE_PER_PEER,
-            None,
-        );
-
-        // Deserialize the peer manager notifications in parallel (for each
-        // network application) and send them to the receiver. Note: this
-        // may cause out of order message delivery, but applications
-        // should already be handling this.
-        tokio::spawn(async move {
-            peer_mgr_notifs_rx
-                .for_each_concurrent(
-                    max_parallel_deserialization_tasks,
-                    move |peer_manager_notification| {
-                        // Get the peer ID for the notification
-                        let deserialized_message_sender = deserialized_message_sender.clone();
-                        let peer_id_for_notification = peer_manager_notification.get_peer_id();
-
-                        // Spawn a new blocking task to deserialize the message
-                        tokio::task::spawn_blocking(move || {
-                            if let Some(deserialized_message) =
-                                peer_mgr_notif_to_event(peer_manager_notification)
-                            {
-                                if let Err(error) = deserialized_message_sender
-                                    .push(peer_id_for_notification, deserialized_message)
-                                {
-                                    warn!(
-                                        "Failed to send deserialized message to receiver: {:?}",
-                                        error
-                                    );
-                                }
-                            }
-                        })
-                        .map(|_| ())
-                    },
-                )
-                .await
+        // Determine the number of parallel deserialization tasks to use
+        let max_parallel_deserialization_tasks = max_parallel_deserialization_tasks.unwrap_or(1);
+
+        let data_event_stream = peer_mgr_notifs_rx.map(|notification| {
+            tokio::task::spawn_blocking(move || received_message_to_event(notification))
         });
 
+        let data_event_stream: Pin<
+            Box<dyn Stream<Item = Event<TMessage>> + Send + Sync + 'static>,
+        > = if allow_out_of_order_delivery {
+            Box::pin(
+                data_event_stream
+                    .buffer_unordered(max_parallel_deserialization_tasks)
+                    .filter_map(|res| future::ready(res.expect("JoinError from spawn blocking"))),
+            )
+        } else {
+            Box::pin(
+                data_event_stream
+                    .buffered(max_parallel_deserialization_tasks)
+                    .filter_map(|res| future::ready(res.expect("JoinError from spawn blocking"))),
+            )
+        };
+
         Self {
-            event_stream: deserialized_message_receiver,
+            event_stream: data_event_stream,
+            done: false,
             _marker: PhantomData,
         }
     }
@@ -215,7 +246,15 @@ impl<TMessage> Stream for NetworkEvents<TMessage> {
     type Item = Event<TMessage>;
 
     fn poll_next(self: Pin<&mut Self>, context: &mut Context) -> Poll<Option<Self::Item>> {
-        self.project().event_stream.poll_next(context)
+        let this = self.project();
+        if *this.done {
+            return Poll::Ready(None);
+        }
+        let item = ready!(this.event_stream.poll_next(context));
+        if item.is_none() {
+            *this.done = true;
+        }
+        Poll::Ready(item)
     }
 
     fn size_hint(&self) -> (usize, Option<usize>) {
@@ -223,31 +262,52 @@ impl<TMessage> Stream for NetworkEvents<TMessage> {
     }
 }
 
+fn unix_micros() -> u64 {
+    std::time::SystemTime::now()
+        .duration_since(std::time::UNIX_EPOCH)
+        .unwrap()
+        .as_micros() as u64
+}
+
 /// Deserialize inbound direct send and rpc messages into the application `TMessage`
 /// type, logging and dropping messages that fail to deserialize.
-fn peer_mgr_notif_to_event<TMessage: Message>(
-    notification: PeerManagerNotification,
+fn received_message_to_event<TMessage: Message>(
+    message: ReceivedMessage,
 ) -> Option<Event<TMessage>> {
-    match notification {
-        PeerManagerNotification::RecvRpc(peer_id, rpc_req) => {
+    let peer_id = message.sender.peer_id();
+    let ReceivedMessage {
+        message,
+        sender: _sender,
+        receive_timestamp_micros: rx_at,
+        rpc_replier,
+    } = message;
+    let dequeue_at = unix_micros();
+    let dt_micros = dequeue_at - rx_at;
+    let dt_seconds = (dt_micros as f64) / 1000000.0;
+    match message {
+        NetworkMessage::RpcRequest(rpc_req) => {
+            crate::counters::inbound_queue_delay_observe(rpc_req.protocol_id, dt_seconds);
+            let rpc_replier = Arc::into_inner(rpc_replier.unwrap()).unwrap();
             request_to_network_event(peer_id, &rpc_req)
-                .map(|msg| Event::RpcRequest(peer_id, msg, rpc_req.protocol_id, rpc_req.res_tx))
+                .map(|msg| Event::RpcRequest(peer_id, msg, rpc_req.protocol_id, rpc_replier))
         },
-        PeerManagerNotification::RecvMessage(peer_id, request) => {
+        NetworkMessage::DirectSendMsg(request) => {
+            crate::counters::inbound_queue_delay_observe(request.protocol_id, dt_seconds);
             request_to_network_event(peer_id, &request).map(|msg| Event::Message(peer_id, msg))
         },
+        _ => None,
     }
 }
 
 /// Converts a `SerializedRequest` into a network `Event` for sending to other nodes
-fn request_to_network_event<TMessage: Message, Request: SerializedRequest>(
+fn request_to_network_event<TMessage: Message, Request: IncomingRequest>(
     peer_id: PeerId,
     request: &Request,
 ) -> Option<TMessage> {
     match request.to_message() {
         Ok(msg) => Some(msg),
         Err(err) => {
-            let data = &request.data();
+            let data = request.data();
             warn!(
                 SecurityEvent::InvalidNetworkEvent,
                 error = ?err,
@@ -262,7 +322,7 @@ fn request_to_network_event<TMessage: Message, Request: SerializedRequest>(
 
 impl<TMessage> FusedStream for NetworkEvents<TMessage> {
     fn is_terminated(&self) -> bool {
-        self.event_stream.is_terminated()
+        self.done
     }
 }
 
@@ -333,7 +393,18 @@ impl<TMessage: Message + Send + 'static> NetworkSender<TMessage> {
         message: TMessage,
     ) -> Result<(), NetworkError> {
         let mdata = protocol.to_bytes(&message)?.into();
-        self.peer_mgr_reqs_tx.send_to(recipient, protocol, mdata)?;
+        self.send_to_raw(recipient, protocol, mdata)
+    }
+
+    /// Sends a raw message to a single recipient
+    pub fn send_to_raw(
+        &self,
+        recipient: PeerId,
+        protocol: ProtocolId,
+        message: Bytes,
+    ) -> Result<(), NetworkError> {
+        self.peer_mgr_reqs_tx
+            .send_to(recipient, protocol, message)?;
         Ok(())
     }
 
@@ -367,10 +438,25 @@ impl<TMessage: Message + Send + 'static> NetworkSender<TMessage> {
             .await??
             .into();
 
+        // Send the request and wait for the response
+        self.send_rpc_raw(recipient, protocol, req_data, timeout)
+            .await
+    }
+
+    /// Send a protobuf rpc request to a single recipient while handling
+    /// serialization and deserialization of the request and response respectively.
+    /// Assumes that the request and response both have the same message type.
+    pub async fn send_rpc_raw(
+        &self,
+        recipient: PeerId,
+        protocol: ProtocolId,
+        req_msg: Bytes,
+        timeout: Duration,
+    ) -> Result<TMessage, RpcError> {
         // Send the request and wait for the response
         let res_data = self
             .peer_mgr_reqs_tx
-            .send_rpc(recipient, protocol, req_data, timeout)
+            .send_rpc(recipient, protocol, req_msg, timeout)
             .await?;
 
         // Deserialize the response using a blocking task
diff --git a/network/framework/src/protocols/rpc/mod.rs b/network/framework/src/protocols/rpc/mod.rs
index 2769993da793c..b948226c4cd70 100644
--- a/network/framework/src/protocols/rpc/mod.rs
+++ b/network/framework/src/protocols/rpc/mod.rs
@@ -51,9 +51,8 @@ use crate::{
         RECEIVED_LABEL, REQUEST_LABEL, RESPONSE_LABEL, SENT_LABEL,
     },
     logging::NetworkSchema,
-    peer::PeerNotification,
     protocols::{
-        network::SerializedRequest,
+        network::{ReceivedMessage, SerializedRequest},
         wire::messaging::v1::{NetworkMessage, Priority, RequestId, RpcRequest, RpcResponse},
     },
     ProtocolId,
@@ -70,12 +69,11 @@ use bytes::Bytes;
 use error::RpcError;
 use futures::{
     channel::oneshot,
-    future::{BoxFuture, FusedFuture, Future, FutureExt},
-    sink::SinkExt,
+    future::{BoxFuture, FusedFuture, FutureExt},
     stream::{FuturesUnordered, StreamExt},
 };
 use serde::Serialize;
-use std::{cmp::PartialEq, collections::HashMap, fmt::Debug, time::Duration};
+use std::{cmp::PartialEq, collections::HashMap, fmt::Debug, sync::Arc, time::Duration};
 
 pub mod error;
 
@@ -207,8 +205,8 @@ impl InboundRpcs {
     /// Handle a new inbound `RpcRequest` message off the wire.
     pub fn handle_inbound_request(
         &mut self,
-        peer_notifs_tx: &mut aptos_channel::Sender<ProtocolId, PeerNotification>,
-        request: RpcRequest,
+        peer_notifs_tx: &aptos_channel::Sender<(PeerId, ProtocolId), ReceivedMessage>,
+        mut request: ReceivedMessage,
     ) -> Result<(), RpcError> {
         let network_context = &self.network_context;
 
@@ -225,9 +223,13 @@ impl InboundRpcs {
             return Err(RpcError::TooManyPending(self.max_concurrent_inbound_rpcs));
         }
 
-        let protocol_id = request.protocol_id;
-        let request_id = request.request_id;
-        let priority = request.priority;
+        let peer_id = request.sender.peer_id();
+        let NetworkMessage::RpcRequest(rpc_request) = &request.message else {
+            return Err(RpcError::InvalidRpcResponse);
+        };
+        let protocol_id = rpc_request.protocol_id;
+        let request_id = rpc_request.request_id;
+        let priority = rpc_request.priority;
 
         trace!(
             NetworkSchema::new(network_context).remote_peer(&self.remote_peer_id),
@@ -237,19 +239,15 @@ impl InboundRpcs {
             request_id,
             protocol_id,
         );
-        self.update_inbound_rpc_request_metrics(protocol_id, request.raw_request.len() as u64);
+        self.update_inbound_rpc_request_metrics(protocol_id, rpc_request.raw_request.len() as u64);
 
         let timer =
             counters::inbound_rpc_handler_latency(network_context, protocol_id).start_timer();
 
         // Forward request to PeerManager for handling.
         let (response_tx, response_rx) = oneshot::channel();
-        let notif = PeerNotification::RecvRpc(InboundRpcRequest {
-            protocol_id,
-            data: Bytes::from(request.raw_request),
-            res_tx: response_tx,
-        });
-        if let Err(err) = peer_notifs_tx.push(protocol_id, notif) {
+        request.rpc_replier = Some(Arc::new(response_tx));
+        if let Err(err) = peer_notifs_tx.push((peer_id, protocol_id), request) {
             counters::rpc_messages(network_context, REQUEST_LABEL, INBOUND_LABEL, FAILED_LABEL)
                 .inc();
             return Err(err.into());
@@ -317,16 +315,16 @@ impl InboundRpcs {
     /// `futures::select!`.
     pub fn next_completed_response(
         &mut self,
-    ) -> impl Future<Output = Result<(RpcResponse, ProtocolId), RpcError>> + FusedFuture + '_ {
+    ) -> impl FusedFuture<Output = Result<(RpcResponse, ProtocolId), RpcError>> + '_ {
         self.inbound_rpc_tasks.select_next_some()
     }
 
     /// Handle a completed response from the application handler. If successful,
     /// we update the appropriate counters and enqueue the response message onto
     /// the outbound write queue.
-    pub async fn send_outbound_response(
+    pub fn send_outbound_response(
         &mut self,
-        write_reqs_tx: &mut aptos_channels::Sender<NetworkMessage>,
+        write_reqs_tx: &mut aptos_channel::Sender<(), NetworkMessage>,
         maybe_response: Result<(RpcResponse, ProtocolId), RpcError>,
     ) -> Result<(), RpcError> {
         let network_context = &self.network_context;
@@ -354,7 +352,7 @@ impl InboundRpcs {
             response.request_id,
         );
         let message = NetworkMessage::RpcResponse(response);
-        write_reqs_tx.send(message).await?;
+        write_reqs_tx.push((), message)?;
 
         // Update the outbound RPC response metrics
         self.update_outbound_rpc_response_metrics(protocol_id, res_len);
@@ -433,10 +431,10 @@ impl OutboundRpcs {
     }
 
     /// Handle a new outbound rpc request from the application layer.
-    pub async fn handle_outbound_request(
+    pub fn handle_outbound_request(
         &mut self,
         request: OutboundRpcRequest,
-        write_reqs_tx: &mut aptos_channels::Sender<NetworkMessage>,
+        write_reqs_tx: &mut aptos_channel::Sender<(), NetworkMessage>,
     ) -> Result<(), RpcError> {
         let network_context = &self.network_context;
         let peer_id = &self.remote_peer_id;
@@ -499,7 +497,7 @@ impl OutboundRpcs {
             priority: Priority::default(),
             raw_request: Vec::from(request_data.as_ref()),
         });
-        write_reqs_tx.send(message).await?;
+        write_reqs_tx.push((), message)?;
 
         // Update the outbound RPC request metrics
         self.update_outbound_rpc_request_metrics(protocol_id, req_len);
@@ -598,7 +596,7 @@ impl OutboundRpcs {
     /// `futures::select!`.
     pub fn next_completed_request(
         &mut self,
-    ) -> impl Future<Output = (RequestId, Result<(f64, u64), RpcError>)> + FusedFuture + '_ {
+    ) -> impl FusedFuture<Output = (RequestId, Result<(f64, u64), RpcError>)> + '_ {
         self.outbound_rpc_tasks.select_next_some()
     }
 
diff --git a/network/framework/src/protocols/wire/handshake/v1/mod.rs b/network/framework/src/protocols/wire/handshake/v1/mod.rs
index 05ac46a44fdc2..1947c84da9149 100644
--- a/network/framework/src/protocols/wire/handshake/v1/mod.rs
+++ b/network/framework/src/protocols/wire/handshake/v1/mod.rs
@@ -72,6 +72,7 @@ pub enum ProtocolId {
     JWKConsensusRpcBcs = 25,
     JWKConsensusRpcJson = 26,
     ConsensusObserver = 27,
+    ConsensusObserverRpc = 28,
 }
 
 /// The encoding types for Protocols
@@ -113,6 +114,7 @@ impl ProtocolId {
             JWKConsensusRpcBcs => "JWKConsensusRpcBcs",
             JWKConsensusRpcJson => "JWKConsensusRpcJson",
             ConsensusObserver => "ConsensusObserver",
+            ConsensusObserverRpc => "ConsensusObserverRpc",
         }
     }
 
@@ -147,6 +149,7 @@ impl ProtocolId {
             ProtocolId::JWKConsensusRpcBcs,
             ProtocolId::JWKConsensusRpcJson,
             ProtocolId::ConsensusObserver,
+            ProtocolId::ConsensusObserverRpc,
         ]
     }
 
@@ -157,6 +160,7 @@ impl ProtocolId {
             ProtocolId::ConsensusDirectSendCompressed | ProtocolId::ConsensusRpcCompressed => {
                 Encoding::CompressedBcs(RECURSION_LIMIT)
             },
+            ProtocolId::ConsensusObserver => Encoding::CompressedBcs(RECURSION_LIMIT),
             ProtocolId::DKGDirectSendCompressed | ProtocolId::DKGRpcCompressed => {
                 Encoding::CompressedBcs(RECURSION_LIMIT)
             },
@@ -174,6 +178,7 @@ impl ProtocolId {
             ProtocolId::ConsensusDirectSendCompressed | ProtocolId::ConsensusRpcCompressed => {
                 CompressionClient::Consensus
             },
+            ProtocolId::ConsensusObserver => CompressionClient::ConsensusObserver,
             ProtocolId::MempoolDirectSend => CompressionClient::Mempool,
             ProtocolId::DKGDirectSendCompressed | ProtocolId::DKGRpcCompressed => {
                 CompressionClient::DKG
diff --git a/network/framework/src/protocols/wire/messaging/v1/mod.rs b/network/framework/src/protocols/wire/messaging/v1/mod.rs
index b01cc28eee613..b02b792524f9e 100644
--- a/network/framework/src/protocols/wire/messaging/v1/mod.rs
+++ b/network/framework/src/protocols/wire/messaging/v1/mod.rs
@@ -20,7 +20,7 @@ use futures::{
 use pin_project::pin_project;
 #[cfg(any(test, feature = "fuzzing"))]
 use proptest_derive::Arbitrary;
-use serde::{Deserialize, Serialize};
+use serde::{de::DeserializeOwned, Deserialize, Serialize};
 use std::{
     io,
     pin::Pin,
@@ -103,6 +103,17 @@ pub type RequestId = u32;
 /// Create alias Priority for u8.
 pub type Priority = u8;
 
+pub trait IncomingRequest {
+    fn protocol_id(&self) -> crate::ProtocolId;
+    fn data(&self) -> &Vec<u8>;
+
+    /// Converts the `SerializedMessage` into its deserialized version of `TMessage` based on the
+    /// `ProtocolId`.  See: [`crate::ProtocolId::from_bytes`]
+    fn to_message<TMessage: DeserializeOwned>(&self) -> anyhow::Result<TMessage> {
+        self.protocol_id().from_bytes(self.data())
+    }
+}
+
 #[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)]
 #[cfg_attr(any(test, feature = "fuzzing"), derive(Arbitrary))]
 pub struct RpcRequest {
@@ -117,6 +128,16 @@ pub struct RpcRequest {
     pub raw_request: Vec<u8>,
 }
 
+impl IncomingRequest for RpcRequest {
+    fn protocol_id(&self) -> crate::ProtocolId {
+        self.protocol_id
+    }
+
+    fn data(&self) -> &Vec<u8> {
+        &self.raw_request
+    }
+}
+
 #[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)]
 #[cfg_attr(any(test, feature = "fuzzing"), derive(Arbitrary))]
 pub struct RpcResponse {
@@ -142,6 +163,16 @@ pub struct DirectSendMsg {
     pub raw_msg: Vec<u8>,
 }
 
+impl IncomingRequest for DirectSendMsg {
+    fn protocol_id(&self) -> crate::ProtocolId {
+        self.protocol_id
+    }
+
+    fn data(&self) -> &Vec<u8> {
+        &self.raw_msg
+    }
+}
+
 /// Errors from reading and deserializing network messages off the wire.
 #[derive(Debug, Error)]
 pub enum ReadError {
diff --git a/network/framework/src/testutils/test_node.rs b/network/framework/src/testutils/test_node.rs
index f7775e4f97e7f..03b69d34ccbd1 100644
--- a/network/framework/src/testutils/test_node.rs
+++ b/network/framework/src/testutils/test_node.rs
@@ -4,10 +4,11 @@
 
 use crate::{
     application::{metadata::ConnectionState, storage::PeersAndMetadata},
-    peer_manager::{PeerManagerNotification, PeerManagerRequest},
+    peer_manager::PeerManagerRequest,
     protocols::{
-        direct_send::Message,
-        rpc::{InboundRpcRequest, OutboundRpcRequest},
+        network::ReceivedMessage,
+        rpc::OutboundRpcRequest,
+        wire::messaging::v1::{DirectSendMsg, NetworkMessage, RpcRequest},
     },
     transport::ConnectionMetadata,
     ProtocolId,
@@ -24,7 +25,7 @@ use std::{collections::HashMap, sync::Arc, time::Duration};
 
 /// A sender to a node to mock an inbound network message from [`PeerManager`]
 pub type InboundMessageSender =
-    aptos_channels::aptos_channel::Sender<(PeerId, ProtocolId), PeerManagerNotification>;
+    aptos_channels::aptos_channel::Sender<(PeerId, ProtocolId), ReceivedMessage>;
 
 /// A sender to a node to mock an inbound connection from [`PeerManager`]
 pub type ConnectionUpdateSender = crate::peer_manager::conn_notifs_channel::Sender;
@@ -306,15 +307,33 @@ pub trait TestNode: ApplicationNode + Sync {
     async fn send_next_network_msg(&mut self, network_id: NetworkId) {
         let request = self.get_next_network_msg(network_id).await;
 
-        let (remote_peer_id, protocol_id, data, maybe_rpc_info) = match request {
-            PeerManagerRequest::SendRpc(peer_id, msg) => (
-                peer_id,
-                msg.protocol_id,
-                msg.data,
-                Some((msg.timeout, msg.res_tx)),
-            ),
+        let (remote_peer_id, protocol_id, rmsg) = match request {
+            PeerManagerRequest::SendRpc(peer_id, msg) => {
+                let rmsg = ReceivedMessage {
+                    message: NetworkMessage::RpcRequest(RpcRequest {
+                        protocol_id: msg.protocol_id,
+                        request_id: 0,
+                        priority: 0,
+                        raw_request: msg.data.into(),
+                    }),
+                    sender: self.peer_network_id(network_id),
+                    receive_timestamp_micros: 0,
+                    rpc_replier: Some(Arc::new(msg.res_tx)),
+                };
+                (peer_id, msg.protocol_id, rmsg)
+            },
             PeerManagerRequest::SendDirectSend(peer_id, msg) => {
-                (peer_id, msg.protocol_id, msg.mdata, None)
+                let rmsg = ReceivedMessage {
+                    message: NetworkMessage::DirectSendMsg(DirectSendMsg {
+                        protocol_id: msg.protocol_id,
+                        priority: 0,
+                        raw_msg: msg.mdata.into(),
+                    }),
+                    sender: self.peer_network_id(network_id),
+                    receive_timestamp_micros: 0,
+                    rpc_replier: None,
+                };
+                (peer_id, msg.protocol_id, rmsg)
             },
         };
 
@@ -323,22 +342,9 @@ pub trait TestNode: ApplicationNode + Sync {
         let receiver_handle = self.get_inbound_handle_for_peer(receiver_peer_network_id);
         let sender_peer_id = sender_peer_network_id.peer_id();
 
-        // TODO: Add timeout functionality
-        let peer_manager_notif = if let Some((_timeout, res_tx)) = maybe_rpc_info {
-            PeerManagerNotification::RecvRpc(sender_peer_id, InboundRpcRequest {
-                protocol_id,
-                data,
-                res_tx,
-            })
-        } else {
-            PeerManagerNotification::RecvMessage(sender_peer_id, Message {
-                protocol_id,
-                mdata: data,
-            })
-        };
         receiver_handle
             .inbound_message_sender
-            .push((sender_peer_id, protocol_id), peer_manager_notif)
+            .push((sender_peer_id, protocol_id), rmsg)
             .unwrap();
     }
 }
diff --git a/peer-monitoring-service/client/src/peer_states/latency_info.rs b/peer-monitoring-service/client/src/peer_states/latency_info.rs
index 9f43abe5a09ab..fac6a4c26c230 100644
--- a/peer-monitoring-service/client/src/peer_states/latency_info.rs
+++ b/peer-monitoring-service/client/src/peer_states/latency_info.rs
@@ -109,6 +109,14 @@ impl LatencyInfoState {
         }
     }
 
+    /// Returns the latest latency ping in seconds. If no latency
+    /// pings have been recorded, None is returned.
+    pub fn get_latest_latency_ping_secs(&self) -> Option<f64> {
+        self.recorded_latency_ping_durations_secs
+            .last_key_value()
+            .map(|(_, value)| *value)
+    }
+
     /// Returns a copy of the recorded latency pings for test purposes
     #[cfg(test)]
     pub fn get_recorded_latency_pings(&self) -> BTreeMap<u64, f64> {
diff --git a/peer-monitoring-service/client/src/peer_states/peer_state.rs b/peer-monitoring-service/client/src/peer_states/peer_state.rs
index 59bf8afe0f409..8c90752407c96 100644
--- a/peer-monitoring-service/client/src/peer_states/peer_state.rs
+++ b/peer-monitoring-service/client/src/peer_states/peer_state.rs
@@ -193,6 +193,9 @@ impl PeerState {
         let average_latency_ping_secs = latency_info_state.get_average_latency_ping_secs();
         peer_monitoring_metadata.average_ping_latency_secs = average_latency_ping_secs;
 
+        let latest_ping_latency_secs = latency_info_state.get_latest_latency_ping_secs();
+        peer_monitoring_metadata.latest_ping_latency_secs = latest_ping_latency_secs;
+
         // Get and store the detailed monitoring metadata
         let internal_client_state = self.get_internal_client_state()?;
         peer_monitoring_metadata.internal_client_state = internal_client_state;
diff --git a/peer-monitoring-service/client/src/tests/utils.rs b/peer-monitoring-service/client/src/tests/utils.rs
index 2da9b8c0bbb0a..13a1358d0bca1 100644
--- a/peer-monitoring-service/client/src/tests/utils.rs
+++ b/peer-monitoring-service/client/src/tests/utils.rs
@@ -1014,7 +1014,7 @@ pub async fn wait_for_monitoring_network_update(
             let peer_monitoring_metadata = peer_metadata.get_peer_monitoring_metadata();
 
             // Check if the distance from validators matches the expected value
-            if let Some(latest_network_info_response) =
+            if let Some(ref latest_network_info_response) =
                 peer_monitoring_metadata.latest_network_info_response
             {
                 if latest_network_info_response.distance_from_validators
diff --git a/peer-monitoring-service/server/src/lib.rs b/peer-monitoring-service/server/src/lib.rs
index 96ddfc8b3c065..262a50f087b8b 100644
--- a/peer-monitoring-service/server/src/lib.rs
+++ b/peer-monitoring-service/server/src/lib.rs
@@ -321,7 +321,7 @@ fn get_distance_from_validators(
     // Otherwise, go through our peers, find the min, and return a distance relative to the min
     let mut min_peer_distance_from_validators = MAX_DISTANCE_FROM_VALIDATORS;
     for peer_metadata in connected_peers_and_metadata.values() {
-        if let Some(latest_network_info_response) = peer_metadata
+        if let Some(ref latest_network_info_response) = peer_metadata
             .get_peer_monitoring_metadata()
             .latest_network_info_response
         {
diff --git a/peer-monitoring-service/server/src/tests.rs b/peer-monitoring-service/server/src/tests.rs
index 596db40fa6871..86b426bc64bbb 100644
--- a/peer-monitoring-service/server/src/tests.rs
+++ b/peer-monitoring-service/server/src/tests.rs
@@ -20,11 +20,12 @@ use aptos_network::{
     application::{
         interface::NetworkServiceEvents, metadata::ConnectionState, storage::PeersAndMetadata,
     },
-    peer_manager::PeerManagerNotification,
     protocols::{
-        network::{NetworkEvents, NewNetworkEvents},
-        rpc::InboundRpcRequest,
-        wire::handshake::v1::{MessagingProtocolVersion, ProtocolId, ProtocolIdSet},
+        network::{NetworkEvents, NewNetworkEvents, ReceivedMessage},
+        wire::{
+            handshake::v1::{MessagingProtocolVersion, ProtocolId, ProtocolIdSet},
+            messaging::v1::{NetworkMessage, RpcRequest},
+        },
     },
     transport::{ConnectionId, ConnectionMetadata},
 };
@@ -134,7 +135,7 @@ async fn test_get_network_information_fullnode() {
         distance_from_validators: peer_distance_1,
     };
     let peer_monitoring_metadata_1 =
-        PeerMonitoringMetadata::new(None, Some(latest_network_info_response), None, None);
+        PeerMonitoringMetadata::new(None, None, Some(latest_network_info_response), None, None);
     peers_and_metadata
         .update_peer_monitoring_metadata(peer_network_id_1, peer_monitoring_metadata_1.clone())
         .unwrap();
@@ -154,7 +155,7 @@ async fn test_get_network_information_fullnode() {
         distance_from_validators: peer_distance_1,
     };
     let peer_monitoring_metadata_1 =
-        PeerMonitoringMetadata::new(None, Some(latest_network_info_response), None, None);
+        PeerMonitoringMetadata::new(None, None, Some(latest_network_info_response), None, None);
     peers_and_metadata
         .update_peer_monitoring_metadata(peer_network_id_1, peer_monitoring_metadata_1.clone())
         .unwrap();
@@ -182,7 +183,7 @@ async fn test_get_network_information_fullnode() {
         distance_from_validators: peer_distance_2,
     };
     let peer_monitoring_metadata_2 =
-        PeerMonitoringMetadata::new(None, Some(latest_network_info_response), None, None);
+        PeerMonitoringMetadata::new(None, None, Some(latest_network_info_response), None, None);
     peers_and_metadata
         .insert_connection_metadata(peer_network_id_2, connection_metadata_2.clone())
         .unwrap();
@@ -251,7 +252,7 @@ async fn test_get_network_information_validator() {
         distance_from_validators: peer_distance_1,
     };
     let peer_monitoring_metadata_1 =
-        PeerMonitoringMetadata::new(None, Some(latest_network_info_response), None, None);
+        PeerMonitoringMetadata::new(None, None, Some(latest_network_info_response), None, None);
     peers_and_metadata
         .update_peer_monitoring_metadata(peer_network_id_1, peer_monitoring_metadata_1.clone())
         .unwrap();
@@ -270,7 +271,7 @@ async fn test_get_network_information_validator() {
         distance_from_validators: peer_distance_2,
     };
     let peer_monitoring_metadata_2 =
-        PeerMonitoringMetadata::new(None, Some(latest_network_info_response), None, None);
+        PeerMonitoringMetadata::new(None, None, Some(latest_network_info_response), None, None);
     peers_and_metadata
         .insert_connection_metadata(peer_network_id_2, connection_metadata_2.clone())
         .unwrap();
@@ -468,7 +469,7 @@ async fn verify_node_information(
 /// mock client requests to a peer monitoring service server.
 struct MockClient {
     peer_manager_notifiers:
-        HashMap<NetworkId, aptos_channel::Sender<(PeerId, ProtocolId), PeerManagerNotification>>,
+        HashMap<NetworkId, aptos_channel::Sender<(PeerId, ProtocolId), ReceivedMessage>>,
 }
 
 impl MockClient {
@@ -506,7 +507,7 @@ impl MockClient {
             .counters(&metrics::PENDING_PEER_MONITORING_SERVER_NETWORK_EVENTS);
             let (peer_manager_notifier, peer_manager_notification_receiver) = queue_cfg.build();
 
-            let network_events = NetworkEvents::new(peer_manager_notification_receiver, None);
+            let network_events = NetworkEvents::new(peer_manager_notification_receiver, None, true);
             network_and_events.insert(network_id, network_events);
             peer_manager_notifiers.insert(network_id, peer_manager_notifier);
         }
@@ -554,12 +555,17 @@ impl MockClient {
             .to_bytes(&PeerMonitoringServiceMessage::Request(request))
             .unwrap();
         let (request_sender, request_receiver) = oneshot::channel();
-        let inbound_rpc = InboundRpcRequest {
-            protocol_id,
-            data: request_data.into(),
-            res_tx: request_sender,
+        let request_notification = ReceivedMessage {
+            message: NetworkMessage::RpcRequest(RpcRequest {
+                protocol_id,
+                request_id: 42,
+                priority: 0,
+                raw_request: request_data.clone(),
+            }),
+            sender: PeerNetworkId::new(network_id, peer_id),
+            receive_timestamp_micros: 0,
+            rpc_replier: Some(Arc::new(request_sender)),
         };
-        let request_notification = PeerManagerNotification::RecvRpc(peer_id, inbound_rpc);
 
         // Send the request to the peer monitoring service
         self.peer_manager_notifiers
@@ -675,7 +681,9 @@ mod database_mock {
 
             fn get_latest_ledger_info(&self) -> Result<LedgerInfoWithSignatures>;
 
-            fn get_latest_version(&self) -> Result<Version>;
+            fn get_synced_version(&self) -> Result<Version>;
+
+            fn get_latest_ledger_info_version(&self) -> Result<Version>;
 
             fn get_latest_commit_metadata(&self) -> Result<(Version, u64)>;
 
@@ -727,7 +735,7 @@ mod database_mock {
                 ledger_version: Version,
             ) -> Result<TransactionAccumulatorSummary>;
 
-            fn get_state_leaf_count(&self, version: Version) -> Result<usize>;
+            fn get_state_item_count(&self, version: Version) -> Result<usize>;
 
             fn get_state_value_chunk_with_proof(
                 &self,
diff --git a/peer-monitoring-service/types/src/lib.rs b/peer-monitoring-service/types/src/lib.rs
index ef93fdeaecc8a..cde7786e36dd9 100644
--- a/peer-monitoring-service/types/src/lib.rs
+++ b/peer-monitoring-service/types/src/lib.rs
@@ -44,6 +44,7 @@ pub enum PeerMonitoringServiceMessage {
 #[derive(Clone, Default, Deserialize, PartialEq, Serialize)]
 pub struct PeerMonitoringMetadata {
     pub average_ping_latency_secs: Option<f64>, // The average latency ping for the peer
+    pub latest_ping_latency_secs: Option<f64>,  // The latest latency ping for the peer
     pub latest_network_info_response: Option<NetworkInformationResponse>, // The latest network info response
     pub latest_node_info_response: Option<NodeInformationResponse>, // The latest node info response
     pub internal_client_state: Option<String>, // A detailed client state string for debugging and logging
@@ -56,12 +57,14 @@ impl Eq for PeerMonitoringMetadata {}
 impl PeerMonitoringMetadata {
     pub fn new(
         average_ping_latency_secs: Option<f64>,
+        latest_ping_latency_secs: Option<f64>,
         latest_network_info_response: Option<NetworkInformationResponse>,
         latest_node_info_response: Option<NodeInformationResponse>,
         internal_client_state: Option<String>,
     ) -> Self {
         PeerMonitoringMetadata {
             average_ping_latency_secs,
+            latest_ping_latency_secs,
             latest_network_info_response,
             latest_node_info_response,
             internal_client_state,
@@ -74,8 +77,9 @@ impl Display for PeerMonitoringMetadata {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(
             f,
-            "{{ average_ping_latency_secs: {}, latest_network_info_response: {}, latest_node_info_response: {} }}",
+            "{{ average_ping_latency_secs: {}, latest_ping_latency_secs: {}, latest_network_info_response: {}, latest_node_info_response: {} }}",
             display_format_option(&self.average_ping_latency_secs),
+            display_format_option(&self.latest_ping_latency_secs),
             display_format_option(&self.latest_network_info_response),
             display_format_option(&self.latest_node_info_response),
         )
@@ -88,8 +92,9 @@ impl Debug for PeerMonitoringMetadata {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(
             f,
-            "{{ average_ping_latency_secs: {}, latest_network_info_response: {}, latest_node_info_response: {} }}",
+            "{{ average_ping_latency_secs: {}, latest_ping_latency_secs: {}, latest_network_info_response: {}, latest_node_info_response: {} }}",
             debug_format_option(&self.average_ping_latency_secs),
+            debug_format_option(&self.latest_ping_latency_secs),
             debug_format_option(&self.latest_network_info_response),
             debug_format_option(&self.latest_node_info_response),
         )
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 373d1088aa69c..59b3bdc264382 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1,9 +1,5 @@
 lockfileVersion: '6.0'
 
-settings:
-  autoInstallPeers: true
-  excludeLinksFromLockfile: false
-
 dependencies:
   '@actions/core':
     specifier: ^1.10.1
@@ -45,7 +41,7 @@ packages:
     resolution: {integrity: sha512-q+epW0trjVUUHboliPb4UF9g2msf+w61b32tAkFEwL/IwP0DQWgbCMM0Hbe3e3WXSKz5VcUXbzJQgy8Hkra/Lg==}
     dependencies:
       tunnel: 0.0.6
-      undici: 5.28.2
+      undici: 5.28.4
     dev: false
 
   /@ampproject/remapping@2.2.1:
@@ -2543,8 +2539,8 @@ packages:
     hasBin: true
     dev: true
 
-  /undici@5.28.2:
-    resolution: {integrity: sha512-wh1pHJHnUeQV5Xa8/kyQhO7WFa8M34l026L5P/+2TYiakvGy5Rdc8jWZVyG7ieht/0WgJLEd3kcU5gKx+6GC8w==}
+  /undici@5.28.4:
+    resolution: {integrity: sha512-72RFADWFqKmUb2hmmvNODKL3p9hcB6Gt2DOQMis1SEBaV6a4MH8soBvzg+95CYhCKPFedut2JY9bMfrDl9D23g==}
     engines: {node: '>=14.0'}
     dependencies:
       '@fastify/busboy': 2.1.0
@@ -2689,3 +2685,7 @@ packages:
       which: 2.0.2
       yaml: 2.1.3
     dev: true
+
+settings:
+  autoInstallPeers: true
+  excludeLinksFromLockfile: false
diff --git a/protos/proto/aptos/bigquery_schema/v1/transaction.proto b/protos/proto/aptos/bigquery_schema/v1/transaction.proto
deleted file mode 100644
index 20ec9be5f076c..0000000000000
--- a/protos/proto/aptos/bigquery_schema/v1/transaction.proto
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-// Proto2 is required.
-// Current BigQuery runs over proto2, thus optional(nullable)
-// field with default value will be ignored. For example,
-// `int64 value = null` will be translated to 0 under column `value`.
-// To avoid any analytics hassle, proto2 is required here.
-syntax = "proto2";
-
-package aptos.bigquery_schema.transaction.v1;
-
-// Transaction is a simplified representation for the transaction
-// happened on the chain. Mainly built for streaming into BigQuery.
-// It matches with the structure defined for the transaction in Indexer.
-message Transaction {
-    required int64 version = 1;
-    required int64 block_height = 2;
-    required string hash = 3;
-    required string type = 4;
-    optional string payload = 5;
-    required string state_change_hash = 6;
-    required string event_root_hash = 7;
-    optional string state_checkpoint_hash = 8;
-    required uint64 gas_used = 9;
-    required bool success = 10;
-    required string vm_status = 11;
-    required string accumulator_root_hash = 12;
-    required int64 num_events = 13;
-    required int64 num_write_set_changes = 14;
-    required int64 epoch = 15;
-    required int64 inserted_at = 16;
-}
diff --git a/protos/proto/aptos/indexer/v1/raw_data.proto b/protos/proto/aptos/indexer/v1/raw_data.proto
index d5c7be9011964..8f7b9ba5b6c44 100644
--- a/protos/proto/aptos/indexer/v1/raw_data.proto
+++ b/protos/proto/aptos/indexer/v1/raw_data.proto
@@ -10,7 +10,7 @@ import "aptos/transaction/v1/transaction.proto";
 // This is for storage only.
 message TransactionsInStorage {
   // Required; transactions data.
-  repeated aptos.transaction.v1.Transaction transactions  = 1;
+  repeated aptos.transaction.v1.Transaction transactions = 1;
   // Required; chain id.
   optional uint64 starting_version = 2;
 }
@@ -30,14 +30,14 @@ message GetTransactionsRequest {
 
 // TransactionsResponse is a batch of transactions.
 message TransactionsResponse {
-    // Required; transactions data.
-    repeated aptos.transaction.v1.Transaction transactions  = 1;
-    
-    // Required; chain id.
-    optional uint64 chain_id = 2 [jstype = JS_STRING];
+  // Required; transactions data.
+  repeated aptos.transaction.v1.Transaction transactions = 1;
+
+  // Required; chain id.
+  optional uint64 chain_id = 2 [jstype = JS_STRING];
 }
 
 service RawData {
-    // Get transactions batch without any filtering from starting version and end if transaction count is present.
-    rpc GetTransactions(GetTransactionsRequest) returns (stream TransactionsResponse);
-}
\ No newline at end of file
+  // Get transactions batch without any filtering from starting version and end if transaction count is present.
+  rpc GetTransactions(GetTransactionsRequest) returns (stream TransactionsResponse);
+}
diff --git a/protos/proto/aptos/internal/fullnode/v1/fullnode_data.proto b/protos/proto/aptos/internal/fullnode/v1/fullnode_data.proto
index 4be429c5fc600..b4e656550e16f 100644
--- a/protos/proto/aptos/internal/fullnode/v1/fullnode_data.proto
+++ b/protos/proto/aptos/internal/fullnode/v1/fullnode_data.proto
@@ -15,7 +15,7 @@ import "aptos/transaction/v1/transaction.proto";
 //    StreamStatus: BATCH_END with version x + (k + 1) * n - 1
 
 message TransactionsOutput {
-  repeated aptos.transaction.v1.Transaction transactions  = 1;
+  repeated aptos.transaction.v1.Transaction transactions = 1;
 }
 
 message StreamStatus {
@@ -53,5 +53,5 @@ message TransactionsFromNodeResponse {
 }
 
 service FullnodeData {
-    rpc GetTransactionsFromNode(GetTransactionsFromNodeRequest) returns (stream TransactionsFromNodeResponse);
-}
\ No newline at end of file
+  rpc GetTransactionsFromNode(GetTransactionsFromNodeRequest) returns (stream TransactionsFromNodeResponse);
+}
diff --git a/protos/proto/aptos/remote_executor/v1/network_msg.proto b/protos/proto/aptos/remote_executor/v1/network_msg.proto
index 5afe67579f1e7..c467d99ca4c86 100644
--- a/protos/proto/aptos/remote_executor/v1/network_msg.proto
+++ b/protos/proto/aptos/remote_executor/v1/network_msg.proto
@@ -6,14 +6,12 @@ syntax = "proto3";
 package aptos.remote_executor.v1;
 
 message NetworkMessage {
-    bytes message = 1;
-    string message_type = 2;
+  bytes message = 1;
+  string message_type = 2;
 }
 
-message Empty {
-
-}
+message Empty {}
 
 service NetworkMessageService {
-    rpc SimpleMsgExchange(NetworkMessage) returns (Empty);
-}
\ No newline at end of file
+  rpc SimpleMsgExchange(NetworkMessage) returns (Empty);
+}
diff --git a/protos/proto/aptos/transaction/v1/transaction.proto b/protos/proto/aptos/transaction/v1/transaction.proto
index 4f80cfcb07ade..f83792456a34a 100644
--- a/protos/proto/aptos/transaction/v1/transaction.proto
+++ b/protos/proto/aptos/transaction/v1/transaction.proto
@@ -35,7 +35,7 @@ message Block {
 // Transaction as it happened on the chain, there are 4 types of transactions:
 // - User Transaction: a user initiated transaction to interact with the chain
 // - Block Metadata Transaction: transactions generated by the chain to group together transactions forming a "block"
-// - State Checkpoint Transaction: transactions generated by the chain so when validator agreed on a particular global state
+// - Block Epilogue / State Checkpoint Transaction: transactions generated by the chain to end the group transactions forming a bloc
 // - Genesis Transaction: the first transaction of the chain, with all core contract and validator information baked in
 message Transaction {
   aptos.util.timestamp.Timestamp timestamp = 1;
@@ -50,7 +50,9 @@ message Transaction {
     TRANSACTION_TYPE_BLOCK_METADATA = 2;
     TRANSACTION_TYPE_STATE_CHECKPOINT = 3;
     TRANSACTION_TYPE_USER = 4;
+    // values 5-19 skipped for no reason
     TRANSACTION_TYPE_VALIDATOR = 20;
+    TRANSACTION_TYPE_BLOCK_EPILOGUE = 21;
   }
 
   TransactionType type = 6;
@@ -60,12 +62,16 @@ message Transaction {
     GenesisTransaction genesis = 8;
     StateCheckpointTransaction state_checkpoint = 9;
     UserTransaction user = 10;
+    // value 11-19 skipped for no reason
     ValidatorTransaction validator = 21;
+    // value 22 is used up below (all Transaction fields have to have different index), so going to 23
+    BlockEpilogueTransaction block_epilogue = 23;
   }
 
   TransactionSizeInfo size_info = 22;
 }
 
+// Transaction types.
 message BlockMetadataTransaction {
   string id = 1;
   uint64 round = 2 [jstype = JS_STRING];
@@ -80,10 +86,71 @@ message GenesisTransaction {
   repeated Event events = 2;
 }
 
-message StateCheckpointTransaction {
-}
+message StateCheckpointTransaction {}
 
 message ValidatorTransaction {
+  oneof ValidatorTransactionType {
+    ObservedJwkUpdate observed_jwk_update = 1;
+    DkgUpdate dkg_update = 2;
+  }
+
+  message ObservedJwkUpdate {
+    message ExportedProviderJWKs {
+      string issuer = 1;
+      uint64 version = 2;
+      message JWK {
+        message RSA {
+          string kid = 1;
+          string kty = 2;
+          string alg = 3;
+          string e = 4;
+          string n = 5;
+        }
+        message UnsupportedJWK {
+          bytes id = 1;
+          bytes payload = 2;
+        }
+        oneof JwkType {
+          UnsupportedJWK unsupported_jwk = 1;
+          RSA rsa = 2;
+        }
+      }
+
+      repeated JWK jwks = 3;
+    }
+    message ExportedAggregateSignature {
+      repeated uint64 signer_indices = 1;
+      // HexToBytes.
+      bytes sig = 2;
+    }
+    message QuorumCertifiedUpdate {
+      ExportedProviderJWKs update = 1;
+      ExportedAggregateSignature multi_sig = 2;
+    }
+    QuorumCertifiedUpdate quorum_certified_update = 1;
+  }
+
+  message DkgUpdate {
+    message DkgTranscript {
+      uint64 epoch = 1;
+      string author = 2;
+      bytes payload = 3;
+    }
+    DkgTranscript dkg_transcript = 1;
+  }
+
+  repeated Event events = 3;
+}
+
+message BlockEpilogueTransaction {
+  optional BlockEndInfo block_end_info = 1;
+}
+
+message BlockEndInfo {
+  bool block_gas_limit_reached = 1;
+  bool block_output_limit_reached = 2;
+  uint64 block_effective_block_gas_units = 3;
+  uint64 block_approx_output_size = 4;
 }
 
 message UserTransaction {
@@ -127,7 +194,6 @@ message UserTransactionRequest {
 }
 
 message WriteSet {
-
   enum WriteSetType {
     WRITE_SET_TYPE_UNSPECIFIED = 0;
     WRITE_SET_TYPE_SCRIPT_WRITE_SET = 1;
@@ -152,7 +218,6 @@ message DirectWriteSet {
 }
 
 message WriteSetChange {
-
   enum Type {
     TYPE_UNSPECIFIED = 0;
     TYPE_DELETE_MODULE = 1;
@@ -315,12 +380,13 @@ message MoveFunction {
 message MoveStruct {
   string name = 1;
   bool is_native = 2;
+  bool is_event = 6;
   repeated MoveAbility abilities = 3;
   repeated MoveStructGenericTypeParam generic_type_params = 4;
   repeated MoveStructField fields = 5;
 }
 
-message MoveStructGenericTypeParam{
+message MoveStructGenericTypeParam {
   repeated MoveAbility constraints = 1;
   bool is_phantom = 2;
 }
@@ -352,8 +418,7 @@ enum MoveTypes {
   MOVE_TYPES_UNPARSABLE = 11; // `(String)`,
 }
 
-message MoveType{
-
+message MoveType {
   message ReferenceType {
     bool mutable = 1;
     MoveType to = 2;
@@ -399,7 +464,6 @@ message MoveStructTag {
 }
 
 message Signature {
-
   enum Type {
     TYPE_UNSPECIFIED = 0;
     TYPE_ED25519 = 1;
diff --git a/protos/proto/aptos/util/timestamp/timestamp.proto b/protos/proto/aptos/util/timestamp/timestamp.proto
index 86fe6b8240273..caacaa13cc6b0 100644
--- a/protos/proto/aptos/util/timestamp/timestamp.proto
+++ b/protos/proto/aptos/util/timestamp/timestamp.proto
@@ -16,4 +16,4 @@ message Timestamp {
   // that count forward in time. Must be from 0 to 999,999,999
   // inclusive.
   int32 nanos = 2;
-}
\ No newline at end of file
+}
diff --git a/protos/python/aptos_protos/aptos/bigquery_schema/v1/transaction_pb2.py b/protos/python/aptos_protos/aptos/bigquery_schema/v1/transaction_pb2.py
deleted file mode 100644
index d40812b67bc1f..0000000000000
--- a/protos/python/aptos_protos/aptos/bigquery_schema/v1/transaction_pb2.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: aptos/bigquery_schema/v1/transaction.proto
-"""Generated protocol buffer code."""
-from google.protobuf import descriptor as _descriptor
-from google.protobuf import descriptor_pool as _descriptor_pool
-from google.protobuf import symbol_database as _symbol_database
-from google.protobuf.internal import builder as _builder
-
-# @@protoc_insertion_point(imports)
-
-_sym_db = _symbol_database.Default()
-
-
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(
-    b'\n*aptos/bigquery_schema/v1/transaction.proto\x12$aptos.bigquery_schema.transaction.v1"\xe0\x02\n\x0bTransaction\x12\x0f\n\x07version\x18\x01 \x02(\x03\x12\x14\n\x0c\x62lock_height\x18\x02 \x02(\x03\x12\x0c\n\x04hash\x18\x03 \x02(\t\x12\x0c\n\x04type\x18\x04 \x02(\t\x12\x0f\n\x07payload\x18\x05 \x01(\t\x12\x19\n\x11state_change_hash\x18\x06 \x02(\t\x12\x17\n\x0f\x65vent_root_hash\x18\x07 \x02(\t\x12\x1d\n\x15state_checkpoint_hash\x18\x08 \x01(\t\x12\x10\n\x08gas_used\x18\t \x02(\x04\x12\x0f\n\x07success\x18\n \x02(\x08\x12\x11\n\tvm_status\x18\x0b \x02(\t\x12\x1d\n\x15\x61\x63\x63umulator_root_hash\x18\x0c \x02(\t\x12\x12\n\nnum_events\x18\r \x02(\x03\x12\x1d\n\x15num_write_set_changes\x18\x0e \x02(\x03\x12\r\n\x05\x65poch\x18\x0f \x02(\x03\x12\x13\n\x0binserted_at\x18\x10 \x02(\x03'
-)
-
-_globals = globals()
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
-_builder.BuildTopDescriptorsAndMessages(
-    DESCRIPTOR, "aptos.bigquery_schema.v1.transaction_pb2", _globals
-)
-if _descriptor._USE_C_DESCRIPTORS == False:
-    DESCRIPTOR._options = None
-    _globals["_TRANSACTION"]._serialized_start = 85
-    _globals["_TRANSACTION"]._serialized_end = 437
-# @@protoc_insertion_point(module_scope)
diff --git a/protos/python/aptos_protos/aptos/bigquery_schema/v1/transaction_pb2.pyi b/protos/python/aptos_protos/aptos/bigquery_schema/v1/transaction_pb2.pyi
deleted file mode 100644
index e789d40ec12bb..0000000000000
--- a/protos/python/aptos_protos/aptos/bigquery_schema/v1/transaction_pb2.pyi
+++ /dev/null
@@ -1,78 +0,0 @@
-from typing import ClassVar as _ClassVar
-from typing import Optional as _Optional
-
-from google.protobuf import descriptor as _descriptor
-from google.protobuf import message as _message
-
-DESCRIPTOR: _descriptor.FileDescriptor
-
-class Transaction(_message.Message):
-    __slots__ = [
-        "version",
-        "block_height",
-        "hash",
-        "type",
-        "payload",
-        "state_change_hash",
-        "event_root_hash",
-        "state_checkpoint_hash",
-        "gas_used",
-        "success",
-        "vm_status",
-        "accumulator_root_hash",
-        "num_events",
-        "num_write_set_changes",
-        "epoch",
-        "inserted_at",
-    ]
-    VERSION_FIELD_NUMBER: _ClassVar[int]
-    BLOCK_HEIGHT_FIELD_NUMBER: _ClassVar[int]
-    HASH_FIELD_NUMBER: _ClassVar[int]
-    TYPE_FIELD_NUMBER: _ClassVar[int]
-    PAYLOAD_FIELD_NUMBER: _ClassVar[int]
-    STATE_CHANGE_HASH_FIELD_NUMBER: _ClassVar[int]
-    EVENT_ROOT_HASH_FIELD_NUMBER: _ClassVar[int]
-    STATE_CHECKPOINT_HASH_FIELD_NUMBER: _ClassVar[int]
-    GAS_USED_FIELD_NUMBER: _ClassVar[int]
-    SUCCESS_FIELD_NUMBER: _ClassVar[int]
-    VM_STATUS_FIELD_NUMBER: _ClassVar[int]
-    ACCUMULATOR_ROOT_HASH_FIELD_NUMBER: _ClassVar[int]
-    NUM_EVENTS_FIELD_NUMBER: _ClassVar[int]
-    NUM_WRITE_SET_CHANGES_FIELD_NUMBER: _ClassVar[int]
-    EPOCH_FIELD_NUMBER: _ClassVar[int]
-    INSERTED_AT_FIELD_NUMBER: _ClassVar[int]
-    version: int
-    block_height: int
-    hash: str
-    type: str
-    payload: str
-    state_change_hash: str
-    event_root_hash: str
-    state_checkpoint_hash: str
-    gas_used: int
-    success: bool
-    vm_status: str
-    accumulator_root_hash: str
-    num_events: int
-    num_write_set_changes: int
-    epoch: int
-    inserted_at: int
-    def __init__(
-        self,
-        version: _Optional[int] = ...,
-        block_height: _Optional[int] = ...,
-        hash: _Optional[str] = ...,
-        type: _Optional[str] = ...,
-        payload: _Optional[str] = ...,
-        state_change_hash: _Optional[str] = ...,
-        event_root_hash: _Optional[str] = ...,
-        state_checkpoint_hash: _Optional[str] = ...,
-        gas_used: _Optional[int] = ...,
-        success: bool = ...,
-        vm_status: _Optional[str] = ...,
-        accumulator_root_hash: _Optional[str] = ...,
-        num_events: _Optional[int] = ...,
-        num_write_set_changes: _Optional[int] = ...,
-        epoch: _Optional[int] = ...,
-        inserted_at: _Optional[int] = ...,
-    ) -> None: ...
diff --git a/protos/python/aptos_protos/aptos/bigquery_schema/v1/transaction_pb2_grpc.py b/protos/python/aptos_protos/aptos/bigquery_schema/v1/transaction_pb2_grpc.py
deleted file mode 100644
index 8a9393943bdf4..0000000000000
--- a/protos/python/aptos_protos/aptos/bigquery_schema/v1/transaction_pb2_grpc.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
-"""Client and server classes corresponding to protobuf-defined services."""
-import grpc
diff --git a/protos/python/aptos_protos/aptos/transaction/v1/transaction_pb2.py b/protos/python/aptos_protos/aptos/transaction/v1/transaction_pb2.py
index 5e49e063dbb09..e9e82597c75bb 100644
--- a/protos/python/aptos_protos/aptos/transaction/v1/transaction_pb2.py
+++ b/protos/python/aptos_protos/aptos/transaction/v1/transaction_pb2.py
@@ -17,7 +17,7 @@
 )
 
 DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(
-    b'\n&aptos/transaction/v1/transaction.proto\x12\x14\x61ptos.transaction.v1\x1a$aptos/util/timestamp/timestamp.proto"\x9a\x01\n\x05\x42lock\x12\x32\n\ttimestamp\x18\x01 \x01(\x0b\x32\x1f.aptos.util.timestamp.Timestamp\x12\x12\n\x06height\x18\x02 \x01(\x04\x42\x02\x30\x01\x12\x37\n\x0ctransactions\x18\x03 \x03(\x0b\x32!.aptos.transaction.v1.Transaction\x12\x10\n\x08\x63hain_id\x18\x04 \x01(\r"\xeb\x06\n\x0bTransaction\x12\x32\n\ttimestamp\x18\x01 \x01(\x0b\x32\x1f.aptos.util.timestamp.Timestamp\x12\x13\n\x07version\x18\x02 \x01(\x04\x42\x02\x30\x01\x12\x33\n\x04info\x18\x03 \x01(\x0b\x32%.aptos.transaction.v1.TransactionInfo\x12\x11\n\x05\x65poch\x18\x04 \x01(\x04\x42\x02\x30\x01\x12\x18\n\x0c\x62lock_height\x18\x05 \x01(\x04\x42\x02\x30\x01\x12?\n\x04type\x18\x06 \x01(\x0e\x32\x31.aptos.transaction.v1.Transaction.TransactionType\x12H\n\x0e\x62lock_metadata\x18\x07 \x01(\x0b\x32..aptos.transaction.v1.BlockMetadataTransactionH\x00\x12;\n\x07genesis\x18\x08 \x01(\x0b\x32(.aptos.transaction.v1.GenesisTransactionH\x00\x12L\n\x10state_checkpoint\x18\t \x01(\x0b\x32\x30.aptos.transaction.v1.StateCheckpointTransactionH\x00\x12\x35\n\x04user\x18\n \x01(\x0b\x32%.aptos.transaction.v1.UserTransactionH\x00\x12?\n\tvalidator\x18\x15 \x01(\x0b\x32*.aptos.transaction.v1.ValidatorTransactionH\x00\x12<\n\tsize_info\x18\x16 \x01(\x0b\x32).aptos.transaction.v1.TransactionSizeInfo"\xd8\x01\n\x0fTransactionType\x12 \n\x1cTRANSACTION_TYPE_UNSPECIFIED\x10\x00\x12\x1c\n\x18TRANSACTION_TYPE_GENESIS\x10\x01\x12#\n\x1fTRANSACTION_TYPE_BLOCK_METADATA\x10\x02\x12%\n!TRANSACTION_TYPE_STATE_CHECKPOINT\x10\x03\x12\x19\n\x15TRANSACTION_TYPE_USER\x10\x04\x12\x1e\n\x1aTRANSACTION_TYPE_VALIDATOR\x10\x14\x42\n\n\x08txn_data"\xbe\x01\n\x18\x42lockMetadataTransaction\x12\n\n\x02id\x18\x01 \x01(\t\x12\x11\n\x05round\x18\x02 \x01(\x04\x42\x02\x30\x01\x12+\n\x06\x65vents\x18\x03 \x03(\x0b\x32\x1b.aptos.transaction.v1.Event\x12#\n\x1bprevious_block_votes_bitvec\x18\x04 \x01(\x0c\x12\x10\n\x08proposer\x18\x05 \x01(\t\x12\x1f\n\x17\x66\x61iled_proposer_indices\x18\x06 \x03(\r"r\n\x12GenesisTransaction\x12/\n\x07payload\x18\x01 \x01(\x0b\x32\x1e.aptos.transaction.v1.WriteSet\x12+\n\x06\x65vents\x18\x02 \x03(\x0b\x32\x1b.aptos.transaction.v1.Event"\x1c\n\x1aStateCheckpointTransaction"\x16\n\x14ValidatorTransaction"}\n\x0fUserTransaction\x12=\n\x07request\x18\x01 \x01(\x0b\x32,.aptos.transaction.v1.UserTransactionRequest\x12+\n\x06\x65vents\x18\x02 \x03(\x0b\x32\x1b.aptos.transaction.v1.Event"\x9f\x01\n\x05\x45vent\x12+\n\x03key\x18\x01 \x01(\x0b\x32\x1e.aptos.transaction.v1.EventKey\x12\x1b\n\x0fsequence_number\x18\x02 \x01(\x04\x42\x02\x30\x01\x12,\n\x04type\x18\x03 \x01(\x0b\x32\x1e.aptos.transaction.v1.MoveType\x12\x10\n\x08type_str\x18\x05 \x01(\t\x12\x0c\n\x04\x64\x61ta\x18\x04 \x01(\t"\xa1\x02\n\x0fTransactionInfo\x12\x0c\n\x04hash\x18\x01 \x01(\x0c\x12\x19\n\x11state_change_hash\x18\x02 \x01(\x0c\x12\x17\n\x0f\x65vent_root_hash\x18\x03 \x01(\x0c\x12"\n\x15state_checkpoint_hash\x18\x04 \x01(\x0cH\x00\x88\x01\x01\x12\x14\n\x08gas_used\x18\x05 \x01(\x04\x42\x02\x30\x01\x12\x0f\n\x07success\x18\x06 \x01(\x08\x12\x11\n\tvm_status\x18\x07 \x01(\t\x12\x1d\n\x15\x61\x63\x63umulator_root_hash\x18\x08 \x01(\x0c\x12\x35\n\x07\x63hanges\x18\t \x03(\x0b\x32$.aptos.transaction.v1.WriteSetChangeB\x18\n\x16_state_checkpoint_hash"@\n\x08\x45ventKey\x12\x1b\n\x0f\x63reation_number\x18\x01 \x01(\x04\x42\x02\x30\x01\x12\x17\n\x0f\x61\x63\x63ount_address\x18\x02 \x01(\t"\xb0\x02\n\x16UserTransactionRequest\x12\x0e\n\x06sender\x18\x01 \x01(\t\x12\x1b\n\x0fsequence_number\x18\x02 \x01(\x04\x42\x02\x30\x01\x12\x1a\n\x0emax_gas_amount\x18\x03 \x01(\x04\x42\x02\x30\x01\x12\x1a\n\x0egas_unit_price\x18\x04 \x01(\x04\x42\x02\x30\x01\x12\x42\n\x19\x65xpiration_timestamp_secs\x18\x05 \x01(\x0b\x32\x1f.aptos.util.timestamp.Timestamp\x12\x39\n\x07payload\x18\x06 \x01(\x0b\x32(.aptos.transaction.v1.TransactionPayload\x12\x32\n\tsignature\x18\x07 \x01(\x0b\x32\x1f.aptos.transaction.v1.Signature"\xda\x02\n\x08WriteSet\x12\x43\n\x0ewrite_set_type\x18\x01 \x01(\x0e\x32+.aptos.transaction.v1.WriteSet.WriteSetType\x12@\n\x10script_write_set\x18\x02 \x01(\x0b\x32$.aptos.transaction.v1.ScriptWriteSetH\x00\x12@\n\x10\x64irect_write_set\x18\x03 \x01(\x0b\x32$.aptos.transaction.v1.DirectWriteSetH\x00"x\n\x0cWriteSetType\x12\x1e\n\x1aWRITE_SET_TYPE_UNSPECIFIED\x10\x00\x12#\n\x1fWRITE_SET_TYPE_SCRIPT_WRITE_SET\x10\x01\x12#\n\x1fWRITE_SET_TYPE_DIRECT_WRITE_SET\x10\x02\x42\x0b\n\twrite_set"Y\n\x0eScriptWriteSet\x12\x12\n\nexecute_as\x18\x01 \x01(\t\x12\x33\n\x06script\x18\x02 \x01(\x0b\x32#.aptos.transaction.v1.ScriptPayload"}\n\x0e\x44irectWriteSet\x12>\n\x10write_set_change\x18\x01 \x03(\x0b\x32$.aptos.transaction.v1.WriteSetChange\x12+\n\x06\x65vents\x18\x02 \x03(\x0b\x32\x1b.aptos.transaction.v1.Event"\x89\x05\n\x0eWriteSetChange\x12\x37\n\x04type\x18\x01 \x01(\x0e\x32).aptos.transaction.v1.WriteSetChange.Type\x12;\n\rdelete_module\x18\x02 \x01(\x0b\x32".aptos.transaction.v1.DeleteModuleH\x00\x12?\n\x0f\x64\x65lete_resource\x18\x03 \x01(\x0b\x32$.aptos.transaction.v1.DeleteResourceH\x00\x12\x42\n\x11\x64\x65lete_table_item\x18\x04 \x01(\x0b\x32%.aptos.transaction.v1.DeleteTableItemH\x00\x12\x39\n\x0cwrite_module\x18\x05 \x01(\x0b\x32!.aptos.transaction.v1.WriteModuleH\x00\x12=\n\x0ewrite_resource\x18\x06 \x01(\x0b\x32#.aptos.transaction.v1.WriteResourceH\x00\x12@\n\x10write_table_item\x18\x07 \x01(\x0b\x32$.aptos.transaction.v1.WriteTableItemH\x00"\xb5\x01\n\x04Type\x12\x14\n\x10TYPE_UNSPECIFIED\x10\x00\x12\x16\n\x12TYPE_DELETE_MODULE\x10\x01\x12\x18\n\x14TYPE_DELETE_RESOURCE\x10\x02\x12\x1a\n\x16TYPE_DELETE_TABLE_ITEM\x10\x03\x12\x15\n\x11TYPE_WRITE_MODULE\x10\x04\x12\x17\n\x13TYPE_WRITE_RESOURCE\x10\x05\x12\x19\n\x15TYPE_WRITE_TABLE_ITEM\x10\x06\x42\x08\n\x06\x63hange"k\n\x0c\x44\x65leteModule\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\t\x12\x16\n\x0estate_key_hash\x18\x02 \x01(\x0c\x12\x32\n\x06module\x18\x03 \x01(\x0b\x32".aptos.transaction.v1.MoveModuleId"~\n\x0e\x44\x65leteResource\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\t\x12\x16\n\x0estate_key_hash\x18\x02 \x01(\x0c\x12\x31\n\x04type\x18\x03 \x01(\x0b\x32#.aptos.transaction.v1.MoveStructTag\x12\x10\n\x08type_str\x18\x04 \x01(\t"{\n\x0f\x44\x65leteTableItem\x12\x16\n\x0estate_key_hash\x18\x01 \x01(\x0c\x12\x0e\n\x06handle\x18\x02 \x01(\t\x12\x0b\n\x03key\x18\x03 \x01(\t\x12\x33\n\x04\x64\x61ta\x18\x04 \x01(\x0b\x32%.aptos.transaction.v1.DeleteTableData"0\n\x0f\x44\x65leteTableData\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x10\n\x08key_type\x18\x02 \x01(\t"n\n\x0bWriteModule\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\t\x12\x16\n\x0estate_key_hash\x18\x02 \x01(\x0c\x12\x36\n\x04\x64\x61ta\x18\x03 \x01(\x0b\x32(.aptos.transaction.v1.MoveModuleBytecode"\x8b\x01\n\rWriteResource\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\t\x12\x16\n\x0estate_key_hash\x18\x02 \x01(\x0c\x12\x31\n\x04type\x18\x03 \x01(\x0b\x32#.aptos.transaction.v1.MoveStructTag\x12\x10\n\x08type_str\x18\x04 \x01(\t\x12\x0c\n\x04\x64\x61ta\x18\x05 \x01(\t"R\n\x0eWriteTableData\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x10\n\x08key_type\x18\x02 \x01(\t\x12\r\n\x05value\x18\x03 \x01(\t\x12\x12\n\nvalue_type\x18\x04 \x01(\t"y\n\x0eWriteTableItem\x12\x16\n\x0estate_key_hash\x18\x01 \x01(\x0c\x12\x0e\n\x06handle\x18\x02 \x01(\t\x12\x0b\n\x03key\x18\x03 \x01(\t\x12\x32\n\x04\x64\x61ta\x18\x04 \x01(\x0b\x32$.aptos.transaction.v1.WriteTableData"\x8c\x04\n\x12TransactionPayload\x12;\n\x04type\x18\x01 \x01(\x0e\x32-.aptos.transaction.v1.TransactionPayload.Type\x12L\n\x16\x65ntry_function_payload\x18\x02 \x01(\x0b\x32*.aptos.transaction.v1.EntryFunctionPayloadH\x00\x12=\n\x0escript_payload\x18\x03 \x01(\x0b\x32#.aptos.transaction.v1.ScriptPayloadH\x00\x12\x42\n\x11write_set_payload\x18\x05 \x01(\x0b\x32%.aptos.transaction.v1.WriteSetPayloadH\x00\x12\x41\n\x10multisig_payload\x18\x06 \x01(\x0b\x32%.aptos.transaction.v1.MultisigPayloadH\x00"\x93\x01\n\x04Type\x12\x14\n\x10TYPE_UNSPECIFIED\x10\x00\x12\x1f\n\x1bTYPE_ENTRY_FUNCTION_PAYLOAD\x10\x01\x12\x17\n\x13TYPE_SCRIPT_PAYLOAD\x10\x02\x12\x1a\n\x16TYPE_WRITE_SET_PAYLOAD\x10\x04\x12\x19\n\x15TYPE_MULTISIG_PAYLOAD\x10\x05"\x04\x08\x03\x10\x03\x42\t\n\x07payloadJ\x04\x08\x04\x10\x05"\xb9\x01\n\x14\x45ntryFunctionPayload\x12\x37\n\x08\x66unction\x18\x01 \x01(\x0b\x32%.aptos.transaction.v1.EntryFunctionId\x12\x36\n\x0etype_arguments\x18\x02 \x03(\x0b\x32\x1e.aptos.transaction.v1.MoveType\x12\x11\n\targuments\x18\x03 \x03(\t\x12\x1d\n\x15\x65ntry_function_id_str\x18\x04 \x01(\t"W\n\x12MoveScriptBytecode\x12\x10\n\x08\x62ytecode\x18\x01 \x01(\x0c\x12/\n\x03\x61\x62i\x18\x02 \x01(\x0b\x32".aptos.transaction.v1.MoveFunction"\x92\x01\n\rScriptPayload\x12\x36\n\x04\x63ode\x18\x01 \x01(\x0b\x32(.aptos.transaction.v1.MoveScriptBytecode\x12\x36\n\x0etype_arguments\x18\x02 \x03(\x0b\x32\x1e.aptos.transaction.v1.MoveType\x12\x11\n\targuments\x18\x03 \x03(\t"\x97\x01\n\x0fMultisigPayload\x12\x18\n\x10multisig_address\x18\x01 \x01(\t\x12R\n\x13transaction_payload\x18\x02 \x01(\x0b\x32\x30.aptos.transaction.v1.MultisigTransactionPayloadH\x00\x88\x01\x01\x42\x16\n\x14_transaction_payload"\xf9\x01\n\x1aMultisigTransactionPayload\x12\x43\n\x04type\x18\x01 \x01(\x0e\x32\x35.aptos.transaction.v1.MultisigTransactionPayload.Type\x12L\n\x16\x65ntry_function_payload\x18\x02 \x01(\x0b\x32*.aptos.transaction.v1.EntryFunctionPayloadH\x00"=\n\x04Type\x12\x14\n\x10TYPE_UNSPECIFIED\x10\x00\x12\x1f\n\x1bTYPE_ENTRY_FUNCTION_PAYLOAD\x10\x01\x42\t\n\x07payload"U\n\x12MoveModuleBytecode\x12\x10\n\x08\x62ytecode\x18\x01 \x01(\x0c\x12-\n\x03\x61\x62i\x18\x02 \x01(\x0b\x32 .aptos.transaction.v1.MoveModule"\xd2\x01\n\nMoveModule\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\t\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x33\n\x07\x66riends\x18\x03 \x03(\x0b\x32".aptos.transaction.v1.MoveModuleId\x12=\n\x11\x65xposed_functions\x18\x04 \x03(\x0b\x32".aptos.transaction.v1.MoveFunction\x12\x31\n\x07structs\x18\x05 \x03(\x0b\x32 .aptos.transaction.v1.MoveStruct"\x92\x03\n\x0cMoveFunction\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x41\n\nvisibility\x18\x02 \x01(\x0e\x32-.aptos.transaction.v1.MoveFunction.Visibility\x12\x10\n\x08is_entry\x18\x03 \x01(\x08\x12O\n\x13generic_type_params\x18\x04 \x03(\x0b\x32\x32.aptos.transaction.v1.MoveFunctionGenericTypeParam\x12.\n\x06params\x18\x05 \x03(\x0b\x32\x1e.aptos.transaction.v1.MoveType\x12.\n\x06return\x18\x06 \x03(\x0b\x32\x1e.aptos.transaction.v1.MoveType"n\n\nVisibility\x12\x1a\n\x16VISIBILITY_UNSPECIFIED\x10\x00\x12\x16\n\x12VISIBILITY_PRIVATE\x10\x01\x12\x15\n\x11VISIBILITY_PUBLIC\x10\x02\x12\x15\n\x11VISIBILITY_FRIEND\x10\x03"\xe9\x01\n\nMoveStruct\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x11\n\tis_native\x18\x02 \x01(\x08\x12\x34\n\tabilities\x18\x03 \x03(\x0e\x32!.aptos.transaction.v1.MoveAbility\x12M\n\x13generic_type_params\x18\x04 \x03(\x0b\x32\x30.aptos.transaction.v1.MoveStructGenericTypeParam\x12\x35\n\x06\x66ields\x18\x05 \x03(\x0b\x32%.aptos.transaction.v1.MoveStructField"h\n\x1aMoveStructGenericTypeParam\x12\x36\n\x0b\x63onstraints\x18\x01 \x03(\x0e\x32!.aptos.transaction.v1.MoveAbility\x12\x12\n\nis_phantom\x18\x02 \x01(\x08"M\n\x0fMoveStructField\x12\x0c\n\x04name\x18\x01 \x01(\t\x12,\n\x04type\x18\x02 \x01(\x0b\x32\x1e.aptos.transaction.v1.MoveType"V\n\x1cMoveFunctionGenericTypeParam\x12\x36\n\x0b\x63onstraints\x18\x01 \x03(\x0e\x32!.aptos.transaction.v1.MoveAbility"\xf8\x02\n\x08MoveType\x12-\n\x04type\x18\x01 \x01(\x0e\x32\x1f.aptos.transaction.v1.MoveTypes\x12\x30\n\x06vector\x18\x03 \x01(\x0b\x32\x1e.aptos.transaction.v1.MoveTypeH\x00\x12\x35\n\x06struct\x18\x04 \x01(\x0b\x32#.aptos.transaction.v1.MoveStructTagH\x00\x12"\n\x18generic_type_param_index\x18\x05 \x01(\rH\x00\x12\x41\n\treference\x18\x06 \x01(\x0b\x32,.aptos.transaction.v1.MoveType.ReferenceTypeH\x00\x12\x14\n\nunparsable\x18\x07 \x01(\tH\x00\x1aL\n\rReferenceType\x12\x0f\n\x07mutable\x18\x01 \x01(\x08\x12*\n\x02to\x18\x02 \x01(\x0b\x32\x1e.aptos.transaction.v1.MoveTypeB\t\n\x07\x63ontent"D\n\x0fWriteSetPayload\x12\x31\n\twrite_set\x18\x01 \x01(\x0b\x32\x1e.aptos.transaction.v1.WriteSet"S\n\x0f\x45ntryFunctionId\x12\x32\n\x06module\x18\x01 \x01(\x0b\x32".aptos.transaction.v1.MoveModuleId\x12\x0c\n\x04name\x18\x02 \x01(\t"-\n\x0cMoveModuleId\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\t\x12\x0c\n\x04name\x18\x02 \x01(\t"{\n\rMoveStructTag\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\t\x12\x0e\n\x06module\x18\x02 \x01(\t\x12\x0c\n\x04name\x18\x03 \x01(\t\x12;\n\x13generic_type_params\x18\x04 \x03(\x0b\x32\x1e.aptos.transaction.v1.MoveType"\x9b\x04\n\tSignature\x12\x32\n\x04type\x18\x01 \x01(\x0e\x32$.aptos.transaction.v1.Signature.Type\x12\x39\n\x07\x65\x64\x32\x35\x35\x31\x39\x18\x02 \x01(\x0b\x32&.aptos.transaction.v1.Ed25519SignatureH\x00\x12\x44\n\rmulti_ed25519\x18\x03 \x01(\x0b\x32+.aptos.transaction.v1.MultiEd25519SignatureH\x00\x12@\n\x0bmulti_agent\x18\x04 \x01(\x0b\x32).aptos.transaction.v1.MultiAgentSignatureH\x00\x12<\n\tfee_payer\x18\x05 \x01(\x0b\x32\'.aptos.transaction.v1.FeePayerSignatureH\x00\x12;\n\rsingle_sender\x18\x07 \x01(\x0b\x32".aptos.transaction.v1.SingleSenderH\x00"\x8e\x01\n\x04Type\x12\x14\n\x10TYPE_UNSPECIFIED\x10\x00\x12\x10\n\x0cTYPE_ED25519\x10\x01\x12\x16\n\x12TYPE_MULTI_ED25519\x10\x02\x12\x14\n\x10TYPE_MULTI_AGENT\x10\x03\x12\x12\n\x0eTYPE_FEE_PAYER\x10\x04\x12\x16\n\x12TYPE_SINGLE_SENDER\x10\x06"\x04\x08\x05\x10\x05\x42\x0b\n\tsignature"9\n\x10\x45\x64\x32\x35\x35\x31\x39Signature\x12\x12\n\npublic_key\x18\x01 \x01(\x0c\x12\x11\n\tsignature\x18\x02 \x01(\x0c"o\n\x15MultiEd25519Signature\x12\x13\n\x0bpublic_keys\x18\x01 \x03(\x0c\x12\x12\n\nsignatures\x18\x02 \x03(\x0c\x12\x11\n\tthreshold\x18\x03 \x01(\r\x12\x1a\n\x12public_key_indices\x18\x04 \x03(\r"\xb4\x01\n\x13MultiAgentSignature\x12\x36\n\x06sender\x18\x01 \x01(\x0b\x32&.aptos.transaction.v1.AccountSignature\x12"\n\x1asecondary_signer_addresses\x18\x02 \x03(\t\x12\x41\n\x11secondary_signers\x18\x03 \x03(\x0b\x32&.aptos.transaction.v1.AccountSignature"\x8f\x02\n\x11\x46\x65\x65PayerSignature\x12\x36\n\x06sender\x18\x01 \x01(\x0b\x32&.aptos.transaction.v1.AccountSignature\x12"\n\x1asecondary_signer_addresses\x18\x02 \x03(\t\x12\x41\n\x11secondary_signers\x18\x03 \x03(\x0b\x32&.aptos.transaction.v1.AccountSignature\x12\x19\n\x11\x66\x65\x65_payer_address\x18\x04 \x01(\t\x12@\n\x10\x66\x65\x65_payer_signer\x18\x05 \x01(\x0b\x32&.aptos.transaction.v1.AccountSignature"\xcf\x01\n\x0c\x41nyPublicKey\x12\x35\n\x04type\x18\x01 \x01(\x0e\x32\'.aptos.transaction.v1.AnyPublicKey.Type\x12\x12\n\npublic_key\x18\x02 \x01(\x0c"t\n\x04Type\x12\x14\n\x10TYPE_UNSPECIFIED\x10\x00\x12\x10\n\x0cTYPE_ED25519\x10\x01\x12\x18\n\x14TYPE_SECP256K1_ECDSA\x10\x02\x12\x18\n\x14TYPE_SECP256R1_ECDSA\x10\x03\x12\x10\n\x0cTYPE_KEYLESS\x10\x04"\xb9\x03\n\x0c\x41nySignature\x12\x35\n\x04type\x18\x01 \x01(\x0e\x32\'.aptos.transaction.v1.AnySignature.Type\x12\x15\n\tsignature\x18\x02 \x01(\x0c\x42\x02\x18\x01\x12\x30\n\x07\x65\x64\x32\x35\x35\x31\x39\x18\x03 \x01(\x0b\x32\x1d.aptos.transaction.v1.Ed25519H\x00\x12?\n\x0fsecp256k1_ecdsa\x18\x04 \x01(\x0b\x32$.aptos.transaction.v1.Secp256k1EcdsaH\x00\x12\x32\n\x08webauthn\x18\x05 \x01(\x0b\x32\x1e.aptos.transaction.v1.WebAuthnH\x00\x12\x30\n\x07keyless\x18\x06 \x01(\x0b\x32\x1d.aptos.transaction.v1.KeylessH\x00"m\n\x04Type\x12\x14\n\x10TYPE_UNSPECIFIED\x10\x00\x12\x10\n\x0cTYPE_ED25519\x10\x01\x12\x18\n\x14TYPE_SECP256K1_ECDSA\x10\x02\x12\x11\n\rTYPE_WEBAUTHN\x10\x03\x12\x10\n\x0cTYPE_KEYLESS\x10\x04\x42\x13\n\x11signature_variant"\x1c\n\x07\x45\x64\x32\x35\x35\x31\x39\x12\x11\n\tsignature\x18\x01 \x01(\x0c"#\n\x0eSecp256k1Ecdsa\x12\x11\n\tsignature\x18\x01 \x01(\x0c"\x1d\n\x08WebAuthn\x12\x11\n\tsignature\x18\x01 \x01(\x0c"\x1c\n\x07Keyless\x12\x11\n\tsignature\x18\x01 \x01(\x0c"\x83\x01\n\x12SingleKeySignature\x12\x36\n\npublic_key\x18\x01 \x01(\x0b\x32".aptos.transaction.v1.AnyPublicKey\x12\x35\n\tsignature\x18\x02 \x01(\x0b\x32".aptos.transaction.v1.AnySignature"X\n\x10IndexedSignature\x12\r\n\x05index\x18\x01 \x01(\r\x12\x35\n\tsignature\x18\x02 \x01(\x0b\x32".aptos.transaction.v1.AnySignature"\xa5\x01\n\x11MultiKeySignature\x12\x37\n\x0bpublic_keys\x18\x01 \x03(\x0b\x32".aptos.transaction.v1.AnyPublicKey\x12:\n\nsignatures\x18\x02 \x03(\x0b\x32&.aptos.transaction.v1.IndexedSignature\x12\x1b\n\x13signatures_required\x18\x03 \x01(\r"F\n\x0cSingleSender\x12\x36\n\x06sender\x18\x01 \x01(\x0b\x32&.aptos.transaction.v1.AccountSignature"\xe4\x03\n\x10\x41\x63\x63ountSignature\x12\x39\n\x04type\x18\x01 \x01(\x0e\x32+.aptos.transaction.v1.AccountSignature.Type\x12\x39\n\x07\x65\x64\x32\x35\x35\x31\x39\x18\x02 \x01(\x0b\x32&.aptos.transaction.v1.Ed25519SignatureH\x00\x12\x44\n\rmulti_ed25519\x18\x03 \x01(\x0b\x32+.aptos.transaction.v1.MultiEd25519SignatureH\x00\x12H\n\x14single_key_signature\x18\x05 \x01(\x0b\x32(.aptos.transaction.v1.SingleKeySignatureH\x00\x12\x46\n\x13multi_key_signature\x18\x06 \x01(\x0b\x32\'.aptos.transaction.v1.MultiKeySignatureH\x00"u\n\x04Type\x12\x14\n\x10TYPE_UNSPECIFIED\x10\x00\x12\x10\n\x0cTYPE_ED25519\x10\x01\x12\x16\n\x12TYPE_MULTI_ED25519\x10\x02\x12\x13\n\x0fTYPE_SINGLE_KEY\x10\x04\x12\x12\n\x0eTYPE_MULTI_KEY\x10\x05"\x04\x08\x03\x10\x03\x42\x0b\n\tsignature"\xb1\x01\n\x13TransactionSizeInfo\x12\x19\n\x11transaction_bytes\x18\x01 \x01(\r\x12<\n\x0f\x65vent_size_info\x18\x02 \x03(\x0b\x32#.aptos.transaction.v1.EventSizeInfo\x12\x41\n\x12write_op_size_info\x18\x03 \x03(\x0b\x32%.aptos.transaction.v1.WriteOpSizeInfo"<\n\rEventSizeInfo\x12\x16\n\x0etype_tag_bytes\x18\x01 \x01(\r\x12\x13\n\x0btotal_bytes\x18\x02 \x01(\r"9\n\x0fWriteOpSizeInfo\x12\x11\n\tkey_bytes\x18\x01 \x01(\r\x12\x13\n\x0bvalue_bytes\x18\x02 \x01(\r*\xea\x02\n\tMoveTypes\x12\x1a\n\x16MOVE_TYPES_UNSPECIFIED\x10\x00\x12\x13\n\x0fMOVE_TYPES_BOOL\x10\x01\x12\x11\n\rMOVE_TYPES_U8\x10\x02\x12\x12\n\x0eMOVE_TYPES_U16\x10\x0c\x12\x12\n\x0eMOVE_TYPES_U32\x10\r\x12\x12\n\x0eMOVE_TYPES_U64\x10\x03\x12\x13\n\x0fMOVE_TYPES_U128\x10\x04\x12\x13\n\x0fMOVE_TYPES_U256\x10\x0e\x12\x16\n\x12MOVE_TYPES_ADDRESS\x10\x05\x12\x15\n\x11MOVE_TYPES_SIGNER\x10\x06\x12\x15\n\x11MOVE_TYPES_VECTOR\x10\x07\x12\x15\n\x11MOVE_TYPES_STRUCT\x10\x08\x12!\n\x1dMOVE_TYPES_GENERIC_TYPE_PARAM\x10\t\x12\x18\n\x14MOVE_TYPES_REFERENCE\x10\n\x12\x19\n\x15MOVE_TYPES_UNPARSABLE\x10\x0b*\x87\x01\n\x0bMoveAbility\x12\x1c\n\x18MOVE_ABILITY_UNSPECIFIED\x10\x00\x12\x15\n\x11MOVE_ABILITY_COPY\x10\x01\x12\x15\n\x11MOVE_ABILITY_DROP\x10\x02\x12\x16\n\x12MOVE_ABILITY_STORE\x10\x03\x12\x14\n\x10MOVE_ABILITY_KEY\x10\x04\x62\x06proto3'
+    b'\n&aptos/transaction/v1/transaction.proto\x12\x14\x61ptos.transaction.v1\x1a$aptos/util/timestamp/timestamp.proto"\x9a\x01\n\x05\x42lock\x12\x32\n\ttimestamp\x18\x01 \x01(\x0b\x32\x1f.aptos.util.timestamp.Timestamp\x12\x12\n\x06height\x18\x02 \x01(\x04\x42\x02\x30\x01\x12\x37\n\x0ctransactions\x18\x03 \x03(\x0b\x32!.aptos.transaction.v1.Transaction\x12\x10\n\x08\x63hain_id\x18\x04 \x01(\r"\xda\x07\n\x0bTransaction\x12\x32\n\ttimestamp\x18\x01 \x01(\x0b\x32\x1f.aptos.util.timestamp.Timestamp\x12\x13\n\x07version\x18\x02 \x01(\x04\x42\x02\x30\x01\x12\x33\n\x04info\x18\x03 \x01(\x0b\x32%.aptos.transaction.v1.TransactionInfo\x12\x11\n\x05\x65poch\x18\x04 \x01(\x04\x42\x02\x30\x01\x12\x18\n\x0c\x62lock_height\x18\x05 \x01(\x04\x42\x02\x30\x01\x12?\n\x04type\x18\x06 \x01(\x0e\x32\x31.aptos.transaction.v1.Transaction.TransactionType\x12H\n\x0e\x62lock_metadata\x18\x07 \x01(\x0b\x32..aptos.transaction.v1.BlockMetadataTransactionH\x00\x12;\n\x07genesis\x18\x08 \x01(\x0b\x32(.aptos.transaction.v1.GenesisTransactionH\x00\x12L\n\x10state_checkpoint\x18\t \x01(\x0b\x32\x30.aptos.transaction.v1.StateCheckpointTransactionH\x00\x12\x35\n\x04user\x18\n \x01(\x0b\x32%.aptos.transaction.v1.UserTransactionH\x00\x12?\n\tvalidator\x18\x15 \x01(\x0b\x32*.aptos.transaction.v1.ValidatorTransactionH\x00\x12H\n\x0e\x62lock_epilogue\x18\x17 \x01(\x0b\x32..aptos.transaction.v1.BlockEpilogueTransactionH\x00\x12<\n\tsize_info\x18\x16 \x01(\x0b\x32).aptos.transaction.v1.TransactionSizeInfo"\xfd\x01\n\x0fTransactionType\x12 \n\x1cTRANSACTION_TYPE_UNSPECIFIED\x10\x00\x12\x1c\n\x18TRANSACTION_TYPE_GENESIS\x10\x01\x12#\n\x1fTRANSACTION_TYPE_BLOCK_METADATA\x10\x02\x12%\n!TRANSACTION_TYPE_STATE_CHECKPOINT\x10\x03\x12\x19\n\x15TRANSACTION_TYPE_USER\x10\x04\x12\x1e\n\x1aTRANSACTION_TYPE_VALIDATOR\x10\x14\x12#\n\x1fTRANSACTION_TYPE_BLOCK_EPILOGUE\x10\x15\x42\n\n\x08txn_data"\xbe\x01\n\x18\x42lockMetadataTransaction\x12\n\n\x02id\x18\x01 \x01(\t\x12\x11\n\x05round\x18\x02 \x01(\x04\x42\x02\x30\x01\x12+\n\x06\x65vents\x18\x03 \x03(\x0b\x32\x1b.aptos.transaction.v1.Event\x12#\n\x1bprevious_block_votes_bitvec\x18\x04 \x01(\x0c\x12\x10\n\x08proposer\x18\x05 \x01(\t\x12\x1f\n\x17\x66\x61iled_proposer_indices\x18\x06 \x03(\r"r\n\x12GenesisTransaction\x12/\n\x07payload\x18\x01 \x01(\x0b\x32\x1e.aptos.transaction.v1.WriteSet\x12+\n\x06\x65vents\x18\x02 \x03(\x0b\x32\x1b.aptos.transaction.v1.Event"\x1c\n\x1aStateCheckpointTransaction"\xfa\n\n\x14ValidatorTransaction\x12[\n\x13observed_jwk_update\x18\x01 \x01(\x0b\x32<.aptos.transaction.v1.ValidatorTransaction.ObservedJwkUpdateH\x00\x12J\n\ndkg_update\x18\x02 \x01(\x0b\x32\x34.aptos.transaction.v1.ValidatorTransaction.DkgUpdateH\x00\x12+\n\x06\x65vents\x18\x03 \x03(\x0b\x32\x1b.aptos.transaction.v1.Event\x1a\xc4\x07\n\x11ObservedJwkUpdate\x12s\n\x17quorum_certified_update\x18\x01 \x01(\x0b\x32R.aptos.transaction.v1.ValidatorTransaction.ObservedJwkUpdate.QuorumCertifiedUpdate\x1a\x8d\x04\n\x14\x45xportedProviderJWKs\x12\x0e\n\x06issuer\x18\x01 \x01(\t\x12\x0f\n\x07version\x18\x02 \x01(\x04\x12\x63\n\x04jwks\x18\x03 \x03(\x0b\x32U.aptos.transaction.v1.ValidatorTransaction.ObservedJwkUpdate.ExportedProviderJWKs.JWK\x1a\xee\x02\n\x03JWK\x12\x7f\n\x0funsupported_jwk\x18\x01 \x01(\x0b\x32\x64.aptos.transaction.v1.ValidatorTransaction.ObservedJwkUpdate.ExportedProviderJWKs.JWK.UnsupportedJWKH\x00\x12h\n\x03rsa\x18\x02 \x01(\x0b\x32Y.aptos.transaction.v1.ValidatorTransaction.ObservedJwkUpdate.ExportedProviderJWKs.JWK.RSAH\x00\x1a\x42\n\x03RSA\x12\x0b\n\x03kid\x18\x01 \x01(\t\x12\x0b\n\x03kty\x18\x02 \x01(\t\x12\x0b\n\x03\x61lg\x18\x03 \x01(\t\x12\t\n\x01\x65\x18\x04 \x01(\t\x12\t\n\x01n\x18\x05 \x01(\t\x1a-\n\x0eUnsupportedJWK\x12\n\n\x02id\x18\x01 \x01(\x0c\x12\x0f\n\x07payload\x18\x02 \x01(\x0c\x42\t\n\x07JwkType\x1a\x41\n\x1a\x45xportedAggregateSignature\x12\x16\n\x0esigner_indices\x18\x01 \x03(\x04\x12\x0b\n\x03sig\x18\x02 \x01(\x0c\x1a\xe6\x01\n\x15QuorumCertifiedUpdate\x12\x61\n\x06update\x18\x01 \x01(\x0b\x32Q.aptos.transaction.v1.ValidatorTransaction.ObservedJwkUpdate.ExportedProviderJWKs\x12j\n\tmulti_sig\x18\x02 \x01(\x0b\x32W.aptos.transaction.v1.ValidatorTransaction.ObservedJwkUpdate.ExportedAggregateSignature\x1a\xa8\x01\n\tDkgUpdate\x12Z\n\x0e\x64kg_transcript\x18\x01 \x01(\x0b\x32\x42.aptos.transaction.v1.ValidatorTransaction.DkgUpdate.DkgTranscript\x1a?\n\rDkgTranscript\x12\r\n\x05\x65poch\x18\x01 \x01(\x04\x12\x0e\n\x06\x61uthor\x18\x02 \x01(\t\x12\x0f\n\x07payload\x18\x03 \x01(\x0c\x42\x1a\n\x18ValidatorTransactionType"n\n\x18\x42lockEpilogueTransaction\x12?\n\x0e\x62lock_end_info\x18\x01 \x01(\x0b\x32".aptos.transaction.v1.BlockEndInfoH\x00\x88\x01\x01\x42\x11\n\x0f_block_end_info"\x9e\x01\n\x0c\x42lockEndInfo\x12\x1f\n\x17\x62lock_gas_limit_reached\x18\x01 \x01(\x08\x12"\n\x1a\x62lock_output_limit_reached\x18\x02 \x01(\x08\x12\'\n\x1f\x62lock_effective_block_gas_units\x18\x03 \x01(\x04\x12 \n\x18\x62lock_approx_output_size\x18\x04 \x01(\x04"}\n\x0fUserTransaction\x12=\n\x07request\x18\x01 \x01(\x0b\x32,.aptos.transaction.v1.UserTransactionRequest\x12+\n\x06\x65vents\x18\x02 \x03(\x0b\x32\x1b.aptos.transaction.v1.Event"\x9f\x01\n\x05\x45vent\x12+\n\x03key\x18\x01 \x01(\x0b\x32\x1e.aptos.transaction.v1.EventKey\x12\x1b\n\x0fsequence_number\x18\x02 \x01(\x04\x42\x02\x30\x01\x12,\n\x04type\x18\x03 \x01(\x0b\x32\x1e.aptos.transaction.v1.MoveType\x12\x10\n\x08type_str\x18\x05 \x01(\t\x12\x0c\n\x04\x64\x61ta\x18\x04 \x01(\t"\xa1\x02\n\x0fTransactionInfo\x12\x0c\n\x04hash\x18\x01 \x01(\x0c\x12\x19\n\x11state_change_hash\x18\x02 \x01(\x0c\x12\x17\n\x0f\x65vent_root_hash\x18\x03 \x01(\x0c\x12"\n\x15state_checkpoint_hash\x18\x04 \x01(\x0cH\x00\x88\x01\x01\x12\x14\n\x08gas_used\x18\x05 \x01(\x04\x42\x02\x30\x01\x12\x0f\n\x07success\x18\x06 \x01(\x08\x12\x11\n\tvm_status\x18\x07 \x01(\t\x12\x1d\n\x15\x61\x63\x63umulator_root_hash\x18\x08 \x01(\x0c\x12\x35\n\x07\x63hanges\x18\t \x03(\x0b\x32$.aptos.transaction.v1.WriteSetChangeB\x18\n\x16_state_checkpoint_hash"@\n\x08\x45ventKey\x12\x1b\n\x0f\x63reation_number\x18\x01 \x01(\x04\x42\x02\x30\x01\x12\x17\n\x0f\x61\x63\x63ount_address\x18\x02 \x01(\t"\xb0\x02\n\x16UserTransactionRequest\x12\x0e\n\x06sender\x18\x01 \x01(\t\x12\x1b\n\x0fsequence_number\x18\x02 \x01(\x04\x42\x02\x30\x01\x12\x1a\n\x0emax_gas_amount\x18\x03 \x01(\x04\x42\x02\x30\x01\x12\x1a\n\x0egas_unit_price\x18\x04 \x01(\x04\x42\x02\x30\x01\x12\x42\n\x19\x65xpiration_timestamp_secs\x18\x05 \x01(\x0b\x32\x1f.aptos.util.timestamp.Timestamp\x12\x39\n\x07payload\x18\x06 \x01(\x0b\x32(.aptos.transaction.v1.TransactionPayload\x12\x32\n\tsignature\x18\x07 \x01(\x0b\x32\x1f.aptos.transaction.v1.Signature"\xda\x02\n\x08WriteSet\x12\x43\n\x0ewrite_set_type\x18\x01 \x01(\x0e\x32+.aptos.transaction.v1.WriteSet.WriteSetType\x12@\n\x10script_write_set\x18\x02 \x01(\x0b\x32$.aptos.transaction.v1.ScriptWriteSetH\x00\x12@\n\x10\x64irect_write_set\x18\x03 \x01(\x0b\x32$.aptos.transaction.v1.DirectWriteSetH\x00"x\n\x0cWriteSetType\x12\x1e\n\x1aWRITE_SET_TYPE_UNSPECIFIED\x10\x00\x12#\n\x1fWRITE_SET_TYPE_SCRIPT_WRITE_SET\x10\x01\x12#\n\x1fWRITE_SET_TYPE_DIRECT_WRITE_SET\x10\x02\x42\x0b\n\twrite_set"Y\n\x0eScriptWriteSet\x12\x12\n\nexecute_as\x18\x01 \x01(\t\x12\x33\n\x06script\x18\x02 \x01(\x0b\x32#.aptos.transaction.v1.ScriptPayload"}\n\x0e\x44irectWriteSet\x12>\n\x10write_set_change\x18\x01 \x03(\x0b\x32$.aptos.transaction.v1.WriteSetChange\x12+\n\x06\x65vents\x18\x02 \x03(\x0b\x32\x1b.aptos.transaction.v1.Event"\x89\x05\n\x0eWriteSetChange\x12\x37\n\x04type\x18\x01 \x01(\x0e\x32).aptos.transaction.v1.WriteSetChange.Type\x12;\n\rdelete_module\x18\x02 \x01(\x0b\x32".aptos.transaction.v1.DeleteModuleH\x00\x12?\n\x0f\x64\x65lete_resource\x18\x03 \x01(\x0b\x32$.aptos.transaction.v1.DeleteResourceH\x00\x12\x42\n\x11\x64\x65lete_table_item\x18\x04 \x01(\x0b\x32%.aptos.transaction.v1.DeleteTableItemH\x00\x12\x39\n\x0cwrite_module\x18\x05 \x01(\x0b\x32!.aptos.transaction.v1.WriteModuleH\x00\x12=\n\x0ewrite_resource\x18\x06 \x01(\x0b\x32#.aptos.transaction.v1.WriteResourceH\x00\x12@\n\x10write_table_item\x18\x07 \x01(\x0b\x32$.aptos.transaction.v1.WriteTableItemH\x00"\xb5\x01\n\x04Type\x12\x14\n\x10TYPE_UNSPECIFIED\x10\x00\x12\x16\n\x12TYPE_DELETE_MODULE\x10\x01\x12\x18\n\x14TYPE_DELETE_RESOURCE\x10\x02\x12\x1a\n\x16TYPE_DELETE_TABLE_ITEM\x10\x03\x12\x15\n\x11TYPE_WRITE_MODULE\x10\x04\x12\x17\n\x13TYPE_WRITE_RESOURCE\x10\x05\x12\x19\n\x15TYPE_WRITE_TABLE_ITEM\x10\x06\x42\x08\n\x06\x63hange"k\n\x0c\x44\x65leteModule\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\t\x12\x16\n\x0estate_key_hash\x18\x02 \x01(\x0c\x12\x32\n\x06module\x18\x03 \x01(\x0b\x32".aptos.transaction.v1.MoveModuleId"~\n\x0e\x44\x65leteResource\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\t\x12\x16\n\x0estate_key_hash\x18\x02 \x01(\x0c\x12\x31\n\x04type\x18\x03 \x01(\x0b\x32#.aptos.transaction.v1.MoveStructTag\x12\x10\n\x08type_str\x18\x04 \x01(\t"{\n\x0f\x44\x65leteTableItem\x12\x16\n\x0estate_key_hash\x18\x01 \x01(\x0c\x12\x0e\n\x06handle\x18\x02 \x01(\t\x12\x0b\n\x03key\x18\x03 \x01(\t\x12\x33\n\x04\x64\x61ta\x18\x04 \x01(\x0b\x32%.aptos.transaction.v1.DeleteTableData"0\n\x0f\x44\x65leteTableData\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x10\n\x08key_type\x18\x02 \x01(\t"n\n\x0bWriteModule\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\t\x12\x16\n\x0estate_key_hash\x18\x02 \x01(\x0c\x12\x36\n\x04\x64\x61ta\x18\x03 \x01(\x0b\x32(.aptos.transaction.v1.MoveModuleBytecode"\x8b\x01\n\rWriteResource\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\t\x12\x16\n\x0estate_key_hash\x18\x02 \x01(\x0c\x12\x31\n\x04type\x18\x03 \x01(\x0b\x32#.aptos.transaction.v1.MoveStructTag\x12\x10\n\x08type_str\x18\x04 \x01(\t\x12\x0c\n\x04\x64\x61ta\x18\x05 \x01(\t"R\n\x0eWriteTableData\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x10\n\x08key_type\x18\x02 \x01(\t\x12\r\n\x05value\x18\x03 \x01(\t\x12\x12\n\nvalue_type\x18\x04 \x01(\t"y\n\x0eWriteTableItem\x12\x16\n\x0estate_key_hash\x18\x01 \x01(\x0c\x12\x0e\n\x06handle\x18\x02 \x01(\t\x12\x0b\n\x03key\x18\x03 \x01(\t\x12\x32\n\x04\x64\x61ta\x18\x04 \x01(\x0b\x32$.aptos.transaction.v1.WriteTableData"\x8c\x04\n\x12TransactionPayload\x12;\n\x04type\x18\x01 \x01(\x0e\x32-.aptos.transaction.v1.TransactionPayload.Type\x12L\n\x16\x65ntry_function_payload\x18\x02 \x01(\x0b\x32*.aptos.transaction.v1.EntryFunctionPayloadH\x00\x12=\n\x0escript_payload\x18\x03 \x01(\x0b\x32#.aptos.transaction.v1.ScriptPayloadH\x00\x12\x42\n\x11write_set_payload\x18\x05 \x01(\x0b\x32%.aptos.transaction.v1.WriteSetPayloadH\x00\x12\x41\n\x10multisig_payload\x18\x06 \x01(\x0b\x32%.aptos.transaction.v1.MultisigPayloadH\x00"\x93\x01\n\x04Type\x12\x14\n\x10TYPE_UNSPECIFIED\x10\x00\x12\x1f\n\x1bTYPE_ENTRY_FUNCTION_PAYLOAD\x10\x01\x12\x17\n\x13TYPE_SCRIPT_PAYLOAD\x10\x02\x12\x1a\n\x16TYPE_WRITE_SET_PAYLOAD\x10\x04\x12\x19\n\x15TYPE_MULTISIG_PAYLOAD\x10\x05"\x04\x08\x03\x10\x03\x42\t\n\x07payloadJ\x04\x08\x04\x10\x05"\xb9\x01\n\x14\x45ntryFunctionPayload\x12\x37\n\x08\x66unction\x18\x01 \x01(\x0b\x32%.aptos.transaction.v1.EntryFunctionId\x12\x36\n\x0etype_arguments\x18\x02 \x03(\x0b\x32\x1e.aptos.transaction.v1.MoveType\x12\x11\n\targuments\x18\x03 \x03(\t\x12\x1d\n\x15\x65ntry_function_id_str\x18\x04 \x01(\t"W\n\x12MoveScriptBytecode\x12\x10\n\x08\x62ytecode\x18\x01 \x01(\x0c\x12/\n\x03\x61\x62i\x18\x02 \x01(\x0b\x32".aptos.transaction.v1.MoveFunction"\x92\x01\n\rScriptPayload\x12\x36\n\x04\x63ode\x18\x01 \x01(\x0b\x32(.aptos.transaction.v1.MoveScriptBytecode\x12\x36\n\x0etype_arguments\x18\x02 \x03(\x0b\x32\x1e.aptos.transaction.v1.MoveType\x12\x11\n\targuments\x18\x03 \x03(\t"\x97\x01\n\x0fMultisigPayload\x12\x18\n\x10multisig_address\x18\x01 \x01(\t\x12R\n\x13transaction_payload\x18\x02 \x01(\x0b\x32\x30.aptos.transaction.v1.MultisigTransactionPayloadH\x00\x88\x01\x01\x42\x16\n\x14_transaction_payload"\xf9\x01\n\x1aMultisigTransactionPayload\x12\x43\n\x04type\x18\x01 \x01(\x0e\x32\x35.aptos.transaction.v1.MultisigTransactionPayload.Type\x12L\n\x16\x65ntry_function_payload\x18\x02 \x01(\x0b\x32*.aptos.transaction.v1.EntryFunctionPayloadH\x00"=\n\x04Type\x12\x14\n\x10TYPE_UNSPECIFIED\x10\x00\x12\x1f\n\x1bTYPE_ENTRY_FUNCTION_PAYLOAD\x10\x01\x42\t\n\x07payload"U\n\x12MoveModuleBytecode\x12\x10\n\x08\x62ytecode\x18\x01 \x01(\x0c\x12-\n\x03\x61\x62i\x18\x02 \x01(\x0b\x32 .aptos.transaction.v1.MoveModule"\xd2\x01\n\nMoveModule\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\t\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x33\n\x07\x66riends\x18\x03 \x03(\x0b\x32".aptos.transaction.v1.MoveModuleId\x12=\n\x11\x65xposed_functions\x18\x04 \x03(\x0b\x32".aptos.transaction.v1.MoveFunction\x12\x31\n\x07structs\x18\x05 \x03(\x0b\x32 .aptos.transaction.v1.MoveStruct"\x92\x03\n\x0cMoveFunction\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x41\n\nvisibility\x18\x02 \x01(\x0e\x32-.aptos.transaction.v1.MoveFunction.Visibility\x12\x10\n\x08is_entry\x18\x03 \x01(\x08\x12O\n\x13generic_type_params\x18\x04 \x03(\x0b\x32\x32.aptos.transaction.v1.MoveFunctionGenericTypeParam\x12.\n\x06params\x18\x05 \x03(\x0b\x32\x1e.aptos.transaction.v1.MoveType\x12.\n\x06return\x18\x06 \x03(\x0b\x32\x1e.aptos.transaction.v1.MoveType"n\n\nVisibility\x12\x1a\n\x16VISIBILITY_UNSPECIFIED\x10\x00\x12\x16\n\x12VISIBILITY_PRIVATE\x10\x01\x12\x15\n\x11VISIBILITY_PUBLIC\x10\x02\x12\x15\n\x11VISIBILITY_FRIEND\x10\x03"\xfb\x01\n\nMoveStruct\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x11\n\tis_native\x18\x02 \x01(\x08\x12\x10\n\x08is_event\x18\x06 \x01(\x08\x12\x34\n\tabilities\x18\x03 \x03(\x0e\x32!.aptos.transaction.v1.MoveAbility\x12M\n\x13generic_type_params\x18\x04 \x03(\x0b\x32\x30.aptos.transaction.v1.MoveStructGenericTypeParam\x12\x35\n\x06\x66ields\x18\x05 \x03(\x0b\x32%.aptos.transaction.v1.MoveStructField"h\n\x1aMoveStructGenericTypeParam\x12\x36\n\x0b\x63onstraints\x18\x01 \x03(\x0e\x32!.aptos.transaction.v1.MoveAbility\x12\x12\n\nis_phantom\x18\x02 \x01(\x08"M\n\x0fMoveStructField\x12\x0c\n\x04name\x18\x01 \x01(\t\x12,\n\x04type\x18\x02 \x01(\x0b\x32\x1e.aptos.transaction.v1.MoveType"V\n\x1cMoveFunctionGenericTypeParam\x12\x36\n\x0b\x63onstraints\x18\x01 \x03(\x0e\x32!.aptos.transaction.v1.MoveAbility"\xf8\x02\n\x08MoveType\x12-\n\x04type\x18\x01 \x01(\x0e\x32\x1f.aptos.transaction.v1.MoveTypes\x12\x30\n\x06vector\x18\x03 \x01(\x0b\x32\x1e.aptos.transaction.v1.MoveTypeH\x00\x12\x35\n\x06struct\x18\x04 \x01(\x0b\x32#.aptos.transaction.v1.MoveStructTagH\x00\x12"\n\x18generic_type_param_index\x18\x05 \x01(\rH\x00\x12\x41\n\treference\x18\x06 \x01(\x0b\x32,.aptos.transaction.v1.MoveType.ReferenceTypeH\x00\x12\x14\n\nunparsable\x18\x07 \x01(\tH\x00\x1aL\n\rReferenceType\x12\x0f\n\x07mutable\x18\x01 \x01(\x08\x12*\n\x02to\x18\x02 \x01(\x0b\x32\x1e.aptos.transaction.v1.MoveTypeB\t\n\x07\x63ontent"D\n\x0fWriteSetPayload\x12\x31\n\twrite_set\x18\x01 \x01(\x0b\x32\x1e.aptos.transaction.v1.WriteSet"S\n\x0f\x45ntryFunctionId\x12\x32\n\x06module\x18\x01 \x01(\x0b\x32".aptos.transaction.v1.MoveModuleId\x12\x0c\n\x04name\x18\x02 \x01(\t"-\n\x0cMoveModuleId\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\t\x12\x0c\n\x04name\x18\x02 \x01(\t"{\n\rMoveStructTag\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\t\x12\x0e\n\x06module\x18\x02 \x01(\t\x12\x0c\n\x04name\x18\x03 \x01(\t\x12;\n\x13generic_type_params\x18\x04 \x03(\x0b\x32\x1e.aptos.transaction.v1.MoveType"\x9b\x04\n\tSignature\x12\x32\n\x04type\x18\x01 \x01(\x0e\x32$.aptos.transaction.v1.Signature.Type\x12\x39\n\x07\x65\x64\x32\x35\x35\x31\x39\x18\x02 \x01(\x0b\x32&.aptos.transaction.v1.Ed25519SignatureH\x00\x12\x44\n\rmulti_ed25519\x18\x03 \x01(\x0b\x32+.aptos.transaction.v1.MultiEd25519SignatureH\x00\x12@\n\x0bmulti_agent\x18\x04 \x01(\x0b\x32).aptos.transaction.v1.MultiAgentSignatureH\x00\x12<\n\tfee_payer\x18\x05 \x01(\x0b\x32\'.aptos.transaction.v1.FeePayerSignatureH\x00\x12;\n\rsingle_sender\x18\x07 \x01(\x0b\x32".aptos.transaction.v1.SingleSenderH\x00"\x8e\x01\n\x04Type\x12\x14\n\x10TYPE_UNSPECIFIED\x10\x00\x12\x10\n\x0cTYPE_ED25519\x10\x01\x12\x16\n\x12TYPE_MULTI_ED25519\x10\x02\x12\x14\n\x10TYPE_MULTI_AGENT\x10\x03\x12\x12\n\x0eTYPE_FEE_PAYER\x10\x04\x12\x16\n\x12TYPE_SINGLE_SENDER\x10\x06"\x04\x08\x05\x10\x05\x42\x0b\n\tsignature"9\n\x10\x45\x64\x32\x35\x35\x31\x39Signature\x12\x12\n\npublic_key\x18\x01 \x01(\x0c\x12\x11\n\tsignature\x18\x02 \x01(\x0c"o\n\x15MultiEd25519Signature\x12\x13\n\x0bpublic_keys\x18\x01 \x03(\x0c\x12\x12\n\nsignatures\x18\x02 \x03(\x0c\x12\x11\n\tthreshold\x18\x03 \x01(\r\x12\x1a\n\x12public_key_indices\x18\x04 \x03(\r"\xb4\x01\n\x13MultiAgentSignature\x12\x36\n\x06sender\x18\x01 \x01(\x0b\x32&.aptos.transaction.v1.AccountSignature\x12"\n\x1asecondary_signer_addresses\x18\x02 \x03(\t\x12\x41\n\x11secondary_signers\x18\x03 \x03(\x0b\x32&.aptos.transaction.v1.AccountSignature"\x8f\x02\n\x11\x46\x65\x65PayerSignature\x12\x36\n\x06sender\x18\x01 \x01(\x0b\x32&.aptos.transaction.v1.AccountSignature\x12"\n\x1asecondary_signer_addresses\x18\x02 \x03(\t\x12\x41\n\x11secondary_signers\x18\x03 \x03(\x0b\x32&.aptos.transaction.v1.AccountSignature\x12\x19\n\x11\x66\x65\x65_payer_address\x18\x04 \x01(\t\x12@\n\x10\x66\x65\x65_payer_signer\x18\x05 \x01(\x0b\x32&.aptos.transaction.v1.AccountSignature"\xcf\x01\n\x0c\x41nyPublicKey\x12\x35\n\x04type\x18\x01 \x01(\x0e\x32\'.aptos.transaction.v1.AnyPublicKey.Type\x12\x12\n\npublic_key\x18\x02 \x01(\x0c"t\n\x04Type\x12\x14\n\x10TYPE_UNSPECIFIED\x10\x00\x12\x10\n\x0cTYPE_ED25519\x10\x01\x12\x18\n\x14TYPE_SECP256K1_ECDSA\x10\x02\x12\x18\n\x14TYPE_SECP256R1_ECDSA\x10\x03\x12\x10\n\x0cTYPE_KEYLESS\x10\x04"\xb9\x03\n\x0c\x41nySignature\x12\x35\n\x04type\x18\x01 \x01(\x0e\x32\'.aptos.transaction.v1.AnySignature.Type\x12\x15\n\tsignature\x18\x02 \x01(\x0c\x42\x02\x18\x01\x12\x30\n\x07\x65\x64\x32\x35\x35\x31\x39\x18\x03 \x01(\x0b\x32\x1d.aptos.transaction.v1.Ed25519H\x00\x12?\n\x0fsecp256k1_ecdsa\x18\x04 \x01(\x0b\x32$.aptos.transaction.v1.Secp256k1EcdsaH\x00\x12\x32\n\x08webauthn\x18\x05 \x01(\x0b\x32\x1e.aptos.transaction.v1.WebAuthnH\x00\x12\x30\n\x07keyless\x18\x06 \x01(\x0b\x32\x1d.aptos.transaction.v1.KeylessH\x00"m\n\x04Type\x12\x14\n\x10TYPE_UNSPECIFIED\x10\x00\x12\x10\n\x0cTYPE_ED25519\x10\x01\x12\x18\n\x14TYPE_SECP256K1_ECDSA\x10\x02\x12\x11\n\rTYPE_WEBAUTHN\x10\x03\x12\x10\n\x0cTYPE_KEYLESS\x10\x04\x42\x13\n\x11signature_variant"\x1c\n\x07\x45\x64\x32\x35\x35\x31\x39\x12\x11\n\tsignature\x18\x01 \x01(\x0c"#\n\x0eSecp256k1Ecdsa\x12\x11\n\tsignature\x18\x01 \x01(\x0c"\x1d\n\x08WebAuthn\x12\x11\n\tsignature\x18\x01 \x01(\x0c"\x1c\n\x07Keyless\x12\x11\n\tsignature\x18\x01 \x01(\x0c"\x83\x01\n\x12SingleKeySignature\x12\x36\n\npublic_key\x18\x01 \x01(\x0b\x32".aptos.transaction.v1.AnyPublicKey\x12\x35\n\tsignature\x18\x02 \x01(\x0b\x32".aptos.transaction.v1.AnySignature"X\n\x10IndexedSignature\x12\r\n\x05index\x18\x01 \x01(\r\x12\x35\n\tsignature\x18\x02 \x01(\x0b\x32".aptos.transaction.v1.AnySignature"\xa5\x01\n\x11MultiKeySignature\x12\x37\n\x0bpublic_keys\x18\x01 \x03(\x0b\x32".aptos.transaction.v1.AnyPublicKey\x12:\n\nsignatures\x18\x02 \x03(\x0b\x32&.aptos.transaction.v1.IndexedSignature\x12\x1b\n\x13signatures_required\x18\x03 \x01(\r"F\n\x0cSingleSender\x12\x36\n\x06sender\x18\x01 \x01(\x0b\x32&.aptos.transaction.v1.AccountSignature"\xe4\x03\n\x10\x41\x63\x63ountSignature\x12\x39\n\x04type\x18\x01 \x01(\x0e\x32+.aptos.transaction.v1.AccountSignature.Type\x12\x39\n\x07\x65\x64\x32\x35\x35\x31\x39\x18\x02 \x01(\x0b\x32&.aptos.transaction.v1.Ed25519SignatureH\x00\x12\x44\n\rmulti_ed25519\x18\x03 \x01(\x0b\x32+.aptos.transaction.v1.MultiEd25519SignatureH\x00\x12H\n\x14single_key_signature\x18\x05 \x01(\x0b\x32(.aptos.transaction.v1.SingleKeySignatureH\x00\x12\x46\n\x13multi_key_signature\x18\x06 \x01(\x0b\x32\'.aptos.transaction.v1.MultiKeySignatureH\x00"u\n\x04Type\x12\x14\n\x10TYPE_UNSPECIFIED\x10\x00\x12\x10\n\x0cTYPE_ED25519\x10\x01\x12\x16\n\x12TYPE_MULTI_ED25519\x10\x02\x12\x13\n\x0fTYPE_SINGLE_KEY\x10\x04\x12\x12\n\x0eTYPE_MULTI_KEY\x10\x05"\x04\x08\x03\x10\x03\x42\x0b\n\tsignature"\xb1\x01\n\x13TransactionSizeInfo\x12\x19\n\x11transaction_bytes\x18\x01 \x01(\r\x12<\n\x0f\x65vent_size_info\x18\x02 \x03(\x0b\x32#.aptos.transaction.v1.EventSizeInfo\x12\x41\n\x12write_op_size_info\x18\x03 \x03(\x0b\x32%.aptos.transaction.v1.WriteOpSizeInfo"<\n\rEventSizeInfo\x12\x16\n\x0etype_tag_bytes\x18\x01 \x01(\r\x12\x13\n\x0btotal_bytes\x18\x02 \x01(\r"9\n\x0fWriteOpSizeInfo\x12\x11\n\tkey_bytes\x18\x01 \x01(\r\x12\x13\n\x0bvalue_bytes\x18\x02 \x01(\r*\xea\x02\n\tMoveTypes\x12\x1a\n\x16MOVE_TYPES_UNSPECIFIED\x10\x00\x12\x13\n\x0fMOVE_TYPES_BOOL\x10\x01\x12\x11\n\rMOVE_TYPES_U8\x10\x02\x12\x12\n\x0eMOVE_TYPES_U16\x10\x0c\x12\x12\n\x0eMOVE_TYPES_U32\x10\r\x12\x12\n\x0eMOVE_TYPES_U64\x10\x03\x12\x13\n\x0fMOVE_TYPES_U128\x10\x04\x12\x13\n\x0fMOVE_TYPES_U256\x10\x0e\x12\x16\n\x12MOVE_TYPES_ADDRESS\x10\x05\x12\x15\n\x11MOVE_TYPES_SIGNER\x10\x06\x12\x15\n\x11MOVE_TYPES_VECTOR\x10\x07\x12\x15\n\x11MOVE_TYPES_STRUCT\x10\x08\x12!\n\x1dMOVE_TYPES_GENERIC_TYPE_PARAM\x10\t\x12\x18\n\x14MOVE_TYPES_REFERENCE\x10\n\x12\x19\n\x15MOVE_TYPES_UNPARSABLE\x10\x0b*\x87\x01\n\x0bMoveAbility\x12\x1c\n\x18MOVE_ABILITY_UNSPECIFIED\x10\x00\x12\x15\n\x11MOVE_ABILITY_COPY\x10\x01\x12\x15\n\x11MOVE_ABILITY_DROP\x10\x02\x12\x16\n\x12MOVE_ABILITY_STORE\x10\x03\x12\x14\n\x10MOVE_ABILITY_KEY\x10\x04\x62\x06proto3'
 )
 
 _globals = globals()
@@ -57,150 +57,196 @@
     ]._serialized_options = b"0\001"
     _ANYSIGNATURE.fields_by_name["signature"]._options = None
     _ANYSIGNATURE.fields_by_name["signature"]._serialized_options = b"\030\001"
-    _globals["_MOVETYPES"]._serialized_start = 11031
-    _globals["_MOVETYPES"]._serialized_end = 11393
-    _globals["_MOVEABILITY"]._serialized_start = 11396
-    _globals["_MOVEABILITY"]._serialized_end = 11531
+    _globals["_MOVETYPES"]._serialized_start = 12814
+    _globals["_MOVETYPES"]._serialized_end = 13176
+    _globals["_MOVEABILITY"]._serialized_start = 13179
+    _globals["_MOVEABILITY"]._serialized_end = 13314
     _globals["_BLOCK"]._serialized_start = 103
     _globals["_BLOCK"]._serialized_end = 257
     _globals["_TRANSACTION"]._serialized_start = 260
-    _globals["_TRANSACTION"]._serialized_end = 1135
-    _globals["_TRANSACTION_TRANSACTIONTYPE"]._serialized_start = 907
-    _globals["_TRANSACTION_TRANSACTIONTYPE"]._serialized_end = 1123
-    _globals["_BLOCKMETADATATRANSACTION"]._serialized_start = 1138
-    _globals["_BLOCKMETADATATRANSACTION"]._serialized_end = 1328
-    _globals["_GENESISTRANSACTION"]._serialized_start = 1330
-    _globals["_GENESISTRANSACTION"]._serialized_end = 1444
-    _globals["_STATECHECKPOINTTRANSACTION"]._serialized_start = 1446
-    _globals["_STATECHECKPOINTTRANSACTION"]._serialized_end = 1474
-    _globals["_VALIDATORTRANSACTION"]._serialized_start = 1476
-    _globals["_VALIDATORTRANSACTION"]._serialized_end = 1498
-    _globals["_USERTRANSACTION"]._serialized_start = 1500
-    _globals["_USERTRANSACTION"]._serialized_end = 1625
-    _globals["_EVENT"]._serialized_start = 1628
-    _globals["_EVENT"]._serialized_end = 1787
-    _globals["_TRANSACTIONINFO"]._serialized_start = 1790
-    _globals["_TRANSACTIONINFO"]._serialized_end = 2079
-    _globals["_EVENTKEY"]._serialized_start = 2081
-    _globals["_EVENTKEY"]._serialized_end = 2145
-    _globals["_USERTRANSACTIONREQUEST"]._serialized_start = 2148
-    _globals["_USERTRANSACTIONREQUEST"]._serialized_end = 2452
-    _globals["_WRITESET"]._serialized_start = 2455
-    _globals["_WRITESET"]._serialized_end = 2801
-    _globals["_WRITESET_WRITESETTYPE"]._serialized_start = 2668
-    _globals["_WRITESET_WRITESETTYPE"]._serialized_end = 2788
-    _globals["_SCRIPTWRITESET"]._serialized_start = 2803
-    _globals["_SCRIPTWRITESET"]._serialized_end = 2892
-    _globals["_DIRECTWRITESET"]._serialized_start = 2894
-    _globals["_DIRECTWRITESET"]._serialized_end = 3019
-    _globals["_WRITESETCHANGE"]._serialized_start = 3022
-    _globals["_WRITESETCHANGE"]._serialized_end = 3671
-    _globals["_WRITESETCHANGE_TYPE"]._serialized_start = 3480
-    _globals["_WRITESETCHANGE_TYPE"]._serialized_end = 3661
-    _globals["_DELETEMODULE"]._serialized_start = 3673
-    _globals["_DELETEMODULE"]._serialized_end = 3780
-    _globals["_DELETERESOURCE"]._serialized_start = 3782
-    _globals["_DELETERESOURCE"]._serialized_end = 3908
-    _globals["_DELETETABLEITEM"]._serialized_start = 3910
-    _globals["_DELETETABLEITEM"]._serialized_end = 4033
-    _globals["_DELETETABLEDATA"]._serialized_start = 4035
-    _globals["_DELETETABLEDATA"]._serialized_end = 4083
-    _globals["_WRITEMODULE"]._serialized_start = 4085
-    _globals["_WRITEMODULE"]._serialized_end = 4195
-    _globals["_WRITERESOURCE"]._serialized_start = 4198
-    _globals["_WRITERESOURCE"]._serialized_end = 4337
-    _globals["_WRITETABLEDATA"]._serialized_start = 4339
-    _globals["_WRITETABLEDATA"]._serialized_end = 4421
-    _globals["_WRITETABLEITEM"]._serialized_start = 4423
-    _globals["_WRITETABLEITEM"]._serialized_end = 4544
-    _globals["_TRANSACTIONPAYLOAD"]._serialized_start = 4547
-    _globals["_TRANSACTIONPAYLOAD"]._serialized_end = 5071
-    _globals["_TRANSACTIONPAYLOAD_TYPE"]._serialized_start = 4907
-    _globals["_TRANSACTIONPAYLOAD_TYPE"]._serialized_end = 5054
-    _globals["_ENTRYFUNCTIONPAYLOAD"]._serialized_start = 5074
-    _globals["_ENTRYFUNCTIONPAYLOAD"]._serialized_end = 5259
-    _globals["_MOVESCRIPTBYTECODE"]._serialized_start = 5261
-    _globals["_MOVESCRIPTBYTECODE"]._serialized_end = 5348
-    _globals["_SCRIPTPAYLOAD"]._serialized_start = 5351
-    _globals["_SCRIPTPAYLOAD"]._serialized_end = 5497
-    _globals["_MULTISIGPAYLOAD"]._serialized_start = 5500
-    _globals["_MULTISIGPAYLOAD"]._serialized_end = 5651
-    _globals["_MULTISIGTRANSACTIONPAYLOAD"]._serialized_start = 5654
-    _globals["_MULTISIGTRANSACTIONPAYLOAD"]._serialized_end = 5903
-    _globals["_MULTISIGTRANSACTIONPAYLOAD_TYPE"]._serialized_start = 4907
-    _globals["_MULTISIGTRANSACTIONPAYLOAD_TYPE"]._serialized_end = 4968
-    _globals["_MOVEMODULEBYTECODE"]._serialized_start = 5905
-    _globals["_MOVEMODULEBYTECODE"]._serialized_end = 5990
-    _globals["_MOVEMODULE"]._serialized_start = 5993
-    _globals["_MOVEMODULE"]._serialized_end = 6203
-    _globals["_MOVEFUNCTION"]._serialized_start = 6206
-    _globals["_MOVEFUNCTION"]._serialized_end = 6608
-    _globals["_MOVEFUNCTION_VISIBILITY"]._serialized_start = 6498
-    _globals["_MOVEFUNCTION_VISIBILITY"]._serialized_end = 6608
-    _globals["_MOVESTRUCT"]._serialized_start = 6611
-    _globals["_MOVESTRUCT"]._serialized_end = 6844
-    _globals["_MOVESTRUCTGENERICTYPEPARAM"]._serialized_start = 6846
-    _globals["_MOVESTRUCTGENERICTYPEPARAM"]._serialized_end = 6950
-    _globals["_MOVESTRUCTFIELD"]._serialized_start = 6952
-    _globals["_MOVESTRUCTFIELD"]._serialized_end = 7029
-    _globals["_MOVEFUNCTIONGENERICTYPEPARAM"]._serialized_start = 7031
-    _globals["_MOVEFUNCTIONGENERICTYPEPARAM"]._serialized_end = 7117
-    _globals["_MOVETYPE"]._serialized_start = 7120
-    _globals["_MOVETYPE"]._serialized_end = 7496
-    _globals["_MOVETYPE_REFERENCETYPE"]._serialized_start = 7409
-    _globals["_MOVETYPE_REFERENCETYPE"]._serialized_end = 7485
-    _globals["_WRITESETPAYLOAD"]._serialized_start = 7498
-    _globals["_WRITESETPAYLOAD"]._serialized_end = 7566
-    _globals["_ENTRYFUNCTIONID"]._serialized_start = 7568
-    _globals["_ENTRYFUNCTIONID"]._serialized_end = 7651
-    _globals["_MOVEMODULEID"]._serialized_start = 7653
-    _globals["_MOVEMODULEID"]._serialized_end = 7698
-    _globals["_MOVESTRUCTTAG"]._serialized_start = 7700
-    _globals["_MOVESTRUCTTAG"]._serialized_end = 7823
-    _globals["_SIGNATURE"]._serialized_start = 7826
-    _globals["_SIGNATURE"]._serialized_end = 8365
-    _globals["_SIGNATURE_TYPE"]._serialized_start = 8210
-    _globals["_SIGNATURE_TYPE"]._serialized_end = 8352
-    _globals["_ED25519SIGNATURE"]._serialized_start = 8367
-    _globals["_ED25519SIGNATURE"]._serialized_end = 8424
-    _globals["_MULTIED25519SIGNATURE"]._serialized_start = 8426
-    _globals["_MULTIED25519SIGNATURE"]._serialized_end = 8537
-    _globals["_MULTIAGENTSIGNATURE"]._serialized_start = 8540
-    _globals["_MULTIAGENTSIGNATURE"]._serialized_end = 8720
-    _globals["_FEEPAYERSIGNATURE"]._serialized_start = 8723
-    _globals["_FEEPAYERSIGNATURE"]._serialized_end = 8994
-    _globals["_ANYPUBLICKEY"]._serialized_start = 8997
-    _globals["_ANYPUBLICKEY"]._serialized_end = 9204
-    _globals["_ANYPUBLICKEY_TYPE"]._serialized_start = 9088
-    _globals["_ANYPUBLICKEY_TYPE"]._serialized_end = 9204
-    _globals["_ANYSIGNATURE"]._serialized_start = 9207
-    _globals["_ANYSIGNATURE"]._serialized_end = 9648
-    _globals["_ANYSIGNATURE_TYPE"]._serialized_start = 9518
-    _globals["_ANYSIGNATURE_TYPE"]._serialized_end = 9627
-    _globals["_ED25519"]._serialized_start = 9650
-    _globals["_ED25519"]._serialized_end = 9678
-    _globals["_SECP256K1ECDSA"]._serialized_start = 9680
-    _globals["_SECP256K1ECDSA"]._serialized_end = 9715
-    _globals["_WEBAUTHN"]._serialized_start = 9717
-    _globals["_WEBAUTHN"]._serialized_end = 9746
-    _globals["_KEYLESS"]._serialized_start = 9748
-    _globals["_KEYLESS"]._serialized_end = 9776
-    _globals["_SINGLEKEYSIGNATURE"]._serialized_start = 9779
-    _globals["_SINGLEKEYSIGNATURE"]._serialized_end = 9910
-    _globals["_INDEXEDSIGNATURE"]._serialized_start = 9912
-    _globals["_INDEXEDSIGNATURE"]._serialized_end = 10000
-    _globals["_MULTIKEYSIGNATURE"]._serialized_start = 10003
-    _globals["_MULTIKEYSIGNATURE"]._serialized_end = 10168
-    _globals["_SINGLESENDER"]._serialized_start = 10170
-    _globals["_SINGLESENDER"]._serialized_end = 10240
-    _globals["_ACCOUNTSIGNATURE"]._serialized_start = 10243
-    _globals["_ACCOUNTSIGNATURE"]._serialized_end = 10727
-    _globals["_ACCOUNTSIGNATURE_TYPE"]._serialized_start = 10597
-    _globals["_ACCOUNTSIGNATURE_TYPE"]._serialized_end = 10714
-    _globals["_TRANSACTIONSIZEINFO"]._serialized_start = 10730
-    _globals["_TRANSACTIONSIZEINFO"]._serialized_end = 10907
-    _globals["_EVENTSIZEINFO"]._serialized_start = 10909
-    _globals["_EVENTSIZEINFO"]._serialized_end = 10969
-    _globals["_WRITEOPSIZEINFO"]._serialized_start = 10971
-    _globals["_WRITEOPSIZEINFO"]._serialized_end = 11028
+    _globals["_TRANSACTION"]._serialized_end = 1246
+    _globals["_TRANSACTION_TRANSACTIONTYPE"]._serialized_start = 981
+    _globals["_TRANSACTION_TRANSACTIONTYPE"]._serialized_end = 1234
+    _globals["_BLOCKMETADATATRANSACTION"]._serialized_start = 1249
+    _globals["_BLOCKMETADATATRANSACTION"]._serialized_end = 1439
+    _globals["_GENESISTRANSACTION"]._serialized_start = 1441
+    _globals["_GENESISTRANSACTION"]._serialized_end = 1555
+    _globals["_STATECHECKPOINTTRANSACTION"]._serialized_start = 1557
+    _globals["_STATECHECKPOINTTRANSACTION"]._serialized_end = 1585
+    _globals["_VALIDATORTRANSACTION"]._serialized_start = 1588
+    _globals["_VALIDATORTRANSACTION"]._serialized_end = 2990
+    _globals["_VALIDATORTRANSACTION_OBSERVEDJWKUPDATE"]._serialized_start = 1827
+    _globals["_VALIDATORTRANSACTION_OBSERVEDJWKUPDATE"]._serialized_end = 2791
+    _globals[
+        "_VALIDATORTRANSACTION_OBSERVEDJWKUPDATE_EXPORTEDPROVIDERJWKS"
+    ]._serialized_start = 1966
+    _globals[
+        "_VALIDATORTRANSACTION_OBSERVEDJWKUPDATE_EXPORTEDPROVIDERJWKS"
+    ]._serialized_end = 2491
+    _globals[
+        "_VALIDATORTRANSACTION_OBSERVEDJWKUPDATE_EXPORTEDPROVIDERJWKS_JWK"
+    ]._serialized_start = 2125
+    _globals[
+        "_VALIDATORTRANSACTION_OBSERVEDJWKUPDATE_EXPORTEDPROVIDERJWKS_JWK"
+    ]._serialized_end = 2491
+    _globals[
+        "_VALIDATORTRANSACTION_OBSERVEDJWKUPDATE_EXPORTEDPROVIDERJWKS_JWK_RSA"
+    ]._serialized_start = 2367
+    _globals[
+        "_VALIDATORTRANSACTION_OBSERVEDJWKUPDATE_EXPORTEDPROVIDERJWKS_JWK_RSA"
+    ]._serialized_end = 2433
+    _globals[
+        "_VALIDATORTRANSACTION_OBSERVEDJWKUPDATE_EXPORTEDPROVIDERJWKS_JWK_UNSUPPORTEDJWK"
+    ]._serialized_start = 2435
+    _globals[
+        "_VALIDATORTRANSACTION_OBSERVEDJWKUPDATE_EXPORTEDPROVIDERJWKS_JWK_UNSUPPORTEDJWK"
+    ]._serialized_end = 2480
+    _globals[
+        "_VALIDATORTRANSACTION_OBSERVEDJWKUPDATE_EXPORTEDAGGREGATESIGNATURE"
+    ]._serialized_start = 2493
+    _globals[
+        "_VALIDATORTRANSACTION_OBSERVEDJWKUPDATE_EXPORTEDAGGREGATESIGNATURE"
+    ]._serialized_end = 2558
+    _globals[
+        "_VALIDATORTRANSACTION_OBSERVEDJWKUPDATE_QUORUMCERTIFIEDUPDATE"
+    ]._serialized_start = 2561
+    _globals[
+        "_VALIDATORTRANSACTION_OBSERVEDJWKUPDATE_QUORUMCERTIFIEDUPDATE"
+    ]._serialized_end = 2791
+    _globals["_VALIDATORTRANSACTION_DKGUPDATE"]._serialized_start = 2794
+    _globals["_VALIDATORTRANSACTION_DKGUPDATE"]._serialized_end = 2962
+    _globals["_VALIDATORTRANSACTION_DKGUPDATE_DKGTRANSCRIPT"]._serialized_start = 2899
+    _globals["_VALIDATORTRANSACTION_DKGUPDATE_DKGTRANSCRIPT"]._serialized_end = 2962
+    _globals["_BLOCKEPILOGUETRANSACTION"]._serialized_start = 2992
+    _globals["_BLOCKEPILOGUETRANSACTION"]._serialized_end = 3102
+    _globals["_BLOCKENDINFO"]._serialized_start = 3105
+    _globals["_BLOCKENDINFO"]._serialized_end = 3263
+    _globals["_USERTRANSACTION"]._serialized_start = 3265
+    _globals["_USERTRANSACTION"]._serialized_end = 3390
+    _globals["_EVENT"]._serialized_start = 3393
+    _globals["_EVENT"]._serialized_end = 3552
+    _globals["_TRANSACTIONINFO"]._serialized_start = 3555
+    _globals["_TRANSACTIONINFO"]._serialized_end = 3844
+    _globals["_EVENTKEY"]._serialized_start = 3846
+    _globals["_EVENTKEY"]._serialized_end = 3910
+    _globals["_USERTRANSACTIONREQUEST"]._serialized_start = 3913
+    _globals["_USERTRANSACTIONREQUEST"]._serialized_end = 4217
+    _globals["_WRITESET"]._serialized_start = 4220
+    _globals["_WRITESET"]._serialized_end = 4566
+    _globals["_WRITESET_WRITESETTYPE"]._serialized_start = 4433
+    _globals["_WRITESET_WRITESETTYPE"]._serialized_end = 4553
+    _globals["_SCRIPTWRITESET"]._serialized_start = 4568
+    _globals["_SCRIPTWRITESET"]._serialized_end = 4657
+    _globals["_DIRECTWRITESET"]._serialized_start = 4659
+    _globals["_DIRECTWRITESET"]._serialized_end = 4784
+    _globals["_WRITESETCHANGE"]._serialized_start = 4787
+    _globals["_WRITESETCHANGE"]._serialized_end = 5436
+    _globals["_WRITESETCHANGE_TYPE"]._serialized_start = 5245
+    _globals["_WRITESETCHANGE_TYPE"]._serialized_end = 5426
+    _globals["_DELETEMODULE"]._serialized_start = 5438
+    _globals["_DELETEMODULE"]._serialized_end = 5545
+    _globals["_DELETERESOURCE"]._serialized_start = 5547
+    _globals["_DELETERESOURCE"]._serialized_end = 5673
+    _globals["_DELETETABLEITEM"]._serialized_start = 5675
+    _globals["_DELETETABLEITEM"]._serialized_end = 5798
+    _globals["_DELETETABLEDATA"]._serialized_start = 5800
+    _globals["_DELETETABLEDATA"]._serialized_end = 5848
+    _globals["_WRITEMODULE"]._serialized_start = 5850
+    _globals["_WRITEMODULE"]._serialized_end = 5960
+    _globals["_WRITERESOURCE"]._serialized_start = 5963
+    _globals["_WRITERESOURCE"]._serialized_end = 6102
+    _globals["_WRITETABLEDATA"]._serialized_start = 6104
+    _globals["_WRITETABLEDATA"]._serialized_end = 6186
+    _globals["_WRITETABLEITEM"]._serialized_start = 6188
+    _globals["_WRITETABLEITEM"]._serialized_end = 6309
+    _globals["_TRANSACTIONPAYLOAD"]._serialized_start = 6312
+    _globals["_TRANSACTIONPAYLOAD"]._serialized_end = 6836
+    _globals["_TRANSACTIONPAYLOAD_TYPE"]._serialized_start = 6672
+    _globals["_TRANSACTIONPAYLOAD_TYPE"]._serialized_end = 6819
+    _globals["_ENTRYFUNCTIONPAYLOAD"]._serialized_start = 6839
+    _globals["_ENTRYFUNCTIONPAYLOAD"]._serialized_end = 7024
+    _globals["_MOVESCRIPTBYTECODE"]._serialized_start = 7026
+    _globals["_MOVESCRIPTBYTECODE"]._serialized_end = 7113
+    _globals["_SCRIPTPAYLOAD"]._serialized_start = 7116
+    _globals["_SCRIPTPAYLOAD"]._serialized_end = 7262
+    _globals["_MULTISIGPAYLOAD"]._serialized_start = 7265
+    _globals["_MULTISIGPAYLOAD"]._serialized_end = 7416
+    _globals["_MULTISIGTRANSACTIONPAYLOAD"]._serialized_start = 7419
+    _globals["_MULTISIGTRANSACTIONPAYLOAD"]._serialized_end = 7668
+    _globals["_MULTISIGTRANSACTIONPAYLOAD_TYPE"]._serialized_start = 6672
+    _globals["_MULTISIGTRANSACTIONPAYLOAD_TYPE"]._serialized_end = 6733
+    _globals["_MOVEMODULEBYTECODE"]._serialized_start = 7670
+    _globals["_MOVEMODULEBYTECODE"]._serialized_end = 7755
+    _globals["_MOVEMODULE"]._serialized_start = 7758
+    _globals["_MOVEMODULE"]._serialized_end = 7968
+    _globals["_MOVEFUNCTION"]._serialized_start = 7971
+    _globals["_MOVEFUNCTION"]._serialized_end = 8373
+    _globals["_MOVEFUNCTION_VISIBILITY"]._serialized_start = 8263
+    _globals["_MOVEFUNCTION_VISIBILITY"]._serialized_end = 8373
+    _globals["_MOVESTRUCT"]._serialized_start = 8376
+    _globals["_MOVESTRUCT"]._serialized_end = 8627
+    _globals["_MOVESTRUCTGENERICTYPEPARAM"]._serialized_start = 8629
+    _globals["_MOVESTRUCTGENERICTYPEPARAM"]._serialized_end = 8733
+    _globals["_MOVESTRUCTFIELD"]._serialized_start = 8735
+    _globals["_MOVESTRUCTFIELD"]._serialized_end = 8812
+    _globals["_MOVEFUNCTIONGENERICTYPEPARAM"]._serialized_start = 8814
+    _globals["_MOVEFUNCTIONGENERICTYPEPARAM"]._serialized_end = 8900
+    _globals["_MOVETYPE"]._serialized_start = 8903
+    _globals["_MOVETYPE"]._serialized_end = 9279
+    _globals["_MOVETYPE_REFERENCETYPE"]._serialized_start = 9192
+    _globals["_MOVETYPE_REFERENCETYPE"]._serialized_end = 9268
+    _globals["_WRITESETPAYLOAD"]._serialized_start = 9281
+    _globals["_WRITESETPAYLOAD"]._serialized_end = 9349
+    _globals["_ENTRYFUNCTIONID"]._serialized_start = 9351
+    _globals["_ENTRYFUNCTIONID"]._serialized_end = 9434
+    _globals["_MOVEMODULEID"]._serialized_start = 9436
+    _globals["_MOVEMODULEID"]._serialized_end = 9481
+    _globals["_MOVESTRUCTTAG"]._serialized_start = 9483
+    _globals["_MOVESTRUCTTAG"]._serialized_end = 9606
+    _globals["_SIGNATURE"]._serialized_start = 9609
+    _globals["_SIGNATURE"]._serialized_end = 10148
+    _globals["_SIGNATURE_TYPE"]._serialized_start = 9993
+    _globals["_SIGNATURE_TYPE"]._serialized_end = 10135
+    _globals["_ED25519SIGNATURE"]._serialized_start = 10150
+    _globals["_ED25519SIGNATURE"]._serialized_end = 10207
+    _globals["_MULTIED25519SIGNATURE"]._serialized_start = 10209
+    _globals["_MULTIED25519SIGNATURE"]._serialized_end = 10320
+    _globals["_MULTIAGENTSIGNATURE"]._serialized_start = 10323
+    _globals["_MULTIAGENTSIGNATURE"]._serialized_end = 10503
+    _globals["_FEEPAYERSIGNATURE"]._serialized_start = 10506
+    _globals["_FEEPAYERSIGNATURE"]._serialized_end = 10777
+    _globals["_ANYPUBLICKEY"]._serialized_start = 10780
+    _globals["_ANYPUBLICKEY"]._serialized_end = 10987
+    _globals["_ANYPUBLICKEY_TYPE"]._serialized_start = 10871
+    _globals["_ANYPUBLICKEY_TYPE"]._serialized_end = 10987
+    _globals["_ANYSIGNATURE"]._serialized_start = 10990
+    _globals["_ANYSIGNATURE"]._serialized_end = 11431
+    _globals["_ANYSIGNATURE_TYPE"]._serialized_start = 11301
+    _globals["_ANYSIGNATURE_TYPE"]._serialized_end = 11410
+    _globals["_ED25519"]._serialized_start = 11433
+    _globals["_ED25519"]._serialized_end = 11461
+    _globals["_SECP256K1ECDSA"]._serialized_start = 11463
+    _globals["_SECP256K1ECDSA"]._serialized_end = 11498
+    _globals["_WEBAUTHN"]._serialized_start = 11500
+    _globals["_WEBAUTHN"]._serialized_end = 11529
+    _globals["_KEYLESS"]._serialized_start = 11531
+    _globals["_KEYLESS"]._serialized_end = 11559
+    _globals["_SINGLEKEYSIGNATURE"]._serialized_start = 11562
+    _globals["_SINGLEKEYSIGNATURE"]._serialized_end = 11693
+    _globals["_INDEXEDSIGNATURE"]._serialized_start = 11695
+    _globals["_INDEXEDSIGNATURE"]._serialized_end = 11783
+    _globals["_MULTIKEYSIGNATURE"]._serialized_start = 11786
+    _globals["_MULTIKEYSIGNATURE"]._serialized_end = 11951
+    _globals["_SINGLESENDER"]._serialized_start = 11953
+    _globals["_SINGLESENDER"]._serialized_end = 12023
+    _globals["_ACCOUNTSIGNATURE"]._serialized_start = 12026
+    _globals["_ACCOUNTSIGNATURE"]._serialized_end = 12510
+    _globals["_ACCOUNTSIGNATURE_TYPE"]._serialized_start = 12380
+    _globals["_ACCOUNTSIGNATURE_TYPE"]._serialized_end = 12497
+    _globals["_TRANSACTIONSIZEINFO"]._serialized_start = 12513
+    _globals["_TRANSACTIONSIZEINFO"]._serialized_end = 12690
+    _globals["_EVENTSIZEINFO"]._serialized_start = 12692
+    _globals["_EVENTSIZEINFO"]._serialized_end = 12752
+    _globals["_WRITEOPSIZEINFO"]._serialized_start = 12754
+    _globals["_WRITEOPSIZEINFO"]._serialized_end = 12811
 # @@protoc_insertion_point(module_scope)
diff --git a/protos/python/aptos_protos/aptos/transaction/v1/transaction_pb2.pyi b/protos/python/aptos_protos/aptos/transaction/v1/transaction_pb2.pyi
index c230ce585a703..3f831b1a076b2 100644
--- a/protos/python/aptos_protos/aptos/transaction/v1/transaction_pb2.pyi
+++ b/protos/python/aptos_protos/aptos/transaction/v1/transaction_pb2.pyi
@@ -90,6 +90,7 @@ class Transaction(_message.Message):
         "state_checkpoint",
         "user",
         "validator",
+        "block_epilogue",
         "size_info",
     ]
 
@@ -101,12 +102,14 @@ class Transaction(_message.Message):
         TRANSACTION_TYPE_STATE_CHECKPOINT: _ClassVar[Transaction.TransactionType]
         TRANSACTION_TYPE_USER: _ClassVar[Transaction.TransactionType]
         TRANSACTION_TYPE_VALIDATOR: _ClassVar[Transaction.TransactionType]
+        TRANSACTION_TYPE_BLOCK_EPILOGUE: _ClassVar[Transaction.TransactionType]
     TRANSACTION_TYPE_UNSPECIFIED: Transaction.TransactionType
     TRANSACTION_TYPE_GENESIS: Transaction.TransactionType
     TRANSACTION_TYPE_BLOCK_METADATA: Transaction.TransactionType
     TRANSACTION_TYPE_STATE_CHECKPOINT: Transaction.TransactionType
     TRANSACTION_TYPE_USER: Transaction.TransactionType
     TRANSACTION_TYPE_VALIDATOR: Transaction.TransactionType
+    TRANSACTION_TYPE_BLOCK_EPILOGUE: Transaction.TransactionType
     TIMESTAMP_FIELD_NUMBER: _ClassVar[int]
     VERSION_FIELD_NUMBER: _ClassVar[int]
     INFO_FIELD_NUMBER: _ClassVar[int]
@@ -118,6 +121,7 @@ class Transaction(_message.Message):
     STATE_CHECKPOINT_FIELD_NUMBER: _ClassVar[int]
     USER_FIELD_NUMBER: _ClassVar[int]
     VALIDATOR_FIELD_NUMBER: _ClassVar[int]
+    BLOCK_EPILOGUE_FIELD_NUMBER: _ClassVar[int]
     SIZE_INFO_FIELD_NUMBER: _ClassVar[int]
     timestamp: _timestamp_pb2.Timestamp
     version: int
@@ -130,6 +134,7 @@ class Transaction(_message.Message):
     state_checkpoint: StateCheckpointTransaction
     user: UserTransaction
     validator: ValidatorTransaction
+    block_epilogue: BlockEpilogueTransaction
     size_info: TransactionSizeInfo
     def __init__(
         self,
@@ -144,6 +149,7 @@ class Transaction(_message.Message):
         state_checkpoint: _Optional[_Union[StateCheckpointTransaction, _Mapping]] = ...,
         user: _Optional[_Union[UserTransaction, _Mapping]] = ...,
         validator: _Optional[_Union[ValidatorTransaction, _Mapping]] = ...,
+        block_epilogue: _Optional[_Union[BlockEpilogueTransaction, _Mapping]] = ...,
         size_info: _Optional[_Union[TransactionSizeInfo, _Mapping]] = ...,
     ) -> None: ...
 
@@ -195,8 +201,205 @@ class StateCheckpointTransaction(_message.Message):
     def __init__(self) -> None: ...
 
 class ValidatorTransaction(_message.Message):
-    __slots__ = []
-    def __init__(self) -> None: ...
+    __slots__ = ["observed_jwk_update", "dkg_update", "events"]
+
+    class ObservedJwkUpdate(_message.Message):
+        __slots__ = ["quorum_certified_update"]
+
+        class ExportedProviderJWKs(_message.Message):
+            __slots__ = ["issuer", "version", "jwks"]
+
+            class JWK(_message.Message):
+                __slots__ = ["unsupported_jwk", "rsa"]
+
+                class RSA(_message.Message):
+                    __slots__ = ["kid", "kty", "alg", "e", "n"]
+                    KID_FIELD_NUMBER: _ClassVar[int]
+                    KTY_FIELD_NUMBER: _ClassVar[int]
+                    ALG_FIELD_NUMBER: _ClassVar[int]
+                    E_FIELD_NUMBER: _ClassVar[int]
+                    N_FIELD_NUMBER: _ClassVar[int]
+                    kid: str
+                    kty: str
+                    alg: str
+                    e: str
+                    n: str
+                    def __init__(
+                        self,
+                        kid: _Optional[str] = ...,
+                        kty: _Optional[str] = ...,
+                        alg: _Optional[str] = ...,
+                        e: _Optional[str] = ...,
+                        n: _Optional[str] = ...,
+                    ) -> None: ...
+
+                class UnsupportedJWK(_message.Message):
+                    __slots__ = ["id", "payload"]
+                    ID_FIELD_NUMBER: _ClassVar[int]
+                    PAYLOAD_FIELD_NUMBER: _ClassVar[int]
+                    id: bytes
+                    payload: bytes
+                    def __init__(
+                        self,
+                        id: _Optional[bytes] = ...,
+                        payload: _Optional[bytes] = ...,
+                    ) -> None: ...
+                UNSUPPORTED_JWK_FIELD_NUMBER: _ClassVar[int]
+                RSA_FIELD_NUMBER: _ClassVar[int]
+                unsupported_jwk: ValidatorTransaction.ObservedJwkUpdate.ExportedProviderJWKs.JWK.UnsupportedJWK
+                rsa: ValidatorTransaction.ObservedJwkUpdate.ExportedProviderJWKs.JWK.RSA
+                def __init__(
+                    self,
+                    unsupported_jwk: _Optional[
+                        _Union[
+                            ValidatorTransaction.ObservedJwkUpdate.ExportedProviderJWKs.JWK.UnsupportedJWK,
+                            _Mapping,
+                        ]
+                    ] = ...,
+                    rsa: _Optional[
+                        _Union[
+                            ValidatorTransaction.ObservedJwkUpdate.ExportedProviderJWKs.JWK.RSA,
+                            _Mapping,
+                        ]
+                    ] = ...,
+                ) -> None: ...
+            ISSUER_FIELD_NUMBER: _ClassVar[int]
+            VERSION_FIELD_NUMBER: _ClassVar[int]
+            JWKS_FIELD_NUMBER: _ClassVar[int]
+            issuer: str
+            version: int
+            jwks: _containers.RepeatedCompositeFieldContainer[
+                ValidatorTransaction.ObservedJwkUpdate.ExportedProviderJWKs.JWK
+            ]
+            def __init__(
+                self,
+                issuer: _Optional[str] = ...,
+                version: _Optional[int] = ...,
+                jwks: _Optional[
+                    _Iterable[
+                        _Union[
+                            ValidatorTransaction.ObservedJwkUpdate.ExportedProviderJWKs.JWK,
+                            _Mapping,
+                        ]
+                    ]
+                ] = ...,
+            ) -> None: ...
+
+        class ExportedAggregateSignature(_message.Message):
+            __slots__ = ["signer_indices", "sig"]
+            SIGNER_INDICES_FIELD_NUMBER: _ClassVar[int]
+            SIG_FIELD_NUMBER: _ClassVar[int]
+            signer_indices: _containers.RepeatedScalarFieldContainer[int]
+            sig: bytes
+            def __init__(
+                self,
+                signer_indices: _Optional[_Iterable[int]] = ...,
+                sig: _Optional[bytes] = ...,
+            ) -> None: ...
+
+        class QuorumCertifiedUpdate(_message.Message):
+            __slots__ = ["update", "multi_sig"]
+            UPDATE_FIELD_NUMBER: _ClassVar[int]
+            MULTI_SIG_FIELD_NUMBER: _ClassVar[int]
+            update: ValidatorTransaction.ObservedJwkUpdate.ExportedProviderJWKs
+            multi_sig: ValidatorTransaction.ObservedJwkUpdate.ExportedAggregateSignature
+            def __init__(
+                self,
+                update: _Optional[
+                    _Union[
+                        ValidatorTransaction.ObservedJwkUpdate.ExportedProviderJWKs,
+                        _Mapping,
+                    ]
+                ] = ...,
+                multi_sig: _Optional[
+                    _Union[
+                        ValidatorTransaction.ObservedJwkUpdate.ExportedAggregateSignature,
+                        _Mapping,
+                    ]
+                ] = ...,
+            ) -> None: ...
+        QUORUM_CERTIFIED_UPDATE_FIELD_NUMBER: _ClassVar[int]
+        quorum_certified_update: ValidatorTransaction.ObservedJwkUpdate.QuorumCertifiedUpdate
+        def __init__(
+            self,
+            quorum_certified_update: _Optional[
+                _Union[
+                    ValidatorTransaction.ObservedJwkUpdate.QuorumCertifiedUpdate,
+                    _Mapping,
+                ]
+            ] = ...,
+        ) -> None: ...
+
+    class DkgUpdate(_message.Message):
+        __slots__ = ["dkg_transcript"]
+
+        class DkgTranscript(_message.Message):
+            __slots__ = ["epoch", "author", "payload"]
+            EPOCH_FIELD_NUMBER: _ClassVar[int]
+            AUTHOR_FIELD_NUMBER: _ClassVar[int]
+            PAYLOAD_FIELD_NUMBER: _ClassVar[int]
+            epoch: int
+            author: str
+            payload: bytes
+            def __init__(
+                self,
+                epoch: _Optional[int] = ...,
+                author: _Optional[str] = ...,
+                payload: _Optional[bytes] = ...,
+            ) -> None: ...
+        DKG_TRANSCRIPT_FIELD_NUMBER: _ClassVar[int]
+        dkg_transcript: ValidatorTransaction.DkgUpdate.DkgTranscript
+        def __init__(
+            self,
+            dkg_transcript: _Optional[
+                _Union[ValidatorTransaction.DkgUpdate.DkgTranscript, _Mapping]
+            ] = ...,
+        ) -> None: ...
+    OBSERVED_JWK_UPDATE_FIELD_NUMBER: _ClassVar[int]
+    DKG_UPDATE_FIELD_NUMBER: _ClassVar[int]
+    EVENTS_FIELD_NUMBER: _ClassVar[int]
+    observed_jwk_update: ValidatorTransaction.ObservedJwkUpdate
+    dkg_update: ValidatorTransaction.DkgUpdate
+    events: _containers.RepeatedCompositeFieldContainer[Event]
+    def __init__(
+        self,
+        observed_jwk_update: _Optional[
+            _Union[ValidatorTransaction.ObservedJwkUpdate, _Mapping]
+        ] = ...,
+        dkg_update: _Optional[_Union[ValidatorTransaction.DkgUpdate, _Mapping]] = ...,
+        events: _Optional[_Iterable[_Union[Event, _Mapping]]] = ...,
+    ) -> None: ...
+
+class BlockEpilogueTransaction(_message.Message):
+    __slots__ = ["block_end_info"]
+    BLOCK_END_INFO_FIELD_NUMBER: _ClassVar[int]
+    block_end_info: BlockEndInfo
+    def __init__(
+        self, block_end_info: _Optional[_Union[BlockEndInfo, _Mapping]] = ...
+    ) -> None: ...
+
+class BlockEndInfo(_message.Message):
+    __slots__ = [
+        "block_gas_limit_reached",
+        "block_output_limit_reached",
+        "block_effective_block_gas_units",
+        "block_approx_output_size",
+    ]
+    BLOCK_GAS_LIMIT_REACHED_FIELD_NUMBER: _ClassVar[int]
+    BLOCK_OUTPUT_LIMIT_REACHED_FIELD_NUMBER: _ClassVar[int]
+    BLOCK_EFFECTIVE_BLOCK_GAS_UNITS_FIELD_NUMBER: _ClassVar[int]
+    BLOCK_APPROX_OUTPUT_SIZE_FIELD_NUMBER: _ClassVar[int]
+    block_gas_limit_reached: bool
+    block_output_limit_reached: bool
+    block_effective_block_gas_units: int
+    block_approx_output_size: int
+    def __init__(
+        self,
+        block_gas_limit_reached: bool = ...,
+        block_output_limit_reached: bool = ...,
+        block_effective_block_gas_units: _Optional[int] = ...,
+        block_approx_output_size: _Optional[int] = ...,
+    ) -> None: ...
 
 class UserTransaction(_message.Message):
     __slots__ = ["request", "events"]
@@ -746,14 +949,23 @@ class MoveFunction(_message.Message):
     ) -> None: ...
 
 class MoveStruct(_message.Message):
-    __slots__ = ["name", "is_native", "abilities", "generic_type_params", "fields"]
+    __slots__ = [
+        "name",
+        "is_native",
+        "is_event",
+        "abilities",
+        "generic_type_params",
+        "fields",
+    ]
     NAME_FIELD_NUMBER: _ClassVar[int]
     IS_NATIVE_FIELD_NUMBER: _ClassVar[int]
+    IS_EVENT_FIELD_NUMBER: _ClassVar[int]
     ABILITIES_FIELD_NUMBER: _ClassVar[int]
     GENERIC_TYPE_PARAMS_FIELD_NUMBER: _ClassVar[int]
     FIELDS_FIELD_NUMBER: _ClassVar[int]
     name: str
     is_native: bool
+    is_event: bool
     abilities: _containers.RepeatedScalarFieldContainer[MoveAbility]
     generic_type_params: _containers.RepeatedCompositeFieldContainer[
         MoveStructGenericTypeParam
@@ -763,6 +975,7 @@ class MoveStruct(_message.Message):
         self,
         name: _Optional[str] = ...,
         is_native: bool = ...,
+        is_event: bool = ...,
         abilities: _Optional[_Iterable[_Union[MoveAbility, str]]] = ...,
         generic_type_params: _Optional[
             _Iterable[_Union[MoveStructGenericTypeParam, _Mapping]]
diff --git a/protos/python/generate.sh b/protos/python/generate.sh
index 666eedf77c8d3..4d6d5ab027698 100755
--- a/protos/python/generate.sh
+++ b/protos/python/generate.sh
@@ -31,7 +31,6 @@ python -m grpc_tools.protoc \
     --python_out $OUT_DIR \
     --pyi_out $OUT_DIR \
     --grpc_python_out $OUT_DIR \
-    $PROTO_DIR/aptos/bigquery_schema/v1/transaction.proto \
     $PROTO_DIR/aptos/indexer/v1/raw_data.proto \
     $PROTO_DIR/aptos/internal/fullnode/v1/fullnode_data.proto \
     $PROTO_DIR/aptos/transaction/v1/transaction.proto \
diff --git a/protos/rust/Cargo.toml b/protos/rust/Cargo.toml
index 1bf8bbef6d292..37d9d42b0605a 100644
--- a/protos/rust/Cargo.toml
+++ b/protos/rust/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "aptos-protos"
-version = "1.3.0"
+version = "1.3.1"
 authors = ["Aptos Labs <opensource@aptoslabs.com>"]
 description = "Code generated from Aptos protobuf definitions"
 repository = "https://github.com/aptos-labs/aptos-core"
diff --git a/protos/rust/src/pb/aptos.indexer.v1.rs b/protos/rust/src/pb/aptos.indexer.v1.rs
index ceb1f4fd33658..b10551ffc515a 100644
--- a/protos/rust/src/pb/aptos.indexer.v1.rs
+++ b/protos/rust/src/pb/aptos.indexer.v1.rs
@@ -107,12 +107,12 @@ pub const FILE_DESCRIPTOR_SET: &[u8] = &[
     0x0f, 0x01, 0x1a, 0x1b, 0x20, 0x54, 0x68, 0x69, 0x73, 0x20, 0x69, 0x73, 0x20, 0x66, 0x6f, 0x72,
     0x20, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x20, 0x6f, 0x6e, 0x6c, 0x79, 0x2e, 0x0a, 0x0a,
     0x0a, 0x0a, 0x03, 0x04, 0x00, 0x01, 0x12, 0x03, 0x0a, 0x08, 0x1d, 0x0a, 0x2b, 0x0a, 0x04, 0x04,
-    0x00, 0x02, 0x00, 0x12, 0x03, 0x0c, 0x02, 0x3e, 0x1a, 0x1e, 0x20, 0x52, 0x65, 0x71, 0x75, 0x69,
+    0x00, 0x02, 0x00, 0x12, 0x03, 0x0c, 0x02, 0x3d, 0x1a, 0x1e, 0x20, 0x52, 0x65, 0x71, 0x75, 0x69,
     0x72, 0x65, 0x64, 0x3b, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e,
     0x73, 0x20, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x0a, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x00, 0x02, 0x00,
     0x04, 0x12, 0x03, 0x0c, 0x02, 0x0a, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x00, 0x02, 0x00, 0x06, 0x12,
     0x03, 0x0c, 0x0b, 0x2b, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x00, 0x02, 0x00, 0x01, 0x12, 0x03, 0x0c,
-    0x2c, 0x38, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x00, 0x02, 0x00, 0x03, 0x12, 0x03, 0x0c, 0x3c, 0x3d,
+    0x2c, 0x38, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x00, 0x02, 0x00, 0x03, 0x12, 0x03, 0x0c, 0x3b, 0x3c,
     0x0a, 0x22, 0x0a, 0x04, 0x04, 0x00, 0x02, 0x01, 0x12, 0x03, 0x0e, 0x02, 0x27, 0x1a, 0x15, 0x20,
     0x52, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x3b, 0x20, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x20,
     0x69, 0x64, 0x2e, 0x0a, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x00, 0x02, 0x01, 0x04, 0x12, 0x03, 0x0e,
@@ -163,33 +163,33 @@ pub const FILE_DESCRIPTOR_SET: &[u8] = &[
     0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x20, 0x69, 0x73, 0x20, 0x61, 0x20, 0x62, 0x61, 0x74, 0x63,
     0x68, 0x20, 0x6f, 0x66, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e,
     0x73, 0x2e, 0x0a, 0x0a, 0x0a, 0x0a, 0x03, 0x04, 0x02, 0x01, 0x12, 0x03, 0x1f, 0x08, 0x1c, 0x0a,
-    0x2b, 0x0a, 0x04, 0x04, 0x02, 0x02, 0x00, 0x12, 0x03, 0x21, 0x04, 0x40, 0x1a, 0x1e, 0x20, 0x52,
+    0x2b, 0x0a, 0x04, 0x04, 0x02, 0x02, 0x00, 0x12, 0x03, 0x21, 0x02, 0x3d, 0x1a, 0x1e, 0x20, 0x52,
     0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x3b, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63,
     0x74, 0x69, 0x6f, 0x6e, 0x73, 0x20, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x0a, 0x0a, 0x0c, 0x0a, 0x05,
-    0x04, 0x02, 0x02, 0x00, 0x04, 0x12, 0x03, 0x21, 0x04, 0x0c, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x02,
-    0x02, 0x00, 0x06, 0x12, 0x03, 0x21, 0x0d, 0x2d, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x02, 0x02, 0x00,
-    0x01, 0x12, 0x03, 0x21, 0x2e, 0x3a, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x02, 0x02, 0x00, 0x03, 0x12,
-    0x03, 0x21, 0x3e, 0x3f, 0x0a, 0x22, 0x0a, 0x04, 0x04, 0x02, 0x02, 0x01, 0x12, 0x03, 0x24, 0x04,
-    0x36, 0x1a, 0x15, 0x20, 0x52, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x3b, 0x20, 0x63, 0x68,
+    0x04, 0x02, 0x02, 0x00, 0x04, 0x12, 0x03, 0x21, 0x02, 0x0a, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x02,
+    0x02, 0x00, 0x06, 0x12, 0x03, 0x21, 0x0b, 0x2b, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x02, 0x02, 0x00,
+    0x01, 0x12, 0x03, 0x21, 0x2c, 0x38, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x02, 0x02, 0x00, 0x03, 0x12,
+    0x03, 0x21, 0x3b, 0x3c, 0x0a, 0x22, 0x0a, 0x04, 0x04, 0x02, 0x02, 0x01, 0x12, 0x03, 0x24, 0x02,
+    0x34, 0x1a, 0x15, 0x20, 0x52, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x3b, 0x20, 0x63, 0x68,
     0x61, 0x69, 0x6e, 0x20, 0x69, 0x64, 0x2e, 0x0a, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x02, 0x02, 0x01,
-    0x04, 0x12, 0x03, 0x24, 0x04, 0x0c, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x02, 0x02, 0x01, 0x05, 0x12,
-    0x03, 0x24, 0x0d, 0x13, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x02, 0x02, 0x01, 0x01, 0x12, 0x03, 0x24,
-    0x14, 0x1c, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x02, 0x02, 0x01, 0x03, 0x12, 0x03, 0x24, 0x1f, 0x20,
-    0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x02, 0x02, 0x01, 0x08, 0x12, 0x03, 0x24, 0x21, 0x35, 0x0a, 0x0d,
-    0x0a, 0x06, 0x04, 0x02, 0x02, 0x01, 0x08, 0x06, 0x12, 0x03, 0x24, 0x22, 0x34, 0x0a, 0x0a, 0x0a,
+    0x04, 0x12, 0x03, 0x24, 0x02, 0x0a, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x02, 0x02, 0x01, 0x05, 0x12,
+    0x03, 0x24, 0x0b, 0x11, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x02, 0x02, 0x01, 0x01, 0x12, 0x03, 0x24,
+    0x12, 0x1a, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x02, 0x02, 0x01, 0x03, 0x12, 0x03, 0x24, 0x1d, 0x1e,
+    0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x02, 0x02, 0x01, 0x08, 0x12, 0x03, 0x24, 0x1f, 0x33, 0x0a, 0x0d,
+    0x0a, 0x06, 0x04, 0x02, 0x02, 0x01, 0x08, 0x06, 0x12, 0x03, 0x24, 0x20, 0x32, 0x0a, 0x0a, 0x0a,
     0x02, 0x06, 0x00, 0x12, 0x04, 0x27, 0x00, 0x2a, 0x01, 0x0a, 0x0a, 0x0a, 0x03, 0x06, 0x00, 0x01,
     0x12, 0x03, 0x27, 0x08, 0x0f, 0x0a, 0x7a, 0x0a, 0x04, 0x06, 0x00, 0x02, 0x00, 0x12, 0x03, 0x29,
-    0x04, 0x56, 0x1a, 0x6d, 0x20, 0x47, 0x65, 0x74, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63,
+    0x02, 0x54, 0x1a, 0x6d, 0x20, 0x47, 0x65, 0x74, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63,
     0x74, 0x69, 0x6f, 0x6e, 0x73, 0x20, 0x62, 0x61, 0x74, 0x63, 0x68, 0x20, 0x77, 0x69, 0x74, 0x68,
     0x6f, 0x75, 0x74, 0x20, 0x61, 0x6e, 0x79, 0x20, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x69, 0x6e,
     0x67, 0x20, 0x66, 0x72, 0x6f, 0x6d, 0x20, 0x73, 0x74, 0x61, 0x72, 0x74, 0x69, 0x6e, 0x67, 0x20,
     0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x65, 0x6e, 0x64, 0x20,
     0x69, 0x66, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63,
     0x6f, 0x75, 0x6e, 0x74, 0x20, 0x69, 0x73, 0x20, 0x70, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x74, 0x2e,
-    0x0a, 0x0a, 0x0c, 0x0a, 0x05, 0x06, 0x00, 0x02, 0x00, 0x01, 0x12, 0x03, 0x29, 0x08, 0x17, 0x0a,
-    0x0c, 0x0a, 0x05, 0x06, 0x00, 0x02, 0x00, 0x02, 0x12, 0x03, 0x29, 0x18, 0x2e, 0x0a, 0x0c, 0x0a,
-    0x05, 0x06, 0x00, 0x02, 0x00, 0x06, 0x12, 0x03, 0x29, 0x39, 0x3f, 0x0a, 0x0c, 0x0a, 0x05, 0x06,
-    0x00, 0x02, 0x00, 0x03, 0x12, 0x03, 0x29, 0x40, 0x54, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+    0x0a, 0x0a, 0x0c, 0x0a, 0x05, 0x06, 0x00, 0x02, 0x00, 0x01, 0x12, 0x03, 0x29, 0x06, 0x15, 0x0a,
+    0x0c, 0x0a, 0x05, 0x06, 0x00, 0x02, 0x00, 0x02, 0x12, 0x03, 0x29, 0x16, 0x2c, 0x0a, 0x0c, 0x0a,
+    0x05, 0x06, 0x00, 0x02, 0x00, 0x06, 0x12, 0x03, 0x29, 0x37, 0x3d, 0x0a, 0x0c, 0x0a, 0x05, 0x06,
+    0x00, 0x02, 0x00, 0x03, 0x12, 0x03, 0x29, 0x3e, 0x52, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
     0x33,
 ];
 include!("aptos.indexer.v1.serde.rs");
diff --git a/protos/rust/src/pb/aptos.internal.fullnode.v1.rs b/protos/rust/src/pb/aptos.internal.fullnode.v1.rs
index cf8578ec1a5b4..2a2fa4be3823c 100644
--- a/protos/rust/src/pb/aptos.internal.fullnode.v1.rs
+++ b/protos/rust/src/pb/aptos.internal.fullnode.v1.rs
@@ -197,10 +197,10 @@ pub const FILE_DESCRIPTOR_SET: &[u8] = &[
     0x20, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x20, 0x78, 0x20, 0x2b, 0x20, 0x28, 0x6b, 0x20,
     0x2b, 0x20, 0x31, 0x29, 0x20, 0x2a, 0x20, 0x6e, 0x20, 0x2d, 0x20, 0x31, 0x0a, 0x0a, 0x0a, 0x0a,
     0x03, 0x04, 0x00, 0x01, 0x12, 0x03, 0x10, 0x08, 0x1a, 0x0a, 0x0b, 0x0a, 0x04, 0x04, 0x00, 0x02,
-    0x00, 0x12, 0x03, 0x11, 0x02, 0x3e, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x00, 0x02, 0x00, 0x04, 0x12,
+    0x00, 0x12, 0x03, 0x11, 0x02, 0x3d, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x00, 0x02, 0x00, 0x04, 0x12,
     0x03, 0x11, 0x02, 0x0a, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x00, 0x02, 0x00, 0x06, 0x12, 0x03, 0x11,
     0x0b, 0x2b, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x00, 0x02, 0x00, 0x01, 0x12, 0x03, 0x11, 0x2c, 0x38,
-    0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x00, 0x02, 0x00, 0x03, 0x12, 0x03, 0x11, 0x3c, 0x3d, 0x0a, 0x0a,
+    0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x00, 0x02, 0x00, 0x03, 0x12, 0x03, 0x11, 0x3b, 0x3c, 0x0a, 0x0a,
     0x0a, 0x02, 0x04, 0x01, 0x12, 0x04, 0x14, 0x00, 0x21, 0x01, 0x0a, 0x0a, 0x0a, 0x03, 0x04, 0x01,
     0x01, 0x12, 0x03, 0x14, 0x08, 0x14, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x01, 0x04, 0x00, 0x12, 0x04,
     0x15, 0x02, 0x1b, 0x03, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x01, 0x04, 0x00, 0x01, 0x12, 0x03, 0x15,
@@ -282,10 +282,10 @@ pub const FILE_DESCRIPTOR_SET: &[u8] = &[
     0x11, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x03, 0x02, 0x02, 0x03, 0x12, 0x03, 0x33, 0x14, 0x15, 0x0a,
     0x0a, 0x0a, 0x02, 0x06, 0x00, 0x12, 0x04, 0x36, 0x00, 0x38, 0x01, 0x0a, 0x0a, 0x0a, 0x03, 0x06,
     0x00, 0x01, 0x12, 0x03, 0x36, 0x08, 0x14, 0x0a, 0x0b, 0x0a, 0x04, 0x06, 0x00, 0x02, 0x00, 0x12,
-    0x03, 0x37, 0x04, 0x6e, 0x0a, 0x0c, 0x0a, 0x05, 0x06, 0x00, 0x02, 0x00, 0x01, 0x12, 0x03, 0x37,
-    0x08, 0x1f, 0x0a, 0x0c, 0x0a, 0x05, 0x06, 0x00, 0x02, 0x00, 0x02, 0x12, 0x03, 0x37, 0x20, 0x3e,
-    0x0a, 0x0c, 0x0a, 0x05, 0x06, 0x00, 0x02, 0x00, 0x06, 0x12, 0x03, 0x37, 0x49, 0x4f, 0x0a, 0x0c,
-    0x0a, 0x05, 0x06, 0x00, 0x02, 0x00, 0x03, 0x12, 0x03, 0x37, 0x50, 0x6c, 0x62, 0x06, 0x70, 0x72,
+    0x03, 0x37, 0x02, 0x6c, 0x0a, 0x0c, 0x0a, 0x05, 0x06, 0x00, 0x02, 0x00, 0x01, 0x12, 0x03, 0x37,
+    0x06, 0x1d, 0x0a, 0x0c, 0x0a, 0x05, 0x06, 0x00, 0x02, 0x00, 0x02, 0x12, 0x03, 0x37, 0x1e, 0x3c,
+    0x0a, 0x0c, 0x0a, 0x05, 0x06, 0x00, 0x02, 0x00, 0x06, 0x12, 0x03, 0x37, 0x47, 0x4d, 0x0a, 0x0c,
+    0x0a, 0x05, 0x06, 0x00, 0x02, 0x00, 0x03, 0x12, 0x03, 0x37, 0x4e, 0x6a, 0x62, 0x06, 0x70, 0x72,
     0x6f, 0x74, 0x6f, 0x33,
 ];
 include!("aptos.internal.fullnode.v1.serde.rs");
diff --git a/protos/rust/src/pb/aptos.remote_executor.v1.rs b/protos/rust/src/pb/aptos.remote_executor.v1.rs
index 243bf26cabfc7..dcf6074bfbf9e 100644
--- a/protos/rust/src/pb/aptos.remote_executor.v1.rs
+++ b/protos/rust/src/pb/aptos.remote_executor.v1.rs
@@ -16,7 +16,7 @@ pub struct Empty {
 }
 /// Encoded file descriptor set for the `aptos.remote_executor.v1` package
 pub const FILE_DESCRIPTOR_SET: &[u8] = &[
-    0x0a, 0xa1, 0x06, 0x0a, 0x2a, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2f, 0x72, 0x65, 0x6d, 0x6f, 0x74,
+    0x0a, 0xa0, 0x06, 0x0a, 0x2a, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2f, 0x72, 0x65, 0x6d, 0x6f, 0x74,
     0x65, 0x5f, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x6f, 0x72, 0x2f, 0x76, 0x31, 0x2f, 0x6e, 0x65,
     0x74, 0x77, 0x6f, 0x72, 0x6b, 0x5f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12,
     0x18, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x5f, 0x65, 0x78,
@@ -44,8 +44,8 @@ pub const FILE_DESCRIPTOR_SET: &[u8] = &[
     0x5c, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x6f, 0x72, 0x5c,
     0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02,
     0x19, 0x41, 0x70, 0x74, 0x6f, 0x73, 0x3a, 0x3a, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x45, 0x78,
-    0x65, 0x63, 0x75, 0x74, 0x6f, 0x72, 0x3a, 0x3a, 0x56, 0x31, 0x4a, 0xcf, 0x02, 0x0a, 0x06, 0x12,
-    0x04, 0x03, 0x00, 0x12, 0x01, 0x0a, 0x4e, 0x0a, 0x01, 0x0c, 0x12, 0x03, 0x03, 0x00, 0x12, 0x32,
+    0x65, 0x63, 0x75, 0x74, 0x6f, 0x72, 0x3a, 0x3a, 0x56, 0x31, 0x4a, 0xce, 0x02, 0x0a, 0x06, 0x12,
+    0x04, 0x03, 0x00, 0x10, 0x01, 0x0a, 0x4e, 0x0a, 0x01, 0x0c, 0x12, 0x03, 0x03, 0x00, 0x12, 0x32,
     0x44, 0x20, 0x43, 0x6f, 0x70, 0x79, 0x72, 0x69, 0x67, 0x68, 0x74, 0x20, 0xc2, 0xa9, 0x20, 0x41,
     0x70, 0x74, 0x6f, 0x73, 0x20, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x0a,
     0x20, 0x53, 0x50, 0x44, 0x58, 0x2d, 0x4c, 0x69, 0x63, 0x65, 0x6e, 0x73, 0x65, 0x2d, 0x49, 0x64,
@@ -53,20 +53,20 @@ pub const FILE_DESCRIPTOR_SET: &[u8] = &[
     0x2d, 0x32, 0x2e, 0x30, 0x0a, 0x0a, 0x08, 0x0a, 0x01, 0x02, 0x12, 0x03, 0x05, 0x00, 0x21, 0x0a,
     0x0a, 0x0a, 0x02, 0x04, 0x00, 0x12, 0x04, 0x07, 0x00, 0x0a, 0x01, 0x0a, 0x0a, 0x0a, 0x03, 0x04,
     0x00, 0x01, 0x12, 0x03, 0x07, 0x08, 0x16, 0x0a, 0x0b, 0x0a, 0x04, 0x04, 0x00, 0x02, 0x00, 0x12,
-    0x03, 0x08, 0x04, 0x16, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x00, 0x02, 0x00, 0x05, 0x12, 0x03, 0x08,
-    0x04, 0x09, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x00, 0x02, 0x00, 0x01, 0x12, 0x03, 0x08, 0x0a, 0x11,
-    0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x00, 0x02, 0x00, 0x03, 0x12, 0x03, 0x08, 0x14, 0x15, 0x0a, 0x0b,
-    0x0a, 0x04, 0x04, 0x00, 0x02, 0x01, 0x12, 0x03, 0x09, 0x04, 0x1c, 0x0a, 0x0c, 0x0a, 0x05, 0x04,
-    0x00, 0x02, 0x01, 0x05, 0x12, 0x03, 0x09, 0x04, 0x0a, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x00, 0x02,
-    0x01, 0x01, 0x12, 0x03, 0x09, 0x0b, 0x17, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x00, 0x02, 0x01, 0x03,
-    0x12, 0x03, 0x09, 0x1a, 0x1b, 0x0a, 0x0a, 0x0a, 0x02, 0x04, 0x01, 0x12, 0x04, 0x0c, 0x00, 0x0e,
-    0x01, 0x0a, 0x0a, 0x0a, 0x03, 0x04, 0x01, 0x01, 0x12, 0x03, 0x0c, 0x08, 0x0d, 0x0a, 0x0a, 0x0a,
-    0x02, 0x06, 0x00, 0x12, 0x04, 0x10, 0x00, 0x12, 0x01, 0x0a, 0x0a, 0x0a, 0x03, 0x06, 0x00, 0x01,
-    0x12, 0x03, 0x10, 0x08, 0x1d, 0x0a, 0x0b, 0x0a, 0x04, 0x06, 0x00, 0x02, 0x00, 0x12, 0x03, 0x11,
-    0x04, 0x3a, 0x0a, 0x0c, 0x0a, 0x05, 0x06, 0x00, 0x02, 0x00, 0x01, 0x12, 0x03, 0x11, 0x08, 0x19,
-    0x0a, 0x0c, 0x0a, 0x05, 0x06, 0x00, 0x02, 0x00, 0x02, 0x12, 0x03, 0x11, 0x1a, 0x28, 0x0a, 0x0c,
-    0x0a, 0x05, 0x06, 0x00, 0x02, 0x00, 0x03, 0x12, 0x03, 0x11, 0x33, 0x38, 0x62, 0x06, 0x70, 0x72,
-    0x6f, 0x74, 0x6f, 0x33,
+    0x03, 0x08, 0x02, 0x14, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x00, 0x02, 0x00, 0x05, 0x12, 0x03, 0x08,
+    0x02, 0x07, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x00, 0x02, 0x00, 0x01, 0x12, 0x03, 0x08, 0x08, 0x0f,
+    0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x00, 0x02, 0x00, 0x03, 0x12, 0x03, 0x08, 0x12, 0x13, 0x0a, 0x0b,
+    0x0a, 0x04, 0x04, 0x00, 0x02, 0x01, 0x12, 0x03, 0x09, 0x02, 0x1a, 0x0a, 0x0c, 0x0a, 0x05, 0x04,
+    0x00, 0x02, 0x01, 0x05, 0x12, 0x03, 0x09, 0x02, 0x08, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x00, 0x02,
+    0x01, 0x01, 0x12, 0x03, 0x09, 0x09, 0x15, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x00, 0x02, 0x01, 0x03,
+    0x12, 0x03, 0x09, 0x18, 0x19, 0x0a, 0x09, 0x0a, 0x02, 0x04, 0x01, 0x12, 0x03, 0x0c, 0x00, 0x10,
+    0x0a, 0x0a, 0x0a, 0x03, 0x04, 0x01, 0x01, 0x12, 0x03, 0x0c, 0x08, 0x0d, 0x0a, 0x0a, 0x0a, 0x02,
+    0x06, 0x00, 0x12, 0x04, 0x0e, 0x00, 0x10, 0x01, 0x0a, 0x0a, 0x0a, 0x03, 0x06, 0x00, 0x01, 0x12,
+    0x03, 0x0e, 0x08, 0x1d, 0x0a, 0x0b, 0x0a, 0x04, 0x06, 0x00, 0x02, 0x00, 0x12, 0x03, 0x0f, 0x02,
+    0x38, 0x0a, 0x0c, 0x0a, 0x05, 0x06, 0x00, 0x02, 0x00, 0x01, 0x12, 0x03, 0x0f, 0x06, 0x17, 0x0a,
+    0x0c, 0x0a, 0x05, 0x06, 0x00, 0x02, 0x00, 0x02, 0x12, 0x03, 0x0f, 0x18, 0x26, 0x0a, 0x0c, 0x0a,
+    0x05, 0x06, 0x00, 0x02, 0x00, 0x03, 0x12, 0x03, 0x0f, 0x31, 0x36, 0x62, 0x06, 0x70, 0x72, 0x6f,
+    0x74, 0x6f, 0x33,
 ];
 include!("aptos.remote_executor.v1.serde.rs");
 include!("aptos.remote_executor.v1.tonic.rs");
diff --git a/protos/rust/src/pb/aptos.transaction.v1.rs b/protos/rust/src/pb/aptos.transaction.v1.rs
index 9f9c360277d08..87500bbf4d99b 100644
--- a/protos/rust/src/pb/aptos.transaction.v1.rs
+++ b/protos/rust/src/pb/aptos.transaction.v1.rs
@@ -32,7 +32,7 @@ pub struct Block {
 /// Transaction as it happened on the chain, there are 4 types of transactions:
 /// - User Transaction: a user initiated transaction to interact with the chain
 /// - Block Metadata Transaction: transactions generated by the chain to group together transactions forming a "block"
-/// - State Checkpoint Transaction: transactions generated by the chain so when validator agreed on a particular global state
+/// - Block Epilogue / State Checkpoint Transaction: transactions generated by the chain to end the group transactions forming a bloc
 /// - Genesis Transaction: the first transaction of the chain, with all core contract and validator information baked in
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
@@ -51,7 +51,7 @@ pub struct Transaction {
     pub r#type: i32,
     #[prost(message, optional, tag="22")]
     pub size_info: ::core::option::Option<TransactionSizeInfo>,
-    #[prost(oneof="transaction::TxnData", tags="7, 8, 9, 10, 21")]
+    #[prost(oneof="transaction::TxnData", tags="7, 8, 9, 10, 21, 23")]
     pub txn_data: ::core::option::Option<transaction::TxnData>,
 }
 /// Nested message and enum types in `Transaction`.
@@ -64,7 +64,9 @@ pub mod transaction {
         BlockMetadata = 2,
         StateCheckpoint = 3,
         User = 4,
+        /// values 5-19 skipped for no reason
         Validator = 20,
+        BlockEpilogue = 21,
     }
     impl TransactionType {
         /// String value of the enum field names used in the ProtoBuf definition.
@@ -79,6 +81,7 @@ pub mod transaction {
                 TransactionType::StateCheckpoint => "TRANSACTION_TYPE_STATE_CHECKPOINT",
                 TransactionType::User => "TRANSACTION_TYPE_USER",
                 TransactionType::Validator => "TRANSACTION_TYPE_VALIDATOR",
+                TransactionType::BlockEpilogue => "TRANSACTION_TYPE_BLOCK_EPILOGUE",
             }
         }
         /// Creates an enum from field names used in the ProtoBuf definition.
@@ -90,6 +93,7 @@ pub mod transaction {
                 "TRANSACTION_TYPE_STATE_CHECKPOINT" => Some(Self::StateCheckpoint),
                 "TRANSACTION_TYPE_USER" => Some(Self::User),
                 "TRANSACTION_TYPE_VALIDATOR" => Some(Self::Validator),
+                "TRANSACTION_TYPE_BLOCK_EPILOGUE" => Some(Self::BlockEpilogue),
                 _ => None,
             }
         }
@@ -105,10 +109,15 @@ pub mod transaction {
         StateCheckpoint(super::StateCheckpointTransaction),
         #[prost(message, tag="10")]
         User(super::UserTransaction),
+        /// value 11-19 skipped for no reason
         #[prost(message, tag="21")]
         Validator(super::ValidatorTransaction),
+        /// value 22 is used up below (all Transaction fields have to have different index), so going to 23
+        #[prost(message, tag="23")]
+        BlockEpilogue(super::BlockEpilogueTransaction),
     }
 }
+/// Transaction types.
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct BlockMetadataTransaction {
@@ -140,6 +149,136 @@ pub struct StateCheckpointTransaction {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ValidatorTransaction {
+    #[prost(message, repeated, tag="3")]
+    pub events: ::prost::alloc::vec::Vec<Event>,
+    #[prost(oneof="validator_transaction::ValidatorTransactionType", tags="1, 2")]
+    pub validator_transaction_type: ::core::option::Option<validator_transaction::ValidatorTransactionType>,
+}
+/// Nested message and enum types in `ValidatorTransaction`.
+pub mod validator_transaction {
+    #[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+    pub struct ObservedJwkUpdate {
+        #[prost(message, optional, tag="1")]
+        pub quorum_certified_update: ::core::option::Option<observed_jwk_update::QuorumCertifiedUpdate>,
+    }
+    /// Nested message and enum types in `ObservedJwkUpdate`.
+    pub mod observed_jwk_update {
+        #[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+        pub struct ExportedProviderJwKs {
+            #[prost(string, tag="1")]
+            pub issuer: ::prost::alloc::string::String,
+            #[prost(uint64, tag="2")]
+            pub version: u64,
+            #[prost(message, repeated, tag="3")]
+            pub jwks: ::prost::alloc::vec::Vec<exported_provider_jw_ks::Jwk>,
+        }
+        /// Nested message and enum types in `ExportedProviderJWKs`.
+        pub mod exported_provider_jw_ks {
+            #[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+            pub struct Jwk {
+                #[prost(oneof="jwk::JwkType", tags="1, 2")]
+                pub jwk_type: ::core::option::Option<jwk::JwkType>,
+            }
+            /// Nested message and enum types in `JWK`.
+            pub mod jwk {
+                #[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+                pub struct Rsa {
+                    #[prost(string, tag="1")]
+                    pub kid: ::prost::alloc::string::String,
+                    #[prost(string, tag="2")]
+                    pub kty: ::prost::alloc::string::String,
+                    #[prost(string, tag="3")]
+                    pub alg: ::prost::alloc::string::String,
+                    #[prost(string, tag="4")]
+                    pub e: ::prost::alloc::string::String,
+                    #[prost(string, tag="5")]
+                    pub n: ::prost::alloc::string::String,
+                }
+                #[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+                pub struct UnsupportedJwk {
+                    #[prost(bytes="vec", tag="1")]
+                    pub id: ::prost::alloc::vec::Vec<u8>,
+                    #[prost(bytes="vec", tag="2")]
+                    pub payload: ::prost::alloc::vec::Vec<u8>,
+                }
+                #[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Oneof)]
+                pub enum JwkType {
+                    #[prost(message, tag="1")]
+                    UnsupportedJwk(UnsupportedJwk),
+                    #[prost(message, tag="2")]
+                    Rsa(Rsa),
+                }
+            }
+        }
+        #[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+        pub struct ExportedAggregateSignature {
+            #[prost(uint64, repeated, tag="1")]
+            pub signer_indices: ::prost::alloc::vec::Vec<u64>,
+            /// HexToBytes.
+            #[prost(bytes="vec", tag="2")]
+            pub sig: ::prost::alloc::vec::Vec<u8>,
+        }
+        #[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+        pub struct QuorumCertifiedUpdate {
+            #[prost(message, optional, tag="1")]
+            pub update: ::core::option::Option<ExportedProviderJwKs>,
+            #[prost(message, optional, tag="2")]
+            pub multi_sig: ::core::option::Option<ExportedAggregateSignature>,
+        }
+    }
+    #[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+    pub struct DkgUpdate {
+        #[prost(message, optional, tag="1")]
+        pub dkg_transcript: ::core::option::Option<dkg_update::DkgTranscript>,
+    }
+    /// Nested message and enum types in `DkgUpdate`.
+    pub mod dkg_update {
+        #[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+        pub struct DkgTranscript {
+            #[prost(uint64, tag="1")]
+            pub epoch: u64,
+            #[prost(string, tag="2")]
+            pub author: ::prost::alloc::string::String,
+            #[prost(bytes="vec", tag="3")]
+            pub payload: ::prost::alloc::vec::Vec<u8>,
+        }
+    }
+    #[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Oneof)]
+    pub enum ValidatorTransactionType {
+        #[prost(message, tag="1")]
+        ObservedJwkUpdate(ObservedJwkUpdate),
+        #[prost(message, tag="2")]
+        DkgUpdate(DkgUpdate),
+    }
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct BlockEpilogueTransaction {
+    #[prost(message, optional, tag="1")]
+    pub block_end_info: ::core::option::Option<BlockEndInfo>,
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct BlockEndInfo {
+    #[prost(bool, tag="1")]
+    pub block_gas_limit_reached: bool,
+    #[prost(bool, tag="2")]
+    pub block_output_limit_reached: bool,
+    #[prost(uint64, tag="3")]
+    pub block_effective_block_gas_units: u64,
+    #[prost(uint64, tag="4")]
+    pub block_approx_output_size: u64,
 }
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
@@ -652,6 +791,8 @@ pub struct MoveStruct {
     pub name: ::prost::alloc::string::String,
     #[prost(bool, tag="2")]
     pub is_native: bool,
+    #[prost(bool, tag="6")]
+    pub is_event: bool,
     #[prost(enumeration="MoveAbility", repeated, tag="3")]
     pub abilities: ::prost::alloc::vec::Vec<i32>,
     #[prost(message, repeated, tag="4")]
@@ -1215,7 +1356,7 @@ impl MoveAbility {
 }
 /// Encoded file descriptor set for the `aptos.transaction.v1` package
 pub const FILE_DESCRIPTOR_SET: &[u8] = &[
-    0x0a, 0xa0, 0x8f, 0x02, 0x0a, 0x26, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2f, 0x74, 0x72, 0x61, 0x6e,
+    0x0a, 0x8e, 0xb8, 0x02, 0x0a, 0x26, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2f, 0x74, 0x72, 0x61, 0x6e,
     0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73,
     0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x14, 0x61, 0x70,
     0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e,
@@ -1234,7 +1375,7 @@ pub const FILE_DESCRIPTOR_SET: &[u8] = &[
     0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0c, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74,
     0x69, 0x6f, 0x6e, 0x73, 0x12, 0x19, 0x0a, 0x08, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x5f, 0x69, 0x64,
     0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x07, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x49, 0x64, 0x22,
-    0xe3, 0x07, 0x0a, 0x0b, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12,
+    0xe1, 0x08, 0x0a, 0x0b, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12,
     0x3d, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x01, 0x20, 0x01,
     0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x75, 0x74, 0x69, 0x6c, 0x2e,
     0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74,
@@ -1277,2115 +1418,2442 @@ pub const FILE_DESCRIPTOR_SET: &[u8] = &[
     0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f,
     0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x54, 0x72,
     0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x00, 0x52, 0x09, 0x76, 0x61, 0x6c,
-    0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x12, 0x46, 0x0a, 0x09, 0x73, 0x69, 0x7a, 0x65, 0x5f, 0x69,
-    0x6e, 0x66, 0x6f, 0x18, 0x16, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x61, 0x70, 0x74, 0x6f,
-    0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31,
-    0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x69, 0x7a, 0x65,
-    0x49, 0x6e, 0x66, 0x6f, 0x52, 0x08, 0x73, 0x69, 0x7a, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0xd8,
-    0x01, 0x0a, 0x0f, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79,
-    0x70, 0x65, 0x12, 0x20, 0x0a, 0x1c, 0x54, 0x52, 0x41, 0x4e, 0x53, 0x41, 0x43, 0x54, 0x49, 0x4f,
-    0x4e, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49,
-    0x45, 0x44, 0x10, 0x00, 0x12, 0x1c, 0x0a, 0x18, 0x54, 0x52, 0x41, 0x4e, 0x53, 0x41, 0x43, 0x54,
-    0x49, 0x4f, 0x4e, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x47, 0x45, 0x4e, 0x45, 0x53, 0x49, 0x53,
-    0x10, 0x01, 0x12, 0x23, 0x0a, 0x1f, 0x54, 0x52, 0x41, 0x4e, 0x53, 0x41, 0x43, 0x54, 0x49, 0x4f,
-    0x4e, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x42, 0x4c, 0x4f, 0x43, 0x4b, 0x5f, 0x4d, 0x45, 0x54,
-    0x41, 0x44, 0x41, 0x54, 0x41, 0x10, 0x02, 0x12, 0x25, 0x0a, 0x21, 0x54, 0x52, 0x41, 0x4e, 0x53,
-    0x41, 0x43, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x53, 0x54, 0x41, 0x54,
-    0x45, 0x5f, 0x43, 0x48, 0x45, 0x43, 0x4b, 0x50, 0x4f, 0x49, 0x4e, 0x54, 0x10, 0x03, 0x12, 0x19,
-    0x0a, 0x15, 0x54, 0x52, 0x41, 0x4e, 0x53, 0x41, 0x43, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x54, 0x59,
-    0x50, 0x45, 0x5f, 0x55, 0x53, 0x45, 0x52, 0x10, 0x04, 0x12, 0x1e, 0x0a, 0x1a, 0x54, 0x52, 0x41,
-    0x4e, 0x53, 0x41, 0x43, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x56, 0x41,
-    0x4c, 0x49, 0x44, 0x41, 0x54, 0x4f, 0x52, 0x10, 0x14, 0x42, 0x0a, 0x0a, 0x08, 0x74, 0x78, 0x6e,
-    0x5f, 0x64, 0x61, 0x74, 0x61, 0x22, 0x8c, 0x02, 0x0a, 0x18, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x4d,
-    0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69,
-    0x6f, 0x6e, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02,
-    0x69, 0x64, 0x12, 0x18, 0x0a, 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28,
-    0x04, 0x42, 0x02, 0x30, 0x01, 0x52, 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x12, 0x33, 0x0a, 0x06,
-    0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x61,
+    0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x12, 0x57, 0x0a, 0x0e, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f,
+    0x65, 0x70, 0x69, 0x6c, 0x6f, 0x67, 0x75, 0x65, 0x18, 0x17, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2e,
+    0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69,
+    0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x45, 0x70, 0x69, 0x6c, 0x6f,
+    0x67, 0x75, 0x65, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x00,
+    0x52, 0x0d, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x45, 0x70, 0x69, 0x6c, 0x6f, 0x67, 0x75, 0x65, 0x12,
+    0x46, 0x0a, 0x09, 0x73, 0x69, 0x7a, 0x65, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x16, 0x20, 0x01,
+    0x28, 0x0b, 0x32, 0x29, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73,
+    0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61,
+    0x63, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x69, 0x7a, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x08, 0x73,
+    0x69, 0x7a, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0xfd, 0x01, 0x0a, 0x0f, 0x54, 0x72, 0x61, 0x6e,
+    0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x20, 0x0a, 0x1c, 0x54,
+    0x52, 0x41, 0x4e, 0x53, 0x41, 0x43, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f,
+    0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x1c, 0x0a,
+    0x18, 0x54, 0x52, 0x41, 0x4e, 0x53, 0x41, 0x43, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x54, 0x59, 0x50,
+    0x45, 0x5f, 0x47, 0x45, 0x4e, 0x45, 0x53, 0x49, 0x53, 0x10, 0x01, 0x12, 0x23, 0x0a, 0x1f, 0x54,
+    0x52, 0x41, 0x4e, 0x53, 0x41, 0x43, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f,
+    0x42, 0x4c, 0x4f, 0x43, 0x4b, 0x5f, 0x4d, 0x45, 0x54, 0x41, 0x44, 0x41, 0x54, 0x41, 0x10, 0x02,
+    0x12, 0x25, 0x0a, 0x21, 0x54, 0x52, 0x41, 0x4e, 0x53, 0x41, 0x43, 0x54, 0x49, 0x4f, 0x4e, 0x5f,
+    0x54, 0x59, 0x50, 0x45, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x45, 0x5f, 0x43, 0x48, 0x45, 0x43, 0x4b,
+    0x50, 0x4f, 0x49, 0x4e, 0x54, 0x10, 0x03, 0x12, 0x19, 0x0a, 0x15, 0x54, 0x52, 0x41, 0x4e, 0x53,
+    0x41, 0x43, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x53, 0x45, 0x52,
+    0x10, 0x04, 0x12, 0x1e, 0x0a, 0x1a, 0x54, 0x52, 0x41, 0x4e, 0x53, 0x41, 0x43, 0x54, 0x49, 0x4f,
+    0x4e, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x56, 0x41, 0x4c, 0x49, 0x44, 0x41, 0x54, 0x4f, 0x52,
+    0x10, 0x14, 0x12, 0x23, 0x0a, 0x1f, 0x54, 0x52, 0x41, 0x4e, 0x53, 0x41, 0x43, 0x54, 0x49, 0x4f,
+    0x4e, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x42, 0x4c, 0x4f, 0x43, 0x4b, 0x5f, 0x45, 0x50, 0x49,
+    0x4c, 0x4f, 0x47, 0x55, 0x45, 0x10, 0x15, 0x42, 0x0a, 0x0a, 0x08, 0x74, 0x78, 0x6e, 0x5f, 0x64,
+    0x61, 0x74, 0x61, 0x22, 0x8c, 0x02, 0x0a, 0x18, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x4d, 0x65, 0x74,
+    0x61, 0x64, 0x61, 0x74, 0x61, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e,
+    0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64,
+    0x12, 0x18, 0x0a, 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x42,
+    0x02, 0x30, 0x01, 0x52, 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x12, 0x33, 0x0a, 0x06, 0x65, 0x76,
+    0x65, 0x6e, 0x74, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x61, 0x70, 0x74,
+    0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76,
+    0x31, 0x2e, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x52, 0x06, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x12,
+    0x3d, 0x0a, 0x1b, 0x70, 0x72, 0x65, 0x76, 0x69, 0x6f, 0x75, 0x73, 0x5f, 0x62, 0x6c, 0x6f, 0x63,
+    0x6b, 0x5f, 0x76, 0x6f, 0x74, 0x65, 0x73, 0x5f, 0x62, 0x69, 0x74, 0x76, 0x65, 0x63, 0x18, 0x04,
+    0x20, 0x01, 0x28, 0x0c, 0x52, 0x18, 0x70, 0x72, 0x65, 0x76, 0x69, 0x6f, 0x75, 0x73, 0x42, 0x6c,
+    0x6f, 0x63, 0x6b, 0x56, 0x6f, 0x74, 0x65, 0x73, 0x42, 0x69, 0x74, 0x76, 0x65, 0x63, 0x12, 0x1a,
+    0x0a, 0x08, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09,
+    0x52, 0x08, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72, 0x12, 0x36, 0x0a, 0x17, 0x66, 0x61,
+    0x69, 0x6c, 0x65, 0x64, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72, 0x5f, 0x69, 0x6e,
+    0x64, 0x69, 0x63, 0x65, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0d, 0x52, 0x15, 0x66, 0x61, 0x69,
+    0x6c, 0x65, 0x64, 0x50, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x64, 0x69, 0x63,
+    0x65, 0x73, 0x22, 0x83, 0x01, 0x0a, 0x12, 0x47, 0x65, 0x6e, 0x65, 0x73, 0x69, 0x73, 0x54, 0x72,
+    0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x38, 0x0a, 0x07, 0x70, 0x61, 0x79,
+    0x6c, 0x6f, 0x61, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x61, 0x70, 0x74,
+    0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76,
+    0x31, 0x2e, 0x57, 0x72, 0x69, 0x74, 0x65, 0x53, 0x65, 0x74, 0x52, 0x07, 0x70, 0x61, 0x79, 0x6c,
+    0x6f, 0x61, 0x64, 0x12, 0x33, 0x0a, 0x06, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x02, 0x20,
+    0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e,
+    0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x45, 0x76, 0x65, 0x6e, 0x74,
+    0x52, 0x06, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x22, 0x1c, 0x0a, 0x1a, 0x53, 0x74, 0x61, 0x74,
+    0x65, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x54, 0x72, 0x61, 0x6e, 0x73,
+    0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0xd4, 0x0c, 0x0a, 0x14, 0x56, 0x61, 0x6c, 0x69, 0x64,
+    0x61, 0x74, 0x6f, 0x72, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12,
+    0x6e, 0x0a, 0x13, 0x6f, 0x62, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x5f, 0x6a, 0x77, 0x6b, 0x5f,
+    0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3c, 0x2e, 0x61,
     0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-    0x2e, 0x76, 0x31, 0x2e, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x52, 0x06, 0x65, 0x76, 0x65, 0x6e, 0x74,
-    0x73, 0x12, 0x3d, 0x0a, 0x1b, 0x70, 0x72, 0x65, 0x76, 0x69, 0x6f, 0x75, 0x73, 0x5f, 0x62, 0x6c,
-    0x6f, 0x63, 0x6b, 0x5f, 0x76, 0x6f, 0x74, 0x65, 0x73, 0x5f, 0x62, 0x69, 0x74, 0x76, 0x65, 0x63,
-    0x18, 0x04, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x18, 0x70, 0x72, 0x65, 0x76, 0x69, 0x6f, 0x75, 0x73,
-    0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x56, 0x6f, 0x74, 0x65, 0x73, 0x42, 0x69, 0x74, 0x76, 0x65, 0x63,
-    0x12, 0x1a, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01,
-    0x28, 0x09, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72, 0x12, 0x36, 0x0a, 0x17,
-    0x66, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72, 0x5f,
-    0x69, 0x6e, 0x64, 0x69, 0x63, 0x65, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0d, 0x52, 0x15, 0x66,
-    0x61, 0x69, 0x6c, 0x65, 0x64, 0x50, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x64,
-    0x69, 0x63, 0x65, 0x73, 0x22, 0x83, 0x01, 0x0a, 0x12, 0x47, 0x65, 0x6e, 0x65, 0x73, 0x69, 0x73,
-    0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x38, 0x0a, 0x07, 0x70,
-    0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x61,
+    0x2e, 0x76, 0x31, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x54, 0x72, 0x61,
+    0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x4f, 0x62, 0x73, 0x65, 0x72, 0x76, 0x65,
+    0x64, 0x4a, 0x77, 0x6b, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x48, 0x00, 0x52, 0x11, 0x6f, 0x62,
+    0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x4a, 0x77, 0x6b, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12,
+    0x55, 0x0a, 0x0a, 0x64, 0x6b, 0x67, 0x5f, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20,
+    0x01, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e,
+    0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64,
+    0x61, 0x74, 0x6f, 0x72, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e,
+    0x44, 0x6b, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x48, 0x00, 0x52, 0x09, 0x64, 0x6b, 0x67,
+    0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0x33, 0x0a, 0x06, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73,
+    0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74,
+    0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x45, 0x76,
+    0x65, 0x6e, 0x74, 0x52, 0x06, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x1a, 0xd1, 0x08, 0x0a, 0x11,
+    0x4f, 0x62, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x4a, 0x77, 0x6b, 0x55, 0x70, 0x64, 0x61, 0x74,
+    0x65, 0x12, 0x8a, 0x01, 0x0a, 0x17, 0x71, 0x75, 0x6f, 0x72, 0x75, 0x6d, 0x5f, 0x63, 0x65, 0x72,
+    0x74, 0x69, 0x66, 0x69, 0x65, 0x64, 0x5f, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x18, 0x01, 0x20,
+    0x01, 0x28, 0x0b, 0x32, 0x52, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e,
+    0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64,
+    0x61, 0x74, 0x6f, 0x72, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e,
+    0x4f, 0x62, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x4a, 0x77, 0x6b, 0x55, 0x70, 0x64, 0x61, 0x74,
+    0x65, 0x2e, 0x51, 0x75, 0x6f, 0x72, 0x75, 0x6d, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x65,
+    0x64, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x15, 0x71, 0x75, 0x6f, 0x72, 0x75, 0x6d, 0x43,
+    0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x65, 0x64, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x1a, 0xdc,
+    0x04, 0x0a, 0x14, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x50, 0x72, 0x6f, 0x76, 0x69,
+    0x64, 0x65, 0x72, 0x4a, 0x57, 0x4b, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x65,
+    0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x65, 0x72, 0x12,
+    0x18, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04,
+    0x52, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x69, 0x0a, 0x04, 0x6a, 0x77, 0x6b,
+    0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x55, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e,
+    0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x56,
+    0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74,
+    0x69, 0x6f, 0x6e, 0x2e, 0x4f, 0x62, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x4a, 0x77, 0x6b, 0x55,
+    0x70, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x50, 0x72,
+    0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x4a, 0x57, 0x4b, 0x73, 0x2e, 0x4a, 0x57, 0x4b, 0x52, 0x04,
+    0x6a, 0x77, 0x6b, 0x73, 0x1a, 0xa6, 0x03, 0x0a, 0x03, 0x4a, 0x57, 0x4b, 0x12, 0x8f, 0x01, 0x0a,
+    0x0f, 0x75, 0x6e, 0x73, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x5f, 0x6a, 0x77, 0x6b,
+    0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x64, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74,
+    0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x61,
+    0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69,
+    0x6f, 0x6e, 0x2e, 0x4f, 0x62, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x4a, 0x77, 0x6b, 0x55, 0x70,
+    0x64, 0x61, 0x74, 0x65, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x50, 0x72, 0x6f,
+    0x76, 0x69, 0x64, 0x65, 0x72, 0x4a, 0x57, 0x4b, 0x73, 0x2e, 0x4a, 0x57, 0x4b, 0x2e, 0x55, 0x6e,
+    0x73, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x4a, 0x57, 0x4b, 0x48, 0x00, 0x52, 0x0e,
+    0x75, 0x6e, 0x73, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x4a, 0x77, 0x6b, 0x12, 0x6d,
+    0x0a, 0x03, 0x72, 0x73, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x59, 0x2e, 0x61, 0x70,
+    0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e,
+    0x76, 0x31, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x54, 0x72, 0x61, 0x6e,
+    0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x4f, 0x62, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64,
+    0x4a, 0x77, 0x6b, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74,
+    0x65, 0x64, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x4a, 0x57, 0x4b, 0x73, 0x2e, 0x4a,
+    0x57, 0x4b, 0x2e, 0x52, 0x53, 0x41, 0x48, 0x00, 0x52, 0x03, 0x72, 0x73, 0x61, 0x1a, 0x57, 0x0a,
+    0x03, 0x52, 0x53, 0x41, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
+    0x09, 0x52, 0x03, 0x6b, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x74, 0x79, 0x18, 0x02, 0x20,
+    0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x74, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x61, 0x6c, 0x67, 0x18,
+    0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x61, 0x6c, 0x67, 0x12, 0x0c, 0x0a, 0x01, 0x65, 0x18,
+    0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x01, 0x65, 0x12, 0x0c, 0x0a, 0x01, 0x6e, 0x18, 0x05, 0x20,
+    0x01, 0x28, 0x09, 0x52, 0x01, 0x6e, 0x1a, 0x3a, 0x0a, 0x0e, 0x55, 0x6e, 0x73, 0x75, 0x70, 0x70,
+    0x6f, 0x72, 0x74, 0x65, 0x64, 0x4a, 0x57, 0x4b, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01,
+    0x20, 0x01, 0x28, 0x0c, 0x52, 0x02, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x61, 0x79, 0x6c,
+    0x6f, 0x61, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x07, 0x70, 0x61, 0x79, 0x6c, 0x6f,
+    0x61, 0x64, 0x42, 0x09, 0x0a, 0x07, 0x4a, 0x77, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x1a, 0x55, 0x0a,
+    0x1a, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61,
+    0x74, 0x65, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x12, 0x25, 0x0a, 0x0e, 0x73,
+    0x69, 0x67, 0x6e, 0x65, 0x72, 0x5f, 0x69, 0x6e, 0x64, 0x69, 0x63, 0x65, 0x73, 0x18, 0x01, 0x20,
+    0x03, 0x28, 0x04, 0x52, 0x0d, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x72, 0x49, 0x6e, 0x64, 0x69, 0x63,
+    0x65, 0x73, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x69, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52,
+    0x03, 0x73, 0x69, 0x67, 0x1a, 0xf8, 0x01, 0x0a, 0x15, 0x51, 0x75, 0x6f, 0x72, 0x75, 0x6d, 0x43,
+    0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x65, 0x64, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0x69,
+    0x0a, 0x06, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x51,
+    0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69,
+    0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x54,
+    0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x4f, 0x62, 0x73, 0x65, 0x72,
+    0x76, 0x65, 0x64, 0x4a, 0x77, 0x6b, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x45, 0x78, 0x70,
+    0x6f, 0x72, 0x74, 0x65, 0x64, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x4a, 0x57, 0x4b,
+    0x73, 0x52, 0x06, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0x74, 0x0a, 0x09, 0x6d, 0x75, 0x6c,
+    0x74, 0x69, 0x5f, 0x73, 0x69, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x57, 0x2e, 0x61,
     0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-    0x2e, 0x76, 0x31, 0x2e, 0x57, 0x72, 0x69, 0x74, 0x65, 0x53, 0x65, 0x74, 0x52, 0x07, 0x70, 0x61,
-    0x79, 0x6c, 0x6f, 0x61, 0x64, 0x12, 0x33, 0x0a, 0x06, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x18,
-    0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72,
-    0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x45, 0x76, 0x65,
-    0x6e, 0x74, 0x52, 0x06, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x22, 0x1c, 0x0a, 0x1a, 0x53, 0x74,
-    0x61, 0x74, 0x65, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x54, 0x72, 0x61,
-    0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x16, 0x0a, 0x14, 0x56, 0x61, 0x6c, 0x69,
-    0x64, 0x61, 0x74, 0x6f, 0x72, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-    0x22, 0x8e, 0x01, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63,
-    0x74, 0x69, 0x6f, 0x6e, 0x12, 0x46, 0x0a, 0x07, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x18,
-    0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72,
-    0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x73, 0x65,
-    0x72, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75,
-    0x65, 0x73, 0x74, 0x52, 0x07, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x33, 0x0a, 0x06,
-    0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x61,
+    0x2e, 0x76, 0x31, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x54, 0x72, 0x61,
+    0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x4f, 0x62, 0x73, 0x65, 0x72, 0x76, 0x65,
+    0x64, 0x4a, 0x77, 0x6b, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72,
+    0x74, 0x65, 0x64, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x65, 0x53, 0x69, 0x67, 0x6e,
+    0x61, 0x74, 0x75, 0x72, 0x65, 0x52, 0x08, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x53, 0x69, 0x67, 0x1a,
+    0xcf, 0x01, 0x0a, 0x09, 0x44, 0x6b, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0x69, 0x0a,
+    0x0e, 0x64, 0x6b, 0x67, 0x5f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x18,
+    0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x42, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72,
+    0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x61, 0x6c,
+    0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f,
+    0x6e, 0x2e, 0x44, 0x6b, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x44, 0x6b, 0x67, 0x54,
+    0x72, 0x61, 0x6e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x52, 0x0d, 0x64, 0x6b, 0x67, 0x54, 0x72,
+    0x61, 0x6e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x1a, 0x57, 0x0a, 0x0d, 0x44, 0x6b, 0x67, 0x54,
+    0x72, 0x61, 0x6e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x70, 0x6f,
+    0x63, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x12,
+    0x16, 0x0a, 0x06, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
+    0x06, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x61, 0x79, 0x6c, 0x6f,
+    0x61, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x07, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61,
+    0x64, 0x42, 0x1a, 0x0a, 0x18, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x54, 0x72,
+    0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x22, 0x7c, 0x0a,
+    0x18, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x45, 0x70, 0x69, 0x6c, 0x6f, 0x67, 0x75, 0x65, 0x54, 0x72,
+    0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x4d, 0x0a, 0x0e, 0x62, 0x6c, 0x6f,
+    0x63, 0x6b, 0x5f, 0x65, 0x6e, 0x64, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28,
+    0x0b, 0x32, 0x22, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61,
+    0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x45, 0x6e,
+    0x64, 0x49, 0x6e, 0x66, 0x6f, 0x48, 0x00, 0x52, 0x0c, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x45, 0x6e,
+    0x64, 0x49, 0x6e, 0x66, 0x6f, 0x88, 0x01, 0x01, 0x42, 0x11, 0x0a, 0x0f, 0x5f, 0x62, 0x6c, 0x6f,
+    0x63, 0x6b, 0x5f, 0x65, 0x6e, 0x64, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x81, 0x02, 0x0a, 0x0c,
+    0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x45, 0x6e, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x35, 0x0a, 0x17,
+    0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x67, 0x61, 0x73, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x5f,
+    0x72, 0x65, 0x61, 0x63, 0x68, 0x65, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x14, 0x62,
+    0x6c, 0x6f, 0x63, 0x6b, 0x47, 0x61, 0x73, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x52, 0x65, 0x61, 0x63,
+    0x68, 0x65, 0x64, 0x12, 0x3b, 0x0a, 0x1a, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x6f, 0x75, 0x74,
+    0x70, 0x75, 0x74, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x5f, 0x72, 0x65, 0x61, 0x63, 0x68, 0x65,
+    0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x17, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x4f, 0x75,
+    0x74, 0x70, 0x75, 0x74, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x52, 0x65, 0x61, 0x63, 0x68, 0x65, 0x64,
+    0x12, 0x44, 0x0a, 0x1f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74,
+    0x69, 0x76, 0x65, 0x5f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x67, 0x61, 0x73, 0x5f, 0x75, 0x6e,
+    0x69, 0x74, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x52, 0x1b, 0x62, 0x6c, 0x6f, 0x63, 0x6b,
+    0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x69, 0x76, 0x65, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x47, 0x61,
+    0x73, 0x55, 0x6e, 0x69, 0x74, 0x73, 0x12, 0x37, 0x0a, 0x18, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f,
+    0x61, 0x70, 0x70, 0x72, 0x6f, 0x78, 0x5f, 0x6f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x5f, 0x73, 0x69,
+    0x7a, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x04, 0x52, 0x15, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x41,
+    0x70, 0x70, 0x72, 0x6f, 0x78, 0x4f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x53, 0x69, 0x7a, 0x65, 0x22,
+    0x8e, 0x01, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74,
+    0x69, 0x6f, 0x6e, 0x12, 0x46, 0x0a, 0x07, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x18, 0x01,
+    0x20, 0x01, 0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61,
+    0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x73, 0x65, 0x72,
+    0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65,
+    0x73, 0x74, 0x52, 0x07, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x33, 0x0a, 0x06, 0x65,
+    0x76, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x61, 0x70,
+    0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e,
+    0x76, 0x31, 0x2e, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x52, 0x06, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73,
+    0x22, 0xc9, 0x01, 0x0a, 0x05, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x30, 0x0a, 0x03, 0x6b, 0x65,
+    0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e,
+    0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x45,
+    0x76, 0x65, 0x6e, 0x74, 0x4b, 0x65, 0x79, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x2b, 0x0a, 0x0f,
+    0x73, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x65, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18,
+    0x02, 0x20, 0x01, 0x28, 0x04, 0x42, 0x02, 0x30, 0x01, 0x52, 0x0e, 0x73, 0x65, 0x71, 0x75, 0x65,
+    0x6e, 0x63, 0x65, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x32, 0x0a, 0x04, 0x74, 0x79, 0x70,
+    0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e,
+    0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d,
+    0x6f, 0x76, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x19, 0x0a,
+    0x08, 0x74, 0x79, 0x70, 0x65, 0x5f, 0x73, 0x74, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52,
+    0x07, 0x74, 0x79, 0x70, 0x65, 0x53, 0x74, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61,
+    0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x96, 0x03, 0x0a,
+    0x0f, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f,
+    0x12, 0x12, 0x0a, 0x04, 0x68, 0x61, 0x73, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04,
+    0x68, 0x61, 0x73, 0x68, 0x12, 0x2a, 0x0a, 0x11, 0x73, 0x74, 0x61, 0x74, 0x65, 0x5f, 0x63, 0x68,
+    0x61, 0x6e, 0x67, 0x65, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52,
+    0x0f, 0x73, 0x74, 0x61, 0x74, 0x65, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x48, 0x61, 0x73, 0x68,
+    0x12, 0x26, 0x0a, 0x0f, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x5f, 0x72, 0x6f, 0x6f, 0x74, 0x5f, 0x68,
+    0x61, 0x73, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0d, 0x65, 0x76, 0x65, 0x6e, 0x74,
+    0x52, 0x6f, 0x6f, 0x74, 0x48, 0x61, 0x73, 0x68, 0x12, 0x37, 0x0a, 0x15, 0x73, 0x74, 0x61, 0x74,
+    0x65, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x5f, 0x68, 0x61, 0x73,
+    0x68, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0c, 0x48, 0x00, 0x52, 0x13, 0x73, 0x74, 0x61, 0x74, 0x65,
+    0x43, 0x68, 0x65, 0x63, 0x6b, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x48, 0x61, 0x73, 0x68, 0x88, 0x01,
+    0x01, 0x12, 0x1d, 0x0a, 0x08, 0x67, 0x61, 0x73, 0x5f, 0x75, 0x73, 0x65, 0x64, 0x18, 0x05, 0x20,
+    0x01, 0x28, 0x04, 0x42, 0x02, 0x30, 0x01, 0x52, 0x07, 0x67, 0x61, 0x73, 0x55, 0x73, 0x65, 0x64,
+    0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28,
+    0x08, 0x52, 0x07, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x12, 0x1b, 0x0a, 0x09, 0x76, 0x6d,
+    0x5f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x76,
+    0x6d, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x32, 0x0a, 0x15, 0x61, 0x63, 0x63, 0x75, 0x6d,
+    0x75, 0x6c, 0x61, 0x74, 0x6f, 0x72, 0x5f, 0x72, 0x6f, 0x6f, 0x74, 0x5f, 0x68, 0x61, 0x73, 0x68,
+    0x18, 0x08, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x13, 0x61, 0x63, 0x63, 0x75, 0x6d, 0x75, 0x6c, 0x61,
+    0x74, 0x6f, 0x72, 0x52, 0x6f, 0x6f, 0x74, 0x48, 0x61, 0x73, 0x68, 0x12, 0x3e, 0x0a, 0x07, 0x63,
+    0x68, 0x61, 0x6e, 0x67, 0x65, 0x73, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x61,
     0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-    0x2e, 0x76, 0x31, 0x2e, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x52, 0x06, 0x65, 0x76, 0x65, 0x6e, 0x74,
-    0x73, 0x22, 0xc9, 0x01, 0x0a, 0x05, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x30, 0x0a, 0x03, 0x6b,
-    0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73,
-    0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e,
-    0x45, 0x76, 0x65, 0x6e, 0x74, 0x4b, 0x65, 0x79, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x2b, 0x0a,
-    0x0f, 0x73, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x65, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72,
-    0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x42, 0x02, 0x30, 0x01, 0x52, 0x0e, 0x73, 0x65, 0x71, 0x75,
-    0x65, 0x6e, 0x63, 0x65, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x32, 0x0a, 0x04, 0x74, 0x79,
-    0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73,
-    0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e,
-    0x4d, 0x6f, 0x76, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x19,
-    0x0a, 0x08, 0x74, 0x79, 0x70, 0x65, 0x5f, 0x73, 0x74, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09,
-    0x52, 0x07, 0x74, 0x79, 0x70, 0x65, 0x53, 0x74, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74,
-    0x61, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x96, 0x03,
-    0x0a, 0x0f, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x66,
-    0x6f, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x61, 0x73, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52,
-    0x04, 0x68, 0x61, 0x73, 0x68, 0x12, 0x2a, 0x0a, 0x11, 0x73, 0x74, 0x61, 0x74, 0x65, 0x5f, 0x63,
-    0x68, 0x61, 0x6e, 0x67, 0x65, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c,
-    0x52, 0x0f, 0x73, 0x74, 0x61, 0x74, 0x65, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x48, 0x61, 0x73,
-    0x68, 0x12, 0x26, 0x0a, 0x0f, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x5f, 0x72, 0x6f, 0x6f, 0x74, 0x5f,
-    0x68, 0x61, 0x73, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0d, 0x65, 0x76, 0x65, 0x6e,
-    0x74, 0x52, 0x6f, 0x6f, 0x74, 0x48, 0x61, 0x73, 0x68, 0x12, 0x37, 0x0a, 0x15, 0x73, 0x74, 0x61,
-    0x74, 0x65, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x5f, 0x68, 0x61,
-    0x73, 0x68, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0c, 0x48, 0x00, 0x52, 0x13, 0x73, 0x74, 0x61, 0x74,
-    0x65, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x48, 0x61, 0x73, 0x68, 0x88,
-    0x01, 0x01, 0x12, 0x1d, 0x0a, 0x08, 0x67, 0x61, 0x73, 0x5f, 0x75, 0x73, 0x65, 0x64, 0x18, 0x05,
-    0x20, 0x01, 0x28, 0x04, 0x42, 0x02, 0x30, 0x01, 0x52, 0x07, 0x67, 0x61, 0x73, 0x55, 0x73, 0x65,
-    0x64, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x18, 0x06, 0x20, 0x01,
-    0x28, 0x08, 0x52, 0x07, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x12, 0x1b, 0x0a, 0x09, 0x76,
-    0x6d, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08,
-    0x76, 0x6d, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x32, 0x0a, 0x15, 0x61, 0x63, 0x63, 0x75,
-    0x6d, 0x75, 0x6c, 0x61, 0x74, 0x6f, 0x72, 0x5f, 0x72, 0x6f, 0x6f, 0x74, 0x5f, 0x68, 0x61, 0x73,
-    0x68, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x13, 0x61, 0x63, 0x63, 0x75, 0x6d, 0x75, 0x6c,
-    0x61, 0x74, 0x6f, 0x72, 0x52, 0x6f, 0x6f, 0x74, 0x48, 0x61, 0x73, 0x68, 0x12, 0x3e, 0x0a, 0x07,
-    0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x73, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e,
+    0x2e, 0x76, 0x31, 0x2e, 0x57, 0x72, 0x69, 0x74, 0x65, 0x53, 0x65, 0x74, 0x43, 0x68, 0x61, 0x6e,
+    0x67, 0x65, 0x52, 0x07, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x73, 0x42, 0x18, 0x0a, 0x16, 0x5f,
+    0x73, 0x74, 0x61, 0x74, 0x65, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x70, 0x6f, 0x69, 0x6e, 0x74,
+    0x5f, 0x68, 0x61, 0x73, 0x68, 0x22, 0x60, 0x0a, 0x08, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x4b, 0x65,
+    0x79, 0x12, 0x2b, 0x0a, 0x0f, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6e, 0x75,
+    0x6d, 0x62, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x02, 0x30, 0x01, 0x52, 0x0e,
+    0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x27,
+    0x0a, 0x0f, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73,
+    0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74,
+    0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x22, 0x91, 0x03, 0x0a, 0x16, 0x55, 0x73, 0x65, 0x72,
+    0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65,
+    0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01,
+    0x28, 0x09, 0x52, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x12, 0x2b, 0x0a, 0x0f, 0x73, 0x65,
+    0x71, 0x75, 0x65, 0x6e, 0x63, 0x65, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x02, 0x20,
+    0x01, 0x28, 0x04, 0x42, 0x02, 0x30, 0x01, 0x52, 0x0e, 0x73, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63,
+    0x65, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x28, 0x0a, 0x0e, 0x6d, 0x61, 0x78, 0x5f, 0x67,
+    0x61, 0x73, 0x5f, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x42,
+    0x02, 0x30, 0x01, 0x52, 0x0c, 0x6d, 0x61, 0x78, 0x47, 0x61, 0x73, 0x41, 0x6d, 0x6f, 0x75, 0x6e,
+    0x74, 0x12, 0x28, 0x0a, 0x0e, 0x67, 0x61, 0x73, 0x5f, 0x75, 0x6e, 0x69, 0x74, 0x5f, 0x70, 0x72,
+    0x69, 0x63, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x04, 0x42, 0x02, 0x30, 0x01, 0x52, 0x0c, 0x67,
+    0x61, 0x73, 0x55, 0x6e, 0x69, 0x74, 0x50, 0x72, 0x69, 0x63, 0x65, 0x12, 0x5b, 0x0a, 0x19, 0x65,
+    0x78, 0x70, 0x69, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74,
+    0x61, 0x6d, 0x70, 0x5f, 0x73, 0x65, 0x63, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f,
+    0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x75, 0x74, 0x69, 0x6c, 0x2e, 0x74, 0x69, 0x6d, 0x65,
+    0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52,
+    0x17, 0x65, 0x78, 0x70, 0x69, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x73,
+    0x74, 0x61, 0x6d, 0x70, 0x53, 0x65, 0x63, 0x73, 0x12, 0x42, 0x0a, 0x07, 0x70, 0x61, 0x79, 0x6c,
+    0x6f, 0x61, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x61, 0x70, 0x74, 0x6f,
+    0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31,
+    0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x61, 0x79, 0x6c,
+    0x6f, 0x61, 0x64, 0x52, 0x07, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x12, 0x3d, 0x0a, 0x09,
+    0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32,
+    0x1f, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74,
+    0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65,
+    0x52, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x22, 0x88, 0x03, 0x0a, 0x08,
+    0x57, 0x72, 0x69, 0x74, 0x65, 0x53, 0x65, 0x74, 0x12, 0x51, 0x0a, 0x0e, 0x77, 0x72, 0x69, 0x74,
+    0x65, 0x5f, 0x73, 0x65, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e,
+    0x32, 0x2b, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63,
+    0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x57, 0x72, 0x69, 0x74, 0x65, 0x53, 0x65, 0x74,
+    0x2e, 0x57, 0x72, 0x69, 0x74, 0x65, 0x53, 0x65, 0x74, 0x54, 0x79, 0x70, 0x65, 0x52, 0x0c, 0x77,
+    0x72, 0x69, 0x74, 0x65, 0x53, 0x65, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x50, 0x0a, 0x10, 0x73,
+    0x63, 0x72, 0x69, 0x70, 0x74, 0x5f, 0x77, 0x72, 0x69, 0x74, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x18,
+    0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72,
+    0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x53, 0x63, 0x72,
+    0x69, 0x70, 0x74, 0x57, 0x72, 0x69, 0x74, 0x65, 0x53, 0x65, 0x74, 0x48, 0x00, 0x52, 0x0e, 0x73,
+    0x63, 0x72, 0x69, 0x70, 0x74, 0x57, 0x72, 0x69, 0x74, 0x65, 0x53, 0x65, 0x74, 0x12, 0x50, 0x0a,
+    0x10, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x5f, 0x77, 0x72, 0x69, 0x74, 0x65, 0x5f, 0x73, 0x65,
+    0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e,
+    0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x44,
+    0x69, 0x72, 0x65, 0x63, 0x74, 0x57, 0x72, 0x69, 0x74, 0x65, 0x53, 0x65, 0x74, 0x48, 0x00, 0x52,
+    0x0e, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x57, 0x72, 0x69, 0x74, 0x65, 0x53, 0x65, 0x74, 0x22,
+    0x78, 0x0a, 0x0c, 0x57, 0x72, 0x69, 0x74, 0x65, 0x53, 0x65, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12,
+    0x1e, 0x0a, 0x1a, 0x57, 0x52, 0x49, 0x54, 0x45, 0x5f, 0x53, 0x45, 0x54, 0x5f, 0x54, 0x59, 0x50,
+    0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12,
+    0x23, 0x0a, 0x1f, 0x57, 0x52, 0x49, 0x54, 0x45, 0x5f, 0x53, 0x45, 0x54, 0x5f, 0x54, 0x59, 0x50,
+    0x45, 0x5f, 0x53, 0x43, 0x52, 0x49, 0x50, 0x54, 0x5f, 0x57, 0x52, 0x49, 0x54, 0x45, 0x5f, 0x53,
+    0x45, 0x54, 0x10, 0x01, 0x12, 0x23, 0x0a, 0x1f, 0x57, 0x52, 0x49, 0x54, 0x45, 0x5f, 0x53, 0x45,
+    0x54, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x44, 0x49, 0x52, 0x45, 0x43, 0x54, 0x5f, 0x57, 0x52,
+    0x49, 0x54, 0x45, 0x5f, 0x53, 0x45, 0x54, 0x10, 0x02, 0x42, 0x0b, 0x0a, 0x09, 0x77, 0x72, 0x69,
+    0x74, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x22, 0x6c, 0x0a, 0x0e, 0x53, 0x63, 0x72, 0x69, 0x70, 0x74,
+    0x57, 0x72, 0x69, 0x74, 0x65, 0x53, 0x65, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x65, 0x78, 0x65, 0x63,
+    0x75, 0x74, 0x65, 0x5f, 0x61, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x65, 0x78,
+    0x65, 0x63, 0x75, 0x74, 0x65, 0x41, 0x73, 0x12, 0x3b, 0x0a, 0x06, 0x73, 0x63, 0x72, 0x69, 0x70,
+    0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e,
+    0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x53,
+    0x63, 0x72, 0x69, 0x70, 0x74, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x52, 0x06, 0x73, 0x63,
+    0x72, 0x69, 0x70, 0x74, 0x22, 0x95, 0x01, 0x0a, 0x0e, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x57,
+    0x72, 0x69, 0x74, 0x65, 0x53, 0x65, 0x74, 0x12, 0x4e, 0x0a, 0x10, 0x77, 0x72, 0x69, 0x74, 0x65,
+    0x5f, 0x73, 0x65, 0x74, 0x5f, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28,
+    0x0b, 0x32, 0x24, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61,
+    0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x57, 0x72, 0x69, 0x74, 0x65, 0x53, 0x65,
+    0x74, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x0e, 0x77, 0x72, 0x69, 0x74, 0x65, 0x53, 0x65,
+    0x74, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x33, 0x0a, 0x06, 0x65, 0x76, 0x65, 0x6e, 0x74,
+    0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e,
+    0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x45,
+    0x76, 0x65, 0x6e, 0x74, 0x52, 0x06, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x22, 0xea, 0x05, 0x0a,
+    0x0e, 0x57, 0x72, 0x69, 0x74, 0x65, 0x53, 0x65, 0x74, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x12,
+    0x3d, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x29, 0x2e,
     0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f,
     0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x57, 0x72, 0x69, 0x74, 0x65, 0x53, 0x65, 0x74, 0x43, 0x68, 0x61,
-    0x6e, 0x67, 0x65, 0x52, 0x07, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x73, 0x42, 0x18, 0x0a, 0x16,
-    0x5f, 0x73, 0x74, 0x61, 0x74, 0x65, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x70, 0x6f, 0x69, 0x6e,
-    0x74, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x22, 0x60, 0x0a, 0x08, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x4b,
-    0x65, 0x79, 0x12, 0x2b, 0x0a, 0x0f, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6e,
-    0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x02, 0x30, 0x01, 0x52,
-    0x0e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x12,
-    0x27, 0x0a, 0x0f, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65,
-    0x73, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e,
-    0x74, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x22, 0x91, 0x03, 0x0a, 0x16, 0x55, 0x73, 0x65,
-    0x72, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75,
-    0x65, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20,
-    0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x12, 0x2b, 0x0a, 0x0f, 0x73,
-    0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x65, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x02,
-    0x20, 0x01, 0x28, 0x04, 0x42, 0x02, 0x30, 0x01, 0x52, 0x0e, 0x73, 0x65, 0x71, 0x75, 0x65, 0x6e,
-    0x63, 0x65, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x28, 0x0a, 0x0e, 0x6d, 0x61, 0x78, 0x5f,
-    0x67, 0x61, 0x73, 0x5f, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04,
-    0x42, 0x02, 0x30, 0x01, 0x52, 0x0c, 0x6d, 0x61, 0x78, 0x47, 0x61, 0x73, 0x41, 0x6d, 0x6f, 0x75,
-    0x6e, 0x74, 0x12, 0x28, 0x0a, 0x0e, 0x67, 0x61, 0x73, 0x5f, 0x75, 0x6e, 0x69, 0x74, 0x5f, 0x70,
-    0x72, 0x69, 0x63, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x04, 0x42, 0x02, 0x30, 0x01, 0x52, 0x0c,
-    0x67, 0x61, 0x73, 0x55, 0x6e, 0x69, 0x74, 0x50, 0x72, 0x69, 0x63, 0x65, 0x12, 0x5b, 0x0a, 0x19,
-    0x65, 0x78, 0x70, 0x69, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x73,
-    0x74, 0x61, 0x6d, 0x70, 0x5f, 0x73, 0x65, 0x63, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32,
-    0x1f, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x75, 0x74, 0x69, 0x6c, 0x2e, 0x74, 0x69, 0x6d,
-    0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70,
-    0x52, 0x17, 0x65, 0x78, 0x70, 0x69, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x69, 0x6d, 0x65,
-    0x73, 0x74, 0x61, 0x6d, 0x70, 0x53, 0x65, 0x63, 0x73, 0x12, 0x42, 0x0a, 0x07, 0x70, 0x61, 0x79,
-    0x6c, 0x6f, 0x61, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x61, 0x70, 0x74,
-    0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76,
-    0x31, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x61, 0x79,
-    0x6c, 0x6f, 0x61, 0x64, 0x52, 0x07, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x12, 0x3d, 0x0a,
-    0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b,
-    0x32, 0x1f, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63,
-    0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72,
-    0x65, 0x52, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x22, 0x88, 0x03, 0x0a,
-    0x08, 0x57, 0x72, 0x69, 0x74, 0x65, 0x53, 0x65, 0x74, 0x12, 0x51, 0x0a, 0x0e, 0x77, 0x72, 0x69,
-    0x74, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
-    0x0e, 0x32, 0x2b, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61,
-    0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x57, 0x72, 0x69, 0x74, 0x65, 0x53, 0x65,
-    0x74, 0x2e, 0x57, 0x72, 0x69, 0x74, 0x65, 0x53, 0x65, 0x74, 0x54, 0x79, 0x70, 0x65, 0x52, 0x0c,
-    0x77, 0x72, 0x69, 0x74, 0x65, 0x53, 0x65, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x50, 0x0a, 0x10,
-    0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x5f, 0x77, 0x72, 0x69, 0x74, 0x65, 0x5f, 0x73, 0x65, 0x74,
-    0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74,
-    0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x53, 0x63,
-    0x72, 0x69, 0x70, 0x74, 0x57, 0x72, 0x69, 0x74, 0x65, 0x53, 0x65, 0x74, 0x48, 0x00, 0x52, 0x0e,
-    0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x57, 0x72, 0x69, 0x74, 0x65, 0x53, 0x65, 0x74, 0x12, 0x50,
-    0x0a, 0x10, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x5f, 0x77, 0x72, 0x69, 0x74, 0x65, 0x5f, 0x73,
-    0x65, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73,
-    0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e,
-    0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x57, 0x72, 0x69, 0x74, 0x65, 0x53, 0x65, 0x74, 0x48, 0x00,
-    0x52, 0x0e, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x57, 0x72, 0x69, 0x74, 0x65, 0x53, 0x65, 0x74,
-    0x22, 0x78, 0x0a, 0x0c, 0x57, 0x72, 0x69, 0x74, 0x65, 0x53, 0x65, 0x74, 0x54, 0x79, 0x70, 0x65,
-    0x12, 0x1e, 0x0a, 0x1a, 0x57, 0x52, 0x49, 0x54, 0x45, 0x5f, 0x53, 0x45, 0x54, 0x5f, 0x54, 0x59,
-    0x50, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00,
-    0x12, 0x23, 0x0a, 0x1f, 0x57, 0x52, 0x49, 0x54, 0x45, 0x5f, 0x53, 0x45, 0x54, 0x5f, 0x54, 0x59,
-    0x50, 0x45, 0x5f, 0x53, 0x43, 0x52, 0x49, 0x50, 0x54, 0x5f, 0x57, 0x52, 0x49, 0x54, 0x45, 0x5f,
-    0x53, 0x45, 0x54, 0x10, 0x01, 0x12, 0x23, 0x0a, 0x1f, 0x57, 0x52, 0x49, 0x54, 0x45, 0x5f, 0x53,
-    0x45, 0x54, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x44, 0x49, 0x52, 0x45, 0x43, 0x54, 0x5f, 0x57,
-    0x52, 0x49, 0x54, 0x45, 0x5f, 0x53, 0x45, 0x54, 0x10, 0x02, 0x42, 0x0b, 0x0a, 0x09, 0x77, 0x72,
-    0x69, 0x74, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x22, 0x6c, 0x0a, 0x0e, 0x53, 0x63, 0x72, 0x69, 0x70,
-    0x74, 0x57, 0x72, 0x69, 0x74, 0x65, 0x53, 0x65, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x65, 0x78, 0x65,
-    0x63, 0x75, 0x74, 0x65, 0x5f, 0x61, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x65,
-    0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x41, 0x73, 0x12, 0x3b, 0x0a, 0x06, 0x73, 0x63, 0x72, 0x69,
-    0x70, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73,
-    0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e,
-    0x53, 0x63, 0x72, 0x69, 0x70, 0x74, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x52, 0x06, 0x73,
-    0x63, 0x72, 0x69, 0x70, 0x74, 0x22, 0x95, 0x01, 0x0a, 0x0e, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74,
-    0x57, 0x72, 0x69, 0x74, 0x65, 0x53, 0x65, 0x74, 0x12, 0x4e, 0x0a, 0x10, 0x77, 0x72, 0x69, 0x74,
-    0x65, 0x5f, 0x73, 0x65, 0x74, 0x5f, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x18, 0x01, 0x20, 0x03,
+    0x6e, 0x67, 0x65, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x49,
+    0x0a, 0x0d, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x5f, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x18,
+    0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72,
+    0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c,
+    0x65, 0x74, 0x65, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x48, 0x00, 0x52, 0x0c, 0x64, 0x65, 0x6c,
+    0x65, 0x74, 0x65, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x12, 0x4f, 0x0a, 0x0f, 0x64, 0x65, 0x6c,
+    0x65, 0x74, 0x65, 0x5f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x03, 0x20, 0x01,
     0x28, 0x0b, 0x32, 0x24, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73,
-    0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x57, 0x72, 0x69, 0x74, 0x65, 0x53,
-    0x65, 0x74, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x0e, 0x77, 0x72, 0x69, 0x74, 0x65, 0x53,
-    0x65, 0x74, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x33, 0x0a, 0x06, 0x65, 0x76, 0x65, 0x6e,
-    0x74, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73,
-    0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e,
-    0x45, 0x76, 0x65, 0x6e, 0x74, 0x52, 0x06, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x22, 0xea, 0x05,
-    0x0a, 0x0e, 0x57, 0x72, 0x69, 0x74, 0x65, 0x53, 0x65, 0x74, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65,
-    0x12, 0x3d, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x29,
-    0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69,
-    0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x57, 0x72, 0x69, 0x74, 0x65, 0x53, 0x65, 0x74, 0x43, 0x68,
-    0x61, 0x6e, 0x67, 0x65, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12,
-    0x49, 0x0a, 0x0d, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x5f, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65,
-    0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74,
-    0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65,
-    0x6c, 0x65, 0x74, 0x65, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x48, 0x00, 0x52, 0x0c, 0x64, 0x65,
-    0x6c, 0x65, 0x74, 0x65, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x12, 0x4f, 0x0a, 0x0f, 0x64, 0x65,
-    0x6c, 0x65, 0x74, 0x65, 0x5f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x03, 0x20,
-    0x01, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e,
-    0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74,
-    0x65, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x48, 0x00, 0x52, 0x0e, 0x64, 0x65, 0x6c,
-    0x65, 0x74, 0x65, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x53, 0x0a, 0x11, 0x64,
-    0x65, 0x6c, 0x65, 0x74, 0x65, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x69, 0x74, 0x65, 0x6d,
-    0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74,
-    0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65,
-    0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x49, 0x74, 0x65, 0x6d, 0x48, 0x00, 0x52,
-    0x0f, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x49, 0x74, 0x65, 0x6d,
-    0x12, 0x46, 0x0a, 0x0c, 0x77, 0x72, 0x69, 0x74, 0x65, 0x5f, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65,
-    0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74,
-    0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x57, 0x72,
-    0x69, 0x74, 0x65, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x48, 0x00, 0x52, 0x0b, 0x77, 0x72, 0x69,
-    0x74, 0x65, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x12, 0x4c, 0x0a, 0x0e, 0x77, 0x72, 0x69, 0x74,
-    0x65, 0x5f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b,
-    0x32, 0x23, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63,
-    0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x57, 0x72, 0x69, 0x74, 0x65, 0x52, 0x65, 0x73,
-    0x6f, 0x75, 0x72, 0x63, 0x65, 0x48, 0x00, 0x52, 0x0d, 0x77, 0x72, 0x69, 0x74, 0x65, 0x52, 0x65,
-    0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x50, 0x0a, 0x10, 0x77, 0x72, 0x69, 0x74, 0x65, 0x5f,
-    0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x69, 0x74, 0x65, 0x6d, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b,
-    0x32, 0x24, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63,
-    0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x57, 0x72, 0x69, 0x74, 0x65, 0x54, 0x61, 0x62,
-    0x6c, 0x65, 0x49, 0x74, 0x65, 0x6d, 0x48, 0x00, 0x52, 0x0e, 0x77, 0x72, 0x69, 0x74, 0x65, 0x54,
-    0x61, 0x62, 0x6c, 0x65, 0x49, 0x74, 0x65, 0x6d, 0x22, 0xb5, 0x01, 0x0a, 0x04, 0x54, 0x79, 0x70,
-    0x65, 0x12, 0x14, 0x0a, 0x10, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43,
-    0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x16, 0x0a, 0x12, 0x54, 0x59, 0x50, 0x45, 0x5f,
-    0x44, 0x45, 0x4c, 0x45, 0x54, 0x45, 0x5f, 0x4d, 0x4f, 0x44, 0x55, 0x4c, 0x45, 0x10, 0x01, 0x12,
-    0x18, 0x0a, 0x14, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x44, 0x45, 0x4c, 0x45, 0x54, 0x45, 0x5f, 0x52,
-    0x45, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x10, 0x02, 0x12, 0x1a, 0x0a, 0x16, 0x54, 0x59, 0x50,
-    0x45, 0x5f, 0x44, 0x45, 0x4c, 0x45, 0x54, 0x45, 0x5f, 0x54, 0x41, 0x42, 0x4c, 0x45, 0x5f, 0x49,
-    0x54, 0x45, 0x4d, 0x10, 0x03, 0x12, 0x15, 0x0a, 0x11, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x57, 0x52,
-    0x49, 0x54, 0x45, 0x5f, 0x4d, 0x4f, 0x44, 0x55, 0x4c, 0x45, 0x10, 0x04, 0x12, 0x17, 0x0a, 0x13,
-    0x54, 0x59, 0x50, 0x45, 0x5f, 0x57, 0x52, 0x49, 0x54, 0x45, 0x5f, 0x52, 0x45, 0x53, 0x4f, 0x55,
-    0x52, 0x43, 0x45, 0x10, 0x05, 0x12, 0x19, 0x0a, 0x15, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x57, 0x52,
-    0x49, 0x54, 0x45, 0x5f, 0x54, 0x41, 0x42, 0x4c, 0x45, 0x5f, 0x49, 0x54, 0x45, 0x4d, 0x10, 0x06,
-    0x42, 0x08, 0x0a, 0x06, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x22, 0x8a, 0x01, 0x0a, 0x0c, 0x44,
-    0x65, 0x6c, 0x65, 0x74, 0x65, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x61,
-    0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x64,
-    0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x24, 0x0a, 0x0e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x5f, 0x6b,
-    0x65, 0x79, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0c, 0x73,
-    0x74, 0x61, 0x74, 0x65, 0x4b, 0x65, 0x79, 0x48, 0x61, 0x73, 0x68, 0x12, 0x3a, 0x0a, 0x06, 0x6d,
-    0x6f, 0x64, 0x75, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x61, 0x70,
-    0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e,
-    0x76, 0x31, 0x2e, 0x4d, 0x6f, 0x76, 0x65, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x49, 0x64, 0x52,
-    0x06, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x22, 0xa4, 0x01, 0x0a, 0x0e, 0x44, 0x65, 0x6c, 0x65,
-    0x74, 0x65, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x64,
+    0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65,
+    0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x48, 0x00, 0x52, 0x0e, 0x64, 0x65, 0x6c, 0x65,
+    0x74, 0x65, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x53, 0x0a, 0x11, 0x64, 0x65,
+    0x6c, 0x65, 0x74, 0x65, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x69, 0x74, 0x65, 0x6d, 0x18,
+    0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72,
+    0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c,
+    0x65, 0x74, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x49, 0x74, 0x65, 0x6d, 0x48, 0x00, 0x52, 0x0f,
+    0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x49, 0x74, 0x65, 0x6d, 0x12,
+    0x46, 0x0a, 0x0c, 0x77, 0x72, 0x69, 0x74, 0x65, 0x5f, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x18,
+    0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72,
+    0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x57, 0x72, 0x69,
+    0x74, 0x65, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x48, 0x00, 0x52, 0x0b, 0x77, 0x72, 0x69, 0x74,
+    0x65, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x12, 0x4c, 0x0a, 0x0e, 0x77, 0x72, 0x69, 0x74, 0x65,
+    0x5f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32,
+    0x23, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74,
+    0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x57, 0x72, 0x69, 0x74, 0x65, 0x52, 0x65, 0x73, 0x6f,
+    0x75, 0x72, 0x63, 0x65, 0x48, 0x00, 0x52, 0x0d, 0x77, 0x72, 0x69, 0x74, 0x65, 0x52, 0x65, 0x73,
+    0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x50, 0x0a, 0x10, 0x77, 0x72, 0x69, 0x74, 0x65, 0x5f, 0x74,
+    0x61, 0x62, 0x6c, 0x65, 0x5f, 0x69, 0x74, 0x65, 0x6d, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32,
+    0x24, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74,
+    0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x57, 0x72, 0x69, 0x74, 0x65, 0x54, 0x61, 0x62, 0x6c,
+    0x65, 0x49, 0x74, 0x65, 0x6d, 0x48, 0x00, 0x52, 0x0e, 0x77, 0x72, 0x69, 0x74, 0x65, 0x54, 0x61,
+    0x62, 0x6c, 0x65, 0x49, 0x74, 0x65, 0x6d, 0x22, 0xb5, 0x01, 0x0a, 0x04, 0x54, 0x79, 0x70, 0x65,
+    0x12, 0x14, 0x0a, 0x10, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49,
+    0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x16, 0x0a, 0x12, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x44,
+    0x45, 0x4c, 0x45, 0x54, 0x45, 0x5f, 0x4d, 0x4f, 0x44, 0x55, 0x4c, 0x45, 0x10, 0x01, 0x12, 0x18,
+    0x0a, 0x14, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x44, 0x45, 0x4c, 0x45, 0x54, 0x45, 0x5f, 0x52, 0x45,
+    0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x10, 0x02, 0x12, 0x1a, 0x0a, 0x16, 0x54, 0x59, 0x50, 0x45,
+    0x5f, 0x44, 0x45, 0x4c, 0x45, 0x54, 0x45, 0x5f, 0x54, 0x41, 0x42, 0x4c, 0x45, 0x5f, 0x49, 0x54,
+    0x45, 0x4d, 0x10, 0x03, 0x12, 0x15, 0x0a, 0x11, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x57, 0x52, 0x49,
+    0x54, 0x45, 0x5f, 0x4d, 0x4f, 0x44, 0x55, 0x4c, 0x45, 0x10, 0x04, 0x12, 0x17, 0x0a, 0x13, 0x54,
+    0x59, 0x50, 0x45, 0x5f, 0x57, 0x52, 0x49, 0x54, 0x45, 0x5f, 0x52, 0x45, 0x53, 0x4f, 0x55, 0x52,
+    0x43, 0x45, 0x10, 0x05, 0x12, 0x19, 0x0a, 0x15, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x57, 0x52, 0x49,
+    0x54, 0x45, 0x5f, 0x54, 0x41, 0x42, 0x4c, 0x45, 0x5f, 0x49, 0x54, 0x45, 0x4d, 0x10, 0x06, 0x42,
+    0x08, 0x0a, 0x06, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x22, 0x8a, 0x01, 0x0a, 0x0c, 0x44, 0x65,
+    0x6c, 0x65, 0x74, 0x65, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x64,
     0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x64, 0x64,
     0x72, 0x65, 0x73, 0x73, 0x12, 0x24, 0x0a, 0x0e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x5f, 0x6b, 0x65,
     0x79, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0c, 0x73, 0x74,
-    0x61, 0x74, 0x65, 0x4b, 0x65, 0x79, 0x48, 0x61, 0x73, 0x68, 0x12, 0x37, 0x0a, 0x04, 0x74, 0x79,
-    0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73,
-    0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e,
-    0x4d, 0x6f, 0x76, 0x65, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x54, 0x61, 0x67, 0x52, 0x04, 0x74,
-    0x79, 0x70, 0x65, 0x12, 0x19, 0x0a, 0x08, 0x74, 0x79, 0x70, 0x65, 0x5f, 0x73, 0x74, 0x72, 0x18,
-    0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x74, 0x79, 0x70, 0x65, 0x53, 0x74, 0x72, 0x22, 0x9c,
-    0x01, 0x0a, 0x0f, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x49, 0x74,
-    0x65, 0x6d, 0x12, 0x24, 0x0a, 0x0e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x5f,
-    0x68, 0x61, 0x73, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0c, 0x73, 0x74, 0x61, 0x74,
-    0x65, 0x4b, 0x65, 0x79, 0x48, 0x61, 0x73, 0x68, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x61, 0x6e, 0x64,
-    0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65,
-    0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b,
-    0x65, 0x79, 0x12, 0x39, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b,
-    0x32, 0x25, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63,
-    0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61,
-    0x62, 0x6c, 0x65, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x3e, 0x0a,
-    0x0f, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x44, 0x61, 0x74, 0x61,
-    0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b,
-    0x65, 0x79, 0x12, 0x19, 0x0a, 0x08, 0x6b, 0x65, 0x79, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02,
-    0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6b, 0x65, 0x79, 0x54, 0x79, 0x70, 0x65, 0x22, 0x8b, 0x01,
-    0x0a, 0x0b, 0x57, 0x72, 0x69, 0x74, 0x65, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x12, 0x18, 0x0a,
-    0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07,
-    0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x24, 0x0a, 0x0e, 0x73, 0x74, 0x61, 0x74, 0x65,
-    0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52,
-    0x0c, 0x73, 0x74, 0x61, 0x74, 0x65, 0x4b, 0x65, 0x79, 0x48, 0x61, 0x73, 0x68, 0x12, 0x3c, 0x0a,
-    0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x61, 0x70,
-    0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e,
-    0x76, 0x31, 0x2e, 0x4d, 0x6f, 0x76, 0x65, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x42, 0x79, 0x74,
-    0x65, 0x63, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0xb7, 0x01, 0x0a, 0x0d,
-    0x57, 0x72, 0x69, 0x74, 0x65, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x18, 0x0a,
-    0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07,
-    0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x24, 0x0a, 0x0e, 0x73, 0x74, 0x61, 0x74, 0x65,
-    0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52,
-    0x0c, 0x73, 0x74, 0x61, 0x74, 0x65, 0x4b, 0x65, 0x79, 0x48, 0x61, 0x73, 0x68, 0x12, 0x37, 0x0a,
-    0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x61, 0x70,
-    0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e,
-    0x76, 0x31, 0x2e, 0x4d, 0x6f, 0x76, 0x65, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x54, 0x61, 0x67,
-    0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x19, 0x0a, 0x08, 0x74, 0x79, 0x70, 0x65, 0x5f, 0x73,
-    0x74, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x74, 0x79, 0x70, 0x65, 0x53, 0x74,
-    0x72, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52,
-    0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x72, 0x0a, 0x0e, 0x57, 0x72, 0x69, 0x74, 0x65, 0x54, 0x61,
-    0x62, 0x6c, 0x65, 0x44, 0x61, 0x74, 0x61, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01,
-    0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x19, 0x0a, 0x08, 0x6b, 0x65, 0x79,
-    0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6b, 0x65, 0x79,
-    0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x03, 0x20,
-    0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x76, 0x61,
-    0x6c, 0x75, 0x65, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09,
-    0x76, 0x61, 0x6c, 0x75, 0x65, 0x54, 0x79, 0x70, 0x65, 0x22, 0x9a, 0x01, 0x0a, 0x0e, 0x57, 0x72,
-    0x69, 0x74, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x24, 0x0a, 0x0e,
-    0x73, 0x74, 0x61, 0x74, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x01,
-    0x20, 0x01, 0x28, 0x0c, 0x52, 0x0c, 0x73, 0x74, 0x61, 0x74, 0x65, 0x4b, 0x65, 0x79, 0x48, 0x61,
-    0x73, 0x68, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01,
-    0x28, 0x09, 0x52, 0x06, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65,
-    0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x38, 0x0a, 0x04,
-    0x64, 0x61, 0x74, 0x61, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x61, 0x70, 0x74,
+    0x61, 0x74, 0x65, 0x4b, 0x65, 0x79, 0x48, 0x61, 0x73, 0x68, 0x12, 0x3a, 0x0a, 0x06, 0x6d, 0x6f,
+    0x64, 0x75, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x61, 0x70, 0x74,
+    0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76,
+    0x31, 0x2e, 0x4d, 0x6f, 0x76, 0x65, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x49, 0x64, 0x52, 0x06,
+    0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x22, 0xa4, 0x01, 0x0a, 0x0e, 0x44, 0x65, 0x6c, 0x65, 0x74,
+    0x65, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x64, 0x64,
+    0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x64, 0x64, 0x72,
+    0x65, 0x73, 0x73, 0x12, 0x24, 0x0a, 0x0e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x5f, 0x6b, 0x65, 0x79,
+    0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0c, 0x73, 0x74, 0x61,
+    0x74, 0x65, 0x4b, 0x65, 0x79, 0x48, 0x61, 0x73, 0x68, 0x12, 0x37, 0x0a, 0x04, 0x74, 0x79, 0x70,
+    0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e,
+    0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d,
+    0x6f, 0x76, 0x65, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x54, 0x61, 0x67, 0x52, 0x04, 0x74, 0x79,
+    0x70, 0x65, 0x12, 0x19, 0x0a, 0x08, 0x74, 0x79, 0x70, 0x65, 0x5f, 0x73, 0x74, 0x72, 0x18, 0x04,
+    0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x74, 0x79, 0x70, 0x65, 0x53, 0x74, 0x72, 0x22, 0x9c, 0x01,
+    0x0a, 0x0f, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x49, 0x74, 0x65,
+    0x6d, 0x12, 0x24, 0x0a, 0x0e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x68,
+    0x61, 0x73, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0c, 0x73, 0x74, 0x61, 0x74, 0x65,
+    0x4b, 0x65, 0x79, 0x48, 0x61, 0x73, 0x68, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x61, 0x6e, 0x64, 0x6c,
+    0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x12,
+    0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65,
+    0x79, 0x12, 0x39, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32,
+    0x25, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74,
+    0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x62,
+    0x6c, 0x65, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x3e, 0x0a, 0x0f,
+    0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x44, 0x61, 0x74, 0x61, 0x12,
+    0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65,
+    0x79, 0x12, 0x19, 0x0a, 0x08, 0x6b, 0x65, 0x79, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20,
+    0x01, 0x28, 0x09, 0x52, 0x07, 0x6b, 0x65, 0x79, 0x54, 0x79, 0x70, 0x65, 0x22, 0x8b, 0x01, 0x0a,
+    0x0b, 0x57, 0x72, 0x69, 0x74, 0x65, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x12, 0x18, 0x0a, 0x07,
+    0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61,
+    0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x24, 0x0a, 0x0e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x5f,
+    0x6b, 0x65, 0x79, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0c,
+    0x73, 0x74, 0x61, 0x74, 0x65, 0x4b, 0x65, 0x79, 0x48, 0x61, 0x73, 0x68, 0x12, 0x3c, 0x0a, 0x04,
+    0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x61, 0x70, 0x74,
     0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76,
-    0x31, 0x2e, 0x57, 0x72, 0x69, 0x74, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x44, 0x61, 0x74, 0x61,
-    0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0xd9, 0x04, 0x0a, 0x12, 0x54, 0x72, 0x61, 0x6e, 0x73,
-    0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x12, 0x41, 0x0a,
-    0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2d, 0x2e, 0x61, 0x70,
+    0x31, 0x2e, 0x4d, 0x6f, 0x76, 0x65, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x42, 0x79, 0x74, 0x65,
+    0x63, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0xb7, 0x01, 0x0a, 0x0d, 0x57,
+    0x72, 0x69, 0x74, 0x65, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x18, 0x0a, 0x07,
+    0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61,
+    0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x24, 0x0a, 0x0e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x5f,
+    0x6b, 0x65, 0x79, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0c,
+    0x73, 0x74, 0x61, 0x74, 0x65, 0x4b, 0x65, 0x79, 0x48, 0x61, 0x73, 0x68, 0x12, 0x37, 0x0a, 0x04,
+    0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x61, 0x70, 0x74,
+    0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76,
+    0x31, 0x2e, 0x4d, 0x6f, 0x76, 0x65, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x54, 0x61, 0x67, 0x52,
+    0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x19, 0x0a, 0x08, 0x74, 0x79, 0x70, 0x65, 0x5f, 0x73, 0x74,
+    0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x74, 0x79, 0x70, 0x65, 0x53, 0x74, 0x72,
+    0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
+    0x64, 0x61, 0x74, 0x61, 0x22, 0x72, 0x0a, 0x0e, 0x57, 0x72, 0x69, 0x74, 0x65, 0x54, 0x61, 0x62,
+    0x6c, 0x65, 0x44, 0x61, 0x74, 0x61, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20,
+    0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x19, 0x0a, 0x08, 0x6b, 0x65, 0x79, 0x5f,
+    0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6b, 0x65, 0x79, 0x54,
+    0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x03, 0x20, 0x01,
+    0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x76, 0x61, 0x6c,
+    0x75, 0x65, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x76,
+    0x61, 0x6c, 0x75, 0x65, 0x54, 0x79, 0x70, 0x65, 0x22, 0x9a, 0x01, 0x0a, 0x0e, 0x57, 0x72, 0x69,
+    0x74, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x24, 0x0a, 0x0e, 0x73,
+    0x74, 0x61, 0x74, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x01, 0x20,
+    0x01, 0x28, 0x0c, 0x52, 0x0c, 0x73, 0x74, 0x61, 0x74, 0x65, 0x4b, 0x65, 0x79, 0x48, 0x61, 0x73,
+    0x68, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
+    0x09, 0x52, 0x06, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79,
+    0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x38, 0x0a, 0x04, 0x64,
+    0x61, 0x74, 0x61, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x61, 0x70, 0x74, 0x6f,
+    0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31,
+    0x2e, 0x57, 0x72, 0x69, 0x74, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x44, 0x61, 0x74, 0x61, 0x52,
+    0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0xd9, 0x04, 0x0a, 0x12, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61,
+    0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x12, 0x41, 0x0a, 0x04,
+    0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2d, 0x2e, 0x61, 0x70, 0x74,
+    0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76,
+    0x31, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x61, 0x79,
+    0x6c, 0x6f, 0x61, 0x64, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12,
+    0x62, 0x0a, 0x16, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x5f, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f,
+    0x6e, 0x5f, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
+    0x2a, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74,
+    0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x46, 0x75, 0x6e, 0x63,
+    0x74, 0x69, 0x6f, 0x6e, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x48, 0x00, 0x52, 0x14, 0x65,
+    0x6e, 0x74, 0x72, 0x79, 0x46, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x61, 0x79, 0x6c,
+    0x6f, 0x61, 0x64, 0x12, 0x4c, 0x0a, 0x0e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x5f, 0x70, 0x61,
+    0x79, 0x6c, 0x6f, 0x61, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x61, 0x70,
     0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e,
-    0x76, 0x31, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x61,
-    0x79, 0x6c, 0x6f, 0x61, 0x64, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65,
-    0x12, 0x62, 0x0a, 0x16, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x5f, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69,
-    0x6f, 0x6e, 0x5f, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
-    0x32, 0x2a, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63,
-    0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x46, 0x75, 0x6e,
-    0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x48, 0x00, 0x52, 0x14,
-    0x65, 0x6e, 0x74, 0x72, 0x79, 0x46, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x61, 0x79,
-    0x6c, 0x6f, 0x61, 0x64, 0x12, 0x4c, 0x0a, 0x0e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x5f, 0x70,
-    0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x61,
+    0x76, 0x31, 0x2e, 0x53, 0x63, 0x72, 0x69, 0x70, 0x74, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64,
+    0x48, 0x00, 0x52, 0x0d, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61,
+    0x64, 0x12, 0x53, 0x0a, 0x11, 0x77, 0x72, 0x69, 0x74, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x5f, 0x70,
+    0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x61,
     0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-    0x2e, 0x76, 0x31, 0x2e, 0x53, 0x63, 0x72, 0x69, 0x70, 0x74, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61,
-    0x64, 0x48, 0x00, 0x52, 0x0d, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x50, 0x61, 0x79, 0x6c, 0x6f,
-    0x61, 0x64, 0x12, 0x53, 0x0a, 0x11, 0x77, 0x72, 0x69, 0x74, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x5f,
-    0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x25, 0x2e,
-    0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f,
-    0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x57, 0x72, 0x69, 0x74, 0x65, 0x53, 0x65, 0x74, 0x50, 0x61, 0x79,
-    0x6c, 0x6f, 0x61, 0x64, 0x48, 0x00, 0x52, 0x0f, 0x77, 0x72, 0x69, 0x74, 0x65, 0x53, 0x65, 0x74,
-    0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x12, 0x52, 0x0a, 0x10, 0x6d, 0x75, 0x6c, 0x74, 0x69,
-    0x73, 0x69, 0x67, 0x5f, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28,
-    0x0b, 0x32, 0x25, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61,
-    0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x73, 0x69,
-    0x67, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x48, 0x00, 0x52, 0x0f, 0x6d, 0x75, 0x6c, 0x74,
-    0x69, 0x73, 0x69, 0x67, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x22, 0x93, 0x01, 0x0a, 0x04,
-    0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x10, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x53,
-    0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x1f, 0x0a, 0x1b, 0x54, 0x59,
-    0x50, 0x45, 0x5f, 0x45, 0x4e, 0x54, 0x52, 0x59, 0x5f, 0x46, 0x55, 0x4e, 0x43, 0x54, 0x49, 0x4f,
-    0x4e, 0x5f, 0x50, 0x41, 0x59, 0x4c, 0x4f, 0x41, 0x44, 0x10, 0x01, 0x12, 0x17, 0x0a, 0x13, 0x54,
-    0x59, 0x50, 0x45, 0x5f, 0x53, 0x43, 0x52, 0x49, 0x50, 0x54, 0x5f, 0x50, 0x41, 0x59, 0x4c, 0x4f,
-    0x41, 0x44, 0x10, 0x02, 0x12, 0x1a, 0x0a, 0x16, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x57, 0x52, 0x49,
-    0x54, 0x45, 0x5f, 0x53, 0x45, 0x54, 0x5f, 0x50, 0x41, 0x59, 0x4c, 0x4f, 0x41, 0x44, 0x10, 0x04,
-    0x12, 0x19, 0x0a, 0x15, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x4d, 0x55, 0x4c, 0x54, 0x49, 0x53, 0x49,
-    0x47, 0x5f, 0x50, 0x41, 0x59, 0x4c, 0x4f, 0x41, 0x44, 0x10, 0x05, 0x22, 0x04, 0x08, 0x03, 0x10,
-    0x03, 0x42, 0x09, 0x0a, 0x07, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x4a, 0x04, 0x08, 0x04,
-    0x10, 0x05, 0x22, 0xf1, 0x01, 0x0a, 0x14, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x46, 0x75, 0x6e, 0x63,
-    0x74, 0x69, 0x6f, 0x6e, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x12, 0x41, 0x0a, 0x08, 0x66,
-    0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x25, 0x2e,
-    0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f,
-    0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x46, 0x75, 0x6e, 0x63, 0x74, 0x69,
-    0x6f, 0x6e, 0x49, 0x64, 0x52, 0x08, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x45,
-    0x0a, 0x0e, 0x74, 0x79, 0x70, 0x65, 0x5f, 0x61, 0x72, 0x67, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x73,
-    0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74,
-    0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x6f,
-    0x76, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x0d, 0x74, 0x79, 0x70, 0x65, 0x41, 0x72, 0x67, 0x75,
-    0x6d, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x72, 0x67, 0x75, 0x6d, 0x65, 0x6e,
-    0x74, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x61, 0x72, 0x67, 0x75, 0x6d, 0x65,
-    0x6e, 0x74, 0x73, 0x12, 0x31, 0x0a, 0x15, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x5f, 0x66, 0x75, 0x6e,
-    0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x5f, 0x73, 0x74, 0x72, 0x18, 0x04, 0x20, 0x01,
-    0x28, 0x09, 0x52, 0x12, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x46, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f,
-    0x6e, 0x49, 0x64, 0x53, 0x74, 0x72, 0x22, 0x66, 0x0a, 0x12, 0x4d, 0x6f, 0x76, 0x65, 0x53, 0x63,
-    0x72, 0x69, 0x70, 0x74, 0x42, 0x79, 0x74, 0x65, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x1a, 0x0a, 0x08,
-    0x62, 0x79, 0x74, 0x65, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x08,
-    0x62, 0x79, 0x74, 0x65, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x34, 0x0a, 0x03, 0x61, 0x62, 0x69, 0x18,
-    0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72,
-    0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x6f, 0x76,
-    0x65, 0x46, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x03, 0x61, 0x62, 0x69, 0x22, 0xb2,
-    0x01, 0x0a, 0x0d, 0x53, 0x63, 0x72, 0x69, 0x70, 0x74, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64,
-    0x12, 0x3c, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x28,
-    0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69,
-    0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x6f, 0x76, 0x65, 0x53, 0x63, 0x72, 0x69, 0x70, 0x74,
-    0x42, 0x79, 0x74, 0x65, 0x63, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x45,
-    0x0a, 0x0e, 0x74, 0x79, 0x70, 0x65, 0x5f, 0x61, 0x72, 0x67, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x73,
-    0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74,
-    0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x6f,
-    0x76, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x0d, 0x74, 0x79, 0x70, 0x65, 0x41, 0x72, 0x67, 0x75,
-    0x6d, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x72, 0x67, 0x75, 0x6d, 0x65, 0x6e,
-    0x74, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x61, 0x72, 0x67, 0x75, 0x6d, 0x65,
-    0x6e, 0x74, 0x73, 0x22, 0xbc, 0x01, 0x0a, 0x0f, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x73, 0x69, 0x67,
-    0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x12, 0x29, 0x0a, 0x10, 0x6d, 0x75, 0x6c, 0x74, 0x69,
-    0x73, 0x69, 0x67, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28,
-    0x09, 0x52, 0x0f, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x73, 0x69, 0x67, 0x41, 0x64, 0x64, 0x72, 0x65,
-    0x73, 0x73, 0x12, 0x66, 0x0a, 0x13, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f,
-    0x6e, 0x5f, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
-    0x30, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74,
-    0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x73, 0x69, 0x67, 0x54,
-    0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61,
-    0x64, 0x48, 0x00, 0x52, 0x12, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-    0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x88, 0x01, 0x01, 0x42, 0x16, 0x0a, 0x14, 0x5f, 0x74,
-    0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x70, 0x61, 0x79, 0x6c, 0x6f,
-    0x61, 0x64, 0x22, 0x95, 0x02, 0x0a, 0x1a, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x73, 0x69, 0x67, 0x54,
-    0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61,
-    0x64, 0x12, 0x49, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32,
-    0x35, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74,
-    0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x73, 0x69, 0x67, 0x54,
-    0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61,
-    0x64, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x62, 0x0a, 0x16,
-    0x65, 0x6e, 0x74, 0x72, 0x79, 0x5f, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x70,
-    0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x61,
+    0x2e, 0x76, 0x31, 0x2e, 0x57, 0x72, 0x69, 0x74, 0x65, 0x53, 0x65, 0x74, 0x50, 0x61, 0x79, 0x6c,
+    0x6f, 0x61, 0x64, 0x48, 0x00, 0x52, 0x0f, 0x77, 0x72, 0x69, 0x74, 0x65, 0x53, 0x65, 0x74, 0x50,
+    0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x12, 0x52, 0x0a, 0x10, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x73,
+    0x69, 0x67, 0x5f, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b,
+    0x32, 0x25, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63,
+    0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x73, 0x69, 0x67,
+    0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x48, 0x00, 0x52, 0x0f, 0x6d, 0x75, 0x6c, 0x74, 0x69,
+    0x73, 0x69, 0x67, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x22, 0x93, 0x01, 0x0a, 0x04, 0x54,
+    0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x10, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50,
+    0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x1f, 0x0a, 0x1b, 0x54, 0x59, 0x50,
+    0x45, 0x5f, 0x45, 0x4e, 0x54, 0x52, 0x59, 0x5f, 0x46, 0x55, 0x4e, 0x43, 0x54, 0x49, 0x4f, 0x4e,
+    0x5f, 0x50, 0x41, 0x59, 0x4c, 0x4f, 0x41, 0x44, 0x10, 0x01, 0x12, 0x17, 0x0a, 0x13, 0x54, 0x59,
+    0x50, 0x45, 0x5f, 0x53, 0x43, 0x52, 0x49, 0x50, 0x54, 0x5f, 0x50, 0x41, 0x59, 0x4c, 0x4f, 0x41,
+    0x44, 0x10, 0x02, 0x12, 0x1a, 0x0a, 0x16, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x57, 0x52, 0x49, 0x54,
+    0x45, 0x5f, 0x53, 0x45, 0x54, 0x5f, 0x50, 0x41, 0x59, 0x4c, 0x4f, 0x41, 0x44, 0x10, 0x04, 0x12,
+    0x19, 0x0a, 0x15, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x4d, 0x55, 0x4c, 0x54, 0x49, 0x53, 0x49, 0x47,
+    0x5f, 0x50, 0x41, 0x59, 0x4c, 0x4f, 0x41, 0x44, 0x10, 0x05, 0x22, 0x04, 0x08, 0x03, 0x10, 0x03,
+    0x42, 0x09, 0x0a, 0x07, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x4a, 0x04, 0x08, 0x04, 0x10,
+    0x05, 0x22, 0xf1, 0x01, 0x0a, 0x14, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x46, 0x75, 0x6e, 0x63, 0x74,
+    0x69, 0x6f, 0x6e, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x12, 0x41, 0x0a, 0x08, 0x66, 0x75,
+    0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x61,
     0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e,
     0x2e, 0x76, 0x31, 0x2e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x46, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f,
-    0x6e, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x48, 0x00, 0x52, 0x14, 0x65, 0x6e, 0x74, 0x72,
-    0x79, 0x46, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64,
-    0x22, 0x3d, 0x0a, 0x04, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x10, 0x54, 0x59, 0x50, 0x45,
-    0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x1f,
-    0x0a, 0x1b, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x45, 0x4e, 0x54, 0x52, 0x59, 0x5f, 0x46, 0x55, 0x4e,
-    0x43, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x50, 0x41, 0x59, 0x4c, 0x4f, 0x41, 0x44, 0x10, 0x01, 0x42,
-    0x09, 0x0a, 0x07, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x22, 0x64, 0x0a, 0x12, 0x4d, 0x6f,
-    0x76, 0x65, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x42, 0x79, 0x74, 0x65, 0x63, 0x6f, 0x64, 0x65,
-    0x12, 0x1a, 0x0a, 0x08, 0x62, 0x79, 0x74, 0x65, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01,
-    0x28, 0x0c, 0x52, 0x08, 0x62, 0x79, 0x74, 0x65, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x32, 0x0a, 0x03,
-    0x61, 0x62, 0x69, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x61, 0x70, 0x74, 0x6f,
-    0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31,
-    0x2e, 0x4d, 0x6f, 0x76, 0x65, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x52, 0x03, 0x61, 0x62, 0x69,
-    0x22, 0x85, 0x02, 0x0a, 0x0a, 0x4d, 0x6f, 0x76, 0x65, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x12,
-    0x18, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-    0x52, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d,
-    0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x3c, 0x0a,
-    0x07, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x22,
-    0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69,
-    0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x6f, 0x76, 0x65, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65,
-    0x49, 0x64, 0x52, 0x07, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x12, 0x4f, 0x0a, 0x11, 0x65,
-    0x78, 0x70, 0x6f, 0x73, 0x65, 0x64, 0x5f, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73,
-    0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74,
-    0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x6f,
-    0x76, 0x65, 0x46, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x10, 0x65, 0x78, 0x70, 0x6f,
-    0x73, 0x65, 0x64, 0x46, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x3a, 0x0a, 0x07,
-    0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e,
-    0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f,
-    0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x6f, 0x76, 0x65, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52,
-    0x07, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x73, 0x22, 0xd0, 0x03, 0x0a, 0x0c, 0x4d, 0x6f, 0x76,
-    0x65, 0x46, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d,
-    0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x4d, 0x0a,
-    0x0a, 0x76, 0x69, 0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28,
-    0x0e, 0x32, 0x2d, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61,
-    0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x6f, 0x76, 0x65, 0x46, 0x75, 0x6e,
-    0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x56, 0x69, 0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79,
-    0x52, 0x0a, 0x76, 0x69, 0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x12, 0x19, 0x0a, 0x08,
-    0x69, 0x73, 0x5f, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07,
-    0x69, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x62, 0x0a, 0x13, 0x67, 0x65, 0x6e, 0x65, 0x72,
-    0x69, 0x63, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x18, 0x04,
-    0x20, 0x03, 0x28, 0x0b, 0x32, 0x32, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61,
+    0x6e, 0x49, 0x64, 0x52, 0x08, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x45, 0x0a,
+    0x0e, 0x74, 0x79, 0x70, 0x65, 0x5f, 0x61, 0x72, 0x67, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x18,
+    0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72,
+    0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x6f, 0x76,
+    0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x0d, 0x74, 0x79, 0x70, 0x65, 0x41, 0x72, 0x67, 0x75, 0x6d,
+    0x65, 0x6e, 0x74, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x72, 0x67, 0x75, 0x6d, 0x65, 0x6e, 0x74,
+    0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x61, 0x72, 0x67, 0x75, 0x6d, 0x65, 0x6e,
+    0x74, 0x73, 0x12, 0x31, 0x0a, 0x15, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x5f, 0x66, 0x75, 0x6e, 0x63,
+    0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x5f, 0x73, 0x74, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28,
+    0x09, 0x52, 0x12, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x46, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e,
+    0x49, 0x64, 0x53, 0x74, 0x72, 0x22, 0x66, 0x0a, 0x12, 0x4d, 0x6f, 0x76, 0x65, 0x53, 0x63, 0x72,
+    0x69, 0x70, 0x74, 0x42, 0x79, 0x74, 0x65, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x62,
+    0x79, 0x74, 0x65, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x08, 0x62,
+    0x79, 0x74, 0x65, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x34, 0x0a, 0x03, 0x61, 0x62, 0x69, 0x18, 0x02,
+    0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61,
     0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x6f, 0x76, 0x65,
-    0x46, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x54,
-    0x79, 0x70, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x52, 0x11, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69,
-    0x63, 0x54, 0x79, 0x70, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, 0x36, 0x0a, 0x06, 0x70,
-    0x61, 0x72, 0x61, 0x6d, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x61, 0x70,
-    0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e,
-    0x76, 0x31, 0x2e, 0x4d, 0x6f, 0x76, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x06, 0x70, 0x61, 0x72,
-    0x61, 0x6d, 0x73, 0x12, 0x36, 0x0a, 0x06, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x18, 0x06, 0x20,
-    0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e,
-    0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x6f, 0x76, 0x65, 0x54,
-    0x79, 0x70, 0x65, 0x52, 0x06, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x22, 0x6e, 0x0a, 0x0a, 0x56,
-    0x69, 0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x12, 0x1a, 0x0a, 0x16, 0x56, 0x49, 0x53,
-    0x49, 0x42, 0x49, 0x4c, 0x49, 0x54, 0x59, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46,
-    0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x16, 0x0a, 0x12, 0x56, 0x49, 0x53, 0x49, 0x42, 0x49, 0x4c,
-    0x49, 0x54, 0x59, 0x5f, 0x50, 0x52, 0x49, 0x56, 0x41, 0x54, 0x45, 0x10, 0x01, 0x12, 0x15, 0x0a,
-    0x11, 0x56, 0x49, 0x53, 0x49, 0x42, 0x49, 0x4c, 0x49, 0x54, 0x59, 0x5f, 0x50, 0x55, 0x42, 0x4c,
-    0x49, 0x43, 0x10, 0x02, 0x12, 0x15, 0x0a, 0x11, 0x56, 0x49, 0x53, 0x49, 0x42, 0x49, 0x4c, 0x49,
-    0x54, 0x59, 0x5f, 0x46, 0x52, 0x49, 0x45, 0x4e, 0x44, 0x10, 0x03, 0x22, 0x9f, 0x02, 0x0a, 0x0a,
-    0x4d, 0x6f, 0x76, 0x65, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61,
-    0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1b,
-    0x0a, 0x09, 0x69, 0x73, 0x5f, 0x6e, 0x61, 0x74, 0x69, 0x76, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
-    0x08, 0x52, 0x08, 0x69, 0x73, 0x4e, 0x61, 0x74, 0x69, 0x76, 0x65, 0x12, 0x3f, 0x0a, 0x09, 0x61,
-    0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0e, 0x32, 0x21,
+    0x46, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x03, 0x61, 0x62, 0x69, 0x22, 0xb2, 0x01,
+    0x0a, 0x0d, 0x53, 0x63, 0x72, 0x69, 0x70, 0x74, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x12,
+    0x3c, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x28, 0x2e,
+    0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f,
+    0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x6f, 0x76, 0x65, 0x53, 0x63, 0x72, 0x69, 0x70, 0x74, 0x42,
+    0x79, 0x74, 0x65, 0x63, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x45, 0x0a,
+    0x0e, 0x74, 0x79, 0x70, 0x65, 0x5f, 0x61, 0x72, 0x67, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x18,
+    0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72,
+    0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x6f, 0x76,
+    0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x0d, 0x74, 0x79, 0x70, 0x65, 0x41, 0x72, 0x67, 0x75, 0x6d,
+    0x65, 0x6e, 0x74, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x72, 0x67, 0x75, 0x6d, 0x65, 0x6e, 0x74,
+    0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x61, 0x72, 0x67, 0x75, 0x6d, 0x65, 0x6e,
+    0x74, 0x73, 0x22, 0xbc, 0x01, 0x0a, 0x0f, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x73, 0x69, 0x67, 0x50,
+    0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x12, 0x29, 0x0a, 0x10, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x73,
+    0x69, 0x67, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+    0x52, 0x0f, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x73, 0x69, 0x67, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73,
+    0x73, 0x12, 0x66, 0x0a, 0x13, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e,
+    0x5f, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x30,
     0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69,
-    0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x6f, 0x76, 0x65, 0x41, 0x62, 0x69, 0x6c, 0x69, 0x74,
-    0x79, 0x52, 0x09, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x12, 0x60, 0x0a, 0x13,
-    0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x5f, 0x70, 0x61, 0x72,
-    0x61, 0x6d, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x61, 0x70, 0x74, 0x6f,
-    0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31,
-    0x2e, 0x4d, 0x6f, 0x76, 0x65, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x47, 0x65, 0x6e, 0x65, 0x72,
-    0x69, 0x63, 0x54, 0x79, 0x70, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x52, 0x11, 0x67, 0x65, 0x6e,
-    0x65, 0x72, 0x69, 0x63, 0x54, 0x79, 0x70, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, 0x3d,
-    0x0a, 0x06, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x25,
+    0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x73, 0x69, 0x67, 0x54, 0x72,
+    0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64,
+    0x48, 0x00, 0x52, 0x12, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50,
+    0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x88, 0x01, 0x01, 0x42, 0x16, 0x0a, 0x14, 0x5f, 0x74, 0x72,
+    0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61,
+    0x64, 0x22, 0x95, 0x02, 0x0a, 0x1a, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x73, 0x69, 0x67, 0x54, 0x72,
+    0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64,
+    0x12, 0x49, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x35,
     0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69,
-    0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x6f, 0x76, 0x65, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74,
-    0x46, 0x69, 0x65, 0x6c, 0x64, 0x52, 0x06, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x22, 0x80, 0x01,
-    0x0a, 0x1a, 0x4d, 0x6f, 0x76, 0x65, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x47, 0x65, 0x6e, 0x65,
-    0x72, 0x69, 0x63, 0x54, 0x79, 0x70, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x12, 0x43, 0x0a, 0x0b,
-    0x63, 0x6f, 0x6e, 0x73, 0x74, 0x72, 0x61, 0x69, 0x6e, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28,
-    0x0e, 0x32, 0x21, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61,
-    0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x6f, 0x76, 0x65, 0x41, 0x62, 0x69,
-    0x6c, 0x69, 0x74, 0x79, 0x52, 0x0b, 0x63, 0x6f, 0x6e, 0x73, 0x74, 0x72, 0x61, 0x69, 0x6e, 0x74,
-    0x73, 0x12, 0x1d, 0x0a, 0x0a, 0x69, 0x73, 0x5f, 0x70, 0x68, 0x61, 0x6e, 0x74, 0x6f, 0x6d, 0x18,
-    0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x69, 0x73, 0x50, 0x68, 0x61, 0x6e, 0x74, 0x6f, 0x6d,
-    0x22, 0x59, 0x0a, 0x0f, 0x4d, 0x6f, 0x76, 0x65, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x46, 0x69,
-    0x65, 0x6c, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
-    0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x32, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18,
-    0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72,
-    0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x6f, 0x76,
-    0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x22, 0x63, 0x0a, 0x1c, 0x4d,
-    0x6f, 0x76, 0x65, 0x46, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x47, 0x65, 0x6e, 0x65, 0x72,
-    0x69, 0x63, 0x54, 0x79, 0x70, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x12, 0x43, 0x0a, 0x0b, 0x63,
-    0x6f, 0x6e, 0x73, 0x74, 0x72, 0x61, 0x69, 0x6e, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0e,
-    0x32, 0x21, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63,
-    0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x6f, 0x76, 0x65, 0x41, 0x62, 0x69, 0x6c,
-    0x69, 0x74, 0x79, 0x52, 0x0b, 0x63, 0x6f, 0x6e, 0x73, 0x74, 0x72, 0x61, 0x69, 0x6e, 0x74, 0x73,
-    0x22, 0xc9, 0x03, 0x0a, 0x08, 0x4d, 0x6f, 0x76, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x33, 0x0a,
-    0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1f, 0x2e, 0x61, 0x70,
+    0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x73, 0x69, 0x67, 0x54, 0x72,
+    0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64,
+    0x2e, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x62, 0x0a, 0x16, 0x65,
+    0x6e, 0x74, 0x72, 0x79, 0x5f, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x70, 0x61,
+    0x79, 0x6c, 0x6f, 0x61, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x61, 0x70,
     0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e,
-    0x76, 0x31, 0x2e, 0x4d, 0x6f, 0x76, 0x65, 0x54, 0x79, 0x70, 0x65, 0x73, 0x52, 0x04, 0x74, 0x79,
-    0x70, 0x65, 0x12, 0x38, 0x0a, 0x06, 0x76, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x18, 0x03, 0x20, 0x01,
-    0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73,
-    0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x6f, 0x76, 0x65, 0x54, 0x79,
-    0x70, 0x65, 0x48, 0x00, 0x52, 0x06, 0x76, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x12, 0x3d, 0x0a, 0x06,
-    0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x61,
-    0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-    0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x6f, 0x76, 0x65, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x54, 0x61,
-    0x67, 0x48, 0x00, 0x52, 0x06, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x12, 0x39, 0x0a, 0x18, 0x67,
-    0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x5f, 0x70, 0x61, 0x72, 0x61,
-    0x6d, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x00, 0x52,
-    0x15, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x54, 0x79, 0x70, 0x65, 0x50, 0x61, 0x72, 0x61,
-    0x6d, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x4c, 0x0a, 0x09, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65,
-    0x6e, 0x63, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x61, 0x70, 0x74, 0x6f,
-    0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31,
-    0x2e, 0x4d, 0x6f, 0x76, 0x65, 0x54, 0x79, 0x70, 0x65, 0x2e, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65,
-    0x6e, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x48, 0x00, 0x52, 0x09, 0x72, 0x65, 0x66, 0x65, 0x72,
-    0x65, 0x6e, 0x63, 0x65, 0x12, 0x20, 0x0a, 0x0a, 0x75, 0x6e, 0x70, 0x61, 0x72, 0x73, 0x61, 0x62,
-    0x6c, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x0a, 0x75, 0x6e, 0x70, 0x61,
-    0x72, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x1a, 0x59, 0x0a, 0x0d, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65,
-    0x6e, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x75, 0x74, 0x61, 0x62,
-    0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x6d, 0x75, 0x74, 0x61, 0x62, 0x6c,
-    0x65, 0x12, 0x2e, 0x0a, 0x02, 0x74, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e,
+    0x76, 0x31, 0x2e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x46, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e,
+    0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x48, 0x00, 0x52, 0x14, 0x65, 0x6e, 0x74, 0x72, 0x79,
+    0x46, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x22,
+    0x3d, 0x0a, 0x04, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x10, 0x54, 0x59, 0x50, 0x45, 0x5f,
+    0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x1f, 0x0a,
+    0x1b, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x45, 0x4e, 0x54, 0x52, 0x59, 0x5f, 0x46, 0x55, 0x4e, 0x43,
+    0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x50, 0x41, 0x59, 0x4c, 0x4f, 0x41, 0x44, 0x10, 0x01, 0x42, 0x09,
+    0x0a, 0x07, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x22, 0x64, 0x0a, 0x12, 0x4d, 0x6f, 0x76,
+    0x65, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x42, 0x79, 0x74, 0x65, 0x63, 0x6f, 0x64, 0x65, 0x12,
+    0x1a, 0x0a, 0x08, 0x62, 0x79, 0x74, 0x65, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
+    0x0c, 0x52, 0x08, 0x62, 0x79, 0x74, 0x65, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x32, 0x0a, 0x03, 0x61,
+    0x62, 0x69, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73,
+    0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e,
+    0x4d, 0x6f, 0x76, 0x65, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x52, 0x03, 0x61, 0x62, 0x69, 0x22,
+    0x85, 0x02, 0x0a, 0x0a, 0x4d, 0x6f, 0x76, 0x65, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x12, 0x18,
+    0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+    0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65,
+    0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x3c, 0x0a, 0x07,
+    0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x22, 0x2e,
     0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f,
-    0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x6f, 0x76, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x02, 0x74,
-    0x6f, 0x42, 0x09, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x22, 0x4e, 0x0a, 0x0f,
-    0x57, 0x72, 0x69, 0x74, 0x65, 0x53, 0x65, 0x74, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x12,
-    0x3b, 0x0a, 0x09, 0x77, 0x72, 0x69, 0x74, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x18, 0x01, 0x20, 0x01,
-    0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73,
-    0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x57, 0x72, 0x69, 0x74, 0x65, 0x53,
-    0x65, 0x74, 0x52, 0x08, 0x77, 0x72, 0x69, 0x74, 0x65, 0x53, 0x65, 0x74, 0x22, 0x61, 0x0a, 0x0f,
-    0x45, 0x6e, 0x74, 0x72, 0x79, 0x46, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12,
-    0x3a, 0x0a, 0x06, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
-    0x22, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74,
-    0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x6f, 0x76, 0x65, 0x4d, 0x6f, 0x64, 0x75, 0x6c,
-    0x65, 0x49, 0x64, 0x52, 0x06, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e,
-    0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22,
-    0x3c, 0x0a, 0x0c, 0x4d, 0x6f, 0x76, 0x65, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x49, 0x64, 0x12,
-    0x18, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-    0x52, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d,
-    0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0xa5, 0x01,
-    0x0a, 0x0d, 0x4d, 0x6f, 0x76, 0x65, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x54, 0x61, 0x67, 0x12,
-    0x18, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-    0x52, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x6d, 0x6f, 0x64,
-    0x75, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6d, 0x6f, 0x64, 0x75, 0x6c,
-    0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52,
-    0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x4e, 0x0a, 0x13, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63,
-    0x5f, 0x74, 0x79, 0x70, 0x65, 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x18, 0x04, 0x20, 0x03,
+    0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x6f, 0x76, 0x65, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x49,
+    0x64, 0x52, 0x07, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x12, 0x4f, 0x0a, 0x11, 0x65, 0x78,
+    0x70, 0x6f, 0x73, 0x65, 0x64, 0x5f, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18,
+    0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72,
+    0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x6f, 0x76,
+    0x65, 0x46, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x10, 0x65, 0x78, 0x70, 0x6f, 0x73,
+    0x65, 0x64, 0x46, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x3a, 0x0a, 0x07, 0x73,
+    0x74, 0x72, 0x75, 0x63, 0x74, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x61,
+    0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e,
+    0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x6f, 0x76, 0x65, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52, 0x07,
+    0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x73, 0x22, 0xd0, 0x03, 0x0a, 0x0c, 0x4d, 0x6f, 0x76, 0x65,
+    0x46, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65,
+    0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x4d, 0x0a, 0x0a,
+    0x76, 0x69, 0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e,
+    0x32, 0x2d, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63,
+    0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x6f, 0x76, 0x65, 0x46, 0x75, 0x6e, 0x63,
+    0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x56, 0x69, 0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x52,
+    0x0a, 0x76, 0x69, 0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x12, 0x19, 0x0a, 0x08, 0x69,
+    0x73, 0x5f, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x69,
+    0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x62, 0x0a, 0x13, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69,
+    0x63, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x18, 0x04, 0x20,
+    0x03, 0x28, 0x0b, 0x32, 0x32, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e,
+    0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x6f, 0x76, 0x65, 0x46,
+    0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x54, 0x79,
+    0x70, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x52, 0x11, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63,
+    0x54, 0x79, 0x70, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, 0x36, 0x0a, 0x06, 0x70, 0x61,
+    0x72, 0x61, 0x6d, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x61, 0x70, 0x74,
+    0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76,
+    0x31, 0x2e, 0x4d, 0x6f, 0x76, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61,
+    0x6d, 0x73, 0x12, 0x36, 0x0a, 0x06, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x18, 0x06, 0x20, 0x03,
     0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73,
     0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x6f, 0x76, 0x65, 0x54, 0x79,
-    0x70, 0x65, 0x52, 0x11, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x54, 0x79, 0x70, 0x65, 0x50,
-    0x61, 0x72, 0x61, 0x6d, 0x73, 0x22, 0xdc, 0x04, 0x0a, 0x09, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74,
-    0x75, 0x72, 0x65, 0x12, 0x38, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
-    0x0e, 0x32, 0x24, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61,
-    0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75,
-    0x72, 0x65, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x42, 0x0a,
-    0x07, 0x65, 0x64, 0x32, 0x35, 0x35, 0x31, 0x39, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x26,
-    0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69,
-    0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x45, 0x64, 0x32, 0x35, 0x35, 0x31, 0x39, 0x53, 0x69, 0x67,
-    0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x48, 0x00, 0x52, 0x07, 0x65, 0x64, 0x32, 0x35, 0x35, 0x31,
-    0x39, 0x12, 0x52, 0x0a, 0x0d, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x5f, 0x65, 0x64, 0x32, 0x35, 0x35,
-    0x31, 0x39, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2b, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73,
+    0x70, 0x65, 0x52, 0x06, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x22, 0x6e, 0x0a, 0x0a, 0x56, 0x69,
+    0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x12, 0x1a, 0x0a, 0x16, 0x56, 0x49, 0x53, 0x49,
+    0x42, 0x49, 0x4c, 0x49, 0x54, 0x59, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49,
+    0x45, 0x44, 0x10, 0x00, 0x12, 0x16, 0x0a, 0x12, 0x56, 0x49, 0x53, 0x49, 0x42, 0x49, 0x4c, 0x49,
+    0x54, 0x59, 0x5f, 0x50, 0x52, 0x49, 0x56, 0x41, 0x54, 0x45, 0x10, 0x01, 0x12, 0x15, 0x0a, 0x11,
+    0x56, 0x49, 0x53, 0x49, 0x42, 0x49, 0x4c, 0x49, 0x54, 0x59, 0x5f, 0x50, 0x55, 0x42, 0x4c, 0x49,
+    0x43, 0x10, 0x02, 0x12, 0x15, 0x0a, 0x11, 0x56, 0x49, 0x53, 0x49, 0x42, 0x49, 0x4c, 0x49, 0x54,
+    0x59, 0x5f, 0x46, 0x52, 0x49, 0x45, 0x4e, 0x44, 0x10, 0x03, 0x22, 0xba, 0x02, 0x0a, 0x0a, 0x4d,
+    0x6f, 0x76, 0x65, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d,
+    0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1b, 0x0a,
+    0x09, 0x69, 0x73, 0x5f, 0x6e, 0x61, 0x74, 0x69, 0x76, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08,
+    0x52, 0x08, 0x69, 0x73, 0x4e, 0x61, 0x74, 0x69, 0x76, 0x65, 0x12, 0x19, 0x0a, 0x08, 0x69, 0x73,
+    0x5f, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x69, 0x73,
+    0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x3f, 0x0a, 0x09, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69,
+    0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0e, 0x32, 0x21, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73,
     0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e,
-    0x4d, 0x75, 0x6c, 0x74, 0x69, 0x45, 0x64, 0x32, 0x35, 0x35, 0x31, 0x39, 0x53, 0x69, 0x67, 0x6e,
-    0x61, 0x74, 0x75, 0x72, 0x65, 0x48, 0x00, 0x52, 0x0c, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x45, 0x64,
-    0x32, 0x35, 0x35, 0x31, 0x39, 0x12, 0x4c, 0x0a, 0x0b, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x5f, 0x61,
-    0x67, 0x65, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x61, 0x70, 0x74,
-    0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76,
-    0x31, 0x2e, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x53, 0x69, 0x67, 0x6e,
-    0x61, 0x74, 0x75, 0x72, 0x65, 0x48, 0x00, 0x52, 0x0a, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x41, 0x67,
-    0x65, 0x6e, 0x74, 0x12, 0x46, 0x0a, 0x09, 0x66, 0x65, 0x65, 0x5f, 0x70, 0x61, 0x79, 0x65, 0x72,
-    0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74,
-    0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x46, 0x65,
-    0x65, 0x50, 0x61, 0x79, 0x65, 0x72, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x48,
-    0x00, 0x52, 0x08, 0x66, 0x65, 0x65, 0x50, 0x61, 0x79, 0x65, 0x72, 0x12, 0x49, 0x0a, 0x0d, 0x73,
-    0x69, 0x6e, 0x67, 0x6c, 0x65, 0x5f, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x18, 0x07, 0x20, 0x01,
-    0x28, 0x0b, 0x32, 0x22, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73,
-    0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65,
-    0x53, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x48, 0x00, 0x52, 0x0c, 0x73, 0x69, 0x6e, 0x67, 0x6c, 0x65,
-    0x53, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x22, 0x8e, 0x01, 0x0a, 0x04, 0x54, 0x79, 0x70, 0x65, 0x12,
-    0x14, 0x0a, 0x10, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46,
-    0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x10, 0x0a, 0x0c, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x45, 0x44,
-    0x32, 0x35, 0x35, 0x31, 0x39, 0x10, 0x01, 0x12, 0x16, 0x0a, 0x12, 0x54, 0x59, 0x50, 0x45, 0x5f,
-    0x4d, 0x55, 0x4c, 0x54, 0x49, 0x5f, 0x45, 0x44, 0x32, 0x35, 0x35, 0x31, 0x39, 0x10, 0x02, 0x12,
-    0x14, 0x0a, 0x10, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x4d, 0x55, 0x4c, 0x54, 0x49, 0x5f, 0x41, 0x47,
-    0x45, 0x4e, 0x54, 0x10, 0x03, 0x12, 0x12, 0x0a, 0x0e, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x46, 0x45,
-    0x45, 0x5f, 0x50, 0x41, 0x59, 0x45, 0x52, 0x10, 0x04, 0x12, 0x16, 0x0a, 0x12, 0x54, 0x59, 0x50,
-    0x45, 0x5f, 0x53, 0x49, 0x4e, 0x47, 0x4c, 0x45, 0x5f, 0x53, 0x45, 0x4e, 0x44, 0x45, 0x52, 0x10,
-    0x06, 0x22, 0x04, 0x08, 0x05, 0x10, 0x05, 0x42, 0x0b, 0x0a, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61,
-    0x74, 0x75, 0x72, 0x65, 0x22, 0x4f, 0x0a, 0x10, 0x45, 0x64, 0x32, 0x35, 0x35, 0x31, 0x39, 0x53,
-    0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x70, 0x75, 0x62, 0x6c,
-    0x69, 0x63, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x09, 0x70, 0x75,
-    0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61,
-    0x74, 0x75, 0x72, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x09, 0x73, 0x69, 0x67, 0x6e,
-    0x61, 0x74, 0x75, 0x72, 0x65, 0x22, 0xa4, 0x01, 0x0a, 0x15, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x45,
-    0x64, 0x32, 0x35, 0x35, 0x31, 0x39, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x12,
-    0x1f, 0x0a, 0x0b, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x5f, 0x6b, 0x65, 0x79, 0x73, 0x18, 0x01,
-    0x20, 0x03, 0x28, 0x0c, 0x52, 0x0a, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x73,
-    0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x18, 0x02,
-    0x20, 0x03, 0x28, 0x0c, 0x52, 0x0a, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73,
-    0x12, 0x1c, 0x0a, 0x09, 0x74, 0x68, 0x72, 0x65, 0x73, 0x68, 0x6f, 0x6c, 0x64, 0x18, 0x03, 0x20,
-    0x01, 0x28, 0x0d, 0x52, 0x09, 0x74, 0x68, 0x72, 0x65, 0x73, 0x68, 0x6f, 0x6c, 0x64, 0x12, 0x2c,
-    0x0a, 0x12, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x69, 0x6e, 0x64,
-    0x69, 0x63, 0x65, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0d, 0x52, 0x10, 0x70, 0x75, 0x62, 0x6c,
-    0x69, 0x63, 0x4b, 0x65, 0x79, 0x49, 0x6e, 0x64, 0x69, 0x63, 0x65, 0x73, 0x22, 0xe8, 0x01, 0x0a,
-    0x13, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x53, 0x69, 0x67, 0x6e, 0x61,
-    0x74, 0x75, 0x72, 0x65, 0x12, 0x3e, 0x0a, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x18, 0x01,
-    0x20, 0x01, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61,
-    0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x63, 0x63, 0x6f,
-    0x75, 0x6e, 0x74, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x52, 0x06, 0x73, 0x65,
-    0x6e, 0x64, 0x65, 0x72, 0x12, 0x3c, 0x0a, 0x1a, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x61, 0x72,
-    0x79, 0x5f, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x72, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73,
-    0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x18, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64,
-    0x61, 0x72, 0x79, 0x53, 0x69, 0x67, 0x6e, 0x65, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73,
-    0x65, 0x73, 0x12, 0x53, 0x0a, 0x11, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x61, 0x72, 0x79, 0x5f,
-    0x73, 0x69, 0x67, 0x6e, 0x65, 0x72, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x26, 0x2e,
-    0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f,
-    0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x53, 0x69, 0x67, 0x6e,
-    0x61, 0x74, 0x75, 0x72, 0x65, 0x52, 0x10, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x61, 0x72, 0x79,
-    0x53, 0x69, 0x67, 0x6e, 0x65, 0x72, 0x73, 0x22, 0xe4, 0x02, 0x0a, 0x11, 0x46, 0x65, 0x65, 0x50,
-    0x61, 0x79, 0x65, 0x72, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x12, 0x3e, 0x0a,
-    0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x26, 0x2e,
-    0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f,
-    0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x53, 0x69, 0x67, 0x6e,
-    0x61, 0x74, 0x75, 0x72, 0x65, 0x52, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x12, 0x3c, 0x0a,
-    0x1a, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x61, 0x72, 0x79, 0x5f, 0x73, 0x69, 0x67, 0x6e, 0x65,
-    0x72, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28,
-    0x09, 0x52, 0x18, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x61, 0x72, 0x79, 0x53, 0x69, 0x67, 0x6e,
-    0x65, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x12, 0x53, 0x0a, 0x11, 0x73,
-    0x65, 0x63, 0x6f, 0x6e, 0x64, 0x61, 0x72, 0x79, 0x5f, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x72, 0x73,
-    0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74,
-    0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x63,
-    0x63, 0x6f, 0x75, 0x6e, 0x74, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x52, 0x10,
-    0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x61, 0x72, 0x79, 0x53, 0x69, 0x67, 0x6e, 0x65, 0x72, 0x73,
-    0x12, 0x2a, 0x0a, 0x11, 0x66, 0x65, 0x65, 0x5f, 0x70, 0x61, 0x79, 0x65, 0x72, 0x5f, 0x61, 0x64,
-    0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x66, 0x65, 0x65,
-    0x50, 0x61, 0x79, 0x65, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x50, 0x0a, 0x10,
-    0x66, 0x65, 0x65, 0x5f, 0x70, 0x61, 0x79, 0x65, 0x72, 0x5f, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x72,
-    0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74,
-    0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x63,
-    0x63, 0x6f, 0x75, 0x6e, 0x74, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x52, 0x0e,
-    0x66, 0x65, 0x65, 0x50, 0x61, 0x79, 0x65, 0x72, 0x53, 0x69, 0x67, 0x6e, 0x65, 0x72, 0x22, 0xe0,
-    0x01, 0x0a, 0x0c, 0x41, 0x6e, 0x79, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x12,
-    0x3b, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x27, 0x2e,
-    0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f,
-    0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x6e, 0x79, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65,
-    0x79, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1d, 0x0a, 0x0a,
-    0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c,
-    0x52, 0x09, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x22, 0x74, 0x0a, 0x04, 0x54,
-    0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x10, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50,
-    0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x10, 0x0a, 0x0c, 0x54, 0x59, 0x50,
-    0x45, 0x5f, 0x45, 0x44, 0x32, 0x35, 0x35, 0x31, 0x39, 0x10, 0x01, 0x12, 0x18, 0x0a, 0x14, 0x54,
-    0x59, 0x50, 0x45, 0x5f, 0x53, 0x45, 0x43, 0x50, 0x32, 0x35, 0x36, 0x4b, 0x31, 0x5f, 0x45, 0x43,
-    0x44, 0x53, 0x41, 0x10, 0x02, 0x12, 0x18, 0x0a, 0x14, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x53, 0x45,
-    0x43, 0x50, 0x32, 0x35, 0x36, 0x52, 0x31, 0x5f, 0x45, 0x43, 0x44, 0x53, 0x41, 0x10, 0x03, 0x12,
-    0x10, 0x0a, 0x0c, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x4b, 0x45, 0x59, 0x4c, 0x45, 0x53, 0x53, 0x10,
-    0x04, 0x22, 0xf6, 0x03, 0x0a, 0x0c, 0x41, 0x6e, 0x79, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75,
-    0x72, 0x65, 0x12, 0x3b, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e,
-    0x32, 0x27, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63,
-    0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x6e, 0x79, 0x53, 0x69, 0x67, 0x6e, 0x61,
-    0x74, 0x75, 0x72, 0x65, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12,
-    0x20, 0x0a, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, 0x02, 0x20, 0x01,
-    0x28, 0x0c, 0x42, 0x02, 0x18, 0x01, 0x52, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72,
-    0x65, 0x12, 0x39, 0x0a, 0x07, 0x65, 0x64, 0x32, 0x35, 0x35, 0x31, 0x39, 0x18, 0x03, 0x20, 0x01,
-    0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73,
-    0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x45, 0x64, 0x32, 0x35, 0x35, 0x31,
-    0x39, 0x48, 0x00, 0x52, 0x07, 0x65, 0x64, 0x32, 0x35, 0x35, 0x31, 0x39, 0x12, 0x4f, 0x0a, 0x0f,
-    0x73, 0x65, 0x63, 0x70, 0x32, 0x35, 0x36, 0x6b, 0x31, 0x5f, 0x65, 0x63, 0x64, 0x73, 0x61, 0x18,
-    0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72,
-    0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x53, 0x65, 0x63,
-    0x70, 0x32, 0x35, 0x36, 0x6b, 0x31, 0x45, 0x63, 0x64, 0x73, 0x61, 0x48, 0x00, 0x52, 0x0e, 0x73,
-    0x65, 0x63, 0x70, 0x32, 0x35, 0x36, 0x6b, 0x31, 0x45, 0x63, 0x64, 0x73, 0x61, 0x12, 0x3c, 0x0a,
-    0x08, 0x77, 0x65, 0x62, 0x61, 0x75, 0x74, 0x68, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32,
+    0x4d, 0x6f, 0x76, 0x65, 0x41, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x52, 0x09, 0x61, 0x62, 0x69,
+    0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x12, 0x60, 0x0a, 0x13, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69,
+    0x63, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x18, 0x04, 0x20,
+    0x03, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e,
+    0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x6f, 0x76, 0x65, 0x53,
+    0x74, 0x72, 0x75, 0x63, 0x74, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x54, 0x79, 0x70, 0x65,
+    0x50, 0x61, 0x72, 0x61, 0x6d, 0x52, 0x11, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x54, 0x79,
+    0x70, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, 0x3d, 0x0a, 0x06, 0x66, 0x69, 0x65, 0x6c,
+    0x64, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73,
+    0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e,
+    0x4d, 0x6f, 0x76, 0x65, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x52,
+    0x06, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x22, 0x80, 0x01, 0x0a, 0x1a, 0x4d, 0x6f, 0x76, 0x65,
+    0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x54, 0x79, 0x70,
+    0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x12, 0x43, 0x0a, 0x0b, 0x63, 0x6f, 0x6e, 0x73, 0x74, 0x72,
+    0x61, 0x69, 0x6e, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0e, 0x32, 0x21, 0x2e, 0x61, 0x70,
+    0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e,
+    0x76, 0x31, 0x2e, 0x4d, 0x6f, 0x76, 0x65, 0x41, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x52, 0x0b,
+    0x63, 0x6f, 0x6e, 0x73, 0x74, 0x72, 0x61, 0x69, 0x6e, 0x74, 0x73, 0x12, 0x1d, 0x0a, 0x0a, 0x69,
+    0x73, 0x5f, 0x70, 0x68, 0x61, 0x6e, 0x74, 0x6f, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52,
+    0x09, 0x69, 0x73, 0x50, 0x68, 0x61, 0x6e, 0x74, 0x6f, 0x6d, 0x22, 0x59, 0x0a, 0x0f, 0x4d, 0x6f,
+    0x76, 0x65, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x12, 0x12, 0x0a,
+    0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d,
+    0x65, 0x12, 0x32, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
     0x1e, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74,
-    0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x57, 0x65, 0x62, 0x41, 0x75, 0x74, 0x68, 0x6e, 0x48,
-    0x00, 0x52, 0x08, 0x77, 0x65, 0x62, 0x61, 0x75, 0x74, 0x68, 0x6e, 0x12, 0x39, 0x0a, 0x07, 0x6b,
-    0x65, 0x79, 0x6c, 0x65, 0x73, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x61,
+    0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x6f, 0x76, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52,
+    0x04, 0x74, 0x79, 0x70, 0x65, 0x22, 0x63, 0x0a, 0x1c, 0x4d, 0x6f, 0x76, 0x65, 0x46, 0x75, 0x6e,
+    0x63, 0x74, 0x69, 0x6f, 0x6e, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x54, 0x79, 0x70, 0x65,
+    0x50, 0x61, 0x72, 0x61, 0x6d, 0x12, 0x43, 0x0a, 0x0b, 0x63, 0x6f, 0x6e, 0x73, 0x74, 0x72, 0x61,
+    0x69, 0x6e, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0e, 0x32, 0x21, 0x2e, 0x61, 0x70, 0x74,
+    0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76,
+    0x31, 0x2e, 0x4d, 0x6f, 0x76, 0x65, 0x41, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x52, 0x0b, 0x63,
+    0x6f, 0x6e, 0x73, 0x74, 0x72, 0x61, 0x69, 0x6e, 0x74, 0x73, 0x22, 0xc9, 0x03, 0x0a, 0x08, 0x4d,
+    0x6f, 0x76, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x33, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18,
+    0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1f, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72,
+    0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x6f, 0x76,
+    0x65, 0x54, 0x79, 0x70, 0x65, 0x73, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x38, 0x0a, 0x06,
+    0x76, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x61,
     0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-    0x2e, 0x76, 0x31, 0x2e, 0x4b, 0x65, 0x79, 0x6c, 0x65, 0x73, 0x73, 0x48, 0x00, 0x52, 0x07, 0x6b,
-    0x65, 0x79, 0x6c, 0x65, 0x73, 0x73, 0x22, 0x6d, 0x0a, 0x04, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14,
-    0x0a, 0x10, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49,
-    0x45, 0x44, 0x10, 0x00, 0x12, 0x10, 0x0a, 0x0c, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x45, 0x44, 0x32,
-    0x35, 0x35, 0x31, 0x39, 0x10, 0x01, 0x12, 0x18, 0x0a, 0x14, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x53,
-    0x45, 0x43, 0x50, 0x32, 0x35, 0x36, 0x4b, 0x31, 0x5f, 0x45, 0x43, 0x44, 0x53, 0x41, 0x10, 0x02,
-    0x12, 0x11, 0x0a, 0x0d, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x57, 0x45, 0x42, 0x41, 0x55, 0x54, 0x48,
-    0x4e, 0x10, 0x03, 0x12, 0x10, 0x0a, 0x0c, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x4b, 0x45, 0x59, 0x4c,
-    0x45, 0x53, 0x53, 0x10, 0x04, 0x42, 0x13, 0x0a, 0x11, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75,
-    0x72, 0x65, 0x5f, 0x76, 0x61, 0x72, 0x69, 0x61, 0x6e, 0x74, 0x22, 0x27, 0x0a, 0x07, 0x45, 0x64,
-    0x32, 0x35, 0x35, 0x31, 0x39, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75,
-    0x72, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74,
-    0x75, 0x72, 0x65, 0x22, 0x2e, 0x0a, 0x0e, 0x53, 0x65, 0x63, 0x70, 0x32, 0x35, 0x36, 0x6b, 0x31,
-    0x45, 0x63, 0x64, 0x73, 0x61, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75,
-    0x72, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74,
-    0x75, 0x72, 0x65, 0x22, 0x28, 0x0a, 0x08, 0x57, 0x65, 0x62, 0x41, 0x75, 0x74, 0x68, 0x6e, 0x12,
-    0x1c, 0x0a, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, 0x01, 0x20, 0x01,
-    0x28, 0x0c, 0x52, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x22, 0x27, 0x0a,
-    0x07, 0x4b, 0x65, 0x79, 0x6c, 0x65, 0x73, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x69, 0x67, 0x6e,
-    0x61, 0x74, 0x75, 0x72, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x09, 0x73, 0x69, 0x67,
-    0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x22, 0x99, 0x01, 0x0a, 0x12, 0x53, 0x69, 0x6e, 0x67, 0x6c,
-    0x65, 0x4b, 0x65, 0x79, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x12, 0x41, 0x0a,
-    0x0a, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
-    0x0b, 0x32, 0x22, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61,
-    0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x6e, 0x79, 0x50, 0x75, 0x62, 0x6c,
-    0x69, 0x63, 0x4b, 0x65, 0x79, 0x52, 0x09, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79,
-    0x12, 0x40, 0x0a, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, 0x02, 0x20,
-    0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e,
-    0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x6e, 0x79, 0x53, 0x69,
-    0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x52, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75,
-    0x72, 0x65, 0x22, 0x6a, 0x0a, 0x10, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x65, 0x64, 0x53, 0x69, 0x67,
-    0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18,
-    0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x40, 0x0a, 0x09,
-    0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
-    0x22, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74,
-    0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x6e, 0x79, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74,
-    0x75, 0x72, 0x65, 0x52, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x22, 0xd1,
-    0x01, 0x0a, 0x11, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x4b, 0x65, 0x79, 0x53, 0x69, 0x67, 0x6e, 0x61,
-    0x74, 0x75, 0x72, 0x65, 0x12, 0x43, 0x0a, 0x0b, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x5f, 0x6b,
-    0x65, 0x79, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x61, 0x70, 0x74, 0x6f,
-    0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31,
-    0x2e, 0x41, 0x6e, 0x79, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x52, 0x0a, 0x70,
-    0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x73, 0x12, 0x46, 0x0a, 0x0a, 0x73, 0x69, 0x67,
-    0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x26, 0x2e,
-    0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f,
-    0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x65, 0x64, 0x53, 0x69, 0x67, 0x6e,
-    0x61, 0x74, 0x75, 0x72, 0x65, 0x52, 0x0a, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65,
-    0x73, 0x12, 0x2f, 0x0a, 0x13, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x5f,
-    0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x12,
-    0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x69, 0x72,
-    0x65, 0x64, 0x22, 0x4e, 0x0a, 0x0c, 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x53, 0x65, 0x6e, 0x64,
-    0x65, 0x72, 0x12, 0x3e, 0x0a, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01,
-    0x28, 0x0b, 0x32, 0x26, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73,
-    0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e,
-    0x74, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x52, 0x06, 0x73, 0x65, 0x6e, 0x64,
-    0x65, 0x72, 0x22, 0xa8, 0x04, 0x0a, 0x10, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x53, 0x69,
-    0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x12, 0x3f, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18,
-    0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2b, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72,
-    0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x63, 0x63,
-    0x6f, 0x75, 0x6e, 0x74, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x2e, 0x54, 0x79,
-    0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x42, 0x0a, 0x07, 0x65, 0x64, 0x32, 0x35,
-    0x35, 0x31, 0x39, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x61, 0x70, 0x74, 0x6f,
+    0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x6f, 0x76, 0x65, 0x54, 0x79, 0x70, 0x65, 0x48, 0x00, 0x52, 0x06,
+    0x76, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x12, 0x3d, 0x0a, 0x06, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74,
+    0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74,
+    0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x6f,
+    0x76, 0x65, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x54, 0x61, 0x67, 0x48, 0x00, 0x52, 0x06, 0x73,
+    0x74, 0x72, 0x75, 0x63, 0x74, 0x12, 0x39, 0x0a, 0x18, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63,
+    0x5f, 0x74, 0x79, 0x70, 0x65, 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x5f, 0x69, 0x6e, 0x64, 0x65,
+    0x78, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x00, 0x52, 0x15, 0x67, 0x65, 0x6e, 0x65, 0x72,
+    0x69, 0x63, 0x54, 0x79, 0x70, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x49, 0x6e, 0x64, 0x65, 0x78,
+    0x12, 0x4c, 0x0a, 0x09, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x18, 0x06, 0x20,
+    0x01, 0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e,
+    0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x6f, 0x76, 0x65, 0x54,
+    0x79, 0x70, 0x65, 0x2e, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x54, 0x79, 0x70,
+    0x65, 0x48, 0x00, 0x52, 0x09, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x20,
+    0x0a, 0x0a, 0x75, 0x6e, 0x70, 0x61, 0x72, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x07, 0x20, 0x01,
+    0x28, 0x09, 0x48, 0x00, 0x52, 0x0a, 0x75, 0x6e, 0x70, 0x61, 0x72, 0x73, 0x61, 0x62, 0x6c, 0x65,
+    0x1a, 0x59, 0x0a, 0x0d, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x54, 0x79, 0x70,
+    0x65, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01,
+    0x28, 0x08, 0x52, 0x07, 0x6d, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x2e, 0x0a, 0x02, 0x74,
+    0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e,
+    0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d,
+    0x6f, 0x76, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x02, 0x74, 0x6f, 0x42, 0x09, 0x0a, 0x07, 0x63,
+    0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x22, 0x4e, 0x0a, 0x0f, 0x57, 0x72, 0x69, 0x74, 0x65, 0x53,
+    0x65, 0x74, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x12, 0x3b, 0x0a, 0x09, 0x77, 0x72, 0x69,
+    0x74, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x61,
+    0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e,
+    0x2e, 0x76, 0x31, 0x2e, 0x57, 0x72, 0x69, 0x74, 0x65, 0x53, 0x65, 0x74, 0x52, 0x08, 0x77, 0x72,
+    0x69, 0x74, 0x65, 0x53, 0x65, 0x74, 0x22, 0x61, 0x0a, 0x0f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x46,
+    0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x3a, 0x0a, 0x06, 0x6d, 0x6f, 0x64,
+    0x75, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x61, 0x70, 0x74, 0x6f,
     0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31,
-    0x2e, 0x45, 0x64, 0x32, 0x35, 0x35, 0x31, 0x39, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72,
-    0x65, 0x48, 0x00, 0x52, 0x07, 0x65, 0x64, 0x32, 0x35, 0x35, 0x31, 0x39, 0x12, 0x52, 0x0a, 0x0d,
-    0x6d, 0x75, 0x6c, 0x74, 0x69, 0x5f, 0x65, 0x64, 0x32, 0x35, 0x35, 0x31, 0x39, 0x18, 0x03, 0x20,
-    0x01, 0x28, 0x0b, 0x32, 0x2b, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e,
-    0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x75, 0x6c, 0x74, 0x69,
+    0x2e, 0x4d, 0x6f, 0x76, 0x65, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x49, 0x64, 0x52, 0x06, 0x6d,
+    0x6f, 0x64, 0x75, 0x6c, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20,
+    0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3c, 0x0a, 0x0c, 0x4d, 0x6f, 0x76,
+    0x65, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x64, 0x64,
+    0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x64, 0x64, 0x72,
+    0x65, 0x73, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
+    0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0xa5, 0x01, 0x0a, 0x0d, 0x4d, 0x6f, 0x76, 0x65,
+    0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x54, 0x61, 0x67, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x64, 0x64,
+    0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x64, 0x64, 0x72,
+    0x65, 0x73, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x18, 0x02, 0x20,
+    0x01, 0x28, 0x09, 0x52, 0x06, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e,
+    0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12,
+    0x4e, 0x0a, 0x13, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x5f,
+    0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x61,
+    0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e,
+    0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x6f, 0x76, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x11, 0x67, 0x65,
+    0x6e, 0x65, 0x72, 0x69, 0x63, 0x54, 0x79, 0x70, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x22,
+    0xdc, 0x04, 0x0a, 0x09, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x12, 0x38, 0x0a,
+    0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x24, 0x2e, 0x61, 0x70,
+    0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e,
+    0x76, 0x31, 0x2e, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x2e, 0x54, 0x79, 0x70,
+    0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x42, 0x0a, 0x07, 0x65, 0x64, 0x32, 0x35, 0x35,
+    0x31, 0x39, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73,
+    0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e,
     0x45, 0x64, 0x32, 0x35, 0x35, 0x31, 0x39, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65,
-    0x48, 0x00, 0x52, 0x0c, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x45, 0x64, 0x32, 0x35, 0x35, 0x31, 0x39,
-    0x12, 0x5c, 0x0a, 0x14, 0x73, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x73,
-    0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x28,
+    0x48, 0x00, 0x52, 0x07, 0x65, 0x64, 0x32, 0x35, 0x35, 0x31, 0x39, 0x12, 0x52, 0x0a, 0x0d, 0x6d,
+    0x75, 0x6c, 0x74, 0x69, 0x5f, 0x65, 0x64, 0x32, 0x35, 0x35, 0x31, 0x39, 0x18, 0x03, 0x20, 0x01,
+    0x28, 0x0b, 0x32, 0x2b, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73,
+    0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x45,
+    0x64, 0x32, 0x35, 0x35, 0x31, 0x39, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x48,
+    0x00, 0x52, 0x0c, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x45, 0x64, 0x32, 0x35, 0x35, 0x31, 0x39, 0x12,
+    0x4c, 0x0a, 0x0b, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x5f, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x18, 0x04,
+    0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61,
+    0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x75, 0x6c, 0x74,
+    0x69, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x48,
+    0x00, 0x52, 0x0a, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x12, 0x46, 0x0a,
+    0x09, 0x66, 0x65, 0x65, 0x5f, 0x70, 0x61, 0x79, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b,
+    0x32, 0x27, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63,
+    0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x46, 0x65, 0x65, 0x50, 0x61, 0x79, 0x65, 0x72,
+    0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x48, 0x00, 0x52, 0x08, 0x66, 0x65, 0x65,
+    0x50, 0x61, 0x79, 0x65, 0x72, 0x12, 0x49, 0x0a, 0x0d, 0x73, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x5f,
+    0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x61,
+    0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e,
+    0x2e, 0x76, 0x31, 0x2e, 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x53, 0x65, 0x6e, 0x64, 0x65, 0x72,
+    0x48, 0x00, 0x52, 0x0c, 0x73, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x53, 0x65, 0x6e, 0x64, 0x65, 0x72,
+    0x22, 0x8e, 0x01, 0x0a, 0x04, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x10, 0x54, 0x59, 0x50,
+    0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12,
+    0x10, 0x0a, 0x0c, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x45, 0x44, 0x32, 0x35, 0x35, 0x31, 0x39, 0x10,
+    0x01, 0x12, 0x16, 0x0a, 0x12, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x4d, 0x55, 0x4c, 0x54, 0x49, 0x5f,
+    0x45, 0x44, 0x32, 0x35, 0x35, 0x31, 0x39, 0x10, 0x02, 0x12, 0x14, 0x0a, 0x10, 0x54, 0x59, 0x50,
+    0x45, 0x5f, 0x4d, 0x55, 0x4c, 0x54, 0x49, 0x5f, 0x41, 0x47, 0x45, 0x4e, 0x54, 0x10, 0x03, 0x12,
+    0x12, 0x0a, 0x0e, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x46, 0x45, 0x45, 0x5f, 0x50, 0x41, 0x59, 0x45,
+    0x52, 0x10, 0x04, 0x12, 0x16, 0x0a, 0x12, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x53, 0x49, 0x4e, 0x47,
+    0x4c, 0x45, 0x5f, 0x53, 0x45, 0x4e, 0x44, 0x45, 0x52, 0x10, 0x06, 0x22, 0x04, 0x08, 0x05, 0x10,
+    0x05, 0x42, 0x0b, 0x0a, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x22, 0x4f,
+    0x0a, 0x10, 0x45, 0x64, 0x32, 0x35, 0x35, 0x31, 0x39, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75,
+    0x72, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x5f, 0x6b, 0x65, 0x79,
+    0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x09, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65,
+    0x79, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, 0x02,
+    0x20, 0x01, 0x28, 0x0c, 0x52, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x22,
+    0xa4, 0x01, 0x0a, 0x15, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x45, 0x64, 0x32, 0x35, 0x35, 0x31, 0x39,
+    0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x70, 0x75, 0x62,
+    0x6c, 0x69, 0x63, 0x5f, 0x6b, 0x65, 0x79, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0c, 0x52, 0x0a,
+    0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x69,
+    0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0c, 0x52, 0x0a,
+    0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x68,
+    0x72, 0x65, 0x73, 0x68, 0x6f, 0x6c, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x09, 0x74,
+    0x68, 0x72, 0x65, 0x73, 0x68, 0x6f, 0x6c, 0x64, 0x12, 0x2c, 0x0a, 0x12, 0x70, 0x75, 0x62, 0x6c,
+    0x69, 0x63, 0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x69, 0x6e, 0x64, 0x69, 0x63, 0x65, 0x73, 0x18, 0x04,
+    0x20, 0x03, 0x28, 0x0d, 0x52, 0x10, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x49,
+    0x6e, 0x64, 0x69, 0x63, 0x65, 0x73, 0x22, 0xe8, 0x01, 0x0a, 0x13, 0x4d, 0x75, 0x6c, 0x74, 0x69,
+    0x41, 0x67, 0x65, 0x6e, 0x74, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x12, 0x3e,
+    0x0a, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x26,
     0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69,
-    0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x4b, 0x65, 0x79, 0x53,
-    0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x48, 0x00, 0x52, 0x12, 0x73, 0x69, 0x6e, 0x67,
-    0x6c, 0x65, 0x4b, 0x65, 0x79, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x12, 0x59,
-    0x0a, 0x13, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x73, 0x69, 0x67, 0x6e,
-    0x61, 0x74, 0x75, 0x72, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x61, 0x70,
-    0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e,
-    0x76, 0x31, 0x2e, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x4b, 0x65, 0x79, 0x53, 0x69, 0x67, 0x6e, 0x61,
-    0x74, 0x75, 0x72, 0x65, 0x48, 0x00, 0x52, 0x11, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x4b, 0x65, 0x79,
-    0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x22, 0x75, 0x0a, 0x04, 0x54, 0x79, 0x70,
-    0x65, 0x12, 0x14, 0x0a, 0x10, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43,
-    0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x10, 0x0a, 0x0c, 0x54, 0x59, 0x50, 0x45, 0x5f,
-    0x45, 0x44, 0x32, 0x35, 0x35, 0x31, 0x39, 0x10, 0x01, 0x12, 0x16, 0x0a, 0x12, 0x54, 0x59, 0x50,
-    0x45, 0x5f, 0x4d, 0x55, 0x4c, 0x54, 0x49, 0x5f, 0x45, 0x44, 0x32, 0x35, 0x35, 0x31, 0x39, 0x10,
-    0x02, 0x12, 0x13, 0x0a, 0x0f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x53, 0x49, 0x4e, 0x47, 0x4c, 0x45,
-    0x5f, 0x4b, 0x45, 0x59, 0x10, 0x04, 0x12, 0x12, 0x0a, 0x0e, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x4d,
-    0x55, 0x4c, 0x54, 0x49, 0x5f, 0x4b, 0x45, 0x59, 0x10, 0x05, 0x22, 0x04, 0x08, 0x03, 0x10, 0x03,
-    0x42, 0x0b, 0x0a, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x22, 0xe3, 0x01,
-    0x0a, 0x13, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x69, 0x7a,
-    0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x2b, 0x0a, 0x11, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63,
-    0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d,
-    0x52, 0x10, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x79, 0x74,
-    0x65, 0x73, 0x12, 0x4b, 0x0a, 0x0f, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x5f, 0x73, 0x69, 0x7a, 0x65,
-    0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x61, 0x70,
-    0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e,
-    0x76, 0x31, 0x2e, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x53, 0x69, 0x7a, 0x65, 0x49, 0x6e, 0x66, 0x6f,
-    0x52, 0x0d, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x53, 0x69, 0x7a, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12,
-    0x52, 0x0a, 0x12, 0x77, 0x72, 0x69, 0x74, 0x65, 0x5f, 0x6f, 0x70, 0x5f, 0x73, 0x69, 0x7a, 0x65,
-    0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x61, 0x70,
+    0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x53, 0x69, 0x67,
+    0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x52, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x12, 0x3c,
+    0x0a, 0x1a, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x61, 0x72, 0x79, 0x5f, 0x73, 0x69, 0x67, 0x6e,
+    0x65, 0x72, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03,
+    0x28, 0x09, 0x52, 0x18, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x61, 0x72, 0x79, 0x53, 0x69, 0x67,
+    0x6e, 0x65, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x12, 0x53, 0x0a, 0x11,
+    0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x61, 0x72, 0x79, 0x5f, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x72,
+    0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e,
+    0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x41,
+    0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x52,
+    0x10, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x61, 0x72, 0x79, 0x53, 0x69, 0x67, 0x6e, 0x65, 0x72,
+    0x73, 0x22, 0xe4, 0x02, 0x0a, 0x11, 0x46, 0x65, 0x65, 0x50, 0x61, 0x79, 0x65, 0x72, 0x53, 0x69,
+    0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x12, 0x3e, 0x0a, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x65,
+    0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e,
+    0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x41,
+    0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x52,
+    0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x12, 0x3c, 0x0a, 0x1a, 0x73, 0x65, 0x63, 0x6f, 0x6e,
+    0x64, 0x61, 0x72, 0x79, 0x5f, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x72, 0x5f, 0x61, 0x64, 0x64, 0x72,
+    0x65, 0x73, 0x73, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x18, 0x73, 0x65, 0x63,
+    0x6f, 0x6e, 0x64, 0x61, 0x72, 0x79, 0x53, 0x69, 0x67, 0x6e, 0x65, 0x72, 0x41, 0x64, 0x64, 0x72,
+    0x65, 0x73, 0x73, 0x65, 0x73, 0x12, 0x53, 0x0a, 0x11, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x61,
+    0x72, 0x79, 0x5f, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x72, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b,
+    0x32, 0x26, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63,
+    0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x53,
+    0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x52, 0x10, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64,
+    0x61, 0x72, 0x79, 0x53, 0x69, 0x67, 0x6e, 0x65, 0x72, 0x73, 0x12, 0x2a, 0x0a, 0x11, 0x66, 0x65,
+    0x65, 0x5f, 0x70, 0x61, 0x79, 0x65, 0x72, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18,
+    0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x66, 0x65, 0x65, 0x50, 0x61, 0x79, 0x65, 0x72, 0x41,
+    0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x50, 0x0a, 0x10, 0x66, 0x65, 0x65, 0x5f, 0x70, 0x61,
+    0x79, 0x65, 0x72, 0x5f, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b,
+    0x32, 0x26, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63,
+    0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x53,
+    0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x52, 0x0e, 0x66, 0x65, 0x65, 0x50, 0x61, 0x79,
+    0x65, 0x72, 0x53, 0x69, 0x67, 0x6e, 0x65, 0x72, 0x22, 0xe0, 0x01, 0x0a, 0x0c, 0x41, 0x6e, 0x79,
+    0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x12, 0x3b, 0x0a, 0x04, 0x74, 0x79, 0x70,
+    0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x27, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e,
+    0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x41,
+    0x6e, 0x79, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x2e, 0x54, 0x79, 0x70, 0x65,
+    0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63,
+    0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x09, 0x70, 0x75, 0x62, 0x6c,
+    0x69, 0x63, 0x4b, 0x65, 0x79, 0x22, 0x74, 0x0a, 0x04, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a,
+    0x10, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45,
+    0x44, 0x10, 0x00, 0x12, 0x10, 0x0a, 0x0c, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x45, 0x44, 0x32, 0x35,
+    0x35, 0x31, 0x39, 0x10, 0x01, 0x12, 0x18, 0x0a, 0x14, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x53, 0x45,
+    0x43, 0x50, 0x32, 0x35, 0x36, 0x4b, 0x31, 0x5f, 0x45, 0x43, 0x44, 0x53, 0x41, 0x10, 0x02, 0x12,
+    0x18, 0x0a, 0x14, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x53, 0x45, 0x43, 0x50, 0x32, 0x35, 0x36, 0x52,
+    0x31, 0x5f, 0x45, 0x43, 0x44, 0x53, 0x41, 0x10, 0x03, 0x12, 0x10, 0x0a, 0x0c, 0x54, 0x59, 0x50,
+    0x45, 0x5f, 0x4b, 0x45, 0x59, 0x4c, 0x45, 0x53, 0x53, 0x10, 0x04, 0x22, 0xf6, 0x03, 0x0a, 0x0c,
+    0x41, 0x6e, 0x79, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x12, 0x3b, 0x0a, 0x04,
+    0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x27, 0x2e, 0x61, 0x70, 0x74,
+    0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76,
+    0x31, 0x2e, 0x41, 0x6e, 0x79, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x2e, 0x54,
+    0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x20, 0x0a, 0x09, 0x73, 0x69, 0x67,
+    0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x42, 0x02, 0x18, 0x01,
+    0x52, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x12, 0x39, 0x0a, 0x07, 0x65,
+    0x64, 0x32, 0x35, 0x35, 0x31, 0x39, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x61,
+    0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e,
+    0x2e, 0x76, 0x31, 0x2e, 0x45, 0x64, 0x32, 0x35, 0x35, 0x31, 0x39, 0x48, 0x00, 0x52, 0x07, 0x65,
+    0x64, 0x32, 0x35, 0x35, 0x31, 0x39, 0x12, 0x4f, 0x0a, 0x0f, 0x73, 0x65, 0x63, 0x70, 0x32, 0x35,
+    0x36, 0x6b, 0x31, 0x5f, 0x65, 0x63, 0x64, 0x73, 0x61, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32,
+    0x24, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74,
+    0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x53, 0x65, 0x63, 0x70, 0x32, 0x35, 0x36, 0x6b, 0x31,
+    0x45, 0x63, 0x64, 0x73, 0x61, 0x48, 0x00, 0x52, 0x0e, 0x73, 0x65, 0x63, 0x70, 0x32, 0x35, 0x36,
+    0x6b, 0x31, 0x45, 0x63, 0x64, 0x73, 0x61, 0x12, 0x3c, 0x0a, 0x08, 0x77, 0x65, 0x62, 0x61, 0x75,
+    0x74, 0x68, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x61, 0x70, 0x74, 0x6f,
+    0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31,
+    0x2e, 0x57, 0x65, 0x62, 0x41, 0x75, 0x74, 0x68, 0x6e, 0x48, 0x00, 0x52, 0x08, 0x77, 0x65, 0x62,
+    0x61, 0x75, 0x74, 0x68, 0x6e, 0x12, 0x39, 0x0a, 0x07, 0x6b, 0x65, 0x79, 0x6c, 0x65, 0x73, 0x73,
+    0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74,
+    0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4b, 0x65,
+    0x79, 0x6c, 0x65, 0x73, 0x73, 0x48, 0x00, 0x52, 0x07, 0x6b, 0x65, 0x79, 0x6c, 0x65, 0x73, 0x73,
+    0x22, 0x6d, 0x0a, 0x04, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x10, 0x54, 0x59, 0x50, 0x45,
+    0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x10,
+    0x0a, 0x0c, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x45, 0x44, 0x32, 0x35, 0x35, 0x31, 0x39, 0x10, 0x01,
+    0x12, 0x18, 0x0a, 0x14, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x53, 0x45, 0x43, 0x50, 0x32, 0x35, 0x36,
+    0x4b, 0x31, 0x5f, 0x45, 0x43, 0x44, 0x53, 0x41, 0x10, 0x02, 0x12, 0x11, 0x0a, 0x0d, 0x54, 0x59,
+    0x50, 0x45, 0x5f, 0x57, 0x45, 0x42, 0x41, 0x55, 0x54, 0x48, 0x4e, 0x10, 0x03, 0x12, 0x10, 0x0a,
+    0x0c, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x4b, 0x45, 0x59, 0x4c, 0x45, 0x53, 0x53, 0x10, 0x04, 0x42,
+    0x13, 0x0a, 0x11, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x5f, 0x76, 0x61, 0x72,
+    0x69, 0x61, 0x6e, 0x74, 0x22, 0x27, 0x0a, 0x07, 0x45, 0x64, 0x32, 0x35, 0x35, 0x31, 0x39, 0x12,
+    0x1c, 0x0a, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, 0x01, 0x20, 0x01,
+    0x28, 0x0c, 0x52, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x22, 0x2e, 0x0a,
+    0x0e, 0x53, 0x65, 0x63, 0x70, 0x32, 0x35, 0x36, 0x6b, 0x31, 0x45, 0x63, 0x64, 0x73, 0x61, 0x12,
+    0x1c, 0x0a, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, 0x01, 0x20, 0x01,
+    0x28, 0x0c, 0x52, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x22, 0x28, 0x0a,
+    0x08, 0x57, 0x65, 0x62, 0x41, 0x75, 0x74, 0x68, 0x6e, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x69, 0x67,
+    0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x09, 0x73, 0x69,
+    0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x22, 0x27, 0x0a, 0x07, 0x4b, 0x65, 0x79, 0x6c, 0x65,
+    0x73, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18,
+    0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65,
+    0x22, 0x99, 0x01, 0x0a, 0x12, 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x4b, 0x65, 0x79, 0x53, 0x69,
+    0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x12, 0x41, 0x0a, 0x0a, 0x70, 0x75, 0x62, 0x6c, 0x69,
+    0x63, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x61, 0x70,
     0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e,
-    0x76, 0x31, 0x2e, 0x57, 0x72, 0x69, 0x74, 0x65, 0x4f, 0x70, 0x53, 0x69, 0x7a, 0x65, 0x49, 0x6e,
-    0x66, 0x6f, 0x52, 0x0f, 0x77, 0x72, 0x69, 0x74, 0x65, 0x4f, 0x70, 0x53, 0x69, 0x7a, 0x65, 0x49,
-    0x6e, 0x66, 0x6f, 0x22, 0x56, 0x0a, 0x0d, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x53, 0x69, 0x7a, 0x65,
-    0x49, 0x6e, 0x66, 0x6f, 0x12, 0x24, 0x0a, 0x0e, 0x74, 0x79, 0x70, 0x65, 0x5f, 0x74, 0x61, 0x67,
-    0x5f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0c, 0x74, 0x79,
-    0x70, 0x65, 0x54, 0x61, 0x67, 0x42, 0x79, 0x74, 0x65, 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x74, 0x6f,
-    0x74, 0x61, 0x6c, 0x5f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52,
-    0x0a, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x42, 0x79, 0x74, 0x65, 0x73, 0x22, 0x4f, 0x0a, 0x0f, 0x57,
-    0x72, 0x69, 0x74, 0x65, 0x4f, 0x70, 0x53, 0x69, 0x7a, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1b,
-    0x0a, 0x09, 0x6b, 0x65, 0x79, 0x5f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28,
-    0x0d, 0x52, 0x08, 0x6b, 0x65, 0x79, 0x42, 0x79, 0x74, 0x65, 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x76,
-    0x61, 0x6c, 0x75, 0x65, 0x5f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d,
-    0x52, 0x0a, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x79, 0x74, 0x65, 0x73, 0x2a, 0xea, 0x02, 0x0a,
-    0x09, 0x4d, 0x6f, 0x76, 0x65, 0x54, 0x79, 0x70, 0x65, 0x73, 0x12, 0x1a, 0x0a, 0x16, 0x4d, 0x4f,
-    0x56, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x53, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49,
-    0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x13, 0x0a, 0x0f, 0x4d, 0x4f, 0x56, 0x45, 0x5f, 0x54,
-    0x59, 0x50, 0x45, 0x53, 0x5f, 0x42, 0x4f, 0x4f, 0x4c, 0x10, 0x01, 0x12, 0x11, 0x0a, 0x0d, 0x4d,
-    0x4f, 0x56, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x53, 0x5f, 0x55, 0x38, 0x10, 0x02, 0x12, 0x12,
-    0x0a, 0x0e, 0x4d, 0x4f, 0x56, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x53, 0x5f, 0x55, 0x31, 0x36,
-    0x10, 0x0c, 0x12, 0x12, 0x0a, 0x0e, 0x4d, 0x4f, 0x56, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x53,
-    0x5f, 0x55, 0x33, 0x32, 0x10, 0x0d, 0x12, 0x12, 0x0a, 0x0e, 0x4d, 0x4f, 0x56, 0x45, 0x5f, 0x54,
-    0x59, 0x50, 0x45, 0x53, 0x5f, 0x55, 0x36, 0x34, 0x10, 0x03, 0x12, 0x13, 0x0a, 0x0f, 0x4d, 0x4f,
-    0x56, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x53, 0x5f, 0x55, 0x31, 0x32, 0x38, 0x10, 0x04, 0x12,
-    0x13, 0x0a, 0x0f, 0x4d, 0x4f, 0x56, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x53, 0x5f, 0x55, 0x32,
-    0x35, 0x36, 0x10, 0x0e, 0x12, 0x16, 0x0a, 0x12, 0x4d, 0x4f, 0x56, 0x45, 0x5f, 0x54, 0x59, 0x50,
-    0x45, 0x53, 0x5f, 0x41, 0x44, 0x44, 0x52, 0x45, 0x53, 0x53, 0x10, 0x05, 0x12, 0x15, 0x0a, 0x11,
-    0x4d, 0x4f, 0x56, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x53, 0x5f, 0x53, 0x49, 0x47, 0x4e, 0x45,
-    0x52, 0x10, 0x06, 0x12, 0x15, 0x0a, 0x11, 0x4d, 0x4f, 0x56, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45,
-    0x53, 0x5f, 0x56, 0x45, 0x43, 0x54, 0x4f, 0x52, 0x10, 0x07, 0x12, 0x15, 0x0a, 0x11, 0x4d, 0x4f,
-    0x56, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x53, 0x5f, 0x53, 0x54, 0x52, 0x55, 0x43, 0x54, 0x10,
-    0x08, 0x12, 0x21, 0x0a, 0x1d, 0x4d, 0x4f, 0x56, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x53, 0x5f,
-    0x47, 0x45, 0x4e, 0x45, 0x52, 0x49, 0x43, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x50, 0x41, 0x52,
-    0x41, 0x4d, 0x10, 0x09, 0x12, 0x18, 0x0a, 0x14, 0x4d, 0x4f, 0x56, 0x45, 0x5f, 0x54, 0x59, 0x50,
-    0x45, 0x53, 0x5f, 0x52, 0x45, 0x46, 0x45, 0x52, 0x45, 0x4e, 0x43, 0x45, 0x10, 0x0a, 0x12, 0x19,
-    0x0a, 0x15, 0x4d, 0x4f, 0x56, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x53, 0x5f, 0x55, 0x4e, 0x50,
-    0x41, 0x52, 0x53, 0x41, 0x42, 0x4c, 0x45, 0x10, 0x0b, 0x2a, 0x87, 0x01, 0x0a, 0x0b, 0x4d, 0x6f,
-    0x76, 0x65, 0x41, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x12, 0x1c, 0x0a, 0x18, 0x4d, 0x4f, 0x56,
-    0x45, 0x5f, 0x41, 0x42, 0x49, 0x4c, 0x49, 0x54, 0x59, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43,
-    0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x15, 0x0a, 0x11, 0x4d, 0x4f, 0x56, 0x45, 0x5f,
-    0x41, 0x42, 0x49, 0x4c, 0x49, 0x54, 0x59, 0x5f, 0x43, 0x4f, 0x50, 0x59, 0x10, 0x01, 0x12, 0x15,
-    0x0a, 0x11, 0x4d, 0x4f, 0x56, 0x45, 0x5f, 0x41, 0x42, 0x49, 0x4c, 0x49, 0x54, 0x59, 0x5f, 0x44,
-    0x52, 0x4f, 0x50, 0x10, 0x02, 0x12, 0x16, 0x0a, 0x12, 0x4d, 0x4f, 0x56, 0x45, 0x5f, 0x41, 0x42,
-    0x49, 0x4c, 0x49, 0x54, 0x59, 0x5f, 0x53, 0x54, 0x4f, 0x52, 0x45, 0x10, 0x03, 0x12, 0x14, 0x0a,
-    0x10, 0x4d, 0x4f, 0x56, 0x45, 0x5f, 0x41, 0x42, 0x49, 0x4c, 0x49, 0x54, 0x59, 0x5f, 0x4b, 0x45,
-    0x59, 0x10, 0x04, 0x42, 0x9e, 0x01, 0x0a, 0x18, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x74, 0x6f,
+    0x76, 0x31, 0x2e, 0x41, 0x6e, 0x79, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x52,
+    0x09, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x12, 0x40, 0x0a, 0x09, 0x73, 0x69,
+    0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e,
+    0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f,
+    0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x6e, 0x79, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72,
+    0x65, 0x52, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x22, 0x6a, 0x0a, 0x10,
+    0x49, 0x6e, 0x64, 0x65, 0x78, 0x65, 0x64, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65,
+    0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52,
+    0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x40, 0x0a, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74,
+    0x75, 0x72, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x61, 0x70, 0x74, 0x6f,
     0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31,
-    0x42, 0x10, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f,
-    0x74, 0x6f, 0x50, 0x01, 0xa2, 0x02, 0x03, 0x41, 0x54, 0x58, 0xaa, 0x02, 0x14, 0x41, 0x70, 0x74,
-    0x6f, 0x73, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x56,
-    0x31, 0xca, 0x02, 0x14, 0x41, 0x70, 0x74, 0x6f, 0x73, 0x5c, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61,
-    0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x20, 0x41, 0x70, 0x74, 0x6f, 0x73,
-    0x5c, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5c, 0x56, 0x31, 0x5c,
-    0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x16, 0x41, 0x70,
-    0x74, 0x6f, 0x73, 0x3a, 0x3a, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-    0x3a, 0x3a, 0x56, 0x31, 0x4a, 0xe4, 0xa1, 0x01, 0x0a, 0x07, 0x12, 0x05, 0x03, 0x00, 0xad, 0x04,
-    0x01, 0x0a, 0x4e, 0x0a, 0x01, 0x0c, 0x12, 0x03, 0x03, 0x00, 0x12, 0x32, 0x44, 0x20, 0x43, 0x6f,
-    0x70, 0x79, 0x72, 0x69, 0x67, 0x68, 0x74, 0x20, 0xc2, 0xa9, 0x20, 0x41, 0x70, 0x74, 0x6f, 0x73,
-    0x20, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x0a, 0x20, 0x53, 0x50, 0x44,
-    0x58, 0x2d, 0x4c, 0x69, 0x63, 0x65, 0x6e, 0x73, 0x65, 0x2d, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69,
-    0x66, 0x69, 0x65, 0x72, 0x3a, 0x20, 0x41, 0x70, 0x61, 0x63, 0x68, 0x65, 0x2d, 0x32, 0x2e, 0x30,
-    0x0a, 0x0a, 0x08, 0x0a, 0x01, 0x02, 0x12, 0x03, 0x05, 0x00, 0x1d, 0x0a, 0x09, 0x0a, 0x02, 0x03,
-    0x00, 0x12, 0x03, 0x07, 0x00, 0x2e, 0x0a, 0xa3, 0x05, 0x0a, 0x02, 0x04, 0x00, 0x12, 0x04, 0x12,
-    0x00, 0x20, 0x01, 0x1a, 0x96, 0x05, 0x20, 0x41, 0x20, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x20, 0x6f,
-    0x6e, 0x20, 0x41, 0x70, 0x74, 0x6f, 0x73, 0x20, 0x68, 0x6f, 0x6c, 0x64, 0x73, 0x20, 0x74, 0x72,
-    0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x20, 0x69, 0x6e, 0x20, 0x63, 0x68,
-    0x72, 0x6f, 0x6e, 0x6f, 0x6c, 0x6f, 0x67, 0x69, 0x63, 0x61, 0x6c, 0x20, 0x6f, 0x72, 0x64, 0x65,
-    0x72, 0x20, 0x28, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x65, 0x64, 0x20, 0x62, 0x79, 0x20, 0x61, 0x20,
-    0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x20, 0x6d, 0x6f, 0x6e,
-    0x6f, 0x74, 0x6f, 0x6e, 0x69, 0x63, 0x61, 0x6c, 0x6c, 0x79, 0x20, 0x69, 0x6e, 0x63, 0x72, 0x65,
-    0x61, 0x73, 0x69, 0x6e, 0x67, 0x20, 0x60, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x60, 0x20,
-    0x66, 0x69, 0x65, 0x6c, 0x64, 0x29, 0x0a, 0x20, 0x41, 0x6c, 0x6c, 0x20, 0x62, 0x6c, 0x6f, 0x63,
-    0x6b, 0x73, 0x20, 0x73, 0x74, 0x61, 0x72, 0x74, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x61, 0x20,
-    0x60, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x54, 0x72,
-    0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x60, 0x2c, 0x20, 0x61, 0x6e, 0x64, 0x20,
-    0x61, 0x72, 0x65, 0x20, 0x66, 0x6f, 0x6c, 0x6c, 0x6f, 0x77, 0x65, 0x64, 0x20, 0x62, 0x79, 0x20,
-    0x7a, 0x65, 0x72, 0x6f, 0x20, 0x6f, 0x72, 0x20, 0x6d, 0x6f, 0x72, 0x65, 0x20, 0x74, 0x72, 0x61,
-    0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x0a, 0x20, 0x54, 0x68, 0x65, 0x20,
-    0x6e, 0x65, 0x78, 0x74, 0x20, 0x60, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x4d, 0x65, 0x74, 0x61, 0x64,
-    0x61, 0x74, 0x61, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x60, 0x20,
-    0x64, 0x65, 0x6e, 0x6f, 0x74, 0x65, 0x73, 0x20, 0x74, 0x68, 0x65, 0x20, 0x65, 0x6e, 0x64, 0x20,
-    0x6f, 0x66, 0x20, 0x74, 0x68, 0x65, 0x20, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x62,
-    0x6c, 0x6f, 0x63, 0x6b, 0x2c, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x74, 0x68, 0x65, 0x20, 0x73, 0x74,
-    0x61, 0x72, 0x74, 0x20, 0x6f, 0x66, 0x20, 0x74, 0x68, 0x65, 0x20, 0x6e, 0x65, 0x78, 0x74, 0x20,
-    0x6f, 0x6e, 0x65, 0x2e, 0x0a, 0x0a, 0x20, 0x54, 0x68, 0x65, 0x20, 0x42, 0x6c, 0x6f, 0x63, 0x6b,
-    0x20, 0x60, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x60, 0x20, 0x69, 0x73, 0x20, 0x61, 0x20, 0x73,
-    0x74, 0x72, 0x69, 0x63, 0x74, 0x6c, 0x79, 0x20, 0x6d, 0x6f, 0x6e, 0x6f, 0x74, 0x6f, 0x6e, 0x69,
-    0x63, 0x61, 0x6c, 0x6c, 0x79, 0x20, 0x69, 0x6e, 0x63, 0x72, 0x65, 0x61, 0x73, 0x69, 0x6e, 0x67,
-    0x20, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x20, 0x6f, 0x66, 0x20, 0x74, 0x68, 0x65, 0x20, 0x6e, 0x75,
-    0x6d, 0x62, 0x65, 0x72, 0x20, 0x6f, 0x66, 0x20, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x73, 0x2c, 0x0a,
-    0x20, 0x61, 0x6e, 0x64, 0x20, 0x74, 0x68, 0x65, 0x72, 0x65, 0x20, 0x77, 0x69, 0x6c, 0x6c, 0x20,
-    0x6e, 0x65, 0x76, 0x65, 0x72, 0x20, 0x62, 0x65, 0x20, 0x61, 0x20, 0x67, 0x61, 0x70, 0x20, 0x69,
-    0x6e, 0x20, 0x74, 0x68, 0x65, 0x20, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x2e, 0x20, 0x49,
-    0x74, 0x20, 0x69, 0x73, 0x20, 0x61, 0x6c, 0x73, 0x6f, 0x20, 0x61, 0x20, 0x75, 0x6e, 0x69, 0x71,
-    0x75, 0x65, 0x20, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x3a, 0x20, 0x74,
+    0x2e, 0x41, 0x6e, 0x79, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x52, 0x09, 0x73,
+    0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x22, 0xd1, 0x01, 0x0a, 0x11, 0x4d, 0x75, 0x6c,
+    0x74, 0x69, 0x4b, 0x65, 0x79, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x12, 0x43,
+    0x0a, 0x0b, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x5f, 0x6b, 0x65, 0x79, 0x73, 0x18, 0x01, 0x20,
+    0x03, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e,
+    0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x6e, 0x79, 0x50, 0x75,
+    0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x52, 0x0a, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b,
+    0x65, 0x79, 0x73, 0x12, 0x46, 0x0a, 0x0a, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65,
+    0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e,
+    0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x49,
+    0x6e, 0x64, 0x65, 0x78, 0x65, 0x64, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x52,
+    0x0a, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x12, 0x2f, 0x0a, 0x13, 0x73,
+    0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72,
+    0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x12, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74,
+    0x75, 0x72, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x22, 0x4e, 0x0a, 0x0c,
+    0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x53, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x12, 0x3e, 0x0a, 0x06,
+    0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x61,
+    0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e,
+    0x2e, 0x76, 0x31, 0x2e, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x53, 0x69, 0x67, 0x6e, 0x61,
+    0x74, 0x75, 0x72, 0x65, 0x52, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x22, 0xa8, 0x04, 0x0a,
+    0x10, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72,
+    0x65, 0x12, 0x3f, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32,
+    0x2b, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74,
+    0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x53, 0x69,
+    0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79,
+    0x70, 0x65, 0x12, 0x42, 0x0a, 0x07, 0x65, 0x64, 0x32, 0x35, 0x35, 0x31, 0x39, 0x18, 0x02, 0x20,
+    0x01, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e,
+    0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x45, 0x64, 0x32, 0x35, 0x35,
+    0x31, 0x39, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x48, 0x00, 0x52, 0x07, 0x65,
+    0x64, 0x32, 0x35, 0x35, 0x31, 0x39, 0x12, 0x52, 0x0a, 0x0d, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x5f,
+    0x65, 0x64, 0x32, 0x35, 0x35, 0x31, 0x39, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2b, 0x2e,
+    0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f,
+    0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x45, 0x64, 0x32, 0x35, 0x35, 0x31,
+    0x39, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x48, 0x00, 0x52, 0x0c, 0x6d, 0x75,
+    0x6c, 0x74, 0x69, 0x45, 0x64, 0x32, 0x35, 0x35, 0x31, 0x39, 0x12, 0x5c, 0x0a, 0x14, 0x73, 0x69,
+    0x6e, 0x67, 0x6c, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75,
+    0x72, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73,
+    0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e,
+    0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x4b, 0x65, 0x79, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75,
+    0x72, 0x65, 0x48, 0x00, 0x52, 0x12, 0x73, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x4b, 0x65, 0x79, 0x53,
+    0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x12, 0x59, 0x0a, 0x13, 0x6d, 0x75, 0x6c, 0x74,
+    0x69, 0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18,
+    0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72,
+    0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x75, 0x6c,
+    0x74, 0x69, 0x4b, 0x65, 0x79, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x48, 0x00,
+    0x52, 0x11, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x4b, 0x65, 0x79, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74,
+    0x75, 0x72, 0x65, 0x22, 0x75, 0x0a, 0x04, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x10, 0x54,
+    0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10,
+    0x00, 0x12, 0x10, 0x0a, 0x0c, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x45, 0x44, 0x32, 0x35, 0x35, 0x31,
+    0x39, 0x10, 0x01, 0x12, 0x16, 0x0a, 0x12, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x4d, 0x55, 0x4c, 0x54,
+    0x49, 0x5f, 0x45, 0x44, 0x32, 0x35, 0x35, 0x31, 0x39, 0x10, 0x02, 0x12, 0x13, 0x0a, 0x0f, 0x54,
+    0x59, 0x50, 0x45, 0x5f, 0x53, 0x49, 0x4e, 0x47, 0x4c, 0x45, 0x5f, 0x4b, 0x45, 0x59, 0x10, 0x04,
+    0x12, 0x12, 0x0a, 0x0e, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x4d, 0x55, 0x4c, 0x54, 0x49, 0x5f, 0x4b,
+    0x45, 0x59, 0x10, 0x05, 0x22, 0x04, 0x08, 0x03, 0x10, 0x03, 0x42, 0x0b, 0x0a, 0x09, 0x73, 0x69,
+    0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x22, 0xe3, 0x01, 0x0a, 0x13, 0x54, 0x72, 0x61, 0x6e,
+    0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x69, 0x7a, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12,
+    0x2b, 0x0a, 0x11, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x62,
+    0x79, 0x74, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x10, 0x74, 0x72, 0x61, 0x6e,
+    0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x79, 0x74, 0x65, 0x73, 0x12, 0x4b, 0x0a, 0x0f,
+    0x65, 0x76, 0x65, 0x6e, 0x74, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18,
+    0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72,
+    0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x45, 0x76, 0x65,
+    0x6e, 0x74, 0x53, 0x69, 0x7a, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x0d, 0x65, 0x76, 0x65, 0x6e,
+    0x74, 0x53, 0x69, 0x7a, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x52, 0x0a, 0x12, 0x77, 0x72, 0x69,
+    0x74, 0x65, 0x5f, 0x6f, 0x70, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18,
+    0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72,
+    0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x57, 0x72, 0x69,
+    0x74, 0x65, 0x4f, 0x70, 0x53, 0x69, 0x7a, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x0f, 0x77, 0x72,
+    0x69, 0x74, 0x65, 0x4f, 0x70, 0x53, 0x69, 0x7a, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0x56, 0x0a,
+    0x0d, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x53, 0x69, 0x7a, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x24,
+    0x0a, 0x0e, 0x74, 0x79, 0x70, 0x65, 0x5f, 0x74, 0x61, 0x67, 0x5f, 0x62, 0x79, 0x74, 0x65, 0x73,
+    0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0c, 0x74, 0x79, 0x70, 0x65, 0x54, 0x61, 0x67, 0x42,
+    0x79, 0x74, 0x65, 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x5f, 0x62, 0x79,
+    0x74, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x74, 0x6f, 0x74, 0x61, 0x6c,
+    0x42, 0x79, 0x74, 0x65, 0x73, 0x22, 0x4f, 0x0a, 0x0f, 0x57, 0x72, 0x69, 0x74, 0x65, 0x4f, 0x70,
+    0x53, 0x69, 0x7a, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1b, 0x0a, 0x09, 0x6b, 0x65, 0x79, 0x5f,
+    0x62, 0x79, 0x74, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x08, 0x6b, 0x65, 0x79,
+    0x42, 0x79, 0x74, 0x65, 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x5f, 0x62,
+    0x79, 0x74, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x76, 0x61, 0x6c, 0x75,
+    0x65, 0x42, 0x79, 0x74, 0x65, 0x73, 0x2a, 0xea, 0x02, 0x0a, 0x09, 0x4d, 0x6f, 0x76, 0x65, 0x54,
+    0x79, 0x70, 0x65, 0x73, 0x12, 0x1a, 0x0a, 0x16, 0x4d, 0x4f, 0x56, 0x45, 0x5f, 0x54, 0x59, 0x50,
+    0x45, 0x53, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00,
+    0x12, 0x13, 0x0a, 0x0f, 0x4d, 0x4f, 0x56, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x53, 0x5f, 0x42,
+    0x4f, 0x4f, 0x4c, 0x10, 0x01, 0x12, 0x11, 0x0a, 0x0d, 0x4d, 0x4f, 0x56, 0x45, 0x5f, 0x54, 0x59,
+    0x50, 0x45, 0x53, 0x5f, 0x55, 0x38, 0x10, 0x02, 0x12, 0x12, 0x0a, 0x0e, 0x4d, 0x4f, 0x56, 0x45,
+    0x5f, 0x54, 0x59, 0x50, 0x45, 0x53, 0x5f, 0x55, 0x31, 0x36, 0x10, 0x0c, 0x12, 0x12, 0x0a, 0x0e,
+    0x4d, 0x4f, 0x56, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x53, 0x5f, 0x55, 0x33, 0x32, 0x10, 0x0d,
+    0x12, 0x12, 0x0a, 0x0e, 0x4d, 0x4f, 0x56, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x53, 0x5f, 0x55,
+    0x36, 0x34, 0x10, 0x03, 0x12, 0x13, 0x0a, 0x0f, 0x4d, 0x4f, 0x56, 0x45, 0x5f, 0x54, 0x59, 0x50,
+    0x45, 0x53, 0x5f, 0x55, 0x31, 0x32, 0x38, 0x10, 0x04, 0x12, 0x13, 0x0a, 0x0f, 0x4d, 0x4f, 0x56,
+    0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x53, 0x5f, 0x55, 0x32, 0x35, 0x36, 0x10, 0x0e, 0x12, 0x16,
+    0x0a, 0x12, 0x4d, 0x4f, 0x56, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x53, 0x5f, 0x41, 0x44, 0x44,
+    0x52, 0x45, 0x53, 0x53, 0x10, 0x05, 0x12, 0x15, 0x0a, 0x11, 0x4d, 0x4f, 0x56, 0x45, 0x5f, 0x54,
+    0x59, 0x50, 0x45, 0x53, 0x5f, 0x53, 0x49, 0x47, 0x4e, 0x45, 0x52, 0x10, 0x06, 0x12, 0x15, 0x0a,
+    0x11, 0x4d, 0x4f, 0x56, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x53, 0x5f, 0x56, 0x45, 0x43, 0x54,
+    0x4f, 0x52, 0x10, 0x07, 0x12, 0x15, 0x0a, 0x11, 0x4d, 0x4f, 0x56, 0x45, 0x5f, 0x54, 0x59, 0x50,
+    0x45, 0x53, 0x5f, 0x53, 0x54, 0x52, 0x55, 0x43, 0x54, 0x10, 0x08, 0x12, 0x21, 0x0a, 0x1d, 0x4d,
+    0x4f, 0x56, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x53, 0x5f, 0x47, 0x45, 0x4e, 0x45, 0x52, 0x49,
+    0x43, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x50, 0x41, 0x52, 0x41, 0x4d, 0x10, 0x09, 0x12, 0x18,
+    0x0a, 0x14, 0x4d, 0x4f, 0x56, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x53, 0x5f, 0x52, 0x45, 0x46,
+    0x45, 0x52, 0x45, 0x4e, 0x43, 0x45, 0x10, 0x0a, 0x12, 0x19, 0x0a, 0x15, 0x4d, 0x4f, 0x56, 0x45,
+    0x5f, 0x54, 0x59, 0x50, 0x45, 0x53, 0x5f, 0x55, 0x4e, 0x50, 0x41, 0x52, 0x53, 0x41, 0x42, 0x4c,
+    0x45, 0x10, 0x0b, 0x2a, 0x87, 0x01, 0x0a, 0x0b, 0x4d, 0x6f, 0x76, 0x65, 0x41, 0x62, 0x69, 0x6c,
+    0x69, 0x74, 0x79, 0x12, 0x1c, 0x0a, 0x18, 0x4d, 0x4f, 0x56, 0x45, 0x5f, 0x41, 0x42, 0x49, 0x4c,
+    0x49, 0x54, 0x59, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10,
+    0x00, 0x12, 0x15, 0x0a, 0x11, 0x4d, 0x4f, 0x56, 0x45, 0x5f, 0x41, 0x42, 0x49, 0x4c, 0x49, 0x54,
+    0x59, 0x5f, 0x43, 0x4f, 0x50, 0x59, 0x10, 0x01, 0x12, 0x15, 0x0a, 0x11, 0x4d, 0x4f, 0x56, 0x45,
+    0x5f, 0x41, 0x42, 0x49, 0x4c, 0x49, 0x54, 0x59, 0x5f, 0x44, 0x52, 0x4f, 0x50, 0x10, 0x02, 0x12,
+    0x16, 0x0a, 0x12, 0x4d, 0x4f, 0x56, 0x45, 0x5f, 0x41, 0x42, 0x49, 0x4c, 0x49, 0x54, 0x59, 0x5f,
+    0x53, 0x54, 0x4f, 0x52, 0x45, 0x10, 0x03, 0x12, 0x14, 0x0a, 0x10, 0x4d, 0x4f, 0x56, 0x45, 0x5f,
+    0x41, 0x42, 0x49, 0x4c, 0x49, 0x54, 0x59, 0x5f, 0x4b, 0x45, 0x59, 0x10, 0x04, 0x42, 0x9e, 0x01,
+    0x0a, 0x18, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e,
+    0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x42, 0x10, 0x54, 0x72, 0x61, 0x6e,
+    0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0xa2, 0x02,
+    0x03, 0x41, 0x54, 0x58, 0xaa, 0x02, 0x14, 0x41, 0x70, 0x74, 0x6f, 0x73, 0x2e, 0x54, 0x72, 0x61,
+    0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x14, 0x41, 0x70,
+    0x74, 0x6f, 0x73, 0x5c, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5c,
+    0x56, 0x31, 0xe2, 0x02, 0x20, 0x41, 0x70, 0x74, 0x6f, 0x73, 0x5c, 0x54, 0x72, 0x61, 0x6e, 0x73,
+    0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74,
+    0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x16, 0x41, 0x70, 0x74, 0x6f, 0x73, 0x3a, 0x3a, 0x54,
+    0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x3a, 0x56, 0x31, 0x4a, 0xf8,
+    0xb9, 0x01, 0x0a, 0x07, 0x12, 0x05, 0x03, 0x00, 0xed, 0x04, 0x01, 0x0a, 0x4e, 0x0a, 0x01, 0x0c,
+    0x12, 0x03, 0x03, 0x00, 0x12, 0x32, 0x44, 0x20, 0x43, 0x6f, 0x70, 0x79, 0x72, 0x69, 0x67, 0x68,
+    0x74, 0x20, 0xc2, 0xa9, 0x20, 0x41, 0x70, 0x74, 0x6f, 0x73, 0x20, 0x46, 0x6f, 0x75, 0x6e, 0x64,
+    0x61, 0x74, 0x69, 0x6f, 0x6e, 0x0a, 0x20, 0x53, 0x50, 0x44, 0x58, 0x2d, 0x4c, 0x69, 0x63, 0x65,
+    0x6e, 0x73, 0x65, 0x2d, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x3a, 0x20,
+    0x41, 0x70, 0x61, 0x63, 0x68, 0x65, 0x2d, 0x32, 0x2e, 0x30, 0x0a, 0x0a, 0x08, 0x0a, 0x01, 0x02,
+    0x12, 0x03, 0x05, 0x00, 0x1d, 0x0a, 0x09, 0x0a, 0x02, 0x03, 0x00, 0x12, 0x03, 0x07, 0x00, 0x2e,
+    0x0a, 0xa3, 0x05, 0x0a, 0x02, 0x04, 0x00, 0x12, 0x04, 0x12, 0x00, 0x20, 0x01, 0x1a, 0x96, 0x05,
+    0x20, 0x41, 0x20, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x20, 0x6f, 0x6e, 0x20, 0x41, 0x70, 0x74, 0x6f,
+    0x73, 0x20, 0x68, 0x6f, 0x6c, 0x64, 0x73, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74,
+    0x69, 0x6f, 0x6e, 0x73, 0x20, 0x69, 0x6e, 0x20, 0x63, 0x68, 0x72, 0x6f, 0x6e, 0x6f, 0x6c, 0x6f,
+    0x67, 0x69, 0x63, 0x61, 0x6c, 0x20, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x20, 0x28, 0x6f, 0x72, 0x64,
+    0x65, 0x72, 0x65, 0x64, 0x20, 0x62, 0x79, 0x20, 0x61, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61,
+    0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x20, 0x6d, 0x6f, 0x6e, 0x6f, 0x74, 0x6f, 0x6e, 0x69, 0x63,
+    0x61, 0x6c, 0x6c, 0x79, 0x20, 0x69, 0x6e, 0x63, 0x72, 0x65, 0x61, 0x73, 0x69, 0x6e, 0x67, 0x20,
+    0x60, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x60, 0x20, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x29,
+    0x0a, 0x20, 0x41, 0x6c, 0x6c, 0x20, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x73, 0x20, 0x73, 0x74, 0x61,
+    0x72, 0x74, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x61, 0x20, 0x60, 0x42, 0x6c, 0x6f, 0x63, 0x6b,
+    0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74,
+    0x69, 0x6f, 0x6e, 0x60, 0x2c, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x61, 0x72, 0x65, 0x20, 0x66, 0x6f,
+    0x6c, 0x6c, 0x6f, 0x77, 0x65, 0x64, 0x20, 0x62, 0x79, 0x20, 0x7a, 0x65, 0x72, 0x6f, 0x20, 0x6f,
+    0x72, 0x20, 0x6d, 0x6f, 0x72, 0x65, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69,
+    0x6f, 0x6e, 0x73, 0x2e, 0x0a, 0x20, 0x54, 0x68, 0x65, 0x20, 0x6e, 0x65, 0x78, 0x74, 0x20, 0x60,
+    0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x54, 0x72, 0x61,
+    0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x60, 0x20, 0x64, 0x65, 0x6e, 0x6f, 0x74, 0x65,
+    0x73, 0x20, 0x74, 0x68, 0x65, 0x20, 0x65, 0x6e, 0x64, 0x20, 0x6f, 0x66, 0x20, 0x74, 0x68, 0x65,
+    0x20, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x2c, 0x20,
+    0x61, 0x6e, 0x64, 0x20, 0x74, 0x68, 0x65, 0x20, 0x73, 0x74, 0x61, 0x72, 0x74, 0x20, 0x6f, 0x66,
+    0x20, 0x74, 0x68, 0x65, 0x20, 0x6e, 0x65, 0x78, 0x74, 0x20, 0x6f, 0x6e, 0x65, 0x2e, 0x0a, 0x0a,
+    0x20, 0x54, 0x68, 0x65, 0x20, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x20, 0x60, 0x68, 0x65, 0x69, 0x67,
+    0x68, 0x74, 0x60, 0x20, 0x69, 0x73, 0x20, 0x61, 0x20, 0x73, 0x74, 0x72, 0x69, 0x63, 0x74, 0x6c,
+    0x79, 0x20, 0x6d, 0x6f, 0x6e, 0x6f, 0x74, 0x6f, 0x6e, 0x69, 0x63, 0x61, 0x6c, 0x6c, 0x79, 0x20,
+    0x69, 0x6e, 0x63, 0x72, 0x65, 0x61, 0x73, 0x69, 0x6e, 0x67, 0x20, 0x63, 0x6f, 0x75, 0x6e, 0x74,
+    0x20, 0x6f, 0x66, 0x20, 0x74, 0x68, 0x65, 0x20, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x20, 0x6f,
+    0x66, 0x20, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x73, 0x2c, 0x0a, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x74,
     0x68, 0x65, 0x72, 0x65, 0x20, 0x77, 0x69, 0x6c, 0x6c, 0x20, 0x6e, 0x65, 0x76, 0x65, 0x72, 0x20,
-    0x62, 0x65, 0x20, 0x74, 0x77, 0x6f, 0x20, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x73, 0x20, 0x77, 0x69,
-    0x74, 0x68, 0x0a, 0x20, 0x74, 0x68, 0x65, 0x20, 0x73, 0x61, 0x6d, 0x65, 0x20, 0x60, 0x68, 0x65,
-    0x69, 0x67, 0x68, 0x74, 0x60, 0x2e, 0x0a, 0x0a, 0x20, 0x54, 0x68, 0x65, 0x20, 0x47, 0x65, 0x6e,
-    0x65, 0x73, 0x69, 0x73, 0x20, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-    0x20, 0x28, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x20, 0x30, 0x29, 0x20, 0x69, 0x73, 0x20,
-    0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x64, 0x20, 0x77, 0x69, 0x74, 0x68, 0x69, 0x6e,
-    0x20, 0x74, 0x68, 0x65, 0x20, 0x66, 0x69, 0x72, 0x73, 0x74, 0x20, 0x62, 0x6c, 0x6f, 0x63, 0x6b,
-    0x2c, 0x20, 0x77, 0x68, 0x69, 0x63, 0x68, 0x20, 0x68, 0x61, 0x73, 0x20, 0x61, 0x20, 0x68, 0x65,
-    0x69, 0x67, 0x68, 0x74, 0x20, 0x6f, 0x66, 0x20, 0x60, 0x30, 0x60, 0x0a, 0x0a, 0x0a, 0x0a, 0x03,
-    0x04, 0x00, 0x01, 0x12, 0x03, 0x12, 0x08, 0x0d, 0x0a, 0xde, 0x01, 0x0a, 0x04, 0x04, 0x00, 0x02,
-    0x00, 0x12, 0x03, 0x15, 0x02, 0x2f, 0x1a, 0xd0, 0x01, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74,
-    0x61, 0x6d, 0x70, 0x20, 0x72, 0x65, 0x70, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x74, 0x73, 0x20, 0x74,
-    0x68, 0x65, 0x20, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x20, 0x6f, 0x66, 0x20,
-    0x74, 0x68, 0x65, 0x20, 0x60, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61,
-    0x74, 0x61, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x60, 0x20, 0x28,
-    0x6f, 0x72, 0x20, 0x60, 0x47, 0x65, 0x6e, 0x65, 0x73, 0x69, 0x73, 0x54, 0x72, 0x61, 0x6e, 0x73,
-    0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x60, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x74, 0x68, 0x65, 0x20,
-    0x67, 0x65, 0x6e, 0x65, 0x73, 0x69, 0x73, 0x20, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x29, 0x0a, 0x20,
-    0x61, 0x6e, 0x64, 0x20, 0x65, 0x76, 0x65, 0x72, 0x79, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61,
-    0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x69, 0x6e, 0x20, 0x74, 0x68, 0x65, 0x20, 0x60, 0x74, 0x72,
-    0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x60, 0x20, 0x77, 0x69, 0x6c, 0x6c,
-    0x20, 0x68, 0x61, 0x76, 0x65, 0x20, 0x74, 0x68, 0x65, 0x20, 0x73, 0x61, 0x6d, 0x65, 0x20, 0x60,
-    0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x60, 0x20, 0x61, 0x73, 0x20, 0x74, 0x68,
-    0x65, 0x20, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x2e, 0x0a, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x00, 0x02,
-    0x00, 0x06, 0x12, 0x03, 0x15, 0x02, 0x20, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x00, 0x02, 0x00, 0x01,
-    0x12, 0x03, 0x15, 0x21, 0x2a, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x00, 0x02, 0x00, 0x03, 0x12, 0x03,
-    0x15, 0x2d, 0x2e, 0x0a, 0x88, 0x01, 0x0a, 0x04, 0x04, 0x00, 0x02, 0x01, 0x12, 0x03, 0x18, 0x02,
-    0x29, 0x1a, 0x7b, 0x20, 0x48, 0x65, 0x69, 0x67, 0x68, 0x74, 0x20, 0x72, 0x65, 0x70, 0x72, 0x65,
-    0x73, 0x65, 0x6e, 0x74, 0x73, 0x20, 0x74, 0x68, 0x65, 0x20, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x20,
-    0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x75, 0x6c, 0x74, 0x69, 0x6d,
-    0x61, 0x74, 0x65, 0x6c, 0x79, 0x2c, 0x20, 0x69, 0x73, 0x20, 0x74, 0x68, 0x65, 0x20, 0x63, 0x6f,
-    0x75, 0x6e, 0x74, 0x20, 0x6f, 0x66, 0x20, 0x60, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x4d, 0x65, 0x74,
-    0x61, 0x64, 0x61, 0x74, 0x61, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-    0x60, 0x20, 0x74, 0x68, 0x61, 0x74, 0x20, 0x68, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x65, 0x64, 0x20,
-    0x6f, 0x6e, 0x20, 0x74, 0x68, 0x65, 0x20, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x2e, 0x0a, 0x0a, 0x0c,
-    0x0a, 0x05, 0x04, 0x00, 0x02, 0x01, 0x05, 0x12, 0x03, 0x18, 0x02, 0x08, 0x0a, 0x0c, 0x0a, 0x05,
-    0x04, 0x00, 0x02, 0x01, 0x01, 0x12, 0x03, 0x18, 0x09, 0x0f, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x00,
-    0x02, 0x01, 0x03, 0x12, 0x03, 0x18, 0x12, 0x13, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x00, 0x02, 0x01,
-    0x08, 0x12, 0x03, 0x18, 0x14, 0x28, 0x0a, 0x0d, 0x0a, 0x06, 0x04, 0x00, 0x02, 0x01, 0x08, 0x06,
-    0x12, 0x03, 0x18, 0x15, 0x27, 0x0a, 0x87, 0x02, 0x0a, 0x04, 0x04, 0x00, 0x02, 0x02, 0x12, 0x03,
-    0x1c, 0x02, 0x28, 0x1a, 0xf9, 0x01, 0x20, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69,
-    0x6f, 0x6e, 0x73, 0x20, 0x68, 0x6f, 0x6c, 0x64, 0x73, 0x20, 0x61, 0x6c, 0x6c, 0x20, 0x74, 0x72,
-    0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x20, 0x74, 0x68, 0x61, 0x74, 0x20,
-    0x68, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x65, 0x64, 0x20, 0x69, 0x6e, 0x20, 0x74, 0x68, 0x65, 0x20,
-    0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x2c, 0x20, 0x77, 0x68, 0x69, 0x63, 0x68, 0x20, 0x69, 0x73, 0x20,
-    0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x20, 0x74, 0x68, 0x61,
-    0x74, 0x20, 0x68, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x65, 0x64, 0x20, 0x73, 0x74, 0x61, 0x72, 0x74,
-    0x69, 0x6e, 0x67, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x28, 0x61, 0x6e, 0x64, 0x20, 0x69, 0x6e,
-    0x63, 0x6c, 0x75, 0x64, 0x69, 0x6e, 0x67, 0x29, 0x0a, 0x20, 0x61, 0x20, 0x60, 0x42, 0x6c, 0x6f,
-    0x63, 0x6b, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61,
-    0x63, 0x74, 0x69, 0x6f, 0x6e, 0x60, 0x2c, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x65, 0x76, 0x65, 0x72,
-    0x79, 0x20, 0x6f, 0x74, 0x68, 0x65, 0x72, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74,
-    0x69, 0x6f, 0x6e, 0x20, 0x75, 0x70, 0x20, 0x74, 0x6f, 0x20, 0x28, 0x62, 0x75, 0x74, 0x20, 0x65,
-    0x78, 0x63, 0x6c, 0x75, 0x64, 0x69, 0x6e, 0x67, 0x29, 0x20, 0x74, 0x68, 0x65, 0x20, 0x6e, 0x65,
-    0x78, 0x74, 0x20, 0x60, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74,
-    0x61, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x60, 0x2e, 0x0a, 0x0a,
-    0x0c, 0x0a, 0x05, 0x04, 0x00, 0x02, 0x02, 0x04, 0x12, 0x03, 0x1c, 0x02, 0x0a, 0x0a, 0x0c, 0x0a,
-    0x05, 0x04, 0x00, 0x02, 0x02, 0x06, 0x12, 0x03, 0x1c, 0x0b, 0x16, 0x0a, 0x0c, 0x0a, 0x05, 0x04,
-    0x00, 0x02, 0x02, 0x01, 0x12, 0x03, 0x1c, 0x17, 0x23, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x00, 0x02,
-    0x02, 0x03, 0x12, 0x03, 0x1c, 0x26, 0x27, 0x0a, 0x99, 0x01, 0x0a, 0x04, 0x04, 0x00, 0x02, 0x03,
-    0x12, 0x03, 0x1f, 0x02, 0x16, 0x1a, 0x8b, 0x01, 0x20, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x20, 0x49,
-    0x44, 0x20, 0x69, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x73, 0x20, 0x75, 0x73, 0x20, 0x77, 0x68, 0x69,
-    0x63, 0x68, 0x20, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x20, 0x77, 0x65, 0x27, 0x72, 0x65, 0x20, 0x74,
-    0x72, 0x79, 0x69, 0x6e, 0x67, 0x20, 0x74, 0x6f, 0x20, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x2c, 0x20,
-    0x74, 0x68, 0x69, 0x73, 0x20, 0x69, 0x73, 0x20, 0x69, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x61, 0x6e,
-    0x74, 0x20, 0x74, 0x6f, 0x20, 0x65, 0x6e, 0x73, 0x75, 0x72, 0x65, 0x20, 0x74, 0x68, 0x61, 0x74,
-    0x20, 0x77, 0x65, 0x27, 0x72, 0x65, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x6d, 0x69, 0x78, 0x69, 0x6e,
-    0x67, 0x20, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x73, 0x20, 0x77, 0x69, 0x74, 0x68, 0x69, 0x6e, 0x20,
-    0x61, 0x20, 0x73, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x20, 0x70, 0x69, 0x70, 0x65, 0x6c, 0x69, 0x6e,
-    0x65, 0x2e, 0x0a, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x00, 0x02, 0x03, 0x05, 0x12, 0x03, 0x1f, 0x02,
-    0x08, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x00, 0x02, 0x03, 0x01, 0x12, 0x03, 0x1f, 0x09, 0x11, 0x0a,
-    0x0c, 0x0a, 0x05, 0x04, 0x00, 0x02, 0x03, 0x03, 0x12, 0x03, 0x1f, 0x14, 0x15, 0x0a, 0x8c, 0x04,
-    0x0a, 0x02, 0x04, 0x01, 0x12, 0x04, 0x27, 0x00, 0x42, 0x01, 0x1a, 0xff, 0x03, 0x20, 0x54, 0x72,
-    0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x61, 0x73, 0x20, 0x69, 0x74, 0x20,
-    0x68, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x65, 0x64, 0x20, 0x6f, 0x6e, 0x20, 0x74, 0x68, 0x65, 0x20,
-    0x63, 0x68, 0x61, 0x69, 0x6e, 0x2c, 0x20, 0x74, 0x68, 0x65, 0x72, 0x65, 0x20, 0x61, 0x72, 0x65,
-    0x20, 0x34, 0x20, 0x74, 0x79, 0x70, 0x65, 0x73, 0x20, 0x6f, 0x66, 0x20, 0x74, 0x72, 0x61, 0x6e,
-    0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x3a, 0x0a, 0x20, 0x2d, 0x20, 0x55, 0x73, 0x65,
-    0x72, 0x20, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x20, 0x61,
-    0x20, 0x75, 0x73, 0x65, 0x72, 0x20, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x74, 0x65, 0x64, 0x20,
-    0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x74, 0x6f, 0x20, 0x69,
-    0x6e, 0x74, 0x65, 0x72, 0x61, 0x63, 0x74, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x74, 0x68, 0x65,
-    0x20, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x0a, 0x20, 0x2d, 0x20, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x20,
-    0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x20, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63,
-    0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f,
-    0x6e, 0x73, 0x20, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x64, 0x20, 0x62, 0x79, 0x20,
-    0x74, 0x68, 0x65, 0x20, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x20, 0x74, 0x6f, 0x20, 0x67, 0x72, 0x6f,
-    0x75, 0x70, 0x20, 0x74, 0x6f, 0x67, 0x65, 0x74, 0x68, 0x65, 0x72, 0x20, 0x74, 0x72, 0x61, 0x6e,
+    0x62, 0x65, 0x20, 0x61, 0x20, 0x67, 0x61, 0x70, 0x20, 0x69, 0x6e, 0x20, 0x74, 0x68, 0x65, 0x20,
+    0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x2e, 0x20, 0x49, 0x74, 0x20, 0x69, 0x73, 0x20, 0x61,
+    0x6c, 0x73, 0x6f, 0x20, 0x61, 0x20, 0x75, 0x6e, 0x69, 0x71, 0x75, 0x65, 0x20, 0x69, 0x64, 0x65,
+    0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x3a, 0x20, 0x74, 0x68, 0x65, 0x72, 0x65, 0x20, 0x77,
+    0x69, 0x6c, 0x6c, 0x20, 0x6e, 0x65, 0x76, 0x65, 0x72, 0x20, 0x62, 0x65, 0x20, 0x74, 0x77, 0x6f,
+    0x20, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x73, 0x20, 0x77, 0x69, 0x74, 0x68, 0x0a, 0x20, 0x74, 0x68,
+    0x65, 0x20, 0x73, 0x61, 0x6d, 0x65, 0x20, 0x60, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x60, 0x2e,
+    0x0a, 0x0a, 0x20, 0x54, 0x68, 0x65, 0x20, 0x47, 0x65, 0x6e, 0x65, 0x73, 0x69, 0x73, 0x20, 0x54,
+    0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x28, 0x76, 0x65, 0x72, 0x73,
+    0x69, 0x6f, 0x6e, 0x20, 0x30, 0x29, 0x20, 0x69, 0x73, 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69,
+    0x6e, 0x65, 0x64, 0x20, 0x77, 0x69, 0x74, 0x68, 0x69, 0x6e, 0x20, 0x74, 0x68, 0x65, 0x20, 0x66,
+    0x69, 0x72, 0x73, 0x74, 0x20, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x2c, 0x20, 0x77, 0x68, 0x69, 0x63,
+    0x68, 0x20, 0x68, 0x61, 0x73, 0x20, 0x61, 0x20, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x20, 0x6f,
+    0x66, 0x20, 0x60, 0x30, 0x60, 0x0a, 0x0a, 0x0a, 0x0a, 0x03, 0x04, 0x00, 0x01, 0x12, 0x03, 0x12,
+    0x08, 0x0d, 0x0a, 0xde, 0x01, 0x0a, 0x04, 0x04, 0x00, 0x02, 0x00, 0x12, 0x03, 0x15, 0x02, 0x2f,
+    0x1a, 0xd0, 0x01, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x20, 0x72, 0x65,
+    0x70, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x74, 0x73, 0x20, 0x74, 0x68, 0x65, 0x20, 0x74, 0x69, 0x6d,
+    0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x20, 0x6f, 0x66, 0x20, 0x74, 0x68, 0x65, 0x20, 0x60, 0x42,
+    0x6c, 0x6f, 0x63, 0x6b, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x54, 0x72, 0x61, 0x6e,
+    0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x60, 0x20, 0x28, 0x6f, 0x72, 0x20, 0x60, 0x47, 0x65,
+    0x6e, 0x65, 0x73, 0x69, 0x73, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e,
+    0x60, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x74, 0x68, 0x65, 0x20, 0x67, 0x65, 0x6e, 0x65, 0x73, 0x69,
+    0x73, 0x20, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x29, 0x0a, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x65, 0x76,
+    0x65, 0x72, 0x79, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20,
+    0x69, 0x6e, 0x20, 0x74, 0x68, 0x65, 0x20, 0x60, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74,
+    0x69, 0x6f, 0x6e, 0x73, 0x60, 0x20, 0x77, 0x69, 0x6c, 0x6c, 0x20, 0x68, 0x61, 0x76, 0x65, 0x20,
+    0x74, 0x68, 0x65, 0x20, 0x73, 0x61, 0x6d, 0x65, 0x20, 0x60, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74,
+    0x61, 0x6d, 0x70, 0x60, 0x20, 0x61, 0x73, 0x20, 0x74, 0x68, 0x65, 0x20, 0x62, 0x6c, 0x6f, 0x63,
+    0x6b, 0x2e, 0x0a, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x00, 0x02, 0x00, 0x06, 0x12, 0x03, 0x15, 0x02,
+    0x20, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x00, 0x02, 0x00, 0x01, 0x12, 0x03, 0x15, 0x21, 0x2a, 0x0a,
+    0x0c, 0x0a, 0x05, 0x04, 0x00, 0x02, 0x00, 0x03, 0x12, 0x03, 0x15, 0x2d, 0x2e, 0x0a, 0x88, 0x01,
+    0x0a, 0x04, 0x04, 0x00, 0x02, 0x01, 0x12, 0x03, 0x18, 0x02, 0x29, 0x1a, 0x7b, 0x20, 0x48, 0x65,
+    0x69, 0x67, 0x68, 0x74, 0x20, 0x72, 0x65, 0x70, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x74, 0x73, 0x20,
+    0x74, 0x68, 0x65, 0x20, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x20, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72,
+    0x20, 0x61, 0x6e, 0x64, 0x20, 0x75, 0x6c, 0x74, 0x69, 0x6d, 0x61, 0x74, 0x65, 0x6c, 0x79, 0x2c,
+    0x20, 0x69, 0x73, 0x20, 0x74, 0x68, 0x65, 0x20, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x20, 0x6f, 0x66,
+    0x20, 0x60, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x54,
+    0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x60, 0x20, 0x74, 0x68, 0x61, 0x74,
+    0x20, 0x68, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x65, 0x64, 0x20, 0x6f, 0x6e, 0x20, 0x74, 0x68, 0x65,
+    0x20, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x2e, 0x0a, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x00, 0x02, 0x01,
+    0x05, 0x12, 0x03, 0x18, 0x02, 0x08, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x00, 0x02, 0x01, 0x01, 0x12,
+    0x03, 0x18, 0x09, 0x0f, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x00, 0x02, 0x01, 0x03, 0x12, 0x03, 0x18,
+    0x12, 0x13, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x00, 0x02, 0x01, 0x08, 0x12, 0x03, 0x18, 0x14, 0x28,
+    0x0a, 0x0d, 0x0a, 0x06, 0x04, 0x00, 0x02, 0x01, 0x08, 0x06, 0x12, 0x03, 0x18, 0x15, 0x27, 0x0a,
+    0x87, 0x02, 0x0a, 0x04, 0x04, 0x00, 0x02, 0x02, 0x12, 0x03, 0x1c, 0x02, 0x28, 0x1a, 0xf9, 0x01,
+    0x20, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x20, 0x68, 0x6f,
+    0x6c, 0x64, 0x73, 0x20, 0x61, 0x6c, 0x6c, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74,
+    0x69, 0x6f, 0x6e, 0x73, 0x20, 0x74, 0x68, 0x61, 0x74, 0x20, 0x68, 0x61, 0x70, 0x70, 0x65, 0x6e,
+    0x65, 0x64, 0x20, 0x69, 0x6e, 0x20, 0x74, 0x68, 0x65, 0x20, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x2c,
+    0x20, 0x77, 0x68, 0x69, 0x63, 0x68, 0x20, 0x69, 0x73, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61,
+    0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x20, 0x74, 0x68, 0x61, 0x74, 0x20, 0x68, 0x61, 0x70, 0x70,
+    0x65, 0x6e, 0x65, 0x64, 0x20, 0x73, 0x74, 0x61, 0x72, 0x74, 0x69, 0x6e, 0x67, 0x20, 0x77, 0x69,
+    0x74, 0x68, 0x20, 0x28, 0x61, 0x6e, 0x64, 0x20, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x69, 0x6e,
+    0x67, 0x29, 0x0a, 0x20, 0x61, 0x20, 0x60, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x4d, 0x65, 0x74, 0x61,
+    0x64, 0x61, 0x74, 0x61, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x60,
+    0x2c, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x65, 0x76, 0x65, 0x72, 0x79, 0x20, 0x6f, 0x74, 0x68, 0x65,
+    0x72, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x75, 0x70,
+    0x20, 0x74, 0x6f, 0x20, 0x28, 0x62, 0x75, 0x74, 0x20, 0x65, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x69,
+    0x6e, 0x67, 0x29, 0x20, 0x74, 0x68, 0x65, 0x20, 0x6e, 0x65, 0x78, 0x74, 0x20, 0x60, 0x42, 0x6c,
+    0x6f, 0x63, 0x6b, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x54, 0x72, 0x61, 0x6e, 0x73,
+    0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x60, 0x2e, 0x0a, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x00, 0x02,
+    0x02, 0x04, 0x12, 0x03, 0x1c, 0x02, 0x0a, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x00, 0x02, 0x02, 0x06,
+    0x12, 0x03, 0x1c, 0x0b, 0x16, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x00, 0x02, 0x02, 0x01, 0x12, 0x03,
+    0x1c, 0x17, 0x23, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x00, 0x02, 0x02, 0x03, 0x12, 0x03, 0x1c, 0x26,
+    0x27, 0x0a, 0x99, 0x01, 0x0a, 0x04, 0x04, 0x00, 0x02, 0x03, 0x12, 0x03, 0x1f, 0x02, 0x16, 0x1a,
+    0x8b, 0x01, 0x20, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x20, 0x49, 0x44, 0x20, 0x69, 0x6e, 0x66, 0x6f,
+    0x72, 0x6d, 0x73, 0x20, 0x75, 0x73, 0x20, 0x77, 0x68, 0x69, 0x63, 0x68, 0x20, 0x63, 0x68, 0x61,
+    0x69, 0x6e, 0x20, 0x77, 0x65, 0x27, 0x72, 0x65, 0x20, 0x74, 0x72, 0x79, 0x69, 0x6e, 0x67, 0x20,
+    0x74, 0x6f, 0x20, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x2c, 0x20, 0x74, 0x68, 0x69, 0x73, 0x20, 0x69,
+    0x73, 0x20, 0x69, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x61, 0x6e, 0x74, 0x20, 0x74, 0x6f, 0x20, 0x65,
+    0x6e, 0x73, 0x75, 0x72, 0x65, 0x20, 0x74, 0x68, 0x61, 0x74, 0x20, 0x77, 0x65, 0x27, 0x72, 0x65,
+    0x20, 0x6e, 0x6f, 0x74, 0x20, 0x6d, 0x69, 0x78, 0x69, 0x6e, 0x67, 0x20, 0x63, 0x68, 0x61, 0x69,
+    0x6e, 0x73, 0x20, 0x77, 0x69, 0x74, 0x68, 0x69, 0x6e, 0x20, 0x61, 0x20, 0x73, 0x69, 0x6e, 0x67,
+    0x6c, 0x65, 0x20, 0x70, 0x69, 0x70, 0x65, 0x6c, 0x69, 0x6e, 0x65, 0x2e, 0x0a, 0x0a, 0x0c, 0x0a,
+    0x05, 0x04, 0x00, 0x02, 0x03, 0x05, 0x12, 0x03, 0x1f, 0x02, 0x08, 0x0a, 0x0c, 0x0a, 0x05, 0x04,
+    0x00, 0x02, 0x03, 0x01, 0x12, 0x03, 0x1f, 0x09, 0x11, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x00, 0x02,
+    0x03, 0x03, 0x12, 0x03, 0x1f, 0x14, 0x15, 0x0a, 0x94, 0x04, 0x0a, 0x02, 0x04, 0x01, 0x12, 0x04,
+    0x27, 0x00, 0x47, 0x01, 0x1a, 0x87, 0x04, 0x20, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74,
+    0x69, 0x6f, 0x6e, 0x20, 0x61, 0x73, 0x20, 0x69, 0x74, 0x20, 0x68, 0x61, 0x70, 0x70, 0x65, 0x6e,
+    0x65, 0x64, 0x20, 0x6f, 0x6e, 0x20, 0x74, 0x68, 0x65, 0x20, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x2c,
+    0x20, 0x74, 0x68, 0x65, 0x72, 0x65, 0x20, 0x61, 0x72, 0x65, 0x20, 0x34, 0x20, 0x74, 0x79, 0x70,
+    0x65, 0x73, 0x20, 0x6f, 0x66, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f,
+    0x6e, 0x73, 0x3a, 0x0a, 0x20, 0x2d, 0x20, 0x55, 0x73, 0x65, 0x72, 0x20, 0x54, 0x72, 0x61, 0x6e,
+    0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x20, 0x61, 0x20, 0x75, 0x73, 0x65, 0x72, 0x20,
+    0x69, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x74, 0x65, 0x64, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61,
+    0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x74, 0x6f, 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x61, 0x63,
+    0x74, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x74, 0x68, 0x65, 0x20, 0x63, 0x68, 0x61, 0x69, 0x6e,
+    0x0a, 0x20, 0x2d, 0x20, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x20, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61,
+    0x74, 0x61, 0x20, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x20,
+    0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x20, 0x67, 0x65, 0x6e,
+    0x65, 0x72, 0x61, 0x74, 0x65, 0x64, 0x20, 0x62, 0x79, 0x20, 0x74, 0x68, 0x65, 0x20, 0x63, 0x68,
+    0x61, 0x69, 0x6e, 0x20, 0x74, 0x6f, 0x20, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x20, 0x74, 0x6f, 0x67,
+    0x65, 0x74, 0x68, 0x65, 0x72, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f,
+    0x6e, 0x73, 0x20, 0x66, 0x6f, 0x72, 0x6d, 0x69, 0x6e, 0x67, 0x20, 0x61, 0x20, 0x22, 0x62, 0x6c,
+    0x6f, 0x63, 0x6b, 0x22, 0x0a, 0x20, 0x2d, 0x20, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x20, 0x45, 0x70,
+    0x69, 0x6c, 0x6f, 0x67, 0x75, 0x65, 0x20, 0x2f, 0x20, 0x53, 0x74, 0x61, 0x74, 0x65, 0x20, 0x43,
+    0x68, 0x65, 0x63, 0x6b, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x20, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61,
+    0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69,
+    0x6f, 0x6e, 0x73, 0x20, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x64, 0x20, 0x62, 0x79,
+    0x20, 0x74, 0x68, 0x65, 0x20, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x20, 0x74, 0x6f, 0x20, 0x65, 0x6e,
+    0x64, 0x20, 0x74, 0x68, 0x65, 0x20, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x20, 0x74, 0x72, 0x61, 0x6e,
     0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x20, 0x66, 0x6f, 0x72, 0x6d, 0x69, 0x6e, 0x67,
-    0x20, 0x61, 0x20, 0x22, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x22, 0x0a, 0x20, 0x2d, 0x20, 0x53, 0x74,
-    0x61, 0x74, 0x65, 0x20, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x20, 0x54,
-    0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x20, 0x74, 0x72, 0x61, 0x6e,
-    0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x20, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74,
-    0x65, 0x64, 0x20, 0x62, 0x79, 0x20, 0x74, 0x68, 0x65, 0x20, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x20,
-    0x73, 0x6f, 0x20, 0x77, 0x68, 0x65, 0x6e, 0x20, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f,
-    0x72, 0x20, 0x61, 0x67, 0x72, 0x65, 0x65, 0x64, 0x20, 0x6f, 0x6e, 0x20, 0x61, 0x20, 0x70, 0x61,
-    0x72, 0x74, 0x69, 0x63, 0x75, 0x6c, 0x61, 0x72, 0x20, 0x67, 0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x20,
-    0x73, 0x74, 0x61, 0x74, 0x65, 0x0a, 0x20, 0x2d, 0x20, 0x47, 0x65, 0x6e, 0x65, 0x73, 0x69, 0x73,
-    0x20, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x20, 0x74, 0x68,
-    0x65, 0x20, 0x66, 0x69, 0x72, 0x73, 0x74, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74,
-    0x69, 0x6f, 0x6e, 0x20, 0x6f, 0x66, 0x20, 0x74, 0x68, 0x65, 0x20, 0x63, 0x68, 0x61, 0x69, 0x6e,
-    0x2c, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x61, 0x6c, 0x6c, 0x20, 0x63, 0x6f, 0x72, 0x65, 0x20,
-    0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x76, 0x61, 0x6c,
-    0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x20, 0x69, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69,
-    0x6f, 0x6e, 0x20, 0x62, 0x61, 0x6b, 0x65, 0x64, 0x20, 0x69, 0x6e, 0x0a, 0x0a, 0x0a, 0x0a, 0x03,
-    0x04, 0x01, 0x01, 0x12, 0x03, 0x27, 0x08, 0x13, 0x0a, 0x0b, 0x0a, 0x04, 0x04, 0x01, 0x02, 0x00,
-    0x12, 0x03, 0x28, 0x02, 0x2f, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x01, 0x02, 0x00, 0x06, 0x12, 0x03,
-    0x28, 0x02, 0x20, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x01, 0x02, 0x00, 0x01, 0x12, 0x03, 0x28, 0x21,
-    0x2a, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x01, 0x02, 0x00, 0x03, 0x12, 0x03, 0x28, 0x2d, 0x2e, 0x0a,
-    0x0b, 0x0a, 0x04, 0x04, 0x01, 0x02, 0x01, 0x12, 0x03, 0x29, 0x02, 0x2a, 0x0a, 0x0c, 0x0a, 0x05,
-    0x04, 0x01, 0x02, 0x01, 0x05, 0x12, 0x03, 0x29, 0x02, 0x08, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x01,
-    0x02, 0x01, 0x01, 0x12, 0x03, 0x29, 0x09, 0x10, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x01, 0x02, 0x01,
-    0x03, 0x12, 0x03, 0x29, 0x13, 0x14, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x01, 0x02, 0x01, 0x08, 0x12,
-    0x03, 0x29, 0x15, 0x29, 0x0a, 0x0d, 0x0a, 0x06, 0x04, 0x01, 0x02, 0x01, 0x08, 0x06, 0x12, 0x03,
-    0x29, 0x16, 0x28, 0x0a, 0x0b, 0x0a, 0x04, 0x04, 0x01, 0x02, 0x02, 0x12, 0x03, 0x2a, 0x02, 0x1b,
-    0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x01, 0x02, 0x02, 0x06, 0x12, 0x03, 0x2a, 0x02, 0x11, 0x0a, 0x0c,
-    0x0a, 0x05, 0x04, 0x01, 0x02, 0x02, 0x01, 0x12, 0x03, 0x2a, 0x12, 0x16, 0x0a, 0x0c, 0x0a, 0x05,
-    0x04, 0x01, 0x02, 0x02, 0x03, 0x12, 0x03, 0x2a, 0x19, 0x1a, 0x0a, 0x0b, 0x0a, 0x04, 0x04, 0x01,
-    0x02, 0x03, 0x12, 0x03, 0x2b, 0x02, 0x28, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x01, 0x02, 0x03, 0x05,
-    0x12, 0x03, 0x2b, 0x02, 0x08, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x01, 0x02, 0x03, 0x01, 0x12, 0x03,
-    0x2b, 0x09, 0x0e, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x01, 0x02, 0x03, 0x03, 0x12, 0x03, 0x2b, 0x11,
-    0x12, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x01, 0x02, 0x03, 0x08, 0x12, 0x03, 0x2b, 0x13, 0x27, 0x0a,
-    0x0d, 0x0a, 0x06, 0x04, 0x01, 0x02, 0x03, 0x08, 0x06, 0x12, 0x03, 0x2b, 0x14, 0x26, 0x0a, 0x0b,
-    0x0a, 0x04, 0x04, 0x01, 0x02, 0x04, 0x12, 0x03, 0x2c, 0x02, 0x2f, 0x0a, 0x0c, 0x0a, 0x05, 0x04,
-    0x01, 0x02, 0x04, 0x05, 0x12, 0x03, 0x2c, 0x02, 0x08, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x01, 0x02,
-    0x04, 0x01, 0x12, 0x03, 0x2c, 0x09, 0x15, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x01, 0x02, 0x04, 0x03,
-    0x12, 0x03, 0x2c, 0x18, 0x19, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x01, 0x02, 0x04, 0x08, 0x12, 0x03,
-    0x2c, 0x1a, 0x2e, 0x0a, 0x0d, 0x0a, 0x06, 0x04, 0x01, 0x02, 0x04, 0x08, 0x06, 0x12, 0x03, 0x2c,
-    0x1b, 0x2d, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x01, 0x04, 0x00, 0x12, 0x04, 0x2e, 0x02, 0x35, 0x03,
-    0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x01, 0x04, 0x00, 0x01, 0x12, 0x03, 0x2e, 0x07, 0x16, 0x0a, 0x0d,
-    0x0a, 0x06, 0x04, 0x01, 0x04, 0x00, 0x02, 0x00, 0x12, 0x03, 0x2f, 0x04, 0x25, 0x0a, 0x0e, 0x0a,
-    0x07, 0x04, 0x01, 0x04, 0x00, 0x02, 0x00, 0x01, 0x12, 0x03, 0x2f, 0x04, 0x20, 0x0a, 0x0e, 0x0a,
-    0x07, 0x04, 0x01, 0x04, 0x00, 0x02, 0x00, 0x02, 0x12, 0x03, 0x2f, 0x23, 0x24, 0x0a, 0x0d, 0x0a,
-    0x06, 0x04, 0x01, 0x04, 0x00, 0x02, 0x01, 0x12, 0x03, 0x30, 0x04, 0x21, 0x0a, 0x0e, 0x0a, 0x07,
-    0x04, 0x01, 0x04, 0x00, 0x02, 0x01, 0x01, 0x12, 0x03, 0x30, 0x04, 0x1c, 0x0a, 0x0e, 0x0a, 0x07,
-    0x04, 0x01, 0x04, 0x00, 0x02, 0x01, 0x02, 0x12, 0x03, 0x30, 0x1f, 0x20, 0x0a, 0x0d, 0x0a, 0x06,
-    0x04, 0x01, 0x04, 0x00, 0x02, 0x02, 0x12, 0x03, 0x31, 0x04, 0x28, 0x0a, 0x0e, 0x0a, 0x07, 0x04,
-    0x01, 0x04, 0x00, 0x02, 0x02, 0x01, 0x12, 0x03, 0x31, 0x04, 0x23, 0x0a, 0x0e, 0x0a, 0x07, 0x04,
-    0x01, 0x04, 0x00, 0x02, 0x02, 0x02, 0x12, 0x03, 0x31, 0x26, 0x27, 0x0a, 0x0d, 0x0a, 0x06, 0x04,
-    0x01, 0x04, 0x00, 0x02, 0x03, 0x12, 0x03, 0x32, 0x04, 0x2a, 0x0a, 0x0e, 0x0a, 0x07, 0x04, 0x01,
-    0x04, 0x00, 0x02, 0x03, 0x01, 0x12, 0x03, 0x32, 0x04, 0x25, 0x0a, 0x0e, 0x0a, 0x07, 0x04, 0x01,
-    0x04, 0x00, 0x02, 0x03, 0x02, 0x12, 0x03, 0x32, 0x28, 0x29, 0x0a, 0x0d, 0x0a, 0x06, 0x04, 0x01,
-    0x04, 0x00, 0x02, 0x04, 0x12, 0x03, 0x33, 0x04, 0x1e, 0x0a, 0x0e, 0x0a, 0x07, 0x04, 0x01, 0x04,
-    0x00, 0x02, 0x04, 0x01, 0x12, 0x03, 0x33, 0x04, 0x19, 0x0a, 0x0e, 0x0a, 0x07, 0x04, 0x01, 0x04,
-    0x00, 0x02, 0x04, 0x02, 0x12, 0x03, 0x33, 0x1c, 0x1d, 0x0a, 0x0d, 0x0a, 0x06, 0x04, 0x01, 0x04,
-    0x00, 0x02, 0x05, 0x12, 0x03, 0x34, 0x04, 0x24, 0x0a, 0x0e, 0x0a, 0x07, 0x04, 0x01, 0x04, 0x00,
-    0x02, 0x05, 0x01, 0x12, 0x03, 0x34, 0x04, 0x1e, 0x0a, 0x0e, 0x0a, 0x07, 0x04, 0x01, 0x04, 0x00,
-    0x02, 0x05, 0x02, 0x12, 0x03, 0x34, 0x21, 0x23, 0x0a, 0x0b, 0x0a, 0x04, 0x04, 0x01, 0x02, 0x05,
-    0x12, 0x03, 0x37, 0x02, 0x1b, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x01, 0x02, 0x05, 0x06, 0x12, 0x03,
-    0x37, 0x02, 0x11, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x01, 0x02, 0x05, 0x01, 0x12, 0x03, 0x37, 0x12,
-    0x16, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x01, 0x02, 0x05, 0x03, 0x12, 0x03, 0x37, 0x19, 0x1a, 0x0a,
-    0x0c, 0x0a, 0x04, 0x04, 0x01, 0x08, 0x00, 0x12, 0x04, 0x39, 0x02, 0x3f, 0x03, 0x0a, 0x0c, 0x0a,
-    0x05, 0x04, 0x01, 0x08, 0x00, 0x01, 0x12, 0x03, 0x39, 0x08, 0x10, 0x0a, 0x0b, 0x0a, 0x04, 0x04,
-    0x01, 0x02, 0x06, 0x12, 0x03, 0x3a, 0x04, 0x30, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x01, 0x02, 0x06,
-    0x06, 0x12, 0x03, 0x3a, 0x04, 0x1c, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x01, 0x02, 0x06, 0x01, 0x12,
-    0x03, 0x3a, 0x1d, 0x2b, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x01, 0x02, 0x06, 0x03, 0x12, 0x03, 0x3a,
-    0x2e, 0x2f, 0x0a, 0x0b, 0x0a, 0x04, 0x04, 0x01, 0x02, 0x07, 0x12, 0x03, 0x3b, 0x04, 0x23, 0x0a,
-    0x0c, 0x0a, 0x05, 0x04, 0x01, 0x02, 0x07, 0x06, 0x12, 0x03, 0x3b, 0x04, 0x16, 0x0a, 0x0c, 0x0a,
-    0x05, 0x04, 0x01, 0x02, 0x07, 0x01, 0x12, 0x03, 0x3b, 0x17, 0x1e, 0x0a, 0x0c, 0x0a, 0x05, 0x04,
-    0x01, 0x02, 0x07, 0x03, 0x12, 0x03, 0x3b, 0x21, 0x22, 0x0a, 0x0b, 0x0a, 0x04, 0x04, 0x01, 0x02,
-    0x08, 0x12, 0x03, 0x3c, 0x04, 0x34, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x01, 0x02, 0x08, 0x06, 0x12,
-    0x03, 0x3c, 0x04, 0x1e, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x01, 0x02, 0x08, 0x01, 0x12, 0x03, 0x3c,
-    0x1f, 0x2f, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x01, 0x02, 0x08, 0x03, 0x12, 0x03, 0x3c, 0x32, 0x33,
-    0x0a, 0x0b, 0x0a, 0x04, 0x04, 0x01, 0x02, 0x09, 0x12, 0x03, 0x3d, 0x04, 0x1e, 0x0a, 0x0c, 0x0a,
-    0x05, 0x04, 0x01, 0x02, 0x09, 0x06, 0x12, 0x03, 0x3d, 0x04, 0x13, 0x0a, 0x0c, 0x0a, 0x05, 0x04,
-    0x01, 0x02, 0x09, 0x01, 0x12, 0x03, 0x3d, 0x14, 0x18, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x01, 0x02,
-    0x09, 0x03, 0x12, 0x03, 0x3d, 0x1b, 0x1d, 0x0a, 0x0b, 0x0a, 0x04, 0x04, 0x01, 0x02, 0x0a, 0x12,
-    0x03, 0x3e, 0x04, 0x28, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x01, 0x02, 0x0a, 0x06, 0x12, 0x03, 0x3e,
-    0x04, 0x18, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x01, 0x02, 0x0a, 0x01, 0x12, 0x03, 0x3e, 0x19, 0x22,
-    0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x01, 0x02, 0x0a, 0x03, 0x12, 0x03, 0x3e, 0x25, 0x27, 0x0a, 0x0b,
-    0x0a, 0x04, 0x04, 0x01, 0x02, 0x0b, 0x12, 0x03, 0x41, 0x02, 0x25, 0x0a, 0x0c, 0x0a, 0x05, 0x04,
-    0x01, 0x02, 0x0b, 0x06, 0x12, 0x03, 0x41, 0x02, 0x15, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x01, 0x02,
-    0x0b, 0x01, 0x12, 0x03, 0x41, 0x16, 0x1f, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x01, 0x02, 0x0b, 0x03,
-    0x12, 0x03, 0x41, 0x22, 0x24, 0x0a, 0x0a, 0x0a, 0x02, 0x04, 0x02, 0x12, 0x04, 0x44, 0x00, 0x4b,
-    0x01, 0x0a, 0x0a, 0x0a, 0x03, 0x04, 0x02, 0x01, 0x12, 0x03, 0x44, 0x08, 0x20, 0x0a, 0x0b, 0x0a,
-    0x04, 0x04, 0x02, 0x02, 0x00, 0x12, 0x03, 0x45, 0x02, 0x10, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x02,
-    0x02, 0x00, 0x05, 0x12, 0x03, 0x45, 0x02, 0x08, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x02, 0x02, 0x00,
-    0x01, 0x12, 0x03, 0x45, 0x09, 0x0b, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x02, 0x02, 0x00, 0x03, 0x12,
-    0x03, 0x45, 0x0e, 0x0f, 0x0a, 0x0b, 0x0a, 0x04, 0x04, 0x02, 0x02, 0x01, 0x12, 0x03, 0x46, 0x02,
-    0x28, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x02, 0x02, 0x01, 0x05, 0x12, 0x03, 0x46, 0x02, 0x08, 0x0a,
-    0x0c, 0x0a, 0x05, 0x04, 0x02, 0x02, 0x01, 0x01, 0x12, 0x03, 0x46, 0x09, 0x0e, 0x0a, 0x0c, 0x0a,
-    0x05, 0x04, 0x02, 0x02, 0x01, 0x03, 0x12, 0x03, 0x46, 0x11, 0x12, 0x0a, 0x0c, 0x0a, 0x05, 0x04,
-    0x02, 0x02, 0x01, 0x08, 0x12, 0x03, 0x46, 0x13, 0x27, 0x0a, 0x0d, 0x0a, 0x06, 0x04, 0x02, 0x02,
-    0x01, 0x08, 0x06, 0x12, 0x03, 0x46, 0x14, 0x26, 0x0a, 0x0b, 0x0a, 0x04, 0x04, 0x02, 0x02, 0x02,
-    0x12, 0x03, 0x47, 0x02, 0x1c, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x02, 0x02, 0x02, 0x04, 0x12, 0x03,
-    0x47, 0x02, 0x0a, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x02, 0x02, 0x02, 0x06, 0x12, 0x03, 0x47, 0x0b,
-    0x10, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x02, 0x02, 0x02, 0x01, 0x12, 0x03, 0x47, 0x11, 0x17, 0x0a,
-    0x0c, 0x0a, 0x05, 0x04, 0x02, 0x02, 0x02, 0x03, 0x12, 0x03, 0x47, 0x1a, 0x1b, 0x0a, 0x0b, 0x0a,
-    0x04, 0x04, 0x02, 0x02, 0x03, 0x12, 0x03, 0x48, 0x02, 0x28, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x02,
-    0x02, 0x03, 0x05, 0x12, 0x03, 0x48, 0x02, 0x07, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x02, 0x02, 0x03,
-    0x01, 0x12, 0x03, 0x48, 0x08, 0x23, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x02, 0x02, 0x03, 0x03, 0x12,
-    0x03, 0x48, 0x26, 0x27, 0x0a, 0x0b, 0x0a, 0x04, 0x04, 0x02, 0x02, 0x04, 0x12, 0x03, 0x49, 0x02,
-    0x16, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x02, 0x02, 0x04, 0x05, 0x12, 0x03, 0x49, 0x02, 0x08, 0x0a,
-    0x0c, 0x0a, 0x05, 0x04, 0x02, 0x02, 0x04, 0x01, 0x12, 0x03, 0x49, 0x09, 0x11, 0x0a, 0x0c, 0x0a,
-    0x05, 0x04, 0x02, 0x02, 0x04, 0x03, 0x12, 0x03, 0x49, 0x14, 0x15, 0x0a, 0x0b, 0x0a, 0x04, 0x04,
-    0x02, 0x02, 0x05, 0x12, 0x03, 0x4a, 0x02, 0x2e, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x02, 0x02, 0x05,
-    0x04, 0x12, 0x03, 0x4a, 0x02, 0x0a, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x02, 0x02, 0x05, 0x05, 0x12,
-    0x03, 0x4a, 0x0b, 0x11, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x02, 0x02, 0x05, 0x01, 0x12, 0x03, 0x4a,
-    0x12, 0x29, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x02, 0x02, 0x05, 0x03, 0x12, 0x03, 0x4a, 0x2c, 0x2d,
-    0x0a, 0x0a, 0x0a, 0x02, 0x04, 0x03, 0x12, 0x04, 0x4d, 0x00, 0x50, 0x01, 0x0a, 0x0a, 0x0a, 0x03,
-    0x04, 0x03, 0x01, 0x12, 0x03, 0x4d, 0x08, 0x1a, 0x0a, 0x0b, 0x0a, 0x04, 0x04, 0x03, 0x02, 0x00,
-    0x12, 0x03, 0x4e, 0x02, 0x17, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x03, 0x02, 0x00, 0x06, 0x12, 0x03,
-    0x4e, 0x02, 0x0a, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x03, 0x02, 0x00, 0x01, 0x12, 0x03, 0x4e, 0x0b,
-    0x12, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x03, 0x02, 0x00, 0x03, 0x12, 0x03, 0x4e, 0x15, 0x16, 0x0a,
-    0x0b, 0x0a, 0x04, 0x04, 0x03, 0x02, 0x01, 0x12, 0x03, 0x4f, 0x02, 0x1c, 0x0a, 0x0c, 0x0a, 0x05,
-    0x04, 0x03, 0x02, 0x01, 0x04, 0x12, 0x03, 0x4f, 0x02, 0x0a, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x03,
-    0x02, 0x01, 0x06, 0x12, 0x03, 0x4f, 0x0b, 0x10, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x03, 0x02, 0x01,
-    0x01, 0x12, 0x03, 0x4f, 0x11, 0x17, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x03, 0x02, 0x01, 0x03, 0x12,
-    0x03, 0x4f, 0x1a, 0x1b, 0x0a, 0x0a, 0x0a, 0x02, 0x04, 0x04, 0x12, 0x04, 0x52, 0x00, 0x53, 0x01,
-    0x0a, 0x0a, 0x0a, 0x03, 0x04, 0x04, 0x01, 0x12, 0x03, 0x52, 0x08, 0x22, 0x0a, 0x0a, 0x0a, 0x02,
-    0x04, 0x05, 0x12, 0x04, 0x55, 0x00, 0x56, 0x01, 0x0a, 0x0a, 0x0a, 0x03, 0x04, 0x05, 0x01, 0x12,
-    0x03, 0x55, 0x08, 0x1c, 0x0a, 0x0a, 0x0a, 0x02, 0x04, 0x06, 0x12, 0x04, 0x58, 0x00, 0x5b, 0x01,
-    0x0a, 0x0a, 0x0a, 0x03, 0x04, 0x06, 0x01, 0x12, 0x03, 0x58, 0x08, 0x17, 0x0a, 0x0b, 0x0a, 0x04,
-    0x04, 0x06, 0x02, 0x00, 0x12, 0x03, 0x59, 0x02, 0x25, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x06, 0x02,
-    0x00, 0x06, 0x12, 0x03, 0x59, 0x02, 0x18, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x06, 0x02, 0x00, 0x01,
-    0x12, 0x03, 0x59, 0x19, 0x20, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x06, 0x02, 0x00, 0x03, 0x12, 0x03,
-    0x59, 0x23, 0x24, 0x0a, 0x0b, 0x0a, 0x04, 0x04, 0x06, 0x02, 0x01, 0x12, 0x03, 0x5a, 0x02, 0x1c,
-    0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x06, 0x02, 0x01, 0x04, 0x12, 0x03, 0x5a, 0x02, 0x0a, 0x0a, 0x0c,
-    0x0a, 0x05, 0x04, 0x06, 0x02, 0x01, 0x06, 0x12, 0x03, 0x5a, 0x0b, 0x10, 0x0a, 0x0c, 0x0a, 0x05,
-    0x04, 0x06, 0x02, 0x01, 0x01, 0x12, 0x03, 0x5a, 0x11, 0x17, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x06,
-    0x02, 0x01, 0x03, 0x12, 0x03, 0x5a, 0x1a, 0x1b, 0x0a, 0x0a, 0x0a, 0x02, 0x04, 0x07, 0x12, 0x04,
-    0x5d, 0x00, 0x63, 0x01, 0x0a, 0x0a, 0x0a, 0x03, 0x04, 0x07, 0x01, 0x12, 0x03, 0x5d, 0x08, 0x0d,
-    0x0a, 0x0b, 0x0a, 0x04, 0x04, 0x07, 0x02, 0x00, 0x12, 0x03, 0x5e, 0x02, 0x13, 0x0a, 0x0c, 0x0a,
-    0x05, 0x04, 0x07, 0x02, 0x00, 0x06, 0x12, 0x03, 0x5e, 0x02, 0x0a, 0x0a, 0x0c, 0x0a, 0x05, 0x04,
-    0x07, 0x02, 0x00, 0x01, 0x12, 0x03, 0x5e, 0x0b, 0x0e, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x07, 0x02,
-    0x00, 0x03, 0x12, 0x03, 0x5e, 0x11, 0x12, 0x0a, 0x0b, 0x0a, 0x04, 0x04, 0x07, 0x02, 0x01, 0x12,
-    0x03, 0x5f, 0x02, 0x32, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x07, 0x02, 0x01, 0x05, 0x12, 0x03, 0x5f,
-    0x02, 0x08, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x07, 0x02, 0x01, 0x01, 0x12, 0x03, 0x5f, 0x09, 0x18,
-    0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x07, 0x02, 0x01, 0x03, 0x12, 0x03, 0x5f, 0x1b, 0x1c, 0x0a, 0x0c,
-    0x0a, 0x05, 0x04, 0x07, 0x02, 0x01, 0x08, 0x12, 0x03, 0x5f, 0x1d, 0x31, 0x0a, 0x0d, 0x0a, 0x06,
-    0x04, 0x07, 0x02, 0x01, 0x08, 0x06, 0x12, 0x03, 0x5f, 0x1e, 0x30, 0x0a, 0x0b, 0x0a, 0x04, 0x04,
-    0x07, 0x02, 0x02, 0x12, 0x03, 0x60, 0x02, 0x14, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x07, 0x02, 0x02,
-    0x06, 0x12, 0x03, 0x60, 0x02, 0x0a, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x07, 0x02, 0x02, 0x01, 0x12,
-    0x03, 0x60, 0x0b, 0x0f, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x07, 0x02, 0x02, 0x03, 0x12, 0x03, 0x60,
-    0x12, 0x13, 0x0a, 0x0b, 0x0a, 0x04, 0x04, 0x07, 0x02, 0x03, 0x12, 0x03, 0x61, 0x02, 0x16, 0x0a,
-    0x0c, 0x0a, 0x05, 0x04, 0x07, 0x02, 0x03, 0x05, 0x12, 0x03, 0x61, 0x02, 0x08, 0x0a, 0x0c, 0x0a,
-    0x05, 0x04, 0x07, 0x02, 0x03, 0x01, 0x12, 0x03, 0x61, 0x09, 0x11, 0x0a, 0x0c, 0x0a, 0x05, 0x04,
-    0x07, 0x02, 0x03, 0x03, 0x12, 0x03, 0x61, 0x14, 0x15, 0x0a, 0x0b, 0x0a, 0x04, 0x04, 0x07, 0x02,
-    0x04, 0x12, 0x03, 0x62, 0x02, 0x12, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x07, 0x02, 0x04, 0x05, 0x12,
-    0x03, 0x62, 0x02, 0x08, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x07, 0x02, 0x04, 0x01, 0x12, 0x03, 0x62,
-    0x09, 0x0d, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x07, 0x02, 0x04, 0x03, 0x12, 0x03, 0x62, 0x10, 0x11,
-    0x0a, 0x0a, 0x0a, 0x02, 0x04, 0x08, 0x12, 0x04, 0x65, 0x00, 0x6f, 0x01, 0x0a, 0x0a, 0x0a, 0x03,
-    0x04, 0x08, 0x01, 0x12, 0x03, 0x65, 0x08, 0x17, 0x0a, 0x0b, 0x0a, 0x04, 0x04, 0x08, 0x02, 0x00,
-    0x12, 0x03, 0x66, 0x02, 0x11, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x08, 0x02, 0x00, 0x05, 0x12, 0x03,
-    0x66, 0x02, 0x07, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x08, 0x02, 0x00, 0x01, 0x12, 0x03, 0x66, 0x08,
-    0x0c, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x08, 0x02, 0x00, 0x03, 0x12, 0x03, 0x66, 0x0f, 0x10, 0x0a,
-    0x0b, 0x0a, 0x04, 0x04, 0x08, 0x02, 0x01, 0x12, 0x03, 0x67, 0x02, 0x1e, 0x0a, 0x0c, 0x0a, 0x05,
-    0x04, 0x08, 0x02, 0x01, 0x05, 0x12, 0x03, 0x67, 0x02, 0x07, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x08,
-    0x02, 0x01, 0x01, 0x12, 0x03, 0x67, 0x08, 0x19, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x08, 0x02, 0x01,
-    0x03, 0x12, 0x03, 0x67, 0x1c, 0x1d, 0x0a, 0x0b, 0x0a, 0x04, 0x04, 0x08, 0x02, 0x02, 0x12, 0x03,
-    0x68, 0x02, 0x1c, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x08, 0x02, 0x02, 0x05, 0x12, 0x03, 0x68, 0x02,
-    0x07, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x08, 0x02, 0x02, 0x01, 0x12, 0x03, 0x68, 0x08, 0x17, 0x0a,
-    0x0c, 0x0a, 0x05, 0x04, 0x08, 0x02, 0x02, 0x03, 0x12, 0x03, 0x68, 0x1a, 0x1b, 0x0a, 0x0b, 0x0a,
-    0x04, 0x04, 0x08, 0x02, 0x03, 0x12, 0x03, 0x69, 0x02, 0x2b, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x08,
-    0x02, 0x03, 0x04, 0x12, 0x03, 0x69, 0x02, 0x0a, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x08, 0x02, 0x03,
-    0x05, 0x12, 0x03, 0x69, 0x0b, 0x10, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x08, 0x02, 0x03, 0x01, 0x12,
-    0x03, 0x69, 0x11, 0x26, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x08, 0x02, 0x03, 0x03, 0x12, 0x03, 0x69,
-    0x29, 0x2a, 0x0a, 0x0b, 0x0a, 0x04, 0x04, 0x08, 0x02, 0x04, 0x12, 0x03, 0x6a, 0x02, 0x2b, 0x0a,
-    0x0c, 0x0a, 0x05, 0x04, 0x08, 0x02, 0x04, 0x05, 0x12, 0x03, 0x6a, 0x02, 0x08, 0x0a, 0x0c, 0x0a,
-    0x05, 0x04, 0x08, 0x02, 0x04, 0x01, 0x12, 0x03, 0x6a, 0x09, 0x11, 0x0a, 0x0c, 0x0a, 0x05, 0x04,
-    0x08, 0x02, 0x04, 0x03, 0x12, 0x03, 0x6a, 0x14, 0x15, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x08, 0x02,
-    0x04, 0x08, 0x12, 0x03, 0x6a, 0x16, 0x2a, 0x0a, 0x0d, 0x0a, 0x06, 0x04, 0x08, 0x02, 0x04, 0x08,
-    0x06, 0x12, 0x03, 0x6a, 0x17, 0x29, 0x0a, 0x0b, 0x0a, 0x04, 0x04, 0x08, 0x02, 0x05, 0x12, 0x03,
-    0x6b, 0x02, 0x13, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x08, 0x02, 0x05, 0x05, 0x12, 0x03, 0x6b, 0x02,
-    0x06, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x08, 0x02, 0x05, 0x01, 0x12, 0x03, 0x6b, 0x07, 0x0e, 0x0a,
-    0x0c, 0x0a, 0x05, 0x04, 0x08, 0x02, 0x05, 0x03, 0x12, 0x03, 0x6b, 0x11, 0x12, 0x0a, 0x0b, 0x0a,
-    0x04, 0x04, 0x08, 0x02, 0x06, 0x12, 0x03, 0x6c, 0x02, 0x17, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x08,
-    0x02, 0x06, 0x05, 0x12, 0x03, 0x6c, 0x02, 0x08, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x08, 0x02, 0x06,
-    0x01, 0x12, 0x03, 0x6c, 0x09, 0x12, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x08, 0x02, 0x06, 0x03, 0x12,
-    0x03, 0x6c, 0x15, 0x16, 0x0a, 0x0b, 0x0a, 0x04, 0x04, 0x08, 0x02, 0x07, 0x12, 0x03, 0x6d, 0x02,
-    0x22, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x08, 0x02, 0x07, 0x05, 0x12, 0x03, 0x6d, 0x02, 0x07, 0x0a,
-    0x0c, 0x0a, 0x05, 0x04, 0x08, 0x02, 0x07, 0x01, 0x12, 0x03, 0x6d, 0x08, 0x1d, 0x0a, 0x0c, 0x0a,
-    0x05, 0x04, 0x08, 0x02, 0x07, 0x03, 0x12, 0x03, 0x6d, 0x20, 0x21, 0x0a, 0x0b, 0x0a, 0x04, 0x04,
-    0x08, 0x02, 0x08, 0x12, 0x03, 0x6e, 0x02, 0x26, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x08, 0x02, 0x08,
-    0x04, 0x12, 0x03, 0x6e, 0x02, 0x0a, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x08, 0x02, 0x08, 0x06, 0x12,
-    0x03, 0x6e, 0x0b, 0x19, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x08, 0x02, 0x08, 0x01, 0x12, 0x03, 0x6e,
-    0x1a, 0x21, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x08, 0x02, 0x08, 0x03, 0x12, 0x03, 0x6e, 0x24, 0x25,
-    0x0a, 0x0a, 0x0a, 0x02, 0x04, 0x09, 0x12, 0x04, 0x71, 0x00, 0x74, 0x01, 0x0a, 0x0a, 0x0a, 0x03,
-    0x04, 0x09, 0x01, 0x12, 0x03, 0x71, 0x08, 0x10, 0x0a, 0x0b, 0x0a, 0x04, 0x04, 0x09, 0x02, 0x00,
-    0x12, 0x03, 0x72, 0x02, 0x32, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x09, 0x02, 0x00, 0x05, 0x12, 0x03,
-    0x72, 0x02, 0x08, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x09, 0x02, 0x00, 0x01, 0x12, 0x03, 0x72, 0x09,
-    0x18, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x09, 0x02, 0x00, 0x03, 0x12, 0x03, 0x72, 0x1b, 0x1c, 0x0a,
-    0x0c, 0x0a, 0x05, 0x04, 0x09, 0x02, 0x00, 0x08, 0x12, 0x03, 0x72, 0x1d, 0x31, 0x0a, 0x0d, 0x0a,
-    0x06, 0x04, 0x09, 0x02, 0x00, 0x08, 0x06, 0x12, 0x03, 0x72, 0x1e, 0x30, 0x0a, 0x0b, 0x0a, 0x04,
-    0x04, 0x09, 0x02, 0x01, 0x12, 0x03, 0x73, 0x02, 0x1d, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x09, 0x02,
-    0x01, 0x05, 0x12, 0x03, 0x73, 0x02, 0x08, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x09, 0x02, 0x01, 0x01,
-    0x12, 0x03, 0x73, 0x09, 0x18, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x09, 0x02, 0x01, 0x03, 0x12, 0x03,
-    0x73, 0x1b, 0x1c, 0x0a, 0x0a, 0x0a, 0x02, 0x04, 0x0a, 0x12, 0x04, 0x76, 0x00, 0x7e, 0x01, 0x0a,
-    0x0a, 0x0a, 0x03, 0x04, 0x0a, 0x01, 0x12, 0x03, 0x76, 0x08, 0x1e, 0x0a, 0x0b, 0x0a, 0x04, 0x04,
-    0x0a, 0x02, 0x00, 0x12, 0x03, 0x77, 0x02, 0x14, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x0a, 0x02, 0x00,
-    0x05, 0x12, 0x03, 0x77, 0x02, 0x08, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x0a, 0x02, 0x00, 0x01, 0x12,
-    0x03, 0x77, 0x09, 0x0f, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x0a, 0x02, 0x00, 0x03, 0x12, 0x03, 0x77,
-    0x12, 0x13, 0x0a, 0x0b, 0x0a, 0x04, 0x04, 0x0a, 0x02, 0x01, 0x12, 0x03, 0x78, 0x02, 0x32, 0x0a,
-    0x0c, 0x0a, 0x05, 0x04, 0x0a, 0x02, 0x01, 0x05, 0x12, 0x03, 0x78, 0x02, 0x08, 0x0a, 0x0c, 0x0a,
-    0x05, 0x04, 0x0a, 0x02, 0x01, 0x01, 0x12, 0x03, 0x78, 0x09, 0x18, 0x0a, 0x0c, 0x0a, 0x05, 0x04,
-    0x0a, 0x02, 0x01, 0x03, 0x12, 0x03, 0x78, 0x1b, 0x1c, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x0a, 0x02,
-    0x01, 0x08, 0x12, 0x03, 0x78, 0x1d, 0x31, 0x0a, 0x0d, 0x0a, 0x06, 0x04, 0x0a, 0x02, 0x01, 0x08,
-    0x06, 0x12, 0x03, 0x78, 0x1e, 0x30, 0x0a, 0x0b, 0x0a, 0x04, 0x04, 0x0a, 0x02, 0x02, 0x12, 0x03,
-    0x79, 0x02, 0x31, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x0a, 0x02, 0x02, 0x05, 0x12, 0x03, 0x79, 0x02,
-    0x08, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x0a, 0x02, 0x02, 0x01, 0x12, 0x03, 0x79, 0x09, 0x17, 0x0a,
-    0x0c, 0x0a, 0x05, 0x04, 0x0a, 0x02, 0x02, 0x03, 0x12, 0x03, 0x79, 0x1a, 0x1b, 0x0a, 0x0c, 0x0a,
-    0x05, 0x04, 0x0a, 0x02, 0x02, 0x08, 0x12, 0x03, 0x79, 0x1c, 0x30, 0x0a, 0x0d, 0x0a, 0x06, 0x04,
-    0x0a, 0x02, 0x02, 0x08, 0x06, 0x12, 0x03, 0x79, 0x1d, 0x2f, 0x0a, 0x0b, 0x0a, 0x04, 0x04, 0x0a,
-    0x02, 0x03, 0x12, 0x03, 0x7a, 0x02, 0x31, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x0a, 0x02, 0x03, 0x05,
-    0x12, 0x03, 0x7a, 0x02, 0x08, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x0a, 0x02, 0x03, 0x01, 0x12, 0x03,
-    0x7a, 0x09, 0x17, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x0a, 0x02, 0x03, 0x03, 0x12, 0x03, 0x7a, 0x1a,
-    0x1b, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x0a, 0x02, 0x03, 0x08, 0x12, 0x03, 0x7a, 0x1c, 0x30, 0x0a,
-    0x0d, 0x0a, 0x06, 0x04, 0x0a, 0x02, 0x03, 0x08, 0x06, 0x12, 0x03, 0x7a, 0x1d, 0x2f, 0x0a, 0x0b,
-    0x0a, 0x04, 0x04, 0x0a, 0x02, 0x04, 0x12, 0x03, 0x7b, 0x02, 0x3f, 0x0a, 0x0c, 0x0a, 0x05, 0x04,
-    0x0a, 0x02, 0x04, 0x06, 0x12, 0x03, 0x7b, 0x02, 0x20, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x0a, 0x02,
-    0x04, 0x01, 0x12, 0x03, 0x7b, 0x21, 0x3a, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x0a, 0x02, 0x04, 0x03,
-    0x12, 0x03, 0x7b, 0x3d, 0x3e, 0x0a, 0x0b, 0x0a, 0x04, 0x04, 0x0a, 0x02, 0x05, 0x12, 0x03, 0x7c,
-    0x02, 0x21, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x0a, 0x02, 0x05, 0x06, 0x12, 0x03, 0x7c, 0x02, 0x14,
-    0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x0a, 0x02, 0x05, 0x01, 0x12, 0x03, 0x7c, 0x15, 0x1c, 0x0a, 0x0c,
-    0x0a, 0x05, 0x04, 0x0a, 0x02, 0x05, 0x03, 0x12, 0x03, 0x7c, 0x1f, 0x20, 0x0a, 0x0b, 0x0a, 0x04,
-    0x04, 0x0a, 0x02, 0x06, 0x12, 0x03, 0x7d, 0x02, 0x1a, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x0a, 0x02,
-    0x06, 0x06, 0x12, 0x03, 0x7d, 0x02, 0x0b, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x0a, 0x02, 0x06, 0x01,
-    0x12, 0x03, 0x7d, 0x0c, 0x15, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x0a, 0x02, 0x06, 0x03, 0x12, 0x03,
-    0x7d, 0x18, 0x19, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x0b, 0x12, 0x06, 0x80, 0x01, 0x00, 0x8d, 0x01,
-    0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x0b, 0x01, 0x12, 0x04, 0x80, 0x01, 0x08, 0x10, 0x0a, 0x0e,
-    0x0a, 0x04, 0x04, 0x0b, 0x04, 0x00, 0x12, 0x06, 0x82, 0x01, 0x02, 0x86, 0x01, 0x03, 0x0a, 0x0d,
-    0x0a, 0x05, 0x04, 0x0b, 0x04, 0x00, 0x01, 0x12, 0x04, 0x82, 0x01, 0x07, 0x13, 0x0a, 0x0e, 0x0a,
-    0x06, 0x04, 0x0b, 0x04, 0x00, 0x02, 0x00, 0x12, 0x04, 0x83, 0x01, 0x04, 0x23, 0x0a, 0x0f, 0x0a,
-    0x07, 0x04, 0x0b, 0x04, 0x00, 0x02, 0x00, 0x01, 0x12, 0x04, 0x83, 0x01, 0x04, 0x1e, 0x0a, 0x0f,
-    0x0a, 0x07, 0x04, 0x0b, 0x04, 0x00, 0x02, 0x00, 0x02, 0x12, 0x04, 0x83, 0x01, 0x21, 0x22, 0x0a,
-    0x0e, 0x0a, 0x06, 0x04, 0x0b, 0x04, 0x00, 0x02, 0x01, 0x12, 0x04, 0x84, 0x01, 0x04, 0x28, 0x0a,
-    0x0f, 0x0a, 0x07, 0x04, 0x0b, 0x04, 0x00, 0x02, 0x01, 0x01, 0x12, 0x04, 0x84, 0x01, 0x04, 0x23,
-    0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x0b, 0x04, 0x00, 0x02, 0x01, 0x02, 0x12, 0x04, 0x84, 0x01, 0x26,
-    0x27, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x0b, 0x04, 0x00, 0x02, 0x02, 0x12, 0x04, 0x85, 0x01, 0x04,
-    0x28, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x0b, 0x04, 0x00, 0x02, 0x02, 0x01, 0x12, 0x04, 0x85, 0x01,
-    0x04, 0x23, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x0b, 0x04, 0x00, 0x02, 0x02, 0x02, 0x12, 0x04, 0x85,
-    0x01, 0x26, 0x27, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x0b, 0x02, 0x00, 0x12, 0x04, 0x88, 0x01, 0x02,
-    0x22, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0b, 0x02, 0x00, 0x06, 0x12, 0x04, 0x88, 0x01, 0x02, 0x0e,
-    0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0b, 0x02, 0x00, 0x01, 0x12, 0x04, 0x88, 0x01, 0x0f, 0x1d, 0x0a,
-    0x0d, 0x0a, 0x05, 0x04, 0x0b, 0x02, 0x00, 0x03, 0x12, 0x04, 0x88, 0x01, 0x20, 0x21, 0x0a, 0x0e,
-    0x0a, 0x04, 0x04, 0x0b, 0x08, 0x00, 0x12, 0x06, 0x89, 0x01, 0x02, 0x8c, 0x01, 0x03, 0x0a, 0x0d,
-    0x0a, 0x05, 0x04, 0x0b, 0x08, 0x00, 0x01, 0x12, 0x04, 0x89, 0x01, 0x08, 0x11, 0x0a, 0x0c, 0x0a,
-    0x04, 0x04, 0x0b, 0x02, 0x01, 0x12, 0x04, 0x8a, 0x01, 0x04, 0x28, 0x0a, 0x0d, 0x0a, 0x05, 0x04,
-    0x0b, 0x02, 0x01, 0x06, 0x12, 0x04, 0x8a, 0x01, 0x04, 0x12, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0b,
-    0x02, 0x01, 0x01, 0x12, 0x04, 0x8a, 0x01, 0x13, 0x23, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0b, 0x02,
-    0x01, 0x03, 0x12, 0x04, 0x8a, 0x01, 0x26, 0x27, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x0b, 0x02, 0x02,
-    0x12, 0x04, 0x8b, 0x01, 0x04, 0x28, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0b, 0x02, 0x02, 0x06, 0x12,
-    0x04, 0x8b, 0x01, 0x04, 0x12, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0b, 0x02, 0x02, 0x01, 0x12, 0x04,
-    0x8b, 0x01, 0x13, 0x23, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0b, 0x02, 0x02, 0x03, 0x12, 0x04, 0x8b,
-    0x01, 0x26, 0x27, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x0c, 0x12, 0x06, 0x8f, 0x01, 0x00, 0x92, 0x01,
-    0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x0c, 0x01, 0x12, 0x04, 0x8f, 0x01, 0x08, 0x16, 0x0a, 0x0c,
-    0x0a, 0x04, 0x04, 0x0c, 0x02, 0x00, 0x12, 0x04, 0x90, 0x01, 0x02, 0x18, 0x0a, 0x0d, 0x0a, 0x05,
-    0x04, 0x0c, 0x02, 0x00, 0x05, 0x12, 0x04, 0x90, 0x01, 0x02, 0x08, 0x0a, 0x0d, 0x0a, 0x05, 0x04,
-    0x0c, 0x02, 0x00, 0x01, 0x12, 0x04, 0x90, 0x01, 0x09, 0x13, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0c,
-    0x02, 0x00, 0x03, 0x12, 0x04, 0x90, 0x01, 0x16, 0x17, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x0c, 0x02,
-    0x01, 0x12, 0x04, 0x91, 0x01, 0x02, 0x1b, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0c, 0x02, 0x01, 0x06,
-    0x12, 0x04, 0x91, 0x01, 0x02, 0x0f, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0c, 0x02, 0x01, 0x01, 0x12,
-    0x04, 0x91, 0x01, 0x10, 0x16, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0c, 0x02, 0x01, 0x03, 0x12, 0x04,
-    0x91, 0x01, 0x19, 0x1a, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x0d, 0x12, 0x06, 0x94, 0x01, 0x00, 0x97,
-    0x01, 0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x0d, 0x01, 0x12, 0x04, 0x94, 0x01, 0x08, 0x16, 0x0a,
-    0x0c, 0x0a, 0x04, 0x04, 0x0d, 0x02, 0x00, 0x12, 0x04, 0x95, 0x01, 0x02, 0x2f, 0x0a, 0x0d, 0x0a,
-    0x05, 0x04, 0x0d, 0x02, 0x00, 0x04, 0x12, 0x04, 0x95, 0x01, 0x02, 0x0a, 0x0a, 0x0d, 0x0a, 0x05,
-    0x04, 0x0d, 0x02, 0x00, 0x06, 0x12, 0x04, 0x95, 0x01, 0x0b, 0x19, 0x0a, 0x0d, 0x0a, 0x05, 0x04,
-    0x0d, 0x02, 0x00, 0x01, 0x12, 0x04, 0x95, 0x01, 0x1a, 0x2a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0d,
-    0x02, 0x00, 0x03, 0x12, 0x04, 0x95, 0x01, 0x2d, 0x2e, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x0d, 0x02,
-    0x01, 0x12, 0x04, 0x96, 0x01, 0x02, 0x1c, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0d, 0x02, 0x01, 0x04,
-    0x12, 0x04, 0x96, 0x01, 0x02, 0x0a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0d, 0x02, 0x01, 0x06, 0x12,
-    0x04, 0x96, 0x01, 0x0b, 0x10, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0d, 0x02, 0x01, 0x01, 0x12, 0x04,
-    0x96, 0x01, 0x11, 0x17, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0d, 0x02, 0x01, 0x03, 0x12, 0x04, 0x96,
-    0x01, 0x1a, 0x1b, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x0e, 0x12, 0x06, 0x99, 0x01, 0x00, 0xaf, 0x01,
-    0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x0e, 0x01, 0x12, 0x04, 0x99, 0x01, 0x08, 0x16, 0x0a, 0x0e,
-    0x0a, 0x04, 0x04, 0x0e, 0x04, 0x00, 0x12, 0x06, 0x9b, 0x01, 0x02, 0xa3, 0x01, 0x03, 0x0a, 0x0d,
-    0x0a, 0x05, 0x04, 0x0e, 0x04, 0x00, 0x01, 0x12, 0x04, 0x9b, 0x01, 0x07, 0x0b, 0x0a, 0x0e, 0x0a,
-    0x06, 0x04, 0x0e, 0x04, 0x00, 0x02, 0x00, 0x12, 0x04, 0x9c, 0x01, 0x04, 0x19, 0x0a, 0x0f, 0x0a,
-    0x07, 0x04, 0x0e, 0x04, 0x00, 0x02, 0x00, 0x01, 0x12, 0x04, 0x9c, 0x01, 0x04, 0x14, 0x0a, 0x0f,
-    0x0a, 0x07, 0x04, 0x0e, 0x04, 0x00, 0x02, 0x00, 0x02, 0x12, 0x04, 0x9c, 0x01, 0x17, 0x18, 0x0a,
-    0x0e, 0x0a, 0x06, 0x04, 0x0e, 0x04, 0x00, 0x02, 0x01, 0x12, 0x04, 0x9d, 0x01, 0x04, 0x1b, 0x0a,
-    0x0f, 0x0a, 0x07, 0x04, 0x0e, 0x04, 0x00, 0x02, 0x01, 0x01, 0x12, 0x04, 0x9d, 0x01, 0x04, 0x16,
-    0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x0e, 0x04, 0x00, 0x02, 0x01, 0x02, 0x12, 0x04, 0x9d, 0x01, 0x19,
-    0x1a, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x0e, 0x04, 0x00, 0x02, 0x02, 0x12, 0x04, 0x9e, 0x01, 0x04,
-    0x1d, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x0e, 0x04, 0x00, 0x02, 0x02, 0x01, 0x12, 0x04, 0x9e, 0x01,
-    0x04, 0x18, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x0e, 0x04, 0x00, 0x02, 0x02, 0x02, 0x12, 0x04, 0x9e,
-    0x01, 0x1b, 0x1c, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x0e, 0x04, 0x00, 0x02, 0x03, 0x12, 0x04, 0x9f,
-    0x01, 0x04, 0x1f, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x0e, 0x04, 0x00, 0x02, 0x03, 0x01, 0x12, 0x04,
-    0x9f, 0x01, 0x04, 0x1a, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x0e, 0x04, 0x00, 0x02, 0x03, 0x02, 0x12,
-    0x04, 0x9f, 0x01, 0x1d, 0x1e, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x0e, 0x04, 0x00, 0x02, 0x04, 0x12,
-    0x04, 0xa0, 0x01, 0x04, 0x1a, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x0e, 0x04, 0x00, 0x02, 0x04, 0x01,
-    0x12, 0x04, 0xa0, 0x01, 0x04, 0x15, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x0e, 0x04, 0x00, 0x02, 0x04,
-    0x02, 0x12, 0x04, 0xa0, 0x01, 0x18, 0x19, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x0e, 0x04, 0x00, 0x02,
-    0x05, 0x12, 0x04, 0xa1, 0x01, 0x04, 0x1c, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x0e, 0x04, 0x00, 0x02,
-    0x05, 0x01, 0x12, 0x04, 0xa1, 0x01, 0x04, 0x17, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x0e, 0x04, 0x00,
-    0x02, 0x05, 0x02, 0x12, 0x04, 0xa1, 0x01, 0x1a, 0x1b, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x0e, 0x04,
-    0x00, 0x02, 0x06, 0x12, 0x04, 0xa2, 0x01, 0x04, 0x1e, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x0e, 0x04,
-    0x00, 0x02, 0x06, 0x01, 0x12, 0x04, 0xa2, 0x01, 0x04, 0x19, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x0e,
-    0x04, 0x00, 0x02, 0x06, 0x02, 0x12, 0x04, 0xa2, 0x01, 0x1c, 0x1d, 0x0a, 0x0c, 0x0a, 0x04, 0x04,
-    0x0e, 0x02, 0x00, 0x12, 0x04, 0xa5, 0x01, 0x02, 0x10, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0e, 0x02,
-    0x00, 0x06, 0x12, 0x04, 0xa5, 0x01, 0x02, 0x06, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0e, 0x02, 0x00,
-    0x01, 0x12, 0x04, 0xa5, 0x01, 0x07, 0x0b, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0e, 0x02, 0x00, 0x03,
-    0x12, 0x04, 0xa5, 0x01, 0x0e, 0x0f, 0x0a, 0x0e, 0x0a, 0x04, 0x04, 0x0e, 0x08, 0x00, 0x12, 0x06,
-    0xa7, 0x01, 0x02, 0xae, 0x01, 0x03, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0e, 0x08, 0x00, 0x01, 0x12,
-    0x04, 0xa7, 0x01, 0x08, 0x0e, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x0e, 0x02, 0x01, 0x12, 0x04, 0xa8,
-    0x01, 0x04, 0x23, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0e, 0x02, 0x01, 0x06, 0x12, 0x04, 0xa8, 0x01,
-    0x04, 0x10, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0e, 0x02, 0x01, 0x01, 0x12, 0x04, 0xa8, 0x01, 0x11,
-    0x1e, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0e, 0x02, 0x01, 0x03, 0x12, 0x04, 0xa8, 0x01, 0x21, 0x22,
-    0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x0e, 0x02, 0x02, 0x12, 0x04, 0xa9, 0x01, 0x04, 0x27, 0x0a, 0x0d,
-    0x0a, 0x05, 0x04, 0x0e, 0x02, 0x02, 0x06, 0x12, 0x04, 0xa9, 0x01, 0x04, 0x12, 0x0a, 0x0d, 0x0a,
-    0x05, 0x04, 0x0e, 0x02, 0x02, 0x01, 0x12, 0x04, 0xa9, 0x01, 0x13, 0x22, 0x0a, 0x0d, 0x0a, 0x05,
-    0x04, 0x0e, 0x02, 0x02, 0x03, 0x12, 0x04, 0xa9, 0x01, 0x25, 0x26, 0x0a, 0x0c, 0x0a, 0x04, 0x04,
-    0x0e, 0x02, 0x03, 0x12, 0x04, 0xaa, 0x01, 0x04, 0x2a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0e, 0x02,
-    0x03, 0x06, 0x12, 0x04, 0xaa, 0x01, 0x04, 0x13, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0e, 0x02, 0x03,
-    0x01, 0x12, 0x04, 0xaa, 0x01, 0x14, 0x25, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0e, 0x02, 0x03, 0x03,
-    0x12, 0x04, 0xaa, 0x01, 0x28, 0x29, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x0e, 0x02, 0x04, 0x12, 0x04,
-    0xab, 0x01, 0x04, 0x21, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0e, 0x02, 0x04, 0x06, 0x12, 0x04, 0xab,
-    0x01, 0x04, 0x0f, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0e, 0x02, 0x04, 0x01, 0x12, 0x04, 0xab, 0x01,
-    0x10, 0x1c, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0e, 0x02, 0x04, 0x03, 0x12, 0x04, 0xab, 0x01, 0x1f,
-    0x20, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x0e, 0x02, 0x05, 0x12, 0x04, 0xac, 0x01, 0x04, 0x25, 0x0a,
-    0x0d, 0x0a, 0x05, 0x04, 0x0e, 0x02, 0x05, 0x06, 0x12, 0x04, 0xac, 0x01, 0x04, 0x11, 0x0a, 0x0d,
-    0x0a, 0x05, 0x04, 0x0e, 0x02, 0x05, 0x01, 0x12, 0x04, 0xac, 0x01, 0x12, 0x20, 0x0a, 0x0d, 0x0a,
-    0x05, 0x04, 0x0e, 0x02, 0x05, 0x03, 0x12, 0x04, 0xac, 0x01, 0x23, 0x24, 0x0a, 0x0c, 0x0a, 0x04,
-    0x04, 0x0e, 0x02, 0x06, 0x12, 0x04, 0xad, 0x01, 0x04, 0x28, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0e,
-    0x02, 0x06, 0x06, 0x12, 0x04, 0xad, 0x01, 0x04, 0x12, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0e, 0x02,
-    0x06, 0x01, 0x12, 0x04, 0xad, 0x01, 0x13, 0x23, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0e, 0x02, 0x06,
-    0x03, 0x12, 0x04, 0xad, 0x01, 0x26, 0x27, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x0f, 0x12, 0x06, 0xb1,
-    0x01, 0x00, 0xb5, 0x01, 0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x0f, 0x01, 0x12, 0x04, 0xb1, 0x01,
-    0x08, 0x14, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x0f, 0x02, 0x00, 0x12, 0x04, 0xb2, 0x01, 0x02, 0x15,
-    0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0f, 0x02, 0x00, 0x05, 0x12, 0x04, 0xb2, 0x01, 0x02, 0x08, 0x0a,
-    0x0d, 0x0a, 0x05, 0x04, 0x0f, 0x02, 0x00, 0x01, 0x12, 0x04, 0xb2, 0x01, 0x09, 0x10, 0x0a, 0x0d,
-    0x0a, 0x05, 0x04, 0x0f, 0x02, 0x00, 0x03, 0x12, 0x04, 0xb2, 0x01, 0x13, 0x14, 0x0a, 0x0c, 0x0a,
-    0x04, 0x04, 0x0f, 0x02, 0x01, 0x12, 0x04, 0xb3, 0x01, 0x02, 0x1b, 0x0a, 0x0d, 0x0a, 0x05, 0x04,
-    0x0f, 0x02, 0x01, 0x05, 0x12, 0x04, 0xb3, 0x01, 0x02, 0x07, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0f,
-    0x02, 0x01, 0x01, 0x12, 0x04, 0xb3, 0x01, 0x08, 0x16, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0f, 0x02,
-    0x01, 0x03, 0x12, 0x04, 0xb3, 0x01, 0x19, 0x1a, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x0f, 0x02, 0x02,
-    0x12, 0x04, 0xb4, 0x01, 0x02, 0x1a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0f, 0x02, 0x02, 0x06, 0x12,
-    0x04, 0xb4, 0x01, 0x02, 0x0e, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0f, 0x02, 0x02, 0x01, 0x12, 0x04,
-    0xb4, 0x01, 0x0f, 0x15, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0f, 0x02, 0x02, 0x03, 0x12, 0x04, 0xb4,
-    0x01, 0x18, 0x19, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x10, 0x12, 0x06, 0xb7, 0x01, 0x00, 0xbc, 0x01,
-    0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x10, 0x01, 0x12, 0x04, 0xb7, 0x01, 0x08, 0x16, 0x0a, 0x0c,
-    0x0a, 0x04, 0x04, 0x10, 0x02, 0x00, 0x12, 0x04, 0xb8, 0x01, 0x02, 0x15, 0x0a, 0x0d, 0x0a, 0x05,
-    0x04, 0x10, 0x02, 0x00, 0x05, 0x12, 0x04, 0xb8, 0x01, 0x02, 0x08, 0x0a, 0x0d, 0x0a, 0x05, 0x04,
-    0x10, 0x02, 0x00, 0x01, 0x12, 0x04, 0xb8, 0x01, 0x09, 0x10, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x10,
-    0x02, 0x00, 0x03, 0x12, 0x04, 0xb8, 0x01, 0x13, 0x14, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x10, 0x02,
-    0x01, 0x12, 0x04, 0xb9, 0x01, 0x02, 0x1b, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x10, 0x02, 0x01, 0x05,
-    0x12, 0x04, 0xb9, 0x01, 0x02, 0x07, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x10, 0x02, 0x01, 0x01, 0x12,
-    0x04, 0xb9, 0x01, 0x08, 0x16, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x10, 0x02, 0x01, 0x03, 0x12, 0x04,
-    0xb9, 0x01, 0x19, 0x1a, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x10, 0x02, 0x02, 0x12, 0x04, 0xba, 0x01,
-    0x02, 0x19, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x10, 0x02, 0x02, 0x06, 0x12, 0x04, 0xba, 0x01, 0x02,
-    0x0f, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x10, 0x02, 0x02, 0x01, 0x12, 0x04, 0xba, 0x01, 0x10, 0x14,
-    0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x10, 0x02, 0x02, 0x03, 0x12, 0x04, 0xba, 0x01, 0x17, 0x18, 0x0a,
-    0x0c, 0x0a, 0x04, 0x04, 0x10, 0x02, 0x03, 0x12, 0x04, 0xbb, 0x01, 0x02, 0x16, 0x0a, 0x0d, 0x0a,
-    0x05, 0x04, 0x10, 0x02, 0x03, 0x05, 0x12, 0x04, 0xbb, 0x01, 0x02, 0x08, 0x0a, 0x0d, 0x0a, 0x05,
-    0x04, 0x10, 0x02, 0x03, 0x01, 0x12, 0x04, 0xbb, 0x01, 0x09, 0x11, 0x0a, 0x0d, 0x0a, 0x05, 0x04,
-    0x10, 0x02, 0x03, 0x03, 0x12, 0x04, 0xbb, 0x01, 0x14, 0x15, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x11,
-    0x12, 0x06, 0xbe, 0x01, 0x00, 0xc3, 0x01, 0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x11, 0x01, 0x12,
-    0x04, 0xbe, 0x01, 0x08, 0x17, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x11, 0x02, 0x00, 0x12, 0x04, 0xbf,
-    0x01, 0x02, 0x1b, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x11, 0x02, 0x00, 0x05, 0x12, 0x04, 0xbf, 0x01,
-    0x02, 0x07, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x11, 0x02, 0x00, 0x01, 0x12, 0x04, 0xbf, 0x01, 0x08,
-    0x16, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x11, 0x02, 0x00, 0x03, 0x12, 0x04, 0xbf, 0x01, 0x19, 0x1a,
-    0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x11, 0x02, 0x01, 0x12, 0x04, 0xc0, 0x01, 0x02, 0x14, 0x0a, 0x0d,
-    0x0a, 0x05, 0x04, 0x11, 0x02, 0x01, 0x05, 0x12, 0x04, 0xc0, 0x01, 0x02, 0x08, 0x0a, 0x0d, 0x0a,
-    0x05, 0x04, 0x11, 0x02, 0x01, 0x01, 0x12, 0x04, 0xc0, 0x01, 0x09, 0x0f, 0x0a, 0x0d, 0x0a, 0x05,
-    0x04, 0x11, 0x02, 0x01, 0x03, 0x12, 0x04, 0xc0, 0x01, 0x12, 0x13, 0x0a, 0x0c, 0x0a, 0x04, 0x04,
-    0x11, 0x02, 0x02, 0x12, 0x04, 0xc1, 0x01, 0x02, 0x11, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x11, 0x02,
-    0x02, 0x05, 0x12, 0x04, 0xc1, 0x01, 0x02, 0x08, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x11, 0x02, 0x02,
-    0x01, 0x12, 0x04, 0xc1, 0x01, 0x09, 0x0c, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x11, 0x02, 0x02, 0x03,
-    0x12, 0x04, 0xc1, 0x01, 0x0f, 0x10, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x11, 0x02, 0x03, 0x12, 0x04,
-    0xc2, 0x01, 0x02, 0x1b, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x11, 0x02, 0x03, 0x06, 0x12, 0x04, 0xc2,
-    0x01, 0x02, 0x11, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x11, 0x02, 0x03, 0x01, 0x12, 0x04, 0xc2, 0x01,
-    0x12, 0x16, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x11, 0x02, 0x03, 0x03, 0x12, 0x04, 0xc2, 0x01, 0x19,
-    0x1a, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x12, 0x12, 0x06, 0xc5, 0x01, 0x00, 0xc8, 0x01, 0x01, 0x0a,
-    0x0b, 0x0a, 0x03, 0x04, 0x12, 0x01, 0x12, 0x04, 0xc5, 0x01, 0x08, 0x17, 0x0a, 0x0c, 0x0a, 0x04,
-    0x04, 0x12, 0x02, 0x00, 0x12, 0x04, 0xc6, 0x01, 0x02, 0x11, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x12,
-    0x02, 0x00, 0x05, 0x12, 0x04, 0xc6, 0x01, 0x02, 0x08, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x12, 0x02,
-    0x00, 0x01, 0x12, 0x04, 0xc6, 0x01, 0x09, 0x0c, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x12, 0x02, 0x00,
-    0x03, 0x12, 0x04, 0xc6, 0x01, 0x0f, 0x10, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x12, 0x02, 0x01, 0x12,
-    0x04, 0xc7, 0x01, 0x02, 0x16, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x12, 0x02, 0x01, 0x05, 0x12, 0x04,
-    0xc7, 0x01, 0x02, 0x08, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x12, 0x02, 0x01, 0x01, 0x12, 0x04, 0xc7,
-    0x01, 0x09, 0x11, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x12, 0x02, 0x01, 0x03, 0x12, 0x04, 0xc7, 0x01,
-    0x14, 0x15, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x13, 0x12, 0x06, 0xca, 0x01, 0x00, 0xce, 0x01, 0x01,
-    0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x13, 0x01, 0x12, 0x04, 0xca, 0x01, 0x08, 0x13, 0x0a, 0x0c, 0x0a,
-    0x04, 0x04, 0x13, 0x02, 0x00, 0x12, 0x04, 0xcb, 0x01, 0x02, 0x15, 0x0a, 0x0d, 0x0a, 0x05, 0x04,
-    0x13, 0x02, 0x00, 0x05, 0x12, 0x04, 0xcb, 0x01, 0x02, 0x08, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x13,
-    0x02, 0x00, 0x01, 0x12, 0x04, 0xcb, 0x01, 0x09, 0x10, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x13, 0x02,
-    0x00, 0x03, 0x12, 0x04, 0xcb, 0x01, 0x13, 0x14, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x13, 0x02, 0x01,
-    0x12, 0x04, 0xcc, 0x01, 0x02, 0x1b, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x13, 0x02, 0x01, 0x05, 0x12,
-    0x04, 0xcc, 0x01, 0x02, 0x07, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x13, 0x02, 0x01, 0x01, 0x12, 0x04,
-    0xcc, 0x01, 0x08, 0x16, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x13, 0x02, 0x01, 0x03, 0x12, 0x04, 0xcc,
-    0x01, 0x19, 0x1a, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x13, 0x02, 0x02, 0x12, 0x04, 0xcd, 0x01, 0x02,
-    0x1e, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x13, 0x02, 0x02, 0x06, 0x12, 0x04, 0xcd, 0x01, 0x02, 0x14,
-    0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x13, 0x02, 0x02, 0x01, 0x12, 0x04, 0xcd, 0x01, 0x15, 0x19, 0x0a,
-    0x0d, 0x0a, 0x05, 0x04, 0x13, 0x02, 0x02, 0x03, 0x12, 0x04, 0xcd, 0x01, 0x1c, 0x1d, 0x0a, 0x0c,
-    0x0a, 0x02, 0x04, 0x14, 0x12, 0x06, 0xd0, 0x01, 0x00, 0xd6, 0x01, 0x01, 0x0a, 0x0b, 0x0a, 0x03,
-    0x04, 0x14, 0x01, 0x12, 0x04, 0xd0, 0x01, 0x08, 0x15, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x14, 0x02,
-    0x00, 0x12, 0x04, 0xd1, 0x01, 0x02, 0x15, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x14, 0x02, 0x00, 0x05,
-    0x12, 0x04, 0xd1, 0x01, 0x02, 0x08, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x14, 0x02, 0x00, 0x01, 0x12,
-    0x04, 0xd1, 0x01, 0x09, 0x10, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x14, 0x02, 0x00, 0x03, 0x12, 0x04,
-    0xd1, 0x01, 0x13, 0x14, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x14, 0x02, 0x01, 0x12, 0x04, 0xd2, 0x01,
-    0x02, 0x1b, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x14, 0x02, 0x01, 0x05, 0x12, 0x04, 0xd2, 0x01, 0x02,
-    0x07, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x14, 0x02, 0x01, 0x01, 0x12, 0x04, 0xd2, 0x01, 0x08, 0x16,
-    0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x14, 0x02, 0x01, 0x03, 0x12, 0x04, 0xd2, 0x01, 0x19, 0x1a, 0x0a,
-    0x0c, 0x0a, 0x04, 0x04, 0x14, 0x02, 0x02, 0x12, 0x04, 0xd3, 0x01, 0x02, 0x19, 0x0a, 0x0d, 0x0a,
-    0x05, 0x04, 0x14, 0x02, 0x02, 0x06, 0x12, 0x04, 0xd3, 0x01, 0x02, 0x0f, 0x0a, 0x0d, 0x0a, 0x05,
-    0x04, 0x14, 0x02, 0x02, 0x01, 0x12, 0x04, 0xd3, 0x01, 0x10, 0x14, 0x0a, 0x0d, 0x0a, 0x05, 0x04,
-    0x14, 0x02, 0x02, 0x03, 0x12, 0x04, 0xd3, 0x01, 0x17, 0x18, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x14,
-    0x02, 0x03, 0x12, 0x04, 0xd4, 0x01, 0x02, 0x16, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x14, 0x02, 0x03,
-    0x05, 0x12, 0x04, 0xd4, 0x01, 0x02, 0x08, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x14, 0x02, 0x03, 0x01,
-    0x12, 0x04, 0xd4, 0x01, 0x09, 0x11, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x14, 0x02, 0x03, 0x03, 0x12,
-    0x04, 0xd4, 0x01, 0x14, 0x15, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x14, 0x02, 0x04, 0x12, 0x04, 0xd5,
-    0x01, 0x02, 0x12, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x14, 0x02, 0x04, 0x05, 0x12, 0x04, 0xd5, 0x01,
-    0x02, 0x08, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x14, 0x02, 0x04, 0x01, 0x12, 0x04, 0xd5, 0x01, 0x09,
-    0x0d, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x14, 0x02, 0x04, 0x03, 0x12, 0x04, 0xd5, 0x01, 0x10, 0x11,
-    0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x15, 0x12, 0x06, 0xd8, 0x01, 0x00, 0xdd, 0x01, 0x01, 0x0a, 0x0b,
-    0x0a, 0x03, 0x04, 0x15, 0x01, 0x12, 0x04, 0xd8, 0x01, 0x08, 0x16, 0x0a, 0x0c, 0x0a, 0x04, 0x04,
-    0x15, 0x02, 0x00, 0x12, 0x04, 0xd9, 0x01, 0x02, 0x11, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x15, 0x02,
-    0x00, 0x05, 0x12, 0x04, 0xd9, 0x01, 0x02, 0x08, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x15, 0x02, 0x00,
-    0x01, 0x12, 0x04, 0xd9, 0x01, 0x09, 0x0c, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x15, 0x02, 0x00, 0x03,
-    0x12, 0x04, 0xd9, 0x01, 0x0f, 0x10, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x15, 0x02, 0x01, 0x12, 0x04,
-    0xda, 0x01, 0x02, 0x16, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x15, 0x02, 0x01, 0x05, 0x12, 0x04, 0xda,
-    0x01, 0x02, 0x08, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x15, 0x02, 0x01, 0x01, 0x12, 0x04, 0xda, 0x01,
-    0x09, 0x11, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x15, 0x02, 0x01, 0x03, 0x12, 0x04, 0xda, 0x01, 0x14,
-    0x15, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x15, 0x02, 0x02, 0x12, 0x04, 0xdb, 0x01, 0x02, 0x13, 0x0a,
-    0x0d, 0x0a, 0x05, 0x04, 0x15, 0x02, 0x02, 0x05, 0x12, 0x04, 0xdb, 0x01, 0x02, 0x08, 0x0a, 0x0d,
-    0x0a, 0x05, 0x04, 0x15, 0x02, 0x02, 0x01, 0x12, 0x04, 0xdb, 0x01, 0x09, 0x0e, 0x0a, 0x0d, 0x0a,
-    0x05, 0x04, 0x15, 0x02, 0x02, 0x03, 0x12, 0x04, 0xdb, 0x01, 0x11, 0x12, 0x0a, 0x0c, 0x0a, 0x04,
-    0x04, 0x15, 0x02, 0x03, 0x12, 0x04, 0xdc, 0x01, 0x02, 0x18, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x15,
-    0x02, 0x03, 0x05, 0x12, 0x04, 0xdc, 0x01, 0x02, 0x08, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x15, 0x02,
-    0x03, 0x01, 0x12, 0x04, 0xdc, 0x01, 0x09, 0x13, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x15, 0x02, 0x03,
-    0x03, 0x12, 0x04, 0xdc, 0x01, 0x16, 0x17, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x16, 0x12, 0x06, 0xdf,
-    0x01, 0x00, 0xe4, 0x01, 0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x16, 0x01, 0x12, 0x04, 0xdf, 0x01,
-    0x08, 0x16, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x16, 0x02, 0x00, 0x12, 0x04, 0xe0, 0x01, 0x02, 0x1b,
-    0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x16, 0x02, 0x00, 0x05, 0x12, 0x04, 0xe0, 0x01, 0x02, 0x07, 0x0a,
-    0x0d, 0x0a, 0x05, 0x04, 0x16, 0x02, 0x00, 0x01, 0x12, 0x04, 0xe0, 0x01, 0x08, 0x16, 0x0a, 0x0d,
-    0x0a, 0x05, 0x04, 0x16, 0x02, 0x00, 0x03, 0x12, 0x04, 0xe0, 0x01, 0x19, 0x1a, 0x0a, 0x0c, 0x0a,
-    0x04, 0x04, 0x16, 0x02, 0x01, 0x12, 0x04, 0xe1, 0x01, 0x02, 0x14, 0x0a, 0x0d, 0x0a, 0x05, 0x04,
-    0x16, 0x02, 0x01, 0x05, 0x12, 0x04, 0xe1, 0x01, 0x02, 0x08, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x16,
-    0x02, 0x01, 0x01, 0x12, 0x04, 0xe1, 0x01, 0x09, 0x0f, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x16, 0x02,
-    0x01, 0x03, 0x12, 0x04, 0xe1, 0x01, 0x12, 0x13, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x16, 0x02, 0x02,
-    0x12, 0x04, 0xe2, 0x01, 0x02, 0x11, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x16, 0x02, 0x02, 0x05, 0x12,
-    0x04, 0xe2, 0x01, 0x02, 0x08, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x16, 0x02, 0x02, 0x01, 0x12, 0x04,
-    0xe2, 0x01, 0x09, 0x0c, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x16, 0x02, 0x02, 0x03, 0x12, 0x04, 0xe2,
-    0x01, 0x0f, 0x10, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x16, 0x02, 0x03, 0x12, 0x04, 0xe3, 0x01, 0x02,
-    0x1a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x16, 0x02, 0x03, 0x06, 0x12, 0x04, 0xe3, 0x01, 0x02, 0x10,
-    0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x16, 0x02, 0x03, 0x01, 0x12, 0x04, 0xe3, 0x01, 0x11, 0x15, 0x0a,
-    0x0d, 0x0a, 0x05, 0x04, 0x16, 0x02, 0x03, 0x03, 0x12, 0x04, 0xe3, 0x01, 0x18, 0x19, 0x0a, 0x0c,
-    0x0a, 0x02, 0x04, 0x17, 0x12, 0x06, 0xe6, 0x01, 0x00, 0xf9, 0x01, 0x01, 0x0a, 0x0b, 0x0a, 0x03,
-    0x04, 0x17, 0x01, 0x12, 0x04, 0xe6, 0x01, 0x08, 0x1a, 0x0a, 0x0e, 0x0a, 0x04, 0x04, 0x17, 0x04,
-    0x00, 0x12, 0x06, 0xe7, 0x01, 0x02, 0xee, 0x01, 0x03, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x17, 0x04,
-    0x00, 0x01, 0x12, 0x04, 0xe7, 0x01, 0x07, 0x0b, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x17, 0x04, 0x00,
-    0x02, 0x00, 0x12, 0x04, 0xe8, 0x01, 0x04, 0x19, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x17, 0x04, 0x00,
-    0x02, 0x00, 0x01, 0x12, 0x04, 0xe8, 0x01, 0x04, 0x14, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x17, 0x04,
-    0x00, 0x02, 0x00, 0x02, 0x12, 0x04, 0xe8, 0x01, 0x17, 0x18, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x17,
-    0x04, 0x00, 0x02, 0x01, 0x12, 0x04, 0xe9, 0x01, 0x04, 0x24, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x17,
-    0x04, 0x00, 0x02, 0x01, 0x01, 0x12, 0x04, 0xe9, 0x01, 0x04, 0x1f, 0x0a, 0x0f, 0x0a, 0x07, 0x04,
-    0x17, 0x04, 0x00, 0x02, 0x01, 0x02, 0x12, 0x04, 0xe9, 0x01, 0x22, 0x23, 0x0a, 0x0e, 0x0a, 0x06,
-    0x04, 0x17, 0x04, 0x00, 0x02, 0x02, 0x12, 0x04, 0xea, 0x01, 0x04, 0x1c, 0x0a, 0x0f, 0x0a, 0x07,
-    0x04, 0x17, 0x04, 0x00, 0x02, 0x02, 0x01, 0x12, 0x04, 0xea, 0x01, 0x04, 0x17, 0x0a, 0x0f, 0x0a,
-    0x07, 0x04, 0x17, 0x04, 0x00, 0x02, 0x02, 0x02, 0x12, 0x04, 0xea, 0x01, 0x1a, 0x1b, 0x0a, 0x0e,
-    0x0a, 0x06, 0x04, 0x17, 0x04, 0x00, 0x02, 0x03, 0x12, 0x04, 0xeb, 0x01, 0x04, 0x1f, 0x0a, 0x0f,
-    0x0a, 0x07, 0x04, 0x17, 0x04, 0x00, 0x02, 0x03, 0x01, 0x12, 0x04, 0xeb, 0x01, 0x04, 0x1a, 0x0a,
-    0x0f, 0x0a, 0x07, 0x04, 0x17, 0x04, 0x00, 0x02, 0x03, 0x02, 0x12, 0x04, 0xeb, 0x01, 0x1d, 0x1e,
-    0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x17, 0x04, 0x00, 0x02, 0x04, 0x12, 0x04, 0xec, 0x01, 0x04, 0x1e,
-    0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x17, 0x04, 0x00, 0x02, 0x04, 0x01, 0x12, 0x04, 0xec, 0x01, 0x04,
-    0x19, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x17, 0x04, 0x00, 0x02, 0x04, 0x02, 0x12, 0x04, 0xec, 0x01,
-    0x1c, 0x1d, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x17, 0x04, 0x00, 0x04, 0x12, 0x04, 0xed, 0x01, 0x04,
-    0x0f, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x17, 0x04, 0x00, 0x04, 0x00, 0x12, 0x04, 0xed, 0x01, 0x0d,
-    0x0e, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x17, 0x04, 0x00, 0x04, 0x00, 0x01, 0x12, 0x04, 0xed, 0x01,
-    0x0d, 0x0e, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x17, 0x04, 0x00, 0x04, 0x00, 0x02, 0x12, 0x04, 0xed,
-    0x01, 0x0d, 0x0e, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x17, 0x02, 0x00, 0x12, 0x04, 0xf0, 0x01, 0x02,
-    0x10, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x17, 0x02, 0x00, 0x06, 0x12, 0x04, 0xf0, 0x01, 0x02, 0x06,
-    0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x17, 0x02, 0x00, 0x01, 0x12, 0x04, 0xf0, 0x01, 0x07, 0x0b, 0x0a,
-    0x0d, 0x0a, 0x05, 0x04, 0x17, 0x02, 0x00, 0x03, 0x12, 0x04, 0xf0, 0x01, 0x0e, 0x0f, 0x0a, 0x0e,
-    0x0a, 0x04, 0x04, 0x17, 0x08, 0x00, 0x12, 0x06, 0xf2, 0x01, 0x02, 0xf7, 0x01, 0x03, 0x0a, 0x0d,
-    0x0a, 0x05, 0x04, 0x17, 0x08, 0x00, 0x01, 0x12, 0x04, 0xf2, 0x01, 0x08, 0x0f, 0x0a, 0x0c, 0x0a,
-    0x04, 0x04, 0x17, 0x02, 0x01, 0x12, 0x04, 0xf3, 0x01, 0x04, 0x34, 0x0a, 0x0d, 0x0a, 0x05, 0x04,
-    0x17, 0x02, 0x01, 0x06, 0x12, 0x04, 0xf3, 0x01, 0x04, 0x18, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x17,
-    0x02, 0x01, 0x01, 0x12, 0x04, 0xf3, 0x01, 0x19, 0x2f, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x17, 0x02,
-    0x01, 0x03, 0x12, 0x04, 0xf3, 0x01, 0x32, 0x33, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x17, 0x02, 0x02,
-    0x12, 0x04, 0xf4, 0x01, 0x04, 0x25, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x17, 0x02, 0x02, 0x06, 0x12,
-    0x04, 0xf4, 0x01, 0x04, 0x11, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x17, 0x02, 0x02, 0x01, 0x12, 0x04,
-    0xf4, 0x01, 0x12, 0x20, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x17, 0x02, 0x02, 0x03, 0x12, 0x04, 0xf4,
-    0x01, 0x23, 0x24, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x17, 0x02, 0x03, 0x12, 0x04, 0xf5, 0x01, 0x04,
-    0x2a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x17, 0x02, 0x03, 0x06, 0x12, 0x04, 0xf5, 0x01, 0x04, 0x13,
-    0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x17, 0x02, 0x03, 0x01, 0x12, 0x04, 0xf5, 0x01, 0x14, 0x25, 0x0a,
-    0x0d, 0x0a, 0x05, 0x04, 0x17, 0x02, 0x03, 0x03, 0x12, 0x04, 0xf5, 0x01, 0x28, 0x29, 0x0a, 0x0c,
-    0x0a, 0x04, 0x04, 0x17, 0x02, 0x04, 0x12, 0x04, 0xf6, 0x01, 0x04, 0x29, 0x0a, 0x0d, 0x0a, 0x05,
-    0x04, 0x17, 0x02, 0x04, 0x06, 0x12, 0x04, 0xf6, 0x01, 0x04, 0x13, 0x0a, 0x0d, 0x0a, 0x05, 0x04,
-    0x17, 0x02, 0x04, 0x01, 0x12, 0x04, 0xf6, 0x01, 0x14, 0x24, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x17,
-    0x02, 0x04, 0x03, 0x12, 0x04, 0xf6, 0x01, 0x27, 0x28, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x17, 0x09,
-    0x12, 0x04, 0xf8, 0x01, 0x02, 0x0d, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x17, 0x09, 0x00, 0x12, 0x04,
-    0xf8, 0x01, 0x0b, 0x0c, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x17, 0x09, 0x00, 0x01, 0x12, 0x04, 0xf8,
-    0x01, 0x0b, 0x0c, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x17, 0x09, 0x00, 0x02, 0x12, 0x04, 0xf8, 0x01,
-    0x0b, 0x0c, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x18, 0x12, 0x06, 0xfb, 0x01, 0x00, 0x80, 0x02, 0x01,
-    0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x18, 0x01, 0x12, 0x04, 0xfb, 0x01, 0x08, 0x1c, 0x0a, 0x0c, 0x0a,
-    0x04, 0x04, 0x18, 0x02, 0x00, 0x12, 0x04, 0xfc, 0x01, 0x02, 0x1f, 0x0a, 0x0d, 0x0a, 0x05, 0x04,
-    0x18, 0x02, 0x00, 0x06, 0x12, 0x04, 0xfc, 0x01, 0x02, 0x11, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x18,
-    0x02, 0x00, 0x01, 0x12, 0x04, 0xfc, 0x01, 0x12, 0x1a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x18, 0x02,
-    0x00, 0x03, 0x12, 0x04, 0xfc, 0x01, 0x1d, 0x1e, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x18, 0x02, 0x01,
-    0x12, 0x04, 0xfd, 0x01, 0x02, 0x27, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x18, 0x02, 0x01, 0x04, 0x12,
-    0x04, 0xfd, 0x01, 0x02, 0x0a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x18, 0x02, 0x01, 0x06, 0x12, 0x04,
-    0xfd, 0x01, 0x0b, 0x13, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x18, 0x02, 0x01, 0x01, 0x12, 0x04, 0xfd,
-    0x01, 0x14, 0x22, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x18, 0x02, 0x01, 0x03, 0x12, 0x04, 0xfd, 0x01,
-    0x25, 0x26, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x18, 0x02, 0x02, 0x12, 0x04, 0xfe, 0x01, 0x02, 0x20,
-    0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x18, 0x02, 0x02, 0x04, 0x12, 0x04, 0xfe, 0x01, 0x02, 0x0a, 0x0a,
-    0x0d, 0x0a, 0x05, 0x04, 0x18, 0x02, 0x02, 0x05, 0x12, 0x04, 0xfe, 0x01, 0x0b, 0x11, 0x0a, 0x0d,
-    0x0a, 0x05, 0x04, 0x18, 0x02, 0x02, 0x01, 0x12, 0x04, 0xfe, 0x01, 0x12, 0x1b, 0x0a, 0x0d, 0x0a,
-    0x05, 0x04, 0x18, 0x02, 0x02, 0x03, 0x12, 0x04, 0xfe, 0x01, 0x1e, 0x1f, 0x0a, 0x0c, 0x0a, 0x04,
-    0x04, 0x18, 0x02, 0x03, 0x12, 0x04, 0xff, 0x01, 0x02, 0x23, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x18,
-    0x02, 0x03, 0x05, 0x12, 0x04, 0xff, 0x01, 0x02, 0x08, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x18, 0x02,
-    0x03, 0x01, 0x12, 0x04, 0xff, 0x01, 0x09, 0x1e, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x18, 0x02, 0x03,
-    0x03, 0x12, 0x04, 0xff, 0x01, 0x21, 0x22, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x19, 0x12, 0x06, 0x82,
-    0x02, 0x00, 0x85, 0x02, 0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x19, 0x01, 0x12, 0x04, 0x82, 0x02,
-    0x08, 0x1a, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x19, 0x02, 0x00, 0x12, 0x04, 0x83, 0x02, 0x02, 0x15,
-    0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x19, 0x02, 0x00, 0x05, 0x12, 0x04, 0x83, 0x02, 0x02, 0x07, 0x0a,
-    0x0d, 0x0a, 0x05, 0x04, 0x19, 0x02, 0x00, 0x01, 0x12, 0x04, 0x83, 0x02, 0x08, 0x10, 0x0a, 0x0d,
-    0x0a, 0x05, 0x04, 0x19, 0x02, 0x00, 0x03, 0x12, 0x04, 0x83, 0x02, 0x13, 0x14, 0x0a, 0x0c, 0x0a,
-    0x04, 0x04, 0x19, 0x02, 0x01, 0x12, 0x04, 0x84, 0x02, 0x02, 0x17, 0x0a, 0x0d, 0x0a, 0x05, 0x04,
-    0x19, 0x02, 0x01, 0x06, 0x12, 0x04, 0x84, 0x02, 0x02, 0x0e, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x19,
-    0x02, 0x01, 0x01, 0x12, 0x04, 0x84, 0x02, 0x0f, 0x12, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x19, 0x02,
-    0x01, 0x03, 0x12, 0x04, 0x84, 0x02, 0x15, 0x16, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x1a, 0x12, 0x06,
-    0x87, 0x02, 0x00, 0x8b, 0x02, 0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x1a, 0x01, 0x12, 0x04, 0x87,
-    0x02, 0x08, 0x15, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x1a, 0x02, 0x00, 0x12, 0x04, 0x88, 0x02, 0x02,
-    0x1e, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1a, 0x02, 0x00, 0x06, 0x12, 0x04, 0x88, 0x02, 0x02, 0x14,
-    0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1a, 0x02, 0x00, 0x01, 0x12, 0x04, 0x88, 0x02, 0x15, 0x19, 0x0a,
-    0x0d, 0x0a, 0x05, 0x04, 0x1a, 0x02, 0x00, 0x03, 0x12, 0x04, 0x88, 0x02, 0x1c, 0x1d, 0x0a, 0x0c,
-    0x0a, 0x04, 0x04, 0x1a, 0x02, 0x01, 0x12, 0x04, 0x89, 0x02, 0x02, 0x27, 0x0a, 0x0d, 0x0a, 0x05,
-    0x04, 0x1a, 0x02, 0x01, 0x04, 0x12, 0x04, 0x89, 0x02, 0x02, 0x0a, 0x0a, 0x0d, 0x0a, 0x05, 0x04,
-    0x1a, 0x02, 0x01, 0x06, 0x12, 0x04, 0x89, 0x02, 0x0b, 0x13, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1a,
-    0x02, 0x01, 0x01, 0x12, 0x04, 0x89, 0x02, 0x14, 0x22, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1a, 0x02,
-    0x01, 0x03, 0x12, 0x04, 0x89, 0x02, 0x25, 0x26, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x1a, 0x02, 0x02,
-    0x12, 0x04, 0x8a, 0x02, 0x02, 0x20, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1a, 0x02, 0x02, 0x04, 0x12,
-    0x04, 0x8a, 0x02, 0x02, 0x0a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1a, 0x02, 0x02, 0x05, 0x12, 0x04,
-    0x8a, 0x02, 0x0b, 0x11, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1a, 0x02, 0x02, 0x01, 0x12, 0x04, 0x8a,
-    0x02, 0x12, 0x1b, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1a, 0x02, 0x02, 0x03, 0x12, 0x04, 0x8a, 0x02,
-    0x1e, 0x1f, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x1b, 0x12, 0x06, 0x8d, 0x02, 0x00, 0x90, 0x02, 0x01,
-    0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x1b, 0x01, 0x12, 0x04, 0x8d, 0x02, 0x08, 0x17, 0x0a, 0x0c, 0x0a,
-    0x04, 0x04, 0x1b, 0x02, 0x00, 0x12, 0x04, 0x8e, 0x02, 0x02, 0x1e, 0x0a, 0x0d, 0x0a, 0x05, 0x04,
-    0x1b, 0x02, 0x00, 0x05, 0x12, 0x04, 0x8e, 0x02, 0x02, 0x08, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1b,
-    0x02, 0x00, 0x01, 0x12, 0x04, 0x8e, 0x02, 0x09, 0x19, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1b, 0x02,
-    0x00, 0x03, 0x12, 0x04, 0x8e, 0x02, 0x1c, 0x1d, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x1b, 0x02, 0x01,
-    0x12, 0x04, 0x8f, 0x02, 0x02, 0x3e, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1b, 0x02, 0x01, 0x04, 0x12,
-    0x04, 0x8f, 0x02, 0x02, 0x0a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1b, 0x02, 0x01, 0x06, 0x12, 0x04,
-    0x8f, 0x02, 0x0b, 0x25, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1b, 0x02, 0x01, 0x01, 0x12, 0x04, 0x8f,
-    0x02, 0x26, 0x39, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1b, 0x02, 0x01, 0x03, 0x12, 0x04, 0x8f, 0x02,
-    0x3c, 0x3d, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x1c, 0x12, 0x06, 0x92, 0x02, 0x00, 0x9d, 0x02, 0x01,
-    0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x1c, 0x01, 0x12, 0x04, 0x92, 0x02, 0x08, 0x22, 0x0a, 0x0e, 0x0a,
-    0x04, 0x04, 0x1c, 0x04, 0x00, 0x12, 0x06, 0x93, 0x02, 0x02, 0x96, 0x02, 0x03, 0x0a, 0x0d, 0x0a,
-    0x05, 0x04, 0x1c, 0x04, 0x00, 0x01, 0x12, 0x04, 0x93, 0x02, 0x07, 0x0b, 0x0a, 0x0e, 0x0a, 0x06,
-    0x04, 0x1c, 0x04, 0x00, 0x02, 0x00, 0x12, 0x04, 0x94, 0x02, 0x04, 0x19, 0x0a, 0x0f, 0x0a, 0x07,
-    0x04, 0x1c, 0x04, 0x00, 0x02, 0x00, 0x01, 0x12, 0x04, 0x94, 0x02, 0x04, 0x14, 0x0a, 0x0f, 0x0a,
-    0x07, 0x04, 0x1c, 0x04, 0x00, 0x02, 0x00, 0x02, 0x12, 0x04, 0x94, 0x02, 0x17, 0x18, 0x0a, 0x0e,
-    0x0a, 0x06, 0x04, 0x1c, 0x04, 0x00, 0x02, 0x01, 0x12, 0x04, 0x95, 0x02, 0x04, 0x24, 0x0a, 0x0f,
-    0x0a, 0x07, 0x04, 0x1c, 0x04, 0x00, 0x02, 0x01, 0x01, 0x12, 0x04, 0x95, 0x02, 0x04, 0x1f, 0x0a,
-    0x0f, 0x0a, 0x07, 0x04, 0x1c, 0x04, 0x00, 0x02, 0x01, 0x02, 0x12, 0x04, 0x95, 0x02, 0x22, 0x23,
-    0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x1c, 0x02, 0x00, 0x12, 0x04, 0x98, 0x02, 0x02, 0x10, 0x0a, 0x0d,
-    0x0a, 0x05, 0x04, 0x1c, 0x02, 0x00, 0x06, 0x12, 0x04, 0x98, 0x02, 0x02, 0x06, 0x0a, 0x0d, 0x0a,
-    0x05, 0x04, 0x1c, 0x02, 0x00, 0x01, 0x12, 0x04, 0x98, 0x02, 0x07, 0x0b, 0x0a, 0x0d, 0x0a, 0x05,
-    0x04, 0x1c, 0x02, 0x00, 0x03, 0x12, 0x04, 0x98, 0x02, 0x0e, 0x0f, 0x0a, 0x0e, 0x0a, 0x04, 0x04,
-    0x1c, 0x08, 0x00, 0x12, 0x06, 0x9a, 0x02, 0x02, 0x9c, 0x02, 0x03, 0x0a, 0x0d, 0x0a, 0x05, 0x04,
-    0x1c, 0x08, 0x00, 0x01, 0x12, 0x04, 0x9a, 0x02, 0x08, 0x0f, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x1c,
-    0x02, 0x01, 0x12, 0x04, 0x9b, 0x02, 0x04, 0x34, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1c, 0x02, 0x01,
-    0x06, 0x12, 0x04, 0x9b, 0x02, 0x04, 0x18, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1c, 0x02, 0x01, 0x01,
-    0x12, 0x04, 0x9b, 0x02, 0x19, 0x2f, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1c, 0x02, 0x01, 0x03, 0x12,
-    0x04, 0x9b, 0x02, 0x32, 0x33, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x1d, 0x12, 0x06, 0x9f, 0x02, 0x00,
-    0xa2, 0x02, 0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x1d, 0x01, 0x12, 0x04, 0x9f, 0x02, 0x08, 0x1a,
-    0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x1d, 0x02, 0x00, 0x12, 0x04, 0xa0, 0x02, 0x02, 0x15, 0x0a, 0x0d,
-    0x0a, 0x05, 0x04, 0x1d, 0x02, 0x00, 0x05, 0x12, 0x04, 0xa0, 0x02, 0x02, 0x07, 0x0a, 0x0d, 0x0a,
-    0x05, 0x04, 0x1d, 0x02, 0x00, 0x01, 0x12, 0x04, 0xa0, 0x02, 0x08, 0x10, 0x0a, 0x0d, 0x0a, 0x05,
-    0x04, 0x1d, 0x02, 0x00, 0x03, 0x12, 0x04, 0xa0, 0x02, 0x13, 0x14, 0x0a, 0x0c, 0x0a, 0x04, 0x04,
-    0x1d, 0x02, 0x01, 0x12, 0x04, 0xa1, 0x02, 0x02, 0x15, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1d, 0x02,
-    0x01, 0x06, 0x12, 0x04, 0xa1, 0x02, 0x02, 0x0c, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1d, 0x02, 0x01,
-    0x01, 0x12, 0x04, 0xa1, 0x02, 0x0d, 0x10, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1d, 0x02, 0x01, 0x03,
-    0x12, 0x04, 0xa1, 0x02, 0x13, 0x14, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x1e, 0x12, 0x06, 0xa4, 0x02,
-    0x00, 0xaa, 0x02, 0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x1e, 0x01, 0x12, 0x04, 0xa4, 0x02, 0x08,
-    0x12, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x1e, 0x02, 0x00, 0x12, 0x04, 0xa5, 0x02, 0x02, 0x15, 0x0a,
-    0x0d, 0x0a, 0x05, 0x04, 0x1e, 0x02, 0x00, 0x05, 0x12, 0x04, 0xa5, 0x02, 0x02, 0x08, 0x0a, 0x0d,
-    0x0a, 0x05, 0x04, 0x1e, 0x02, 0x00, 0x01, 0x12, 0x04, 0xa5, 0x02, 0x09, 0x10, 0x0a, 0x0d, 0x0a,
-    0x05, 0x04, 0x1e, 0x02, 0x00, 0x03, 0x12, 0x04, 0xa5, 0x02, 0x13, 0x14, 0x0a, 0x0c, 0x0a, 0x04,
-    0x04, 0x1e, 0x02, 0x01, 0x12, 0x04, 0xa6, 0x02, 0x02, 0x12, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1e,
-    0x02, 0x01, 0x05, 0x12, 0x04, 0xa6, 0x02, 0x02, 0x08, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1e, 0x02,
-    0x01, 0x01, 0x12, 0x04, 0xa6, 0x02, 0x09, 0x0d, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1e, 0x02, 0x01,
-    0x03, 0x12, 0x04, 0xa6, 0x02, 0x10, 0x11, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x1e, 0x02, 0x02, 0x12,
-    0x04, 0xa7, 0x02, 0x02, 0x24, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1e, 0x02, 0x02, 0x04, 0x12, 0x04,
-    0xa7, 0x02, 0x02, 0x0a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1e, 0x02, 0x02, 0x06, 0x12, 0x04, 0xa7,
-    0x02, 0x0b, 0x17, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1e, 0x02, 0x02, 0x01, 0x12, 0x04, 0xa7, 0x02,
-    0x18, 0x1f, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1e, 0x02, 0x02, 0x03, 0x12, 0x04, 0xa7, 0x02, 0x22,
-    0x23, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x1e, 0x02, 0x03, 0x12, 0x04, 0xa8, 0x02, 0x02, 0x2e, 0x0a,
-    0x0d, 0x0a, 0x05, 0x04, 0x1e, 0x02, 0x03, 0x04, 0x12, 0x04, 0xa8, 0x02, 0x02, 0x0a, 0x0a, 0x0d,
-    0x0a, 0x05, 0x04, 0x1e, 0x02, 0x03, 0x06, 0x12, 0x04, 0xa8, 0x02, 0x0b, 0x17, 0x0a, 0x0d, 0x0a,
-    0x05, 0x04, 0x1e, 0x02, 0x03, 0x01, 0x12, 0x04, 0xa8, 0x02, 0x18, 0x29, 0x0a, 0x0d, 0x0a, 0x05,
-    0x04, 0x1e, 0x02, 0x03, 0x03, 0x12, 0x04, 0xa8, 0x02, 0x2c, 0x2d, 0x0a, 0x0c, 0x0a, 0x04, 0x04,
-    0x1e, 0x02, 0x04, 0x12, 0x04, 0xa9, 0x02, 0x02, 0x22, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1e, 0x02,
-    0x04, 0x04, 0x12, 0x04, 0xa9, 0x02, 0x02, 0x0a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1e, 0x02, 0x04,
-    0x06, 0x12, 0x04, 0xa9, 0x02, 0x0b, 0x15, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1e, 0x02, 0x04, 0x01,
-    0x12, 0x04, 0xa9, 0x02, 0x16, 0x1d, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1e, 0x02, 0x04, 0x03, 0x12,
-    0x04, 0xa9, 0x02, 0x20, 0x21, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x1f, 0x12, 0x06, 0xab, 0x02, 0x00,
-    0xb8, 0x02, 0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x1f, 0x01, 0x12, 0x04, 0xab, 0x02, 0x08, 0x14,
-    0x0a, 0x0e, 0x0a, 0x04, 0x04, 0x1f, 0x04, 0x00, 0x12, 0x06, 0xac, 0x02, 0x02, 0xb1, 0x02, 0x03,
-    0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1f, 0x04, 0x00, 0x01, 0x12, 0x04, 0xac, 0x02, 0x07, 0x11, 0x0a,
-    0x0e, 0x0a, 0x06, 0x04, 0x1f, 0x04, 0x00, 0x02, 0x00, 0x12, 0x04, 0xad, 0x02, 0x04, 0x1f, 0x0a,
-    0x0f, 0x0a, 0x07, 0x04, 0x1f, 0x04, 0x00, 0x02, 0x00, 0x01, 0x12, 0x04, 0xad, 0x02, 0x04, 0x1a,
-    0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x1f, 0x04, 0x00, 0x02, 0x00, 0x02, 0x12, 0x04, 0xad, 0x02, 0x1d,
-    0x1e, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x1f, 0x04, 0x00, 0x02, 0x01, 0x12, 0x04, 0xae, 0x02, 0x04,
-    0x1b, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x1f, 0x04, 0x00, 0x02, 0x01, 0x01, 0x12, 0x04, 0xae, 0x02,
-    0x04, 0x16, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x1f, 0x04, 0x00, 0x02, 0x01, 0x02, 0x12, 0x04, 0xae,
-    0x02, 0x19, 0x1a, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x1f, 0x04, 0x00, 0x02, 0x02, 0x12, 0x04, 0xaf,
-    0x02, 0x04, 0x1a, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x1f, 0x04, 0x00, 0x02, 0x02, 0x01, 0x12, 0x04,
-    0xaf, 0x02, 0x04, 0x15, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x1f, 0x04, 0x00, 0x02, 0x02, 0x02, 0x12,
-    0x04, 0xaf, 0x02, 0x18, 0x19, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x1f, 0x04, 0x00, 0x02, 0x03, 0x12,
-    0x04, 0xb0, 0x02, 0x04, 0x1a, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x1f, 0x04, 0x00, 0x02, 0x03, 0x01,
-    0x12, 0x04, 0xb0, 0x02, 0x04, 0x15, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x1f, 0x04, 0x00, 0x02, 0x03,
-    0x02, 0x12, 0x04, 0xb0, 0x02, 0x18, 0x19, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x1f, 0x02, 0x00, 0x12,
-    0x04, 0xb2, 0x02, 0x02, 0x12, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1f, 0x02, 0x00, 0x05, 0x12, 0x04,
-    0xb2, 0x02, 0x02, 0x08, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1f, 0x02, 0x00, 0x01, 0x12, 0x04, 0xb2,
-    0x02, 0x09, 0x0d, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1f, 0x02, 0x00, 0x03, 0x12, 0x04, 0xb2, 0x02,
-    0x10, 0x11, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x1f, 0x02, 0x01, 0x12, 0x04, 0xb3, 0x02, 0x02, 0x29,
-    0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1f, 0x02, 0x01, 0x06, 0x12, 0x04, 0xb3, 0x02, 0x02, 0x19, 0x0a,
-    0x0d, 0x0a, 0x05, 0x04, 0x1f, 0x02, 0x01, 0x01, 0x12, 0x04, 0xb3, 0x02, 0x1a, 0x24, 0x0a, 0x0d,
-    0x0a, 0x05, 0x04, 0x1f, 0x02, 0x01, 0x03, 0x12, 0x04, 0xb3, 0x02, 0x27, 0x28, 0x0a, 0x0c, 0x0a,
-    0x04, 0x04, 0x1f, 0x02, 0x02, 0x12, 0x04, 0xb4, 0x02, 0x02, 0x14, 0x0a, 0x0d, 0x0a, 0x05, 0x04,
-    0x1f, 0x02, 0x02, 0x05, 0x12, 0x04, 0xb4, 0x02, 0x02, 0x06, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1f,
-    0x02, 0x02, 0x01, 0x12, 0x04, 0xb4, 0x02, 0x07, 0x0f, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1f, 0x02,
-    0x02, 0x03, 0x12, 0x04, 0xb4, 0x02, 0x12, 0x13, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x1f, 0x02, 0x03,
-    0x12, 0x04, 0xb5, 0x02, 0x02, 0x40, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1f, 0x02, 0x03, 0x04, 0x12,
-    0x04, 0xb5, 0x02, 0x02, 0x0a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1f, 0x02, 0x03, 0x06, 0x12, 0x04,
-    0xb5, 0x02, 0x0b, 0x27, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1f, 0x02, 0x03, 0x01, 0x12, 0x04, 0xb5,
-    0x02, 0x28, 0x3b, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1f, 0x02, 0x03, 0x03, 0x12, 0x04, 0xb5, 0x02,
-    0x3e, 0x3f, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x1f, 0x02, 0x04, 0x12, 0x04, 0xb6, 0x02, 0x02, 0x1f,
-    0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1f, 0x02, 0x04, 0x04, 0x12, 0x04, 0xb6, 0x02, 0x02, 0x0a, 0x0a,
-    0x0d, 0x0a, 0x05, 0x04, 0x1f, 0x02, 0x04, 0x06, 0x12, 0x04, 0xb6, 0x02, 0x0b, 0x13, 0x0a, 0x0d,
-    0x0a, 0x05, 0x04, 0x1f, 0x02, 0x04, 0x01, 0x12, 0x04, 0xb6, 0x02, 0x14, 0x1a, 0x0a, 0x0d, 0x0a,
-    0x05, 0x04, 0x1f, 0x02, 0x04, 0x03, 0x12, 0x04, 0xb6, 0x02, 0x1d, 0x1e, 0x0a, 0x0c, 0x0a, 0x04,
-    0x04, 0x1f, 0x02, 0x05, 0x12, 0x04, 0xb7, 0x02, 0x02, 0x1f, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1f,
-    0x02, 0x05, 0x04, 0x12, 0x04, 0xb7, 0x02, 0x02, 0x0a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1f, 0x02,
-    0x05, 0x06, 0x12, 0x04, 0xb7, 0x02, 0x0b, 0x13, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1f, 0x02, 0x05,
-    0x01, 0x12, 0x04, 0xb7, 0x02, 0x14, 0x1a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1f, 0x02, 0x05, 0x03,
-    0x12, 0x04, 0xb7, 0x02, 0x1d, 0x1e, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x20, 0x12, 0x06, 0xba, 0x02,
-    0x00, 0xc0, 0x02, 0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x20, 0x01, 0x12, 0x04, 0xba, 0x02, 0x08,
-    0x12, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x20, 0x02, 0x00, 0x12, 0x04, 0xbb, 0x02, 0x02, 0x12, 0x0a,
-    0x0d, 0x0a, 0x05, 0x04, 0x20, 0x02, 0x00, 0x05, 0x12, 0x04, 0xbb, 0x02, 0x02, 0x08, 0x0a, 0x0d,
-    0x0a, 0x05, 0x04, 0x20, 0x02, 0x00, 0x01, 0x12, 0x04, 0xbb, 0x02, 0x09, 0x0d, 0x0a, 0x0d, 0x0a,
-    0x05, 0x04, 0x20, 0x02, 0x00, 0x03, 0x12, 0x04, 0xbb, 0x02, 0x10, 0x11, 0x0a, 0x0c, 0x0a, 0x04,
-    0x04, 0x20, 0x02, 0x01, 0x12, 0x04, 0xbc, 0x02, 0x02, 0x15, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x20,
-    0x02, 0x01, 0x05, 0x12, 0x04, 0xbc, 0x02, 0x02, 0x06, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x20, 0x02,
-    0x01, 0x01, 0x12, 0x04, 0xbc, 0x02, 0x07, 0x10, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x20, 0x02, 0x01,
-    0x03, 0x12, 0x04, 0xbc, 0x02, 0x13, 0x14, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x20, 0x02, 0x02, 0x12,
-    0x04, 0xbd, 0x02, 0x02, 0x25, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x20, 0x02, 0x02, 0x04, 0x12, 0x04,
-    0xbd, 0x02, 0x02, 0x0a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x20, 0x02, 0x02, 0x06, 0x12, 0x04, 0xbd,
-    0x02, 0x0b, 0x16, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x20, 0x02, 0x02, 0x01, 0x12, 0x04, 0xbd, 0x02,
-    0x17, 0x20, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x20, 0x02, 0x02, 0x03, 0x12, 0x04, 0xbd, 0x02, 0x23,
-    0x24, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x20, 0x02, 0x03, 0x12, 0x04, 0xbe, 0x02, 0x02, 0x3e, 0x0a,
-    0x0d, 0x0a, 0x05, 0x04, 0x20, 0x02, 0x03, 0x04, 0x12, 0x04, 0xbe, 0x02, 0x02, 0x0a, 0x0a, 0x0d,
-    0x0a, 0x05, 0x04, 0x20, 0x02, 0x03, 0x06, 0x12, 0x04, 0xbe, 0x02, 0x0b, 0x25, 0x0a, 0x0d, 0x0a,
-    0x05, 0x04, 0x20, 0x02, 0x03, 0x01, 0x12, 0x04, 0xbe, 0x02, 0x26, 0x39, 0x0a, 0x0d, 0x0a, 0x05,
-    0x04, 0x20, 0x02, 0x03, 0x03, 0x12, 0x04, 0xbe, 0x02, 0x3c, 0x3d, 0x0a, 0x0c, 0x0a, 0x04, 0x04,
-    0x20, 0x02, 0x04, 0x12, 0x04, 0xbf, 0x02, 0x02, 0x26, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x20, 0x02,
-    0x04, 0x04, 0x12, 0x04, 0xbf, 0x02, 0x02, 0x0a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x20, 0x02, 0x04,
-    0x06, 0x12, 0x04, 0xbf, 0x02, 0x0b, 0x1a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x20, 0x02, 0x04, 0x01,
-    0x12, 0x04, 0xbf, 0x02, 0x1b, 0x21, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x20, 0x02, 0x04, 0x03, 0x12,
-    0x04, 0xbf, 0x02, 0x24, 0x25, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x21, 0x12, 0x06, 0xc2, 0x02, 0x00,
-    0xc5, 0x02, 0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x21, 0x01, 0x12, 0x04, 0xc2, 0x02, 0x08, 0x22,
-    0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x21, 0x02, 0x00, 0x12, 0x04, 0xc3, 0x02, 0x02, 0x27, 0x0a, 0x0d,
-    0x0a, 0x05, 0x04, 0x21, 0x02, 0x00, 0x04, 0x12, 0x04, 0xc3, 0x02, 0x02, 0x0a, 0x0a, 0x0d, 0x0a,
-    0x05, 0x04, 0x21, 0x02, 0x00, 0x06, 0x12, 0x04, 0xc3, 0x02, 0x0b, 0x16, 0x0a, 0x0d, 0x0a, 0x05,
-    0x04, 0x21, 0x02, 0x00, 0x01, 0x12, 0x04, 0xc3, 0x02, 0x17, 0x22, 0x0a, 0x0d, 0x0a, 0x05, 0x04,
-    0x21, 0x02, 0x00, 0x03, 0x12, 0x04, 0xc3, 0x02, 0x25, 0x26, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x21,
-    0x02, 0x01, 0x12, 0x04, 0xc4, 0x02, 0x02, 0x16, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x21, 0x02, 0x01,
-    0x05, 0x12, 0x04, 0xc4, 0x02, 0x02, 0x06, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x21, 0x02, 0x01, 0x01,
-    0x12, 0x04, 0xc4, 0x02, 0x07, 0x11, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x21, 0x02, 0x01, 0x03, 0x12,
-    0x04, 0xc4, 0x02, 0x14, 0x15, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x22, 0x12, 0x06, 0xc7, 0x02, 0x00,
-    0xca, 0x02, 0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x22, 0x01, 0x12, 0x04, 0xc7, 0x02, 0x08, 0x17,
-    0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x22, 0x02, 0x00, 0x12, 0x04, 0xc8, 0x02, 0x02, 0x12, 0x0a, 0x0d,
-    0x0a, 0x05, 0x04, 0x22, 0x02, 0x00, 0x05, 0x12, 0x04, 0xc8, 0x02, 0x02, 0x08, 0x0a, 0x0d, 0x0a,
-    0x05, 0x04, 0x22, 0x02, 0x00, 0x01, 0x12, 0x04, 0xc8, 0x02, 0x09, 0x0d, 0x0a, 0x0d, 0x0a, 0x05,
-    0x04, 0x22, 0x02, 0x00, 0x03, 0x12, 0x04, 0xc8, 0x02, 0x10, 0x11, 0x0a, 0x0c, 0x0a, 0x04, 0x04,
-    0x22, 0x02, 0x01, 0x12, 0x04, 0xc9, 0x02, 0x02, 0x14, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x22, 0x02,
-    0x01, 0x06, 0x12, 0x04, 0xc9, 0x02, 0x02, 0x0a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x22, 0x02, 0x01,
-    0x01, 0x12, 0x04, 0xc9, 0x02, 0x0b, 0x0f, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x22, 0x02, 0x01, 0x03,
-    0x12, 0x04, 0xc9, 0x02, 0x12, 0x13, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x23, 0x12, 0x06, 0xcc, 0x02,
-    0x00, 0xce, 0x02, 0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x23, 0x01, 0x12, 0x04, 0xcc, 0x02, 0x08,
-    0x24, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x23, 0x02, 0x00, 0x12, 0x04, 0xcd, 0x02, 0x02, 0x27, 0x0a,
-    0x0d, 0x0a, 0x05, 0x04, 0x23, 0x02, 0x00, 0x04, 0x12, 0x04, 0xcd, 0x02, 0x02, 0x0a, 0x0a, 0x0d,
-    0x0a, 0x05, 0x04, 0x23, 0x02, 0x00, 0x06, 0x12, 0x04, 0xcd, 0x02, 0x0b, 0x16, 0x0a, 0x0d, 0x0a,
-    0x05, 0x04, 0x23, 0x02, 0x00, 0x01, 0x12, 0x04, 0xcd, 0x02, 0x17, 0x22, 0x0a, 0x0d, 0x0a, 0x05,
-    0x04, 0x23, 0x02, 0x00, 0x03, 0x12, 0x04, 0xcd, 0x02, 0x25, 0x26, 0x0a, 0x0c, 0x0a, 0x02, 0x05,
-    0x00, 0x12, 0x06, 0xd0, 0x02, 0x00, 0xe0, 0x02, 0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x05, 0x00, 0x01,
-    0x12, 0x04, 0xd0, 0x02, 0x05, 0x0e, 0x0a, 0x0c, 0x0a, 0x04, 0x05, 0x00, 0x02, 0x00, 0x12, 0x04,
-    0xd1, 0x02, 0x02, 0x1d, 0x0a, 0x0d, 0x0a, 0x05, 0x05, 0x00, 0x02, 0x00, 0x01, 0x12, 0x04, 0xd1,
-    0x02, 0x02, 0x18, 0x0a, 0x0d, 0x0a, 0x05, 0x05, 0x00, 0x02, 0x00, 0x02, 0x12, 0x04, 0xd1, 0x02,
-    0x1b, 0x1c, 0x0a, 0x0c, 0x0a, 0x04, 0x05, 0x00, 0x02, 0x01, 0x12, 0x04, 0xd2, 0x02, 0x02, 0x16,
-    0x0a, 0x0d, 0x0a, 0x05, 0x05, 0x00, 0x02, 0x01, 0x01, 0x12, 0x04, 0xd2, 0x02, 0x02, 0x11, 0x0a,
-    0x0d, 0x0a, 0x05, 0x05, 0x00, 0x02, 0x01, 0x02, 0x12, 0x04, 0xd2, 0x02, 0x14, 0x15, 0x0a, 0x0c,
-    0x0a, 0x04, 0x05, 0x00, 0x02, 0x02, 0x12, 0x04, 0xd3, 0x02, 0x02, 0x14, 0x0a, 0x0d, 0x0a, 0x05,
-    0x05, 0x00, 0x02, 0x02, 0x01, 0x12, 0x04, 0xd3, 0x02, 0x02, 0x0f, 0x0a, 0x0d, 0x0a, 0x05, 0x05,
-    0x00, 0x02, 0x02, 0x02, 0x12, 0x04, 0xd3, 0x02, 0x12, 0x13, 0x0a, 0x0c, 0x0a, 0x04, 0x05, 0x00,
-    0x02, 0x03, 0x12, 0x04, 0xd4, 0x02, 0x02, 0x16, 0x0a, 0x0d, 0x0a, 0x05, 0x05, 0x00, 0x02, 0x03,
-    0x01, 0x12, 0x04, 0xd4, 0x02, 0x02, 0x10, 0x0a, 0x0d, 0x0a, 0x05, 0x05, 0x00, 0x02, 0x03, 0x02,
-    0x12, 0x04, 0xd4, 0x02, 0x13, 0x15, 0x0a, 0x0c, 0x0a, 0x04, 0x05, 0x00, 0x02, 0x04, 0x12, 0x04,
-    0xd5, 0x02, 0x02, 0x16, 0x0a, 0x0d, 0x0a, 0x05, 0x05, 0x00, 0x02, 0x04, 0x01, 0x12, 0x04, 0xd5,
-    0x02, 0x02, 0x10, 0x0a, 0x0d, 0x0a, 0x05, 0x05, 0x00, 0x02, 0x04, 0x02, 0x12, 0x04, 0xd5, 0x02,
-    0x13, 0x15, 0x0a, 0x0c, 0x0a, 0x04, 0x05, 0x00, 0x02, 0x05, 0x12, 0x04, 0xd6, 0x02, 0x02, 0x15,
-    0x0a, 0x0d, 0x0a, 0x05, 0x05, 0x00, 0x02, 0x05, 0x01, 0x12, 0x04, 0xd6, 0x02, 0x02, 0x10, 0x0a,
-    0x0d, 0x0a, 0x05, 0x05, 0x00, 0x02, 0x05, 0x02, 0x12, 0x04, 0xd6, 0x02, 0x13, 0x14, 0x0a, 0x0c,
-    0x0a, 0x04, 0x05, 0x00, 0x02, 0x06, 0x12, 0x04, 0xd7, 0x02, 0x02, 0x16, 0x0a, 0x0d, 0x0a, 0x05,
-    0x05, 0x00, 0x02, 0x06, 0x01, 0x12, 0x04, 0xd7, 0x02, 0x02, 0x11, 0x0a, 0x0d, 0x0a, 0x05, 0x05,
-    0x00, 0x02, 0x06, 0x02, 0x12, 0x04, 0xd7, 0x02, 0x14, 0x15, 0x0a, 0x0c, 0x0a, 0x04, 0x05, 0x00,
-    0x02, 0x07, 0x12, 0x04, 0xd8, 0x02, 0x02, 0x17, 0x0a, 0x0d, 0x0a, 0x05, 0x05, 0x00, 0x02, 0x07,
-    0x01, 0x12, 0x04, 0xd8, 0x02, 0x02, 0x11, 0x0a, 0x0d, 0x0a, 0x05, 0x05, 0x00, 0x02, 0x07, 0x02,
-    0x12, 0x04, 0xd8, 0x02, 0x14, 0x16, 0x0a, 0x0c, 0x0a, 0x04, 0x05, 0x00, 0x02, 0x08, 0x12, 0x04,
-    0xd9, 0x02, 0x02, 0x19, 0x0a, 0x0d, 0x0a, 0x05, 0x05, 0x00, 0x02, 0x08, 0x01, 0x12, 0x04, 0xd9,
-    0x02, 0x02, 0x14, 0x0a, 0x0d, 0x0a, 0x05, 0x05, 0x00, 0x02, 0x08, 0x02, 0x12, 0x04, 0xd9, 0x02,
-    0x17, 0x18, 0x0a, 0x0c, 0x0a, 0x04, 0x05, 0x00, 0x02, 0x09, 0x12, 0x04, 0xda, 0x02, 0x02, 0x18,
-    0x0a, 0x0d, 0x0a, 0x05, 0x05, 0x00, 0x02, 0x09, 0x01, 0x12, 0x04, 0xda, 0x02, 0x02, 0x13, 0x0a,
-    0x0d, 0x0a, 0x05, 0x05, 0x00, 0x02, 0x09, 0x02, 0x12, 0x04, 0xda, 0x02, 0x16, 0x17, 0x0a, 0x2b,
-    0x0a, 0x04, 0x05, 0x00, 0x02, 0x0a, 0x12, 0x04, 0xdb, 0x02, 0x02, 0x18, 0x22, 0x1d, 0x20, 0x60,
-    0x7b, 0x20, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x3a, 0x20, 0x42, 0x6f, 0x78, 0x3c, 0x4d, 0x6f, 0x76,
-    0x65, 0x54, 0x79, 0x70, 0x65, 0x3e, 0x20, 0x7d, 0x60, 0x2c, 0x0a, 0x0a, 0x0d, 0x0a, 0x05, 0x05,
-    0x00, 0x02, 0x0a, 0x01, 0x12, 0x04, 0xdb, 0x02, 0x02, 0x13, 0x0a, 0x0d, 0x0a, 0x05, 0x05, 0x00,
-    0x02, 0x0a, 0x02, 0x12, 0x04, 0xdb, 0x02, 0x16, 0x17, 0x0a, 0x22, 0x0a, 0x04, 0x05, 0x00, 0x02,
-    0x0b, 0x12, 0x04, 0xdc, 0x02, 0x02, 0x18, 0x22, 0x14, 0x20, 0x60, 0x28, 0x4d, 0x6f, 0x76, 0x65,
-    0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x54, 0x61, 0x67, 0x29, 0x60, 0x2c, 0x0a, 0x0a, 0x0d, 0x0a,
-    0x05, 0x05, 0x00, 0x02, 0x0b, 0x01, 0x12, 0x04, 0xdc, 0x02, 0x02, 0x13, 0x0a, 0x0d, 0x0a, 0x05,
-    0x05, 0x00, 0x02, 0x0b, 0x02, 0x12, 0x04, 0xdc, 0x02, 0x16, 0x17, 0x0a, 0x22, 0x0a, 0x04, 0x05,
-    0x00, 0x02, 0x0c, 0x12, 0x04, 0xdd, 0x02, 0x02, 0x24, 0x22, 0x14, 0x20, 0x60, 0x7b, 0x20, 0x69,
-    0x6e, 0x64, 0x65, 0x78, 0x3a, 0x20, 0x75, 0x31, 0x36, 0x20, 0x7d, 0x60, 0x60, 0x2c, 0x0a, 0x0a,
-    0x0d, 0x0a, 0x05, 0x05, 0x00, 0x02, 0x0c, 0x01, 0x12, 0x04, 0xdd, 0x02, 0x02, 0x1f, 0x0a, 0x0d,
-    0x0a, 0x05, 0x05, 0x00, 0x02, 0x0c, 0x02, 0x12, 0x04, 0xdd, 0x02, 0x22, 0x23, 0x0a, 0x37, 0x0a,
-    0x04, 0x05, 0x00, 0x02, 0x0d, 0x12, 0x04, 0xde, 0x02, 0x02, 0x1c, 0x22, 0x29, 0x20, 0x60, 0x7b,
-    0x20, 0x6d, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3a, 0x20, 0x62, 0x6f, 0x6f, 0x6c, 0x2c, 0x20,
-    0x74, 0x6f, 0x3a, 0x20, 0x42, 0x6f, 0x78, 0x3c, 0x4d, 0x6f, 0x76, 0x65, 0x54, 0x79, 0x70, 0x65,
-    0x3e, 0x20, 0x7d, 0x60, 0x2c, 0x0a, 0x0a, 0x0d, 0x0a, 0x05, 0x05, 0x00, 0x02, 0x0d, 0x01, 0x12,
-    0x04, 0xde, 0x02, 0x02, 0x16, 0x0a, 0x0d, 0x0a, 0x05, 0x05, 0x00, 0x02, 0x0d, 0x02, 0x12, 0x04,
-    0xde, 0x02, 0x19, 0x1b, 0x0a, 0x1b, 0x0a, 0x04, 0x05, 0x00, 0x02, 0x0e, 0x12, 0x04, 0xdf, 0x02,
-    0x02, 0x1d, 0x22, 0x0d, 0x20, 0x60, 0x28, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x29, 0x60, 0x2c,
-    0x0a, 0x0a, 0x0d, 0x0a, 0x05, 0x05, 0x00, 0x02, 0x0e, 0x01, 0x12, 0x04, 0xdf, 0x02, 0x02, 0x17,
-    0x0a, 0x0d, 0x0a, 0x05, 0x05, 0x00, 0x02, 0x0e, 0x02, 0x12, 0x04, 0xdf, 0x02, 0x1a, 0x1c, 0x0a,
-    0x0c, 0x0a, 0x02, 0x04, 0x24, 0x12, 0x06, 0xe2, 0x02, 0x00, 0xf1, 0x02, 0x01, 0x0a, 0x0b, 0x0a,
-    0x03, 0x04, 0x24, 0x01, 0x12, 0x04, 0xe2, 0x02, 0x08, 0x10, 0x0a, 0x0e, 0x0a, 0x04, 0x04, 0x24,
-    0x03, 0x00, 0x12, 0x06, 0xe4, 0x02, 0x02, 0xe7, 0x02, 0x03, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x24,
-    0x03, 0x00, 0x01, 0x12, 0x04, 0xe4, 0x02, 0x0a, 0x17, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x24, 0x03,
-    0x00, 0x02, 0x00, 0x12, 0x04, 0xe5, 0x02, 0x04, 0x15, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x24, 0x03,
-    0x00, 0x02, 0x00, 0x05, 0x12, 0x04, 0xe5, 0x02, 0x04, 0x08, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x24,
-    0x03, 0x00, 0x02, 0x00, 0x01, 0x12, 0x04, 0xe5, 0x02, 0x09, 0x10, 0x0a, 0x0f, 0x0a, 0x07, 0x04,
-    0x24, 0x03, 0x00, 0x02, 0x00, 0x03, 0x12, 0x04, 0xe5, 0x02, 0x13, 0x14, 0x0a, 0x0e, 0x0a, 0x06,
-    0x04, 0x24, 0x03, 0x00, 0x02, 0x01, 0x12, 0x04, 0xe6, 0x02, 0x04, 0x14, 0x0a, 0x0f, 0x0a, 0x07,
-    0x04, 0x24, 0x03, 0x00, 0x02, 0x01, 0x06, 0x12, 0x04, 0xe6, 0x02, 0x04, 0x0c, 0x0a, 0x0f, 0x0a,
-    0x07, 0x04, 0x24, 0x03, 0x00, 0x02, 0x01, 0x01, 0x12, 0x04, 0xe6, 0x02, 0x0d, 0x0f, 0x0a, 0x0f,
-    0x0a, 0x07, 0x04, 0x24, 0x03, 0x00, 0x02, 0x01, 0x03, 0x12, 0x04, 0xe6, 0x02, 0x12, 0x13, 0x0a,
-    0x0c, 0x0a, 0x04, 0x04, 0x24, 0x02, 0x00, 0x12, 0x04, 0xe9, 0x02, 0x02, 0x15, 0x0a, 0x0d, 0x0a,
-    0x05, 0x04, 0x24, 0x02, 0x00, 0x06, 0x12, 0x04, 0xe9, 0x02, 0x02, 0x0b, 0x0a, 0x0d, 0x0a, 0x05,
-    0x04, 0x24, 0x02, 0x00, 0x01, 0x12, 0x04, 0xe9, 0x02, 0x0c, 0x10, 0x0a, 0x0d, 0x0a, 0x05, 0x04,
-    0x24, 0x02, 0x00, 0x03, 0x12, 0x04, 0xe9, 0x02, 0x13, 0x14, 0x0a, 0x0e, 0x0a, 0x04, 0x04, 0x24,
-    0x08, 0x00, 0x12, 0x06, 0xea, 0x02, 0x02, 0xf0, 0x02, 0x03, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x24,
-    0x08, 0x00, 0x01, 0x12, 0x04, 0xea, 0x02, 0x08, 0x0f, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x24, 0x02,
-    0x01, 0x12, 0x04, 0xeb, 0x02, 0x04, 0x18, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x24, 0x02, 0x01, 0x06,
-    0x12, 0x04, 0xeb, 0x02, 0x04, 0x0c, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x24, 0x02, 0x01, 0x01, 0x12,
-    0x04, 0xeb, 0x02, 0x0d, 0x13, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x24, 0x02, 0x01, 0x03, 0x12, 0x04,
-    0xeb, 0x02, 0x16, 0x17, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x24, 0x02, 0x02, 0x12, 0x04, 0xec, 0x02,
-    0x04, 0x1d, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x24, 0x02, 0x02, 0x06, 0x12, 0x04, 0xec, 0x02, 0x04,
-    0x11, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x24, 0x02, 0x02, 0x01, 0x12, 0x04, 0xec, 0x02, 0x12, 0x18,
-    0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x24, 0x02, 0x02, 0x03, 0x12, 0x04, 0xec, 0x02, 0x1b, 0x1c, 0x0a,
-    0x0c, 0x0a, 0x04, 0x04, 0x24, 0x02, 0x03, 0x12, 0x04, 0xed, 0x02, 0x04, 0x28, 0x0a, 0x0d, 0x0a,
-    0x05, 0x04, 0x24, 0x02, 0x03, 0x05, 0x12, 0x04, 0xed, 0x02, 0x04, 0x0a, 0x0a, 0x0d, 0x0a, 0x05,
-    0x04, 0x24, 0x02, 0x03, 0x01, 0x12, 0x04, 0xed, 0x02, 0x0b, 0x23, 0x0a, 0x0d, 0x0a, 0x05, 0x04,
-    0x24, 0x02, 0x03, 0x03, 0x12, 0x04, 0xed, 0x02, 0x26, 0x27, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x24,
-    0x02, 0x04, 0x12, 0x04, 0xee, 0x02, 0x04, 0x20, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x24, 0x02, 0x04,
-    0x06, 0x12, 0x04, 0xee, 0x02, 0x04, 0x11, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x24, 0x02, 0x04, 0x01,
-    0x12, 0x04, 0xee, 0x02, 0x12, 0x1b, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x24, 0x02, 0x04, 0x03, 0x12,
-    0x04, 0xee, 0x02, 0x1e, 0x1f, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x24, 0x02, 0x05, 0x12, 0x04, 0xef,
-    0x02, 0x04, 0x1a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x24, 0x02, 0x05, 0x05, 0x12, 0x04, 0xef, 0x02,
-    0x04, 0x0a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x24, 0x02, 0x05, 0x01, 0x12, 0x04, 0xef, 0x02, 0x0b,
-    0x15, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x24, 0x02, 0x05, 0x03, 0x12, 0x04, 0xef, 0x02, 0x18, 0x19,
-    0x0a, 0x0c, 0x0a, 0x02, 0x05, 0x01, 0x12, 0x06, 0xf3, 0x02, 0x00, 0xf9, 0x02, 0x01, 0x0a, 0x0b,
-    0x0a, 0x03, 0x05, 0x01, 0x01, 0x12, 0x04, 0xf3, 0x02, 0x05, 0x10, 0x0a, 0x0c, 0x0a, 0x04, 0x05,
-    0x01, 0x02, 0x00, 0x12, 0x04, 0xf4, 0x02, 0x02, 0x1f, 0x0a, 0x0d, 0x0a, 0x05, 0x05, 0x01, 0x02,
-    0x00, 0x01, 0x12, 0x04, 0xf4, 0x02, 0x02, 0x1a, 0x0a, 0x0d, 0x0a, 0x05, 0x05, 0x01, 0x02, 0x00,
-    0x02, 0x12, 0x04, 0xf4, 0x02, 0x1d, 0x1e, 0x0a, 0x0c, 0x0a, 0x04, 0x05, 0x01, 0x02, 0x01, 0x12,
-    0x04, 0xf5, 0x02, 0x02, 0x18, 0x0a, 0x0d, 0x0a, 0x05, 0x05, 0x01, 0x02, 0x01, 0x01, 0x12, 0x04,
-    0xf5, 0x02, 0x02, 0x13, 0x0a, 0x0d, 0x0a, 0x05, 0x05, 0x01, 0x02, 0x01, 0x02, 0x12, 0x04, 0xf5,
-    0x02, 0x16, 0x17, 0x0a, 0x0c, 0x0a, 0x04, 0x05, 0x01, 0x02, 0x02, 0x12, 0x04, 0xf6, 0x02, 0x02,
-    0x18, 0x0a, 0x0d, 0x0a, 0x05, 0x05, 0x01, 0x02, 0x02, 0x01, 0x12, 0x04, 0xf6, 0x02, 0x02, 0x13,
-    0x0a, 0x0d, 0x0a, 0x05, 0x05, 0x01, 0x02, 0x02, 0x02, 0x12, 0x04, 0xf6, 0x02, 0x16, 0x17, 0x0a,
-    0x0c, 0x0a, 0x04, 0x05, 0x01, 0x02, 0x03, 0x12, 0x04, 0xf7, 0x02, 0x02, 0x19, 0x0a, 0x0d, 0x0a,
-    0x05, 0x05, 0x01, 0x02, 0x03, 0x01, 0x12, 0x04, 0xf7, 0x02, 0x02, 0x14, 0x0a, 0x0d, 0x0a, 0x05,
-    0x05, 0x01, 0x02, 0x03, 0x02, 0x12, 0x04, 0xf7, 0x02, 0x17, 0x18, 0x0a, 0x0c, 0x0a, 0x04, 0x05,
-    0x01, 0x02, 0x04, 0x12, 0x04, 0xf8, 0x02, 0x02, 0x17, 0x0a, 0x0d, 0x0a, 0x05, 0x05, 0x01, 0x02,
-    0x04, 0x01, 0x12, 0x04, 0xf8, 0x02, 0x02, 0x12, 0x0a, 0x0d, 0x0a, 0x05, 0x05, 0x01, 0x02, 0x04,
-    0x02, 0x12, 0x04, 0xf8, 0x02, 0x15, 0x16, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x25, 0x12, 0x06, 0xfb,
-    0x02, 0x00, 0xfd, 0x02, 0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x25, 0x01, 0x12, 0x04, 0xfb, 0x02,
-    0x08, 0x17, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x25, 0x02, 0x00, 0x12, 0x04, 0xfc, 0x02, 0x02, 0x19,
-    0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x25, 0x02, 0x00, 0x06, 0x12, 0x04, 0xfc, 0x02, 0x02, 0x0a, 0x0a,
-    0x0d, 0x0a, 0x05, 0x04, 0x25, 0x02, 0x00, 0x01, 0x12, 0x04, 0xfc, 0x02, 0x0b, 0x14, 0x0a, 0x0d,
-    0x0a, 0x05, 0x04, 0x25, 0x02, 0x00, 0x03, 0x12, 0x04, 0xfc, 0x02, 0x17, 0x18, 0x0a, 0x0c, 0x0a,
-    0x02, 0x04, 0x26, 0x12, 0x06, 0xff, 0x02, 0x00, 0x82, 0x03, 0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04,
-    0x26, 0x01, 0x12, 0x04, 0xff, 0x02, 0x08, 0x17, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x26, 0x02, 0x00,
-    0x12, 0x04, 0x80, 0x03, 0x02, 0x1a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x26, 0x02, 0x00, 0x06, 0x12,
-    0x04, 0x80, 0x03, 0x02, 0x0e, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x26, 0x02, 0x00, 0x01, 0x12, 0x04,
-    0x80, 0x03, 0x0f, 0x15, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x26, 0x02, 0x00, 0x03, 0x12, 0x04, 0x80,
-    0x03, 0x18, 0x19, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x26, 0x02, 0x01, 0x12, 0x04, 0x81, 0x03, 0x02,
-    0x12, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x26, 0x02, 0x01, 0x05, 0x12, 0x04, 0x81, 0x03, 0x02, 0x08,
-    0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x26, 0x02, 0x01, 0x01, 0x12, 0x04, 0x81, 0x03, 0x09, 0x0d, 0x0a,
-    0x0d, 0x0a, 0x05, 0x04, 0x26, 0x02, 0x01, 0x03, 0x12, 0x04, 0x81, 0x03, 0x10, 0x11, 0x0a, 0x0c,
-    0x0a, 0x02, 0x04, 0x27, 0x12, 0x06, 0x84, 0x03, 0x00, 0x87, 0x03, 0x01, 0x0a, 0x0b, 0x0a, 0x03,
-    0x04, 0x27, 0x01, 0x12, 0x04, 0x84, 0x03, 0x08, 0x14, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x27, 0x02,
-    0x00, 0x12, 0x04, 0x85, 0x03, 0x02, 0x15, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x27, 0x02, 0x00, 0x05,
-    0x12, 0x04, 0x85, 0x03, 0x02, 0x08, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x27, 0x02, 0x00, 0x01, 0x12,
-    0x04, 0x85, 0x03, 0x09, 0x10, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x27, 0x02, 0x00, 0x03, 0x12, 0x04,
-    0x85, 0x03, 0x13, 0x14, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x27, 0x02, 0x01, 0x12, 0x04, 0x86, 0x03,
-    0x02, 0x12, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x27, 0x02, 0x01, 0x05, 0x12, 0x04, 0x86, 0x03, 0x02,
-    0x08, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x27, 0x02, 0x01, 0x01, 0x12, 0x04, 0x86, 0x03, 0x09, 0x0d,
-    0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x27, 0x02, 0x01, 0x03, 0x12, 0x04, 0x86, 0x03, 0x10, 0x11, 0x0a,
-    0x0c, 0x0a, 0x02, 0x04, 0x28, 0x12, 0x06, 0x89, 0x03, 0x00, 0x8e, 0x03, 0x01, 0x0a, 0x0b, 0x0a,
-    0x03, 0x04, 0x28, 0x01, 0x12, 0x04, 0x89, 0x03, 0x08, 0x15, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x28,
-    0x02, 0x00, 0x12, 0x04, 0x8a, 0x03, 0x02, 0x15, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x28, 0x02, 0x00,
-    0x05, 0x12, 0x04, 0x8a, 0x03, 0x02, 0x08, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x28, 0x02, 0x00, 0x01,
-    0x12, 0x04, 0x8a, 0x03, 0x09, 0x10, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x28, 0x02, 0x00, 0x03, 0x12,
-    0x04, 0x8a, 0x03, 0x13, 0x14, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x28, 0x02, 0x01, 0x12, 0x04, 0x8b,
-    0x03, 0x02, 0x14, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x28, 0x02, 0x01, 0x05, 0x12, 0x04, 0x8b, 0x03,
-    0x02, 0x08, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x28, 0x02, 0x01, 0x01, 0x12, 0x04, 0x8b, 0x03, 0x09,
-    0x0f, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x28, 0x02, 0x01, 0x03, 0x12, 0x04, 0x8b, 0x03, 0x12, 0x13,
-    0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x28, 0x02, 0x02, 0x12, 0x04, 0x8c, 0x03, 0x02, 0x12, 0x0a, 0x0d,
-    0x0a, 0x05, 0x04, 0x28, 0x02, 0x02, 0x05, 0x12, 0x04, 0x8c, 0x03, 0x02, 0x08, 0x0a, 0x0d, 0x0a,
-    0x05, 0x04, 0x28, 0x02, 0x02, 0x01, 0x12, 0x04, 0x8c, 0x03, 0x09, 0x0d, 0x0a, 0x0d, 0x0a, 0x05,
-    0x04, 0x28, 0x02, 0x02, 0x03, 0x12, 0x04, 0x8c, 0x03, 0x10, 0x11, 0x0a, 0x0c, 0x0a, 0x04, 0x04,
-    0x28, 0x02, 0x03, 0x12, 0x04, 0x8d, 0x03, 0x02, 0x2c, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x28, 0x02,
-    0x03, 0x04, 0x12, 0x04, 0x8d, 0x03, 0x02, 0x0a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x28, 0x02, 0x03,
-    0x06, 0x12, 0x04, 0x8d, 0x03, 0x0b, 0x13, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x28, 0x02, 0x03, 0x01,
-    0x12, 0x04, 0x8d, 0x03, 0x14, 0x27, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x28, 0x02, 0x03, 0x03, 0x12,
-    0x04, 0x8d, 0x03, 0x2a, 0x2b, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x29, 0x12, 0x06, 0x90, 0x03, 0x00,
-    0xa5, 0x03, 0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x29, 0x01, 0x12, 0x04, 0x90, 0x03, 0x08, 0x11,
-    0x0a, 0x0e, 0x0a, 0x04, 0x04, 0x29, 0x04, 0x00, 0x12, 0x06, 0x92, 0x03, 0x02, 0x9a, 0x03, 0x03,
-    0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x29, 0x04, 0x00, 0x01, 0x12, 0x04, 0x92, 0x03, 0x07, 0x0b, 0x0a,
-    0x0e, 0x0a, 0x06, 0x04, 0x29, 0x04, 0x00, 0x02, 0x00, 0x12, 0x04, 0x93, 0x03, 0x04, 0x19, 0x0a,
-    0x0f, 0x0a, 0x07, 0x04, 0x29, 0x04, 0x00, 0x02, 0x00, 0x01, 0x12, 0x04, 0x93, 0x03, 0x04, 0x14,
-    0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x29, 0x04, 0x00, 0x02, 0x00, 0x02, 0x12, 0x04, 0x93, 0x03, 0x17,
-    0x18, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x29, 0x04, 0x00, 0x02, 0x01, 0x12, 0x04, 0x94, 0x03, 0x04,
-    0x15, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x29, 0x04, 0x00, 0x02, 0x01, 0x01, 0x12, 0x04, 0x94, 0x03,
-    0x04, 0x10, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x29, 0x04, 0x00, 0x02, 0x01, 0x02, 0x12, 0x04, 0x94,
-    0x03, 0x13, 0x14, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x29, 0x04, 0x00, 0x02, 0x02, 0x12, 0x04, 0x95,
-    0x03, 0x04, 0x1b, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x29, 0x04, 0x00, 0x02, 0x02, 0x01, 0x12, 0x04,
-    0x95, 0x03, 0x04, 0x16, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x29, 0x04, 0x00, 0x02, 0x02, 0x02, 0x12,
-    0x04, 0x95, 0x03, 0x19, 0x1a, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x29, 0x04, 0x00, 0x02, 0x03, 0x12,
-    0x04, 0x96, 0x03, 0x04, 0x19, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x29, 0x04, 0x00, 0x02, 0x03, 0x01,
-    0x12, 0x04, 0x96, 0x03, 0x04, 0x14, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x29, 0x04, 0x00, 0x02, 0x03,
-    0x02, 0x12, 0x04, 0x96, 0x03, 0x17, 0x18, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x29, 0x04, 0x00, 0x02,
-    0x04, 0x12, 0x04, 0x97, 0x03, 0x04, 0x17, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x29, 0x04, 0x00, 0x02,
-    0x04, 0x01, 0x12, 0x04, 0x97, 0x03, 0x04, 0x12, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x29, 0x04, 0x00,
-    0x02, 0x04, 0x02, 0x12, 0x04, 0x97, 0x03, 0x15, 0x16, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x29, 0x04,
-    0x00, 0x02, 0x05, 0x12, 0x04, 0x98, 0x03, 0x04, 0x1b, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x29, 0x04,
-    0x00, 0x02, 0x05, 0x01, 0x12, 0x04, 0x98, 0x03, 0x04, 0x16, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x29,
-    0x04, 0x00, 0x02, 0x05, 0x02, 0x12, 0x04, 0x98, 0x03, 0x19, 0x1a, 0x0a, 0x0d, 0x0a, 0x05, 0x04,
-    0x29, 0x04, 0x00, 0x04, 0x12, 0x04, 0x99, 0x03, 0x04, 0x0f, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x29,
-    0x04, 0x00, 0x04, 0x00, 0x12, 0x04, 0x99, 0x03, 0x0d, 0x0e, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x29,
-    0x04, 0x00, 0x04, 0x00, 0x01, 0x12, 0x04, 0x99, 0x03, 0x0d, 0x0e, 0x0a, 0x0f, 0x0a, 0x07, 0x04,
-    0x29, 0x04, 0x00, 0x04, 0x00, 0x02, 0x12, 0x04, 0x99, 0x03, 0x0d, 0x0e, 0x0a, 0x0c, 0x0a, 0x04,
-    0x04, 0x29, 0x02, 0x00, 0x12, 0x04, 0x9c, 0x03, 0x02, 0x10, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x29,
-    0x02, 0x00, 0x06, 0x12, 0x04, 0x9c, 0x03, 0x02, 0x06, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x29, 0x02,
-    0x00, 0x01, 0x12, 0x04, 0x9c, 0x03, 0x07, 0x0b, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x29, 0x02, 0x00,
-    0x03, 0x12, 0x04, 0x9c, 0x03, 0x0e, 0x0f, 0x0a, 0x0e, 0x0a, 0x04, 0x04, 0x29, 0x08, 0x00, 0x12,
-    0x06, 0x9d, 0x03, 0x02, 0xa4, 0x03, 0x03, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x29, 0x08, 0x00, 0x01,
-    0x12, 0x04, 0x9d, 0x03, 0x08, 0x11, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x29, 0x02, 0x01, 0x12, 0x04,
-    0x9e, 0x03, 0x04, 0x21, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x29, 0x02, 0x01, 0x06, 0x12, 0x04, 0x9e,
-    0x03, 0x04, 0x14, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x29, 0x02, 0x01, 0x01, 0x12, 0x04, 0x9e, 0x03,
-    0x15, 0x1c, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x29, 0x02, 0x01, 0x03, 0x12, 0x04, 0x9e, 0x03, 0x1f,
-    0x20, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x29, 0x02, 0x02, 0x12, 0x04, 0x9f, 0x03, 0x04, 0x2c, 0x0a,
-    0x0d, 0x0a, 0x05, 0x04, 0x29, 0x02, 0x02, 0x06, 0x12, 0x04, 0x9f, 0x03, 0x04, 0x19, 0x0a, 0x0d,
-    0x0a, 0x05, 0x04, 0x29, 0x02, 0x02, 0x01, 0x12, 0x04, 0x9f, 0x03, 0x1a, 0x27, 0x0a, 0x0d, 0x0a,
-    0x05, 0x04, 0x29, 0x02, 0x02, 0x03, 0x12, 0x04, 0x9f, 0x03, 0x2a, 0x2b, 0x0a, 0x0c, 0x0a, 0x04,
-    0x04, 0x29, 0x02, 0x03, 0x12, 0x04, 0xa0, 0x03, 0x04, 0x28, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x29,
-    0x02, 0x03, 0x06, 0x12, 0x04, 0xa0, 0x03, 0x04, 0x17, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x29, 0x02,
-    0x03, 0x01, 0x12, 0x04, 0xa0, 0x03, 0x18, 0x23, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x29, 0x02, 0x03,
-    0x03, 0x12, 0x04, 0xa0, 0x03, 0x26, 0x27, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x29, 0x02, 0x04, 0x12,
-    0x04, 0xa1, 0x03, 0x04, 0x24, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x29, 0x02, 0x04, 0x06, 0x12, 0x04,
-    0xa1, 0x03, 0x04, 0x15, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x29, 0x02, 0x04, 0x01, 0x12, 0x04, 0xa1,
-    0x03, 0x16, 0x1f, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x29, 0x02, 0x04, 0x03, 0x12, 0x04, 0xa1, 0x03,
-    0x22, 0x23, 0x0a, 0x1e, 0x0a, 0x04, 0x04, 0x29, 0x02, 0x05, 0x12, 0x04, 0xa3, 0x03, 0x04, 0x23,
-    0x1a, 0x10, 0x20, 0x36, 0x20, 0x69, 0x73, 0x20, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64,
-    0x2e, 0x0a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x29, 0x02, 0x05, 0x06, 0x12, 0x04, 0xa3, 0x03, 0x04,
-    0x10, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x29, 0x02, 0x05, 0x01, 0x12, 0x04, 0xa3, 0x03, 0x11, 0x1e,
-    0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x29, 0x02, 0x05, 0x03, 0x12, 0x04, 0xa3, 0x03, 0x21, 0x22, 0x0a,
-    0x0c, 0x0a, 0x02, 0x04, 0x2a, 0x12, 0x06, 0xa7, 0x03, 0x00, 0xaa, 0x03, 0x01, 0x0a, 0x0b, 0x0a,
-    0x03, 0x04, 0x2a, 0x01, 0x12, 0x04, 0xa7, 0x03, 0x08, 0x18, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x2a,
-    0x02, 0x00, 0x12, 0x04, 0xa8, 0x03, 0x02, 0x17, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2a, 0x02, 0x00,
-    0x05, 0x12, 0x04, 0xa8, 0x03, 0x02, 0x07, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2a, 0x02, 0x00, 0x01,
-    0x12, 0x04, 0xa8, 0x03, 0x08, 0x12, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2a, 0x02, 0x00, 0x03, 0x12,
-    0x04, 0xa8, 0x03, 0x15, 0x16, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x2a, 0x02, 0x01, 0x12, 0x04, 0xa9,
-    0x03, 0x02, 0x16, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2a, 0x02, 0x01, 0x05, 0x12, 0x04, 0xa9, 0x03,
-    0x02, 0x07, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2a, 0x02, 0x01, 0x01, 0x12, 0x04, 0xa9, 0x03, 0x08,
-    0x11, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2a, 0x02, 0x01, 0x03, 0x12, 0x04, 0xa9, 0x03, 0x14, 0x15,
-    0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x2b, 0x12, 0x06, 0xac, 0x03, 0x00, 0xb1, 0x03, 0x01, 0x0a, 0x0b,
-    0x0a, 0x03, 0x04, 0x2b, 0x01, 0x12, 0x04, 0xac, 0x03, 0x08, 0x1d, 0x0a, 0x0c, 0x0a, 0x04, 0x04,
-    0x2b, 0x02, 0x00, 0x12, 0x04, 0xad, 0x03, 0x02, 0x21, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2b, 0x02,
-    0x00, 0x04, 0x12, 0x04, 0xad, 0x03, 0x02, 0x0a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2b, 0x02, 0x00,
-    0x05, 0x12, 0x04, 0xad, 0x03, 0x0b, 0x10, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2b, 0x02, 0x00, 0x01,
-    0x12, 0x04, 0xad, 0x03, 0x11, 0x1c, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2b, 0x02, 0x00, 0x03, 0x12,
-    0x04, 0xad, 0x03, 0x1f, 0x20, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x2b, 0x02, 0x01, 0x12, 0x04, 0xae,
-    0x03, 0x02, 0x20, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2b, 0x02, 0x01, 0x04, 0x12, 0x04, 0xae, 0x03,
-    0x02, 0x0a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2b, 0x02, 0x01, 0x05, 0x12, 0x04, 0xae, 0x03, 0x0b,
-    0x10, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2b, 0x02, 0x01, 0x01, 0x12, 0x04, 0xae, 0x03, 0x11, 0x1b,
-    0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2b, 0x02, 0x01, 0x03, 0x12, 0x04, 0xae, 0x03, 0x1e, 0x1f, 0x0a,
-    0x0c, 0x0a, 0x04, 0x04, 0x2b, 0x02, 0x02, 0x12, 0x04, 0xaf, 0x03, 0x02, 0x17, 0x0a, 0x0d, 0x0a,
-    0x05, 0x04, 0x2b, 0x02, 0x02, 0x05, 0x12, 0x04, 0xaf, 0x03, 0x02, 0x08, 0x0a, 0x0d, 0x0a, 0x05,
-    0x04, 0x2b, 0x02, 0x02, 0x01, 0x12, 0x04, 0xaf, 0x03, 0x09, 0x12, 0x0a, 0x0d, 0x0a, 0x05, 0x04,
-    0x2b, 0x02, 0x02, 0x03, 0x12, 0x04, 0xaf, 0x03, 0x15, 0x16, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x2b,
-    0x02, 0x03, 0x12, 0x04, 0xb0, 0x03, 0x02, 0x29, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2b, 0x02, 0x03,
-    0x04, 0x12, 0x04, 0xb0, 0x03, 0x02, 0x0a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2b, 0x02, 0x03, 0x05,
-    0x12, 0x04, 0xb0, 0x03, 0x0b, 0x11, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2b, 0x02, 0x03, 0x01, 0x12,
-    0x04, 0xb0, 0x03, 0x12, 0x24, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2b, 0x02, 0x03, 0x03, 0x12, 0x04,
-    0xb0, 0x03, 0x27, 0x28, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x2c, 0x12, 0x06, 0xb3, 0x03, 0x00, 0xb7,
-    0x03, 0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x2c, 0x01, 0x12, 0x04, 0xb3, 0x03, 0x08, 0x1b, 0x0a,
-    0x0c, 0x0a, 0x04, 0x04, 0x2c, 0x02, 0x00, 0x12, 0x04, 0xb4, 0x03, 0x02, 0x1e, 0x0a, 0x0d, 0x0a,
-    0x05, 0x04, 0x2c, 0x02, 0x00, 0x06, 0x12, 0x04, 0xb4, 0x03, 0x02, 0x12, 0x0a, 0x0d, 0x0a, 0x05,
-    0x04, 0x2c, 0x02, 0x00, 0x01, 0x12, 0x04, 0xb4, 0x03, 0x13, 0x19, 0x0a, 0x0d, 0x0a, 0x05, 0x04,
-    0x2c, 0x02, 0x00, 0x03, 0x12, 0x04, 0xb4, 0x03, 0x1c, 0x1d, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x2c,
-    0x02, 0x01, 0x12, 0x04, 0xb5, 0x03, 0x02, 0x31, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2c, 0x02, 0x01,
-    0x04, 0x12, 0x04, 0xb5, 0x03, 0x02, 0x0a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2c, 0x02, 0x01, 0x05,
-    0x12, 0x04, 0xb5, 0x03, 0x0b, 0x11, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2c, 0x02, 0x01, 0x01, 0x12,
-    0x04, 0xb5, 0x03, 0x12, 0x2c, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2c, 0x02, 0x01, 0x03, 0x12, 0x04,
-    0xb5, 0x03, 0x2f, 0x30, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x2c, 0x02, 0x02, 0x12, 0x04, 0xb6, 0x03,
-    0x02, 0x32, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2c, 0x02, 0x02, 0x04, 0x12, 0x04, 0xb6, 0x03, 0x02,
-    0x0a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2c, 0x02, 0x02, 0x06, 0x12, 0x04, 0xb6, 0x03, 0x0b, 0x1b,
-    0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2c, 0x02, 0x02, 0x01, 0x12, 0x04, 0xb6, 0x03, 0x1c, 0x2d, 0x0a,
-    0x0d, 0x0a, 0x05, 0x04, 0x2c, 0x02, 0x02, 0x03, 0x12, 0x04, 0xb6, 0x03, 0x30, 0x31, 0x0a, 0x0c,
-    0x0a, 0x02, 0x04, 0x2d, 0x12, 0x06, 0xb9, 0x03, 0x00, 0xbf, 0x03, 0x01, 0x0a, 0x0b, 0x0a, 0x03,
-    0x04, 0x2d, 0x01, 0x12, 0x04, 0xb9, 0x03, 0x08, 0x19, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x2d, 0x02,
-    0x00, 0x12, 0x04, 0xba, 0x03, 0x02, 0x1e, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2d, 0x02, 0x00, 0x06,
-    0x12, 0x04, 0xba, 0x03, 0x02, 0x12, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2d, 0x02, 0x00, 0x01, 0x12,
-    0x04, 0xba, 0x03, 0x13, 0x19, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2d, 0x02, 0x00, 0x03, 0x12, 0x04,
-    0xba, 0x03, 0x1c, 0x1d, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x2d, 0x02, 0x01, 0x12, 0x04, 0xbb, 0x03,
-    0x02, 0x31, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2d, 0x02, 0x01, 0x04, 0x12, 0x04, 0xbb, 0x03, 0x02,
-    0x0a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2d, 0x02, 0x01, 0x05, 0x12, 0x04, 0xbb, 0x03, 0x0b, 0x11,
-    0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2d, 0x02, 0x01, 0x01, 0x12, 0x04, 0xbb, 0x03, 0x12, 0x2c, 0x0a,
-    0x0d, 0x0a, 0x05, 0x04, 0x2d, 0x02, 0x01, 0x03, 0x12, 0x04, 0xbb, 0x03, 0x2f, 0x30, 0x0a, 0x0c,
-    0x0a, 0x04, 0x04, 0x2d, 0x02, 0x02, 0x12, 0x04, 0xbc, 0x03, 0x02, 0x32, 0x0a, 0x0d, 0x0a, 0x05,
-    0x04, 0x2d, 0x02, 0x02, 0x04, 0x12, 0x04, 0xbc, 0x03, 0x02, 0x0a, 0x0a, 0x0d, 0x0a, 0x05, 0x04,
-    0x2d, 0x02, 0x02, 0x06, 0x12, 0x04, 0xbc, 0x03, 0x0b, 0x1b, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2d,
-    0x02, 0x02, 0x01, 0x12, 0x04, 0xbc, 0x03, 0x1c, 0x2d, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2d, 0x02,
-    0x02, 0x03, 0x12, 0x04, 0xbc, 0x03, 0x30, 0x31, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x2d, 0x02, 0x03,
-    0x12, 0x04, 0xbd, 0x03, 0x02, 0x1f, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2d, 0x02, 0x03, 0x05, 0x12,
-    0x04, 0xbd, 0x03, 0x02, 0x08, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2d, 0x02, 0x03, 0x01, 0x12, 0x04,
-    0xbd, 0x03, 0x09, 0x1a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2d, 0x02, 0x03, 0x03, 0x12, 0x04, 0xbd,
-    0x03, 0x1d, 0x1e, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x2d, 0x02, 0x04, 0x12, 0x04, 0xbe, 0x03, 0x02,
-    0x28, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2d, 0x02, 0x04, 0x06, 0x12, 0x04, 0xbe, 0x03, 0x02, 0x12,
-    0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2d, 0x02, 0x04, 0x01, 0x12, 0x04, 0xbe, 0x03, 0x13, 0x23, 0x0a,
-    0x0d, 0x0a, 0x05, 0x04, 0x2d, 0x02, 0x04, 0x03, 0x12, 0x04, 0xbe, 0x03, 0x26, 0x27, 0x0a, 0x0c,
-    0x0a, 0x02, 0x04, 0x2e, 0x12, 0x06, 0xc1, 0x03, 0x00, 0xcc, 0x03, 0x01, 0x0a, 0x0b, 0x0a, 0x03,
-    0x04, 0x2e, 0x01, 0x12, 0x04, 0xc1, 0x03, 0x08, 0x14, 0x0a, 0x0e, 0x0a, 0x04, 0x04, 0x2e, 0x04,
-    0x00, 0x12, 0x06, 0xc2, 0x03, 0x02, 0xc8, 0x03, 0x03, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2e, 0x04,
-    0x00, 0x01, 0x12, 0x04, 0xc2, 0x03, 0x07, 0x0b, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x2e, 0x04, 0x00,
-    0x02, 0x00, 0x12, 0x04, 0xc3, 0x03, 0x04, 0x19, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x2e, 0x04, 0x00,
-    0x02, 0x00, 0x01, 0x12, 0x04, 0xc3, 0x03, 0x04, 0x14, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x2e, 0x04,
-    0x00, 0x02, 0x00, 0x02, 0x12, 0x04, 0xc3, 0x03, 0x17, 0x18, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x2e,
-    0x04, 0x00, 0x02, 0x01, 0x12, 0x04, 0xc4, 0x03, 0x04, 0x15, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x2e,
-    0x04, 0x00, 0x02, 0x01, 0x01, 0x12, 0x04, 0xc4, 0x03, 0x04, 0x10, 0x0a, 0x0f, 0x0a, 0x07, 0x04,
-    0x2e, 0x04, 0x00, 0x02, 0x01, 0x02, 0x12, 0x04, 0xc4, 0x03, 0x13, 0x14, 0x0a, 0x0e, 0x0a, 0x06,
-    0x04, 0x2e, 0x04, 0x00, 0x02, 0x02, 0x12, 0x04, 0xc5, 0x03, 0x04, 0x1d, 0x0a, 0x0f, 0x0a, 0x07,
-    0x04, 0x2e, 0x04, 0x00, 0x02, 0x02, 0x01, 0x12, 0x04, 0xc5, 0x03, 0x04, 0x18, 0x0a, 0x0f, 0x0a,
-    0x07, 0x04, 0x2e, 0x04, 0x00, 0x02, 0x02, 0x02, 0x12, 0x04, 0xc5, 0x03, 0x1b, 0x1c, 0x0a, 0x0e,
-    0x0a, 0x06, 0x04, 0x2e, 0x04, 0x00, 0x02, 0x03, 0x12, 0x04, 0xc6, 0x03, 0x04, 0x1d, 0x0a, 0x0f,
-    0x0a, 0x07, 0x04, 0x2e, 0x04, 0x00, 0x02, 0x03, 0x01, 0x12, 0x04, 0xc6, 0x03, 0x04, 0x18, 0x0a,
-    0x0f, 0x0a, 0x07, 0x04, 0x2e, 0x04, 0x00, 0x02, 0x03, 0x02, 0x12, 0x04, 0xc6, 0x03, 0x1b, 0x1c,
-    0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x2e, 0x04, 0x00, 0x02, 0x04, 0x12, 0x04, 0xc7, 0x03, 0x04, 0x15,
-    0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x2e, 0x04, 0x00, 0x02, 0x04, 0x01, 0x12, 0x04, 0xc7, 0x03, 0x04,
-    0x10, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x2e, 0x04, 0x00, 0x02, 0x04, 0x02, 0x12, 0x04, 0xc7, 0x03,
-    0x13, 0x14, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x2e, 0x02, 0x00, 0x12, 0x04, 0xca, 0x03, 0x02, 0x10,
-    0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2e, 0x02, 0x00, 0x06, 0x12, 0x04, 0xca, 0x03, 0x02, 0x06, 0x0a,
-    0x0d, 0x0a, 0x05, 0x04, 0x2e, 0x02, 0x00, 0x01, 0x12, 0x04, 0xca, 0x03, 0x07, 0x0b, 0x0a, 0x0d,
-    0x0a, 0x05, 0x04, 0x2e, 0x02, 0x00, 0x03, 0x12, 0x04, 0xca, 0x03, 0x0e, 0x0f, 0x0a, 0x0c, 0x0a,
-    0x04, 0x04, 0x2e, 0x02, 0x01, 0x12, 0x04, 0xcb, 0x03, 0x02, 0x17, 0x0a, 0x0d, 0x0a, 0x05, 0x04,
-    0x2e, 0x02, 0x01, 0x05, 0x12, 0x04, 0xcb, 0x03, 0x02, 0x07, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2e,
-    0x02, 0x01, 0x01, 0x12, 0x04, 0xcb, 0x03, 0x08, 0x12, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2e, 0x02,
-    0x01, 0x03, 0x12, 0x04, 0xcb, 0x03, 0x15, 0x16, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x2f, 0x12, 0x06,
-    0xce, 0x03, 0x00, 0xe4, 0x03, 0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x2f, 0x01, 0x12, 0x04, 0xce,
-    0x03, 0x08, 0x14, 0x0a, 0x0e, 0x0a, 0x04, 0x04, 0x2f, 0x04, 0x00, 0x12, 0x06, 0xcf, 0x03, 0x02,
-    0xd5, 0x03, 0x03, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2f, 0x04, 0x00, 0x01, 0x12, 0x04, 0xcf, 0x03,
-    0x07, 0x0b, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x2f, 0x04, 0x00, 0x02, 0x00, 0x12, 0x04, 0xd0, 0x03,
-    0x04, 0x19, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x2f, 0x04, 0x00, 0x02, 0x00, 0x01, 0x12, 0x04, 0xd0,
-    0x03, 0x04, 0x14, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x2f, 0x04, 0x00, 0x02, 0x00, 0x02, 0x12, 0x04,
-    0xd0, 0x03, 0x17, 0x18, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x2f, 0x04, 0x00, 0x02, 0x01, 0x12, 0x04,
-    0xd1, 0x03, 0x04, 0x15, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x2f, 0x04, 0x00, 0x02, 0x01, 0x01, 0x12,
-    0x04, 0xd1, 0x03, 0x04, 0x10, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x2f, 0x04, 0x00, 0x02, 0x01, 0x02,
-    0x12, 0x04, 0xd1, 0x03, 0x13, 0x14, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x2f, 0x04, 0x00, 0x02, 0x02,
-    0x12, 0x04, 0xd2, 0x03, 0x04, 0x1d, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x2f, 0x04, 0x00, 0x02, 0x02,
-    0x01, 0x12, 0x04, 0xd2, 0x03, 0x04, 0x18, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x2f, 0x04, 0x00, 0x02,
-    0x02, 0x02, 0x12, 0x04, 0xd2, 0x03, 0x1b, 0x1c, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x2f, 0x04, 0x00,
-    0x02, 0x03, 0x12, 0x04, 0xd3, 0x03, 0x04, 0x16, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x2f, 0x04, 0x00,
-    0x02, 0x03, 0x01, 0x12, 0x04, 0xd3, 0x03, 0x04, 0x11, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x2f, 0x04,
-    0x00, 0x02, 0x03, 0x02, 0x12, 0x04, 0xd3, 0x03, 0x14, 0x15, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x2f,
-    0x04, 0x00, 0x02, 0x04, 0x12, 0x04, 0xd4, 0x03, 0x04, 0x15, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x2f,
-    0x04, 0x00, 0x02, 0x04, 0x01, 0x12, 0x04, 0xd4, 0x03, 0x04, 0x10, 0x0a, 0x0f, 0x0a, 0x07, 0x04,
-    0x2f, 0x04, 0x00, 0x02, 0x04, 0x02, 0x12, 0x04, 0xd4, 0x03, 0x13, 0x14, 0x0a, 0x0c, 0x0a, 0x04,
-    0x04, 0x2f, 0x02, 0x00, 0x12, 0x04, 0xd7, 0x03, 0x02, 0x10, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2f,
-    0x02, 0x00, 0x06, 0x12, 0x04, 0xd7, 0x03, 0x02, 0x06, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2f, 0x02,
-    0x00, 0x01, 0x12, 0x04, 0xd7, 0x03, 0x07, 0x0b, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2f, 0x02, 0x00,
-    0x03, 0x12, 0x04, 0xd7, 0x03, 0x0e, 0x0f, 0x0a, 0x64, 0x0a, 0x04, 0x04, 0x2f, 0x02, 0x01, 0x12,
-    0x04, 0xdb, 0x03, 0x02, 0x2a, 0x1a, 0x56, 0x20, 0x44, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74,
-    0x65, 0x64, 0x3a, 0x20, 0x75, 0x73, 0x65, 0x20, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72,
-    0x65, 0x5f, 0x76, 0x61, 0x72, 0x69, 0x61, 0x6e, 0x74, 0x20, 0x69, 0x6e, 0x73, 0x74, 0x65, 0x61,
-    0x64, 0x2e, 0x0a, 0x20, 0x4e, 0x6f, 0x74, 0x65, 0x3a, 0x20, 0x3e, 0x3d, 0x20, 0x31, 0x2e, 0x31,
-    0x30, 0x2c, 0x20, 0x74, 0x68, 0x69, 0x73, 0x20, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x20, 0x69, 0x73,
-    0x20, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x2e, 0x0a, 0x0a, 0x0d, 0x0a,
-    0x05, 0x04, 0x2f, 0x02, 0x01, 0x05, 0x12, 0x04, 0xdb, 0x03, 0x02, 0x07, 0x0a, 0x0d, 0x0a, 0x05,
-    0x04, 0x2f, 0x02, 0x01, 0x01, 0x12, 0x04, 0xdb, 0x03, 0x08, 0x11, 0x0a, 0x0d, 0x0a, 0x05, 0x04,
-    0x2f, 0x02, 0x01, 0x03, 0x12, 0x04, 0xdb, 0x03, 0x14, 0x15, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2f,
-    0x02, 0x01, 0x08, 0x12, 0x04, 0xdb, 0x03, 0x16, 0x29, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x2f, 0x02,
-    0x01, 0x08, 0x03, 0x12, 0x04, 0xdb, 0x03, 0x17, 0x28, 0x0a, 0x23, 0x0a, 0x04, 0x04, 0x2f, 0x08,
-    0x00, 0x12, 0x06, 0xde, 0x03, 0x02, 0xe3, 0x03, 0x03, 0x1a, 0x13, 0x20, 0x53, 0x75, 0x70, 0x70,
-    0x6f, 0x72, 0x74, 0x3a, 0x20, 0x3e, 0x3d, 0x20, 0x31, 0x2e, 0x31, 0x30, 0x2e, 0x0a, 0x0a, 0x0d,
-    0x0a, 0x05, 0x04, 0x2f, 0x08, 0x00, 0x01, 0x12, 0x04, 0xde, 0x03, 0x08, 0x19, 0x0a, 0x0c, 0x0a,
-    0x04, 0x04, 0x2f, 0x02, 0x02, 0x12, 0x04, 0xdf, 0x03, 0x04, 0x18, 0x0a, 0x0d, 0x0a, 0x05, 0x04,
-    0x2f, 0x02, 0x02, 0x06, 0x12, 0x04, 0xdf, 0x03, 0x04, 0x0b, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2f,
-    0x02, 0x02, 0x01, 0x12, 0x04, 0xdf, 0x03, 0x0c, 0x13, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2f, 0x02,
-    0x02, 0x03, 0x12, 0x04, 0xdf, 0x03, 0x16, 0x17, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x2f, 0x02, 0x03,
-    0x12, 0x04, 0xe0, 0x03, 0x04, 0x27, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2f, 0x02, 0x03, 0x06, 0x12,
-    0x04, 0xe0, 0x03, 0x04, 0x12, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2f, 0x02, 0x03, 0x01, 0x12, 0x04,
-    0xe0, 0x03, 0x13, 0x22, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2f, 0x02, 0x03, 0x03, 0x12, 0x04, 0xe0,
-    0x03, 0x25, 0x26, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x2f, 0x02, 0x04, 0x12, 0x04, 0xe1, 0x03, 0x04,
-    0x1a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2f, 0x02, 0x04, 0x06, 0x12, 0x04, 0xe1, 0x03, 0x04, 0x0c,
-    0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2f, 0x02, 0x04, 0x01, 0x12, 0x04, 0xe1, 0x03, 0x0d, 0x15, 0x0a,
-    0x0d, 0x0a, 0x05, 0x04, 0x2f, 0x02, 0x04, 0x03, 0x12, 0x04, 0xe1, 0x03, 0x18, 0x19, 0x0a, 0x0c,
-    0x0a, 0x04, 0x04, 0x2f, 0x02, 0x05, 0x12, 0x04, 0xe2, 0x03, 0x04, 0x18, 0x0a, 0x0d, 0x0a, 0x05,
-    0x04, 0x2f, 0x02, 0x05, 0x06, 0x12, 0x04, 0xe2, 0x03, 0x04, 0x0b, 0x0a, 0x0d, 0x0a, 0x05, 0x04,
-    0x2f, 0x02, 0x05, 0x01, 0x12, 0x04, 0xe2, 0x03, 0x0c, 0x13, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2f,
-    0x02, 0x05, 0x03, 0x12, 0x04, 0xe2, 0x03, 0x16, 0x17, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x30, 0x12,
-    0x06, 0xe6, 0x03, 0x00, 0xe8, 0x03, 0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x30, 0x01, 0x12, 0x04,
-    0xe6, 0x03, 0x08, 0x0f, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x30, 0x02, 0x00, 0x12, 0x04, 0xe7, 0x03,
-    0x02, 0x16, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x30, 0x02, 0x00, 0x05, 0x12, 0x04, 0xe7, 0x03, 0x02,
-    0x07, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x30, 0x02, 0x00, 0x01, 0x12, 0x04, 0xe7, 0x03, 0x08, 0x11,
-    0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x30, 0x02, 0x00, 0x03, 0x12, 0x04, 0xe7, 0x03, 0x14, 0x15, 0x0a,
-    0x0c, 0x0a, 0x02, 0x04, 0x31, 0x12, 0x06, 0xea, 0x03, 0x00, 0xec, 0x03, 0x01, 0x0a, 0x0b, 0x0a,
-    0x03, 0x04, 0x31, 0x01, 0x12, 0x04, 0xea, 0x03, 0x08, 0x16, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x31,
-    0x02, 0x00, 0x12, 0x04, 0xeb, 0x03, 0x02, 0x16, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x31, 0x02, 0x00,
-    0x05, 0x12, 0x04, 0xeb, 0x03, 0x02, 0x07, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x31, 0x02, 0x00, 0x01,
-    0x12, 0x04, 0xeb, 0x03, 0x08, 0x11, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x31, 0x02, 0x00, 0x03, 0x12,
-    0x04, 0xeb, 0x03, 0x14, 0x15, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x32, 0x12, 0x06, 0xee, 0x03, 0x00,
-    0xf0, 0x03, 0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x32, 0x01, 0x12, 0x04, 0xee, 0x03, 0x08, 0x10,
-    0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x32, 0x02, 0x00, 0x12, 0x04, 0xef, 0x03, 0x02, 0x16, 0x0a, 0x0d,
-    0x0a, 0x05, 0x04, 0x32, 0x02, 0x00, 0x05, 0x12, 0x04, 0xef, 0x03, 0x02, 0x07, 0x0a, 0x0d, 0x0a,
-    0x05, 0x04, 0x32, 0x02, 0x00, 0x01, 0x12, 0x04, 0xef, 0x03, 0x08, 0x11, 0x0a, 0x0d, 0x0a, 0x05,
-    0x04, 0x32, 0x02, 0x00, 0x03, 0x12, 0x04, 0xef, 0x03, 0x14, 0x15, 0x0a, 0x0c, 0x0a, 0x02, 0x04,
-    0x33, 0x12, 0x06, 0xf2, 0x03, 0x00, 0xf4, 0x03, 0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x33, 0x01,
-    0x12, 0x04, 0xf2, 0x03, 0x08, 0x0f, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x33, 0x02, 0x00, 0x12, 0x04,
-    0xf3, 0x03, 0x02, 0x16, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x33, 0x02, 0x00, 0x05, 0x12, 0x04, 0xf3,
-    0x03, 0x02, 0x07, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x33, 0x02, 0x00, 0x01, 0x12, 0x04, 0xf3, 0x03,
-    0x08, 0x11, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x33, 0x02, 0x00, 0x03, 0x12, 0x04, 0xf3, 0x03, 0x14,
-    0x15, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x34, 0x12, 0x06, 0xf6, 0x03, 0x00, 0xf9, 0x03, 0x01, 0x0a,
-    0x0b, 0x0a, 0x03, 0x04, 0x34, 0x01, 0x12, 0x04, 0xf6, 0x03, 0x08, 0x1a, 0x0a, 0x0c, 0x0a, 0x04,
-    0x04, 0x34, 0x02, 0x00, 0x12, 0x04, 0xf7, 0x03, 0x02, 0x1e, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x34,
-    0x02, 0x00, 0x06, 0x12, 0x04, 0xf7, 0x03, 0x02, 0x0e, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x34, 0x02,
-    0x00, 0x01, 0x12, 0x04, 0xf7, 0x03, 0x0f, 0x19, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x34, 0x02, 0x00,
-    0x03, 0x12, 0x04, 0xf7, 0x03, 0x1c, 0x1d, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x34, 0x02, 0x01, 0x12,
-    0x04, 0xf8, 0x03, 0x02, 0x1d, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x34, 0x02, 0x01, 0x06, 0x12, 0x04,
-    0xf8, 0x03, 0x02, 0x0e, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x34, 0x02, 0x01, 0x01, 0x12, 0x04, 0xf8,
-    0x03, 0x0f, 0x18, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x34, 0x02, 0x01, 0x03, 0x12, 0x04, 0xf8, 0x03,
-    0x1b, 0x1c, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x35, 0x12, 0x06, 0xfb, 0x03, 0x00, 0xfe, 0x03, 0x01,
-    0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x35, 0x01, 0x12, 0x04, 0xfb, 0x03, 0x08, 0x18, 0x0a, 0x0c, 0x0a,
-    0x04, 0x04, 0x35, 0x02, 0x00, 0x12, 0x04, 0xfc, 0x03, 0x02, 0x13, 0x0a, 0x0d, 0x0a, 0x05, 0x04,
-    0x35, 0x02, 0x00, 0x05, 0x12, 0x04, 0xfc, 0x03, 0x02, 0x08, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x35,
-    0x02, 0x00, 0x01, 0x12, 0x04, 0xfc, 0x03, 0x09, 0x0e, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x35, 0x02,
-    0x00, 0x03, 0x12, 0x04, 0xfc, 0x03, 0x11, 0x12, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x35, 0x02, 0x01,
-    0x12, 0x04, 0xfd, 0x03, 0x02, 0x1d, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x35, 0x02, 0x01, 0x06, 0x12,
-    0x04, 0xfd, 0x03, 0x02, 0x0e, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x35, 0x02, 0x01, 0x01, 0x12, 0x04,
-    0xfd, 0x03, 0x0f, 0x18, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x35, 0x02, 0x01, 0x03, 0x12, 0x04, 0xfd,
-    0x03, 0x1b, 0x1c, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x36, 0x12, 0x06, 0x80, 0x04, 0x00, 0x84, 0x04,
-    0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x36, 0x01, 0x12, 0x04, 0x80, 0x04, 0x08, 0x19, 0x0a, 0x0c,
-    0x0a, 0x04, 0x04, 0x36, 0x02, 0x00, 0x12, 0x04, 0x81, 0x04, 0x02, 0x28, 0x0a, 0x0d, 0x0a, 0x05,
-    0x04, 0x36, 0x02, 0x00, 0x04, 0x12, 0x04, 0x81, 0x04, 0x02, 0x0a, 0x0a, 0x0d, 0x0a, 0x05, 0x04,
-    0x36, 0x02, 0x00, 0x06, 0x12, 0x04, 0x81, 0x04, 0x0b, 0x17, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x36,
-    0x02, 0x00, 0x01, 0x12, 0x04, 0x81, 0x04, 0x18, 0x23, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x36, 0x02,
-    0x00, 0x03, 0x12, 0x04, 0x81, 0x04, 0x26, 0x27, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x36, 0x02, 0x01,
-    0x12, 0x04, 0x82, 0x04, 0x02, 0x2b, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x36, 0x02, 0x01, 0x04, 0x12,
-    0x04, 0x82, 0x04, 0x02, 0x0a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x36, 0x02, 0x01, 0x06, 0x12, 0x04,
-    0x82, 0x04, 0x0b, 0x1b, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x36, 0x02, 0x01, 0x01, 0x12, 0x04, 0x82,
-    0x04, 0x1c, 0x26, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x36, 0x02, 0x01, 0x03, 0x12, 0x04, 0x82, 0x04,
-    0x29, 0x2a, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x36, 0x02, 0x02, 0x12, 0x04, 0x83, 0x04, 0x02, 0x21,
-    0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x36, 0x02, 0x02, 0x05, 0x12, 0x04, 0x83, 0x04, 0x02, 0x08, 0x0a,
-    0x0d, 0x0a, 0x05, 0x04, 0x36, 0x02, 0x02, 0x01, 0x12, 0x04, 0x83, 0x04, 0x09, 0x1c, 0x0a, 0x0d,
-    0x0a, 0x05, 0x04, 0x36, 0x02, 0x02, 0x03, 0x12, 0x04, 0x83, 0x04, 0x1f, 0x20, 0x0a, 0x0c, 0x0a,
-    0x02, 0x04, 0x37, 0x12, 0x06, 0x86, 0x04, 0x00, 0x88, 0x04, 0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04,
-    0x37, 0x01, 0x12, 0x04, 0x86, 0x04, 0x08, 0x14, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x37, 0x02, 0x00,
-    0x12, 0x04, 0x87, 0x04, 0x02, 0x1e, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x37, 0x02, 0x00, 0x06, 0x12,
-    0x04, 0x87, 0x04, 0x02, 0x12, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x37, 0x02, 0x00, 0x01, 0x12, 0x04,
-    0x87, 0x04, 0x13, 0x19, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x37, 0x02, 0x00, 0x03, 0x12, 0x04, 0x87,
-    0x04, 0x1c, 0x1d, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x38, 0x12, 0x06, 0x8a, 0x04, 0x00, 0x9d, 0x04,
-    0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x38, 0x01, 0x12, 0x04, 0x8a, 0x04, 0x08, 0x18, 0x0a, 0x0e,
-    0x0a, 0x04, 0x04, 0x38, 0x04, 0x00, 0x12, 0x06, 0x8b, 0x04, 0x02, 0x93, 0x04, 0x03, 0x0a, 0x0d,
-    0x0a, 0x05, 0x04, 0x38, 0x04, 0x00, 0x01, 0x12, 0x04, 0x8b, 0x04, 0x07, 0x0b, 0x0a, 0x0e, 0x0a,
-    0x06, 0x04, 0x38, 0x04, 0x00, 0x02, 0x00, 0x12, 0x04, 0x8c, 0x04, 0x04, 0x19, 0x0a, 0x0f, 0x0a,
-    0x07, 0x04, 0x38, 0x04, 0x00, 0x02, 0x00, 0x01, 0x12, 0x04, 0x8c, 0x04, 0x04, 0x14, 0x0a, 0x0f,
-    0x0a, 0x07, 0x04, 0x38, 0x04, 0x00, 0x02, 0x00, 0x02, 0x12, 0x04, 0x8c, 0x04, 0x17, 0x18, 0x0a,
-    0x0e, 0x0a, 0x06, 0x04, 0x38, 0x04, 0x00, 0x02, 0x01, 0x12, 0x04, 0x8d, 0x04, 0x04, 0x15, 0x0a,
-    0x0f, 0x0a, 0x07, 0x04, 0x38, 0x04, 0x00, 0x02, 0x01, 0x01, 0x12, 0x04, 0x8d, 0x04, 0x04, 0x10,
-    0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x38, 0x04, 0x00, 0x02, 0x01, 0x02, 0x12, 0x04, 0x8d, 0x04, 0x13,
-    0x14, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x38, 0x04, 0x00, 0x02, 0x02, 0x12, 0x04, 0x8e, 0x04, 0x04,
-    0x1b, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x38, 0x04, 0x00, 0x02, 0x02, 0x01, 0x12, 0x04, 0x8e, 0x04,
-    0x04, 0x16, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x38, 0x04, 0x00, 0x02, 0x02, 0x02, 0x12, 0x04, 0x8e,
-    0x04, 0x19, 0x1a, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x38, 0x04, 0x00, 0x02, 0x03, 0x12, 0x04, 0x8f,
-    0x04, 0x04, 0x18, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x38, 0x04, 0x00, 0x02, 0x03, 0x01, 0x12, 0x04,
-    0x8f, 0x04, 0x04, 0x13, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x38, 0x04, 0x00, 0x02, 0x03, 0x02, 0x12,
-    0x04, 0x8f, 0x04, 0x16, 0x17, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x38, 0x04, 0x00, 0x02, 0x04, 0x12,
-    0x04, 0x90, 0x04, 0x04, 0x17, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x38, 0x04, 0x00, 0x02, 0x04, 0x01,
-    0x12, 0x04, 0x90, 0x04, 0x04, 0x12, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x38, 0x04, 0x00, 0x02, 0x04,
-    0x02, 0x12, 0x04, 0x90, 0x04, 0x15, 0x16, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x38, 0x04, 0x00, 0x04,
-    0x12, 0x04, 0x92, 0x04, 0x04, 0x0f, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x38, 0x04, 0x00, 0x04, 0x00,
-    0x12, 0x04, 0x92, 0x04, 0x0d, 0x0e, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x38, 0x04, 0x00, 0x04, 0x00,
-    0x01, 0x12, 0x04, 0x92, 0x04, 0x0d, 0x0e, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x38, 0x04, 0x00, 0x04,
-    0x00, 0x02, 0x12, 0x04, 0x92, 0x04, 0x0d, 0x0e, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x38, 0x02, 0x00,
-    0x12, 0x04, 0x95, 0x04, 0x02, 0x10, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x38, 0x02, 0x00, 0x06, 0x12,
-    0x04, 0x95, 0x04, 0x02, 0x06, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x38, 0x02, 0x00, 0x01, 0x12, 0x04,
-    0x95, 0x04, 0x07, 0x0b, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x38, 0x02, 0x00, 0x03, 0x12, 0x04, 0x95,
-    0x04, 0x0e, 0x0f, 0x0a, 0x0e, 0x0a, 0x04, 0x04, 0x38, 0x08, 0x00, 0x12, 0x06, 0x96, 0x04, 0x02,
-    0x9c, 0x04, 0x03, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x38, 0x08, 0x00, 0x01, 0x12, 0x04, 0x96, 0x04,
-    0x08, 0x11, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x38, 0x02, 0x01, 0x12, 0x04, 0x97, 0x04, 0x04, 0x21,
-    0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x38, 0x02, 0x01, 0x06, 0x12, 0x04, 0x97, 0x04, 0x04, 0x14, 0x0a,
-    0x0d, 0x0a, 0x05, 0x04, 0x38, 0x02, 0x01, 0x01, 0x12, 0x04, 0x97, 0x04, 0x15, 0x1c, 0x0a, 0x0d,
-    0x0a, 0x05, 0x04, 0x38, 0x02, 0x01, 0x03, 0x12, 0x04, 0x97, 0x04, 0x1f, 0x20, 0x0a, 0x0c, 0x0a,
-    0x04, 0x04, 0x38, 0x02, 0x02, 0x12, 0x04, 0x98, 0x04, 0x04, 0x2c, 0x0a, 0x0d, 0x0a, 0x05, 0x04,
-    0x38, 0x02, 0x02, 0x06, 0x12, 0x04, 0x98, 0x04, 0x04, 0x19, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x38,
-    0x02, 0x02, 0x01, 0x12, 0x04, 0x98, 0x04, 0x1a, 0x27, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x38, 0x02,
-    0x02, 0x03, 0x12, 0x04, 0x98, 0x04, 0x2a, 0x2b, 0x0a, 0x1e, 0x0a, 0x04, 0x04, 0x38, 0x02, 0x03,
-    0x12, 0x04, 0x9a, 0x04, 0x04, 0x30, 0x1a, 0x10, 0x20, 0x34, 0x20, 0x69, 0x73, 0x20, 0x72, 0x65,
-    0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x2e, 0x0a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x38, 0x02, 0x03,
-    0x06, 0x12, 0x04, 0x9a, 0x04, 0x04, 0x16, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x38, 0x02, 0x03, 0x01,
-    0x12, 0x04, 0x9a, 0x04, 0x17, 0x2b, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x38, 0x02, 0x03, 0x03, 0x12,
-    0x04, 0x9a, 0x04, 0x2e, 0x2f, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x38, 0x02, 0x04, 0x12, 0x04, 0x9b,
-    0x04, 0x04, 0x2e, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x38, 0x02, 0x04, 0x06, 0x12, 0x04, 0x9b, 0x04,
-    0x04, 0x15, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x38, 0x02, 0x04, 0x01, 0x12, 0x04, 0x9b, 0x04, 0x16,
-    0x29, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x38, 0x02, 0x04, 0x03, 0x12, 0x04, 0x9b, 0x04, 0x2c, 0x2d,
-    0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x39, 0x12, 0x06, 0x9f, 0x04, 0x00, 0xa3, 0x04, 0x01, 0x0a, 0x0b,
-    0x0a, 0x03, 0x04, 0x39, 0x01, 0x12, 0x04, 0x9f, 0x04, 0x08, 0x1b, 0x0a, 0x0c, 0x0a, 0x04, 0x04,
-    0x39, 0x02, 0x00, 0x12, 0x04, 0xa0, 0x04, 0x02, 0x1f, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x39, 0x02,
-    0x00, 0x05, 0x12, 0x04, 0xa0, 0x04, 0x02, 0x08, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x39, 0x02, 0x00,
-    0x01, 0x12, 0x04, 0xa0, 0x04, 0x09, 0x1a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x39, 0x02, 0x00, 0x03,
-    0x12, 0x04, 0xa0, 0x04, 0x1d, 0x1e, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x39, 0x02, 0x01, 0x12, 0x04,
-    0xa1, 0x04, 0x02, 0x2d, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x39, 0x02, 0x01, 0x04, 0x12, 0x04, 0xa1,
-    0x04, 0x02, 0x0a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x39, 0x02, 0x01, 0x06, 0x12, 0x04, 0xa1, 0x04,
-    0x0b, 0x18, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x39, 0x02, 0x01, 0x01, 0x12, 0x04, 0xa1, 0x04, 0x19,
-    0x28, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x39, 0x02, 0x01, 0x03, 0x12, 0x04, 0xa1, 0x04, 0x2b, 0x2c,
-    0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x39, 0x02, 0x02, 0x12, 0x04, 0xa2, 0x04, 0x02, 0x32, 0x0a, 0x0d,
-    0x0a, 0x05, 0x04, 0x39, 0x02, 0x02, 0x04, 0x12, 0x04, 0xa2, 0x04, 0x02, 0x0a, 0x0a, 0x0d, 0x0a,
-    0x05, 0x04, 0x39, 0x02, 0x02, 0x06, 0x12, 0x04, 0xa2, 0x04, 0x0b, 0x1a, 0x0a, 0x0d, 0x0a, 0x05,
-    0x04, 0x39, 0x02, 0x02, 0x01, 0x12, 0x04, 0xa2, 0x04, 0x1b, 0x2d, 0x0a, 0x0d, 0x0a, 0x05, 0x04,
-    0x39, 0x02, 0x02, 0x03, 0x12, 0x04, 0xa2, 0x04, 0x30, 0x31, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x3a,
-    0x12, 0x06, 0xa5, 0x04, 0x00, 0xa8, 0x04, 0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x3a, 0x01, 0x12,
-    0x04, 0xa5, 0x04, 0x08, 0x15, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x3a, 0x02, 0x00, 0x12, 0x04, 0xa6,
-    0x04, 0x02, 0x1c, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x3a, 0x02, 0x00, 0x05, 0x12, 0x04, 0xa6, 0x04,
-    0x02, 0x08, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x3a, 0x02, 0x00, 0x01, 0x12, 0x04, 0xa6, 0x04, 0x09,
-    0x17, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x3a, 0x02, 0x00, 0x03, 0x12, 0x04, 0xa6, 0x04, 0x1a, 0x1b,
-    0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x3a, 0x02, 0x01, 0x12, 0x04, 0xa7, 0x04, 0x02, 0x19, 0x0a, 0x0d,
-    0x0a, 0x05, 0x04, 0x3a, 0x02, 0x01, 0x05, 0x12, 0x04, 0xa7, 0x04, 0x02, 0x08, 0x0a, 0x0d, 0x0a,
-    0x05, 0x04, 0x3a, 0x02, 0x01, 0x01, 0x12, 0x04, 0xa7, 0x04, 0x09, 0x14, 0x0a, 0x0d, 0x0a, 0x05,
-    0x04, 0x3a, 0x02, 0x01, 0x03, 0x12, 0x04, 0xa7, 0x04, 0x17, 0x18, 0x0a, 0x0c, 0x0a, 0x02, 0x04,
-    0x3b, 0x12, 0x06, 0xaa, 0x04, 0x00, 0xad, 0x04, 0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x3b, 0x01,
-    0x12, 0x04, 0xaa, 0x04, 0x08, 0x17, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x3b, 0x02, 0x00, 0x12, 0x04,
-    0xab, 0x04, 0x02, 0x17, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x3b, 0x02, 0x00, 0x05, 0x12, 0x04, 0xab,
-    0x04, 0x02, 0x08, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x3b, 0x02, 0x00, 0x01, 0x12, 0x04, 0xab, 0x04,
-    0x09, 0x12, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x3b, 0x02, 0x00, 0x03, 0x12, 0x04, 0xab, 0x04, 0x15,
-    0x16, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x3b, 0x02, 0x01, 0x12, 0x04, 0xac, 0x04, 0x02, 0x19, 0x0a,
-    0x0d, 0x0a, 0x05, 0x04, 0x3b, 0x02, 0x01, 0x05, 0x12, 0x04, 0xac, 0x04, 0x02, 0x08, 0x0a, 0x0d,
-    0x0a, 0x05, 0x04, 0x3b, 0x02, 0x01, 0x01, 0x12, 0x04, 0xac, 0x04, 0x09, 0x14, 0x0a, 0x0d, 0x0a,
-    0x05, 0x04, 0x3b, 0x02, 0x01, 0x03, 0x12, 0x04, 0xac, 0x04, 0x17, 0x18, 0x62, 0x06, 0x70, 0x72,
-    0x6f, 0x74, 0x6f, 0x33,
+    0x20, 0x61, 0x20, 0x62, 0x6c, 0x6f, 0x63, 0x0a, 0x20, 0x2d, 0x20, 0x47, 0x65, 0x6e, 0x65, 0x73,
+    0x69, 0x73, 0x20, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x20,
+    0x74, 0x68, 0x65, 0x20, 0x66, 0x69, 0x72, 0x73, 0x74, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61,
+    0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x6f, 0x66, 0x20, 0x74, 0x68, 0x65, 0x20, 0x63, 0x68, 0x61,
+    0x69, 0x6e, 0x2c, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x61, 0x6c, 0x6c, 0x20, 0x63, 0x6f, 0x72,
+    0x65, 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x76,
+    0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x20, 0x69, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61,
+    0x74, 0x69, 0x6f, 0x6e, 0x20, 0x62, 0x61, 0x6b, 0x65, 0x64, 0x20, 0x69, 0x6e, 0x0a, 0x0a, 0x0a,
+    0x0a, 0x03, 0x04, 0x01, 0x01, 0x12, 0x03, 0x27, 0x08, 0x13, 0x0a, 0x0b, 0x0a, 0x04, 0x04, 0x01,
+    0x02, 0x00, 0x12, 0x03, 0x28, 0x02, 0x2f, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x01, 0x02, 0x00, 0x06,
+    0x12, 0x03, 0x28, 0x02, 0x20, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x01, 0x02, 0x00, 0x01, 0x12, 0x03,
+    0x28, 0x21, 0x2a, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x01, 0x02, 0x00, 0x03, 0x12, 0x03, 0x28, 0x2d,
+    0x2e, 0x0a, 0x0b, 0x0a, 0x04, 0x04, 0x01, 0x02, 0x01, 0x12, 0x03, 0x29, 0x02, 0x2a, 0x0a, 0x0c,
+    0x0a, 0x05, 0x04, 0x01, 0x02, 0x01, 0x05, 0x12, 0x03, 0x29, 0x02, 0x08, 0x0a, 0x0c, 0x0a, 0x05,
+    0x04, 0x01, 0x02, 0x01, 0x01, 0x12, 0x03, 0x29, 0x09, 0x10, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x01,
+    0x02, 0x01, 0x03, 0x12, 0x03, 0x29, 0x13, 0x14, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x01, 0x02, 0x01,
+    0x08, 0x12, 0x03, 0x29, 0x15, 0x29, 0x0a, 0x0d, 0x0a, 0x06, 0x04, 0x01, 0x02, 0x01, 0x08, 0x06,
+    0x12, 0x03, 0x29, 0x16, 0x28, 0x0a, 0x0b, 0x0a, 0x04, 0x04, 0x01, 0x02, 0x02, 0x12, 0x03, 0x2a,
+    0x02, 0x1b, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x01, 0x02, 0x02, 0x06, 0x12, 0x03, 0x2a, 0x02, 0x11,
+    0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x01, 0x02, 0x02, 0x01, 0x12, 0x03, 0x2a, 0x12, 0x16, 0x0a, 0x0c,
+    0x0a, 0x05, 0x04, 0x01, 0x02, 0x02, 0x03, 0x12, 0x03, 0x2a, 0x19, 0x1a, 0x0a, 0x0b, 0x0a, 0x04,
+    0x04, 0x01, 0x02, 0x03, 0x12, 0x03, 0x2b, 0x02, 0x28, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x01, 0x02,
+    0x03, 0x05, 0x12, 0x03, 0x2b, 0x02, 0x08, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x01, 0x02, 0x03, 0x01,
+    0x12, 0x03, 0x2b, 0x09, 0x0e, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x01, 0x02, 0x03, 0x03, 0x12, 0x03,
+    0x2b, 0x11, 0x12, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x01, 0x02, 0x03, 0x08, 0x12, 0x03, 0x2b, 0x13,
+    0x27, 0x0a, 0x0d, 0x0a, 0x06, 0x04, 0x01, 0x02, 0x03, 0x08, 0x06, 0x12, 0x03, 0x2b, 0x14, 0x26,
+    0x0a, 0x0b, 0x0a, 0x04, 0x04, 0x01, 0x02, 0x04, 0x12, 0x03, 0x2c, 0x02, 0x2f, 0x0a, 0x0c, 0x0a,
+    0x05, 0x04, 0x01, 0x02, 0x04, 0x05, 0x12, 0x03, 0x2c, 0x02, 0x08, 0x0a, 0x0c, 0x0a, 0x05, 0x04,
+    0x01, 0x02, 0x04, 0x01, 0x12, 0x03, 0x2c, 0x09, 0x15, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x01, 0x02,
+    0x04, 0x03, 0x12, 0x03, 0x2c, 0x18, 0x19, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x01, 0x02, 0x04, 0x08,
+    0x12, 0x03, 0x2c, 0x1a, 0x2e, 0x0a, 0x0d, 0x0a, 0x06, 0x04, 0x01, 0x02, 0x04, 0x08, 0x06, 0x12,
+    0x03, 0x2c, 0x1b, 0x2d, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x01, 0x04, 0x00, 0x12, 0x04, 0x2e, 0x02,
+    0x37, 0x03, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x01, 0x04, 0x00, 0x01, 0x12, 0x03, 0x2e, 0x07, 0x16,
+    0x0a, 0x0d, 0x0a, 0x06, 0x04, 0x01, 0x04, 0x00, 0x02, 0x00, 0x12, 0x03, 0x2f, 0x04, 0x25, 0x0a,
+    0x0e, 0x0a, 0x07, 0x04, 0x01, 0x04, 0x00, 0x02, 0x00, 0x01, 0x12, 0x03, 0x2f, 0x04, 0x20, 0x0a,
+    0x0e, 0x0a, 0x07, 0x04, 0x01, 0x04, 0x00, 0x02, 0x00, 0x02, 0x12, 0x03, 0x2f, 0x23, 0x24, 0x0a,
+    0x0d, 0x0a, 0x06, 0x04, 0x01, 0x04, 0x00, 0x02, 0x01, 0x12, 0x03, 0x30, 0x04, 0x21, 0x0a, 0x0e,
+    0x0a, 0x07, 0x04, 0x01, 0x04, 0x00, 0x02, 0x01, 0x01, 0x12, 0x03, 0x30, 0x04, 0x1c, 0x0a, 0x0e,
+    0x0a, 0x07, 0x04, 0x01, 0x04, 0x00, 0x02, 0x01, 0x02, 0x12, 0x03, 0x30, 0x1f, 0x20, 0x0a, 0x0d,
+    0x0a, 0x06, 0x04, 0x01, 0x04, 0x00, 0x02, 0x02, 0x12, 0x03, 0x31, 0x04, 0x28, 0x0a, 0x0e, 0x0a,
+    0x07, 0x04, 0x01, 0x04, 0x00, 0x02, 0x02, 0x01, 0x12, 0x03, 0x31, 0x04, 0x23, 0x0a, 0x0e, 0x0a,
+    0x07, 0x04, 0x01, 0x04, 0x00, 0x02, 0x02, 0x02, 0x12, 0x03, 0x31, 0x26, 0x27, 0x0a, 0x0d, 0x0a,
+    0x06, 0x04, 0x01, 0x04, 0x00, 0x02, 0x03, 0x12, 0x03, 0x32, 0x04, 0x2a, 0x0a, 0x0e, 0x0a, 0x07,
+    0x04, 0x01, 0x04, 0x00, 0x02, 0x03, 0x01, 0x12, 0x03, 0x32, 0x04, 0x25, 0x0a, 0x0e, 0x0a, 0x07,
+    0x04, 0x01, 0x04, 0x00, 0x02, 0x03, 0x02, 0x12, 0x03, 0x32, 0x28, 0x29, 0x0a, 0x0d, 0x0a, 0x06,
+    0x04, 0x01, 0x04, 0x00, 0x02, 0x04, 0x12, 0x03, 0x33, 0x04, 0x1e, 0x0a, 0x0e, 0x0a, 0x07, 0x04,
+    0x01, 0x04, 0x00, 0x02, 0x04, 0x01, 0x12, 0x03, 0x33, 0x04, 0x19, 0x0a, 0x0e, 0x0a, 0x07, 0x04,
+    0x01, 0x04, 0x00, 0x02, 0x04, 0x02, 0x12, 0x03, 0x33, 0x1c, 0x1d, 0x0a, 0x32, 0x0a, 0x06, 0x04,
+    0x01, 0x04, 0x00, 0x02, 0x05, 0x12, 0x03, 0x35, 0x04, 0x24, 0x1a, 0x23, 0x20, 0x76, 0x61, 0x6c,
+    0x75, 0x65, 0x73, 0x20, 0x35, 0x2d, 0x31, 0x39, 0x20, 0x73, 0x6b, 0x69, 0x70, 0x70, 0x65, 0x64,
+    0x20, 0x66, 0x6f, 0x72, 0x20, 0x6e, 0x6f, 0x20, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x0a, 0x0a,
+    0x0e, 0x0a, 0x07, 0x04, 0x01, 0x04, 0x00, 0x02, 0x05, 0x01, 0x12, 0x03, 0x35, 0x04, 0x1e, 0x0a,
+    0x0e, 0x0a, 0x07, 0x04, 0x01, 0x04, 0x00, 0x02, 0x05, 0x02, 0x12, 0x03, 0x35, 0x21, 0x23, 0x0a,
+    0x0d, 0x0a, 0x06, 0x04, 0x01, 0x04, 0x00, 0x02, 0x06, 0x12, 0x03, 0x36, 0x04, 0x29, 0x0a, 0x0e,
+    0x0a, 0x07, 0x04, 0x01, 0x04, 0x00, 0x02, 0x06, 0x01, 0x12, 0x03, 0x36, 0x04, 0x23, 0x0a, 0x0e,
+    0x0a, 0x07, 0x04, 0x01, 0x04, 0x00, 0x02, 0x06, 0x02, 0x12, 0x03, 0x36, 0x26, 0x28, 0x0a, 0x0b,
+    0x0a, 0x04, 0x04, 0x01, 0x02, 0x05, 0x12, 0x03, 0x39, 0x02, 0x1b, 0x0a, 0x0c, 0x0a, 0x05, 0x04,
+    0x01, 0x02, 0x05, 0x06, 0x12, 0x03, 0x39, 0x02, 0x11, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x01, 0x02,
+    0x05, 0x01, 0x12, 0x03, 0x39, 0x12, 0x16, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x01, 0x02, 0x05, 0x03,
+    0x12, 0x03, 0x39, 0x19, 0x1a, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x01, 0x08, 0x00, 0x12, 0x04, 0x3b,
+    0x02, 0x44, 0x03, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x01, 0x08, 0x00, 0x01, 0x12, 0x03, 0x3b, 0x08,
+    0x10, 0x0a, 0x0b, 0x0a, 0x04, 0x04, 0x01, 0x02, 0x06, 0x12, 0x03, 0x3c, 0x04, 0x30, 0x0a, 0x0c,
+    0x0a, 0x05, 0x04, 0x01, 0x02, 0x06, 0x06, 0x12, 0x03, 0x3c, 0x04, 0x1c, 0x0a, 0x0c, 0x0a, 0x05,
+    0x04, 0x01, 0x02, 0x06, 0x01, 0x12, 0x03, 0x3c, 0x1d, 0x2b, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x01,
+    0x02, 0x06, 0x03, 0x12, 0x03, 0x3c, 0x2e, 0x2f, 0x0a, 0x0b, 0x0a, 0x04, 0x04, 0x01, 0x02, 0x07,
+    0x12, 0x03, 0x3d, 0x04, 0x23, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x01, 0x02, 0x07, 0x06, 0x12, 0x03,
+    0x3d, 0x04, 0x16, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x01, 0x02, 0x07, 0x01, 0x12, 0x03, 0x3d, 0x17,
+    0x1e, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x01, 0x02, 0x07, 0x03, 0x12, 0x03, 0x3d, 0x21, 0x22, 0x0a,
+    0x0b, 0x0a, 0x04, 0x04, 0x01, 0x02, 0x08, 0x12, 0x03, 0x3e, 0x04, 0x34, 0x0a, 0x0c, 0x0a, 0x05,
+    0x04, 0x01, 0x02, 0x08, 0x06, 0x12, 0x03, 0x3e, 0x04, 0x1e, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x01,
+    0x02, 0x08, 0x01, 0x12, 0x03, 0x3e, 0x1f, 0x2f, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x01, 0x02, 0x08,
+    0x03, 0x12, 0x03, 0x3e, 0x32, 0x33, 0x0a, 0x0b, 0x0a, 0x04, 0x04, 0x01, 0x02, 0x09, 0x12, 0x03,
+    0x3f, 0x04, 0x1e, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x01, 0x02, 0x09, 0x06, 0x12, 0x03, 0x3f, 0x04,
+    0x13, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x01, 0x02, 0x09, 0x01, 0x12, 0x03, 0x3f, 0x14, 0x18, 0x0a,
+    0x0c, 0x0a, 0x05, 0x04, 0x01, 0x02, 0x09, 0x03, 0x12, 0x03, 0x3f, 0x1b, 0x1d, 0x0a, 0x30, 0x0a,
+    0x04, 0x04, 0x01, 0x02, 0x0a, 0x12, 0x03, 0x41, 0x04, 0x28, 0x1a, 0x23, 0x20, 0x76, 0x61, 0x6c,
+    0x75, 0x65, 0x20, 0x31, 0x31, 0x2d, 0x31, 0x39, 0x20, 0x73, 0x6b, 0x69, 0x70, 0x70, 0x65, 0x64,
+    0x20, 0x66, 0x6f, 0x72, 0x20, 0x6e, 0x6f, 0x20, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x0a, 0x0a,
+    0x0c, 0x0a, 0x05, 0x04, 0x01, 0x02, 0x0a, 0x06, 0x12, 0x03, 0x41, 0x04, 0x18, 0x0a, 0x0c, 0x0a,
+    0x05, 0x04, 0x01, 0x02, 0x0a, 0x01, 0x12, 0x03, 0x41, 0x19, 0x22, 0x0a, 0x0c, 0x0a, 0x05, 0x04,
+    0x01, 0x02, 0x0a, 0x03, 0x12, 0x03, 0x41, 0x25, 0x27, 0x0a, 0x6e, 0x0a, 0x04, 0x04, 0x01, 0x02,
+    0x0b, 0x12, 0x03, 0x43, 0x04, 0x31, 0x1a, 0x61, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x20, 0x32,
+    0x32, 0x20, 0x69, 0x73, 0x20, 0x75, 0x73, 0x65, 0x64, 0x20, 0x75, 0x70, 0x20, 0x62, 0x65, 0x6c,
+    0x6f, 0x77, 0x20, 0x28, 0x61, 0x6c, 0x6c, 0x20, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74,
+    0x69, 0x6f, 0x6e, 0x20, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x20, 0x68, 0x61, 0x76, 0x65, 0x20,
+    0x74, 0x6f, 0x20, 0x68, 0x61, 0x76, 0x65, 0x20, 0x64, 0x69, 0x66, 0x66, 0x65, 0x72, 0x65, 0x6e,
+    0x74, 0x20, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x29, 0x2c, 0x20, 0x73, 0x6f, 0x20, 0x67, 0x6f, 0x69,
+    0x6e, 0x67, 0x20, 0x74, 0x6f, 0x20, 0x32, 0x33, 0x0a, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x01, 0x02,
+    0x0b, 0x06, 0x12, 0x03, 0x43, 0x04, 0x1c, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x01, 0x02, 0x0b, 0x01,
+    0x12, 0x03, 0x43, 0x1d, 0x2b, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x01, 0x02, 0x0b, 0x03, 0x12, 0x03,
+    0x43, 0x2e, 0x30, 0x0a, 0x0b, 0x0a, 0x04, 0x04, 0x01, 0x02, 0x0c, 0x12, 0x03, 0x46, 0x02, 0x25,
+    0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x01, 0x02, 0x0c, 0x06, 0x12, 0x03, 0x46, 0x02, 0x15, 0x0a, 0x0c,
+    0x0a, 0x05, 0x04, 0x01, 0x02, 0x0c, 0x01, 0x12, 0x03, 0x46, 0x16, 0x1f, 0x0a, 0x0c, 0x0a, 0x05,
+    0x04, 0x01, 0x02, 0x0c, 0x03, 0x12, 0x03, 0x46, 0x22, 0x24, 0x0a, 0x20, 0x0a, 0x02, 0x04, 0x02,
+    0x12, 0x04, 0x4a, 0x00, 0x51, 0x01, 0x1a, 0x14, 0x20, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63,
+    0x74, 0x69, 0x6f, 0x6e, 0x20, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x0a, 0x0a, 0x0a, 0x0a, 0x03,
+    0x04, 0x02, 0x01, 0x12, 0x03, 0x4a, 0x08, 0x20, 0x0a, 0x0b, 0x0a, 0x04, 0x04, 0x02, 0x02, 0x00,
+    0x12, 0x03, 0x4b, 0x02, 0x10, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x02, 0x02, 0x00, 0x05, 0x12, 0x03,
+    0x4b, 0x02, 0x08, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x02, 0x02, 0x00, 0x01, 0x12, 0x03, 0x4b, 0x09,
+    0x0b, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x02, 0x02, 0x00, 0x03, 0x12, 0x03, 0x4b, 0x0e, 0x0f, 0x0a,
+    0x0b, 0x0a, 0x04, 0x04, 0x02, 0x02, 0x01, 0x12, 0x03, 0x4c, 0x02, 0x28, 0x0a, 0x0c, 0x0a, 0x05,
+    0x04, 0x02, 0x02, 0x01, 0x05, 0x12, 0x03, 0x4c, 0x02, 0x08, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x02,
+    0x02, 0x01, 0x01, 0x12, 0x03, 0x4c, 0x09, 0x0e, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x02, 0x02, 0x01,
+    0x03, 0x12, 0x03, 0x4c, 0x11, 0x12, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x02, 0x02, 0x01, 0x08, 0x12,
+    0x03, 0x4c, 0x13, 0x27, 0x0a, 0x0d, 0x0a, 0x06, 0x04, 0x02, 0x02, 0x01, 0x08, 0x06, 0x12, 0x03,
+    0x4c, 0x14, 0x26, 0x0a, 0x0b, 0x0a, 0x04, 0x04, 0x02, 0x02, 0x02, 0x12, 0x03, 0x4d, 0x02, 0x1c,
+    0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x02, 0x02, 0x02, 0x04, 0x12, 0x03, 0x4d, 0x02, 0x0a, 0x0a, 0x0c,
+    0x0a, 0x05, 0x04, 0x02, 0x02, 0x02, 0x06, 0x12, 0x03, 0x4d, 0x0b, 0x10, 0x0a, 0x0c, 0x0a, 0x05,
+    0x04, 0x02, 0x02, 0x02, 0x01, 0x12, 0x03, 0x4d, 0x11, 0x17, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x02,
+    0x02, 0x02, 0x03, 0x12, 0x03, 0x4d, 0x1a, 0x1b, 0x0a, 0x0b, 0x0a, 0x04, 0x04, 0x02, 0x02, 0x03,
+    0x12, 0x03, 0x4e, 0x02, 0x28, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x02, 0x02, 0x03, 0x05, 0x12, 0x03,
+    0x4e, 0x02, 0x07, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x02, 0x02, 0x03, 0x01, 0x12, 0x03, 0x4e, 0x08,
+    0x23, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x02, 0x02, 0x03, 0x03, 0x12, 0x03, 0x4e, 0x26, 0x27, 0x0a,
+    0x0b, 0x0a, 0x04, 0x04, 0x02, 0x02, 0x04, 0x12, 0x03, 0x4f, 0x02, 0x16, 0x0a, 0x0c, 0x0a, 0x05,
+    0x04, 0x02, 0x02, 0x04, 0x05, 0x12, 0x03, 0x4f, 0x02, 0x08, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x02,
+    0x02, 0x04, 0x01, 0x12, 0x03, 0x4f, 0x09, 0x11, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x02, 0x02, 0x04,
+    0x03, 0x12, 0x03, 0x4f, 0x14, 0x15, 0x0a, 0x0b, 0x0a, 0x04, 0x04, 0x02, 0x02, 0x05, 0x12, 0x03,
+    0x50, 0x02, 0x2e, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x02, 0x02, 0x05, 0x04, 0x12, 0x03, 0x50, 0x02,
+    0x0a, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x02, 0x02, 0x05, 0x05, 0x12, 0x03, 0x50, 0x0b, 0x11, 0x0a,
+    0x0c, 0x0a, 0x05, 0x04, 0x02, 0x02, 0x05, 0x01, 0x12, 0x03, 0x50, 0x12, 0x29, 0x0a, 0x0c, 0x0a,
+    0x05, 0x04, 0x02, 0x02, 0x05, 0x03, 0x12, 0x03, 0x50, 0x2c, 0x2d, 0x0a, 0x0a, 0x0a, 0x02, 0x04,
+    0x03, 0x12, 0x04, 0x53, 0x00, 0x56, 0x01, 0x0a, 0x0a, 0x0a, 0x03, 0x04, 0x03, 0x01, 0x12, 0x03,
+    0x53, 0x08, 0x1a, 0x0a, 0x0b, 0x0a, 0x04, 0x04, 0x03, 0x02, 0x00, 0x12, 0x03, 0x54, 0x02, 0x17,
+    0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x03, 0x02, 0x00, 0x06, 0x12, 0x03, 0x54, 0x02, 0x0a, 0x0a, 0x0c,
+    0x0a, 0x05, 0x04, 0x03, 0x02, 0x00, 0x01, 0x12, 0x03, 0x54, 0x0b, 0x12, 0x0a, 0x0c, 0x0a, 0x05,
+    0x04, 0x03, 0x02, 0x00, 0x03, 0x12, 0x03, 0x54, 0x15, 0x16, 0x0a, 0x0b, 0x0a, 0x04, 0x04, 0x03,
+    0x02, 0x01, 0x12, 0x03, 0x55, 0x02, 0x1c, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x03, 0x02, 0x01, 0x04,
+    0x12, 0x03, 0x55, 0x02, 0x0a, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x03, 0x02, 0x01, 0x06, 0x12, 0x03,
+    0x55, 0x0b, 0x10, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x03, 0x02, 0x01, 0x01, 0x12, 0x03, 0x55, 0x11,
+    0x17, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x03, 0x02, 0x01, 0x03, 0x12, 0x03, 0x55, 0x1a, 0x1b, 0x0a,
+    0x09, 0x0a, 0x02, 0x04, 0x04, 0x12, 0x03, 0x58, 0x00, 0x25, 0x0a, 0x0a, 0x0a, 0x03, 0x04, 0x04,
+    0x01, 0x12, 0x03, 0x58, 0x08, 0x22, 0x0a, 0x0b, 0x0a, 0x02, 0x04, 0x05, 0x12, 0x05, 0x5a, 0x00,
+    0x8e, 0x01, 0x01, 0x0a, 0x0a, 0x0a, 0x03, 0x04, 0x05, 0x01, 0x12, 0x03, 0x5a, 0x08, 0x1c, 0x0a,
+    0x0c, 0x0a, 0x04, 0x04, 0x05, 0x08, 0x00, 0x12, 0x04, 0x5b, 0x02, 0x5e, 0x03, 0x0a, 0x0c, 0x0a,
+    0x05, 0x04, 0x05, 0x08, 0x00, 0x01, 0x12, 0x03, 0x5b, 0x08, 0x20, 0x0a, 0x0b, 0x0a, 0x04, 0x04,
+    0x05, 0x02, 0x00, 0x12, 0x03, 0x5c, 0x04, 0x2e, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x05, 0x02, 0x00,
+    0x06, 0x12, 0x03, 0x5c, 0x04, 0x15, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x05, 0x02, 0x00, 0x01, 0x12,
+    0x03, 0x5c, 0x16, 0x29, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x05, 0x02, 0x00, 0x03, 0x12, 0x03, 0x5c,
+    0x2c, 0x2d, 0x0a, 0x0b, 0x0a, 0x04, 0x04, 0x05, 0x02, 0x01, 0x12, 0x03, 0x5d, 0x04, 0x1d, 0x0a,
+    0x0c, 0x0a, 0x05, 0x04, 0x05, 0x02, 0x01, 0x06, 0x12, 0x03, 0x5d, 0x04, 0x0d, 0x0a, 0x0c, 0x0a,
+    0x05, 0x04, 0x05, 0x02, 0x01, 0x01, 0x12, 0x03, 0x5d, 0x0e, 0x18, 0x0a, 0x0c, 0x0a, 0x05, 0x04,
+    0x05, 0x02, 0x01, 0x03, 0x12, 0x03, 0x5d, 0x1b, 0x1c, 0x0a, 0x0d, 0x0a, 0x04, 0x04, 0x05, 0x03,
+    0x00, 0x12, 0x05, 0x60, 0x02, 0x82, 0x01, 0x03, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x05, 0x03, 0x00,
+    0x01, 0x12, 0x03, 0x60, 0x0a, 0x1b, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x05, 0x03, 0x00, 0x03, 0x00,
+    0x12, 0x04, 0x61, 0x04, 0x77, 0x05, 0x0a, 0x0e, 0x0a, 0x07, 0x04, 0x05, 0x03, 0x00, 0x03, 0x00,
+    0x01, 0x12, 0x03, 0x61, 0x0c, 0x20, 0x0a, 0x0f, 0x0a, 0x08, 0x04, 0x05, 0x03, 0x00, 0x03, 0x00,
+    0x02, 0x00, 0x12, 0x03, 0x62, 0x06, 0x18, 0x0a, 0x10, 0x0a, 0x09, 0x04, 0x05, 0x03, 0x00, 0x03,
+    0x00, 0x02, 0x00, 0x05, 0x12, 0x03, 0x62, 0x06, 0x0c, 0x0a, 0x10, 0x0a, 0x09, 0x04, 0x05, 0x03,
+    0x00, 0x03, 0x00, 0x02, 0x00, 0x01, 0x12, 0x03, 0x62, 0x0d, 0x13, 0x0a, 0x10, 0x0a, 0x09, 0x04,
+    0x05, 0x03, 0x00, 0x03, 0x00, 0x02, 0x00, 0x03, 0x12, 0x03, 0x62, 0x16, 0x17, 0x0a, 0x0f, 0x0a,
+    0x08, 0x04, 0x05, 0x03, 0x00, 0x03, 0x00, 0x02, 0x01, 0x12, 0x03, 0x63, 0x06, 0x19, 0x0a, 0x10,
+    0x0a, 0x09, 0x04, 0x05, 0x03, 0x00, 0x03, 0x00, 0x02, 0x01, 0x05, 0x12, 0x03, 0x63, 0x06, 0x0c,
+    0x0a, 0x10, 0x0a, 0x09, 0x04, 0x05, 0x03, 0x00, 0x03, 0x00, 0x02, 0x01, 0x01, 0x12, 0x03, 0x63,
+    0x0d, 0x14, 0x0a, 0x10, 0x0a, 0x09, 0x04, 0x05, 0x03, 0x00, 0x03, 0x00, 0x02, 0x01, 0x03, 0x12,
+    0x03, 0x63, 0x17, 0x18, 0x0a, 0x10, 0x0a, 0x08, 0x04, 0x05, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00,
+    0x12, 0x04, 0x64, 0x06, 0x74, 0x07, 0x0a, 0x10, 0x0a, 0x09, 0x04, 0x05, 0x03, 0x00, 0x03, 0x00,
+    0x03, 0x00, 0x01, 0x12, 0x03, 0x64, 0x0e, 0x11, 0x0a, 0x12, 0x0a, 0x0a, 0x04, 0x05, 0x03, 0x00,
+    0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x12, 0x04, 0x65, 0x08, 0x6b, 0x09, 0x0a, 0x12, 0x0a, 0x0b,
+    0x04, 0x05, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x01, 0x12, 0x03, 0x65, 0x10, 0x13,
+    0x0a, 0x13, 0x0a, 0x0c, 0x04, 0x05, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x02, 0x00,
+    0x12, 0x03, 0x66, 0x0a, 0x19, 0x0a, 0x14, 0x0a, 0x0d, 0x04, 0x05, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x02, 0x00, 0x05, 0x12, 0x03, 0x66, 0x0a, 0x10, 0x0a, 0x14, 0x0a, 0x0d, 0x04,
+    0x05, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x02, 0x00, 0x01, 0x12, 0x03, 0x66, 0x11,
+    0x14, 0x0a, 0x14, 0x0a, 0x0d, 0x04, 0x05, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x02,
+    0x00, 0x03, 0x12, 0x03, 0x66, 0x17, 0x18, 0x0a, 0x13, 0x0a, 0x0c, 0x04, 0x05, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x02, 0x01, 0x12, 0x03, 0x67, 0x0a, 0x19, 0x0a, 0x14, 0x0a, 0x0d,
+    0x04, 0x05, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x02, 0x01, 0x05, 0x12, 0x03, 0x67,
+    0x0a, 0x10, 0x0a, 0x14, 0x0a, 0x0d, 0x04, 0x05, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00,
+    0x02, 0x01, 0x01, 0x12, 0x03, 0x67, 0x11, 0x14, 0x0a, 0x14, 0x0a, 0x0d, 0x04, 0x05, 0x03, 0x00,
+    0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x02, 0x01, 0x03, 0x12, 0x03, 0x67, 0x17, 0x18, 0x0a, 0x13,
+    0x0a, 0x0c, 0x04, 0x05, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x02, 0x02, 0x12, 0x03,
+    0x68, 0x0a, 0x19, 0x0a, 0x14, 0x0a, 0x0d, 0x04, 0x05, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x02, 0x02, 0x05, 0x12, 0x03, 0x68, 0x0a, 0x10, 0x0a, 0x14, 0x0a, 0x0d, 0x04, 0x05, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x02, 0x02, 0x01, 0x12, 0x03, 0x68, 0x11, 0x14, 0x0a,
+    0x14, 0x0a, 0x0d, 0x04, 0x05, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x02, 0x02, 0x03,
+    0x12, 0x03, 0x68, 0x17, 0x18, 0x0a, 0x13, 0x0a, 0x0c, 0x04, 0x05, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x02, 0x03, 0x12, 0x03, 0x69, 0x0a, 0x17, 0x0a, 0x14, 0x0a, 0x0d, 0x04, 0x05,
+    0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x02, 0x03, 0x05, 0x12, 0x03, 0x69, 0x0a, 0x10,
+    0x0a, 0x14, 0x0a, 0x0d, 0x04, 0x05, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x02, 0x03,
+    0x01, 0x12, 0x03, 0x69, 0x11, 0x12, 0x0a, 0x14, 0x0a, 0x0d, 0x04, 0x05, 0x03, 0x00, 0x03, 0x00,
+    0x03, 0x00, 0x03, 0x00, 0x02, 0x03, 0x03, 0x12, 0x03, 0x69, 0x15, 0x16, 0x0a, 0x13, 0x0a, 0x0c,
+    0x04, 0x05, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x02, 0x04, 0x12, 0x03, 0x6a, 0x0a,
+    0x17, 0x0a, 0x14, 0x0a, 0x0d, 0x04, 0x05, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x02,
+    0x04, 0x05, 0x12, 0x03, 0x6a, 0x0a, 0x10, 0x0a, 0x14, 0x0a, 0x0d, 0x04, 0x05, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x02, 0x04, 0x01, 0x12, 0x03, 0x6a, 0x11, 0x12, 0x0a, 0x14, 0x0a,
+    0x0d, 0x04, 0x05, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x02, 0x04, 0x03, 0x12, 0x03,
+    0x6a, 0x15, 0x16, 0x0a, 0x12, 0x0a, 0x0a, 0x04, 0x05, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x01, 0x12, 0x04, 0x6c, 0x08, 0x6f, 0x09, 0x0a, 0x12, 0x0a, 0x0b, 0x04, 0x05, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x01, 0x01, 0x12, 0x03, 0x6c, 0x10, 0x1e, 0x0a, 0x13, 0x0a, 0x0c, 0x04,
+    0x05, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x01, 0x02, 0x00, 0x12, 0x03, 0x6d, 0x0a, 0x17,
+    0x0a, 0x14, 0x0a, 0x0d, 0x04, 0x05, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x01, 0x02, 0x00,
+    0x05, 0x12, 0x03, 0x6d, 0x0a, 0x0f, 0x0a, 0x14, 0x0a, 0x0d, 0x04, 0x05, 0x03, 0x00, 0x03, 0x00,
+    0x03, 0x00, 0x03, 0x01, 0x02, 0x00, 0x01, 0x12, 0x03, 0x6d, 0x10, 0x12, 0x0a, 0x14, 0x0a, 0x0d,
+    0x04, 0x05, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x01, 0x02, 0x00, 0x03, 0x12, 0x03, 0x6d,
+    0x15, 0x16, 0x0a, 0x13, 0x0a, 0x0c, 0x04, 0x05, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x01,
+    0x02, 0x01, 0x12, 0x03, 0x6e, 0x0a, 0x1c, 0x0a, 0x14, 0x0a, 0x0d, 0x04, 0x05, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x01, 0x02, 0x01, 0x05, 0x12, 0x03, 0x6e, 0x0a, 0x0f, 0x0a, 0x14, 0x0a,
+    0x0d, 0x04, 0x05, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x01, 0x02, 0x01, 0x01, 0x12, 0x03,
+    0x6e, 0x10, 0x17, 0x0a, 0x14, 0x0a, 0x0d, 0x04, 0x05, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x01, 0x02, 0x01, 0x03, 0x12, 0x03, 0x6e, 0x1a, 0x1b, 0x0a, 0x12, 0x0a, 0x0a, 0x04, 0x05, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x08, 0x00, 0x12, 0x04, 0x70, 0x08, 0x73, 0x09, 0x0a, 0x12, 0x0a,
+    0x0b, 0x04, 0x05, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x08, 0x00, 0x01, 0x12, 0x03, 0x70, 0x0e,
+    0x15, 0x0a, 0x11, 0x0a, 0x0a, 0x04, 0x05, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x02, 0x00, 0x12,
+    0x03, 0x71, 0x0a, 0x2d, 0x0a, 0x12, 0x0a, 0x0b, 0x04, 0x05, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00,
+    0x02, 0x00, 0x06, 0x12, 0x03, 0x71, 0x0a, 0x18, 0x0a, 0x12, 0x0a, 0x0b, 0x04, 0x05, 0x03, 0x00,
+    0x03, 0x00, 0x03, 0x00, 0x02, 0x00, 0x01, 0x12, 0x03, 0x71, 0x19, 0x28, 0x0a, 0x12, 0x0a, 0x0b,
+    0x04, 0x05, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x02, 0x00, 0x03, 0x12, 0x03, 0x71, 0x2b, 0x2c,
+    0x0a, 0x11, 0x0a, 0x0a, 0x04, 0x05, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x02, 0x01, 0x12, 0x03,
+    0x72, 0x0a, 0x16, 0x0a, 0x12, 0x0a, 0x0b, 0x04, 0x05, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x02,
+    0x01, 0x06, 0x12, 0x03, 0x72, 0x0a, 0x0d, 0x0a, 0x12, 0x0a, 0x0b, 0x04, 0x05, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x02, 0x01, 0x01, 0x12, 0x03, 0x72, 0x0e, 0x11, 0x0a, 0x12, 0x0a, 0x0b, 0x04,
+    0x05, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x02, 0x01, 0x03, 0x12, 0x03, 0x72, 0x14, 0x15, 0x0a,
+    0x0f, 0x0a, 0x08, 0x04, 0x05, 0x03, 0x00, 0x03, 0x00, 0x02, 0x02, 0x12, 0x03, 0x76, 0x06, 0x1c,
+    0x0a, 0x10, 0x0a, 0x09, 0x04, 0x05, 0x03, 0x00, 0x03, 0x00, 0x02, 0x02, 0x04, 0x12, 0x03, 0x76,
+    0x06, 0x0e, 0x0a, 0x10, 0x0a, 0x09, 0x04, 0x05, 0x03, 0x00, 0x03, 0x00, 0x02, 0x02, 0x06, 0x12,
+    0x03, 0x76, 0x0f, 0x12, 0x0a, 0x10, 0x0a, 0x09, 0x04, 0x05, 0x03, 0x00, 0x03, 0x00, 0x02, 0x02,
+    0x01, 0x12, 0x03, 0x76, 0x13, 0x17, 0x0a, 0x10, 0x0a, 0x09, 0x04, 0x05, 0x03, 0x00, 0x03, 0x00,
+    0x02, 0x02, 0x03, 0x12, 0x03, 0x76, 0x1a, 0x1b, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x05, 0x03, 0x00,
+    0x03, 0x01, 0x12, 0x04, 0x78, 0x04, 0x7c, 0x05, 0x0a, 0x0e, 0x0a, 0x07, 0x04, 0x05, 0x03, 0x00,
+    0x03, 0x01, 0x01, 0x12, 0x03, 0x78, 0x0c, 0x26, 0x0a, 0x0f, 0x0a, 0x08, 0x04, 0x05, 0x03, 0x00,
+    0x03, 0x01, 0x02, 0x00, 0x12, 0x03, 0x79, 0x06, 0x29, 0x0a, 0x10, 0x0a, 0x09, 0x04, 0x05, 0x03,
+    0x00, 0x03, 0x01, 0x02, 0x00, 0x04, 0x12, 0x03, 0x79, 0x06, 0x0e, 0x0a, 0x10, 0x0a, 0x09, 0x04,
+    0x05, 0x03, 0x00, 0x03, 0x01, 0x02, 0x00, 0x05, 0x12, 0x03, 0x79, 0x0f, 0x15, 0x0a, 0x10, 0x0a,
+    0x09, 0x04, 0x05, 0x03, 0x00, 0x03, 0x01, 0x02, 0x00, 0x01, 0x12, 0x03, 0x79, 0x16, 0x24, 0x0a,
+    0x10, 0x0a, 0x09, 0x04, 0x05, 0x03, 0x00, 0x03, 0x01, 0x02, 0x00, 0x03, 0x12, 0x03, 0x79, 0x27,
+    0x28, 0x0a, 0x1e, 0x0a, 0x08, 0x04, 0x05, 0x03, 0x00, 0x03, 0x01, 0x02, 0x01, 0x12, 0x03, 0x7b,
+    0x06, 0x14, 0x1a, 0x0d, 0x20, 0x48, 0x65, 0x78, 0x54, 0x6f, 0x42, 0x79, 0x74, 0x65, 0x73, 0x2e,
+    0x0a, 0x0a, 0x10, 0x0a, 0x09, 0x04, 0x05, 0x03, 0x00, 0x03, 0x01, 0x02, 0x01, 0x05, 0x12, 0x03,
+    0x7b, 0x06, 0x0b, 0x0a, 0x10, 0x0a, 0x09, 0x04, 0x05, 0x03, 0x00, 0x03, 0x01, 0x02, 0x01, 0x01,
+    0x12, 0x03, 0x7b, 0x0c, 0x0f, 0x0a, 0x10, 0x0a, 0x09, 0x04, 0x05, 0x03, 0x00, 0x03, 0x01, 0x02,
+    0x01, 0x03, 0x12, 0x03, 0x7b, 0x12, 0x13, 0x0a, 0x0f, 0x0a, 0x06, 0x04, 0x05, 0x03, 0x00, 0x03,
+    0x02, 0x12, 0x05, 0x7d, 0x04, 0x80, 0x01, 0x05, 0x0a, 0x0e, 0x0a, 0x07, 0x04, 0x05, 0x03, 0x00,
+    0x03, 0x02, 0x01, 0x12, 0x03, 0x7d, 0x0c, 0x21, 0x0a, 0x0f, 0x0a, 0x08, 0x04, 0x05, 0x03, 0x00,
+    0x03, 0x02, 0x02, 0x00, 0x12, 0x03, 0x7e, 0x06, 0x26, 0x0a, 0x10, 0x0a, 0x09, 0x04, 0x05, 0x03,
+    0x00, 0x03, 0x02, 0x02, 0x00, 0x06, 0x12, 0x03, 0x7e, 0x06, 0x1a, 0x0a, 0x10, 0x0a, 0x09, 0x04,
+    0x05, 0x03, 0x00, 0x03, 0x02, 0x02, 0x00, 0x01, 0x12, 0x03, 0x7e, 0x1b, 0x21, 0x0a, 0x10, 0x0a,
+    0x09, 0x04, 0x05, 0x03, 0x00, 0x03, 0x02, 0x02, 0x00, 0x03, 0x12, 0x03, 0x7e, 0x24, 0x25, 0x0a,
+    0x0f, 0x0a, 0x08, 0x04, 0x05, 0x03, 0x00, 0x03, 0x02, 0x02, 0x01, 0x12, 0x03, 0x7f, 0x06, 0x2f,
+    0x0a, 0x10, 0x0a, 0x09, 0x04, 0x05, 0x03, 0x00, 0x03, 0x02, 0x02, 0x01, 0x06, 0x12, 0x03, 0x7f,
+    0x06, 0x20, 0x0a, 0x10, 0x0a, 0x09, 0x04, 0x05, 0x03, 0x00, 0x03, 0x02, 0x02, 0x01, 0x01, 0x12,
+    0x03, 0x7f, 0x21, 0x2a, 0x0a, 0x10, 0x0a, 0x09, 0x04, 0x05, 0x03, 0x00, 0x03, 0x02, 0x02, 0x01,
+    0x03, 0x12, 0x03, 0x7f, 0x2d, 0x2e, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x05, 0x03, 0x00, 0x02, 0x00,
+    0x12, 0x04, 0x81, 0x01, 0x04, 0x36, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x05, 0x03, 0x00, 0x02, 0x00,
+    0x06, 0x12, 0x04, 0x81, 0x01, 0x04, 0x19, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x05, 0x03, 0x00, 0x02,
+    0x00, 0x01, 0x12, 0x04, 0x81, 0x01, 0x1a, 0x31, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x05, 0x03, 0x00,
+    0x02, 0x00, 0x03, 0x12, 0x04, 0x81, 0x01, 0x34, 0x35, 0x0a, 0x0e, 0x0a, 0x04, 0x04, 0x05, 0x03,
+    0x01, 0x12, 0x06, 0x84, 0x01, 0x02, 0x8b, 0x01, 0x03, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x05, 0x03,
+    0x01, 0x01, 0x12, 0x04, 0x84, 0x01, 0x0a, 0x13, 0x0a, 0x10, 0x0a, 0x06, 0x04, 0x05, 0x03, 0x01,
+    0x03, 0x00, 0x12, 0x06, 0x85, 0x01, 0x04, 0x89, 0x01, 0x05, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x05,
+    0x03, 0x01, 0x03, 0x00, 0x01, 0x12, 0x04, 0x85, 0x01, 0x0c, 0x19, 0x0a, 0x10, 0x0a, 0x08, 0x04,
+    0x05, 0x03, 0x01, 0x03, 0x00, 0x02, 0x00, 0x12, 0x04, 0x86, 0x01, 0x06, 0x17, 0x0a, 0x11, 0x0a,
+    0x09, 0x04, 0x05, 0x03, 0x01, 0x03, 0x00, 0x02, 0x00, 0x05, 0x12, 0x04, 0x86, 0x01, 0x06, 0x0c,
+    0x0a, 0x11, 0x0a, 0x09, 0x04, 0x05, 0x03, 0x01, 0x03, 0x00, 0x02, 0x00, 0x01, 0x12, 0x04, 0x86,
+    0x01, 0x0d, 0x12, 0x0a, 0x11, 0x0a, 0x09, 0x04, 0x05, 0x03, 0x01, 0x03, 0x00, 0x02, 0x00, 0x03,
+    0x12, 0x04, 0x86, 0x01, 0x15, 0x16, 0x0a, 0x10, 0x0a, 0x08, 0x04, 0x05, 0x03, 0x01, 0x03, 0x00,
+    0x02, 0x01, 0x12, 0x04, 0x87, 0x01, 0x06, 0x18, 0x0a, 0x11, 0x0a, 0x09, 0x04, 0x05, 0x03, 0x01,
+    0x03, 0x00, 0x02, 0x01, 0x05, 0x12, 0x04, 0x87, 0x01, 0x06, 0x0c, 0x0a, 0x11, 0x0a, 0x09, 0x04,
+    0x05, 0x03, 0x01, 0x03, 0x00, 0x02, 0x01, 0x01, 0x12, 0x04, 0x87, 0x01, 0x0d, 0x13, 0x0a, 0x11,
+    0x0a, 0x09, 0x04, 0x05, 0x03, 0x01, 0x03, 0x00, 0x02, 0x01, 0x03, 0x12, 0x04, 0x87, 0x01, 0x16,
+    0x17, 0x0a, 0x10, 0x0a, 0x08, 0x04, 0x05, 0x03, 0x01, 0x03, 0x00, 0x02, 0x02, 0x12, 0x04, 0x88,
+    0x01, 0x06, 0x18, 0x0a, 0x11, 0x0a, 0x09, 0x04, 0x05, 0x03, 0x01, 0x03, 0x00, 0x02, 0x02, 0x05,
+    0x12, 0x04, 0x88, 0x01, 0x06, 0x0b, 0x0a, 0x11, 0x0a, 0x09, 0x04, 0x05, 0x03, 0x01, 0x03, 0x00,
+    0x02, 0x02, 0x01, 0x12, 0x04, 0x88, 0x01, 0x0c, 0x13, 0x0a, 0x11, 0x0a, 0x09, 0x04, 0x05, 0x03,
+    0x01, 0x03, 0x00, 0x02, 0x02, 0x03, 0x12, 0x04, 0x88, 0x01, 0x16, 0x17, 0x0a, 0x0e, 0x0a, 0x06,
+    0x04, 0x05, 0x03, 0x01, 0x02, 0x00, 0x12, 0x04, 0x8a, 0x01, 0x04, 0x25, 0x0a, 0x0f, 0x0a, 0x07,
+    0x04, 0x05, 0x03, 0x01, 0x02, 0x00, 0x06, 0x12, 0x04, 0x8a, 0x01, 0x04, 0x11, 0x0a, 0x0f, 0x0a,
+    0x07, 0x04, 0x05, 0x03, 0x01, 0x02, 0x00, 0x01, 0x12, 0x04, 0x8a, 0x01, 0x12, 0x20, 0x0a, 0x0f,
+    0x0a, 0x07, 0x04, 0x05, 0x03, 0x01, 0x02, 0x00, 0x03, 0x12, 0x04, 0x8a, 0x01, 0x23, 0x24, 0x0a,
+    0x0c, 0x0a, 0x04, 0x04, 0x05, 0x02, 0x02, 0x12, 0x04, 0x8d, 0x01, 0x02, 0x1c, 0x0a, 0x0d, 0x0a,
+    0x05, 0x04, 0x05, 0x02, 0x02, 0x04, 0x12, 0x04, 0x8d, 0x01, 0x02, 0x0a, 0x0a, 0x0d, 0x0a, 0x05,
+    0x04, 0x05, 0x02, 0x02, 0x06, 0x12, 0x04, 0x8d, 0x01, 0x0b, 0x10, 0x0a, 0x0d, 0x0a, 0x05, 0x04,
+    0x05, 0x02, 0x02, 0x01, 0x12, 0x04, 0x8d, 0x01, 0x11, 0x17, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x05,
+    0x02, 0x02, 0x03, 0x12, 0x04, 0x8d, 0x01, 0x1a, 0x1b, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x06, 0x12,
+    0x06, 0x90, 0x01, 0x00, 0x92, 0x01, 0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x06, 0x01, 0x12, 0x04,
+    0x90, 0x01, 0x08, 0x20, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x06, 0x02, 0x00, 0x12, 0x04, 0x91, 0x01,
+    0x02, 0x2b, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x06, 0x02, 0x00, 0x04, 0x12, 0x04, 0x91, 0x01, 0x02,
+    0x0a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x06, 0x02, 0x00, 0x06, 0x12, 0x04, 0x91, 0x01, 0x0b, 0x17,
+    0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x06, 0x02, 0x00, 0x01, 0x12, 0x04, 0x91, 0x01, 0x18, 0x26, 0x0a,
+    0x0d, 0x0a, 0x05, 0x04, 0x06, 0x02, 0x00, 0x03, 0x12, 0x04, 0x91, 0x01, 0x29, 0x2a, 0x0a, 0x0c,
+    0x0a, 0x02, 0x04, 0x07, 0x12, 0x06, 0x94, 0x01, 0x00, 0x99, 0x01, 0x01, 0x0a, 0x0b, 0x0a, 0x03,
+    0x04, 0x07, 0x01, 0x12, 0x04, 0x94, 0x01, 0x08, 0x14, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x07, 0x02,
+    0x00, 0x12, 0x04, 0x95, 0x01, 0x02, 0x23, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x07, 0x02, 0x00, 0x05,
+    0x12, 0x04, 0x95, 0x01, 0x02, 0x06, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x07, 0x02, 0x00, 0x01, 0x12,
+    0x04, 0x95, 0x01, 0x07, 0x1e, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x07, 0x02, 0x00, 0x03, 0x12, 0x04,
+    0x95, 0x01, 0x21, 0x22, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x07, 0x02, 0x01, 0x12, 0x04, 0x96, 0x01,
+    0x02, 0x26, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x07, 0x02, 0x01, 0x05, 0x12, 0x04, 0x96, 0x01, 0x02,
+    0x06, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x07, 0x02, 0x01, 0x01, 0x12, 0x04, 0x96, 0x01, 0x07, 0x21,
+    0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x07, 0x02, 0x01, 0x03, 0x12, 0x04, 0x96, 0x01, 0x24, 0x25, 0x0a,
+    0x0c, 0x0a, 0x04, 0x04, 0x07, 0x02, 0x02, 0x12, 0x04, 0x97, 0x01, 0x02, 0x2d, 0x0a, 0x0d, 0x0a,
+    0x05, 0x04, 0x07, 0x02, 0x02, 0x05, 0x12, 0x04, 0x97, 0x01, 0x02, 0x08, 0x0a, 0x0d, 0x0a, 0x05,
+    0x04, 0x07, 0x02, 0x02, 0x01, 0x12, 0x04, 0x97, 0x01, 0x09, 0x28, 0x0a, 0x0d, 0x0a, 0x05, 0x04,
+    0x07, 0x02, 0x02, 0x03, 0x12, 0x04, 0x97, 0x01, 0x2b, 0x2c, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x07,
+    0x02, 0x03, 0x12, 0x04, 0x98, 0x01, 0x02, 0x26, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x07, 0x02, 0x03,
+    0x05, 0x12, 0x04, 0x98, 0x01, 0x02, 0x08, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x07, 0x02, 0x03, 0x01,
+    0x12, 0x04, 0x98, 0x01, 0x09, 0x21, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x07, 0x02, 0x03, 0x03, 0x12,
+    0x04, 0x98, 0x01, 0x24, 0x25, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x08, 0x12, 0x06, 0x9b, 0x01, 0x00,
+    0x9e, 0x01, 0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x08, 0x01, 0x12, 0x04, 0x9b, 0x01, 0x08, 0x17,
+    0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x08, 0x02, 0x00, 0x12, 0x04, 0x9c, 0x01, 0x02, 0x25, 0x0a, 0x0d,
+    0x0a, 0x05, 0x04, 0x08, 0x02, 0x00, 0x06, 0x12, 0x04, 0x9c, 0x01, 0x02, 0x18, 0x0a, 0x0d, 0x0a,
+    0x05, 0x04, 0x08, 0x02, 0x00, 0x01, 0x12, 0x04, 0x9c, 0x01, 0x19, 0x20, 0x0a, 0x0d, 0x0a, 0x05,
+    0x04, 0x08, 0x02, 0x00, 0x03, 0x12, 0x04, 0x9c, 0x01, 0x23, 0x24, 0x0a, 0x0c, 0x0a, 0x04, 0x04,
+    0x08, 0x02, 0x01, 0x12, 0x04, 0x9d, 0x01, 0x02, 0x1c, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x08, 0x02,
+    0x01, 0x04, 0x12, 0x04, 0x9d, 0x01, 0x02, 0x0a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x08, 0x02, 0x01,
+    0x06, 0x12, 0x04, 0x9d, 0x01, 0x0b, 0x10, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x08, 0x02, 0x01, 0x01,
+    0x12, 0x04, 0x9d, 0x01, 0x11, 0x17, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x08, 0x02, 0x01, 0x03, 0x12,
+    0x04, 0x9d, 0x01, 0x1a, 0x1b, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x09, 0x12, 0x06, 0xa0, 0x01, 0x00,
+    0xa6, 0x01, 0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x09, 0x01, 0x12, 0x04, 0xa0, 0x01, 0x08, 0x0d,
+    0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x09, 0x02, 0x00, 0x12, 0x04, 0xa1, 0x01, 0x02, 0x13, 0x0a, 0x0d,
+    0x0a, 0x05, 0x04, 0x09, 0x02, 0x00, 0x06, 0x12, 0x04, 0xa1, 0x01, 0x02, 0x0a, 0x0a, 0x0d, 0x0a,
+    0x05, 0x04, 0x09, 0x02, 0x00, 0x01, 0x12, 0x04, 0xa1, 0x01, 0x0b, 0x0e, 0x0a, 0x0d, 0x0a, 0x05,
+    0x04, 0x09, 0x02, 0x00, 0x03, 0x12, 0x04, 0xa1, 0x01, 0x11, 0x12, 0x0a, 0x0c, 0x0a, 0x04, 0x04,
+    0x09, 0x02, 0x01, 0x12, 0x04, 0xa2, 0x01, 0x02, 0x32, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x09, 0x02,
+    0x01, 0x05, 0x12, 0x04, 0xa2, 0x01, 0x02, 0x08, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x09, 0x02, 0x01,
+    0x01, 0x12, 0x04, 0xa2, 0x01, 0x09, 0x18, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x09, 0x02, 0x01, 0x03,
+    0x12, 0x04, 0xa2, 0x01, 0x1b, 0x1c, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x09, 0x02, 0x01, 0x08, 0x12,
+    0x04, 0xa2, 0x01, 0x1d, 0x31, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x09, 0x02, 0x01, 0x08, 0x06, 0x12,
+    0x04, 0xa2, 0x01, 0x1e, 0x30, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x09, 0x02, 0x02, 0x12, 0x04, 0xa3,
+    0x01, 0x02, 0x14, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x09, 0x02, 0x02, 0x06, 0x12, 0x04, 0xa3, 0x01,
+    0x02, 0x0a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x09, 0x02, 0x02, 0x01, 0x12, 0x04, 0xa3, 0x01, 0x0b,
+    0x0f, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x09, 0x02, 0x02, 0x03, 0x12, 0x04, 0xa3, 0x01, 0x12, 0x13,
+    0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x09, 0x02, 0x03, 0x12, 0x04, 0xa4, 0x01, 0x02, 0x16, 0x0a, 0x0d,
+    0x0a, 0x05, 0x04, 0x09, 0x02, 0x03, 0x05, 0x12, 0x04, 0xa4, 0x01, 0x02, 0x08, 0x0a, 0x0d, 0x0a,
+    0x05, 0x04, 0x09, 0x02, 0x03, 0x01, 0x12, 0x04, 0xa4, 0x01, 0x09, 0x11, 0x0a, 0x0d, 0x0a, 0x05,
+    0x04, 0x09, 0x02, 0x03, 0x03, 0x12, 0x04, 0xa4, 0x01, 0x14, 0x15, 0x0a, 0x0c, 0x0a, 0x04, 0x04,
+    0x09, 0x02, 0x04, 0x12, 0x04, 0xa5, 0x01, 0x02, 0x12, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x09, 0x02,
+    0x04, 0x05, 0x12, 0x04, 0xa5, 0x01, 0x02, 0x08, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x09, 0x02, 0x04,
+    0x01, 0x12, 0x04, 0xa5, 0x01, 0x09, 0x0d, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x09, 0x02, 0x04, 0x03,
+    0x12, 0x04, 0xa5, 0x01, 0x10, 0x11, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x0a, 0x12, 0x06, 0xa8, 0x01,
+    0x00, 0xb2, 0x01, 0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x0a, 0x01, 0x12, 0x04, 0xa8, 0x01, 0x08,
+    0x17, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x0a, 0x02, 0x00, 0x12, 0x04, 0xa9, 0x01, 0x02, 0x11, 0x0a,
+    0x0d, 0x0a, 0x05, 0x04, 0x0a, 0x02, 0x00, 0x05, 0x12, 0x04, 0xa9, 0x01, 0x02, 0x07, 0x0a, 0x0d,
+    0x0a, 0x05, 0x04, 0x0a, 0x02, 0x00, 0x01, 0x12, 0x04, 0xa9, 0x01, 0x08, 0x0c, 0x0a, 0x0d, 0x0a,
+    0x05, 0x04, 0x0a, 0x02, 0x00, 0x03, 0x12, 0x04, 0xa9, 0x01, 0x0f, 0x10, 0x0a, 0x0c, 0x0a, 0x04,
+    0x04, 0x0a, 0x02, 0x01, 0x12, 0x04, 0xaa, 0x01, 0x02, 0x1e, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0a,
+    0x02, 0x01, 0x05, 0x12, 0x04, 0xaa, 0x01, 0x02, 0x07, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0a, 0x02,
+    0x01, 0x01, 0x12, 0x04, 0xaa, 0x01, 0x08, 0x19, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0a, 0x02, 0x01,
+    0x03, 0x12, 0x04, 0xaa, 0x01, 0x1c, 0x1d, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x0a, 0x02, 0x02, 0x12,
+    0x04, 0xab, 0x01, 0x02, 0x1c, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0a, 0x02, 0x02, 0x05, 0x12, 0x04,
+    0xab, 0x01, 0x02, 0x07, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0a, 0x02, 0x02, 0x01, 0x12, 0x04, 0xab,
+    0x01, 0x08, 0x17, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0a, 0x02, 0x02, 0x03, 0x12, 0x04, 0xab, 0x01,
+    0x1a, 0x1b, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x0a, 0x02, 0x03, 0x12, 0x04, 0xac, 0x01, 0x02, 0x2b,
+    0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0a, 0x02, 0x03, 0x04, 0x12, 0x04, 0xac, 0x01, 0x02, 0x0a, 0x0a,
+    0x0d, 0x0a, 0x05, 0x04, 0x0a, 0x02, 0x03, 0x05, 0x12, 0x04, 0xac, 0x01, 0x0b, 0x10, 0x0a, 0x0d,
+    0x0a, 0x05, 0x04, 0x0a, 0x02, 0x03, 0x01, 0x12, 0x04, 0xac, 0x01, 0x11, 0x26, 0x0a, 0x0d, 0x0a,
+    0x05, 0x04, 0x0a, 0x02, 0x03, 0x03, 0x12, 0x04, 0xac, 0x01, 0x29, 0x2a, 0x0a, 0x0c, 0x0a, 0x04,
+    0x04, 0x0a, 0x02, 0x04, 0x12, 0x04, 0xad, 0x01, 0x02, 0x2b, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0a,
+    0x02, 0x04, 0x05, 0x12, 0x04, 0xad, 0x01, 0x02, 0x08, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0a, 0x02,
+    0x04, 0x01, 0x12, 0x04, 0xad, 0x01, 0x09, 0x11, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0a, 0x02, 0x04,
+    0x03, 0x12, 0x04, 0xad, 0x01, 0x14, 0x15, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0a, 0x02, 0x04, 0x08,
+    0x12, 0x04, 0xad, 0x01, 0x16, 0x2a, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x0a, 0x02, 0x04, 0x08, 0x06,
+    0x12, 0x04, 0xad, 0x01, 0x17, 0x29, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x0a, 0x02, 0x05, 0x12, 0x04,
+    0xae, 0x01, 0x02, 0x13, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0a, 0x02, 0x05, 0x05, 0x12, 0x04, 0xae,
+    0x01, 0x02, 0x06, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0a, 0x02, 0x05, 0x01, 0x12, 0x04, 0xae, 0x01,
+    0x07, 0x0e, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0a, 0x02, 0x05, 0x03, 0x12, 0x04, 0xae, 0x01, 0x11,
+    0x12, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x0a, 0x02, 0x06, 0x12, 0x04, 0xaf, 0x01, 0x02, 0x17, 0x0a,
+    0x0d, 0x0a, 0x05, 0x04, 0x0a, 0x02, 0x06, 0x05, 0x12, 0x04, 0xaf, 0x01, 0x02, 0x08, 0x0a, 0x0d,
+    0x0a, 0x05, 0x04, 0x0a, 0x02, 0x06, 0x01, 0x12, 0x04, 0xaf, 0x01, 0x09, 0x12, 0x0a, 0x0d, 0x0a,
+    0x05, 0x04, 0x0a, 0x02, 0x06, 0x03, 0x12, 0x04, 0xaf, 0x01, 0x15, 0x16, 0x0a, 0x0c, 0x0a, 0x04,
+    0x04, 0x0a, 0x02, 0x07, 0x12, 0x04, 0xb0, 0x01, 0x02, 0x22, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0a,
+    0x02, 0x07, 0x05, 0x12, 0x04, 0xb0, 0x01, 0x02, 0x07, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0a, 0x02,
+    0x07, 0x01, 0x12, 0x04, 0xb0, 0x01, 0x08, 0x1d, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0a, 0x02, 0x07,
+    0x03, 0x12, 0x04, 0xb0, 0x01, 0x20, 0x21, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x0a, 0x02, 0x08, 0x12,
+    0x04, 0xb1, 0x01, 0x02, 0x26, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0a, 0x02, 0x08, 0x04, 0x12, 0x04,
+    0xb1, 0x01, 0x02, 0x0a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0a, 0x02, 0x08, 0x06, 0x12, 0x04, 0xb1,
+    0x01, 0x0b, 0x19, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0a, 0x02, 0x08, 0x01, 0x12, 0x04, 0xb1, 0x01,
+    0x1a, 0x21, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0a, 0x02, 0x08, 0x03, 0x12, 0x04, 0xb1, 0x01, 0x24,
+    0x25, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x0b, 0x12, 0x06, 0xb4, 0x01, 0x00, 0xb7, 0x01, 0x01, 0x0a,
+    0x0b, 0x0a, 0x03, 0x04, 0x0b, 0x01, 0x12, 0x04, 0xb4, 0x01, 0x08, 0x10, 0x0a, 0x0c, 0x0a, 0x04,
+    0x04, 0x0b, 0x02, 0x00, 0x12, 0x04, 0xb5, 0x01, 0x02, 0x32, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0b,
+    0x02, 0x00, 0x05, 0x12, 0x04, 0xb5, 0x01, 0x02, 0x08, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0b, 0x02,
+    0x00, 0x01, 0x12, 0x04, 0xb5, 0x01, 0x09, 0x18, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0b, 0x02, 0x00,
+    0x03, 0x12, 0x04, 0xb5, 0x01, 0x1b, 0x1c, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0b, 0x02, 0x00, 0x08,
+    0x12, 0x04, 0xb5, 0x01, 0x1d, 0x31, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x0b, 0x02, 0x00, 0x08, 0x06,
+    0x12, 0x04, 0xb5, 0x01, 0x1e, 0x30, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x0b, 0x02, 0x01, 0x12, 0x04,
+    0xb6, 0x01, 0x02, 0x1d, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0b, 0x02, 0x01, 0x05, 0x12, 0x04, 0xb6,
+    0x01, 0x02, 0x08, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0b, 0x02, 0x01, 0x01, 0x12, 0x04, 0xb6, 0x01,
+    0x09, 0x18, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0b, 0x02, 0x01, 0x03, 0x12, 0x04, 0xb6, 0x01, 0x1b,
+    0x1c, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x0c, 0x12, 0x06, 0xb9, 0x01, 0x00, 0xc1, 0x01, 0x01, 0x0a,
+    0x0b, 0x0a, 0x03, 0x04, 0x0c, 0x01, 0x12, 0x04, 0xb9, 0x01, 0x08, 0x1e, 0x0a, 0x0c, 0x0a, 0x04,
+    0x04, 0x0c, 0x02, 0x00, 0x12, 0x04, 0xba, 0x01, 0x02, 0x14, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0c,
+    0x02, 0x00, 0x05, 0x12, 0x04, 0xba, 0x01, 0x02, 0x08, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0c, 0x02,
+    0x00, 0x01, 0x12, 0x04, 0xba, 0x01, 0x09, 0x0f, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0c, 0x02, 0x00,
+    0x03, 0x12, 0x04, 0xba, 0x01, 0x12, 0x13, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x0c, 0x02, 0x01, 0x12,
+    0x04, 0xbb, 0x01, 0x02, 0x32, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0c, 0x02, 0x01, 0x05, 0x12, 0x04,
+    0xbb, 0x01, 0x02, 0x08, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0c, 0x02, 0x01, 0x01, 0x12, 0x04, 0xbb,
+    0x01, 0x09, 0x18, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0c, 0x02, 0x01, 0x03, 0x12, 0x04, 0xbb, 0x01,
+    0x1b, 0x1c, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0c, 0x02, 0x01, 0x08, 0x12, 0x04, 0xbb, 0x01, 0x1d,
+    0x31, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x0c, 0x02, 0x01, 0x08, 0x06, 0x12, 0x04, 0xbb, 0x01, 0x1e,
+    0x30, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x0c, 0x02, 0x02, 0x12, 0x04, 0xbc, 0x01, 0x02, 0x31, 0x0a,
+    0x0d, 0x0a, 0x05, 0x04, 0x0c, 0x02, 0x02, 0x05, 0x12, 0x04, 0xbc, 0x01, 0x02, 0x08, 0x0a, 0x0d,
+    0x0a, 0x05, 0x04, 0x0c, 0x02, 0x02, 0x01, 0x12, 0x04, 0xbc, 0x01, 0x09, 0x17, 0x0a, 0x0d, 0x0a,
+    0x05, 0x04, 0x0c, 0x02, 0x02, 0x03, 0x12, 0x04, 0xbc, 0x01, 0x1a, 0x1b, 0x0a, 0x0d, 0x0a, 0x05,
+    0x04, 0x0c, 0x02, 0x02, 0x08, 0x12, 0x04, 0xbc, 0x01, 0x1c, 0x30, 0x0a, 0x0e, 0x0a, 0x06, 0x04,
+    0x0c, 0x02, 0x02, 0x08, 0x06, 0x12, 0x04, 0xbc, 0x01, 0x1d, 0x2f, 0x0a, 0x0c, 0x0a, 0x04, 0x04,
+    0x0c, 0x02, 0x03, 0x12, 0x04, 0xbd, 0x01, 0x02, 0x31, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0c, 0x02,
+    0x03, 0x05, 0x12, 0x04, 0xbd, 0x01, 0x02, 0x08, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0c, 0x02, 0x03,
+    0x01, 0x12, 0x04, 0xbd, 0x01, 0x09, 0x17, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0c, 0x02, 0x03, 0x03,
+    0x12, 0x04, 0xbd, 0x01, 0x1a, 0x1b, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0c, 0x02, 0x03, 0x08, 0x12,
+    0x04, 0xbd, 0x01, 0x1c, 0x30, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x0c, 0x02, 0x03, 0x08, 0x06, 0x12,
+    0x04, 0xbd, 0x01, 0x1d, 0x2f, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x0c, 0x02, 0x04, 0x12, 0x04, 0xbe,
+    0x01, 0x02, 0x3f, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0c, 0x02, 0x04, 0x06, 0x12, 0x04, 0xbe, 0x01,
+    0x02, 0x20, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0c, 0x02, 0x04, 0x01, 0x12, 0x04, 0xbe, 0x01, 0x21,
+    0x3a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0c, 0x02, 0x04, 0x03, 0x12, 0x04, 0xbe, 0x01, 0x3d, 0x3e,
+    0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x0c, 0x02, 0x05, 0x12, 0x04, 0xbf, 0x01, 0x02, 0x21, 0x0a, 0x0d,
+    0x0a, 0x05, 0x04, 0x0c, 0x02, 0x05, 0x06, 0x12, 0x04, 0xbf, 0x01, 0x02, 0x14, 0x0a, 0x0d, 0x0a,
+    0x05, 0x04, 0x0c, 0x02, 0x05, 0x01, 0x12, 0x04, 0xbf, 0x01, 0x15, 0x1c, 0x0a, 0x0d, 0x0a, 0x05,
+    0x04, 0x0c, 0x02, 0x05, 0x03, 0x12, 0x04, 0xbf, 0x01, 0x1f, 0x20, 0x0a, 0x0c, 0x0a, 0x04, 0x04,
+    0x0c, 0x02, 0x06, 0x12, 0x04, 0xc0, 0x01, 0x02, 0x1a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0c, 0x02,
+    0x06, 0x06, 0x12, 0x04, 0xc0, 0x01, 0x02, 0x0b, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0c, 0x02, 0x06,
+    0x01, 0x12, 0x04, 0xc0, 0x01, 0x0c, 0x15, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0c, 0x02, 0x06, 0x03,
+    0x12, 0x04, 0xc0, 0x01, 0x18, 0x19, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x0d, 0x12, 0x06, 0xc3, 0x01,
+    0x00, 0xcf, 0x01, 0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x0d, 0x01, 0x12, 0x04, 0xc3, 0x01, 0x08,
+    0x10, 0x0a, 0x0e, 0x0a, 0x04, 0x04, 0x0d, 0x04, 0x00, 0x12, 0x06, 0xc4, 0x01, 0x02, 0xc8, 0x01,
+    0x03, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0d, 0x04, 0x00, 0x01, 0x12, 0x04, 0xc4, 0x01, 0x07, 0x13,
+    0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x0d, 0x04, 0x00, 0x02, 0x00, 0x12, 0x04, 0xc5, 0x01, 0x04, 0x23,
+    0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x0d, 0x04, 0x00, 0x02, 0x00, 0x01, 0x12, 0x04, 0xc5, 0x01, 0x04,
+    0x1e, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x0d, 0x04, 0x00, 0x02, 0x00, 0x02, 0x12, 0x04, 0xc5, 0x01,
+    0x21, 0x22, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x0d, 0x04, 0x00, 0x02, 0x01, 0x12, 0x04, 0xc6, 0x01,
+    0x04, 0x28, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x0d, 0x04, 0x00, 0x02, 0x01, 0x01, 0x12, 0x04, 0xc6,
+    0x01, 0x04, 0x23, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x0d, 0x04, 0x00, 0x02, 0x01, 0x02, 0x12, 0x04,
+    0xc6, 0x01, 0x26, 0x27, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x0d, 0x04, 0x00, 0x02, 0x02, 0x12, 0x04,
+    0xc7, 0x01, 0x04, 0x28, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x0d, 0x04, 0x00, 0x02, 0x02, 0x01, 0x12,
+    0x04, 0xc7, 0x01, 0x04, 0x23, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x0d, 0x04, 0x00, 0x02, 0x02, 0x02,
+    0x12, 0x04, 0xc7, 0x01, 0x26, 0x27, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x0d, 0x02, 0x00, 0x12, 0x04,
+    0xca, 0x01, 0x02, 0x22, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0d, 0x02, 0x00, 0x06, 0x12, 0x04, 0xca,
+    0x01, 0x02, 0x0e, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0d, 0x02, 0x00, 0x01, 0x12, 0x04, 0xca, 0x01,
+    0x0f, 0x1d, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0d, 0x02, 0x00, 0x03, 0x12, 0x04, 0xca, 0x01, 0x20,
+    0x21, 0x0a, 0x0e, 0x0a, 0x04, 0x04, 0x0d, 0x08, 0x00, 0x12, 0x06, 0xcb, 0x01, 0x02, 0xce, 0x01,
+    0x03, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0d, 0x08, 0x00, 0x01, 0x12, 0x04, 0xcb, 0x01, 0x08, 0x11,
+    0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x0d, 0x02, 0x01, 0x12, 0x04, 0xcc, 0x01, 0x04, 0x28, 0x0a, 0x0d,
+    0x0a, 0x05, 0x04, 0x0d, 0x02, 0x01, 0x06, 0x12, 0x04, 0xcc, 0x01, 0x04, 0x12, 0x0a, 0x0d, 0x0a,
+    0x05, 0x04, 0x0d, 0x02, 0x01, 0x01, 0x12, 0x04, 0xcc, 0x01, 0x13, 0x23, 0x0a, 0x0d, 0x0a, 0x05,
+    0x04, 0x0d, 0x02, 0x01, 0x03, 0x12, 0x04, 0xcc, 0x01, 0x26, 0x27, 0x0a, 0x0c, 0x0a, 0x04, 0x04,
+    0x0d, 0x02, 0x02, 0x12, 0x04, 0xcd, 0x01, 0x04, 0x28, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0d, 0x02,
+    0x02, 0x06, 0x12, 0x04, 0xcd, 0x01, 0x04, 0x12, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0d, 0x02, 0x02,
+    0x01, 0x12, 0x04, 0xcd, 0x01, 0x13, 0x23, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0d, 0x02, 0x02, 0x03,
+    0x12, 0x04, 0xcd, 0x01, 0x26, 0x27, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x0e, 0x12, 0x06, 0xd1, 0x01,
+    0x00, 0xd4, 0x01, 0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x0e, 0x01, 0x12, 0x04, 0xd1, 0x01, 0x08,
+    0x16, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x0e, 0x02, 0x00, 0x12, 0x04, 0xd2, 0x01, 0x02, 0x18, 0x0a,
+    0x0d, 0x0a, 0x05, 0x04, 0x0e, 0x02, 0x00, 0x05, 0x12, 0x04, 0xd2, 0x01, 0x02, 0x08, 0x0a, 0x0d,
+    0x0a, 0x05, 0x04, 0x0e, 0x02, 0x00, 0x01, 0x12, 0x04, 0xd2, 0x01, 0x09, 0x13, 0x0a, 0x0d, 0x0a,
+    0x05, 0x04, 0x0e, 0x02, 0x00, 0x03, 0x12, 0x04, 0xd2, 0x01, 0x16, 0x17, 0x0a, 0x0c, 0x0a, 0x04,
+    0x04, 0x0e, 0x02, 0x01, 0x12, 0x04, 0xd3, 0x01, 0x02, 0x1b, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0e,
+    0x02, 0x01, 0x06, 0x12, 0x04, 0xd3, 0x01, 0x02, 0x0f, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0e, 0x02,
+    0x01, 0x01, 0x12, 0x04, 0xd3, 0x01, 0x10, 0x16, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0e, 0x02, 0x01,
+    0x03, 0x12, 0x04, 0xd3, 0x01, 0x19, 0x1a, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x0f, 0x12, 0x06, 0xd6,
+    0x01, 0x00, 0xd9, 0x01, 0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x0f, 0x01, 0x12, 0x04, 0xd6, 0x01,
+    0x08, 0x16, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x0f, 0x02, 0x00, 0x12, 0x04, 0xd7, 0x01, 0x02, 0x2f,
+    0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0f, 0x02, 0x00, 0x04, 0x12, 0x04, 0xd7, 0x01, 0x02, 0x0a, 0x0a,
+    0x0d, 0x0a, 0x05, 0x04, 0x0f, 0x02, 0x00, 0x06, 0x12, 0x04, 0xd7, 0x01, 0x0b, 0x19, 0x0a, 0x0d,
+    0x0a, 0x05, 0x04, 0x0f, 0x02, 0x00, 0x01, 0x12, 0x04, 0xd7, 0x01, 0x1a, 0x2a, 0x0a, 0x0d, 0x0a,
+    0x05, 0x04, 0x0f, 0x02, 0x00, 0x03, 0x12, 0x04, 0xd7, 0x01, 0x2d, 0x2e, 0x0a, 0x0c, 0x0a, 0x04,
+    0x04, 0x0f, 0x02, 0x01, 0x12, 0x04, 0xd8, 0x01, 0x02, 0x1c, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0f,
+    0x02, 0x01, 0x04, 0x12, 0x04, 0xd8, 0x01, 0x02, 0x0a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0f, 0x02,
+    0x01, 0x06, 0x12, 0x04, 0xd8, 0x01, 0x0b, 0x10, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0f, 0x02, 0x01,
+    0x01, 0x12, 0x04, 0xd8, 0x01, 0x11, 0x17, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x0f, 0x02, 0x01, 0x03,
+    0x12, 0x04, 0xd8, 0x01, 0x1a, 0x1b, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x10, 0x12, 0x06, 0xdb, 0x01,
+    0x00, 0xf0, 0x01, 0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x10, 0x01, 0x12, 0x04, 0xdb, 0x01, 0x08,
+    0x16, 0x0a, 0x0e, 0x0a, 0x04, 0x04, 0x10, 0x04, 0x00, 0x12, 0x06, 0xdc, 0x01, 0x02, 0xe4, 0x01,
+    0x03, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x10, 0x04, 0x00, 0x01, 0x12, 0x04, 0xdc, 0x01, 0x07, 0x0b,
+    0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x10, 0x04, 0x00, 0x02, 0x00, 0x12, 0x04, 0xdd, 0x01, 0x04, 0x19,
+    0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x10, 0x04, 0x00, 0x02, 0x00, 0x01, 0x12, 0x04, 0xdd, 0x01, 0x04,
+    0x14, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x10, 0x04, 0x00, 0x02, 0x00, 0x02, 0x12, 0x04, 0xdd, 0x01,
+    0x17, 0x18, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x10, 0x04, 0x00, 0x02, 0x01, 0x12, 0x04, 0xde, 0x01,
+    0x04, 0x1b, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x10, 0x04, 0x00, 0x02, 0x01, 0x01, 0x12, 0x04, 0xde,
+    0x01, 0x04, 0x16, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x10, 0x04, 0x00, 0x02, 0x01, 0x02, 0x12, 0x04,
+    0xde, 0x01, 0x19, 0x1a, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x10, 0x04, 0x00, 0x02, 0x02, 0x12, 0x04,
+    0xdf, 0x01, 0x04, 0x1d, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x10, 0x04, 0x00, 0x02, 0x02, 0x01, 0x12,
+    0x04, 0xdf, 0x01, 0x04, 0x18, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x10, 0x04, 0x00, 0x02, 0x02, 0x02,
+    0x12, 0x04, 0xdf, 0x01, 0x1b, 0x1c, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x10, 0x04, 0x00, 0x02, 0x03,
+    0x12, 0x04, 0xe0, 0x01, 0x04, 0x1f, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x10, 0x04, 0x00, 0x02, 0x03,
+    0x01, 0x12, 0x04, 0xe0, 0x01, 0x04, 0x1a, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x10, 0x04, 0x00, 0x02,
+    0x03, 0x02, 0x12, 0x04, 0xe0, 0x01, 0x1d, 0x1e, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x10, 0x04, 0x00,
+    0x02, 0x04, 0x12, 0x04, 0xe1, 0x01, 0x04, 0x1a, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x10, 0x04, 0x00,
+    0x02, 0x04, 0x01, 0x12, 0x04, 0xe1, 0x01, 0x04, 0x15, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x10, 0x04,
+    0x00, 0x02, 0x04, 0x02, 0x12, 0x04, 0xe1, 0x01, 0x18, 0x19, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x10,
+    0x04, 0x00, 0x02, 0x05, 0x12, 0x04, 0xe2, 0x01, 0x04, 0x1c, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x10,
+    0x04, 0x00, 0x02, 0x05, 0x01, 0x12, 0x04, 0xe2, 0x01, 0x04, 0x17, 0x0a, 0x0f, 0x0a, 0x07, 0x04,
+    0x10, 0x04, 0x00, 0x02, 0x05, 0x02, 0x12, 0x04, 0xe2, 0x01, 0x1a, 0x1b, 0x0a, 0x0e, 0x0a, 0x06,
+    0x04, 0x10, 0x04, 0x00, 0x02, 0x06, 0x12, 0x04, 0xe3, 0x01, 0x04, 0x1e, 0x0a, 0x0f, 0x0a, 0x07,
+    0x04, 0x10, 0x04, 0x00, 0x02, 0x06, 0x01, 0x12, 0x04, 0xe3, 0x01, 0x04, 0x19, 0x0a, 0x0f, 0x0a,
+    0x07, 0x04, 0x10, 0x04, 0x00, 0x02, 0x06, 0x02, 0x12, 0x04, 0xe3, 0x01, 0x1c, 0x1d, 0x0a, 0x0c,
+    0x0a, 0x04, 0x04, 0x10, 0x02, 0x00, 0x12, 0x04, 0xe6, 0x01, 0x02, 0x10, 0x0a, 0x0d, 0x0a, 0x05,
+    0x04, 0x10, 0x02, 0x00, 0x06, 0x12, 0x04, 0xe6, 0x01, 0x02, 0x06, 0x0a, 0x0d, 0x0a, 0x05, 0x04,
+    0x10, 0x02, 0x00, 0x01, 0x12, 0x04, 0xe6, 0x01, 0x07, 0x0b, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x10,
+    0x02, 0x00, 0x03, 0x12, 0x04, 0xe6, 0x01, 0x0e, 0x0f, 0x0a, 0x0e, 0x0a, 0x04, 0x04, 0x10, 0x08,
+    0x00, 0x12, 0x06, 0xe8, 0x01, 0x02, 0xef, 0x01, 0x03, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x10, 0x08,
+    0x00, 0x01, 0x12, 0x04, 0xe8, 0x01, 0x08, 0x0e, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x10, 0x02, 0x01,
+    0x12, 0x04, 0xe9, 0x01, 0x04, 0x23, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x10, 0x02, 0x01, 0x06, 0x12,
+    0x04, 0xe9, 0x01, 0x04, 0x10, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x10, 0x02, 0x01, 0x01, 0x12, 0x04,
+    0xe9, 0x01, 0x11, 0x1e, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x10, 0x02, 0x01, 0x03, 0x12, 0x04, 0xe9,
+    0x01, 0x21, 0x22, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x10, 0x02, 0x02, 0x12, 0x04, 0xea, 0x01, 0x04,
+    0x27, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x10, 0x02, 0x02, 0x06, 0x12, 0x04, 0xea, 0x01, 0x04, 0x12,
+    0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x10, 0x02, 0x02, 0x01, 0x12, 0x04, 0xea, 0x01, 0x13, 0x22, 0x0a,
+    0x0d, 0x0a, 0x05, 0x04, 0x10, 0x02, 0x02, 0x03, 0x12, 0x04, 0xea, 0x01, 0x25, 0x26, 0x0a, 0x0c,
+    0x0a, 0x04, 0x04, 0x10, 0x02, 0x03, 0x12, 0x04, 0xeb, 0x01, 0x04, 0x2a, 0x0a, 0x0d, 0x0a, 0x05,
+    0x04, 0x10, 0x02, 0x03, 0x06, 0x12, 0x04, 0xeb, 0x01, 0x04, 0x13, 0x0a, 0x0d, 0x0a, 0x05, 0x04,
+    0x10, 0x02, 0x03, 0x01, 0x12, 0x04, 0xeb, 0x01, 0x14, 0x25, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x10,
+    0x02, 0x03, 0x03, 0x12, 0x04, 0xeb, 0x01, 0x28, 0x29, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x10, 0x02,
+    0x04, 0x12, 0x04, 0xec, 0x01, 0x04, 0x21, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x10, 0x02, 0x04, 0x06,
+    0x12, 0x04, 0xec, 0x01, 0x04, 0x0f, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x10, 0x02, 0x04, 0x01, 0x12,
+    0x04, 0xec, 0x01, 0x10, 0x1c, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x10, 0x02, 0x04, 0x03, 0x12, 0x04,
+    0xec, 0x01, 0x1f, 0x20, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x10, 0x02, 0x05, 0x12, 0x04, 0xed, 0x01,
+    0x04, 0x25, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x10, 0x02, 0x05, 0x06, 0x12, 0x04, 0xed, 0x01, 0x04,
+    0x11, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x10, 0x02, 0x05, 0x01, 0x12, 0x04, 0xed, 0x01, 0x12, 0x20,
+    0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x10, 0x02, 0x05, 0x03, 0x12, 0x04, 0xed, 0x01, 0x23, 0x24, 0x0a,
+    0x0c, 0x0a, 0x04, 0x04, 0x10, 0x02, 0x06, 0x12, 0x04, 0xee, 0x01, 0x04, 0x28, 0x0a, 0x0d, 0x0a,
+    0x05, 0x04, 0x10, 0x02, 0x06, 0x06, 0x12, 0x04, 0xee, 0x01, 0x04, 0x12, 0x0a, 0x0d, 0x0a, 0x05,
+    0x04, 0x10, 0x02, 0x06, 0x01, 0x12, 0x04, 0xee, 0x01, 0x13, 0x23, 0x0a, 0x0d, 0x0a, 0x05, 0x04,
+    0x10, 0x02, 0x06, 0x03, 0x12, 0x04, 0xee, 0x01, 0x26, 0x27, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x11,
+    0x12, 0x06, 0xf2, 0x01, 0x00, 0xf6, 0x01, 0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x11, 0x01, 0x12,
+    0x04, 0xf2, 0x01, 0x08, 0x14, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x11, 0x02, 0x00, 0x12, 0x04, 0xf3,
+    0x01, 0x02, 0x15, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x11, 0x02, 0x00, 0x05, 0x12, 0x04, 0xf3, 0x01,
+    0x02, 0x08, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x11, 0x02, 0x00, 0x01, 0x12, 0x04, 0xf3, 0x01, 0x09,
+    0x10, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x11, 0x02, 0x00, 0x03, 0x12, 0x04, 0xf3, 0x01, 0x13, 0x14,
+    0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x11, 0x02, 0x01, 0x12, 0x04, 0xf4, 0x01, 0x02, 0x1b, 0x0a, 0x0d,
+    0x0a, 0x05, 0x04, 0x11, 0x02, 0x01, 0x05, 0x12, 0x04, 0xf4, 0x01, 0x02, 0x07, 0x0a, 0x0d, 0x0a,
+    0x05, 0x04, 0x11, 0x02, 0x01, 0x01, 0x12, 0x04, 0xf4, 0x01, 0x08, 0x16, 0x0a, 0x0d, 0x0a, 0x05,
+    0x04, 0x11, 0x02, 0x01, 0x03, 0x12, 0x04, 0xf4, 0x01, 0x19, 0x1a, 0x0a, 0x0c, 0x0a, 0x04, 0x04,
+    0x11, 0x02, 0x02, 0x12, 0x04, 0xf5, 0x01, 0x02, 0x1a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x11, 0x02,
+    0x02, 0x06, 0x12, 0x04, 0xf5, 0x01, 0x02, 0x0e, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x11, 0x02, 0x02,
+    0x01, 0x12, 0x04, 0xf5, 0x01, 0x0f, 0x15, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x11, 0x02, 0x02, 0x03,
+    0x12, 0x04, 0xf5, 0x01, 0x18, 0x19, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x12, 0x12, 0x06, 0xf8, 0x01,
+    0x00, 0xfd, 0x01, 0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x12, 0x01, 0x12, 0x04, 0xf8, 0x01, 0x08,
+    0x16, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x12, 0x02, 0x00, 0x12, 0x04, 0xf9, 0x01, 0x02, 0x15, 0x0a,
+    0x0d, 0x0a, 0x05, 0x04, 0x12, 0x02, 0x00, 0x05, 0x12, 0x04, 0xf9, 0x01, 0x02, 0x08, 0x0a, 0x0d,
+    0x0a, 0x05, 0x04, 0x12, 0x02, 0x00, 0x01, 0x12, 0x04, 0xf9, 0x01, 0x09, 0x10, 0x0a, 0x0d, 0x0a,
+    0x05, 0x04, 0x12, 0x02, 0x00, 0x03, 0x12, 0x04, 0xf9, 0x01, 0x13, 0x14, 0x0a, 0x0c, 0x0a, 0x04,
+    0x04, 0x12, 0x02, 0x01, 0x12, 0x04, 0xfa, 0x01, 0x02, 0x1b, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x12,
+    0x02, 0x01, 0x05, 0x12, 0x04, 0xfa, 0x01, 0x02, 0x07, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x12, 0x02,
+    0x01, 0x01, 0x12, 0x04, 0xfa, 0x01, 0x08, 0x16, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x12, 0x02, 0x01,
+    0x03, 0x12, 0x04, 0xfa, 0x01, 0x19, 0x1a, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x12, 0x02, 0x02, 0x12,
+    0x04, 0xfb, 0x01, 0x02, 0x19, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x12, 0x02, 0x02, 0x06, 0x12, 0x04,
+    0xfb, 0x01, 0x02, 0x0f, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x12, 0x02, 0x02, 0x01, 0x12, 0x04, 0xfb,
+    0x01, 0x10, 0x14, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x12, 0x02, 0x02, 0x03, 0x12, 0x04, 0xfb, 0x01,
+    0x17, 0x18, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x12, 0x02, 0x03, 0x12, 0x04, 0xfc, 0x01, 0x02, 0x16,
+    0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x12, 0x02, 0x03, 0x05, 0x12, 0x04, 0xfc, 0x01, 0x02, 0x08, 0x0a,
+    0x0d, 0x0a, 0x05, 0x04, 0x12, 0x02, 0x03, 0x01, 0x12, 0x04, 0xfc, 0x01, 0x09, 0x11, 0x0a, 0x0d,
+    0x0a, 0x05, 0x04, 0x12, 0x02, 0x03, 0x03, 0x12, 0x04, 0xfc, 0x01, 0x14, 0x15, 0x0a, 0x0c, 0x0a,
+    0x02, 0x04, 0x13, 0x12, 0x06, 0xff, 0x01, 0x00, 0x84, 0x02, 0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04,
+    0x13, 0x01, 0x12, 0x04, 0xff, 0x01, 0x08, 0x17, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x13, 0x02, 0x00,
+    0x12, 0x04, 0x80, 0x02, 0x02, 0x1b, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x13, 0x02, 0x00, 0x05, 0x12,
+    0x04, 0x80, 0x02, 0x02, 0x07, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x13, 0x02, 0x00, 0x01, 0x12, 0x04,
+    0x80, 0x02, 0x08, 0x16, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x13, 0x02, 0x00, 0x03, 0x12, 0x04, 0x80,
+    0x02, 0x19, 0x1a, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x13, 0x02, 0x01, 0x12, 0x04, 0x81, 0x02, 0x02,
+    0x14, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x13, 0x02, 0x01, 0x05, 0x12, 0x04, 0x81, 0x02, 0x02, 0x08,
+    0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x13, 0x02, 0x01, 0x01, 0x12, 0x04, 0x81, 0x02, 0x09, 0x0f, 0x0a,
+    0x0d, 0x0a, 0x05, 0x04, 0x13, 0x02, 0x01, 0x03, 0x12, 0x04, 0x81, 0x02, 0x12, 0x13, 0x0a, 0x0c,
+    0x0a, 0x04, 0x04, 0x13, 0x02, 0x02, 0x12, 0x04, 0x82, 0x02, 0x02, 0x11, 0x0a, 0x0d, 0x0a, 0x05,
+    0x04, 0x13, 0x02, 0x02, 0x05, 0x12, 0x04, 0x82, 0x02, 0x02, 0x08, 0x0a, 0x0d, 0x0a, 0x05, 0x04,
+    0x13, 0x02, 0x02, 0x01, 0x12, 0x04, 0x82, 0x02, 0x09, 0x0c, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x13,
+    0x02, 0x02, 0x03, 0x12, 0x04, 0x82, 0x02, 0x0f, 0x10, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x13, 0x02,
+    0x03, 0x12, 0x04, 0x83, 0x02, 0x02, 0x1b, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x13, 0x02, 0x03, 0x06,
+    0x12, 0x04, 0x83, 0x02, 0x02, 0x11, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x13, 0x02, 0x03, 0x01, 0x12,
+    0x04, 0x83, 0x02, 0x12, 0x16, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x13, 0x02, 0x03, 0x03, 0x12, 0x04,
+    0x83, 0x02, 0x19, 0x1a, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x14, 0x12, 0x06, 0x86, 0x02, 0x00, 0x89,
+    0x02, 0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x14, 0x01, 0x12, 0x04, 0x86, 0x02, 0x08, 0x17, 0x0a,
+    0x0c, 0x0a, 0x04, 0x04, 0x14, 0x02, 0x00, 0x12, 0x04, 0x87, 0x02, 0x02, 0x11, 0x0a, 0x0d, 0x0a,
+    0x05, 0x04, 0x14, 0x02, 0x00, 0x05, 0x12, 0x04, 0x87, 0x02, 0x02, 0x08, 0x0a, 0x0d, 0x0a, 0x05,
+    0x04, 0x14, 0x02, 0x00, 0x01, 0x12, 0x04, 0x87, 0x02, 0x09, 0x0c, 0x0a, 0x0d, 0x0a, 0x05, 0x04,
+    0x14, 0x02, 0x00, 0x03, 0x12, 0x04, 0x87, 0x02, 0x0f, 0x10, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x14,
+    0x02, 0x01, 0x12, 0x04, 0x88, 0x02, 0x02, 0x16, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x14, 0x02, 0x01,
+    0x05, 0x12, 0x04, 0x88, 0x02, 0x02, 0x08, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x14, 0x02, 0x01, 0x01,
+    0x12, 0x04, 0x88, 0x02, 0x09, 0x11, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x14, 0x02, 0x01, 0x03, 0x12,
+    0x04, 0x88, 0x02, 0x14, 0x15, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x15, 0x12, 0x06, 0x8b, 0x02, 0x00,
+    0x8f, 0x02, 0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x15, 0x01, 0x12, 0x04, 0x8b, 0x02, 0x08, 0x13,
+    0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x15, 0x02, 0x00, 0x12, 0x04, 0x8c, 0x02, 0x02, 0x15, 0x0a, 0x0d,
+    0x0a, 0x05, 0x04, 0x15, 0x02, 0x00, 0x05, 0x12, 0x04, 0x8c, 0x02, 0x02, 0x08, 0x0a, 0x0d, 0x0a,
+    0x05, 0x04, 0x15, 0x02, 0x00, 0x01, 0x12, 0x04, 0x8c, 0x02, 0x09, 0x10, 0x0a, 0x0d, 0x0a, 0x05,
+    0x04, 0x15, 0x02, 0x00, 0x03, 0x12, 0x04, 0x8c, 0x02, 0x13, 0x14, 0x0a, 0x0c, 0x0a, 0x04, 0x04,
+    0x15, 0x02, 0x01, 0x12, 0x04, 0x8d, 0x02, 0x02, 0x1b, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x15, 0x02,
+    0x01, 0x05, 0x12, 0x04, 0x8d, 0x02, 0x02, 0x07, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x15, 0x02, 0x01,
+    0x01, 0x12, 0x04, 0x8d, 0x02, 0x08, 0x16, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x15, 0x02, 0x01, 0x03,
+    0x12, 0x04, 0x8d, 0x02, 0x19, 0x1a, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x15, 0x02, 0x02, 0x12, 0x04,
+    0x8e, 0x02, 0x02, 0x1e, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x15, 0x02, 0x02, 0x06, 0x12, 0x04, 0x8e,
+    0x02, 0x02, 0x14, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x15, 0x02, 0x02, 0x01, 0x12, 0x04, 0x8e, 0x02,
+    0x15, 0x19, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x15, 0x02, 0x02, 0x03, 0x12, 0x04, 0x8e, 0x02, 0x1c,
+    0x1d, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x16, 0x12, 0x06, 0x91, 0x02, 0x00, 0x97, 0x02, 0x01, 0x0a,
+    0x0b, 0x0a, 0x03, 0x04, 0x16, 0x01, 0x12, 0x04, 0x91, 0x02, 0x08, 0x15, 0x0a, 0x0c, 0x0a, 0x04,
+    0x04, 0x16, 0x02, 0x00, 0x12, 0x04, 0x92, 0x02, 0x02, 0x15, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x16,
+    0x02, 0x00, 0x05, 0x12, 0x04, 0x92, 0x02, 0x02, 0x08, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x16, 0x02,
+    0x00, 0x01, 0x12, 0x04, 0x92, 0x02, 0x09, 0x10, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x16, 0x02, 0x00,
+    0x03, 0x12, 0x04, 0x92, 0x02, 0x13, 0x14, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x16, 0x02, 0x01, 0x12,
+    0x04, 0x93, 0x02, 0x02, 0x1b, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x16, 0x02, 0x01, 0x05, 0x12, 0x04,
+    0x93, 0x02, 0x02, 0x07, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x16, 0x02, 0x01, 0x01, 0x12, 0x04, 0x93,
+    0x02, 0x08, 0x16, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x16, 0x02, 0x01, 0x03, 0x12, 0x04, 0x93, 0x02,
+    0x19, 0x1a, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x16, 0x02, 0x02, 0x12, 0x04, 0x94, 0x02, 0x02, 0x19,
+    0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x16, 0x02, 0x02, 0x06, 0x12, 0x04, 0x94, 0x02, 0x02, 0x0f, 0x0a,
+    0x0d, 0x0a, 0x05, 0x04, 0x16, 0x02, 0x02, 0x01, 0x12, 0x04, 0x94, 0x02, 0x10, 0x14, 0x0a, 0x0d,
+    0x0a, 0x05, 0x04, 0x16, 0x02, 0x02, 0x03, 0x12, 0x04, 0x94, 0x02, 0x17, 0x18, 0x0a, 0x0c, 0x0a,
+    0x04, 0x04, 0x16, 0x02, 0x03, 0x12, 0x04, 0x95, 0x02, 0x02, 0x16, 0x0a, 0x0d, 0x0a, 0x05, 0x04,
+    0x16, 0x02, 0x03, 0x05, 0x12, 0x04, 0x95, 0x02, 0x02, 0x08, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x16,
+    0x02, 0x03, 0x01, 0x12, 0x04, 0x95, 0x02, 0x09, 0x11, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x16, 0x02,
+    0x03, 0x03, 0x12, 0x04, 0x95, 0x02, 0x14, 0x15, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x16, 0x02, 0x04,
+    0x12, 0x04, 0x96, 0x02, 0x02, 0x12, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x16, 0x02, 0x04, 0x05, 0x12,
+    0x04, 0x96, 0x02, 0x02, 0x08, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x16, 0x02, 0x04, 0x01, 0x12, 0x04,
+    0x96, 0x02, 0x09, 0x0d, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x16, 0x02, 0x04, 0x03, 0x12, 0x04, 0x96,
+    0x02, 0x10, 0x11, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x17, 0x12, 0x06, 0x99, 0x02, 0x00, 0x9e, 0x02,
+    0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x17, 0x01, 0x12, 0x04, 0x99, 0x02, 0x08, 0x16, 0x0a, 0x0c,
+    0x0a, 0x04, 0x04, 0x17, 0x02, 0x00, 0x12, 0x04, 0x9a, 0x02, 0x02, 0x11, 0x0a, 0x0d, 0x0a, 0x05,
+    0x04, 0x17, 0x02, 0x00, 0x05, 0x12, 0x04, 0x9a, 0x02, 0x02, 0x08, 0x0a, 0x0d, 0x0a, 0x05, 0x04,
+    0x17, 0x02, 0x00, 0x01, 0x12, 0x04, 0x9a, 0x02, 0x09, 0x0c, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x17,
+    0x02, 0x00, 0x03, 0x12, 0x04, 0x9a, 0x02, 0x0f, 0x10, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x17, 0x02,
+    0x01, 0x12, 0x04, 0x9b, 0x02, 0x02, 0x16, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x17, 0x02, 0x01, 0x05,
+    0x12, 0x04, 0x9b, 0x02, 0x02, 0x08, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x17, 0x02, 0x01, 0x01, 0x12,
+    0x04, 0x9b, 0x02, 0x09, 0x11, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x17, 0x02, 0x01, 0x03, 0x12, 0x04,
+    0x9b, 0x02, 0x14, 0x15, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x17, 0x02, 0x02, 0x12, 0x04, 0x9c, 0x02,
+    0x02, 0x13, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x17, 0x02, 0x02, 0x05, 0x12, 0x04, 0x9c, 0x02, 0x02,
+    0x08, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x17, 0x02, 0x02, 0x01, 0x12, 0x04, 0x9c, 0x02, 0x09, 0x0e,
+    0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x17, 0x02, 0x02, 0x03, 0x12, 0x04, 0x9c, 0x02, 0x11, 0x12, 0x0a,
+    0x0c, 0x0a, 0x04, 0x04, 0x17, 0x02, 0x03, 0x12, 0x04, 0x9d, 0x02, 0x02, 0x18, 0x0a, 0x0d, 0x0a,
+    0x05, 0x04, 0x17, 0x02, 0x03, 0x05, 0x12, 0x04, 0x9d, 0x02, 0x02, 0x08, 0x0a, 0x0d, 0x0a, 0x05,
+    0x04, 0x17, 0x02, 0x03, 0x01, 0x12, 0x04, 0x9d, 0x02, 0x09, 0x13, 0x0a, 0x0d, 0x0a, 0x05, 0x04,
+    0x17, 0x02, 0x03, 0x03, 0x12, 0x04, 0x9d, 0x02, 0x16, 0x17, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x18,
+    0x12, 0x06, 0xa0, 0x02, 0x00, 0xa5, 0x02, 0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x18, 0x01, 0x12,
+    0x04, 0xa0, 0x02, 0x08, 0x16, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x18, 0x02, 0x00, 0x12, 0x04, 0xa1,
+    0x02, 0x02, 0x1b, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x18, 0x02, 0x00, 0x05, 0x12, 0x04, 0xa1, 0x02,
+    0x02, 0x07, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x18, 0x02, 0x00, 0x01, 0x12, 0x04, 0xa1, 0x02, 0x08,
+    0x16, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x18, 0x02, 0x00, 0x03, 0x12, 0x04, 0xa1, 0x02, 0x19, 0x1a,
+    0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x18, 0x02, 0x01, 0x12, 0x04, 0xa2, 0x02, 0x02, 0x14, 0x0a, 0x0d,
+    0x0a, 0x05, 0x04, 0x18, 0x02, 0x01, 0x05, 0x12, 0x04, 0xa2, 0x02, 0x02, 0x08, 0x0a, 0x0d, 0x0a,
+    0x05, 0x04, 0x18, 0x02, 0x01, 0x01, 0x12, 0x04, 0xa2, 0x02, 0x09, 0x0f, 0x0a, 0x0d, 0x0a, 0x05,
+    0x04, 0x18, 0x02, 0x01, 0x03, 0x12, 0x04, 0xa2, 0x02, 0x12, 0x13, 0x0a, 0x0c, 0x0a, 0x04, 0x04,
+    0x18, 0x02, 0x02, 0x12, 0x04, 0xa3, 0x02, 0x02, 0x11, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x18, 0x02,
+    0x02, 0x05, 0x12, 0x04, 0xa3, 0x02, 0x02, 0x08, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x18, 0x02, 0x02,
+    0x01, 0x12, 0x04, 0xa3, 0x02, 0x09, 0x0c, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x18, 0x02, 0x02, 0x03,
+    0x12, 0x04, 0xa3, 0x02, 0x0f, 0x10, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x18, 0x02, 0x03, 0x12, 0x04,
+    0xa4, 0x02, 0x02, 0x1a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x18, 0x02, 0x03, 0x06, 0x12, 0x04, 0xa4,
+    0x02, 0x02, 0x10, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x18, 0x02, 0x03, 0x01, 0x12, 0x04, 0xa4, 0x02,
+    0x11, 0x15, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x18, 0x02, 0x03, 0x03, 0x12, 0x04, 0xa4, 0x02, 0x18,
+    0x19, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x19, 0x12, 0x06, 0xa7, 0x02, 0x00, 0xba, 0x02, 0x01, 0x0a,
+    0x0b, 0x0a, 0x03, 0x04, 0x19, 0x01, 0x12, 0x04, 0xa7, 0x02, 0x08, 0x1a, 0x0a, 0x0e, 0x0a, 0x04,
+    0x04, 0x19, 0x04, 0x00, 0x12, 0x06, 0xa8, 0x02, 0x02, 0xaf, 0x02, 0x03, 0x0a, 0x0d, 0x0a, 0x05,
+    0x04, 0x19, 0x04, 0x00, 0x01, 0x12, 0x04, 0xa8, 0x02, 0x07, 0x0b, 0x0a, 0x0e, 0x0a, 0x06, 0x04,
+    0x19, 0x04, 0x00, 0x02, 0x00, 0x12, 0x04, 0xa9, 0x02, 0x04, 0x19, 0x0a, 0x0f, 0x0a, 0x07, 0x04,
+    0x19, 0x04, 0x00, 0x02, 0x00, 0x01, 0x12, 0x04, 0xa9, 0x02, 0x04, 0x14, 0x0a, 0x0f, 0x0a, 0x07,
+    0x04, 0x19, 0x04, 0x00, 0x02, 0x00, 0x02, 0x12, 0x04, 0xa9, 0x02, 0x17, 0x18, 0x0a, 0x0e, 0x0a,
+    0x06, 0x04, 0x19, 0x04, 0x00, 0x02, 0x01, 0x12, 0x04, 0xaa, 0x02, 0x04, 0x24, 0x0a, 0x0f, 0x0a,
+    0x07, 0x04, 0x19, 0x04, 0x00, 0x02, 0x01, 0x01, 0x12, 0x04, 0xaa, 0x02, 0x04, 0x1f, 0x0a, 0x0f,
+    0x0a, 0x07, 0x04, 0x19, 0x04, 0x00, 0x02, 0x01, 0x02, 0x12, 0x04, 0xaa, 0x02, 0x22, 0x23, 0x0a,
+    0x0e, 0x0a, 0x06, 0x04, 0x19, 0x04, 0x00, 0x02, 0x02, 0x12, 0x04, 0xab, 0x02, 0x04, 0x1c, 0x0a,
+    0x0f, 0x0a, 0x07, 0x04, 0x19, 0x04, 0x00, 0x02, 0x02, 0x01, 0x12, 0x04, 0xab, 0x02, 0x04, 0x17,
+    0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x19, 0x04, 0x00, 0x02, 0x02, 0x02, 0x12, 0x04, 0xab, 0x02, 0x1a,
+    0x1b, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x19, 0x04, 0x00, 0x02, 0x03, 0x12, 0x04, 0xac, 0x02, 0x04,
+    0x1f, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x19, 0x04, 0x00, 0x02, 0x03, 0x01, 0x12, 0x04, 0xac, 0x02,
+    0x04, 0x1a, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x19, 0x04, 0x00, 0x02, 0x03, 0x02, 0x12, 0x04, 0xac,
+    0x02, 0x1d, 0x1e, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x19, 0x04, 0x00, 0x02, 0x04, 0x12, 0x04, 0xad,
+    0x02, 0x04, 0x1e, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x19, 0x04, 0x00, 0x02, 0x04, 0x01, 0x12, 0x04,
+    0xad, 0x02, 0x04, 0x19, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x19, 0x04, 0x00, 0x02, 0x04, 0x02, 0x12,
+    0x04, 0xad, 0x02, 0x1c, 0x1d, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x19, 0x04, 0x00, 0x04, 0x12, 0x04,
+    0xae, 0x02, 0x04, 0x0f, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x19, 0x04, 0x00, 0x04, 0x00, 0x12, 0x04,
+    0xae, 0x02, 0x0d, 0x0e, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x19, 0x04, 0x00, 0x04, 0x00, 0x01, 0x12,
+    0x04, 0xae, 0x02, 0x0d, 0x0e, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x19, 0x04, 0x00, 0x04, 0x00, 0x02,
+    0x12, 0x04, 0xae, 0x02, 0x0d, 0x0e, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x19, 0x02, 0x00, 0x12, 0x04,
+    0xb1, 0x02, 0x02, 0x10, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x19, 0x02, 0x00, 0x06, 0x12, 0x04, 0xb1,
+    0x02, 0x02, 0x06, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x19, 0x02, 0x00, 0x01, 0x12, 0x04, 0xb1, 0x02,
+    0x07, 0x0b, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x19, 0x02, 0x00, 0x03, 0x12, 0x04, 0xb1, 0x02, 0x0e,
+    0x0f, 0x0a, 0x0e, 0x0a, 0x04, 0x04, 0x19, 0x08, 0x00, 0x12, 0x06, 0xb3, 0x02, 0x02, 0xb8, 0x02,
+    0x03, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x19, 0x08, 0x00, 0x01, 0x12, 0x04, 0xb3, 0x02, 0x08, 0x0f,
+    0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x19, 0x02, 0x01, 0x12, 0x04, 0xb4, 0x02, 0x04, 0x34, 0x0a, 0x0d,
+    0x0a, 0x05, 0x04, 0x19, 0x02, 0x01, 0x06, 0x12, 0x04, 0xb4, 0x02, 0x04, 0x18, 0x0a, 0x0d, 0x0a,
+    0x05, 0x04, 0x19, 0x02, 0x01, 0x01, 0x12, 0x04, 0xb4, 0x02, 0x19, 0x2f, 0x0a, 0x0d, 0x0a, 0x05,
+    0x04, 0x19, 0x02, 0x01, 0x03, 0x12, 0x04, 0xb4, 0x02, 0x32, 0x33, 0x0a, 0x0c, 0x0a, 0x04, 0x04,
+    0x19, 0x02, 0x02, 0x12, 0x04, 0xb5, 0x02, 0x04, 0x25, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x19, 0x02,
+    0x02, 0x06, 0x12, 0x04, 0xb5, 0x02, 0x04, 0x11, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x19, 0x02, 0x02,
+    0x01, 0x12, 0x04, 0xb5, 0x02, 0x12, 0x20, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x19, 0x02, 0x02, 0x03,
+    0x12, 0x04, 0xb5, 0x02, 0x23, 0x24, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x19, 0x02, 0x03, 0x12, 0x04,
+    0xb6, 0x02, 0x04, 0x2a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x19, 0x02, 0x03, 0x06, 0x12, 0x04, 0xb6,
+    0x02, 0x04, 0x13, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x19, 0x02, 0x03, 0x01, 0x12, 0x04, 0xb6, 0x02,
+    0x14, 0x25, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x19, 0x02, 0x03, 0x03, 0x12, 0x04, 0xb6, 0x02, 0x28,
+    0x29, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x19, 0x02, 0x04, 0x12, 0x04, 0xb7, 0x02, 0x04, 0x29, 0x0a,
+    0x0d, 0x0a, 0x05, 0x04, 0x19, 0x02, 0x04, 0x06, 0x12, 0x04, 0xb7, 0x02, 0x04, 0x13, 0x0a, 0x0d,
+    0x0a, 0x05, 0x04, 0x19, 0x02, 0x04, 0x01, 0x12, 0x04, 0xb7, 0x02, 0x14, 0x24, 0x0a, 0x0d, 0x0a,
+    0x05, 0x04, 0x19, 0x02, 0x04, 0x03, 0x12, 0x04, 0xb7, 0x02, 0x27, 0x28, 0x0a, 0x0b, 0x0a, 0x03,
+    0x04, 0x19, 0x09, 0x12, 0x04, 0xb9, 0x02, 0x02, 0x0d, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x19, 0x09,
+    0x00, 0x12, 0x04, 0xb9, 0x02, 0x0b, 0x0c, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x19, 0x09, 0x00, 0x01,
+    0x12, 0x04, 0xb9, 0x02, 0x0b, 0x0c, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x19, 0x09, 0x00, 0x02, 0x12,
+    0x04, 0xb9, 0x02, 0x0b, 0x0c, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x1a, 0x12, 0x06, 0xbc, 0x02, 0x00,
+    0xc1, 0x02, 0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x1a, 0x01, 0x12, 0x04, 0xbc, 0x02, 0x08, 0x1c,
+    0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x1a, 0x02, 0x00, 0x12, 0x04, 0xbd, 0x02, 0x02, 0x1f, 0x0a, 0x0d,
+    0x0a, 0x05, 0x04, 0x1a, 0x02, 0x00, 0x06, 0x12, 0x04, 0xbd, 0x02, 0x02, 0x11, 0x0a, 0x0d, 0x0a,
+    0x05, 0x04, 0x1a, 0x02, 0x00, 0x01, 0x12, 0x04, 0xbd, 0x02, 0x12, 0x1a, 0x0a, 0x0d, 0x0a, 0x05,
+    0x04, 0x1a, 0x02, 0x00, 0x03, 0x12, 0x04, 0xbd, 0x02, 0x1d, 0x1e, 0x0a, 0x0c, 0x0a, 0x04, 0x04,
+    0x1a, 0x02, 0x01, 0x12, 0x04, 0xbe, 0x02, 0x02, 0x27, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1a, 0x02,
+    0x01, 0x04, 0x12, 0x04, 0xbe, 0x02, 0x02, 0x0a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1a, 0x02, 0x01,
+    0x06, 0x12, 0x04, 0xbe, 0x02, 0x0b, 0x13, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1a, 0x02, 0x01, 0x01,
+    0x12, 0x04, 0xbe, 0x02, 0x14, 0x22, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1a, 0x02, 0x01, 0x03, 0x12,
+    0x04, 0xbe, 0x02, 0x25, 0x26, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x1a, 0x02, 0x02, 0x12, 0x04, 0xbf,
+    0x02, 0x02, 0x20, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1a, 0x02, 0x02, 0x04, 0x12, 0x04, 0xbf, 0x02,
+    0x02, 0x0a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1a, 0x02, 0x02, 0x05, 0x12, 0x04, 0xbf, 0x02, 0x0b,
+    0x11, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1a, 0x02, 0x02, 0x01, 0x12, 0x04, 0xbf, 0x02, 0x12, 0x1b,
+    0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1a, 0x02, 0x02, 0x03, 0x12, 0x04, 0xbf, 0x02, 0x1e, 0x1f, 0x0a,
+    0x0c, 0x0a, 0x04, 0x04, 0x1a, 0x02, 0x03, 0x12, 0x04, 0xc0, 0x02, 0x02, 0x23, 0x0a, 0x0d, 0x0a,
+    0x05, 0x04, 0x1a, 0x02, 0x03, 0x05, 0x12, 0x04, 0xc0, 0x02, 0x02, 0x08, 0x0a, 0x0d, 0x0a, 0x05,
+    0x04, 0x1a, 0x02, 0x03, 0x01, 0x12, 0x04, 0xc0, 0x02, 0x09, 0x1e, 0x0a, 0x0d, 0x0a, 0x05, 0x04,
+    0x1a, 0x02, 0x03, 0x03, 0x12, 0x04, 0xc0, 0x02, 0x21, 0x22, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x1b,
+    0x12, 0x06, 0xc3, 0x02, 0x00, 0xc6, 0x02, 0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x1b, 0x01, 0x12,
+    0x04, 0xc3, 0x02, 0x08, 0x1a, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x1b, 0x02, 0x00, 0x12, 0x04, 0xc4,
+    0x02, 0x02, 0x15, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1b, 0x02, 0x00, 0x05, 0x12, 0x04, 0xc4, 0x02,
+    0x02, 0x07, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1b, 0x02, 0x00, 0x01, 0x12, 0x04, 0xc4, 0x02, 0x08,
+    0x10, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1b, 0x02, 0x00, 0x03, 0x12, 0x04, 0xc4, 0x02, 0x13, 0x14,
+    0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x1b, 0x02, 0x01, 0x12, 0x04, 0xc5, 0x02, 0x02, 0x17, 0x0a, 0x0d,
+    0x0a, 0x05, 0x04, 0x1b, 0x02, 0x01, 0x06, 0x12, 0x04, 0xc5, 0x02, 0x02, 0x0e, 0x0a, 0x0d, 0x0a,
+    0x05, 0x04, 0x1b, 0x02, 0x01, 0x01, 0x12, 0x04, 0xc5, 0x02, 0x0f, 0x12, 0x0a, 0x0d, 0x0a, 0x05,
+    0x04, 0x1b, 0x02, 0x01, 0x03, 0x12, 0x04, 0xc5, 0x02, 0x15, 0x16, 0x0a, 0x0c, 0x0a, 0x02, 0x04,
+    0x1c, 0x12, 0x06, 0xc8, 0x02, 0x00, 0xcc, 0x02, 0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x1c, 0x01,
+    0x12, 0x04, 0xc8, 0x02, 0x08, 0x15, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x1c, 0x02, 0x00, 0x12, 0x04,
+    0xc9, 0x02, 0x02, 0x1e, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1c, 0x02, 0x00, 0x06, 0x12, 0x04, 0xc9,
+    0x02, 0x02, 0x14, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1c, 0x02, 0x00, 0x01, 0x12, 0x04, 0xc9, 0x02,
+    0x15, 0x19, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1c, 0x02, 0x00, 0x03, 0x12, 0x04, 0xc9, 0x02, 0x1c,
+    0x1d, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x1c, 0x02, 0x01, 0x12, 0x04, 0xca, 0x02, 0x02, 0x27, 0x0a,
+    0x0d, 0x0a, 0x05, 0x04, 0x1c, 0x02, 0x01, 0x04, 0x12, 0x04, 0xca, 0x02, 0x02, 0x0a, 0x0a, 0x0d,
+    0x0a, 0x05, 0x04, 0x1c, 0x02, 0x01, 0x06, 0x12, 0x04, 0xca, 0x02, 0x0b, 0x13, 0x0a, 0x0d, 0x0a,
+    0x05, 0x04, 0x1c, 0x02, 0x01, 0x01, 0x12, 0x04, 0xca, 0x02, 0x14, 0x22, 0x0a, 0x0d, 0x0a, 0x05,
+    0x04, 0x1c, 0x02, 0x01, 0x03, 0x12, 0x04, 0xca, 0x02, 0x25, 0x26, 0x0a, 0x0c, 0x0a, 0x04, 0x04,
+    0x1c, 0x02, 0x02, 0x12, 0x04, 0xcb, 0x02, 0x02, 0x20, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1c, 0x02,
+    0x02, 0x04, 0x12, 0x04, 0xcb, 0x02, 0x02, 0x0a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1c, 0x02, 0x02,
+    0x05, 0x12, 0x04, 0xcb, 0x02, 0x0b, 0x11, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1c, 0x02, 0x02, 0x01,
+    0x12, 0x04, 0xcb, 0x02, 0x12, 0x1b, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1c, 0x02, 0x02, 0x03, 0x12,
+    0x04, 0xcb, 0x02, 0x1e, 0x1f, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x1d, 0x12, 0x06, 0xce, 0x02, 0x00,
+    0xd1, 0x02, 0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x1d, 0x01, 0x12, 0x04, 0xce, 0x02, 0x08, 0x17,
+    0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x1d, 0x02, 0x00, 0x12, 0x04, 0xcf, 0x02, 0x02, 0x1e, 0x0a, 0x0d,
+    0x0a, 0x05, 0x04, 0x1d, 0x02, 0x00, 0x05, 0x12, 0x04, 0xcf, 0x02, 0x02, 0x08, 0x0a, 0x0d, 0x0a,
+    0x05, 0x04, 0x1d, 0x02, 0x00, 0x01, 0x12, 0x04, 0xcf, 0x02, 0x09, 0x19, 0x0a, 0x0d, 0x0a, 0x05,
+    0x04, 0x1d, 0x02, 0x00, 0x03, 0x12, 0x04, 0xcf, 0x02, 0x1c, 0x1d, 0x0a, 0x0c, 0x0a, 0x04, 0x04,
+    0x1d, 0x02, 0x01, 0x12, 0x04, 0xd0, 0x02, 0x02, 0x3e, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1d, 0x02,
+    0x01, 0x04, 0x12, 0x04, 0xd0, 0x02, 0x02, 0x0a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1d, 0x02, 0x01,
+    0x06, 0x12, 0x04, 0xd0, 0x02, 0x0b, 0x25, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1d, 0x02, 0x01, 0x01,
+    0x12, 0x04, 0xd0, 0x02, 0x26, 0x39, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1d, 0x02, 0x01, 0x03, 0x12,
+    0x04, 0xd0, 0x02, 0x3c, 0x3d, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x1e, 0x12, 0x06, 0xd3, 0x02, 0x00,
+    0xde, 0x02, 0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x1e, 0x01, 0x12, 0x04, 0xd3, 0x02, 0x08, 0x22,
+    0x0a, 0x0e, 0x0a, 0x04, 0x04, 0x1e, 0x04, 0x00, 0x12, 0x06, 0xd4, 0x02, 0x02, 0xd7, 0x02, 0x03,
+    0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1e, 0x04, 0x00, 0x01, 0x12, 0x04, 0xd4, 0x02, 0x07, 0x0b, 0x0a,
+    0x0e, 0x0a, 0x06, 0x04, 0x1e, 0x04, 0x00, 0x02, 0x00, 0x12, 0x04, 0xd5, 0x02, 0x04, 0x19, 0x0a,
+    0x0f, 0x0a, 0x07, 0x04, 0x1e, 0x04, 0x00, 0x02, 0x00, 0x01, 0x12, 0x04, 0xd5, 0x02, 0x04, 0x14,
+    0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x1e, 0x04, 0x00, 0x02, 0x00, 0x02, 0x12, 0x04, 0xd5, 0x02, 0x17,
+    0x18, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x1e, 0x04, 0x00, 0x02, 0x01, 0x12, 0x04, 0xd6, 0x02, 0x04,
+    0x24, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x1e, 0x04, 0x00, 0x02, 0x01, 0x01, 0x12, 0x04, 0xd6, 0x02,
+    0x04, 0x1f, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x1e, 0x04, 0x00, 0x02, 0x01, 0x02, 0x12, 0x04, 0xd6,
+    0x02, 0x22, 0x23, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x1e, 0x02, 0x00, 0x12, 0x04, 0xd9, 0x02, 0x02,
+    0x10, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1e, 0x02, 0x00, 0x06, 0x12, 0x04, 0xd9, 0x02, 0x02, 0x06,
+    0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1e, 0x02, 0x00, 0x01, 0x12, 0x04, 0xd9, 0x02, 0x07, 0x0b, 0x0a,
+    0x0d, 0x0a, 0x05, 0x04, 0x1e, 0x02, 0x00, 0x03, 0x12, 0x04, 0xd9, 0x02, 0x0e, 0x0f, 0x0a, 0x0e,
+    0x0a, 0x04, 0x04, 0x1e, 0x08, 0x00, 0x12, 0x06, 0xdb, 0x02, 0x02, 0xdd, 0x02, 0x03, 0x0a, 0x0d,
+    0x0a, 0x05, 0x04, 0x1e, 0x08, 0x00, 0x01, 0x12, 0x04, 0xdb, 0x02, 0x08, 0x0f, 0x0a, 0x0c, 0x0a,
+    0x04, 0x04, 0x1e, 0x02, 0x01, 0x12, 0x04, 0xdc, 0x02, 0x04, 0x34, 0x0a, 0x0d, 0x0a, 0x05, 0x04,
+    0x1e, 0x02, 0x01, 0x06, 0x12, 0x04, 0xdc, 0x02, 0x04, 0x18, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1e,
+    0x02, 0x01, 0x01, 0x12, 0x04, 0xdc, 0x02, 0x19, 0x2f, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1e, 0x02,
+    0x01, 0x03, 0x12, 0x04, 0xdc, 0x02, 0x32, 0x33, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x1f, 0x12, 0x06,
+    0xe0, 0x02, 0x00, 0xe3, 0x02, 0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x1f, 0x01, 0x12, 0x04, 0xe0,
+    0x02, 0x08, 0x1a, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x1f, 0x02, 0x00, 0x12, 0x04, 0xe1, 0x02, 0x02,
+    0x15, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1f, 0x02, 0x00, 0x05, 0x12, 0x04, 0xe1, 0x02, 0x02, 0x07,
+    0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1f, 0x02, 0x00, 0x01, 0x12, 0x04, 0xe1, 0x02, 0x08, 0x10, 0x0a,
+    0x0d, 0x0a, 0x05, 0x04, 0x1f, 0x02, 0x00, 0x03, 0x12, 0x04, 0xe1, 0x02, 0x13, 0x14, 0x0a, 0x0c,
+    0x0a, 0x04, 0x04, 0x1f, 0x02, 0x01, 0x12, 0x04, 0xe2, 0x02, 0x02, 0x15, 0x0a, 0x0d, 0x0a, 0x05,
+    0x04, 0x1f, 0x02, 0x01, 0x06, 0x12, 0x04, 0xe2, 0x02, 0x02, 0x0c, 0x0a, 0x0d, 0x0a, 0x05, 0x04,
+    0x1f, 0x02, 0x01, 0x01, 0x12, 0x04, 0xe2, 0x02, 0x0d, 0x10, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x1f,
+    0x02, 0x01, 0x03, 0x12, 0x04, 0xe2, 0x02, 0x13, 0x14, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x20, 0x12,
+    0x06, 0xe5, 0x02, 0x00, 0xeb, 0x02, 0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x20, 0x01, 0x12, 0x04,
+    0xe5, 0x02, 0x08, 0x12, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x20, 0x02, 0x00, 0x12, 0x04, 0xe6, 0x02,
+    0x02, 0x15, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x20, 0x02, 0x00, 0x05, 0x12, 0x04, 0xe6, 0x02, 0x02,
+    0x08, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x20, 0x02, 0x00, 0x01, 0x12, 0x04, 0xe6, 0x02, 0x09, 0x10,
+    0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x20, 0x02, 0x00, 0x03, 0x12, 0x04, 0xe6, 0x02, 0x13, 0x14, 0x0a,
+    0x0c, 0x0a, 0x04, 0x04, 0x20, 0x02, 0x01, 0x12, 0x04, 0xe7, 0x02, 0x02, 0x12, 0x0a, 0x0d, 0x0a,
+    0x05, 0x04, 0x20, 0x02, 0x01, 0x05, 0x12, 0x04, 0xe7, 0x02, 0x02, 0x08, 0x0a, 0x0d, 0x0a, 0x05,
+    0x04, 0x20, 0x02, 0x01, 0x01, 0x12, 0x04, 0xe7, 0x02, 0x09, 0x0d, 0x0a, 0x0d, 0x0a, 0x05, 0x04,
+    0x20, 0x02, 0x01, 0x03, 0x12, 0x04, 0xe7, 0x02, 0x10, 0x11, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x20,
+    0x02, 0x02, 0x12, 0x04, 0xe8, 0x02, 0x02, 0x24, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x20, 0x02, 0x02,
+    0x04, 0x12, 0x04, 0xe8, 0x02, 0x02, 0x0a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x20, 0x02, 0x02, 0x06,
+    0x12, 0x04, 0xe8, 0x02, 0x0b, 0x17, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x20, 0x02, 0x02, 0x01, 0x12,
+    0x04, 0xe8, 0x02, 0x18, 0x1f, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x20, 0x02, 0x02, 0x03, 0x12, 0x04,
+    0xe8, 0x02, 0x22, 0x23, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x20, 0x02, 0x03, 0x12, 0x04, 0xe9, 0x02,
+    0x02, 0x2e, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x20, 0x02, 0x03, 0x04, 0x12, 0x04, 0xe9, 0x02, 0x02,
+    0x0a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x20, 0x02, 0x03, 0x06, 0x12, 0x04, 0xe9, 0x02, 0x0b, 0x17,
+    0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x20, 0x02, 0x03, 0x01, 0x12, 0x04, 0xe9, 0x02, 0x18, 0x29, 0x0a,
+    0x0d, 0x0a, 0x05, 0x04, 0x20, 0x02, 0x03, 0x03, 0x12, 0x04, 0xe9, 0x02, 0x2c, 0x2d, 0x0a, 0x0c,
+    0x0a, 0x04, 0x04, 0x20, 0x02, 0x04, 0x12, 0x04, 0xea, 0x02, 0x02, 0x22, 0x0a, 0x0d, 0x0a, 0x05,
+    0x04, 0x20, 0x02, 0x04, 0x04, 0x12, 0x04, 0xea, 0x02, 0x02, 0x0a, 0x0a, 0x0d, 0x0a, 0x05, 0x04,
+    0x20, 0x02, 0x04, 0x06, 0x12, 0x04, 0xea, 0x02, 0x0b, 0x15, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x20,
+    0x02, 0x04, 0x01, 0x12, 0x04, 0xea, 0x02, 0x16, 0x1d, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x20, 0x02,
+    0x04, 0x03, 0x12, 0x04, 0xea, 0x02, 0x20, 0x21, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x21, 0x12, 0x06,
+    0xec, 0x02, 0x00, 0xf9, 0x02, 0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x21, 0x01, 0x12, 0x04, 0xec,
+    0x02, 0x08, 0x14, 0x0a, 0x0e, 0x0a, 0x04, 0x04, 0x21, 0x04, 0x00, 0x12, 0x06, 0xed, 0x02, 0x02,
+    0xf2, 0x02, 0x03, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x21, 0x04, 0x00, 0x01, 0x12, 0x04, 0xed, 0x02,
+    0x07, 0x11, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x21, 0x04, 0x00, 0x02, 0x00, 0x12, 0x04, 0xee, 0x02,
+    0x04, 0x1f, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x21, 0x04, 0x00, 0x02, 0x00, 0x01, 0x12, 0x04, 0xee,
+    0x02, 0x04, 0x1a, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x21, 0x04, 0x00, 0x02, 0x00, 0x02, 0x12, 0x04,
+    0xee, 0x02, 0x1d, 0x1e, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x21, 0x04, 0x00, 0x02, 0x01, 0x12, 0x04,
+    0xef, 0x02, 0x04, 0x1b, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x21, 0x04, 0x00, 0x02, 0x01, 0x01, 0x12,
+    0x04, 0xef, 0x02, 0x04, 0x16, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x21, 0x04, 0x00, 0x02, 0x01, 0x02,
+    0x12, 0x04, 0xef, 0x02, 0x19, 0x1a, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x21, 0x04, 0x00, 0x02, 0x02,
+    0x12, 0x04, 0xf0, 0x02, 0x04, 0x1a, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x21, 0x04, 0x00, 0x02, 0x02,
+    0x01, 0x12, 0x04, 0xf0, 0x02, 0x04, 0x15, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x21, 0x04, 0x00, 0x02,
+    0x02, 0x02, 0x12, 0x04, 0xf0, 0x02, 0x18, 0x19, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x21, 0x04, 0x00,
+    0x02, 0x03, 0x12, 0x04, 0xf1, 0x02, 0x04, 0x1a, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x21, 0x04, 0x00,
+    0x02, 0x03, 0x01, 0x12, 0x04, 0xf1, 0x02, 0x04, 0x15, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x21, 0x04,
+    0x00, 0x02, 0x03, 0x02, 0x12, 0x04, 0xf1, 0x02, 0x18, 0x19, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x21,
+    0x02, 0x00, 0x12, 0x04, 0xf3, 0x02, 0x02, 0x12, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x21, 0x02, 0x00,
+    0x05, 0x12, 0x04, 0xf3, 0x02, 0x02, 0x08, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x21, 0x02, 0x00, 0x01,
+    0x12, 0x04, 0xf3, 0x02, 0x09, 0x0d, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x21, 0x02, 0x00, 0x03, 0x12,
+    0x04, 0xf3, 0x02, 0x10, 0x11, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x21, 0x02, 0x01, 0x12, 0x04, 0xf4,
+    0x02, 0x02, 0x29, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x21, 0x02, 0x01, 0x06, 0x12, 0x04, 0xf4, 0x02,
+    0x02, 0x19, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x21, 0x02, 0x01, 0x01, 0x12, 0x04, 0xf4, 0x02, 0x1a,
+    0x24, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x21, 0x02, 0x01, 0x03, 0x12, 0x04, 0xf4, 0x02, 0x27, 0x28,
+    0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x21, 0x02, 0x02, 0x12, 0x04, 0xf5, 0x02, 0x02, 0x14, 0x0a, 0x0d,
+    0x0a, 0x05, 0x04, 0x21, 0x02, 0x02, 0x05, 0x12, 0x04, 0xf5, 0x02, 0x02, 0x06, 0x0a, 0x0d, 0x0a,
+    0x05, 0x04, 0x21, 0x02, 0x02, 0x01, 0x12, 0x04, 0xf5, 0x02, 0x07, 0x0f, 0x0a, 0x0d, 0x0a, 0x05,
+    0x04, 0x21, 0x02, 0x02, 0x03, 0x12, 0x04, 0xf5, 0x02, 0x12, 0x13, 0x0a, 0x0c, 0x0a, 0x04, 0x04,
+    0x21, 0x02, 0x03, 0x12, 0x04, 0xf6, 0x02, 0x02, 0x40, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x21, 0x02,
+    0x03, 0x04, 0x12, 0x04, 0xf6, 0x02, 0x02, 0x0a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x21, 0x02, 0x03,
+    0x06, 0x12, 0x04, 0xf6, 0x02, 0x0b, 0x27, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x21, 0x02, 0x03, 0x01,
+    0x12, 0x04, 0xf6, 0x02, 0x28, 0x3b, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x21, 0x02, 0x03, 0x03, 0x12,
+    0x04, 0xf6, 0x02, 0x3e, 0x3f, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x21, 0x02, 0x04, 0x12, 0x04, 0xf7,
+    0x02, 0x02, 0x1f, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x21, 0x02, 0x04, 0x04, 0x12, 0x04, 0xf7, 0x02,
+    0x02, 0x0a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x21, 0x02, 0x04, 0x06, 0x12, 0x04, 0xf7, 0x02, 0x0b,
+    0x13, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x21, 0x02, 0x04, 0x01, 0x12, 0x04, 0xf7, 0x02, 0x14, 0x1a,
+    0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x21, 0x02, 0x04, 0x03, 0x12, 0x04, 0xf7, 0x02, 0x1d, 0x1e, 0x0a,
+    0x0c, 0x0a, 0x04, 0x04, 0x21, 0x02, 0x05, 0x12, 0x04, 0xf8, 0x02, 0x02, 0x1f, 0x0a, 0x0d, 0x0a,
+    0x05, 0x04, 0x21, 0x02, 0x05, 0x04, 0x12, 0x04, 0xf8, 0x02, 0x02, 0x0a, 0x0a, 0x0d, 0x0a, 0x05,
+    0x04, 0x21, 0x02, 0x05, 0x06, 0x12, 0x04, 0xf8, 0x02, 0x0b, 0x13, 0x0a, 0x0d, 0x0a, 0x05, 0x04,
+    0x21, 0x02, 0x05, 0x01, 0x12, 0x04, 0xf8, 0x02, 0x14, 0x1a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x21,
+    0x02, 0x05, 0x03, 0x12, 0x04, 0xf8, 0x02, 0x1d, 0x1e, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x22, 0x12,
+    0x06, 0xfb, 0x02, 0x00, 0x82, 0x03, 0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x22, 0x01, 0x12, 0x04,
+    0xfb, 0x02, 0x08, 0x12, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x22, 0x02, 0x00, 0x12, 0x04, 0xfc, 0x02,
+    0x02, 0x12, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x22, 0x02, 0x00, 0x05, 0x12, 0x04, 0xfc, 0x02, 0x02,
+    0x08, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x22, 0x02, 0x00, 0x01, 0x12, 0x04, 0xfc, 0x02, 0x09, 0x0d,
+    0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x22, 0x02, 0x00, 0x03, 0x12, 0x04, 0xfc, 0x02, 0x10, 0x11, 0x0a,
+    0x0c, 0x0a, 0x04, 0x04, 0x22, 0x02, 0x01, 0x12, 0x04, 0xfd, 0x02, 0x02, 0x15, 0x0a, 0x0d, 0x0a,
+    0x05, 0x04, 0x22, 0x02, 0x01, 0x05, 0x12, 0x04, 0xfd, 0x02, 0x02, 0x06, 0x0a, 0x0d, 0x0a, 0x05,
+    0x04, 0x22, 0x02, 0x01, 0x01, 0x12, 0x04, 0xfd, 0x02, 0x07, 0x10, 0x0a, 0x0d, 0x0a, 0x05, 0x04,
+    0x22, 0x02, 0x01, 0x03, 0x12, 0x04, 0xfd, 0x02, 0x13, 0x14, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x22,
+    0x02, 0x02, 0x12, 0x04, 0xfe, 0x02, 0x02, 0x14, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x22, 0x02, 0x02,
+    0x05, 0x12, 0x04, 0xfe, 0x02, 0x02, 0x06, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x22, 0x02, 0x02, 0x01,
+    0x12, 0x04, 0xfe, 0x02, 0x07, 0x0f, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x22, 0x02, 0x02, 0x03, 0x12,
+    0x04, 0xfe, 0x02, 0x12, 0x13, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x22, 0x02, 0x03, 0x12, 0x04, 0xff,
+    0x02, 0x02, 0x25, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x22, 0x02, 0x03, 0x04, 0x12, 0x04, 0xff, 0x02,
+    0x02, 0x0a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x22, 0x02, 0x03, 0x06, 0x12, 0x04, 0xff, 0x02, 0x0b,
+    0x16, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x22, 0x02, 0x03, 0x01, 0x12, 0x04, 0xff, 0x02, 0x17, 0x20,
+    0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x22, 0x02, 0x03, 0x03, 0x12, 0x04, 0xff, 0x02, 0x23, 0x24, 0x0a,
+    0x0c, 0x0a, 0x04, 0x04, 0x22, 0x02, 0x04, 0x12, 0x04, 0x80, 0x03, 0x02, 0x3e, 0x0a, 0x0d, 0x0a,
+    0x05, 0x04, 0x22, 0x02, 0x04, 0x04, 0x12, 0x04, 0x80, 0x03, 0x02, 0x0a, 0x0a, 0x0d, 0x0a, 0x05,
+    0x04, 0x22, 0x02, 0x04, 0x06, 0x12, 0x04, 0x80, 0x03, 0x0b, 0x25, 0x0a, 0x0d, 0x0a, 0x05, 0x04,
+    0x22, 0x02, 0x04, 0x01, 0x12, 0x04, 0x80, 0x03, 0x26, 0x39, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x22,
+    0x02, 0x04, 0x03, 0x12, 0x04, 0x80, 0x03, 0x3c, 0x3d, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x22, 0x02,
+    0x05, 0x12, 0x04, 0x81, 0x03, 0x02, 0x26, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x22, 0x02, 0x05, 0x04,
+    0x12, 0x04, 0x81, 0x03, 0x02, 0x0a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x22, 0x02, 0x05, 0x06, 0x12,
+    0x04, 0x81, 0x03, 0x0b, 0x1a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x22, 0x02, 0x05, 0x01, 0x12, 0x04,
+    0x81, 0x03, 0x1b, 0x21, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x22, 0x02, 0x05, 0x03, 0x12, 0x04, 0x81,
+    0x03, 0x24, 0x25, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x23, 0x12, 0x06, 0x84, 0x03, 0x00, 0x87, 0x03,
+    0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x23, 0x01, 0x12, 0x04, 0x84, 0x03, 0x08, 0x22, 0x0a, 0x0c,
+    0x0a, 0x04, 0x04, 0x23, 0x02, 0x00, 0x12, 0x04, 0x85, 0x03, 0x02, 0x27, 0x0a, 0x0d, 0x0a, 0x05,
+    0x04, 0x23, 0x02, 0x00, 0x04, 0x12, 0x04, 0x85, 0x03, 0x02, 0x0a, 0x0a, 0x0d, 0x0a, 0x05, 0x04,
+    0x23, 0x02, 0x00, 0x06, 0x12, 0x04, 0x85, 0x03, 0x0b, 0x16, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x23,
+    0x02, 0x00, 0x01, 0x12, 0x04, 0x85, 0x03, 0x17, 0x22, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x23, 0x02,
+    0x00, 0x03, 0x12, 0x04, 0x85, 0x03, 0x25, 0x26, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x23, 0x02, 0x01,
+    0x12, 0x04, 0x86, 0x03, 0x02, 0x16, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x23, 0x02, 0x01, 0x05, 0x12,
+    0x04, 0x86, 0x03, 0x02, 0x06, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x23, 0x02, 0x01, 0x01, 0x12, 0x04,
+    0x86, 0x03, 0x07, 0x11, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x23, 0x02, 0x01, 0x03, 0x12, 0x04, 0x86,
+    0x03, 0x14, 0x15, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x24, 0x12, 0x06, 0x89, 0x03, 0x00, 0x8c, 0x03,
+    0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x24, 0x01, 0x12, 0x04, 0x89, 0x03, 0x08, 0x17, 0x0a, 0x0c,
+    0x0a, 0x04, 0x04, 0x24, 0x02, 0x00, 0x12, 0x04, 0x8a, 0x03, 0x02, 0x12, 0x0a, 0x0d, 0x0a, 0x05,
+    0x04, 0x24, 0x02, 0x00, 0x05, 0x12, 0x04, 0x8a, 0x03, 0x02, 0x08, 0x0a, 0x0d, 0x0a, 0x05, 0x04,
+    0x24, 0x02, 0x00, 0x01, 0x12, 0x04, 0x8a, 0x03, 0x09, 0x0d, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x24,
+    0x02, 0x00, 0x03, 0x12, 0x04, 0x8a, 0x03, 0x10, 0x11, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x24, 0x02,
+    0x01, 0x12, 0x04, 0x8b, 0x03, 0x02, 0x14, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x24, 0x02, 0x01, 0x06,
+    0x12, 0x04, 0x8b, 0x03, 0x02, 0x0a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x24, 0x02, 0x01, 0x01, 0x12,
+    0x04, 0x8b, 0x03, 0x0b, 0x0f, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x24, 0x02, 0x01, 0x03, 0x12, 0x04,
+    0x8b, 0x03, 0x12, 0x13, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x25, 0x12, 0x06, 0x8e, 0x03, 0x00, 0x90,
+    0x03, 0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x25, 0x01, 0x12, 0x04, 0x8e, 0x03, 0x08, 0x24, 0x0a,
+    0x0c, 0x0a, 0x04, 0x04, 0x25, 0x02, 0x00, 0x12, 0x04, 0x8f, 0x03, 0x02, 0x27, 0x0a, 0x0d, 0x0a,
+    0x05, 0x04, 0x25, 0x02, 0x00, 0x04, 0x12, 0x04, 0x8f, 0x03, 0x02, 0x0a, 0x0a, 0x0d, 0x0a, 0x05,
+    0x04, 0x25, 0x02, 0x00, 0x06, 0x12, 0x04, 0x8f, 0x03, 0x0b, 0x16, 0x0a, 0x0d, 0x0a, 0x05, 0x04,
+    0x25, 0x02, 0x00, 0x01, 0x12, 0x04, 0x8f, 0x03, 0x17, 0x22, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x25,
+    0x02, 0x00, 0x03, 0x12, 0x04, 0x8f, 0x03, 0x25, 0x26, 0x0a, 0x0c, 0x0a, 0x02, 0x05, 0x00, 0x12,
+    0x06, 0x92, 0x03, 0x00, 0xa2, 0x03, 0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x05, 0x00, 0x01, 0x12, 0x04,
+    0x92, 0x03, 0x05, 0x0e, 0x0a, 0x0c, 0x0a, 0x04, 0x05, 0x00, 0x02, 0x00, 0x12, 0x04, 0x93, 0x03,
+    0x02, 0x1d, 0x0a, 0x0d, 0x0a, 0x05, 0x05, 0x00, 0x02, 0x00, 0x01, 0x12, 0x04, 0x93, 0x03, 0x02,
+    0x18, 0x0a, 0x0d, 0x0a, 0x05, 0x05, 0x00, 0x02, 0x00, 0x02, 0x12, 0x04, 0x93, 0x03, 0x1b, 0x1c,
+    0x0a, 0x0c, 0x0a, 0x04, 0x05, 0x00, 0x02, 0x01, 0x12, 0x04, 0x94, 0x03, 0x02, 0x16, 0x0a, 0x0d,
+    0x0a, 0x05, 0x05, 0x00, 0x02, 0x01, 0x01, 0x12, 0x04, 0x94, 0x03, 0x02, 0x11, 0x0a, 0x0d, 0x0a,
+    0x05, 0x05, 0x00, 0x02, 0x01, 0x02, 0x12, 0x04, 0x94, 0x03, 0x14, 0x15, 0x0a, 0x0c, 0x0a, 0x04,
+    0x05, 0x00, 0x02, 0x02, 0x12, 0x04, 0x95, 0x03, 0x02, 0x14, 0x0a, 0x0d, 0x0a, 0x05, 0x05, 0x00,
+    0x02, 0x02, 0x01, 0x12, 0x04, 0x95, 0x03, 0x02, 0x0f, 0x0a, 0x0d, 0x0a, 0x05, 0x05, 0x00, 0x02,
+    0x02, 0x02, 0x12, 0x04, 0x95, 0x03, 0x12, 0x13, 0x0a, 0x0c, 0x0a, 0x04, 0x05, 0x00, 0x02, 0x03,
+    0x12, 0x04, 0x96, 0x03, 0x02, 0x16, 0x0a, 0x0d, 0x0a, 0x05, 0x05, 0x00, 0x02, 0x03, 0x01, 0x12,
+    0x04, 0x96, 0x03, 0x02, 0x10, 0x0a, 0x0d, 0x0a, 0x05, 0x05, 0x00, 0x02, 0x03, 0x02, 0x12, 0x04,
+    0x96, 0x03, 0x13, 0x15, 0x0a, 0x0c, 0x0a, 0x04, 0x05, 0x00, 0x02, 0x04, 0x12, 0x04, 0x97, 0x03,
+    0x02, 0x16, 0x0a, 0x0d, 0x0a, 0x05, 0x05, 0x00, 0x02, 0x04, 0x01, 0x12, 0x04, 0x97, 0x03, 0x02,
+    0x10, 0x0a, 0x0d, 0x0a, 0x05, 0x05, 0x00, 0x02, 0x04, 0x02, 0x12, 0x04, 0x97, 0x03, 0x13, 0x15,
+    0x0a, 0x0c, 0x0a, 0x04, 0x05, 0x00, 0x02, 0x05, 0x12, 0x04, 0x98, 0x03, 0x02, 0x15, 0x0a, 0x0d,
+    0x0a, 0x05, 0x05, 0x00, 0x02, 0x05, 0x01, 0x12, 0x04, 0x98, 0x03, 0x02, 0x10, 0x0a, 0x0d, 0x0a,
+    0x05, 0x05, 0x00, 0x02, 0x05, 0x02, 0x12, 0x04, 0x98, 0x03, 0x13, 0x14, 0x0a, 0x0c, 0x0a, 0x04,
+    0x05, 0x00, 0x02, 0x06, 0x12, 0x04, 0x99, 0x03, 0x02, 0x16, 0x0a, 0x0d, 0x0a, 0x05, 0x05, 0x00,
+    0x02, 0x06, 0x01, 0x12, 0x04, 0x99, 0x03, 0x02, 0x11, 0x0a, 0x0d, 0x0a, 0x05, 0x05, 0x00, 0x02,
+    0x06, 0x02, 0x12, 0x04, 0x99, 0x03, 0x14, 0x15, 0x0a, 0x0c, 0x0a, 0x04, 0x05, 0x00, 0x02, 0x07,
+    0x12, 0x04, 0x9a, 0x03, 0x02, 0x17, 0x0a, 0x0d, 0x0a, 0x05, 0x05, 0x00, 0x02, 0x07, 0x01, 0x12,
+    0x04, 0x9a, 0x03, 0x02, 0x11, 0x0a, 0x0d, 0x0a, 0x05, 0x05, 0x00, 0x02, 0x07, 0x02, 0x12, 0x04,
+    0x9a, 0x03, 0x14, 0x16, 0x0a, 0x0c, 0x0a, 0x04, 0x05, 0x00, 0x02, 0x08, 0x12, 0x04, 0x9b, 0x03,
+    0x02, 0x19, 0x0a, 0x0d, 0x0a, 0x05, 0x05, 0x00, 0x02, 0x08, 0x01, 0x12, 0x04, 0x9b, 0x03, 0x02,
+    0x14, 0x0a, 0x0d, 0x0a, 0x05, 0x05, 0x00, 0x02, 0x08, 0x02, 0x12, 0x04, 0x9b, 0x03, 0x17, 0x18,
+    0x0a, 0x0c, 0x0a, 0x04, 0x05, 0x00, 0x02, 0x09, 0x12, 0x04, 0x9c, 0x03, 0x02, 0x18, 0x0a, 0x0d,
+    0x0a, 0x05, 0x05, 0x00, 0x02, 0x09, 0x01, 0x12, 0x04, 0x9c, 0x03, 0x02, 0x13, 0x0a, 0x0d, 0x0a,
+    0x05, 0x05, 0x00, 0x02, 0x09, 0x02, 0x12, 0x04, 0x9c, 0x03, 0x16, 0x17, 0x0a, 0x2b, 0x0a, 0x04,
+    0x05, 0x00, 0x02, 0x0a, 0x12, 0x04, 0x9d, 0x03, 0x02, 0x18, 0x22, 0x1d, 0x20, 0x60, 0x7b, 0x20,
+    0x69, 0x74, 0x65, 0x6d, 0x73, 0x3a, 0x20, 0x42, 0x6f, 0x78, 0x3c, 0x4d, 0x6f, 0x76, 0x65, 0x54,
+    0x79, 0x70, 0x65, 0x3e, 0x20, 0x7d, 0x60, 0x2c, 0x0a, 0x0a, 0x0d, 0x0a, 0x05, 0x05, 0x00, 0x02,
+    0x0a, 0x01, 0x12, 0x04, 0x9d, 0x03, 0x02, 0x13, 0x0a, 0x0d, 0x0a, 0x05, 0x05, 0x00, 0x02, 0x0a,
+    0x02, 0x12, 0x04, 0x9d, 0x03, 0x16, 0x17, 0x0a, 0x22, 0x0a, 0x04, 0x05, 0x00, 0x02, 0x0b, 0x12,
+    0x04, 0x9e, 0x03, 0x02, 0x18, 0x22, 0x14, 0x20, 0x60, 0x28, 0x4d, 0x6f, 0x76, 0x65, 0x53, 0x74,
+    0x72, 0x75, 0x63, 0x74, 0x54, 0x61, 0x67, 0x29, 0x60, 0x2c, 0x0a, 0x0a, 0x0d, 0x0a, 0x05, 0x05,
+    0x00, 0x02, 0x0b, 0x01, 0x12, 0x04, 0x9e, 0x03, 0x02, 0x13, 0x0a, 0x0d, 0x0a, 0x05, 0x05, 0x00,
+    0x02, 0x0b, 0x02, 0x12, 0x04, 0x9e, 0x03, 0x16, 0x17, 0x0a, 0x22, 0x0a, 0x04, 0x05, 0x00, 0x02,
+    0x0c, 0x12, 0x04, 0x9f, 0x03, 0x02, 0x24, 0x22, 0x14, 0x20, 0x60, 0x7b, 0x20, 0x69, 0x6e, 0x64,
+    0x65, 0x78, 0x3a, 0x20, 0x75, 0x31, 0x36, 0x20, 0x7d, 0x60, 0x60, 0x2c, 0x0a, 0x0a, 0x0d, 0x0a,
+    0x05, 0x05, 0x00, 0x02, 0x0c, 0x01, 0x12, 0x04, 0x9f, 0x03, 0x02, 0x1f, 0x0a, 0x0d, 0x0a, 0x05,
+    0x05, 0x00, 0x02, 0x0c, 0x02, 0x12, 0x04, 0x9f, 0x03, 0x22, 0x23, 0x0a, 0x37, 0x0a, 0x04, 0x05,
+    0x00, 0x02, 0x0d, 0x12, 0x04, 0xa0, 0x03, 0x02, 0x1c, 0x22, 0x29, 0x20, 0x60, 0x7b, 0x20, 0x6d,
+    0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3a, 0x20, 0x62, 0x6f, 0x6f, 0x6c, 0x2c, 0x20, 0x74, 0x6f,
+    0x3a, 0x20, 0x42, 0x6f, 0x78, 0x3c, 0x4d, 0x6f, 0x76, 0x65, 0x54, 0x79, 0x70, 0x65, 0x3e, 0x20,
+    0x7d, 0x60, 0x2c, 0x0a, 0x0a, 0x0d, 0x0a, 0x05, 0x05, 0x00, 0x02, 0x0d, 0x01, 0x12, 0x04, 0xa0,
+    0x03, 0x02, 0x16, 0x0a, 0x0d, 0x0a, 0x05, 0x05, 0x00, 0x02, 0x0d, 0x02, 0x12, 0x04, 0xa0, 0x03,
+    0x19, 0x1b, 0x0a, 0x1b, 0x0a, 0x04, 0x05, 0x00, 0x02, 0x0e, 0x12, 0x04, 0xa1, 0x03, 0x02, 0x1d,
+    0x22, 0x0d, 0x20, 0x60, 0x28, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x29, 0x60, 0x2c, 0x0a, 0x0a,
+    0x0d, 0x0a, 0x05, 0x05, 0x00, 0x02, 0x0e, 0x01, 0x12, 0x04, 0xa1, 0x03, 0x02, 0x17, 0x0a, 0x0d,
+    0x0a, 0x05, 0x05, 0x00, 0x02, 0x0e, 0x02, 0x12, 0x04, 0xa1, 0x03, 0x1a, 0x1c, 0x0a, 0x0c, 0x0a,
+    0x02, 0x04, 0x26, 0x12, 0x06, 0xa4, 0x03, 0x00, 0xb2, 0x03, 0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04,
+    0x26, 0x01, 0x12, 0x04, 0xa4, 0x03, 0x08, 0x10, 0x0a, 0x0e, 0x0a, 0x04, 0x04, 0x26, 0x03, 0x00,
+    0x12, 0x06, 0xa5, 0x03, 0x02, 0xa8, 0x03, 0x03, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x26, 0x03, 0x00,
+    0x01, 0x12, 0x04, 0xa5, 0x03, 0x0a, 0x17, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x26, 0x03, 0x00, 0x02,
+    0x00, 0x12, 0x04, 0xa6, 0x03, 0x04, 0x15, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x26, 0x03, 0x00, 0x02,
+    0x00, 0x05, 0x12, 0x04, 0xa6, 0x03, 0x04, 0x08, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x26, 0x03, 0x00,
+    0x02, 0x00, 0x01, 0x12, 0x04, 0xa6, 0x03, 0x09, 0x10, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x26, 0x03,
+    0x00, 0x02, 0x00, 0x03, 0x12, 0x04, 0xa6, 0x03, 0x13, 0x14, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x26,
+    0x03, 0x00, 0x02, 0x01, 0x12, 0x04, 0xa7, 0x03, 0x04, 0x14, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x26,
+    0x03, 0x00, 0x02, 0x01, 0x06, 0x12, 0x04, 0xa7, 0x03, 0x04, 0x0c, 0x0a, 0x0f, 0x0a, 0x07, 0x04,
+    0x26, 0x03, 0x00, 0x02, 0x01, 0x01, 0x12, 0x04, 0xa7, 0x03, 0x0d, 0x0f, 0x0a, 0x0f, 0x0a, 0x07,
+    0x04, 0x26, 0x03, 0x00, 0x02, 0x01, 0x03, 0x12, 0x04, 0xa7, 0x03, 0x12, 0x13, 0x0a, 0x0c, 0x0a,
+    0x04, 0x04, 0x26, 0x02, 0x00, 0x12, 0x04, 0xaa, 0x03, 0x02, 0x15, 0x0a, 0x0d, 0x0a, 0x05, 0x04,
+    0x26, 0x02, 0x00, 0x06, 0x12, 0x04, 0xaa, 0x03, 0x02, 0x0b, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x26,
+    0x02, 0x00, 0x01, 0x12, 0x04, 0xaa, 0x03, 0x0c, 0x10, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x26, 0x02,
+    0x00, 0x03, 0x12, 0x04, 0xaa, 0x03, 0x13, 0x14, 0x0a, 0x0e, 0x0a, 0x04, 0x04, 0x26, 0x08, 0x00,
+    0x12, 0x06, 0xab, 0x03, 0x02, 0xb1, 0x03, 0x03, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x26, 0x08, 0x00,
+    0x01, 0x12, 0x04, 0xab, 0x03, 0x08, 0x0f, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x26, 0x02, 0x01, 0x12,
+    0x04, 0xac, 0x03, 0x04, 0x18, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x26, 0x02, 0x01, 0x06, 0x12, 0x04,
+    0xac, 0x03, 0x04, 0x0c, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x26, 0x02, 0x01, 0x01, 0x12, 0x04, 0xac,
+    0x03, 0x0d, 0x13, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x26, 0x02, 0x01, 0x03, 0x12, 0x04, 0xac, 0x03,
+    0x16, 0x17, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x26, 0x02, 0x02, 0x12, 0x04, 0xad, 0x03, 0x04, 0x1d,
+    0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x26, 0x02, 0x02, 0x06, 0x12, 0x04, 0xad, 0x03, 0x04, 0x11, 0x0a,
+    0x0d, 0x0a, 0x05, 0x04, 0x26, 0x02, 0x02, 0x01, 0x12, 0x04, 0xad, 0x03, 0x12, 0x18, 0x0a, 0x0d,
+    0x0a, 0x05, 0x04, 0x26, 0x02, 0x02, 0x03, 0x12, 0x04, 0xad, 0x03, 0x1b, 0x1c, 0x0a, 0x0c, 0x0a,
+    0x04, 0x04, 0x26, 0x02, 0x03, 0x12, 0x04, 0xae, 0x03, 0x04, 0x28, 0x0a, 0x0d, 0x0a, 0x05, 0x04,
+    0x26, 0x02, 0x03, 0x05, 0x12, 0x04, 0xae, 0x03, 0x04, 0x0a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x26,
+    0x02, 0x03, 0x01, 0x12, 0x04, 0xae, 0x03, 0x0b, 0x23, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x26, 0x02,
+    0x03, 0x03, 0x12, 0x04, 0xae, 0x03, 0x26, 0x27, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x26, 0x02, 0x04,
+    0x12, 0x04, 0xaf, 0x03, 0x04, 0x20, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x26, 0x02, 0x04, 0x06, 0x12,
+    0x04, 0xaf, 0x03, 0x04, 0x11, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x26, 0x02, 0x04, 0x01, 0x12, 0x04,
+    0xaf, 0x03, 0x12, 0x1b, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x26, 0x02, 0x04, 0x03, 0x12, 0x04, 0xaf,
+    0x03, 0x1e, 0x1f, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x26, 0x02, 0x05, 0x12, 0x04, 0xb0, 0x03, 0x04,
+    0x1a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x26, 0x02, 0x05, 0x05, 0x12, 0x04, 0xb0, 0x03, 0x04, 0x0a,
+    0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x26, 0x02, 0x05, 0x01, 0x12, 0x04, 0xb0, 0x03, 0x0b, 0x15, 0x0a,
+    0x0d, 0x0a, 0x05, 0x04, 0x26, 0x02, 0x05, 0x03, 0x12, 0x04, 0xb0, 0x03, 0x18, 0x19, 0x0a, 0x0c,
+    0x0a, 0x02, 0x05, 0x01, 0x12, 0x06, 0xb4, 0x03, 0x00, 0xba, 0x03, 0x01, 0x0a, 0x0b, 0x0a, 0x03,
+    0x05, 0x01, 0x01, 0x12, 0x04, 0xb4, 0x03, 0x05, 0x10, 0x0a, 0x0c, 0x0a, 0x04, 0x05, 0x01, 0x02,
+    0x00, 0x12, 0x04, 0xb5, 0x03, 0x02, 0x1f, 0x0a, 0x0d, 0x0a, 0x05, 0x05, 0x01, 0x02, 0x00, 0x01,
+    0x12, 0x04, 0xb5, 0x03, 0x02, 0x1a, 0x0a, 0x0d, 0x0a, 0x05, 0x05, 0x01, 0x02, 0x00, 0x02, 0x12,
+    0x04, 0xb5, 0x03, 0x1d, 0x1e, 0x0a, 0x0c, 0x0a, 0x04, 0x05, 0x01, 0x02, 0x01, 0x12, 0x04, 0xb6,
+    0x03, 0x02, 0x18, 0x0a, 0x0d, 0x0a, 0x05, 0x05, 0x01, 0x02, 0x01, 0x01, 0x12, 0x04, 0xb6, 0x03,
+    0x02, 0x13, 0x0a, 0x0d, 0x0a, 0x05, 0x05, 0x01, 0x02, 0x01, 0x02, 0x12, 0x04, 0xb6, 0x03, 0x16,
+    0x17, 0x0a, 0x0c, 0x0a, 0x04, 0x05, 0x01, 0x02, 0x02, 0x12, 0x04, 0xb7, 0x03, 0x02, 0x18, 0x0a,
+    0x0d, 0x0a, 0x05, 0x05, 0x01, 0x02, 0x02, 0x01, 0x12, 0x04, 0xb7, 0x03, 0x02, 0x13, 0x0a, 0x0d,
+    0x0a, 0x05, 0x05, 0x01, 0x02, 0x02, 0x02, 0x12, 0x04, 0xb7, 0x03, 0x16, 0x17, 0x0a, 0x0c, 0x0a,
+    0x04, 0x05, 0x01, 0x02, 0x03, 0x12, 0x04, 0xb8, 0x03, 0x02, 0x19, 0x0a, 0x0d, 0x0a, 0x05, 0x05,
+    0x01, 0x02, 0x03, 0x01, 0x12, 0x04, 0xb8, 0x03, 0x02, 0x14, 0x0a, 0x0d, 0x0a, 0x05, 0x05, 0x01,
+    0x02, 0x03, 0x02, 0x12, 0x04, 0xb8, 0x03, 0x17, 0x18, 0x0a, 0x0c, 0x0a, 0x04, 0x05, 0x01, 0x02,
+    0x04, 0x12, 0x04, 0xb9, 0x03, 0x02, 0x17, 0x0a, 0x0d, 0x0a, 0x05, 0x05, 0x01, 0x02, 0x04, 0x01,
+    0x12, 0x04, 0xb9, 0x03, 0x02, 0x12, 0x0a, 0x0d, 0x0a, 0x05, 0x05, 0x01, 0x02, 0x04, 0x02, 0x12,
+    0x04, 0xb9, 0x03, 0x15, 0x16, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x27, 0x12, 0x06, 0xbc, 0x03, 0x00,
+    0xbe, 0x03, 0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x27, 0x01, 0x12, 0x04, 0xbc, 0x03, 0x08, 0x17,
+    0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x27, 0x02, 0x00, 0x12, 0x04, 0xbd, 0x03, 0x02, 0x19, 0x0a, 0x0d,
+    0x0a, 0x05, 0x04, 0x27, 0x02, 0x00, 0x06, 0x12, 0x04, 0xbd, 0x03, 0x02, 0x0a, 0x0a, 0x0d, 0x0a,
+    0x05, 0x04, 0x27, 0x02, 0x00, 0x01, 0x12, 0x04, 0xbd, 0x03, 0x0b, 0x14, 0x0a, 0x0d, 0x0a, 0x05,
+    0x04, 0x27, 0x02, 0x00, 0x03, 0x12, 0x04, 0xbd, 0x03, 0x17, 0x18, 0x0a, 0x0c, 0x0a, 0x02, 0x04,
+    0x28, 0x12, 0x06, 0xc0, 0x03, 0x00, 0xc3, 0x03, 0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x28, 0x01,
+    0x12, 0x04, 0xc0, 0x03, 0x08, 0x17, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x28, 0x02, 0x00, 0x12, 0x04,
+    0xc1, 0x03, 0x02, 0x1a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x28, 0x02, 0x00, 0x06, 0x12, 0x04, 0xc1,
+    0x03, 0x02, 0x0e, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x28, 0x02, 0x00, 0x01, 0x12, 0x04, 0xc1, 0x03,
+    0x0f, 0x15, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x28, 0x02, 0x00, 0x03, 0x12, 0x04, 0xc1, 0x03, 0x18,
+    0x19, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x28, 0x02, 0x01, 0x12, 0x04, 0xc2, 0x03, 0x02, 0x12, 0x0a,
+    0x0d, 0x0a, 0x05, 0x04, 0x28, 0x02, 0x01, 0x05, 0x12, 0x04, 0xc2, 0x03, 0x02, 0x08, 0x0a, 0x0d,
+    0x0a, 0x05, 0x04, 0x28, 0x02, 0x01, 0x01, 0x12, 0x04, 0xc2, 0x03, 0x09, 0x0d, 0x0a, 0x0d, 0x0a,
+    0x05, 0x04, 0x28, 0x02, 0x01, 0x03, 0x12, 0x04, 0xc2, 0x03, 0x10, 0x11, 0x0a, 0x0c, 0x0a, 0x02,
+    0x04, 0x29, 0x12, 0x06, 0xc5, 0x03, 0x00, 0xc8, 0x03, 0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x29,
+    0x01, 0x12, 0x04, 0xc5, 0x03, 0x08, 0x14, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x29, 0x02, 0x00, 0x12,
+    0x04, 0xc6, 0x03, 0x02, 0x15, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x29, 0x02, 0x00, 0x05, 0x12, 0x04,
+    0xc6, 0x03, 0x02, 0x08, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x29, 0x02, 0x00, 0x01, 0x12, 0x04, 0xc6,
+    0x03, 0x09, 0x10, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x29, 0x02, 0x00, 0x03, 0x12, 0x04, 0xc6, 0x03,
+    0x13, 0x14, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x29, 0x02, 0x01, 0x12, 0x04, 0xc7, 0x03, 0x02, 0x12,
+    0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x29, 0x02, 0x01, 0x05, 0x12, 0x04, 0xc7, 0x03, 0x02, 0x08, 0x0a,
+    0x0d, 0x0a, 0x05, 0x04, 0x29, 0x02, 0x01, 0x01, 0x12, 0x04, 0xc7, 0x03, 0x09, 0x0d, 0x0a, 0x0d,
+    0x0a, 0x05, 0x04, 0x29, 0x02, 0x01, 0x03, 0x12, 0x04, 0xc7, 0x03, 0x10, 0x11, 0x0a, 0x0c, 0x0a,
+    0x02, 0x04, 0x2a, 0x12, 0x06, 0xca, 0x03, 0x00, 0xcf, 0x03, 0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04,
+    0x2a, 0x01, 0x12, 0x04, 0xca, 0x03, 0x08, 0x15, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x2a, 0x02, 0x00,
+    0x12, 0x04, 0xcb, 0x03, 0x02, 0x15, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2a, 0x02, 0x00, 0x05, 0x12,
+    0x04, 0xcb, 0x03, 0x02, 0x08, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2a, 0x02, 0x00, 0x01, 0x12, 0x04,
+    0xcb, 0x03, 0x09, 0x10, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2a, 0x02, 0x00, 0x03, 0x12, 0x04, 0xcb,
+    0x03, 0x13, 0x14, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x2a, 0x02, 0x01, 0x12, 0x04, 0xcc, 0x03, 0x02,
+    0x14, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2a, 0x02, 0x01, 0x05, 0x12, 0x04, 0xcc, 0x03, 0x02, 0x08,
+    0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2a, 0x02, 0x01, 0x01, 0x12, 0x04, 0xcc, 0x03, 0x09, 0x0f, 0x0a,
+    0x0d, 0x0a, 0x05, 0x04, 0x2a, 0x02, 0x01, 0x03, 0x12, 0x04, 0xcc, 0x03, 0x12, 0x13, 0x0a, 0x0c,
+    0x0a, 0x04, 0x04, 0x2a, 0x02, 0x02, 0x12, 0x04, 0xcd, 0x03, 0x02, 0x12, 0x0a, 0x0d, 0x0a, 0x05,
+    0x04, 0x2a, 0x02, 0x02, 0x05, 0x12, 0x04, 0xcd, 0x03, 0x02, 0x08, 0x0a, 0x0d, 0x0a, 0x05, 0x04,
+    0x2a, 0x02, 0x02, 0x01, 0x12, 0x04, 0xcd, 0x03, 0x09, 0x0d, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2a,
+    0x02, 0x02, 0x03, 0x12, 0x04, 0xcd, 0x03, 0x10, 0x11, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x2a, 0x02,
+    0x03, 0x12, 0x04, 0xce, 0x03, 0x02, 0x2c, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2a, 0x02, 0x03, 0x04,
+    0x12, 0x04, 0xce, 0x03, 0x02, 0x0a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2a, 0x02, 0x03, 0x06, 0x12,
+    0x04, 0xce, 0x03, 0x0b, 0x13, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2a, 0x02, 0x03, 0x01, 0x12, 0x04,
+    0xce, 0x03, 0x14, 0x27, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2a, 0x02, 0x03, 0x03, 0x12, 0x04, 0xce,
+    0x03, 0x2a, 0x2b, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x2b, 0x12, 0x06, 0xd1, 0x03, 0x00, 0xe5, 0x03,
+    0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x2b, 0x01, 0x12, 0x04, 0xd1, 0x03, 0x08, 0x11, 0x0a, 0x0e,
+    0x0a, 0x04, 0x04, 0x2b, 0x04, 0x00, 0x12, 0x06, 0xd2, 0x03, 0x02, 0xda, 0x03, 0x03, 0x0a, 0x0d,
+    0x0a, 0x05, 0x04, 0x2b, 0x04, 0x00, 0x01, 0x12, 0x04, 0xd2, 0x03, 0x07, 0x0b, 0x0a, 0x0e, 0x0a,
+    0x06, 0x04, 0x2b, 0x04, 0x00, 0x02, 0x00, 0x12, 0x04, 0xd3, 0x03, 0x04, 0x19, 0x0a, 0x0f, 0x0a,
+    0x07, 0x04, 0x2b, 0x04, 0x00, 0x02, 0x00, 0x01, 0x12, 0x04, 0xd3, 0x03, 0x04, 0x14, 0x0a, 0x0f,
+    0x0a, 0x07, 0x04, 0x2b, 0x04, 0x00, 0x02, 0x00, 0x02, 0x12, 0x04, 0xd3, 0x03, 0x17, 0x18, 0x0a,
+    0x0e, 0x0a, 0x06, 0x04, 0x2b, 0x04, 0x00, 0x02, 0x01, 0x12, 0x04, 0xd4, 0x03, 0x04, 0x15, 0x0a,
+    0x0f, 0x0a, 0x07, 0x04, 0x2b, 0x04, 0x00, 0x02, 0x01, 0x01, 0x12, 0x04, 0xd4, 0x03, 0x04, 0x10,
+    0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x2b, 0x04, 0x00, 0x02, 0x01, 0x02, 0x12, 0x04, 0xd4, 0x03, 0x13,
+    0x14, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x2b, 0x04, 0x00, 0x02, 0x02, 0x12, 0x04, 0xd5, 0x03, 0x04,
+    0x1b, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x2b, 0x04, 0x00, 0x02, 0x02, 0x01, 0x12, 0x04, 0xd5, 0x03,
+    0x04, 0x16, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x2b, 0x04, 0x00, 0x02, 0x02, 0x02, 0x12, 0x04, 0xd5,
+    0x03, 0x19, 0x1a, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x2b, 0x04, 0x00, 0x02, 0x03, 0x12, 0x04, 0xd6,
+    0x03, 0x04, 0x19, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x2b, 0x04, 0x00, 0x02, 0x03, 0x01, 0x12, 0x04,
+    0xd6, 0x03, 0x04, 0x14, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x2b, 0x04, 0x00, 0x02, 0x03, 0x02, 0x12,
+    0x04, 0xd6, 0x03, 0x17, 0x18, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x2b, 0x04, 0x00, 0x02, 0x04, 0x12,
+    0x04, 0xd7, 0x03, 0x04, 0x17, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x2b, 0x04, 0x00, 0x02, 0x04, 0x01,
+    0x12, 0x04, 0xd7, 0x03, 0x04, 0x12, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x2b, 0x04, 0x00, 0x02, 0x04,
+    0x02, 0x12, 0x04, 0xd7, 0x03, 0x15, 0x16, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x2b, 0x04, 0x00, 0x02,
+    0x05, 0x12, 0x04, 0xd8, 0x03, 0x04, 0x1b, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x2b, 0x04, 0x00, 0x02,
+    0x05, 0x01, 0x12, 0x04, 0xd8, 0x03, 0x04, 0x16, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x2b, 0x04, 0x00,
+    0x02, 0x05, 0x02, 0x12, 0x04, 0xd8, 0x03, 0x19, 0x1a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2b, 0x04,
+    0x00, 0x04, 0x12, 0x04, 0xd9, 0x03, 0x04, 0x0f, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x2b, 0x04, 0x00,
+    0x04, 0x00, 0x12, 0x04, 0xd9, 0x03, 0x0d, 0x0e, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x2b, 0x04, 0x00,
+    0x04, 0x00, 0x01, 0x12, 0x04, 0xd9, 0x03, 0x0d, 0x0e, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x2b, 0x04,
+    0x00, 0x04, 0x00, 0x02, 0x12, 0x04, 0xd9, 0x03, 0x0d, 0x0e, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x2b,
+    0x02, 0x00, 0x12, 0x04, 0xdc, 0x03, 0x02, 0x10, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2b, 0x02, 0x00,
+    0x06, 0x12, 0x04, 0xdc, 0x03, 0x02, 0x06, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2b, 0x02, 0x00, 0x01,
+    0x12, 0x04, 0xdc, 0x03, 0x07, 0x0b, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2b, 0x02, 0x00, 0x03, 0x12,
+    0x04, 0xdc, 0x03, 0x0e, 0x0f, 0x0a, 0x0e, 0x0a, 0x04, 0x04, 0x2b, 0x08, 0x00, 0x12, 0x06, 0xdd,
+    0x03, 0x02, 0xe4, 0x03, 0x03, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2b, 0x08, 0x00, 0x01, 0x12, 0x04,
+    0xdd, 0x03, 0x08, 0x11, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x2b, 0x02, 0x01, 0x12, 0x04, 0xde, 0x03,
+    0x04, 0x21, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2b, 0x02, 0x01, 0x06, 0x12, 0x04, 0xde, 0x03, 0x04,
+    0x14, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2b, 0x02, 0x01, 0x01, 0x12, 0x04, 0xde, 0x03, 0x15, 0x1c,
+    0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2b, 0x02, 0x01, 0x03, 0x12, 0x04, 0xde, 0x03, 0x1f, 0x20, 0x0a,
+    0x0c, 0x0a, 0x04, 0x04, 0x2b, 0x02, 0x02, 0x12, 0x04, 0xdf, 0x03, 0x04, 0x2c, 0x0a, 0x0d, 0x0a,
+    0x05, 0x04, 0x2b, 0x02, 0x02, 0x06, 0x12, 0x04, 0xdf, 0x03, 0x04, 0x19, 0x0a, 0x0d, 0x0a, 0x05,
+    0x04, 0x2b, 0x02, 0x02, 0x01, 0x12, 0x04, 0xdf, 0x03, 0x1a, 0x27, 0x0a, 0x0d, 0x0a, 0x05, 0x04,
+    0x2b, 0x02, 0x02, 0x03, 0x12, 0x04, 0xdf, 0x03, 0x2a, 0x2b, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x2b,
+    0x02, 0x03, 0x12, 0x04, 0xe0, 0x03, 0x04, 0x28, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2b, 0x02, 0x03,
+    0x06, 0x12, 0x04, 0xe0, 0x03, 0x04, 0x17, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2b, 0x02, 0x03, 0x01,
+    0x12, 0x04, 0xe0, 0x03, 0x18, 0x23, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2b, 0x02, 0x03, 0x03, 0x12,
+    0x04, 0xe0, 0x03, 0x26, 0x27, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x2b, 0x02, 0x04, 0x12, 0x04, 0xe1,
+    0x03, 0x04, 0x24, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2b, 0x02, 0x04, 0x06, 0x12, 0x04, 0xe1, 0x03,
+    0x04, 0x15, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2b, 0x02, 0x04, 0x01, 0x12, 0x04, 0xe1, 0x03, 0x16,
+    0x1f, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2b, 0x02, 0x04, 0x03, 0x12, 0x04, 0xe1, 0x03, 0x22, 0x23,
+    0x0a, 0x1e, 0x0a, 0x04, 0x04, 0x2b, 0x02, 0x05, 0x12, 0x04, 0xe3, 0x03, 0x04, 0x23, 0x1a, 0x10,
+    0x20, 0x36, 0x20, 0x69, 0x73, 0x20, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x2e, 0x0a,
+    0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2b, 0x02, 0x05, 0x06, 0x12, 0x04, 0xe3, 0x03, 0x04, 0x10, 0x0a,
+    0x0d, 0x0a, 0x05, 0x04, 0x2b, 0x02, 0x05, 0x01, 0x12, 0x04, 0xe3, 0x03, 0x11, 0x1e, 0x0a, 0x0d,
+    0x0a, 0x05, 0x04, 0x2b, 0x02, 0x05, 0x03, 0x12, 0x04, 0xe3, 0x03, 0x21, 0x22, 0x0a, 0x0c, 0x0a,
+    0x02, 0x04, 0x2c, 0x12, 0x06, 0xe7, 0x03, 0x00, 0xea, 0x03, 0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04,
+    0x2c, 0x01, 0x12, 0x04, 0xe7, 0x03, 0x08, 0x18, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x2c, 0x02, 0x00,
+    0x12, 0x04, 0xe8, 0x03, 0x02, 0x17, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2c, 0x02, 0x00, 0x05, 0x12,
+    0x04, 0xe8, 0x03, 0x02, 0x07, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2c, 0x02, 0x00, 0x01, 0x12, 0x04,
+    0xe8, 0x03, 0x08, 0x12, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2c, 0x02, 0x00, 0x03, 0x12, 0x04, 0xe8,
+    0x03, 0x15, 0x16, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x2c, 0x02, 0x01, 0x12, 0x04, 0xe9, 0x03, 0x02,
+    0x16, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2c, 0x02, 0x01, 0x05, 0x12, 0x04, 0xe9, 0x03, 0x02, 0x07,
+    0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2c, 0x02, 0x01, 0x01, 0x12, 0x04, 0xe9, 0x03, 0x08, 0x11, 0x0a,
+    0x0d, 0x0a, 0x05, 0x04, 0x2c, 0x02, 0x01, 0x03, 0x12, 0x04, 0xe9, 0x03, 0x14, 0x15, 0x0a, 0x0c,
+    0x0a, 0x02, 0x04, 0x2d, 0x12, 0x06, 0xec, 0x03, 0x00, 0xf1, 0x03, 0x01, 0x0a, 0x0b, 0x0a, 0x03,
+    0x04, 0x2d, 0x01, 0x12, 0x04, 0xec, 0x03, 0x08, 0x1d, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x2d, 0x02,
+    0x00, 0x12, 0x04, 0xed, 0x03, 0x02, 0x21, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2d, 0x02, 0x00, 0x04,
+    0x12, 0x04, 0xed, 0x03, 0x02, 0x0a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2d, 0x02, 0x00, 0x05, 0x12,
+    0x04, 0xed, 0x03, 0x0b, 0x10, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2d, 0x02, 0x00, 0x01, 0x12, 0x04,
+    0xed, 0x03, 0x11, 0x1c, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2d, 0x02, 0x00, 0x03, 0x12, 0x04, 0xed,
+    0x03, 0x1f, 0x20, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x2d, 0x02, 0x01, 0x12, 0x04, 0xee, 0x03, 0x02,
+    0x20, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2d, 0x02, 0x01, 0x04, 0x12, 0x04, 0xee, 0x03, 0x02, 0x0a,
+    0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2d, 0x02, 0x01, 0x05, 0x12, 0x04, 0xee, 0x03, 0x0b, 0x10, 0x0a,
+    0x0d, 0x0a, 0x05, 0x04, 0x2d, 0x02, 0x01, 0x01, 0x12, 0x04, 0xee, 0x03, 0x11, 0x1b, 0x0a, 0x0d,
+    0x0a, 0x05, 0x04, 0x2d, 0x02, 0x01, 0x03, 0x12, 0x04, 0xee, 0x03, 0x1e, 0x1f, 0x0a, 0x0c, 0x0a,
+    0x04, 0x04, 0x2d, 0x02, 0x02, 0x12, 0x04, 0xef, 0x03, 0x02, 0x17, 0x0a, 0x0d, 0x0a, 0x05, 0x04,
+    0x2d, 0x02, 0x02, 0x05, 0x12, 0x04, 0xef, 0x03, 0x02, 0x08, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2d,
+    0x02, 0x02, 0x01, 0x12, 0x04, 0xef, 0x03, 0x09, 0x12, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2d, 0x02,
+    0x02, 0x03, 0x12, 0x04, 0xef, 0x03, 0x15, 0x16, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x2d, 0x02, 0x03,
+    0x12, 0x04, 0xf0, 0x03, 0x02, 0x29, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2d, 0x02, 0x03, 0x04, 0x12,
+    0x04, 0xf0, 0x03, 0x02, 0x0a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2d, 0x02, 0x03, 0x05, 0x12, 0x04,
+    0xf0, 0x03, 0x0b, 0x11, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2d, 0x02, 0x03, 0x01, 0x12, 0x04, 0xf0,
+    0x03, 0x12, 0x24, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2d, 0x02, 0x03, 0x03, 0x12, 0x04, 0xf0, 0x03,
+    0x27, 0x28, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x2e, 0x12, 0x06, 0xf3, 0x03, 0x00, 0xf7, 0x03, 0x01,
+    0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x2e, 0x01, 0x12, 0x04, 0xf3, 0x03, 0x08, 0x1b, 0x0a, 0x0c, 0x0a,
+    0x04, 0x04, 0x2e, 0x02, 0x00, 0x12, 0x04, 0xf4, 0x03, 0x02, 0x1e, 0x0a, 0x0d, 0x0a, 0x05, 0x04,
+    0x2e, 0x02, 0x00, 0x06, 0x12, 0x04, 0xf4, 0x03, 0x02, 0x12, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2e,
+    0x02, 0x00, 0x01, 0x12, 0x04, 0xf4, 0x03, 0x13, 0x19, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2e, 0x02,
+    0x00, 0x03, 0x12, 0x04, 0xf4, 0x03, 0x1c, 0x1d, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x2e, 0x02, 0x01,
+    0x12, 0x04, 0xf5, 0x03, 0x02, 0x31, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2e, 0x02, 0x01, 0x04, 0x12,
+    0x04, 0xf5, 0x03, 0x02, 0x0a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2e, 0x02, 0x01, 0x05, 0x12, 0x04,
+    0xf5, 0x03, 0x0b, 0x11, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2e, 0x02, 0x01, 0x01, 0x12, 0x04, 0xf5,
+    0x03, 0x12, 0x2c, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2e, 0x02, 0x01, 0x03, 0x12, 0x04, 0xf5, 0x03,
+    0x2f, 0x30, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x2e, 0x02, 0x02, 0x12, 0x04, 0xf6, 0x03, 0x02, 0x32,
+    0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2e, 0x02, 0x02, 0x04, 0x12, 0x04, 0xf6, 0x03, 0x02, 0x0a, 0x0a,
+    0x0d, 0x0a, 0x05, 0x04, 0x2e, 0x02, 0x02, 0x06, 0x12, 0x04, 0xf6, 0x03, 0x0b, 0x1b, 0x0a, 0x0d,
+    0x0a, 0x05, 0x04, 0x2e, 0x02, 0x02, 0x01, 0x12, 0x04, 0xf6, 0x03, 0x1c, 0x2d, 0x0a, 0x0d, 0x0a,
+    0x05, 0x04, 0x2e, 0x02, 0x02, 0x03, 0x12, 0x04, 0xf6, 0x03, 0x30, 0x31, 0x0a, 0x0c, 0x0a, 0x02,
+    0x04, 0x2f, 0x12, 0x06, 0xf9, 0x03, 0x00, 0xff, 0x03, 0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x2f,
+    0x01, 0x12, 0x04, 0xf9, 0x03, 0x08, 0x19, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x2f, 0x02, 0x00, 0x12,
+    0x04, 0xfa, 0x03, 0x02, 0x1e, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2f, 0x02, 0x00, 0x06, 0x12, 0x04,
+    0xfa, 0x03, 0x02, 0x12, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2f, 0x02, 0x00, 0x01, 0x12, 0x04, 0xfa,
+    0x03, 0x13, 0x19, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2f, 0x02, 0x00, 0x03, 0x12, 0x04, 0xfa, 0x03,
+    0x1c, 0x1d, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x2f, 0x02, 0x01, 0x12, 0x04, 0xfb, 0x03, 0x02, 0x31,
+    0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2f, 0x02, 0x01, 0x04, 0x12, 0x04, 0xfb, 0x03, 0x02, 0x0a, 0x0a,
+    0x0d, 0x0a, 0x05, 0x04, 0x2f, 0x02, 0x01, 0x05, 0x12, 0x04, 0xfb, 0x03, 0x0b, 0x11, 0x0a, 0x0d,
+    0x0a, 0x05, 0x04, 0x2f, 0x02, 0x01, 0x01, 0x12, 0x04, 0xfb, 0x03, 0x12, 0x2c, 0x0a, 0x0d, 0x0a,
+    0x05, 0x04, 0x2f, 0x02, 0x01, 0x03, 0x12, 0x04, 0xfb, 0x03, 0x2f, 0x30, 0x0a, 0x0c, 0x0a, 0x04,
+    0x04, 0x2f, 0x02, 0x02, 0x12, 0x04, 0xfc, 0x03, 0x02, 0x32, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2f,
+    0x02, 0x02, 0x04, 0x12, 0x04, 0xfc, 0x03, 0x02, 0x0a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2f, 0x02,
+    0x02, 0x06, 0x12, 0x04, 0xfc, 0x03, 0x0b, 0x1b, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2f, 0x02, 0x02,
+    0x01, 0x12, 0x04, 0xfc, 0x03, 0x1c, 0x2d, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2f, 0x02, 0x02, 0x03,
+    0x12, 0x04, 0xfc, 0x03, 0x30, 0x31, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x2f, 0x02, 0x03, 0x12, 0x04,
+    0xfd, 0x03, 0x02, 0x1f, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2f, 0x02, 0x03, 0x05, 0x12, 0x04, 0xfd,
+    0x03, 0x02, 0x08, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2f, 0x02, 0x03, 0x01, 0x12, 0x04, 0xfd, 0x03,
+    0x09, 0x1a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x2f, 0x02, 0x03, 0x03, 0x12, 0x04, 0xfd, 0x03, 0x1d,
+    0x1e, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x2f, 0x02, 0x04, 0x12, 0x04, 0xfe, 0x03, 0x02, 0x28, 0x0a,
+    0x0d, 0x0a, 0x05, 0x04, 0x2f, 0x02, 0x04, 0x06, 0x12, 0x04, 0xfe, 0x03, 0x02, 0x12, 0x0a, 0x0d,
+    0x0a, 0x05, 0x04, 0x2f, 0x02, 0x04, 0x01, 0x12, 0x04, 0xfe, 0x03, 0x13, 0x23, 0x0a, 0x0d, 0x0a,
+    0x05, 0x04, 0x2f, 0x02, 0x04, 0x03, 0x12, 0x04, 0xfe, 0x03, 0x26, 0x27, 0x0a, 0x0c, 0x0a, 0x02,
+    0x04, 0x30, 0x12, 0x06, 0x81, 0x04, 0x00, 0x8c, 0x04, 0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x30,
+    0x01, 0x12, 0x04, 0x81, 0x04, 0x08, 0x14, 0x0a, 0x0e, 0x0a, 0x04, 0x04, 0x30, 0x04, 0x00, 0x12,
+    0x06, 0x82, 0x04, 0x02, 0x88, 0x04, 0x03, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x30, 0x04, 0x00, 0x01,
+    0x12, 0x04, 0x82, 0x04, 0x07, 0x0b, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x30, 0x04, 0x00, 0x02, 0x00,
+    0x12, 0x04, 0x83, 0x04, 0x04, 0x19, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x30, 0x04, 0x00, 0x02, 0x00,
+    0x01, 0x12, 0x04, 0x83, 0x04, 0x04, 0x14, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x30, 0x04, 0x00, 0x02,
+    0x00, 0x02, 0x12, 0x04, 0x83, 0x04, 0x17, 0x18, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x30, 0x04, 0x00,
+    0x02, 0x01, 0x12, 0x04, 0x84, 0x04, 0x04, 0x15, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x30, 0x04, 0x00,
+    0x02, 0x01, 0x01, 0x12, 0x04, 0x84, 0x04, 0x04, 0x10, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x30, 0x04,
+    0x00, 0x02, 0x01, 0x02, 0x12, 0x04, 0x84, 0x04, 0x13, 0x14, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x30,
+    0x04, 0x00, 0x02, 0x02, 0x12, 0x04, 0x85, 0x04, 0x04, 0x1d, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x30,
+    0x04, 0x00, 0x02, 0x02, 0x01, 0x12, 0x04, 0x85, 0x04, 0x04, 0x18, 0x0a, 0x0f, 0x0a, 0x07, 0x04,
+    0x30, 0x04, 0x00, 0x02, 0x02, 0x02, 0x12, 0x04, 0x85, 0x04, 0x1b, 0x1c, 0x0a, 0x0e, 0x0a, 0x06,
+    0x04, 0x30, 0x04, 0x00, 0x02, 0x03, 0x12, 0x04, 0x86, 0x04, 0x04, 0x1d, 0x0a, 0x0f, 0x0a, 0x07,
+    0x04, 0x30, 0x04, 0x00, 0x02, 0x03, 0x01, 0x12, 0x04, 0x86, 0x04, 0x04, 0x18, 0x0a, 0x0f, 0x0a,
+    0x07, 0x04, 0x30, 0x04, 0x00, 0x02, 0x03, 0x02, 0x12, 0x04, 0x86, 0x04, 0x1b, 0x1c, 0x0a, 0x0e,
+    0x0a, 0x06, 0x04, 0x30, 0x04, 0x00, 0x02, 0x04, 0x12, 0x04, 0x87, 0x04, 0x04, 0x15, 0x0a, 0x0f,
+    0x0a, 0x07, 0x04, 0x30, 0x04, 0x00, 0x02, 0x04, 0x01, 0x12, 0x04, 0x87, 0x04, 0x04, 0x10, 0x0a,
+    0x0f, 0x0a, 0x07, 0x04, 0x30, 0x04, 0x00, 0x02, 0x04, 0x02, 0x12, 0x04, 0x87, 0x04, 0x13, 0x14,
+    0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x30, 0x02, 0x00, 0x12, 0x04, 0x8a, 0x04, 0x02, 0x10, 0x0a, 0x0d,
+    0x0a, 0x05, 0x04, 0x30, 0x02, 0x00, 0x06, 0x12, 0x04, 0x8a, 0x04, 0x02, 0x06, 0x0a, 0x0d, 0x0a,
+    0x05, 0x04, 0x30, 0x02, 0x00, 0x01, 0x12, 0x04, 0x8a, 0x04, 0x07, 0x0b, 0x0a, 0x0d, 0x0a, 0x05,
+    0x04, 0x30, 0x02, 0x00, 0x03, 0x12, 0x04, 0x8a, 0x04, 0x0e, 0x0f, 0x0a, 0x0c, 0x0a, 0x04, 0x04,
+    0x30, 0x02, 0x01, 0x12, 0x04, 0x8b, 0x04, 0x02, 0x17, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x30, 0x02,
+    0x01, 0x05, 0x12, 0x04, 0x8b, 0x04, 0x02, 0x07, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x30, 0x02, 0x01,
+    0x01, 0x12, 0x04, 0x8b, 0x04, 0x08, 0x12, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x30, 0x02, 0x01, 0x03,
+    0x12, 0x04, 0x8b, 0x04, 0x15, 0x16, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x31, 0x12, 0x06, 0x8e, 0x04,
+    0x00, 0xa4, 0x04, 0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x31, 0x01, 0x12, 0x04, 0x8e, 0x04, 0x08,
+    0x14, 0x0a, 0x0e, 0x0a, 0x04, 0x04, 0x31, 0x04, 0x00, 0x12, 0x06, 0x8f, 0x04, 0x02, 0x95, 0x04,
+    0x03, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x31, 0x04, 0x00, 0x01, 0x12, 0x04, 0x8f, 0x04, 0x07, 0x0b,
+    0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x31, 0x04, 0x00, 0x02, 0x00, 0x12, 0x04, 0x90, 0x04, 0x04, 0x19,
+    0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x31, 0x04, 0x00, 0x02, 0x00, 0x01, 0x12, 0x04, 0x90, 0x04, 0x04,
+    0x14, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x31, 0x04, 0x00, 0x02, 0x00, 0x02, 0x12, 0x04, 0x90, 0x04,
+    0x17, 0x18, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x31, 0x04, 0x00, 0x02, 0x01, 0x12, 0x04, 0x91, 0x04,
+    0x04, 0x15, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x31, 0x04, 0x00, 0x02, 0x01, 0x01, 0x12, 0x04, 0x91,
+    0x04, 0x04, 0x10, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x31, 0x04, 0x00, 0x02, 0x01, 0x02, 0x12, 0x04,
+    0x91, 0x04, 0x13, 0x14, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x31, 0x04, 0x00, 0x02, 0x02, 0x12, 0x04,
+    0x92, 0x04, 0x04, 0x1d, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x31, 0x04, 0x00, 0x02, 0x02, 0x01, 0x12,
+    0x04, 0x92, 0x04, 0x04, 0x18, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x31, 0x04, 0x00, 0x02, 0x02, 0x02,
+    0x12, 0x04, 0x92, 0x04, 0x1b, 0x1c, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x31, 0x04, 0x00, 0x02, 0x03,
+    0x12, 0x04, 0x93, 0x04, 0x04, 0x16, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x31, 0x04, 0x00, 0x02, 0x03,
+    0x01, 0x12, 0x04, 0x93, 0x04, 0x04, 0x11, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x31, 0x04, 0x00, 0x02,
+    0x03, 0x02, 0x12, 0x04, 0x93, 0x04, 0x14, 0x15, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x31, 0x04, 0x00,
+    0x02, 0x04, 0x12, 0x04, 0x94, 0x04, 0x04, 0x15, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x31, 0x04, 0x00,
+    0x02, 0x04, 0x01, 0x12, 0x04, 0x94, 0x04, 0x04, 0x10, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x31, 0x04,
+    0x00, 0x02, 0x04, 0x02, 0x12, 0x04, 0x94, 0x04, 0x13, 0x14, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x31,
+    0x02, 0x00, 0x12, 0x04, 0x97, 0x04, 0x02, 0x10, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x31, 0x02, 0x00,
+    0x06, 0x12, 0x04, 0x97, 0x04, 0x02, 0x06, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x31, 0x02, 0x00, 0x01,
+    0x12, 0x04, 0x97, 0x04, 0x07, 0x0b, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x31, 0x02, 0x00, 0x03, 0x12,
+    0x04, 0x97, 0x04, 0x0e, 0x0f, 0x0a, 0x64, 0x0a, 0x04, 0x04, 0x31, 0x02, 0x01, 0x12, 0x04, 0x9b,
+    0x04, 0x02, 0x2a, 0x1a, 0x56, 0x20, 0x44, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64,
+    0x3a, 0x20, 0x75, 0x73, 0x65, 0x20, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x5f,
+    0x76, 0x61, 0x72, 0x69, 0x61, 0x6e, 0x74, 0x20, 0x69, 0x6e, 0x73, 0x74, 0x65, 0x61, 0x64, 0x2e,
+    0x0a, 0x20, 0x4e, 0x6f, 0x74, 0x65, 0x3a, 0x20, 0x3e, 0x3d, 0x20, 0x31, 0x2e, 0x31, 0x30, 0x2c,
+    0x20, 0x74, 0x68, 0x69, 0x73, 0x20, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x20, 0x69, 0x73, 0x20, 0x64,
+    0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x2e, 0x0a, 0x0a, 0x0d, 0x0a, 0x05, 0x04,
+    0x31, 0x02, 0x01, 0x05, 0x12, 0x04, 0x9b, 0x04, 0x02, 0x07, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x31,
+    0x02, 0x01, 0x01, 0x12, 0x04, 0x9b, 0x04, 0x08, 0x11, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x31, 0x02,
+    0x01, 0x03, 0x12, 0x04, 0x9b, 0x04, 0x14, 0x15, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x31, 0x02, 0x01,
+    0x08, 0x12, 0x04, 0x9b, 0x04, 0x16, 0x29, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x31, 0x02, 0x01, 0x08,
+    0x03, 0x12, 0x04, 0x9b, 0x04, 0x17, 0x28, 0x0a, 0x23, 0x0a, 0x04, 0x04, 0x31, 0x08, 0x00, 0x12,
+    0x06, 0x9e, 0x04, 0x02, 0xa3, 0x04, 0x03, 0x1a, 0x13, 0x20, 0x53, 0x75, 0x70, 0x70, 0x6f, 0x72,
+    0x74, 0x3a, 0x20, 0x3e, 0x3d, 0x20, 0x31, 0x2e, 0x31, 0x30, 0x2e, 0x0a, 0x0a, 0x0d, 0x0a, 0x05,
+    0x04, 0x31, 0x08, 0x00, 0x01, 0x12, 0x04, 0x9e, 0x04, 0x08, 0x19, 0x0a, 0x0c, 0x0a, 0x04, 0x04,
+    0x31, 0x02, 0x02, 0x12, 0x04, 0x9f, 0x04, 0x04, 0x18, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x31, 0x02,
+    0x02, 0x06, 0x12, 0x04, 0x9f, 0x04, 0x04, 0x0b, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x31, 0x02, 0x02,
+    0x01, 0x12, 0x04, 0x9f, 0x04, 0x0c, 0x13, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x31, 0x02, 0x02, 0x03,
+    0x12, 0x04, 0x9f, 0x04, 0x16, 0x17, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x31, 0x02, 0x03, 0x12, 0x04,
+    0xa0, 0x04, 0x04, 0x27, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x31, 0x02, 0x03, 0x06, 0x12, 0x04, 0xa0,
+    0x04, 0x04, 0x12, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x31, 0x02, 0x03, 0x01, 0x12, 0x04, 0xa0, 0x04,
+    0x13, 0x22, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x31, 0x02, 0x03, 0x03, 0x12, 0x04, 0xa0, 0x04, 0x25,
+    0x26, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x31, 0x02, 0x04, 0x12, 0x04, 0xa1, 0x04, 0x04, 0x1a, 0x0a,
+    0x0d, 0x0a, 0x05, 0x04, 0x31, 0x02, 0x04, 0x06, 0x12, 0x04, 0xa1, 0x04, 0x04, 0x0c, 0x0a, 0x0d,
+    0x0a, 0x05, 0x04, 0x31, 0x02, 0x04, 0x01, 0x12, 0x04, 0xa1, 0x04, 0x0d, 0x15, 0x0a, 0x0d, 0x0a,
+    0x05, 0x04, 0x31, 0x02, 0x04, 0x03, 0x12, 0x04, 0xa1, 0x04, 0x18, 0x19, 0x0a, 0x0c, 0x0a, 0x04,
+    0x04, 0x31, 0x02, 0x05, 0x12, 0x04, 0xa2, 0x04, 0x04, 0x18, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x31,
+    0x02, 0x05, 0x06, 0x12, 0x04, 0xa2, 0x04, 0x04, 0x0b, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x31, 0x02,
+    0x05, 0x01, 0x12, 0x04, 0xa2, 0x04, 0x0c, 0x13, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x31, 0x02, 0x05,
+    0x03, 0x12, 0x04, 0xa2, 0x04, 0x16, 0x17, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x32, 0x12, 0x06, 0xa6,
+    0x04, 0x00, 0xa8, 0x04, 0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x32, 0x01, 0x12, 0x04, 0xa6, 0x04,
+    0x08, 0x0f, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x32, 0x02, 0x00, 0x12, 0x04, 0xa7, 0x04, 0x02, 0x16,
+    0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x32, 0x02, 0x00, 0x05, 0x12, 0x04, 0xa7, 0x04, 0x02, 0x07, 0x0a,
+    0x0d, 0x0a, 0x05, 0x04, 0x32, 0x02, 0x00, 0x01, 0x12, 0x04, 0xa7, 0x04, 0x08, 0x11, 0x0a, 0x0d,
+    0x0a, 0x05, 0x04, 0x32, 0x02, 0x00, 0x03, 0x12, 0x04, 0xa7, 0x04, 0x14, 0x15, 0x0a, 0x0c, 0x0a,
+    0x02, 0x04, 0x33, 0x12, 0x06, 0xaa, 0x04, 0x00, 0xac, 0x04, 0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04,
+    0x33, 0x01, 0x12, 0x04, 0xaa, 0x04, 0x08, 0x16, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x33, 0x02, 0x00,
+    0x12, 0x04, 0xab, 0x04, 0x02, 0x16, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x33, 0x02, 0x00, 0x05, 0x12,
+    0x04, 0xab, 0x04, 0x02, 0x07, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x33, 0x02, 0x00, 0x01, 0x12, 0x04,
+    0xab, 0x04, 0x08, 0x11, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x33, 0x02, 0x00, 0x03, 0x12, 0x04, 0xab,
+    0x04, 0x14, 0x15, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x34, 0x12, 0x06, 0xae, 0x04, 0x00, 0xb0, 0x04,
+    0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x34, 0x01, 0x12, 0x04, 0xae, 0x04, 0x08, 0x10, 0x0a, 0x0c,
+    0x0a, 0x04, 0x04, 0x34, 0x02, 0x00, 0x12, 0x04, 0xaf, 0x04, 0x02, 0x16, 0x0a, 0x0d, 0x0a, 0x05,
+    0x04, 0x34, 0x02, 0x00, 0x05, 0x12, 0x04, 0xaf, 0x04, 0x02, 0x07, 0x0a, 0x0d, 0x0a, 0x05, 0x04,
+    0x34, 0x02, 0x00, 0x01, 0x12, 0x04, 0xaf, 0x04, 0x08, 0x11, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x34,
+    0x02, 0x00, 0x03, 0x12, 0x04, 0xaf, 0x04, 0x14, 0x15, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x35, 0x12,
+    0x06, 0xb2, 0x04, 0x00, 0xb4, 0x04, 0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x35, 0x01, 0x12, 0x04,
+    0xb2, 0x04, 0x08, 0x0f, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x35, 0x02, 0x00, 0x12, 0x04, 0xb3, 0x04,
+    0x02, 0x16, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x35, 0x02, 0x00, 0x05, 0x12, 0x04, 0xb3, 0x04, 0x02,
+    0x07, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x35, 0x02, 0x00, 0x01, 0x12, 0x04, 0xb3, 0x04, 0x08, 0x11,
+    0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x35, 0x02, 0x00, 0x03, 0x12, 0x04, 0xb3, 0x04, 0x14, 0x15, 0x0a,
+    0x0c, 0x0a, 0x02, 0x04, 0x36, 0x12, 0x06, 0xb6, 0x04, 0x00, 0xb9, 0x04, 0x01, 0x0a, 0x0b, 0x0a,
+    0x03, 0x04, 0x36, 0x01, 0x12, 0x04, 0xb6, 0x04, 0x08, 0x1a, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x36,
+    0x02, 0x00, 0x12, 0x04, 0xb7, 0x04, 0x02, 0x1e, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x36, 0x02, 0x00,
+    0x06, 0x12, 0x04, 0xb7, 0x04, 0x02, 0x0e, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x36, 0x02, 0x00, 0x01,
+    0x12, 0x04, 0xb7, 0x04, 0x0f, 0x19, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x36, 0x02, 0x00, 0x03, 0x12,
+    0x04, 0xb7, 0x04, 0x1c, 0x1d, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x36, 0x02, 0x01, 0x12, 0x04, 0xb8,
+    0x04, 0x02, 0x1d, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x36, 0x02, 0x01, 0x06, 0x12, 0x04, 0xb8, 0x04,
+    0x02, 0x0e, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x36, 0x02, 0x01, 0x01, 0x12, 0x04, 0xb8, 0x04, 0x0f,
+    0x18, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x36, 0x02, 0x01, 0x03, 0x12, 0x04, 0xb8, 0x04, 0x1b, 0x1c,
+    0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x37, 0x12, 0x06, 0xbb, 0x04, 0x00, 0xbe, 0x04, 0x01, 0x0a, 0x0b,
+    0x0a, 0x03, 0x04, 0x37, 0x01, 0x12, 0x04, 0xbb, 0x04, 0x08, 0x18, 0x0a, 0x0c, 0x0a, 0x04, 0x04,
+    0x37, 0x02, 0x00, 0x12, 0x04, 0xbc, 0x04, 0x02, 0x13, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x37, 0x02,
+    0x00, 0x05, 0x12, 0x04, 0xbc, 0x04, 0x02, 0x08, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x37, 0x02, 0x00,
+    0x01, 0x12, 0x04, 0xbc, 0x04, 0x09, 0x0e, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x37, 0x02, 0x00, 0x03,
+    0x12, 0x04, 0xbc, 0x04, 0x11, 0x12, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x37, 0x02, 0x01, 0x12, 0x04,
+    0xbd, 0x04, 0x02, 0x1d, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x37, 0x02, 0x01, 0x06, 0x12, 0x04, 0xbd,
+    0x04, 0x02, 0x0e, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x37, 0x02, 0x01, 0x01, 0x12, 0x04, 0xbd, 0x04,
+    0x0f, 0x18, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x37, 0x02, 0x01, 0x03, 0x12, 0x04, 0xbd, 0x04, 0x1b,
+    0x1c, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x38, 0x12, 0x06, 0xc0, 0x04, 0x00, 0xc4, 0x04, 0x01, 0x0a,
+    0x0b, 0x0a, 0x03, 0x04, 0x38, 0x01, 0x12, 0x04, 0xc0, 0x04, 0x08, 0x19, 0x0a, 0x0c, 0x0a, 0x04,
+    0x04, 0x38, 0x02, 0x00, 0x12, 0x04, 0xc1, 0x04, 0x02, 0x28, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x38,
+    0x02, 0x00, 0x04, 0x12, 0x04, 0xc1, 0x04, 0x02, 0x0a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x38, 0x02,
+    0x00, 0x06, 0x12, 0x04, 0xc1, 0x04, 0x0b, 0x17, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x38, 0x02, 0x00,
+    0x01, 0x12, 0x04, 0xc1, 0x04, 0x18, 0x23, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x38, 0x02, 0x00, 0x03,
+    0x12, 0x04, 0xc1, 0x04, 0x26, 0x27, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x38, 0x02, 0x01, 0x12, 0x04,
+    0xc2, 0x04, 0x02, 0x2b, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x38, 0x02, 0x01, 0x04, 0x12, 0x04, 0xc2,
+    0x04, 0x02, 0x0a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x38, 0x02, 0x01, 0x06, 0x12, 0x04, 0xc2, 0x04,
+    0x0b, 0x1b, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x38, 0x02, 0x01, 0x01, 0x12, 0x04, 0xc2, 0x04, 0x1c,
+    0x26, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x38, 0x02, 0x01, 0x03, 0x12, 0x04, 0xc2, 0x04, 0x29, 0x2a,
+    0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x38, 0x02, 0x02, 0x12, 0x04, 0xc3, 0x04, 0x02, 0x21, 0x0a, 0x0d,
+    0x0a, 0x05, 0x04, 0x38, 0x02, 0x02, 0x05, 0x12, 0x04, 0xc3, 0x04, 0x02, 0x08, 0x0a, 0x0d, 0x0a,
+    0x05, 0x04, 0x38, 0x02, 0x02, 0x01, 0x12, 0x04, 0xc3, 0x04, 0x09, 0x1c, 0x0a, 0x0d, 0x0a, 0x05,
+    0x04, 0x38, 0x02, 0x02, 0x03, 0x12, 0x04, 0xc3, 0x04, 0x1f, 0x20, 0x0a, 0x0c, 0x0a, 0x02, 0x04,
+    0x39, 0x12, 0x06, 0xc6, 0x04, 0x00, 0xc8, 0x04, 0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x39, 0x01,
+    0x12, 0x04, 0xc6, 0x04, 0x08, 0x14, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x39, 0x02, 0x00, 0x12, 0x04,
+    0xc7, 0x04, 0x02, 0x1e, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x39, 0x02, 0x00, 0x06, 0x12, 0x04, 0xc7,
+    0x04, 0x02, 0x12, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x39, 0x02, 0x00, 0x01, 0x12, 0x04, 0xc7, 0x04,
+    0x13, 0x19, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x39, 0x02, 0x00, 0x03, 0x12, 0x04, 0xc7, 0x04, 0x1c,
+    0x1d, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x3a, 0x12, 0x06, 0xca, 0x04, 0x00, 0xdd, 0x04, 0x01, 0x0a,
+    0x0b, 0x0a, 0x03, 0x04, 0x3a, 0x01, 0x12, 0x04, 0xca, 0x04, 0x08, 0x18, 0x0a, 0x0e, 0x0a, 0x04,
+    0x04, 0x3a, 0x04, 0x00, 0x12, 0x06, 0xcb, 0x04, 0x02, 0xd3, 0x04, 0x03, 0x0a, 0x0d, 0x0a, 0x05,
+    0x04, 0x3a, 0x04, 0x00, 0x01, 0x12, 0x04, 0xcb, 0x04, 0x07, 0x0b, 0x0a, 0x0e, 0x0a, 0x06, 0x04,
+    0x3a, 0x04, 0x00, 0x02, 0x00, 0x12, 0x04, 0xcc, 0x04, 0x04, 0x19, 0x0a, 0x0f, 0x0a, 0x07, 0x04,
+    0x3a, 0x04, 0x00, 0x02, 0x00, 0x01, 0x12, 0x04, 0xcc, 0x04, 0x04, 0x14, 0x0a, 0x0f, 0x0a, 0x07,
+    0x04, 0x3a, 0x04, 0x00, 0x02, 0x00, 0x02, 0x12, 0x04, 0xcc, 0x04, 0x17, 0x18, 0x0a, 0x0e, 0x0a,
+    0x06, 0x04, 0x3a, 0x04, 0x00, 0x02, 0x01, 0x12, 0x04, 0xcd, 0x04, 0x04, 0x15, 0x0a, 0x0f, 0x0a,
+    0x07, 0x04, 0x3a, 0x04, 0x00, 0x02, 0x01, 0x01, 0x12, 0x04, 0xcd, 0x04, 0x04, 0x10, 0x0a, 0x0f,
+    0x0a, 0x07, 0x04, 0x3a, 0x04, 0x00, 0x02, 0x01, 0x02, 0x12, 0x04, 0xcd, 0x04, 0x13, 0x14, 0x0a,
+    0x0e, 0x0a, 0x06, 0x04, 0x3a, 0x04, 0x00, 0x02, 0x02, 0x12, 0x04, 0xce, 0x04, 0x04, 0x1b, 0x0a,
+    0x0f, 0x0a, 0x07, 0x04, 0x3a, 0x04, 0x00, 0x02, 0x02, 0x01, 0x12, 0x04, 0xce, 0x04, 0x04, 0x16,
+    0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x3a, 0x04, 0x00, 0x02, 0x02, 0x02, 0x12, 0x04, 0xce, 0x04, 0x19,
+    0x1a, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x3a, 0x04, 0x00, 0x02, 0x03, 0x12, 0x04, 0xcf, 0x04, 0x04,
+    0x18, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x3a, 0x04, 0x00, 0x02, 0x03, 0x01, 0x12, 0x04, 0xcf, 0x04,
+    0x04, 0x13, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x3a, 0x04, 0x00, 0x02, 0x03, 0x02, 0x12, 0x04, 0xcf,
+    0x04, 0x16, 0x17, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x3a, 0x04, 0x00, 0x02, 0x04, 0x12, 0x04, 0xd0,
+    0x04, 0x04, 0x17, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x3a, 0x04, 0x00, 0x02, 0x04, 0x01, 0x12, 0x04,
+    0xd0, 0x04, 0x04, 0x12, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x3a, 0x04, 0x00, 0x02, 0x04, 0x02, 0x12,
+    0x04, 0xd0, 0x04, 0x15, 0x16, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x3a, 0x04, 0x00, 0x04, 0x12, 0x04,
+    0xd2, 0x04, 0x04, 0x0f, 0x0a, 0x0e, 0x0a, 0x06, 0x04, 0x3a, 0x04, 0x00, 0x04, 0x00, 0x12, 0x04,
+    0xd2, 0x04, 0x0d, 0x0e, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x3a, 0x04, 0x00, 0x04, 0x00, 0x01, 0x12,
+    0x04, 0xd2, 0x04, 0x0d, 0x0e, 0x0a, 0x0f, 0x0a, 0x07, 0x04, 0x3a, 0x04, 0x00, 0x04, 0x00, 0x02,
+    0x12, 0x04, 0xd2, 0x04, 0x0d, 0x0e, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x3a, 0x02, 0x00, 0x12, 0x04,
+    0xd5, 0x04, 0x02, 0x10, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x3a, 0x02, 0x00, 0x06, 0x12, 0x04, 0xd5,
+    0x04, 0x02, 0x06, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x3a, 0x02, 0x00, 0x01, 0x12, 0x04, 0xd5, 0x04,
+    0x07, 0x0b, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x3a, 0x02, 0x00, 0x03, 0x12, 0x04, 0xd5, 0x04, 0x0e,
+    0x0f, 0x0a, 0x0e, 0x0a, 0x04, 0x04, 0x3a, 0x08, 0x00, 0x12, 0x06, 0xd6, 0x04, 0x02, 0xdc, 0x04,
+    0x03, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x3a, 0x08, 0x00, 0x01, 0x12, 0x04, 0xd6, 0x04, 0x08, 0x11,
+    0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x3a, 0x02, 0x01, 0x12, 0x04, 0xd7, 0x04, 0x04, 0x21, 0x0a, 0x0d,
+    0x0a, 0x05, 0x04, 0x3a, 0x02, 0x01, 0x06, 0x12, 0x04, 0xd7, 0x04, 0x04, 0x14, 0x0a, 0x0d, 0x0a,
+    0x05, 0x04, 0x3a, 0x02, 0x01, 0x01, 0x12, 0x04, 0xd7, 0x04, 0x15, 0x1c, 0x0a, 0x0d, 0x0a, 0x05,
+    0x04, 0x3a, 0x02, 0x01, 0x03, 0x12, 0x04, 0xd7, 0x04, 0x1f, 0x20, 0x0a, 0x0c, 0x0a, 0x04, 0x04,
+    0x3a, 0x02, 0x02, 0x12, 0x04, 0xd8, 0x04, 0x04, 0x2c, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x3a, 0x02,
+    0x02, 0x06, 0x12, 0x04, 0xd8, 0x04, 0x04, 0x19, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x3a, 0x02, 0x02,
+    0x01, 0x12, 0x04, 0xd8, 0x04, 0x1a, 0x27, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x3a, 0x02, 0x02, 0x03,
+    0x12, 0x04, 0xd8, 0x04, 0x2a, 0x2b, 0x0a, 0x1e, 0x0a, 0x04, 0x04, 0x3a, 0x02, 0x03, 0x12, 0x04,
+    0xda, 0x04, 0x04, 0x30, 0x1a, 0x10, 0x20, 0x34, 0x20, 0x69, 0x73, 0x20, 0x72, 0x65, 0x73, 0x65,
+    0x72, 0x76, 0x65, 0x64, 0x2e, 0x0a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x3a, 0x02, 0x03, 0x06, 0x12,
+    0x04, 0xda, 0x04, 0x04, 0x16, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x3a, 0x02, 0x03, 0x01, 0x12, 0x04,
+    0xda, 0x04, 0x17, 0x2b, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x3a, 0x02, 0x03, 0x03, 0x12, 0x04, 0xda,
+    0x04, 0x2e, 0x2f, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x3a, 0x02, 0x04, 0x12, 0x04, 0xdb, 0x04, 0x04,
+    0x2e, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x3a, 0x02, 0x04, 0x06, 0x12, 0x04, 0xdb, 0x04, 0x04, 0x15,
+    0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x3a, 0x02, 0x04, 0x01, 0x12, 0x04, 0xdb, 0x04, 0x16, 0x29, 0x0a,
+    0x0d, 0x0a, 0x05, 0x04, 0x3a, 0x02, 0x04, 0x03, 0x12, 0x04, 0xdb, 0x04, 0x2c, 0x2d, 0x0a, 0x0c,
+    0x0a, 0x02, 0x04, 0x3b, 0x12, 0x06, 0xdf, 0x04, 0x00, 0xe3, 0x04, 0x01, 0x0a, 0x0b, 0x0a, 0x03,
+    0x04, 0x3b, 0x01, 0x12, 0x04, 0xdf, 0x04, 0x08, 0x1b, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x3b, 0x02,
+    0x00, 0x12, 0x04, 0xe0, 0x04, 0x02, 0x1f, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x3b, 0x02, 0x00, 0x05,
+    0x12, 0x04, 0xe0, 0x04, 0x02, 0x08, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x3b, 0x02, 0x00, 0x01, 0x12,
+    0x04, 0xe0, 0x04, 0x09, 0x1a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x3b, 0x02, 0x00, 0x03, 0x12, 0x04,
+    0xe0, 0x04, 0x1d, 0x1e, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x3b, 0x02, 0x01, 0x12, 0x04, 0xe1, 0x04,
+    0x02, 0x2d, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x3b, 0x02, 0x01, 0x04, 0x12, 0x04, 0xe1, 0x04, 0x02,
+    0x0a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x3b, 0x02, 0x01, 0x06, 0x12, 0x04, 0xe1, 0x04, 0x0b, 0x18,
+    0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x3b, 0x02, 0x01, 0x01, 0x12, 0x04, 0xe1, 0x04, 0x19, 0x28, 0x0a,
+    0x0d, 0x0a, 0x05, 0x04, 0x3b, 0x02, 0x01, 0x03, 0x12, 0x04, 0xe1, 0x04, 0x2b, 0x2c, 0x0a, 0x0c,
+    0x0a, 0x04, 0x04, 0x3b, 0x02, 0x02, 0x12, 0x04, 0xe2, 0x04, 0x02, 0x32, 0x0a, 0x0d, 0x0a, 0x05,
+    0x04, 0x3b, 0x02, 0x02, 0x04, 0x12, 0x04, 0xe2, 0x04, 0x02, 0x0a, 0x0a, 0x0d, 0x0a, 0x05, 0x04,
+    0x3b, 0x02, 0x02, 0x06, 0x12, 0x04, 0xe2, 0x04, 0x0b, 0x1a, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x3b,
+    0x02, 0x02, 0x01, 0x12, 0x04, 0xe2, 0x04, 0x1b, 0x2d, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x3b, 0x02,
+    0x02, 0x03, 0x12, 0x04, 0xe2, 0x04, 0x30, 0x31, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x3c, 0x12, 0x06,
+    0xe5, 0x04, 0x00, 0xe8, 0x04, 0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x3c, 0x01, 0x12, 0x04, 0xe5,
+    0x04, 0x08, 0x15, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x3c, 0x02, 0x00, 0x12, 0x04, 0xe6, 0x04, 0x02,
+    0x1c, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x3c, 0x02, 0x00, 0x05, 0x12, 0x04, 0xe6, 0x04, 0x02, 0x08,
+    0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x3c, 0x02, 0x00, 0x01, 0x12, 0x04, 0xe6, 0x04, 0x09, 0x17, 0x0a,
+    0x0d, 0x0a, 0x05, 0x04, 0x3c, 0x02, 0x00, 0x03, 0x12, 0x04, 0xe6, 0x04, 0x1a, 0x1b, 0x0a, 0x0c,
+    0x0a, 0x04, 0x04, 0x3c, 0x02, 0x01, 0x12, 0x04, 0xe7, 0x04, 0x02, 0x19, 0x0a, 0x0d, 0x0a, 0x05,
+    0x04, 0x3c, 0x02, 0x01, 0x05, 0x12, 0x04, 0xe7, 0x04, 0x02, 0x08, 0x0a, 0x0d, 0x0a, 0x05, 0x04,
+    0x3c, 0x02, 0x01, 0x01, 0x12, 0x04, 0xe7, 0x04, 0x09, 0x14, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x3c,
+    0x02, 0x01, 0x03, 0x12, 0x04, 0xe7, 0x04, 0x17, 0x18, 0x0a, 0x0c, 0x0a, 0x02, 0x04, 0x3d, 0x12,
+    0x06, 0xea, 0x04, 0x00, 0xed, 0x04, 0x01, 0x0a, 0x0b, 0x0a, 0x03, 0x04, 0x3d, 0x01, 0x12, 0x04,
+    0xea, 0x04, 0x08, 0x17, 0x0a, 0x0c, 0x0a, 0x04, 0x04, 0x3d, 0x02, 0x00, 0x12, 0x04, 0xeb, 0x04,
+    0x02, 0x17, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x3d, 0x02, 0x00, 0x05, 0x12, 0x04, 0xeb, 0x04, 0x02,
+    0x08, 0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x3d, 0x02, 0x00, 0x01, 0x12, 0x04, 0xeb, 0x04, 0x09, 0x12,
+    0x0a, 0x0d, 0x0a, 0x05, 0x04, 0x3d, 0x02, 0x00, 0x03, 0x12, 0x04, 0xeb, 0x04, 0x15, 0x16, 0x0a,
+    0x0c, 0x0a, 0x04, 0x04, 0x3d, 0x02, 0x01, 0x12, 0x04, 0xec, 0x04, 0x02, 0x19, 0x0a, 0x0d, 0x0a,
+    0x05, 0x04, 0x3d, 0x02, 0x01, 0x05, 0x12, 0x04, 0xec, 0x04, 0x02, 0x08, 0x0a, 0x0d, 0x0a, 0x05,
+    0x04, 0x3d, 0x02, 0x01, 0x01, 0x12, 0x04, 0xec, 0x04, 0x09, 0x14, 0x0a, 0x0d, 0x0a, 0x05, 0x04,
+    0x3d, 0x02, 0x01, 0x03, 0x12, 0x04, 0xec, 0x04, 0x17, 0x18, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
+    0x6f, 0x33,
 ];
 include!("aptos.transaction.v1.serde.rs");
 // @@protoc_insertion_point(module)
diff --git a/protos/rust/src/pb/aptos.transaction.v1.serde.rs b/protos/rust/src/pb/aptos.transaction.v1.serde.rs
index bb9e563f7e1bc..3af6e841d0614 100644
--- a/protos/rust/src/pb/aptos.transaction.v1.serde.rs
+++ b/protos/rust/src/pb/aptos.transaction.v1.serde.rs
@@ -839,6 +839,248 @@ impl<'de> serde::Deserialize<'de> for Block {
         deserializer.deserialize_struct("aptos.transaction.v1.Block", FIELDS, GeneratedVisitor)
     }
 }
+impl serde::Serialize for BlockEndInfo {
+    #[allow(deprecated)]
+    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        use serde::ser::SerializeStruct;
+        let mut len = 0;
+        if self.block_gas_limit_reached {
+            len += 1;
+        }
+        if self.block_output_limit_reached {
+            len += 1;
+        }
+        if self.block_effective_block_gas_units != 0 {
+            len += 1;
+        }
+        if self.block_approx_output_size != 0 {
+            len += 1;
+        }
+        let mut struct_ser = serializer.serialize_struct("aptos.transaction.v1.BlockEndInfo", len)?;
+        if self.block_gas_limit_reached {
+            struct_ser.serialize_field("blockGasLimitReached", &self.block_gas_limit_reached)?;
+        }
+        if self.block_output_limit_reached {
+            struct_ser.serialize_field("blockOutputLimitReached", &self.block_output_limit_reached)?;
+        }
+        if self.block_effective_block_gas_units != 0 {
+            struct_ser.serialize_field("blockEffectiveBlockGasUnits", ToString::to_string(&self.block_effective_block_gas_units).as_str())?;
+        }
+        if self.block_approx_output_size != 0 {
+            struct_ser.serialize_field("blockApproxOutputSize", ToString::to_string(&self.block_approx_output_size).as_str())?;
+        }
+        struct_ser.end()
+    }
+}
+impl<'de> serde::Deserialize<'de> for BlockEndInfo {
+    #[allow(deprecated)]
+    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        const FIELDS: &[&str] = &[
+            "block_gas_limit_reached",
+            "blockGasLimitReached",
+            "block_output_limit_reached",
+            "blockOutputLimitReached",
+            "block_effective_block_gas_units",
+            "blockEffectiveBlockGasUnits",
+            "block_approx_output_size",
+            "blockApproxOutputSize",
+        ];
+
+        #[allow(clippy::enum_variant_names)]
+        enum GeneratedField {
+            BlockGasLimitReached,
+            BlockOutputLimitReached,
+            BlockEffectiveBlockGasUnits,
+            BlockApproxOutputSize,
+        }
+        impl<'de> serde::Deserialize<'de> for GeneratedField {
+            fn deserialize<D>(deserializer: D) -> std::result::Result<GeneratedField, D::Error>
+            where
+                D: serde::Deserializer<'de>,
+            {
+                struct GeneratedVisitor;
+
+                impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
+                    type Value = GeneratedField;
+
+                    fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+                        write!(formatter, "expected one of: {:?}", &FIELDS)
+                    }
+
+                    #[allow(unused_variables)]
+                    fn visit_str<E>(self, value: &str) -> std::result::Result<GeneratedField, E>
+                    where
+                        E: serde::de::Error,
+                    {
+                        match value {
+                            "blockGasLimitReached" | "block_gas_limit_reached" => Ok(GeneratedField::BlockGasLimitReached),
+                            "blockOutputLimitReached" | "block_output_limit_reached" => Ok(GeneratedField::BlockOutputLimitReached),
+                            "blockEffectiveBlockGasUnits" | "block_effective_block_gas_units" => Ok(GeneratedField::BlockEffectiveBlockGasUnits),
+                            "blockApproxOutputSize" | "block_approx_output_size" => Ok(GeneratedField::BlockApproxOutputSize),
+                            _ => Err(serde::de::Error::unknown_field(value, FIELDS)),
+                        }
+                    }
+                }
+                deserializer.deserialize_identifier(GeneratedVisitor)
+            }
+        }
+        struct GeneratedVisitor;
+        impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
+            type Value = BlockEndInfo;
+
+            fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+                formatter.write_str("struct aptos.transaction.v1.BlockEndInfo")
+            }
+
+            fn visit_map<V>(self, mut map: V) -> std::result::Result<BlockEndInfo, V::Error>
+                where
+                    V: serde::de::MapAccess<'de>,
+            {
+                let mut block_gas_limit_reached__ = None;
+                let mut block_output_limit_reached__ = None;
+                let mut block_effective_block_gas_units__ = None;
+                let mut block_approx_output_size__ = None;
+                while let Some(k) = map.next_key()? {
+                    match k {
+                        GeneratedField::BlockGasLimitReached => {
+                            if block_gas_limit_reached__.is_some() {
+                                return Err(serde::de::Error::duplicate_field("blockGasLimitReached"));
+                            }
+                            block_gas_limit_reached__ = Some(map.next_value()?);
+                        }
+                        GeneratedField::BlockOutputLimitReached => {
+                            if block_output_limit_reached__.is_some() {
+                                return Err(serde::de::Error::duplicate_field("blockOutputLimitReached"));
+                            }
+                            block_output_limit_reached__ = Some(map.next_value()?);
+                        }
+                        GeneratedField::BlockEffectiveBlockGasUnits => {
+                            if block_effective_block_gas_units__.is_some() {
+                                return Err(serde::de::Error::duplicate_field("blockEffectiveBlockGasUnits"));
+                            }
+                            block_effective_block_gas_units__ =
+                                Some(map.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0)
+                            ;
+                        }
+                        GeneratedField::BlockApproxOutputSize => {
+                            if block_approx_output_size__.is_some() {
+                                return Err(serde::de::Error::duplicate_field("blockApproxOutputSize"));
+                            }
+                            block_approx_output_size__ =
+                                Some(map.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0)
+                            ;
+                        }
+                    }
+                }
+                Ok(BlockEndInfo {
+                    block_gas_limit_reached: block_gas_limit_reached__.unwrap_or_default(),
+                    block_output_limit_reached: block_output_limit_reached__.unwrap_or_default(),
+                    block_effective_block_gas_units: block_effective_block_gas_units__.unwrap_or_default(),
+                    block_approx_output_size: block_approx_output_size__.unwrap_or_default(),
+                })
+            }
+        }
+        deserializer.deserialize_struct("aptos.transaction.v1.BlockEndInfo", FIELDS, GeneratedVisitor)
+    }
+}
+impl serde::Serialize for BlockEpilogueTransaction {
+    #[allow(deprecated)]
+    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        use serde::ser::SerializeStruct;
+        let mut len = 0;
+        if self.block_end_info.is_some() {
+            len += 1;
+        }
+        let mut struct_ser = serializer.serialize_struct("aptos.transaction.v1.BlockEpilogueTransaction", len)?;
+        if let Some(v) = self.block_end_info.as_ref() {
+            struct_ser.serialize_field("blockEndInfo", v)?;
+        }
+        struct_ser.end()
+    }
+}
+impl<'de> serde::Deserialize<'de> for BlockEpilogueTransaction {
+    #[allow(deprecated)]
+    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        const FIELDS: &[&str] = &[
+            "block_end_info",
+            "blockEndInfo",
+        ];
+
+        #[allow(clippy::enum_variant_names)]
+        enum GeneratedField {
+            BlockEndInfo,
+        }
+        impl<'de> serde::Deserialize<'de> for GeneratedField {
+            fn deserialize<D>(deserializer: D) -> std::result::Result<GeneratedField, D::Error>
+            where
+                D: serde::Deserializer<'de>,
+            {
+                struct GeneratedVisitor;
+
+                impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
+                    type Value = GeneratedField;
+
+                    fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+                        write!(formatter, "expected one of: {:?}", &FIELDS)
+                    }
+
+                    #[allow(unused_variables)]
+                    fn visit_str<E>(self, value: &str) -> std::result::Result<GeneratedField, E>
+                    where
+                        E: serde::de::Error,
+                    {
+                        match value {
+                            "blockEndInfo" | "block_end_info" => Ok(GeneratedField::BlockEndInfo),
+                            _ => Err(serde::de::Error::unknown_field(value, FIELDS)),
+                        }
+                    }
+                }
+                deserializer.deserialize_identifier(GeneratedVisitor)
+            }
+        }
+        struct GeneratedVisitor;
+        impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
+            type Value = BlockEpilogueTransaction;
+
+            fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+                formatter.write_str("struct aptos.transaction.v1.BlockEpilogueTransaction")
+            }
+
+            fn visit_map<V>(self, mut map: V) -> std::result::Result<BlockEpilogueTransaction, V::Error>
+                where
+                    V: serde::de::MapAccess<'de>,
+            {
+                let mut block_end_info__ = None;
+                while let Some(k) = map.next_key()? {
+                    match k {
+                        GeneratedField::BlockEndInfo => {
+                            if block_end_info__.is_some() {
+                                return Err(serde::de::Error::duplicate_field("blockEndInfo"));
+                            }
+                            block_end_info__ = map.next_value()?;
+                        }
+                    }
+                }
+                Ok(BlockEpilogueTransaction {
+                    block_end_info: block_end_info__,
+                })
+            }
+        }
+        deserializer.deserialize_struct("aptos.transaction.v1.BlockEpilogueTransaction", FIELDS, GeneratedVisitor)
+    }
+}
 impl serde::Serialize for BlockMetadataTransaction {
     #[allow(deprecated)]
     fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
@@ -3920,6 +4162,9 @@ impl serde::Serialize for MoveStruct {
         if self.is_native {
             len += 1;
         }
+        if self.is_event {
+            len += 1;
+        }
         if !self.abilities.is_empty() {
             len += 1;
         }
@@ -3936,6 +4181,9 @@ impl serde::Serialize for MoveStruct {
         if self.is_native {
             struct_ser.serialize_field("isNative", &self.is_native)?;
         }
+        if self.is_event {
+            struct_ser.serialize_field("isEvent", &self.is_event)?;
+        }
         if !self.abilities.is_empty() {
             let v = self.abilities.iter().cloned().map(|v| {
                 MoveAbility::from_i32(v)
@@ -3962,6 +4210,8 @@ impl<'de> serde::Deserialize<'de> for MoveStruct {
             "name",
             "is_native",
             "isNative",
+            "is_event",
+            "isEvent",
             "abilities",
             "generic_type_params",
             "genericTypeParams",
@@ -3972,6 +4222,7 @@ impl<'de> serde::Deserialize<'de> for MoveStruct {
         enum GeneratedField {
             Name,
             IsNative,
+            IsEvent,
             Abilities,
             GenericTypeParams,
             Fields,
@@ -3998,6 +4249,7 @@ impl<'de> serde::Deserialize<'de> for MoveStruct {
                         match value {
                             "name" => Ok(GeneratedField::Name),
                             "isNative" | "is_native" => Ok(GeneratedField::IsNative),
+                            "isEvent" | "is_event" => Ok(GeneratedField::IsEvent),
                             "abilities" => Ok(GeneratedField::Abilities),
                             "genericTypeParams" | "generic_type_params" => Ok(GeneratedField::GenericTypeParams),
                             "fields" => Ok(GeneratedField::Fields),
@@ -4022,6 +4274,7 @@ impl<'de> serde::Deserialize<'de> for MoveStruct {
             {
                 let mut name__ = None;
                 let mut is_native__ = None;
+                let mut is_event__ = None;
                 let mut abilities__ = None;
                 let mut generic_type_params__ = None;
                 let mut fields__ = None;
@@ -4039,6 +4292,12 @@ impl<'de> serde::Deserialize<'de> for MoveStruct {
                             }
                             is_native__ = Some(map.next_value()?);
                         }
+                        GeneratedField::IsEvent => {
+                            if is_event__.is_some() {
+                                return Err(serde::de::Error::duplicate_field("isEvent"));
+                            }
+                            is_event__ = Some(map.next_value()?);
+                        }
                         GeneratedField::Abilities => {
                             if abilities__.is_some() {
                                 return Err(serde::de::Error::duplicate_field("abilities"));
@@ -4062,6 +4321,7 @@ impl<'de> serde::Deserialize<'de> for MoveStruct {
                 Ok(MoveStruct {
                     name: name__.unwrap_or_default(),
                     is_native: is_native__.unwrap_or_default(),
+                    is_event: is_event__.unwrap_or_default(),
                     abilities: abilities__.unwrap_or_default(),
                     generic_type_params: generic_type_params__.unwrap_or_default(),
                     fields: fields__.unwrap_or_default(),
@@ -6459,6 +6719,9 @@ impl serde::Serialize for Transaction {
                 transaction::TxnData::Validator(v) => {
                     struct_ser.serialize_field("validator", v)?;
                 }
+                transaction::TxnData::BlockEpilogue(v) => {
+                    struct_ser.serialize_field("blockEpilogue", v)?;
+                }
             }
         }
         struct_ser.end()
@@ -6487,6 +6750,8 @@ impl<'de> serde::Deserialize<'de> for Transaction {
             "stateCheckpoint",
             "user",
             "validator",
+            "block_epilogue",
+            "blockEpilogue",
         ];
 
         #[allow(clippy::enum_variant_names)]
@@ -6503,6 +6768,7 @@ impl<'de> serde::Deserialize<'de> for Transaction {
             StateCheckpoint,
             User,
             Validator,
+            BlockEpilogue,
         }
         impl<'de> serde::Deserialize<'de> for GeneratedField {
             fn deserialize<D>(deserializer: D) -> std::result::Result<GeneratedField, D::Error>
@@ -6536,6 +6802,7 @@ impl<'de> serde::Deserialize<'de> for Transaction {
                             "stateCheckpoint" | "state_checkpoint" => Ok(GeneratedField::StateCheckpoint),
                             "user" => Ok(GeneratedField::User),
                             "validator" => Ok(GeneratedField::Validator),
+                            "blockEpilogue" | "block_epilogue" => Ok(GeneratedField::BlockEpilogue),
                             _ => Err(serde::de::Error::unknown_field(value, FIELDS)),
                         }
                     }
@@ -6646,6 +6913,13 @@ impl<'de> serde::Deserialize<'de> for Transaction {
                                 return Err(serde::de::Error::duplicate_field("validator"));
                             }
                             txn_data__ = map.next_value::<::std::option::Option<_>>()?.map(transaction::TxnData::Validator)
+;
+                        }
+                        GeneratedField::BlockEpilogue => {
+                            if txn_data__.is_some() {
+                                return Err(serde::de::Error::duplicate_field("blockEpilogue"));
+                            }
+                            txn_data__ = map.next_value::<::std::option::Option<_>>()?.map(transaction::TxnData::BlockEpilogue)
 ;
                         }
                     }
@@ -6678,6 +6952,7 @@ impl serde::Serialize for transaction::TransactionType {
             Self::StateCheckpoint => "TRANSACTION_TYPE_STATE_CHECKPOINT",
             Self::User => "TRANSACTION_TYPE_USER",
             Self::Validator => "TRANSACTION_TYPE_VALIDATOR",
+            Self::BlockEpilogue => "TRANSACTION_TYPE_BLOCK_EPILOGUE",
         };
         serializer.serialize_str(variant)
     }
@@ -6695,6 +6970,7 @@ impl<'de> serde::Deserialize<'de> for transaction::TransactionType {
             "TRANSACTION_TYPE_STATE_CHECKPOINT",
             "TRANSACTION_TYPE_USER",
             "TRANSACTION_TYPE_VALIDATOR",
+            "TRANSACTION_TYPE_BLOCK_EPILOGUE",
         ];
 
         struct GeneratedVisitor;
@@ -6743,6 +7019,7 @@ impl<'de> serde::Deserialize<'de> for transaction::TransactionType {
                     "TRANSACTION_TYPE_STATE_CHECKPOINT" => Ok(transaction::TransactionType::StateCheckpoint),
                     "TRANSACTION_TYPE_USER" => Ok(transaction::TransactionType::User),
                     "TRANSACTION_TYPE_VALIDATOR" => Ok(transaction::TransactionType::Validator),
+                    "TRANSACTION_TYPE_BLOCK_EPILOGUE" => Ok(transaction::TransactionType::BlockEpilogue),
                     _ => Err(serde::de::Error::unknown_variant(value, FIELDS)),
                 }
             }
@@ -7683,8 +7960,27 @@ impl serde::Serialize for ValidatorTransaction {
         S: serde::Serializer,
     {
         use serde::ser::SerializeStruct;
-        let len = 0;
-        let struct_ser = serializer.serialize_struct("aptos.transaction.v1.ValidatorTransaction", len)?;
+        let mut len = 0;
+        if !self.events.is_empty() {
+            len += 1;
+        }
+        if self.validator_transaction_type.is_some() {
+            len += 1;
+        }
+        let mut struct_ser = serializer.serialize_struct("aptos.transaction.v1.ValidatorTransaction", len)?;
+        if !self.events.is_empty() {
+            struct_ser.serialize_field("events", &self.events)?;
+        }
+        if let Some(v) = self.validator_transaction_type.as_ref() {
+            match v {
+                validator_transaction::ValidatorTransactionType::ObservedJwkUpdate(v) => {
+                    struct_ser.serialize_field("observedJwkUpdate", v)?;
+                }
+                validator_transaction::ValidatorTransactionType::DkgUpdate(v) => {
+                    struct_ser.serialize_field("dkgUpdate", v)?;
+                }
+            }
+        }
         struct_ser.end()
     }
 }
@@ -7695,10 +7991,18 @@ impl<'de> serde::Deserialize<'de> for ValidatorTransaction {
         D: serde::Deserializer<'de>,
     {
         const FIELDS: &[&str] = &[
+            "events",
+            "observed_jwk_update",
+            "observedJwkUpdate",
+            "dkg_update",
+            "dkgUpdate",
         ];
 
         #[allow(clippy::enum_variant_names)]
         enum GeneratedField {
+            Events,
+            ObservedJwkUpdate,
+            DkgUpdate,
         }
         impl<'de> serde::Deserialize<'de> for GeneratedField {
             fn deserialize<D>(deserializer: D) -> std::result::Result<GeneratedField, D::Error>
@@ -7719,7 +8023,12 @@ impl<'de> serde::Deserialize<'de> for ValidatorTransaction {
                     where
                         E: serde::de::Error,
                     {
-                            Err(serde::de::Error::unknown_field(value, FIELDS))
+                        match value {
+                            "events" => Ok(GeneratedField::Events),
+                            "observedJwkUpdate" | "observed_jwk_update" => Ok(GeneratedField::ObservedJwkUpdate),
+                            "dkgUpdate" | "dkg_update" => Ok(GeneratedField::DkgUpdate),
+                            _ => Err(serde::de::Error::unknown_field(value, FIELDS)),
+                        }
                     }
                 }
                 deserializer.deserialize_identifier(GeneratedVisitor)
@@ -7737,16 +8046,1085 @@ impl<'de> serde::Deserialize<'de> for ValidatorTransaction {
                 where
                     V: serde::de::MapAccess<'de>,
             {
-                while map.next_key::<GeneratedField>()?.is_some() {
-                    let _ = map.next_value::<serde::de::IgnoredAny>()?;
+                let mut events__ = None;
+                let mut validator_transaction_type__ = None;
+                while let Some(k) = map.next_key()? {
+                    match k {
+                        GeneratedField::Events => {
+                            if events__.is_some() {
+                                return Err(serde::de::Error::duplicate_field("events"));
+                            }
+                            events__ = Some(map.next_value()?);
+                        }
+                        GeneratedField::ObservedJwkUpdate => {
+                            if validator_transaction_type__.is_some() {
+                                return Err(serde::de::Error::duplicate_field("observedJwkUpdate"));
+                            }
+                            validator_transaction_type__ = map.next_value::<::std::option::Option<_>>()?.map(validator_transaction::ValidatorTransactionType::ObservedJwkUpdate)
+;
+                        }
+                        GeneratedField::DkgUpdate => {
+                            if validator_transaction_type__.is_some() {
+                                return Err(serde::de::Error::duplicate_field("dkgUpdate"));
+                            }
+                            validator_transaction_type__ = map.next_value::<::std::option::Option<_>>()?.map(validator_transaction::ValidatorTransactionType::DkgUpdate)
+;
+                        }
+                    }
                 }
                 Ok(ValidatorTransaction {
+                    events: events__.unwrap_or_default(),
+                    validator_transaction_type: validator_transaction_type__,
                 })
             }
         }
         deserializer.deserialize_struct("aptos.transaction.v1.ValidatorTransaction", FIELDS, GeneratedVisitor)
     }
 }
+impl serde::Serialize for validator_transaction::DkgUpdate {
+    #[allow(deprecated)]
+    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        use serde::ser::SerializeStruct;
+        let mut len = 0;
+        if self.dkg_transcript.is_some() {
+            len += 1;
+        }
+        let mut struct_ser = serializer.serialize_struct("aptos.transaction.v1.ValidatorTransaction.DkgUpdate", len)?;
+        if let Some(v) = self.dkg_transcript.as_ref() {
+            struct_ser.serialize_field("dkgTranscript", v)?;
+        }
+        struct_ser.end()
+    }
+}
+impl<'de> serde::Deserialize<'de> for validator_transaction::DkgUpdate {
+    #[allow(deprecated)]
+    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        const FIELDS: &[&str] = &[
+            "dkg_transcript",
+            "dkgTranscript",
+        ];
+
+        #[allow(clippy::enum_variant_names)]
+        enum GeneratedField {
+            DkgTranscript,
+        }
+        impl<'de> serde::Deserialize<'de> for GeneratedField {
+            fn deserialize<D>(deserializer: D) -> std::result::Result<GeneratedField, D::Error>
+            where
+                D: serde::Deserializer<'de>,
+            {
+                struct GeneratedVisitor;
+
+                impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
+                    type Value = GeneratedField;
+
+                    fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+                        write!(formatter, "expected one of: {:?}", &FIELDS)
+                    }
+
+                    #[allow(unused_variables)]
+                    fn visit_str<E>(self, value: &str) -> std::result::Result<GeneratedField, E>
+                    where
+                        E: serde::de::Error,
+                    {
+                        match value {
+                            "dkgTranscript" | "dkg_transcript" => Ok(GeneratedField::DkgTranscript),
+                            _ => Err(serde::de::Error::unknown_field(value, FIELDS)),
+                        }
+                    }
+                }
+                deserializer.deserialize_identifier(GeneratedVisitor)
+            }
+        }
+        struct GeneratedVisitor;
+        impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
+            type Value = validator_transaction::DkgUpdate;
+
+            fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+                formatter.write_str("struct aptos.transaction.v1.ValidatorTransaction.DkgUpdate")
+            }
+
+            fn visit_map<V>(self, mut map: V) -> std::result::Result<validator_transaction::DkgUpdate, V::Error>
+                where
+                    V: serde::de::MapAccess<'de>,
+            {
+                let mut dkg_transcript__ = None;
+                while let Some(k) = map.next_key()? {
+                    match k {
+                        GeneratedField::DkgTranscript => {
+                            if dkg_transcript__.is_some() {
+                                return Err(serde::de::Error::duplicate_field("dkgTranscript"));
+                            }
+                            dkg_transcript__ = map.next_value()?;
+                        }
+                    }
+                }
+                Ok(validator_transaction::DkgUpdate {
+                    dkg_transcript: dkg_transcript__,
+                })
+            }
+        }
+        deserializer.deserialize_struct("aptos.transaction.v1.ValidatorTransaction.DkgUpdate", FIELDS, GeneratedVisitor)
+    }
+}
+impl serde::Serialize for validator_transaction::dkg_update::DkgTranscript {
+    #[allow(deprecated)]
+    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        use serde::ser::SerializeStruct;
+        let mut len = 0;
+        if self.epoch != 0 {
+            len += 1;
+        }
+        if !self.author.is_empty() {
+            len += 1;
+        }
+        if !self.payload.is_empty() {
+            len += 1;
+        }
+        let mut struct_ser = serializer.serialize_struct("aptos.transaction.v1.ValidatorTransaction.DkgUpdate.DkgTranscript", len)?;
+        if self.epoch != 0 {
+            struct_ser.serialize_field("epoch", ToString::to_string(&self.epoch).as_str())?;
+        }
+        if !self.author.is_empty() {
+            struct_ser.serialize_field("author", &self.author)?;
+        }
+        if !self.payload.is_empty() {
+            struct_ser.serialize_field("payload", pbjson::private::base64::encode(&self.payload).as_str())?;
+        }
+        struct_ser.end()
+    }
+}
+impl<'de> serde::Deserialize<'de> for validator_transaction::dkg_update::DkgTranscript {
+    #[allow(deprecated)]
+    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        const FIELDS: &[&str] = &[
+            "epoch",
+            "author",
+            "payload",
+        ];
+
+        #[allow(clippy::enum_variant_names)]
+        enum GeneratedField {
+            Epoch,
+            Author,
+            Payload,
+        }
+        impl<'de> serde::Deserialize<'de> for GeneratedField {
+            fn deserialize<D>(deserializer: D) -> std::result::Result<GeneratedField, D::Error>
+            where
+                D: serde::Deserializer<'de>,
+            {
+                struct GeneratedVisitor;
+
+                impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
+                    type Value = GeneratedField;
+
+                    fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+                        write!(formatter, "expected one of: {:?}", &FIELDS)
+                    }
+
+                    #[allow(unused_variables)]
+                    fn visit_str<E>(self, value: &str) -> std::result::Result<GeneratedField, E>
+                    where
+                        E: serde::de::Error,
+                    {
+                        match value {
+                            "epoch" => Ok(GeneratedField::Epoch),
+                            "author" => Ok(GeneratedField::Author),
+                            "payload" => Ok(GeneratedField::Payload),
+                            _ => Err(serde::de::Error::unknown_field(value, FIELDS)),
+                        }
+                    }
+                }
+                deserializer.deserialize_identifier(GeneratedVisitor)
+            }
+        }
+        struct GeneratedVisitor;
+        impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
+            type Value = validator_transaction::dkg_update::DkgTranscript;
+
+            fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+                formatter.write_str("struct aptos.transaction.v1.ValidatorTransaction.DkgUpdate.DkgTranscript")
+            }
+
+            fn visit_map<V>(self, mut map: V) -> std::result::Result<validator_transaction::dkg_update::DkgTranscript, V::Error>
+                where
+                    V: serde::de::MapAccess<'de>,
+            {
+                let mut epoch__ = None;
+                let mut author__ = None;
+                let mut payload__ = None;
+                while let Some(k) = map.next_key()? {
+                    match k {
+                        GeneratedField::Epoch => {
+                            if epoch__.is_some() {
+                                return Err(serde::de::Error::duplicate_field("epoch"));
+                            }
+                            epoch__ =
+                                Some(map.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0)
+                            ;
+                        }
+                        GeneratedField::Author => {
+                            if author__.is_some() {
+                                return Err(serde::de::Error::duplicate_field("author"));
+                            }
+                            author__ = Some(map.next_value()?);
+                        }
+                        GeneratedField::Payload => {
+                            if payload__.is_some() {
+                                return Err(serde::de::Error::duplicate_field("payload"));
+                            }
+                            payload__ =
+                                Some(map.next_value::<::pbjson::private::BytesDeserialize<_>>()?.0)
+                            ;
+                        }
+                    }
+                }
+                Ok(validator_transaction::dkg_update::DkgTranscript {
+                    epoch: epoch__.unwrap_or_default(),
+                    author: author__.unwrap_or_default(),
+                    payload: payload__.unwrap_or_default(),
+                })
+            }
+        }
+        deserializer.deserialize_struct("aptos.transaction.v1.ValidatorTransaction.DkgUpdate.DkgTranscript", FIELDS, GeneratedVisitor)
+    }
+}
+impl serde::Serialize for validator_transaction::ObservedJwkUpdate {
+    #[allow(deprecated)]
+    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        use serde::ser::SerializeStruct;
+        let mut len = 0;
+        if self.quorum_certified_update.is_some() {
+            len += 1;
+        }
+        let mut struct_ser = serializer.serialize_struct("aptos.transaction.v1.ValidatorTransaction.ObservedJwkUpdate", len)?;
+        if let Some(v) = self.quorum_certified_update.as_ref() {
+            struct_ser.serialize_field("quorumCertifiedUpdate", v)?;
+        }
+        struct_ser.end()
+    }
+}
+impl<'de> serde::Deserialize<'de> for validator_transaction::ObservedJwkUpdate {
+    #[allow(deprecated)]
+    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        const FIELDS: &[&str] = &[
+            "quorum_certified_update",
+            "quorumCertifiedUpdate",
+        ];
+
+        #[allow(clippy::enum_variant_names)]
+        enum GeneratedField {
+            QuorumCertifiedUpdate,
+        }
+        impl<'de> serde::Deserialize<'de> for GeneratedField {
+            fn deserialize<D>(deserializer: D) -> std::result::Result<GeneratedField, D::Error>
+            where
+                D: serde::Deserializer<'de>,
+            {
+                struct GeneratedVisitor;
+
+                impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
+                    type Value = GeneratedField;
+
+                    fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+                        write!(formatter, "expected one of: {:?}", &FIELDS)
+                    }
+
+                    #[allow(unused_variables)]
+                    fn visit_str<E>(self, value: &str) -> std::result::Result<GeneratedField, E>
+                    where
+                        E: serde::de::Error,
+                    {
+                        match value {
+                            "quorumCertifiedUpdate" | "quorum_certified_update" => Ok(GeneratedField::QuorumCertifiedUpdate),
+                            _ => Err(serde::de::Error::unknown_field(value, FIELDS)),
+                        }
+                    }
+                }
+                deserializer.deserialize_identifier(GeneratedVisitor)
+            }
+        }
+        struct GeneratedVisitor;
+        impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
+            type Value = validator_transaction::ObservedJwkUpdate;
+
+            fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+                formatter.write_str("struct aptos.transaction.v1.ValidatorTransaction.ObservedJwkUpdate")
+            }
+
+            fn visit_map<V>(self, mut map: V) -> std::result::Result<validator_transaction::ObservedJwkUpdate, V::Error>
+                where
+                    V: serde::de::MapAccess<'de>,
+            {
+                let mut quorum_certified_update__ = None;
+                while let Some(k) = map.next_key()? {
+                    match k {
+                        GeneratedField::QuorumCertifiedUpdate => {
+                            if quorum_certified_update__.is_some() {
+                                return Err(serde::de::Error::duplicate_field("quorumCertifiedUpdate"));
+                            }
+                            quorum_certified_update__ = map.next_value()?;
+                        }
+                    }
+                }
+                Ok(validator_transaction::ObservedJwkUpdate {
+                    quorum_certified_update: quorum_certified_update__,
+                })
+            }
+        }
+        deserializer.deserialize_struct("aptos.transaction.v1.ValidatorTransaction.ObservedJwkUpdate", FIELDS, GeneratedVisitor)
+    }
+}
+impl serde::Serialize for validator_transaction::observed_jwk_update::ExportedAggregateSignature {
+    #[allow(deprecated)]
+    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        use serde::ser::SerializeStruct;
+        let mut len = 0;
+        if !self.signer_indices.is_empty() {
+            len += 1;
+        }
+        if !self.sig.is_empty() {
+            len += 1;
+        }
+        let mut struct_ser = serializer.serialize_struct("aptos.transaction.v1.ValidatorTransaction.ObservedJwkUpdate.ExportedAggregateSignature", len)?;
+        if !self.signer_indices.is_empty() {
+            struct_ser.serialize_field("signerIndices", &self.signer_indices.iter().map(ToString::to_string).collect::<Vec<_>>())?;
+        }
+        if !self.sig.is_empty() {
+            struct_ser.serialize_field("sig", pbjson::private::base64::encode(&self.sig).as_str())?;
+        }
+        struct_ser.end()
+    }
+}
+impl<'de> serde::Deserialize<'de> for validator_transaction::observed_jwk_update::ExportedAggregateSignature {
+    #[allow(deprecated)]
+    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        const FIELDS: &[&str] = &[
+            "signer_indices",
+            "signerIndices",
+            "sig",
+        ];
+
+        #[allow(clippy::enum_variant_names)]
+        enum GeneratedField {
+            SignerIndices,
+            Sig,
+        }
+        impl<'de> serde::Deserialize<'de> for GeneratedField {
+            fn deserialize<D>(deserializer: D) -> std::result::Result<GeneratedField, D::Error>
+            where
+                D: serde::Deserializer<'de>,
+            {
+                struct GeneratedVisitor;
+
+                impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
+                    type Value = GeneratedField;
+
+                    fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+                        write!(formatter, "expected one of: {:?}", &FIELDS)
+                    }
+
+                    #[allow(unused_variables)]
+                    fn visit_str<E>(self, value: &str) -> std::result::Result<GeneratedField, E>
+                    where
+                        E: serde::de::Error,
+                    {
+                        match value {
+                            "signerIndices" | "signer_indices" => Ok(GeneratedField::SignerIndices),
+                            "sig" => Ok(GeneratedField::Sig),
+                            _ => Err(serde::de::Error::unknown_field(value, FIELDS)),
+                        }
+                    }
+                }
+                deserializer.deserialize_identifier(GeneratedVisitor)
+            }
+        }
+        struct GeneratedVisitor;
+        impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
+            type Value = validator_transaction::observed_jwk_update::ExportedAggregateSignature;
+
+            fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+                formatter.write_str("struct aptos.transaction.v1.ValidatorTransaction.ObservedJwkUpdate.ExportedAggregateSignature")
+            }
+
+            fn visit_map<V>(self, mut map: V) -> std::result::Result<validator_transaction::observed_jwk_update::ExportedAggregateSignature, V::Error>
+                where
+                    V: serde::de::MapAccess<'de>,
+            {
+                let mut signer_indices__ = None;
+                let mut sig__ = None;
+                while let Some(k) = map.next_key()? {
+                    match k {
+                        GeneratedField::SignerIndices => {
+                            if signer_indices__.is_some() {
+                                return Err(serde::de::Error::duplicate_field("signerIndices"));
+                            }
+                            signer_indices__ =
+                                Some(map.next_value::<Vec<::pbjson::private::NumberDeserialize<_>>>()?
+                                    .into_iter().map(|x| x.0).collect())
+                            ;
+                        }
+                        GeneratedField::Sig => {
+                            if sig__.is_some() {
+                                return Err(serde::de::Error::duplicate_field("sig"));
+                            }
+                            sig__ =
+                                Some(map.next_value::<::pbjson::private::BytesDeserialize<_>>()?.0)
+                            ;
+                        }
+                    }
+                }
+                Ok(validator_transaction::observed_jwk_update::ExportedAggregateSignature {
+                    signer_indices: signer_indices__.unwrap_or_default(),
+                    sig: sig__.unwrap_or_default(),
+                })
+            }
+        }
+        deserializer.deserialize_struct("aptos.transaction.v1.ValidatorTransaction.ObservedJwkUpdate.ExportedAggregateSignature", FIELDS, GeneratedVisitor)
+    }
+}
+impl serde::Serialize for validator_transaction::observed_jwk_update::ExportedProviderJwKs {
+    #[allow(deprecated)]
+    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        use serde::ser::SerializeStruct;
+        let mut len = 0;
+        if !self.issuer.is_empty() {
+            len += 1;
+        }
+        if self.version != 0 {
+            len += 1;
+        }
+        if !self.jwks.is_empty() {
+            len += 1;
+        }
+        let mut struct_ser = serializer.serialize_struct("aptos.transaction.v1.ValidatorTransaction.ObservedJwkUpdate.ExportedProviderJWKs", len)?;
+        if !self.issuer.is_empty() {
+            struct_ser.serialize_field("issuer", &self.issuer)?;
+        }
+        if self.version != 0 {
+            struct_ser.serialize_field("version", ToString::to_string(&self.version).as_str())?;
+        }
+        if !self.jwks.is_empty() {
+            struct_ser.serialize_field("jwks", &self.jwks)?;
+        }
+        struct_ser.end()
+    }
+}
+impl<'de> serde::Deserialize<'de> for validator_transaction::observed_jwk_update::ExportedProviderJwKs {
+    #[allow(deprecated)]
+    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        const FIELDS: &[&str] = &[
+            "issuer",
+            "version",
+            "jwks",
+        ];
+
+        #[allow(clippy::enum_variant_names)]
+        enum GeneratedField {
+            Issuer,
+            Version,
+            Jwks,
+        }
+        impl<'de> serde::Deserialize<'de> for GeneratedField {
+            fn deserialize<D>(deserializer: D) -> std::result::Result<GeneratedField, D::Error>
+            where
+                D: serde::Deserializer<'de>,
+            {
+                struct GeneratedVisitor;
+
+                impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
+                    type Value = GeneratedField;
+
+                    fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+                        write!(formatter, "expected one of: {:?}", &FIELDS)
+                    }
+
+                    #[allow(unused_variables)]
+                    fn visit_str<E>(self, value: &str) -> std::result::Result<GeneratedField, E>
+                    where
+                        E: serde::de::Error,
+                    {
+                        match value {
+                            "issuer" => Ok(GeneratedField::Issuer),
+                            "version" => Ok(GeneratedField::Version),
+                            "jwks" => Ok(GeneratedField::Jwks),
+                            _ => Err(serde::de::Error::unknown_field(value, FIELDS)),
+                        }
+                    }
+                }
+                deserializer.deserialize_identifier(GeneratedVisitor)
+            }
+        }
+        struct GeneratedVisitor;
+        impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
+            type Value = validator_transaction::observed_jwk_update::ExportedProviderJwKs;
+
+            fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+                formatter.write_str("struct aptos.transaction.v1.ValidatorTransaction.ObservedJwkUpdate.ExportedProviderJWKs")
+            }
+
+            fn visit_map<V>(self, mut map: V) -> std::result::Result<validator_transaction::observed_jwk_update::ExportedProviderJwKs, V::Error>
+                where
+                    V: serde::de::MapAccess<'de>,
+            {
+                let mut issuer__ = None;
+                let mut version__ = None;
+                let mut jwks__ = None;
+                while let Some(k) = map.next_key()? {
+                    match k {
+                        GeneratedField::Issuer => {
+                            if issuer__.is_some() {
+                                return Err(serde::de::Error::duplicate_field("issuer"));
+                            }
+                            issuer__ = Some(map.next_value()?);
+                        }
+                        GeneratedField::Version => {
+                            if version__.is_some() {
+                                return Err(serde::de::Error::duplicate_field("version"));
+                            }
+                            version__ =
+                                Some(map.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0)
+                            ;
+                        }
+                        GeneratedField::Jwks => {
+                            if jwks__.is_some() {
+                                return Err(serde::de::Error::duplicate_field("jwks"));
+                            }
+                            jwks__ = Some(map.next_value()?);
+                        }
+                    }
+                }
+                Ok(validator_transaction::observed_jwk_update::ExportedProviderJwKs {
+                    issuer: issuer__.unwrap_or_default(),
+                    version: version__.unwrap_or_default(),
+                    jwks: jwks__.unwrap_or_default(),
+                })
+            }
+        }
+        deserializer.deserialize_struct("aptos.transaction.v1.ValidatorTransaction.ObservedJwkUpdate.ExportedProviderJWKs", FIELDS, GeneratedVisitor)
+    }
+}
+impl serde::Serialize for validator_transaction::observed_jwk_update::exported_provider_jw_ks::Jwk {
+    #[allow(deprecated)]
+    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        use serde::ser::SerializeStruct;
+        let mut len = 0;
+        if self.jwk_type.is_some() {
+            len += 1;
+        }
+        let mut struct_ser = serializer.serialize_struct("aptos.transaction.v1.ValidatorTransaction.ObservedJwkUpdate.ExportedProviderJWKs.JWK", len)?;
+        if let Some(v) = self.jwk_type.as_ref() {
+            match v {
+                validator_transaction::observed_jwk_update::exported_provider_jw_ks::jwk::JwkType::UnsupportedJwk(v) => {
+                    struct_ser.serialize_field("unsupportedJwk", v)?;
+                }
+                validator_transaction::observed_jwk_update::exported_provider_jw_ks::jwk::JwkType::Rsa(v) => {
+                    struct_ser.serialize_field("rsa", v)?;
+                }
+            }
+        }
+        struct_ser.end()
+    }
+}
+impl<'de> serde::Deserialize<'de> for validator_transaction::observed_jwk_update::exported_provider_jw_ks::Jwk {
+    #[allow(deprecated)]
+    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        const FIELDS: &[&str] = &[
+            "unsupported_jwk",
+            "unsupportedJwk",
+            "rsa",
+        ];
+
+        #[allow(clippy::enum_variant_names)]
+        enum GeneratedField {
+            UnsupportedJwk,
+            Rsa,
+        }
+        impl<'de> serde::Deserialize<'de> for GeneratedField {
+            fn deserialize<D>(deserializer: D) -> std::result::Result<GeneratedField, D::Error>
+            where
+                D: serde::Deserializer<'de>,
+            {
+                struct GeneratedVisitor;
+
+                impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
+                    type Value = GeneratedField;
+
+                    fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+                        write!(formatter, "expected one of: {:?}", &FIELDS)
+                    }
+
+                    #[allow(unused_variables)]
+                    fn visit_str<E>(self, value: &str) -> std::result::Result<GeneratedField, E>
+                    where
+                        E: serde::de::Error,
+                    {
+                        match value {
+                            "unsupportedJwk" | "unsupported_jwk" => Ok(GeneratedField::UnsupportedJwk),
+                            "rsa" => Ok(GeneratedField::Rsa),
+                            _ => Err(serde::de::Error::unknown_field(value, FIELDS)),
+                        }
+                    }
+                }
+                deserializer.deserialize_identifier(GeneratedVisitor)
+            }
+        }
+        struct GeneratedVisitor;
+        impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
+            type Value = validator_transaction::observed_jwk_update::exported_provider_jw_ks::Jwk;
+
+            fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+                formatter.write_str("struct aptos.transaction.v1.ValidatorTransaction.ObservedJwkUpdate.ExportedProviderJWKs.JWK")
+            }
+
+            fn visit_map<V>(self, mut map: V) -> std::result::Result<validator_transaction::observed_jwk_update::exported_provider_jw_ks::Jwk, V::Error>
+                where
+                    V: serde::de::MapAccess<'de>,
+            {
+                let mut jwk_type__ = None;
+                while let Some(k) = map.next_key()? {
+                    match k {
+                        GeneratedField::UnsupportedJwk => {
+                            if jwk_type__.is_some() {
+                                return Err(serde::de::Error::duplicate_field("unsupportedJwk"));
+                            }
+                            jwk_type__ = map.next_value::<::std::option::Option<_>>()?.map(validator_transaction::observed_jwk_update::exported_provider_jw_ks::jwk::JwkType::UnsupportedJwk)
+;
+                        }
+                        GeneratedField::Rsa => {
+                            if jwk_type__.is_some() {
+                                return Err(serde::de::Error::duplicate_field("rsa"));
+                            }
+                            jwk_type__ = map.next_value::<::std::option::Option<_>>()?.map(validator_transaction::observed_jwk_update::exported_provider_jw_ks::jwk::JwkType::Rsa)
+;
+                        }
+                    }
+                }
+                Ok(validator_transaction::observed_jwk_update::exported_provider_jw_ks::Jwk {
+                    jwk_type: jwk_type__,
+                })
+            }
+        }
+        deserializer.deserialize_struct("aptos.transaction.v1.ValidatorTransaction.ObservedJwkUpdate.ExportedProviderJWKs.JWK", FIELDS, GeneratedVisitor)
+    }
+}
+impl serde::Serialize for validator_transaction::observed_jwk_update::exported_provider_jw_ks::jwk::Rsa {
+    #[allow(deprecated)]
+    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        use serde::ser::SerializeStruct;
+        let mut len = 0;
+        if !self.kid.is_empty() {
+            len += 1;
+        }
+        if !self.kty.is_empty() {
+            len += 1;
+        }
+        if !self.alg.is_empty() {
+            len += 1;
+        }
+        if !self.e.is_empty() {
+            len += 1;
+        }
+        if !self.n.is_empty() {
+            len += 1;
+        }
+        let mut struct_ser = serializer.serialize_struct("aptos.transaction.v1.ValidatorTransaction.ObservedJwkUpdate.ExportedProviderJWKs.JWK.RSA", len)?;
+        if !self.kid.is_empty() {
+            struct_ser.serialize_field("kid", &self.kid)?;
+        }
+        if !self.kty.is_empty() {
+            struct_ser.serialize_field("kty", &self.kty)?;
+        }
+        if !self.alg.is_empty() {
+            struct_ser.serialize_field("alg", &self.alg)?;
+        }
+        if !self.e.is_empty() {
+            struct_ser.serialize_field("e", &self.e)?;
+        }
+        if !self.n.is_empty() {
+            struct_ser.serialize_field("n", &self.n)?;
+        }
+        struct_ser.end()
+    }
+}
+impl<'de> serde::Deserialize<'de> for validator_transaction::observed_jwk_update::exported_provider_jw_ks::jwk::Rsa {
+    #[allow(deprecated)]
+    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        const FIELDS: &[&str] = &[
+            "kid",
+            "kty",
+            "alg",
+            "e",
+            "n",
+        ];
+
+        #[allow(clippy::enum_variant_names)]
+        enum GeneratedField {
+            Kid,
+            Kty,
+            Alg,
+            E,
+            N,
+        }
+        impl<'de> serde::Deserialize<'de> for GeneratedField {
+            fn deserialize<D>(deserializer: D) -> std::result::Result<GeneratedField, D::Error>
+            where
+                D: serde::Deserializer<'de>,
+            {
+                struct GeneratedVisitor;
+
+                impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
+                    type Value = GeneratedField;
+
+                    fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+                        write!(formatter, "expected one of: {:?}", &FIELDS)
+                    }
+
+                    #[allow(unused_variables)]
+                    fn visit_str<E>(self, value: &str) -> std::result::Result<GeneratedField, E>
+                    where
+                        E: serde::de::Error,
+                    {
+                        match value {
+                            "kid" => Ok(GeneratedField::Kid),
+                            "kty" => Ok(GeneratedField::Kty),
+                            "alg" => Ok(GeneratedField::Alg),
+                            "e" => Ok(GeneratedField::E),
+                            "n" => Ok(GeneratedField::N),
+                            _ => Err(serde::de::Error::unknown_field(value, FIELDS)),
+                        }
+                    }
+                }
+                deserializer.deserialize_identifier(GeneratedVisitor)
+            }
+        }
+        struct GeneratedVisitor;
+        impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
+            type Value = validator_transaction::observed_jwk_update::exported_provider_jw_ks::jwk::Rsa;
+
+            fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+                formatter.write_str("struct aptos.transaction.v1.ValidatorTransaction.ObservedJwkUpdate.ExportedProviderJWKs.JWK.RSA")
+            }
+
+            fn visit_map<V>(self, mut map: V) -> std::result::Result<validator_transaction::observed_jwk_update::exported_provider_jw_ks::jwk::Rsa, V::Error>
+                where
+                    V: serde::de::MapAccess<'de>,
+            {
+                let mut kid__ = None;
+                let mut kty__ = None;
+                let mut alg__ = None;
+                let mut e__ = None;
+                let mut n__ = None;
+                while let Some(k) = map.next_key()? {
+                    match k {
+                        GeneratedField::Kid => {
+                            if kid__.is_some() {
+                                return Err(serde::de::Error::duplicate_field("kid"));
+                            }
+                            kid__ = Some(map.next_value()?);
+                        }
+                        GeneratedField::Kty => {
+                            if kty__.is_some() {
+                                return Err(serde::de::Error::duplicate_field("kty"));
+                            }
+                            kty__ = Some(map.next_value()?);
+                        }
+                        GeneratedField::Alg => {
+                            if alg__.is_some() {
+                                return Err(serde::de::Error::duplicate_field("alg"));
+                            }
+                            alg__ = Some(map.next_value()?);
+                        }
+                        GeneratedField::E => {
+                            if e__.is_some() {
+                                return Err(serde::de::Error::duplicate_field("e"));
+                            }
+                            e__ = Some(map.next_value()?);
+                        }
+                        GeneratedField::N => {
+                            if n__.is_some() {
+                                return Err(serde::de::Error::duplicate_field("n"));
+                            }
+                            n__ = Some(map.next_value()?);
+                        }
+                    }
+                }
+                Ok(validator_transaction::observed_jwk_update::exported_provider_jw_ks::jwk::Rsa {
+                    kid: kid__.unwrap_or_default(),
+                    kty: kty__.unwrap_or_default(),
+                    alg: alg__.unwrap_or_default(),
+                    e: e__.unwrap_or_default(),
+                    n: n__.unwrap_or_default(),
+                })
+            }
+        }
+        deserializer.deserialize_struct("aptos.transaction.v1.ValidatorTransaction.ObservedJwkUpdate.ExportedProviderJWKs.JWK.RSA", FIELDS, GeneratedVisitor)
+    }
+}
+impl serde::Serialize for validator_transaction::observed_jwk_update::exported_provider_jw_ks::jwk::UnsupportedJwk {
+    #[allow(deprecated)]
+    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        use serde::ser::SerializeStruct;
+        let mut len = 0;
+        if !self.id.is_empty() {
+            len += 1;
+        }
+        if !self.payload.is_empty() {
+            len += 1;
+        }
+        let mut struct_ser = serializer.serialize_struct("aptos.transaction.v1.ValidatorTransaction.ObservedJwkUpdate.ExportedProviderJWKs.JWK.UnsupportedJWK", len)?;
+        if !self.id.is_empty() {
+            struct_ser.serialize_field("id", pbjson::private::base64::encode(&self.id).as_str())?;
+        }
+        if !self.payload.is_empty() {
+            struct_ser.serialize_field("payload", pbjson::private::base64::encode(&self.payload).as_str())?;
+        }
+        struct_ser.end()
+    }
+}
+impl<'de> serde::Deserialize<'de> for validator_transaction::observed_jwk_update::exported_provider_jw_ks::jwk::UnsupportedJwk {
+    #[allow(deprecated)]
+    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        const FIELDS: &[&str] = &[
+            "id",
+            "payload",
+        ];
+
+        #[allow(clippy::enum_variant_names)]
+        enum GeneratedField {
+            Id,
+            Payload,
+        }
+        impl<'de> serde::Deserialize<'de> for GeneratedField {
+            fn deserialize<D>(deserializer: D) -> std::result::Result<GeneratedField, D::Error>
+            where
+                D: serde::Deserializer<'de>,
+            {
+                struct GeneratedVisitor;
+
+                impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
+                    type Value = GeneratedField;
+
+                    fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+                        write!(formatter, "expected one of: {:?}", &FIELDS)
+                    }
+
+                    #[allow(unused_variables)]
+                    fn visit_str<E>(self, value: &str) -> std::result::Result<GeneratedField, E>
+                    where
+                        E: serde::de::Error,
+                    {
+                        match value {
+                            "id" => Ok(GeneratedField::Id),
+                            "payload" => Ok(GeneratedField::Payload),
+                            _ => Err(serde::de::Error::unknown_field(value, FIELDS)),
+                        }
+                    }
+                }
+                deserializer.deserialize_identifier(GeneratedVisitor)
+            }
+        }
+        struct GeneratedVisitor;
+        impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
+            type Value = validator_transaction::observed_jwk_update::exported_provider_jw_ks::jwk::UnsupportedJwk;
+
+            fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+                formatter.write_str("struct aptos.transaction.v1.ValidatorTransaction.ObservedJwkUpdate.ExportedProviderJWKs.JWK.UnsupportedJWK")
+            }
+
+            fn visit_map<V>(self, mut map: V) -> std::result::Result<validator_transaction::observed_jwk_update::exported_provider_jw_ks::jwk::UnsupportedJwk, V::Error>
+                where
+                    V: serde::de::MapAccess<'de>,
+            {
+                let mut id__ = None;
+                let mut payload__ = None;
+                while let Some(k) = map.next_key()? {
+                    match k {
+                        GeneratedField::Id => {
+                            if id__.is_some() {
+                                return Err(serde::de::Error::duplicate_field("id"));
+                            }
+                            id__ =
+                                Some(map.next_value::<::pbjson::private::BytesDeserialize<_>>()?.0)
+                            ;
+                        }
+                        GeneratedField::Payload => {
+                            if payload__.is_some() {
+                                return Err(serde::de::Error::duplicate_field("payload"));
+                            }
+                            payload__ =
+                                Some(map.next_value::<::pbjson::private::BytesDeserialize<_>>()?.0)
+                            ;
+                        }
+                    }
+                }
+                Ok(validator_transaction::observed_jwk_update::exported_provider_jw_ks::jwk::UnsupportedJwk {
+                    id: id__.unwrap_or_default(),
+                    payload: payload__.unwrap_or_default(),
+                })
+            }
+        }
+        deserializer.deserialize_struct("aptos.transaction.v1.ValidatorTransaction.ObservedJwkUpdate.ExportedProviderJWKs.JWK.UnsupportedJWK", FIELDS, GeneratedVisitor)
+    }
+}
+impl serde::Serialize for validator_transaction::observed_jwk_update::QuorumCertifiedUpdate {
+    #[allow(deprecated)]
+    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        use serde::ser::SerializeStruct;
+        let mut len = 0;
+        if self.update.is_some() {
+            len += 1;
+        }
+        if self.multi_sig.is_some() {
+            len += 1;
+        }
+        let mut struct_ser = serializer.serialize_struct("aptos.transaction.v1.ValidatorTransaction.ObservedJwkUpdate.QuorumCertifiedUpdate", len)?;
+        if let Some(v) = self.update.as_ref() {
+            struct_ser.serialize_field("update", v)?;
+        }
+        if let Some(v) = self.multi_sig.as_ref() {
+            struct_ser.serialize_field("multiSig", v)?;
+        }
+        struct_ser.end()
+    }
+}
+impl<'de> serde::Deserialize<'de> for validator_transaction::observed_jwk_update::QuorumCertifiedUpdate {
+    #[allow(deprecated)]
+    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        const FIELDS: &[&str] = &[
+            "update",
+            "multi_sig",
+            "multiSig",
+        ];
+
+        #[allow(clippy::enum_variant_names)]
+        enum GeneratedField {
+            Update,
+            MultiSig,
+        }
+        impl<'de> serde::Deserialize<'de> for GeneratedField {
+            fn deserialize<D>(deserializer: D) -> std::result::Result<GeneratedField, D::Error>
+            where
+                D: serde::Deserializer<'de>,
+            {
+                struct GeneratedVisitor;
+
+                impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
+                    type Value = GeneratedField;
+
+                    fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+                        write!(formatter, "expected one of: {:?}", &FIELDS)
+                    }
+
+                    #[allow(unused_variables)]
+                    fn visit_str<E>(self, value: &str) -> std::result::Result<GeneratedField, E>
+                    where
+                        E: serde::de::Error,
+                    {
+                        match value {
+                            "update" => Ok(GeneratedField::Update),
+                            "multiSig" | "multi_sig" => Ok(GeneratedField::MultiSig),
+                            _ => Err(serde::de::Error::unknown_field(value, FIELDS)),
+                        }
+                    }
+                }
+                deserializer.deserialize_identifier(GeneratedVisitor)
+            }
+        }
+        struct GeneratedVisitor;
+        impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
+            type Value = validator_transaction::observed_jwk_update::QuorumCertifiedUpdate;
+
+            fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+                formatter.write_str("struct aptos.transaction.v1.ValidatorTransaction.ObservedJwkUpdate.QuorumCertifiedUpdate")
+            }
+
+            fn visit_map<V>(self, mut map: V) -> std::result::Result<validator_transaction::observed_jwk_update::QuorumCertifiedUpdate, V::Error>
+                where
+                    V: serde::de::MapAccess<'de>,
+            {
+                let mut update__ = None;
+                let mut multi_sig__ = None;
+                while let Some(k) = map.next_key()? {
+                    match k {
+                        GeneratedField::Update => {
+                            if update__.is_some() {
+                                return Err(serde::de::Error::duplicate_field("update"));
+                            }
+                            update__ = map.next_value()?;
+                        }
+                        GeneratedField::MultiSig => {
+                            if multi_sig__.is_some() {
+                                return Err(serde::de::Error::duplicate_field("multiSig"));
+                            }
+                            multi_sig__ = map.next_value()?;
+                        }
+                    }
+                }
+                Ok(validator_transaction::observed_jwk_update::QuorumCertifiedUpdate {
+                    update: update__,
+                    multi_sig: multi_sig__,
+                })
+            }
+        }
+        deserializer.deserialize_struct("aptos.transaction.v1.ValidatorTransaction.ObservedJwkUpdate.QuorumCertifiedUpdate", FIELDS, GeneratedVisitor)
+    }
+}
 impl serde::Serialize for WebAuthn {
     #[allow(deprecated)]
     fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
diff --git a/protos/rust/src/pb/mod.rs b/protos/rust/src/pb/mod.rs
index df3cb85ab00ba..abf2433daa41e 100644
--- a/protos/rust/src/pb/mod.rs
+++ b/protos/rust/src/pb/mod.rs
@@ -3,15 +3,6 @@
 
 // @generated
 pub mod aptos {
-    pub mod bigquery_schema {
-        pub mod transaction {
-            // @@protoc_insertion_point(attribute:aptos.bigquery_schema.transaction.v1)
-            pub mod v1 {
-                include!("aptos.bigquery_schema.transaction.v1.rs");
-                // @@protoc_insertion_point(aptos.bigquery_schema.transaction.v1)
-            }
-        }
-    }
     pub mod indexer {
         // @@protoc_insertion_point(attribute:aptos.indexer.v1)
         pub mod v1 {
diff --git a/protos/typescript/src/aptos/transaction/v1/transaction.ts b/protos/typescript/src/aptos/transaction/v1/transaction.ts
index 1666ba1f79ba7..91b54abc9ab23 100644
--- a/protos/typescript/src/aptos/transaction/v1/transaction.ts
+++ b/protos/typescript/src/aptos/transaction/v1/transaction.ts
@@ -208,7 +208,7 @@ export interface Block {
  * Transaction as it happened on the chain, there are 4 types of transactions:
  * - User Transaction: a user initiated transaction to interact with the chain
  * - Block Metadata Transaction: transactions generated by the chain to group together transactions forming a "block"
- * - State Checkpoint Transaction: transactions generated by the chain so when validator agreed on a particular global state
+ * - Block Epilogue / State Checkpoint Transaction: transactions generated by the chain to end the group transactions forming a bloc
  * - Genesis Transaction: the first transaction of the chain, with all core contract and validator information baked in
  */
 export interface Transaction {
@@ -221,8 +221,15 @@ export interface Transaction {
   blockMetadata?: BlockMetadataTransaction | undefined;
   genesis?: GenesisTransaction | undefined;
   stateCheckpoint?: StateCheckpointTransaction | undefined;
-  user?: UserTransaction | undefined;
-  validator?: ValidatorTransaction | undefined;
+  user?:
+    | UserTransaction
+    | undefined;
+  /** value 11-19 skipped for no reason */
+  validator?:
+    | ValidatorTransaction
+    | undefined;
+  /** value 22 is used up below (all Transaction fields have to have different index), so going to 23 */
+  blockEpilogue?: BlockEpilogueTransaction | undefined;
   sizeInfo?: TransactionSizeInfo | undefined;
 }
 
@@ -232,7 +239,9 @@ export enum Transaction_TransactionType {
   TRANSACTION_TYPE_BLOCK_METADATA = 2,
   TRANSACTION_TYPE_STATE_CHECKPOINT = 3,
   TRANSACTION_TYPE_USER = 4,
+  /** TRANSACTION_TYPE_VALIDATOR - values 5-19 skipped for no reason */
   TRANSACTION_TYPE_VALIDATOR = 20,
+  TRANSACTION_TYPE_BLOCK_EPILOGUE = 21,
   UNRECOGNIZED = -1,
 }
 
@@ -256,6 +265,9 @@ export function transaction_TransactionTypeFromJSON(object: any): Transaction_Tr
     case 20:
     case "TRANSACTION_TYPE_VALIDATOR":
       return Transaction_TransactionType.TRANSACTION_TYPE_VALIDATOR;
+    case 21:
+    case "TRANSACTION_TYPE_BLOCK_EPILOGUE":
+      return Transaction_TransactionType.TRANSACTION_TYPE_BLOCK_EPILOGUE;
     case -1:
     case "UNRECOGNIZED":
     default:
@@ -277,12 +289,15 @@ export function transaction_TransactionTypeToJSON(object: Transaction_Transactio
       return "TRANSACTION_TYPE_USER";
     case Transaction_TransactionType.TRANSACTION_TYPE_VALIDATOR:
       return "TRANSACTION_TYPE_VALIDATOR";
+    case Transaction_TransactionType.TRANSACTION_TYPE_BLOCK_EPILOGUE:
+      return "TRANSACTION_TYPE_BLOCK_EPILOGUE";
     case Transaction_TransactionType.UNRECOGNIZED:
     default:
       return "UNRECOGNIZED";
   }
 }
 
+/** Transaction types. */
 export interface BlockMetadataTransaction {
   id?: string | undefined;
   round?: bigint | undefined;
@@ -301,6 +316,71 @@ export interface StateCheckpointTransaction {
 }
 
 export interface ValidatorTransaction {
+  observedJwkUpdate?: ValidatorTransaction_ObservedJwkUpdate | undefined;
+  dkgUpdate?: ValidatorTransaction_DkgUpdate | undefined;
+  events?: Event[] | undefined;
+}
+
+export interface ValidatorTransaction_ObservedJwkUpdate {
+  quorumCertifiedUpdate?: ValidatorTransaction_ObservedJwkUpdate_QuorumCertifiedUpdate | undefined;
+}
+
+export interface ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs {
+  issuer?: string | undefined;
+  version?: bigint | undefined;
+  jwks?: ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK[] | undefined;
+}
+
+export interface ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK {
+  unsupportedJwk?: ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK_UnsupportedJWK | undefined;
+  rsa?: ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK_RSA | undefined;
+}
+
+export interface ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK_RSA {
+  kid?: string | undefined;
+  kty?: string | undefined;
+  alg?: string | undefined;
+  e?: string | undefined;
+  n?: string | undefined;
+}
+
+export interface ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK_UnsupportedJWK {
+  id?: Uint8Array | undefined;
+  payload?: Uint8Array | undefined;
+}
+
+export interface ValidatorTransaction_ObservedJwkUpdate_ExportedAggregateSignature {
+  signerIndices?:
+    | bigint[]
+    | undefined;
+  /** HexToBytes. */
+  sig?: Uint8Array | undefined;
+}
+
+export interface ValidatorTransaction_ObservedJwkUpdate_QuorumCertifiedUpdate {
+  update?: ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs | undefined;
+  multiSig?: ValidatorTransaction_ObservedJwkUpdate_ExportedAggregateSignature | undefined;
+}
+
+export interface ValidatorTransaction_DkgUpdate {
+  dkgTranscript?: ValidatorTransaction_DkgUpdate_DkgTranscript | undefined;
+}
+
+export interface ValidatorTransaction_DkgUpdate_DkgTranscript {
+  epoch?: bigint | undefined;
+  author?: string | undefined;
+  payload?: Uint8Array | undefined;
+}
+
+export interface BlockEpilogueTransaction {
+  blockEndInfo?: BlockEndInfo | undefined;
+}
+
+export interface BlockEndInfo {
+  blockGasLimitReached?: boolean | undefined;
+  blockOutputLimitReached?: boolean | undefined;
+  blockEffectiveBlockGasUnits?: bigint | undefined;
+  blockApproxOutputSize?: bigint | undefined;
 }
 
 export interface UserTransaction {
@@ -714,6 +794,7 @@ export function moveFunction_VisibilityToJSON(object: MoveFunction_Visibility):
 export interface MoveStruct {
   name?: string | undefined;
   isNative?: boolean | undefined;
+  isEvent?: boolean | undefined;
   abilities?: MoveAbility[] | undefined;
   genericTypeParams?: MoveStructGenericTypeParam[] | undefined;
   fields?: MoveStructField[] | undefined;
@@ -1259,6 +1340,7 @@ function createBaseTransaction(): Transaction {
     stateCheckpoint: undefined,
     user: undefined,
     validator: undefined,
+    blockEpilogue: undefined,
     sizeInfo: undefined,
   };
 }
@@ -1307,6 +1389,9 @@ export const Transaction = {
     if (message.validator !== undefined) {
       ValidatorTransaction.encode(message.validator, writer.uint32(170).fork()).ldelim();
     }
+    if (message.blockEpilogue !== undefined) {
+      BlockEpilogueTransaction.encode(message.blockEpilogue, writer.uint32(186).fork()).ldelim();
+    }
     if (message.sizeInfo !== undefined) {
       TransactionSizeInfo.encode(message.sizeInfo, writer.uint32(178).fork()).ldelim();
     }
@@ -1397,6 +1482,13 @@ export const Transaction = {
 
           message.validator = ValidatorTransaction.decode(reader, reader.uint32());
           continue;
+        case 23:
+          if (tag !== 186) {
+            break;
+          }
+
+          message.blockEpilogue = BlockEpilogueTransaction.decode(reader, reader.uint32());
+          continue;
         case 22:
           if (tag !== 178) {
             break;
@@ -1460,6 +1552,7 @@ export const Transaction = {
         : undefined,
       user: isSet(object.user) ? UserTransaction.fromJSON(object.user) : undefined,
       validator: isSet(object.validator) ? ValidatorTransaction.fromJSON(object.validator) : undefined,
+      blockEpilogue: isSet(object.blockEpilogue) ? BlockEpilogueTransaction.fromJSON(object.blockEpilogue) : undefined,
       sizeInfo: isSet(object.sizeInfo) ? TransactionSizeInfo.fromJSON(object.sizeInfo) : undefined,
     };
   },
@@ -1499,6 +1592,9 @@ export const Transaction = {
     if (message.validator !== undefined) {
       obj.validator = ValidatorTransaction.toJSON(message.validator);
     }
+    if (message.blockEpilogue !== undefined) {
+      obj.blockEpilogue = BlockEpilogueTransaction.toJSON(message.blockEpilogue);
+    }
     if (message.sizeInfo !== undefined) {
       obj.sizeInfo = TransactionSizeInfo.toJSON(message.sizeInfo);
     }
@@ -1535,6 +1631,9 @@ export const Transaction = {
     message.validator = (object.validator !== undefined && object.validator !== null)
       ? ValidatorTransaction.fromPartial(object.validator)
       : undefined;
+    message.blockEpilogue = (object.blockEpilogue !== undefined && object.blockEpilogue !== null)
+      ? BlockEpilogueTransaction.fromPartial(object.blockEpilogue)
+      : undefined;
     message.sizeInfo = (object.sizeInfo !== undefined && object.sizeInfo !== null)
       ? TransactionSizeInfo.fromPartial(object.sizeInfo)
       : undefined;
@@ -1585,10 +1684,1470 @@ export const BlockMetadataTransaction = {
     return writer;
   },
 
-  decode(input: _m0.Reader | Uint8Array, length?: number): BlockMetadataTransaction {
+  decode(input: _m0.Reader | Uint8Array, length?: number): BlockMetadataTransaction {
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseBlockMetadataTransaction();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          if (tag !== 10) {
+            break;
+          }
+
+          message.id = reader.string();
+          continue;
+        case 2:
+          if (tag !== 16) {
+            break;
+          }
+
+          message.round = longToBigint(reader.uint64() as Long);
+          continue;
+        case 3:
+          if (tag !== 26) {
+            break;
+          }
+
+          message.events!.push(Event.decode(reader, reader.uint32()));
+          continue;
+        case 4:
+          if (tag !== 34) {
+            break;
+          }
+
+          message.previousBlockVotesBitvec = reader.bytes();
+          continue;
+        case 5:
+          if (tag !== 42) {
+            break;
+          }
+
+          message.proposer = reader.string();
+          continue;
+        case 6:
+          if (tag === 48) {
+            message.failedProposerIndices!.push(reader.uint32());
+
+            continue;
+          }
+
+          if (tag === 50) {
+            const end2 = reader.uint32() + reader.pos;
+            while (reader.pos < end2) {
+              message.failedProposerIndices!.push(reader.uint32());
+            }
+
+            continue;
+          }
+
+          break;
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  },
+
+  // encodeTransform encodes a source of message objects.
+  // Transform<BlockMetadataTransaction, Uint8Array>
+  async *encodeTransform(
+    source:
+      | AsyncIterable<BlockMetadataTransaction | BlockMetadataTransaction[]>
+      | Iterable<BlockMetadataTransaction | BlockMetadataTransaction[]>,
+  ): AsyncIterable<Uint8Array> {
+    for await (const pkt of source) {
+      if (globalThis.Array.isArray(pkt)) {
+        for (const p of (pkt as any)) {
+          yield* [BlockMetadataTransaction.encode(p).finish()];
+        }
+      } else {
+        yield* [BlockMetadataTransaction.encode(pkt as any).finish()];
+      }
+    }
+  },
+
+  // decodeTransform decodes a source of encoded messages.
+  // Transform<Uint8Array, BlockMetadataTransaction>
+  async *decodeTransform(
+    source: AsyncIterable<Uint8Array | Uint8Array[]> | Iterable<Uint8Array | Uint8Array[]>,
+  ): AsyncIterable<BlockMetadataTransaction> {
+    for await (const pkt of source) {
+      if (globalThis.Array.isArray(pkt)) {
+        for (const p of (pkt as any)) {
+          yield* [BlockMetadataTransaction.decode(p)];
+        }
+      } else {
+        yield* [BlockMetadataTransaction.decode(pkt as any)];
+      }
+    }
+  },
+
+  fromJSON(object: any): BlockMetadataTransaction {
+    return {
+      id: isSet(object.id) ? globalThis.String(object.id) : "",
+      round: isSet(object.round) ? BigInt(object.round) : BigInt("0"),
+      events: globalThis.Array.isArray(object?.events) ? object.events.map((e: any) => Event.fromJSON(e)) : [],
+      previousBlockVotesBitvec: isSet(object.previousBlockVotesBitvec)
+        ? bytesFromBase64(object.previousBlockVotesBitvec)
+        : new Uint8Array(0),
+      proposer: isSet(object.proposer) ? globalThis.String(object.proposer) : "",
+      failedProposerIndices: globalThis.Array.isArray(object?.failedProposerIndices)
+        ? object.failedProposerIndices.map((e: any) => globalThis.Number(e))
+        : [],
+    };
+  },
+
+  toJSON(message: BlockMetadataTransaction): unknown {
+    const obj: any = {};
+    if (message.id !== undefined && message.id !== "") {
+      obj.id = message.id;
+    }
+    if (message.round !== undefined && message.round !== BigInt("0")) {
+      obj.round = message.round.toString();
+    }
+    if (message.events?.length) {
+      obj.events = message.events.map((e) => Event.toJSON(e));
+    }
+    if (message.previousBlockVotesBitvec !== undefined && message.previousBlockVotesBitvec.length !== 0) {
+      obj.previousBlockVotesBitvec = base64FromBytes(message.previousBlockVotesBitvec);
+    }
+    if (message.proposer !== undefined && message.proposer !== "") {
+      obj.proposer = message.proposer;
+    }
+    if (message.failedProposerIndices?.length) {
+      obj.failedProposerIndices = message.failedProposerIndices.map((e) => Math.round(e));
+    }
+    return obj;
+  },
+
+  create(base?: DeepPartial<BlockMetadataTransaction>): BlockMetadataTransaction {
+    return BlockMetadataTransaction.fromPartial(base ?? {});
+  },
+  fromPartial(object: DeepPartial<BlockMetadataTransaction>): BlockMetadataTransaction {
+    const message = createBaseBlockMetadataTransaction();
+    message.id = object.id ?? "";
+    message.round = object.round ?? BigInt("0");
+    message.events = object.events?.map((e) => Event.fromPartial(e)) || [];
+    message.previousBlockVotesBitvec = object.previousBlockVotesBitvec ?? new Uint8Array(0);
+    message.proposer = object.proposer ?? "";
+    message.failedProposerIndices = object.failedProposerIndices?.map((e) => e) || [];
+    return message;
+  },
+};
+
+function createBaseGenesisTransaction(): GenesisTransaction {
+  return { payload: undefined, events: [] };
+}
+
+export const GenesisTransaction = {
+  encode(message: GenesisTransaction, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    if (message.payload !== undefined) {
+      WriteSet.encode(message.payload, writer.uint32(10).fork()).ldelim();
+    }
+    if (message.events !== undefined && message.events.length !== 0) {
+      for (const v of message.events) {
+        Event.encode(v!, writer.uint32(18).fork()).ldelim();
+      }
+    }
+    return writer;
+  },
+
+  decode(input: _m0.Reader | Uint8Array, length?: number): GenesisTransaction {
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseGenesisTransaction();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          if (tag !== 10) {
+            break;
+          }
+
+          message.payload = WriteSet.decode(reader, reader.uint32());
+          continue;
+        case 2:
+          if (tag !== 18) {
+            break;
+          }
+
+          message.events!.push(Event.decode(reader, reader.uint32()));
+          continue;
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  },
+
+  // encodeTransform encodes a source of message objects.
+  // Transform<GenesisTransaction, Uint8Array>
+  async *encodeTransform(
+    source:
+      | AsyncIterable<GenesisTransaction | GenesisTransaction[]>
+      | Iterable<GenesisTransaction | GenesisTransaction[]>,
+  ): AsyncIterable<Uint8Array> {
+    for await (const pkt of source) {
+      if (globalThis.Array.isArray(pkt)) {
+        for (const p of (pkt as any)) {
+          yield* [GenesisTransaction.encode(p).finish()];
+        }
+      } else {
+        yield* [GenesisTransaction.encode(pkt as any).finish()];
+      }
+    }
+  },
+
+  // decodeTransform decodes a source of encoded messages.
+  // Transform<Uint8Array, GenesisTransaction>
+  async *decodeTransform(
+    source: AsyncIterable<Uint8Array | Uint8Array[]> | Iterable<Uint8Array | Uint8Array[]>,
+  ): AsyncIterable<GenesisTransaction> {
+    for await (const pkt of source) {
+      if (globalThis.Array.isArray(pkt)) {
+        for (const p of (pkt as any)) {
+          yield* [GenesisTransaction.decode(p)];
+        }
+      } else {
+        yield* [GenesisTransaction.decode(pkt as any)];
+      }
+    }
+  },
+
+  fromJSON(object: any): GenesisTransaction {
+    return {
+      payload: isSet(object.payload) ? WriteSet.fromJSON(object.payload) : undefined,
+      events: globalThis.Array.isArray(object?.events) ? object.events.map((e: any) => Event.fromJSON(e)) : [],
+    };
+  },
+
+  toJSON(message: GenesisTransaction): unknown {
+    const obj: any = {};
+    if (message.payload !== undefined) {
+      obj.payload = WriteSet.toJSON(message.payload);
+    }
+    if (message.events?.length) {
+      obj.events = message.events.map((e) => Event.toJSON(e));
+    }
+    return obj;
+  },
+
+  create(base?: DeepPartial<GenesisTransaction>): GenesisTransaction {
+    return GenesisTransaction.fromPartial(base ?? {});
+  },
+  fromPartial(object: DeepPartial<GenesisTransaction>): GenesisTransaction {
+    const message = createBaseGenesisTransaction();
+    message.payload = (object.payload !== undefined && object.payload !== null)
+      ? WriteSet.fromPartial(object.payload)
+      : undefined;
+    message.events = object.events?.map((e) => Event.fromPartial(e)) || [];
+    return message;
+  },
+};
+
+function createBaseStateCheckpointTransaction(): StateCheckpointTransaction {
+  return {};
+}
+
+export const StateCheckpointTransaction = {
+  encode(_: StateCheckpointTransaction, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    return writer;
+  },
+
+  decode(input: _m0.Reader | Uint8Array, length?: number): StateCheckpointTransaction {
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseStateCheckpointTransaction();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  },
+
+  // encodeTransform encodes a source of message objects.
+  // Transform<StateCheckpointTransaction, Uint8Array>
+  async *encodeTransform(
+    source:
+      | AsyncIterable<StateCheckpointTransaction | StateCheckpointTransaction[]>
+      | Iterable<StateCheckpointTransaction | StateCheckpointTransaction[]>,
+  ): AsyncIterable<Uint8Array> {
+    for await (const pkt of source) {
+      if (globalThis.Array.isArray(pkt)) {
+        for (const p of (pkt as any)) {
+          yield* [StateCheckpointTransaction.encode(p).finish()];
+        }
+      } else {
+        yield* [StateCheckpointTransaction.encode(pkt as any).finish()];
+      }
+    }
+  },
+
+  // decodeTransform decodes a source of encoded messages.
+  // Transform<Uint8Array, StateCheckpointTransaction>
+  async *decodeTransform(
+    source: AsyncIterable<Uint8Array | Uint8Array[]> | Iterable<Uint8Array | Uint8Array[]>,
+  ): AsyncIterable<StateCheckpointTransaction> {
+    for await (const pkt of source) {
+      if (globalThis.Array.isArray(pkt)) {
+        for (const p of (pkt as any)) {
+          yield* [StateCheckpointTransaction.decode(p)];
+        }
+      } else {
+        yield* [StateCheckpointTransaction.decode(pkt as any)];
+      }
+    }
+  },
+
+  fromJSON(_: any): StateCheckpointTransaction {
+    return {};
+  },
+
+  toJSON(_: StateCheckpointTransaction): unknown {
+    const obj: any = {};
+    return obj;
+  },
+
+  create(base?: DeepPartial<StateCheckpointTransaction>): StateCheckpointTransaction {
+    return StateCheckpointTransaction.fromPartial(base ?? {});
+  },
+  fromPartial(_: DeepPartial<StateCheckpointTransaction>): StateCheckpointTransaction {
+    const message = createBaseStateCheckpointTransaction();
+    return message;
+  },
+};
+
+function createBaseValidatorTransaction(): ValidatorTransaction {
+  return { observedJwkUpdate: undefined, dkgUpdate: undefined, events: [] };
+}
+
+export const ValidatorTransaction = {
+  encode(message: ValidatorTransaction, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    if (message.observedJwkUpdate !== undefined) {
+      ValidatorTransaction_ObservedJwkUpdate.encode(message.observedJwkUpdate, writer.uint32(10).fork()).ldelim();
+    }
+    if (message.dkgUpdate !== undefined) {
+      ValidatorTransaction_DkgUpdate.encode(message.dkgUpdate, writer.uint32(18).fork()).ldelim();
+    }
+    if (message.events !== undefined && message.events.length !== 0) {
+      for (const v of message.events) {
+        Event.encode(v!, writer.uint32(26).fork()).ldelim();
+      }
+    }
+    return writer;
+  },
+
+  decode(input: _m0.Reader | Uint8Array, length?: number): ValidatorTransaction {
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseValidatorTransaction();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          if (tag !== 10) {
+            break;
+          }
+
+          message.observedJwkUpdate = ValidatorTransaction_ObservedJwkUpdate.decode(reader, reader.uint32());
+          continue;
+        case 2:
+          if (tag !== 18) {
+            break;
+          }
+
+          message.dkgUpdate = ValidatorTransaction_DkgUpdate.decode(reader, reader.uint32());
+          continue;
+        case 3:
+          if (tag !== 26) {
+            break;
+          }
+
+          message.events!.push(Event.decode(reader, reader.uint32()));
+          continue;
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  },
+
+  // encodeTransform encodes a source of message objects.
+  // Transform<ValidatorTransaction, Uint8Array>
+  async *encodeTransform(
+    source:
+      | AsyncIterable<ValidatorTransaction | ValidatorTransaction[]>
+      | Iterable<ValidatorTransaction | ValidatorTransaction[]>,
+  ): AsyncIterable<Uint8Array> {
+    for await (const pkt of source) {
+      if (globalThis.Array.isArray(pkt)) {
+        for (const p of (pkt as any)) {
+          yield* [ValidatorTransaction.encode(p).finish()];
+        }
+      } else {
+        yield* [ValidatorTransaction.encode(pkt as any).finish()];
+      }
+    }
+  },
+
+  // decodeTransform decodes a source of encoded messages.
+  // Transform<Uint8Array, ValidatorTransaction>
+  async *decodeTransform(
+    source: AsyncIterable<Uint8Array | Uint8Array[]> | Iterable<Uint8Array | Uint8Array[]>,
+  ): AsyncIterable<ValidatorTransaction> {
+    for await (const pkt of source) {
+      if (globalThis.Array.isArray(pkt)) {
+        for (const p of (pkt as any)) {
+          yield* [ValidatorTransaction.decode(p)];
+        }
+      } else {
+        yield* [ValidatorTransaction.decode(pkt as any)];
+      }
+    }
+  },
+
+  fromJSON(object: any): ValidatorTransaction {
+    return {
+      observedJwkUpdate: isSet(object.observedJwkUpdate)
+        ? ValidatorTransaction_ObservedJwkUpdate.fromJSON(object.observedJwkUpdate)
+        : undefined,
+      dkgUpdate: isSet(object.dkgUpdate) ? ValidatorTransaction_DkgUpdate.fromJSON(object.dkgUpdate) : undefined,
+      events: globalThis.Array.isArray(object?.events) ? object.events.map((e: any) => Event.fromJSON(e)) : [],
+    };
+  },
+
+  toJSON(message: ValidatorTransaction): unknown {
+    const obj: any = {};
+    if (message.observedJwkUpdate !== undefined) {
+      obj.observedJwkUpdate = ValidatorTransaction_ObservedJwkUpdate.toJSON(message.observedJwkUpdate);
+    }
+    if (message.dkgUpdate !== undefined) {
+      obj.dkgUpdate = ValidatorTransaction_DkgUpdate.toJSON(message.dkgUpdate);
+    }
+    if (message.events?.length) {
+      obj.events = message.events.map((e) => Event.toJSON(e));
+    }
+    return obj;
+  },
+
+  create(base?: DeepPartial<ValidatorTransaction>): ValidatorTransaction {
+    return ValidatorTransaction.fromPartial(base ?? {});
+  },
+  fromPartial(object: DeepPartial<ValidatorTransaction>): ValidatorTransaction {
+    const message = createBaseValidatorTransaction();
+    message.observedJwkUpdate = (object.observedJwkUpdate !== undefined && object.observedJwkUpdate !== null)
+      ? ValidatorTransaction_ObservedJwkUpdate.fromPartial(object.observedJwkUpdate)
+      : undefined;
+    message.dkgUpdate = (object.dkgUpdate !== undefined && object.dkgUpdate !== null)
+      ? ValidatorTransaction_DkgUpdate.fromPartial(object.dkgUpdate)
+      : undefined;
+    message.events = object.events?.map((e) => Event.fromPartial(e)) || [];
+    return message;
+  },
+};
+
+function createBaseValidatorTransaction_ObservedJwkUpdate(): ValidatorTransaction_ObservedJwkUpdate {
+  return { quorumCertifiedUpdate: undefined };
+}
+
+export const ValidatorTransaction_ObservedJwkUpdate = {
+  encode(message: ValidatorTransaction_ObservedJwkUpdate, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    if (message.quorumCertifiedUpdate !== undefined) {
+      ValidatorTransaction_ObservedJwkUpdate_QuorumCertifiedUpdate.encode(
+        message.quorumCertifiedUpdate,
+        writer.uint32(10).fork(),
+      ).ldelim();
+    }
+    return writer;
+  },
+
+  decode(input: _m0.Reader | Uint8Array, length?: number): ValidatorTransaction_ObservedJwkUpdate {
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseValidatorTransaction_ObservedJwkUpdate();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          if (tag !== 10) {
+            break;
+          }
+
+          message.quorumCertifiedUpdate = ValidatorTransaction_ObservedJwkUpdate_QuorumCertifiedUpdate.decode(
+            reader,
+            reader.uint32(),
+          );
+          continue;
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  },
+
+  // encodeTransform encodes a source of message objects.
+  // Transform<ValidatorTransaction_ObservedJwkUpdate, Uint8Array>
+  async *encodeTransform(
+    source:
+      | AsyncIterable<ValidatorTransaction_ObservedJwkUpdate | ValidatorTransaction_ObservedJwkUpdate[]>
+      | Iterable<ValidatorTransaction_ObservedJwkUpdate | ValidatorTransaction_ObservedJwkUpdate[]>,
+  ): AsyncIterable<Uint8Array> {
+    for await (const pkt of source) {
+      if (globalThis.Array.isArray(pkt)) {
+        for (const p of (pkt as any)) {
+          yield* [ValidatorTransaction_ObservedJwkUpdate.encode(p).finish()];
+        }
+      } else {
+        yield* [ValidatorTransaction_ObservedJwkUpdate.encode(pkt as any).finish()];
+      }
+    }
+  },
+
+  // decodeTransform decodes a source of encoded messages.
+  // Transform<Uint8Array, ValidatorTransaction_ObservedJwkUpdate>
+  async *decodeTransform(
+    source: AsyncIterable<Uint8Array | Uint8Array[]> | Iterable<Uint8Array | Uint8Array[]>,
+  ): AsyncIterable<ValidatorTransaction_ObservedJwkUpdate> {
+    for await (const pkt of source) {
+      if (globalThis.Array.isArray(pkt)) {
+        for (const p of (pkt as any)) {
+          yield* [ValidatorTransaction_ObservedJwkUpdate.decode(p)];
+        }
+      } else {
+        yield* [ValidatorTransaction_ObservedJwkUpdate.decode(pkt as any)];
+      }
+    }
+  },
+
+  fromJSON(object: any): ValidatorTransaction_ObservedJwkUpdate {
+    return {
+      quorumCertifiedUpdate: isSet(object.quorumCertifiedUpdate)
+        ? ValidatorTransaction_ObservedJwkUpdate_QuorumCertifiedUpdate.fromJSON(object.quorumCertifiedUpdate)
+        : undefined,
+    };
+  },
+
+  toJSON(message: ValidatorTransaction_ObservedJwkUpdate): unknown {
+    const obj: any = {};
+    if (message.quorumCertifiedUpdate !== undefined) {
+      obj.quorumCertifiedUpdate = ValidatorTransaction_ObservedJwkUpdate_QuorumCertifiedUpdate.toJSON(
+        message.quorumCertifiedUpdate,
+      );
+    }
+    return obj;
+  },
+
+  create(base?: DeepPartial<ValidatorTransaction_ObservedJwkUpdate>): ValidatorTransaction_ObservedJwkUpdate {
+    return ValidatorTransaction_ObservedJwkUpdate.fromPartial(base ?? {});
+  },
+  fromPartial(object: DeepPartial<ValidatorTransaction_ObservedJwkUpdate>): ValidatorTransaction_ObservedJwkUpdate {
+    const message = createBaseValidatorTransaction_ObservedJwkUpdate();
+    message.quorumCertifiedUpdate =
+      (object.quorumCertifiedUpdate !== undefined && object.quorumCertifiedUpdate !== null)
+        ? ValidatorTransaction_ObservedJwkUpdate_QuorumCertifiedUpdate.fromPartial(object.quorumCertifiedUpdate)
+        : undefined;
+    return message;
+  },
+};
+
+function createBaseValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs(): ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs {
+  return { issuer: "", version: BigInt("0"), jwks: [] };
+}
+
+export const ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs = {
+  encode(
+    message: ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs,
+    writer: _m0.Writer = _m0.Writer.create(),
+  ): _m0.Writer {
+    if (message.issuer !== undefined && message.issuer !== "") {
+      writer.uint32(10).string(message.issuer);
+    }
+    if (message.version !== undefined && message.version !== BigInt("0")) {
+      if (BigInt.asUintN(64, message.version) !== message.version) {
+        throw new globalThis.Error("value provided for field message.version of type uint64 too large");
+      }
+      writer.uint32(16).uint64(message.version.toString());
+    }
+    if (message.jwks !== undefined && message.jwks.length !== 0) {
+      for (const v of message.jwks) {
+        ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK.encode(v!, writer.uint32(26).fork()).ldelim();
+      }
+    }
+    return writer;
+  },
+
+  decode(input: _m0.Reader | Uint8Array, length?: number): ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs {
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          if (tag !== 10) {
+            break;
+          }
+
+          message.issuer = reader.string();
+          continue;
+        case 2:
+          if (tag !== 16) {
+            break;
+          }
+
+          message.version = longToBigint(reader.uint64() as Long);
+          continue;
+        case 3:
+          if (tag !== 26) {
+            break;
+          }
+
+          message.jwks!.push(
+            ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK.decode(reader, reader.uint32()),
+          );
+          continue;
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  },
+
+  // encodeTransform encodes a source of message objects.
+  // Transform<ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs, Uint8Array>
+  async *encodeTransform(
+    source:
+      | AsyncIterable<
+        | ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs
+        | ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs[]
+      >
+      | Iterable<
+        | ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs
+        | ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs[]
+      >,
+  ): AsyncIterable<Uint8Array> {
+    for await (const pkt of source) {
+      if (globalThis.Array.isArray(pkt)) {
+        for (const p of (pkt as any)) {
+          yield* [ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs.encode(p).finish()];
+        }
+      } else {
+        yield* [ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs.encode(pkt as any).finish()];
+      }
+    }
+  },
+
+  // decodeTransform decodes a source of encoded messages.
+  // Transform<Uint8Array, ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs>
+  async *decodeTransform(
+    source: AsyncIterable<Uint8Array | Uint8Array[]> | Iterable<Uint8Array | Uint8Array[]>,
+  ): AsyncIterable<ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs> {
+    for await (const pkt of source) {
+      if (globalThis.Array.isArray(pkt)) {
+        for (const p of (pkt as any)) {
+          yield* [ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs.decode(p)];
+        }
+      } else {
+        yield* [ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs.decode(pkt as any)];
+      }
+    }
+  },
+
+  fromJSON(object: any): ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs {
+    return {
+      issuer: isSet(object.issuer) ? globalThis.String(object.issuer) : "",
+      version: isSet(object.version) ? BigInt(object.version) : BigInt("0"),
+      jwks: globalThis.Array.isArray(object?.jwks)
+        ? object.jwks.map((e: any) => ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK.fromJSON(e))
+        : [],
+    };
+  },
+
+  toJSON(message: ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs): unknown {
+    const obj: any = {};
+    if (message.issuer !== undefined && message.issuer !== "") {
+      obj.issuer = message.issuer;
+    }
+    if (message.version !== undefined && message.version !== BigInt("0")) {
+      obj.version = message.version.toString();
+    }
+    if (message.jwks?.length) {
+      obj.jwks = message.jwks.map((e) => ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK.toJSON(e));
+    }
+    return obj;
+  },
+
+  create(
+    base?: DeepPartial<ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs>,
+  ): ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs {
+    return ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs.fromPartial(base ?? {});
+  },
+  fromPartial(
+    object: DeepPartial<ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs>,
+  ): ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs {
+    const message = createBaseValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs();
+    message.issuer = object.issuer ?? "";
+    message.version = object.version ?? BigInt("0");
+    message.jwks =
+      object.jwks?.map((e) => ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK.fromPartial(e)) || [];
+    return message;
+  },
+};
+
+function createBaseValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK(): ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK {
+  return { unsupportedJwk: undefined, rsa: undefined };
+}
+
+export const ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK = {
+  encode(
+    message: ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK,
+    writer: _m0.Writer = _m0.Writer.create(),
+  ): _m0.Writer {
+    if (message.unsupportedJwk !== undefined) {
+      ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK_UnsupportedJWK.encode(
+        message.unsupportedJwk,
+        writer.uint32(10).fork(),
+      ).ldelim();
+    }
+    if (message.rsa !== undefined) {
+      ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK_RSA.encode(message.rsa, writer.uint32(18).fork())
+        .ldelim();
+    }
+    return writer;
+  },
+
+  decode(
+    input: _m0.Reader | Uint8Array,
+    length?: number,
+  ): ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK {
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          if (tag !== 10) {
+            break;
+          }
+
+          message.unsupportedJwk = ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK_UnsupportedJWK
+            .decode(reader, reader.uint32());
+          continue;
+        case 2:
+          if (tag !== 18) {
+            break;
+          }
+
+          message.rsa = ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK_RSA.decode(
+            reader,
+            reader.uint32(),
+          );
+          continue;
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  },
+
+  // encodeTransform encodes a source of message objects.
+  // Transform<ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK, Uint8Array>
+  async *encodeTransform(
+    source:
+      | AsyncIterable<
+        | ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK
+        | ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK[]
+      >
+      | Iterable<
+        | ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK
+        | ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK[]
+      >,
+  ): AsyncIterable<Uint8Array> {
+    for await (const pkt of source) {
+      if (globalThis.Array.isArray(pkt)) {
+        for (const p of (pkt as any)) {
+          yield* [ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK.encode(p).finish()];
+        }
+      } else {
+        yield* [ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK.encode(pkt as any).finish()];
+      }
+    }
+  },
+
+  // decodeTransform decodes a source of encoded messages.
+  // Transform<Uint8Array, ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK>
+  async *decodeTransform(
+    source: AsyncIterable<Uint8Array | Uint8Array[]> | Iterable<Uint8Array | Uint8Array[]>,
+  ): AsyncIterable<ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK> {
+    for await (const pkt of source) {
+      if (globalThis.Array.isArray(pkt)) {
+        for (const p of (pkt as any)) {
+          yield* [ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK.decode(p)];
+        }
+      } else {
+        yield* [ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK.decode(pkt as any)];
+      }
+    }
+  },
+
+  fromJSON(object: any): ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK {
+    return {
+      unsupportedJwk: isSet(object.unsupportedJwk)
+        ? ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK_UnsupportedJWK.fromJSON(object.unsupportedJwk)
+        : undefined,
+      rsa: isSet(object.rsa)
+        ? ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK_RSA.fromJSON(object.rsa)
+        : undefined,
+    };
+  },
+
+  toJSON(message: ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK): unknown {
+    const obj: any = {};
+    if (message.unsupportedJwk !== undefined) {
+      obj.unsupportedJwk = ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK_UnsupportedJWK.toJSON(
+        message.unsupportedJwk,
+      );
+    }
+    if (message.rsa !== undefined) {
+      obj.rsa = ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK_RSA.toJSON(message.rsa);
+    }
+    return obj;
+  },
+
+  create(
+    base?: DeepPartial<ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK>,
+  ): ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK {
+    return ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK.fromPartial(base ?? {});
+  },
+  fromPartial(
+    object: DeepPartial<ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK>,
+  ): ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK {
+    const message = createBaseValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK();
+    message.unsupportedJwk = (object.unsupportedJwk !== undefined && object.unsupportedJwk !== null)
+      ? ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK_UnsupportedJWK.fromPartial(
+        object.unsupportedJwk,
+      )
+      : undefined;
+    message.rsa = (object.rsa !== undefined && object.rsa !== null)
+      ? ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK_RSA.fromPartial(object.rsa)
+      : undefined;
+    return message;
+  },
+};
+
+function createBaseValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK_RSA(): ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK_RSA {
+  return { kid: "", kty: "", alg: "", e: "", n: "" };
+}
+
+export const ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK_RSA = {
+  encode(
+    message: ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK_RSA,
+    writer: _m0.Writer = _m0.Writer.create(),
+  ): _m0.Writer {
+    if (message.kid !== undefined && message.kid !== "") {
+      writer.uint32(10).string(message.kid);
+    }
+    if (message.kty !== undefined && message.kty !== "") {
+      writer.uint32(18).string(message.kty);
+    }
+    if (message.alg !== undefined && message.alg !== "") {
+      writer.uint32(26).string(message.alg);
+    }
+    if (message.e !== undefined && message.e !== "") {
+      writer.uint32(34).string(message.e);
+    }
+    if (message.n !== undefined && message.n !== "") {
+      writer.uint32(42).string(message.n);
+    }
+    return writer;
+  },
+
+  decode(
+    input: _m0.Reader | Uint8Array,
+    length?: number,
+  ): ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK_RSA {
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK_RSA();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          if (tag !== 10) {
+            break;
+          }
+
+          message.kid = reader.string();
+          continue;
+        case 2:
+          if (tag !== 18) {
+            break;
+          }
+
+          message.kty = reader.string();
+          continue;
+        case 3:
+          if (tag !== 26) {
+            break;
+          }
+
+          message.alg = reader.string();
+          continue;
+        case 4:
+          if (tag !== 34) {
+            break;
+          }
+
+          message.e = reader.string();
+          continue;
+        case 5:
+          if (tag !== 42) {
+            break;
+          }
+
+          message.n = reader.string();
+          continue;
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  },
+
+  // encodeTransform encodes a source of message objects.
+  // Transform<ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK_RSA, Uint8Array>
+  async *encodeTransform(
+    source:
+      | AsyncIterable<
+        | ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK_RSA
+        | ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK_RSA[]
+      >
+      | Iterable<
+        | ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK_RSA
+        | ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK_RSA[]
+      >,
+  ): AsyncIterable<Uint8Array> {
+    for await (const pkt of source) {
+      if (globalThis.Array.isArray(pkt)) {
+        for (const p of (pkt as any)) {
+          yield* [ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK_RSA.encode(p).finish()];
+        }
+      } else {
+        yield* [ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK_RSA.encode(pkt as any).finish()];
+      }
+    }
+  },
+
+  // decodeTransform decodes a source of encoded messages.
+  // Transform<Uint8Array, ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK_RSA>
+  async *decodeTransform(
+    source: AsyncIterable<Uint8Array | Uint8Array[]> | Iterable<Uint8Array | Uint8Array[]>,
+  ): AsyncIterable<ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK_RSA> {
+    for await (const pkt of source) {
+      if (globalThis.Array.isArray(pkt)) {
+        for (const p of (pkt as any)) {
+          yield* [ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK_RSA.decode(p)];
+        }
+      } else {
+        yield* [ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK_RSA.decode(pkt as any)];
+      }
+    }
+  },
+
+  fromJSON(object: any): ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK_RSA {
+    return {
+      kid: isSet(object.kid) ? globalThis.String(object.kid) : "",
+      kty: isSet(object.kty) ? globalThis.String(object.kty) : "",
+      alg: isSet(object.alg) ? globalThis.String(object.alg) : "",
+      e: isSet(object.e) ? globalThis.String(object.e) : "",
+      n: isSet(object.n) ? globalThis.String(object.n) : "",
+    };
+  },
+
+  toJSON(message: ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK_RSA): unknown {
+    const obj: any = {};
+    if (message.kid !== undefined && message.kid !== "") {
+      obj.kid = message.kid;
+    }
+    if (message.kty !== undefined && message.kty !== "") {
+      obj.kty = message.kty;
+    }
+    if (message.alg !== undefined && message.alg !== "") {
+      obj.alg = message.alg;
+    }
+    if (message.e !== undefined && message.e !== "") {
+      obj.e = message.e;
+    }
+    if (message.n !== undefined && message.n !== "") {
+      obj.n = message.n;
+    }
+    return obj;
+  },
+
+  create(
+    base?: DeepPartial<ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK_RSA>,
+  ): ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK_RSA {
+    return ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK_RSA.fromPartial(base ?? {});
+  },
+  fromPartial(
+    object: DeepPartial<ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK_RSA>,
+  ): ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK_RSA {
+    const message = createBaseValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK_RSA();
+    message.kid = object.kid ?? "";
+    message.kty = object.kty ?? "";
+    message.alg = object.alg ?? "";
+    message.e = object.e ?? "";
+    message.n = object.n ?? "";
+    return message;
+  },
+};
+
+function createBaseValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK_UnsupportedJWK(): ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK_UnsupportedJWK {
+  return { id: new Uint8Array(0), payload: new Uint8Array(0) };
+}
+
+export const ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK_UnsupportedJWK = {
+  encode(
+    message: ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK_UnsupportedJWK,
+    writer: _m0.Writer = _m0.Writer.create(),
+  ): _m0.Writer {
+    if (message.id !== undefined && message.id.length !== 0) {
+      writer.uint32(10).bytes(message.id);
+    }
+    if (message.payload !== undefined && message.payload.length !== 0) {
+      writer.uint32(18).bytes(message.payload);
+    }
+    return writer;
+  },
+
+  decode(
+    input: _m0.Reader | Uint8Array,
+    length?: number,
+  ): ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK_UnsupportedJWK {
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK_UnsupportedJWK();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          if (tag !== 10) {
+            break;
+          }
+
+          message.id = reader.bytes();
+          continue;
+        case 2:
+          if (tag !== 18) {
+            break;
+          }
+
+          message.payload = reader.bytes();
+          continue;
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  },
+
+  // encodeTransform encodes a source of message objects.
+  // Transform<ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK_UnsupportedJWK, Uint8Array>
+  async *encodeTransform(
+    source:
+      | AsyncIterable<
+        | ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK_UnsupportedJWK
+        | ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK_UnsupportedJWK[]
+      >
+      | Iterable<
+        | ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK_UnsupportedJWK
+        | ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK_UnsupportedJWK[]
+      >,
+  ): AsyncIterable<Uint8Array> {
+    for await (const pkt of source) {
+      if (globalThis.Array.isArray(pkt)) {
+        for (const p of (pkt as any)) {
+          yield* [ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK_UnsupportedJWK.encode(p).finish()];
+        }
+      } else {
+        yield* [
+          ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK_UnsupportedJWK.encode(pkt as any).finish(),
+        ];
+      }
+    }
+  },
+
+  // decodeTransform decodes a source of encoded messages.
+  // Transform<Uint8Array, ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK_UnsupportedJWK>
+  async *decodeTransform(
+    source: AsyncIterable<Uint8Array | Uint8Array[]> | Iterable<Uint8Array | Uint8Array[]>,
+  ): AsyncIterable<ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK_UnsupportedJWK> {
+    for await (const pkt of source) {
+      if (globalThis.Array.isArray(pkt)) {
+        for (const p of (pkt as any)) {
+          yield* [ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK_UnsupportedJWK.decode(p)];
+        }
+      } else {
+        yield* [ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK_UnsupportedJWK.decode(pkt as any)];
+      }
+    }
+  },
+
+  fromJSON(object: any): ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK_UnsupportedJWK {
+    return {
+      id: isSet(object.id) ? bytesFromBase64(object.id) : new Uint8Array(0),
+      payload: isSet(object.payload) ? bytesFromBase64(object.payload) : new Uint8Array(0),
+    };
+  },
+
+  toJSON(message: ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK_UnsupportedJWK): unknown {
+    const obj: any = {};
+    if (message.id !== undefined && message.id.length !== 0) {
+      obj.id = base64FromBytes(message.id);
+    }
+    if (message.payload !== undefined && message.payload.length !== 0) {
+      obj.payload = base64FromBytes(message.payload);
+    }
+    return obj;
+  },
+
+  create(
+    base?: DeepPartial<ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK_UnsupportedJWK>,
+  ): ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK_UnsupportedJWK {
+    return ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK_UnsupportedJWK.fromPartial(base ?? {});
+  },
+  fromPartial(
+    object: DeepPartial<ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK_UnsupportedJWK>,
+  ): ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK_UnsupportedJWK {
+    const message = createBaseValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs_JWK_UnsupportedJWK();
+    message.id = object.id ?? new Uint8Array(0);
+    message.payload = object.payload ?? new Uint8Array(0);
+    return message;
+  },
+};
+
+function createBaseValidatorTransaction_ObservedJwkUpdate_ExportedAggregateSignature(): ValidatorTransaction_ObservedJwkUpdate_ExportedAggregateSignature {
+  return { signerIndices: [], sig: new Uint8Array(0) };
+}
+
+export const ValidatorTransaction_ObservedJwkUpdate_ExportedAggregateSignature = {
+  encode(
+    message: ValidatorTransaction_ObservedJwkUpdate_ExportedAggregateSignature,
+    writer: _m0.Writer = _m0.Writer.create(),
+  ): _m0.Writer {
+    if (message.signerIndices !== undefined && message.signerIndices.length !== 0) {
+      writer.uint32(10).fork();
+      for (const v of message.signerIndices) {
+        if (BigInt.asUintN(64, v) !== v) {
+          throw new globalThis.Error("a value provided in array field signerIndices of type uint64 is too large");
+        }
+        writer.uint64(v.toString());
+      }
+      writer.ldelim();
+    }
+    if (message.sig !== undefined && message.sig.length !== 0) {
+      writer.uint32(18).bytes(message.sig);
+    }
+    return writer;
+  },
+
+  decode(
+    input: _m0.Reader | Uint8Array,
+    length?: number,
+  ): ValidatorTransaction_ObservedJwkUpdate_ExportedAggregateSignature {
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseValidatorTransaction_ObservedJwkUpdate_ExportedAggregateSignature();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          if (tag === 8) {
+            message.signerIndices!.push(longToBigint(reader.uint64() as Long));
+
+            continue;
+          }
+
+          if (tag === 10) {
+            const end2 = reader.uint32() + reader.pos;
+            while (reader.pos < end2) {
+              message.signerIndices!.push(longToBigint(reader.uint64() as Long));
+            }
+
+            continue;
+          }
+
+          break;
+        case 2:
+          if (tag !== 18) {
+            break;
+          }
+
+          message.sig = reader.bytes();
+          continue;
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  },
+
+  // encodeTransform encodes a source of message objects.
+  // Transform<ValidatorTransaction_ObservedJwkUpdate_ExportedAggregateSignature, Uint8Array>
+  async *encodeTransform(
+    source:
+      | AsyncIterable<
+        | ValidatorTransaction_ObservedJwkUpdate_ExportedAggregateSignature
+        | ValidatorTransaction_ObservedJwkUpdate_ExportedAggregateSignature[]
+      >
+      | Iterable<
+        | ValidatorTransaction_ObservedJwkUpdate_ExportedAggregateSignature
+        | ValidatorTransaction_ObservedJwkUpdate_ExportedAggregateSignature[]
+      >,
+  ): AsyncIterable<Uint8Array> {
+    for await (const pkt of source) {
+      if (globalThis.Array.isArray(pkt)) {
+        for (const p of (pkt as any)) {
+          yield* [ValidatorTransaction_ObservedJwkUpdate_ExportedAggregateSignature.encode(p).finish()];
+        }
+      } else {
+        yield* [ValidatorTransaction_ObservedJwkUpdate_ExportedAggregateSignature.encode(pkt as any).finish()];
+      }
+    }
+  },
+
+  // decodeTransform decodes a source of encoded messages.
+  // Transform<Uint8Array, ValidatorTransaction_ObservedJwkUpdate_ExportedAggregateSignature>
+  async *decodeTransform(
+    source: AsyncIterable<Uint8Array | Uint8Array[]> | Iterable<Uint8Array | Uint8Array[]>,
+  ): AsyncIterable<ValidatorTransaction_ObservedJwkUpdate_ExportedAggregateSignature> {
+    for await (const pkt of source) {
+      if (globalThis.Array.isArray(pkt)) {
+        for (const p of (pkt as any)) {
+          yield* [ValidatorTransaction_ObservedJwkUpdate_ExportedAggregateSignature.decode(p)];
+        }
+      } else {
+        yield* [ValidatorTransaction_ObservedJwkUpdate_ExportedAggregateSignature.decode(pkt as any)];
+      }
+    }
+  },
+
+  fromJSON(object: any): ValidatorTransaction_ObservedJwkUpdate_ExportedAggregateSignature {
+    return {
+      signerIndices: globalThis.Array.isArray(object?.signerIndices)
+        ? object.signerIndices.map((e: any) => BigInt(e))
+        : [],
+      sig: isSet(object.sig) ? bytesFromBase64(object.sig) : new Uint8Array(0),
+    };
+  },
+
+  toJSON(message: ValidatorTransaction_ObservedJwkUpdate_ExportedAggregateSignature): unknown {
+    const obj: any = {};
+    if (message.signerIndices?.length) {
+      obj.signerIndices = message.signerIndices.map((e) => e.toString());
+    }
+    if (message.sig !== undefined && message.sig.length !== 0) {
+      obj.sig = base64FromBytes(message.sig);
+    }
+    return obj;
+  },
+
+  create(
+    base?: DeepPartial<ValidatorTransaction_ObservedJwkUpdate_ExportedAggregateSignature>,
+  ): ValidatorTransaction_ObservedJwkUpdate_ExportedAggregateSignature {
+    return ValidatorTransaction_ObservedJwkUpdate_ExportedAggregateSignature.fromPartial(base ?? {});
+  },
+  fromPartial(
+    object: DeepPartial<ValidatorTransaction_ObservedJwkUpdate_ExportedAggregateSignature>,
+  ): ValidatorTransaction_ObservedJwkUpdate_ExportedAggregateSignature {
+    const message = createBaseValidatorTransaction_ObservedJwkUpdate_ExportedAggregateSignature();
+    message.signerIndices = object.signerIndices?.map((e) => e) || [];
+    message.sig = object.sig ?? new Uint8Array(0);
+    return message;
+  },
+};
+
+function createBaseValidatorTransaction_ObservedJwkUpdate_QuorumCertifiedUpdate(): ValidatorTransaction_ObservedJwkUpdate_QuorumCertifiedUpdate {
+  return { update: undefined, multiSig: undefined };
+}
+
+export const ValidatorTransaction_ObservedJwkUpdate_QuorumCertifiedUpdate = {
+  encode(
+    message: ValidatorTransaction_ObservedJwkUpdate_QuorumCertifiedUpdate,
+    writer: _m0.Writer = _m0.Writer.create(),
+  ): _m0.Writer {
+    if (message.update !== undefined) {
+      ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs.encode(message.update, writer.uint32(10).fork())
+        .ldelim();
+    }
+    if (message.multiSig !== undefined) {
+      ValidatorTransaction_ObservedJwkUpdate_ExportedAggregateSignature.encode(
+        message.multiSig,
+        writer.uint32(18).fork(),
+      ).ldelim();
+    }
+    return writer;
+  },
+
+  decode(
+    input: _m0.Reader | Uint8Array,
+    length?: number,
+  ): ValidatorTransaction_ObservedJwkUpdate_QuorumCertifiedUpdate {
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseValidatorTransaction_ObservedJwkUpdate_QuorumCertifiedUpdate();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          if (tag !== 10) {
+            break;
+          }
+
+          message.update = ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs.decode(reader, reader.uint32());
+          continue;
+        case 2:
+          if (tag !== 18) {
+            break;
+          }
+
+          message.multiSig = ValidatorTransaction_ObservedJwkUpdate_ExportedAggregateSignature.decode(
+            reader,
+            reader.uint32(),
+          );
+          continue;
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  },
+
+  // encodeTransform encodes a source of message objects.
+  // Transform<ValidatorTransaction_ObservedJwkUpdate_QuorumCertifiedUpdate, Uint8Array>
+  async *encodeTransform(
+    source:
+      | AsyncIterable<
+        | ValidatorTransaction_ObservedJwkUpdate_QuorumCertifiedUpdate
+        | ValidatorTransaction_ObservedJwkUpdate_QuorumCertifiedUpdate[]
+      >
+      | Iterable<
+        | ValidatorTransaction_ObservedJwkUpdate_QuorumCertifiedUpdate
+        | ValidatorTransaction_ObservedJwkUpdate_QuorumCertifiedUpdate[]
+      >,
+  ): AsyncIterable<Uint8Array> {
+    for await (const pkt of source) {
+      if (globalThis.Array.isArray(pkt)) {
+        for (const p of (pkt as any)) {
+          yield* [ValidatorTransaction_ObservedJwkUpdate_QuorumCertifiedUpdate.encode(p).finish()];
+        }
+      } else {
+        yield* [ValidatorTransaction_ObservedJwkUpdate_QuorumCertifiedUpdate.encode(pkt as any).finish()];
+      }
+    }
+  },
+
+  // decodeTransform decodes a source of encoded messages.
+  // Transform<Uint8Array, ValidatorTransaction_ObservedJwkUpdate_QuorumCertifiedUpdate>
+  async *decodeTransform(
+    source: AsyncIterable<Uint8Array | Uint8Array[]> | Iterable<Uint8Array | Uint8Array[]>,
+  ): AsyncIterable<ValidatorTransaction_ObservedJwkUpdate_QuorumCertifiedUpdate> {
+    for await (const pkt of source) {
+      if (globalThis.Array.isArray(pkt)) {
+        for (const p of (pkt as any)) {
+          yield* [ValidatorTransaction_ObservedJwkUpdate_QuorumCertifiedUpdate.decode(p)];
+        }
+      } else {
+        yield* [ValidatorTransaction_ObservedJwkUpdate_QuorumCertifiedUpdate.decode(pkt as any)];
+      }
+    }
+  },
+
+  fromJSON(object: any): ValidatorTransaction_ObservedJwkUpdate_QuorumCertifiedUpdate {
+    return {
+      update: isSet(object.update)
+        ? ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs.fromJSON(object.update)
+        : undefined,
+      multiSig: isSet(object.multiSig)
+        ? ValidatorTransaction_ObservedJwkUpdate_ExportedAggregateSignature.fromJSON(object.multiSig)
+        : undefined,
+    };
+  },
+
+  toJSON(message: ValidatorTransaction_ObservedJwkUpdate_QuorumCertifiedUpdate): unknown {
+    const obj: any = {};
+    if (message.update !== undefined) {
+      obj.update = ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs.toJSON(message.update);
+    }
+    if (message.multiSig !== undefined) {
+      obj.multiSig = ValidatorTransaction_ObservedJwkUpdate_ExportedAggregateSignature.toJSON(message.multiSig);
+    }
+    return obj;
+  },
+
+  create(
+    base?: DeepPartial<ValidatorTransaction_ObservedJwkUpdate_QuorumCertifiedUpdate>,
+  ): ValidatorTransaction_ObservedJwkUpdate_QuorumCertifiedUpdate {
+    return ValidatorTransaction_ObservedJwkUpdate_QuorumCertifiedUpdate.fromPartial(base ?? {});
+  },
+  fromPartial(
+    object: DeepPartial<ValidatorTransaction_ObservedJwkUpdate_QuorumCertifiedUpdate>,
+  ): ValidatorTransaction_ObservedJwkUpdate_QuorumCertifiedUpdate {
+    const message = createBaseValidatorTransaction_ObservedJwkUpdate_QuorumCertifiedUpdate();
+    message.update = (object.update !== undefined && object.update !== null)
+      ? ValidatorTransaction_ObservedJwkUpdate_ExportedProviderJWKs.fromPartial(object.update)
+      : undefined;
+    message.multiSig = (object.multiSig !== undefined && object.multiSig !== null)
+      ? ValidatorTransaction_ObservedJwkUpdate_ExportedAggregateSignature.fromPartial(object.multiSig)
+      : undefined;
+    return message;
+  },
+};
+
+function createBaseValidatorTransaction_DkgUpdate(): ValidatorTransaction_DkgUpdate {
+  return { dkgTranscript: undefined };
+}
+
+export const ValidatorTransaction_DkgUpdate = {
+  encode(message: ValidatorTransaction_DkgUpdate, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    if (message.dkgTranscript !== undefined) {
+      ValidatorTransaction_DkgUpdate_DkgTranscript.encode(message.dkgTranscript, writer.uint32(10).fork()).ldelim();
+    }
+    return writer;
+  },
+
+  decode(input: _m0.Reader | Uint8Array, length?: number): ValidatorTransaction_DkgUpdate {
     const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
     let end = length === undefined ? reader.len : reader.pos + length;
-    const message = createBaseBlockMetadataTransaction();
+    const message = createBaseValidatorTransaction_DkgUpdate();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -1597,53 +3156,8 @@ export const BlockMetadataTransaction = {
             break;
           }
 
-          message.id = reader.string();
-          continue;
-        case 2:
-          if (tag !== 16) {
-            break;
-          }
-
-          message.round = longToBigint(reader.uint64() as Long);
-          continue;
-        case 3:
-          if (tag !== 26) {
-            break;
-          }
-
-          message.events!.push(Event.decode(reader, reader.uint32()));
-          continue;
-        case 4:
-          if (tag !== 34) {
-            break;
-          }
-
-          message.previousBlockVotesBitvec = reader.bytes();
-          continue;
-        case 5:
-          if (tag !== 42) {
-            break;
-          }
-
-          message.proposer = reader.string();
+          message.dkgTranscript = ValidatorTransaction_DkgUpdate_DkgTranscript.decode(reader, reader.uint32());
           continue;
-        case 6:
-          if (tag === 48) {
-            message.failedProposerIndices!.push(reader.uint32());
-
-            continue;
-          }
-
-          if (tag === 50) {
-            const end2 = reader.uint32() + reader.pos;
-            while (reader.pos < end2) {
-              message.failedProposerIndices!.push(reader.uint32());
-            }
-
-            continue;
-          }
-
-          break;
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -1654,129 +3168,115 @@ export const BlockMetadataTransaction = {
   },
 
   // encodeTransform encodes a source of message objects.
-  // Transform<BlockMetadataTransaction, Uint8Array>
+  // Transform<ValidatorTransaction_DkgUpdate, Uint8Array>
   async *encodeTransform(
     source:
-      | AsyncIterable<BlockMetadataTransaction | BlockMetadataTransaction[]>
-      | Iterable<BlockMetadataTransaction | BlockMetadataTransaction[]>,
+      | AsyncIterable<ValidatorTransaction_DkgUpdate | ValidatorTransaction_DkgUpdate[]>
+      | Iterable<ValidatorTransaction_DkgUpdate | ValidatorTransaction_DkgUpdate[]>,
   ): AsyncIterable<Uint8Array> {
     for await (const pkt of source) {
       if (globalThis.Array.isArray(pkt)) {
         for (const p of (pkt as any)) {
-          yield* [BlockMetadataTransaction.encode(p).finish()];
+          yield* [ValidatorTransaction_DkgUpdate.encode(p).finish()];
         }
       } else {
-        yield* [BlockMetadataTransaction.encode(pkt as any).finish()];
+        yield* [ValidatorTransaction_DkgUpdate.encode(pkt as any).finish()];
       }
     }
   },
 
   // decodeTransform decodes a source of encoded messages.
-  // Transform<Uint8Array, BlockMetadataTransaction>
+  // Transform<Uint8Array, ValidatorTransaction_DkgUpdate>
   async *decodeTransform(
     source: AsyncIterable<Uint8Array | Uint8Array[]> | Iterable<Uint8Array | Uint8Array[]>,
-  ): AsyncIterable<BlockMetadataTransaction> {
+  ): AsyncIterable<ValidatorTransaction_DkgUpdate> {
     for await (const pkt of source) {
       if (globalThis.Array.isArray(pkt)) {
         for (const p of (pkt as any)) {
-          yield* [BlockMetadataTransaction.decode(p)];
+          yield* [ValidatorTransaction_DkgUpdate.decode(p)];
         }
       } else {
-        yield* [BlockMetadataTransaction.decode(pkt as any)];
+        yield* [ValidatorTransaction_DkgUpdate.decode(pkt as any)];
       }
     }
   },
 
-  fromJSON(object: any): BlockMetadataTransaction {
+  fromJSON(object: any): ValidatorTransaction_DkgUpdate {
     return {
-      id: isSet(object.id) ? globalThis.String(object.id) : "",
-      round: isSet(object.round) ? BigInt(object.round) : BigInt("0"),
-      events: globalThis.Array.isArray(object?.events) ? object.events.map((e: any) => Event.fromJSON(e)) : [],
-      previousBlockVotesBitvec: isSet(object.previousBlockVotesBitvec)
-        ? bytesFromBase64(object.previousBlockVotesBitvec)
-        : new Uint8Array(0),
-      proposer: isSet(object.proposer) ? globalThis.String(object.proposer) : "",
-      failedProposerIndices: globalThis.Array.isArray(object?.failedProposerIndices)
-        ? object.failedProposerIndices.map((e: any) => globalThis.Number(e))
-        : [],
+      dkgTranscript: isSet(object.dkgTranscript)
+        ? ValidatorTransaction_DkgUpdate_DkgTranscript.fromJSON(object.dkgTranscript)
+        : undefined,
     };
   },
 
-  toJSON(message: BlockMetadataTransaction): unknown {
+  toJSON(message: ValidatorTransaction_DkgUpdate): unknown {
     const obj: any = {};
-    if (message.id !== undefined && message.id !== "") {
-      obj.id = message.id;
-    }
-    if (message.round !== undefined && message.round !== BigInt("0")) {
-      obj.round = message.round.toString();
-    }
-    if (message.events?.length) {
-      obj.events = message.events.map((e) => Event.toJSON(e));
-    }
-    if (message.previousBlockVotesBitvec !== undefined && message.previousBlockVotesBitvec.length !== 0) {
-      obj.previousBlockVotesBitvec = base64FromBytes(message.previousBlockVotesBitvec);
-    }
-    if (message.proposer !== undefined && message.proposer !== "") {
-      obj.proposer = message.proposer;
-    }
-    if (message.failedProposerIndices?.length) {
-      obj.failedProposerIndices = message.failedProposerIndices.map((e) => Math.round(e));
+    if (message.dkgTranscript !== undefined) {
+      obj.dkgTranscript = ValidatorTransaction_DkgUpdate_DkgTranscript.toJSON(message.dkgTranscript);
     }
     return obj;
   },
 
-  create(base?: DeepPartial<BlockMetadataTransaction>): BlockMetadataTransaction {
-    return BlockMetadataTransaction.fromPartial(base ?? {});
+  create(base?: DeepPartial<ValidatorTransaction_DkgUpdate>): ValidatorTransaction_DkgUpdate {
+    return ValidatorTransaction_DkgUpdate.fromPartial(base ?? {});
   },
-  fromPartial(object: DeepPartial<BlockMetadataTransaction>): BlockMetadataTransaction {
-    const message = createBaseBlockMetadataTransaction();
-    message.id = object.id ?? "";
-    message.round = object.round ?? BigInt("0");
-    message.events = object.events?.map((e) => Event.fromPartial(e)) || [];
-    message.previousBlockVotesBitvec = object.previousBlockVotesBitvec ?? new Uint8Array(0);
-    message.proposer = object.proposer ?? "";
-    message.failedProposerIndices = object.failedProposerIndices?.map((e) => e) || [];
+  fromPartial(object: DeepPartial<ValidatorTransaction_DkgUpdate>): ValidatorTransaction_DkgUpdate {
+    const message = createBaseValidatorTransaction_DkgUpdate();
+    message.dkgTranscript = (object.dkgTranscript !== undefined && object.dkgTranscript !== null)
+      ? ValidatorTransaction_DkgUpdate_DkgTranscript.fromPartial(object.dkgTranscript)
+      : undefined;
     return message;
   },
 };
 
-function createBaseGenesisTransaction(): GenesisTransaction {
-  return { payload: undefined, events: [] };
+function createBaseValidatorTransaction_DkgUpdate_DkgTranscript(): ValidatorTransaction_DkgUpdate_DkgTranscript {
+  return { epoch: BigInt("0"), author: "", payload: new Uint8Array(0) };
 }
 
-export const GenesisTransaction = {
-  encode(message: GenesisTransaction, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
-    if (message.payload !== undefined) {
-      WriteSet.encode(message.payload, writer.uint32(10).fork()).ldelim();
-    }
-    if (message.events !== undefined && message.events.length !== 0) {
-      for (const v of message.events) {
-        Event.encode(v!, writer.uint32(18).fork()).ldelim();
+export const ValidatorTransaction_DkgUpdate_DkgTranscript = {
+  encode(message: ValidatorTransaction_DkgUpdate_DkgTranscript, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    if (message.epoch !== undefined && message.epoch !== BigInt("0")) {
+      if (BigInt.asUintN(64, message.epoch) !== message.epoch) {
+        throw new globalThis.Error("value provided for field message.epoch of type uint64 too large");
       }
+      writer.uint32(8).uint64(message.epoch.toString());
+    }
+    if (message.author !== undefined && message.author !== "") {
+      writer.uint32(18).string(message.author);
+    }
+    if (message.payload !== undefined && message.payload.length !== 0) {
+      writer.uint32(26).bytes(message.payload);
     }
     return writer;
   },
 
-  decode(input: _m0.Reader | Uint8Array, length?: number): GenesisTransaction {
+  decode(input: _m0.Reader | Uint8Array, length?: number): ValidatorTransaction_DkgUpdate_DkgTranscript {
     const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
     let end = length === undefined ? reader.len : reader.pos + length;
-    const message = createBaseGenesisTransaction();
+    const message = createBaseValidatorTransaction_DkgUpdate_DkgTranscript();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
         case 1:
-          if (tag !== 10) {
+          if (tag !== 8) {
             break;
           }
 
-          message.payload = WriteSet.decode(reader, reader.uint32());
+          message.epoch = longToBigint(reader.uint64() as Long);
           continue;
         case 2:
           if (tag !== 18) {
             break;
           }
 
-          message.events!.push(Event.decode(reader, reader.uint32()));
+          message.author = reader.string();
+          continue;
+        case 3:
+          if (tag !== 26) {
+            break;
+          }
+
+          message.payload = reader.bytes();
           continue;
       }
       if ((tag & 7) === 4 || tag === 0) {
@@ -1788,86 +3288,103 @@ export const GenesisTransaction = {
   },
 
   // encodeTransform encodes a source of message objects.
-  // Transform<GenesisTransaction, Uint8Array>
+  // Transform<ValidatorTransaction_DkgUpdate_DkgTranscript, Uint8Array>
   async *encodeTransform(
     source:
-      | AsyncIterable<GenesisTransaction | GenesisTransaction[]>
-      | Iterable<GenesisTransaction | GenesisTransaction[]>,
+      | AsyncIterable<ValidatorTransaction_DkgUpdate_DkgTranscript | ValidatorTransaction_DkgUpdate_DkgTranscript[]>
+      | Iterable<ValidatorTransaction_DkgUpdate_DkgTranscript | ValidatorTransaction_DkgUpdate_DkgTranscript[]>,
   ): AsyncIterable<Uint8Array> {
     for await (const pkt of source) {
       if (globalThis.Array.isArray(pkt)) {
         for (const p of (pkt as any)) {
-          yield* [GenesisTransaction.encode(p).finish()];
+          yield* [ValidatorTransaction_DkgUpdate_DkgTranscript.encode(p).finish()];
         }
       } else {
-        yield* [GenesisTransaction.encode(pkt as any).finish()];
+        yield* [ValidatorTransaction_DkgUpdate_DkgTranscript.encode(pkt as any).finish()];
       }
     }
   },
 
   // decodeTransform decodes a source of encoded messages.
-  // Transform<Uint8Array, GenesisTransaction>
+  // Transform<Uint8Array, ValidatorTransaction_DkgUpdate_DkgTranscript>
   async *decodeTransform(
     source: AsyncIterable<Uint8Array | Uint8Array[]> | Iterable<Uint8Array | Uint8Array[]>,
-  ): AsyncIterable<GenesisTransaction> {
+  ): AsyncIterable<ValidatorTransaction_DkgUpdate_DkgTranscript> {
     for await (const pkt of source) {
       if (globalThis.Array.isArray(pkt)) {
         for (const p of (pkt as any)) {
-          yield* [GenesisTransaction.decode(p)];
+          yield* [ValidatorTransaction_DkgUpdate_DkgTranscript.decode(p)];
         }
       } else {
-        yield* [GenesisTransaction.decode(pkt as any)];
+        yield* [ValidatorTransaction_DkgUpdate_DkgTranscript.decode(pkt as any)];
       }
     }
   },
 
-  fromJSON(object: any): GenesisTransaction {
+  fromJSON(object: any): ValidatorTransaction_DkgUpdate_DkgTranscript {
     return {
-      payload: isSet(object.payload) ? WriteSet.fromJSON(object.payload) : undefined,
-      events: globalThis.Array.isArray(object?.events) ? object.events.map((e: any) => Event.fromJSON(e)) : [],
+      epoch: isSet(object.epoch) ? BigInt(object.epoch) : BigInt("0"),
+      author: isSet(object.author) ? globalThis.String(object.author) : "",
+      payload: isSet(object.payload) ? bytesFromBase64(object.payload) : new Uint8Array(0),
     };
   },
 
-  toJSON(message: GenesisTransaction): unknown {
+  toJSON(message: ValidatorTransaction_DkgUpdate_DkgTranscript): unknown {
     const obj: any = {};
-    if (message.payload !== undefined) {
-      obj.payload = WriteSet.toJSON(message.payload);
+    if (message.epoch !== undefined && message.epoch !== BigInt("0")) {
+      obj.epoch = message.epoch.toString();
     }
-    if (message.events?.length) {
-      obj.events = message.events.map((e) => Event.toJSON(e));
+    if (message.author !== undefined && message.author !== "") {
+      obj.author = message.author;
+    }
+    if (message.payload !== undefined && message.payload.length !== 0) {
+      obj.payload = base64FromBytes(message.payload);
     }
     return obj;
   },
 
-  create(base?: DeepPartial<GenesisTransaction>): GenesisTransaction {
-    return GenesisTransaction.fromPartial(base ?? {});
+  create(
+    base?: DeepPartial<ValidatorTransaction_DkgUpdate_DkgTranscript>,
+  ): ValidatorTransaction_DkgUpdate_DkgTranscript {
+    return ValidatorTransaction_DkgUpdate_DkgTranscript.fromPartial(base ?? {});
   },
-  fromPartial(object: DeepPartial<GenesisTransaction>): GenesisTransaction {
-    const message = createBaseGenesisTransaction();
-    message.payload = (object.payload !== undefined && object.payload !== null)
-      ? WriteSet.fromPartial(object.payload)
-      : undefined;
-    message.events = object.events?.map((e) => Event.fromPartial(e)) || [];
+  fromPartial(
+    object: DeepPartial<ValidatorTransaction_DkgUpdate_DkgTranscript>,
+  ): ValidatorTransaction_DkgUpdate_DkgTranscript {
+    const message = createBaseValidatorTransaction_DkgUpdate_DkgTranscript();
+    message.epoch = object.epoch ?? BigInt("0");
+    message.author = object.author ?? "";
+    message.payload = object.payload ?? new Uint8Array(0);
     return message;
   },
 };
 
-function createBaseStateCheckpointTransaction(): StateCheckpointTransaction {
-  return {};
+function createBaseBlockEpilogueTransaction(): BlockEpilogueTransaction {
+  return { blockEndInfo: undefined };
 }
 
-export const StateCheckpointTransaction = {
-  encode(_: StateCheckpointTransaction, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+export const BlockEpilogueTransaction = {
+  encode(message: BlockEpilogueTransaction, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    if (message.blockEndInfo !== undefined) {
+      BlockEndInfo.encode(message.blockEndInfo, writer.uint32(10).fork()).ldelim();
+    }
     return writer;
   },
 
-  decode(input: _m0.Reader | Uint8Array, length?: number): StateCheckpointTransaction {
+  decode(input: _m0.Reader | Uint8Array, length?: number): BlockEpilogueTransaction {
     const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
     let end = length === undefined ? reader.len : reader.pos + length;
-    const message = createBaseStateCheckpointTransaction();
+    const message = createBaseBlockEpilogueTransaction();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
+        case 1:
+          if (tag !== 10) {
+            break;
+          }
+
+          message.blockEndInfo = BlockEndInfo.decode(reader, reader.uint32());
+          continue;
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -1878,73 +3395,132 @@ export const StateCheckpointTransaction = {
   },
 
   // encodeTransform encodes a source of message objects.
-  // Transform<StateCheckpointTransaction, Uint8Array>
+  // Transform<BlockEpilogueTransaction, Uint8Array>
   async *encodeTransform(
     source:
-      | AsyncIterable<StateCheckpointTransaction | StateCheckpointTransaction[]>
-      | Iterable<StateCheckpointTransaction | StateCheckpointTransaction[]>,
+      | AsyncIterable<BlockEpilogueTransaction | BlockEpilogueTransaction[]>
+      | Iterable<BlockEpilogueTransaction | BlockEpilogueTransaction[]>,
   ): AsyncIterable<Uint8Array> {
     for await (const pkt of source) {
       if (globalThis.Array.isArray(pkt)) {
         for (const p of (pkt as any)) {
-          yield* [StateCheckpointTransaction.encode(p).finish()];
+          yield* [BlockEpilogueTransaction.encode(p).finish()];
         }
       } else {
-        yield* [StateCheckpointTransaction.encode(pkt as any).finish()];
+        yield* [BlockEpilogueTransaction.encode(pkt as any).finish()];
       }
     }
   },
 
   // decodeTransform decodes a source of encoded messages.
-  // Transform<Uint8Array, StateCheckpointTransaction>
+  // Transform<Uint8Array, BlockEpilogueTransaction>
   async *decodeTransform(
     source: AsyncIterable<Uint8Array | Uint8Array[]> | Iterable<Uint8Array | Uint8Array[]>,
-  ): AsyncIterable<StateCheckpointTransaction> {
+  ): AsyncIterable<BlockEpilogueTransaction> {
     for await (const pkt of source) {
       if (globalThis.Array.isArray(pkt)) {
         for (const p of (pkt as any)) {
-          yield* [StateCheckpointTransaction.decode(p)];
+          yield* [BlockEpilogueTransaction.decode(p)];
         }
       } else {
-        yield* [StateCheckpointTransaction.decode(pkt as any)];
+        yield* [BlockEpilogueTransaction.decode(pkt as any)];
       }
     }
   },
 
-  fromJSON(_: any): StateCheckpointTransaction {
-    return {};
+  fromJSON(object: any): BlockEpilogueTransaction {
+    return { blockEndInfo: isSet(object.blockEndInfo) ? BlockEndInfo.fromJSON(object.blockEndInfo) : undefined };
   },
 
-  toJSON(_: StateCheckpointTransaction): unknown {
+  toJSON(message: BlockEpilogueTransaction): unknown {
     const obj: any = {};
+    if (message.blockEndInfo !== undefined) {
+      obj.blockEndInfo = BlockEndInfo.toJSON(message.blockEndInfo);
+    }
     return obj;
   },
 
-  create(base?: DeepPartial<StateCheckpointTransaction>): StateCheckpointTransaction {
-    return StateCheckpointTransaction.fromPartial(base ?? {});
+  create(base?: DeepPartial<BlockEpilogueTransaction>): BlockEpilogueTransaction {
+    return BlockEpilogueTransaction.fromPartial(base ?? {});
   },
-  fromPartial(_: DeepPartial<StateCheckpointTransaction>): StateCheckpointTransaction {
-    const message = createBaseStateCheckpointTransaction();
+  fromPartial(object: DeepPartial<BlockEpilogueTransaction>): BlockEpilogueTransaction {
+    const message = createBaseBlockEpilogueTransaction();
+    message.blockEndInfo = (object.blockEndInfo !== undefined && object.blockEndInfo !== null)
+      ? BlockEndInfo.fromPartial(object.blockEndInfo)
+      : undefined;
     return message;
   },
 };
 
-function createBaseValidatorTransaction(): ValidatorTransaction {
-  return {};
+function createBaseBlockEndInfo(): BlockEndInfo {
+  return {
+    blockGasLimitReached: false,
+    blockOutputLimitReached: false,
+    blockEffectiveBlockGasUnits: BigInt("0"),
+    blockApproxOutputSize: BigInt("0"),
+  };
 }
 
-export const ValidatorTransaction = {
-  encode(_: ValidatorTransaction, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+export const BlockEndInfo = {
+  encode(message: BlockEndInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    if (message.blockGasLimitReached === true) {
+      writer.uint32(8).bool(message.blockGasLimitReached);
+    }
+    if (message.blockOutputLimitReached === true) {
+      writer.uint32(16).bool(message.blockOutputLimitReached);
+    }
+    if (message.blockEffectiveBlockGasUnits !== undefined && message.blockEffectiveBlockGasUnits !== BigInt("0")) {
+      if (BigInt.asUintN(64, message.blockEffectiveBlockGasUnits) !== message.blockEffectiveBlockGasUnits) {
+        throw new globalThis.Error(
+          "value provided for field message.blockEffectiveBlockGasUnits of type uint64 too large",
+        );
+      }
+      writer.uint32(24).uint64(message.blockEffectiveBlockGasUnits.toString());
+    }
+    if (message.blockApproxOutputSize !== undefined && message.blockApproxOutputSize !== BigInt("0")) {
+      if (BigInt.asUintN(64, message.blockApproxOutputSize) !== message.blockApproxOutputSize) {
+        throw new globalThis.Error("value provided for field message.blockApproxOutputSize of type uint64 too large");
+      }
+      writer.uint32(32).uint64(message.blockApproxOutputSize.toString());
+    }
     return writer;
   },
 
-  decode(input: _m0.Reader | Uint8Array, length?: number): ValidatorTransaction {
+  decode(input: _m0.Reader | Uint8Array, length?: number): BlockEndInfo {
     const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
     let end = length === undefined ? reader.len : reader.pos + length;
-    const message = createBaseValidatorTransaction();
+    const message = createBaseBlockEndInfo();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
+        case 1:
+          if (tag !== 8) {
+            break;
+          }
+
+          message.blockGasLimitReached = reader.bool();
+          continue;
+        case 2:
+          if (tag !== 16) {
+            break;
+          }
+
+          message.blockOutputLimitReached = reader.bool();
+          continue;
+        case 3:
+          if (tag !== 24) {
+            break;
+          }
+
+          message.blockEffectiveBlockGasUnits = longToBigint(reader.uint64() as Long);
+          continue;
+        case 4:
+          if (tag !== 32) {
+            break;
+          }
+
+          message.blockApproxOutputSize = longToBigint(reader.uint64() as Long);
+          continue;
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -1955,53 +3531,78 @@ export const ValidatorTransaction = {
   },
 
   // encodeTransform encodes a source of message objects.
-  // Transform<ValidatorTransaction, Uint8Array>
+  // Transform<BlockEndInfo, Uint8Array>
   async *encodeTransform(
-    source:
-      | AsyncIterable<ValidatorTransaction | ValidatorTransaction[]>
-      | Iterable<ValidatorTransaction | ValidatorTransaction[]>,
+    source: AsyncIterable<BlockEndInfo | BlockEndInfo[]> | Iterable<BlockEndInfo | BlockEndInfo[]>,
   ): AsyncIterable<Uint8Array> {
     for await (const pkt of source) {
       if (globalThis.Array.isArray(pkt)) {
         for (const p of (pkt as any)) {
-          yield* [ValidatorTransaction.encode(p).finish()];
+          yield* [BlockEndInfo.encode(p).finish()];
         }
       } else {
-        yield* [ValidatorTransaction.encode(pkt as any).finish()];
+        yield* [BlockEndInfo.encode(pkt as any).finish()];
       }
     }
   },
 
   // decodeTransform decodes a source of encoded messages.
-  // Transform<Uint8Array, ValidatorTransaction>
+  // Transform<Uint8Array, BlockEndInfo>
   async *decodeTransform(
     source: AsyncIterable<Uint8Array | Uint8Array[]> | Iterable<Uint8Array | Uint8Array[]>,
-  ): AsyncIterable<ValidatorTransaction> {
+  ): AsyncIterable<BlockEndInfo> {
     for await (const pkt of source) {
       if (globalThis.Array.isArray(pkt)) {
         for (const p of (pkt as any)) {
-          yield* [ValidatorTransaction.decode(p)];
+          yield* [BlockEndInfo.decode(p)];
         }
       } else {
-        yield* [ValidatorTransaction.decode(pkt as any)];
+        yield* [BlockEndInfo.decode(pkt as any)];
       }
     }
   },
 
-  fromJSON(_: any): ValidatorTransaction {
-    return {};
+  fromJSON(object: any): BlockEndInfo {
+    return {
+      blockGasLimitReached: isSet(object.blockGasLimitReached)
+        ? globalThis.Boolean(object.blockGasLimitReached)
+        : false,
+      blockOutputLimitReached: isSet(object.blockOutputLimitReached)
+        ? globalThis.Boolean(object.blockOutputLimitReached)
+        : false,
+      blockEffectiveBlockGasUnits: isSet(object.blockEffectiveBlockGasUnits)
+        ? BigInt(object.blockEffectiveBlockGasUnits)
+        : BigInt("0"),
+      blockApproxOutputSize: isSet(object.blockApproxOutputSize) ? BigInt(object.blockApproxOutputSize) : BigInt("0"),
+    };
   },
 
-  toJSON(_: ValidatorTransaction): unknown {
+  toJSON(message: BlockEndInfo): unknown {
     const obj: any = {};
+    if (message.blockGasLimitReached === true) {
+      obj.blockGasLimitReached = message.blockGasLimitReached;
+    }
+    if (message.blockOutputLimitReached === true) {
+      obj.blockOutputLimitReached = message.blockOutputLimitReached;
+    }
+    if (message.blockEffectiveBlockGasUnits !== undefined && message.blockEffectiveBlockGasUnits !== BigInt("0")) {
+      obj.blockEffectiveBlockGasUnits = message.blockEffectiveBlockGasUnits.toString();
+    }
+    if (message.blockApproxOutputSize !== undefined && message.blockApproxOutputSize !== BigInt("0")) {
+      obj.blockApproxOutputSize = message.blockApproxOutputSize.toString();
+    }
     return obj;
   },
 
-  create(base?: DeepPartial<ValidatorTransaction>): ValidatorTransaction {
-    return ValidatorTransaction.fromPartial(base ?? {});
+  create(base?: DeepPartial<BlockEndInfo>): BlockEndInfo {
+    return BlockEndInfo.fromPartial(base ?? {});
   },
-  fromPartial(_: DeepPartial<ValidatorTransaction>): ValidatorTransaction {
-    const message = createBaseValidatorTransaction();
+  fromPartial(object: DeepPartial<BlockEndInfo>): BlockEndInfo {
+    const message = createBaseBlockEndInfo();
+    message.blockGasLimitReached = object.blockGasLimitReached ?? false;
+    message.blockOutputLimitReached = object.blockOutputLimitReached ?? false;
+    message.blockEffectiveBlockGasUnits = object.blockEffectiveBlockGasUnits ?? BigInt("0");
+    message.blockApproxOutputSize = object.blockApproxOutputSize ?? BigInt("0");
     return message;
   },
 };
@@ -5641,7 +7242,7 @@ export const MoveFunction = {
 };
 
 function createBaseMoveStruct(): MoveStruct {
-  return { name: "", isNative: false, abilities: [], genericTypeParams: [], fields: [] };
+  return { name: "", isNative: false, isEvent: false, abilities: [], genericTypeParams: [], fields: [] };
 }
 
 export const MoveStruct = {
@@ -5652,6 +7253,9 @@ export const MoveStruct = {
     if (message.isNative === true) {
       writer.uint32(16).bool(message.isNative);
     }
+    if (message.isEvent === true) {
+      writer.uint32(48).bool(message.isEvent);
+    }
     if (message.abilities !== undefined && message.abilities.length !== 0) {
       writer.uint32(26).fork();
       for (const v of message.abilities) {
@@ -5693,6 +7297,13 @@ export const MoveStruct = {
 
           message.isNative = reader.bool();
           continue;
+        case 6:
+          if (tag !== 48) {
+            break;
+          }
+
+          message.isEvent = reader.bool();
+          continue;
         case 3:
           if (tag === 24) {
             message.abilities!.push(reader.int32() as any);
@@ -5769,6 +7380,7 @@ export const MoveStruct = {
     return {
       name: isSet(object.name) ? globalThis.String(object.name) : "",
       isNative: isSet(object.isNative) ? globalThis.Boolean(object.isNative) : false,
+      isEvent: isSet(object.isEvent) ? globalThis.Boolean(object.isEvent) : false,
       abilities: globalThis.Array.isArray(object?.abilities)
         ? object.abilities.map((e: any) => moveAbilityFromJSON(e))
         : [],
@@ -5789,6 +7401,9 @@ export const MoveStruct = {
     if (message.isNative === true) {
       obj.isNative = message.isNative;
     }
+    if (message.isEvent === true) {
+      obj.isEvent = message.isEvent;
+    }
     if (message.abilities?.length) {
       obj.abilities = message.abilities.map((e) => moveAbilityToJSON(e));
     }
@@ -5808,6 +7423,7 @@ export const MoveStruct = {
     const message = createBaseMoveStruct();
     message.name = object.name ?? "";
     message.isNative = object.isNative ?? false;
+    message.isEvent = object.isEvent ?? false;
     message.abilities = object.abilities?.map((e) => e) || [];
     message.genericTypeParams = object.genericTypeParams?.map((e) => MoveStructGenericTypeParam.fromPartial(e)) || [];
     message.fields = object.fields?.map((e) => MoveStructField.fromPartial(e)) || [];
diff --git a/protos/typescript/src/index.aptos.ts b/protos/typescript/src/index.aptos.ts
index b847dd590ac5e..6c47394fa6b39 100644
--- a/protos/typescript/src/index.aptos.ts
+++ b/protos/typescript/src/index.aptos.ts
@@ -1,6 +1,5 @@
 /* eslint-disable */
 
-export * as bigquery_schema from "./index.aptos.bigquery_schema";
 export * as util from "./index.aptos.util";
 export * as transaction from "./index.aptos.transaction";
 export * as indexer from "./index.aptos.indexer";
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 0b13a21a22d01..30329882ad821 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,6 +1,6 @@
 [toolchain]
-channel = "1.75.0"
+channel = "1.78.0"
 
 # Note: we don't specify cargofmt in our toolchain because we rely on
 # the nightly version of cargofmt and verify formatting in CI/CD.
-components = [ "cargo", "clippy", "rustc", "rust-docs", "rust-std" ]
+components = ["cargo", "clippy", "rustc", "rust-docs", "rust-std"]
diff --git a/scripts/dev_setup.sh b/scripts/dev_setup.sh
index acb9a61a8d230..d6a64ac447859 100755
--- a/scripts/dev_setup.sh
+++ b/scripts/dev_setup.sh
@@ -16,6 +16,7 @@
 # fast fail.
 set -eo pipefail
 
+NODE_MAJOR_VERSION=20
 SHELLCHECK_VERSION=0.7.1
 GRCOV_VERSION=0.8.2
 KUBECTL_VERSION=1.18.6
@@ -542,7 +543,7 @@ function install_dotnet {
     # Below we need to (a) set TERM variable because the .net installer expects it and it is not set
     # in some environments (b) use bash not sh because the installer uses bash features.
     # NOTE: use wget to better follow the redirect
-    wget https://dot.net/v1/dotnet-install.sh -O dotnet-install.sh
+    wget --tries 10 --retry-connrefused --waitretry=5 https://dot.net/v1/dotnet-install.sh -O dotnet-install.sh
     chmod +x dotnet-install.sh
     ./dotnet-install.sh --channel $DOTNET_VERSION --install-dir "${DOTNET_INSTALL_DIR}" --version latest
     rm dotnet-install.sh
@@ -655,9 +656,8 @@ function install_xsltproc {
 
 function install_nodejs {
   if [[ "$PACKAGE_MANAGER" == "apt-get" ]]; then
-    # install via nodesource: https://github.com/nodesource/distributions/issues/1709#issuecomment-1788473588
-    NODE_MAJOR=18
-    echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | "${PRE_COMMAND[@]}" tee /etc/apt/sources.list.d/nodesource.list
+    curl -fsSL "https://deb.nodesource.com/setup_${NODE_MAJOR_VERSION}.x" -o nodesource_setup.sh
+    "${PRE_COMMAND[@]}" -E bash nodesource_setup.sh
   fi
   install_pkg nodejs "$PACKAGE_MANAGER"
   install_pkg npm "$PACKAGE_MANAGER"
@@ -1099,11 +1099,12 @@ if [[ "$INSTALL_JSTS" == "true" ]]; then
   install_solidity
 fi
 
+install_libudev-dev
+
 install_python3
 if [[ "$SKIP_PRE_COMMIT" == "false" ]]; then
   if [[ "$PACKAGE_MANAGER" != "pacman" ]]; then
     pip3 install pre-commit
-    install_libudev-dev
   else
     install_pkg python-pre-commit "$PACKAGE_MANAGER"
   fi
diff --git a/scripts/update_docker_images.py b/scripts/update_docker_images.py
index f85afdc825817..035e9ae2cc869 100755
--- a/scripts/update_docker_images.py
+++ b/scripts/update_docker_images.py
@@ -10,7 +10,7 @@
 
 IMAGES = {
     "debian": "debian:bullseye",
-    "rust": "rust:1.75.0-bullseye",
+    "rust": "rust:1.78.0-bullseye",
 }
 
 
diff --git a/scripts/windows_dev_setup.ps1 b/scripts/windows_dev_setup.ps1
index 640b3db74c142..8045800cb8b3f 100644
--- a/scripts/windows_dev_setup.ps1
+++ b/scripts/windows_dev_setup.ps1
@@ -7,6 +7,8 @@ param (
 
 $ErrorActionPreference = 'Stop'
 
+Set-PSDebug -Trace 1
+
 Set-Location (Split-Path -Parent $MyInvocation.MyCommand.Path) | Out-Null; Set-Location '..' -ErrorAction Stop
 
 $global:user_selection = $null
@@ -76,7 +78,7 @@ function update_versions {
     $url = "https://raw.githubusercontent.com/aptos-labs/aptos-core/main/scripts/dev_setup.sh"
 
     # Retrieve the content of the file and store it in a variable
-    $content = (Invoke-WebRequest -Uri $url -UseBasicParsing | Select-Object -ExpandProperty Content -First 50) -join "`n"
+    $content = (Invoke-WebRequest -UseBasicParsing -Uri $url | Select-Object -ExpandProperty Content -First 50) -join "`n"
 
     $packages = @($global:grcov_version, $global:protoc_version, $global:dotnet_version, $global:z3_version, $global:boogie_version)
 
@@ -149,7 +151,7 @@ function check_os {
 }
 
 function install_winget {
-  $xaml_url = "https://www.nuget.org/api/v2/package/Microsoft.UI.Xaml/2.8.6"
+  $xaml_url = "https://globalcdn.nuget.org/packages/microsoft.ui.xaml.2.8.6.nupkg"
   $xaml_downloadpath = "Microsoft.UI.Xaml.2.8.6.nupkg.zip"
   $xaml_filepath = "Microsoft.UI.Xaml.2.8.6.nupkg\tools\AppX\x64\Release\Microsoft.UI.Xaml.2.8.appx"
 
@@ -163,18 +165,18 @@ function install_winget {
   $license_downloadpath = "license.xml"
 
   # Download and extract XAML (dependency)
-  Invoke-WebRequest -Uri $xaml_url -OutFile $xaml_downloadpath -ErrorAction SilentlyContinue
+  Safe-Download-File $xaml_url -Destination $xaml_downloadpath
   Expand-Archive $xaml_downloadpath -ErrorAction SilentlyContinue
 
   # Download and install VCLibs and XAML (dependencies)
-  Invoke-WebRequest -Uri $vclib_url -OutFile $vclib_downloadpath -ErrorAction SilentlyContinue
-  Add-AppxPackage $vclib_downloadpath -ErrorAction SilentlyContinue
-  Add-AppxPackage $xaml_filepath -ErrorAction SilentlyContinue
+  Safe-Download-File -Source $vclib_url -Destination $vclib_downloadpath
+  Add-AppxPackage $vclib_downloadpath
+  Add-AppxPackage $xaml_filepath
 
   # Download and install WinGet
-  Invoke-WebRequest -Uri $installer_url -OutFile $installer_downloadpath -ErrorAction SilentlyContinue
-  Invoke-WebRequest -Uri $license_url -OutFile $license_downloadpath -ErrorAction SilentlyContinue
-  Add-AppxProvisionedPackage -Online -PackagePath $installer_downloadpath -LicensePath $license_downloadpath -ErrorAction SilentlyContinue
+  Safe-Download-File -Source $installer_url -Destination $installer_downloadpath
+  Safe-Download-File -Source $license_url -Destination $license_downloadpath
+  Add-AppxProvisionedPackage -Online -PackagePath $installer_downloadpath -LicensePath $license_downloadpath
 
   # Cleanup
   Remove-Item $xaml_filepath
@@ -276,11 +278,11 @@ function set_msvc_env_variables {  # Sets the environment variables based on the
 function install_rustup {
   $result = check_package "Rustup"
   if ($result) {
-    winget install Rustlang.Rustup --silent
+    winget install Rustlang.Rustup --silent --accept-source-agreements
     Exit
 	}
   else {
-    winget upgrade --id Rustlang.Rustup
+    winget upgrade --id Rustlang.Rustup --accept-source-agreements
   }
   # Reload the PATH environment variables for this session
   $env:Path = [System.Environment]::GetEnvironmentVariable("PATH", "User") + ";" + [System.Environment]::GetEnvironmentVariable("PATH", "Machine")
@@ -300,7 +302,7 @@ function install_protoc {
     $protoc_url = "https://github.com/protocolbuffers/protobuf/releases/download/v$global:protoc_version/$protoc_zip"
 
     # Download and extract Protoc
-    Invoke-WebRequest -Uri $protoc_url -OutFile (New-Item -Path "$env:USERPROFILE\Downloads\$protoc_zip" -Force) -ErrorAction SilentlyContinue
+    Safe-Download-File $protoc_url -Destination (New-Item -Path "$env:USERPROFILE\Downloads\$protoc_zip" -Force)
     Expand-Archive -Path "$env:USERPROFILE\Downloads\$protoc_zip" -DestinationPath "$env:USERPROFILE\$protoc_folder" -ErrorAction SilentlyContinue
     Remove-Item "$env:USERPROFILE\Downloads\$protoc_zip"
 
@@ -324,42 +326,42 @@ function install_cargo_plugins {  # Installs Grcov, protoc components, and cargo
 function install_llvm {
   $result = check_package "LLVM"
   if ($result) {
-    winget install LLVM.LLVM --silent
+    winget install LLVM.LLVM --silent --accept-source-agreements
 	}
   else {
-    winget upgrade --id LLVM.LLVM
+    winget upgrade --id LLVM.LLVM --accept-source-agreements
   }
 }
 
 function install_openssl {
   $result = check_package "OpenSSL"
   if ($result) {
-    winget install ShiningLight.OpenSSL --silent
+    winget install ShiningLight.OpenSSL --silent --accept-source-agreements
 	}
   else {
-    winget upgrade --id ShiningLight.OpenSSL --silent
+    winget upgrade --id ShiningLight.OpenSSL --silent --accept-source-agreements
   }
 }
 
 function install_nodejs {
   $result = check_package "Node.js"
   if ($result) {
-    winget install OpenJS.NodeJS --silent
+    winget install OpenJS.NodeJS --silent --accept-source-agreements
 	}
   else {
-    winget upgrade --id OpenJS.NodeJS --silent
+    winget upgrade --id OpenJS.NodeJS --silent --accept-source-agreements
   }
 }
 
 function install_python {
   $result = check_package "Python"
   if ($result) {
-    winget install Python.Python.3.11 --silent
+    winget install Python.Python.3.11 --silent --accept-source-agreements
     # Reload the PATH environment variables for this session
     $env:Path = [System.Environment]::GetEnvironmentVariable("PATH", "User") + ";" + [System.Environment]::GetEnvironmentVariable("PATH", "Machine")
 	}
   else {
-    winget upgrade --id Python.Python.3.11 --silent
+    winget upgrade --id Python.Python.3.11 --silent --accept-source-agreements
   }
   python -m pip install --upgrade pip
   python -m pip install schemathesis
@@ -368,35 +370,35 @@ function install_python {
 function install_pnpm {
   $result = check_package "pnpm"
   if ($result) {
-    winget install pnpm.pnpm --silent
+    winget install pnpm.pnpm --silent --accept-source-agreements
 	}
   else {
-    winget upgrade --id pnpm.pnpm
+    winget upgrade --id pnpm.pnpm --accept-source-agreements
   }
 }
 
 function install_postgresql {
-  $result = check_package "PostgreSQL"
-  $psql_version = winget show -e PostgreSQL | Select-String Version
+  $result = check_package "PostgreSQL 15"
+  $psql_version = winget show -e "PostgreSQL 15" --accept-source-agreements | Select-String Version
   $psql_version = $psql_version.Line.Split(':')[1].Split('.')[0].Trim()
   $psql_path = "$env:PATH;$env:PROGRAMFILES\PostgreSQL\$psql_version\bin"
 
   if ($result) {
-    winget install PostgreSQL.PostgreSQL --silent
+    winget install PostgreSQL.PostgreSQL.15 --silent --accept-source-agreements
     [Environment]::SetEnvironmentVariable("PATH", $psql_path, "User")
   }
   elseif (!(Get-Command psql -ErrorAction SilentlyContinue)) {
     [Environment]::SetEnvironmentVariable("PATH", $psql_path, "User")
   }
   else {
-    winget upgrade --id PostgreSQL.PostgreSQL
+    winget upgrade --id PostgreSQL.PostgreSQL.15 --accept-source-agreements
   }
 }
 
 function install_git {
   if (!(Get-Command git -ErrorAction SilentlyContinue)) {
     Write-Host "Installing Git..."
-    winget install Git.Git --silent
+    winget install Git.Git --silent --accept-source-agreements
   }
   else {
     Write-Host "Git is already installed."
@@ -431,7 +433,7 @@ function install_z3 {
     $z3_filepath = "$env:USERPROFILE\$z3_zip"
 
     # Download and extract Z3
-    Invoke-WebRequest -Uri "https://github.com/Z3Prover/z3/releases/download/$uri/$z3_zip" -OutFile (New-Item -Path "$z3_filepath" -Force) -ErrorAction SilentlyContinue
+    Safe-Download-File -Source "https://github.com/Z3Prover/z3/releases/download/$uri/$z3_zip" -Destination (New-Item -Path "$z3_filepath" -Force)
     Expand-Archive $z3_filepath -DestinationPath "$env:USERPROFILE" -ErrorAction SilentlyContinue
     Remove-Item $z3_filepath
 
@@ -480,6 +482,29 @@ function install_move_prover {
   install_git
 }
 
+function Safe-Download-File {
+    param (
+        [Parameter(Mandatory=$true)]
+        [string]$Source,
+
+        [Parameter(Mandatory=$true)]
+        [string]$Destination
+    )
+
+    # Check if the file exists
+    if (Test-Path -Path $Destination) {
+        Write-Host "File already exists at $Destination. Deleting the existing file..." -ForegroundColor Yellow
+        # Remove the existing file
+        Remove-Item -Path $Destination -Force
+        Write-Host "Existing file deleted." -ForegroundColor Green
+    }
+    
+    # Start the download
+    Write-Host "Starting the download from $Source to $Destination..." -ForegroundColor Blue
+    Start-BitsTransfer -Source $Source -Destination $Destination
+    Write-Host "Download completed successfully." -ForegroundColor Green
+}
+
 verify_architecture
 check_os
 update_versions
diff --git a/sdk/Cargo.toml b/sdk/Cargo.toml
index 82640e7cb9a13..ee2105cbebd55 100644
--- a/sdk/Cargo.toml
+++ b/sdk/Cargo.toml
@@ -23,6 +23,7 @@ aptos-types = { workspace = true }
 base64 = { workspace = true }
 bcs = { workspace = true }
 ed25519-dalek-bip32 = { workspace = true }
+hex = { workspace = true }
 move-core-types = { workspace = true }
 rand_core = { workspace = true }
 serde_json = { workspace = true }
diff --git a/sdk/src/transaction_builder.rs b/sdk/src/transaction_builder.rs
index bb28f20c1c95e..9f5e958fef9b8 100644
--- a/sdk/src/transaction_builder.rs
+++ b/sdk/src/transaction_builder.rs
@@ -137,6 +137,10 @@ impl TransactionFactory {
         self.transaction_expiration_time
     }
 
+    pub fn get_chain_id(&self) -> ChainId {
+        self.chain_id
+    }
+
     pub fn payload(&self, payload: TransactionPayload) -> TransactionBuilder {
         self.transaction_builder(payload)
     }
diff --git a/sdk/src/types.rs b/sdk/src/types.rs
index db89a99992093..9fe8e149a8737 100644
--- a/sdk/src/types.rs
+++ b/sdk/src/types.rs
@@ -142,6 +142,16 @@ impl LocalAccount {
         Ok(Self::new(address, key, sequence_number))
     }
 
+    /// Create a new account from the given private key in hex literal.
+    pub fn from_private_key(private_key: &str, sequence_number: u64) -> Result<Self> {
+        let key = AccountKey::from_private_key(Ed25519PrivateKey::try_from(
+            hex::decode(private_key.trim_start_matches("0x"))?.as_ref(),
+        )?);
+        let address = key.authentication_key().account_address();
+
+        Ok(Self::new(address, key, sequence_number))
+    }
+
     /// Generate a new account locally. Note: This function does not actually
     /// create an account on the Aptos blockchain, it just generates a new
     /// account locally.
@@ -575,4 +585,25 @@ mod tests {
         // Return an error for empty mnemonic phrase.
         assert!(LocalAccount::from_derive_path(derive_path, "", 0).is_err());
     }
+
+    #[test]
+    fn test_create_account_from_private_key() {
+        let key = AccountKey::generate(&mut rand::rngs::OsRng);
+        let (private_key_hex_literal, public_key_hex_literal) = (
+            hex::encode(key.private_key().to_bytes().as_ref()),
+            key.authentication_key().account_address().to_hex_literal(),
+        );
+
+        // Test private key hex literal without `0x` prefix.
+        let account = LocalAccount::from_private_key(&private_key_hex_literal, 0).unwrap();
+        assert_eq!(account.address().to_hex_literal(), public_key_hex_literal);
+
+        // Test private key hex literal with `0x` prefix.
+        let account =
+            LocalAccount::from_private_key(&format!("0x{}", private_key_hex_literal), 0).unwrap();
+        assert_eq!(account.address().to_hex_literal(), public_key_hex_literal);
+
+        // Test invalid private key hex literal.
+        assert!(LocalAccount::from_private_key("invalid_private_key", 0).is_err());
+    }
 }
diff --git a/state-sync/aptos-data-client/src/latency_monitor.rs b/state-sync/aptos-data-client/src/latency_monitor.rs
index 2301b01ed4782..041bc1e2a74db 100644
--- a/state-sync/aptos-data-client/src/latency_monitor.rs
+++ b/state-sync/aptos-data-client/src/latency_monitor.rs
@@ -67,8 +67,7 @@ impl LatencyMonitor {
             // Wait for the next round
             loop_ticker.next().await;
 
-            // Get the highest synced version from storage
-            let highest_synced_version = match self.storage.get_latest_version() {
+            let highest_synced_version = match self.storage.get_synced_version() {
                 Ok(version) => version,
                 Err(error) => {
                     sample!(
diff --git a/state-sync/aptos-data-client/src/tests/mock.rs b/state-sync/aptos-data-client/src/tests/mock.rs
index a1f9c3e7c5bc2..b9fde73ad55f9 100644
--- a/state-sync/aptos-data-client/src/tests/mock.rs
+++ b/state-sync/aptos-data-client/src/tests/mock.rs
@@ -191,8 +191,13 @@ impl MockNetwork {
             connected_peers: Default::default(),
             distance_from_validators: OsRng.gen(),
         };
-        let peer_monitoring_metadata =
-            PeerMonitoringMetadata::new(Some(OsRng.gen()), Some(network_info_response), None, None);
+        let peer_monitoring_metadata = PeerMonitoringMetadata::new(
+            Some(OsRng.gen()),
+            None,
+            Some(network_info_response),
+            None,
+            None,
+        );
         self.peers_and_metadata
             .update_peer_monitoring_metadata(peer_network_id, peer_monitoring_metadata)
             .unwrap();
diff --git a/state-sync/aptos-data-client/src/tests/utils.rs b/state-sync/aptos-data-client/src/tests/utils.rs
index 3521953833bf6..7dc403f6d73bf 100644
--- a/state-sync/aptos-data-client/src/tests/utils.rs
+++ b/state-sync/aptos-data-client/src/tests/utils.rs
@@ -298,7 +298,7 @@ pub fn get_peer_monitoring_metadata(
     let peer_metadata = peers_and_metadata.get_metadata_for_peer(peer).unwrap();
 
     // Return the peer monitoring metadata
-    peer_metadata.get_peer_monitoring_metadata()
+    peer_metadata.get_peer_monitoring_metadata().clone()
 }
 
 /// Returns the peer priority for polling based on if `poll_priority_peers` is true
diff --git a/state-sync/aptos-data-client/src/utils.rs b/state-sync/aptos-data-client/src/utils.rs
index 11136c13c6e31..c3fd79a99beb2 100644
--- a/state-sync/aptos-data-client/src/utils.rs
+++ b/state-sync/aptos-data-client/src/utils.rs
@@ -237,6 +237,7 @@ fn get_distance_and_latency_for_peer(
         let peer_monitoring_metadata = peer_metadata.get_peer_monitoring_metadata();
         let distance = peer_monitoring_metadata
             .latest_network_info_response
+            .as_ref()
             .map(|response| response.distance_from_validators);
         let latency = peer_monitoring_metadata.average_ping_latency_secs;
 
diff --git a/state-sync/data-streaming-service/src/data_stream.rs b/state-sync/data-streaming-service/src/data_stream.rs
index 0a949a3cea490..cb912221eb91b 100644
--- a/state-sync/data-streaming-service/src/data_stream.rs
+++ b/state-sync/data-streaming-service/src/data_stream.rs
@@ -228,8 +228,7 @@ impl<T: AptosDataClientInterface + Send + Clone + 'static> DataStream<T> {
         }
 
         self.notifications_to_responses
-            .get(notification_id)
-            .is_some()
+            .contains_key(notification_id)
     }
 
     /// Notifies the Aptos data client of a bad client response
diff --git a/state-sync/inter-component/mempool-notifications/src/lib.rs b/state-sync/inter-component/mempool-notifications/src/lib.rs
index ef45755aa882b..fa8518ac37edd 100644
--- a/state-sync/inter-component/mempool-notifications/src/lib.rs
+++ b/state-sync/inter-component/mempool-notifications/src/lib.rs
@@ -4,7 +4,13 @@
 
 #![forbid(unsafe_code)]
 
-use aptos_types::{account_address::AccountAddress, transaction::Transaction};
+use aptos_types::{
+    account_address::AccountAddress,
+    transaction::{
+        use_case::{UseCaseAwareTransaction, UseCaseKey},
+        Transaction,
+    },
+};
 use async_trait::async_trait;
 use futures::{channel::mpsc, stream::FusedStream, SinkExt, Stream};
 use serde::{Deserialize, Serialize};
@@ -81,6 +87,7 @@ impl MempoolNotificationSender for MempoolNotifier {
                 Transaction::UserTransaction(signed_txn) => Some(CommittedTransaction {
                     sender: signed_txn.sender(),
                     sequence_number: signed_txn.sequence_number(),
+                    use_case: signed_txn.parse_use_case(),
                 }),
                 _ => None,
             })
@@ -160,11 +167,16 @@ impl fmt::Display for MempoolCommitNotification {
 pub struct CommittedTransaction {
     pub sender: AccountAddress,
     pub sequence_number: u64,
+    pub use_case: UseCaseKey,
 }
 
 impl fmt::Display for CommittedTransaction {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}:{}", self.sender, self.sequence_number,)
+        write!(
+            f,
+            "{}:{}:{:?}",
+            self.sender, self.sequence_number, self.use_case
+        )
     }
 }
 
@@ -177,8 +189,8 @@ mod tests {
         block_metadata::BlockMetadata,
         chain_id::ChainId,
         transaction::{
-            ChangeSet, RawTransaction, Script, SignedTransaction, Transaction, TransactionPayload,
-            WriteSetPayload,
+            use_case::UseCaseAwareTransaction, ChangeSet, RawTransaction, Script,
+            SignedTransaction, Transaction, TransactionPayload, WriteSetPayload,
         },
         write_set::WriteSetMut,
     };
@@ -280,6 +292,7 @@ mod tests {
                         CommittedTransaction {
                             sender: signed_transaction.sender(),
                             sequence_number: signed_transaction.sequence_number(),
+                            use_case: signed_transaction.parse_use_case(),
                         }
                     ]);
                     assert_eq!(
diff --git a/state-sync/state-sync-driver/src/driver.rs b/state-sync/state-sync-driver/src/driver.rs
index c35d7a7dd23a9..4b18c66911cf2 100644
--- a/state-sync/state-sync-driver/src/driver.rs
+++ b/state-sync/state-sync-driver/src/driver.rs
@@ -20,7 +20,7 @@ use crate::{
     utils,
     utils::{OutputFallbackHandler, PENDING_DATA_LOG_FREQ_SECS},
 };
-use aptos_config::config::{RoleType, StateSyncDriverConfig};
+use aptos_config::config::{ConsensusObserverConfig, RoleType, StateSyncDriverConfig};
 use aptos_consensus_notifications::{
     ConsensusCommitNotification, ConsensusNotification, ConsensusSyncNotification,
 };
@@ -53,6 +53,9 @@ pub struct DriverConfiguration {
     // The config file of the driver
     pub config: StateSyncDriverConfig,
 
+    // The config for consensus observer
+    pub consensus_observer_config: ConsensusObserverConfig,
+
     // The role of the node
     pub role: RoleType,
 
@@ -61,9 +64,15 @@ pub struct DriverConfiguration {
 }
 
 impl DriverConfiguration {
-    pub fn new(config: StateSyncDriverConfig, role: RoleType, waypoint: Waypoint) -> Self {
+    pub fn new(
+        config: StateSyncDriverConfig,
+        consensus_observer_config: ConsensusObserverConfig,
+        role: RoleType,
+        waypoint: Waypoint,
+    ) -> Self {
         Self {
             config,
+            consensus_observer_config,
             role,
             waypoint,
         }
@@ -142,6 +151,7 @@ impl<
         StreamingClient,
     >
 {
+    #[allow(clippy::too_many_arguments)]
     pub fn new(
         client_notification_listener: ClientNotificationListener,
         commit_notification_listener: CommitNotificationListener,
@@ -304,8 +314,6 @@ impl<
         );
         self.update_consensus_commit_metrics(&consensus_commit_notification);
 
-        // TODO(joshlind): can we get consensus to forward the events?
-
         // Handle the commit notification
         let committed_transactions = CommittedTransactions {
             events: consensus_commit_notification.subscribable_events.clone(),
@@ -538,7 +546,10 @@ impl<
     /// Returns true iff this node enables consensus
     fn is_consensus_enabled(&self) -> bool {
         self.driver_configuration.role == RoleType::Validator
-            || self.driver_configuration.config.observer_enabled
+            || self
+                .driver_configuration
+                .consensus_observer_config
+                .observer_enabled
     }
 
     /// Returns true iff consensus is currently executing
diff --git a/state-sync/state-sync-driver/src/driver_factory.rs b/state-sync/state-sync-driver/src/driver_factory.rs
index ed272387b3b7e..0e904075aacde 100644
--- a/state-sync/state-sync-driver/src/driver_factory.rs
+++ b/state-sync/state-sync-driver/src/driver_factory.rs
@@ -158,6 +158,7 @@ impl DriverFactory {
         // Create the driver configuration
         let driver_configuration = DriverConfiguration::new(
             node_config.state_sync.state_sync_driver,
+            node_config.consensus_observer,
             node_config.base.role,
             waypoint,
         );
diff --git a/state-sync/state-sync-driver/src/storage_synchronizer.rs b/state-sync/state-sync-driver/src/storage_synchronizer.rs
index c033912923df2..ac2418ad0db68 100644
--- a/state-sync/state-sync-driver/src/storage_synchronizer.rs
+++ b/state-sync/state-sync-driver/src/storage_synchronizer.rs
@@ -841,6 +841,7 @@ fn spawn_state_snapshot_receiver<
                     let all_states_synced = states_with_proof.is_last_chunk();
                     let last_committed_state_index = states_with_proof.last_index;
                     let num_state_values = states_with_proof.raw_values.len();
+
                     let result = state_snapshot_receiver.add_chunk(
                         states_with_proof.raw_values,
                         states_with_proof.proof.clone(),
diff --git a/state-sync/state-sync-driver/src/tests/bootstrapper.rs b/state-sync/state-sync-driver/src/tests/bootstrapper.rs
index a6191d0752e43..68785a0e7611b 100644
--- a/state-sync/state-sync-driver/src/tests/bootstrapper.rs
+++ b/state-sync/state-sync-driver/src/tests/bootstrapper.rs
@@ -1612,7 +1612,7 @@ fn create_bootstrapper(
         .expect_get_latest_ledger_info()
         .returning(|| Ok(create_epoch_ending_ledger_info()));
     mock_database_reader
-        .expect_get_latest_version()
+        .expect_get_synced_version()
         .returning(|| Ok(0));
 
     // Create the output fallback handler
@@ -1669,7 +1669,7 @@ fn create_bootstrapper_with_storage(
         .expect_get_latest_ledger_info()
         .returning(move || Ok(epoch_ending_ledger_info.clone()));
     mock_database_reader
-        .expect_get_latest_version()
+        .expect_get_synced_version()
         .returning(move || Ok(latest_synced_version));
 
     // Create the output fallback handler
diff --git a/state-sync/state-sync-driver/src/tests/continuous_syncer.rs b/state-sync/state-sync-driver/src/tests/continuous_syncer.rs
index 3d35a10996327..5ad36dc671388 100644
--- a/state-sync/state-sync-driver/src/tests/continuous_syncer.rs
+++ b/state-sync/state-sync-driver/src/tests/continuous_syncer.rs
@@ -502,7 +502,7 @@ fn create_continuous_syncer(
     // Create the mock db reader with the given synced version
     let mut mock_database_reader = create_mock_db_reader();
     mock_database_reader
-        .expect_get_latest_version()
+        .expect_get_synced_version()
         .returning(move || Ok(synced_version));
     mock_database_reader
         .expect_get_latest_epoch_state()
diff --git a/state-sync/state-sync-driver/src/tests/driver_factory.rs b/state-sync/state-sync-driver/src/tests/driver_factory.rs
index 13d88dd66ba9c..b693a3e6fd937 100644
--- a/state-sync/state-sync-driver/src/tests/driver_factory.rs
+++ b/state-sync/state-sync-driver/src/tests/driver_factory.rs
@@ -40,6 +40,7 @@ fn test_new_initialized_configs() {
         false, /* indexer */
         BUFFERED_STATE_TARGET_ITEMS,
         DEFAULT_MAX_NUM_NODES_PER_LRU_CACHE_SHARD,
+        None,
     )
     .unwrap();
     let (_, db_rw) = DbReaderWriter::wrap(db);
diff --git a/state-sync/state-sync-driver/src/tests/mocks.rs b/state-sync/state-sync-driver/src/tests/mocks.rs
index a8ff93ae9814c..80d91c97fcd9e 100644
--- a/state-sync/state-sync-driver/src/tests/mocks.rs
+++ b/state-sync/state-sync-driver/src/tests/mocks.rs
@@ -81,7 +81,7 @@ pub fn create_mock_reader_writer_with_version(
 ) -> DbReaderWriter {
     let mut reader = reader.unwrap_or_else(create_mock_db_reader);
     reader
-        .expect_get_latest_version()
+        .expect_get_synced_version()
         .returning(move || Ok(highest_synced_version));
     reader
         .expect_get_latest_epoch_state()
@@ -235,7 +235,9 @@ mock! {
 
         fn get_latest_ledger_info(&self) -> Result<LedgerInfoWithSignatures>;
 
-        fn get_latest_version(&self) -> Result<Version>;
+        fn get_synced_version(&self) -> Result<Version>;
+
+        fn get_latest_ledger_info_version(&self) -> Result<Version>;
 
         fn get_latest_commit_metadata(&self) -> Result<(Version, u64)>;
 
@@ -287,7 +289,7 @@ mock! {
             ledger_version: Version,
         ) -> Result<TransactionAccumulatorSummary>;
 
-        fn get_state_leaf_count(&self, version: Version) -> Result<usize>;
+        fn get_state_item_count(&self, version: Version) -> Result<usize>;
 
         fn get_state_value_chunk_with_proof(
             &self,
diff --git a/state-sync/state-sync-driver/src/tests/utils.rs b/state-sync/state-sync-driver/src/tests/utils.rs
index 1a481e7323876..a9ca1460a0f25 100644
--- a/state-sync/state-sync-driver/src/tests/utils.rs
+++ b/state-sync/state-sync-driver/src/tests/utils.rs
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::driver::DriverConfiguration;
-use aptos_config::config::{RoleType, StateSyncDriverConfig};
+use aptos_config::config::{ConsensusObserverConfig, RoleType, StateSyncDriverConfig};
 use aptos_crypto::{
     ed25519::{Ed25519PrivateKey, Ed25519Signature},
     HashValue, PrivateKey, Uniform,
@@ -31,9 +31,10 @@ use aptos_types::{
     },
     state_store::state_value::StateValueChunkWithProof,
     transaction::{
-        ExecutionStatus, RawTransaction, Script, SignedTransaction, Transaction,
-        TransactionAuxiliaryData, TransactionInfo, TransactionListWithProof, TransactionOutput,
-        TransactionOutputListWithProof, TransactionPayload, TransactionStatus, Version,
+        use_case::UseCaseAwareTransaction, ExecutionStatus, RawTransaction, Script,
+        SignedTransaction, Transaction, TransactionAuxiliaryData, TransactionInfo,
+        TransactionListWithProof, TransactionOutput, TransactionOutputListWithProof,
+        TransactionPayload, TransactionStatus, Version,
     },
     validator_verifier::ValidatorVerifier,
     waypoint::Waypoint,
@@ -84,11 +85,13 @@ pub fn create_event(event_key: Option<EventKey>) -> ContractEvent {
 /// Creates a test driver configuration for full nodes
 pub fn create_full_node_driver_configuration() -> DriverConfiguration {
     let config = StateSyncDriverConfig::default();
+    let consensus_observer_config = ConsensusObserverConfig::default();
     let role = RoleType::FullNode;
     let waypoint = Waypoint::default();
 
     DriverConfiguration {
         config,
+        consensus_observer_config,
         role,
         waypoint,
     }
@@ -276,9 +279,13 @@ pub async fn verify_commit_notification(
     let mempool_notification = mempool_notification_listener.select_next_some().await;
     let committed_transactions: Vec<CommittedTransaction> = expected_transactions
         .into_iter()
-        .map(|txn| CommittedTransaction {
-            sender: txn.try_as_signed_user_txn().unwrap().sender(),
-            sequence_number: 0,
+        .map(|txn| {
+            let signed = txn.try_as_signed_user_txn().unwrap();
+            CommittedTransaction {
+                sender: signed.sender(),
+                sequence_number: 0,
+                use_case: signed.parse_use_case(),
+            }
         })
         .collect();
     assert_eq!(mempool_notification.transactions, committed_transactions);
diff --git a/state-sync/state-sync-driver/src/utils.rs b/state-sync/state-sync-driver/src/utils.rs
index 2306ff6f99023..46ee898366fec 100644
--- a/state-sync/state-sync-driver/src/utils.rs
+++ b/state-sync/state-sync-driver/src/utils.rs
@@ -279,7 +279,7 @@ pub fn fetch_latest_synced_ledger_info(
 
 /// Fetches the latest synced version from the specified storage
 pub fn fetch_latest_synced_version(storage: Arc<dyn DbReader>) -> Result<Version, Error> {
-    storage.get_latest_version().map_err(|e| {
+    storage.get_synced_version().map_err(|e| {
         Error::StorageError(format!("Failed to get latest version from storage: {e:?}"))
     })
 }
diff --git a/state-sync/storage-service/server/src/storage.rs b/state-sync/storage-service/server/src/storage.rs
index edc88cec188bd..6c950715b163f 100644
--- a/state-sync/storage-service/server/src/storage.rs
+++ b/state-sync/storage-service/server/src/storage.rs
@@ -443,7 +443,7 @@ impl StorageReaderInterface for StorageReader {
     ) -> aptos_storage_service_types::Result<u64, Error> {
         let number_of_states = self
             .storage
-            .get_state_leaf_count(version)
+            .get_state_item_count(version)
             .map_err(|error| Error::StorageErrorEncountered(error.to_string()))?;
         Ok(number_of_states as u64)
     }
@@ -570,7 +570,7 @@ impl DbReader for TimedStorageReader {
             ledger_version: Version,
         ) -> StorageResult<TransactionOutputListWithProof>;
 
-        fn get_state_leaf_count(&self, version: Version) -> StorageResult<usize>;
+        fn get_state_item_count(&self, version: Version) -> StorageResult<usize>;
 
         fn get_state_value_chunk_with_proof(
             &self,
diff --git a/state-sync/storage-service/server/src/tests/cache.rs b/state-sync/storage-service/server/src/tests/cache.rs
index 14fb97eb37f64..587d0671a3510 100644
--- a/state-sync/storage-service/server/src/tests/cache.rs
+++ b/state-sync/storage-service/server/src/tests/cache.rs
@@ -176,7 +176,7 @@ async fn test_cachable_requests_eviction() {
     let mut db_reader = mock::create_mock_db_reader();
     let mut expectation_sequence = Sequence::new();
     db_reader
-        .expect_get_state_leaf_count()
+        .expect_get_state_item_count()
         .times(max_lru_cache_size as usize)
         .with(always())
         .returning(move |_| Ok(165));
diff --git a/state-sync/storage-service/server/src/tests/mock.rs b/state-sync/storage-service/server/src/tests/mock.rs
index 65296d3c73280..c72fdec9f65e9 100644
--- a/state-sync/storage-service/server/src/tests/mock.rs
+++ b/state-sync/storage-service/server/src/tests/mock.rs
@@ -9,16 +9,17 @@ use anyhow::Result;
 use aptos_channels::{aptos_channel, message_queues::QueueStyle};
 use aptos_config::{
     config::{StateSyncConfig, StorageServiceConfig},
-    network_id::NetworkId,
+    network_id::{NetworkId, PeerNetworkId},
 };
 use aptos_crypto::HashValue;
 use aptos_network::{
     application::{interface::NetworkServiceEvents, storage::PeersAndMetadata},
-    peer_manager::PeerManagerNotification,
     protocols::{
-        network::{NetworkEvents, NewNetworkEvents},
-        rpc::InboundRpcRequest,
-        wire::handshake::v1::ProtocolId,
+        network::{NetworkEvents, NewNetworkEvents, ReceivedMessage},
+        wire::{
+            handshake::v1::ProtocolId,
+            messaging::v1::{NetworkMessage, RpcRequest},
+        },
     },
 };
 use aptos_storage_interface::{DbReader, ExecutedTrees, Order};
@@ -59,7 +60,7 @@ const MAX_RESPONSE_TIMEOUT_SECS: u64 = 60;
 /// mock client requests to a [`StorageServiceServer`].
 pub struct MockClient {
     peer_manager_notifiers:
-        HashMap<NetworkId, aptos_channel::Sender<(PeerId, ProtocolId), PeerManagerNotification>>,
+        HashMap<NetworkId, aptos_channel::Sender<(PeerId, ProtocolId), ReceivedMessage>>,
 }
 
 impl MockClient {
@@ -98,7 +99,7 @@ impl MockClient {
             .counters(&metrics::PENDING_STORAGE_SERVER_NETWORK_EVENTS);
             let (peer_manager_notifier, peer_manager_notification_receiver) = queue_cfg.build();
 
-            let network_events = NetworkEvents::new(peer_manager_notification_receiver, None);
+            let network_events = NetworkEvents::new(peer_manager_notification_receiver, None, true);
             network_and_events.insert(network_id, network_events);
             peer_manager_notifiers.insert(network_id, peer_manager_notifier);
         }
@@ -161,12 +162,17 @@ impl MockClient {
             .to_bytes(&StorageServiceMessage::Request(request))
             .unwrap();
         let (res_tx, res_rx) = oneshot::channel();
-        let inbound_rpc = InboundRpcRequest {
-            protocol_id,
-            data: data.into(),
-            res_tx,
+        let notification = ReceivedMessage {
+            message: NetworkMessage::RpcRequest(RpcRequest {
+                protocol_id,
+                request_id: 0,
+                priority: 0,
+                raw_request: data,
+            }),
+            sender: PeerNetworkId::new(network_id, peer_id),
+            receive_timestamp_micros: 0,
+            rpc_replier: Some(Arc::new(res_tx)),
         };
-        let notification = PeerManagerNotification::RecvRpc(peer_id, inbound_rpc);
 
         // Push the request up to the storage service
         self.peer_manager_notifiers
@@ -282,7 +288,9 @@ mock! {
 
         fn get_latest_ledger_info(&self) -> aptos_storage_interface::Result<LedgerInfoWithSignatures>;
 
-        fn get_latest_version(&self) -> aptos_storage_interface::Result<Version>;
+        fn get_synced_version(&self) -> aptos_storage_interface::Result<Version>;
+
+        fn get_latest_ledger_info_version(&self) -> aptos_storage_interface::Result<Version>;
 
         fn get_latest_commit_metadata(&self) -> aptos_storage_interface::Result<(Version, u64)>;
 
@@ -334,7 +342,7 @@ mock! {
             ledger_version: Version,
         ) -> aptos_storage_interface::Result<TransactionAccumulatorSummary>;
 
-        fn get_state_leaf_count(&self, version: Version) -> aptos_storage_interface::Result<usize>;
+        fn get_state_item_count(&self, version: Version) -> aptos_storage_interface::Result<usize>;
 
         fn get_state_value_chunk_with_proof(
             &self,
diff --git a/state-sync/storage-service/server/src/tests/number_of_states.rs b/state-sync/storage-service/server/src/tests/number_of_states.rs
index f6962bdcfa1d6..f93e33ce4063c 100644
--- a/state-sync/storage-service/server/src/tests/number_of_states.rs
+++ b/state-sync/storage-service/server/src/tests/number_of_states.rs
@@ -20,7 +20,7 @@ async fn test_get_number_of_states_at_version() {
     // Create the mock db reader
     let mut db_reader = mock::create_mock_db_reader();
     db_reader
-        .expect_get_state_leaf_count()
+        .expect_get_state_item_count()
         .times(1)
         .with(eq(version))
         .returning(move |_| Ok(number_of_states as usize));
@@ -70,7 +70,7 @@ async fn test_get_number_of_states_at_version_invalid() {
     // Create the mock db reader
     let mut db_reader = mock::create_mock_db_reader();
     db_reader
-        .expect_get_state_leaf_count()
+        .expect_get_state_item_count()
         .times(1)
         .with(eq(version))
         .returning(move |_| {
diff --git a/storage/aptosdb/Cargo.toml b/storage/aptosdb/Cargo.toml
index 969e97d103f51..cc86b63746f0e 100644
--- a/storage/aptosdb/Cargo.toml
+++ b/storage/aptosdb/Cargo.toml
@@ -18,6 +18,7 @@ aptos-accumulator = { workspace = true }
 aptos-config = { workspace = true }
 aptos-crypto = { workspace = true }
 aptos-db-indexer = { workspace = true }
+aptos-db-indexer-schemas = { workspace = true, features = ["fuzzing"] }
 aptos-executor = { workspace = true }
 aptos-executor-types = { workspace = true }
 aptos-experimental-runtimes = { workspace = true }
@@ -39,8 +40,11 @@ bcs = { workspace = true }
 byteorder = { workspace = true }
 claims = { workspace = true }
 clap = { workspace = true, optional = true }
+crossbeam-channel = { workspace = true, optional = true }
 dashmap = { workspace = true }
 either = { workspace = true }
+hex = { workspace = true }
+indicatif = { workspace = true, optional = true }
 itertools = { workspace = true }
 lru = { workspace = true }
 move-core-types = { workspace = true }
@@ -70,4 +74,4 @@ rand = { workspace = true }
 default = []
 fuzzing = ["proptest", "proptest-derive", "aptos-proptest-helpers", "aptos-temppath", "aptos-crypto/fuzzing", "aptos-jellyfish-merkle/fuzzing", "aptos-types/fuzzing", "aptos-executor-types/fuzzing", "aptos-schemadb/fuzzing", "aptos-scratchpad/fuzzing"]
 consensus-only-perf-test = []
-db-debugger = ["aptos-temppath", "clap", "owo-colors"]
+db-debugger = ["aptos-temppath", "clap", "crossbeam-channel", "owo-colors", "indicatif"]
diff --git a/storage/aptosdb/src/backup/backup_handler.rs b/storage/aptosdb/src/backup/backup_handler.rs
index 377bf60d67050..8a14eea44687c 100644
--- a/storage/aptosdb/src/backup/backup_handler.rs
+++ b/storage/aptosdb/src/backup/backup_handler.rs
@@ -119,18 +119,26 @@ impl BackupHandler {
         Ok((accumulator_proof, ledger_info))
     }
 
-    /// Gets an iterator which can yield all accounts in the state tree.
-    pub fn get_account_iter(
+    /// Gets the number of items in a state snapshot.
+    pub fn get_state_item_count(&self, version: Version) -> Result<usize> {
+        self.state_store.get_value_count(version)
+    }
+
+    /// Iterate through items in a state snapshot
+    pub fn get_state_item_iter(
         &self,
         version: Version,
-    ) -> Result<Box<dyn Iterator<Item = Result<(StateKey, StateValue)>> + Send + Sync>> {
+        start_idx: usize,
+        limit: usize,
+    ) -> Result<impl Iterator<Item = Result<(StateKey, StateValue)>> + Send> {
         let iterator = self
             .state_store
-            .get_state_key_and_value_iter(version, HashValue::zero())?
+            .get_state_key_and_value_iter(version, start_idx)?
+            .take(limit)
             .enumerate()
             .map(move |(idx, res)| {
                 BACKUP_STATE_SNAPSHOT_VERSION.set(version as i64);
-                BACKUP_STATE_SNAPSHOT_LEAF_IDX.set(idx as i64);
+                BACKUP_STATE_SNAPSHOT_LEAF_IDX.set((start_idx + idx) as i64);
                 res
             });
         Ok(Box::new(iterator))
diff --git a/storage/aptosdb/src/backup/restore_handler.rs b/storage/aptosdb/src/backup/restore_handler.rs
index 32abffb48cffb..9a623d3d0e5d3 100644
--- a/storage/aptosdb/src/backup/restore_handler.rs
+++ b/storage/aptosdb/src/backup/restore_handler.rs
@@ -119,7 +119,7 @@ impl RestoreHandler {
     }
 
     pub fn get_next_expected_transaction_version(&self) -> Result<Version> {
-        Ok(self.aptosdb.get_latest_version().map_or(0, |ver| ver + 1))
+        Ok(self.aptosdb.get_synced_version().map_or(0, |ver| ver + 1))
     }
 
     pub fn get_state_snapshot_before(
@@ -133,10 +133,10 @@ impl RestoreHandler {
 
     pub fn get_in_progress_state_kv_snapshot_version(&self) -> Result<Option<Version>> {
         let db = self.aptosdb.ledger_db.metadata_db_arc();
-        let mut iter = db.iter::<DbMetadataSchema>(Default::default())?;
+        let mut iter = db.iter::<DbMetadataSchema>()?;
         iter.seek_to_first();
         while let Some((k, _v)) = iter.next().transpose()? {
-            if let DbMetadataKey::StateSnapshotRestoreProgress(version) = k {
+            if let DbMetadataKey::StateSnapshotKvRestoreProgress(version) = k {
                 return Ok(Some(version));
             }
         }
diff --git a/storage/aptosdb/src/backup/restore_utils.rs b/storage/aptosdb/src/backup/restore_utils.rs
index 92a9ec132ef8f..b2da4a01adb4f 100644
--- a/storage/aptosdb/src/backup/restore_utils.rs
+++ b/storage/aptosdb/src/backup/restore_utils.rs
@@ -122,7 +122,7 @@ pub(crate) fn save_transactions(
     )>,
     kv_replay: bool,
 ) -> Result<()> {
-    if let Some((ledger_db_batch, state_kv_batches, state_kv_metadata_batch)) = existing_batch {
+    if let Some((ledger_db_batch, state_kv_batches, _state_kv_metadata_batch)) = existing_batch {
         save_transactions_impl(
             state_store,
             ledger_db,
@@ -133,7 +133,6 @@ pub(crate) fn save_transactions(
             write_sets.as_ref(),
             ledger_db_batch,
             state_kv_batches,
-            state_kv_metadata_batch,
             kv_replay,
         )?;
     } else {
@@ -150,7 +149,6 @@ pub(crate) fn save_transactions(
             write_sets.as_ref(),
             &mut ledger_db_batch,
             &mut sharded_kv_schema_batch,
-            &state_kv_metadata_batch,
             kv_replay,
         )?;
         // get the last version and commit to the state kv db
@@ -193,7 +191,6 @@ pub(crate) fn save_transactions_impl(
     write_sets: &[WriteSet],
     ledger_db_batch: &mut LedgerDbSchemaBatches,
     state_kv_batches: &mut ShardedStateKvSchemaBatch,
-    state_kv_metadata_batch: &SchemaBatch,
     kv_replay: bool,
 ) -> Result<()> {
     for (idx, txn) in txns.iter().enumerate() {
@@ -241,7 +238,6 @@ pub(crate) fn save_transactions_impl(
             first_version,
             &ledger_db_batch.ledger_metadata_db_batches, // used for storing the storage usage
             state_kv_batches,
-            state_kv_metadata_batch,
             state_store.state_kv_db.enabled_sharding(),
         )?;
     }
diff --git a/storage/aptosdb/src/db/aptosdb_test.rs b/storage/aptosdb/src/db/aptosdb_test.rs
index 4bf735c2fd8c0..78a58842283c3 100644
--- a/storage/aptosdb/src/db/aptosdb_test.rs
+++ b/storage/aptosdb/src/db/aptosdb_test.rs
@@ -15,7 +15,7 @@ use crate::{
 };
 use aptos_config::config::{
     EpochSnapshotPrunerConfig, LedgerPrunerConfig, PrunerConfig, RocksdbConfigs,
-    StateMerklePrunerConfig, StorageDirPaths, BUFFERED_STATE_TARGET_ITEMS,
+    StateMerklePrunerConfig, StorageDirPaths, BUFFERED_STATE_TARGET_ITEMS_FOR_TEST,
     DEFAULT_MAX_NUM_NODES_PER_LRU_CACHE_SHARD,
 };
 use aptos_crypto::{hash::CryptoHash, HashValue};
@@ -109,13 +109,16 @@ fn test_pruner_config() {
         assert_eq!(state_merkle_pruner.is_pruner_enabled(), enable);
         assert_eq!(state_merkle_pruner.get_prune_window(), 20);
 
-        let ledger_pruner =
-            LedgerPrunerManager::new(Arc::clone(&aptos_db.ledger_db), LedgerPrunerConfig {
+        let ledger_pruner = LedgerPrunerManager::new(
+            Arc::clone(&aptos_db.ledger_db),
+            LedgerPrunerConfig {
                 enable,
                 prune_window: 100,
                 batch_size: 1,
                 user_pruning_window_offset: 0,
-            });
+            },
+            None,
+        );
         assert_eq!(ledger_pruner.is_pruner_enabled(), enable);
         assert_eq!(ledger_pruner.get_prune_window(), 100);
     }
@@ -164,11 +167,11 @@ fn test_get_transaction_auxiliary_data() {
     put_transaction_auxiliary_data(&db, 0, &txns);
     assert_eq!(
         db.get_transaction_auxiliary_data_by_version(0).unwrap(),
-        aux_1
+        Some(aux_1)
     );
     assert_eq!(
         db.get_transaction_auxiliary_data_by_version(1).unwrap(),
-        aux_2
+        Some(aux_2)
     );
 }
 
@@ -235,8 +238,9 @@ pub fn test_state_merkle_pruning_impl(
         },
         RocksdbConfigs::default(),
         false, /* enable_indexer */
-        BUFFERED_STATE_TARGET_ITEMS,
+        BUFFERED_STATE_TARGET_ITEMS_FOR_TEST,
         DEFAULT_MAX_NUM_NODES_PER_LRU_CACHE_SHARD,
+        None,
     )
     .unwrap();
 
diff --git a/storage/aptosdb/src/db/fake_aptosdb.rs b/storage/aptosdb/src/db/fake_aptosdb.rs
index ad008f28f8ebe..fe499c38a3bf4 100644
--- a/storage/aptosdb/src/db/fake_aptosdb.rs
+++ b/storage/aptosdb/src/db/fake_aptosdb.rs
@@ -236,7 +236,7 @@ impl FakeAptosDB {
             .current_version
             .map(|version| version + 1)
             .unwrap_or(0);
-        let num_transactions_in_db = self.get_latest_version().map_or(0, |v| v + 1);
+        let num_transactions_in_db = self.get_synced_version().map_or(0, |v| v + 1);
         ensure!(num_transactions_in_db == first_version && num_transactions_in_db == next_version_in_buffered_state,
             "The first version {} passed in, the next version in buffered state {} and the next version in db {} are inconsistent.",
             first_version,
@@ -667,7 +667,7 @@ impl DbReader for FakeAptosDB {
     fn get_block_timestamp(&self, version: Version) -> Result<u64> {
         gauged_api("get_block_timestamp", || {
             ensure!(
-                version <= self.get_latest_version()?,
+                version <= self.get_synced_version()?,
                 "version older than latest version"
             );
 
@@ -835,7 +835,7 @@ impl DbReader for FakeAptosDB {
         // This is because when we call save_transactions for the genesis block, we call [AptosDB::save_transactions]
         // where there is an expectation that the root of the SMTs are the same pointers. Here,
         // we get from the inner AptosDB which ensures that the pointers match when save_transactions is called.
-        if self.get_latest_version().unwrap_or_default() == 0 {
+        if self.get_synced_version().unwrap_or_default() == 0 {
             return self.inner.get_latest_executed_trees();
         }
 
@@ -900,8 +900,8 @@ impl DbReader for FakeAptosDB {
             .map_err(Into::into)
     }
 
-    fn get_state_leaf_count(&self, version: Version) -> Result<usize> {
-        self.inner.get_state_leaf_count(version)
+    fn get_state_item_count(&self, version: Version) -> Result<usize> {
+        self.inner.get_state_item_count(version)
     }
 
     fn get_state_value_chunk_with_proof(
diff --git a/storage/aptosdb/src/db/include/aptosdb_internal.rs b/storage/aptosdb/src/db/include/aptosdb_internal.rs
index 9895e454e048b..44e77cf4028ca 100644
--- a/storage/aptosdb/src/db/include/aptosdb_internal.rs
+++ b/storage/aptosdb/src/db/include/aptosdb_internal.rs
@@ -1,6 +1,8 @@
 // Copyright © Aptos Foundation
 // SPDX-License-Identifier: Apache-2.0
 
+use aptos_storage_interface::block_info::BlockInfo;
+
 impl AptosDB {
     fn new_with_dbs(
         ledger_db: LedgerDb,
@@ -11,6 +13,7 @@ impl AptosDB {
         hack_for_tests: bool,
         empty_buffered_state_for_restore: bool,
         skip_index_and_usage: bool,
+        internal_indexer_db: Option<InternalIndexerDB>,
     ) -> Self {
         let ledger_db = Arc::new(ledger_db);
         let state_merkle_db = Arc::new(state_merkle_db);
@@ -36,10 +39,11 @@ impl AptosDB {
             hack_for_tests,
             empty_buffered_state_for_restore,
             skip_index_and_usage,
+            internal_indexer_db.clone(),
         ));
 
         let ledger_pruner =
-            LedgerPrunerManager::new(Arc::clone(&ledger_db), pruner_config.ledger_pruner_config);
+            LedgerPrunerManager::new(Arc::clone(&ledger_db), pruner_config.ledger_pruner_config, internal_indexer_db);
 
         AptosDB {
             ledger_db: Arc::clone(&ledger_db),
@@ -68,6 +72,7 @@ impl AptosDB {
         buffered_state_target_items: usize,
         max_num_nodes_per_lru_cache_shard: usize,
         empty_buffered_state_for_restore: bool,
+        internal_indexer_db: Option<InternalIndexerDB>,
     ) -> Result<Self> {
         ensure!(
             pruner_config.eq(&NO_OP_STORAGE_PRUNER_CONFIG) || !readonly,
@@ -90,6 +95,7 @@ impl AptosDB {
             readonly,
             empty_buffered_state_for_restore,
             rocksdb_configs.enable_storage_sharding,
+            internal_indexer_db,
         );
 
         if !readonly && enable_indexer {
@@ -108,7 +114,7 @@ impl AptosDB {
         rocksdb_config: RocksdbConfig,
     ) -> Result<()> {
         let indexer = Indexer::open(&db_root_path, rocksdb_config)?;
-        let ledger_next_version = self.get_latest_version().map_or(0, |v| v + 1);
+        let ledger_next_version = self.get_synced_version().map_or(0, |v| v + 1);
         info!(
             indexer_next_version = indexer.next_version(),
             ledger_next_version = ledger_next_version,
@@ -150,15 +156,20 @@ impl AptosDB {
         buffered_state_target_items: usize,
         max_num_nodes_per_lru_cache_shard: usize,
         enable_indexer: bool,
+        enable_sharding: bool,
     ) -> Self {
         Self::open(
             StorageDirPaths::from_path(db_root_path),
             readonly,
             NO_OP_STORAGE_PRUNER_CONFIG, /* pruner */
-            RocksdbConfigs::default(),
+            RocksdbConfigs {
+                enable_storage_sharding: enable_sharding,
+                ..Default::default()
+            },
             enable_indexer,
             buffered_state_target_items,
             max_num_nodes_per_lru_cache_shard,
+            None,
         )
         .expect("Unable to open AptosDB")
     }
@@ -214,6 +225,96 @@ impl AptosDB {
         );
         Ok(())
     }
+
+    fn get_raw_block_info_by_height(&self, block_height: u64) -> Result<BlockInfo> {
+        if !self.skip_index_and_usage {
+            let (first_version, new_block_event) = self.event_store.get_event_by_key(
+                &new_block_event_key(),
+                block_height,
+                self.get_synced_version()?,
+            )?;
+            let new_block_event = bcs::from_bytes(new_block_event.event_data())?;
+            Ok(BlockInfo::from_new_block_event(
+                first_version,
+                &new_block_event,
+            ))
+        } else {
+            Ok(self
+                .ledger_db
+                .metadata_db()
+                .get_block_info(block_height)?
+                .ok_or(AptosDbError::NotFound(format!(
+                    "BlockInfo not found at height {block_height}"
+                )))?)
+        }
+    }
+
+    fn get_raw_block_info_by_version(
+        &self,
+        version: Version,
+    ) -> Result<(u64 /* block_height */, BlockInfo)> {
+        let synced_version = self.get_synced_version()?;
+        ensure!(
+            version <= synced_version,
+            "Requested version {version} > synced version {synced_version}",
+        );
+
+        if !self.skip_index_and_usage {
+            let (first_version, event_index, block_height) = self
+                .event_store
+                .lookup_event_before_or_at_version(&new_block_event_key(), version)?
+                .ok_or_else(|| AptosDbError::NotFound("NewBlockEvent".to_string()))?;
+            let new_block_event = self
+                .event_store
+                .get_event_by_version_and_index(first_version, event_index)?;
+            let new_block_event = bcs::from_bytes(new_block_event.event_data())?;
+            Ok((
+                block_height,
+                BlockInfo::from_new_block_event(first_version, &new_block_event),
+            ))
+        } else {
+            let block_height = self
+                .ledger_db
+                .metadata_db()
+                .get_block_height_by_version(version)?;
+
+            let block_info = self.get_raw_block_info_by_height(block_height)?;
+            Ok((block_height, block_info))
+        }
+    }
+
+    fn to_api_block_info(
+        &self,
+        block_height: u64,
+        block_info: BlockInfo,
+    ) -> Result<(Version, Version, NewBlockEvent)> {
+        // N.b. Must use committed_version because if synced version is used, we won't be able
+        // to tell the end of the latest block.
+        let committed_version = self.get_latest_ledger_info_version()?;
+        ensure!(
+            block_info.first_version() <= committed_version,
+            "block first version {} > committed version {committed_version}",
+            block_info.first_version(),
+        );
+
+        // TODO(grao): Consider return BlockInfo instead of NewBlockEvent.
+        let new_block_event = self
+            .ledger_db
+            .event_db()
+            .expect_new_block_event(block_info.first_version())?;
+
+        let last_version = match self.get_raw_block_info_by_height(block_height + 1) {
+            Ok(next_block_info) => next_block_info.first_version() - 1,
+            Err(AptosDbError::NotFound(..)) => committed_version,
+            Err(err) => return Err(err),
+        };
+
+        Ok((
+            block_info.first_version(),
+            last_version,
+            bcs::from_bytes(new_block_event.event_data())?,
+        ))
+    }
 }
 
 impl Debug for AptosDB {
@@ -231,7 +332,7 @@ fn error_if_too_many_requested(num_requested: u64, max_allowed: u64) -> Result<(
 }
 
 thread_local! {
-    static ENTERED_GAUGED_API: Cell<bool> = Cell::new(false);
+    static ENTERED_GAUGED_API: Cell<bool> = const { Cell::new(false) };
 }
 
 fn gauged_api<T, F>(api_name: &'static str, api_impl: F) -> Result<T>
diff --git a/storage/aptosdb/src/db/include/aptosdb_reader.rs b/storage/aptosdb/src/db/include/aptosdb_reader.rs
index ee8d469ddb8c1..cf591fb3c455b 100644
--- a/storage/aptosdb/src/db/include/aptosdb_reader.rs
+++ b/storage/aptosdb/src/db/include/aptosdb_reader.rs
@@ -23,6 +23,7 @@ impl DbReader for AptosDB {
         version: Version,
     ) -> Result<Box<dyn Iterator<Item = Result<(StateKey, StateValue)>> + '_>> {
         gauged_api("get_prefixed_state_value_iterator", || {
+            ensure!(!self.state_kv_db.enabled_sharding(), "This API is not supported with sharded DB");
             self.error_if_state_kv_pruned("StateValue", version)?;
 
             Ok(Box::new(
@@ -36,7 +37,7 @@ impl DbReader for AptosDB {
     fn get_transaction_auxiliary_data_by_version(
         &self,
         version: Version,
-    ) -> Result<TransactionAuxiliaryData> {
+    ) -> Result<Option<TransactionAuxiliaryData>> {
         gauged_api("get_transaction_auxiliary_data_by_version", || {
             self.error_if_ledger_pruned("Transaction", version)?;
             self.ledger_db
@@ -50,9 +51,9 @@ impl DbReader for AptosDB {
         })
     }
 
-    fn get_latest_version(&self) -> Result<Version> {
-        gauged_api("get_latest_version", || {
-            self.ledger_db.metadata_db().get_latest_version()
+    fn get_synced_version(&self) -> Result<Version> {
+        gauged_api("get_synced_version", || {
+            self.ledger_db.metadata_db().get_synced_version()
         })
     }
 
@@ -64,6 +65,7 @@ impl DbReader for AptosDB {
         ledger_version: Version,
     ) -> Result<Option<TransactionWithProof>> {
         gauged_api("get_account_transaction", || {
+            ensure!(!self.state_kv_db.enabled_sharding(), "This API is not supported with sharded DB");
             self.transaction_store
                 .get_account_transaction_version(address, seq_num, ledger_version)?
                 .map(|txn_version| {
@@ -82,6 +84,7 @@ impl DbReader for AptosDB {
         ledger_version: Version,
     ) -> Result<AccountTransactionsWithProof> {
         gauged_api("get_account_transactions", || {
+            ensure!(!self.state_kv_db.enabled_sharding(), "This API is not supported with sharded DB");
             error_if_too_many_requested(limit, MAX_REQUEST_LIMIT)?;
 
             let txns_with_proofs = self
@@ -256,7 +259,7 @@ impl DbReader for AptosDB {
                     let events = self.ledger_db.event_db().get_events_by_version(version)?;
                     let write_set = self.ledger_db.write_set_db().get_write_set(version)?;
                     let txn = self.ledger_db.transaction_db().get_transaction(version)?;
-                    let auxiliary_data = self.ledger_db.transaction_auxiliary_data_db().get_transaction_auxiliary_data(version).unwrap_or_default();
+                    let auxiliary_data = self.ledger_db.transaction_auxiliary_data_db().get_transaction_auxiliary_data(version)?.unwrap_or_default();
                     let txn_output = TransactionOutput::new(
                         write_set,
                         events,
@@ -284,6 +287,7 @@ impl DbReader for AptosDB {
         })
     }
 
+    /// TODO(bowu): Deprecate after internal index migration
     fn get_events(
         &self,
         event_key: &EventKey,
@@ -525,13 +529,9 @@ impl DbReader for AptosDB {
     fn get_block_timestamp(&self, version: u64) -> Result<u64> {
         gauged_api("get_block_timestamp", || {
             self.error_if_ledger_pruned("NewBlockEvent", version)?;
-            ensure!(
-                version <= self.get_latest_version()?,
-                "version older than latest version"
-            );
+            let (_block_height, block_info) = self.get_raw_block_info_by_version(version)?;
 
-            let (_first_version, _last_version, new_block_event) = self.get_block_info_by_version(version)?;
-            Ok(new_block_event.proposed_time())
+            Ok(block_info.timestamp_usecs())
         })
     }
 
@@ -545,12 +545,12 @@ impl DbReader for AptosDB {
                     u64::max_value(),
                     Order::Descending,
                     num_events as u64,
-                    self.get_latest_version().unwrap_or(0),
+                    self.get_synced_version().unwrap_or(0),
                 );
             }
 
             let db = self.ledger_db.metadata_db_arc();
-            let mut iter = db.rev_iter::<BlockInfoSchema>(ReadOptions::default())?;
+            let mut iter = db.rev_iter::<BlockInfoSchema>()?;
             iter.seek_to_last();
 
             let mut events = Vec::with_capacity(num_events);
@@ -572,33 +572,8 @@ impl DbReader for AptosDB {
         gauged_api("get_block_info", || {
             self.error_if_ledger_pruned("NewBlockEvent", version)?;
 
-            let latest_li = self.get_latest_ledger_info()?;
-            let committed_version = latest_li.ledger_info().version();
-            ensure!(
-                version <= committed_version,
-                "Requested version {} > committed version {}",
-                version,
-                committed_version
-            );
-
-            if !self.skip_index_and_usage {
-                let (first_version, new_block_event) =
-                    self.event_store.get_block_metadata(version)?;
-
-                let last_version = self
-                    .event_store
-                    .lookup_event_after_version(&new_block_event_key(), version)?
-                    .map_or(committed_version, |(v, _, _)| v - 1);
-
-                return Ok((first_version, last_version, new_block_event));
-            }
-
-            let block_height = self
-                .ledger_db
-                .metadata_db()
-                .get_block_height_by_version(version)?;
-
-            self.get_block_info_by_height(block_height)
+            let (block_height, block_info) = self.get_raw_block_info_by_version(version)?;
+            self.to_api_block_info(block_height, block_info)
         })
     }
 
@@ -607,64 +582,8 @@ impl DbReader for AptosDB {
         block_height: u64,
     ) -> Result<(Version, Version, NewBlockEvent)> {
         gauged_api("get_block_info_by_height", || {
-            let latest_li = self.get_latest_ledger_info()?;
-            let committed_version = latest_li.ledger_info().version();
-
-            if !self.skip_index_and_usage {
-                let event_key = new_block_event_key();
-                let (first_version, new_block_event) = self.event_store.get_event_by_key(
-                    &event_key,
-                    block_height,
-                    committed_version,
-                )?;
-                let last_version = self
-                    .event_store
-                    .lookup_event_after_version(&event_key, first_version)?
-                    .map_or(committed_version, |(v, _, _)| v - 1);
-                return Ok((
-                    first_version,
-                    last_version,
-                    bcs::from_bytes(new_block_event.event_data())?,
-                ));
-            };
-
-            let first_version = self
-                .ledger_db
-                .metadata_db()
-                .get_block_info(block_height)?
-                .ok_or(anyhow!(
-                    "Block is not found at height {block_height}, maybe pruned?"
-                ))?
-                .first_version();
-            let last_version = self
-                .ledger_db
-                .metadata_db()
-                .get_block_info(block_height + 1)?
-                .map_or(committed_version, |block_info| {
-                    block_info.first_version() - 1
-                });
-
-            // TODO(grao): Consider return BlockInfo instead of NewBlockEvent.
-            let new_block_event = self
-                .ledger_db
-                .event_db()
-                .get_events_by_version(first_version)?
-                .into_iter()
-                .find(|event| {
-                    if let Some(key) = event.event_key() {
-                        if *key == new_block_event_key() {
-                            return true;
-                        }
-                    }
-                    false
-                })
-            .ok_or_else(|| anyhow!("Event for block_height {block_height} at version {first_version} is not found."))?;
-
-            Ok((
-                first_version,
-                last_version,
-                bcs::from_bytes(new_block_event.event_data())?,
-            ))
+            let block_info = self.get_raw_block_info_by_height(block_height)?;
+            self.to_api_block_info(block_height, block_info)
         })
     }
 
@@ -737,10 +656,10 @@ impl DbReader for AptosDB {
             .map_err(Into::into)
     }
 
-    fn get_state_leaf_count(&self, version: Version) -> Result<usize> {
-        gauged_api("get_state_leaf_count", || {
+    fn get_state_item_count(&self, version: Version) -> Result<usize> {
+        gauged_api("get_state_item_count", || {
             self.error_if_state_merkle_pruned("State merkle", version)?;
-            self.state_store.get_value_count(version)
+            self.ledger_db.metadata_db().get_usage(version).map(|usage| usage.items())
         })
     }
 
@@ -809,6 +728,19 @@ impl DbReader for AptosDB {
             self.state_store.get_usage(version)
         })
     }
+
+
+    fn get_event_by_version_and_index(
+        &self,
+        version: Version,
+        index: u64,
+    ) -> Result<ContractEvent> {
+        gauged_api("get_event_by_version_and_index", || {
+            self.error_if_ledger_pruned("Event", version)?;
+            self.event_store.get_event_by_version_and_index(version, index)
+        })
+
+    }
 }
 
 impl AptosDB {
@@ -888,7 +820,7 @@ impl AptosDB {
     ) -> Result<TransactionWithProof> {
         self.error_if_ledger_pruned("Transaction", version)?;
 
-        let mut proof = self
+        let proof = self
             .ledger_db
             .transaction_info_db()
             .get_transaction_info_with_proof(
@@ -897,10 +829,6 @@ impl AptosDB {
                 self.ledger_db.transaction_accumulator_db(),
             )?;
 
-        let aux_data_opt = self.get_transaction_auxiliary_data_by_version(version).ok();
-        proof.inject_auxiliary_error_data(aux_data_opt);
-
-
         let transaction = self.ledger_db.transaction_db().get_transaction(version)?;
 
         // If events were requested, also fetch those.
@@ -918,6 +846,7 @@ impl AptosDB {
         })
     }
 
+    /// TODO(bowu): Deprecate after internal index migration
     fn get_events_by_event_key(
         &self,
         event_key: &EventKey,
@@ -926,6 +855,7 @@ impl AptosDB {
         limit: u64,
         ledger_version: Version,
     ) -> Result<Vec<EventWithVersion>> {
+        ensure!(!self.state_kv_db.enabled_sharding(), "This API is deprecated for sharded DB");
         error_if_too_many_requested(limit, MAX_REQUEST_LIMIT)?;
         let get_latest = order == Order::Descending && start_seq_num == u64::max_value();
 
diff --git a/storage/aptosdb/src/db/include/aptosdb_testonly.rs b/storage/aptosdb/src/db/include/aptosdb_testonly.rs
index bf9a4e3196410..5e67968b5fa3b 100644
--- a/storage/aptosdb/src/db/include/aptosdb_testonly.rs
+++ b/storage/aptosdb/src/db/include/aptosdb_testonly.rs
@@ -2,9 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::state_store::buffered_state::BufferedState;
-use aptos_config::config::{
-    BUFFERED_STATE_TARGET_ITEMS, DEFAULT_MAX_NUM_NODES_PER_LRU_CACHE_SHARD,
-};
+use aptos_config::config::{ BUFFERED_STATE_TARGET_ITEMS_FOR_TEST, DEFAULT_MAX_NUM_NODES_PER_LRU_CACHE_SHARD};
 use aptos_infallible::Mutex;
 use aptos_types::state_store::create_empty_sharded_state_updates;
 use std::default::Default;
@@ -15,9 +13,10 @@ impl AptosDB {
         Self::new_without_pruner(
             db_root_path,
             false,
-            BUFFERED_STATE_TARGET_ITEMS,
+            BUFFERED_STATE_TARGET_ITEMS_FOR_TEST,
             DEFAULT_MAX_NUM_NODES_PER_LRU_CACHE_SHARD,
             false, /* indexer */
+            false,
         )
     }
 
@@ -36,25 +35,29 @@ impl AptosDB {
             NO_OP_STORAGE_PRUNER_CONFIG, /* pruner */
             db_config,
             false, /* indexer */
-            BUFFERED_STATE_TARGET_ITEMS,
+            BUFFERED_STATE_TARGET_ITEMS_FOR_TEST,
             max_node_cache,
+            None,
         )
         .expect("Unable to open AptosDB")
     }
 
     /// This opens db in non-readonly mode, without the pruner and cache.
     pub fn new_for_test_no_cache<P: AsRef<Path> + Clone>(db_root_path: P) -> Self {
-        Self::new_without_pruner(db_root_path, false, BUFFERED_STATE_TARGET_ITEMS, 0, false)
+        Self::new_without_pruner(db_root_path, false,
+                                 BUFFERED_STATE_TARGET_ITEMS_FOR_TEST,
+                                 0, false, false)
     }
 
     /// This opens db in non-readonly mode, without the pruner, and with the indexer
-    pub fn new_for_test_with_indexer<P: AsRef<Path> + Clone>(db_root_path: P) -> Self {
+    pub fn new_for_test_with_indexer<P: AsRef<Path> + Clone>(db_root_path: P, enable_sharding: bool) -> Self {
         Self::new_without_pruner(
             db_root_path,
             false,
-            BUFFERED_STATE_TARGET_ITEMS,
+            BUFFERED_STATE_TARGET_ITEMS_FOR_TEST,
             DEFAULT_MAX_NUM_NODES_PER_LRU_CACHE_SHARD,
             true, /* indexer */
+            enable_sharding,
         )
     }
 
@@ -69,6 +72,7 @@ impl AptosDB {
             buffered_state_target_items,
             DEFAULT_MAX_NUM_NODES_PER_LRU_CACHE_SHARD,
             false, /* indexer */
+            false,
         )
     }
 
@@ -77,9 +81,10 @@ impl AptosDB {
         Self::new_without_pruner(
             db_root_path,
             true,
-            BUFFERED_STATE_TARGET_ITEMS,
+            BUFFERED_STATE_TARGET_ITEMS_FOR_TEST,
             DEFAULT_MAX_NUM_NODES_PER_LRU_CACHE_SHARD,
             false, /* indexer */
+            false,
         )
     }
 
@@ -102,7 +107,7 @@ pub fn gather_state_updates_until_last_checkpoint(
         if latest_checkpoint_version >= first_version {
             let idx = (latest_checkpoint_version - first_version) as usize;
             assert!(
-                    txns_to_commit[idx].is_state_checkpoint(),
+                    txns_to_commit[idx].has_state_checkpoint_hash(),
                     "The new latest snapshot version passed in {:?} does not match with the last checkpoint version in txns_to_commit {:?}",
                     latest_checkpoint_version,
                     first_version + idx as u64
diff --git a/storage/aptosdb/src/db/include/aptosdb_writer.rs b/storage/aptosdb/src/db/include/aptosdb_writer.rs
index 36b0c06a0fc66..d599d858abf43 100644
--- a/storage/aptosdb/src/db/include/aptosdb_writer.rs
+++ b/storage/aptosdb/src/db/include/aptosdb_writer.rs
@@ -227,7 +227,7 @@ impl AptosDB {
             .current_version
             .map(|version| version + 1)
             .unwrap_or(0);
-        let num_transactions_in_db = self.get_latest_version().map_or(0, |v| v + 1);
+        let num_transactions_in_db = self.get_synced_version().map_or(0, |v| v + 1);
         ensure!(num_transactions_in_db == first_version && num_transactions_in_db == next_version_in_buffered_state,
             "The first version {} passed in, the next version in buffered state {} and the next version in db {} are inconsistent.",
             first_version,
@@ -355,14 +355,13 @@ impl AptosDB {
             sharded_state_cache,
             &ledger_metadata_batch,
             &sharded_state_kv_batches,
-            &state_kv_metadata_batch,
             // Always put in state value index for now.
             // TODO(grao): remove after APIs migrated off the DB to the indexer.
             self.state_store.state_kv_db.enabled_sharding(),
             skip_index_and_usage,
             txns_to_commit
                 .iter()
-                .rposition(|txn| txn.is_state_checkpoint()),
+                .rposition(|txn| txn.has_state_checkpoint_hash()),
         )?;
 
         // Write block index if event index is skipped.
@@ -475,6 +474,33 @@ impl AptosDB {
             .transaction_accumulator_db()
             .write_schemas(batch)?;
 
+        let batch = SchemaBatch::new();
+        let all_versions: Vec<_> =
+            (first_version..first_version + txns_to_commit.len() as u64).collect();
+        THREAD_MANAGER
+            .get_non_exe_cpu_pool()
+            .install(|| -> Result<()> {
+                let all_root_hashes = all_versions
+                    .into_par_iter()
+                    .with_min_len(64)
+                    .map(|version| {
+                        self.ledger_db
+                            .transaction_accumulator_db()
+                            .get_root_hash(version)
+                    })
+                    .collect::<Result<Vec<_>>>()?;
+                all_root_hashes
+                    .iter()
+                    .enumerate()
+                    .try_for_each(|(i, hash)| {
+                        let version = first_version + i as u64;
+                        batch.put::<TransactionAccumulatorRootHashSchema>(&version, hash)
+                    })?;
+                self.ledger_db
+                    .transaction_accumulator_db()
+                    .write_schemas(batch)
+            })?;
+
         Ok(root_hash)
     }
 
@@ -498,9 +524,8 @@ impl AptosDB {
                     &batch,
                 )?;
 
-
-            Ok(())
-        })?;
+                Ok(())
+            })?;
 
         let _timer = OTHER_TIMERS_SECONDS
             .with_label_values(&["commit_transaction_auxiliary_data___commit"])
diff --git a/storage/aptosdb/src/db/mod.rs b/storage/aptosdb/src/db/mod.rs
index 66b4697d2bd00..a669a9bde68bf 100644
--- a/storage/aptosdb/src/db/mod.rs
+++ b/storage/aptosdb/src/db/mod.rs
@@ -20,6 +20,7 @@ use crate::{
     schema::{
         block_info::BlockInfoSchema,
         db_metadata::{DbMetadataKey, DbMetadataSchema, DbMetadataValue},
+        transaction_accumulator_root_hash::TransactionAccumulatorRootHashSchema,
     },
     state_kv_db::StateKvDb,
     state_merkle_db::StateMerkleDb,
@@ -31,17 +32,17 @@ use aptos_config::config::{
     PrunerConfig, RocksdbConfig, RocksdbConfigs, StorageDirPaths, NO_OP_STORAGE_PRUNER_CONFIG,
 };
 use aptos_crypto::HashValue;
-use aptos_db_indexer::Indexer;
+use aptos_db_indexer::{db_indexer::InternalIndexerDB, Indexer};
 use aptos_experimental_runtimes::thread_manager::{optimal_min_len, THREAD_MANAGER};
 use aptos_logger::prelude::*;
 use aptos_metrics_core::TimerHelper;
 use aptos_resource_viewer::AptosValueAnnotator;
-use aptos_schemadb::{ReadOptions, SchemaBatch};
+use aptos_schemadb::SchemaBatch;
 use aptos_scratchpad::SparseMerkleTree;
 use aptos_storage_interface::{
-    cached_state_view::ShardedStateCache, db_anyhow as anyhow, db_ensure as ensure,
-    db_other_bail as bail, state_delta::StateDelta, AptosDbError, DbReader, DbWriter,
-    ExecutedTrees, Order, Result, StateSnapshotReceiver, MAX_REQUEST_LIMIT,
+    cached_state_view::ShardedStateCache, db_ensure as ensure, db_other_bail as bail,
+    state_delta::StateDelta, AptosDbError, DbReader, DbWriter, ExecutedTrees, Order, Result,
+    StateSnapshotReceiver, MAX_REQUEST_LIMIT,
 };
 use aptos_types::{
     account_address::AccountAddress,
@@ -123,6 +124,7 @@ impl AptosDB {
         enable_indexer: bool,
         buffered_state_target_items: usize,
         max_num_nodes_per_lru_cache_shard: usize,
+        internal_indexer_db: Option<InternalIndexerDB>,
     ) -> Result<Self> {
         Self::open_internal(
             &db_paths,
@@ -133,6 +135,7 @@ impl AptosDB {
             buffered_state_target_items,
             max_num_nodes_per_lru_cache_shard,
             false,
+            internal_indexer_db,
         )
     }
 
@@ -144,6 +147,7 @@ impl AptosDB {
         enable_indexer: bool,
         buffered_state_target_items: usize,
         max_num_nodes_per_lru_cache_shard: usize,
+        internal_indexer_db: Option<InternalIndexerDB>,
     ) -> Result<Self> {
         Self::open_internal(
             &db_paths,
@@ -154,6 +158,7 @@ impl AptosDB {
             buffered_state_target_items,
             max_num_nodes_per_lru_cache_shard,
             true,
+            internal_indexer_db,
         )
     }
 
diff --git a/storage/aptosdb/src/db/test_helper.rs b/storage/aptosdb/src/db/test_helper.rs
index 8bb61fa9c2cc1..570bdf8bd4433 100644
--- a/storage/aptosdb/src/db/test_helper.rs
+++ b/storage/aptosdb/src/db/test_helper.rs
@@ -85,7 +85,7 @@ pub(crate) fn update_store(
             .unwrap();
         let ledger_batch = SchemaBatch::new();
         let sharded_state_kv_batches = new_sharded_kv_schema_batch();
-        let state_kv_metadata_batch = SchemaBatch::new();
+        let schema_batch = SchemaBatch::new();
         store
             .put_value_sets(
                 vec![&sharded_value_state_set],
@@ -94,7 +94,6 @@ pub(crate) fn update_store(
                 None,
                 &ledger_batch,
                 &sharded_state_kv_batches,
-                &state_kv_metadata_batch,
                 /*put_state_value_indices=*/ false,
                 /*skip_usage=*/ false,
                 /*last_checkpoint_index=*/ None,
@@ -107,7 +106,7 @@ pub(crate) fn update_store(
             .unwrap();
         store
             .state_kv_db
-            .commit(version, state_kv_metadata_batch, sharded_state_kv_batches)
+            .commit(version, schema_batch, sharded_state_kv_batches)
             .unwrap();
     }
     root_hash
@@ -125,7 +124,7 @@ pub fn update_in_memory_state(state: &mut StateDelta, txns_to_commit: &[Transact
                     .insert(key.clone(), value.clone());
             });
         next_version += 1;
-        if txn_to_commit.is_state_checkpoint() {
+        if txn_to_commit.has_state_checkpoint_hash() {
             state.current = state
                 .current
                 .batch_update(
@@ -200,7 +199,7 @@ prop_compose! {
                 let event_root_hash = InMemoryEventAccumulator::from_leaves(&event_hashes).root_hash();
 
                 // calculate state checkpoint hash and this must be the last txn
-                let state_checkpoint_hash = if txn.is_state_checkpoint() {
+                let state_checkpoint_hash = if txn.has_state_checkpoint_hash() {
                     Some(state_checkpoint_root_hash)
                 } else {
                     None
@@ -321,7 +320,7 @@ fn gen_snapshot_version(
     let last_checkpoint = txns_to_commit
         .iter()
         .enumerate()
-        .filter(|(_idx, x)| x.is_state_checkpoint())
+        .filter(|(_idx, x)| x.has_state_checkpoint_hash())
         .last()
         .map(|(idx, _)| idx);
     if let Some(idx) = last_checkpoint {
@@ -463,7 +462,7 @@ fn verify_snapshots(
     for snapshot_version in snapshot_versions {
         let start = (cur_version - start_version) as usize;
         let end = (snapshot_version - start_version) as usize;
-        assert!(txns_to_commit[end].is_state_checkpoint());
+        assert!(txns_to_commit[end].has_state_checkpoint_hash());
         let expected_root_hash = db
             .ledger_db
             .transaction_info_db()
@@ -826,7 +825,7 @@ pub fn verify_committed_transactions(
             assert_eq!(state_value_in_db, *state_value);
         }
 
-        if !txn_to_commit.is_state_checkpoint() {
+        if !txn_to_commit.has_state_checkpoint_hash() {
             // Fetch and verify transaction itself.
             let txn = txn_to_commit
                 .transaction()
diff --git a/storage/aptosdb/src/db_debugger/common/mod.rs b/storage/aptosdb/src/db_debugger/common/mod.rs
index c5a60713a86cb..dc9a19e390e0c 100644
--- a/storage/aptosdb/src/db_debugger/common/mod.rs
+++ b/storage/aptosdb/src/db_debugger/common/mod.rs
@@ -1,7 +1,10 @@
 // Copyright © Aptos Foundation
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::{db_debugger::ShardingConfig, ledger_db::LedgerDb, state_merkle_db::StateMerkleDb};
+use crate::{
+    db_debugger::ShardingConfig, ledger_db::LedgerDb, state_kv_db::StateKvDb,
+    state_merkle_db::StateMerkleDb,
+};
 use aptos_config::config::{RocksdbConfigs, StorageDirPaths};
 use aptos_storage_interface::Result;
 use aptos_types::nibble::{nibble_path::NibblePath, Nibble};
@@ -34,6 +37,19 @@ impl DbDir {
         )
     }
 
+    pub fn open_state_kv_db(&self) -> Result<StateKvDb> {
+        let leger_db = self.open_ledger_db()?;
+        StateKvDb::new(
+            &StorageDirPaths::from_path(&self.db_dir),
+            RocksdbConfigs {
+                enable_storage_sharding: self.sharding_config.enable_storage_sharding,
+                ..Default::default()
+            },
+            true,
+            leger_db.metadata_db_arc(),
+        )
+    }
+
     pub fn open_ledger_db(&self) -> Result<LedgerDb> {
         LedgerDb::new(
             self.db_dir.as_path(),
diff --git a/storage/aptosdb/src/db_debugger/examine/print_db_versions.rs b/storage/aptosdb/src/db_debugger/examine/print_db_versions.rs
index e89e01a8fe194..8a1df87b26d3e 100644
--- a/storage/aptosdb/src/db_debugger/examine/print_db_versions.rs
+++ b/storage/aptosdb/src/db_debugger/examine/print_db_versions.rs
@@ -18,7 +18,7 @@ use crate::{
     AptosDB,
 };
 use aptos_config::config::{RocksdbConfigs, StorageDirPaths};
-use aptos_schemadb::{schema::Schema, ReadOptions, DB};
+use aptos_schemadb::{schema::Schema, DB};
 use aptos_storage_interface::Result;
 use aptos_types::transaction::Version;
 use clap::Parser;
@@ -49,7 +49,7 @@ impl Cmd {
 
         println!(
             "Overall Progress: {:?}",
-            ledger_db.metadata_db().get_latest_version()?
+            ledger_db.metadata_db().get_synced_version()?
         );
 
         println!(
@@ -133,7 +133,7 @@ impl Cmd {
         {
             let mut iter = ledger_db
                 .transaction_accumulator_db_raw()
-                .iter::<TransactionAccumulatorSchema>(ReadOptions::default())?;
+                .iter::<TransactionAccumulatorSchema>()?;
             iter.seek_to_last();
             let position = iter.next().transpose()?.map(|kv| kv.0);
             let num_frozen_nodes = position.map(|p| p.to_postorder_index() + 1);
@@ -150,7 +150,7 @@ impl Cmd {
     where
         S: Schema<Key = Version>,
     {
-        let mut iter = db.iter::<S>(ReadOptions::default())?;
+        let mut iter = db.iter::<S>()?;
         iter.seek_to_last();
         Ok(iter.next().transpose()?.map(|kv| kv.0))
     }
diff --git a/storage/aptosdb/src/db_debugger/mod.rs b/storage/aptosdb/src/db_debugger/mod.rs
index fbcb0e3b77fb5..5fb1a67276c05 100644
--- a/storage/aptosdb/src/db_debugger/mod.rs
+++ b/storage/aptosdb/src/db_debugger/mod.rs
@@ -5,6 +5,7 @@ pub mod checkpoint;
 mod common;
 mod examine;
 pub mod ledger;
+pub mod state_kv;
 pub mod state_tree;
 pub mod truncate;
 
@@ -22,6 +23,9 @@ pub enum Cmd {
     #[clap(subcommand)]
     StateTree(state_tree::Cmd),
 
+    #[clap(subcommand)]
+    StateKv(state_kv::Cmd),
+
     Checkpoint(checkpoint::Cmd),
 
     #[clap(subcommand)]
@@ -37,6 +41,7 @@ impl Cmd {
     pub fn run(self) -> Result<()> {
         match self {
             Cmd::StateTree(cmd) => cmd.run(),
+            Cmd::StateKv(cmd) => cmd.run(),
             Cmd::Checkpoint(cmd) => cmd.run(),
             Cmd::Ledger(cmd) => cmd.run(),
             Cmd::Truncate(cmd) => cmd.run(),
diff --git a/storage/aptosdb/src/db_debugger/state_kv/get_value.rs b/storage/aptosdb/src/db_debugger/state_kv/get_value.rs
new file mode 100644
index 0000000000000..574bb4429ecfe
--- /dev/null
+++ b/storage/aptosdb/src/db_debugger/state_kv/get_value.rs
@@ -0,0 +1,69 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::db_debugger::common::DbDir;
+use aptos_storage_interface::Result;
+use aptos_types::{state_store::state_key::StateKey, transaction::Version};
+use clap::Parser;
+use owo_colors::OwoColorize;
+
+#[derive(Parser)]
+#[clap(about = "Print state value by given key and version.")]
+pub struct Cmd {
+    #[clap(flatten)]
+    db_dir: DbDir,
+
+    #[clap(long)]
+    key_hex: String,
+
+    #[clap(long)]
+    version: Version,
+}
+
+impl Cmd {
+    pub fn run(self) -> Result<()> {
+        let key_vec = hex::decode(&self.key_hex).unwrap();
+        let key: StateKey = bcs::from_bytes(&key_vec)?;
+        println!(
+            "{}",
+            format!(
+                "* Get state value for key {:?} at version {}. \n",
+                key, self.version,
+            )
+            .yellow()
+        );
+
+        let ledger_db = self.db_dir.open_ledger_db()?;
+        let db = self.db_dir.open_state_kv_db()?;
+        let latest_version = ledger_db.metadata_db().get_synced_version()?;
+        println!("latest version: {latest_version}");
+        if self.version != Version::MAX && self.version > latest_version {
+            println!(
+                "{}",
+                format!(
+                    "warning: version {} is greater than latest version {}",
+                    self.version, latest_version
+                )
+                .red()
+            );
+        }
+
+        match db.get_state_value_with_version_by_version(&key, self.version)? {
+            None => {
+                println!("{}", "Value not found.".to_string().yellow());
+            },
+            Some((version, value)) => {
+                println!("{}", "Value found:".to_string().yellow());
+                println!("   version: {version}");
+                if value.bytes().len() > 1024 {
+                    println!("     value: {} bytes", value.bytes().len())
+                } else {
+                    println!("     value: {:?}", value.bytes())
+                }
+                println!("  metadata: {:?}", value.into_metadata());
+            },
+        }
+
+        Ok(())
+    }
+}
diff --git a/storage/aptosdb/src/db_debugger/state_kv/mod.rs b/storage/aptosdb/src/db_debugger/state_kv/mod.rs
new file mode 100644
index 0000000000000..bbe63f03d8349
--- /dev/null
+++ b/storage/aptosdb/src/db_debugger/state_kv/mod.rs
@@ -0,0 +1,22 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+mod get_value;
+mod scan_snapshot;
+
+use aptos_storage_interface::Result;
+
+#[derive(clap::Subcommand)]
+pub enum Cmd {
+    GetValue(get_value::Cmd),
+    ScanSnapshot(scan_snapshot::Cmd),
+}
+
+impl Cmd {
+    pub fn run(self) -> Result<()> {
+        match self {
+            Self::GetValue(cmd) => cmd.run(),
+            Self::ScanSnapshot(cmd) => cmd.run(),
+        }
+    }
+}
diff --git a/storage/aptosdb/src/db_debugger/state_kv/scan_snapshot.rs b/storage/aptosdb/src/db_debugger/state_kv/scan_snapshot.rs
new file mode 100644
index 0000000000000..9dfc4349b87c2
--- /dev/null
+++ b/storage/aptosdb/src/db_debugger/state_kv/scan_snapshot.rs
@@ -0,0 +1,191 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    db_debugger::common::DbDir,
+    schema::{state_value::StateValueSchema, state_value_by_key_hash::StateValueByKeyHashSchema},
+};
+use aptos_crypto::hash::CryptoHash;
+use aptos_jellyfish_merkle::iterator::JellyfishMerkleIterator;
+use aptos_schemadb::ReadOptions;
+use aptos_storage_interface::Result;
+use aptos_types::transaction::Version;
+use clap::Parser;
+use indicatif::{ProgressBar, ProgressStyle};
+use owo_colors::OwoColorize;
+use std::{
+    sync::{mpsc, Arc},
+    thread,
+    time::Instant,
+};
+
+#[derive(Parser)]
+#[clap(about = "Print state value.")]
+pub struct Cmd {
+    #[clap(flatten)]
+    db_dir: DbDir,
+
+    #[clap(long)]
+    version: Version,
+
+    #[clap(long, default_value = "32")]
+    concurrency: usize,
+
+    #[clap(long, default_value = "100")]
+    slow_threshold_ms: u128,
+}
+
+impl Cmd {
+    pub fn run(self) -> Result<()> {
+        println!(
+            "{}",
+            format!(
+                "* Scan all key values in snapshot at version {} in the key hash value order. \n",
+                self.version,
+            )
+            .yellow()
+        );
+
+        let state_kv_db = Arc::new(self.db_dir.open_state_kv_db()?);
+        let state_merkle_db = Arc::new(self.db_dir.open_state_merkle_db()?);
+        let total_leaves = state_merkle_db.get_leaf_count(self.version)?;
+        println!("total leaves: {}", total_leaves);
+
+        let (range_tx, range_rx) = crossbeam_channel::bounded::<(usize, usize)>(1024);
+        let (result_tx, result_rx) = mpsc::channel();
+
+        let workers: Vec<_> = (0..self.concurrency)
+            .map(|_| {
+                let range_rx = range_rx.clone();
+                let state_merkle_db = state_merkle_db.clone();
+                let state_kv_db = state_kv_db.clone();
+                let result_tx = result_tx.clone();
+                thread::spawn(move || {
+                    while let Ok((start, len)) = range_rx.recv() {
+                        let range_iter = JellyfishMerkleIterator::new_by_index(
+                            state_merkle_db.clone(),
+                            self.version,
+                            start,
+                        )
+                        .unwrap()
+                        .take(len);
+
+                        for (n, leaf_res) in range_iter.enumerate() {
+                            let (_key_hash, (key, key_version)) = leaf_res.unwrap();
+                            let index = start + n;
+
+                            let t = Instant::now();
+
+                            let mut read_opts = ReadOptions::default();
+                            // We want `None` if the state_key changes in iteration.
+                            read_opts.set_prefix_same_as_start(true);
+
+                            let enable_sharding = state_kv_db.enabled_sharding();
+
+                            let (value_version, value) = if enable_sharding {
+                                let mut iter = state_kv_db
+                                    .db_shard(key.get_shard_id())
+                                    .iter::<StateValueByKeyHashSchema>()
+                                    .unwrap();
+                                iter.seek(&(key.hash(), key_version)).unwrap();
+                                iter.next()
+                                    .transpose()
+                                    .unwrap()
+                                    .and_then(|((_, version), value_opt)| {
+                                        value_opt.map(|value| (version, value))
+                                    })
+                                    .expect("Value must exist.")
+                            } else {
+                                let mut iter = state_kv_db
+                                    .db_shard(key.get_shard_id())
+                                    .iter::<StateValueSchema>()
+                                    .unwrap();
+                                iter.seek(&(key.clone(), key_version)).unwrap();
+                                iter.next()
+                                    .transpose()
+                                    .unwrap()
+                                    .and_then(|((_, version), value_opt)| {
+                                        value_opt.map(|value| (version, value))
+                                    })
+                                    .expect("Value must exist.")
+                            };
+
+                            let elapsed = t.elapsed();
+                            result_tx
+                                .send((index, key, key_version, value_version, value, elapsed))
+                                .unwrap();
+                        }
+                    }
+                })
+            })
+            .collect();
+
+        let printer = thread::spawn(move || {
+            let start_time = Instant::now();
+            let bar = ProgressBar::new(total_leaves as u64);
+            bar.set_style(ProgressStyle::default_bar().template(
+                "[{elapsed_precise} {per_sec}] {bar:100.cyan/blue} {pos} / {len} {percent}% ETA {eta_precise}",
+            ));
+
+            for count in 0..total_leaves {
+                let (index, key, key_version, value_version, value, elapsed) =
+                    result_rx.recv().unwrap();
+                bar.inc(1);
+
+                if count % 1000000 == 0 {
+                    bar.println(format!(
+                        "{count} leaves scanned, total time: {:?}",
+                        start_time.elapsed()
+                    ));
+                }
+                if elapsed.as_millis() > self.slow_threshold_ms {
+                    let serialized = hex::encode(bcs::to_bytes(&key).unwrap());
+
+                    println!("{}", "- Slow fetch detected!".to_string().red());
+                    println!("         time: {:?}", elapsed);
+                    println!("   leaf index: {}", index);
+                    println!("    state key: {:?}\n", key);
+                    println!("   serialized: {}\n", serialized);
+                    println!(" leaf version: {}", key_version);
+                    println!("        Value: ");
+                    println!("            version: {value_version}");
+                    print!("              bytes: ({} bytes)", value.bytes().len());
+                    if value.bytes().len() > 1024 {
+                        println!();
+                    } else {
+                        println!("{:?}", value.bytes());
+                    }
+                    println!("           metadata: {:?}", value.into_metadata());
+                    println!(); // extra blank line, otherwise the progress bar overwrites last line.
+                }
+            }
+
+            bar.finish()
+        });
+
+        const BATCH_SIZE: usize = 100_000;
+        let mut start = 0;
+        while start <= total_leaves {
+            if total_leaves - start < BATCH_SIZE {
+                range_tx.send((start, total_leaves - start)).unwrap();
+                break;
+            } else {
+                range_tx.send((start, BATCH_SIZE)).unwrap();
+                start += BATCH_SIZE;
+            }
+        }
+
+        // signal workers to quit
+        drop(range_tx);
+
+        // wait for work to drain
+        printer.join().unwrap();
+        for worker in workers {
+            worker.join().unwrap();
+        }
+
+        println!("{}", "Scan complete.".to_string().yellow());
+
+        Ok(())
+    }
+}
diff --git a/storage/aptosdb/src/db_debugger/state_tree/get_leaf.rs b/storage/aptosdb/src/db_debugger/state_tree/get_leaf.rs
new file mode 100644
index 0000000000000..74c53e0ec2e96
--- /dev/null
+++ b/storage/aptosdb/src/db_debugger/state_tree/get_leaf.rs
@@ -0,0 +1,67 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{db_debugger::common::DbDir, schema::jellyfish_merkle_node::JellyfishMerkleNodeSchema};
+use aptos_crypto::hash::CryptoHash;
+use aptos_jellyfish_merkle::{iterator::JellyfishMerkleIterator, node_type::NodeKey};
+use aptos_storage_interface::{db_ensure as ensure, AptosDbError, Result};
+use aptos_types::transaction::Version;
+use clap::Parser;
+use owo_colors::OwoColorize;
+use std::sync::Arc;
+
+#[derive(Parser)]
+#[clap(about = "Print leaf info for given leaf index in a snapshot")]
+pub struct Cmd {
+    #[clap(flatten)]
+    db_dir: DbDir,
+
+    #[clap(long)]
+    before_version: Version,
+
+    #[clap(long)]
+    leaf_index: usize,
+}
+
+impl Cmd {
+    pub fn run(self) -> Result<()> {
+        ensure!(self.before_version > 0, "version must be greater than 0.");
+        println!(
+            "{}",
+            format!(
+                "* Get full path from the latest root strictly before version {} to leaf #{}. \n",
+                self.before_version, self.leaf_index,
+            )
+            .yellow()
+        );
+
+        let db = Arc::new(self.db_dir.open_state_merkle_db()?);
+
+        let root_version = {
+            let mut iter = db.metadata_db().rev_iter::<JellyfishMerkleNodeSchema>()?;
+            iter.seek_for_prev(&NodeKey::new_empty_path(self.before_version - 1))?;
+            iter.next().transpose()?.unwrap().0.version()
+        };
+        let total_leaves = db.get_leaf_count(root_version)?;
+        println!(
+            "{}",
+            format!("* Root version: {root_version}. Total leaves: {total_leaves}. \n").yellow()
+        );
+        ensure!(self.leaf_index < total_leaves, "leaf index out of range.");
+
+        let (key_hash, (state_key, leaf_version)) =
+            JellyfishMerkleIterator::new_by_index(db, root_version, self.leaf_index)?
+                .next()
+                .transpose()?
+                .unwrap();
+        assert_eq!(key_hash, state_key.hash());
+
+        let serialized = hex::encode(bcs::to_bytes(&state_key).unwrap());
+        println!("           state key: {:?}\n", state_key);
+        println!("          serialized: {}\n", serialized);
+        println!("             version: {:?}", leaf_version);
+        println!("    full nibble path: {:x}", key_hash);
+
+        Ok(())
+    }
+}
diff --git a/storage/aptosdb/src/db_debugger/state_tree/get_path.rs b/storage/aptosdb/src/db_debugger/state_tree/get_path.rs
index 52cbdf6d5548c..0e7e2b838545e 100644
--- a/storage/aptosdb/src/db_debugger/state_tree/get_path.rs
+++ b/storage/aptosdb/src/db_debugger/state_tree/get_path.rs
@@ -6,7 +6,7 @@ use crate::{
     schema::jellyfish_merkle_node::JellyfishMerkleNodeSchema,
     state_merkle_db::StateMerkleDb,
 };
-use aptos_crypto::HashValue;
+use aptos_crypto::{hash::CryptoHash, HashValue};
 use aptos_jellyfish_merkle::{
     node_type::{Child, Node, NodeKey, NodeType},
     TreeReader,
@@ -45,9 +45,7 @@ impl Cmd {
         );
 
         let db = self.db_dir.open_state_merkle_db()?;
-        let mut iter = db
-            .metadata_db()
-            .rev_iter::<JellyfishMerkleNodeSchema>(Default::default())?;
+        let mut iter = db.metadata_db().rev_iter::<JellyfishMerkleNodeSchema>()?;
 
         iter.seek_for_prev(&NodeKey::new_empty_path(self.before_version - 1))?;
         let mut version = iter.next().transpose()?.unwrap().0.version();
@@ -171,7 +169,12 @@ impl Cmd {
                 }
             },
             Some(Node::Leaf(leaf_node)) => {
-                println!("           state key: {:?}\n", leaf_node.value_index().0);
+                let state_key = leaf_node.value_index().0.clone();
+                assert_eq!(state_key.hash(), leaf_node.account_key());
+
+                let serialized = hex::encode(bcs::to_bytes(&state_key).unwrap());
+                println!("           state key: {:?}\n", state_key);
+                println!("          serialized: {}\n", serialized);
                 println!("    full nibble path: {:x}", leaf_node.account_key());
                 println!("          value hash: {:x}", leaf_node.value_hash());
             },
diff --git a/storage/aptosdb/src/db_debugger/state_tree/mod.rs b/storage/aptosdb/src/db_debugger/state_tree/mod.rs
index c2a870bcc8415..57f2a5f8bbb47 100644
--- a/storage/aptosdb/src/db_debugger/state_tree/mod.rs
+++ b/storage/aptosdb/src/db_debugger/state_tree/mod.rs
@@ -1,16 +1,17 @@
 // Copyright © Aptos Foundation
 // SPDX-License-Identifier: Apache-2.0
 
+mod get_leaf;
 mod get_path;
 mod get_snapshots;
 
 use aptos_storage_interface::Result;
 
-/// Tool supports listing snapshots before version and printing node in merkel tree with version and nibble path
 #[derive(clap::Subcommand)]
 pub enum Cmd {
     GetSnapshots(get_snapshots::Cmd),
     GetPath(get_path::Cmd),
+    GetLeaf(get_leaf::Cmd),
 }
 
 impl Cmd {
@@ -18,6 +19,7 @@ impl Cmd {
         match self {
             Self::GetSnapshots(cmd) => Ok(cmd.run()?),
             Self::GetPath(cmd) => cmd.run(),
+            Self::GetLeaf(cmd) => cmd.run(),
         }
     }
 }
diff --git a/storage/aptosdb/src/db_debugger/truncate/mod.rs b/storage/aptosdb/src/db_debugger/truncate/mod.rs
index 8150dabbe708b..6a779c0d11949 100644
--- a/storage/aptosdb/src/db_debugger/truncate/mod.rs
+++ b/storage/aptosdb/src/db_debugger/truncate/mod.rs
@@ -18,7 +18,7 @@ use crate::{
 };
 use aptos_config::config::{RocksdbConfigs, StorageDirPaths};
 use aptos_jellyfish_merkle::node_type::NodeKey;
-use aptos_schemadb::{ReadOptions, SchemaBatch, DB};
+use aptos_schemadb::{SchemaBatch, DB};
 use aptos_storage_interface::{db_ensure as ensure, AptosDbError, Result};
 use aptos_types::transaction::Version;
 use claims::assert_le;
@@ -88,7 +88,7 @@ impl Cmd {
         let state_kv_db = Arc::new(state_kv_db);
         let overall_version = ledger_db
             .metadata_db()
-            .get_latest_version()
+            .get_synced_version()
             .expect("Overall commit progress must exist.");
         let ledger_db_version = ledger_db
             .metadata_db()
@@ -193,8 +193,7 @@ impl Cmd {
                 if Self::root_exists_at_version(state_merkle_db, closest_version)? {
                     return Ok(Some(closest_version));
                 }
-                let mut iter =
-                    ledger_metadata_db.iter::<EpochByVersionSchema>(ReadOptions::default())?;
+                let mut iter = ledger_metadata_db.iter::<EpochByVersionSchema>()?;
                 iter.seek_for_prev(&version)?;
                 match iter.next().transpose()? {
                     Some((closest_epoch_version, _)) => {
@@ -232,7 +231,9 @@ mod test {
             epoch_by_version::EpochByVersionSchema, ledger_info::LedgerInfoSchema,
             stale_node_index::StaleNodeIndexSchema,
             stale_node_index_cross_epoch::StaleNodeIndexCrossEpochSchema,
-            stale_state_value_index::StaleStateValueIndexSchema, state_value::StateValueSchema,
+            stale_state_value_index::StaleStateValueIndexSchema,
+            stale_state_value_index_by_key_hash::StaleStateValueIndexByKeyHashSchema,
+            state_value::StateValueSchema, state_value_by_key_hash::StateValueByKeyHashSchema,
             transaction::TransactionSchema, transaction_accumulator::TransactionAccumulatorSchema,
             transaction_info::TransactionInfoSchema, version_data::VersionDataSchema,
             write_set::WriteSetSchema,
@@ -273,7 +274,7 @@ mod test {
                 version += txns_to_commit.len() as u64;
             }
 
-            let db_version = db.get_latest_version().unwrap();
+            let db_version = db.get_synced_version().unwrap();
             prop_assert_eq!(db_version, version - 1);
 
             drop(db);
@@ -292,7 +293,7 @@ mod test {
             cmd.run().unwrap();
 
             let db = if input.1 { AptosDB::new_for_test_with_sharding(&tmp_dir, DEFAULT_MAX_NUM_NODES_PER_LRU_CACHE_SHARD) } else { AptosDB::new_for_test(&tmp_dir) };
-            let db_version = db.get_latest_version().unwrap();
+            let db_version = db.get_synced_version().unwrap();
             prop_assert!(db_version <= target_version);
             target_version = db_version;
 
@@ -302,7 +303,7 @@ mod test {
             prop_assert_eq!(txn_list_with_proof.first_transaction_version, Some(0));
 
             let state_checkpoint_version = db.get_latest_state_checkpoint_version().unwrap().unwrap();
-            let state_leaf_count = db.get_state_leaf_count(state_checkpoint_version).unwrap();
+            let state_leaf_count = db.get_state_item_count(state_checkpoint_version).unwrap();
             let state_value_chunk_with_proof = db.get_state_value_chunk_with_proof(state_checkpoint_version, 0, state_leaf_count).unwrap();
             prop_assert_eq!(state_value_chunk_with_proof.first_index, 0);
             prop_assert_eq!(state_value_chunk_with_proof.last_index as usize, state_leaf_count - 1);
@@ -324,66 +325,86 @@ mod test {
             let ledger_metadata_db = ledger_db.metadata_db_arc();
 
             let num_frozen_nodes = num_frozen_nodes_in_accumulator(target_version + 1);
-            let mut iter = ledger_db.transaction_accumulator_db_raw().iter::<TransactionAccumulatorSchema>(ReadOptions::default()).unwrap();
+            let mut iter = ledger_db.transaction_accumulator_db_raw().iter::<TransactionAccumulatorSchema>().unwrap();
             iter.seek_to_last();
             let position = iter.next().transpose().unwrap().unwrap().0;
             prop_assert_eq!(position.to_postorder_index() + 1, num_frozen_nodes);
 
-            let mut iter = ledger_db.transaction_info_db_raw().iter::<TransactionInfoSchema>(ReadOptions::default()).unwrap();
+            let mut iter = ledger_db.transaction_info_db_raw().iter::<TransactionInfoSchema>().unwrap();
             iter.seek_to_last();
             prop_assert_eq!(iter.next().transpose().unwrap().unwrap().0, target_version);
 
-            let mut iter = ledger_db.transaction_db_raw().iter::<TransactionSchema>(ReadOptions::default()).unwrap();
+            let mut iter = ledger_db.transaction_db_raw().iter::<TransactionSchema>().unwrap();
             iter.seek_to_last();
             prop_assert_eq!(iter.next().transpose().unwrap().unwrap().0, target_version);
 
-            let mut iter = ledger_metadata_db.iter::<VersionDataSchema>(ReadOptions::default()).unwrap();
+            let mut iter = ledger_metadata_db.iter::<VersionDataSchema>().unwrap();
             iter.seek_to_last();
             prop_assert!(iter.next().transpose().unwrap().unwrap().0 <= target_version);
 
-            let mut iter = ledger_db.write_set_db_raw().iter::<WriteSetSchema>(ReadOptions::default()).unwrap();
+            let mut iter = ledger_db.write_set_db_raw().iter::<WriteSetSchema>().unwrap();
             iter.seek_to_last();
             prop_assert_eq!(iter.next().transpose().unwrap().unwrap().0, target_version);
 
-            let mut iter = ledger_metadata_db.iter::<EpochByVersionSchema>(ReadOptions::default()).unwrap();
+            let mut iter = ledger_metadata_db.iter::<EpochByVersionSchema>().unwrap();
             iter.seek_to_last();
             let (version, epoch) = iter.next().transpose().unwrap().unwrap();
             prop_assert!(version <= target_version);
 
-            let mut iter = ledger_metadata_db.iter::<LedgerInfoSchema>(ReadOptions::default()).unwrap();
+            let mut iter = ledger_metadata_db.iter::<LedgerInfoSchema>().unwrap();
             iter.seek_to_last();
             prop_assert_eq!(iter.next().transpose().unwrap().unwrap().0, epoch);
 
+            if sharding_config.enable_storage_sharding {
+                let mut iter = state_kv_db.metadata_db().iter::<StateValueByKeyHashSchema>().unwrap();
+                iter.seek_to_first();
+                for item in iter {
+                    let ((_, version), _) = item.unwrap();
+                    prop_assert!(version <= target_version);
+                }
 
-            let mut iter = state_kv_db.metadata_db().iter::<StateValueSchema>(ReadOptions::default()).unwrap();
-            iter.seek_to_first();
-            for item in iter {
-                let ((_, version), _) = item.unwrap();
-                prop_assert!(version <= target_version);
-            }
+                let mut iter = state_kv_db.metadata_db().iter::<StaleStateValueIndexByKeyHashSchema>().unwrap();
+                iter.seek_to_first();
+                for item in iter {
+                    let version = item.unwrap().0.stale_since_version;
+                    prop_assert!(version <= target_version);
+                }
 
-            let mut iter = state_kv_db.metadata_db().iter::<StaleStateValueIndexSchema>(ReadOptions::default()).unwrap();
+            } else {
+                let mut iter = state_kv_db.metadata_db().iter::<StateValueSchema>().unwrap();
+                iter.seek_to_first();
+                for item in iter {
+                    let ((_, version), _) = item.unwrap();
+                    prop_assert!(version <= target_version);
+                }
+
+                let mut iter = state_kv_db.metadata_db().iter::<StaleStateValueIndexSchema>().unwrap();
             iter.seek_to_first();
             for item in iter {
                 let version = item.unwrap().0.stale_since_version;
                 prop_assert!(version <= target_version);
             }
+            }
+
+
+
+
 
-            let mut iter = state_merkle_db.metadata_db().iter::<StaleNodeIndexSchema>(ReadOptions::default()).unwrap();
+            let mut iter = state_merkle_db.metadata_db().iter::<StaleNodeIndexSchema>().unwrap();
             iter.seek_to_first();
             for item in iter {
                 let version = item.unwrap().0.stale_since_version;
                 prop_assert!(version <= target_version);
             }
 
-            let mut iter = state_merkle_db.metadata_db().iter::<StaleNodeIndexCrossEpochSchema>(ReadOptions::default()).unwrap();
+            let mut iter = state_merkle_db.metadata_db().iter::<StaleNodeIndexCrossEpochSchema>().unwrap();
             iter.seek_to_first();
             for item in iter {
                 let version = item.unwrap().0.stale_since_version;
                 prop_assert!(version <= target_version);
             }
 
-            let mut iter = state_merkle_db.metadata_db().iter::<JellyfishMerkleNodeSchema>(ReadOptions::default()).unwrap();
+            let mut iter = state_merkle_db.metadata_db().iter::<JellyfishMerkleNodeSchema>().unwrap();
             iter.seek_to_first();
             for item in iter {
                 let version = item.unwrap().0.version();
@@ -393,34 +414,34 @@ mod test {
             if sharding_config.enable_storage_sharding {
                 let state_merkle_db = Arc::new(state_merkle_db);
                 for i in 0..NUM_STATE_SHARDS as u8 {
-                    let mut kv_shard_iter = state_kv_db.db_shard(i).iter::<StateValueSchema>(ReadOptions::default()).unwrap();
+                    let mut kv_shard_iter = state_kv_db.db_shard(i).iter::<StateValueByKeyHashSchema>().unwrap();
                     kv_shard_iter.seek_to_first();
                     for item in kv_shard_iter {
                         let ((_, version), _) = item.unwrap();
                         prop_assert!(version <= target_version);
                     }
 
-                    let value_index_shard_iter = state_kv_db.db_shard(i).iter::<StaleStateValueIndexSchema>(ReadOptions::default()).unwrap();
+                    let value_index_shard_iter = state_kv_db.db_shard(i).iter::<StaleStateValueIndexByKeyHashSchema>().unwrap();
                     for item in value_index_shard_iter {
                         let version = item.unwrap().0.stale_since_version;
                         prop_assert!(version <= target_version);
                     }
 
-                    let mut stale_node_ind_iter = state_merkle_db.db_shard(i).iter::<StaleNodeIndexSchema>(ReadOptions::default()).unwrap();
+                    let mut stale_node_ind_iter = state_merkle_db.db_shard(i).iter::<StaleNodeIndexSchema>().unwrap();
                     stale_node_ind_iter.seek_to_first();
                     for item in stale_node_ind_iter {
                         let version = item.unwrap().0.stale_since_version;
                         prop_assert!(version <= target_version);
                     }
 
-                    let mut jelly_iter = state_merkle_db.db_shard(i).iter::<JellyfishMerkleNodeSchema>(ReadOptions::default()).unwrap();
+                    let mut jelly_iter = state_merkle_db.db_shard(i).iter::<JellyfishMerkleNodeSchema>().unwrap();
                     jelly_iter.seek_to_first();
                     for item in jelly_iter {
                         let version = item.unwrap().0.version();
                         prop_assert!(version <= target_version);
                     }
 
-                    let mut cross_iter = state_merkle_db.db_shard(i).iter::<StaleNodeIndexCrossEpochSchema>(ReadOptions::default()).unwrap();
+                    let mut cross_iter = state_merkle_db.db_shard(i).iter::<StaleNodeIndexCrossEpochSchema>().unwrap();
                     cross_iter.seek_to_first();
                     for item in cross_iter {
                         let version = item.unwrap().0.stale_since_version;
diff --git a/storage/aptosdb/src/db_options.rs b/storage/aptosdb/src/db_options.rs
index ff9e5b0fdd16a..e41de403b30b3 100644
--- a/storage/aptosdb/src/db_options.rs
+++ b/storage/aptosdb/src/db_options.rs
@@ -26,6 +26,7 @@ pub(super) fn ledger_db_column_families() -> Vec<ColumnFamilyName> {
         STATE_VALUE_CF_NAME,
         TRANSACTION_CF_NAME,
         TRANSACTION_ACCUMULATOR_CF_NAME,
+        TRANSACTION_ACCUMULATOR_HASH_CF_NAME,
         TRANSACTION_AUXILIARY_DATA_CF_NAME,
         TRANSACTION_BY_ACCOUNT_CF_NAME,
         TRANSACTION_BY_HASH_CF_NAME,
@@ -52,6 +53,7 @@ pub(super) fn transaction_accumulator_db_column_families() -> Vec<ColumnFamilyNa
         /* empty cf */ DEFAULT_COLUMN_FAMILY_NAME,
         DB_METADATA_CF_NAME,
         TRANSACTION_ACCUMULATOR_CF_NAME,
+        TRANSACTION_ACCUMULATOR_HASH_CF_NAME,
     ]
 }
 
@@ -125,6 +127,16 @@ pub(super) fn state_kv_db_column_families() -> Vec<ColumnFamilyName> {
     ]
 }
 
+pub(super) fn state_kv_db_new_key_column_families() -> Vec<ColumnFamilyName> {
+    vec![
+        /* empty cf */ DEFAULT_COLUMN_FAMILY_NAME,
+        DB_METADATA_CF_NAME,
+        STALE_STATE_VALUE_INDEX_BY_KEY_HASH_CF_NAME,
+        STATE_VALUE_BY_KEY_HASH_CF_NAME,
+        STATE_VALUE_INDEX_CF_NAME, // we still need this cf before deleting all the write callsites
+    ]
+}
+
 fn gen_cfds<F>(
     rocksdb_config: &RocksdbConfig,
     cfs: Vec<ColumnFamilyName>,
@@ -150,7 +162,7 @@ where
 }
 
 fn with_state_key_extractor_processor(cf_name: ColumnFamilyName, cf_opts: &mut Options) {
-    if cf_name == STATE_VALUE_CF_NAME {
+    if cf_name == STATE_VALUE_CF_NAME || cf_name == STATE_VALUE_BY_KEY_HASH_CF_NAME {
         let prefix_extractor =
             SliceTransform::create("state_key_extractor", state_key_extractor, None);
         cf_opts.set_prefix_extractor(prefix_extractor);
@@ -209,8 +221,15 @@ pub(super) fn gen_state_merkle_cfds(rocksdb_config: &RocksdbConfig) -> Vec<Colum
     gen_cfds(rocksdb_config, cfs, |_, _| {})
 }
 
-pub(super) fn gen_state_kv_cfds(rocksdb_config: &RocksdbConfig) -> Vec<ColumnFamilyDescriptor> {
-    let cfs = state_kv_db_column_families();
+pub(super) fn gen_state_kv_cfds(
+    rocksdb_config: &RocksdbConfig,
+    enable_sharding: bool,
+) -> Vec<ColumnFamilyDescriptor> {
+    let cfs = if enable_sharding {
+        state_kv_db_new_key_column_families()
+    } else {
+        state_kv_db_column_families()
+    };
     gen_cfds(rocksdb_config, cfs, with_state_key_extractor_processor)
 }
 
diff --git a/storage/aptosdb/src/event_store/mod.rs b/storage/aptosdb/src/event_store/mod.rs
index 430ef731076ba..1ff4d31c330d4 100644
--- a/storage/aptosdb/src/event_store/mod.rs
+++ b/storage/aptosdb/src/event_store/mod.rs
@@ -8,10 +8,7 @@
 
 use super::AptosDB;
 use crate::{
-    schema::{
-        event::EventSchema, event_accumulator::EventAccumulatorSchema,
-        event_by_key::EventByKeySchema, event_by_version::EventByVersionSchema,
-    },
+    schema::{event::EventSchema, event_accumulator::EventAccumulatorSchema},
     utils::iterators::EventsByVersionIter,
 };
 use anyhow::anyhow;
@@ -20,6 +17,9 @@ use aptos_crypto::{
     hash::{CryptoHash, EventAccumulatorHasher},
     HashValue,
 };
+use aptos_db_indexer_schemas::schema::{
+    event_by_key::EventByKeySchema, event_by_version::EventByVersionSchema,
+};
 use aptos_schemadb::{iterator::SchemaIterator, schema::ValueCodec, ReadOptions, SchemaBatch, DB};
 use aptos_storage_interface::{db_ensure as ensure, db_other_bail, AptosDbError, Result};
 use aptos_types::{
@@ -87,9 +87,7 @@ impl EventStore {
         ledger_version: Version,
         event_key: &EventKey,
     ) -> Result<Option<u64>> {
-        let mut iter = self
-            .event_db
-            .iter::<EventByVersionSchema>(ReadOptions::default())?;
+        let mut iter = self.event_db.iter::<EventByVersionSchema>()?;
         iter.seek_for_prev(&(*event_key, ledger_version, u64::max_value()));
 
         Ok(iter.next().transpose()?.and_then(
@@ -127,9 +125,7 @@ impl EventStore {
             u64,     // index among events for the same transaction
         )>,
     > {
-        let mut iter = self
-            .event_db
-            .iter::<EventByKeySchema>(ReadOptions::default())?;
+        let mut iter = self.event_db.iter::<EventByKeySchema>()?;
         iter.seek(&(*event_key, start_seq_num))?;
 
         let mut result = Vec::new();
@@ -183,9 +179,7 @@ impl EventStore {
             u64,     // sequence number
         )>,
     > {
-        let mut iter = self
-            .event_db
-            .iter::<EventByVersionSchema>(ReadOptions::default())?;
+        let mut iter = self.event_db.iter::<EventByVersionSchema>()?;
         iter.seek_for_prev(&(*event_key, version, u64::MAX))?;
 
         match iter.next().transpose()? {
@@ -211,9 +205,7 @@ impl EventStore {
             u64,     // sequence number
         )>,
     > {
-        let mut iter = self
-            .event_db
-            .iter::<EventByVersionSchema>(ReadOptions::default())?;
+        let mut iter = self.event_db.iter::<EventByVersionSchema>()?;
         iter.seek(&(*event_key, version, 0))?;
 
         match iter.next().transpose()? {
@@ -239,9 +231,7 @@ impl EventStore {
             u64,     // sequence number
         )>,
     > {
-        let mut iter = self
-            .event_db
-            .iter::<EventByVersionSchema>(ReadOptions::default())?;
+        let mut iter = self.event_db.iter::<EventByVersionSchema>()?;
         iter.seek(&(*event_key, version + 1, 0))?;
 
         match iter.next().transpose()? {
@@ -256,16 +246,6 @@ impl EventStore {
         }
     }
 
-    pub fn get_block_metadata(&self, version: Version) -> Result<(Version, NewBlockEvent)> {
-        let (first_version, event_index, seq_num) = self
-            .lookup_event_before_or_at_version(&new_block_event_key(), version)?
-            .ok_or_else(|| AptosDbError::NotFound("NewBlockEvent".to_string()))?;
-
-        let new_block_event = self.get_event_by_version_and_index(first_version, event_index)?;
-        let payload = bcs::from_bytes(new_block_event.event_data())?;
-        Ok((first_version, payload))
-    }
-
     /// Finds the first event sequence number in a specified stream on which `comp` returns false.
     /// (assuming the whole stream is partitioned by `comp`)
     fn search_for_event_lower_bound<C>(
@@ -351,9 +331,7 @@ impl EventStore {
         end: Version,
         db_batch: &SchemaBatch,
     ) -> anyhow::Result<()> {
-        let mut iter = self
-            .event_db
-            .iter::<EventAccumulatorSchema>(Default::default())?;
+        let mut iter = self.event_db.iter::<EventAccumulatorSchema>()?;
         iter.seek(&(begin, Position::from_inorder_index(0)))?;
         while let Some(((version, position), _)) = iter.next().transpose()? {
             if version >= end {
diff --git a/storage/aptosdb/src/fast_sync_storage_wrapper.rs b/storage/aptosdb/src/fast_sync_storage_wrapper.rs
index d29bf307ef25e..7204e25f12654 100644
--- a/storage/aptosdb/src/fast_sync_storage_wrapper.rs
+++ b/storage/aptosdb/src/fast_sync_storage_wrapper.rs
@@ -5,6 +5,7 @@ use crate::AptosDB;
 use anyhow::anyhow;
 use aptos_config::config::{NodeConfig, StorageDirPaths};
 use aptos_crypto::HashValue;
+use aptos_db_indexer::db_indexer::InternalIndexerDB;
 use aptos_infallible::RwLock;
 use aptos_storage_interface::{
     cached_state_view::ShardedStateCache, state_delta::StateDelta, DbReader, DbWriter, Result,
@@ -40,7 +41,10 @@ pub struct FastSyncStorageWrapper {
 impl FastSyncStorageWrapper {
     /// If the db is empty and configured to do fast sync, we return a FastSyncStorageWrapper
     /// Otherwise, we returns AptosDB directly and the FastSyncStorageWrapper is None
-    pub fn initialize_dbs(config: &NodeConfig) -> Result<Either<AptosDB, Self>> {
+    pub fn initialize_dbs(
+        config: &NodeConfig,
+        internal_indexer_db: Option<InternalIndexerDB>,
+    ) -> Result<Either<AptosDB, Self>> {
         let db_main = AptosDB::open(
             config.storage.get_dir_paths(),
             /*readonly=*/ false,
@@ -49,6 +53,7 @@ impl FastSyncStorageWrapper {
             config.storage.enable_indexer,
             config.storage.buffered_state_target_items,
             config.storage.max_num_nodes_per_lru_cache_shard,
+            internal_indexer_db,
         )
         .map_err(|err| anyhow!("fast sync DB failed to open {}", err))?;
 
@@ -62,7 +67,7 @@ impl FastSyncStorageWrapper {
             && (db_main
                 .ledger_db
                 .metadata_db()
-                .get_latest_version()
+                .get_synced_version()
                 .map_or(0, |v| v)
                 == 0)
         {
@@ -75,6 +80,7 @@ impl FastSyncStorageWrapper {
                 config.storage.enable_indexer,
                 config.storage.buffered_state_target_items,
                 config.storage.max_num_nodes_per_lru_cache_shard,
+                None,
             )
             .map_err(|err| anyhow!("Secondary DB failed to open {}", err))?;
 
diff --git a/storage/aptosdb/src/ledger_db/event_db.rs b/storage/aptosdb/src/ledger_db/event_db.rs
index dc5a478260970..235df9b29a1ca 100644
--- a/storage/aptosdb/src/ledger_db/event_db.rs
+++ b/storage/aptosdb/src/ledger_db/event_db.rs
@@ -7,8 +7,6 @@ use crate::{
         db_metadata::{DbMetadataKey, DbMetadataSchema, DbMetadataValue},
         event::EventSchema,
         event_accumulator::EventAccumulatorSchema,
-        event_by_key::EventByKeySchema,
-        event_by_version::EventByVersionSchema,
     },
     utils::iterators::EventsByVersionIter,
 };
@@ -17,7 +15,10 @@ use aptos_crypto::{
     hash::{CryptoHash, EventAccumulatorHasher},
     HashValue,
 };
-use aptos_schemadb::{ReadOptions, SchemaBatch, DB};
+use aptos_db_indexer_schemas::schema::{
+    event_by_key::EventByKeySchema, event_by_version::EventByVersionSchema,
+};
+use aptos_schemadb::{SchemaBatch, DB};
 use aptos_storage_interface::{AptosDbError, Result};
 use aptos_types::{
     account_config::new_block_event_key, contract_event::ContractEvent, transaction::Version,
@@ -63,7 +64,7 @@ impl EventDb {
     pub(crate) fn get_events_by_version(&self, version: Version) -> Result<Vec<ContractEvent>> {
         let mut events = vec![];
 
-        let mut iter = self.db.iter::<EventSchema>(ReadOptions::default())?;
+        let mut iter = self.db.iter::<EventSchema>()?;
         // Grab the first event and then iterate until we get all events for this version.
         iter.seek(&version)?;
         while let Some(((ver, _index), event)) = iter.next().transpose()? {
@@ -98,7 +99,7 @@ impl EventDb {
         start_version: Version,
         num_versions: usize,
     ) -> Result<EventsByVersionIter> {
-        let mut iter = self.db.iter::<EventSchema>(Default::default())?;
+        let mut iter = self.db.iter::<EventSchema>()?;
         iter.seek(&start_version)?;
 
         Ok(EventsByVersionIter::new(
@@ -112,7 +113,7 @@ impl EventDb {
 
     /// Returns the version of the latest event committed in the event db.
     pub(crate) fn latest_version(&self) -> Result<Option<Version>> {
-        let mut iter = self.db.iter::<EventSchema>(ReadOptions::default())?;
+        let mut iter = self.db.iter::<EventSchema>()?;
         iter.seek_to_last();
         if let Some(((version, _), _)) = iter.next().transpose()? {
             Ok(Some(version))
@@ -189,17 +190,21 @@ impl EventDb {
         start: Version,
         end: Version,
         db_batch: &SchemaBatch,
+        indices_batch: Option<&SchemaBatch>,
     ) -> anyhow::Result<()> {
         let mut current_version = start;
+
         for events in self.get_events_by_version_iter(start, (end - start) as usize)? {
             for (idx, event) in (events?).into_iter().enumerate() {
                 if let ContractEvent::V1(v1) = event {
-                    db_batch.delete::<EventByVersionSchema>(&(
-                        *v1.key(),
-                        current_version,
-                        v1.sequence_number(),
-                    ))?;
-                    db_batch.delete::<EventByKeySchema>(&(*v1.key(), v1.sequence_number()))?;
+                    if let Some(batch) = indices_batch {
+                        batch.delete::<EventByKeySchema>(&(*v1.key(), v1.sequence_number()))?;
+                        batch.delete::<EventByVersionSchema>(&(
+                            *v1.key(),
+                            current_version,
+                            v1.sequence_number(),
+                        ))?;
+                    }
                 }
                 db_batch.delete::<EventSchema>(&(current_version, idx as u64))?;
             }
diff --git a/storage/aptosdb/src/ledger_db/ledger_metadata_db.rs b/storage/aptosdb/src/ledger_db/ledger_metadata_db.rs
index 70373e44aa160..c5d2857718f6f 100644
--- a/storage/aptosdb/src/ledger_db/ledger_metadata_db.rs
+++ b/storage/aptosdb/src/ledger_db/ledger_metadata_db.rs
@@ -13,11 +13,8 @@ use crate::{
     utils::{get_progress, iterators::EpochEndingLedgerInfoIter},
 };
 use anyhow::anyhow;
-use aptos_schemadb::{ReadOptions, SchemaBatch, DB};
-use aptos_storage_interface::{
-    block_info::{BlockInfo, BlockInfoV0},
-    db_ensure as ensure, AptosDbError, Result,
-};
+use aptos_schemadb::{SchemaBatch, DB};
+use aptos_storage_interface::{block_info::BlockInfo, db_ensure as ensure, AptosDbError, Result};
 use aptos_types::{
     account_config::NewBlockEvent, block_info::BlockHeight, contract_event::ContractEvent,
     epoch_state::EpochState, ledger_info::LedgerInfoWithSignatures,
@@ -27,7 +24,7 @@ use arc_swap::ArcSwap;
 use std::{ops::Deref, path::Path, sync::Arc};
 
 fn get_latest_ledger_info_in_db_impl(db: &DB) -> Result<Option<LedgerInfoWithSignatures>> {
-    let mut iter = db.iter::<LedgerInfoSchema>(ReadOptions::default())?;
+    let mut iter = db.iter::<LedgerInfoSchema>()?;
     iter.seek_to_last();
     Ok(iter.next().transpose()?.map(|(_, v)| v))
 }
@@ -76,7 +73,7 @@ impl LedgerMetadataDb {
         self.db.write_schemas(batch)
     }
 
-    pub(crate) fn get_latest_version(&self) -> Result<Version> {
+    pub(crate) fn get_synced_version(&self) -> Result<Version> {
         get_progress(&self.db, &DbMetadataKey::OverallCommitProgress)?.ok_or(
             AptosDbError::NotFound("No OverallCommitProgress in db.".to_string()),
         )
@@ -129,7 +126,7 @@ impl LedgerMetadataDb {
         start_epoch: u64,
         end_epoch: u64,
     ) -> Result<EpochEndingLedgerInfoIter> {
-        let mut iter = self.db.iter::<LedgerInfoSchema>(ReadOptions::default())?;
+        let mut iter = self.db.iter::<LedgerInfoSchema>()?;
         iter.seek(&start_epoch)?;
         Ok(EpochEndingLedgerInfoIter::new(iter, start_epoch, end_epoch))
     }
@@ -205,9 +202,7 @@ impl LedgerMetadataDb {
 impl LedgerMetadataDb {
     /// Returns the epoch at the given version.
     pub(crate) fn get_epoch(&self, version: Version) -> Result<u64> {
-        let mut iter = self
-            .db
-            .iter::<EpochByVersionSchema>(ReadOptions::default())?;
+        let mut iter = self.db.iter::<EpochByVersionSchema>()?;
         // Search for the end of the previous epoch.
         iter.seek_for_prev(&version)?;
         let (epoch_end_version, epoch) = match iter.next().transpose()? {
@@ -257,9 +252,7 @@ impl LedgerMetadataDb {
         }
         let prev_version = version - 1;
 
-        let mut iter = self
-            .db
-            .iter::<EpochByVersionSchema>(ReadOptions::default())?;
+        let mut iter = self.db.iter::<EpochByVersionSchema>()?;
         // Search for the end of the previous epoch.
         iter.seek_for_prev(&prev_version)?;
         iter.next().transpose()
@@ -275,9 +268,7 @@ impl LedgerMetadataDb {
 
     /// Returns the corresponding block height for a given version.
     pub(crate) fn get_block_height_by_version(&self, version: Version) -> Result<u64> {
-        let mut iter = self
-            .db
-            .iter::<BlockByVersionSchema>(ReadOptions::default())?;
+        let mut iter = self.db.iter::<BlockByVersionSchema>()?;
 
         iter.seek_for_prev(&version)?;
         let (_, block_height) = iter.next().transpose()?.ok_or(anyhow!(
@@ -291,9 +282,7 @@ impl LedgerMetadataDb {
         &self,
         version: Version,
     ) -> Result<(Version, BlockHeight)> {
-        let mut iter = self
-            .db
-            .iter::<BlockByVersionSchema>(ReadOptions::default())?;
+        let mut iter = self.db.iter::<BlockByVersionSchema>()?;
         iter.seek(&version)?;
         let (block_version, block_height) = iter
             .next()
@@ -310,19 +299,7 @@ impl LedgerMetadataDb {
     ) -> Result<()> {
         let new_block_event = NewBlockEvent::try_from_bytes(event.event_data())?;
         let block_height = new_block_event.height();
-        let id = new_block_event.hash()?;
-        let epoch = new_block_event.epoch();
-        let round = new_block_event.round();
-        let proposer = new_block_event.proposer();
-        let block_timestamp_usecs = new_block_event.proposed_time();
-        let block_info = BlockInfo::V0(BlockInfoV0::new(
-            id,
-            epoch,
-            round,
-            proposer,
-            block_timestamp_usecs,
-            version,
-        ));
+        let block_info = BlockInfo::from_new_block_event(version, &new_block_event);
         batch.put::<BlockInfoSchema>(&block_height, &block_info)?;
         batch.put::<BlockByVersionSchema>(&version, &block_height)?;
 
@@ -350,7 +327,7 @@ impl LedgerMetadataDb {
         &self,
         version: Version,
     ) -> Result<(Version, StateStorageUsage)> {
-        let mut iter = self.db.iter::<VersionDataSchema>(ReadOptions::default())?;
+        let mut iter = self.db.iter::<VersionDataSchema>()?;
         iter.seek_for_prev(&version)?;
         match iter.next().transpose()? {
             Some((previous_version, data)) => {
diff --git a/storage/aptosdb/src/ledger_db/mod.rs b/storage/aptosdb/src/ledger_db/mod.rs
index 7cb8b2288b873..e0d3119ecfc0d 100644
--- a/storage/aptosdb/src/ledger_db/mod.rs
+++ b/storage/aptosdb/src/ledger_db/mod.rs
@@ -21,6 +21,7 @@ use crate::{
         transaction_auxiliary_data_db::TransactionAuxiliaryDataDb, transaction_db::TransactionDb,
         transaction_info_db::TransactionInfoDb, write_set_db::WriteSetDb,
     },
+    schema::db_metadata::{DbMetadataKey, DbMetadataSchema},
 };
 use aptos_config::config::{RocksdbConfig, RocksdbConfigs};
 use aptos_logger::prelude::info;
@@ -103,6 +104,7 @@ pub struct LedgerDb {
     transaction_db: TransactionDb,
     transaction_info_db: TransactionInfoDb,
     write_set_db: WriteSetDb,
+    enable_storage_sharding: bool,
 }
 
 impl LedgerDb {
@@ -147,6 +149,7 @@ impl LedgerDb {
                 transaction_db: TransactionDb::new(Arc::clone(&ledger_metadata_db)),
                 transaction_info_db: TransactionInfoDb::new(Arc::clone(&ledger_metadata_db)),
                 write_set_db: WriteSetDb::new(Arc::clone(&ledger_metadata_db)),
+                enable_storage_sharding: false,
             });
         }
 
@@ -206,9 +209,25 @@ impl LedgerDb {
             transaction_db,
             transaction_info_db,
             write_set_db,
+            enable_storage_sharding: true,
         })
     }
 
+    pub(crate) fn enable_storage_sharding(&self) -> bool {
+        self.enable_storage_sharding
+    }
+
+    pub(crate) fn get_in_progress_state_kv_snapshot_version(&self) -> Result<Option<Version>> {
+        let mut iter = self.ledger_metadata_db.db().iter::<DbMetadataSchema>()?;
+        iter.seek_to_first();
+        while let Some((k, _v)) = iter.next().transpose()? {
+            if let DbMetadataKey::StateSnapshotKvRestoreProgress(version) = k {
+                return Ok(Some(version));
+            }
+        }
+        Ok(None)
+    }
+
     pub(crate) fn create_checkpoint(
         db_root_path: impl AsRef<Path>,
         cp_root_path: impl AsRef<Path>,
diff --git a/storage/aptosdb/src/ledger_db/transaction_accumulator_db.rs b/storage/aptosdb/src/ledger_db/transaction_accumulator_db.rs
index 2fa1367670d5e..e5d14e6fefab1 100644
--- a/storage/aptosdb/src/ledger_db/transaction_accumulator_db.rs
+++ b/storage/aptosdb/src/ledger_db/transaction_accumulator_db.rs
@@ -4,6 +4,7 @@
 use crate::schema::{
     db_metadata::{DbMetadataKey, DbMetadataSchema, DbMetadataValue},
     transaction_accumulator::TransactionAccumulatorSchema,
+    transaction_accumulator_root_hash::TransactionAccumulatorRootHashSchema,
 };
 use anyhow::anyhow;
 use aptos_accumulator::{HashReader, MerkleAccumulator};
@@ -126,6 +127,12 @@ impl TransactionAccumulatorDb {
 
     /// Returns the root hash at given `version`.
     pub fn get_root_hash(&self, version: Version) -> Result<HashValue> {
+        if let Some(hash) = self
+            .db
+            .get::<TransactionAccumulatorRootHashSchema>(&version)?
+        {
+            return Ok(hash);
+        }
         Accumulator::get_root_hash(self, version + 1).map_err(Into::into)
     }
 
@@ -141,6 +148,7 @@ impl TransactionAccumulatorDb {
     /// More details are in this issue https://github.com/aptos-labs/aptos-core/issues/1288.
     pub(crate) fn prune(begin: Version, end: Version, db_batch: &SchemaBatch) -> Result<()> {
         for version_to_delete in begin..end {
+            db_batch.delete::<TransactionAccumulatorRootHashSchema>(&version_to_delete)?;
             // The even version will be pruned in the iteration of version + 1.
             if version_to_delete % 2 == 0 {
                 continue;
diff --git a/storage/aptosdb/src/ledger_db/transaction_auxiliary_data_db.rs b/storage/aptosdb/src/ledger_db/transaction_auxiliary_data_db.rs
index a1a51cd040855..a3b0226a484c5 100644
--- a/storage/aptosdb/src/ledger_db/transaction_auxiliary_data_db.rs
+++ b/storage/aptosdb/src/ledger_db/transaction_auxiliary_data_db.rs
@@ -8,8 +8,8 @@ use crate::{
     },
     utils::iterators::ExpectContinuousVersions,
 };
-use aptos_schemadb::{ReadOptions, SchemaBatch, DB};
-use aptos_storage_interface::{AptosDbError, Result};
+use aptos_schemadb::{SchemaBatch, DB};
+use aptos_storage_interface::Result;
 use aptos_types::transaction::{TransactionAuxiliaryData, Version};
 use std::{path::Path, sync::Arc};
 
@@ -45,15 +45,8 @@ impl TransactionAuxiliaryDataDb {
     pub(crate) fn get_transaction_auxiliary_data(
         &self,
         version: Version,
-    ) -> Result<TransactionAuxiliaryData> {
-        self.db
-            .get::<TransactionAuxiliaryDataSchema>(&version)?
-            .ok_or_else(|| {
-                AptosDbError::NotFound(format!(
-                    "No Transaction Auxiliary Data at version {}",
-                    version
-                ))
-            })
+    ) -> Result<Option<TransactionAuxiliaryData>> {
+        self.db.get::<TransactionAuxiliaryDataSchema>(&version)
     }
 
     /// Returns an iterator that yields `num_transaction_infos` transaction infos starting from
@@ -63,9 +56,7 @@ impl TransactionAuxiliaryDataDb {
         start_version: Version,
         num_transaction_auxiliary_data: usize,
     ) -> Result<impl Iterator<Item = Result<TransactionAuxiliaryData>> + '_> {
-        let mut iter = self
-            .db
-            .iter::<TransactionAuxiliaryDataSchema>(ReadOptions::default())?;
+        let mut iter = self.db.iter::<TransactionAuxiliaryDataSchema>()?;
         iter.seek(&start_version)?;
         iter.expect_continuous_versions(start_version, num_transaction_auxiliary_data)
     }
diff --git a/storage/aptosdb/src/ledger_db/transaction_db.rs b/storage/aptosdb/src/ledger_db/transaction_db.rs
index c0d95dcddc016..f2f3b48b26641 100644
--- a/storage/aptosdb/src/ledger_db/transaction_db.rs
+++ b/storage/aptosdb/src/ledger_db/transaction_db.rs
@@ -6,13 +6,13 @@ use crate::{
     schema::{
         db_metadata::{DbMetadataKey, DbMetadataSchema, DbMetadataValue},
         transaction::TransactionSchema,
-        transaction_by_account::TransactionByAccountSchema,
         transaction_by_hash::TransactionByHashSchema,
     },
     utils::iterators::ExpectContinuousVersions,
 };
 use aptos_crypto::hash::{CryptoHash, HashValue};
-use aptos_schemadb::{ReadOptions, SchemaBatch, DB};
+use aptos_db_indexer_schemas::schema::transaction_by_account::TransactionByAccountSchema;
+use aptos_schemadb::{SchemaBatch, DB};
 use aptos_storage_interface::{AptosDbError, Result};
 use aptos_types::transaction::{Transaction, TransactionToCommit, Version};
 use rayon::prelude::*;
@@ -60,7 +60,7 @@ impl TransactionDb {
         start_version: Version,
         num_transactions: usize,
     ) -> Result<impl Iterator<Item = Result<Transaction>> + '_> {
-        let mut iter = self.db.iter::<TransactionSchema>(ReadOptions::default())?;
+        let mut iter = self.db.iter::<TransactionSchema>()?;
         iter.seek(&start_version)?;
         iter.expect_continuous_versions(start_version, num_transactions)
     }
diff --git a/storage/aptosdb/src/ledger_db/transaction_info_db.rs b/storage/aptosdb/src/ledger_db/transaction_info_db.rs
index 64e7be5d08379..45d826f16cd1c 100644
--- a/storage/aptosdb/src/ledger_db/transaction_info_db.rs
+++ b/storage/aptosdb/src/ledger_db/transaction_info_db.rs
@@ -9,7 +9,7 @@ use crate::{
     },
     utils::iterators::ExpectContinuousVersions,
 };
-use aptos_schemadb::{ReadOptions, SchemaBatch, DB};
+use aptos_schemadb::{SchemaBatch, DB};
 use aptos_storage_interface::{AptosDbError, Result};
 use aptos_types::{
     proof::TransactionInfoWithProof,
@@ -64,9 +64,7 @@ impl TransactionInfoDb {
         start_version: Version,
         num_transaction_infos: usize,
     ) -> Result<impl Iterator<Item = Result<TransactionInfo>> + '_> {
-        let mut iter = self
-            .db
-            .iter::<TransactionInfoSchema>(ReadOptions::default())?;
+        let mut iter = self.db.iter::<TransactionInfoSchema>()?;
         iter.seek(&start_version)?;
         iter.expect_continuous_versions(start_version, num_transaction_infos)
     }
diff --git a/storage/aptosdb/src/ledger_db/write_set_db.rs b/storage/aptosdb/src/ledger_db/write_set_db.rs
index 41175ea473c6c..92dbc1e654178 100644
--- a/storage/aptosdb/src/ledger_db/write_set_db.rs
+++ b/storage/aptosdb/src/ledger_db/write_set_db.rs
@@ -10,7 +10,7 @@ use crate::{
     utils::iterators::ExpectContinuousVersions,
 };
 use aptos_experimental_runtimes::thread_manager::optimal_min_len;
-use aptos_schemadb::{ReadOptions, SchemaBatch, DB};
+use aptos_schemadb::{SchemaBatch, DB};
 use aptos_storage_interface::{db_ensure as ensure, AptosDbError, Result};
 use aptos_types::{
     transaction::{TransactionToCommit, Version},
@@ -66,7 +66,7 @@ impl WriteSetDb {
         start_version: Version,
         num_transactions: usize,
     ) -> Result<impl Iterator<Item = Result<WriteSet>> + '_> {
-        let mut iter = self.db.iter::<WriteSetSchema>(ReadOptions::default())?;
+        let mut iter = self.db.iter::<WriteSetSchema>()?;
         iter.seek(&start_version)?;
         iter.expect_continuous_versions(start_version, num_transactions)
     }
@@ -89,7 +89,7 @@ impl WriteSetDb {
             end_version
         );
 
-        let mut iter = self.db.iter::<WriteSetSchema>(Default::default())?;
+        let mut iter = self.db.iter::<WriteSetSchema>()?;
         iter.seek(&begin_version)?;
 
         let mut ret = Vec::with_capacity((end_version - begin_version) as usize);
diff --git a/storage/aptosdb/src/metrics.rs b/storage/aptosdb/src/metrics.rs
index 19831d0e04831..1144915d40e84 100644
--- a/storage/aptosdb/src/metrics.rs
+++ b/storage/aptosdb/src/metrics.rs
@@ -229,3 +229,13 @@ pub(crate) static BACKUP_STATE_SNAPSHOT_LEAF_IDX: Lazy<IntGauge> = Lazy::new(||
     )
     .unwrap()
 });
+
+pub static BACKUP_TIMER: Lazy<HistogramVec> = Lazy::new(|| {
+    register_histogram_vec!(
+        "aptos_backup_handler_timers_seconds",
+        "Various timers for performance analysis.",
+        &["name"],
+        exponential_buckets(/*start=*/ 1e-6, /*factor=*/ 2.0, /*count=*/ 32).unwrap(),
+    )
+    .unwrap()
+});
diff --git a/storage/aptosdb/src/pruner/db_pruner.rs b/storage/aptosdb/src/pruner/db_pruner.rs
index 2372c13aee5d0..17cb40778ef5c 100644
--- a/storage/aptosdb/src/pruner/db_pruner.rs
+++ b/storage/aptosdb/src/pruner/db_pruner.rs
@@ -24,6 +24,7 @@ pub trait DBPruner: Send + Sync {
 
     /// Returns the target version for the current pruning round - this might be different from the
     /// target_version() because we need to keep max_version in account.
+    #[allow(unused)]
     fn get_current_batch_target(&self, max_versions: Version) -> Version {
         // Current target version  might be less than the target version to ensure we don't prune
         // more than max_version in one go.
diff --git a/storage/aptosdb/src/pruner/ledger_pruner/event_store_pruner.rs b/storage/aptosdb/src/pruner/ledger_pruner/event_store_pruner.rs
index b619484272a23..952bb2086e457 100644
--- a/storage/aptosdb/src/pruner/ledger_pruner/event_store_pruner.rs
+++ b/storage/aptosdb/src/pruner/ledger_pruner/event_store_pruner.rs
@@ -6,6 +6,11 @@ use crate::{
     pruner::{db_sub_pruner::DBSubPruner, pruner_utils::get_or_initialize_subpruner_progress},
     schema::db_metadata::{DbMetadataKey, DbMetadataSchema, DbMetadataValue},
 };
+use aptos_db_indexer::db_indexer::InternalIndexerDB;
+use aptos_db_indexer_schemas::{
+    metadata::{MetadataKey as IndexerMetadataKey, MetadataValue as IndexerMetadataValue},
+    schema::indexer_metadata::InternalIndexerMetadataSchema,
+};
 use aptos_logger::info;
 use aptos_schemadb::SchemaBatch;
 use aptos_storage_interface::Result;
@@ -15,6 +20,19 @@ use std::sync::Arc;
 #[derive(Debug)]
 pub struct EventStorePruner {
     ledger_db: Arc<LedgerDb>,
+    internal_indexer_db: Option<InternalIndexerDB>,
+}
+
+impl EventStorePruner {
+    fn expect_indexer_db(&self) -> &InternalIndexerDB {
+        self.internal_indexer_db
+            .as_ref()
+            .expect("internal indexer not enabled")
+    }
+
+    fn indexer_db(&self) -> Option<&InternalIndexerDB> {
+        self.internal_indexer_db.as_ref()
+    }
 }
 
 impl DBSubPruner for EventStorePruner {
@@ -24,13 +42,36 @@ impl DBSubPruner for EventStorePruner {
 
     fn prune(&self, current_progress: Version, target_version: Version) -> Result<()> {
         let batch = SchemaBatch::new();
-        self.ledger_db
-            .event_db()
-            .prune_events(current_progress, target_version, &batch)?;
+        let mut indexer_batch = None;
+
+        let indices_batch = if let Some(indexer_db) = self.indexer_db() {
+            if indexer_db.event_enabled() {
+                indexer_batch = Some(SchemaBatch::new());
+            }
+            indexer_batch.as_ref()
+        } else {
+            Some(&batch)
+        };
+        self.ledger_db.event_db().prune_events(
+            current_progress,
+            target_version,
+            &batch,
+            indices_batch,
+        )?;
         batch.put::<DbMetadataSchema>(
             &DbMetadataKey::EventPrunerProgress,
             &DbMetadataValue::Version(target_version),
         )?;
+
+        if let Some(indexer_batch) = indexer_batch {
+            indexer_batch.put::<InternalIndexerMetadataSchema>(
+                &IndexerMetadataKey::EventPrunerProgress,
+                &IndexerMetadataValue::Version(target_version),
+            )?;
+            self.expect_indexer_db()
+                .get_inner_db_ref()
+                .write_schemas(indexer_batch)?;
+        }
         self.ledger_db.event_db().write_schemas(batch)
     }
 }
@@ -39,6 +80,7 @@ impl EventStorePruner {
     pub(in crate::pruner) fn new(
         ledger_db: Arc<LedgerDb>,
         metadata_progress: Version,
+        internal_indexer_db: Option<InternalIndexerDB>,
     ) -> Result<Self> {
         let progress = get_or_initialize_subpruner_progress(
             ledger_db.event_db_raw(),
@@ -46,7 +88,10 @@ impl EventStorePruner {
             metadata_progress,
         )?;
 
-        let myself = EventStorePruner { ledger_db };
+        let myself = EventStorePruner {
+            ledger_db,
+            internal_indexer_db,
+        };
 
         info!(
             progress = progress,
diff --git a/storage/aptosdb/src/pruner/ledger_pruner/ledger_metadata_pruner.rs b/storage/aptosdb/src/pruner/ledger_pruner/ledger_metadata_pruner.rs
index 04b659d008031..e4e94d41a0e20 100644
--- a/storage/aptosdb/src/pruner/ledger_pruner/ledger_metadata_pruner.rs
+++ b/storage/aptosdb/src/pruner/ledger_pruner/ledger_metadata_pruner.rs
@@ -5,7 +5,7 @@ use crate::schema::{
     db_metadata::{DbMetadataKey, DbMetadataSchema, DbMetadataValue},
     version_data::VersionDataSchema,
 };
-use aptos_schemadb::{ReadOptions, SchemaBatch, DB};
+use aptos_schemadb::{SchemaBatch, DB};
 use aptos_storage_interface::{AptosDbError, Result};
 use aptos_types::transaction::Version;
 use std::sync::Arc;
@@ -24,7 +24,7 @@ impl LedgerMetadataPruner {
         } else {
             // NOTE: I **think** all db should have the LedgerPrunerProgress. Have a fallback path
             // here in case the database was super old before we introducing this progress counter.
-            let mut iter = ledger_metadata_db.iter::<VersionDataSchema>(ReadOptions::default())?;
+            let mut iter = ledger_metadata_db.iter::<VersionDataSchema>()?;
             iter.seek_to_first();
             let version = match iter.next().transpose()? {
                 Some((version, _)) => version,
diff --git a/storage/aptosdb/src/pruner/ledger_pruner/ledger_pruner_manager.rs b/storage/aptosdb/src/pruner/ledger_pruner/ledger_pruner_manager.rs
index e6f5ab682ee36..e7cb4eaa5193f 100644
--- a/storage/aptosdb/src/pruner/ledger_pruner/ledger_pruner_manager.rs
+++ b/storage/aptosdb/src/pruner/ledger_pruner/ledger_pruner_manager.rs
@@ -10,6 +10,7 @@ use crate::{
     },
 };
 use aptos_config::config::LedgerPrunerConfig;
+use aptos_db_indexer::db_indexer::InternalIndexerDB;
 use aptos_infallible::Mutex;
 use aptos_storage_interface::Result;
 use aptos_types::transaction::{AtomicVersion, Version};
@@ -104,11 +105,16 @@ impl PrunerManager for LedgerPrunerManager {
 
 impl LedgerPrunerManager {
     /// Creates a worker thread that waits on a channel for pruning commands.
-    pub fn new(ledger_db: Arc<LedgerDb>, ledger_pruner_config: LedgerPrunerConfig) -> Self {
+    pub fn new(
+        ledger_db: Arc<LedgerDb>,
+        ledger_pruner_config: LedgerPrunerConfig,
+        internal_indexer_db: Option<InternalIndexerDB>,
+    ) -> Self {
         let pruner_worker = if ledger_pruner_config.enable {
             Some(Self::init_pruner(
                 Arc::clone(&ledger_db),
                 ledger_pruner_config,
+                internal_indexer_db,
             ))
         } else {
             None
@@ -135,9 +141,12 @@ impl LedgerPrunerManager {
     fn init_pruner(
         ledger_db: Arc<LedgerDb>,
         ledger_pruner_config: LedgerPrunerConfig,
+        internal_indexer_db: Option<InternalIndexerDB>,
     ) -> PrunerWorker {
-        let pruner =
-            Arc::new(LedgerPruner::new(ledger_db).expect("Failed to create ledger pruner."));
+        let pruner = Arc::new(
+            LedgerPruner::new(ledger_db, internal_indexer_db)
+                .expect("Failed to create ledger pruner."),
+        );
 
         PRUNER_WINDOW
             .with_label_values(&["ledger_pruner"])
diff --git a/storage/aptosdb/src/pruner/ledger_pruner/mod.rs b/storage/aptosdb/src/pruner/ledger_pruner/mod.rs
index fa4aac850253f..1bd766c93efe8 100644
--- a/storage/aptosdb/src/pruner/ledger_pruner/mod.rs
+++ b/storage/aptosdb/src/pruner/ledger_pruner/mod.rs
@@ -27,6 +27,7 @@ use crate::{
     transaction_store::TransactionStore,
 };
 use anyhow::anyhow;
+use aptos_db_indexer::db_indexer::InternalIndexerDB;
 use aptos_experimental_runtimes::thread_manager::THREAD_MANAGER;
 use aptos_logger::info;
 use aptos_storage_interface::Result;
@@ -112,7 +113,10 @@ impl DBPruner for LedgerPruner {
 }
 
 impl LedgerPruner {
-    pub fn new(ledger_db: Arc<LedgerDb>) -> Result<Self> {
+    pub fn new(
+        ledger_db: Arc<LedgerDb>,
+        internal_indexer_db: Option<InternalIndexerDB>,
+    ) -> Result<Self> {
         info!(name = LEDGER_PRUNER_NAME, "Initializing...");
 
         let ledger_metadata_pruner = Box::new(
@@ -132,6 +136,7 @@ impl LedgerPruner {
         let event_store_pruner = Box::new(EventStorePruner::new(
             Arc::clone(&ledger_db),
             metadata_progress,
+            internal_indexer_db.clone(),
         )?);
         let transaction_accumulator_pruner = Box::new(TransactionAccumulatorPruner::new(
             Arc::clone(&ledger_db),
@@ -151,6 +156,7 @@ impl LedgerPruner {
             Arc::clone(&transaction_store),
             Arc::clone(&ledger_db),
             metadata_progress,
+            internal_indexer_db,
         )?);
         let write_set_pruner = Box::new(WriteSetPruner::new(
             Arc::clone(&ledger_db),
diff --git a/storage/aptosdb/src/pruner/ledger_pruner/test.rs b/storage/aptosdb/src/pruner/ledger_pruner/test.rs
index 20519f7b6b8e4..70ef9a9c5366d 100644
--- a/storage/aptosdb/src/pruner/ledger_pruner/test.rs
+++ b/storage/aptosdb/src/pruner/ledger_pruner/test.rs
@@ -23,7 +23,6 @@ use std::sync::Arc;
 
 proptest! {
     #![proptest_config(ProptestConfig::with_cases(10))]
-
     #[test]
     fn test_txn_store_pruner(txns in vec(
         prop_oneof![
diff --git a/storage/aptosdb/src/pruner/ledger_pruner/transaction_pruner.rs b/storage/aptosdb/src/pruner/ledger_pruner/transaction_pruner.rs
index 620d9fdf3292c..bccabdb0f891a 100644
--- a/storage/aptosdb/src/pruner/ledger_pruner/transaction_pruner.rs
+++ b/storage/aptosdb/src/pruner/ledger_pruner/transaction_pruner.rs
@@ -10,8 +10,13 @@ use crate::{
     },
     transaction_store::TransactionStore,
 };
+use aptos_db_indexer::db_indexer::InternalIndexerDB;
+use aptos_db_indexer_schemas::{
+    metadata::{MetadataKey as IndexerMetadataKey, MetadataValue as IndexerMetadataValue},
+    schema::indexer_metadata::InternalIndexerMetadataSchema,
+};
 use aptos_logger::info;
-use aptos_schemadb::{ReadOptions, SchemaBatch};
+use aptos_schemadb::SchemaBatch;
 use aptos_storage_interface::{db_ensure as ensure, AptosDbError, Result};
 use aptos_types::transaction::{Transaction, Version};
 use std::sync::Arc;
@@ -20,6 +25,7 @@ use std::sync::Arc;
 pub struct TransactionPruner {
     transaction_store: Arc<TransactionStore>,
     ledger_db: Arc<LedgerDb>,
+    internal_indexer_db: Option<InternalIndexerDB>,
 }
 
 impl DBSubPruner for TransactionPruner {
@@ -34,8 +40,6 @@ impl DBSubPruner for TransactionPruner {
         self.ledger_db
             .transaction_db()
             .prune_transaction_by_hash_indices(&candidate_transactions, &batch)?;
-        self.transaction_store
-            .prune_transaction_by_account(&candidate_transactions, &batch)?;
         self.ledger_db.transaction_db().prune_transactions(
             current_progress,
             target_version,
@@ -45,6 +49,21 @@ impl DBSubPruner for TransactionPruner {
             &DbMetadataKey::TransactionPrunerProgress,
             &DbMetadataValue::Version(target_version),
         )?;
+        if let Some(indexer_db) = self.internal_indexer_db.as_ref() {
+            if indexer_db.transaction_enabled() {
+                let index_batch = SchemaBatch::new();
+                self.transaction_store
+                    .prune_transaction_by_account(&candidate_transactions, &index_batch)?;
+                index_batch.put::<InternalIndexerMetadataSchema>(
+                    &IndexerMetadataKey::TransactionPrunerProgress,
+                    &IndexerMetadataValue::Version(target_version),
+                )?;
+                indexer_db.get_inner_db_ref().write_schemas(index_batch)?;
+            } else {
+                self.transaction_store
+                    .prune_transaction_by_account(&candidate_transactions, &batch)?;
+            }
+        }
         self.ledger_db.transaction_db().write_schemas(batch)
     }
 }
@@ -54,6 +73,7 @@ impl TransactionPruner {
         transaction_store: Arc<TransactionStore>,
         ledger_db: Arc<LedgerDb>,
         metadata_progress: Version,
+        internal_indexer_db: Option<InternalIndexerDB>,
     ) -> Result<Self> {
         let progress = get_or_initialize_subpruner_progress(
             ledger_db.transaction_db_raw(),
@@ -64,6 +84,7 @@ impl TransactionPruner {
         let myself = TransactionPruner {
             transaction_store,
             ledger_db,
+            internal_indexer_db,
         };
 
         info!(
@@ -86,7 +107,7 @@ impl TransactionPruner {
         let mut iter = self
             .ledger_db
             .transaction_db_raw()
-            .iter::<TransactionSchema>(ReadOptions::default())?;
+            .iter::<TransactionSchema>()?;
         iter.seek(&start)?;
 
         // The capacity is capped by the max number of txns we prune in a single batch. It's a
diff --git a/storage/aptosdb/src/pruner/pruner_manager.rs b/storage/aptosdb/src/pruner/pruner_manager.rs
index 703b06c9a8ed0..41086d9258460 100644
--- a/storage/aptosdb/src/pruner/pruner_manager.rs
+++ b/storage/aptosdb/src/pruner/pruner_manager.rs
@@ -34,6 +34,7 @@ pub trait PrunerManager: Sync {
     // in memory progress.
     fn save_min_readable_version(&self, min_readable_version: Version) -> Result<()>;
 
+    #[allow(unused)]
     fn is_pruning_pending(&self) -> bool;
 
     /// (For tests only.) Notifies the worker thread and waits for it to finish its job by polling
diff --git a/storage/aptosdb/src/pruner/state_kv_pruner/state_kv_metadata_pruner.rs b/storage/aptosdb/src/pruner/state_kv_pruner/state_kv_metadata_pruner.rs
index 8ff396fa49cec..a4a79d4b0c78c 100644
--- a/storage/aptosdb/src/pruner/state_kv_pruner/state_kv_metadata_pruner.rs
+++ b/storage/aptosdb/src/pruner/state_kv_pruner/state_kv_metadata_pruner.rs
@@ -5,13 +5,13 @@ use crate::{
     schema::{
         db_metadata::{DbMetadataKey, DbMetadataSchema, DbMetadataValue},
         stale_state_value_index::StaleStateValueIndexSchema,
+        stale_state_value_index_by_key_hash::StaleStateValueIndexByKeyHashSchema,
         state_value::StateValueSchema,
-        state_value_index::StateValueIndexSchema,
     },
     state_kv_db::StateKvDb,
     utils::get_progress,
 };
-use aptos_schemadb::{ReadOptions, SchemaBatch};
+use aptos_schemadb::SchemaBatch;
 use aptos_storage_interface::Result;
 use aptos_types::transaction::Version;
 use std::sync::Arc;
@@ -39,21 +39,20 @@ impl StateKvMetadataPruner {
                 let mut iter = self
                     .state_kv_db
                     .db_shard(shard_id)
-                    .iter::<StaleStateValueIndexSchema>(ReadOptions::default())?;
+                    .iter::<StaleStateValueIndexByKeyHashSchema>()?;
                 iter.seek(&current_progress)?;
                 for item in iter {
                     let (index, _) = item?;
                     if index.stale_since_version > target_version {
                         break;
                     }
-                    batch.delete::<StateValueIndexSchema>(&(index.state_key, index.version))?;
                 }
             }
         } else {
             let mut iter = self
                 .state_kv_db
                 .metadata_db()
-                .iter::<StaleStateValueIndexSchema>(ReadOptions::default())?;
+                .iter::<StaleStateValueIndexSchema>()?;
             iter.seek(&current_progress)?;
             for item in iter {
                 let (index, _) = item?;
diff --git a/storage/aptosdb/src/pruner/state_kv_pruner/state_kv_shard_pruner.rs b/storage/aptosdb/src/pruner/state_kv_pruner/state_kv_shard_pruner.rs
index 34e6829c11283..7824d5bc78c18 100644
--- a/storage/aptosdb/src/pruner/state_kv_pruner/state_kv_shard_pruner.rs
+++ b/storage/aptosdb/src/pruner/state_kv_pruner/state_kv_shard_pruner.rs
@@ -5,16 +5,17 @@ use crate::{
     pruner::pruner_utils::get_or_initialize_subpruner_progress,
     schema::{
         db_metadata::{DbMetadataKey, DbMetadataSchema, DbMetadataValue},
-        stale_state_value_index::StaleStateValueIndexSchema,
-        state_value::StateValueSchema,
+        stale_state_value_index_by_key_hash::StaleStateValueIndexByKeyHashSchema,
+        state_value_by_key_hash::StateValueByKeyHashSchema,
     },
 };
 use aptos_logger::info;
-use aptos_schemadb::{ReadOptions, SchemaBatch, DB};
+use aptos_schemadb::{SchemaBatch, DB};
 use aptos_storage_interface::Result;
 use aptos_types::transaction::Version;
 use std::sync::Arc;
 
+// This pruner is only used when enable_sharding flag is true
 pub(in crate::pruner) struct StateKvShardPruner {
     shard_id: u8,
     db_shard: Arc<DB>,
@@ -52,15 +53,15 @@ impl StateKvShardPruner {
 
         let mut iter = self
             .db_shard
-            .iter::<StaleStateValueIndexSchema>(ReadOptions::default())?;
+            .iter::<StaleStateValueIndexByKeyHashSchema>()?;
         iter.seek(&current_progress)?;
         for item in iter {
             let (index, _) = item?;
             if index.stale_since_version > target_version {
                 break;
             }
-            batch.delete::<StaleStateValueIndexSchema>(&index)?;
-            batch.delete::<StateValueSchema>(&(index.state_key, index.version))?;
+            batch.delete::<StaleStateValueIndexByKeyHashSchema>(&index)?;
+            batch.delete::<StateValueByKeyHashSchema>(&(index.state_key_hash, index.version))?;
         }
         batch.put::<DbMetadataSchema>(
             &DbMetadataKey::StateKvShardPrunerProgress(self.shard_id as usize),
diff --git a/storage/aptosdb/src/pruner/state_merkle_pruner/mod.rs b/storage/aptosdb/src/pruner/state_merkle_pruner/mod.rs
index 8e8bcec16003d..f97ac2715e547 100644
--- a/storage/aptosdb/src/pruner/state_merkle_pruner/mod.rs
+++ b/storage/aptosdb/src/pruner/state_merkle_pruner/mod.rs
@@ -24,7 +24,7 @@ use anyhow::anyhow;
 use aptos_experimental_runtimes::thread_manager::THREAD_MANAGER;
 use aptos_jellyfish_merkle::{node_type::NodeKey, StaleNodeIndex};
 use aptos_logger::info;
-use aptos_schemadb::{schema::KeyCodec, ReadOptions, DB};
+use aptos_schemadb::{schema::KeyCodec, DB};
 use aptos_storage_interface::Result;
 use aptos_types::transaction::{AtomicVersion, Version};
 use rayon::prelude::*;
@@ -189,7 +189,7 @@ where
         target_version: Version,
     ) -> Result<(Vec<StaleNodeIndex>, Option<Version>)> {
         let mut indices = Vec::new();
-        let mut iter = state_merkle_db_shard.iter::<S>(ReadOptions::default())?;
+        let mut iter = state_merkle_db_shard.iter::<S>()?;
         iter.seek(&StaleNodeIndex {
             stale_since_version: start_version,
             node_key: NodeKey::new_empty_path(0),
diff --git a/storage/aptosdb/src/pruner/state_merkle_pruner/test.rs b/storage/aptosdb/src/pruner/state_merkle_pruner/test.rs
index 99a19f9acfe9a..a660a6082975e 100644
--- a/storage/aptosdb/src/pruner/state_merkle_pruner/test.rs
+++ b/storage/aptosdb/src/pruner/state_merkle_pruner/test.rs
@@ -9,22 +9,24 @@ use crate::{
     },
     pruner::{PrunerManager, StateKvPrunerManager, StateMerklePrunerManager},
     schema::{
-        stale_node_index::StaleNodeIndexSchema, stale_state_value_index::StaleStateValueIndexSchema,
+        stale_node_index::StaleNodeIndexSchema,
+        stale_state_value_index::StaleStateValueIndexSchema,
+        stale_state_value_index_by_key_hash::StaleStateValueIndexByKeyHashSchema,
     },
     state_merkle_db::StateMerkleDb,
     state_store::StateStore,
     utils::new_sharded_kv_schema_batch,
 };
 use aptos_config::config::{LedgerPrunerConfig, StateMerklePrunerConfig};
-use aptos_crypto::HashValue;
-use aptos_schemadb::{ReadOptions, SchemaBatch};
+use aptos_crypto::{hash::CryptoHash, HashValue};
+use aptos_schemadb::SchemaBatch;
 use aptos_storage_interface::{jmt_update_refs, jmt_updates, DbReader};
 use aptos_temppath::TempPath;
 use aptos_types::{
     state_store::{
         state_key::StateKey,
         state_storage_usage::StateStorageUsage,
-        state_value::{StaleStateValueIndex, StateValue},
+        state_value::{StaleStateValueByKeyHashIndex, StaleStateValueIndex, StateValue},
     },
     transaction::Version,
 };
@@ -58,6 +60,7 @@ fn put_value_set(
     let ledger_batch = SchemaBatch::new();
     let sharded_state_kv_batches = new_sharded_kv_schema_batch();
     let state_kv_metadata_batch = SchemaBatch::new();
+    let enable_sharding = state_store.state_kv_db.enabled_sharding();
     state_store
         .put_value_sets(
             vec![&sharded_value_set],
@@ -66,8 +69,7 @@ fn put_value_set(
             None,
             &ledger_batch,
             &sharded_state_kv_batches,
-            &state_kv_metadata_batch,
-            /*put_state_value_indices=*/ false,
+            enable_sharding,
             /*skip_usage=*/ false,
             /*last_checkpoint_index=*/ None,
         )
@@ -275,7 +277,7 @@ fn test_state_store_pruner_partial_version() {
         aptos_db
             .state_merkle_db()
             .metadata_db()
-            .iter::<StaleNodeIndexSchema>(ReadOptions::default())
+            .iter::<StaleNodeIndexSchema>()
             .unwrap()
             .count(),
         0
@@ -287,7 +289,7 @@ fn test_state_store_pruner_partial_version() {
                 aptos_db
                     .state_merkle_db()
                     .db_shard(i)
-                    .iter::<StaleNodeIndexSchema>(ReadOptions::default())
+                    .iter::<StaleNodeIndexSchema>()
                     .unwrap()
                     .count(),
                 0
@@ -405,17 +407,31 @@ fn verify_state_value<'a, I: Iterator<Item = (&'a StateKey, &'a (Version, Option
     for (k, (old_version, v)) in kvs {
         let v_from_db = state_store.get_state_value_by_version(k, version).unwrap();
         assert_eq!(&v_from_db, if pruned { &None } else { v });
+        let enable_sharding = state_store.state_kv_db.enabled_sharding();
         if pruned {
-            assert!(state_store
-                .state_kv_db
-                .db_shard(k.get_shard_id())
-                .get::<StaleStateValueIndexSchema>(&StaleStateValueIndex {
-                    stale_since_version: version,
-                    version: *old_version,
-                    state_key: k.clone()
-                })
-                .unwrap()
-                .is_none());
+            if !enable_sharding {
+                assert!(state_store
+                    .state_kv_db
+                    .db_shard(k.get_shard_id())
+                    .get::<StaleStateValueIndexSchema>(&StaleStateValueIndex {
+                        stale_since_version: version,
+                        version: *old_version,
+                        state_key: k.clone()
+                    })
+                    .unwrap()
+                    .is_none());
+            } else {
+                assert!(state_store
+                    .state_kv_db
+                    .db_shard(k.get_shard_id())
+                    .get::<StaleStateValueIndexByKeyHashSchema>(&StaleStateValueByKeyHashIndex {
+                        stale_since_version: version,
+                        version: *old_version,
+                        state_key_hash: k.hash()
+                    })
+                    .unwrap()
+                    .is_none());
+            }
         }
     }
 }
diff --git a/storage/aptosdb/src/rocksdb_property_reporter.rs b/storage/aptosdb/src/rocksdb_property_reporter.rs
index ab11aee61de01..043cd1e72fff3 100644
--- a/storage/aptosdb/src/rocksdb_property_reporter.rs
+++ b/storage/aptosdb/src/rocksdb_property_reporter.rs
@@ -6,9 +6,10 @@ use crate::{
     common::NUM_STATE_SHARDS,
     db_options::{
         event_db_column_families, ledger_db_column_families, ledger_metadata_db_column_families,
-        skip_reporting_cf, state_kv_db_column_families, state_merkle_db_column_families,
-        transaction_accumulator_db_column_families, transaction_db_column_families,
-        transaction_info_db_column_families, write_set_db_column_families,
+        skip_reporting_cf, state_kv_db_column_families, state_kv_db_new_key_column_families,
+        state_merkle_db_column_families, transaction_accumulator_db_column_families,
+        transaction_db_column_families, transaction_info_db_column_families,
+        write_set_db_column_families,
     },
     ledger_db::LedgerDb,
     metrics::{
@@ -139,9 +140,13 @@ fn update_rocksdb_properties(
             set_property(cf, ledger_db.transaction_accumulator_db_raw())?;
         }
 
-        for cf in state_kv_db_column_families() {
-            set_property(cf, state_kv_db.metadata_db())?;
-            if state_kv_db.enabled_sharding() {
+        if !state_kv_db.enabled_sharding() {
+            for cf in state_kv_db_column_families() {
+                set_property(cf, state_kv_db.metadata_db())?;
+            }
+        } else {
+            for cf in state_kv_db_new_key_column_families() {
+                set_property(cf, state_kv_db.metadata_db())?;
                 for shard in 0..NUM_STATE_SHARDS {
                     set_shard_property(
                         cf,
diff --git a/storage/aptosdb/src/schema/db_metadata/mod.rs b/storage/aptosdb/src/schema/db_metadata/mod.rs
index d0624cb82d49f..b76a423ba0ef9 100644
--- a/storage/aptosdb/src/schema/db_metadata/mod.rs
+++ b/storage/aptosdb/src/schema/db_metadata/mod.rs
@@ -9,8 +9,9 @@
 //! ```
 //!
 
-use crate::{schema::DB_METADATA_CF_NAME, state_restore::StateSnapshotProgress};
+use crate::schema::DB_METADATA_CF_NAME;
 use anyhow::Result;
+use aptos_db_indexer_schemas::metadata::StateSnapshotProgress;
 use aptos_schemadb::{
     define_schema,
     schema::{KeyCodec, ValueCodec},
@@ -50,7 +51,7 @@ pub enum DbMetadataKey {
     StateMerklePrunerProgress,
     EpochEndingStateMerklePrunerProgress,
     StateKvPrunerProgress,
-    StateSnapshotRestoreProgress(Version),
+    StateSnapshotKvRestoreProgress(Version),
     LedgerCommitProgress,
     StateKvCommitProgress,
     OverallCommitProgress,
diff --git a/storage/aptosdb/src/schema/event_by_key/mod.rs b/storage/aptosdb/src/schema/event_by_key/mod.rs
deleted file mode 100644
index 465b10b271d2e..0000000000000
--- a/storage/aptosdb/src/schema/event_by_key/mod.rs
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright © Aptos Foundation
-// Parts of the project are originally copyright © Meta Platforms, Inc.
-// SPDX-License-Identifier: Apache-2.0
-
-//! This module defines physical storage schema for an event index via which a ContractEvent (
-//! represented by a <txn_version, event_idx> tuple so that it can be fetched from `EventSchema`)
-//! can be found by <access_path, sequence_num> tuple.
-//!
-//! ```text
-//! |<---------key------->|<----value---->|
-//! | event_key | seq_num | txn_ver | idx |
-//! ```
-
-use crate::schema::{ensure_slice_len_eq, EVENT_BY_KEY_CF_NAME};
-use anyhow::Result;
-use aptos_schemadb::{
-    define_schema,
-    schema::{KeyCodec, ValueCodec},
-};
-use aptos_types::{event::EventKey, transaction::Version};
-use byteorder::{BigEndian, ReadBytesExt, WriteBytesExt};
-use std::mem::size_of;
-
-define_schema!(EventByKeySchema, Key, Value, EVENT_BY_KEY_CF_NAME);
-
-type SeqNum = u64;
-type Key = (EventKey, SeqNum);
-
-type Index = u64;
-type Value = (Version, Index);
-
-impl KeyCodec<EventByKeySchema> for Key {
-    fn encode_key(&self) -> Result<Vec<u8>> {
-        let (ref event_key, seq_num) = *self;
-
-        let mut encoded = event_key.to_bytes();
-        encoded.write_u64::<BigEndian>(seq_num)?;
-
-        Ok(encoded)
-    }
-
-    fn decode_key(data: &[u8]) -> Result<Self> {
-        ensure_slice_len_eq(data, size_of::<Self>())?;
-
-        const EVENT_KEY_LEN: usize = size_of::<EventKey>();
-        let event_key = bcs::from_bytes(&data[..EVENT_KEY_LEN])?;
-        let seq_num = (&data[EVENT_KEY_LEN..]).read_u64::<BigEndian>()?;
-
-        Ok((event_key, seq_num))
-    }
-}
-
-impl ValueCodec<EventByKeySchema> for Value {
-    fn encode_value(&self) -> Result<Vec<u8>> {
-        let (version, index) = *self;
-
-        let mut encoded = Vec::with_capacity(size_of::<Version>() + size_of::<Index>());
-        encoded.write_u64::<BigEndian>(version)?;
-        encoded.write_u64::<BigEndian>(index)?;
-
-        Ok(encoded)
-    }
-
-    fn decode_value(data: &[u8]) -> Result<Self> {
-        ensure_slice_len_eq(data, size_of::<Self>())?;
-
-        const VERSION_SIZE: usize = size_of::<Version>();
-        let version = (&data[..VERSION_SIZE]).read_u64::<BigEndian>()?;
-        let index = (&data[VERSION_SIZE..]).read_u64::<BigEndian>()?;
-
-        Ok((version, index))
-    }
-}
-
-#[cfg(test)]
-mod test;
diff --git a/storage/aptosdb/src/schema/event_by_version/mod.rs b/storage/aptosdb/src/schema/event_by_version/mod.rs
deleted file mode 100644
index 287109b5de521..0000000000000
--- a/storage/aptosdb/src/schema/event_by_version/mod.rs
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright © Aptos Foundation
-// Parts of the project are originally copyright © Meta Platforms, Inc.
-// SPDX-License-Identifier: Apache-2.0
-
-//! This module defines physical storage schema for an event index via which a ContractEvent (
-//! represented by a <txn_version, event_idx> tuple so that it can be fetched from `EventSchema`)
-//! can be found by <access_path, version, sequence_num> tuple.
-//!
-//! ```text
-//! |<--------------key------------>|<-value->|
-//! | event_key | txn_ver | seq_num |   idx   |
-//! ```
-
-use crate::schema::{ensure_slice_len_eq, EVENT_BY_VERSION_CF_NAME};
-use anyhow::Result;
-use aptos_schemadb::{
-    define_schema,
-    schema::{KeyCodec, ValueCodec},
-};
-use aptos_types::{event::EventKey, transaction::Version};
-use byteorder::{BigEndian, ReadBytesExt, WriteBytesExt};
-use std::mem::size_of;
-
-define_schema!(EventByVersionSchema, Key, Value, EVENT_BY_VERSION_CF_NAME);
-
-type SeqNum = u64;
-type Key = (EventKey, Version, SeqNum);
-
-type Index = u64;
-type Value = Index;
-
-impl KeyCodec<EventByVersionSchema> for Key {
-    fn encode_key(&self) -> Result<Vec<u8>> {
-        let (ref event_key, version, seq_num) = *self;
-
-        let mut encoded = event_key.to_bytes();
-        encoded.write_u64::<BigEndian>(version)?;
-        encoded.write_u64::<BigEndian>(seq_num)?;
-
-        Ok(encoded)
-    }
-
-    fn decode_key(data: &[u8]) -> Result<Self> {
-        ensure_slice_len_eq(data, size_of::<Self>())?;
-
-        const EVENT_KEY_LEN: usize = size_of::<EventKey>();
-        const EVENT_KEY_AND_VER_LEN: usize = size_of::<(EventKey, Version)>();
-        let event_key = bcs::from_bytes(&data[..EVENT_KEY_LEN])?;
-        let version = (&data[EVENT_KEY_LEN..]).read_u64::<BigEndian>()?;
-        let seq_num = (&data[EVENT_KEY_AND_VER_LEN..]).read_u64::<BigEndian>()?;
-
-        Ok((event_key, version, seq_num))
-    }
-}
-
-impl ValueCodec<EventByVersionSchema> for Value {
-    fn encode_value(&self) -> Result<Vec<u8>> {
-        Ok(self.to_be_bytes().to_vec())
-    }
-
-    fn decode_value(mut data: &[u8]) -> Result<Self> {
-        ensure_slice_len_eq(data, size_of::<Self>())?;
-
-        Ok(data.read_u64::<BigEndian>()?)
-    }
-}
-
-#[cfg(test)]
-mod test;
diff --git a/storage/aptosdb/src/schema/mod.rs b/storage/aptosdb/src/schema/mod.rs
index 11c6067cf631f..4b988da7dac70 100644
--- a/storage/aptosdb/src/schema/mod.rs
+++ b/storage/aptosdb/src/schema/mod.rs
@@ -12,19 +12,18 @@ pub(crate) mod db_metadata;
 pub(crate) mod epoch_by_version;
 pub(crate) mod event;
 pub(crate) mod event_accumulator;
-pub(crate) mod event_by_key;
-pub(crate) mod event_by_version;
 pub(crate) mod jellyfish_merkle_node;
 pub(crate) mod ledger_info;
 pub(crate) mod stale_node_index;
 pub(crate) mod stale_node_index_cross_epoch;
 pub(crate) mod stale_state_value_index;
+pub(crate) mod stale_state_value_index_by_key_hash;
 pub(crate) mod state_value;
-pub(crate) mod state_value_index;
+pub(crate) mod state_value_by_key_hash;
 pub(crate) mod transaction;
 pub(crate) mod transaction_accumulator;
+pub(crate) mod transaction_accumulator_root_hash;
 pub(crate) mod transaction_auxiliary_data;
-pub(crate) mod transaction_by_account;
 pub(crate) mod transaction_by_hash;
 pub(crate) mod transaction_info;
 pub(crate) mod version_data;
@@ -46,10 +45,15 @@ pub const LEDGER_INFO_CF_NAME: ColumnFamilyName = "ledger_info";
 pub const STALE_NODE_INDEX_CF_NAME: ColumnFamilyName = "stale_node_index";
 pub const STALE_NODE_INDEX_CROSS_EPOCH_CF_NAME: ColumnFamilyName = "stale_node_index_cross_epoch";
 pub const STALE_STATE_VALUE_INDEX_CF_NAME: ColumnFamilyName = "stale_state_value_index";
+pub const STALE_STATE_VALUE_INDEX_BY_KEY_HASH_CF_NAME: ColumnFamilyName =
+    "stale_state_value_index_by_key_hash";
 pub const STATE_VALUE_CF_NAME: ColumnFamilyName = "state_value";
+pub const STATE_VALUE_BY_KEY_HASH_CF_NAME: ColumnFamilyName = "state_value_by_key_hash";
 pub const STATE_VALUE_INDEX_CF_NAME: ColumnFamilyName = "state_value_index";
 pub const TRANSACTION_CF_NAME: ColumnFamilyName = "transaction";
 pub const TRANSACTION_ACCUMULATOR_CF_NAME: ColumnFamilyName = "transaction_accumulator";
+pub const TRANSACTION_ACCUMULATOR_HASH_CF_NAME: ColumnFamilyName =
+    "transaction_accumulator_root_hash";
 pub const TRANSACTION_AUXILIARY_DATA_CF_NAME: ColumnFamilyName = "transaction_auxiliary_data";
 pub const TRANSACTION_BY_ACCOUNT_CF_NAME: ColumnFamilyName = "transaction_by_account";
 pub const TRANSACTION_BY_HASH_CF_NAME: ColumnFamilyName = "transaction_by_hash";
@@ -89,8 +93,6 @@ pub mod fuzzing {
             assert_no_panic_decoding::<super::epoch_by_version::EpochByVersionSchema>(data);
             assert_no_panic_decoding::<super::event::EventSchema>(data);
             assert_no_panic_decoding::<super::event_accumulator::EventAccumulatorSchema>(data);
-            assert_no_panic_decoding::<super::event_by_key::EventByKeySchema>(data);
-            assert_no_panic_decoding::<super::event_by_version::EventByVersionSchema>(data);
             assert_no_panic_decoding::<super::jellyfish_merkle_node::JellyfishMerkleNodeSchema>(
                 data,
             );
@@ -100,21 +102,26 @@ pub mod fuzzing {
             assert_no_panic_decoding::<
                 super::stale_node_index_cross_epoch::StaleNodeIndexCrossEpochSchema,
             >(data);
+            assert_no_panic_decoding::<
+                super::stale_state_value_index_by_key_hash::StaleStateValueIndexByKeyHashSchema,
+            >(data);
             assert_no_panic_decoding::<super::stale_state_value_index::StaleStateValueIndexSchema>(
                 data,
             );
             assert_no_panic_decoding::<super::state_value::StateValueSchema>(data);
-            assert_no_panic_decoding::<super::state_value_index::StateValueIndexSchema>(data);
+            assert_no_panic_decoding::<super::state_value_by_key_hash::StateValueByKeyHashSchema>(
+                data,
+            );
             assert_no_panic_decoding::<super::transaction::TransactionSchema>(data);
             assert_no_panic_decoding::<super::transaction_accumulator::TransactionAccumulatorSchema>(
                 data,
             );
+            assert_no_panic_decoding::<
+                super::transaction_accumulator_root_hash::TransactionAccumulatorRootHashSchema,
+            >(data);
             assert_no_panic_decoding::<
                 super::transaction_auxiliary_data::TransactionAuxiliaryDataSchema,
             >(data);
-            assert_no_panic_decoding::<super::transaction_by_account::TransactionByAccountSchema>(
-                data,
-            );
             assert_no_panic_decoding::<super::transaction_by_hash::TransactionByHashSchema>(data);
             assert_no_panic_decoding::<super::transaction_info::TransactionInfoSchema>(data);
             assert_no_panic_decoding::<super::version_data::VersionDataSchema>(data);
diff --git a/storage/aptosdb/src/schema/stale_state_value_index_by_key_hash/mod.rs b/storage/aptosdb/src/schema/stale_state_value_index_by_key_hash/mod.rs
new file mode 100644
index 0000000000000..e1eb807ad918c
--- /dev/null
+++ b/storage/aptosdb/src/schema/stale_state_value_index_by_key_hash/mod.rs
@@ -0,0 +1,83 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module defines the physical storage schema for information related to outdated state
+//! values, which are ready to be pruned after being old enough.
+//!
+//! An index entry in this data set has 3 pieces of information:
+//!     1. The version since which a state value (in another data set) becomes stale, meaning,
+//! replaced by an updated value.
+//!     2. The version this state value was updated identified by the state key.
+//!     3. The state_key to identify the stale state value.
+//!
+//! ```text
+//! |<-------------------key------------------------>|
+//! | stale_since_version | version | state_key_hash |
+//! ```
+//!
+//! `stale_since_version` is serialized in big endian so that records in RocksDB will be in order of
+//! its numeric value.
+
+use crate::schema::{ensure_slice_len_eq, STALE_STATE_VALUE_INDEX_BY_KEY_HASH_CF_NAME};
+use anyhow::Result;
+use aptos_crypto::HashValue;
+use aptos_schemadb::{
+    define_schema,
+    schema::{KeyCodec, SeekKeyCodec, ValueCodec},
+};
+use aptos_types::{state_store::state_value::StaleStateValueByKeyHashIndex, transaction::Version};
+use byteorder::{BigEndian, ReadBytesExt, WriteBytesExt};
+use std::{io::Write, mem::size_of};
+
+define_schema!(
+    StaleStateValueIndexByKeyHashSchema,
+    StaleStateValueByKeyHashIndex,
+    (),
+    STALE_STATE_VALUE_INDEX_BY_KEY_HASH_CF_NAME
+);
+
+impl KeyCodec<StaleStateValueIndexByKeyHashSchema> for StaleStateValueByKeyHashIndex {
+    fn encode_key(&self) -> Result<Vec<u8>> {
+        let mut encoded = vec![];
+        encoded.write_u64::<BigEndian>(self.stale_since_version)?;
+        encoded.write_u64::<BigEndian>(self.version)?;
+        encoded.write_all(self.state_key_hash.as_ref())?;
+
+        Ok(encoded)
+    }
+
+    fn decode_key(data: &[u8]) -> Result<Self> {
+        const VERSION_SIZE: usize = size_of::<Version>();
+
+        ensure_slice_len_eq(data, 2 * VERSION_SIZE + HashValue::LENGTH)?;
+        let stale_since_version = (&data[..VERSION_SIZE]).read_u64::<BigEndian>()?;
+        let version = (&data[VERSION_SIZE..2 * VERSION_SIZE]).read_u64::<BigEndian>()?;
+        let state_key_hash = HashValue::from_slice(&data[2 * VERSION_SIZE..])?;
+
+        Ok(Self {
+            stale_since_version,
+            version,
+            state_key_hash,
+        })
+    }
+}
+
+impl ValueCodec<StaleStateValueIndexByKeyHashSchema> for () {
+    fn encode_value(&self) -> Result<Vec<u8>> {
+        Ok(Vec::new())
+    }
+
+    fn decode_value(data: &[u8]) -> Result<Self> {
+        ensure_slice_len_eq(data, 0)?;
+        Ok(())
+    }
+}
+
+impl SeekKeyCodec<StaleStateValueIndexByKeyHashSchema> for Version {
+    fn encode_seek_key(&self) -> Result<Vec<u8>> {
+        Ok(self.to_be_bytes().to_vec())
+    }
+}
+
+#[cfg(test)]
+mod test;
diff --git a/storage/aptosdb/src/schema/stale_state_value_index_by_key_hash/test.rs b/storage/aptosdb/src/schema/stale_state_value_index_by_key_hash/test.rs
new file mode 100644
index 0000000000000..9ab69f66aed4f
--- /dev/null
+++ b/storage/aptosdb/src/schema/stale_state_value_index_by_key_hash/test.rs
@@ -0,0 +1,17 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use super::*;
+use aptos_schemadb::{schema::fuzzing::assert_encode_decode, test_no_panic_decoding};
+use proptest::prelude::*;
+
+proptest! {
+    #[test]
+    fn test_encode_decode(
+        stale_state_value_index_with_hash in any::<StaleStateValueByKeyHashIndex>(),
+    ) {
+        assert_encode_decode::<StaleStateValueIndexByKeyHashSchema>(&stale_state_value_index_with_hash, &());
+    }
+}
+
+test_no_panic_decoding!(StaleStateValueIndexByKeyHashSchema);
diff --git a/storage/aptosdb/src/schema/state_value_by_key_hash/mod.rs b/storage/aptosdb/src/schema/state_value_by_key_hash/mod.rs
new file mode 100644
index 0000000000000..6154d5bb1e136
--- /dev/null
+++ b/storage/aptosdb/src/schema/state_value_by_key_hash/mod.rs
@@ -0,0 +1,66 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module defines the physical storage schema for state value, which is used
+//! to access the state value directly.
+//!
+//! An Index Key in this data set has 2 pieces of information:
+//!     1. The state key hash
+//!     2. The version associated with the key
+//! The value associated with the key is the serialized State Value.
+//!
+//! ```text
+//! |<-------- key -------->|<------ value ---->|
+//! |  state key hash | version |  state value  |
+//! ```
+
+use crate::schema::{ensure_slice_len_eq, STATE_VALUE_BY_KEY_HASH_CF_NAME};
+use anyhow::Result;
+use aptos_crypto::HashValue;
+use aptos_schemadb::{
+    define_schema,
+    schema::{KeyCodec, ValueCodec},
+};
+use aptos_types::{state_store::state_value::StateValue, transaction::Version};
+use byteorder::{BigEndian, ReadBytesExt, WriteBytesExt};
+use std::{io::Write, mem::size_of};
+
+type Key = (HashValue, Version);
+
+define_schema!(
+    StateValueByKeyHashSchema,
+    Key,
+    Option<StateValue>,
+    STATE_VALUE_BY_KEY_HASH_CF_NAME
+);
+
+impl KeyCodec<StateValueByKeyHashSchema> for Key {
+    fn encode_key(&self) -> Result<Vec<u8>> {
+        let mut encoded = vec![];
+        encoded.write_all(self.0.as_ref())?;
+        encoded.write_u64::<BigEndian>(!self.1)?;
+        Ok(encoded)
+    }
+
+    fn decode_key(data: &[u8]) -> Result<Self> {
+        const VERSION_SIZE: usize = size_of::<Version>();
+
+        ensure_slice_len_eq(data, VERSION_SIZE + HashValue::LENGTH)?;
+        let state_key_hash: HashValue = HashValue::from_slice(&data[..HashValue::LENGTH])?;
+        let version = !(&data[HashValue::LENGTH..]).read_u64::<BigEndian>()?;
+        Ok((state_key_hash, version))
+    }
+}
+
+impl ValueCodec<StateValueByKeyHashSchema> for Option<StateValue> {
+    fn encode_value(&self) -> Result<Vec<u8>> {
+        bcs::to_bytes(self).map_err(Into::into)
+    }
+
+    fn decode_value(data: &[u8]) -> Result<Self> {
+        bcs::from_bytes(data).map_err(Into::into)
+    }
+}
+
+#[cfg(test)]
+mod test;
diff --git a/storage/aptosdb/src/schema/state_value_by_key_hash/test.rs b/storage/aptosdb/src/schema/state_value_by_key_hash/test.rs
new file mode 100644
index 0000000000000..6d972586b1872
--- /dev/null
+++ b/storage/aptosdb/src/schema/state_value_by_key_hash/test.rs
@@ -0,0 +1,20 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use super::*;
+use aptos_crypto::HashValue;
+use aptos_schemadb::{schema::fuzzing::assert_encode_decode, test_no_panic_decoding};
+use proptest::prelude::*;
+
+proptest! {
+    #[test]
+    fn test_encode_decode(
+        state_key in any::<HashValue>(),
+        version in any::<Version>(),
+        v in any::<Option<StateValue>>(),
+    ) {
+        assert_encode_decode::<StateValueByKeyHashSchema>(&(state_key, version), &v);
+    }
+}
+
+test_no_panic_decoding!(StateValueByKeyHashSchema);
diff --git a/storage/aptosdb/src/schema/state_value_index/mod.rs b/storage/aptosdb/src/schema/state_value_index/mod.rs
deleted file mode 100644
index 494ca93d5286b..0000000000000
--- a/storage/aptosdb/src/schema/state_value_index/mod.rs
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-// Historically we support an API that returns everything by key prefix (e.g. return all states
-// under an account) operation. This was implemented by seeking the StateKv db by prefix directly.
-// However in the new sharding world, account (or whatever prefix) is not a first class concept in
-// the storage layer, and we will store data for an account in different shards, based on the hash
-// of StateKey. Therefore the API cannot be supported by doing a single db seek.
-//
-// Our long term vision, is to move such support into indexer, before they are ready, we add this
-// index for now to temporarily unblock the sharded db migration.
-
-use crate::schema::{ensure_slice_len_eq, ensure_slice_len_gt, STATE_VALUE_INDEX_CF_NAME};
-use anyhow::Result;
-use aptos_schemadb::{
-    define_schema,
-    schema::{KeyCodec, SeekKeyCodec, ValueCodec},
-};
-use aptos_types::{
-    state_store::state_key::{prefix::StateKeyPrefix, StateKey},
-    transaction::Version,
-};
-use byteorder::{BigEndian, ReadBytesExt, WriteBytesExt};
-use std::{io::Write, mem::size_of};
-
-type Key = (StateKey, Version);
-
-define_schema!(StateValueIndexSchema, Key, (), STATE_VALUE_INDEX_CF_NAME);
-
-impl KeyCodec<StateValueIndexSchema> for Key {
-    fn encode_key(&self) -> Result<Vec<u8>> {
-        let mut encoded = vec![];
-        encoded.write_all(self.0.encoded())?;
-        encoded.write_u64::<BigEndian>(!self.1)?;
-        Ok(encoded)
-    }
-
-    fn decode_key(data: &[u8]) -> Result<Self> {
-        const VERSION_SIZE: usize = size_of::<Version>();
-
-        ensure_slice_len_gt(data, VERSION_SIZE)?;
-        let state_key_len = data.len() - VERSION_SIZE;
-        let state_key: StateKey = StateKey::decode(&data[..state_key_len])?;
-        let version = !(&data[state_key_len..]).read_u64::<BigEndian>()?;
-        Ok((state_key, version))
-    }
-}
-
-impl ValueCodec<StateValueIndexSchema> for () {
-    fn encode_value(&self) -> Result<Vec<u8>> {
-        Ok(Vec::new())
-    }
-
-    fn decode_value(data: &[u8]) -> Result<Self> {
-        ensure_slice_len_eq(data, 0)?;
-        Ok(())
-    }
-}
-
-impl SeekKeyCodec<StateValueIndexSchema> for &StateKeyPrefix {
-    fn encode_seek_key(&self) -> Result<Vec<u8>> {
-        self.encode()
-    }
-}
-
-#[cfg(test)]
-mod test;
diff --git a/storage/aptosdb/src/schema/state_value_index/test.rs b/storage/aptosdb/src/schema/state_value_index/test.rs
deleted file mode 100644
index c6d87014d0a7d..0000000000000
--- a/storage/aptosdb/src/schema/state_value_index/test.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-use super::*;
-use aptos_schemadb::{schema::fuzzing::assert_encode_decode, test_no_panic_decoding};
-use proptest::prelude::*;
-
-proptest! {
-    #[test]
-    fn test_encode_decode(
-        state_key in any::<StateKey>(),
-        version in any::<Version>(),
-    ) {
-        assert_encode_decode::<StateValueIndexSchema>(&(state_key, version), &());
-    }
-}
-
-test_no_panic_decoding!(StateValueIndexSchema);
diff --git a/storage/aptosdb/src/schema/transaction_accumulator_root_hash/mod.rs b/storage/aptosdb/src/schema/transaction_accumulator_root_hash/mod.rs
new file mode 100644
index 0000000000000..31fca8db3f2c8
--- /dev/null
+++ b/storage/aptosdb/src/schema/transaction_accumulator_root_hash/mod.rs
@@ -0,0 +1,55 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module defines physical storage schema for the transaction accumulator hash.
+//!
+//! The transaction accumulator root hash value is stored at each version.
+//! ```text
+//! |<--key-->|<-value->|
+//! | version |   hash  |
+//! ```
+
+use crate::schema::{ensure_slice_len_eq, TRANSACTION_ACCUMULATOR_HASH_CF_NAME};
+use anyhow::Result;
+use aptos_crypto::HashValue;
+use aptos_schemadb::{
+    define_schema,
+    schema::{KeyCodec, ValueCodec},
+};
+use aptos_types::transaction::Version;
+use byteorder::{BigEndian, ReadBytesExt};
+use std::mem::size_of;
+
+type Key = Version;
+type Value = HashValue;
+
+define_schema!(
+    TransactionAccumulatorRootHashSchema,
+    Key,
+    Value,
+    TRANSACTION_ACCUMULATOR_HASH_CF_NAME
+);
+
+impl KeyCodec<TransactionAccumulatorRootHashSchema> for Key {
+    fn encode_key(&self) -> Result<Vec<u8>> {
+        Ok(self.to_be_bytes().to_vec())
+    }
+
+    fn decode_key(mut data: &[u8]) -> Result<Self> {
+        ensure_slice_len_eq(data, size_of::<Self>())?;
+        Ok(data.read_u64::<BigEndian>()?)
+    }
+}
+
+impl ValueCodec<TransactionAccumulatorRootHashSchema> for HashValue {
+    fn encode_value(&self) -> Result<Vec<u8>> {
+        Ok(self.to_vec())
+    }
+
+    fn decode_value(data: &[u8]) -> Result<Self> {
+        Self::from_slice(data).map_err(Into::into)
+    }
+}
+
+#[cfg(test)]
+mod test;
diff --git a/storage/aptosdb/src/schema/transaction_accumulator_root_hash/test.rs b/storage/aptosdb/src/schema/transaction_accumulator_root_hash/test.rs
new file mode 100644
index 0000000000000..fa3553692513d
--- /dev/null
+++ b/storage/aptosdb/src/schema/transaction_accumulator_root_hash/test.rs
@@ -0,0 +1,18 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use super::*;
+use aptos_schemadb::{schema::fuzzing::assert_encode_decode, test_no_panic_decoding};
+use proptest::prelude::*;
+
+proptest! {
+    #[test]
+    fn test_encode_decode(version in any::<u64>(), hash in any::<HashValue>()) {
+        assert_encode_decode::<TransactionAccumulatorRootHashSchema>(
+            &version,
+            &hash,
+        );
+    }
+}
+
+test_no_panic_decoding!(TransactionAccumulatorRootHashSchema);
diff --git a/storage/aptosdb/src/schema/transaction_by_account/mod.rs b/storage/aptosdb/src/schema/transaction_by_account/mod.rs
deleted file mode 100644
index 988b2ad53d125..0000000000000
--- a/storage/aptosdb/src/schema/transaction_by_account/mod.rs
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright © Aptos Foundation
-// Parts of the project are originally copyright © Meta Platforms, Inc.
-// SPDX-License-Identifier: Apache-2.0
-
-//! This module defines physical storage schema for a transaction index via which the version of a
-//! transaction sent by `account_address` with `sequence_number` can be found. With the version one
-//! can resort to `TransactionSchema` for the transaction content.
-//!
-//! ```text
-//! |<-------key------->|<-value->|
-//! | address | seq_num | txn_ver |
-//! ```
-
-use crate::schema::{ensure_slice_len_eq, TRANSACTION_BY_ACCOUNT_CF_NAME};
-use anyhow::Result;
-use aptos_schemadb::{
-    define_schema,
-    schema::{KeyCodec, ValueCodec},
-};
-use aptos_types::{account_address::AccountAddress, transaction::Version};
-use byteorder::{BigEndian, ReadBytesExt, WriteBytesExt};
-use std::{convert::TryFrom, mem::size_of};
-
-define_schema!(
-    TransactionByAccountSchema,
-    Key,
-    Version,
-    TRANSACTION_BY_ACCOUNT_CF_NAME
-);
-
-type SeqNum = u64;
-type Key = (AccountAddress, SeqNum);
-
-impl KeyCodec<TransactionByAccountSchema> for Key {
-    fn encode_key(&self) -> Result<Vec<u8>> {
-        let (ref account_address, seq_num) = *self;
-
-        let mut encoded = account_address.to_vec();
-        encoded.write_u64::<BigEndian>(seq_num)?;
-
-        Ok(encoded)
-    }
-
-    fn decode_key(data: &[u8]) -> Result<Self> {
-        ensure_slice_len_eq(data, size_of::<Self>())?;
-
-        let address = AccountAddress::try_from(&data[..AccountAddress::LENGTH])?;
-        let seq_num = (&data[AccountAddress::LENGTH..]).read_u64::<BigEndian>()?;
-
-        Ok((address, seq_num))
-    }
-}
-
-impl ValueCodec<TransactionByAccountSchema> for Version {
-    fn encode_value(&self) -> Result<Vec<u8>> {
-        Ok(self.to_be_bytes().to_vec())
-    }
-
-    fn decode_value(mut data: &[u8]) -> Result<Self> {
-        ensure_slice_len_eq(data, size_of::<Self>())?;
-
-        Ok(data.read_u64::<BigEndian>()?)
-    }
-}
-
-#[cfg(test)]
-mod test;
diff --git a/storage/aptosdb/src/state_kv_db.rs b/storage/aptosdb/src/state_kv_db.rs
index bf478d04c2610..efd99adacec86 100644
--- a/storage/aptosdb/src/state_kv_db.rs
+++ b/storage/aptosdb/src/state_kv_db.rs
@@ -5,18 +5,28 @@
 
 use crate::{
     common::NUM_STATE_SHARDS,
-    db_options::{gen_state_kv_cfds, state_kv_db_column_families},
+    db_options::{
+        gen_state_kv_cfds, state_kv_db_column_families, state_kv_db_new_key_column_families,
+    },
     metrics::OTHER_TIMERS_SECONDS,
-    schema::db_metadata::{DbMetadataKey, DbMetadataSchema, DbMetadataValue},
+    schema::{
+        db_metadata::{DbMetadataKey, DbMetadataSchema, DbMetadataValue},
+        state_value::StateValueSchema,
+        state_value_by_key_hash::StateValueByKeyHashSchema,
+    },
     utils::truncation_helper::{get_state_kv_commit_progress, truncate_state_kv_db_shards},
 };
 use aptos_config::config::{RocksdbConfig, RocksdbConfigs, StorageDirPaths};
+use aptos_crypto::hash::CryptoHash;
 use aptos_experimental_runtimes::thread_manager::THREAD_MANAGER;
 use aptos_logger::prelude::info;
 use aptos_rocksdb_options::gen_rocksdb_options;
-use aptos_schemadb::{SchemaBatch, DB};
+use aptos_schemadb::{ReadOptions, SchemaBatch, DB};
 use aptos_storage_interface::Result;
-use aptos_types::transaction::Version;
+use aptos_types::{
+    state_store::{state_key::StateKey, state_value::StateValue},
+    transaction::Version,
+};
 use arr_macro::arr;
 use std::{
     path::{Path, PathBuf},
@@ -49,13 +59,19 @@ impl StateKvDb {
             });
         }
 
-        Self::open(db_paths, rocksdb_configs.state_kv_db_config, readonly)
+        Self::open(
+            db_paths,
+            rocksdb_configs.state_kv_db_config,
+            readonly,
+            sharding,
+        )
     }
 
     pub(crate) fn open(
         db_paths: &StorageDirPaths,
         state_kv_db_config: RocksdbConfig,
         readonly: bool,
+        enable_sharding: bool,
     ) -> Result<Self> {
         let state_kv_metadata_db_path =
             Self::metadata_db_path(db_paths.state_kv_db_metadata_root_path());
@@ -65,6 +81,7 @@ impl StateKvDb {
             STATE_KV_METADATA_DB_NAME,
             &state_kv_db_config,
             readonly,
+            enable_sharding,
         )?);
 
         info!(
@@ -76,7 +93,7 @@ impl StateKvDb {
         let state_kv_db_shards = {
             arr![{
                 let shard_root_path = db_paths.state_kv_db_shard_root_path(shard_id as u8);
-                let db = Self::open_shard(shard_root_path, shard_id as u8, &state_kv_db_config, readonly)?;
+                let db = Self::open_shard(shard_root_path, shard_id as u8, &state_kv_db_config, readonly, enable_sharding)?;
                 shard_id += 1;
                 Arc::new(db)
             }; 16]
@@ -104,22 +121,26 @@ impl StateKvDb {
         let _timer = OTHER_TIMERS_SECONDS
             .with_label_values(&["state_kv_db__commit"])
             .start_timer();
-        THREAD_MANAGER.get_io_pool().scope(|s| {
+        {
             let _timer = OTHER_TIMERS_SECONDS
                 .with_label_values(&["state_kv_db__commit_shards"])
                 .start_timer();
-            let mut batches = sharded_state_kv_batches.into_iter();
-            for shard_id in 0..NUM_STATE_SHARDS {
-                let state_kv_batch = batches
-                    .next()
-                    .expect("Not sufficient number of sharded state kv batches");
-                s.spawn(move |_| {
-                    // TODO(grao): Consider propagating the error instead of panic, if necessary.
-                    self.commit_single_shard(version, shard_id as u8, state_kv_batch)
-                        .unwrap_or_else(|err| panic!("Failed to commit shard {shard_id}: {err}."));
-                });
-            }
-        });
+            THREAD_MANAGER.get_io_pool().scope(|s| {
+                let mut batches = sharded_state_kv_batches.into_iter();
+                for shard_id in 0..NUM_STATE_SHARDS {
+                    let state_kv_batch = batches
+                        .next()
+                        .expect("Not sufficient number of sharded state kv batches");
+                    s.spawn(move |_| {
+                        // TODO(grao): Consider propagating the error instead of panic, if necessary.
+                        self.commit_single_shard(version, shard_id as u8, state_kv_batch)
+                            .unwrap_or_else(|err| {
+                                panic!("Failed to commit shard {shard_id}: {err}.")
+                            });
+                    });
+                }
+            });
+        }
 
         {
             let _timer = OTHER_TIMERS_SECONDS
@@ -155,6 +176,7 @@ impl StateKvDb {
             &StorageDirPaths::from_path(db_root_path),
             RocksdbConfig::default(),
             false,
+            true,
         )?;
         let cp_state_kv_db_path = cp_root_path.as_ref().join(STATE_KV_DB_FOLDER_NAME);
 
@@ -222,6 +244,7 @@ impl StateKvDb {
         shard_id: u8,
         state_kv_db_config: &RocksdbConfig,
         readonly: bool,
+        enable_sharding: bool,
     ) -> Result<DB> {
         let db_name = format!("state_kv_db_shard_{}", shard_id);
         Self::open_db(
@@ -229,6 +252,7 @@ impl StateKvDb {
             &db_name,
             state_kv_db_config,
             readonly,
+            enable_sharding,
         )
     }
 
@@ -237,20 +261,25 @@ impl StateKvDb {
         name: &str,
         state_kv_db_config: &RocksdbConfig,
         readonly: bool,
+        enable_sharding: bool,
     ) -> Result<DB> {
         Ok(if readonly {
             DB::open_cf_readonly(
                 &gen_rocksdb_options(state_kv_db_config, true),
                 path,
                 name,
-                state_kv_db_column_families(),
+                if enable_sharding {
+                    state_kv_db_new_key_column_families()
+                } else {
+                    state_kv_db_column_families()
+                },
             )?
         } else {
             DB::open_cf(
                 &gen_rocksdb_options(state_kv_db_config, false),
                 path,
                 name,
-                gen_state_kv_cfds(state_kv_db_config),
+                gen_state_kv_cfds(state_kv_db_config, enable_sharding),
             )?
         })
     }
@@ -269,4 +298,34 @@ impl StateKvDb {
             .join(STATE_KV_DB_FOLDER_NAME)
             .join("metadata")
     }
+
+    pub(crate) fn get_state_value_with_version_by_version(
+        &self,
+        state_key: &StateKey,
+        version: Version,
+    ) -> Result<Option<(Version, StateValue)>> {
+        let mut read_opts = ReadOptions::default();
+
+        // We want `None` if the state_key changes in iteration.
+        read_opts.set_prefix_same_as_start(true);
+        if !self.enabled_sharding() {
+            let mut iter = self
+                .db_shard(state_key.get_shard_id())
+                .iter_with_opts::<StateValueSchema>(read_opts)?;
+            iter.seek(&(state_key.clone(), version))?;
+            Ok(iter
+                .next()
+                .transpose()?
+                .and_then(|((_, version), value_opt)| value_opt.map(|value| (version, value))))
+        } else {
+            let mut iter = self
+                .db_shard(state_key.get_shard_id())
+                .iter_with_opts::<StateValueByKeyHashSchema>(read_opts)?;
+            iter.seek(&(state_key.hash(), version))?;
+            Ok(iter
+                .next()
+                .transpose()?
+                .and_then(|((_, version), value_opt)| value_opt.map(|value| (version, value))))
+        }
+    }
 }
diff --git a/storage/aptosdb/src/state_merkle_db.rs b/storage/aptosdb/src/state_merkle_db.rs
index d1a9b9333d98a..4c957969728d0 100644
--- a/storage/aptosdb/src/state_merkle_db.rs
+++ b/storage/aptosdb/src/state_merkle_db.rs
@@ -137,6 +137,7 @@ impl StateMerkleDb {
         self.commit_top_levels(version, top_levels_batch)
     }
 
+    /// Only used by fast sync / restore.
     pub(crate) fn commit_no_progress(
         &self,
         top_level_batch: SchemaBatch,
@@ -146,19 +147,11 @@ impl StateMerkleDb {
             batches_for_shards.len() == NUM_STATE_SHARDS,
             "Shard count mismatch."
         );
-        THREAD_MANAGER.get_io_pool().scope(|s| {
-            let mut state_merkle_batch = batches_for_shards.into_iter();
-            for shard_id in 0..NUM_STATE_SHARDS {
-                let batch = state_merkle_batch.next().unwrap();
-                s.spawn(move |_| {
-                    self.state_merkle_db_shards[shard_id]
-                        .write_schemas(batch)
-                        .unwrap_or_else(|_| {
-                            panic!("Failed to commit state merkle shard {shard_id}.")
-                        });
-                });
-            }
-        });
+        let mut batches = batches_for_shards.into_iter();
+        for shard_id in 0..NUM_STATE_SHARDS {
+            let state_merkle_batch = batches.next().unwrap();
+            self.state_merkle_db_shards[shard_id].write_schemas(state_merkle_batch)?;
+        }
 
         self.state_merkle_metadata_db.write_schemas(top_level_batch)
     }
@@ -306,9 +299,7 @@ impl StateMerkleDb {
     ) -> Result<Option<Version>> {
         if next_version > 0 {
             let max_possible_version = next_version - 1;
-            let mut iter = self
-                .metadata_db()
-                .rev_iter::<JellyfishMerkleNodeSchema>(Default::default())?;
+            let mut iter = self.metadata_db().rev_iter::<JellyfishMerkleNodeSchema>()?;
             iter.seek_for_prev(&NodeKey::new_empty_path(max_possible_version))?;
             if let Some((key, _node)) = iter.next().transpose()? {
                 let version = key.version();
@@ -687,9 +678,7 @@ impl StateMerkleDb {
         let mut ret = None;
 
         if self.enable_sharding {
-            let mut iter = self
-                .metadata_db()
-                .iter::<JellyfishMerkleNodeSchema>(Default::default())?;
+            let mut iter = self.metadata_db().iter::<JellyfishMerkleNodeSchema>()?;
             iter.seek(&(version, 0)).unwrap();
             // early exit if no node is found for the target version
             match iter.next().transpose()? {
@@ -707,7 +696,7 @@ impl StateMerkleDb {
         let start_num_of_nibbles = if self.enable_sharding { 1 } else { 0 };
         for shard_id in shards.rev() {
             let shard_db = self.state_merkle_db_shards[shard_id].clone();
-            let mut shard_iter = shard_db.iter::<JellyfishMerkleNodeSchema>(Default::default())?;
+            let mut shard_iter = shard_db.iter::<JellyfishMerkleNodeSchema>()?;
             // DB sharded only contain nodes with num_of_nibbles >= 1
             shard_iter.seek(&(version, start_num_of_nibbles)).unwrap();
 
@@ -762,7 +751,7 @@ impl StateMerkleDb {
         let mut ret = None;
 
         for num_nibbles in 0..=ROOT_NIBBLE_HEIGHT {
-            let mut iter = shard_db.iter::<JellyfishMerkleNodeSchema>(Default::default())?;
+            let mut iter = shard_db.iter::<JellyfishMerkleNodeSchema>()?;
             // nibble_path is always non-empty except for the root, so if we use an empty nibble
             // path as the seek key, the iterator will end up pointing to the end of the previous
             // range.
@@ -836,9 +825,7 @@ impl TreeReader<StateKey> for StateMerkleDb {
         // Since everything has the same version during restore, we seek to the first node and get
         // its version.
 
-        let mut iter = self
-            .metadata_db()
-            .iter::<JellyfishMerkleNodeSchema>(Default::default())?;
+        let mut iter = self.metadata_db().iter::<JellyfishMerkleNodeSchema>()?;
         // get the root node corresponding to the version
         iter.seek(&(version, 0))?;
         match iter.next().transpose()? {
diff --git a/storage/aptosdb/src/state_restore/mod.rs b/storage/aptosdb/src/state_restore/mod.rs
index a4e1422c52179..cd09dec6adb37 100644
--- a/storage/aptosdb/src/state_restore/mod.rs
+++ b/storage/aptosdb/src/state_restore/mod.rs
@@ -4,6 +4,7 @@
 use crate::metrics::OTHER_TIMERS_SECONDS;
 use anyhow::anyhow;
 use aptos_crypto::{hash::CryptoHash, HashValue};
+use aptos_db_indexer_schemas::metadata::StateSnapshotProgress;
 use aptos_infallible::Mutex;
 use aptos_jellyfish_merkle::{restore::JellyfishMerkleRestore, Key, TreeReader, TreeWriter, Value};
 use aptos_storage_interface::{Result, StateSnapshotReceiver};
@@ -30,19 +31,6 @@ pub static IO_POOL: Lazy<ThreadPool> = Lazy::new(|| {
 /// Key-Value batch that will be written into db atomically with other batches.
 pub type StateValueBatch<K, V> = HashMap<(K, Version), V>;
 
-#[derive(Clone, Copy, Debug, Deserialize, Eq, PartialEq, Serialize)]
-#[cfg_attr(any(test, feature = "fuzzing"), derive(proptest_derive::Arbitrary))]
-pub struct StateSnapshotProgress {
-    pub key_hash: HashValue,
-    pub usage: StateStorageUsage,
-}
-
-impl StateSnapshotProgress {
-    pub fn new(key_hash: HashValue, usage: StateStorageUsage) -> Self {
-        Self { key_hash, usage }
-    }
-}
-
 pub trait StateValueWriter<K, V>: Send + Sync {
     /// Writes a kv batch into storage.
     fn write_kv_batch(
@@ -52,7 +40,7 @@ pub trait StateValueWriter<K, V>: Send + Sync {
         progress: StateSnapshotProgress,
     ) -> Result<()>;
 
-    fn write_usage(&self, version: Version, usage: StateStorageUsage) -> Result<()>;
+    fn kv_finish(&self, version: Version, usage: StateStorageUsage) -> Result<()>;
 
     fn get_progress(&self, version: Version) -> Result<Option<StateSnapshotProgress>>;
 }
@@ -139,7 +127,7 @@ impl<K: Key + CryptoHash + Eq + Hash, V: Value> StateValueRestore<K, V> {
 
     pub fn finish(self) -> Result<()> {
         let progress = self.db.get_progress(self.version)?;
-        self.db.write_usage(
+        self.db.kv_finish(
             self.version,
             progress.map_or(StateStorageUsage::zero(), |p| p.usage),
         )
@@ -259,8 +247,6 @@ impl<K: Key + CryptoHash + Hash + Eq, V: Value> StateSnapshotReceiver<K, V>
                 .unwrap()
                 .add_chunk_impl(chunk.iter().map(|(k, v)| (k, v.hash())).collect(), proof)
         };
-        // Write KV out first because we are likely to resume according to the rightmost key in the
-        // tree after crashing.
         match self.restore_mode {
             StateSnapshotRestoreMode::KvOnly => kv_fn()?,
             StateSnapshotRestoreMode::TreeOnly => tree_fn()?,
@@ -291,17 +277,6 @@ impl<K: Key + CryptoHash + Hash + Eq, V: Value> StateSnapshotReceiver<K, V>
     }
 
     fn finish_box(self: Box<Self>) -> Result<()> {
-        match self.restore_mode {
-            StateSnapshotRestoreMode::KvOnly => self.kv_restore.lock().take().unwrap().finish()?,
-            StateSnapshotRestoreMode::TreeOnly => {
-                self.tree_restore.lock().take().unwrap().finish_impl()?
-            },
-            StateSnapshotRestoreMode::Default => {
-                // for tree only mode, we also need to write the usage to DB
-                self.kv_restore.lock().take().unwrap().finish()?;
-                self.tree_restore.lock().take().unwrap().finish_impl()?
-            },
-        }
-        Ok(())
+        self.finish()
     }
 }
diff --git a/storage/aptosdb/src/state_restore/restore_test.rs b/storage/aptosdb/src/state_restore/restore_test.rs
index 0ad09c1880e16..e2f54589d771e 100644
--- a/storage/aptosdb/src/state_restore/restore_test.rs
+++ b/storage/aptosdb/src/state_restore/restore_test.rs
@@ -2,10 +2,10 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::state_restore::{
-    StateSnapshotProgress, StateSnapshotRestore, StateSnapshotRestoreMode, StateValueBatch,
-    StateValueWriter,
+    StateSnapshotRestore, StateSnapshotRestoreMode, StateValueBatch, StateValueWriter,
 };
 use aptos_crypto::{hash::CryptoHash, HashValue};
+use aptos_db_indexer_schemas::metadata::StateSnapshotProgress;
 use aptos_infallible::RwLock;
 use aptos_jellyfish_merkle::{
     mock_tree_store::MockTreeStore,
@@ -88,7 +88,7 @@ where
         Ok(())
     }
 
-    fn write_usage(&self, version: Version, usage: StateStorageUsage) -> Result<()> {
+    fn kv_finish(&self, version: Version, usage: StateStorageUsage) -> Result<()> {
         self.usage_store.write().insert(version, usage);
         Ok(())
     }
diff --git a/storage/aptosdb/src/state_store/mod.rs b/storage/aptosdb/src/state_store/mod.rs
index 49111a2f3fd80..2af2839dd939f 100644
--- a/storage/aptosdb/src/state_store/mod.rs
+++ b/storage/aptosdb/src/state_store/mod.rs
@@ -14,15 +14,14 @@ use crate::{
         stale_node_index::StaleNodeIndexSchema,
         stale_node_index_cross_epoch::StaleNodeIndexCrossEpochSchema,
         stale_state_value_index::StaleStateValueIndexSchema,
+        stale_state_value_index_by_key_hash::StaleStateValueIndexByKeyHashSchema,
         state_value::StateValueSchema,
-        state_value_index::StateValueIndexSchema,
+        state_value_by_key_hash::StateValueByKeyHashSchema,
         version_data::VersionDataSchema,
     },
     state_kv_db::StateKvDb,
     state_merkle_db::StateMerkleDb,
-    state_restore::{
-        StateSnapshotProgress, StateSnapshotRestore, StateSnapshotRestoreMode, StateValueWriter,
-    },
+    state_restore::{StateSnapshotRestore, StateSnapshotRestoreMode, StateValueWriter},
     state_store::buffered_state::BufferedState,
     utils::{
         iterators::PrefixedStateValueIterator,
@@ -36,17 +35,22 @@ use aptos_crypto::{
     hash::{CryptoHash, SPARSE_MERKLE_PLACEHOLDER_HASH},
     HashValue,
 };
+use aptos_db_indexer::db_indexer::InternalIndexerDB;
+use aptos_db_indexer_schemas::{
+    metadata::{MetadataKey, MetadataValue, StateSnapshotProgress},
+    schema::indexer_metadata::InternalIndexerMetadataSchema,
+};
 use aptos_executor::components::in_memory_state_calculator_v2::InMemoryStateCalculatorV2;
 use aptos_experimental_runtimes::thread_manager::THREAD_MANAGER;
 use aptos_infallible::Mutex;
 use aptos_jellyfish_merkle::iterator::JellyfishMerkleIterator;
 use aptos_logger::info;
-use aptos_schemadb::{ReadOptions, SchemaBatch};
+use aptos_schemadb::SchemaBatch;
 use aptos_scratchpad::{SmtAncestors, SparseMerkleTree};
 use aptos_storage_interface::{
     async_proof_fetcher::AsyncProofFetcher,
     cached_state_view::{CachedStateView, ShardedStateCache},
-    db_ensure as ensure,
+    db_ensure as ensure, db_other_bail as bail,
     state_delta::StateDelta,
     AptosDbError, DbReader, Result, StateSnapshotReceiver,
 };
@@ -56,7 +60,10 @@ use aptos_types::{
         create_empty_sharded_state_updates,
         state_key::{prefix::StateKeyPrefix, StateKey},
         state_storage_usage::StateStorageUsage,
-        state_value::{StaleStateValueIndex, StateValue, StateValueChunkWithProof},
+        state_value::{
+            StaleStateValueByKeyHashIndex, StaleStateValueIndex, StateValue,
+            StateValueChunkWithProof,
+        },
         ShardedStateUpdates, StateViewId,
     },
     transaction::Version,
@@ -100,6 +107,7 @@ pub(crate) struct StateStore {
     buffered_state: Mutex<BufferedState>,
     buffered_state_target_items: usize,
     smt_ancestors: Mutex<SmtAncestors<StateValue>>,
+    internal_indexer_db: Option<InternalIndexerDB>,
 }
 
 impl Deref for StateStore {
@@ -146,18 +154,8 @@ impl DbReader for StateDb {
         state_key: &StateKey,
         version: Version,
     ) -> Result<Option<(Version, StateValue)>> {
-        let mut read_opts = ReadOptions::default();
-        // We want `None` if the state_key changes in iteration.
-        read_opts.set_prefix_same_as_start(true);
-        let mut iter = self
-            .state_kv_db
-            .db_shard(state_key.get_shard_id())
-            .iter::<StateValueSchema>(read_opts)?;
-        iter.seek(&(state_key.clone(), version))?;
-        Ok(iter
-            .next()
-            .transpose()?
-            .and_then(|((_, version), value_opt)| value_opt.map(|value| (version, value))))
+        self.state_kv_db
+            .get_state_value_with_version_by_version(state_key, version)
     }
 
     /// Returns the proof of the given state key and version.
@@ -293,6 +291,7 @@ impl StateStore {
         hack_for_tests: bool,
         empty_buffered_state_for_restore: bool,
         skip_usage: bool,
+        internal_indexer_db: Option<InternalIndexerDB>,
     ) -> Self {
         if !hack_for_tests && !empty_buffered_state_for_restore {
             Self::sync_commit_progress(
@@ -331,6 +330,7 @@ impl StateStore {
             buffered_state: Mutex::new(buffered_state),
             buffered_state_target_items,
             smt_ancestors: Mutex::new(smt_ancestors),
+            internal_indexer_db,
         }
     }
 
@@ -342,7 +342,7 @@ impl StateStore {
         crash_if_difference_is_too_large: bool,
     ) {
         let ledger_metadata_db = ledger_db.metadata_db();
-        if let Ok(overall_commit_progress) = ledger_metadata_db.get_latest_version() {
+        if let Ok(overall_commit_progress) = ledger_metadata_db.get_synced_version() {
             info!(
                 overall_commit_progress = overall_commit_progress,
                 "Start syncing databases..."
@@ -440,7 +440,7 @@ impl StateStore {
         let num_transactions = state_db
             .ledger_db
             .metadata_db()
-            .get_latest_version()
+            .get_synced_version()
             .map_or(0, |v| v + 1);
 
         let latest_snapshot_version = state_db
@@ -523,7 +523,7 @@ impl StateStore {
                 .collect::<Result<Vec<_>>>()?
                 .into_iter()
                 .enumerate()
-                .filter(|(_idx, txn_info)| txn_info.is_state_checkpoint())
+                .filter(|(_idx, txn_info)| txn_info.has_state_checkpoint_hash())
                 .last()
                 .map(|(idx, _)| idx);
             latest_snapshot_state_view.prime_cache_by_write_set(&write_sets)?;
@@ -579,12 +579,13 @@ impl StateStore {
         first_key_opt: Option<&StateKey>,
         desired_version: Version,
     ) -> Result<PrefixedStateValueIterator> {
+        // this can only handle non-sharded db scenario.
+        // For sharded db, should look at API side using internal indexer to handle this request
         PrefixedStateValueIterator::new(
             &self.state_kv_db,
             key_prefix.clone(),
             first_key_opt.cloned(),
             desired_version,
-            self.state_kv_db.enabled_sharding(),
         )
     }
 
@@ -604,8 +605,7 @@ impl StateStore {
         first_version: Version,
         batch: &SchemaBatch,
         sharded_state_kv_batches: &ShardedStateKvSchemaBatch,
-        state_kv_metadata_batch: &SchemaBatch,
-        put_state_value_indices: bool,
+        enable_sharding: bool,
     ) -> Result<()> {
         let _timer = OTHER_TIMERS_SECONDS
             .with_label_values(&["put_writesets"])
@@ -635,14 +635,14 @@ impl StateStore {
             sharded_state_kv_batches,
             /*skip_usage=*/ false,
             None,
+            enable_sharding,
         )?;
 
         self.put_state_values(
             value_state_sets.to_vec(),
             first_version,
             sharded_state_kv_batches,
-            state_kv_metadata_batch,
-            put_state_value_indices,
+            enable_sharding,
         )?;
 
         Ok(())
@@ -657,8 +657,7 @@ impl StateStore {
         sharded_state_cache: Option<&ShardedStateCache>,
         ledger_batch: &SchemaBatch,
         sharded_state_kv_batches: &ShardedStateKvSchemaBatch,
-        state_kv_metadata_batch: &SchemaBatch,
-        put_state_value_indices: bool,
+        enable_sharding: bool,
         skip_usage: bool,
         last_checkpoint_index: Option<usize>,
     ) -> Result<()> {
@@ -675,6 +674,7 @@ impl StateStore {
             sharded_state_kv_batches,
             skip_usage,
             last_checkpoint_index,
+            enable_sharding,
         )?;
 
         let _timer = OTHER_TIMERS_SECONDS
@@ -685,8 +685,7 @@ impl StateStore {
             value_state_sets,
             first_version,
             sharded_state_kv_batches,
-            state_kv_metadata_batch,
-            put_state_value_indices,
+            enable_sharding,
         )
     }
 
@@ -695,8 +694,7 @@ impl StateStore {
         value_state_sets: Vec<&ShardedStateUpdates>,
         first_version: Version,
         sharded_state_kv_batches: &ShardedStateKvSchemaBatch,
-        state_kv_metadata_batch: &SchemaBatch,
-        put_state_value_indices: bool,
+        enable_sharding: bool,
     ) -> Result<()> {
         sharded_state_kv_batches
             .par_iter()
@@ -709,28 +707,18 @@ impl StateStore {
                         let version = first_version + i as Version;
                         let kvs = &shards[shard_id];
                         kvs.iter().map(move |(k, v)| {
-                            batch.put::<StateValueSchema>(&(k.clone(), version), v)
+                            if enable_sharding {
+                                batch.put::<StateValueByKeyHashSchema>(
+                                    &(k.clone().hash(), version),
+                                    v,
+                                )
+                            } else {
+                                batch.put::<StateValueSchema>(&(k.clone(), version), v)
+                            }
                         })
                     })
                     .collect::<Result<_>>()
             })?;
-
-        // Eventually this index will move to indexer side. For now we temporarily write this into
-        // metadata db to unblock the sharded DB migration.
-        // TODO(grao): Remove when we are ready.
-        if put_state_value_indices {
-            value_state_sets
-                .par_iter()
-                .enumerate()
-                .try_for_each(|(i, updates)| {
-                    let version = first_version + i as Version;
-                    updates.iter().flatten().try_for_each(|(k, _)| {
-                        state_kv_metadata_batch
-                            .put::<StateValueIndexSchema>(&(k.clone(), version), &())
-                    })
-                })?;
-        }
-
         Ok(())
     }
 
@@ -762,6 +750,7 @@ impl StateStore {
         sharded_state_kv_batches: &ShardedStateKvSchemaBatch,
         skip_usage: bool,
         last_checkpoint_index: Option<usize>,
+        enable_sharding: bool,
     ) -> Result<()> {
         let _timer = OTHER_TIMERS_SECONDS
             .with_label_values(&["put_stats_and_indices"])
@@ -837,16 +826,29 @@ impl StateStore {
                         } else {
                             // Update the stale index of the tombstone at current version to
                             // current version.
-                            sharded_state_kv_batches[shard_id]
-                                .put::<StaleStateValueIndexSchema>(
-                                    &StaleStateValueIndex {
-                                        stale_since_version: version,
-                                        version,
-                                        state_key: key.clone(),
-                                    },
-                                    &(),
-                                )
-                                .unwrap();
+                            if enable_sharding {
+                                sharded_state_kv_batches[shard_id]
+                                    .put::<StaleStateValueIndexByKeyHashSchema>(
+                                        &StaleStateValueByKeyHashIndex {
+                                            stale_since_version: version,
+                                            version,
+                                            state_key_hash: key.hash(),
+                                        },
+                                        &(),
+                                    )
+                                    .unwrap();
+                            } else {
+                                sharded_state_kv_batches[shard_id]
+                                    .put::<StaleStateValueIndexSchema>(
+                                        &StaleStateValueIndex {
+                                            stale_since_version: version,
+                                            version,
+                                            state_key: key.clone(),
+                                        },
+                                        &(),
+                                    )
+                                    .unwrap();
+                            }
                         }
 
                         let old_version_and_value_opt = if let Some((old_version, old_value_opt)) =
@@ -864,16 +866,29 @@ impl StateStore {
                             items_delta -= 1;
                             bytes_delta -= (key.size() + old_value.size()) as i64;
                             // stale index of the old value at its version.
-                            sharded_state_kv_batches[shard_id]
-                                .put::<StaleStateValueIndexSchema>(
-                                    &StaleStateValueIndex {
-                                        stale_since_version: version,
-                                        version: old_version,
-                                        state_key: key.clone(),
-                                    },
-                                    &(),
-                                )
-                                .unwrap();
+                            if enable_sharding {
+                                sharded_state_kv_batches[shard_id]
+                                    .put::<StaleStateValueIndexByKeyHashSchema>(
+                                        &StaleStateValueByKeyHashIndex {
+                                            stale_since_version: version,
+                                            version: old_version,
+                                            state_key_hash: key.hash(),
+                                        },
+                                        &(),
+                                    )
+                                    .unwrap();
+                            } else {
+                                sharded_state_kv_batches[shard_id]
+                                    .put::<StaleStateValueIndexSchema>(
+                                        &StaleStateValueIndex {
+                                            stale_since_version: version,
+                                            version: old_version,
+                                            state_key: key.clone(),
+                                        },
+                                        &(),
+                                    )
+                                    .unwrap();
+                            }
                         }
                     }
                     usage_delta.push((items_delta, bytes_delta));
@@ -927,9 +942,9 @@ impl StateStore {
 
     pub(crate) fn shard_state_value_batch(
         &self,
-        metadata_batch: &SchemaBatch,
         sharded_batch: &ShardedStateKvSchemaBatch,
         values: &StateValueBatch,
+        enable_sharding: bool,
     ) -> Result<()> {
         values.iter().for_each(|((key, version), value)| {
             let shard_id = key.get_shard_id() as usize;
@@ -938,14 +953,14 @@ impl StateStore {
                 "Invalid shard id: {}",
                 shard_id
             );
-            sharded_batch[shard_id]
-                .put::<StateValueSchema>(&(key.clone(), *version), value)
-                .expect("Inserting into sharded schema batch should never fail");
-
-            if self.state_kv_db.enabled_sharding() {
-                metadata_batch
-                    .put::<StateValueIndexSchema>(&(key.clone(), *version), &())
-                    .expect("Inserting into state value index schema batch should never fail");
+            if enable_sharding {
+                sharded_batch[shard_id]
+                    .put::<StateValueByKeyHashSchema>(&(key.hash(), *version), value)
+                    .expect("Inserting into sharded schema batch should never fail");
+            } else {
+                sharded_batch[shard_id]
+                    .put::<StateValueSchema>(&(key.clone(), *version), value)
+                    .expect("Inserting into sharded schema batch should never fail");
             }
         });
         Ok(())
@@ -983,13 +998,13 @@ impl StateStore {
     pub fn get_state_key_and_value_iter(
         self: &Arc<Self>,
         version: Version,
-        start_hashed_key: HashValue,
+        start_idx: usize,
     ) -> Result<impl Iterator<Item = Result<(StateKey, StateValue)>> + Send + Sync> {
         let store = Arc::clone(self);
-        Ok(JellyfishMerkleIterator::new(
+        Ok(JellyfishMerkleIterator::new_by_index(
             Arc::clone(&self.state_merkle_db),
             version,
-            start_hashed_key,
+            start_idx,
         )?
         .map(|it| it.map_err(Into::into))
         .map(move |res| match res {
@@ -1076,9 +1091,7 @@ impl StateStore {
             .state_db
             .state_merkle_db
             .metadata_db()
-            .iter::<crate::schema::jellyfish_merkle_node::JellyfishMerkleNodeSchema>(
-            Default::default(),
-        )?;
+            .iter::<crate::schema::jellyfish_merkle_node::JellyfishMerkleNodeSchema>()?;
         iter.seek_to_first();
 
         let all_rows = iter.collect::<Result<Vec<_>>>()?;
@@ -1087,12 +1100,10 @@ impl StateStore {
             all_rows.into_iter().map(|(k, _v)| k).collect();
         if self.state_merkle_db.sharding_enabled() {
             for i in 0..NUM_STATE_SHARDS as u8 {
-                let mut iter = self
-                    .state_merkle_db
-                    .db_shard(i)
-                    .iter::<crate::schema::jellyfish_merkle_node::JellyfishMerkleNodeSchema>(
-                    Default::default(),
-                )?;
+                let mut iter =
+                    self.state_merkle_db
+                        .db_shard(i)
+                        .iter::<crate::schema::jellyfish_merkle_node::JellyfishMerkleNodeSchema>()?;
                 iter.seek_to_first();
 
                 let all_rows = iter.collect::<Result<Vec<_>>>()?;
@@ -1141,6 +1152,7 @@ impl StateStore {
 }
 
 impl StateValueWriter<StateKey, StateValue> for StateStore {
+    // This already turns on sharded KV
     fn write_kv_batch(
         &self,
         version: Version,
@@ -1154,25 +1166,111 @@ impl StateValueWriter<StateKey, StateValue> for StateStore {
         let sharded_schema_batch = new_sharded_kv_schema_batch();
 
         batch.put::<DbMetadataSchema>(
-            &DbMetadataKey::StateSnapshotRestoreProgress(version),
+            &DbMetadataKey::StateSnapshotKvRestoreProgress(version),
             &DbMetadataValue::StateSnapshotProgress(progress),
         )?;
 
-        self.shard_state_value_batch(&batch, &sharded_schema_batch, node_batch)?;
-
+        if self.internal_indexer_db.is_some()
+            && self
+                .internal_indexer_db
+                .as_ref()
+                .unwrap()
+                .statekeys_enabled()
+        {
+            let keys = node_batch.iter().map(|(key, _)| key.0.clone()).collect();
+            self.internal_indexer_db
+                .as_ref()
+                .unwrap()
+                .write_keys_to_indexer_db(&keys, version, progress)?;
+        }
+        self.shard_state_value_batch(
+            &sharded_schema_batch,
+            node_batch,
+            self.state_kv_db.enabled_sharding(),
+        )?;
         self.state_kv_db
             .commit(version, batch, sharded_schema_batch)
     }
 
-    fn write_usage(&self, version: Version, usage: StateStorageUsage) -> Result<()> {
-        self.ledger_db.metadata_db().put_usage(version, usage)
+    fn kv_finish(&self, version: Version, usage: StateStorageUsage) -> Result<()> {
+        self.ledger_db.metadata_db().put_usage(version, usage)?;
+        if let Some(internal_indexer_db) = self.internal_indexer_db.as_ref() {
+            if version > 0 {
+                let batch = SchemaBatch::new();
+                batch.put::<InternalIndexerMetadataSchema>(
+                    &MetadataKey::LatestVersion,
+                    &MetadataValue::Version(version - 1),
+                )?;
+                if internal_indexer_db.statekeys_enabled() {
+                    batch.put::<InternalIndexerMetadataSchema>(
+                        &MetadataKey::StateVersion,
+                        &MetadataValue::Version(version - 1),
+                    )?;
+                }
+                if internal_indexer_db.transaction_enabled() {
+                    batch.put::<InternalIndexerMetadataSchema>(
+                        &MetadataKey::TransactionVersion,
+                        &MetadataValue::Version(version - 1),
+                    )?;
+                }
+                if internal_indexer_db.event_enabled() {
+                    batch.put::<InternalIndexerMetadataSchema>(
+                        &MetadataKey::EventVersion,
+                        &MetadataValue::Version(version - 1),
+                    )?;
+                }
+                internal_indexer_db
+                    .get_inner_db_ref()
+                    .write_schemas(batch)?;
+            }
+        }
+
+        Ok(())
     }
 
     fn get_progress(&self, version: Version) -> Result<Option<StateSnapshotProgress>> {
-        Ok(self
+        let main_db_progress = self
             .state_kv_db
             .metadata_db()
-            .get::<DbMetadataSchema>(&DbMetadataKey::StateSnapshotRestoreProgress(version))?
-            .map(|v| v.expect_state_snapshot_progress()))
+            .get::<DbMetadataSchema>(&DbMetadataKey::StateSnapshotKvRestoreProgress(version))?
+            .map(|v| v.expect_state_snapshot_progress());
+
+        // verify if internal indexer db and main db are consistent before starting the restore
+        if self.internal_indexer_db.is_some()
+            && self
+                .internal_indexer_db
+                .as_ref()
+                .unwrap()
+                .statekeys_enabled()
+        {
+            let progress_opt = self
+                .internal_indexer_db
+                .as_ref()
+                .unwrap()
+                .get_restore_progress(version)?;
+
+            match (main_db_progress, progress_opt) {
+                (None, None) => (),
+                (None, Some(_)) => (),
+                (Some(main_progres), Some(indexer_progress)) => {
+                    if main_progres.key_hash > indexer_progress.key_hash {
+                        bail!(
+                            "Inconsistent restore progress between main db and internal indexer db. main db: {:?}, internal indexer db: {:?}",
+                            main_progres,
+                            indexer_progress,
+                        );
+                    }
+                },
+                _ => {
+                    bail!(
+                        "Inconsistent restore progress between main db and internal indexer db. main db: {:?}, internal indexer db: {:?}",
+                        main_db_progress,
+                        progress_opt,
+                    );
+                },
+            }
+        }
+
+        Ok(main_db_progress)
     }
 }
diff --git a/storage/aptosdb/src/state_store/state_store_test.rs b/storage/aptosdb/src/state_store/state_store_test.rs
index 9a1fc0e856bbf..add8ba9f3bfb1 100644
--- a/storage/aptosdb/src/state_store/state_store_test.rs
+++ b/storage/aptosdb/src/state_store/state_store_test.rs
@@ -58,7 +58,6 @@ fn put_value_set(
             None,
             &ledger_batch,
             &sharded_state_kv_batches,
-            &state_kv_metadata_batch,
             /*put_state_value_indices=*/ false,
             /*skip_usage=*/ false,
             /*last_checkpoint_index=*/ None,
@@ -354,7 +353,7 @@ proptest! {
         for i in 0..kvs.len() {
             let actual_values = db
                 .get_backup_handler()
-                .get_account_iter(i as Version)
+                .get_state_item_iter(i as Version, 0, usize::MAX)
                 .unwrap()
                 .collect::<Result<Vec<_>>>()
                 .unwrap();
@@ -531,7 +530,7 @@ proptest! {
             let last_version = next_version - 1;
             let snapshot = db
                 .get_backup_handler()
-                .get_account_iter(last_version)
+                .get_state_item_iter(last_version, 0, usize::MAX)
                 .unwrap()
                 .collect::<Result<Vec<_>>>()
                 .unwrap();
diff --git a/storage/aptosdb/src/transaction_store/mod.rs b/storage/aptosdb/src/transaction_store/mod.rs
index f02db825bd111..cb7e15a1ee1a1 100644
--- a/storage/aptosdb/src/transaction_store/mod.rs
+++ b/storage/aptosdb/src/transaction_store/mod.rs
@@ -4,11 +4,12 @@
 
 //! This file defines transaction store APIs that are related to committed signed transactions.
 
-use crate::{
-    ledger_db::LedgerDb, schema::transaction_by_account::TransactionByAccountSchema,
-    utils::iterators::AccountTransactionVersionIter,
+use crate::ledger_db::LedgerDb;
+use aptos_db_indexer_schemas::{
+    schema::transaction_by_account::TransactionByAccountSchema,
+    utils::AccountTransactionVersionIter,
 };
-use aptos_schemadb::{ReadOptions, SchemaBatch};
+use aptos_schemadb::SchemaBatch;
 use aptos_storage_interface::{AptosDbError, Result};
 use aptos_types::{
     account_address::AccountAddress,
@@ -65,7 +66,7 @@ impl TransactionStore {
         let mut iter = self
             .ledger_db
             .transaction_db_raw()
-            .iter::<TransactionByAccountSchema>(ReadOptions::default())?;
+            .iter::<TransactionByAccountSchema>()?;
         iter.seek(&(address, min_seq_num))?;
         Ok(AccountTransactionVersionIter::new(
             iter,
diff --git a/storage/aptosdb/src/utils/iterators.rs b/storage/aptosdb/src/utils/iterators.rs
index f10fad9c1d3ab..98906684f8ce0 100644
--- a/storage/aptosdb/src/utils/iterators.rs
+++ b/storage/aptosdb/src/utils/iterators.rs
@@ -2,17 +2,12 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{
-    schema::{
-        event::EventSchema, ledger_info::LedgerInfoSchema, state_value::StateValueSchema,
-        state_value_index::StateValueIndexSchema,
-        transaction_by_account::TransactionByAccountSchema,
-    },
+    schema::{event::EventSchema, ledger_info::LedgerInfoSchema, state_value::StateValueSchema},
     state_kv_db::StateKvDb,
 };
 use aptos_schemadb::{iterator::SchemaIterator, ReadOptions};
 use aptos_storage_interface::{db_ensure as ensure, AptosDbError, Result};
 use aptos_types::{
-    account_address::AccountAddress,
     contract_event::ContractEvent,
     ledger_info::LedgerInfoWithSignatures,
     state_store::{
@@ -101,14 +96,11 @@ where
 }
 
 pub struct PrefixedStateValueIterator<'a> {
-    db: &'a StateKvDb,
     kv_iter: Option<SchemaIterator<'a, StateValueSchema>>,
-    index_iter: Option<SchemaIterator<'a, StateValueIndexSchema>>,
     key_prefix: StateKeyPrefix,
     prev_key: Option<StateKey>,
     desired_version: Version,
     is_finished: bool,
-    use_index: bool,
 }
 
 impl<'a> PrefixedStateValueIterator<'a> {
@@ -117,7 +109,6 @@ impl<'a> PrefixedStateValueIterator<'a> {
         key_prefix: StateKeyPrefix,
         first_key: Option<StateKey>,
         desired_version: Version,
-        use_index: bool,
     ) -> Result<Self> {
         let mut read_opts = ReadOptions::default();
         // Without this, iterators are not guaranteed a total order of all keys, but only keys for the same prefix.
@@ -130,32 +121,20 @@ impl<'a> PrefixedStateValueIterator<'a> {
         // here will stick with prefix `aptos/abc` and return `None` or any arbitrary result after visited all the
         // keys starting with `aptos/abc`.
         read_opts.set_total_order_seek(true);
-        let (kv_iter, index_iter) = if use_index {
-            let mut index_iter = db.metadata_db().iter::<StateValueIndexSchema>(read_opts)?;
-            if let Some(first_key) = &first_key {
-                index_iter.seek(&(first_key.clone(), u64::MAX))?;
-            } else {
-                index_iter.seek(&&key_prefix)?;
-            };
-            (None, Some(index_iter))
+        let mut kv_iter = db
+            .metadata_db()
+            .iter_with_opts::<StateValueSchema>(read_opts)?;
+        if let Some(first_key) = &first_key {
+            kv_iter.seek(&(first_key.clone(), u64::MAX))?;
         } else {
-            let mut kv_iter = db.metadata_db().iter::<StateValueSchema>(read_opts)?;
-            if let Some(first_key) = &first_key {
-                kv_iter.seek(&(first_key.clone(), u64::MAX))?;
-            } else {
-                kv_iter.seek(&&key_prefix)?;
-            };
-            (Some(kv_iter), None)
+            kv_iter.seek(&&key_prefix)?;
         };
         Ok(Self {
-            db,
-            kv_iter,
-            index_iter,
+            kv_iter: Some(kv_iter),
             key_prefix,
             prev_key: None,
             desired_version,
             is_finished: false,
-            use_index,
         })
     }
 
@@ -191,144 +170,13 @@ impl<'a> PrefixedStateValueIterator<'a> {
         }
         Ok(None)
     }
-
-    fn next_by_index(&mut self) -> Result<Option<(StateKey, StateValue)>> {
-        let iter = self.index_iter.as_mut().unwrap();
-        if !self.is_finished {
-            while let Some(((state_key, version), _)) = iter.next().transpose()? {
-                // In case the previous seek() ends on the same key with version 0.
-                if Some(&state_key) == self.prev_key.as_ref() {
-                    continue;
-                }
-                // Cursor is currently at the first available version of the state key.
-                // Check if the key_prefix is a valid prefix of the state_key we got from DB.
-                if !self.key_prefix.is_prefix(&state_key)? {
-                    // No more keys matching the key_prefix, we can return the result.
-                    self.is_finished = true;
-                    break;
-                }
-
-                if version > self.desired_version {
-                    iter.seek(&(state_key.clone(), self.desired_version))?;
-                    continue;
-                }
-
-                self.prev_key = Some(state_key.clone());
-                // Seek to the next key - this can be done by seeking to the current key with version 0
-                iter.seek(&(state_key.clone(), 0))?;
-
-                if let Some(state_value) = self
-                    .db
-                    .db_shard(state_key.get_shard_id())
-                    .get::<StateValueSchema>(&(state_key.clone(), version))?
-                    .ok_or_else(|| {
-                        AptosDbError::NotFound(format!(
-                            "Key {state_key:?} is not found at version {version}.",
-                            state_key = state_key,
-                            version = version
-                        ))
-                    })?
-                {
-                    return Ok(Some((state_key, state_value)));
-                }
-            }
-        }
-        Ok(None)
-    }
 }
 
 impl<'a> Iterator for PrefixedStateValueIterator<'a> {
     type Item = Result<(StateKey, StateValue)>;
 
     fn next(&mut self) -> Option<Self::Item> {
-        if self.use_index {
-            self.next_by_index().transpose()
-        } else {
-            self.next_by_kv().transpose()
-        }
-    }
-}
-
-pub struct AccountTransactionVersionIter<'a> {
-    inner: SchemaIterator<'a, TransactionByAccountSchema>,
-    address: AccountAddress,
-    expected_next_seq_num: Option<u64>,
-    end_seq_num: u64,
-    prev_version: Option<Version>,
-    ledger_version: Version,
-}
-
-impl<'a> AccountTransactionVersionIter<'a> {
-    pub(crate) fn new(
-        inner: SchemaIterator<'a, TransactionByAccountSchema>,
-        address: AccountAddress,
-        end_seq_num: u64,
-        ledger_version: Version,
-    ) -> Self {
-        Self {
-            inner,
-            address,
-            end_seq_num,
-            ledger_version,
-            expected_next_seq_num: None,
-            prev_version: None,
-        }
-    }
-}
-
-impl<'a> AccountTransactionVersionIter<'a> {
-    fn next_impl(&mut self) -> Result<Option<(u64, Version)>> {
-        Ok(match self.inner.next().transpose()? {
-            Some(((address, seq_num), version)) => {
-                // No more transactions sent by this account.
-                if address != self.address {
-                    return Ok(None);
-                }
-                if seq_num >= self.end_seq_num {
-                    return Ok(None);
-                }
-
-                // Ensure seq_num_{i+1} == seq_num_{i} + 1
-                if let Some(expected_seq_num) = self.expected_next_seq_num {
-                    ensure!(
-                        seq_num == expected_seq_num,
-                        "DB corruption: account transactions sequence numbers are not contiguous: \
-                     actual: {}, expected: {}",
-                        seq_num,
-                        expected_seq_num,
-                    );
-                };
-
-                // Ensure version_{i+1} > version_{i}
-                if let Some(prev_version) = self.prev_version {
-                    ensure!(
-                        prev_version < version,
-                        "DB corruption: account transaction versions are not strictly increasing: \
-                         previous version: {}, current version: {}",
-                        prev_version,
-                        version,
-                    );
-                }
-
-                // No more transactions (in this view of the ledger).
-                if version > self.ledger_version {
-                    return Ok(None);
-                }
-
-                self.expected_next_seq_num = Some(seq_num + 1);
-                self.prev_version = Some(version);
-                Some((seq_num, version))
-            },
-            None => None,
-        })
-    }
-}
-
-impl<'a> Iterator for AccountTransactionVersionIter<'a> {
-    type Item = Result<(u64, Version)>;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        self.next_impl().transpose()
+        self.next_by_kv().transpose()
     }
 }
 
diff --git a/storage/aptosdb/src/utils/truncation_helper.rs b/storage/aptosdb/src/utils/truncation_helper.rs
index 3b5a2f7466cd7..7497efe067651 100644
--- a/storage/aptosdb/src/utils/truncation_helper.rs
+++ b/storage/aptosdb/src/utils/truncation_helper.rs
@@ -13,9 +13,12 @@ use crate::{
         stale_node_index::StaleNodeIndexSchema,
         stale_node_index_cross_epoch::StaleNodeIndexCrossEpochSchema,
         stale_state_value_index::StaleStateValueIndexSchema,
+        stale_state_value_index_by_key_hash::StaleStateValueIndexByKeyHashSchema,
         state_value::StateValueSchema,
+        state_value_by_key_hash::StateValueByKeyHashSchema,
         transaction::TransactionSchema,
         transaction_accumulator::TransactionAccumulatorSchema,
+        transaction_accumulator_root_hash::TransactionAccumulatorRootHashSchema,
         transaction_info::TransactionInfoSchema,
         version_data::VersionDataSchema,
         write_set::WriteSetSchema,
@@ -30,7 +33,7 @@ use aptos_jellyfish_merkle::{node_type::NodeKey, StaleNodeIndex};
 use aptos_logger::info;
 use aptos_schemadb::{
     schema::{Schema, SeekKeyCodec},
-    ReadOptions, SchemaBatch, DB,
+    SchemaBatch, DB,
 };
 use aptos_storage_interface::Result;
 use aptos_types::{proof::position::Position, transaction::Version};
@@ -123,7 +126,12 @@ pub(crate) fn truncate_state_kv_db_single_shard(
     target_version: Version,
 ) -> Result<()> {
     let batch = SchemaBatch::new();
-    delete_state_value_and_index(state_kv_db.db_shard(shard_id), target_version + 1, &batch)?;
+    delete_state_value_and_index(
+        state_kv_db.db_shard(shard_id),
+        target_version + 1,
+        &batch,
+        state_kv_db.enabled_sharding(),
+    )?;
     state_kv_db.commit_single_shard(target_version, shard_id, batch)
 }
 
@@ -199,7 +207,7 @@ pub(crate) fn find_closest_node_version_at_or_before(
 ) -> Result<Option<Version>> {
     let mut iter = state_merkle_db
         .metadata_db()
-        .rev_iter::<JellyfishMerkleNodeSchema>(Default::default())?;
+        .rev_iter::<JellyfishMerkleNodeSchema>()?;
     iter.seek_for_prev(&NodeKey::new_empty_path(version))?;
     Ok(iter.next().transpose()?.map(|item| item.0.version()))
 }
@@ -213,8 +221,7 @@ fn truncate_transaction_accumulator(
     start_version: Version,
     batch: &SchemaBatch,
 ) -> Result<()> {
-    let mut iter =
-        transaction_accumulator_db.iter::<TransactionAccumulatorSchema>(ReadOptions::default())?;
+    let mut iter = transaction_accumulator_db.iter::<TransactionAccumulatorSchema>()?;
     iter.seek_to_last();
     let (position, _) = iter.next().transpose()?.unwrap();
     let num_frozen_nodes = position.to_postorder_index() + 1;
@@ -304,7 +311,7 @@ fn delete_per_epoch_data(
     start_version: Version,
     batch: &SchemaBatch,
 ) -> Result<()> {
-    let mut iter = ledger_db.iter::<LedgerInfoSchema>(ReadOptions::default())?;
+    let mut iter = ledger_db.iter::<LedgerInfoSchema>()?;
     iter.seek_to_last();
     if let Some((epoch, ledger_info)) = iter.next().transpose()? {
         let version = ledger_info.commit_info().version();
@@ -318,7 +325,7 @@ fn delete_per_epoch_data(
         }
     }
 
-    let mut iter = ledger_db.iter::<EpochByVersionSchema>(ReadOptions::default())?;
+    let mut iter = ledger_db.iter::<EpochByVersionSchema>()?;
     iter.seek(&start_version)?;
 
     for item in iter {
@@ -340,6 +347,11 @@ fn delete_per_version_data(
     start_version: Version,
     batch: &LedgerDbSchemaBatches,
 ) -> Result<()> {
+    delete_per_version_data_impl::<TransactionAccumulatorRootHashSchema>(
+        ledger_db.transaction_accumulator_db_raw(),
+        start_version,
+        &batch.transaction_accumulator_db_batches,
+    )?;
     delete_per_version_data_impl::<TransactionInfoSchema>(
         ledger_db.transaction_info_db_raw(),
         start_version,
@@ -372,17 +384,17 @@ fn delete_per_version_data_impl<S>(
 where
     S: Schema<Key = Version>,
 {
-    let mut iter = ledger_db.iter::<S>(ReadOptions::default())?;
+    let mut iter = ledger_db.iter::<S>()?;
     iter.seek_to_last();
-    if let Some((lastest_version, _)) = iter.next().transpose()? {
-        if lastest_version >= start_version {
+    if let Some((latest_version, _)) = iter.next().transpose()? {
+        if latest_version >= start_version {
             info!(
                 start_version = start_version,
-                latest_version = lastest_version,
+                latest_version = latest_version,
                 cf_name = S::COLUMN_FAMILY_NAME,
                 "Truncate per version data."
             );
-            for version in start_version..=lastest_version {
+            for version in start_version..=latest_version {
                 batch.delete::<S>(&version)?;
             }
         }
@@ -402,9 +414,15 @@ fn delete_event_data(
                 latest_version = latest_version,
                 "Truncate event data."
             );
-            ledger_db
-                .event_db()
-                .prune_events(start_version, latest_version + 1, batch)?;
+            ledger_db.event_db().prune_events(
+                start_version,
+                latest_version + 1,
+                batch,
+                // Assuming same data will be overwritten into indices, we don't bother to deal
+                // with the existence or placement of indices
+                // TODO: prune data from internal indices
+                None,
+            )?;
         }
     }
     Ok(())
@@ -414,14 +432,29 @@ fn delete_state_value_and_index(
     state_kv_db_shard: &DB,
     start_version: Version,
     batch: &SchemaBatch,
+    enable_sharding: bool,
 ) -> Result<()> {
-    let mut iter = state_kv_db_shard.iter::<StaleStateValueIndexSchema>(ReadOptions::default())?;
-    iter.seek(&start_version)?;
-
-    for item in iter {
-        let (index, _) = item?;
-        batch.delete::<StaleStateValueIndexSchema>(&index)?;
-        batch.delete::<StateValueSchema>(&(index.state_key, index.stale_since_version))?;
+    if enable_sharding {
+        let mut iter = state_kv_db_shard.iter::<StaleStateValueIndexByKeyHashSchema>()?;
+        iter.seek(&start_version)?;
+
+        for item in iter {
+            let (index, _) = item?;
+            batch.delete::<StaleStateValueIndexByKeyHashSchema>(&index)?;
+            batch.delete::<StateValueByKeyHashSchema>(&(
+                index.state_key_hash,
+                index.stale_since_version,
+            ))?;
+        }
+    } else {
+        let mut iter = state_kv_db_shard.iter::<StaleStateValueIndexSchema>()?;
+        iter.seek(&start_version)?;
+
+        for item in iter {
+            let (index, _) = item?;
+            batch.delete::<StaleStateValueIndexSchema>(&index)?;
+            batch.delete::<StateValueSchema>(&(index.state_key, index.stale_since_version))?;
+        }
     }
 
     Ok(())
@@ -436,7 +469,7 @@ where
     S: Schema<Key = StaleNodeIndex>,
     Version: SeekKeyCodec<S>,
 {
-    let mut iter = db.iter::<S>(ReadOptions::default())?;
+    let mut iter = db.iter::<S>()?;
     iter.seek(&version)?;
     for item in iter {
         let (index, _) = item?;
@@ -457,7 +490,7 @@ fn delete_nodes_and_stale_indices_at_or_after_version(
         db, version, batch,
     )?;
 
-    let mut iter = db.iter::<JellyfishMerkleNodeSchema>(ReadOptions::default())?;
+    let mut iter = db.iter::<JellyfishMerkleNodeSchema>()?;
     iter.seek(&NodeKey::new_empty_path(version))?;
     for item in iter {
         let (key, _) = item?;
diff --git a/storage/backup/backup-cli/Cargo.toml b/storage/backup/backup-cli/Cargo.toml
index cc499aecff4b3..59dcb2d4a44c4 100644
--- a/storage/backup/backup-cli/Cargo.toml
+++ b/storage/backup/backup-cli/Cargo.toml
@@ -18,12 +18,15 @@ aptos-backup-service = { workspace = true }
 aptos-config = { workspace = true }
 aptos-crypto = { workspace = true }
 aptos-db = { workspace = true }
+aptos-db-indexer-schemas = { workspace = true }
 aptos-executor = { workspace = true }
 aptos-executor-test-helpers = { workspace = true }
 aptos-executor-types = { workspace = true }
+aptos-indexer-grpc-table-info = { workspace = true }
 aptos-infallible = { workspace = true }
 aptos-jellyfish-merkle = { workspace = true }
 aptos-logger = { workspace = true }
+aptos-metrics-core = { workspace = true }
 aptos-proptest-helpers = { workspace = true }
 aptos-push-metrics = { workspace = true }
 aptos-storage-interface = { workspace = true }
diff --git a/storage/backup/backup-cli/src/backup_types/epoch_ending/tests.rs b/storage/backup/backup-cli/src/backup_types/epoch_ending/tests.rs
index c473a01c61a31..3f130770dcc1f 100644
--- a/storage/backup/backup-cli/src/backup_types/epoch_ending/tests.rs
+++ b/storage/backup/backup-cli/src/backup_types/epoch_ending/tests.rs
@@ -68,6 +68,7 @@ fn end_to_end() {
                 },
                 GlobalBackupOpt {
                     max_chunk_size: 1024,
+                    concurrent_data_requests: 2,
                 },
                 client,
                 Arc::clone(&store),
@@ -87,6 +88,7 @@ fn end_to_end() {
                 rocksdb_opt: RocksdbOpt::default(),
                 concurrent_downloads: ConcurrentDownloadsOpt::default(),
                 replay_concurrency_level: ReplayConcurrencyLevelOpt::default(),
+                enable_state_indices: false,
             }
             .try_into()
             .unwrap(),
@@ -198,6 +200,7 @@ async fn test_trusted_waypoints_impl(
             },
             GlobalBackupOpt {
                 max_chunk_size: 1024,
+                concurrent_data_requests: 2,
             },
             client.clone(),
             Arc::clone(&store),
@@ -219,6 +222,7 @@ async fn test_trusted_waypoints_impl(
             rocksdb_opt: RocksdbOpt::default(),
             concurrent_downloads: ConcurrentDownloadsOpt::default(),
             replay_concurrency_level: ReplayConcurrencyLevelOpt::default(),
+            enable_state_indices: false,
         }
         .try_into()
         .unwrap(),
@@ -240,6 +244,7 @@ async fn test_trusted_waypoints_impl(
             rocksdb_opt: RocksdbOpt::default(),
             concurrent_downloads: ConcurrentDownloadsOpt::default(),
             replay_concurrency_level: ReplayConcurrencyLevelOpt::default(),
+            enable_state_indices: false,
         }
         .try_into()
         .unwrap(),
diff --git a/storage/backup/backup-cli/src/backup_types/state_snapshot/backup.rs b/storage/backup/backup-cli/src/backup_types/state_snapshot/backup.rs
index 465f9e1987f3b..155858011d8bf 100644
--- a/storage/backup/backup-cli/src/backup_types/state_snapshot/backup.rs
+++ b/storage/backup/backup-cli/src/backup_types/state_snapshot/backup.rs
@@ -5,26 +5,30 @@
 use crate::{
     backup_types::state_snapshot::manifest::{StateSnapshotBackup, StateSnapshotChunk},
     metadata::Metadata,
+    metrics::backup::BACKUP_TIMER,
     storage::{BackupHandleRef, BackupStorage, FileHandle, ShellSafeName},
     utils::{
         backup_service_client::BackupServiceClient, read_record_bytes::ReadRecordBytes,
-        should_cut_chunk, storage_ext::BackupStorageExt, GlobalBackupOpt,
+        should_cut_chunk, storage_ext::BackupStorageExt, stream::TryStreamX, GlobalBackupOpt,
     },
 };
-use anyhow::{anyhow, Result};
+use anyhow::{anyhow, ensure, Result};
 use aptos_crypto::{hash::CryptoHash, HashValue};
 use aptos_logger::prelude::*;
+use aptos_metrics_core::TimerHelper;
 use aptos_types::{
     ledger_info::LedgerInfoWithSignatures,
     proof::TransactionInfoWithProof,
     state_store::{state_key::StateKey, state_value::StateValue},
     transaction::Version,
 };
-use bytes::Bytes;
+use bytes::{BufMut, Bytes, BytesMut};
 use clap::Parser;
+use futures::{StreamExt, TryStream, TryStreamExt};
 use once_cell::sync::Lazy;
-use std::{convert::TryInto, str::FromStr, sync::Arc};
-use tokio::{io::AsyncWriteExt, time::Instant};
+use std::{convert::TryInto, str::FromStr, sync::Arc, time::Instant};
+use tokio::{io::AsyncWriteExt, sync::mpsc::Sender};
+use tokio_stream::wrappers::ReceiverStream;
 
 #[derive(Parser)]
 pub struct StateSnapshotBackupOpt {
@@ -35,12 +39,171 @@ pub struct StateSnapshotBackupOpt {
     pub epoch: u64,
 }
 
+struct Chunk {
+    bytes: Bytes,
+    first_key: HashValue,
+    first_idx: usize,
+    last_key: HashValue,
+    last_idx: usize,
+}
+
+struct ChunkerState<RecordStream> {
+    record_stream: Option<RecordStream>,
+    buf: BytesMut,
+    chunk_first_key: HashValue,
+    prev_record_len: usize,
+    current_idx: usize,
+    chunk_first_idx: usize,
+    max_chunk_size: usize,
+}
+
+impl<RecordStream> ChunkerState<RecordStream>
+where
+    RecordStream: TryStream<Ok = Bytes, Error = anyhow::Error> + Unpin,
+{
+    async fn new(mut record_stream: RecordStream, max_chunk_size: usize) -> Result<Self> {
+        let first_record = record_stream
+            .try_next()
+            .await?
+            .ok_or_else(|| anyhow!("State is empty."))?;
+
+        let chunk_first_key = Self::parse_key(&first_record)?;
+        let prev_record_len = first_record.len();
+
+        let mut buf = BytesMut::new();
+        buf.put_slice(&(first_record.len() as u32).to_be_bytes());
+        buf.extend(first_record);
+
+        Ok(Self {
+            record_stream: Some(record_stream),
+            buf,
+            chunk_first_key,
+            prev_record_len,
+            current_idx: 0,
+            chunk_first_idx: 0,
+            max_chunk_size,
+        })
+    }
+
+    async fn next_full_chunk(&mut self) -> Result<Option<Chunk>> {
+        let _timer = BACKUP_TIMER.timer_with(&["state_snapshot_next_full_chunk"]);
+
+        let input = self
+            .record_stream
+            .as_mut()
+            .expect("get_next_full_chunk after EOF.");
+
+        while let Some(record_bytes) = input.try_next().await? {
+            let _timer = BACKUP_TIMER.timer_with(&["state_snapshot_process_records"]);
+
+            // If buf + current_record exceeds max_chunk_size, dump current buf to a new chunk
+            let chunk_cut_opt = should_cut_chunk(&self.buf, &record_bytes, self.max_chunk_size)
+                .then(|| {
+                    let bytes = self.buf.split().freeze();
+                    let last_key = Self::parse_key(&bytes[bytes.len() - self.prev_record_len..])?;
+
+                    let chunk = Chunk {
+                        bytes,
+                        first_key: self.chunk_first_key,
+                        first_idx: self.chunk_first_idx,
+                        last_key,
+                        last_idx: self.current_idx,
+                    };
+
+                    self.chunk_first_idx = self.current_idx + 1;
+                    self.chunk_first_key = Self::parse_key(&record_bytes)?;
+
+                    Result::<_>::Ok(chunk)
+                })
+                .transpose()?;
+
+            // Append record to buf
+            self.prev_record_len = record_bytes.len();
+            self.buf
+                .put_slice(&(record_bytes.len() as u32).to_be_bytes());
+            self.buf.extend(record_bytes);
+            self.current_idx += 1;
+
+            // Return the full chunk if found
+            if let Some(chunk) = chunk_cut_opt {
+                return Ok(Some(chunk));
+            }
+        }
+
+        // Input file ended, full chunk not found.
+        // The call site will call get_last_chunk which consume ChunkerState
+        let _ = self.record_stream.take();
+        Ok(None)
+    }
+
+    async fn last_chunk(self) -> Result<Chunk> {
+        let Self {
+            record_stream: state_snapshot_file,
+            buf,
+            chunk_first_key,
+            prev_record_len,
+            current_idx,
+            chunk_first_idx,
+            max_chunk_size: _,
+        } = self;
+        ensure!(
+            state_snapshot_file.is_none(),
+            "get_last_chunk called before EOF"
+        );
+        ensure!(!buf.is_empty(), "Last chunk can't be empty");
+
+        let bytes = buf.freeze();
+        let last_key = Self::parse_key(&bytes[bytes.len() - prev_record_len..])?;
+
+        Ok(Chunk {
+            bytes,
+            first_key: chunk_first_key,
+            first_idx: chunk_first_idx,
+            last_key,
+            last_idx: current_idx,
+        })
+    }
+
+    fn parse_key(record: &[u8]) -> Result<HashValue> {
+        let (key, _): (StateKey, StateValue) = bcs::from_bytes(record)?;
+        Ok(key.hash())
+    }
+}
+
+struct Chunker<R> {
+    state: Option<ChunkerState<R>>,
+}
+
+impl<RecordStream> Chunker<RecordStream>
+where
+    RecordStream: TryStream<Ok = Bytes, Error = anyhow::Error> + Unpin,
+{
+    async fn new(record_stream: RecordStream, max_chunk_size: usize) -> Result<Self> {
+        Ok(Self {
+            state: Some(ChunkerState::new(record_stream, max_chunk_size).await?),
+        })
+    }
+
+    async fn next_chunk(&mut self) -> Result<Option<Chunk>> {
+        let ret = match self.state.as_mut() {
+            None => None,
+            Some(state) => match state.next_full_chunk().await? {
+                Some(chunk) => Some(chunk),
+                None => Some(self.state.take().unwrap().last_chunk().await?),
+            },
+        };
+
+        Ok(ret)
+    }
+}
+
 pub struct StateSnapshotBackupController {
     epoch: u64,
     version: Option<Version>, // initialize before using
     max_chunk_size: usize,
     client: Arc<BackupServiceClient>,
     storage: Arc<dyn BackupStorage>,
+    concurrent_data_requests: usize,
 }
 
 impl StateSnapshotBackupController {
@@ -56,6 +219,7 @@ impl StateSnapshotBackupController {
             max_chunk_size: global_opt.max_chunk_size,
             client,
             storage,
+            concurrent_data_requests: global_opt.concurrent_data_requests,
         }
     }
 
@@ -76,66 +240,119 @@ impl StateSnapshotBackupController {
             .create_backup_with_random_suffix(&self.backup_name())
             .await?;
 
-        let mut chunks = vec![];
-
-        let mut state_snapshot_file = self.client.get_state_snapshot(self.version()).await?;
-        let mut prev_record_bytes = state_snapshot_file
-            .read_record_bytes()
-            .await?
-            .ok_or_else(|| anyhow!("State is empty."))?;
-        let mut chunk_bytes = (prev_record_bytes.len() as u32).to_be_bytes().to_vec();
-        chunk_bytes.extend(&prev_record_bytes);
-        let mut chunk_first_key = Self::parse_key(&prev_record_bytes)?;
-        let mut current_idx: usize = 0;
-        let mut chunk_first_idx: usize = 0;
+        let record_stream = Box::pin(self.record_stream(self.concurrent_data_requests).await?);
+        let chunker = Chunker::new(record_stream, self.max_chunk_size).await?;
 
         let start = Instant::now();
-        while let Some(record_bytes) = state_snapshot_file.read_record_bytes().await? {
-            if should_cut_chunk(&chunk_bytes, &record_bytes, self.max_chunk_size) {
-                let chunk = self
-                    .write_chunk(
-                        &backup_handle,
-                        &chunk_bytes,
-                        chunk_first_idx,
-                        current_idx,
-                        chunk_first_key,
-                        Self::parse_key(&prev_record_bytes)?,
-                    )
-                    .await?;
-                chunks.push(chunk);
-                chunk_bytes = vec![];
-                chunk_first_idx = current_idx + 1;
-                chunk_first_key = Self::parse_key(&record_bytes)?;
+        let chunk_stream = futures::stream::try_unfold(chunker, |mut chunker| async {
+            Ok(chunker.next_chunk().await?.map(|chunk| (chunk, chunker)))
+        });
+
+        let chunk_manifest_fut_stream =
+            chunk_stream.map_ok(|chunk| self.write_chunk(&backup_handle, chunk));
 
+        let chunks: Vec<_> = chunk_manifest_fut_stream
+            .try_buffered_x(8, 4) // 4 concurrently, at most 8 results in buffer.
+            .map_ok(|chunk_manifest| {
+                let last_idx = chunk_manifest.last_idx;
                 info!(
-                    last_idx = current_idx,
+                    last_idx = last_idx,
                     values_per_second =
-                        ((current_idx + 1) as f64 / start.elapsed().as_secs_f64()) as u64,
+                        ((last_idx + 1) as f64 / start.elapsed().as_secs_f64()) as u64,
                     "Chunk written."
                 );
+                chunk_manifest
+            })
+            .try_collect()
+            .await?;
+
+        self.write_manifest(&backup_handle, chunks).await
+    }
+
+    async fn record_stream(
+        &self,
+        concurrency: usize,
+    ) -> Result<impl TryStream<Ok = Bytes, Error = anyhow::Error, Item = Result<Bytes>>> {
+        const CHUNK_SIZE: usize = if cfg!(test) { 2 } else { 100_000 };
+
+        let count = self.client.get_state_item_count(self.version()).await?;
+        let version = self.version();
+        let client = self.client.clone();
+
+        let chunks_stream = futures::stream::unfold(0, move |start_idx| async move {
+            if start_idx >= count {
+                return None;
             }
 
-            current_idx += 1;
-            chunk_bytes.extend((record_bytes.len() as u32).to_be_bytes());
-            chunk_bytes.extend(&record_bytes);
-            prev_record_bytes = record_bytes;
-        }
+            let next_start_idx = start_idx + CHUNK_SIZE;
+            let chunk_size = CHUNK_SIZE.min(count - start_idx);
 
-        assert!(!chunk_bytes.is_empty());
-        let chunk = self
-            .write_chunk(
-                &backup_handle,
-                &chunk_bytes,
-                chunk_first_idx,
-                current_idx,
-                chunk_first_key,
-                Self::parse_key(&prev_record_bytes)?,
-            )
-            .await?;
-        chunks.push(chunk);
+            Some(((start_idx, chunk_size), next_start_idx))
+        })
+        .map(Result::<_>::Ok);
 
-        self.write_manifest(&backup_handle, chunks).await
+        let record_stream_stream = chunks_stream.map_ok(move |(start_idx, chunk_size)| {
+            let client = client.clone();
+            async move {
+                let (tx, rx) = tokio::sync::mpsc::channel(chunk_size);
+                // spawn and forget, propagate error through channel
+                let _join_handle = tokio::spawn(send_records(
+                    client.clone(),
+                    version,
+                    start_idx,
+                    chunk_size,
+                    tx,
+                ));
+
+                Ok(ReceiverStream::new(rx))
+            }
+        });
+
+        Ok(record_stream_stream
+            .try_buffered_x(concurrency * 2, concurrency)
+            .try_flatten())
+    }
+}
+
+async fn send_records(
+    client: Arc<BackupServiceClient>,
+    version: Version,
+    start_idx: usize,
+    chunk_size: usize,
+    sender: Sender<Result<Bytes>>,
+) {
+    if let Err(err) = send_records_inner(client, version, start_idx, chunk_size, &sender).await {
+        let _ = sender.send(Err(err)).await;
+    }
+}
+
+async fn send_records_inner(
+    client: Arc<BackupServiceClient>,
+    version: Version,
+    start_idx: usize,
+    chunk_size: usize,
+    sender: &Sender<Result<Bytes>>,
+) -> Result<()> {
+    let _timer = BACKUP_TIMER.timer_with(&["state_snapshot_record_stream_all"]);
+    let mut input = client
+        .get_state_snapshot_chunk(version, start_idx, chunk_size)
+        .await?;
+    let mut count = 0;
+    while let Some(record_bytes) = {
+        let _timer = BACKUP_TIMER.timer_with(&["state_snapshot_read_record_bytes"]);
+        input.read_record_bytes().await?
+    } {
+        let _timer = BACKUP_TIMER.timer_with(&["state_snapshot_record_stream_send_bytes"]);
+        count += 1;
+        sender.send(Ok(record_bytes)).await?;
     }
+    ensure!(
+        count == chunk_size,
+        "expecting {} records, got {}",
+        chunk_size,
+        count
+    );
+    Ok(())
 }
 
 impl StateSnapshotBackupController {
@@ -169,11 +386,6 @@ impl StateSnapshotBackupController {
             .unwrap()
     }
 
-    fn parse_key(record: &Bytes) -> Result<HashValue> {
-        let (key, _): (StateKey, StateValue) = bcs::from_bytes(record)?;
-        Ok(key.hash())
-    }
-
     async fn get_version_for_epoch_ending(&self, epoch: u64) -> Result<u64> {
         let ledger_info: LedgerInfoWithSignatures = bcs::from_bytes(
             self.client
@@ -192,17 +404,23 @@ impl StateSnapshotBackupController {
     async fn write_chunk(
         &self,
         backup_handle: &BackupHandleRef,
-        chunk_bytes: &[u8],
-        first_idx: usize,
-        last_idx: usize,
-        first_key: HashValue,
-        last_key: HashValue,
+        chunk: Chunk,
     ) -> Result<StateSnapshotChunk> {
+        let _timer = BACKUP_TIMER.timer_with(&["state_snapshot_write_chunk"]);
+
+        let Chunk {
+            bytes,
+            first_idx,
+            last_idx,
+            first_key,
+            last_key,
+        } = chunk;
+
         let (chunk_handle, mut chunk_file) = self
             .storage
             .create_for_write(backup_handle, &Self::chunk_name(first_idx))
             .await?;
-        chunk_file.write_all(chunk_bytes).await?;
+        chunk_file.write_all(&bytes).await?;
         chunk_file.shutdown().await?;
         let (proof_handle, mut proof_file) = self
             .storage
diff --git a/storage/backup/backup-cli/src/backup_types/state_snapshot/restore.rs b/storage/backup/backup-cli/src/backup_types/state_snapshot/restore.rs
index 20516aa68b604..f538f4cc462c2 100644
--- a/storage/backup/backup-cli/src/backup_types/state_snapshot/restore.rs
+++ b/storage/backup/backup-cli/src/backup_types/state_snapshot/restore.rs
@@ -30,15 +30,15 @@ use aptos_storage_interface::StateSnapshotReceiver;
 use aptos_types::{
     access_path::Path,
     ledger_info::LedgerInfoWithSignatures,
-    on_chain_config::{Features, TimedFeatureOverride, TimedFeaturesBuilder},
+    on_chain_config::Features,
     proof::TransactionInfoWithProof,
     state_store::{
         state_key::{inner::StateKeyInner, StateKey},
         state_value::StateValue,
     },
     transaction::Version,
+    vm::configs::aptos_prod_verifier_config,
 };
-use aptos_vm::move_vm_ext::verifier_config;
 use clap::Parser;
 use futures::{stream, TryStreamExt};
 use move_binary_format::CompiledModule;
@@ -233,13 +233,10 @@ impl StateSnapshotRestoreController {
     }
 
     fn validate_modules(blob: &[(StateKey, StateValue)]) {
-        let config = verifier_config(
-            &Features::default(),
-            // FIXME: feed chain id & timestamp from the state.
-            &TimedFeaturesBuilder::enable_all()
-                .with_override_profile(TimedFeatureOverride::Replay)
-                .build(),
-        );
+        // TODO: Instead of using default features, fetch them from the the state.
+        let features = Features::default();
+
+        let config = aptos_prod_verifier_config(&features);
         for (key, value) in blob {
             if let StateKeyInner::AccessPath(p) = key.inner() {
                 if let Path::Code(module_id) = p.get_path() {
diff --git a/storage/backup/backup-cli/src/backup_types/state_snapshot/tests.rs b/storage/backup/backup-cli/src/backup_types/state_snapshot/tests.rs
index ae7a4f890ecb6..9f9160c4da6e3 100644
--- a/storage/backup/backup-cli/src/backup_types/state_snapshot/tests.rs
+++ b/storage/backup/backup-cli/src/backup_types/state_snapshot/tests.rs
@@ -64,6 +64,7 @@ fn end_to_end() {
                 StateSnapshotBackupOpt { epoch },
                 GlobalBackupOpt {
                     max_chunk_size: 500,
+                    concurrent_data_requests: 2,
                 },
                 client,
                 Arc::clone(&store),
@@ -88,6 +89,7 @@ fn end_to_end() {
                 rocksdb_opt: RocksdbOpt::default(),
                 concurrent_downloads: ConcurrentDownloadsOpt::default(),
                 replay_concurrency_level: ReplayConcurrencyLevelOpt::default(),
+                enable_state_indices: false,
             }
             .try_into()
             .unwrap(),
diff --git a/storage/backup/backup-cli/src/backup_types/tests.rs b/storage/backup/backup-cli/src/backup_types/tests.rs
index 7bf8d31e8c8cf..0ad9f270c2d5a 100644
--- a/storage/backup/backup-cli/src/backup_types/tests.rs
+++ b/storage/backup/backup-cli/src/backup_types/tests.rs
@@ -41,7 +41,7 @@ struct TestData {
 
 fn test_data_strategy() -> impl Strategy<Value = TestData> {
     let db = test_execution_with_storage_impl();
-    let latest_ver = db.get_latest_version().unwrap();
+    let latest_ver = db.get_synced_version().unwrap();
 
     let latest_epoch_state = db.get_latest_epoch_state().unwrap();
     let epoch_ending_lis = db
@@ -88,6 +88,7 @@ fn test_end_to_end_impl(d: TestData) {
     // Backup
     let global_backup_opt = GlobalBackupOpt {
         max_chunk_size: 2048,
+        concurrent_data_requests: 2,
     };
     let state_snapshot_manifest = d.state_snapshot_epoch.map(|epoch| {
         rt.block_on(
@@ -124,6 +125,7 @@ fn test_end_to_end_impl(d: TestData) {
         rocksdb_opt: RocksdbOpt::default(),
         concurrent_downloads: ConcurrentDownloadsOpt::default(),
         replay_concurrency_level: ReplayConcurrencyLevelOpt::default(),
+        enable_state_indices: false,
     }
     .try_into()
     .unwrap();
diff --git a/storage/backup/backup-cli/src/backup_types/transaction/analysis.rs b/storage/backup/backup-cli/src/backup_types/transaction/analysis.rs
index 0e90c62d0bac9..5a10ffcd61cd9 100644
--- a/storage/backup/backup-cli/src/backup_types/transaction/analysis.rs
+++ b/storage/backup/backup-cli/src/backup_types/transaction/analysis.rs
@@ -117,6 +117,7 @@ impl TransactionAnalysis {
             | BlockMetadata(_)
             | BlockMetadataExt(_)
             | StateCheckpoint(_)
+            | BlockEpilogue(_)
             | ValidatorTransaction(_) => bcs::serialized_size(txn).expect("Txn should serialize"),
         }
     }
diff --git a/storage/backup/backup-cli/src/backup_types/transaction/tests.rs b/storage/backup/backup-cli/src/backup_types/transaction/tests.rs
index 5b97e14e0c5fd..fb75f3299a2be 100644
--- a/storage/backup/backup-cli/src/backup_types/transaction/tests.rs
+++ b/storage/backup/backup-cli/src/backup_types/transaction/tests.rs
@@ -66,7 +66,10 @@ fn end_to_end() {
                         start_version: 0,
                         num_transactions: first_ver_to_backup as usize,
                     },
-                    GlobalBackupOpt { max_chunk_size },
+                    GlobalBackupOpt {
+                        max_chunk_size,
+                        concurrent_data_requests: 2,
+                    },
                     client.clone(),
                     Arc::clone(&store),
                 )
@@ -83,7 +86,10 @@ fn end_to_end() {
                     start_version: first_ver_to_backup,
                     num_transactions: num_txns_to_backup,
                 },
-                GlobalBackupOpt { max_chunk_size },
+                GlobalBackupOpt {
+                    max_chunk_size,
+                    concurrent_data_requests: 2,
+                },
                 client,
                 Arc::clone(&store),
             )
@@ -101,6 +107,7 @@ fn end_to_end() {
                 rocksdb_opt: RocksdbOpt::default(),
                 concurrent_downloads: ConcurrentDownloadsOpt::default(),
                 replay_concurrency_level: ReplayConcurrencyLevelOpt::default(),
+                enable_state_indices: false,
             }
             .try_into()
             .unwrap(),
@@ -137,7 +144,7 @@ fn end_to_end() {
         assert_eq!(restore_ws, org_ws);
     }
 
-    assert_eq!(tgt_db.get_latest_version().unwrap(), target_version);
+    assert_eq!(tgt_db.get_synced_version().unwrap(), target_version);
     let recovered_transactions = tgt_db
         .get_transactions(
             0,
diff --git a/storage/backup/backup-cli/src/coordinators/replay_verify.rs b/storage/backup/backup-cli/src/coordinators/replay_verify.rs
index d534ff900335f..cff0c43e83bd2 100644
--- a/storage/backup/backup-cli/src/coordinators/replay_verify.rs
+++ b/storage/backup/backup-cli/src/coordinators/replay_verify.rs
@@ -17,7 +17,10 @@ use aptos_db::backup::restore_handler::RestoreHandler;
 use aptos_executor_types::VerifyExecutionMode;
 use aptos_logger::prelude::*;
 use aptos_storage_interface::AptosDbError;
-use aptos_types::{on_chain_config::TimedFeatureOverride, transaction::Version};
+use aptos_types::{
+    on_chain_config::TimedFeatureOverride, transaction::Version,
+    vm::configs::set_timed_feature_override,
+};
 use aptos_vm::AptosVM;
 use std::sync::Arc;
 use thiserror::Error;
@@ -99,7 +102,7 @@ impl ReplayVerifyCoordinator {
 
     async fn run_impl(self) -> Result<(), ReplayError> {
         AptosVM::set_concurrency_level_once(self.replay_concurrency_level);
-        AptosVM::set_timed_feature_override(TimedFeatureOverride::Replay);
+        set_timed_feature_override(TimedFeatureOverride::Replay);
 
         let metadata_view = metadata::cache::sync_and_load(
             &self.metadata_cache_opt,
diff --git a/storage/backup/backup-cli/src/metadata/cache.rs b/storage/backup/backup-cli/src/metadata/cache.rs
index a04ba7bd97883..f7eb9c93463e2 100644
--- a/storage/backup/backup-cli/src/metadata/cache.rs
+++ b/storage/backup/backup-cli/src/metadata/cache.rs
@@ -154,19 +154,30 @@ pub async fn sync_and_load(
             let local_file = cache_dir_ref.join(*h);
             let local_tmp_file = cache_dir_ref.join(format!(".{}", *h));
 
-            download_file(storage_ref, file_handle, &local_tmp_file).await?;
-            // rename to target file only if successful; stale tmp file caused by failure will be
-            // reclaimed on next run
-            tokio::fs::rename(local_tmp_file.clone(), local_file)
-                .await
-                .err_notes(local_tmp_file)?;
-            info!(
-                file_handle = file_handle,
-                processed = i + 1,
-                total = num_new_files,
-                "Metadata file downloaded."
-            );
-            NUM_META_DOWNLOAD.inc();
+            match download_file(storage_ref, file_handle, &local_tmp_file).await {
+                Ok(_) => {
+                    // rename to target file only if successful; stale tmp file caused by failure will be
+                    // reclaimed on next run
+                    tokio::fs::rename(local_tmp_file.clone(), local_file)
+                        .await
+                        .err_notes(local_tmp_file)?;
+                    info!(
+                        file_handle = file_handle,
+                        processed = i + 1,
+                        total = num_new_files,
+                        "Metadata file downloaded."
+                    );
+                    NUM_META_DOWNLOAD.inc();
+                },
+                Err(e) => {
+                    warn!(
+                        file_handle = file_handle,
+                        error = %e,
+                        "Ignoring metadata file download error -- can be compactor removing files."
+                    )
+                },
+            }
+
             Ok(())
         }
     });
diff --git a/storage/backup/backup-cli/src/metadata/view.rs b/storage/backup/backup-cli/src/metadata/view.rs
index fd9c5bd3be643..d42c3a39061a3 100644
--- a/storage/backup/backup-cli/src/metadata/view.rs
+++ b/storage/backup/backup-cli/src/metadata/view.rs
@@ -115,14 +115,14 @@ impl MetadataView {
             .sorted()
             .rev()
             .find(|m| m.version <= target_version)
-            .map(Clone::clone))
+            .cloned())
     }
 
     pub fn expect_state_snapshot(&self, version: Version) -> Result<StateSnapshotBackupMeta> {
         self.state_snapshot_backups
             .iter()
             .find(|m| m.version == version)
-            .map(Clone::clone)
+            .cloned()
             .ok_or_else(|| anyhow!("State snapshot not found at version {}", version))
     }
 
diff --git a/storage/backup/backup-cli/src/metrics/backup.rs b/storage/backup/backup-cli/src/metrics/backup.rs
index 1b437af5801e4..e2a9d767a039b 100644
--- a/storage/backup/backup-cli/src/metrics/backup.rs
+++ b/storage/backup/backup-cli/src/metrics/backup.rs
@@ -2,7 +2,10 @@
 // Parts of the project are originally copyright © Meta Platforms, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-use aptos_push_metrics::{register_int_gauge, IntGauge};
+use aptos_metrics_core::{register_int_counter_vec, IntCounterVec};
+use aptos_push_metrics::{
+    exponential_buckets, register_histogram_vec, register_int_gauge, HistogramVec, IntGauge,
+};
 use once_cell::sync::Lazy;
 
 pub static HEARTBEAT_TS: Lazy<IntGauge> = Lazy::new(|| {
@@ -44,3 +47,22 @@ pub static COMPACTED_TXN_VERSION: Lazy<IntGauge> = Lazy::new(|| {
     )
     .unwrap()
 });
+
+pub static BACKUP_TIMER: Lazy<HistogramVec> = Lazy::new(|| {
+    register_histogram_vec!(
+        "aptos_db_backup_timers_seconds",
+        "Various timers for performance analysis.",
+        &["name"],
+        exponential_buckets(/*start=*/ 1e-6, /*factor=*/ 2.0, /*count=*/ 32).unwrap(),
+    )
+    .unwrap()
+});
+
+pub static THROUGHPUT_COUNTER: Lazy<IntCounterVec> = Lazy::new(|| {
+    register_int_counter_vec!(
+        "aptos_db_backup_received_bytes",
+        "Backup controller throughput in bytes.",
+        &["endpoint"]
+    )
+    .unwrap()
+});
diff --git a/storage/backup/backup-cli/src/utils/backup_service_client.rs b/storage/backup/backup-cli/src/utils/backup_service_client.rs
index 0f1c158ac8bf9..530dc604b8cae 100644
--- a/storage/backup/backup-cli/src/utils/backup_service_client.rs
+++ b/storage/backup/backup-cli/src/utils/backup_service_client.rs
@@ -2,10 +2,14 @@
 // Parts of the project are originally copyright © Meta Platforms, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::utils::error_notes::ErrorNotes;
+use crate::{
+    metrics::backup::{BACKUP_TIMER, THROUGHPUT_COUNTER},
+    utils::error_notes::ErrorNotes,
+};
 use anyhow::Result;
 use aptos_crypto::HashValue;
 use aptos_db::backup::backup_handler::DbState;
+use aptos_metrics_core::{IntCounterHelper, TimerHelper};
 use aptos_types::transaction::Version;
 use clap::Parser;
 use futures::TryStreamExt;
@@ -49,8 +53,14 @@ impl BackupServiceClient {
         }
     }
 
-    async fn get(&self, path: &str) -> Result<impl AsyncRead> {
-        let url = format!("{}/{}", self.address, path);
+    async fn get(&self, endpoint: &'static str, params: &str) -> Result<impl AsyncRead> {
+        let _timer = BACKUP_TIMER.timer_with(&[&format!("backup_service_client_get_{endpoint}")]);
+
+        let url = if params.is_empty() {
+            format!("{}/{}", self.address, endpoint)
+        } else {
+            format!("{}/{}/{}", self.address, endpoint, params)
+        };
         let timeout = Duration::from_secs(Self::TIMEOUT_SECS);
         let reader = tokio::time::timeout(timeout, self.client.get(&url).send())
             .await?
@@ -58,6 +68,10 @@ impl BackupServiceClient {
             .error_for_status()
             .err_notes(&url)?
             .bytes_stream()
+            .map_ok(|bytes| {
+                THROUGHPUT_COUNTER.inc_with_by(&[endpoint], bytes.len() as u64);
+                bytes
+            })
             .map_err(|e| futures::io::Error::new(futures::io::ErrorKind::Other, e))
             .into_async_read()
             .compat();
@@ -72,7 +86,10 @@ impl BackupServiceClient {
 
     pub async fn get_db_state(&self) -> Result<Option<DbState>> {
         let mut buf = Vec::new();
-        self.get("db_state").await?.read_to_end(&mut buf).await?;
+        self.get("db_state", "")
+            .await?
+            .read_to_end(&mut buf)
+            .await?;
         Ok(bcs::from_bytes(&buf)?)
     }
 
@@ -81,17 +98,35 @@ impl BackupServiceClient {
         key: HashValue,
         version: Version,
     ) -> Result<impl AsyncRead> {
-        self.get(&format!("state_range_proof/{}/{:x}", version, key))
+        self.get("state_range_proof", &format!("{}/{:x}", version, key))
             .await
     }
 
-    pub async fn get_state_snapshot(&self, version: Version) -> Result<impl AsyncRead> {
-        self.get(&format!("state_snapshot/{}", version)).await
+    pub async fn get_state_item_count(&self, version: Version) -> Result<usize> {
+        let mut buf = Vec::new();
+        self.get("state_item_count", &format!("{}", version))
+            .await?
+            .read_to_end(&mut buf)
+            .await?;
+        Ok(bcs::from_bytes::<u64>(&buf)? as usize)
+    }
+
+    pub async fn get_state_snapshot_chunk(
+        &self,
+        version: Version,
+        start_idx: usize,
+        limit: usize,
+    ) -> Result<impl AsyncRead> {
+        self.get(
+            "state_snapshot_chunk",
+            &format!("{}/{}/{}", version, start_idx, limit),
+        )
+        .await
     }
 
     pub async fn get_state_root_proof(&self, version: Version) -> Result<Vec<u8>> {
         let mut buf = Vec::new();
-        self.get(&format!("state_root_proof/{}", version))
+        self.get("state_root_proof", &format!("{}", version))
             .await?
             .read_to_end(&mut buf)
             .await?;
@@ -103,10 +138,10 @@ impl BackupServiceClient {
         start_epoch: u64,
         end_epoch: u64,
     ) -> Result<impl AsyncRead> {
-        self.get(&format!(
-            "epoch_ending_ledger_infos/{}/{}",
-            start_epoch, end_epoch
-        ))
+        self.get(
+            "epoch_ending_ledger_infos",
+            &format!("{}/{}", start_epoch, end_epoch),
+        )
         .await
     }
 
@@ -115,10 +150,10 @@ impl BackupServiceClient {
         start_version: Version,
         num_transactions: usize,
     ) -> Result<impl AsyncRead> {
-        self.get(&format!(
-            "transactions/{}/{}",
-            start_version, num_transactions
-        ))
+        self.get(
+            "transactions",
+            &format!("{}/{}", start_version, num_transactions,),
+        )
         .await
     }
 
@@ -127,10 +162,10 @@ impl BackupServiceClient {
         first_version: Version,
         last_version: Version,
     ) -> Result<impl AsyncRead> {
-        self.get(&format!(
-            "transaction_range_proof/{}/{}",
-            first_version, last_version,
-        ))
+        self.get(
+            "transaction_range_proof",
+            &format!("{}/{}", first_version, last_version,),
+        )
         .await
     }
 }
diff --git a/storage/backup/backup-cli/src/utils/mod.rs b/storage/backup/backup-cli/src/utils/mod.rs
index f737d3d868b36..f814890df5e76 100644
--- a/storage/backup/backup-cli/src/utils/mod.rs
+++ b/storage/backup/backup-cli/src/utils/mod.rs
@@ -21,10 +21,11 @@ use aptos_db::{
     db::AptosDB,
     get_restore_handler::GetRestoreHandler,
     state_restore::{
-        StateSnapshotProgress, StateSnapshotRestore, StateSnapshotRestoreMode, StateValueBatch,
-        StateValueWriter,
+        StateSnapshotRestore, StateSnapshotRestoreMode, StateValueBatch, StateValueWriter,
     },
 };
+use aptos_db_indexer_schemas::metadata::StateSnapshotProgress;
+use aptos_indexer_grpc_table_info::internal_indexer_db_service::InternalIndexerDBService;
 use aptos_infallible::duration_since_epoch;
 use aptos_jellyfish_merkle::{NodeBatch, TreeWriter};
 use aptos_logger::info;
@@ -55,6 +56,13 @@ pub struct GlobalBackupOpt {
         help = "Maximum chunk file size in bytes."
     )]
     pub max_chunk_size: usize,
+    #[clap(
+        long,
+        default_value_t = 8,
+        help = "When applicable (currently only for state snapshot backups), the number of \
+        concurrent requests to the fullnode backup service. "
+    )]
+    pub concurrent_data_requests: usize,
 }
 
 #[derive(Clone, Parser)]
@@ -150,6 +158,9 @@ pub struct GlobalRestoreOpt {
 
     #[clap(flatten)]
     pub replay_concurrency_level: ReplayConcurrencyLevelOpt,
+
+    #[clap(long, help = "Restore the state indices when restore the snapshot")]
+    pub enable_state_indices: bool,
 }
 
 pub enum RestoreRunMode {
@@ -175,7 +186,7 @@ impl StateValueWriter<StateKey, StateValue> for MockStore {
         Ok(())
     }
 
-    fn write_usage(&self, _version: Version, _usage: StateStorageUsage) -> Result<()> {
+    fn kv_finish(&self, _version: Version, _usage: StateStorageUsage) -> Result<()> {
         Ok(())
     }
 
@@ -283,6 +294,11 @@ impl TryFrom<GlobalRestoreOpt> for GlobalRestoreOptions {
         let run_mode = if let Some(db_dir) = &opt.db_dir {
             // for restore, we can always start state store with empty buffered_state since we will restore
             // TODO(grao): Support path override here.
+            let internal_indexer_db = if opt.enable_state_indices {
+                InternalIndexerDBService::get_indexer_db_for_restore(db_dir.as_path())
+            } else {
+                None
+            };
             let restore_handler = Arc::new(AptosDB::open_kv_only(
                 StorageDirPaths::from_path(db_dir),
                 false,                       /* read_only */
@@ -291,6 +307,7 @@ impl TryFrom<GlobalRestoreOpt> for GlobalRestoreOptions {
                 false, /* indexer */
                 BUFFERED_STATE_TARGET_ITEMS,
                 DEFAULT_MAX_NUM_NODES_PER_LRU_CACHE_SHARD,
+                internal_indexer_db,
             )?)
             .get_restore_handler();
 
@@ -363,6 +380,9 @@ impl ConcurrentDownloadsOpt {
     }
 }
 
+#[derive(Clone, Copy, Default, Parser)]
+pub struct ConcurrentDataRequestsOpt {}
+
 #[derive(Clone, Copy, Default, Parser)]
 pub struct ReplayConcurrencyLevelOpt {
     /// AptosVM::set_concurrency_level_once() is called with this
diff --git a/storage/backup/backup-cli/src/utils/read_record_bytes.rs b/storage/backup/backup-cli/src/utils/read_record_bytes.rs
index 32ed646a81b11..e749c3c5b58cb 100644
--- a/storage/backup/backup-cli/src/utils/read_record_bytes.rs
+++ b/storage/backup/backup-cli/src/utils/read_record_bytes.rs
@@ -2,8 +2,9 @@
 // Parts of the project are originally copyright © Meta Platforms, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::utils::error_notes::ErrorNotes;
+use crate::{metrics::backup::BACKUP_TIMER, utils::error_notes::ErrorNotes};
 use anyhow::{bail, Result};
+use aptos_metrics_core::TimerHelper;
 use async_trait::async_trait;
 use bytes::{Bytes, BytesMut};
 use std::convert::TryInto;
@@ -42,6 +43,7 @@ impl<R: AsyncRead + Send + Unpin> ReadRecordBytes for R {
     }
 
     async fn read_record_bytes(&mut self) -> Result<Option<Bytes>> {
+        let _timer = BACKUP_TIMER.timer_with(&["read_record_bytes"]);
         // read record size
         let mut size_buf = BytesMut::with_capacity(4);
         self.read_full_buf_or_none(&mut size_buf).await?;
diff --git a/storage/backup/backup-service/Cargo.toml b/storage/backup/backup-service/Cargo.toml
index 0c59ace454fc7..d8d565b7637db 100644
--- a/storage/backup/backup-service/Cargo.toml
+++ b/storage/backup/backup-service/Cargo.toml
@@ -26,6 +26,7 @@ hyper = { workspace = true }
 once_cell = { workspace = true }
 serde = { workspace = true }
 tokio = { workspace = true }
+tokio-stream = { workspace = true }
 warp = { workspace = true }
 
 [dev-dependencies]
diff --git a/storage/backup/backup-service/src/handlers/bytes_sender.rs b/storage/backup/backup-service/src/handlers/bytes_sender.rs
new file mode 100644
index 0000000000000..250ea4f57ef87
--- /dev/null
+++ b/storage/backup/backup-service/src/handlers/bytes_sender.rs
@@ -0,0 +1,89 @@
+// Copyright © Aptos Foundation
+// Parts of the project are originally copyright © Meta Platforms, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::handlers::utils::THROUGHPUT_COUNTER;
+use aptos_metrics_core::IntCounterHelper;
+use aptos_storage_interface::{AptosDbError, Result as DbResult};
+use bytes::{BufMut, Bytes, BytesMut};
+use serde::Serialize;
+
+type BoxError = Box<dyn std::error::Error + Send + Sync>;
+type BytesResult = Result<Bytes, BoxError>;
+
+pub(super) struct BytesSender {
+    /// Buffers bytes instead of relying on the channel's backlog to provide backpressure, so
+    /// the max pending bytes are more predictable.
+    buffer: BytesMut,
+    bytes_tx: tokio::sync::mpsc::Sender<BytesResult>,
+    endpoint: &'static str,
+}
+
+impl BytesSender {
+    const MAX_BATCHES: usize = 100;
+    #[cfg(not(test))]
+    const TARGET_BATCH_SIZE: usize = 10 * 1024;
+    #[cfg(test)]
+    const TARGET_BATCH_SIZE: usize = 10;
+
+    pub fn new(
+        endpoint: &'static str,
+    ) -> (Self, tokio_stream::wrappers::ReceiverStream<BytesResult>) {
+        let (bytes_tx, bytes_rx) = tokio::sync::mpsc::channel(Self::MAX_BATCHES);
+
+        let myself = Self {
+            buffer: BytesMut::new(),
+            bytes_tx,
+            endpoint,
+        };
+
+        let stream = tokio_stream::wrappers::ReceiverStream::new(bytes_rx);
+
+        (myself, stream)
+    }
+
+    pub fn send_bytes(&mut self, bytes: Bytes) -> DbResult<()> {
+        self.buffer.extend(bytes);
+
+        if self.buffer.len() >= Self::TARGET_BATCH_SIZE {
+            self.flush_buffer()?
+        }
+
+        Ok(())
+    }
+
+    pub fn send_size_prefixed_bcs_bytes<Record: Serialize>(
+        &mut self,
+        record: Record,
+    ) -> DbResult<()> {
+        let record_bytes = bcs::to_bytes(&record)?;
+        let size_bytes = (record_bytes.len() as u32).to_be_bytes();
+
+        let mut buf = BytesMut::with_capacity(size_bytes.len() + record_bytes.len());
+        buf.put_slice(&size_bytes);
+        buf.extend(record_bytes);
+
+        self.send_bytes(buf.freeze())
+    }
+
+    pub fn flush_buffer(&mut self) -> DbResult<()> {
+        let bytes = self.buffer.split().freeze();
+        THROUGHPUT_COUNTER.inc_with_by(&[self.endpoint], bytes.len() as u64);
+
+        self.send_res(Ok(bytes))
+    }
+
+    pub fn finish(mut self) -> DbResult<()> {
+        self.flush_buffer()
+    }
+
+    pub fn abort<E: std::error::Error + Send + Sync + 'static>(self, err: E) -> DbResult<()> {
+        self.send_res(Err(Box::new(err)))
+    }
+
+    pub fn send_res(&self, item: BytesResult) -> DbResult<()> {
+        self.bytes_tx
+            .blocking_send(item)
+            .map_err(|e| AptosDbError::Other(format!("Failed to send to response stream. {e}")))
+    }
+}
diff --git a/storage/backup/backup-service/src/handlers/mod.rs b/storage/backup/backup-service/src/handlers/mod.rs
index 99b1e3143a70f..8ed06b2764c8f 100644
--- a/storage/backup/backup-service/src/handlers/mod.rs
+++ b/storage/backup/backup-service/src/handlers/mod.rs
@@ -2,11 +2,12 @@
 // Parts of the project are originally copyright © Meta Platforms, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
+mod bytes_sender;
 mod utils;
 
 use crate::handlers::utils::{
-    handle_rejection, reply_with_async_channel_writer, reply_with_bcs_bytes,
-    send_size_prefixed_bcs_bytes, unwrap_or_500, LATENCY_HISTOGRAM,
+    handle_rejection, reply_with_bcs_bytes, reply_with_bytes_sender, unwrap_or_500,
+    LATENCY_HISTOGRAM,
 };
 use aptos_crypto::hash::HashValue;
 use aptos_db::backup::backup_handler::BackupHandler;
@@ -16,6 +17,8 @@ use warp::{filters::BoxedFilter, reply::Reply, Filter};
 static DB_STATE: &str = "db_state";
 static STATE_RANGE_PROOF: &str = "state_range_proof";
 static STATE_SNAPSHOT: &str = "state_snapshot";
+static STATE_ITEM_COUNT: &str = "state_item_count";
+static STATE_SNAPSHOT_CHUNK: &str = "state_snapshot_chunk";
 static STATE_ROOT_PROOF: &str = "state_root_proof";
 static EPOCH_ENDING_LEDGER_INFOS: &str = "epoch_ending_ledger_infos";
 static TRANSACTIONS: &str = "transactions";
@@ -45,8 +48,32 @@ pub(crate) fn get_routes(backup_handler: BackupHandler) -> BoxedFilter<(impl Rep
     let bh = backup_handler.clone();
     let state_snapshot = warp::path!(Version)
         .map(move |version| {
-            reply_with_async_channel_writer(&bh, STATE_SNAPSHOT, |bh, sender| {
-                send_size_prefixed_bcs_bytes(bh.get_account_iter(version), sender)
+            reply_with_bytes_sender(&bh, STATE_SNAPSHOT, move |bh, sender| {
+                bh.get_state_item_iter(version, 0, usize::MAX)?
+                    .try_for_each(|record_res| sender.send_size_prefixed_bcs_bytes(record_res?))
+            })
+        })
+        .recover(handle_rejection);
+
+    // GET state_item_count/<version>
+    let bh = backup_handler.clone();
+    let state_item_count = warp::path!(Version)
+        .map(move |version| {
+            reply_with_bcs_bytes(
+                STATE_ITEM_COUNT,
+                &(bh.get_state_item_count(version)? as u64),
+            )
+        })
+        .map(unwrap_or_500)
+        .recover(handle_rejection);
+
+    // GET state_snapshot_chunk/<version>/<start_idx>/<limit>
+    let bh = backup_handler.clone();
+    let state_snapshot_chunk = warp::path!(Version / usize / usize)
+        .map(move |version, start_idx, limit| {
+            reply_with_bytes_sender(&bh, STATE_SNAPSHOT_CHUNK, move |bh, sender| {
+                bh.get_state_item_iter(version, start_idx, limit)?
+                    .try_for_each(|record_res| sender.send_size_prefixed_bcs_bytes(record_res?))
             })
         })
         .recover(handle_rejection);
@@ -64,19 +91,10 @@ pub(crate) fn get_routes(backup_handler: BackupHandler) -> BoxedFilter<(impl Rep
     let bh = backup_handler.clone();
     let epoch_ending_ledger_infos = warp::path!(u64 / u64)
         .map(move |start_epoch, end_epoch| {
-            // use async move block to group `bh` and the iterator into the same lifetime, since the
-            // latter references the former.
-            reply_with_async_channel_writer(
-                &bh,
-                EPOCH_ENDING_LEDGER_INFOS,
-                |bh, sender| async move {
-                    send_size_prefixed_bcs_bytes(
-                        bh.get_epoch_ending_ledger_info_iter(start_epoch, end_epoch),
-                        sender,
-                    )
-                    .await
-                },
-            )
+            reply_with_bytes_sender(&bh, EPOCH_ENDING_LEDGER_INFOS, move |bh, sender| {
+                bh.get_epoch_ending_ledger_info_iter(start_epoch, end_epoch)?
+                    .try_for_each(|record_res| sender.send_size_prefixed_bcs_bytes(record_res?))
+            })
         })
         .recover(handle_rejection);
 
@@ -84,14 +102,9 @@ pub(crate) fn get_routes(backup_handler: BackupHandler) -> BoxedFilter<(impl Rep
     let bh = backup_handler.clone();
     let transactions = warp::path!(Version / usize)
         .map(move |start_version, num_transactions| {
-            // use async move block to group `bh` and the iterator into the same lifetime, since the
-            // latter references the former.
-            reply_with_async_channel_writer(&bh, TRANSACTIONS, |bh, sender| async move {
-                send_size_prefixed_bcs_bytes(
-                    bh.get_transaction_iter(start_version, num_transactions),
-                    sender,
-                )
-                .await
+            reply_with_bytes_sender(&bh, TRANSACTIONS, move |bh, sender| {
+                bh.get_transaction_iter(start_version, num_transactions)?
+                    .try_for_each(|record_res| sender.send_size_prefixed_bcs_bytes(record_res?))
             })
         })
         .recover(handle_rejection);
@@ -113,6 +126,8 @@ pub(crate) fn get_routes(backup_handler: BackupHandler) -> BoxedFilter<(impl Rep
         .and(warp::path(DB_STATE).and(db_state))
         .or(warp::path(STATE_RANGE_PROOF).and(state_range_proof))
         .or(warp::path(STATE_SNAPSHOT).and(state_snapshot))
+        .or(warp::path(STATE_ITEM_COUNT).and(state_item_count))
+        .or(warp::path(STATE_SNAPSHOT_CHUNK).and(state_snapshot_chunk))
         .or(warp::path(STATE_ROOT_PROOF).and(state_root_proof))
         .or(warp::path(EPOCH_ENDING_LEDGER_INFOS).and(epoch_ending_ledger_infos))
         .or(warp::path(TRANSACTIONS).and(transactions))
diff --git a/storage/backup/backup-service/src/handlers/utils.rs b/storage/backup/backup-service/src/handlers/utils.rs
index f834a241a93d7..220d430720a1b 100644
--- a/storage/backup/backup-service/src/handlers/utils.rs
+++ b/storage/backup/backup-service/src/handlers/utils.rs
@@ -2,17 +2,17 @@
 // Parts of the project are originally copyright © Meta Platforms, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-use aptos_db::backup::backup_handler::BackupHandler;
+use crate::handlers::bytes_sender;
+use aptos_db::{backup::backup_handler::BackupHandler, metrics::BACKUP_TIMER};
 use aptos_logger::prelude::*;
 use aptos_metrics_core::{
-    register_histogram_vec, register_int_counter_vec, HistogramVec, IntCounterVec,
+    register_histogram_vec, register_int_counter_vec, HistogramVec, IntCounterVec, TimerHelper,
 };
-use aptos_storage_interface::{AptosDbError, Result};
-use bytes::Bytes;
+use aptos_storage_interface::Result as DbResult;
 use hyper::Body;
 use once_cell::sync::Lazy;
 use serde::Serialize;
-use std::{convert::Infallible, future::Future};
+use std::convert::Infallible;
 use warp::{reply::Response, Rejection, Reply};
 
 pub(super) static LATENCY_HISTOGRAM: Lazy<HistogramVec> = Lazy::new(|| {
@@ -36,7 +36,7 @@ pub(super) static THROUGHPUT_COUNTER: Lazy<IntCounterVec> = Lazy::new(|| {
 pub(super) fn reply_with_bcs_bytes<R: Serialize>(
     endpoint: &str,
     record: &R,
-) -> Result<Box<dyn Reply>> {
+) -> DbResult<Box<dyn Reply>> {
     let bytes = bcs::to_bytes(record)?;
     THROUGHPUT_COUNTER
         .with_label_values(&[endpoint])
@@ -44,83 +44,44 @@ pub(super) fn reply_with_bcs_bytes<R: Serialize>(
     Ok(Box::new(bytes))
 }
 
-pub(super) struct BytesSender {
-    endpoint: &'static str,
-    inner: hyper::body::Sender,
-}
-
-impl BytesSender {
-    fn new(endpoint: &'static str, inner: hyper::body::Sender) -> Self {
-        Self { endpoint, inner }
-    }
-
-    async fn send_data(&mut self, chunk: Bytes) -> Result<()> {
-        let n_bytes = chunk.len();
-        self.inner
-            .send_data(chunk)
-            .await
-            .map_err(|e| AptosDbError::Other(e.to_string()))?;
-        THROUGHPUT_COUNTER
-            .with_label_values(&[self.endpoint])
-            .inc_by(n_bytes as u64);
-        Ok(())
-    }
-
-    fn abort(self) {
-        self.inner.abort()
-    }
-}
-
-pub(super) fn reply_with_async_channel_writer<G, F>(
+pub(super) fn reply_with_bytes_sender<F>(
     backup_handler: &BackupHandler,
     endpoint: &'static str,
-    get_channel_writer: G,
+    f: F,
 ) -> Box<dyn Reply>
 where
-    G: FnOnce(BackupHandler, BytesSender) -> F,
-    F: Future<Output = ()> + Send + 'static,
+    F: FnOnce(BackupHandler, &mut bytes_sender::BytesSender) -> DbResult<()> + Send + 'static,
 {
-    let (sender, body) = Body::channel();
-    let sender = BytesSender::new(endpoint, sender);
-    let bh = backup_handler.clone();
-    tokio::spawn(get_channel_writer(bh, sender));
+    let (sender, stream) = bytes_sender::BytesSender::new(endpoint);
 
-    Box::new(Response::new(body))
-}
+    // spawn and forget, error propagates through the `stream: TryStream<_>`
+    let bh = backup_handler.clone();
+    let _join_handle = tokio::task::spawn_blocking(move || {
+        let _timer =
+            BACKUP_TIMER.timer_with(&[&format!("backup_service_bytes_sender_{}", endpoint)]);
+        abort_on_error(f)(bh, sender)
+    });
 
-pub(super) async fn send_size_prefixed_bcs_bytes<I, R>(iter_res: Result<I>, mut sender: BytesSender)
-where
-    I: Iterator<Item = Result<R>>,
-    R: Serialize,
-{
-    send_size_prefixed_bcs_bytes_impl(iter_res, &mut sender)
-        .await
-        .unwrap_or_else(|e| {
-            warn!("Failed writing to output http body: {:?}", e);
-            sender.abort()
-        });
+    Box::new(Response::new(Body::wrap_stream(stream)))
 }
 
-async fn send_size_prefixed_bcs_bytes_impl<I, R>(
-    iter_res: Result<I>,
-    sender: &mut BytesSender,
-) -> Result<()>
+pub(super) fn abort_on_error<F>(
+    f: F,
+) -> impl FnOnce(BackupHandler, bytes_sender::BytesSender) + Send + 'static
 where
-    I: Iterator<Item = Result<R>>,
-    R: Serialize,
+    F: FnOnce(BackupHandler, &mut bytes_sender::BytesSender) -> DbResult<()> + Send + 'static,
 {
-    for record_res in iter_res? {
-        let record = record_res?;
-        let record_bytes = bcs::to_bytes(&record)?;
-        let size_bytes = (record_bytes.len() as u32).to_be_bytes();
-        sender.send_data(Bytes::from(size_bytes.to_vec())).await?;
-        sender.send_data(Bytes::from(record_bytes)).await?;
+    move |bh: BackupHandler, mut sender: bytes_sender::BytesSender| {
+        // ignore error from finish() and abort()
+        let _res = match f(bh, &mut sender) {
+            Ok(()) => sender.finish(),
+            Err(e) => sender.abort(e),
+        };
     }
-    Ok(())
 }
 
 /// Return 500 on any error raised by the request handler.
-pub(super) fn unwrap_or_500(result: Result<Box<dyn Reply>>) -> Box<dyn Reply> {
+pub(super) fn unwrap_or_500(result: DbResult<Box<dyn Reply>>) -> Box<dyn Reply> {
     match result {
         Ok(resp) => resp,
         Err(e) => {
@@ -131,7 +92,7 @@ pub(super) fn unwrap_or_500(result: Result<Box<dyn Reply>>) -> Box<dyn Reply> {
 }
 
 /// Return 400 on any rejections (parameter parsing errors).
-pub(super) async fn handle_rejection(err: Rejection) -> Result<impl Reply, Infallible> {
+pub(super) async fn handle_rejection(err: Rejection) -> DbResult<impl Reply, Infallible> {
     warn!("bad request: {:?}", err);
     Ok(warp::http::StatusCode::BAD_REQUEST)
 }
diff --git a/storage/db-tool/src/bootstrap.rs b/storage/db-tool/src/bootstrap.rs
index 46aed10777957..8f7f1abe43ce8 100644
--- a/storage/db-tool/src/bootstrap.rs
+++ b/storage/db-tool/src/bootstrap.rs
@@ -57,6 +57,7 @@ impl Command {
             false, /* indexer */
             BUFFERED_STATE_TARGET_ITEMS,
             DEFAULT_MAX_NUM_NODES_PER_LRU_CACHE_SHARD,
+            None,
         )
         .expect("Failed to open DB.");
         let db = DbReaderWriter::new(db);
diff --git a/storage/db-tool/src/replay_verify.rs b/storage/db-tool/src/replay_verify.rs
index 21c1bd817e400..621c374a5e633 100644
--- a/storage/db-tool/src/replay_verify.rs
+++ b/storage/db-tool/src/replay_verify.rs
@@ -69,6 +69,7 @@ impl Opt {
             false, /* indexer */
             BUFFERED_STATE_TARGET_ITEMS,
             DEFAULT_MAX_NUM_NODES_PER_LRU_CACHE_SHARD,
+            None,
         )?)
         .get_restore_handler();
         let ret = ReplayVerifyCoordinator::new(
diff --git a/storage/db-tool/src/tests.rs b/storage/db-tool/src/tests.rs
index eb31df420ee0e..578110a408b93 100644
--- a/storage/db-tool/src/tests.rs
+++ b/storage/db-tool/src/tests.rs
@@ -474,7 +474,6 @@ mod dbtool_tests {
                 StateKeyPrefix::new(AccessPath, b"".to_vec()),
                 None,
                 ver,
-                force_sharding,
             )
             .unwrap();
             let old_iter = db
diff --git a/storage/indexer/Cargo.toml b/storage/indexer/Cargo.toml
index b57c5b7da1435..963c1a61864b0 100644
--- a/storage/indexer/Cargo.toml
+++ b/storage/indexer/Cargo.toml
@@ -15,6 +15,7 @@ rust-version = { workspace = true }
 [dependencies]
 anyhow = { workspace = true }
 aptos-config = { workspace = true }
+aptos-db-indexer-schemas = { workspace = true }
 aptos-logger = { workspace = true }
 aptos-resource-viewer = { workspace = true }
 aptos-rocksdb-options = { workspace = true }
@@ -25,18 +26,13 @@ bcs = { workspace = true }
 bytes = { workspace = true }
 dashmap = { workspace = true }
 move-core-types = { workspace = true }
-proptest = { workspace = true, optional = true }
-proptest-derive = { workspace = true, optional = true }
-serde = { workspace = true }
 
 [dev-dependencies]
 aptos-proptest-helpers = { workspace = true }
 aptos-schemadb = { workspace = true, features = ["fuzzing"] }
 aptos-types = { workspace = true, features = ["fuzzing"] }
-proptest = { workspace = true }
-proptest-derive = { workspace = true }
 rand = { workspace = true }
 
 [features]
 default = []
-fuzzing = ["proptest", "proptest-derive", "aptos-types/fuzzing", "aptos-schemadb/fuzzing"]
+fuzzing = ["aptos-types/fuzzing", "aptos-schemadb/fuzzing"]
diff --git a/storage/indexer/src/db_indexer.rs b/storage/indexer/src/db_indexer.rs
new file mode 100644
index 0000000000000..5c6940a926cdc
--- /dev/null
+++ b/storage/indexer/src/db_indexer.rs
@@ -0,0 +1,570 @@
+// Copyright (c) Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::utils::PrefixedStateValueIterator;
+use aptos_config::config::internal_indexer_db_config::InternalIndexerDBConfig;
+use aptos_db_indexer_schemas::{
+    metadata::{MetadataKey, MetadataValue, StateSnapshotProgress},
+    schema::{
+        event_by_key::EventByKeySchema, event_by_version::EventByVersionSchema,
+        indexer_metadata::InternalIndexerMetadataSchema, state_keys::StateKeysSchema,
+        transaction_by_account::TransactionByAccountSchema,
+    },
+    utils::{
+        error_if_too_many_requested, get_first_seq_num_and_limit, AccountTransactionVersionIter,
+        MAX_REQUEST_LIMIT,
+    },
+};
+use aptos_schemadb::{SchemaBatch, DB};
+use aptos_storage_interface::{
+    db_ensure as ensure, db_other_bail as bail, AptosDbError, DbReader, Result,
+};
+use aptos_types::{
+    account_address::AccountAddress,
+    contract_event::{ContractEvent, EventWithVersion},
+    event::EventKey,
+    indexer::indexer_db_reader::Order,
+    state_store::{
+        state_key::{prefix::StateKeyPrefix, StateKey},
+        state_value::StateValue,
+    },
+    transaction::{AccountTransactionsWithProof, Transaction, Version},
+    write_set::{TransactionWrite, WriteSet},
+};
+use std::{
+    cmp::min,
+    sync::{
+        mpsc::{self, Receiver, Sender},
+        Arc,
+    },
+    thread,
+};
+
+pub struct DBCommitter {
+    db: Arc<DB>,
+    receiver: Receiver<Option<SchemaBatch>>,
+}
+
+impl DBCommitter {
+    pub fn new(db: Arc<DB>, receiver: Receiver<Option<SchemaBatch>>) -> Self {
+        Self { db, receiver }
+    }
+
+    pub fn run(&self) {
+        loop {
+            let batch_opt = self
+                .receiver
+                .recv()
+                .expect("Failed to receive batch from DB Indexer");
+            if let Some(batch) = batch_opt {
+                self.db
+                    .write_schemas(batch)
+                    .expect("Failed to write batch to indexer db");
+            } else {
+                break;
+            }
+        }
+    }
+}
+
+#[derive(Clone, Debug)]
+pub struct InternalIndexerDB {
+    db: Arc<DB>,
+    config: InternalIndexerDBConfig,
+}
+
+impl InternalIndexerDB {
+    pub fn new(db: Arc<DB>, config: InternalIndexerDBConfig) -> Self {
+        Self { db, config }
+    }
+
+    pub fn write_keys_to_indexer_db(
+        &self,
+        keys: &Vec<StateKey>,
+        snapshot_version: Version,
+        progress: StateSnapshotProgress,
+    ) -> Result<()> {
+        // add state value to internal indexer
+        let batch = SchemaBatch::new();
+        for state_key in keys {
+            batch.put::<StateKeysSchema>(state_key, &())?;
+        }
+
+        batch.put::<InternalIndexerMetadataSchema>(
+            &MetadataKey::StateSnapshotRestoreProgress(snapshot_version),
+            &MetadataValue::StateSnapshotProgress(progress),
+        )?;
+        self.db.write_schemas(batch)?;
+        Ok(())
+    }
+
+    pub fn get_persisted_version(&self) -> Result<Option<Version>> {
+        self.get_version(&MetadataKey::LatestVersion)
+    }
+
+    pub fn get_event_version(&self) -> Result<Option<Version>> {
+        self.get_version(&MetadataKey::EventVersion)
+    }
+
+    pub fn get_state_version(&self) -> Result<Option<Version>> {
+        self.get_version(&MetadataKey::StateVersion)
+    }
+
+    pub fn get_transaction_version(&self) -> Result<Option<Version>> {
+        self.get_version(&MetadataKey::TransactionVersion)
+    }
+
+    pub fn event_enabled(&self) -> bool {
+        self.config.enable_event
+    }
+
+    pub fn transaction_enabled(&self) -> bool {
+        self.config.enable_transaction
+    }
+
+    pub fn statekeys_enabled(&self) -> bool {
+        self.config.enable_statekeys
+    }
+
+    pub fn get_inner_db_ref(&self) -> &Arc<DB> {
+        &self.db
+    }
+
+    pub fn get_inner_db_clone(&self) -> Arc<DB> {
+        Arc::clone(&self.db)
+    }
+
+    pub fn get_restore_progress(&self, version: Version) -> Result<Option<StateSnapshotProgress>> {
+        Ok(self
+            .db
+            .get::<InternalIndexerMetadataSchema>(&MetadataKey::StateSnapshotRestoreProgress(
+                version,
+            ))?
+            .map(|e| e.expect_state_snapshot_progress()))
+    }
+
+    pub fn ensure_cover_ledger_version(&self, ledger_version: Version) -> Result<()> {
+        let indexer_latest_version = self.get_persisted_version()?;
+        if let Some(indexer_latest_version) = indexer_latest_version {
+            if indexer_latest_version >= ledger_version {
+                return Ok(());
+            }
+        }
+
+        bail!("ledger version too new")
+    }
+
+    pub fn get_account_transaction_version_iter(
+        &self,
+        address: AccountAddress,
+        min_seq_num: u64,
+        num_versions: u64,
+        ledger_version: Version,
+    ) -> Result<AccountTransactionVersionIter> {
+        let mut iter = self.db.iter::<TransactionByAccountSchema>()?;
+        iter.seek(&(address, min_seq_num))?;
+        Ok(AccountTransactionVersionIter::new(
+            iter,
+            address,
+            min_seq_num
+                .checked_add(num_versions)
+                .ok_or(AptosDbError::TooManyRequested(min_seq_num, num_versions))?,
+            ledger_version,
+        ))
+    }
+
+    pub fn get_latest_sequence_number(
+        &self,
+        ledger_version: Version,
+        event_key: &EventKey,
+    ) -> Result<Option<u64>> {
+        let mut iter = self.db.iter::<EventByVersionSchema>()?;
+        iter.seek_for_prev(&(*event_key, ledger_version, u64::max_value()))?;
+
+        Ok(iter.next().transpose()?.and_then(
+            |((key, _version, seq), _idx)| if &key == event_key { Some(seq) } else { None },
+        ))
+    }
+
+    /// Given `event_key` and `start_seq_num`, returns events identified by transaction version and
+    /// index among all events emitted by the same transaction. Result won't contain records with a
+    /// transaction version > `ledger_version` and is in ascending order.
+    pub fn lookup_events_by_key(
+        &self,
+        event_key: &EventKey,
+        start_seq_num: u64,
+        limit: u64,
+        ledger_version: u64,
+    ) -> Result<
+        Vec<(
+            u64,     // sequence number
+            Version, // transaction version it belongs to
+            u64,     // index among events for the same transaction
+        )>,
+    > {
+        let mut iter = self.db.iter::<EventByKeySchema>()?;
+        iter.seek(&(*event_key, start_seq_num))?;
+
+        let mut result = Vec::new();
+        let mut cur_seq = start_seq_num;
+        for res in iter.take(limit as usize) {
+            let ((path, seq), (ver, idx)) = res?;
+            if path != *event_key || ver > ledger_version {
+                break;
+            }
+            if seq != cur_seq {
+                let msg = if cur_seq == start_seq_num {
+                    "First requested event is probably pruned."
+                } else {
+                    "DB corruption: Sequence number not continuous."
+                };
+                bail!("{} expected: {}, actual: {}", msg, cur_seq, seq);
+            }
+            result.push((seq, ver, idx));
+            cur_seq += 1;
+        }
+
+        Ok(result)
+    }
+
+    #[cfg(any(test, feature = "fuzzing"))]
+    pub fn get_restore_version_and_progress(
+        &self,
+    ) -> Result<Option<(Version, StateSnapshotProgress)>> {
+        let mut iter = self.db.iter::<InternalIndexerMetadataSchema>()?;
+        iter.seek_to_first();
+        let mut last_version = None;
+        let mut last_progress = None;
+        for res in iter {
+            let (key, value) = res?;
+            if let MetadataKey::StateSnapshotRestoreProgress(version) = key {
+                last_version = Some(version);
+                last_progress = Some(value.expect_state_snapshot_progress());
+            }
+        }
+        Ok(last_version.map(|version| (version, last_progress.unwrap())))
+    }
+
+    #[cfg(any(test, feature = "fuzzing"))]
+    pub fn get_state_keys(&self, prefix: &StateKeyPrefix) -> Result<Vec<StateKey>> {
+        let mut iter = self.db.iter::<StateKeysSchema>()?;
+        iter.seek_to_first();
+        Ok(iter
+            .map(|res| res.unwrap().0)
+            .filter(|k| prefix.is_prefix(k).unwrap())
+            .collect())
+    }
+
+    #[cfg(any(test, feature = "fuzzing"))]
+    pub fn get_event_by_key_iter(
+        &self,
+    ) -> Result<Box<dyn Iterator<Item = (EventKey, u64, u64, u64)> + '_>> {
+        let mut iter = self.db.iter::<EventByKeySchema>()?;
+        iter.seek_to_first();
+        Ok(Box::new(iter.map(|res| {
+            let ((event_key, seq_num), (txn_version, idx)) = res.unwrap();
+            (event_key, txn_version, seq_num, idx)
+        })))
+    }
+
+    fn get_version(&self, key: &MetadataKey) -> Result<Option<Version>> {
+        Ok(self
+            .db
+            .get::<InternalIndexerMetadataSchema>(key)?
+            .map(|v| v.expect_version()))
+    }
+}
+
+pub struct DBIndexer {
+    pub indexer_db: InternalIndexerDB,
+    pub main_db_reader: Arc<dyn DbReader>,
+    sender: Sender<Option<SchemaBatch>>,
+    committer_handle: Option<thread::JoinHandle<()>>,
+}
+
+impl Drop for DBIndexer {
+    fn drop(&mut self) {
+        if let Some(handle) = self.committer_handle.take() {
+            self.sender
+                .send(None)
+                .expect("Failed to send None to DBIndexer committer");
+            handle
+                .join()
+                .expect("DBIndexer committer thread fails to join");
+        }
+    }
+}
+
+impl DBIndexer {
+    pub fn new(indexer_db: InternalIndexerDB, db_reader: Arc<dyn DbReader>) -> Self {
+        let (sender, reciver) = mpsc::channel();
+
+        let db = indexer_db.get_inner_db_ref().to_owned();
+        let committer_handle = thread::spawn(move || {
+            let committer = DBCommitter::new(db, reciver);
+            committer.run();
+        });
+
+        Self {
+            indexer_db,
+            main_db_reader: db_reader,
+            sender,
+            committer_handle: Some(committer_handle),
+        }
+    }
+
+    pub fn get_main_db_lowest_viable_version(&self) -> Result<Version> {
+        self.main_db_reader
+            .get_first_txn_version()
+            .transpose()
+            .expect("main db lowest viable version doesn't exist")
+    }
+
+    fn get_main_db_iter(
+        &self,
+        start_version: Version,
+        num_transactions: u64,
+    ) -> Result<impl Iterator<Item = Result<(Transaction, Vec<ContractEvent>, WriteSet)>> + '_>
+    {
+        let txn_iter = self
+            .main_db_reader
+            .get_transaction_iterator(start_version, num_transactions)?;
+        let event_vec_iter = self
+            .main_db_reader
+            .get_events_iterator(start_version, num_transactions)?;
+        let writeset_iter = self
+            .main_db_reader
+            .get_write_set_iterator(start_version, num_transactions)?;
+        let zipped = txn_iter.zip(event_vec_iter).zip(writeset_iter).map(
+            |((txn_res, event_vec_res), writeset_res)| {
+                let txn = txn_res?;
+                let event_vec = event_vec_res?;
+                let writeset = writeset_res?;
+                Ok((txn, event_vec, writeset))
+            },
+        );
+        Ok(zipped)
+    }
+
+    fn get_num_of_transactions(&self, version: Version) -> Result<u64> {
+        let highest_version = self.main_db_reader.get_synced_version()?;
+        if version > highest_version {
+            // In case main db is not synced yet or recreated
+            return Ok(0);
+        }
+        // we want to include the last transaction since the iterator interface will is right exclusive.
+        let num_of_transaction = min(
+            self.indexer_db.config.batch_size as u64,
+            highest_version + 1 - version,
+        );
+        Ok(num_of_transaction)
+    }
+
+    pub fn process_a_batch(&self, start_version: Version) -> Result<Version> {
+        let mut version = start_version;
+        let num_transactions = self.get_num_of_transactions(version)?;
+        let mut db_iter = self.get_main_db_iter(version, num_transactions)?;
+        let batch = SchemaBatch::new();
+        db_iter.try_for_each(|res| {
+            let (txn, events, writeset) = res?;
+            if let Some(txn) = txn.try_as_signed_user_txn() {
+                if self.indexer_db.transaction_enabled() {
+                    batch.put::<TransactionByAccountSchema>(
+                        &(txn.sender(), txn.sequence_number()),
+                        &version,
+                    )?;
+                }
+            }
+
+            if self.indexer_db.event_enabled() {
+                events.iter().enumerate().for_each(|(idx, event)| {
+                    if let ContractEvent::V1(v1) = event {
+                        batch
+                            .put::<EventByKeySchema>(
+                                &(*v1.key(), v1.sequence_number()),
+                                &(version, idx as u64),
+                            )
+                            .expect("Failed to put events by key to a batch");
+                        batch
+                            .put::<EventByVersionSchema>(
+                                &(*v1.key(), version, v1.sequence_number()),
+                                &(idx as u64),
+                            )
+                            .expect("Failed to put events by version to a batch");
+                    }
+                });
+            }
+
+            if self.indexer_db.statekeys_enabled() {
+                writeset.iter().for_each(|(state_key, write_op)| {
+                    if write_op.is_creation() {
+                        batch
+                            .put::<StateKeysSchema>(state_key, &())
+                            .expect("Failed to put state keys to a batch");
+                    }
+                });
+            }
+            version += 1;
+            Ok::<(), AptosDbError>(())
+        })?;
+        assert_eq!(num_transactions, version - start_version);
+        if self.indexer_db.transaction_enabled() {
+            batch.put::<InternalIndexerMetadataSchema>(
+                &MetadataKey::TransactionVersion,
+                &MetadataValue::Version(version - 1),
+            )?;
+        }
+        if self.indexer_db.event_enabled() {
+            batch.put::<InternalIndexerMetadataSchema>(
+                &MetadataKey::EventVersion,
+                &MetadataValue::Version(version - 1),
+            )?;
+        }
+        if self.indexer_db.statekeys_enabled() {
+            batch.put::<InternalIndexerMetadataSchema>(
+                &MetadataKey::StateVersion,
+                &MetadataValue::Version(version - 1),
+            )?;
+        }
+        batch.put::<InternalIndexerMetadataSchema>(
+            &MetadataKey::LatestVersion,
+            &MetadataValue::Version(version - 1),
+        )?;
+        self.sender
+            .send(Some(batch))
+            .map_err(|e| AptosDbError::Other(e.to_string()))?;
+        Ok(version)
+    }
+
+    pub fn get_account_transactions(
+        &self,
+        address: AccountAddress,
+        start_seq_num: u64,
+        limit: u64,
+        include_events: bool,
+        ledger_version: Version,
+    ) -> Result<AccountTransactionsWithProof> {
+        self.indexer_db
+            .ensure_cover_ledger_version(ledger_version)?;
+        error_if_too_many_requested(limit, MAX_REQUEST_LIMIT)?;
+
+        let txns_with_proofs = self
+            .indexer_db
+            .get_account_transaction_version_iter(address, start_seq_num, limit, ledger_version)?
+            .map(|result| {
+                let (_seq_num, txn_version) = result?;
+                self.main_db_reader.get_transaction_by_version(
+                    txn_version,
+                    ledger_version,
+                    include_events,
+                )
+            })
+            .collect::<Result<Vec<_>>>()?;
+
+        Ok(AccountTransactionsWithProof::new(txns_with_proofs))
+    }
+
+    pub fn get_prefixed_state_value_iterator(
+        &self,
+        key_prefix: &StateKeyPrefix,
+        cursor: Option<&StateKey>,
+        ledger_version: Version,
+    ) -> Result<impl Iterator<Item = anyhow::Result<(StateKey, StateValue)>> + '_> {
+        self.indexer_db
+            .ensure_cover_ledger_version(ledger_version)?;
+        PrefixedStateValueIterator::new(
+            self.main_db_reader.clone(),
+            self.indexer_db.get_inner_db_ref(),
+            key_prefix.clone(),
+            cursor.cloned(),
+            ledger_version,
+        )
+    }
+
+    pub fn get_events(
+        &self,
+        event_key: &EventKey,
+        start: u64,
+        order: Order,
+        limit: u64,
+        ledger_version: Version,
+    ) -> Result<Vec<EventWithVersion>> {
+        self.indexer_db
+            .ensure_cover_ledger_version(ledger_version)?;
+        self.get_events_by_event_key(event_key, start, order, limit, ledger_version)
+    }
+
+    pub fn get_events_by_event_key(
+        &self,
+        event_key: &EventKey,
+        start_seq_num: u64,
+        order: Order,
+        limit: u64,
+        ledger_version: Version,
+    ) -> Result<Vec<EventWithVersion>> {
+        self.indexer_db
+            .ensure_cover_ledger_version(ledger_version)?;
+        error_if_too_many_requested(limit, MAX_REQUEST_LIMIT)?;
+        let get_latest = order == Order::Descending && start_seq_num == u64::max_value();
+
+        let cursor = if get_latest {
+            // Caller wants the latest, figure out the latest seq_num.
+            // In the case of no events on that path, use 0 and expect empty result below.
+            self.indexer_db
+                .get_latest_sequence_number(ledger_version, event_key)?
+                .unwrap_or(0)
+        } else {
+            start_seq_num
+        };
+
+        // Convert requested range and order to a range in ascending order.
+        let (first_seq, real_limit) = get_first_seq_num_and_limit(order, cursor, limit)?;
+
+        // Query the index.
+        let mut event_indices = self.indexer_db.lookup_events_by_key(
+            event_key,
+            first_seq,
+            real_limit,
+            ledger_version,
+        )?;
+
+        // When descending, it's possible that user is asking for something beyond the latest
+        // sequence number, in which case we will consider it a bad request and return an empty
+        // list.
+        // For example, if the latest sequence number is 100, and the caller is asking for 110 to
+        // 90, we will get 90 to 100 from the index lookup above. Seeing that the last item
+        // is 100 instead of 110 tells us 110 is out of bound.
+        if order == Order::Descending {
+            if let Some((seq_num, _, _)) = event_indices.last() {
+                if *seq_num < cursor {
+                    event_indices = Vec::new();
+                }
+            }
+        }
+
+        let mut events_with_version = event_indices
+            .into_iter()
+            .map(|(seq, ver, idx)| {
+                let event = self
+                    .main_db_reader
+                    .get_event_by_version_and_index(ver, idx)?;
+                let v0 = match &event {
+                    ContractEvent::V1(event) => event,
+                    ContractEvent::V2(_) => bail!("Unexpected module event"),
+                };
+                ensure!(
+                    seq == v0.sequence_number(),
+                    "Index broken, expected seq:{}, actual:{}",
+                    seq,
+                    v0.sequence_number()
+                );
+                Ok(EventWithVersion::new(ver, event))
+            })
+            .collect::<Result<Vec<_>>>()?;
+        if order == Order::Descending {
+            events_with_version.reverse();
+        }
+
+        Ok(events_with_version)
+    }
+}
diff --git a/storage/indexer/src/db_ops.rs b/storage/indexer/src/db_ops.rs
index 2f109bed876f0..e8a9a1fbf2048 100644
--- a/storage/indexer/src/db_ops.rs
+++ b/storage/indexer/src/db_ops.rs
@@ -1,22 +1,37 @@
 // Copyright © Aptos Foundation
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::schema::column_families;
 use anyhow::Result;
 use aptos_config::config::RocksdbConfig;
+use aptos_db_indexer_schemas::schema::{column_families, internal_indexer_column_families};
 use aptos_rocksdb_options::gen_rocksdb_options;
 use aptos_schemadb::DB;
 use std::{mem, path::Path};
 
+const INTERNAL_INDEXER_DB_NAME: &str = "internal_indexer_db";
+const TABLE_INFO_DB_NAME: &str = "index_async_v2_db";
+
 pub fn open_db<P: AsRef<Path>>(db_path: P, rocksdb_config: &RocksdbConfig) -> Result<DB> {
     Ok(DB::open(
         db_path,
-        "index_asnync_v2_db",
+        TABLE_INFO_DB_NAME,
         column_families(),
         &gen_rocksdb_options(rocksdb_config, false),
     )?)
 }
 
+pub fn open_internal_indexer_db<P: AsRef<Path>>(
+    db_path: P,
+    rocksdb_config: &RocksdbConfig,
+) -> Result<DB> {
+    Ok(DB::open(
+        db_path,
+        INTERNAL_INDEXER_DB_NAME,
+        internal_indexer_column_families(),
+        &gen_rocksdb_options(rocksdb_config, false),
+    )?)
+}
+
 pub fn close_db(db: DB) {
     mem::drop(db)
 }
diff --git a/storage/indexer/src/db_v2.rs b/storage/indexer/src/db_v2.rs
index 273b754f01d8a..01ad40d096251 100644
--- a/storage/indexer/src/db_v2.rs
+++ b/storage/indexer/src/db_v2.rs
@@ -5,7 +5,7 @@
 /// At the end of the migration to migrate table info mapping
 /// from storage critical path to indexer, the other file will be removed
 /// and this file will be moved to /ecosystem/indexer-grpc/indexer-grpc-table-info.
-use crate::{
+use aptos_db_indexer_schemas::{
     metadata::{MetadataKey, MetadataValue},
     schema::{indexer_metadata::IndexerMetadataSchema, table_info::TableInfoSchema},
 };
diff --git a/storage/indexer/src/indexer_reader.rs b/storage/indexer/src/indexer_reader.rs
new file mode 100644
index 0000000000000..0368d80c612a5
--- /dev/null
+++ b/storage/indexer/src/indexer_reader.rs
@@ -0,0 +1,156 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{db_indexer::DBIndexer, db_v2::IndexerAsyncV2};
+use anyhow::anyhow;
+use aptos_types::{
+    account_address::AccountAddress,
+    contract_event::EventWithVersion,
+    event::EventKey,
+    indexer::indexer_db_reader::{IndexerReader, Order},
+    state_store::{
+        state_key::{prefix::StateKeyPrefix, StateKey},
+        state_value::StateValue,
+        table::{TableHandle, TableInfo},
+    },
+    transaction::{AccountTransactionsWithProof, Version},
+};
+use std::sync::Arc;
+
+#[derive(Clone)]
+pub struct IndexerReaders {
+    table_info_reader: Option<Arc<IndexerAsyncV2>>,
+    db_indexer_reader: Option<Arc<DBIndexer>>,
+}
+
+impl IndexerReaders {
+    pub fn new(
+        table_info_reader: Option<Arc<IndexerAsyncV2>>,
+        db_indexer_reader: Option<Arc<DBIndexer>>,
+    ) -> Option<Self> {
+        if table_info_reader.is_none() && db_indexer_reader.is_none() {
+            None
+        } else {
+            Some(Self {
+                table_info_reader,
+                db_indexer_reader,
+            })
+        }
+    }
+}
+
+impl IndexerReader for IndexerReaders {
+    fn get_table_info(&self, handle: TableHandle) -> anyhow::Result<Option<TableInfo>> {
+        if let Some(table_info_reader) = &self.table_info_reader {
+            return Ok(table_info_reader.get_table_info_with_retry(handle)?);
+        }
+        anyhow::bail!("Table info reader is not available")
+    }
+
+    fn get_latest_internal_indexer_ledger_version(&self) -> anyhow::Result<Option<Version>> {
+        if let Some(db_indexer) = &self.db_indexer_reader {
+            return Ok(db_indexer.indexer_db.get_persisted_version()?);
+        }
+        anyhow::bail!("DB indexer reader is not available")
+    }
+
+    fn get_events(
+        &self,
+        event_key: &EventKey,
+        start: u64,
+        order: Order,
+        limit: u64,
+        ledger_version: Version,
+    ) -> anyhow::Result<Vec<EventWithVersion>> {
+        if let Some(db_indexer_reader) = &self.db_indexer_reader {
+            if db_indexer_reader.indexer_db.event_enabled() {
+                return Ok(db_indexer_reader.get_events(
+                    event_key,
+                    start,
+                    order,
+                    limit,
+                    ledger_version,
+                )?);
+            } else {
+                anyhow::bail!("Internal event index is not enabled")
+            }
+        }
+        anyhow::bail!("DB Indexer reader is not available")
+    }
+
+    fn get_events_by_event_key(
+        &self,
+        event_key: &EventKey,
+        start_seq_num: u64,
+        order: Order,
+        limit: u64,
+        ledger_version: Version,
+    ) -> anyhow::Result<Vec<EventWithVersion>> {
+        if let Some(db_indexer_reader) = &self.db_indexer_reader {
+            if db_indexer_reader.indexer_db.event_enabled() {
+                return Ok(db_indexer_reader.get_events_by_event_key(
+                    event_key,
+                    start_seq_num,
+                    order,
+                    limit,
+                    ledger_version,
+                )?);
+            } else {
+                anyhow::bail!("Internal event index is not enabled")
+            }
+        }
+        anyhow::bail!("DB indexer reader is not available")
+    }
+
+    fn get_account_transactions(
+        &self,
+        address: AccountAddress,
+        start_seq_num: u64,
+        limit: u64,
+        include_events: bool,
+        ledger_version: Version,
+    ) -> anyhow::Result<AccountTransactionsWithProof> {
+        if let Some(db_indexer_reader) = &self.db_indexer_reader {
+            if db_indexer_reader.indexer_db.transaction_enabled() {
+                return Ok(db_indexer_reader.get_account_transactions(
+                    address,
+                    start_seq_num,
+                    limit,
+                    include_events,
+                    ledger_version,
+                )?);
+            } else {
+                anyhow::bail!("Interal transaction by account index is not enabled")
+            }
+        }
+        anyhow::bail!("DB indexer reader is not available")
+    }
+
+    fn get_prefixed_state_value_iterator(
+        &self,
+        key_prefix: &StateKeyPrefix,
+        cursor: Option<&StateKey>,
+        ledger_version: Version,
+    ) -> anyhow::Result<Box<dyn Iterator<Item = anyhow::Result<(StateKey, StateValue)>> + '_>> {
+        if let Some(db_indexer_reader) = &self.db_indexer_reader {
+            if db_indexer_reader.indexer_db.statekeys_enabled() {
+                return Ok(Box::new(
+                    db_indexer_reader
+                        .get_prefixed_state_value_iterator(key_prefix, cursor, ledger_version)
+                        .map_err(|err| {
+                            anyhow!(format!(
+                                "failed to get prefixed state value iterator {}",
+                                err
+                            ))
+                        })?,
+                )
+                    as Box<
+                        dyn Iterator<Item = anyhow::Result<(StateKey, StateValue)>>,
+                    >);
+            } else {
+                anyhow::bail!("Internal statekeys index is not enabled")
+            }
+        }
+        anyhow::bail!("DB indexer reader is not available")
+    }
+}
diff --git a/storage/indexer/src/lib.rs b/storage/indexer/src/lib.rs
index 3b82dd83ba574..6a96f37f16cf0 100644
--- a/storage/indexer/src/lib.rs
+++ b/storage/indexer/src/lib.rs
@@ -3,20 +3,20 @@
 
 /// TODO(jill): deprecate Indexer once Indexer Async V2 is ready
 mod db;
+pub mod db_indexer;
 pub mod db_ops;
 pub mod db_v2;
-mod metadata;
-mod schema;
-pub mod table_info_reader;
+pub mod indexer_reader;
+mod utils;
 
-use crate::{
-    db::INDEX_DB_NAME,
+use crate::db::INDEX_DB_NAME;
+use aptos_config::config::RocksdbConfig;
+use aptos_db_indexer_schemas::{
     metadata::{MetadataKey, MetadataValue},
     schema::{
         column_families, indexer_metadata::IndexerMetadataSchema, table_info::TableInfoSchema,
     },
 };
-use aptos_config::config::RocksdbConfig;
 use aptos_logger::warn;
 use aptos_resource_viewer::{AnnotatedMoveValue, AptosValueAnnotator};
 use aptos_rocksdb_options::gen_rocksdb_options;
diff --git a/storage/indexer/src/metadata.rs b/storage/indexer/src/metadata.rs
deleted file mode 100644
index 116709252727a..0000000000000
--- a/storage/indexer/src/metadata.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-use aptos_types::transaction::Version;
-use serde::{Deserialize, Serialize};
-
-#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize)]
-#[cfg_attr(any(test, feature = "fuzzing"), derive(proptest_derive::Arbitrary))]
-pub(crate) enum MetadataValue {
-    Version(Version),
-}
-
-impl MetadataValue {
-    pub fn expect_version(self) -> Version {
-        match self {
-            Self::Version(v) => v,
-        }
-    }
-}
-
-#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize)]
-#[cfg_attr(any(test, feature = "fuzzing"), derive(proptest_derive::Arbitrary))]
-pub(crate) enum MetadataKey {
-    LatestVersion,
-}
diff --git a/storage/indexer/src/schema/indexer_metadata/mod.rs b/storage/indexer/src/schema/indexer_metadata/mod.rs
deleted file mode 100644
index f8615ba5b8ee9..0000000000000
--- a/storage/indexer/src/schema/indexer_metadata/mod.rs
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-//! This module defines physical storage schema storing metadata for the internal indexer
-//!
-
-use crate::{
-    metadata::{MetadataKey, MetadataValue},
-    schema::INDEXER_METADATA_CF_NAME,
-};
-use anyhow::Result;
-use aptos_schemadb::{
-    define_schema,
-    schema::{KeyCodec, ValueCodec},
-};
-
-define_schema!(
-    IndexerMetadataSchema,
-    MetadataKey,
-    MetadataValue,
-    INDEXER_METADATA_CF_NAME
-);
-
-impl KeyCodec<IndexerMetadataSchema> for MetadataKey {
-    fn encode_key(&self) -> Result<Vec<u8>> {
-        Ok(bcs::to_bytes(self)?)
-    }
-
-    fn decode_key(data: &[u8]) -> Result<Self> {
-        Ok(bcs::from_bytes(data)?)
-    }
-}
-
-impl ValueCodec<IndexerMetadataSchema> for MetadataValue {
-    fn encode_value(&self) -> Result<Vec<u8>> {
-        Ok(bcs::to_bytes(self)?)
-    }
-
-    fn decode_value(data: &[u8]) -> Result<Self> {
-        Ok(bcs::from_bytes(data)?)
-    }
-}
-
-#[cfg(test)]
-mod test;
diff --git a/storage/indexer/src/schema/indexer_metadata/test.rs b/storage/indexer/src/schema/indexer_metadata/test.rs
deleted file mode 100644
index a1117d2b17ea3..0000000000000
--- a/storage/indexer/src/schema/indexer_metadata/test.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-use super::*;
-use aptos_schemadb::{schema::fuzzing::assert_encode_decode, test_no_panic_decoding};
-use proptest::prelude::*;
-
-proptest! {
-    #[test]
-    fn test_encode_decode(
-        tag in any::<MetadataKey>(),
-        metadata in any::<MetadataValue>(),
-    ) {
-        assert_encode_decode::<IndexerMetadataSchema>(&tag, &metadata);
-    }
-}
-
-test_no_panic_decoding!(IndexerMetadataSchema);
diff --git a/storage/indexer/src/schema/mod.rs b/storage/indexer/src/schema/mod.rs
deleted file mode 100644
index 90ba38374788d..0000000000000
--- a/storage/indexer/src/schema/mod.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-//! This module defines representation of AptosDB indexer data structures at physical level via schemas
-//! that implement [`aptos_schemadb::schema::Schema`].
-//!
-//! All schemas are `pub(crate)` so not shown in rustdoc, refer to the source code to see details.
-
-pub(crate) mod indexer_metadata;
-pub(crate) mod table_info;
-
-use aptos_schemadb::ColumnFamilyName;
-
-pub const DEFAULT_COLUMN_FAMILY_NAME: ColumnFamilyName = "default";
-pub const INDEXER_METADATA_CF_NAME: ColumnFamilyName = "indexer_metadata";
-pub const TABLE_INFO_CF_NAME: ColumnFamilyName = "table_info";
-
-pub fn column_families() -> Vec<ColumnFamilyName> {
-    vec![
-        /* empty cf */ DEFAULT_COLUMN_FAMILY_NAME,
-        INDEXER_METADATA_CF_NAME,
-        TABLE_INFO_CF_NAME,
-    ]
-}
diff --git a/storage/indexer/src/schema/table_info/mod.rs b/storage/indexer/src/schema/table_info/mod.rs
deleted file mode 100644
index 33dbb82f51184..0000000000000
--- a/storage/indexer/src/schema/table_info/mod.rs
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-//! This module defines physical storage schema mapping table handles to its metadata including
-//! key / value type tags.
-//!
-//! ```text
-//! |<--key-->|<---value-->|
-//! | handle  | table_info |
-//! ```
-
-use crate::schema::TABLE_INFO_CF_NAME;
-use anyhow::Result;
-use aptos_schemadb::{
-    define_schema,
-    schema::{KeyCodec, ValueCodec},
-};
-use aptos_types::state_store::table::{TableHandle, TableInfo};
-
-define_schema!(TableInfoSchema, TableHandle, TableInfo, TABLE_INFO_CF_NAME);
-
-impl KeyCodec<TableInfoSchema> for TableHandle {
-    fn encode_key(&self) -> Result<Vec<u8>> {
-        Ok(bcs::to_bytes(self)?)
-    }
-
-    fn decode_key(data: &[u8]) -> Result<Self> {
-        Ok(bcs::from_bytes(data)?)
-    }
-}
-
-impl ValueCodec<TableInfoSchema> for TableInfo {
-    fn encode_value(&self) -> Result<Vec<u8>> {
-        Ok(bcs::to_bytes(self)?)
-    }
-
-    fn decode_value(data: &[u8]) -> Result<Self> {
-        Ok(bcs::from_bytes(data)?)
-    }
-}
-
-#[cfg(test)]
-mod test;
diff --git a/storage/indexer/src/table_info_reader.rs b/storage/indexer/src/table_info_reader.rs
deleted file mode 100644
index f0ddcff4aa1ff..0000000000000
--- a/storage/indexer/src/table_info_reader.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::db_v2::IndexerAsyncV2;
-use aptos_storage_interface::Result;
-use aptos_types::state_store::table::{TableHandle, TableInfo};
-
-/// Table info reader is to create a thin interface for other services to read the db data,
-/// this standalone db is officially not part of the AptosDB anymore.
-/// For services that need table info mapping, they need to acquire this reader in the FN bootstrapping stage.
-pub trait TableInfoReader: Send + Sync {
-    fn get_table_info(&self, handle: TableHandle) -> Result<Option<TableInfo>>;
-}
-
-impl TableInfoReader for IndexerAsyncV2 {
-    fn get_table_info(&self, handle: TableHandle) -> Result<Option<TableInfo>> {
-        self.get_table_info_with_retry(handle)
-    }
-}
diff --git a/storage/indexer/src/utils.rs b/storage/indexer/src/utils.rs
new file mode 100644
index 0000000000000..d87e454626db4
--- /dev/null
+++ b/storage/indexer/src/utils.rs
@@ -0,0 +1,83 @@
+// Copyright (c) Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use aptos_db_indexer_schemas::schema::state_keys::StateKeysSchema;
+use aptos_schemadb::{iterator::SchemaIterator, ReadOptions, DB};
+use aptos_storage_interface::{DbReader, Result};
+use aptos_types::{
+    state_store::{
+        state_key::{prefix::StateKeyPrefix, StateKey},
+        state_value::StateValue,
+    },
+    transaction::Version,
+};
+use std::sync::Arc;
+
+pub struct PrefixedStateValueIterator<'a> {
+    state_keys_iter: SchemaIterator<'a, StateKeysSchema>,
+    main_db: Arc<dyn DbReader>,
+    key_prefix: StateKeyPrefix,
+    desired_version: Version, // state values before the version
+    is_finished: bool,
+}
+
+impl<'a> PrefixedStateValueIterator<'a> {
+    pub fn new(
+        main_db_reader: Arc<dyn DbReader>,
+        indexer_db: &'a DB,
+        key_prefix: StateKeyPrefix,
+        first_key: Option<StateKey>,
+        desired_version: Version,
+    ) -> Result<Self> {
+        let mut read_opt = ReadOptions::default();
+        read_opt.set_total_order_seek(true);
+        let mut state_keys_iter = indexer_db.iter_with_opts::<StateKeysSchema>(read_opt)?;
+        if let Some(first_key) = first_key {
+            state_keys_iter.seek(&first_key)?;
+        } else {
+            state_keys_iter.seek(&&key_prefix)?;
+        };
+        Ok(Self {
+            state_keys_iter,
+            main_db: main_db_reader,
+            key_prefix,
+            desired_version,
+            is_finished: false,
+        })
+    }
+
+    pub fn next_impl(&mut self) -> anyhow::Result<Option<(StateKey, StateValue)>> {
+        let iter = &mut self.state_keys_iter;
+        if self.is_finished {
+            return Ok(None);
+        }
+        while let Some((state_key, _)) = iter.next().transpose()? {
+            if !self.key_prefix.is_prefix(&state_key)? {
+                self.is_finished = true;
+                return Ok(None);
+            }
+
+            match self
+                .main_db
+                .get_state_value_by_version(&state_key, self.desired_version)?
+            {
+                Some(state_value) => {
+                    return Ok(Some((state_key, state_value)));
+                },
+                None => {
+                    // state key doesn't have value before the desired version, continue to next state key
+                    continue;
+                },
+            }
+        }
+        Ok(None)
+    }
+}
+
+impl<'a> Iterator for PrefixedStateValueIterator<'a> {
+    type Item = anyhow::Result<(StateKey, StateValue)>;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        self.next_impl().transpose()
+    }
+}
diff --git a/storage/indexer_schemas/Cargo.toml b/storage/indexer_schemas/Cargo.toml
new file mode 100644
index 0000000000000..b25ff3cb50f35
--- /dev/null
+++ b/storage/indexer_schemas/Cargo.toml
@@ -0,0 +1,37 @@
+[package]
+name = "aptos-db-indexer-schemas"
+description = "AptosDB Internal Indexer DB schemas"
+version = "0.1.0"
+
+# Workspace inherited keys
+authors = { workspace = true }
+edition = { workspace = true }
+homepage = { workspace = true }
+license = { workspace = true }
+publish = { workspace = true }
+repository = { workspace = true }
+rust-version = { workspace = true }
+
+[dependencies]
+anyhow = { workspace = true }
+aptos-crypto = { workspace = true }
+aptos-schemadb = { workspace = true }
+aptos-storage-interface = { workspace = true }
+aptos-types = { workspace = true }
+bcs = { workspace = true }
+byteorder = { workspace = true }
+proptest = { workspace = true, optional = true }
+proptest-derive = { workspace = true, optional = true }
+serde = { workspace = true }
+
+[dev-dependencies]
+aptos-proptest-helpers = { workspace = true }
+aptos-schemadb = { workspace = true, features = ["fuzzing"] }
+aptos-types = { workspace = true, features = ["fuzzing"] }
+proptest = { workspace = true }
+proptest-derive = { workspace = true }
+rand = { workspace = true }
+
+[features]
+default = []
+fuzzing = ["proptest", "proptest-derive", "aptos-types/fuzzing", "aptos-schemadb/fuzzing"]
diff --git a/storage/indexer_schemas/src/lib.rs b/storage/indexer_schemas/src/lib.rs
new file mode 100644
index 0000000000000..4e2dbb0c8338a
--- /dev/null
+++ b/storage/indexer_schemas/src/lib.rs
@@ -0,0 +1,6 @@
+// Copyright (c) Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod metadata;
+pub mod schema;
+pub mod utils;
diff --git a/storage/indexer_schemas/src/metadata.rs b/storage/indexer_schemas/src/metadata.rs
new file mode 100644
index 0000000000000..940f724da79d0
--- /dev/null
+++ b/storage/indexer_schemas/src/metadata.rs
@@ -0,0 +1,54 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use aptos_crypto::HashValue;
+use aptos_types::{state_store::state_storage_usage::StateStorageUsage, transaction::Version};
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize)]
+#[cfg_attr(any(test, feature = "fuzzing"), derive(proptest_derive::Arbitrary))]
+pub enum MetadataValue {
+    Version(Version),
+    StateSnapshotProgress(StateSnapshotProgress),
+}
+
+impl MetadataValue {
+    pub fn expect_version(self) -> Version {
+        match self {
+            Self::Version(v) => v,
+            _ => panic!("Not version"),
+        }
+    }
+
+    pub fn expect_state_snapshot_progress(self) -> StateSnapshotProgress {
+        match self {
+            Self::StateSnapshotProgress(p) => p,
+            _ => panic!("Not state snapshot progress"),
+        }
+    }
+}
+
+#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize, Hash, PartialOrd, Ord)]
+#[cfg_attr(any(test, feature = "fuzzing"), derive(proptest_derive::Arbitrary))]
+pub enum MetadataKey {
+    LatestVersion,
+    EventPrunerProgress,
+    TransactionPrunerProgress,
+    StateSnapshotRestoreProgress(Version),
+    EventVersion,
+    StateVersion,
+    TransactionVersion,
+}
+
+#[derive(Clone, Copy, Debug, Deserialize, Eq, PartialEq, Serialize)]
+#[cfg_attr(any(test, feature = "fuzzing"), derive(proptest_derive::Arbitrary))]
+pub struct StateSnapshotProgress {
+    pub key_hash: HashValue,
+    pub usage: StateStorageUsage,
+}
+
+impl StateSnapshotProgress {
+    pub fn new(key_hash: HashValue, usage: StateStorageUsage) -> Self {
+        Self { key_hash, usage }
+    }
+}
diff --git a/storage/indexer_schemas/src/schema/event_by_key/mod.rs b/storage/indexer_schemas/src/schema/event_by_key/mod.rs
new file mode 100644
index 0000000000000..5e147b708298a
--- /dev/null
+++ b/storage/indexer_schemas/src/schema/event_by_key/mod.rs
@@ -0,0 +1,76 @@
+// Copyright © Aptos Foundation
+// Parts of the project are originally copyright © Meta Platforms, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module defines physical storage schema for an event index via which a ContractEvent (
+//! represented by a <txn_version, event_idx> tuple so that it can be fetched from `EventSchema`)
+//! can be found by <access_path, sequence_num> tuple.
+//!
+//! ```text
+//! |<---------key------->|<----value---->|
+//! | event_key | seq_num | txn_ver | idx |
+//! ```
+
+use crate::{schema::EVENT_BY_KEY_CF_NAME, utils::ensure_slice_len_eq};
+use anyhow::Result;
+use aptos_schemadb::{
+    define_pub_schema,
+    schema::{KeyCodec, ValueCodec},
+};
+use aptos_types::{event::EventKey, transaction::Version};
+use byteorder::{BigEndian, ReadBytesExt, WriteBytesExt};
+use std::mem::size_of;
+
+define_pub_schema!(EventByKeySchema, Key, Value, EVENT_BY_KEY_CF_NAME);
+
+type SeqNum = u64;
+type Key = (EventKey, SeqNum);
+
+type Index = u64;
+type Value = (Version, Index);
+
+impl KeyCodec<EventByKeySchema> for Key {
+    fn encode_key(&self) -> Result<Vec<u8>> {
+        let (ref event_key, seq_num) = *self;
+
+        let mut encoded = event_key.to_bytes();
+        encoded.write_u64::<BigEndian>(seq_num)?;
+
+        Ok(encoded)
+    }
+
+    fn decode_key(data: &[u8]) -> Result<Self> {
+        ensure_slice_len_eq(data, size_of::<Self>())?;
+
+        const EVENT_KEY_LEN: usize = size_of::<EventKey>();
+        let event_key = bcs::from_bytes(&data[..EVENT_KEY_LEN])?;
+        let seq_num = (&data[EVENT_KEY_LEN..]).read_u64::<BigEndian>()?;
+
+        Ok((event_key, seq_num))
+    }
+}
+
+impl ValueCodec<EventByKeySchema> for Value {
+    fn encode_value(&self) -> Result<Vec<u8>> {
+        let (version, index) = *self;
+
+        let mut encoded = Vec::with_capacity(size_of::<Version>() + size_of::<Index>());
+        encoded.write_u64::<BigEndian>(version)?;
+        encoded.write_u64::<BigEndian>(index)?;
+
+        Ok(encoded)
+    }
+
+    fn decode_value(data: &[u8]) -> Result<Self> {
+        ensure_slice_len_eq(data, size_of::<Self>())?;
+
+        const VERSION_SIZE: usize = size_of::<Version>();
+        let version = (&data[..VERSION_SIZE]).read_u64::<BigEndian>()?;
+        let index = (&data[VERSION_SIZE..]).read_u64::<BigEndian>()?;
+
+        Ok((version, index))
+    }
+}
+
+#[cfg(test)]
+mod test;
diff --git a/storage/aptosdb/src/schema/event_by_key/test.rs b/storage/indexer_schemas/src/schema/event_by_key/test.rs
similarity index 100%
rename from storage/aptosdb/src/schema/event_by_key/test.rs
rename to storage/indexer_schemas/src/schema/event_by_key/test.rs
diff --git a/storage/indexer_schemas/src/schema/event_by_version/mod.rs b/storage/indexer_schemas/src/schema/event_by_version/mod.rs
new file mode 100644
index 0000000000000..ac33c9219671b
--- /dev/null
+++ b/storage/indexer_schemas/src/schema/event_by_version/mod.rs
@@ -0,0 +1,69 @@
+// Copyright © Aptos Foundation
+// Parts of the project are originally copyright © Meta Platforms, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module defines physical storage schema for an event index via which a ContractEvent (
+//! represented by a <txn_version, event_idx> tuple so that it can be fetched from `EventSchema`)
+//! can be found by <access_path, version, sequence_num> tuple.
+//!
+//! ```text
+//! |<--------------key------------>|<-value->|
+//! | event_key | txn_ver | seq_num |   idx   |
+//! ```
+
+use crate::{schema::EVENT_BY_VERSION_CF_NAME, utils::ensure_slice_len_eq};
+use anyhow::Result;
+use aptos_schemadb::{
+    define_pub_schema,
+    schema::{KeyCodec, ValueCodec},
+};
+use aptos_types::{event::EventKey, transaction::Version};
+use byteorder::{BigEndian, ReadBytesExt, WriteBytesExt};
+use std::mem::size_of;
+
+define_pub_schema!(EventByVersionSchema, Key, Value, EVENT_BY_VERSION_CF_NAME);
+
+type SeqNum = u64;
+type Key = (EventKey, Version, SeqNum);
+
+type Index = u64;
+type Value = Index;
+
+impl KeyCodec<EventByVersionSchema> for Key {
+    fn encode_key(&self) -> Result<Vec<u8>> {
+        let (ref event_key, version, seq_num) = *self;
+
+        let mut encoded = event_key.to_bytes();
+        encoded.write_u64::<BigEndian>(version)?;
+        encoded.write_u64::<BigEndian>(seq_num)?;
+
+        Ok(encoded)
+    }
+
+    fn decode_key(data: &[u8]) -> Result<Self> {
+        ensure_slice_len_eq(data, size_of::<Self>())?;
+
+        const EVENT_KEY_LEN: usize = size_of::<EventKey>();
+        const EVENT_KEY_AND_VER_LEN: usize = size_of::<(EventKey, Version)>();
+        let event_key = bcs::from_bytes(&data[..EVENT_KEY_LEN])?;
+        let version = (&data[EVENT_KEY_LEN..]).read_u64::<BigEndian>()?;
+        let seq_num = (&data[EVENT_KEY_AND_VER_LEN..]).read_u64::<BigEndian>()?;
+
+        Ok((event_key, version, seq_num))
+    }
+}
+
+impl ValueCodec<EventByVersionSchema> for Value {
+    fn encode_value(&self) -> Result<Vec<u8>> {
+        Ok(self.to_be_bytes().to_vec())
+    }
+
+    fn decode_value(mut data: &[u8]) -> Result<Self> {
+        ensure_slice_len_eq(data, size_of::<Self>())?;
+
+        Ok(data.read_u64::<BigEndian>()?)
+    }
+}
+
+#[cfg(test)]
+mod test;
diff --git a/storage/aptosdb/src/schema/event_by_version/test.rs b/storage/indexer_schemas/src/schema/event_by_version/test.rs
similarity index 100%
rename from storage/aptosdb/src/schema/event_by_version/test.rs
rename to storage/indexer_schemas/src/schema/event_by_version/test.rs
diff --git a/storage/indexer_schemas/src/schema/indexer_metadata/mod.rs b/storage/indexer_schemas/src/schema/indexer_metadata/mod.rs
new file mode 100644
index 0000000000000..ede60f2679159
--- /dev/null
+++ b/storage/indexer_schemas/src/schema/indexer_metadata/mod.rs
@@ -0,0 +1,73 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module defines physical storage schema storing metadata for the internal indexer
+//!
+
+use super::INTERNAL_INDEXER_METADATA_CF_NAME;
+use crate::{
+    metadata::{MetadataKey, MetadataValue},
+    schema::INDEXER_METADATA_CF_NAME,
+};
+use anyhow::Result;
+use aptos_schemadb::{
+    define_pub_schema,
+    schema::{KeyCodec, ValueCodec},
+};
+
+define_pub_schema!(
+    IndexerMetadataSchema,
+    MetadataKey,
+    MetadataValue,
+    INDEXER_METADATA_CF_NAME
+);
+
+impl KeyCodec<IndexerMetadataSchema> for MetadataKey {
+    fn encode_key(&self) -> Result<Vec<u8>> {
+        Ok(bcs::to_bytes(self)?)
+    }
+
+    fn decode_key(data: &[u8]) -> Result<Self> {
+        Ok(bcs::from_bytes(data)?)
+    }
+}
+
+impl ValueCodec<IndexerMetadataSchema> for MetadataValue {
+    fn encode_value(&self) -> Result<Vec<u8>> {
+        Ok(bcs::to_bytes(self)?)
+    }
+
+    fn decode_value(data: &[u8]) -> Result<Self> {
+        Ok(bcs::from_bytes(data)?)
+    }
+}
+
+define_pub_schema!(
+    InternalIndexerMetadataSchema,
+    MetadataKey,
+    MetadataValue,
+    INTERNAL_INDEXER_METADATA_CF_NAME
+);
+
+impl KeyCodec<InternalIndexerMetadataSchema> for MetadataKey {
+    fn encode_key(&self) -> Result<Vec<u8>> {
+        Ok(bcs::to_bytes(self)?)
+    }
+
+    fn decode_key(data: &[u8]) -> Result<Self> {
+        Ok(bcs::from_bytes(data)?)
+    }
+}
+
+impl ValueCodec<InternalIndexerMetadataSchema> for MetadataValue {
+    fn encode_value(&self) -> Result<Vec<u8>> {
+        Ok(bcs::to_bytes(self)?)
+    }
+
+    fn decode_value(data: &[u8]) -> Result<Self> {
+        Ok(bcs::from_bytes(data)?)
+    }
+}
+
+#[cfg(test)]
+mod test;
diff --git a/storage/indexer_schemas/src/schema/indexer_metadata/test.rs b/storage/indexer_schemas/src/schema/indexer_metadata/test.rs
new file mode 100644
index 0000000000000..60d03d590e5b4
--- /dev/null
+++ b/storage/indexer_schemas/src/schema/indexer_metadata/test.rs
@@ -0,0 +1,26 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use super::*;
+use aptos_schemadb::{schema::fuzzing::assert_encode_decode, test_no_panic_decoding};
+use proptest::prelude::*;
+
+proptest! {
+    #[test]
+    fn test_encode_decode(
+        tag in any::<MetadataKey>(),
+        metadata in any::<MetadataValue>(),
+    ) {
+        assert_encode_decode::<IndexerMetadataSchema>(&tag, &metadata);
+    }
+
+    #[test]
+    fn test_encode_decode_internal_indexer_metadata(
+        key in any::<MetadataKey>(),
+        metadata in any::<MetadataValue>(),
+    ) {
+        assert_encode_decode::<InternalIndexerMetadataSchema>(&key, &metadata);
+    }
+}
+
+test_no_panic_decoding!(IndexerMetadataSchema);
diff --git a/storage/indexer_schemas/src/schema/mod.rs b/storage/indexer_schemas/src/schema/mod.rs
new file mode 100644
index 0000000000000..0f4dfd4c7bcd6
--- /dev/null
+++ b/storage/indexer_schemas/src/schema/mod.rs
@@ -0,0 +1,43 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module defines representation of AptosDB indexer data structures at physical level via schemas
+//! that implement [`aptos_schemadb::schema::Schema`].
+//!
+//! All schemas are `pub(crate)` so not shown in rustdoc, refer to the source code to see details.
+
+pub mod event_by_key;
+pub mod event_by_version;
+pub mod indexer_metadata;
+pub mod state_keys;
+pub mod table_info;
+pub mod transaction_by_account;
+use aptos_schemadb::ColumnFamilyName;
+
+pub const DEFAULT_COLUMN_FAMILY_NAME: ColumnFamilyName = "default";
+pub const INDEXER_METADATA_CF_NAME: ColumnFamilyName = "indexer_metadata";
+pub const INTERNAL_INDEXER_METADATA_CF_NAME: ColumnFamilyName = "internal_indexer_metadata";
+pub const TABLE_INFO_CF_NAME: ColumnFamilyName = "table_info";
+pub const EVENT_BY_KEY_CF_NAME: ColumnFamilyName = "event_by_key";
+pub const EVENT_BY_VERSION_CF_NAME: ColumnFamilyName = "event_by_version";
+pub const TRANSACTION_BY_ACCOUNT_CF_NAME: ColumnFamilyName = "transaction_by_account";
+pub const STATE_KEYS_CF_NAME: ColumnFamilyName = "state_keys";
+
+pub fn column_families() -> Vec<ColumnFamilyName> {
+    vec![
+        /* empty cf */ DEFAULT_COLUMN_FAMILY_NAME,
+        INDEXER_METADATA_CF_NAME,
+        TABLE_INFO_CF_NAME,
+    ]
+}
+
+pub fn internal_indexer_column_families() -> Vec<ColumnFamilyName> {
+    vec![
+        /* empty cf */ DEFAULT_COLUMN_FAMILY_NAME,
+        INTERNAL_INDEXER_METADATA_CF_NAME,
+        EVENT_BY_KEY_CF_NAME,
+        EVENT_BY_VERSION_CF_NAME,
+        TRANSACTION_BY_ACCOUNT_CF_NAME,
+        STATE_KEYS_CF_NAME,
+    ]
+}
diff --git a/storage/indexer_schemas/src/schema/state_keys/mod.rs b/storage/indexer_schemas/src/schema/state_keys/mod.rs
new file mode 100644
index 0000000000000..913c7e36bcaf1
--- /dev/null
+++ b/storage/indexer_schemas/src/schema/state_keys/mod.rs
@@ -0,0 +1,43 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{schema::STATE_KEYS_CF_NAME, utils::ensure_slice_len_eq};
+use anyhow::Result;
+use aptos_schemadb::{
+    define_pub_schema,
+    schema::{KeyCodec, SeekKeyCodec, ValueCodec},
+};
+use aptos_types::state_store::state_key::{prefix::StateKeyPrefix, StateKey};
+
+define_pub_schema!(StateKeysSchema, StateKey, (), STATE_KEYS_CF_NAME);
+
+impl KeyCodec<StateKeysSchema> for StateKey {
+    fn encode_key(&self) -> Result<Vec<u8>> {
+        Ok(self.encoded().to_vec())
+    }
+
+    fn decode_key(data: &[u8]) -> Result<Self> {
+        let state_key: StateKey = StateKey::decode(data)?;
+        Ok(state_key)
+    }
+}
+
+impl ValueCodec<StateKeysSchema> for () {
+    fn encode_value(&self) -> Result<Vec<u8>> {
+        Ok(Vec::new())
+    }
+
+    fn decode_value(data: &[u8]) -> Result<Self> {
+        ensure_slice_len_eq(data, 0)?;
+        Ok(())
+    }
+}
+
+impl SeekKeyCodec<StateKeysSchema> for &StateKeyPrefix {
+    fn encode_seek_key(&self) -> Result<Vec<u8>> {
+        self.encode()
+    }
+}
+
+#[cfg(test)]
+mod test;
diff --git a/storage/indexer_schemas/src/schema/state_keys/test.rs b/storage/indexer_schemas/src/schema/state_keys/test.rs
new file mode 100644
index 0000000000000..92724ebd7a0d9
--- /dev/null
+++ b/storage/indexer_schemas/src/schema/state_keys/test.rs
@@ -0,0 +1,17 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use super::*;
+use aptos_schemadb::{schema::fuzzing::assert_encode_decode, test_no_panic_decoding};
+use proptest::prelude::*;
+
+proptest! {
+    #[test]
+    fn test_encode_decode(
+        state_key in any::<StateKey>(),
+    ) {
+        assert_encode_decode::<StateKeysSchema>(&state_key, &());
+    }
+}
+
+test_no_panic_decoding!(StateKeysSchema);
diff --git a/storage/indexer_schemas/src/schema/table_info/mod.rs b/storage/indexer_schemas/src/schema/table_info/mod.rs
new file mode 100644
index 0000000000000..3d3858bbfa507
--- /dev/null
+++ b/storage/indexer_schemas/src/schema/table_info/mod.rs
@@ -0,0 +1,43 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module defines physical storage schema mapping table handles to its metadata including
+//! key / value type tags.
+//!
+//! ```text
+//! |<--key-->|<---value-->|
+//! | handle  | table_info |
+//! ```
+
+use crate::schema::TABLE_INFO_CF_NAME;
+use anyhow::Result;
+use aptos_schemadb::{
+    define_pub_schema,
+    schema::{KeyCodec, ValueCodec},
+};
+use aptos_types::state_store::table::{TableHandle, TableInfo};
+
+define_pub_schema!(TableInfoSchema, TableHandle, TableInfo, TABLE_INFO_CF_NAME);
+
+impl KeyCodec<TableInfoSchema> for TableHandle {
+    fn encode_key(&self) -> Result<Vec<u8>> {
+        Ok(bcs::to_bytes(self)?)
+    }
+
+    fn decode_key(data: &[u8]) -> Result<Self> {
+        Ok(bcs::from_bytes(data)?)
+    }
+}
+
+impl ValueCodec<TableInfoSchema> for TableInfo {
+    fn encode_value(&self) -> Result<Vec<u8>> {
+        Ok(bcs::to_bytes(self)?)
+    }
+
+    fn decode_value(data: &[u8]) -> Result<Self> {
+        Ok(bcs::from_bytes(data)?)
+    }
+}
+
+#[cfg(test)]
+mod test;
diff --git a/storage/indexer/src/schema/table_info/test.rs b/storage/indexer_schemas/src/schema/table_info/test.rs
similarity index 100%
rename from storage/indexer/src/schema/table_info/test.rs
rename to storage/indexer_schemas/src/schema/table_info/test.rs
diff --git a/storage/indexer_schemas/src/schema/transaction_by_account/mod.rs b/storage/indexer_schemas/src/schema/transaction_by_account/mod.rs
new file mode 100644
index 0000000000000..511788c5f5bb2
--- /dev/null
+++ b/storage/indexer_schemas/src/schema/transaction_by_account/mod.rs
@@ -0,0 +1,67 @@
+// Copyright © Aptos Foundation
+// Parts of the project are originally copyright © Meta Platforms, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module defines physical storage schema for a transaction index via which the version of a
+//! transaction sent by `account_address` with `sequence_number` can be found. With the version one
+//! can resort to `TransactionSchema` for the transaction content.
+//!
+//! ```text
+//! |<-------key------->|<-value->|
+//! | address | seq_num | txn_ver |
+//! ```
+
+use crate::{schema::TRANSACTION_BY_ACCOUNT_CF_NAME, utils::ensure_slice_len_eq};
+use anyhow::Result;
+use aptos_schemadb::{
+    define_pub_schema,
+    schema::{KeyCodec, ValueCodec},
+};
+use aptos_types::{account_address::AccountAddress, transaction::Version};
+use byteorder::{BigEndian, ReadBytesExt, WriteBytesExt};
+use std::{convert::TryFrom, mem::size_of};
+
+define_pub_schema!(
+    TransactionByAccountSchema,
+    Key,
+    Version,
+    TRANSACTION_BY_ACCOUNT_CF_NAME
+);
+
+type SeqNum = u64;
+type Key = (AccountAddress, SeqNum);
+
+impl KeyCodec<TransactionByAccountSchema> for Key {
+    fn encode_key(&self) -> Result<Vec<u8>> {
+        let (ref account_address, seq_num) = *self;
+
+        let mut encoded = account_address.to_vec();
+        encoded.write_u64::<BigEndian>(seq_num)?;
+
+        Ok(encoded)
+    }
+
+    fn decode_key(data: &[u8]) -> Result<Self> {
+        ensure_slice_len_eq(data, size_of::<Self>())?;
+
+        let address = AccountAddress::try_from(&data[..AccountAddress::LENGTH])?;
+        let seq_num = (&data[AccountAddress::LENGTH..]).read_u64::<BigEndian>()?;
+
+        Ok((address, seq_num))
+    }
+}
+
+impl ValueCodec<TransactionByAccountSchema> for Version {
+    fn encode_value(&self) -> Result<Vec<u8>> {
+        Ok(self.to_be_bytes().to_vec())
+    }
+
+    fn decode_value(mut data: &[u8]) -> Result<Self> {
+        ensure_slice_len_eq(data, size_of::<Self>())?;
+
+        Ok(data.read_u64::<BigEndian>()?)
+    }
+}
+
+#[cfg(test)]
+mod test;
diff --git a/storage/aptosdb/src/schema/transaction_by_account/test.rs b/storage/indexer_schemas/src/schema/transaction_by_account/test.rs
similarity index 100%
rename from storage/aptosdb/src/schema/transaction_by_account/test.rs
rename to storage/indexer_schemas/src/schema/transaction_by_account/test.rs
diff --git a/storage/indexer_schemas/src/utils.rs b/storage/indexer_schemas/src/utils.rs
new file mode 100644
index 0000000000000..c1309093c271e
--- /dev/null
+++ b/storage/indexer_schemas/src/utils.rs
@@ -0,0 +1,126 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::schema::transaction_by_account::TransactionByAccountSchema;
+use aptos_schemadb::iterator::SchemaIterator;
+use aptos_storage_interface::{db_ensure as ensure, AptosDbError, Result};
+use aptos_types::{
+    account_address::AccountAddress, indexer::indexer_db_reader::Order, transaction::Version,
+};
+
+pub fn ensure_slice_len_eq(data: &[u8], len: usize) -> Result<()> {
+    ensure!(
+        data.len() == len,
+        "Unexpected data len {}, expected {}.",
+        data.len(),
+        len,
+    );
+    Ok(())
+}
+
+pub const MAX_REQUEST_LIMIT: u64 = 10_000;
+
+pub fn error_if_too_many_requested(num_requested: u64, max_allowed: u64) -> Result<()> {
+    if num_requested > max_allowed {
+        Err(AptosDbError::TooManyRequested(num_requested, max_allowed))
+    } else {
+        Ok(())
+    }
+}
+
+// Convert requested range and order to a range in ascending order.
+pub fn get_first_seq_num_and_limit(order: Order, cursor: u64, limit: u64) -> Result<(u64, u64)> {
+    ensure!(limit > 0, "limit should > 0, got {}", limit);
+
+    Ok(if order == Order::Ascending {
+        (cursor, limit)
+    } else if limit <= cursor {
+        (cursor - limit + 1, limit)
+    } else {
+        (0, cursor + 1)
+    })
+}
+
+// This is a replicate of the AccountTransactionVersionIter from storage/aptosdb crate.
+pub struct AccountTransactionVersionIter<'a> {
+    inner: SchemaIterator<'a, TransactionByAccountSchema>,
+    address: AccountAddress,
+    expected_next_seq_num: Option<u64>,
+    end_seq_num: u64,
+    prev_version: Option<Version>,
+    ledger_version: Version,
+}
+
+impl<'a> AccountTransactionVersionIter<'a> {
+    pub fn new(
+        inner: SchemaIterator<'a, TransactionByAccountSchema>,
+        address: AccountAddress,
+        end_seq_num: u64,
+        ledger_version: Version,
+    ) -> Self {
+        Self {
+            inner,
+            address,
+            end_seq_num,
+            ledger_version,
+            expected_next_seq_num: None,
+            prev_version: None,
+        }
+    }
+}
+
+impl<'a> AccountTransactionVersionIter<'a> {
+    fn next_impl(&mut self) -> Result<Option<(u64, Version)>> {
+        Ok(match self.inner.next().transpose()? {
+            Some(((address, seq_num), version)) => {
+                // No more transactions sent by this account.
+                if address != self.address {
+                    return Ok(None);
+                }
+                if seq_num >= self.end_seq_num {
+                    return Ok(None);
+                }
+
+                // Ensure seq_num_{i+1} == seq_num_{i} + 1
+                if let Some(expected_seq_num) = self.expected_next_seq_num {
+                    ensure!(
+                        seq_num == expected_seq_num,
+                        "DB corruption: account transactions sequence numbers are not contiguous: \
+                     actual: {}, expected: {}",
+                        seq_num,
+                        expected_seq_num,
+                    );
+                };
+
+                // Ensure version_{i+1} > version_{i}
+                if let Some(prev_version) = self.prev_version {
+                    ensure!(
+                        prev_version < version,
+                        "DB corruption: account transaction versions are not strictly increasing: \
+                         previous version: {}, current version: {}",
+                        prev_version,
+                        version,
+                    );
+                }
+
+                // No more transactions (in this view of the ledger).
+                if version > self.ledger_version {
+                    return Ok(None);
+                }
+
+                self.expected_next_seq_num = Some(seq_num + 1);
+                self.prev_version = Some(version);
+                Some((seq_num, version))
+            },
+            None => None,
+        })
+    }
+}
+
+impl<'a> Iterator for AccountTransactionVersionIter<'a> {
+    type Item = Result<(u64, Version)>;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        self.next_impl().transpose()
+    }
+}
diff --git a/storage/jellyfish-merkle/src/restore/mod.rs b/storage/jellyfish-merkle/src/restore/mod.rs
index 42de201544626..673bd95de1655 100644
--- a/storage/jellyfish-merkle/src/restore/mod.rs
+++ b/storage/jellyfish-merkle/src/restore/mod.rs
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 //! This module implements the functionality to restore a `JellyfishMerkleTree` from small chunks
-//! of accounts.
+//! of states.
 
 use crate::{
     node_type::{
@@ -153,10 +153,10 @@ pub struct JellyfishMerkleRestore<K> {
     ///                             |         |
     ///                             |         |
     ///                             v         v
-    ///                            Frozen    Previously inserted account
+    ///                            Frozen    Previously inserted state
     /// ```
     ///
-    /// We insert the accounts from left to right. So if the next account appears at position `A`,
+    /// We insert the states from left to right. So if the next state appears at position `A`,
     /// it will cause the leaf at position `B` to be frozen. If it appears at position `B`, it
     /// might cause a few internal nodes to be created additionally. If it appears at position `C`,
     /// it will also cause `partial_nodes[1]` to be added to `frozen_nodes` as an internal node and
@@ -334,7 +334,7 @@ where
         Ok(partial_nodes)
     }
 
-    /// Restores a chunk of accounts. This function will verify that the given chunk is correct
+    /// Restores a chunk of states. This function will verify that the given chunk is correct
     /// using the proof and root hash, then write things to storage. If the chunk is invalid, an
     /// error will be returned and nothing will be written to storage.
     pub fn add_chunk_impl(
@@ -376,7 +376,7 @@ where
             if let Some(ref prev_leaf) = self.previous_leaf {
                 ensure!(
                     hashed_key > prev_leaf.account_key(),
-                    "Account keys must come in increasing order.",
+                    "State keys must come in increasing order.",
                 )
             }
             self.previous_leaf.replace(LeafNode::new(
@@ -413,7 +413,7 @@ where
         Ok(())
     }
 
-    /// Restores one account.
+    /// Restores one state.
     fn add_one(&mut self, new_key: &K, new_value_hash: HashValue) {
         let new_hashed_key = new_key.hash();
         let nibble_path = NibblePath::new_even(new_hashed_key.to_vec());
@@ -462,14 +462,14 @@ where
                     );
 
                     // We do not add this leaf node to self.frozen_nodes because we don't know its
-                    // node key yet. We will know its node key when the next account comes.
+                    // node key yet. We will know its node key when the next state comes.
                     break;
                 },
             }
         }
     }
 
-    /// Inserts a new account at the position of the existing leaf node. We may need to create
+    /// Inserts a new state at the position of the existing leaf node. We may need to create
     /// multiple internal nodes depending on the length of the common prefix of the existing key
     /// and the new key.
     fn insert_at_leaf(
@@ -622,9 +622,9 @@ where
         }
     }
 
-    /// Verifies that all accounts that have been added so far (from the leftmost one to
+    /// Verifies that all states that have been added so far (from the leftmost one to
     /// `self.previous_leaf`) are correct, i.e., we are able to construct `self.expected_root_hash`
-    /// by combining all existing accounts and `proof`.
+    /// by combining all existing states and `proof`.
     #[allow(clippy::collapsible_if)]
     fn verify(&self, proof: SparseMerkleRangeProof) -> Result<()> {
         let previous_leaf = self
@@ -635,7 +635,7 @@ where
         let previous_key = previous_leaf.account_key();
         // If we have all siblings on the path from root to `previous_key`, we should be able to
         // compute the root hash. The siblings on the right are already in the proof. Now we
-        // compute the siblings on the left side, which represent all the accounts that have ever
+        // compute the siblings on the left side, which represent all the states that have ever
         // been added.
         let mut left_siblings = vec![];
 
@@ -746,7 +746,7 @@ where
         Ok(())
     }
 
-    /// Finishes the restoration process. This tells the code that there is no more account,
+    /// Finishes the restoration process. This tells the code that there is no more state,
     /// otherwise we can not freeze the rightmost leaf and its ancestors.
     pub fn finish_impl(mut self) -> Result<()> {
         self.wait_for_async_commit()?;
diff --git a/storage/schemadb/src/iterator.rs b/storage/schemadb/src/iterator.rs
index 1a3ed83ee0ef0..13eb19e8578ae 100644
--- a/storage/schemadb/src/iterator.rs
+++ b/storage/schemadb/src/iterator.rs
@@ -12,11 +12,19 @@ pub enum ScanDirection {
     Backward,
 }
 
+enum Status {
+    Initialized,
+    DoneSeek,
+    Advancing,
+    Invalid,
+}
+
 /// DB Iterator parameterized on [`Schema`] that seeks with [`Schema::Key`] and yields
 /// [`Schema::Key`] and [`Schema::Value`]
 pub struct SchemaIterator<'a, S> {
     db_iter: rocksdb::DBRawIterator<'a>,
     direction: ScanDirection,
+    status: Status,
     phantom: PhantomData<S>,
 }
 
@@ -28,6 +36,7 @@ where
         SchemaIterator {
             db_iter,
             direction,
+            status: Status::Initialized,
             phantom: PhantomData,
         }
     }
@@ -38,6 +47,7 @@ where
             .with_label_values(&[S::COLUMN_FAMILY_NAME, "seek_to_first"])
             .start_timer();
         self.db_iter.seek_to_first();
+        self.status = Status::DoneSeek;
     }
 
     /// Seeks to the last key.
@@ -46,6 +56,7 @@ where
             .with_label_values(&[S::COLUMN_FAMILY_NAME, "seek_to_last"])
             .start_timer();
         self.db_iter.seek_to_last();
+        self.status = Status::DoneSeek;
     }
 
     /// Seeks to the first key whose binary representation is equal to or greater than that of the
@@ -59,6 +70,7 @@ where
             .start_timer();
         let key = <SK as SeekKeyCodec<S>>::encode_seek_key(seek_key)?;
         self.db_iter.seek(&key);
+        self.status = Status::DoneSeek;
         Ok(())
     }
 
@@ -75,6 +87,7 @@ where
             .start_timer();
         let key = <SK as SeekKeyCodec<S>>::encode_seek_key(seek_key)?;
         self.db_iter.seek_for_prev(&key);
+        self.status = Status::DoneSeek;
         Ok(())
     }
 
@@ -83,8 +96,19 @@ where
             .with_label_values(&[S::COLUMN_FAMILY_NAME])
             .start_timer();
 
+        if let Status::Advancing = self.status {
+            match self.direction {
+                ScanDirection::Forward => self.db_iter.next(),
+                ScanDirection::Backward => self.db_iter.prev(),
+            }
+        } else {
+            self.status = Status::Advancing;
+        }
+
         if !self.db_iter.valid() {
             self.db_iter.status().into_db_res()?;
+            // advancing an invalid raw iter results in seg fault
+            self.status = Status::Invalid;
             return Ok(None);
         }
 
@@ -97,11 +121,6 @@ where
         let key = <S::Key as KeyCodec<S>>::decode_key(raw_key);
         let value = <S::Value as ValueCodec<S>>::decode_value(raw_value);
 
-        match self.direction {
-            ScanDirection::Forward => self.db_iter.next(),
-            ScanDirection::Backward => self.db_iter.prev(),
-        }
-
         Ok(Some((key?, value?)))
     }
 }
diff --git a/storage/schemadb/src/lib.rs b/storage/schemadb/src/lib.rs
index 77e75366c29ef..c9f2ee176d172 100644
--- a/storage/schemadb/src/lib.rs
+++ b/storage/schemadb/src/lib.rs
@@ -32,9 +32,10 @@ use crate::{
 use anyhow::format_err;
 use aptos_infallible::Mutex;
 use aptos_logger::prelude::*;
-use aptos_storage_interface::Result as DbResult;
+use aptos_storage_interface::{AptosDbError, Result as DbResult};
 use iterator::{ScanDirection, SchemaIterator};
 use rand::Rng;
+use rocksdb::ErrorKind;
 /// Type alias to `rocksdb::ReadOptions`. See [`rocksdb doc`](https://github.com/pingcap/rust-rocksdb/blob/master/src/rocksdb_options.rs)
 pub use rocksdb::{
     BlockBasedOptions, Cache, ColumnFamilyDescriptor, DBCompressionType, Options, ReadOptions,
@@ -235,6 +236,14 @@ impl DB {
         self.write_schemas(batch)
     }
 
+    /// Deletes a single record.
+    pub fn delete<S: Schema>(&self, key: &S::Key) -> DbResult<()> {
+        // Not necessary to use a batch, but we'd like a central place to bump counters.
+        let batch = SchemaBatch::new();
+        batch.delete::<S>(key)?;
+        self.write_schemas(batch)
+    }
+
     fn iter_with_direction<S: Schema>(
         &self,
         opts: ReadOptions,
@@ -248,12 +257,22 @@ impl DB {
     }
 
     /// Returns a forward [`SchemaIterator`] on a certain schema.
-    pub fn iter<S: Schema>(&self, opts: ReadOptions) -> DbResult<SchemaIterator<S>> {
+    pub fn iter<S: Schema>(&self) -> DbResult<SchemaIterator<S>> {
+        self.iter_with_opts(ReadOptions::default())
+    }
+
+    /// Returns a forward [`SchemaIterator`] on a certain schema, with non-default ReadOptions
+    pub fn iter_with_opts<S: Schema>(&self, opts: ReadOptions) -> DbResult<SchemaIterator<S>> {
         self.iter_with_direction::<S>(opts, ScanDirection::Forward)
     }
 
     /// Returns a backward [`SchemaIterator`] on a certain schema.
-    pub fn rev_iter<S: Schema>(&self, opts: ReadOptions) -> DbResult<SchemaIterator<S>> {
+    pub fn rev_iter<S: Schema>(&self) -> DbResult<SchemaIterator<S>> {
+        self.rev_iter_with_opts(ReadOptions::default())
+    }
+
+    /// Returns a backward [`SchemaIterator`] on a certain schema, with non-default ReadOptions
+    pub fn rev_iter_with_opts<S: Schema>(&self, opts: ReadOptions) -> DbResult<SchemaIterator<S>> {
         self.iter_with_direction::<S>(opts, ScanDirection::Backward)
     }
 
@@ -387,8 +406,25 @@ trait DeUnc: AsRef<Path> {
 
 impl<T> DeUnc for T where T: AsRef<Path> {}
 
-fn to_db_err(rocksdb_err: rocksdb::Error) -> aptos_storage_interface::AptosDbError {
-    aptos_storage_interface::AptosDbError::RocksDbError(rocksdb_err.to_string())
+fn to_db_err(rocksdb_err: rocksdb::Error) -> AptosDbError {
+    match rocksdb_err.kind() {
+        ErrorKind::Incomplete => AptosDbError::RocksDbIncompleteResult(rocksdb_err.to_string()),
+        ErrorKind::NotFound
+        | ErrorKind::Corruption
+        | ErrorKind::NotSupported
+        | ErrorKind::InvalidArgument
+        | ErrorKind::IOError
+        | ErrorKind::MergeInProgress
+        | ErrorKind::ShutdownInProgress
+        | ErrorKind::TimedOut
+        | ErrorKind::Aborted
+        | ErrorKind::Busy
+        | ErrorKind::Expired
+        | ErrorKind::TryAgain
+        | ErrorKind::CompactionTooLarge
+        | ErrorKind::ColumnFamilyDropped
+        | ErrorKind::Unknown => AptosDbError::OtherRocksDbError(rocksdb_err.to_string()),
+    }
 }
 
 trait IntoDbResult<T> {
diff --git a/storage/schemadb/src/schema.rs b/storage/schemadb/src/schema.rs
index 34c26607da22a..b0e8181e98d85 100644
--- a/storage/schemadb/src/schema.rs
+++ b/storage/schemadb/src/schema.rs
@@ -80,6 +80,21 @@ macro_rules! define_schema {
     };
 }
 
+#[macro_export]
+macro_rules! define_pub_schema {
+    ($schema_type:ident, $key_type:ty, $value_type:ty, $cf_name:expr) => {
+        #[derive(Debug)]
+        pub struct $schema_type;
+
+        impl $crate::schema::Schema for $schema_type {
+            type Key = $key_type;
+            type Value = $value_type;
+
+            const COLUMN_FAMILY_NAME: $crate::ColumnFamilyName = $cf_name;
+        }
+    };
+}
+
 /// This trait defines a type that can serve as a [`Schema::Key`].
 pub trait KeyCodec<S: Schema + ?Sized>: Sized + PartialEq + Debug {
     /// Converts `self` to bytes to be stored in DB.
diff --git a/storage/schemadb/tests/db.rs b/storage/schemadb/tests/db.rs
index 35baf4014bc6e..b162ac4d0244e 100644
--- a/storage/schemadb/tests/db.rs
+++ b/storage/schemadb/tests/db.rs
@@ -175,9 +175,7 @@ fn test_schema_put_get() {
 }
 
 fn collect_values<S: Schema>(db: &TestDB) -> Vec<(S::Key, S::Value)> {
-    let mut iter = db
-        .iter::<S>(Default::default())
-        .expect("Failed to create iterator.");
+    let mut iter = db.iter::<S>().expect("Failed to create iterator.");
     iter.seek_to_first();
     iter.collect::<Result<Vec<_>, AptosDbError>>().unwrap()
 }
diff --git a/storage/schemadb/tests/iterator.rs b/storage/schemadb/tests/iterator.rs
index e500276c147d9..c1ba4b188a1e8 100644
--- a/storage/schemadb/tests/iterator.rs
+++ b/storage/schemadb/tests/iterator.rs
@@ -9,8 +9,9 @@ use aptos_schemadb::{
     schema::{KeyCodec, Schema, SeekKeyCodec, ValueCodec},
     DB,
 };
+use aptos_storage_interface::AptosDbError;
 use byteorder::{BigEndian, ReadBytesExt, WriteBytesExt};
-use rocksdb::DEFAULT_COLUMN_FAMILY_NAME;
+use rocksdb::{ColumnFamilyDescriptor, SliceTransform, DEFAULT_COLUMN_FAMILY_NAME};
 
 define_schema!(TestSchema, TestKey, TestValue, "TestCF");
 
@@ -69,10 +70,35 @@ impl SeekKeyCodec<TestSchema> for KeyPrefix2 {
     }
 }
 
-fn collect_values(iter: SchemaIterator<TestSchema>) -> Vec<u32> {
+fn collect_values(mut iter: SchemaIterator<TestSchema>) -> Vec<u32> {
+    collect_values_mut(&mut iter)
+}
+
+fn collect_values_mut(iter: &mut SchemaIterator<TestSchema>) -> Vec<u32> {
     iter.map(|row| (row.unwrap().1).0).collect()
 }
 
+fn collect_incomplete(iter: &mut SchemaIterator<TestSchema>) -> Vec<u32> {
+    let mut res_vec = vec![];
+    for res in iter {
+        match res {
+            Ok((_key, value)) => {
+                res_vec.push(value.0);
+            },
+            Err(AptosDbError::RocksDbIncompleteResult(..)) => {
+                return res_vec;
+            },
+            Err(e) => {
+                panic!("expecting incomplete error, got {:?}", e);
+            },
+        }
+    }
+
+    panic!("expecting incomplete error, while iterator terminated.")
+}
+
+const EMPTY: [u32; 0] = [];
+
 struct TestDB {
     _tmpdir: aptos_temppath::TempPath,
     db: DB,
@@ -113,15 +139,11 @@ impl TestDB {
 
 impl TestDB {
     fn iter(&self) -> SchemaIterator<TestSchema> {
-        self.db
-            .iter(Default::default())
-            .expect("Failed to create iterator.")
+        self.db.iter().expect("Failed to create iterator.")
     }
 
     fn rev_iter(&self) -> SchemaIterator<TestSchema> {
-        self.db
-            .rev_iter(Default::default())
-            .expect("Failed to create iterator.")
+        self.db.rev_iter().expect("Failed to create iterator.")
     }
 }
 
@@ -266,3 +288,245 @@ fn test_seek_for_prev_by_2prefix() {
     iter.seek_for_prev(&KeyPrefix2(2, 0)).unwrap();
     assert_eq!(collect_values(iter), [114, 112, 110, 104, 102, 100]);
 }
+
+struct TestDBWithPrefixExtractor {
+    _tmpdir: aptos_temppath::TempPath,
+    db: DB,
+}
+
+impl TestDBWithPrefixExtractor {
+    fn new() -> Self {
+        let tmpdir = aptos_temppath::TempPath::new();
+        let mut db_opts = rocksdb::Options::default();
+        db_opts.create_if_missing(true);
+        db_opts.create_missing_column_families(true);
+        let db = DB::open_cf(&db_opts, tmpdir.path(), "test_with_prefix", vec![
+            ColumnFamilyDescriptor::new(DEFAULT_COLUMN_FAMILY_NAME, rocksdb::Options::default()),
+            ColumnFamilyDescriptor::new(TestSchema::COLUMN_FAMILY_NAME, {
+                let mut opts = rocksdb::Options::default();
+                opts.set_prefix_extractor(SliceTransform::create(
+                    "2_prefix_extractor",
+                    |key| &key[0..std::cmp::min(8, key.len())],
+                    None,
+                ));
+                opts
+            }),
+        ])
+        .unwrap();
+
+        // delete later
+        db.put::<TestSchema>(&TestKey(1, 1, 1), &TestValue(111))
+            .unwrap();
+        db.put::<TestSchema>(&TestKey(1, 2, 2), &TestValue(122))
+            .unwrap();
+        db.put::<TestSchema>(&TestKey(1, 2, 3), &TestValue(123))
+            .unwrap();
+
+        //  delete without update TestKey(1,2,4)
+
+        db.put::<TestSchema>(&TestKey(1, 2, 5), &TestValue(125))
+            .unwrap();
+        db.put::<TestSchema>(&TestKey(1, 5, 5), &TestValue(155))
+            .unwrap();
+        // delete later
+        db.put::<TestSchema>(&TestKey(1, 6, 6), &TestValue(166))
+            .unwrap();
+        // to be overwritten
+        db.put::<TestSchema>(&TestKey(1, 7, 7), &TestValue(0))
+            .unwrap();
+        // overwrite
+        db.put::<TestSchema>(&TestKey(1, 7, 7), &TestValue(177))
+            .unwrap();
+        db.put::<TestSchema>(&TestKey(2, 2, 2), &TestValue(222))
+            .unwrap();
+        // delete later
+        db.put::<TestSchema>(&TestKey(2, 3, 3), &TestValue(233))
+            .unwrap();
+
+        // delete without update TestKey(2,4,4)
+
+        db.put::<TestSchema>(&TestKey(2, 7, 7), &TestValue(277))
+            .unwrap();
+        db.put::<TestSchema>(&TestKey(2, 8, 8), &TestValue(288))
+            .unwrap();
+        db.put::<TestSchema>(&TestKey(2, 9, 9), &TestValue(299))
+            .unwrap();
+        // delete later
+        db.put::<TestSchema>(&TestKey(3, 7, 7), &TestValue(377))
+            .unwrap();
+        // delete later
+        db.put::<TestSchema>(&TestKey(3, 8, 8), &TestValue(388))
+            .unwrap();
+        db.put::<TestSchema>(&TestKey(3, 9, 9), &TestValue(399))
+            .unwrap();
+
+        db.delete::<TestSchema>(&TestKey(1, 1, 1)).unwrap();
+        db.delete::<TestSchema>(&TestKey(1, 2, 4)).unwrap();
+        db.delete::<TestSchema>(&TestKey(1, 6, 6)).unwrap();
+        db.delete::<TestSchema>(&TestKey(2, 3, 3)).unwrap();
+        db.delete::<TestSchema>(&TestKey(2, 4, 4)).unwrap();
+        db.delete::<TestSchema>(&TestKey(3, 7, 7)).unwrap();
+        db.delete::<TestSchema>(&TestKey(3, 8, 8)).unwrap();
+
+        TestDBWithPrefixExtractor {
+            _tmpdir: tmpdir,
+            db,
+        }
+    }
+
+    fn iter(&self) -> SchemaIterator<TestSchema> {
+        self.db.iter().expect("Failed to create iterator.")
+    }
+
+    fn iter_with_same_prefix(&self) -> SchemaIterator<TestSchema> {
+        let mut opts = rocksdb::ReadOptions::default();
+        opts.set_prefix_same_as_start(true);
+        self.db
+            .iter_with_opts(opts)
+            .expect("Failed to create iterator.")
+    }
+
+    fn iter_with_max_skipped_deletions(&self, num_skips: u64) -> SchemaIterator<TestSchema> {
+        let mut opts = rocksdb::ReadOptions::default();
+        opts.set_max_skippable_internal_keys(num_skips);
+        self.db
+            .iter_with_opts(opts)
+            .expect("Failed to create iterator.")
+    }
+
+    fn iter_with_upper_bound(&self, upper_bound: Vec<u8>) -> SchemaIterator<TestSchema> {
+        let mut opts = rocksdb::ReadOptions::default();
+        opts.set_iterate_upper_bound(upper_bound);
+        self.db
+            .iter_with_opts(opts)
+            .expect("Failed to create iterator.")
+    }
+}
+
+#[test]
+fn test_iter_with_prefix_extractor() {
+    let db = TestDBWithPrefixExtractor::new();
+
+    let all_values = [122, 123, 125, 155, 177, 222, 277, 288, 299, 399];
+
+    let mut iter = db.iter();
+    iter.seek(&TestKey(0, 0, 0)).unwrap();
+    assert_eq!(collect_values_mut(&mut iter), all_values);
+
+    iter.seek(&KeyPrefix2(0, 0)).unwrap();
+    assert_eq!(collect_values_mut(&mut iter), all_values);
+
+    iter.seek(&KeyPrefix1(0)).unwrap();
+    assert_eq!(collect_values_mut(&mut iter), all_values);
+}
+
+#[test]
+fn test_iter_with_same_prefix() {
+    let db = TestDBWithPrefixExtractor::new();
+
+    let mut iter = db.iter_with_same_prefix();
+    iter.seek(&TestKey(1, 2, 0)).unwrap();
+    assert_eq!(collect_values_mut(&mut iter), [122, 123, 125]);
+
+    iter.seek(&TestKey(1, 2, 3)).unwrap();
+    assert_eq!(collect_values_mut(&mut iter), [123, 125]);
+
+    iter.seek(&TestKey(1, 2, 4)).unwrap();
+    assert_eq!(collect_values_mut(&mut iter), [125]);
+
+    iter.seek(&KeyPrefix2(1, 2)).unwrap();
+    assert_eq!(collect_values_mut(&mut iter), [122, 123, 125]);
+
+    iter.seek(&KeyPrefix2(1, 0)).unwrap();
+    assert_eq!(collect_values_mut(&mut iter), EMPTY);
+
+    iter.seek(&KeyPrefix2(1, 1)).unwrap();
+    assert_eq!(collect_values_mut(&mut iter), EMPTY);
+
+    iter.seek(&KeyPrefix1(1)).unwrap();
+    assert_eq!(collect_values_mut(&mut iter), EMPTY);
+}
+
+#[test]
+fn test_iter_with_max_skipped_deletions() {
+    let db = TestDBWithPrefixExtractor::new();
+
+    // -----------------
+    // max skip 1
+
+    let mut iter = db.iter_with_max_skipped_deletions(1);
+
+    iter.seek_to_first();
+    assert_eq!(collect_incomplete(&mut iter), EMPTY);
+
+    iter.seek(&TestKey(1, 1, 1)).unwrap();
+    assert_eq!(collect_incomplete(&mut iter), EMPTY);
+
+    iter.seek(&KeyPrefix1(0)).unwrap();
+    assert_eq!(collect_incomplete(&mut iter), EMPTY);
+
+    iter.seek(&KeyPrefix2(1, 1)).unwrap();
+    assert_eq!(collect_incomplete(&mut iter), EMPTY);
+
+    iter.seek(&TestKey(1, 2, 3)).unwrap();
+    assert_eq!(collect_incomplete(&mut iter), [123, 125, 155]);
+
+    iter.seek(&TestKey(1, 5, 5)).unwrap();
+    assert_eq!(collect_incomplete(&mut iter), [155]);
+
+    iter.seek(&TestKey(1, 6, 7)).unwrap();
+    assert_eq!(collect_incomplete(&mut iter), [177, 222]);
+
+    // -----------------
+    // max skip 2
+
+    let mut iter = db.iter_with_max_skipped_deletions(2);
+
+    iter.seek(&TestKey(1, 2, 3)).unwrap();
+    assert_eq!(collect_incomplete(&mut iter), [123, 125, 155, 177, 222]);
+
+    // -----------------
+    // max skip 3
+
+    let mut iter = db.iter_with_max_skipped_deletions(3);
+    iter.seek(&TestKey(1, 5, 5)).unwrap();
+    assert_eq!(collect_incomplete(&mut iter), [
+        155, 177, 222, 277, 288, 299
+    ]);
+
+    // -----------------
+    // max skip 4
+
+    let mut iter = db.iter_with_max_skipped_deletions(4);
+    iter.seek(&TestKey(0, 0, 0)).unwrap();
+    assert_eq!(collect_values_mut(&mut iter), [
+        122, 123, 125, 155, 177, 222, 277, 288, 299, 399
+    ]);
+}
+
+#[test]
+fn test_iter_with_upper_bound() {
+    let db = TestDBWithPrefixExtractor::new();
+
+    let mut iter =
+        db.iter_with_upper_bound(KeyCodec::<TestSchema>::encode_key(&TestKey(1, 5, 5)).unwrap());
+    iter.seek_to_first();
+    assert_eq!(collect_values_mut(&mut iter), [122, 123, 125]);
+
+    let mut iter =
+        db.iter_with_upper_bound(KeyCodec::<TestSchema>::encode_key(&TestKey(1, 2, 4)).unwrap());
+    iter.seek_to_first();
+    assert_eq!(collect_values_mut(&mut iter), [122, 123]);
+
+    let mut iter = db.iter_with_upper_bound(
+        SeekKeyCodec::<TestSchema>::encode_seek_key(&KeyPrefix1(2)).unwrap(),
+    );
+    iter.seek(&KeyPrefix1(1)).unwrap();
+    assert_eq!(collect_values_mut(&mut iter), [122, 123, 125, 155, 177]);
+
+    let mut iter = db.iter_with_upper_bound(
+        SeekKeyCodec::<TestSchema>::encode_seek_key(&KeyPrefix2(1, 5)).unwrap(),
+    );
+    iter.seek(&KeyPrefix1(1)).unwrap();
+    assert_eq!(collect_values_mut(&mut iter), [122, 123, 125]);
+}
diff --git a/storage/scratchpad/src/sparse_merkle/mod.rs b/storage/scratchpad/src/sparse_merkle/mod.rs
index 94a9836a31ce5..6b9f35e145439 100644
--- a/storage/scratchpad/src/sparse_merkle/mod.rs
+++ b/storage/scratchpad/src/sparse_merkle/mod.rs
@@ -92,6 +92,7 @@ use aptos_crypto::{
     hash::{CryptoHash, SPARSE_MERKLE_PLACEHOLDER_HASH},
     HashValue,
 };
+use aptos_drop_helper::ArcAsyncDrop;
 use aptos_infallible::Mutex;
 use aptos_metrics_core::IntGaugeHelper;
 use aptos_types::{
@@ -112,7 +113,7 @@ const BITS_IN_BYTE: usize = 8;
 /// The inner content of a sparse merkle tree, we have this so that even if a tree is dropped, the
 /// INNER of it can still live if referenced by a previous version.
 #[derive(Debug)]
-struct Inner<V: Send + Sync + 'static> {
+struct Inner<V: ArcAsyncDrop> {
     root: Option<SubTree<V>>,
     usage: StateStorageUsage,
     children: Mutex<Vec<Arc<Inner<V>>>>,
@@ -120,7 +121,7 @@ struct Inner<V: Send + Sync + 'static> {
     generation: u64,
 }
 
-impl<V: Send + Sync + 'static> Drop for Inner<V> {
+impl<V: ArcAsyncDrop> Drop for Inner<V> {
     fn drop(&mut self) {
         // Drop the root in a different thread, because that's the slowest part.
         SUBTREE_DROPPER.schedule_drop(self.root.take());
@@ -140,7 +141,7 @@ impl<V: Send + Sync + 'static> Drop for Inner<V> {
     }
 }
 
-impl<V: Send + Sync + 'static> Inner<V> {
+impl<V: ArcAsyncDrop> Inner<V> {
     fn new(root: SubTree<V>, usage: StateStorageUsage) -> Arc<Self> {
         let family = HashValue::random();
         let me = Arc::new(Self {
@@ -187,13 +188,13 @@ impl<V: Send + Sync + 'static> Inner<V> {
 
 /// The Sparse Merkle Tree implementation.
 #[derive(Clone, Debug)]
-pub struct SparseMerkleTree<V: Send + Sync + 'static> {
+pub struct SparseMerkleTree<V: ArcAsyncDrop> {
     inner: Arc<Inner<V>>,
 }
 
-impl<V: Send + Sync + 'static> SparseMerkleTree<V>
+impl<V> SparseMerkleTree<V>
 where
-    V: Clone + CryptoHash + Send + Sync + 'static,
+    V: Clone + CryptoHash + ArcAsyncDrop,
 {
     /// Constructs a Sparse Merkle Tree with a root hash. This is often used when we restart and
     /// the scratch pad and the storage have identical state, so we use a single root hash to
@@ -408,7 +409,7 @@ where
 #[cfg(any(feature = "fuzzing", feature = "bench", test))]
 impl<V> SparseMerkleTree<V>
 where
-    V: Clone + CryptoHash + Send + Sync,
+    V: Clone + CryptoHash + ArcAsyncDrop,
 {
     pub fn batch_update(
         &self,
@@ -428,7 +429,7 @@ where
 
 impl<V> Default for SparseMerkleTree<V>
 where
-    V: Clone + CryptoHash + Send + Sync,
+    V: Clone + CryptoHash + ArcAsyncDrop,
 {
     fn default() -> Self {
         SparseMerkleTree::new_empty()
@@ -456,7 +457,7 @@ pub enum StateStoreStatus<V> {
 /// In the entire lifetime of this, in-mem nodes won't be dropped because a reference to the oldest
 /// SMT is held inside.
 #[derive(Clone, Debug)]
-pub struct FrozenSparseMerkleTree<V: Send + Sync + 'static> {
+pub struct FrozenSparseMerkleTree<V: ArcAsyncDrop> {
     pub base_smt: SparseMerkleTree<V>,
     pub base_generation: u64,
     pub smt: SparseMerkleTree<V>,
@@ -464,7 +465,7 @@ pub struct FrozenSparseMerkleTree<V: Send + Sync + 'static> {
 
 impl<V> FrozenSparseMerkleTree<V>
 where
-    V: Clone + CryptoHash + Send + Sync + 'static,
+    V: Clone + CryptoHash + ArcAsyncDrop,
 {
     fn spawn(&self, child_root: SubTree<V>, child_usage: StateStorageUsage) -> Self {
         let smt = SparseMerkleTree {
diff --git a/storage/scratchpad/src/sparse_merkle/node.rs b/storage/scratchpad/src/sparse_merkle/node.rs
index fc471e587d874..0167a22a3347c 100644
--- a/storage/scratchpad/src/sparse_merkle/node.rs
+++ b/storage/scratchpad/src/sparse_merkle/node.rs
@@ -26,11 +26,12 @@ use aptos_crypto::{
     hash::{CryptoHash, SPARSE_MERKLE_PLACEHOLDER_HASH},
     HashValue,
 };
+use aptos_drop_helper::ArcAsyncDrop;
 use aptos_types::proof::{SparseMerkleInternalNode, SparseMerkleLeafNode};
 use std::sync::{Arc, Weak};
 
 #[derive(Clone, Debug)]
-pub(crate) struct InternalNode<V: Send + Sync + 'static> {
+pub(crate) struct InternalNode<V: ArcAsyncDrop> {
     pub left: SubTree<V>,
     pub right: SubTree<V>,
 }
@@ -42,12 +43,12 @@ impl<V: CryptoHash + Send + Sync + 'static> InternalNode<V> {
 }
 
 #[derive(Clone, Debug)]
-pub(crate) struct LeafNode<V: Send + Sync + 'static> {
+pub(crate) struct LeafNode<V: ArcAsyncDrop> {
     pub key: HashValue,
     pub value: LeafValue<V>,
 }
 
-impl<V: Send + Sync + 'static> LeafNode<V> {
+impl<V: ArcAsyncDrop> LeafNode<V> {
     pub fn new(key: HashValue, value: LeafValue<V>) -> Self {
         Self { key, value }
     }
@@ -66,7 +67,7 @@ impl<V: CryptoHash + Send + Sync + 'static> LeafNode<V> {
     }
 }
 
-impl<V: Send + Sync + 'static> From<&SparseMerkleLeafNode> for LeafNode<V>
+impl<V: ArcAsyncDrop> From<&SparseMerkleLeafNode> for LeafNode<V>
 where
     V: CryptoHash,
 {
@@ -79,13 +80,13 @@ where
 }
 
 #[derive(Debug)]
-pub(crate) enum NodeInner<V: Send + Sync + 'static> {
+pub(crate) enum NodeInner<V: ArcAsyncDrop> {
     Internal(InternalNode<V>),
     Leaf(LeafNode<V>),
 }
 
 #[derive(Debug)]
-pub(crate) struct Node<V: Send + Sync + 'static> {
+pub(crate) struct Node<V: ArcAsyncDrop> {
     generation: u64,
     inner: NodeInner<V>,
 }
@@ -99,7 +100,7 @@ impl<V: CryptoHash + Send + Sync + 'static> Node<V> {
     }
 }
 
-impl<V: Send + Sync + 'static> Node<V> {
+impl<V: ArcAsyncDrop> Node<V> {
     pub fn new_leaf(key: HashValue, value: LeafValue<V>, generation: u64) -> Self {
         Self {
             generation,
@@ -176,7 +177,7 @@ impl<R> Clone for Ref<R> {
 pub(crate) type NodeHandle<V> = Ref<Node<V>>;
 
 #[derive(Clone, Debug)]
-pub(crate) enum SubTree<V: Send + Sync + 'static> {
+pub(crate) enum SubTree<V: ArcAsyncDrop> {
     Empty,
     NonEmpty {
         hash: HashValue,
@@ -272,12 +273,12 @@ impl<V: CryptoHash + Send + Sync + 'static> SubTree<V> {
 }
 
 #[derive(Clone, Debug)]
-pub struct LeafValue<V: Send + Sync + 'static> {
+pub struct LeafValue<V: ArcAsyncDrop> {
     pub hash: HashValue,
     pub data: Ref<V>,
 }
 
-impl<V: Send + Sync + 'static> LeafValue<V> {
+impl<V: ArcAsyncDrop> LeafValue<V> {
     pub fn new_with_value(value: V) -> Self
     where
         V: CryptoHash,
diff --git a/storage/scratchpad/src/sparse_merkle/test_utils/proptest_helpers.rs b/storage/scratchpad/src/sparse_merkle/test_utils/proptest_helpers.rs
index 2ef6f84b3c709..0cea1a3a60f8f 100644
--- a/storage/scratchpad/src/sparse_merkle/test_utils/proptest_helpers.rs
+++ b/storage/scratchpad/src/sparse_merkle/test_utils/proptest_helpers.rs
@@ -8,6 +8,7 @@ use crate::{
     SparseMerkleTree,
 };
 use aptos_crypto::{hash::SPARSE_MERKLE_PLACEHOLDER_HASH, HashValue};
+use aptos_drop_helper::ArcAsyncDrop;
 use aptos_types::state_store::{state_storage_usage::StateStorageUsage, state_value::StateValue};
 use proptest::{
     collection::{hash_set, vec},
@@ -128,13 +129,13 @@ trait AssertNoExternalStrongRef {
     fn assert_no_external_strong_ref(&self);
 }
 
-impl<V: Send + Sync + 'static> AssertNoExternalStrongRef for SparseMerkleTree<V> {
+impl<V: ArcAsyncDrop> AssertNoExternalStrongRef for SparseMerkleTree<V> {
     fn assert_no_external_strong_ref(&self) {
         assert_subtree_sole_strong_ref(self.inner.root());
     }
 }
 
-fn assert_subtree_sole_strong_ref<V: Send + Sync + 'static>(subtree: &SubTree<V>) {
+fn assert_subtree_sole_strong_ref<V: ArcAsyncDrop>(subtree: &SubTree<V>) {
     if let SubTree::NonEmpty {
         root: NodeHandle::Shared(arc),
         ..
diff --git a/storage/scratchpad/src/sparse_merkle/updater.rs b/storage/scratchpad/src/sparse_merkle/updater.rs
index 95dd16a3247c9..0105e40f1b96c 100644
--- a/storage/scratchpad/src/sparse_merkle/updater.rs
+++ b/storage/scratchpad/src/sparse_merkle/updater.rs
@@ -14,6 +14,7 @@ use aptos_crypto::{
     hash::{CryptoHash, SPARSE_MERKLE_PLACEHOLDER_HASH},
     HashValue,
 };
+use aptos_drop_helper::ArcAsyncDrop;
 use aptos_experimental_runtimes::thread_manager::THREAD_MANAGER;
 use aptos_types::proof::{definition::NodeInProof, SparseMerkleLeafNode, SparseMerkleProofExt};
 use std::cmp::Ordering;
@@ -24,7 +25,7 @@ type InMemSubTree<V> = super::node::SubTree<V>;
 type InMemInternal<V> = InternalNode<V>;
 
 #[derive(Clone)]
-enum InMemSubTreeInfo<V: Send + Sync + 'static> {
+enum InMemSubTreeInfo<V: ArcAsyncDrop> {
     Internal {
         subtree: InMemSubTree<V>,
         node: InMemInternal<V>,
@@ -105,7 +106,7 @@ enum PersistedSubTreeInfo<'a> {
 }
 
 #[derive(Clone)]
-enum SubTreeInfo<'a, V: Send + Sync + 'static> {
+enum SubTreeInfo<'a, V: ArcAsyncDrop> {
     InMem(InMemSubTreeInfo<V>),
     Persisted(PersistedSubTreeInfo<'a>),
 }
@@ -272,14 +273,14 @@ impl<'a, V: Clone + CryptoHash + Send + Sync + 'static> SubTreeInfo<'a, V> {
     }
 }
 
-pub struct SubTreeUpdater<'a, V: Send + Sync + 'static> {
+pub struct SubTreeUpdater<'a, V: ArcAsyncDrop> {
     depth: usize,
     info: SubTreeInfo<'a, V>,
     updates: &'a [(HashValue, Option<&'a V>)],
     generation: u64,
 }
 
-impl<'a, V: Send + Sync + 'static + Clone + CryptoHash> SubTreeUpdater<'a, V> {
+impl<'a, V: ArcAsyncDrop + Clone + CryptoHash> SubTreeUpdater<'a, V> {
     pub(crate) fn update(
         root: InMemSubTree<V>,
         updates: &'a [(HashValue, Option<&'a V>)],
diff --git a/storage/storage-interface/src/block_info.rs b/storage/storage-interface/src/block_info.rs
index 7179c381018ca..a650ecb651a11 100644
--- a/storage/storage-interface/src/block_info.rs
+++ b/storage/storage-interface/src/block_info.rs
@@ -2,7 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use aptos_crypto::hash::HashValue;
-use aptos_types::{account_address::AccountAddress, transaction::Version};
+use aptos_types::{
+    account_address::AccountAddress, account_config::NewBlockEvent, transaction::Version,
+};
 use serde::{Deserialize, Serialize};
 use std::ops::Deref;
 
@@ -12,6 +14,30 @@ pub enum BlockInfo {
     V0(BlockInfoV0),
 }
 
+impl BlockInfo {
+    pub fn from_new_block_event(version: Version, new_block_event: &NewBlockEvent) -> Self {
+        let NewBlockEvent {
+            hash,
+            epoch,
+            round,
+            height: _,
+            previous_block_votes_bitvec: _,
+            proposer,
+            failed_proposer_indices: _,
+            timestamp,
+        } = new_block_event;
+
+        Self::V0(BlockInfoV0 {
+            id: HashValue::from_slice(hash.as_slice()).unwrap(),
+            epoch: *epoch,
+            round: *round,
+            proposer: *proposer,
+            first_version: version,
+            timestamp_usecs: *timestamp,
+        })
+    }
+}
+
 impl Deref for BlockInfo {
     type Target = BlockInfoV0;
 
@@ -35,24 +61,6 @@ pub struct BlockInfoV0 {
 }
 
 impl BlockInfoV0 {
-    pub fn new(
-        id: HashValue,
-        epoch: u64,
-        round: u64,
-        proposer: AccountAddress,
-        timestamp_usecs: u64,
-        first_version: Version,
-    ) -> Self {
-        Self {
-            id,
-            epoch,
-            round,
-            proposer,
-            timestamp_usecs,
-            first_version,
-        }
-    }
-
     pub fn id(&self) -> HashValue {
         self.id
     }
diff --git a/storage/storage-interface/src/errors.rs b/storage/storage-interface/src/errors.rs
index 4e44987dbe393..8e380126700fa 100644
--- a/storage/storage-interface/src/errors.rs
+++ b/storage/storage-interface/src/errors.rs
@@ -21,8 +21,10 @@ pub enum AptosDbError {
     /// Other non-classified error.
     #[error("AptosDB Other Error: {0}")]
     Other(String),
+    #[error("AptosDB RocksDb Error: {0}")]
+    RocksDbIncompleteResult(String),
     #[error("AptosDB RocksDB Error: {0}")]
-    RocksDbError(String),
+    OtherRocksDbError(String),
     #[error("AptosDB bcs Error: {0}")]
     BcsError(String),
     #[error("AptosDB IO Error: {0}")]
diff --git a/storage/storage-interface/src/lib.rs b/storage/storage-interface/src/lib.rs
index 8281c0522c3da..25628347838be 100644
--- a/storage/storage-interface/src/lib.rs
+++ b/storage/storage-interface/src/lib.rs
@@ -4,6 +4,7 @@
 
 use crate::cached_state_view::ShardedStateCache;
 use aptos_crypto::{hash::CryptoHash, HashValue};
+pub use aptos_types::indexer::indexer_db_reader::Order;
 use aptos_types::{
     account_address::AccountAddress,
     account_config::NewBlockEvent,
@@ -97,12 +98,6 @@ impl From<aptos_secure_net::Error> for Error {
     }
 }
 
-#[derive(Clone, Copy, Eq, PartialEq)]
-pub enum Order {
-    Ascending,
-    Descending,
-}
-
 macro_rules! delegate_read {
     ($(
         $(#[$($attr:meta)*])*
@@ -170,7 +165,7 @@ pub trait DbReader: Send + Sync {
         fn get_transaction_auxiliary_data_by_version(
             &self,
             version: Version,
-        ) -> Result<TransactionAuxiliaryData>;
+        ) -> Result<Option<TransactionAuxiliaryData>>;
 
         /// See [AptosDB::get_first_txn_version].
         ///
@@ -286,8 +281,8 @@ pub trait DbReader: Send + Sync {
         /// Returns the latest ledger info, if any.
         fn get_latest_ledger_info_option(&self) -> Result<Option<LedgerInfoWithSignatures>>;
 
-        /// Returns the latest committed version, error on on non-bootstrapped/empty DB.
-        fn get_latest_version(&self) -> Result<Version>;
+        /// Returns the latest "synced" transaction version, potentially not "committed" yet.
+        fn get_synced_version(&self) -> Result<Version>;
 
         /// Returns the latest state checkpoint version if any.
         fn get_latest_state_checkpoint_version(&self) -> Result<Option<Version>>;
@@ -424,8 +419,8 @@ pub trait DbReader: Send + Sync {
             ledger_version: Version,
         ) -> Result<TransactionAccumulatorSummary>;
 
-        /// Returns total number of leaves in state store at given version.
-        fn get_state_leaf_count(&self, version: Version) -> Result<usize>;
+        /// Returns total number of state items in state store at given version.
+        fn get_state_item_count(&self, version: Version) -> Result<usize>;
 
         /// Get a chunk of state store value, addressed by the index.
         fn get_state_value_chunk_with_proof(
@@ -455,6 +450,12 @@ pub trait DbReader: Send + Sync {
 
         /// Returns state storage usage at the end of an epoch.
         fn get_state_storage_usage(&self, version: Option<Version>) -> Result<StateStorageUsage>;
+
+        fn get_event_by_version_and_index(
+            &self,
+            version: Version,
+            index: u64,
+        ) -> Result<ContractEvent>;
     ); // end delegated
 
     /// Returns the latest ledger info.
@@ -464,6 +465,13 @@ pub trait DbReader: Send + Sync {
         })
     }
 
+    /// Returns the latest committed version, error on on non-bootstrapped/empty DB.
+    /// N.b. different from `get_synced_version()`.
+    fn get_latest_ledger_info_version(&self) -> Result<Version> {
+        self.get_latest_ledger_info()
+            .map(|li| li.ledger_info().version())
+    }
+
     /// Returns the latest version and committed block timestamp
     fn get_latest_commit_metadata(&self) -> Result<(Version, u64)> {
         let ledger_info_with_sig = self.get_latest_ledger_info()?;
diff --git a/storage/storage-interface/src/state_view.rs b/storage/storage-interface/src/state_view.rs
index e69d57436e351..bf851f0fb893c 100644
--- a/storage/storage-interface/src/state_view.rs
+++ b/storage/storage-interface/src/state_view.rs
@@ -19,24 +19,29 @@ type Result<T, E = StateviewError> = std::result::Result<T, E>;
 pub struct DbStateView {
     db: Arc<dyn DbReader>,
     version: Option<Version>,
-    verify_against_state_root_hash: Option<HashValue>,
+    /// DB doesn't support returning proofs for buffered state, so only optionally verify proof.
+    /// TODO: support returning state proof for buffered state.
+    maybe_verify_against_state_root_hash: Option<HashValue>,
 }
 
 impl DbStateView {
     fn get(&self, key: &StateKey) -> Result<Option<StateValue>> {
-        Ok(if let Some(version) = self.version {
-            if let Some(root_hash) = self.verify_against_state_root_hash {
-                let (value, proof) = self
-                    .db
-                    .get_state_value_with_proof_by_version(key, version)?;
-                proof.verify(root_hash, CryptoHash::hash(key), value.as_ref())?;
-                value
-            } else {
-                self.db.get_state_value_by_version(key, version)?
+        if let Some(version) = self.version {
+            if let Some(root_hash) = self.maybe_verify_against_state_root_hash {
+                // DB doesn't support returning proofs for buffered state, so only optionally
+                // verify proof.
+                // TODO: support returning state proof for buffered state.
+                if let Ok((value, proof)) =
+                    self.db.get_state_value_with_proof_by_version(key, version)
+                {
+                    proof.verify(root_hash, CryptoHash::hash(key), value.as_ref())?;
+                    return Ok(value);
+                }
             }
+            Ok(self.db.get_state_value_by_version(key, version)?)
         } else {
-            None
-        })
+            Ok(None)
+        }
     }
 }
 
@@ -65,7 +70,7 @@ impl LatestDbStateCheckpointView for Arc<dyn DbReader> {
             version: self
                 .get_latest_state_checkpoint_version()
                 .map_err(Into::<StateviewError>::into)?,
-            verify_against_state_root_hash: None,
+            maybe_verify_against_state_root_hash: None,
         })
     }
 }
@@ -79,7 +84,7 @@ impl DbStateViewAtVersion for Arc<dyn DbReader> {
         Ok(DbStateView {
             db: self.clone(),
             version,
-            verify_against_state_root_hash: None,
+            maybe_verify_against_state_root_hash: None,
         })
     }
 }
@@ -114,13 +119,13 @@ impl VerifiedStateViewAtVersion for Arc<dyn DbReader> {
             Ok(DbStateView {
                 db,
                 version: Some(version),
-                verify_against_state_root_hash: Some(state_root_hash),
+                maybe_verify_against_state_root_hash: Some(state_root_hash),
             })
         } else {
             Ok(DbStateView {
                 db,
                 version: None,
-                verify_against_state_root_hash: None,
+                maybe_verify_against_state_root_hash: None,
             })
         }
     }
diff --git a/terraform/aptos-node-testnet/gcp/forge.tf b/terraform/aptos-node-testnet/gcp/forge.tf
index 2b77f6c915512..c70186596f199 100644
--- a/terraform/aptos-node-testnet/gcp/forge.tf
+++ b/terraform/aptos-node-testnet/gcp/forge.tf
@@ -1,6 +1,7 @@
 locals {
   forge_helm_chart_path = "${path.module}/../../helm/forge"
 }
+
 resource "helm_release" "forge" {
   count       = var.enable_forge ? 1 : 0
   name        = "forge"
@@ -25,113 +26,3 @@ resource "helm_release" "forge" {
     value = sha1(join("", [for f in fileset(local.forge_helm_chart_path, "**") : filesha1("${local.forge_helm_chart_path}/${f}")]))
   }
 }
-
-
-resource "kubernetes_secret" "grafana_credentials" {
-  metadata {
-    name      = "credentials"
-    namespace = "grafana"
-  }
-
-  # Ignore changes to the data field to prevent replacing the manually updated password
-  lifecycle {
-    ignore_changes = [
-      data,
-    ]
-  }
-
-  # Create a placeholder password. This should be set manually in each cluster
-  data = {
-    password = base64encode("placeholder")
-  }
-}
-
-resource "helm_release" "grafana_agent_flow" {
-  name       = "grafana-agent-flow"
-  repository = "https://grafana.github.io/helm-charts"
-  chart      = "grafana-agent"
-  version    = "0.37.0"
-  namespace  = "grafana"
-
-  values = [
-    yamlencode({
-      agent = {
-        mode = "flow"
-        configMap = {
-          create  = true
-          content = <<-EOT
-          remote.kubernetes.secret "credentials" {
-            namespace = "grafana"
-            name = "credentials"
-          }
-          discovery.kubernetes "local_pods" {
-            selectors {
-              field = "spec.nodeName=" + env("HOSTNAME")
-              role = "pod"
-            }
-            role = "pod"
-          }
-          discovery.relabel "specific_pods" {
-            targets = discovery.kubernetes.local_pods.targets
-            rule {
-              action = "drop"
-              regex = "Succeeded|Failed|Completed"
-              source_labels = ["__meta_kubernetes_pod_phase"]
-            }
-            rule {
-              action = "replace"
-              source_labels = ["__meta_kubernetes_namespace"]
-              target_label = "namespace"
-            }
-            rule {
-              action = "replace"
-              source_labels = ["__meta_kubernetes_pod_name"]
-              target_label = "pod"
-            }
-            rule {
-              action = "replace"
-              source_labels = ["__meta_kubernetes_pod_node_name"]
-              target_label = "node"
-            }
-            rule {
-              action = "replace"
-              source_labels = ["__meta_kubernetes_pod_container_name"]
-              target_label = "container"
-            }
-            rule {
-              action = "replace"
-              regex = "(.*)@(.*)"
-              replacement = "ebpf/$${1}/$${2}"
-              separator = "@"
-              source_labels = ["__meta_kubernetes_namespace", "__meta_kubernetes_pod_container_name"]
-              target_label = "service_name"
-            }
-          }
-          pyroscope.ebpf "instance" {
-            forward_to = [pyroscope.write.endpoint.receiver]
-            targets = discovery.relabel.specific_pods.output
-            demangle = "full"
-          }
-          pyroscope.write "endpoint" {
-            endpoint {
-              url = "https://profiles-prod-003.grafana.net"
-                basic_auth {
-                  username = "340750"
-                  password = remote.kubernetes.secret.credentials.data["password"]
-              }
-            }
-          }
-          EOT
-        }
-        securityContext = {
-          privileged = true
-          runAsGroup = 0
-          runAsUser  = 0
-        }
-      }
-      controller = {
-        hostPID = true
-      }
-    })
-  ]
-}
diff --git a/terraform/aptos-node-testnet/gcp/main.tf b/terraform/aptos-node-testnet/gcp/main.tf
index 7551f898a78e6..c15119e09b236 100644
--- a/terraform/aptos-node-testnet/gcp/main.tf
+++ b/terraform/aptos-node-testnet/gcp/main.tf
@@ -44,8 +44,10 @@ module "validator" {
   validator_name = "aptos-node"
 
   # K8s config
-  k8s_api_sources         = var.k8s_api_sources
-  cluster_ipv4_cidr_block = var.cluster_ipv4_cidr_block
+  k8s_api_sources                     = var.k8s_api_sources
+  cluster_ipv4_cidr_block             = var.cluster_ipv4_cidr_block
+  router_nat_ip_allocate_option       = var.router_nat_ip_allocate_option
+  enable_endpoint_independent_mapping = var.enable_endpoint_independent_mapping
 
   # autoscaling
   gke_enable_node_autoprovisioning     = var.gke_enable_node_autoprovisioning
diff --git a/terraform/aptos-node-testnet/gcp/variables.tf b/terraform/aptos-node-testnet/gcp/variables.tf
index b56355fae99b7..880be3978563d 100644
--- a/terraform/aptos-node-testnet/gcp/variables.tf
+++ b/terraform/aptos-node-testnet/gcp/variables.tf
@@ -271,6 +271,18 @@ variable "cluster_ipv4_cidr_block" {
   default     = ""
 }
 
+variable "router_nat_ip_allocate_option" {
+  description = "The method of NAT IP allocation for the cluster. See https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/container_cluster#router_nat_ip_allocate_option"
+  type        = string
+  default     = "MANUAL_ONLY"
+}
+
+variable "enable_endpoint_independent_mapping" {
+  description = "Enable endpoint independent mapping for the NAT router"
+  type        = bool
+  default     = true
+}
+
 variable "enable_clouddns" {
   description = "Enable CloudDNS (Google-managed cluster DNS)"
   type        = bool
diff --git a/terraform/aptos-node/aws/versions.tf b/terraform/aptos-node/aws/versions.tf
index 1403cae46c48a..d6271e6b4b65c 100644
--- a/terraform/aptos-node/aws/versions.tf
+++ b/terraform/aptos-node/aws/versions.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = "~> 1.5.6"
+  required_version = "~> 1.9.1"
   required_providers {
     aws = {
       source  = "hashicorp/aws"
diff --git a/terraform/aptos-node/azure/versions.tf b/terraform/aptos-node/azure/versions.tf
index c18e160e7df9a..b1e40cfac375b 100644
--- a/terraform/aptos-node/azure/versions.tf
+++ b/terraform/aptos-node/azure/versions.tf
@@ -1,7 +1,7 @@
 provider "azuread" {}
 
 terraform {
-  required_version = "~> 1.5.6"
+  required_version = "~> 1.9.1"
   required_providers {
     azuread = {
       source  = "hashicorp/azuread"
diff --git a/terraform/aptos-node/gcp/network.tf b/terraform/aptos-node/gcp/network.tf
index 97d92c23869f9..f7453ef0cb42a 100644
--- a/terraform/aptos-node/gcp/network.tf
+++ b/terraform/aptos-node/gcp/network.tf
@@ -26,9 +26,13 @@ resource "google_compute_address" "nat" {
 }
 
 resource "google_compute_router_nat" "nat" {
-  name                               = "aptos-${local.workspace_name}-nat"
-  router                             = google_compute_router.nat.name
-  nat_ip_allocate_option             = "MANUAL_ONLY"
-  nat_ips                            = [google_compute_address.nat.self_link]
-  source_subnetwork_ip_ranges_to_nat = "ALL_SUBNETWORKS_ALL_PRIMARY_IP_RANGES"
+  name                                = "aptos-${local.workspace_name}-nat"
+  router                              = google_compute_router.nat.name
+  nat_ip_allocate_option              = var.router_nat_ip_allocate_option
+  nat_ips                             = var.router_nat_ip_allocate_option == "MANUAL_ONLY" ? [google_compute_address.nat.self_link] : null
+  source_subnetwork_ip_ranges_to_nat  = "ALL_SUBNETWORKS_ALL_PRIMARY_IP_RANGES"
+  min_ports_per_vm                    = var.router_nat_ip_allocate_option == "MANUAL_ONLY" ? null : 32
+  enable_endpoint_independent_mapping = var.enable_endpoint_independent_mapping
+  # EndpointIndependentMapping and DynamicPortAllocation are mutually exclusive.
+  enable_dynamic_port_allocation = !var.enable_endpoint_independent_mapping
 }
diff --git a/terraform/aptos-node/gcp/variables.tf b/terraform/aptos-node/gcp/variables.tf
index 822cdda6681ec..fbea82b870eb8 100644
--- a/terraform/aptos-node/gcp/variables.tf
+++ b/terraform/aptos-node/gcp/variables.tf
@@ -263,6 +263,18 @@ variable "cluster_ipv4_cidr_block" {
   default     = ""
 }
 
+variable "router_nat_ip_allocate_option" {
+  description = "The method of NAT IP allocation for the cluster. See https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/container_cluster#router_nat_ip_allocate_option"
+  type        = string
+  default     = "MANUAL_ONLY"
+}
+
+variable "enable_endpoint_independent_mapping" {
+  description = "Enable endpoint independent mapping for the NAT router"
+  type        = bool
+  default     = true
+}
+
 variable "enable_clouddns" {
   description = "Enable CloudDNS (Google-managed cluster DNS)"
   type        = bool
diff --git a/terraform/aptos-node/gcp/versions.tf b/terraform/aptos-node/gcp/versions.tf
index b74536e8f4cc8..ba465e695febc 100644
--- a/terraform/aptos-node/gcp/versions.tf
+++ b/terraform/aptos-node/gcp/versions.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = "~> 1.5.6"
+  required_version = "~> 1.9.1"
   required_providers {
     google = {
       source  = "hashicorp/google"
diff --git a/terraform/fullnode/aws/auth.tf b/terraform/fullnode/aws/auth.tf
index 03a0dafe1ee3a..9da81cc231701 100644
--- a/terraform/fullnode/aws/auth.tf
+++ b/terraform/fullnode/aws/auth.tf
@@ -153,14 +153,8 @@ data "aws_iam_policy_document" "alb-ingress" {
   }
 }
 
-resource "aws_iam_openid_connect_provider" "cluster" {
-  client_id_list  = ["sts.amazonaws.com"]
-  thumbprint_list = ["9e99a48a9960b14926bb7f3b02e22da2b0ab7280"] # Thumbprint of Root CA for EKS OIDC, Valid until 2037
-  url             = data.aws_eks_cluster.aptos.identity[0].oidc[0].issuer
-}
-
 locals {
-  oidc_provider = replace(aws_iam_openid_connect_provider.cluster.url, "https://", "")
+  oidc_provider = module.eks.oidc_provider
 }
 
 data "aws_iam_policy_document" "k8s-aws-integrations-assume-role" {
diff --git a/terraform/fullnode/aws/backup.tf b/terraform/fullnode/aws/backup.tf
index 73c5e11649266..f2b990e8b0b12 100644
--- a/terraform/fullnode/aws/backup.tf
+++ b/terraform/fullnode/aws/backup.tf
@@ -49,9 +49,16 @@ data "aws_iam_policy_document" "backup-assume-role" {
 data "aws_iam_policy_document" "backup" {
   statement {
     actions = [
-      "s3:GetObject",
       "s3:ListBucket",
       "s3:PutObject",
+      "s3:GetObject",
+      "s3:GetObjectTagging",
+      "s3:DeleteObject",
+      "s3:DeleteObjectVersion",
+      "s3:GetObjectVersion",
+      "s3:GetObjectVersionTagging",
+      "s3:GetObjectACL",
+      "s3:PutObjectACL"
     ]
     resources = [
       "arn:aws:s3:::${aws_s3_bucket.backup.id}",
diff --git a/terraform/fullnode/aws/versions.tf b/terraform/fullnode/aws/versions.tf
index 134ae20d5c34d..0a32f7c09c53a 100644
--- a/terraform/fullnode/aws/versions.tf
+++ b/terraform/fullnode/aws/versions.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = "~> 1.5.6"
+  required_version = "~> 1.9.1"
   required_providers {
     aws = {
       source  = "hashicorp/aws"
diff --git a/terraform/fullnode/gcp/network.tf b/terraform/fullnode/gcp/network.tf
index 839e4a01474e0..0373648b950c1 100644
--- a/terraform/fullnode/gcp/network.tf
+++ b/terraform/fullnode/gcp/network.tf
@@ -26,9 +26,13 @@ resource "google_compute_address" "nat" {
 }
 
 resource "google_compute_router_nat" "nat" {
-  name                               = "aptos-${terraform.workspace}-nat"
-  router                             = google_compute_router.nat.name
-  nat_ip_allocate_option             = "MANUAL_ONLY"
-  nat_ips                            = [google_compute_address.nat.self_link]
-  source_subnetwork_ip_ranges_to_nat = "ALL_SUBNETWORKS_ALL_PRIMARY_IP_RANGES"
+  name                                = "aptos-${terraform.workspace}-nat"
+  router                              = google_compute_router.nat.name
+  nat_ip_allocate_option              = var.router_nat_ip_allocate_option
+  nat_ips                             = var.router_nat_ip_allocate_option == "MANUAL_ONLY" ? [google_compute_address.nat.self_link] : null
+  source_subnetwork_ip_ranges_to_nat  = "ALL_SUBNETWORKS_ALL_PRIMARY_IP_RANGES"
+  min_ports_per_vm                    = var.router_nat_ip_allocate_option == "MANUAL_ONLY" ? null : 32
+  enable_endpoint_independent_mapping = var.enable_endpoint_independent_mapping
+  # EndpointIndependentMapping and DynamicPortAllocation are mutually exclusive.
+  enable_dynamic_port_allocation = !var.enable_endpoint_independent_mapping
 }
diff --git a/terraform/fullnode/gcp/variables.tf b/terraform/fullnode/gcp/variables.tf
index d55669ac233a4..5954c15a7bd7c 100644
--- a/terraform/fullnode/gcp/variables.tf
+++ b/terraform/fullnode/gcp/variables.tf
@@ -180,6 +180,18 @@ variable "workspace_name_override" {
 
 ### GKE cluster config
 
+variable "router_nat_ip_allocate_option" {
+  description = "The method of NAT IP allocation for the cluster. See https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/container_cluster#router_nat_ip_allocate_option"
+  type        = string
+  default     = "MANUAL_ONLY"
+}
+
+variable "enable_endpoint_independent_mapping" {
+  description = "Enable endpoint independent mapping for the NAT router"
+  type        = bool
+  default     = false
+}
+
 variable "enable_clouddns" {
   description = "Enable CloudDNS (Google-managed cluster DNS)"
   type        = bool
diff --git a/terraform/fullnode/gcp/versions.tf b/terraform/fullnode/gcp/versions.tf
index b74536e8f4cc8..ba465e695febc 100644
--- a/terraform/fullnode/gcp/versions.tf
+++ b/terraform/fullnode/gcp/versions.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = "~> 1.5.6"
+  required_version = "~> 1.9.1"
   required_providers {
     google = {
       source  = "hashicorp/google"
diff --git a/terraform/helm/aptos-node/README.md b/terraform/helm/aptos-node/README.md
index 2a2cedd26c8fe..36fdfe0a8078f 100644
--- a/terraform/helm/aptos-node/README.md
+++ b/terraform/helm/aptos-node/README.md
@@ -32,29 +32,27 @@ Aptos blockchain node deployment
 | fullnode.storage.class | string | `nil` | Kubernetes storage class to use for fullnode persistent storage |
 | fullnode.storage.size | string | `"2048Gi"` | Size of fullnode persistent storage |
 | fullnode.tolerations | list | `[]` |  |
-| genesis_blob_upload_url | string | `"https://us-west1-aptos-forge-gcp-0.cloudfunctions.net/signed-url"` |  |
+| genesis_blob_upload_url | string | `"https://us-west1-aptos-forge-gcp-0.cloudfunctions.net/signed-url?cluster_name=unknown&era=1"` |  |
 | haproxy.affinity | object | `{}` |  |
 | haproxy.config.send_proxy_protocol | bool | `false` | Whether to send Proxy Protocol v2 |
+| haproxy.config.user | string | `"nobody"` | System user to run HA |
 | haproxy.enabled | bool | `true` | Enable HAProxy deployment in front of validator and fullnodes |
 | haproxy.image.pullPolicy | string | `"IfNotPresent"` | Image pull policy to use for HAProxy images |
 | haproxy.image.repo | string | `"haproxy"` | Image repo to use for HAProxy images |
-| haproxy.image.tag | string | `"2.2.29@sha256:8019a233a37045a27970dbc990e9ea485799200c40f658e4620b7fdf55641a3c"` | Image tag to use for HAProxy images |
-| haproxy.limits.validator.connectionsPerIPPerMin | int | `12` | Limit the number of connections per IP address per min |
-| haproxy.limits.validator.maxBytesOutRate10sec | int | `134217728` |  |
-| haproxy.limits.validator.rateLimitSession | int | `256` |  |
-| haproxy.limits.validator.tcpBufSize | int | `524288` |  |
+| haproxy.image.tag | string | `"3.0.2@sha256:3fa2e323a2f422239a39eff345b41ab20a7a91aa4ad8c3c82b9ae85dd241214b"` | Image tag to use for HAProxy images |
 | haproxy.nodeSelector | object | `{}` |  |
 | haproxy.replicas | int | `1` | Number of HAProxy replicas |
-| haproxy.resources.limits.cpu | int | `3` |  |
-| haproxy.resources.limits.memory | string | `"6Gi"` |  |
-| haproxy.resources.requests.cpu | int | `3` |  |
-| haproxy.resources.requests.memory | string | `"6Gi"` |  |
+| haproxy.resources.limits.cpu | int | `7` |  |
+| haproxy.resources.limits.memory | string | `"16Gi"` |  |
+| haproxy.resources.requests.cpu | int | `7` |  |
+| haproxy.resources.requests.memory | string | `"16Gi"` |  |
 | haproxy.tls_secret | string | `nil` | Name of the Kubernetes TLS secret to use for HAProxy |
 | haproxy.tolerations | list | `[]` |  |
 | imageTag | string | `"devnet"` | Default image tag to use for all validator and fullnode images |
 | labels | string | `nil` |  |
 | loadTestGenesis | bool | `false` | Load test-data for starting a test network |
 | manageImages | bool | `true` | If true, helm will always override the deployed image with what is configured in the helm values. If not, helm will take the latest image from the currently running workloads, which is useful if you have a separate procedure to update images (e.g. rollout) |
+| metrics.destination | string | `"dev"` | The upstream sink for metrics. Supported values are "dev" and "prod" |
 | migrations.enable_vfn_explicit_pvc | bool | `false` | See templates/fullnode.yaml |
 | multicluster | object | `{"enabled":false,"targetClusters":["forge-multiregion-1","forge-multiregion-2","forge-multiregion-3"]}` | Options for multicluster mode. This is *experimental only*. |
 | numFullnodeGroups | int | `1` | Total number of fullnode groups to deploy |
diff --git a/terraform/helm/aptos-node/files/haproxy.cfg b/terraform/helm/aptos-node/files/haproxy.cfg
index 268cc783df810..06433385fedda 100644
--- a/terraform/helm/aptos-node/files/haproxy.cfg
+++ b/terraform/helm/aptos-node/files/haproxy.cfg
@@ -1,38 +1,42 @@
+# Config manual: https://www.haproxy.com/documentation/haproxy-configuration-manual/latest/
+# Values: ./aptos-core/terraform/helm/aptos-node/values.yaml
+
+## Global settings
 global
+    # Specify the stdout log format and size
     log stdout len 10240 format raw local0
 
-    # Config manual: https://cbonte.github.io/haproxy-dconv/2.5/configuration.html
-    # magic values : terraform/helm/aptos-node/values.yaml
-
-    # 256 connections/sec * upgrade_to(30 sec)
-    maxconn 8192
-    # This limits the whole HA Proxy impacting both validators and other frontends
-    # maxconnrate 128
-    nbthread 4
+    # Limit the maximum number of connections to 500 (this is ~5x the validator set size)
+    maxconn 500
 
-    #4MB for client facing sndbuf/rcvbuf. -- 100Mb/s with 300 mili latency (e.g., us-asia)
-    tune.rcvbuf.client {{ $.Values.haproxy.limits.validator.tcpBufSize }}
+    # Limit the maximum number of connections per second to 300 (this is ~3x the validator set size)
+    maxconnrate 300
 
-    user nobody
+    # Limit user privileges
+    user {{ $.Values.haproxy.config.user }}
 
-## TCP port defaults
+## Default settings
 defaults
+    # Enable logging of events and traffic
     log global
+
+    # Set the default mode to TCP
     mode tcp
-    #option tcplog
+
+    # Don't log normal events
     option dontlog-normal
-    log-format "> %ci:%cp - %sp[%rt] [%t] %ft %Tw/%Tc/%Tt %B [%ts] %ac/%fc/%bc/%sc/%rc %sq/%bq"
-    maxconn 8192		#Validator network mesh + FN x2
-    retries 3
-    timeout queue 5s  #limits num of concurrent connections. Not clear if t/o connect is needed. #https://www.papertrail.com/solution/tips/haproxy-logging-how-to-tune-timeouts-for-performance/
-    timeout connect 5s
-    # enough for 1 successfull + 5 unsuccessfull HB(10 sec interval) + 20 sec timeout
-    timeout server 80s
-    timeout client 80s
-
-    timeout client-fin 3s #How long to hold an interrupted client connection.
-    timeout server-fin 1s
 
+    # Set timeouts for connections
+    timeout client 60s
+    timeout connect 10s
+    timeout server 60s
+    timeout queue 10s
+
+    # Prevent long-running HTTP requests
+    timeout http-request 60s
+    timeout http-keep-alive 5s
+
+## Specify the validator network frontend
 frontend fe-{{ include "aptos-validator.fullname" $ }}-validator
     bind :6180
     default_backend {{ include "aptos-validator.fullname" $ }}-validator
@@ -40,37 +44,39 @@ frontend fe-{{ include "aptos-validator.fullname" $ }}-validator
     # Deny requests from blocked IPs
     tcp-request connection silent-drop if { src -n -f /usr/local/etc/haproxy/blocked.ips }
 
-    acl ip_high_conn_rate sc0_conn_rate gt {{ $.Values.haproxy.limits.validator.connectionsPerIPPerMin }}
+    # Create TCP request bandwidth limits of 25 MB/s (per TCP stream)
+    filter bwlim-in incoming-limit default-limit 25m default-period 1s
+    filter bwlim-out outgoing-limit default-limit 25m default-period 1s
+    tcp-request content set-bandwidth-limit incoming-limit
+    tcp-request content set-bandwidth-limit outgoing-limit
 
-    stick-table type ip size 128K expire 30m store gpc1,conn_rate(1m),bytes_out_cnt	##about 500MB of memory
-    tcp-request connection track-sc0 src 						   #update table with src ip as key, store in sc0
+    # Create TCP request bandwidth limits of 50 MB/s (per source IP)
+    filter bwlim-in incoming-src-limit key src table limit-by-src limit 50m
+    filter bwlim-out outgoing-src-limit key src table limit-by-src limit 50m
+    tcp-request content set-bandwidth-limit incoming-src-limit
+    tcp-request content set-bandwidth-limit outgoing-src-limit
 
-    #We Count rate-limit manualy -- Will be more CPU intensieve but will allow whitelists to enter and up to rateLimitSession non blacklisted IPs.
-    tcp-request connection track-sc1 int(1) table CONN_RATE
-
-    #This connection is silently dropped no reason to count it for rateLimitSession
-    tcp-request connection sc-inc-gpc1(1) unless ip_high_conn_rate
-
-    # an IP is rejected due to to many unsucsessfull tcp attempts
-    #-1- Enforce connection rate limit
-    tcp-request connection silent-drop if ip_high_conn_rate
+## Specify the validator network backend
+backend {{ include "aptos-validator.fullname" $ }}-validator
+    server {{ include "aptos-validator.fullname" $ }}-{{ $.Values.i }}-validator {{ include "aptos-validator.fullname" $ }}-{{ $.Values.i }}-validator:6180
 
-    #an IP that had a sucessfull connection.
-    #-2- Allow Whitelist
-    tcp-request connection accept if { sc0_get_gpc1() ge 1 }
+    # Create TCP response bandwidth limits of 25 MB/s (per TCP stream)
+    filter bwlim-in incoming-limit default-limit 25m default-period 1s
+    filter bwlim-out outgoing-limit default-limit 25m default-period 1s
+    tcp-response content set-bandwidth-limit incoming-limit
+    tcp-response content set-bandwidth-limit outgoing-limit
 
-    #-3- Enforce RateLimit
-    tcp-request connection reject if { sc1_gpc1_rate(CONN_RATE) gt  {{ $.Values.haproxy.limits.validator.rateLimitSession }} }
+    # Create TCP response bandwidth limits of 50 MB/s (per source IP)
+    filter bwlim-in incoming-src-limit key src table limit-by-src limit 50m
+    filter bwlim-out outgoing-src-limit key src table limit-by-src limit 50m
+    tcp-response content set-bandwidth-limit incoming-src-limit
+    tcp-response content set-bandwidth-limit outgoing-src-limit
 
-    # This is a successfull connection i.e., was sent more than 16K bytes in the last 30 min
-    #tcp-request session sc-set-gpt0(0) int(...)  if { sc0_kbytes_out gt 16 }
-    #<2> Mark Whitelist
-    tcp-request session sc-inc-gpc1(0) if { sc0_kbytes_out gt 4 }
-
-backend {{ include "aptos-validator.fullname" $ }}-validator
-    default-server maxconn 8192
-    server {{ include "aptos-validator.fullname" $ }}-{{ $.Values.i }}-validator {{ include "aptos-validator.fullname" $ }}-{{ $.Values.i }}-validator:6180
+## Specify the source IP filter backend
+backend limit-by-src
+    stick-table type ip size 1m expire 300s store bytes_out_rate(1s),bytes_in_rate(1s)
 
+## Specify the VFN network frontend
 frontend fe-{{ include "aptos-validator.fullname" $ }}-validator-fn
     bind :6181
     default_backend {{ include "aptos-validator.fullname" $ }}-validator-fn
@@ -78,57 +84,11 @@ frontend fe-{{ include "aptos-validator.fullname" $ }}-validator-fn
     # Deny requests from blocked IPs
     tcp-request connection silent-drop if { src -n -f /usr/local/etc/haproxy/blocked.ips }
 
-    acl ip_high_conn_rate sc0_conn_rate gt {{ $.Values.haproxy.limits.validator.connectionsPerIPPerMin }}
-
-    stick-table type ip size 128K expire 30m store gpc1,conn_rate(1m),bytes_out_cnt	##about 500MB of memory
-    tcp-request connection track-sc0 src 						   #update table with src ip as key, store in sc0
-
-    #We Count rate-limit manualy -- Will be more CPU intensieve but will allow whitelists to enter and up to rateLimitSession non blacklisted IPs.
-    tcp-request connection track-sc1 int(1) table CONN_RATE
-
-    #This connection is silently dropped no reason to count it for rateLimitSession
-    tcp-request connection sc-inc-gpc1(1) unless ip_high_conn_rate
-
-    # an IP is rejected due to to many unsucsessfull tcp attempts
-    #-1- Enforce connection rate limit
-    tcp-request connection silent-drop if ip_high_conn_rate
-
-    #an IP that had a sucessfull connection.
-    #-2- Allow Whitelist
-    tcp-request connection accept if { sc0_get_gpc1() ge 1 }
-
-    #-3- Enforce RateLimit
-    tcp-request connection reject if { sc1_gpc1_rate(CONN_RATE) gt  {{ $.Values.haproxy.limits.validator.rateLimitSession }} }
-
-    # This is a successfull connection i.e., was sent more than 16K bytes in the last 30 min
-    #tcp-request session sc-set-gpt0(0) int(...)  if { sc0_kbytes_out gt 16 }
-    #<2> Mark Whitelist
-    tcp-request session sc-inc-gpc1(0) if { sc0_kbytes_out gt 4 }
-
+## Specify the VFN network backend
 backend {{ include "aptos-validator.fullname" $ }}-validator-fn
-    default-server maxconn 16
     server {{ include "aptos-validator.fullname" $ }}-{{ $.Values.i }}-validator {{ include "aptos-validator.fullname" $ }}-{{ $.Values.i }}-validator:6181
 
-#CONNRATE holds only entry with key 1: used for determening global conn rate
-backend CONN_RATE
-    stick-table type integer size 1 expire 10m store gpc1,gpc1_rate(1s)
-
-##################  HTTP: metrics & API
-defaults
-	retries 3
-	timeout queue 5s  #limits num of concurrent connections. Not clear if t/o connect is needed. #https://www.papertrail.com/solution/tips/haproxy-logging-how-to-tune-timeouts-for-performance/
-	timeout connect 5s
-	timeout server 60s #what makes sense? for silence between nodes?
-	timeout client 60s
-
-	timeout client-fin 3s #How long to hold an interrupted client connection.
-	timeout server-fin 1s
-
-	timeout http-request 60s #len of http request
-	timeout http-keep-alive 2s
-
-	rate-limit sessions 128
-
+## Specify the validator metrics frontend
 frontend validator-metrics
     mode http
     option httplog
@@ -137,13 +97,16 @@ frontend validator-metrics
 
     # Deny requests from blocked IPs
     tcp-request connection reject if { src -n -f /usr/local/etc/haproxy/blocked.ips }
+
+    ## Add the forwarded header
     http-request add-header Forwarded "for=%ci"
 
+## Specify the validator metrics backend
 backend validator-metrics
     mode http
-    default-server maxconn 16
     server {{ include "aptos-validator.fullname" $ }}-{{ $.Values.i }}-validator {{ include "aptos-validator.fullname" $ }}-{{ $.Values.i }}-validator:9101
 
+## Specify the validator admin frontend
 frontend validator-admin
     mode http
     option httplog
@@ -152,15 +115,17 @@ frontend validator-admin
 
     # Deny requests from blocked IPs
     tcp-request connection reject if { src -n -f /usr/local/etc/haproxy/blocked.ips }
+
+    ## Add the forwarded header
     http-request add-header Forwarded "for=%ci"
 
+## Specify the validator admin backend
 backend validator-admin
     mode http
-    default-server maxconn 16
     server {{ include "aptos-validator.fullname" $ }}-{{ $.Values.i }}-validator {{ include "aptos-validator.fullname" $ }}-{{ $.Values.i }}-validator:9102
 
-# Exposes the validator's own REST API
 {{- if $.Values.service.validator.enableRestApi }}
+## Specify the validator API frontend
 frontend validator-api
     mode http
     option httplog
@@ -169,17 +134,20 @@ frontend validator-api
 
     # Deny requests from blocked IPs
     tcp-request connection reject if { src -n -f /usr/local/etc/haproxy/blocked.ips }
+
+    ## Add the forwarded header
     http-request add-header Forwarded "for=%ci"
 
+## Specify the validator API backend
 backend validator-api
     mode http
-    default-server maxconn 16
     server {{ include "aptos-validator.fullname" $ }}-{{ $.Values.i }}-validator {{ include "aptos-validator.fullname" $ }}-{{ $.Values.i }}-validator:8080
 {{- end }}
 
 {{- range $index, $config := $.Values.fullnode.groups }}
 {{- if lt $.Values.i (int $.Values.numFullnodeGroups) }}
 
+## Specify the PFN network frontend
 frontend {{ $config.name }}-aptosnet
     bind :{{ add 6182 $index }}
     default_backend {{ $config.name }}-aptosnet
@@ -187,54 +155,30 @@ frontend {{ $config.name }}-aptosnet
     # Deny requests from blocked IPs
     tcp-request connection reject if { src -n -f /usr/local/etc/haproxy/blocked.ips }
 
-    acl ip_high_conn_rate sc0_conn_rate gt {{ $.Values.haproxy.limits.validator.connectionsPerIPPerMin }}
-
-    stick-table type ip size 128K expire 30m store gpc1,conn_rate(1m),bytes_out_cnt	##about 500MB of memory
-    tcp-request connection track-sc0 src 						   #update table with src ip as key, store in sc0
-
-    #We Count rate-limit manualy -- Will be more CPU intensieve but will allow whitelists to enter and up to rateLimitSession non blacklisted IPs.
-    tcp-request connection track-sc1 int(1) table CONN_RATE
-
-    #This connection is silently dropped no reason to count it for rateLimitSession
-    tcp-request connection sc-inc-gpc1(1) unless ip_high_conn_rate
-
-    # an IP is rejected due to to many unsucsessfull tcp attempts
-    #-1- Enforce connection rate limit
-    tcp-request connection silent-drop if ip_high_conn_rate
-
-    #an IP that had a sucessfull connection.
-    #-2- Allow Whitelist
-    tcp-request connection accept if { sc0_get_gpc1() ge 1 }
-
-    #-3- Enforce RateLimit
-    tcp-request connection reject if { sc1_gpc1_rate(CONN_RATE) gt  {{ $.Values.haproxy.limits.validator.rateLimitSession }} }
-
-    # This is a successfull connection i.e., was sent more than 16K bytes in the last 30 min
-    #tcp-request session sc-set-gpt0(0) int(...)  if { sc0_kbytes_out gt 16 }
-    #<2> Mark Whitelist
-    tcp-request session sc-inc-gpc1(0) if { sc0_kbytes_out gt 4 }
-
+## Specify the PFN network backend
 backend {{ $config.name }}-aptosnet
     default-server maxconn {{ $.Values.fullnode.config.max_inbound_connections }} {{ if $.Values.haproxy.config.send_proxy_protocol }}send-proxy-v2{{ end }}
     server {{ include "aptos-validator.fullname" $ }}-{{ $.Values.i }}-{{ $config.name }} {{ include "aptos-validator.fullname" $ }}-{{ $.Values.i }}-{{ $config.name }}:6182
 
+## Specify the PFN REST API frontend
 frontend {{ $config.name }}-api
     mode http
     option httplog
     bind :{{ add 8080 $index }}
     default_backend {{ $config.name }}-api
-    # add Forwarded header, which behaves differently than X-Forwarded-For
-    # see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Forwarded
 
     # Deny requests from blocked IPs
     tcp-request connection reject if { src -n -f /usr/local/etc/haproxy/blocked.ips }
+
+    # Add the forwarded header
     http-request add-header Forwarded "for=%ci"
 
+## Specify the PFN REST API backend
 backend {{ $config.name }}-api
     mode http
-    default-server maxconn 16
     server {{ include "aptos-validator.fullname" $ }}-{{ $.Values.i }}-{{ $config.name }} {{ include "aptos-validator.fullname" $ }}-{{ $.Values.i }}-{{ $config.name }}:8080
 
+## Specify the PFN metrics frontend
 frontend {{ $config.name }}-metrics
     mode http
     option httplog
@@ -243,13 +187,16 @@ frontend {{ $config.name }}-metrics
 
     # Deny requests from blocked IPs
     tcp-request connection reject if { src -n -f /usr/local/etc/haproxy/blocked.ips }
+
+    # Add the forwarded header
     http-request add-header Forwarded "for=%ci"
 
+## Specify the PFN metrics backend
 backend {{ $config.name }}-metrics
     mode http
-    default-server maxconn 16
     server {{ include "aptos-validator.fullname" $ }}-{{ $.Values.i }}-{{ $config.name }} {{ include "aptos-validator.fullname" $ }}-{{ $.Values.i }}-{{ $config.name }}:9101
 
+## Specify the PFN admin frontend
 frontend {{ $config.name }}-admin
     mode http
     option httplog
@@ -258,20 +205,22 @@ frontend {{ $config.name }}-admin
 
     # Deny requests from blocked IPs
     tcp-request connection reject if { src -n -f /usr/local/etc/haproxy/blocked.ips }
+
+    # Add the forwarded header
     http-request add-header Forwarded "for=%ci"
 
+## Specify the PFN admin backend
 backend {{ $config.name }}-admin
     mode http
-    default-server maxconn 16
     server {{ include "aptos-validator.fullname" $ }}-{{ $.Values.i }}-{{ $config.name }} {{ include "aptos-validator.fullname" $ }}-{{ $.Values.i }}-{{ $config.name }}:9102
 
 {{- end }}
 {{- end }}
 
+## Specify the stats frontend
 frontend stats
     mode http
     bind :9101
-    option http-use-htx
     http-request use-service prometheus-exporter if { path /metrics }
     stats enable
     stats uri /stats
diff --git a/terraform/helm/aptos-node/templates/fullnode.yaml b/terraform/helm/aptos-node/templates/fullnode.yaml
index e942f6d3555a2..e3cf7572e4864 100644
--- a/terraform/helm/aptos-node/templates/fullnode.yaml
+++ b/terraform/helm/aptos-node/templates/fullnode.yaml
@@ -96,20 +96,25 @@ spec:
         {{- include "aptos-validator.selectorLabels" $ | nindent 8 }}
         app.kubernetes.io/name: fullnode
         app.kubernetes.io/instance: fullnode-{{$i}}
+        {{- if $.Values.chain.name }}
+        chain_name: {{ $.Values.chain.name }}
+        {{- end}}
         group: {{ .name }}
       annotations:
         checksum/fullnode.yaml: {{ tpl ($.Files.Get "files/configs/fullnode.yaml") $ | sha256sum }}
         prometheus.io/scrape: "true"
         prometheus.io/port: "9101"
+        {{- if $.Values.metrics.destination }}
+        aptos.dev/metrics-destination: {{ $.Values.metrics.destination }}
+        {{- end}}
     spec:
-      terminationGracePeriodSeconds: 0
       securityContext:
         seccompProfile:
           type: RuntimeDefault
       initContainers:
         - name: run-script
           image: curlimages/curl:latest
-          command:
+          args:
             - sh
             - -c
             - |
@@ -138,7 +143,7 @@ spec:
         image: {{ $.Values.validator.image.repo }}:{{ $.Values.validator.image.tag | default $.Values.imageTag }}
         {{- end }}
         imagePullPolicy: {{ $.Values.validator.image.pullPolicy }}
-        command:
+        args:
           - /bin/bash
           - -c
           - |-
@@ -149,7 +154,7 @@ spec:
               # Delete the command file so we only wipe the DB once
               rm -vf /opt/aptos/data/wipe-db
             fi
-            /usr/local/bin/aptos-node -f /opt/aptos/etc/fullnode.yaml
+            exec /usr/local/bin/aptos-node -f /opt/aptos/etc/fullnode.yaml
       {{- with $.Values.fullnode }}
         resources:
           {{- toYaml .resources | nindent 10 }}
diff --git a/terraform/helm/aptos-node/templates/haproxy.yaml b/terraform/helm/aptos-node/templates/haproxy.yaml
index 24f5ec8ebd32d..8a8e0b06c6e4b 100644
--- a/terraform/helm/aptos-node/templates/haproxy.yaml
+++ b/terraform/helm/aptos-node/templates/haproxy.yaml
@@ -10,7 +10,7 @@ metadata:
   labels:
     {{- include "aptos-validator.labels" $ | nindent 4 }}
 data:
-  haproxy.cfg: |-
+  haproxy.cfg: |
 {{ (tpl ($.Files.Get "files/haproxy.cfg") $) | indent 4 }}
   blocked.ips: ""
 
@@ -144,6 +144,9 @@ spec:
         {{- include "aptos-validator.selectorLabels" $ | nindent 8 }}
         app.kubernetes.io/name: haproxy
         app.kubernetes.io/instance: haproxy-{{$i}}
+        {{- if $.Values.chain.name }}
+        chain_name: {{ $.Values.chain.name }}
+        {{- end}}
       annotations:
         checksum/haproxy.cfg: {{ tpl ($.Files.Get "files/haproxy.cfg") $ | sha256sum }}
     spec:
@@ -151,7 +154,12 @@ spec:
       containers:
       - name: haproxy
         image: {{ .image.repo }}:{{ .image.tag }}
-        command: ["sh", "-c", "ulimit -n 1048576 && exec haproxy -f /usr/local/etc/haproxy/haproxy.cfg"]
+        args:
+          - /bin/sh
+          - -c
+          - |-
+            ulimit -n 1048576
+            exec haproxy -f /usr/local/etc/haproxy/haproxy.cfg
         imagePullPolicy: {{ .image.pullPolicy }}
         resources:
           {{- toYaml .resources | nindent 10 }}
diff --git a/terraform/helm/aptos-node/templates/validator.yaml b/terraform/helm/aptos-node/templates/validator.yaml
index 866ca05affa57..65dc4f8b5c8c7 100644
--- a/terraform/helm/aptos-node/templates/validator.yaml
+++ b/terraform/helm/aptos-node/templates/validator.yaml
@@ -77,19 +77,24 @@ spec:
         {{- include "aptos-validator.selectorLabels" $ | nindent 8 }}
         app.kubernetes.io/name: validator
         app.kubernetes.io/instance: validator-{{$i}}
+        {{- if $.Values.chain.name }}
+        chain_name: {{ $.Values.chain.name }}
+        {{- end}}
       annotations:
         checksum/validator.yaml: {{ tpl ($.Files.Get "files/configs/validator.yaml") $ | sha256sum }}
         prometheus.io/scrape: "true"
         prometheus.io/port: "9101"
+        {{- if $.Values.metrics.destination }}
+        aptos.dev/metrics-destination: {{ $.Values.metrics.destination }}
+        {{- end}}
     spec:
-      terminationGracePeriodSeconds: 0
       securityContext:
         seccompProfile:
           type: RuntimeDefault
       initContainers:
         - name: run-script
           image: curlimages/curl:latest
-          command:
+          args:
             - sh
             - -c
             - |
@@ -119,7 +124,7 @@ spec:
         {{- end }}
       {{- with $.Values.validator }}
         imagePullPolicy: {{ .image.pullPolicy }}
-        command:
+        args:
           - /bin/bash
           - -c
           - |-
@@ -130,7 +135,7 @@ spec:
               # Delete the command file so we only wipe the DB once
               rm -vf /opt/aptos/data/wipe-db
             fi
-            /usr/local/bin/aptos-node -f /opt/aptos/etc/validator.yaml
+            exec /usr/local/bin/aptos-node -f /opt/aptos/etc/validator.yaml
         resources:
           {{- toYaml .resources | nindent 10 }}
         env:
diff --git a/terraform/helm/aptos-node/values.yaml b/terraform/helm/aptos-node/values.yaml
index b09390607f35a..1b5887dddb78b 100644
--- a/terraform/helm/aptos-node/values.yaml
+++ b/terraform/helm/aptos-node/values.yaml
@@ -34,31 +34,25 @@ haproxy:
     # -- Image repo to use for HAProxy images
     repo: haproxy
     # -- Image tag to use for HAProxy images
-    tag: 2.2.29@sha256:8019a233a37045a27970dbc990e9ea485799200c40f658e4620b7fdf55641a3c
+    tag: 3.0.2@sha256:3fa2e323a2f422239a39eff345b41ab20a7a91aa4ad8c3c82b9ae85dd241214b
     # -- Image pull policy to use for HAProxy images
     pullPolicy: IfNotPresent
   resources:
     limits:
-      cpu: 3
-      memory: 6Gi
+      cpu: 7
+      memory: 16Gi
     requests:
-      cpu: 3
-      memory: 6Gi
+      cpu: 7
+      memory: 16Gi
   nodeSelector: {}
   tolerations: []
   affinity: {}
-  limits:
-    validator:
-      # -- Limit the number of connections per IP address per min
-      connectionsPerIPPerMin: 12
-      # Sustained 100mb/s for 10 sec.
-      maxBytesOutRate10sec: 134217728
-      rateLimitSession: 256
-      tcpBufSize: 524288
 
   config:
     # -- Whether to send Proxy Protocol v2
     send_proxy_protocol: &send_proxy_protocol false
+    # -- System user to run HA
+    user: nobody
   # -- Name of the Kubernetes TLS secret to use for HAProxy
   tls_secret:
 
@@ -178,6 +172,10 @@ serviceAccount:
   # -- The name of the service account to use. If not set and create is true, a name is generated using the fullname template
   name:
 
+metrics:
+  # -- The upstream sink for metrics. Supported values are "dev" and "prod"
+  destination: dev
+
 # -- Load test-data for starting a test network
 loadTestGenesis: false
 
diff --git a/terraform/helm/fullnode/files/backup/gcs.yaml b/terraform/helm/fullnode/files/backup/gcs.yaml
index 561a00384c64a..ddb5c93278ddf 100644
--- a/terraform/helm/fullnode/files/backup/gcs.yaml
+++ b/terraform/helm/fullnode/files/backup/gcs.yaml
@@ -5,12 +5,27 @@ commands:
     FILE_HANDLE="$BACKUP_HANDLE/$FILE_NAME"
     echo "$FILE_HANDLE"
     exec 1>&-  # close stdout
-    gzip -c | gsutil -q cp - "gs://$BUCKET/$SUB_DIR/$FILE_HANDLE" > /dev/null
-  open_for_read: 'gsutil -q cp "gs://$BUCKET/$SUB_DIR/$FILE_HANDLE" - | gzip -cd'
-  save_metadata_line: | 
+    gzip -c | gcloud storage cp - "gs://$BUCKET/$SUB_DIR/$FILE_HANDLE" > /dev/null
+  open_for_read: |
+    TEMP=$(mktemp)
+    trap "rm -f $TEMP" EXIT
+    for try in {0..4}
+    do
+        if [ $try -gt 0 ]; then
+            SLEEP=$((10 * $try))
+            echo "sleeping for $SLEEP seconds before retry #$try" >&2
+          sleep $SLEEP
+        fi
+      gcloud storage cp "gs://$BUCKET/$SUB_DIR/$FILE_HANDLE" $TEMP 1>&2 || continue
+      cat $TEMP | gzip -cd
+      exit
+    done
+    echo "Failed after 5 tries" >&2
+    exit 1
+  save_metadata_line: |
     FILE_HANDLE="metadata/$FILE_NAME"
     echo "$FILE_HANDLE"
     exec 1>&-
-    gzip -c | gsutil -q cp - "gs://$BUCKET/$SUB_DIR/$FILE_HANDLE" > /dev/null
-  list_metadata_files: '(gsutil -q ls gs://$BUCKET/$SUB_DIR/metadata/ ||:) | sed -ne "s#gs://.*/metadata/#metadata/#p"'
-  backup_metadata_file: 'gsutil mv gs://$BUCKET/$SUB_DIR/metadata/$FILE_NAME gs://$BUCKET/$SUB_DIR/metadata_backup/$FILE_NAME'
+    gzip -c | gcloud storage cp - "gs://$BUCKET/$SUB_DIR/$FILE_HANDLE" > /dev/null
+  list_metadata_files: '(gcloud storage ls gs://$BUCKET/$SUB_DIR/metadata/ ||:) | sed -ne "s#gs://.*/metadata/#metadata/#p"'
+  backup_metadata_file: "gcloud storage mv gs://$BUCKET/$SUB_DIR/metadata/$FILE_NAME gs://$BUCKET/$SUB_DIR/metadata_backup/$FILE_NAME"
diff --git a/terraform/helm/fullnode/templates/backup-compaction.yaml b/terraform/helm/fullnode/templates/backup-compaction.yaml
index 3bbc177035b00..466191d66681c 100644
--- a/terraform/helm/fullnode/templates/backup-compaction.yaml
+++ b/terraform/helm/fullnode/templates/backup-compaction.yaml
@@ -1,3 +1,4 @@
+{{- if $.Values.backup.enable }}
 {{ $backup_compaction_cronjob := lookup "batch/v1" "CronJob" $.Release.Namespace (print (include "backup.fullname" .) "-backup-compaction")}}
 apiVersion: batch/v1
 kind: CronJob
@@ -8,7 +9,6 @@ metadata:
     app.kubernetes.io/name: backup-compaction
 spec:
   concurrencyPolicy: Replace
-  suspend: {{ not .Values.backup.enable }}
   schedule: {{ .Values.backup_compaction.schedule | quote }}
   jobTemplate:
     spec:
@@ -17,9 +17,15 @@ spec:
           labels:
             {{- include "backup.selectorLabels" . | nindent 12 }}
             app.kubernetes.io/name: backup-compaction
+            {{- if or $.Values.chain.label $.Values.chain.name }}
+            chain_name: {{ $.Values.chain.label | default $.Values.chain.name }}
+            {{- end}}
+          annotations:
+            {{- if $.Values.metrics.destination }}
+            aptos.dev/metrics-destination: {{ $.Values.metrics.destination }}
+            {{- end}}
         spec:
           restartPolicy: Never
-          terminationGracePeriodSeconds: 0
           containers:
           - name: backup-compaction
             {{- if and $backup_compaction_cronjob (not $.Values.manageImages) }} # if the statefulset already exists and we do not want helm to simply overwrite the image, use the existing image
@@ -103,3 +109,4 @@ spec:
           imagePullSecrets:
           - name: {{.Values.imagePullSecret}}
           {{- end }}
+{{- end }} # if $.Values.backup.enable
diff --git a/terraform/helm/fullnode/templates/backup-verify.yaml b/terraform/helm/fullnode/templates/backup-verify.yaml
index a4834aefa78b9..deaf64b7650db 100644
--- a/terraform/helm/fullnode/templates/backup-verify.yaml
+++ b/terraform/helm/fullnode/templates/backup-verify.yaml
@@ -1,3 +1,4 @@
+{{- if $.Values.backup.enable }}
 {{ $backup_verify_cronjob := lookup "batch/v1" "CronJob" $.Release.Namespace (print (include "backup.fullname" .) "-backup-verify")}}
 apiVersion: batch/v1
 kind: CronJob
@@ -8,7 +9,6 @@ metadata:
     app.kubernetes.io/name: backup-verify
 spec:
   concurrencyPolicy: Replace
-  suspend: {{ not .Values.backup.enable }}
   schedule: {{ .Values.backup_verify.schedule | quote }}
   jobTemplate:
     spec:
@@ -17,9 +17,15 @@ spec:
           labels:
             {{- include "backup.selectorLabels" . | nindent 12 }}
             app.kubernetes.io/name: backup-verify
+            {{- if or $.Values.chain.label $.Values.chain.name }}
+            chain_name: {{ $.Values.chain.label | default $.Values.chain.name }}
+            {{- end}}
+          annotations:
+            {{- if $.Values.metrics.destination }}
+            aptos.dev/metrics-destination: {{ $.Values.metrics.destination }}
+            {{- end}}
         spec:
           restartPolicy: Never
-          terminationGracePeriodSeconds: 0
           containers:
           - name: backup-verify
             {{- if and $backup_verify_cronjob (not $.Values.manageImages) }} # if the statefulset already exists and we do not want helm to simply overwrite the image, use the existing image
@@ -101,3 +107,4 @@ spec:
           imagePullSecrets:
           - name: {{.Values.imagePullSecret}}
           {{- end }}
+{{- end }} # if $.Values.backup.enable
diff --git a/terraform/helm/fullnode/templates/backup.yaml b/terraform/helm/fullnode/templates/backup.yaml
index 627193cefbd0b..4911c4fa18922 100644
--- a/terraform/helm/fullnode/templates/backup.yaml
+++ b/terraform/helm/fullnode/templates/backup.yaml
@@ -1,3 +1,4 @@
+{{- if $.Values.backup.enable }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -18,7 +19,7 @@ metadata:
     app.kubernetes.io/name: backup
 spec:
   serviceName: {{ include "backup.fullname" . }}-backup
-  replicas: {{ int .Values.backup.enable }}
+  replicas: 1
   podManagementPolicy: Parallel
   selector:
     matchLabels:
@@ -29,8 +30,14 @@ spec:
       labels:
         {{- include "backup.selectorLabels" . | nindent 8 }}
         app.kubernetes.io/name: backup
+        {{- if or $.Values.chain.label $.Values.chain.name }}
+        chain_name: {{ $.Values.chain.label | default $.Values.chain.name }}
+        {{- end}}
+      annotations:
+        {{- if $.Values.metrics.destination }}
+        aptos.dev/metrics-destination: {{ $.Values.metrics.destination }}
+        {{- end}}
     spec:
-      terminationGracePeriodSeconds: 0
       containers:
       - name: backup
         {{- if and $backup_statefulset (not $.Values.manageImages) }} # if the statefulset already exists and we do not want helm to simply overwrite the image, use the existing image
@@ -113,3 +120,4 @@ spec:
       imagePullSecrets:
       - name: {{.Values.imagePullSecret}}
       {{- end }}
+{{- end }} # if $.Values.backup.enable
diff --git a/terraform/helm/fullnode/templates/fullnode.yaml b/terraform/helm/fullnode/templates/fullnode.yaml
index 895a3f640d06b..9e64950cff58f 100644
--- a/terraform/helm/fullnode/templates/fullnode.yaml
+++ b/terraform/helm/fullnode/templates/fullnode.yaml
@@ -19,11 +19,16 @@ spec:
       labels:
         {{- include "aptos-fullnode.selectorLabels" . | nindent 8 }}
         app.kubernetes.io/name: fullnode
+        {{- if or $.Values.chain.label $.Values.chain.name }}
+        chain_name: {{ $.Values.chain.label | default $.Values.chain.name }}
+        {{- end}}
       annotations:
         prometheus.io/scrape: "true"
         prometheus.io/port: "9101"
+        {{- if $.Values.metrics.destination }}
+        aptos.dev/metrics-destination: {{ $.Values.metrics.destination }}
+        {{- end}}
     spec:
-      terminationGracePeriodSeconds: 0
       initContainers:
       {{- with .Values.restore }}
       {{- if .enabled }}
@@ -32,7 +37,7 @@ spec:
         imagePullPolicy: {{ .image.pullPolicy }}
         resources:
           {{- toYaml .resources | nindent 10 }}
-        command:
+        args:
         - /bin/bash
         - -c
         - |-
@@ -106,7 +111,7 @@ spec:
         image: {{ .Values.image.repo }}:{{ .Values.image.tag | default $.Values.imageTag }}
         {{- end }}
         imagePullPolicy: {{ .Values.image.pullPolicy }}
-        command:
+        args:
         - /bin/bash
         - -c
         - |-
@@ -123,7 +128,7 @@ spec:
           curl -o /opt/aptos/genesis/genesis.blob {{ (get .Values.aptos_chains .Values.chain.name).genesis_blob_url }}
           {{- end }}
           # Start the node
-          /usr/local/bin/aptos-node -f /opt/aptos/etc/fullnode.yaml
+          exec /usr/local/bin/aptos-node -f /opt/aptos/etc/fullnode.yaml
         resources:
           {{- toYaml .Values.resources | nindent 10 }}
         env:
@@ -155,15 +160,33 @@ spec:
         - containerPort: 9102
           name: admin
         # NOTE: these require the API to be enabled, which is not always the case
-        livenessProbe: # restart the pod if the REST API is ever unresponsive
+        # Wait for up to 20 * 15 = 300 seconds before starting the liveness and readiness probes.
+        startupProbe:
           httpGet:
             path: /v1/-/healthy
             port: 8080
-          initialDelaySeconds: 30
-        readinessProbe: # pod is ready when state sync is caught up
+          timeoutSeconds: 5
+          failureThreshold: 20
+          periodSeconds: 15
+        # Restart the pod if the REST API is ever unresponsive for 60 seconds.
+        livenessProbe:
+          httpGet:
+            path: /v1/-/healthy
+            port: 8080
+          timeoutSeconds: 5
+          periodSeconds: 15
+          successThreshold: 1
+          failureThreshold: 4
+         # Pod is ready when state sync is caught up.
+         # If it falls more than 10 seconds behind, remove it from the service.
+        readinessProbe:
           httpGet:
             path: /v1/-/healthy?duration_secs=10
             port: 8080
+          timeoutSeconds: 5
+          periodSeconds: 3
+          successThreshold: 1
+          failureThreshold: 3
         securityContext:
           readOnlyRootFilesystem: true
           allowPrivilegeEscalation: false
diff --git a/terraform/helm/fullnode/values.yaml b/terraform/helm/fullnode/values.yaml
index 86f0f487f1d7e..c50b6425b9fd7 100644
--- a/terraform/helm/fullnode/values.yaml
+++ b/terraform/helm/fullnode/values.yaml
@@ -9,6 +9,8 @@ chain:
   era: 1
   # -- Name of the testnet to connect to. There must be a corresponding entry in .Values.aptos_chains
   name: devnet
+  # -- The value of the `chain_name` label. If empty, defaults to `.Values.chain.name`
+  label:
   # -- Kubernetes Configmap from which to load the genesis.blob and waypoint.txt
   genesisConfigmap:
   # -- Kubernetes Secret from which to load the genesis.blob and waypoint.txt
@@ -20,7 +22,7 @@ aptos_chains:
     waypoint_txt_url: https://devnet.aptoslabs.com/waypoint.txt
     genesis_blob_url: https://devnet.aptoslabs.com/genesis.blob
   testnet:
-    waypoint_txt_url: https://raw.githubusercontent.com/aptos-labs/aptos-networks/main/testnet/waypoint.txt
+    waypoint_txt_url: https://raw.githubusercontent.com/aptos-labs/aptos-networks/main/testnet/genesis_waypoint.txt
     genesis_blob_url: https://raw.githubusercontent.com/aptos-labs/aptos-networks/main/testnet/genesis.blob
   mainnet:
     waypoint_txt_url: https://raw.githubusercontent.com/aptos-labs/aptos-networks/main/mainnet/waypoint.txt
@@ -101,6 +103,10 @@ logging:
   # -- Address for remote logging
   address:
 
+metrics:
+  # -- The upstream sink for metrics. Supported values are "dev" and "prod"
+  destination: dev
+
 backup:
   image:
     # -- Image repo to use for backup images
@@ -133,7 +139,7 @@ backup:
       container:
       sas:
     # -- State snapshot interval epochs
-    state_snapshot_interval_epochs: 1
+    state_snapshot_interval_epochs: 2
     # -- Transaction batch size
     transaction_batch_size: 1000000
 
diff --git a/terraform/helm/pfn-addons/README.md b/terraform/helm/pfn-addons/README.md
index 146c6a07a96bf..c669ca4b7aa63 100644
--- a/terraform/helm/pfn-addons/README.md
+++ b/terraform/helm/pfn-addons/README.md
@@ -16,6 +16,7 @@ Additional components for a public fullnode fleet deployment
 | ingress.gce_managed_certificate | string | `nil` |  |
 | ingress.gce_managed_certificate_domains | string | `nil` |  |
 | ingress.gce_security_policy | string | `nil` | Security policy to apply to the backend services behind the ingress |
+| ingress.health_check_duration_secs | string | `nil` | The maximum number of seconds that a PFN is allowed to be behind to be considered healthy and be allowed to serve traffic |
 | ingress.loadBalancerSourceRanges | string | `nil` |  |
 | ingress.wafAclArn | string | `nil` |  |
 | load_test.affinity | object | `{}` |  |
diff --git a/terraform/helm/pfn-addons/templates/service.yaml b/terraform/helm/pfn-addons/templates/service.yaml
index 4f555ad9f4706..c4f6e7f4f984e 100644
--- a/terraform/helm/pfn-addons/templates/service.yaml
+++ b/terraform/helm/pfn-addons/templates/service.yaml
@@ -6,8 +6,12 @@ metadata:
     {{- include "pfn-addons.labels" . | nindent 4 }}
   annotations:
     {{- if eq .Values.ingress.class "alb" }}
+    {{- if .Values.ingress.health_check_duration_secs }}
+    alb.ingress.kubernetes.io/healthcheck-path: /v1/-/healthy?duration_secs={{ .Values.ingress.health_check_duration_secs }}
+    {{- else }}
     alb.ingress.kubernetes.io/healthcheck-path: /v1/-/healthy
     {{- end }}
+    {{- end }}
     {{- if eq .Values.ingress.class "gce" }}
     {{- if .Values.ingress.backend_http2 }}
     cloud.google.com/app-protocols: '{"default": "HTTP2"}'
@@ -35,13 +39,19 @@ spec:
   securityPolicy:
     name: {{ .Values.ingress.gce_security_policy }}
   {{- end }}
+  connectionDraining:
+    drainingTimeoutSec: 30
   healthCheck:
-    checkIntervalSec: 30
+    checkIntervalSec: 15
     timeoutSec: 5
     healthyThreshold: 1
     unhealthyThreshold: 2
     type: HTTP
+    {{- if .Values.ingress.health_check_duration_secs }}
+    requestPath: /v1/-/healthy?duration_secs={{ .Values.ingress.health_check_duration_secs }}
+    {{- else }}
     requestPath: /v1/-/healthy
+    {{- end }}
     # container targetPort
     port: 8080
   {{- if .Values.ingress.enableStickyness }}
diff --git a/terraform/helm/pfn-addons/values.yaml b/terraform/helm/pfn-addons/values.yaml
index 7aa23fe82899d..3c5cdf5cb1cdc 100644
--- a/terraform/helm/pfn-addons/values.yaml
+++ b/terraform/helm/pfn-addons/values.yaml
@@ -29,6 +29,9 @@ ingress:
   gce_security_policy:
   # -- Enable HTTP/2 on the backends shards
   backend_http2: false
+  # -- The maximum number of seconds that a PFN is allowed to be behind
+  # to be considered healthy and be allowed to serve traffic
+  health_check_duration_secs:
 
 load_test:
   # -- Whether to enable the load test CronJob
diff --git a/terraform/helm/vector-log-agent/example-values/humio-sink.yaml b/terraform/helm/vector-log-agent/example-values/humio-sink.yaml
deleted file mode 100644
index f8b120dc28c0b..0000000000000
--- a/terraform/helm/vector-log-agent/example-values/humio-sink.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-# This provides a values example for a humio sink with some recommended settings.
-# For docs on availabe config options check https://vector.dev/docs/reference/configuration/sinks/humio_logs/ .
-# The TLDR is:
-# most defaults are fine as baseline config.
-# - set compression: gzip. Typically this will save you 90-95% in Network Egress at the cost of some (negligible amount) of CPU to handle the compression.
-# - set rate_limit_num: 100 or something higher than the default. The default is `10` which is a bit too conservative and can easily lead backpressure for high-volume sources.
-loggingSinks:
-  humio:
-    type: humio_logs
-    inputs:
-      - final_logs
-    endpoint: "https://cloud.us.humio.com"
-    token: "${HUMIO_TOKEN:?err}"
-    compression: gzip
-    encoding:
-      codec: json
-    request:
-      rate_limit_num: 100
-
-secretVars:
-  humio-credentials:
-    HUMIO_TOKEN: "<enter_humio_ingest_token_here" # or set via --set-string secretVars.humio-credentials.HUMIO_TOKEN=<humio-ingest_token>
diff --git a/terraform/helm/vector-log-agent/files/vector-config.yaml b/terraform/helm/vector-log-agent/files/vector-config.yaml
index a7374a4ed994d..a361265c515dd 100644
--- a/terraform/helm/vector-log-agent/files/vector-config.yaml
+++ b/terraform/helm/vector-log-agent/files/vector-config.yaml
@@ -18,6 +18,7 @@ sources:
 
   internal_metrics:
     type: internal_metrics
+    scrape_interval_secs: 60
 
 transforms:
   # applying workaround from https://github.com/vectordotdev/vector/issues/11821#issuecomment-1068041226 to reduce internal metrics cardinality
diff --git a/terraform/helm/vector-log-agent/files/vector-transforms.yaml b/terraform/helm/vector-log-agent/files/vector-transforms.yaml
index 69b42e84934f9..943e800b44f39 100644
--- a/terraform/helm/vector-log-agent/files/vector-transforms.yaml
+++ b/terraform/helm/vector-log-agent/files/vector-transforms.yaml
@@ -11,31 +11,31 @@ transforms:
 
       del(.k8s.namespace_labels)
 
-      del(.k8s.node_labels."beta.kubernetes.io/instance-type")
-      del(.k8s.node_labels."beta.kubernetes.io/arch")
-      del(.k8s.node_labels."beta.kubernetes.io/os")
-      del(.k8s.node_labels."eks.amazonaws.com/capacityType")
-      del(.k8s.node_labels."eks.amazonaws.com/nodegroup-image")
-      del(.k8s.node_labels."eks.amazonaws.com/sourceLaunchTemplateId")
-      del(.k8s.node_labels."eks.amazonaws.com/sourceLaunchTemplateVersion")
-      del(.k8s.node_labels."failure-domain.beta.kubernetes.io/region")
-      del(.k8s.node_labels."failure-domain.beta.kubernetes.io/zone")
-      del(.k8s.node_labels."topology.ebs.csi.aws.com/zone")
-      del(.k8s.node_labels."kubernetes.io/arch")
-      del(.k8s.node_labels."kubernetes.io/os")
-      del(.k8s.node_labels."kubernetes.io/hostname")
-      del(.k8s.node_labels."topology.kubernetes.io/region")
-      del(.k8s.node_labels."topology.kubernetes.io/zone")
-      del(.k8s.node_labels."k8s.io/cloud-provider-aws")
-      del(.k8s.node_labels."eks.amazonaws.com/nodegroup")
+      node_labels = del(.k8s.node_labels)
+      .k8s.node_labels."node.kubernetes.io/instance-type" = node_labels."node.kubernetes.io/instance-type"
+      .k8s.node_labels."topology.gke.io/zone" = node_labels."topology.gke.io/zone"
+
       del(.k8s.labels."statefulset.kubernetes.io/pod-name")
+      del(.k8s.labels."pod-template-generation")
+      del(.k8s.labels."addonmanager.kubernetes.io/mode")
+      del(.k8s.container_image_id)
       del(.k8s.pod_owner)
       del(.k8s.labels."forge-image-tag")
       del(.k8s.labels."controller-uid")
 
-      del(.k8s.annotations."kubectl.kubernetes.io/last-applied-configuration")
-      del(.k8s.annotations."seccomp.security.alpha.kubernetes.io/pod")
-      del(.k8s.annotations."checksum/validator.yaml")
+      # del(.k8s.annotations."kubectl.kubernetes.io/last-applied-configuration")
+      # del(.k8s.annotations."seccomp.security.alpha.kubernetes.io/pod")
+      # del(.k8s.annotations."checksum/validator.yaml")
+      # del(.k8s.annotations."config-hash")
+      # del(.k8s.annotations."tls-secret-hash")
+      # del(.k8s.annotations."prometheus.io/port")
+      # del(.k8s.annotations."prometheus.io/scrape")
+
+      # if is_object(.k8s.annotations) && is_empty(object!(.k8s.annotations)) {
+      #   del(.k8s.annotations)
+      # }
+
+      del(.k8s.annotations)
 
       del(.k8s.labels."app.kubernetes.io/managed-by")
       del(.k8s.labels."app.kubernetes.io/part-of")
@@ -51,7 +51,7 @@ transforms:
       del(.hostname)
       del(.file)
 
-  final_logs:
+  normalized_logs:
     type: remap
     inputs:
       - k8s_logs
@@ -68,6 +68,10 @@ transforms:
           }
         }
       }
+      if exists(.fields) {
+        . = merge!(., .fields)
+        del(.fields)
+      }
       if exists(.level) && is_string(.level) {
         .level = downcase!(.level);
       }
@@ -78,3 +82,65 @@ transforms:
       if err == null {
         .timestamp = parsed_timestamp
       }
+
+  # this last stage drops all forge node logs from aptos-nodes 5 (0-indexed) and above unless they are of level error
+  filter_forge_logs:
+    type: filter
+    inputs:
+      - normalized_logs
+    condition: |
+      aptos_node_index = to_int(parse_regex(.k8s.pod_name, r'^aptos-node-(?P<node_index>\d+)-.*').node_index ?? 0) ?? 0
+
+      should_be_excluded = contains(to_string!(.k8s.cluster), "forge") && exists(.k8s.labels."forge-namespace") && aptos_node_index >= 5 && includes(["warn","info","debug","trace"], .level)
+
+      !should_be_excluded
+
+  final_logs:
+    type: filter
+    inputs:
+      - filter_forge_logs
+    # temporarily filter out noisy logs in vector until https://github.com/aptos-labs/aptos-core/pull/13965 lands in mainnet release
+    # temporarily filter out noisy logs from https://aptos-org.slack.com/archives/C06TH3DH7SB/p1721328005384169?thread_ts=1720695143.603089&cid=C06TH3DH7SB until lands in mainnet release
+    condition: |
+      if is_string(.message) {
+        message = to_string!(.message)
+        if .level == "debug" && ( .message == "ReceiveProactiveRandShare" || .message == "ReceiveRandShareFastPath" ) {
+          return false
+        }
+        if starts_with(message, "ReceiveVote") || starts_with(message, "OrderVote:") || starts_with(message, "Receive commit vote BlockInfo") {
+          return false
+        }
+      }
+      true
+
+  uptrace_logs:
+    type: remap
+    inputs:
+      - final_logs
+    source: |
+      . = flatten(., ".") # in order for fields to become individual, filterable top-level fields in uptrace we need to flatten nested objects into top-level keys.
+      .service_name = .k8s.labels.app
+      .repo = "gcp"
+
+  datadog_logs:
+    type: remap
+    inputs:
+      - final_logs
+    source: |
+      .ddsource = "k8s"
+      if is_string(.k8s.labels.app) {
+        .service = .k8s.labels.app
+      }
+      .ddtags, _ = "kube_cluster_name:" + .k8s.cluster + ",kube_namespace:" + .k8s.namespace + ",pod_name:" + .k8s.pod_name
+
+  signoz_logs:
+    type: remap
+    inputs:
+      - final_logs
+    source: |
+      .severity_text = del(.level)
+      .source_type = "k8s"
+      tmp = { "k8s": del(.k8s)}
+      resources_tmp = flatten(tmp, ".")
+      . = flatten(., ".")
+      .resources = resources_tmp
diff --git a/terraform/helm/vector-log-agent/templates/vector-daemonset.yaml b/terraform/helm/vector-log-agent/templates/vector-daemonset.yaml
index 183e0f2de9964..28bcd23ef9491 100644
--- a/terraform/helm/vector-log-agent/templates/vector-daemonset.yaml
+++ b/terraform/helm/vector-log-agent/templates/vector-daemonset.yaml
@@ -171,7 +171,6 @@ spec:
             - name: sysfs
               mountPath: "/host/sys"
               readOnly: true
-      terminationGracePeriodSeconds: 60
       volumes:
         - name: config
           projected:
diff --git a/terraform/helm/vector-log-agent/testing/test-transforms.sh b/terraform/helm/vector-log-agent/testing/test-transforms.sh
index 5ef50e3cb7a8e..0adcea832da23 100755
--- a/terraform/helm/vector-log-agent/testing/test-transforms.sh
+++ b/terraform/helm/vector-log-agent/testing/test-transforms.sh
@@ -3,7 +3,8 @@
 set -e
 
 export VECTOR_SELF_POD_NAME=my-vector-agent
-export K8S_CLUSTER=mycluster
+export K8S_CLUSTER=forge-0
 
 cat ./testing/test1.json | jq -c -M | vector --quiet --config ./files/vector-transforms.yaml --config ./testing/vector-test-config.yaml | jq
 cat ./testing/test2.json | jq -c -M | vector --quiet --config ./files/vector-transforms.yaml --config ./testing/vector-test-config.yaml | jq
+cat ./testing/test3.json | jq -c -M | vector --quiet --config ./files/vector-transforms.yaml --config ./testing/vector-test-config.yaml | jq
diff --git a/terraform/helm/vector-log-agent/testing/test3.json b/terraform/helm/vector-log-agent/testing/test3.json
new file mode 100644
index 0000000000000..0561d0c36894f
--- /dev/null
+++ b/terraform/helm/vector-log-agent/testing/test3.json
@@ -0,0 +1,26 @@
+{
+  "@timestamp.nanos": 163018,
+  "kubernetes": {
+    "annotations": {},
+    "cluster": "forge-0",
+    "container_image": "12355.dkr.ecr.asia-central-2.amazonaws.com/aptos/validator:fd60a8b334afa0eecae0824f6671ae763ca57664",
+    "container_name": "validator",
+    "labels": {
+      "app.kubernetes.io/instance": "validator-21",
+      "app.kubernetes.io/name": "validator",
+      "statefulset.kubernetes.io/pod-name": "aptos-node-21-validator-0",
+      "forge-namespace": "forge-main"
+    },
+    "namespace": "forge-main",
+    "node_labels": {
+      "eks.amazonaws.com/nodegroup": "validators",
+      "node.kubernetes.io/instance-type": "c5.4xlarge",
+      "topology.kubernetes.io/zone": "asia-central-2a"
+    },
+    "pod_ip": "192.168.127.54",
+    "pod_name": "aptos-node-21-validator-0",
+    "pod_owner": "StatefulSet/aptos-node-21-validator"
+  },
+  "message": "{\"level\":\"INFO\",\"source\":{\"package\":\"consensus\",\"file\":\"consensus/src/round_manager.rs:794\"},\"thread_name\":\"consensus\",\"hostname\":\"aptos-node-21-validator-0\",\"namespace\":\"forge-main\",\"timestamp\":\"2022-07-25T03:20:50.815984Z\",\"data\":{\"committed_round\":17,\"error\":\"from peer E2D5A0F4F3A866D98F4FE3C4B0D76183BCEEB1EF62BEA6C07ECED001DF61272A\\n\\nCaused by:\\n    0: [RoundManager] Add a new vote\\n    1: Round 19 timeout, broadcast to all peers\",\"kind\":\"InternalError\",\"pending_votes\":\"PendingVotes: [LI 98c04dcc has 1 votes [EFBF2E8347A72A4A3AC12F76AAFAF9C12FB999B436B6D55E61FBD9F43C8C4C1E] LI b139e9a7 has 9 votes [350C69707DFDF4EC4C42314B935809E0985C1B78EFE91B8538737FC1AE44CCFF, 3FF63F156CF7A3966840AE820642A37CA0F3F82EF11AE93083706C221C857E68, 624765BC704C1E45E9B227F33A9F330E84CB862E3D0CFB889E49FCB3B7E3576B, 8DAFFCF6D634D36CEA43F6D2C5F8339A124DD1B7F210F74D6E1C536E0B9677A3, A32FF345DB7B6AC7899BC9B4252014C3A188E9A26568782E83E899160364E9D4, AF43ECB5172711C619C0028BF338ECA09E8718F4AE85686D618795C7DFD0FF9D, D718B4C4DECADCBC584400269EDE2C0113E2BDABECA6320309FE3086E34B89E9, E2D5A0F4F3A866D98F4FE3C4B0D76183BCEEB1EF62BEA6C07ECED001DF61272A, FD962B3D9C9B37BCAD898A8AA691AF292F33044B3FC3027787748FA10DD4DC64] 10 timeout [350C69707DFDF4EC4C42314B935809E0985C1B78EFE91B8538737FC1AE44CCFF, 3FF63F156CF7A3966840AE820642A37CA0F3F82EF11AE93083706C221C857E68, 624765BC704C1E45E9B227F33A9F330E84CB862E3D0CFB889E49FCB3B7E3576B, 8DAFFCF6D634D36CEA43F6D2C5F8339A124DD1B7F210F74D6E1C536E0B9677A3, A32FF345DB7B6AC7899BC9B4252014C3A188E9A26568782E83E899160364E9D4, AF43ECB5172711C619C0028BF338ECA09E8718F4AE85686D618795C7DFD0FF9D, D718B4C4DECADCBC584400269EDE2C0113E2BDABECA6320309FE3086E34B89E9, E2D5A0F4F3A866D98F4FE3C4B0D76183BCEEB1EF62BEA6C07ECED001DF61272A, EFBF2E8347A72A4A3AC12F76AAFAF9C12FB999B436B6D55E61FBD9F43C8C4C1E, FD962B3D9C9B37BCAD898A8AA691AF292F33044B3FC3027787748FA10DD4DC64]]\",\"round\":19,\"self_vote\":\"Vote: [vote data: VoteData: [block id: 71aaccbe, epoch: 2, round: 19, timestamp: 1658719250254586,parent_block_id: cdd6daa8, parent_block_round: 18, parent_timestamp: 1658719247019858], author: 8364ac69, is_timeout: true, LedgerInfo: [commit_info: BlockInfo: [epoch: 2, round: 18, id: cdd6daa8, executed_state_id: 41434355, version: 0, timestamp (us): 1658719247019858, next_epoch_state: None]]]\"}}",
+  "stream": "stdout"
+}
diff --git a/terraform/modules/eks/kubernetes.tf b/terraform/modules/eks/kubernetes.tf
index 5de01b8e2875f..b036b50035902 100644
--- a/terraform/modules/eks/kubernetes.tf
+++ b/terraform/modules/eks/kubernetes.tf
@@ -206,3 +206,7 @@ output "kubernetes" {
   value     = jsondecode(local_file.kubernetes.content)
   sensitive = true
 }
+
+output "oidc_provider" {
+  value = local.oidc_provider
+}
diff --git a/terraform/modules/eks/variables.tf b/terraform/modules/eks/variables.tf
index cd6ee985b67c0..2f9e39926a7e6 100644
--- a/terraform/modules/eks/variables.tf
+++ b/terraform/modules/eks/variables.tf
@@ -6,7 +6,7 @@ variable "region" {
 variable "kubernetes_version" {
   description = "Version of Kubernetes to use for EKS cluster"
   type        = string
-  default     = "1.27"
+  default     = "1.28"
 }
 
 variable "eks_cluster_name" {
diff --git a/terraform/modules/eks/versions.tf b/terraform/modules/eks/versions.tf
index db37affd89991..cf38141b242d9 100644
--- a/terraform/modules/eks/versions.tf
+++ b/terraform/modules/eks/versions.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = "~> 1.5.6"
+  required_version = "~> 1.9.1"
   required_providers {
     aws = {
       source = "hashicorp/aws"
diff --git a/testsuite/dos/README b/testsuite/dos/README
deleted file mode 100644
index 1f72e57cd0a5f..0000000000000
--- a/testsuite/dos/README
+++ /dev/null
@@ -1,45 +0,0 @@
-# DOS Testing Tools
-
-## Listner
-A target server that reports the number of connections it received per second.
-
-$ ./target/debug/listner -h
-listner 0.1.0
-TCP listner
-
-USAGE:
-    listner [OPTIONS]
-
-OPTIONS:
-    -a, --addr <ADDR>    listner ip:port
-    -h, --help           Print help information
-    -V, --version        Print version information
-
-Will reply with a "Hello world!\n" to first 8 connections each epoch i.e., second. -- Good for sanity.
-Will reply with an endless random stream of bytes to any other non zero string. -- Used for testing Whitelist
-
-## Sender
-A DOS generator, creating TCP connections to target server.
-Has three modes of operation that can be combined in a single command.
-	- BURST  creates a burst of N connections that send "Hello world!\n"
-	- Stream creates a single stream that requests CAP bytes
-	- load   creates an endless stream of TCP connections with HERTZ connections/s.
-		 0 HERTZ means as fast as you can.
-
-$ ./target/debug/sender --help
-sender 0.1.0
-TCP sender
-
-USAGE:
-    sender [OPTIONS]
-
-OPTIONS:
-    -a, --addr <ADDR>      listner ip:port
-    -b, --burst <BURST>    [default: 0]
-    -c, --cap <CAP>        [default: 0]
-    -h, --hertz <HERTZ>    [default: 128]
-        --help             Print help information
-    -l, --load
-    -s, --stream
-    -V, --version          Print version information
-
diff --git a/testsuite/dos/http_test/Cargo.toml b/testsuite/dos/http_test/Cargo.toml
deleted file mode 100644
index 59b6a59838d14..0000000000000
--- a/testsuite/dos/http_test/Cargo.toml
+++ /dev/null
@@ -1,17 +0,0 @@
-[package]
-name = "axum-test"
-description = "Axum http test"
-version = "0.1.0"
-
-# Workspace inherited keys
-authors = { workspace = true }
-edition = { workspace = true }
-homepage = { workspace = true }
-license = { workspace = true }
-publish = { workspace = true }
-repository = { workspace = true }
-rust-version = { workspace = true }
-
-[dependencies]
-axum = { workspace = true }
-tokio = { workspace = true }
diff --git a/testsuite/dos/http_test/README.md b/testsuite/dos/http_test/README.md
deleted file mode 100644
index cd097d31a0c01..0000000000000
--- a/testsuite/dos/http_test/README.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# HTTP Tester 
-creates an axum server behind an haproxy to test http configs for haproxy
-
-## Server
-1. cargo build --release
-2. cd docker
-3. docker compose up
-
-## Test
-1. curl <ip>:8180
diff --git a/testsuite/dos/http_test/docker/docker-compose.yaml b/testsuite/dos/http_test/docker/docker-compose.yaml
deleted file mode 100644
index 2b0c6c9c878cd..0000000000000
--- a/testsuite/dos/http_test/docker/docker-compose.yaml
+++ /dev/null
@@ -1,58 +0,0 @@
-# This compose file defines an Aptos Validator deployment.
-# Read the README.md files for instruction on how to install aptos-node
-
-version: "3.8"
-services:
-  haproxy:
-    image: haproxytech/haproxy-debian:2.2.29
-    networks:
-      - shared
-    volumes:
-      - type: bind
-        source: ./haproxy-fullnode.cfg
-        target: /usr/local/etc/haproxy/haproxy.cfg
-      - type: bind
-        source: ./blocked.ips
-        target: /usr/local/etc/haproxy/blocked.ips
-    expose:
-      - 6180
-      - 6181
-      - 9101
-      - 8180
-    ports:
-      - "6180:6180"
-      - "6181:6181"
-      - "8180:8180"
-      - "9101:9101"
-
-  fullnode:
-    image: debian:latest
-    networks:
-      - shared
-    volumes:
-      - type: bind
-        source: ../../../../target/release/axum-test
-        target: /usr/bin/listener
-    command: ["listener"]
-    restart: unless-stopped
-    expose:
-      - 6190
-      - 6180
-      - 6181
-      - 9101
-      - 8080
-
-networks:
-    hostnet:
-      external: true
-      name: host
-
-    shared:
-        name: "aptos-docker-compose-shared"
-        ipam:
-          config:
-            - subnet: 172.16.1.0/24
-
-volumes:
-  aptos-validator:
-    name: aptos-validator
diff --git a/testsuite/dos/http_test/docker/haproxy-fullnode.cfg b/testsuite/dos/http_test/docker/haproxy-fullnode.cfg
deleted file mode 100644
index 0ddc37789e153..0000000000000
--- a/testsuite/dos/http_test/docker/haproxy-fullnode.cfg
+++ /dev/null
@@ -1,85 +0,0 @@
-global
-    log stdout len 10240 format raw local0
-
-    # Config manual: https://cbonte.github.io/haproxy-dconv/2.5/configuration.html
-    # magic values : terraform/helm/aptos-node/values.yaml
-
-    maxconn 8192
-    # This limits the whole HA Proxy impacting both fullnodes and other frontends
-    # maxconnrate 128
-    nbthread 4
-
-    #4MB for client facing sndbuf/rcvbuf. -- 100Mb/s with 300 mili latency (e.g., us-asia)
-    tune.sndbuf.client 4194304	#tcpBufSize
-    tune.rcvbuf.client 4194304	#tcpBufSize
-
-    user nobody
-
-## TCP port defaults
-defaults
-    log global
-    mode tcp
-    #option tcplog
-    option dontlog-normal
-    log-format "%ci:%cp - %sp[%rt] [%t] %ft %Tw/%Tc/%Tt %B [%ts] %ac/%fc/%bc/%sc/%rc %sq/%bq"
-    maxconn 8192		#Validator network mesh + FN x2
-    retries 3
-    timeout queue 5s  #limits num of concurrent connections. Not clear if t/o connect is needed. #https://www.papertrail.com/solution/tips/haproxy-logging-how-to-tune-timeouts-for-performance/
-    timeout connect 5s
-    # enough for 1 successfull + 5 unsuccessfull HB(10 sec interval) + 20 sec timeout
-    timeout server 80s
-    timeout client 80s
-
-    timeout client-fin 3s #How long to hold an interrupted client connection.
-    timeout server-fin 1s
-
-frontend fullnode-fn
-    mode tcp
-    bind :6182
-    default_backend fullnode
-
-    # Deny requests from blocked IPs
-    tcp-request connection reject if { src -n -f /usr/local/etc/haproxy/blocked.ips }
-
-backend fullnode
-    default-server maxconn 128
-    server fullnode fullnode:6182
-
-##################  HTTP: metrics & API
-defaults
-        retries 3
-        timeout queue 5s  #limits num of concurrent connections. Not clear if t/o connect is needed. #https://www.papertrail.com/solution/tips/haproxy-logging-how-to-tune-timeouts-for-performance/
-        timeout connect 5s
-        timeout server 60s #what makes sense? for silence between nodes?
-        timeout client 60s
-
-        timeout client-fin 3s #How long to hold an interrupted client connection.
-        timeout server-fin 1s
-
-	timeout http-request 1s #len of http request
-	timeout http-keep-alive 2s
-
-        rate-limit sessions 256
-
-frontend fullnode-api
-    mode http
-    option httplog
-    bind :8180
-    default_backend fullnode-api
-
-    # Deny requests from blocked IPs
-    tcp-request connection reject if { src -n -f /usr/local/etc/haproxy/blocked.ips }
-
-backend fullnode-api
-    mode http
-    default-server maxconn 16
-    server fullnode fullnode:8080
-
-frontend stats
-    mode http
-    bind :9101
-    option http-use-htx
-    http-request use-service prometheus-exporter if { path /metrics }
-    stats enable
-    stats uri /stats
-    monitor-uri /healthy
diff --git a/testsuite/dos/http_test/src/main.rs b/testsuite/dos/http_test/src/main.rs
deleted file mode 100644
index 8bfbe4a943634..0000000000000
--- a/testsuite/dos/http_test/src/main.rs
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-use axum::{routing::get, Router};
-use tokio::{
-    io::{AsyncReadExt, AsyncWriteExt},
-    net::TcpListener,
-};
-
-#[tokio::main]
-async fn main() {
-    // build our application with a single route
-    let app = Router::new().route("/", get(|| async { "Hello, World!\n" }));
-
-    let stats = Router::new().route("/", get(|| async { "Hello, World!\n" }));
-
-    let h1 = tokio::spawn(async {
-        axum::Server::bind(&"0.0.0.0:80".parse().unwrap())
-            .serve(app.into_make_service())
-            .await
-            .unwrap();
-    });
-
-    let h2 = tokio::spawn(async {
-        axum::Server::bind(&"0.0.0.0:9101".parse().unwrap())
-            .serve(stats.into_make_service())
-            .await
-            .unwrap();
-    });
-
-    let h3 = tokio::spawn(async {
-        let addr = "0.0.0.0:6180";
-        let listener = TcpListener::bind(&addr).await.unwrap();
-        println!("Listening on: {}", addr);
-        let (mut socket, _) = listener.accept().await.unwrap();
-        println!("Connection from {:#?}", socket);
-        let mut buf = vec![0; 1024];
-
-        let n = socket
-            .read(&mut buf)
-            .await
-            .expect("failed to read data from socket");
-
-        if n == 0 {
-            return;
-        }
-
-        socket
-            .write_all(&buf[0..n])
-            .await
-            .expect("failed to write data to socket");
-    });
-
-    let h4 = tokio::spawn(async {
-        let addr = "0.0.0.0:6181";
-        let listener = TcpListener::bind(&addr).await.unwrap();
-        println!("Listening on: {}", addr);
-        let (mut socket, _) = listener.accept().await.unwrap();
-        println!("Connection from {:#?}", socket);
-        let mut buf = vec![0; 1024];
-
-        let n = socket
-            .read(&mut buf)
-            .await
-            .expect("failed to read data from socket");
-
-        if n == 0 {
-            return;
-        }
-
-        socket
-            .write_all(&buf[0..n])
-            .await
-            .expect("failed to write data to socket");
-        println!("cya cowboy!...");
-    });
-
-    _ = tokio::join!(h1, h2, h3, h4);
-}
diff --git a/testsuite/dos/listener/Cargo.toml b/testsuite/dos/listener/Cargo.toml
deleted file mode 100644
index d4416721ed980..0000000000000
--- a/testsuite/dos/listener/Cargo.toml
+++ /dev/null
@@ -1,18 +0,0 @@
-[package]
-name = "listener"
-description = "DDOS listener"
-version = "0.1.0"
-
-# Workspace inherited keys
-authors = { workspace = true }
-edition = { workspace = true }
-homepage = { workspace = true }
-license = { workspace = true }
-publish = { workspace = true }
-repository = { workspace = true }
-rust-version = { workspace = true }
-
-[dependencies]
-bytes = { workspace = true }
-clap = { workspace = true }
-tokio = { workspace = true }
diff --git a/testsuite/dos/listener/src/main.rs b/testsuite/dos/listener/src/main.rs
deleted file mode 100644
index 993ee97462b40..0000000000000
--- a/testsuite/dos/listener/src/main.rs
+++ /dev/null
@@ -1,114 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-use bytes::BytesMut;
-use clap::Parser;
-use std::{
-    io,
-    sync::{
-        atomic::{AtomicBool, AtomicU64, Ordering},
-        Arc,
-    },
-};
-use tokio::{io::AsyncWriteExt, net::TcpListener, time::Duration};
-
-static STOP: AtomicBool = AtomicBool::new(false);
-#[cfg(not(target_arch = "x86_64"))]
-const DEFAULT_ADDR: &str = "127.0.0.1:6142";
-#[cfg(target_arch = "x86_64")]
-const DEFAULT_ADDR: &str = "0.0.0.0:6181";
-
-/// TCP listener
-#[derive(Parser, Debug)]
-#[clap(author, version, about, long_about = None)]
-struct Args {
-    /// listener ip:port
-    #[clap(short, long, value_parser)]
-    addr: Option<String>,
-}
-
-#[tokio::main]
-async fn main() -> tokio::io::Result<()> {
-    let args = Args::parse();
-
-    let listener = {
-        if let Some(addr) = args.addr {
-            println!("listening on {addr}");
-            TcpListener::bind(addr).await?
-        } else {
-            println!("listening on: {} (default)", DEFAULT_ADDR);
-            TcpListener::bind(DEFAULT_ADDR).await?
-        }
-    };
-
-    let inner_counter = Arc::new(AtomicU64::new(0));
-    let counter = inner_counter.clone();
-
-    tokio::spawn(async move {
-        loop {
-            tokio::time::sleep(Duration::from_millis(1000)).await;
-            let conn = counter.load(Ordering::Relaxed);
-
-            if conn > 0 {
-                println!("{conn} connections in last epoch\n");
-                counter.store(0, Ordering::SeqCst);
-            }
-        }
-    });
-
-    while !STOP.load(Ordering::Relaxed) {
-        let mut buffer = BytesMut::with_capacity(4096);
-        let (mut socket, _) = listener.accept().await?;
-
-        let load = inner_counter.fetch_add(1, Ordering::Relaxed);
-
-        if load < 8 {
-            tokio::spawn(async move {
-                println!("connection from {:?} - {}", socket, load);
-
-                for _ in 0..128 {
-                    //let _ = socket.ready(Interest::READABLE).await?;
-                    match socket.try_read_buf(&mut buffer) {
-                        Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
-                            tokio::task::yield_now().await;
-                        },
-                        Err(e) => {
-                            return Err(e);
-                        },
-                        Ok(0) => break,
-                        Ok(n) => {
-                            if &buffer[..13] == b"Hello World!\n" {
-                                socket.write_all(b"Hello World!\n").await?;
-                            } else {
-                                let mut total = 0;
-                                loop {
-                                    let mut buffer = BytesMut::with_capacity(4096);
-                                    unsafe {
-                                        buffer.set_len(4096);
-                                    }
-                                    let m = socket.write_buf(&mut buffer).await?;
-                                    if m == 0 {
-                                        println!("{n} In. Sent {total} Bytes");
-                                        break;
-                                    } else {
-                                        total += m;
-                                    }
-                                }
-                            }
-                        },
-                    }
-                }
-
-                Ok::<_, tokio::io::Error>(())
-            });
-            tokio::task::yield_now().await;
-        }
-    }
-    Ok(())
-}
-
-#[test]
-fn verify_tool() {
-    use clap::CommandFactory;
-    Args::command().debug_assert()
-}
diff --git a/testsuite/dos/sender/Cargo.toml b/testsuite/dos/sender/Cargo.toml
deleted file mode 100644
index 7e043cb3ac8bf..0000000000000
--- a/testsuite/dos/sender/Cargo.toml
+++ /dev/null
@@ -1,19 +0,0 @@
-[package]
-name = "sender"
-description = "DDOS sender"
-version = "0.1.0"
-
-# Workspace inherited keys
-authors = { workspace = true }
-edition = { workspace = true }
-homepage = { workspace = true }
-license = { workspace = true }
-publish = { workspace = true }
-repository = { workspace = true }
-rust-version = { workspace = true }
-
-[dependencies]
-bytes = { workspace = true }
-clap = { workspace = true }
-event-listener = { workspace = true }
-tokio = { workspace = true }
diff --git a/testsuite/dos/sender/src/main.rs b/testsuite/dos/sender/src/main.rs
deleted file mode 100644
index ad7ff6ccd9bc3..0000000000000
--- a/testsuite/dos/sender/src/main.rs
+++ /dev/null
@@ -1,232 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-use bytes::BytesMut;
-use clap::Parser;
-use event_listener::Event;
-use std::sync::{
-    atomic::{AtomicBool, AtomicU64, Ordering},
-    Arc,
-};
-use tokio::{
-    io,
-    io::{AsyncReadExt, AsyncWriteExt},
-    net::TcpStream,
-    time::Duration,
-};
-//use quanta::Clock;
-
-static STOP: AtomicBool = AtomicBool::new(false);
-static BYTESIN: AtomicU64 = AtomicU64::new(0);
-#[cfg(not(target_arch = "x86_64"))]
-const DEFAULT_ADDR: &str = "127.0.0.1:6142";
-#[cfg(target_arch = "x86_64")]
-const DEFAULT_ADDR: &str = "10.100.62.151:6180";
-
-/// TCP sender
-#[derive(Parser, Debug)]
-#[clap(author, version, about, long_about = None)]
-struct Args {
-    /// listner ip:port
-    #[clap(short, long, value_parser)]
-    addr: Option<String>,
-
-    #[clap(short, long, value_parser, default_value_t = false)]
-    load: bool,
-
-    #[clap(short, long, value_parser, default_value_t = false)]
-    stream: bool,
-
-    #[clap(short, long, value_parser, default_value_t = 0)]
-    cap: u64,
-
-    #[clap(short, long, value_parser, default_value_t = 0)]
-    burst: u16,
-
-    #[clap(long, value_parser, default_value_t = 128.0)]
-    hertz: f64,
-}
-
-async fn stream_rx(addr: Arc<String>, cap: u64) -> io::Result<()> {
-    let mut buf = BytesMut::with_capacity(4096);
-    let mut stream = TcpStream::connect(&*addr).await?;
-    let mut total = 0;
-
-    stream.write_all(b"Gimme some Bytes World!\n").await?;
-
-    loop {
-        let n = stream.read_buf(&mut buf).await?;
-        if n == 0 {
-            println!("RX Stream out");
-            return Ok::<(), tokio::io::Error>(());
-        }
-        total += n;
-        if total >= cap as usize {
-            println!("RX Stream Done {total}/{cap}");
-            return Ok::<(), tokio::io::Error>(());
-        }
-
-        buf.clear();
-        BYTESIN.fetch_add(n as u64, Ordering::Relaxed);
-    }
-}
-
-async fn burst_target(addr: Arc<String>, burst: u16) {
-    let inner_counter = Arc::new(AtomicU64::new(1));
-    let ack_counter = Arc::new(AtomicU64::new(0));
-    let done = Arc::new(Event::new());
-    let listner = done.listen();
-
-    for i in 0..burst {
-        let counter = inner_counter.clone();
-        let ack = ack_counter.clone();
-        let daddr = addr.clone();
-        let done = done.clone();
-
-        tokio::spawn(async move {
-            let stream = TcpStream::connect(&*daddr).await;
-            if let Err(e) = stream {
-                println!("{i} : Error {e}");
-                let curr = counter.fetch_add(1, Ordering::Relaxed);
-
-                if curr == burst.into() {
-                    done.notify(1);
-                }
-                return Err(e);
-            }
-            let mut stream = stream?;
-            let mut buf = BytesMut::with_capacity(4096);
-
-            _ = stream.set_nodelay(true);
-            println!(
-                "{:?} Connected to {:?}",
-                stream.local_addr(),
-                stream.peer_addr()
-            );
-            stream.write_all(b"Hello World!\n").await?;
-            let n = stream.read_buf(&mut buf).await?;
-            let curr = counter.fetch_add(1, Ordering::Relaxed);
-
-            if n > 0 {
-                //this is ugly...
-                if n < 16 {
-                    println!(
-                        "{curr}/{}:{}: Got: {:?}",
-                        burst,
-                        ack.fetch_add(1, Ordering::Relaxed),
-                        String::from_utf8(buf[..n].to_vec()).unwrap()
-                    );
-                } else {
-                    println!(
-                        "{curr}/{}:{}: Received: {n} bytes",
-                        burst,
-                        ack.fetch_add(1, Ordering::Relaxed)
-                    );
-                }
-            } /*else {
-                  println!("{curr}/{}:{}: Silent", burst, ack.load(Ordering::Relaxed));
-              }*/
-
-            if curr == burst.into() {
-                println!("{} cya cowboy!\n", curr);
-                done.notify(1);
-            }
-
-            Ok::<_, tokio::io::Error>(())
-        });
-        tokio::task::yield_now().await;
-    }
-
-    listner.await;
-}
-
-async fn load_target(addr: Arc<String>, step: u64) {
-    let inner_counter = Arc::new(AtomicU64::new(0));
-    let inner_err_counter = Arc::new(AtomicU64::new(0));
-    let inner_conn_counter = Arc::new(AtomicU64::new(0));
-
-    let counter = inner_counter.clone();
-    let con_at = inner_conn_counter.clone();
-    let con_err = inner_err_counter.clone();
-
-    //let BYTESIN = BytesIN.clone();
-    tokio::spawn(async move {
-        loop {
-            tokio::time::sleep(Duration::from_millis(1000)).await;
-            let conn = counter.load(Ordering::Relaxed);
-            let attempt = con_at.load(Ordering::Relaxed);
-            let err = con_err.load(Ordering::Relaxed);
-
-            let rx_bytes = BYTESIN.load(Ordering::Relaxed);
-
-            println!(
-                "Approx: {attempt}/{} connections in last sec, {err} errors: BytesIN {}",
-                conn, rx_bytes,
-            );
-
-            counter.fetch_sub(conn, Ordering::SeqCst);
-            con_at.fetch_sub(attempt, Ordering::SeqCst);
-            con_err.fetch_sub(err, Ordering::SeqCst);
-            BYTESIN.fetch_sub(rx_bytes, Ordering::SeqCst);
-        }
-    });
-
-    while !STOP.load(Ordering::Relaxed) {
-        let daddr = addr.clone();
-        let con_at = inner_conn_counter.clone();
-        let con_err = inner_err_counter.clone();
-
-        if step > 0 {
-            tokio::time::sleep(Duration::from_millis(step)).await;
-        }
-        inner_counter.fetch_add(1, Ordering::Relaxed);
-        tokio::spawn(async move {
-            let stream = TcpStream::connect(&*daddr).await;
-            if let Err(_e) = stream {
-                con_err.fetch_add(1, Ordering::Relaxed);
-            } else {
-                con_at.fetch_add(1, Ordering::Relaxed);
-            }
-        });
-    }
-}
-
-#[tokio::main]
-async fn main() -> io::Result<()> {
-    let args = Args::parse();
-
-    let addr = {
-        if let Some(addr) = args.addr {
-            Arc::new(addr)
-        } else {
-            Arc::new(DEFAULT_ADDR.to_string())
-        }
-    };
-
-    let mut _stream = TcpStream::connect(&*addr.clone()).await?;
-
-    if args.burst > 0 {
-        burst_target(addr.clone(), args.burst).await;
-    }
-
-    if args.stream {
-        tokio::spawn(stream_rx(addr.clone(), args.cap));
-    }
-
-    if args.load {
-        let mut step = 0.0;
-        if args.hertz > 0.0 {
-            step = 1000.0 / args.hertz;
-        }
-
-        load_target(addr.clone(), step as u64).await;
-    }
-
-    Ok(())
-}
-
-#[test]
-fn verify_tool() {
-    use clap::CommandFactory;
-    Args::command().debug_assert()
-}
diff --git a/testsuite/forge-cli/src/main.rs b/testsuite/forge-cli/src/main.rs
index a18c3787d152b..a06be5d98246d 100644
--- a/testsuite/forge-cli/src/main.rs
+++ b/testsuite/forge-cli/src/main.rs
@@ -36,7 +36,7 @@ use aptos_testcases::{
     fullnode_reboot_stress_test::FullNodeRebootStressTest,
     generate_traffic,
     load_vs_perf_benchmark::{
-        ContinuousTraffic, LoadVsPerfBenchmark, TransactionWorkload, Workloads,
+        BackgroundTraffic, LoadVsPerfBenchmark, TransactionWorkload, Workloads,
     },
     modifiers::{CpuChaosTest, ExecutionDelayConfig, ExecutionDelayTest},
     multi_region_network_test::{
@@ -60,6 +60,7 @@ use aptos_testcases::{
     validator_reboot_stress_test::ValidatorRebootStressTest,
     CompositeNetworkTest,
 };
+use async_trait::async_trait;
 use clap::{Parser, Subcommand};
 use futures::stream::{FuturesUnordered, StreamExt};
 use once_cell::sync::Lazy;
@@ -67,6 +68,7 @@ use rand::{rngs::ThreadRng, seq::SliceRandom, Rng};
 use std::{
     env,
     num::NonZeroUsize,
+    ops::DerefMut,
     path::{Path, PathBuf},
     process,
     sync::{
@@ -261,6 +263,30 @@ static SYSTEM_12_CORES_10GB_THRESHOLD: Lazy<SystemMetricsThreshold> = Lazy::new(
     )
 });
 
+static RELIABLE_PROGRESS_THRESHOLD: Lazy<StateProgressThreshold> =
+    Lazy::new(|| StateProgressThreshold {
+        max_non_epoch_no_progress_secs: 10.0,
+        max_epoch_no_progress_secs: 10.0,
+        max_non_epoch_round_gap: 4,
+        max_epoch_round_gap: 4,
+    });
+
+static PROGRESS_THRESHOLD_20_6: Lazy<StateProgressThreshold> =
+    Lazy::new(|| StateProgressThreshold {
+        max_non_epoch_no_progress_secs: 20.0,
+        max_epoch_no_progress_secs: 20.0,
+        max_non_epoch_round_gap: 6,
+        max_epoch_round_gap: 6,
+    });
+
+static RELIABLE_REAL_ENV_PROGRESS_THRESHOLD: Lazy<StateProgressThreshold> =
+    Lazy::new(|| StateProgressThreshold {
+        max_non_epoch_no_progress_secs: 30.0,
+        max_epoch_no_progress_secs: 30.0,
+        max_non_epoch_round_gap: 10,
+        max_epoch_round_gap: 10,
+    });
+
 /// Make an easy to remember random namespace for your testnet
 fn random_namespace<R: Rng>(dictionary: Vec<String>, rng: &mut R) -> Result<String> {
     // Pick four random words
@@ -312,7 +338,7 @@ fn main() -> Result<()> {
             match test_cmd {
                 TestCommand::LocalSwarm(local_cfg) => {
                     // Loosen all criteria for local runs
-                    test_suite.get_success_criteria_mut().min_avg_tps = 400;
+                    test_suite.get_success_criteria_mut().min_avg_tps = 400.0;
                     let previous_emit_job = test_suite.get_emit_job().clone();
                     let test_suite =
                         test_suite.with_emit_job(previous_emit_job.mode(EmitJobMode::MaxLoad {
@@ -541,7 +567,6 @@ fn get_test_suite(
         "workload_mix" => workload_mix_test(),
         "account_creation" | "nft_mint" | "publishing" | "module_loading"
         | "write_new_resource" => individual_workload_tests(test_name.into()),
-        "graceful_overload" => graceful_overload(),
         // not scheduled on continuous
         "load_vs_perf_benchmark" => load_vs_perf_benchmark(),
         "workload_vs_perf_benchmark" => workload_vs_perf_benchmark(),
@@ -687,6 +712,7 @@ fn get_realistic_env_test(
         "realistic_env_max_load_large" => realistic_env_max_load_test(duration, test_cmd, 20, 10),
         "realistic_env_load_sweep" => realistic_env_load_sweep_test(),
         "realistic_env_workload_sweep" => realistic_env_workload_sweep_test(),
+        "realistic_env_fairness_workload_sweep" => realistic_env_fairness_workload_sweep(),
         "realistic_env_graceful_workload_sweep" => realistic_env_graceful_workload_sweep(),
         "realistic_env_graceful_overload" => realistic_env_graceful_overload(),
         "realistic_network_tuned_for_throughput" => realistic_network_tuned_for_throughput_test(),
@@ -795,10 +821,7 @@ fn run_consensus_only_realistic_env_max_tps() -> ForgeConfig {
             SuccessCriteria::new(10000)
                 .add_no_restarts()
                 .add_wait_for_catchup_s(240)
-                .add_chain_progress(StateProgressThreshold {
-                    max_no_progress_secs: 20.0,
-                    max_round_gap: 6,
-                }),
+                .add_chain_progress(PROGRESS_THRESHOLD_20_6.clone()),
         )
 }
 
@@ -827,8 +850,13 @@ fn optimize_for_maximum_throughput(
 ) {
     mempool_config_practically_non_expiring(&mut config.mempool);
 
-    config.consensus.max_sending_block_txns = max_txns_per_block as u64;
-    config.consensus.max_receiving_block_txns = (max_txns_per_block as f64 * 4.0 / 3.0) as u64;
+    config.consensus.max_sending_block_txns_after_filtering = max_txns_per_block as u64;
+    config.consensus.max_sending_block_txns = config
+        .consensus
+        .max_sending_block_txns
+        .max(max_txns_per_block as u64 * 3 / 2);
+    config.consensus.max_receiving_block_txns =
+        (config.consensus.max_sending_block_txns as f64 * 4.0 / 3.0) as u64;
     config.consensus.max_sending_block_bytes = 10 * 1024 * 1024;
     config.consensus.max_receiving_block_bytes = 12 * 1024 * 1024;
     config.consensus.pipeline_backpressure = vec![];
@@ -837,6 +865,10 @@ fn optimize_for_maximum_throughput(
     quorum_store_backlog_txn_limit_count(config, target_tps, vn_latency);
 
     config.consensus.quorum_store.sender_max_batch_txns = 500;
+    config
+        .consensus
+        .min_max_txns_in_block_after_filtering_from_backpressure =
+        2 * config.consensus.quorum_store.sender_max_batch_txns as u64;
     config.consensus.quorum_store.sender_max_batch_bytes = 4 * 1024 * 1024;
     config.consensus.quorum_store.sender_max_num_batches = 100;
     config.consensus.quorum_store.sender_max_total_txns = 4000;
@@ -865,10 +897,7 @@ fn twin_validator_test() -> ForgeConfig {
                 .add_no_restarts()
                 .add_wait_for_catchup_s(60)
                 .add_system_metrics_threshold(SYSTEM_12_CORES_5GB_THRESHOLD.clone())
-                .add_chain_progress(StateProgressThreshold {
-                    max_no_progress_secs: 10.0,
-                    max_round_gap: 4,
-                }),
+                .add_chain_progress(RELIABLE_PROGRESS_THRESHOLD.clone()),
         )
 }
 
@@ -1040,37 +1069,73 @@ fn realistic_env_sweep_wrap(
             SuccessCriteria::new(0)
                 .add_no_restarts()
                 .add_wait_for_catchup_s(60)
-                .add_chain_progress(StateProgressThreshold {
-                    max_no_progress_secs: 30.0,
-                    max_round_gap: 10,
-                }),
+                .add_chain_progress(RELIABLE_REAL_ENV_PROGRESS_THRESHOLD.clone()),
         )
 }
 
+fn background_emit_request() -> EmitJobRequest {
+    EmitJobRequest::default()
+        .num_accounts_mode(NumAccountsMode::TransactionsPerAccount(1))
+        .mode(EmitJobMode::ConstTps { tps: 10 })
+        .gas_price(5 * aptos_global_constants::GAS_UNIT_PRICE)
+}
+
+fn background_traffic_for_sweep(num_cases: usize) -> Option<BackgroundTraffic> {
+    Some(BackgroundTraffic {
+        traffic: background_emit_request(),
+        criteria: std::iter::repeat(9.5)
+            .take(num_cases)
+            .map(|min_tps| {
+                SuccessCriteria::new_float(min_tps)
+                    .add_max_expired_tps(0.1)
+                    .add_max_failed_submission_tps(0.0)
+            })
+            .collect(),
+    })
+}
+
+fn background_traffic_for_sweep_with_latency(criteria: &[(f32, f32)]) -> Option<BackgroundTraffic> {
+    Some(BackgroundTraffic {
+        traffic: background_emit_request(),
+        criteria: criteria
+            .iter()
+            .map(|(p50, p90)| {
+                SuccessCriteria::new_float(9.5)
+                    .add_max_expired_tps(0.1)
+                    .add_max_failed_submission_tps(0.0)
+                    .add_latency_threshold(*p50, LatencyType::P50)
+                    .add_latency_threshold(*p90, LatencyType::P90)
+            })
+            .collect(),
+    })
+}
+
 fn realistic_env_load_sweep_test() -> ForgeConfig {
     realistic_env_sweep_wrap(20, 10, LoadVsPerfBenchmark {
         test: Box::new(PerformanceBenchmark),
-        workloads: Workloads::TPS(vec![10, 100, 1000, 3000, 5000]),
+        workloads: Workloads::TPS(vec![10, 100, 1000, 3000, 5000, 7000]),
         criteria: [
-            (9, 1.5, 3., 4., 0),
-            (95, 1.5, 3., 4., 0),
-            (950, 2., 3., 4., 0),
-            (2750, 2.5, 3.5, 4.5, 0),
-            (4600, 3., 4., 6., 10), // Allow some expired transactions (high-load)
+            (9, 1.0, 1.0, 1.2, 0),
+            (95, 1.0, 1.0, 1.2, 0),
+            (950, 1.4, 1.6, 2.0, 0),
+            (2900, 2.5, 2.2, 2.5, 0),
+            (4800, 3., 4., 3.0, 0),
+            // TODO : recalibrate latencies for 7k TPS
+            (6700, 5., 10., 20., 100), // Allow some expired transactions (high-load)
         ]
         .into_iter()
         .map(
             |(min_tps, max_lat_p50, max_lat_p90, max_lat_p99, max_expired_tps)| {
                 SuccessCriteria::new(min_tps)
-                    .add_max_expired_tps(max_expired_tps)
-                    .add_max_failed_submission_tps(0)
+                    .add_max_expired_tps(max_expired_tps as f64)
+                    .add_max_failed_submission_tps(0.0)
                     .add_latency_threshold(max_lat_p50, LatencyType::P50)
                     .add_latency_threshold(max_lat_p90, LatencyType::P90)
                     .add_latency_threshold(max_lat_p99, LatencyType::P99)
             },
         )
         .collect(),
-        continuous_traffic: None,
+        background_traffic: background_traffic_for_sweep(5),
     })
 }
 
@@ -1078,45 +1143,22 @@ fn realistic_env_workload_sweep_test() -> ForgeConfig {
     realistic_env_sweep_wrap(7, 3, LoadVsPerfBenchmark {
         test: Box::new(PerformanceBenchmark),
         workloads: Workloads::TRANSACTIONS(vec![
-            TransactionWorkload {
-                transaction_type: TransactionTypeArg::CoinTransfer,
-                num_modules: 1,
-                unique_senders: false,
-                mempool_backlog: 20000,
-            },
-            TransactionWorkload {
-                transaction_type: TransactionTypeArg::NoOp,
-                num_modules: 100,
-                unique_senders: false,
-                mempool_backlog: 20000,
-            },
-            TransactionWorkload {
-                transaction_type: TransactionTypeArg::ModifyGlobalResource,
-                num_modules: 1,
-                unique_senders: true,
-                mempool_backlog: 20000,
-            },
-            TransactionWorkload {
-                transaction_type: TransactionTypeArg::TokenV2AmbassadorMint,
-                num_modules: 1,
-                unique_senders: true,
-                mempool_backlog: 30000,
-            },
-            // transactions get rejected, to fix.
-            // TransactionWorkload {
-            //     transaction_type: TransactionTypeArg::PublishPackage,
-            //     num_modules: 1,
-            //     unique_senders: true,
-            //     mempool_backlog: 1000,
-            // },
+            TransactionWorkload::new(TransactionTypeArg::CoinTransfer, 20000),
+            TransactionWorkload::new(TransactionTypeArg::NoOp, 20000).with_num_modules(100),
+            TransactionWorkload::new(TransactionTypeArg::ModifyGlobalResource, 6000)
+                .with_transactions_per_account(1),
+            TransactionWorkload::new(TransactionTypeArg::TokenV2AmbassadorMint, 20000)
+                .with_unique_senders(),
+            TransactionWorkload::new(TransactionTypeArg::PublishPackage, 200)
+                .with_transactions_per_account(1),
         ]),
         // Investigate/improve to make latency more predictable on different workloads
         criteria: [
-            (5500, 100, 0.3, 0.3, 0.8, 0.65),
-            (4500, 100, 0.3, 0.4, 1.0, 2.0),
-            (2000, 300, 0.3, 0.8, 0.8, 2.0),
-            (600, 500, 0.3, 0.3, 0.8, 2.0),
-            // (150, 0.5, 1.0, 1.5, 0.65),
+            (7000, 100, 0.3, 0.5, 0.5, 0.5),
+            (8500, 100, 0.3, 0.5, 0.5, 0.5),
+            (2000, 300, 0.3, 1.0, 0.6, 1.0),
+            (3200, 500, 0.3, 1.0, 0.7, 0.7),
+            (28, 5, 0.3, 1.0, 0.7, 1.0),
         ]
         .into_iter()
         .map(
@@ -1129,8 +1171,8 @@ fn realistic_env_workload_sweep_test() -> ForgeConfig {
                 ordered_to_commit,
             )| {
                 SuccessCriteria::new(min_tps)
-                    .add_max_expired_tps(max_expired)
-                    .add_max_failed_submission_tps(200)
+                    .add_max_expired_tps(max_expired as f64)
+                    .add_max_failed_submission_tps(200.0)
                     .add_latency_breakdown_threshold(LatencyBreakdownThreshold::new_strict(vec![
                         (LatencyBreakdownSlice::QsBatchToPos, batch_to_pos),
                         (LatencyBreakdownSlice::QsPosToProposal, pos_to_proposal),
@@ -1146,7 +1188,29 @@ fn realistic_env_workload_sweep_test() -> ForgeConfig {
             },
         )
         .collect(),
-        continuous_traffic: None,
+        background_traffic: background_traffic_for_sweep(5),
+    })
+}
+
+fn realistic_env_fairness_workload_sweep() -> ForgeConfig {
+    realistic_env_sweep_wrap(7, 3, LoadVsPerfBenchmark {
+        test: Box::new(PerformanceBenchmark),
+        workloads: Workloads::TRANSACTIONS(vec![
+            // Very high gas
+            TransactionWorkload::new(
+                TransactionTypeArg::ResourceGroupsGlobalWriteAndReadTag1KB,
+                100000,
+            ),
+            TransactionWorkload::new(TransactionTypeArg::VectorPicture30k, 20000),
+            TransactionWorkload::new(TransactionTypeArg::SmartTablePicture1MWith256Change, 4000)
+                .with_transactions_per_account(1),
+        ]),
+        criteria: Vec::new(),
+        background_traffic: background_traffic_for_sweep_with_latency(&[
+            (3.0, 8.0),
+            (3.0, 8.0),
+            (3.0, 4.0),
+        ]),
     })
 }
 
@@ -1155,114 +1219,43 @@ fn realistic_env_graceful_workload_sweep() -> ForgeConfig {
         test: Box::new(PerformanceBenchmark),
         workloads: Workloads::TRANSACTIONS(vec![
             // do account generation first, to fill up a storage a bit.
-            TransactionWorkload {
-                transaction_type: TransactionTypeArg::AccountGeneration,
-                num_modules: 1,
-                unique_senders: false,
-                mempool_backlog: 100000,
-            },
-            TransactionWorkload {
-                transaction_type: TransactionTypeArg::CoinTransfer,
-                num_modules: 1,
-                unique_senders: false,
-                mempool_backlog: 100000,
-            },
-            TransactionWorkload {
-                transaction_type: TransactionTypeArg::ModifyGlobalResource,
-                num_modules: 1,
-                unique_senders: false,
-                mempool_backlog: 50000,
-            },
-            TransactionWorkload {
-                transaction_type: TransactionTypeArg::CreateObjects10WithPayload10k,
-                num_modules: 1,
-                unique_senders: false,
-                mempool_backlog: 10000,
-            },
-            // very low gas/s
-            TransactionWorkload {
-                transaction_type: TransactionTypeArg::CreateObjectsConflict100WithPayload10k,
-                num_modules: 1,
-                unique_senders: false,
-                mempool_backlog: 2000,
-            },
-            TransactionWorkload {
-                transaction_type: TransactionTypeArg::TokenV2AmbassadorMint,
-                num_modules: 1,
-                unique_senders: false,
-                mempool_backlog: 20000,
-            },
-            TransactionWorkload {
-                transaction_type: TransactionTypeArg::VectorPicture40,
-                num_modules: 1,
-                unique_senders: false,
-                mempool_backlog: 50000,
-            },
-            TransactionWorkload {
-                transaction_type: TransactionTypeArg::VectorPictureRead40,
-                num_modules: 1,
-                unique_senders: false,
-                mempool_backlog: 50000,
-            },
-            TransactionWorkload {
-                transaction_type: TransactionTypeArg::VectorPicture30k,
-                num_modules: 1,
-                unique_senders: false,
-                mempool_backlog: 10000,
-            },
-            // very high gas/s
-            TransactionWorkload {
-                transaction_type: TransactionTypeArg::VectorPicture30k,
-                num_modules: 20,
-                unique_senders: false,
-                mempool_backlog: 10000,
-            },
-            TransactionWorkload {
-                transaction_type: TransactionTypeArg::SmartTablePicture30KWith200Change,
-                num_modules: 1,
-                unique_senders: false,
-                mempool_backlog: 2000,
-            },
-            TransactionWorkload {
-                transaction_type: TransactionTypeArg::SmartTablePicture1MWith256Change,
-                num_modules: 1,
-                unique_senders: false,
-                mempool_backlog: 2000,
-            },
-            TransactionWorkload {
-                transaction_type: TransactionTypeArg::SmartTablePicture1MWith1KChangeExceedsLimit,
-                num_modules: 1,
-                unique_senders: false,
-                mempool_backlog: 2000,
-            },
-            // publishing package - executes sequentially, but conflict_multiplier is 1
-            TransactionWorkload {
-                transaction_type: TransactionTypeArg::PublishPackage,
-                num_modules: 1,
-                unique_senders: true,
-                mempool_backlog: 20000,
-            },
-            // module loading
-            TransactionWorkload {
-                transaction_type: TransactionTypeArg::NoOp,
-                num_modules: 1000,
-                unique_senders: false,
-                mempool_backlog: 50000,
-            },
+            TransactionWorkload::new_const_tps(TransactionTypeArg::AccountGeneration, 2 * 7000),
+            // Very high gas
+            TransactionWorkload::new_const_tps(
+                TransactionTypeArg::ResourceGroupsGlobalWriteAndReadTag1KB,
+                3 * 1800,
+            ),
+            // publishing package - executes sequentially
+            TransactionWorkload::new_const_tps(TransactionTypeArg::PublishPackage, 3 * 150)
+                .with_transactions_per_account(1),
+            TransactionWorkload::new_const_tps(
+                TransactionTypeArg::SmartTablePicture1MWith256Change,
+                3 * 14,
+            ),
+            TransactionWorkload::new_const_tps(
+                TransactionTypeArg::SmartTablePicture1MWith1KChangeExceedsLimit,
+                3 * 12,
+            ),
+            TransactionWorkload::new_const_tps(TransactionTypeArg::VectorPicture30k, 3 * 150),
+            TransactionWorkload::new_const_tps(TransactionTypeArg::ModifyGlobalFlagAggV2, 3 * 3500),
         ]),
         criteria: Vec::new(),
-        continuous_traffic: Some(ContinuousTraffic {
-            traffic: EmitJobRequest::default()
-                .num_accounts_mode(NumAccountsMode::TransactionsPerAccount(1))
-                .mode(EmitJobMode::ConstTps { tps: 10 })
-                .gas_price(5 * aptos_global_constants::GAS_UNIT_PRICE),
-            criteria: Some(SuccessCriteria::new(8)),
-        }),
+        background_traffic: background_traffic_for_sweep_with_latency(&[
+            (4.0, 5.0),
+            (3.0, 4.0),
+            (2.5, 4.0),
+            (2.5, 4.0),
+            (3.0, 5.0),
+            (2.5, 4.0),
+            (3.5, 5.0),
+        ]),
     })
-    .with_genesis_helm_config_fn(Arc::new(|helm_values| {
-        // no epoch change.
-        helm_values["chain"]["epoch_duration_secs"] = (24 * 3600).into();
-    }))
+    .with_emit_job(
+        EmitJobRequest::default()
+            .txn_expiration_time_secs(20)
+            .init_gas_price_multiplier(5)
+            .init_expiration_multiplier(6.0),
+    )
 }
 
 fn load_vs_perf_benchmark() -> ForgeConfig {
@@ -1275,7 +1268,7 @@ fn load_vs_perf_benchmark() -> ForgeConfig {
                 200, 1000, 3000, 5000, 7000, 7500, 8000, 9000, 10000, 12000, 15000,
             ]),
             criteria: Vec::new(),
-            continuous_traffic: None,
+            background_traffic: None,
         })
         .with_genesis_helm_config_fn(Arc::new(|helm_values| {
             // no epoch change.
@@ -1285,10 +1278,7 @@ fn load_vs_perf_benchmark() -> ForgeConfig {
             SuccessCriteria::new(0)
                 .add_no_restarts()
                 .add_wait_for_catchup_s(60)
-                .add_chain_progress(StateProgressThreshold {
-                    max_no_progress_secs: 30.0,
-                    max_round_gap: 10,
-                }),
+                .add_chain_progress(RELIABLE_REAL_ENV_PROGRESS_THRESHOLD.clone()),
         )
 }
 
@@ -1302,57 +1292,22 @@ fn workload_vs_perf_benchmark() -> ForgeConfig {
         .add_network_test(LoadVsPerfBenchmark {
             test: Box::new(PerformanceBenchmark),
             workloads: Workloads::TRANSACTIONS(vec![
-                TransactionWorkload {
-                    transaction_type: TransactionTypeArg::NoOp,
-                    num_modules: 1,
-                    unique_senders: false,
-                    mempool_backlog: 20000,
-                },
-                TransactionWorkload {
-                    transaction_type: TransactionTypeArg::NoOp,
-                    num_modules: 1,
-                    unique_senders: true,
-                    mempool_backlog: 20000,
-                },
-                TransactionWorkload {
-                    transaction_type: TransactionTypeArg::NoOp,
-                    num_modules: 1000,
-                    unique_senders: false,
-                    mempool_backlog: 20000,
-                },
-                TransactionWorkload {
-                    transaction_type: TransactionTypeArg::CoinTransfer,
-                    num_modules: 1,
-                    unique_senders: true,
-                    mempool_backlog: 20000,
-                },
-                TransactionWorkload {
-                    transaction_type: TransactionTypeArg::CoinTransfer,
-                    num_modules: 1,
-                    unique_senders: true,
-                    mempool_backlog: 20000,
-                },
-                TransactionWorkload {
-                    transaction_type: TransactionTypeArg::AccountResource32B,
-                    num_modules: 1,
-                    unique_senders: true,
-                    mempool_backlog: 20000,
-                },
-                TransactionWorkload {
-                    transaction_type: TransactionTypeArg::AccountResource1KB,
-                    num_modules: 1,
-                    unique_senders: true,
-                    mempool_backlog: 20000,
-                },
-                TransactionWorkload {
-                    transaction_type: TransactionTypeArg::PublishPackage,
-                    num_modules: 1,
-                    unique_senders: true,
-                    mempool_backlog: 20000,
-                },
+                TransactionWorkload::new(TransactionTypeArg::NoOp, 20000),
+                TransactionWorkload::new(TransactionTypeArg::NoOp, 20000).with_unique_senders(),
+                TransactionWorkload::new(TransactionTypeArg::NoOp, 20000).with_num_modules(1000),
+                TransactionWorkload::new(TransactionTypeArg::CoinTransfer, 20000)
+                    .with_unique_senders(),
+                TransactionWorkload::new(TransactionTypeArg::CoinTransfer, 20000)
+                    .with_unique_senders(),
+                TransactionWorkload::new(TransactionTypeArg::AccountResource32B, 20000)
+                    .with_unique_senders(),
+                TransactionWorkload::new(TransactionTypeArg::AccountResource1KB, 20000)
+                    .with_unique_senders(),
+                TransactionWorkload::new(TransactionTypeArg::PublishPackage, 20000)
+                    .with_unique_senders(),
             ]),
             criteria: Vec::new(),
-            continuous_traffic: None,
+            background_traffic: None,
         })
         .with_genesis_helm_config_fn(Arc::new(|helm_values| {
             // no epoch change.
@@ -1362,58 +1317,7 @@ fn workload_vs_perf_benchmark() -> ForgeConfig {
             SuccessCriteria::new(0)
                 .add_no_restarts()
                 .add_wait_for_catchup_s(60)
-                .add_chain_progress(StateProgressThreshold {
-                    max_no_progress_secs: 30.0,
-                    max_round_gap: 10,
-                }),
-        )
-}
-
-fn graceful_overload() -> ForgeConfig {
-    ForgeConfig::default()
-        .with_initial_validator_count(NonZeroUsize::new(10).unwrap())
-        // if we have full nodes for subset of validators, TPS drops.
-        // Validators without VFN are not creating batches,
-        // as no useful transaction reach their mempool.
-        // something to potentially improve upon.
-        // So having VFNs for all validators
-        .with_initial_fullnode_count(10)
-        .add_network_test(TwoTrafficsTest {
-            inner_traffic: EmitJobRequest::default()
-                .mode(EmitJobMode::ConstTps { tps: 10000 })
-                .init_gas_price_multiplier(20),
-
-            // Additionally - we are not really gracefully handling overlaods,
-            // setting limits based on current reality, to make sure they
-            // don't regress, but something to investigate
-            inner_success_criteria: SuccessCriteria::new(3400),
-        })
-        // First start non-overload (higher gas-fee) traffic,
-        // to not cause issues with TxnEmitter setup - account creation
-        .with_emit_job(
-            EmitJobRequest::default()
-                .mode(EmitJobMode::ConstTps { tps: 1000 })
-                .gas_price(5 * aptos_global_constants::GAS_UNIT_PRICE),
-        )
-        .with_genesis_helm_config_fn(Arc::new(|helm_values| {
-            helm_values["chain"]["epoch_duration_secs"] = 300.into();
-        }))
-        .with_success_criteria(
-            SuccessCriteria::new(900)
-                .add_no_restarts()
-                .add_wait_for_catchup_s(120)
-                .add_system_metrics_threshold(SystemMetricsThreshold::new(
-                    // Check that we don't use more than 12 CPU cores for 30% of the time.
-                    MetricsThreshold::new(12.0, 40),
-                    // Check that we don't use more than 5 GB of memory for 30% of the time.
-                    MetricsThreshold::new_gb(5.0, 30),
-                ))
-                .add_latency_threshold(10.0, LatencyType::P50)
-                .add_latency_threshold(30.0, LatencyType::P90)
-                .add_chain_progress(StateProgressThreshold {
-                    max_no_progress_secs: 30.0,
-                    max_round_gap: 10,
-                }),
+                .add_chain_progress(RELIABLE_REAL_ENV_PROGRESS_THRESHOLD.clone()),
         )
 }
 
@@ -1425,10 +1329,7 @@ fn realistic_env_graceful_overload() -> ForgeConfig {
             inner_traffic: EmitJobRequest::default()
                 .mode(EmitJobMode::ConstTps { tps: 15000 })
                 .init_gas_price_multiplier(20),
-            // Additionally - we are not really gracefully handling overlaods,
-            // setting limits based on current reality, to make sure they
-            // don't regress, but something to investigate
-            inner_success_criteria: SuccessCriteria::new(3400),
+            inner_success_criteria: SuccessCriteria::new(7500),
         }))
         // First start higher gas-fee traffic, to not cause issues with TxnEmitter setup - account creation
         .with_emit_job(
@@ -1448,17 +1349,14 @@ fn realistic_env_graceful_overload() -> ForgeConfig {
                 .add_wait_for_catchup_s(180) // 3 minutes
                 .add_system_metrics_threshold(SystemMetricsThreshold::new(
                     // overload test uses more CPUs than others, so increase the limit
-                    // Check that we don't use more than 18 CPU cores for 30% of the time.
-                    MetricsThreshold::new(18.0, 40),
-                    // Check that we don't use more than 5 GB of memory for 30% of the time.
-                    MetricsThreshold::new_gb(5.0, 30),
+                    // Check that we don't use more than 24 CPU cores for 20% of the time.
+                    MetricsThreshold::new(24.0, 20),
+                    // Check that we don't use more than 7.5 GB of memory for more than 10% of the time.
+                    MetricsThreshold::new_gb(7.5, 10),
                 ))
                 .add_latency_threshold(10.0, LatencyType::P50)
                 .add_latency_threshold(30.0, LatencyType::P90)
-                .add_chain_progress(StateProgressThreshold {
-                    max_no_progress_secs: 30.0,
-                    max_round_gap: 10,
-                }),
+                .add_chain_progress(RELIABLE_REAL_ENV_PROGRESS_THRESHOLD.clone()),
         )
 }
 
@@ -1548,10 +1446,7 @@ fn workload_mix_test() -> ForgeConfig {
             SuccessCriteria::new(3000)
                 .add_no_restarts()
                 .add_wait_for_catchup_s(240)
-                .add_chain_progress(StateProgressThreshold {
-                    max_no_progress_secs: 20.0,
-                    max_round_gap: 6,
-                }),
+                .add_chain_progress(PROGRESS_THRESHOLD_20_6.clone()),
         )
 }
 
@@ -1616,10 +1511,7 @@ fn individual_workload_tests(test_name: String) -> ForgeConfig {
             })
             .add_no_restarts()
             .add_wait_for_catchup_s(240)
-            .add_chain_progress(StateProgressThreshold {
-                max_no_progress_secs: 20.0,
-                max_round_gap: 6,
-            }),
+            .add_chain_progress(PROGRESS_THRESHOLD_20_6.clone()),
         )
 }
 
@@ -1769,10 +1661,7 @@ fn three_region_simulation_with_different_node_speed() -> ForgeConfig {
             SuccessCriteria::new(1000)
                 .add_no_restarts()
                 .add_wait_for_catchup_s(240)
-                .add_chain_progress(StateProgressThreshold {
-                    max_no_progress_secs: 20.0,
-                    max_round_gap: 6,
-                }),
+                .add_chain_progress(PROGRESS_THRESHOLD_20_6.clone()),
         )
 }
 
@@ -1787,10 +1676,7 @@ fn three_region_simulation() -> ForgeConfig {
             SuccessCriteria::new(3000)
                 .add_no_restarts()
                 .add_wait_for_catchup_s(240)
-                .add_chain_progress(StateProgressThreshold {
-                    max_no_progress_secs: 20.0,
-                    max_round_gap: 6,
-                }),
+                .add_chain_progress(PROGRESS_THRESHOLD_20_6.clone()),
         )
 }
 
@@ -1925,10 +1811,7 @@ fn validators_join_and_leave() -> ForgeConfig {
                 .add_no_restarts()
                 .add_wait_for_catchup_s(240)
                 .add_system_metrics_threshold(SYSTEM_12_CORES_10GB_THRESHOLD.clone())
-                .add_chain_progress(StateProgressThreshold {
-                    max_no_progress_secs: 10.0,
-                    max_round_gap: 4,
-                }),
+                .add_chain_progress(RELIABLE_PROGRESS_THRESHOLD.clone()),
         )
 }
 
@@ -1949,25 +1832,72 @@ fn realistic_env_max_load_test(
     let duration_secs = duration.as_secs();
     let long_running = duration_secs >= 2400;
 
+    // resource override for long_running tests
+    let resource_override = if long_running {
+        NodeResourceOverride {
+            storage_gib: Some(1000), // long running tests need more storage
+            ..NodeResourceOverride::default()
+        }
+    } else {
+        NodeResourceOverride::default() // no overrides
+    };
+
+    let mut success_criteria = SuccessCriteria::new(95)
+        .add_system_metrics_threshold(SystemMetricsThreshold::new(
+            // Check that we don't use more than 18 CPU cores for 15% of the time.
+            MetricsThreshold::new(25.0, 15),
+            // Memory starts around 5GB, and grows around 1.4GB/hr in this test.
+            // Check that we don't use more than final expected memory for more than 15% of the time.
+            MetricsThreshold::new_gb(5.0 + 1.4 * (duration_secs as f64 / 3600.0), 15),
+        ))
+        .add_no_restarts()
+        .add_wait_for_catchup_s(
+            // Give at least 60s for catchup, give 10% of the run for longer durations.
+            (duration.as_secs() / 10).max(60),
+        )
+        .add_latency_threshold(3.4, LatencyType::P50)
+        .add_latency_threshold(4.5, LatencyType::P90)
+        .add_chain_progress(StateProgressThreshold {
+            max_non_epoch_no_progress_secs: 15.0,
+            max_epoch_no_progress_secs: 15.0,
+            max_non_epoch_round_gap: 4,
+            max_epoch_round_gap: 4,
+        });
+    if !ha_proxy {
+        success_criteria = success_criteria.add_latency_breakdown_threshold(
+            LatencyBreakdownThreshold::new_with_breach_pct(
+                vec![
+                    (LatencyBreakdownSlice::QsBatchToPos, 0.35),
+                    // quorum store backpressure is relaxed, so queueing happens here
+                    (LatencyBreakdownSlice::QsPosToProposal, 2.5),
+                    // can be adjusted down if less backpressure
+                    (LatencyBreakdownSlice::ConsensusProposalToOrdered, 0.85),
+                    // can be adjusted down if less backpressure
+                    (LatencyBreakdownSlice::ConsensusOrderedToCommit, 1.0),
+                ],
+                5,
+            ),
+        )
+    }
+
     // Create the test
+    let mempool_backlog = if ha_proxy { 30000 } else { 40000 };
     ForgeConfig::default()
         .with_initial_validator_count(NonZeroUsize::new(num_validators).unwrap())
         .with_initial_fullnode_count(num_fullnodes)
         .add_network_test(wrap_with_realistic_env(TwoTrafficsTest {
             inner_traffic: EmitJobRequest::default()
-                .mode(EmitJobMode::MaxLoad {
-                    mempool_backlog: 40000,
-                })
+                .mode(EmitJobMode::MaxLoad { mempool_backlog })
                 .init_gas_price_multiplier(20),
             inner_success_criteria: SuccessCriteria::new(
                 if ha_proxy {
-                    4600
+                    7000
                 } else if long_running {
                     // This is for forge stable
-                    7000
+                    11000
                 } else {
                     // During land time we want to be less strict, otherwise we flaky fail
-                    6500
+                    10000
                 },
             ),
         }))
@@ -1989,38 +1919,9 @@ fn realistic_env_max_load_test(
                 .gas_price(5 * aptos_global_constants::GAS_UNIT_PRICE)
                 .latency_polling_interval(Duration::from_millis(100)),
         )
-        .with_success_criteria(
-            SuccessCriteria::new(95)
-                .add_no_restarts()
-                .add_wait_for_catchup_s(
-                    // Give at least 60s for catchup, give 10% of the run for longer durations.
-                    (duration.as_secs() / 10).max(60),
-                )
-                .add_latency_threshold(3.4, LatencyType::P50)
-                .add_latency_threshold(4.5, LatencyType::P90)
-                .add_latency_breakdown_threshold(LatencyBreakdownThreshold::new_with_breach_pct(
-                    vec![
-                        (LatencyBreakdownSlice::QsBatchToPos, 0.35),
-                        // only reaches close to threshold during epoch change
-                        (
-                            LatencyBreakdownSlice::QsPosToProposal,
-                            if ha_proxy { 0.7 } else { 0.6 },
-                        ),
-                        // can be adjusted down if less backpressure
-                        (LatencyBreakdownSlice::ConsensusProposalToOrdered, 0.85),
-                        // can be adjusted down if less backpressure
-                        (
-                            LatencyBreakdownSlice::ConsensusOrderedToCommit,
-                            if ha_proxy { 1.3 } else { 0.75 },
-                        ),
-                    ],
-                    5,
-                ))
-                .add_chain_progress(StateProgressThreshold {
-                    max_no_progress_secs: 15.0,
-                    max_round_gap: 4,
-                }),
-        )
+        .with_success_criteria(success_criteria)
+        .with_validator_resource_override(resource_override)
+        .with_fullnode_resource_override(resource_override)
 }
 
 fn realistic_network_tuned_for_throughput_test() -> ForgeConfig {
@@ -2051,7 +1952,7 @@ fn realistic_network_tuned_for_throughput_test() -> ForgeConfig {
         }))
         .with_validator_override_node_config_fn(Arc::new(|config, _| {
             // Increase the state sync chunk sizes (consensus blocks are much larger than 1k)
-            optimize_state_sync_for_throughput(config);
+            optimize_state_sync_for_throughput(config, 15_000);
 
             optimize_for_maximum_throughput(config, TARGET_TPS, MAX_TXNS_PER_BLOCK, VN_LATENCY_S);
 
@@ -2078,11 +1979,7 @@ fn realistic_network_tuned_for_throughput_test() -> ForgeConfig {
                 }
                 OnChainExecutionConfig::V4(config_v4) => {
                     config_v4.block_gas_limit_type = BlockGasLimitType::NoLimit;
-                    config_v4.transaction_shuffler_type = TransactionShufflerType::Fairness {
-                        sender_conflict_window_size: 256,
-                        module_conflict_window_size: 2,
-                        entry_fun_conflict_window_size: 3,
-                    };
+                    config_v4.transaction_shuffler_type = TransactionShufflerType::SenderAwareV2(256);
                 }
             }
             helm_values["chain"]["on_chain_execution_config"] =
@@ -2094,7 +1991,7 @@ fn realistic_network_tuned_for_throughput_test() -> ForgeConfig {
             .with_initial_fullnode_count(VALIDATOR_COUNT)
             .with_fullnode_override_node_config_fn(Arc::new(|config, _| {
                 // Increase the state sync chunk sizes (consensus blocks are much larger than 1k)
-                optimize_state_sync_for_throughput(config);
+                optimize_state_sync_for_throughput(config, 15_000);
 
                 // Experimental storage optimizations
                 config.storage.rocksdb_configs.enable_storage_sharding = true;
@@ -2111,10 +2008,12 @@ fn realistic_network_tuned_for_throughput_test() -> ForgeConfig {
             .with_validator_resource_override(NodeResourceOverride {
                 cpu_cores: Some(58),
                 memory_gib: Some(200),
+                storage_gib: Some(500), // assuming we're using these large marchines for long-running or expensive tests which need more disk
             })
             .with_fullnode_resource_override(NodeResourceOverride {
                 cpu_cores: Some(58),
                 memory_gib: Some(200),
+                storage_gib: Some(500),
             })
             .with_success_criteria(
                 SuccessCriteria::new(25000)
@@ -2122,10 +2021,7 @@ fn realistic_network_tuned_for_throughput_test() -> ForgeConfig {
                     /* This test runs at high load, so we need more catchup time */
                     .add_wait_for_catchup_s(120),
                 /* Doesn't work without event indices
-                .add_chain_progress(StateProgressThreshold {
-                    max_no_progress_secs: 10.0,
-                    max_round_gap: 4,
-                }),
+                .add_chain_progress(RELIABLE_PROGRESS_THRESHOLD.clone()),
                  */
             );
     } else {
@@ -2135,10 +2031,7 @@ fn realistic_network_tuned_for_throughput_test() -> ForgeConfig {
                 /* This test runs at high load, so we need more catchup time */
                 .add_wait_for_catchup_s(120),
             /* Doesn't work without event indices
-                .add_chain_progress(StateProgressThreshold {
-                     max_no_progress_secs: 10.0,
-                     max_round_gap: 4,
-                 }),
+                .add_chain_progress(RELIABLE_PROGRESS_THRESHOLD.clone()),
             */
         );
     }
@@ -2146,15 +2039,16 @@ fn realistic_network_tuned_for_throughput_test() -> ForgeConfig {
     forge_config
 }
 
-/// Optimizes the state sync configs for throughput
-fn optimize_state_sync_for_throughput(node_config: &mut NodeConfig) {
-    let max_chunk_size = 15_000; // This allows state sync to match consensus block sizes
+/// Optimizes the state sync configs for throughput.
+/// `max_chunk_size` is the maximum number of transactions to include in a chunk.
+fn optimize_state_sync_for_throughput(node_config: &mut NodeConfig, max_chunk_size: u64) {
     let max_chunk_bytes = 40 * 1024 * 1024; // 10x the current limit (to prevent execution fallback)
 
     // Update the chunk sizes for the data client
     let data_client_config = &mut node_config.state_sync.aptos_data_client;
     data_client_config.max_transaction_chunk_size = max_chunk_size;
     data_client_config.max_transaction_output_chunk_size = max_chunk_size;
+
     // Update the chunk sizes for the storage service
     let storage_service_config = &mut node_config.state_sync.storage_service;
     storage_service_config.max_transaction_chunk_size = max_chunk_size;
@@ -2236,9 +2130,10 @@ pub fn changing_working_quorum_test_helper(
             } else {
                 for (i, item) in chain_health_backoff.iter_mut().enumerate() {
                     // as we have lower TPS, make limits smaller
-                    item.max_sending_block_txns_override =
+                    item.max_sending_block_txns_after_filtering_override =
                         (block_size / 2_u64.pow(i as u32 + 1)).max(2);
-                    min_block_txns = min_block_txns.min(item.max_sending_block_txns_override);
+                    min_block_txns =
+                        min_block_txns.min(item.max_sending_block_txns_after_filtering_override);
                     // as we have fewer nodes, make backoff triggered earlier:
                     item.backoff_if_below_participating_voting_power_percentage = 90 - i * 5;
                 }
@@ -2276,21 +2171,26 @@ pub fn changing_working_quorum_test_helper(
             let success_criteria = SuccessCriteria::new(min_avg_tps)
                 .add_no_restarts()
                 .add_wait_for_catchup_s(30)
-                .add_chain_progress(StateProgressThreshold {
-                    max_no_progress_secs: if max_down_nodes == 0 {
+                .add_chain_progress({
+                    let max_no_progress_secs = if max_down_nodes == 0 {
                         // very aggressive if no nodes are expected to be down
                         3.0
                     } else if max_down_nodes * 3 + 1 + 2 < num_validators {
                         // number of down nodes is at least 2 below the quorum limit, so
-                        // we can still be reasonably aggressive
+                        // we can still be reasonably aggqressive
                         15.0
                     } else {
                         // number of down nodes is close to the quorum limit, so
                         // make a check a bit looser, as state sync might be required
                         // to get the quorum back.
                         40.0
-                    },
-                    max_round_gap: 60,
+                    };
+                    StateProgressThreshold {
+                        max_non_epoch_no_progress_secs: max_no_progress_secs,
+                        max_epoch_no_progress_secs: max_no_progress_secs,
+                        max_non_epoch_round_gap: 60,
+                        max_epoch_round_gap: 60,
+                    }
                 });
 
             // If errors are allowed, overwrite the success criteria
@@ -2340,10 +2240,7 @@ fn large_db_test(
             SuccessCriteria::new(min_avg_tps)
                 .add_no_restarts()
                 .add_wait_for_catchup_s(30)
-                .add_chain_progress(StateProgressThreshold {
-                    max_no_progress_secs: 20.0,
-                    max_round_gap: 6,
-                }),
+                .add_chain_progress(PROGRESS_THRESHOLD_20_6.clone()),
         )
 }
 
@@ -2357,10 +2254,7 @@ fn quorum_store_reconfig_enable_test() -> ForgeConfig {
                 .add_no_restarts()
                 .add_wait_for_catchup_s(240)
                 .add_system_metrics_threshold(SYSTEM_12_CORES_10GB_THRESHOLD.clone())
-                .add_chain_progress(StateProgressThreshold {
-                    max_no_progress_secs: 10.0,
-                    max_round_gap: 4,
-                }),
+                .add_chain_progress(RELIABLE_PROGRESS_THRESHOLD.clone()),
         )
 }
 
@@ -2387,10 +2281,7 @@ fn mainnet_like_simulation_test() -> ForgeConfig {
             SuccessCriteria::new(10000)
                 .add_no_restarts()
                 .add_wait_for_catchup_s(240)
-                .add_chain_progress(StateProgressThreshold {
-                    max_no_progress_secs: 20.0,
-                    max_round_gap: 6,
-                }),
+                .add_chain_progress(PROGRESS_THRESHOLD_20_6.clone()),
         )
 }
 
@@ -2416,10 +2307,7 @@ fn multiregion_benchmark_test() -> ForgeConfig {
                     180,
                 )
                 .add_system_metrics_threshold(SYSTEM_12_CORES_10GB_THRESHOLD.clone())
-                .add_chain_progress(StateProgressThreshold {
-                    max_no_progress_secs: 10.0,
-                    max_round_gap: 4,
-                }),
+                .add_chain_progress(RELIABLE_PROGRESS_THRESHOLD.clone()),
         )
 }
 
@@ -2444,7 +2332,7 @@ fn pfn_const_tps(
     ForgeConfig::default()
         .with_initial_validator_count(NonZeroUsize::new(7).unwrap())
         .with_initial_fullnode_count(7)
-        .with_emit_job(EmitJobRequest::default().mode(EmitJobMode::ConstTps { tps: 100 }))
+        .with_emit_job(EmitJobRequest::default().mode(EmitJobMode::ConstTps { tps: 5000 }))
         .add_network_test(PFNPerformance::new(
             7,
             add_cpu_chaos,
@@ -2455,22 +2343,19 @@ fn pfn_const_tps(
             helm_values["chain"]["epoch_duration_secs"] = epoch_duration_secs.into();
         }))
         .with_success_criteria(
-            SuccessCriteria::new(95)
+            SuccessCriteria::new(4500)
                 .add_no_restarts()
-                .add_max_expired_tps(0)
-                .add_max_failed_submission_tps(0)
-                // Percentile thresholds are set to +1 second of non-PFN tests. Should be revisited.
-                .add_latency_threshold(2.5, LatencyType::P50)
-                .add_latency_threshold(4., LatencyType::P90)
-                .add_latency_threshold(5., LatencyType::P99)
+                .add_max_expired_tps(0.0)
+                .add_max_failed_submission_tps(0.0)
+                // Percentile thresholds are estimated and should be revisited.
+                .add_latency_threshold(3.5, LatencyType::P50)
+                .add_latency_threshold(4.5, LatencyType::P90)
+                .add_latency_threshold(5.5, LatencyType::P99)
                 .add_wait_for_catchup_s(
                     // Give at least 60s for catchup and at most 10% of the run
                     (duration.as_secs() / 10).max(60),
                 )
-                .add_chain_progress(StateProgressThreshold {
-                    max_no_progress_secs: 10.0,
-                    max_round_gap: 4,
-                }),
+                .add_chain_progress(RELIABLE_PROGRESS_THRESHOLD.clone()),
         )
 }
 
@@ -2529,10 +2414,7 @@ fn pfn_performance(
                     // Give at least 60s for catchup and at most 10% of the run
                     (duration.as_secs() / 10).max(60),
                 )
-                .add_chain_progress(StateProgressThreshold {
-                    max_no_progress_secs: 10.0,
-                    max_round_gap: 4,
-                }),
+                .add_chain_progress(RELIABLE_PROGRESS_THRESHOLD.clone()),
         )
 }
 
@@ -2659,18 +2541,19 @@ impl Test for RestartValidator {
     }
 }
 
+#[async_trait]
 impl NetworkTest for RestartValidator {
-    fn run(&self, ctx: &mut NetworkContext<'_>) -> Result<()> {
-        let runtime = Runtime::new()?;
-        runtime.block_on(async {
-            let node = ctx.swarm().validators_mut().next().unwrap();
-            node.health_check().await.expect("node health check failed");
-            node.stop().await.unwrap();
-            println!("Restarting node {}", node.peer_id());
-            node.start().await.unwrap();
-            tokio::time::sleep(Duration::from_secs(1)).await;
-            node.health_check().await.expect("node health check failed");
-        });
+    async fn run<'a>(&self, ctx: NetworkContextSynchronizer<'a>) -> Result<()> {
+        let mut ctx_locker = ctx.ctx.lock().await;
+        let ctx = ctx_locker.deref_mut();
+        let swarm = ctx.swarm.read().await;
+        let node = swarm.validators().next().unwrap();
+        node.health_check().await.expect("node health check failed");
+        node.stop().await.unwrap();
+        println!("Restarting node {}", node.peer_id());
+        node.start().await.unwrap();
+        tokio::time::sleep(Duration::from_secs(1)).await;
+        node.health_check().await.expect("node health check failed");
         Ok(())
     }
 }
@@ -2684,17 +2567,23 @@ impl Test for EmitTransaction {
     }
 }
 
+#[async_trait]
 impl NetworkTest for EmitTransaction {
-    fn run(&self, ctx: &mut NetworkContext<'_>) -> Result<()> {
+    async fn run<'a>(&self, ctx: NetworkContextSynchronizer<'a>) -> Result<()> {
+        let mut ctx_locker = ctx.ctx.lock().await;
+        let ctx = ctx_locker.deref_mut();
         let duration = Duration::from_secs(10);
         let all_validators = ctx
-            .swarm()
+            .swarm
+            .read()
+            .await
             .validators()
             .map(|v| v.peer_id())
             .collect::<Vec<_>>();
-        let stats = generate_traffic(ctx, &all_validators, duration).unwrap();
+        let stats = generate_traffic(ctx, &all_validators, duration)
+            .await
+            .unwrap();
         ctx.report.report_txn_stats(self.name().to_string(), &stats);
-
         Ok(())
     }
 }
@@ -2716,10 +2605,11 @@ impl Test for Delay {
     }
 }
 
+#[async_trait]
 impl NetworkTest for Delay {
-    fn run(&self, _ctx: &mut NetworkContext<'_>) -> Result<()> {
+    async fn run<'a>(&self, _ctx: NetworkContextSynchronizer<'a>) -> Result<()> {
         info!("forge sleep {}", self.seconds);
-        std::thread::sleep(Duration::from_secs(self.seconds));
+        tokio::time::sleep(Duration::from_secs(self.seconds)).await;
         Ok(())
     }
 }
@@ -2733,10 +2623,12 @@ impl Test for GatherMetrics {
     }
 }
 
+#[async_trait]
 impl NetworkTest for GatherMetrics {
-    fn run(&self, ctx: &mut NetworkContext<'_>) -> Result<()> {
-        let runtime = ctx.runtime.handle();
-        runtime.block_on(gather_metrics_one(ctx));
+    async fn run<'a>(&self, ctx: NetworkContextSynchronizer<'a>) -> Result<()> {
+        let mut ctx_locker = ctx.ctx.lock().await;
+        let ctx = ctx_locker.deref_mut();
+        gather_metrics_one(ctx).await;
         Ok(())
     }
 }
@@ -2748,14 +2640,17 @@ async fn gather_metrics_one(ctx: &NetworkContext<'_>) {
     let now = chrono::prelude::Utc::now()
         .format("%Y%m%d_%H%M%S")
         .to_string();
-    for val in ctx.swarm.validators() {
-        let mut url = val.inspection_service_endpoint();
-        let valname = val.peer_id().to_string();
-        url.set_path("metrics");
-        let fname = format!("{}.{}.metrics", now, valname);
-        let outpath: PathBuf = outdir.join(fname);
-        let th = handle.spawn(gather_metrics_to_file(url, outpath));
-        gets.push(th);
+    {
+        let swarm = ctx.swarm.read().await;
+        for val in swarm.validators() {
+            let mut url = val.inspection_service_endpoint();
+            let valname = val.peer_id().to_string();
+            url.set_path("metrics");
+            let fname = format!("{}.{}.metrics", now, valname);
+            let outpath: PathBuf = outdir.join(fname);
+            let th = handle.spawn(gather_metrics_to_file(url, outpath));
+            gets.push(th);
+        }
     }
     // join all the join handles
     while !gets.is_empty() {
diff --git a/testsuite/forge-cli/src/suites/dag.rs b/testsuite/forge-cli/src/suites/dag.rs
index 90252cf7f7709..f309c6403cba1 100644
--- a/testsuite/forge-cli/src/suites/dag.rs
+++ b/testsuite/forge-cli/src/suites/dag.rs
@@ -108,11 +108,7 @@ fn dag_realistic_env_max_load_test(
                 }
                 OnChainExecutionConfig::V4(config_v4) => {
                     config_v4.block_gas_limit_type = BlockGasLimitType::NoLimit;
-                    config_v4.transaction_shuffler_type = TransactionShufflerType::Fairness {
-                        sender_conflict_window_size: 256,
-                        module_conflict_window_size: 2,
-                        entry_fun_conflict_window_size: 3,
-                    };
+                    config_v4.transaction_shuffler_type = TransactionShufflerType::default_for_genesis();
                 }
             }
             helm_values["chain"]["on_chain_execution_config"] =
@@ -134,8 +130,10 @@ fn dag_realistic_env_max_load_test(
                 )
                 .add_latency_threshold(4.0, LatencyType::P50)
                 .add_chain_progress(StateProgressThreshold {
-                    max_no_progress_secs: 15.0,
-                    max_round_gap: 8,
+                    max_non_epoch_no_progress_secs: 15.0,
+                    max_epoch_no_progress_secs: 15.0,
+                    max_non_epoch_round_gap: 8,
+                    max_epoch_round_gap: 8,
                 }),
         )
 }
@@ -211,11 +209,6 @@ fn dag_reconfig_enable_test() -> ForgeConfig {
                     }
                     OnChainExecutionConfig::V4(config_v4) => {
                         config_v4.block_gas_limit_type = BlockGasLimitType::NoLimit;
-                        config_v4.transaction_shuffler_type = TransactionShufflerType::Fairness {
-                            sender_conflict_window_size: 256,
-                            module_conflict_window_size: 2,
-                            entry_fun_conflict_window_size: 3,
-                        };
                     }
             }
             helm_values["chain"]["on_chain_execution_config"] =
@@ -226,8 +219,10 @@ fn dag_reconfig_enable_test() -> ForgeConfig {
                 .add_no_restarts()
                 .add_wait_for_catchup_s(240)
                 .add_chain_progress(StateProgressThreshold {
-                    max_no_progress_secs: 20.0,
-                    max_round_gap: 20,
+                    max_non_epoch_no_progress_secs: 20.0,
+                    max_epoch_no_progress_secs: 20.0,
+                    max_non_epoch_round_gap: 20,
+                    max_epoch_round_gap: 20,
                 }),
         )
 }
diff --git a/testsuite/forge/Cargo.toml b/testsuite/forge/Cargo.toml
index 8e18c496f73e5..caa3c1f34ba78 100644
--- a/testsuite/forge/Cargo.toml
+++ b/testsuite/forge/Cargo.toml
@@ -28,6 +28,7 @@ aptos-inspection-service = { workspace = true }
 aptos-logger = { workspace = true }
 aptos-rest-client = { workspace = true }
 aptos-retrier = { workspace = true }
+aptos-runtimes = { workspace = true }
 aptos-sdk = { workspace = true }
 aptos-short-hex-str = { workspace = true }
 aptos-state-sync-driver = { workspace = true }
diff --git a/testsuite/forge/src/backend/k8s/chaos.rs b/testsuite/forge/src/backend/k8s/chaos.rs
index 3dfb3b3a4ef48..03306bf9fdd2b 100644
--- a/testsuite/forge/src/backend/k8s/chaos.rs
+++ b/testsuite/forge/src/backend/k8s/chaos.rs
@@ -167,6 +167,7 @@ impl K8sSwarm {
         for group_netem in &swarm_netem.group_netems {
             let source_instance_labels = self.get_instance_labels(&group_netem.source_nodes);
             let target_instance_labels = self.get_instance_labels(&group_netem.target_nodes);
+            let service_targets = self.get_service_targets(&group_netem.target_nodes);
 
             network_chaos_specs.push(format!(
                 include_str!(NETEM_CHAOS_TEMPLATE!()),
@@ -180,6 +181,7 @@ impl K8sSwarm {
                 instance_labels = &source_instance_labels,
                 target_instance_labels = &target_instance_labels,
                 rate = group_netem.rate_in_mbps,
+                service_targets = &service_targets,
             ));
         }
 
@@ -285,4 +287,23 @@ impl K8sSwarm {
             INVALID_NODE_STRING
         }
     }
+
+    fn get_service_name(&self, node: &AccountAddress) -> Option<String> {
+        if let Some(validator) = self.validator(*node) {
+            validator.service_name()
+        } else if let Some(fullnode) = self.full_node(*node) {
+            fullnode.service_name()
+        } else {
+            // TODO: should we throw an error here instead of failing silently?
+            None
+        }
+    }
+
+    pub(crate) fn get_service_targets(&self, target_nodes: &[AccountAddress]) -> String {
+        target_nodes
+            .iter()
+            .filter_map(|node| self.get_service_name(node))
+            .collect::<Vec<_>>()
+            .join(",")
+    }
 }
diff --git a/testsuite/forge/src/backend/k8s/chaos/netem.yaml b/testsuite/forge/src/backend/k8s/chaos/netem.yaml
index 1957df33f898e..686f5a9e94510 100644
--- a/testsuite/forge/src/backend/k8s/chaos/netem.yaml
+++ b/testsuite/forge/src/backend/k8s/chaos/netem.yaml
@@ -22,7 +22,7 @@ spec:
     rate: "{rate}mbps"
     limit: 20971520 # placeholder value. not supported by tc netem
     buffer: 10000 # placeholder value. not supported by tc netem
-  direction: both
+  direction: to 
   target:
     selector:
       namespaces:
@@ -30,3 +30,5 @@ spec:
       expressionSelectors:
         - {{ key: app.kubernetes.io/instance, operator: In, values: [{target_instance_labels}] }}
     mode: all
+  # This is required to ensure that the network chaos is applied when using service IPs instead of pod IPs
+  externalTargets: [{service_targets}]
diff --git a/testsuite/forge/src/backend/k8s/cluster_helper.rs b/testsuite/forge/src/backend/k8s/cluster_helper.rs
index 28588cd2ba3fd..a75996c0e4ab3 100644
--- a/testsuite/forge/src/backend/k8s/cluster_helper.rs
+++ b/testsuite/forge/src/backend/k8s/cluster_helper.rs
@@ -161,13 +161,13 @@ async fn wait_nodes_stateful_set(
 }
 
 /// Deletes a collection of resources in k8s as part of aptos-node
-async fn delete_k8s_collection<T: kube::Resource>(
+async fn delete_k8s_collection<T>(
     api: Api<T>,
     name: &'static str,
     label_selector: &str,
 ) -> Result<()>
 where
-    T: Clone + DeserializeOwned + Debug,
+    T: kube::Resource + Clone + DeserializeOwned + Debug,
     <T as kube::Resource>::DynamicType: Default,
 {
     match api
diff --git a/testsuite/forge/src/backend/k8s/fullnode.rs b/testsuite/forge/src/backend/k8s/fullnode.rs
index f7537e3a492cb..627fcdc758d71 100644
--- a/testsuite/forge/src/backend/k8s/fullnode.rs
+++ b/testsuite/forge/src/backend/k8s/fullnode.rs
@@ -35,7 +35,7 @@ use std::{
     env,
     net::{Ipv4Addr, SocketAddr, SocketAddrV4},
     path::PathBuf,
-    sync::Arc,
+    sync::{atomic::AtomicU32, Arc},
 };
 use tempfile::TempDir;
 
@@ -169,7 +169,7 @@ fn create_fullnode_container(
 ) -> Result<Container> {
     Ok(Container {
         image: Some(fullnode_image),
-        command: Some(vec![
+        args: Some(vec![
             "/usr/local/bin/aptos-node".to_string(),
             "-f".to_string(),
             format!("/opt/aptos/etc/{}", FULLNODE_CONFIG_MAP_KEY),
@@ -504,7 +504,7 @@ pub async fn install_public_fullnode<'a>(
         haproxy_enabled: false,
 
         port_forward_enabled: use_port_forward,
-        rest_api_port: REST_API_SERVICE_PORT, // in the case of port-forward, this port will be changed at runtime
+        rest_api_port: AtomicU32::new(REST_API_SERVICE_PORT), // in the case of port-forward, this port will be changed at runtime
     };
 
     Ok((node_peer_id, ret_node))
diff --git a/testsuite/forge/src/backend/k8s/helm-values/aptos-node-default-values.yaml b/testsuite/forge/src/backend/k8s/helm-values/aptos-node-default-values.yaml
index 2cebfd18189d3..5f30786f111a2 100644
--- a/testsuite/forge/src/backend/k8s/helm-values/aptos-node-default-values.yaml
+++ b/testsuite/forge/src/backend/k8s/helm-values/aptos-node-default-values.yaml
@@ -17,22 +17,20 @@ fullnode:
   # force enable the telemetry service to try to send telemetry
   force_enable_telemetry: true
 
-# Make all services internal NodePort and open all ports
-# NodePort is required for ChaosMesh to function correctly: https://github.com/chaos-mesh/chaos-mesh/issues/3278#issuecomment-1134248492
 service:
   validator:
     external:
-      type: "NodePort"
+      type: "ClusterIP"
     internal:
-      type: "NodePort"
+      type: "ClusterIP"
     enableRestApi: true
     enableMetricsPort: true
 
   fullnode:
     external:
-      type: "NodePort"
+      type: "ClusterIP"
     internal:
-      type: "NodePort"
+      type: "ClusterIP"
     enableRestApi: true
     enableMetricsPort: true
 
diff --git a/testsuite/forge/src/backend/k8s/node.rs b/testsuite/forge/src/backend/k8s/node.rs
index 8fd0fec22badf..35e76ba93e99f 100644
--- a/testsuite/forge/src/backend/k8s/node.rs
+++ b/testsuite/forge/src/backend/k8s/node.rs
@@ -20,6 +20,7 @@ use std::{
     fmt::{Debug, Formatter},
     process::{Command, Stdio},
     str::FromStr,
+    sync::atomic::{AtomicU32, Ordering},
     thread,
     time::{Duration, Instant},
 };
@@ -32,7 +33,7 @@ pub struct K8sNode {
     pub(crate) peer_id: PeerId,
     pub(crate) index: usize,
     pub(crate) service_name: String,
-    pub(crate) rest_api_port: u32,
+    pub(crate) rest_api_port: AtomicU32,
     pub version: Version,
     pub namespace: String,
     // whether this node has HAProxy in front of it
@@ -43,7 +44,7 @@ pub struct K8sNode {
 
 impl K8sNode {
     fn rest_api_port(&self) -> u32 {
-        self.rest_api_port
+        self.rest_api_port.load(Ordering::SeqCst)
     }
 
     fn service_name(&self) -> String {
@@ -133,19 +134,19 @@ impl Node for K8sNode {
         self.peer_id
     }
 
-    async fn start(&mut self) -> Result<()> {
+    async fn start(&self) -> Result<()> {
         scale_stateful_set_replicas(self.stateful_set_name(), self.namespace(), 1).await?;
         // need to port-forward again since the node is coming back
         // note that we will get a new port
         if self.port_forward_enabled {
-            self.rest_api_port = get_free_port();
+            self.rest_api_port.store(get_free_port(), Ordering::SeqCst);
             self.port_forward_rest_api()?;
         }
         self.wait_until_healthy(Instant::now() + Duration::from_secs(60))
             .await
     }
 
-    async fn stop(&mut self) -> Result<()> {
+    async fn stop(&self) -> Result<()> {
         info!("going to stop node {}", self.stateful_set_name());
         scale_stateful_set_replicas(self.stateful_set_name(), self.namespace(), 0).await
     }
@@ -164,7 +165,7 @@ impl Node for K8sNode {
             .expect("Invalid URL.")
     }
 
-    async fn clear_storage(&mut self) -> Result<()> {
+    async fn clear_storage(&self) -> Result<()> {
         // Remove all storage files
         let ledger_db_path = format!("{}/db/{}", APTOS_DATA_DIR, LEDGER_DB_NAME);
         let state_db_path = format!("{}/db/{}", APTOS_DATA_DIR, STATE_MERKLE_DB_NAME);
@@ -236,7 +237,7 @@ impl Node for K8sNode {
         Ok(port as u64)
     }
 
-    async fn health_check(&mut self) -> Result<(), HealthCheckError> {
+    async fn health_check(&self) -> Result<(), HealthCheckError> {
         self.rest_client()
             .get_ledger_information()
             .await
@@ -256,11 +257,11 @@ impl Node for K8sNode {
         .unwrap()
     }
 
-    async fn get_identity(&mut self) -> Result<String> {
+    async fn get_identity(&self) -> Result<String> {
         stateful_set::get_identity(self.stateful_set_name(), self.namespace()).await
     }
 
-    async fn set_identity(&mut self, k8s_secret_name: String) -> Result<()> {
+    async fn set_identity(&self, k8s_secret_name: String) -> Result<()> {
         stateful_set::set_identity(
             self.stateful_set_name(),
             self.namespace(),
@@ -268,6 +269,10 @@ impl Node for K8sNode {
         )
         .await
     }
+
+    fn service_name(&self) -> Option<String> {
+        Some(self.service_name.clone())
+    }
 }
 
 impl Validator for K8sNode {}
diff --git a/testsuite/forge/src/backend/k8s/prometheus.rs b/testsuite/forge/src/backend/k8s/prometheus.rs
index d0d28b7f729df..93367f590fbe0 100644
--- a/testsuite/forge/src/backend/k8s/prometheus.rs
+++ b/testsuite/forge/src/backend/k8s/prometheus.rs
@@ -4,7 +4,7 @@
 use crate::{create_k8s_client, K8sApi, ReadWrite, Result};
 use again::RetryPolicy;
 use anyhow::{anyhow, bail};
-use aptos_logger::info;
+use aptos_logger::{info, warn};
 use k8s_openapi::api::core::v1::Secret;
 use once_cell::sync::Lazy;
 use prometheus_http_query::{
@@ -185,7 +185,14 @@ pub async fn query_range_with_metadata(
             new_query
         )
     })?;
-    if range.len() != 1 {
+    if range.is_empty() {
+        warn!(
+            "Missing data for start={}, end={}, query={}",
+            start_time, end_time, new_query
+        );
+        return Ok(Vec::new());
+    }
+    if range.len() > 1 {
         bail!(
             "Expected only one range vector from prometheus, recieved {} ({:?}). start={}, end={}, query={}",
             range.len(),
diff --git a/testsuite/forge/src/backend/k8s/swarm.rs b/testsuite/forge/src/backend/k8s/swarm.rs
index d4cc6512f2a53..15c51cd8b0318 100644
--- a/testsuite/forge/src/backend/k8s/swarm.rs
+++ b/testsuite/forge/src/backend/k8s/swarm.rs
@@ -40,14 +40,15 @@ use std::{
     collections::{BTreeMap, HashMap, HashSet},
     convert::TryFrom,
     env, str,
-    sync::Arc,
+    sync::{atomic::AtomicU32, Arc},
 };
+// use std::sync::Mutex;
 use tokio::{runtime::Runtime, time::Duration};
 
 pub struct K8sSwarm {
     validators: HashMap<PeerId, K8sNode>,
     fullnodes: HashMap<PeerId, K8sNode>,
-    root_account: LocalAccount,
+    root_account: Arc<LocalAccount>,
     kube_client: K8sClient,
     versions: Arc<HashMap<Version, String>>,
     pub chain_id: ChainId,
@@ -86,6 +87,7 @@ impl K8sSwarm {
             )
         })?;
         let root_account = LocalAccount::new(address, account_key, sequence_number);
+        let root_account = Arc::new(root_account);
 
         let mut versions = HashMap::new();
         let cur_version = Version::new(0, image_tag.to_string());
@@ -178,7 +180,7 @@ impl K8sSwarm {
             self.get_kube_client(),
             Some(self.kube_namespace.clone()),
         ));
-        let (peer_id, mut k8snode) = install_public_fullnode(
+        let (peer_id, k8snode) = install_public_fullnode(
             stateful_set_api,
             configmap_api,
             persistent_volume_claim_api,
@@ -201,7 +203,7 @@ impl K8sSwarm {
 
 #[async_trait::async_trait]
 impl Swarm for K8sSwarm {
-    async fn health_check(&mut self) -> Result<()> {
+    async fn health_check(&self) -> Result<()> {
         let nodes = self.validators.values().collect();
         let unhealthy_nodes = nodes_healthcheck(nodes).await.unwrap();
         if !unhealthy_nodes.is_empty() {
@@ -221,26 +223,10 @@ impl Swarm for K8sSwarm {
         Box::new(validators.into_iter())
     }
 
-    fn validators_mut<'a>(&'a mut self) -> Box<dyn Iterator<Item = &'a mut dyn Validator> + 'a> {
-        let mut validators: Vec<_> = self
-            .validators
-            .values_mut()
-            .map(|v| v as &'a mut dyn Validator)
-            .collect();
-        validators.sort_by_key(|v| v.index());
-        Box::new(validators.into_iter())
-    }
-
     fn validator(&self, id: PeerId) -> Option<&dyn Validator> {
         self.validators.get(&id).map(|v| v as &dyn Validator)
     }
 
-    fn validator_mut(&mut self, id: PeerId) -> Option<&mut dyn Validator> {
-        self.validators
-            .get_mut(&id)
-            .map(|v| v as &mut dyn Validator)
-    }
-
     /// TODO: this should really be a method on Node rather than Swarm
     async fn upgrade_validator(&mut self, id: PeerId, version: &Version) -> Result<()> {
         let validator = self
@@ -281,24 +267,10 @@ impl Swarm for K8sSwarm {
         Box::new(full_nodes.into_iter())
     }
 
-    fn full_nodes_mut<'a>(&'a mut self) -> Box<dyn Iterator<Item = &'a mut dyn FullNode> + 'a> {
-        let mut full_nodes: Vec<_> = self
-            .fullnodes
-            .values_mut()
-            .map(|n| n as &'a mut dyn FullNode)
-            .collect();
-        full_nodes.sort_by_key(|n| n.index());
-        Box::new(full_nodes.into_iter())
-    }
-
     fn full_node(&self, id: PeerId) -> Option<&dyn FullNode> {
         self.fullnodes.get(&id).map(|v| v as &dyn FullNode)
     }
 
-    fn full_node_mut(&mut self, id: PeerId) -> Option<&mut dyn FullNode> {
-        self.fullnodes.get_mut(&id).map(|v| v as &mut dyn FullNode)
-    }
-
     fn add_validator(&mut self, _version: &Version, _template: NodeConfig) -> Result<PeerId> {
         todo!()
     }
@@ -337,11 +309,11 @@ impl Swarm for K8sSwarm {
         Box::new(self.versions.keys().cloned())
     }
 
-    fn chain_info(&mut self) -> ChainInfo<'_> {
+    fn chain_info(&self) -> ChainInfo {
         let rest_api_url = self.get_rest_api_url(0);
         let inspection_service_url = self.get_inspection_service_url(0);
         ChainInfo::new(
-            &mut self.root_account,
+            self.root_account.clone(),
             rest_api_url,
             inspection_service_url,
             self.chain_id,
@@ -457,11 +429,11 @@ impl Swarm for K8sSwarm {
         bail!("No prom client");
     }
 
-    fn chain_info_for_node(&mut self, idx: usize) -> ChainInfo<'_> {
+    fn chain_info_for_node(&mut self, idx: usize) -> ChainInfo {
         let rest_api_url = self.get_rest_api_url(idx);
         let inspection_service_url = self.get_inspection_service_url(idx);
         ChainInfo::new(
-            &mut self.root_account,
+            self.root_account.clone(),
             rest_api_url,
             inspection_service_url,
             self.chain_id,
@@ -570,7 +542,7 @@ fn get_k8s_node_from_stateful_set(
         peer_id: PeerId::random(),
         index,
         service_name,
-        rest_api_port,
+        rest_api_port: AtomicU32::new(rest_api_port),
         version: Version::new(0, image_tag),
         namespace: namespace.to_string(),
         haproxy_enabled: enable_haproxy,
diff --git a/testsuite/forge/src/backend/local/node.rs b/testsuite/forge/src/backend/local/node.rs
index 9487e40180e60..d0beef57a2746 100644
--- a/testsuite/forge/src/backend/local/node.rs
+++ b/testsuite/forge/src/backend/local/node.rs
@@ -50,7 +50,7 @@ impl Drop for Process {
 #[derive(Debug)]
 pub struct LocalNode {
     version: LocalVersion,
-    process: Option<Process>,
+    process: std::sync::Mutex<Option<Process>>,
     name: String,
     index: usize,
     account_private_key: Option<ConfigKey<Ed25519PrivateKey>>,
@@ -81,7 +81,7 @@ impl LocalNode {
 
         Ok(Self {
             version,
-            process: None,
+            process: std::sync::Mutex::new(None),
             name,
             index,
             account_private_key,
@@ -115,13 +115,17 @@ impl LocalNode {
         &self.account_private_key
     }
 
-    pub fn start(&mut self) -> Result<()> {
-        ensure!(self.process.is_none(), "node {} already running", self.name);
+    pub fn start(&self) -> Result<()> {
+        let mut process_locker = self.process.lock().unwrap();
+        ensure!(
+            process_locker.is_none(),
+            "node {} already running",
+            self.name
+        );
 
         // Ensure log file exists
         let log_file = OpenOptions::new()
             .create(true)
-            .write(true)
             .append(true)
             .open(self.log_path())?;
 
@@ -172,13 +176,13 @@ impl LocalNode {
             self.config.storage.backup_service_address.port()
         );
 
-        self.process = Some(Process(process));
+        *process_locker = Some(Process(process));
 
         Ok(())
     }
 
-    pub fn stop(&mut self) {
-        self.process = None;
+    pub fn stop(&self) {
+        *(self.process.lock().unwrap()) = None;
     }
 
     pub fn port(&self) -> u16 {
@@ -207,28 +211,32 @@ impl LocalNode {
         fs::read_to_string(self.log_path()).map_err(Into::into)
     }
 
-    pub async fn health_check(&mut self) -> Result<(), HealthCheckError> {
+    pub async fn health_check(&self) -> Result<(), HealthCheckError> {
         debug!("Health check on node '{}'", self.name);
 
-        if let Some(p) = &mut self.process {
-            match p.0.try_wait() {
-                // This would mean the child process has crashed
-                Ok(Some(status)) => {
-                    let error = format!("Node '{}' crashed with: {}", self.name, status);
-                    return Err(HealthCheckError::NotRunning(error));
-                },
-
-                // This is the case where the node is still running
-                Ok(None) => {},
-
-                // Some other unknown error
-                Err(e) => {
-                    return Err(HealthCheckError::Unknown(e.into()));
-                },
+        {
+            let mut process_locker = self.process.lock().unwrap();
+            let process = process_locker.as_mut();
+            if let Some(p) = process {
+                match p.0.try_wait() {
+                    // This would mean the child process has crashed
+                    Ok(Some(status)) => {
+                        let error = format!("Node '{}' crashed with: {}", self.name, status);
+                        return Err(HealthCheckError::NotRunning(error));
+                    },
+
+                    // This is the case where the node is still running
+                    Ok(None) => {},
+
+                    // Some other unknown error
+                    Err(e) => {
+                        return Err(HealthCheckError::Unknown(e.into()));
+                    },
+                }
+            } else {
+                let error = format!("Node '{}' is stopped", self.name);
+                return Err(HealthCheckError::NotRunning(error));
             }
-        } else {
-            let error = format!("Node '{}' is stopped", self.name);
-            return Err(HealthCheckError::NotRunning(error));
         }
 
         self.inspection_client()
@@ -281,24 +289,24 @@ impl Node for LocalNode {
         self.config()
     }
 
-    async fn start(&mut self) -> Result<()> {
+    async fn start(&self) -> Result<()> {
         self.start()
     }
 
-    async fn stop(&mut self) -> Result<()> {
+    async fn stop(&self) -> Result<()> {
         self.stop();
         Ok(())
     }
 
-    async fn get_identity(&mut self) -> Result<String> {
+    async fn get_identity(&self) -> Result<String> {
         todo!()
     }
 
-    async fn set_identity(&mut self, _k8s_secret_name: String) -> Result<()> {
+    async fn set_identity(&self, _k8s_secret_name: String) -> Result<()> {
         todo!()
     }
 
-    async fn clear_storage(&mut self) -> Result<()> {
+    async fn clear_storage(&self) -> Result<()> {
         // Remove all storage files (i.e., blockchain data, consensus data and state sync data)
         let node_config = self.config();
         let ledger_db_path = node_config.storage.dir().join(LEDGER_DB_NAME);
@@ -355,7 +363,7 @@ impl Node for LocalNode {
         Ok(())
     }
 
-    async fn health_check(&mut self) -> Result<(), HealthCheckError> {
+    async fn health_check(&self) -> Result<(), HealthCheckError> {
         self.health_check().await
     }
 
@@ -367,6 +375,10 @@ impl Node for LocalNode {
     fn expose_metric(&self) -> Result<u64> {
         Ok(0)
     }
+
+    fn service_name(&self) -> Option<String> {
+        None
+    }
 }
 
 impl Validator for LocalNode {}
diff --git a/testsuite/forge/src/backend/local/swarm.rs b/testsuite/forge/src/backend/local/swarm.rs
index 4e8905c2a3305..cb1f8ba2989f7 100644
--- a/testsuite/forge/src/backend/local/swarm.rs
+++ b/testsuite/forge/src/backend/local/swarm.rs
@@ -96,7 +96,7 @@ pub struct LocalSwarm {
     fullnodes: HashMap<PeerId, LocalNode>,
     public_networks: HashMap<PeerId, NetworkConfig>,
     dir: SwarmDirectory,
-    root_account: LocalAccount,
+    root_account: Arc<LocalAccount>,
     chain_id: ChainId,
     root_key: ConfigKey<Ed25519PrivateKey>,
 
@@ -245,6 +245,7 @@ impl LocalSwarm {
             AccountKey::from_private_key(root_key.private_key()),
             0,
         );
+        let root_account = Arc::new(root_account);
 
         Ok(LocalSwarm {
             node_name_counter: validators.len(),
@@ -367,7 +368,7 @@ impl LocalSwarm {
         )?;
 
         let version = self.versions.get(version).unwrap();
-        let mut fullnode = LocalNode::new(
+        let fullnode = LocalNode::new(
             version.to_owned(),
             fullnode_config.name,
             index,
@@ -397,7 +398,7 @@ impl LocalSwarm {
         )?;
 
         let version = self.versions.get(version).unwrap();
-        let mut fullnode = LocalNode::new(
+        let fullnode = LocalNode::new(
             version.to_owned(),
             fullnode_config.name,
             index,
@@ -477,7 +478,7 @@ impl Drop for LocalSwarm {
 
 #[async_trait::async_trait]
 impl Swarm for LocalSwarm {
-    async fn health_check(&mut self) -> Result<()> {
+    async fn health_check(&self) -> Result<()> {
         Ok(())
     }
 
@@ -491,26 +492,10 @@ impl Swarm for LocalSwarm {
         Box::new(validators.into_iter())
     }
 
-    fn validators_mut<'a>(&'a mut self) -> Box<dyn Iterator<Item = &'a mut dyn Validator> + 'a> {
-        let mut validators: Vec<_> = self
-            .validators
-            .values_mut()
-            .map(|v| v as &'a mut dyn Validator)
-            .collect();
-        validators.sort_by_key(|v| v.index());
-        Box::new(validators.into_iter())
-    }
-
     fn validator(&self, id: PeerId) -> Option<&dyn Validator> {
         self.validators.get(&id).map(|v| v as &dyn Validator)
     }
 
-    fn validator_mut(&mut self, id: PeerId) -> Option<&mut dyn Validator> {
-        self.validators
-            .get_mut(&id)
-            .map(|v| v as &mut dyn Validator)
-    }
-
     async fn upgrade_validator(&mut self, id: PeerId, version: &Version) -> Result<()> {
         let version = self
             .versions
@@ -534,24 +519,10 @@ impl Swarm for LocalSwarm {
         Box::new(full_nodes.into_iter())
     }
 
-    fn full_nodes_mut<'a>(&'a mut self) -> Box<dyn Iterator<Item = &'a mut dyn FullNode> + 'a> {
-        let mut full_nodes: Vec<_> = self
-            .fullnodes
-            .values_mut()
-            .map(|v| v as &'a mut dyn FullNode)
-            .collect();
-        full_nodes.sort_by_key(|n| n.index());
-        Box::new(full_nodes.into_iter())
-    }
-
     fn full_node(&self, id: PeerId) -> Option<&dyn FullNode> {
         self.fullnodes.get(&id).map(|v| v as &dyn FullNode)
     }
 
-    fn full_node_mut(&mut self, id: PeerId) -> Option<&mut dyn FullNode> {
-        self.fullnodes.get_mut(&id).map(|v| v as &mut dyn FullNode)
-    }
-
     fn add_validator(&mut self, _version: &Version, _template: NodeConfig) -> Result<PeerId> {
         todo!()
     }
@@ -578,7 +549,7 @@ impl Swarm for LocalSwarm {
     }
 
     fn remove_full_node(&mut self, id: PeerId) -> Result<()> {
-        if let Some(mut fullnode) = self.fullnodes.remove(&id) {
+        if let Some(fullnode) = self.fullnodes.remove(&id) {
             fullnode.stop();
         }
 
@@ -589,7 +560,7 @@ impl Swarm for LocalSwarm {
         Box::new(self.versions.keys().cloned())
     }
 
-    fn chain_info(&mut self) -> ChainInfo<'_> {
+    fn chain_info(&self) -> ChainInfo {
         let rest_api_url = self
             .validators()
             .next()
@@ -604,7 +575,7 @@ impl Swarm for LocalSwarm {
             .to_string();
 
         ChainInfo::new(
-            &mut self.root_account,
+            self.root_account.clone(),
             rest_api_url,
             inspection_service_url,
             self.chain_id,
@@ -655,7 +626,7 @@ impl Swarm for LocalSwarm {
         todo!()
     }
 
-    fn chain_info_for_node(&mut self, idx: usize) -> ChainInfo<'_> {
+    fn chain_info_for_node(&mut self, idx: usize) -> ChainInfo {
         let rest_api_url = self
             .validators()
             .nth(idx)
@@ -669,7 +640,7 @@ impl Swarm for LocalSwarm {
             .inspection_service_endpoint()
             .to_string();
         ChainInfo::new(
-            &mut self.root_account,
+            self.root_account.clone(),
             rest_api_url,
             inspection_service_url,
             self.chain_id,
diff --git a/testsuite/forge/src/interface/admin.rs b/testsuite/forge/src/interface/admin.rs
index 50d726ced5a6a..0abbbe87039cf 100644
--- a/testsuite/forge/src/interface/admin.rs
+++ b/testsuite/forge/src/interface/admin.rs
@@ -20,12 +20,12 @@ pub trait AdminTest: Test {
 pub struct AdminContext<'t> {
     core: CoreContext,
 
-    chain_info: ChainInfo<'t>,
+    chain_info: ChainInfo,
     pub report: &'t mut TestReport,
 }
 
 impl<'t> AdminContext<'t> {
-    pub fn new(core: CoreContext, chain_info: ChainInfo<'t>, report: &'t mut TestReport) -> Self {
+    pub fn new(core: CoreContext, chain_info: ChainInfo, report: &'t mut TestReport) -> Self {
         Self {
             core,
             chain_info,
@@ -45,7 +45,7 @@ impl<'t> AdminContext<'t> {
         RestClient::new(Url::parse(self.chain_info.rest_api()).unwrap())
     }
 
-    pub fn chain_info(&mut self) -> &mut ChainInfo<'t> {
+    pub fn chain_info(&mut self) -> &mut ChainInfo {
         &mut self.chain_info
     }
 
diff --git a/testsuite/forge/src/interface/aptos.rs b/testsuite/forge/src/interface/aptos.rs
index b31cbb2655449..6e38ae931dfed 100644
--- a/testsuite/forge/src/interface/aptos.rs
+++ b/testsuite/forge/src/interface/aptos.rs
@@ -25,6 +25,7 @@ use aptos_sdk::{
 use rand::{rngs::OsRng, Rng, SeedableRng};
 use reqwest::Url;
 use serde::{Deserialize, Serialize};
+use std::sync::Arc;
 
 #[async_trait::async_trait]
 pub trait AptosTest: Test {
@@ -34,14 +35,14 @@ pub trait AptosTest: Test {
 
 pub struct AptosContext<'t> {
     core: CoreContext,
-    public_info: AptosPublicInfo<'t>,
+    public_info: AptosPublicInfo,
     pub report: &'t mut TestReport,
 }
 
 impl<'t> AptosContext<'t> {
     pub fn new(
         core: CoreContext,
-        public_info: AptosPublicInfo<'t>,
+        public_info: AptosPublicInfo,
         report: &'t mut TestReport,
     ) -> Self {
         Self {
@@ -107,26 +108,26 @@ impl<'t> AptosContext<'t> {
         self.public_info.get_balance(address).await
     }
 
-    pub fn root_account(&mut self) -> &mut LocalAccount {
-        self.public_info.root_account
+    pub fn root_account(&mut self) -> Arc<LocalAccount> {
+        self.public_info.root_account.clone()
     }
 }
 
-pub struct AptosPublicInfo<'t> {
+pub struct AptosPublicInfo {
     chain_id: ChainId,
     inspection_service_url: Url,
     rest_api_url: Url,
     rest_client: RestClient,
-    root_account: &'t mut LocalAccount,
+    root_account: Arc<LocalAccount>,
     rng: ::rand::rngs::StdRng,
 }
 
-impl<'t> AptosPublicInfo<'t> {
+impl AptosPublicInfo {
     pub fn new(
         chain_id: ChainId,
         inspection_service_url_str: String,
         rest_api_url_str: String,
-        root_account: &'t mut LocalAccount,
+        root_account: Arc<LocalAccount>,
     ) -> Self {
         let rest_api_url = Url::parse(&rest_api_url_str).unwrap();
         let inspection_service_url = Url::parse(&inspection_service_url_str).unwrap();
@@ -152,8 +153,8 @@ impl<'t> AptosPublicInfo<'t> {
         self.inspection_service_url.as_str()
     }
 
-    pub fn root_account(&mut self) -> &mut LocalAccount {
-        self.root_account
+    pub fn root_account(&mut self) -> Arc<LocalAccount> {
+        self.root_account.clone()
     }
 
     pub async fn create_user_account(&mut self, pubkey: &Ed25519PublicKey) -> Result<()> {
@@ -300,12 +301,12 @@ impl<'t> AptosPublicInfo<'t> {
         Ok(account)
     }
 
-    pub async fn reconfig(&mut self) -> State {
+    pub async fn reconfig(&self) -> State {
         // dedupe with smoke-test::test_utils::reconfig
         reconfig(
             &self.rest_client,
             &self.transaction_factory(),
-            self.root_account,
+            self.root_account.clone(),
         )
         .await
     }
@@ -328,21 +329,23 @@ impl<'t> AptosPublicInfo<'t> {
 pub async fn reconfig(
     client: &RestClient,
     transaction_factory: &TransactionFactory,
-    root_account: &mut LocalAccount,
+    root_account: Arc<LocalAccount>,
 ) -> State {
     let aptos_version = client.get_aptos_version().await.unwrap();
     let current = aptos_version.into_inner();
     let current_version = *current.major.inner();
-    let txns = vec![
-        root_account.sign_with_transaction_builder(transaction_factory.clone().payload(
-            aptos_stdlib::version_set_for_next_epoch(current_version + 1),
-        )),
-        root_account.sign_with_transaction_builder(
-            transaction_factory
-                .clone()
-                .payload(aptos_stdlib::aptos_governance_force_end_epoch_test_only()),
-        ),
-    ];
+    let txns = {
+        vec![
+            root_account.sign_with_transaction_builder(transaction_factory.clone().payload(
+                aptos_stdlib::version_set_for_next_epoch(current_version + 1),
+            )),
+            root_account.sign_with_transaction_builder(
+                transaction_factory
+                    .clone()
+                    .payload(aptos_stdlib::aptos_governance_force_end_epoch_test_only()),
+            ),
+        ]
+    };
 
     submit_and_wait_reconfig(client, txns).await
 }
diff --git a/testsuite/forge/src/interface/chain_info.rs b/testsuite/forge/src/interface/chain_info.rs
index 9baa8c22ac9f1..ff6606f9fab67 100644
--- a/testsuite/forge/src/interface/chain_info.rs
+++ b/testsuite/forge/src/interface/chain_info.rs
@@ -10,18 +10,19 @@ use aptos_sdk::{
     types::{chain_id::ChainId, LocalAccount},
 };
 use reqwest::Url;
+use std::sync::Arc;
 
 #[derive(Debug)]
-pub struct ChainInfo<'t> {
-    pub root_account: &'t mut LocalAccount,
+pub struct ChainInfo {
+    pub root_account: Arc<LocalAccount>,
     pub rest_api_url: String,
     pub inspection_service_url: String,
     pub chain_id: ChainId,
 }
 
-impl<'t> ChainInfo<'t> {
+impl ChainInfo {
     pub fn new(
-        root_account: &'t mut LocalAccount,
+        root_account: Arc<LocalAccount>,
         rest_api_url: String,
         inspection_service_url: String,
         chain_id: ChainId,
@@ -34,15 +35,13 @@ impl<'t> ChainInfo<'t> {
         }
     }
 
-    pub fn root_account(&mut self) -> &mut LocalAccount {
-        self.root_account
+    pub fn root_account(&self) -> Arc<LocalAccount> {
+        self.root_account.clone()
     }
 
     pub async fn resync_root_account_seq_num(&mut self, client: &RestClient) -> Result<()> {
-        let account = client
-            .get_account(self.root_account.address())
-            .await?
-            .into_inner();
+        let root_address = { self.root_account.address() };
+        let account = client.get_account(root_address).await?.into_inner();
         self.root_account
             .set_sequence_number(account.sequence_number);
         Ok(())
@@ -64,12 +63,12 @@ impl<'t> ChainInfo<'t> {
         TransactionFactory::new(self.chain_id())
     }
 
-    pub fn into_aptos_public_info(self) -> AptosPublicInfo<'t> {
+    pub fn into_aptos_public_info(self) -> AptosPublicInfo {
         AptosPublicInfo::new(
             self.chain_id,
             self.inspection_service_url.clone(),
             self.rest_api_url.clone(),
-            self.root_account,
+            self.root_account.clone(),
         )
     }
 }
diff --git a/testsuite/forge/src/interface/network.rs b/testsuite/forge/src/interface/network.rs
index 1d4f87fc2a9f4..26b622d58ef98 100644
--- a/testsuite/forge/src/interface/network.rs
+++ b/testsuite/forge/src/interface/network.rs
@@ -9,20 +9,53 @@ use crate::{
     CoreContext, Result, Swarm, TestReport,
 };
 use aptos_transaction_emitter_lib::{EmitJobRequest, TxnStats};
-use std::time::Duration;
-use tokio::runtime::Runtime;
+use async_trait::async_trait;
+use std::{future::Future, sync::Arc, time::Duration};
+use tokio::runtime::{Handle, Runtime};
 
 /// The testing interface which defines a test written with full control over an existing network.
 /// Tests written against this interface will have access to both the Root account as well as the
 /// nodes which comprise the network.
+#[async_trait]
 pub trait NetworkTest: Test {
     /// Executes the test against the given context.
-    fn run(&self, ctx: &mut NetworkContext<'_>) -> Result<()>;
+    async fn run<'t>(&self, ctx: NetworkContextSynchronizer<'t>) -> Result<()>;
+}
+
+#[derive(Clone)]
+pub struct NetworkContextSynchronizer<'t> {
+    pub ctx: Arc<tokio::sync::Mutex<NetworkContext<'t>>>,
+    pub handle: tokio::runtime::Handle,
+}
+
+// TODO: some useful things that don't need to hold the lock or make a copy
+impl<'t> NetworkContextSynchronizer<'t> {
+    pub fn new(ctx: NetworkContext<'t>, handle: tokio::runtime::Handle) -> Self {
+        Self {
+            ctx: Arc::new(tokio::sync::Mutex::new(ctx)),
+            handle,
+        }
+    }
+
+    pub async fn report_text(&self, text: String) {
+        let mut locker = self.ctx.lock().await;
+        locker.report.report_text(text);
+    }
+
+    pub fn flex_block_on<F: Future>(&self, future: F) -> F::Output {
+        match Handle::try_current() {
+            Ok(handle) => {
+                // we are in an async context, we don't need block_on
+                handle.block_on(future)
+            },
+            Err(_) => self.handle.block_on(future),
+        }
+    }
 }
 
 pub struct NetworkContext<'t> {
     core: CoreContext,
-    pub swarm: &'t mut dyn Swarm,
+    pub swarm: Arc<tokio::sync::RwLock<Box<dyn Swarm>>>,
     pub report: &'t mut TestReport,
     pub global_duration: Duration,
     pub emit_job: EmitJobRequest,
@@ -33,7 +66,7 @@ pub struct NetworkContext<'t> {
 impl<'t> NetworkContext<'t> {
     pub fn new(
         core: CoreContext,
-        swarm: &'t mut dyn Swarm,
+        swarm: Arc<tokio::sync::RwLock<Box<dyn Swarm>>>,
         report: &'t mut TestReport,
         global_duration: Duration,
         emit_job: EmitJobRequest,
@@ -46,19 +79,15 @@ impl<'t> NetworkContext<'t> {
             global_duration,
             emit_job,
             success_criteria,
-            runtime: Runtime::new().unwrap(),
+            runtime: aptos_runtimes::spawn_named_runtime("emitter".into(), Some(64)),
         }
     }
 
-    pub fn swarm(&mut self) -> &mut dyn Swarm {
-        self.swarm
-    }
-
     pub fn core(&mut self) -> &mut CoreContext {
         &mut self.core
     }
 
-    pub fn check_for_success(
+    pub async fn check_for_success(
         &mut self,
         stats: &TxnStats,
         window: Duration,
@@ -68,18 +97,38 @@ impl<'t> NetworkContext<'t> {
         start_version: u64,
         end_version: u64,
     ) -> Result<()> {
-        self.runtime
-            .block_on(SuccessCriteriaChecker::check_for_success(
-                &self.success_criteria,
-                self.swarm,
-                self.report,
-                stats,
-                window,
-                latency_breakdown,
-                start_time,
-                end_time,
-                start_version,
-                end_version,
-            ))
+        SuccessCriteriaChecker::check_for_success(
+            &self.success_criteria,
+            self.swarm.clone(),
+            self.report,
+            stats,
+            window,
+            latency_breakdown,
+            start_time,
+            end_time,
+            start_version,
+            end_version,
+        )
+        .await
+    }
+
+    pub fn handle(&self) -> Handle {
+        match Handle::try_current() {
+            Ok(handle) => {
+                // we are in an async context, we don't need block_on
+                handle
+            },
+            Err(_) => self.runtime.handle().clone(),
+        }
+    }
+
+    pub fn flex_block_on<F: Future>(&self, future: F) -> F::Output {
+        match Handle::try_current() {
+            Ok(handle) => {
+                // we are in an async context, we don't need block_on
+                handle.block_on(future)
+            },
+            Err(_) => self.runtime.block_on(future),
+        }
     }
 }
diff --git a/testsuite/forge/src/interface/node.rs b/testsuite/forge/src/interface/node.rs
index 02dd405b97c59..e3eaa314c2f46 100644
--- a/testsuite/forge/src/interface/node.rs
+++ b/testsuite/forge/src/interface/node.rs
@@ -55,23 +55,25 @@ pub trait Node: Send + Sync {
 
     /// Start this Node.
     /// This should be a noop if the Node is already running.
-    async fn start(&mut self) -> Result<()>;
+    async fn start(&self) -> Result<()>;
 
     /// Stop this Node.
     /// This should be a noop if the Node isn't running.
-    async fn stop(&mut self) -> Result<()>;
+    async fn stop(&self) -> Result<()>;
 
-    async fn get_identity(&mut self) -> Result<String>;
+    async fn get_identity(&self) -> Result<String>;
 
-    async fn set_identity(&mut self, k8s_secret_name: String) -> Result<()>;
+    async fn set_identity(&self, k8s_secret_name: String) -> Result<()>;
     /// Clears this Node's Storage. This stops the node as well
-    async fn clear_storage(&mut self) -> Result<()>;
+    async fn clear_storage(&self) -> Result<()>;
 
-    async fn health_check(&mut self) -> Result<(), HealthCheckError>;
+    async fn health_check(&self) -> Result<(), HealthCheckError>;
 
     fn counter(&self, counter: &str, port: u64) -> Result<f64>;
 
     fn expose_metric(&self) -> Result<u64>;
+
+    fn service_name(&self) -> Option<String>;
 }
 
 /// Trait used to represent a running Validator
@@ -225,7 +227,7 @@ pub trait NodeExt: Node {
         Ok(self.rest_client().health_check(seconds).await?)
     }
 
-    async fn wait_until_healthy(&mut self, deadline: Instant) -> Result<()> {
+    async fn wait_until_healthy(&self, deadline: Instant) -> Result<()> {
         let mut healthcheck_error =
             HealthCheckError::Unknown(anyhow::anyhow!("No healthcheck performed yet"));
         while Instant::now() < deadline {
diff --git a/testsuite/forge/src/interface/prometheus_metrics.rs b/testsuite/forge/src/interface/prometheus_metrics.rs
index 6edcdbe4f81f1..9ec7d6f82440c 100644
--- a/testsuite/forge/src/interface/prometheus_metrics.rs
+++ b/testsuite/forge/src/interface/prometheus_metrics.rs
@@ -3,7 +3,7 @@
 
 use crate::Swarm;
 use prometheus_http_query::response::Sample;
-use std::{collections::BTreeMap, fmt};
+use std::{collections::BTreeMap, fmt, sync::Arc};
 
 #[derive(Clone)]
 pub struct MetricSamples(Vec<Sample>);
@@ -58,10 +58,16 @@ impl SystemMetrics {
     }
 }
 
-pub async fn fetch_error_metrics(swarm: &dyn Swarm) -> anyhow::Result<i64> {
+pub async fn fetch_error_metrics(
+    swarm: Arc<tokio::sync::RwLock<Box<dyn Swarm>>>,
+) -> anyhow::Result<i64> {
     let error_query = r#"aptos_error_log_count{role=~"validator"}"#;
 
-    let result = swarm.query_metrics(error_query, None, None).await?;
+    let result = swarm
+        .read()
+        .await
+        .query_metrics(error_query, None, None)
+        .await?;
     let error_samples = result.as_instant().unwrap_or(&[]);
 
     Ok(error_samples
@@ -72,13 +78,14 @@ pub async fn fetch_error_metrics(swarm: &dyn Swarm) -> anyhow::Result<i64> {
 }
 
 pub async fn fetch_system_metrics(
-    swarm: &dyn Swarm,
+    swarm: Arc<tokio::sync::RwLock<Box<dyn Swarm>>>,
     start_time: i64,
     end_time: i64,
 ) -> anyhow::Result<SystemMetrics> {
     let cpu_query = r#"avg(rate(container_cpu_usage_seconds_total{container=~"validator"}[30s]))"#;
     let memory_query = r#"avg(container_memory_rss{container=~"validator"})"#;
 
+    let swarm = swarm.read().await;
     let cpu_samples = swarm
         .query_range_metrics(cpu_query, start_time, end_time, None)
         .await?;
@@ -119,7 +126,7 @@ impl LatencyBreakdown {
 }
 
 pub async fn fetch_latency_breakdown(
-    swarm: &dyn Swarm,
+    swarm: Arc<tokio::sync::RwLock<Box<(dyn Swarm)>>>,
     start_time: u64,
     end_time: u64,
 ) -> anyhow::Result<LatencyBreakdown> {
@@ -131,6 +138,7 @@ pub async fn fetch_latency_breakdown(
     let qs_batch_to_pos_query = r#"sum(rate(quorum_store_batch_to_PoS_duration_sum{role=~"validator"}[1m])) / sum(rate(quorum_store_batch_to_PoS_duration_count{role=~"validator"}[1m]))"#;
     let qs_pos_to_proposal_query = r#"sum(rate(quorum_store_pos_to_pull_sum{role=~"validator"}[1m])) / sum(rate(quorum_store_pos_to_pull_count{role=~"validator"}[1m]))"#;
 
+    let swarm = swarm.read().await;
     let consensus_proposal_to_ordered_samples = swarm
         .query_range_metrics(
             consensus_proposal_to_ordered_query,
diff --git a/testsuite/forge/src/interface/swarm.rs b/testsuite/forge/src/interface/swarm.rs
index ce21f44f18f28..b2c3f501ba5ec 100644
--- a/testsuite/forge/src/interface/swarm.rs
+++ b/testsuite/forge/src/interface/swarm.rs
@@ -16,42 +16,29 @@ use aptos_sdk::types::PeerId;
 use futures::future::{join_all, try_join_all};
 use prometheus_http_query::response::{PromqlResult, Sample};
 use std::time::{Duration, Instant};
-use tokio::runtime::Runtime;
 
 /// Trait used to represent a running network comprised of Validators and FullNodes
 #[async_trait::async_trait]
-pub trait Swarm: Sync {
+pub trait Swarm: Sync + Send {
     /// Performs a health check on the entire swarm, ensuring all Nodes are Live and that no forks
     /// have occurred
-    async fn health_check(&mut self) -> Result<()>;
+    async fn health_check(&self) -> Result<()>;
 
     /// Returns an Iterator of references to all the Validators in the Swarm
     fn validators<'a>(&'a self) -> Box<dyn Iterator<Item = &'a dyn Validator> + 'a>;
 
-    /// Returns an Iterator of mutable references to all the Validators in the Swarm
-    fn validators_mut<'a>(&'a mut self) -> Box<dyn Iterator<Item = &'a mut dyn Validator> + 'a>;
-
     /// Returns a reference to the Validator with the provided PeerId
     fn validator(&self, id: PeerId) -> Option<&dyn Validator>;
 
-    /// Returns a mutable reference to the Validator with the provided PeerId
-    fn validator_mut(&mut self, id: PeerId) -> Option<&mut dyn Validator>;
-
     /// Upgrade a Validator to run specified `Version`
     async fn upgrade_validator(&mut self, id: PeerId, version: &Version) -> Result<()>;
 
     /// Returns an Iterator of references to all the FullNodes in the Swarm
     fn full_nodes<'a>(&'a self) -> Box<dyn Iterator<Item = &'a dyn FullNode> + 'a>;
 
-    /// Returns an Iterator of mutable references to all the FullNodes in the Swarm
-    fn full_nodes_mut<'a>(&'a mut self) -> Box<dyn Iterator<Item = &'a mut dyn FullNode> + 'a>;
-
     /// Returns a reference to the FullNode with the provided PeerId
     fn full_node(&self, id: PeerId) -> Option<&dyn FullNode>;
 
-    /// Returns a mutable reference to the FullNode with the provided PeerId
-    fn full_node_mut(&mut self, id: PeerId) -> Option<&mut dyn FullNode>;
-
     /// Adds a Validator to the swarm and returns the PeerId
     fn add_validator(&mut self, version: &Version, template: NodeConfig) -> Result<PeerId>;
 
@@ -79,7 +66,7 @@ pub trait Swarm: Sync {
     fn versions<'a>(&'a self) -> Box<dyn Iterator<Item = Version> + 'a>;
 
     /// Construct a ChainInfo from this Swarm
-    fn chain_info(&mut self) -> ChainInfo<'_>;
+    fn chain_info(&self) -> ChainInfo;
 
     fn logs_location(&mut self) -> String;
 
@@ -107,13 +94,13 @@ pub trait Swarm: Sync {
         timeout: Option<i64>,
     ) -> Result<Vec<Sample>>;
 
-    fn aptos_public_info(&mut self) -> AptosPublicInfo<'_> {
+    fn aptos_public_info(&self) -> AptosPublicInfo {
         self.chain_info().into_aptos_public_info()
     }
 
-    fn chain_info_for_node(&mut self, idx: usize) -> ChainInfo<'_>;
+    fn chain_info_for_node(&mut self, idx: usize) -> ChainInfo;
 
-    fn aptos_public_info_for_node(&mut self, idx: usize) -> AptosPublicInfo<'_> {
+    fn aptos_public_info_for_node(&mut self, idx: usize) -> AptosPublicInfo {
         self.chain_info_for_node(idx).into_aptos_public_info()
     }
 
@@ -202,12 +189,11 @@ pub trait SwarmExt: Swarm {
     }
 
     /// Perform a safety check, ensuring that no forks have occurred in the network.
-    fn fork_check(&self, epoch_duration: Duration) -> Result<()> {
-        let runtime = Runtime::new().unwrap();
-
+    async fn fork_check(&self, epoch_duration: Duration) -> Result<()> {
         // Lots of errors can actually occur after an epoch change so guarantee that we change epochs here
         // This can wait for 2x epoch to at least force the caller to be explicit about the epoch duration
-        runtime.block_on(self.wait_for_all_nodes_to_change_epoch(epoch_duration * 2))?;
+        self.wait_for_all_nodes_to_change_epoch(epoch_duration * 2)
+            .await?;
 
         let clients = self
             .validators()
@@ -215,16 +201,16 @@ pub trait SwarmExt: Swarm {
             .chain(self.full_nodes().map(|node| node.rest_client()))
             .collect::<Vec<_>>();
 
-        let versions = runtime
-            .block_on(try_join_all(
-                clients
-                    .iter()
-                    .map(|node| node.get_ledger_information())
-                    .collect::<Vec<_>>(),
-            ))?
-            .into_iter()
-            .map(|resp| resp.into_inner().version)
-            .collect::<Vec<u64>>();
+        let versions = try_join_all(
+            clients
+                .iter()
+                .map(|node| node.get_ledger_information())
+                .collect::<Vec<_>>(),
+        )
+        .await?
+        .into_iter()
+        .map(|resp| resp.into_inner().version)
+        .collect::<Vec<u64>>();
         let min_version = versions
             .iter()
             .min()
@@ -236,21 +222,14 @@ pub trait SwarmExt: Swarm {
             .copied()
             .ok_or_else(|| anyhow!("Unable to query nodes for their latest version"))?;
 
-        if !runtime.block_on(Self::are_root_hashes_equal_at_version(
-            &clients,
-            min_version,
-        ))? {
+        if !Self::are_root_hashes_equal_at_version(&clients, min_version).await? {
             return Err(anyhow!("Fork check failed"));
         }
 
-        runtime.block_on(
-            self.wait_for_all_nodes_to_catchup_to_version(max_version, Duration::from_secs(10)),
-        )?;
+        self.wait_for_all_nodes_to_catchup_to_version(max_version, Duration::from_secs(10))
+            .await?;
 
-        if !runtime.block_on(Self::are_root_hashes_equal_at_version(
-            &clients,
-            max_version,
-        ))? {
+        if !Self::are_root_hashes_equal_at_version(&clients, max_version).await? {
             return Err(anyhow!("Fork check failed"));
         }
 
@@ -307,10 +286,23 @@ pub trait SwarmExt: Swarm {
     }
 
     async fn wait_for_all_nodes_to_catchup_to_next(&self, timeout: Duration) -> Result<()> {
+        self.wait_for_all_nodes_to_catchup_to_future(timeout, 1)
+            .await
+    }
+
+    async fn wait_for_all_nodes_to_catchup_to_future(
+        &self,
+        timeout: Duration,
+        versions_to_sync_past: u64,
+    ) -> Result<()> {
         let clients = self.get_all_nodes_clients_with_names();
         let highest_synced_version = get_highest_synced_version(&clients).await?;
-        wait_for_all_nodes_to_catchup_to_version(&clients, highest_synced_version + 1, timeout)
-            .await
+        wait_for_all_nodes_to_catchup_to_version(
+            &clients,
+            highest_synced_version + versions_to_sync_past,
+            timeout,
+        )
+        .await
     }
 
     fn get_validator_clients_with_names(&self) -> Vec<(String, RestClient)> {
diff --git a/testsuite/forge/src/runner.rs b/testsuite/forge/src/runner.rs
index f4b15c9facdac..924353a1233bd 100644
--- a/testsuite/forge/src/runner.rs
+++ b/testsuite/forge/src/runner.rs
@@ -124,6 +124,7 @@ pub type OverrideNodeConfigFn = Arc<dyn Fn(&mut NodeConfig, &mut NodeConfig) + S
 pub struct NodeResourceOverride {
     pub cpu_cores: Option<usize>,
     pub memory_gib: Option<usize>,
+    pub storage_gib: Option<usize>,
 }
 
 pub struct ForgeConfig {
@@ -270,6 +271,7 @@ impl ForgeConfig {
         let validator_resource_override = self.validator_resource_override;
         let fullnode_resource_override = self.fullnode_resource_override;
 
+        // Override specific helm values. See reference: terraform/helm/aptos-node/values.yaml
         Some(Arc::new(move |helm_values: &mut serde_yaml::Value| {
             if let Some(override_config) = &validator_override_node_config {
                 helm_values["validator"]["config"] = override_config.get_yaml().unwrap();
@@ -304,6 +306,9 @@ impl ForgeConfig {
                 helm_values["validator"]["resources"]["limits"]["memory"] =
                     format!("{}Gi", memory_gib).into();
             }
+            if let Some(storage_gib) = validator_resource_override.storage_gib {
+                helm_values["validator"]["storage"]["size"] = format!("{}Gi", storage_gib).into();
+            }
             // fullnode resource overrides
             if let Some(cpu_cores) = fullnode_resource_override.cpu_cores {
                 helm_values["fullnode"]["resources"]["requests"]["cpu"] = cpu_cores.into();
@@ -315,6 +320,9 @@ impl ForgeConfig {
                 helm_values["fullnode"]["resources"]["limits"]["memory"] =
                     format!("{}Gi", memory_gib).into();
             }
+            if let Some(storage_gib) = fullnode_resource_override.storage_gib {
+                helm_values["fullnode"]["storage"]["size"] = format!("{}Gi", storage_gib).into();
+            }
         }))
     }
 
@@ -547,7 +555,7 @@ impl<'cfg, F: Factory> Forge<'cfg, F> {
             let initial_version = self.initial_version();
             // The genesis version should always match the initial node version
             let genesis_version = initial_version.clone();
-            let runtime = Runtime::new().unwrap();
+            let runtime = Runtime::new().unwrap(); // TODO: new multithreaded?
             let mut rng = ::rand::rngs::StdRng::from_seed(OsRng.gen());
             let mut swarm = runtime.block_on(self.factory.launch_swarm(
                 &mut rng,
@@ -586,16 +594,26 @@ impl<'cfg, F: Factory> Forge<'cfg, F> {
                 summary.handle_result(test.name().to_owned(), result)?;
             }
 
+            let logs_location = swarm.logs_location();
+            let swarm = Arc::new(tokio::sync::RwLock::new(swarm));
             for test in self.filter_tests(&self.tests.network_tests) {
-                let mut network_ctx = NetworkContext::new(
+                let network_ctx = NetworkContext::new(
                     CoreContext::from_rng(&mut rng),
-                    &mut *swarm,
+                    swarm.clone(),
                     &mut report,
                     self.global_duration,
                     self.tests.emit_job_request.clone(),
                     self.tests.success_criteria.clone(),
                 );
-                let result = run_test(|| test.run(&mut network_ctx));
+                let handle = network_ctx.runtime.handle().clone();
+                let _handle_context = handle.enter();
+                let network_ctx = NetworkContextSynchronizer::new(network_ctx, handle.clone());
+                let result = run_test(|| handle.block_on(test.run(network_ctx.clone())));
+                // explicitly keep network context in scope so that its created tokio Runtime drops after all the stuff has run.
+                let NetworkContextSynchronizer { ctx, handle } = network_ctx;
+                drop(handle);
+                let ctx = Arc::into_inner(ctx).unwrap().into_inner();
+                drop(ctx);
                 report.report_text(result.to_string());
                 summary.handle_result(test.name().to_owned(), result)?;
             }
@@ -606,7 +624,7 @@ impl<'cfg, F: Factory> Forge<'cfg, F> {
             io::stderr().flush()?;
             if !summary.success() {
                 println!();
-                println!("Swarm logs can be found here: {}", swarm.logs_location());
+                println!("Swarm logs can be found here: {}", logs_location);
             }
         }
 
diff --git a/testsuite/forge/src/success_criteria.rs b/testsuite/forge/src/success_criteria.rs
index 1bd1896d298c4..e592e914f50ff 100644
--- a/testsuite/forge/src/success_criteria.rs
+++ b/testsuite/forge/src/success_criteria.rs
@@ -9,16 +9,18 @@ use crate::{
     Swarm, SwarmExt, TestReport,
 };
 use anyhow::{bail, Context};
-use aptos::node::analyze::fetch_metadata::FetchMetadata;
-use aptos_sdk::types::PeerId;
+use aptos::node::analyze::{analyze_validators::AnalyzeValidators, fetch_metadata::FetchMetadata};
+use aptos_logger::info;
 use aptos_transaction_emitter_lib::{TxnStats, TxnStatsRate};
 use prometheus_http_query::response::Sample;
-use std::{collections::BTreeMap, time::Duration};
+use std::{collections::BTreeMap, sync::Arc, time::Duration};
 
 #[derive(Clone, Debug)]
 pub struct StateProgressThreshold {
-    pub max_no_progress_secs: f32,
-    pub max_round_gap: u64,
+    pub max_non_epoch_no_progress_secs: f32,
+    pub max_epoch_no_progress_secs: f32,
+    pub max_non_epoch_round_gap: u64,
+    pub max_epoch_round_gap: u64,
 }
 
 #[derive(Clone, Debug)]
@@ -34,6 +36,8 @@ pub struct MetricsThreshold {
     max: f64,
     // % of the data point that can breach the max threshold
     max_breach_pct: usize,
+
+    expect_empty: bool,
 }
 
 impl MetricsThreshold {
@@ -41,6 +45,15 @@ impl MetricsThreshold {
         Self {
             max,
             max_breach_pct,
+            expect_empty: false,
+        }
+    }
+
+    pub fn new_expect_empty() -> Self {
+        Self {
+            max: 0.0,
+            max_breach_pct: 0,
+            expect_empty: true,
         }
     }
 
@@ -48,14 +61,22 @@ impl MetricsThreshold {
         Self {
             max: max * 1024.0 * 1024.0 * 1024.0,
             max_breach_pct,
+            expect_empty: false,
         }
     }
 
     pub fn ensure_metrics_threshold(
         &self,
         metrics_name: &str,
-        metrics: &Vec<Sample>,
+        metrics: &[Sample],
     ) -> anyhow::Result<()> {
+        if self.expect_empty {
+            if !metrics.is_empty() {
+                bail!("Data found for metrics expected to be empty");
+            }
+            return Ok(());
+        }
+
         if metrics.is_empty() {
             bail!("Empty metrics provided");
         }
@@ -140,13 +161,13 @@ impl LatencyBreakdownThreshold {
 
 #[derive(Default, Clone, Debug)]
 pub struct SuccessCriteria {
-    pub min_avg_tps: usize,
+    pub min_avg_tps: f64,
     latency_thresholds: Vec<(Duration, LatencyType)>,
     latency_breakdown_thresholds: Option<LatencyBreakdownThreshold>,
     check_no_restarts: bool,
     check_no_errors: bool,
-    max_expired_tps: Option<usize>,
-    max_failed_submission_tps: Option<usize>,
+    max_expired_tps: Option<f64>,
+    max_failed_submission_tps: Option<f64>,
     wait_for_all_nodes_to_catchup: Option<Duration>,
     // Maximum amount of CPU cores and memory bytes used by the nodes.
     system_metrics_threshold: Option<SystemMetricsThreshold>,
@@ -155,6 +176,10 @@ pub struct SuccessCriteria {
 
 impl SuccessCriteria {
     pub fn new(min_avg_tps: usize) -> Self {
+        Self::new_float(min_avg_tps as f64)
+    }
+
+    pub fn new_float(min_avg_tps: f64) -> Self {
         Self {
             min_avg_tps,
             latency_thresholds: Vec::new(),
@@ -179,12 +204,12 @@ impl SuccessCriteria {
         self
     }
 
-    pub fn add_max_expired_tps(mut self, max_expired_tps: usize) -> Self {
+    pub fn add_max_expired_tps(mut self, max_expired_tps: f64) -> Self {
         self.max_expired_tps = Some(max_expired_tps);
         self
     }
 
-    pub fn add_max_failed_submission_tps(mut self, max_failed_submission_tps: usize) -> Self {
+    pub fn add_max_failed_submission_tps(mut self, max_failed_submission_tps: f64) -> Self {
         self.max_failed_submission_tps = Some(max_failed_submission_tps);
         self
     }
@@ -250,7 +275,7 @@ impl SuccessCriteriaChecker {
 
     pub async fn check_for_success(
         success_criteria: &SuccessCriteria,
-        swarm: &mut dyn Swarm,
+        swarm: Arc<tokio::sync::RwLock<Box<dyn Swarm>>>,
         report: &mut TestReport,
         stats: &TxnStats,
         window: Duration,
@@ -260,7 +285,7 @@ impl SuccessCriteriaChecker {
         start_version: u64,
         end_version: u64,
     ) -> anyhow::Result<()> {
-        println!(
+        info!(
             "End to end duration: {}s, performance measured for: {}s",
             window.as_secs(),
             stats.lasted.as_secs()
@@ -289,34 +314,42 @@ impl SuccessCriteriaChecker {
 
         if let Some(timeout) = success_criteria.wait_for_all_nodes_to_catchup {
             swarm
+                .read()
+                .await
                 .wait_for_all_nodes_to_catchup_to_next(timeout)
                 .await
                 .context("Failed waiting for all nodes to catchup to next version")?;
         }
 
         if success_criteria.check_no_restarts {
-            swarm
+            let swarm_read = swarm.read().await;
+            swarm_read
                 .ensure_no_validator_restart()
                 .await
                 .context("Failed ensuring no validator restarted")?;
-            swarm
+            swarm_read
                 .ensure_no_fullnode_restart()
                 .await
                 .context("Failed ensuring no fullnode restarted")?;
         }
 
         if success_criteria.check_no_errors {
-            Self::check_no_errors(swarm).await?;
+            Self::check_no_errors(swarm.clone()).await?;
         }
 
         if let Some(system_metrics_threshold) = success_criteria.system_metrics_threshold.clone() {
-            Self::check_system_metrics(swarm, start_time, end_time, system_metrics_threshold)
-                .await?;
+            Self::check_system_metrics(
+                swarm.clone(),
+                start_time,
+                end_time,
+                system_metrics_threshold,
+            )
+            .await?;
         }
 
         if let Some(chain_progress_threshold) = &success_criteria.chain_progress_check {
             Self::check_chain_progress(
-                swarm,
+                swarm.clone(),
                 report,
                 chain_progress_threshold,
                 start_version,
@@ -330,109 +363,93 @@ impl SuccessCriteriaChecker {
     }
 
     async fn check_chain_progress(
-        swarm: &mut dyn Swarm,
+        swarm: Arc<tokio::sync::RwLock<Box<dyn Swarm>>>,
         report: &mut TestReport,
         chain_progress_threshold: &StateProgressThreshold,
         start_version: u64,
         end_version: u64,
     ) -> anyhow::Result<()> {
         // Choose client with newest ledger version to fetch NewBlockEvents from:
-        let (_max_v, client) = swarm
-            .get_client_with_newest_ledger_version()
-            .await
-            .context("No clients replied in check_chain_progress")?;
+        let (_max_v, client) = {
+            swarm
+                .read()
+                .await
+                .get_client_with_newest_ledger_version()
+                .await
+                .context("No clients replied in check_chain_progress")?
+        };
 
         let epochs = FetchMetadata::fetch_new_block_events(&client, None, None)
             .await
             .unwrap();
 
-        let mut max_round_gap = 0;
-        let mut max_round_gap_version = 0;
-        let mut max_time_gap = 0;
-        let mut max_time_gap_version = 0;
-
-        let mut prev_block = None;
-        let mut prev_ts = 0;
-        let mut failed_from_nil = 0;
-        let mut previous_epooch = 0;
-        let mut previous_round = 0;
-        for block in epochs
-            .iter()
-            .flat_map(|epoch| epoch.blocks.iter())
-            .filter(|b| b.version > start_version && b.version < end_version)
-        {
-            let is_nil = block.event.proposer() == PeerId::ZERO;
+        let gap_info = AnalyzeValidators::analyze_gap(
+            epochs
+                .iter()
+                .flat_map(|epoch| epoch.blocks.iter())
+                .filter(|b| b.version > start_version && b.version < end_version),
+        );
 
-            let current_gap = if previous_epooch == block.event.epoch() {
-                block.event.round() - previous_round - 1
-            } else {
-                u64::from(!is_nil) + block.event.failed_proposer_indices().len() as u64
-            };
+        let gap_text = format!(
+            "Max non-epoch-change gap was: {} [limit {}], {} [limit {}].",
+            gap_info.non_epoch_round_gap.to_string_as_round(),
+            chain_progress_threshold.max_non_epoch_round_gap,
+            gap_info.non_epoch_time_gap.to_string_as_time(),
+            chain_progress_threshold.max_non_epoch_no_progress_secs,
+        );
 
-            if is_nil {
-                failed_from_nil += current_gap;
-            } else {
-                if prev_ts > 0 {
-                    let round_gap = current_gap + failed_from_nil;
-                    let time_gap = block.event.proposed_time() as i64 - prev_ts as i64;
-
-                    if time_gap < 0 {
-                        println!(
-                            "Clock went backwards? {}, {:?}, {:?}",
-                            time_gap, block, prev_block
-                        );
-                    }
-
-                    if round_gap > max_round_gap {
-                        max_round_gap = round_gap;
-                        max_round_gap_version = block.version;
-                    }
-                    if time_gap > max_time_gap as i64 {
-                        max_time_gap = time_gap as u64;
-                        max_time_gap_version = block.version;
-                    }
-                }
-
-                failed_from_nil = 0;
-                prev_ts = block.event.proposed_time();
-                prev_block = Some(block);
-            }
+        let epoch_gap_text = format!(
+            "Max epoch-change gap was: {} [limit {}], {} [limit {}].",
+            gap_info.epoch_round_gap.to_string_as_round(),
+            chain_progress_threshold.max_epoch_round_gap,
+            gap_info.epoch_time_gap.to_string_as_time(),
+            chain_progress_threshold.max_epoch_no_progress_secs,
+        );
 
-            previous_epooch = block.event.epoch();
-            previous_round = block.event.round();
-        }
+        info!(
+            max_non_epoch_round_gap = gap_info.non_epoch_round_gap.max_gap,
+            max_epoch_round_gap = gap_info.epoch_round_gap.max_gap,
+            max_non_epoch_time_gap = gap_info.non_epoch_time_gap.max_gap,
+            max_epoch_time_gap = gap_info.epoch_time_gap.max_gap,
+            "Max gap values",
+        );
 
-        let max_time_gap_secs = Duration::from_micros(max_time_gap).as_secs_f32();
+        report.report_text(gap_text.clone());
+        report.report_text(epoch_gap_text.clone());
 
-        let gap_text = format!(
-            "Max round gap was {} [limit {}] at version {}. Max no progress secs was {} [limit {}] at version {}.",
-            max_round_gap,
-            chain_progress_threshold.max_round_gap,
-            max_round_gap_version,
-            max_time_gap_secs,
-            chain_progress_threshold.max_no_progress_secs,
-            max_time_gap_version,
-        );
+        if gap_info.non_epoch_round_gap.max_gap.round() as u64
+            > chain_progress_threshold.max_non_epoch_round_gap
+            || gap_info.non_epoch_time_gap.max_gap
+                > chain_progress_threshold.max_non_epoch_no_progress_secs
+        {
+            bail!(
+                "Failed non-epoch-change chain progress check. {}",
+                &gap_text
+            );
+        }
+        info!("Passed non-epoch-change progress check. {}", gap_text);
 
-        if max_round_gap > chain_progress_threshold.max_round_gap
-            || max_time_gap_secs > chain_progress_threshold.max_no_progress_secs
+        if gap_info.epoch_round_gap.max_gap.round() as u64
+            > chain_progress_threshold.max_epoch_round_gap
+            || gap_info.epoch_time_gap.max_gap > chain_progress_threshold.max_epoch_no_progress_secs
         {
-            bail!("Failed chain progress check. {}", gap_text);
-        } else {
-            println!("Passed progress check. {}", gap_text);
-            report.report_text(gap_text);
+            bail!(
+                "Failed epoch-change chain progress check. {}",
+                &epoch_gap_text
+            );
         }
+        info!("Passed epoch-change progress check. {}", epoch_gap_text);
 
         Ok(())
     }
 
     pub fn check_tps(
-        min_avg_tps: usize,
+        min_avg_tps: f64,
         stats_rate: &TxnStatsRate,
         traffic_name_addition: &String,
     ) -> anyhow::Result<()> {
         let avg_tps = stats_rate.committed;
-        if avg_tps < min_avg_tps as f64 {
+        if avg_tps < min_avg_tps {
             bail!(
                 "TPS requirement{} failed. Average TPS {}, minimum TPS requirement {}. Full stats: {}",
                 traffic_name_addition,
@@ -441,7 +458,7 @@ impl SuccessCriteriaChecker {
                 stats_rate,
             )
         } else {
-            println!(
+            info!(
                 "TPS is {} and is within limit of {}",
                 stats_rate.committed, min_avg_tps
             );
@@ -450,14 +467,14 @@ impl SuccessCriteriaChecker {
     }
 
     fn check_max_value(
-        max_config: Option<usize>,
+        max_config: Option<f64>,
         stats_rate: &TxnStatsRate,
         value: f64,
         value_desc: &str,
         traffic_name_addition: &String,
     ) -> anyhow::Result<()> {
         if let Some(max) = max_config {
-            if value > max as f64 {
+            if value > max {
                 bail!(
                     "{} requirement{} failed. {} TPS: average {}, maximum requirement {}. Full stats: {}",
                     value_desc,
@@ -468,7 +485,7 @@ impl SuccessCriteriaChecker {
                     stats_rate,
                 )
             } else {
-                println!(
+                info!(
                     "{} TPS is {} and is below max limit of {}",
                     value_desc, value, max
                 );
@@ -480,9 +497,9 @@ impl SuccessCriteriaChecker {
     }
 
     pub fn check_throughput(
-        min_avg_tps: usize,
-        max_expired_config: Option<usize>,
-        max_failed_submission_config: Option<usize>,
+        min_avg_tps: f64,
+        max_expired_config: Option<f64>,
+        max_failed_submission_config: Option<f64>,
         stats_rate: &TxnStatsRate,
         traffic_name_addition: &String,
     ) -> anyhow::Result<()> {
@@ -530,7 +547,7 @@ impl SuccessCriteriaChecker {
                     .to_string(),
                 );
             } else {
-                println!(
+                info!(
                     "{:?} latency{} is {}s and is within limit of {}s",
                     latency_type,
                     traffic_name_addition,
@@ -546,7 +563,9 @@ impl SuccessCriteriaChecker {
         }
     }
 
-    async fn check_no_errors(swarm: &mut dyn Swarm) -> anyhow::Result<()> {
+    async fn check_no_errors(
+        swarm: Arc<tokio::sync::RwLock<Box<dyn Swarm>>>,
+    ) -> anyhow::Result<()> {
         let error_count = fetch_error_metrics(swarm).await?;
         if error_count > 0 {
             bail!(
@@ -554,13 +573,13 @@ impl SuccessCriteriaChecker {
                 error_count
             );
         } else {
-            println!("No error!() found in validator logs");
+            info!("No error!() found in validator logs");
             Ok(())
         }
     }
 
     async fn check_system_metrics(
-        swarm: &mut dyn Swarm,
+        swarm: Arc<tokio::sync::RwLock<Box<dyn Swarm>>>,
         start_time: i64,
         end_time: i64,
         threshold: SystemMetricsThreshold,
diff --git a/testsuite/forge/src/test_utils/consensus_utils.rs b/testsuite/forge/src/test_utils/consensus_utils.rs
index 9eba7b81fdb60..6115a5c2e60de 100644
--- a/testsuite/forge/src/test_utils/consensus_utils.rs
+++ b/testsuite/forge/src/test_utils/consensus_utils.rs
@@ -1,7 +1,7 @@
 // Copyright © Aptos Foundation
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::{wait_for_all_nodes_to_catchup_to_version, Swarm, SwarmExt};
+use crate::{wait_for_all_nodes_to_catchup_to_version, AptosPublicInfo};
 use anyhow::{bail, Context, Result};
 use aptos_config::config::DEFAULT_MAX_PAGE_SIZE;
 use aptos_rest_client::Client as RestClient;
@@ -53,14 +53,16 @@ async fn get_node_state(validator_client: &RestClient) -> NodeState {
 /// I.e. if part is shorter than how long it takes for empty block to be
 /// generated, we can make sure one block gets created on every part.
 pub async fn test_consensus_fault_tolerance(
-    swarm: &mut dyn Swarm,
+    // swarm: Arc<tokio::sync::RwLock<Box<(dyn Swarm)>>>,
+    validator_clients: Vec<(String, RestClient)>,
+    public_info: AptosPublicInfo,
     cycles: usize,
     cycle_duration_s: f32,
     parts_in_cycle: usize,
-    mut failure_injection: Box<dyn FailureInjection>,
+    mut failure_injection: Box<dyn FailureInjection + Send>,
     // (cycle, executed_epochs, executed_rounds, executed_transactions, current_state, previous_state)
     mut check_cycle: Box<
-        dyn FnMut(usize, u64, u64, u64, Vec<NodeState>, Vec<NodeState>) -> Result<()>,
+        dyn FnMut(usize, u64, u64, u64, Vec<NodeState>, Vec<NodeState>) -> Result<()> + Send,
     >,
     new_epoch_on_cycle: bool,
     // Instead of failing on first check, we check the full run,
@@ -68,8 +70,6 @@ pub async fn test_consensus_fault_tolerance(
     // Can allow us to better see if state would've gotten resolved by itself, etc.
     raise_check_error_at_the_end: bool,
 ) -> Result<()> {
-    let validator_clients = swarm.get_validator_clients_with_names();
-
     async fn get_all_states(validator_clients: &[(String, RestClient)]) -> Vec<NodeState> {
         join_all(
             validator_clients
@@ -99,14 +99,11 @@ pub async fn test_consensus_fault_tolerance(
 
         let cur = get_all_states(&validator_clients).await;
 
-        let epochs = cur.iter().map(|s| s.epoch).max().unwrap()
-            - previous.iter().map(|s| s.epoch).max().unwrap();
-        let rounds = cur
-            .iter()
-            .map(|s| s.round)
-            .max()
-            .unwrap()
-            .saturating_sub(previous.iter().map(|s| s.round).max().unwrap());
+        let (cur_epoch, cur_round) = cur.iter().map(|s| (s.epoch, s.round)).max().unwrap();
+        let (prev_epoch, prev_round) = previous.iter().map(|s| (s.epoch, s.round)).max().unwrap();
+        let epochs = cur_epoch.saturating_sub(prev_epoch);
+        let rounds = cur_round.saturating_sub(prev_round);
+
         let transactions = cur.iter().map(|s| s.version).max().unwrap()
             - previous.iter().map(|s| s.version).max().unwrap();
 
@@ -145,7 +142,7 @@ pub async fn test_consensus_fault_tolerance(
         }
 
         if new_epoch_on_cycle {
-            swarm.aptos_public_info().reconfig().await;
+            public_info.reconfig().await;
         }
     }
 
@@ -240,7 +237,7 @@ impl FailureInjection for NoFailureInjection {
     async fn clear(&mut self, _: &[(String, RestClient)]) {}
 }
 
-pub fn no_failure_injection() -> Box<dyn FailureInjection> {
+pub fn no_failure_injection() -> Box<dyn FailureInjection + Send> {
     Box::new(NoFailureInjection {})
 }
 
diff --git a/testsuite/fuzzer/.cargo/config.toml b/testsuite/fuzzer/.cargo/config.toml
index 94b9a7ade260b..b9891568c790f 100644
--- a/testsuite/fuzzer/.cargo/config.toml
+++ b/testsuite/fuzzer/.cargo/config.toml
@@ -4,4 +4,5 @@ target-applies-to-host = false
 rustflags = ["--cfg", "tokio_unstable", "-C", "force-frame-pointers=yes", "-C", "force-unwind-tables=yes"]
 
 [host.x86_64-unknown-linux-gnu]
-rustflags = ["--cfg", "tokio_unstable", "-C", "link-arg=-fuse-ld=lld", "-C", "force-frame-pointers=yes", "-C", "force-unwind-tables=yes", "-C", "target-feature=+sse4.2"]
+linker = "clang"
+rustflags = ["--cfg", "tokio_unstable", "-C", "link-args=-fuse-ld=gold -Wl,--no-keep-files-mapped -Wl,--no-keep-memory -Wl,--no-threads", "-C", "codegen-units=1", "-C", "force-frame-pointers=yes", "-C", "force-unwind-tables=yes", "-C", "target-feature=+sse4.2"]
diff --git a/testsuite/fuzzer/Cargo.toml b/testsuite/fuzzer/Cargo.toml
index 5f07a38412d24..1afea076541cd 100644
--- a/testsuite/fuzzer/Cargo.toml
+++ b/testsuite/fuzzer/Cargo.toml
@@ -2,6 +2,6 @@
 name = "fuzzer"
 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]
diff --git a/testsuite/fuzzer/Patches/001FakeExecutorDisableMultiThread.patch b/testsuite/fuzzer/Patches/001FakeExecutorDisableMultiThread.patch
deleted file mode 100644
index a33097516b3ed..0000000000000
--- a/testsuite/fuzzer/Patches/001FakeExecutorDisableMultiThread.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-diff --git a/aptos-move/aptos-vm/src/aptos_vm.rs b/aptos-move/aptos-vm/src/aptos_vm.rs
-index fee3fcdadd..fae1653841 100644
---- a/aptos-move/aptos-vm/src/aptos_vm.rs
-+++ b/aptos-move/aptos-vm/src/aptos_vm.rs
-@@ -114,7 +114,7 @@ static TIMED_FEATURE_OVERRIDE: OnceCell<TimedFeatureOverride> = OnceCell::new();
- pub static RAYON_EXEC_POOL: Lazy<Arc<rayon::ThreadPool>> = Lazy::new(|| {
-     Arc::new(
-         rayon::ThreadPoolBuilder::new()
--            .num_threads(num_cpus::get())
-+            .num_threads(1)
-             .thread_name(|index| format!("par_exec-{}", index))
-             .build()
-             .unwrap(),
-diff --git a/aptos-move/e2e-tests/src/executor.rs b/aptos-move/e2e-tests/src/executor.rs
-index 76b94ce0e9..e8e38f72a0 100644
---- a/aptos-move/e2e-tests/src/executor.rs
-+++ b/aptos-move/e2e-tests/src/executor.rs
-@@ -116,9 +116,9 @@ pub enum ExecutorMode {
- pub struct FakeExecutor {
-     data_store: FakeDataStore,
-     event_store: Vec<ContractEvent>,
--    executor_thread_pool: Arc<rayon::ThreadPool>,
-+    //executor_thread_pool: Arc<rayon::ThreadPool>,
-     block_time: u64,
--    executed_output: Option<GoldenOutputs>,
-+    //executed_output: Option<GoldenOutputs>,
-     trace_dir: Option<PathBuf>,
-     rng: KeyGen,
-     /// If set, determines whether or not to execute a comparison test with the parallel
-@@ -138,18 +138,18 @@ pub enum GasMeterType {
- impl FakeExecutor {
-     /// Creates an executor from a genesis [`WriteSet`].
-     pub fn from_genesis(write_set: &WriteSet, chain_id: ChainId) -> Self {
--        let executor_thread_pool = Arc::new(
--            rayon::ThreadPoolBuilder::new()
--                .num_threads(num_cpus::get())
--                .build()
--                .unwrap(),
--        );
-+        //let executor_thread_pool = Arc::new(
-+        //    rayon::ThreadPoolBuilder::new()
-+        //        .num_threads(num_cpus::get())
-+        //        .build()
-+        //        .unwrap(),
-+        //);
-         let mut executor = FakeExecutor {
-             data_store: FakeDataStore::default(),
-             event_store: Vec::new(),
--            executor_thread_pool,
-+            //executor_thread_pool,
-             block_time: 0,
--            executed_output: None,
-+            //executed_output: None,
-             trace_dir: None,
-             rng: KeyGen::from_seed(RNG_SEED),
-             executor_mode: None,
-@@ -219,18 +219,18 @@ impl FakeExecutor {
- 
-     /// Creates an executor in which no genesis state has been applied yet.
-     pub fn no_genesis() -> Self {
--        let executor_thread_pool = Arc::new(
--            rayon::ThreadPoolBuilder::new()
--                .num_threads(num_cpus::get())
--                .build()
--                .unwrap(),
--        );
-+        //let executor_thread_pool = Arc::new(
-+        //    rayon::ThreadPoolBuilder::new()
-+        //        .num_threads(num_cpus::get())
-+        //        .build()
-+        //        .unwrap(),
-+        //);
-         FakeExecutor {
-             data_store: FakeDataStore::default(),
-             event_store: Vec::new(),
--            executor_thread_pool,
-+            //executor_thread_pool,
-             block_time: 0,
--            executed_output: None,
-+            //executed_output: None,
-             trace_dir: None,
-             rng: KeyGen::from_seed(RNG_SEED),
-             executor_mode: None,
-@@ -243,7 +243,7 @@ impl FakeExecutor {
-         // 'test_name' includes ':' in the names, lets re-write these to be '_'s so that these
-         // files can persist on windows machines.
-         let file_name = test_name.replace(':', "_");
--        self.executed_output = Some(GoldenOutputs::new(&file_name));
-+        //self.executed_output = Some(GoldenOutputs::new(&file_name));
-         self.set_tracing(test_name, file_name)
-     }
- 
-@@ -251,7 +251,7 @@ impl FakeExecutor {
-         // 'test_name' includes ':' in the names, lets re-write these to be '_'s so that these
-         // files can persist on windows machines.
-         let file_name = test_name.replace(':', "_");
--        self.executed_output = Some(GoldenOutputs::new_at_path(PathBuf::from(path), &file_name));
-+        //self.executed_output = Some(GoldenOutputs::new_at_path(PathBuf::from(path), &file_name));
-         self.set_tracing(test_name, file_name)
-     }
- 
-@@ -475,18 +475,19 @@ impl FakeExecutor {
-         txn_block: &[SignatureVerifiedTransaction],
-         onchain_config: BlockExecutorConfigFromOnchain,
-     ) -> Result<Vec<TransactionOutput>, VMStatus> {
--        BlockAptosVM::execute_block::<_, NoOpTransactionCommitHook<AptosTransactionOutput, VMStatus>>(
--            self.executor_thread_pool.clone(),
--            txn_block,
--            &self.data_store,
--            BlockExecutorConfig {
--                local: BlockExecutorLocalConfig {
--                    concurrency_level: usize::min(4, num_cpus::get()),
--                },
--                onchain: onchain_config,
--            },
--            None,
--        ).map(BlockOutput::into_transaction_outputs_forced)
-+        //BlockAptosVM::execute_block::<_, NoOpTransactionCommitHook<AptosTransactionOutput, VMStatus>>(
-+        //    self.executor_thread_pool.clone(),
-+        //    txn_block,
-+        //    &self.data_store,
-+        //    BlockExecutorConfig {
-+        //        local: BlockExecutorLocalConfig {
-+        //            concurrency_level: usize::min(4, num_cpus::get()),
-+        //        },
-+        //        onchain: onchain_config,
-+        //    },
-+        //    None,
-+        //).map(BlockOutput::into_transaction_outputs_forced)
-+        todo!()
-     }
- 
-     pub fn execute_transaction_block(
-@@ -554,9 +555,9 @@ impl FakeExecutor {
- 
-         let output = sequential_output.or(parallel_output).unwrap();
- 
--        if let Some(logger) = &self.executed_output {
--            logger.log(format!("{:#?}\n", output).as_str());
--        }
-+        //if let Some(logger) = &self.executed_output {
-+        //    logger.log(format!("{:#?}\n", output).as_str());
-+        //}
- 
-         // dump serialized transaction output after execution, if tracing
-         if let Some(trace_dir) = &self.trace_dir {
diff --git a/testsuite/fuzzer/fuzz.sh b/testsuite/fuzzer/fuzz.sh
index bc4181541a95b..a932286fc6a70 100755
--- a/testsuite/fuzzer/fuzz.sh
+++ b/testsuite/fuzzer/fuzz.sh
@@ -4,7 +4,7 @@ export RUSTFLAGS="${RUSTFLAGS} --cfg tokio_unstable"
 export EXTRAFLAGS="-Ztarget-applies-to-host -Zhost-config"
 
 # GDRIVE format https://docs.google.com/uc?export=download&id=DOCID
-CORPUS_ZIPS=("https://storage.googleapis.com/aptos-core-corpora/move_aptosvm_publish_and_run_seed_corpus.zip")
+CORPUS_ZIPS=("https://storage.googleapis.com/aptos-core-corpora/move_aptosvm_publish_and_run_seed_corpus.zip" "https://storage.googleapis.com/aptos-core-corpora/move_aptosvm_publish_seed_corpus.zip")
 
 function info() {
     echo "[info] $1"
@@ -17,7 +17,8 @@ function error() {
 
 function cargo_fuzz() {
     # Nightly version control
-    NIGHTLY_VERSION="nightly-2024-01-01"
+    # Pin nightly-2024-02-12 because of https://github.com/google/oss-fuzz/issues/11626
+    NIGHTLY_VERSION="nightly-2024-02-12"
     rustup install $NIGHTLY_VERSION
     if [ -z "$1" ]; then
         error "error using cargo()"
@@ -108,6 +109,10 @@ function build-oss-fuzz() {
     export CXXFLAGS_EXTRA="-stdlib=libc++"
     export CXXFLAGS="$CFLAGS $CXXFLAGS_EXTRA"
 
+    # component versions good to have in logs
+    ld.lld --version
+    clang --version
+
     if ! build all ./target; then
         env
         error "Build failed. Exiting."
@@ -177,7 +182,7 @@ function run() {
         fi
     fi
     info "Running $fuzz_target"
-    cargo_fuzz run $fuzz_target $testcase
+    cargo_fuzz run --sanitizer none $fuzz_target $testcase
 }
 
 function test() {
diff --git a/testsuite/fuzzer/fuzz/Cargo.toml b/testsuite/fuzzer/fuzz/Cargo.toml
index bba236c4930e6..e5054199095f9 100644
--- a/testsuite/fuzzer/fuzz/Cargo.toml
+++ b/testsuite/fuzzer/fuzz/Cargo.toml
@@ -19,11 +19,13 @@ libfuzzer-sys = "0.4"
 move-binary-format = { workspace = true, features = ["fuzzing"] }
 move-bytecode-verifier = { workspace = true }
 move-core-types = { workspace = true, features = ["fuzzing"] }
-move-vm-runtime = { workspace = true }
 move-vm-types = { workspace = true, features = ["fuzzing"] }
 once_cell = { workspace = true }
 rayon = { workspace = true }
 
+[features]
+disabled = []
+
 [[bin]]
 name = "move_bytecode_verifier_code_unit"
 path = "fuzz_targets/move/bytecode_verifier_code_unit.rs"
@@ -41,27 +43,37 @@ name = "move_value_deserialize"
 path = "fuzz_targets/move/value_deserialize.rs"
 test = false
 doc = false
+required-features = ["disabled"]
 
 [[bin]]
 name = "move_move_value_deserialize"
 path = "fuzz_targets/move/move_value_deserialize.rs"
 test = false
 doc = false
+required-features = ["disabled"]
 
 [[bin]]
 name = "move_move_value_decorate"
 path = "fuzz_targets/move/move_value_decorate.rs"
 test = false
 doc = false
+required-features = ["disabled"]
 
 [[bin]]
 name = "signed_transaction_deserialize"
 path = "fuzz_targets/signed_transaction_deserialize.rs"
 test = false
 doc = false
+required-features = ["disabled"]
 
 [[bin]]
 name = "move_aptosvm_publish_and_run"
 path = "fuzz_targets/move/aptosvm_publish_and_run.rs"
 test = false
 doc = false
+
+[[bin]]
+name = "move_aptosvm_publish"
+path = "fuzz_targets/move/aptosvm_publish.rs"
+test = false
+doc = false
diff --git a/testsuite/fuzzer/fuzz/fuzz_targets/move/aptosvm_publish.rs b/testsuite/fuzzer/fuzz/fuzz_targets/move/aptosvm_publish.rs
new file mode 100644
index 0000000000000..ca532a4f11258
--- /dev/null
+++ b/testsuite/fuzzer/fuzz/fuzz_targets/move/aptosvm_publish.rs
@@ -0,0 +1,134 @@
+#![no_main]
+
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+mod utils;
+use aptos_language_e2e_tests::{data_store::GENESIS_CHANGE_SET_HEAD, executor::FakeExecutor};
+use aptos_types::{chain_id::ChainId, write_set::WriteSet};
+use aptos_vm::AptosVM;
+use libfuzzer_sys::{fuzz_target, Corpus};
+use move_binary_format::{
+    access::ModuleAccess,
+    deserializer::DeserializerConfig,
+    file_format::{CompiledModule, CompiledScript},
+};
+use once_cell::sync::Lazy;
+use std::{
+    collections::{BTreeMap, HashSet},
+    sync::Arc,
+};
+use utils::{publish_group, sort_by_deps, ExecVariant, RunnableState};
+
+// genesis write set generated once for each fuzzing session
+static VM: Lazy<WriteSet> = Lazy::new(|| GENESIS_CHANGE_SET_HEAD.write_set().clone());
+
+const TEST_UPGRADE: bool = true;
+const FUZZER_CONCURRENCY_LEVEL: usize = 1;
+static TP: Lazy<Arc<rayon::ThreadPool>> = Lazy::new(|| {
+    Arc::new(
+        rayon::ThreadPoolBuilder::new()
+            .num_threads(FUZZER_CONCURRENCY_LEVEL)
+            .build()
+            .unwrap(),
+    )
+});
+
+fn run_case(mut input: RunnableState) -> Result<(), Corpus> {
+    tdbg!(&input);
+
+    let deserializer_config = DeserializerConfig::default();
+
+    for m in input.dep_modules.iter_mut() {
+        // m.metadata = vec![]; // we could optimize metadata to only contain aptos metadata
+        // m.version = VERSION_MAX;
+
+        // reject bad modules fast lite
+        let mut module_code: Vec<u8> = vec![];
+        m.serialize(&mut module_code).map_err(|_| Corpus::Keep)?;
+        CompiledModule::deserialize_with_config(&module_code, &deserializer_config)
+            .map_err(|_| Corpus::Keep)?;
+    }
+
+    if let ExecVariant::Script {
+        script: s,
+        type_args: _,
+        args: _,
+    } = &input.exec_variant
+    {
+        // reject bad scripts fast lite
+        let mut script_code: Vec<u8> = vec![];
+        s.serialize(&mut script_code).map_err(|_| Corpus::Keep)?;
+        CompiledScript::deserialize_with_config(&script_code, &deserializer_config)
+            .map_err(|_| Corpus::Keep)?;
+    }
+
+    // check no duplicates
+    let mset: HashSet<_> = input.dep_modules.iter().map(|m| m.self_id()).collect();
+    if mset.len() != input.dep_modules.len() {
+        return Err(Corpus::Keep);
+    }
+
+    // topologically order modules {
+    let all_modules = input.dep_modules.clone();
+    let mut map = all_modules
+        .into_iter()
+        .map(|m| (m.self_id(), m))
+        .collect::<BTreeMap<_, _>>();
+    let mut order = vec![];
+    for id in map.keys() {
+        let mut visited = HashSet::new();
+        sort_by_deps(&map, &mut order, id.clone(), &mut visited)?;
+    }
+    // }
+
+    // group same address modules in packages. keep local ordering.
+    let mut packages = vec![];
+    for cur_package_id in order.iter() {
+        let mut cur = vec![];
+        if !map.contains_key(cur_package_id) {
+            continue;
+        }
+        // this makes sure we keep the order in packages
+        for id in order.iter() {
+            // check if part of current package
+            if id.address() == cur_package_id.address() {
+                if let Some(module) = map.remove(cur_package_id) {
+                    cur.push(module);
+                }
+            }
+        }
+        packages.push(cur)
+    }
+
+    AptosVM::set_concurrency_level_once(FUZZER_CONCURRENCY_LEVEL);
+    let mut vm = FakeExecutor::from_genesis_with_existing_thread_pool(
+        &VM,
+        ChainId::mainnet(),
+        Arc::clone(&TP),
+    )
+    .set_not_parallel();
+
+    // publish all packages
+    for group in packages {
+        let sender = *group[0].address();
+        let acc = vm.new_account_at(sender);
+
+        // First publish attempt
+        publish_group(&mut vm, &acc, &group, 0)?;
+
+        // Test upgrade path
+        if TEST_UPGRADE {
+            // Second publish attempt
+            publish_group(&mut vm, &acc, &group, 1)?;
+        }
+
+        tdbg!("published");
+    }
+
+    Ok(())
+}
+
+fuzz_target!(|fuzz_data: RunnableState| -> Corpus {
+    run_case(fuzz_data).err().unwrap_or(Corpus::Keep)
+});
diff --git a/testsuite/fuzzer/fuzz/fuzz_targets/move/aptosvm_publish_and_run.rs b/testsuite/fuzzer/fuzz/fuzz_targets/move/aptosvm_publish_and_run.rs
index e0e5775d3b49a..20301e8db6d98 100644
--- a/testsuite/fuzzer/fuzz/fuzz_targets/move/aptosvm_publish_and_run.rs
+++ b/testsuite/fuzzer/fuzz/fuzz_targets/move/aptosvm_publish_and_run.rs
@@ -3,10 +3,6 @@
 // Copyright © Aptos Foundation
 // SPDX-License-Identifier: Apache-2.0
 
-use aptos_cached_packages::aptos_stdlib::code_publish_package_txn;
-use aptos_framework::natives::code::{
-    ModuleMetadata, MoveOption, PackageDep, PackageMetadata, UpgradePolicy,
-};
 use aptos_language_e2e_tests::{
     account::Account, data_store::GENESIS_CHANGE_SET_HEAD, executor::FakeExecutor,
 };
@@ -19,111 +15,26 @@ use aptos_types::{
     write_set::WriteSet,
 };
 use aptos_vm::AptosVM;
-use arbitrary::Arbitrary;
 use libfuzzer_sys::{fuzz_target, Corpus};
 use move_binary_format::{
     access::ModuleAccess,
+    deserializer::DeserializerConfig,
     errors::VMError,
-    file_format::{CompiledModule, CompiledScript, FunctionDefinitionIndex, SignatureToken},
-};
-use move_core_types::{
-    language_storage::{ModuleId, TypeTag},
-    value::MoveValue,
-    vm_status::{StatusCode, StatusType, VMStatus},
+    file_format::{CompiledModule, CompiledScript, SignatureToken},
 };
-use move_vm_runtime::config::VMConfig;
+use move_bytecode_verifier::VerifierConfig;
+use move_core_types::vm_status::{StatusCode, StatusType};
 use once_cell::sync::Lazy;
 use std::{
-    collections::{BTreeMap, BTreeSet, HashSet},
-    convert::TryInto,
+    collections::{BTreeMap, HashSet},
     sync::Arc,
+    time::Instant,
+};
+mod utils;
+use utils::{
+    check_for_invariant_violation, publish_group, sort_by_deps, Authenticator, ExecVariant,
+    RunnableState,
 };
-
-#[derive(Debug, Arbitrary, Eq, PartialEq, Clone, Copy)]
-pub enum FundAmount {
-    Zero,
-    Poor,
-    Rich,
-}
-
-#[derive(Debug, Arbitrary, Eq, PartialEq, Clone, Copy)]
-pub struct UserAccount {
-    is_inited_and_funded: bool,
-    fund: FundAmount,
-}
-
-#[derive(Debug, Arbitrary, Eq, PartialEq, Clone)]
-pub enum Authenticator {
-    Ed25519 {
-        sender: UserAccount,
-    },
-    MultiAgent {
-        sender: UserAccount,
-        secondary_signers: Vec<UserAccount>,
-    },
-    FeePayer {
-        sender: UserAccount,
-        secondary_signers: Vec<UserAccount>,
-        fee_payer: UserAccount,
-    },
-}
-
-impl UserAccount {
-    fn fund_amount(&self) -> u64 {
-        match self.fund {
-            FundAmount::Zero => 0,
-            FundAmount::Poor => 1_000,
-            FundAmount::Rich => 1_000_000_000_000_000,
-        }
-    }
-
-    fn convert_account(&self, vm: &mut FakeExecutor) -> Account {
-        if self.is_inited_and_funded {
-            vm.create_accounts(1, self.fund_amount(), 0).remove(0)
-        } else {
-            Account::new()
-        }
-    }
-}
-
-impl Authenticator {
-    fn sender(&self) -> UserAccount {
-        match self {
-            Authenticator::Ed25519 { sender } => *sender,
-            Authenticator::MultiAgent {
-                sender,
-                secondary_signers: _,
-            } => *sender,
-            Authenticator::FeePayer {
-                sender,
-                secondary_signers: _,
-                fee_payer: _,
-            } => *sender,
-        }
-    }
-}
-
-#[derive(Debug, Arbitrary, Eq, PartialEq, Clone)]
-pub enum ExecVariant {
-    Script {
-        script: CompiledScript,
-        type_args: Vec<TypeTag>,
-        args: Vec<MoveValue>,
-    },
-    CallFunction {
-        module: ModuleId,
-        function: FunctionDefinitionIndex,
-        type_args: Vec<TypeTag>,
-        args: Vec<Vec<u8>>,
-    },
-}
-
-#[derive(Debug, Arbitrary, Eq, PartialEq, Clone)]
-pub struct RunnableState {
-    pub dep_modules: Vec<CompiledModule>,
-    pub exec_variant: ExecVariant,
-    pub tx_auth_type: Authenticator,
-}
 
 // genesis write set generated once for each fuzzing session
 static VM: Lazy<WriteSet> = Lazy::new(|| GENESIS_CHANGE_SET_HEAD.write_set().clone());
@@ -138,66 +49,9 @@ static TP: Lazy<Arc<rayon::ThreadPool>> = Lazy::new(|| {
     )
 });
 
-// small debug macro which can be enabled or disabled
-const DEBUG: bool = false;
-macro_rules! tdbg {
-    () => {
-        ()
-    };
-    ($val:expr $(,)?) => {
-        if DEBUG {
-            dbg!($val)
-        } else {
-            ($val)
-        }
-    };
-    ($($val:expr),+ $(,)?) => {
-        if DEBUG {
-            dbg!($(($val)),+,)
-        } else {
-            ($(($val)),+,)
-        }
-    };
-}
-
 const MAX_TYPE_PARAMETER_VALUE: u16 = 64 / 4 * 16; // third_party/move/move-bytecode-verifier/src/signature_v2.rs#L1306-L1312
 
-// used for ordering modules topologically
-fn sort_by_deps(
-    map: &BTreeMap<ModuleId, CompiledModule>,
-    order: &mut Vec<ModuleId>,
-    id: ModuleId,
-    visited: &mut HashSet<ModuleId>,
-) -> Result<(), Corpus> {
-    if visited.contains(&id) {
-        return Err(Corpus::Keep);
-    }
-    visited.insert(id.clone());
-    if order.contains(&id) {
-        return Ok(());
-    }
-    let compiled = &map.get(&id).unwrap();
-    for dep in compiled.immediate_dependencies() {
-        // Only consider deps which are actually in this package. Deps for outside
-        // packages are considered fine because of package deployment order. Note
-        // that because of this detail, we can't use existing topsort from Move utils.
-        if map.contains_key(&dep) {
-            sort_by_deps(map, order, dep, visited)?;
-        }
-    }
-    order.push(id);
-    Ok(())
-}
-
-// panic to catch invariant violations
-fn check_for_invariant_violation(e: VMStatus) {
-    if e.status_type() == StatusType::InvariantViolation {
-        // known false positive
-        if e.message() != Some(&"moving container with dangling references".to_string()) {
-            panic!("invariant violation {:?}", e);
-        }
-    }
-}
+const EXECUTION_TIME_GAS_RATIO: u8 = 35;
 
 fn check_for_invariant_violation_vmerror(e: VMError) {
     if e.status_type() == StatusType::InvariantViolation
@@ -233,58 +87,14 @@ fn filter_modules(input: &RunnableState) -> Result<(), Corpus> {
     Ok(())
 }
 
-fn publish_transaction_payload(modules: &[CompiledModule]) -> TransactionPayload {
-    let modules_metadatas: Vec<_> = modules
-        .iter()
-        .map(|cm| ModuleMetadata {
-            name: cm.name().to_string(),
-            source: vec![],
-            source_map: vec![],
-            extension: MoveOption::default(),
-        })
-        .collect();
-
-    let all_immediate_deps: Vec<_> = modules
-        .iter()
-        .flat_map(|cm| cm.immediate_dependencies())
-        .map(|mi| PackageDep {
-            account: mi.address,
-            package_name: mi.name.to_string(),
-        })
-        .collect::<BTreeSet<_>>() // leave only uniques
-        .into_iter()
-        .filter(|c| &c.account != modules[0].address()) // filter out package itself
-        .collect::<Vec<_>>();
-
-    let metadata = PackageMetadata {
-        name: "fuzz_package".to_string(),
-        upgrade_policy: UpgradePolicy::compat(), // TODO: currently does not matter. Maybe fuzz compat checks specifically at some point.
-        upgrade_number: 1,
-        source_digest: "".to_string(),
-        manifest: vec![],
-        modules: modules_metadatas,
-        deps: all_immediate_deps,
-        extension: MoveOption::default(),
-    };
-    let pkg_metadata = bcs::to_bytes(&metadata).expect("PackageMetadata must serialize");
-    let mut pkg_code: Vec<Vec<u8>> = vec![];
-    for module in modules {
-        let mut module_code: Vec<u8> = vec![];
-        module
-            .serialize(&mut module_code)
-            .expect("Module must serialize");
-        pkg_code.push(module_code);
-    }
-    code_publish_package_txn(pkg_metadata, pkg_code)
-}
-
 fn run_case(mut input: RunnableState) -> Result<(), Corpus> {
     tdbg!(&input);
 
     // filter modules
     filter_modules(&input)?;
 
-    let vm_config = VMConfig::production();
+    let verifier_config = VerifierConfig::production();
+    let deserializer_config = DeserializerConfig::default();
 
     for m in input.dep_modules.iter_mut() {
         // m.metadata = vec![]; // we could optimize metadata to only contain aptos metadata
@@ -293,15 +103,12 @@ fn run_case(mut input: RunnableState) -> Result<(), Corpus> {
         // reject bad modules fast
         let mut module_code: Vec<u8> = vec![];
         m.serialize(&mut module_code).map_err(|_| Corpus::Keep)?;
-        let m_de =
-            CompiledModule::deserialize_with_config(&module_code, &vm_config.deserializer_config)
-                .map_err(|_| Corpus::Keep)?;
-        move_bytecode_verifier::verify_module_with_config(&vm_config.verifier, &m_de).map_err(
-            |e| {
-                check_for_invariant_violation_vmerror(e);
-                Corpus::Keep
-            },
-        )?
+        let m_de = CompiledModule::deserialize_with_config(&module_code, &deserializer_config)
+            .map_err(|_| Corpus::Keep)?;
+        move_bytecode_verifier::verify_module_with_config(&verifier_config, &m_de).map_err(|e| {
+            check_for_invariant_violation_vmerror(e);
+            Corpus::Keep
+        })?
     }
 
     if let ExecVariant::Script {
@@ -313,15 +120,12 @@ fn run_case(mut input: RunnableState) -> Result<(), Corpus> {
         // reject bad scripts fast
         let mut script_code: Vec<u8> = vec![];
         s.serialize(&mut script_code).map_err(|_| Corpus::Keep)?;
-        let s_de =
-            CompiledScript::deserialize_with_config(&script_code, &vm_config.deserializer_config)
-                .map_err(|_| Corpus::Keep)?;
-        move_bytecode_verifier::verify_script_with_config(&vm_config.verifier, &s_de).map_err(
-            |e| {
-                check_for_invariant_violation_vmerror(e);
-                Corpus::Keep
-            },
-        )?
+        let s_de = CompiledScript::deserialize_with_config(&script_code, &deserializer_config)
+            .map_err(|_| Corpus::Keep)?;
+        move_bytecode_verifier::verify_script_with_config(&verifier_config, &s_de).map_err(|e| {
+            check_for_invariant_violation_vmerror(e);
+            Corpus::Keep
+        })?
     }
 
     // check no duplicates
@@ -374,51 +178,7 @@ fn run_case(mut input: RunnableState) -> Result<(), Corpus> {
     for group in packages {
         let sender = *group[0].address();
         let acc = vm.new_account_at(sender);
-        let tx = acc
-            .transaction()
-            .gas_unit_price(100)
-            .sequence_number(0)
-            .payload(publish_transaction_payload(&group))
-            .sign();
-
-        tdbg!("publishing");
-        let res = vm
-            .execute_block(vec![tx])
-            .map_err(|e| {
-                check_for_invariant_violation(e);
-                Corpus::Keep
-            })?
-            .pop()
-            .expect("expected 1 output");
-        // if error exit gracefully
-        tdbg!(&res);
-        let status = match tdbg!(res.status()) {
-            TransactionStatus::Keep(status) => status,
-            TransactionStatus::Discard(e) => {
-                if e.status_type() == StatusType::InvariantViolation {
-                    panic!("invariant violation {:?}", e);
-                }
-                return Err(Corpus::Keep);
-            },
-            _ => return Err(Corpus::Keep),
-        };
-        tdbg!(&status);
-        // apply write set to commit published packages
-        vm.apply_write_set(res.write_set());
-        match tdbg!(status) {
-            ExecutionStatus::Success => (),
-            ExecutionStatus::MiscellaneousError(e) => {
-                if let Some(e) = e {
-                    if e.status_type() == StatusType::InvariantViolation {
-                        panic!("invariant violation {:?}", e);
-                    }
-                }
-                return Err(Corpus::Keep);
-            },
-            _ => return Err(Corpus::Keep),
-        };
-
-        tdbg!("published");
+        publish_group(&mut vm, &acc, &group, 0)?;
     }
 
     let sender_acc = if true {
@@ -429,6 +189,7 @@ fn run_case(mut input: RunnableState) -> Result<(), Corpus> {
         // only create sender pub/priv key. do not initialize
         Account::new()
     };
+
     // build tx
     let tx = match input.exec_variant.clone() {
         ExecVariant::Script {
@@ -495,7 +256,6 @@ fn run_case(mut input: RunnableState) -> Result<(), Corpus> {
                 )))
         },
     };
-
     let raw_tx = tx.raw();
     let tx = match input.tx_auth_type {
         Authenticator::Ed25519 { sender: _ } => raw_tx
@@ -567,7 +327,11 @@ fn run_case(mut input: RunnableState) -> Result<(), Corpus> {
         }
         old_res = Some(res);
     }
-    let res = vm.execute_block(vec![tx]);
+
+    let now = Instant::now();
+    let res = vm.execute_block(vec![tx.clone()]);
+    let elapsed = now.elapsed();
+
     // check main execution as well
     if let Some(old_res) = old_res {
         assert!(old_res == res);
@@ -608,6 +372,30 @@ fn run_case(mut input: RunnableState) -> Result<(), Corpus> {
         _ => return Err(Corpus::Keep),
     };
 
+    let fee = res.try_extract_fee_statement().unwrap().unwrap();
+
+    // EXECUTION_TIME_GAS_RATIO is a ratio between execution time and gas used. If the ratio is higher than EXECUTION_TIME_GAS_ratio, we consider the gas usage as unexpected.
+    // EXPERIMENTAL: This very sensible to excution enviroment, e.g. local run, OSS-Fuzz. It may cause false positive. Real data from production does not apply to this ratio.
+    // We only want to catch big unexpected gas usage.
+    if (elapsed.as_millis() / (fee.execution_gas_used() + fee.io_gas_used()) as u128)
+        > EXECUTION_TIME_GAS_RATIO as u128
+    {
+        if std::env::var("DEBUG").is_ok() {
+            tdbg!(
+                "Potential unexpected gas usage detected. Execution time: {:?}, Gas burned: {:?}",
+                elapsed,
+                fee.execution_gas_used() + fee.io_gas_used()
+            );
+            tdbg!("Transaction: {:?}", tx);
+        } else {
+            panic!(
+                "Potential unexpected gas usage detected. Execution time: {:?}, Gas burned: {:?}",
+                elapsed,
+                fee.execution_gas_used() + fee.io_gas_used()
+            );
+        }
+    }
+
     Ok(())
 }
 
diff --git a/testsuite/fuzzer/fuzz/fuzz_targets/move/utils.rs b/testsuite/fuzzer/fuzz/fuzz_targets/move/utils.rs
index 694957794ed84..cfc1d1971dea5 100644
--- a/testsuite/fuzzer/fuzz/fuzz_targets/move/utils.rs
+++ b/testsuite/fuzzer/fuzz/fuzz_targets/move/utils.rs
@@ -1,10 +1,271 @@
 // Copyright © Aptos Foundation
 // SPDX-License-Identifier: Apache-2.0
 
-use move_binary_format::file_format::CompiledModule;
-use move_core_types::value::{MoveStructLayout, MoveTypeLayout};
+#![allow(dead_code)]
+
+use aptos_cached_packages::aptos_stdlib::code_publish_package_txn;
+use aptos_framework::natives::code::{
+    ModuleMetadata, MoveOption, PackageDep, PackageMetadata, UpgradePolicy,
+};
+use aptos_language_e2e_tests::{account::Account, executor::FakeExecutor};
+use aptos_types::transaction::{ExecutionStatus, TransactionPayload, TransactionStatus};
+use arbitrary::Arbitrary;
+use libfuzzer_sys::Corpus;
+use move_binary_format::{
+    access::ModuleAccess,
+    file_format::{CompiledModule, CompiledScript, FunctionDefinitionIndex},
+};
+use move_core_types::{
+    language_storage::{ModuleId, TypeTag},
+    value::{MoveStructLayout, MoveTypeLayout, MoveValue},
+    vm_status::{StatusType, VMStatus},
+};
+use std::collections::{BTreeMap, BTreeSet, HashSet};
+
+#[macro_export]
+macro_rules! tdbg {
+    () => {
+        ()
+    };
+    ($val:expr $(,)?) => {
+        {
+            if std::env::var("DEBUG").is_ok() {
+                dbg!($val)
+            } else {
+                $val
+            }
+        }
+    };
+    ($($val:expr),+ $(,)?) => {
+        {
+            if std::env::var("DEBUG").is_ok() {
+                dbg!($($val),+)
+            } else {
+                ($($val),+)
+            }
+        }
+    };
+}
+
+#[derive(Debug, Arbitrary, Eq, PartialEq, Clone, Copy)]
+pub enum FundAmount {
+    Zero,
+    Poor,
+    Rich,
+}
+
+#[derive(Debug, Arbitrary, Eq, PartialEq, Clone, Copy)]
+pub struct UserAccount {
+    is_inited_and_funded: bool,
+    fund: FundAmount,
+}
+
+#[derive(Debug, Arbitrary, Eq, PartialEq, Clone)]
+pub enum Authenticator {
+    Ed25519 {
+        sender: UserAccount,
+    },
+    MultiAgent {
+        sender: UserAccount,
+        secondary_signers: Vec<UserAccount>,
+    },
+    FeePayer {
+        sender: UserAccount,
+        secondary_signers: Vec<UserAccount>,
+        fee_payer: UserAccount,
+    },
+}
+
+impl UserAccount {
+    pub fn fund_amount(&self) -> u64 {
+        match self.fund {
+            FundAmount::Zero => 0,
+            FundAmount::Poor => 1_000,
+            FundAmount::Rich => 1_000_000_000_000_000,
+        }
+    }
+
+    pub fn convert_account(&self, vm: &mut FakeExecutor) -> Account {
+        if self.is_inited_and_funded {
+            vm.create_accounts(1, self.fund_amount(), 0).remove(0)
+        } else {
+            Account::new()
+        }
+    }
+}
+
+impl Authenticator {
+    pub fn sender(&self) -> UserAccount {
+        match self {
+            Authenticator::Ed25519 { sender } => *sender,
+            Authenticator::MultiAgent {
+                sender,
+                secondary_signers: _,
+            } => *sender,
+            Authenticator::FeePayer {
+                sender,
+                secondary_signers: _,
+                fee_payer: _,
+            } => *sender,
+        }
+    }
+}
+
+#[derive(Debug, Arbitrary, Eq, PartialEq, Clone)]
+pub enum ExecVariant {
+    Script {
+        script: CompiledScript,
+        type_args: Vec<TypeTag>,
+        args: Vec<MoveValue>,
+    },
+    CallFunction {
+        module: ModuleId,
+        function: FunctionDefinitionIndex,
+        type_args: Vec<TypeTag>,
+        args: Vec<Vec<u8>>,
+    },
+}
+
+#[derive(Debug, Arbitrary, Eq, PartialEq, Clone)]
+pub struct RunnableState {
+    pub dep_modules: Vec<CompiledModule>,
+    pub exec_variant: ExecVariant,
+    pub tx_auth_type: Authenticator,
+}
+
+// used for ordering modules topologically
+pub(crate) fn sort_by_deps(
+    map: &BTreeMap<ModuleId, CompiledModule>,
+    order: &mut Vec<ModuleId>,
+    id: ModuleId,
+    visited: &mut HashSet<ModuleId>,
+) -> Result<(), Corpus> {
+    if visited.contains(&id) {
+        return Err(Corpus::Keep);
+    }
+    visited.insert(id.clone());
+    if order.contains(&id) {
+        return Ok(());
+    }
+    let compiled = &map.get(&id).unwrap();
+    for dep in compiled.immediate_dependencies() {
+        // Only consider deps which are actually in this package. Deps for outside
+        // packages are considered fine because of package deployment order. Note
+        // that because of this detail, we can't use existing topsort from Move utils.
+        if map.contains_key(&dep) {
+            sort_by_deps(map, order, dep, visited)?;
+        }
+    }
+    order.push(id);
+    Ok(())
+}
+
+fn publish_transaction_payload(modules: &[CompiledModule]) -> TransactionPayload {
+    let modules_metadatas: Vec<_> = modules
+        .iter()
+        .map(|cm| ModuleMetadata {
+            name: cm.name().to_string(),
+            source: vec![],
+            source_map: vec![],
+            extension: MoveOption::default(),
+        })
+        .collect();
+
+    let all_immediate_deps: Vec<_> = modules
+        .iter()
+        .flat_map(|cm| cm.immediate_dependencies())
+        .map(|mi| PackageDep {
+            account: mi.address,
+            package_name: mi.name.to_string(),
+        })
+        .collect::<BTreeSet<_>>() // leave only uniques
+        .into_iter()
+        .filter(|c| &c.account != modules[0].address()) // filter out package itself
+        .collect::<Vec<_>>();
+
+    let metadata = PackageMetadata {
+        name: "fuzz_package".to_string(),
+        upgrade_policy: UpgradePolicy::compat(), // TODO: currently does not matter. Maybe fuzz compat checks specifically at some point.
+        upgrade_number: 1,
+        source_digest: "".to_string(),
+        manifest: vec![],
+        modules: modules_metadatas,
+        deps: all_immediate_deps,
+        extension: MoveOption::default(),
+    };
+    let pkg_metadata = bcs::to_bytes(&metadata).expect("PackageMetadata must serialize");
+    let mut pkg_code: Vec<Vec<u8>> = vec![];
+    for module in modules {
+        let mut module_code: Vec<u8> = vec![];
+        module
+            .serialize(&mut module_code)
+            .expect("Module must serialize");
+        pkg_code.push(module_code);
+    }
+    code_publish_package_txn(pkg_metadata, pkg_code)
+}
+
+// panic to catch invariant violations
+pub(crate) fn check_for_invariant_violation(e: VMStatus) {
+    if e.status_type() == StatusType::InvariantViolation {
+        // known false positive
+        if e.message() != Some(&"moving container with dangling references".to_string()) {
+            panic!("invariant violation {:?}", e);
+        }
+    }
+}
+
+pub(crate) fn publish_group(
+    vm: &mut FakeExecutor,
+    acc: &Account,
+    group: &[CompiledModule],
+    sequence_number: u64,
+) -> Result<(), Corpus> {
+    let tx = acc
+        .transaction()
+        .gas_unit_price(100)
+        .sequence_number(sequence_number)
+        .payload(publish_transaction_payload(group))
+        .sign();
+
+    tdbg!("publishing");
+    let res = vm
+        .execute_block(vec![tx])
+        .map_err(|e| {
+            check_for_invariant_violation(e);
+            Corpus::Keep
+        })?
+        .pop()
+        .expect("expected 1 output");
+    // if error exit gracefully
+    tdbg!(&res);
+    let status = match tdbg!(res.status()) {
+        TransactionStatus::Keep(status) => status,
+        TransactionStatus::Discard(e) => {
+            if e.status_type() == StatusType::InvariantViolation {
+                panic!("invariant violation {:?}", e);
+            }
+            return Err(Corpus::Keep);
+        },
+        _ => return Err(Corpus::Keep),
+    };
+    tdbg!(&status);
+    // apply write set to commit published packages
+    vm.apply_write_set(res.write_set());
+    match tdbg!(status) {
+        ExecutionStatus::Success => Ok(()),
+        ExecutionStatus::MiscellaneousError(e) => {
+            if let Some(e) = e {
+                if e.status_type() == StatusType::InvariantViolation {
+                    panic!("invariant violation {:?}", e);
+                }
+            }
+            Err(Corpus::Keep)
+        },
+        _ => Err(Corpus::Keep),
+    }
+}
 
-#[allow(dead_code)]
 pub(crate) fn is_valid_layout(layout: &MoveTypeLayout) -> bool {
     use MoveTypeLayout as L;
 
@@ -14,18 +275,22 @@ pub(crate) fn is_valid_layout(layout: &MoveTypeLayout) -> bool {
         },
 
         L::Vector(layout) | L::Native(_, layout) => is_valid_layout(layout),
-        L::Struct(struct_layout) => {
-            if !matches!(struct_layout, MoveStructLayout::Runtime(_))
-                || struct_layout.fields().is_empty()
-            {
+        L::Struct(MoveStructLayout::RuntimeVariants(variants)) => {
+            variants.iter().all(|v| v.iter().all(is_valid_layout))
+        },
+        L::Struct(MoveStructLayout::Runtime(fields)) => {
+            if fields.is_empty() {
                 return false;
             }
-            struct_layout.fields().iter().all(is_valid_layout)
+            fields.iter().all(is_valid_layout)
+        },
+        L::Struct(_) => {
+            // decorated layouts not supported
+            false
         },
     }
 }
 
-#[allow(dead_code)]
 pub(crate) fn compiled_module_serde(module: &CompiledModule) -> Result<(), ()> {
     let mut blob = vec![];
     module.serialize(&mut blob).map_err(|_| ())?;
diff --git a/testsuite/fuzzer/google-oss-fuzz/project.yaml b/testsuite/fuzzer/google-oss-fuzz/project.yaml
index 51d3f32f85f2f..ab4f813d852aa 100644
--- a/testsuite/fuzzer/google-oss-fuzz/project.yaml
+++ b/testsuite/fuzzer/google-oss-fuzz/project.yaml
@@ -8,7 +8,7 @@ auto_ccs:
   - "andrea.cappa@aptoslabs.com"
   - "marco.ilardi@aptoslabs.com"
 sanitizers:
-  - address
+  - none
 fuzzing_engines:
   - libfuzzer
 coverage_extra_args: -ignore-filename-regex=.*/rustc/.*
\ No newline at end of file
diff --git a/testsuite/generate-format/src/api.rs b/testsuite/generate-format/src/api.rs
index 6d22991341573..ff32bd50b3263 100644
--- a/testsuite/generate-format/src/api.rs
+++ b/testsuite/generate-format/src/api.rs
@@ -20,7 +20,10 @@ use aptos_types::{
         state_value::{PersistedStateValueMetadata, StateValueMetadata},
     },
     transaction,
-    transaction::authenticator::{AccountAuthenticator, TransactionAuthenticator},
+    transaction::{
+        authenticator::{AccountAuthenticator, TransactionAuthenticator},
+        block_epilogue::BlockEpiloguePayload,
+    },
     validator_txn::ValidatorTransaction,
     vm_status::AbortLocation,
     write_set,
@@ -102,10 +105,12 @@ pub fn get_registry() -> Result<Registry> {
     tracer.trace_type::<language_storage::TypeTag>(&samples)?;
     tracer.trace_type::<ValidatorTransaction>(&samples)?;
     tracer.trace_type::<BlockMetadataExt>(&samples)?;
+    tracer.trace_type::<BlockEpiloguePayload>(&samples)?;
     tracer.trace_type::<transaction::Transaction>(&samples)?;
     tracer.trace_type::<transaction::TransactionArgument>(&samples)?;
     tracer.trace_type::<transaction::TransactionPayload>(&samples)?;
     tracer.trace_type::<transaction::WriteSetPayload>(&samples)?;
+    tracer.trace_type::<transaction::BlockEpiloguePayload>(&samples)?;
     tracer.trace_type::<StateKey>(&samples)?;
     tracer.trace_type::<transaction::ExecutionStatus>(&samples)?;
     tracer.trace_type::<TransactionAuthenticator>(&samples)?;
diff --git a/testsuite/generate-format/src/aptos.rs b/testsuite/generate-format/src/aptos.rs
index 3d0d4800cca2a..0fa55466b8cdc 100644
--- a/testsuite/generate-format/src/aptos.rs
+++ b/testsuite/generate-format/src/aptos.rs
@@ -19,6 +19,7 @@ use aptos_types::{
         state_value::{PersistedStateValueMetadata, StateValueMetadata},
     },
     transaction,
+    transaction::block_epilogue::BlockEpiloguePayload,
     validator_txn::ValidatorTransaction,
     write_set,
 };
@@ -98,10 +99,12 @@ pub fn get_registry() -> Result<Registry> {
     tracer.trace_type::<language_storage::TypeTag>(&samples)?;
     tracer.trace_type::<ValidatorTransaction>(&samples)?;
     tracer.trace_type::<BlockMetadataExt>(&samples)?;
+    tracer.trace_type::<BlockEpiloguePayload>(&samples)?;
     tracer.trace_type::<transaction::Transaction>(&samples)?;
     tracer.trace_type::<transaction::TransactionArgument>(&samples)?;
     tracer.trace_type::<transaction::TransactionPayload>(&samples)?;
     tracer.trace_type::<transaction::WriteSetPayload>(&samples)?;
+    tracer.trace_type::<transaction::BlockEpiloguePayload>(&samples)?;
     tracer.trace_type::<StateKey>(&samples)?;
     tracer.trace_type::<PersistedStateValueMetadata>(&samples)?;
 
diff --git a/testsuite/generate-format/src/consensus.rs b/testsuite/generate-format/src/consensus.rs
index 0a36c8fc9f099..50db48dcc165f 100644
--- a/testsuite/generate-format/src/consensus.rs
+++ b/testsuite/generate-format/src/consensus.rs
@@ -19,6 +19,7 @@ use aptos_types::{
         state_value::{PersistedStateValueMetadata, StateValueMetadata},
     },
     transaction,
+    transaction::block_epilogue::BlockEpiloguePayload,
     validator_txn::ValidatorTransaction,
     write_set,
 };
@@ -97,10 +98,12 @@ pub fn get_registry() -> Result<Registry> {
     tracer.trace_type::<language_storage::TypeTag>(&samples)?;
     tracer.trace_type::<ValidatorTransaction>(&samples)?;
     tracer.trace_type::<BlockMetadataExt>(&samples)?;
+    tracer.trace_type::<BlockEpiloguePayload>(&samples)?;
     tracer.trace_type::<transaction::Transaction>(&samples)?;
     tracer.trace_type::<transaction::TransactionArgument>(&samples)?;
     tracer.trace_type::<transaction::TransactionPayload>(&samples)?;
     tracer.trace_type::<transaction::WriteSetPayload>(&samples)?;
+    tracer.trace_type::<transaction::BlockEpiloguePayload>(&samples)?;
     tracer.trace_type::<transaction::authenticator::AccountAuthenticator>(&samples)?;
     tracer.trace_type::<transaction::authenticator::TransactionAuthenticator>(&samples)?;
     tracer.trace_type::<transaction::authenticator::AnyPublicKey>(&samples)?;
@@ -116,6 +119,7 @@ pub fn get_registry() -> Result<Registry> {
     tracer.trace_type::<aptos_consensus::network_interface::CommitMessage>(&samples)?;
     tracer.trace_type::<aptos_consensus_types::block_data::BlockType>(&samples)?;
     tracer.trace_type::<aptos_consensus_types::block_retrieval::BlockRetrievalStatus>(&samples)?;
+    tracer.trace_type::<aptos_consensus_types::payload::PayloadExecutionLimit>(&samples)?;
     tracer.trace_type::<aptos_consensus_types::common::Payload>(&samples)?;
 
     // aliases within StructTag
diff --git a/testsuite/generate-format/src/lib.rs b/testsuite/generate-format/src/lib.rs
index a2e2add7c3faa..47aaf8afc229e 100644
--- a/testsuite/generate-format/src/lib.rs
+++ b/testsuite/generate-format/src/lib.rs
@@ -53,7 +53,7 @@ impl Corpus {
         match result {
             Ok(registry) => registry,
             Err(error) => {
-                panic!("{}:{}", error, error.explanation());
+                panic!("[corpus {:?}] {}:{}", self, error, error.explanation());
             },
         }
     }
diff --git a/testsuite/generate-format/tests/staged/api.yaml b/testsuite/generate-format/tests/staged/api.yaml
index cc9975a84cf2f..530b8e34c726b 100644
--- a/testsuite/generate-format/tests/staged/api.yaml
+++ b/testsuite/generate-format/tests/staged/api.yaml
@@ -112,6 +112,24 @@ AssertionSignature:
 BitVec:
   STRUCT:
     - inner: BYTES
+BlockEndInfo:
+  ENUM:
+    0:
+      V0:
+        STRUCT:
+          - block_gas_limit_reached: BOOL
+          - block_output_limit_reached: BOOL
+          - block_effective_block_gas_units: U64
+          - block_approx_output_size: U64
+BlockEpiloguePayload:
+  ENUM:
+    0:
+      V0:
+        STRUCT:
+          - block_id:
+              TYPENAME: HashValue
+          - block_end_info:
+              TYPENAME: BlockEndInfo
 BlockMetadata:
   STRUCT:
     - id:
@@ -551,6 +569,10 @@ Transaction:
       BlockMetadataExt:
         NEWTYPE:
           TYPENAME: BlockMetadataExt
+    6:
+      BlockEpilogue:
+        NEWTYPE:
+          TYPENAME: BlockEpiloguePayload
 TransactionArgument:
   ENUM:
     0:
@@ -584,6 +606,9 @@ TransactionArgument:
           TUPLEARRAY:
             CONTENT: U8
             SIZE: 32
+    9:
+      Serialized:
+        NEWTYPE: BYTES
 TransactionAuthenticator:
   ENUM:
     0:
diff --git a/testsuite/generate-format/tests/staged/aptos.yaml b/testsuite/generate-format/tests/staged/aptos.yaml
index f3c116dc51afd..c51844f21185d 100644
--- a/testsuite/generate-format/tests/staged/aptos.yaml
+++ b/testsuite/generate-format/tests/staged/aptos.yaml
@@ -100,6 +100,24 @@ AssertionSignature:
 BitVec:
   STRUCT:
     - inner: BYTES
+BlockEndInfo:
+  ENUM:
+    0:
+      V0:
+        STRUCT:
+          - block_gas_limit_reached: BOOL
+          - block_output_limit_reached: BOOL
+          - block_effective_block_gas_units: U64
+          - block_approx_output_size: U64
+BlockEpiloguePayload:
+  ENUM:
+    0:
+      V0:
+        STRUCT:
+          - block_id:
+              TYPENAME: HashValue
+          - block_end_info:
+              TYPENAME: BlockEndInfo
 BlockMetadata:
   STRUCT:
     - id:
@@ -483,6 +501,10 @@ Transaction:
       BlockMetadataExt:
         NEWTYPE:
           TYPENAME: BlockMetadataExt
+    6:
+      BlockEpilogue:
+        NEWTYPE:
+          TYPENAME: BlockEpiloguePayload
 TransactionArgument:
   ENUM:
     0:
@@ -516,6 +538,9 @@ TransactionArgument:
           TUPLEARRAY:
             CONTENT: U8
             SIZE: 32
+    9:
+      Serialized:
+        NEWTYPE: BYTES
 TransactionAuthenticator:
   ENUM:
     0:
diff --git a/testsuite/generate-format/tests/staged/consensus.yaml b/testsuite/generate-format/tests/staged/consensus.yaml
index 5c985efd64af5..b45da4c399d50 100644
--- a/testsuite/generate-format/tests/staged/consensus.yaml
+++ b/testsuite/generate-format/tests/staged/consensus.yaml
@@ -138,6 +138,11 @@ BatchPayload:
     - txns:
         SEQ:
           TYPENAME: SignedTransaction
+BatchPointer:
+  STRUCT:
+    - batch_summary:
+        SEQ:
+          TYPENAME: BatchInfo
 BatchRequest:
   STRUCT:
     - epoch: U64
@@ -174,6 +179,24 @@ BlockData:
         TYPENAME: QuorumCert
     - block_type:
         TYPENAME: BlockType
+BlockEndInfo:
+  ENUM:
+    0:
+      V0:
+        STRUCT:
+          - block_gas_limit_reached: BOOL
+          - block_output_limit_reached: BOOL
+          - block_effective_block_gas_units: U64
+          - block_approx_output_size: U64
+BlockEpiloguePayload:
+  ENUM:
+    0:
+      V0:
+        STRUCT:
+          - block_id:
+              TYPENAME: HashValue
+          - block_end_info:
+              TYPENAME: BlockEndInfo
 BlockInfo:
   STRUCT:
     - epoch: U64
@@ -387,6 +410,10 @@ ConsensusMsg:
       BatchResponseV2:
         NEWTYPE:
           TYPENAME: BatchResponse
+    18:
+      OrderVoteMsg:
+        NEWTYPE:
+          TYPENAME: OrderVoteMsg
 ContractEvent:
   ENUM:
     0:
@@ -524,6 +551,17 @@ IdCommitment:
   NEWTYPESTRUCT: BYTES
 Identifier:
   NEWTYPESTRUCT: STR
+InlineBatch:
+  STRUCT:
+    - batch_info:
+        TYPENAME: BatchInfo
+    - transactions:
+        SEQ:
+          TYPENAME: SignedTransaction
+InlineBatches:
+  NEWTYPESTRUCT:
+    SEQ:
+      TYPENAME: InlineBatch
 JWKMoveStruct:
   STRUCT:
     - variant:
@@ -609,6 +647,36 @@ OpenIdSig:
         TYPENAME: Pepper
     - idc_aud_val:
         OPTION: STR
+OptQuorumStorePayload:
+  ENUM:
+    0:
+      V1:
+        NEWTYPE:
+          TYPENAME: OptQuorumStorePayloadV1
+OptQuorumStorePayloadV1:
+  STRUCT:
+    - inline_batches:
+        TYPENAME: InlineBatches
+    - opt_batches:
+        TYPENAME: BatchPointer
+    - proofs:
+        TYPENAME: BatchPointer
+    - execution_limits:
+        TYPENAME: PayloadExecutionLimit
+OrderVote:
+  STRUCT:
+    - author:
+        TYPENAME: AccountAddress
+    - ledger_info:
+        TYPENAME: LedgerInfo
+    - signature:
+        TYPENAME: Signature
+OrderVoteMsg:
+  STRUCT:
+    - order_vote:
+        TYPENAME: OrderVote
+    - quorum_cert:
+        TYPENAME: QuorumCert
 PartialAuthenticatorAssertionResponse:
   STRUCT:
     - signature:
@@ -640,6 +708,17 @@ Payload:
                     TYPENAME: SignedTransaction
           - TYPENAME: ProofWithData
           - OPTION: U64
+    4:
+      OptQuorumStore:
+        NEWTYPE:
+          TYPENAME: OptQuorumStorePayload
+PayloadExecutionLimit:
+  ENUM:
+    0:
+      None: UNIT
+    1:
+      MaxTransactionsToExecute:
+        NEWTYPE: U64
 Pepper:
   NEWTYPESTRUCT:
     TUPLEARRAY:
@@ -829,9 +908,9 @@ SyncInfo:
         TYPENAME: QuorumCert
     - highest_ordered_cert:
         OPTION:
-          TYPENAME: QuorumCert
+          TYPENAME: WrappedLedgerInfo
     - highest_commit_cert:
-        TYPENAME: QuorumCert
+        TYPENAME: WrappedLedgerInfo
     - highest_2chain_timeout_cert:
         OPTION:
           TYPENAME: TwoChainTimeoutCertificate
@@ -864,6 +943,10 @@ Transaction:
       BlockMetadataExt:
         NEWTYPE:
           TYPENAME: BlockMetadataExt
+    6:
+      BlockEpilogue:
+        NEWTYPE:
+          TYPENAME: BlockEpiloguePayload
 TransactionArgument:
   ENUM:
     0:
@@ -897,6 +980,9 @@ TransactionArgument:
           TUPLEARRAY:
             CONTENT: U8
             SIZE: 32
+    9:
+      Serialized:
+        NEWTYPE: BYTES
 TransactionAuthenticator:
   ENUM:
     0:
@@ -1051,6 +1137,12 @@ VoteMsg:
         TYPENAME: Vote
     - sync_info:
         TYPENAME: SyncInfo
+WrappedLedgerInfo:
+  STRUCT:
+    - vote_data:
+        TYPENAME: VoteData
+    - signed_ledger_info:
+        TYPENAME: LedgerInfoWithSignatures
 WriteOp:
   ENUM:
     0:
diff --git a/testsuite/generate-format/tests/staged/network.yaml b/testsuite/generate-format/tests/staged/network.yaml
index b76e7456fca25..1d06b57ac4b1a 100644
--- a/testsuite/generate-format/tests/staged/network.yaml
+++ b/testsuite/generate-format/tests/staged/network.yaml
@@ -182,6 +182,8 @@ ProtocolId:
       JWKConsensusRpcJson: UNIT
     27:
       ConsensusObserver: UNIT
+    28:
+      ConsensusObserverRpc: UNIT
 ProtocolIdSet:
   NEWTYPESTRUCT:
     TYPENAME: BitVec
diff --git a/testsuite/module-publish/src/main.rs b/testsuite/module-publish/src/main.rs
index ea2060aa7bb63..9c428bbf0e1d5 100644
--- a/testsuite/module-publish/src/main.rs
+++ b/testsuite/module-publish/src/main.rs
@@ -26,6 +26,10 @@ fn additional_packages() -> Vec<(&'static str, &'static str)> {
             "ambassador_token",
             "../../aptos-move/move-examples/token_objects/ambassador",
         ),
+        (
+            "aggregator_examples",
+            "../../aptos-move/move-examples/aggregator_examples",
+        ),
         ("bcs_stream", "../../aptos-move/move-examples/bcs-stream"),
     ]
 }
diff --git a/testsuite/module_verify.py b/testsuite/module_verify.py
index 8adcc55590c50..14f53f75b845d 100755
--- a/testsuite/module_verify.py
+++ b/testsuite/module_verify.py
@@ -7,7 +7,7 @@
 import shutil
 import subprocess
 
-from verify_core.common import query_backup_latest_version, clear_artifacts
+from verify_core.common import warm_cache_and_get_latest_backup_version, clear_artifacts
 
 
 def main():
diff --git a/testsuite/poetry.lock b/testsuite/poetry.lock
index fc3a700eb7f61..64240e0c570f7 100644
--- a/testsuite/poetry.lock
+++ b/testsuite/poetry.lock
@@ -1,10 +1,9 @@
-# This file is automatically @generated by Poetry 1.4.2 and should not be changed by hand.
+# This file is automatically @generated by Poetry 1.8.2 and should not be changed by hand.
 
 [[package]]
 name = "black"
 version = "23.3.0"
 description = "The uncompromising code formatter."
-category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -54,7 +53,6 @@ uvloop = ["uvloop (>=0.15.2)"]
 name = "cachetools"
 version = "5.3.1"
 description = "Extensible memoizing collections and decorators"
-category = "main"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -66,7 +64,6 @@ files = [
 name = "certifi"
 version = "2023.7.22"
 description = "Python package for providing Mozilla's CA Bundle."
-category = "main"
 optional = false
 python-versions = ">=3.6"
 files = [
@@ -78,7 +75,6 @@ files = [
 name = "charset-normalizer"
 version = "3.2.0"
 description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet."
-category = "main"
 optional = false
 python-versions = ">=3.7.0"
 files = [
@@ -163,7 +159,6 @@ files = [
 name = "click"
 version = "8.1.6"
 description = "Composable command line interface toolkit"
-category = "main"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -178,7 +173,6 @@ colorama = {version = "*", markers = "platform_system == \"Windows\""}
 name = "colorama"
 version = "0.4.6"
 description = "Cross-platform colored terminal text."
-category = "main"
 optional = false
 python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7"
 files = [
@@ -190,7 +184,6 @@ files = [
 name = "dacite"
 version = "1.8.1"
 description = "Simple creation of data classes from dictionaries."
-category = "main"
 optional = false
 python-versions = ">=3.6"
 files = [
@@ -204,7 +197,6 @@ dev = ["black", "coveralls", "mypy", "pre-commit", "pylint", "pytest (>=5)", "py
 name = "google-auth"
 version = "2.17.3"
 description = "Google Authentication Library"
-category = "main"
 optional = false
 python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*"
 files = [
@@ -227,21 +219,19 @@ requests = ["requests (>=2.20.0,<3.0.0dev)"]
 
 [[package]]
 name = "idna"
-version = "3.4"
+version = "3.7"
 description = "Internationalized Domain Names in Applications (IDNA)"
-category = "main"
 optional = false
 python-versions = ">=3.5"
 files = [
-    {file = "idna-3.4-py3-none-any.whl", hash = "sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2"},
-    {file = "idna-3.4.tar.gz", hash = "sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4"},
+    {file = "idna-3.7-py3-none-any.whl", hash = "sha256:82fee1fc78add43492d3a1898bfa6d8a904cc97d8427f683ed8e798d07761aa0"},
+    {file = "idna-3.7.tar.gz", hash = "sha256:028ff3aadf0609c1fd278d8ea3089299412a7a8b9bd005dd08b9f8285bcb5cfc"},
 ]
 
 [[package]]
 name = "isort"
 version = "5.12.0"
 description = "A Python utility / library to sort Python imports."
-category = "dev"
 optional = false
 python-versions = ">=3.8.0"
 files = [
@@ -259,7 +249,6 @@ requirements-deprecated-finder = ["pip-api", "pipreqs"]
 name = "kubernetes"
 version = "26.1.0"
 description = "Kubernetes python client"
-category = "main"
 optional = false
 python-versions = ">=3.6"
 files = [
@@ -277,7 +266,7 @@ requests-oauthlib = "*"
 setuptools = ">=21.0.0"
 six = ">=1.9.0"
 urllib3 = ">=1.24.2"
-websocket-client = ">=0.32.0,<0.40.0 || >0.40.0,<0.41.0 || >=0.43.0"
+websocket-client = ">=0.32.0,<0.40.0 || >0.40.0,<0.41.dev0 || >=0.43.dev0"
 
 [package.extras]
 adal = ["adal (>=1.0.2)"]
@@ -286,7 +275,6 @@ adal = ["adal (>=1.0.2)"]
 name = "kubernetes-stubs"
 version = "22.6.0.post1"
 description = "Type stubs for the Kubernetes Python API client"
-category = "main"
 optional = false
 python-versions = "*"
 files = [
@@ -298,7 +286,6 @@ files = [
 name = "mypy-extensions"
 version = "1.0.0"
 description = "Type system extensions for programs checked with the mypy type checker."
-category = "dev"
 optional = false
 python-versions = ">=3.5"
 files = [
@@ -310,7 +297,6 @@ files = [
 name = "nodeenv"
 version = "1.8.0"
 description = "Node.js virtual environment builder"
-category = "dev"
 optional = false
 python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*"
 files = [
@@ -325,7 +311,6 @@ setuptools = "*"
 name = "oauthlib"
 version = "3.2.2"
 description = "A generic, spec-compliant, thorough implementation of the OAuth request-signing logic"
-category = "main"
 optional = false
 python-versions = ">=3.6"
 files = [
@@ -342,7 +327,6 @@ signedtoken = ["cryptography (>=3.0.0)", "pyjwt (>=2.0.0,<3)"]
 name = "packaging"
 version = "23.1"
 description = "Core utilities for Python packages"
-category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -354,7 +338,6 @@ files = [
 name = "pathspec"
 version = "0.11.1"
 description = "Utility library for gitignore style pattern matching of file paths."
-category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -366,7 +349,6 @@ files = [
 name = "platformdirs"
 version = "3.9.1"
 description = "A small Python package for determining appropriate platform-specific dirs, e.g. a \"user data dir\"."
-category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -382,7 +364,6 @@ test = ["appdirs (==1.4.4)", "covdefaults (>=2.3)", "pytest (>=7.3.1)", "pytest-
 name = "psutil"
 version = "5.9.5"
 description = "Cross-platform lib for process and system monitoring in Python."
-category = "main"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
 files = [
@@ -409,7 +390,6 @@ test = ["enum34", "ipaddress", "mock", "pywin32", "wmi"]
 name = "pyasn1"
 version = "0.5.0"
 description = "Pure-Python implementation of ASN.1 types and DER/BER/CER codecs (X.208)"
-category = "main"
 optional = false
 python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,>=2.7"
 files = [
@@ -421,7 +401,6 @@ files = [
 name = "pyasn1-modules"
 version = "0.3.0"
 description = "A collection of ASN.1-based protocols modules"
-category = "main"
 optional = false
 python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,>=2.7"
 files = [
@@ -436,7 +415,6 @@ pyasn1 = ">=0.4.6,<0.6.0"
 name = "pyright"
 version = "1.1.317"
 description = "Command line wrapper for pyright"
-category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -455,7 +433,6 @@ dev = ["twine (>=3.4.1)"]
 name = "python-dateutil"
 version = "2.8.2"
 description = "Extensions to the standard Python datetime module"
-category = "main"
 optional = false
 python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7"
 files = [
@@ -470,7 +447,6 @@ six = ">=1.5"
 name = "pyyaml"
 version = "6.0.1"
 description = "YAML parser and emitter for Python"
-category = "main"
 optional = false
 python-versions = ">=3.6"
 files = [
@@ -479,6 +455,7 @@ files = [
     {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:69b023b2b4daa7548bcfbd4aa3da05b3a74b772db9e23b982788168117739938"},
     {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:81e0b275a9ecc9c0c0c07b4b90ba548307583c125f54d5b6946cfee6360c733d"},
     {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ba336e390cd8e4d1739f42dfe9bb83a3cc2e80f567d8805e11b46f4a943f5515"},
+    {file = "PyYAML-6.0.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:326c013efe8048858a6d312ddd31d56e468118ad4cdeda36c719bf5bb6192290"},
     {file = "PyYAML-6.0.1-cp310-cp310-win32.whl", hash = "sha256:bd4af7373a854424dabd882decdc5579653d7868b8fb26dc7d0e99f823aa5924"},
     {file = "PyYAML-6.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:fd1592b3fdf65fff2ad0004b5e363300ef59ced41c2e6b3a99d4089fa8c5435d"},
     {file = "PyYAML-6.0.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:6965a7bc3cf88e5a1c3bd2e0b5c22f8d677dc88a455344035f03399034eb3007"},
@@ -486,8 +463,16 @@ files = [
     {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:42f8152b8dbc4fe7d96729ec2b99c7097d656dc1213a3229ca5383f973a5ed6d"},
     {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:062582fca9fabdd2c8b54a3ef1c978d786e0f6b3a1510e0ac93ef59e0ddae2bc"},
     {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d2b04aac4d386b172d5b9692e2d2da8de7bfb6c387fa4f801fbf6fb2e6ba4673"},
+    {file = "PyYAML-6.0.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:e7d73685e87afe9f3b36c799222440d6cf362062f78be1013661b00c5c6f678b"},
     {file = "PyYAML-6.0.1-cp311-cp311-win32.whl", hash = "sha256:1635fd110e8d85d55237ab316b5b011de701ea0f29d07611174a1b42f1444741"},
     {file = "PyYAML-6.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:bf07ee2fef7014951eeb99f56f39c9bb4af143d8aa3c21b1677805985307da34"},
+    {file = "PyYAML-6.0.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:855fb52b0dc35af121542a76b9a84f8d1cd886ea97c84703eaa6d88e37a2ad28"},
+    {file = "PyYAML-6.0.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:40df9b996c2b73138957fe23a16a4f0ba614f4c0efce1e9406a184b6d07fa3a9"},
+    {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a08c6f0fe150303c1c6b71ebcd7213c2858041a7e01975da3a99aed1e7a378ef"},
+    {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0"},
+    {file = "PyYAML-6.0.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8d4e9c88387b0f5c7d5f281e55304de64cf7f9c0021a3525bd3b1c542da3b0e4"},
+    {file = "PyYAML-6.0.1-cp312-cp312-win32.whl", hash = "sha256:d483d2cdf104e7c9fa60c544d92981f12ad66a457afae824d146093b8c294c54"},
+    {file = "PyYAML-6.0.1-cp312-cp312-win_amd64.whl", hash = "sha256:0d3304d8c0adc42be59c5f8a4d9e3d7379e6955ad754aa9d6ab7a398b59dd1df"},
     {file = "PyYAML-6.0.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:50550eb667afee136e9a77d6dc71ae76a44df8b3e51e41b77f6de2932bfe0f47"},
     {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1fe35611261b29bd1de0070f0b2f47cb6ff71fa6595c077e42bd0c419fa27b98"},
     {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:704219a11b772aea0d8ecd7058d0082713c3562b4e271b849ad7dc4a5c90c13c"},
@@ -504,6 +489,7 @@ files = [
     {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a0cd17c15d3bb3fa06978b4e8958dcdc6e0174ccea823003a106c7d4d7899ac5"},
     {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:28c119d996beec18c05208a8bd78cbe4007878c6dd15091efb73a30e90539696"},
     {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7e07cbde391ba96ab58e532ff4803f79c4129397514e1413a7dc761ccd755735"},
+    {file = "PyYAML-6.0.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:49a183be227561de579b4a36efbb21b3eab9651dd81b1858589f796549873dd6"},
     {file = "PyYAML-6.0.1-cp38-cp38-win32.whl", hash = "sha256:184c5108a2aca3c5b3d3bf9395d50893a7ab82a38004c8f61c258d4428e80206"},
     {file = "PyYAML-6.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:1e2722cc9fbb45d9b87631ac70924c11d3a401b2d7f410cc0e3bbf249f2dca62"},
     {file = "PyYAML-6.0.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:9eb6caa9a297fc2c2fb8862bc5370d0303ddba53ba97e71f08023b6cd73d16a8"},
@@ -511,6 +497,7 @@ files = [
     {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5773183b6446b2c99bb77e77595dd486303b4faab2b086e7b17bc6bef28865f6"},
     {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b786eecbdf8499b9ca1d697215862083bd6d2a99965554781d0d8d1ad31e13a0"},
     {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bc1bf2925a1ecd43da378f4db9e4f799775d6367bdb94671027b73b393a7c42c"},
+    {file = "PyYAML-6.0.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:04ac92ad1925b2cff1db0cfebffb6ffc43457495c9b3c39d3fcae417d7125dc5"},
     {file = "PyYAML-6.0.1-cp39-cp39-win32.whl", hash = "sha256:faca3bdcf85b2fc05d06ff3fbc1f83e1391b3e724afa3feba7d13eeab355484c"},
     {file = "PyYAML-6.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:510c9deebc5c0225e8c96813043e62b680ba2f9c50a08d3724c7f28a747d1486"},
     {file = "PyYAML-6.0.1.tar.gz", hash = "sha256:bfdf460b1736c775f2ba9f6a92bca30bc2095067b8a9d77876d1fad6cc3b4a43"},
@@ -520,7 +507,6 @@ files = [
 name = "requests"
 version = "2.31.0"
 description = "Python HTTP for Humans."
-category = "main"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -542,7 +528,6 @@ use-chardet-on-py3 = ["chardet (>=3.0.2,<6)"]
 name = "requests-oauthlib"
 version = "1.3.1"
 description = "OAuthlib authentication support for Requests."
-category = "main"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
 files = [
@@ -561,7 +546,6 @@ rsa = ["oauthlib[signedtoken] (>=3.0.0)"]
 name = "rsa"
 version = "4.9"
 description = "Pure-Python RSA implementation"
-category = "main"
 optional = false
 python-versions = ">=3.6,<4"
 files = [
@@ -576,7 +560,6 @@ pyasn1 = ">=0.1.3"
 name = "setuptools"
 version = "68.0.0"
 description = "Easily download, build, install, upgrade, and uninstall Python packages"
-category = "main"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -593,7 +576,6 @@ testing-integration = ["build[virtualenv]", "filelock (>=3.4.0)", "jaraco.envs (
 name = "six"
 version = "1.16.0"
 description = "Python 2 and 3 compatibility utilities"
-category = "main"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*"
 files = [
@@ -605,7 +587,6 @@ files = [
 name = "tabulate"
 version = "0.9.0"
 description = "Pretty-print tabular data"
-category = "main"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -620,7 +601,6 @@ widechars = ["wcwidth"]
 name = "tomli"
 version = "2.0.1"
 description = "A lil' TOML parser"
-category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -632,7 +612,6 @@ files = [
 name = "typing-extensions"
 version = "4.7.1"
 description = "Backported and Experimental Type Hints for Python 3.7+"
-category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -644,7 +623,6 @@ files = [
 name = "urllib3"
 version = "2.0.4"
 description = "HTTP library with thread-safe connection pooling, file post, and more."
-category = "main"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -662,7 +640,6 @@ zstd = ["zstandard (>=0.18.0)"]
 name = "websocket-client"
 version = "1.6.1"
 description = "WebSocket client for Python with low level API options"
-category = "main"
 optional = false
 python-versions = ">=3.7"
 files = [
diff --git a/testsuite/replay_verify.py b/testsuite/replay_verify.py
index 01c9b98eddb9d..6875fdc45e503 100755
--- a/testsuite/replay_verify.py
+++ b/testsuite/replay_verify.py
@@ -4,59 +4,58 @@
 # SPDX-License-Identifier: Apache-2.0
 
 import os
-import subprocess
 import shutil
+import subprocess
 import sys
-from multiprocessing import Pool, freeze_support
-from typing import Tuple
 from collections import deque
-
-
-from verify_core.common import clear_artifacts, query_backup_latest_version
-
-
-TESTNET_RANGES = [
-    [250000000, 255584106],
-    [255584107, 271874718],
-    [271874719, 300009463],
-    [300009464, 324904819],
-    [324904820, 347234877],
-    [347234878, 366973577],
-    [366973578, 399489396],
-    [399489397, 430909965],
-    [430909966, 449999999],
-    [450000000, 462114510],
-    [462114511, 478825432],
-    [478825433, 483500000],
-    [483500001, 516281795],
-    [516281796, 551052675],
-    [551052676, 582481398],
-    [582481399, 640_000_000],
-    [640_000_001, 980_000_000],
-    [980_000_000, 1_000_000_000],
-    [1_000_000_001, sys.maxsize],
+from multiprocessing import Pool, freeze_support
+from typing import List, Tuple
+
+from verify_core.common import clear_artifacts, warm_cache_and_get_latest_backup_version
+
+TESTNET_RANGES: List[Tuple[int, int]] = [
+    (862_000_000, 878_000_000),
+    (878_000_000, 894_000_000),
+    (894_000_000, 910_000_000),
+    (910_000_000, 926_000_000),
+    (942_000_000, 958_000_000),
+    (958_000_000, 974_000_000),
+    (974_000_000, 990_000_000),
+    (990_000_000, 1_006_000_000),
+    (1_006_000_000, 1_022_000_000),
+    (1_022_000_000, 1_038_000_000),
+    (1_038_000_000, 1_054_000_000),
+    (1_054_000_000, 1_070_000_000),
+    (1_070_000_000, 1_086_000_000),
+    (1_086_000_000, 1_102_000_000),
+    (1_102_000_000, 1_115_000_000),
+    (1_115_000_000, 1_128_000_000),
+    (1_128_000_000, 1_141_000_000),
+    (1_141_000_000, 1_154_000_000),
+    (1_154_000_000, 1_167_000_000),
 ]
 
-MAINNET_RANGES = [
-    [45_000_001, 100_000_000],
-    [100_000_001, 116_000_000],
-    [116_000_001, 155_000_000],
-    [155_000_001, 180_000_000],
-    [180_000_001, 190_000_000],
-    [190_000_001, 200_000_000],
-    [200_000_001, 215_000_000],
-    [215_000_001, 225_000_000],
-    [225_000_001, 235_000_000],
-    [235_000_001, 246_000_000],
-    [246_000_001, 270_000_000],
-    [270_000_001, 295_000_000],
-    [295_000_001, 321_000_000],
-    [321_000_001, 331_000_000],
-    [331_000_001, 354_000_000],
-    [354_000_001, 400_000_000],
-    [400_000_001, 490_000_000],
-    [490_000_000, 550_000_000],
-    [550_000_001, sys.maxsize],
+MAINNET_RANGES: List[Tuple[int, int]] = [
+    (408_000_000, 424_000_000),
+    (424_000_000, 439_000_000),
+    (439_000_000, 455_000_000),
+    (455_000_000, 471_000_000),
+    (471_000_000, 487_000_000),
+    (487_000_000, 503_000_000),
+    (503_000_000, 518_000_000),
+    (518_000_000, 534_000_000),
+    (534_000_000, 550_000_000),
+    (550_000_000, 566_000_000),
+    (566_000_000, 581_000_000),
+    (581_000_000, 597_000_000),
+    (597_000_000, 613_000_000),
+    (613_000_000, 629_000_000),
+    (629_000_000, 640_000_000),
+    # Skip tapos range
+    (949_000_000, 954_000_000),
+    (954_000_000, 969_000_000),
+    (969_000_000, 984_000_000),
+    (984_000_000, 1_000_000_000),
 ]
 
 
@@ -114,6 +113,7 @@ def replay_verify_partition(
             "target/release/aptos-debugger",
             "aptos-db",
             "replay-verify",
+            # "--enable-storage-sharding",
             *txns_to_skip_args,
             "--concurrent-downloads",
             "8",
@@ -194,11 +194,11 @@ def main(runner_no=None, runner_cnt=None, start_version=None, end_version=None):
     ), "runner_cnt must match the number of runners in the mapping"
     runner_start = runner_mapping[runner_no][0]
     runner_end = runner_mapping[runner_no][1]
-    latest_version = query_backup_latest_version(BACKUP_CONFIG_TEMPLATE_PATH)
+    latest_version = warm_cache_and_get_latest_backup_version(
+        BACKUP_CONFIG_TEMPLATE_PATH
+    )
     if runner_no == runner_cnt - 1:
-        runner_end = latest_version
-        if runner_end is None:
-            raise Exception("Failed to query latest version from backup")
+        runner_end = min(runner_end, latest_version)
     print("runner start %d end %d" % (runner_start, runner_end))
     if start_version is not None and end_version is not None:
         runner_start = start_version
diff --git a/testsuite/single_node_performance.py b/testsuite/single_node_performance.py
index 7a3e20dbd5b2e..fda4581b1c01e 100755
--- a/testsuite/single_node_performance.py
+++ b/testsuite/single_node_performance.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 
 # Copyright © Aptos Foundation
 # SPDX-License-Identifier: Apache-2.0
@@ -36,28 +36,6 @@ class Flow(Flag):
 # Tests that are run on LAND_BLOCKING and continuously on main
 LAND_BLOCKING_AND_C = Flow.LAND_BLOCKING | Flow.CONTINUOUS
 
-
-@dataclass
-class RunGroupKey:
-    transaction_type: str
-    module_working_set_size: int = field(default=1)
-    executor_type: str = field(default="VM")
-
-    transaction_type_override: Optional[str] = field(default=None)
-    transaction_weights_override: Optional[str] = field(default=None)
-    sharding_traffic_flags: Optional[str] = field(default=None)
-
-    smaller_working_set: bool = field(default=False)
-
-
-@dataclass
-class RunGroupConfig:
-    key: RunGroupKey
-    expected_tps: float
-    included_in: Flow
-    waived: bool = field(default=False)
-
-
 SELECTED_FLOW = Flow[os.environ.get("FLOW", default="LAND_BLOCKING")]
 IS_MAINNET = SELECTED_FLOW in [Flow.MAINNET, Flow.MAINNET_LARGE_DB]
 
@@ -77,104 +55,6 @@ class RunGroupConfig:
 )
 MAIN_SIGNER_ACCOUNTS = 2 * MAX_BLOCK_SIZE
 
-# numbers are based on the machine spec used by github action
-# Calibrate using median value from
-# Axiom: https://app.axiom.co/aptoslabs-hghf/explorer?qid=88fegG0H1si-s3x8pv&relative=1
-# Humio: https://gist.github.com/igor-aptos/7b12ca28de03894cddda8e415f37889e
-# Local machine numbers will be higher.
-# For charts over time, you can modify the following query:
-# https://app.axiom.co/aptoslabs-hghf/explorer?qid=29zYzeVi7FX-s4ukl5&relative=1
-# fmt: off
-TESTS = [
-    RunGroupConfig(expected_tps=22300, key=RunGroupKey("no-op"), included_in=LAND_BLOCKING_AND_C),
-    RunGroupConfig(expected_tps=11900, key=RunGroupKey("no-op", module_working_set_size=1000), included_in=LAND_BLOCKING_AND_C),
-    RunGroupConfig(expected_tps=13100, key=RunGroupKey("coin-transfer"), included_in=LAND_BLOCKING_AND_C | Flow.REPRESENTATIVE),
-    RunGroupConfig(expected_tps=40100, key=RunGroupKey("coin-transfer", executor_type="native"), included_in=LAND_BLOCKING_AND_C),
-    RunGroupConfig(expected_tps=9000, key=RunGroupKey("account-generation"), included_in=LAND_BLOCKING_AND_C | Flow.REPRESENTATIVE),
-    RunGroupConfig(expected_tps=30600, key=RunGroupKey("account-generation", executor_type="native"), included_in=Flow.CONTINUOUS),
-    RunGroupConfig(expected_tps=19300, key=RunGroupKey("account-resource32-b"), included_in=Flow.CONTINUOUS),
-    RunGroupConfig(expected_tps=4150, key=RunGroupKey("modify-global-resource"), included_in=LAND_BLOCKING_AND_C | Flow.REPRESENTATIVE),
-    RunGroupConfig(expected_tps=15150, key=RunGroupKey("modify-global-resource", module_working_set_size=10), included_in=Flow.CONTINUOUS),
-    RunGroupConfig(expected_tps=147, key=RunGroupKey("publish-package"), included_in=LAND_BLOCKING_AND_C | Flow.REPRESENTATIVE),
-    RunGroupConfig(expected_tps=2130, key=RunGroupKey(
-        "mix_publish_transfer",
-        transaction_type_override="publish-package coin-transfer",
-        transaction_weights_override="1 500",
-    ), included_in=LAND_BLOCKING_AND_C),
-    RunGroupConfig(expected_tps=310, key=RunGroupKey("batch100-transfer"), included_in=LAND_BLOCKING_AND_C),
-    RunGroupConfig(expected_tps=1050, key=RunGroupKey("batch100-transfer", executor_type="native"), included_in=Flow.CONTINUOUS),
-
-    RunGroupConfig(expected_tps=165, key=RunGroupKey("vector-picture40"), included_in=Flow(0), waived=True),
-    RunGroupConfig(expected_tps=1000, key=RunGroupKey("vector-picture40", module_working_set_size=20), included_in=Flow(0), waived=True),
-    RunGroupConfig(expected_tps=152, key=RunGroupKey("vector-picture30k"), included_in=LAND_BLOCKING_AND_C),
-    RunGroupConfig(expected_tps=910, key=RunGroupKey("vector-picture30k", module_working_set_size=20), included_in=Flow.CONTINUOUS),
-    RunGroupConfig(expected_tps=24, key=RunGroupKey("smart-table-picture30-k-with200-change"), included_in=LAND_BLOCKING_AND_C),
-    RunGroupConfig(expected_tps=130, key=RunGroupKey("smart-table-picture30-k-with200-change", module_working_set_size=20), included_in=Flow.CONTINUOUS),
-    # RunGroupConfig(expected_tps=10, key=RunGroupKey("smart-table-picture1-m-with256-change"), included_in=LAND_BLOCKING_AND_C, waived=True),
-    # RunGroupConfig(expected_tps=40, key=RunGroupKey("smart-table-picture1-m-with256-change", module_working_set_size=20), included_in=Flow.CONTINUOUS, waived=True),
-
-    RunGroupConfig(expected_tps=20050, key=RunGroupKey("modify-global-resource-agg-v2"), included_in=Flow.AGG_V2 | LAND_BLOCKING_AND_C),
-    RunGroupConfig(expected_tps=12500, key=RunGroupKey("modify-global-resource-agg-v2", module_working_set_size=50), included_in=Flow.AGG_V2),
-    RunGroupConfig(expected_tps=7200, key=RunGroupKey("modify-global-flag-agg-v2"), included_in=Flow.AGG_V2 | Flow.CONTINUOUS),
-    RunGroupConfig(expected_tps=12500, key=RunGroupKey("modify-global-flag-agg-v2", module_working_set_size=50), included_in=Flow.AGG_V2),
-    RunGroupConfig(expected_tps=12400, key=RunGroupKey("modify-global-bounded-agg-v2"), included_in=Flow.AGG_V2 | Flow.CONTINUOUS),
-    RunGroupConfig(expected_tps=12500, key=RunGroupKey("modify-global-bounded-agg-v2", module_working_set_size=50), included_in=Flow.AGG_V2),
-
-    RunGroupConfig(expected_tps=3670, key=RunGroupKey("resource-groups-global-write-tag1-kb"), included_in=LAND_BLOCKING_AND_C | Flow.RESOURCE_GROUPS),
-    RunGroupConfig(expected_tps=8000, key=RunGroupKey("resource-groups-global-write-tag1-kb", module_working_set_size=20), included_in=Flow.RESOURCE_GROUPS, waived=True),
-    RunGroupConfig(expected_tps=3240, key=RunGroupKey("resource-groups-global-write-and-read-tag1-kb"), included_in=Flow.CONTINUOUS | Flow.RESOURCE_GROUPS),
-    RunGroupConfig(expected_tps=8000, key=RunGroupKey("resource-groups-global-write-and-read-tag1-kb", module_working_set_size=20), included_in=Flow.RESOURCE_GROUPS, waived=True),
-    RunGroupConfig(expected_tps=16200, key=RunGroupKey("resource-groups-sender-write-tag1-kb"), included_in=Flow.CONTINUOUS | Flow.RESOURCE_GROUPS),
-    RunGroupConfig(expected_tps=8000, key=RunGroupKey("resource-groups-sender-write-tag1-kb", module_working_set_size=20), included_in=Flow.RESOURCE_GROUPS, waived=True),
-    RunGroupConfig(expected_tps=14200, key=RunGroupKey("resource-groups-sender-multi-change1-kb"), included_in=LAND_BLOCKING_AND_C | Flow.RESOURCE_GROUPS),
-    RunGroupConfig(expected_tps=8000, key=RunGroupKey("resource-groups-sender-multi-change1-kb", module_working_set_size=20), included_in=Flow.RESOURCE_GROUPS, waived=True),
-    
-    RunGroupConfig(expected_tps=1725, key=RunGroupKey("token-v1ft-mint-and-transfer"), included_in=Flow.CONTINUOUS),
-    RunGroupConfig(expected_tps=8420, key=RunGroupKey("token-v1ft-mint-and-transfer", module_working_set_size=20), included_in=Flow.CONTINUOUS),
-    RunGroupConfig(expected_tps=1040, key=RunGroupKey("token-v1nft-mint-and-transfer-sequential"), included_in=Flow.CONTINUOUS),
-    RunGroupConfig(expected_tps=5700, key=RunGroupKey("token-v1nft-mint-and-transfer-sequential", module_working_set_size=20), included_in=Flow.CONTINUOUS),
-    RunGroupConfig(expected_tps=1300, key=RunGroupKey("token-v1nft-mint-and-transfer-parallel"), included_in=Flow(0)),
-    RunGroupConfig(expected_tps=5300, key=RunGroupKey("token-v1nft-mint-and-transfer-parallel", module_working_set_size=20), included_in=Flow(0)),
-
-    RunGroupConfig(expected_tps=14500, key=RunGroupKey("coin-init-and-mint", module_working_set_size=1), included_in=Flow.CONTINUOUS),
-    RunGroupConfig(expected_tps=11770, key=RunGroupKey("coin-init-and-mint", module_working_set_size=20), included_in=Flow.CONTINUOUS),
-    RunGroupConfig(expected_tps=9800, key=RunGroupKey("fungible-asset-mint", module_working_set_size=1), included_in=LAND_BLOCKING_AND_C),
-    RunGroupConfig(expected_tps=8800, key=RunGroupKey("fungible-asset-mint", module_working_set_size=20), included_in=Flow.CONTINUOUS),
-
-    # RunGroupConfig(expected_tps=1000, key=RunGroupKey("token-v1ft-mint-and-store"), included_in=Flow(0)),
-    # RunGroupConfig(expected_tps=1000, key=RunGroupKey("token-v1nft-mint-and-store-sequential"), included_in=Flow(0)),
-    # RunGroupConfig(expected_tps=1000, key=RunGroupKey("token-v1nft-mint-and-transfer-parallel"), included_in=Flow(0)),
-
-    RunGroupConfig(expected_tps=22200, key=RunGroupKey("no-op5-signers"), included_in=Flow.CONTINUOUS),
-   
-    RunGroupConfig(expected_tps=6900, key=RunGroupKey("token-v2-ambassador-mint"), included_in=LAND_BLOCKING_AND_C | Flow.REPRESENTATIVE),
-    RunGroupConfig(expected_tps=6785, key=RunGroupKey("token-v2-ambassador-mint", module_working_set_size=20), included_in=Flow.CONTINUOUS),
-
-    RunGroupConfig(expected_tps=1080, key=RunGroupKey("liquidity-pool-swap"), included_in=LAND_BLOCKING_AND_C | Flow.REPRESENTATIVE),
-    RunGroupConfig(expected_tps=4690, key=RunGroupKey("liquidity-pool-swap", module_working_set_size=20), included_in=Flow.CONTINUOUS),
-
-    RunGroupConfig(expected_tps=1035, key=RunGroupKey("liquidity-pool-swap-stable"), included_in=Flow.CONTINUOUS),
-    RunGroupConfig(expected_tps=4570, key=RunGroupKey("liquidity-pool-swap-stable", module_working_set_size=20), included_in=Flow.CONTINUOUS),
-
-    RunGroupConfig(expected_tps=19250, key=RunGroupKey("deserialize-u256"), included_in=Flow.CONTINUOUS),
-    
-    # fee payer sequentializes transactions today. in these tests module publisher is the fee payer, so larger number of modules tests throughput with multiple fee payers
-    RunGroupConfig(expected_tps=3095, key=RunGroupKey("no-op-fee-payer"), included_in=LAND_BLOCKING_AND_C),
-    RunGroupConfig(expected_tps=17840, key=RunGroupKey("no-op-fee-payer", module_working_set_size=50), included_in=Flow.CONTINUOUS),
-
-    RunGroupConfig(expected_tps=50000, key=RunGroupKey("coin_transfer_connected_components", executor_type="sharded", sharding_traffic_flags="--connected-tx-grps 5000", transaction_type_override=""), included_in=Flow.REPRESENTATIVE),
-    RunGroupConfig(expected_tps=50000, key=RunGroupKey("coin_transfer_hotspot", executor_type="sharded", sharding_traffic_flags="--hotspot-probability 0.8", transaction_type_override=""), included_in=Flow.REPRESENTATIVE),
-
-    # setting separately for previewnet, as we run on a different number of cores.
-    RunGroupConfig(expected_tps=29000 if NUM_ACCOUNTS < 5000000 else 20000, key=RunGroupKey("coin-transfer", smaller_working_set=True), included_in=Flow.MAINNET | Flow.MAINNET_LARGE_DB),
-    RunGroupConfig(expected_tps=23000 if NUM_ACCOUNTS < 5000000 else 15000, key=RunGroupKey("account-generation"), included_in=Flow.MAINNET | Flow.MAINNET_LARGE_DB),
-    RunGroupConfig(expected_tps=130 if NUM_ACCOUNTS < 5000000 else 60, key=RunGroupKey("publish-package"), included_in=Flow.MAINNET | Flow.MAINNET_LARGE_DB),
-    RunGroupConfig(expected_tps=12000 if NUM_ACCOUNTS < 5000000 else 6800, key=RunGroupKey("token-v2-ambassador-mint"), included_in=Flow.MAINNET | Flow.MAINNET_LARGE_DB),
-    RunGroupConfig(expected_tps=35000 if NUM_ACCOUNTS < 5000000 else 28000, key=RunGroupKey("coin_transfer_connected_components", executor_type="sharded", sharding_traffic_flags="--connected-tx-grps 5000", transaction_type_override=""), included_in=Flow.MAINNET | Flow.MAINNET_LARGE_DB, waived=True),
-    RunGroupConfig(expected_tps=27000 if NUM_ACCOUNTS < 5000000 else 23000, key=RunGroupKey("coin_transfer_hotspot", executor_type="sharded", sharding_traffic_flags="--hotspot-probability 0.8", transaction_type_override=""), included_in=Flow.MAINNET | Flow.MAINNET_LARGE_DB, waived=True),
-]
-# fmt: on
-
 NOISE_LOWER_LIMIT = 0.98 if IS_MAINNET else 0.8
 NOISE_LOWER_LIMIT_WARN = None if IS_MAINNET else 0.9
 # If you want to calibrate the upper limit for perf improvement, you can
@@ -184,15 +64,15 @@ class RunGroupConfig:
 
 # bump after a perf improvement, so you can easily distinguish runs
 # that are on top of this commit
-CODE_PERF_VERSION = "v4"
+CODE_PERF_VERSION = "v6"
 
 # default to using production number of execution threads for assertions
 NUMBER_OF_EXECUTION_THREADS = int(
-    os.environ.get("NUMBER_OF_EXECUTION_THREADS", default=8)
+    os.environ.get("NUMBER_OF_EXECUTION_THREADS", default=32)
 )
 
 if os.environ.get("DETAILED"):
-    EXECUTION_ONLY_NUMBER_OF_THREADS = [1, 2, 4, 8, 16, 32, 60]
+    EXECUTION_ONLY_NUMBER_OF_THREADS = [1, 2, 4, 8, 16, 32, 48, 60]
 else:
     EXECUTION_ONLY_NUMBER_OF_THREADS = []
 
@@ -208,6 +88,13 @@ class RunGroupConfig:
 else:
     DB_CONFIG_FLAGS = "--enable-storage-sharding"
 
+if os.environ.get("DISABLE_FA_APT"):
+    FEATURE_FLAGS = ""
+    SKIP_NATIVE = False
+else:
+    FEATURE_FLAGS = "--enable-feature NEW_ACCOUNTS_DEFAULT_TO_FA_APT_STORE --enable-feature OPERATIONS_DEFAULT_TO_FA_APT_STORE"
+    SKIP_NATIVE = True
+
 if os.environ.get("ENABLE_PRUNER"):
     DB_PRUNER_FLAGS = "--enable-state-pruner --enable-ledger-pruner --enable-epoch-snapshot-pruner --ledger-pruning-batch-size 10000 --state-prune-window 3000000 --epoch-snapshot-prune-window 3000000 --ledger-prune-window 3000000"
 else:
@@ -216,6 +103,237 @@ class RunGroupConfig:
 HIDE_OUTPUT = os.environ.get("HIDE_OUTPUT")
 SKIP_MOVE_E2E = os.environ.get("SKIP_MOVE_E2E")
 
+
+@dataclass(frozen=True)
+class RunGroupKey:
+    transaction_type: str
+    module_working_set_size: int = field(default=1)
+    executor_type: str = field(default="VM")
+
+
+@dataclass(frozen=True)
+class RunGroupKeyExtra:
+    transaction_type_override: Optional[str] = field(default=None)
+    transaction_weights_override: Optional[str] = field(default=None)
+    sharding_traffic_flags: Optional[str] = field(default=None)
+
+    smaller_working_set: bool = field(default=False)
+
+
+@dataclass
+class RunGroupConfig:
+    key: RunGroupKey
+    included_in: Flow
+    expected_tps: Optional[float] = field(default=None)
+    key_extra: RunGroupKeyExtra = field(default_factory=RunGroupKeyExtra)
+    waived: bool = field(default=False)
+
+
+# numbers are based on the machine spec used by github action
+# Local machine numbers will be different.
+#
+# Calibrate using median value from
+# Humio: https://gist.github.com/igor-aptos/7b12ca28de03894cddda8e415f37889e
+# Exporting as CSV and copying to the table below.
+# If there is one or few tests that need to be recalibrated, it's recommended to update
+# only their lines, as to not add unintentional drift to other tests.
+#
+# Dashboard: https://aptoslabs.grafana.net/d/fdf2e5rdip5vkd/single-node-performance-benchmark?orgId=1
+# fmt: off
+
+# 0-indexed
+CALIBRATED_TPS_INDEX = -1
+CALIBRATION_SEPARATOR = "	"
+
+# transaction_type	module_working_set_size	executor_type	min_ratio	max_ratio	median
+CALIBRATION = """
+no-op	1	VM	0.896	1.057	41218.8
+no-op	1000	VM	0.902	1.030	22359.4
+apt-fa-transfer	1	VM	0.891	1.056	28721.7
+apt-fa-transfer	1	native	0.848	1.157	40469.1
+account-generation	1	VM	0.888	1.030	22359.4
+account-generation	1	native	0.717	1.153	33440.0
+account-resource32-b	1	VM	0.934	1.074	36855.5
+modify-global-resource	1	VM	0.940	1.033	3082.9
+modify-global-resource	10	VM	0.918	1.017	17905.3
+publish-package	1	VM	0.950	1.040	143.9
+mix_publish_transfer	1	VM	0.967	1.163	2173.8
+batch100-transfer	1	VM	0.859	1.021	667.8
+batch100-transfer	1	native	0.784	1.222	1862.1
+vector-picture30k	1	VM	0.935	1.023	110.0
+vector-picture30k	20	VM	0.819	1.038	1347.9
+smart-table-picture30-k-with200-change	1	VM	0.959	1.054	21.4
+smart-table-picture30-k-with200-change	20	VM	0.923	1.057	182.6
+modify-global-resource-agg-v2	1	VM	0.893	1.030	39728.8
+modify-global-flag-agg-v2	1	VM	0.972	1.022	6111.4
+modify-global-bounded-agg-v2	1	VM	0.926	1.103	10494.1
+modify-global-milestone-agg-v2	1	VM	0.912	1.030	29251.9
+resource-groups-global-write-tag1-kb	1	VM	0.886	1.061	9389.9
+resource-groups-global-write-and-read-tag1-kb	1	VM	0.882	1.018	6446.3
+resource-groups-sender-write-tag1-kb	1	VM	0.841	1.163	22359.4
+resource-groups-sender-multi-change1-kb	1	VM	0.826	1.107	17562.1
+token-v1ft-mint-and-transfer	1	VM	0.892	1.027	1347.9
+token-v1ft-mint-and-transfer	20	VM	0.889	1.021	12114.8
+token-v1nft-mint-and-transfer-sequential	1	VM	0.899	1.027	812.9
+token-v1nft-mint-and-transfer-sequential	20	VM	0.888	1.015	7881.5
+coin-init-and-mint	1	VM	0.870	1.024	30932.7
+coin-init-and-mint	20	VM	0.866	1.055	25786.3
+fungible-asset-mint	1	VM	0.873	1.033	25331.5
+fungible-asset-mint	20	VM	0.887	1.055	22763.8
+no-op5-signers	1	VM	0.904	1.038	41978.3
+token-v2-ambassador-mint	1	VM	0.869	1.025	17905.3
+token-v2-ambassador-mint	20	VM	0.878	1.024	17562.1
+liquidity-pool-swap	1	VM	0.931	1.032	975.7
+liquidity-pool-swap	20	VM	0.918	1.009	8359.6
+liquidity-pool-swap-stable	1	VM	0.901	1.016	957.5
+liquidity-pool-swap-stable	20	VM	0.925	1.022	8035.3
+deserialize-u256	1	VM	0.899	1.036	39728.8
+no-op-fee-payer	1	VM	0.922	1.022	2392.0
+no-op-fee-payer	50	VM	0.898	1.028	27699.5
+"""
+
+
+# temporary table, until recalibration can be done.
+CALIBRATION_SEPARATOR = " "
+
+# transaction_type                                 module_working_set  executor      block_size    expected t/s    t/s
+CALIBRATION = """
+warmup                                                            1  VM                 10000             0    20373
+no-op                                                             1  VM                 10000         41218.8  33211
+no-op                                                          1000  VM                 10000         22359.4  20593
+apt-fa-transfer                                                   1  VM                 10000         28721.7  25699
+account-generation                                                1  VM                 10000         22359.4  20728
+account-resource32-b                                              1  VM                 10000         36855.5  30215
+modify-global-resource                                            1  VM                  3082          3082.9   2853
+modify-global-resource                                           10  VM                 10000         17905.3  16934
+publish-package                                                   1  VM                   143           143.9    149
+mix_publish_transfer                                              1  VM                  2173          2173.8   2272
+batch100-transfer                                                 1  VM                   667           667.8    768
+vector-picture30k                                                 1  VM                   110           110      110
+vector-picture30k                                                20  VM                  1347          1347.9   1124
+smart-table-picture30-k-with200-change                            1  VM                    21            21.4     22
+smart-table-picture30-k-with200-change                           20  VM                   182           182.6    191
+modify-global-resource-agg-v2                                     1  VM                 10000         39728.8  30580
+modify-global-flag-agg-v2                                         1  VM                  6111          6111.4   5288
+modify-global-bounded-agg-v2                                      1  VM                 10000         10494.1   9035
+modify-global-milestone-agg-v2                                    1  VM                 10000         29251.9  24582
+resource-groups-global-write-tag1-kb                              1  VM                  9389          9389.9   9271
+resource-groups-global-write-and-read-tag1-kb                     1  VM                  6446          6446.3   6276
+resource-groups-sender-write-tag1-kb                              1  VM                 10000         22359.4  21517
+resource-groups-sender-multi-change1-kb                           1  VM                 10000         17562.1  15941
+token-v1ft-mint-and-transfer                                      1  VM                  1347          1347.9   1271
+token-v1ft-mint-and-transfer                                     20  VM                 10000         12114.8  11409
+token-v1nft-mint-and-transfer-sequential                          1  VM                   812           812.9    815
+token-v1nft-mint-and-transfer-sequential                         20  VM                  7881          7881.5   7583
+coin-init-and-mint                                                1  VM                 10000         30932.7  27459
+coin-init-and-mint                                               20  VM                 10000         25786.3  23818
+fungible-asset-mint                                               1  VM                 10000         25331.5  21542
+fungible-asset-mint                                              20  VM                 10000         22763.8  19915
+no-op5-signers                                                    1  VM                 10000         41978.3  34432
+token-v2-ambassador-mint                                          1  VM                 10000         17905.3  15378
+token-v2-ambassador-mint                                         20  VM                 10000         17562.1  15351
+liquidity-pool-swap                                               1  VM                   975           975.7    973
+liquidity-pool-swap                                              20  VM                  8359          8359.6   8213
+liquidity-pool-swap-stable                                        1  VM                   957           957.5    952
+liquidity-pool-swap-stable                                       20  VM                  8035          8035.3   7993
+deserialize-u256                                                  1  VM                 10000         39728.8  32416
+no-op-fee-payer                                                   1  VM                  2392          2392     2193
+no-op-fee-payer                                                  50  VM                 10000         27699.5  25762
+"""
+
+# when adding a new test, add estimated expected_tps to it, as well as waived=True.
+# And then after a day or two - add calibration result for it above, removing expected_tps/waived fields.
+
+TESTS = [
+    RunGroupConfig(key=RunGroupKey("no-op"), included_in=LAND_BLOCKING_AND_C),
+    RunGroupConfig(key=RunGroupKey("no-op", module_working_set_size=1000), included_in=LAND_BLOCKING_AND_C),
+    RunGroupConfig(key=RunGroupKey("apt-fa-transfer"), included_in=LAND_BLOCKING_AND_C | Flow.REPRESENTATIVE),
+    RunGroupConfig(key=RunGroupKey("apt-fa-transfer", executor_type="native"), included_in=LAND_BLOCKING_AND_C),
+    RunGroupConfig(key=RunGroupKey("account-generation"), included_in=LAND_BLOCKING_AND_C | Flow.REPRESENTATIVE),
+    RunGroupConfig(key=RunGroupKey("account-generation", executor_type="native"), included_in=Flow.CONTINUOUS),
+    RunGroupConfig(key=RunGroupKey("account-resource32-b"), included_in=Flow.CONTINUOUS),
+    RunGroupConfig(key=RunGroupKey("modify-global-resource"), included_in=LAND_BLOCKING_AND_C | Flow.REPRESENTATIVE),
+    RunGroupConfig(key=RunGroupKey("modify-global-resource", module_working_set_size=10), included_in=Flow.CONTINUOUS),
+    RunGroupConfig(key=RunGroupKey("publish-package"), included_in=LAND_BLOCKING_AND_C | Flow.REPRESENTATIVE),
+    RunGroupConfig(key=RunGroupKey("mix_publish_transfer"), key_extra=RunGroupKeyExtra(
+        transaction_type_override="publish-package apt-fa-transfer",
+        transaction_weights_override="1 500",
+    ), included_in=LAND_BLOCKING_AND_C),
+    RunGroupConfig(key=RunGroupKey("batch100-transfer"), included_in=LAND_BLOCKING_AND_C),
+    RunGroupConfig(key=RunGroupKey("batch100-transfer", executor_type="native"), included_in=Flow.CONTINUOUS),
+
+    RunGroupConfig(expected_tps=100, key=RunGroupKey("vector-picture40"), included_in=Flow(0), waived=True),
+    RunGroupConfig(expected_tps=1000, key=RunGroupKey("vector-picture40", module_working_set_size=20), included_in=Flow(0), waived=True),
+    RunGroupConfig(key=RunGroupKey("vector-picture30k"), included_in=LAND_BLOCKING_AND_C),
+    RunGroupConfig(key=RunGroupKey("vector-picture30k", module_working_set_size=20), included_in=Flow.CONTINUOUS),
+    RunGroupConfig(key=RunGroupKey("smart-table-picture30-k-with200-change"), included_in=LAND_BLOCKING_AND_C),
+    RunGroupConfig(key=RunGroupKey("smart-table-picture30-k-with200-change", module_working_set_size=20), included_in=Flow.CONTINUOUS),
+    # RunGroupConfig(expected_tps=10, key=RunGroupKey("smart-table-picture1-m-with256-change"), included_in=LAND_BLOCKING_AND_C),
+    # RunGroupConfig(expected_tps=40, key=RunGroupKey("smart-table-picture1-m-with256-change", module_working_set_size=20), included_in=Flow.CONTINUOUS),
+
+    RunGroupConfig(key=RunGroupKey("modify-global-resource-agg-v2"), included_in=Flow.AGG_V2 | LAND_BLOCKING_AND_C),
+    RunGroupConfig(expected_tps=10000, key=RunGroupKey("modify-global-resource-agg-v2", module_working_set_size=50), included_in=Flow.AGG_V2, waived=True),
+    RunGroupConfig(key=RunGroupKey("modify-global-flag-agg-v2"), included_in=Flow.AGG_V2 | Flow.CONTINUOUS),
+    RunGroupConfig(expected_tps=10000, key=RunGroupKey("modify-global-flag-agg-v2", module_working_set_size=50), included_in=Flow.AGG_V2, waived=True),
+    RunGroupConfig(key=RunGroupKey("modify-global-bounded-agg-v2"), included_in=Flow.AGG_V2 | Flow.CONTINUOUS),
+    RunGroupConfig(expected_tps=10000, key=RunGroupKey("modify-global-bounded-agg-v2", module_working_set_size=50), included_in=Flow.AGG_V2, waived=True),
+    RunGroupConfig(key=RunGroupKey("modify-global-milestone-agg-v2"), included_in=Flow.AGG_V2 | Flow.CONTINUOUS),
+
+    RunGroupConfig(key=RunGroupKey("resource-groups-global-write-tag1-kb"), included_in=LAND_BLOCKING_AND_C | Flow.RESOURCE_GROUPS),
+    RunGroupConfig(expected_tps=8000, key=RunGroupKey("resource-groups-global-write-tag1-kb", module_working_set_size=20), included_in=Flow.RESOURCE_GROUPS, waived=True),
+    RunGroupConfig(key=RunGroupKey("resource-groups-global-write-and-read-tag1-kb"), included_in=Flow.CONTINUOUS | Flow.RESOURCE_GROUPS),
+    RunGroupConfig(expected_tps=8000, key=RunGroupKey("resource-groups-global-write-and-read-tag1-kb", module_working_set_size=20), included_in=Flow.RESOURCE_GROUPS, waived=True),
+    RunGroupConfig(key=RunGroupKey("resource-groups-sender-write-tag1-kb"), included_in=Flow.CONTINUOUS | Flow.RESOURCE_GROUPS),
+    RunGroupConfig(expected_tps=8000, key=RunGroupKey("resource-groups-sender-write-tag1-kb", module_working_set_size=20), included_in=Flow.RESOURCE_GROUPS, waived=True),
+    RunGroupConfig(key=RunGroupKey("resource-groups-sender-multi-change1-kb"), included_in=LAND_BLOCKING_AND_C | Flow.RESOURCE_GROUPS),
+    RunGroupConfig(expected_tps=8000, key=RunGroupKey("resource-groups-sender-multi-change1-kb", module_working_set_size=20), included_in=Flow.RESOURCE_GROUPS, waived=True),
+    
+    RunGroupConfig(key=RunGroupKey("token-v1ft-mint-and-transfer"), included_in=Flow.CONTINUOUS),
+    RunGroupConfig(key=RunGroupKey("token-v1ft-mint-and-transfer", module_working_set_size=20), included_in=Flow.CONTINUOUS),
+    RunGroupConfig(key=RunGroupKey("token-v1nft-mint-and-transfer-sequential"), included_in=Flow.CONTINUOUS),
+    RunGroupConfig(key=RunGroupKey("token-v1nft-mint-and-transfer-sequential", module_working_set_size=20), included_in=Flow.CONTINUOUS),
+    RunGroupConfig(expected_tps=1300, key=RunGroupKey("token-v1nft-mint-and-transfer-parallel"), included_in=Flow(0), waived=True),
+    RunGroupConfig(expected_tps=5300, key=RunGroupKey("token-v1nft-mint-and-transfer-parallel", module_working_set_size=20), included_in=Flow(0), waived=True),
+
+    RunGroupConfig(key=RunGroupKey("coin-init-and-mint", module_working_set_size=1), included_in=Flow.CONTINUOUS),
+    RunGroupConfig(key=RunGroupKey("coin-init-and-mint", module_working_set_size=20), included_in=Flow.CONTINUOUS),
+    RunGroupConfig(key=RunGroupKey("fungible-asset-mint", module_working_set_size=1), included_in=LAND_BLOCKING_AND_C),
+    RunGroupConfig(key=RunGroupKey("fungible-asset-mint", module_working_set_size=20), included_in=Flow.CONTINUOUS),
+
+    # RunGroupConfig(expected_tps=1000, key=RunGroupKey("token-v1ft-mint-and-store"), included_in=Flow(0)),
+    # RunGroupConfig(expected_tps=1000, key=RunGroupKey("token-v1nft-mint-and-store-sequential"), included_in=Flow(0)),
+    # RunGroupConfig(expected_tps=1000, key=RunGroupKey("token-v1nft-mint-and-transfer-parallel"), included_in=Flow(0)),
+
+    RunGroupConfig(key=RunGroupKey("no-op5-signers"), included_in=Flow.CONTINUOUS),
+   
+    RunGroupConfig(key=RunGroupKey("token-v2-ambassador-mint"), included_in=LAND_BLOCKING_AND_C | Flow.REPRESENTATIVE),
+    RunGroupConfig(key=RunGroupKey("token-v2-ambassador-mint", module_working_set_size=20), included_in=Flow.CONTINUOUS),
+
+    RunGroupConfig(key=RunGroupKey("liquidity-pool-swap"), included_in=LAND_BLOCKING_AND_C | Flow.REPRESENTATIVE),
+    RunGroupConfig(key=RunGroupKey("liquidity-pool-swap", module_working_set_size=20), included_in=Flow.CONTINUOUS),
+
+    RunGroupConfig(key=RunGroupKey("liquidity-pool-swap-stable"), included_in=Flow.CONTINUOUS),
+    RunGroupConfig(key=RunGroupKey("liquidity-pool-swap-stable", module_working_set_size=20), included_in=Flow.CONTINUOUS),
+
+    RunGroupConfig(key=RunGroupKey("deserialize-u256"), included_in=Flow.CONTINUOUS),
+    
+    # fee payer sequentializes transactions today. in these tests module publisher is the fee payer, so larger number of modules tests throughput with multiple fee payers
+    RunGroupConfig(key=RunGroupKey("no-op-fee-payer"), included_in=LAND_BLOCKING_AND_C),
+    RunGroupConfig(key=RunGroupKey("no-op-fee-payer", module_working_set_size=50), included_in=Flow.CONTINUOUS),
+
+    RunGroupConfig(expected_tps=50000, key=RunGroupKey("coin_transfer_connected_components", executor_type="sharded"), key_extra=RunGroupKeyExtra(sharding_traffic_flags="--connected-tx-grps 5000", transaction_type_override=""), included_in=Flow.REPRESENTATIVE, waived=True),
+    RunGroupConfig(expected_tps=50000, key=RunGroupKey("coin_transfer_hotspot", executor_type="sharded"), key_extra=RunGroupKeyExtra(sharding_traffic_flags="--hotspot-probability 0.8", transaction_type_override=""), included_in=Flow.REPRESENTATIVE, waived=True),
+
+    # setting separately for previewnet, as we run on a different number of cores.
+    RunGroupConfig(expected_tps=29000 if NUM_ACCOUNTS < 5000000 else 20000, key=RunGroupKey("coin-transfer"), key_extra=RunGroupKeyExtra(smaller_working_set=True), included_in=Flow.MAINNET | Flow.MAINNET_LARGE_DB),
+    RunGroupConfig(expected_tps=23000 if NUM_ACCOUNTS < 5000000 else 15000, key=RunGroupKey("account-generation"), included_in=Flow.MAINNET | Flow.MAINNET_LARGE_DB),
+    RunGroupConfig(expected_tps=130 if NUM_ACCOUNTS < 5000000 else 60, key=RunGroupKey("publish-package"), included_in=Flow.MAINNET | Flow.MAINNET_LARGE_DB),
+    RunGroupConfig(expected_tps=12000 if NUM_ACCOUNTS < 5000000 else 6800, key=RunGroupKey("token-v2-ambassador-mint"), included_in=Flow.MAINNET | Flow.MAINNET_LARGE_DB),
+    RunGroupConfig(expected_tps=35000 if NUM_ACCOUNTS < 5000000 else 28000, key=RunGroupKey("coin_transfer_connected_components", executor_type="sharded"), key_extra=RunGroupKeyExtra(sharding_traffic_flags="--connected-tx-grps 5000", transaction_type_override=""), included_in=Flow.MAINNET | Flow.MAINNET_LARGE_DB, waived=True),
+    RunGroupConfig(expected_tps=27000 if NUM_ACCOUNTS < 5000000 else 23000, key=RunGroupKey("coin_transfer_hotspot", executor_type="sharded"), key_extra=RunGroupKeyExtra(sharding_traffic_flags="--hotspot-probability 0.8", transaction_type_override=""), included_in=Flow.MAINNET | Flow.MAINNET_LARGE_DB, waived=True),
+]
+# fmt: on
+
 # Run the single node with performance optimizations enabled
 target_directory = "execution/executor-benchmark/src"
 
@@ -270,6 +388,7 @@ class RunResults:
     io_gps: float
     execution_gps: float
     gpt: float
+    storage_fee_pt: float
     output_bps: float
     fraction_in_execution: float
     fraction_of_execution_in_vm: float
@@ -307,6 +426,7 @@ def extract_run_results(
         io_gps = 0
         execution_gps = 0
         gpt = 0
+        storage_fee_pt = 0
         output_bps = 0
         fraction_in_execution = 0
         fraction_of_execution_in_vm = 0
@@ -324,6 +444,12 @@ def extract_run_results(
             get_only(re.findall(prefix + r" executionGPS: (\d+\.?\d*) gas/s", output))
         )
         gpt = float(get_only(re.findall(prefix + r" GPT: (\d+\.?\d*) gas/txn", output)))
+        storage_fee_pt = float(
+            get_only(
+                re.findall(prefix + r" Storage fee: (\-?\d+\.?\d*) octas/txn", output)
+            )
+        )
+
         output_bps = float(
             get_only(re.findall(prefix + r" output: (\d+\.?\d*) bytes/s", output))
         )
@@ -348,6 +474,7 @@ def extract_run_results(
         io_gps=io_gps,
         execution_gps=execution_gps,
         gpt=gpt,
+        storage_fee_pt=storage_fee_pt,
         output_bps=output_bps,
         fraction_in_execution=fraction_in_execution,
         fraction_of_execution_in_vm=fraction_of_execution_in_vm,
@@ -389,6 +516,7 @@ def print_table(
                 "io g/s",
                 "exe g/s",
                 "g/t",
+                "fee/t",
                 "out B/s",
             ]
         )
@@ -406,9 +534,12 @@ def print_table(
             if single_field is not None:
                 _, field_getter = single_field
                 for num_threads in number_of_execution_threads:
-                    row.append(
-                        field_getter(result.number_of_threads_results[num_threads])
-                    )
+                    if num_threads in result.number_of_threads_results:
+                        row.append(
+                            field_getter(result.number_of_threads_results[num_threads])
+                        )
+                    else:
+                        row.append("-")
 
         if single_field is not None:
             _, field_getter = single_field
@@ -423,6 +554,7 @@ def print_table(
             row.append(int(round(result.single_node_result.io_gps)))
             row.append(int(round(result.single_node_result.execution_gps)))
             row.append(int(round(result.single_node_result.gpt)))
+            row.append(int(round(result.single_node_result.storage_fee_pt)))
             row.append(int(round(result.single_node_result.output_bps)))
         rows.append(row)
 
@@ -446,9 +578,25 @@ def print_table(
                 exit(1)
             move_e2e_benchmark_failed = True
 
+    calibrated_expected_tps = {
+        RunGroupKey(
+            transaction_type=parts[0],
+            module_working_set_size=int(parts[1]),
+            executor_type=parts[2],
+        ): float(parts[CALIBRATED_TPS_INDEX])
+        for line in CALIBRATION.split("\n")
+        if len(
+            parts := [
+                part for part in line.strip().split(CALIBRATION_SEPARATOR) if part
+            ]
+        )
+        >= 1
+    }
+    print(calibrated_expected_tps)
+
     execute_command(f"cargo build {BUILD_FLAG} --package aptos-executor-benchmark")
     print(f"Warmup - creating DB with {NUM_ACCOUNTS} accounts")
-    create_db_command = f"RUST_BACKTRACE=1 {BUILD_FOLDER}/aptos-executor-benchmark --block-size {MAX_BLOCK_SIZE} --execution-threads {NUMBER_OF_EXECUTION_THREADS} {DB_CONFIG_FLAGS} {DB_PRUNER_FLAGS} create-db --data-dir {tmpdirname}/db --num-accounts {NUM_ACCOUNTS}"
+    create_db_command = f"RUST_BACKTRACE=1 {BUILD_FOLDER}/aptos-executor-benchmark --block-size {MAX_BLOCK_SIZE} --execution-threads {NUMBER_OF_EXECUTION_THREADS} {DB_CONFIG_FLAGS} {DB_PRUNER_FLAGS} create-db {FEATURE_FLAGS} --data-dir {tmpdirname}/db --num-accounts {NUM_ACCOUNTS}"
     output = execute_command(create_db_command)
 
     results = []
@@ -470,19 +618,30 @@ def print_table(
         if SELECTED_FLOW not in test.included_in:
             continue
 
+        if SKIP_NATIVE and test.key.executor_type == "native":
+            continue
+
+        if test.key in calibrated_expected_tps:
+            expected_tps = calibrated_expected_tps[test.key]
+        else:
+            print(f"WARNING: Couldn't find {test.key} in calibration results")
+            assert test.expected_tps is not None, test
+            expected_tps = test.expected_tps
+        cur_block_size = int(min([expected_tps, MAX_BLOCK_SIZE]))
+
         print(f"Testing {test.key}")
-        if test.key.transaction_type_override == "":
+        if test.key_extra.transaction_type_override == "":
             workload_args_str = ""
         else:
             transaction_type_list = (
-                test.key.transaction_type_override or test.key.transaction_type
+                test.key_extra.transaction_type_override or test.key.transaction_type
+            )
+            transaction_weights_list = (
+                test.key_extra.transaction_weights_override or "1"
             )
-            transaction_weights_list = test.key.transaction_weights_override or "1"
             workload_args_str = f"--transaction-type {transaction_type_list} --transaction-weights {transaction_weights_list}"
 
-        cur_block_size = int(min([test.expected_tps, MAX_BLOCK_SIZE]))
-
-        sharding_traffic_flags = test.key.sharding_traffic_flags or ""
+        sharding_traffic_flags = test.key_extra.sharding_traffic_flags or ""
 
         if test.key.executor_type == "VM":
             executor_type_str = "--transactions-per-sender 1"
@@ -495,15 +654,17 @@ def print_table(
         txn_emitter_prefix_str = "" if NUM_BLOCKS > 200 else " --generate-then-execute"
 
         ADDITIONAL_DST_POOL_ACCOUNTS = (
-            2 * MAX_BLOCK_SIZE * (1 if test.key.smaller_working_set else NUM_BLOCKS)
+            2
+            * MAX_BLOCK_SIZE
+            * (1 if test.key_extra.smaller_working_set else NUM_BLOCKS)
         )
 
-        common_command_suffix = f"{executor_type_str} {txn_emitter_prefix_str} --block-size {cur_block_size} {DB_CONFIG_FLAGS} {DB_PRUNER_FLAGS} run-executor {workload_args_str} --module-working-set-size {test.key.module_working_set_size} --main-signer-accounts {MAIN_SIGNER_ACCOUNTS} --additional-dst-pool-accounts {ADDITIONAL_DST_POOL_ACCOUNTS} --data-dir {tmpdirname}/db  --checkpoint-dir {tmpdirname}/cp"
+        common_command_suffix = f"{executor_type_str} {txn_emitter_prefix_str} --block-size {cur_block_size} {DB_CONFIG_FLAGS} {DB_PRUNER_FLAGS} run-executor {FEATURE_FLAGS} {workload_args_str} --module-working-set-size {test.key.module_working_set_size} --main-signer-accounts {MAIN_SIGNER_ACCOUNTS} --additional-dst-pool-accounts {ADDITIONAL_DST_POOL_ACCOUNTS} --data-dir {tmpdirname}/db  --checkpoint-dir {tmpdirname}/cp"
 
         number_of_threads_results = {}
 
         for execution_threads in EXECUTION_ONLY_NUMBER_OF_THREADS:
-            test_db_command = f"RUST_BACKTRACE=1 {BUILD_FOLDER}/aptos-executor-benchmark --execution-threads {execution_threads} {common_command_suffix} --skip-commit --blocks {NUM_BLOCKS_DETAILED}"
+            test_db_command = f"RUST_BACKTRACE=1 {BUILD_FOLDER}/aptos-executor-benchmark --execution-threads {execution_threads} --skip-commit {common_command_suffix} --blocks {NUM_BLOCKS_DETAILED}"
             output = execute_command(test_db_command)
 
             number_of_threads_results[execution_threads] = extract_run_results(
@@ -529,7 +690,7 @@ def print_table(
                 single_node_result=single_node_result,
                 number_of_threads_results=number_of_threads_results,
                 block_size=cur_block_size,
-                expected_tps=test.expected_tps,
+                expected_tps=expected_tps,
             )
         )
 
@@ -545,7 +706,7 @@ def print_table(
                     single_node_result=stage_node_result,
                     number_of_threads_results=number_of_threads_results,
                     block_size=cur_block_size,
-                    expected_tps=test.expected_tps,
+                    expected_tps=expected_tps,
                 )
             )
 
@@ -558,7 +719,8 @@ def print_table(
                     "module_working_set_size": test.key.module_working_set_size,
                     "executor_type": test.key.executor_type,
                     "block_size": cur_block_size,
-                    "expected_tps": test.expected_tps,
+                    "execution_threads": NUMBER_OF_EXECUTION_THREADS,
+                    "expected_tps": expected_tps,
                     "waived": test.waived,
                     "tps": single_node_result.tps,
                     "gps": single_node_result.gps,
@@ -580,6 +742,19 @@ def print_table(
                 by_levels=True,
                 single_field=("g/s", lambda r: int(round(r.gps))),
             )
+            print_table(
+                results,
+                by_levels=False,
+                single_field=("gas/txn", lambda r: int(round(r.gpt))),
+            )
+            print_table(
+                results,
+                by_levels=False,
+                single_field=(
+                    "storage fee/txn",
+                    lambda r: int(round(r.storage_fee_pt)),
+                ),
+            )
             print_table(
                 results,
                 by_levels=True,
@@ -595,35 +770,39 @@ def print_table(
             )
             print_table(results, by_levels=False, single_field=None)
 
+        # if expected TPS is not set, skip performance checks
+        if expected_tps is None:
+            continue
+
         if (
             NOISE_LOWER_LIMIT is not None
-            and single_node_result.tps < test.expected_tps * NOISE_LOWER_LIMIT
+            and single_node_result.tps < expected_tps * NOISE_LOWER_LIMIT
         ):
-            text = f"regression detected {single_node_result.tps} < {test.expected_tps * NOISE_LOWER_LIMIT} = {test.expected_tps} * {NOISE_LOWER_LIMIT}, {test.key} didn't meet TPS requirements"
+            text = f"regression detected {single_node_result.tps} < {expected_tps * NOISE_LOWER_LIMIT} = {expected_tps} * {NOISE_LOWER_LIMIT}, {test.key} didn't meet TPS requirements"
             if not test.waived:
                 errors.append(text)
             else:
                 warnings.append(text)
         elif (
             NOISE_LOWER_LIMIT_WARN is not None
-            and single_node_result.tps < test.expected_tps * NOISE_LOWER_LIMIT_WARN
+            and single_node_result.tps < expected_tps * NOISE_LOWER_LIMIT_WARN
         ):
-            text = f"potential (but within normal noise) regression detected {single_node_result.tps} < {test.expected_tps * NOISE_LOWER_LIMIT_WARN} = {test.expected_tps} * {NOISE_LOWER_LIMIT_WARN}, {test.key} didn't meet TPS requirements"
+            text = f"potential (but within normal noise) regression detected {single_node_result.tps} < {expected_tps * NOISE_LOWER_LIMIT_WARN} = {expected_tps} * {NOISE_LOWER_LIMIT_WARN}, {test.key} didn't meet TPS requirements"
             warnings.append(text)
         elif (
             NOISE_UPPER_LIMIT is not None
-            and single_node_result.tps > test.expected_tps * NOISE_UPPER_LIMIT
+            and single_node_result.tps > expected_tps * NOISE_UPPER_LIMIT
         ):
-            text = f"perf improvement detected {single_node_result.tps} > {test.expected_tps * NOISE_UPPER_LIMIT} = {test.expected_tps} * {NOISE_UPPER_LIMIT}, {test.key} exceeded TPS requirements, increase TPS requirements to match new baseline"
+            text = f"perf improvement detected {single_node_result.tps} > {expected_tps * NOISE_UPPER_LIMIT} = {expected_tps} * {NOISE_UPPER_LIMIT}, {test.key} exceeded TPS requirements, increase TPS requirements to match new baseline"
             if not test.waived:
                 errors.append(text)
             else:
                 warnings.append(text)
         elif (
             NOISE_UPPER_LIMIT_WARN is not None
-            and single_node_result.tps > test.expected_tps * NOISE_UPPER_LIMIT_WARN
+            and single_node_result.tps > expected_tps * NOISE_UPPER_LIMIT_WARN
         ):
-            text = f"potential (but within normal noise) perf improvement detected {single_node_result.tps} > {test.expected_tps * NOISE_UPPER_LIMIT_WARN} = {test.expected_tps} * {NOISE_UPPER_LIMIT_WARN}, {test.key} exceeded TPS requirements, increase TPS requirements to match new baseline"
+            text = f"potential (but within normal noise) perf improvement detected {single_node_result.tps} > {expected_tps * NOISE_UPPER_LIMIT_WARN} = {expected_tps} * {NOISE_UPPER_LIMIT_WARN}, {test.key} exceeded TPS requirements, increase TPS requirements to match new baseline"
             warnings.append(text)
 
 if HIDE_OUTPUT:
diff --git a/testsuite/smoke-test/Cargo.toml b/testsuite/smoke-test/Cargo.toml
index d0b9cb1b62fc9..16dfafe0f632b 100644
--- a/testsuite/smoke-test/Cargo.toml
+++ b/testsuite/smoke-test/Cargo.toml
@@ -21,6 +21,7 @@ aptos-config = { workspace = true }
 aptos-consensus = { workspace = true }
 aptos-crypto = { workspace = true }
 aptos-db = { workspace = true }
+aptos-db-indexer-schemas = { workspace = true }
 aptos-debugger = { workspace = true }
 aptos-dkg = { workspace = true }
 aptos-faucet-core = { workspace = true }
@@ -30,12 +31,14 @@ aptos-gas-algebra = { workspace = true }
 aptos-gas-schedule = { workspace = true, features = ["testing"] }
 aptos-global-constants = { workspace = true }
 aptos-indexer = { workspace = true }
+aptos-indexer-grpc-table-info = { workspace = true }
 aptos-inspection-service = { workspace = true }
 aptos-keygen = { workspace = true }
 aptos-move-debugger = { workspace = true }
 aptos-release-builder = { workspace = true }
 aptos-rest-client = { workspace = true }
 aptos-rosetta = { workspace = true }
+aptos-schemadb = { workspace = true }
 aptos-sdk = { workspace = true }
 aptos-storage-interface = { workspace = true }
 aptos-temppath = { workspace = true }
@@ -62,6 +65,7 @@ walkdir = { workspace = true }
 
 [dev-dependencies]
 aptos-backup-cli = { workspace = true }
+aptos-db-indexer = { workspace = true, features = ["fuzzing"] }
 aptos-genesis = { workspace = true }
 aptos-infallible = { workspace = true }
 aptos-logger = { workspace = true }
@@ -76,3 +80,5 @@ rand = { workspace = true }
 regex = { workspace = true }
 reqwest = { workspace = true }
 serde_yaml = { workspace = true }
+tempfile = { workspace = true }
+
diff --git a/testsuite/smoke-test/src/aptos/error_report.rs b/testsuite/smoke-test/src/aptos/error_report.rs
index d3bee2ad9e6ba..96a4a184353a1 100644
--- a/testsuite/smoke-test/src/aptos/error_report.rs
+++ b/testsuite/smoke-test/src/aptos/error_report.rs
@@ -11,7 +11,7 @@ use aptos_types::{
 
 async fn submit_and_check_err<F: Fn(TransactionBuilder) -> TransactionBuilder>(
     local_account: &LocalAccount,
-    info: &mut AptosPublicInfo<'_>,
+    info: &mut AptosPublicInfo,
     f: F,
     expected: &str,
 ) {
@@ -34,7 +34,7 @@ async fn submit_and_check_err<F: Fn(TransactionBuilder) -> TransactionBuilder>(
 
 #[tokio::test]
 async fn test_error_report() {
-    let mut swarm = new_local_swarm_with_aptos(1).await;
+    let swarm = new_local_swarm_with_aptos(1).await;
     let mut info = swarm.aptos_public_info();
 
     let local_account = info.random_account();
diff --git a/testsuite/smoke-test/src/aptos/gas_check.rs b/testsuite/smoke-test/src/aptos/gas_check.rs
index 68f7d79659ff8..f3f63915486e9 100644
--- a/testsuite/smoke-test/src/aptos/gas_check.rs
+++ b/testsuite/smoke-test/src/aptos/gas_check.rs
@@ -12,7 +12,7 @@ use std::time::Duration;
 #[ignore]
 #[tokio::test]
 async fn test_gas_check() {
-    let mut swarm = new_local_swarm_with_aptos(1).await;
+    let swarm = new_local_swarm_with_aptos(1).await;
     let mut info = swarm.aptos_public_info();
 
     let account1 = info.random_account();
diff --git a/testsuite/smoke-test/src/aptos/mint_transfer.rs b/testsuite/smoke-test/src/aptos/mint_transfer.rs
index 6740ec1b952f7..8be365164a269 100644
--- a/testsuite/smoke-test/src/aptos/mint_transfer.rs
+++ b/testsuite/smoke-test/src/aptos/mint_transfer.rs
@@ -9,7 +9,7 @@ use aptos_types::transaction::{ExecutionStatus, TransactionStatus};
 
 #[tokio::test(flavor = "multi_thread", worker_threads = 1)]
 async fn test_mint_transfer() {
-    let mut swarm = new_local_swarm_with_aptos(1).await;
+    let swarm = new_local_swarm_with_aptos(1).await;
     let mut info = swarm.aptos_public_info();
 
     let account1 = info.random_account();
@@ -81,7 +81,7 @@ async fn test_mint_transfer() {
         .unwrap();
 
     let output = debugger
-        .execute_past_transactions(txn_ver, 1, 1)
+        .execute_past_transactions(txn_ver, 1, false, 1, &[1])
         .await
         .unwrap()
         .pop()
diff --git a/testsuite/smoke-test/src/aptos/move_test_helpers.rs b/testsuite/smoke-test/src/aptos/move_test_helpers.rs
index 013bff5e3874b..d5d0f2aa80b9f 100644
--- a/testsuite/smoke-test/src/aptos/move_test_helpers.rs
+++ b/testsuite/smoke-test/src/aptos/move_test_helpers.rs
@@ -11,7 +11,7 @@ use std::path::PathBuf;
 
 /// New style publishing via `code::publish_package`
 pub async fn publish_package(
-    info: &mut AptosPublicInfo<'_>,
+    info: &mut AptosPublicInfo,
     move_dir: PathBuf,
 ) -> Result<TransactionFactory> {
     let package = BuiltPackage::build(move_dir, BuildOptions::default())?;
diff --git a/testsuite/smoke-test/src/aptos/package_publish.rs b/testsuite/smoke-test/src/aptos/package_publish.rs
index 7d1b48285c1cc..3c9c408fc8c82 100644
--- a/testsuite/smoke-test/src/aptos/package_publish.rs
+++ b/testsuite/smoke-test/src/aptos/package_publish.rs
@@ -6,7 +6,7 @@ use aptos_forge::Swarm;
 
 #[tokio::test]
 async fn test_package_publish() {
-    let mut swarm = new_local_swarm_with_aptos(1).await;
+    let swarm = new_local_swarm_with_aptos(1).await;
     let mut info = swarm.aptos_public_info();
 
     let base_dir = std::path::Path::new(env!("CARGO_MANIFEST_DIR"));
diff --git a/testsuite/smoke-test/src/aptos_cli/validator.rs b/testsuite/smoke-test/src/aptos_cli/validator.rs
index f023e06779a60..69e7bd3429074 100644
--- a/testsuite/smoke-test/src/aptos_cli/validator.rs
+++ b/testsuite/smoke-test/src/aptos_cli/validator.rs
@@ -3,7 +3,7 @@
 
 use crate::{
     smoke_test_environment::SwarmBuilder,
-    test_utils::{create_and_fund_account, MAX_CATCH_UP_WAIT_SECS},
+    utils::{create_and_fund_account, MAX_CATCH_UP_WAIT_SECS},
 };
 use aptos::{
     account::create::DEFAULT_FUNDED_COINS,
@@ -42,7 +42,7 @@ use std::{
 
 #[tokio::test]
 async fn test_analyze_validators() {
-    let (mut swarm, cli, _faucet) = SwarmBuilder::new_local(1)
+    let (swarm, cli, _faucet) = SwarmBuilder::new_local(1)
         .with_aptos()
         .with_init_genesis_stake(Arc::new(|_i, genesis_stake_amount| {
             *genesis_stake_amount = 100000;
@@ -388,7 +388,7 @@ async fn test_onchain_shuffling_change() {
 
     assert_eq!(
         current_execution_config.transaction_shuffler_type(),
-        TransactionShufflerType::SenderAwareV2(32),
+        TransactionShufflerType::default_for_genesis(),
     );
 
     assert_reordering(&mut swarm, true).await;
@@ -545,7 +545,7 @@ pub(crate) fn generate_blob(data: &[u8]) -> String {
 async fn test_large_total_stake() {
     // just barelly below u64::MAX
     const BASE: u64 = 10_000_000_000_000_000_000;
-    let (mut swarm, mut cli, _faucet) = SwarmBuilder::new_local(4)
+    let (swarm, mut cli, _faucet) = SwarmBuilder::new_local(4)
         .with_init_genesis_stake(Arc::new(|_, genesis_stake_amount| {
             // make sure we have quorum
             *genesis_stake_amount = BASE;
@@ -613,7 +613,7 @@ async fn test_nodes_rewards() {
     // with 10% APY, BASE amount gives 100 rewards per second
     const BASE: u64 = 3600u64 * 24 * 365 * 10 * 100;
 
-    let (mut swarm, mut cli, _faucet) = SwarmBuilder::new_local(4)
+    let (swarm, mut cli, _faucet) = SwarmBuilder::new_local(4)
         .with_init_config(Arc::new(|_, conf, _| {
             // reduce timeout, as we will have dead node during rounds
             conf.consensus.round_initial_timeout_ms = 200;
@@ -946,7 +946,7 @@ async fn test_nodes_rewards() {
 
 #[tokio::test]
 async fn test_register_and_update_validator() {
-    let (mut swarm, mut cli, _faucet) = SwarmBuilder::new_local(1)
+    let (swarm, mut cli, _faucet) = SwarmBuilder::new_local(1)
         .with_aptos()
         .build_with_cli(0)
         .await;
@@ -1042,7 +1042,7 @@ async fn test_register_and_update_validator() {
 
 #[tokio::test]
 async fn test_join_and_leave_validator() {
-    let (mut swarm, mut cli, _faucet) = SwarmBuilder::new_local(1)
+    let (swarm, mut cli, _faucet) = SwarmBuilder::new_local(1)
         .with_aptos()
         .with_init_config(Arc::new(|_i, conf, _| {
             // reduce timeout, as we will have dead node during rounds
@@ -1207,7 +1207,7 @@ async fn test_join_and_leave_validator() {
 
 #[tokio::test]
 async fn test_owner_create_and_delegate_flow() {
-    let (mut swarm, mut cli, _faucet) = SwarmBuilder::new_local(1)
+    let (swarm, mut cli, _faucet) = SwarmBuilder::new_local(1)
         .with_aptos()
         .with_init_config(Arc::new(|_i, conf, _| {
             // reduce timeout, as we will have dead node during rounds
@@ -1223,7 +1223,8 @@ async fn test_owner_create_and_delegate_flow() {
             genesis_config.epoch_duration_secs = 5;
             genesis_config.recurring_lockup_duration_secs = 10;
             genesis_config.voting_duration_secs = 5;
-            genesis_config.min_stake = 500000
+            genesis_config.min_stake = 500000;
+            genesis_config.randomness_config_override = Some(OnChainRandomnessConfig::Off);
         }))
         .build_with_cli(0)
         .await;
diff --git a/testsuite/smoke-test/src/client.rs b/testsuite/smoke-test/src/client.rs
index 3c3f7b512fc98..7aa44679baa7f 100644
--- a/testsuite/smoke-test/src/client.rs
+++ b/testsuite/smoke-test/src/client.rs
@@ -4,7 +4,7 @@
 
 use crate::{
     smoke_test_environment::new_local_swarm_with_aptos,
-    test_utils::{
+    utils::{
         assert_balance, check_create_mint_transfer, create_and_fund_account, transfer_coins,
         MAX_HEALTHY_WAIT_SECS,
     },
diff --git a/testsuite/smoke-test/src/consensus/consensus_fault_tolerance.rs b/testsuite/smoke-test/src/consensus/consensus_fault_tolerance.rs
index dff8acfb8f0e7..56e6cea9fa2d5 100644
--- a/testsuite/smoke-test/src/consensus/consensus_fault_tolerance.rs
+++ b/testsuite/smoke-test/src/consensus/consensus_fault_tolerance.rs
@@ -3,7 +3,7 @@
 
 use crate::{
     smoke_test_environment::SwarmBuilder,
-    test_utils::{create_and_fund_account, transfer_coins_non_blocking},
+    utils::{create_and_fund_account, transfer_coins_non_blocking},
 };
 use aptos_forge::{
     test_utils::consensus_utils::{
@@ -134,7 +134,8 @@ async fn run_fail_point_test(
     >,
     // (cycle, executed_epochs, executed_rounds, executed_transactions, current_state, previous_state)
     check_cycle: Box<
-        dyn FnMut(usize, u64, u64, u64, Vec<NodeState>, Vec<NodeState>) -> anyhow::Result<()>,
+        dyn FnMut(usize, u64, u64, u64, Vec<NodeState>, Vec<NodeState>) -> anyhow::Result<()>
+            + Send,
     >,
 ) {
     let mut swarm = create_swarm(num_validators, max_block_size).await;
@@ -145,8 +146,15 @@ async fn run_fail_point_test(
             finish_traffic: Arc::new(AtomicBool::new(false)),
         }
     };
+    let (validator_clients, public_info) = {
+        (
+            swarm.get_validator_clients_with_names(),
+            swarm.aptos_public_info(),
+        )
+    };
     test_consensus_fault_tolerance(
-        &mut swarm,
+        validator_clients,
+        public_info,
         cycles,
         cycle_duration_s,
         parts_in_cycle,
@@ -159,31 +167,126 @@ async fn run_fail_point_test(
     .unwrap();
 }
 
+fn successful_criteria(executed_epochs: u64, executed_rounds: u64, executed_transactions: u64) {
+    assert!(
+        executed_transactions >= 4,
+        "no progress with active consensus, only {} transactions",
+        executed_transactions
+    );
+    assert!(
+        executed_epochs >= 1 || executed_rounds >= 2,
+        "no progress with active consensus, only {} epochs, {} rounds",
+        executed_epochs,
+        executed_rounds
+    );
+}
+
 #[tokio::test]
 async fn test_no_failures() {
     let num_validators = 3;
 
-    let mut swarm = create_swarm(num_validators, 1).await;
+    let swarm = create_swarm(num_validators, 1).await;
 
+    let (validator_clients, public_info) = {
+        (
+            swarm.get_validator_clients_with_names(),
+            swarm.aptos_public_info(),
+        )
+    };
     test_consensus_fault_tolerance(
-        &mut swarm,
+        validator_clients,
+        public_info,
         3,
         5.0,
         1,
         no_failure_injection(),
-        Box::new(move |_, _, executed_rounds, executed_transactions, _, _| {
-            assert!(
-                executed_transactions >= 4,
-                "no progress with active consensus, only {} transactions",
-                executed_transactions
-            );
-            assert!(
-                executed_rounds >= 2,
-                "no progress with active consensus, only {} rounds",
-                executed_rounds
-            );
-            Ok(())
-        }),
+        Box::new(
+            move |_, executed_epochs, executed_rounds, executed_transactions, _, _| {
+                successful_criteria(executed_epochs, executed_rounds, executed_transactions);
+                Ok(())
+            },
+        ),
+        true,
+        false,
+    )
+    .await
+    .unwrap();
+}
+
+#[tokio::test]
+async fn test_ordered_only_cert() {
+    let num_validators = 3;
+
+    let swarm = create_swarm(num_validators, 1).await;
+
+    let (validator_clients, public_info) = {
+        (
+            swarm.get_validator_clients_with_names(),
+            swarm.aptos_public_info(),
+        )
+    };
+    test_consensus_fault_tolerance(
+        validator_clients,
+        public_info,
+        3,
+        5.0,
+        1,
+        Box::new(FailPointFailureInjection::new(Box::new(move |cycle, _| {
+            (
+                vec![(
+                    cycle % num_validators,
+                    "consensus::ordered_only_cert".to_string(),
+                    format!("{}%return", 50),
+                )],
+                true,
+            )
+        }))),
+        Box::new(
+            move |_, executed_epochs, executed_rounds, executed_transactions, _, _| {
+                successful_criteria(executed_epochs, executed_rounds, executed_transactions);
+                Ok(())
+            },
+        ),
+        true,
+        false,
+    )
+    .await
+    .unwrap();
+}
+
+#[tokio::test]
+async fn test_execution_retry() {
+    let num_validators = 4;
+
+    let swarm = create_swarm(num_validators, 1).await;
+    let (validator_clients, public_info) = {
+        (
+            swarm.get_validator_clients_with_names(),
+            swarm.aptos_public_info(),
+        )
+    };
+    test_consensus_fault_tolerance(
+        validator_clients,
+        public_info,
+        3,
+        5.0,
+        1,
+        Box::new(FailPointFailureInjection::new(Box::new(move |cycle, _| {
+            (
+                vec![(
+                    cycle % num_validators,
+                    "consensus::prepare_block".to_string(),
+                    format!("{}%return", 50),
+                )],
+                true,
+            )
+        }))),
+        Box::new(
+            move |_, executed_epochs, executed_rounds, executed_transactions, _, _| {
+                successful_criteria(executed_epochs, executed_rounds, executed_transactions);
+                Ok(())
+            },
+        ),
         true,
         false,
     )
@@ -303,19 +406,12 @@ async fn test_changing_working_consensus() {
                 (vec![], false)
             }
         }),
-        Box::new(|_, _, executed_rounds, executed_transactions, _, _| {
-            assert!(
-                executed_transactions >= 5,
-                "no progress with active consensus, only {} transactions",
-                executed_transactions
-            );
-            assert!(
-                executed_rounds >= 2,
-                "no progress with active consensus, only {} rounds",
-                executed_rounds
-            );
-            Ok(())
-        }),
+        Box::new(
+            move |_, executed_epochs, executed_rounds, executed_transactions, _, _| {
+                successful_criteria(executed_epochs, executed_rounds, executed_transactions);
+                Ok(())
+            },
+        ),
     )
     .await;
 }
@@ -364,19 +460,12 @@ async fn test_changing_working_consensus_fast() {
                 true,
             )
         }),
-        Box::new(|_, _, executed_rounds, executed_transactions, _, _| {
-            assert!(
-                executed_transactions >= 4,
-                "no progress with active consensus, only {} transactions",
-                executed_transactions
-            );
-            assert!(
-                executed_rounds >= 2,
-                "no progress with active consensus, only {} rounds",
-                executed_rounds
-            );
-            Ok(())
-        }),
+        Box::new(
+            move |_, executed_epochs, executed_rounds, executed_transactions, _, _| {
+                successful_criteria(executed_epochs, executed_rounds, executed_transactions);
+                Ok(())
+            },
+        ),
     )
     .await;
 }
@@ -428,33 +517,36 @@ async fn test_alternating_having_consensus() {
                 (vec![], false)
             }
         }),
-        Box::new(|cycle, _, executed_rounds, executed_transactions, _, _| {
-            if cycle % 2 == 1 {
-                // allow 1 round / 3 transactions, in case anything was leftover in the pipeline
-                assert!(
-                    executed_transactions <= 3,
-                    "progress with active consensus, {} transactions",
-                    executed_transactions
-                );
-                assert!(
-                    executed_rounds <= 1,
-                    "progress with active consensus, {} rounds",
-                    executed_rounds
-                );
-            } else {
-                assert!(
-                    executed_transactions >= 5,
-                    "no progress with active consensus, only {} transactions",
-                    executed_transactions
-                );
-                assert!(
-                    executed_rounds >= 2,
-                    "no progress with active consensus, only {} rounds",
-                    executed_rounds
-                );
-            }
-            Ok(())
-        }),
+        Box::new(
+            |cycle, executed_epochs, executed_rounds, executed_transactions, _, _| {
+                if cycle % 2 == 1 {
+                    // allow 1 round / 3 transactions, in case anything was leftover in the pipeline
+                    assert!(
+                        executed_transactions <= 3,
+                        "progress with active consensus, {} transactions",
+                        executed_transactions
+                    );
+                    assert!(
+                        executed_rounds <= 1,
+                        "progress with active consensus, {} rounds",
+                        executed_rounds
+                    );
+                } else {
+                    assert!(
+                        executed_transactions >= 5,
+                        "no progress with active consensus, only {} transactions",
+                        executed_transactions
+                    );
+                    assert!(
+                        executed_epochs >= 1 || executed_rounds >= 2,
+                        "no progress with active consensus, only {} epochs, {} rounds",
+                        executed_epochs,
+                        executed_rounds
+                    );
+                }
+                Ok(())
+            },
+        ),
     )
     .await;
 }
diff --git a/testsuite/smoke-test/src/consensus/consensusdb_recovery.rs b/testsuite/smoke-test/src/consensus/consensusdb_recovery.rs
index 608987c95b777..6ff1ca68d5bbd 100644
--- a/testsuite/smoke-test/src/consensus/consensusdb_recovery.rs
+++ b/testsuite/smoke-test/src/consensus/consensusdb_recovery.rs
@@ -3,7 +3,7 @@
 
 use crate::{
     smoke_test_environment::new_local_swarm_with_aptos,
-    test_utils::{assert_balance, create_and_fund_account, transfer_coins, MAX_HEALTHY_WAIT_SECS},
+    utils::{assert_balance, create_and_fund_account, transfer_coins, MAX_HEALTHY_WAIT_SECS},
 };
 use aptos_consensus::CONSENSUS_DB_NAME;
 use aptos_forge::{HealthCheckError, NodeExt, Swarm};
@@ -12,6 +12,7 @@ use std::{
     time::{Duration, Instant},
 };
 
+#[ignore] // TODO: turn this test back on once the flakes have resolved.
 #[tokio::test]
 async fn test_consensusdb_recovery() {
     let mut swarm = new_local_swarm_with_aptos(4).await;
diff --git a/testsuite/smoke-test/src/consensus/dag/dag_fault_tolerance.rs b/testsuite/smoke-test/src/consensus/dag/dag_fault_tolerance.rs
index b133a9499ef3b..2636a3def9491 100644
--- a/testsuite/smoke-test/src/consensus/dag/dag_fault_tolerance.rs
+++ b/testsuite/smoke-test/src/consensus/dag/dag_fault_tolerance.rs
@@ -10,7 +10,7 @@ use aptos_forge::{
     test_utils::consensus_utils::{
         no_failure_injection, test_consensus_fault_tolerance, FailPointFailureInjection, NodeState,
     },
-    LocalSwarm,
+    LocalSwarm, Swarm, SwarmExt,
 };
 use aptos_types::on_chain_config::{
     ConsensusAlgorithmConfig, DagConsensusConfigV1, OnChainConsensusConfig, ValidatorTxnConfig,
@@ -57,13 +57,20 @@ pub async fn create_dag_swarm(num_nodes: usize) -> LocalSwarm {
 }
 
 #[tokio::test]
+#[ignore]
 async fn test_no_failures() {
     let num_validators = 3;
 
-    let mut swarm = create_dag_swarm(num_validators).await;
-
+    let swarm = create_dag_swarm(num_validators).await;
+    let (validator_clients, public_info) = {
+        (
+            swarm.get_validator_clients_with_names(),
+            swarm.aptos_public_info(),
+        )
+    };
     test_consensus_fault_tolerance(
-        &mut swarm,
+        validator_clients,
+        public_info,
         3,
         5.0,
         1,
@@ -96,7 +103,8 @@ async fn run_dag_fail_point_test(
     >,
     // (cycle, executed_epochs, executed_rounds, executed_transactions, current_state, previous_state)
     check_cycle: Box<
-        dyn FnMut(usize, u64, u64, u64, Vec<NodeState>, Vec<NodeState>) -> anyhow::Result<()>,
+        dyn FnMut(usize, u64, u64, u64, Vec<NodeState>, Vec<NodeState>) -> anyhow::Result<()>
+            + Send,
     >,
 ) {
     let mut swarm = create_dag_swarm(num_validators).await;
@@ -107,8 +115,15 @@ async fn run_dag_fail_point_test(
             finish_traffic: Arc::new(AtomicBool::new(false)),
         }
     };
+    let (validator_clients, public_info) = {
+        (
+            swarm.get_validator_clients_with_names(),
+            swarm.aptos_public_info(),
+        )
+    };
     test_consensus_fault_tolerance(
-        &mut swarm,
+        validator_clients,
+        public_info,
         cycles,
         cycle_duration_s,
         parts_in_cycle,
diff --git a/testsuite/smoke-test/src/consensus/quorum_store_fault_tolerance.rs b/testsuite/smoke-test/src/consensus/quorum_store_fault_tolerance.rs
index e1ad0f22ec38c..d85ea146d4a6a 100644
--- a/testsuite/smoke-test/src/consensus/quorum_store_fault_tolerance.rs
+++ b/testsuite/smoke-test/src/consensus/quorum_store_fault_tolerance.rs
@@ -40,6 +40,8 @@ async fn generate_traffic_and_assert_committed(
             TransactionType::CoinTransfer {
                 invalid_transaction_ratio: 0,
                 sender_use_account_pool: false,
+                non_conflicting: false,
+                use_fa_transfer: false,
             },
             70,
         ),
@@ -370,21 +372,24 @@ async fn test_swarm_with_bad_non_qs_node() {
         .unwrap();
 
     info!("generate traffic");
-    let tx_stat = generate_traffic(
-        &mut swarm,
-        &[dishonest_peer_id],
-        Duration::from_secs(20),
-        1,
-        vec![vec![
-            (TransactionTypeArg::CoinTransfer.materialize_default(), 70),
-            (
-                TransactionTypeArg::AccountGeneration.materialize_default(),
-                20,
-            ),
-        ]],
+    let tx_stat = tokio::time::timeout(
+        Duration::from_secs(60),
+        generate_traffic(
+            &mut swarm,
+            &[dishonest_peer_id],
+            Duration::from_secs(20),
+            1,
+            vec![vec![
+                (TransactionTypeArg::CoinTransfer.materialize_default(), 70),
+                (
+                    TransactionTypeArg::AccountGeneration.materialize_default(),
+                    20,
+                ),
+            ]],
+        ),
     )
     .await;
-    assert!(tx_stat.is_err());
+    assert!(tx_stat.is_err() || tx_stat.is_ok_and(|result| result.is_err()));
 
     generate_traffic_and_assert_committed(
         &mut swarm,
diff --git a/testsuite/smoke-test/src/consensus_observer.rs b/testsuite/smoke-test/src/consensus_observer.rs
new file mode 100644
index 0000000000000..4a114be3dcdb4
--- /dev/null
+++ b/testsuite/smoke-test/src/consensus_observer.rs
@@ -0,0 +1,176 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    smoke_test_environment::SwarmBuilder,
+    state_sync_utils,
+    state_sync_utils::enable_consensus_observer,
+    utils::{create_test_accounts, execute_transactions, wait_for_all_nodes},
+};
+use aptos_config::config::NodeConfig;
+use aptos_forge::NodeExt;
+use std::sync::Arc;
+
+#[tokio::test]
+async fn test_consensus_observer_fast_sync_epoch_changes() {
+    // Test fast syncing with consensus observer and epoch changes
+    state_sync_utils::test_fullnode_fast_sync(true, true).await;
+}
+
+#[tokio::test]
+async fn test_consensus_observer_fast_sync_no_epoch_changes() {
+    // Test fast syncing with consensus observer and without epoch changes
+    state_sync_utils::test_fullnode_fast_sync(false, true).await;
+}
+
+#[tokio::test]
+async fn test_consensus_observer_fullnode_sync() {
+    // Create a validator swarm of 1 validator with consensus observer enabled
+    let mut swarm = SwarmBuilder::new_local(1)
+        .with_aptos()
+        .with_init_config(Arc::new(|_, config, _| {
+            enable_consensus_observer(true, config);
+        }))
+        .build()
+        .await;
+
+    // Create a fullnode config that uses consensus observer
+    let mut vfn_config = NodeConfig::get_default_vfn_config();
+    enable_consensus_observer(true, &mut vfn_config);
+
+    // Create the fullnode
+    let _ = state_sync_utils::create_fullnode(vfn_config, &mut swarm).await;
+
+    // Execute a number of transactions on the validator
+    let validator_peer_id = swarm.validators().next().unwrap().peer_id();
+    let validator_client = swarm.validator(validator_peer_id).unwrap().rest_client();
+    let (mut account_0, account_1) = create_test_accounts(&mut swarm).await;
+    execute_transactions(
+        &mut swarm,
+        &validator_client,
+        &mut account_0,
+        &account_1,
+        false,
+    )
+    .await;
+
+    // Verify the fullnode is up-to-date
+    wait_for_all_nodes(&mut swarm).await;
+}
+
+#[tokio::test]
+async fn test_consensus_observer_fullnode_restart() {
+    // Create a validator swarm of 1 validator with consensus observer enabled
+    let mut swarm = SwarmBuilder::new_local(1)
+        .with_aptos()
+        .with_init_config(Arc::new(|_, config, _| {
+            enable_consensus_observer(true, config);
+        }))
+        .build()
+        .await;
+
+    // Create a fullnode config that uses consensus observer
+    let mut vfn_config = NodeConfig::get_default_vfn_config();
+    enable_consensus_observer(true, &mut vfn_config);
+
+    // Create the fullnode and test its ability to stay up-to-date
+    let vfn_peer_id = state_sync_utils::create_fullnode(vfn_config, &mut swarm).await;
+    state_sync_utils::test_fullnode_sync(vfn_peer_id, &mut swarm, true, false).await;
+}
+
+#[tokio::test]
+async fn test_consensus_observer_fullnode_restart_wipe() {
+    // Create a validator swarm of 1 validator with consensus observer enabled
+    let mut swarm = SwarmBuilder::new_local(1)
+        .with_aptos()
+        .with_init_config(Arc::new(|_, config, _| {
+            enable_consensus_observer(true, config);
+        }))
+        .build()
+        .await;
+
+    // Create a fullnode config that uses consensus observer
+    let mut vfn_config = NodeConfig::get_default_vfn_config();
+    enable_consensus_observer(true, &mut vfn_config);
+
+    // Create the fullnode and test its ability to stay up-to-date (after a data wipe)
+    let vfn_peer_id = state_sync_utils::create_fullnode(vfn_config, &mut swarm).await;
+    state_sync_utils::test_fullnode_sync(vfn_peer_id, &mut swarm, true, true).await;
+}
+
+#[tokio::test]
+async fn test_consensus_observer_validator_restart() {
+    // Test the ability of a validator to catch up after a restart
+    test_validator_restart(false).await;
+}
+
+#[tokio::test]
+async fn test_consensus_observer_validator_restart_wipe() {
+    // Test the ability of a validator to catch up after a data wipe
+    test_validator_restart(true).await;
+}
+
+/// A simple helper function that tests the ability of a validator (and it's
+/// corresponding VFN) to catch up after a restart or data wipe.
+async fn test_validator_restart(clear_storage: bool) {
+    // Create a validator swarm of 4 validators with consensus observer enabled
+    let mut swarm = SwarmBuilder::new_local(4)
+        .with_aptos()
+        .with_init_config(Arc::new(|_, config, _| {
+            enable_consensus_observer(true, config);
+        }))
+        .build()
+        .await;
+
+    // Create a fullnode config that uses consensus observer
+    let mut vfn_config = NodeConfig::get_default_vfn_config();
+    enable_consensus_observer(true, &mut vfn_config);
+
+    // Create the fullnode (i.e., a VFN for the first validator)
+    let _ = state_sync_utils::create_fullnode(vfn_config, &mut swarm).await;
+
+    // Execute transactions on the first validator
+    let validator_peer_id = swarm.validators().next().unwrap().peer_id();
+    let validator_client = swarm.validator(validator_peer_id).unwrap().rest_client();
+    let (mut account_0, account_1) = create_test_accounts(&mut swarm).await;
+    execute_transactions(
+        &mut swarm,
+        &validator_client,
+        &mut account_0,
+        &account_1,
+        true,
+    )
+    .await;
+
+    // Stop the first validator (the VFN will also stop making progress)
+    let validator_peer_id = swarm.validators().next().unwrap().peer_id();
+    state_sync_utils::stop_validator_and_delete_storage(
+        &mut swarm,
+        validator_peer_id,
+        clear_storage,
+    )
+    .await;
+
+    // Execute a number of transactions on another validator
+    let validator_peer_id = swarm.validators().last().unwrap().peer_id();
+    let validator_client = swarm.validator(validator_peer_id).unwrap().rest_client();
+    execute_transactions(
+        &mut swarm,
+        &validator_client,
+        &mut account_0,
+        &account_1,
+        true,
+    )
+    .await;
+
+    // Restart the first validator
+    let validator_peer_id = swarm.validators().next().unwrap().peer_id();
+    swarm
+        .validator_mut(validator_peer_id)
+        .unwrap()
+        .start()
+        .unwrap();
+
+    // Verify that all nodes can catch up
+    wait_for_all_nodes(&mut swarm).await;
+}
diff --git a/testsuite/smoke-test/src/execution.rs b/testsuite/smoke-test/src/execution.rs
index c037c597ce29f..a63be389708cf 100644
--- a/testsuite/smoke-test/src/execution.rs
+++ b/testsuite/smoke-test/src/execution.rs
@@ -2,10 +2,21 @@
 // Parts of the project are originally copyright © Meta Platforms, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::{smoke_test_environment::SwarmBuilder, utils::get_current_version};
-use aptos_forge::{NodeExt, SwarmExt};
+use crate::{
+    aptos_cli::validator::generate_blob, smoke_test_environment::SwarmBuilder,
+    utils::get_current_version,
+};
+use aptos::test::CliTestFramework;
+use aptos_forge::{NodeExt, Swarm, SwarmExt};
+use aptos_rest_client::Client;
+use aptos_types::on_chain_config::{
+    BlockGasLimitType, ExecutionConfigV4, OnChainExecutionConfig, TransactionDeduperType,
+    TransactionShufflerType,
+};
 use std::{sync::Arc, time::Duration};
 
+const MAX_WAIT_SECS: u64 = 30;
+
 #[tokio::test]
 async fn fallback_test() {
     let swarm = SwarmBuilder::new_local(1)
@@ -42,3 +53,139 @@ async fn fallback_test() {
             .expect("milestone 1 taking too long");
     }
 }
+
+async fn update_execution_config(
+    cli: &CliTestFramework,
+    root_cli_index: usize,
+    new_execution_config: OnChainExecutionConfig,
+) {
+    let update_execution_config_script = format!(
+        r#"
+    script {{
+        use aptos_framework::aptos_governance;
+        use aptos_framework::execution_config;
+        fun main(core_resources: &signer) {{
+            let framework_signer = aptos_governance::get_signer_testnet_only(core_resources, @0000000000000000000000000000000000000000000000000000000000000001);
+            let config_bytes = {};
+            execution_config::set_for_next_epoch(&framework_signer, config_bytes);
+            aptos_governance::force_end_epoch(&framework_signer);
+        }}
+    }}
+    "#,
+        generate_blob(&bcs::to_bytes(&new_execution_config).unwrap())
+    );
+    cli.run_script(root_cli_index, &update_execution_config_script)
+        .await
+        .unwrap();
+}
+
+async fn get_last_non_reconfig_block_ending_txn_name(rest_client: &Client) -> Option<&'static str> {
+    let txns = rest_client
+        .get_transactions_bcs(None, Some(10))
+        .await
+        .unwrap()
+        .into_inner();
+    let txn_names = txns
+        .into_iter()
+        .filter(|txn| txn.transaction.is_non_reconfig_block_ending())
+        .map(|txn| txn.transaction.type_name())
+        .collect::<Vec<_>>();
+    println!("{:?}", txn_names);
+    txn_names.last().copied()
+}
+
+#[tokio::test]
+async fn block_epilogue_upgrade_test() {
+    let (swarm, mut cli, _faucet) = SwarmBuilder::new_local(2)
+        .with_aptos()
+        // Start with V1
+        .with_init_genesis_config(Arc::new(|genesis_config| {
+            genesis_config.execution_config = OnChainExecutionConfig::V4(ExecutionConfigV4 {
+                transaction_shuffler_type: TransactionShufflerType::NoShuffling,
+                block_gas_limit_type: BlockGasLimitType::NoLimit,
+                transaction_deduper_type: TransactionDeduperType::TxnHashAndAuthenticatorV1,
+            });
+        }))
+        .build_with_cli(0)
+        .await;
+
+    swarm
+        .wait_for_all_nodes_to_catchup_to_future(Duration::from_secs(MAX_WAIT_SECS), 8)
+        .await
+        .unwrap();
+
+    let rest_client = swarm.validators().next().unwrap().rest_client();
+
+    assert_eq!(
+        get_last_non_reconfig_block_ending_txn_name(&rest_client).await,
+        Some("state_checkpoint")
+    );
+
+    for _ in 0..3 {
+        let root_cli_index = cli.add_account_with_address_to_cli(
+            swarm.root_key(),
+            swarm.chain_info().root_account().address(),
+        );
+
+        let current_execution_config =
+            crate::utils::get_current_execution_config(&rest_client).await;
+        match current_execution_config {
+            OnChainExecutionConfig::V4(inner) => {
+                assert!(!inner.block_gas_limit_type.add_block_limit_outcome_onchain())
+            },
+            _ => panic!("Unexpected execution config"),
+        };
+
+        // Enable BlockEpilogue
+        let mut block_gas_limit = BlockGasLimitType::default_for_genesis();
+        match &mut block_gas_limit {
+            BlockGasLimitType::ComplexLimitV1 {
+                add_block_limit_outcome_onchain,
+                ..
+            } => *add_block_limit_outcome_onchain = true,
+            _ => panic!(),
+        };
+        let new_execution_config = OnChainExecutionConfig::V4(ExecutionConfigV4 {
+            transaction_shuffler_type: TransactionShufflerType::NoShuffling,
+            block_gas_limit_type: block_gas_limit,
+            transaction_deduper_type: TransactionDeduperType::TxnHashAndAuthenticatorV1,
+        });
+        update_execution_config(&cli, root_cli_index, new_execution_config).await;
+
+        swarm
+            .wait_for_all_nodes_to_catchup_to_future(Duration::from_secs(MAX_WAIT_SECS), 8)
+            .await
+            .unwrap();
+        assert_eq!(
+            get_last_non_reconfig_block_ending_txn_name(&rest_client).await,
+            Some("block_epilogue")
+        );
+
+        let current_execution_config =
+            crate::utils::get_current_execution_config(&rest_client).await;
+        match current_execution_config {
+            OnChainExecutionConfig::V4(inner) => {
+                assert!(inner.block_gas_limit_type.add_block_limit_outcome_onchain())
+            },
+            _ => panic!("Unexpected execution config"),
+        };
+
+        // Disable BlockEpilogue
+        let new_execution_config = OnChainExecutionConfig::V4(ExecutionConfigV4 {
+            transaction_shuffler_type: TransactionShufflerType::NoShuffling,
+            block_gas_limit_type: BlockGasLimitType::NoLimit,
+            transaction_deduper_type: TransactionDeduperType::TxnHashAndAuthenticatorV1,
+        });
+        update_execution_config(&cli, root_cli_index, new_execution_config).await;
+
+        swarm
+            .wait_for_all_nodes_to_catchup_to_future(Duration::from_secs(MAX_WAIT_SECS), 8)
+            .await
+            .unwrap();
+
+        assert_eq!(
+            get_last_non_reconfig_block_ending_txn_name(&rest_client).await,
+            Some("state_checkpoint")
+        );
+    }
+}
diff --git a/testsuite/smoke-test/src/full_nodes.rs b/testsuite/smoke-test/src/full_nodes.rs
index 2360c8a5cb78c..254f2825318a1 100644
--- a/testsuite/smoke-test/src/full_nodes.rs
+++ b/testsuite/smoke-test/src/full_nodes.rs
@@ -4,7 +4,7 @@
 
 use crate::{
     smoke_test_environment::SwarmBuilder,
-    test_utils::{
+    utils::{
         assert_balance, create_and_fund_account, transfer_coins, MAX_CATCH_UP_WAIT_SECS,
         MAX_CONNECTIVITY_WAIT_SECS, MAX_HEALTHY_WAIT_SECS,
     },
@@ -34,7 +34,7 @@ async fn test_full_node_basic_flow() {
         )
         .await
         .unwrap();
-    for fullnode in swarm.full_nodes_mut() {
+    for fullnode in swarm.full_nodes() {
         fullnode
             .wait_until_healthy(Instant::now() + Duration::from_secs(MAX_HEALTHY_WAIT_SECS))
             .await
@@ -126,7 +126,7 @@ async fn test_vfn_failover() {
         .await;
     let transaction_factory = swarm.chain_info().transaction_factory();
 
-    for fullnode in swarm.full_nodes_mut() {
+    for fullnode in swarm.full_nodes() {
         fullnode
             .wait_until_healthy(Instant::now() + Duration::from_secs(MAX_HEALTHY_WAIT_SECS))
             .await
diff --git a/testsuite/smoke-test/src/fullnode.rs b/testsuite/smoke-test/src/fullnode.rs
index 3cc1081ed3a8d..0a5bbb139ae17 100644
--- a/testsuite/smoke-test/src/fullnode.rs
+++ b/testsuite/smoke-test/src/fullnode.rs
@@ -3,16 +3,27 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{
-    smoke_test_environment::new_local_swarm_with_aptos, test_utils::MAX_HEALTHY_WAIT_SECS,
+    smoke_test_environment::{new_local_swarm_with_aptos, SwarmBuilder},
+    state_sync_utils::create_fullnode,
+    utils::{create_test_accounts, execute_transactions, MAX_HEALTHY_WAIT_SECS},
 };
 use anyhow::bail;
 use aptos_cached_packages::aptos_stdlib;
-use aptos_config::config::{NodeConfig, OverrideNodeConfig};
-use aptos_forge::{NodeExt, Result, Swarm};
+use aptos_config::config::{BootstrappingMode, NodeConfig, OverrideNodeConfig};
+use aptos_db_indexer_schemas::{
+    metadata::MetadataKey,
+    schema::{indexer_metadata::InternalIndexerMetadataSchema, state_keys::StateKeysSchema},
+};
+use aptos_forge::{NodeExt, Result, Swarm, SwarmExt};
+use aptos_indexer_grpc_table_info::internal_indexer_db_service::InternalIndexerDBService;
 use aptos_rest_client::Client as RestClient;
-use aptos_types::account_address::AccountAddress;
-use std::time::{Duration, Instant};
-
+use aptos_schemadb::DB;
+use aptos_types::{account_address::AccountAddress, state_store::state_key::StateKey};
+use std::{
+    collections::HashSet,
+    sync::Arc,
+    time::{Duration, Instant},
+};
 #[tokio::test]
 async fn test_indexer() {
     let mut swarm = new_local_swarm_with_aptos(1).await;
@@ -34,7 +45,7 @@ async fn test_indexer() {
         )
         .unwrap();
 
-    let fullnode = swarm.full_node_mut(fullnode_peer_id).unwrap();
+    let fullnode = swarm.full_node(fullnode_peer_id).unwrap();
     fullnode
         .wait_until_healthy(Instant::now() + Duration::from_secs(MAX_HEALTHY_WAIT_SECS))
         .await
@@ -88,3 +99,104 @@ async fn wait_for_account(client: &RestClient, address: AccountAddress) -> Resul
     }
     bail!("wait for account(address={}) timeout", address,)
 }
+
+fn enable_internal_indexer(node_config: &mut NodeConfig) {
+    node_config.storage.rocksdb_configs.enable_storage_sharding = true;
+    node_config.indexer_db_config.enable_event = true;
+    node_config.indexer_db_config.enable_transaction = true;
+    node_config.indexer_db_config.enable_statekeys = true;
+}
+
+#[tokio::test]
+async fn test_internal_indexer_with_fast_sync() {
+    // Create a swarm with 2 validators
+    let mut swarm = SwarmBuilder::new_local(2)
+        .with_aptos()
+        .with_init_config(Arc::new(move |_, config, _| {
+            config.state_sync.state_sync_driver.bootstrapping_mode =
+                BootstrappingMode::DownloadLatestStates;
+        }))
+        .build()
+        .await;
+
+    let validator_peer_id = swarm.validators().next().unwrap().peer_id();
+    let validator_client = swarm.validator(validator_peer_id).unwrap().rest_client();
+    let (mut account_0, account_1) = create_test_accounts(&mut swarm).await;
+
+    execute_transactions(
+        &mut swarm,
+        &validator_client,
+        &mut account_0,
+        &account_1,
+        true,
+    )
+    .await;
+
+    let ledger_info = validator_client.get_ledger_information().await.unwrap();
+    println!("ledger_info: {:?}", ledger_info);
+    let mut vfn_config = NodeConfig::get_default_vfn_config();
+    vfn_config.storage.rocksdb_configs.enable_storage_sharding = true;
+    vfn_config.state_sync.state_sync_driver.bootstrapping_mode =
+        BootstrappingMode::DownloadLatestStates;
+    vfn_config
+        .storage
+        .storage_pruner_config
+        .ledger_pruner_config
+        .enable = true;
+    vfn_config
+        .storage
+        .storage_pruner_config
+        .ledger_pruner_config
+        .prune_window = 100;
+    vfn_config
+        .storage
+        .storage_pruner_config
+        .ledger_pruner_config
+        .batch_size = 50;
+    vfn_config
+        .storage
+        .storage_pruner_config
+        .ledger_pruner_config
+        .user_pruning_window_offset = 30;
+
+    enable_internal_indexer(&mut vfn_config);
+
+    let peer_id = create_fullnode(vfn_config.clone(), &mut swarm).await;
+    swarm
+        .wait_for_all_nodes_to_catchup(Duration::from_secs(60))
+        .await
+        .unwrap();
+    let node = swarm.full_node(peer_id).unwrap();
+    let node_config = node.config().to_owned();
+    node.stop().await.unwrap();
+    check_indexer_db(&node_config);
+}
+
+fn check_indexer_db(vfn_config: &NodeConfig) {
+    let internal_indexer_db = InternalIndexerDBService::get_indexer_db(vfn_config).unwrap();
+    let opt = internal_indexer_db
+        .get_restore_version_and_progress()
+        .unwrap();
+    assert!(opt.is_some());
+    let indexer_keys: HashSet<StateKey> = get_indexer_db_content::<StateKeysSchema, StateKey>(
+        internal_indexer_db.get_inner_db_clone(),
+    );
+    let meta_keys = get_indexer_db_content::<InternalIndexerMetadataSchema, MetadataKey>(
+        internal_indexer_db.get_inner_db_clone(),
+    );
+    assert!(meta_keys.contains(&MetadataKey::EventPrunerProgress));
+    assert!(meta_keys.contains(&MetadataKey::TransactionPrunerProgress));
+    assert!(!indexer_keys.is_empty());
+}
+
+fn get_indexer_db_content<T, U>(internal_indexer_db: Arc<DB>) -> HashSet<U>
+where
+    T: aptos_schemadb::schema::Schema,
+    U: aptos_schemadb::schema::KeyCodec<T> + std::cmp::Ord + std::fmt::Debug,
+    std::collections::HashSet<U>:
+        std::iter::FromIterator<<T as aptos_schemadb::schema::Schema>::Key>,
+{
+    let mut indexer_db_iter = internal_indexer_db.iter::<T>().unwrap();
+    indexer_db_iter.seek_to_first();
+    indexer_db_iter.map(|iter| iter.unwrap().0).collect()
+}
diff --git a/testsuite/smoke-test/src/genesis.rs b/testsuite/smoke-test/src/genesis.rs
index c7ae8c1e6b09f..0a2b8fbd8364d 100644
--- a/testsuite/smoke-test/src/genesis.rs
+++ b/testsuite/smoke-test/src/genesis.rs
@@ -5,7 +5,7 @@
 use crate::{
     smoke_test_environment::SwarmBuilder,
     storage::{db_backup, db_restore},
-    test_utils::{
+    utils::{
         check_create_mint_transfer_node, create_test_accounts, execute_transactions,
         execute_transactions_and_wait, swarm_utils::insert_waypoint, MAX_CATCH_UP_WAIT_SECS,
         MAX_CONNECTIVITY_WAIT_SECS, MAX_HEALTHY_WAIT_SECS,
@@ -421,7 +421,7 @@ async fn delete_storage_and_wait_for_catchup(env: &mut LocalSwarm, validator_ind
 }
 
 /// Enables sync_only mode for the specified validator and wait for it to become healthy
-async fn enable_sync_only_mode(num_nodes: usize, validator_node: &mut LocalNode) {
+pub(crate) async fn enable_sync_only_mode(num_nodes: usize, validator_node: &mut LocalNode) {
     // Update the validator's config to enable sync_only mode
     let mut validator_config = validator_node.config().clone();
     validator_config.consensus.sync_only = true;
diff --git a/testsuite/smoke-test/src/indexer.rs b/testsuite/smoke-test/src/indexer.rs
index 9bb854d44df71..45d2e6a2a4200 100644
--- a/testsuite/smoke-test/src/indexer.rs
+++ b/testsuite/smoke-test/src/indexer.rs
@@ -32,10 +32,7 @@ pub fn setup_indexer() -> anyhow::Result<PgDbPool> {
     Ok(conn_pool)
 }
 
-pub async fn execute_nft_txns<'t>(
-    creator: LocalAccount,
-    info: &mut AptosPublicInfo<'t>,
-) -> Result<()> {
+pub async fn execute_nft_txns<'t>(creator: LocalAccount, info: &mut AptosPublicInfo) -> Result<()> {
     let collection_name = "collection name".to_owned().into_bytes();
     let token_name = "token name".to_owned().into_bytes();
     let collection_builder =
@@ -98,7 +95,7 @@ async fn test_old_indexer() {
 
     let conn_pool = setup_indexer().unwrap();
 
-    let mut swarm = crate::smoke_test_environment::SwarmBuilder::new_local(1)
+    let swarm = crate::smoke_test_environment::SwarmBuilder::new_local(1)
         .with_aptos()
         .with_init_config(Arc::new(|_, config, _| {
             config.storage.enable_indexer = true;
diff --git a/testsuite/smoke-test/src/inspection_service.rs b/testsuite/smoke-test/src/inspection_service.rs
index 13341406c0fe3..da83113228628 100644
--- a/testsuite/smoke-test/src/inspection_service.rs
+++ b/testsuite/smoke-test/src/inspection_service.rs
@@ -6,7 +6,7 @@ use aptos_forge::Swarm;
 
 #[tokio::test]
 async fn test_inspection_service_connection() {
-    let mut swarm = new_local_swarm_with_aptos(1).await;
+    let swarm = new_local_swarm_with_aptos(1).await;
     let info = swarm.aptos_public_info();
     // Ping the inspection service index page and verify we get a successful response
     let resp = reqwest::get(info.inspection_service_url().to_owned())
diff --git a/testsuite/smoke-test/src/jwks/dummy_provider/mod.rs b/testsuite/smoke-test/src/jwks/dummy_provider/mod.rs
index 64f3da80d294b..32e8930641fe8 100644
--- a/testsuite/smoke-test/src/jwks/dummy_provider/mod.rs
+++ b/testsuite/smoke-test/src/jwks/dummy_provider/mod.rs
@@ -19,14 +19,14 @@ use tokio::{
 pub(crate) mod request_handler;
 
 /// A dummy OIDC provider.
-pub struct DummyProvider {
+pub struct DummyHttpServer {
     close_tx: Sender<()>,
-    open_id_config_url: String,
+    url: String,
     handler_holder: Arc<RwLock<Option<Arc<dyn RequestHandler>>>>,
     server_join_handle: JoinHandle<()>,
 }
 
-impl DummyProvider {
+impl DummyHttpServer {
     pub(crate) async fn spawn() -> Self {
         let addr = SocketAddr::from(([127, 0, 0, 1], 0));
         let handler_holder = Arc::new(RwLock::new(None));
@@ -39,17 +39,17 @@ impl DummyProvider {
             close_rx,
         ));
         let actual_port = port_rx.await.unwrap();
-        let open_id_config_url = format!("http://127.0.0.1:{}", actual_port);
+        let url = format!("http://127.0.0.1:{}", actual_port);
         Self {
             close_tx,
-            open_id_config_url,
+            url,
             handler_holder,
             server_join_handle,
         }
     }
 
-    pub fn open_id_config_url(&self) -> String {
-        self.open_id_config_url.clone()
+    pub fn url(&self) -> String {
+        self.url.clone()
     }
 
     pub fn update_request_handler(
@@ -60,7 +60,7 @@ impl DummyProvider {
     }
 
     pub async fn shutdown(self) {
-        let DummyProvider {
+        let DummyHttpServer {
             close_tx,
             server_join_handle,
             ..
@@ -71,7 +71,7 @@ impl DummyProvider {
 }
 
 // Private functions.
-impl DummyProvider {
+impl DummyHttpServer {
     async fn run_server(
         addr: SocketAddr,
         handler_holder: Arc<RwLock<Option<Arc<dyn RequestHandler>>>>,
diff --git a/testsuite/smoke-test/src/jwks/jwk_consensus_basic.rs b/testsuite/smoke-test/src/jwks/jwk_consensus_basic.rs
index f059cbf527360..e91af813bc458 100644
--- a/testsuite/smoke-test/src/jwks/jwk_consensus_basic.rs
+++ b/testsuite/smoke-test/src/jwks/jwk_consensus_basic.rs
@@ -5,7 +5,7 @@ use crate::{
     jwks::{
         dummy_provider::{
             request_handler::{EquivocatingServer, StaticContentServer},
-            DummyProvider,
+            DummyHttpServer,
         },
         get_patched_jwks, update_jwk_consensus_config,
     },
@@ -15,10 +15,8 @@ use aptos_forge::{NodeExt, Swarm, SwarmExt};
 use aptos_logger::{debug, info};
 use aptos_types::{
     jwks::{
-        jwk::{JWKMoveStruct, JWK},
-        rsa::RSA_JWK,
-        unsupported::UnsupportedJWK,
-        AllProvidersJWKs, ProviderJWKs,
+        jwk::JWK, rsa::RSA_JWK, secure_test_rsa_jwk, unsupported::UnsupportedJWK, AllProvidersJWKs,
+        ProviderJWKs,
     },
     keyless::test_utils::get_sample_iss,
     on_chain_config::{JWKConsensusConfigV1, OIDCProvider, OnChainJWKConsensusConfig},
@@ -31,7 +29,7 @@ use tokio::time::sleep;
 async fn jwk_consensus_basic() {
     let epoch_duration_secs = 30;
 
-    let (mut swarm, mut cli, _faucet) = SwarmBuilder::new_local(4)
+    let (swarm, mut cli, _faucet) = SwarmBuilder::new_local(4)
         .with_num_fullnodes(1)
         .with_aptos()
         .with_init_genesis_config(Arc::new(move |conf| {
@@ -57,10 +55,32 @@ async fn jwk_consensus_basic() {
     assert!(patched_jwks.jwks.entries.len() == 1);
 
     info!("Adding some providers.");
-    let (provider_alice, provider_bob) =
-        tokio::join!(DummyProvider::spawn(), DummyProvider::spawn());
+    let (alice_config_server, alice_jwks_server, bob_config_server, bob_jwks_server) = tokio::join!(
+        DummyHttpServer::spawn(),
+        DummyHttpServer::spawn(),
+        DummyHttpServer::spawn(),
+        DummyHttpServer::spawn()
+    );
+    let alice_issuer_id = "https://alice.io";
+    let bob_issuer_id = "https://bob.dev";
+    alice_config_server.update_request_handler(Some(Arc::new(StaticContentServer::new_str(
+        format!(
+            r#"{{"issuer": "{}", "jwks_uri": "{}"}}"#,
+            alice_issuer_id,
+            alice_jwks_server.url()
+        )
+        .as_str(),
+    ))));
+    bob_config_server.update_request_handler(Some(Arc::new(StaticContentServer::new_str(
+        format!(
+            r#"{{"issuer": "{}", "jwks_uri": "{}"}}"#,
+            bob_issuer_id,
+            bob_jwks_server.url()
+        )
+        .as_str(),
+    ))));
 
-    provider_alice.update_request_handler(Some(Arc::new(StaticContentServer::new_str(
+    alice_jwks_server.update_request_handler(Some(Arc::new(StaticContentServer::new_str(
         r#"
 {
     "keys": [
@@ -70,18 +90,20 @@ async fn jwk_consensus_basic() {
 }
 "#,
     ))));
-    provider_bob.update_request_handler(Some(Arc::new(StaticContentServer::new(
+
+    bob_jwks_server.update_request_handler(Some(Arc::new(StaticContentServer::new(
         r#"{"keys": ["BOB_JWK_V0"]}"#.as_bytes().to_vec(),
     ))));
+
     let config = OnChainJWKConsensusConfig::V1(JWKConsensusConfigV1 {
         oidc_providers: vec![
             OIDCProvider {
-                name: "https://alice.io".to_string(),
-                config_url: provider_alice.open_id_config_url(),
+                name: alice_issuer_id.to_string(),
+                config_url: alice_config_server.url(),
             },
             OIDCProvider {
-                name: "https://bob.dev".to_string(),
-                config_url: provider_bob.open_id_config_url(),
+                name: bob_issuer_id.to_string(),
+                config_url: bob_config_server.url(),
             },
         ],
     });
@@ -97,7 +119,7 @@ async fn jwk_consensus_basic() {
         AllProvidersJWKs {
             entries: vec![
                 ProviderJWKs {
-                    issuer: b"https://alice.io".to_vec(),
+                    issuer: alice_issuer_id.as_bytes().to_vec(),
                     version: 1,
                     jwks: vec![
                         JWK::RSA(RSA_JWK::new_256_aqab("kid0", "n0")).into(),
@@ -106,7 +128,7 @@ async fn jwk_consensus_basic() {
                     ],
                 },
                 ProviderJWKs {
-                    issuer: b"https://bob.dev".to_vec(),
+                    issuer: bob_issuer_id.as_bytes().to_vec(),
                     version: 1,
                     jwks: vec![JWK::Unsupported(UnsupportedJWK::new_with_payload(
                         "\"BOB_JWK_V0\""
@@ -116,7 +138,7 @@ async fn jwk_consensus_basic() {
                 ProviderJWKs {
                     issuer: get_sample_iss().into_bytes(),
                     version: 0,
-                    jwks: vec![JWKMoveStruct::from(RSA_JWK::secure_test_jwk())],
+                    jwks: vec![secure_test_rsa_jwk().into()],
                 },
             ]
         },
@@ -124,7 +146,7 @@ async fn jwk_consensus_basic() {
     );
 
     info!("Rotating Alice keys. Also making https://alice.io gently equivocate.");
-    provider_alice.update_request_handler(Some(Arc::new(EquivocatingServer::new(
+    alice_jwks_server.update_request_handler(Some(Arc::new(EquivocatingServer::new(
         r#"{"keys": ["ALICE_JWK_V1A"]}"#.as_bytes().to_vec(),
         r#"{"keys": ["ALICE_JWK_V1B"]}"#.as_bytes().to_vec(),
         1,
@@ -138,7 +160,7 @@ async fn jwk_consensus_basic() {
         AllProvidersJWKs {
             entries: vec![
                 ProviderJWKs {
-                    issuer: b"https://alice.io".to_vec(),
+                    issuer: alice_issuer_id.as_bytes().to_vec(),
                     version: 2,
                     jwks: vec![JWK::Unsupported(UnsupportedJWK::new_with_payload(
                         "\"ALICE_JWK_V1B\""
@@ -146,7 +168,7 @@ async fn jwk_consensus_basic() {
                     .into()],
                 },
                 ProviderJWKs {
-                    issuer: b"https://bob.dev".to_vec(),
+                    issuer: bob_issuer_id.as_bytes().to_vec(),
                     version: 1,
                     jwks: vec![JWK::Unsupported(UnsupportedJWK::new_with_payload(
                         "\"BOB_JWK_V0\""
@@ -156,7 +178,7 @@ async fn jwk_consensus_basic() {
                 ProviderJWKs {
                     issuer: get_sample_iss().into_bytes(),
                     version: 0,
-                    jwks: vec![JWKMoveStruct::from(RSA_JWK::secure_test_jwk())],
+                    jwks: vec![secure_test_rsa_jwk().into()],
                 },
             ]
         },
@@ -164,5 +186,10 @@ async fn jwk_consensus_basic() {
     );
 
     info!("Tear down.");
-    provider_alice.shutdown().await;
+    tokio::join!(
+        alice_jwks_server.shutdown(),
+        alice_config_server.shutdown(),
+        bob_jwks_server.shutdown(),
+        bob_config_server.shutdown()
+    );
 }
diff --git a/testsuite/smoke-test/src/jwks/jwk_consensus_per_issuer.rs b/testsuite/smoke-test/src/jwks/jwk_consensus_per_issuer.rs
index 3b5dfcdf73628..76a07be724ae2 100644
--- a/testsuite/smoke-test/src/jwks/jwk_consensus_per_issuer.rs
+++ b/testsuite/smoke-test/src/jwks/jwk_consensus_per_issuer.rs
@@ -5,7 +5,7 @@ use crate::{
     jwks::{
         dummy_provider::{
             request_handler::{EquivocatingServer, StaticContentServer},
-            DummyProvider,
+            DummyHttpServer,
         },
         get_patched_jwks, update_jwk_consensus_config,
     },
@@ -15,10 +15,7 @@ use aptos_forge::{NodeExt, Swarm, SwarmExt};
 use aptos_logger::{debug, info};
 use aptos_types::{
     jwks::{
-        jwk::{JWKMoveStruct, JWK},
-        rsa::RSA_JWK,
-        unsupported::UnsupportedJWK,
-        AllProvidersJWKs, ProviderJWKs,
+        jwk::JWK, secure_test_rsa_jwk, unsupported::UnsupportedJWK, AllProvidersJWKs, ProviderJWKs,
     },
     keyless::test_utils::get_sample_iss,
     on_chain_config::{JWKConsensusConfigV1, OIDCProvider, OnChainJWKConsensusConfig},
@@ -32,7 +29,7 @@ use tokio::time::sleep;
 async fn jwk_consensus_per_issuer() {
     let epoch_duration_secs = 30;
 
-    let (mut swarm, mut cli, _faucet) = SwarmBuilder::new_local(4)
+    let (swarm, mut cli, _faucet) = SwarmBuilder::new_local(4)
         .with_num_fullnodes(1)
         .with_aptos()
         .with_init_genesis_config(Arc::new(move |conf| {
@@ -58,25 +55,48 @@ async fn jwk_consensus_per_issuer() {
     assert!(patched_jwks.jwks.entries.len() == 1);
 
     info!("Adding some providers, one seriously equivocating, the other well behaving.");
-    let (provider_alice, provider_bob) =
-        tokio::join!(DummyProvider::spawn(), DummyProvider::spawn());
-    provider_alice.update_request_handler(Some(Arc::new(EquivocatingServer::new(
+    let (alice_config_server, alice_jwks_server, bob_config_server, bob_jwks_server) = tokio::join!(
+        DummyHttpServer::spawn(),
+        DummyHttpServer::spawn(),
+        DummyHttpServer::spawn(),
+        DummyHttpServer::spawn()
+    );
+    let alice_issuer_id = "https://alice.io";
+    let bob_issuer_id = "https://bob.dev";
+    alice_config_server.update_request_handler(Some(Arc::new(StaticContentServer::new_str(
+        format!(
+            r#"{{"issuer": "{}", "jwks_uri": "{}"}}"#,
+            alice_issuer_id,
+            alice_jwks_server.url()
+        )
+        .as_str(),
+    ))));
+    bob_config_server.update_request_handler(Some(Arc::new(StaticContentServer::new_str(
+        format!(
+            r#"{{"issuer": "{}", "jwks_uri": "{}"}}"#,
+            bob_issuer_id,
+            bob_jwks_server.url()
+        )
+        .as_str(),
+    ))));
+
+    alice_jwks_server.update_request_handler(Some(Arc::new(EquivocatingServer::new(
         r#"{"keys": ["ALICE_JWK_V1A"]}"#.as_bytes().to_vec(),
         r#"{"keys": ["ALICE_JWK_V1B"]}"#.as_bytes().to_vec(),
         2,
     ))));
-    provider_bob.update_request_handler(Some(Arc::new(StaticContentServer::new(
+    bob_jwks_server.update_request_handler(Some(Arc::new(StaticContentServer::new(
         r#"{"keys": ["BOB_JWK_V0"]}"#.as_bytes().to_vec(),
     ))));
     let config = OnChainJWKConsensusConfig::V1(JWKConsensusConfigV1 {
         oidc_providers: vec![
             OIDCProvider {
-                name: "https://alice.io".to_string(),
-                config_url: provider_alice.open_id_config_url(),
+                name: alice_issuer_id.to_string(),
+                config_url: alice_config_server.url(),
             },
             OIDCProvider {
-                name: "https://bob.dev".to_string(),
-                config_url: provider_bob.open_id_config_url(),
+                name: bob_issuer_id.to_string(),
+                config_url: bob_config_server.url(),
             },
         ],
     });
@@ -92,7 +112,7 @@ async fn jwk_consensus_per_issuer() {
         AllProvidersJWKs {
             entries: vec![
                 ProviderJWKs {
-                    issuer: b"https://bob.dev".to_vec(),
+                    issuer: bob_issuer_id.as_bytes().to_vec(),
                     version: 1,
                     jwks: vec![JWK::Unsupported(UnsupportedJWK::new_with_payload(
                         "\"BOB_JWK_V0\""
@@ -102,7 +122,7 @@ async fn jwk_consensus_per_issuer() {
                 ProviderJWKs {
                     issuer: get_sample_iss().into_bytes(),
                     version: 0,
-                    jwks: vec![JWKMoveStruct::from(RSA_JWK::secure_test_jwk())],
+                    jwks: vec![secure_test_rsa_jwk().into()],
                 },
             ]
         },
@@ -110,5 +130,10 @@ async fn jwk_consensus_per_issuer() {
     );
 
     info!("Tear down.");
-    provider_alice.shutdown().await;
+    tokio::join!(
+        alice_jwks_server.shutdown(),
+        alice_config_server.shutdown(),
+        bob_jwks_server.shutdown(),
+        bob_config_server.shutdown()
+    );
 }
diff --git a/testsuite/smoke-test/src/jwks/jwk_consensus_provider_change_mind.rs b/testsuite/smoke-test/src/jwks/jwk_consensus_provider_change_mind.rs
index 4a0e105bcc86e..f26e1d4bf7489 100644
--- a/testsuite/smoke-test/src/jwks/jwk_consensus_provider_change_mind.rs
+++ b/testsuite/smoke-test/src/jwks/jwk_consensus_provider_change_mind.rs
@@ -5,7 +5,7 @@ use crate::{
     jwks::{
         dummy_provider::{
             request_handler::{MindChangingServer, StaticContentServer},
-            DummyProvider,
+            DummyHttpServer,
         },
         get_patched_jwks, update_jwk_consensus_config,
     },
@@ -15,10 +15,7 @@ use aptos_forge::{NodeExt, Swarm, SwarmExt};
 use aptos_logger::{debug, info};
 use aptos_types::{
     jwks::{
-        jwk::{JWKMoveStruct, JWK},
-        rsa::RSA_JWK,
-        unsupported::UnsupportedJWK,
-        AllProvidersJWKs, ProviderJWKs,
+        jwk::JWK, secure_test_rsa_jwk, unsupported::UnsupportedJWK, AllProvidersJWKs, ProviderJWKs,
     },
     keyless::test_utils::get_sample_iss,
     on_chain_config::{JWKConsensusConfigV1, OIDCProvider, OnChainJWKConsensusConfig},
@@ -34,7 +31,7 @@ async fn jwk_consensus_provider_change_mind() {
     // Big epoch duration to ensure epoch change does not help reset validators if they are stuck.
     let epoch_duration_secs = 1800;
 
-    let (mut swarm, mut cli, _faucet) = SwarmBuilder::new_local(4)
+    let (swarm, mut cli, _faucet) = SwarmBuilder::new_local(4)
         .with_num_fullnodes(1)
         .with_aptos()
         .with_init_genesis_config(Arc::new(move |conf| {
@@ -60,12 +57,34 @@ async fn jwk_consensus_provider_change_mind() {
     assert!(patched_jwks.jwks.entries.len() == 1);
 
     info!("Adding some providers.");
-    let (provider_alice, provider_bob) =
-        tokio::join!(DummyProvider::spawn(), DummyProvider::spawn());
-    provider_alice.update_request_handler(Some(Arc::new(StaticContentServer::new(
+    let (alice_config_server, alice_jwks_server, bob_config_server, bob_jwks_server) = tokio::join!(
+        DummyHttpServer::spawn(),
+        DummyHttpServer::spawn(),
+        DummyHttpServer::spawn(),
+        DummyHttpServer::spawn()
+    );
+    let alice_issuer_id = "https://alice.io";
+    let bob_issuer_id = "https://bob.dev";
+    alice_config_server.update_request_handler(Some(Arc::new(StaticContentServer::new_str(
+        format!(
+            r#"{{"issuer": "{}", "jwks_uri": "{}"}}"#,
+            alice_issuer_id,
+            alice_jwks_server.url()
+        )
+        .as_str(),
+    ))));
+    bob_config_server.update_request_handler(Some(Arc::new(StaticContentServer::new_str(
+        format!(
+            r#"{{"issuer": "{}", "jwks_uri": "{}"}}"#,
+            bob_issuer_id,
+            bob_jwks_server.url()
+        )
+        .as_str(),
+    ))));
+    alice_jwks_server.update_request_handler(Some(Arc::new(StaticContentServer::new(
         r#"{"keys": ["ALICE_JWK_V0"]}"#.as_bytes().to_vec(),
     ))));
-    provider_bob.update_request_handler(Some(Arc::new(MindChangingServer::new(
+    bob_jwks_server.update_request_handler(Some(Arc::new(MindChangingServer::new(
         r#"{"keys": ["BOB_JWK_V0"]}"#.as_bytes().to_vec(),
         r#"{"keys": ["BOB_JWK_V0_1"]}"#.as_bytes().to_vec(),
         2,
@@ -73,12 +92,12 @@ async fn jwk_consensus_provider_change_mind() {
     let config = OnChainJWKConsensusConfig::V1(JWKConsensusConfigV1 {
         oidc_providers: vec![
             OIDCProvider {
-                name: "https://alice.io".to_string(),
-                config_url: provider_alice.open_id_config_url(),
+                name: alice_issuer_id.to_string(),
+                config_url: alice_config_server.url(),
             },
             OIDCProvider {
-                name: "https://bob.dev".to_string(),
-                config_url: provider_bob.open_id_config_url(),
+                name: bob_issuer_id.to_string(),
+                config_url: bob_config_server.url(),
             },
         ],
     });
@@ -94,7 +113,7 @@ async fn jwk_consensus_provider_change_mind() {
         AllProvidersJWKs {
             entries: vec![
                 ProviderJWKs {
-                    issuer: b"https://alice.io".to_vec(),
+                    issuer: alice_issuer_id.as_bytes().to_vec(),
                     version: 1,
                     jwks: vec![JWK::Unsupported(UnsupportedJWK::new_with_payload(
                         "\"ALICE_JWK_V0\""
@@ -102,7 +121,7 @@ async fn jwk_consensus_provider_change_mind() {
                     .into()],
                 },
                 ProviderJWKs {
-                    issuer: b"https://bob.dev".to_vec(),
+                    issuer: bob_issuer_id.as_bytes().to_vec(),
                     version: 1,
                     jwks: vec![JWK::Unsupported(UnsupportedJWK::new_with_payload(
                         "\"BOB_JWK_V0_1\""
@@ -112,10 +131,18 @@ async fn jwk_consensus_provider_change_mind() {
                 ProviderJWKs {
                     issuer: get_sample_iss().into_bytes(),
                     version: 0,
-                    jwks: vec![JWKMoveStruct::from(RSA_JWK::secure_test_jwk())],
+                    jwks: vec![secure_test_rsa_jwk().into()],
                 },
             ]
         },
         patched_jwks.jwks
     );
+
+    info!("Tear down.");
+    tokio::join!(
+        alice_jwks_server.shutdown(),
+        alice_config_server.shutdown(),
+        bob_jwks_server.shutdown(),
+        bob_config_server.shutdown()
+    );
 }
diff --git a/testsuite/smoke-test/src/jwks/mod.rs b/testsuite/smoke-test/src/jwks/mod.rs
index ea7cab2002204..d677300ca1c6a 100644
--- a/testsuite/smoke-test/src/jwks/mod.rs
+++ b/testsuite/smoke-test/src/jwks/mod.rs
@@ -89,7 +89,7 @@ async fn get_patched_jwks(rest_client: &Client) -> PatchedJWKs {
 /// Patch the JWK with governance proposal and see it is effective.
 #[tokio::test]
 async fn jwk_patching() {
-    let (mut swarm, mut cli, _faucet) = SwarmBuilder::new_local(4)
+    let (swarm, mut cli, _faucet) = SwarmBuilder::new_local(4)
         .with_aptos()
         .build_with_cli(0)
         .await;
diff --git a/testsuite/smoke-test/src/keyless.rs b/testsuite/smoke-test/src/keyless.rs
index 41273edaad9bf..fb77d12e15cf9 100644
--- a/testsuite/smoke-test/src/keyless.rs
+++ b/testsuite/smoke-test/src/keyless.rs
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::smoke_test_environment::SwarmBuilder;
-use aptos::test::CliTestFramework;
+use aptos::{common::types::GasOptions, test::CliTestFramework};
 use aptos_cached_packages::aptos_stdlib;
 use aptos_crypto::{
     ed25519::{Ed25519PrivateKey, Ed25519PublicKey},
@@ -16,7 +16,7 @@ use aptos_types::{
     jwks::{
         jwk::{JWKMoveStruct, JWK},
         rsa::RSA_JWK,
-        AllProvidersJWKs, PatchedJWKs, ProviderJWKs,
+        secure_test_rsa_jwk, AllProvidersJWKs, PatchedJWKs, ProviderJWKs,
     },
     keyless::{
         get_public_inputs_hash,
@@ -45,7 +45,7 @@ use std::{fmt::Debug, time::Duration};
 
 #[tokio::test]
 async fn test_keyless_oidc_txn_verifies() {
-    let (_, _, mut swarm, signed_txn) = get_transaction(get_sample_openid_sig_and_pk).await;
+    let (_, _, swarm, signed_txn) = get_transaction(get_sample_openid_sig_and_pk).await;
 
     info!("Submit OpenID transaction");
     let result = swarm
@@ -61,7 +61,7 @@ async fn test_keyless_oidc_txn_verifies() {
 
 #[tokio::test]
 async fn test_keyless_rotate_vk() {
-    let (tw_sk, config, jwk, mut swarm, mut cli, root_idx) = setup_local_net().await;
+    let (tw_sk, config, jwk, swarm, mut cli, root_idx) = setup_local_net().await;
     let mut info = swarm.aptos_public_info();
 
     let (old_sig, old_pk) = get_sample_groth16_sig_and_pk();
@@ -156,7 +156,7 @@ async fn test_keyless_secure_test_jwk_initialized_at_genesis() {
         entries: vec![ProviderJWKs {
             issuer: iss.into_bytes(),
             version: 0,
-            jwks: vec![JWKMoveStruct::from(RSA_JWK::secure_test_jwk())],
+            jwks: vec![secure_test_rsa_jwk().into()],
         }],
     };
     assert_eq!(expected_providers_jwks, patched_jwks.jwks);
@@ -164,7 +164,7 @@ async fn test_keyless_secure_test_jwk_initialized_at_genesis() {
 
 #[tokio::test]
 async fn test_keyless_oidc_txn_with_bad_jwt_sig() {
-    let (tw_sk, config, jwk, mut swarm, _, _) = setup_local_net().await;
+    let (tw_sk, config, jwk, swarm, _, _) = setup_local_net().await;
     let (mut sig, pk) = get_sample_openid_sig_and_pk();
 
     match &mut sig.cert {
@@ -190,7 +190,7 @@ async fn test_keyless_oidc_txn_with_bad_jwt_sig() {
 
 #[tokio::test]
 async fn test_keyless_oidc_txn_with_expired_epk() {
-    let (tw_sk, config, jwk, mut swarm, _, _) = setup_local_net().await;
+    let (tw_sk, config, jwk, swarm, _, _) = setup_local_net().await;
     let (mut sig, pk) = get_sample_openid_sig_and_pk();
 
     sig.exp_date_secs = 1; // This should fail the verification since the expiration date is way in the past
@@ -211,7 +211,7 @@ async fn test_keyless_oidc_txn_with_expired_epk() {
 
 #[tokio::test]
 async fn test_keyless_groth16_verifies() {
-    let (_, _, mut swarm, signed_txn) = get_transaction(get_sample_groth16_sig_and_pk).await;
+    let (_, _, swarm, signed_txn) = get_transaction(get_sample_groth16_sig_and_pk).await;
 
     info!("Submit keyless Groth16 transaction");
     let result = swarm
@@ -227,7 +227,7 @@ async fn test_keyless_groth16_verifies() {
 
 #[tokio::test]
 async fn test_keyless_no_extra_field_groth16_verifies() {
-    let (_, _, mut swarm, signed_txn) =
+    let (_, _, swarm, signed_txn) =
         get_transaction(get_sample_groth16_sig_and_pk_no_extra_field).await;
 
     info!("Submit keyless Groth16 transaction");
@@ -244,7 +244,7 @@ async fn test_keyless_no_extra_field_groth16_verifies() {
 
 #[tokio::test]
 async fn test_keyless_no_training_wheels_groth16_verifies() {
-    let (_tw_sk, config, jwk, mut swarm, mut cli, root_idx) = setup_local_net().await;
+    let (_tw_sk, config, jwk, swarm, mut cli, root_idx) = setup_local_net().await;
     let (sig, pk) = get_sample_groth16_sig_and_pk();
 
     let mut info = swarm.aptos_public_info();
@@ -267,7 +267,7 @@ async fn test_keyless_no_training_wheels_groth16_verifies() {
 
 #[tokio::test]
 async fn test_keyless_groth16_with_mauled_proof() {
-    let (tw_sk, config, jwk, mut swarm, _, _) = setup_local_net().await;
+    let (tw_sk, config, jwk, swarm, _, _) = setup_local_net().await;
     let (sig, pk) = get_sample_groth16_sig_and_pk();
 
     let mut info = swarm.aptos_public_info();
@@ -287,7 +287,7 @@ async fn test_keyless_groth16_with_mauled_proof() {
 
 #[tokio::test]
 async fn test_keyless_groth16_with_bad_tw_signature() {
-    let (_tw_sk, config, jwk, mut swarm, _, _) = setup_local_net().await;
+    let (_tw_sk, config, jwk, swarm, _, _) = setup_local_net().await;
     let (sig, pk) = get_sample_groth16_sig_and_pk();
 
     let mut info = swarm.aptos_public_info();
@@ -318,7 +318,7 @@ async fn test_keyless_groth16_with_bad_tw_signature() {
 }
 
 async fn sign_transaction<'a>(
-    info: &mut AptosPublicInfo<'a>,
+    info: &mut AptosPublicInfo,
     mut sig: KeylessSignature,
     pk: KeylessPublicKey,
     jwk: &RSA_JWK,
@@ -438,7 +438,7 @@ async fn get_transaction(
     LocalSwarm,
     SignedTransaction,
 ) {
-    let (tw_sk, config, jwk, mut swarm, _, _) = setup_local_net().await;
+    let (tw_sk, config, jwk, swarm, _, _) = setup_local_net().await;
 
     let (sig, pk) = get_pk_and_sig_func();
 
@@ -477,7 +477,7 @@ async fn setup_local_net() -> (
 
 async fn remove_training_wheels<'a>(
     cli: &mut CliTestFramework,
-    info: &mut AptosPublicInfo<'a>,
+    info: &mut AptosPublicInfo,
     root_idx: usize,
 ) {
     let script = format!(
@@ -495,7 +495,15 @@ fun main(core_resources: &signer) {{
 "#,
         KEYLESS_ACCOUNT_MODULE_NAME, KEYLESS_ACCOUNT_MODULE_NAME
     );
-    let txn_summary = cli.run_script(root_idx, &script).await.unwrap();
+    let gas_options = GasOptions {
+        gas_unit_price: Some(100),
+        max_gas: Some(2000000),
+        expiration_secs: 60,
+    };
+    let txn_summary = cli
+        .run_script_with_gas_options(root_idx, &script, Some(gas_options))
+        .await
+        .unwrap();
     debug!("txn_summary={:?}", txn_summary);
 
     // Increment sequence number as we ran a governance proposal
@@ -596,7 +604,15 @@ fun main(core_resources: &signer) {{
         hex::encode(training_wheels_pk.to_bytes())
     );
 
-    let txn_summary = cli.run_script(root_idx, &script).await.unwrap();
+    let gas_options = GasOptions {
+        gas_unit_price: Some(100),
+        max_gas: Some(2000000),
+        expiration_secs: 60,
+    };
+    let txn_summary = cli
+        .run_script_with_gas_options(root_idx, &script, Some(gas_options))
+        .await
+        .unwrap();
     debug!("txn_summary={:?}", txn_summary);
 
     info!("Use resource API to check the patch result.");
@@ -642,7 +658,7 @@ async fn get_latest_jwkset(rest_client: &Client) -> PatchedJWKs {
 
 async fn rotate_vk_by_governance<'a>(
     cli: &mut CliTestFramework,
-    info: &mut AptosPublicInfo<'a>,
+    info: &mut AptosPublicInfo,
     vk: &Groth16VerificationKey,
     root_idx: usize,
 ) {
@@ -680,7 +696,15 @@ script {{
     )
     .await;
 
-    let txn_summary = cli.run_script(root_idx, &script).await.unwrap();
+    let gas_options = GasOptions {
+        gas_unit_price: Some(100),
+        max_gas: Some(2000000),
+        expiration_secs: 60,
+    };
+    let txn_summary = cli
+        .run_script_with_gas_options(root_idx, &script, Some(gas_options))
+        .await
+        .unwrap();
     debug!("txn_summary={:?}", txn_summary);
 
     // Increment sequence number as we ran a governance proposal
diff --git a/testsuite/smoke-test/src/lib.rs b/testsuite/smoke-test/src/lib.rs
index 1bc84980668a5..fe96bb83e7ea3 100644
--- a/testsuite/smoke-test/src/lib.rs
+++ b/testsuite/smoke-test/src/lib.rs
@@ -13,6 +13,8 @@ mod client;
 #[cfg(test)]
 mod consensus;
 #[cfg(test)]
+mod consensus_observer;
+#[cfg(test)]
 mod execution;
 #[cfg(test)]
 mod full_nodes;
@@ -39,6 +41,8 @@ mod rosetta;
 #[cfg(test)]
 mod state_sync;
 #[cfg(test)]
+mod state_sync_utils;
+#[cfg(test)]
 mod storage;
 #[cfg(test)]
 mod test_smoke_tests;
@@ -55,13 +59,10 @@ mod upgrade;
 mod smoke_test_environment;
 
 #[cfg(test)]
-mod test_utils;
+mod utils;
 
 #[cfg(test)]
 mod validator_txns;
 
 #[cfg(test)]
 mod workspace_builder;
-
-#[cfg(test)]
-pub(crate) mod utils;
diff --git a/testsuite/smoke-test/src/network.rs b/testsuite/smoke-test/src/network.rs
index 45c5e225eb31f..c67f1f5c15662 100644
--- a/testsuite/smoke-test/src/network.rs
+++ b/testsuite/smoke-test/src/network.rs
@@ -5,7 +5,7 @@
 use crate::{
     smoke_test_environment::{new_local_swarm_with_aptos, SwarmBuilder},
     state_sync::test_all_validator_failures,
-    test_utils::{MAX_CONNECTIVITY_WAIT_SECS, MAX_HEALTHY_WAIT_SECS},
+    utils::{MAX_CONNECTIVITY_WAIT_SECS, MAX_HEALTHY_WAIT_SECS},
 };
 use aptos::test::CliTestFramework;
 use aptos_config::{
diff --git a/testsuite/smoke-test/src/randomness/disable_feature_0.rs b/testsuite/smoke-test/src/randomness/disable_feature_0.rs
index a5273521879f8..f004a95ebb187 100644
--- a/testsuite/smoke-test/src/randomness/disable_feature_0.rs
+++ b/testsuite/smoke-test/src/randomness/disable_feature_0.rs
@@ -19,7 +19,7 @@ use std::{sync::Arc, time::Duration};
 async fn disable_feature_0() {
     let epoch_duration_secs = 20;
 
-    let (mut swarm, mut cli, _faucet) = SwarmBuilder::new_local(4)
+    let (swarm, mut cli, _faucet) = SwarmBuilder::new_local(4)
         .with_num_fullnodes(1)
         .with_aptos()
         .with_init_genesis_config(Arc::new(move |conf| {
diff --git a/testsuite/smoke-test/src/randomness/disable_feature_1.rs b/testsuite/smoke-test/src/randomness/disable_feature_1.rs
index 99712c7b385d6..efcfb5c5f3c53 100644
--- a/testsuite/smoke-test/src/randomness/disable_feature_1.rs
+++ b/testsuite/smoke-test/src/randomness/disable_feature_1.rs
@@ -21,7 +21,7 @@ use std::{sync::Arc, time::Duration};
 async fn disable_feature_1() {
     let epoch_duration_secs = 20;
 
-    let (mut swarm, mut cli, _faucet) = SwarmBuilder::new_local(4)
+    let (swarm, mut cli, _faucet) = SwarmBuilder::new_local(4)
         .with_num_fullnodes(1)
         .with_aptos()
         .with_init_genesis_config(Arc::new(move |conf| {
diff --git a/testsuite/smoke-test/src/randomness/dkg_with_validator_join_leave.rs b/testsuite/smoke-test/src/randomness/dkg_with_validator_join_leave.rs
index 2f02146368a4e..4ce4dcae4089e 100644
--- a/testsuite/smoke-test/src/randomness/dkg_with_validator_join_leave.rs
+++ b/testsuite/smoke-test/src/randomness/dkg_with_validator_join_leave.rs
@@ -16,7 +16,7 @@ async fn dkg_with_validator_join_leave() {
     let estimated_dkg_latency_secs = 80;
     let time_limit_secs = epoch_duration_secs + estimated_dkg_latency_secs;
 
-    let mut swarm = SwarmBuilder::new_local(7)
+    let swarm = SwarmBuilder::new_local(7)
         .with_num_fullnodes(1)
         .with_aptos()
         .with_init_genesis_config(Arc::new(move |conf| {
diff --git a/testsuite/smoke-test/src/randomness/e2e_basic_consumption.rs b/testsuite/smoke-test/src/randomness/e2e_basic_consumption.rs
index 585a46fcd65cf..44154c16e69d6 100644
--- a/testsuite/smoke-test/src/randomness/e2e_basic_consumption.rs
+++ b/testsuite/smoke-test/src/randomness/e2e_basic_consumption.rs
@@ -16,7 +16,7 @@ use std::{collections::BTreeMap, str::FromStr, sync::Arc, time::Duration};
 async fn e2e_basic_consumption() {
     let epoch_duration_secs = 20;
 
-    let (mut swarm, mut cli, _faucet) = SwarmBuilder::new_local(4)
+    let (swarm, mut cli, _faucet) = SwarmBuilder::new_local(4)
         .with_num_fullnodes(1)
         .with_aptos()
         .with_init_genesis_config(Arc::new(move |conf| {
diff --git a/testsuite/smoke-test/src/randomness/enable_feature_0.rs b/testsuite/smoke-test/src/randomness/enable_feature_0.rs
index 9aac2afb4af29..1f7e47d1d1445 100644
--- a/testsuite/smoke-test/src/randomness/enable_feature_0.rs
+++ b/testsuite/smoke-test/src/randomness/enable_feature_0.rs
@@ -22,7 +22,7 @@ async fn enable_feature_0() {
     let epoch_duration_secs = 20;
     let estimated_dkg_latency_secs = 40;
 
-    let (mut swarm, mut cli, _faucet) = SwarmBuilder::new_local(4)
+    let (swarm, mut cli, _faucet) = SwarmBuilder::new_local(4)
         .with_num_fullnodes(1)
         .with_aptos()
         .with_init_genesis_config(Arc::new(move |conf| {
diff --git a/testsuite/smoke-test/src/randomness/enable_feature_1.rs b/testsuite/smoke-test/src/randomness/enable_feature_1.rs
index f622313643812..2288f1f16b57d 100644
--- a/testsuite/smoke-test/src/randomness/enable_feature_1.rs
+++ b/testsuite/smoke-test/src/randomness/enable_feature_1.rs
@@ -22,7 +22,7 @@ async fn enable_feature_1() {
     let epoch_duration_secs = 20;
     let estimated_dkg_latency_secs = 40;
 
-    let (mut swarm, mut cli, _faucet) = SwarmBuilder::new_local(4)
+    let (swarm, mut cli, _faucet) = SwarmBuilder::new_local(4)
         .with_num_fullnodes(1)
         .with_aptos()
         .with_init_genesis_config(Arc::new(move |conf| {
diff --git a/testsuite/smoke-test/src/randomness/enable_feature_2.rs b/testsuite/smoke-test/src/randomness/enable_feature_2.rs
index e7fef83c420fa..3f008e9fe9c78 100644
--- a/testsuite/smoke-test/src/randomness/enable_feature_2.rs
+++ b/testsuite/smoke-test/src/randomness/enable_feature_2.rs
@@ -17,7 +17,7 @@ async fn enable_feature_2() {
     let epoch_duration_secs = 20;
     let estimated_dkg_latency_secs = 40;
 
-    let (mut swarm, mut cli, _faucet) = SwarmBuilder::new_local(4)
+    let (swarm, mut cli, _faucet) = SwarmBuilder::new_local(4)
         .with_num_fullnodes(1)
         .with_aptos()
         .with_init_genesis_config(Arc::new(move |conf| {
diff --git a/testsuite/smoke-test/src/randomness/entry_func_attrs.rs b/testsuite/smoke-test/src/randomness/entry_func_attrs.rs
index 49c931dd3df3b..a839f3c14a896 100644
--- a/testsuite/smoke-test/src/randomness/entry_func_attrs.rs
+++ b/testsuite/smoke-test/src/randomness/entry_func_attrs.rs
@@ -5,8 +5,7 @@ use crate::{
     randomness::{
         e2e_basic_consumption::publish_on_chain_dice_module,
         entry_func_attrs::TxnResult::{
-            CommittedSucceeded, CommittedWithBiasableAbort, CommittedWithNoSeedAbort,
-            DiscardedWithMaxGasCheck,
+            CommittedWithBiasableAbort, CommittedWithNoSeedAbort, DiscardedWithMaxGasCheck,
         },
     },
     smoke_test_environment::SwarmBuilder,
@@ -137,130 +136,6 @@ async fn randomness_attr_000() {
     .await;
 }
 
-#[tokio::test]
-async fn randomness_attr_010() {
-    common(TestParams {
-        chain_generates_randomness_seed: false,
-        chain_requires_deposit_for_randtxn: true,
-        chain_allows_custom_max_gas_for_randtxn: false,
-        rolls: vec![
-            RollParams::new(RollFunc::NoAttr, 10000, CommittedWithBiasableAbort),
-            RollParams::new(RollFunc::NoAttr, 45678, CommittedWithBiasableAbort),
-            RollParams::new(RollFunc::NoAttr, 56789, CommittedWithBiasableAbort),
-            RollParams::new(RollFunc::AttrOnly, 10000, CommittedWithNoSeedAbort),
-            RollParams::new(RollFunc::AttrOnly, 45678, DiscardedWithMaxGasCheck),
-            RollParams::new(RollFunc::AttrOnly, 56789, DiscardedWithMaxGasCheck),
-            RollParams::new(
-                RollFunc::AttrWithMaxGasProp,
-                10000,
-                CommittedWithNoSeedAbort,
-            ),
-            RollParams::new(
-                RollFunc::AttrWithMaxGasProp,
-                45678,
-                DiscardedWithMaxGasCheck,
-            ),
-            RollParams::new(
-                RollFunc::AttrWithMaxGasProp,
-                56789,
-                DiscardedWithMaxGasCheck,
-            ),
-        ],
-    })
-    .await;
-}
-
-#[tokio::test]
-async fn randomness_attr_110() {
-    common(TestParams {
-        chain_generates_randomness_seed: true,
-        chain_requires_deposit_for_randtxn: true,
-        chain_allows_custom_max_gas_for_randtxn: false,
-        rolls: vec![
-            RollParams::new(RollFunc::NoAttr, 10000, CommittedWithBiasableAbort),
-            RollParams::new(RollFunc::NoAttr, 45678, CommittedWithBiasableAbort),
-            RollParams::new(RollFunc::NoAttr, 56789, CommittedWithBiasableAbort),
-            RollParams::new(RollFunc::AttrOnly, 10000, CommittedSucceeded),
-            RollParams::new(RollFunc::AttrOnly, 45678, DiscardedWithMaxGasCheck),
-            RollParams::new(RollFunc::AttrOnly, 56789, DiscardedWithMaxGasCheck),
-            RollParams::new(RollFunc::AttrWithMaxGasProp, 10000, CommittedSucceeded),
-            RollParams::new(
-                RollFunc::AttrWithMaxGasProp,
-                45678,
-                DiscardedWithMaxGasCheck,
-            ),
-            RollParams::new(
-                RollFunc::AttrWithMaxGasProp,
-                56789,
-                DiscardedWithMaxGasCheck,
-            ),
-        ],
-    })
-    .await;
-}
-
-#[tokio::test]
-async fn randomness_attr_011() {
-    common(TestParams {
-        chain_generates_randomness_seed: false,
-        chain_requires_deposit_for_randtxn: true,
-        chain_allows_custom_max_gas_for_randtxn: true,
-        rolls: vec![
-            RollParams::new(RollFunc::NoAttr, 10000, CommittedWithBiasableAbort),
-            RollParams::new(RollFunc::NoAttr, 45678, CommittedWithBiasableAbort),
-            RollParams::new(RollFunc::NoAttr, 56789, CommittedWithBiasableAbort),
-            RollParams::new(RollFunc::AttrOnly, 10000, CommittedWithNoSeedAbort),
-            RollParams::new(RollFunc::AttrOnly, 45678, DiscardedWithMaxGasCheck),
-            RollParams::new(RollFunc::AttrOnly, 56789, DiscardedWithMaxGasCheck),
-            RollParams::new(
-                RollFunc::AttrWithMaxGasProp,
-                10000,
-                DiscardedWithMaxGasCheck,
-            ),
-            RollParams::new(
-                RollFunc::AttrWithMaxGasProp,
-                45678,
-                DiscardedWithMaxGasCheck,
-            ),
-            RollParams::new(
-                RollFunc::AttrWithMaxGasProp,
-                56789,
-                CommittedWithNoSeedAbort,
-            ),
-        ],
-    })
-    .await;
-}
-
-#[tokio::test]
-async fn randomness_attr_111() {
-    common(TestParams {
-        chain_generates_randomness_seed: true,
-        chain_requires_deposit_for_randtxn: true,
-        chain_allows_custom_max_gas_for_randtxn: true,
-        rolls: vec![
-            RollParams::new(RollFunc::NoAttr, 10000, CommittedWithBiasableAbort),
-            RollParams::new(RollFunc::NoAttr, 45678, CommittedWithBiasableAbort),
-            RollParams::new(RollFunc::NoAttr, 56789, CommittedWithBiasableAbort),
-            RollParams::new(RollFunc::AttrOnly, 10000, CommittedSucceeded),
-            RollParams::new(RollFunc::AttrOnly, 45678, DiscardedWithMaxGasCheck),
-            RollParams::new(RollFunc::AttrOnly, 56789, DiscardedWithMaxGasCheck),
-            RollParams::new(
-                RollFunc::AttrWithMaxGasProp,
-                10000,
-                DiscardedWithMaxGasCheck,
-            ),
-            RollParams::new(
-                RollFunc::AttrWithMaxGasProp,
-                45678,
-                DiscardedWithMaxGasCheck,
-            ),
-            RollParams::new(RollFunc::AttrWithMaxGasProp, 56789, CommittedSucceeded),
-        ],
-    })
-    .await;
-}
-
 async fn common(params: TestParams) {
     let TestParams {
         chain_generates_randomness_seed,
@@ -271,7 +146,7 @@ async fn common(params: TestParams) {
     let epoch_duration_secs = 20;
     let estimated_dkg_latency_secs = 30;
 
-    let (mut swarm, mut cli, _faucet) = SwarmBuilder::new_local(1)
+    let (swarm, mut cli, _faucet) = SwarmBuilder::new_local(1)
         .with_aptos()
         .with_init_genesis_config(Arc::new(move |conf| {
             conf.epoch_duration_secs = epoch_duration_secs;
diff --git a/testsuite/smoke-test/src/randomness/randomness_stall_recovery.rs b/testsuite/smoke-test/src/randomness/randomness_stall_recovery.rs
index 313e6048aeb6a..aa71e069bd3d4 100644
--- a/testsuite/smoke-test/src/randomness/randomness_stall_recovery.rs
+++ b/testsuite/smoke-test/src/randomness/randomness_stall_recovery.rs
@@ -1,14 +1,15 @@
 // Copyright © Aptos Foundation
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::{randomness::get_on_chain_resource, smoke_test_environment::SwarmBuilder};
+use crate::{
+    genesis::enable_sync_only_mode, randomness::get_on_chain_resource,
+    smoke_test_environment::SwarmBuilder,
+};
 use aptos::common::types::GasOptions;
 use aptos_config::config::{OverrideNodeConfig, PersistableConfig};
 use aptos_forge::{NodeExt, Swarm, SwarmExt};
 use aptos_logger::{debug, info};
-use aptos_rest_client::Client;
 use aptos_types::{on_chain_config::OnChainRandomnessConfig, randomness::PerBlockRandomness};
-use futures::future::join_all;
 use std::{
     ops::Add,
     sync::Arc,
@@ -48,23 +49,10 @@ async fn randomness_stall_recovery() {
         .await
         .expect("Epoch 2 taking too long to arrive!");
 
-    info!("Inject RandManager fault to every node.");
-    let validator_clients: Vec<Client> =
-        swarm.validators().map(|node| node.rest_client()).collect();
-    let tasks = validator_clients
-        .iter()
-        .map(|client| {
-            client.set_failpoint(
-                "rand_manager::process_ready_blocks".to_string(),
-                "return".to_string(),
-            )
-        })
-        .collect::<Vec<_>>();
-    let aptos_results = join_all(tasks).await;
-    debug!("aptos_results={:?}", aptos_results);
-
-    // Bake the fault injection...
-    tokio::time::sleep(Duration::from_secs(10)).await;
+    info!("Halting the chain by putting every validator into sync_only mode.");
+    for validator in swarm.validators_mut() {
+        enable_sync_only_mode(4, validator).await;
+    }
 
     info!("Chain should have halted.");
     let liveness_check_result = swarm
@@ -73,6 +61,7 @@ async fn randomness_stall_recovery() {
     info!("liveness_check_result={:?}", liveness_check_result);
     assert!(liveness_check_result.is_err());
 
+    info!("Hot-fixing all validators.");
     for (idx, validator) in swarm.validators_mut().enumerate() {
         info!("Stopping validator {}.", idx);
         validator.stop();
@@ -82,6 +71,10 @@ async fn randomness_stall_recovery() {
         validator_override_config
             .override_config_mut()
             .randomness_override_seq_num = 1;
+        validator_override_config
+            .override_config_mut()
+            .consensus
+            .sync_only = false;
         info!("Updating validator {} config.", idx);
         validator_override_config.save_config(config_path).unwrap();
         info!("Restarting validator {}.", idx);
@@ -90,6 +83,23 @@ async fn randomness_stall_recovery() {
         tokio::time::sleep(Duration::from_secs(5)).await;
     }
 
+    info!("Hot-fixing the VFNs.");
+    for (idx, vfn) in swarm.fullnodes_mut().enumerate() {
+        info!("Stopping VFN {}.", idx);
+        vfn.stop();
+        let config_path = vfn.config_path();
+        let mut vfn_override_config = OverrideNodeConfig::load_config(config_path.clone()).unwrap();
+        vfn_override_config
+            .override_config_mut()
+            .randomness_override_seq_num = 1;
+        info!("Updating VFN {} config.", idx);
+        vfn_override_config.save_config(config_path).unwrap();
+        info!("Restarting VFN {}.", idx);
+        vfn.start().unwrap();
+        info!("Let VFN {} bake for 5 secs.", idx);
+        tokio::time::sleep(Duration::from_secs(5)).await;
+    }
+
     let liveness_check_result = swarm
         .liveness_check(Instant::now().add(Duration::from_secs(30)))
         .await;
diff --git a/testsuite/smoke-test/src/rest_api.rs b/testsuite/smoke-test/src/rest_api.rs
index 97a6f8c2b0bfb..4af199ace76cd 100644
--- a/testsuite/smoke-test/src/rest_api.rs
+++ b/testsuite/smoke-test/src/rest_api.rs
@@ -30,7 +30,7 @@ use std::{convert::TryFrom, str::FromStr, sync::Arc, time::Duration};
 
 #[tokio::test]
 async fn test_get_index() {
-    let mut swarm = new_local_swarm_with_aptos(1).await;
+    let swarm = new_local_swarm_with_aptos(1).await;
     let info = swarm.aptos_public_info();
 
     let resp = reqwest::get(info.url().to_owned()).await.unwrap();
@@ -39,7 +39,7 @@ async fn test_get_index() {
 
 #[tokio::test]
 async fn test_basic_client() {
-    let mut swarm = new_local_swarm_with_aptos(1).await;
+    let swarm = new_local_swarm_with_aptos(1).await;
     let mut info = swarm.aptos_public_info();
 
     info.client().get_ledger_information().await.unwrap();
@@ -123,6 +123,8 @@ async fn test_gas_estimation_inner(swarm: &mut LocalSwarm) {
             TransactionType::CoinTransfer {
                 invalid_transaction_ratio: 0,
                 sender_use_account_pool: false,
+                non_conflicting: false,
+                use_fa_transfer: false,
             },
             100,
         )]],
@@ -244,7 +246,7 @@ async fn test_gas_estimation_gas_used_limit() {
 
 #[tokio::test]
 async fn test_bcs() {
-    let mut swarm = new_local_swarm_with_aptos(1).await;
+    let swarm = new_local_swarm_with_aptos(1).await;
     let mut info = swarm.aptos_public_info();
 
     // Create accounts
@@ -546,7 +548,7 @@ async fn test_bcs() {
 
 #[tokio::test]
 async fn test_view_function() {
-    let mut swarm = new_local_swarm_with_aptos(1).await;
+    let swarm = new_local_swarm_with_aptos(1).await;
     let info = swarm.aptos_public_info();
     let client: &Client = info.client();
 
diff --git a/testsuite/smoke-test/src/rosetta.rs b/testsuite/smoke-test/src/rosetta.rs
index f14cc2ffc0e54..8b7a36b4652e1 100644
--- a/testsuite/smoke-test/src/rosetta.rs
+++ b/testsuite/smoke-test/src/rosetta.rs
@@ -113,7 +113,6 @@ async fn setup_test(
         Some(aptos_rest_client::Client::new(
             validator.rest_api_endpoint(),
         )),
-        cli.addresses(),
     )
     .await
     .unwrap();
@@ -242,7 +241,7 @@ async fn test_network() {
 
 #[tokio::test]
 async fn test_account_balance() {
-    let (mut swarm, cli, _faucet, rosetta_client) = setup_simple_test(3).await;
+    let (swarm, cli, _faucet, rosetta_client) = setup_simple_test(3).await;
 
     let account_1 = cli.account_id(0);
     let account_2 = cli.account_id(1);
@@ -467,7 +466,7 @@ async fn test_account_balance() {
 }
 
 async fn create_staking_contract(
-    info: &AptosPublicInfo<'_>,
+    info: &AptosPublicInfo,
     account: &mut LocalAccount,
     operator: AccountAddress,
     voter: AccountAddress,
@@ -491,7 +490,7 @@ async fn create_staking_contract(
 }
 
 async fn unlock_stake(
-    info: &AptosPublicInfo<'_>,
+    info: &AptosPublicInfo,
     account: &mut LocalAccount,
     operator: AccountAddress,
     amount: u64,
@@ -509,7 +508,7 @@ async fn unlock_stake(
 }
 
 async fn create_delegation_pool(
-    info: &AptosPublicInfo<'_>,
+    info: &AptosPublicInfo,
     account: &mut LocalAccount,
     commission_percentage: u64,
     sequence_number: u64,
@@ -587,7 +586,7 @@ async fn wait_for_rosetta_block(node_clients: &NodeClients<'_>, block_height: u6
 
 #[tokio::test]
 async fn test_transfer() {
-    let (mut swarm, cli, _faucet, rosetta_client) = setup_simple_test(1).await;
+    let (swarm, cli, _faucet, rosetta_client) = setup_simple_test(1).await;
     let chain_id = swarm.chain_id();
     let client = swarm.aptos_public_info().client().clone();
     let sender = cli.account_id(0);
@@ -728,7 +727,7 @@ async fn test_block() {
         .into_inner();
     let feature_version = gas_schedule.feature_version;
     let gas_params = AptosGasParameters::from_on_chain_gas_schedule(
-        &gas_schedule.to_btree_map(),
+        &gas_schedule.into_btree_map(),
         feature_version,
     )
     .unwrap();
@@ -1106,6 +1105,13 @@ async fn parse_block_transactions(
                 ));
                 assert!(transaction.operations.is_empty());
             },
+            TransactionType::BlockEpilogue => {
+                assert!(matches!(
+                    actual_txn.transaction,
+                    aptos_types::transaction::Transaction::BlockEpilogue(_)
+                ));
+                assert!(transaction.operations.is_empty());
+            },
             TransactionType::Validator => {
                 assert!(matches!(
                     actual_txn.transaction,
@@ -2085,7 +2091,7 @@ async fn create_account_and_wait(
     sequence_number: Option<u64>,
     max_gas: Option<u64>,
     gas_unit_price: Option<u64>,
-) -> Result<Box<UserTransaction>, ErrorWrapper> {
+) -> Result<UserTransaction, ErrorWrapper> {
     submit_transaction(
         node_clients.rest_client,
         txn_expiry_duration.unwrap_or(DEFAULT_MAX_WAIT_DURATION),
@@ -2109,7 +2115,7 @@ async fn simple_transfer_and_wait(
     sender_key: &Ed25519PrivateKey,
     receiver: AccountAddress,
     amount: u64,
-) -> Result<Box<UserTransaction>, ErrorWrapper> {
+) -> Result<UserTransaction, ErrorWrapper> {
     transfer_and_wait(
         node_clients,
         sender_key,
@@ -2132,7 +2138,7 @@ async fn transfer_and_wait(
     sequence_number: Option<u64>,
     max_gas: Option<u64>,
     gas_unit_price: Option<u64>,
-) -> Result<Box<UserTransaction>, ErrorWrapper> {
+) -> Result<UserTransaction, ErrorWrapper> {
     submit_transaction(
         node_clients.rest_client,
         txn_expiry_duration.unwrap_or(DEFAULT_MAX_WAIT_DURATION),
@@ -2157,7 +2163,7 @@ async fn set_operator_and_wait(
     sender_key: &Ed25519PrivateKey,
     old_operator: Option<AccountAddress>,
     new_operator: AccountAddress,
-) -> Result<Box<UserTransaction>, ErrorWrapper> {
+) -> Result<UserTransaction, ErrorWrapper> {
     submit_transaction(
         node_clients.rest_client,
         DEFAULT_MAX_WAIT_DURATION,
@@ -2182,7 +2188,7 @@ async fn set_voter_and_wait(
     sender_key: &Ed25519PrivateKey,
     operator: Option<AccountAddress>,
     new_voter: AccountAddress,
-) -> Result<Box<UserTransaction>, ErrorWrapper> {
+) -> Result<UserTransaction, ErrorWrapper> {
     submit_transaction(
         node_clients.rest_client,
         DEFAULT_MAX_WAIT_DURATION,
@@ -2209,7 +2215,7 @@ async fn create_stake_pool_and_wait(
     voter: Option<AccountAddress>,
     stake_amount: Option<u64>,
     commission_percentage: Option<u64>,
-) -> Result<Box<UserTransaction>, ErrorWrapper> {
+) -> Result<UserTransaction, ErrorWrapper> {
     submit_transaction(
         node_clients.rest_client,
         DEFAULT_MAX_WAIT_DURATION,
@@ -2235,7 +2241,7 @@ async fn reset_lockup_and_wait(
     node_clients: &NodeClients<'_>,
     sender_key: &Ed25519PrivateKey,
     operator: Option<AccountAddress>,
-) -> Result<Box<UserTransaction>, ErrorWrapper> {
+) -> Result<UserTransaction, ErrorWrapper> {
     submit_transaction(
         node_clients.rest_client,
         DEFAULT_MAX_WAIT_DURATION,
@@ -2259,7 +2265,7 @@ async fn update_commission_and_wait(
     sender_key: &Ed25519PrivateKey,
     operator: Option<AccountAddress>,
     new_commission_percentage: Option<u64>,
-) -> Result<Box<UserTransaction>, ErrorWrapper> {
+) -> Result<UserTransaction, ErrorWrapper> {
     submit_transaction(
         node_clients.rest_client,
         DEFAULT_MAX_WAIT_DURATION,
@@ -2284,7 +2290,7 @@ async fn unlock_stake_and_wait(
     sender_key: &Ed25519PrivateKey,
     operator: Option<AccountAddress>,
     amount: Option<u64>,
-) -> Result<Box<UserTransaction>, ErrorWrapper> {
+) -> Result<UserTransaction, ErrorWrapper> {
     submit_transaction(
         node_clients.rest_client,
         DEFAULT_MAX_WAIT_DURATION,
@@ -2309,7 +2315,7 @@ async fn distribute_staking_rewards_and_wait(
     sender_key: &Ed25519PrivateKey,
     operator: AccountAddress,
     staker: AccountAddress,
-) -> Result<Box<UserTransaction>, ErrorWrapper> {
+) -> Result<UserTransaction, ErrorWrapper> {
     submit_transaction(
         node_clients.rest_client,
         DEFAULT_MAX_WAIT_DURATION,
@@ -2336,7 +2342,7 @@ async fn submit_transaction<
     rest_client: &aptos_rest_client::Client,
     txn_expiry_duration: Duration,
     transaction_builder: F,
-) -> Result<Box<UserTransaction>, ErrorWrapper> {
+) -> Result<UserTransaction, ErrorWrapper> {
     let expiry_time = expiry_time(txn_expiry_duration);
 
     let txn_hash = transaction_builder(expiry_time.as_secs())
@@ -2352,7 +2358,7 @@ async fn wait_for_transaction(
     rest_client: &aptos_rest_client::Client,
     expiry_time: Duration,
     txn_hash: String,
-) -> Result<Box<UserTransaction>, Box<UserTransaction>> {
+) -> Result<UserTransaction, UserTransaction> {
     let hash_value = HashValue::from_str(&txn_hash).unwrap();
     let response = rest_client
         .wait_for_transaction_by_hash(
@@ -2403,7 +2409,7 @@ async fn add_delegated_stake_and_wait(
     sequence_number: Option<u64>,
     max_gas: Option<u64>,
     gas_unit_price: Option<u64>,
-) -> Result<Box<UserTransaction>, ErrorWrapper> {
+) -> Result<UserTransaction, ErrorWrapper> {
     let expiry_time = expiry_time(txn_expiry_duration);
     let txn_hash = rosetta_client
         .add_delegated_stake(
@@ -2436,7 +2442,7 @@ async fn unlock_delegated_stake_and_wait(
     sequence_number: Option<u64>,
     max_gas: Option<u64>,
     gas_unit_price: Option<u64>,
-) -> Result<Box<UserTransaction>, ErrorWrapper> {
+) -> Result<UserTransaction, ErrorWrapper> {
     let expiry_time = expiry_time(txn_expiry_duration);
     let txn_hash = rosetta_client
         .unlock_delegated_stake(
@@ -2468,7 +2474,7 @@ async fn withdraw_undelegated_stake_and_wait(
     sequence_number: Option<u64>,
     max_gas: Option<u64>,
     gas_unit_price: Option<u64>,
-) -> Result<Box<UserTransaction>, ErrorWrapper> {
+) -> Result<UserTransaction, ErrorWrapper> {
     let expiry_time = expiry_time(txn_expiry_duration);
     let txn_hash = rosetta_client
         .withdraw_undelegated_stake(
@@ -2494,7 +2500,7 @@ async fn withdraw_undelegated_stake_and_wait(
 async fn test_delegation_pool_operations() {
     const NUM_TXNS_PER_PAGE: u16 = 2;
 
-    let (mut swarm, cli, _, rosetta_client) = setup_test(
+    let (swarm, cli, _, rosetta_client) = setup_test(
         2,
         Arc::new(|_, config, _| config.api.max_transactions_page_size = NUM_TXNS_PER_PAGE),
     )
@@ -2703,5 +2709,5 @@ async fn test_delegation_pool_operations() {
 #[derive(Debug)]
 pub enum ErrorWrapper {
     BeforeSubmission(anyhow::Error),
-    AfterSubmission(Box<UserTransaction>),
+    AfterSubmission(UserTransaction),
 }
diff --git a/testsuite/smoke-test/src/state_sync.rs b/testsuite/smoke-test/src/state_sync.rs
index 92dc5929c9fc3..ce85f1477557f 100644
--- a/testsuite/smoke-test/src/state_sync.rs
+++ b/testsuite/smoke-test/src/state_sync.rs
@@ -4,44 +4,30 @@
 
 use crate::{
     smoke_test_environment::{new_local_swarm_with_aptos, SwarmBuilder},
-    test_utils::{
+    state_sync_utils,
+    utils::{
         create_test_accounts, execute_transactions, execute_transactions_and_wait,
-        wait_for_all_nodes, MAX_CATCH_UP_WAIT_SECS, MAX_HEALTHY_WAIT_SECS,
+        wait_for_all_nodes, MAX_CATCH_UP_WAIT_SECS,
     },
 };
-use aptos_config::config::{
-    BootstrappingMode, ContinuousSyncingMode, NodeConfig, OverrideNodeConfig,
-};
-use aptos_db::AptosDB;
-use aptos_forge::{LocalNode, LocalSwarm, Node, NodeExt, Swarm};
-use aptos_inspection_service::inspection_client::InspectionClient;
-use aptos_rest_client::Client as RestClient;
-use aptos_storage_interface::DbReader;
-use aptos_types::{
-    account_address::AccountAddress,
-    on_chain_config::{
-        ConsensusConfigV1, LeaderReputationType, OnChainConsensusConfig, ProposerAndVoterConfig,
-        ProposerElectionType,
-    },
-    PeerId,
-};
-use std::{
-    sync::Arc,
-    time::{Duration, Instant},
+use aptos_config::config::{BootstrappingMode, ContinuousSyncingMode, NodeConfig};
+use aptos_forge::{LocalSwarm, NodeExt};
+use aptos_types::on_chain_config::{
+    ConsensusConfigV1, LeaderReputationType, OnChainConsensusConfig, ProposerAndVoterConfig,
+    ProposerElectionType,
 };
-
-// TODO: Go through the existing tests, identify any gaps, and clean up the rest.
+use std::{sync::Arc, time::Duration};
 
 #[tokio::test]
 async fn test_fullnode_fast_sync_epoch_changes() {
     // Test fast syncing in the presence of epoch changes
-    test_fullnode_fast_sync(true).await;
+    state_sync_utils::test_fullnode_fast_sync(true, false).await;
 }
 
 #[tokio::test]
 async fn test_fullnode_fast_sync_no_epoch_changes() {
     // Test fast syncing without epoch changes
-    test_fullnode_fast_sync(false).await;
+    state_sync_utils::test_fullnode_fast_sync(false, false).await;
 }
 
 #[tokio::test]
@@ -60,8 +46,8 @@ async fn test_fullnode_output_sync_epoch_changes() {
     vfn_config.state_sync.aptos_data_client.use_compression = true;
 
     // Create the fullnode and test its ability to sync
-    let vfn_peer_id = create_fullnode(vfn_config, &mut swarm).await;
-    test_fullnode_sync(vfn_peer_id, &mut swarm, true, false).await;
+    let vfn_peer_id = state_sync_utils::create_fullnode(vfn_config, &mut swarm).await;
+    state_sync_utils::test_fullnode_sync(vfn_peer_id, &mut swarm, true, false).await;
 }
 
 #[tokio::test]
@@ -80,8 +66,8 @@ async fn test_fullnode_output_sync_no_compression() {
     vfn_config.state_sync.aptos_data_client.use_compression = false;
 
     // Create the fullnode and test its ability to sync
-    let vfn_peer_id = create_fullnode(vfn_config, &mut swarm).await;
-    test_fullnode_sync(vfn_peer_id, &mut swarm, true, false).await;
+    let vfn_peer_id = state_sync_utils::create_fullnode(vfn_config, &mut swarm).await;
+    state_sync_utils::test_fullnode_sync(vfn_peer_id, &mut swarm, true, false).await;
 }
 
 #[tokio::test]
@@ -100,8 +86,8 @@ async fn test_fullnode_output_sync_exponential_backoff() {
     vfn_config.state_sync.aptos_data_client.response_timeout_ms = 1;
 
     // Create the fullnode and test its ability to sync
-    let vfn_peer_id = create_fullnode(vfn_config, &mut swarm).await;
-    test_fullnode_sync(vfn_peer_id, &mut swarm, true, false).await;
+    let vfn_peer_id = state_sync_utils::create_fullnode(vfn_config, &mut swarm).await;
+    state_sync_utils::test_fullnode_sync(vfn_peer_id, &mut swarm, true, false).await;
 }
 
 #[tokio::test]
@@ -130,8 +116,8 @@ async fn test_fullnode_intelligent_sync_epoch_changes() {
     vfn_config.state_sync.aptos_data_client.response_timeout_ms = 1;
 
     // Create the fullnode and test its ability to sync
-    let vfn_peer_id = create_fullnode(vfn_config, &mut swarm).await;
-    test_fullnode_sync(vfn_peer_id, &mut swarm, true, false).await;
+    let vfn_peer_id = state_sync_utils::create_fullnode(vfn_config, &mut swarm).await;
+    state_sync_utils::test_fullnode_sync(vfn_peer_id, &mut swarm, true, false).await;
 }
 
 #[tokio::test]
@@ -160,8 +146,8 @@ async fn test_fullnode_fast_and_intelligent_sync_epoch_changes() {
     vfn_config.state_sync.aptos_data_client.response_timeout_ms = 1;
 
     // Create the fullnode and test its ability to sync
-    let vfn_peer_id = create_fullnode(vfn_config, &mut swarm).await;
-    test_fullnode_sync(vfn_peer_id, &mut swarm, true, false).await;
+    let vfn_peer_id = state_sync_utils::create_fullnode(vfn_config, &mut swarm).await;
+    state_sync_utils::test_fullnode_sync(vfn_peer_id, &mut swarm, true, false).await;
 }
 
 #[tokio::test]
@@ -180,8 +166,8 @@ async fn test_fullnode_execution_sync_epoch_changes() {
     vfn_config.state_sync.aptos_data_client.use_compression = true;
 
     // Create the fullnode and test its ability to sync
-    let vfn_peer_id = create_fullnode(vfn_config, &mut swarm).await;
-    test_fullnode_sync(vfn_peer_id, &mut swarm, true, false).await;
+    let vfn_peer_id = state_sync_utils::create_fullnode(vfn_config, &mut swarm).await;
+    state_sync_utils::test_fullnode_sync(vfn_peer_id, &mut swarm, true, false).await;
 }
 
 #[tokio::test]
@@ -197,8 +183,8 @@ async fn test_fullnode_output_sync_no_epoch_changes() {
         .continuous_syncing_mode = ContinuousSyncingMode::ApplyTransactionOutputs;
 
     // Create the fullnode and test its ability to sync
-    let vfn_peer_id = create_fullnode(vfn_config, &mut swarm).await;
-    test_fullnode_sync(vfn_peer_id, &mut swarm, false, false).await;
+    let vfn_peer_id = state_sync_utils::create_fullnode(vfn_config, &mut swarm).await;
+    state_sync_utils::test_fullnode_sync(vfn_peer_id, &mut swarm, false, false).await;
 }
 
 #[tokio::test]
@@ -214,8 +200,8 @@ async fn test_fullnode_execution_sync_no_epoch_changes() {
         .continuous_syncing_mode = ContinuousSyncingMode::ExecuteTransactions;
 
     // Create the fullnode and test its ability to sync
-    let vfn_peer_id = create_fullnode(vfn_config, &mut swarm).await;
-    test_fullnode_sync(vfn_peer_id, &mut swarm, false, false).await;
+    let vfn_peer_id = state_sync_utils::create_fullnode(vfn_config, &mut swarm).await;
+    state_sync_utils::test_fullnode_sync(vfn_peer_id, &mut swarm, false, false).await;
 }
 
 #[tokio::test]
@@ -570,63 +556,6 @@ async fn test_all_validators_fast_and_execution_sync() {
     test_all_validator_failures(swarm).await;
 }
 
-/// Creates a new full node using the given config and swarm
-async fn create_fullnode(full_node_config: NodeConfig, swarm: &mut LocalSwarm) -> PeerId {
-    let validator_peer_id = swarm.validators().next().unwrap().peer_id();
-    let vfn_peer_id = swarm
-        .add_validator_fullnode(
-            &swarm.versions().max().unwrap(),
-            OverrideNodeConfig::new_with_default_base(full_node_config),
-            validator_peer_id,
-        )
-        .unwrap();
-    for fullnode in swarm.full_nodes_mut() {
-        fullnode
-            .wait_until_healthy(Instant::now() + Duration::from_secs(MAX_HEALTHY_WAIT_SECS))
-            .await
-            .unwrap();
-    }
-    vfn_peer_id
-}
-
-/// A test method that verifies that a fullnode can fast sync from
-/// a validator after a data wipe. If `epoch_changes` are enabled
-/// then epoch changes can occur during test execution and fullnode syncing.
-async fn test_fullnode_fast_sync(epoch_changes: bool) {
-    // Create a swarm with 2 validators
-    let mut swarm = SwarmBuilder::new_local(2)
-        .with_aptos()
-        .with_init_config(Arc::new(|_, config, _| {
-            config.state_sync.state_sync_driver.bootstrapping_mode =
-                BootstrappingMode::DownloadLatestStates;
-        }))
-        .with_init_genesis_config(Arc::new(|genesis_config| {
-            genesis_config.epoch_duration_secs = 10_000; // Prevent epoch changes from occurring unnecessarily
-        }))
-        .build()
-        .await;
-
-    // Verify the oldest ledger info and pruning metrics for the validators
-    for validator in swarm.validators_mut() {
-        verify_fast_sync_version_and_metrics(validator, true).await;
-    }
-
-    // Create a fullnode config that uses fast syncing
-    let mut vfn_config = NodeConfig::get_default_vfn_config();
-    vfn_config.state_sync.state_sync_driver.bootstrapping_mode =
-        BootstrappingMode::DownloadLatestStates;
-
-    // Test the ability of a fullnode to sync
-    let vfn_peer_id = create_fullnode(vfn_config, &mut swarm).await;
-    test_fullnode_sync(vfn_peer_id, &mut swarm, epoch_changes, true).await;
-
-    // Verify the oldest ledger info and pruning metrics for the fullnode
-    if epoch_changes {
-        let fullnode = swarm.fullnode_mut(vfn_peer_id).unwrap();
-        verify_fast_sync_version_and_metrics(fullnode, false).await;
-    }
-}
-
 /// A test method that verifies that a validator can fast sync from other
 /// validators after a data wipe and while requiring exponential backoff.
 /// If `epoch_changes` are enabled then epoch changes can occur during
@@ -653,54 +582,6 @@ async fn test_validator_sync_exponential_backoff(epoch_changes: bool) {
     test_validator_sync(&mut swarm, 1, epoch_changes).await;
 }
 
-/// A helper method that tests that a full node can sync from a validator after
-/// a failure and continue to stay up-to-date.
-async fn test_fullnode_sync(
-    vfn_peer_id: PeerId,
-    swarm: &mut LocalSwarm,
-    epoch_changes: bool,
-    clear_storage: bool,
-) {
-    // Stop the fullnode and potentially clear storage
-    if clear_storage {
-        stop_fullnode_and_delete_storage(swarm, vfn_peer_id).await;
-    } else {
-        swarm.fullnode_mut(vfn_peer_id).unwrap().stop();
-    }
-
-    // Execute a number of transactions on the validator
-    let validator_peer_id = swarm.validators().next().unwrap().peer_id();
-    let validator_client = swarm.validator(validator_peer_id).unwrap().rest_client();
-    let (mut account_0, mut account_1) = create_test_accounts(swarm).await;
-    execute_transactions(
-        swarm,
-        &validator_client,
-        &mut account_0,
-        &account_1,
-        epoch_changes,
-    )
-    .await;
-
-    // Restart the fullnode and verify it can sync
-    swarm
-        .fullnode_mut(vfn_peer_id)
-        .unwrap()
-        .restart()
-        .await
-        .unwrap();
-    wait_for_all_nodes(swarm).await;
-
-    // Execute more transactions on the validator and verify the fullnode catches up
-    execute_transactions_and_wait(
-        swarm,
-        &validator_client,
-        &mut account_1,
-        &account_0,
-        epoch_changes,
-    )
-    .await;
-}
-
 /// A helper method that tests that a validator can sync after a failure and
 /// continue to stay up-to-date.
 async fn test_validator_sync(
@@ -726,7 +607,7 @@ async fn test_validator_sync(
 
     // Stop the specified validator and delete the storage
     let validator = validator_peer_ids[validator_index_to_test];
-    stop_validator_and_delete_storage(swarm, validator).await;
+    state_sync_utils::stop_validator_and_delete_storage(swarm, validator, true).await;
 
     // Execute more transactions
     execute_transactions(
@@ -822,7 +703,7 @@ async fn test_validator_sync_and_participate(fast_sync: bool, epoch_changes: boo
     // Verify the oldest ledger info and pruning metrics for the second validator
     if fast_sync && epoch_changes {
         let validator = swarm.validators_mut().nth(validator_index_to_test).unwrap();
-        verify_fast_sync_version_and_metrics(validator, false).await;
+        state_sync_utils::verify_fast_sync_version_and_metrics(validator, false).await;
     }
 
     // Execute multiple transactions through the first validator
@@ -877,7 +758,7 @@ pub async fn test_all_validator_failures(mut swarm: LocalSwarm) {
 
     // Go through each validator, stop the node, delete the storage and wait for it to come back
     for validator in validator_peer_ids.clone() {
-        stop_validator_and_delete_storage(&mut swarm, validator).await;
+        state_sync_utils::stop_validator_and_delete_storage(&mut swarm, validator, true).await;
         swarm.validator_mut(validator).unwrap().start().unwrap();
         wait_for_all_nodes(&mut swarm).await;
     }
@@ -894,7 +775,7 @@ pub async fn test_all_validator_failures(mut swarm: LocalSwarm) {
 
     // Go through each validator, stop the node, delete the storage and wait for it to come back
     for validator in validator_peer_ids.clone() {
-        stop_validator_and_delete_storage(&mut swarm, validator).await;
+        state_sync_utils::stop_validator_and_delete_storage(&mut swarm, validator, true).await;
         swarm.validator_mut(validator).unwrap().start().unwrap();
         wait_for_all_nodes(&mut swarm).await;
     }
@@ -913,110 +794,3 @@ pub async fn test_all_validator_failures(mut swarm: LocalSwarm) {
     )
     .await;
 }
-
-/// Stops the specified fullnode and deletes storage
-async fn stop_fullnode_and_delete_storage(swarm: &mut LocalSwarm, fullnode: AccountAddress) {
-    let fullnode = swarm.full_node_mut(fullnode).unwrap();
-
-    // The fullnode is stopped during the clear_storage() call
-    fullnode.clear_storage().await.unwrap();
-}
-
-/// Stops the specified validator and deletes storage
-async fn stop_validator_and_delete_storage(swarm: &mut LocalSwarm, validator: AccountAddress) {
-    let validator = swarm.validator_mut(validator).unwrap();
-
-    // The validator is stopped during the clear_storage() call
-    validator.clear_storage().await.unwrap();
-}
-
-/// Verifies that the oldest ledger info, pruning metrics and first
-/// ledger info are all correctly aligned after a fast sync.
-async fn verify_fast_sync_version_and_metrics(node: &mut LocalNode, sync_to_genesis: bool) {
-    // Verify the oldest ledger info for the node
-    verify_oldest_version_after_fast_sync(node.rest_client(), sync_to_genesis).await;
-
-    // Verify the node's pruning metrics
-    let inspection_client = node.inspection_client();
-    verify_pruning_metrics_after_fast_sync(inspection_client, sync_to_genesis).await;
-
-    // Verify that the ledger info exists at version 0
-    verify_first_ledger_info(node);
-}
-
-/// Verifies that the ledger info at version 0 exists in the given node's DB
-fn verify_first_ledger_info(node: &mut LocalNode) {
-    // Get the DB path for the node
-    let db_path = node.config().base.data_dir.as_path();
-    let mut db_path_buf = db_path.to_path_buf();
-    db_path_buf.push("db");
-
-    // Stop the node to prevent any DB contention
-    node.stop();
-
-    // Verify that the ledger info exists at version 0
-    let aptos_db = AptosDB::new_for_test(db_path_buf.as_path());
-    aptos_db.get_epoch_ending_ledger_info(0).unwrap();
-
-    // Restart the node
-    node.start().unwrap();
-}
-
-/// Verifies the oldest ledger version on a node after fast syncing
-async fn verify_oldest_version_after_fast_sync(
-    node_rest_client: RestClient,
-    sync_to_genesis: bool,
-) {
-    // Fetch the oldest ledger version from the node
-    let ledger_information = node_rest_client.get_ledger_information().await.unwrap();
-    let oldest_ledger_version = ledger_information.inner().oldest_ledger_version;
-
-    // Verify the oldest ledger version after fast syncing
-    if sync_to_genesis {
-        // The node should have fast synced to genesis
-        assert_eq!(oldest_ledger_version, 0);
-    } else {
-        // The node should have fast synced to the latest epoch
-        assert!(oldest_ledger_version > 0);
-    }
-}
-
-/// Verifies the pruning metrics on a node after fast syncing
-async fn verify_pruning_metrics_after_fast_sync(
-    node_inspection_client: InspectionClient,
-    sync_to_genesis: bool,
-) {
-    // Fetch the pruning metrics from the node
-    let state_merkle_pruner_version = node_inspection_client
-        .get_node_metric_i64(
-            "aptos_pruner_versions{pruner_name=state_merkle_pruner,tag=min_readable}",
-        )
-        .await
-        .unwrap()
-        .unwrap();
-    let epoch_snapshot_pruner_version = node_inspection_client
-        .get_node_metric_i64(
-            "aptos_pruner_versions{pruner_name=epoch_snapshot_pruner,tag=min_readable}",
-        )
-        .await
-        .unwrap()
-        .unwrap();
-    let ledger_pruner_version = node_inspection_client
-        .get_node_metric_i64("aptos_pruner_versions{pruner_name=ledger_pruner,tag=min_readable}")
-        .await
-        .unwrap()
-        .unwrap();
-
-    // Verify that the pruning metrics are valid
-    if sync_to_genesis {
-        // The node should have fast synced to genesis
-        assert_eq!(state_merkle_pruner_version, 0);
-        assert_eq!(epoch_snapshot_pruner_version, 0);
-        assert_eq!(ledger_pruner_version, 0);
-    } else {
-        // The node should have fast synced to the latest epoch
-        assert!(state_merkle_pruner_version > 0);
-        assert!(epoch_snapshot_pruner_version > 0);
-        assert!(ledger_pruner_version > 0);
-    }
-}
diff --git a/testsuite/smoke-test/src/state_sync_utils.rs b/testsuite/smoke-test/src/state_sync_utils.rs
new file mode 100644
index 0000000000000..0558d169629b0
--- /dev/null
+++ b/testsuite/smoke-test/src/state_sync_utils.rs
@@ -0,0 +1,265 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    smoke_test_environment::SwarmBuilder,
+    utils::{
+        create_test_accounts, execute_transactions, execute_transactions_and_wait,
+        wait_for_all_nodes, MAX_HEALTHY_WAIT_SECS,
+    },
+};
+use aptos_config::config::{BootstrappingMode, NodeConfig, OverrideNodeConfig};
+use aptos_db::AptosDB;
+use aptos_forge::{LocalNode, LocalSwarm, Node, NodeExt, Swarm};
+use aptos_inspection_service::inspection_client::InspectionClient;
+use aptos_rest_client::Client as RestClient;
+use aptos_sdk::types::PeerId;
+use aptos_storage_interface::DbReader;
+use move_core_types::account_address::AccountAddress;
+use std::{
+    sync::Arc,
+    time::{Duration, Instant},
+};
+
+/// Creates a new full node using the given config and swarm
+pub async fn create_fullnode(full_node_config: NodeConfig, swarm: &mut LocalSwarm) -> PeerId {
+    let validator_peer_id = swarm.validators().next().unwrap().peer_id();
+    let vfn_peer_id = swarm
+        .add_validator_fullnode(
+            &swarm.versions().max().unwrap(),
+            OverrideNodeConfig::new_with_default_base(full_node_config),
+            validator_peer_id,
+        )
+        .unwrap();
+    for fullnode in swarm.full_nodes() {
+        fullnode
+            .wait_until_healthy(Instant::now() + Duration::from_secs(MAX_HEALTHY_WAIT_SECS))
+            .await
+            .unwrap();
+    }
+    vfn_peer_id
+}
+
+/// Enables consensus observer for the given node config if `use_consensus_observer`
+/// is true. This currently assumes that validators will only use the publisher,
+/// and VFNs will only use the observer.
+pub fn enable_consensus_observer(use_consensus_observer: bool, node_config: &mut NodeConfig) {
+    if use_consensus_observer {
+        match node_config.base.role {
+            aptos_config::config::RoleType::Validator => {
+                node_config.consensus_observer.publisher_enabled = true;
+            },
+            aptos_config::config::RoleType::FullNode => {
+                node_config.consensus_observer.observer_enabled = true;
+            },
+        }
+    }
+}
+
+/// Stops the specified fullnode and only deletes storage if `clear_storage` is true
+pub async fn stop_fullnode_and_delete_storage(
+    swarm: &mut LocalSwarm,
+    fullnode: AccountAddress,
+    clear_storage: bool,
+) {
+    let fullnode = swarm.full_node(fullnode).unwrap();
+    if clear_storage {
+        // The fullnode is implicitly stopped during the clear_storage() call
+        fullnode.clear_storage().await.unwrap();
+    } else {
+        fullnode.stop().await.unwrap();
+    }
+}
+
+/// Stops the specified validator and deletes storage if `clear_storage` is true
+pub async fn stop_validator_and_delete_storage(
+    swarm: &mut LocalSwarm,
+    validator: AccountAddress,
+    clear_storage: bool,
+) {
+    let validator = swarm.validator_mut(validator).unwrap();
+    if clear_storage {
+        // The validator is implicitly stopped during the clear_storage() call
+        validator.clear_storage().await.unwrap();
+    } else {
+        validator.stop();
+    }
+}
+
+/// A test method that verifies that a fullnode can fast sync from
+/// a validator after a data wipe.
+/// - If `epoch_changes` are enabled then epoch changes can occur
+///   during test execution and fullnode syncing.
+/// - If `enable_consensus_observer` is enabled then the fullnode
+///   will use the consensus observer.
+pub async fn test_fullnode_fast_sync(epoch_changes: bool, use_consensus_observer: bool) {
+    // Create a swarm with 2 validators
+    let mut swarm = SwarmBuilder::new_local(2)
+        .with_aptos()
+        .with_init_config(Arc::new(move |_, config, _| {
+            config.state_sync.state_sync_driver.bootstrapping_mode =
+                BootstrappingMode::DownloadLatestStates;
+            enable_consensus_observer(use_consensus_observer, config);
+        }))
+        .with_init_genesis_config(Arc::new(|genesis_config| {
+            genesis_config.epoch_duration_secs = 10_000; // Prevent epoch changes from occurring unnecessarily
+        }))
+        .build()
+        .await;
+
+    // Verify the oldest ledger info and pruning metrics for the validators
+    for validator in swarm.validators_mut() {
+        verify_fast_sync_version_and_metrics(validator, true).await;
+    }
+
+    // Create a fullnode config with appropriate settings
+    let mut vfn_config = NodeConfig::get_default_vfn_config();
+    vfn_config.state_sync.state_sync_driver.bootstrapping_mode =
+        BootstrappingMode::DownloadLatestStates;
+    enable_consensus_observer(use_consensus_observer, &mut vfn_config);
+
+    // Test the ability of a fullnode to sync
+    let vfn_peer_id = create_fullnode(vfn_config, &mut swarm).await;
+    test_fullnode_sync(vfn_peer_id, &mut swarm, epoch_changes, true).await;
+
+    // Verify the oldest ledger info and pruning metrics for the fullnode
+    if epoch_changes {
+        let fullnode = swarm.fullnode_mut(vfn_peer_id).unwrap();
+        verify_fast_sync_version_and_metrics(fullnode, false).await;
+    }
+}
+
+/// A helper method that tests that a full node can sync from a validator after
+/// a failure and continue to stay up-to-date.
+pub async fn test_fullnode_sync(
+    vfn_peer_id: PeerId,
+    swarm: &mut LocalSwarm,
+    epoch_changes: bool,
+    clear_storage: bool,
+) {
+    // Stop the fullnode and potentially clear storage
+    stop_fullnode_and_delete_storage(swarm, vfn_peer_id, clear_storage).await;
+
+    // Execute a number of transactions on the validator
+    let validator_peer_id = swarm.validators().next().unwrap().peer_id();
+    let validator_client = swarm.validator(validator_peer_id).unwrap().rest_client();
+    let (mut account_0, mut account_1) = create_test_accounts(swarm).await;
+    execute_transactions(
+        swarm,
+        &validator_client,
+        &mut account_0,
+        &account_1,
+        epoch_changes,
+    )
+    .await;
+
+    // Restart the fullnode and verify it can sync
+    swarm
+        .fullnode_mut(vfn_peer_id)
+        .unwrap()
+        .restart()
+        .await
+        .unwrap();
+    wait_for_all_nodes(swarm).await;
+
+    // Execute more transactions on the validator and verify the fullnode catches up
+    execute_transactions_and_wait(
+        swarm,
+        &validator_client,
+        &mut account_1,
+        &account_0,
+        epoch_changes,
+    )
+    .await;
+}
+
+/// Verifies that the oldest ledger info, pruning metrics and first
+/// ledger info are all correctly aligned after a fast sync.
+pub async fn verify_fast_sync_version_and_metrics(node: &mut LocalNode, sync_to_genesis: bool) {
+    // Verify the oldest ledger info for the node
+    verify_oldest_version_after_fast_sync(node.rest_client(), sync_to_genesis).await;
+
+    // Verify the node's pruning metrics
+    let inspection_client = node.inspection_client();
+    verify_pruning_metrics_after_fast_sync(inspection_client, sync_to_genesis).await;
+
+    // Verify that the ledger info exists at version 0
+    verify_first_ledger_info(node);
+}
+
+/// Verifies that the ledger info at version 0 exists in the given node's DB
+fn verify_first_ledger_info(node: &mut LocalNode) {
+    // Get the DB path for the node
+    let db_path = node.config().base.data_dir.as_path();
+    let mut db_path_buf = db_path.to_path_buf();
+    db_path_buf.push("db");
+
+    // Stop the node to prevent any DB contention
+    node.stop();
+
+    // Verify that the ledger info exists at version 0
+    let aptos_db = AptosDB::new_for_test(db_path_buf.as_path());
+    aptos_db.get_epoch_ending_ledger_info(0).unwrap();
+
+    // Restart the node
+    node.start().unwrap();
+}
+
+/// Verifies the oldest ledger version on a node after fast syncing
+async fn verify_oldest_version_after_fast_sync(
+    node_rest_client: RestClient,
+    sync_to_genesis: bool,
+) {
+    // Fetch the oldest ledger version from the node
+    let ledger_information = node_rest_client.get_ledger_information().await.unwrap();
+    let oldest_ledger_version = ledger_information.inner().oldest_ledger_version;
+
+    // Verify the oldest ledger version after fast syncing
+    if sync_to_genesis {
+        // The node should have fast synced to genesis
+        assert_eq!(oldest_ledger_version, 0);
+    } else {
+        // The node should have fast synced to the latest epoch
+        assert!(oldest_ledger_version > 0);
+    }
+}
+
+/// Verifies the pruning metrics on a node after fast syncing
+async fn verify_pruning_metrics_after_fast_sync(
+    node_inspection_client: InspectionClient,
+    sync_to_genesis: bool,
+) {
+    // Fetch the pruning metrics from the node
+    let state_merkle_pruner_version = node_inspection_client
+        .get_node_metric_i64(
+            "aptos_pruner_versions{pruner_name=state_merkle_pruner,tag=min_readable}",
+        )
+        .await
+        .unwrap()
+        .unwrap();
+    let epoch_snapshot_pruner_version = node_inspection_client
+        .get_node_metric_i64(
+            "aptos_pruner_versions{pruner_name=epoch_snapshot_pruner,tag=min_readable}",
+        )
+        .await
+        .unwrap()
+        .unwrap();
+    let ledger_pruner_version = node_inspection_client
+        .get_node_metric_i64("aptos_pruner_versions{pruner_name=ledger_pruner,tag=min_readable}")
+        .await
+        .unwrap()
+        .unwrap();
+
+    // Verify that the pruning metrics are valid
+    if sync_to_genesis {
+        // The node should have fast synced to genesis
+        assert_eq!(state_merkle_pruner_version, 0);
+        assert_eq!(epoch_snapshot_pruner_version, 0);
+        assert_eq!(ledger_pruner_version, 0);
+    } else {
+        // The node should have fast synced to the latest epoch
+        assert!(state_merkle_pruner_version > 0);
+        assert!(epoch_snapshot_pruner_version > 0);
+        assert!(ledger_pruner_version > 0);
+    }
+}
diff --git a/testsuite/smoke-test/src/storage.rs b/testsuite/smoke-test/src/storage.rs
index d60437909cc76..85f5b19d4ba3b 100644
--- a/testsuite/smoke-test/src/storage.rs
+++ b/testsuite/smoke-test/src/storage.rs
@@ -4,7 +4,7 @@
 
 use crate::{
     smoke_test_environment::SwarmBuilder,
-    test_utils::{
+    utils::{
         assert_balance, create_and_fund_account, swarm_utils::insert_waypoint,
         transfer_and_maybe_reconfig, transfer_coins, MAX_CATCH_UP_WAIT_SECS, MAX_HEALTHY_WAIT_SECS,
     },
@@ -430,6 +430,7 @@ pub(crate) fn db_restore(
 
     if enable_storage_sharding {
         cmd.arg("--enable_storage_sharding");
+        cmd.arg("--enable-state-indices");
     }
     if let Some(version) = target_verion {
         cmd.arg("--target-version");
diff --git a/testsuite/smoke-test/src/test_smoke_tests.rs b/testsuite/smoke-test/src/test_smoke_tests.rs
index 6c071fd581f52..16c28215369ec 100644
--- a/testsuite/smoke-test/src/test_smoke_tests.rs
+++ b/testsuite/smoke-test/src/test_smoke_tests.rs
@@ -3,7 +3,7 @@
 
 use crate::{
     smoke_test_environment::SwarmBuilder,
-    test_utils::{MAX_CONNECTIVITY_WAIT_SECS, MAX_HEALTHY_WAIT_SECS},
+    utils::{MAX_CONNECTIVITY_WAIT_SECS, MAX_HEALTHY_WAIT_SECS},
 };
 use aptos_config::config::{NodeConfig, OverrideNodeConfig};
 use aptos_forge::{NodeExt, Swarm};
@@ -40,7 +40,7 @@ async fn test_aptos_node_after_get_bin() {
         )
         .unwrap();
 
-    for fullnode in swarm.full_nodes_mut() {
+    for fullnode in swarm.full_nodes() {
         fullnode
             .wait_until_healthy(Instant::now() + Duration::from_secs(MAX_HEALTHY_WAIT_SECS))
             .await
diff --git a/testsuite/smoke-test/src/test_utils.rs b/testsuite/smoke-test/src/test_utils.rs
deleted file mode 100644
index da2258ab9ff71..0000000000000
--- a/testsuite/smoke-test/src/test_utils.rs
+++ /dev/null
@@ -1,206 +0,0 @@
-// Copyright © Aptos Foundation
-// Parts of the project are originally copyright © Meta Platforms, Inc.
-// SPDX-License-Identifier: Apache-2.0
-
-use aptos_cached_packages::aptos_stdlib;
-use aptos_forge::{reconfig, LocalSwarm, NodeExt, Swarm, SwarmExt};
-use aptos_rest_client::Client as RestClient;
-use aptos_sdk::{
-    transaction_builder::TransactionFactory,
-    types::{transaction::SignedTransaction, LocalAccount},
-};
-use rand::random;
-use std::time::Duration;
-
-pub const MAX_CATCH_UP_WAIT_SECS: u64 = 180; // The max time we'll wait for nodes to catch up
-pub const MAX_CONNECTIVITY_WAIT_SECS: u64 = 180; // The max time we'll wait for nodes to gain connectivity
-pub const MAX_HEALTHY_WAIT_SECS: u64 = 120; // The max time we'll wait for nodes to become healthy
-
-pub async fn create_and_fund_account(swarm: &'_ mut dyn Swarm, amount: u64) -> LocalAccount {
-    let mut info = swarm.aptos_public_info();
-    info.create_and_fund_user_account(amount).await.unwrap()
-}
-
-/// Creates and funds two test accounts
-pub async fn create_test_accounts(swarm: &mut LocalSwarm) -> (LocalAccount, LocalAccount) {
-    let token_amount = 1000;
-    let account_0 = create_and_fund_account(swarm, token_amount).await;
-    let account_1 = create_and_fund_account(swarm, token_amount).await;
-    (account_0, account_1)
-}
-
-/// Executes transactions using the given transaction factory, client and
-/// accounts. If `execute_epoch_changes` is true, also execute transactions to
-/// force reconfigurations.
-pub async fn execute_transactions(
-    swarm: &mut LocalSwarm,
-    client: &RestClient,
-    sender: &mut LocalAccount,
-    receiver: &LocalAccount,
-    execute_epoch_changes: bool,
-) {
-    // Execute several transactions
-    let num_transfers = 10;
-    let transaction_factory = swarm.chain_info().transaction_factory();
-    if execute_epoch_changes {
-        transfer_and_maybe_reconfig(
-            client,
-            &transaction_factory,
-            swarm.chain_info().root_account,
-            sender,
-            receiver,
-            num_transfers,
-        )
-        .await;
-    } else {
-        for _ in 0..num_transfers {
-            // Execute simple transfer transactions
-            transfer_coins(client, &transaction_factory, sender, receiver, 1).await;
-        }
-    }
-
-    // Always ensure that at least one reconfiguration transaction is executed
-    if !execute_epoch_changes {
-        aptos_forge::reconfig(
-            client,
-            &transaction_factory,
-            swarm.chain_info().root_account,
-        )
-        .await;
-    }
-}
-
-/// Executes transactions and waits for all nodes to catch up
-pub async fn execute_transactions_and_wait(
-    swarm: &mut LocalSwarm,
-    client: &RestClient,
-    sender: &mut LocalAccount,
-    receiver: &LocalAccount,
-    epoch_changes: bool,
-) {
-    execute_transactions(swarm, client, sender, receiver, epoch_changes).await;
-    wait_for_all_nodes(swarm).await;
-}
-
-pub async fn transfer_coins_non_blocking(
-    client: &RestClient,
-    transaction_factory: &TransactionFactory,
-    sender: &mut LocalAccount,
-    receiver: &LocalAccount,
-    amount: u64,
-) -> SignedTransaction {
-    let txn = sender.sign_with_transaction_builder(transaction_factory.payload(
-        aptos_stdlib::aptos_coin_transfer(receiver.address(), amount),
-    ));
-
-    client.submit(&txn).await.unwrap();
-    txn
-}
-
-pub async fn transfer_coins(
-    client: &RestClient,
-    transaction_factory: &TransactionFactory,
-    sender: &mut LocalAccount,
-    receiver: &LocalAccount,
-    amount: u64,
-) -> SignedTransaction {
-    let txn =
-        transfer_coins_non_blocking(client, transaction_factory, sender, receiver, amount).await;
-
-    client.wait_for_signed_transaction(&txn).await.unwrap();
-
-    txn
-}
-
-pub async fn transfer_and_maybe_reconfig(
-    client: &RestClient,
-    transaction_factory: &TransactionFactory,
-    root_account: &mut LocalAccount,
-    sender: &mut LocalAccount,
-    receiver: &LocalAccount,
-    num_transfers: usize,
-) {
-    for _ in 0..num_transfers {
-        // Reconfigurations have a 20% chance of being executed
-        if random::<u16>() % 5 == 0 {
-            reconfig(client, transaction_factory, root_account).await;
-        }
-
-        transfer_coins(client, transaction_factory, sender, receiver, 1).await;
-    }
-}
-
-pub async fn assert_balance(client: &RestClient, account: &LocalAccount, balance: u64) {
-    let on_chain_balance = client
-        .get_account_balance(account.address())
-        .await
-        .unwrap()
-        .into_inner();
-
-    assert_eq!(on_chain_balance.get(), balance);
-}
-
-/// This helper function creates 3 new accounts, mints funds, transfers funds
-/// between the accounts and verifies that these operations succeed.
-pub async fn check_create_mint_transfer(swarm: &mut LocalSwarm) {
-    check_create_mint_transfer_node(swarm, 0).await;
-}
-
-/// This helper function creates 3 new accounts, mints funds, transfers funds
-/// between the accounts and verifies that these operations succeed on one specific validator.
-pub async fn check_create_mint_transfer_node(swarm: &mut LocalSwarm, idx: usize) {
-    let client = swarm.validators().nth(idx).unwrap().rest_client();
-
-    // Create account 0, mint 10 coins and check balance
-    let transaction_factory = TransactionFactory::new(swarm.chain_id());
-    let mut info = swarm.aptos_public_info_for_node(idx);
-    let mut account_0 = info.create_and_fund_user_account(10).await.unwrap();
-    assert_balance(&client, &account_0, 10).await;
-
-    // Create account 1, mint 1 coin, transfer 3 coins from account 0 to 1, check balances
-    let account_1 = info.create_and_fund_user_account(1).await.unwrap();
-    transfer_coins(&client, &transaction_factory, &mut account_0, &account_1, 3).await;
-
-    assert_balance(&client, &account_0, 7).await;
-    assert_balance(&client, &account_1, 4).await;
-
-    // Create account 2, mint 15 coins and check balance
-    let account_2 = info.create_and_fund_user_account(15).await.unwrap();
-    assert_balance(&client, &account_2, 15).await;
-}
-
-/// Waits for all nodes to catch up
-pub async fn wait_for_all_nodes(swarm: &mut LocalSwarm) {
-    swarm
-        .wait_for_all_nodes_to_catchup(Duration::from_secs(MAX_CATCH_UP_WAIT_SECS))
-        .await
-        .unwrap();
-}
-
-/// This module provides useful functions for operating, handling and managing
-/// AptosSwarm instances. It is particularly useful for working with tests that
-/// require a SmokeTestEnvironment, as it provides a generic interface across
-/// AptosSwarms, regardless of if the swarm is a validator swarm, validator full
-/// node swarm, or a public full node swarm.
-#[cfg(test)]
-pub mod swarm_utils {
-    use aptos_config::config::{NodeConfig, SecureBackend, WaypointConfig};
-    use aptos_secure_storage::{KVStorage, Storage};
-    use aptos_types::waypoint::Waypoint;
-
-    pub fn insert_waypoint(node_config: &mut NodeConfig, waypoint: Waypoint) {
-        node_config.base.waypoint = WaypointConfig::FromConfig(waypoint);
-
-        let f = |backend: &SecureBackend| {
-            let mut storage: Storage = backend.into();
-            storage
-                .set(aptos_global_constants::WAYPOINT, waypoint)
-                .expect("Unable to write waypoint");
-            storage
-                .set(aptos_global_constants::GENESIS_WAYPOINT, waypoint)
-                .expect("Unable to write waypoint");
-        };
-        let backend = &node_config.consensus.safety_rules.backend;
-        f(backend);
-    }
-}
diff --git a/testsuite/smoke-test/src/transaction.rs b/testsuite/smoke-test/src/transaction.rs
index c58e36400dc65..1e9d47b85ba77 100644
--- a/testsuite/smoke-test/src/transaction.rs
+++ b/testsuite/smoke-test/src/transaction.rs
@@ -19,7 +19,7 @@ use aptos_sdk::{
 #[ignore]
 #[tokio::test]
 async fn test_external_transaction_signer() {
-    let mut swarm = new_local_swarm_with_aptos(1).await;
+    let swarm = new_local_swarm_with_aptos(1).await;
     let mut info = swarm.aptos_public_info();
 
     // generate key pair
diff --git a/testsuite/smoke-test/src/txn_broadcast.rs b/testsuite/smoke-test/src/txn_broadcast.rs
index 816ba1f989aa4..018a939bcf1a7 100644
--- a/testsuite/smoke-test/src/txn_broadcast.rs
+++ b/testsuite/smoke-test/src/txn_broadcast.rs
@@ -3,7 +3,7 @@
 
 use crate::{
     smoke_test_environment::SwarmBuilder,
-    test_utils::{
+    utils::{
         assert_balance, create_and_fund_account, transfer_coins, MAX_CATCH_UP_WAIT_SECS,
         MAX_CONNECTIVITY_WAIT_SECS, MAX_HEALTHY_WAIT_SECS,
     },
@@ -39,7 +39,7 @@ async fn test_txn_broadcast() {
         )
         .unwrap();
 
-    for fullnode in swarm.full_nodes_mut() {
+    for fullnode in swarm.full_nodes() {
         fullnode
             .wait_until_healthy(Instant::now() + Duration::from_secs(MAX_HEALTHY_WAIT_SECS))
             .await
diff --git a/testsuite/smoke-test/src/txn_emitter.rs b/testsuite/smoke-test/src/txn_emitter.rs
index 3023f89c70cff..937509f8cf38f 100644
--- a/testsuite/smoke-test/src/txn_emitter.rs
+++ b/testsuite/smoke-test/src/txn_emitter.rs
@@ -3,7 +3,7 @@
 
 use crate::{
     smoke_test_environment::{new_local_swarm_with_aptos, SwarmBuilder},
-    test_utils::create_and_fund_account,
+    utils::create_and_fund_account,
 };
 use anyhow::ensure;
 use aptos_forge::{
@@ -142,7 +142,8 @@ async fn test_txn_emmitter_with_high_pending_latency() {
         .with_init_config(Arc::new(|_, conf, _| {
             conf.api.failpoints_enabled = true;
             conf.consensus.pipeline_backpressure.truncate(1);
-            conf.consensus.pipeline_backpressure[0].max_txns_from_block_to_execute = Some(2);
+            conf.consensus.pipeline_backpressure[0]
+                .max_sending_block_txns_after_filtering_override = 2;
             conf.consensus.pipeline_backpressure[0].back_pressure_pipeline_latency_limit_ms = 0;
         }))
         .build()
@@ -206,8 +207,9 @@ async fn test_txn_emmitter_low_funds() {
             mempool_backlog: 10,
         });
 
+    let account_1 = Arc::new(account_1);
     let txn_stat = emitter
-        .emit_txn_for_with_stats(&account_1, emit_job_request, Duration::from_secs(10), 3)
+        .emit_txn_for_with_stats(account_1, emit_job_request, Duration::from_secs(10), 3)
         .await
         .unwrap();
 
diff --git a/testsuite/smoke-test/src/upgrade.rs b/testsuite/smoke-test/src/upgrade.rs
index 8668c47775661..e782bf3758c89 100644
--- a/testsuite/smoke-test/src/upgrade.rs
+++ b/testsuite/smoke-test/src/upgrade.rs
@@ -3,7 +3,7 @@
 
 use crate::{
     aptos::move_test_helpers, smoke_test_environment::SwarmBuilder,
-    test_utils::check_create_mint_transfer, workspace_builder, workspace_builder::workspace_root,
+    utils::check_create_mint_transfer, workspace_builder, workspace_builder::workspace_root,
 };
 use aptos_crypto::ValidCryptoMaterialStringExt;
 use aptos_forge::Swarm;
@@ -14,7 +14,7 @@ use aptos_release_builder::{
         feature_flags::{FeatureFlag, Features},
         framework::FrameworkReleaseConfig,
         gas::generate_gas_upgrade_proposal,
-        ExecutionMode, Proposal, ProposalMetadata,
+        ExecutionMode, GasScheduleLocator, Proposal, ProposalMetadata,
     },
     ReleaseEntry,
 };
@@ -59,7 +59,7 @@ async fn test_upgrade_flow() {
     };
 
     let (_, update_gas_script) =
-        generate_gas_upgrade_proposal(true, &gas_schedule, true, "".to_owned().into_bytes())
+        generate_gas_upgrade_proposal(None, &gas_schedule, true, "".to_owned().into_bytes())
             .unwrap()
             .pop()
             .unwrap();
@@ -121,7 +121,10 @@ async fn test_upgrade_flow() {
                 execution_mode: ExecutionMode::RootSigner,
                 name: "gas".to_string(),
                 metadata: ProposalMetadata::default(),
-                update_sequence: vec![ReleaseEntry::DefaultGas],
+                update_sequence: vec![ReleaseEntry::Gas {
+                    old: None,
+                    new: GasScheduleLocator::Current,
+                }],
             },
             Proposal {
                 execution_mode: ExecutionMode::RootSigner,
@@ -143,6 +146,7 @@ async fn test_upgrade_flow() {
 
     config
         .generate_release_proposal_scripts(upgrade_scripts_folder.path())
+        .await
         .unwrap();
     let mut scripts = walkdir::WalkDir::new(upgrade_scripts_folder.path())
         .sort_by_file_name()
diff --git a/testsuite/smoke-test/src/utils.rs b/testsuite/smoke-test/src/utils.rs
index d3c8de2a3de6a..dc64bdb686b1c 100644
--- a/testsuite/smoke-test/src/utils.rs
+++ b/testsuite/smoke-test/src/utils.rs
@@ -1,20 +1,186 @@
 // Copyright © Aptos Foundation
+// Parts of the project are originally copyright © Meta Platforms, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-use aptos_rest_client::Client;
-use aptos_types::on_chain_config::OnChainConsensusConfig;
+use aptos_cached_packages::aptos_stdlib;
+use aptos_forge::{reconfig, LocalSwarm, NodeExt, Swarm, SwarmExt};
+use aptos_rest_client::Client as RestClient;
+use aptos_sdk::{
+    transaction_builder::TransactionFactory,
+    types::{transaction::SignedTransaction, LocalAccount},
+};
+use aptos_types::on_chain_config::{OnChainConsensusConfig, OnChainExecutionConfig};
 use move_core_types::language_storage::CORE_CODE_ADDRESS;
+use rand::random;
+use std::{sync::Arc, time::Duration};
 
-pub(crate) async fn get_current_version(rest_client: &Client) -> u64 {
-    rest_client
-        .get_ledger_information()
+pub const MAX_CATCH_UP_WAIT_SECS: u64 = 180; // The max time we'll wait for nodes to catch up
+pub const MAX_CONNECTIVITY_WAIT_SECS: u64 = 180; // The max time we'll wait for nodes to gain connectivity
+pub const MAX_HEALTHY_WAIT_SECS: u64 = 120; // The max time we'll wait for nodes to become healthy
+
+pub async fn create_and_fund_account(swarm: &'_ mut dyn Swarm, amount: u64) -> LocalAccount {
+    let mut info = swarm.aptos_public_info();
+    info.create_and_fund_user_account(amount).await.unwrap()
+}
+
+/// Creates and funds two test accounts
+pub async fn create_test_accounts(swarm: &mut LocalSwarm) -> (LocalAccount, LocalAccount) {
+    let token_amount = 1000;
+    let account_0 = create_and_fund_account(swarm, token_amount).await;
+    let account_1 = create_and_fund_account(swarm, token_amount).await;
+    (account_0, account_1)
+}
+
+/// Executes transactions using the given transaction factory, client and
+/// accounts. If `execute_epoch_changes` is true, also execute transactions to
+/// force reconfigurations.
+pub async fn execute_transactions(
+    swarm: &mut LocalSwarm,
+    client: &RestClient,
+    sender: &mut LocalAccount,
+    receiver: &LocalAccount,
+    execute_epoch_changes: bool,
+) {
+    // Execute several transactions
+    let num_transfers = 10;
+    let transaction_factory = swarm.chain_info().transaction_factory();
+    if execute_epoch_changes {
+        transfer_and_maybe_reconfig(
+            client,
+            &transaction_factory,
+            swarm.chain_info().root_account,
+            sender,
+            receiver,
+            num_transfers,
+        )
+        .await;
+    } else {
+        for _ in 0..num_transfers {
+            // Execute simple transfer transactions
+            transfer_coins(client, &transaction_factory, sender, receiver, 1).await;
+        }
+    }
+
+    // Always ensure that at least one reconfiguration transaction is executed
+    if !execute_epoch_changes {
+        aptos_forge::reconfig(
+            client,
+            &transaction_factory,
+            swarm.chain_info().root_account,
+        )
+        .await;
+    }
+}
+
+/// Executes transactions and waits for all nodes to catch up
+pub async fn execute_transactions_and_wait(
+    swarm: &mut LocalSwarm,
+    client: &RestClient,
+    sender: &mut LocalAccount,
+    receiver: &LocalAccount,
+    epoch_changes: bool,
+) {
+    execute_transactions(swarm, client, sender, receiver, epoch_changes).await;
+    wait_for_all_nodes(swarm).await;
+}
+
+pub async fn transfer_coins_non_blocking(
+    client: &RestClient,
+    transaction_factory: &TransactionFactory,
+    sender: &mut LocalAccount,
+    receiver: &LocalAccount,
+    amount: u64,
+) -> SignedTransaction {
+    let txn = sender.sign_with_transaction_builder(transaction_factory.payload(
+        aptos_stdlib::aptos_coin_transfer(receiver.address(), amount),
+    ));
+
+    client.submit(&txn).await.unwrap();
+    txn
+}
+
+pub async fn transfer_coins(
+    client: &RestClient,
+    transaction_factory: &TransactionFactory,
+    sender: &mut LocalAccount,
+    receiver: &LocalAccount,
+    amount: u64,
+) -> SignedTransaction {
+    let txn =
+        transfer_coins_non_blocking(client, transaction_factory, sender, receiver, amount).await;
+
+    client.wait_for_signed_transaction(&txn).await.unwrap();
+
+    txn
+}
+
+pub async fn transfer_and_maybe_reconfig(
+    client: &RestClient,
+    transaction_factory: &TransactionFactory,
+    root_account: Arc<LocalAccount>,
+    sender: &mut LocalAccount,
+    receiver: &LocalAccount,
+    num_transfers: usize,
+) {
+    for _ in 0..num_transfers {
+        // Reconfigurations have a 20% chance of being executed
+        if random::<u16>() % 5 == 0 {
+            reconfig(client, transaction_factory, root_account.clone()).await;
+        }
+
+        transfer_coins(client, transaction_factory, sender, receiver, 1).await;
+    }
+}
+
+pub async fn assert_balance(client: &RestClient, account: &LocalAccount, balance: u64) {
+    let on_chain_balance = client
+        .get_account_balance(account.address())
         .await
         .unwrap()
-        .inner()
-        .version
+        .into_inner();
+
+    assert_eq!(on_chain_balance.get(), balance);
+}
+
+/// This helper function creates 3 new accounts, mints funds, transfers funds
+/// between the accounts and verifies that these operations succeed.
+pub async fn check_create_mint_transfer(swarm: &mut LocalSwarm) {
+    check_create_mint_transfer_node(swarm, 0).await;
+}
+
+/// This helper function creates 3 new accounts, mints funds, transfers funds
+/// between the accounts and verifies that these operations succeed on one specific validator.
+pub async fn check_create_mint_transfer_node(swarm: &mut LocalSwarm, idx: usize) {
+    let client = swarm.validators().nth(idx).unwrap().rest_client();
+
+    // Create account 0, mint 10 coins and check balance
+    let transaction_factory = TransactionFactory::new(swarm.chain_id());
+    let mut info = swarm.aptos_public_info_for_node(idx);
+    let mut account_0 = info.create_and_fund_user_account(10).await.unwrap();
+    assert_balance(&client, &account_0, 10).await;
+
+    // Create account 1, mint 1 coin, transfer 3 coins from account 0 to 1, check balances
+    let account_1 = info.create_and_fund_user_account(1).await.unwrap();
+    transfer_coins(&client, &transaction_factory, &mut account_0, &account_1, 3).await;
+
+    assert_balance(&client, &account_0, 7).await;
+    assert_balance(&client, &account_1, 4).await;
+
+    // Create account 2, mint 15 coins and check balance
+    let account_2 = info.create_and_fund_user_account(15).await.unwrap();
+    assert_balance(&client, &account_2, 15).await;
+}
+
+/// Waits for all nodes to catch up
+pub async fn wait_for_all_nodes(swarm: &mut LocalSwarm) {
+    swarm
+        .wait_for_all_nodes_to_catchup(Duration::from_secs(MAX_CATCH_UP_WAIT_SECS))
+        .await
+        .unwrap();
 }
 
-pub(crate) async fn get_current_consensus_config(rest_client: &Client) -> OnChainConsensusConfig {
+/// Returns the current consensus config
+pub async fn get_current_consensus_config(rest_client: &RestClient) -> OnChainConsensusConfig {
     bcs::from_bytes(
         &rest_client
             .get_account_resource_bcs::<Vec<u8>>(
@@ -27,3 +193,52 @@ pub(crate) async fn get_current_consensus_config(rest_client: &Client) -> OnChai
     )
     .unwrap()
 }
+
+pub(crate) async fn get_current_execution_config(
+    rest_client: &RestClient,
+) -> OnChainExecutionConfig {
+    bcs::from_bytes(
+        &rest_client
+            .get_account_resource_bcs::<Vec<u8>>(
+                CORE_CODE_ADDRESS,
+                "0x1::execution_config::ExecutionConfig",
+            )
+            .await
+            .unwrap()
+            .into_inner(),
+    )
+    .unwrap()
+}
+
+/// Returns the current ledger info version
+pub async fn get_current_version(rest_client: &RestClient) -> u64 {
+    rest_client
+        .get_ledger_information()
+        .await
+        .unwrap()
+        .inner()
+        .version
+}
+
+#[cfg(test)]
+pub mod swarm_utils {
+    use aptos_config::config::{NodeConfig, SecureBackend, WaypointConfig};
+    use aptos_secure_storage::{KVStorage, Storage};
+    use aptos_types::waypoint::Waypoint;
+
+    pub fn insert_waypoint(node_config: &mut NodeConfig, waypoint: Waypoint) {
+        node_config.base.waypoint = WaypointConfig::FromConfig(waypoint);
+
+        let f = |backend: &SecureBackend| {
+            let mut storage: Storage = backend.into();
+            storage
+                .set(aptos_global_constants::WAYPOINT, waypoint)
+                .expect("Unable to write waypoint");
+            storage
+                .set(aptos_global_constants::GENESIS_WAYPOINT, waypoint)
+                .expect("Unable to write waypoint");
+        };
+        let backend = &node_config.consensus.safety_rules.backend;
+        f(backend);
+    }
+}
diff --git a/testsuite/testcases/Cargo.toml b/testsuite/testcases/Cargo.toml
index 225c5d96153bf..c7443b02da9c2 100644
--- a/testsuite/testcases/Cargo.toml
+++ b/testsuite/testcases/Cargo.toml
@@ -26,6 +26,7 @@ aptos-runtimes = { workspace = true }
 aptos-sdk = { workspace = true }
 aptos-temppath = { workspace = true }
 aptos-types = { workspace = true }
+async-trait = { workspace = true }
 bcs = { workspace = true }
 csv = { workspace = true }
 futures = { workspace = true }
@@ -34,6 +35,7 @@ itertools = { workspace = true }
 rand = { workspace = true }
 reqwest = { workspace = true }
 tokio = { workspace = true }
+tokio-scoped = { workspace = true }
 
 [dev-dependencies]
 assert_approx_eq = { workspace = true }
diff --git a/testsuite/testcases/src/compatibility_test.rs b/testsuite/testcases/src/compatibility_test.rs
index 88a6a10e419d2..c14203af78ffe 100644
--- a/testsuite/testcases/src/compatibility_test.rs
+++ b/testsuite/testcases/src/compatibility_test.rs
@@ -2,11 +2,24 @@
 // Parts of the project are originally copyright © Meta Platforms, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::{batch_update, generate_traffic};
+use crate::{batch_update_gradually, create_emitter_and_request, generate_traffic};
 use anyhow::bail;
-use aptos_forge::{NetworkContext, NetworkTest, Result, SwarmExt, Test};
+use aptos_forge::{
+    EmitJobRequest, NetworkContextSynchronizer, NetworkTest, Result, SwarmExt, Test, TxnEmitter,
+    TxnStats, Version,
+};
 use aptos_logger::info;
-use tokio::{runtime::Runtime, time::Duration};
+use aptos_sdk::types::{LocalAccount, PeerId};
+use async_trait::async_trait;
+use rand::SeedableRng;
+use std::{
+    ops::DerefMut,
+    sync::{
+        atomic::{AtomicBool, Ordering},
+        Arc,
+    },
+};
+use tokio::time::Duration;
 
 pub struct SimpleValidatorUpgrade;
 
@@ -20,15 +33,127 @@ impl Test for SimpleValidatorUpgrade {
     }
 }
 
+async fn stat_gather_task(
+    emitter: TxnEmitter,
+    emit_job_request: EmitJobRequest,
+    source_account: Arc<LocalAccount>,
+    upgrade_traffic_chunk_duration: Duration,
+    done: Arc<AtomicBool>,
+) -> Result<Option<TxnStats>> {
+    let mut upgrade_stats = vec![];
+    while !done.load(Ordering::Relaxed) {
+        info!("stat_gather_task some traffic...");
+        let upgrading_stats = emitter
+            .clone()
+            .emit_txn_for(
+                source_account.clone(),
+                emit_job_request.clone(),
+                upgrade_traffic_chunk_duration,
+            )
+            .await?;
+        info!("stat_gather_task some stats: {}", &upgrading_stats);
+        upgrade_stats.push(upgrading_stats);
+    }
+    let statsum = upgrade_stats.into_iter().reduce(|a, b| &a + &b);
+    Ok(statsum)
+}
+
+fn upgrade_and_gather_stats(
+    ctxa: NetworkContextSynchronizer,
+    // upgrade args
+    validators_to_update: &[PeerId],
+    version: &Version,
+    wait_until_healthy: bool,
+    delay: Duration,
+    max_wait: Duration,
+    // traffic args
+    nodes: &[PeerId],
+) -> Result<Option<TxnStats>> {
+    let upgrade_done = Arc::new(AtomicBool::new(false));
+    let emitter_ctx = ctxa.clone();
+    let mut stats_result: Result<Option<TxnStats>> = Ok(None);
+    let mut upgrade_result: Result<()> = Ok(());
+    tokio_scoped::scope(|scopev| {
+        // emit trafic and gather stats
+        scopev.spawn(async {
+            info!("upgrade_and_gather_stats traffic thread start");
+            let (emitter, emit_job_request, source_account) = {
+                let mut ctx_locker = emitter_ctx.ctx.lock().await;
+                let ctx = ctx_locker.deref_mut();
+                let emit_job_request = ctx.emit_job.clone();
+                let rng = SeedableRng::from_rng(ctx.core().rng()).unwrap();
+                let (emitter, emit_job_request) = match create_emitter_and_request(
+                    ctx.swarm.clone(),
+                    emit_job_request,
+                    nodes,
+                    rng,
+                )
+                .await
+                {
+                    Ok(parts) => parts,
+                    Err(err) => {
+                        stats_result = Err(err);
+                        return;
+                    },
+                };
+                let source_account = ctx.swarm.read().await.chain_info().root_account;
+                (emitter, emit_job_request, source_account)
+                // release lock on network context
+            };
+            let upgrade_traffic_chunk_duration = Duration::from_secs(15);
+            info!("upgrade_and_gather_stats traffic thread 1");
+            stats_result = stat_gather_task(
+                emitter,
+                emit_job_request,
+                source_account,
+                upgrade_traffic_chunk_duration,
+                upgrade_done.clone(),
+            )
+            .await;
+            info!("upgrade_and_gather_stats traffic thread done");
+        });
+        // do upgrade
+        scopev.spawn(async {
+            info!("upgrade_and_gather_stats upgrade thread start");
+            upgrade_result = batch_update_gradually(
+                ctxa,
+                validators_to_update,
+                version,
+                wait_until_healthy,
+                delay,
+                max_wait,
+            )
+            .await;
+            info!("upgrade_and_gather_stats upgrade thread 1");
+            upgrade_done.store(true, Ordering::Relaxed);
+            info!("upgrade_and_gather_stats upgrade thread done");
+        });
+    });
+
+    upgrade_result?;
+    stats_result
+}
+
+#[async_trait]
 impl NetworkTest for SimpleValidatorUpgrade {
-    fn run(&self, ctx: &mut NetworkContext<'_>) -> Result<()> {
-        let runtime = Runtime::new()?;
+    async fn run<'a>(&self, ctxa: NetworkContextSynchronizer<'a>) -> Result<()> {
+        let upgrade_wait_for_healthy = true;
+        let upgrade_node_delay = Duration::from_secs(10);
+        let upgrade_max_wait = Duration::from_secs(40);
 
         let epoch_duration = Duration::from_secs(Self::EPOCH_DURATION_SECS);
 
         // Get the different versions we're testing with
         let (old_version, new_version) = {
-            let mut versions = ctx.swarm().versions().collect::<Vec<_>>();
+            let mut versions = ctxa
+                .ctx
+                .lock()
+                .await
+                .swarm
+                .read()
+                .await
+                .versions()
+                .collect::<Vec<_>>();
             versions.sort();
             if versions.len() != 2 {
                 bail!("exactly two different versions needed to run compat test");
@@ -42,14 +167,29 @@ impl NetworkTest for SimpleValidatorUpgrade {
             old_version, new_version
         );
         info!("{}", msg);
-        ctx.report.report_text(msg);
+        ctxa.report_text(msg).await;
 
         // Split the swarm into 2 parts
-        if ctx.swarm().validators().count() < 4 {
+        if ctxa
+            .ctx
+            .lock()
+            .await
+            .swarm
+            .read()
+            .await
+            .validators()
+            .count()
+            < 4
+        {
             bail!("compat test requires >= 4 validators");
         }
-        let all_validators = ctx
-            .swarm()
+        let all_validators = ctxa
+            .ctx
+            .lock()
+            .await
+            .swarm
+            .read()
+            .await
             .validators()
             .map(|v| v.peer_id())
             .collect::<Vec<_>>();
@@ -63,12 +203,16 @@ impl NetworkTest for SimpleValidatorUpgrade {
             old_version
         );
         info!("{}", msg);
-        ctx.report.report_text(msg);
+        ctxa.report_text(msg).await;
 
         // Generate some traffic
-        let txn_stat = generate_traffic(ctx, &all_validators, duration)?;
-        ctx.report
-            .report_txn_stats(format!("{}::liveness-check", self.name()), &txn_stat);
+        {
+            let mut ctx_locker = ctxa.ctx.lock().await;
+            let ctx = ctx_locker.deref_mut();
+            let txn_stat_prior = generate_traffic(ctx, &all_validators, duration).await?;
+            ctx.report
+                .report_txn_stats(format!("{}::liveness-check", self.name()), &txn_stat_prior);
+        }
 
         // Update the first Validator
         let msg = format!(
@@ -76,55 +220,114 @@ impl NetworkTest for SimpleValidatorUpgrade {
             new_version
         );
         info!("{}", msg);
-        ctx.report.report_text(msg);
-        runtime.block_on(batch_update(ctx, &[first_node], &new_version))?;
+        ctxa.report_text(msg).await;
+        let upgrade_stats = upgrade_and_gather_stats(
+            ctxa.clone(),
+            &[first_node],
+            &new_version,
+            upgrade_wait_for_healthy,
+            upgrade_node_delay,
+            upgrade_max_wait,
+            &[first_node],
+        )?;
+        let upgrade_stats_sum = upgrade_stats.into_iter().reduce(|a, b| &a + &b);
+        if let Some(upgrade_stats_sum) = upgrade_stats_sum {
+            ctxa.ctx.lock().await.report.report_txn_stats(
+                format!("{}::single-validator-upgrading", self.name()),
+                &upgrade_stats_sum,
+            );
+        }
 
         // Generate some traffic
-        let txn_stat = generate_traffic(ctx, &[first_node], duration)?;
-        ctx.report.report_txn_stats(
-            format!("{}::single-validator-upgrade", self.name()),
-            &txn_stat,
-        );
+        {
+            let mut ctx_locker = ctxa.ctx.lock().await;
+            let ctx = ctx_locker.deref_mut();
+            let txn_stat_one = generate_traffic(ctx, &[first_node], duration).await?;
+            ctx.report.report_txn_stats(
+                format!("{}::single-validator-upgrade", self.name()),
+                &txn_stat_one,
+            );
 
-        // Update the rest of the first batch
-        let msg = format!(
-            "3. Upgrading rest of first batch to new version: {}",
-            new_version
-        );
-        info!("{}", msg);
-        ctx.report.report_text(msg);
-        runtime.block_on(batch_update(ctx, &first_batch, &new_version))?;
+            // Update the rest of the first batch
+            let msg = format!(
+                "3. Upgrading rest of first batch to new version: {}",
+                new_version
+            );
+            info!("{}", msg);
+            ctx.report.report_text(msg);
+        }
 
-        // Generate some traffic
-        let txn_stat = generate_traffic(ctx, &first_batch, duration)?;
-        ctx.report.report_txn_stats(
-            format!("{}::half-validator-upgrade", self.name()),
-            &txn_stat,
-        );
+        // upgrade the rest of the first half
+        let upgrade2_stats = upgrade_and_gather_stats(
+            ctxa.clone(),
+            &first_batch,
+            &new_version,
+            upgrade_wait_for_healthy,
+            upgrade_node_delay,
+            upgrade_max_wait,
+            &first_batch,
+        )?;
+        let upgrade2_stats_sum = upgrade2_stats.into_iter().reduce(|a, b| &a + &b);
+        if let Some(upgrade2_stats_sum) = upgrade2_stats_sum {
+            ctxa.ctx.lock().await.report.report_txn_stats(
+                format!("{}::half-validator-upgrading", self.name()),
+                &upgrade2_stats_sum,
+            );
+        }
+        {
+            let mut ctx_locker = ctxa.ctx.lock().await;
+            let ctx = ctx_locker.deref_mut();
 
-        ctx.swarm().fork_check(epoch_duration)?;
+            // Generate some traffic
+            let txn_stat_half = generate_traffic(ctx, &first_batch, duration).await?;
+            ctx.report.report_txn_stats(
+                format!("{}::half-validator-upgrade", self.name()),
+                &txn_stat_half,
+            );
 
-        // Update the second batch
-        let msg = format!("4. upgrading second batch to new version: {}", new_version);
-        info!("{}", msg);
-        ctx.report.report_text(msg);
-        runtime.block_on(batch_update(ctx, &second_batch, &new_version))?;
+            ctx.swarm.read().await.fork_check(epoch_duration).await?;
 
-        // Generate some traffic
-        let txn_stat = generate_traffic(ctx, &second_batch, duration)?;
-        ctx.report.report_txn_stats(
-            format!("{}::rest-validator-upgrade", self.name()),
-            &txn_stat,
-        );
+            // Update the second batch
+            let msg = format!("4. upgrading second batch to new version: {}", new_version);
+            info!("{}", msg);
+            ctx.report.report_text(msg);
+        }
+        let upgrade3_stats = upgrade_and_gather_stats(
+            ctxa.clone(),
+            &second_batch,
+            &new_version,
+            upgrade_wait_for_healthy,
+            upgrade_node_delay,
+            upgrade_max_wait,
+            &second_batch,
+        )?;
+        let upgrade3_stats_sum = upgrade3_stats.into_iter().reduce(|a, b| &a + &b);
+        if let Some(upgrade3_stats_sum) = upgrade3_stats_sum {
+            ctxa.ctx.lock().await.report.report_txn_stats(
+                format!("{}::rest-validator-upgrading", self.name()),
+                &upgrade3_stats_sum,
+            );
+        }
+        {
+            let mut ctx_locker = ctxa.ctx.lock().await;
+            let ctx = ctx_locker.deref_mut();
 
-        let msg = "5. check swarm health".to_string();
-        info!("{}", msg);
-        ctx.report.report_text(msg);
-        ctx.swarm().fork_check(epoch_duration)?;
-        ctx.report.report_text(format!(
-            "Compatibility test for {} ==> {} passed",
-            old_version, new_version
-        ));
+            // Generate some traffic
+            let txn_stat_all = generate_traffic(ctx, &second_batch, duration).await?;
+            ctx.report.report_txn_stats(
+                format!("{}::rest-validator-upgrade", self.name()),
+                &txn_stat_all,
+            );
+
+            let msg = "5. check swarm health".to_string();
+            info!("{}", msg);
+            ctx.report.report_text(msg);
+            ctx.swarm.read().await.fork_check(epoch_duration).await?;
+            ctx.report.report_text(format!(
+                "Compatibility test for {} ==> {} passed",
+                old_version, new_version
+            ));
+        }
 
         Ok(())
     }
diff --git a/testsuite/testcases/src/consensus_reliability_tests.rs b/testsuite/testcases/src/consensus_reliability_tests.rs
index 99a8d6f18ed41..909e98e7c3826 100644
--- a/testsuite/testcases/src/consensus_reliability_tests.rs
+++ b/testsuite/testcases/src/consensus_reliability_tests.rs
@@ -7,12 +7,13 @@ use aptos_forge::{
     test_utils::consensus_utils::{
         test_consensus_fault_tolerance, FailPointFailureInjection, NodeState,
     },
-    NetworkContext, NetworkTest, Result, Swarm, SwarmExt, Test, TestReport,
+    NetworkContext, NetworkContextSynchronizer, NetworkTest, Result, Swarm, SwarmExt, Test,
+    TestReport,
 };
 use aptos_logger::{info, warn};
+use async_trait::async_trait;
 use rand::Rng;
-use std::{collections::HashSet, time::Duration};
-use tokio::runtime::Runtime;
+use std::{collections::HashSet, sync::Arc, time::Duration};
 
 pub struct ChangingWorkingQuorumTest {
     pub min_tps: usize,
@@ -32,34 +33,37 @@ impl Test for ChangingWorkingQuorumTest {
     }
 }
 
+#[async_trait]
 impl NetworkLoadTest for ChangingWorkingQuorumTest {
-    fn setup(&self, ctx: &mut NetworkContext) -> Result<LoadDestination> {
+    async fn setup<'a>(&self, ctx: &mut NetworkContext<'a>) -> Result<LoadDestination> {
         // because we are doing failure testing, we should be sending
         // traffic to nodes that are alive.
-        if ctx.swarm().full_nodes().count() > 0 {
+        let full_nodes_count = { ctx.swarm.read().await.full_nodes().count() };
+        if full_nodes_count > 0 {
             Ok(LoadDestination::AllFullnodes)
         } else if self.always_healthy_nodes > 0 {
-            Ok(LoadDestination::Peers(
-                ctx.swarm()
+            let validator_peer_ids = {
+                ctx.swarm
+                    .read()
+                    .await
                     .validators()
                     .take(self.always_healthy_nodes)
                     .map(|v| v.peer_id())
-                    .collect(),
-            ))
+                    .collect()
+            };
+            Ok(LoadDestination::Peers(validator_peer_ids))
         } else {
             Ok(LoadDestination::AllValidators)
         }
     }
 
-    fn test(
+    async fn test(
         &self,
-        swarm: &mut dyn Swarm,
+        swarm: Arc<tokio::sync::RwLock<Box<dyn Swarm>>>,
         _report: &mut TestReport,
         duration: Duration,
     ) -> Result<()> {
-        let runtime = Runtime::new().unwrap();
-
-        let validators = swarm.get_validator_clients_with_names();
+        let validators = { swarm.read().await.get_validator_clients_with_names() };
 
         let num_validators = validators.len();
 
@@ -74,12 +78,22 @@ impl NetworkLoadTest for ChangingWorkingQuorumTest {
         );
         // On every cycle, we will fail this many next nodes, and make this many previous nodes healthy again.
         let cycle_offset = max_fail_in_test / 4 + 1;
-        let num_destinations = if swarm.full_nodes().count() > 0 {
-            swarm.full_nodes().count()
-        } else if num_always_healthy > 0 {
-            num_always_healthy
-        } else {
-            swarm.validators().count()
+        let num_destinations = {
+            let swarm = swarm.read().await;
+            if swarm.full_nodes().count() > 0 {
+                swarm.full_nodes().count()
+            } else if num_always_healthy > 0 {
+                num_always_healthy
+            } else {
+                swarm.validators().count()
+            }
+        };
+        let (validator_clients, public_info) = {
+            let swarm = swarm.read().await;
+            (
+                swarm.get_validator_clients_with_names(),
+                swarm.aptos_public_info(),
+            )
         };
         // Function that returns set of down nodes in a given cycle.
         let down_indices_f = move |cycle: usize| -> HashSet<usize> {
@@ -107,34 +121,33 @@ impl NetworkLoadTest for ChangingWorkingQuorumTest {
             num_always_healthy, max_fail_in_test, num_validators, cycle_offset, self.num_large_validators);
 
         let slow_allowed_lagging = if self.add_execution_delay {
-            runtime.block_on(async {
-                let mut rng = rand::thread_rng();
-                let mut slow_allowed_lagging = HashSet::new();
-                for (index, (name, validator)) in
-                    validators.iter().enumerate().skip(num_always_healthy)
-                {
-                    let sleep_time = rng.gen_range(20, 500);
-                    if sleep_time > 100 {
-                        slow_allowed_lagging.insert(index);
-                    }
-                    let name = name.clone();
+            let mut slow_allowed_lagging = HashSet::new();
+            for (index, (name, validator)) in validators.iter().enumerate().skip(num_always_healthy)
+            {
+                let sleep_time = {
+                    let mut rng = rand::thread_rng();
+                    rng.gen_range(20, 500)
+                };
+                if sleep_time > 100 {
+                    slow_allowed_lagging.insert(index);
+                }
+                let name = name.clone();
 
-                    validator
-                        .set_failpoint(
-                            "aptos_vm::execution::block_metadata".to_string(),
-                            format!("sleep({})", sleep_time),
+                validator
+                    .set_failpoint(
+                        "aptos_vm::execution::block_metadata".to_string(),
+                        format!("sleep({})", sleep_time),
+                    )
+                    .await
+                    .map_err(|e| {
+                        anyhow!(
+                            "set_failpoint to remove execution delay on {} failed, {:?}",
+                            name,
+                            e
                         )
-                        .await
-                        .map_err(|e| {
-                            anyhow!(
-                                "set_failpoint to remove execution delay on {} failed, {:?}",
-                                name,
-                                e
-                            )
-                        })?;
-                }
-                Ok::<HashSet<usize>, anyhow::Error>(slow_allowed_lagging)
-            })?
+                    })?;
+            }
+            slow_allowed_lagging
         } else {
             HashSet::new()
         };
@@ -142,32 +155,38 @@ impl NetworkLoadTest for ChangingWorkingQuorumTest {
         let min_tps = self.min_tps;
         let check_period_s = self.check_period_s;
 
-        runtime.block_on(test_consensus_fault_tolerance(
-            swarm,
-            duration.as_secs() as usize / self.check_period_s,
-            self.check_period_s as f32,
-            1,
-            Box::new(FailPointFailureInjection::new(Box::new(move |cycle, part| {
+        let failure_injection = Box::new(FailPointFailureInjection::new(Box::new(
+            move |cycle, part| {
                 if part == 0 {
                     let down_indices = down_indices_f(cycle);
                     info!("For cycle {} down nodes: {:?}", cycle, down_indices);
                     // For all down nodes, we are going to drop all messages we receive.
                     (
-                        down_indices.iter().flat_map(|i| {
-                            [
-                                (
+                        down_indices
+                            .iter()
+                            .flat_map(|i| {
+                                [(
                                     *i,
                                     "consensus::process::any".to_string(),
                                     "return".to_string(),
-                                ),
-                            ]
-                        }).collect(),
+                                )]
+                            })
+                            .collect(),
                         true,
                     )
                 } else {
                     (vec![], false)
                 }
-            }))),
+            },
+        )));
+
+        test_consensus_fault_tolerance(
+            validator_clients,
+            public_info,
+            duration.as_secs() as usize / self.check_period_s,
+            self.check_period_s as f32,
+            1,
+            failure_injection,
             Box::new(move |cycle, _, _, _, cycle_end, cycle_start| {
                 // we group nodes into 3 groups:
                 // - active - nodes we expect to be making progress, and doing so together. we check wery strict rule of min(cycle_end) vs max(cycle_start)
@@ -266,37 +285,35 @@ impl NetworkLoadTest for ChangingWorkingQuorumTest {
             }),
             false,
             true,
-        )).context("test_consensus_fault_tolerance failed")?;
+        ).await.context("test_consensus_fault_tolerance failed")?;
 
         // undo slowing down.
         if self.add_execution_delay {
-            runtime.block_on(async {
-                for (name, validator) in validators.iter().skip(num_always_healthy) {
-                    let name = name.clone();
+            for (name, validator) in validators.iter().skip(num_always_healthy) {
+                let name = name.clone();
 
-                    validator
-                        .set_failpoint(
-                            "aptos_vm::execution::block_metadata".to_string(),
-                            "off".to_string(),
+                validator
+                    .set_failpoint(
+                        "aptos_vm::execution::block_metadata".to_string(),
+                        "off".to_string(),
+                    )
+                    .await
+                    .map_err(|e| {
+                        anyhow!(
+                            "set_failpoint to remove execution delay on {} failed, {:?}",
+                            name,
+                            e
                         )
-                        .await
-                        .map_err(|e| {
-                            anyhow!(
-                                "set_failpoint to remove execution delay on {} failed, {:?}",
-                                name,
-                                e
-                            )
-                        })?;
-                }
-                Ok::<(), anyhow::Error>(())
-            })?;
+                    })?;
+            }
         }
         Ok(())
     }
 }
 
+#[async_trait]
 impl NetworkTest for ChangingWorkingQuorumTest {
-    fn run(&self, ctx: &mut NetworkContext<'_>) -> Result<()> {
-        <dyn NetworkLoadTest>::run(self, ctx)
+    async fn run<'a>(&self, ctx: NetworkContextSynchronizer<'a>) -> Result<()> {
+        <dyn NetworkLoadTest>::run(self, ctx).await
     }
 }
diff --git a/testsuite/testcases/src/dag_onchain_enable_test.rs b/testsuite/testcases/src/dag_onchain_enable_test.rs
index 09af1aee62ba4..d3b2e0f73e11c 100644
--- a/testsuite/testcases/src/dag_onchain_enable_test.rs
+++ b/testsuite/testcases/src/dag_onchain_enable_test.rs
@@ -4,7 +4,7 @@
 use crate::{generate_onchain_config_blob, NetworkLoadTest};
 use anyhow::Ok;
 use aptos::test::CliTestFramework;
-use aptos_forge::{NetworkTest, NodeExt, SwarmExt, Test};
+use aptos_forge::{NetworkContextSynchronizer, NetworkTest, NodeExt, SwarmExt, Test};
 use aptos_logger::info;
 use aptos_sdk::bcs;
 use aptos_types::{
@@ -13,8 +13,8 @@ use aptos_types::{
         ConsensusAlgorithmConfig, DagConsensusConfigV1, OnChainConsensusConfig, ValidatorTxnConfig,
     },
 };
-use std::time::Duration;
-use tokio::runtime::Runtime;
+use async_trait::async_trait;
+use std::{sync::Arc, time::Duration};
 
 const MAX_NODE_LAG_SECS: u64 = 360;
 
@@ -26,182 +26,194 @@ impl Test for DagOnChainEnableTest {
     }
 }
 
+#[async_trait]
 impl NetworkLoadTest for DagOnChainEnableTest {
-    fn test(
+    async fn test(
         &self,
-        swarm: &mut dyn aptos_forge::Swarm,
+        swarm: Arc<tokio::sync::RwLock<Box<dyn aptos_forge::Swarm>>>,
         _report: &mut aptos_forge::TestReport,
         duration: std::time::Duration,
     ) -> anyhow::Result<()> {
-        let runtime = Runtime::new().unwrap();
-
         let faucet_endpoint: reqwest::Url = "http://localhost:8081".parse().unwrap();
-        let rest_client = swarm.validators().next().unwrap().rest_client();
-
-        let mut cli = runtime.block_on(async {
-            CliTestFramework::new(
-                swarm.validators().next().unwrap().rest_api_endpoint(),
-                faucet_endpoint,
-                /*num_cli_accounts=*/ 0,
+        let (rest_client, rest_api_endpoint) = {
+            let swarm = swarm.read().await;
+            let first_validator = swarm.validators().next().unwrap();
+            let rest_client = first_validator.rest_client();
+            let rest_api_endpoint = first_validator.rest_api_endpoint();
+            (rest_client, rest_api_endpoint)
+        };
+        let mut cli = CliTestFramework::new(
+            rest_api_endpoint,
+            faucet_endpoint,
+            /*num_cli_accounts=*/ 0,
+        )
+        .await;
+
+        tokio::time::sleep(duration / 3).await;
+
+        let root_cli_index = {
+            let root_account = swarm.read().await.chain_info().root_account();
+            cli.add_account_with_address_to_cli(
+                root_account.private_key().clone(),
+                root_account.address(),
             )
-            .await
-        });
-
-        std::thread::sleep(duration / 3);
-
-        runtime.block_on(async {
-
-            let root_cli_index = cli.add_account_with_address_to_cli(
-                swarm.chain_info().root_account().private_key().clone(),
-                swarm.chain_info().root_account().address(),
-            );
-
-            let current_consensus_config: OnChainConsensusConfig = bcs::from_bytes(
-                &rest_client
-                    .get_account_resource_bcs::<Vec<u8>>(
-                        CORE_CODE_ADDRESS,
-                        "0x1::consensus_config::ConsensusConfig",
-                    )
-                    .await
-                    .unwrap()
-                    .into_inner(),
-            )
-            .unwrap();
-
-            assert!(matches!(current_consensus_config, OnChainConsensusConfig::V3 { .. }));
-
-            // Change to V2
-            let new_consensus_config = OnChainConsensusConfig::V3 {
-                alg: ConsensusAlgorithmConfig::DAG(DagConsensusConfigV1::default()),
-                vtxn: ValidatorTxnConfig::default_disabled(),
-            };
-
-            let update_consensus_config_script = format!(
-                r#"
-        script {{
-            use aptos_framework::aptos_governance;
-            use aptos_framework::consensus_config;
-            fun main(core_resources: &signer) {{
-                let framework_signer = aptos_governance::get_signer_testnet_only(core_resources, @0000000000000000000000000000000000000000000000000000000000000001);
-                let config_bytes = {};
-                consensus_config::set(&framework_signer, config_bytes);
-            }}
+        };
+
+        let current_consensus_config: OnChainConsensusConfig = bcs::from_bytes(
+            &rest_client
+                .get_account_resource_bcs::<Vec<u8>>(
+                    CORE_CODE_ADDRESS,
+                    "0x1::consensus_config::ConsensusConfig",
+                )
+                .await
+                .unwrap()
+                .into_inner(),
+        )
+        .unwrap();
+
+        assert!(matches!(
+            current_consensus_config,
+            OnChainConsensusConfig::V3 { .. }
+        ));
+
+        // Change to V2
+        let new_consensus_config = OnChainConsensusConfig::V3 {
+            alg: ConsensusAlgorithmConfig::DAG(DagConsensusConfigV1::default()),
+            vtxn: ValidatorTxnConfig::default_disabled(),
+        };
+
+        let update_consensus_config_script = format!(
+            r#"
+    script {{
+        use aptos_framework::aptos_governance;
+        use aptos_framework::consensus_config;
+        fun main(core_resources: &signer) {{
+            let framework_signer = aptos_governance::get_signer_testnet_only(core_resources, @0000000000000000000000000000000000000000000000000000000000000001);
+            let config_bytes = {};
+            consensus_config::set(&framework_signer, config_bytes);
         }}
-        "#,
-                generate_onchain_config_blob(&bcs::to_bytes(&new_consensus_config).unwrap())
-            );
+    }}
+    "#,
+            generate_onchain_config_blob(&bcs::to_bytes(&new_consensus_config).unwrap())
+        );
 
-            cli.run_script_with_default_framework(root_cli_index, &update_consensus_config_script)
-                .await
-        })?;
-
-        std::thread::sleep(duration / 3);
-
-        let initial_consensus_config = runtime.block_on(async {
-
-            let root_cli_index = cli.add_account_with_address_to_cli(
-                swarm.chain_info().root_account().private_key().clone(),
-                swarm.chain_info().root_account().address(),
-            );
-
-            let current_consensus_config: OnChainConsensusConfig = bcs::from_bytes(
-                &rest_client
-                    .get_account_resource_bcs::<Vec<u8>>(
-                        CORE_CODE_ADDRESS,
-                        "0x1::consensus_config::ConsensusConfig",
-                    )
-                    .await
-                    .unwrap()
-                    .into_inner(),
+        cli.run_script_with_default_framework(root_cli_index, &update_consensus_config_script)
+            .await?;
+
+        tokio::time::sleep(duration / 3).await;
+
+        let root_cli_index = {
+            let root_account = swarm.read().await.chain_info().root_account();
+            cli.add_account_with_address_to_cli(
+                root_account.private_key().clone(),
+                root_account.address(),
             )
-            .unwrap();
-
-            assert!(matches!(current_consensus_config, OnChainConsensusConfig::V3 { .. }));
-
-            // Change to DAG
-            let new_consensus_config = OnChainConsensusConfig::V3 {
-                alg: ConsensusAlgorithmConfig::DAG(DagConsensusConfigV1::default()),
-                vtxn: ValidatorTxnConfig::default_disabled(),
-            };
-
-            let update_consensus_config_script = format!(
-                r#"
-        script {{
-            use aptos_framework::aptos_governance;
-            use aptos_framework::consensus_config;
-            fun main(core_resources: &signer) {{
-                let framework_signer = aptos_governance::get_signer_testnet_only(core_resources, @0000000000000000000000000000000000000000000000000000000000000001);
-                let config_bytes = {};
-                consensus_config::set(&framework_signer, config_bytes);
-            }}
+        };
+
+        let current_consensus_config: OnChainConsensusConfig = bcs::from_bytes(
+            &rest_client
+                .get_account_resource_bcs::<Vec<u8>>(
+                    CORE_CODE_ADDRESS,
+                    "0x1::consensus_config::ConsensusConfig",
+                )
+                .await
+                .unwrap()
+                .into_inner(),
+        )
+        .unwrap();
+
+        assert!(matches!(
+            current_consensus_config,
+            OnChainConsensusConfig::V3 { .. }
+        ));
+
+        // Change to DAG
+        let new_consensus_config = OnChainConsensusConfig::V3 {
+            alg: ConsensusAlgorithmConfig::DAG(DagConsensusConfigV1::default()),
+            vtxn: ValidatorTxnConfig::default_disabled(),
+        };
+
+        let update_consensus_config_script = format!(
+            r#"
+    script {{
+        use aptos_framework::aptos_governance;
+        use aptos_framework::consensus_config;
+        fun main(core_resources: &signer) {{
+            let framework_signer = aptos_governance::get_signer_testnet_only(core_resources, @0000000000000000000000000000000000000000000000000000000000000001);
+            let config_bytes = {};
+            consensus_config::set(&framework_signer, config_bytes);
         }}
-        "#,
-                generate_onchain_config_blob(&bcs::to_bytes(&new_consensus_config).unwrap())
-            );
-
-            cli.run_script_with_default_framework(root_cli_index, &update_consensus_config_script)
-                .await?;
-
-            Ok(current_consensus_config)
-        })?;
-
-        std::thread::sleep(duration / 3);
-
-        runtime.block_on(async {
-
-            let root_cli_index = cli.add_account_with_address_to_cli(
-                swarm.chain_info().root_account().private_key().clone(),
-                swarm.chain_info().root_account().address(),
-            );
-
-            let current_consensus_config: OnChainConsensusConfig = bcs::from_bytes(
-                &rest_client
-                    .get_account_resource_bcs::<Vec<u8>>(
-                        CORE_CODE_ADDRESS,
-                        "0x1::consensus_config::ConsensusConfig",
-                    )
-                    .await
-                    .unwrap()
-                    .into_inner(),
+    }}
+    "#,
+            generate_onchain_config_blob(&bcs::to_bytes(&new_consensus_config).unwrap())
+        );
+
+        cli.run_script_with_default_framework(root_cli_index, &update_consensus_config_script)
+            .await?;
+
+        let initial_consensus_config = current_consensus_config;
+
+        tokio::time::sleep(duration / 3).await;
+
+        let root_cli_index = {
+            let root_account = swarm.read().await.chain_info().root_account();
+            cli.add_account_with_address_to_cli(
+                root_account.private_key().clone(),
+                root_account.address(),
             )
-            .unwrap();
-
-            assert!(matches!(current_consensus_config, OnChainConsensusConfig::V3 { .. }));
-
-            // Change back to initial
-            let update_consensus_config_script = format!(
-                r#"
-        script {{
-            use aptos_framework::aptos_governance;
-            use aptos_framework::consensus_config;
-            fun main(core_resources: &signer) {{
-                let framework_signer = aptos_governance::get_signer_testnet_only(core_resources, @0000000000000000000000000000000000000000000000000000000000000001);
-                let config_bytes = {};
-                consensus_config::set(&framework_signer, config_bytes);
-            }}
+        };
+
+        let current_consensus_config: OnChainConsensusConfig = bcs::from_bytes(
+            &rest_client
+                .get_account_resource_bcs::<Vec<u8>>(
+                    CORE_CODE_ADDRESS,
+                    "0x1::consensus_config::ConsensusConfig",
+                )
+                .await
+                .unwrap()
+                .into_inner(),
+        )
+        .unwrap();
+
+        assert!(matches!(
+            current_consensus_config,
+            OnChainConsensusConfig::V3 { .. }
+        ));
+
+        // Change back to initial
+        let update_consensus_config_script = format!(
+            r#"
+    script {{
+        use aptos_framework::aptos_governance;
+        use aptos_framework::consensus_config;
+        fun main(core_resources: &signer) {{
+            let framework_signer = aptos_governance::get_signer_testnet_only(core_resources, @0000000000000000000000000000000000000000000000000000000000000001);
+            let config_bytes = {};
+            consensus_config::set(&framework_signer, config_bytes);
         }}
-        "#,
-                generate_onchain_config_blob(&bcs::to_bytes(&initial_consensus_config).unwrap())
-            );
+    }}
+    "#,
+            generate_onchain_config_blob(&bcs::to_bytes(&initial_consensus_config).unwrap())
+        );
 
-            cli.run_script_with_default_framework(root_cli_index, &update_consensus_config_script)
-                .await
-        })?;
+        cli.run_script_with_default_framework(root_cli_index, &update_consensus_config_script)
+            .await?;
 
         // Wait for all nodes to synchronize and stabilize.
         info!("Waiting for the validators to be synchronized.");
-        runtime.block_on(async {
-            swarm
-                .wait_for_all_nodes_to_catchup(Duration::from_secs(MAX_NODE_LAG_SECS))
-                .await
-        })?;
+        swarm
+            .read()
+            .await
+            .wait_for_all_nodes_to_catchup(Duration::from_secs(MAX_NODE_LAG_SECS))
+            .await?;
 
         Ok(())
     }
 }
 
+#[async_trait]
 impl NetworkTest for DagOnChainEnableTest {
-    fn run(&self, ctx: &mut aptos_forge::NetworkContext<'_>) -> anyhow::Result<()> {
-        <dyn NetworkLoadTest>::run(self, ctx)
+    async fn run<'a>(&self, ctx: NetworkContextSynchronizer<'a>) -> anyhow::Result<()> {
+        <dyn NetworkLoadTest>::run(self, ctx).await
     }
 }
diff --git a/testsuite/testcases/src/forge_setup_test.rs b/testsuite/testcases/src/forge_setup_test.rs
index 6a69224bb1bc4..aba938f235c13 100644
--- a/testsuite/testcases/src/forge_setup_test.rs
+++ b/testsuite/testcases/src/forge_setup_test.rs
@@ -4,15 +4,15 @@
 use crate::generate_traffic;
 use anyhow::Context;
 use aptos_config::config::OverrideNodeConfig;
-use aptos_forge::{NetworkContext, NetworkTest, Result, Test};
+use aptos_forge::{NetworkContextSynchronizer, NetworkTest, Result, Test};
 use aptos_logger::info;
+use async_trait::async_trait;
 use rand::{
     rngs::{OsRng, StdRng},
     seq::IteratorRandom,
     Rng, SeedableRng,
 };
-use std::{thread, time::Duration};
-use tokio::runtime::Runtime;
+use std::{ops::DerefMut, thread, time::Duration};
 
 const STATE_SYNC_VERSION_COUNTER_NAME: &str = "aptos_state_sync_version";
 
@@ -24,58 +24,65 @@ impl Test for ForgeSetupTest {
     }
 }
 
+#[async_trait]
 impl NetworkTest for ForgeSetupTest {
-    fn run(&self, ctx: &mut NetworkContext<'_>) -> Result<()> {
+    async fn run<'a>(&self, ctx: NetworkContextSynchronizer<'a>) -> Result<()> {
         let mut rng = StdRng::from_seed(OsRng.gen());
-        let runtime = Runtime::new().unwrap();
+        let mut ctx_locker = ctx.ctx.lock().await;
+        let ctx = ctx_locker.deref_mut();
 
-        let swarm = ctx.swarm();
+        // TODO: decrease lock shadow on swarm for this test
+        {
+            let swarm = ctx.swarm.read().await;
 
-        let all_fullnodes = swarm.full_nodes().map(|v| v.peer_id()).collect::<Vec<_>>();
-        let fullnode_id = all_fullnodes.iter().choose(&mut rng).unwrap();
+            let all_fullnodes = swarm.full_nodes().map(|v| v.peer_id()).collect::<Vec<_>>();
+            let fullnode_id = all_fullnodes.iter().choose(&mut rng).unwrap();
 
-        info!("Pick one fullnode to stop and wipe");
-        let fullnode = swarm.full_node_mut(*fullnode_id).unwrap();
-        runtime.block_on(fullnode.clear_storage())?;
-        runtime.block_on(fullnode.start())?;
+            info!("Pick one fullnode to stop and wipe");
+            let fullnode = swarm.full_node(*fullnode_id).unwrap();
+            fullnode.clear_storage().await?;
+            fullnode.start().await?;
 
-        let fullnode = swarm.full_node(*fullnode_id).unwrap();
-        let fullnode_name = fullnode.name();
+            let fullnode = swarm.full_node(*fullnode_id).unwrap();
+            let fullnode_name = fullnode.name();
 
-        for _ in 0..10 {
-            let query = format!(
-                "{}{{instance=\"{}\",type=\"synced\"}}",
-                STATE_SYNC_VERSION_COUNTER_NAME, &fullnode_name
-            );
-            info!("PromQL Query {}", query);
-            let r = runtime.block_on(swarm.query_metrics(&query, None, None))?;
-            let ivs = r.as_instant().unwrap();
-            for iv in ivs {
-                info!(
-                    "{}: {}",
-                    STATE_SYNC_VERSION_COUNTER_NAME,
-                    iv.sample().value()
+            for _ in 0..10 {
+                let query = format!(
+                    "{}{{instance=\"{}\",type=\"synced\"}}",
+                    STATE_SYNC_VERSION_COUNTER_NAME, &fullnode_name
                 );
+                info!("PromQL Query {}", query);
+                let r = swarm.query_metrics(&query, None, None).await?;
+                let ivs = r.as_instant().unwrap();
+                for iv in ivs {
+                    info!(
+                        "{}: {}",
+                        STATE_SYNC_VERSION_COUNTER_NAME,
+                        iv.sample().value()
+                    );
+                }
+                thread::sleep(std::time::Duration::from_secs(5));
             }
-            thread::sleep(std::time::Duration::from_secs(5));
         }
 
         // add some PFNs and send load to them
         let mut pfns = Vec::new();
         let num_pfns = 5;
-        for _ in 0..num_pfns {
-            let pfn_version = swarm.versions().max().unwrap();
-            let pfn_node_config =
-                OverrideNodeConfig::new_with_default_base(swarm.get_default_pfn_node_config());
-            let pfn_peer_id =
-                runtime.block_on(swarm.add_full_node(&pfn_version, pfn_node_config))?;
+        {
+            let mut swarm = ctx.swarm.write().await;
+            for _ in 0..num_pfns {
+                let pfn_version = swarm.versions().max().unwrap();
+                let pfn_node_config =
+                    OverrideNodeConfig::new_with_default_base(swarm.get_default_pfn_node_config());
+                let pfn_peer_id = swarm.add_full_node(&pfn_version, pfn_node_config).await?;
 
-            let _pfn = swarm.full_node(pfn_peer_id).context("pfn not found")?;
-            pfns.push(pfn_peer_id);
+                let _pfn = swarm.full_node(pfn_peer_id).context("pfn not found")?;
+                pfns.push(pfn_peer_id);
+            }
         }
 
         let duration = Duration::from_secs(10 * num_pfns);
-        let txn_stat = generate_traffic(ctx, &pfns, duration)?;
+        let txn_stat = generate_traffic(ctx, &pfns, duration).await?;
 
         ctx.report
             .report_txn_stats(self.name().to_string(), &txn_stat);
diff --git a/testsuite/testcases/src/framework_upgrade.rs b/testsuite/testcases/src/framework_upgrade.rs
index cd49107a815d6..37cad29b35511 100644
--- a/testsuite/testcases/src/framework_upgrade.rs
+++ b/testsuite/testcases/src/framework_upgrade.rs
@@ -4,14 +4,18 @@
 use crate::{batch_update, generate_traffic};
 use anyhow::bail;
 use aptos_forge::{
-    NetworkContext, NetworkTest, Result, SwarmExt, Test, DEFAULT_ROOT_PRIV_KEY, FORGE_KEY_SEED,
+    NetworkContextSynchronizer, NetworkTest, Result, SwarmExt, Test, DEFAULT_ROOT_PRIV_KEY,
+    FORGE_KEY_SEED,
 };
 use aptos_keygen::KeyGen;
 use aptos_logger::info;
+use aptos_release_builder::ReleaseConfig;
 use aptos_sdk::crypto::{ed25519::Ed25519PrivateKey, PrivateKey};
 use aptos_temppath::TempPath;
 use aptos_types::transaction::authenticator::AuthenticationKey;
-use tokio::{runtime::Runtime, time::Duration};
+use async_trait::async_trait;
+use std::{ops::DerefMut, path::Path};
+use tokio::{fs, time::Duration};
 
 pub struct FrameworkUpgrade;
 
@@ -25,15 +29,27 @@ impl Test for FrameworkUpgrade {
     }
 }
 
+const RELEASE_YAML_PATH: &str = "aptos-move/aptos-release-builder/data";
+const IGNORED_YAMLS: [&str; 2] = ["release.yaml", "example.yaml"];
+
+fn is_release_yaml(path: &Path) -> bool {
+    let basename = path.file_name().unwrap().to_str().unwrap();
+    path.is_file()
+        && path.extension().unwrap_or_default() == "yaml"
+        && !IGNORED_YAMLS.contains(&basename)
+}
+
+#[async_trait]
 impl NetworkTest for FrameworkUpgrade {
-    fn run(&self, ctx: &mut NetworkContext<'_>) -> Result<()> {
-        let runtime = Runtime::new()?;
+    async fn run<'a>(&self, ctx: NetworkContextSynchronizer<'a>) -> Result<()> {
+        let mut ctx_locker = ctx.ctx.lock().await;
+        let ctx = ctx_locker.deref_mut();
 
         let epoch_duration = Duration::from_secs(Self::EPOCH_DURATION_SECS);
 
         // Get the different versions we're testing with
         let (old_version, new_version) = {
-            let mut versions = ctx.swarm().versions().collect::<Vec<_>>();
+            let mut versions = ctx.swarm.read().await.versions().collect::<Vec<_>>();
             versions.sort();
             if versions.len() != 2 {
                 bail!("exactly two different versions needed to run compat test");
@@ -42,11 +58,14 @@ impl NetworkTest for FrameworkUpgrade {
             (versions[0].clone(), versions[1].clone())
         };
 
-        let all_validators = ctx
-            .swarm()
-            .validators()
-            .map(|v| v.peer_id())
-            .collect::<Vec<_>>();
+        let all_validators = {
+            ctx.swarm
+                .read()
+                .await
+                .validators()
+                .map(|v| v.peer_id())
+                .collect::<Vec<_>>()
+        };
 
         let msg = format!(
             "Compatibility test results for {} ==> {} (PR)",
@@ -60,17 +79,19 @@ impl NetworkTest for FrameworkUpgrade {
         let msg = format!("Upgrade the nodes to version: {}", new_version);
         info!("{}", msg);
         ctx.report.report_text(msg);
-        runtime.block_on(batch_update(ctx, first_half, &new_version))?;
+        batch_update(ctx, first_half, &new_version).await?;
 
         // Generate some traffic
         let duration = Duration::from_secs(30);
-        let txn_stat = generate_traffic(ctx, &all_validators, duration)?;
+        let txn_stat = generate_traffic(ctx, &all_validators, duration).await?;
         ctx.report.report_txn_stats(
             format!("{}::full-framework-upgrade", self.name()),
             &txn_stat,
         );
 
-        ctx.swarm().fork_check(epoch_duration)?;
+        {
+            ctx.swarm.read().await.fork_check(epoch_duration).await?;
+        }
 
         // Apply the framework release bundle.
         let root_key_path = TempPath::new();
@@ -98,54 +119,80 @@ impl NetworkTest for FrameworkUpgrade {
             AuthenticationKey::ed25519(&validator_key.public_key()).account_address();
 
         let network_info = aptos_release_builder::validate::NetworkConfig {
-            endpoint: ctx.swarm().validators().last().unwrap().rest_api_endpoint(),
+            endpoint: ctx
+                .swarm
+                .read()
+                .await
+                .validators()
+                .last()
+                .unwrap()
+                .rest_api_endpoint(),
             root_key_path: root_key_path.path().to_path_buf(),
             validator_account,
             validator_key,
             framework_git_rev: None,
         };
 
-        runtime.block_on(network_info.mint_to_validator())?;
+        network_info.mint_to_validator().await?;
 
         let release_config = aptos_release_builder::current_release_config();
 
-        runtime.block_on(aptos_release_builder::validate::validate_config(
+        aptos_release_builder::validate::validate_config(
             release_config.clone(),
-            network_info,
-        ))?;
+            network_info.clone(),
+        )
+        .await?;
+
+        // Execute all the release yaml files
+        let mut entries = fs::read_dir(RELEASE_YAML_PATH).await?;
+        while let Some(entry) = entries.next_entry().await? {
+            let path = entry.path();
+            if is_release_yaml(&path) {
+                let release_config = ReleaseConfig::parse(&fs::read_to_string(&path).await?)?;
+                info!("Executing release yaml: {}", path.to_string_lossy());
+                aptos_release_builder::validate::validate_config(
+                    release_config.clone(),
+                    network_info.clone(),
+                )
+                .await?;
+            }
+        }
 
         // Update the sequence number for the root account
-        let root_account = ctx.swarm().chain_info().root_account().address();
+        let root_account = { ctx.swarm.read().await.chain_info().root_account().address() };
         // Test the module publishing workflow
-        let sequence_number = runtime
-            .block_on(
-                ctx.swarm()
-                    .chain_info()
-                    .rest_client()
-                    .get_account(root_account),
-            )
-            .unwrap()
-            .inner()
-            .sequence_number;
-        ctx.swarm()
-            .chain_info()
-            .root_account()
-            .set_sequence_number(sequence_number);
+        {
+            let chain_info = ctx.swarm.read().await.chain_info();
+            let sequence_number = chain_info
+                .rest_client()
+                .get_account(root_account)
+                .await
+                .unwrap()
+                .inner()
+                .sequence_number;
+            chain_info
+                .root_account()
+                .set_sequence_number(sequence_number);
+        }
 
         // Generate some traffic
         let duration = Duration::from_secs(30);
-        let txn_stat = generate_traffic(ctx, &all_validators, duration)?;
+        let txn_stat = generate_traffic(ctx, &all_validators, duration).await?;
         ctx.report.report_txn_stats(
             format!("{}::full-framework-upgrade", self.name()),
             &txn_stat,
         );
 
-        ctx.swarm().fork_check(epoch_duration)?;
+        {
+            ctx.swarm.read().await.fork_check(epoch_duration).await?;
+        }
 
         let msg = "5. check swarm health".to_string();
         info!("{}", msg);
         ctx.report.report_text(msg);
-        ctx.swarm().fork_check(epoch_duration)?;
+        {
+            ctx.swarm.read().await.fork_check(epoch_duration).await?;
+        }
         ctx.report.report_text(format!(
             "Compatibility test for {} ==> {} passed",
             old_version, new_version
@@ -156,16 +203,18 @@ impl NetworkTest for FrameworkUpgrade {
         let msg = format!("Upgrade the remaining nodes to version: {}", new_version);
         info!("{}", msg);
         ctx.report.report_text(msg);
-        runtime.block_on(batch_update(ctx, second_half, &new_version))?;
+        batch_update(ctx, second_half, &new_version).await?;
 
         let duration = Duration::from_secs(30);
-        let txn_stat = generate_traffic(ctx, &all_validators, duration)?;
+        let txn_stat = generate_traffic(ctx, &all_validators, duration).await?;
         ctx.report.report_txn_stats(
             format!("{}::full-framework-upgrade", self.name()),
             &txn_stat,
         );
 
-        ctx.swarm().fork_check(epoch_duration)?;
+        {
+            ctx.swarm.read().await.fork_check(epoch_duration).await?;
+        }
 
         Ok(())
     }
diff --git a/testsuite/testcases/src/fullnode_reboot_stress_test.rs b/testsuite/testcases/src/fullnode_reboot_stress_test.rs
index a2d8702e402a8..8fdd177b5af9b 100644
--- a/testsuite/testcases/src/fullnode_reboot_stress_test.rs
+++ b/testsuite/testcases/src/fullnode_reboot_stress_test.rs
@@ -2,10 +2,13 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{LoadDestination, NetworkLoadTest};
-use aptos_forge::{NetworkContext, NetworkTest, Result, Swarm, Test, TestReport};
+use aptos_forge::{
+    NetworkContext, NetworkContextSynchronizer, NetworkTest, Result, Swarm, Test, TestReport,
+};
+use async_trait::async_trait;
 use rand::{seq::SliceRandom, thread_rng};
-use std::time::Duration;
-use tokio::{runtime::Runtime, time::Instant};
+use std::{sync::Arc, time::Duration};
+use tokio::time::Instant;
 
 pub struct FullNodeRebootStressTest;
 
@@ -15,39 +18,51 @@ impl Test for FullNodeRebootStressTest {
     }
 }
 
+#[async_trait]
 impl NetworkLoadTest for FullNodeRebootStressTest {
-    fn setup(&self, _ctx: &mut NetworkContext) -> Result<LoadDestination> {
+    async fn setup<'a>(&self, _ctx: &mut NetworkContext<'a>) -> Result<LoadDestination> {
         Ok(LoadDestination::AllFullnodes)
     }
 
-    fn test(
+    async fn test(
         &self,
-        swarm: &mut dyn Swarm,
+        swarm: Arc<tokio::sync::RwLock<Box<dyn Swarm>>>,
         _report: &mut TestReport,
         duration: Duration,
     ) -> Result<()> {
         let start = Instant::now();
-        let runtime = Runtime::new().unwrap();
 
-        let all_fullnodes = swarm.full_nodes().map(|v| v.peer_id()).collect::<Vec<_>>();
-
-        let mut rng = thread_rng();
+        let all_fullnodes = {
+            swarm
+                .read()
+                .await
+                .full_nodes()
+                .map(|v| v.peer_id())
+                .collect::<Vec<_>>()
+        };
 
         while start.elapsed() < duration {
-            let fullnode_to_reboot = swarm
-                .full_node_mut(*all_fullnodes.choose(&mut rng).unwrap())
-                .unwrap();
-            runtime.block_on(async { fullnode_to_reboot.stop().await })?;
-            runtime.block_on(async { fullnode_to_reboot.start().await })?;
-            std::thread::sleep(Duration::from_secs(10));
+            {
+                let swarm = swarm.read().await;
+                let fullnode_to_reboot = {
+                    let mut rng = thread_rng();
+                    swarm
+                        .full_node(*all_fullnodes.choose(&mut rng).unwrap())
+                        .unwrap()
+                };
+                fullnode_to_reboot.stop().await?;
+                fullnode_to_reboot.start().await?;
+            }
+            tokio::time::sleep(Duration::from_secs(10)).await;
         }
 
         Ok(())
     }
 }
 
+#[async_trait]
 impl NetworkTest for FullNodeRebootStressTest {
-    fn run(&self, ctx: &mut NetworkContext<'_>) -> Result<()> {
-        <dyn NetworkLoadTest>::run(self, ctx)
+    async fn run<'a>(&self, ctx: NetworkContextSynchronizer<'a>) -> Result<()> {
+        <dyn NetworkLoadTest>::run(self, ctx).await
     }
 }
diff --git a/testsuite/testcases/src/lib.rs b/testsuite/testcases/src/lib.rs
index a620211693382..1857815437254 100644
--- a/testsuite/testcases/src/lib.rs
+++ b/testsuite/testcases/src/lib.rs
@@ -29,22 +29,25 @@ pub mod validator_reboot_stress_test;
 use anyhow::Context;
 use aptos_forge::{
     prometheus_metrics::{fetch_latency_breakdown, LatencyBreakdown},
-    EmitJobRequest, NetworkContext, NetworkTest, NodeExt, Result, Swarm, SwarmExt, Test,
-    TestReport, TxnEmitter, TxnStats, Version,
+    EmitJob, EmitJobRequest, NetworkContext, NetworkContextSynchronizer, NetworkTest, NodeExt,
+    Result, Swarm, SwarmExt, Test, TestReport, TxnEmitter, TxnStats, Version,
 };
 use aptos_logger::info;
 use aptos_rest_client::Client as RestClient;
 use aptos_sdk::{transaction_builder::TransactionFactory, types::PeerId};
+use async_trait::async_trait;
 use futures::future::join_all;
 use rand::{rngs::StdRng, SeedableRng};
 use std::{
     fmt::Write,
+    ops::DerefMut,
+    sync::Arc,
     time::{Duration, Instant, SystemTime, UNIX_EPOCH},
 };
-use tokio::runtime::Runtime;
+use tokio::runtime::{Handle, Runtime};
 
-const WARMUP_DURATION_FRACTION: f32 = 0.07;
-const COOLDOWN_DURATION_FRACTION: f32 = 0.04;
+pub const WARMUP_DURATION_FRACTION: f32 = 0.07;
+pub const COOLDOWN_DURATION_FRACTION: f32 = 0.04;
 
 async fn batch_update(
     ctx: &mut NetworkContext<'_>,
@@ -52,14 +55,20 @@ async fn batch_update(
     version: &Version,
 ) -> Result<()> {
     for validator in validators_to_update {
-        ctx.swarm().upgrade_validator(*validator, version).await?;
+        ctx.swarm
+            .write()
+            .await
+            .upgrade_validator(*validator, version)
+            .await?;
     }
 
-    ctx.swarm().health_check().await?;
+    ctx.swarm.read().await.health_check().await?;
     let deadline = Instant::now() + Duration::from_secs(60);
     for validator in validators_to_update {
-        ctx.swarm()
-            .validator_mut(*validator)
+        ctx.swarm
+            .read()
+            .await
+            .validator(*validator)
             .unwrap()
             .wait_until_healthy(deadline)
             .await?;
@@ -68,8 +77,62 @@ async fn batch_update(
     Ok(())
 }
 
-pub fn create_emitter_and_request(
-    swarm: &mut dyn Swarm,
+async fn batch_update_gradually(
+    ctxa: NetworkContextSynchronizer<'_>,
+    validators_to_update: &[PeerId],
+    version: &Version,
+    wait_until_healthy: bool,
+    delay: Duration,
+    max_wait: Duration,
+) -> Result<()> {
+    for validator in validators_to_update {
+        info!("batch_update_gradually upgrade start: {}", validator);
+        {
+            ctxa.ctx
+                .lock()
+                .await
+                .swarm
+                .write()
+                .await
+                .upgrade_validator(*validator, version)
+                .await?;
+        }
+        if wait_until_healthy {
+            info!("batch_update_gradually upgrade waiting: {}", validator);
+            let deadline = Instant::now() + max_wait;
+            ctxa.ctx
+                .lock()
+                .await
+                .swarm
+                .read()
+                .await
+                .validator(*validator)
+                .unwrap()
+                .wait_until_healthy(deadline)
+                .await?;
+            info!("batch_update_gradually upgrade healthy: {}", validator);
+        }
+        if !delay.is_zero() {
+            info!("batch_update_gradually upgrade delay: {:?}", delay);
+            tokio::time::sleep(delay).await;
+        }
+        info!("batch_update_gradually upgrade done: {}", validator);
+    }
+
+    ctxa.ctx
+        .lock()
+        .await
+        .swarm
+        .read()
+        .await
+        .health_check()
+        .await?;
+
+    Ok(())
+}
+
+pub async fn create_emitter_and_request(
+    swarm: Arc<tokio::sync::RwLock<Box<dyn Swarm>>>,
     mut emit_job_request: EmitJobRequest,
     nodes: &[PeerId],
     rng: StdRng,
@@ -77,12 +140,16 @@ pub fn create_emitter_and_request(
     // as we are loading nodes, use higher client timeout
     let client_timeout = Duration::from_secs(30);
 
-    let chain_info = swarm.chain_info();
+    let chain_info = swarm.read().await.chain_info();
     let transaction_factory = TransactionFactory::new(chain_info.chain_id);
     let emitter = TxnEmitter::new(transaction_factory, rng);
 
-    emit_job_request =
-        emit_job_request.rest_clients(swarm.get_clients_for_peers(nodes, client_timeout));
+    emit_job_request = emit_job_request.rest_clients(
+        swarm
+            .read()
+            .await
+            .get_clients_for_peers(nodes, client_timeout),
+    );
     Ok((emitter, emit_job_request))
 }
 
@@ -91,7 +158,7 @@ pub fn traffic_emitter_runtime() -> Result<Runtime> {
     Ok(runtime)
 }
 
-pub fn generate_traffic(
+pub async fn generate_traffic(
     ctx: &mut NetworkContext<'_>,
     nodes: &[PeerId],
     duration: Duration,
@@ -99,14 +166,15 @@ pub fn generate_traffic(
     let emit_job_request = ctx.emit_job.clone();
     let rng = SeedableRng::from_rng(ctx.core().rng())?;
     let (emitter, emit_job_request) =
-        create_emitter_and_request(ctx.swarm(), emit_job_request, nodes, rng)?;
+        create_emitter_and_request(ctx.swarm.clone(), emit_job_request, nodes, rng).await?;
 
-    let rt = traffic_emitter_runtime()?;
-    let stats = rt.block_on(emitter.emit_txn_for(
-        ctx.swarm().chain_info().root_account,
-        emit_job_request,
-        duration,
-    ))?;
+    let stats = emitter
+        .emit_txn_for(
+            ctx.swarm.read().await.chain_info().root_account,
+            emit_job_request,
+            duration,
+        )
+        .await?;
 
     Ok(stats)
 }
@@ -121,7 +189,11 @@ pub enum LoadDestination {
 }
 
 impl LoadDestination {
-    fn get_destination_nodes(self, swarm: &mut dyn Swarm) -> Vec<PeerId> {
+    async fn get_destination_nodes(
+        self,
+        swarm: Arc<tokio::sync::RwLock<Box<dyn Swarm>>>,
+    ) -> Vec<PeerId> {
+        let swarm = swarm.read().await;
         let all_validators = swarm.validators().map(|v| v.peer_id()).collect::<Vec<_>>();
         let all_fullnodes = swarm.full_nodes().map(|v| v.peer_id()).collect::<Vec<_>>();
 
@@ -141,50 +213,58 @@ impl LoadDestination {
     }
 }
 
+#[async_trait]
 pub trait NetworkLoadTest: Test {
-    fn setup(&self, _ctx: &mut NetworkContext) -> Result<LoadDestination> {
+    async fn setup<'a>(&self, _ctx: &mut NetworkContext<'a>) -> Result<LoadDestination> {
         Ok(LoadDestination::FullnodesOtherwiseValidators)
     }
 
     // Load is started before this function is called, and stops after this function returns.
     // Expected duration is passed into this function, expecting this function to take that much
     // time to finish. How long this function takes will dictate how long the actual test lasts.
-    fn test(
+    async fn test(
         &self,
-        _swarm: &mut dyn Swarm,
+        _swarm: Arc<tokio::sync::RwLock<Box<dyn Swarm>>>,
         _report: &mut TestReport,
         duration: Duration,
     ) -> Result<()> {
-        std::thread::sleep(duration);
+        tokio::time::sleep(duration).await;
         Ok(())
     }
 
-    fn finish(&self, _ctx: &mut NetworkContext) -> Result<()> {
+    async fn finish<'a>(&self, _ctx: &mut NetworkContext<'a>) -> Result<()> {
         Ok(())
     }
 }
 
+#[async_trait]
 impl NetworkTest for dyn NetworkLoadTest {
-    fn run(&self, ctx: &mut NetworkContext<'_>) -> Result<()> {
-        let runtime = Runtime::new().unwrap();
+    async fn run<'a>(&self, ctx: NetworkContextSynchronizer<'a>) -> Result<()> {
+        let mut ctx_locker = ctx.ctx.lock().await;
+        let ctx = ctx_locker.deref_mut();
         let start_timestamp = SystemTime::now()
             .duration_since(UNIX_EPOCH)
             .expect("Time went backwards")
             .as_secs();
-        let (start_version, _) = runtime
-            .block_on(ctx.swarm().get_client_with_newest_ledger_version())
+        let (start_version, _) = ctx
+            .swarm
+            .read()
+            .await
+            .get_client_with_newest_ledger_version()
+            .await
             .context("no clients replied for start version")?;
         let emit_job_request = ctx.emit_job.clone();
-        let rng = SeedableRng::from_rng(ctx.core().rng())?;
         let duration = ctx.global_duration;
-        let stats_by_phase = self.network_load_test(
-            ctx,
-            emit_job_request,
-            duration,
-            WARMUP_DURATION_FRACTION,
-            COOLDOWN_DURATION_FRACTION,
-            rng,
-        )?;
+        let stats_by_phase = self
+            .network_load_test(
+                ctx,
+                emit_job_request,
+                duration,
+                WARMUP_DURATION_FRACTION,
+                COOLDOWN_DURATION_FRACTION,
+                None,
+            )
+            .await?;
 
         let phased = stats_by_phase.len() > 1;
         for (phase, phase_stats) in stats_by_phase.iter().enumerate() {
@@ -219,11 +299,15 @@ impl NetworkTest for dyn NetworkLoadTest {
             .duration_since(UNIX_EPOCH)
             .expect("Time went backwards")
             .as_secs();
-        let (end_version, _) = runtime
-            .block_on(ctx.swarm().get_client_with_newest_ledger_version())
+        let (end_version, _) = ctx
+            .swarm
+            .read()
+            .await
+            .get_client_with_newest_ledger_version()
+            .await
             .context("no clients replied for end version")?;
 
-        self.finish(ctx).context("finish NetworkLoadTest ")?;
+        self.finish(ctx).await.context("finish NetworkLoadTest ")?;
 
         for phase_stats in stats_by_phase.into_iter() {
             ctx.check_for_success(
@@ -235,6 +319,7 @@ impl NetworkTest for dyn NetworkLoadTest {
                 start_version,
                 end_version,
             )
+            .await
             .context("check for success")?;
         }
 
@@ -242,144 +327,183 @@ impl NetworkTest for dyn NetworkLoadTest {
     }
 }
 
-impl dyn NetworkLoadTest {
-    pub fn network_load_test(
-        &self,
-        ctx: &mut NetworkContext,
-        emit_job_request: EmitJobRequest,
-        duration: Duration,
-        warmup_duration_fraction: f32,
-        cooldown_duration_fraction: f32,
-        rng: StdRng,
-    ) -> Result<Vec<LoadTestPhaseStats>> {
-        let destination = self.setup(ctx).context("setup NetworkLoadTest")?;
-        let nodes_to_send_load_to = destination.get_destination_nodes(ctx.swarm());
-
-        // Generate some traffic
-
-        let (mut emitter, emit_job_request) =
-            create_emitter_and_request(ctx.swarm(), emit_job_request, &nodes_to_send_load_to, rng)
-                .context("create emitter")?;
+pub async fn create_buffered_load(
+    swarm: Arc<tokio::sync::RwLock<Box<dyn Swarm>>>,
+    nodes_to_send_load_to: &[PeerId],
+    emit_job_request: EmitJobRequest,
+    duration: Duration,
+    warmup_duration_fraction: f32,
+    cooldown_duration_fraction: f32,
+    mut inner_test_and_report: Option<(&dyn NetworkLoadTest, &mut TestReport)>,
+    mut synchronized_with_job: Option<&mut EmitJob>,
+) -> Result<Vec<LoadTestPhaseStats>> {
+    // Generate some traffic
+    let (mut emitter, emit_job_request) = create_emitter_and_request(
+        swarm.clone(),
+        emit_job_request,
+        nodes_to_send_load_to,
+        StdRng::from_entropy(),
+    )
+    .await
+    .context("create emitter")?;
+
+    let clients = swarm
+        .read()
+        .await
+        .get_clients_for_peers(nodes_to_send_load_to, Duration::from_secs(10));
+
+    let mut stats_tracking_phases = emit_job_request.get_num_phases();
+    assert!(stats_tracking_phases > 0 && stats_tracking_phases != 2);
+    if stats_tracking_phases == 1 {
+        stats_tracking_phases = 3;
+    }
 
-        let rt = traffic_emitter_runtime()?;
-        let clients = ctx
-            .swarm()
-            .get_clients_for_peers(&nodes_to_send_load_to, Duration::from_secs(10));
+    info!("Starting emitting txns for {}s", duration.as_secs());
+    let mut job = emitter
+        .start_job(
+            swarm.read().await.chain_info().root_account,
+            emit_job_request,
+            stats_tracking_phases,
+        )
+        .await
+        .context("start emitter job")?;
 
-        let mut stats_tracking_phases = emit_job_request.get_num_phases();
-        assert!(stats_tracking_phases > 0 && stats_tracking_phases != 2);
-        if stats_tracking_phases == 1 {
-            stats_tracking_phases = 3;
-        }
+    let total_start = PhaseTimingStart::now();
 
-        info!("Starting emitting txns for {}s", duration.as_secs());
-        let mut job = rt
-            .block_on(emitter.start_job(
-                ctx.swarm().chain_info().root_account,
-                emit_job_request,
-                stats_tracking_phases,
-            ))
-            .context("start emitter job")?;
+    let warmup_duration = duration.mul_f32(warmup_duration_fraction);
+    let cooldown_duration = duration.mul_f32(cooldown_duration_fraction);
+    let test_duration = duration - warmup_duration - cooldown_duration;
+    let phase_duration = test_duration.div_f32((stats_tracking_phases - 2) as f32);
 
-        let total_start = PhaseTimingStart::now();
+    job = job.periodic_stat_forward(warmup_duration, 60).await;
+    info!("{}s warmup finished", warmup_duration.as_secs());
 
-        let warmup_duration = duration.mul_f32(warmup_duration_fraction);
-        let cooldown_duration = duration.mul_f32(cooldown_duration_fraction);
-        let test_duration = duration - warmup_duration - cooldown_duration;
-        let phase_duration = test_duration.div_f32((stats_tracking_phases - 2) as f32);
-
-        job = rt.block_on(job.periodic_stat_forward(warmup_duration, 60));
-        info!("{}s warmup finished", warmup_duration.as_secs());
+    if let Some(job) = synchronized_with_job.as_mut() {
+        job.start_next_phase()
+    }
 
-        let mut phase_timing = Vec::new();
-        let mut phase_start_network_state = Vec::new();
-        let test_start = Instant::now();
-        for i in 0..stats_tracking_phases - 2 {
-            phase_start_network_state.push(rt.block_on(NetworkState::new(&clients)));
-            job.start_next_phase();
+    let mut phase_timing = Vec::new();
+    let mut phase_start_network_state = Vec::new();
+    let test_start = Instant::now();
+    for i in 0..stats_tracking_phases - 2 {
+        phase_start_network_state.push(NetworkState::new(&clients).await);
+        job.start_next_phase();
 
-            if i > 0 {
-                info!(
-                    "Starting test phase {} out of {}",
-                    i,
-                    stats_tracking_phases - 2,
-                );
-            }
-            let phase_start = PhaseTimingStart::now();
+        if i > 0 {
+            info!(
+                "Starting test phase {} out of {}",
+                i,
+                stats_tracking_phases - 2,
+            );
+        }
+        let phase_start = PhaseTimingStart::now();
 
-            let join_stats = rt.spawn(job.periodic_stat_forward(phase_duration, 60));
-            self.test(ctx.swarm, ctx.report, phase_duration)
+        let join_stats = Handle::current().spawn(job.periodic_stat_forward(phase_duration, 60));
+        if let Some((inner_test, context)) = inner_test_and_report.as_mut() {
+            inner_test
+                .test(swarm.clone(), context, phase_duration)
+                .await
                 .context("test NetworkLoadTest")?;
-            job = rt.block_on(join_stats).context("join stats")?;
-            phase_timing.push(phase_start.elapsed());
         }
-        let actual_test_duration = test_start.elapsed();
+        job = join_stats.await.context("join stats")?;
+        phase_timing.push(phase_start.elapsed());
+    }
+    let actual_test_duration = test_start.elapsed();
+    info!(
+        "{}s test finished after {}s",
+        test_duration.as_secs(),
+        actual_test_duration.as_secs()
+    );
+
+    phase_start_network_state.push(NetworkState::new(&clients).await);
+    job.start_next_phase();
+    if let Some(job) = synchronized_with_job.as_mut() {
+        job.start_next_phase()
+    }
+    let cooldown_start = Instant::now();
+
+    let cooldown_used = cooldown_start.elapsed();
+    if cooldown_used < cooldown_duration {
+        job = job
+            .periodic_stat_forward(cooldown_duration - cooldown_used, 60)
+            .await;
+    }
+    info!("{}s cooldown finished", cooldown_duration.as_secs());
+
+    let total_timing = total_start.elapsed();
+    info!(
+        "Emitting txns ran for {} secs(from {} to {}), stopping job...",
+        duration.as_secs(),
+        total_timing.start_unixtime_s,
+        total_timing.end_unixtime_s,
+    );
+    let stats_by_phase = job.stop_job().await;
+
+    info!("Stopped job");
+    info!("Warmup stats: {}", stats_by_phase[0].rate());
+
+    let mut stats: Option<TxnStats> = None;
+    let mut stats_by_phase_filtered = Vec::new();
+    for i in 0..stats_tracking_phases - 2 {
+        let next_i = i + 1;
+        let cur = &stats_by_phase[next_i];
+        info!("Test stats [test phase {}]: {}", i, cur.rate());
+        stats = if let Some(previous) = stats {
+            Some(&previous + cur)
+        } else {
+            Some(cur.clone())
+        };
+        let latency_breakdown = fetch_latency_breakdown(
+            swarm.clone(),
+            phase_timing[i].start_unixtime_s,
+            phase_timing[i].end_unixtime_s,
+        )
+        .await?;
         info!(
-            "{}s test finished after {}s",
-            test_duration.as_secs(),
-            actual_test_duration.as_secs()
+            "Latency breakdown details for phase {}: from {} to {}: {:?}",
+            i, phase_timing[i].start_unixtime_s, phase_timing[i].end_unixtime_s, latency_breakdown
         );
+        stats_by_phase_filtered.push(LoadTestPhaseStats {
+            emitter_stats: cur.clone(),
+            actual_duration: phase_timing[i].duration,
+            phase_start_unixtime_s: phase_timing[i].start_unixtime_s,
+            phase_end_unixtime_s: phase_timing[i].end_unixtime_s,
+            ledger_transactions: NetworkState::ledger_transactions(
+                &phase_start_network_state[i],
+                &phase_start_network_state[next_i],
+            ),
+            latency_breakdown,
+        });
+    }
+    info!("Cooldown stats: {}", stats_by_phase.last().unwrap().rate());
 
-        phase_start_network_state.push(rt.block_on(NetworkState::new(&clients)));
-        job.start_next_phase();
-        let cooldown_start = Instant::now();
-
-        let cooldown_used = cooldown_start.elapsed();
-        if cooldown_used < cooldown_duration {
-            job = rt.block_on(job.periodic_stat_forward(cooldown_duration - cooldown_used, 60));
-        }
-        info!("{}s cooldown finished", cooldown_duration.as_secs());
+    Ok(stats_by_phase_filtered)
+}
 
-        let total_timing = total_start.elapsed();
-        info!(
-            "Emitting txns ran for {} secs(from {} to {}), stopping job...",
-            duration.as_secs(),
-            total_timing.start_unixtime_s,
-            total_timing.end_unixtime_s,
-        );
-        let stats_by_phase = rt.block_on(job.stop_job());
-
-        info!("Stopped job");
-        info!("Warmup stats: {}", stats_by_phase[0].rate());
-
-        let mut stats: Option<TxnStats> = None;
-        let mut stats_by_phase_filtered = Vec::new();
-        for i in 0..stats_tracking_phases - 2 {
-            let next_i = i + 1;
-            let cur = &stats_by_phase[next_i];
-            info!("Test stats [test phase {}]: {}", i, cur.rate());
-            stats = if let Some(previous) = stats {
-                Some(&previous + cur)
-            } else {
-                Some(cur.clone())
-            };
-            let latency_breakdown = rt.block_on(fetch_latency_breakdown(
-                ctx.swarm(),
-                phase_timing[i].start_unixtime_s,
-                phase_timing[i].end_unixtime_s,
-            ))?;
-            info!(
-                "Latency breakdown details for phase {}: from {} to {}: {:?}",
-                i,
-                phase_timing[i].start_unixtime_s,
-                phase_timing[i].end_unixtime_s,
-                latency_breakdown
-            );
-            stats_by_phase_filtered.push(LoadTestPhaseStats {
-                emitter_stats: cur.clone(),
-                actual_duration: phase_timing[i].duration,
-                phase_start_unixtime_s: phase_timing[i].start_unixtime_s,
-                phase_end_unixtime_s: phase_timing[i].end_unixtime_s,
-                ledger_transactions: NetworkState::ledger_transactions(
-                    &phase_start_network_state[i],
-                    &phase_start_network_state[next_i],
-                ),
-                latency_breakdown,
-            });
-        }
-        info!("Cooldown stats: {}", stats_by_phase.last().unwrap().rate());
+impl dyn NetworkLoadTest + '_ {
+    pub async fn network_load_test<'a>(
+        &self,
+        ctx: &mut NetworkContext<'a>,
+        emit_job_request: EmitJobRequest,
+        duration: Duration,
+        warmup_duration_fraction: f32,
+        cooldown_duration_fraction: f32,
+        synchronized_with_job: Option<&mut EmitJob>,
+    ) -> Result<Vec<LoadTestPhaseStats>> {
+        let destination = self.setup(ctx).await.context("setup NetworkLoadTest")?;
+        let nodes_to_send_load_to = destination.get_destination_nodes(ctx.swarm.clone()).await;
 
-        Ok(stats_by_phase_filtered)
+        create_buffered_load(
+            ctx.swarm.clone(),
+            &nodes_to_send_load_to,
+            emit_job_request,
+            duration,
+            warmup_duration_fraction,
+            cooldown_duration_fraction,
+            Some((self, ctx.report)),
+            synchronized_with_job,
+        )
+        .await
     }
 }
 
@@ -491,14 +615,23 @@ impl CompositeNetworkTest {
     }
 }
 
+#[async_trait]
 impl NetworkTest for CompositeNetworkTest {
-    fn run(&self, ctx: &mut NetworkContext<'_>) -> anyhow::Result<()> {
-        for wrapper in &self.wrappers {
-            wrapper.setup(ctx)?;
+    async fn run<'a>(&self, ctxa: NetworkContextSynchronizer<'a>) -> Result<()> {
+        {
+            let mut ctx_locker = ctxa.ctx.lock().await;
+            let ctx = ctx_locker.deref_mut();
+            for wrapper in &self.wrappers {
+                wrapper.setup(ctx).await?;
+            }
         }
-        self.test.run(ctx)?;
-        for wrapper in &self.wrappers {
-            wrapper.finish(ctx)?;
+        self.test.run(ctxa.clone()).await?;
+        {
+            let mut ctx_locker = ctxa.ctx.lock().await;
+            let ctx = ctx_locker.deref_mut();
+            for wrapper in &self.wrappers {
+                wrapper.finish(ctx).await?;
+            }
         }
         Ok(())
     }
diff --git a/testsuite/testcases/src/load_vs_perf_benchmark.rs b/testsuite/testcases/src/load_vs_perf_benchmark.rs
index 60d794375fcd3..e63ff8bc0ec56 100644
--- a/testsuite/testcases/src/load_vs_perf_benchmark.rs
+++ b/testsuite/testcases/src/load_vs_perf_benchmark.rs
@@ -5,15 +5,16 @@ use crate::{create_emitter_and_request, LoadDestination, NetworkLoadTest};
 use anyhow::Context;
 use aptos_forge::{
     args::TransactionTypeArg,
+    emitter::NumAccountsMode,
     prometheus_metrics::{LatencyBreakdown, LatencyBreakdownSlice},
     success_criteria::{SuccessCriteria, SuccessCriteriaChecker},
-    EmitJobMode, EmitJobRequest, NetworkContext, NetworkTest, Result, Test, TxnStats,
-    WorkflowProgress,
+    EmitJob, EmitJobMode, EmitJobRequest, NetworkContext, NetworkContextSynchronizer, NetworkTest,
+    Result, Test, TxnStats, WorkflowProgress,
 };
-use aptos_logger::info;
+use aptos_logger::{error, info};
+use async_trait::async_trait;
 use rand::SeedableRng;
-use std::{fmt::Debug, time::Duration};
-use tokio::runtime::Runtime;
+use std::{fmt::Debug, ops::DerefMut, time::Duration};
 
 // add larger warmup, as when we are exceeding the max load,
 // it takes more time to fill mempool.
@@ -62,6 +63,15 @@ impl Workloads {
         }
     }
 
+    fn desc(&self, index: usize) -> String {
+        match self {
+            Self::TPS(tpss) => {
+                format!("TPS({})", tpss[index])
+            },
+            Self::TRANSACTIONS(workloads) => format!("TRANSACTIONS({:?})", workloads[index]),
+        }
+    }
+
     fn phase_name(&self, index: usize, phase: usize) -> String {
         match self {
             Self::TPS(tpss) => {
@@ -98,15 +108,70 @@ impl Workloads {
     }
 }
 
-#[derive(Debug, Copy, Clone)]
+#[derive(Debug, Clone)]
 pub struct TransactionWorkload {
     pub transaction_type: TransactionTypeArg,
     pub num_modules: usize,
     pub unique_senders: bool,
-    pub mempool_backlog: usize,
+    pub load: EmitJobMode,
+    pub transactions_per_account_override: Option<usize>,
 }
 
 impl TransactionWorkload {
+    pub fn new(transaction_type: TransactionTypeArg, mempool_backlog: usize) -> Self {
+        Self {
+            transaction_type,
+            num_modules: 1,
+            unique_senders: false,
+            load: EmitJobMode::MaxLoad { mempool_backlog },
+            transactions_per_account_override: None,
+        }
+    }
+
+    pub fn new_const_tps(transaction_type: TransactionTypeArg, tps: usize) -> Self {
+        Self {
+            transaction_type,
+            num_modules: 1,
+            unique_senders: false,
+            load: EmitJobMode::ConstTps { tps },
+            transactions_per_account_override: None,
+        }
+    }
+
+    pub fn new_wave_tps(
+        transaction_type: TransactionTypeArg,
+        average_tps: usize,
+        wave_ratio: f32,
+        num_waves: usize,
+    ) -> Self {
+        Self {
+            transaction_type,
+            num_modules: 1,
+            unique_senders: false,
+            load: EmitJobMode::WaveTps {
+                average_tps,
+                wave_ratio,
+                num_waves,
+            },
+            transactions_per_account_override: None,
+        }
+    }
+
+    pub fn with_num_modules(mut self, num_modules: usize) -> Self {
+        self.num_modules = num_modules;
+        self
+    }
+
+    pub fn with_unique_senders(mut self) -> Self {
+        self.unique_senders = true;
+        self
+    }
+
+    pub fn with_transactions_per_account(mut self, transactions_per_account: usize) -> Self {
+        self.transactions_per_account_override = Some(transactions_per_account);
+        self
+    }
+
     fn is_phased(&self) -> bool {
         self.unique_senders
     }
@@ -115,9 +180,13 @@ impl TransactionWorkload {
         let account_creation_type =
             TransactionTypeArg::AccountGenerationLargePool.materialize_default();
 
-        let request = request.mode(EmitJobMode::MaxLoad {
-            mempool_backlog: self.mempool_backlog,
-        });
+        let mut request = request.mode(self.load.clone());
+
+        if let Some(transactions_per_account) = &self.transactions_per_account_override {
+            request = request.num_accounts_mode(NumAccountsMode::TransactionsPerAccount(
+                *transactions_per_account,
+            ))
+        }
 
         if self.is_phased() {
             let write_type = self.transaction_type.materialize(
@@ -144,7 +213,7 @@ impl TransactionWorkload {
 
     fn phase_name(&self, phase: usize) -> String {
         format!(
-            "{}{}[{:.1}k]",
+            "{}{}[{}]",
             match (self.is_phased(), phase) {
                 (true, 0) => "CreateBurnerAccounts".to_string(),
                 (true, 1) => format!("{:?}", self.transaction_type),
@@ -156,14 +225,21 @@ impl TransactionWorkload {
             } else {
                 "".to_string()
             },
-            self.mempool_backlog as f32 / 1000.0,
+            match self.load {
+                EmitJobMode::MaxLoad { mempool_backlog } =>
+                    format!("B:{:.1}k", mempool_backlog as f32 / 1000.0),
+                EmitJobMode::ConstTps { tps } => format!("T:{:.1}k", tps as f32 / 1000.0),
+                EmitJobMode::WaveTps { average_tps, .. } =>
+                    format!("T:~{:.1}k", average_tps as f32 / 1000.0),
+            },
+            // ,
         )
     }
 }
 
-pub struct ContinuousTraffic {
+pub struct BackgroundTraffic {
     pub traffic: EmitJobRequest,
-    pub criteria: Option<SuccessCriteria>,
+    pub criteria: Vec<SuccessCriteria>,
 }
 
 pub struct LoadVsPerfBenchmark {
@@ -171,33 +247,39 @@ pub struct LoadVsPerfBenchmark {
     pub workloads: Workloads,
     pub criteria: Vec<SuccessCriteria>,
 
-    pub continuous_traffic: Option<ContinuousTraffic>,
+    pub background_traffic: Option<BackgroundTraffic>,
 }
 
 impl Test for LoadVsPerfBenchmark {
     fn name(&self) -> &'static str {
-        "continuous progress test"
+        match self.workloads {
+            Workloads::TPS(_) => "load vs perf test",
+            Workloads::TRANSACTIONS(_) => "workload vs perf test",
+        }
     }
 }
 
 impl LoadVsPerfBenchmark {
-    fn evaluate_single(
+    async fn evaluate_single(
         &self,
         ctx: &mut NetworkContext<'_>,
         workloads: &Workloads,
         index: usize,
         duration: Duration,
+        synchronized_with_job: Option<&mut EmitJob>,
     ) -> Result<Vec<SingleRunStats>> {
-        let rng = SeedableRng::from_rng(ctx.core().rng())?;
         let emit_job_request = workloads.configure(index, ctx.emit_job.clone());
-        let stats_by_phase = self.test.network_load_test(
-            ctx,
-            emit_job_request,
-            duration,
-            PER_TEST_WARMUP_DURATION_FRACTION,
-            PER_TEST_COOLDOWN_DURATION_FRACTION,
-            rng,
-        )?;
+        let stats_by_phase = self
+            .test
+            .network_load_test(
+                ctx,
+                emit_job_request,
+                duration,
+                PER_TEST_WARMUP_DURATION_FRACTION,
+                PER_TEST_COOLDOWN_DURATION_FRACTION,
+                synchronized_with_job,
+            )
+            .await?;
 
         let mut result = vec![];
         for (phase, phase_stats) in stats_by_phase.into_iter().enumerate() {
@@ -214,8 +296,9 @@ impl LoadVsPerfBenchmark {
     }
 }
 
+#[async_trait]
 impl NetworkTest for LoadVsPerfBenchmark {
-    fn run(&self, ctx: &mut NetworkContext<'_>) -> Result<()> {
+    async fn run<'a>(&self, ctx: NetworkContextSynchronizer<'a>) -> Result<()> {
         assert!(
             self.criteria.is_empty() || self.criteria.len() == self.workloads.len(),
             "Invalid config, {} criteria and {} workloads given",
@@ -223,26 +306,30 @@ impl NetworkTest for LoadVsPerfBenchmark {
             self.workloads.len(),
         );
 
-        let rt = Runtime::new().unwrap();
+        let mut ctx_locker = ctx.ctx.lock().await;
+        let ctx = ctx_locker.deref_mut();
 
-        let mut continous_job = if let Some(continuous_traffic) = &self.continuous_traffic {
-            let nodes_to_send_load_to =
-                LoadDestination::FullnodesOtherwiseValidators.get_destination_nodes(ctx.swarm());
+        let mut background_job = if let Some(background_traffic) = &self.background_traffic {
+            let nodes_to_send_load_to = LoadDestination::FullnodesOtherwiseValidators
+                .get_destination_nodes(ctx.swarm.clone())
+                .await;
             let rng = SeedableRng::from_rng(ctx.core().rng())?;
             let (mut emitter, emit_job_request) = create_emitter_and_request(
-                ctx.swarm(),
-                continuous_traffic.traffic.clone(),
+                ctx.swarm.clone(),
+                background_traffic.traffic.clone(),
                 &nodes_to_send_load_to,
                 rng,
             )
+            .await
             .context("create emitter")?;
 
-            let job = rt
-                .block_on(emitter.start_job(
-                    ctx.swarm().chain_info().root_account,
+            let job = emitter
+                .start_job(
+                    ctx.swarm.read().await.chain_info().root_account,
                     emit_job_request,
                     1 + 2 * self.workloads.len(),
-                ))
+                )
+                .await
                 .context("start emitter job")?;
             Some(job)
         } else {
@@ -258,11 +345,7 @@ impl NetworkTest for LoadVsPerfBenchmark {
                 std::thread::sleep(buffer);
             }
 
-            if let Some(job) = continous_job.as_mut() {
-                job.start_next_phase()
-            }
-
-            info!("Starting for {:?}", self.workloads);
+            info!("Starting for [{}]: {:?}", index, self.workloads.desc(index));
             results.push(
                 self.evaluate_single(
                     ctx,
@@ -271,21 +354,37 @@ impl NetworkTest for LoadVsPerfBenchmark {
                     phase_duration
                         .checked_mul(self.workloads.num_phases(index) as u32)
                         .unwrap(),
-                )?,
+                    background_job.as_mut(),
+                )
+                .await
+                .inspect_err(|e| {
+                    error!(
+                        "Failed evaluating single run [{}]: {:?} with {:?}",
+                        index,
+                        self.workloads.desc(index),
+                        e
+                    )
+                })?,
             );
 
-            if let Some(job) = continous_job.as_mut() {
-                job.start_next_phase()
+            let table = to_table(self.workloads.type_name(), &results);
+            for line in table {
+                info!("{}", line);
+            }
+
+            if let Some(job) = &background_job {
+                let stats_by_phase = job.peek_and_accumulate();
+                for line in to_table_background(
+                    "background traffic".to_string(),
+                    &extract_background_stats(stats_by_phase),
+                ) {
+                    info!("{}", line);
+                }
             }
 
             // Note: uncomment below to perform reconfig during a test
             // let mut aptos_info = ctx.swarm().aptos_public_info();
             // runtime.block_on(aptos_info.reconfig());
-
-            let table = to_table(self.workloads.type_name(), &results);
-            for line in table {
-                info!("{}", line);
-            }
         }
 
         let table = to_table(self.workloads.type_name(), &results);
@@ -293,26 +392,19 @@ impl NetworkTest for LoadVsPerfBenchmark {
             ctx.report.report_text(line);
         }
 
-        let continuous_results = continous_job.map(|job| {
-            let stats_by_phase = rt.block_on(job.stop_job());
-
-            let mut result = vec![];
-            for (phase, phase_stats) in stats_by_phase.into_iter().enumerate() {
-                if phase % 2 != 0 {
-                    result.push((
-                        format!("continuous with traffic {}", phase / 2),
-                        phase_stats,
-                    ));
-                }
-            }
+        let background_results = match background_job {
+            Some(job) => {
+                let stats_by_phase = job.stop_job().await;
 
-            let table = to_table_continuous("continuous traffic".to_string(), &result);
-            for line in table {
-                ctx.report.report_text(line);
-            }
+                let result = extract_background_stats(stats_by_phase);
 
-            result
-        });
+                for line in to_table_background("background traffic".to_string(), &result) {
+                    ctx.report.report_text(line);
+                }
+                Some(result)
+            },
+            None => None,
+        };
 
         for (index, result) in results.iter().enumerate() {
             // always take last phase for success criteria
@@ -329,10 +421,16 @@ impl NetworkTest for LoadVsPerfBenchmark {
             }
         }
 
-        if let Some(results) = continuous_results {
-            for (name, stats) in results {
+        if let Some(results) = background_results {
+            for (index, (name, stats)) in results.into_iter().enumerate() {
                 let rate = stats.rate();
-                if let Some(criteria) = &self.continuous_traffic.as_ref().unwrap().criteria {
+                if let Some(criteria) = self
+                    .background_traffic
+                    .as_ref()
+                    .unwrap()
+                    .criteria
+                    .get(index)
+                {
                     SuccessCriteriaChecker::check_core_for_success(
                         criteria,
                         ctx.report,
@@ -348,10 +446,32 @@ impl NetworkTest for LoadVsPerfBenchmark {
     }
 }
 
+fn extract_background_stats(stats_by_phase: Vec<TxnStats>) -> Vec<(String, TxnStats)> {
+    let mut result = vec![];
+    for (phase, phase_stats) in stats_by_phase.into_iter().enumerate() {
+        if phase % 2 != 0 {
+            result.push((
+                format!("background with traffic {}", phase / 2),
+                phase_stats,
+            ));
+        }
+    }
+    result
+}
+
 fn to_table(type_name: String, results: &[Vec<SingleRunStats>]) -> Vec<String> {
+    let name_width = (results
+        .iter()
+        .flatten()
+        .map(|result| result.name.len())
+        .max()
+        .unwrap_or(28)
+        + 2)
+    .max(30);
+
     let mut table = Vec::new();
     table.push(format!(
-        "{: <40} | {: <12} | {: <12} | {: <12} | {: <12} | {: <12} | {: <12} | {: <12} | {: <12} | {: <12} | {: <12} | {: <12} | {: <12} | {: <12} | {: <12}",
+        "{: <name_width$} | {: <12} | {: <12} | {: <12} | {: <12} | {: <12} | {: <12} | {: <12} | {: <12} | {: <12} | {: <12} | {: <12} | {: <12} | {: <12} | {: <12}",
         type_name,
         "submitted/s",
         "committed/s",
@@ -373,17 +493,17 @@ fn to_table(type_name: String, results: &[Vec<SingleRunStats>]) -> Vec<String> {
         for result in run_results {
             let rate = result.stats.rate();
             table.push(format!(
-                "{: <40} | {: <12} | {: <12} | {: <12} | {: <12} | {: <12} | {: <12} | {: <12} | {: <12} | {: <12} | {: <12.3} | {: <12.3} | {: <12.3} | {: <12.3} | {: <12}",
+                "{: <name_width$} | {: <12.2} | {: <12.2} | {: <12.2} | {: <12.2} | {: <12.2} | {: <12.3} | {: <12.3} | {: <12.3} | {: <12.3} | {: <12.3} | {: <12.3} | {: <12.3} | {: <12.3} | {: <12}",
                 result.name,
                 rate.submitted,
                 rate.committed,
                 rate.expired,
                 rate.failed_submission,
                 result.ledger_transactions / result.actual_duration.as_secs(),
-                rate.latency,
-                rate.p50_latency,
-                rate.p90_latency,
-                rate.p99_latency,
+                rate.latency / 1000.0,
+                rate.p50_latency as f64 / 1000.0,
+                rate.p90_latency as f64 / 1000.0,
+                rate.p99_latency as f64 / 1000.0,
                 result.latency_breakdown.get_samples(&LatencyBreakdownSlice::QsBatchToPos).max_sample(),
                 result.latency_breakdown.get_samples(&LatencyBreakdownSlice::QsPosToProposal).max_sample(),
                 result.latency_breakdown.get_samples(&LatencyBreakdownSlice::ConsensusProposalToOrdered).max_sample(),
@@ -396,10 +516,18 @@ fn to_table(type_name: String, results: &[Vec<SingleRunStats>]) -> Vec<String> {
     table
 }
 
-fn to_table_continuous(type_name: String, results: &[(String, TxnStats)]) -> Vec<String> {
+fn to_table_background(type_name: String, results: &[(String, TxnStats)]) -> Vec<String> {
+    let name_width = (results
+        .iter()
+        .map(|(name, _)| name.len())
+        .max()
+        .unwrap_or(28)
+        + 2)
+    .max(30);
+
     let mut table = Vec::new();
     table.push(format!(
-        "{: <40} | {: <12} | {: <12} | {: <12} | {: <12} | {: <12} | {: <12} | {: <12} | {: <12}",
+        "{: <name_width$} | {: <12} | {: <12} | {: <12} | {: <12} | {: <12} | {: <12} | {: <12} | {: <12}",
         type_name,
         "submitted/s",
         "committed/s",
@@ -414,16 +542,16 @@ fn to_table_continuous(type_name: String, results: &[(String, TxnStats)]) -> Vec
     for (name, stats) in results {
         let rate = stats.rate();
         table.push(format!(
-            "{: <40} | {: <12} | {: <12} | {: <12} | {: <12} | {: <12} | {: <12} | {: <12} | {: <12}",
+            "{: <name_width$} | {: <12.2} | {: <12.2} | {: <12.2} | {: <12.2} | {: <12.3} | {: <12.3} | {: <12.3} | {: <12.3}",
             name,
             rate.submitted,
             rate.committed,
             rate.expired,
             rate.failed_submission,
-            rate.latency,
-            rate.p50_latency,
-            rate.p90_latency,
-            rate.p99_latency,
+            rate.latency / 1000.0,
+            rate.p50_latency as f64 / 1000.0,
+            rate.p90_latency as f64 / 1000.0,
+            rate.p99_latency as f64 / 1000.0,
         ));
     }
 
@@ -435,27 +563,18 @@ fn test_phases_duration() {
     use assert_approx_eq::assert_approx_eq;
     use std::ops::{Add, Mul};
 
-    let one_phase = TransactionWorkload {
-        transaction_type: TransactionTypeArg::CoinTransfer,
-        num_modules: 1,
-        unique_senders: false,
-        mempool_backlog: 20000,
-    };
-    let two_phase = TransactionWorkload {
-        transaction_type: TransactionTypeArg::ModifyGlobalResource,
-        num_modules: 1,
-        unique_senders: true,
-        mempool_backlog: 20000,
-    };
+    let one_phase = TransactionWorkload::new(TransactionTypeArg::CoinTransfer, 20000);
+    let two_phase = TransactionWorkload::new(TransactionTypeArg::ModifyGlobalResource, 20000)
+        .with_unique_senders();
 
     {
-        let workload = Workloads::TRANSACTIONS(vec![one_phase]);
+        let workload = Workloads::TRANSACTIONS(vec![one_phase.clone()]);
         let (phase, _buffer) = workload.split_duration(Duration::from_secs(1));
         assert_approx_eq!(phase.as_secs_f32(), 1.0);
     }
 
     {
-        let workload = Workloads::TRANSACTIONS(vec![one_phase, one_phase]);
+        let workload = Workloads::TRANSACTIONS(vec![one_phase.clone(), one_phase.clone()]);
         let (phase, buffer) = workload.split_duration(Duration::from_secs(1));
         assert_approx_eq!(phase.as_secs_f32(), 1.0 / 2.2);
         assert_approx_eq!(buffer.as_secs_f32(), 1.0 / 2.2 * 0.2);
@@ -463,14 +582,19 @@ fn test_phases_duration() {
     }
 
     {
-        let workload = Workloads::TRANSACTIONS(vec![two_phase]);
+        let workload = Workloads::TRANSACTIONS(vec![two_phase.clone()]);
         let (phase, _buffer) = workload.split_duration(Duration::from_secs(1));
         assert_approx_eq!(phase.as_secs_f32(), 0.5);
     }
 
     {
-        let workload =
-            Workloads::TRANSACTIONS(vec![one_phase, one_phase, two_phase, two_phase, two_phase]);
+        let workload = Workloads::TRANSACTIONS(vec![
+            one_phase.clone(),
+            one_phase,
+            two_phase.clone(),
+            two_phase.clone(),
+            two_phase,
+        ]);
         let (phase, buffer) = workload.split_duration(Duration::from_secs(1));
         assert_approx_eq!(phase.as_secs_f32(), 1.0 / 8.8);
         assert_approx_eq!(buffer.as_secs_f32(), 1.0 / 8.8 * 0.2);
diff --git a/testsuite/testcases/src/modifiers.rs b/testsuite/testcases/src/modifiers.rs
index 2cdda468a1418..a881780b17d2f 100644
--- a/testsuite/testcases/src/modifiers.rs
+++ b/testsuite/testcases/src/modifiers.rs
@@ -3,72 +3,75 @@
 
 use crate::{multi_region_network_test::chunk_peers, LoadDestination, NetworkLoadTest};
 use aptos_forge::{
-    GroupCpuStress, NetworkContext, NetworkTest, Swarm, SwarmChaos, SwarmCpuStress, SwarmExt, Test,
+    GroupCpuStress, NetworkContext, NetworkContextSynchronizer, NetworkTest, Swarm, SwarmChaos,
+    SwarmCpuStress, SwarmExt, Test,
 };
 use aptos_logger::info;
 use aptos_types::PeerId;
+use async_trait::async_trait;
 use rand::Rng;
-use tokio::runtime::Runtime;
+use std::sync::Arc;
 
-fn add_execution_delay(swarm: &mut dyn Swarm, config: &ExecutionDelayConfig) -> anyhow::Result<()> {
-    let runtime = Runtime::new().unwrap();
-    let validators = swarm.get_validator_clients_with_names();
+async fn add_execution_delay(
+    swarm: Arc<tokio::sync::RwLock<Box<(dyn Swarm)>>>,
+    config: &ExecutionDelayConfig,
+) -> anyhow::Result<()> {
+    let validators = { swarm.read().await.get_validator_clients_with_names() };
 
-    runtime.block_on(async {
-        let mut rng = rand::thread_rng();
-        for (name, validator) in validators {
-            let sleep_percentage = if rng.gen_bool(config.inject_delay_node_fraction) {
+    for (name, validator) in validators {
+        let sleep_percentage = {
+            let mut rng = rand::thread_rng();
+            if rng.gen_bool(config.inject_delay_node_fraction) {
                 rng.gen_range(1_u32, config.inject_delay_max_transaction_percentage)
             } else {
                 0
-            };
-            info!(
-                "Validator {} adding {}% of transactions with {}ms execution delay",
-                name, sleep_percentage, config.inject_delay_per_transaction_ms
-            );
-            validator
-                .set_failpoint(
-                    "aptos_vm::execution::user_transaction".to_string(),
-                    format!(
-                        "{}%delay({})",
-                        sleep_percentage, config.inject_delay_per_transaction_ms
-                    ),
+            }
+        };
+        info!(
+            "Validator {} adding {}% of transactions with {}ms execution delay",
+            name, sleep_percentage, config.inject_delay_per_transaction_ms
+        );
+        validator
+            .set_failpoint(
+                "aptos_vm::execution::user_transaction".to_string(),
+                format!(
+                    "{}%delay({})",
+                    sleep_percentage, config.inject_delay_per_transaction_ms
+                ),
+            )
+            .await
+            .map_err(|e| {
+                anyhow::anyhow!(
+                    "set_failpoint to add execution delay on {} failed, {:?}",
+                    name,
+                    e
                 )
-                .await
-                .map_err(|e| {
-                    anyhow::anyhow!(
-                        "set_failpoint to add execution delay on {} failed, {:?}",
-                        name,
-                        e
-                    )
-                })?;
-        }
-        Ok(())
-    })
+            })?;
+    }
+    Ok(())
 }
 
-fn remove_execution_delay(swarm: &mut dyn Swarm) -> anyhow::Result<()> {
-    let runtime = Runtime::new().unwrap();
-    let validators = swarm.get_validator_clients_with_names();
-
-    runtime.block_on(async {
-        for (name, validator) in validators {
-            validator
-                .set_failpoint(
-                    "aptos_vm::execution::block_metadata".to_string(),
-                    "off".to_string(),
+async fn remove_execution_delay(
+    swarm: Arc<tokio::sync::RwLock<Box<(dyn Swarm)>>>,
+) -> anyhow::Result<()> {
+    let validators = { swarm.read().await.get_validator_clients_with_names() };
+
+    for (name, validator) in validators {
+        validator
+            .set_failpoint(
+                "aptos_vm::execution::block_metadata".to_string(),
+                "off".to_string(),
+            )
+            .await
+            .map_err(|e| {
+                anyhow::anyhow!(
+                    "set_failpoint to remove execution delay on {} failed, {:?}",
+                    name,
+                    e
                 )
-                .await
-                .map_err(|e| {
-                    anyhow::anyhow!(
-                        "set_failpoint to remove execution delay on {} failed, {:?}",
-                        name,
-                        e
-                    )
-                })?;
-        }
-        Ok(())
-    })
+            })?;
+    }
+    Ok(())
 }
 
 /// Config for adding variable processing overhead/delay into
@@ -90,20 +93,22 @@ pub struct ExecutionDelayTest {
     pub add_execution_delay: ExecutionDelayConfig,
 }
 
+#[async_trait]
 impl NetworkLoadTest for ExecutionDelayTest {
-    fn setup(&self, ctx: &mut NetworkContext) -> anyhow::Result<LoadDestination> {
-        add_execution_delay(ctx.swarm(), &self.add_execution_delay)?;
+    async fn setup<'a>(&self, ctx: &mut NetworkContext<'a>) -> anyhow::Result<LoadDestination> {
+        add_execution_delay(ctx.swarm.clone(), &self.add_execution_delay).await?;
         Ok(LoadDestination::FullnodesOtherwiseValidators)
     }
 
-    fn finish(&self, ctx: &mut NetworkContext) -> anyhow::Result<()> {
-        remove_execution_delay(ctx.swarm())
+    async fn finish<'a>(&self, ctx: &mut NetworkContext<'a>) -> anyhow::Result<()> {
+        remove_execution_delay(ctx.swarm.clone()).await
     }
 }
 
+#[async_trait]
 impl NetworkTest for ExecutionDelayTest {
-    fn run(&self, ctx: &mut NetworkContext<'_>) -> anyhow::Result<()> {
-        <dyn NetworkLoadTest>::run(self, ctx)
+    async fn run<'a>(&self, ctx: NetworkContextSynchronizer<'a>) -> anyhow::Result<()> {
+        <dyn NetworkLoadTest>::run(self, ctx).await
     }
 }
 
@@ -122,16 +127,15 @@ pub struct NetworkUnreliabilityTest {
     pub config: NetworkUnreliabilityConfig,
 }
 
+#[async_trait]
 impl NetworkLoadTest for NetworkUnreliabilityTest {
-    fn setup(&self, ctx: &mut NetworkContext) -> anyhow::Result<LoadDestination> {
-        let swarm = ctx.swarm();
-        let runtime = Runtime::new().unwrap();
-        let validators = swarm.get_validator_clients_with_names();
+    async fn setup<'a>(&self, ctx: &mut NetworkContext<'a>) -> anyhow::Result<LoadDestination> {
+        let validators = { ctx.swarm.read().await.get_validator_clients_with_names() };
 
-        runtime.block_on(async {
-            let mut rng = rand::thread_rng();
-            for (name, validator) in validators {
-                let drop_percentage = if rng.gen_bool(self.config.inject_unreliability_fraction) {
+        for (name, validator) in validators {
+            let drop_percentage = {
+                let mut rng = rand::thread_rng();
+                if rng.gen_bool(self.config.inject_unreliability_fraction) {
                     rng.gen_range(
                         1_u32,
                         (self.config.inject_max_unreliability_percentage * 1000.0) as u32,
@@ -139,56 +143,53 @@ impl NetworkLoadTest for NetworkUnreliabilityTest {
                         / 1000.0
                 } else {
                     0.0
-                };
-                info!(
-                    "Validator {} dropping {}% of messages",
-                    name, drop_percentage
-                );
-                validator
-                    .set_failpoint(
-                        "consensus::send::any".to_string(),
-                        format!("{}%return", drop_percentage),
+                }
+            };
+            info!(
+                "Validator {} dropping {}% of messages",
+                name, drop_percentage
+            );
+            validator
+                .set_failpoint(
+                    "consensus::send::any".to_string(),
+                    format!("{}%return", drop_percentage),
+                )
+                .await
+                .map_err(|e| {
+                    anyhow::anyhow!(
+                        "set_failpoint to add unreliability on {} failed, {:?}",
+                        name,
+                        e
                     )
-                    .await
-                    .map_err(|e| {
-                        anyhow::anyhow!(
-                            "set_failpoint to add unreliability on {} failed, {:?}",
-                            name,
-                            e
-                        )
-                    })?;
-            }
-            Ok::<(), anyhow::Error>(())
-        })?;
+                })?;
+        }
 
         Ok(LoadDestination::FullnodesOtherwiseValidators)
     }
 
-    fn finish(&self, ctx: &mut NetworkContext) -> anyhow::Result<()> {
-        let runtime = Runtime::new().unwrap();
-        let validators = ctx.swarm().get_validator_clients_with_names();
-
-        runtime.block_on(async {
-            for (name, validator) in validators {
-                validator
-                    .set_failpoint("consensus::send::any".to_string(), "off".to_string())
-                    .await
-                    .map_err(|e| {
-                        anyhow::anyhow!(
-                            "set_failpoint to remove unreliability on {} failed, {:?}",
-                            name,
-                            e
-                        )
-                    })?;
-            }
-            Ok(())
-        })
+    async fn finish<'a>(&self, ctx: &mut NetworkContext<'a>) -> anyhow::Result<()> {
+        let validators = { ctx.swarm.read().await.get_validator_clients_with_names() };
+
+        for (name, validator) in validators {
+            validator
+                .set_failpoint("consensus::send::any".to_string(), "off".to_string())
+                .await
+                .map_err(|e| {
+                    anyhow::anyhow!(
+                        "set_failpoint to remove unreliability on {} failed, {:?}",
+                        name,
+                        e
+                    )
+                })?;
+        }
+        Ok(())
     }
 }
 
+#[async_trait]
 impl NetworkTest for NetworkUnreliabilityTest {
-    fn run(&self, ctx: &mut NetworkContext<'_>) -> anyhow::Result<()> {
-        <dyn NetworkLoadTest>::run(self, ctx)
+    async fn run<'a>(&self, ctx: NetworkContextSynchronizer<'a>) -> anyhow::Result<()> {
+        <dyn NetworkLoadTest>::run(self, ctx).await
     }
 }
 
@@ -226,8 +227,16 @@ impl CpuChaosTest {
     /// Creates a new SwarmCpuStress to be injected via chaos. Note:
     /// CPU chaos is only done for the validators in the swarm (and
     /// not the fullnodes).
-    fn create_cpu_chaos(&self, swarm: &mut dyn Swarm) -> SwarmCpuStress {
-        let all_validators = swarm.validators().map(|v| v.peer_id()).collect::<Vec<_>>();
+    async fn create_cpu_chaos(
+        &self,
+        swarm: Arc<tokio::sync::RwLock<Box<(dyn Swarm)>>>,
+    ) -> SwarmCpuStress {
+        let all_validators = swarm
+            .read()
+            .await
+            .validators()
+            .map(|v| v.peer_id())
+            .collect::<Vec<_>>();
         let cpu_chaos_config = self.cpu_chaos_config.clone();
         create_swarm_cpu_stress(all_validators, Some(cpu_chaos_config))
     }
@@ -279,30 +288,34 @@ pub fn create_swarm_cpu_stress(
     SwarmCpuStress { group_cpu_stresses }
 }
 
+#[async_trait]
 impl NetworkLoadTest for CpuChaosTest {
-    fn setup(&self, ctx: &mut NetworkContext) -> anyhow::Result<LoadDestination> {
-        let swarm_cpu_stress = self.create_cpu_chaos(ctx.swarm());
+    async fn setup<'a>(&self, ctx: &mut NetworkContext<'a>) -> anyhow::Result<LoadDestination> {
+        let swarm_cpu_stress = self.create_cpu_chaos(ctx.swarm.clone()).await;
 
-        ctx.runtime.block_on(
-            ctx.swarm
-                .inject_chaos(SwarmChaos::CpuStress(swarm_cpu_stress)),
-        )?;
+        ctx.swarm
+            .write()
+            .await
+            .inject_chaos(SwarmChaos::CpuStress(swarm_cpu_stress))
+            .await?;
 
         Ok(LoadDestination::FullnodesOtherwiseValidators)
     }
 
-    fn finish(&self, ctx: &mut NetworkContext) -> anyhow::Result<()> {
-        let swarm_cpu_stress = self.create_cpu_chaos(ctx.swarm());
+    async fn finish<'a>(&self, ctx: &mut NetworkContext<'a>) -> anyhow::Result<()> {
+        let swarm_cpu_stress = self.create_cpu_chaos(ctx.swarm.clone()).await;
 
-        ctx.runtime.block_on(
-            ctx.swarm
-                .remove_chaos(SwarmChaos::CpuStress(swarm_cpu_stress)),
-        )
+        ctx.swarm
+            .write()
+            .await
+            .remove_chaos(SwarmChaos::CpuStress(swarm_cpu_stress))
+            .await
     }
 }
 
+#[async_trait]
 impl NetworkTest for CpuChaosTest {
-    fn run(&self, ctx: &mut NetworkContext<'_>) -> anyhow::Result<()> {
-        <dyn NetworkLoadTest>::run(self, ctx)
+    async fn run<'a>(&self, ctx: NetworkContextSynchronizer<'a>) -> anyhow::Result<()> {
+        <dyn NetworkLoadTest>::run(self, ctx).await
     }
 }
diff --git a/testsuite/testcases/src/multi_region_network_test.rs b/testsuite/testcases/src/multi_region_network_test.rs
index a4a60a062f818..840d37699152e 100644
--- a/testsuite/testcases/src/multi_region_network_test.rs
+++ b/testsuite/testcases/src/multi_region_network_test.rs
@@ -2,11 +2,15 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{LoadDestination, NetworkLoadTest};
-use aptos_forge::{GroupNetEm, NetworkContext, NetworkTest, Swarm, SwarmChaos, SwarmNetEm, Test};
+use aptos_forge::{
+    GroupNetEm, NetworkContext, NetworkContextSynchronizer, NetworkTest, Swarm, SwarmChaos,
+    SwarmNetEm, Test,
+};
 use aptos_logger::info;
 use aptos_types::PeerId;
+use async_trait::async_trait;
 use itertools::{self, EitherOrBoth, Itertools};
-use std::collections::BTreeMap;
+use std::{collections::BTreeMap, sync::Arc};
 
 /// The link stats are obtained from https://github.com/doitintl/intercloud-throughput/blob/master/results_202202/results.csv
 /// The four regions were hand-picked from the dataset to simulate a multi-region setup
@@ -120,25 +124,39 @@ impl InterRegionNetEmConfig {
         let group_netems: Vec<GroupNetEm> = peer_groups
             .iter()
             .combinations(2)
-            .map(|comb| {
+            .flat_map(|comb| {
                 let (from_region, from_chunk, stats) = &comb[0];
                 let (to_region, to_chunk, _) = &comb[1];
 
-                let (bandwidth, latency) = stats.get(to_region).unwrap();
-                let netem = GroupNetEm {
-                    name: format!("{}-to-{}-netem", from_region, to_region),
-                    source_nodes: from_chunk.to_vec(),
-                    target_nodes: to_chunk.to_vec(),
-                    delay_latency_ms: *latency as u64,
-                    delay_jitter_ms: self.delay_jitter_ms,
-                    delay_correlation_percentage: self.delay_correlation_percentage,
-                    loss_percentage: self.loss_percentage,
-                    loss_correlation_percentage: self.loss_correlation_percentage,
-                    rate_in_mbps: *bandwidth / 1e6 as u64,
-                };
-                info!("inter-region netem {:?}", netem);
-
-                netem
+                let (bandwidth, rtt_latency) = stats.get(to_region).unwrap();
+                let hop_latency = rtt_latency / 2.0;
+                let netems = [
+                    GroupNetEm {
+                        name: format!("{}-to-{}-netem", from_region, to_region),
+                        source_nodes: from_chunk.to_vec(),
+                        target_nodes: to_chunk.to_vec(),
+                        delay_latency_ms: hop_latency as u64,
+                        delay_jitter_ms: self.delay_jitter_ms,
+                        delay_correlation_percentage: self.delay_correlation_percentage,
+                        loss_percentage: self.loss_percentage,
+                        loss_correlation_percentage: self.loss_correlation_percentage,
+                        rate_in_mbps: *bandwidth / 1e6 as u64,
+                    },
+                    GroupNetEm {
+                        name: format!("{}-to-{}-netem", to_region, from_region),
+                        source_nodes: to_chunk.to_vec(),
+                        target_nodes: from_chunk.to_vec(),
+                        delay_latency_ms: hop_latency as u64,
+                        delay_jitter_ms: self.delay_jitter_ms,
+                        delay_correlation_percentage: self.delay_correlation_percentage,
+                        loss_percentage: self.loss_percentage,
+                        loss_correlation_percentage: self.loss_correlation_percentage,
+                        rate_in_mbps: *bandwidth / 1e6 as u64,
+                    },
+                ];
+                info!("inter-region netem {:?}", netems);
+
+                netems
             })
             .collect();
 
@@ -237,9 +255,16 @@ impl MultiRegionNetworkEmulationTest {
     /// Creates a new SwarmNetEm to be injected via chaos. Note: network
     /// emulation is only done for the validators in the swarm (and not
     /// the fullnodes).
-    fn create_netem_chaos(&self, swarm: &mut dyn Swarm) -> SwarmNetEm {
-        let all_validators = swarm.validators().map(|v| v.peer_id()).collect::<Vec<_>>();
-        let all_vfns = swarm.full_nodes().map(|v| v.peer_id()).collect::<Vec<_>>();
+    async fn create_netem_chaos(
+        &self,
+        swarm: Arc<tokio::sync::RwLock<Box<(dyn Swarm)>>>,
+    ) -> SwarmNetEm {
+        let (all_validators, all_vfns) = {
+            let swarm = swarm.read().await;
+            let all_validators = swarm.validators().map(|v| v.peer_id()).collect::<Vec<_>>();
+            let all_vfns = swarm.full_nodes().map(|v| v.peer_id()).collect::<Vec<_>>();
+            (all_validators, all_vfns)
+        };
 
         let all_pairs: Vec<_> = all_validators
             .iter()
@@ -295,26 +320,34 @@ pub fn create_multi_region_swarm_network_chaos(
     }
 }
 
+#[async_trait]
 impl NetworkLoadTest for MultiRegionNetworkEmulationTest {
-    fn setup(&self, ctx: &mut NetworkContext) -> anyhow::Result<LoadDestination> {
-        let chaos = self.create_netem_chaos(ctx.swarm);
-        ctx.runtime
-            .block_on(ctx.swarm.inject_chaos(SwarmChaos::NetEm(chaos)))?;
+    async fn setup<'a>(&self, ctx: &mut NetworkContext<'a>) -> anyhow::Result<LoadDestination> {
+        let chaos = self.create_netem_chaos(ctx.swarm.clone()).await;
+        ctx.swarm
+            .write()
+            .await
+            .inject_chaos(SwarmChaos::NetEm(chaos))
+            .await?;
 
         Ok(LoadDestination::FullnodesOtherwiseValidators)
     }
 
-    fn finish(&self, ctx: &mut NetworkContext) -> anyhow::Result<()> {
-        let chaos = self.create_netem_chaos(ctx.swarm);
-        ctx.runtime
-            .block_on(ctx.swarm.remove_chaos(SwarmChaos::NetEm(chaos)))?;
+    async fn finish<'a>(&self, ctx: &mut NetworkContext<'a>) -> anyhow::Result<()> {
+        let chaos = self.create_netem_chaos(ctx.swarm.clone()).await;
+        ctx.swarm
+            .write()
+            .await
+            .remove_chaos(SwarmChaos::NetEm(chaos))
+            .await?;
         Ok(())
     }
 }
 
+#[async_trait]
 impl NetworkTest for MultiRegionNetworkEmulationTest {
-    fn run(&self, ctx: &mut NetworkContext<'_>) -> anyhow::Result<()> {
-        <dyn NetworkLoadTest>::run(self, ctx)
+    async fn run<'a>(&self, ctx: NetworkContextSynchronizer<'a>) -> anyhow::Result<()> {
+        <dyn NetworkLoadTest>::run(self, ctx).await
     }
 }
 
diff --git a/testsuite/testcases/src/network_bandwidth_test.rs b/testsuite/testcases/src/network_bandwidth_test.rs
index eb8f701565440..30c7bf4bba4ea 100644
--- a/testsuite/testcases/src/network_bandwidth_test.rs
+++ b/testsuite/testcases/src/network_bandwidth_test.rs
@@ -3,9 +3,12 @@
 
 use crate::{LoadDestination, NetworkLoadTest};
 use aptos_forge::{
-    GroupNetworkBandwidth, NetworkContext, NetworkTest, SwarmChaos, SwarmNetworkBandwidth, Test,
+    GroupNetworkBandwidth, NetworkContext, NetworkContextSynchronizer, NetworkTest, SwarmChaos,
+    SwarmNetworkBandwidth, Test,
 };
+use async_trait::async_trait;
 
+/// This is deprecated. Use [crate::multi_region_network_test::MultiRegionNetworkEmulationTest] instead
 pub struct NetworkBandwidthTest;
 
 // Bandwidth
@@ -22,20 +25,21 @@ impl Test for NetworkBandwidthTest {
     }
 }
 
+#[async_trait]
 impl NetworkLoadTest for NetworkBandwidthTest {
-    fn setup(&self, ctx: &mut NetworkContext) -> anyhow::Result<LoadDestination> {
-        ctx.runtime
-            .block_on(
-                ctx.swarm
-                    .inject_chaos(SwarmChaos::Bandwidth(SwarmNetworkBandwidth {
-                        group_network_bandwidths: vec![GroupNetworkBandwidth {
-                            name: format!("forge-namespace-{}mbps-bandwidth", RATE_MBPS),
-                            rate: RATE_MBPS,
-                            limit: LIMIT_BYTES,
-                            buffer: BUFFER_BYTES,
-                        }],
-                    })),
-            )?;
+    async fn setup<'a>(&self, ctx: &mut NetworkContext<'a>) -> anyhow::Result<LoadDestination> {
+        ctx.swarm
+            .write()
+            .await
+            .inject_chaos(SwarmChaos::Bandwidth(SwarmNetworkBandwidth {
+                group_network_bandwidths: vec![GroupNetworkBandwidth {
+                    name: format!("forge-namespace-{}mbps-bandwidth", RATE_MBPS),
+                    rate: RATE_MBPS,
+                    limit: LIMIT_BYTES,
+                    buffer: BUFFER_BYTES,
+                }],
+            }))
+            .await?;
 
         let msg = format!(
             "Limited bandwidth to {}mbps with limit {} and buffer {} to namespace",
@@ -47,25 +51,26 @@ impl NetworkLoadTest for NetworkBandwidthTest {
         Ok(LoadDestination::FullnodesOtherwiseValidators)
     }
 
-    fn finish(&self, ctx: &mut NetworkContext) -> anyhow::Result<()> {
-        ctx.runtime
-            .block_on(
-                ctx.swarm
-                    .remove_chaos(SwarmChaos::Bandwidth(SwarmNetworkBandwidth {
-                        group_network_bandwidths: vec![GroupNetworkBandwidth {
-                            name: format!("forge-namespace-{}mbps-bandwidth", RATE_MBPS),
-                            rate: RATE_MBPS,
-                            limit: LIMIT_BYTES,
-                            buffer: BUFFER_BYTES,
-                        }],
-                    })),
-            )?;
+    async fn finish<'a>(&self, ctx: &mut NetworkContext<'a>) -> anyhow::Result<()> {
+        ctx.swarm
+            .write()
+            .await
+            .remove_chaos(SwarmChaos::Bandwidth(SwarmNetworkBandwidth {
+                group_network_bandwidths: vec![GroupNetworkBandwidth {
+                    name: format!("forge-namespace-{}mbps-bandwidth", RATE_MBPS),
+                    rate: RATE_MBPS,
+                    limit: LIMIT_BYTES,
+                    buffer: BUFFER_BYTES,
+                }],
+            }))
+            .await?;
         Ok(())
     }
 }
 
+#[async_trait]
 impl NetworkTest for NetworkBandwidthTest {
-    fn run(&self, ctx: &mut NetworkContext<'_>) -> anyhow::Result<()> {
-        <dyn NetworkLoadTest>::run(self, ctx)
+    async fn run<'a>(&self, ctx: NetworkContextSynchronizer<'a>) -> anyhow::Result<()> {
+        <dyn NetworkLoadTest>::run(self, ctx).await
     }
 }
diff --git a/testsuite/testcases/src/network_loss_test.rs b/testsuite/testcases/src/network_loss_test.rs
index f7f175555f7aa..925d04dfd82f2 100644
--- a/testsuite/testcases/src/network_loss_test.rs
+++ b/testsuite/testcases/src/network_loss_test.rs
@@ -2,8 +2,12 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{LoadDestination, NetworkLoadTest};
-use aptos_forge::{NetworkContext, NetworkTest, SwarmChaos, SwarmNetworkLoss, Test};
+use aptos_forge::{
+    NetworkContext, NetworkContextSynchronizer, NetworkTest, SwarmChaos, SwarmNetworkLoss, Test,
+};
+use async_trait::async_trait;
 
+/// This is deprecated. Use [crate::multi_region_network_test::MultiRegionNetworkEmulationTest] instead
 pub struct NetworkLossTest;
 
 // Loss parameters
@@ -16,13 +20,17 @@ impl Test for NetworkLossTest {
     }
 }
 
+#[async_trait]
 impl NetworkLoadTest for NetworkLossTest {
-    fn setup(&self, ctx: &mut NetworkContext) -> anyhow::Result<LoadDestination> {
-        ctx.runtime
-            .block_on(ctx.swarm.inject_chaos(SwarmChaos::Loss(SwarmNetworkLoss {
+    async fn setup<'a>(&self, ctx: &mut NetworkContext<'a>) -> anyhow::Result<LoadDestination> {
+        ctx.swarm
+            .write()
+            .await
+            .inject_chaos(SwarmChaos::Loss(SwarmNetworkLoss {
                 loss_percentage: LOSS_PERCENTAGE,
                 correlation_percentage: CORRELATION_PERCENTAGE,
-            })))?;
+            }))
+            .await?;
 
         let msg = format!(
             "Injected {}% loss with {}% correlation loss to namespace",
@@ -33,18 +41,22 @@ impl NetworkLoadTest for NetworkLossTest {
         Ok(LoadDestination::FullnodesOtherwiseValidators)
     }
 
-    fn finish(&self, ctx: &mut NetworkContext) -> anyhow::Result<()> {
-        ctx.runtime
-            .block_on(ctx.swarm.remove_chaos(SwarmChaos::Loss(SwarmNetworkLoss {
+    async fn finish<'a>(&self, ctx: &mut NetworkContext<'a>) -> anyhow::Result<()> {
+        ctx.swarm
+            .write()
+            .await
+            .remove_chaos(SwarmChaos::Loss(SwarmNetworkLoss {
                 loss_percentage: LOSS_PERCENTAGE,
                 correlation_percentage: CORRELATION_PERCENTAGE,
-            })))?;
+            }))
+            .await?;
         Ok(())
     }
 }
 
+#[async_trait]
 impl NetworkTest for NetworkLossTest {
-    fn run(&self, ctx: &mut NetworkContext<'_>) -> anyhow::Result<()> {
-        <dyn NetworkLoadTest>::run(self, ctx)
+    async fn run<'a>(&self, ctx: NetworkContextSynchronizer<'a>) -> anyhow::Result<()> {
+        <dyn NetworkLoadTest>::run(self, ctx).await
     }
 }
diff --git a/testsuite/testcases/src/network_partition_test.rs b/testsuite/testcases/src/network_partition_test.rs
index 41659cf5c8468..48f192f91c2be 100644
--- a/testsuite/testcases/src/network_partition_test.rs
+++ b/testsuite/testcases/src/network_partition_test.rs
@@ -2,8 +2,13 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{LoadDestination, NetworkLoadTest};
-use aptos_forge::{NetworkContext, NetworkTest, SwarmChaos, SwarmNetworkPartition, Test};
+use aptos_forge::{
+    NetworkContext, NetworkContextSynchronizer, NetworkTest, SwarmChaos, SwarmNetworkPartition,
+    Test,
+};
+use async_trait::async_trait;
 
+/// This is deprecated. Use [crate::multi_region_network_test::MultiRegionNetworkEmulationTest] instead
 pub struct NetworkPartitionTest;
 
 // Partition
@@ -15,15 +20,16 @@ impl Test for NetworkPartitionTest {
     }
 }
 
+#[async_trait]
 impl NetworkLoadTest for NetworkPartitionTest {
-    fn setup(&self, ctx: &mut NetworkContext) -> anyhow::Result<LoadDestination> {
-        ctx.runtime
-            .block_on(
-                ctx.swarm
-                    .inject_chaos(SwarmChaos::Partition(SwarmNetworkPartition {
-                        partition_percentage: PARTITION_PERCENTAGE,
-                    })),
-            )?;
+    async fn setup<'a>(&self, ctx: &mut NetworkContext<'a>) -> anyhow::Result<LoadDestination> {
+        ctx.swarm
+            .write()
+            .await
+            .inject_chaos(SwarmChaos::Partition(SwarmNetworkPartition {
+                partition_percentage: PARTITION_PERCENTAGE,
+            }))
+            .await?;
 
         let msg = format!(
             "Partitioned {}% validators in namespace",
@@ -34,26 +40,29 @@ impl NetworkLoadTest for NetworkPartitionTest {
         // Just send the load to last validator which is not included in the partition
         Ok(LoadDestination::Peers(vec![ctx
             .swarm
+            .read()
+            .await
             .validators()
             .last()
             .map(|v| v.peer_id())
             .unwrap()]))
     }
 
-    fn finish(&self, ctx: &mut NetworkContext) -> anyhow::Result<()> {
-        ctx.runtime
-            .block_on(
-                ctx.swarm
-                    .remove_chaos(SwarmChaos::Partition(SwarmNetworkPartition {
-                        partition_percentage: PARTITION_PERCENTAGE,
-                    })),
-            )?;
+    async fn finish<'a>(&self, ctx: &mut NetworkContext<'a>) -> anyhow::Result<()> {
+        ctx.swarm
+            .write()
+            .await
+            .remove_chaos(SwarmChaos::Partition(SwarmNetworkPartition {
+                partition_percentage: PARTITION_PERCENTAGE,
+            }))
+            .await?;
         Ok(())
     }
 }
 
+#[async_trait]
 impl NetworkTest for NetworkPartitionTest {
-    fn run(&self, ctx: &mut NetworkContext<'_>) -> anyhow::Result<()> {
-        <dyn NetworkLoadTest>::run(self, ctx)
+    async fn run<'a>(&self, ctx: NetworkContextSynchronizer<'a>) -> anyhow::Result<()> {
+        <dyn NetworkLoadTest>::run(self, ctx).await
     }
 }
diff --git a/testsuite/testcases/src/partial_nodes_down_test.rs b/testsuite/testcases/src/partial_nodes_down_test.rs
index 2d6c126907cc4..84cb944df3882 100644
--- a/testsuite/testcases/src/partial_nodes_down_test.rs
+++ b/testsuite/testcases/src/partial_nodes_down_test.rs
@@ -3,8 +3,9 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::generate_traffic;
-use aptos_forge::{NetworkContext, NetworkTest, Result, Test};
-use std::thread;
+use aptos_forge::{NetworkContextSynchronizer, NetworkTest, Result, Test};
+use async_trait::async_trait;
+use std::{ops::DerefMut, thread};
 use tokio::{runtime::Runtime, time::Duration};
 
 pub struct PartialNodesDown;
@@ -15,30 +16,37 @@ impl Test for PartialNodesDown {
     }
 }
 
+#[async_trait]
 impl NetworkTest for PartialNodesDown {
-    fn run(&self, ctx: &mut NetworkContext<'_>) -> Result<()> {
+    async fn run<'a>(&self, ctx: NetworkContextSynchronizer<'a>) -> Result<()> {
+        let mut ctx_locker = ctx.ctx.lock().await;
+        let ctx = ctx_locker.deref_mut();
         let runtime = Runtime::new()?;
         let duration = Duration::from_secs(120);
         let all_validators = ctx
-            .swarm()
+            .swarm
+            .read()
+            .await
             .validators()
             .map(|v| v.peer_id())
             .collect::<Vec<_>>();
         let mut down_nodes = all_validators.clone();
         let up_nodes = down_nodes.split_off(all_validators.len() / 10);
         for n in &down_nodes {
-            let node = ctx.swarm().validator_mut(*n).unwrap();
+            let swarm = ctx.swarm.read().await;
+            let node = swarm.validator(*n).unwrap();
             println!("Node {} is going to stop", node.name());
             runtime.block_on(node.stop())?;
         }
         thread::sleep(Duration::from_secs(5));
 
         // Generate some traffic
-        let txn_stat = generate_traffic(ctx, &up_nodes, duration)?;
+        let txn_stat = generate_traffic(ctx, &up_nodes, duration).await?;
         ctx.report
             .report_txn_stats(self.name().to_string(), &txn_stat);
         for n in &down_nodes {
-            let node = ctx.swarm().validator_mut(*n).unwrap();
+            let swarm = ctx.swarm.read().await;
+            let node = swarm.validator(*n).unwrap();
             println!("Node {} is going to restart", node.name());
             runtime.block_on(node.start())?;
         }
diff --git a/testsuite/testcases/src/performance_test.rs b/testsuite/testcases/src/performance_test.rs
index f602ede7d437f..63786565d1f98 100644
--- a/testsuite/testcases/src/performance_test.rs
+++ b/testsuite/testcases/src/performance_test.rs
@@ -3,7 +3,8 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::NetworkLoadTest;
-use aptos_forge::{NetworkContext, NetworkTest, Result, Test};
+use aptos_forge::{NetworkContextSynchronizer, NetworkTest, Result, Test};
+use async_trait::async_trait;
 
 pub struct PerformanceBenchmark;
 
@@ -15,8 +16,9 @@ impl Test for PerformanceBenchmark {
 
 impl NetworkLoadTest for PerformanceBenchmark {}
 
+#[async_trait]
 impl NetworkTest for PerformanceBenchmark {
-    fn run(&self, ctx: &mut NetworkContext<'_>) -> Result<()> {
-        <dyn NetworkLoadTest>::run(self, ctx)
+    async fn run<'a>(&self, ctx: NetworkContextSynchronizer<'a>) -> Result<()> {
+        <dyn NetworkLoadTest>::run(self, ctx).await
     }
 }
diff --git a/testsuite/testcases/src/public_fullnode_performance.rs b/testsuite/testcases/src/public_fullnode_performance.rs
index a57ad39a9c05d..88b3fac41b72c 100644
--- a/testsuite/testcases/src/public_fullnode_performance.rs
+++ b/testsuite/testcases/src/public_fullnode_performance.rs
@@ -9,20 +9,20 @@ use crate::{
 use anyhow::Error;
 use aptos_config::config::{NodeConfig, OverrideNodeConfig};
 use aptos_forge::{
-    NetworkContext, NetworkTest, OverrideNodeConfigFn, Result, Swarm, SwarmChaos, SwarmCpuStress,
-    SwarmNetEm, Test,
+    NetworkContext, NetworkContextSynchronizer, NetworkTest, OverrideNodeConfigFn, Result, Swarm,
+    SwarmChaos, SwarmCpuStress, SwarmNetEm, Test,
 };
 use aptos_logger::info;
 use aptos_sdk::move_types::account_address::AccountAddress;
 use aptos_types::PeerId;
+use async_trait::async_trait;
 use itertools::{EitherOrBoth, Itertools};
 use rand::{
     rngs::{OsRng, StdRng},
     seq::SliceRandom,
     Rng, SeedableRng,
 };
-use std::iter::once;
-use tokio::runtime::Runtime;
+use std::{iter::once, sync::Arc};
 
 /// A simple test that adds multiple public fullnodes (PFNs) to the swarm
 /// and submits transactions through them. Network emulation chaos can also
@@ -57,9 +57,12 @@ impl PFNPerformance {
 
     /// Creates CPU chaos for the swarm. Note: CPU chaos is added
     /// to all validators, VFNs and PFNs in the swarm.
-    fn create_cpu_chaos(&self, swarm: &mut dyn Swarm) -> SwarmCpuStress {
+    async fn create_cpu_chaos(
+        &self,
+        swarm: Arc<tokio::sync::RwLock<Box<(dyn Swarm)>>>,
+    ) -> SwarmCpuStress {
         // Gather and shuffle all peers IDs (so that we get random CPU chaos)
-        let shuffled_peer_ids = self.gather_and_shuffle_peer_ids(swarm);
+        let shuffled_peer_ids = self.gather_and_shuffle_peer_ids(swarm).await;
 
         // Create CPU chaos for the swarm
         create_swarm_cpu_stress(shuffled_peer_ids, None)
@@ -67,19 +70,31 @@ impl PFNPerformance {
 
     /// Creates network emulation chaos for the swarm. Note: network chaos
     /// is added to all validators, VFNs and PFNs in the swarm.
-    fn create_network_emulation_chaos(&self, swarm: &mut dyn Swarm) -> SwarmNetEm {
+    async fn create_network_emulation_chaos(
+        &self,
+        swarm: Arc<tokio::sync::RwLock<Box<(dyn Swarm)>>>,
+    ) -> SwarmNetEm {
         // Gather and shuffle all peers IDs (so that we get random network emulation)
-        let shuffled_peer_ids = self.gather_and_shuffle_peer_ids_with_colocation(swarm);
+        let shuffled_peer_ids = self
+            .gather_and_shuffle_peer_ids_with_colocation(swarm)
+            .await;
 
         // Create network emulation chaos for the swarm
         create_multi_region_swarm_network_chaos(shuffled_peer_ids, None)
     }
 
     /// Gathers and shuffles all peer IDs in the swarm
-    fn gather_and_shuffle_peer_ids(&self, swarm: &mut dyn Swarm) -> Vec<AccountAddress> {
+    async fn gather_and_shuffle_peer_ids(
+        &self,
+        swarm: Arc<tokio::sync::RwLock<Box<(dyn Swarm)>>>,
+    ) -> Vec<AccountAddress> {
         // Identify the validators and fullnodes in the swarm
-        let validator_peer_ids = swarm.validators().map(|v| v.peer_id()).collect::<Vec<_>>();
-        let fullnode_peer_ids = swarm.full_nodes().map(|v| v.peer_id()).collect::<Vec<_>>();
+        let (validator_peer_ids, fullnode_peer_ids) = {
+            let swarm = swarm.read().await;
+            let validator_peer_ids = swarm.validators().map(|v| v.peer_id()).collect::<Vec<_>>();
+            let fullnode_peer_ids = swarm.full_nodes().map(|v| v.peer_id()).collect::<Vec<_>>();
+            (validator_peer_ids, fullnode_peer_ids)
+        };
 
         // Gather and shuffle all peers IDs
         let mut all_peer_ids = validator_peer_ids
@@ -93,13 +108,17 @@ impl PFNPerformance {
     }
 
     /// Gathers and shuffles all peer IDs in the swarm, colocating VFNs with their validator
-    fn gather_and_shuffle_peer_ids_with_colocation(
+    async fn gather_and_shuffle_peer_ids_with_colocation(
         &self,
-        swarm: &mut dyn Swarm,
+        swarm: Arc<tokio::sync::RwLock<Box<(dyn Swarm)>>>,
     ) -> Vec<Vec<AccountAddress>> {
         // Identify the validators and fullnodes in the swarm
-        let validator_peer_ids = swarm.validators().map(|v| v.peer_id()).collect::<Vec<_>>();
-        let fullnode_peer_ids = swarm.full_nodes().map(|v| v.peer_id()).collect::<Vec<_>>();
+        let (validator_peer_ids, fullnode_peer_ids) = {
+            let swarm = swarm.read().await;
+            let validator_peer_ids = swarm.validators().map(|v| v.peer_id()).collect::<Vec<_>>();
+            let fullnode_peer_ids = swarm.full_nodes().map(|v| v.peer_id()).collect::<Vec<_>>();
+            (validator_peer_ids, fullnode_peer_ids)
+        };
         let (vfn_peer_ids, pfn_peer_ids) =
             fullnode_peer_ids.split_at(fullnode_peer_ids.len() - self.num_pfns as usize);
         let mut vfn_and_vn_ids: Vec<_> = validator_peer_ids
@@ -124,51 +143,65 @@ impl Test for PFNPerformance {
     }
 }
 
+#[async_trait]
 impl NetworkTest for PFNPerformance {
-    fn run(&self, ctx: &mut NetworkContext<'_>) -> Result<()> {
-        <dyn NetworkLoadTest>::run(self, ctx)
+    async fn run<'a>(&self, ctx: NetworkContextSynchronizer<'a>) -> Result<()> {
+        <dyn NetworkLoadTest>::run(self, ctx).await
     }
 }
 
+#[async_trait]
 impl NetworkLoadTest for PFNPerformance {
     /// We must override the setup function to: (i) create PFNs in
     /// the swarm; and (ii) use those PFNs as the load destination.
-    fn setup(&self, ctx: &mut NetworkContext) -> Result<LoadDestination> {
+    async fn setup<'a>(&self, ctx: &mut NetworkContext<'a>) -> Result<LoadDestination> {
         // Add the PFNs to the swarm
         let pfn_peer_ids =
-            create_and_add_pfns(ctx, self.num_pfns, self.config_override_fn.clone())?;
+            create_and_add_pfns(ctx, self.num_pfns, self.config_override_fn.clone()).await?;
 
         // Add CPU chaos to the swarm
         if self.add_cpu_chaos {
-            let cpu_chaos = self.create_cpu_chaos(ctx.swarm);
-            ctx.runtime
-                .block_on(ctx.swarm.inject_chaos(SwarmChaos::CpuStress(cpu_chaos)))?;
+            let cpu_chaos = self.create_cpu_chaos(ctx.swarm.clone()).await;
+            ctx.swarm
+                .write()
+                .await
+                .inject_chaos(SwarmChaos::CpuStress(cpu_chaos))
+                .await?;
         }
 
         // Add network emulation to the swarm
         if self.add_network_emulation {
-            let network_chaos = self.create_network_emulation_chaos(ctx.swarm);
-            ctx.runtime
-                .block_on(ctx.swarm.inject_chaos(SwarmChaos::NetEm(network_chaos)))?;
+            let network_chaos = self.create_network_emulation_chaos(ctx.swarm.clone()).await;
+            ctx.swarm
+                .write()
+                .await
+                .inject_chaos(SwarmChaos::NetEm(network_chaos))
+                .await?;
         }
 
         // Use the PFNs as the load destination
         Ok(LoadDestination::Peers(pfn_peer_ids))
     }
 
-    fn finish(&self, ctx: &mut NetworkContext) -> Result<()> {
+    async fn finish<'a>(&self, ctx: &mut NetworkContext<'a>) -> Result<()> {
         // Remove CPU chaos from the swarm
         if self.add_cpu_chaos {
-            let cpu_chaos = self.create_cpu_chaos(ctx.swarm);
-            ctx.runtime
-                .block_on(ctx.swarm.remove_chaos(SwarmChaos::CpuStress(cpu_chaos)))?;
+            let cpu_chaos = self.create_cpu_chaos(ctx.swarm.clone()).await;
+            ctx.swarm
+                .write()
+                .await
+                .remove_chaos(SwarmChaos::CpuStress(cpu_chaos))
+                .await?;
         }
 
         // Remove network emulation from the swarm
         if self.add_network_emulation {
-            let network_chaos = self.create_network_emulation_chaos(ctx.swarm);
-            ctx.runtime
-                .block_on(ctx.swarm.remove_chaos(SwarmChaos::NetEm(network_chaos)))?;
+            let network_chaos = self.create_network_emulation_chaos(ctx.swarm.clone()).await;
+            ctx.swarm
+                .write()
+                .await
+                .remove_chaos(SwarmChaos::NetEm(network_chaos))
+                .await?;
         }
 
         Ok(())
@@ -176,48 +209,49 @@ impl NetworkLoadTest for PFNPerformance {
 }
 
 /// Adds a number of PFNs to the network and returns the peer IDs
-fn create_and_add_pfns(
-    ctx: &mut NetworkContext,
+async fn create_and_add_pfns<'a>(
+    ctx: &mut NetworkContext<'a>,
     num_pfns: u64,
     config_override_fn: Option<OverrideNodeConfigFn>,
 ) -> Result<Vec<PeerId>, Error> {
     info!("Creating {} public fullnodes!", num_pfns);
 
     // Identify the version for the PFNs
-    let swarm = ctx.swarm();
-    let pfn_version = swarm.versions().max().unwrap();
+    let pfn_version = { ctx.swarm.read().await.versions().max().unwrap() };
 
     // Create the PFN swarm
-    let runtime = Runtime::new().unwrap();
-    let pfn_peer_ids: Vec<AccountAddress> = (0..num_pfns)
-        .map(|i| {
-            // Create a config for the PFN. Note: this needs to be done here
-            // because the config will generate a unique peer ID for the PFN.
-            let mut pfn_config = swarm.get_default_pfn_node_config();
-            let mut base_config = NodeConfig::default();
-            if let Some(f) = config_override_fn.as_ref() {
-                f(&mut pfn_config, &mut base_config);
-            }
-            let pfn_override_config = OverrideNodeConfig::new(pfn_config, base_config);
-
-            // Add the PFN to the swarm
-            let peer_id = runtime
-                .block_on(swarm.add_full_node(&pfn_version, pfn_override_config))
-                .unwrap();
-
-            // Verify the PFN was added
-            if swarm.full_node(peer_id).is_none() {
-                panic!(
-                    "Failed to locate PFN {:?} in the swarm! Peer ID: {:?}",
-                    i, peer_id
-                );
-            }
-
-            // Return the peer ID
-            info!("Created PFN {:?} with peer ID: {:?}", i, peer_id);
-            peer_id
-        })
-        .collect();
+    let mut pfn_peer_ids = Vec::with_capacity(num_pfns as usize);
+    for i in 0..num_pfns {
+        // Create a config for the PFN. Note: this needs to be done here
+        // because the config will generate a unique peer ID for the PFN.
+        let mut pfn_config = ctx.swarm.read().await.get_default_pfn_node_config();
+        let mut base_config = NodeConfig::default();
+        if let Some(f) = config_override_fn.as_ref() {
+            f(&mut pfn_config, &mut base_config);
+        }
+        let pfn_override_config = OverrideNodeConfig::new(pfn_config, base_config);
+
+        // Add the PFN to the swarm
+        let peer_id = ctx
+            .swarm
+            .write()
+            .await
+            .add_full_node(&pfn_version, pfn_override_config)
+            .await
+            .unwrap();
+
+        // Verify the PFN was added
+        if ctx.swarm.read().await.full_node(peer_id).is_none() {
+            panic!(
+                "Failed to locate PFN {:?} in the swarm! Peer ID: {:?}",
+                i, peer_id
+            );
+        }
+
+        // Return the peer ID
+        info!("Created PFN {:?} with peer ID: {:?}", i, peer_id);
+        pfn_peer_ids.push(peer_id);
+    }
 
     Ok(pfn_peer_ids)
 }
diff --git a/testsuite/testcases/src/quorum_store_onchain_enable_test.rs b/testsuite/testcases/src/quorum_store_onchain_enable_test.rs
index 63c8e6e505fa6..873ae870e7a1b 100644
--- a/testsuite/testcases/src/quorum_store_onchain_enable_test.rs
+++ b/testsuite/testcases/src/quorum_store_onchain_enable_test.rs
@@ -4,15 +4,15 @@
 use crate::{generate_onchain_config_blob, NetworkLoadTest};
 use anyhow::Ok;
 use aptos::test::CliTestFramework;
-use aptos_forge::{NetworkTest, NodeExt, SwarmExt, Test};
+use aptos_forge::{NetworkContextSynchronizer, NetworkTest, NodeExt, SwarmExt, Test};
 use aptos_logger::info;
 use aptos_sdk::bcs;
 use aptos_types::{
     account_config::CORE_CODE_ADDRESS,
     on_chain_config::{ConsensusConfigV1, OnChainConsensusConfig},
 };
-use std::time::Duration;
-use tokio::runtime::Runtime;
+use async_trait::async_trait;
+use std::{sync::Arc, time::Duration};
 
 const MAX_NODE_LAG_SECS: u64 = 360;
 
@@ -24,92 +24,95 @@ impl Test for QuorumStoreOnChainEnableTest {
     }
 }
 
+#[async_trait]
 impl NetworkLoadTest for QuorumStoreOnChainEnableTest {
-    fn test(
+    async fn test(
         &self,
-        swarm: &mut dyn aptos_forge::Swarm,
+        swarm: Arc<tokio::sync::RwLock<Box<dyn aptos_forge::Swarm>>>,
         _report: &mut aptos_forge::TestReport,
         duration: std::time::Duration,
     ) -> anyhow::Result<()> {
-        let runtime = Runtime::new().unwrap();
-
         let faucet_endpoint: reqwest::Url = "http://localhost:8081".parse().unwrap();
-        let rest_client = swarm.validators().next().unwrap().rest_client();
-
-        let mut cli = runtime.block_on(async {
-            CliTestFramework::new(
-                swarm.validators().next().unwrap().rest_api_endpoint(),
-                faucet_endpoint,
-                /*num_cli_accounts=*/ 0,
-            )
-            .await
-        });
-
-        std::thread::sleep(duration / 2);
-
-        runtime.block_on(async {
-
-            let root_cli_index = cli.add_account_with_address_to_cli(
-                swarm.chain_info().root_account().private_key().clone(),
-                swarm.chain_info().root_account().address(),
-            );
-
-            let current_consensus_config: OnChainConsensusConfig = bcs::from_bytes(
-                &rest_client
-                    .get_account_resource_bcs::<Vec<u8>>(
-                        CORE_CODE_ADDRESS,
-                        "0x1::consensus_config::ConsensusConfig",
-                    )
-                    .await
-                    .unwrap()
-                    .into_inner(),
+        let (rest_client, rest_api_endpoint) = {
+            let swarm = swarm.read().await;
+            let first_validator = swarm.validators().next().unwrap();
+            let rest_client = first_validator.rest_client();
+            let rest_api_endpoint = first_validator.rest_api_endpoint();
+            (rest_client, rest_api_endpoint)
+        };
+        let mut cli = CliTestFramework::new(
+            rest_api_endpoint,
+            faucet_endpoint,
+            /*num_cli_accounts=*/ 0,
+        )
+        .await;
+
+        tokio::time::sleep(duration / 2).await;
+
+        let root_cli_index = {
+            let root_account = swarm.read().await.chain_info().root_account();
+            cli.add_account_with_address_to_cli(
+                root_account.private_key().clone(),
+                root_account.address(),
             )
-            .unwrap();
-
-            let inner = match current_consensus_config {
-                OnChainConsensusConfig::V1(inner) => inner,
-                OnChainConsensusConfig::V2(_) => panic!("Unexpected V2 config"),
-                _ => unimplemented!()
-            };
-
-            // Change to V2
-            let new_consensus_config = OnChainConsensusConfig::V2(ConsensusConfigV1 { ..inner });
-
-            let update_consensus_config_script = format!(
-                r#"
-        script {{
-            use aptos_framework::aptos_governance;
-            use aptos_framework::consensus_config;
-            fun main(core_resources: &signer) {{
-                let framework_signer = aptos_governance::get_signer_testnet_only(core_resources, @0000000000000000000000000000000000000000000000000000000000000001);
-                let config_bytes = {};
-                consensus_config::set(&framework_signer, config_bytes);
-            }}
+        };
+
+        let current_consensus_config: OnChainConsensusConfig = bcs::from_bytes(
+            &rest_client
+                .get_account_resource_bcs::<Vec<u8>>(
+                    CORE_CODE_ADDRESS,
+                    "0x1::consensus_config::ConsensusConfig",
+                )
+                .await
+                .unwrap()
+                .into_inner(),
+        )
+        .unwrap();
+
+        let inner = match current_consensus_config {
+            OnChainConsensusConfig::V1(inner) => inner,
+            OnChainConsensusConfig::V2(_) => panic!("Unexpected V2 config"),
+            _ => unimplemented!(),
+        };
+
+        // Change to V2
+        let new_consensus_config = OnChainConsensusConfig::V2(ConsensusConfigV1 { ..inner });
+
+        let update_consensus_config_script = format!(
+            r#"
+    script {{
+        use aptos_framework::aptos_governance;
+        use aptos_framework::consensus_config;
+        fun main(core_resources: &signer) {{
+            let framework_signer = aptos_governance::get_signer_testnet_only(core_resources, @0000000000000000000000000000000000000000000000000000000000000001);
+            let config_bytes = {};
+            consensus_config::set(&framework_signer, config_bytes);
         }}
-        "#,
-                generate_onchain_config_blob(&bcs::to_bytes(&new_consensus_config).unwrap())
-            );
+    }}
+    "#,
+            generate_onchain_config_blob(&bcs::to_bytes(&new_consensus_config).unwrap())
+        );
 
-            cli.run_script_with_default_framework(root_cli_index, &update_consensus_config_script)
-                .await
-        })?;
+        cli.run_script_with_default_framework(root_cli_index, &update_consensus_config_script)
+            .await?;
 
-        std::thread::sleep(duration / 2);
+        tokio::time::sleep(duration / 2).await;
 
         // Wait for all nodes to synchronize and stabilize.
         info!("Waiting for the validators to be synchronized.");
-        runtime.block_on(async {
-            swarm
-                .wait_for_all_nodes_to_catchup(Duration::from_secs(MAX_NODE_LAG_SECS))
-                .await
-        })?;
+        swarm
+            .read()
+            .await
+            .wait_for_all_nodes_to_catchup(Duration::from_secs(MAX_NODE_LAG_SECS))
+            .await?;
 
         Ok(())
     }
 }
 
+#[async_trait]
 impl NetworkTest for QuorumStoreOnChainEnableTest {
-    fn run(&self, ctx: &mut aptos_forge::NetworkContext<'_>) -> anyhow::Result<()> {
-        <dyn NetworkLoadTest>::run(self, ctx)
+    async fn run<'a>(&self, ctx: NetworkContextSynchronizer<'a>) -> anyhow::Result<()> {
+        <dyn NetworkLoadTest>::run(self, ctx).await
     }
 }
diff --git a/testsuite/testcases/src/reconfiguration_test.rs b/testsuite/testcases/src/reconfiguration_test.rs
index 57f99767eb194..eb0c0a7e38409 100644
--- a/testsuite/testcases/src/reconfiguration_test.rs
+++ b/testsuite/testcases/src/reconfiguration_test.rs
@@ -3,7 +3,8 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use anyhow::anyhow;
-use aptos_forge::{NetworkContext, NetworkTest, Result, Test};
+use aptos_forge::{NetworkContextSynchronizer, NetworkTest, Result, Test};
+use async_trait::async_trait;
 
 pub struct ReconfigurationTest;
 
@@ -13,8 +14,9 @@ impl Test for ReconfigurationTest {
     }
 }
 
+#[async_trait]
 impl NetworkTest for ReconfigurationTest {
-    fn run(&self, _ctx: &mut NetworkContext<'_>) -> Result<()> {
+    async fn run<'a>(&self, _ctx: NetworkContextSynchronizer<'a>) -> Result<()> {
         Err(anyhow!("Not supported in aptos-framework yet"))
     }
     // TODO(https://github.com/aptos-labs/aptos-core/issues/317): add back after support those transactions in aptos-framework
diff --git a/testsuite/testcases/src/state_sync_performance.rs b/testsuite/testcases/src/state_sync_performance.rs
index 22f43cc7a1569..2e0948ccc48bf 100644
--- a/testsuite/testcases/src/state_sync_performance.rs
+++ b/testsuite/testcases/src/state_sync_performance.rs
@@ -5,12 +5,13 @@
 use crate::generate_traffic;
 use anyhow::bail;
 use aptos_forge::{
-    get_highest_synced_epoch, get_highest_synced_version, NetworkContext, NetworkTest, Result,
-    SwarmExt, Test,
+    get_highest_synced_epoch, get_highest_synced_version, NetworkContext,
+    NetworkContextSynchronizer, NetworkTest, Result, SwarmExt, Test,
 };
 use aptos_logger::info;
 use aptos_sdk::move_types::account_address::AccountAddress;
-use std::time::Instant;
+use async_trait::async_trait;
+use std::{ops::DerefMut, time::Instant};
 use tokio::{runtime::Runtime, time::Duration};
 
 const MAX_EPOCH_CHANGE_SECS: u64 = 300; // Max amount of time (in seconds) to wait for an epoch change
@@ -27,15 +28,18 @@ impl Test for StateSyncFullnodePerformance {
     }
 }
 
+#[async_trait]
 impl NetworkTest for StateSyncFullnodePerformance {
-    fn run(&self, ctx: &mut NetworkContext<'_>) -> Result<()> {
-        let all_fullnodes = get_fullnodes_and_check_setup(ctx, self.name())?;
+    async fn run<'a>(&self, ctx: NetworkContextSynchronizer<'a>) -> Result<()> {
+        let mut ctx_locker = ctx.ctx.lock().await;
+        let ctx = ctx_locker.deref_mut();
+        let all_fullnodes = get_fullnodes_and_check_setup(ctx, self.name()).await?;
 
         // Emit a lot of traffic and ensure the fullnodes can all sync
-        emit_traffic_and_ensure_bounded_sync(ctx, &all_fullnodes)?;
+        emit_traffic_and_ensure_bounded_sync(ctx, &all_fullnodes).await?;
 
         // Stop and reset the fullnodes so they start syncing from genesis
-        stop_and_reset_nodes(ctx, &all_fullnodes, &[])?;
+        stop_and_reset_nodes(ctx, &all_fullnodes, &[]).await?;
 
         // Wait for all nodes to catch up to the highest synced version
         // then calculate and display the throughput results.
@@ -53,28 +57,32 @@ impl Test for StateSyncFullnodeFastSyncPerformance {
     }
 }
 
+#[async_trait]
 impl NetworkTest for StateSyncFullnodeFastSyncPerformance {
-    fn run(&self, ctx: &mut NetworkContext<'_>) -> Result<()> {
-        let all_fullnodes = get_fullnodes_and_check_setup(ctx, self.name())?;
+    async fn run<'a>(&self, ctxa: NetworkContextSynchronizer<'a>) -> Result<()> {
+        let mut ctx_locker = ctxa.ctx.lock().await;
+        let ctx = ctx_locker.deref_mut();
+        let all_fullnodes = get_fullnodes_and_check_setup(ctx, self.name()).await?;
 
         // Emit a lot of traffic and ensure the fullnodes can all sync
-        emit_traffic_and_ensure_bounded_sync(ctx, &all_fullnodes)?;
+        emit_traffic_and_ensure_bounded_sync(ctx, &all_fullnodes).await?;
 
         // Wait for an epoch change to ensure fast sync can download all the latest states
         info!("Waiting for an epoch change.");
-        let runtime = Runtime::new().unwrap();
-        runtime.block_on(async {
-            ctx.swarm()
-                .wait_for_all_nodes_to_change_epoch(Duration::from_secs(MAX_EPOCH_CHANGE_SECS))
+        {
+            ctx.swarm
+                .read()
                 .await
-        })?;
+                .wait_for_all_nodes_to_change_epoch(Duration::from_secs(MAX_EPOCH_CHANGE_SECS))
+                .await?;
+        }
 
         // Get the highest known epoch in the chain
-        let highest_synced_epoch = runtime.block_on(async {
-            get_highest_synced_epoch(&ctx.swarm().get_all_nodes_clients_with_names())
+        let highest_synced_epoch = {
+            get_highest_synced_epoch(&ctx.swarm.read().await.get_all_nodes_clients_with_names())
                 .await
                 .unwrap_or(0)
-        });
+        };
         if highest_synced_epoch == 0 {
             return Err(anyhow::format_err!(
                 "The swarm has synced 0 epochs! Something has gone wrong!"
@@ -82,12 +90,19 @@ impl NetworkTest for StateSyncFullnodeFastSyncPerformance {
         }
 
         // Fetch the number of state values held on-chain
-        let fullnode_name = ctx.swarm().full_nodes().next().unwrap().name();
-        let prom_query = format!(
-            "{}{{instance=\"{}\"}}",
-            NUM_STATE_VALUE_COUNTER_NAME, &fullnode_name
-        );
-        let promql_result = runtime.block_on(ctx.swarm().query_metrics(&prom_query, None, None))?;
+        let prom_query = {
+            let swarm = ctx.swarm.read().await;
+            let fullnode_name = swarm.full_nodes().next().unwrap().name();
+            format!(
+                "{}{{instance=\"{}\"}}",
+                NUM_STATE_VALUE_COUNTER_NAME, &fullnode_name
+            )
+        };
+
+        let promql_result = {
+            let swarm = ctx.swarm.read().await;
+            swarm.query_metrics(&prom_query, None, None).await?
+        };
         let number_of_state_values = match promql_result.as_instant().unwrap().first() {
             Some(instant_vector) => instant_vector.sample().value() as u64,
             None => {
@@ -103,7 +118,7 @@ impl NetworkTest for StateSyncFullnodeFastSyncPerformance {
         );
 
         // Stop and reset the fullnodes so they start syncing from genesis
-        stop_and_reset_nodes(ctx, &all_fullnodes, &[])?;
+        stop_and_reset_nodes(ctx, &all_fullnodes, &[]).await?;
 
         // Wait for all nodes to catch up to the highest synced epoch
         // then calculate and display the throughput results.
@@ -129,15 +144,21 @@ impl Test for StateSyncValidatorPerformance {
     }
 }
 
+#[async_trait]
 impl NetworkTest for StateSyncValidatorPerformance {
-    fn run(&self, ctx: &mut NetworkContext<'_>) -> Result<()> {
+    async fn run<'a>(&self, ctxa: NetworkContextSynchronizer<'a>) -> Result<()> {
+        let mut ctx_locker = ctxa.ctx.lock().await;
+        let ctx = ctx_locker.deref_mut();
         // Verify we have at least 7 validators (i.e., 3f+1, where f is 2)
         // so we can kill 2 validators but still make progress.
-        let all_validators = ctx
-            .swarm()
-            .validators()
-            .map(|v| v.peer_id())
-            .collect::<Vec<_>>();
+        let all_validators = {
+            ctx.swarm
+                .read()
+                .await
+                .validators()
+                .map(|v| v.peer_id())
+                .collect::<Vec<_>>()
+        };
         let num_validators = all_validators.len();
         if num_validators < 7 {
             return Err(anyhow::format_err!(
@@ -155,12 +176,12 @@ impl NetworkTest for StateSyncValidatorPerformance {
         );
 
         // Generate some traffic through the validators.
-        emit_traffic_and_ensure_bounded_sync(ctx, &all_validators)?;
+        emit_traffic_and_ensure_bounded_sync(ctx, &all_validators).await?;
 
         // Stop and reset two validators so they start syncing from genesis
         info!("Deleting data for two validators!");
         let validators_to_reset = &all_validators[0..2];
-        stop_and_reset_nodes(ctx, &[], validators_to_reset)?;
+        stop_and_reset_nodes(ctx, &[], validators_to_reset).await?;
 
         // Wait for all nodes to catch up to the highest synced version
         // then calculate and display the throughput results.
@@ -170,16 +191,19 @@ impl NetworkTest for StateSyncValidatorPerformance {
 
 /// Verifies the setup for the given fullnode test and returns the
 /// set of fullnodes.
-fn get_fullnodes_and_check_setup(
-    ctx: &mut NetworkContext,
+async fn get_fullnodes_and_check_setup<'a>(
+    ctx: &mut NetworkContext<'a>,
     test_name: &'static str,
 ) -> Result<Vec<AccountAddress>> {
     // Verify we have at least 1 fullnode
-    let all_fullnodes = ctx
-        .swarm()
-        .full_nodes()
-        .map(|v| v.peer_id())
-        .collect::<Vec<_>>();
+    let all_fullnodes = {
+        ctx.swarm
+            .read()
+            .await
+            .full_nodes()
+            .map(|v| v.peer_id())
+            .collect::<Vec<_>>()
+    };
     if all_fullnodes.is_empty() {
         return Err(anyhow::format_err!(
             "Fullnode test {} requires at least 1 fullnode!",
@@ -191,7 +215,7 @@ fn get_fullnodes_and_check_setup(
     info!(
         "Running state sync test {:?} with {:?} validators and {:?} fullnodes.",
         test_name,
-        ctx.swarm().validators().count(),
+        ctx.swarm.read().await.validators().count(),
         all_fullnodes.len()
     );
 
@@ -200,8 +224,8 @@ fn get_fullnodes_and_check_setup(
 
 /// Emits traffic through all specified nodes and ensures all nodes can
 /// sync within a reasonable time bound.
-fn emit_traffic_and_ensure_bounded_sync(
-    ctx: &mut NetworkContext,
+async fn emit_traffic_and_ensure_bounded_sync<'a>(
+    ctx: &mut NetworkContext<'a>,
     nodes_to_send_traffic: &[AccountAddress],
 ) -> Result<()> {
     // Generate some traffic through the specified nodes.
@@ -211,52 +235,54 @@ fn emit_traffic_and_ensure_bounded_sync(
         "Generating the initial traffic for {:?} seconds.",
         emit_txn_duration.as_secs()
     );
-    let _txn_stat = generate_traffic(ctx, nodes_to_send_traffic, emit_txn_duration)?;
+    let _txn_stat = generate_traffic(ctx, nodes_to_send_traffic, emit_txn_duration).await?;
 
     // Wait for all nodes to synchronize. We time bound this to ensure
     // nodes don't fall too far behind.
     info!("Waiting for the validators and fullnodes to be synchronized.");
-    Runtime::new().unwrap().block_on(async {
-        ctx.swarm()
-            .wait_for_all_nodes_to_catchup(Duration::from_secs(MAX_NODE_LAG_SECS))
-            .await
-    })?;
+    ctx.swarm
+        .read()
+        .await
+        .wait_for_all_nodes_to_catchup(Duration::from_secs(MAX_NODE_LAG_SECS))
+        .await?;
 
     Ok(())
 }
 
 /// Stops and resets all specified nodes
-fn stop_and_reset_nodes(
-    ctx: &mut NetworkContext,
+async fn stop_and_reset_nodes<'a>(
+    ctx: &mut NetworkContext<'a>,
     fullnodes_to_reset: &[AccountAddress],
     validators_to_reset: &[AccountAddress],
 ) -> Result<()> {
-    let runtime = Runtime::new().unwrap();
-
     // Stop and reset all fullnodes
     info!("Deleting all fullnode data!");
     for fullnode_id in fullnodes_to_reset {
-        let fullnode = ctx.swarm().full_node_mut(*fullnode_id).unwrap();
-        runtime.block_on(async { fullnode.clear_storage().await })?;
+        let swarm = ctx.swarm.read().await;
+        let fullnode = swarm.full_node(*fullnode_id).unwrap();
+        fullnode.clear_storage().await?;
     }
 
     // Stop and reset all validators
     info!("Deleting all validator data!");
     for valdiator_id in validators_to_reset {
-        let validator = ctx.swarm().validator_mut(*valdiator_id).unwrap();
-        runtime.block_on(async { validator.clear_storage().await })?;
+        let swarm = ctx.swarm.read().await;
+        let validator = swarm.validator(*valdiator_id).unwrap();
+        validator.clear_storage().await?;
     }
 
     // Restart the fullnodes so they start syncing from a fresh state
     for fullnode_id in fullnodes_to_reset {
-        let fullnode = ctx.swarm().full_node_mut(*fullnode_id).unwrap();
-        runtime.block_on(async { fullnode.start().await })?;
+        let swarm = ctx.swarm.read().await;
+        let fullnode = swarm.full_node(*fullnode_id).unwrap();
+        fullnode.start().await?;
     }
 
     // Restart the validators so they start syncing from a fresh state
     for valdiator_id in validators_to_reset {
-        let validator = ctx.swarm().validator_mut(*valdiator_id).unwrap();
-        runtime.block_on(async { validator.start().await })?;
+        let swarm = ctx.swarm.read().await;
+        let validator = swarm.validator(*valdiator_id).unwrap();
+        validator.start().await?;
     }
 
     Ok(())
@@ -278,7 +304,9 @@ fn display_state_sync_state_throughput(
     // We allow up to half the test time to do this.
     let node_sync_duration = ctx.global_duration.checked_div(2).unwrap();
     runtime.block_on(async {
-        ctx.swarm()
+        ctx.swarm
+            .read()
+            .await
             .wait_for_all_nodes_to_catchup_to_epoch(highest_synced_epoch, node_sync_duration)
             .await
     })?;
@@ -320,7 +348,7 @@ fn ensure_state_sync_transaction_throughput(
     // Get the highest synced version for the chain
     let runtime = Runtime::new().unwrap();
     let highest_synced_version = runtime.block_on(async {
-        get_highest_synced_version(&ctx.swarm().get_all_nodes_clients_with_names())
+        get_highest_synced_version(&ctx.swarm.read().await.get_all_nodes_clients_with_names())
             .await
             .unwrap_or(0)
     });
@@ -334,7 +362,9 @@ fn ensure_state_sync_transaction_throughput(
     // We allow up to half the test time to do this.
     let node_sync_duration = ctx.global_duration.checked_div(2).unwrap();
     runtime.block_on(async {
-        ctx.swarm()
+        ctx.swarm
+            .read()
+            .await
             .wait_for_all_nodes_to_catchup(node_sync_duration)
             .await
     })?;
diff --git a/testsuite/testcases/src/three_region_simulation_test.rs b/testsuite/testcases/src/three_region_simulation_test.rs
index 916bbcc86c322..3fb63ef4972e4 100644
--- a/testsuite/testcases/src/three_region_simulation_test.rs
+++ b/testsuite/testcases/src/three_region_simulation_test.rs
@@ -3,10 +3,12 @@
 
 use crate::{LoadDestination, NetworkLoadTest};
 use aptos_forge::{
-    GroupNetworkBandwidth, GroupNetworkDelay, NetworkContext, NetworkTest, Swarm, SwarmChaos,
-    SwarmNetworkBandwidth, SwarmNetworkDelay, Test,
+    GroupNetworkBandwidth, GroupNetworkDelay, NetworkContext, NetworkContextSynchronizer,
+    NetworkTest, SwarmChaos, SwarmNetworkBandwidth, SwarmNetworkDelay, Test,
 };
 use aptos_logger::info;
+use aptos_types::account_address::AccountAddress;
+use async_trait::async_trait;
 
 /// Represents a test that simulates a network with 3 regions, all in the same cloud.
 pub struct ThreeRegionSameCloudSimulationTest;
@@ -22,9 +24,11 @@ impl Test for ThreeRegionSameCloudSimulationTest {
 /// 2. Each region has minimal network delay amongst its nodes
 /// 3. Each region has a network delay to the other two regions, as estimated by https://www.cloudping.co/grid
 /// 4. Currently simulating a 50 percentile network delay between us-west <--> af-south <--> eu-north
-fn create_three_region_swarm_network_delay(swarm: &dyn Swarm) -> SwarmNetworkDelay {
-    let all_validators = swarm.validators().map(|v| v.peer_id()).collect::<Vec<_>>();
-
+///
+/// This is deprecated and flawed. Use [crate::multi_region_network_test::MultiRegionNetworkEmulationTest] instead
+fn create_three_region_swarm_network_delay(
+    all_validators: Vec<AccountAddress>,
+) -> SwarmNetworkDelay {
     // each region has 1/3 of the validators
     let region_size = all_validators.len() / 3;
     let mut us_west = all_validators;
@@ -80,29 +84,40 @@ fn create_bandwidth_limit() -> SwarmNetworkBandwidth {
     }
 }
 
+#[async_trait]
 impl NetworkLoadTest for ThreeRegionSameCloudSimulationTest {
-    fn setup(&self, ctx: &mut NetworkContext) -> anyhow::Result<LoadDestination> {
+    async fn setup<'a>(&self, ctx: &mut NetworkContext<'a>) -> anyhow::Result<LoadDestination> {
         // inject network delay
-        let delay = create_three_region_swarm_network_delay(ctx.swarm());
+        let all_validators = {
+            ctx.swarm
+                .read()
+                .await
+                .validators()
+                .map(|v| v.peer_id())
+                .collect::<Vec<_>>()
+        };
+        let delay = create_three_region_swarm_network_delay(all_validators);
+        let mut swarm = ctx.swarm.write().await;
         let chaos = SwarmChaos::Delay(delay);
-        ctx.runtime.block_on(ctx.swarm.inject_chaos(chaos))?;
+        swarm.inject_chaos(chaos).await?;
 
         // inject bandwidth limit
         let bandwidth = create_bandwidth_limit();
         let chaos = SwarmChaos::Bandwidth(bandwidth);
-        ctx.runtime.block_on(ctx.swarm.inject_chaos(chaos))?;
+        swarm.inject_chaos(chaos).await?;
 
         Ok(LoadDestination::FullnodesOtherwiseValidators)
     }
 
-    fn finish(&self, ctx: &mut NetworkContext) -> anyhow::Result<()> {
-        ctx.runtime.block_on(ctx.swarm.remove_all_chaos())?;
+    async fn finish<'a>(&self, ctx: &mut NetworkContext<'a>) -> anyhow::Result<()> {
+        ctx.swarm.write().await.remove_all_chaos().await?;
         Ok(())
     }
 }
 
+#[async_trait]
 impl NetworkTest for ThreeRegionSameCloudSimulationTest {
-    fn run(&self, ctx: &mut NetworkContext<'_>) -> anyhow::Result<()> {
-        <dyn NetworkLoadTest>::run(self, ctx)
+    async fn run<'a>(&self, ctx: NetworkContextSynchronizer<'a>) -> anyhow::Result<()> {
+        <dyn NetworkLoadTest>::run(self, ctx).await
     }
 }
diff --git a/testsuite/testcases/src/twin_validator_test.rs b/testsuite/testcases/src/twin_validator_test.rs
index 53905027f22b5..0cd9a50ae9afd 100644
--- a/testsuite/testcases/src/twin_validator_test.rs
+++ b/testsuite/testcases/src/twin_validator_test.rs
@@ -3,10 +3,13 @@
 
 use crate::NetworkLoadTest;
 use anyhow::Context;
-use aptos_forge::{NetworkContext, NetworkTest, NodeExt, Test};
+use aptos_forge::{NetworkContextSynchronizer, NetworkTest, NodeExt, Test};
 use aptos_sdk::move_types::account_address::AccountAddress;
-use std::time::{Duration, Instant};
-use tokio::runtime::Runtime;
+use async_trait::async_trait;
+use std::{
+    ops::DerefMut,
+    time::{Duration, Instant},
+};
 
 pub struct TwinValidatorTest;
 
@@ -18,57 +21,62 @@ impl Test for TwinValidatorTest {
 
 impl NetworkLoadTest for TwinValidatorTest {}
 
+#[async_trait]
 impl NetworkTest for TwinValidatorTest {
-    fn run(&self, ctx: &mut NetworkContext<'_>) -> anyhow::Result<()> {
-        let runtime = Runtime::new().unwrap();
+    async fn run<'a>(&self, ctxa: NetworkContextSynchronizer<'a>) -> anyhow::Result<()> {
+        {
+            let mut ctx_locker = ctxa.ctx.lock().await;
+            let ctx = ctx_locker.deref_mut();
+
+            let all_validators_ids = {
+                ctx.swarm
+                    .read()
+                    .await
+                    .validators()
+                    .map(|v| v.peer_id())
+                    .collect::<Vec<_>>()
+            };
+            let validator_count = all_validators_ids.len();
+            let twin_count = 2;
 
-        let all_validators_ids = ctx
-            .swarm()
-            .validators()
-            .map(|v| v.peer_id())
-            .collect::<Vec<_>>();
-        let validator_count = all_validators_ids.len();
-        let twin_count = 2;
-        runtime.block_on(async {
             for i in 0..twin_count {
                 let main_id: AccountAddress = all_validators_ids[i];
                 let twin_id = all_validators_ids[i + validator_count - twin_count];
-                ctx.swarm()
-                    .validator_mut(twin_id)
+                let swarm = ctx.swarm.read().await;
+                swarm
+                    .validator(twin_id)
                     .unwrap()
                     .clear_storage()
                     .await
                     .context(format!(
                         "Error while clearing storage and stopping {twin_id}"
                     ))?;
-                let main_identity = ctx
-                    .swarm()
-                    .validator_mut(main_id)
+                let main_identity = swarm
+                    .validator(main_id)
                     .unwrap()
                     .get_identity()
                     .await
                     .context(format!("Error while getting identity for {main_id}"))?;
-                ctx.swarm()
-                    .validator_mut(twin_id)
+                swarm
+                    .validator(twin_id)
                     .unwrap()
                     .set_identity(main_identity)
                     .await
                     .context(format!("Error while setting identity for {twin_id}"))?;
-                ctx.swarm()
-                    .validator_mut(twin_id)
+                swarm
+                    .validator(twin_id)
                     .unwrap()
                     .start()
                     .await
                     .context(format!("Error while starting {twin_id}"))?;
-                ctx.swarm()
-                    .validator_mut(twin_id)
+                swarm
+                    .validator(twin_id)
                     .unwrap()
                     .wait_until_healthy(Instant::now() + Duration::from_secs(300))
                     .await
                     .context(format!("Error while waiting for {twin_id}"))?;
             }
-            Ok::<(), anyhow::Error>(())
-        })?;
-        <dyn NetworkLoadTest>::run(self, ctx)
+        }
+        <dyn NetworkLoadTest>::run(self, ctxa).await
     }
 }
diff --git a/testsuite/testcases/src/two_traffics_test.rs b/testsuite/testcases/src/two_traffics_test.rs
index dd824174a4ee9..c69de2eaa7da5 100644
--- a/testsuite/testcases/src/two_traffics_test.rs
+++ b/testsuite/testcases/src/two_traffics_test.rs
@@ -2,15 +2,16 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{
-    create_emitter_and_request, traffic_emitter_runtime, LoadDestination, NetworkLoadTest,
+    create_buffered_load, LoadDestination, NetworkLoadTest, COOLDOWN_DURATION_FRACTION,
+    WARMUP_DURATION_FRACTION,
 };
 use aptos_forge::{
     success_criteria::{SuccessCriteria, SuccessCriteriaChecker},
-    EmitJobRequest, NetworkContext, NetworkTest, Result, Swarm, Test, TestReport,
+    EmitJobRequest, NetworkContextSynchronizer, NetworkTest, Result, Swarm, Test, TestReport,
 };
 use aptos_logger::info;
-use rand::{rngs::OsRng, Rng, SeedableRng};
-use std::time::{Duration, Instant};
+use async_trait::async_trait;
+use std::{sync::Arc, time::Duration};
 
 pub struct TwoTrafficsTest {
     pub inner_traffic: EmitJobRequest,
@@ -23,10 +24,11 @@ impl Test for TwoTrafficsTest {
     }
 }
 
+#[async_trait]
 impl NetworkLoadTest for TwoTrafficsTest {
-    fn test(
+    async fn test(
         &self,
-        swarm: &mut dyn Swarm,
+        swarm: Arc<tokio::sync::RwLock<Box<dyn Swarm>>>,
         report: &mut TestReport,
         duration: Duration,
     ) -> Result<()> {
@@ -34,51 +36,44 @@ impl NetworkLoadTest for TwoTrafficsTest {
             "Running TwoTrafficsTest test for duration {}s",
             duration.as_secs_f32()
         );
-        let nodes_to_send_load_to =
-            LoadDestination::FullnodesOtherwiseValidators.get_destination_nodes(swarm);
-        let rng = ::rand::rngs::StdRng::from_seed(OsRng.gen());
+        let nodes_to_send_load_to = LoadDestination::FullnodesOtherwiseValidators
+            .get_destination_nodes(swarm.clone())
+            .await;
 
-        let (emitter, emit_job_request) = create_emitter_and_request(
+        let stats_by_phase = create_buffered_load(
             swarm,
-            self.inner_traffic.clone(),
             &nodes_to_send_load_to,
-            rng,
-        )?;
-
-        let rt = traffic_emitter_runtime()?;
-
-        let test_start = Instant::now();
-
-        let stats = rt.block_on(emitter.emit_txn_for(
-            swarm.chain_info().root_account,
-            emit_job_request,
+            self.inner_traffic.clone(),
             duration,
-        ))?;
-
-        let actual_test_duration = test_start.elapsed();
-        info!(
-            "End to end duration: {}s, while txn emitter lasted: {}s",
-            actual_test_duration.as_secs(),
-            stats.lasted.as_secs()
-        );
+            WARMUP_DURATION_FRACTION,
+            COOLDOWN_DURATION_FRACTION,
+            None,
+            None,
+        )
+        .await?;
 
-        let rate = stats.rate();
+        for phase_stats in stats_by_phase.into_iter() {
+            report.report_txn_stats(
+                format!("{}: inner traffic", self.name()),
+                &phase_stats.emitter_stats,
+            );
 
-        report.report_txn_stats(format!("{}: inner traffic", self.name()), &stats);
+            SuccessCriteriaChecker::check_core_for_success(
+                &self.inner_success_criteria,
+                report,
+                &phase_stats.emitter_stats.rate(),
+                None,
+                Some("inner traffic".to_string()),
+            )?;
+        }
 
-        SuccessCriteriaChecker::check_core_for_success(
-            &self.inner_success_criteria,
-            report,
-            &rate,
-            None,
-            Some("inner traffic".to_string()),
-        )?;
         Ok(())
     }
 }
 
+#[async_trait]
 impl NetworkTest for TwoTrafficsTest {
-    fn run(&self, ctx: &mut NetworkContext<'_>) -> Result<()> {
-        <dyn NetworkLoadTest>::run(self, ctx)
+    async fn run<'a>(&self, ctx: NetworkContextSynchronizer<'a>) -> Result<()> {
+        <dyn NetworkLoadTest>::run(self, ctx).await
     }
 }
diff --git a/testsuite/testcases/src/validator_join_leave_test.rs b/testsuite/testcases/src/validator_join_leave_test.rs
index 092871293febc..edf9c59fc62c5 100644
--- a/testsuite/testcases/src/validator_join_leave_test.rs
+++ b/testsuite/testcases/src/validator_join_leave_test.rs
@@ -4,15 +4,15 @@
 use crate::{LoadDestination, NetworkLoadTest};
 use aptos::{account::create::DEFAULT_FUNDED_COINS, test::CliTestFramework};
 use aptos_forge::{
-    reconfig, NetworkContext, NetworkTest, NodeExt, Result, Swarm, SwarmExt, Test, TestReport,
-    FORGE_KEY_SEED,
+    reconfig, NetworkContext, NetworkContextSynchronizer, NetworkTest, NodeExt, Result, Swarm,
+    SwarmExt, Test, TestReport, FORGE_KEY_SEED,
 };
 use aptos_keygen::KeyGen;
 use aptos_logger::info;
 use aptos_sdk::crypto::{ed25519::Ed25519PrivateKey, PrivateKey};
 use aptos_types::{account_address::AccountAddress, transaction::authenticator::AuthenticationKey};
-use std::time::Duration;
-use tokio::runtime::Runtime;
+use async_trait::async_trait;
+use std::{sync::Arc, time::Duration};
 
 const MAX_NODE_LAG_SECS: u64 = 360;
 
@@ -24,20 +24,21 @@ impl Test for ValidatorJoinLeaveTest {
     }
 }
 
+#[async_trait]
 impl NetworkLoadTest for ValidatorJoinLeaveTest {
-    fn setup(&self, _ctx: &mut NetworkContext) -> Result<LoadDestination> {
+    async fn setup<'a>(&self, _ctx: &mut NetworkContext<'a>) -> Result<LoadDestination> {
         Ok(LoadDestination::FullnodesOtherwiseValidators)
     }
 
-    fn test(
+    async fn test(
         &self,
-        swarm: &mut dyn Swarm,
+        swarm: Arc<tokio::sync::RwLock<Box<dyn Swarm>>>,
         _report: &mut TestReport,
         duration: Duration,
     ) -> Result<()> {
         // Verify we have at least 7 validators (i.e., 3f+1, where f is 2)
         // so we can lose 2 validators but still make progress.
-        let num_validators = swarm.validators().count();
+        let num_validators = { swarm.read().await.validators().count() };
         if num_validators < 7 {
             return Err(anyhow::format_err!(
                 "ValidatorSet leaving and rejoining test require at least 7 validators! Given: {:?}.",
@@ -47,20 +48,23 @@ impl NetworkLoadTest for ValidatorJoinLeaveTest {
 
         let faucet_endpoint: reqwest::Url = "http://localhost:8081".parse().unwrap();
         // Connect the operator tool to the node's JSON RPC API
-        let rest_client = swarm.validators().next().unwrap().rest_client();
-        let transaction_factory = swarm.chain_info().transaction_factory();
-        let runtime = Runtime::new().unwrap();
-
-        let mut cli = runtime.block_on(async {
-            CliTestFramework::new(
-                swarm.validators().next().unwrap().rest_api_endpoint(),
-                faucet_endpoint,
-                /*num_cli_accounts=*/ 0,
-            )
-            .await
-        });
-
-        let mut public_info = swarm.chain_info().into_aptos_public_info();
+        let transaction_factory = { swarm.read().await.chain_info().transaction_factory() };
+
+        let (rest_client, rest_api_endpoint) = {
+            let swarm = swarm.read().await;
+            let first_validator = swarm.validators().next().unwrap();
+            let rest_client = first_validator.rest_client();
+            let rest_api_endpoint = first_validator.rest_api_endpoint();
+            (rest_client, rest_api_endpoint)
+        };
+        let mut cli = CliTestFramework::new(
+            rest_api_endpoint,
+            faucet_endpoint,
+            /*num_cli_accounts=*/ 0,
+        )
+        .await;
+
+        let mut public_info = { swarm.read().await.chain_info().into_aptos_public_info() };
 
         let mut validator_cli_indices = Vec::new();
 
@@ -77,30 +81,25 @@ impl NetworkLoadTest for ValidatorJoinLeaveTest {
 
             let mut keygen = KeyGen::from_seed(seed_slice);
 
-            let (validator_cli_index, _keys, account_balance) = runtime.block_on(async {
-                let (validator_cli_index, keys) =
-                    init_validator_account(&mut cli, &mut keygen).await;
-
-                let auth_key = AuthenticationKey::ed25519(&keys.account_private_key.public_key());
-                let validator_account_address = AccountAddress::new(*auth_key.account_address());
+            let (validator_cli_index, keys) = init_validator_account(&mut cli, &mut keygen).await;
 
-                public_info
-                    .mint(validator_account_address, DEFAULT_FUNDED_COINS)
-                    .await
-                    .unwrap();
+            let auth_key = AuthenticationKey::ed25519(&keys.account_private_key.public_key());
+            let validator_account_address = AccountAddress::new(*auth_key.account_address());
 
-                let account_balance = public_info
-                    .get_balance(validator_account_address)
-                    .await
-                    .unwrap();
+            public_info
+                .mint(validator_account_address, DEFAULT_FUNDED_COINS)
+                .await
+                .unwrap();
 
-                (validator_cli_index, keys, account_balance)
-            });
+            let account_balance = public_info
+                .get_balance(validator_account_address)
+                .await
+                .unwrap();
             assert_eq!(account_balance, DEFAULT_FUNDED_COINS);
             validator_cli_indices.push(validator_cli_index);
 
             assert_eq!(
-                runtime.block_on(get_validator_state(&cli, validator_cli_index)),
+                get_validator_state(&cli, validator_cli_index).await,
                 ValidatorState::ACTIVE
             );
         }
@@ -114,79 +113,66 @@ impl NetworkLoadTest for ValidatorJoinLeaveTest {
 
         // Wait for all nodes to synchronize and stabilize.
         info!("Waiting for the validators to be synchronized.");
-        runtime.block_on(async {
+        {
             swarm
-                .wait_for_all_nodes_to_catchup(Duration::from_secs(MAX_NODE_LAG_SECS))
+                .read()
                 .await
-        })?;
+                .wait_for_all_nodes_to_catchup(Duration::from_secs(MAX_NODE_LAG_SECS))
+                .await?;
+        }
 
         // Wait for 1/3 of the test duration.
-        std::thread::sleep(duration / 3);
-
-        runtime.block_on(async {
-            // 1/3 validators leave the validator set.
-            info!("Make the last 1/3 validators leave the validator set!");
-            for operator_index in validator_cli_indices.iter().rev().take(num_validators / 3) {
-                cli.leave_validator_set(*operator_index, None)
-                    .await
-                    .unwrap();
-
-                reconfig(
-                    &rest_client,
-                    &transaction_factory,
-                    swarm.chain_info().root_account(),
-                )
-                .await;
-            }
-
-            reconfig(
-                &rest_client,
-                &transaction_factory,
-                swarm.chain_info().root_account(),
-            )
-            .await;
-        });
+        tokio::time::sleep(duration / 3).await;
+
+        // 1/3 validators leave the validator set.
+        info!("Make the last 1/3 validators leave the validator set!");
+        for operator_index in validator_cli_indices.iter().rev().take(num_validators / 3) {
+            cli.leave_validator_set(*operator_index, None)
+                .await
+                .unwrap();
+
+            let root_account = swarm.read().await.chain_info().root_account();
+            reconfig(&rest_client, &transaction_factory, root_account).await;
+        }
+
+        {
+            let root_account = swarm.read().await.chain_info().root_account();
+            reconfig(&rest_client, &transaction_factory, root_account).await;
+        }
 
         // Wait for 1/3 of the test duration.
-        std::thread::sleep(duration / 3);
-
-        runtime.block_on(async {
-            // Rejoining validator set.
-            info!("Make the last 1/3 validators rejoin the validator set!");
-            for operator_index in validator_cli_indices.iter().rev().take(num_validators / 3) {
-                cli.join_validator_set(*operator_index, None).await.unwrap();
-
-                reconfig(
-                    &rest_client,
-                    &transaction_factory,
-                    swarm.chain_info().root_account(),
-                )
-                .await;
-            }
-
-            reconfig(
-                &rest_client,
-                &transaction_factory,
-                swarm.chain_info().root_account(),
-            )
-            .await;
-        });
+        tokio::time::sleep(duration / 3).await;
+
+        // Rejoining validator set.
+        info!("Make the last 1/3 validators rejoin the validator set!");
+        for operator_index in validator_cli_indices.iter().rev().take(num_validators / 3) {
+            cli.join_validator_set(*operator_index, None).await.unwrap();
+
+            let root_account = swarm.read().await.chain_info().root_account();
+            reconfig(&rest_client, &transaction_factory, root_account).await;
+        }
+
+        {
+            let root_account = swarm.read().await.chain_info().root_account();
+            reconfig(&rest_client, &transaction_factory, root_account).await;
+        }
 
         // Wait for all nodes to synchronize and stabilize.
         info!("Waiting for the validators to be synchronized.");
-        runtime.block_on(async {
-            swarm
-                .wait_for_all_nodes_to_catchup(Duration::from_secs(MAX_NODE_LAG_SECS))
-                .await
-        })?;
+        swarm
+            .read()
+            .await
+            .wait_for_all_nodes_to_catchup(Duration::from_secs(MAX_NODE_LAG_SECS))
+            .await?;
 
         Ok(())
     }
 }
 
+#[async_trait]
 impl NetworkTest for ValidatorJoinLeaveTest {
-    fn run(&self, ctx: &mut NetworkContext<'_>) -> Result<()> {
-        <dyn NetworkLoadTest>::run(self, ctx)
+    async fn run<'a>(&self, ctx: NetworkContextSynchronizer<'a>) -> Result<()> {
+        <dyn NetworkLoadTest>::run(self, ctx).await
     }
 }
 
diff --git a/testsuite/testcases/src/validator_reboot_stress_test.rs b/testsuite/testcases/src/validator_reboot_stress_test.rs
index 9355ac97a99d8..1a83dde6f908c 100644
--- a/testsuite/testcases/src/validator_reboot_stress_test.rs
+++ b/testsuite/testcases/src/validator_reboot_stress_test.rs
@@ -2,10 +2,11 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::NetworkLoadTest;
-use aptos_forge::{NetworkContext, NetworkTest, Result, Swarm, Test, TestReport};
+use aptos_forge::{NetworkContextSynchronizer, NetworkTest, Result, Swarm, Test, TestReport};
+use async_trait::async_trait;
 use rand::{seq::SliceRandom, thread_rng};
-use std::time::Duration;
-use tokio::{runtime::Runtime, time::Instant};
+use std::{sync::Arc, time::Duration};
+use tokio::time::Instant;
 
 pub struct ValidatorRebootStressTest {
     pub num_simultaneously: usize,
@@ -19,40 +20,50 @@ impl Test for ValidatorRebootStressTest {
     }
 }
 
+#[async_trait]
 impl NetworkLoadTest for ValidatorRebootStressTest {
-    fn test(
+    async fn test(
         &self,
-        swarm: &mut dyn Swarm,
+        swarm: Arc<tokio::sync::RwLock<Box<dyn Swarm>>>,
         _report: &mut TestReport,
         duration: Duration,
     ) -> Result<()> {
         let start = Instant::now();
-        let runtime = Runtime::new().unwrap();
 
-        let all_validators = swarm.validators().map(|v| v.peer_id()).collect::<Vec<_>>();
-
-        let mut rng = thread_rng();
+        let all_validators = {
+            swarm
+                .read()
+                .await
+                .validators()
+                .map(|v| v.peer_id())
+                .collect::<Vec<_>>()
+        };
 
         while start.elapsed() < duration {
-            let addresses: Vec<_> = all_validators
-                .choose_multiple(&mut rng, self.num_simultaneously)
-                .cloned()
-                .collect();
+            let addresses: Vec<_> = {
+                let mut rng = thread_rng();
+                all_validators
+                    .choose_multiple(&mut rng, self.num_simultaneously)
+                    .cloned()
+                    .collect()
+            };
             for adr in &addresses {
-                let validator_to_reboot = swarm.validator_mut(*adr).unwrap();
-                runtime.block_on(async { validator_to_reboot.stop().await })?;
+                let swarm = swarm.read().await;
+                let validator_to_reboot = swarm.validator(*adr).unwrap();
+                validator_to_reboot.stop().await?;
             }
             if self.down_time_secs > 0.0 {
-                std::thread::sleep(Duration::from_secs_f32(self.down_time_secs));
+                tokio::time::sleep(Duration::from_secs_f32(self.down_time_secs)).await;
             }
 
             for adr in &addresses {
-                let validator_to_reboot = swarm.validator_mut(*adr).unwrap();
-                runtime.block_on(async { validator_to_reboot.start().await })?;
+                let swarm = swarm.read().await;
+                let validator_to_reboot = swarm.validator(*adr).unwrap();
+                validator_to_reboot.start().await?;
             }
 
             if self.pause_secs > 0.0 {
-                std::thread::sleep(Duration::from_secs_f32(self.pause_secs));
+                tokio::time::sleep(Duration::from_secs_f32(self.pause_secs)).await;
             }
         }
 
@@ -60,8 +71,9 @@ impl NetworkLoadTest for ValidatorRebootStressTest {
     }
 }
 
+#[async_trait]
 impl NetworkTest for ValidatorRebootStressTest {
-    fn run(&self, ctx: &mut NetworkContext<'_>) -> Result<()> {
-        <dyn NetworkLoadTest>::run(self, ctx)
+    async fn run<'a>(&self, ctx: NetworkContextSynchronizer<'a>) -> Result<()> {
+        <dyn NetworkLoadTest>::run(self, ctx).await
     }
 }
diff --git a/testsuite/testcases/tests/forge-local-performance.rs b/testsuite/testcases/tests/forge-local-performance.rs
index df5e682180b00..2243399b0aaa0 100644
--- a/testsuite/testcases/tests/forge-local-performance.rs
+++ b/testsuite/testcases/tests/forge-local-performance.rs
@@ -24,8 +24,10 @@ fn main() -> Result<()> {
         )
         .with_success_criteria(SuccessCriteria::new(20).add_chain_progress(
             StateProgressThreshold {
-                max_no_progress_secs: 0.0,
-                max_round_gap: 0,
+                max_non_epoch_no_progress_secs: 0.0,
+                max_epoch_no_progress_secs: 0.0,
+                max_non_epoch_round_gap: 0,
+                max_epoch_round_gap: 0,
             },
         ));
 
diff --git a/testsuite/verify_core/common.py b/testsuite/verify_core/common.py
index a7ae25d42fccc..ed92129d1cd01 100644
--- a/testsuite/verify_core/common.py
+++ b/testsuite/verify_core/common.py
@@ -39,7 +39,9 @@ def clear_artifacts():
         shutil.rmtree(f)
 
 
-def query_backup_latest_version(backup_config_template_path: str) -> int:
+def warm_cache_and_get_latest_backup_version(
+    backup_config_template_path: str,
+) -> int:
     """query latest version in backup, at the same time, pre-heat metadata cache"""
     db_backup_result = subprocess.Popen(
         [
diff --git a/third_party/move/evm/move-to-yul/src/dispatcher_generator.rs b/third_party/move/evm/move-to-yul/src/dispatcher_generator.rs
index 1ca6dbf6725b1..e728bce8e0f2c 100644
--- a/third_party/move/evm/move-to-yul/src/dispatcher_generator.rs
+++ b/third_party/move/evm/move-to-yul/src/dispatcher_generator.rs
@@ -67,7 +67,7 @@ impl Generator {
     ) {
         emitln!(ctx.writer, "if iszero(lt(calldatasize(), 4))");
         let mut selectors = BTreeMap::new();
-        let para_vec = vec!["calldataload(0)".to_string(), "224".to_string()];
+        let para_vec = ["calldataload(0)".to_string(), "224".to_string()];
         let shr224 = self.call_builtin_str(ctx, YulFunction::Shr, para_vec.iter().cloned());
         ctx.emit_block(|| {
             emitln!(ctx.writer, "let selector := {}", shr224);
@@ -528,7 +528,7 @@ impl Generator {
                     .enumerate()
                 {
                     let is_static = ty.is_static();
-                    let local_typ_var = vec![ret_var[stack_pos].clone()];
+                    let local_typ_var = [ret_var[stack_pos].clone()];
                     let abi_decode_type =
                         gen.generate_abi_decoding_type(ctx, ty, move_ty, from_memory);
                     ctx.emit_block(|| {
@@ -631,7 +631,7 @@ impl Generator {
                 {
                     let is_static = ty.is_static();
                     // TODO: consider the case size_on_stack is not 1
-                    let local_typ_var = vec![ret_var[stack_pos].clone()];
+                    let local_typ_var = [ret_var[stack_pos].clone()];
                     let abi_decode_type =
                         gen.generate_abi_decoding_type(ctx, ty, move_ty, from_memory);
                     ctx.emit_block(|| {
@@ -1453,7 +1453,7 @@ impl Generator {
                     .enumerate()
                 {
                     let is_static = ty.is_static();
-                    let local_typ_var = vec![ret_var[stack_pos].clone()];
+                    let local_typ_var = [ret_var[stack_pos].clone()];
                     let memory_func = ctx.memory_load_builtin_fun(move_ty);
                     if local_typ_var.len() == 1 {
                         emitln!(
diff --git a/third_party/move/evm/move-to-yul/src/external_functions.rs b/third_party/move/evm/move-to-yul/src/external_functions.rs
index 13efc1c441aba..b95742686d66d 100644
--- a/third_party/move/evm/move-to-yul/src/external_functions.rs
+++ b/third_party/move/evm/move-to-yul/src/external_functions.rs
@@ -122,7 +122,7 @@ impl NativeFunctions {
             let fun_sig = format!("{}", sig);
             let function_selector =
                 format!("0x{:x}", Keccak256::digest(fun_sig.as_bytes()))[..10].to_string();
-            let para_vec = vec![function_selector, "224".to_string()];
+            let para_vec = [function_selector, "224".to_string()];
             let shl224 =
                 gen.parent
                     .call_builtin_str(ctx, YulFunction::Shl, para_vec.iter().cloned());
diff --git a/third_party/move/evm/move-to-yul/src/functions.rs b/third_party/move/evm/move-to-yul/src/functions.rs
index 9a59a5b90dd28..7e24f6757b828 100644
--- a/third_party/move/evm/move-to-yul/src/functions.rs
+++ b/third_party/move/evm/move-to-yul/src/functions.rs
@@ -548,6 +548,12 @@ impl<'a> FunctionGenerator<'a> {
 
                     // Unimplemented
                     Vector => unimplemented!("vector"),
+                    TestVariant(..)
+                    | PackVariant(..)
+                    | UnpackVariant(..)
+                    | BorrowVariantField(..) => {
+                        unimplemented!("variants")
+                    },
 
                     // Specification or other operations which can be ignored here
                     Release
diff --git a/third_party/move/evm/move-to-yul/tests/AccountStateMachine.v2_exp b/third_party/move/evm/move-to-yul/tests/AccountStateMachine.v2_exp
new file mode 100644
index 0000000000000..08f39e05a23f3
--- /dev/null
+++ b/third_party/move/evm/move-to-yul/tests/AccountStateMachine.v2_exp
@@ -0,0 +1,1138 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A3_AccountStateMachine" {
+    code {
+        mstore(0, memoryguard(160))
+        let $new_value := A3_AccountStateMachine_init()
+        {
+            let $base_offset := $MakeTypeStorageBase(0, 0x330750a9, address())
+            if $AlignedStorageLoad($base_offset) {
+              $AbortBuiltin()
+            }
+            $AlignedStorageStore($base_offset, true)
+            {
+                let $dst := add($base_offset, 32)
+                let $src := $new_value
+                {
+                    let $linked_src_37500119 := mload(add($src, 0))
+                    let $linked_dst_37500119 := $NewLinkedStorageBase(0x23c34d7)
+                    let $size_37500119 := $MemoryLoadU64($linked_src_37500119)
+                    let $data_size_37500119 := mul($size_37500119, 32)
+                    $AlignedStorageStore($linked_dst_37500119, mload($linked_src_37500119))
+                    let $data_src_37500119 := add($linked_src_37500119, 32)
+                    let $data_dst_37500119 := add($linked_dst_37500119, 32)
+                    for { let $offs_37500119 := 0 } lt($offs_37500119, $data_size_37500119) { $offs_37500119 := add($offs_37500119, 32)} {
+                        {
+                            let $linked_src_1341933877 := mload(add($offs_37500119, $data_src_37500119))
+                            let $linked_dst_1341933877 := $NewLinkedStorageBase(0x4ffc4935)
+                            $AlignedStorageStore(add($linked_dst_1341933877, 0), mload(add($linked_src_1341933877, 0)))
+                            $Free($linked_src_1341933877, 32)
+                            $AlignedStorageStore(add($data_dst_37500119, $offs_37500119), $linked_dst_1341933877)
+                        }
+                        $Free($linked_src_37500119, add($data_size_37500119, 32))
+                    }
+                    $AlignedStorageStore(add($dst, 0), $linked_dst_37500119)
+                }
+                $AlignedStorageStore(add($dst, 32), mload(add($src, 32)))
+                $Free($src, 48)
+            }
+        }
+        codecopy(0, dataoffset("A3_AccountStateMachine_deployed"), datasize("A3_AccountStateMachine_deployed"))
+        return(0, datasize("A3_AccountStateMachine_deployed"))
+        function A3_AccountStateMachine_init() -> $result {
+            let $t0, $t1, $t2, $t3
+            // $t0 := 0
+            $t0 := 0
+            // $t1 := 0
+            $t1 := 0
+            // $t2 := vector::empty<AccountStateMachine::PendingTransfer>()
+            $t2 := A1_vector_empty$A3_AccountStateMachine_PendingTransfer$()
+            // $t3 := pack AccountStateMachine::Account($t0, $t1, $t2)
+            {
+                let $mem := $Malloc(48)
+                $MemoryStoreU64(add($mem, 32), $t0)
+                $MemoryStoreU64(add($mem, 40), $t1)
+                $MemoryStoreU256(add($mem, 0), $t2)
+                $t3 := $mem
+            }
+            // return $t3
+            $result := $t3
+        }
+
+        function A1_vector_empty$A3_AccountStateMachine_PendingTransfer$() -> vector {
+            vector := $Malloc(96)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+    }
+    object "A3_AccountStateMachine_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                case 0x3cecd719
+                {
+                    // cleanup()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let $base_offset := $MakeTypeStorageBase(0, 0x330750a9, address())
+                    if iszero($AlignedStorageLoad($base_offset)) {
+                      $AbortBuiltin()
+                    }
+                    A3_AccountStateMachine_cleanup($MakePtr(true, add($base_offset, 32)))
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x13765838
+                {
+                    // deposit(uint64)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint64$_$u64$(4, calldatasize())
+                    let $base_offset := $MakeTypeStorageBase(0, 0x330750a9, address())
+                    if iszero($AlignedStorageLoad($base_offset)) {
+                      $AbortBuiltin()
+                    }
+                    A3_AccountStateMachine_deposit($MakePtr(true, add($base_offset, 32)), param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x750f0acc
+                {
+                    // withdraw(uint64)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint64$_$u64$(4, calldatasize())
+                    let $base_offset := $MakeTypeStorageBase(0, 0x330750a9, address())
+                    if iszero($AlignedStorageLoad($base_offset)) {
+                      $AbortBuiltin()
+                    }
+                    A3_AccountStateMachine_withdraw($MakePtr(true, add($base_offset, 32)), param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x2bcc3f98
+                {
+                    // xfer(address,uint64)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1 := abi_decode_tuple_$address_uint64$_$address_u64$(4, calldatasize())
+                    let $base_offset := $MakeTypeStorageBase(0, 0x330750a9, address())
+                    if iszero($AlignedStorageLoad($base_offset)) {
+                      $AbortBuiltin()
+                    }
+                    A3_AccountStateMachine_xfer($MakePtr(true, add($base_offset, 32)), param_0, param_1)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x02852d52
+                {
+                    // xfer_deposit(uint64,address,uint64)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1, param_2 := abi_decode_tuple_$uint64_address_uint64$_$u64_address_u64$(4, calldatasize())
+                    let $base_offset := $MakeTypeStorageBase(0, 0x330750a9, address())
+                    if iszero($AlignedStorageLoad($base_offset)) {
+                      $AbortBuiltin()
+                    }
+                    A3_AccountStateMachine_xfer_deposit($MakePtr(true, add($base_offset, 32)), param_0, param_1, param_2)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x8c38542c
+                {
+                    // xfer_finish(uint64)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint64$_$u64$(4, calldatasize())
+                    let $base_offset := $MakeTypeStorageBase(0, 0x330750a9, address())
+                    if iszero($AlignedStorageLoad($base_offset)) {
+                      $AbortBuiltin()
+                    }
+                    A3_AccountStateMachine_xfer_finish($MakePtr(true, add($base_offset, 32)), param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                default {}
+            }
+            $Abort(97)
+            function A3_AccountStateMachine_cleanup(this) {
+                let tmp_$1, i, p, pending, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19
+                let $block := 3
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L6
+                        // $t7 := freeze_ref($t5)
+                        $t7 := $t5
+                        // $t8 := vector::length<AccountStateMachine::PendingTransfer>($t7)
+                        $t8 := A1_vector_length$A3_AccountStateMachine_PendingTransfer$($t7)
+                        // $t9 := <($t2, $t8)
+                        $t9 := $Lt(i, $t8)
+                        // if ($t9) goto L1 else goto L0
+                        switch $t9
+                        case 0  { $block := 5 }
+                        default { $block := 4 }
+                    }
+                    case 3 {
+                        // $t5 := borrow_field<AccountStateMachine::Account>.pending($t0)
+                        $t5 := this
+                        // $t6 := 0
+                        $t6 := 0
+                        // $t2 := $t6
+                        i := $t6
+                        // goto L6
+                        $block := 2
+                    }
+                    case 4 {
+                        // label L1
+                        // goto L2
+                        $block := 6
+                    }
+                    case 5 {
+                        // label L0
+                        // drop($t5)
+                        // return ()
+                        leave
+                    }
+                    case 6 {
+                        // label L2
+                        // $t10 := freeze_ref($t5)
+                        $t10 := $t5
+                        // $t11 := vector::borrow<AccountStateMachine::PendingTransfer>($t10, $t2)
+                        $t11 := A1_vector_borrow$A3_AccountStateMachine_PendingTransfer$($t10, i)
+                        // $t12 := Actor::virtual_time()
+                        $t12 := A1_Actor_virtual_time()
+                        // $t13 := borrow_field<AccountStateMachine::PendingTransfer>.initiated_at($t11)
+                        $t13 := $t11
+                        // $t14 := read_ref($t13)
+                        $t14 := $LoadU128($t13)
+                        // $t15 := -($t12, $t14)
+                        $t15 := $Sub($t12, $t14)
+                        // $t16 := 100000000
+                        $t16 := 100000000
+                        // $t17 := >=($t15, $t16)
+                        $t17 := $GtEq($t15, $t16)
+                        // if ($t17) goto L4 else goto L3
+                        switch $t17
+                        case 0  { $block := 8 }
+                        default { $block := 7 }
+                    }
+                    case 7 {
+                        // label L4
+                        // $t18 := vector::remove<AccountStateMachine::PendingTransfer>($t5, $t2)
+                        $t18 := A1_vector_remove$A3_AccountStateMachine_PendingTransfer$($t5, i)
+                        // drop($t18)
+                        $Free($t18, 32)
+                        // goto L5
+                        $block := 9
+                    }
+                    case 8 {
+                        // label L3
+                        // $t19 := 1
+                        $t19 := 1
+                        // $t2 := +($t2, $t19)
+                        i := $AddU64(i, $t19)
+                        // goto L5
+                        $block := 9
+                    }
+                    case 9 {
+                        // label L5
+                        // goto L6
+                        $block := 2
+                    }
+                }
+            }
+
+            function A3_AccountStateMachine_deposit(this, v) {
+                let $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11
+                let $block := 4
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L1
+                        // goto L2
+                        $block := 5
+                    }
+                    case 3 {
+                        // label L0
+                        // drop($t0)
+                        // $t7 := 1
+                        $t7 := 1
+                        // abort($t7)
+                        $Abort($t7)
+                    }
+                    case 4 {
+                        // $t2 := 43
+                        $t2 := 43
+                        // $t3 := borrow_field<AccountStateMachine::Account>.value($t0)
+                        $t3 := $IndexPtr(this, 32)
+                        // $t4 := read_ref($t3)
+                        $t4 := $LoadU64($t3)
+                        // $t5 := -($t2, $t4)
+                        $t5 := $Sub($t2, $t4)
+                        // $t6 := >=($t5, $t1)
+                        $t6 := $GtEq($t5, v)
+                        // if ($t6) goto L1 else goto L0
+                        switch $t6
+                        case 0  { $block := 3 }
+                        default { $block := 2 }
+                    }
+                    case 5 {
+                        // label L2
+                        // $t8 := borrow_field<AccountStateMachine::Account>.value($t0)
+                        $t8 := $IndexPtr(this, 32)
+                        // $t9 := read_ref($t8)
+                        $t9 := $LoadU64($t8)
+                        // $t10 := +($t9, $t1)
+                        $t10 := $AddU64($t9, v)
+                        // $t11 := borrow_field<AccountStateMachine::Account>.value($t0)
+                        $t11 := $IndexPtr(this, 32)
+                        // write_ref($t11, $t10)
+                        $StoreU64($t11, $t10)
+                        // return ()
+                        leave
+                    }
+                }
+            }
+
+            function A3_AccountStateMachine_withdraw(this, v) {
+                let $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9
+                let $block := 4
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L1
+                        // goto L2
+                        $block := 5
+                    }
+                    case 3 {
+                        // label L0
+                        // drop($t0)
+                        // $t5 := 2
+                        $t5 := 2
+                        // abort($t5)
+                        $Abort($t5)
+                    }
+                    case 4 {
+                        // $t2 := borrow_field<AccountStateMachine::Account>.value($t0)
+                        $t2 := $IndexPtr(this, 32)
+                        // $t3 := read_ref($t2)
+                        $t3 := $LoadU64($t2)
+                        // $t4 := >=($t3, $t1)
+                        $t4 := $GtEq($t3, v)
+                        // if ($t4) goto L1 else goto L0
+                        switch $t4
+                        case 0  { $block := 3 }
+                        default { $block := 2 }
+                    }
+                    case 5 {
+                        // label L2
+                        // $t6 := borrow_field<AccountStateMachine::Account>.value($t0)
+                        $t6 := $IndexPtr(this, 32)
+                        // $t7 := read_ref($t6)
+                        $t7 := $LoadU64($t6)
+                        // $t8 := -($t7, $t1)
+                        $t8 := $Sub($t7, v)
+                        // $t9 := borrow_field<AccountStateMachine::Account>.value($t0)
+                        $t9 := $IndexPtr(this, 32)
+                        // write_ref($t9, $t8)
+                        $StoreU64($t9, $t8)
+                        // return ()
+                        leave
+                    }
+                }
+            }
+
+            function A3_AccountStateMachine_xfer(this, dest, v) {
+                let xfer_id, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12
+                let $block := 4
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L1
+                        // goto L2
+                        $block := 5
+                    }
+                    case 3 {
+                        // label L0
+                        // drop($t0)
+                        // $t7 := 1
+                        $t7 := 1
+                        // abort($t7)
+                        $Abort($t7)
+                    }
+                    case 4 {
+                        // $t4 := borrow_field<AccountStateMachine::Account>.value($t0)
+                        $t4 := $IndexPtr(this, 32)
+                        // $t5 := read_ref($t4)
+                        $t5 := $LoadU64($t4)
+                        // $t6 := >=($t5, $t2)
+                        $t6 := $GtEq($t5, v)
+                        // if ($t6) goto L1 else goto L0
+                        switch $t6
+                        case 0  { $block := 3 }
+                        default { $block := 2 }
+                    }
+                    case 5 {
+                        // label L2
+                        // $t8 := AccountStateMachine::new_xfer_id($t0)
+                        $t8 := A3_AccountStateMachine_new_xfer_id(this)
+                        // $t9 := borrow_field<AccountStateMachine::Account>.pending($t0)
+                        $t9 := this
+                        // $t10 := Actor::virtual_time()
+                        $t10 := A1_Actor_virtual_time()
+                        // $t11 := pack AccountStateMachine::PendingTransfer($t8, $t2, $t10)
+                        {
+                            let $mem := $Malloc(32)
+                            $MemoryStoreU64(add($mem, 16), $t8)
+                            $MemoryStoreU64(add($mem, 24), v)
+                            $MemoryStoreU128(add($mem, 0), $t10)
+                            $t11 := $mem
+                        }
+                        // vector::push_back<AccountStateMachine::PendingTransfer>($t9, $t11)
+                        A1_vector_push_back$A3_AccountStateMachine_PendingTransfer$($t9, $t11)
+                        // $t12 := Actor::self()
+                        $t12 := A1_Actor_self()
+                        // AccountStateMachine::send_xfer_deposit($t1, $t2, $t12, $t8)
+                        A3_AccountStateMachine_send_xfer_deposit(dest, v, $t12, $t8)
+                        // return ()
+                        leave
+                    }
+                }
+            }
+
+            function A3_AccountStateMachine_xfer_deposit(this, v, caller_, xfer_id) {
+                // AccountStateMachine::deposit($t0, $t1)
+                A3_AccountStateMachine_deposit(this, v)
+                // AccountStateMachine::send_xfer_finish($t2, $t3)
+                A3_AccountStateMachine_send_xfer_finish(caller_, xfer_id)
+                // return ()
+            }
+
+            function A3_AccountStateMachine_xfer_finish(this, xfer_id) {
+                let tmp_$2, amount, i, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12
+                // $t5 := freeze_ref($t0)
+                $t5 := this
+                // $t6 := AccountStateMachine::find_xfer($t5, $t1)
+                $t6 := A3_AccountStateMachine_find_xfer($t5, xfer_id)
+                // $t7 := borrow_field<AccountStateMachine::Account>.pending($t0)
+                $t7 := this
+                // $t8 := vector::borrow<AccountStateMachine::PendingTransfer>($t7, $t6)
+                $t8 := A1_vector_borrow$A3_AccountStateMachine_PendingTransfer$($t7, $t6)
+                // $t9 := borrow_field<AccountStateMachine::PendingTransfer>.amount($t8)
+                $t9 := $IndexPtr($t8, 24)
+                // $t10 := read_ref($t9)
+                $t10 := $LoadU64($t9)
+                // $t11 := borrow_field<AccountStateMachine::Account>.pending($t0)
+                $t11 := this
+                // $t12 := vector::remove<AccountStateMachine::PendingTransfer>($t11, $t6)
+                $t12 := A1_vector_remove$A3_AccountStateMachine_PendingTransfer$($t11, $t6)
+                // drop($t12)
+                $Free($t12, 32)
+                // AccountStateMachine::withdraw($t0, $t10)
+                A3_AccountStateMachine_withdraw(this, $t10)
+                // return ()
+            }
+
+            function A1_vector_remove$A3_AccountStateMachine_PendingTransfer$(v, i) -> $result {
+                let tmp_$2, tmp_$3, len, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15
+                let $block := 4
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L1
+                        // drop($t0)
+                        // $t8 := 131072
+                        $t8 := 131072
+                        // abort($t8)
+                        $Abort($t8)
+                    }
+                    case 3 {
+                        // label L0
+                        // $t9 := 1
+                        $t9 := 1
+                        // $t10 := -($t6, $t9)
+                        $t10 := $Sub($t6, $t9)
+                        // goto L5
+                        $block := 5
+                    }
+                    case 4 {
+                        // $t5 := freeze_ref($t0)
+                        $t5 := v
+                        // $t6 := vector::length<#0>($t5)
+                        $t6 := A1_vector_length$A3_AccountStateMachine_PendingTransfer$($t5)
+                        // $t7 := >=($t1, $t6)
+                        $t7 := $GtEq(i, $t6)
+                        // if ($t7) goto L1 else goto L0
+                        switch $t7
+                        case 0  { $block := 3 }
+                        default { $block := 2 }
+                    }
+                    case 5 {
+                        // label L5
+                        // $t11 := <($t1, $t10)
+                        $t11 := $Lt(i, $t10)
+                        // if ($t11) goto L3 else goto L2
+                        switch $t11
+                        case 0  { $block := 7 }
+                        default { $block := 6 }
+                    }
+                    case 6 {
+                        // label L3
+                        // goto L4
+                        $block := 8
+                    }
+                    case 7 {
+                        // label L2
+                        // $t15 := vector::pop_back<#0>($t0)
+                        $t15 := A1_vector_pop_back$A3_AccountStateMachine_PendingTransfer$(v)
+                        // return $t15
+                        $result := $t15
+                        leave
+                    }
+                    case 8 {
+                        // label L4
+                        // $t12 := copy($t1)
+                        $t12 := i
+                        // $t13 := 1
+                        $t13 := 1
+                        // $t14 := +($t1, $t13)
+                        $t14 := $AddU64(i, $t13)
+                        // $t1 := $t14
+                        i := $t14
+                        // vector::swap<#0>($t0, $t12, $t14)
+                        A1_vector_swap$A3_AccountStateMachine_PendingTransfer$(v, $t12, $t14)
+                        // goto L5
+                        $block := 5
+                    }
+                }
+            }
+
+            function A1_vector_swap$A3_AccountStateMachine_PendingTransfer$(v_ref, i, j) {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                let size := $LoadU64(v_ptr)
+                if or($GtEq(i, size), $GtEq(j, size)) { $AbortBuiltin() }
+                let i_ptr := $IndexPtr(v_ptr, add(32, mul(i, 32)))
+                let j_ptr := $IndexPtr(v_ptr, add(32, mul(j, 32)))
+                let i_val := $LoadU256(i_ptr)
+                let j_val := $LoadU256(j_ptr)
+                $StoreU256(i_ptr, j_val)
+                $StoreU256(j_ptr, i_val)
+            }
+            function A1_vector_pop_back$A3_AccountStateMachine_PendingTransfer$(v_ref) -> e {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                let size := $LoadU64(v_ptr)
+                if iszero(size) { $AbortBuiltin() }
+                let e_ptr := $IndexPtr(v_ptr, add(32, mul(sub(size, 1), 32)))
+                e := $LoadU256(e_ptr)
+                if $IsStoragePtr(e_ptr) {
+                    let e_offs := $OffsetPtr(e_ptr)
+                    let linked_src := $AlignedStorageLoad(e_offs)
+                    e := $Malloc(32)
+                    mstore(add(e, 0), $AlignedStorageLoad(add(linked_src, 0)))
+                    $AlignedStorageStore(add(linked_src, 0), 0)
+                    $AlignedStorageStore(e_offs, 0)
+                }
+                $StoreU64(v_ptr, sub(size, 1))
+            }
+            function A1_vector_length$A3_AccountStateMachine_PendingTransfer$(v_ref) -> len {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                len := $LoadU64(v_ptr)
+            }
+            function A1_vector_borrow$A3_AccountStateMachine_PendingTransfer$(v_ref, i) -> e_ptr {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                let size := $LoadU64(v_ptr)
+                if $GtEq(i, size) { $AbortBuiltin() }
+                e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 32)))
+                let e := $LoadU256(e_ptr)
+                e_ptr := $MakePtr($IsStoragePtr(v_ref), e)
+            }
+            function A3_AccountStateMachine_find_xfer(this, xfer_id) -> $result {
+                let tmp_$2, i, pending, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16
+                let $block := 3
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L6
+                        // $t7 := vector::length<AccountStateMachine::PendingTransfer>($t5)
+                        $t7 := A1_vector_length$A3_AccountStateMachine_PendingTransfer$($t5)
+                        // $t8 := <($t3, $t7)
+                        $t8 := $Lt(i, $t7)
+                        // if ($t8) goto L1 else goto L0
+                        switch $t8
+                        case 0  { $block := 5 }
+                        default { $block := 4 }
+                    }
+                    case 3 {
+                        // $t5 := borrow_field<AccountStateMachine::Account>.pending($t0)
+                        $t5 := this
+                        // $t6 := 0
+                        $t6 := 0
+                        // $t3 := $t6
+                        i := $t6
+                        // goto L6
+                        $block := 2
+                    }
+                    case 4 {
+                        // label L1
+                        // goto L2
+                        $block := 6
+                    }
+                    case 5 {
+                        // label L0
+                        // $t12 := false
+                        $t12 := false
+                        // $t2 := $t12
+                        tmp_$2 := $t12
+                        // goto L3
+                        $block := 7
+                    }
+                    case 6 {
+                        // label L2
+                        // $t9 := vector::borrow<AccountStateMachine::PendingTransfer>($t5, $t3)
+                        $t9 := A1_vector_borrow$A3_AccountStateMachine_PendingTransfer$($t5, i)
+                        // $t10 := borrow_field<AccountStateMachine::PendingTransfer>.xfer_id($t9)
+                        $t10 := $IndexPtr($t9, 16)
+                        // $t11 := read_ref($t10)
+                        $t11 := $LoadU64($t10)
+                        // $t2 := !=($t11, $t1)
+                        tmp_$2 := $Neq($t11, xfer_id)
+                        // goto L3
+                        $block := 7
+                    }
+                    case 7 {
+                        // label L3
+                        // if ($t2) goto L5 else goto L4
+                        switch tmp_$2
+                        case 0  { $block := 9 }
+                        default { $block := 8 }
+                    }
+                    case 8 {
+                        // label L5
+                        // $t13 := 1
+                        $t13 := 1
+                        // $t3 := +($t3, $t13)
+                        i := $AddU64(i, $t13)
+                        // goto L6
+                        $block := 2
+                    }
+                    case 9 {
+                        // label L4
+                        // $t14 := vector::length<AccountStateMachine::PendingTransfer>($t5)
+                        $t14 := A1_vector_length$A3_AccountStateMachine_PendingTransfer$($t5)
+                        // $t15 := <($t3, $t14)
+                        $t15 := $Lt(i, $t14)
+                        // if ($t15) goto L8 else goto L7
+                        switch $t15
+                        case 0  { $block := 11 }
+                        default { $block := 10 }
+                    }
+                    case 10 {
+                        // label L8
+                        // goto L9
+                        $block := 12
+                    }
+                    case 11 {
+                        // label L7
+                        // $t16 := 3
+                        $t16 := 3
+                        // abort($t16)
+                        $Abort($t16)
+                    }
+                    case 12 {
+                        // label L9
+                        // return $t3
+                        $result := i
+                        leave
+                    }
+                }
+            }
+
+            function A3_AccountStateMachine_send_xfer_finish(actor,xfer_id) {
+                let $t2 := 0x6a51b363524e1e502dbe8698bec5f165b6cf490a68c4ee9063f2c2f0653ff0dd
+                let $t3 := 0x09d2fda8
+                {
+                    let $t4 := mload(0)
+                    let $t5 := abi_encode_tuple_$address_uint64_uint64$_$address_u64_u64$($t4, actor,$t3,xfer_id)
+                    log1($t4, sub($t5, $t4), $t2)
+                    mstore(0, $t5)
+                }
+            }
+            function A3_AccountStateMachine_send_xfer_deposit(actor,v,caller_,xfer_id) {
+                let $t4 := 0x5163aa8ed9d57dbb55d2433f534c881e8fec62da43488c756dbd1ac604ce9c1b
+                let $t5 := 0x8eeea8a2
+                {
+                    let $t6 := mload(0)
+                    let $t7 := abi_encode_tuple_$address_uint64_uint64_address_uint64$_$address_u64_u64_address_u64$($t6, actor,$t5,v,caller_,xfer_id)
+                    log1($t6, sub($t7, $t6), $t4)
+                    mstore(0, $t7)
+                }
+            }
+            function A1_Actor_self() -> addr {
+              addr := address()
+            }
+            function A1_vector_push_back$A3_AccountStateMachine_PendingTransfer$(v_ref, e) {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                let size := $LoadU64(v_ptr)
+                let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 32)))
+                $StoreU256(e_ptr, e)
+                if $IsStoragePtr(e_ptr) {
+                    let e_offs := $OffsetPtr(e_ptr)
+                    let $linked_dst_1341933877 := $NewLinkedStorageBase(0x4ffc4935)
+                    $AlignedStorageStore(add($linked_dst_1341933877, 0), mload(add(e, 0)))
+                    $Free(e, 32)
+                    $AlignedStorageStore(e_offs, $linked_dst_1341933877)
+                }
+                size := add(size, 1)
+                $StoreU64(v_ptr, size)
+                let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+                if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                    let new_v_offs := $ResizeVector(v_offs, capacity, 32)
+                    $StoreU256(v_ref, new_v_offs)
+                }
+            }
+            function A1_Actor_virtual_time() -> virtual_time {
+                virtual_time := timestamp()
+            }
+            function A3_AccountStateMachine_new_xfer_id(this) -> $result {
+                let counter, xfer_id, $t3, $t4, $t5, $t6, $t7
+                // $t3 := borrow_field<AccountStateMachine::Account>.xfer_id_counter($t0)
+                $t3 := $IndexPtr(this, 40)
+                // $t4 := read_ref($t3)
+                $t4 := $LoadU64($t3)
+                // $t5 := read_ref($t3)
+                $t5 := $LoadU64($t3)
+                // $t6 := 1
+                $t6 := 1
+                // $t7 := +($t5, $t6)
+                $t7 := $AddU64($t5, $t6)
+                // write_ref($t3, $t7)
+                $StoreU64($t3, $t7)
+                // return $t4
+                $result := $t4
+            }
+
+            function abi_encode_tuple_$address_uint64_uint64_address_uint64$_$address_u64_u64_address_u64$(headStart ,value_0, value_1, value_2, value_3, value_4) -> tail {
+                tail := add(headStart, 160)
+                abi_encode_address(value_0, add(headStart, 0))
+                abi_encode_uint64(value_1, add(headStart, 32))
+                abi_encode_uint64(value_2, add(headStart, 64))
+                abi_encode_address(value_3, add(headStart, 96))
+                abi_encode_uint64(value_4, add(headStart, 128))
+            }
+            function abi_encode_uint64(value, pos) {
+                mstore(pos, cleanup_uint64(value))
+            }
+            function cleanup_uint64(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffff)
+            }
+            function abi_encode_address(value, pos) {
+                mstore(pos, cleanup_address(value))
+            }
+            function cleanup_address(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffffffffffffffffffffffffffff)
+            }
+            function abi_encode_tuple_$address_uint64_uint64$_$address_u64_u64$(headStart ,value_0, value_1, value_2) -> tail {
+                tail := add(headStart, 96)
+                abi_encode_address(value_0, add(headStart, 0))
+                abi_encode_uint64(value_1, add(headStart, 32))
+                abi_encode_uint64(value_2, add(headStart, 64))
+            }
+            function abi_encode_tuple__(headStart ) -> tail {
+                tail := add(headStart, 0)
+            }
+            function abi_decode_tuple_$uint64$_$u64$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_uint64(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint64(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint64(value)
+            }
+            function validator_uint64(value) {
+                if iszero(eq(value, cleanup_uint64(value))) { $Abort(95) }
+            }
+            function abi_decode_tuple_$uint64_address_uint64$_$u64_address_u64$(headStart, dataEnd) -> value_0, value_1, value_2 {
+                if slt(sub(dataEnd, headStart), 96) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_uint64(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 64
+                    value_2 := abi_decode_uint64(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_address(offset, end) -> value {
+                value := calldataload(offset)
+                validator_address(value)
+            }
+            function validator_address(value) {
+                if iszero(eq(value, cleanup_address(value))) { $Abort(95) }
+            }
+            function abi_decode_tuple_$address_uint64$_$address_u64$(headStart, dataEnd) -> value_0, value_1 {
+                if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_uint64(add(headStart, offset), dataEnd)
+                }
+            }
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $AbortBuiltin() {
+                $Abort(sub(0, 1))
+            }
+            function $Malloc(size) -> offs {
+                offs := mload(0)
+                // pad to word size
+                mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+            }
+            function $Free(offs, size) {
+            }
+            function $MakePtr(is_storage, offs) -> ptr {
+              ptr := or(is_storage, shl(1, offs))
+            }
+            function $IsStoragePtr(ptr) -> b {
+              b := and(ptr, 0x1)
+            }
+            function $OffsetPtr(ptr) -> offs {
+              offs := shr(1, ptr)
+            }
+            function $MaskForSize(size) -> mask {
+              mask := sub(shl(shl(3, size), 1), 1)
+            }
+            function $ExtractBytes(word, start, size) -> bytes {
+               switch size
+               case 1 {
+                  // use the faster byte primitive
+                  bytes := byte(start, word)
+               }
+               default {
+                  // As we have big endian, we need to right shift the value from
+                  // where the highest byte starts in the word (32 - start), minus
+                  // the size.
+                  let shift_bits := shl(3, sub(sub(32, start), size))
+                  bytes := and(shr(shift_bits, word), $MaskForSize(size))
+               }
+            }
+            function $InjectBytes(word, start, size, bytes) -> new_word {
+               let shift_bits := shl(3, sub(sub(32, start), size))
+               // Blend out the bits which we inject
+               let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+               word := and(word, neg_mask)
+               // Overlay the bits we inject
+               new_word := or(word, shl(shift_bits, bytes))
+            }
+            function $ToWordOffs(offs) -> word_offs, byte_offset {
+              word_offs := shr(5, offs)
+              byte_offset := and(offs, 0x1F)
+            }
+            function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+              let available_bytes := sub(32, byte_offset)
+              switch gt(size, available_bytes)
+              case 0 {
+                overflow_bytes := 0
+              }
+              default {
+                overflow_bytes := sub(size, available_bytes)
+              }
+            }
+            function $MemoryLoadBytes(offs, size) -> val {
+              // Lower bit where the value in the higher bytes ends
+              let bit_end := shl(3, sub(32, size))
+              val := shr(bit_end, mload(offs))
+            }
+            function $MemoryStoreBytes(offs, size, val) {
+              let bit_end := shl(3, sub(32, size))
+              let mask := shl(bit_end, $MaskForSize(size))
+              mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+            }
+            function $StorageLoadBytes(offs, size) -> val {
+              let word_offs, byte_offs := $ToWordOffs(offs)
+              let key := $StorageKey(0, word_offs)
+              val := $ExtractBytes(sload(key), byte_offs, size)
+              let overflow_bytes := $OverflowBytes(byte_offs, size)
+              if $LogicalNot(iszero(overflow_bytes)) {
+                key := $StorageKey(0, add(word_offs, 1))
+                let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+                val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+              }
+            }
+            function $StorageStoreBytes(offs, size, bytes) {
+              let word_offs, byte_offs := $ToWordOffs(offs)
+              let key := $StorageKey(0, word_offs)
+              let overflow_bytes := $OverflowBytes(byte_offs, size)
+              switch overflow_bytes
+              case 0 {
+                sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+              }
+              default {
+                // Shift the higher bytes to the right
+                let used_bytes := sub(size, overflow_bytes)
+                let higher_bytes := shr(used_bytes, bytes)
+                let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+                sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+                key := $StorageKey(0, add(word_offs, 1))
+                sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+              }
+            }
+            function $StorageKey(group, word) -> key {
+              mstore(32, word)
+              mstore(64, shl(224, group))
+              key := keccak256(32, 36)
+            }
+            function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+              offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+            }
+            function $NewLinkedStorageBase(type_hash) -> offs {
+              let key := $StorageKey(1, 1)
+              let handle := sload(key)
+              sstore(key, add(handle, 1))
+              offs := $MakeTypeStorageBase(1, type_hash, handle)
+            }
+            function $IndexPtr(ptr, offs) -> new_ptr {
+              new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+            }
+            function $LoadU64(ptr) -> val {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                val := $MemoryLoadU64(offs)
+              }
+              default {
+                val := $StorageLoadU64(offs)
+              }
+            }
+            function $MemoryLoadU64(offs) -> val {
+              val := $MemoryLoadBytes(offs, 8)
+            }
+            function $StorageLoadU64(offs) -> val {
+              val := $StorageLoadBytes(offs, 8)
+            }
+            function $StoreU64(ptr, val) {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                $MemoryStoreU64(offs, val)
+              }
+              default {
+                $StorageStoreU64(offs, val)
+              }
+            }
+            function $MemoryStoreU64(offs, val) {
+              $MemoryStoreBytes(offs, 8, val)
+            }
+            function $StorageStoreU64(offs, val) {
+              $StorageStoreBytes(offs, 8, val)
+            }
+            function $LoadU128(ptr) -> val {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                val := $MemoryLoadU128(offs)
+              }
+              default {
+                val := $StorageLoadU128(offs)
+              }
+            }
+            function $MemoryLoadU128(offs) -> val {
+              val := $MemoryLoadBytes(offs, 16)
+            }
+            function $StorageLoadU128(offs) -> val {
+              val := $StorageLoadBytes(offs, 16)
+            }
+            function $MemoryStoreU128(offs, val) {
+              $MemoryStoreBytes(offs, 16, val)
+            }
+            function $LoadU256(ptr) -> val {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                val := $MemoryLoadU256(offs)
+              }
+              default {
+                val := $StorageLoadU256(offs)
+              }
+            }
+            function $MemoryLoadU256(offs) -> val {
+              val := $MemoryLoadBytes(offs, 32)
+            }
+            function $StorageLoadU256(offs) -> val {
+              val := $StorageLoadBytes(offs, 32)
+            }
+            function $StoreU256(ptr, val) {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                $MemoryStoreU256(offs, val)
+              }
+              default {
+                $StorageStoreU256(offs, val)
+              }
+            }
+            function $MemoryStoreU256(offs, val) {
+              $MemoryStoreBytes(offs, 32, val)
+            }
+            function $StorageStoreU256(offs, val) {
+              $StorageStoreBytes(offs, 32, val)
+            }
+            function $AlignedStorageLoad(offs) -> val {
+              let word_offs := shr(5, offs)
+              val := sload($StorageKey(0, word_offs))
+            }
+            function $AlignedStorageStore(offs, val) {
+              let word_offs := shr(5, offs)
+              sstore($StorageKey(0, word_offs), val)
+            }
+            function $CopyMemory(src, dst, size) {
+              let num_words, overflow_bytes := $ToWordOffs(size)
+              let i := 0
+              for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+                mstore(add(dst, i), mload(add(src, i)))
+              }
+              if overflow_bytes {
+                let mask := $MaskForSize(sub(32, overflow_bytes))
+                let overflow_offs := mul(num_words, 32)
+                let dst_word := and(mload(add(dst, overflow_offs)), mask)
+                let src_word := and(mload(add(src, overflow_offs)), not(mask))
+                mstore(add(dst, overflow_offs), or(dst_word, src_word))
+              }
+            }
+            function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+                let new_capacity := mul(capacity, 2)
+                let data_size := add(32, mul(capacity, type_size))
+                let new_data_size := add(32, mul(new_capacity, type_size))
+                new_v_offs := $Malloc(new_data_size)
+                $CopyMemory(v_offs, new_v_offs, data_size)
+                // update capacity at new location
+                $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+                $Free(v_offs, data_size)
+            }
+            function $AddU64(x, y) -> r {
+                if lt(sub(0xffffffffffffffff, x), y) { $AbortBuiltin() }
+                r := add(x, y)
+            }
+            function $Sub(x, y) -> r {
+                if lt(x, y) { $AbortBuiltin() }
+                r := sub(x, y)
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+            function $Lt(x, y) -> r {
+                r := lt(x, y)
+            }
+            function $GtEq(x, y) -> r {
+                r := or(gt(x, y), eq(x, y))
+            }
+            function $Neq(x, y) -> r {
+                r := $LogicalNot(eq(x, y))
+            }
+            function $LogicalNot(x) -> r {
+                r := iszero(x)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
diff --git a/third_party/move/evm/move-to-yul/tests/Arithm.v2_exp b/third_party/move/evm/move-to-yul/tests/Arithm.v2_exp
new file mode 100644
index 0000000000000..0bf2268a45d84
--- /dev/null
+++ b/third_party/move/evm/move-to-yul/tests/Arithm.v2_exp
@@ -0,0 +1,1591 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_M" {
+    code {
+        codecopy(0, dataoffset("A2_M_deployed"), datasize("A2_M_deployed"))
+        return(0, datasize("A2_M_deployed"))
+    }
+    object "A2_M_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                case 0x27a15f43
+                {
+                    // add_two_number(uint64,uint64)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1 := abi_decode_tuple_$uint64_uint64$_$u64_u64$(4, calldatasize())
+                    let ret_0, ret_1 := A2_M_add_two_number(param_0, param_1)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint64_uint64$_$u64_u64$(memPos, ret_0, ret_1)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x30df35a9
+                {
+                    // arithmetic_ops(uint64)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint64$_$u64$(4, calldatasize())
+                    let ret_0, ret_1 := A2_M_arithmetic_ops(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint64_uint64$_$u64_u64$(memPos, ret_0, ret_1)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xae7d00ae
+                {
+                    // bool_ops(uint64,uint64)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1 := abi_decode_tuple_$uint64_uint64$_$u64_u64$(4, calldatasize())
+                    let ret_0, ret_1 := A2_M_bool_ops(param_0, param_1)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$bool_bool$_$bool_bool$(memPos, ret_0, ret_1)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xf1a0a85c
+                {
+                    // div(uint64,uint64)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1 := abi_decode_tuple_$uint64_uint64$_$u64_u64$(4, calldatasize())
+                    let ret_0, ret_1 := A2_M_div(param_0, param_1)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint64_uint64$_$u64_u64$(memPos, ret_0, ret_1)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x4c275efc
+                {
+                    // multiple_ops(uint64,uint64,uint64)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1, param_2 := abi_decode_tuple_$uint64_uint64_uint64$_$u64_u64_u64$(4, calldatasize())
+                    let ret_0 := A2_M_multiple_ops(param_0, param_1, param_2)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint64$_$u64$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xdc75bec7
+                {
+                    // underflow()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let ret_0 := A2_M_underflow()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint64$_$u64$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                default {}
+            }
+            $Abort(97)
+            function A2_M_add_two_number(x, y) -> $result0, $result1 {
+                let res, $t3, $t4
+                // $t3 := +($t0, $t1)
+                $t3 := $AddU64(x, y)
+                // $t4 := 3
+                $t4 := 3
+                // return ($t4, $t3)
+                $result0 := $t4
+                $result1 := $t3
+            }
+
+            function A2_M_arithmetic_ops(a) -> $result0, $result1 {
+                let c, $t2, $t3, $t4, $t5
+                let $block := 4
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L1
+                        // $t5 := 42
+                        $t5 := 42
+                        // abort($t5)
+                        $Abort($t5)
+                    }
+                    case 3 {
+                        // label L0
+                        // return ($t2, $t0)
+                        $result0 := $t2
+                        $result1 := a
+                        leave
+                    }
+                    case 4 {
+                        // $t2 := 2
+                        $t2 := 2
+                        // $t3 := 2
+                        $t3 := 2
+                        // $t4 := !=($t2, $t3)
+                        $t4 := $Neq($t2, $t3)
+                        // if ($t4) goto L1 else goto L0
+                        switch $t4
+                        case 0  { $block := 3 }
+                        default { $block := 2 }
+                    }
+                }
+            }
+
+            function A2_M_bool_ops(a, b) -> $result0, $result1 {
+                let tmp_$2, tmp_$3, c, d, $t6, $t7, $t8, $t9, $t10, $t11, $t12
+                let $block := 4
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L1
+                        // $t2 := >=($t0, $t1)
+                        tmp_$2 := $GtEq(a, b)
+                        // goto L2
+                        $block := 5
+                    }
+                    case 3 {
+                        // label L0
+                        // $t7 := false
+                        $t7 := false
+                        // $t2 := $t7
+                        tmp_$2 := $t7
+                        // goto L2
+                        $block := 5
+                    }
+                    case 4 {
+                        // $t6 := >($t0, $t1)
+                        $t6 := $Gt(a, b)
+                        // if ($t6) goto L1 else goto L0
+                        switch $t6
+                        case 0  { $block := 3 }
+                        default { $block := 2 }
+                    }
+                    case 5 {
+                        // label L2
+                        // $t8 := <($t0, $t1)
+                        $t8 := $Lt(a, b)
+                        // if ($t8) goto L4 else goto L3
+                        switch $t8
+                        case 0  { $block := 7 }
+                        default { $block := 6 }
+                    }
+                    case 6 {
+                        // label L4
+                        // $t9 := true
+                        $t9 := true
+                        // $t3 := $t9
+                        tmp_$3 := $t9
+                        // goto L5
+                        $block := 8
+                    }
+                    case 7 {
+                        // label L3
+                        // $t3 := <=($t0, $t1)
+                        tmp_$3 := $LtEq(a, b)
+                        // goto L5
+                        $block := 8
+                    }
+                    case 8 {
+                        // label L5
+                        // $t10 := !=($t2, $t3)
+                        $t10 := $Neq(tmp_$2, tmp_$3)
+                        // $t11 := !($t10)
+                        $t11 := $LogicalNot($t10)
+                        // if ($t11) goto L7 else goto L6
+                        switch $t11
+                        case 0  { $block := 10 }
+                        default { $block := 9 }
+                    }
+                    case 9 {
+                        // label L7
+                        // $t12 := 42
+                        $t12 := 42
+                        // abort($t12)
+                        $Abort($t12)
+                    }
+                    case 10 {
+                        // label L6
+                        // return ($t2, $t3)
+                        $result0 := tmp_$2
+                        $result1 := tmp_$3
+                        leave
+                    }
+                }
+            }
+
+            function A2_M_div(x, y) -> $result0, $result1 {
+                let $t2, $t3
+                // $t2 := /($t0, $t1)
+                $t2 := $Div(x, y)
+                // $t3 := %($t0, $t1)
+                $t3 := $Mod(x, y)
+                // return ($t2, $t3)
+                $result0 := $t2
+                $result1 := $t3
+            }
+
+            function A2_M_multiple_ops(x, y, z) -> $result {
+                let $t3, $t4
+                // $t3 := *($t1, $t2)
+                $t3 := $MulU64(y, z)
+                // $t4 := +($t0, $t3)
+                $t4 := $AddU64(x, $t3)
+                // return $t4
+                $result := $t4
+            }
+
+            function A2_M_underflow() -> $result {
+                let $t0, $t1, $t2
+                // $t0 := 0
+                $t0 := 0
+                // $t1 := 1
+                $t1 := 1
+                // $t2 := -($t0, $t1)
+                $t2 := $Sub($t0, $t1)
+                // return $t2
+                $result := $t2
+            }
+
+            function abi_encode_tuple_$uint64$_$u64$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_uint64(value_0, add(headStart, 0))
+            }
+            function abi_encode_uint64(value, pos) {
+                mstore(pos, cleanup_uint64(value))
+            }
+            function cleanup_uint64(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffff)
+            }
+            function abi_decode_tuple_$uint64_uint64_uint64$_$u64_u64_u64$(headStart, dataEnd) -> value_0, value_1, value_2 {
+                if slt(sub(dataEnd, headStart), 96) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_uint64(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_uint64(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 64
+                    value_2 := abi_decode_uint64(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint64(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint64(value)
+            }
+            function validator_uint64(value) {
+                if iszero(eq(value, cleanup_uint64(value))) { $Abort(95) }
+            }
+            function abi_encode_tuple_$uint64_uint64$_$u64_u64$(headStart ,value_0, value_1) -> tail {
+                tail := add(headStart, 64)
+                abi_encode_uint64(value_0, add(headStart, 0))
+                abi_encode_uint64(value_1, add(headStart, 32))
+            }
+            function abi_decode_tuple_$uint64_uint64$_$u64_u64$(headStart, dataEnd) -> value_0, value_1 {
+                if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_uint64(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_uint64(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_encode_tuple_$bool_bool$_$bool_bool$(headStart ,value_0, value_1) -> tail {
+                tail := add(headStart, 64)
+                abi_encode_bool(value_0, add(headStart, 0))
+                abi_encode_bool(value_1, add(headStart, 32))
+            }
+            function abi_encode_bool(value, pos) {
+                mstore(pos, cleanup_bool(value))
+            }
+            function cleanup_bool(value) -> cleaned {
+                cleaned := and(value, 0xff)
+            }
+            function abi_decode_tuple_$uint64$_$u64$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_uint64(add(headStart, offset), dataEnd)
+                }
+            }
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $AbortBuiltin() {
+                $Abort(sub(0, 1))
+            }
+            function $AddU64(x, y) -> r {
+                if lt(sub(0xffffffffffffffff, x), y) { $AbortBuiltin() }
+                r := add(x, y)
+            }
+            function $MulU64(x, y) -> r {
+                if gt(y, div(0xffffffffffffffff, x)) { $AbortBuiltin() }
+                r := mul(x, y)
+            }
+            function $Sub(x, y) -> r {
+                if lt(x, y) { $AbortBuiltin() }
+                r := sub(x, y)
+            }
+            function $Div(x, y) -> r {
+                if eq(y, 0) { $AbortBuiltin() }
+                r := div(x, y)
+            }
+            function $Mod(x, y) -> r {
+                if eq(y, 0) { $AbortBuiltin() }
+                r := mod(x, y)
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+            function $Gt(x, y) -> r {
+                r := gt(x, y)
+            }
+            function $Lt(x, y) -> r {
+                r := lt(x, y)
+            }
+            function $GtEq(x, y) -> r {
+                r := or(gt(x, y), eq(x, y))
+            }
+            function $LtEq(x, y) -> r {
+                r := or(lt(x, y), eq(x, y))
+            }
+            function $Neq(x, y) -> r {
+                r := $LogicalNot(eq(x, y))
+            }
+            function $LogicalNot(x) -> r {
+                r := iszero(x)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
+
+
+!! Unit tests
+
+// test of M::test_add_two_number
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_add_two_number" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_add_two_number()
+        return (0, 0)
+        function A2_M_test_add_two_number() {
+            let res, $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t7 := 100
+                    $t7 := 100
+                    // abort($t7)
+                    $Abort($t7)
+                }
+                case 4 {
+                    // $t1 := 2
+                    $t1 := 2
+                    // $t2 := 5
+                    $t2 := 5
+                    // ($t3, $t4) := M::add_two_number($t1, $t2)
+                    $t3, $t4 := A2_M_add_two_number($t1, $t2)
+                    // $t5 := 3
+                    $t5 := 3
+                    // $t6 := ==($t3, $t5)
+                    $t6 := $Eq($t3, $t5)
+                    // if ($t6) goto L1 else goto L0
+                    switch $t6
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t8 := 7
+                    $t8 := 7
+                    // $t9 := ==($t4, $t8)
+                    $t9 := $Eq($t4, $t8)
+                    // if ($t9) goto L4 else goto L3
+                    switch $t9
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t10 := 101
+                    $t10 := 101
+                    // abort($t10)
+                    $Abort($t10)
+                }
+                case 8 {
+                    // label L5
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function A2_M_add_two_number(x, y) -> $result0, $result1 {
+            let res, $t3, $t4
+            // $t3 := +($t0, $t1)
+            $t3 := $AddU64(x, y)
+            // $t4 := 3
+            $t4 := 3
+            // return ($t4, $t3)
+            $result0 := $t4
+            $result1 := $t3
+        }
+
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $AddU64(x, y) -> r {
+            if lt(sub(0xffffffffffffffff, x), y) { $AbortBuiltin() }
+            r := add(x, y)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+    }
+}
+===> Test result of M::test_add_two_number: Succeed(Stopped) (used_gas=677): []
+
+// test of M::test_add_two_number_overflow
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_add_two_number_overflow" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_add_two_number_overflow()
+        return (0, 0)
+        function A2_M_test_add_two_number_overflow() {
+            let $t0, $t1, $t2, $t3
+            // $t0 := 18446744073709551615
+            $t0 := 18446744073709551615
+            // $t1 := 1
+            $t1 := 1
+            // ($t2, $t3) := M::add_two_number($t0, $t1)
+            $t2, $t3 := A2_M_add_two_number($t0, $t1)
+            // drop($t3)
+            // drop($t2)
+            // return ()
+        }
+
+        function A2_M_add_two_number(x, y) -> $result0, $result1 {
+            let res, $t3, $t4
+            // $t3 := +($t0, $t1)
+            $t3 := $AddU64(x, y)
+            // $t4 := 3
+            $t4 := 3
+            // return ($t4, $t3)
+            $result0 := $t4
+            $result1 := $t3
+        }
+
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $AddU64(x, y) -> r {
+            if lt(sub(0xffffffffffffffff, x), y) { $AbortBuiltin() }
+            r := add(x, y)
+        }
+    }
+}
+===> Test result of M::test_add_two_number_overflow: Revert(Reverted) (used_gas=21): [255, 255, 255, 255, 255, 255, 255, 255]
+
+// test of M::test_add_two_number_wrong_assert
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_add_two_number_wrong_assert" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_add_two_number_wrong_assert()
+        return (0, 0)
+        function A2_M_test_add_two_number_wrong_assert() {
+            let res, $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t7 := 100
+                    $t7 := 100
+                    // abort($t7)
+                    $Abort($t7)
+                }
+                case 4 {
+                    // $t1 := 2
+                    $t1 := 2
+                    // $t2 := 5
+                    $t2 := 5
+                    // ($t3, $t4) := M::add_two_number($t1, $t2)
+                    $t3, $t4 := A2_M_add_two_number($t1, $t2)
+                    // $t5 := 3
+                    $t5 := 3
+                    // $t6 := ==($t3, $t5)
+                    $t6 := $Eq($t3, $t5)
+                    // if ($t6) goto L1 else goto L0
+                    switch $t6
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t8 := 6
+                    $t8 := 6
+                    // $t9 := ==($t4, $t8)
+                    $t9 := $Eq($t4, $t8)
+                    // if ($t9) goto L4 else goto L3
+                    switch $t9
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t10 := 101
+                    $t10 := 101
+                    // abort($t10)
+                    $Abort($t10)
+                }
+                case 8 {
+                    // label L5
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function A2_M_add_two_number(x, y) -> $result0, $result1 {
+            let res, $t3, $t4
+            // $t3 := +($t0, $t1)
+            $t3 := $AddU64(x, y)
+            // $t4 := 3
+            $t4 := 3
+            // return ($t4, $t3)
+            $result0 := $t4
+            $result1 := $t3
+        }
+
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $AddU64(x, y) -> r {
+            if lt(sub(0xffffffffffffffff, x), y) { $AbortBuiltin() }
+            r := add(x, y)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+    }
+}
+===> Test result of M::test_add_two_number_wrong_assert: Revert(Reverted) (used_gas=545): [0, 0, 0, 0, 0, 0, 0, 101]
+
+// test of M::test_arithmetic_ops_aborts
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_arithmetic_ops_aborts" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_arithmetic_ops_aborts()
+        return (0, 0)
+        function A2_M_test_arithmetic_ops_aborts() {
+            let r2, $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t6 := 100
+                    $t6 := 100
+                    // abort($t6)
+                    $Abort($t6)
+                }
+                case 4 {
+                    // $t1 := 3
+                    $t1 := 3
+                    // ($t2, $t3) := M::arithmetic_ops($t1)
+                    $t2, $t3 := A2_M_arithmetic_ops($t1)
+                    // $t4 := 1
+                    $t4 := 1
+                    // $t5 := ==($t2, $t4)
+                    $t5 := $Eq($t2, $t4)
+                    // if ($t5) goto L1 else goto L0
+                    switch $t5
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t7 := 3
+                    $t7 := 3
+                    // $t8 := ==($t3, $t7)
+                    $t8 := $Eq($t3, $t7)
+                    // if ($t8) goto L4 else goto L3
+                    switch $t8
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t9 := 101
+                    $t9 := 101
+                    // abort($t9)
+                    $Abort($t9)
+                }
+                case 8 {
+                    // label L5
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function A2_M_arithmetic_ops(a) -> $result0, $result1 {
+            let c, $t2, $t3, $t4, $t5
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // $t5 := 42
+                    $t5 := 42
+                    // abort($t5)
+                    $Abort($t5)
+                }
+                case 3 {
+                    // label L0
+                    // return ($t2, $t0)
+                    $result0 := $t2
+                    $result1 := a
+                    leave
+                }
+                case 4 {
+                    // $t2 := 2
+                    $t2 := 2
+                    // $t3 := 2
+                    $t3 := 2
+                    // $t4 := !=($t2, $t3)
+                    $t4 := $Neq($t2, $t3)
+                    // if ($t4) goto L1 else goto L0
+                    switch $t4
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+            }
+        }
+
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $Neq(x, y) -> r {
+            r := $LogicalNot(eq(x, y))
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of M::test_arithmetic_ops_aborts: Revert(Reverted) (used_gas=420): [0, 0, 0, 0, 0, 0, 0, 100]
+
+// test of M::test_bool_ops
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_bool_ops" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_bool_ops()
+        return (0, 0)
+        function A2_M_test_bool_ops() {
+            let r2, $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t7 := 100
+                    $t7 := 100
+                    // abort($t7)
+                    $Abort($t7)
+                }
+                case 4 {
+                    // $t1 := 3
+                    $t1 := 3
+                    // $t2 := 2
+                    $t2 := 2
+                    // ($t3, $t4) := M::bool_ops($t1, $t2)
+                    $t3, $t4 := A2_M_bool_ops($t1, $t2)
+                    // $t5 := true
+                    $t5 := true
+                    // $t6 := ==($t3, $t5)
+                    $t6 := $Eq($t3, $t5)
+                    // if ($t6) goto L1 else goto L0
+                    switch $t6
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t8 := false
+                    $t8 := false
+                    // $t9 := ==($t4, $t8)
+                    $t9 := $Eq($t4, $t8)
+                    // if ($t9) goto L4 else goto L3
+                    switch $t9
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t10 := 101
+                    $t10 := 101
+                    // abort($t10)
+                    $Abort($t10)
+                }
+                case 8 {
+                    // label L5
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function A2_M_bool_ops(a, b) -> $result0, $result1 {
+            let tmp_$2, tmp_$3, c, d, $t6, $t7, $t8, $t9, $t10, $t11, $t12
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // $t2 := >=($t0, $t1)
+                    tmp_$2 := $GtEq(a, b)
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t7 := false
+                    $t7 := false
+                    // $t2 := $t7
+                    tmp_$2 := $t7
+                    // goto L2
+                    $block := 5
+                }
+                case 4 {
+                    // $t6 := >($t0, $t1)
+                    $t6 := $Gt(a, b)
+                    // if ($t6) goto L1 else goto L0
+                    switch $t6
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t8 := <($t0, $t1)
+                    $t8 := $Lt(a, b)
+                    // if ($t8) goto L4 else goto L3
+                    switch $t8
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // $t9 := true
+                    $t9 := true
+                    // $t3 := $t9
+                    tmp_$3 := $t9
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t3 := <=($t0, $t1)
+                    tmp_$3 := $LtEq(a, b)
+                    // goto L5
+                    $block := 8
+                }
+                case 8 {
+                    // label L5
+                    // $t10 := !=($t2, $t3)
+                    $t10 := $Neq(tmp_$2, tmp_$3)
+                    // $t11 := !($t10)
+                    $t11 := $LogicalNot($t10)
+                    // if ($t11) goto L7 else goto L6
+                    switch $t11
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // $t12 := 42
+                    $t12 := 42
+                    // abort($t12)
+                    $Abort($t12)
+                }
+                case 10 {
+                    // label L6
+                    // return ($t2, $t3)
+                    $result0 := tmp_$2
+                    $result1 := tmp_$3
+                    leave
+                }
+            }
+        }
+
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $Gt(x, y) -> r {
+            r := gt(x, y)
+        }
+        function $Lt(x, y) -> r {
+            r := lt(x, y)
+        }
+        function $GtEq(x, y) -> r {
+            r := or(gt(x, y), eq(x, y))
+        }
+        function $LtEq(x, y) -> r {
+            r := or(lt(x, y), eq(x, y))
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $Neq(x, y) -> r {
+            r := $LogicalNot(eq(x, y))
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of M::test_bool_ops: Succeed(Stopped) (used_gas=1491): []
+
+// test of M::test_bool_ops_aborts
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_bool_ops_aborts" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_bool_ops_aborts()
+        return (0, 0)
+        function A2_M_test_bool_ops_aborts() {
+            let r1, r2, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t6 := 100
+                    $t6 := 100
+                    // abort($t6)
+                    $Abort($t6)
+                }
+                case 4 {
+                    // $t2 := true
+                    $t2 := true
+                    // $t3 := false
+                    $t3 := false
+                    // $t4 := ==($t2, $t3)
+                    $t4 := $Eq($t2, $t3)
+                    // $t5 := !($t4)
+                    $t5 := $LogicalNot($t4)
+                    // if ($t5) goto L1 else goto L0
+                    switch $t5
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t7 := !=($t2, $t3)
+                    $t7 := $Neq($t2, $t3)
+                    // if ($t7) goto L4 else goto L3
+                    switch $t7
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t8 := 101
+                    $t8 := 101
+                    // abort($t8)
+                    $Abort($t8)
+                }
+                case 8 {
+                    // label L5
+                    // $t9 := !($t2)
+                    $t9 := $LogicalNot($t2)
+                    // $t10 := !($t3)
+                    $t10 := $LogicalNot($t3)
+                    // $t11 := !=($t9, $t10)
+                    $t11 := $Neq($t9, $t10)
+                    // if ($t11) goto L7 else goto L6
+                    switch $t11
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t12 := 102
+                    $t12 := 102
+                    // abort($t12)
+                    $Abort($t12)
+                }
+                case 11 {
+                    // label L8
+                    // $t13 := !($t3)
+                    $t13 := $LogicalNot($t3)
+                    // if ($t13) goto L10 else goto L9
+                    switch $t13
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t14 := 103
+                    $t14 := 103
+                    // abort($t14)
+                    $Abort($t14)
+                }
+                case 14 {
+                    // label L11
+                    // $t15 := !($t2)
+                    $t15 := $LogicalNot($t2)
+                    // if ($t15) goto L13 else goto L12
+                    switch $t15
+                    case 0  { $block := 16 }
+                    default { $block := 15 }
+                }
+                case 15 {
+                    // label L13
+                    // goto L14
+                    $block := 17
+                }
+                case 16 {
+                    // label L12
+                    // $t16 := 104
+                    $t16 := 104
+                    // abort($t16)
+                    $Abort($t16)
+                }
+                case 17 {
+                    // label L14
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $Neq(x, y) -> r {
+            r := $LogicalNot(eq(x, y))
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of M::test_bool_ops_aborts: Revert(Reverted) (used_gas=2075): [0, 0, 0, 0, 0, 0, 0, 104]
+
+// test of M::test_div
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_div" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_div()
+        return (0, 0)
+        function A2_M_test_div() {
+            let r2, $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t7 := 100
+                    $t7 := 100
+                    // abort($t7)
+                    $Abort($t7)
+                }
+                case 4 {
+                    // $t1 := 7
+                    $t1 := 7
+                    // $t2 := 4
+                    $t2 := 4
+                    // ($t3, $t4) := M::div($t1, $t2)
+                    $t3, $t4 := A2_M_div($t1, $t2)
+                    // $t5 := 1
+                    $t5 := 1
+                    // $t6 := ==($t3, $t5)
+                    $t6 := $Eq($t3, $t5)
+                    // if ($t6) goto L1 else goto L0
+                    switch $t6
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t8 := 3
+                    $t8 := 3
+                    // $t9 := ==($t4, $t8)
+                    $t9 := $Eq($t4, $t8)
+                    // if ($t9) goto L4 else goto L3
+                    switch $t9
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t10 := 101
+                    $t10 := 101
+                    // abort($t10)
+                    $Abort($t10)
+                }
+                case 8 {
+                    // label L5
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function A2_M_div(x, y) -> $result0, $result1 {
+            let $t2, $t3
+            // $t2 := /($t0, $t1)
+            $t2 := $Div(x, y)
+            // $t3 := %($t0, $t1)
+            $t3 := $Mod(x, y)
+            // return ($t2, $t3)
+            $result0 := $t2
+            $result1 := $t3
+        }
+
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Div(x, y) -> r {
+            if eq(y, 0) { $AbortBuiltin() }
+            r := div(x, y)
+        }
+        function $Mod(x, y) -> r {
+            if eq(y, 0) { $AbortBuiltin() }
+            r := mod(x, y)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+    }
+}
+===> Test result of M::test_div: Succeed(Stopped) (used_gas=661): []
+
+// test of M::test_div_by_zero
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_div_by_zero" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_div_by_zero()
+        return (0, 0)
+        function A2_M_test_div_by_zero() {
+            let $t0, $t1, $t2, $t3
+            // $t0 := 7
+            $t0 := 7
+            // $t1 := 0
+            $t1 := 0
+            // ($t2, $t3) := M::div($t0, $t1)
+            $t2, $t3 := A2_M_div($t0, $t1)
+            // drop($t3)
+            // drop($t2)
+            // return ()
+        }
+
+        function A2_M_div(x, y) -> $result0, $result1 {
+            let $t2, $t3
+            // $t2 := /($t0, $t1)
+            $t2 := $Div(x, y)
+            // $t3 := %($t0, $t1)
+            $t3 := $Mod(x, y)
+            // return ($t2, $t3)
+            $result0 := $t2
+            $result1 := $t3
+        }
+
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Div(x, y) -> r {
+            if eq(y, 0) { $AbortBuiltin() }
+            r := div(x, y)
+        }
+        function $Mod(x, y) -> r {
+            if eq(y, 0) { $AbortBuiltin() }
+            r := mod(x, y)
+        }
+    }
+}
+===> Test result of M::test_div_by_zero: Revert(Reverted) (used_gas=21): [255, 255, 255, 255, 255, 255, 255, 255]
+
+// test of M::test_div_wrong_assert
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_div_wrong_assert" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_div_wrong_assert()
+        return (0, 0)
+        function A2_M_test_div_wrong_assert() {
+            let r2, $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t7 := 100
+                    $t7 := 100
+                    // abort($t7)
+                    $Abort($t7)
+                }
+                case 4 {
+                    // $t1 := 7
+                    $t1 := 7
+                    // $t2 := 4
+                    $t2 := 4
+                    // ($t3, $t4) := M::div($t1, $t2)
+                    $t3, $t4 := A2_M_div($t1, $t2)
+                    // $t5 := 1
+                    $t5 := 1
+                    // $t6 := ==($t3, $t5)
+                    $t6 := $Eq($t3, $t5)
+                    // if ($t6) goto L1 else goto L0
+                    switch $t6
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t8 := 2
+                    $t8 := 2
+                    // $t9 := ==($t4, $t8)
+                    $t9 := $Eq($t4, $t8)
+                    // if ($t9) goto L4 else goto L3
+                    switch $t9
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t10 := 101
+                    $t10 := 101
+                    // abort($t10)
+                    $Abort($t10)
+                }
+                case 8 {
+                    // label L5
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function A2_M_div(x, y) -> $result0, $result1 {
+            let $t2, $t3
+            // $t2 := /($t0, $t1)
+            $t2 := $Div(x, y)
+            // $t3 := %($t0, $t1)
+            $t3 := $Mod(x, y)
+            // return ($t2, $t3)
+            $result0 := $t2
+            $result1 := $t3
+        }
+
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Div(x, y) -> r {
+            if eq(y, 0) { $AbortBuiltin() }
+            r := div(x, y)
+        }
+        function $Mod(x, y) -> r {
+            if eq(y, 0) { $AbortBuiltin() }
+            r := mod(x, y)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+    }
+}
+===> Test result of M::test_div_wrong_assert: Revert(Reverted) (used_gas=529): [0, 0, 0, 0, 0, 0, 0, 101]
+
+// test of M::test_multiple_ops
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_multiple_ops" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_multiple_ops()
+        return (0, 0)
+        function A2_M_test_multiple_ops() {
+            let $t0, $t1, $t2, $t3, $t4, $t5, $t6
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t6 := 100
+                    $t6 := 100
+                    // abort($t6)
+                    $Abort($t6)
+                }
+                case 4 {
+                    // $t0 := 3
+                    $t0 := 3
+                    // $t1 := 2
+                    $t1 := 2
+                    // $t2 := 5
+                    $t2 := 5
+                    // $t3 := M::multiple_ops($t0, $t1, $t2)
+                    $t3 := A2_M_multiple_ops($t0, $t1, $t2)
+                    // $t4 := 13
+                    $t4 := 13
+                    // $t5 := ==($t3, $t4)
+                    $t5 := $Eq($t3, $t4)
+                    // if ($t5) goto L1 else goto L0
+                    switch $t5
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function A2_M_multiple_ops(x, y, z) -> $result {
+            let $t3, $t4
+            // $t3 := *($t1, $t2)
+            $t3 := $MulU64(y, z)
+            // $t4 := +($t0, $t3)
+            $t4 := $AddU64(x, $t3)
+            // return $t4
+            $result := $t4
+        }
+
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $AddU64(x, y) -> r {
+            if lt(sub(0xffffffffffffffff, x), y) { $AbortBuiltin() }
+            r := add(x, y)
+        }
+        function $MulU64(x, y) -> r {
+            if gt(y, div(0xffffffffffffffff, x)) { $AbortBuiltin() }
+            r := mul(x, y)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+    }
+}
+===> Test result of M::test_multiple_ops: Succeed(Stopped) (used_gas=265): []
+
+// test of M::test_multiple_overflow
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_multiple_overflow" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_multiple_overflow()
+        return (0, 0)
+        function A2_M_test_multiple_overflow() {
+            let $t0, $t1, $t2, $t3, $t4, $t5, $t6
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t6 := 100
+                    $t6 := 100
+                    // abort($t6)
+                    $Abort($t6)
+                }
+                case 4 {
+                    // $t0 := 0
+                    $t0 := 0
+                    // $t1 := 18446744073709551615
+                    $t1 := 18446744073709551615
+                    // $t2 := 2
+                    $t2 := 2
+                    // $t3 := M::multiple_ops($t0, $t1, $t2)
+                    $t3 := A2_M_multiple_ops($t0, $t1, $t2)
+                    // $t4 := 0
+                    $t4 := 0
+                    // $t5 := ==($t3, $t4)
+                    $t5 := $Eq($t3, $t4)
+                    // if ($t5) goto L1 else goto L0
+                    switch $t5
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function A2_M_multiple_ops(x, y, z) -> $result {
+            let $t3, $t4
+            // $t3 := *($t1, $t2)
+            $t3 := $MulU64(y, z)
+            // $t4 := +($t0, $t3)
+            $t4 := $AddU64(x, $t3)
+            // return $t4
+            $result := $t4
+        }
+
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $AddU64(x, y) -> r {
+            if lt(sub(0xffffffffffffffff, x), y) { $AbortBuiltin() }
+            r := add(x, y)
+        }
+        function $MulU64(x, y) -> r {
+            if gt(y, div(0xffffffffffffffff, x)) { $AbortBuiltin() }
+            r := mul(x, y)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+    }
+}
+===> Test result of M::test_multiple_overflow: Revert(Reverted) (used_gas=125): [255, 255, 255, 255, 255, 255, 255, 255]
+
+// test of M::test_underflow
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_underflow" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_underflow()
+        return (0, 0)
+        function A2_M_test_underflow() {
+            let $t0
+            // $t0 := M::underflow()
+            $t0 := A2_M_underflow()
+            // drop($t0)
+            // return ()
+        }
+
+        function A2_M_underflow() -> $result {
+            let $t0, $t1, $t2
+            // $t0 := 0
+            $t0 := 0
+            // $t1 := 1
+            $t1 := 1
+            // $t2 := -($t0, $t1)
+            $t2 := $Sub($t0, $t1)
+            // return $t2
+            $result := $t2
+        }
+
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Sub(x, y) -> r {
+            if lt(x, y) { $AbortBuiltin() }
+            r := sub(x, y)
+        }
+    }
+}
+===> Test result of M::test_underflow: Revert(Reverted) (used_gas=21): [255, 255, 255, 255, 255, 255, 255, 255]
diff --git a/third_party/move/evm/move-to-yul/tests/ConstructorTest.v2_exp b/third_party/move/evm/move-to-yul/tests/ConstructorTest.v2_exp
new file mode 100644
index 0000000000000..b51e33ba8fde2
--- /dev/null
+++ b/third_party/move/evm/move-to-yul/tests/ConstructorTest.v2_exp
@@ -0,0 +1,343 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_ConstructorTest" {
+    code {
+        mstore(0, memoryguard(160))
+        let program_size := datasize("A2_ConstructorTest")
+        let arg_size := sub(codesize(), program_size)
+        let memory_data_offset := $Malloc(arg_size)
+        codecopy(memory_data_offset, program_size, arg_size)
+        let param_0, param_1 := abi_decode_tuple_$uint64_uint64$_$u64_u64$_from_memory(memory_data_offset, add(memory_data_offset, arg_size))
+        A2_ConstructorTest_init(param_0, param_1)
+        codecopy(0, dataoffset("A2_ConstructorTest_deployed"), datasize("A2_ConstructorTest_deployed"))
+        return(0, datasize("A2_ConstructorTest_deployed"))
+        function A2_ConstructorTest_init(value, value2) {
+            let $t3, $t4, $t5
+            let $locals := $Malloc(32)
+            // $t3 := 0x42
+            $t3 := 0x42
+            // $t2 := Evm::sign($t3)
+            mstore($locals, A2_Evm_sign($t3))
+            // $t4 := borrow_local($t2)
+            $t4 := $MakePtr(false, $locals)
+            // $t5 := pack ConstructorTest::Balance($t0, $t1)
+            {
+                let $mem := $Malloc(16)
+                $MemoryStoreU64(add($mem, 0), value)
+                $MemoryStoreU64(add($mem, 8), value2)
+                $t5 := $mem
+            }
+            // move_to<ConstructorTest::Balance>($t5, $t4)
+            {
+                let $base_offset := $MakeTypeStorageBase(0, 0x91d9463a, $LoadU256($t4))
+                if $AlignedStorageLoad($base_offset) {
+                  $AbortBuiltin()
+                }
+                $AlignedStorageStore($base_offset, true)
+                {
+                    let $dst := add($base_offset, 32)
+                    let $src := $t5
+                    $AlignedStorageStore(add($dst, 0), mload(add($src, 0)))
+                    $Free($src, 16)
+                }
+            }
+            // return ()
+            $Free($locals, 32)
+        }
+
+        function A2_Evm_sign(addr) -> signer {
+          signer := addr
+        }
+        function abi_decode_tuple_$uint64_uint64$_$u64_u64$_from_memory(headStart, dataEnd) -> value_0, value_1 {
+            if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+            {
+                let offset := 0
+                value_0 := abi_decode_uint64_from_memory(add(headStart, offset), dataEnd)
+            }
+            {
+                let offset := 32
+                value_1 := abi_decode_uint64_from_memory(add(headStart, offset), dataEnd)
+            }
+        }
+        function abi_decode_uint64_from_memory(offset, end) -> value {
+            value := mload(offset)
+            validator_uint64(value)
+        }
+        function validator_uint64(value) {
+            if iszero(eq(value, cleanup_uint64(value))) { $Abort(95) }
+        }
+        function cleanup_uint64(value) -> cleaned {
+            cleaned := and(value, 0xffffffffffffffff)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+    object "A2_ConstructorTest_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                case 0xf8a8fd6d
+                {
+                    // test()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let ret_0 := A2_ConstructorTest_test()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint64$_$u64$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                default {}
+            }
+            $Abort(97)
+            function A2_ConstructorTest_test() -> $result {
+                let $t0, $t1, $t2, $t3
+                // $t0 := 0x42
+                $t0 := 0x42
+                // $t1 := borrow_global<ConstructorTest::Balance>($t0)
+                {
+                    let $base_offset := $MakeTypeStorageBase(0, 0x91d9463a, $t0)
+                    if iszero($AlignedStorageLoad($base_offset)) {
+                      $AbortBuiltin()
+                    }
+                    $t1 := $MakePtr(true, add($base_offset, 32))
+                }
+                // $t2 := borrow_field<ConstructorTest::Balance>.value($t1)
+                $t2 := $t1
+                // $t3 := read_ref($t2)
+                $t3 := $LoadU64($t2)
+                // return $t3
+                $result := $t3
+            }
+
+            function abi_encode_tuple_$uint64$_$u64$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_uint64(value_0, add(headStart, 0))
+            }
+            function abi_encode_uint64(value, pos) {
+                mstore(pos, cleanup_uint64(value))
+            }
+            function cleanup_uint64(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffff)
+            }
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $AbortBuiltin() {
+                $Abort(sub(0, 1))
+            }
+            function $MakePtr(is_storage, offs) -> ptr {
+              ptr := or(is_storage, shl(1, offs))
+            }
+            function $IsStoragePtr(ptr) -> b {
+              b := and(ptr, 0x1)
+            }
+            function $OffsetPtr(ptr) -> offs {
+              offs := shr(1, ptr)
+            }
+            function $MaskForSize(size) -> mask {
+              mask := sub(shl(shl(3, size), 1), 1)
+            }
+            function $ExtractBytes(word, start, size) -> bytes {
+               switch size
+               case 1 {
+                  // use the faster byte primitive
+                  bytes := byte(start, word)
+               }
+               default {
+                  // As we have big endian, we need to right shift the value from
+                  // where the highest byte starts in the word (32 - start), minus
+                  // the size.
+                  let shift_bits := shl(3, sub(sub(32, start), size))
+                  bytes := and(shr(shift_bits, word), $MaskForSize(size))
+               }
+            }
+            function $ToWordOffs(offs) -> word_offs, byte_offset {
+              word_offs := shr(5, offs)
+              byte_offset := and(offs, 0x1F)
+            }
+            function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+              let available_bytes := sub(32, byte_offset)
+              switch gt(size, available_bytes)
+              case 0 {
+                overflow_bytes := 0
+              }
+              default {
+                overflow_bytes := sub(size, available_bytes)
+              }
+            }
+            function $MemoryLoadBytes(offs, size) -> val {
+              // Lower bit where the value in the higher bytes ends
+              let bit_end := shl(3, sub(32, size))
+              val := shr(bit_end, mload(offs))
+            }
+            function $StorageLoadBytes(offs, size) -> val {
+              let word_offs, byte_offs := $ToWordOffs(offs)
+              let key := $StorageKey(0, word_offs)
+              val := $ExtractBytes(sload(key), byte_offs, size)
+              let overflow_bytes := $OverflowBytes(byte_offs, size)
+              if $LogicalNot(iszero(overflow_bytes)) {
+                key := $StorageKey(0, add(word_offs, 1))
+                let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+                val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+              }
+            }
+            function $StorageKey(group, word) -> key {
+              mstore(32, word)
+              mstore(64, shl(224, group))
+              key := keccak256(32, 36)
+            }
+            function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+              offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+            }
+            function $LoadU64(ptr) -> val {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                val := $MemoryLoadU64(offs)
+              }
+              default {
+                val := $StorageLoadU64(offs)
+              }
+            }
+            function $MemoryLoadU64(offs) -> val {
+              val := $MemoryLoadBytes(offs, 8)
+            }
+            function $StorageLoadU64(offs) -> val {
+              val := $StorageLoadBytes(offs, 8)
+            }
+            function $AlignedStorageLoad(offs) -> val {
+              let word_offs := shr(5, offs)
+              val := sload($StorageKey(0, word_offs))
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+            function $LogicalNot(x) -> r {
+                r := iszero(x)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
diff --git a/third_party/move/evm/move-to-yul/tests/ControlStructures.v2_exp b/third_party/move/evm/move-to-yul/tests/ControlStructures.v2_exp
new file mode 100644
index 0000000000000..f2832b853daeb
--- /dev/null
+++ b/third_party/move/evm/move-to-yul/tests/ControlStructures.v2_exp
@@ -0,0 +1,334 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_M" {
+    code {
+        codecopy(0, dataoffset("A2_M_deployed"), datasize("A2_M_deployed"))
+        return(0, datasize("A2_M_deployed"))
+    }
+    object "A2_M_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                case 0x70e8dbcb
+                {
+                    // f(uint64)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint64$_$u64$(4, calldatasize())
+                    A2_M_f(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xb3e8e519
+                {
+                    // g(uint64)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint64$_$u64$(4, calldatasize())
+                    A2_M_g(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xf5f96a87
+                {
+                    // h1(uint64)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint64$_$u64$(4, calldatasize())
+                    let ret_0 := A2_M_h1(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint64$_$u64$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x410dac7e
+                {
+                    // h2(uint64)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint64$_$u64$(4, calldatasize())
+                    A2_M_h2(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                default {}
+            }
+            $Abort(97)
+            function A2_M_f(x) {
+                let $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8
+                let $block := 4
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L1
+                        // goto L2
+                        $block := 5
+                    }
+                    case 3 {
+                        // label L0
+                        // return ()
+                        leave
+                    }
+                    case 4 {
+                        // label L6
+                        // $t1 := 0
+                        $t1 := 0
+                        // $t2 := >($t0, $t1)
+                        $t2 := $Gt(x, $t1)
+                        // if ($t2) goto L1 else goto L0
+                        switch $t2
+                        case 0  { $block := 3 }
+                        default { $block := 2 }
+                    }
+                    case 5 {
+                        // label L2
+                        // $t3 := 2
+                        $t3 := 2
+                        // $t4 := %($t0, $t3)
+                        $t4 := $Mod(x, $t3)
+                        // $t5 := 0
+                        $t5 := 0
+                        // $t6 := ==($t4, $t5)
+                        $t6 := $Eq($t4, $t5)
+                        // if ($t6) goto L4 else goto L3
+                        switch $t6
+                        case 0  { $block := 7 }
+                        default { $block := 6 }
+                    }
+                    case 6 {
+                        // label L4
+                        // $t7 := 1
+                        $t7 := 1
+                        // $t0 := +($t0, $t7)
+                        x := $AddU64(x, $t7)
+                        // goto L5
+                        $block := 8
+                    }
+                    case 7 {
+                        // label L3
+                        // $t8 := 2
+                        $t8 := 2
+                        // $t0 := -($t0, $t8)
+                        x := $Sub(x, $t8)
+                        // goto L5
+                        $block := 8
+                    }
+                    case 8 {
+                        // label L5
+                        // goto L6
+                        $block := 4
+                    }
+                }
+            }
+
+            function A2_M_g(x) {
+                let $t1, $t2, $t3, $t4, $t5
+                let $block := 4
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L1
+                        // goto L2
+                        $block := 5
+                    }
+                    case 3 {
+                        // label L0
+                        // $t4 := 0
+                        $t4 := 0
+                        // $t5 := ==($t0, $t4)
+                        $t5 := $Eq(x, $t4)
+                        // if ($t5) goto L5 else goto L4
+                        switch $t5
+                        case 0  { $block := 7 }
+                        default { $block := 6 }
+                    }
+                    case 4 {
+                        // label L3
+                        // $t1 := 1
+                        $t1 := 1
+                        // $t2 := >=($t0, $t1)
+                        $t2 := $GtEq(x, $t1)
+                        // if ($t2) goto L1 else goto L0
+                        switch $t2
+                        case 0  { $block := 3 }
+                        default { $block := 2 }
+                    }
+                    case 5 {
+                        // label L2
+                        // $t3 := 1
+                        $t3 := 1
+                        // $t0 := -($t0, $t3)
+                        x := $Sub(x, $t3)
+                        // goto L3
+                        $block := 4
+                    }
+                    case 6 {
+                        // label L5
+                        // goto L6
+                        $block := 8
+                    }
+                    case 7 {
+                        // label L4
+                        // goto L3
+                        $block := 4
+                    }
+                    case 8 {
+                        // label L6
+                        // return ()
+                        leave
+                    }
+                }
+            }
+
+            function A2_M_h1(x) -> $result {
+                let tmp_$1, $t2, $t3, $t4, $t5
+                let $block := 4
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L1
+                        // $t4 := 1
+                        $t4 := 1
+                        // $t1 := $t4
+                        tmp_$1 := $t4
+                        // goto L2
+                        $block := 5
+                    }
+                    case 3 {
+                        // label L0
+                        // $t5 := 2
+                        $t5 := 2
+                        // $t1 := $t5
+                        tmp_$1 := $t5
+                        // goto L2
+                        $block := 5
+                    }
+                    case 4 {
+                        // $t2 := 0
+                        $t2 := 0
+                        // $t3 := >($t0, $t2)
+                        $t3 := $Gt(x, $t2)
+                        // if ($t3) goto L1 else goto L0
+                        switch $t3
+                        case 0  { $block := 3 }
+                        default { $block := 2 }
+                    }
+                    case 5 {
+                        // label L2
+                        // return $t1
+                        $result := tmp_$1
+                        leave
+                    }
+                }
+            }
+
+            function A2_M_h2(x) {
+                let $t1, $t2, $t3
+                let $block := 4
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L1
+                        // $t3 := 1
+                        $t3 := 1
+                        // abort($t3)
+                        $Abort($t3)
+                    }
+                    case 3 {
+                        // label L0
+                        // return ()
+                        leave
+                    }
+                    case 4 {
+                        // $t1 := 0
+                        $t1 := 0
+                        // $t2 := >($t0, $t1)
+                        $t2 := $Gt(x, $t1)
+                        // if ($t2) goto L1 else goto L0
+                        switch $t2
+                        case 0  { $block := 3 }
+                        default { $block := 2 }
+                    }
+                }
+            }
+
+            function abi_encode_tuple__(headStart ) -> tail {
+                tail := add(headStart, 0)
+            }
+            function abi_decode_tuple_$uint64$_$u64$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_uint64(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint64(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint64(value)
+            }
+            function validator_uint64(value) {
+                if iszero(eq(value, cleanup_uint64(value))) { $Abort(95) }
+            }
+            function cleanup_uint64(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffff)
+            }
+            function abi_encode_tuple_$uint64$_$u64$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_uint64(value_0, add(headStart, 0))
+            }
+            function abi_encode_uint64(value, pos) {
+                mstore(pos, cleanup_uint64(value))
+            }
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $AbortBuiltin() {
+                $Abort(sub(0, 1))
+            }
+            function $AddU64(x, y) -> r {
+                if lt(sub(0xffffffffffffffff, x), y) { $AbortBuiltin() }
+                r := add(x, y)
+            }
+            function $Sub(x, y) -> r {
+                if lt(x, y) { $AbortBuiltin() }
+                r := sub(x, y)
+            }
+            function $Mod(x, y) -> r {
+                if eq(y, 0) { $AbortBuiltin() }
+                r := mod(x, y)
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+            function $Gt(x, y) -> r {
+                r := gt(x, y)
+            }
+            function $GtEq(x, y) -> r {
+                r := or(gt(x, y), eq(x, y))
+            }
+            function $Eq(x, y) -> r {
+                r := eq(x, y)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
diff --git a/third_party/move/evm/move-to-yul/tests/GlobalVectors.v2_exp b/third_party/move/evm/move-to-yul/tests/GlobalVectors.v2_exp
new file mode 100644
index 0000000000000..fcee1e13c2424
--- /dev/null
+++ b/third_party/move/evm/move-to-yul/tests/GlobalVectors.v2_exp
@@ -0,0 +1,7281 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_GlobalVectors" {
+    code {
+        codecopy(0, dataoffset("A2_GlobalVectors_deployed"), datasize("A2_GlobalVectors_deployed"))
+        return(0, datasize("A2_GlobalVectors_deployed"))
+    }
+    object "A2_GlobalVectors_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                default {}
+            }
+            $Abort(97)
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
+
+
+!! Unit tests
+
+// test of GlobalVectors::test_borrow_mut_global
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_GlobalVectors_test_borrow_mut_global" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_GlobalVectors_test_borrow_mut_global()
+        return (0, 0)
+        function A2_GlobalVectors_test_borrow_mut_global() {
+            let e, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27
+            let $locals := $Malloc(64)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t27 := 102
+                    $t27 := 102
+                    // abort($t27)
+                    $Abort($t27)
+                }
+                case 4 {
+                    // $t2 := vector::empty<u64>()
+                    mstore($locals, A1_vector_empty$u64$())
+                    // $t3 := borrow_local($t2)
+                    $t3 := $MakePtr(false, $locals)
+                    // $t4 := 42
+                    $t4 := 42
+                    // vector::push_back<u64>($t3, $t4)
+                    A1_vector_push_back$u64$($t3, $t4)
+                    // $t5 := borrow_local($t2)
+                    $t5 := $MakePtr(false, $locals)
+                    // $t6 := 43
+                    $t6 := 43
+                    // vector::push_back<u64>($t5, $t6)
+                    A1_vector_push_back$u64$($t5, $t6)
+                    // $t7 := borrow_local($t2)
+                    $t7 := $MakePtr(false, $locals)
+                    // $t8 := 44
+                    $t8 := 44
+                    // vector::push_back<u64>($t7, $t8)
+                    A1_vector_push_back$u64$($t7, $t8)
+                    // $t9 := 0x42
+                    $t9 := 0x42
+                    // $t0 := Evm::sign($t9)
+                    mstore(add($locals, 32), A2_Evm_sign($t9))
+                    // $t10 := borrow_local($t0)
+                    $t10 := $MakePtr(false, add($locals, 32))
+                    // $t11 := move($t2)
+                    $t11 := mload($locals)
+                    // $t12 := pack GlobalVectors::T<u64>($t11)
+                    {
+                        let $mem := $Malloc(32)
+                        $MemoryStoreU256(add($mem, 0), $t11)
+                        $t12 := $mem
+                    }
+                    // move_to<GlobalVectors::T<u64>>($t12, $t10)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $LoadU256($t10))
+                        if $AlignedStorageLoad($base_offset) {
+                          $AbortBuiltin()
+                        }
+                        $AlignedStorageStore($base_offset, true)
+                        {
+                            let $dst := add($base_offset, 32)
+                            let $src := $t12
+                            {
+                                let $linked_src_814019441 := mload(add($src, 0))
+                                let $linked_dst_814019441 := $NewLinkedStorageBase(0x3084f371)
+                                let $size_814019441 := $MemoryLoadU64($linked_src_814019441)
+                                let $data_size_814019441 := mul($size_814019441, 8)
+                                $AlignedStorageStore($linked_dst_814019441, mload($linked_src_814019441))
+                                let $data_src_814019441 := add($linked_src_814019441, 32)
+                                let $data_dst_814019441 := add($linked_dst_814019441, 32)
+                                for { let $offs_814019441 := 0 } lt($offs_814019441, $data_size_814019441) { $offs_814019441 := add($offs_814019441, 32)} {
+                                    $AlignedStorageStore(add($data_dst_814019441, $offs_814019441), mload(add($data_src_814019441, $offs_814019441)))
+                                    $Free($linked_src_814019441, add($data_size_814019441, 32))
+                                }
+                                $AlignedStorageStore(add($dst, 0), $linked_dst_814019441)
+                            }
+                            $Free($src, 32)
+                        }
+                    }
+                    // $t13 := 0x42
+                    $t13 := 0x42
+                    // $t14 := borrow_global<GlobalVectors::T<u64>>($t13)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $t13)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t14 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t15 := borrow_field<GlobalVectors::T<u64>>.v($t14)
+                    $t15 := $t14
+                    // $t16 := 0
+                    $t16 := 0
+                    // $t17 := vector::borrow_mut<u64>($t15, $t16)
+                    $t17 := A1_vector_borrow_mut$u64$($t15, $t16)
+                    // $t18 := 12
+                    $t18 := 12
+                    // write_ref($t17, $t18)
+                    $StoreU64($t17, $t18)
+                    // $t19 := 0x42
+                    $t19 := 0x42
+                    // $t20 := borrow_global<GlobalVectors::T<u64>>($t19)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $t19)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t20 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t21 := borrow_field<GlobalVectors::T<u64>>.v($t20)
+                    $t21 := $t20
+                    // $t22 := 0
+                    $t22 := 0
+                    // $t23 := vector::borrow<u64>($t21, $t22)
+                    $t23 := A1_vector_borrow$u64$($t21, $t22)
+                    // $t24 := read_ref($t23)
+                    $t24 := $LoadU64($t23)
+                    // $t25 := 12
+                    $t25 := 12
+                    // $t26 := ==($t24, $t25)
+                    $t26 := $Eq($t24, $t25)
+                    // if ($t26) goto L1 else goto L0
+                    switch $t26
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // return ()
+                    $Free($locals, 64)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_borrow$u64$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 8)))
+        }
+        function A1_vector_borrow_mut$u64$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 8)))
+        }
+        function A2_Evm_sign(addr) -> signer {
+          signer := addr
+        }
+        function A1_vector_push_back$u64$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 8)))
+            $StoreU64(e_ptr, e)
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 8)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_vector_empty$u64$() -> vector {
+            vector := $Malloc(48)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $GtEq(x, y) -> r {
+            r := or(gt(x, y), eq(x, y))
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of GlobalVectors::test_borrow_mut_global: Succeed(Stopped) (used_gas=117389): []
+
+// test of GlobalVectors::test_move_from
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_GlobalVectors_test_move_from" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_GlobalVectors_test_move_from()
+        return (0, 0)
+        function A2_GlobalVectors_test_move_from() {
+            let $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32, $t33, $t34, $t35, $t36, $t37, $t38, $t39, $t40, $t41, $t42, $t43, $t44, $t45, $t46, $t47, $t48, $t49, $t50, $t51, $t52, $t53, $t54, $t55, $t56, $t57, $t58
+            let $locals := $Malloc(96)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t19 := 101
+                    $t19 := 101
+                    // abort($t19)
+                    $Abort($t19)
+                }
+                case 4 {
+                    // $t1 := vector::empty<u64>()
+                    mstore($locals, A1_vector_empty$u64$())
+                    // $t3 := borrow_local($t1)
+                    $t3 := $MakePtr(false, $locals)
+                    // $t4 := 10
+                    $t4 := 10
+                    // vector::push_back<u64>($t3, $t4)
+                    A1_vector_push_back$u64$($t3, $t4)
+                    // $t5 := borrow_local($t1)
+                    $t5 := $MakePtr(false, $locals)
+                    // $t6 := 11
+                    $t6 := 11
+                    // vector::push_back<u64>($t5, $t6)
+                    A1_vector_push_back$u64$($t5, $t6)
+                    // $t7 := borrow_local($t1)
+                    $t7 := $MakePtr(false, $locals)
+                    // $t8 := 12
+                    $t8 := 12
+                    // vector::push_back<u64>($t7, $t8)
+                    A1_vector_push_back$u64$($t7, $t8)
+                    // $t9 := 0x42
+                    $t9 := 0x42
+                    // $t0 := Evm::sign($t9)
+                    mstore(add($locals, 32), A2_Evm_sign($t9))
+                    // $t10 := borrow_local($t0)
+                    $t10 := $MakePtr(false, add($locals, 32))
+                    // $t11 := move($t1)
+                    $t11 := mload($locals)
+                    // $t12 := pack GlobalVectors::T<u64>($t11)
+                    {
+                        let $mem := $Malloc(32)
+                        $MemoryStoreU256(add($mem, 0), $t11)
+                        $t12 := $mem
+                    }
+                    // move_to<GlobalVectors::T<u64>>($t12, $t10)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $LoadU256($t10))
+                        if $AlignedStorageLoad($base_offset) {
+                          $AbortBuiltin()
+                        }
+                        $AlignedStorageStore($base_offset, true)
+                        {
+                            let $dst := add($base_offset, 32)
+                            let $src := $t12
+                            {
+                                let $linked_src_814019441 := mload(add($src, 0))
+                                let $linked_dst_814019441 := $NewLinkedStorageBase(0x3084f371)
+                                let $size_814019441 := $MemoryLoadU64($linked_src_814019441)
+                                let $data_size_814019441 := mul($size_814019441, 8)
+                                $AlignedStorageStore($linked_dst_814019441, mload($linked_src_814019441))
+                                let $data_src_814019441 := add($linked_src_814019441, 32)
+                                let $data_dst_814019441 := add($linked_dst_814019441, 32)
+                                for { let $offs_814019441 := 0 } lt($offs_814019441, $data_size_814019441) { $offs_814019441 := add($offs_814019441, 32)} {
+                                    $AlignedStorageStore(add($data_dst_814019441, $offs_814019441), mload(add($data_src_814019441, $offs_814019441)))
+                                    $Free($linked_src_814019441, add($data_size_814019441, 32))
+                                }
+                                $AlignedStorageStore(add($dst, 0), $linked_dst_814019441)
+                            }
+                            $Free($src, 32)
+                        }
+                    }
+                    // $t13 := 0x42
+                    $t13 := 0x42
+                    // $t14 := move_from<GlobalVectors::T<u64>>($t13)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $t13)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $AlignedStorageStore($base_offset, false)
+                        {
+                            let $src := add($base_offset, 32)
+                            let $dst
+                            $dst := $Malloc(32)
+                            {
+                                let $linked_src_814019441 := $AlignedStorageLoad(add($src, 0))
+                                let $linked_dst_814019441
+                                let $size_814019441 := $StorageLoadU64($linked_src_814019441)
+                                let $capacity_814019441 := $ClosestGreaterPowerOfTwo($size_814019441)
+                                $linked_dst_814019441 := $Malloc(add(32, mul($capacity_814019441, 8)))
+                                let $data_size_814019441 := mul($size_814019441, 8)
+                                mstore($linked_dst_814019441, $AlignedStorageLoad($linked_src_814019441))
+                                $MemoryStoreU64(add($linked_dst_814019441, 8), $capacity_814019441)
+                                let $data_src_814019441 := add($linked_src_814019441, 32)
+                                let $data_dst_814019441 := add($linked_dst_814019441, 32)
+                                for { let $offs_814019441 := 0 } lt($offs_814019441, $data_size_814019441) { $offs_814019441 := add($offs_814019441, 32)} {
+                                    mstore(add($data_dst_814019441, $offs_814019441), $AlignedStorageLoad(add($data_src_814019441, $offs_814019441)))
+                                    $AlignedStorageStore(add($data_src_814019441, $offs_814019441), 0)
+                                }
+                                mstore(add($dst, 0), $linked_dst_814019441)
+                                $AlignedStorageStore(add($src, 0), 0)
+                            }
+                            $t14 := $dst
+                        }
+                    }
+                    // $t2 := unpack GlobalVectors::T<u64>($t14)
+                    mstore(add($locals, 64), $MemoryLoadU256(add($t14, 0)))
+                    $Free($t14, 32)
+                    // $t15 := borrow_local($t2)
+                    $t15 := $MakePtr(false, add($locals, 64))
+                    // $t16 := vector::length<u64>($t15)
+                    $t16 := A1_vector_length$u64$($t15)
+                    // $t17 := 3
+                    $t17 := 3
+                    // $t18 := ==($t16, $t17)
+                    $t18 := $Eq($t16, $t17)
+                    // if ($t18) goto L1 else goto L0
+                    switch $t18
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t20 := borrow_local($t2)
+                    $t20 := $MakePtr(false, add($locals, 64))
+                    // $t21 := 0
+                    $t21 := 0
+                    // $t22 := vector::borrow<u64>($t20, $t21)
+                    $t22 := A1_vector_borrow$u64$($t20, $t21)
+                    // $t23 := read_ref($t22)
+                    $t23 := $LoadU64($t22)
+                    // $t24 := 10
+                    $t24 := 10
+                    // $t25 := ==($t23, $t24)
+                    $t25 := $Eq($t23, $t24)
+                    // if ($t25) goto L4 else goto L3
+                    switch $t25
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t26 := 102
+                    $t26 := 102
+                    // abort($t26)
+                    $Abort($t26)
+                }
+                case 8 {
+                    // label L5
+                    // $t27 := borrow_local($t2)
+                    $t27 := $MakePtr(false, add($locals, 64))
+                    // $t28 := 1
+                    $t28 := 1
+                    // $t29 := vector::borrow<u64>($t27, $t28)
+                    $t29 := A1_vector_borrow$u64$($t27, $t28)
+                    // $t30 := read_ref($t29)
+                    $t30 := $LoadU64($t29)
+                    // $t31 := 11
+                    $t31 := 11
+                    // $t32 := ==($t30, $t31)
+                    $t32 := $Eq($t30, $t31)
+                    // if ($t32) goto L7 else goto L6
+                    switch $t32
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t33 := 103
+                    $t33 := 103
+                    // abort($t33)
+                    $Abort($t33)
+                }
+                case 11 {
+                    // label L8
+                    // $t34 := borrow_local($t2)
+                    $t34 := $MakePtr(false, add($locals, 64))
+                    // $t35 := 2
+                    $t35 := 2
+                    // $t36 := vector::borrow<u64>($t34, $t35)
+                    $t36 := A1_vector_borrow$u64$($t34, $t35)
+                    // $t37 := read_ref($t36)
+                    $t37 := $LoadU64($t36)
+                    // $t38 := 12
+                    $t38 := 12
+                    // $t39 := ==($t37, $t38)
+                    $t39 := $Eq($t37, $t38)
+                    // if ($t39) goto L10 else goto L9
+                    switch $t39
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t40 := 104
+                    $t40 := 104
+                    // abort($t40)
+                    $Abort($t40)
+                }
+                case 14 {
+                    // label L11
+                    // $t41 := borrow_local($t2)
+                    $t41 := $MakePtr(false, add($locals, 64))
+                    // $t42 := 13
+                    $t42 := 13
+                    // vector::push_back<u64>($t41, $t42)
+                    A1_vector_push_back$u64$($t41, $t42)
+                    // $t43 := borrow_local($t2)
+                    $t43 := $MakePtr(false, add($locals, 64))
+                    // $t44 := 14
+                    $t44 := 14
+                    // vector::push_back<u64>($t43, $t44)
+                    A1_vector_push_back$u64$($t43, $t44)
+                    // $t45 := borrow_local($t2)
+                    $t45 := $MakePtr(false, add($locals, 64))
+                    // $t46 := 3
+                    $t46 := 3
+                    // $t47 := vector::borrow<u64>($t45, $t46)
+                    $t47 := A1_vector_borrow$u64$($t45, $t46)
+                    // $t48 := read_ref($t47)
+                    $t48 := $LoadU64($t47)
+                    // $t49 := 13
+                    $t49 := 13
+                    // $t50 := ==($t48, $t49)
+                    $t50 := $Eq($t48, $t49)
+                    // if ($t50) goto L13 else goto L12
+                    switch $t50
+                    case 0  { $block := 16 }
+                    default { $block := 15 }
+                }
+                case 15 {
+                    // label L13
+                    // goto L14
+                    $block := 17
+                }
+                case 16 {
+                    // label L12
+                    // $t51 := 105
+                    $t51 := 105
+                    // abort($t51)
+                    $Abort($t51)
+                }
+                case 17 {
+                    // label L14
+                    // $t52 := borrow_local($t2)
+                    $t52 := $MakePtr(false, add($locals, 64))
+                    // $t53 := 4
+                    $t53 := 4
+                    // $t54 := vector::borrow<u64>($t52, $t53)
+                    $t54 := A1_vector_borrow$u64$($t52, $t53)
+                    // $t55 := read_ref($t54)
+                    $t55 := $LoadU64($t54)
+                    // $t56 := 14
+                    $t56 := 14
+                    // $t57 := ==($t55, $t56)
+                    $t57 := $Eq($t55, $t56)
+                    // if ($t57) goto L16 else goto L15
+                    switch $t57
+                    case 0  { $block := 19 }
+                    default { $block := 18 }
+                }
+                case 18 {
+                    // label L16
+                    // goto L17
+                    $block := 20
+                }
+                case 19 {
+                    // label L15
+                    // $t58 := 106
+                    $t58 := 106
+                    // abort($t58)
+                    $Abort($t58)
+                }
+                case 20 {
+                    // label L17
+                    // return ()
+                    $Free($locals, 96)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_borrow$u64$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 8)))
+        }
+        function A1_vector_push_back$u64$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 8)))
+            $StoreU64(e_ptr, e)
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 8)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_vector_length$u64$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A2_Evm_sign(addr) -> signer {
+          signer := addr
+        }
+        function A1_vector_empty$u64$() -> vector {
+            vector := $Malloc(48)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $GtEq(x, y) -> r {
+            r := or(gt(x, y), eq(x, y))
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $ClosestGreaterPowerOfTwo(x) -> r {
+            r := or(r, shr(1, x))
+            r := or(r, shr(2, r))
+            r := or(r, shr(4, r))
+            r := or(r, shr(8, r))
+            r := or(r, shr(16, r))
+            r := or(r, shr(32, r))
+            r := add(x, 1)
+        }
+    }
+}
+===> Test result of GlobalVectors::test_move_from: Succeed(Stopped) (used_gas=98498): []
+
+// test of GlobalVectors::test_move_from_vector_of_struct
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_GlobalVectors_test_move_from_vector_of_struct" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_GlobalVectors_test_move_from_vector_of_struct()
+        return (0, 0)
+        function A2_GlobalVectors_test_move_from_vector_of_struct() {
+            let local_t, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32, $t33, $t34, $t35, $t36, $t37, $t38, $t39, $t40, $t41, $t42, $t43, $t44, $t45, $t46, $t47, $t48, $t49, $t50, $t51, $t52
+            let $locals := $Malloc(64)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t25 := 101
+                    $t25 := 101
+                    // abort($t25)
+                    $Abort($t25)
+                }
+                case 4 {
+                    // $t2 := vector::empty<GlobalVectors::S>()
+                    mstore($locals, A1_vector_empty$A2_GlobalVectors_S$())
+                    // $t3 := borrow_local($t2)
+                    $t3 := $MakePtr(false, $locals)
+                    // $t4 := 10
+                    $t4 := 10
+                    // $t5 := 40
+                    $t5 := 40
+                    // $t6 := pack GlobalVectors::S($t4, $t5)
+                    {
+                        let $mem := $Malloc(24)
+                        $MemoryStoreU128(add($mem, 0), $t4)
+                        $MemoryStoreU64(add($mem, 16), $t5)
+                        $t6 := $mem
+                    }
+                    // vector::push_back<GlobalVectors::S>($t3, $t6)
+                    A1_vector_push_back$A2_GlobalVectors_S$($t3, $t6)
+                    // $t7 := borrow_local($t2)
+                    $t7 := $MakePtr(false, $locals)
+                    // $t8 := 11
+                    $t8 := 11
+                    // $t9 := 41
+                    $t9 := 41
+                    // $t10 := pack GlobalVectors::S($t8, $t9)
+                    {
+                        let $mem := $Malloc(24)
+                        $MemoryStoreU128(add($mem, 0), $t8)
+                        $MemoryStoreU64(add($mem, 16), $t9)
+                        $t10 := $mem
+                    }
+                    // vector::push_back<GlobalVectors::S>($t7, $t10)
+                    A1_vector_push_back$A2_GlobalVectors_S$($t7, $t10)
+                    // $t11 := borrow_local($t2)
+                    $t11 := $MakePtr(false, $locals)
+                    // $t12 := 12
+                    $t12 := 12
+                    // $t13 := 42
+                    $t13 := 42
+                    // $t14 := pack GlobalVectors::S($t12, $t13)
+                    {
+                        let $mem := $Malloc(24)
+                        $MemoryStoreU128(add($mem, 0), $t12)
+                        $MemoryStoreU64(add($mem, 16), $t13)
+                        $t14 := $mem
+                    }
+                    // vector::push_back<GlobalVectors::S>($t11, $t14)
+                    A1_vector_push_back$A2_GlobalVectors_S$($t11, $t14)
+                    // $t15 := 0x42
+                    $t15 := 0x42
+                    // $t0 := Evm::sign($t15)
+                    mstore(add($locals, 32), A2_Evm_sign($t15))
+                    // $t16 := borrow_local($t0)
+                    $t16 := $MakePtr(false, add($locals, 32))
+                    // $t17 := move($t2)
+                    $t17 := mload($locals)
+                    // $t18 := pack GlobalVectors::T<GlobalVectors::S>($t17)
+                    {
+                        let $mem := $Malloc(32)
+                        $MemoryStoreU256(add($mem, 0), $t17)
+                        $t18 := $mem
+                    }
+                    // move_to<GlobalVectors::T<GlobalVectors::S>>($t18, $t16)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x27c9b6b7, $LoadU256($t16))
+                        if $AlignedStorageLoad($base_offset) {
+                          $AbortBuiltin()
+                        }
+                        $AlignedStorageStore($base_offset, true)
+                        {
+                            let $dst := add($base_offset, 32)
+                            let $src := $t18
+                            {
+                                let $linked_src_634259357 := mload(add($src, 0))
+                                let $linked_dst_634259357 := $NewLinkedStorageBase(0x25ce079d)
+                                let $size_634259357 := $MemoryLoadU64($linked_src_634259357)
+                                let $data_size_634259357 := mul($size_634259357, 32)
+                                $AlignedStorageStore($linked_dst_634259357, mload($linked_src_634259357))
+                                let $data_src_634259357 := add($linked_src_634259357, 32)
+                                let $data_dst_634259357 := add($linked_dst_634259357, 32)
+                                for { let $offs_634259357 := 0 } lt($offs_634259357, $data_size_634259357) { $offs_634259357 := add($offs_634259357, 32)} {
+                                    {
+                                        let $linked_src_3681206257 := mload(add($offs_634259357, $data_src_634259357))
+                                        let $linked_dst_3681206257 := $NewLinkedStorageBase(0xdb6abff1)
+                                        $AlignedStorageStore(add($linked_dst_3681206257, 0), mload(add($linked_src_3681206257, 0)))
+                                        $Free($linked_src_3681206257, 24)
+                                        $AlignedStorageStore(add($data_dst_634259357, $offs_634259357), $linked_dst_3681206257)
+                                    }
+                                    $Free($linked_src_634259357, add($data_size_634259357, 32))
+                                }
+                                $AlignedStorageStore(add($dst, 0), $linked_dst_634259357)
+                            }
+                            $Free($src, 32)
+                        }
+                    }
+                    // $t19 := 0x42
+                    $t19 := 0x42
+                    // $t1 := move_from<GlobalVectors::T<GlobalVectors::S>>($t19)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x27c9b6b7, $t19)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $AlignedStorageStore($base_offset, false)
+                        {
+                            let $src := add($base_offset, 32)
+                            let $dst
+                            $dst := $Malloc(32)
+                            {
+                                let $linked_src_634259357 := $AlignedStorageLoad(add($src, 0))
+                                let $linked_dst_634259357
+                                let $size_634259357 := $StorageLoadU64($linked_src_634259357)
+                                let $capacity_634259357 := $ClosestGreaterPowerOfTwo($size_634259357)
+                                $linked_dst_634259357 := $Malloc(add(32, mul($capacity_634259357, 32)))
+                                let $data_size_634259357 := mul($size_634259357, 32)
+                                mstore($linked_dst_634259357, $AlignedStorageLoad($linked_src_634259357))
+                                $MemoryStoreU64(add($linked_dst_634259357, 8), $capacity_634259357)
+                                let $data_src_634259357 := add($linked_src_634259357, 32)
+                                let $data_dst_634259357 := add($linked_dst_634259357, 32)
+                                for { let $offs_634259357 := 0 } lt($offs_634259357, $data_size_634259357) { $offs_634259357 := add($offs_634259357, 32)} {
+                                    {
+                                        let $linked_src_3681206257 := $AlignedStorageLoad(add($data_src_634259357, $offs_634259357))
+                                        let $linked_dst_3681206257
+                                        $linked_dst_3681206257 := $Malloc(24)
+                                        mstore(add($linked_dst_3681206257, 0), $AlignedStorageLoad(add($linked_src_3681206257, 0)))
+                                        $AlignedStorageStore(add($linked_src_3681206257, 0), 0)
+                                        mstore(add($data_dst_634259357, $offs_634259357), $linked_dst_3681206257)
+                                        $AlignedStorageStore(add($data_src_634259357, $offs_634259357), 0)
+                                    }
+                                }
+                                mstore(add($dst, 0), $linked_dst_634259357)
+                                $AlignedStorageStore(add($src, 0), 0)
+                            }
+                            local_t := $dst
+                        }
+                    }
+                    // $t20 := borrow_local($t1)
+                    $t20 := $MakePtr(false, local_t)
+                    // $t21 := borrow_field<GlobalVectors::T<GlobalVectors::S>>.v($t20)
+                    $t21 := $t20
+                    // $t22 := vector::length<GlobalVectors::S>($t21)
+                    $t22 := A1_vector_length$A2_GlobalVectors_S$($t21)
+                    // $t23 := 3
+                    $t23 := 3
+                    // $t24 := ==($t22, $t23)
+                    $t24 := $Eq($t22, $t23)
+                    // if ($t24) goto L1 else goto L0
+                    switch $t24
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t26 := borrow_local($t1)
+                    $t26 := $MakePtr(false, local_t)
+                    // $t27 := borrow_field<GlobalVectors::T<GlobalVectors::S>>.v($t26)
+                    $t27 := $t26
+                    // $t28 := 0
+                    $t28 := 0
+                    // $t29 := vector::borrow<GlobalVectors::S>($t27, $t28)
+                    $t29 := A1_vector_borrow$A2_GlobalVectors_S$($t27, $t28)
+                    // $t30 := borrow_field<GlobalVectors::S>.x($t29)
+                    $t30 := $t29
+                    // $t31 := read_ref($t30)
+                    $t31 := $LoadU128($t30)
+                    // $t32 := 10
+                    $t32 := 10
+                    // $t33 := ==($t31, $t32)
+                    $t33 := $Eq($t31, $t32)
+                    // if ($t33) goto L4 else goto L3
+                    switch $t33
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t34 := 102
+                    $t34 := 102
+                    // abort($t34)
+                    $Abort($t34)
+                }
+                case 8 {
+                    // label L5
+                    // $t35 := borrow_local($t1)
+                    $t35 := $MakePtr(false, local_t)
+                    // $t36 := borrow_field<GlobalVectors::T<GlobalVectors::S>>.v($t35)
+                    $t36 := $t35
+                    // $t37 := 1
+                    $t37 := 1
+                    // $t38 := vector::borrow<GlobalVectors::S>($t36, $t37)
+                    $t38 := A1_vector_borrow$A2_GlobalVectors_S$($t36, $t37)
+                    // $t39 := borrow_field<GlobalVectors::S>.x($t38)
+                    $t39 := $t38
+                    // $t40 := read_ref($t39)
+                    $t40 := $LoadU128($t39)
+                    // $t41 := 11
+                    $t41 := 11
+                    // $t42 := ==($t40, $t41)
+                    $t42 := $Eq($t40, $t41)
+                    // if ($t42) goto L7 else goto L6
+                    switch $t42
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t43 := 103
+                    $t43 := 103
+                    // abort($t43)
+                    $Abort($t43)
+                }
+                case 11 {
+                    // label L8
+                    // $t44 := borrow_local($t1)
+                    $t44 := $MakePtr(false, local_t)
+                    // $t45 := borrow_field<GlobalVectors::T<GlobalVectors::S>>.v($t44)
+                    $t45 := $t44
+                    // $t46 := 2
+                    $t46 := 2
+                    // $t47 := vector::borrow<GlobalVectors::S>($t45, $t46)
+                    $t47 := A1_vector_borrow$A2_GlobalVectors_S$($t45, $t46)
+                    // $t48 := borrow_field<GlobalVectors::S>.x($t47)
+                    $t48 := $t47
+                    // $t49 := read_ref($t48)
+                    $t49 := $LoadU128($t48)
+                    // $t50 := 12
+                    $t50 := 12
+                    // $t51 := ==($t49, $t50)
+                    $t51 := $Eq($t49, $t50)
+                    // if ($t51) goto L10 else goto L9
+                    switch $t51
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t52 := 104
+                    $t52 := 104
+                    // abort($t52)
+                    $Abort($t52)
+                }
+                case 14 {
+                    // label L11
+                    // return ()
+                    $Free($locals, 64)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_borrow$A2_GlobalVectors_S$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 32)))
+            let e := $LoadU256(e_ptr)
+            e_ptr := $MakePtr($IsStoragePtr(v_ref), e)
+        }
+        function A1_vector_length$A2_GlobalVectors_S$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A2_Evm_sign(addr) -> signer {
+          signer := addr
+        }
+        function A1_vector_push_back$A2_GlobalVectors_S$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 32)))
+            $StoreU256(e_ptr, e)
+            if $IsStoragePtr(e_ptr) {
+                let e_offs := $OffsetPtr(e_ptr)
+                let $linked_dst_3681206257 := $NewLinkedStorageBase(0xdb6abff1)
+                $AlignedStorageStore(add($linked_dst_3681206257, 0), mload(add(e, 0)))
+                $Free(e, 24)
+                $AlignedStorageStore(e_offs, $linked_dst_3681206257)
+            }
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 32)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_vector_empty$A2_GlobalVectors_S$() -> vector {
+            vector := $Malloc(96)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU128(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU128(offs)
+          }
+          default {
+            val := $StorageLoadU128(offs)
+          }
+        }
+        function $MemoryLoadU128(offs) -> val {
+          val := $MemoryLoadBytes(offs, 16)
+        }
+        function $StorageLoadU128(offs) -> val {
+          val := $StorageLoadBytes(offs, 16)
+        }
+        function $MemoryStoreU128(offs, val) {
+          $MemoryStoreBytes(offs, 16, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $GtEq(x, y) -> r {
+            r := or(gt(x, y), eq(x, y))
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $ClosestGreaterPowerOfTwo(x) -> r {
+            r := or(r, shr(1, x))
+            r := or(r, shr(2, r))
+            r := or(r, shr(4, r))
+            r := or(r, shr(8, r))
+            r := or(r, shr(16, r))
+            r := or(r, shr(32, r))
+            r := add(x, 1)
+        }
+    }
+}
+===> Test result of GlobalVectors::test_move_from_vector_of_struct: Succeed(Stopped) (used_gas=187040): []
+
+// test of GlobalVectors::test_move_from_vector_of_vector
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_GlobalVectors_test_move_from_vector_of_vector" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_GlobalVectors_test_move_from_vector_of_vector()
+        return (0, 0)
+        function A2_GlobalVectors_test_move_from_vector_of_vector() {
+            let local_t, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32, $t33, $t34, $t35, $t36, $t37, $t38, $t39, $t40, $t41, $t42, $t43, $t44, $t45, $t46, $t47, $t48, $t49, $t50, $t51, $t52
+            let $locals := $Malloc(64)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t22 := 101
+                    $t22 := 101
+                    // abort($t22)
+                    $Abort($t22)
+                }
+                case 4 {
+                    // $t2 := vector::empty<vector<u64>>()
+                    mstore($locals, A1_vector_empty$vec$u64$$())
+                    // $t3 := borrow_local($t2)
+                    $t3 := $MakePtr(false, $locals)
+                    // $t4 := 10
+                    $t4 := 10
+                    // $t5 := vector::singleton<u64>($t4)
+                    $t5 := A1_vector_singleton$u64$($t4)
+                    // vector::push_back<vector<u64>>($t3, $t5)
+                    A1_vector_push_back$vec$u64$$($t3, $t5)
+                    // $t6 := borrow_local($t2)
+                    $t6 := $MakePtr(false, $locals)
+                    // $t7 := 11
+                    $t7 := 11
+                    // $t8 := vector::singleton<u64>($t7)
+                    $t8 := A1_vector_singleton$u64$($t7)
+                    // vector::push_back<vector<u64>>($t6, $t8)
+                    A1_vector_push_back$vec$u64$$($t6, $t8)
+                    // $t9 := borrow_local($t2)
+                    $t9 := $MakePtr(false, $locals)
+                    // $t10 := 12
+                    $t10 := 12
+                    // $t11 := vector::singleton<u64>($t10)
+                    $t11 := A1_vector_singleton$u64$($t10)
+                    // vector::push_back<vector<u64>>($t9, $t11)
+                    A1_vector_push_back$vec$u64$$($t9, $t11)
+                    // $t12 := 0x42
+                    $t12 := 0x42
+                    // $t0 := Evm::sign($t12)
+                    mstore(add($locals, 32), A2_Evm_sign($t12))
+                    // $t13 := borrow_local($t0)
+                    $t13 := $MakePtr(false, add($locals, 32))
+                    // $t14 := move($t2)
+                    $t14 := mload($locals)
+                    // $t15 := pack GlobalVectors::T<vector<u64>>($t14)
+                    {
+                        let $mem := $Malloc(32)
+                        $MemoryStoreU256(add($mem, 0), $t14)
+                        $t15 := $mem
+                    }
+                    // move_to<GlobalVectors::T<vector<u64>>>($t15, $t13)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x9947b477, $LoadU256($t13))
+                        if $AlignedStorageLoad($base_offset) {
+                          $AbortBuiltin()
+                        }
+                        $AlignedStorageStore($base_offset, true)
+                        {
+                            let $dst := add($base_offset, 32)
+                            let $src := $t15
+                            {
+                                let $linked_src_3066871491 := mload(add($src, 0))
+                                let $linked_dst_3066871491 := $NewLinkedStorageBase(0xb6ccbec3)
+                                let $size_3066871491 := $MemoryLoadU64($linked_src_3066871491)
+                                let $data_size_3066871491 := mul($size_3066871491, 32)
+                                $AlignedStorageStore($linked_dst_3066871491, mload($linked_src_3066871491))
+                                let $data_src_3066871491 := add($linked_src_3066871491, 32)
+                                let $data_dst_3066871491 := add($linked_dst_3066871491, 32)
+                                for { let $offs_3066871491 := 0 } lt($offs_3066871491, $data_size_3066871491) { $offs_3066871491 := add($offs_3066871491, 32)} {
+                                    {
+                                        let $linked_src_814019441 := mload(add($offs_3066871491, $data_src_3066871491))
+                                        let $linked_dst_814019441 := $NewLinkedStorageBase(0x3084f371)
+                                        let $size_814019441 := $MemoryLoadU64($linked_src_814019441)
+                                        let $data_size_814019441 := mul($size_814019441, 8)
+                                        $AlignedStorageStore($linked_dst_814019441, mload($linked_src_814019441))
+                                        let $data_src_814019441 := add($linked_src_814019441, 32)
+                                        let $data_dst_814019441 := add($linked_dst_814019441, 32)
+                                        for { let $offs_814019441 := 0 } lt($offs_814019441, $data_size_814019441) { $offs_814019441 := add($offs_814019441, 32)} {
+                                            $AlignedStorageStore(add($data_dst_814019441, $offs_814019441), mload(add($data_src_814019441, $offs_814019441)))
+                                            $Free($linked_src_814019441, add($data_size_814019441, 32))
+                                        }
+                                        $AlignedStorageStore(add($data_dst_3066871491, $offs_3066871491), $linked_dst_814019441)
+                                    }
+                                    $Free($linked_src_3066871491, add($data_size_3066871491, 32))
+                                }
+                                $AlignedStorageStore(add($dst, 0), $linked_dst_3066871491)
+                            }
+                            $Free($src, 32)
+                        }
+                    }
+                    // $t16 := 0x42
+                    $t16 := 0x42
+                    // $t1 := move_from<GlobalVectors::T<vector<u64>>>($t16)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x9947b477, $t16)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $AlignedStorageStore($base_offset, false)
+                        {
+                            let $src := add($base_offset, 32)
+                            let $dst
+                            $dst := $Malloc(32)
+                            {
+                                let $linked_src_3066871491 := $AlignedStorageLoad(add($src, 0))
+                                let $linked_dst_3066871491
+                                let $size_3066871491 := $StorageLoadU64($linked_src_3066871491)
+                                let $capacity_3066871491 := $ClosestGreaterPowerOfTwo($size_3066871491)
+                                $linked_dst_3066871491 := $Malloc(add(32, mul($capacity_3066871491, 32)))
+                                let $data_size_3066871491 := mul($size_3066871491, 32)
+                                mstore($linked_dst_3066871491, $AlignedStorageLoad($linked_src_3066871491))
+                                $MemoryStoreU64(add($linked_dst_3066871491, 8), $capacity_3066871491)
+                                let $data_src_3066871491 := add($linked_src_3066871491, 32)
+                                let $data_dst_3066871491 := add($linked_dst_3066871491, 32)
+                                for { let $offs_3066871491 := 0 } lt($offs_3066871491, $data_size_3066871491) { $offs_3066871491 := add($offs_3066871491, 32)} {
+                                    {
+                                        let $linked_src_814019441 := $AlignedStorageLoad(add($data_src_3066871491, $offs_3066871491))
+                                        let $linked_dst_814019441
+                                        let $size_814019441 := $StorageLoadU64($linked_src_814019441)
+                                        let $capacity_814019441 := $ClosestGreaterPowerOfTwo($size_814019441)
+                                        $linked_dst_814019441 := $Malloc(add(32, mul($capacity_814019441, 8)))
+                                        let $data_size_814019441 := mul($size_814019441, 8)
+                                        mstore($linked_dst_814019441, $AlignedStorageLoad($linked_src_814019441))
+                                        $MemoryStoreU64(add($linked_dst_814019441, 8), $capacity_814019441)
+                                        let $data_src_814019441 := add($linked_src_814019441, 32)
+                                        let $data_dst_814019441 := add($linked_dst_814019441, 32)
+                                        for { let $offs_814019441 := 0 } lt($offs_814019441, $data_size_814019441) { $offs_814019441 := add($offs_814019441, 32)} {
+                                            mstore(add($data_dst_814019441, $offs_814019441), $AlignedStorageLoad(add($data_src_814019441, $offs_814019441)))
+                                            $AlignedStorageStore(add($data_src_814019441, $offs_814019441), 0)
+                                        }
+                                        mstore(add($data_dst_3066871491, $offs_3066871491), $linked_dst_814019441)
+                                        $AlignedStorageStore(add($data_src_3066871491, $offs_3066871491), 0)
+                                    }
+                                }
+                                mstore(add($dst, 0), $linked_dst_3066871491)
+                                $AlignedStorageStore(add($src, 0), 0)
+                            }
+                            local_t := $dst
+                        }
+                    }
+                    // $t17 := borrow_local($t1)
+                    $t17 := $MakePtr(false, local_t)
+                    // $t18 := borrow_field<GlobalVectors::T<vector<u64>>>.v($t17)
+                    $t18 := $t17
+                    // $t19 := vector::length<vector<u64>>($t18)
+                    $t19 := A1_vector_length$vec$u64$$($t18)
+                    // $t20 := 3
+                    $t20 := 3
+                    // $t21 := ==($t19, $t20)
+                    $t21 := $Eq($t19, $t20)
+                    // if ($t21) goto L1 else goto L0
+                    switch $t21
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t23 := borrow_local($t1)
+                    $t23 := $MakePtr(false, local_t)
+                    // $t24 := borrow_field<GlobalVectors::T<vector<u64>>>.v($t23)
+                    $t24 := $t23
+                    // $t25 := 0
+                    $t25 := 0
+                    // $t26 := vector::borrow<vector<u64>>($t24, $t25)
+                    $t26 := A1_vector_borrow$vec$u64$$($t24, $t25)
+                    // $t27 := 0
+                    $t27 := 0
+                    // $t28 := vector::borrow<u64>($t26, $t27)
+                    $t28 := A1_vector_borrow$u64$($t26, $t27)
+                    // $t29 := read_ref($t28)
+                    $t29 := $LoadU64($t28)
+                    // $t30 := 10
+                    $t30 := 10
+                    // $t31 := ==($t29, $t30)
+                    $t31 := $Eq($t29, $t30)
+                    // if ($t31) goto L4 else goto L3
+                    switch $t31
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t32 := 102
+                    $t32 := 102
+                    // abort($t32)
+                    $Abort($t32)
+                }
+                case 8 {
+                    // label L5
+                    // $t33 := borrow_local($t1)
+                    $t33 := $MakePtr(false, local_t)
+                    // $t34 := borrow_field<GlobalVectors::T<vector<u64>>>.v($t33)
+                    $t34 := $t33
+                    // $t35 := 1
+                    $t35 := 1
+                    // $t36 := vector::borrow<vector<u64>>($t34, $t35)
+                    $t36 := A1_vector_borrow$vec$u64$$($t34, $t35)
+                    // $t37 := 0
+                    $t37 := 0
+                    // $t38 := vector::borrow<u64>($t36, $t37)
+                    $t38 := A1_vector_borrow$u64$($t36, $t37)
+                    // $t39 := read_ref($t38)
+                    $t39 := $LoadU64($t38)
+                    // $t40 := 11
+                    $t40 := 11
+                    // $t41 := ==($t39, $t40)
+                    $t41 := $Eq($t39, $t40)
+                    // if ($t41) goto L7 else goto L6
+                    switch $t41
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t42 := 102
+                    $t42 := 102
+                    // abort($t42)
+                    $Abort($t42)
+                }
+                case 11 {
+                    // label L8
+                    // $t43 := borrow_local($t1)
+                    $t43 := $MakePtr(false, local_t)
+                    // $t44 := borrow_field<GlobalVectors::T<vector<u64>>>.v($t43)
+                    $t44 := $t43
+                    // $t45 := 2
+                    $t45 := 2
+                    // $t46 := vector::borrow<vector<u64>>($t44, $t45)
+                    $t46 := A1_vector_borrow$vec$u64$$($t44, $t45)
+                    // $t47 := 0
+                    $t47 := 0
+                    // $t48 := vector::borrow<u64>($t46, $t47)
+                    $t48 := A1_vector_borrow$u64$($t46, $t47)
+                    // $t49 := read_ref($t48)
+                    $t49 := $LoadU64($t48)
+                    // $t50 := 12
+                    $t50 := 12
+                    // $t51 := ==($t49, $t50)
+                    $t51 := $Eq($t49, $t50)
+                    // if ($t51) goto L10 else goto L9
+                    switch $t51
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t52 := 102
+                    $t52 := 102
+                    // abort($t52)
+                    $Abort($t52)
+                }
+                case 14 {
+                    // label L11
+                    // return ()
+                    $Free($locals, 64)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_borrow$u64$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 8)))
+        }
+        function A1_vector_borrow$vec$u64$$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 32)))
+        }
+        function A1_vector_length$vec$u64$$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A2_Evm_sign(addr) -> signer {
+          signer := addr
+        }
+        function A1_vector_push_back$vec$u64$$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 32)))
+            $StoreU256(e_ptr, e)
+            if $IsStoragePtr(e_ptr) {
+                let e_offs := $OffsetPtr(e_ptr)
+                let $linked_dst_814019441 := $NewLinkedStorageBase(0x3084f371)
+                let $size_814019441 := $MemoryLoadU64(e)
+                let $data_size_814019441 := mul($size_814019441, 8)
+                $AlignedStorageStore($linked_dst_814019441, mload(e))
+                let $data_src_814019441 := add(e, 32)
+                let $data_dst_814019441 := add($linked_dst_814019441, 32)
+                for { let $offs_814019441 := 0 } lt($offs_814019441, $data_size_814019441) { $offs_814019441 := add($offs_814019441, 32)} {
+                    $AlignedStorageStore(add($data_dst_814019441, $offs_814019441), mload(add($data_src_814019441, $offs_814019441)))
+                    $Free(e, add($data_size_814019441, 32))
+                }
+                $AlignedStorageStore(e_offs, $linked_dst_814019441)
+            }
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 32)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_vector_singleton$u64$(e) -> $result {
+            let $t2, $t3
+            let $locals := $Malloc(32)
+            // $t1 := vector::empty<#0>()
+            mstore($locals, A1_vector_empty$u64$())
+            // $t2 := borrow_local($t1)
+            $t2 := $MakePtr(false, $locals)
+            // vector::push_back<#0>($t2, $t0)
+            A1_vector_push_back$u64$($t2, e)
+            // $t3 := move($t1)
+            $t3 := mload($locals)
+            // return $t3
+            $result := $t3
+            $Free($locals, 32)
+        }
+
+        function A1_vector_push_back$u64$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 8)))
+            $StoreU64(e_ptr, e)
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 8)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_vector_empty$u64$() -> vector {
+            vector := $Malloc(48)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function A1_vector_empty$vec$u64$$() -> vector {
+            vector := $Malloc(96)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $GtEq(x, y) -> r {
+            r := or(gt(x, y), eq(x, y))
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $ClosestGreaterPowerOfTwo(x) -> r {
+            r := or(r, shr(1, x))
+            r := or(r, shr(2, r))
+            r := or(r, shr(4, r))
+            r := or(r, shr(8, r))
+            r := or(r, shr(16, r))
+            r := or(r, shr(32, r))
+            r := add(x, 1)
+        }
+    }
+}
+===> Test result of GlobalVectors::test_move_from_vector_of_vector: Succeed(Stopped) (used_gas=244640): []
+
+// test of GlobalVectors::test_move_to
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_GlobalVectors_test_move_to" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_GlobalVectors_test_move_to()
+        return (0, 0)
+        function A2_GlobalVectors_test_move_to() {
+            let $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32, $t33, $t34, $t35, $t36, $t37, $t38, $t39, $t40, $t41, $t42, $t43, $t44, $t45
+            let $locals := $Malloc(64)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t18 := 101
+                    $t18 := 101
+                    // abort($t18)
+                    $Abort($t18)
+                }
+                case 4 {
+                    // $t1 := vector::empty<u64>()
+                    mstore($locals, A1_vector_empty$u64$())
+                    // $t2 := borrow_local($t1)
+                    $t2 := $MakePtr(false, $locals)
+                    // $t3 := 10
+                    $t3 := 10
+                    // vector::push_back<u64>($t2, $t3)
+                    A1_vector_push_back$u64$($t2, $t3)
+                    // $t4 := borrow_local($t1)
+                    $t4 := $MakePtr(false, $locals)
+                    // $t5 := 11
+                    $t5 := 11
+                    // vector::push_back<u64>($t4, $t5)
+                    A1_vector_push_back$u64$($t4, $t5)
+                    // $t6 := borrow_local($t1)
+                    $t6 := $MakePtr(false, $locals)
+                    // $t7 := 12
+                    $t7 := 12
+                    // vector::push_back<u64>($t6, $t7)
+                    A1_vector_push_back$u64$($t6, $t7)
+                    // $t8 := 0x42
+                    $t8 := 0x42
+                    // $t0 := Evm::sign($t8)
+                    mstore(add($locals, 32), A2_Evm_sign($t8))
+                    // $t9 := borrow_local($t0)
+                    $t9 := $MakePtr(false, add($locals, 32))
+                    // $t10 := move($t1)
+                    $t10 := mload($locals)
+                    // $t11 := pack GlobalVectors::T<u64>($t10)
+                    {
+                        let $mem := $Malloc(32)
+                        $MemoryStoreU256(add($mem, 0), $t10)
+                        $t11 := $mem
+                    }
+                    // move_to<GlobalVectors::T<u64>>($t11, $t9)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $LoadU256($t9))
+                        if $AlignedStorageLoad($base_offset) {
+                          $AbortBuiltin()
+                        }
+                        $AlignedStorageStore($base_offset, true)
+                        {
+                            let $dst := add($base_offset, 32)
+                            let $src := $t11
+                            {
+                                let $linked_src_814019441 := mload(add($src, 0))
+                                let $linked_dst_814019441 := $NewLinkedStorageBase(0x3084f371)
+                                let $size_814019441 := $MemoryLoadU64($linked_src_814019441)
+                                let $data_size_814019441 := mul($size_814019441, 8)
+                                $AlignedStorageStore($linked_dst_814019441, mload($linked_src_814019441))
+                                let $data_src_814019441 := add($linked_src_814019441, 32)
+                                let $data_dst_814019441 := add($linked_dst_814019441, 32)
+                                for { let $offs_814019441 := 0 } lt($offs_814019441, $data_size_814019441) { $offs_814019441 := add($offs_814019441, 32)} {
+                                    $AlignedStorageStore(add($data_dst_814019441, $offs_814019441), mload(add($data_src_814019441, $offs_814019441)))
+                                    $Free($linked_src_814019441, add($data_size_814019441, 32))
+                                }
+                                $AlignedStorageStore(add($dst, 0), $linked_dst_814019441)
+                            }
+                            $Free($src, 32)
+                        }
+                    }
+                    // $t12 := 0x42
+                    $t12 := 0x42
+                    // $t13 := borrow_global<GlobalVectors::T<u64>>($t12)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $t12)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t13 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t14 := borrow_field<GlobalVectors::T<u64>>.v($t13)
+                    $t14 := $t13
+                    // $t15 := vector::length<u64>($t14)
+                    $t15 := A1_vector_length$u64$($t14)
+                    // $t16 := 3
+                    $t16 := 3
+                    // $t17 := ==($t15, $t16)
+                    $t17 := $Eq($t15, $t16)
+                    // if ($t17) goto L1 else goto L0
+                    switch $t17
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t19 := 0x42
+                    $t19 := 0x42
+                    // $t20 := borrow_global<GlobalVectors::T<u64>>($t19)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $t19)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t20 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t21 := borrow_field<GlobalVectors::T<u64>>.v($t20)
+                    $t21 := $t20
+                    // $t22 := 0
+                    $t22 := 0
+                    // $t23 := vector::borrow<u64>($t21, $t22)
+                    $t23 := A1_vector_borrow$u64$($t21, $t22)
+                    // $t24 := read_ref($t23)
+                    $t24 := $LoadU64($t23)
+                    // $t25 := 10
+                    $t25 := 10
+                    // $t26 := ==($t24, $t25)
+                    $t26 := $Eq($t24, $t25)
+                    // if ($t26) goto L4 else goto L3
+                    switch $t26
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t27 := 102
+                    $t27 := 102
+                    // abort($t27)
+                    $Abort($t27)
+                }
+                case 8 {
+                    // label L5
+                    // $t28 := 0x42
+                    $t28 := 0x42
+                    // $t29 := borrow_global<GlobalVectors::T<u64>>($t28)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $t28)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t29 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t30 := borrow_field<GlobalVectors::T<u64>>.v($t29)
+                    $t30 := $t29
+                    // $t31 := 1
+                    $t31 := 1
+                    // $t32 := vector::borrow<u64>($t30, $t31)
+                    $t32 := A1_vector_borrow$u64$($t30, $t31)
+                    // $t33 := read_ref($t32)
+                    $t33 := $LoadU64($t32)
+                    // $t34 := 11
+                    $t34 := 11
+                    // $t35 := ==($t33, $t34)
+                    $t35 := $Eq($t33, $t34)
+                    // if ($t35) goto L7 else goto L6
+                    switch $t35
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t36 := 103
+                    $t36 := 103
+                    // abort($t36)
+                    $Abort($t36)
+                }
+                case 11 {
+                    // label L8
+                    // $t37 := 0x42
+                    $t37 := 0x42
+                    // $t38 := borrow_global<GlobalVectors::T<u64>>($t37)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $t37)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t38 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t39 := borrow_field<GlobalVectors::T<u64>>.v($t38)
+                    $t39 := $t38
+                    // $t40 := 2
+                    $t40 := 2
+                    // $t41 := vector::borrow<u64>($t39, $t40)
+                    $t41 := A1_vector_borrow$u64$($t39, $t40)
+                    // $t42 := read_ref($t41)
+                    $t42 := $LoadU64($t41)
+                    // $t43 := 12
+                    $t43 := 12
+                    // $t44 := ==($t42, $t43)
+                    $t44 := $Eq($t42, $t43)
+                    // if ($t44) goto L10 else goto L9
+                    switch $t44
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t45 := 104
+                    $t45 := 104
+                    // abort($t45)
+                    $Abort($t45)
+                }
+                case 14 {
+                    // label L11
+                    // return ()
+                    $Free($locals, 64)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_borrow$u64$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 8)))
+        }
+        function A1_vector_length$u64$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A2_Evm_sign(addr) -> signer {
+          signer := addr
+        }
+        function A1_vector_push_back$u64$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 8)))
+            $StoreU64(e_ptr, e)
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 8)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_vector_empty$u64$() -> vector {
+            vector := $Malloc(48)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $GtEq(x, y) -> r {
+            r := or(gt(x, y), eq(x, y))
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of GlobalVectors::test_move_to: Succeed(Stopped) (used_gas=121112): []
+
+// test of GlobalVectors::test_move_to_vector_of_struct
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_GlobalVectors_test_move_to_vector_of_struct" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_GlobalVectors_test_move_to_vector_of_struct()
+        return (0, 0)
+        function A2_GlobalVectors_test_move_to_vector_of_struct() {
+            let $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32, $t33, $t34, $t35, $t36, $t37, $t38, $t39, $t40, $t41, $t42, $t43, $t44, $t45, $t46, $t47, $t48, $t49, $t50, $t51, $t52, $t53, $t54
+            let $locals := $Malloc(64)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t24 := 101
+                    $t24 := 101
+                    // abort($t24)
+                    $Abort($t24)
+                }
+                case 4 {
+                    // $t1 := vector::empty<GlobalVectors::S>()
+                    mstore($locals, A1_vector_empty$A2_GlobalVectors_S$())
+                    // $t2 := borrow_local($t1)
+                    $t2 := $MakePtr(false, $locals)
+                    // $t3 := 10
+                    $t3 := 10
+                    // $t4 := 40
+                    $t4 := 40
+                    // $t5 := pack GlobalVectors::S($t3, $t4)
+                    {
+                        let $mem := $Malloc(24)
+                        $MemoryStoreU128(add($mem, 0), $t3)
+                        $MemoryStoreU64(add($mem, 16), $t4)
+                        $t5 := $mem
+                    }
+                    // vector::push_back<GlobalVectors::S>($t2, $t5)
+                    A1_vector_push_back$A2_GlobalVectors_S$($t2, $t5)
+                    // $t6 := borrow_local($t1)
+                    $t6 := $MakePtr(false, $locals)
+                    // $t7 := 11
+                    $t7 := 11
+                    // $t8 := 41
+                    $t8 := 41
+                    // $t9 := pack GlobalVectors::S($t7, $t8)
+                    {
+                        let $mem := $Malloc(24)
+                        $MemoryStoreU128(add($mem, 0), $t7)
+                        $MemoryStoreU64(add($mem, 16), $t8)
+                        $t9 := $mem
+                    }
+                    // vector::push_back<GlobalVectors::S>($t6, $t9)
+                    A1_vector_push_back$A2_GlobalVectors_S$($t6, $t9)
+                    // $t10 := borrow_local($t1)
+                    $t10 := $MakePtr(false, $locals)
+                    // $t11 := 12
+                    $t11 := 12
+                    // $t12 := 42
+                    $t12 := 42
+                    // $t13 := pack GlobalVectors::S($t11, $t12)
+                    {
+                        let $mem := $Malloc(24)
+                        $MemoryStoreU128(add($mem, 0), $t11)
+                        $MemoryStoreU64(add($mem, 16), $t12)
+                        $t13 := $mem
+                    }
+                    // vector::push_back<GlobalVectors::S>($t10, $t13)
+                    A1_vector_push_back$A2_GlobalVectors_S$($t10, $t13)
+                    // $t14 := 0x42
+                    $t14 := 0x42
+                    // $t0 := Evm::sign($t14)
+                    mstore(add($locals, 32), A2_Evm_sign($t14))
+                    // $t15 := borrow_local($t0)
+                    $t15 := $MakePtr(false, add($locals, 32))
+                    // $t16 := move($t1)
+                    $t16 := mload($locals)
+                    // $t17 := pack GlobalVectors::T<GlobalVectors::S>($t16)
+                    {
+                        let $mem := $Malloc(32)
+                        $MemoryStoreU256(add($mem, 0), $t16)
+                        $t17 := $mem
+                    }
+                    // move_to<GlobalVectors::T<GlobalVectors::S>>($t17, $t15)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x27c9b6b7, $LoadU256($t15))
+                        if $AlignedStorageLoad($base_offset) {
+                          $AbortBuiltin()
+                        }
+                        $AlignedStorageStore($base_offset, true)
+                        {
+                            let $dst := add($base_offset, 32)
+                            let $src := $t17
+                            {
+                                let $linked_src_634259357 := mload(add($src, 0))
+                                let $linked_dst_634259357 := $NewLinkedStorageBase(0x25ce079d)
+                                let $size_634259357 := $MemoryLoadU64($linked_src_634259357)
+                                let $data_size_634259357 := mul($size_634259357, 32)
+                                $AlignedStorageStore($linked_dst_634259357, mload($linked_src_634259357))
+                                let $data_src_634259357 := add($linked_src_634259357, 32)
+                                let $data_dst_634259357 := add($linked_dst_634259357, 32)
+                                for { let $offs_634259357 := 0 } lt($offs_634259357, $data_size_634259357) { $offs_634259357 := add($offs_634259357, 32)} {
+                                    {
+                                        let $linked_src_3681206257 := mload(add($offs_634259357, $data_src_634259357))
+                                        let $linked_dst_3681206257 := $NewLinkedStorageBase(0xdb6abff1)
+                                        $AlignedStorageStore(add($linked_dst_3681206257, 0), mload(add($linked_src_3681206257, 0)))
+                                        $Free($linked_src_3681206257, 24)
+                                        $AlignedStorageStore(add($data_dst_634259357, $offs_634259357), $linked_dst_3681206257)
+                                    }
+                                    $Free($linked_src_634259357, add($data_size_634259357, 32))
+                                }
+                                $AlignedStorageStore(add($dst, 0), $linked_dst_634259357)
+                            }
+                            $Free($src, 32)
+                        }
+                    }
+                    // $t18 := 0x42
+                    $t18 := 0x42
+                    // $t19 := borrow_global<GlobalVectors::T<GlobalVectors::S>>($t18)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x27c9b6b7, $t18)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t19 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t20 := borrow_field<GlobalVectors::T<GlobalVectors::S>>.v($t19)
+                    $t20 := $t19
+                    // $t21 := vector::length<GlobalVectors::S>($t20)
+                    $t21 := A1_vector_length$A2_GlobalVectors_S$($t20)
+                    // $t22 := 3
+                    $t22 := 3
+                    // $t23 := ==($t21, $t22)
+                    $t23 := $Eq($t21, $t22)
+                    // if ($t23) goto L1 else goto L0
+                    switch $t23
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t25 := 0x42
+                    $t25 := 0x42
+                    // $t26 := borrow_global<GlobalVectors::T<GlobalVectors::S>>($t25)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x27c9b6b7, $t25)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t26 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t27 := borrow_field<GlobalVectors::T<GlobalVectors::S>>.v($t26)
+                    $t27 := $t26
+                    // $t28 := 0
+                    $t28 := 0
+                    // $t29 := vector::borrow<GlobalVectors::S>($t27, $t28)
+                    $t29 := A1_vector_borrow$A2_GlobalVectors_S$($t27, $t28)
+                    // $t30 := borrow_field<GlobalVectors::S>.x($t29)
+                    $t30 := $t29
+                    // $t31 := read_ref($t30)
+                    $t31 := $LoadU128($t30)
+                    // $t32 := 10
+                    $t32 := 10
+                    // $t33 := ==($t31, $t32)
+                    $t33 := $Eq($t31, $t32)
+                    // if ($t33) goto L4 else goto L3
+                    switch $t33
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t34 := 102
+                    $t34 := 102
+                    // abort($t34)
+                    $Abort($t34)
+                }
+                case 8 {
+                    // label L5
+                    // $t35 := 0x42
+                    $t35 := 0x42
+                    // $t36 := borrow_global<GlobalVectors::T<GlobalVectors::S>>($t35)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x27c9b6b7, $t35)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t36 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t37 := borrow_field<GlobalVectors::T<GlobalVectors::S>>.v($t36)
+                    $t37 := $t36
+                    // $t38 := 1
+                    $t38 := 1
+                    // $t39 := vector::borrow<GlobalVectors::S>($t37, $t38)
+                    $t39 := A1_vector_borrow$A2_GlobalVectors_S$($t37, $t38)
+                    // $t40 := borrow_field<GlobalVectors::S>.x($t39)
+                    $t40 := $t39
+                    // $t41 := read_ref($t40)
+                    $t41 := $LoadU128($t40)
+                    // $t42 := 11
+                    $t42 := 11
+                    // $t43 := ==($t41, $t42)
+                    $t43 := $Eq($t41, $t42)
+                    // if ($t43) goto L7 else goto L6
+                    switch $t43
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t44 := 103
+                    $t44 := 103
+                    // abort($t44)
+                    $Abort($t44)
+                }
+                case 11 {
+                    // label L8
+                    // $t45 := 0x42
+                    $t45 := 0x42
+                    // $t46 := borrow_global<GlobalVectors::T<GlobalVectors::S>>($t45)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x27c9b6b7, $t45)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t46 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t47 := borrow_field<GlobalVectors::T<GlobalVectors::S>>.v($t46)
+                    $t47 := $t46
+                    // $t48 := 2
+                    $t48 := 2
+                    // $t49 := vector::borrow<GlobalVectors::S>($t47, $t48)
+                    $t49 := A1_vector_borrow$A2_GlobalVectors_S$($t47, $t48)
+                    // $t50 := borrow_field<GlobalVectors::S>.x($t49)
+                    $t50 := $t49
+                    // $t51 := read_ref($t50)
+                    $t51 := $LoadU128($t50)
+                    // $t52 := 12
+                    $t52 := 12
+                    // $t53 := ==($t51, $t52)
+                    $t53 := $Eq($t51, $t52)
+                    // if ($t53) goto L10 else goto L9
+                    switch $t53
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t54 := 104
+                    $t54 := 104
+                    // abort($t54)
+                    $Abort($t54)
+                }
+                case 14 {
+                    // label L11
+                    // return ()
+                    $Free($locals, 64)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_borrow$A2_GlobalVectors_S$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 32)))
+            let e := $LoadU256(e_ptr)
+            e_ptr := $MakePtr($IsStoragePtr(v_ref), e)
+        }
+        function A1_vector_length$A2_GlobalVectors_S$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A2_Evm_sign(addr) -> signer {
+          signer := addr
+        }
+        function A1_vector_push_back$A2_GlobalVectors_S$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 32)))
+            $StoreU256(e_ptr, e)
+            if $IsStoragePtr(e_ptr) {
+                let e_offs := $OffsetPtr(e_ptr)
+                let $linked_dst_3681206257 := $NewLinkedStorageBase(0xdb6abff1)
+                $AlignedStorageStore(add($linked_dst_3681206257, 0), mload(add(e, 0)))
+                $Free(e, 24)
+                $AlignedStorageStore(e_offs, $linked_dst_3681206257)
+            }
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 32)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_vector_empty$A2_GlobalVectors_S$() -> vector {
+            vector := $Malloc(96)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU128(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU128(offs)
+          }
+          default {
+            val := $StorageLoadU128(offs)
+          }
+        }
+        function $MemoryLoadU128(offs) -> val {
+          val := $MemoryLoadBytes(offs, 16)
+        }
+        function $StorageLoadU128(offs) -> val {
+          val := $StorageLoadBytes(offs, 16)
+        }
+        function $MemoryStoreU128(offs, val) {
+          $MemoryStoreBytes(offs, 16, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $GtEq(x, y) -> r {
+            r := or(gt(x, y), eq(x, y))
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of GlobalVectors::test_move_to_vector_of_struct: Succeed(Stopped) (used_gas=234677): []
+
+// test of GlobalVectors::test_move_to_vector_of_vector
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_GlobalVectors_test_move_to_vector_of_vector" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_GlobalVectors_test_move_to_vector_of_vector()
+        return (0, 0)
+        function A2_GlobalVectors_test_move_to_vector_of_vector() {
+            let $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32, $t33, $t34, $t35, $t36, $t37, $t38, $t39, $t40, $t41, $t42, $t43, $t44, $t45, $t46, $t47, $t48, $t49, $t50, $t51, $t52, $t53, $t54
+            let $locals := $Malloc(64)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t21 := 101
+                    $t21 := 101
+                    // abort($t21)
+                    $Abort($t21)
+                }
+                case 4 {
+                    // $t1 := vector::empty<vector<u64>>()
+                    mstore($locals, A1_vector_empty$vec$u64$$())
+                    // $t2 := borrow_local($t1)
+                    $t2 := $MakePtr(false, $locals)
+                    // $t3 := 10
+                    $t3 := 10
+                    // $t4 := vector::singleton<u64>($t3)
+                    $t4 := A1_vector_singleton$u64$($t3)
+                    // vector::push_back<vector<u64>>($t2, $t4)
+                    A1_vector_push_back$vec$u64$$($t2, $t4)
+                    // $t5 := borrow_local($t1)
+                    $t5 := $MakePtr(false, $locals)
+                    // $t6 := 11
+                    $t6 := 11
+                    // $t7 := vector::singleton<u64>($t6)
+                    $t7 := A1_vector_singleton$u64$($t6)
+                    // vector::push_back<vector<u64>>($t5, $t7)
+                    A1_vector_push_back$vec$u64$$($t5, $t7)
+                    // $t8 := borrow_local($t1)
+                    $t8 := $MakePtr(false, $locals)
+                    // $t9 := 12
+                    $t9 := 12
+                    // $t10 := vector::singleton<u64>($t9)
+                    $t10 := A1_vector_singleton$u64$($t9)
+                    // vector::push_back<vector<u64>>($t8, $t10)
+                    A1_vector_push_back$vec$u64$$($t8, $t10)
+                    // $t11 := 0x42
+                    $t11 := 0x42
+                    // $t0 := Evm::sign($t11)
+                    mstore(add($locals, 32), A2_Evm_sign($t11))
+                    // $t12 := borrow_local($t0)
+                    $t12 := $MakePtr(false, add($locals, 32))
+                    // $t13 := move($t1)
+                    $t13 := mload($locals)
+                    // $t14 := pack GlobalVectors::T<vector<u64>>($t13)
+                    {
+                        let $mem := $Malloc(32)
+                        $MemoryStoreU256(add($mem, 0), $t13)
+                        $t14 := $mem
+                    }
+                    // move_to<GlobalVectors::T<vector<u64>>>($t14, $t12)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x9947b477, $LoadU256($t12))
+                        if $AlignedStorageLoad($base_offset) {
+                          $AbortBuiltin()
+                        }
+                        $AlignedStorageStore($base_offset, true)
+                        {
+                            let $dst := add($base_offset, 32)
+                            let $src := $t14
+                            {
+                                let $linked_src_3066871491 := mload(add($src, 0))
+                                let $linked_dst_3066871491 := $NewLinkedStorageBase(0xb6ccbec3)
+                                let $size_3066871491 := $MemoryLoadU64($linked_src_3066871491)
+                                let $data_size_3066871491 := mul($size_3066871491, 32)
+                                $AlignedStorageStore($linked_dst_3066871491, mload($linked_src_3066871491))
+                                let $data_src_3066871491 := add($linked_src_3066871491, 32)
+                                let $data_dst_3066871491 := add($linked_dst_3066871491, 32)
+                                for { let $offs_3066871491 := 0 } lt($offs_3066871491, $data_size_3066871491) { $offs_3066871491 := add($offs_3066871491, 32)} {
+                                    {
+                                        let $linked_src_814019441 := mload(add($offs_3066871491, $data_src_3066871491))
+                                        let $linked_dst_814019441 := $NewLinkedStorageBase(0x3084f371)
+                                        let $size_814019441 := $MemoryLoadU64($linked_src_814019441)
+                                        let $data_size_814019441 := mul($size_814019441, 8)
+                                        $AlignedStorageStore($linked_dst_814019441, mload($linked_src_814019441))
+                                        let $data_src_814019441 := add($linked_src_814019441, 32)
+                                        let $data_dst_814019441 := add($linked_dst_814019441, 32)
+                                        for { let $offs_814019441 := 0 } lt($offs_814019441, $data_size_814019441) { $offs_814019441 := add($offs_814019441, 32)} {
+                                            $AlignedStorageStore(add($data_dst_814019441, $offs_814019441), mload(add($data_src_814019441, $offs_814019441)))
+                                            $Free($linked_src_814019441, add($data_size_814019441, 32))
+                                        }
+                                        $AlignedStorageStore(add($data_dst_3066871491, $offs_3066871491), $linked_dst_814019441)
+                                    }
+                                    $Free($linked_src_3066871491, add($data_size_3066871491, 32))
+                                }
+                                $AlignedStorageStore(add($dst, 0), $linked_dst_3066871491)
+                            }
+                            $Free($src, 32)
+                        }
+                    }
+                    // $t15 := 0x42
+                    $t15 := 0x42
+                    // $t16 := borrow_global<GlobalVectors::T<vector<u64>>>($t15)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x9947b477, $t15)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t16 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t17 := borrow_field<GlobalVectors::T<vector<u64>>>.v($t16)
+                    $t17 := $t16
+                    // $t18 := vector::length<vector<u64>>($t17)
+                    $t18 := A1_vector_length$vec$u64$$($t17)
+                    // $t19 := 3
+                    $t19 := 3
+                    // $t20 := ==($t18, $t19)
+                    $t20 := $Eq($t18, $t19)
+                    // if ($t20) goto L1 else goto L0
+                    switch $t20
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t22 := 0x42
+                    $t22 := 0x42
+                    // $t23 := borrow_global<GlobalVectors::T<vector<u64>>>($t22)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x9947b477, $t22)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t23 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t24 := borrow_field<GlobalVectors::T<vector<u64>>>.v($t23)
+                    $t24 := $t23
+                    // $t25 := 0
+                    $t25 := 0
+                    // $t26 := vector::borrow<vector<u64>>($t24, $t25)
+                    $t26 := A1_vector_borrow$vec$u64$$($t24, $t25)
+                    // $t27 := 0
+                    $t27 := 0
+                    // $t28 := vector::borrow<u64>($t26, $t27)
+                    $t28 := A1_vector_borrow$u64$($t26, $t27)
+                    // $t29 := read_ref($t28)
+                    $t29 := $LoadU64($t28)
+                    // $t30 := 10
+                    $t30 := 10
+                    // $t31 := ==($t29, $t30)
+                    $t31 := $Eq($t29, $t30)
+                    // if ($t31) goto L4 else goto L3
+                    switch $t31
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t32 := 102
+                    $t32 := 102
+                    // abort($t32)
+                    $Abort($t32)
+                }
+                case 8 {
+                    // label L5
+                    // $t33 := 0x42
+                    $t33 := 0x42
+                    // $t34 := borrow_global<GlobalVectors::T<vector<u64>>>($t33)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x9947b477, $t33)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t34 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t35 := borrow_field<GlobalVectors::T<vector<u64>>>.v($t34)
+                    $t35 := $t34
+                    // $t36 := 1
+                    $t36 := 1
+                    // $t37 := vector::borrow<vector<u64>>($t35, $t36)
+                    $t37 := A1_vector_borrow$vec$u64$$($t35, $t36)
+                    // $t38 := 0
+                    $t38 := 0
+                    // $t39 := vector::borrow<u64>($t37, $t38)
+                    $t39 := A1_vector_borrow$u64$($t37, $t38)
+                    // $t40 := read_ref($t39)
+                    $t40 := $LoadU64($t39)
+                    // $t41 := 11
+                    $t41 := 11
+                    // $t42 := ==($t40, $t41)
+                    $t42 := $Eq($t40, $t41)
+                    // if ($t42) goto L7 else goto L6
+                    switch $t42
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t43 := 102
+                    $t43 := 102
+                    // abort($t43)
+                    $Abort($t43)
+                }
+                case 11 {
+                    // label L8
+                    // $t44 := 0x42
+                    $t44 := 0x42
+                    // $t45 := borrow_global<GlobalVectors::T<vector<u64>>>($t44)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x9947b477, $t44)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t45 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t46 := borrow_field<GlobalVectors::T<vector<u64>>>.v($t45)
+                    $t46 := $t45
+                    // $t47 := 2
+                    $t47 := 2
+                    // $t48 := vector::borrow<vector<u64>>($t46, $t47)
+                    $t48 := A1_vector_borrow$vec$u64$$($t46, $t47)
+                    // $t49 := 0
+                    $t49 := 0
+                    // $t50 := vector::borrow<u64>($t48, $t49)
+                    $t50 := A1_vector_borrow$u64$($t48, $t49)
+                    // $t51 := read_ref($t50)
+                    $t51 := $LoadU64($t50)
+                    // $t52 := 12
+                    $t52 := 12
+                    // $t53 := ==($t51, $t52)
+                    $t53 := $Eq($t51, $t52)
+                    // if ($t53) goto L10 else goto L9
+                    switch $t53
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t54 := 102
+                    $t54 := 102
+                    // abort($t54)
+                    $Abort($t54)
+                }
+                case 14 {
+                    // label L11
+                    // return ()
+                    $Free($locals, 64)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_borrow$u64$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 8)))
+        }
+        function A1_vector_borrow$vec$u64$$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 32)))
+        }
+        function A1_vector_length$vec$u64$$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A2_Evm_sign(addr) -> signer {
+          signer := addr
+        }
+        function A1_vector_push_back$vec$u64$$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 32)))
+            $StoreU256(e_ptr, e)
+            if $IsStoragePtr(e_ptr) {
+                let e_offs := $OffsetPtr(e_ptr)
+                let $linked_dst_814019441 := $NewLinkedStorageBase(0x3084f371)
+                let $size_814019441 := $MemoryLoadU64(e)
+                let $data_size_814019441 := mul($size_814019441, 8)
+                $AlignedStorageStore($linked_dst_814019441, mload(e))
+                let $data_src_814019441 := add(e, 32)
+                let $data_dst_814019441 := add($linked_dst_814019441, 32)
+                for { let $offs_814019441 := 0 } lt($offs_814019441, $data_size_814019441) { $offs_814019441 := add($offs_814019441, 32)} {
+                    $AlignedStorageStore(add($data_dst_814019441, $offs_814019441), mload(add($data_src_814019441, $offs_814019441)))
+                    $Free(e, add($data_size_814019441, 32))
+                }
+                $AlignedStorageStore(e_offs, $linked_dst_814019441)
+            }
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 32)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_vector_singleton$u64$(e) -> $result {
+            let $t2, $t3
+            let $locals := $Malloc(32)
+            // $t1 := vector::empty<#0>()
+            mstore($locals, A1_vector_empty$u64$())
+            // $t2 := borrow_local($t1)
+            $t2 := $MakePtr(false, $locals)
+            // vector::push_back<#0>($t2, $t0)
+            A1_vector_push_back$u64$($t2, e)
+            // $t3 := move($t1)
+            $t3 := mload($locals)
+            // return $t3
+            $result := $t3
+            $Free($locals, 32)
+        }
+
+        function A1_vector_push_back$u64$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 8)))
+            $StoreU64(e_ptr, e)
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 8)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_vector_empty$u64$() -> vector {
+            vector := $Malloc(48)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function A1_vector_empty$vec$u64$$() -> vector {
+            vector := $Malloc(96)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $GtEq(x, y) -> r {
+            r := or(gt(x, y), eq(x, y))
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of GlobalVectors::test_move_to_vector_of_vector: Succeed(Stopped) (used_gas=305279): []
+
+// test of GlobalVectors::test_pop_back_global
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_GlobalVectors_test_pop_back_global" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_GlobalVectors_test_pop_back_global()
+        return (0, 0)
+        function A2_GlobalVectors_test_pop_back_global() {
+            let $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32, $t33, $t34, $t35, $t36, $t37, $t38, $t39
+            let $locals := $Malloc(64)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t18 := 101
+                    $t18 := 101
+                    // abort($t18)
+                    $Abort($t18)
+                }
+                case 4 {
+                    // $t1 := vector::empty<u64>()
+                    mstore($locals, A1_vector_empty$u64$())
+                    // $t2 := borrow_local($t1)
+                    $t2 := $MakePtr(false, $locals)
+                    // $t3 := 10
+                    $t3 := 10
+                    // vector::push_back<u64>($t2, $t3)
+                    A1_vector_push_back$u64$($t2, $t3)
+                    // $t4 := borrow_local($t1)
+                    $t4 := $MakePtr(false, $locals)
+                    // $t5 := 11
+                    $t5 := 11
+                    // vector::push_back<u64>($t4, $t5)
+                    A1_vector_push_back$u64$($t4, $t5)
+                    // $t6 := borrow_local($t1)
+                    $t6 := $MakePtr(false, $locals)
+                    // $t7 := 12
+                    $t7 := 12
+                    // vector::push_back<u64>($t6, $t7)
+                    A1_vector_push_back$u64$($t6, $t7)
+                    // $t8 := 0x42
+                    $t8 := 0x42
+                    // $t0 := Evm::sign($t8)
+                    mstore(add($locals, 32), A2_Evm_sign($t8))
+                    // $t9 := borrow_local($t0)
+                    $t9 := $MakePtr(false, add($locals, 32))
+                    // $t10 := move($t1)
+                    $t10 := mload($locals)
+                    // $t11 := pack GlobalVectors::T<u64>($t10)
+                    {
+                        let $mem := $Malloc(32)
+                        $MemoryStoreU256(add($mem, 0), $t10)
+                        $t11 := $mem
+                    }
+                    // move_to<GlobalVectors::T<u64>>($t11, $t9)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $LoadU256($t9))
+                        if $AlignedStorageLoad($base_offset) {
+                          $AbortBuiltin()
+                        }
+                        $AlignedStorageStore($base_offset, true)
+                        {
+                            let $dst := add($base_offset, 32)
+                            let $src := $t11
+                            {
+                                let $linked_src_814019441 := mload(add($src, 0))
+                                let $linked_dst_814019441 := $NewLinkedStorageBase(0x3084f371)
+                                let $size_814019441 := $MemoryLoadU64($linked_src_814019441)
+                                let $data_size_814019441 := mul($size_814019441, 8)
+                                $AlignedStorageStore($linked_dst_814019441, mload($linked_src_814019441))
+                                let $data_src_814019441 := add($linked_src_814019441, 32)
+                                let $data_dst_814019441 := add($linked_dst_814019441, 32)
+                                for { let $offs_814019441 := 0 } lt($offs_814019441, $data_size_814019441) { $offs_814019441 := add($offs_814019441, 32)} {
+                                    $AlignedStorageStore(add($data_dst_814019441, $offs_814019441), mload(add($data_src_814019441, $offs_814019441)))
+                                    $Free($linked_src_814019441, add($data_size_814019441, 32))
+                                }
+                                $AlignedStorageStore(add($dst, 0), $linked_dst_814019441)
+                            }
+                            $Free($src, 32)
+                        }
+                    }
+                    // $t12 := 0x42
+                    $t12 := 0x42
+                    // $t13 := borrow_global<GlobalVectors::T<u64>>($t12)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $t12)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t13 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t14 := borrow_field<GlobalVectors::T<u64>>.v($t13)
+                    $t14 := $t13
+                    // $t15 := vector::pop_back<u64>($t14)
+                    $t15 := A1_vector_pop_back$u64$($t14)
+                    // $t16 := 12
+                    $t16 := 12
+                    // $t17 := ==($t15, $t16)
+                    $t17 := $Eq($t15, $t16)
+                    // if ($t17) goto L1 else goto L0
+                    switch $t17
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t19 := 0x42
+                    $t19 := 0x42
+                    // $t20 := borrow_global<GlobalVectors::T<u64>>($t19)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $t19)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t20 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t21 := borrow_field<GlobalVectors::T<u64>>.v($t20)
+                    $t21 := $t20
+                    // $t22 := vector::length<u64>($t21)
+                    $t22 := A1_vector_length$u64$($t21)
+                    // $t23 := 2
+                    $t23 := 2
+                    // $t24 := ==($t22, $t23)
+                    $t24 := $Eq($t22, $t23)
+                    // if ($t24) goto L4 else goto L3
+                    switch $t24
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t25 := 102
+                    $t25 := 102
+                    // abort($t25)
+                    $Abort($t25)
+                }
+                case 8 {
+                    // label L5
+                    // $t26 := 0x42
+                    $t26 := 0x42
+                    // $t27 := borrow_global<GlobalVectors::T<u64>>($t26)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $t26)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t27 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t28 := borrow_field<GlobalVectors::T<u64>>.v($t27)
+                    $t28 := $t27
+                    // $t29 := vector::pop_back<u64>($t28)
+                    $t29 := A1_vector_pop_back$u64$($t28)
+                    // $t30 := 11
+                    $t30 := 11
+                    // $t31 := ==($t29, $t30)
+                    $t31 := $Eq($t29, $t30)
+                    // if ($t31) goto L7 else goto L6
+                    switch $t31
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t32 := 103
+                    $t32 := 103
+                    // abort($t32)
+                    $Abort($t32)
+                }
+                case 11 {
+                    // label L8
+                    // $t33 := 0x42
+                    $t33 := 0x42
+                    // $t34 := borrow_global<GlobalVectors::T<u64>>($t33)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $t33)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t34 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t35 := borrow_field<GlobalVectors::T<u64>>.v($t34)
+                    $t35 := $t34
+                    // $t36 := vector::length<u64>($t35)
+                    $t36 := A1_vector_length$u64$($t35)
+                    // $t37 := 1
+                    $t37 := 1
+                    // $t38 := ==($t36, $t37)
+                    $t38 := $Eq($t36, $t37)
+                    // if ($t38) goto L10 else goto L9
+                    switch $t38
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t39 := 104
+                    $t39 := 104
+                    // abort($t39)
+                    $Abort($t39)
+                }
+                case 14 {
+                    // label L11
+                    // return ()
+                    $Free($locals, 64)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_length$u64$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A1_vector_pop_back$u64$(v_ref) -> e {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if iszero(size) { $AbortBuiltin() }
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(sub(size, 1), 8)))
+            e := $LoadU64(e_ptr)
+            $StoreU64(v_ptr, sub(size, 1))
+        }
+        function A2_Evm_sign(addr) -> signer {
+          signer := addr
+        }
+        function A1_vector_push_back$u64$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 8)))
+            $StoreU64(e_ptr, e)
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 8)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_vector_empty$u64$() -> vector {
+            vector := $Malloc(48)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of GlobalVectors::test_pop_back_global: Succeed(Stopped) (used_gas=121755): []
+
+// test of GlobalVectors::test_pop_back_struct_global
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_GlobalVectors_test_pop_back_struct_global" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_GlobalVectors_test_pop_back_struct_global()
+        return (0, 0)
+        function A2_GlobalVectors_test_pop_back_struct_global() {
+            let tmp_$1, tmp_$2, e, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32, $t33, $t34, $t35, $t36, $t37, $t38, $t39, $t40, $t41, $t42, $t43, $t44, $t45, $t46, $t47, $t48, $t49, $t50, $t51, $t52, $t53, $t54, $t55, $t56, $t57, $t58, $t59, $t60, $t61, $t62
+            let $locals := $Malloc(64)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // $t29 := borrow_local($t3)
+                    $t29 := $MakePtr(false, e)
+                    // $t30 := borrow_field<GlobalVectors::S>.y($t29)
+                    $t30 := $IndexPtr($t29, 16)
+                    // $t31 := read_ref($t30)
+                    $t31 := $LoadU64($t30)
+                    // $t32 := 42
+                    $t32 := 42
+                    // $t1 := ==($t31, $t32)
+                    tmp_$1 := $Eq($t31, $t32)
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t33 := false
+                    $t33 := false
+                    // $t1 := $t33
+                    tmp_$1 := $t33
+                    // goto L2
+                    $block := 5
+                }
+                case 4 {
+                    // $t4 := vector::empty<GlobalVectors::S>()
+                    mstore($locals, A1_vector_empty$A2_GlobalVectors_S$())
+                    // $t5 := borrow_local($t4)
+                    $t5 := $MakePtr(false, $locals)
+                    // $t6 := 10
+                    $t6 := 10
+                    // $t7 := 40
+                    $t7 := 40
+                    // $t8 := pack GlobalVectors::S($t6, $t7)
+                    {
+                        let $mem := $Malloc(24)
+                        $MemoryStoreU128(add($mem, 0), $t6)
+                        $MemoryStoreU64(add($mem, 16), $t7)
+                        $t8 := $mem
+                    }
+                    // vector::push_back<GlobalVectors::S>($t5, $t8)
+                    A1_vector_push_back$A2_GlobalVectors_S$($t5, $t8)
+                    // $t9 := borrow_local($t4)
+                    $t9 := $MakePtr(false, $locals)
+                    // $t10 := 11
+                    $t10 := 11
+                    // $t11 := 41
+                    $t11 := 41
+                    // $t12 := pack GlobalVectors::S($t10, $t11)
+                    {
+                        let $mem := $Malloc(24)
+                        $MemoryStoreU128(add($mem, 0), $t10)
+                        $MemoryStoreU64(add($mem, 16), $t11)
+                        $t12 := $mem
+                    }
+                    // vector::push_back<GlobalVectors::S>($t9, $t12)
+                    A1_vector_push_back$A2_GlobalVectors_S$($t9, $t12)
+                    // $t13 := borrow_local($t4)
+                    $t13 := $MakePtr(false, $locals)
+                    // $t14 := 12
+                    $t14 := 12
+                    // $t15 := 42
+                    $t15 := 42
+                    // $t16 := pack GlobalVectors::S($t14, $t15)
+                    {
+                        let $mem := $Malloc(24)
+                        $MemoryStoreU128(add($mem, 0), $t14)
+                        $MemoryStoreU64(add($mem, 16), $t15)
+                        $t16 := $mem
+                    }
+                    // vector::push_back<GlobalVectors::S>($t13, $t16)
+                    A1_vector_push_back$A2_GlobalVectors_S$($t13, $t16)
+                    // $t17 := 0x42
+                    $t17 := 0x42
+                    // $t0 := Evm::sign($t17)
+                    mstore(add($locals, 32), A2_Evm_sign($t17))
+                    // $t18 := borrow_local($t0)
+                    $t18 := $MakePtr(false, add($locals, 32))
+                    // $t19 := move($t4)
+                    $t19 := mload($locals)
+                    // $t20 := pack GlobalVectors::T<GlobalVectors::S>($t19)
+                    {
+                        let $mem := $Malloc(32)
+                        $MemoryStoreU256(add($mem, 0), $t19)
+                        $t20 := $mem
+                    }
+                    // move_to<GlobalVectors::T<GlobalVectors::S>>($t20, $t18)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x27c9b6b7, $LoadU256($t18))
+                        if $AlignedStorageLoad($base_offset) {
+                          $AbortBuiltin()
+                        }
+                        $AlignedStorageStore($base_offset, true)
+                        {
+                            let $dst := add($base_offset, 32)
+                            let $src := $t20
+                            {
+                                let $linked_src_634259357 := mload(add($src, 0))
+                                let $linked_dst_634259357 := $NewLinkedStorageBase(0x25ce079d)
+                                let $size_634259357 := $MemoryLoadU64($linked_src_634259357)
+                                let $data_size_634259357 := mul($size_634259357, 32)
+                                $AlignedStorageStore($linked_dst_634259357, mload($linked_src_634259357))
+                                let $data_src_634259357 := add($linked_src_634259357, 32)
+                                let $data_dst_634259357 := add($linked_dst_634259357, 32)
+                                for { let $offs_634259357 := 0 } lt($offs_634259357, $data_size_634259357) { $offs_634259357 := add($offs_634259357, 32)} {
+                                    {
+                                        let $linked_src_3681206257 := mload(add($offs_634259357, $data_src_634259357))
+                                        let $linked_dst_3681206257 := $NewLinkedStorageBase(0xdb6abff1)
+                                        $AlignedStorageStore(add($linked_dst_3681206257, 0), mload(add($linked_src_3681206257, 0)))
+                                        $Free($linked_src_3681206257, 24)
+                                        $AlignedStorageStore(add($data_dst_634259357, $offs_634259357), $linked_dst_3681206257)
+                                    }
+                                    $Free($linked_src_634259357, add($data_size_634259357, 32))
+                                }
+                                $AlignedStorageStore(add($dst, 0), $linked_dst_634259357)
+                            }
+                            $Free($src, 32)
+                        }
+                    }
+                    // $t21 := 0x42
+                    $t21 := 0x42
+                    // $t22 := borrow_global<GlobalVectors::T<GlobalVectors::S>>($t21)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x27c9b6b7, $t21)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t22 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t23 := borrow_field<GlobalVectors::T<GlobalVectors::S>>.v($t22)
+                    $t23 := $t22
+                    // $t3 := vector::pop_back<GlobalVectors::S>($t23)
+                    e := A1_vector_pop_back$A2_GlobalVectors_S$($t23)
+                    // $t24 := borrow_local($t3)
+                    $t24 := $MakePtr(false, e)
+                    // $t25 := borrow_field<GlobalVectors::S>.x($t24)
+                    $t25 := $t24
+                    // $t26 := read_ref($t25)
+                    $t26 := $LoadU128($t25)
+                    // $t27 := 12
+                    $t27 := 12
+                    // $t28 := ==($t26, $t27)
+                    $t28 := $Eq($t26, $t27)
+                    // if ($t28) goto L1 else goto L0
+                    switch $t28
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // if ($t1) goto L4 else goto L3
+                    switch tmp_$1
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t34 := 101
+                    $t34 := 101
+                    // abort($t34)
+                    $Abort($t34)
+                }
+                case 8 {
+                    // label L5
+                    // $t35 := 0x42
+                    $t35 := 0x42
+                    // $t36 := borrow_global<GlobalVectors::T<GlobalVectors::S>>($t35)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x27c9b6b7, $t35)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t36 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t37 := borrow_field<GlobalVectors::T<GlobalVectors::S>>.v($t36)
+                    $t37 := $t36
+                    // $t38 := vector::length<GlobalVectors::S>($t37)
+                    $t38 := A1_vector_length$A2_GlobalVectors_S$($t37)
+                    // $t39 := 2
+                    $t39 := 2
+                    // $t40 := ==($t38, $t39)
+                    $t40 := $Eq($t38, $t39)
+                    // if ($t40) goto L7 else goto L6
+                    switch $t40
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t41 := 102
+                    $t41 := 102
+                    // abort($t41)
+                    $Abort($t41)
+                }
+                case 11 {
+                    // label L8
+                    // $t42 := 0x42
+                    $t42 := 0x42
+                    // $t43 := borrow_global<GlobalVectors::T<GlobalVectors::S>>($t42)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x27c9b6b7, $t42)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t43 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t44 := borrow_field<GlobalVectors::T<GlobalVectors::S>>.v($t43)
+                    $t44 := $t43
+                    // $t3 := vector::pop_back<GlobalVectors::S>($t44)
+                    e := A1_vector_pop_back$A2_GlobalVectors_S$($t44)
+                    // $t45 := borrow_local($t3)
+                    $t45 := $MakePtr(false, e)
+                    // $t46 := borrow_field<GlobalVectors::S>.x($t45)
+                    $t46 := $t45
+                    // $t47 := read_ref($t46)
+                    $t47 := $LoadU128($t46)
+                    // $t48 := 11
+                    $t48 := 11
+                    // $t49 := ==($t47, $t48)
+                    $t49 := $Eq($t47, $t48)
+                    // if ($t49) goto L10 else goto L9
+                    switch $t49
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // $t50 := borrow_local($t3)
+                    $t50 := $MakePtr(false, e)
+                    // $t51 := borrow_field<GlobalVectors::S>.y($t50)
+                    $t51 := $IndexPtr($t50, 16)
+                    // $t52 := read_ref($t51)
+                    $t52 := $LoadU64($t51)
+                    // $t53 := 41
+                    $t53 := 41
+                    // $t2 := ==($t52, $t53)
+                    tmp_$2 := $Eq($t52, $t53)
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t54 := false
+                    $t54 := false
+                    // $t2 := $t54
+                    tmp_$2 := $t54
+                    // goto L11
+                    $block := 14
+                }
+                case 14 {
+                    // label L11
+                    // if ($t2) goto L13 else goto L12
+                    switch tmp_$2
+                    case 0  { $block := 16 }
+                    default { $block := 15 }
+                }
+                case 15 {
+                    // label L13
+                    // goto L14
+                    $block := 17
+                }
+                case 16 {
+                    // label L12
+                    // $t55 := 103
+                    $t55 := 103
+                    // abort($t55)
+                    $Abort($t55)
+                }
+                case 17 {
+                    // label L14
+                    // $t56 := 0x42
+                    $t56 := 0x42
+                    // $t57 := borrow_global<GlobalVectors::T<GlobalVectors::S>>($t56)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x27c9b6b7, $t56)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t57 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t58 := borrow_field<GlobalVectors::T<GlobalVectors::S>>.v($t57)
+                    $t58 := $t57
+                    // $t59 := vector::length<GlobalVectors::S>($t58)
+                    $t59 := A1_vector_length$A2_GlobalVectors_S$($t58)
+                    // $t60 := 1
+                    $t60 := 1
+                    // $t61 := ==($t59, $t60)
+                    $t61 := $Eq($t59, $t60)
+                    // if ($t61) goto L16 else goto L15
+                    switch $t61
+                    case 0  { $block := 19 }
+                    default { $block := 18 }
+                }
+                case 18 {
+                    // label L16
+                    // goto L17
+                    $block := 20
+                }
+                case 19 {
+                    // label L15
+                    // $t62 := 104
+                    $t62 := 104
+                    // abort($t62)
+                    $Abort($t62)
+                }
+                case 20 {
+                    // label L17
+                    // return ()
+                    $Free($locals, 64)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_length$A2_GlobalVectors_S$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A1_vector_pop_back$A2_GlobalVectors_S$(v_ref) -> e {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if iszero(size) { $AbortBuiltin() }
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(sub(size, 1), 32)))
+            e := $LoadU256(e_ptr)
+            if $IsStoragePtr(e_ptr) {
+                let e_offs := $OffsetPtr(e_ptr)
+                let linked_src := $AlignedStorageLoad(e_offs)
+                e := $Malloc(24)
+                mstore(add(e, 0), $AlignedStorageLoad(add(linked_src, 0)))
+                $AlignedStorageStore(add(linked_src, 0), 0)
+                $AlignedStorageStore(e_offs, 0)
+            }
+            $StoreU64(v_ptr, sub(size, 1))
+        }
+        function A2_Evm_sign(addr) -> signer {
+          signer := addr
+        }
+        function A1_vector_push_back$A2_GlobalVectors_S$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 32)))
+            $StoreU256(e_ptr, e)
+            if $IsStoragePtr(e_ptr) {
+                let e_offs := $OffsetPtr(e_ptr)
+                let $linked_dst_3681206257 := $NewLinkedStorageBase(0xdb6abff1)
+                $AlignedStorageStore(add($linked_dst_3681206257, 0), mload(add(e, 0)))
+                $Free(e, 24)
+                $AlignedStorageStore(e_offs, $linked_dst_3681206257)
+            }
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 32)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_vector_empty$A2_GlobalVectors_S$() -> vector {
+            vector := $Malloc(96)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU128(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU128(offs)
+          }
+          default {
+            val := $StorageLoadU128(offs)
+          }
+        }
+        function $MemoryLoadU128(offs) -> val {
+          val := $MemoryLoadBytes(offs, 16)
+        }
+        function $StorageLoadU128(offs) -> val {
+          val := $StorageLoadBytes(offs, 16)
+        }
+        function $MemoryStoreU128(offs, val) {
+          $MemoryStoreBytes(offs, 16, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of GlobalVectors::test_pop_back_struct_global: Succeed(Stopped) (used_gas=190461): []
+
+// test of GlobalVectors::test_push_back_global
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_GlobalVectors_test_push_back_global" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_GlobalVectors_test_push_back_global()
+        return (0, 0)
+        function A2_GlobalVectors_test_push_back_global() {
+            let $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32, $t33, $t34, $t35, $t36, $t37, $t38, $t39, $t40, $t41, $t42, $t43, $t44, $t45, $t46, $t47, $t48, $t49, $t50, $t51, $t52, $t53, $t54, $t55, $t56, $t57, $t58, $t59, $t60, $t61, $t62, $t63, $t64, $t65, $t66, $t67, $t68, $t69, $t70, $t71
+            let $locals := $Malloc(64)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t26 := 101
+                    $t26 := 101
+                    // abort($t26)
+                    $Abort($t26)
+                }
+                case 4 {
+                    // $t1 := vector::empty<u64>()
+                    mstore($locals, A1_vector_empty$u64$())
+                    // $t2 := borrow_local($t1)
+                    $t2 := $MakePtr(false, $locals)
+                    // $t3 := 10
+                    $t3 := 10
+                    // vector::push_back<u64>($t2, $t3)
+                    A1_vector_push_back$u64$($t2, $t3)
+                    // $t4 := borrow_local($t1)
+                    $t4 := $MakePtr(false, $locals)
+                    // $t5 := 11
+                    $t5 := 11
+                    // vector::push_back<u64>($t4, $t5)
+                    A1_vector_push_back$u64$($t4, $t5)
+                    // $t6 := borrow_local($t1)
+                    $t6 := $MakePtr(false, $locals)
+                    // $t7 := 12
+                    $t7 := 12
+                    // vector::push_back<u64>($t6, $t7)
+                    A1_vector_push_back$u64$($t6, $t7)
+                    // $t8 := 0x42
+                    $t8 := 0x42
+                    // $t0 := Evm::sign($t8)
+                    mstore(add($locals, 32), A2_Evm_sign($t8))
+                    // $t9 := borrow_local($t0)
+                    $t9 := $MakePtr(false, add($locals, 32))
+                    // $t10 := copy($t1)
+                    $t10 := mload($locals)
+                    // $t11 := pack GlobalVectors::T<u64>($t10)
+                    {
+                        let $mem := $Malloc(32)
+                        $MemoryStoreU256(add($mem, 0), $t10)
+                        $t11 := $mem
+                    }
+                    // move_to<GlobalVectors::T<u64>>($t11, $t9)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $LoadU256($t9))
+                        if $AlignedStorageLoad($base_offset) {
+                          $AbortBuiltin()
+                        }
+                        $AlignedStorageStore($base_offset, true)
+                        {
+                            let $dst := add($base_offset, 32)
+                            let $src := $t11
+                            {
+                                let $linked_src_814019441 := mload(add($src, 0))
+                                let $linked_dst_814019441 := $NewLinkedStorageBase(0x3084f371)
+                                let $size_814019441 := $MemoryLoadU64($linked_src_814019441)
+                                let $data_size_814019441 := mul($size_814019441, 8)
+                                $AlignedStorageStore($linked_dst_814019441, mload($linked_src_814019441))
+                                let $data_src_814019441 := add($linked_src_814019441, 32)
+                                let $data_dst_814019441 := add($linked_dst_814019441, 32)
+                                for { let $offs_814019441 := 0 } lt($offs_814019441, $data_size_814019441) { $offs_814019441 := add($offs_814019441, 32)} {
+                                    $AlignedStorageStore(add($data_dst_814019441, $offs_814019441), mload(add($data_src_814019441, $offs_814019441)))
+                                    $Free($linked_src_814019441, add($data_size_814019441, 32))
+                                }
+                                $AlignedStorageStore(add($dst, 0), $linked_dst_814019441)
+                            }
+                            $Free($src, 32)
+                        }
+                    }
+                    // $t12 := 0x42
+                    $t12 := 0x42
+                    // $t13 := borrow_global<GlobalVectors::T<u64>>($t12)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $t12)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t13 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t14 := borrow_field<GlobalVectors::T<u64>>.v($t13)
+                    $t14 := $t13
+                    // $t15 := 13
+                    $t15 := 13
+                    // vector::push_back<u64>($t14, $t15)
+                    A1_vector_push_back$u64$($t14, $t15)
+                    // $t16 := 0x42
+                    $t16 := 0x42
+                    // $t17 := borrow_global<GlobalVectors::T<u64>>($t16)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $t16)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t17 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t18 := borrow_field<GlobalVectors::T<u64>>.v($t17)
+                    $t18 := $t17
+                    // $t19 := 14
+                    $t19 := 14
+                    // vector::push_back<u64>($t18, $t19)
+                    A1_vector_push_back$u64$($t18, $t19)
+                    // $t20 := 0x42
+                    $t20 := 0x42
+                    // $t21 := borrow_global<GlobalVectors::T<u64>>($t20)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $t20)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t21 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t22 := borrow_field<GlobalVectors::T<u64>>.v($t21)
+                    $t22 := $t21
+                    // $t23 := vector::length<u64>($t22)
+                    $t23 := A1_vector_length$u64$($t22)
+                    // $t24 := 5
+                    $t24 := 5
+                    // $t25 := ==($t23, $t24)
+                    $t25 := $Eq($t23, $t24)
+                    // if ($t25) goto L1 else goto L0
+                    switch $t25
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t27 := 0x42
+                    $t27 := 0x42
+                    // $t28 := borrow_global<GlobalVectors::T<u64>>($t27)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $t27)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t28 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t29 := borrow_field<GlobalVectors::T<u64>>.v($t28)
+                    $t29 := $t28
+                    // $t30 := 0
+                    $t30 := 0
+                    // $t31 := vector::borrow<u64>($t29, $t30)
+                    $t31 := A1_vector_borrow$u64$($t29, $t30)
+                    // $t32 := read_ref($t31)
+                    $t32 := $LoadU64($t31)
+                    // $t33 := 10
+                    $t33 := 10
+                    // $t34 := ==($t32, $t33)
+                    $t34 := $Eq($t32, $t33)
+                    // if ($t34) goto L4 else goto L3
+                    switch $t34
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t35 := 102
+                    $t35 := 102
+                    // abort($t35)
+                    $Abort($t35)
+                }
+                case 8 {
+                    // label L5
+                    // $t36 := 0x42
+                    $t36 := 0x42
+                    // $t37 := borrow_global<GlobalVectors::T<u64>>($t36)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $t36)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t37 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t38 := borrow_field<GlobalVectors::T<u64>>.v($t37)
+                    $t38 := $t37
+                    // $t39 := 1
+                    $t39 := 1
+                    // $t40 := vector::borrow<u64>($t38, $t39)
+                    $t40 := A1_vector_borrow$u64$($t38, $t39)
+                    // $t41 := read_ref($t40)
+                    $t41 := $LoadU64($t40)
+                    // $t42 := 11
+                    $t42 := 11
+                    // $t43 := ==($t41, $t42)
+                    $t43 := $Eq($t41, $t42)
+                    // if ($t43) goto L7 else goto L6
+                    switch $t43
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t44 := 103
+                    $t44 := 103
+                    // abort($t44)
+                    $Abort($t44)
+                }
+                case 11 {
+                    // label L8
+                    // $t45 := 0x42
+                    $t45 := 0x42
+                    // $t46 := borrow_global<GlobalVectors::T<u64>>($t45)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $t45)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t46 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t47 := borrow_field<GlobalVectors::T<u64>>.v($t46)
+                    $t47 := $t46
+                    // $t48 := 2
+                    $t48 := 2
+                    // $t49 := vector::borrow<u64>($t47, $t48)
+                    $t49 := A1_vector_borrow$u64$($t47, $t48)
+                    // $t50 := read_ref($t49)
+                    $t50 := $LoadU64($t49)
+                    // $t51 := 12
+                    $t51 := 12
+                    // $t52 := ==($t50, $t51)
+                    $t52 := $Eq($t50, $t51)
+                    // if ($t52) goto L10 else goto L9
+                    switch $t52
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t53 := 104
+                    $t53 := 104
+                    // abort($t53)
+                    $Abort($t53)
+                }
+                case 14 {
+                    // label L11
+                    // $t54 := 0x42
+                    $t54 := 0x42
+                    // $t55 := borrow_global<GlobalVectors::T<u64>>($t54)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $t54)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t55 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t56 := borrow_field<GlobalVectors::T<u64>>.v($t55)
+                    $t56 := $t55
+                    // $t57 := 3
+                    $t57 := 3
+                    // $t58 := vector::borrow<u64>($t56, $t57)
+                    $t58 := A1_vector_borrow$u64$($t56, $t57)
+                    // $t59 := read_ref($t58)
+                    $t59 := $LoadU64($t58)
+                    // $t60 := 13
+                    $t60 := 13
+                    // $t61 := ==($t59, $t60)
+                    $t61 := $Eq($t59, $t60)
+                    // if ($t61) goto L13 else goto L12
+                    switch $t61
+                    case 0  { $block := 16 }
+                    default { $block := 15 }
+                }
+                case 15 {
+                    // label L13
+                    // goto L14
+                    $block := 17
+                }
+                case 16 {
+                    // label L12
+                    // $t62 := 105
+                    $t62 := 105
+                    // abort($t62)
+                    $Abort($t62)
+                }
+                case 17 {
+                    // label L14
+                    // $t63 := 0x42
+                    $t63 := 0x42
+                    // $t64 := borrow_global<GlobalVectors::T<u64>>($t63)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $t63)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t64 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t65 := borrow_field<GlobalVectors::T<u64>>.v($t64)
+                    $t65 := $t64
+                    // $t66 := 4
+                    $t66 := 4
+                    // $t67 := vector::borrow<u64>($t65, $t66)
+                    $t67 := A1_vector_borrow$u64$($t65, $t66)
+                    // $t68 := read_ref($t67)
+                    $t68 := $LoadU64($t67)
+                    // $t69 := 14
+                    $t69 := 14
+                    // $t70 := ==($t68, $t69)
+                    $t70 := $Eq($t68, $t69)
+                    // if ($t70) goto L16 else goto L15
+                    switch $t70
+                    case 0  { $block := 19 }
+                    default { $block := 18 }
+                }
+                case 18 {
+                    // label L16
+                    // goto L17
+                    $block := 20
+                }
+                case 19 {
+                    // label L15
+                    // $t71 := 106
+                    $t71 := 106
+                    // abort($t71)
+                    $Abort($t71)
+                }
+                case 20 {
+                    // label L17
+                    // return ()
+                    $Free($locals, 64)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_borrow$u64$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 8)))
+        }
+        function A1_vector_length$u64$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A1_vector_push_back$u64$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 8)))
+            $StoreU64(e_ptr, e)
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 8)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A2_Evm_sign(addr) -> signer {
+          signer := addr
+        }
+        function A1_vector_empty$u64$() -> vector {
+            vector := $Malloc(48)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $GtEq(x, y) -> r {
+            r := or(gt(x, y), eq(x, y))
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of GlobalVectors::test_push_back_global: Succeed(Stopped) (used_gas=152738): []
+
+// test of GlobalVectors::test_push_back_struct_global
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_GlobalVectors_test_push_back_struct_global" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_GlobalVectors_test_push_back_struct_global()
+        return (0, 0)
+        function A2_GlobalVectors_test_push_back_struct_global() {
+            let $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32, $t33, $t34, $t35, $t36, $t37, $t38, $t39, $t40, $t41, $t42, $t43, $t44, $t45, $t46, $t47, $t48, $t49, $t50, $t51, $t52, $t53, $t54, $t55, $t56, $t57, $t58, $t59, $t60, $t61, $t62, $t63, $t64, $t65, $t66
+            let $locals := $Malloc(64)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t36 := 101
+                    $t36 := 101
+                    // abort($t36)
+                    $Abort($t36)
+                }
+                case 4 {
+                    // $t1 := vector::empty<GlobalVectors::S>()
+                    mstore($locals, A1_vector_empty$A2_GlobalVectors_S$())
+                    // $t2 := borrow_local($t1)
+                    $t2 := $MakePtr(false, $locals)
+                    // $t3 := 10
+                    $t3 := 10
+                    // $t4 := 40
+                    $t4 := 40
+                    // $t5 := pack GlobalVectors::S($t3, $t4)
+                    {
+                        let $mem := $Malloc(24)
+                        $MemoryStoreU128(add($mem, 0), $t3)
+                        $MemoryStoreU64(add($mem, 16), $t4)
+                        $t5 := $mem
+                    }
+                    // vector::push_back<GlobalVectors::S>($t2, $t5)
+                    A1_vector_push_back$A2_GlobalVectors_S$($t2, $t5)
+                    // $t6 := borrow_local($t1)
+                    $t6 := $MakePtr(false, $locals)
+                    // $t7 := 11
+                    $t7 := 11
+                    // $t8 := 41
+                    $t8 := 41
+                    // $t9 := pack GlobalVectors::S($t7, $t8)
+                    {
+                        let $mem := $Malloc(24)
+                        $MemoryStoreU128(add($mem, 0), $t7)
+                        $MemoryStoreU64(add($mem, 16), $t8)
+                        $t9 := $mem
+                    }
+                    // vector::push_back<GlobalVectors::S>($t6, $t9)
+                    A1_vector_push_back$A2_GlobalVectors_S$($t6, $t9)
+                    // $t10 := borrow_local($t1)
+                    $t10 := $MakePtr(false, $locals)
+                    // $t11 := 12
+                    $t11 := 12
+                    // $t12 := 42
+                    $t12 := 42
+                    // $t13 := pack GlobalVectors::S($t11, $t12)
+                    {
+                        let $mem := $Malloc(24)
+                        $MemoryStoreU128(add($mem, 0), $t11)
+                        $MemoryStoreU64(add($mem, 16), $t12)
+                        $t13 := $mem
+                    }
+                    // vector::push_back<GlobalVectors::S>($t10, $t13)
+                    A1_vector_push_back$A2_GlobalVectors_S$($t10, $t13)
+                    // $t14 := 0x42
+                    $t14 := 0x42
+                    // $t0 := Evm::sign($t14)
+                    mstore(add($locals, 32), A2_Evm_sign($t14))
+                    // $t15 := borrow_local($t0)
+                    $t15 := $MakePtr(false, add($locals, 32))
+                    // $t16 := move($t1)
+                    $t16 := mload($locals)
+                    // $t17 := pack GlobalVectors::T<GlobalVectors::S>($t16)
+                    {
+                        let $mem := $Malloc(32)
+                        $MemoryStoreU256(add($mem, 0), $t16)
+                        $t17 := $mem
+                    }
+                    // move_to<GlobalVectors::T<GlobalVectors::S>>($t17, $t15)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x27c9b6b7, $LoadU256($t15))
+                        if $AlignedStorageLoad($base_offset) {
+                          $AbortBuiltin()
+                        }
+                        $AlignedStorageStore($base_offset, true)
+                        {
+                            let $dst := add($base_offset, 32)
+                            let $src := $t17
+                            {
+                                let $linked_src_634259357 := mload(add($src, 0))
+                                let $linked_dst_634259357 := $NewLinkedStorageBase(0x25ce079d)
+                                let $size_634259357 := $MemoryLoadU64($linked_src_634259357)
+                                let $data_size_634259357 := mul($size_634259357, 32)
+                                $AlignedStorageStore($linked_dst_634259357, mload($linked_src_634259357))
+                                let $data_src_634259357 := add($linked_src_634259357, 32)
+                                let $data_dst_634259357 := add($linked_dst_634259357, 32)
+                                for { let $offs_634259357 := 0 } lt($offs_634259357, $data_size_634259357) { $offs_634259357 := add($offs_634259357, 32)} {
+                                    {
+                                        let $linked_src_3681206257 := mload(add($offs_634259357, $data_src_634259357))
+                                        let $linked_dst_3681206257 := $NewLinkedStorageBase(0xdb6abff1)
+                                        $AlignedStorageStore(add($linked_dst_3681206257, 0), mload(add($linked_src_3681206257, 0)))
+                                        $Free($linked_src_3681206257, 24)
+                                        $AlignedStorageStore(add($data_dst_634259357, $offs_634259357), $linked_dst_3681206257)
+                                    }
+                                    $Free($linked_src_634259357, add($data_size_634259357, 32))
+                                }
+                                $AlignedStorageStore(add($dst, 0), $linked_dst_634259357)
+                            }
+                            $Free($src, 32)
+                        }
+                    }
+                    // $t18 := 0x42
+                    $t18 := 0x42
+                    // $t19 := borrow_global<GlobalVectors::T<GlobalVectors::S>>($t18)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x27c9b6b7, $t18)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t19 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t20 := borrow_field<GlobalVectors::T<GlobalVectors::S>>.v($t19)
+                    $t20 := $t19
+                    // $t21 := 13
+                    $t21 := 13
+                    // $t22 := 43
+                    $t22 := 43
+                    // $t23 := pack GlobalVectors::S($t21, $t22)
+                    {
+                        let $mem := $Malloc(24)
+                        $MemoryStoreU128(add($mem, 0), $t21)
+                        $MemoryStoreU64(add($mem, 16), $t22)
+                        $t23 := $mem
+                    }
+                    // vector::push_back<GlobalVectors::S>($t20, $t23)
+                    A1_vector_push_back$A2_GlobalVectors_S$($t20, $t23)
+                    // $t24 := 0x42
+                    $t24 := 0x42
+                    // $t25 := borrow_global<GlobalVectors::T<GlobalVectors::S>>($t24)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x27c9b6b7, $t24)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t25 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t26 := borrow_field<GlobalVectors::T<GlobalVectors::S>>.v($t25)
+                    $t26 := $t25
+                    // $t27 := 14
+                    $t27 := 14
+                    // $t28 := 44
+                    $t28 := 44
+                    // $t29 := pack GlobalVectors::S($t27, $t28)
+                    {
+                        let $mem := $Malloc(24)
+                        $MemoryStoreU128(add($mem, 0), $t27)
+                        $MemoryStoreU64(add($mem, 16), $t28)
+                        $t29 := $mem
+                    }
+                    // vector::push_back<GlobalVectors::S>($t26, $t29)
+                    A1_vector_push_back$A2_GlobalVectors_S$($t26, $t29)
+                    // $t30 := 0x42
+                    $t30 := 0x42
+                    // $t31 := borrow_global<GlobalVectors::T<GlobalVectors::S>>($t30)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x27c9b6b7, $t30)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t31 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t32 := borrow_field<GlobalVectors::T<GlobalVectors::S>>.v($t31)
+                    $t32 := $t31
+                    // $t33 := vector::length<GlobalVectors::S>($t32)
+                    $t33 := A1_vector_length$A2_GlobalVectors_S$($t32)
+                    // $t34 := 5
+                    $t34 := 5
+                    // $t35 := ==($t33, $t34)
+                    $t35 := $Eq($t33, $t34)
+                    // if ($t35) goto L1 else goto L0
+                    switch $t35
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t37 := 0x42
+                    $t37 := 0x42
+                    // $t38 := borrow_global<GlobalVectors::T<GlobalVectors::S>>($t37)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x27c9b6b7, $t37)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t38 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t39 := borrow_field<GlobalVectors::T<GlobalVectors::S>>.v($t38)
+                    $t39 := $t38
+                    // $t40 := 0
+                    $t40 := 0
+                    // $t41 := vector::borrow<GlobalVectors::S>($t39, $t40)
+                    $t41 := A1_vector_borrow$A2_GlobalVectors_S$($t39, $t40)
+                    // $t42 := borrow_field<GlobalVectors::S>.x($t41)
+                    $t42 := $t41
+                    // $t43 := read_ref($t42)
+                    $t43 := $LoadU128($t42)
+                    // $t44 := 10
+                    $t44 := 10
+                    // $t45 := ==($t43, $t44)
+                    $t45 := $Eq($t43, $t44)
+                    // if ($t45) goto L4 else goto L3
+                    switch $t45
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t46 := 102
+                    $t46 := 102
+                    // abort($t46)
+                    $Abort($t46)
+                }
+                case 8 {
+                    // label L5
+                    // $t47 := 0x42
+                    $t47 := 0x42
+                    // $t48 := borrow_global<GlobalVectors::T<GlobalVectors::S>>($t47)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x27c9b6b7, $t47)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t48 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t49 := borrow_field<GlobalVectors::T<GlobalVectors::S>>.v($t48)
+                    $t49 := $t48
+                    // $t50 := 1
+                    $t50 := 1
+                    // $t51 := vector::borrow<GlobalVectors::S>($t49, $t50)
+                    $t51 := A1_vector_borrow$A2_GlobalVectors_S$($t49, $t50)
+                    // $t52 := borrow_field<GlobalVectors::S>.x($t51)
+                    $t52 := $t51
+                    // $t53 := read_ref($t52)
+                    $t53 := $LoadU128($t52)
+                    // $t54 := 11
+                    $t54 := 11
+                    // $t55 := ==($t53, $t54)
+                    $t55 := $Eq($t53, $t54)
+                    // if ($t55) goto L7 else goto L6
+                    switch $t55
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t56 := 103
+                    $t56 := 103
+                    // abort($t56)
+                    $Abort($t56)
+                }
+                case 11 {
+                    // label L8
+                    // $t57 := 0x42
+                    $t57 := 0x42
+                    // $t58 := borrow_global<GlobalVectors::T<GlobalVectors::S>>($t57)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x27c9b6b7, $t57)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t58 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t59 := borrow_field<GlobalVectors::T<GlobalVectors::S>>.v($t58)
+                    $t59 := $t58
+                    // $t60 := 2
+                    $t60 := 2
+                    // $t61 := vector::borrow<GlobalVectors::S>($t59, $t60)
+                    $t61 := A1_vector_borrow$A2_GlobalVectors_S$($t59, $t60)
+                    // $t62 := borrow_field<GlobalVectors::S>.x($t61)
+                    $t62 := $t61
+                    // $t63 := read_ref($t62)
+                    $t63 := $LoadU128($t62)
+                    // $t64 := 12
+                    $t64 := 12
+                    // $t65 := ==($t63, $t64)
+                    $t65 := $Eq($t63, $t64)
+                    // if ($t65) goto L10 else goto L9
+                    switch $t65
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t66 := 104
+                    $t66 := 104
+                    // abort($t66)
+                    $Abort($t66)
+                }
+                case 14 {
+                    // label L11
+                    // return ()
+                    $Free($locals, 64)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_borrow$A2_GlobalVectors_S$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 32)))
+            let e := $LoadU256(e_ptr)
+            e_ptr := $MakePtr($IsStoragePtr(v_ref), e)
+        }
+        function A1_vector_length$A2_GlobalVectors_S$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A1_vector_push_back$A2_GlobalVectors_S$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 32)))
+            $StoreU256(e_ptr, e)
+            if $IsStoragePtr(e_ptr) {
+                let e_offs := $OffsetPtr(e_ptr)
+                let $linked_dst_3681206257 := $NewLinkedStorageBase(0xdb6abff1)
+                $AlignedStorageStore(add($linked_dst_3681206257, 0), mload(add(e, 0)))
+                $Free(e, 24)
+                $AlignedStorageStore(e_offs, $linked_dst_3681206257)
+            }
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 32)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A2_Evm_sign(addr) -> signer {
+          signer := addr
+        }
+        function A1_vector_empty$A2_GlobalVectors_S$() -> vector {
+            vector := $Malloc(96)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU128(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU128(offs)
+          }
+          default {
+            val := $StorageLoadU128(offs)
+          }
+        }
+        function $MemoryLoadU128(offs) -> val {
+          val := $MemoryLoadBytes(offs, 16)
+        }
+        function $StorageLoadU128(offs) -> val {
+          val := $StorageLoadBytes(offs, 16)
+        }
+        function $MemoryStoreU128(offs, val) {
+          $MemoryStoreBytes(offs, 16, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $GtEq(x, y) -> r {
+            r := or(gt(x, y), eq(x, y))
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of GlobalVectors::test_push_back_struct_global: Succeed(Stopped) (used_gas=329341): []
+
+// test of GlobalVectors::test_read_ref_copy
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_GlobalVectors_test_read_ref_copy" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_GlobalVectors_test_read_ref_copy()
+        return (0, 0)
+        function A2_GlobalVectors_test_read_ref_copy() {
+            let $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23
+            let $locals := $Malloc(96)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t16 := 101
+                    $t16 := 101
+                    // abort($t16)
+                    $Abort($t16)
+                }
+                case 4 {
+                    // $t1 := vector::empty<u8>()
+                    mstore($locals, A1_vector_empty$u8$())
+                    // $t3 := borrow_local($t1)
+                    $t3 := $MakePtr(false, $locals)
+                    // $t4 := 65
+                    $t4 := 65
+                    // vector::push_back<u8>($t3, $t4)
+                    A1_vector_push_back$u8$($t3, $t4)
+                    // $t5 := 0x42
+                    $t5 := 0x42
+                    // $t0 := Evm::sign($t5)
+                    mstore(add($locals, 32), A2_Evm_sign($t5))
+                    // $t6 := borrow_local($t0)
+                    $t6 := $MakePtr(false, add($locals, 32))
+                    // $t7 := move($t1)
+                    $t7 := mload($locals)
+                    // $t8 := pack GlobalVectors::T<u8>($t7)
+                    {
+                        let $mem := $Malloc(32)
+                        $MemoryStoreU256(add($mem, 0), $t7)
+                        $t8 := $mem
+                    }
+                    // move_to<GlobalVectors::T<u8>>($t8, $t6)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x10b7746c, $LoadU256($t6))
+                        if $AlignedStorageLoad($base_offset) {
+                          $AbortBuiltin()
+                        }
+                        $AlignedStorageStore($base_offset, true)
+                        {
+                            let $dst := add($base_offset, 32)
+                            let $src := $t8
+                            {
+                                let $linked_src_2300595445 := mload(add($src, 0))
+                                let $linked_dst_2300595445 := $NewLinkedStorageBase(0x89204cf5)
+                                let $size_2300595445 := $MemoryLoadU64($linked_src_2300595445)
+                                let $data_size_2300595445 := mul($size_2300595445, 1)
+                                $AlignedStorageStore($linked_dst_2300595445, mload($linked_src_2300595445))
+                                let $data_src_2300595445 := add($linked_src_2300595445, 32)
+                                let $data_dst_2300595445 := add($linked_dst_2300595445, 32)
+                                for { let $offs_2300595445 := 0 } lt($offs_2300595445, $data_size_2300595445) { $offs_2300595445 := add($offs_2300595445, 32)} {
+                                    $AlignedStorageStore(add($data_dst_2300595445, $offs_2300595445), mload(add($data_src_2300595445, $offs_2300595445)))
+                                    $Free($linked_src_2300595445, add($data_size_2300595445, 32))
+                                }
+                                $AlignedStorageStore(add($dst, 0), $linked_dst_2300595445)
+                            }
+                            $Free($src, 32)
+                        }
+                    }
+                    // $t9 := 0x42
+                    $t9 := 0x42
+                    // $t10 := borrow_global<GlobalVectors::T<u8>>($t9)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x10b7746c, $t9)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t10 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t11 := borrow_field<GlobalVectors::T<u8>>.v($t10)
+                    $t11 := $t10
+                    // $t2 := read_ref($t11)
+                    mstore(add($locals, 64), $LoadU256($t11))
+                    if $IsStoragePtr($t11){
+                        let $storage_ptr_2300595445
+                        let $size_2300595445 := $StorageLoadU64(mload(add($locals, 64)))
+                        let $capacity_2300595445 := $ClosestGreaterPowerOfTwo($size_2300595445)
+                        $storage_ptr_2300595445 := $Malloc(add(32, mul($capacity_2300595445, 1)))
+                        let $data_size_2300595445 := mul($size_2300595445, 1)
+                        mstore($storage_ptr_2300595445, $AlignedStorageLoad(mload(add($locals, 64))))
+                        $MemoryStoreU64(add($storage_ptr_2300595445, 8), $capacity_2300595445)
+                        let $data_src_2300595445 := add(mload(add($locals, 64)), 32)
+                        let $data_dst_2300595445 := add($storage_ptr_2300595445, 32)
+                        for { let $offs_2300595445 := 0 } lt($offs_2300595445, $data_size_2300595445) { $offs_2300595445 := add($offs_2300595445, 32)} {
+                            mstore(add($data_dst_2300595445, $offs_2300595445), $AlignedStorageLoad(add($data_src_2300595445, $offs_2300595445)))
+                        }
+                        mstore(add($locals, 64), $storage_ptr_2300595445)
+                    }
+                    // $t12 := borrow_local($t2)
+                    $t12 := $MakePtr(false, add($locals, 64))
+                    // $t13 := vector::length<u8>($t12)
+                    $t13 := A1_vector_length$u8$($t12)
+                    // $t14 := 1
+                    $t14 := 1
+                    // $t15 := ==($t13, $t14)
+                    $t15 := $Eq($t13, $t14)
+                    // if ($t15) goto L1 else goto L0
+                    switch $t15
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t17 := borrow_local($t2)
+                    $t17 := $MakePtr(false, add($locals, 64))
+                    // $t18 := 0
+                    $t18 := 0
+                    // $t19 := vector::borrow<u8>($t17, $t18)
+                    $t19 := A1_vector_borrow$u8$($t17, $t18)
+                    // $t20 := read_ref($t19)
+                    $t20 := $LoadU8($t19)
+                    // $t21 := 65
+                    $t21 := 65
+                    // $t22 := ==($t20, $t21)
+                    $t22 := $Eq($t20, $t21)
+                    // if ($t22) goto L4 else goto L3
+                    switch $t22
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t23 := 102
+                    $t23 := 102
+                    // abort($t23)
+                    $Abort($t23)
+                }
+                case 8 {
+                    // label L5
+                    // return ()
+                    $Free($locals, 96)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_borrow$u8$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 1)))
+        }
+        function A1_vector_length$u8$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A2_Evm_sign(addr) -> signer {
+          signer := addr
+        }
+        function A1_vector_push_back$u8$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 1)))
+            $StoreU8(e_ptr, e)
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 1)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_vector_empty$u8$() -> vector {
+            vector := $Malloc(34)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU8(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU8(offs)
+          }
+          default {
+            val := $StorageLoadU8(offs)
+          }
+        }
+        function $MemoryLoadU8(offs) -> val {
+          val := $MemoryLoadBytes(offs, 1)
+        }
+        function $StorageLoadU8(offs) -> val {
+          val := $StorageLoadBytes(offs, 1)
+        }
+        function $StoreU8(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU8(offs, val)
+          }
+          default {
+            $StorageStoreU8(offs, val)
+          }
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $StorageStoreU8(offs, val) {
+          $StorageStoreBytes(offs, 1, val)
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $GtEq(x, y) -> r {
+            r := or(gt(x, y), eq(x, y))
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $ClosestGreaterPowerOfTwo(x) -> r {
+            r := or(r, shr(1, x))
+            r := or(r, shr(2, r))
+            r := or(r, shr(4, r))
+            r := or(r, shr(8, r))
+            r := or(r, shr(16, r))
+            r := or(r, shr(32, r))
+            r := add(x, 1)
+        }
+    }
+}
+===> Test result of GlobalVectors::test_read_ref_copy: Succeed(Stopped) (used_gas=114827): []
+
+// test of GlobalVectors::test_swap_global
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_GlobalVectors_test_swap_global" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_GlobalVectors_test_swap_global()
+        return (0, 0)
+        function A2_GlobalVectors_test_swap_global() {
+            let $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32, $t33, $t34, $t35, $t36, $t37, $t38, $t39, $t40, $t41, $t42, $t43, $t44, $t45, $t46, $t47, $t48, $t49, $t50
+            let $locals := $Malloc(64)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t23 := 101
+                    $t23 := 101
+                    // abort($t23)
+                    $Abort($t23)
+                }
+                case 4 {
+                    // $t1 := vector::empty<u64>()
+                    mstore($locals, A1_vector_empty$u64$())
+                    // $t2 := borrow_local($t1)
+                    $t2 := $MakePtr(false, $locals)
+                    // $t3 := 42
+                    $t3 := 42
+                    // vector::push_back<u64>($t2, $t3)
+                    A1_vector_push_back$u64$($t2, $t3)
+                    // $t4 := borrow_local($t1)
+                    $t4 := $MakePtr(false, $locals)
+                    // $t5 := 43
+                    $t5 := 43
+                    // vector::push_back<u64>($t4, $t5)
+                    A1_vector_push_back$u64$($t4, $t5)
+                    // $t6 := borrow_local($t1)
+                    $t6 := $MakePtr(false, $locals)
+                    // $t7 := 44
+                    $t7 := 44
+                    // vector::push_back<u64>($t6, $t7)
+                    A1_vector_push_back$u64$($t6, $t7)
+                    // $t8 := 0x42
+                    $t8 := 0x42
+                    // $t0 := Evm::sign($t8)
+                    mstore(add($locals, 32), A2_Evm_sign($t8))
+                    // $t9 := borrow_local($t0)
+                    $t9 := $MakePtr(false, add($locals, 32))
+                    // $t10 := move($t1)
+                    $t10 := mload($locals)
+                    // $t11 := pack GlobalVectors::T<u64>($t10)
+                    {
+                        let $mem := $Malloc(32)
+                        $MemoryStoreU256(add($mem, 0), $t10)
+                        $t11 := $mem
+                    }
+                    // move_to<GlobalVectors::T<u64>>($t11, $t9)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $LoadU256($t9))
+                        if $AlignedStorageLoad($base_offset) {
+                          $AbortBuiltin()
+                        }
+                        $AlignedStorageStore($base_offset, true)
+                        {
+                            let $dst := add($base_offset, 32)
+                            let $src := $t11
+                            {
+                                let $linked_src_814019441 := mload(add($src, 0))
+                                let $linked_dst_814019441 := $NewLinkedStorageBase(0x3084f371)
+                                let $size_814019441 := $MemoryLoadU64($linked_src_814019441)
+                                let $data_size_814019441 := mul($size_814019441, 8)
+                                $AlignedStorageStore($linked_dst_814019441, mload($linked_src_814019441))
+                                let $data_src_814019441 := add($linked_src_814019441, 32)
+                                let $data_dst_814019441 := add($linked_dst_814019441, 32)
+                                for { let $offs_814019441 := 0 } lt($offs_814019441, $data_size_814019441) { $offs_814019441 := add($offs_814019441, 32)} {
+                                    $AlignedStorageStore(add($data_dst_814019441, $offs_814019441), mload(add($data_src_814019441, $offs_814019441)))
+                                    $Free($linked_src_814019441, add($data_size_814019441, 32))
+                                }
+                                $AlignedStorageStore(add($dst, 0), $linked_dst_814019441)
+                            }
+                            $Free($src, 32)
+                        }
+                    }
+                    // $t12 := 0x42
+                    $t12 := 0x42
+                    // $t13 := borrow_global<GlobalVectors::T<u64>>($t12)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $t12)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t13 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t14 := borrow_field<GlobalVectors::T<u64>>.v($t13)
+                    $t14 := $t13
+                    // $t15 := 0
+                    $t15 := 0
+                    // $t16 := 2
+                    $t16 := 2
+                    // vector::swap<u64>($t14, $t15, $t16)
+                    A1_vector_swap$u64$($t14, $t15, $t16)
+                    // $t17 := 0x42
+                    $t17 := 0x42
+                    // $t18 := borrow_global<GlobalVectors::T<u64>>($t17)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $t17)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t18 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t19 := borrow_field<GlobalVectors::T<u64>>.v($t18)
+                    $t19 := $t18
+                    // $t20 := vector::length<u64>($t19)
+                    $t20 := A1_vector_length$u64$($t19)
+                    // $t21 := 3
+                    $t21 := 3
+                    // $t22 := ==($t20, $t21)
+                    $t22 := $Eq($t20, $t21)
+                    // if ($t22) goto L1 else goto L0
+                    switch $t22
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t24 := 0x42
+                    $t24 := 0x42
+                    // $t25 := borrow_global<GlobalVectors::T<u64>>($t24)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $t24)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t25 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t26 := borrow_field<GlobalVectors::T<u64>>.v($t25)
+                    $t26 := $t25
+                    // $t27 := 0
+                    $t27 := 0
+                    // $t28 := vector::borrow<u64>($t26, $t27)
+                    $t28 := A1_vector_borrow$u64$($t26, $t27)
+                    // $t29 := read_ref($t28)
+                    $t29 := $LoadU64($t28)
+                    // $t30 := 44
+                    $t30 := 44
+                    // $t31 := ==($t29, $t30)
+                    $t31 := $Eq($t29, $t30)
+                    // if ($t31) goto L4 else goto L3
+                    switch $t31
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t32 := 102
+                    $t32 := 102
+                    // abort($t32)
+                    $Abort($t32)
+                }
+                case 8 {
+                    // label L5
+                    // $t33 := 0x42
+                    $t33 := 0x42
+                    // $t34 := borrow_global<GlobalVectors::T<u64>>($t33)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $t33)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t34 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t35 := borrow_field<GlobalVectors::T<u64>>.v($t34)
+                    $t35 := $t34
+                    // $t36 := 1
+                    $t36 := 1
+                    // $t37 := vector::borrow<u64>($t35, $t36)
+                    $t37 := A1_vector_borrow$u64$($t35, $t36)
+                    // $t38 := read_ref($t37)
+                    $t38 := $LoadU64($t37)
+                    // $t39 := 43
+                    $t39 := 43
+                    // $t40 := ==($t38, $t39)
+                    $t40 := $Eq($t38, $t39)
+                    // if ($t40) goto L7 else goto L6
+                    switch $t40
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t41 := 103
+                    $t41 := 103
+                    // abort($t41)
+                    $Abort($t41)
+                }
+                case 11 {
+                    // label L8
+                    // $t42 := 0x42
+                    $t42 := 0x42
+                    // $t43 := borrow_global<GlobalVectors::T<u64>>($t42)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $t42)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t43 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t44 := borrow_field<GlobalVectors::T<u64>>.v($t43)
+                    $t44 := $t43
+                    // $t45 := 2
+                    $t45 := 2
+                    // $t46 := vector::borrow<u64>($t44, $t45)
+                    $t46 := A1_vector_borrow$u64$($t44, $t45)
+                    // $t47 := read_ref($t46)
+                    $t47 := $LoadU64($t46)
+                    // $t48 := 42
+                    $t48 := 42
+                    // $t49 := ==($t47, $t48)
+                    $t49 := $Eq($t47, $t48)
+                    // if ($t49) goto L10 else goto L9
+                    switch $t49
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t50 := 104
+                    $t50 := 104
+                    // abort($t50)
+                    $Abort($t50)
+                }
+                case 14 {
+                    // label L11
+                    // return ()
+                    $Free($locals, 64)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_borrow$u64$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 8)))
+        }
+        function A1_vector_length$u64$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A1_vector_swap$u64$(v_ref, i, j) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if or($GtEq(i, size), $GtEq(j, size)) { $AbortBuiltin() }
+            let i_ptr := $IndexPtr(v_ptr, add(32, mul(i, 8)))
+            let j_ptr := $IndexPtr(v_ptr, add(32, mul(j, 8)))
+            let i_val := $LoadU64(i_ptr)
+            let j_val := $LoadU64(j_ptr)
+            $StoreU64(i_ptr, j_val)
+            $StoreU64(j_ptr, i_val)
+        }
+        function A2_Evm_sign(addr) -> signer {
+          signer := addr
+        }
+        function A1_vector_push_back$u64$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 8)))
+            $StoreU64(e_ptr, e)
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 8)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_vector_empty$u64$() -> vector {
+            vector := $Malloc(48)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $GtEq(x, y) -> r {
+            r := or(gt(x, y), eq(x, y))
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of GlobalVectors::test_swap_global: Succeed(Stopped) (used_gas=124086): []
diff --git a/third_party/move/evm/move-to-yul/tests/Locals.v2_exp b/third_party/move/evm/move-to-yul/tests/Locals.v2_exp
new file mode 100644
index 0000000000000..62b4cb4f57484
--- /dev/null
+++ b/third_party/move/evm/move-to-yul/tests/Locals.v2_exp
@@ -0,0 +1,893 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_M" {
+    code {
+        codecopy(0, dataoffset("A2_M_deployed"), datasize("A2_M_deployed"))
+        return(0, datasize("A2_M_deployed"))
+    }
+    object "A2_M_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                case 0xc11ae395
+                {
+                    // evaded(uint64,uint64)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1 := abi_decode_tuple_$uint64_uint64$_$u64_u64$(4, calldatasize())
+                    let ret_0, ret_1, ret_2, ret_3 := A2_M_evaded(param_0, param_1)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint64_uint64_uint64_uint64$_$u64_u64_u64_u64$(memPos, ret_0, ret_1, ret_2, ret_3)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                default {}
+            }
+            $Abort(97)
+            function A2_M_evaded(a, b) -> $result0, $result1, $result2, $result3 {
+                let ar, d, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14
+                let $locals := $Malloc(64)
+                mstore($locals, a)
+                // $t5 := copy($t0)
+                $t5 := mload($locals)
+                // $t3 := $t5
+                mstore(add($locals, 32), $t5)
+                // $t6 := copy($t3)
+                $t6 := mload(add($locals, 32))
+                // $t7 := +($t6, $t1)
+                $t7 := $AddU64($t6, b)
+                // $t8 := borrow_local($t0)
+                $t8 := $MakePtr(false, add($locals, 24))
+                // $t9 := borrow_local($t3)
+                $t9 := $MakePtr(false, add($locals, 56))
+                // $t10 := read_ref($t9)
+                $t10 := $LoadU64($t9)
+                // $t11 := 1
+                $t11 := 1
+                // $t12 := +($t10, $t11)
+                $t12 := $AddU64($t10, $t11)
+                // write_ref($t8, $t12)
+                $StoreU64($t8, $t12)
+                // $t13 := move($t0)
+                $t13 := mload($locals)
+                // $t14 := move($t3)
+                $t14 := mload(add($locals, 32))
+                // return ($t13, $t1, $t14, $t7)
+                $result0 := $t13
+                $result1 := b
+                $result2 := $t14
+                $result3 := $t7
+                $Free($locals, 64)
+            }
+
+            function abi_encode_tuple_$uint64_uint64_uint64_uint64$_$u64_u64_u64_u64$(headStart ,value_0, value_1, value_2, value_3) -> tail {
+                tail := add(headStart, 128)
+                abi_encode_uint64(value_0, add(headStart, 0))
+                abi_encode_uint64(value_1, add(headStart, 32))
+                abi_encode_uint64(value_2, add(headStart, 64))
+                abi_encode_uint64(value_3, add(headStart, 96))
+            }
+            function abi_encode_uint64(value, pos) {
+                mstore(pos, cleanup_uint64(value))
+            }
+            function cleanup_uint64(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffff)
+            }
+            function abi_decode_tuple_$uint64_uint64$_$u64_u64$(headStart, dataEnd) -> value_0, value_1 {
+                if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_uint64(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_uint64(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint64(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint64(value)
+            }
+            function validator_uint64(value) {
+                if iszero(eq(value, cleanup_uint64(value))) { $Abort(95) }
+            }
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $AbortBuiltin() {
+                $Abort(sub(0, 1))
+            }
+            function $Malloc(size) -> offs {
+                offs := mload(0)
+                // pad to word size
+                mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+            }
+            function $Free(offs, size) {
+            }
+            function $MakePtr(is_storage, offs) -> ptr {
+              ptr := or(is_storage, shl(1, offs))
+            }
+            function $IsStoragePtr(ptr) -> b {
+              b := and(ptr, 0x1)
+            }
+            function $OffsetPtr(ptr) -> offs {
+              offs := shr(1, ptr)
+            }
+            function $MaskForSize(size) -> mask {
+              mask := sub(shl(shl(3, size), 1), 1)
+            }
+            function $ExtractBytes(word, start, size) -> bytes {
+               switch size
+               case 1 {
+                  // use the faster byte primitive
+                  bytes := byte(start, word)
+               }
+               default {
+                  // As we have big endian, we need to right shift the value from
+                  // where the highest byte starts in the word (32 - start), minus
+                  // the size.
+                  let shift_bits := shl(3, sub(sub(32, start), size))
+                  bytes := and(shr(shift_bits, word), $MaskForSize(size))
+               }
+            }
+            function $InjectBytes(word, start, size, bytes) -> new_word {
+               let shift_bits := shl(3, sub(sub(32, start), size))
+               // Blend out the bits which we inject
+               let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+               word := and(word, neg_mask)
+               // Overlay the bits we inject
+               new_word := or(word, shl(shift_bits, bytes))
+            }
+            function $ToWordOffs(offs) -> word_offs, byte_offset {
+              word_offs := shr(5, offs)
+              byte_offset := and(offs, 0x1F)
+            }
+            function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+              let available_bytes := sub(32, byte_offset)
+              switch gt(size, available_bytes)
+              case 0 {
+                overflow_bytes := 0
+              }
+              default {
+                overflow_bytes := sub(size, available_bytes)
+              }
+            }
+            function $MemoryLoadBytes(offs, size) -> val {
+              // Lower bit where the value in the higher bytes ends
+              let bit_end := shl(3, sub(32, size))
+              val := shr(bit_end, mload(offs))
+            }
+            function $MemoryStoreBytes(offs, size, val) {
+              let bit_end := shl(3, sub(32, size))
+              let mask := shl(bit_end, $MaskForSize(size))
+              mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+            }
+            function $StorageLoadBytes(offs, size) -> val {
+              let word_offs, byte_offs := $ToWordOffs(offs)
+              let key := $StorageKey(0, word_offs)
+              val := $ExtractBytes(sload(key), byte_offs, size)
+              let overflow_bytes := $OverflowBytes(byte_offs, size)
+              if $LogicalNot(iszero(overflow_bytes)) {
+                key := $StorageKey(0, add(word_offs, 1))
+                let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+                val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+              }
+            }
+            function $StorageStoreBytes(offs, size, bytes) {
+              let word_offs, byte_offs := $ToWordOffs(offs)
+              let key := $StorageKey(0, word_offs)
+              let overflow_bytes := $OverflowBytes(byte_offs, size)
+              switch overflow_bytes
+              case 0 {
+                sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+              }
+              default {
+                // Shift the higher bytes to the right
+                let used_bytes := sub(size, overflow_bytes)
+                let higher_bytes := shr(used_bytes, bytes)
+                let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+                sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+                key := $StorageKey(0, add(word_offs, 1))
+                sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+              }
+            }
+            function $StorageKey(group, word) -> key {
+              mstore(32, word)
+              mstore(64, shl(224, group))
+              key := keccak256(32, 36)
+            }
+            function $LoadU64(ptr) -> val {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                val := $MemoryLoadU64(offs)
+              }
+              default {
+                val := $StorageLoadU64(offs)
+              }
+            }
+            function $MemoryLoadU64(offs) -> val {
+              val := $MemoryLoadBytes(offs, 8)
+            }
+            function $StorageLoadU64(offs) -> val {
+              val := $StorageLoadBytes(offs, 8)
+            }
+            function $StoreU64(ptr, val) {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                $MemoryStoreU64(offs, val)
+              }
+              default {
+                $StorageStoreU64(offs, val)
+              }
+            }
+            function $MemoryStoreU64(offs, val) {
+              $MemoryStoreBytes(offs, 8, val)
+            }
+            function $StorageStoreU64(offs, val) {
+              $StorageStoreBytes(offs, 8, val)
+            }
+            function $AddU64(x, y) -> r {
+                if lt(sub(0xffffffffffffffff, x), y) { $AbortBuiltin() }
+                r := add(x, y)
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+            function $LogicalNot(x) -> r {
+                r := iszero(x)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
+
+
+!! Unit tests
+
+// test of M::test_call_by_ref
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_call_by_ref" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_call_by_ref()
+        return (0, 0)
+        function A2_M_test_call_by_ref() {
+            let $t1, $t2, $t3, $t4, $t5, $t6
+            let $locals := $Malloc(32)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t6 := 101
+                    $t6 := 101
+                    // abort($t6)
+                    $Abort($t6)
+                }
+                case 4 {
+                    // $t1 := 1
+                    $t1 := 1
+                    // $t0 := $t1
+                    mstore($locals, $t1)
+                    // $t2 := borrow_local($t0)
+                    $t2 := $MakePtr(false, add($locals, 24))
+                    // M::call_by_ref($t2)
+                    A2_M_call_by_ref($t2)
+                    // $t3 := move($t0)
+                    $t3 := mload($locals)
+                    // $t4 := 2
+                    $t4 := 2
+                    // $t5 := ==($t3, $t4)
+                    $t5 := $Eq($t3, $t4)
+                    // if ($t5) goto L1 else goto L0
+                    switch $t5
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // return ()
+                    $Free($locals, 32)
+                    leave
+                }
+            }
+        }
+
+        function A2_M_call_by_ref(a) {
+            let $t1
+            // $t1 := 2
+            $t1 := 2
+            // write_ref($t0, $t1)
+            $StoreU64(a, $t1)
+            // return ()
+        }
+
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+    }
+}
+===> Test result of M::test_call_by_ref: Succeed(Stopped) (used_gas=488): []
+
+// test of M::test_evaded
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_evaded" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_evaded()
+        return (0, 0)
+        function A2_M_test_evaded() {
+            let b, c, d, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t11 := 100
+                    $t11 := 100
+                    // abort($t11)
+                    $Abort($t11)
+                }
+                case 4 {
+                    // $t3 := 1
+                    $t3 := 1
+                    // $t4 := 2
+                    $t4 := 2
+                    // ($t5, $t6, $t7, $t8) := M::evaded($t3, $t4)
+                    $t5, $t6, $t7, $t8 := A2_M_evaded($t3, $t4)
+                    // $t9 := 2
+                    $t9 := 2
+                    // $t10 := ==($t5, $t9)
+                    $t10 := $Eq($t5, $t9)
+                    // if ($t10) goto L1 else goto L0
+                    switch $t10
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t12 := 2
+                    $t12 := 2
+                    // $t13 := ==($t6, $t12)
+                    $t13 := $Eq($t6, $t12)
+                    // if ($t13) goto L4 else goto L3
+                    switch $t13
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t14 := 101
+                    $t14 := 101
+                    // abort($t14)
+                    $Abort($t14)
+                }
+                case 8 {
+                    // label L5
+                    // $t15 := 1
+                    $t15 := 1
+                    // $t16 := ==($t7, $t15)
+                    $t16 := $Eq($t7, $t15)
+                    // if ($t16) goto L7 else goto L6
+                    switch $t16
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t17 := 102
+                    $t17 := 102
+                    // abort($t17)
+                    $Abort($t17)
+                }
+                case 11 {
+                    // label L8
+                    // $t18 := 3
+                    $t18 := 3
+                    // $t19 := ==($t8, $t18)
+                    $t19 := $Eq($t8, $t18)
+                    // if ($t19) goto L10 else goto L9
+                    switch $t19
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t20 := 103
+                    $t20 := 103
+                    // abort($t20)
+                    $Abort($t20)
+                }
+                case 14 {
+                    // label L11
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function A2_M_evaded(a, b) -> $result0, $result1, $result2, $result3 {
+            let ar, d, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14
+            let $locals := $Malloc(64)
+            mstore($locals, a)
+            // $t5 := copy($t0)
+            $t5 := mload($locals)
+            // $t3 := $t5
+            mstore(add($locals, 32), $t5)
+            // $t6 := copy($t3)
+            $t6 := mload(add($locals, 32))
+            // $t7 := +($t6, $t1)
+            $t7 := $AddU64($t6, b)
+            // $t8 := borrow_local($t0)
+            $t8 := $MakePtr(false, add($locals, 24))
+            // $t9 := borrow_local($t3)
+            $t9 := $MakePtr(false, add($locals, 56))
+            // $t10 := read_ref($t9)
+            $t10 := $LoadU64($t9)
+            // $t11 := 1
+            $t11 := 1
+            // $t12 := +($t10, $t11)
+            $t12 := $AddU64($t10, $t11)
+            // write_ref($t8, $t12)
+            $StoreU64($t8, $t12)
+            // $t13 := move($t0)
+            $t13 := mload($locals)
+            // $t14 := move($t3)
+            $t14 := mload(add($locals, 32))
+            // return ($t13, $t1, $t14, $t7)
+            $result0 := $t13
+            $result1 := b
+            $result2 := $t14
+            $result3 := $t7
+            $Free($locals, 64)
+        }
+
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $AddU64(x, y) -> r {
+            if lt(sub(0xffffffffffffffff, x), y) { $AbortBuiltin() }
+            r := add(x, y)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of M::test_evaded: Succeed(Stopped) (used_gas=2140): []
+
+// test of M::test_freeze_ref
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_freeze_ref" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_freeze_ref()
+        return (0, 0)
+        function A2_M_test_freeze_ref() {
+            let $t1, $t2, $t3, $t4, $t5, $t6, $t7
+            let $locals := $Malloc(32)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t7 := 101
+                    $t7 := 101
+                    // abort($t7)
+                    $Abort($t7)
+                }
+                case 4 {
+                    // $t1 := 1
+                    $t1 := 1
+                    // $t0 := $t1
+                    mstore($locals, $t1)
+                    // $t2 := borrow_local($t0)
+                    $t2 := $MakePtr(false, add($locals, 24))
+                    // $t3 := freeze_ref($t2)
+                    $t3 := $t2
+                    // $t4 := M::call_by_immut_ref($t3)
+                    $t4 := A2_M_call_by_immut_ref($t3)
+                    // $t5 := 1
+                    $t5 := 1
+                    // $t6 := ==($t4, $t5)
+                    $t6 := $Eq($t4, $t5)
+                    // if ($t6) goto L1 else goto L0
+                    switch $t6
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // return ()
+                    $Free($locals, 32)
+                    leave
+                }
+            }
+        }
+
+        function A2_M_call_by_immut_ref(a) -> $result {
+            let $t1
+            // $t1 := read_ref($t0)
+            $t1 := $LoadU64(a)
+            // return $t1
+            $result := $t1
+        }
+
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of M::test_freeze_ref: Succeed(Stopped) (used_gas=438): []
diff --git a/third_party/move/evm/move-to-yul/tests/MoveCalls.v2_exp b/third_party/move/evm/move-to-yul/tests/MoveCalls.v2_exp
new file mode 100644
index 0000000000000..1965022678778
--- /dev/null
+++ b/third_party/move/evm/move-to-yul/tests/MoveCalls.v2_exp
@@ -0,0 +1,119 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_M" {
+    code {
+        codecopy(0, dataoffset("A2_M_deployed"), datasize("A2_M_deployed"))
+        return(0, datasize("A2_M_deployed"))
+    }
+    object "A2_M_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                case 0x70e8dbcb
+                {
+                    // f(uint64)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint64$_$u64$(4, calldatasize())
+                    let ret_0 := A2_M_f(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint64$_$u64$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                default {}
+            }
+            $Abort(97)
+            function A2_M_f(x) -> $result {
+                let y, $t2, $t3, $t4, $t5, $t6
+                // ($t2, $t3) := M::g($t0)
+                $t2, $t3 := A2_M_g(x)
+                // drop($t2)
+                // $t4 := 1
+                $t4 := 1
+                // $t5 := -($t3, $t4)
+                $t5 := $Sub($t3, $t4)
+                // $t6 := M::h($t5)
+                $t6 := A2_M_h($t5)
+                // return $t6
+                $result := $t6
+            }
+
+            function A2_M_h(x) -> $result {
+                let $t1, $t2, $t3
+                // $t1 := M::k<u64>($t0)
+                $t1 := A2_M_k$u64$(x)
+                // $t2 := 1
+                $t2 := 1
+                // $t3 := +($t1, $t2)
+                $t3 := $AddU64($t1, $t2)
+                // return $t3
+                $result := $t3
+            }
+
+            function A2_M_k$u64$(x) -> $result {
+                // return $t0
+                $result := x
+            }
+
+            function A2_M_g(x) -> $result0, $result1 {
+                // return ($t0, $t0)
+                $result0 := x
+                $result1 := x
+            }
+
+            function abi_encode_tuple_$uint64$_$u64$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_uint64(value_0, add(headStart, 0))
+            }
+            function abi_encode_uint64(value, pos) {
+                mstore(pos, cleanup_uint64(value))
+            }
+            function cleanup_uint64(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffff)
+            }
+            function abi_decode_tuple_$uint64$_$u64$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_uint64(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint64(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint64(value)
+            }
+            function validator_uint64(value) {
+                if iszero(eq(value, cleanup_uint64(value))) { $Abort(95) }
+            }
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $AbortBuiltin() {
+                $Abort(sub(0, 1))
+            }
+            function $AddU64(x, y) -> r {
+                if lt(sub(0xffffffffffffffff, x), y) { $AbortBuiltin() }
+                r := add(x, y)
+            }
+            function $Sub(x, y) -> r {
+                if lt(x, y) { $AbortBuiltin() }
+                r := sub(x, y)
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
diff --git a/third_party/move/evm/move-to-yul/tests/NativeFunctions.v2_exp b/third_party/move/evm/move-to-yul/tests/NativeFunctions.v2_exp
new file mode 100644
index 0000000000000..fb3c4f9bbe074
--- /dev/null
+++ b/third_party/move/evm/move-to-yul/tests/NativeFunctions.v2_exp
@@ -0,0 +1,1289 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_NativeFunctions" {
+    code {
+        codecopy(0, dataoffset("A2_NativeFunctions_deployed"), datasize("A2_NativeFunctions_deployed"))
+        return(0, datasize("A2_NativeFunctions_deployed"))
+    }
+    object "A2_NativeFunctions_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                case 0x90b6bab2
+                {
+                    // call_native_functions()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    A2_NativeFunctions_call_native_functions()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                default {}
+            }
+            $Abort(97)
+            function A2_NativeFunctions_call_native_functions() {
+                let $t0, $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15
+                // $t0 := U256::one()
+                $t0 := A2_U256_one()
+                // $t1 := Evm::blockhash($t0)
+                $t1 := A2_Evm_blockhash($t0)
+                // drop($t1)
+                // $t2 := Evm::block_basefee()
+                $t2 := A2_Evm_block_basefee()
+                // drop($t2)
+                $Free($t2, 0)
+                // $t3 := Evm::block_chainid()
+                $t3 := A2_Evm_block_chainid()
+                // drop($t3)
+                $Free($t3, 0)
+                // $t4 := Evm::block_coinbase()
+                $t4 := A2_Evm_block_coinbase()
+                // drop($t4)
+                // $t5 := Evm::block_difficulty()
+                $t5 := A2_Evm_block_difficulty()
+                // drop($t5)
+                $Free($t5, 0)
+                // $t6 := Evm::block_gaslimit()
+                $t6 := A2_Evm_block_gaslimit()
+                // drop($t6)
+                $Free($t6, 0)
+                // $t7 := Evm::block_number()
+                $t7 := A2_Evm_block_number()
+                // drop($t7)
+                $Free($t7, 0)
+                // $t8 := Evm::block_timestamp()
+                $t8 := A2_Evm_block_timestamp()
+                // drop($t8)
+                $Free($t8, 0)
+                // $t9 := Evm::gasleft()
+                $t9 := A2_Evm_gasleft()
+                // drop($t9)
+                $Free($t9, 0)
+                // $t10 := Evm::msg_data()
+                $t10 := A2_Evm_msg_data()
+                // drop($t10)
+                // $t11 := Evm::msg_sender()
+                $t11 := A2_Evm_msg_sender()
+                // drop($t11)
+                // $t12 := Evm::msg_sig()
+                $t12 := A2_Evm_msg_sig()
+                // drop($t12)
+                // $t13 := Evm::msg_value()
+                $t13 := A2_Evm_msg_value()
+                // drop($t13)
+                $Free($t13, 0)
+                // $t14 := Evm::tx_gasprice()
+                $t14 := A2_Evm_tx_gasprice()
+                // drop($t14)
+                $Free($t14, 0)
+                // $t15 := Evm::tx_origin()
+                $t15 := A2_Evm_tx_origin()
+                // drop($t15)
+                // return ()
+            }
+
+            function A2_Evm_tx_origin() -> result {
+              result := origin()
+            }
+            function A2_Evm_tx_gasprice() -> result {
+              result := gasprice()
+            }
+            function A2_Evm_msg_value() -> result {
+              result := callvalue()
+            }
+            function A2_Evm_msg_sig() -> result {
+              result := timestamp()
+            }
+            function A2_Evm_msg_sender() -> result {
+              result := caller()
+            }
+            function A2_Evm_msg_data() -> result {
+              result := calldataload(0)
+            }
+            function A2_Evm_gasleft() -> result {
+              result := gas()
+            }
+            function A2_Evm_block_timestamp() -> result {
+              result := timestamp()
+            }
+            function A2_Evm_block_number() -> result {
+              result := number()
+            }
+            function A2_Evm_block_gaslimit() -> result {
+              result := gaslimit()
+            }
+            function A2_Evm_block_difficulty() -> result {
+              result := difficulty()
+            }
+            function A2_Evm_block_coinbase() -> result {
+              result := coinbase()
+            }
+            function A2_Evm_block_chainid() -> result {
+              result := chainid()
+            }
+            function A2_Evm_block_basefee() -> result {
+              result := basefee()
+            }
+            function A2_Evm_blockhash(block_number) -> hash {
+              hash := blockhash(block_number)
+            }
+            function A2_U256_one() -> $result {
+                let $t0
+                // $t0 := 1
+                $t0 := 1
+                // return $t0
+                $result := $t0
+            }
+
+            function abi_encode_tuple__(headStart ) -> tail {
+                tail := add(headStart, 0)
+            }
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $Free(offs, size) {
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
+
+
+!! Unit tests
+
+// test of NativeFunctions::test_abort
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_NativeFunctions_test_abort" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_NativeFunctions_test_abort()
+        return (0, 0)
+        function A2_NativeFunctions_test_abort() {
+            let $t0
+            // $t0 := [101, 114, 114, 111, 114, 32, 109, 101, 115, 115, 97, 103, 101]
+            $t0 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(13)))
+            $MemoryStoreU64($t0, 13)
+            $MemoryStoreU64(add($t0, 8), $ClosestGreaterPowerOfTwo(13))
+            copy_literal_string_to_memory_1627894131(add($t0, 32))
+            // Evm::abort_with($t0)
+            A2_Evm_abort_with($t0)
+            // return ()
+        }
+
+        function A2_Evm_abort_with(message) {
+          let head := $Malloc(32)
+          // store the function selector for Error(string)
+          mstore(head, 3963877391197344453575983046348115674221700746820753546331534351508065746944)
+          let pos := add(head, 4)
+          mstore(pos, 32)
+          pos := add(pos, 32)
+          let size := $MemoryLoadU64(message)
+          mstore(pos, size)
+          pos := add(pos, 32)
+          $CopyMemory(add(message, 32), pos, size)
+          size := $RoundUp(size)
+          let end := add(pos, size)
+          revert(head, sub(end, head))
+        }
+        function copy_literal_string_to_memory_1627894131(value) {
+            $MemoryStoreU8(value, 101)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 114)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 114)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 111)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 114)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 32)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 109)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 101)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 115)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 115)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 97)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 103)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 101)
+            value := add(value, 1)
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ClosestGreaterPowerOfTwo(x) -> r {
+            r := or(r, shr(1, x))
+            r := or(r, shr(2, r))
+            r := or(r, shr(4, r))
+            r := or(r, shr(8, r))
+            r := or(r, shr(16, r))
+            r := or(r, shr(32, r))
+            r := add(x, 1)
+        }
+        function $RoundUp(value) -> result {
+            result := and(add(value, 31), not(31))
+        }
+    }
+}
+===> Test result of NativeFunctions::test_abort: Revert(Reverted) (used_gas=696): [8, 195, 121, 160, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 101, 114, 114, 111, 114, 32, 109, 101, 115, 115, 97, 103, 101, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+
+// test of NativeFunctions::test_concat
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_NativeFunctions_test_concat" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_NativeFunctions_test_concat()
+        return (0, 0)
+        function A2_NativeFunctions_test_concat() {
+            let $t0, $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t5 := 100
+                    $t5 := 100
+                    // abort($t5)
+                    $Abort($t5)
+                }
+                case 4 {
+                    // $t0 := []
+                    $t0 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(0)))
+                    $MemoryStoreU64($t0, 0)
+                    $MemoryStoreU64(add($t0, 8), $ClosestGreaterPowerOfTwo(0))
+                    copy_literal_string_to_memory_21418693(add($t0, 32))
+                    // $t1 := []
+                    $t1 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(0)))
+                    $MemoryStoreU64($t1, 0)
+                    $MemoryStoreU64(add($t1, 8), $ClosestGreaterPowerOfTwo(0))
+                    copy_literal_string_to_memory_21418693(add($t1, 32))
+                    // $t2 := Evm::concat($t0, $t1)
+                    $t2 := A2_Evm_concat($t0, $t1)
+                    // $t3 := []
+                    $t3 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(0)))
+                    $MemoryStoreU64($t3, 0)
+                    $MemoryStoreU64(add($t3, 8), $ClosestGreaterPowerOfTwo(0))
+                    copy_literal_string_to_memory_21418693(add($t3, 32))
+                    // $t4 := ==($t2, $t3)
+                    $t4 := $Eq_$vec$u8$$($t2, $t3)
+                    // if ($t4) goto L1 else goto L0
+                    switch $t4
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t6 := [49]
+                    $t6 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(1)))
+                    $MemoryStoreU64($t6, 1)
+                    $MemoryStoreU64(add($t6, 8), $ClosestGreaterPowerOfTwo(1))
+                    copy_literal_string_to_memory_2868747976(add($t6, 32))
+                    // $t7 := [50]
+                    $t7 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(1)))
+                    $MemoryStoreU64($t7, 1)
+                    $MemoryStoreU64(add($t7, 8), $ClosestGreaterPowerOfTwo(1))
+                    copy_literal_string_to_memory_4015750317(add($t7, 32))
+                    // $t8 := Evm::concat($t6, $t7)
+                    $t8 := A2_Evm_concat($t6, $t7)
+                    // $t9 := [49, 50]
+                    $t9 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(2)))
+                    $MemoryStoreU64($t9, 2)
+                    $MemoryStoreU64(add($t9, 8), $ClosestGreaterPowerOfTwo(2))
+                    copy_literal_string_to_memory_141265791(add($t9, 32))
+                    // $t10 := ==($t8, $t9)
+                    $t10 := $Eq_$vec$u8$$($t8, $t9)
+                    // if ($t10) goto L4 else goto L3
+                    switch $t10
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t11 := 101
+                    $t11 := 101
+                    // abort($t11)
+                    $Abort($t11)
+                }
+                case 8 {
+                    // label L5
+                    // $t12 := []
+                    $t12 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(0)))
+                    $MemoryStoreU64($t12, 0)
+                    $MemoryStoreU64(add($t12, 8), $ClosestGreaterPowerOfTwo(0))
+                    copy_literal_string_to_memory_21418693(add($t12, 32))
+                    // $t13 := [97, 98, 99]
+                    $t13 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(3)))
+                    $MemoryStoreU64($t13, 3)
+                    $MemoryStoreU64(add($t13, 8), $ClosestGreaterPowerOfTwo(3))
+                    copy_literal_string_to_memory_2053440334(add($t13, 32))
+                    // $t14 := Evm::concat($t12, $t13)
+                    $t14 := A2_Evm_concat($t12, $t13)
+                    // $t15 := [97, 98, 99]
+                    $t15 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(3)))
+                    $MemoryStoreU64($t15, 3)
+                    $MemoryStoreU64(add($t15, 8), $ClosestGreaterPowerOfTwo(3))
+                    copy_literal_string_to_memory_2053440334(add($t15, 32))
+                    // $t16 := ==($t14, $t15)
+                    $t16 := $Eq_$vec$u8$$($t14, $t15)
+                    // if ($t16) goto L7 else goto L6
+                    switch $t16
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t17 := 102
+                    $t17 := 102
+                    // abort($t17)
+                    $Abort($t17)
+                }
+                case 11 {
+                    // label L8
+                    // $t18 := [97]
+                    $t18 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(1)))
+                    $MemoryStoreU64($t18, 1)
+                    $MemoryStoreU64(add($t18, 8), $ClosestGreaterPowerOfTwo(1))
+                    copy_literal_string_to_memory_371573306(add($t18, 32))
+                    // $t19 := [98, 99]
+                    $t19 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(2)))
+                    $MemoryStoreU64($t19, 2)
+                    $MemoryStoreU64(add($t19, 8), $ClosestGreaterPowerOfTwo(2))
+                    copy_literal_string_to_memory_3119208230(add($t19, 32))
+                    // $t20 := Evm::concat($t18, $t19)
+                    $t20 := A2_Evm_concat($t18, $t19)
+                    // $t21 := [100, 101]
+                    $t21 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(2)))
+                    $MemoryStoreU64($t21, 2)
+                    $MemoryStoreU64(add($t21, 8), $ClosestGreaterPowerOfTwo(2))
+                    copy_literal_string_to_memory_1933910203(add($t21, 32))
+                    // $t22 := Evm::concat($t20, $t21)
+                    $t22 := A2_Evm_concat($t20, $t21)
+                    // $t23 := [97, 98, 99, 100, 101]
+                    $t23 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(5)))
+                    $MemoryStoreU64($t23, 5)
+                    $MemoryStoreU64(add($t23, 8), $ClosestGreaterPowerOfTwo(5))
+                    copy_literal_string_to_memory_3871831907(add($t23, 32))
+                    // $t24 := ==($t22, $t23)
+                    $t24 := $Eq_$vec$u8$$($t22, $t23)
+                    // if ($t24) goto L10 else goto L9
+                    switch $t24
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t25 := 103
+                    $t25 := 103
+                    // abort($t25)
+                    $Abort($t25)
+                }
+                case 14 {
+                    // label L11
+                    // $t26 := [116, 101, 115, 116]
+                    $t26 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(4)))
+                    $MemoryStoreU64($t26, 4)
+                    $MemoryStoreU64(add($t26, 8), $ClosestGreaterPowerOfTwo(4))
+                    copy_literal_string_to_memory_1610556060(add($t26, 32))
+                    // $t27 := []
+                    $t27 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(0)))
+                    $MemoryStoreU64($t27, 0)
+                    $MemoryStoreU64(add($t27, 8), $ClosestGreaterPowerOfTwo(0))
+                    copy_literal_string_to_memory_21418693(add($t27, 32))
+                    // $t28 := Evm::concat($t26, $t27)
+                    $t28 := A2_Evm_concat($t26, $t27)
+                    // $t29 := [116, 101, 115, 116]
+                    $t29 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(4)))
+                    $MemoryStoreU64($t29, 4)
+                    $MemoryStoreU64(add($t29, 8), $ClosestGreaterPowerOfTwo(4))
+                    copy_literal_string_to_memory_1610556060(add($t29, 32))
+                    // $t30 := ==($t28, $t29)
+                    $t30 := $Eq_$vec$u8$$($t28, $t29)
+                    // if ($t30) goto L13 else goto L12
+                    switch $t30
+                    case 0  { $block := 16 }
+                    default { $block := 15 }
+                }
+                case 15 {
+                    // label L13
+                    // goto L14
+                    $block := 17
+                }
+                case 16 {
+                    // label L12
+                    // $t31 := 104
+                    $t31 := 104
+                    // abort($t31)
+                    $Abort($t31)
+                }
+                case 17 {
+                    // label L14
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function A2_Evm_concat(s1, s2) -> result {
+                          result := $ExtendVector(s1, s2, 1)
+                        }
+        function $Eq_$vec$u8$$(x, y) -> res
+        {
+            res := $EqVector(x, y, 1)
+        }
+        function copy_literal_string_to_memory_1610556060(value) {
+            $MemoryStoreU8(value, 116)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 101)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 115)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 116)
+            value := add(value, 1)
+        }
+        function copy_literal_string_to_memory_21418693(value) {
+        }
+        function copy_literal_string_to_memory_3871831907(value) {
+            $MemoryStoreU8(value, 97)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 98)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 99)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 100)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 101)
+            value := add(value, 1)
+        }
+        function copy_literal_string_to_memory_1933910203(value) {
+            $MemoryStoreU8(value, 100)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 101)
+            value := add(value, 1)
+        }
+        function copy_literal_string_to_memory_3119208230(value) {
+            $MemoryStoreU8(value, 98)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 99)
+            value := add(value, 1)
+        }
+        function copy_literal_string_to_memory_371573306(value) {
+            $MemoryStoreU8(value, 97)
+            value := add(value, 1)
+        }
+        function copy_literal_string_to_memory_2053440334(value) {
+            $MemoryStoreU8(value, 97)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 98)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 99)
+            value := add(value, 1)
+        }
+        function copy_literal_string_to_memory_141265791(value) {
+            $MemoryStoreU8(value, 49)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 50)
+            value := add(value, 1)
+        }
+        function copy_literal_string_to_memory_4015750317(value) {
+            $MemoryStoreU8(value, 50)
+            value := add(value, 1)
+        }
+        function copy_literal_string_to_memory_2868747976(value) {
+            $MemoryStoreU8(value, 49)
+            value := add(value, 1)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $EqVector(x, y, elem_size) -> r {
+            let len_x := $MemoryLoadU64(x)
+            let len_y := $MemoryLoadU64(y)
+            if $Neq(len_x, len_y) {
+                r := false
+                leave
+            }
+            let data_size_bytes := mul(elem_size, len_x)
+            let num_words, overflow_bytes := $ToWordOffs(data_size_bytes)
+            let i := 0
+            for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+                if $Neq(mload(add(x, add(i, 32))), mload(add(y, add(i, 32)))) {
+                    r := false
+                    leave
+                }
+            }
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let x_overflow := mload(add(x, add(overflow_offs, 32)))
+            let y_overflow := mload(add(y, add(overflow_offs, 32)))
+            r := eq(or(mask, x_overflow), or(mask, y_overflow))
+        }
+        function $Neq(x, y) -> r {
+            r := $LogicalNot(eq(x, y))
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $ClosestGreaterPowerOfTwo(x) -> r {
+            r := or(r, shr(1, x))
+            r := or(r, shr(2, r))
+            r := or(r, shr(4, r))
+            r := or(r, shr(8, r))
+            r := or(r, shr(16, r))
+            r := or(r, shr(32, r))
+            r := add(x, 1)
+        }
+        function $ExtendVector(v1, v2, elem_size) -> new_v1 {
+          let v1_len := $MemoryLoadU64(v1)
+          let v2_len := $MemoryLoadU64(v2)
+          let new_len := add(v1_len, v2_len)
+          let v1_cap := $MemoryLoadU64(add(v1, 8))
+          new_v1 := v1
+          if iszero(gt(v1_cap, new_len)){
+            let new_cap := $ClosestGreaterPowerOfTwo(new_len)
+            new_v1 := $Malloc(add(mul(new_cap, elem_size), 32))
+            $CopyMemory(v1, new_v1, add(mul(v1_len, elem_size), 32))
+            $MemoryStoreU64(add(new_v1, 8), new_cap)
+            $Free(v1, add(mul(v1_len, elem_size), 32))
+          }
+          let src := add(v2, 32)
+          let dst := add(add(new_v1, 32), mul(elem_size, v1_len))
+          $CopyMemory(src, dst, mul(v2_len, elem_size))
+          $MemoryStoreU64(new_v1, new_len)
+        }
+    }
+}
+===> Test result of NativeFunctions::test_concat: Succeed(Stopped) (used_gas=10872): []
+
+// test of NativeFunctions::test_signer_address_of
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_NativeFunctions_test_signer_address_of" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_NativeFunctions_test_signer_address_of()
+        return (0, 0)
+        function A2_NativeFunctions_test_signer_address_of() {
+            let $t1, $t2, $t3, $t4, $t5, $t6
+            let $locals := $Malloc(32)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t6 := 101
+                    $t6 := 101
+                    // abort($t6)
+                    $Abort($t6)
+                }
+                case 4 {
+                    // $t1 := 0x42
+                    $t1 := 0x42
+                    // $t0 := Evm::sign($t1)
+                    mstore($locals, A2_Evm_sign($t1))
+                    // $t2 := borrow_local($t0)
+                    $t2 := $MakePtr(false, $locals)
+                    // $t3 := signer::address_of($t2)
+                    $t3 := A1_signer_address_of($t2)
+                    // $t4 := 0x42
+                    $t4 := 0x42
+                    // $t5 := ==($t3, $t4)
+                    $t5 := $Eq($t3, $t4)
+                    // if ($t5) goto L1 else goto L0
+                    switch $t5
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // return ()
+                    $Free($locals, 32)
+                    leave
+                }
+            }
+        }
+
+        function A1_signer_address_of(s) -> $result {
+            let $t1, $t2
+            // $t1 := signer::borrow_address($t0)
+            $t1 := A1_signer_borrow_address(s)
+            // $t2 := read_ref($t1)
+            $t2 := $LoadU256($t1)
+            // return $t2
+            $result := $t2
+        }
+
+        function A1_signer_borrow_address(signer_ref) -> addr_ref {
+          addr_ref := signer_ref
+        }
+        function A2_Evm_sign(addr) -> signer {
+          signer := addr
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of NativeFunctions::test_signer_address_of: Succeed(Stopped) (used_gas=431): []
+
+// test of NativeFunctions::test_to_string
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_NativeFunctions_test_to_string" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_NativeFunctions_test_to_string()
+        return (0, 0)
+        function A2_NativeFunctions_test_to_string() {
+            let $t0, $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t4 := 101
+                    $t4 := 101
+                    // abort($t4)
+                    $Abort($t4)
+                }
+                case 4 {
+                    // $t0 := U256::zero()
+                    $t0 := A2_U256_zero()
+                    // $t1 := Evm::to_string($t0)
+                    $t1 := A2_Evm_to_string($t0)
+                    // $t2 := [48]
+                    $t2 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(1)))
+                    $MemoryStoreU64($t2, 1)
+                    $MemoryStoreU64(add($t2, 8), $ClosestGreaterPowerOfTwo(1))
+                    copy_literal_string_to_memory_2991736836(add($t2, 32))
+                    // $t3 := ==($t1, $t2)
+                    $t3 := $Eq_$vec$u8$$($t1, $t2)
+                    // if ($t3) goto L1 else goto L0
+                    switch $t3
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t5 := U256::one()
+                    $t5 := A2_U256_one()
+                    // $t6 := Evm::to_string($t5)
+                    $t6 := A2_Evm_to_string($t5)
+                    // $t7 := [49]
+                    $t7 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(1)))
+                    $MemoryStoreU64($t7, 1)
+                    $MemoryStoreU64(add($t7, 8), $ClosestGreaterPowerOfTwo(1))
+                    copy_literal_string_to_memory_2868747976(add($t7, 32))
+                    // $t8 := ==($t6, $t7)
+                    $t8 := $Eq_$vec$u8$$($t6, $t7)
+                    // if ($t8) goto L4 else goto L3
+                    switch $t8
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t9 := 102
+                    $t9 := 102
+                    // abort($t9)
+                    $Abort($t9)
+                }
+                case 8 {
+                    // label L5
+                    // $t10 := 42
+                    $t10 := 42
+                    // $t11 := U256::u256_from_u128($t10)
+                    $t11 := A2_U256_u256_from_u128($t10)
+                    // $t12 := Evm::to_string($t11)
+                    $t12 := A2_Evm_to_string($t11)
+                    // $t13 := [52, 50]
+                    $t13 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(2)))
+                    $MemoryStoreU64($t13, 2)
+                    $MemoryStoreU64(add($t13, 8), $ClosestGreaterPowerOfTwo(2))
+                    copy_literal_string_to_memory_402108876(add($t13, 32))
+                    // $t14 := ==($t12, $t13)
+                    $t14 := $Eq_$vec$u8$$($t12, $t13)
+                    // if ($t14) goto L7 else goto L6
+                    switch $t14
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t15 := 103
+                    $t15 := 103
+                    // abort($t15)
+                    $Abort($t15)
+                }
+                case 11 {
+                    // label L8
+                    // $t16 := 7008
+                    $t16 := 7008
+                    // $t17 := U256::u256_from_u128($t16)
+                    $t17 := A2_U256_u256_from_u128($t16)
+                    // $t18 := Evm::to_string($t17)
+                    $t18 := A2_Evm_to_string($t17)
+                    // $t19 := [55, 48, 48, 56]
+                    $t19 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(4)))
+                    $MemoryStoreU64($t19, 4)
+                    $MemoryStoreU64(add($t19, 8), $ClosestGreaterPowerOfTwo(4))
+                    copy_literal_string_to_memory_2919365730(add($t19, 32))
+                    // $t20 := ==($t18, $t19)
+                    $t20 := $Eq_$vec$u8$$($t18, $t19)
+                    // if ($t20) goto L10 else goto L9
+                    switch $t20
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t21 := 104
+                    $t21 := 104
+                    // abort($t21)
+                    $Abort($t21)
+                }
+                case 14 {
+                    // label L11
+                    // $t22 := 340282366920938463463374607431768211458
+                    $t22 := 340282366920938463463374607431768211458
+                    // $t23 := Evm::to_string($t22)
+                    $t23 := A2_Evm_to_string($t22)
+                    // $t24 := [51, 52, 48, 50, 56, 50, 51, 54, 54, 57, 50, 48, 57, 51, 56, 52, 54, 51, 52, 54, 51, 51, 55, 52, 54, 48, 55, 52, 51, 49, 55, 54, 56, 50, 49, 49, 52, 53, 56]
+                    $t24 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(39)))
+                    $MemoryStoreU64($t24, 39)
+                    $MemoryStoreU64(add($t24, 8), $ClosestGreaterPowerOfTwo(39))
+                    copy_literal_string_to_memory_767927084(add($t24, 32))
+                    // $t25 := ==($t23, $t24)
+                    $t25 := $Eq_$vec$u8$$($t23, $t24)
+                    // if ($t25) goto L13 else goto L12
+                    switch $t25
+                    case 0  { $block := 16 }
+                    default { $block := 15 }
+                }
+                case 15 {
+                    // label L13
+                    // goto L14
+                    $block := 17
+                }
+                case 16 {
+                    // label L12
+                    // $t26 := 105
+                    $t26 := 105
+                    // abort($t26)
+                    $Abort($t26)
+                }
+                case 17 {
+                    // label L14
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function A2_Evm_to_string(x) -> result {
+                          result := $NumToString(x)
+                        }
+        function A2_U256_u256_from_u128(lo) -> $result {
+            let $t1, $t2
+            // $t1 := 0
+            $t1 := 0
+            // $t2 := (u256)($t1, $t0)
+            $t2 := $CastU256($t1, lo)
+            // return $t2
+            $result := $t2
+        }
+
+        function A2_U256_one() -> $result {
+            let $t0
+            // $t0 := 1
+            $t0 := 1
+            // return $t0
+            $result := $t0
+        }
+
+        function A2_U256_zero() -> $result {
+            let $t0
+            // $t0 := 0
+            $t0 := 0
+            // return $t0
+            $result := $t0
+        }
+
+        function $Eq_$vec$u8$$(x, y) -> res
+        {
+            res := $EqVector(x, y, 1)
+        }
+        function copy_literal_string_to_memory_767927084(value) {
+            $MemoryStoreU8(value, 51)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 52)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 48)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 50)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 56)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 50)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 51)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 54)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 54)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 57)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 50)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 48)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 57)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 51)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 56)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 52)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 54)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 51)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 52)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 54)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 51)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 51)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 55)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 52)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 54)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 48)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 55)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 52)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 51)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 49)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 55)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 54)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 56)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 50)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 49)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 49)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 52)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 53)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 56)
+            value := add(value, 1)
+        }
+        function copy_literal_string_to_memory_2919365730(value) {
+            $MemoryStoreU8(value, 55)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 48)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 48)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 56)
+            value := add(value, 1)
+        }
+        function copy_literal_string_to_memory_402108876(value) {
+            $MemoryStoreU8(value, 52)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 50)
+            value := add(value, 1)
+        }
+        function copy_literal_string_to_memory_2868747976(value) {
+            $MemoryStoreU8(value, 49)
+            value := add(value, 1)
+        }
+        function copy_literal_string_to_memory_2991736836(value) {
+            $MemoryStoreU8(value, 48)
+            value := add(value, 1)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $EqVector(x, y, elem_size) -> r {
+            let len_x := $MemoryLoadU64(x)
+            let len_y := $MemoryLoadU64(y)
+            if $Neq(len_x, len_y) {
+                r := false
+                leave
+            }
+            let data_size_bytes := mul(elem_size, len_x)
+            let num_words, overflow_bytes := $ToWordOffs(data_size_bytes)
+            let i := 0
+            for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+                if $Neq(mload(add(x, add(i, 32))), mload(add(y, add(i, 32)))) {
+                    r := false
+                    leave
+                }
+            }
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let x_overflow := mload(add(x, add(overflow_offs, 32)))
+            let y_overflow := mload(add(y, add(overflow_offs, 32)))
+            r := eq(or(mask, x_overflow), or(mask, y_overflow))
+        }
+        function $Neq(x, y) -> r {
+            r := $LogicalNot(eq(x, y))
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $CastU256(hi, lo) -> r {
+            if gt(hi, 0xffffffffffffffffffffffffffffffff) { $AbortBuiltin() }
+            if gt(lo, 0xffffffffffffffffffffffffffffffff) { $AbortBuiltin() }
+            r := add(shl(128, hi), lo)
+        }
+        function $ClosestGreaterPowerOfTwo(x) -> r {
+            r := or(r, shr(1, x))
+            r := or(r, shr(2, r))
+            r := or(r, shr(4, r))
+            r := or(r, shr(8, r))
+            r := or(r, shr(16, r))
+            r := or(r, shr(32, r))
+            r := add(x, 1)
+        }
+        function $NumToString(x) -> s {
+          if iszero(x) {
+            s := $Malloc(add(32, 2))
+            $MemoryStoreU64(s, 1)
+            $MemoryStoreU64(add(s, 8), 2)
+            $MemoryStoreU8(add(s, 32), 48) // string "0"
+            leave
+          }
+          let temp := x
+          let num_digits := 0
+          for { } temp { num_digits := add(num_digits, 1) } {
+            temp := div(temp, 10)
+          }
+          let digits_space := $ClosestGreaterPowerOfTwo(num_digits)
+          s := $Malloc(add(32, digits_space))
+          $MemoryStoreU64(s, num_digits)
+          $MemoryStoreU64(add(s, 8), digits_space)
+          let digit
+          for { } x { } {
+            digit := add(48, mod(x, 10))
+            num_digits := sub(num_digits, 1)
+            $MemoryStoreU8(add(add(s, 32), num_digits), digit)
+            x := div(x, 10)
+          }
+        }
+    }
+}
+===> Test result of NativeFunctions::test_to_string: Succeed(Stopped) (used_gas=13241): []
diff --git a/third_party/move/evm/move-to-yul/tests/NoGenericCallable.v2_exp b/third_party/move/evm/move-to-yul/tests/NoGenericCallable.v2_exp
new file mode 100644
index 0000000000000..d1169e9148037
--- /dev/null
+++ b/third_party/move/evm/move-to-yul/tests/NoGenericCallable.v2_exp
@@ -0,0 +1,8 @@
+
+
+!! Move-To-Yul Diagnostics:
+ error: #[callable] or #[create] functions cannot be generic
+  ┌─ tests/NoGenericCallable.move:5:5
+  │
+5 │     fun f<T>(x: u64): u64 { x }
+  │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/third_party/move/evm/move-to-yul/tests/Resources.v2_exp b/third_party/move/evm/move-to-yul/tests/Resources.v2_exp
new file mode 100644
index 0000000000000..e75268ee3b854
--- /dev/null
+++ b/third_party/move/evm/move-to-yul/tests/Resources.v2_exp
@@ -0,0 +1,1643 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_M" {
+    code {
+        codecopy(0, dataoffset("A2_M_deployed"), datasize("A2_M_deployed"))
+        return(0, datasize("A2_M_deployed"))
+    }
+    object "A2_M_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                default {}
+            }
+            $Abort(97)
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
+
+
+!! Unit tests
+
+// test of M::test_increment_a
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_increment_a" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_increment_a()
+        return (0, 0)
+        function A2_M_test_increment_a() {
+            let $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11
+            let $locals := $Malloc(32)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t11 := 100
+                    $t11 := 100
+                    // abort($t11)
+                    $Abort($t11)
+                }
+                case 4 {
+                    // $t1 := 0x3
+                    $t1 := 0x3
+                    // $t0 := Evm::sign($t1)
+                    mstore($locals, A2_Evm_sign($t1))
+                    // $t2 := borrow_local($t0)
+                    $t2 := $MakePtr(false, $locals)
+                    // $t3 := 510
+                    $t3 := 510
+                    // M::publish($t2, $t3)
+                    A2_M_publish($t2, $t3)
+                    // $t4 := 0x3
+                    $t4 := 0x3
+                    // M::increment_a($t4)
+                    A2_M_increment_a($t4)
+                    // $t5 := 0x3
+                    $t5 := 0x3
+                    // $t6 := borrow_global<M::S>($t5)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x698265eb, $t5)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t6 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t7 := borrow_field<M::S>.a($t6)
+                    $t7 := $IndexPtr($t6, 32)
+                    // $t8 := read_ref($t7)
+                    $t8 := $LoadU64($t7)
+                    // $t9 := 511
+                    $t9 := 511
+                    // $t10 := ==($t8, $t9)
+                    $t10 := $Eq($t8, $t9)
+                    // if ($t10) goto L1 else goto L0
+                    switch $t10
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // return ()
+                    $Free($locals, 32)
+                    leave
+                }
+            }
+        }
+
+        function A2_M_increment_a(addr) {
+            let r, $t2, $t3, $t4, $t5, $t6, $t7
+            // $t2 := borrow_global<M::S>($t0)
+            {
+                let $base_offset := $MakeTypeStorageBase(0, 0x698265eb, addr)
+                if iszero($AlignedStorageLoad($base_offset)) {
+                  $AbortBuiltin()
+                }
+                $t2 := $MakePtr(true, add($base_offset, 32))
+            }
+            // $t3 := borrow_field<M::S>.a($t2)
+            $t3 := $IndexPtr($t2, 32)
+            // $t4 := read_ref($t3)
+            $t4 := $LoadU64($t3)
+            // $t5 := 1
+            $t5 := 1
+            // $t6 := +($t4, $t5)
+            $t6 := $AddU64($t4, $t5)
+            // $t7 := borrow_field<M::S>.a($t2)
+            $t7 := $IndexPtr($t2, 32)
+            // write_ref($t7, $t6)
+            $StoreU64($t7, $t6)
+            // return ()
+        }
+
+        function A2_M_publish(sg, a) {
+            let s, $t3, $t4, $t5, $t6, $t7, $t8, $t9
+            // $t3 := 2
+            $t3 := 2
+            // $t4 := /($t1, $t3)
+            $t4 := $Div(a, $t3)
+            // $t5 := (u8)($t4)
+            $t5 := $CastU8($t4)
+            // $t6 := +($t1, $t1)
+            $t6 := $AddU64(a, a)
+            // $t7 := (u128)($t6)
+            $t7 := $CastU128($t6)
+            // $t8 := pack M::S2($t7)
+            {
+                let $mem := $Malloc(16)
+                $MemoryStoreU128(add($mem, 0), $t7)
+                $t8 := $mem
+            }
+            // $t9 := pack M::S($t1, $t5, $t8)
+            {
+                let $mem := $Malloc(41)
+                $MemoryStoreU64(add($mem, 32), a)
+                $MemoryStoreU8(add($mem, 40), $t5)
+                $MemoryStoreU256(add($mem, 0), $t8)
+                $t9 := $mem
+            }
+            // move_to<M::S>($t9, $t0)
+            {
+                let $base_offset := $MakeTypeStorageBase(0, 0x698265eb, $LoadU256(sg))
+                if $AlignedStorageLoad($base_offset) {
+                  $AbortBuiltin()
+                }
+                $AlignedStorageStore($base_offset, true)
+                {
+                    let $dst := add($base_offset, 32)
+                    let $src := $t9
+                    {
+                        let $linked_src_1602512591 := mload(add($src, 0))
+                        let $linked_dst_1602512591 := $NewLinkedStorageBase(0x5f8466cf)
+                        $AlignedStorageStore(add($linked_dst_1602512591, 0), mload(add($linked_src_1602512591, 0)))
+                        $Free($linked_src_1602512591, 16)
+                        $AlignedStorageStore(add($dst, 0), $linked_dst_1602512591)
+                    }
+                    $AlignedStorageStore(add($dst, 32), mload(add($src, 32)))
+                    $Free($src, 41)
+                }
+            }
+            // return ()
+        }
+
+        function A2_Evm_sign(addr) -> signer {
+          signer := addr
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $MemoryStoreU128(offs, val) {
+          $MemoryStoreBytes(offs, 16, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $AddU64(x, y) -> r {
+            if lt(sub(0xffffffffffffffff, x), y) { $AbortBuiltin() }
+            r := add(x, y)
+        }
+        function $Div(x, y) -> r {
+            if eq(y, 0) { $AbortBuiltin() }
+            r := div(x, y)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $CastU8(x) -> r {
+            if gt(x, 0xff) { $AbortBuiltin() }
+            r := x
+        }
+        function $CastU128(x) -> r {
+            if gt(x, 0xffffffffffffffffffffffffffffffff) { $AbortBuiltin() }
+            r := x
+        }
+    }
+}
+===> Test result of M::test_increment_a: Succeed(Stopped) (used_gas=113532): []
+
+// test of M::test_publish
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_publish" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_publish()
+        return (0, 0)
+        function A2_M_test_publish() {
+            let $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28
+            let $locals := $Malloc(32)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t6 := 100
+                    $t6 := 100
+                    // abort($t6)
+                    $Abort($t6)
+                }
+                case 4 {
+                    // $t1 := 0x3
+                    $t1 := 0x3
+                    // $t0 := Evm::sign($t1)
+                    mstore($locals, A2_Evm_sign($t1))
+                    // $t2 := borrow_local($t0)
+                    $t2 := $MakePtr(false, $locals)
+                    // $t3 := 22
+                    $t3 := 22
+                    // M::publish($t2, $t3)
+                    A2_M_publish($t2, $t3)
+                    // $t4 := 0x3
+                    $t4 := 0x3
+                    // $t5 := exists<M::S>($t4)
+                    $t5 := $AlignedStorageLoad($MakeTypeStorageBase(0, 0x698265eb, $t4))
+                    // if ($t5) goto L1 else goto L0
+                    switch $t5
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t7 := 0x3
+                    $t7 := 0x3
+                    // $t8 := borrow_global<M::S>($t7)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x698265eb, $t7)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t8 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t9 := borrow_field<M::S>.a($t8)
+                    $t9 := $IndexPtr($t8, 32)
+                    // $t10 := read_ref($t9)
+                    $t10 := $LoadU64($t9)
+                    // $t11 := 22
+                    $t11 := 22
+                    // $t12 := ==($t10, $t11)
+                    $t12 := $Eq($t10, $t11)
+                    // if ($t12) goto L4 else goto L3
+                    switch $t12
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t13 := 101
+                    $t13 := 101
+                    // abort($t13)
+                    $Abort($t13)
+                }
+                case 8 {
+                    // label L5
+                    // $t14 := 0x3
+                    $t14 := 0x3
+                    // $t15 := borrow_global<M::S>($t14)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x698265eb, $t14)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t15 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t16 := borrow_field<M::S>.b($t15)
+                    $t16 := $IndexPtr($t15, 40)
+                    // $t17 := read_ref($t16)
+                    $t17 := $LoadU8($t16)
+                    // $t18 := 11
+                    $t18 := 11
+                    // $t19 := ==($t17, $t18)
+                    $t19 := $Eq($t17, $t18)
+                    // if ($t19) goto L7 else goto L6
+                    switch $t19
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t20 := 102
+                    $t20 := 102
+                    // abort($t20)
+                    $Abort($t20)
+                }
+                case 11 {
+                    // label L8
+                    // $t21 := 0x3
+                    $t21 := 0x3
+                    // $t22 := borrow_global<M::S>($t21)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x698265eb, $t21)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t22 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t23 := borrow_field<M::S>.c($t22)
+                    {
+                        $t23 := $MakePtr($IsStoragePtr($t22), $LoadU256($t22))
+                    }
+                    // $t24 := borrow_field<M::S2>.x($t23)
+                    $t24 := $t23
+                    // $t25 := read_ref($t24)
+                    $t25 := $LoadU128($t24)
+                    // $t26 := 44
+                    $t26 := 44
+                    // $t27 := ==($t25, $t26)
+                    $t27 := $Eq($t25, $t26)
+                    // if ($t27) goto L10 else goto L9
+                    switch $t27
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t28 := 103
+                    $t28 := 103
+                    // abort($t28)
+                    $Abort($t28)
+                }
+                case 14 {
+                    // label L11
+                    // return ()
+                    $Free($locals, 32)
+                    leave
+                }
+            }
+        }
+
+        function A2_M_publish(sg, a) {
+            let s, $t3, $t4, $t5, $t6, $t7, $t8, $t9
+            // $t3 := 2
+            $t3 := 2
+            // $t4 := /($t1, $t3)
+            $t4 := $Div(a, $t3)
+            // $t5 := (u8)($t4)
+            $t5 := $CastU8($t4)
+            // $t6 := +($t1, $t1)
+            $t6 := $AddU64(a, a)
+            // $t7 := (u128)($t6)
+            $t7 := $CastU128($t6)
+            // $t8 := pack M::S2($t7)
+            {
+                let $mem := $Malloc(16)
+                $MemoryStoreU128(add($mem, 0), $t7)
+                $t8 := $mem
+            }
+            // $t9 := pack M::S($t1, $t5, $t8)
+            {
+                let $mem := $Malloc(41)
+                $MemoryStoreU64(add($mem, 32), a)
+                $MemoryStoreU8(add($mem, 40), $t5)
+                $MemoryStoreU256(add($mem, 0), $t8)
+                $t9 := $mem
+            }
+            // move_to<M::S>($t9, $t0)
+            {
+                let $base_offset := $MakeTypeStorageBase(0, 0x698265eb, $LoadU256(sg))
+                if $AlignedStorageLoad($base_offset) {
+                  $AbortBuiltin()
+                }
+                $AlignedStorageStore($base_offset, true)
+                {
+                    let $dst := add($base_offset, 32)
+                    let $src := $t9
+                    {
+                        let $linked_src_1602512591 := mload(add($src, 0))
+                        let $linked_dst_1602512591 := $NewLinkedStorageBase(0x5f8466cf)
+                        $AlignedStorageStore(add($linked_dst_1602512591, 0), mload(add($linked_src_1602512591, 0)))
+                        $Free($linked_src_1602512591, 16)
+                        $AlignedStorageStore(add($dst, 0), $linked_dst_1602512591)
+                    }
+                    $AlignedStorageStore(add($dst, 32), mload(add($src, 32)))
+                    $Free($src, 41)
+                }
+            }
+            // return ()
+        }
+
+        function A2_Evm_sign(addr) -> signer {
+          signer := addr
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU8(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU8(offs)
+          }
+          default {
+            val := $StorageLoadU8(offs)
+          }
+        }
+        function $MemoryLoadU8(offs) -> val {
+          val := $MemoryLoadBytes(offs, 1)
+        }
+        function $StorageLoadU8(offs) -> val {
+          val := $StorageLoadBytes(offs, 1)
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $LoadU128(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU128(offs)
+          }
+          default {
+            val := $StorageLoadU128(offs)
+          }
+        }
+        function $MemoryLoadU128(offs) -> val {
+          val := $MemoryLoadBytes(offs, 16)
+        }
+        function $StorageLoadU128(offs) -> val {
+          val := $StorageLoadBytes(offs, 16)
+        }
+        function $MemoryStoreU128(offs, val) {
+          $MemoryStoreBytes(offs, 16, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $AddU64(x, y) -> r {
+            if lt(sub(0xffffffffffffffff, x), y) { $AbortBuiltin() }
+            r := add(x, y)
+        }
+        function $Div(x, y) -> r {
+            if eq(y, 0) { $AbortBuiltin() }
+            r := div(x, y)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $CastU8(x) -> r {
+            if gt(x, 0xff) { $AbortBuiltin() }
+            r := x
+        }
+        function $CastU128(x) -> r {
+            if gt(x, 0xffffffffffffffffffffffffffffffff) { $AbortBuiltin() }
+            r := x
+        }
+    }
+}
+===> Test result of M::test_publish: Succeed(Stopped) (used_gas=115318): []
+
+// test of M::test_publish_t
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_publish_t" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_publish_t()
+        return (0, 0)
+        function A2_M_test_publish_t() {
+            let $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31
+            let $locals := $Malloc(32)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t6 := 100
+                    $t6 := 100
+                    // abort($t6)
+                    $Abort($t6)
+                }
+                case 4 {
+                    // $t1 := 0x3
+                    $t1 := 0x3
+                    // $t0 := Evm::sign($t1)
+                    mstore($locals, A2_Evm_sign($t1))
+                    // $t2 := borrow_local($t0)
+                    $t2 := $MakePtr(false, $locals)
+                    // $t3 := 22
+                    $t3 := 22
+                    // M::publish_t($t2, $t3)
+                    A2_M_publish_t($t2, $t3)
+                    // $t4 := 0x3
+                    $t4 := 0x3
+                    // $t5 := exists<M::T>($t4)
+                    $t5 := $AlignedStorageLoad($MakeTypeStorageBase(0, 0x3948ca0a, $t4))
+                    // if ($t5) goto L1 else goto L0
+                    switch $t5
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t7 := 0x3
+                    $t7 := 0x3
+                    // $t8 := borrow_global<M::T>($t7)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x3948ca0a, $t7)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t8 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t9 := borrow_field<M::T>.s($t8)
+                    {
+                        $t9 := $MakePtr($IsStoragePtr($t8), $LoadU256($t8))
+                    }
+                    // $t10 := borrow_field<M::S>.a($t9)
+                    $t10 := $IndexPtr($t9, 32)
+                    // $t11 := read_ref($t10)
+                    $t11 := $LoadU64($t10)
+                    // $t12 := 22
+                    $t12 := 22
+                    // $t13 := ==($t11, $t12)
+                    $t13 := $Eq($t11, $t12)
+                    // if ($t13) goto L4 else goto L3
+                    switch $t13
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t14 := 101
+                    $t14 := 101
+                    // abort($t14)
+                    $Abort($t14)
+                }
+                case 8 {
+                    // label L5
+                    // $t15 := 0x3
+                    $t15 := 0x3
+                    // $t16 := borrow_global<M::T>($t15)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x3948ca0a, $t15)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t16 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t17 := borrow_field<M::T>.s($t16)
+                    {
+                        $t17 := $MakePtr($IsStoragePtr($t16), $LoadU256($t16))
+                    }
+                    // $t18 := borrow_field<M::S>.b($t17)
+                    $t18 := $IndexPtr($t17, 40)
+                    // $t19 := read_ref($t18)
+                    $t19 := $LoadU8($t18)
+                    // $t20 := 11
+                    $t20 := 11
+                    // $t21 := ==($t19, $t20)
+                    $t21 := $Eq($t19, $t20)
+                    // if ($t21) goto L7 else goto L6
+                    switch $t21
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t22 := 102
+                    $t22 := 102
+                    // abort($t22)
+                    $Abort($t22)
+                }
+                case 11 {
+                    // label L8
+                    // $t23 := 0x3
+                    $t23 := 0x3
+                    // $t24 := borrow_global<M::T>($t23)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x3948ca0a, $t23)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t24 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t25 := borrow_field<M::T>.s($t24)
+                    {
+                        $t25 := $MakePtr($IsStoragePtr($t24), $LoadU256($t24))
+                    }
+                    // $t26 := borrow_field<M::S>.c($t25)
+                    {
+                        $t26 := $MakePtr($IsStoragePtr($t25), $LoadU256($t25))
+                    }
+                    // $t27 := borrow_field<M::S2>.x($t26)
+                    $t27 := $t26
+                    // $t28 := read_ref($t27)
+                    $t28 := $LoadU128($t27)
+                    // $t29 := 44
+                    $t29 := 44
+                    // $t30 := ==($t28, $t29)
+                    $t30 := $Eq($t28, $t29)
+                    // if ($t30) goto L10 else goto L9
+                    switch $t30
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t31 := 103
+                    $t31 := 103
+                    // abort($t31)
+                    $Abort($t31)
+                }
+                case 14 {
+                    // label L11
+                    // return ()
+                    $Free($locals, 32)
+                    leave
+                }
+            }
+        }
+
+        function A2_M_publish_t(sg, a) {
+            let t, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10
+            // $t3 := 2
+            $t3 := 2
+            // $t4 := /($t1, $t3)
+            $t4 := $Div(a, $t3)
+            // $t5 := (u8)($t4)
+            $t5 := $CastU8($t4)
+            // $t6 := +($t1, $t1)
+            $t6 := $AddU64(a, a)
+            // $t7 := (u128)($t6)
+            $t7 := $CastU128($t6)
+            // $t8 := pack M::S2($t7)
+            {
+                let $mem := $Malloc(16)
+                $MemoryStoreU128(add($mem, 0), $t7)
+                $t8 := $mem
+            }
+            // $t9 := pack M::S($t1, $t5, $t8)
+            {
+                let $mem := $Malloc(41)
+                $MemoryStoreU64(add($mem, 32), a)
+                $MemoryStoreU8(add($mem, 40), $t5)
+                $MemoryStoreU256(add($mem, 0), $t8)
+                $t9 := $mem
+            }
+            // $t10 := pack M::T($t9)
+            {
+                let $mem := $Malloc(32)
+                $MemoryStoreU256(add($mem, 0), $t9)
+                $t10 := $mem
+            }
+            // move_to<M::T>($t10, $t0)
+            {
+                let $base_offset := $MakeTypeStorageBase(0, 0x3948ca0a, $LoadU256(sg))
+                if $AlignedStorageLoad($base_offset) {
+                  $AbortBuiltin()
+                }
+                $AlignedStorageStore($base_offset, true)
+                {
+                    let $dst := add($base_offset, 32)
+                    let $src := $t10
+                    {
+                        let $linked_src_1770153451 := mload(add($src, 0))
+                        let $linked_dst_1770153451 := $NewLinkedStorageBase(0x698265eb)
+                        {
+                            let $linked_src_1602512591 := mload(add($linked_src_1770153451, 0))
+                            let $linked_dst_1602512591 := $NewLinkedStorageBase(0x5f8466cf)
+                            $AlignedStorageStore(add($linked_dst_1602512591, 0), mload(add($linked_src_1602512591, 0)))
+                            $Free($linked_src_1602512591, 16)
+                            $AlignedStorageStore(add($linked_dst_1770153451, 0), $linked_dst_1602512591)
+                        }
+                        $AlignedStorageStore(add($linked_dst_1770153451, 32), mload(add($linked_src_1770153451, 32)))
+                        $Free($linked_src_1770153451, 41)
+                        $AlignedStorageStore(add($dst, 0), $linked_dst_1770153451)
+                    }
+                    $Free($src, 32)
+                }
+            }
+            // return ()
+        }
+
+        function A2_Evm_sign(addr) -> signer {
+          signer := addr
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU8(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU8(offs)
+          }
+          default {
+            val := $StorageLoadU8(offs)
+          }
+        }
+        function $MemoryLoadU8(offs) -> val {
+          val := $MemoryLoadBytes(offs, 1)
+        }
+        function $StorageLoadU8(offs) -> val {
+          val := $StorageLoadBytes(offs, 1)
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $LoadU128(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU128(offs)
+          }
+          default {
+            val := $StorageLoadU128(offs)
+          }
+        }
+        function $MemoryLoadU128(offs) -> val {
+          val := $MemoryLoadBytes(offs, 16)
+        }
+        function $StorageLoadU128(offs) -> val {
+          val := $StorageLoadBytes(offs, 16)
+        }
+        function $MemoryStoreU128(offs, val) {
+          $MemoryStoreBytes(offs, 16, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $AddU64(x, y) -> r {
+            if lt(sub(0xffffffffffffffff, x), y) { $AbortBuiltin() }
+            r := add(x, y)
+        }
+        function $Div(x, y) -> r {
+            if eq(y, 0) { $AbortBuiltin() }
+            r := div(x, y)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $CastU8(x) -> r {
+            if gt(x, 0xff) { $AbortBuiltin() }
+            r := x
+        }
+        function $CastU128(x) -> r {
+            if gt(x, 0xffffffffffffffffffffffffffffffff) { $AbortBuiltin() }
+            r := x
+        }
+    }
+}
+===> Test result of M::test_publish_t: Succeed(Stopped) (used_gas=138948): []
+
+// test of M::test_unpublish
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_unpublish" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_unpublish()
+        return (0, 0)
+        function A2_M_test_unpublish() {
+            let b, x, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20
+            let $locals := $Malloc(32)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t14 := 101
+                    $t14 := 101
+                    // abort($t14)
+                    $Abort($t14)
+                }
+                case 4 {
+                    // $t3 := 0x3
+                    $t3 := 0x3
+                    // $t0 := Evm::sign($t3)
+                    mstore($locals, A2_Evm_sign($t3))
+                    // $t4 := borrow_local($t0)
+                    $t4 := $MakePtr(false, $locals)
+                    // $t5 := 33
+                    $t5 := 33
+                    // M::publish($t4, $t5)
+                    A2_M_publish($t4, $t5)
+                    // $t6 := 0x3
+                    $t6 := 0x3
+                    // $t7 := M::unpublish($t6)
+                    $t7 := A2_M_unpublish($t6)
+                    // ($t8, $t9, $t10) := unpack M::S($t7)
+                    $t8 := $MemoryLoadU64(add($t7, 32))
+                    $t9 := $MemoryLoadU8(add($t7, 40))
+                    $t10 := $MemoryLoadU256(add($t7, 0))
+                    $Free($t7, 41)
+                    // $t11 := unpack M::S2($t10)
+                    $t11 := $MemoryLoadU128(add($t10, 0))
+                    $Free($t10, 16)
+                    // $t12 := 33
+                    $t12 := 33
+                    // $t13 := ==($t8, $t12)
+                    $t13 := $Eq($t8, $t12)
+                    // if ($t13) goto L1 else goto L0
+                    switch $t13
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t15 := 16
+                    $t15 := 16
+                    // $t16 := ==($t9, $t15)
+                    $t16 := $Eq($t9, $t15)
+                    // if ($t16) goto L4 else goto L3
+                    switch $t16
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t17 := 102
+                    $t17 := 102
+                    // abort($t17)
+                    $Abort($t17)
+                }
+                case 8 {
+                    // label L5
+                    // $t18 := 66
+                    $t18 := 66
+                    // $t19 := ==($t11, $t18)
+                    $t19 := $Eq($t11, $t18)
+                    // if ($t19) goto L7 else goto L6
+                    switch $t19
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t20 := 103
+                    $t20 := 103
+                    // abort($t20)
+                    $Abort($t20)
+                }
+                case 11 {
+                    // label L8
+                    // return ()
+                    $Free($locals, 32)
+                    leave
+                }
+            }
+        }
+
+        function A2_M_unpublish(a) -> $result {
+            let $t1
+            // $t1 := move_from<M::S>($t0)
+            {
+                let $base_offset := $MakeTypeStorageBase(0, 0x698265eb, a)
+                if iszero($AlignedStorageLoad($base_offset)) {
+                  $AbortBuiltin()
+                }
+                $AlignedStorageStore($base_offset, false)
+                {
+                    let $src := add($base_offset, 32)
+                    let $dst
+                    $dst := $Malloc(41)
+                    {
+                        let $linked_src_1602512591 := $AlignedStorageLoad(add($src, 0))
+                        let $linked_dst_1602512591
+                        $linked_dst_1602512591 := $Malloc(16)
+                        mstore(add($linked_dst_1602512591, 0), $AlignedStorageLoad(add($linked_src_1602512591, 0)))
+                        $AlignedStorageStore(add($linked_src_1602512591, 0), 0)
+                        mstore(add($dst, 0), $linked_dst_1602512591)
+                        $AlignedStorageStore(add($src, 0), 0)
+                    }
+                    mstore(add($dst, 32), $AlignedStorageLoad(add($src, 32)))
+                    $AlignedStorageStore(add($src, 32), 0)
+                    $t1 := $dst
+                }
+            }
+            // return $t1
+            $result := $t1
+        }
+
+        function A2_M_publish(sg, a) {
+            let s, $t3, $t4, $t5, $t6, $t7, $t8, $t9
+            // $t3 := 2
+            $t3 := 2
+            // $t4 := /($t1, $t3)
+            $t4 := $Div(a, $t3)
+            // $t5 := (u8)($t4)
+            $t5 := $CastU8($t4)
+            // $t6 := +($t1, $t1)
+            $t6 := $AddU64(a, a)
+            // $t7 := (u128)($t6)
+            $t7 := $CastU128($t6)
+            // $t8 := pack M::S2($t7)
+            {
+                let $mem := $Malloc(16)
+                $MemoryStoreU128(add($mem, 0), $t7)
+                $t8 := $mem
+            }
+            // $t9 := pack M::S($t1, $t5, $t8)
+            {
+                let $mem := $Malloc(41)
+                $MemoryStoreU64(add($mem, 32), a)
+                $MemoryStoreU8(add($mem, 40), $t5)
+                $MemoryStoreU256(add($mem, 0), $t8)
+                $t9 := $mem
+            }
+            // move_to<M::S>($t9, $t0)
+            {
+                let $base_offset := $MakeTypeStorageBase(0, 0x698265eb, $LoadU256(sg))
+                if $AlignedStorageLoad($base_offset) {
+                  $AbortBuiltin()
+                }
+                $AlignedStorageStore($base_offset, true)
+                {
+                    let $dst := add($base_offset, 32)
+                    let $src := $t9
+                    {
+                        let $linked_src_1602512591 := mload(add($src, 0))
+                        let $linked_dst_1602512591 := $NewLinkedStorageBase(0x5f8466cf)
+                        $AlignedStorageStore(add($linked_dst_1602512591, 0), mload(add($linked_src_1602512591, 0)))
+                        $Free($linked_src_1602512591, 16)
+                        $AlignedStorageStore(add($dst, 0), $linked_dst_1602512591)
+                    }
+                    $AlignedStorageStore(add($dst, 32), mload(add($src, 32)))
+                    $Free($src, 41)
+                }
+            }
+            // return ()
+        }
+
+        function A2_Evm_sign(addr) -> signer {
+          signer := addr
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $MemoryLoadU8(offs) -> val {
+          val := $MemoryLoadBytes(offs, 1)
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $MemoryLoadU128(offs) -> val {
+          val := $MemoryLoadBytes(offs, 16)
+        }
+        function $MemoryStoreU128(offs, val) {
+          $MemoryStoreBytes(offs, 16, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $AddU64(x, y) -> r {
+            if lt(sub(0xffffffffffffffff, x), y) { $AbortBuiltin() }
+            r := add(x, y)
+        }
+        function $Div(x, y) -> r {
+            if eq(y, 0) { $AbortBuiltin() }
+            r := div(x, y)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $CastU8(x) -> r {
+            if gt(x, 0xff) { $AbortBuiltin() }
+            r := x
+        }
+        function $CastU128(x) -> r {
+            if gt(x, 0xffffffffffffffffffffffffffffffff) { $AbortBuiltin() }
+            r := x
+        }
+    }
+}
+===> Test result of M::test_unpublish: Succeed(Stopped) (used_gas=91212): []
diff --git a/third_party/move/evm/move-to-yul/tests/Resources.v2_exp.capture-source-info b/third_party/move/evm/move-to-yul/tests/Resources.v2_exp.capture-source-info
new file mode 100644
index 0000000000000..c04def6d750e5
--- /dev/null
+++ b/third_party/move/evm/move-to-yul/tests/Resources.v2_exp.capture-source-info
@@ -0,0 +1,1838 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+
+object "A2_M" {
+    code {
+        codecopy(0, dataoffset("A2_M_deployed"), datasize("A2_M_deployed"))
+        return(0, datasize("A2_M_deployed"))
+    }
+    object "A2_M_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                default {}
+            }
+            $Abort(97)
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
+
+
+!! Unit tests
+
+// test of M::test_increment_a
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+/// @use-src 1:"tests/Resources.move"
+///        , 2:"../stdlib/sources/Evm.move"
+
+
+object "test_A2_M_test_increment_a" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_increment_a()
+        return (0, 0)
+        function A2_M_test_increment_a() {
+            let $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11
+            let $locals := $Malloc(32)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    /// @src 1:1284:1327
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t11 := 100
+                    /// @src 1:1323:1326
+                    $t11 := 100
+                    // abort($t11)
+                    /// @src 1:1284:1327
+                    $Abort($t11)
+                }
+                case 4 {
+                    // $t1 := 0x3
+                    /// @src 1:1240:1242
+                    $t1 := 0x3
+                    // $t0 := Evm::sign($t1)
+                    /// @src 1:1235:1243
+                    mstore($locals, A2_Evm_sign($t1))
+                    // $t2 := borrow_local($t0)
+                    /// @src 1:1234:1243
+                    $t2 := $MakePtr(false, $locals)
+                    // $t3 := 510
+                    /// @src 1:1245:1248
+                    $t3 := 510
+                    // M::publish($t2, $t3)
+                    /// @src 1:1226:1249
+                    A2_M_publish($t2, $t3)
+                    // $t4 := 0x3
+                    /// @src 1:1271:1273
+                    $t4 := 0x3
+                    // M::increment_a($t4)
+                    /// @src 1:1259:1274
+                    A2_M_increment_a($t4)
+                    // $t5 := 0x3
+                    /// @src 1:1309:1311
+                    $t5 := 0x3
+                    // $t6 := borrow_global<M::S>($t5)
+                    /// @src 1:1292:1305
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x698265eb, $t5)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t6 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t7 := borrow_field<M::S>.a($t6)
+                    /// @src 1:1292:1314
+                    $t7 := $IndexPtr($t6, 32)
+                    // $t8 := read_ref($t7)
+                    /// @src 1:1292:1314
+                    $t8 := $LoadU64($t7)
+                    // $t9 := 511
+                    /// @src 1:1318:1321
+                    $t9 := 511
+                    // $t10 := ==($t8, $t9)
+                    /// @src 1:1315:1317
+                    $t10 := $Eq($t8, $t9)
+                    // if ($t10) goto L1 else goto L0
+                    /// @src 1:1284:1327
+                    switch $t10
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // return ()
+                    /// @src 1:1327:1328
+                    $Free($locals, 32)
+                    leave
+                }
+            }
+        }
+
+        function A2_M_increment_a(addr) {
+            let r, $t2, $t3, $t4, $t5, $t6, $t7
+            // $t2 := borrow_global<M::S>($t0)
+            /// @src 1:1106:1123
+            {
+                let $base_offset := $MakeTypeStorageBase(0, 0x698265eb, addr)
+                if iszero($AlignedStorageLoad($base_offset)) {
+                  $AbortBuiltin()
+                }
+                $t2 := $MakePtr(true, add($base_offset, 32))
+            }
+            // $t3 := borrow_field<M::S>.a($t2)
+            /// @src 1:1148:1151
+            $t3 := $IndexPtr($t2, 32)
+            // $t4 := read_ref($t3)
+            /// @src 1:1148:1151
+            $t4 := $LoadU64($t3)
+            // $t5 := 1
+            /// @src 1:1154:1155
+            $t5 := 1
+            // $t6 := +($t4, $t5)
+            /// @src 1:1152:1153
+            $t6 := $AddU64($t4, $t5)
+            // $t7 := borrow_field<M::S>.a($t2)
+            /// @src 1:1142:1145
+            $t7 := $IndexPtr($t2, 32)
+            // write_ref($t7, $t6)
+            /// @src 1:1142:1155
+            $StoreU64($t7, $t6)
+            // return ()
+            /// @src 1:1142:1155
+        }
+
+        function A2_M_publish(sg, a) {
+            let s, $t3, $t4, $t5, $t6, $t7, $t8, $t9
+            // $t3 := 2
+            /// @src 1:385:386
+            $t3 := 2
+            // $t4 := /($t1, $t3)
+            /// @src 1:383:384
+            $t4 := $Div(a, $t3)
+            // $t5 := (u8)($t4)
+            /// @src 1:379:394
+            $t5 := $CastU8($t4)
+            // $t6 := +($t1, $t1)
+            /// @src 1:409:410
+            $t6 := $AddU64(a, a)
+            // $t7 := (u128)($t6)
+            /// @src 1:405:422
+            $t7 := $CastU128($t6)
+            // $t8 := pack M::S2($t7)
+            /// @src 1:399:423
+            {
+                let $mem := $Malloc(16)
+                $MemoryStoreU128(add($mem, 0), $t7)
+                $t8 := $mem
+            }
+            // $t9 := pack M::S($t1, $t5, $t8)
+            /// @src 1:371:424
+            {
+                let $mem := $Malloc(41)
+                $MemoryStoreU64(add($mem, 32), a)
+                $MemoryStoreU8(add($mem, 40), $t5)
+                $MemoryStoreU256(add($mem, 0), $t8)
+                $t9 := $mem
+            }
+            // move_to<M::S>($t9, $t0)
+            /// @src 1:434:441
+            {
+                let $base_offset := $MakeTypeStorageBase(0, 0x698265eb, $LoadU256(sg))
+                if $AlignedStorageLoad($base_offset) {
+                  $AbortBuiltin()
+                }
+                $AlignedStorageStore($base_offset, true)
+                {
+                    let $dst := add($base_offset, 32)
+                    let $src := $t9
+                    {
+                        let $linked_src_1602512591 := mload(add($src, 0))
+                        let $linked_dst_1602512591 := $NewLinkedStorageBase(0x5f8466cf)
+                        $AlignedStorageStore(add($linked_dst_1602512591, 0), mload(add($linked_src_1602512591, 0)))
+                        $Free($linked_src_1602512591, 16)
+                        $AlignedStorageStore(add($dst, 0), $linked_dst_1602512591)
+                    }
+                    $AlignedStorageStore(add($dst, 32), mload(add($src, 32)))
+                    $Free($src, 41)
+                }
+            }
+            // return ()
+            /// @src 1:434:451
+        }
+
+        function A2_Evm_sign(addr) -> signer {
+          signer := addr
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $MemoryStoreU128(offs, val) {
+          $MemoryStoreBytes(offs, 16, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $AddU64(x, y) -> r {
+            if lt(sub(0xffffffffffffffff, x), y) { $AbortBuiltin() }
+            r := add(x, y)
+        }
+        function $Div(x, y) -> r {
+            if eq(y, 0) { $AbortBuiltin() }
+            r := div(x, y)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $CastU8(x) -> r {
+            if gt(x, 0xff) { $AbortBuiltin() }
+            r := x
+        }
+        function $CastU128(x) -> r {
+            if gt(x, 0xffffffffffffffffffffffffffffffff) { $AbortBuiltin() }
+            r := x
+        }
+    }
+}
+===> Test result of M::test_increment_a: Succeed(Stopped) (used_gas=113532): []
+
+// test of M::test_publish
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+/// @use-src 1:"tests/Resources.move"
+///        , 2:"../stdlib/sources/Evm.move"
+
+
+object "test_A2_M_test_publish" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_publish()
+        return (0, 0)
+        function A2_M_test_publish() {
+            let $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28
+            let $locals := $Malloc(32)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    /// @src 1:548:575
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t6 := 100
+                    /// @src 1:571:574
+                    $t6 := 100
+                    // abort($t6)
+                    /// @src 1:548:575
+                    $Abort($t6)
+                }
+                case 4 {
+                    // $t1 := 0x3
+                    /// @src 1:531:533
+                    $t1 := 0x3
+                    // $t0 := Evm::sign($t1)
+                    /// @src 1:526:534
+                    mstore($locals, A2_Evm_sign($t1))
+                    // $t2 := borrow_local($t0)
+                    /// @src 1:525:534
+                    $t2 := $MakePtr(false, $locals)
+                    // $t3 := 22
+                    /// @src 1:536:538
+                    $t3 := 22
+                    // M::publish($t2, $t3)
+                    /// @src 1:517:539
+                    A2_M_publish($t2, $t3)
+                    // $t4 := 0x3
+                    /// @src 1:566:568
+                    $t4 := 0x3
+                    // $t5 := exists<M::S>($t4)
+                    /// @src 1:556:562
+                    $t5 := $AlignedStorageLoad($MakeTypeStorageBase(0, 0x698265eb, $t4))
+                    // if ($t5) goto L1 else goto L0
+                    /// @src 1:548:575
+                    switch $t5
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t7 := 0x3
+                    /// @src 1:609:611
+                    $t7 := 0x3
+                    // $t8 := borrow_global<M::S>($t7)
+                    /// @src 1:592:605
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x698265eb, $t7)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t8 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t9 := borrow_field<M::S>.a($t8)
+                    /// @src 1:592:614
+                    $t9 := $IndexPtr($t8, 32)
+                    // $t10 := read_ref($t9)
+                    /// @src 1:592:614
+                    $t10 := $LoadU64($t9)
+                    // $t11 := 22
+                    /// @src 1:618:620
+                    $t11 := 22
+                    // $t12 := ==($t10, $t11)
+                    /// @src 1:615:617
+                    $t12 := $Eq($t10, $t11)
+                    // if ($t12) goto L4 else goto L3
+                    /// @src 1:584:626
+                    switch $t12
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    /// @src 1:584:626
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t13 := 101
+                    /// @src 1:622:625
+                    $t13 := 101
+                    // abort($t13)
+                    /// @src 1:584:626
+                    $Abort($t13)
+                }
+                case 8 {
+                    // label L5
+                    // $t14 := 0x3
+                    /// @src 1:660:662
+                    $t14 := 0x3
+                    // $t15 := borrow_global<M::S>($t14)
+                    /// @src 1:643:656
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x698265eb, $t14)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t15 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t16 := borrow_field<M::S>.b($t15)
+                    /// @src 1:643:665
+                    $t16 := $IndexPtr($t15, 40)
+                    // $t17 := read_ref($t16)
+                    /// @src 1:643:665
+                    $t17 := $LoadU8($t16)
+                    // $t18 := 11
+                    /// @src 1:669:671
+                    $t18 := 11
+                    // $t19 := ==($t17, $t18)
+                    /// @src 1:666:668
+                    $t19 := $Eq($t17, $t18)
+                    // if ($t19) goto L7 else goto L6
+                    /// @src 1:635:677
+                    switch $t19
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    /// @src 1:635:677
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t20 := 102
+                    /// @src 1:673:676
+                    $t20 := 102
+                    // abort($t20)
+                    /// @src 1:635:677
+                    $Abort($t20)
+                }
+                case 11 {
+                    // label L8
+                    // $t21 := 0x3
+                    /// @src 1:711:713
+                    $t21 := 0x3
+                    // $t22 := borrow_global<M::S>($t21)
+                    /// @src 1:694:707
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x698265eb, $t21)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t22 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t23 := borrow_field<M::S>.c($t22)
+                    /// @src 1:694:716
+                    {
+                        $t23 := $MakePtr($IsStoragePtr($t22), $LoadU256($t22))
+                    }
+                    // $t24 := borrow_field<M::S2>.x($t23)
+                    /// @src 1:694:718
+                    $t24 := $t23
+                    // $t25 := read_ref($t24)
+                    /// @src 1:694:718
+                    $t25 := $LoadU128($t24)
+                    // $t26 := 44
+                    /// @src 1:722:724
+                    $t26 := 44
+                    // $t27 := ==($t25, $t26)
+                    /// @src 1:719:721
+                    $t27 := $Eq($t25, $t26)
+                    // if ($t27) goto L10 else goto L9
+                    /// @src 1:686:730
+                    switch $t27
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    /// @src 1:686:730
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t28 := 103
+                    /// @src 1:726:729
+                    $t28 := 103
+                    // abort($t28)
+                    /// @src 1:686:730
+                    $Abort($t28)
+                }
+                case 14 {
+                    // label L11
+                    // return ()
+                    /// @src 1:730:731
+                    $Free($locals, 32)
+                    leave
+                }
+            }
+        }
+
+        function A2_M_publish(sg, a) {
+            let s, $t3, $t4, $t5, $t6, $t7, $t8, $t9
+            // $t3 := 2
+            /// @src 1:385:386
+            $t3 := 2
+            // $t4 := /($t1, $t3)
+            /// @src 1:383:384
+            $t4 := $Div(a, $t3)
+            // $t5 := (u8)($t4)
+            /// @src 1:379:394
+            $t5 := $CastU8($t4)
+            // $t6 := +($t1, $t1)
+            /// @src 1:409:410
+            $t6 := $AddU64(a, a)
+            // $t7 := (u128)($t6)
+            /// @src 1:405:422
+            $t7 := $CastU128($t6)
+            // $t8 := pack M::S2($t7)
+            /// @src 1:399:423
+            {
+                let $mem := $Malloc(16)
+                $MemoryStoreU128(add($mem, 0), $t7)
+                $t8 := $mem
+            }
+            // $t9 := pack M::S($t1, $t5, $t8)
+            /// @src 1:371:424
+            {
+                let $mem := $Malloc(41)
+                $MemoryStoreU64(add($mem, 32), a)
+                $MemoryStoreU8(add($mem, 40), $t5)
+                $MemoryStoreU256(add($mem, 0), $t8)
+                $t9 := $mem
+            }
+            // move_to<M::S>($t9, $t0)
+            /// @src 1:434:441
+            {
+                let $base_offset := $MakeTypeStorageBase(0, 0x698265eb, $LoadU256(sg))
+                if $AlignedStorageLoad($base_offset) {
+                  $AbortBuiltin()
+                }
+                $AlignedStorageStore($base_offset, true)
+                {
+                    let $dst := add($base_offset, 32)
+                    let $src := $t9
+                    {
+                        let $linked_src_1602512591 := mload(add($src, 0))
+                        let $linked_dst_1602512591 := $NewLinkedStorageBase(0x5f8466cf)
+                        $AlignedStorageStore(add($linked_dst_1602512591, 0), mload(add($linked_src_1602512591, 0)))
+                        $Free($linked_src_1602512591, 16)
+                        $AlignedStorageStore(add($dst, 0), $linked_dst_1602512591)
+                    }
+                    $AlignedStorageStore(add($dst, 32), mload(add($src, 32)))
+                    $Free($src, 41)
+                }
+            }
+            // return ()
+            /// @src 1:434:451
+        }
+
+        function A2_Evm_sign(addr) -> signer {
+          signer := addr
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU8(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU8(offs)
+          }
+          default {
+            val := $StorageLoadU8(offs)
+          }
+        }
+        function $MemoryLoadU8(offs) -> val {
+          val := $MemoryLoadBytes(offs, 1)
+        }
+        function $StorageLoadU8(offs) -> val {
+          val := $StorageLoadBytes(offs, 1)
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $LoadU128(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU128(offs)
+          }
+          default {
+            val := $StorageLoadU128(offs)
+          }
+        }
+        function $MemoryLoadU128(offs) -> val {
+          val := $MemoryLoadBytes(offs, 16)
+        }
+        function $StorageLoadU128(offs) -> val {
+          val := $StorageLoadBytes(offs, 16)
+        }
+        function $MemoryStoreU128(offs, val) {
+          $MemoryStoreBytes(offs, 16, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $AddU64(x, y) -> r {
+            if lt(sub(0xffffffffffffffff, x), y) { $AbortBuiltin() }
+            r := add(x, y)
+        }
+        function $Div(x, y) -> r {
+            if eq(y, 0) { $AbortBuiltin() }
+            r := div(x, y)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $CastU8(x) -> r {
+            if gt(x, 0xff) { $AbortBuiltin() }
+            r := x
+        }
+        function $CastU128(x) -> r {
+            if gt(x, 0xffffffffffffffffffffffffffffffff) { $AbortBuiltin() }
+            r := x
+        }
+    }
+}
+===> Test result of M::test_publish: Succeed(Stopped) (used_gas=115318): []
+
+// test of M::test_publish_t
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+/// @use-src 1:"tests/Resources.move"
+///        , 2:"../stdlib/sources/Evm.move"
+
+
+object "test_A2_M_test_publish_t" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_publish_t()
+        return (0, 0)
+        function A2_M_test_publish_t() {
+            let $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31
+            let $locals := $Malloc(32)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    /// @src 1:1584:1611
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t6 := 100
+                    /// @src 1:1607:1610
+                    $t6 := 100
+                    // abort($t6)
+                    /// @src 1:1584:1611
+                    $Abort($t6)
+                }
+                case 4 {
+                    // $t1 := 0x3
+                    /// @src 1:1566:1568
+                    $t1 := 0x3
+                    // $t0 := Evm::sign($t1)
+                    /// @src 1:1561:1569
+                    mstore($locals, A2_Evm_sign($t1))
+                    // $t2 := borrow_local($t0)
+                    /// @src 1:1560:1569
+                    $t2 := $MakePtr(false, $locals)
+                    // $t3 := 22
+                    /// @src 1:1571:1573
+                    $t3 := 22
+                    // M::publish_t($t2, $t3)
+                    /// @src 1:1550:1574
+                    A2_M_publish_t($t2, $t3)
+                    // $t4 := 0x3
+                    /// @src 1:1602:1604
+                    $t4 := 0x3
+                    // $t5 := exists<M::T>($t4)
+                    /// @src 1:1592:1598
+                    $t5 := $AlignedStorageLoad($MakeTypeStorageBase(0, 0x3948ca0a, $t4))
+                    // if ($t5) goto L1 else goto L0
+                    /// @src 1:1584:1611
+                    switch $t5
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t7 := 0x3
+                    /// @src 1:1646:1648
+                    $t7 := 0x3
+                    // $t8 := borrow_global<M::T>($t7)
+                    /// @src 1:1629:1642
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x3948ca0a, $t7)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t8 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t9 := borrow_field<M::T>.s($t8)
+                    /// @src 1:1629:1651
+                    {
+                        $t9 := $MakePtr($IsStoragePtr($t8), $LoadU256($t8))
+                    }
+                    // $t10 := borrow_field<M::S>.a($t9)
+                    /// @src 1:1629:1653
+                    $t10 := $IndexPtr($t9, 32)
+                    // $t11 := read_ref($t10)
+                    /// @src 1:1629:1653
+                    $t11 := $LoadU64($t10)
+                    // $t12 := 22
+                    /// @src 1:1657:1659
+                    $t12 := 22
+                    // $t13 := ==($t11, $t12)
+                    /// @src 1:1654:1656
+                    $t13 := $Eq($t11, $t12)
+                    // if ($t13) goto L4 else goto L3
+                    /// @src 1:1621:1665
+                    switch $t13
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    /// @src 1:1621:1665
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t14 := 101
+                    /// @src 1:1661:1664
+                    $t14 := 101
+                    // abort($t14)
+                    /// @src 1:1621:1665
+                    $Abort($t14)
+                }
+                case 8 {
+                    // label L5
+                    // $t15 := 0x3
+                    /// @src 1:1700:1702
+                    $t15 := 0x3
+                    // $t16 := borrow_global<M::T>($t15)
+                    /// @src 1:1683:1696
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x3948ca0a, $t15)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t16 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t17 := borrow_field<M::T>.s($t16)
+                    /// @src 1:1683:1705
+                    {
+                        $t17 := $MakePtr($IsStoragePtr($t16), $LoadU256($t16))
+                    }
+                    // $t18 := borrow_field<M::S>.b($t17)
+                    /// @src 1:1683:1707
+                    $t18 := $IndexPtr($t17, 40)
+                    // $t19 := read_ref($t18)
+                    /// @src 1:1683:1707
+                    $t19 := $LoadU8($t18)
+                    // $t20 := 11
+                    /// @src 1:1711:1713
+                    $t20 := 11
+                    // $t21 := ==($t19, $t20)
+                    /// @src 1:1708:1710
+                    $t21 := $Eq($t19, $t20)
+                    // if ($t21) goto L7 else goto L6
+                    /// @src 1:1675:1719
+                    switch $t21
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    /// @src 1:1675:1719
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t22 := 102
+                    /// @src 1:1715:1718
+                    $t22 := 102
+                    // abort($t22)
+                    /// @src 1:1675:1719
+                    $Abort($t22)
+                }
+                case 11 {
+                    // label L8
+                    // $t23 := 0x3
+                    /// @src 1:1754:1756
+                    $t23 := 0x3
+                    // $t24 := borrow_global<M::T>($t23)
+                    /// @src 1:1737:1750
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x3948ca0a, $t23)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t24 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t25 := borrow_field<M::T>.s($t24)
+                    /// @src 1:1737:1759
+                    {
+                        $t25 := $MakePtr($IsStoragePtr($t24), $LoadU256($t24))
+                    }
+                    // $t26 := borrow_field<M::S>.c($t25)
+                    /// @src 1:1737:1761
+                    {
+                        $t26 := $MakePtr($IsStoragePtr($t25), $LoadU256($t25))
+                    }
+                    // $t27 := borrow_field<M::S2>.x($t26)
+                    /// @src 1:1737:1763
+                    $t27 := $t26
+                    // $t28 := read_ref($t27)
+                    /// @src 1:1737:1763
+                    $t28 := $LoadU128($t27)
+                    // $t29 := 44
+                    /// @src 1:1767:1769
+                    $t29 := 44
+                    // $t30 := ==($t28, $t29)
+                    /// @src 1:1764:1766
+                    $t30 := $Eq($t28, $t29)
+                    // if ($t30) goto L10 else goto L9
+                    /// @src 1:1729:1775
+                    switch $t30
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    /// @src 1:1729:1775
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t31 := 103
+                    /// @src 1:1771:1774
+                    $t31 := 103
+                    // abort($t31)
+                    /// @src 1:1729:1775
+                    $Abort($t31)
+                }
+                case 14 {
+                    // label L11
+                    // return ()
+                    /// @src 1:1775:1776
+                    $Free($locals, 32)
+                    leave
+                }
+            }
+        }
+
+        function A2_M_publish_t(sg, a) {
+            let t, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10
+            // $t3 := 2
+            /// @src 1:1414:1415
+            $t3 := 2
+            // $t4 := /($t1, $t3)
+            /// @src 1:1412:1413
+            $t4 := $Div(a, $t3)
+            // $t5 := (u8)($t4)
+            /// @src 1:1408:1423
+            $t5 := $CastU8($t4)
+            // $t6 := +($t1, $t1)
+            /// @src 1:1438:1439
+            $t6 := $AddU64(a, a)
+            // $t7 := (u128)($t6)
+            /// @src 1:1434:1451
+            $t7 := $CastU128($t6)
+            // $t8 := pack M::S2($t7)
+            /// @src 1:1428:1452
+            {
+                let $mem := $Malloc(16)
+                $MemoryStoreU128(add($mem, 0), $t7)
+                $t8 := $mem
+            }
+            // $t9 := pack M::S($t1, $t5, $t8)
+            /// @src 1:1400:1453
+            {
+                let $mem := $Malloc(41)
+                $MemoryStoreU64(add($mem, 32), a)
+                $MemoryStoreU8(add($mem, 40), $t5)
+                $MemoryStoreU256(add($mem, 0), $t8)
+                $t9 := $mem
+            }
+            // $t10 := pack M::T($t9)
+            /// @src 1:1393:1454
+            {
+                let $mem := $Malloc(32)
+                $MemoryStoreU256(add($mem, 0), $t9)
+                $t10 := $mem
+            }
+            // move_to<M::T>($t10, $t0)
+            /// @src 1:1464:1471
+            {
+                let $base_offset := $MakeTypeStorageBase(0, 0x3948ca0a, $LoadU256(sg))
+                if $AlignedStorageLoad($base_offset) {
+                  $AbortBuiltin()
+                }
+                $AlignedStorageStore($base_offset, true)
+                {
+                    let $dst := add($base_offset, 32)
+                    let $src := $t10
+                    {
+                        let $linked_src_1770153451 := mload(add($src, 0))
+                        let $linked_dst_1770153451 := $NewLinkedStorageBase(0x698265eb)
+                        {
+                            let $linked_src_1602512591 := mload(add($linked_src_1770153451, 0))
+                            let $linked_dst_1602512591 := $NewLinkedStorageBase(0x5f8466cf)
+                            $AlignedStorageStore(add($linked_dst_1602512591, 0), mload(add($linked_src_1602512591, 0)))
+                            $Free($linked_src_1602512591, 16)
+                            $AlignedStorageStore(add($linked_dst_1770153451, 0), $linked_dst_1602512591)
+                        }
+                        $AlignedStorageStore(add($linked_dst_1770153451, 32), mload(add($linked_src_1770153451, 32)))
+                        $Free($linked_src_1770153451, 41)
+                        $AlignedStorageStore(add($dst, 0), $linked_dst_1770153451)
+                    }
+                    $Free($src, 32)
+                }
+            }
+            // return ()
+            /// @src 1:1464:1481
+        }
+
+        function A2_Evm_sign(addr) -> signer {
+          signer := addr
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU8(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU8(offs)
+          }
+          default {
+            val := $StorageLoadU8(offs)
+          }
+        }
+        function $MemoryLoadU8(offs) -> val {
+          val := $MemoryLoadBytes(offs, 1)
+        }
+        function $StorageLoadU8(offs) -> val {
+          val := $StorageLoadBytes(offs, 1)
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $LoadU128(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU128(offs)
+          }
+          default {
+            val := $StorageLoadU128(offs)
+          }
+        }
+        function $MemoryLoadU128(offs) -> val {
+          val := $MemoryLoadBytes(offs, 16)
+        }
+        function $StorageLoadU128(offs) -> val {
+          val := $StorageLoadBytes(offs, 16)
+        }
+        function $MemoryStoreU128(offs, val) {
+          $MemoryStoreBytes(offs, 16, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $AddU64(x, y) -> r {
+            if lt(sub(0xffffffffffffffff, x), y) { $AbortBuiltin() }
+            r := add(x, y)
+        }
+        function $Div(x, y) -> r {
+            if eq(y, 0) { $AbortBuiltin() }
+            r := div(x, y)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $CastU8(x) -> r {
+            if gt(x, 0xff) { $AbortBuiltin() }
+            r := x
+        }
+        function $CastU128(x) -> r {
+            if gt(x, 0xffffffffffffffffffffffffffffffff) { $AbortBuiltin() }
+            r := x
+        }
+    }
+}
+===> Test result of M::test_publish_t: Succeed(Stopped) (used_gas=138948): []
+
+// test of M::test_unpublish
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+/// @use-src 1:"tests/Resources.move"
+///        , 2:"../stdlib/sources/Evm.move"
+
+
+object "test_A2_M_test_unpublish" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_unpublish()
+        return (0, 0)
+        function A2_M_test_unpublish() {
+            let b, x, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20
+            let $locals := $Malloc(32)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    /// @src 1:953:974
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t14 := 101
+                    /// @src 1:970:973
+                    $t14 := 101
+                    // abort($t14)
+                    /// @src 1:953:974
+                    $Abort($t14)
+                }
+                case 4 {
+                    // $t3 := 0x3
+                    /// @src 1:890:892
+                    $t3 := 0x3
+                    // $t0 := Evm::sign($t3)
+                    /// @src 1:885:893
+                    mstore($locals, A2_Evm_sign($t3))
+                    // $t4 := borrow_local($t0)
+                    /// @src 1:884:893
+                    $t4 := $MakePtr(false, $locals)
+                    // $t5 := 33
+                    /// @src 1:895:897
+                    $t5 := 33
+                    // M::publish($t4, $t5)
+                    /// @src 1:876:898
+                    A2_M_publish($t4, $t5)
+                    // $t6 := 0x3
+                    /// @src 1:941:943
+                    $t6 := 0x3
+                    // $t7 := M::unpublish($t6)
+                    /// @src 1:931:944
+                    $t7 := A2_M_unpublish($t6)
+                    // ($t8, $t9, $t10) := unpack M::S($t7)
+                    /// @src 1:911:928
+                    $t8 := $MemoryLoadU64(add($t7, 32))
+                    $t9 := $MemoryLoadU8(add($t7, 40))
+                    $t10 := $MemoryLoadU256(add($t7, 0))
+                    $Free($t7, 41)
+                    // $t11 := unpack M::S2($t10)
+                    /// @src 1:922:927
+                    $t11 := $MemoryLoadU128(add($t10, 0))
+                    $Free($t10, 16)
+                    // $t12 := 33
+                    /// @src 1:966:968
+                    $t12 := 33
+                    // $t13 := ==($t8, $t12)
+                    /// @src 1:963:965
+                    $t13 := $Eq($t8, $t12)
+                    // if ($t13) goto L1 else goto L0
+                    /// @src 1:953:974
+                    switch $t13
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t15 := 16
+                    /// @src 1:996:998
+                    $t15 := 16
+                    // $t16 := ==($t9, $t15)
+                    /// @src 1:993:995
+                    $t16 := $Eq($t9, $t15)
+                    // if ($t16) goto L4 else goto L3
+                    /// @src 1:983:1004
+                    switch $t16
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    /// @src 1:983:1004
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t17 := 102
+                    /// @src 1:1000:1003
+                    $t17 := 102
+                    // abort($t17)
+                    /// @src 1:983:1004
+                    $Abort($t17)
+                }
+                case 8 {
+                    // label L5
+                    // $t18 := 66
+                    /// @src 1:1026:1028
+                    $t18 := 66
+                    // $t19 := ==($t11, $t18)
+                    /// @src 1:1023:1025
+                    $t19 := $Eq($t11, $t18)
+                    // if ($t19) goto L7 else goto L6
+                    /// @src 1:1013:1034
+                    switch $t19
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    /// @src 1:1013:1034
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t20 := 103
+                    /// @src 1:1030:1033
+                    $t20 := 103
+                    // abort($t20)
+                    /// @src 1:1013:1034
+                    $Abort($t20)
+                }
+                case 11 {
+                    // label L8
+                    // return ()
+                    /// @src 1:1034:1035
+                    $Free($locals, 32)
+                    leave
+                }
+            }
+        }
+
+        function A2_M_unpublish(a) -> $result {
+            let $t1
+            // $t1 := move_from<M::S>($t0)
+            /// @src 1:793:802
+            {
+                let $base_offset := $MakeTypeStorageBase(0, 0x698265eb, a)
+                if iszero($AlignedStorageLoad($base_offset)) {
+                  $AbortBuiltin()
+                }
+                $AlignedStorageStore($base_offset, false)
+                {
+                    let $src := add($base_offset, 32)
+                    let $dst
+                    $dst := $Malloc(41)
+                    {
+                        let $linked_src_1602512591 := $AlignedStorageLoad(add($src, 0))
+                        let $linked_dst_1602512591
+                        $linked_dst_1602512591 := $Malloc(16)
+                        mstore(add($linked_dst_1602512591, 0), $AlignedStorageLoad(add($linked_src_1602512591, 0)))
+                        $AlignedStorageStore(add($linked_src_1602512591, 0), 0)
+                        mstore(add($dst, 0), $linked_dst_1602512591)
+                        $AlignedStorageStore(add($src, 0), 0)
+                    }
+                    mstore(add($dst, 32), $AlignedStorageLoad(add($src, 32)))
+                    $AlignedStorageStore(add($src, 32), 0)
+                    $t1 := $dst
+                }
+            }
+            // return $t1
+            /// @src 1:793:808
+            $result := $t1
+        }
+
+        function A2_M_publish(sg, a) {
+            let s, $t3, $t4, $t5, $t6, $t7, $t8, $t9
+            // $t3 := 2
+            /// @src 1:385:386
+            $t3 := 2
+            // $t4 := /($t1, $t3)
+            /// @src 1:383:384
+            $t4 := $Div(a, $t3)
+            // $t5 := (u8)($t4)
+            /// @src 1:379:394
+            $t5 := $CastU8($t4)
+            // $t6 := +($t1, $t1)
+            /// @src 1:409:410
+            $t6 := $AddU64(a, a)
+            // $t7 := (u128)($t6)
+            /// @src 1:405:422
+            $t7 := $CastU128($t6)
+            // $t8 := pack M::S2($t7)
+            /// @src 1:399:423
+            {
+                let $mem := $Malloc(16)
+                $MemoryStoreU128(add($mem, 0), $t7)
+                $t8 := $mem
+            }
+            // $t9 := pack M::S($t1, $t5, $t8)
+            /// @src 1:371:424
+            {
+                let $mem := $Malloc(41)
+                $MemoryStoreU64(add($mem, 32), a)
+                $MemoryStoreU8(add($mem, 40), $t5)
+                $MemoryStoreU256(add($mem, 0), $t8)
+                $t9 := $mem
+            }
+            // move_to<M::S>($t9, $t0)
+            /// @src 1:434:441
+            {
+                let $base_offset := $MakeTypeStorageBase(0, 0x698265eb, $LoadU256(sg))
+                if $AlignedStorageLoad($base_offset) {
+                  $AbortBuiltin()
+                }
+                $AlignedStorageStore($base_offset, true)
+                {
+                    let $dst := add($base_offset, 32)
+                    let $src := $t9
+                    {
+                        let $linked_src_1602512591 := mload(add($src, 0))
+                        let $linked_dst_1602512591 := $NewLinkedStorageBase(0x5f8466cf)
+                        $AlignedStorageStore(add($linked_dst_1602512591, 0), mload(add($linked_src_1602512591, 0)))
+                        $Free($linked_src_1602512591, 16)
+                        $AlignedStorageStore(add($dst, 0), $linked_dst_1602512591)
+                    }
+                    $AlignedStorageStore(add($dst, 32), mload(add($src, 32)))
+                    $Free($src, 41)
+                }
+            }
+            // return ()
+            /// @src 1:434:451
+        }
+
+        function A2_Evm_sign(addr) -> signer {
+          signer := addr
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $MemoryLoadU8(offs) -> val {
+          val := $MemoryLoadBytes(offs, 1)
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $MemoryLoadU128(offs) -> val {
+          val := $MemoryLoadBytes(offs, 16)
+        }
+        function $MemoryStoreU128(offs, val) {
+          $MemoryStoreBytes(offs, 16, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $AddU64(x, y) -> r {
+            if lt(sub(0xffffffffffffffff, x), y) { $AbortBuiltin() }
+            r := add(x, y)
+        }
+        function $Div(x, y) -> r {
+            if eq(y, 0) { $AbortBuiltin() }
+            r := div(x, y)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $CastU8(x) -> r {
+            if gt(x, 0xff) { $AbortBuiltin() }
+            r := x
+        }
+        function $CastU128(x) -> r {
+            if gt(x, 0xffffffffffffffffffffffffffffffff) { $AbortBuiltin() }
+            r := x
+        }
+    }
+}
+===> Test result of M::test_unpublish: Succeed(Stopped) (used_gas=91212): []
diff --git a/third_party/move/evm/move-to-yul/tests/Structs.v2_exp b/third_party/move/evm/move-to-yul/tests/Structs.v2_exp
new file mode 100644
index 0000000000000..d79871424ed16
--- /dev/null
+++ b/third_party/move/evm/move-to-yul/tests/Structs.v2_exp
@@ -0,0 +1,2355 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_M" {
+    code {
+        codecopy(0, dataoffset("A2_M_deployed"), datasize("A2_M_deployed"))
+        return(0, datasize("A2_M_deployed"))
+    }
+    object "A2_M_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                default {}
+            }
+            $Abort(97)
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
+
+
+!! Unit tests
+
+// test of M::test_drop
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_drop" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_drop()
+        return (0, 0)
+        function A2_M_test_drop() {
+            let $t0, $t1, $t2, $t3
+            // $t0 := 33
+            $t0 := 33
+            // $t1 := false
+            $t1 := false
+            // $t2 := M::pack_S($t0, $t1)
+            $t2 := A2_M_pack_S($t0, $t1)
+            // $t3 := pack M::S3($t2)
+            {
+                let $mem := $Malloc(32)
+                $MemoryStoreU256(add($mem, 0), $t2)
+                $t3 := $mem
+            }
+            // drop($t3)
+            {
+                let $field_ptr_1770153451 := $LoadU256(add($t3, 0))
+                {
+                    let $field_ptr_1602512591 := $LoadU256(add($field_ptr_1770153451, 0))
+                    $Free($field_ptr_1602512591, 16)
+                }
+                $Free($field_ptr_1770153451, 41)
+            }
+            $Free($t3, 32)
+            // return ()
+        }
+
+        function A2_M_pack_S(a, b) -> $result {
+            let $t2, $t3, $t4
+            // $t2 := (u128)($t0)
+            $t2 := $CastU128(a)
+            // $t3 := M::pack_S2($t2)
+            $t3 := A2_M_pack_S2($t2)
+            // $t4 := pack M::S($t0, $t1, $t3)
+            {
+                let $mem := $Malloc(41)
+                $MemoryStoreU64(add($mem, 32), a)
+                $MemoryStoreU8(add($mem, 40), b)
+                $MemoryStoreU256(add($mem, 0), $t3)
+                $t4 := $mem
+            }
+            // return $t4
+            $result := $t4
+        }
+
+        function A2_M_pack_S2(x) -> $result {
+            let $t1
+            // $t1 := pack M::S2($t0)
+            {
+                let $mem := $Malloc(16)
+                $MemoryStoreU128(add($mem, 0), x)
+                $t1 := $mem
+            }
+            // return $t1
+            $result := $t1
+        }
+
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $MemoryStoreU128(offs, val) {
+          $MemoryStoreBytes(offs, 16, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $CastU128(x) -> r {
+            if gt(x, 0xffffffffffffffffffffffffffffffff) { $AbortBuiltin() }
+            r := x
+        }
+    }
+}
+===> Test result of M::test_drop: Succeed(Returned) (used_gas=343): []
+
+// test of M::test_equality
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_equality" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_equality()
+        return (0, 0)
+        function A2_M_test_equality() {
+            let s1, s2, s3, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t13 := 101
+                    $t13 := 101
+                    // abort($t13)
+                    $Abort($t13)
+                }
+                case 4 {
+                    // $t3 := 23
+                    $t3 := 23
+                    // $t4 := false
+                    $t4 := false
+                    // $t5 := M::pack_S($t3, $t4)
+                    $t5 := A2_M_pack_S($t3, $t4)
+                    // $t6 := 23
+                    $t6 := 23
+                    // $t7 := false
+                    $t7 := false
+                    // $t8 := M::pack_S($t6, $t7)
+                    $t8 := A2_M_pack_S($t6, $t7)
+                    // $t9 := 24
+                    $t9 := 24
+                    // $t10 := false
+                    $t10 := false
+                    // $t11 := M::pack_S($t9, $t10)
+                    $t11 := A2_M_pack_S($t9, $t10)
+                    // $t12 := ==($t5, $t8)
+                    $t12 := $Eq_$A2_M_S$($t5, $t8)
+                    // if ($t12) goto L1 else goto L0
+                    switch $t12
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t14 := !=($t5, $t11)
+                    $t14 := $LogicalNot($Eq_$A2_M_S$($t5, $t11))
+                    // if ($t14) goto L4 else goto L3
+                    switch $t14
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t15 := 102
+                    $t15 := 102
+                    // abort($t15)
+                    $Abort($t15)
+                }
+                case 8 {
+                    // label L5
+                    // $t16 := !=($t8, $t11)
+                    $t16 := $LogicalNot($Eq_$A2_M_S$($t8, $t11))
+                    // if ($t16) goto L7 else goto L6
+                    switch $t16
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t17 := 103
+                    $t17 := 103
+                    // abort($t17)
+                    $Abort($t17)
+                }
+                case 11 {
+                    // label L8
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function A2_M_pack_S(a, b) -> $result {
+            let $t2, $t3, $t4
+            // $t2 := (u128)($t0)
+            $t2 := $CastU128(a)
+            // $t3 := M::pack_S2($t2)
+            $t3 := A2_M_pack_S2($t2)
+            // $t4 := pack M::S($t0, $t1, $t3)
+            {
+                let $mem := $Malloc(41)
+                $MemoryStoreU64(add($mem, 32), a)
+                $MemoryStoreU8(add($mem, 40), b)
+                $MemoryStoreU256(add($mem, 0), $t3)
+                $t4 := $mem
+            }
+            // return $t4
+            $result := $t4
+        }
+
+        function A2_M_pack_S2(x) -> $result {
+            let $t1
+            // $t1 := pack M::S2($t0)
+            {
+                let $mem := $Malloc(16)
+                $MemoryStoreU128(add($mem, 0), x)
+                $t1 := $mem
+            }
+            // return $t1
+            $result := $t1
+        }
+
+        function $Eq_$A2_M_S$(x, y) -> res
+        {
+            let f_x_2 := mload(add(x, 0))
+            let f_y_2 := mload(add(y, 0))
+            if $LogicalNot($Eq_$A2_M_S2$(f_x_2, f_y_2)) {
+              res:= false
+              leave
+            }
+            if $Neq(mload(add(x, 32)), mload(add(y, 32))) {
+              res:= false
+              leave
+            }
+            res := true
+        }
+        function $Eq_$A2_M_S2$(x, y) -> res
+        {
+            if $Neq(mload(add(x, 0)), mload(add(y, 0))) {
+              res:= false
+              leave
+            }
+            res := true
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $MemoryStoreU128(offs, val) {
+          $MemoryStoreBytes(offs, 16, val)
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $Neq(x, y) -> r {
+            r := $LogicalNot(eq(x, y))
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $CastU128(x) -> r {
+            if gt(x, 0xffffffffffffffffffffffffffffffff) { $AbortBuiltin() }
+            r := x
+        }
+    }
+}
+===> Test result of M::test_equality: Succeed(Stopped) (used_gas=2137): []
+
+// test of M::test_pack_S
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_pack_S" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_pack_S()
+        return (0, 0)
+        function A2_M_test_pack_S() {
+            let s, $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t8 := 100
+                    $t8 := 100
+                    // abort($t8)
+                    $Abort($t8)
+                }
+                case 4 {
+                    // $t1 := 42
+                    $t1 := 42
+                    // $t2 := true
+                    $t2 := true
+                    // $t0 := M::pack_S($t1, $t2)
+                    s := A2_M_pack_S($t1, $t2)
+                    // $t3 := borrow_local($t0)
+                    $t3 := $MakePtr(false, s)
+                    // $t4 := borrow_field<M::S>.a($t3)
+                    $t4 := $IndexPtr($t3, 32)
+                    // $t5 := read_ref($t4)
+                    $t5 := $LoadU64($t4)
+                    // $t6 := 42
+                    $t6 := 42
+                    // $t7 := ==($t5, $t6)
+                    $t7 := $Eq($t5, $t6)
+                    // if ($t7) goto L1 else goto L0
+                    switch $t7
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t9 := borrow_local($t0)
+                    $t9 := $MakePtr(false, s)
+                    // $t10 := borrow_field<M::S>.b($t9)
+                    $t10 := $IndexPtr($t9, 40)
+                    // $t11 := read_ref($t10)
+                    $t11 := $LoadU8($t10)
+                    // $t12 := true
+                    $t12 := true
+                    // $t13 := ==($t11, $t12)
+                    $t13 := $Eq($t11, $t12)
+                    // if ($t13) goto L4 else goto L3
+                    switch $t13
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t14 := 101
+                    $t14 := 101
+                    // abort($t14)
+                    $Abort($t14)
+                }
+                case 8 {
+                    // label L5
+                    // $t15 := borrow_local($t0)
+                    $t15 := $MakePtr(false, s)
+                    // $t16 := borrow_field<M::S>.c($t15)
+                    {
+                        $t16 := $MakePtr($IsStoragePtr($t15), $LoadU256($t15))
+                    }
+                    // $t17 := borrow_field<M::S2>.x($t16)
+                    $t17 := $t16
+                    // $t18 := read_ref($t17)
+                    $t18 := $LoadU128($t17)
+                    // $t19 := 42
+                    $t19 := 42
+                    // $t20 := ==($t18, $t19)
+                    $t20 := $Eq($t18, $t19)
+                    // if ($t20) goto L7 else goto L6
+                    switch $t20
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t21 := 102
+                    $t21 := 102
+                    // abort($t21)
+                    $Abort($t21)
+                }
+                case 11 {
+                    // label L8
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function A2_M_pack_S(a, b) -> $result {
+            let $t2, $t3, $t4
+            // $t2 := (u128)($t0)
+            $t2 := $CastU128(a)
+            // $t3 := M::pack_S2($t2)
+            $t3 := A2_M_pack_S2($t2)
+            // $t4 := pack M::S($t0, $t1, $t3)
+            {
+                let $mem := $Malloc(41)
+                $MemoryStoreU64(add($mem, 32), a)
+                $MemoryStoreU8(add($mem, 40), b)
+                $MemoryStoreU256(add($mem, 0), $t3)
+                $t4 := $mem
+            }
+            // return $t4
+            $result := $t4
+        }
+
+        function A2_M_pack_S2(x) -> $result {
+            let $t1
+            // $t1 := pack M::S2($t0)
+            {
+                let $mem := $Malloc(16)
+                $MemoryStoreU128(add($mem, 0), x)
+                $t1 := $mem
+            }
+            // return $t1
+            $result := $t1
+        }
+
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU8(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU8(offs)
+          }
+          default {
+            val := $StorageLoadU8(offs)
+          }
+        }
+        function $MemoryLoadU8(offs) -> val {
+          val := $MemoryLoadBytes(offs, 1)
+        }
+        function $StorageLoadU8(offs) -> val {
+          val := $StorageLoadBytes(offs, 1)
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $LoadU128(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU128(offs)
+          }
+          default {
+            val := $StorageLoadU128(offs)
+          }
+        }
+        function $MemoryLoadU128(offs) -> val {
+          val := $MemoryLoadBytes(offs, 16)
+        }
+        function $StorageLoadU128(offs) -> val {
+          val := $StorageLoadBytes(offs, 16)
+        }
+        function $MemoryStoreU128(offs, val) {
+          $MemoryStoreBytes(offs, 16, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $CastU128(x) -> r {
+            if gt(x, 0xffffffffffffffffffffffffffffffff) { $AbortBuiltin() }
+            r := x
+        }
+    }
+}
+===> Test result of M::test_pack_S: Succeed(Stopped) (used_gas=1775): []
+
+// test of M::test_pack_S2
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_pack_S2" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_pack_S2()
+        return (0, 0)
+        function A2_M_test_pack_S2() {
+            let s, $t1, $t2, $t3, $t4, $t5, $t6, $t7
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t7 := 100
+                    $t7 := 100
+                    // abort($t7)
+                    $Abort($t7)
+                }
+                case 4 {
+                    // $t1 := 42
+                    $t1 := 42
+                    // $t0 := M::pack_S2($t1)
+                    s := A2_M_pack_S2($t1)
+                    // $t2 := borrow_local($t0)
+                    $t2 := $MakePtr(false, s)
+                    // $t3 := borrow_field<M::S2>.x($t2)
+                    $t3 := $t2
+                    // $t4 := read_ref($t3)
+                    $t4 := $LoadU128($t3)
+                    // $t5 := 42
+                    $t5 := 42
+                    // $t6 := ==($t4, $t5)
+                    $t6 := $Eq($t4, $t5)
+                    // if ($t6) goto L1 else goto L0
+                    switch $t6
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function A2_M_pack_S2(x) -> $result {
+            let $t1
+            // $t1 := pack M::S2($t0)
+            {
+                let $mem := $Malloc(16)
+                $MemoryStoreU128(add($mem, 0), x)
+                $t1 := $mem
+            }
+            // return $t1
+            $result := $t1
+        }
+
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $LoadU128(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU128(offs)
+          }
+          default {
+            val := $StorageLoadU128(offs)
+          }
+        }
+        function $MemoryLoadU128(offs) -> val {
+          val := $MemoryLoadBytes(offs, 16)
+        }
+        function $StorageLoadU128(offs) -> val {
+          val := $StorageLoadBytes(offs, 16)
+        }
+        function $MemoryStoreU128(offs, val) {
+          $MemoryStoreBytes(offs, 16, val)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of M::test_pack_S2: Succeed(Stopped) (used_gas=471): []
+
+// test of M::test_pack_S2_fail
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_pack_S2_fail" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_pack_S2_fail()
+        return (0, 0)
+        function A2_M_test_pack_S2_fail() {
+            let s, $t1, $t2, $t3, $t4, $t5, $t6, $t7
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t7 := 100
+                    $t7 := 100
+                    // abort($t7)
+                    $Abort($t7)
+                }
+                case 4 {
+                    // $t1 := 42
+                    $t1 := 42
+                    // $t0 := M::pack_S2($t1)
+                    s := A2_M_pack_S2($t1)
+                    // $t2 := borrow_local($t0)
+                    $t2 := $MakePtr(false, s)
+                    // $t3 := borrow_field<M::S2>.x($t2)
+                    $t3 := $t2
+                    // $t4 := read_ref($t3)
+                    $t4 := $LoadU128($t3)
+                    // $t5 := 41
+                    $t5 := 41
+                    // $t6 := ==($t4, $t5)
+                    $t6 := $Eq($t4, $t5)
+                    // if ($t6) goto L1 else goto L0
+                    switch $t6
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function A2_M_pack_S2(x) -> $result {
+            let $t1
+            // $t1 := pack M::S2($t0)
+            {
+                let $mem := $Malloc(16)
+                $MemoryStoreU128(add($mem, 0), x)
+                $t1 := $mem
+            }
+            // return $t1
+            $result := $t1
+        }
+
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $LoadU128(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU128(offs)
+          }
+          default {
+            val := $StorageLoadU128(offs)
+          }
+        }
+        function $MemoryLoadU128(offs) -> val {
+          val := $MemoryLoadBytes(offs, 16)
+        }
+        function $StorageLoadU128(offs) -> val {
+          val := $StorageLoadBytes(offs, 16)
+        }
+        function $MemoryStoreU128(offs, val) {
+          $MemoryStoreBytes(offs, 16, val)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of M::test_pack_S2_fail: Revert(Reverted) (used_gas=396): [0, 0, 0, 0, 0, 0, 0, 100]
+
+// test of M::test_read_S
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_read_S" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_read_S()
+        return (0, 0)
+        function A2_M_test_read_S() {
+            let s, $t1, $t2, $t3, $t4, $t5, $t6, $t7
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t7 := 100
+                    $t7 := 100
+                    // abort($t7)
+                    $Abort($t7)
+                }
+                case 4 {
+                    // $t1 := 42
+                    $t1 := 42
+                    // $t2 := true
+                    $t2 := true
+                    // $t0 := M::pack_S($t1, $t2)
+                    s := A2_M_pack_S($t1, $t2)
+                    // $t3 := borrow_local($t0)
+                    $t3 := $MakePtr(false, s)
+                    // $t4 := M::read_S($t3)
+                    $t4 := A2_M_read_S($t3)
+                    // $t5 := 84
+                    $t5 := 84
+                    // $t6 := ==($t4, $t5)
+                    $t6 := $Eq($t4, $t5)
+                    // if ($t6) goto L1 else goto L0
+                    switch $t6
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function A2_M_read_S(s) -> $result {
+            let $t1, $t2, $t3, $t4, $t5, $t6, $t7
+            // $t1 := borrow_field<M::S>.a($t0)
+            $t1 := $IndexPtr(s, 32)
+            // $t2 := read_ref($t1)
+            $t2 := $LoadU64($t1)
+            // $t3 := borrow_field<M::S>.c($t0)
+            {
+                $t3 := $MakePtr($IsStoragePtr(s), $LoadU256(s))
+            }
+            // $t4 := borrow_field<M::S2>.x($t3)
+            $t4 := $t3
+            // $t5 := read_ref($t4)
+            $t5 := $LoadU128($t4)
+            // $t6 := (u64)($t5)
+            $t6 := $CastU64($t5)
+            // $t7 := +($t2, $t6)
+            $t7 := $AddU64($t2, $t6)
+            // return $t7
+            $result := $t7
+        }
+
+        function A2_M_pack_S(a, b) -> $result {
+            let $t2, $t3, $t4
+            // $t2 := (u128)($t0)
+            $t2 := $CastU128(a)
+            // $t3 := M::pack_S2($t2)
+            $t3 := A2_M_pack_S2($t2)
+            // $t4 := pack M::S($t0, $t1, $t3)
+            {
+                let $mem := $Malloc(41)
+                $MemoryStoreU64(add($mem, 32), a)
+                $MemoryStoreU8(add($mem, 40), b)
+                $MemoryStoreU256(add($mem, 0), $t3)
+                $t4 := $mem
+            }
+            // return $t4
+            $result := $t4
+        }
+
+        function A2_M_pack_S2(x) -> $result {
+            let $t1
+            // $t1 := pack M::S2($t0)
+            {
+                let $mem := $Malloc(16)
+                $MemoryStoreU128(add($mem, 0), x)
+                $t1 := $mem
+            }
+            // return $t1
+            $result := $t1
+        }
+
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $LoadU128(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU128(offs)
+          }
+          default {
+            val := $StorageLoadU128(offs)
+          }
+        }
+        function $MemoryLoadU128(offs) -> val {
+          val := $MemoryLoadBytes(offs, 16)
+        }
+        function $StorageLoadU128(offs) -> val {
+          val := $StorageLoadBytes(offs, 16)
+        }
+        function $MemoryStoreU128(offs, val) {
+          $MemoryStoreBytes(offs, 16, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $AddU64(x, y) -> r {
+            if lt(sub(0xffffffffffffffff, x), y) { $AbortBuiltin() }
+            r := add(x, y)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $CastU64(x) -> r {
+            if gt(x, 0xffffffffffffffff) { $AbortBuiltin() }
+            r := x
+        }
+        function $CastU128(x) -> r {
+            if gt(x, 0xffffffffffffffffffffffffffffffff) { $AbortBuiltin() }
+            r := x
+        }
+    }
+}
+===> Test result of M::test_read_S: Succeed(Stopped) (used_gas=925): []
+
+// test of M::test_read_and_write_S
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_read_and_write_S" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_read_and_write_S()
+        return (0, 0)
+        function A2_M_test_read_and_write_S() {
+            let s, $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t6 := 100
+                    $t6 := 100
+                    // abort($t6)
+                    $Abort($t6)
+                }
+                case 4 {
+                    // $t0 := M::read_and_write_S()
+                    s := A2_M_read_and_write_S()
+                    // $t1 := borrow_local($t0)
+                    $t1 := $MakePtr(false, s)
+                    // $t2 := borrow_field<M::S>.a($t1)
+                    $t2 := $IndexPtr($t1, 32)
+                    // $t3 := read_ref($t2)
+                    $t3 := $LoadU64($t2)
+                    // $t4 := 2
+                    $t4 := 2
+                    // $t5 := ==($t3, $t4)
+                    $t5 := $Eq($t3, $t4)
+                    // if ($t5) goto L1 else goto L0
+                    switch $t5
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t7 := borrow_local($t0)
+                    $t7 := $MakePtr(false, s)
+                    // $t8 := borrow_field<M::S>.c($t7)
+                    {
+                        $t8 := $MakePtr($IsStoragePtr($t7), $LoadU256($t7))
+                    }
+                    // $t9 := borrow_field<M::S2>.x($t8)
+                    $t9 := $t8
+                    // $t10 := read_ref($t9)
+                    $t10 := $LoadU128($t9)
+                    // $t11 := 2
+                    $t11 := 2
+                    // $t12 := ==($t10, $t11)
+                    $t12 := $Eq($t10, $t11)
+                    // if ($t12) goto L4 else goto L3
+                    switch $t12
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t13 := 101
+                    $t13 := 101
+                    // abort($t13)
+                    $Abort($t13)
+                }
+                case 8 {
+                    // label L5
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function A2_M_read_and_write_S() -> $result {
+            let s, x, $t2, $t3, $t4, $t5, $t6, $t7
+            // $t2 := 1
+            $t2 := 1
+            // $t3 := false
+            $t3 := false
+            // $t0 := M::pack_S($t2, $t3)
+            s := A2_M_pack_S($t2, $t3)
+            // $t4 := borrow_local($t0)
+            $t4 := $MakePtr(false, s)
+            // $t5 := M::read_S($t4)
+            $t5 := A2_M_read_S($t4)
+            // $t6 := borrow_local($t0)
+            $t6 := $MakePtr(false, s)
+            // M::write_S($t6, $t5)
+            A2_M_write_S($t6, $t5)
+            // $t7 := move($t0)
+            $t7 := s
+            // return $t7
+            $result := $t7
+        }
+
+        function A2_M_write_S(s, v) {
+            let $t2, $t3, $t4, $t5, $t6, $t7
+            // $t2 := borrow_field<M::S>.a($t0)
+            $t2 := $IndexPtr(s, 32)
+            // write_ref($t2, $t1)
+            $StoreU64($t2, v)
+            // $t3 := borrow_field<M::S>.a($t0)
+            $t3 := $IndexPtr(s, 32)
+            // $t4 := read_ref($t3)
+            $t4 := $LoadU64($t3)
+            // $t5 := (u128)($t4)
+            $t5 := $CastU128($t4)
+            // $t6 := borrow_field<M::S>.c($t0)
+            {
+                $t6 := $MakePtr($IsStoragePtr(s), $LoadU256(s))
+            }
+            // $t7 := borrow_field<M::S2>.x($t6)
+            $t7 := $t6
+            // write_ref($t7, $t5)
+            $StoreU128($t7, $t5)
+            // return ()
+        }
+
+        function A2_M_read_S(s) -> $result {
+            let $t1, $t2, $t3, $t4, $t5, $t6, $t7
+            // $t1 := borrow_field<M::S>.a($t0)
+            $t1 := $IndexPtr(s, 32)
+            // $t2 := read_ref($t1)
+            $t2 := $LoadU64($t1)
+            // $t3 := borrow_field<M::S>.c($t0)
+            {
+                $t3 := $MakePtr($IsStoragePtr(s), $LoadU256(s))
+            }
+            // $t4 := borrow_field<M::S2>.x($t3)
+            $t4 := $t3
+            // $t5 := read_ref($t4)
+            $t5 := $LoadU128($t4)
+            // $t6 := (u64)($t5)
+            $t6 := $CastU64($t5)
+            // $t7 := +($t2, $t6)
+            $t7 := $AddU64($t2, $t6)
+            // return $t7
+            $result := $t7
+        }
+
+        function A2_M_pack_S(a, b) -> $result {
+            let $t2, $t3, $t4
+            // $t2 := (u128)($t0)
+            $t2 := $CastU128(a)
+            // $t3 := M::pack_S2($t2)
+            $t3 := A2_M_pack_S2($t2)
+            // $t4 := pack M::S($t0, $t1, $t3)
+            {
+                let $mem := $Malloc(41)
+                $MemoryStoreU64(add($mem, 32), a)
+                $MemoryStoreU8(add($mem, 40), b)
+                $MemoryStoreU256(add($mem, 0), $t3)
+                $t4 := $mem
+            }
+            // return $t4
+            $result := $t4
+        }
+
+        function A2_M_pack_S2(x) -> $result {
+            let $t1
+            // $t1 := pack M::S2($t0)
+            {
+                let $mem := $Malloc(16)
+                $MemoryStoreU128(add($mem, 0), x)
+                $t1 := $mem
+            }
+            // return $t1
+            $result := $t1
+        }
+
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU128(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU128(offs)
+          }
+          default {
+            val := $StorageLoadU128(offs)
+          }
+        }
+        function $MemoryLoadU128(offs) -> val {
+          val := $MemoryLoadBytes(offs, 16)
+        }
+        function $StorageLoadU128(offs) -> val {
+          val := $StorageLoadBytes(offs, 16)
+        }
+        function $StoreU128(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU128(offs, val)
+          }
+          default {
+            $StorageStoreU128(offs, val)
+          }
+        }
+        function $MemoryStoreU128(offs, val) {
+          $MemoryStoreBytes(offs, 16, val)
+        }
+        function $StorageStoreU128(offs, val) {
+          $StorageStoreBytes(offs, 16, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $AddU64(x, y) -> r {
+            if lt(sub(0xffffffffffffffff, x), y) { $AbortBuiltin() }
+            r := add(x, y)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $CastU64(x) -> r {
+            if gt(x, 0xffffffffffffffff) { $AbortBuiltin() }
+            r := x
+        }
+        function $CastU128(x) -> r {
+            if gt(x, 0xffffffffffffffffffffffffffffffff) { $AbortBuiltin() }
+            r := x
+        }
+    }
+}
+===> Test result of M::test_read_and_write_S: Succeed(Stopped) (used_gas=2055): []
+
+// test of M::test_unpack
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_unpack" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_unpack()
+        return (0, 0)
+        function A2_M_test_unpack() {
+            let s1, $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t9 := 101
+                    $t9 := 101
+                    // abort($t9)
+                    $Abort($t9)
+                }
+                case 4 {
+                    // $t1 := 33
+                    $t1 := 33
+                    // $t2 := false
+                    $t2 := false
+                    // $t3 := M::pack_S($t1, $t2)
+                    $t3 := A2_M_pack_S($t1, $t2)
+                    // $t0 := M::unpack($t3)
+                    s1 := A2_M_unpack($t3)
+                    // $t4 := borrow_local($t0)
+                    $t4 := $MakePtr(false, s1)
+                    // $t5 := borrow_field<M::S2>.x($t4)
+                    $t5 := $t4
+                    // $t6 := read_ref($t5)
+                    $t6 := $LoadU128($t5)
+                    // $t7 := 33
+                    $t7 := 33
+                    // $t8 := ==($t6, $t7)
+                    $t8 := $Eq($t6, $t7)
+                    // if ($t8) goto L1 else goto L0
+                    switch $t8
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function A2_M_unpack(s) -> $result {
+            let c, $t2, $t3, $t4
+            // ($t2, $t3, $t4) := unpack M::S($t0)
+            $t2 := $MemoryLoadU64(add(s, 32))
+            $t3 := $MemoryLoadU8(add(s, 40))
+            $t4 := $MemoryLoadU256(add(s, 0))
+            $Free(s, 41)
+            // drop($t3)
+            // drop($t2)
+            // return $t4
+            $result := $t4
+        }
+
+        function A2_M_pack_S(a, b) -> $result {
+            let $t2, $t3, $t4
+            // $t2 := (u128)($t0)
+            $t2 := $CastU128(a)
+            // $t3 := M::pack_S2($t2)
+            $t3 := A2_M_pack_S2($t2)
+            // $t4 := pack M::S($t0, $t1, $t3)
+            {
+                let $mem := $Malloc(41)
+                $MemoryStoreU64(add($mem, 32), a)
+                $MemoryStoreU8(add($mem, 40), b)
+                $MemoryStoreU256(add($mem, 0), $t3)
+                $t4 := $mem
+            }
+            // return $t4
+            $result := $t4
+        }
+
+        function A2_M_pack_S2(x) -> $result {
+            let $t1
+            // $t1 := pack M::S2($t0)
+            {
+                let $mem := $Malloc(16)
+                $MemoryStoreU128(add($mem, 0), x)
+                $t1 := $mem
+            }
+            // return $t1
+            $result := $t1
+        }
+
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MemoryLoadU8(offs) -> val {
+          val := $MemoryLoadBytes(offs, 1)
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $LoadU128(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU128(offs)
+          }
+          default {
+            val := $StorageLoadU128(offs)
+          }
+        }
+        function $MemoryLoadU128(offs) -> val {
+          val := $MemoryLoadBytes(offs, 16)
+        }
+        function $StorageLoadU128(offs) -> val {
+          val := $StorageLoadBytes(offs, 16)
+        }
+        function $MemoryStoreU128(offs, val) {
+          $MemoryStoreBytes(offs, 16, val)
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $CastU128(x) -> r {
+            if gt(x, 0xffffffffffffffffffffffffffffffff) { $AbortBuiltin() }
+            r := x
+        }
+    }
+}
+===> Test result of M::test_unpack: Succeed(Stopped) (used_gas=591): []
+
+// test of M::test_write_S
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_write_S" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_write_S()
+        return (0, 0)
+        function A2_M_test_write_S() {
+            let s, $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t10 := 100
+                    $t10 := 100
+                    // abort($t10)
+                    $Abort($t10)
+                }
+                case 4 {
+                    // $t1 := 42
+                    $t1 := 42
+                    // $t2 := true
+                    $t2 := true
+                    // $t0 := M::pack_S($t1, $t2)
+                    s := A2_M_pack_S($t1, $t2)
+                    // $t3 := borrow_local($t0)
+                    $t3 := $MakePtr(false, s)
+                    // $t4 := 43
+                    $t4 := 43
+                    // M::write_S($t3, $t4)
+                    A2_M_write_S($t3, $t4)
+                    // $t5 := borrow_local($t0)
+                    $t5 := $MakePtr(false, s)
+                    // $t6 := borrow_field<M::S>.a($t5)
+                    $t6 := $IndexPtr($t5, 32)
+                    // $t7 := read_ref($t6)
+                    $t7 := $LoadU64($t6)
+                    // $t8 := 43
+                    $t8 := 43
+                    // $t9 := ==($t7, $t8)
+                    $t9 := $Eq($t7, $t8)
+                    // if ($t9) goto L1 else goto L0
+                    switch $t9
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t11 := borrow_local($t0)
+                    $t11 := $MakePtr(false, s)
+                    // $t12 := borrow_field<M::S>.c($t11)
+                    {
+                        $t12 := $MakePtr($IsStoragePtr($t11), $LoadU256($t11))
+                    }
+                    // $t13 := borrow_field<M::S2>.x($t12)
+                    $t13 := $t12
+                    // $t14 := read_ref($t13)
+                    $t14 := $LoadU128($t13)
+                    // $t15 := 43
+                    $t15 := 43
+                    // $t16 := ==($t14, $t15)
+                    $t16 := $Eq($t14, $t15)
+                    // if ($t16) goto L4 else goto L3
+                    switch $t16
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t17 := 101
+                    $t17 := 101
+                    // abort($t17)
+                    $Abort($t17)
+                }
+                case 8 {
+                    // label L5
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function A2_M_write_S(s, v) {
+            let $t2, $t3, $t4, $t5, $t6, $t7
+            // $t2 := borrow_field<M::S>.a($t0)
+            $t2 := $IndexPtr(s, 32)
+            // write_ref($t2, $t1)
+            $StoreU64($t2, v)
+            // $t3 := borrow_field<M::S>.a($t0)
+            $t3 := $IndexPtr(s, 32)
+            // $t4 := read_ref($t3)
+            $t4 := $LoadU64($t3)
+            // $t5 := (u128)($t4)
+            $t5 := $CastU128($t4)
+            // $t6 := borrow_field<M::S>.c($t0)
+            {
+                $t6 := $MakePtr($IsStoragePtr(s), $LoadU256(s))
+            }
+            // $t7 := borrow_field<M::S2>.x($t6)
+            $t7 := $t6
+            // write_ref($t7, $t5)
+            $StoreU128($t7, $t5)
+            // return ()
+        }
+
+        function A2_M_pack_S(a, b) -> $result {
+            let $t2, $t3, $t4
+            // $t2 := (u128)($t0)
+            $t2 := $CastU128(a)
+            // $t3 := M::pack_S2($t2)
+            $t3 := A2_M_pack_S2($t2)
+            // $t4 := pack M::S($t0, $t1, $t3)
+            {
+                let $mem := $Malloc(41)
+                $MemoryStoreU64(add($mem, 32), a)
+                $MemoryStoreU8(add($mem, 40), b)
+                $MemoryStoreU256(add($mem, 0), $t3)
+                $t4 := $mem
+            }
+            // return $t4
+            $result := $t4
+        }
+
+        function A2_M_pack_S2(x) -> $result {
+            let $t1
+            // $t1 := pack M::S2($t0)
+            {
+                let $mem := $Malloc(16)
+                $MemoryStoreU128(add($mem, 0), x)
+                $t1 := $mem
+            }
+            // return $t1
+            $result := $t1
+        }
+
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU128(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU128(offs)
+          }
+          default {
+            val := $StorageLoadU128(offs)
+          }
+        }
+        function $MemoryLoadU128(offs) -> val {
+          val := $MemoryLoadBytes(offs, 16)
+        }
+        function $StorageLoadU128(offs) -> val {
+          val := $StorageLoadBytes(offs, 16)
+        }
+        function $StoreU128(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU128(offs, val)
+          }
+          default {
+            $StorageStoreU128(offs, val)
+          }
+        }
+        function $MemoryStoreU128(offs, val) {
+          $MemoryStoreBytes(offs, 16, val)
+        }
+        function $StorageStoreU128(offs, val) {
+          $StorageStoreBytes(offs, 16, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $CastU128(x) -> r {
+            if gt(x, 0xffffffffffffffffffffffffffffffff) { $AbortBuiltin() }
+            r := x
+        }
+    }
+}
+===> Test result of M::test_write_S: Succeed(Stopped) (used_gas=1637): []
diff --git a/third_party/move/evm/move-to-yul/tests/Tables.v2_exp b/third_party/move/evm/move-to-yul/tests/Tables.v2_exp
new file mode 100644
index 0000000000000..f6ce37ffea2a9
--- /dev/null
+++ b/third_party/move/evm/move-to-yul/tests/Tables.v2_exp
@@ -0,0 +1,4227 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_Tables" {
+    code {
+        codecopy(0, dataoffset("A2_Tables_deployed"), datasize("A2_Tables_deployed"))
+        return(0, datasize("A2_Tables_deployed"))
+    }
+    object "A2_Tables_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                default {}
+            }
+            $Abort(97)
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
+
+
+!! Unit tests
+
+// test of Tables::test_borrow_fail
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_Tables_test_borrow_fail" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_Tables_test_borrow_fail()
+        return (0, 0)
+        function A2_Tables_test_borrow_fail() {
+            let tmp_$1, tmp_$3, entry_ref, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21
+            let $locals := $Malloc(128)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t12 := 100
+                    $t12 := 100
+                    // abort($t12)
+                    $Abort($t12)
+                }
+                case 4 {
+                    // $t6 := Table::empty<u64, u128>()
+                    mstore($locals, A2_Table_empty$u64_u128$())
+                    // $t7 := borrow_local($t6)
+                    $t7 := $MakePtr(false, $locals)
+                    // $t8 := 42
+                    $t8 := 42
+                    // $t0 := $t8
+                    mstore(add($locals, 32), $t8)
+                    // $t9 := borrow_local($t0)
+                    $t9 := $MakePtr(false, add($locals, 56))
+                    // $t10 := Table::contains<u64, u128>($t7, $t9)
+                    $t10 := A2_Table_contains$u64_u128$($t7, $t9)
+                    // $t11 := !($t10)
+                    $t11 := $LogicalNot($t10)
+                    // if ($t11) goto L1 else goto L0
+                    switch $t11
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t13 := borrow_local($t6)
+                    $t13 := $MakePtr(false, $locals)
+                    // $t14 := 42
+                    $t14 := 42
+                    // $t2 := $t14
+                    mstore(add($locals, 64), $t14)
+                    // $t15 := borrow_local($t2)
+                    $t15 := $MakePtr(false, add($locals, 88))
+                    // $t16 := Table::borrow_mut<u64, u128>($t13, $t15)
+                    $t16 := A2_Table_borrow_mut$u64_u128$($t13, $t15)
+                    // $t17 := 1
+                    $t17 := 1
+                    // write_ref($t16, $t17)
+                    $StoreU128($t16, $t17)
+                    // $t18 := 0x42
+                    $t18 := 0x42
+                    // $t4 := Evm::sign($t18)
+                    mstore(add($locals, 96), A2_Evm_sign($t18))
+                    // $t19 := borrow_local($t4)
+                    $t19 := $MakePtr(false, add($locals, 96))
+                    // $t20 := move($t6)
+                    $t20 := mload($locals)
+                    // $t21 := pack Tables::S<u64, u128>($t20)
+                    {
+                        let $mem := $Malloc(32)
+                        $MemoryStoreU256(add($mem, 0), $t20)
+                        $t21 := $mem
+                    }
+                    // move_to<Tables::S<u64, u128>>($t21, $t19)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x8a475b1c, $LoadU256($t19))
+                        if $AlignedStorageLoad($base_offset) {
+                          $AbortBuiltin()
+                        }
+                        $AlignedStorageStore($base_offset, true)
+                        {
+                            let $dst := add($base_offset, 32)
+                            let $src := $t21
+                            $AlignedStorageStore(add($dst, 0), mload(add($src, 0)))
+                            $Free($src, 32)
+                        }
+                    }
+                    // return ()
+                    $Free($locals, 128)
+                    leave
+                }
+            }
+        }
+
+        function A2_Evm_sign(addr) -> signer {
+          signer := addr
+        }
+        function A2_Table_borrow_mut$u64_u128$(table_ref, key_ref) -> value_ref {
+            let key := $LoadU64(key_ref)
+            let table_handle := $LoadU256(table_ref)
+            let storage_key := $StorageKey(table_handle, key)
+            let value_offs := sload(storage_key)
+            if iszero(value_offs) {
+              $AbortBuiltin()
+            }
+            value_ref := $MakePtr(true, value_offs)
+        }
+        function A2_Table_contains$u64_u128$(table_ref, key_ref) -> res {
+            let key := $LoadU64(key_ref)
+            let table_handle := $LoadU256(table_ref)
+            let storage_key := $StorageKey(table_handle, key)
+            let word := sload(storage_key)
+            res := $LogicalNot(iszero(word))
+        }
+        function A2_Table_empty$u64_u128$() -> table {
+            table := $NewTableHandle()
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewTableHandle() -> handle {
+          let key := $StorageKey(1, 0)
+          handle := sload(key)
+          if iszero(handle) {
+             // no tables have been allocated in this contract, need to initialize the counter
+             // to the number of storage groups already statically allocated
+             handle := 2
+          }
+          sstore(key, add(handle, 1))
+        }
+
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU128(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU128(offs, val)
+          }
+          default {
+            $StorageStoreU128(offs, val)
+          }
+        }
+        function $MemoryStoreU128(offs, val) {
+          $MemoryStoreBytes(offs, 16, val)
+        }
+        function $StorageStoreU128(offs, val) {
+          $StorageStoreBytes(offs, 16, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of Tables::test_borrow_fail: Revert(Reverted) (used_gas=25408): [255, 255, 255, 255, 255, 255, 255, 255]
+
+// test of Tables::test_insert_fail
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_Tables_test_insert_fail" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_Tables_test_insert_fail()
+        return (0, 0)
+        function A2_Tables_test_insert_fail() {
+            let tmp_$1, tmp_$3, tmp_$5, tmp_$7, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32
+            let $locals := $Malloc(192)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t15 := 100
+                    $t15 := 100
+                    // abort($t15)
+                    $Abort($t15)
+                }
+                case 4 {
+                    // $t9 := Table::empty<u64, u128>()
+                    mstore($locals, A2_Table_empty$u64_u128$())
+                    // $t10 := borrow_local($t9)
+                    $t10 := $MakePtr(false, $locals)
+                    // $t11 := 42
+                    $t11 := 42
+                    // $t0 := $t11
+                    mstore(add($locals, 32), $t11)
+                    // $t12 := borrow_local($t0)
+                    $t12 := $MakePtr(false, add($locals, 56))
+                    // $t13 := Table::contains<u64, u128>($t10, $t12)
+                    $t13 := A2_Table_contains$u64_u128$($t10, $t12)
+                    // $t14 := !($t13)
+                    $t14 := $LogicalNot($t13)
+                    // if ($t14) goto L1 else goto L0
+                    switch $t14
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t16 := borrow_local($t9)
+                    $t16 := $MakePtr(false, $locals)
+                    // $t17 := 42
+                    $t17 := 42
+                    // $t2 := $t17
+                    mstore(add($locals, 64), $t17)
+                    // $t18 := borrow_local($t2)
+                    $t18 := $MakePtr(false, add($locals, 88))
+                    // $t19 := 1012
+                    $t19 := 1012
+                    // Table::insert<u64, u128>($t16, $t18, $t19)
+                    A2_Table_insert$u64_u128$($t16, $t18, $t19)
+                    // $t20 := borrow_local($t9)
+                    $t20 := $MakePtr(false, $locals)
+                    // $t21 := 42
+                    $t21 := 42
+                    // $t4 := $t21
+                    mstore(add($locals, 96), $t21)
+                    // $t22 := borrow_local($t4)
+                    $t22 := $MakePtr(false, add($locals, 120))
+                    // $t23 := Table::contains<u64, u128>($t20, $t22)
+                    $t23 := A2_Table_contains$u64_u128$($t20, $t22)
+                    // if ($t23) goto L4 else goto L3
+                    switch $t23
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t24 := 101
+                    $t24 := 101
+                    // abort($t24)
+                    $Abort($t24)
+                }
+                case 8 {
+                    // label L5
+                    // $t25 := borrow_local($t9)
+                    $t25 := $MakePtr(false, $locals)
+                    // $t26 := 42
+                    $t26 := 42
+                    // $t6 := $t26
+                    mstore(add($locals, 128), $t26)
+                    // $t27 := borrow_local($t6)
+                    $t27 := $MakePtr(false, add($locals, 152))
+                    // $t28 := 1013
+                    $t28 := 1013
+                    // Table::insert<u64, u128>($t25, $t27, $t28)
+                    A2_Table_insert$u64_u128$($t25, $t27, $t28)
+                    // $t29 := 0x42
+                    $t29 := 0x42
+                    // $t8 := Evm::sign($t29)
+                    mstore(add($locals, 160), A2_Evm_sign($t29))
+                    // $t30 := borrow_local($t8)
+                    $t30 := $MakePtr(false, add($locals, 160))
+                    // $t31 := move($t9)
+                    $t31 := mload($locals)
+                    // $t32 := pack Tables::S<u64, u128>($t31)
+                    {
+                        let $mem := $Malloc(32)
+                        $MemoryStoreU256(add($mem, 0), $t31)
+                        $t32 := $mem
+                    }
+                    // move_to<Tables::S<u64, u128>>($t32, $t30)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x8a475b1c, $LoadU256($t30))
+                        if $AlignedStorageLoad($base_offset) {
+                          $AbortBuiltin()
+                        }
+                        $AlignedStorageStore($base_offset, true)
+                        {
+                            let $dst := add($base_offset, 32)
+                            let $src := $t32
+                            $AlignedStorageStore(add($dst, 0), mload(add($src, 0)))
+                            $Free($src, 32)
+                        }
+                    }
+                    // return ()
+                    $Free($locals, 192)
+                    leave
+                }
+            }
+        }
+
+        function A2_Evm_sign(addr) -> signer {
+          signer := addr
+        }
+        function A2_Table_insert$u64_u128$(table_ref, key_ref, value) {
+            let key := $LoadU64(key_ref)
+            let table_handle := $LoadU256(table_ref)
+            let storage_key := $StorageKey(table_handle, key)
+            let word := sload(storage_key)
+            if $LogicalNot(iszero(word)) {
+              $AbortBuiltin()
+            }
+            let $linked_dst_107084805 := $NewLinkedStorageBase(0x661fc05)
+            $StorageStoreU128($linked_dst_107084805, value)
+            sstore(storage_key, $linked_dst_107084805)
+        }
+        function A2_Table_contains$u64_u128$(table_ref, key_ref) -> res {
+            let key := $LoadU64(key_ref)
+            let table_handle := $LoadU256(table_ref)
+            let storage_key := $StorageKey(table_handle, key)
+            let word := sload(storage_key)
+            res := $LogicalNot(iszero(word))
+        }
+        function A2_Table_empty$u64_u128$() -> table {
+            table := $NewTableHandle()
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $NewTableHandle() -> handle {
+          let key := $StorageKey(1, 0)
+          handle := sload(key)
+          if iszero(handle) {
+             // no tables have been allocated in this contract, need to initialize the counter
+             // to the number of storage groups already statically allocated
+             handle := 2
+          }
+          sstore(key, add(handle, 1))
+        }
+
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StorageStoreU128(offs, val) {
+          $StorageStoreBytes(offs, 16, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of Tables::test_insert_fail: Revert(Reverted) (used_gas=91120): [255, 255, 255, 255, 255, 255, 255, 255]
+
+// test of Tables::test_primitive
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_Tables_test_primitive" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_Tables_test_primitive()
+        return (0, 0)
+        function A2_Tables_test_primitive() {
+            let tmp_$1, tmp_$3, tmp_$5, tmp_$7, tmp_$9, tmp_$11, tmp_$12, tmp_$14, tmp_$17, tmp_$19, tmp_$22, tmp_$24, tmp_$26, tmp_$28, t_ref, $t33, $t34, $t35, $t36, $t37, $t38, $t39, $t40, $t41, $t42, $t43, $t44, $t45, $t46, $t47, $t48, $t49, $t50, $t51, $t52, $t53, $t54, $t55, $t56, $t57, $t58, $t59, $t60, $t61, $t62, $t63, $t64, $t65, $t66, $t67, $t68, $t69, $t70, $t71, $t72, $t73, $t74, $t75, $t76, $t77, $t78, $t79, $t80, $t81, $t82, $t83, $t84, $t85, $t86, $t87, $t88, $t89, $t90, $t91, $t92, $t93, $t94, $t95, $t96, $t97, $t98, $t99, $t100, $t101, $t102, $t103, $t104, $t105, $t106, $t107, $t108, $t109, $t110, $t111, $t112, $t113, $t114, $t115, $t116, $t117, $t118, $t119, $t120, $t121, $t122, $t123, $t124, $t125, $t126, $t127, $t128, $t129
+            let $locals := $Malloc(576)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t38 := 100
+                    $t38 := 100
+                    // abort($t38)
+                    $Abort($t38)
+                }
+                case 4 {
+                    // $t31 := Table::empty<u64, u128>()
+                    mstore($locals, A2_Table_empty$u64_u128$())
+                    // $t33 := borrow_local($t31)
+                    $t33 := $MakePtr(false, $locals)
+                    // $t34 := 42
+                    $t34 := 42
+                    // $t0 := $t34
+                    mstore(add($locals, 32), $t34)
+                    // $t35 := borrow_local($t0)
+                    $t35 := $MakePtr(false, add($locals, 56))
+                    // $t36 := Table::contains<u64, u128>($t33, $t35)
+                    $t36 := A2_Table_contains$u64_u128$($t33, $t35)
+                    // $t37 := !($t36)
+                    $t37 := $LogicalNot($t36)
+                    // if ($t37) goto L1 else goto L0
+                    switch $t37
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t39 := borrow_local($t31)
+                    $t39 := $MakePtr(false, $locals)
+                    // $t40 := 42
+                    $t40 := 42
+                    // $t21 := $t40
+                    mstore(add($locals, 64), $t40)
+                    // $t41 := borrow_local($t21)
+                    $t41 := $MakePtr(false, add($locals, 88))
+                    // $t42 := 1012
+                    $t42 := 1012
+                    // Table::insert<u64, u128>($t39, $t41, $t42)
+                    A2_Table_insert$u64_u128$($t39, $t41, $t42)
+                    // $t43 := borrow_local($t31)
+                    $t43 := $MakePtr(false, $locals)
+                    // $t44 := 42
+                    $t44 := 42
+                    // $t25 := $t44
+                    mstore(add($locals, 96), $t44)
+                    // $t45 := borrow_local($t25)
+                    $t45 := $MakePtr(false, add($locals, 120))
+                    // $t46 := Table::contains<u64, u128>($t43, $t45)
+                    $t46 := A2_Table_contains$u64_u128$($t43, $t45)
+                    // if ($t46) goto L4 else goto L3
+                    switch $t46
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t47 := 101
+                    $t47 := 101
+                    // abort($t47)
+                    $Abort($t47)
+                }
+                case 8 {
+                    // label L5
+                    // $t48 := borrow_local($t31)
+                    $t48 := $MakePtr(false, $locals)
+                    // $t49 := 0
+                    $t49 := 0
+                    // $t27 := $t49
+                    mstore(add($locals, 128), $t49)
+                    // $t50 := borrow_local($t27)
+                    $t50 := $MakePtr(false, add($locals, 152))
+                    // $t51 := Table::contains<u64, u128>($t48, $t50)
+                    $t51 := A2_Table_contains$u64_u128$($t48, $t50)
+                    // $t52 := !($t51)
+                    $t52 := $LogicalNot($t51)
+                    // if ($t52) goto L7 else goto L6
+                    switch $t52
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t53 := 102
+                    $t53 := 102
+                    // abort($t53)
+                    $Abort($t53)
+                }
+                case 11 {
+                    // label L8
+                    // $t54 := borrow_local($t31)
+                    $t54 := $MakePtr(false, $locals)
+                    // $t55 := 42
+                    $t55 := 42
+                    // $t29 := $t55
+                    mstore(add($locals, 160), $t55)
+                    // $t56 := borrow_local($t29)
+                    $t56 := $MakePtr(false, add($locals, 184))
+                    // $t57 := Table::borrow<u64, u128>($t54, $t56)
+                    $t57 := A2_Table_borrow$u64_u128$($t54, $t56)
+                    // $t58 := read_ref($t57)
+                    $t58 := $LoadU128($t57)
+                    // $t59 := 1012
+                    $t59 := 1012
+                    // $t60 := ==($t58, $t59)
+                    $t60 := $Eq($t58, $t59)
+                    // if ($t60) goto L10 else goto L9
+                    switch $t60
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t61 := 103
+                    $t61 := 103
+                    // abort($t61)
+                    $Abort($t61)
+                }
+                case 14 {
+                    // label L11
+                    // $t62 := borrow_local($t31)
+                    $t62 := $MakePtr(false, $locals)
+                    // $t63 := 43
+                    $t63 := 43
+                    // $t2 := $t63
+                    mstore(add($locals, 192), $t63)
+                    // $t64 := borrow_local($t2)
+                    $t64 := $MakePtr(false, add($locals, 216))
+                    // $t65 := 1013
+                    $t65 := 1013
+                    // Table::insert<u64, u128>($t62, $t64, $t65)
+                    A2_Table_insert$u64_u128$($t62, $t64, $t65)
+                    // $t66 := borrow_local($t31)
+                    $t66 := $MakePtr(false, $locals)
+                    // $t67 := 42
+                    $t67 := 42
+                    // $t4 := $t67
+                    mstore(add($locals, 224), $t67)
+                    // $t68 := borrow_local($t4)
+                    $t68 := $MakePtr(false, add($locals, 248))
+                    // $t69 := Table::contains<u64, u128>($t66, $t68)
+                    $t69 := A2_Table_contains$u64_u128$($t66, $t68)
+                    // if ($t69) goto L13 else goto L12
+                    switch $t69
+                    case 0  { $block := 16 }
+                    default { $block := 15 }
+                }
+                case 15 {
+                    // label L13
+                    // goto L14
+                    $block := 17
+                }
+                case 16 {
+                    // label L12
+                    // $t70 := 104
+                    $t70 := 104
+                    // abort($t70)
+                    $Abort($t70)
+                }
+                case 17 {
+                    // label L14
+                    // $t71 := borrow_local($t31)
+                    $t71 := $MakePtr(false, $locals)
+                    // $t72 := 0
+                    $t72 := 0
+                    // $t6 := $t72
+                    mstore(add($locals, 256), $t72)
+                    // $t73 := borrow_local($t6)
+                    $t73 := $MakePtr(false, add($locals, 280))
+                    // $t74 := Table::contains<u64, u128>($t71, $t73)
+                    $t74 := A2_Table_contains$u64_u128$($t71, $t73)
+                    // $t75 := !($t74)
+                    $t75 := $LogicalNot($t74)
+                    // if ($t75) goto L16 else goto L15
+                    switch $t75
+                    case 0  { $block := 19 }
+                    default { $block := 18 }
+                }
+                case 18 {
+                    // label L16
+                    // goto L17
+                    $block := 20
+                }
+                case 19 {
+                    // label L15
+                    // $t76 := 105
+                    $t76 := 105
+                    // abort($t76)
+                    $Abort($t76)
+                }
+                case 20 {
+                    // label L17
+                    // $t77 := borrow_local($t31)
+                    $t77 := $MakePtr(false, $locals)
+                    // $t78 := 43
+                    $t78 := 43
+                    // $t8 := $t78
+                    mstore(add($locals, 288), $t78)
+                    // $t79 := borrow_local($t8)
+                    $t79 := $MakePtr(false, add($locals, 312))
+                    // $t80 := Table::contains<u64, u128>($t77, $t79)
+                    $t80 := A2_Table_contains$u64_u128$($t77, $t79)
+                    // if ($t80) goto L19 else goto L18
+                    switch $t80
+                    case 0  { $block := 22 }
+                    default { $block := 21 }
+                }
+                case 21 {
+                    // label L19
+                    // goto L20
+                    $block := 23
+                }
+                case 22 {
+                    // label L18
+                    // $t81 := 106
+                    $t81 := 106
+                    // abort($t81)
+                    $Abort($t81)
+                }
+                case 23 {
+                    // label L20
+                    // $t82 := borrow_local($t31)
+                    $t82 := $MakePtr(false, $locals)
+                    // $t83 := 43
+                    $t83 := 43
+                    // $t10 := $t83
+                    mstore(add($locals, 320), $t83)
+                    // $t84 := borrow_local($t10)
+                    $t84 := $MakePtr(false, add($locals, 344))
+                    // $t85 := Table::borrow<u64, u128>($t82, $t84)
+                    $t85 := A2_Table_borrow$u64_u128$($t82, $t84)
+                    // $t86 := read_ref($t85)
+                    $t86 := $LoadU128($t85)
+                    // $t87 := 1013
+                    $t87 := 1013
+                    // $t88 := ==($t86, $t87)
+                    $t88 := $Eq($t86, $t87)
+                    // if ($t88) goto L22 else goto L21
+                    switch $t88
+                    case 0  { $block := 25 }
+                    default { $block := 24 }
+                }
+                case 24 {
+                    // label L22
+                    // goto L23
+                    $block := 26
+                }
+                case 25 {
+                    // label L21
+                    // $t89 := 107
+                    $t89 := 107
+                    // abort($t89)
+                    $Abort($t89)
+                }
+                case 26 {
+                    // label L23
+                    // $t90 := borrow_local($t31)
+                    $t90 := $MakePtr(false, $locals)
+                    // $t91 := 42
+                    $t91 := 42
+                    // $t13 := $t91
+                    mstore(add($locals, 352), $t91)
+                    // $t92 := borrow_local($t13)
+                    $t92 := $MakePtr(false, add($locals, 376))
+                    // $t93 := Table::remove<u64, u128>($t90, $t92)
+                    $t93 := A2_Table_remove$u64_u128$($t90, $t92)
+                    // $t94 := 1012
+                    $t94 := 1012
+                    // $t95 := ==($t93, $t94)
+                    $t95 := $Eq($t93, $t94)
+                    // if ($t95) goto L25 else goto L24
+                    switch $t95
+                    case 0  { $block := 28 }
+                    default { $block := 27 }
+                }
+                case 27 {
+                    // label L25
+                    // goto L26
+                    $block := 29
+                }
+                case 28 {
+                    // label L24
+                    // $t96 := 108
+                    $t96 := 108
+                    // abort($t96)
+                    $Abort($t96)
+                }
+                case 29 {
+                    // label L26
+                    // $t97 := 0x42
+                    $t97 := 0x42
+                    // $t15 := Evm::sign($t97)
+                    mstore(add($locals, 384), A2_Evm_sign($t97))
+                    // $t98 := borrow_local($t15)
+                    $t98 := $MakePtr(false, add($locals, 384))
+                    // $t99 := move($t31)
+                    $t99 := mload($locals)
+                    // $t100 := pack Tables::S<u64, u128>($t99)
+                    {
+                        let $mem := $Malloc(32)
+                        $MemoryStoreU256(add($mem, 0), $t99)
+                        $t100 := $mem
+                    }
+                    // move_to<Tables::S<u64, u128>>($t100, $t98)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x8a475b1c, $LoadU256($t98))
+                        if $AlignedStorageLoad($base_offset) {
+                          $AbortBuiltin()
+                        }
+                        $AlignedStorageStore($base_offset, true)
+                        {
+                            let $dst := add($base_offset, 32)
+                            let $src := $t100
+                            $AlignedStorageStore(add($dst, 0), mload(add($src, 0)))
+                            $Free($src, 32)
+                        }
+                    }
+                    // $t101 := 0x42
+                    $t101 := 0x42
+                    // $t102 := borrow_global<Tables::S<u64, u128>>($t101)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x8a475b1c, $t101)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t102 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t103 := borrow_field<Tables::S<u64, u128>>.t($t102)
+                    $t103 := $t102
+                    // $t104 := 42
+                    $t104 := 42
+                    // $t16 := $t104
+                    mstore(add($locals, 416), $t104)
+                    // $t105 := borrow_local($t16)
+                    $t105 := $MakePtr(false, add($locals, 440))
+                    // $t106 := Table::contains<u64, u128>($t103, $t105)
+                    $t106 := A2_Table_contains$u64_u128$($t103, $t105)
+                    // $t107 := !($t106)
+                    $t107 := $LogicalNot($t106)
+                    // if ($t107) goto L28 else goto L27
+                    switch $t107
+                    case 0  { $block := 31 }
+                    default { $block := 30 }
+                }
+                case 30 {
+                    // label L28
+                    // goto L29
+                    $block := 32
+                }
+                case 31 {
+                    // label L27
+                    // drop($t103)
+                    // $t108 := 109
+                    $t108 := 109
+                    // abort($t108)
+                    $Abort($t108)
+                }
+                case 32 {
+                    // label L29
+                    // $t109 := 43
+                    $t109 := 43
+                    // $t18 := $t109
+                    mstore(add($locals, 448), $t109)
+                    // $t110 := borrow_local($t18)
+                    $t110 := $MakePtr(false, add($locals, 472))
+                    // $t111 := Table::borrow<u64, u128>($t103, $t110)
+                    $t111 := A2_Table_borrow$u64_u128$($t103, $t110)
+                    // $t112 := read_ref($t111)
+                    $t112 := $LoadU128($t111)
+                    // $t113 := 1013
+                    $t113 := 1013
+                    // $t114 := ==($t112, $t113)
+                    $t114 := $Eq($t112, $t113)
+                    // if ($t114) goto L31 else goto L30
+                    switch $t114
+                    case 0  { $block := 34 }
+                    default { $block := 33 }
+                }
+                case 33 {
+                    // label L31
+                    // goto L32
+                    $block := 35
+                }
+                case 34 {
+                    // label L30
+                    // $t115 := 110
+                    $t115 := 110
+                    // abort($t115)
+                    $Abort($t115)
+                }
+                case 35 {
+                    // label L32
+                    // $t116 := 0x42
+                    $t116 := 0x42
+                    // $t117 := move_from<Tables::S<u64, u128>>($t116)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x8a475b1c, $t116)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $AlignedStorageStore($base_offset, false)
+                        {
+                            let $src := add($base_offset, 32)
+                            let $dst
+                            $dst := $Malloc(32)
+                            mstore(add($dst, 0), $AlignedStorageLoad(add($src, 0)))
+                            $AlignedStorageStore(add($src, 0), 0)
+                            $t117 := $dst
+                        }
+                    }
+                    // $t30 := unpack Tables::S<u64, u128>($t117)
+                    mstore(add($locals, 480), $MemoryLoadU256(add($t117, 0)))
+                    $Free($t117, 32)
+                    // $t118 := borrow_local($t30)
+                    $t118 := $MakePtr(false, add($locals, 480))
+                    // $t119 := 43
+                    $t119 := 43
+                    // $t20 := $t119
+                    mstore(add($locals, 512), $t119)
+                    // $t120 := borrow_local($t20)
+                    $t120 := $MakePtr(false, add($locals, 536))
+                    // $t121 := Table::borrow<u64, u128>($t118, $t120)
+                    $t121 := A2_Table_borrow$u64_u128$($t118, $t120)
+                    // $t122 := read_ref($t121)
+                    $t122 := $LoadU128($t121)
+                    // $t123 := 1013
+                    $t123 := 1013
+                    // $t124 := ==($t122, $t123)
+                    $t124 := $Eq($t122, $t123)
+                    // if ($t124) goto L34 else goto L33
+                    switch $t124
+                    case 0  { $block := 37 }
+                    default { $block := 36 }
+                }
+                case 36 {
+                    // label L34
+                    // goto L35
+                    $block := 38
+                }
+                case 37 {
+                    // label L33
+                    // $t125 := 111
+                    $t125 := 111
+                    // abort($t125)
+                    $Abort($t125)
+                }
+                case 38 {
+                    // label L35
+                    // $t126 := 0x43
+                    $t126 := 0x43
+                    // $t23 := Evm::sign($t126)
+                    mstore(add($locals, 544), A2_Evm_sign($t126))
+                    // $t127 := borrow_local($t23)
+                    $t127 := $MakePtr(false, add($locals, 544))
+                    // $t128 := move($t30)
+                    $t128 := mload(add($locals, 480))
+                    // $t129 := pack Tables::S<u64, u128>($t128)
+                    {
+                        let $mem := $Malloc(32)
+                        $MemoryStoreU256(add($mem, 0), $t128)
+                        $t129 := $mem
+                    }
+                    // move_to<Tables::S<u64, u128>>($t129, $t127)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x8a475b1c, $LoadU256($t127))
+                        if $AlignedStorageLoad($base_offset) {
+                          $AbortBuiltin()
+                        }
+                        $AlignedStorageStore($base_offset, true)
+                        {
+                            let $dst := add($base_offset, 32)
+                            let $src := $t129
+                            $AlignedStorageStore(add($dst, 0), mload(add($src, 0)))
+                            $Free($src, 32)
+                        }
+                    }
+                    // return ()
+                    $Free($locals, 576)
+                    leave
+                }
+            }
+        }
+
+        function A2_Evm_sign(addr) -> signer {
+          signer := addr
+        }
+        function A2_Table_borrow$u64_u128$(table_ref, key_ref) -> value_ref {
+            let key := $LoadU64(key_ref)
+            let table_handle := $LoadU256(table_ref)
+            let storage_key := $StorageKey(table_handle, key)
+            let value_offs := sload(storage_key)
+            if iszero(value_offs) {
+              $AbortBuiltin()
+            }
+            value_ref := $MakePtr(true, value_offs)
+        }
+        function A2_Table_contains$u64_u128$(table_ref, key_ref) -> res {
+            let key := $LoadU64(key_ref)
+            let table_handle := $LoadU256(table_ref)
+            let storage_key := $StorageKey(table_handle, key)
+            let word := sload(storage_key)
+            res := $LogicalNot(iszero(word))
+        }
+        function A2_Table_remove$u64_u128$(table_ref, key_ref) -> value {
+            let key := $LoadU64(key_ref)
+            let table_handle := $LoadU256(table_ref)
+            let storage_key := $StorageKey(table_handle, key)
+            let linked_src := sload(storage_key)
+            if iszero(linked_src) {
+              $AbortBuiltin()
+            }
+            value := $StorageLoadU128(linked_src)
+            $AlignedStorageStore(linked_src, 0)
+            sstore(storage_key, 0)
+        }
+        function A2_Table_insert$u64_u128$(table_ref, key_ref, value) {
+            let key := $LoadU64(key_ref)
+            let table_handle := $LoadU256(table_ref)
+            let storage_key := $StorageKey(table_handle, key)
+            let word := sload(storage_key)
+            if $LogicalNot(iszero(word)) {
+              $AbortBuiltin()
+            }
+            let $linked_dst_107084805 := $NewLinkedStorageBase(0x661fc05)
+            $StorageStoreU128($linked_dst_107084805, value)
+            sstore(storage_key, $linked_dst_107084805)
+        }
+        function A2_Table_empty$u64_u128$() -> table {
+            table := $NewTableHandle()
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $NewTableHandle() -> handle {
+          let key := $StorageKey(1, 0)
+          handle := sload(key)
+          if iszero(handle) {
+             // no tables have been allocated in this contract, need to initialize the counter
+             // to the number of storage groups already statically allocated
+             handle := 2
+          }
+          sstore(key, add(handle, 1))
+        }
+
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $LoadU128(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU128(offs)
+          }
+          default {
+            val := $StorageLoadU128(offs)
+          }
+        }
+        function $MemoryLoadU128(offs) -> val {
+          val := $MemoryLoadBytes(offs, 16)
+        }
+        function $StorageLoadU128(offs) -> val {
+          val := $StorageLoadBytes(offs, 16)
+        }
+        function $StorageStoreU128(offs, val) {
+          $StorageStoreBytes(offs, 16, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of Tables::test_primitive: Succeed(Stopped) (used_gas=196448): []
+
+// test of Tables::test_remove_fail
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_Tables_test_remove_fail" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_Tables_test_remove_fail()
+        return (0, 0)
+        function A2_Tables_test_remove_fail() {
+            let tmp_$1, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15
+            let $locals := $Malloc(96)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t11 := 101
+                    $t11 := 101
+                    // abort($t11)
+                    $Abort($t11)
+                }
+                case 4 {
+                    // $t3 := Table::empty<u64, Tables::Balance>()
+                    mstore($locals, A2_Table_empty$u64_A2_Tables_Balance$())
+                    // $t4 := borrow_local($t3)
+                    $t4 := $MakePtr(false, $locals)
+                    // $t5 := 42
+                    $t5 := 42
+                    // $t0 := $t5
+                    mstore(add($locals, 32), $t5)
+                    // $t6 := borrow_local($t0)
+                    $t6 := $MakePtr(false, add($locals, 56))
+                    // $t7 := Table::remove<u64, Tables::Balance>($t4, $t6)
+                    $t7 := A2_Table_remove$u64_A2_Tables_Balance$($t4, $t6)
+                    // $t8 := unpack Tables::Balance($t7)
+                    $t8 := $MemoryLoadU256(add($t7, 0))
+                    $Free($t7, 32)
+                    // $t9 := U256::zero()
+                    $t9 := A2_U256_zero()
+                    // $t10 := ==($t8, $t9)
+                    $t10 := $Eq($t8, $t9)
+                    // if ($t10) goto L1 else goto L0
+                    switch $t10
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t12 := 0x42
+                    $t12 := 0x42
+                    // $t2 := Evm::sign($t12)
+                    mstore(add($locals, 64), A2_Evm_sign($t12))
+                    // $t13 := borrow_local($t2)
+                    $t13 := $MakePtr(false, add($locals, 64))
+                    // $t14 := move($t3)
+                    $t14 := mload($locals)
+                    // $t15 := pack Tables::S<u64, Tables::Balance>($t14)
+                    {
+                        let $mem := $Malloc(32)
+                        $MemoryStoreU256(add($mem, 0), $t14)
+                        $t15 := $mem
+                    }
+                    // move_to<Tables::S<u64, Tables::Balance>>($t15, $t13)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x6f98bffd, $LoadU256($t13))
+                        if $AlignedStorageLoad($base_offset) {
+                          $AbortBuiltin()
+                        }
+                        $AlignedStorageStore($base_offset, true)
+                        {
+                            let $dst := add($base_offset, 32)
+                            let $src := $t15
+                            $AlignedStorageStore(add($dst, 0), mload(add($src, 0)))
+                            $Free($src, 32)
+                        }
+                    }
+                    // return ()
+                    $Free($locals, 96)
+                    leave
+                }
+            }
+        }
+
+        function A2_Evm_sign(addr) -> signer {
+          signer := addr
+        }
+        function A2_U256_zero() -> $result {
+            let $t0
+            // $t0 := 0
+            $t0 := 0
+            // return $t0
+            $result := $t0
+        }
+
+        function A2_Table_remove$u64_A2_Tables_Balance$(table_ref, key_ref) -> value {
+            let key := $LoadU64(key_ref)
+            let table_handle := $LoadU256(table_ref)
+            let storage_key := $StorageKey(table_handle, key)
+            let linked_src := sload(storage_key)
+            if iszero(linked_src) {
+              $AbortBuiltin()
+            }
+            value := $Malloc(32)
+            mstore(add(value, 0), $AlignedStorageLoad(add(linked_src, 0)))
+            $AlignedStorageStore(add(linked_src, 0), 0)
+            $AlignedStorageStore(linked_src, 0)
+            sstore(storage_key, 0)
+        }
+        function A2_Table_empty$u64_A2_Tables_Balance$() -> table {
+            table := $NewTableHandle()
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewTableHandle() -> handle {
+          let key := $StorageKey(1, 0)
+          handle := sload(key)
+          if iszero(handle) {
+             // no tables have been allocated in this contract, need to initialize the counter
+             // to the number of storage groups already statically allocated
+             handle := 2
+          }
+          sstore(key, add(handle, 1))
+        }
+
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of Tables::test_remove_fail: Revert(Reverted) (used_gas=24811): [255, 255, 255, 255, 255, 255, 255, 255]
+
+// test of Tables::test_struct
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_Tables_test_struct" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_Tables_test_struct()
+        return (0, 0)
+        function A2_Tables_test_struct() {
+            let tmp_$2, tmp_$3, tmp_$5, tmp_$6, tmp_$8, tmp_$9, tmp_$11, tmp_$12, tmp_$14, tmp_$16, tmp_$17, tmp_$19, tmp_$21, tmp_$24, entry_mut_ref, global_t, val_1, val_2, $t30, $t31, $t32, $t33, $t34, $t35, $t36, $t37, $t38, $t39, $t40, $t41, $t42, $t43, $t44, $t45, $t46, $t47, $t48, $t49, $t50, $t51, $t52, $t53, $t54, $t55, $t56, $t57, $t58, $t59, $t60, $t61, $t62, $t63, $t64, $t65, $t66, $t67, $t68, $t69, $t70, $t71, $t72, $t73, $t74, $t75, $t76, $t77, $t78, $t79, $t80, $t81, $t82, $t83, $t84, $t85, $t86, $t87, $t88, $t89, $t90, $t91, $t92, $t93, $t94, $t95, $t96, $t97, $t98, $t99, $t100, $t101, $t102, $t103
+            let $locals := $Malloc(384)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t40 := 101
+                    $t40 := 101
+                    // abort($t40)
+                    $Abort($t40)
+                }
+                case 4 {
+                    // $t27 := Table::empty<address, Tables::Balance>()
+                    mstore($locals, A2_Table_empty$address_A2_Tables_Balance$())
+                    // $t30 := 3743106036130323098097120681749450326028
+                    $t30 := 3743106036130323098097120681749450326028
+                    // $t31 := 15312706511442230855851857334429569515566
+                    $t31 := 15312706511442230855851857334429569515566
+                    // $t32 := borrow_local($t27)
+                    $t32 := $MakePtr(false, $locals)
+                    // $t33 := 0xab
+                    $t33 := 0xab
+                    // $t0 := $t33
+                    mstore(add($locals, 32), $t33)
+                    // $t34 := borrow_local($t0)
+                    $t34 := $MakePtr(false, add($locals, 32))
+                    // $t35 := pack Tables::Balance($t30)
+                    {
+                        let $mem := $Malloc(32)
+                        $MemoryStoreU256(add($mem, 0), $t30)
+                        $t35 := $mem
+                    }
+                    // Table::insert<address, Tables::Balance>($t32, $t34, $t35)
+                    A2_Table_insert$address_A2_Tables_Balance$($t32, $t34, $t35)
+                    // $t36 := borrow_local($t27)
+                    $t36 := $MakePtr(false, $locals)
+                    // $t37 := 0xab
+                    $t37 := 0xab
+                    // $t18 := $t37
+                    mstore(add($locals, 64), $t37)
+                    // $t38 := borrow_local($t18)
+                    $t38 := $MakePtr(false, add($locals, 64))
+                    // $t39 := Table::contains<address, Tables::Balance>($t36, $t38)
+                    $t39 := A2_Table_contains$address_A2_Tables_Balance$($t36, $t38)
+                    // if ($t39) goto L1 else goto L0
+                    switch $t39
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t41 := borrow_local($t27)
+                    $t41 := $MakePtr(false, $locals)
+                    // $t42 := 0xab
+                    $t42 := 0xab
+                    // $t20 := $t42
+                    mstore(add($locals, 96), $t42)
+                    // $t43 := borrow_local($t20)
+                    $t43 := $MakePtr(false, add($locals, 96))
+                    // $t44 := Table::borrow<address, Tables::Balance>($t41, $t43)
+                    $t44 := A2_Table_borrow$address_A2_Tables_Balance$($t41, $t43)
+                    // $t45 := borrow_field<Tables::Balance>.value($t44)
+                    $t45 := $t44
+                    // $t46 := read_ref($t45)
+                    $t46 := $LoadU256($t45)
+                    // $t47 := ==($t46, $t30)
+                    $t47 := $Eq($t46, $t30)
+                    // if ($t47) goto L4 else goto L3
+                    switch $t47
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t48 := 102
+                    $t48 := 102
+                    // abort($t48)
+                    $Abort($t48)
+                }
+                case 8 {
+                    // label L5
+                    // $t49 := 0x42
+                    $t49 := 0x42
+                    // $t22 := Evm::sign($t49)
+                    mstore(add($locals, 128), A2_Evm_sign($t49))
+                    // $t50 := borrow_local($t22)
+                    $t50 := $MakePtr(false, add($locals, 128))
+                    // $t51 := move($t27)
+                    $t51 := mload($locals)
+                    // $t52 := pack Tables::S<address, Tables::Balance>($t51)
+                    {
+                        let $mem := $Malloc(32)
+                        $MemoryStoreU256(add($mem, 0), $t51)
+                        $t52 := $mem
+                    }
+                    // move_to<Tables::S<address, Tables::Balance>>($t52, $t50)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7dd56ec3, $LoadU256($t50))
+                        if $AlignedStorageLoad($base_offset) {
+                          $AbortBuiltin()
+                        }
+                        $AlignedStorageStore($base_offset, true)
+                        {
+                            let $dst := add($base_offset, 32)
+                            let $src := $t52
+                            $AlignedStorageStore(add($dst, 0), mload(add($src, 0)))
+                            $Free($src, 32)
+                        }
+                    }
+                    // $t53 := 0x42
+                    $t53 := 0x42
+                    // $t54 := borrow_global<Tables::S<address, Tables::Balance>>($t53)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7dd56ec3, $t53)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t54 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t55 := borrow_field<Tables::S<address, Tables::Balance>>.t($t54)
+                    $t55 := $t54
+                    // $t56 := 0xcd
+                    $t56 := 0xcd
+                    // $t23 := $t56
+                    mstore(add($locals, 160), $t56)
+                    // $t57 := borrow_local($t23)
+                    $t57 := $MakePtr(false, add($locals, 160))
+                    // $t58 := pack Tables::Balance($t31)
+                    {
+                        let $mem := $Malloc(32)
+                        $MemoryStoreU256(add($mem, 0), $t31)
+                        $t58 := $mem
+                    }
+                    // Table::insert<address, Tables::Balance>($t55, $t57, $t58)
+                    A2_Table_insert$address_A2_Tables_Balance$($t55, $t57, $t58)
+                    // $t59 := 0xab
+                    $t59 := 0xab
+                    // $t1 := $t59
+                    mstore(add($locals, 192), $t59)
+                    // $t60 := borrow_local($t1)
+                    $t60 := $MakePtr(false, add($locals, 192))
+                    // $t61 := freeze_ref($t55)
+                    $t61 := $t55
+                    // $t62 := Table::borrow<address, Tables::Balance>($t61, $t60)
+                    $t62 := A2_Table_borrow$address_A2_Tables_Balance$($t61, $t60)
+                    // $t63 := borrow_field<Tables::Balance>.value($t62)
+                    $t63 := $t62
+                    // $t64 := read_ref($t63)
+                    $t64 := $LoadU256($t63)
+                    // $t65 := ==($t64, $t30)
+                    $t65 := $Eq($t64, $t30)
+                    // if ($t65) goto L7 else goto L6
+                    switch $t65
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // drop($t55)
+                    // $t66 := 103
+                    $t66 := 103
+                    // abort($t66)
+                    $Abort($t66)
+                }
+                case 11 {
+                    // label L8
+                    // $t67 := 0xcd
+                    $t67 := 0xcd
+                    // $t4 := $t67
+                    mstore(add($locals, 224), $t67)
+                    // $t68 := borrow_local($t4)
+                    $t68 := $MakePtr(false, add($locals, 224))
+                    // $t69 := freeze_ref($t55)
+                    $t69 := $t55
+                    // $t70 := Table::borrow<address, Tables::Balance>($t69, $t68)
+                    $t70 := A2_Table_borrow$address_A2_Tables_Balance$($t69, $t68)
+                    // $t71 := borrow_field<Tables::Balance>.value($t70)
+                    $t71 := $t70
+                    // $t72 := read_ref($t71)
+                    $t72 := $LoadU256($t71)
+                    // $t73 := ==($t72, $t31)
+                    $t73 := $Eq($t72, $t31)
+                    // if ($t73) goto L10 else goto L9
+                    switch $t73
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // drop($t55)
+                    // $t74 := 104
+                    $t74 := 104
+                    // abort($t74)
+                    $Abort($t74)
+                }
+                case 14 {
+                    // label L11
+                    // $t75 := 0xcd
+                    $t75 := 0xcd
+                    // $t7 := $t75
+                    mstore(add($locals, 256), $t75)
+                    // $t76 := borrow_local($t7)
+                    $t76 := $MakePtr(false, add($locals, 256))
+                    // $t77 := Table::borrow_mut<address, Tables::Balance>($t55, $t76)
+                    $t77 := A2_Table_borrow_mut$address_A2_Tables_Balance$($t55, $t76)
+                    // $t78 := borrow_field<Tables::Balance>.value($t77)
+                    $t78 := $t77
+                    // $t79 := read_ref($t78)
+                    $t79 := $LoadU256($t78)
+                    // $t80 := U256::one()
+                    $t80 := A2_U256_one()
+                    // $t81 := -($t79, $t80)
+                    $t81 := $Sub($t79, $t80)
+                    // $t82 := borrow_field<Tables::Balance>.value($t77)
+                    $t82 := $t77
+                    // write_ref($t82, $t81)
+                    $StoreU256($t82, $t81)
+                    // $t83 := 0xcd
+                    $t83 := 0xcd
+                    // $t10 := $t83
+                    mstore(add($locals, 288), $t83)
+                    // $t84 := borrow_local($t10)
+                    $t84 := $MakePtr(false, add($locals, 288))
+                    // $t85 := freeze_ref($t55)
+                    $t85 := $t55
+                    // $t86 := Table::borrow<address, Tables::Balance>($t85, $t84)
+                    $t86 := A2_Table_borrow$address_A2_Tables_Balance$($t85, $t84)
+                    // $t87 := borrow_field<Tables::Balance>.value($t86)
+                    $t87 := $t86
+                    // $t88 := read_ref($t87)
+                    $t88 := $LoadU256($t87)
+                    // $t89 := 15312706511442230855851857334429569515565
+                    $t89 := 15312706511442230855851857334429569515565
+                    // $t90 := ==($t88, $t89)
+                    $t90 := $Eq($t88, $t89)
+                    // if ($t90) goto L13 else goto L12
+                    switch $t90
+                    case 0  { $block := 16 }
+                    default { $block := 15 }
+                }
+                case 15 {
+                    // label L13
+                    // goto L14
+                    $block := 17
+                }
+                case 16 {
+                    // label L12
+                    // drop($t55)
+                    // $t91 := 105
+                    $t91 := 105
+                    // abort($t91)
+                    $Abort($t91)
+                }
+                case 17 {
+                    // label L14
+                    // $t92 := 0xab
+                    $t92 := 0xab
+                    // $t13 := $t92
+                    mstore(add($locals, 320), $t92)
+                    // $t93 := borrow_local($t13)
+                    $t93 := $MakePtr(false, add($locals, 320))
+                    // $t94 := Table::remove<address, Tables::Balance>($t55, $t93)
+                    $t94 := A2_Table_remove$address_A2_Tables_Balance$($t55, $t93)
+                    // $t95 := unpack Tables::Balance($t94)
+                    $t95 := $MemoryLoadU256(add($t94, 0))
+                    $Free($t94, 32)
+                    // $t96 := ==($t95, $t30)
+                    $t96 := $Eq($t95, $t30)
+                    // if ($t96) goto L16 else goto L15
+                    switch $t96
+                    case 0  { $block := 19 }
+                    default { $block := 18 }
+                }
+                case 18 {
+                    // label L16
+                    // goto L17
+                    $block := 20
+                }
+                case 19 {
+                    // label L15
+                    // drop($t55)
+                    // $t97 := 106
+                    $t97 := 106
+                    // abort($t97)
+                    $Abort($t97)
+                }
+                case 20 {
+                    // label L17
+                    // $t98 := 0xab
+                    $t98 := 0xab
+                    // $t15 := $t98
+                    mstore(add($locals, 352), $t98)
+                    // $t99 := borrow_local($t15)
+                    $t99 := $MakePtr(false, add($locals, 352))
+                    // $t100 := freeze_ref($t55)
+                    $t100 := $t55
+                    // $t101 := Table::contains<address, Tables::Balance>($t100, $t99)
+                    $t101 := A2_Table_contains$address_A2_Tables_Balance$($t100, $t99)
+                    // $t102 := !($t101)
+                    $t102 := $LogicalNot($t101)
+                    // if ($t102) goto L19 else goto L18
+                    switch $t102
+                    case 0  { $block := 22 }
+                    default { $block := 21 }
+                }
+                case 21 {
+                    // label L19
+                    // goto L20
+                    $block := 23
+                }
+                case 22 {
+                    // label L18
+                    // $t103 := 107
+                    $t103 := 107
+                    // abort($t103)
+                    $Abort($t103)
+                }
+                case 23 {
+                    // label L20
+                    // return ()
+                    $Free($locals, 384)
+                    leave
+                }
+            }
+        }
+
+        function A2_Table_contains$address_A2_Tables_Balance$(table_ref, key_ref) -> res {
+            let key := $LoadU256(key_ref)
+            let table_handle := $LoadU256(table_ref)
+            let storage_key := $StorageKey(table_handle, key)
+            let word := sload(storage_key)
+            res := $LogicalNot(iszero(word))
+        }
+        function A2_Table_remove$address_A2_Tables_Balance$(table_ref, key_ref) -> value {
+            let key := $LoadU256(key_ref)
+            let table_handle := $LoadU256(table_ref)
+            let storage_key := $StorageKey(table_handle, key)
+            let linked_src := sload(storage_key)
+            if iszero(linked_src) {
+              $AbortBuiltin()
+            }
+            value := $Malloc(32)
+            mstore(add(value, 0), $AlignedStorageLoad(add(linked_src, 0)))
+            $AlignedStorageStore(add(linked_src, 0), 0)
+            $AlignedStorageStore(linked_src, 0)
+            sstore(storage_key, 0)
+        }
+        function A2_Table_borrow$address_A2_Tables_Balance$(table_ref, key_ref) -> value_ref {
+            let key := $LoadU256(key_ref)
+            let table_handle := $LoadU256(table_ref)
+            let storage_key := $StorageKey(table_handle, key)
+            let value_offs := sload(storage_key)
+            if iszero(value_offs) {
+              $AbortBuiltin()
+            }
+            value_ref := $MakePtr(true, value_offs)
+        }
+        function A2_U256_one() -> $result {
+            let $t0
+            // $t0 := 1
+            $t0 := 1
+            // return $t0
+            $result := $t0
+        }
+
+        function A2_Table_borrow_mut$address_A2_Tables_Balance$(table_ref, key_ref) -> value_ref {
+            let key := $LoadU256(key_ref)
+            let table_handle := $LoadU256(table_ref)
+            let storage_key := $StorageKey(table_handle, key)
+            let value_offs := sload(storage_key)
+            if iszero(value_offs) {
+              $AbortBuiltin()
+            }
+            value_ref := $MakePtr(true, value_offs)
+        }
+        function A2_Table_insert$address_A2_Tables_Balance$(table_ref, key_ref, value) {
+            let key := $LoadU256(key_ref)
+            let table_handle := $LoadU256(table_ref)
+            let storage_key := $StorageKey(table_handle, key)
+            let word := sload(storage_key)
+            if $LogicalNot(iszero(word)) {
+              $AbortBuiltin()
+            }
+            let $linked_dst_2739064938 := $NewLinkedStorageBase(0xa342d06a)
+            $AlignedStorageStore(add($linked_dst_2739064938, 0), mload(add(value, 0)))
+            $Free(value, 32)
+            sstore(storage_key, $linked_dst_2739064938)
+        }
+        function A2_Evm_sign(addr) -> signer {
+          signer := addr
+        }
+        function A2_Table_empty$address_A2_Tables_Balance$() -> table {
+            table := $NewTableHandle()
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $NewTableHandle() -> handle {
+          let key := $StorageKey(1, 0)
+          handle := sload(key)
+          if iszero(handle) {
+             // no tables have been allocated in this contract, need to initialize the counter
+             // to the number of storage groups already statically allocated
+             handle := 2
+          }
+          sstore(key, add(handle, 1))
+        }
+
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $Sub(x, y) -> r {
+            if lt(x, y) { $AbortBuiltin() }
+            r := sub(x, y)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of Tables::test_struct: Succeed(Stopped) (used_gas=153416): []
+
+// test of Tables::test_table_of_tables
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_Tables_test_table_of_tables" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_Tables_test_table_of_tables()
+        return (0, 0)
+        function A2_Tables_test_table_of_tables() {
+            let tmp_$2, tmp_$3, tmp_$6, tmp_$7, tmp_$10, tmp_$11, tmp_$12, tmp_$15, tmp_$16, tmp_$19, tmp_$20, tmp_$24, tmp_$25, tmp_$28, tmp_$29, tmp_$32, tmp_$33, tmp_$34, tmp_$37, tmp_$38, tmp_$41, tmp_$43, val_1, val_2, val_3, $t51, $t52, $t53, $t54, $t55, $t56, $t57, $t58, $t59, $t60, $t61, $t62, $t63, $t64, $t65, $t66, $t67, $t68, $t69, $t70, $t71, $t72, $t73, $t74, $t75, $t76, $t77, $t78, $t79, $t80, $t81, $t82, $t83, $t84, $t85, $t86, $t87, $t88, $t89, $t90, $t91, $t92, $t93, $t94, $t95, $t96, $t97, $t98, $t99, $t100, $t101, $t102, $t103, $t104, $t105, $t106, $t107, $t108, $t109, $t110, $t111, $t112, $t113, $t114, $t115, $t116, $t117, $t118, $t119, $t120, $t121, $t122, $t123, $t124, $t125, $t126, $t127, $t128, $t129, $t130, $t131, $t132, $t133, $t134, $t135, $t136, $t137, $t138, $t139, $t140, $t141, $t142, $t143, $t144, $t145, $t146, $t147, $t148, $t149, $t150, $t151
+            let $locals := $Malloc(832)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t75 := 101
+                    $t75 := 101
+                    // abort($t75)
+                    $Abort($t75)
+                }
+                case 4 {
+                    // $t45 := Table::empty<address, Table::Table<address, U256::U256>>()
+                    mstore(add($locals, 128), A2_Table_empty$address_A2_Table_Table$address_A2_U256_U256$$())
+                    // $t51 := 3743106036130323098097120681749450326028
+                    $t51 := 3743106036130323098097120681749450326028
+                    // $t52 := 15312706511442230855851857334429569515566
+                    $t52 := 15312706511442230855851857334429569515566
+                    // $t53 := 26542024619833200150143219379677920493647
+                    $t53 := 26542024619833200150143219379677920493647
+                    // $t46 := Table::empty<address, U256::U256>()
+                    mstore($locals, A2_Table_empty$address_A2_U256_U256$())
+                    // $t54 := borrow_local($t46)
+                    $t54 := $MakePtr(false, $locals)
+                    // $t55 := 0xab
+                    $t55 := 0xab
+                    // $t0 := $t55
+                    mstore(add($locals, 32), $t55)
+                    // $t56 := borrow_local($t0)
+                    $t56 := $MakePtr(false, add($locals, 32))
+                    // Table::insert<address, U256::U256>($t54, $t56, $t51)
+                    A2_Table_insert$address_A2_U256_U256$($t54, $t56, $t51)
+                    // $t47 := Table::empty<address, U256::U256>()
+                    mstore(add($locals, 64), A2_Table_empty$address_A2_U256_U256$())
+                    // $t57 := borrow_local($t47)
+                    $t57 := $MakePtr(false, add($locals, 64))
+                    // $t58 := 0xcd
+                    $t58 := 0xcd
+                    // $t22 := $t58
+                    mstore(add($locals, 96), $t58)
+                    // $t59 := borrow_local($t22)
+                    $t59 := $MakePtr(false, add($locals, 96))
+                    // Table::insert<address, U256::U256>($t57, $t59, $t52)
+                    A2_Table_insert$address_A2_U256_U256$($t57, $t59, $t52)
+                    // $t60 := borrow_local($t45)
+                    $t60 := $MakePtr(false, add($locals, 128))
+                    // $t61 := 0x12
+                    $t61 := 0x12
+                    // $t40 := $t61
+                    mstore(add($locals, 160), $t61)
+                    // $t62 := borrow_local($t40)
+                    $t62 := $MakePtr(false, add($locals, 160))
+                    // $t63 := move($t46)
+                    $t63 := mload($locals)
+                    // Table::insert<address, Table::Table<address, U256::U256>>($t60, $t62, $t63)
+                    A2_Table_insert$address_A2_Table_Table$address_A2_U256_U256$$($t60, $t62, $t63)
+                    // $t64 := borrow_local($t45)
+                    $t64 := $MakePtr(false, add($locals, 128))
+                    // $t65 := 0x34
+                    $t65 := 0x34
+                    // $t42 := $t65
+                    mstore(add($locals, 192), $t65)
+                    // $t66 := borrow_local($t42)
+                    $t66 := $MakePtr(false, add($locals, 192))
+                    // $t67 := move($t47)
+                    $t67 := mload(add($locals, 64))
+                    // Table::insert<address, Table::Table<address, U256::U256>>($t64, $t66, $t67)
+                    A2_Table_insert$address_A2_Table_Table$address_A2_U256_U256$$($t64, $t66, $t67)
+                    // $t68 := borrow_local($t45)
+                    $t68 := $MakePtr(false, add($locals, 128))
+                    // $t69 := 0x12
+                    $t69 := 0x12
+                    // $t1 := $t69
+                    mstore(add($locals, 224), $t69)
+                    // $t70 := borrow_local($t1)
+                    $t70 := $MakePtr(false, add($locals, 224))
+                    // $t71 := Table::borrow<address, Table::Table<address, U256::U256>>($t68, $t70)
+                    $t71 := A2_Table_borrow$address_A2_Table_Table$address_A2_U256_U256$$($t68, $t70)
+                    // $t72 := 0xab
+                    $t72 := 0xab
+                    // $t44 := $t72
+                    mstore(add($locals, 256), $t72)
+                    // $t73 := borrow_local($t44)
+                    $t73 := $MakePtr(false, add($locals, 256))
+                    // $t74 := Table::contains<address, U256::U256>($t71, $t73)
+                    $t74 := A2_Table_contains$address_A2_U256_U256$($t71, $t73)
+                    // if ($t74) goto L1 else goto L0
+                    switch $t74
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t76 := borrow_local($t45)
+                    $t76 := $MakePtr(false, add($locals, 128))
+                    // $t77 := 0x34
+                    $t77 := 0x34
+                    // $t5 := $t77
+                    mstore(add($locals, 288), $t77)
+                    // $t78 := borrow_local($t5)
+                    $t78 := $MakePtr(false, add($locals, 288))
+                    // $t79 := Table::borrow<address, Table::Table<address, U256::U256>>($t76, $t78)
+                    $t79 := A2_Table_borrow$address_A2_Table_Table$address_A2_U256_U256$$($t76, $t78)
+                    // $t80 := 0xcd
+                    $t80 := 0xcd
+                    // $t4 := $t80
+                    mstore(add($locals, 320), $t80)
+                    // $t81 := borrow_local($t4)
+                    $t81 := $MakePtr(false, add($locals, 320))
+                    // $t82 := Table::contains<address, U256::U256>($t79, $t81)
+                    $t82 := A2_Table_contains$address_A2_U256_U256$($t79, $t81)
+                    // if ($t82) goto L4 else goto L3
+                    switch $t82
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t83 := 102
+                    $t83 := 102
+                    // abort($t83)
+                    $Abort($t83)
+                }
+                case 8 {
+                    // label L5
+                    // $t84 := borrow_local($t45)
+                    $t84 := $MakePtr(false, add($locals, 128))
+                    // $t85 := 0x12
+                    $t85 := 0x12
+                    // $t9 := $t85
+                    mstore(add($locals, 352), $t85)
+                    // $t86 := borrow_local($t9)
+                    $t86 := $MakePtr(false, add($locals, 352))
+                    // $t87 := Table::borrow<address, Table::Table<address, U256::U256>>($t84, $t86)
+                    $t87 := A2_Table_borrow$address_A2_Table_Table$address_A2_U256_U256$$($t84, $t86)
+                    // $t88 := 0xab
+                    $t88 := 0xab
+                    // $t8 := $t88
+                    mstore(add($locals, 384), $t88)
+                    // $t89 := borrow_local($t8)
+                    $t89 := $MakePtr(false, add($locals, 384))
+                    // $t90 := Table::borrow<address, U256::U256>($t87, $t89)
+                    $t90 := A2_Table_borrow$address_A2_U256_U256$($t87, $t89)
+                    // $t91 := read_ref($t90)
+                    $t91 := $LoadU256($t90)
+                    // $t92 := ==($t91, $t51)
+                    $t92 := $Eq($t91, $t51)
+                    // if ($t92) goto L7 else goto L6
+                    switch $t92
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t93 := 103
+                    $t93 := 103
+                    // abort($t93)
+                    $Abort($t93)
+                }
+                case 11 {
+                    // label L8
+                    // $t94 := borrow_local($t45)
+                    $t94 := $MakePtr(false, add($locals, 128))
+                    // $t95 := 0x34
+                    $t95 := 0x34
+                    // $t14 := $t95
+                    mstore(add($locals, 416), $t95)
+                    // $t96 := borrow_local($t14)
+                    $t96 := $MakePtr(false, add($locals, 416))
+                    // $t97 := Table::borrow<address, Table::Table<address, U256::U256>>($t94, $t96)
+                    $t97 := A2_Table_borrow$address_A2_Table_Table$address_A2_U256_U256$$($t94, $t96)
+                    // $t98 := 0xcd
+                    $t98 := 0xcd
+                    // $t13 := $t98
+                    mstore(add($locals, 448), $t98)
+                    // $t99 := borrow_local($t13)
+                    $t99 := $MakePtr(false, add($locals, 448))
+                    // $t100 := Table::borrow<address, U256::U256>($t97, $t99)
+                    $t100 := A2_Table_borrow$address_A2_U256_U256$($t97, $t99)
+                    // $t101 := read_ref($t100)
+                    $t101 := $LoadU256($t100)
+                    // $t102 := ==($t101, $t52)
+                    $t102 := $Eq($t101, $t52)
+                    // if ($t102) goto L10 else goto L9
+                    switch $t102
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t103 := 104
+                    $t103 := 104
+                    // abort($t103)
+                    $Abort($t103)
+                }
+                case 14 {
+                    // label L11
+                    // $t104 := borrow_local($t45)
+                    $t104 := $MakePtr(false, add($locals, 128))
+                    // $t105 := 0x12
+                    $t105 := 0x12
+                    // $t18 := $t105
+                    mstore(add($locals, 480), $t105)
+                    // $t106 := borrow_local($t18)
+                    $t106 := $MakePtr(false, add($locals, 480))
+                    // $t107 := Table::borrow_mut<address, Table::Table<address, U256::U256>>($t104, $t106)
+                    $t107 := A2_Table_borrow_mut$address_A2_Table_Table$address_A2_U256_U256$$($t104, $t106)
+                    // $t108 := 0xef
+                    $t108 := 0xef
+                    // $t17 := $t108
+                    mstore(add($locals, 512), $t108)
+                    // $t109 := borrow_local($t17)
+                    $t109 := $MakePtr(false, add($locals, 512))
+                    // Table::insert<address, U256::U256>($t107, $t109, $t53)
+                    A2_Table_insert$address_A2_U256_U256$($t107, $t109, $t53)
+                    // $t110 := borrow_local($t45)
+                    $t110 := $MakePtr(false, add($locals, 128))
+                    // $t111 := 0x12
+                    $t111 := 0x12
+                    // $t23 := $t111
+                    mstore(add($locals, 544), $t111)
+                    // $t112 := borrow_local($t23)
+                    $t112 := $MakePtr(false, add($locals, 544))
+                    // $t113 := Table::borrow<address, Table::Table<address, U256::U256>>($t110, $t112)
+                    $t113 := A2_Table_borrow$address_A2_Table_Table$address_A2_U256_U256$$($t110, $t112)
+                    // $t114 := 0xef
+                    $t114 := 0xef
+                    // $t21 := $t114
+                    mstore(add($locals, 576), $t114)
+                    // $t115 := borrow_local($t21)
+                    $t115 := $MakePtr(false, add($locals, 576))
+                    // $t116 := Table::borrow<address, U256::U256>($t113, $t115)
+                    $t116 := A2_Table_borrow$address_A2_U256_U256$($t113, $t115)
+                    // $t117 := read_ref($t116)
+                    $t117 := $LoadU256($t116)
+                    // $t118 := ==($t117, $t53)
+                    $t118 := $Eq($t117, $t53)
+                    // if ($t118) goto L13 else goto L12
+                    switch $t118
+                    case 0  { $block := 16 }
+                    default { $block := 15 }
+                }
+                case 15 {
+                    // label L13
+                    // goto L14
+                    $block := 17
+                }
+                case 16 {
+                    // label L12
+                    // $t119 := 105
+                    $t119 := 105
+                    // abort($t119)
+                    $Abort($t119)
+                }
+                case 17 {
+                    // label L14
+                    // $t120 := borrow_local($t45)
+                    $t120 := $MakePtr(false, add($locals, 128))
+                    // $t121 := 0x12
+                    $t121 := 0x12
+                    // $t27 := $t121
+                    mstore(add($locals, 608), $t121)
+                    // $t122 := borrow_local($t27)
+                    $t122 := $MakePtr(false, add($locals, 608))
+                    // $t123 := Table::borrow<address, Table::Table<address, U256::U256>>($t120, $t122)
+                    $t123 := A2_Table_borrow$address_A2_Table_Table$address_A2_U256_U256$$($t120, $t122)
+                    // $t124 := 0xab
+                    $t124 := 0xab
+                    // $t26 := $t124
+                    mstore(add($locals, 640), $t124)
+                    // $t125 := borrow_local($t26)
+                    $t125 := $MakePtr(false, add($locals, 640))
+                    // $t126 := Table::borrow<address, U256::U256>($t123, $t125)
+                    $t126 := A2_Table_borrow$address_A2_U256_U256$($t123, $t125)
+                    // $t127 := read_ref($t126)
+                    $t127 := $LoadU256($t126)
+                    // $t128 := ==($t127, $t51)
+                    $t128 := $Eq($t127, $t51)
+                    // if ($t128) goto L16 else goto L15
+                    switch $t128
+                    case 0  { $block := 19 }
+                    default { $block := 18 }
+                }
+                case 18 {
+                    // label L16
+                    // goto L17
+                    $block := 20
+                }
+                case 19 {
+                    // label L15
+                    // $t129 := 106
+                    $t129 := 106
+                    // abort($t129)
+                    $Abort($t129)
+                }
+                case 20 {
+                    // label L17
+                    // $t130 := borrow_local($t45)
+                    $t130 := $MakePtr(false, add($locals, 128))
+                    // $t131 := 0x34
+                    $t131 := 0x34
+                    // $t31 := $t131
+                    mstore(add($locals, 672), $t131)
+                    // $t132 := borrow_local($t31)
+                    $t132 := $MakePtr(false, add($locals, 672))
+                    // $t133 := Table::borrow_mut<address, Table::Table<address, U256::U256>>($t130, $t132)
+                    $t133 := A2_Table_borrow_mut$address_A2_Table_Table$address_A2_U256_U256$$($t130, $t132)
+                    // $t134 := 0xcd
+                    $t134 := 0xcd
+                    // $t30 := $t134
+                    mstore(add($locals, 704), $t134)
+                    // $t135 := borrow_local($t30)
+                    $t135 := $MakePtr(false, add($locals, 704))
+                    // $t136 := Table::remove<address, U256::U256>($t133, $t135)
+                    $t136 := A2_Table_remove$address_A2_U256_U256$($t133, $t135)
+                    // $t137 := ==($t136, $t52)
+                    $t137 := $Eq($t136, $t52)
+                    // if ($t137) goto L19 else goto L18
+                    switch $t137
+                    case 0  { $block := 22 }
+                    default { $block := 21 }
+                }
+                case 21 {
+                    // label L19
+                    // goto L20
+                    $block := 23
+                }
+                case 22 {
+                    // label L18
+                    // $t138 := 107
+                    $t138 := 107
+                    // abort($t138)
+                    $Abort($t138)
+                }
+                case 23 {
+                    // label L20
+                    // $t139 := borrow_local($t45)
+                    $t139 := $MakePtr(false, add($locals, 128))
+                    // $t140 := 0x34
+                    $t140 := 0x34
+                    // $t36 := $t140
+                    mstore(add($locals, 736), $t140)
+                    // $t141 := borrow_local($t36)
+                    $t141 := $MakePtr(false, add($locals, 736))
+                    // $t142 := Table::borrow<address, Table::Table<address, U256::U256>>($t139, $t141)
+                    $t142 := A2_Table_borrow$address_A2_Table_Table$address_A2_U256_U256$$($t139, $t141)
+                    // $t143 := 0xcd
+                    $t143 := 0xcd
+                    // $t35 := $t143
+                    mstore(add($locals, 768), $t143)
+                    // $t144 := borrow_local($t35)
+                    $t144 := $MakePtr(false, add($locals, 768))
+                    // $t145 := Table::contains<address, U256::U256>($t142, $t144)
+                    $t145 := A2_Table_contains$address_A2_U256_U256$($t142, $t144)
+                    // $t146 := !($t145)
+                    $t146 := $LogicalNot($t145)
+                    // if ($t146) goto L22 else goto L21
+                    switch $t146
+                    case 0  { $block := 25 }
+                    default { $block := 24 }
+                }
+                case 24 {
+                    // label L22
+                    // goto L23
+                    $block := 26
+                }
+                case 25 {
+                    // label L21
+                    // $t147 := 108
+                    $t147 := 108
+                    // abort($t147)
+                    $Abort($t147)
+                }
+                case 26 {
+                    // label L23
+                    // $t148 := 0x42
+                    $t148 := 0x42
+                    // $t39 := Evm::sign($t148)
+                    mstore(add($locals, 800), A2_Evm_sign($t148))
+                    // $t149 := borrow_local($t39)
+                    $t149 := $MakePtr(false, add($locals, 800))
+                    // $t150 := move($t45)
+                    $t150 := mload(add($locals, 128))
+                    // $t151 := pack Tables::S<address, Table::Table<address, U256::U256>>($t150)
+                    {
+                        let $mem := $Malloc(32)
+                        $MemoryStoreU256(add($mem, 0), $t150)
+                        $t151 := $mem
+                    }
+                    // move_to<Tables::S<address, Table::Table<address, U256::U256>>>($t151, $t149)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0xc5110c9a, $LoadU256($t149))
+                        if $AlignedStorageLoad($base_offset) {
+                          $AbortBuiltin()
+                        }
+                        $AlignedStorageStore($base_offset, true)
+                        {
+                            let $dst := add($base_offset, 32)
+                            let $src := $t151
+                            $AlignedStorageStore(add($dst, 0), mload(add($src, 0)))
+                            $Free($src, 32)
+                        }
+                    }
+                    // return ()
+                    $Free($locals, 832)
+                    leave
+                }
+            }
+        }
+
+        function A2_Evm_sign(addr) -> signer {
+          signer := addr
+        }
+        function A2_Table_contains$address_A2_U256_U256$(table_ref, key_ref) -> res {
+            let key := $LoadU256(key_ref)
+            let table_handle := $LoadU256(table_ref)
+            let storage_key := $StorageKey(table_handle, key)
+            let word := sload(storage_key)
+            res := $LogicalNot(iszero(word))
+        }
+        function A2_Table_borrow$address_A2_Table_Table$address_A2_U256_U256$$(table_ref, key_ref) -> value_ref {
+            let key := $LoadU256(key_ref)
+            let table_handle := $LoadU256(table_ref)
+            let storage_key := $StorageKey(table_handle, key)
+            let value_offs := sload(storage_key)
+            if iszero(value_offs) {
+              $AbortBuiltin()
+            }
+            value_ref := $MakePtr(true, value_offs)
+        }
+        function A2_Table_remove$address_A2_U256_U256$(table_ref, key_ref) -> value {
+            let key := $LoadU256(key_ref)
+            let table_handle := $LoadU256(table_ref)
+            let storage_key := $StorageKey(table_handle, key)
+            let linked_src := sload(storage_key)
+            if iszero(linked_src) {
+              $AbortBuiltin()
+            }
+            value := $StorageLoadU256(linked_src)
+            $AlignedStorageStore(linked_src, 0)
+            sstore(storage_key, 0)
+        }
+        function A2_Table_borrow_mut$address_A2_Table_Table$address_A2_U256_U256$$(table_ref, key_ref) -> value_ref {
+            let key := $LoadU256(key_ref)
+            let table_handle := $LoadU256(table_ref)
+            let storage_key := $StorageKey(table_handle, key)
+            let value_offs := sload(storage_key)
+            if iszero(value_offs) {
+              $AbortBuiltin()
+            }
+            value_ref := $MakePtr(true, value_offs)
+        }
+        function A2_Table_borrow$address_A2_U256_U256$(table_ref, key_ref) -> value_ref {
+            let key := $LoadU256(key_ref)
+            let table_handle := $LoadU256(table_ref)
+            let storage_key := $StorageKey(table_handle, key)
+            let value_offs := sload(storage_key)
+            if iszero(value_offs) {
+              $AbortBuiltin()
+            }
+            value_ref := $MakePtr(true, value_offs)
+        }
+        function A2_Table_insert$address_A2_U256_U256$(table_ref, key_ref, value) {
+            let key := $LoadU256(key_ref)
+            let table_handle := $LoadU256(table_ref)
+            let storage_key := $StorageKey(table_handle, key)
+            let word := sload(storage_key)
+            if $LogicalNot(iszero(word)) {
+              $AbortBuiltin()
+            }
+            let $linked_dst_2934085429 := $NewLinkedStorageBase(0xaee29735)
+            $StorageStoreU256($linked_dst_2934085429, value)
+            sstore(storage_key, $linked_dst_2934085429)
+        }
+        function A2_Table_insert$address_A2_Table_Table$address_A2_U256_U256$$(table_ref, key_ref, value) {
+            let key := $LoadU256(key_ref)
+            let table_handle := $LoadU256(table_ref)
+            let storage_key := $StorageKey(table_handle, key)
+            let word := sload(storage_key)
+            if $LogicalNot(iszero(word)) {
+              $AbortBuiltin()
+            }
+            let $linked_dst_3228464714 := $NewLinkedStorageBase(0xc06e764a)
+            $StorageStoreU256($linked_dst_3228464714, value)
+            sstore(storage_key, $linked_dst_3228464714)
+        }
+        function A2_Table_empty$address_A2_U256_U256$() -> table {
+            table := $NewTableHandle()
+        }
+        function A2_Table_empty$address_A2_Table_Table$address_A2_U256_U256$$() -> table {
+            table := $NewTableHandle()
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $NewTableHandle() -> handle {
+          let key := $StorageKey(1, 0)
+          handle := sload(key)
+          if iszero(handle) {
+             // no tables have been allocated in this contract, need to initialize the counter
+             // to the number of storage groups already statically allocated
+             handle := 2
+          }
+          sstore(key, add(handle, 1))
+        }
+
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of Tables::test_table_of_tables: Succeed(Stopped) (used_gas=292670): []
+
+// test of Tables::test_u256
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_Tables_test_u256" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_Tables_test_u256()
+        return (0, 0)
+        function A2_Tables_test_u256() {
+            let entry_mut_ref, val_1, val_2, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32, $t33, $t34
+            let $locals := $Malloc(96)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t14 := 101
+                    $t14 := 101
+                    // abort($t14)
+                    $Abort($t14)
+                }
+                case 4 {
+                    // $t3 := Table::empty<U256::U256, U256::U256>()
+                    mstore($locals, A2_Table_empty$A2_U256_U256_A2_U256_U256$())
+                    // $t6 := 26542024619833200150143219379677920493647
+                    $t6 := 26542024619833200150143219379677920493647
+                    // $t2 := $t6
+                    mstore(add($locals, 32), $t6)
+                    // $t7 := 3743106036130323098097120681749450326028
+                    $t7 := 3743106036130323098097120681749450326028
+                    // $t8 := 15312706511442230855851857334429569515566
+                    $t8 := 15312706511442230855851857334429569515566
+                    // $t9 := borrow_local($t3)
+                    $t9 := $MakePtr(false, $locals)
+                    // $t10 := borrow_local($t2)
+                    $t10 := $MakePtr(false, add($locals, 32))
+                    // Table::insert<U256::U256, U256::U256>($t9, $t10, $t7)
+                    A2_Table_insert$A2_U256_U256_A2_U256_U256$($t9, $t10, $t7)
+                    // $t11 := borrow_local($t3)
+                    $t11 := $MakePtr(false, $locals)
+                    // $t12 := borrow_local($t2)
+                    $t12 := $MakePtr(false, add($locals, 32))
+                    // $t13 := Table::contains<U256::U256, U256::U256>($t11, $t12)
+                    $t13 := A2_Table_contains$A2_U256_U256_A2_U256_U256$($t11, $t12)
+                    // if ($t13) goto L1 else goto L0
+                    switch $t13
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t15 := borrow_local($t3)
+                    $t15 := $MakePtr(false, $locals)
+                    // $t16 := borrow_local($t2)
+                    $t16 := $MakePtr(false, add($locals, 32))
+                    // $t17 := Table::borrow<U256::U256, U256::U256>($t15, $t16)
+                    $t17 := A2_Table_borrow$A2_U256_U256_A2_U256_U256$($t15, $t16)
+                    // $t18 := read_ref($t17)
+                    $t18 := $LoadU256($t17)
+                    // $t19 := 3743106036130323098097120681749450326028
+                    $t19 := 3743106036130323098097120681749450326028
+                    // $t20 := ==($t18, $t19)
+                    $t20 := $Eq($t18, $t19)
+                    // if ($t20) goto L4 else goto L3
+                    switch $t20
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t21 := 102
+                    $t21 := 102
+                    // abort($t21)
+                    $Abort($t21)
+                }
+                case 8 {
+                    // label L5
+                    // $t22 := borrow_local($t3)
+                    $t22 := $MakePtr(false, $locals)
+                    // $t23 := borrow_local($t2)
+                    $t23 := $MakePtr(false, add($locals, 32))
+                    // $t24 := Table::borrow_mut<U256::U256, U256::U256>($t22, $t23)
+                    $t24 := A2_Table_borrow_mut$A2_U256_U256_A2_U256_U256$($t22, $t23)
+                    // write_ref($t24, $t8)
+                    $StoreU256($t24, $t8)
+                    // $t25 := borrow_local($t3)
+                    $t25 := $MakePtr(false, $locals)
+                    // $t26 := borrow_local($t2)
+                    $t26 := $MakePtr(false, add($locals, 32))
+                    // $t27 := Table::borrow<U256::U256, U256::U256>($t25, $t26)
+                    $t27 := A2_Table_borrow$A2_U256_U256_A2_U256_U256$($t25, $t26)
+                    // $t28 := read_ref($t27)
+                    $t28 := $LoadU256($t27)
+                    // $t29 := ==($t28, $t8)
+                    $t29 := $Eq($t28, $t8)
+                    // if ($t29) goto L7 else goto L6
+                    switch $t29
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t30 := 103
+                    $t30 := 103
+                    // abort($t30)
+                    $Abort($t30)
+                }
+                case 11 {
+                    // label L8
+                    // $t31 := 0x42
+                    $t31 := 0x42
+                    // $t0 := Evm::sign($t31)
+                    mstore(add($locals, 64), A2_Evm_sign($t31))
+                    // $t32 := borrow_local($t0)
+                    $t32 := $MakePtr(false, add($locals, 64))
+                    // $t33 := move($t3)
+                    $t33 := mload($locals)
+                    // $t34 := pack Tables::S<U256::U256, U256::U256>($t33)
+                    {
+                        let $mem := $Malloc(32)
+                        $MemoryStoreU256(add($mem, 0), $t33)
+                        $t34 := $mem
+                    }
+                    // move_to<Tables::S<U256::U256, U256::U256>>($t34, $t32)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0xa20c17a3, $LoadU256($t32))
+                        if $AlignedStorageLoad($base_offset) {
+                          $AbortBuiltin()
+                        }
+                        $AlignedStorageStore($base_offset, true)
+                        {
+                            let $dst := add($base_offset, 32)
+                            let $src := $t34
+                            $AlignedStorageStore(add($dst, 0), mload(add($src, 0)))
+                            $Free($src, 32)
+                        }
+                    }
+                    // return ()
+                    $Free($locals, 96)
+                    leave
+                }
+            }
+        }
+
+        function A2_Evm_sign(addr) -> signer {
+          signer := addr
+        }
+        function A2_Table_borrow$A2_U256_U256_A2_U256_U256$(table_ref, key_ref) -> value_ref {
+            let key := $LoadU256(key_ref)
+            let table_handle := $LoadU256(table_ref)
+            let storage_key := $StorageKey(table_handle, key)
+            let value_offs := sload(storage_key)
+            if iszero(value_offs) {
+              $AbortBuiltin()
+            }
+            value_ref := $MakePtr(true, value_offs)
+        }
+        function A2_Table_borrow_mut$A2_U256_U256_A2_U256_U256$(table_ref, key_ref) -> value_ref {
+            let key := $LoadU256(key_ref)
+            let table_handle := $LoadU256(table_ref)
+            let storage_key := $StorageKey(table_handle, key)
+            let value_offs := sload(storage_key)
+            if iszero(value_offs) {
+              $AbortBuiltin()
+            }
+            value_ref := $MakePtr(true, value_offs)
+        }
+        function A2_Table_contains$A2_U256_U256_A2_U256_U256$(table_ref, key_ref) -> res {
+            let key := $LoadU256(key_ref)
+            let table_handle := $LoadU256(table_ref)
+            let storage_key := $StorageKey(table_handle, key)
+            let word := sload(storage_key)
+            res := $LogicalNot(iszero(word))
+        }
+        function A2_Table_insert$A2_U256_U256_A2_U256_U256$(table_ref, key_ref, value) {
+            let key := $LoadU256(key_ref)
+            let table_handle := $LoadU256(table_ref)
+            let storage_key := $StorageKey(table_handle, key)
+            let word := sload(storage_key)
+            if $LogicalNot(iszero(word)) {
+              $AbortBuiltin()
+            }
+            let $linked_dst_2934085429 := $NewLinkedStorageBase(0xaee29735)
+            $StorageStoreU256($linked_dst_2934085429, value)
+            sstore(storage_key, $linked_dst_2934085429)
+        }
+        function A2_Table_empty$A2_U256_U256_A2_U256_U256$() -> table {
+            table := $NewTableHandle()
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $NewTableHandle() -> handle {
+          let key := $StorageKey(1, 0)
+          handle := sload(key)
+          if iszero(handle) {
+             // no tables have been allocated in this contract, need to initialize the counter
+             // to the number of storage groups already statically allocated
+             handle := 2
+          }
+          sstore(key, add(handle, 1))
+        }
+
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of Tables::test_u256: Succeed(Stopped) (used_gas=137855): []
+
+// test of Tables::test_vector
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_Tables_test_vector" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_Tables_test_vector()
+        return (0, 0)
+        function A2_Tables_test_vector() {
+            let tmp_$1, tmp_$4, tmp_$6, tmp_$8, tmp_$10, tmp_$11, tmp_$13, tmp_$15, tmp_$17, tmp_$19, s, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32, $t33, $t34, $t35, $t36, $t37, $t38, $t39, $t40, $t41, $t42, $t43, $t44, $t45, $t46, $t47, $t48, $t49, $t50, $t51, $t52, $t53, $t54, $t55, $t56, $t57, $t58, $t59, $t60, $t61, $t62, $t63, $t64, $t65, $t66, $t67, $t68, $t69, $t70, $t71, $t72, $t73, $t74, $t75, $t76, $t77, $t78, $t79, $t80, $t81, $t82, $t83, $t84, $t85, $t86, $t87, $t88, $t89, $t90, $t91, $t92, $t93, $t94, $t95, $t96, $t97, $t98, $t99, $t100, $t101, $t102, $t103, $t104, $t105, $t106, $t107, $t108, $t109, $t110, $t111, $t112, $t113, $t114
+            let $locals := $Malloc(416)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t33 := 101
+                    $t33 := 101
+                    // abort($t33)
+                    $Abort($t33)
+                }
+                case 4 {
+                    // $t22 := Table::empty<u8, vector<address>>()
+                    mstore($locals, A2_Table_empty$u8_vec$address$$())
+                    // $t24 := borrow_local($t22)
+                    $t24 := $MakePtr(false, $locals)
+                    // $t25 := 42
+                    $t25 := 42
+                    // $t0 := $t25
+                    mstore(add($locals, 32), $t25)
+                    // $t26 := borrow_local($t0)
+                    $t26 := $MakePtr(false, add($locals, 63))
+                    // $t27 := 0x1012
+                    $t27 := 0x1012
+                    // $t28 := vector::singleton<address>($t27)
+                    $t28 := A1_vector_singleton$address$($t27)
+                    // Table::insert<u8, vector<address>>($t24, $t26, $t28)
+                    A2_Table_insert$u8_vec$address$$($t24, $t26, $t28)
+                    // $t29 := borrow_local($t22)
+                    $t29 := $MakePtr(false, $locals)
+                    // $t30 := 42
+                    $t30 := 42
+                    // $t14 := $t30
+                    mstore(add($locals, 64), $t30)
+                    // $t31 := borrow_local($t14)
+                    $t31 := $MakePtr(false, add($locals, 95))
+                    // $t32 := Table::contains<u8, vector<address>>($t29, $t31)
+                    $t32 := A2_Table_contains$u8_vec$address$$($t29, $t31)
+                    // if ($t32) goto L1 else goto L0
+                    switch $t32
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t34 := borrow_local($t22)
+                    $t34 := $MakePtr(false, $locals)
+                    // $t35 := 0
+                    $t35 := 0
+                    // $t16 := $t35
+                    mstore(add($locals, 96), $t35)
+                    // $t36 := borrow_local($t16)
+                    $t36 := $MakePtr(false, add($locals, 127))
+                    // $t37 := Table::contains<u8, vector<address>>($t34, $t36)
+                    $t37 := A2_Table_contains$u8_vec$address$$($t34, $t36)
+                    // $t38 := !($t37)
+                    $t38 := $LogicalNot($t37)
+                    // if ($t38) goto L4 else goto L3
+                    switch $t38
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t39 := 102
+                    $t39 := 102
+                    // abort($t39)
+                    $Abort($t39)
+                }
+                case 8 {
+                    // label L5
+                    // $t40 := borrow_local($t22)
+                    $t40 := $MakePtr(false, $locals)
+                    // $t41 := 42
+                    $t41 := 42
+                    // $t18 := $t41
+                    mstore(add($locals, 128), $t41)
+                    // $t42 := borrow_local($t18)
+                    $t42 := $MakePtr(false, add($locals, 159))
+                    // $t43 := Table::borrow<u8, vector<address>>($t40, $t42)
+                    $t43 := A2_Table_borrow$u8_vec$address$$($t40, $t42)
+                    // $t44 := vector::length<address>($t43)
+                    $t44 := A1_vector_length$address$($t43)
+                    // $t45 := 1
+                    $t45 := 1
+                    // $t46 := ==($t44, $t45)
+                    $t46 := $Eq($t44, $t45)
+                    // if ($t46) goto L7 else goto L6
+                    switch $t46
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t47 := 103
+                    $t47 := 103
+                    // abort($t47)
+                    $Abort($t47)
+                }
+                case 11 {
+                    // label L8
+                    // $t48 := borrow_local($t22)
+                    $t48 := $MakePtr(false, $locals)
+                    // $t49 := 42
+                    $t49 := 42
+                    // $t20 := $t49
+                    mstore(add($locals, 160), $t49)
+                    // $t50 := borrow_local($t20)
+                    $t50 := $MakePtr(false, add($locals, 191))
+                    // $t51 := Table::borrow<u8, vector<address>>($t48, $t50)
+                    $t51 := A2_Table_borrow$u8_vec$address$$($t48, $t50)
+                    // $t52 := 0
+                    $t52 := 0
+                    // $t53 := vector::borrow<address>($t51, $t52)
+                    $t53 := A1_vector_borrow$address$($t51, $t52)
+                    // $t54 := read_ref($t53)
+                    $t54 := $LoadU256($t53)
+                    // $t55 := 0x1012
+                    $t55 := 0x1012
+                    // $t56 := ==($t54, $t55)
+                    $t56 := $Eq($t54, $t55)
+                    // if ($t56) goto L10 else goto L9
+                    switch $t56
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t57 := 104
+                    $t57 := 104
+                    // abort($t57)
+                    $Abort($t57)
+                }
+                case 14 {
+                    // label L11
+                    // $t58 := 0x42
+                    $t58 := 0x42
+                    // $t2 := Evm::sign($t58)
+                    mstore(add($locals, 192), A2_Evm_sign($t58))
+                    // $t59 := borrow_local($t2)
+                    $t59 := $MakePtr(false, add($locals, 192))
+                    // $t60 := move($t22)
+                    $t60 := mload($locals)
+                    // $t61 := pack Tables::S<u8, vector<address>>($t60)
+                    {
+                        let $mem := $Malloc(32)
+                        $MemoryStoreU256(add($mem, 0), $t60)
+                        $t61 := $mem
+                    }
+                    // move_to<Tables::S<u8, vector<address>>>($t61, $t59)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0xa0362133, $LoadU256($t59))
+                        if $AlignedStorageLoad($base_offset) {
+                          $AbortBuiltin()
+                        }
+                        $AlignedStorageStore($base_offset, true)
+                        {
+                            let $dst := add($base_offset, 32)
+                            let $src := $t61
+                            $AlignedStorageStore(add($dst, 0), mload(add($src, 0)))
+                            $Free($src, 32)
+                        }
+                    }
+                    // $t62 := 0x42
+                    $t62 := 0x42
+                    // $t63 := borrow_global<Tables::S<u8, vector<address>>>($t62)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0xa0362133, $t62)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t63 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t64 := borrow_field<Tables::S<u8, vector<address>>>.t($t63)
+                    $t64 := $t63
+                    // $t65 := 42
+                    $t65 := 42
+                    // $t3 := $t65
+                    mstore(add($locals, 224), $t65)
+                    // $t66 := borrow_local($t3)
+                    $t66 := $MakePtr(false, add($locals, 255))
+                    // $t67 := Table::borrow_mut<u8, vector<address>>($t64, $t66)
+                    $t67 := A2_Table_borrow_mut$u8_vec$address$$($t64, $t66)
+                    // $t68 := 0x1013
+                    $t68 := 0x1013
+                    // vector::push_back<address>($t67, $t68)
+                    A1_vector_push_back$address$($t67, $t68)
+                    // $t69 := borrow_field<Tables::S<u8, vector<address>>>.t($t63)
+                    $t69 := $t63
+                    // $t70 := 42
+                    $t70 := 42
+                    // $t5 := $t70
+                    mstore(add($locals, 256), $t70)
+                    // $t71 := borrow_local($t5)
+                    $t71 := $MakePtr(false, add($locals, 287))
+                    // $t72 := Table::borrow<u8, vector<address>>($t69, $t71)
+                    $t72 := A2_Table_borrow$u8_vec$address$$($t69, $t71)
+                    // $t73 := vector::length<address>($t72)
+                    $t73 := A1_vector_length$address$($t72)
+                    // $t74 := 2
+                    $t74 := 2
+                    // $t75 := ==($t73, $t74)
+                    $t75 := $Eq($t73, $t74)
+                    // if ($t75) goto L13 else goto L12
+                    switch $t75
+                    case 0  { $block := 16 }
+                    default { $block := 15 }
+                }
+                case 15 {
+                    // label L13
+                    // goto L14
+                    $block := 17
+                }
+                case 16 {
+                    // label L12
+                    // drop($t63)
+                    // $t76 := 105
+                    $t76 := 105
+                    // abort($t76)
+                    $Abort($t76)
+                }
+                case 17 {
+                    // label L14
+                    // $t77 := borrow_field<Tables::S<u8, vector<address>>>.t($t63)
+                    $t77 := $t63
+                    // $t78 := 42
+                    $t78 := 42
+                    // $t7 := $t78
+                    mstore(add($locals, 288), $t78)
+                    // $t79 := borrow_local($t7)
+                    $t79 := $MakePtr(false, add($locals, 319))
+                    // $t80 := Table::borrow<u8, vector<address>>($t77, $t79)
+                    $t80 := A2_Table_borrow$u8_vec$address$$($t77, $t79)
+                    // $t81 := 1
+                    $t81 := 1
+                    // $t82 := vector::borrow<address>($t80, $t81)
+                    $t82 := A1_vector_borrow$address$($t80, $t81)
+                    // $t83 := read_ref($t82)
+                    $t83 := $LoadU256($t82)
+                    // $t84 := 0x1013
+                    $t84 := 0x1013
+                    // $t85 := ==($t83, $t84)
+                    $t85 := $Eq($t83, $t84)
+                    // if ($t85) goto L16 else goto L15
+                    switch $t85
+                    case 0  { $block := 19 }
+                    default { $block := 18 }
+                }
+                case 18 {
+                    // label L16
+                    // goto L17
+                    $block := 20
+                }
+                case 19 {
+                    // label L15
+                    // drop($t63)
+                    // $t86 := 106
+                    $t86 := 106
+                    // abort($t86)
+                    $Abort($t86)
+                }
+                case 20 {
+                    // label L17
+                    // $t87 := borrow_field<Tables::S<u8, vector<address>>>.t($t63)
+                    $t87 := $t63
+                    // $t88 := 42
+                    $t88 := 42
+                    // $t9 := $t88
+                    mstore(add($locals, 320), $t88)
+                    // $t89 := borrow_local($t9)
+                    $t89 := $MakePtr(false, add($locals, 351))
+                    // $t23 := Table::remove<u8, vector<address>>($t87, $t89)
+                    mstore(add($locals, 352), A2_Table_remove$u8_vec$address$$($t87, $t89))
+                    // $t90 := borrow_local($t23)
+                    $t90 := $MakePtr(false, add($locals, 352))
+                    // $t91 := vector::length<address>($t90)
+                    $t91 := A1_vector_length$address$($t90)
+                    // $t92 := 2
+                    $t92 := 2
+                    // $t93 := ==($t91, $t92)
+                    $t93 := $Eq($t91, $t92)
+                    // if ($t93) goto L19 else goto L18
+                    switch $t93
+                    case 0  { $block := 22 }
+                    default { $block := 21 }
+                }
+                case 21 {
+                    // label L19
+                    // goto L20
+                    $block := 23
+                }
+                case 22 {
+                    // label L18
+                    // drop($t63)
+                    // $t94 := 107
+                    $t94 := 107
+                    // abort($t94)
+                    $Abort($t94)
+                }
+                case 23 {
+                    // label L20
+                    // $t95 := borrow_local($t23)
+                    $t95 := $MakePtr(false, add($locals, 352))
+                    // $t96 := 0
+                    $t96 := 0
+                    // $t97 := vector::borrow<address>($t95, $t96)
+                    $t97 := A1_vector_borrow$address$($t95, $t96)
+                    // $t98 := read_ref($t97)
+                    $t98 := $LoadU256($t97)
+                    // $t99 := 0x1012
+                    $t99 := 0x1012
+                    // $t100 := ==($t98, $t99)
+                    $t100 := $Eq($t98, $t99)
+                    // if ($t100) goto L22 else goto L21
+                    switch $t100
+                    case 0  { $block := 25 }
+                    default { $block := 24 }
+                }
+                case 24 {
+                    // label L22
+                    // goto L23
+                    $block := 26
+                }
+                case 25 {
+                    // label L21
+                    // drop($t63)
+                    // $t101 := 108
+                    $t101 := 108
+                    // abort($t101)
+                    $Abort($t101)
+                }
+                case 26 {
+                    // label L23
+                    // $t102 := borrow_local($t23)
+                    $t102 := $MakePtr(false, add($locals, 352))
+                    // $t103 := 1
+                    $t103 := 1
+                    // $t104 := vector::borrow<address>($t102, $t103)
+                    $t104 := A1_vector_borrow$address$($t102, $t103)
+                    // $t105 := read_ref($t104)
+                    $t105 := $LoadU256($t104)
+                    // $t106 := 0x1013
+                    $t106 := 0x1013
+                    // $t107 := ==($t105, $t106)
+                    $t107 := $Eq($t105, $t106)
+                    // if ($t107) goto L25 else goto L24
+                    switch $t107
+                    case 0  { $block := 28 }
+                    default { $block := 27 }
+                }
+                case 27 {
+                    // label L25
+                    // goto L26
+                    $block := 29
+                }
+                case 28 {
+                    // label L24
+                    // drop($t63)
+                    // $t108 := 109
+                    $t108 := 109
+                    // abort($t108)
+                    $Abort($t108)
+                }
+                case 29 {
+                    // label L26
+                    // $t109 := borrow_field<Tables::S<u8, vector<address>>>.t($t63)
+                    $t109 := $t63
+                    // $t110 := 42
+                    $t110 := 42
+                    // $t12 := $t110
+                    mstore(add($locals, 384), $t110)
+                    // $t111 := borrow_local($t12)
+                    $t111 := $MakePtr(false, add($locals, 415))
+                    // $t112 := Table::contains<u8, vector<address>>($t109, $t111)
+                    $t112 := A2_Table_contains$u8_vec$address$$($t109, $t111)
+                    // $t113 := !($t112)
+                    $t113 := $LogicalNot($t112)
+                    // if ($t113) goto L28 else goto L27
+                    switch $t113
+                    case 0  { $block := 31 }
+                    default { $block := 30 }
+                }
+                case 30 {
+                    // label L28
+                    // goto L29
+                    $block := 32
+                }
+                case 31 {
+                    // label L27
+                    // $t114 := 110
+                    $t114 := 110
+                    // abort($t114)
+                    $Abort($t114)
+                }
+                case 32 {
+                    // label L29
+                    // return ()
+                    $Free($locals, 416)
+                    leave
+                }
+            }
+        }
+
+        function A2_Table_contains$u8_vec$address$$(table_ref, key_ref) -> res {
+            let key := $LoadU8(key_ref)
+            let table_handle := $LoadU256(table_ref)
+            let storage_key := $StorageKey(table_handle, key)
+            let word := sload(storage_key)
+            res := $LogicalNot(iszero(word))
+        }
+        function A1_vector_borrow$address$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 32)))
+        }
+        function A1_vector_length$address$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A2_Table_remove$u8_vec$address$$(table_ref, key_ref) -> value {
+            let key := $LoadU8(key_ref)
+            let table_handle := $LoadU256(table_ref)
+            let storage_key := $StorageKey(table_handle, key)
+            let linked_src := sload(storage_key)
+            if iszero(linked_src) {
+              $AbortBuiltin()
+            }
+            let vector_linked_src := $StorageLoadU256(linked_src)
+            $AlignedStorageStore(linked_src, 0)
+            linked_src := vector_linked_src
+            let $size_1833323706 := $StorageLoadU64(linked_src)
+            let $capacity_1833323706 := $ClosestGreaterPowerOfTwo($size_1833323706)
+            value := $Malloc(add(32, mul($capacity_1833323706, 32)))
+            let $data_size_1833323706 := mul($size_1833323706, 32)
+            mstore(value, $AlignedStorageLoad(linked_src))
+            $MemoryStoreU64(add(value, 8), $capacity_1833323706)
+            let $data_src_1833323706 := add(linked_src, 32)
+            let $data_dst_1833323706 := add(value, 32)
+            for { let $offs_1833323706 := 0 } lt($offs_1833323706, $data_size_1833323706) { $offs_1833323706 := add($offs_1833323706, 32)} {
+                mstore(add($data_dst_1833323706, $offs_1833323706), $AlignedStorageLoad(add($data_src_1833323706, $offs_1833323706)))
+                $AlignedStorageStore(add($data_src_1833323706, $offs_1833323706), 0)
+            }
+            $AlignedStorageStore(linked_src, 0)
+            sstore(storage_key, 0)
+        }
+        function A2_Table_borrow$u8_vec$address$$(table_ref, key_ref) -> value_ref {
+            let key := $LoadU8(key_ref)
+            let table_handle := $LoadU256(table_ref)
+            let storage_key := $StorageKey(table_handle, key)
+            let value_offs := sload(storage_key)
+            if iszero(value_offs) {
+              $AbortBuiltin()
+            }
+            value_ref := $MakePtr(true, value_offs)
+        }
+        function A1_vector_push_back$address$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 32)))
+            $StoreU256(e_ptr, e)
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 32)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A2_Table_borrow_mut$u8_vec$address$$(table_ref, key_ref) -> value_ref {
+            let key := $LoadU8(key_ref)
+            let table_handle := $LoadU256(table_ref)
+            let storage_key := $StorageKey(table_handle, key)
+            let value_offs := sload(storage_key)
+            if iszero(value_offs) {
+              $AbortBuiltin()
+            }
+            value_ref := $MakePtr(true, value_offs)
+        }
+        function A2_Evm_sign(addr) -> signer {
+          signer := addr
+        }
+        function A2_Table_insert$u8_vec$address$$(table_ref, key_ref, value) {
+            let key := $LoadU8(key_ref)
+            let table_handle := $LoadU256(table_ref)
+            let storage_key := $StorageKey(table_handle, key)
+            let word := sload(storage_key)
+            if $LogicalNot(iszero(word)) {
+              $AbortBuiltin()
+            }
+            let $linked_dst_1833323706 := $NewLinkedStorageBase(0x6d464cba)
+            let $size_1833323706 := $MemoryLoadU64(value)
+            let $data_size_1833323706 := mul($size_1833323706, 32)
+            $AlignedStorageStore($linked_dst_1833323706, mload(value))
+            let $data_src_1833323706 := add(value, 32)
+            let $data_dst_1833323706 := add($linked_dst_1833323706, 32)
+            for { let $offs_1833323706 := 0 } lt($offs_1833323706, $data_size_1833323706) { $offs_1833323706 := add($offs_1833323706, 32)} {
+                $AlignedStorageStore(add($data_dst_1833323706, $offs_1833323706), mload(add($data_src_1833323706, $offs_1833323706)))
+                $Free(value, add($data_size_1833323706, 32))
+            }
+            let vector_ref_dst := $NewLinkedStorageBase(0x6d464cba)
+            $AlignedStorageStore(vector_ref_dst, $linked_dst_1833323706)
+            sstore(storage_key, vector_ref_dst)
+        }
+        function A1_vector_singleton$address$(e) -> $result {
+            let $t2, $t3
+            let $locals := $Malloc(32)
+            // $t1 := vector::empty<#0>()
+            mstore($locals, A1_vector_empty$address$())
+            // $t2 := borrow_local($t1)
+            $t2 := $MakePtr(false, $locals)
+            // vector::push_back<#0>($t2, $t0)
+            A1_vector_push_back$address$($t2, e)
+            // $t3 := move($t1)
+            $t3 := mload($locals)
+            // return $t3
+            $result := $t3
+            $Free($locals, 32)
+        }
+
+        function A1_vector_empty$address$() -> vector {
+            vector := $Malloc(96)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function A2_Table_empty$u8_vec$address$$() -> table {
+            table := $NewTableHandle()
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $NewTableHandle() -> handle {
+          let key := $StorageKey(1, 0)
+          handle := sload(key)
+          if iszero(handle) {
+             // no tables have been allocated in this contract, need to initialize the counter
+             // to the number of storage groups already statically allocated
+             handle := 2
+          }
+          sstore(key, add(handle, 1))
+        }
+
+        function $LoadU8(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU8(offs)
+          }
+          default {
+            val := $StorageLoadU8(offs)
+          }
+        }
+        function $MemoryLoadU8(offs) -> val {
+          val := $MemoryLoadBytes(offs, 1)
+        }
+        function $StorageLoadU8(offs) -> val {
+          val := $StorageLoadBytes(offs, 1)
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $GtEq(x, y) -> r {
+            r := or(gt(x, y), eq(x, y))
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $ClosestGreaterPowerOfTwo(x) -> r {
+            r := or(r, shr(1, x))
+            r := or(r, shr(2, r))
+            r := or(r, shr(4, r))
+            r := or(r, shr(8, r))
+            r := or(r, shr(16, r))
+            r := or(r, shr(32, r))
+            r := add(x, 1)
+        }
+    }
+}
+===> Test result of Tables::test_vector: Succeed(Stopped) (used_gas=181444): []
diff --git a/third_party/move/evm/move-to-yul/tests/TestABINative.v2_exp b/third_party/move/evm/move-to-yul/tests/TestABINative.v2_exp
new file mode 100644
index 0000000000000..262139247a78a
--- /dev/null
+++ b/third_party/move/evm/move-to-yul/tests/TestABINative.v2_exp
@@ -0,0 +1,2733 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_M" {
+    code {
+        codecopy(0, dataoffset("A2_M_deployed"), datasize("A2_M_deployed"))
+        return(0, datasize("A2_M_deployed"))
+    }
+    object "A2_M_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                default {}
+            }
+            $Abort(97)
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
+
+
+!! Unit tests
+
+// test of M::test_decode_two_bytes1
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_decode_two_bytes1" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_decode_two_bytes1()
+        return (0, 0)
+        function A2_M_test_decode_two_bytes1() {
+            let i, i_1, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32, $t33, $t34, $t35, $t36, $t37, $t38, $t39, $t40, $t41, $t42, $t43, $t44, $t45, $t46, $t47
+            let $locals := $Malloc(96)
+            let $block := 3
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L3
+                    // $t8 := 31
+                    $t8 := 31
+                    // $t9 := <=($t0, $t8)
+                    $t9 := $LtEq(i, $t8)
+                    // if ($t9) goto L1 else goto L0
+                    switch $t9
+                    case 0  { $block := 5 }
+                    default { $block := 4 }
+                }
+                case 3 {
+                    // $t2 := vector::empty<u8>()
+                    mstore($locals, A1_vector_empty$u8$())
+                    // $t5 := borrow_local($t2)
+                    $t5 := $MakePtr(false, $locals)
+                    // $t6 := 42
+                    $t6 := 42
+                    // vector::push_back<u8>($t5, $t6)
+                    A1_vector_push_back$u8$($t5, $t6)
+                    // $t7 := 1
+                    $t7 := 1
+                    // $t0 := $t7
+                    i := $t7
+                    // goto L3
+                    $block := 2
+                }
+                case 4 {
+                    // label L1
+                    // goto L2
+                    $block := 6
+                }
+                case 5 {
+                    // label L0
+                    // $t13 := borrow_local($t2)
+                    $t13 := $MakePtr(false, $locals)
+                    // $t14 := 43
+                    $t14 := 43
+                    // vector::push_back<u8>($t13, $t14)
+                    A1_vector_push_back$u8$($t13, $t14)
+                    // $t15 := 1
+                    $t15 := 1
+                    // $t1 := $t15
+                    i_1 := $t15
+                    // goto L7
+                    $block := 7
+                }
+                case 6 {
+                    // label L2
+                    // $t10 := borrow_local($t2)
+                    $t10 := $MakePtr(false, $locals)
+                    // $t11 := 0
+                    $t11 := 0
+                    // vector::push_back<u8>($t10, $t11)
+                    A1_vector_push_back$u8$($t10, $t11)
+                    // $t12 := 1
+                    $t12 := 1
+                    // $t0 := +($t0, $t12)
+                    i := $AddU64(i, $t12)
+                    // goto L3
+                    $block := 2
+                }
+                case 7 {
+                    // label L7
+                    // $t16 := 31
+                    $t16 := 31
+                    // $t17 := <=($t1, $t16)
+                    $t17 := $LtEq(i_1, $t16)
+                    // if ($t17) goto L5 else goto L4
+                    switch $t17
+                    case 0  { $block := 9 }
+                    default { $block := 8 }
+                }
+                case 8 {
+                    // label L5
+                    // goto L6
+                    $block := 10
+                }
+                case 9 {
+                    // label L4
+                    // $t21 := move($t2)
+                    $t21 := mload($locals)
+                    // ($t22, $t23) := M::decode_two_bytes1($t21)
+                    $t22, $t23 := A2_M_decode_two_bytes1($t21)
+                    // $t4 := $t23
+                    mstore(add($locals, 64), $t23)
+                    // $t3 := $t22
+                    mstore(add($locals, 32), $t22)
+                    // $t24 := borrow_local($t3)
+                    $t24 := $MakePtr(false, add($locals, 32))
+                    // $t25 := vector::length<u8>($t24)
+                    $t25 := A1_vector_length$u8$($t24)
+                    // $t26 := 1
+                    $t26 := 1
+                    // $t27 := ==($t25, $t26)
+                    $t27 := $Eq($t25, $t26)
+                    // if ($t27) goto L9 else goto L8
+                    switch $t27
+                    case 0  { $block := 12 }
+                    default { $block := 11 }
+                }
+                case 10 {
+                    // label L6
+                    // $t18 := borrow_local($t2)
+                    $t18 := $MakePtr(false, $locals)
+                    // $t19 := 0
+                    $t19 := 0
+                    // vector::push_back<u8>($t18, $t19)
+                    A1_vector_push_back$u8$($t18, $t19)
+                    // $t20 := 1
+                    $t20 := 1
+                    // $t1 := +($t1, $t20)
+                    i_1 := $AddU64(i_1, $t20)
+                    // goto L7
+                    $block := 7
+                }
+                case 11 {
+                    // label L9
+                    // goto L10
+                    $block := 13
+                }
+                case 12 {
+                    // label L8
+                    // $t28 := 101
+                    $t28 := 101
+                    // abort($t28)
+                    $Abort($t28)
+                }
+                case 13 {
+                    // label L10
+                    // $t29 := borrow_local($t4)
+                    $t29 := $MakePtr(false, add($locals, 64))
+                    // $t30 := vector::length<u8>($t29)
+                    $t30 := A1_vector_length$u8$($t29)
+                    // $t31 := 1
+                    $t31 := 1
+                    // $t32 := ==($t30, $t31)
+                    $t32 := $Eq($t30, $t31)
+                    // if ($t32) goto L12 else goto L11
+                    switch $t32
+                    case 0  { $block := 15 }
+                    default { $block := 14 }
+                }
+                case 14 {
+                    // label L12
+                    // goto L13
+                    $block := 16
+                }
+                case 15 {
+                    // label L11
+                    // $t33 := 102
+                    $t33 := 102
+                    // abort($t33)
+                    $Abort($t33)
+                }
+                case 16 {
+                    // label L13
+                    // $t34 := borrow_local($t3)
+                    $t34 := $MakePtr(false, add($locals, 32))
+                    // $t35 := 0
+                    $t35 := 0
+                    // $t36 := vector::borrow<u8>($t34, $t35)
+                    $t36 := A1_vector_borrow$u8$($t34, $t35)
+                    // $t37 := read_ref($t36)
+                    $t37 := $LoadU8($t36)
+                    // $t38 := 42
+                    $t38 := 42
+                    // $t39 := ==($t37, $t38)
+                    $t39 := $Eq($t37, $t38)
+                    // if ($t39) goto L15 else goto L14
+                    switch $t39
+                    case 0  { $block := 18 }
+                    default { $block := 17 }
+                }
+                case 17 {
+                    // label L15
+                    // goto L16
+                    $block := 19
+                }
+                case 18 {
+                    // label L14
+                    // $t40 := 103
+                    $t40 := 103
+                    // abort($t40)
+                    $Abort($t40)
+                }
+                case 19 {
+                    // label L16
+                    // $t41 := borrow_local($t4)
+                    $t41 := $MakePtr(false, add($locals, 64))
+                    // $t42 := 0
+                    $t42 := 0
+                    // $t43 := vector::borrow<u8>($t41, $t42)
+                    $t43 := A1_vector_borrow$u8$($t41, $t42)
+                    // $t44 := read_ref($t43)
+                    $t44 := $LoadU8($t43)
+                    // $t45 := 43
+                    $t45 := 43
+                    // $t46 := ==($t44, $t45)
+                    $t46 := $Eq($t44, $t45)
+                    // if ($t46) goto L18 else goto L17
+                    switch $t46
+                    case 0  { $block := 21 }
+                    default { $block := 20 }
+                }
+                case 20 {
+                    // label L18
+                    // goto L19
+                    $block := 22
+                }
+                case 21 {
+                    // label L17
+                    // $t47 := 104
+                    $t47 := 104
+                    // abort($t47)
+                    $Abort($t47)
+                }
+                case 22 {
+                    // label L19
+                    // return ()
+                    $Free($locals, 96)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_borrow$u8$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 1)))
+        }
+        function A1_vector_length$u8$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A1_vector_push_back$u8$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 1)))
+            $StoreU8(e_ptr, e)
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 1)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A2_M_decode_two_bytes1(input) -> $result0, $result1  {
+            let $t1 := add(input, 32)
+            let $t2 := $MemoryLoadU64(input)
+            let $t3 := add($t1, $t2)
+            if gt($t1, 0xffffffffffffffff) { $AbortBuiltin() }
+            if gt($t3, 0xffffffffffffffff) { $AbortBuiltin() }
+            $result0, $result1 := abi_decode_tuple_$bytes1_bytes1$_$vec$u8$_vec$u8$$_from_memory($t1, $t3)
+        }
+        function A1_vector_empty$u8$() -> vector {
+            vector := $Malloc(34)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function abi_decode_tuple_$bytes1_bytes1$_$vec$u8$_vec$u8$$_from_memory(headStart, dataEnd) -> value_0, value_1 {
+            if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+            {
+                let offset := 0
+                value_0 := abi_decode_bytes1_vec$u8$_from_memory(add(headStart, offset), dataEnd)
+            }
+            {
+                let offset := 32
+                value_1 := abi_decode_bytes1_vec$u8$_from_memory(add(headStart, offset), dataEnd)
+            }
+        }
+        function abi_decode_bytes1_vec$u8$_from_memory(offset, end) -> array {
+            if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+            let length := 1
+            let size := 33
+            array := abi_decode_available_length__bytes1_from_memory(offset, length, size, end)
+        }
+        function abi_decode_available_length__bytes1_from_memory(src, length, size, end) -> array {
+            array := $Malloc($CheckMemorySize(size))
+            $MemoryStoreU64(array, length)
+            $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+            let dst := add(array, 32)
+            if gt(add(src, sub(size, 32)), end) { $Abort(93) }
+            $CopyFromMemoryToMemory(src, dst, length)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU8(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU8(offs)
+          }
+          default {
+            val := $StorageLoadU8(offs)
+          }
+        }
+        function $MemoryLoadU8(offs) -> val {
+          val := $MemoryLoadBytes(offs, 1)
+        }
+        function $StorageLoadU8(offs) -> val {
+          val := $StorageLoadBytes(offs, 1)
+        }
+        function $StoreU8(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU8(offs, val)
+          }
+          default {
+            $StorageStoreU8(offs, val)
+          }
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $StorageStoreU8(offs, val) {
+          $StorageStoreBytes(offs, 1, val)
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $CheckMemorySize(len) -> checked_len {
+            if gt(len, 0xffffffffffffffff) { $AbortBuiltin() }
+            checked_len := len
+        }
+        function $CopyFromMemoryToMemory(src, dst, length) {
+          let i := 0
+          for { } lt(i, length) { i := add(i, 32) }
+          {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if gt(i, length)
+          {
+            // clear end
+            mstore(add(dst, length), 0)
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $AddU64(x, y) -> r {
+            if lt(sub(0xffffffffffffffff, x), y) { $AbortBuiltin() }
+            r := add(x, y)
+        }
+        function $GtEq(x, y) -> r {
+            r := or(gt(x, y), eq(x, y))
+        }
+        function $LtEq(x, y) -> r {
+            r := or(lt(x, y), eq(x, y))
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $ClosestGreaterPowerOfTwo(x) -> r {
+            r := or(r, shr(1, x))
+            r := or(r, shr(2, r))
+            r := or(r, shr(4, r))
+            r := or(r, shr(8, r))
+            r := or(r, shr(16, r))
+            r := or(r, shr(32, r))
+            r := add(x, 1)
+        }
+    }
+}
+===> Test result of M::test_decode_two_bytes1: Succeed(Stopped) (used_gas=79598): []
+
+// test of M::test_decode_two_u8
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_decode_two_u8" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_decode_two_u8()
+        return (0, 0)
+        function A2_M_test_decode_two_u8() {
+            let i, i_1, v2, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28
+            let $locals := $Malloc(32)
+            let $block := 3
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L3
+                    // $t5 := 31
+                    $t5 := 31
+                    // $t6 := <=($t0, $t5)
+                    $t6 := $LtEq(i, $t5)
+                    // if ($t6) goto L1 else goto L0
+                    switch $t6
+                    case 0  { $block := 5 }
+                    default { $block := 4 }
+                }
+                case 3 {
+                    // $t2 := vector::empty<u8>()
+                    mstore($locals, A1_vector_empty$u8$())
+                    // $t4 := 1
+                    $t4 := 1
+                    // $t0 := $t4
+                    i := $t4
+                    // goto L3
+                    $block := 2
+                }
+                case 4 {
+                    // label L1
+                    // goto L2
+                    $block := 6
+                }
+                case 5 {
+                    // label L0
+                    // $t10 := borrow_local($t2)
+                    $t10 := $MakePtr(false, $locals)
+                    // $t11 := 42
+                    $t11 := 42
+                    // vector::push_back<u8>($t10, $t11)
+                    A1_vector_push_back$u8$($t10, $t11)
+                    // $t12 := 1
+                    $t12 := 1
+                    // $t1 := $t12
+                    i_1 := $t12
+                    // goto L7
+                    $block := 7
+                }
+                case 6 {
+                    // label L2
+                    // $t7 := borrow_local($t2)
+                    $t7 := $MakePtr(false, $locals)
+                    // $t8 := 0
+                    $t8 := 0
+                    // vector::push_back<u8>($t7, $t8)
+                    A1_vector_push_back$u8$($t7, $t8)
+                    // $t9 := 1
+                    $t9 := 1
+                    // $t0 := +($t0, $t9)
+                    i := $AddU64(i, $t9)
+                    // goto L3
+                    $block := 2
+                }
+                case 7 {
+                    // label L7
+                    // $t13 := 31
+                    $t13 := 31
+                    // $t14 := <=($t1, $t13)
+                    $t14 := $LtEq(i_1, $t13)
+                    // if ($t14) goto L5 else goto L4
+                    switch $t14
+                    case 0  { $block := 9 }
+                    default { $block := 8 }
+                }
+                case 8 {
+                    // label L5
+                    // goto L6
+                    $block := 10
+                }
+                case 9 {
+                    // label L4
+                    // $t18 := borrow_local($t2)
+                    $t18 := $MakePtr(false, $locals)
+                    // $t19 := 43
+                    $t19 := 43
+                    // vector::push_back<u8>($t18, $t19)
+                    A1_vector_push_back$u8$($t18, $t19)
+                    // $t20 := move($t2)
+                    $t20 := mload($locals)
+                    // ($t21, $t22) := M::decode_two_u8($t20)
+                    $t21, $t22 := A2_M_decode_two_u8($t20)
+                    // $t23 := 42
+                    $t23 := 42
+                    // $t24 := ==($t21, $t23)
+                    $t24 := $Eq($t21, $t23)
+                    // if ($t24) goto L9 else goto L8
+                    switch $t24
+                    case 0  { $block := 12 }
+                    default { $block := 11 }
+                }
+                case 10 {
+                    // label L6
+                    // $t15 := borrow_local($t2)
+                    $t15 := $MakePtr(false, $locals)
+                    // $t16 := 0
+                    $t16 := 0
+                    // vector::push_back<u8>($t15, $t16)
+                    A1_vector_push_back$u8$($t15, $t16)
+                    // $t17 := 1
+                    $t17 := 1
+                    // $t1 := +($t1, $t17)
+                    i_1 := $AddU64(i_1, $t17)
+                    // goto L7
+                    $block := 7
+                }
+                case 11 {
+                    // label L9
+                    // goto L10
+                    $block := 13
+                }
+                case 12 {
+                    // label L8
+                    // $t25 := 101
+                    $t25 := 101
+                    // abort($t25)
+                    $Abort($t25)
+                }
+                case 13 {
+                    // label L10
+                    // $t26 := 43
+                    $t26 := 43
+                    // $t27 := ==($t22, $t26)
+                    $t27 := $Eq($t22, $t26)
+                    // if ($t27) goto L12 else goto L11
+                    switch $t27
+                    case 0  { $block := 15 }
+                    default { $block := 14 }
+                }
+                case 14 {
+                    // label L12
+                    // goto L13
+                    $block := 16
+                }
+                case 15 {
+                    // label L11
+                    // $t28 := 102
+                    $t28 := 102
+                    // abort($t28)
+                    $Abort($t28)
+                }
+                case 16 {
+                    // label L13
+                    // return ()
+                    $Free($locals, 32)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_push_back$u8$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 1)))
+            $StoreU8(e_ptr, e)
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 1)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A2_M_decode_two_u8(input) -> $result0, $result1  {
+            let $t1 := add(input, 32)
+            let $t2 := $MemoryLoadU64(input)
+            let $t3 := add($t1, $t2)
+            if gt($t1, 0xffffffffffffffff) { $AbortBuiltin() }
+            if gt($t3, 0xffffffffffffffff) { $AbortBuiltin() }
+            $result0, $result1 := abi_decode_tuple_$uint8_uint8$_$u8_u8$_from_memory($t1, $t3)
+        }
+        function A1_vector_empty$u8$() -> vector {
+            vector := $Malloc(34)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function abi_decode_tuple_$uint8_uint8$_$u8_u8$_from_memory(headStart, dataEnd) -> value_0, value_1 {
+            if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+            {
+                let offset := 0
+                value_0 := abi_decode_uint8_from_memory(add(headStart, offset), dataEnd)
+            }
+            {
+                let offset := 32
+                value_1 := abi_decode_uint8_from_memory(add(headStart, offset), dataEnd)
+            }
+        }
+        function abi_decode_uint8_from_memory(offset, end) -> value {
+            value := mload(offset)
+            validator_uint8(value)
+        }
+        function validator_uint8(value) {
+            if iszero(eq(value, cleanup_uint8(value))) { $Abort(95) }
+        }
+        function cleanup_uint8(value) -> cleaned {
+            cleaned := and(value, 0xff)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $StoreU8(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU8(offs, val)
+          }
+          default {
+            $StorageStoreU8(offs, val)
+          }
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $StorageStoreU8(offs, val) {
+          $StorageStoreBytes(offs, 1, val)
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $AddU64(x, y) -> r {
+            if lt(sub(0xffffffffffffffff, x), y) { $AbortBuiltin() }
+            r := add(x, y)
+        }
+        function $LtEq(x, y) -> r {
+            r := or(lt(x, y), eq(x, y))
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of M::test_decode_two_u8: Succeed(Stopped) (used_gas=77393): []
+
+// test of M::test_encode_packed_string
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_encode_packed_string" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_encode_packed_string()
+        return (0, 0)
+        function A2_M_test_encode_packed_string() {
+            let $t0, $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t5 := 100
+                    $t5 := 100
+                    // abort($t5)
+                    $Abort($t5)
+                }
+                case 4 {
+                    // $t0 := []
+                    $t0 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(0)))
+                    $MemoryStoreU64($t0, 0)
+                    $MemoryStoreU64(add($t0, 8), $ClosestGreaterPowerOfTwo(0))
+                    copy_literal_string_to_memory_21418693(add($t0, 32))
+                    // $t1 := []
+                    $t1 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(0)))
+                    $MemoryStoreU64($t1, 0)
+                    $MemoryStoreU64(add($t1, 8), $ClosestGreaterPowerOfTwo(0))
+                    copy_literal_string_to_memory_21418693(add($t1, 32))
+                    // $t2 := M::encode_packed_string($t0, $t1)
+                    $t2 := A2_M_encode_packed_string($t0, $t1)
+                    // $t3 := []
+                    $t3 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(0)))
+                    $MemoryStoreU64($t3, 0)
+                    $MemoryStoreU64(add($t3, 8), $ClosestGreaterPowerOfTwo(0))
+                    copy_literal_string_to_memory_21418693(add($t3, 32))
+                    // $t4 := ==($t2, $t3)
+                    $t4 := $Eq_$vec$u8$$($t2, $t3)
+                    // if ($t4) goto L1 else goto L0
+                    switch $t4
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t6 := [49]
+                    $t6 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(1)))
+                    $MemoryStoreU64($t6, 1)
+                    $MemoryStoreU64(add($t6, 8), $ClosestGreaterPowerOfTwo(1))
+                    copy_literal_string_to_memory_2868747976(add($t6, 32))
+                    // $t7 := [50]
+                    $t7 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(1)))
+                    $MemoryStoreU64($t7, 1)
+                    $MemoryStoreU64(add($t7, 8), $ClosestGreaterPowerOfTwo(1))
+                    copy_literal_string_to_memory_4015750317(add($t7, 32))
+                    // $t8 := M::encode_packed_string($t6, $t7)
+                    $t8 := A2_M_encode_packed_string($t6, $t7)
+                    // $t9 := [49, 50]
+                    $t9 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(2)))
+                    $MemoryStoreU64($t9, 2)
+                    $MemoryStoreU64(add($t9, 8), $ClosestGreaterPowerOfTwo(2))
+                    copy_literal_string_to_memory_141265791(add($t9, 32))
+                    // $t10 := ==($t8, $t9)
+                    $t10 := $Eq_$vec$u8$$($t8, $t9)
+                    // if ($t10) goto L4 else goto L3
+                    switch $t10
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t11 := 101
+                    $t11 := 101
+                    // abort($t11)
+                    $Abort($t11)
+                }
+                case 8 {
+                    // label L5
+                    // $t12 := []
+                    $t12 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(0)))
+                    $MemoryStoreU64($t12, 0)
+                    $MemoryStoreU64(add($t12, 8), $ClosestGreaterPowerOfTwo(0))
+                    copy_literal_string_to_memory_21418693(add($t12, 32))
+                    // $t13 := [97, 98, 99]
+                    $t13 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(3)))
+                    $MemoryStoreU64($t13, 3)
+                    $MemoryStoreU64(add($t13, 8), $ClosestGreaterPowerOfTwo(3))
+                    copy_literal_string_to_memory_2053440334(add($t13, 32))
+                    // $t14 := M::encode_packed_string($t12, $t13)
+                    $t14 := A2_M_encode_packed_string($t12, $t13)
+                    // $t15 := [97, 98, 99]
+                    $t15 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(3)))
+                    $MemoryStoreU64($t15, 3)
+                    $MemoryStoreU64(add($t15, 8), $ClosestGreaterPowerOfTwo(3))
+                    copy_literal_string_to_memory_2053440334(add($t15, 32))
+                    // $t16 := ==($t14, $t15)
+                    $t16 := $Eq_$vec$u8$$($t14, $t15)
+                    // if ($t16) goto L7 else goto L6
+                    switch $t16
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t17 := 102
+                    $t17 := 102
+                    // abort($t17)
+                    $Abort($t17)
+                }
+                case 11 {
+                    // label L8
+                    // $t18 := [97]
+                    $t18 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(1)))
+                    $MemoryStoreU64($t18, 1)
+                    $MemoryStoreU64(add($t18, 8), $ClosestGreaterPowerOfTwo(1))
+                    copy_literal_string_to_memory_371573306(add($t18, 32))
+                    // $t19 := [98, 99]
+                    $t19 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(2)))
+                    $MemoryStoreU64($t19, 2)
+                    $MemoryStoreU64(add($t19, 8), $ClosestGreaterPowerOfTwo(2))
+                    copy_literal_string_to_memory_3119208230(add($t19, 32))
+                    // $t20 := M::encode_packed_string($t18, $t19)
+                    $t20 := A2_M_encode_packed_string($t18, $t19)
+                    // $t21 := [100, 101]
+                    $t21 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(2)))
+                    $MemoryStoreU64($t21, 2)
+                    $MemoryStoreU64(add($t21, 8), $ClosestGreaterPowerOfTwo(2))
+                    copy_literal_string_to_memory_1933910203(add($t21, 32))
+                    // $t22 := M::encode_packed_string($t20, $t21)
+                    $t22 := A2_M_encode_packed_string($t20, $t21)
+                    // $t23 := [97, 98, 99, 100, 101]
+                    $t23 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(5)))
+                    $MemoryStoreU64($t23, 5)
+                    $MemoryStoreU64(add($t23, 8), $ClosestGreaterPowerOfTwo(5))
+                    copy_literal_string_to_memory_3871831907(add($t23, 32))
+                    // $t24 := ==($t22, $t23)
+                    $t24 := $Eq_$vec$u8$$($t22, $t23)
+                    // if ($t24) goto L10 else goto L9
+                    switch $t24
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t25 := 103
+                    $t25 := 103
+                    // abort($t25)
+                    $Abort($t25)
+                }
+                case 14 {
+                    // label L11
+                    // $t26 := [116, 101, 115, 116]
+                    $t26 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(4)))
+                    $MemoryStoreU64($t26, 4)
+                    $MemoryStoreU64(add($t26, 8), $ClosestGreaterPowerOfTwo(4))
+                    copy_literal_string_to_memory_1610556060(add($t26, 32))
+                    // $t27 := []
+                    $t27 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(0)))
+                    $MemoryStoreU64($t27, 0)
+                    $MemoryStoreU64(add($t27, 8), $ClosestGreaterPowerOfTwo(0))
+                    copy_literal_string_to_memory_21418693(add($t27, 32))
+                    // $t28 := M::encode_packed_string($t26, $t27)
+                    $t28 := A2_M_encode_packed_string($t26, $t27)
+                    // $t29 := [116, 101, 115, 116]
+                    $t29 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(4)))
+                    $MemoryStoreU64($t29, 4)
+                    $MemoryStoreU64(add($t29, 8), $ClosestGreaterPowerOfTwo(4))
+                    copy_literal_string_to_memory_1610556060(add($t29, 32))
+                    // $t30 := ==($t28, $t29)
+                    $t30 := $Eq_$vec$u8$$($t28, $t29)
+                    // if ($t30) goto L13 else goto L12
+                    switch $t30
+                    case 0  { $block := 16 }
+                    default { $block := 15 }
+                }
+                case 15 {
+                    // label L13
+                    // goto L14
+                    $block := 17
+                }
+                case 16 {
+                    // label L12
+                    // $t31 := 104
+                    $t31 := 104
+                    // abort($t31)
+                    $Abort($t31)
+                }
+                case 17 {
+                    // label L14
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function A2_M_encode_packed_string(input_1,input_2) -> $result  {
+            $result := mload(0)
+            let $t2 := add($result, 32)
+            if gt($t2, 0xffffffffffffffff) { $AbortBuiltin() }
+            let $t3 := abi_encode_tuple_packed_$string_string$_$vec$u8$_vec$u8$$_not_padded_inplace($t2,input_1,input_2)
+            if gt($t3, 0xffffffffffffffff) { $AbortBuiltin() }
+            let $t4 := sub($t3, $t2)
+            $MemoryStoreU64($result, $t4)
+            let $t5 := $ClosestGreaterPowerOfTwo($t4)
+            $MemoryStoreU64(add($result, 8), $t5)
+            mstore(0, $t3)
+        }
+        function abi_encode_tuple_packed_$string_string$_$vec$u8$_vec$u8$$_not_padded_inplace(pos ,value_0, value_1) -> end {
+            pos := abi_encode_string_not_padded_inplace(value_0,  pos)
+            pos := abi_encode_string_not_padded_inplace(value_1,  pos)
+            end := pos
+        }
+        function abi_encode_string_not_padded_inplace(value, pos) -> end{
+            let size := $MemoryLoadU64(value)
+            $CopyMemory(add(value, 0x20), pos, size)
+            end := add(pos, size)
+        }
+        function $Eq_$vec$u8$$(x, y) -> res
+        {
+            res := $EqVector(x, y, 1)
+        }
+        function copy_literal_string_to_memory_1610556060(value) {
+            $MemoryStoreU8(value, 116)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 101)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 115)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 116)
+            value := add(value, 1)
+        }
+        function copy_literal_string_to_memory_21418693(value) {
+        }
+        function copy_literal_string_to_memory_3871831907(value) {
+            $MemoryStoreU8(value, 97)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 98)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 99)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 100)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 101)
+            value := add(value, 1)
+        }
+        function copy_literal_string_to_memory_1933910203(value) {
+            $MemoryStoreU8(value, 100)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 101)
+            value := add(value, 1)
+        }
+        function copy_literal_string_to_memory_3119208230(value) {
+            $MemoryStoreU8(value, 98)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 99)
+            value := add(value, 1)
+        }
+        function copy_literal_string_to_memory_371573306(value) {
+            $MemoryStoreU8(value, 97)
+            value := add(value, 1)
+        }
+        function copy_literal_string_to_memory_2053440334(value) {
+            $MemoryStoreU8(value, 97)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 98)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 99)
+            value := add(value, 1)
+        }
+        function copy_literal_string_to_memory_141265791(value) {
+            $MemoryStoreU8(value, 49)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 50)
+            value := add(value, 1)
+        }
+        function copy_literal_string_to_memory_4015750317(value) {
+            $MemoryStoreU8(value, 50)
+            value := add(value, 1)
+        }
+        function copy_literal_string_to_memory_2868747976(value) {
+            $MemoryStoreU8(value, 49)
+            value := add(value, 1)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $EqVector(x, y, elem_size) -> r {
+            let len_x := $MemoryLoadU64(x)
+            let len_y := $MemoryLoadU64(y)
+            if $Neq(len_x, len_y) {
+                r := false
+                leave
+            }
+            let data_size_bytes := mul(elem_size, len_x)
+            let num_words, overflow_bytes := $ToWordOffs(data_size_bytes)
+            let i := 0
+            for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+                if $Neq(mload(add(x, add(i, 32))), mload(add(y, add(i, 32)))) {
+                    r := false
+                    leave
+                }
+            }
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let x_overflow := mload(add(x, add(overflow_offs, 32)))
+            let y_overflow := mload(add(y, add(overflow_offs, 32)))
+            r := eq(or(mask, x_overflow), or(mask, y_overflow))
+        }
+        function $Neq(x, y) -> r {
+            r := $LogicalNot(eq(x, y))
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $ClosestGreaterPowerOfTwo(x) -> r {
+            r := or(r, shr(1, x))
+            r := or(r, shr(2, r))
+            r := or(r, shr(4, r))
+            r := or(r, shr(8, r))
+            r := or(r, shr(16, r))
+            r := or(r, shr(32, r))
+            r := add(x, 1)
+        }
+    }
+}
+===> Test result of M::test_encode_packed_string: Succeed(Stopped) (used_gas=10647): []
+
+// test of M::test_encode_packed_uint16
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_encode_packed_uint16" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_encode_packed_uint16()
+        return (0, 0)
+        function A2_M_test_encode_packed_uint16() {
+            let $t1, $t2, $t3, $t4, $t5, $t6, $t7
+            let $locals := $Malloc(32)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t7 := 101
+                    $t7 := 101
+                    // abort($t7)
+                    $Abort($t7)
+                }
+                case 4 {
+                    // $t1 := 41
+                    $t1 := 41
+                    // $t2 := 42
+                    $t2 := 42
+                    // $t0 := M::encode_packed($t1, $t2)
+                    mstore($locals, A2_M_encode_packed($t1, $t2))
+                    // $t3 := borrow_local($t0)
+                    $t3 := $MakePtr(false, $locals)
+                    // $t4 := vector::length<u8>($t3)
+                    $t4 := A1_vector_length$u8$($t3)
+                    // $t5 := 4
+                    $t5 := 4
+                    // $t6 := ==($t4, $t5)
+                    $t6 := $Eq($t4, $t5)
+                    // if ($t6) goto L1 else goto L0
+                    switch $t6
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // return ()
+                    $Free($locals, 32)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_length$u8$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A2_M_encode_packed(input_1,input_2) -> $result  {
+            $result := mload(0)
+            let $t2 := add($result, 32)
+            if gt($t2, 0xffffffffffffffff) { $AbortBuiltin() }
+            let $t3 := abi_encode_tuple_packed_$uint16_uint16$_$u64_u64$_not_padded_inplace($t2,input_1,input_2)
+            if gt($t3, 0xffffffffffffffff) { $AbortBuiltin() }
+            let $t4 := sub($t3, $t2)
+            $MemoryStoreU64($result, $t4)
+            let $t5 := $ClosestGreaterPowerOfTwo($t4)
+            $MemoryStoreU64(add($result, 8), $t5)
+            mstore(0, $t3)
+        }
+        function abi_encode_tuple_packed_$uint16_uint16$_$u64_u64$_not_padded_inplace(pos ,value_0, value_1) -> end {
+            abi_encode_uint16(value_0,  pos)
+            pos := add(pos, 2)
+            abi_encode_uint16(value_1,  pos)
+            pos := add(pos, 2)
+            end := pos
+        }
+        function abi_encode_uint16(value, pos) {
+            mstore(pos, left_align_uint16(cleanup_uint16(value)))
+        }
+        function left_align_uint16(value) -> aligned {
+            aligned := shl(240, value)
+        }
+        function cleanup_uint16(value) -> cleaned {
+            cleaned := and(value, 0xffff)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $ClosestGreaterPowerOfTwo(x) -> r {
+            r := or(r, shr(1, x))
+            r := or(r, shr(2, r))
+            r := or(r, shr(4, r))
+            r := or(r, shr(8, r))
+            r := or(r, shr(16, r))
+            r := or(r, shr(32, r))
+            r := add(x, 1)
+        }
+    }
+}
+===> Test result of M::test_encode_packed_uint16: Succeed(Stopped) (used_gas=776): []
+
+// test of M::test_marshalling_two_bytes1
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_marshalling_two_bytes1" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_marshalling_two_bytes1()
+        return (0, 0)
+        function A2_M_test_marshalling_two_bytes1() {
+            let i, i_1, v_, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26
+            let $locals := $Malloc(32)
+            let $block := 3
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L3
+                    // $t7 := 31
+                    $t7 := 31
+                    // $t8 := <=($t0, $t7)
+                    $t8 := $LtEq(i, $t7)
+                    // if ($t8) goto L1 else goto L0
+                    switch $t8
+                    case 0  { $block := 5 }
+                    default { $block := 4 }
+                }
+                case 3 {
+                    // $t2 := vector::empty<u8>()
+                    mstore($locals, A1_vector_empty$u8$())
+                    // $t4 := borrow_local($t2)
+                    $t4 := $MakePtr(false, $locals)
+                    // $t5 := 42
+                    $t5 := 42
+                    // vector::push_back<u8>($t4, $t5)
+                    A1_vector_push_back$u8$($t4, $t5)
+                    // $t6 := 1
+                    $t6 := 1
+                    // $t0 := $t6
+                    i := $t6
+                    // goto L3
+                    $block := 2
+                }
+                case 4 {
+                    // label L1
+                    // goto L2
+                    $block := 6
+                }
+                case 5 {
+                    // label L0
+                    // $t12 := borrow_local($t2)
+                    $t12 := $MakePtr(false, $locals)
+                    // $t13 := 43
+                    $t13 := 43
+                    // vector::push_back<u8>($t12, $t13)
+                    A1_vector_push_back$u8$($t12, $t13)
+                    // $t14 := 1
+                    $t14 := 1
+                    // $t1 := $t14
+                    i_1 := $t14
+                    // goto L7
+                    $block := 7
+                }
+                case 6 {
+                    // label L2
+                    // $t9 := borrow_local($t2)
+                    $t9 := $MakePtr(false, $locals)
+                    // $t10 := 0
+                    $t10 := 0
+                    // vector::push_back<u8>($t9, $t10)
+                    A1_vector_push_back$u8$($t9, $t10)
+                    // $t11 := 1
+                    $t11 := 1
+                    // $t0 := +($t0, $t11)
+                    i := $AddU64(i, $t11)
+                    // goto L3
+                    $block := 2
+                }
+                case 7 {
+                    // label L7
+                    // $t15 := 31
+                    $t15 := 31
+                    // $t16 := <=($t1, $t15)
+                    $t16 := $LtEq(i_1, $t15)
+                    // if ($t16) goto L5 else goto L4
+                    switch $t16
+                    case 0  { $block := 9 }
+                    default { $block := 8 }
+                }
+                case 8 {
+                    // label L5
+                    // goto L6
+                    $block := 10
+                }
+                case 9 {
+                    // label L4
+                    // $t20 := copy($t2)
+                    $t20 := mload($locals)
+                    // ($t21, $t22) := M::decode_two_bytes1($t20)
+                    $t21, $t22 := A2_M_decode_two_bytes1($t20)
+                    // $t23 := M::encode_two_bytes1($t21, $t22)
+                    $t23 := A2_M_encode_two_bytes1($t21, $t22)
+                    // $t24 := move($t2)
+                    $t24 := mload($locals)
+                    // $t25 := ==($t24, $t23)
+                    $t25 := $Eq_$vec$u8$$($t24, $t23)
+                    // if ($t25) goto L9 else goto L8
+                    switch $t25
+                    case 0  { $block := 12 }
+                    default { $block := 11 }
+                }
+                case 10 {
+                    // label L6
+                    // $t17 := borrow_local($t2)
+                    $t17 := $MakePtr(false, $locals)
+                    // $t18 := 0
+                    $t18 := 0
+                    // vector::push_back<u8>($t17, $t18)
+                    A1_vector_push_back$u8$($t17, $t18)
+                    // $t19 := 1
+                    $t19 := 1
+                    // $t1 := +($t1, $t19)
+                    i_1 := $AddU64(i_1, $t19)
+                    // goto L7
+                    $block := 7
+                }
+                case 11 {
+                    // label L9
+                    // goto L10
+                    $block := 13
+                }
+                case 12 {
+                    // label L8
+                    // $t26 := 101
+                    $t26 := 101
+                    // abort($t26)
+                    $Abort($t26)
+                }
+                case 13 {
+                    // label L10
+                    // return ()
+                    $Free($locals, 32)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_push_back$u8$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 1)))
+            $StoreU8(e_ptr, e)
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 1)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A2_M_encode_two_bytes1(input_1,input_2) -> $result  {
+            $result := mload(0)
+            let $t2 := add($result, 32)
+            if gt($t2, 0xffffffffffffffff) { $AbortBuiltin() }
+            let $t3 := abi_encode_tuple_$bytes1_bytes1$_$vec$u8$_vec$u8$$($t2,input_1,input_2)
+            if gt($t3, 0xffffffffffffffff) { $AbortBuiltin() }
+            let $t4 := sub($t3, $t2)
+            $MemoryStoreU64($result, $t4)
+            let $t5 := $ClosestGreaterPowerOfTwo($t4)
+            $MemoryStoreU64(add($result, 8), $t5)
+            mstore(0, $t3)
+        }
+        function A2_M_decode_two_bytes1(input) -> $result0, $result1  {
+            let $t1 := add(input, 32)
+            let $t2 := $MemoryLoadU64(input)
+            let $t3 := add($t1, $t2)
+            if gt($t1, 0xffffffffffffffff) { $AbortBuiltin() }
+            if gt($t3, 0xffffffffffffffff) { $AbortBuiltin() }
+            $result0, $result1 := abi_decode_tuple_$bytes1_bytes1$_$vec$u8$_vec$u8$$_from_memory($t1, $t3)
+        }
+        function A1_vector_empty$u8$() -> vector {
+            vector := $Malloc(34)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function abi_decode_tuple_$bytes1_bytes1$_$vec$u8$_vec$u8$$_from_memory(headStart, dataEnd) -> value_0, value_1 {
+            if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+            {
+                let offset := 0
+                value_0 := abi_decode_bytes1_vec$u8$_from_memory(add(headStart, offset), dataEnd)
+            }
+            {
+                let offset := 32
+                value_1 := abi_decode_bytes1_vec$u8$_from_memory(add(headStart, offset), dataEnd)
+            }
+        }
+        function abi_decode_bytes1_vec$u8$_from_memory(offset, end) -> array {
+            if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+            let length := 1
+            let size := 33
+            array := abi_decode_available_length__bytes1_from_memory(offset, length, size, end)
+        }
+        function abi_decode_available_length__bytes1_from_memory(src, length, size, end) -> array {
+            array := $Malloc($CheckMemorySize(size))
+            $MemoryStoreU64(array, length)
+            $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+            let dst := add(array, 32)
+            if gt(add(src, sub(size, 32)), end) { $Abort(93) }
+            $CopyFromMemoryToMemory(src, dst, length)
+        }
+        function abi_encode_tuple_$bytes1_bytes1$_$vec$u8$_vec$u8$$(headStart ,value_0, value_1) -> tail {
+            tail := add(headStart, 64)
+            abi_encode_bytes1(value_0, add(headStart, 0))
+            abi_encode_bytes1(value_1, add(headStart, 32))
+        }
+        function abi_encode_bytes1(value, pos) {
+            let size := $MemoryLoadU64(value)
+            if iszero(eq(size, 1)) { $Abort(92) }
+            $CopyMemory(add(value, 0x20), pos, size)
+        }
+        function $Eq_$vec$u8$$(x, y) -> res
+        {
+            res := $EqVector(x, y, 1)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $StoreU8(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU8(offs, val)
+          }
+          default {
+            $StorageStoreU8(offs, val)
+          }
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $StorageStoreU8(offs, val) {
+          $StorageStoreBytes(offs, 1, val)
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $CheckMemorySize(len) -> checked_len {
+            if gt(len, 0xffffffffffffffff) { $AbortBuiltin() }
+            checked_len := len
+        }
+        function $CopyFromMemoryToMemory(src, dst, length) {
+          let i := 0
+          for { } lt(i, length) { i := add(i, 32) }
+          {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if gt(i, length)
+          {
+            // clear end
+            mstore(add(dst, length), 0)
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $AddU64(x, y) -> r {
+            if lt(sub(0xffffffffffffffff, x), y) { $AbortBuiltin() }
+            r := add(x, y)
+        }
+        function $LtEq(x, y) -> r {
+            r := or(lt(x, y), eq(x, y))
+        }
+        function $EqVector(x, y, elem_size) -> r {
+            let len_x := $MemoryLoadU64(x)
+            let len_y := $MemoryLoadU64(y)
+            if $Neq(len_x, len_y) {
+                r := false
+                leave
+            }
+            let data_size_bytes := mul(elem_size, len_x)
+            let num_words, overflow_bytes := $ToWordOffs(data_size_bytes)
+            let i := 0
+            for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+                if $Neq(mload(add(x, add(i, 32))), mload(add(y, add(i, 32)))) {
+                    r := false
+                    leave
+                }
+            }
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let x_overflow := mload(add(x, add(overflow_offs, 32)))
+            let y_overflow := mload(add(y, add(overflow_offs, 32)))
+            r := eq(or(mask, x_overflow), or(mask, y_overflow))
+        }
+        function $Neq(x, y) -> r {
+            r := $LogicalNot(eq(x, y))
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $ClosestGreaterPowerOfTwo(x) -> r {
+            r := or(r, shr(1, x))
+            r := or(r, shr(2, r))
+            r := or(r, shr(4, r))
+            r := or(r, shr(8, r))
+            r := or(r, shr(16, r))
+            r := or(r, shr(32, r))
+            r := add(x, 1)
+        }
+    }
+}
+===> Test result of M::test_marshalling_two_bytes1: Succeed(Stopped) (used_gas=78906): []
+
+// test of M::test_marshalling_two_u8
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_marshalling_two_u8" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_marshalling_two_u8()
+        return (0, 0)
+        function A2_M_test_marshalling_two_u8() {
+            let i, i_1, v1, v2, v_, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32, $t33, $t34
+            let $locals := $Malloc(32)
+            let $block := 3
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L3
+                    // $t7 := 31
+                    $t7 := 31
+                    // $t8 := <=($t0, $t7)
+                    $t8 := $LtEq(i, $t7)
+                    // if ($t8) goto L1 else goto L0
+                    switch $t8
+                    case 0  { $block := 5 }
+                    default { $block := 4 }
+                }
+                case 3 {
+                    // $t2 := vector::empty<u8>()
+                    mstore($locals, A1_vector_empty$u8$())
+                    // $t6 := 1
+                    $t6 := 1
+                    // $t0 := $t6
+                    i := $t6
+                    // goto L3
+                    $block := 2
+                }
+                case 4 {
+                    // label L1
+                    // goto L2
+                    $block := 6
+                }
+                case 5 {
+                    // label L0
+                    // $t12 := borrow_local($t2)
+                    $t12 := $MakePtr(false, $locals)
+                    // $t13 := 42
+                    $t13 := 42
+                    // vector::push_back<u8>($t12, $t13)
+                    A1_vector_push_back$u8$($t12, $t13)
+                    // $t14 := 1
+                    $t14 := 1
+                    // $t1 := $t14
+                    i_1 := $t14
+                    // goto L7
+                    $block := 7
+                }
+                case 6 {
+                    // label L2
+                    // $t9 := borrow_local($t2)
+                    $t9 := $MakePtr(false, $locals)
+                    // $t10 := 0
+                    $t10 := 0
+                    // vector::push_back<u8>($t9, $t10)
+                    A1_vector_push_back$u8$($t9, $t10)
+                    // $t11 := 1
+                    $t11 := 1
+                    // $t0 := +($t0, $t11)
+                    i := $AddU64(i, $t11)
+                    // goto L3
+                    $block := 2
+                }
+                case 7 {
+                    // label L7
+                    // $t15 := 31
+                    $t15 := 31
+                    // $t16 := <=($t1, $t15)
+                    $t16 := $LtEq(i_1, $t15)
+                    // if ($t16) goto L5 else goto L4
+                    switch $t16
+                    case 0  { $block := 9 }
+                    default { $block := 8 }
+                }
+                case 8 {
+                    // label L5
+                    // goto L6
+                    $block := 10
+                }
+                case 9 {
+                    // label L4
+                    // $t20 := borrow_local($t2)
+                    $t20 := $MakePtr(false, $locals)
+                    // $t21 := 43
+                    $t21 := 43
+                    // vector::push_back<u8>($t20, $t21)
+                    A1_vector_push_back$u8$($t20, $t21)
+                    // $t22 := copy($t2)
+                    $t22 := mload($locals)
+                    // ($t23, $t24) := M::decode_two_u8($t22)
+                    $t23, $t24 := A2_M_decode_two_u8($t22)
+                    // $t25 := 42
+                    $t25 := 42
+                    // $t26 := ==($t23, $t25)
+                    $t26 := $Eq($t23, $t25)
+                    // if ($t26) goto L9 else goto L8
+                    switch $t26
+                    case 0  { $block := 12 }
+                    default { $block := 11 }
+                }
+                case 10 {
+                    // label L6
+                    // $t17 := borrow_local($t2)
+                    $t17 := $MakePtr(false, $locals)
+                    // $t18 := 0
+                    $t18 := 0
+                    // vector::push_back<u8>($t17, $t18)
+                    A1_vector_push_back$u8$($t17, $t18)
+                    // $t19 := 1
+                    $t19 := 1
+                    // $t1 := +($t1, $t19)
+                    i_1 := $AddU64(i_1, $t19)
+                    // goto L7
+                    $block := 7
+                }
+                case 11 {
+                    // label L9
+                    // goto L10
+                    $block := 13
+                }
+                case 12 {
+                    // label L8
+                    // $t27 := 101
+                    $t27 := 101
+                    // abort($t27)
+                    $Abort($t27)
+                }
+                case 13 {
+                    // label L10
+                    // $t28 := 43
+                    $t28 := 43
+                    // $t29 := ==($t24, $t28)
+                    $t29 := $Eq($t24, $t28)
+                    // if ($t29) goto L12 else goto L11
+                    switch $t29
+                    case 0  { $block := 15 }
+                    default { $block := 14 }
+                }
+                case 14 {
+                    // label L12
+                    // goto L13
+                    $block := 16
+                }
+                case 15 {
+                    // label L11
+                    // $t30 := 102
+                    $t30 := 102
+                    // abort($t30)
+                    $Abort($t30)
+                }
+                case 16 {
+                    // label L13
+                    // $t31 := M::encode_two_u8($t23, $t24)
+                    $t31 := A2_M_encode_two_u8($t23, $t24)
+                    // $t32 := move($t2)
+                    $t32 := mload($locals)
+                    // $t33 := ==($t32, $t31)
+                    $t33 := $Eq_$vec$u8$$($t32, $t31)
+                    // if ($t33) goto L15 else goto L14
+                    switch $t33
+                    case 0  { $block := 18 }
+                    default { $block := 17 }
+                }
+                case 17 {
+                    // label L15
+                    // goto L16
+                    $block := 19
+                }
+                case 18 {
+                    // label L14
+                    // $t34 := 103
+                    $t34 := 103
+                    // abort($t34)
+                    $Abort($t34)
+                }
+                case 19 {
+                    // label L16
+                    // return ()
+                    $Free($locals, 32)
+                    leave
+                }
+            }
+        }
+
+        function A2_M_encode_two_u8(v1,v2) -> $result  {
+            $result := mload(0)
+            let $t2 := add($result, 32)
+            if gt($t2, 0xffffffffffffffff) { $AbortBuiltin() }
+            let $t3 := abi_encode_tuple_$uint8_uint8$_$u8_u8$($t2,v1,v2)
+            if gt($t3, 0xffffffffffffffff) { $AbortBuiltin() }
+            let $t4 := sub($t3, $t2)
+            $MemoryStoreU64($result, $t4)
+            let $t5 := $ClosestGreaterPowerOfTwo($t4)
+            $MemoryStoreU64(add($result, 8), $t5)
+            mstore(0, $t3)
+        }
+        function A1_vector_push_back$u8$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 1)))
+            $StoreU8(e_ptr, e)
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 1)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A2_M_decode_two_u8(input) -> $result0, $result1  {
+            let $t1 := add(input, 32)
+            let $t2 := $MemoryLoadU64(input)
+            let $t3 := add($t1, $t2)
+            if gt($t1, 0xffffffffffffffff) { $AbortBuiltin() }
+            if gt($t3, 0xffffffffffffffff) { $AbortBuiltin() }
+            $result0, $result1 := abi_decode_tuple_$uint8_uint8$_$u8_u8$_from_memory($t1, $t3)
+        }
+        function A1_vector_empty$u8$() -> vector {
+            vector := $Malloc(34)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function abi_decode_tuple_$uint8_uint8$_$u8_u8$_from_memory(headStart, dataEnd) -> value_0, value_1 {
+            if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+            {
+                let offset := 0
+                value_0 := abi_decode_uint8_from_memory(add(headStart, offset), dataEnd)
+            }
+            {
+                let offset := 32
+                value_1 := abi_decode_uint8_from_memory(add(headStart, offset), dataEnd)
+            }
+        }
+        function abi_decode_uint8_from_memory(offset, end) -> value {
+            value := mload(offset)
+            validator_uint8(value)
+        }
+        function validator_uint8(value) {
+            if iszero(eq(value, cleanup_uint8(value))) { $Abort(95) }
+        }
+        function cleanup_uint8(value) -> cleaned {
+            cleaned := and(value, 0xff)
+        }
+        function abi_encode_tuple_$uint8_uint8$_$u8_u8$(headStart ,value_0, value_1) -> tail {
+            tail := add(headStart, 64)
+            abi_encode_uint8(value_0, add(headStart, 0))
+            abi_encode_uint8(value_1, add(headStart, 32))
+        }
+        function abi_encode_uint8(value, pos) {
+            mstore(pos, cleanup_uint8(value))
+        }
+        function $Eq_$vec$u8$$(x, y) -> res
+        {
+            res := $EqVector(x, y, 1)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $StoreU8(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU8(offs, val)
+          }
+          default {
+            $StorageStoreU8(offs, val)
+          }
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $StorageStoreU8(offs, val) {
+          $StorageStoreBytes(offs, 1, val)
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $AddU64(x, y) -> r {
+            if lt(sub(0xffffffffffffffff, x), y) { $AbortBuiltin() }
+            r := add(x, y)
+        }
+        function $LtEq(x, y) -> r {
+            r := or(lt(x, y), eq(x, y))
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $EqVector(x, y, elem_size) -> r {
+            let len_x := $MemoryLoadU64(x)
+            let len_y := $MemoryLoadU64(y)
+            if $Neq(len_x, len_y) {
+                r := false
+                leave
+            }
+            let data_size_bytes := mul(elem_size, len_x)
+            let num_words, overflow_bytes := $ToWordOffs(data_size_bytes)
+            let i := 0
+            for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+                if $Neq(mload(add(x, add(i, 32))), mload(add(y, add(i, 32)))) {
+                    r := false
+                    leave
+                }
+            }
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let x_overflow := mload(add(x, add(overflow_offs, 32)))
+            let y_overflow := mload(add(y, add(overflow_offs, 32)))
+            r := eq(or(mask, x_overflow), or(mask, y_overflow))
+        }
+        function $Neq(x, y) -> r {
+            r := $LogicalNot(eq(x, y))
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $ClosestGreaterPowerOfTwo(x) -> r {
+            r := or(r, shr(1, x))
+            r := or(r, shr(2, r))
+            r := or(r, shr(4, r))
+            r := or(r, shr(8, r))
+            r := or(r, shr(16, r))
+            r := or(r, shr(32, r))
+            r := add(x, 1)
+        }
+    }
+}
+===> Test result of M::test_marshalling_two_u8: Succeed(Stopped) (used_gas=78803): []
+
+
+
+!! Move-To-Yul Diagnostics:
+ warning: unused alias
+  ┌─ tests/TestABINative.move:3:20
+  │
+3 │      use Evm::Evm::concat;
+  │                    ^^^^^^ Unused 'use' of alias 'concat'. Consider removing it
diff --git a/third_party/move/evm/move-to-yul/tests/TestABINativeError.v2_exp b/third_party/move/evm/move-to-yul/tests/TestABINativeError.v2_exp
new file mode 100644
index 0000000000000..3578572cdc5fe
--- /dev/null
+++ b/third_party/move/evm/move-to-yul/tests/TestABINativeError.v2_exp
@@ -0,0 +1,71 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_M" {
+    code {
+        codecopy(0, dataoffset("A2_M_deployed"), datasize("A2_M_deployed"))
+        return(0, datasize("A2_M_deployed"))
+    }
+    object "A2_M_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                default {}
+            }
+            $Abort(97)
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
+
+
+!! Move-To-Yul Diagnostics:
+ error: decode function must only has one argument of type bytes
+  ┌─ tests/TestABINativeError.move:8:5
+  │
+8 │     public native fun decode_wrong_input_type(input: vector<u64>): (u8, u8);
+  │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: decode function must only has one argument of type bytes
+   ┌─ tests/TestABINativeError.move:11:5
+   │
+11 │     public native fun decode_wrong_input_type_sig(input: vector<u64>): (u8, u8);
+   │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: encode function must only has one return value of type bytes
+   ┌─ tests/TestABINativeError.move:14:5
+   │
+14 │     public native fun encode_wrong_input_type(input: vector<u64>): vector<u64>;
+   │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: encode function must only has one return value of type bytes
+   ┌─ tests/TestABINativeError.move:17:5
+   │
+17 │     public native fun encode_wrong_input_type_sig(input: vector<u64>): vector<u64>;
+   │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: encode function must only has one return value of type bytes
+   ┌─ tests/TestABINativeError.move:20:5
+   │
+20 │     public native fun encode_wrong_input_type_packed(input: vector<u64>): vector<u64>;
+   │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: encode function must only has one return value of type bytes
+   ┌─ tests/TestABINativeError.move:23:5
+   │
+23 │     public native fun encode_wrong_input_type_packed_sig(input: vector<u64>): vector<u64>;
+   │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/third_party/move/evm/move-to-yul/tests/TestABIStructs.v2_exp b/third_party/move/evm/move-to-yul/tests/TestABIStructs.v2_exp
new file mode 100644
index 0000000000000..49a3eb0ea4782
--- /dev/null
+++ b/third_party/move/evm/move-to-yul/tests/TestABIStructs.v2_exp
@@ -0,0 +1,2974 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_M" {
+    code {
+        codecopy(0, dataoffset("A2_M_deployed"), datasize("A2_M_deployed"))
+        return(0, datasize("A2_M_deployed"))
+    }
+    object "A2_M_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                case 0xcf61f38d
+                {
+                    // do_transfer()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    A2_M_do_transfer()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x5bd0cf08
+                {
+                    // test_2((uint64,bool,(uint128[])[]))
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$_uint64_bool__uint128______$_$A2_M_S$(4, calldatasize())
+                    let ret_0 := A2_M_test_2_S(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$_uint64_bool__uint128______$_$A2_M_S$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x99472457
+                {
+                    // test_s_struct((bytes))
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$_bytes_$_$A1_ascii_String$(4, calldatasize())
+                    let ret_0 := A2_M_test_String_struct(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$_bytes_$_$A1_ascii_String$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x4c3d6ddc
+                {
+                    // test_array((uint64,bool,(uint128[])[])[][2])
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$_uint64_bool__uint128_________2_$_$vec$vec$A2_M_S$$$(4, calldatasize())
+                    let ret_0 := A2_M_test_array(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$_uint64_bool__uint128________$_$vec$A2_M_S$$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xf8a8fd6d
+                {
+                    // test()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let ret_0 := A2_M_test_pack_S()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$_uint64_bool__uint128______$_$A2_M_S$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xa6853da5
+                {
+                    // test_safe_transfer_from()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let ret_0 := A2_M_test_safe_transfer_from()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$_uint128___$_$A2_M_S2$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                default {}
+            }
+            $Abort(97)
+            function A2_M_do_transfer() {
+                let $t0, $t1, $t2, $t3
+                // $t0 := 42
+                $t0 := 42
+                // $t1 := true
+                $t1 := true
+                // $t2 := M::pack_S($t0, $t1)
+                $t2 := A2_M_pack_S($t0, $t1)
+                // $t3 := pack M::Event_S($t2)
+                {
+                    let $mem := $Malloc(32)
+                    $MemoryStoreU256(add($mem, 0), $t2)
+                    $t3 := $mem
+                }
+                // Evm::emit<M::Event_S>($t3)
+                A2_Evm_emit$A2_M_Event_S$($t3)
+                // return ()
+            }
+
+            function A2_M_test_2_S(s) -> $result {
+                // return $t0
+                $result := s
+            }
+
+            function A2_M_test_String_struct(s) -> $result {
+                // return $t0
+                $result := s
+            }
+
+            function A2_M_test_array(v) -> $result {
+                let $t1, $t2, $t3, $t4
+                let $locals := $Malloc(32)
+                mstore($locals, v)
+                // $t1 := borrow_local($t0)
+                $t1 := $MakePtr(false, $locals)
+                // $t2 := 0
+                $t2 := 0
+                // $t3 := vector::borrow<vector<M::S>>($t1, $t2)
+                $t3 := A1_vector_borrow$vec$A2_M_S$$($t1, $t2)
+                // $t4 := read_ref($t3)
+                $t4 := $LoadU256($t3)
+                if $IsStoragePtr($t3){
+                    let $storage_ptr_3616935342
+                    let $size_3616935342 := $StorageLoadU64($t4)
+                    let $capacity_3616935342 := $ClosestGreaterPowerOfTwo($size_3616935342)
+                    $storage_ptr_3616935342 := $Malloc(add(32, mul($capacity_3616935342, 32)))
+                    let $data_size_3616935342 := mul($size_3616935342, 32)
+                    mstore($storage_ptr_3616935342, $AlignedStorageLoad($t4))
+                    $MemoryStoreU64(add($storage_ptr_3616935342, 8), $capacity_3616935342)
+                    let $data_src_3616935342 := add($t4, 32)
+                    let $data_dst_3616935342 := add($storage_ptr_3616935342, 32)
+                    for { let $offs_3616935342 := 0 } lt($offs_3616935342, $data_size_3616935342) { $offs_3616935342 := add($offs_3616935342, 32)} {
+                        {
+                            let $linked_src_1770153451 := $AlignedStorageLoad(add($data_src_3616935342, $offs_3616935342))
+                            let $linked_dst_1770153451
+                            $linked_dst_1770153451 := $Malloc(41)
+                            {
+                                let $linked_src_894856441 := $AlignedStorageLoad(add($linked_src_1770153451, 0))
+                                let $linked_dst_894856441
+                                let $size_894856441 := $StorageLoadU64($linked_src_894856441)
+                                let $capacity_894856441 := $ClosestGreaterPowerOfTwo($size_894856441)
+                                $linked_dst_894856441 := $Malloc(add(32, mul($capacity_894856441, 32)))
+                                let $data_size_894856441 := mul($size_894856441, 32)
+                                mstore($linked_dst_894856441, $AlignedStorageLoad($linked_src_894856441))
+                                $MemoryStoreU64(add($linked_dst_894856441, 8), $capacity_894856441)
+                                let $data_src_894856441 := add($linked_src_894856441, 32)
+                                let $data_dst_894856441 := add($linked_dst_894856441, 32)
+                                for { let $offs_894856441 := 0 } lt($offs_894856441, $data_size_894856441) { $offs_894856441 := add($offs_894856441, 32)} {
+                                    {
+                                        let $linked_src_1602512591 := $AlignedStorageLoad(add($data_src_894856441, $offs_894856441))
+                                        let $linked_dst_1602512591
+                                        $linked_dst_1602512591 := $Malloc(32)
+                                        {
+                                            let $linked_src_2315022182 := $AlignedStorageLoad(add($linked_src_1602512591, 0))
+                                            let $linked_dst_2315022182
+                                            let $size_2315022182 := $StorageLoadU64($linked_src_2315022182)
+                                            let $capacity_2315022182 := $ClosestGreaterPowerOfTwo($size_2315022182)
+                                            $linked_dst_2315022182 := $Malloc(add(32, mul($capacity_2315022182, 16)))
+                                            let $data_size_2315022182 := mul($size_2315022182, 16)
+                                            mstore($linked_dst_2315022182, $AlignedStorageLoad($linked_src_2315022182))
+                                            $MemoryStoreU64(add($linked_dst_2315022182, 8), $capacity_2315022182)
+                                            let $data_src_2315022182 := add($linked_src_2315022182, 32)
+                                            let $data_dst_2315022182 := add($linked_dst_2315022182, 32)
+                                            for { let $offs_2315022182 := 0 } lt($offs_2315022182, $data_size_2315022182) { $offs_2315022182 := add($offs_2315022182, 32)} {
+                                                mstore(add($data_dst_2315022182, $offs_2315022182), $AlignedStorageLoad(add($data_src_2315022182, $offs_2315022182)))
+                                            }
+                                            mstore(add($linked_dst_1602512591, 0), $linked_dst_2315022182)
+                                        }
+                                        mstore(add($data_dst_894856441, $offs_894856441), $linked_dst_1602512591)
+                                    }
+                                }
+                                mstore(add($linked_dst_1770153451, 0), $linked_dst_894856441)
+                            }
+                            mstore(add($linked_dst_1770153451, 32), $AlignedStorageLoad(add($linked_src_1770153451, 32)))
+                            mstore(add($data_dst_3616935342, $offs_3616935342), $linked_dst_1770153451)
+                        }
+                    }
+                    $t4 := $storage_ptr_3616935342
+                }
+                // return $t4
+                $result := $t4
+                $Free($locals, 32)
+            }
+
+            function A2_M_test_pack_S() -> $result {
+                let $t0, $t1, $t2
+                // $t0 := 42
+                $t0 := 42
+                // $t1 := true
+                $t1 := true
+                // $t2 := M::pack_S($t0, $t1)
+                $t2 := A2_M_pack_S($t0, $t1)
+                // return $t2
+                $result := $t2
+            }
+
+            function A2_M_test_safe_transfer_from() -> $result {
+                let s, $t1, $t2, $t3, $t4, $t5
+                // $t1 := 42
+                $t1 := 42
+                // $t2 := true
+                $t2 := true
+                // $t3 := M::pack_S($t1, $t2)
+                $t3 := A2_M_pack_S($t1, $t2)
+                // $t4 := 0x3
+                $t4 := 0x3
+                // $t5 := M::safe_transfer_form($t4, $t3)
+                $t5 := A2_M_safe_transfer_form($t4, $t3)
+                // return $t5
+                $result := $t5
+            }
+
+            function A2_M_safe_transfer_form(contract, s) -> $result  {
+                // storage for arguments and returned data
+                let $t2 := mload(0)
+                mstore($t2, $Shl(0xd9f27567, 224))
+                let $t3 := abi_encode_tuple_$_uint64_bool__uint128______$_$A2_M_S$(add($t2, 4), s)
+                let $t4 := call(gas(), contract, 0,  $t2, sub($t3, $t2), $t2, 0)
+                // set freeMemoryPointer
+                mstore(0, $t3)
+                if iszero($t4) { $RevertForward() }
+                if $t4 {
+                    // copy dynamic return data out
+                    returndatacopy($t2, 0, returndatasize())
+                    // decode return parameters from external try-call into retVars
+                    $result := abi_decode_tuple_$_uint128___$_$A2_M_S2$_from_memory($t2, add($t2, returndatasize()))
+                }
+            }
+            function A2_M_pack_S(a, b) -> $result {
+                let s2, $t4, $t5, $t6, $t7, $t8
+                let $locals := $Malloc(32)
+                // $t3 := vector::empty<M::S2>()
+                mstore($locals, A1_vector_empty$A2_M_S2$())
+                // $t4 := (u128)($t0)
+                $t4 := $CastU128(a)
+                // $t5 := M::pack_S2($t4)
+                $t5 := A2_M_pack_S2($t4)
+                // $t6 := borrow_local($t3)
+                $t6 := $MakePtr(false, $locals)
+                // vector::push_back<M::S2>($t6, $t5)
+                A1_vector_push_back$A2_M_S2$($t6, $t5)
+                // $t7 := move($t3)
+                $t7 := mload($locals)
+                // $t8 := pack M::S($t0, $t1, $t7)
+                {
+                    let $mem := $Malloc(41)
+                    $MemoryStoreU64(add($mem, 32), a)
+                    $MemoryStoreU8(add($mem, 40), b)
+                    $MemoryStoreU256(add($mem, 0), $t7)
+                    $t8 := $mem
+                }
+                // return $t8
+                $result := $t8
+                $Free($locals, 32)
+            }
+
+            function A1_vector_push_back$A2_M_S2$(v_ref, e) {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                let size := $LoadU64(v_ptr)
+                let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 32)))
+                $StoreU256(e_ptr, e)
+                if $IsStoragePtr(e_ptr) {
+                    let e_offs := $OffsetPtr(e_ptr)
+                    let $linked_dst_1602512591 := $NewLinkedStorageBase(0x5f8466cf)
+                    {
+                        let $linked_src_2315022182 := mload(add(e, 0))
+                        let $linked_dst_2315022182 := $NewLinkedStorageBase(0x89fc6f66)
+                        let $size_2315022182 := $MemoryLoadU64($linked_src_2315022182)
+                        let $data_size_2315022182 := mul($size_2315022182, 16)
+                        $AlignedStorageStore($linked_dst_2315022182, mload($linked_src_2315022182))
+                        let $data_src_2315022182 := add($linked_src_2315022182, 32)
+                        let $data_dst_2315022182 := add($linked_dst_2315022182, 32)
+                        for { let $offs_2315022182 := 0 } lt($offs_2315022182, $data_size_2315022182) { $offs_2315022182 := add($offs_2315022182, 32)} {
+                            $AlignedStorageStore(add($data_dst_2315022182, $offs_2315022182), mload(add($data_src_2315022182, $offs_2315022182)))
+                            $Free($linked_src_2315022182, add($data_size_2315022182, 32))
+                        }
+                        $AlignedStorageStore(add($linked_dst_1602512591, 0), $linked_dst_2315022182)
+                    }
+                    $Free(e, 32)
+                    $AlignedStorageStore(e_offs, $linked_dst_1602512591)
+                }
+                size := add(size, 1)
+                $StoreU64(v_ptr, size)
+                let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+                if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                    let new_v_offs := $ResizeVector(v_offs, capacity, 32)
+                    $StoreU256(v_ref, new_v_offs)
+                }
+            }
+            function A2_M_pack_S2(x) -> $result {
+                let $t2, $t3, $t4
+                let $locals := $Malloc(32)
+                // $t1 := vector::empty<u128>()
+                mstore($locals, A1_vector_empty$u128$())
+                // $t2 := borrow_local($t1)
+                $t2 := $MakePtr(false, $locals)
+                // vector::push_back<u128>($t2, $t0)
+                A1_vector_push_back$u128$($t2, x)
+                // $t3 := move($t1)
+                $t3 := mload($locals)
+                // $t4 := pack M::S2($t3)
+                {
+                    let $mem := $Malloc(32)
+                    $MemoryStoreU256(add($mem, 0), $t3)
+                    $t4 := $mem
+                }
+                // return $t4
+                $result := $t4
+                $Free($locals, 32)
+            }
+
+            function A1_vector_push_back$u128$(v_ref, e) {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                let size := $LoadU64(v_ptr)
+                let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 16)))
+                $StoreU128(e_ptr, e)
+                size := add(size, 1)
+                $StoreU64(v_ptr, size)
+                let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+                if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                    let new_v_offs := $ResizeVector(v_offs, capacity, 16)
+                    $StoreU256(v_ref, new_v_offs)
+                }
+            }
+            function A1_vector_empty$u128$() -> vector {
+                vector := $Malloc(64)
+                $MemoryStoreU64(add(vector, 8), 2)
+            }
+            function A1_vector_empty$A2_M_S2$() -> vector {
+                vector := $Malloc(96)
+                $MemoryStoreU64(add(vector, 8), 2)
+            }
+            function A1_vector_borrow$vec$A2_M_S$$(v_ref, i) -> e_ptr {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                let size := $LoadU64(v_ptr)
+                if $GtEq(i, size) { $AbortBuiltin() }
+                e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 32)))
+            }
+            function A2_Evm_emit$A2_M_Event_S$(e) {
+                let $t1 := 0x63832c328fffa84736f81dee39bf126d59b4a7c5c1bb370244d025be5b10230b
+                let $t2 := $MemoryLoadU256(add(e, 0))
+                {
+                    let $t3 := mload(0)
+                    let $t4 := abi_encode_tuple_$_uint64_bool__uint128______$_$A2_M_S$($t3, $t2)
+                    log1($t3, sub($t4, $t3), $t1)
+                    mstore(0, $t4)
+                }
+            }
+            function abi_encode_tuple_$_uint64_bool__uint128______$_$A2_M_S$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                mstore(add(headStart, 0), sub(tail, headStart))
+                tail := abi_encode_$uint64_bool__uint128_____$_$A2_M_S$(value_0,  tail)
+            }
+            function abi_encode_$uint64_bool__uint128_____$_$A2_M_S$(value, pos) -> end {
+                let tail := add(pos, 96)
+                let value_0 := $MemoryLoadU64(add(value, 32))
+                abi_encode_uint64(value_0, add(pos, 0))
+                let value_1 := $MemoryLoadU8(add(value, 40))
+                abi_encode_bool(value_1, add(pos, 32))
+                let value_2 := $MemoryLoadU256(add(value, 0))
+                mstore(add(pos, 64), sub(tail, pos))
+                tail := abi_encode__uint128______vec$A2_M_S2$(value_2, tail)
+                end := tail
+            }
+            function abi_encode__uint128______vec$A2_M_S2$(value, pos) -> end {
+                let length := $MemoryLoadU64(value)
+                mstore(pos, length)
+                pos := add(pos, 0x20)
+                let headStart := pos
+                let tail := add(pos, mul(length, 0x20))
+                let start := add(value, 32)
+                let srcEnd := add(start, mul(length, 32))
+                for { let src := start } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    mstore(pos, sub(tail, headStart))
+                    let v := $MemoryLoadU256(src)
+                    tail := abi_encode_$uint128__$_$A2_M_S2$_with_updated_pos(v, tail)
+                    pos := add(pos, 0x20)
+                }
+                pos := tail
+                end := pos
+            }
+            function abi_encode_$uint128__$_$A2_M_S2$_with_updated_pos(value, pos) -> updated_pos{
+                updated_pos := abi_encode_$uint128__$_$A2_M_S2$(value, pos)
+            }
+            function abi_encode_$uint128__$_$A2_M_S2$(value, pos) -> end {
+                let tail := add(pos, 32)
+                let value_0 := $MemoryLoadU256(add(value, 0))
+                mstore(add(pos, 0), sub(tail, pos))
+                tail := abi_encode_uint128___vec$u128$(value_0, tail)
+                end := tail
+            }
+            function abi_encode_uint128___vec$u128$(value, pos) -> end {
+                let length := $MemoryLoadU64(value)
+                mstore(pos, length)
+                pos := add(pos, 0x20)
+                let start := add(value, 32)
+                let srcEnd := add(start, mul(length, 16))
+                for { let src := start } lt(src, srcEnd) { src := add(src, 16) }
+                {
+                    let v := $MemoryLoadU128(src)
+                    pos := abi_encode_uint128_with_updated_pos(v, pos)
+                }
+                end := pos
+            }
+            function abi_encode_uint128_with_updated_pos(value, pos) -> updated_pos{
+                abi_encode_uint128(value, pos)
+                updated_pos := add(pos, 32)
+            }
+            function abi_encode_uint128(value, pos) {
+                mstore(pos, cleanup_uint128(value))
+            }
+            function cleanup_uint128(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffffffffffffffffffff)
+            }
+            function abi_encode_bool(value, pos) {
+                mstore(pos, cleanup_bool(value))
+            }
+            function cleanup_bool(value) -> cleaned {
+                cleaned := and(value, 0xff)
+            }
+            function abi_encode_uint64(value, pos) {
+                mstore(pos, cleanup_uint64(value))
+            }
+            function cleanup_uint64(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffff)
+            }
+            function abi_decode_tuple_$_uint128___$_$A2_M_S2$_from_memory(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := mload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_$uint128__$_$A2_M_S2$_from_memory(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_$uint128__$_$A2_M_S2$_from_memory(headStart, end) -> value {
+                if slt(sub(end, headStart), 32) { $Abort(90) }
+                let value_0
+                value := $Malloc(32)
+                {
+                    let offset := mload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_uint128___vec$u128$_from_memory(add(headStart, offset), end)
+                }
+                $MemoryStoreU256(add(value, 0), value_0)
+            }
+            function abi_decode_uint128___vec$u128$_from_memory(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := mload(offset)
+                let size := add(mul(16, length), 32)
+                array := abi_decode_available_length__uint128___vec$u128$_from_memory(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__uint128___vec$u128$_from_memory(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint128_from_memory(elementPos, end)
+                    $MemoryStoreU128(dst, value)
+                    dst := add(dst, 16)
+                }
+            }
+            function abi_decode_uint128_from_memory(offset, end) -> value {
+                value := mload(offset)
+                validator_uint128(value)
+            }
+            function validator_uint128(value) {
+                if iszero(eq(value, cleanup_uint128(value))) { $Abort(95) }
+            }
+            function abi_encode_tuple_$_uint128___$_$A2_M_S2$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                mstore(add(headStart, 0), sub(tail, headStart))
+                tail := abi_encode_$uint128__$_$A2_M_S2$(value_0,  tail)
+            }
+            function abi_encode_tuple_$_uint64_bool__uint128________$_$vec$A2_M_S$$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                mstore(add(headStart, 0), sub(tail, headStart))
+                tail := abi_encode__uint64_bool__uint128_________vec$A2_M_S$(value_0,  tail)
+            }
+            function abi_encode__uint64_bool__uint128_________vec$A2_M_S$(value, pos) -> end {
+                let length := $MemoryLoadU64(value)
+                mstore(pos, length)
+                pos := add(pos, 0x20)
+                let headStart := pos
+                let tail := add(pos, mul(length, 0x20))
+                let start := add(value, 32)
+                let srcEnd := add(start, mul(length, 32))
+                for { let src := start } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    mstore(pos, sub(tail, headStart))
+                    let v := $MemoryLoadU256(src)
+                    tail := abi_encode_$uint64_bool__uint128_____$_$A2_M_S$_with_updated_pos(v, tail)
+                    pos := add(pos, 0x20)
+                }
+                pos := tail
+                end := pos
+            }
+            function abi_encode_$uint64_bool__uint128_____$_$A2_M_S$_with_updated_pos(value, pos) -> updated_pos{
+                updated_pos := abi_encode_$uint64_bool__uint128_____$_$A2_M_S$(value, pos)
+            }
+            function abi_decode_tuple_$_uint64_bool__uint128_________2_$_$vec$vec$A2_M_S$$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode__uint64_bool__uint128_________2__vec$vec$A2_M_S$$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode__uint64_bool__uint128_________2__vec$vec$A2_M_S$$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 2
+                let size := 96
+                array := abi_decode_available_length___uint64_bool__uint128_________2__vec$vec$A2_M_S$$(offset, length, size, end)
+            }
+            function abi_decode_available_length___uint64_bool__uint128_________2__vec$vec$A2_M_S$$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let innerOffset := calldataload(src)
+                    if gt(innerOffset, 0xffffffffffffffff) { $Abort(94) }
+                    let elementPos := add(offset, innerOffset)
+                    let value := abi_decode__uint64_bool__uint128_________vec$A2_M_S$(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode__uint64_bool__uint128_________vec$A2_M_S$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(32, length), 32)
+                array := abi_decode_available_length___uint64_bool__uint128_________vec$A2_M_S$(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length___uint64_bool__uint128_________vec$A2_M_S$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let innerOffset := calldataload(src)
+                    if gt(innerOffset, 0xffffffffffffffff) { $Abort(94) }
+                    let elementPos := add(offset, innerOffset)
+                    let value := abi_decode_$uint64_bool__uint128_____$_$A2_M_S$(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode_$uint64_bool__uint128_____$_$A2_M_S$(headStart, end) -> value {
+                if slt(sub(end, headStart), 96) { $Abort(90) }
+                let value_0, value_1, value_2
+                value := $Malloc(96)
+                {
+                    let offset := 0
+                    value_0 := abi_decode_uint64(add(headStart, offset), end)
+                }
+                $MemoryStoreU64(add(value, 32), value_0)
+                {
+                    let offset := 32
+                    value_1 := abi_decode_bool(add(headStart, offset), end)
+                }
+                $MemoryStoreU8(add(value, 40), value_1)
+                {
+                    let offset := calldataload(add(headStart, 64))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_2 := abi_decode__uint128______vec$A2_M_S2$(add(headStart, offset), end)
+                }
+                $MemoryStoreU256(add(value, 0), value_2)
+            }
+            function abi_decode__uint128______vec$A2_M_S2$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(32, length), 32)
+                array := abi_decode_available_length___uint128______vec$A2_M_S2$(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length___uint128______vec$A2_M_S2$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let innerOffset := calldataload(src)
+                    if gt(innerOffset, 0xffffffffffffffff) { $Abort(94) }
+                    let elementPos := add(offset, innerOffset)
+                    let value := abi_decode_$uint128__$_$A2_M_S2$(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode_$uint128__$_$A2_M_S2$(headStart, end) -> value {
+                if slt(sub(end, headStart), 32) { $Abort(90) }
+                let value_0
+                value := $Malloc(32)
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_uint128___vec$u128$(add(headStart, offset), end)
+                }
+                $MemoryStoreU256(add(value, 0), value_0)
+            }
+            function abi_decode_uint128___vec$u128$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(16, length), 32)
+                array := abi_decode_available_length__uint128___vec$u128$(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__uint128___vec$u128$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint128(elementPos, end)
+                    $MemoryStoreU128(dst, value)
+                    dst := add(dst, 16)
+                }
+            }
+            function abi_decode_uint128(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint128(value)
+            }
+            function abi_decode_bool(offset, end) -> value {
+                value := calldataload(offset)
+                validator_bool(value)
+            }
+            function validator_bool(value) {
+                if iszero(eq(value, cleanup_bool(value))) { $Abort(95) }
+            }
+            function abi_decode_uint64(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint64(value)
+            }
+            function validator_uint64(value) {
+                if iszero(eq(value, cleanup_uint64(value))) { $Abort(95) }
+            }
+            function abi_encode_tuple_$_bytes_$_$A1_ascii_String$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                mstore(add(headStart, 0), sub(tail, headStart))
+                tail := abi_encode_$bytes$_$A1_ascii_String$(value_0,  tail)
+            }
+            function abi_encode_$bytes$_$A1_ascii_String$(value, pos) -> end {
+                let tail := add(pos, 32)
+                let value_0 := $MemoryLoadU256(add(value, 0))
+                mstore(add(pos, 0), sub(tail, pos))
+                tail := abi_encode_bytes(value_0, tail)
+                end := tail
+            }
+            function abi_encode_bytes(value, pos) -> end{
+                let size := $MemoryLoadU64(value)
+                mstore(pos, size)
+                pos := add(pos, 0x20)
+                $CopyMemory(add(value, 0x20), pos, size)
+                size := $RoundUp(size)
+                end := add(pos, size)
+            }
+            function abi_decode_tuple_$_bytes_$_$A1_ascii_String$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_$bytes$_$A1_ascii_String$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_$bytes$_$A1_ascii_String$(headStart, end) -> value {
+                if slt(sub(end, headStart), 32) { $Abort(90) }
+                let value_0
+                value := $Malloc(32)
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_bytes_vec$u8$(add(headStart, offset), end)
+                }
+                $MemoryStoreU256(add(value, 0), value_0)
+            }
+            function abi_decode_bytes_vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(1, length), 32)
+                array := abi_decode_available_length__bytes(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__bytes(src, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                if gt(add(src, sub(size, 32)), end) { $Abort(93) }
+                $CopyFromCallDataToMemory(src, dst, length)
+            }
+            function abi_decode_tuple_$_uint64_bool__uint128______$_$A2_M_S$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_$uint64_bool__uint128_____$_$A2_M_S$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_encode_tuple__(headStart ) -> tail {
+                tail := add(headStart, 0)
+            }
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $AbortBuiltin() {
+                $Abort(sub(0, 1))
+            }
+            function $RevertForward() {
+              let pos := mload(0)
+              returndatacopy(pos, 0, returndatasize())
+              revert(pos, returndatasize())
+            }
+            function $Malloc(size) -> offs {
+                offs := mload(0)
+                // pad to word size
+                mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+            }
+            function $Free(offs, size) {
+            }
+            function $MakePtr(is_storage, offs) -> ptr {
+              ptr := or(is_storage, shl(1, offs))
+            }
+            function $IsStoragePtr(ptr) -> b {
+              b := and(ptr, 0x1)
+            }
+            function $OffsetPtr(ptr) -> offs {
+              offs := shr(1, ptr)
+            }
+            function $MaskForSize(size) -> mask {
+              mask := sub(shl(shl(3, size), 1), 1)
+            }
+            function $ExtractBytes(word, start, size) -> bytes {
+               switch size
+               case 1 {
+                  // use the faster byte primitive
+                  bytes := byte(start, word)
+               }
+               default {
+                  // As we have big endian, we need to right shift the value from
+                  // where the highest byte starts in the word (32 - start), minus
+                  // the size.
+                  let shift_bits := shl(3, sub(sub(32, start), size))
+                  bytes := and(shr(shift_bits, word), $MaskForSize(size))
+               }
+            }
+            function $InjectBytes(word, start, size, bytes) -> new_word {
+               let shift_bits := shl(3, sub(sub(32, start), size))
+               // Blend out the bits which we inject
+               let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+               word := and(word, neg_mask)
+               // Overlay the bits we inject
+               new_word := or(word, shl(shift_bits, bytes))
+            }
+            function $ToWordOffs(offs) -> word_offs, byte_offset {
+              word_offs := shr(5, offs)
+              byte_offset := and(offs, 0x1F)
+            }
+            function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+              let available_bytes := sub(32, byte_offset)
+              switch gt(size, available_bytes)
+              case 0 {
+                overflow_bytes := 0
+              }
+              default {
+                overflow_bytes := sub(size, available_bytes)
+              }
+            }
+            function $MemoryLoadBytes(offs, size) -> val {
+              // Lower bit where the value in the higher bytes ends
+              let bit_end := shl(3, sub(32, size))
+              val := shr(bit_end, mload(offs))
+            }
+            function $MemoryStoreBytes(offs, size, val) {
+              let bit_end := shl(3, sub(32, size))
+              let mask := shl(bit_end, $MaskForSize(size))
+              mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+            }
+            function $StorageLoadBytes(offs, size) -> val {
+              let word_offs, byte_offs := $ToWordOffs(offs)
+              let key := $StorageKey(0, word_offs)
+              val := $ExtractBytes(sload(key), byte_offs, size)
+              let overflow_bytes := $OverflowBytes(byte_offs, size)
+              if $LogicalNot(iszero(overflow_bytes)) {
+                key := $StorageKey(0, add(word_offs, 1))
+                let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+                val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+              }
+            }
+            function $StorageStoreBytes(offs, size, bytes) {
+              let word_offs, byte_offs := $ToWordOffs(offs)
+              let key := $StorageKey(0, word_offs)
+              let overflow_bytes := $OverflowBytes(byte_offs, size)
+              switch overflow_bytes
+              case 0 {
+                sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+              }
+              default {
+                // Shift the higher bytes to the right
+                let used_bytes := sub(size, overflow_bytes)
+                let higher_bytes := shr(used_bytes, bytes)
+                let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+                sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+                key := $StorageKey(0, add(word_offs, 1))
+                sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+              }
+            }
+            function $StorageKey(group, word) -> key {
+              mstore(32, word)
+              mstore(64, shl(224, group))
+              key := keccak256(32, 36)
+            }
+            function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+              offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+            }
+            function $NewLinkedStorageBase(type_hash) -> offs {
+              let key := $StorageKey(1, 1)
+              let handle := sload(key)
+              sstore(key, add(handle, 1))
+              offs := $MakeTypeStorageBase(1, type_hash, handle)
+            }
+            function $IndexPtr(ptr, offs) -> new_ptr {
+              new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+            }
+            function $MemoryLoadU8(offs) -> val {
+              val := $MemoryLoadBytes(offs, 1)
+            }
+            function $MemoryStoreU8(offs, val) {
+              // Shortcut via special instruction
+              mstore8(offs, val)
+            }
+            function $LoadU64(ptr) -> val {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                val := $MemoryLoadU64(offs)
+              }
+              default {
+                val := $StorageLoadU64(offs)
+              }
+            }
+            function $MemoryLoadU64(offs) -> val {
+              val := $MemoryLoadBytes(offs, 8)
+            }
+            function $StorageLoadU64(offs) -> val {
+              val := $StorageLoadBytes(offs, 8)
+            }
+            function $StoreU64(ptr, val) {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                $MemoryStoreU64(offs, val)
+              }
+              default {
+                $StorageStoreU64(offs, val)
+              }
+            }
+            function $MemoryStoreU64(offs, val) {
+              $MemoryStoreBytes(offs, 8, val)
+            }
+            function $StorageStoreU64(offs, val) {
+              $StorageStoreBytes(offs, 8, val)
+            }
+            function $MemoryLoadU128(offs) -> val {
+              val := $MemoryLoadBytes(offs, 16)
+            }
+            function $StoreU128(ptr, val) {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                $MemoryStoreU128(offs, val)
+              }
+              default {
+                $StorageStoreU128(offs, val)
+              }
+            }
+            function $MemoryStoreU128(offs, val) {
+              $MemoryStoreBytes(offs, 16, val)
+            }
+            function $StorageStoreU128(offs, val) {
+              $StorageStoreBytes(offs, 16, val)
+            }
+            function $LoadU256(ptr) -> val {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                val := $MemoryLoadU256(offs)
+              }
+              default {
+                val := $StorageLoadU256(offs)
+              }
+            }
+            function $MemoryLoadU256(offs) -> val {
+              val := $MemoryLoadBytes(offs, 32)
+            }
+            function $StorageLoadU256(offs) -> val {
+              val := $StorageLoadBytes(offs, 32)
+            }
+            function $StoreU256(ptr, val) {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                $MemoryStoreU256(offs, val)
+              }
+              default {
+                $StorageStoreU256(offs, val)
+              }
+            }
+            function $MemoryStoreU256(offs, val) {
+              $MemoryStoreBytes(offs, 32, val)
+            }
+            function $StorageStoreU256(offs, val) {
+              $StorageStoreBytes(offs, 32, val)
+            }
+            function $AlignedStorageLoad(offs) -> val {
+              let word_offs := shr(5, offs)
+              val := sload($StorageKey(0, word_offs))
+            }
+            function $AlignedStorageStore(offs, val) {
+              let word_offs := shr(5, offs)
+              sstore($StorageKey(0, word_offs), val)
+            }
+            function $CopyMemory(src, dst, size) {
+              let num_words, overflow_bytes := $ToWordOffs(size)
+              let i := 0
+              for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+                mstore(add(dst, i), mload(add(src, i)))
+              }
+              if overflow_bytes {
+                let mask := $MaskForSize(sub(32, overflow_bytes))
+                let overflow_offs := mul(num_words, 32)
+                let dst_word := and(mload(add(dst, overflow_offs)), mask)
+                let src_word := and(mload(add(src, overflow_offs)), not(mask))
+                mstore(add(dst, overflow_offs), or(dst_word, src_word))
+              }
+            }
+            function $CheckMemorySize(len) -> checked_len {
+                if gt(len, 0xffffffffffffffff) { $AbortBuiltin() }
+                checked_len := len
+            }
+            function $CopyFromCallDataToMemory(src, dst, length) {
+                calldatacopy(dst, src, length)
+                mstore(add(dst, length), 0)
+            }
+            function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+                let new_capacity := mul(capacity, 2)
+                let data_size := add(32, mul(capacity, type_size))
+                let new_data_size := add(32, mul(new_capacity, type_size))
+                new_v_offs := $Malloc(new_data_size)
+                $CopyMemory(v_offs, new_v_offs, data_size)
+                // update capacity at new location
+                $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+                $Free(v_offs, data_size)
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+            function $Shl(x, y) -> r {
+              r := shl(y, x)
+            }
+            function $GtEq(x, y) -> r {
+                r := or(gt(x, y), eq(x, y))
+            }
+            function $LogicalNot(x) -> r {
+                r := iszero(x)
+            }
+            function $CastU128(x) -> r {
+                if gt(x, 0xffffffffffffffffffffffffffffffff) { $AbortBuiltin() }
+                r := x
+            }
+            function $ClosestGreaterPowerOfTwo(x) -> r {
+                r := or(r, shr(1, x))
+                r := or(r, shr(2, r))
+                r := or(r, shr(4, r))
+                r := or(r, shr(8, r))
+                r := or(r, shr(16, r))
+                r := or(r, shr(32, r))
+                r := add(x, 1)
+            }
+            function $RoundUp(value) -> result {
+                result := and(add(value, 31), not(31))
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
+
+
+!! Unit tests
+
+// test of M::test_abi_S
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_abi_S" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_abi_S()
+        return (0, 0)
+        function A2_M_test_abi_S() {
+            let _s, s, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32, $t33, $t34, $t35, $t36, $t37, $t38, $t39, $t40, $t41, $t42, $t43, $t44, $t45, $t46, $t47, $t48, $t49, $t50, $t51, $t52, $t53, $t54, $t55, $t56, $t57, $t58, $t59
+            let $locals := $Malloc(64)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t15 := 100
+                    $t15 := 100
+                    // abort($t15)
+                    $Abort($t15)
+                }
+                case 4 {
+                    // $t4 := 42
+                    $t4 := 42
+                    // $t5 := true
+                    $t5 := true
+                    // $t2 := M::pack_S($t4, $t5)
+                    s := A2_M_pack_S($t4, $t5)
+                    // $t6 := copy($t2)
+                    $t6 := s
+                    // $t7 := M::encode_S($t6)
+                    $t7 := A2_M_encode_S($t6)
+                    // $t0 := M::decode_S($t7)
+                    _s := A2_M_decode_S($t7)
+                    // $t8 := borrow_local($t2)
+                    $t8 := $MakePtr(false, s)
+                    // $t9 := borrow_field<M::S>.a($t8)
+                    $t9 := $IndexPtr($t8, 32)
+                    // $t10 := read_ref($t9)
+                    $t10 := $LoadU64($t9)
+                    // $t11 := borrow_local($t0)
+                    $t11 := $MakePtr(false, _s)
+                    // $t12 := borrow_field<M::S>.a($t11)
+                    $t12 := $IndexPtr($t11, 32)
+                    // $t13 := read_ref($t12)
+                    $t13 := $LoadU64($t12)
+                    // $t14 := ==($t10, $t13)
+                    $t14 := $Eq($t10, $t13)
+                    // if ($t14) goto L1 else goto L0
+                    switch $t14
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t16 := borrow_local($t0)
+                    $t16 := $MakePtr(false, _s)
+                    // $t17 := borrow_field<M::S>.a($t16)
+                    $t17 := $IndexPtr($t16, 32)
+                    // $t18 := read_ref($t17)
+                    $t18 := $LoadU64($t17)
+                    // $t19 := 42
+                    $t19 := 42
+                    // $t20 := ==($t18, $t19)
+                    $t20 := $Eq($t18, $t19)
+                    // if ($t20) goto L4 else goto L3
+                    switch $t20
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t21 := 101
+                    $t21 := 101
+                    // abort($t21)
+                    $Abort($t21)
+                }
+                case 8 {
+                    // label L5
+                    // $t22 := borrow_local($t2)
+                    $t22 := $MakePtr(false, s)
+                    // $t23 := borrow_field<M::S>.b($t22)
+                    $t23 := $IndexPtr($t22, 40)
+                    // $t24 := read_ref($t23)
+                    $t24 := $LoadU8($t23)
+                    // $t25 := borrow_local($t0)
+                    $t25 := $MakePtr(false, _s)
+                    // $t26 := borrow_field<M::S>.b($t25)
+                    $t26 := $IndexPtr($t25, 40)
+                    // $t27 := read_ref($t26)
+                    $t27 := $LoadU8($t26)
+                    // $t28 := ==($t24, $t27)
+                    $t28 := $Eq($t24, $t27)
+                    // if ($t28) goto L7 else goto L6
+                    switch $t28
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t29 := 102
+                    $t29 := 102
+                    // abort($t29)
+                    $Abort($t29)
+                }
+                case 11 {
+                    // label L8
+                    // $t30 := borrow_local($t0)
+                    $t30 := $MakePtr(false, _s)
+                    // $t31 := borrow_field<M::S>.b($t30)
+                    $t31 := $IndexPtr($t30, 40)
+                    // $t32 := read_ref($t31)
+                    $t32 := $LoadU8($t31)
+                    // $t33 := true
+                    $t33 := true
+                    // $t34 := ==($t32, $t33)
+                    $t34 := $Eq($t32, $t33)
+                    // if ($t34) goto L10 else goto L9
+                    switch $t34
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t35 := 103
+                    $t35 := 103
+                    // abort($t35)
+                    $Abort($t35)
+                }
+                case 14 {
+                    // label L11
+                    // $t36 := borrow_local($t2)
+                    $t36 := $MakePtr(false, s)
+                    // $t37 := borrow_field<M::S>.c($t36)
+                    $t37 := $t36
+                    // $t3 := read_ref($t37)
+                    mstore($locals, $LoadU256($t37))
+                    if $IsStoragePtr($t37){
+                        let $storage_ptr_894856441
+                        let $size_894856441 := $StorageLoadU64(mload($locals))
+                        let $capacity_894856441 := $ClosestGreaterPowerOfTwo($size_894856441)
+                        $storage_ptr_894856441 := $Malloc(add(32, mul($capacity_894856441, 32)))
+                        let $data_size_894856441 := mul($size_894856441, 32)
+                        mstore($storage_ptr_894856441, $AlignedStorageLoad(mload($locals)))
+                        $MemoryStoreU64(add($storage_ptr_894856441, 8), $capacity_894856441)
+                        let $data_src_894856441 := add(mload($locals), 32)
+                        let $data_dst_894856441 := add($storage_ptr_894856441, 32)
+                        for { let $offs_894856441 := 0 } lt($offs_894856441, $data_size_894856441) { $offs_894856441 := add($offs_894856441, 32)} {
+                            {
+                                let $linked_src_1602512591 := $AlignedStorageLoad(add($data_src_894856441, $offs_894856441))
+                                let $linked_dst_1602512591
+                                $linked_dst_1602512591 := $Malloc(32)
+                                {
+                                    let $linked_src_2315022182 := $AlignedStorageLoad(add($linked_src_1602512591, 0))
+                                    let $linked_dst_2315022182
+                                    let $size_2315022182 := $StorageLoadU64($linked_src_2315022182)
+                                    let $capacity_2315022182 := $ClosestGreaterPowerOfTwo($size_2315022182)
+                                    $linked_dst_2315022182 := $Malloc(add(32, mul($capacity_2315022182, 16)))
+                                    let $data_size_2315022182 := mul($size_2315022182, 16)
+                                    mstore($linked_dst_2315022182, $AlignedStorageLoad($linked_src_2315022182))
+                                    $MemoryStoreU64(add($linked_dst_2315022182, 8), $capacity_2315022182)
+                                    let $data_src_2315022182 := add($linked_src_2315022182, 32)
+                                    let $data_dst_2315022182 := add($linked_dst_2315022182, 32)
+                                    for { let $offs_2315022182 := 0 } lt($offs_2315022182, $data_size_2315022182) { $offs_2315022182 := add($offs_2315022182, 32)} {
+                                        mstore(add($data_dst_2315022182, $offs_2315022182), $AlignedStorageLoad(add($data_src_2315022182, $offs_2315022182)))
+                                    }
+                                    mstore(add($linked_dst_1602512591, 0), $linked_dst_2315022182)
+                                }
+                                mstore(add($data_dst_894856441, $offs_894856441), $linked_dst_1602512591)
+                            }
+                        }
+                        mstore($locals, $storage_ptr_894856441)
+                    }
+                    // $t38 := borrow_local($t0)
+                    $t38 := $MakePtr(false, _s)
+                    // $t39 := borrow_field<M::S>.c($t38)
+                    $t39 := $t38
+                    // $t1 := read_ref($t39)
+                    mstore(add($locals, 32), $LoadU256($t39))
+                    if $IsStoragePtr($t39){
+                        let $storage_ptr_894856441
+                        let $size_894856441 := $StorageLoadU64(mload(add($locals, 32)))
+                        let $capacity_894856441 := $ClosestGreaterPowerOfTwo($size_894856441)
+                        $storage_ptr_894856441 := $Malloc(add(32, mul($capacity_894856441, 32)))
+                        let $data_size_894856441 := mul($size_894856441, 32)
+                        mstore($storage_ptr_894856441, $AlignedStorageLoad(mload(add($locals, 32))))
+                        $MemoryStoreU64(add($storage_ptr_894856441, 8), $capacity_894856441)
+                        let $data_src_894856441 := add(mload(add($locals, 32)), 32)
+                        let $data_dst_894856441 := add($storage_ptr_894856441, 32)
+                        for { let $offs_894856441 := 0 } lt($offs_894856441, $data_size_894856441) { $offs_894856441 := add($offs_894856441, 32)} {
+                            {
+                                let $linked_src_1602512591 := $AlignedStorageLoad(add($data_src_894856441, $offs_894856441))
+                                let $linked_dst_1602512591
+                                $linked_dst_1602512591 := $Malloc(32)
+                                {
+                                    let $linked_src_2315022182 := $AlignedStorageLoad(add($linked_src_1602512591, 0))
+                                    let $linked_dst_2315022182
+                                    let $size_2315022182 := $StorageLoadU64($linked_src_2315022182)
+                                    let $capacity_2315022182 := $ClosestGreaterPowerOfTwo($size_2315022182)
+                                    $linked_dst_2315022182 := $Malloc(add(32, mul($capacity_2315022182, 16)))
+                                    let $data_size_2315022182 := mul($size_2315022182, 16)
+                                    mstore($linked_dst_2315022182, $AlignedStorageLoad($linked_src_2315022182))
+                                    $MemoryStoreU64(add($linked_dst_2315022182, 8), $capacity_2315022182)
+                                    let $data_src_2315022182 := add($linked_src_2315022182, 32)
+                                    let $data_dst_2315022182 := add($linked_dst_2315022182, 32)
+                                    for { let $offs_2315022182 := 0 } lt($offs_2315022182, $data_size_2315022182) { $offs_2315022182 := add($offs_2315022182, 32)} {
+                                        mstore(add($data_dst_2315022182, $offs_2315022182), $AlignedStorageLoad(add($data_src_2315022182, $offs_2315022182)))
+                                    }
+                                    mstore(add($linked_dst_1602512591, 0), $linked_dst_2315022182)
+                                }
+                                mstore(add($data_dst_894856441, $offs_894856441), $linked_dst_1602512591)
+                            }
+                        }
+                        mstore(add($locals, 32), $storage_ptr_894856441)
+                    }
+                    // $t40 := borrow_local($t3)
+                    $t40 := $MakePtr(false, $locals)
+                    // $t41 := vector::length<M::S2>($t40)
+                    $t41 := A1_vector_length$A2_M_S2$($t40)
+                    // $t42 := 1
+                    $t42 := 1
+                    // $t43 := ==($t41, $t42)
+                    $t43 := $Eq($t41, $t42)
+                    // if ($t43) goto L13 else goto L12
+                    switch $t43
+                    case 0  { $block := 16 }
+                    default { $block := 15 }
+                }
+                case 15 {
+                    // label L13
+                    // goto L14
+                    $block := 17
+                }
+                case 16 {
+                    // label L12
+                    // $t44 := 104
+                    $t44 := 104
+                    // abort($t44)
+                    $Abort($t44)
+                }
+                case 17 {
+                    // label L14
+                    // $t45 := borrow_local($t1)
+                    $t45 := $MakePtr(false, add($locals, 32))
+                    // $t46 := vector::length<M::S2>($t45)
+                    $t46 := A1_vector_length$A2_M_S2$($t45)
+                    // $t47 := 1
+                    $t47 := 1
+                    // $t48 := ==($t46, $t47)
+                    $t48 := $Eq($t46, $t47)
+                    // if ($t48) goto L16 else goto L15
+                    switch $t48
+                    case 0  { $block := 19 }
+                    default { $block := 18 }
+                }
+                case 18 {
+                    // label L16
+                    // goto L17
+                    $block := 20
+                }
+                case 19 {
+                    // label L15
+                    // $t49 := 105
+                    $t49 := 105
+                    // abort($t49)
+                    $Abort($t49)
+                }
+                case 20 {
+                    // label L17
+                    // $t50 := borrow_local($t1)
+                    $t50 := $MakePtr(false, add($locals, 32))
+                    // $t51 := 0
+                    $t51 := 0
+                    // $t52 := vector::borrow<M::S2>($t50, $t51)
+                    $t52 := A1_vector_borrow$A2_M_S2$($t50, $t51)
+                    // $t53 := borrow_field<M::S2>.x($t52)
+                    $t53 := $t52
+                    // $t54 := 0
+                    $t54 := 0
+                    // $t55 := vector::borrow<u128>($t53, $t54)
+                    $t55 := A1_vector_borrow$u128$($t53, $t54)
+                    // $t56 := read_ref($t55)
+                    $t56 := $LoadU128($t55)
+                    // $t57 := 42
+                    $t57 := 42
+                    // $t58 := ==($t56, $t57)
+                    $t58 := $Eq($t56, $t57)
+                    // if ($t58) goto L19 else goto L18
+                    switch $t58
+                    case 0  { $block := 22 }
+                    default { $block := 21 }
+                }
+                case 21 {
+                    // label L19
+                    // goto L20
+                    $block := 23
+                }
+                case 22 {
+                    // label L18
+                    // $t59 := 106
+                    $t59 := 106
+                    // abort($t59)
+                    $Abort($t59)
+                }
+                case 23 {
+                    // label L20
+                    // return ()
+                    $Free($locals, 64)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_borrow$u128$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 16)))
+        }
+        function A1_vector_borrow$A2_M_S2$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 32)))
+            let e := $LoadU256(e_ptr)
+            e_ptr := $MakePtr($IsStoragePtr(v_ref), e)
+        }
+        function A1_vector_length$A2_M_S2$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A2_M_decode_S(input) -> $result  {
+            let $t1 := add(input, 32)
+            let $t2 := $MemoryLoadU64(input)
+            let $t3 := add($t1, $t2)
+            if gt($t1, 0xffffffffffffffff) { $AbortBuiltin() }
+            if gt($t3, 0xffffffffffffffff) { $AbortBuiltin() }
+            $result := abi_decode_tuple_$_uint64_bool__uint128______$_$A2_M_S$_from_memory($t1, $t3)
+        }
+        function A2_M_encode_S(s) -> $result  {
+            $result := mload(0)
+            let $t1 := add($result, 32)
+            if gt($t1, 0xffffffffffffffff) { $AbortBuiltin() }
+            let $t2 := abi_encode_tuple_$_uint64_bool__uint128______$_$A2_M_S$($t1,s)
+            if gt($t2, 0xffffffffffffffff) { $AbortBuiltin() }
+            let $t3 := sub($t2, $t1)
+            $MemoryStoreU64($result, $t3)
+            let $t4 := $ClosestGreaterPowerOfTwo($t3)
+            $MemoryStoreU64(add($result, 8), $t4)
+            mstore(0, $t2)
+        }
+        function A2_M_pack_S(a, b) -> $result {
+            let s2, $t4, $t5, $t6, $t7, $t8
+            let $locals := $Malloc(32)
+            // $t3 := vector::empty<M::S2>()
+            mstore($locals, A1_vector_empty$A2_M_S2$())
+            // $t4 := (u128)($t0)
+            $t4 := $CastU128(a)
+            // $t5 := M::pack_S2($t4)
+            $t5 := A2_M_pack_S2($t4)
+            // $t6 := borrow_local($t3)
+            $t6 := $MakePtr(false, $locals)
+            // vector::push_back<M::S2>($t6, $t5)
+            A1_vector_push_back$A2_M_S2$($t6, $t5)
+            // $t7 := move($t3)
+            $t7 := mload($locals)
+            // $t8 := pack M::S($t0, $t1, $t7)
+            {
+                let $mem := $Malloc(41)
+                $MemoryStoreU64(add($mem, 32), a)
+                $MemoryStoreU8(add($mem, 40), b)
+                $MemoryStoreU256(add($mem, 0), $t7)
+                $t8 := $mem
+            }
+            // return $t8
+            $result := $t8
+            $Free($locals, 32)
+        }
+
+        function A1_vector_push_back$A2_M_S2$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 32)))
+            $StoreU256(e_ptr, e)
+            if $IsStoragePtr(e_ptr) {
+                let e_offs := $OffsetPtr(e_ptr)
+                let $linked_dst_1602512591 := $NewLinkedStorageBase(0x5f8466cf)
+                {
+                    let $linked_src_2315022182 := mload(add(e, 0))
+                    let $linked_dst_2315022182 := $NewLinkedStorageBase(0x89fc6f66)
+                    let $size_2315022182 := $MemoryLoadU64($linked_src_2315022182)
+                    let $data_size_2315022182 := mul($size_2315022182, 16)
+                    $AlignedStorageStore($linked_dst_2315022182, mload($linked_src_2315022182))
+                    let $data_src_2315022182 := add($linked_src_2315022182, 32)
+                    let $data_dst_2315022182 := add($linked_dst_2315022182, 32)
+                    for { let $offs_2315022182 := 0 } lt($offs_2315022182, $data_size_2315022182) { $offs_2315022182 := add($offs_2315022182, 32)} {
+                        $AlignedStorageStore(add($data_dst_2315022182, $offs_2315022182), mload(add($data_src_2315022182, $offs_2315022182)))
+                        $Free($linked_src_2315022182, add($data_size_2315022182, 32))
+                    }
+                    $AlignedStorageStore(add($linked_dst_1602512591, 0), $linked_dst_2315022182)
+                }
+                $Free(e, 32)
+                $AlignedStorageStore(e_offs, $linked_dst_1602512591)
+            }
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 32)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A2_M_pack_S2(x) -> $result {
+            let $t2, $t3, $t4
+            let $locals := $Malloc(32)
+            // $t1 := vector::empty<u128>()
+            mstore($locals, A1_vector_empty$u128$())
+            // $t2 := borrow_local($t1)
+            $t2 := $MakePtr(false, $locals)
+            // vector::push_back<u128>($t2, $t0)
+            A1_vector_push_back$u128$($t2, x)
+            // $t3 := move($t1)
+            $t3 := mload($locals)
+            // $t4 := pack M::S2($t3)
+            {
+                let $mem := $Malloc(32)
+                $MemoryStoreU256(add($mem, 0), $t3)
+                $t4 := $mem
+            }
+            // return $t4
+            $result := $t4
+            $Free($locals, 32)
+        }
+
+        function A1_vector_push_back$u128$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 16)))
+            $StoreU128(e_ptr, e)
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 16)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_vector_empty$u128$() -> vector {
+            vector := $Malloc(64)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function A1_vector_empty$A2_M_S2$() -> vector {
+            vector := $Malloc(96)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function abi_encode_tuple_$_uint64_bool__uint128______$_$A2_M_S$(headStart ,value_0) -> tail {
+            tail := add(headStart, 32)
+            mstore(add(headStart, 0), sub(tail, headStart))
+            tail := abi_encode_$uint64_bool__uint128_____$_$A2_M_S$(value_0,  tail)
+        }
+        function abi_encode_$uint64_bool__uint128_____$_$A2_M_S$(value, pos) -> end {
+            let tail := add(pos, 96)
+            let value_0 := $MemoryLoadU64(add(value, 32))
+            abi_encode_uint64(value_0, add(pos, 0))
+            let value_1 := $MemoryLoadU8(add(value, 40))
+            abi_encode_bool(value_1, add(pos, 32))
+            let value_2 := $MemoryLoadU256(add(value, 0))
+            mstore(add(pos, 64), sub(tail, pos))
+            tail := abi_encode__uint128______vec$A2_M_S2$(value_2, tail)
+            end := tail
+        }
+        function abi_encode__uint128______vec$A2_M_S2$(value, pos) -> end {
+            let length := $MemoryLoadU64(value)
+            mstore(pos, length)
+            pos := add(pos, 0x20)
+            let headStart := pos
+            let tail := add(pos, mul(length, 0x20))
+            let start := add(value, 32)
+            let srcEnd := add(start, mul(length, 32))
+            for { let src := start } lt(src, srcEnd) { src := add(src, 32) }
+            {
+                mstore(pos, sub(tail, headStart))
+                let v := $MemoryLoadU256(src)
+                tail := abi_encode_$uint128__$_$A2_M_S2$_with_updated_pos(v, tail)
+                pos := add(pos, 0x20)
+            }
+            pos := tail
+            end := pos
+        }
+        function abi_encode_$uint128__$_$A2_M_S2$_with_updated_pos(value, pos) -> updated_pos{
+            updated_pos := abi_encode_$uint128__$_$A2_M_S2$(value, pos)
+        }
+        function abi_encode_$uint128__$_$A2_M_S2$(value, pos) -> end {
+            let tail := add(pos, 32)
+            let value_0 := $MemoryLoadU256(add(value, 0))
+            mstore(add(pos, 0), sub(tail, pos))
+            tail := abi_encode_uint128___vec$u128$(value_0, tail)
+            end := tail
+        }
+        function abi_encode_uint128___vec$u128$(value, pos) -> end {
+            let length := $MemoryLoadU64(value)
+            mstore(pos, length)
+            pos := add(pos, 0x20)
+            let start := add(value, 32)
+            let srcEnd := add(start, mul(length, 16))
+            for { let src := start } lt(src, srcEnd) { src := add(src, 16) }
+            {
+                let v := $MemoryLoadU128(src)
+                pos := abi_encode_uint128_with_updated_pos(v, pos)
+            }
+            end := pos
+        }
+        function abi_encode_uint128_with_updated_pos(value, pos) -> updated_pos{
+            abi_encode_uint128(value, pos)
+            updated_pos := add(pos, 32)
+        }
+        function abi_encode_uint128(value, pos) {
+            mstore(pos, cleanup_uint128(value))
+        }
+        function cleanup_uint128(value) -> cleaned {
+            cleaned := and(value, 0xffffffffffffffffffffffffffffffff)
+        }
+        function abi_encode_bool(value, pos) {
+            mstore(pos, cleanup_bool(value))
+        }
+        function cleanup_bool(value) -> cleaned {
+            cleaned := and(value, 0xff)
+        }
+        function abi_encode_uint64(value, pos) {
+            mstore(pos, cleanup_uint64(value))
+        }
+        function cleanup_uint64(value) -> cleaned {
+            cleaned := and(value, 0xffffffffffffffff)
+        }
+        function abi_decode_tuple_$_uint64_bool__uint128______$_$A2_M_S$_from_memory(headStart, dataEnd) -> value_0 {
+            if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+            {
+                let offset := mload(add(headStart, 0))
+                if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                value_0 := abi_decode_$uint64_bool__uint128_____$_$A2_M_S$_from_memory(add(headStart, offset), dataEnd)
+            }
+        }
+        function abi_decode_$uint64_bool__uint128_____$_$A2_M_S$_from_memory(headStart, end) -> value {
+            if slt(sub(end, headStart), 96) { $Abort(90) }
+            let value_0, value_1, value_2
+            value := $Malloc(96)
+            {
+                let offset := 0
+                value_0 := abi_decode_uint64_from_memory(add(headStart, offset), end)
+            }
+            $MemoryStoreU64(add(value, 32), value_0)
+            {
+                let offset := 32
+                value_1 := abi_decode_bool_from_memory(add(headStart, offset), end)
+            }
+            $MemoryStoreU8(add(value, 40), value_1)
+            {
+                let offset := mload(add(headStart, 64))
+                if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                value_2 := abi_decode__uint128______vec$A2_M_S2$_from_memory(add(headStart, offset), end)
+            }
+            $MemoryStoreU256(add(value, 0), value_2)
+        }
+        function abi_decode__uint128______vec$A2_M_S2$_from_memory(offset, end) -> array {
+            if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+            let length := mload(offset)
+            let size := add(mul(32, length), 32)
+            array := abi_decode_available_length___uint128______vec$A2_M_S2$_from_memory(add(offset, 0x20), length, size, end)
+        }
+        function abi_decode_available_length___uint128______vec$A2_M_S2$_from_memory(offset, length, size, end) -> array {
+            array := $Malloc($CheckMemorySize(size))
+            $MemoryStoreU64(array, length)
+            $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+            let dst := add(array, 32)
+            let srcEnd := add(offset, mul(length, 32))
+            if gt(srcEnd, end) { $Abort(94) }
+            for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+            {
+                let innerOffset := mload(src)
+                if gt(innerOffset, 0xffffffffffffffff) { $Abort(94) }
+                let elementPos := add(offset, innerOffset)
+                let value := abi_decode_$uint128__$_$A2_M_S2$_from_memory(elementPos, end)
+                $MemoryStoreU256(dst, value)
+                dst := add(dst, 32)
+            }
+        }
+        function abi_decode_$uint128__$_$A2_M_S2$_from_memory(headStart, end) -> value {
+            if slt(sub(end, headStart), 32) { $Abort(90) }
+            let value_0
+            value := $Malloc(32)
+            {
+                let offset := mload(add(headStart, 0))
+                if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                value_0 := abi_decode_uint128___vec$u128$_from_memory(add(headStart, offset), end)
+            }
+            $MemoryStoreU256(add(value, 0), value_0)
+        }
+        function abi_decode_uint128___vec$u128$_from_memory(offset, end) -> array {
+            if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+            let length := mload(offset)
+            let size := add(mul(16, length), 32)
+            array := abi_decode_available_length__uint128___vec$u128$_from_memory(add(offset, 0x20), length, size, end)
+        }
+        function abi_decode_available_length__uint128___vec$u128$_from_memory(offset, length, size, end) -> array {
+            array := $Malloc($CheckMemorySize(size))
+            $MemoryStoreU64(array, length)
+            $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+            let dst := add(array, 32)
+            let srcEnd := add(offset, mul(length, 32))
+            if gt(srcEnd, end) { $Abort(94) }
+            for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+            {
+                let elementPos := src
+                let value := abi_decode_uint128_from_memory(elementPos, end)
+                $MemoryStoreU128(dst, value)
+                dst := add(dst, 16)
+            }
+        }
+        function abi_decode_uint128_from_memory(offset, end) -> value {
+            value := mload(offset)
+            validator_uint128(value)
+        }
+        function validator_uint128(value) {
+            if iszero(eq(value, cleanup_uint128(value))) { $Abort(95) }
+        }
+        function abi_decode_bool_from_memory(offset, end) -> value {
+            value := mload(offset)
+            validator_bool(value)
+        }
+        function validator_bool(value) {
+            if iszero(eq(value, cleanup_bool(value))) { $Abort(95) }
+        }
+        function abi_decode_uint64_from_memory(offset, end) -> value {
+            value := mload(offset)
+            validator_uint64(value)
+        }
+        function validator_uint64(value) {
+            if iszero(eq(value, cleanup_uint64(value))) { $Abort(95) }
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU8(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU8(offs)
+          }
+          default {
+            val := $StorageLoadU8(offs)
+          }
+        }
+        function $MemoryLoadU8(offs) -> val {
+          val := $MemoryLoadBytes(offs, 1)
+        }
+        function $StorageLoadU8(offs) -> val {
+          val := $StorageLoadBytes(offs, 1)
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU128(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU128(offs)
+          }
+          default {
+            val := $StorageLoadU128(offs)
+          }
+        }
+        function $MemoryLoadU128(offs) -> val {
+          val := $MemoryLoadBytes(offs, 16)
+        }
+        function $StorageLoadU128(offs) -> val {
+          val := $StorageLoadBytes(offs, 16)
+        }
+        function $StoreU128(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU128(offs, val)
+          }
+          default {
+            $StorageStoreU128(offs, val)
+          }
+        }
+        function $MemoryStoreU128(offs, val) {
+          $MemoryStoreBytes(offs, 16, val)
+        }
+        function $StorageStoreU128(offs, val) {
+          $StorageStoreBytes(offs, 16, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $CheckMemorySize(len) -> checked_len {
+            if gt(len, 0xffffffffffffffff) { $AbortBuiltin() }
+            checked_len := len
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $GtEq(x, y) -> r {
+            r := or(gt(x, y), eq(x, y))
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $CastU128(x) -> r {
+            if gt(x, 0xffffffffffffffffffffffffffffffff) { $AbortBuiltin() }
+            r := x
+        }
+        function $ClosestGreaterPowerOfTwo(x) -> r {
+            r := or(r, shr(1, x))
+            r := or(r, shr(2, r))
+            r := or(r, shr(4, r))
+            r := or(r, shr(8, r))
+            r := or(r, shr(16, r))
+            r := or(r, shr(32, r))
+            r := add(x, 1)
+        }
+    }
+}
+===> Test result of M::test_abi_S: Succeed(Stopped) (used_gas=10789): []
+
+// test of M::test_abi_String
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_abi_String" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_abi_String()
+        return (0, 0)
+        function A2_M_test_abi_String() {
+            let _str, end, i, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32, $t33, $t34, $t35
+            let $locals := $Malloc(64)
+            let $block := 3
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L6
+                    // $t7 := <($t3, $t6)
+                    $t7 := $Lt(i, $t6)
+                    // if ($t7) goto L1 else goto L0
+                    switch $t7
+                    case 0  { $block := 5 }
+                    default { $block := 4 }
+                }
+                case 3 {
+                    // $t5 := 0
+                    $t5 := 0
+                    // $t3 := $t5
+                    i := $t5
+                    // $t6 := 128
+                    $t6 := 128
+                    // $t4 := vector::empty<u8>()
+                    mstore($locals, A1_vector_empty$u8$())
+                    // goto L6
+                    $block := 2
+                }
+                case 4 {
+                    // label L1
+                    // goto L2
+                    $block := 6
+                }
+                case 5 {
+                    // label L0
+                    // $t12 := move($t4)
+                    $t12 := mload($locals)
+                    // $t13 := ascii::string($t12)
+                    $t13 := A1_ascii_string($t12)
+                    // $t14 := M::encode_String($t13)
+                    $t14 := A2_M_encode_String($t13)
+                    // $t0 := M::decode_String($t14)
+                    _str := A2_M_decode_String($t14)
+                    // $t15 := borrow_local($t0)
+                    $t15 := $MakePtr(false, _str)
+                    // $t16 := ascii::as_bytes($t15)
+                    $t16 := A1_ascii_as_bytes($t15)
+                    // $t17 := vector::length<u8>($t16)
+                    $t17 := A1_vector_length$u8$($t16)
+                    // $t18 := 128
+                    $t18 := 128
+                    // $t19 := ==($t17, $t18)
+                    $t19 := $Eq($t17, $t18)
+                    // if ($t19) goto L8 else goto L7
+                    switch $t19
+                    case 0  { $block := 11 }
+                    default { $block := 10 }
+                }
+                case 6 {
+                    // label L2
+                    // $t8 := ascii::is_valid_char($t3)
+                    $t8 := A1_ascii_is_valid_char(i)
+                    // if ($t8) goto L4 else goto L3
+                    switch $t8
+                    case 0  { $block := 8 }
+                    default { $block := 7 }
+                }
+                case 7 {
+                    // label L4
+                    // goto L5
+                    $block := 9
+                }
+                case 8 {
+                    // label L3
+                    // $t9 := 0
+                    $t9 := 0
+                    // abort($t9)
+                    $Abort($t9)
+                }
+                case 9 {
+                    // label L5
+                    // $t10 := borrow_local($t4)
+                    $t10 := $MakePtr(false, $locals)
+                    // vector::push_back<u8>($t10, $t3)
+                    A1_vector_push_back$u8$($t10, i)
+                    // $t11 := 1
+                    $t11 := 1
+                    // $t3 := +($t3, $t11)
+                    i := $AddU8(i, $t11)
+                    // goto L6
+                    $block := 2
+                }
+                case 10 {
+                    // label L8
+                    // goto L9
+                    $block := 12
+                }
+                case 11 {
+                    // label L7
+                    // $t20 := 100
+                    $t20 := 100
+                    // abort($t20)
+                    $Abort($t20)
+                }
+                case 12 {
+                    // label L9
+                    // $t21 := move($t0)
+                    $t21 := _str
+                    // $t1 := ascii::into_bytes($t21)
+                    mstore(add($locals, 32), A1_ascii_into_bytes($t21))
+                    // $t22 := borrow_local($t1)
+                    $t22 := $MakePtr(false, add($locals, 32))
+                    // $t23 := vector::length<u8>($t22)
+                    $t23 := A1_vector_length$u8$($t22)
+                    // $t24 := 128
+                    $t24 := 128
+                    // $t25 := ==($t23, $t24)
+                    $t25 := $Eq($t23, $t24)
+                    // if ($t25) goto L11 else goto L10
+                    switch $t25
+                    case 0  { $block := 14 }
+                    default { $block := 13 }
+                }
+                case 13 {
+                    // label L11
+                    // goto L12
+                    $block := 15
+                }
+                case 14 {
+                    // label L10
+                    // $t26 := 99
+                    $t26 := 99
+                    // abort($t26)
+                    $Abort($t26)
+                }
+                case 15 {
+                    // label L12
+                    // $t27 := 0
+                    $t27 := 0
+                    // $t3 := $t27
+                    i := $t27
+                    // goto L19
+                    $block := 16
+                }
+                case 16 {
+                    // label L19
+                    // $t28 := <($t3, $t6)
+                    $t28 := $Lt(i, $t6)
+                    // if ($t28) goto L14 else goto L13
+                    switch $t28
+                    case 0  { $block := 18 }
+                    default { $block := 17 }
+                }
+                case 17 {
+                    // label L14
+                    // goto L15
+                    $block := 19
+                }
+                case 18 {
+                    // label L13
+                    // return ()
+                    $Free($locals, 64)
+                    leave
+                }
+                case 19 {
+                    // label L15
+                    // $t29 := borrow_local($t1)
+                    $t29 := $MakePtr(false, add($locals, 32))
+                    // $t30 := (u64)($t3)
+                    $t30 := $CastU64(i)
+                    // $t31 := vector::borrow<u8>($t29, $t30)
+                    $t31 := A1_vector_borrow$u8$($t29, $t30)
+                    // $t32 := read_ref($t31)
+                    $t32 := $LoadU8($t31)
+                    // $t33 := ==($t32, $t3)
+                    $t33 := $Eq($t32, i)
+                    // if ($t33) goto L17 else goto L16
+                    switch $t33
+                    case 0  { $block := 21 }
+                    default { $block := 20 }
+                }
+                case 20 {
+                    // label L17
+                    // goto L18
+                    $block := 22
+                }
+                case 21 {
+                    // label L16
+                    // $t34 := (u64)($t3)
+                    $t34 := $CastU64(i)
+                    // abort($t34)
+                    $Abort($t34)
+                }
+                case 22 {
+                    // label L18
+                    // $t35 := 1
+                    $t35 := 1
+                    // $t3 := +($t3, $t35)
+                    i := $AddU8(i, $t35)
+                    // goto L19
+                    $block := 16
+                }
+            }
+        }
+
+        function A1_vector_borrow$u8$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 1)))
+        }
+        function A1_vector_length$u8$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A1_ascii_into_bytes(string) -> $result {
+            let $t1
+            // $t1 := unpack ascii::String($t0)
+            $t1 := $MemoryLoadU256(add(string, 0))
+            $Free(string, 32)
+            // return $t1
+            $result := $t1
+        }
+
+        function A1_vector_push_back$u8$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 1)))
+            $StoreU8(e_ptr, e)
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 1)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_ascii_is_valid_char(b) -> $result {
+            let $t1, $t2
+            // $t1 := 127
+            $t1 := 127
+            // $t2 := <=($t0, $t1)
+            $t2 := $LtEq(b, $t1)
+            // return $t2
+            $result := $t2
+        }
+
+        function A1_ascii_as_bytes(string) -> $result {
+            let $t1
+            // $t1 := borrow_field<ascii::String>.bytes($t0)
+            $t1 := string
+            // return $t1
+            $result := $t1
+        }
+
+        function A2_M_decode_String(input) -> $result  {
+            let $t1 := add(input, 32)
+            let $t2 := $MemoryLoadU64(input)
+            let $t3 := add($t1, $t2)
+            if gt($t1, 0xffffffffffffffff) { $AbortBuiltin() }
+            if gt($t3, 0xffffffffffffffff) { $AbortBuiltin() }
+            $result := abi_decode_tuple_$_bytes_$_$A1_ascii_String$_from_memory($t1, $t3)
+        }
+        function A2_M_encode_String(s) -> $result  {
+            $result := mload(0)
+            let $t1 := add($result, 32)
+            if gt($t1, 0xffffffffffffffff) { $AbortBuiltin() }
+            let $t2 := abi_encode_tuple_$_bytes_$_$A1_ascii_String$($t1,s)
+            if gt($t2, 0xffffffffffffffff) { $AbortBuiltin() }
+            let $t3 := sub($t2, $t1)
+            $MemoryStoreU64($result, $t3)
+            let $t4 := $ClosestGreaterPowerOfTwo($t3)
+            $MemoryStoreU64(add($result, 8), $t4)
+            mstore(0, $t2)
+        }
+        function A1_ascii_string(bytes) -> $result {
+            let x, $t2, $t3, $t4, $t5, $t6
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t4 := 65536
+                    $t4 := 65536
+                    // abort($t4)
+                    $Abort($t4)
+                }
+                case 4 {
+                    // $t1 := ascii::try_string($t0)
+                    x := A1_ascii_try_string(bytes)
+                    // $t2 := borrow_local($t1)
+                    $t2 := $MakePtr(false, x)
+                    // $t3 := option::is_some<ascii::String>($t2)
+                    $t3 := A1_option_is_some$A1_ascii_String$($t2)
+                    // if ($t3) goto L1 else goto L0
+                    switch $t3
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t5 := move($t1)
+                    $t5 := x
+                    // $t6 := option::destroy_some<ascii::String>($t5)
+                    $t6 := A1_option_destroy_some$A1_ascii_String$($t5)
+                    // return $t6
+                    $result := $t6
+                    leave
+                }
+            }
+        }
+
+        function A1_option_destroy_some$A1_ascii_String$(t) -> $result {
+            let elem, $t3, $t4, $t5, $t6, $t7, $t8, $t9
+            let $locals := $Malloc(32)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t5 := 262145
+                    $t5 := 262145
+                    // abort($t5)
+                    $Abort($t5)
+                }
+                case 4 {
+                    // $t3 := borrow_local($t0)
+                    $t3 := $MakePtr(false, t)
+                    // $t4 := option::is_some<#0>($t3)
+                    $t4 := A1_option_is_some$A1_ascii_String$($t3)
+                    // if ($t4) goto L1 else goto L0
+                    switch $t4
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t6 := move($t0)
+                    $t6 := t
+                    // $t2 := unpack option::Option<#0>($t6)
+                    mstore($locals, $MemoryLoadU256(add($t6, 0)))
+                    $Free($t6, 32)
+                    // $t7 := borrow_local($t2)
+                    $t7 := $MakePtr(false, $locals)
+                    // $t8 := vector::pop_back<#0>($t7)
+                    $t8 := A1_vector_pop_back$A1_ascii_String$($t7)
+                    // $t9 := move($t2)
+                    $t9 := mload($locals)
+                    // vector::destroy_empty<#0>($t9)
+                    A1_vector_destroy_empty$A1_ascii_String$($t9)
+                    // return $t8
+                    $result := $t8
+                    $Free($locals, 32)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_destroy_empty$A1_ascii_String$(v) {
+            let size := $MemoryLoadU64(v)
+            if $LogicalNot(iszero(size)) { $AbortBuiltin() }
+            let capacity := $MemoryLoadU64(add(v, 8))
+            $Free(v, add(32, mul(capacity, 32)))
+        }
+        function A1_vector_pop_back$A1_ascii_String$(v_ref) -> e {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if iszero(size) { $AbortBuiltin() }
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(sub(size, 1), 32)))
+            e := $LoadU256(e_ptr)
+            if $IsStoragePtr(e_ptr) {
+                let e_offs := $OffsetPtr(e_ptr)
+                let linked_src := $AlignedStorageLoad(e_offs)
+                e := $Malloc(32)
+                {
+                    let $linked_src_2300595445 := $AlignedStorageLoad(add(linked_src, 0))
+                    let $linked_dst_2300595445
+                    let $size_2300595445 := $StorageLoadU64($linked_src_2300595445)
+                    let $capacity_2300595445 := $ClosestGreaterPowerOfTwo($size_2300595445)
+                    $linked_dst_2300595445 := $Malloc(add(32, mul($capacity_2300595445, 1)))
+                    let $data_size_2300595445 := mul($size_2300595445, 1)
+                    mstore($linked_dst_2300595445, $AlignedStorageLoad($linked_src_2300595445))
+                    $MemoryStoreU64(add($linked_dst_2300595445, 8), $capacity_2300595445)
+                    let $data_src_2300595445 := add($linked_src_2300595445, 32)
+                    let $data_dst_2300595445 := add($linked_dst_2300595445, 32)
+                    for { let $offs_2300595445 := 0 } lt($offs_2300595445, $data_size_2300595445) { $offs_2300595445 := add($offs_2300595445, 32)} {
+                        mstore(add($data_dst_2300595445, $offs_2300595445), $AlignedStorageLoad(add($data_src_2300595445, $offs_2300595445)))
+                        $AlignedStorageStore(add($data_src_2300595445, $offs_2300595445), 0)
+                    }
+                    mstore(add(e, 0), $linked_dst_2300595445)
+                    $AlignedStorageStore(add(linked_src, 0), 0)
+                }
+                $AlignedStorageStore(e_offs, 0)
+            }
+            $StoreU64(v_ptr, sub(size, 1))
+        }
+        function A1_option_is_some$A1_ascii_String$(t) -> $result {
+            let $t1, $t2, $t3
+            // $t1 := borrow_field<option::Option<#0>>.vec($t0)
+            $t1 := t
+            // $t2 := vector::is_empty<#0>($t1)
+            $t2 := A1_vector_is_empty$A1_ascii_String$($t1)
+            // $t3 := !($t2)
+            $t3 := $LogicalNot($t2)
+            // return $t3
+            $result := $t3
+        }
+
+        function A1_vector_is_empty$A1_ascii_String$(v) -> $result {
+            let $t1, $t2, $t3
+            // $t1 := vector::length<#0>($t0)
+            $t1 := A1_vector_length$A1_ascii_String$(v)
+            // $t2 := 0
+            $t2 := 0
+            // $t3 := ==($t1, $t2)
+            $t3 := $Eq($t1, $t2)
+            // return $t3
+            $result := $t3
+        }
+
+        function A1_vector_length$A1_ascii_String$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A1_ascii_try_string(bytes) -> $result {
+            let i, len, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16
+            let $locals := $Malloc(32)
+            mstore($locals, bytes)
+            let $block := 3
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L5
+                    // assert Le($t1, $t4)
+                    // assert forall j: num: Range(0, $t1): ascii::is_valid_char(Index($t0, j))
+                    // $t6 := <($t1, $t4)
+                    $t6 := $Lt(i, $t4)
+                    // if ($t6) goto L1 else goto L0
+                    switch $t6
+                    case 0  { $block := 5 }
+                    default { $block := 4 }
+                }
+                case 3 {
+                    // $t3 := borrow_local($t0)
+                    $t3 := $MakePtr(false, $locals)
+                    // $t4 := vector::length<u8>($t3)
+                    $t4 := A1_vector_length$u8$($t3)
+                    // $t5 := 0
+                    $t5 := 0
+                    // $t1 := $t5
+                    i := $t5
+                    // goto L5
+                    $block := 2
+                }
+                case 4 {
+                    // label L1
+                    // goto L2
+                    $block := 6
+                }
+                case 5 {
+                    // label L0
+                    // assert Eq<u64>($t1, $t4)
+                    // assert forall j: num: Range(0, $t4): ascii::is_valid_char(Index($t0, j))
+                    // $t14 := move($t0)
+                    $t14 := mload($locals)
+                    // $t15 := pack ascii::String($t14)
+                    {
+                        let $mem := $Malloc(32)
+                        $MemoryStoreU256(add($mem, 0), $t14)
+                        $t15 := $mem
+                    }
+                    // $t16 := option::some<ascii::String>($t15)
+                    $t16 := A1_option_some$A1_ascii_String$($t15)
+                    // return $t16
+                    $result := $t16
+                    $Free($locals, 32)
+                    leave
+                }
+                case 6 {
+                    // label L2
+                    // $t7 := borrow_local($t0)
+                    $t7 := $MakePtr(false, $locals)
+                    // $t8 := vector::borrow<u8>($t7, $t1)
+                    $t8 := A1_vector_borrow$u8$($t7, i)
+                    // $t9 := read_ref($t8)
+                    $t9 := $LoadU8($t8)
+                    // $t10 := ascii::is_valid_char($t9)
+                    $t10 := A1_ascii_is_valid_char($t9)
+                    // $t11 := !($t10)
+                    $t11 := $LogicalNot($t10)
+                    // if ($t11) goto L4 else goto L3
+                    switch $t11
+                    case 0  { $block := 8 }
+                    default { $block := 7 }
+                }
+                case 7 {
+                    // label L4
+                    // $t12 := option::none<ascii::String>()
+                    $t12 := A1_option_none$A1_ascii_String$()
+                    // return $t12
+                    $result := $t12
+                    $Free($locals, 32)
+                    leave
+                }
+                case 8 {
+                    // label L3
+                    // $t13 := 1
+                    $t13 := 1
+                    // $t1 := +($t1, $t13)
+                    i := $AddU64(i, $t13)
+                    // goto L5
+                    $block := 2
+                }
+            }
+        }
+
+        function A1_option_none$A1_ascii_String$() -> $result {
+            let $t0, $t1
+            // $t0 := vector::empty<#0>()
+            $t0 := A1_vector_empty$A1_ascii_String$()
+            // $t1 := pack option::Option<#0>($t0)
+            {
+                let $mem := $Malloc(32)
+                $MemoryStoreU256(add($mem, 0), $t0)
+                $t1 := $mem
+            }
+            // return $t1
+            $result := $t1
+        }
+
+        function A1_vector_empty$A1_ascii_String$() -> vector {
+            vector := $Malloc(96)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function A1_option_some$A1_ascii_String$(e) -> $result {
+            let $t1, $t2
+            // $t1 := vector::singleton<#0>($t0)
+            $t1 := A1_vector_singleton$A1_ascii_String$(e)
+            // $t2 := pack option::Option<#0>($t1)
+            {
+                let $mem := $Malloc(32)
+                $MemoryStoreU256(add($mem, 0), $t1)
+                $t2 := $mem
+            }
+            // return $t2
+            $result := $t2
+        }
+
+        function A1_vector_singleton$A1_ascii_String$(e) -> $result {
+            let $t2, $t3
+            let $locals := $Malloc(32)
+            // $t1 := vector::empty<#0>()
+            mstore($locals, A1_vector_empty$A1_ascii_String$())
+            // $t2 := borrow_local($t1)
+            $t2 := $MakePtr(false, $locals)
+            // vector::push_back<#0>($t2, $t0)
+            A1_vector_push_back$A1_ascii_String$($t2, e)
+            // $t3 := move($t1)
+            $t3 := mload($locals)
+            // return $t3
+            $result := $t3
+            $Free($locals, 32)
+        }
+
+        function A1_vector_push_back$A1_ascii_String$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 32)))
+            $StoreU256(e_ptr, e)
+            if $IsStoragePtr(e_ptr) {
+                let e_offs := $OffsetPtr(e_ptr)
+                let $linked_dst_57814254 := $NewLinkedStorageBase(0x3722cee)
+                {
+                    let $linked_src_2300595445 := mload(add(e, 0))
+                    let $linked_dst_2300595445 := $NewLinkedStorageBase(0x89204cf5)
+                    let $size_2300595445 := $MemoryLoadU64($linked_src_2300595445)
+                    let $data_size_2300595445 := mul($size_2300595445, 1)
+                    $AlignedStorageStore($linked_dst_2300595445, mload($linked_src_2300595445))
+                    let $data_src_2300595445 := add($linked_src_2300595445, 32)
+                    let $data_dst_2300595445 := add($linked_dst_2300595445, 32)
+                    for { let $offs_2300595445 := 0 } lt($offs_2300595445, $data_size_2300595445) { $offs_2300595445 := add($offs_2300595445, 32)} {
+                        $AlignedStorageStore(add($data_dst_2300595445, $offs_2300595445), mload(add($data_src_2300595445, $offs_2300595445)))
+                        $Free($linked_src_2300595445, add($data_size_2300595445, 32))
+                    }
+                    $AlignedStorageStore(add($linked_dst_57814254, 0), $linked_dst_2300595445)
+                }
+                $Free(e, 32)
+                $AlignedStorageStore(e_offs, $linked_dst_57814254)
+            }
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 32)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_vector_empty$u8$() -> vector {
+            vector := $Malloc(34)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function abi_encode_tuple_$_bytes_$_$A1_ascii_String$(headStart ,value_0) -> tail {
+            tail := add(headStart, 32)
+            mstore(add(headStart, 0), sub(tail, headStart))
+            tail := abi_encode_$bytes$_$A1_ascii_String$(value_0,  tail)
+        }
+        function abi_encode_$bytes$_$A1_ascii_String$(value, pos) -> end {
+            let tail := add(pos, 32)
+            let value_0 := $MemoryLoadU256(add(value, 0))
+            mstore(add(pos, 0), sub(tail, pos))
+            tail := abi_encode_bytes(value_0, tail)
+            end := tail
+        }
+        function abi_encode_bytes(value, pos) -> end{
+            let size := $MemoryLoadU64(value)
+            mstore(pos, size)
+            pos := add(pos, 0x20)
+            $CopyMemory(add(value, 0x20), pos, size)
+            size := $RoundUp(size)
+            end := add(pos, size)
+        }
+        function abi_decode_tuple_$_bytes_$_$A1_ascii_String$_from_memory(headStart, dataEnd) -> value_0 {
+            if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+            {
+                let offset := mload(add(headStart, 0))
+                if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                value_0 := abi_decode_$bytes$_$A1_ascii_String$_from_memory(add(headStart, offset), dataEnd)
+            }
+        }
+        function abi_decode_$bytes$_$A1_ascii_String$_from_memory(headStart, end) -> value {
+            if slt(sub(end, headStart), 32) { $Abort(90) }
+            let value_0
+            value := $Malloc(32)
+            {
+                let offset := mload(add(headStart, 0))
+                if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                value_0 := abi_decode_bytes_vec$u8$_from_memory(add(headStart, offset), end)
+            }
+            $MemoryStoreU256(add(value, 0), value_0)
+        }
+        function abi_decode_bytes_vec$u8$_from_memory(offset, end) -> array {
+            if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+            let length := mload(offset)
+            let size := add(mul(1, length), 32)
+            array := abi_decode_available_length__bytes_from_memory(add(offset, 0x20), length, size, end)
+        }
+        function abi_decode_available_length__bytes_from_memory(src, length, size, end) -> array {
+            array := $Malloc($CheckMemorySize(size))
+            $MemoryStoreU64(array, length)
+            $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+            let dst := add(array, 32)
+            if gt(add(src, sub(size, 32)), end) { $Abort(93) }
+            $CopyFromMemoryToMemory(src, dst, length)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU8(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU8(offs)
+          }
+          default {
+            val := $StorageLoadU8(offs)
+          }
+        }
+        function $MemoryLoadU8(offs) -> val {
+          val := $MemoryLoadBytes(offs, 1)
+        }
+        function $StorageLoadU8(offs) -> val {
+          val := $StorageLoadBytes(offs, 1)
+        }
+        function $StoreU8(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU8(offs, val)
+          }
+          default {
+            $StorageStoreU8(offs, val)
+          }
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $StorageStoreU8(offs, val) {
+          $StorageStoreBytes(offs, 1, val)
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $CheckMemorySize(len) -> checked_len {
+            if gt(len, 0xffffffffffffffff) { $AbortBuiltin() }
+            checked_len := len
+        }
+        function $CopyFromMemoryToMemory(src, dst, length) {
+          let i := 0
+          for { } lt(i, length) { i := add(i, 32) }
+          {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if gt(i, length)
+          {
+            // clear end
+            mstore(add(dst, length), 0)
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $AddU64(x, y) -> r {
+            if lt(sub(0xffffffffffffffff, x), y) { $AbortBuiltin() }
+            r := add(x, y)
+        }
+        function $AddU8(x, y) -> r {
+            if lt(sub(0xff, x), y) { $AbortBuiltin() }
+            r := add(x, y)
+        }
+        function $Lt(x, y) -> r {
+            r := lt(x, y)
+        }
+        function $GtEq(x, y) -> r {
+            r := or(gt(x, y), eq(x, y))
+        }
+        function $LtEq(x, y) -> r {
+            r := or(lt(x, y), eq(x, y))
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $CastU64(x) -> r {
+            if gt(x, 0xffffffffffffffff) { $AbortBuiltin() }
+            r := x
+        }
+        function $ClosestGreaterPowerOfTwo(x) -> r {
+            r := or(r, shr(1, x))
+            r := or(r, shr(2, r))
+            r := or(r, shr(4, r))
+            r := or(r, shr(8, r))
+            r := or(r, shr(16, r))
+            r := or(r, shr(32, r))
+            r := add(x, 1)
+        }
+        function $RoundUp(value) -> result {
+            result := and(add(value, 31), not(31))
+        }
+    }
+}
+===> Test result of M::test_abi_String: Succeed(Stopped) (used_gas=646767): []
diff --git a/third_party/move/evm/move-to-yul/tests/TestExternalResult.v2_exp b/third_party/move/evm/move-to-yul/tests/TestExternalResult.v2_exp
new file mode 100644
index 0000000000000..0efdfd006698d
--- /dev/null
+++ b/third_party/move/evm/move-to-yul/tests/TestExternalResult.v2_exp
@@ -0,0 +1,3230 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_M" {
+    code {
+        codecopy(0, dataoffset("A2_M_deployed"), datasize("A2_M_deployed"))
+        return(0, datasize("A2_M_deployed"))
+    }
+    object "A2_M_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                default {}
+            }
+            $Abort(97)
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
+
+
+!! Unit tests
+
+// test of M::extract_err_data
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_extract_err_data" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_extract_err_data()
+        return (0, 0)
+        function A2_M_extract_err_data() {
+            let v2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21
+            let $locals := $Malloc(64)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t8 := 102
+                    $t8 := 102
+                    // abort($t8)
+                    $Abort($t8)
+                }
+                case 4 {
+                    // $t0 := vector::empty<u8>()
+                    mstore($locals, A1_vector_empty$u8$())
+                    // $t3 := borrow_local($t0)
+                    $t3 := $MakePtr(false, $locals)
+                    // $t4 := 42
+                    $t4 := 42
+                    // vector::push_back<u8>($t3, $t4)
+                    A1_vector_push_back$u8$($t3, $t4)
+                    // $t5 := move($t0)
+                    $t5 := mload($locals)
+                    // $t1 := M::pack_err_data<u64>($t5)
+                    v2 := A2_M_pack_err_data$u64$($t5)
+                    // $t6 := borrow_local($t1)
+                    $t6 := $MakePtr(false, v2)
+                    // $t7 := ExternalResult::is_err_data<u64>($t6)
+                    $t7 := A2_ExternalResult_is_err_data$u64$($t6)
+                    // if ($t7) goto L1 else goto L0
+                    switch $t7
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t9 := move($t1)
+                    $t9 := v2
+                    // $t2 := ExternalResult::unwrap_err_data<u64>($t9)
+                    mstore(add($locals, 32), A2_ExternalResult_unwrap_err_data$u64$($t9))
+                    // $t10 := borrow_local($t2)
+                    $t10 := $MakePtr(false, add($locals, 32))
+                    // $t11 := vector::length<u8>($t10)
+                    $t11 := A1_vector_length$u8$($t10)
+                    // $t12 := 1
+                    $t12 := 1
+                    // $t13 := ==($t11, $t12)
+                    $t13 := $Eq($t11, $t12)
+                    // if ($t13) goto L4 else goto L3
+                    switch $t13
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t14 := 103
+                    $t14 := 103
+                    // abort($t14)
+                    $Abort($t14)
+                }
+                case 8 {
+                    // label L5
+                    // $t15 := borrow_local($t2)
+                    $t15 := $MakePtr(false, add($locals, 32))
+                    // $t16 := 0
+                    $t16 := 0
+                    // $t17 := vector::borrow<u8>($t15, $t16)
+                    $t17 := A1_vector_borrow$u8$($t15, $t16)
+                    // $t18 := read_ref($t17)
+                    $t18 := $LoadU8($t17)
+                    // $t19 := 42
+                    $t19 := 42
+                    // $t20 := ==($t18, $t19)
+                    $t20 := $Eq($t18, $t19)
+                    // if ($t20) goto L7 else goto L6
+                    switch $t20
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t21 := 104
+                    $t21 := 104
+                    // abort($t21)
+                    $Abort($t21)
+                }
+                case 11 {
+                    // label L8
+                    // return ()
+                    $Free($locals, 64)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_borrow$u8$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 1)))
+        }
+        function A1_vector_length$u8$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A2_ExternalResult_unwrap_err_data$u64$(result) -> $result {
+            let err_data, err_reason, panic_code, $t4, $t5, $t6, $t7, $t8
+            // ($t4, $t5, $t6, $t7) := unpack ExternalResult::ExternalResult<#0>($t0)
+            $t4 := $MemoryLoadU256(add(result, 0))
+            $t5 := $MemoryLoadU256(add(result, 32))
+            $t6 := $MemoryLoadU256(add(result, 64))
+            $t7 := $MemoryLoadU256(add(result, 96))
+            $Free(result, 128)
+            // option::destroy_none<#0>($t4)
+            A1_option_destroy_none$u64$($t4)
+            // option::destroy_none<vector<u8>>($t6)
+            A1_option_destroy_none$vec$u8$$($t6)
+            // option::destroy_none<U256::U256>($t7)
+            A1_option_destroy_none$A2_U256_U256$($t7)
+            // $t8 := option::destroy_some<vector<u8>>($t5)
+            $t8 := A1_option_destroy_some$vec$u8$$($t5)
+            // return $t8
+            $result := $t8
+        }
+
+        function A1_option_destroy_some$vec$u8$$(t) -> $result {
+            let elem, $t3, $t4, $t5, $t6, $t7, $t8, $t9
+            let $locals := $Malloc(32)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t5 := 262145
+                    $t5 := 262145
+                    // abort($t5)
+                    $Abort($t5)
+                }
+                case 4 {
+                    // $t3 := borrow_local($t0)
+                    $t3 := $MakePtr(false, t)
+                    // $t4 := option::is_some<#0>($t3)
+                    $t4 := A1_option_is_some$vec$u8$$($t3)
+                    // if ($t4) goto L1 else goto L0
+                    switch $t4
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t6 := move($t0)
+                    $t6 := t
+                    // $t2 := unpack option::Option<#0>($t6)
+                    mstore($locals, $MemoryLoadU256(add($t6, 0)))
+                    $Free($t6, 32)
+                    // $t7 := borrow_local($t2)
+                    $t7 := $MakePtr(false, $locals)
+                    // $t8 := vector::pop_back<#0>($t7)
+                    $t8 := A1_vector_pop_back$vec$u8$$($t7)
+                    // $t9 := move($t2)
+                    $t9 := mload($locals)
+                    // vector::destroy_empty<#0>($t9)
+                    A1_vector_destroy_empty$vec$u8$$($t9)
+                    // return $t8
+                    $result := $t8
+                    $Free($locals, 32)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_destroy_empty$vec$u8$$(v) {
+            let size := $MemoryLoadU64(v)
+            if $LogicalNot(iszero(size)) { $AbortBuiltin() }
+            let capacity := $MemoryLoadU64(add(v, 8))
+            $Free(v, add(32, mul(capacity, 32)))
+        }
+        function A1_vector_pop_back$vec$u8$$(v_ref) -> e {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if iszero(size) { $AbortBuiltin() }
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(sub(size, 1), 32)))
+            e := $LoadU256(e_ptr)
+            if $IsStoragePtr(e_ptr) {
+                let e_offs := $OffsetPtr(e_ptr)
+                let linked_src := $AlignedStorageLoad(e_offs)
+                let $size_2300595445 := $StorageLoadU64(linked_src)
+                let $capacity_2300595445 := $ClosestGreaterPowerOfTwo($size_2300595445)
+                e := $Malloc(add(32, mul($capacity_2300595445, 1)))
+                let $data_size_2300595445 := mul($size_2300595445, 1)
+                mstore(e, $AlignedStorageLoad(linked_src))
+                $MemoryStoreU64(add(e, 8), $capacity_2300595445)
+                let $data_src_2300595445 := add(linked_src, 32)
+                let $data_dst_2300595445 := add(e, 32)
+                for { let $offs_2300595445 := 0 } lt($offs_2300595445, $data_size_2300595445) { $offs_2300595445 := add($offs_2300595445, 32)} {
+                    mstore(add($data_dst_2300595445, $offs_2300595445), $AlignedStorageLoad(add($data_src_2300595445, $offs_2300595445)))
+                    $AlignedStorageStore(add($data_src_2300595445, $offs_2300595445), 0)
+                }
+                $AlignedStorageStore(e_offs, 0)
+            }
+            $StoreU64(v_ptr, sub(size, 1))
+        }
+        function A1_option_is_some$vec$u8$$(t) -> $result {
+            let $t1, $t2, $t3
+            // $t1 := borrow_field<option::Option<#0>>.vec($t0)
+            $t1 := t
+            // $t2 := vector::is_empty<#0>($t1)
+            $t2 := A1_vector_is_empty$vec$u8$$($t1)
+            // $t3 := !($t2)
+            $t3 := $LogicalNot($t2)
+            // return $t3
+            $result := $t3
+        }
+
+        function A1_vector_is_empty$vec$u8$$(v) -> $result {
+            let $t1, $t2, $t3
+            // $t1 := vector::length<#0>($t0)
+            $t1 := A1_vector_length$vec$u8$$(v)
+            // $t2 := 0
+            $t2 := 0
+            // $t3 := ==($t1, $t2)
+            $t3 := $Eq($t1, $t2)
+            // return $t3
+            $result := $t3
+        }
+
+        function A1_vector_length$vec$u8$$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A1_option_destroy_none$A2_U256_U256$(t) {
+            let $t1, $t2, $t3, $t4, $t5
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t3 := 262144
+                    $t3 := 262144
+                    // abort($t3)
+                    $Abort($t3)
+                }
+                case 4 {
+                    // $t1 := borrow_local($t0)
+                    $t1 := $MakePtr(false, t)
+                    // $t2 := option::is_none<#0>($t1)
+                    $t2 := A1_option_is_none$A2_U256_U256$($t1)
+                    // if ($t2) goto L1 else goto L0
+                    switch $t2
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t4 := move($t0)
+                    $t4 := t
+                    // $t5 := unpack option::Option<#0>($t4)
+                    $t5 := $MemoryLoadU256(add($t4, 0))
+                    $Free($t4, 32)
+                    // vector::destroy_empty<#0>($t5)
+                    A1_vector_destroy_empty$A2_U256_U256$($t5)
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_destroy_empty$A2_U256_U256$(v) {
+            let size := $MemoryLoadU64(v)
+            if $LogicalNot(iszero(size)) { $AbortBuiltin() }
+            let capacity := $MemoryLoadU64(add(v, 8))
+            $Free(v, add(32, mul(capacity, 32)))
+        }
+        function A1_option_is_none$A2_U256_U256$(t) -> $result {
+            let $t1, $t2
+            // $t1 := borrow_field<option::Option<#0>>.vec($t0)
+            $t1 := t
+            // $t2 := vector::is_empty<#0>($t1)
+            $t2 := A1_vector_is_empty$A2_U256_U256$($t1)
+            // return $t2
+            $result := $t2
+        }
+
+        function A1_vector_is_empty$A2_U256_U256$(v) -> $result {
+            let $t1, $t2, $t3
+            // $t1 := vector::length<#0>($t0)
+            $t1 := A1_vector_length$A2_U256_U256$(v)
+            // $t2 := 0
+            $t2 := 0
+            // $t3 := ==($t1, $t2)
+            $t3 := $Eq($t1, $t2)
+            // return $t3
+            $result := $t3
+        }
+
+        function A1_vector_length$A2_U256_U256$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A1_option_destroy_none$vec$u8$$(t) {
+            let $t1, $t2, $t3, $t4, $t5
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t3 := 262144
+                    $t3 := 262144
+                    // abort($t3)
+                    $Abort($t3)
+                }
+                case 4 {
+                    // $t1 := borrow_local($t0)
+                    $t1 := $MakePtr(false, t)
+                    // $t2 := option::is_none<#0>($t1)
+                    $t2 := A1_option_is_none$vec$u8$$($t1)
+                    // if ($t2) goto L1 else goto L0
+                    switch $t2
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t4 := move($t0)
+                    $t4 := t
+                    // $t5 := unpack option::Option<#0>($t4)
+                    $t5 := $MemoryLoadU256(add($t4, 0))
+                    $Free($t4, 32)
+                    // vector::destroy_empty<#0>($t5)
+                    A1_vector_destroy_empty$vec$u8$$($t5)
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function A1_option_is_none$vec$u8$$(t) -> $result {
+            let $t1, $t2
+            // $t1 := borrow_field<option::Option<#0>>.vec($t0)
+            $t1 := t
+            // $t2 := vector::is_empty<#0>($t1)
+            $t2 := A1_vector_is_empty$vec$u8$$($t1)
+            // return $t2
+            $result := $t2
+        }
+
+        function A1_option_destroy_none$u64$(t) {
+            let $t1, $t2, $t3, $t4, $t5
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t3 := 262144
+                    $t3 := 262144
+                    // abort($t3)
+                    $Abort($t3)
+                }
+                case 4 {
+                    // $t1 := borrow_local($t0)
+                    $t1 := $MakePtr(false, t)
+                    // $t2 := option::is_none<#0>($t1)
+                    $t2 := A1_option_is_none$u64$($t1)
+                    // if ($t2) goto L1 else goto L0
+                    switch $t2
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t4 := move($t0)
+                    $t4 := t
+                    // $t5 := unpack option::Option<#0>($t4)
+                    $t5 := $MemoryLoadU256(add($t4, 0))
+                    $Free($t4, 32)
+                    // vector::destroy_empty<#0>($t5)
+                    A1_vector_destroy_empty$u64$($t5)
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_destroy_empty$u64$(v) {
+            let size := $MemoryLoadU64(v)
+            if $LogicalNot(iszero(size)) { $AbortBuiltin() }
+            let capacity := $MemoryLoadU64(add(v, 8))
+            $Free(v, add(32, mul(capacity, 8)))
+        }
+        function A1_option_is_none$u64$(t) -> $result {
+            let $t1, $t2
+            // $t1 := borrow_field<option::Option<#0>>.vec($t0)
+            $t1 := t
+            // $t2 := vector::is_empty<#0>($t1)
+            $t2 := A1_vector_is_empty$u64$($t1)
+            // return $t2
+            $result := $t2
+        }
+
+        function A1_vector_is_empty$u64$(v) -> $result {
+            let $t1, $t2, $t3
+            // $t1 := vector::length<#0>($t0)
+            $t1 := A1_vector_length$u64$(v)
+            // $t2 := 0
+            $t2 := 0
+            // $t3 := ==($t1, $t2)
+            $t3 := $Eq($t1, $t2)
+            // return $t3
+            $result := $t3
+        }
+
+        function A1_vector_length$u64$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A2_ExternalResult_is_err_data$u64$(result) -> $result {
+            let $t1, $t2
+            // $t1 := borrow_field<ExternalResult::ExternalResult<#0>>.err_data($t0)
+            {
+                let $field_ptr := $IndexPtr(result, 32)
+                $t1 := $MakePtr($IsStoragePtr($field_ptr), $LoadU256($field_ptr))
+            }
+            // $t2 := option::is_some<vector<u8>>($t1)
+            $t2 := A1_option_is_some$vec$u8$$($t1)
+            // return $t2
+            $result := $t2
+        }
+
+        function A2_M_pack_err_data$u64$(v) -> $result {
+            let $t1
+            // $t1 := ExternalResult::err_data<#0>($t0)
+            $t1 := A2_ExternalResult_err_data$u64$(v)
+            // return $t1
+            $result := $t1
+        }
+
+        function A2_ExternalResult_err_data$u64$(error) -> $result {
+            let $t1, $t2, $t3, $t4, $t5
+            // $t1 := option::none<#0>()
+            $t1 := A1_option_none$u64$()
+            // $t2 := option::some<vector<u8>>($t0)
+            $t2 := A1_option_some$vec$u8$$(error)
+            // $t3 := option::none<vector<u8>>()
+            $t3 := A1_option_none$vec$u8$$()
+            // $t4 := option::none<U256::U256>()
+            $t4 := A1_option_none$A2_U256_U256$()
+            // $t5 := pack ExternalResult::ExternalResult<#0>($t1, $t2, $t3, $t4)
+            {
+                let $mem := $Malloc(128)
+                $MemoryStoreU256(add($mem, 0), $t1)
+                $MemoryStoreU256(add($mem, 32), $t2)
+                $MemoryStoreU256(add($mem, 64), $t3)
+                $MemoryStoreU256(add($mem, 96), $t4)
+                $t5 := $mem
+            }
+            // return $t5
+            $result := $t5
+        }
+
+        function A1_option_none$A2_U256_U256$() -> $result {
+            let $t0, $t1
+            // $t0 := vector::empty<#0>()
+            $t0 := A1_vector_empty$A2_U256_U256$()
+            // $t1 := pack option::Option<#0>($t0)
+            {
+                let $mem := $Malloc(32)
+                $MemoryStoreU256(add($mem, 0), $t0)
+                $t1 := $mem
+            }
+            // return $t1
+            $result := $t1
+        }
+
+        function A1_vector_empty$A2_U256_U256$() -> vector {
+            vector := $Malloc(96)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function A1_option_none$vec$u8$$() -> $result {
+            let $t0, $t1
+            // $t0 := vector::empty<#0>()
+            $t0 := A1_vector_empty$vec$u8$$()
+            // $t1 := pack option::Option<#0>($t0)
+            {
+                let $mem := $Malloc(32)
+                $MemoryStoreU256(add($mem, 0), $t0)
+                $t1 := $mem
+            }
+            // return $t1
+            $result := $t1
+        }
+
+        function A1_vector_empty$vec$u8$$() -> vector {
+            vector := $Malloc(96)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function A1_option_some$vec$u8$$(e) -> $result {
+            let $t1, $t2
+            // $t1 := vector::singleton<#0>($t0)
+            $t1 := A1_vector_singleton$vec$u8$$(e)
+            // $t2 := pack option::Option<#0>($t1)
+            {
+                let $mem := $Malloc(32)
+                $MemoryStoreU256(add($mem, 0), $t1)
+                $t2 := $mem
+            }
+            // return $t2
+            $result := $t2
+        }
+
+        function A1_vector_singleton$vec$u8$$(e) -> $result {
+            let $t2, $t3
+            let $locals := $Malloc(32)
+            // $t1 := vector::empty<#0>()
+            mstore($locals, A1_vector_empty$vec$u8$$())
+            // $t2 := borrow_local($t1)
+            $t2 := $MakePtr(false, $locals)
+            // vector::push_back<#0>($t2, $t0)
+            A1_vector_push_back$vec$u8$$($t2, e)
+            // $t3 := move($t1)
+            $t3 := mload($locals)
+            // return $t3
+            $result := $t3
+            $Free($locals, 32)
+        }
+
+        function A1_vector_push_back$vec$u8$$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 32)))
+            $StoreU256(e_ptr, e)
+            if $IsStoragePtr(e_ptr) {
+                let e_offs := $OffsetPtr(e_ptr)
+                let $linked_dst_2300595445 := $NewLinkedStorageBase(0x89204cf5)
+                let $size_2300595445 := $MemoryLoadU64(e)
+                let $data_size_2300595445 := mul($size_2300595445, 1)
+                $AlignedStorageStore($linked_dst_2300595445, mload(e))
+                let $data_src_2300595445 := add(e, 32)
+                let $data_dst_2300595445 := add($linked_dst_2300595445, 32)
+                for { let $offs_2300595445 := 0 } lt($offs_2300595445, $data_size_2300595445) { $offs_2300595445 := add($offs_2300595445, 32)} {
+                    $AlignedStorageStore(add($data_dst_2300595445, $offs_2300595445), mload(add($data_src_2300595445, $offs_2300595445)))
+                    $Free(e, add($data_size_2300595445, 32))
+                }
+                $AlignedStorageStore(e_offs, $linked_dst_2300595445)
+            }
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 32)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_option_none$u64$() -> $result {
+            let $t0, $t1
+            // $t0 := vector::empty<#0>()
+            $t0 := A1_vector_empty$u64$()
+            // $t1 := pack option::Option<#0>($t0)
+            {
+                let $mem := $Malloc(32)
+                $MemoryStoreU256(add($mem, 0), $t0)
+                $t1 := $mem
+            }
+            // return $t1
+            $result := $t1
+        }
+
+        function A1_vector_empty$u64$() -> vector {
+            vector := $Malloc(48)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function A1_vector_push_back$u8$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 1)))
+            $StoreU8(e_ptr, e)
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 1)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_vector_empty$u8$() -> vector {
+            vector := $Malloc(34)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU8(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU8(offs)
+          }
+          default {
+            val := $StorageLoadU8(offs)
+          }
+        }
+        function $MemoryLoadU8(offs) -> val {
+          val := $MemoryLoadBytes(offs, 1)
+        }
+        function $StorageLoadU8(offs) -> val {
+          val := $StorageLoadBytes(offs, 1)
+        }
+        function $StoreU8(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU8(offs, val)
+          }
+          default {
+            $StorageStoreU8(offs, val)
+          }
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $StorageStoreU8(offs, val) {
+          $StorageStoreBytes(offs, 1, val)
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $GtEq(x, y) -> r {
+            r := or(gt(x, y), eq(x, y))
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $ClosestGreaterPowerOfTwo(x) -> r {
+            r := or(r, shr(1, x))
+            r := or(r, shr(2, r))
+            r := or(r, shr(4, r))
+            r := or(r, shr(8, r))
+            r := or(r, shr(16, r))
+            r := or(r, shr(32, r))
+            r := add(x, 1)
+        }
+    }
+}
+===> Test result of M::extract_err_data: Succeed(Stopped) (used_gas=6994): []
+
+// test of M::extract_err_reason
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_extract_err_reason" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_extract_err_reason()
+        return (0, 0)
+        function A2_M_extract_err_reason() {
+            let v2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21
+            let $locals := $Malloc(64)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t8 := 105
+                    $t8 := 105
+                    // abort($t8)
+                    $Abort($t8)
+                }
+                case 4 {
+                    // $t0 := vector::empty<u8>()
+                    mstore($locals, A1_vector_empty$u8$())
+                    // $t3 := borrow_local($t0)
+                    $t3 := $MakePtr(false, $locals)
+                    // $t4 := 42
+                    $t4 := 42
+                    // vector::push_back<u8>($t3, $t4)
+                    A1_vector_push_back$u8$($t3, $t4)
+                    // $t5 := move($t0)
+                    $t5 := mload($locals)
+                    // $t1 := M::pack_err_reason<u64>($t5)
+                    v2 := A2_M_pack_err_reason$u64$($t5)
+                    // $t6 := borrow_local($t1)
+                    $t6 := $MakePtr(false, v2)
+                    // $t7 := ExternalResult::is_err_reason<u64>($t6)
+                    $t7 := A2_ExternalResult_is_err_reason$u64$($t6)
+                    // if ($t7) goto L1 else goto L0
+                    switch $t7
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t9 := move($t1)
+                    $t9 := v2
+                    // $t2 := ExternalResult::unwrap_err_reason<u64>($t9)
+                    mstore(add($locals, 32), A2_ExternalResult_unwrap_err_reason$u64$($t9))
+                    // $t10 := borrow_local($t2)
+                    $t10 := $MakePtr(false, add($locals, 32))
+                    // $t11 := vector::length<u8>($t10)
+                    $t11 := A1_vector_length$u8$($t10)
+                    // $t12 := 1
+                    $t12 := 1
+                    // $t13 := ==($t11, $t12)
+                    $t13 := $Eq($t11, $t12)
+                    // if ($t13) goto L4 else goto L3
+                    switch $t13
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t14 := 106
+                    $t14 := 106
+                    // abort($t14)
+                    $Abort($t14)
+                }
+                case 8 {
+                    // label L5
+                    // $t15 := borrow_local($t2)
+                    $t15 := $MakePtr(false, add($locals, 32))
+                    // $t16 := 0
+                    $t16 := 0
+                    // $t17 := vector::borrow<u8>($t15, $t16)
+                    $t17 := A1_vector_borrow$u8$($t15, $t16)
+                    // $t18 := read_ref($t17)
+                    $t18 := $LoadU8($t17)
+                    // $t19 := 42
+                    $t19 := 42
+                    // $t20 := ==($t18, $t19)
+                    $t20 := $Eq($t18, $t19)
+                    // if ($t20) goto L7 else goto L6
+                    switch $t20
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t21 := 107
+                    $t21 := 107
+                    // abort($t21)
+                    $Abort($t21)
+                }
+                case 11 {
+                    // label L8
+                    // return ()
+                    $Free($locals, 64)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_borrow$u8$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 1)))
+        }
+        function A1_vector_length$u8$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A2_ExternalResult_unwrap_err_reason$u64$(result) -> $result {
+            let err_data, err_reason, panic_code, $t4, $t5, $t6, $t7, $t8
+            // ($t4, $t5, $t6, $t7) := unpack ExternalResult::ExternalResult<#0>($t0)
+            $t4 := $MemoryLoadU256(add(result, 0))
+            $t5 := $MemoryLoadU256(add(result, 32))
+            $t6 := $MemoryLoadU256(add(result, 64))
+            $t7 := $MemoryLoadU256(add(result, 96))
+            $Free(result, 128)
+            // option::destroy_none<#0>($t4)
+            A1_option_destroy_none$u64$($t4)
+            // option::destroy_none<vector<u8>>($t5)
+            A1_option_destroy_none$vec$u8$$($t5)
+            // option::destroy_none<U256::U256>($t7)
+            A1_option_destroy_none$A2_U256_U256$($t7)
+            // $t8 := option::destroy_some<vector<u8>>($t6)
+            $t8 := A1_option_destroy_some$vec$u8$$($t6)
+            // return $t8
+            $result := $t8
+        }
+
+        function A1_option_destroy_some$vec$u8$$(t) -> $result {
+            let elem, $t3, $t4, $t5, $t6, $t7, $t8, $t9
+            let $locals := $Malloc(32)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t5 := 262145
+                    $t5 := 262145
+                    // abort($t5)
+                    $Abort($t5)
+                }
+                case 4 {
+                    // $t3 := borrow_local($t0)
+                    $t3 := $MakePtr(false, t)
+                    // $t4 := option::is_some<#0>($t3)
+                    $t4 := A1_option_is_some$vec$u8$$($t3)
+                    // if ($t4) goto L1 else goto L0
+                    switch $t4
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t6 := move($t0)
+                    $t6 := t
+                    // $t2 := unpack option::Option<#0>($t6)
+                    mstore($locals, $MemoryLoadU256(add($t6, 0)))
+                    $Free($t6, 32)
+                    // $t7 := borrow_local($t2)
+                    $t7 := $MakePtr(false, $locals)
+                    // $t8 := vector::pop_back<#0>($t7)
+                    $t8 := A1_vector_pop_back$vec$u8$$($t7)
+                    // $t9 := move($t2)
+                    $t9 := mload($locals)
+                    // vector::destroy_empty<#0>($t9)
+                    A1_vector_destroy_empty$vec$u8$$($t9)
+                    // return $t8
+                    $result := $t8
+                    $Free($locals, 32)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_destroy_empty$vec$u8$$(v) {
+            let size := $MemoryLoadU64(v)
+            if $LogicalNot(iszero(size)) { $AbortBuiltin() }
+            let capacity := $MemoryLoadU64(add(v, 8))
+            $Free(v, add(32, mul(capacity, 32)))
+        }
+        function A1_vector_pop_back$vec$u8$$(v_ref) -> e {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if iszero(size) { $AbortBuiltin() }
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(sub(size, 1), 32)))
+            e := $LoadU256(e_ptr)
+            if $IsStoragePtr(e_ptr) {
+                let e_offs := $OffsetPtr(e_ptr)
+                let linked_src := $AlignedStorageLoad(e_offs)
+                let $size_2300595445 := $StorageLoadU64(linked_src)
+                let $capacity_2300595445 := $ClosestGreaterPowerOfTwo($size_2300595445)
+                e := $Malloc(add(32, mul($capacity_2300595445, 1)))
+                let $data_size_2300595445 := mul($size_2300595445, 1)
+                mstore(e, $AlignedStorageLoad(linked_src))
+                $MemoryStoreU64(add(e, 8), $capacity_2300595445)
+                let $data_src_2300595445 := add(linked_src, 32)
+                let $data_dst_2300595445 := add(e, 32)
+                for { let $offs_2300595445 := 0 } lt($offs_2300595445, $data_size_2300595445) { $offs_2300595445 := add($offs_2300595445, 32)} {
+                    mstore(add($data_dst_2300595445, $offs_2300595445), $AlignedStorageLoad(add($data_src_2300595445, $offs_2300595445)))
+                    $AlignedStorageStore(add($data_src_2300595445, $offs_2300595445), 0)
+                }
+                $AlignedStorageStore(e_offs, 0)
+            }
+            $StoreU64(v_ptr, sub(size, 1))
+        }
+        function A1_option_is_some$vec$u8$$(t) -> $result {
+            let $t1, $t2, $t3
+            // $t1 := borrow_field<option::Option<#0>>.vec($t0)
+            $t1 := t
+            // $t2 := vector::is_empty<#0>($t1)
+            $t2 := A1_vector_is_empty$vec$u8$$($t1)
+            // $t3 := !($t2)
+            $t3 := $LogicalNot($t2)
+            // return $t3
+            $result := $t3
+        }
+
+        function A1_vector_is_empty$vec$u8$$(v) -> $result {
+            let $t1, $t2, $t3
+            // $t1 := vector::length<#0>($t0)
+            $t1 := A1_vector_length$vec$u8$$(v)
+            // $t2 := 0
+            $t2 := 0
+            // $t3 := ==($t1, $t2)
+            $t3 := $Eq($t1, $t2)
+            // return $t3
+            $result := $t3
+        }
+
+        function A1_vector_length$vec$u8$$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A1_option_destroy_none$A2_U256_U256$(t) {
+            let $t1, $t2, $t3, $t4, $t5
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t3 := 262144
+                    $t3 := 262144
+                    // abort($t3)
+                    $Abort($t3)
+                }
+                case 4 {
+                    // $t1 := borrow_local($t0)
+                    $t1 := $MakePtr(false, t)
+                    // $t2 := option::is_none<#0>($t1)
+                    $t2 := A1_option_is_none$A2_U256_U256$($t1)
+                    // if ($t2) goto L1 else goto L0
+                    switch $t2
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t4 := move($t0)
+                    $t4 := t
+                    // $t5 := unpack option::Option<#0>($t4)
+                    $t5 := $MemoryLoadU256(add($t4, 0))
+                    $Free($t4, 32)
+                    // vector::destroy_empty<#0>($t5)
+                    A1_vector_destroy_empty$A2_U256_U256$($t5)
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_destroy_empty$A2_U256_U256$(v) {
+            let size := $MemoryLoadU64(v)
+            if $LogicalNot(iszero(size)) { $AbortBuiltin() }
+            let capacity := $MemoryLoadU64(add(v, 8))
+            $Free(v, add(32, mul(capacity, 32)))
+        }
+        function A1_option_is_none$A2_U256_U256$(t) -> $result {
+            let $t1, $t2
+            // $t1 := borrow_field<option::Option<#0>>.vec($t0)
+            $t1 := t
+            // $t2 := vector::is_empty<#0>($t1)
+            $t2 := A1_vector_is_empty$A2_U256_U256$($t1)
+            // return $t2
+            $result := $t2
+        }
+
+        function A1_vector_is_empty$A2_U256_U256$(v) -> $result {
+            let $t1, $t2, $t3
+            // $t1 := vector::length<#0>($t0)
+            $t1 := A1_vector_length$A2_U256_U256$(v)
+            // $t2 := 0
+            $t2 := 0
+            // $t3 := ==($t1, $t2)
+            $t3 := $Eq($t1, $t2)
+            // return $t3
+            $result := $t3
+        }
+
+        function A1_vector_length$A2_U256_U256$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A1_option_destroy_none$vec$u8$$(t) {
+            let $t1, $t2, $t3, $t4, $t5
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t3 := 262144
+                    $t3 := 262144
+                    // abort($t3)
+                    $Abort($t3)
+                }
+                case 4 {
+                    // $t1 := borrow_local($t0)
+                    $t1 := $MakePtr(false, t)
+                    // $t2 := option::is_none<#0>($t1)
+                    $t2 := A1_option_is_none$vec$u8$$($t1)
+                    // if ($t2) goto L1 else goto L0
+                    switch $t2
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t4 := move($t0)
+                    $t4 := t
+                    // $t5 := unpack option::Option<#0>($t4)
+                    $t5 := $MemoryLoadU256(add($t4, 0))
+                    $Free($t4, 32)
+                    // vector::destroy_empty<#0>($t5)
+                    A1_vector_destroy_empty$vec$u8$$($t5)
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function A1_option_is_none$vec$u8$$(t) -> $result {
+            let $t1, $t2
+            // $t1 := borrow_field<option::Option<#0>>.vec($t0)
+            $t1 := t
+            // $t2 := vector::is_empty<#0>($t1)
+            $t2 := A1_vector_is_empty$vec$u8$$($t1)
+            // return $t2
+            $result := $t2
+        }
+
+        function A1_option_destroy_none$u64$(t) {
+            let $t1, $t2, $t3, $t4, $t5
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t3 := 262144
+                    $t3 := 262144
+                    // abort($t3)
+                    $Abort($t3)
+                }
+                case 4 {
+                    // $t1 := borrow_local($t0)
+                    $t1 := $MakePtr(false, t)
+                    // $t2 := option::is_none<#0>($t1)
+                    $t2 := A1_option_is_none$u64$($t1)
+                    // if ($t2) goto L1 else goto L0
+                    switch $t2
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t4 := move($t0)
+                    $t4 := t
+                    // $t5 := unpack option::Option<#0>($t4)
+                    $t5 := $MemoryLoadU256(add($t4, 0))
+                    $Free($t4, 32)
+                    // vector::destroy_empty<#0>($t5)
+                    A1_vector_destroy_empty$u64$($t5)
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_destroy_empty$u64$(v) {
+            let size := $MemoryLoadU64(v)
+            if $LogicalNot(iszero(size)) { $AbortBuiltin() }
+            let capacity := $MemoryLoadU64(add(v, 8))
+            $Free(v, add(32, mul(capacity, 8)))
+        }
+        function A1_option_is_none$u64$(t) -> $result {
+            let $t1, $t2
+            // $t1 := borrow_field<option::Option<#0>>.vec($t0)
+            $t1 := t
+            // $t2 := vector::is_empty<#0>($t1)
+            $t2 := A1_vector_is_empty$u64$($t1)
+            // return $t2
+            $result := $t2
+        }
+
+        function A1_vector_is_empty$u64$(v) -> $result {
+            let $t1, $t2, $t3
+            // $t1 := vector::length<#0>($t0)
+            $t1 := A1_vector_length$u64$(v)
+            // $t2 := 0
+            $t2 := 0
+            // $t3 := ==($t1, $t2)
+            $t3 := $Eq($t1, $t2)
+            // return $t3
+            $result := $t3
+        }
+
+        function A1_vector_length$u64$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A2_ExternalResult_is_err_reason$u64$(result) -> $result {
+            let $t1, $t2
+            // $t1 := borrow_field<ExternalResult::ExternalResult<#0>>.err_reason($t0)
+            {
+                let $field_ptr := $IndexPtr(result, 64)
+                $t1 := $MakePtr($IsStoragePtr($field_ptr), $LoadU256($field_ptr))
+            }
+            // $t2 := option::is_some<vector<u8>>($t1)
+            $t2 := A1_option_is_some$vec$u8$$($t1)
+            // return $t2
+            $result := $t2
+        }
+
+        function A2_M_pack_err_reason$u64$(v) -> $result {
+            let $t1
+            // $t1 := ExternalResult::err_reason<#0>($t0)
+            $t1 := A2_ExternalResult_err_reason$u64$(v)
+            // return $t1
+            $result := $t1
+        }
+
+        function A2_ExternalResult_err_reason$u64$(error) -> $result {
+            let tmp_$1, tmp_$2, tmp_$3, tmp_$4, $t5, $t6, $t7, $t8, $t9
+            // $t5 := option::none<#0>()
+            $t5 := A1_option_none$u64$()
+            // $t6 := option::some<vector<u8>>($t0)
+            $t6 := A1_option_some$vec$u8$$(error)
+            // $t7 := option::none<vector<u8>>()
+            $t7 := A1_option_none$vec$u8$$()
+            // $t8 := option::none<U256::U256>()
+            $t8 := A1_option_none$A2_U256_U256$()
+            // $t9 := pack ExternalResult::ExternalResult<#0>($t5, $t7, $t6, $t8)
+            {
+                let $mem := $Malloc(128)
+                $MemoryStoreU256(add($mem, 0), $t5)
+                $MemoryStoreU256(add($mem, 32), $t7)
+                $MemoryStoreU256(add($mem, 64), $t6)
+                $MemoryStoreU256(add($mem, 96), $t8)
+                $t9 := $mem
+            }
+            // return $t9
+            $result := $t9
+        }
+
+        function A1_option_none$A2_U256_U256$() -> $result {
+            let $t0, $t1
+            // $t0 := vector::empty<#0>()
+            $t0 := A1_vector_empty$A2_U256_U256$()
+            // $t1 := pack option::Option<#0>($t0)
+            {
+                let $mem := $Malloc(32)
+                $MemoryStoreU256(add($mem, 0), $t0)
+                $t1 := $mem
+            }
+            // return $t1
+            $result := $t1
+        }
+
+        function A1_vector_empty$A2_U256_U256$() -> vector {
+            vector := $Malloc(96)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function A1_option_none$vec$u8$$() -> $result {
+            let $t0, $t1
+            // $t0 := vector::empty<#0>()
+            $t0 := A1_vector_empty$vec$u8$$()
+            // $t1 := pack option::Option<#0>($t0)
+            {
+                let $mem := $Malloc(32)
+                $MemoryStoreU256(add($mem, 0), $t0)
+                $t1 := $mem
+            }
+            // return $t1
+            $result := $t1
+        }
+
+        function A1_vector_empty$vec$u8$$() -> vector {
+            vector := $Malloc(96)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function A1_option_some$vec$u8$$(e) -> $result {
+            let $t1, $t2
+            // $t1 := vector::singleton<#0>($t0)
+            $t1 := A1_vector_singleton$vec$u8$$(e)
+            // $t2 := pack option::Option<#0>($t1)
+            {
+                let $mem := $Malloc(32)
+                $MemoryStoreU256(add($mem, 0), $t1)
+                $t2 := $mem
+            }
+            // return $t2
+            $result := $t2
+        }
+
+        function A1_vector_singleton$vec$u8$$(e) -> $result {
+            let $t2, $t3
+            let $locals := $Malloc(32)
+            // $t1 := vector::empty<#0>()
+            mstore($locals, A1_vector_empty$vec$u8$$())
+            // $t2 := borrow_local($t1)
+            $t2 := $MakePtr(false, $locals)
+            // vector::push_back<#0>($t2, $t0)
+            A1_vector_push_back$vec$u8$$($t2, e)
+            // $t3 := move($t1)
+            $t3 := mload($locals)
+            // return $t3
+            $result := $t3
+            $Free($locals, 32)
+        }
+
+        function A1_vector_push_back$vec$u8$$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 32)))
+            $StoreU256(e_ptr, e)
+            if $IsStoragePtr(e_ptr) {
+                let e_offs := $OffsetPtr(e_ptr)
+                let $linked_dst_2300595445 := $NewLinkedStorageBase(0x89204cf5)
+                let $size_2300595445 := $MemoryLoadU64(e)
+                let $data_size_2300595445 := mul($size_2300595445, 1)
+                $AlignedStorageStore($linked_dst_2300595445, mload(e))
+                let $data_src_2300595445 := add(e, 32)
+                let $data_dst_2300595445 := add($linked_dst_2300595445, 32)
+                for { let $offs_2300595445 := 0 } lt($offs_2300595445, $data_size_2300595445) { $offs_2300595445 := add($offs_2300595445, 32)} {
+                    $AlignedStorageStore(add($data_dst_2300595445, $offs_2300595445), mload(add($data_src_2300595445, $offs_2300595445)))
+                    $Free(e, add($data_size_2300595445, 32))
+                }
+                $AlignedStorageStore(e_offs, $linked_dst_2300595445)
+            }
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 32)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_option_none$u64$() -> $result {
+            let $t0, $t1
+            // $t0 := vector::empty<#0>()
+            $t0 := A1_vector_empty$u64$()
+            // $t1 := pack option::Option<#0>($t0)
+            {
+                let $mem := $Malloc(32)
+                $MemoryStoreU256(add($mem, 0), $t0)
+                $t1 := $mem
+            }
+            // return $t1
+            $result := $t1
+        }
+
+        function A1_vector_empty$u64$() -> vector {
+            vector := $Malloc(48)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function A1_vector_push_back$u8$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 1)))
+            $StoreU8(e_ptr, e)
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 1)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_vector_empty$u8$() -> vector {
+            vector := $Malloc(34)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU8(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU8(offs)
+          }
+          default {
+            val := $StorageLoadU8(offs)
+          }
+        }
+        function $MemoryLoadU8(offs) -> val {
+          val := $MemoryLoadBytes(offs, 1)
+        }
+        function $StorageLoadU8(offs) -> val {
+          val := $StorageLoadBytes(offs, 1)
+        }
+        function $StoreU8(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU8(offs, val)
+          }
+          default {
+            $StorageStoreU8(offs, val)
+          }
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $StorageStoreU8(offs, val) {
+          $StorageStoreBytes(offs, 1, val)
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $GtEq(x, y) -> r {
+            r := or(gt(x, y), eq(x, y))
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $ClosestGreaterPowerOfTwo(x) -> r {
+            r := or(r, shr(1, x))
+            r := or(r, shr(2, r))
+            r := or(r, shr(4, r))
+            r := or(r, shr(8, r))
+            r := or(r, shr(16, r))
+            r := or(r, shr(32, r))
+            r := add(x, 1)
+        }
+    }
+}
+===> Test result of M::extract_err_reason: Succeed(Stopped) (used_gas=6988): []
+
+// test of M::extract_panic_code
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_extract_panic_code" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_extract_panic_code()
+        return (0, 0)
+        function A2_M_extract_panic_code() {
+            let v2, $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t5 := 108
+                    $t5 := 108
+                    // abort($t5)
+                    $Abort($t5)
+                }
+                case 4 {
+                    // $t1 := 42
+                    $t1 := 42
+                    // $t2 := U256::u256_from_u128($t1)
+                    $t2 := A2_U256_u256_from_u128($t1)
+                    // $t0 := M::pack_panic_code<u64>($t2)
+                    v2 := A2_M_pack_panic_code$u64$($t2)
+                    // $t3 := borrow_local($t0)
+                    $t3 := $MakePtr(false, v2)
+                    // $t4 := ExternalResult::is_panic<u64>($t3)
+                    $t4 := A2_ExternalResult_is_panic$u64$($t3)
+                    // if ($t4) goto L1 else goto L0
+                    switch $t4
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t6 := move($t0)
+                    $t6 := v2
+                    // $t7 := ExternalResult::unwrap_panic<u64>($t6)
+                    $t7 := A2_ExternalResult_unwrap_panic$u64$($t6)
+                    // $t8 := 42
+                    $t8 := 42
+                    // $t9 := U256::u256_from_u128($t8)
+                    $t9 := A2_U256_u256_from_u128($t8)
+                    // $t10 := ==($t7, $t9)
+                    $t10 := $Eq($t7, $t9)
+                    // if ($t10) goto L4 else goto L3
+                    switch $t10
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t11 := 109
+                    $t11 := 109
+                    // abort($t11)
+                    $Abort($t11)
+                }
+                case 8 {
+                    // label L5
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function A2_U256_u256_from_u128(lo) -> $result {
+            let $t1, $t2
+            // $t1 := 0
+            $t1 := 0
+            // $t2 := (u256)($t1, $t0)
+            $t2 := $CastU256($t1, lo)
+            // return $t2
+            $result := $t2
+        }
+
+        function A2_ExternalResult_unwrap_panic$u64$(result) -> $result {
+            let err_data, err_reason, panic_code, $t4, $t5, $t6, $t7, $t8
+            // ($t4, $t5, $t6, $t7) := unpack ExternalResult::ExternalResult<#0>($t0)
+            $t4 := $MemoryLoadU256(add(result, 0))
+            $t5 := $MemoryLoadU256(add(result, 32))
+            $t6 := $MemoryLoadU256(add(result, 64))
+            $t7 := $MemoryLoadU256(add(result, 96))
+            $Free(result, 128)
+            // option::destroy_none<#0>($t4)
+            A1_option_destroy_none$u64$($t4)
+            // option::destroy_none<vector<u8>>($t6)
+            A1_option_destroy_none$vec$u8$$($t6)
+            // option::destroy_none<vector<u8>>($t5)
+            A1_option_destroy_none$vec$u8$$($t5)
+            // $t8 := option::destroy_some<U256::U256>($t7)
+            $t8 := A1_option_destroy_some$A2_U256_U256$($t7)
+            // return $t8
+            $result := $t8
+        }
+
+        function A1_option_destroy_some$A2_U256_U256$(t) -> $result {
+            let elem, $t3, $t4, $t5, $t6, $t7, $t8, $t9
+            let $locals := $Malloc(32)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t5 := 262145
+                    $t5 := 262145
+                    // abort($t5)
+                    $Abort($t5)
+                }
+                case 4 {
+                    // $t3 := borrow_local($t0)
+                    $t3 := $MakePtr(false, t)
+                    // $t4 := option::is_some<#0>($t3)
+                    $t4 := A1_option_is_some$A2_U256_U256$($t3)
+                    // if ($t4) goto L1 else goto L0
+                    switch $t4
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t6 := move($t0)
+                    $t6 := t
+                    // $t2 := unpack option::Option<#0>($t6)
+                    mstore($locals, $MemoryLoadU256(add($t6, 0)))
+                    $Free($t6, 32)
+                    // $t7 := borrow_local($t2)
+                    $t7 := $MakePtr(false, $locals)
+                    // $t8 := vector::pop_back<#0>($t7)
+                    $t8 := A1_vector_pop_back$A2_U256_U256$($t7)
+                    // $t9 := move($t2)
+                    $t9 := mload($locals)
+                    // vector::destroy_empty<#0>($t9)
+                    A1_vector_destroy_empty$A2_U256_U256$($t9)
+                    // return $t8
+                    $result := $t8
+                    $Free($locals, 32)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_destroy_empty$A2_U256_U256$(v) {
+            let size := $MemoryLoadU64(v)
+            if $LogicalNot(iszero(size)) { $AbortBuiltin() }
+            let capacity := $MemoryLoadU64(add(v, 8))
+            $Free(v, add(32, mul(capacity, 32)))
+        }
+        function A1_vector_pop_back$A2_U256_U256$(v_ref) -> e {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if iszero(size) { $AbortBuiltin() }
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(sub(size, 1), 32)))
+            e := $LoadU256(e_ptr)
+            $StoreU64(v_ptr, sub(size, 1))
+        }
+        function A1_option_is_some$A2_U256_U256$(t) -> $result {
+            let $t1, $t2, $t3
+            // $t1 := borrow_field<option::Option<#0>>.vec($t0)
+            $t1 := t
+            // $t2 := vector::is_empty<#0>($t1)
+            $t2 := A1_vector_is_empty$A2_U256_U256$($t1)
+            // $t3 := !($t2)
+            $t3 := $LogicalNot($t2)
+            // return $t3
+            $result := $t3
+        }
+
+        function A1_vector_is_empty$A2_U256_U256$(v) -> $result {
+            let $t1, $t2, $t3
+            // $t1 := vector::length<#0>($t0)
+            $t1 := A1_vector_length$A2_U256_U256$(v)
+            // $t2 := 0
+            $t2 := 0
+            // $t3 := ==($t1, $t2)
+            $t3 := $Eq($t1, $t2)
+            // return $t3
+            $result := $t3
+        }
+
+        function A1_vector_length$A2_U256_U256$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A1_option_destroy_none$vec$u8$$(t) {
+            let $t1, $t2, $t3, $t4, $t5
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t3 := 262144
+                    $t3 := 262144
+                    // abort($t3)
+                    $Abort($t3)
+                }
+                case 4 {
+                    // $t1 := borrow_local($t0)
+                    $t1 := $MakePtr(false, t)
+                    // $t2 := option::is_none<#0>($t1)
+                    $t2 := A1_option_is_none$vec$u8$$($t1)
+                    // if ($t2) goto L1 else goto L0
+                    switch $t2
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t4 := move($t0)
+                    $t4 := t
+                    // $t5 := unpack option::Option<#0>($t4)
+                    $t5 := $MemoryLoadU256(add($t4, 0))
+                    $Free($t4, 32)
+                    // vector::destroy_empty<#0>($t5)
+                    A1_vector_destroy_empty$vec$u8$$($t5)
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_destroy_empty$vec$u8$$(v) {
+            let size := $MemoryLoadU64(v)
+            if $LogicalNot(iszero(size)) { $AbortBuiltin() }
+            let capacity := $MemoryLoadU64(add(v, 8))
+            $Free(v, add(32, mul(capacity, 32)))
+        }
+        function A1_option_is_none$vec$u8$$(t) -> $result {
+            let $t1, $t2
+            // $t1 := borrow_field<option::Option<#0>>.vec($t0)
+            $t1 := t
+            // $t2 := vector::is_empty<#0>($t1)
+            $t2 := A1_vector_is_empty$vec$u8$$($t1)
+            // return $t2
+            $result := $t2
+        }
+
+        function A1_vector_is_empty$vec$u8$$(v) -> $result {
+            let $t1, $t2, $t3
+            // $t1 := vector::length<#0>($t0)
+            $t1 := A1_vector_length$vec$u8$$(v)
+            // $t2 := 0
+            $t2 := 0
+            // $t3 := ==($t1, $t2)
+            $t3 := $Eq($t1, $t2)
+            // return $t3
+            $result := $t3
+        }
+
+        function A1_vector_length$vec$u8$$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A1_option_destroy_none$u64$(t) {
+            let $t1, $t2, $t3, $t4, $t5
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t3 := 262144
+                    $t3 := 262144
+                    // abort($t3)
+                    $Abort($t3)
+                }
+                case 4 {
+                    // $t1 := borrow_local($t0)
+                    $t1 := $MakePtr(false, t)
+                    // $t2 := option::is_none<#0>($t1)
+                    $t2 := A1_option_is_none$u64$($t1)
+                    // if ($t2) goto L1 else goto L0
+                    switch $t2
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t4 := move($t0)
+                    $t4 := t
+                    // $t5 := unpack option::Option<#0>($t4)
+                    $t5 := $MemoryLoadU256(add($t4, 0))
+                    $Free($t4, 32)
+                    // vector::destroy_empty<#0>($t5)
+                    A1_vector_destroy_empty$u64$($t5)
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_destroy_empty$u64$(v) {
+            let size := $MemoryLoadU64(v)
+            if $LogicalNot(iszero(size)) { $AbortBuiltin() }
+            let capacity := $MemoryLoadU64(add(v, 8))
+            $Free(v, add(32, mul(capacity, 8)))
+        }
+        function A1_option_is_none$u64$(t) -> $result {
+            let $t1, $t2
+            // $t1 := borrow_field<option::Option<#0>>.vec($t0)
+            $t1 := t
+            // $t2 := vector::is_empty<#0>($t1)
+            $t2 := A1_vector_is_empty$u64$($t1)
+            // return $t2
+            $result := $t2
+        }
+
+        function A1_vector_is_empty$u64$(v) -> $result {
+            let $t1, $t2, $t3
+            // $t1 := vector::length<#0>($t0)
+            $t1 := A1_vector_length$u64$(v)
+            // $t2 := 0
+            $t2 := 0
+            // $t3 := ==($t1, $t2)
+            $t3 := $Eq($t1, $t2)
+            // return $t3
+            $result := $t3
+        }
+
+        function A1_vector_length$u64$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A2_ExternalResult_is_panic$u64$(result) -> $result {
+            let $t1, $t2
+            // $t1 := borrow_field<ExternalResult::ExternalResult<#0>>.panic_code($t0)
+            {
+                let $field_ptr := $IndexPtr(result, 96)
+                $t1 := $MakePtr($IsStoragePtr($field_ptr), $LoadU256($field_ptr))
+            }
+            // $t2 := option::is_some<U256::U256>($t1)
+            $t2 := A1_option_is_some$A2_U256_U256$($t1)
+            // return $t2
+            $result := $t2
+        }
+
+        function A2_M_pack_panic_code$u64$(v) -> $result {
+            let $t1
+            // $t1 := ExternalResult::panic<#0>($t0)
+            $t1 := A2_ExternalResult_panic$u64$(v)
+            // return $t1
+            $result := $t1
+        }
+
+        function A2_ExternalResult_panic$u64$(panic_code) -> $result {
+            let tmp_$1, tmp_$2, tmp_$3, tmp_$4, $t5, $t6, $t7, $t8, $t9
+            // $t5 := option::none<#0>()
+            $t5 := A1_option_none$u64$()
+            // $t6 := option::none<vector<u8>>()
+            $t6 := A1_option_none$vec$u8$$()
+            // $t7 := option::none<vector<u8>>()
+            $t7 := A1_option_none$vec$u8$$()
+            // $t8 := option::some<U256::U256>($t0)
+            $t8 := A1_option_some$A2_U256_U256$(panic_code)
+            // $t9 := pack ExternalResult::ExternalResult<#0>($t5, $t7, $t6, $t8)
+            {
+                let $mem := $Malloc(128)
+                $MemoryStoreU256(add($mem, 0), $t5)
+                $MemoryStoreU256(add($mem, 32), $t7)
+                $MemoryStoreU256(add($mem, 64), $t6)
+                $MemoryStoreU256(add($mem, 96), $t8)
+                $t9 := $mem
+            }
+            // return $t9
+            $result := $t9
+        }
+
+        function A1_option_some$A2_U256_U256$(e) -> $result {
+            let $t1, $t2
+            // $t1 := vector::singleton<#0>($t0)
+            $t1 := A1_vector_singleton$A2_U256_U256$(e)
+            // $t2 := pack option::Option<#0>($t1)
+            {
+                let $mem := $Malloc(32)
+                $MemoryStoreU256(add($mem, 0), $t1)
+                $t2 := $mem
+            }
+            // return $t2
+            $result := $t2
+        }
+
+        function A1_vector_singleton$A2_U256_U256$(e) -> $result {
+            let $t2, $t3
+            let $locals := $Malloc(32)
+            // $t1 := vector::empty<#0>()
+            mstore($locals, A1_vector_empty$A2_U256_U256$())
+            // $t2 := borrow_local($t1)
+            $t2 := $MakePtr(false, $locals)
+            // vector::push_back<#0>($t2, $t0)
+            A1_vector_push_back$A2_U256_U256$($t2, e)
+            // $t3 := move($t1)
+            $t3 := mload($locals)
+            // return $t3
+            $result := $t3
+            $Free($locals, 32)
+        }
+
+        function A1_vector_push_back$A2_U256_U256$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 32)))
+            $StoreU256(e_ptr, e)
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 32)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_vector_empty$A2_U256_U256$() -> vector {
+            vector := $Malloc(96)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function A1_option_none$vec$u8$$() -> $result {
+            let $t0, $t1
+            // $t0 := vector::empty<#0>()
+            $t0 := A1_vector_empty$vec$u8$$()
+            // $t1 := pack option::Option<#0>($t0)
+            {
+                let $mem := $Malloc(32)
+                $MemoryStoreU256(add($mem, 0), $t0)
+                $t1 := $mem
+            }
+            // return $t1
+            $result := $t1
+        }
+
+        function A1_vector_empty$vec$u8$$() -> vector {
+            vector := $Malloc(96)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function A1_option_none$u64$() -> $result {
+            let $t0, $t1
+            // $t0 := vector::empty<#0>()
+            $t0 := A1_vector_empty$u64$()
+            // $t1 := pack option::Option<#0>($t0)
+            {
+                let $mem := $Malloc(32)
+                $MemoryStoreU256(add($mem, 0), $t0)
+                $t1 := $mem
+            }
+            // return $t1
+            $result := $t1
+        }
+
+        function A1_vector_empty$u64$() -> vector {
+            vector := $Malloc(48)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $CastU256(hi, lo) -> r {
+            if gt(hi, 0xffffffffffffffffffffffffffffffff) { $AbortBuiltin() }
+            if gt(lo, 0xffffffffffffffffffffffffffffffff) { $AbortBuiltin() }
+            r := add(shl(128, hi), lo)
+        }
+    }
+}
+===> Test result of M::extract_panic_code: Succeed(Stopped) (used_gas=5168): []
+
+// test of M::extract_value
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_extract_value" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_extract_value()
+        return (0, 0)
+        function A2_M_extract_value() {
+            let v2, $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t4 := 100
+                    $t4 := 100
+                    // abort($t4)
+                    $Abort($t4)
+                }
+                case 4 {
+                    // $t1 := 100
+                    $t1 := 100
+                    // $t0 := M::pack_value<u64>($t1)
+                    v2 := A2_M_pack_value$u64$($t1)
+                    // $t2 := borrow_local($t0)
+                    $t2 := $MakePtr(false, v2)
+                    // $t3 := ExternalResult::is_ok<u64>($t2)
+                    $t3 := A2_ExternalResult_is_ok$u64$($t2)
+                    // if ($t3) goto L1 else goto L0
+                    switch $t3
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t5 := move($t0)
+                    $t5 := v2
+                    // $t6 := ExternalResult::unwrap<u64>($t5)
+                    $t6 := A2_ExternalResult_unwrap$u64$($t5)
+                    // $t7 := 100
+                    $t7 := 100
+                    // $t8 := ==($t6, $t7)
+                    $t8 := $Eq($t6, $t7)
+                    // if ($t8) goto L4 else goto L3
+                    switch $t8
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t9 := 101
+                    $t9 := 101
+                    // abort($t9)
+                    $Abort($t9)
+                }
+                case 8 {
+                    // label L5
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function A2_ExternalResult_unwrap$u64$(result) -> $result {
+            let err_data, err_reason, panic_code, value, $t5, $t6, $t7, $t8, $t9
+            // ($t5, $t6, $t7, $t8) := unpack ExternalResult::ExternalResult<#0>($t0)
+            $t5 := $MemoryLoadU256(add(result, 0))
+            $t6 := $MemoryLoadU256(add(result, 32))
+            $t7 := $MemoryLoadU256(add(result, 64))
+            $t8 := $MemoryLoadU256(add(result, 96))
+            $Free(result, 128)
+            // option::destroy_none<vector<u8>>($t6)
+            A1_option_destroy_none$vec$u8$$($t6)
+            // option::destroy_none<vector<u8>>($t7)
+            A1_option_destroy_none$vec$u8$$($t7)
+            // option::destroy_none<U256::U256>($t8)
+            A1_option_destroy_none$A2_U256_U256$($t8)
+            // $t9 := option::destroy_some<#0>($t5)
+            $t9 := A1_option_destroy_some$u64$($t5)
+            // return $t9
+            $result := $t9
+        }
+
+        function A1_option_destroy_some$u64$(t) -> $result {
+            let elem, $t3, $t4, $t5, $t6, $t7, $t8, $t9
+            let $locals := $Malloc(32)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t5 := 262145
+                    $t5 := 262145
+                    // abort($t5)
+                    $Abort($t5)
+                }
+                case 4 {
+                    // $t3 := borrow_local($t0)
+                    $t3 := $MakePtr(false, t)
+                    // $t4 := option::is_some<#0>($t3)
+                    $t4 := A1_option_is_some$u64$($t3)
+                    // if ($t4) goto L1 else goto L0
+                    switch $t4
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t6 := move($t0)
+                    $t6 := t
+                    // $t2 := unpack option::Option<#0>($t6)
+                    mstore($locals, $MemoryLoadU256(add($t6, 0)))
+                    $Free($t6, 32)
+                    // $t7 := borrow_local($t2)
+                    $t7 := $MakePtr(false, $locals)
+                    // $t8 := vector::pop_back<#0>($t7)
+                    $t8 := A1_vector_pop_back$u64$($t7)
+                    // $t9 := move($t2)
+                    $t9 := mload($locals)
+                    // vector::destroy_empty<#0>($t9)
+                    A1_vector_destroy_empty$u64$($t9)
+                    // return $t8
+                    $result := $t8
+                    $Free($locals, 32)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_destroy_empty$u64$(v) {
+            let size := $MemoryLoadU64(v)
+            if $LogicalNot(iszero(size)) { $AbortBuiltin() }
+            let capacity := $MemoryLoadU64(add(v, 8))
+            $Free(v, add(32, mul(capacity, 8)))
+        }
+        function A1_vector_pop_back$u64$(v_ref) -> e {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if iszero(size) { $AbortBuiltin() }
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(sub(size, 1), 8)))
+            e := $LoadU64(e_ptr)
+            $StoreU64(v_ptr, sub(size, 1))
+        }
+        function A1_option_is_some$u64$(t) -> $result {
+            let $t1, $t2, $t3
+            // $t1 := borrow_field<option::Option<#0>>.vec($t0)
+            $t1 := t
+            // $t2 := vector::is_empty<#0>($t1)
+            $t2 := A1_vector_is_empty$u64$($t1)
+            // $t3 := !($t2)
+            $t3 := $LogicalNot($t2)
+            // return $t3
+            $result := $t3
+        }
+
+        function A1_vector_is_empty$u64$(v) -> $result {
+            let $t1, $t2, $t3
+            // $t1 := vector::length<#0>($t0)
+            $t1 := A1_vector_length$u64$(v)
+            // $t2 := 0
+            $t2 := 0
+            // $t3 := ==($t1, $t2)
+            $t3 := $Eq($t1, $t2)
+            // return $t3
+            $result := $t3
+        }
+
+        function A1_vector_length$u64$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A1_option_destroy_none$A2_U256_U256$(t) {
+            let $t1, $t2, $t3, $t4, $t5
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t3 := 262144
+                    $t3 := 262144
+                    // abort($t3)
+                    $Abort($t3)
+                }
+                case 4 {
+                    // $t1 := borrow_local($t0)
+                    $t1 := $MakePtr(false, t)
+                    // $t2 := option::is_none<#0>($t1)
+                    $t2 := A1_option_is_none$A2_U256_U256$($t1)
+                    // if ($t2) goto L1 else goto L0
+                    switch $t2
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t4 := move($t0)
+                    $t4 := t
+                    // $t5 := unpack option::Option<#0>($t4)
+                    $t5 := $MemoryLoadU256(add($t4, 0))
+                    $Free($t4, 32)
+                    // vector::destroy_empty<#0>($t5)
+                    A1_vector_destroy_empty$A2_U256_U256$($t5)
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_destroy_empty$A2_U256_U256$(v) {
+            let size := $MemoryLoadU64(v)
+            if $LogicalNot(iszero(size)) { $AbortBuiltin() }
+            let capacity := $MemoryLoadU64(add(v, 8))
+            $Free(v, add(32, mul(capacity, 32)))
+        }
+        function A1_option_is_none$A2_U256_U256$(t) -> $result {
+            let $t1, $t2
+            // $t1 := borrow_field<option::Option<#0>>.vec($t0)
+            $t1 := t
+            // $t2 := vector::is_empty<#0>($t1)
+            $t2 := A1_vector_is_empty$A2_U256_U256$($t1)
+            // return $t2
+            $result := $t2
+        }
+
+        function A1_vector_is_empty$A2_U256_U256$(v) -> $result {
+            let $t1, $t2, $t3
+            // $t1 := vector::length<#0>($t0)
+            $t1 := A1_vector_length$A2_U256_U256$(v)
+            // $t2 := 0
+            $t2 := 0
+            // $t3 := ==($t1, $t2)
+            $t3 := $Eq($t1, $t2)
+            // return $t3
+            $result := $t3
+        }
+
+        function A1_vector_length$A2_U256_U256$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A1_option_destroy_none$vec$u8$$(t) {
+            let $t1, $t2, $t3, $t4, $t5
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t3 := 262144
+                    $t3 := 262144
+                    // abort($t3)
+                    $Abort($t3)
+                }
+                case 4 {
+                    // $t1 := borrow_local($t0)
+                    $t1 := $MakePtr(false, t)
+                    // $t2 := option::is_none<#0>($t1)
+                    $t2 := A1_option_is_none$vec$u8$$($t1)
+                    // if ($t2) goto L1 else goto L0
+                    switch $t2
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t4 := move($t0)
+                    $t4 := t
+                    // $t5 := unpack option::Option<#0>($t4)
+                    $t5 := $MemoryLoadU256(add($t4, 0))
+                    $Free($t4, 32)
+                    // vector::destroy_empty<#0>($t5)
+                    A1_vector_destroy_empty$vec$u8$$($t5)
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_destroy_empty$vec$u8$$(v) {
+            let size := $MemoryLoadU64(v)
+            if $LogicalNot(iszero(size)) { $AbortBuiltin() }
+            let capacity := $MemoryLoadU64(add(v, 8))
+            $Free(v, add(32, mul(capacity, 32)))
+        }
+        function A1_option_is_none$vec$u8$$(t) -> $result {
+            let $t1, $t2
+            // $t1 := borrow_field<option::Option<#0>>.vec($t0)
+            $t1 := t
+            // $t2 := vector::is_empty<#0>($t1)
+            $t2 := A1_vector_is_empty$vec$u8$$($t1)
+            // return $t2
+            $result := $t2
+        }
+
+        function A1_vector_is_empty$vec$u8$$(v) -> $result {
+            let $t1, $t2, $t3
+            // $t1 := vector::length<#0>($t0)
+            $t1 := A1_vector_length$vec$u8$$(v)
+            // $t2 := 0
+            $t2 := 0
+            // $t3 := ==($t1, $t2)
+            $t3 := $Eq($t1, $t2)
+            // return $t3
+            $result := $t3
+        }
+
+        function A1_vector_length$vec$u8$$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A2_ExternalResult_is_ok$u64$(result) -> $result {
+            let $t1, $t2
+            // $t1 := borrow_field<ExternalResult::ExternalResult<#0>>.value($t0)
+            {
+                $t1 := $MakePtr($IsStoragePtr(result), $LoadU256(result))
+            }
+            // $t2 := option::is_some<#0>($t1)
+            $t2 := A1_option_is_some$u64$($t1)
+            // return $t2
+            $result := $t2
+        }
+
+        function A2_M_pack_value$u64$(v) -> $result {
+            let $t1
+            // $t1 := ExternalResult::ok<#0>($t0)
+            $t1 := A2_ExternalResult_ok$u64$(v)
+            // return $t1
+            $result := $t1
+        }
+
+        function A2_ExternalResult_ok$u64$(value) -> $result {
+            let $t1, $t2, $t3, $t4, $t5
+            // $t1 := option::some<#0>($t0)
+            $t1 := A1_option_some$u64$(value)
+            // $t2 := option::none<vector<u8>>()
+            $t2 := A1_option_none$vec$u8$$()
+            // $t3 := option::none<vector<u8>>()
+            $t3 := A1_option_none$vec$u8$$()
+            // $t4 := option::none<U256::U256>()
+            $t4 := A1_option_none$A2_U256_U256$()
+            // $t5 := pack ExternalResult::ExternalResult<#0>($t1, $t2, $t3, $t4)
+            {
+                let $mem := $Malloc(128)
+                $MemoryStoreU256(add($mem, 0), $t1)
+                $MemoryStoreU256(add($mem, 32), $t2)
+                $MemoryStoreU256(add($mem, 64), $t3)
+                $MemoryStoreU256(add($mem, 96), $t4)
+                $t5 := $mem
+            }
+            // return $t5
+            $result := $t5
+        }
+
+        function A1_option_none$A2_U256_U256$() -> $result {
+            let $t0, $t1
+            // $t0 := vector::empty<#0>()
+            $t0 := A1_vector_empty$A2_U256_U256$()
+            // $t1 := pack option::Option<#0>($t0)
+            {
+                let $mem := $Malloc(32)
+                $MemoryStoreU256(add($mem, 0), $t0)
+                $t1 := $mem
+            }
+            // return $t1
+            $result := $t1
+        }
+
+        function A1_vector_empty$A2_U256_U256$() -> vector {
+            vector := $Malloc(96)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function A1_option_none$vec$u8$$() -> $result {
+            let $t0, $t1
+            // $t0 := vector::empty<#0>()
+            $t0 := A1_vector_empty$vec$u8$$()
+            // $t1 := pack option::Option<#0>($t0)
+            {
+                let $mem := $Malloc(32)
+                $MemoryStoreU256(add($mem, 0), $t0)
+                $t1 := $mem
+            }
+            // return $t1
+            $result := $t1
+        }
+
+        function A1_vector_empty$vec$u8$$() -> vector {
+            vector := $Malloc(96)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function A1_option_some$u64$(e) -> $result {
+            let $t1, $t2
+            // $t1 := vector::singleton<#0>($t0)
+            $t1 := A1_vector_singleton$u64$(e)
+            // $t2 := pack option::Option<#0>($t1)
+            {
+                let $mem := $Malloc(32)
+                $MemoryStoreU256(add($mem, 0), $t1)
+                $t2 := $mem
+            }
+            // return $t2
+            $result := $t2
+        }
+
+        function A1_vector_singleton$u64$(e) -> $result {
+            let $t2, $t3
+            let $locals := $Malloc(32)
+            // $t1 := vector::empty<#0>()
+            mstore($locals, A1_vector_empty$u64$())
+            // $t2 := borrow_local($t1)
+            $t2 := $MakePtr(false, $locals)
+            // vector::push_back<#0>($t2, $t0)
+            A1_vector_push_back$u64$($t2, e)
+            // $t3 := move($t1)
+            $t3 := mload($locals)
+            // return $t3
+            $result := $t3
+            $Free($locals, 32)
+        }
+
+        function A1_vector_push_back$u64$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 8)))
+            $StoreU64(e_ptr, e)
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 8)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_vector_empty$u64$() -> vector {
+            vector := $Malloc(48)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of M::extract_value: Succeed(Stopped) (used_gas=5103): []
diff --git a/third_party/move/evm/move-to-yul/tests/TestStringLiteral.v2_exp b/third_party/move/evm/move-to-yul/tests/TestStringLiteral.v2_exp
new file mode 100644
index 0000000000000..7ff6ff55a5591
--- /dev/null
+++ b/third_party/move/evm/move-to-yul/tests/TestStringLiteral.v2_exp
@@ -0,0 +1,887 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_M" {
+    code {
+        codecopy(0, dataoffset("A2_M_deployed"), datasize("A2_M_deployed"))
+        return(0, datasize("A2_M_deployed"))
+    }
+    object "A2_M_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                default {}
+            }
+            $Abort(97)
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
+
+
+!! Unit tests
+
+// test of M::h1
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_h1" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_h1()
+        return (0, 0)
+        function A2_M_h1() {
+            let $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32, $t33, $t34, $t35, $t36, $t37, $t38, $t39, $t40, $t41, $t42, $t43, $t44, $t45, $t46, $t47, $t48, $t49, $t50, $t51, $t52, $t53, $t54, $t55, $t56, $t57, $t58, $t59, $t60, $t61, $t62, $t63, $t64, $t65, $t66, $t67, $t68, $t69, $t70, $t71, $t72, $t73, $t74, $t75
+            let $locals := $Malloc(96)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t14 := 96
+                    $t14 := 96
+                    // abort($t14)
+                    $Abort($t14)
+                }
+                case 4 {
+                    // $t3 := 0x3
+                    $t3 := 0x3
+                    // $t0 := Evm::sign($t3)
+                    mstore($locals, A2_Evm_sign($t3))
+                    // $t4 := borrow_local($t0)
+                    $t4 := $MakePtr(false, $locals)
+                    // $t5 := [97, 98, 99]
+                    $t5 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(3)))
+                    $MemoryStoreU64($t5, 3)
+                    $MemoryStoreU64(add($t5, 8), $ClosestGreaterPowerOfTwo(3))
+                    copy_literal_string_to_memory_2053440334(add($t5, 32))
+                    // $t6 := pack M::T($t5)
+                    {
+                        let $mem := $Malloc(32)
+                        $MemoryStoreU256(add($mem, 0), $t5)
+                        $t6 := $mem
+                    }
+                    // move_to<M::T>($t6, $t4)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x3948ca0a, $LoadU256($t4))
+                        if $AlignedStorageLoad($base_offset) {
+                          $AbortBuiltin()
+                        }
+                        $AlignedStorageStore($base_offset, true)
+                        {
+                            let $dst := add($base_offset, 32)
+                            let $src := $t6
+                            {
+                                let $linked_src_2300595445 := mload(add($src, 0))
+                                let $linked_dst_2300595445 := $NewLinkedStorageBase(0x89204cf5)
+                                let $size_2300595445 := $MemoryLoadU64($linked_src_2300595445)
+                                let $data_size_2300595445 := mul($size_2300595445, 1)
+                                $AlignedStorageStore($linked_dst_2300595445, mload($linked_src_2300595445))
+                                let $data_src_2300595445 := add($linked_src_2300595445, 32)
+                                let $data_dst_2300595445 := add($linked_dst_2300595445, 32)
+                                for { let $offs_2300595445 := 0 } lt($offs_2300595445, $data_size_2300595445) { $offs_2300595445 := add($offs_2300595445, 32)} {
+                                    $AlignedStorageStore(add($data_dst_2300595445, $offs_2300595445), mload(add($data_src_2300595445, $offs_2300595445)))
+                                    $Free($linked_src_2300595445, add($data_size_2300595445, 32))
+                                }
+                                $AlignedStorageStore(add($dst, 0), $linked_dst_2300595445)
+                            }
+                            $Free($src, 32)
+                        }
+                    }
+                    // $t7 := 0x3
+                    $t7 := 0x3
+                    // $t8 := borrow_global<M::T>($t7)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x3948ca0a, $t7)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t8 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t9 := borrow_field<M::T>.s($t8)
+                    $t9 := $t8
+                    // $t1 := read_ref($t9)
+                    mstore(add($locals, 32), $LoadU256($t9))
+                    if $IsStoragePtr($t9){
+                        let $storage_ptr_2300595445
+                        let $size_2300595445 := $StorageLoadU64(mload(add($locals, 32)))
+                        let $capacity_2300595445 := $ClosestGreaterPowerOfTwo($size_2300595445)
+                        $storage_ptr_2300595445 := $Malloc(add(32, mul($capacity_2300595445, 1)))
+                        let $data_size_2300595445 := mul($size_2300595445, 1)
+                        mstore($storage_ptr_2300595445, $AlignedStorageLoad(mload(add($locals, 32))))
+                        $MemoryStoreU64(add($storage_ptr_2300595445, 8), $capacity_2300595445)
+                        let $data_src_2300595445 := add(mload(add($locals, 32)), 32)
+                        let $data_dst_2300595445 := add($storage_ptr_2300595445, 32)
+                        for { let $offs_2300595445 := 0 } lt($offs_2300595445, $data_size_2300595445) { $offs_2300595445 := add($offs_2300595445, 32)} {
+                            mstore(add($data_dst_2300595445, $offs_2300595445), $AlignedStorageLoad(add($data_src_2300595445, $offs_2300595445)))
+                        }
+                        mstore(add($locals, 32), $storage_ptr_2300595445)
+                    }
+                    // $t10 := borrow_local($t1)
+                    $t10 := $MakePtr(false, add($locals, 32))
+                    // $t11 := vector::length<u8>($t10)
+                    $t11 := A1_vector_length$u8$($t10)
+                    // $t12 := 3
+                    $t12 := 3
+                    // $t13 := ==($t11, $t12)
+                    $t13 := $Eq($t11, $t12)
+                    // if ($t13) goto L1 else goto L0
+                    switch $t13
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t15 := borrow_local($t1)
+                    $t15 := $MakePtr(false, add($locals, 32))
+                    // $t16 := 0
+                    $t16 := 0
+                    // $t17 := vector::borrow<u8>($t15, $t16)
+                    $t17 := A1_vector_borrow$u8$($t15, $t16)
+                    // $t18 := read_ref($t17)
+                    $t18 := $LoadU8($t17)
+                    // $t19 := 97
+                    $t19 := 97
+                    // $t20 := ==($t18, $t19)
+                    $t20 := $Eq($t18, $t19)
+                    // if ($t20) goto L4 else goto L3
+                    switch $t20
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t21 := 97
+                    $t21 := 97
+                    // abort($t21)
+                    $Abort($t21)
+                }
+                case 8 {
+                    // label L5
+                    // $t22 := borrow_local($t1)
+                    $t22 := $MakePtr(false, add($locals, 32))
+                    // $t23 := 1
+                    $t23 := 1
+                    // $t24 := vector::borrow<u8>($t22, $t23)
+                    $t24 := A1_vector_borrow$u8$($t22, $t23)
+                    // $t25 := read_ref($t24)
+                    $t25 := $LoadU8($t24)
+                    // $t26 := 98
+                    $t26 := 98
+                    // $t27 := ==($t25, $t26)
+                    $t27 := $Eq($t25, $t26)
+                    // if ($t27) goto L7 else goto L6
+                    switch $t27
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t28 := 98
+                    $t28 := 98
+                    // abort($t28)
+                    $Abort($t28)
+                }
+                case 11 {
+                    // label L8
+                    // $t29 := borrow_local($t1)
+                    $t29 := $MakePtr(false, add($locals, 32))
+                    // $t30 := 2
+                    $t30 := 2
+                    // $t31 := vector::borrow<u8>($t29, $t30)
+                    $t31 := A1_vector_borrow$u8$($t29, $t30)
+                    // $t32 := read_ref($t31)
+                    $t32 := $LoadU8($t31)
+                    // $t33 := 99
+                    $t33 := 99
+                    // $t34 := ==($t32, $t33)
+                    $t34 := $Eq($t32, $t33)
+                    // if ($t34) goto L10 else goto L9
+                    switch $t34
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t35 := 99
+                    $t35 := 99
+                    // abort($t35)
+                    $Abort($t35)
+                }
+                case 14 {
+                    // label L11
+                    // $t36 := [101, 102, 103, 104]
+                    $t36 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(4)))
+                    $MemoryStoreU64($t36, 4)
+                    $MemoryStoreU64(add($t36, 8), $ClosestGreaterPowerOfTwo(4))
+                    copy_literal_string_to_memory_2788570470(add($t36, 32))
+                    // $t37 := 0x3
+                    $t37 := 0x3
+                    // $t38 := borrow_global<M::T>($t37)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x3948ca0a, $t37)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t38 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t39 := borrow_field<M::T>.s($t38)
+                    $t39 := $t38
+                    // write_ref($t39, $t36)
+                    if $IsStoragePtr($t39){
+                        let $storage_ptr_2300595445 := $NewLinkedStorageBase(0x89204cf5)
+                        let $size_2300595445 := $MemoryLoadU64($t36)
+                        let $data_size_2300595445 := mul($size_2300595445, 1)
+                        $AlignedStorageStore($storage_ptr_2300595445, mload($t36))
+                        let $data_src_2300595445 := add($t36, 32)
+                        let $data_dst_2300595445 := add($storage_ptr_2300595445, 32)
+                        for { let $offs_2300595445 := 0 } lt($offs_2300595445, $data_size_2300595445) { $offs_2300595445 := add($offs_2300595445, 32)} {
+                            $AlignedStorageStore(add($data_dst_2300595445, $offs_2300595445), mload(add($data_src_2300595445, $offs_2300595445)))
+                        }
+                        $t36 := $storage_ptr_2300595445
+                    }
+                    $StoreU256($t39, $t36)
+                    // $t40 := 0x3
+                    $t40 := 0x3
+                    // $t41 := borrow_global<M::T>($t40)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x3948ca0a, $t40)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t41 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t42 := borrow_field<M::T>.s($t41)
+                    $t42 := $t41
+                    // $t2 := read_ref($t42)
+                    mstore(add($locals, 64), $LoadU256($t42))
+                    if $IsStoragePtr($t42){
+                        let $storage_ptr_2300595445
+                        let $size_2300595445 := $StorageLoadU64(mload(add($locals, 64)))
+                        let $capacity_2300595445 := $ClosestGreaterPowerOfTwo($size_2300595445)
+                        $storage_ptr_2300595445 := $Malloc(add(32, mul($capacity_2300595445, 1)))
+                        let $data_size_2300595445 := mul($size_2300595445, 1)
+                        mstore($storage_ptr_2300595445, $AlignedStorageLoad(mload(add($locals, 64))))
+                        $MemoryStoreU64(add($storage_ptr_2300595445, 8), $capacity_2300595445)
+                        let $data_src_2300595445 := add(mload(add($locals, 64)), 32)
+                        let $data_dst_2300595445 := add($storage_ptr_2300595445, 32)
+                        for { let $offs_2300595445 := 0 } lt($offs_2300595445, $data_size_2300595445) { $offs_2300595445 := add($offs_2300595445, 32)} {
+                            mstore(add($data_dst_2300595445, $offs_2300595445), $AlignedStorageLoad(add($data_src_2300595445, $offs_2300595445)))
+                        }
+                        mstore(add($locals, 64), $storage_ptr_2300595445)
+                    }
+                    // $t43 := borrow_local($t2)
+                    $t43 := $MakePtr(false, add($locals, 64))
+                    // $t44 := vector::length<u8>($t43)
+                    $t44 := A1_vector_length$u8$($t43)
+                    // $t45 := 4
+                    $t45 := 4
+                    // $t46 := ==($t44, $t45)
+                    $t46 := $Eq($t44, $t45)
+                    // if ($t46) goto L13 else goto L12
+                    switch $t46
+                    case 0  { $block := 16 }
+                    default { $block := 15 }
+                }
+                case 15 {
+                    // label L13
+                    // goto L14
+                    $block := 17
+                }
+                case 16 {
+                    // label L12
+                    // $t47 := 100
+                    $t47 := 100
+                    // abort($t47)
+                    $Abort($t47)
+                }
+                case 17 {
+                    // label L14
+                    // $t48 := borrow_local($t2)
+                    $t48 := $MakePtr(false, add($locals, 64))
+                    // $t49 := 0
+                    $t49 := 0
+                    // $t50 := vector::borrow<u8>($t48, $t49)
+                    $t50 := A1_vector_borrow$u8$($t48, $t49)
+                    // $t51 := read_ref($t50)
+                    $t51 := $LoadU8($t50)
+                    // $t52 := 101
+                    $t52 := 101
+                    // $t53 := ==($t51, $t52)
+                    $t53 := $Eq($t51, $t52)
+                    // if ($t53) goto L16 else goto L15
+                    switch $t53
+                    case 0  { $block := 19 }
+                    default { $block := 18 }
+                }
+                case 18 {
+                    // label L16
+                    // goto L17
+                    $block := 20
+                }
+                case 19 {
+                    // label L15
+                    // $t54 := 101
+                    $t54 := 101
+                    // abort($t54)
+                    $Abort($t54)
+                }
+                case 20 {
+                    // label L17
+                    // $t55 := borrow_local($t2)
+                    $t55 := $MakePtr(false, add($locals, 64))
+                    // $t56 := 1
+                    $t56 := 1
+                    // $t57 := vector::borrow<u8>($t55, $t56)
+                    $t57 := A1_vector_borrow$u8$($t55, $t56)
+                    // $t58 := read_ref($t57)
+                    $t58 := $LoadU8($t57)
+                    // $t59 := 102
+                    $t59 := 102
+                    // $t60 := ==($t58, $t59)
+                    $t60 := $Eq($t58, $t59)
+                    // if ($t60) goto L19 else goto L18
+                    switch $t60
+                    case 0  { $block := 22 }
+                    default { $block := 21 }
+                }
+                case 21 {
+                    // label L19
+                    // goto L20
+                    $block := 23
+                }
+                case 22 {
+                    // label L18
+                    // $t61 := 102
+                    $t61 := 102
+                    // abort($t61)
+                    $Abort($t61)
+                }
+                case 23 {
+                    // label L20
+                    // $t62 := borrow_local($t2)
+                    $t62 := $MakePtr(false, add($locals, 64))
+                    // $t63 := 2
+                    $t63 := 2
+                    // $t64 := vector::borrow<u8>($t62, $t63)
+                    $t64 := A1_vector_borrow$u8$($t62, $t63)
+                    // $t65 := read_ref($t64)
+                    $t65 := $LoadU8($t64)
+                    // $t66 := 103
+                    $t66 := 103
+                    // $t67 := ==($t65, $t66)
+                    $t67 := $Eq($t65, $t66)
+                    // if ($t67) goto L22 else goto L21
+                    switch $t67
+                    case 0  { $block := 25 }
+                    default { $block := 24 }
+                }
+                case 24 {
+                    // label L22
+                    // goto L23
+                    $block := 26
+                }
+                case 25 {
+                    // label L21
+                    // $t68 := 103
+                    $t68 := 103
+                    // abort($t68)
+                    $Abort($t68)
+                }
+                case 26 {
+                    // label L23
+                    // $t69 := borrow_local($t2)
+                    $t69 := $MakePtr(false, add($locals, 64))
+                    // $t70 := 3
+                    $t70 := 3
+                    // $t71 := vector::borrow<u8>($t69, $t70)
+                    $t71 := A1_vector_borrow$u8$($t69, $t70)
+                    // $t72 := read_ref($t71)
+                    $t72 := $LoadU8($t71)
+                    // $t73 := 104
+                    $t73 := 104
+                    // $t74 := ==($t72, $t73)
+                    $t74 := $Eq($t72, $t73)
+                    // if ($t74) goto L25 else goto L24
+                    switch $t74
+                    case 0  { $block := 28 }
+                    default { $block := 27 }
+                }
+                case 27 {
+                    // label L25
+                    // goto L26
+                    $block := 29
+                }
+                case 28 {
+                    // label L24
+                    // $t75 := 104
+                    $t75 := 104
+                    // abort($t75)
+                    $Abort($t75)
+                }
+                case 29 {
+                    // label L26
+                    // return ()
+                    $Free($locals, 96)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_borrow$u8$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 1)))
+        }
+        function A1_vector_length$u8$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A2_Evm_sign(addr) -> signer {
+          signer := addr
+        }
+        function copy_literal_string_to_memory_2788570470(value) {
+            $MemoryStoreU8(value, 101)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 102)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 103)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 104)
+            value := add(value, 1)
+        }
+        function copy_literal_string_to_memory_2053440334(value) {
+            $MemoryStoreU8(value, 97)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 98)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 99)
+            value := add(value, 1)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU8(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU8(offs)
+          }
+          default {
+            val := $StorageLoadU8(offs)
+          }
+        }
+        function $MemoryLoadU8(offs) -> val {
+          val := $MemoryLoadBytes(offs, 1)
+        }
+        function $StorageLoadU8(offs) -> val {
+          val := $StorageLoadBytes(offs, 1)
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $GtEq(x, y) -> r {
+            r := or(gt(x, y), eq(x, y))
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $ClosestGreaterPowerOfTwo(x) -> r {
+            r := or(r, shr(1, x))
+            r := or(r, shr(2, r))
+            r := or(r, shr(4, r))
+            r := or(r, shr(8, r))
+            r := or(r, shr(16, r))
+            r := or(r, shr(32, r))
+            r := add(x, 1)
+        }
+    }
+}
+===> Test result of M::h1: Succeed(Stopped) (used_gas=170443): []
+
+// test of M::test_same_literals
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_same_literals" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_same_literals()
+        return (0, 0)
+        function A2_M_test_same_literals() {
+            let $t0, $t1, $t2, $t3
+            // $t0 := true
+            $t0 := true
+            // $t1 := [101, 114, 114, 111, 114, 95, 109, 101, 115, 115, 97, 103, 101]
+            $t1 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(13)))
+            $MemoryStoreU64($t1, 13)
+            $MemoryStoreU64(add($t1, 8), $ClosestGreaterPowerOfTwo(13))
+            copy_literal_string_to_memory_3855568786(add($t1, 32))
+            // Evm::require($t0, $t1)
+            A2_Evm_require($t0, $t1)
+            // $t2 := true
+            $t2 := true
+            // $t3 := [101, 114, 114, 111, 114, 95, 109, 101, 115, 115, 97, 103, 101]
+            $t3 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(13)))
+            $MemoryStoreU64($t3, 13)
+            $MemoryStoreU64(add($t3, 8), $ClosestGreaterPowerOfTwo(13))
+            copy_literal_string_to_memory_3855568786(add($t3, 32))
+            // Evm::require($t2, $t3)
+            A2_Evm_require($t2, $t3)
+            // return ()
+        }
+
+        function A2_Evm_require(cond, message) {
+            let $t2
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // Evm::abort_with($t1)
+                    A2_Evm_abort_with(message)
+                    // goto L0
+                    $block := 3
+                }
+                case 3 {
+                    // label L0
+                    // return ()
+                    leave
+                }
+                case 4 {
+                    // $t2 := !($t0)
+                    $t2 := $LogicalNot(cond)
+                    // if ($t2) goto L1 else goto L0
+                    switch $t2
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+            }
+        }
+
+        function A2_Evm_abort_with(message) {
+          let head := $Malloc(32)
+          // store the function selector for Error(string)
+          mstore(head, 3963877391197344453575983046348115674221700746820753546331534351508065746944)
+          let pos := add(head, 4)
+          mstore(pos, 32)
+          pos := add(pos, 32)
+          let size := $MemoryLoadU64(message)
+          mstore(pos, size)
+          pos := add(pos, 32)
+          $CopyMemory(add(message, 32), pos, size)
+          size := $RoundUp(size)
+          let end := add(pos, size)
+          revert(head, sub(end, head))
+        }
+        function copy_literal_string_to_memory_3855568786(value) {
+            $MemoryStoreU8(value, 101)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 114)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 114)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 111)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 114)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 95)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 109)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 101)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 115)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 115)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 97)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 103)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 101)
+            value := add(value, 1)
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $ClosestGreaterPowerOfTwo(x) -> r {
+            r := or(r, shr(1, x))
+            r := or(r, shr(2, r))
+            r := or(r, shr(4, r))
+            r := or(r, shr(8, r))
+            r := or(r, shr(16, r))
+            r := or(r, shr(32, r))
+            r := add(x, 1)
+        }
+        function $RoundUp(value) -> result {
+            result := and(add(value, 31), not(31))
+        }
+    }
+}
+===> Test result of M::test_same_literals: Succeed(Returned) (used_gas=1078): []
diff --git a/third_party/move/evm/move-to-yul/tests/U256Arith.v2_exp b/third_party/move/evm/move-to-yul/tests/U256Arith.v2_exp
new file mode 100644
index 0000000000000..1a2b2270f12b9
--- /dev/null
+++ b/third_party/move/evm/move-to-yul/tests/U256Arith.v2_exp
@@ -0,0 +1,459 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_U256Arith" {
+    code {
+        codecopy(0, dataoffset("A2_U256Arith_deployed"), datasize("A2_U256Arith_deployed"))
+        return(0, datasize("A2_U256Arith_deployed"))
+    }
+    object "A2_U256Arith_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                case 0x4f2be91f
+                {
+                    // add()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let ret_0 := A2_U256Arith_add()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint256$_$A2_U256_U256$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xf9fa48c3
+                {
+                    // div()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let ret_0 := A2_U256Arith_div()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint256$_$A2_U256_U256$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xb5165b60
+                {
+                    // eq()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let ret_0 := A2_U256Arith_eq()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$bool$_$bool$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x4e507d6a
+                {
+                    // ge()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let ret_0 := A2_U256Arith_ge()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$bool$_$bool$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xaf0ab80a
+                {
+                    // gt()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let ret_0 := A2_U256Arith_gt()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$bool$_$bool$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xdcc78377
+                {
+                    // le()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let ret_0 := A2_U256Arith_le()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$bool$_$bool$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xa22ca2a6
+                {
+                    // lt()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let ret_0 := A2_U256Arith_lt()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$bool$_$bool$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x2986e054
+                {
+                    // mod()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let ret_0 := A2_U256Arith_mod()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint256$_$A2_U256_U256$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x58931c46
+                {
+                    // mul()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let ret_0 := A2_U256Arith_mul()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint256$_$A2_U256_U256$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x83a93813
+                {
+                    // ne()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let ret_0 := A2_U256Arith_ne()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$bool$_$bool$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xcad85866
+                {
+                    // shl()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let ret_0 := A2_U256Arith_shl()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint256$_$A2_U256_U256$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xb87f777a
+                {
+                    // shr()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let ret_0 := A2_U256Arith_shr()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint256$_$A2_U256_U256$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xc54124be
+                {
+                    // sub()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let ret_0 := A2_U256Arith_sub()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint256$_$A2_U256_U256$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x5c32cfdd
+                {
+                    // cast(uint128,uint128)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1 := abi_decode_tuple_$uint128_uint128$_$u128_u128$(4, calldatasize())
+                    let ret_0 := A2_U256Arith_cast(param_0, param_1)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint256$_$A2_U256_U256$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                default {}
+            }
+            $Abort(97)
+            function A2_U256Arith_add() -> $result {
+                let x, y, $t2, $t3, $t4
+                // $t2 := 2041694201525630780780247644590609268738
+                $t2 := 2041694201525630780780247644590609268738
+                // $t3 := 1701411834604692317316873037158841057281
+                $t3 := 1701411834604692317316873037158841057281
+                // $t4 := +($t2, $t3)
+                $t4 := $AddU256($t2, $t3)
+                // return $t4
+                $result := $t4
+            }
+
+            function A2_U256Arith_div() -> $result {
+                let x, y, $t2, $t3, $t4
+                // $t2 := 2041694201525630780780247644590609268738
+                $t2 := 2041694201525630780780247644590609268738
+                // $t3 := 1701411834604692317316873037158841057281
+                $t3 := 1701411834604692317316873037158841057281
+                // $t4 := /($t2, $t3)
+                $t4 := $Div($t2, $t3)
+                // return $t4
+                $result := $t4
+            }
+
+            function A2_U256Arith_eq() -> $result {
+                let x, y, $t2, $t3, $t4
+                // $t2 := 2041694201525630780780247644590609268738
+                $t2 := 2041694201525630780780247644590609268738
+                // $t3 := 1701411834604692317316873037158841057281
+                $t3 := 1701411834604692317316873037158841057281
+                // $t4 := ==($t2, $t3)
+                $t4 := $Eq($t2, $t3)
+                // return $t4
+                $result := $t4
+            }
+
+            function A2_U256Arith_ge() -> $result {
+                let x, y, $t2, $t3, $t4
+                // $t2 := 2041694201525630780780247644590609268738
+                $t2 := 2041694201525630780780247644590609268738
+                // $t3 := 1701411834604692317316873037158841057281
+                $t3 := 1701411834604692317316873037158841057281
+                // $t4 := >=($t2, $t3)
+                $t4 := $GtEq($t2, $t3)
+                // return $t4
+                $result := $t4
+            }
+
+            function A2_U256Arith_gt() -> $result {
+                let x, y, $t2, $t3, $t4
+                // $t2 := 2041694201525630780780247644590609268738
+                $t2 := 2041694201525630780780247644590609268738
+                // $t3 := 1701411834604692317316873037158841057281
+                $t3 := 1701411834604692317316873037158841057281
+                // $t4 := >($t2, $t3)
+                $t4 := $Gt($t2, $t3)
+                // return $t4
+                $result := $t4
+            }
+
+            function A2_U256Arith_le() -> $result {
+                let x, y, $t2, $t3, $t4
+                // $t2 := 2041694201525630780780247644590609268738
+                $t2 := 2041694201525630780780247644590609268738
+                // $t3 := 1701411834604692317316873037158841057281
+                $t3 := 1701411834604692317316873037158841057281
+                // $t4 := <=($t2, $t3)
+                $t4 := $LtEq($t2, $t3)
+                // return $t4
+                $result := $t4
+            }
+
+            function A2_U256Arith_lt() -> $result {
+                let x, y, $t2, $t3, $t4
+                // $t2 := 2041694201525630780780247644590609268738
+                $t2 := 2041694201525630780780247644590609268738
+                // $t3 := 1701411834604692317316873037158841057281
+                $t3 := 1701411834604692317316873037158841057281
+                // $t4 := <($t2, $t3)
+                $t4 := $Lt($t2, $t3)
+                // return $t4
+                $result := $t4
+            }
+
+            function A2_U256Arith_mod() -> $result {
+                let x, y, $t2, $t3, $t4
+                // $t2 := 2041694201525630780780247644590609268738
+                $t2 := 2041694201525630780780247644590609268738
+                // $t3 := 1701411834604692317316873037158841057281
+                $t3 := 1701411834604692317316873037158841057281
+                // $t4 := %($t2, $t3)
+                $t4 := $Mod($t2, $t3)
+                // return $t4
+                $result := $t4
+            }
+
+            function A2_U256Arith_mul() -> $result {
+                let x, y, $t2, $t3, $t4
+                // $t2 := 2041694201525630780780247644590609268738
+                $t2 := 2041694201525630780780247644590609268738
+                // $t3 := 1701411834604692317316873037158841057281
+                $t3 := 1701411834604692317316873037158841057281
+                // $t4 := *($t2, $t3)
+                $t4 := $MulU256($t2, $t3)
+                // return $t4
+                $result := $t4
+            }
+
+            function A2_U256Arith_ne() -> $result {
+                let x, y, $t2, $t3, $t4
+                // $t2 := 2041694201525630780780247644590609268738
+                $t2 := 2041694201525630780780247644590609268738
+                // $t3 := 1701411834604692317316873037158841057281
+                $t3 := 1701411834604692317316873037158841057281
+                // $t4 := !=($t2, $t3)
+                $t4 := $Neq($t2, $t3)
+                // return $t4
+                $result := $t4
+            }
+
+            function A2_U256Arith_shl() -> $result {
+                let $t0, $t1, $t2
+                // $t0 := 2041694201525630780780247644590609268738
+                $t0 := 2041694201525630780780247644590609268738
+                // $t1 := 127
+                $t1 := 127
+                // $t2 := <<($t0, $t1)
+                $t2 := $ShlU256($t0, $t1)
+                // return $t2
+                $result := $t2
+            }
+
+            function A2_U256Arith_shr() -> $result {
+                let $t0, $t1, $t2
+                // $t0 := 2041694201525630780780247644590609268738
+                $t0 := 2041694201525630780780247644590609268738
+                // $t1 := 127
+                $t1 := 127
+                // $t2 := >>($t0, $t1)
+                $t2 := $Shr($t0, $t1)
+                // return $t2
+                $result := $t2
+            }
+
+            function A2_U256Arith_sub() -> $result {
+                let x, y, $t2, $t3, $t4
+                // $t2 := 2041694201525630780780247644590609268738
+                $t2 := 2041694201525630780780247644590609268738
+                // $t3 := 1701411834604692317316873037158841057281
+                $t3 := 1701411834604692317316873037158841057281
+                // $t4 := -($t2, $t3)
+                $t4 := $Sub($t2, $t3)
+                // return $t4
+                $result := $t4
+            }
+
+            function A2_U256Arith_cast(x, y) -> $result {
+                let $t2
+                // $t2 := (u256)($t0, $t1)
+                $t2 := $CastU256(x, y)
+                // return $t2
+                $result := $t2
+            }
+
+            function abi_encode_tuple_$uint256$_$A2_U256_U256$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_uint256(value_0, add(headStart, 0))
+            }
+            function abi_encode_uint256(value, pos) {
+                mstore(pos, cleanup_uint256(value))
+            }
+            function cleanup_uint256(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)
+            }
+            function abi_decode_tuple_$uint128_uint128$_$u128_u128$(headStart, dataEnd) -> value_0, value_1 {
+                if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_uint128(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_uint128(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint128(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint128(value)
+            }
+            function validator_uint128(value) {
+                if iszero(eq(value, cleanup_uint128(value))) { $Abort(95) }
+            }
+            function cleanup_uint128(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffffffffffffffffffff)
+            }
+            function abi_encode_tuple_$bool$_$bool$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_bool(value_0, add(headStart, 0))
+            }
+            function abi_encode_bool(value, pos) {
+                mstore(pos, cleanup_bool(value))
+            }
+            function cleanup_bool(value) -> cleaned {
+                cleaned := and(value, 0xff)
+            }
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $AbortBuiltin() {
+                $Abort(sub(0, 1))
+            }
+            function $AddU256(x, y) -> r {
+                if lt(sub(0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff, x), y) { $AbortBuiltin() }
+                r := add(x, y)
+            }
+            function $MulU256(x, y) -> r {
+                if gt(y, div(0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff, x)) { $AbortBuiltin() }
+                r := mul(x, y)
+            }
+            function $Sub(x, y) -> r {
+                if lt(x, y) { $AbortBuiltin() }
+                r := sub(x, y)
+            }
+            function $Div(x, y) -> r {
+                if eq(y, 0) { $AbortBuiltin() }
+                r := div(x, y)
+            }
+            function $Mod(x, y) -> r {
+                if eq(y, 0) { $AbortBuiltin() }
+                r := mod(x, y)
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+            function $ShlU256(x, y) -> r {
+                r := and(shl(y, x), 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)
+            }
+            function $Gt(x, y) -> r {
+                r := gt(x, y)
+            }
+            function $Lt(x, y) -> r {
+                r := lt(x, y)
+            }
+            function $GtEq(x, y) -> r {
+                r := or(gt(x, y), eq(x, y))
+            }
+            function $LtEq(x, y) -> r {
+                r := or(lt(x, y), eq(x, y))
+            }
+            function $Eq(x, y) -> r {
+                r := eq(x, y)
+            }
+            function $Neq(x, y) -> r {
+                r := $LogicalNot(eq(x, y))
+            }
+            function $LogicalNot(x) -> r {
+                r := iszero(x)
+            }
+            function $CastU256(hi, lo) -> r {
+                if gt(hi, 0xffffffffffffffffffffffffffffffff) { $AbortBuiltin() }
+                if gt(lo, 0xffffffffffffffffffffffffffffffff) { $AbortBuiltin() }
+                r := add(shl(128, hi), lo)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
diff --git a/third_party/move/evm/move-to-yul/tests/Vectors.v2_exp b/third_party/move/evm/move-to-yul/tests/Vectors.v2_exp
new file mode 100644
index 0000000000000..b173205f13135
--- /dev/null
+++ b/third_party/move/evm/move-to-yul/tests/Vectors.v2_exp
@@ -0,0 +1,7835 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_Vectors" {
+    code {
+        codecopy(0, dataoffset("A2_Vectors_deployed"), datasize("A2_Vectors_deployed"))
+        return(0, datasize("A2_Vectors_deployed"))
+    }
+    object "A2_Vectors_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                case 0x04ac5ead
+                {
+                    // test_one_elem_u64()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    A2_Vectors_test_one_elem_u64()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                default {}
+            }
+            $Abort(97)
+            function A2_Vectors_test_one_elem_u64() {
+                let $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12
+                let $locals := $Malloc(32)
+                let $block := 4
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L1
+                        // goto L2
+                        $block := 5
+                    }
+                    case 3 {
+                        // label L0
+                        // $t5 := 101
+                        $t5 := 101
+                        // abort($t5)
+                        $Abort($t5)
+                    }
+                    case 4 {
+                        // $t0 := Vectors::one_elem_u64()
+                        mstore($locals, A2_Vectors_one_elem_u64())
+                        // $t1 := borrow_local($t0)
+                        $t1 := $MakePtr(false, $locals)
+                        // $t2 := vector::length<u64>($t1)
+                        $t2 := A1_vector_length$u64$($t1)
+                        // $t3 := 1
+                        $t3 := 1
+                        // $t4 := ==($t2, $t3)
+                        $t4 := $Eq($t2, $t3)
+                        // if ($t4) goto L1 else goto L0
+                        switch $t4
+                        case 0  { $block := 3 }
+                        default { $block := 2 }
+                    }
+                    case 5 {
+                        // label L2
+                        // $t6 := borrow_local($t0)
+                        $t6 := $MakePtr(false, $locals)
+                        // $t7 := 0
+                        $t7 := 0
+                        // $t8 := vector::borrow<u64>($t6, $t7)
+                        $t8 := A1_vector_borrow$u64$($t6, $t7)
+                        // $t9 := read_ref($t8)
+                        $t9 := $LoadU64($t8)
+                        // $t10 := 42
+                        $t10 := 42
+                        // $t11 := ==($t9, $t10)
+                        $t11 := $Eq($t9, $t10)
+                        // if ($t11) goto L4 else goto L3
+                        switch $t11
+                        case 0  { $block := 7 }
+                        default { $block := 6 }
+                    }
+                    case 6 {
+                        // label L4
+                        // goto L5
+                        $block := 8
+                    }
+                    case 7 {
+                        // label L3
+                        // $t12 := 102
+                        $t12 := 102
+                        // abort($t12)
+                        $Abort($t12)
+                    }
+                    case 8 {
+                        // label L5
+                        // return ()
+                        $Free($locals, 32)
+                        leave
+                    }
+                }
+            }
+
+            function A1_vector_borrow$u64$(v_ref, i) -> e_ptr {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                let size := $LoadU64(v_ptr)
+                if $GtEq(i, size) { $AbortBuiltin() }
+                e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 8)))
+            }
+            function A1_vector_length$u64$(v_ref) -> len {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                len := $LoadU64(v_ptr)
+            }
+            function A2_Vectors_one_elem_u64() -> $result {
+                let $t1, $t2, $t3
+                let $locals := $Malloc(32)
+                // $t0 := vector::empty<u64>()
+                mstore($locals, A1_vector_empty$u64$())
+                // $t1 := borrow_local($t0)
+                $t1 := $MakePtr(false, $locals)
+                // $t2 := 42
+                $t2 := 42
+                // vector::push_back<u64>($t1, $t2)
+                A1_vector_push_back$u64$($t1, $t2)
+                // $t3 := move($t0)
+                $t3 := mload($locals)
+                // return $t3
+                $result := $t3
+                $Free($locals, 32)
+            }
+
+            function A1_vector_push_back$u64$(v_ref, e) {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                let size := $LoadU64(v_ptr)
+                let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 8)))
+                $StoreU64(e_ptr, e)
+                size := add(size, 1)
+                $StoreU64(v_ptr, size)
+                let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+                if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                    let new_v_offs := $ResizeVector(v_offs, capacity, 8)
+                    $StoreU256(v_ref, new_v_offs)
+                }
+            }
+            function A1_vector_empty$u64$() -> vector {
+                vector := $Malloc(48)
+                $MemoryStoreU64(add(vector, 8), 2)
+            }
+            function abi_encode_tuple__(headStart ) -> tail {
+                tail := add(headStart, 0)
+            }
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $AbortBuiltin() {
+                $Abort(sub(0, 1))
+            }
+            function $Malloc(size) -> offs {
+                offs := mload(0)
+                // pad to word size
+                mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+            }
+            function $Free(offs, size) {
+            }
+            function $MakePtr(is_storage, offs) -> ptr {
+              ptr := or(is_storage, shl(1, offs))
+            }
+            function $IsStoragePtr(ptr) -> b {
+              b := and(ptr, 0x1)
+            }
+            function $OffsetPtr(ptr) -> offs {
+              offs := shr(1, ptr)
+            }
+            function $MaskForSize(size) -> mask {
+              mask := sub(shl(shl(3, size), 1), 1)
+            }
+            function $ExtractBytes(word, start, size) -> bytes {
+               switch size
+               case 1 {
+                  // use the faster byte primitive
+                  bytes := byte(start, word)
+               }
+               default {
+                  // As we have big endian, we need to right shift the value from
+                  // where the highest byte starts in the word (32 - start), minus
+                  // the size.
+                  let shift_bits := shl(3, sub(sub(32, start), size))
+                  bytes := and(shr(shift_bits, word), $MaskForSize(size))
+               }
+            }
+            function $InjectBytes(word, start, size, bytes) -> new_word {
+               let shift_bits := shl(3, sub(sub(32, start), size))
+               // Blend out the bits which we inject
+               let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+               word := and(word, neg_mask)
+               // Overlay the bits we inject
+               new_word := or(word, shl(shift_bits, bytes))
+            }
+            function $ToWordOffs(offs) -> word_offs, byte_offset {
+              word_offs := shr(5, offs)
+              byte_offset := and(offs, 0x1F)
+            }
+            function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+              let available_bytes := sub(32, byte_offset)
+              switch gt(size, available_bytes)
+              case 0 {
+                overflow_bytes := 0
+              }
+              default {
+                overflow_bytes := sub(size, available_bytes)
+              }
+            }
+            function $MemoryLoadBytes(offs, size) -> val {
+              // Lower bit where the value in the higher bytes ends
+              let bit_end := shl(3, sub(32, size))
+              val := shr(bit_end, mload(offs))
+            }
+            function $MemoryStoreBytes(offs, size, val) {
+              let bit_end := shl(3, sub(32, size))
+              let mask := shl(bit_end, $MaskForSize(size))
+              mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+            }
+            function $StorageLoadBytes(offs, size) -> val {
+              let word_offs, byte_offs := $ToWordOffs(offs)
+              let key := $StorageKey(0, word_offs)
+              val := $ExtractBytes(sload(key), byte_offs, size)
+              let overflow_bytes := $OverflowBytes(byte_offs, size)
+              if $LogicalNot(iszero(overflow_bytes)) {
+                key := $StorageKey(0, add(word_offs, 1))
+                let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+                val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+              }
+            }
+            function $StorageStoreBytes(offs, size, bytes) {
+              let word_offs, byte_offs := $ToWordOffs(offs)
+              let key := $StorageKey(0, word_offs)
+              let overflow_bytes := $OverflowBytes(byte_offs, size)
+              switch overflow_bytes
+              case 0 {
+                sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+              }
+              default {
+                // Shift the higher bytes to the right
+                let used_bytes := sub(size, overflow_bytes)
+                let higher_bytes := shr(used_bytes, bytes)
+                let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+                sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+                key := $StorageKey(0, add(word_offs, 1))
+                sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+              }
+            }
+            function $StorageKey(group, word) -> key {
+              mstore(32, word)
+              mstore(64, shl(224, group))
+              key := keccak256(32, 36)
+            }
+            function $IndexPtr(ptr, offs) -> new_ptr {
+              new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+            }
+            function $LoadU64(ptr) -> val {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                val := $MemoryLoadU64(offs)
+              }
+              default {
+                val := $StorageLoadU64(offs)
+              }
+            }
+            function $MemoryLoadU64(offs) -> val {
+              val := $MemoryLoadBytes(offs, 8)
+            }
+            function $StorageLoadU64(offs) -> val {
+              val := $StorageLoadBytes(offs, 8)
+            }
+            function $StoreU64(ptr, val) {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                $MemoryStoreU64(offs, val)
+              }
+              default {
+                $StorageStoreU64(offs, val)
+              }
+            }
+            function $MemoryStoreU64(offs, val) {
+              $MemoryStoreBytes(offs, 8, val)
+            }
+            function $StorageStoreU64(offs, val) {
+              $StorageStoreBytes(offs, 8, val)
+            }
+            function $LoadU256(ptr) -> val {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                val := $MemoryLoadU256(offs)
+              }
+              default {
+                val := $StorageLoadU256(offs)
+              }
+            }
+            function $MemoryLoadU256(offs) -> val {
+              val := $MemoryLoadBytes(offs, 32)
+            }
+            function $StorageLoadU256(offs) -> val {
+              val := $StorageLoadBytes(offs, 32)
+            }
+            function $StoreU256(ptr, val) {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                $MemoryStoreU256(offs, val)
+              }
+              default {
+                $StorageStoreU256(offs, val)
+              }
+            }
+            function $MemoryStoreU256(offs, val) {
+              $MemoryStoreBytes(offs, 32, val)
+            }
+            function $StorageStoreU256(offs, val) {
+              $StorageStoreBytes(offs, 32, val)
+            }
+            function $CopyMemory(src, dst, size) {
+              let num_words, overflow_bytes := $ToWordOffs(size)
+              let i := 0
+              for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+                mstore(add(dst, i), mload(add(src, i)))
+              }
+              if overflow_bytes {
+                let mask := $MaskForSize(sub(32, overflow_bytes))
+                let overflow_offs := mul(num_words, 32)
+                let dst_word := and(mload(add(dst, overflow_offs)), mask)
+                let src_word := and(mload(add(src, overflow_offs)), not(mask))
+                mstore(add(dst, overflow_offs), or(dst_word, src_word))
+              }
+            }
+            function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+                let new_capacity := mul(capacity, 2)
+                let data_size := add(32, mul(capacity, type_size))
+                let new_data_size := add(32, mul(new_capacity, type_size))
+                new_v_offs := $Malloc(new_data_size)
+                $CopyMemory(v_offs, new_v_offs, data_size)
+                // update capacity at new location
+                $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+                $Free(v_offs, data_size)
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+            function $GtEq(x, y) -> r {
+                r := or(gt(x, y), eq(x, y))
+            }
+            function $Eq(x, y) -> r {
+                r := eq(x, y)
+            }
+            function $LogicalNot(x) -> r {
+                r := iszero(x)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
+
+
+!! Unit tests
+
+// test of Vectors::test_borrow_fail
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_Vectors_test_borrow_fail" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_Vectors_test_borrow_fail()
+        return (0, 0)
+        function A2_Vectors_test_borrow_fail() {
+            let $t1, $t2, $t3, $t4, $t5, $t6, $t7
+            let $locals := $Malloc(32)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t7 := 101
+                    $t7 := 101
+                    // abort($t7)
+                    $Abort($t7)
+                }
+                case 4 {
+                    // $t0 := Vectors::empty_vector()
+                    mstore($locals, A2_Vectors_empty_vector())
+                    // $t1 := borrow_local($t0)
+                    $t1 := $MakePtr(false, $locals)
+                    // $t2 := 0
+                    $t2 := 0
+                    // $t3 := vector::borrow<u64>($t1, $t2)
+                    $t3 := A1_vector_borrow$u64$($t1, $t2)
+                    // $t4 := read_ref($t3)
+                    $t4 := $LoadU64($t3)
+                    // $t5 := 0
+                    $t5 := 0
+                    // $t6 := ==($t4, $t5)
+                    $t6 := $Eq($t4, $t5)
+                    // if ($t6) goto L1 else goto L0
+                    switch $t6
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // return ()
+                    $Free($locals, 32)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_borrow$u64$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 8)))
+        }
+        function A2_Vectors_empty_vector() -> $result {
+            let $t0
+            // $t0 := vector::empty<u64>()
+            $t0 := A1_vector_empty$u64$()
+            // return $t0
+            $result := $t0
+        }
+
+        function A1_vector_empty$u64$() -> vector {
+            vector := $Malloc(48)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $GtEq(x, y) -> r {
+            r := or(gt(x, y), eq(x, y))
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of Vectors::test_borrow_fail: Revert(Reverted) (used_gas=470): [255, 255, 255, 255, 255, 255, 255, 255]
+
+// test of Vectors::test_borrow_mut
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_Vectors_test_borrow_mut" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_Vectors_test_borrow_mut()
+        return (0, 0)
+        function A2_Vectors_test_borrow_mut() {
+            let s1_ref, s2_ref, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32, $t33, $t34, $t35, $t36, $t37, $t38, $t39, $t40, $t41, $t42, $t43, $t44, $t45, $t46, $t47, $t48, $t49, $t50, $t51, $t52, $t53, $t54, $t55, $t56, $t57, $t58, $t59, $t60, $t61, $t62, $t63, $t64, $t65, $t66, $t67, $t68, $t69, $t70, $t71, $t72, $t73, $t74, $t75, $t76, $t77, $t78, $t79, $t80, $t81, $t82, $t83, $t84, $t85, $t86, $t87, $t88, $t89, $t90, $t91, $t92, $t93, $t94, $t95, $t96, $t97
+            let $locals := $Malloc(32)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t24 := 101
+                    $t24 := 101
+                    // abort($t24)
+                    $Abort($t24)
+                }
+                case 4 {
+                    // $t2 := Vectors::one_elem_struct()
+                    mstore($locals, A2_Vectors_one_elem_struct())
+                    // $t3 := borrow_local($t2)
+                    $t3 := $MakePtr(false, $locals)
+                    // $t4 := 45
+                    $t4 := 45
+                    // $t5 := false
+                    $t5 := false
+                    // $t6 := 123
+                    $t6 := 123
+                    // $t7 := pack Vectors::S($t4, $t5, $t6)
+                    {
+                        let $mem := $Malloc(25)
+                        $MemoryStoreU128(add($mem, 0), $t4)
+                        $MemoryStoreU8(add($mem, 24), $t5)
+                        $MemoryStoreU64(add($mem, 16), $t6)
+                        $t7 := $mem
+                    }
+                    // vector::push_back<Vectors::S>($t3, $t7)
+                    A1_vector_push_back$A2_Vectors_S$($t3, $t7)
+                    // $t8 := borrow_local($t2)
+                    $t8 := $MakePtr(false, $locals)
+                    // $t9 := 0
+                    $t9 := 0
+                    // $t10 := vector::borrow_mut<Vectors::S>($t8, $t9)
+                    $t10 := A1_vector_borrow_mut$A2_Vectors_S$($t8, $t9)
+                    // $t11 := 90
+                    $t11 := 90
+                    // $t12 := borrow_field<Vectors::S>.x($t10)
+                    $t12 := $t10
+                    // write_ref($t12, $t11)
+                    $StoreU128($t12, $t11)
+                    // $t13 := false
+                    $t13 := false
+                    // $t14 := borrow_field<Vectors::S>.y($t10)
+                    $t14 := $IndexPtr($t10, 24)
+                    // write_ref($t14, $t13)
+                    $StoreU8($t14, $t13)
+                    // $t15 := 1028
+                    $t15 := 1028
+                    // $t16 := borrow_field<Vectors::S>.z($t10)
+                    $t16 := $IndexPtr($t10, 16)
+                    // write_ref($t16, $t15)
+                    $StoreU64($t16, $t15)
+                    // $t17 := borrow_local($t2)
+                    $t17 := $MakePtr(false, $locals)
+                    // $t18 := 0
+                    $t18 := 0
+                    // $t19 := vector::borrow<Vectors::S>($t17, $t18)
+                    $t19 := A1_vector_borrow$A2_Vectors_S$($t17, $t18)
+                    // $t20 := borrow_field<Vectors::S>.x($t19)
+                    $t20 := $t19
+                    // $t21 := read_ref($t20)
+                    $t21 := $LoadU128($t20)
+                    // $t22 := 90
+                    $t22 := 90
+                    // $t23 := ==($t21, $t22)
+                    $t23 := $Eq($t21, $t22)
+                    // if ($t23) goto L1 else goto L0
+                    switch $t23
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t25 := borrow_local($t2)
+                    $t25 := $MakePtr(false, $locals)
+                    // $t26 := 0
+                    $t26 := 0
+                    // $t27 := vector::borrow<Vectors::S>($t25, $t26)
+                    $t27 := A1_vector_borrow$A2_Vectors_S$($t25, $t26)
+                    // $t28 := borrow_field<Vectors::S>.y($t27)
+                    $t28 := $IndexPtr($t27, 24)
+                    // $t29 := read_ref($t28)
+                    $t29 := $LoadU8($t28)
+                    // $t30 := false
+                    $t30 := false
+                    // $t31 := ==($t29, $t30)
+                    $t31 := $Eq($t29, $t30)
+                    // if ($t31) goto L4 else goto L3
+                    switch $t31
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t32 := 102
+                    $t32 := 102
+                    // abort($t32)
+                    $Abort($t32)
+                }
+                case 8 {
+                    // label L5
+                    // $t33 := borrow_local($t2)
+                    $t33 := $MakePtr(false, $locals)
+                    // $t34 := 0
+                    $t34 := 0
+                    // $t35 := vector::borrow<Vectors::S>($t33, $t34)
+                    $t35 := A1_vector_borrow$A2_Vectors_S$($t33, $t34)
+                    // $t36 := borrow_field<Vectors::S>.z($t35)
+                    $t36 := $IndexPtr($t35, 16)
+                    // $t37 := read_ref($t36)
+                    $t37 := $LoadU64($t36)
+                    // $t38 := 1028
+                    $t38 := 1028
+                    // $t39 := ==($t37, $t38)
+                    $t39 := $Eq($t37, $t38)
+                    // if ($t39) goto L7 else goto L6
+                    switch $t39
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t40 := 103
+                    $t40 := 103
+                    // abort($t40)
+                    $Abort($t40)
+                }
+                case 11 {
+                    // label L8
+                    // $t41 := borrow_local($t2)
+                    $t41 := $MakePtr(false, $locals)
+                    // $t42 := 1
+                    $t42 := 1
+                    // $t43 := vector::borrow<Vectors::S>($t41, $t42)
+                    $t43 := A1_vector_borrow$A2_Vectors_S$($t41, $t42)
+                    // $t44 := borrow_field<Vectors::S>.x($t43)
+                    $t44 := $t43
+                    // $t45 := read_ref($t44)
+                    $t45 := $LoadU128($t44)
+                    // $t46 := 45
+                    $t46 := 45
+                    // $t47 := ==($t45, $t46)
+                    $t47 := $Eq($t45, $t46)
+                    // if ($t47) goto L10 else goto L9
+                    switch $t47
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t48 := 104
+                    $t48 := 104
+                    // abort($t48)
+                    $Abort($t48)
+                }
+                case 14 {
+                    // label L11
+                    // $t49 := borrow_local($t2)
+                    $t49 := $MakePtr(false, $locals)
+                    // $t50 := 1
+                    $t50 := 1
+                    // $t51 := vector::borrow<Vectors::S>($t49, $t50)
+                    $t51 := A1_vector_borrow$A2_Vectors_S$($t49, $t50)
+                    // $t52 := borrow_field<Vectors::S>.y($t51)
+                    $t52 := $IndexPtr($t51, 24)
+                    // $t53 := read_ref($t52)
+                    $t53 := $LoadU8($t52)
+                    // $t54 := false
+                    $t54 := false
+                    // $t55 := ==($t53, $t54)
+                    $t55 := $Eq($t53, $t54)
+                    // if ($t55) goto L13 else goto L12
+                    switch $t55
+                    case 0  { $block := 16 }
+                    default { $block := 15 }
+                }
+                case 15 {
+                    // label L13
+                    // goto L14
+                    $block := 17
+                }
+                case 16 {
+                    // label L12
+                    // $t56 := 105
+                    $t56 := 105
+                    // abort($t56)
+                    $Abort($t56)
+                }
+                case 17 {
+                    // label L14
+                    // $t57 := borrow_local($t2)
+                    $t57 := $MakePtr(false, $locals)
+                    // $t58 := 1
+                    $t58 := 1
+                    // $t59 := vector::borrow<Vectors::S>($t57, $t58)
+                    $t59 := A1_vector_borrow$A2_Vectors_S$($t57, $t58)
+                    // $t60 := borrow_field<Vectors::S>.z($t59)
+                    $t60 := $IndexPtr($t59, 16)
+                    // $t61 := read_ref($t60)
+                    $t61 := $LoadU64($t60)
+                    // $t62 := 123
+                    $t62 := 123
+                    // $t63 := ==($t61, $t62)
+                    $t63 := $Eq($t61, $t62)
+                    // if ($t63) goto L16 else goto L15
+                    switch $t63
+                    case 0  { $block := 19 }
+                    default { $block := 18 }
+                }
+                case 18 {
+                    // label L16
+                    // goto L17
+                    $block := 20
+                }
+                case 19 {
+                    // label L15
+                    // $t64 := 106
+                    $t64 := 106
+                    // abort($t64)
+                    $Abort($t64)
+                }
+                case 20 {
+                    // label L17
+                    // $t65 := borrow_local($t2)
+                    $t65 := $MakePtr(false, $locals)
+                    // $t66 := 1
+                    $t66 := 1
+                    // $t67 := vector::borrow_mut<Vectors::S>($t65, $t66)
+                    $t67 := A1_vector_borrow_mut$A2_Vectors_S$($t65, $t66)
+                    // $t68 := 10
+                    $t68 := 10
+                    // $t69 := borrow_field<Vectors::S>.x($t67)
+                    $t69 := $t67
+                    // write_ref($t69, $t68)
+                    $StoreU128($t69, $t68)
+                    // $t70 := true
+                    $t70 := true
+                    // $t71 := borrow_field<Vectors::S>.y($t67)
+                    $t71 := $IndexPtr($t67, 24)
+                    // write_ref($t71, $t70)
+                    $StoreU8($t71, $t70)
+                    // $t72 := 456
+                    $t72 := 456
+                    // $t73 := borrow_field<Vectors::S>.z($t67)
+                    $t73 := $IndexPtr($t67, 16)
+                    // write_ref($t73, $t72)
+                    $StoreU64($t73, $t72)
+                    // $t74 := borrow_local($t2)
+                    $t74 := $MakePtr(false, $locals)
+                    // $t75 := 1
+                    $t75 := 1
+                    // $t76 := vector::borrow<Vectors::S>($t74, $t75)
+                    $t76 := A1_vector_borrow$A2_Vectors_S$($t74, $t75)
+                    // $t77 := borrow_field<Vectors::S>.x($t76)
+                    $t77 := $t76
+                    // $t78 := read_ref($t77)
+                    $t78 := $LoadU128($t77)
+                    // $t79 := 10
+                    $t79 := 10
+                    // $t80 := ==($t78, $t79)
+                    $t80 := $Eq($t78, $t79)
+                    // if ($t80) goto L19 else goto L18
+                    switch $t80
+                    case 0  { $block := 22 }
+                    default { $block := 21 }
+                }
+                case 21 {
+                    // label L19
+                    // goto L20
+                    $block := 23
+                }
+                case 22 {
+                    // label L18
+                    // $t81 := 107
+                    $t81 := 107
+                    // abort($t81)
+                    $Abort($t81)
+                }
+                case 23 {
+                    // label L20
+                    // $t82 := borrow_local($t2)
+                    $t82 := $MakePtr(false, $locals)
+                    // $t83 := 1
+                    $t83 := 1
+                    // $t84 := vector::borrow<Vectors::S>($t82, $t83)
+                    $t84 := A1_vector_borrow$A2_Vectors_S$($t82, $t83)
+                    // $t85 := borrow_field<Vectors::S>.y($t84)
+                    $t85 := $IndexPtr($t84, 24)
+                    // $t86 := read_ref($t85)
+                    $t86 := $LoadU8($t85)
+                    // $t87 := true
+                    $t87 := true
+                    // $t88 := ==($t86, $t87)
+                    $t88 := $Eq($t86, $t87)
+                    // if ($t88) goto L22 else goto L21
+                    switch $t88
+                    case 0  { $block := 25 }
+                    default { $block := 24 }
+                }
+                case 24 {
+                    // label L22
+                    // goto L23
+                    $block := 26
+                }
+                case 25 {
+                    // label L21
+                    // $t89 := 108
+                    $t89 := 108
+                    // abort($t89)
+                    $Abort($t89)
+                }
+                case 26 {
+                    // label L23
+                    // $t90 := borrow_local($t2)
+                    $t90 := $MakePtr(false, $locals)
+                    // $t91 := 1
+                    $t91 := 1
+                    // $t92 := vector::borrow<Vectors::S>($t90, $t91)
+                    $t92 := A1_vector_borrow$A2_Vectors_S$($t90, $t91)
+                    // $t93 := borrow_field<Vectors::S>.z($t92)
+                    $t93 := $IndexPtr($t92, 16)
+                    // $t94 := read_ref($t93)
+                    $t94 := $LoadU64($t93)
+                    // $t95 := 456
+                    $t95 := 456
+                    // $t96 := ==($t94, $t95)
+                    $t96 := $Eq($t94, $t95)
+                    // if ($t96) goto L25 else goto L24
+                    switch $t96
+                    case 0  { $block := 28 }
+                    default { $block := 27 }
+                }
+                case 27 {
+                    // label L25
+                    // goto L26
+                    $block := 29
+                }
+                case 28 {
+                    // label L24
+                    // $t97 := 109
+                    $t97 := 109
+                    // abort($t97)
+                    $Abort($t97)
+                }
+                case 29 {
+                    // label L26
+                    // return ()
+                    $Free($locals, 32)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_borrow$A2_Vectors_S$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 32)))
+            let e := $LoadU256(e_ptr)
+            e_ptr := $MakePtr($IsStoragePtr(v_ref), e)
+        }
+        function A1_vector_borrow_mut$A2_Vectors_S$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 32)))
+            let e := $LoadU256(e_ptr)
+            e_ptr := $MakePtr($IsStoragePtr(v_ref), e)
+        }
+        function A1_vector_push_back$A2_Vectors_S$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 32)))
+            $StoreU256(e_ptr, e)
+            if $IsStoragePtr(e_ptr) {
+                let e_offs := $OffsetPtr(e_ptr)
+                let $linked_dst_490229512 := $NewLinkedStorageBase(0x1d384f08)
+                $AlignedStorageStore(add($linked_dst_490229512, 0), mload(add(e, 0)))
+                $Free(e, 25)
+                $AlignedStorageStore(e_offs, $linked_dst_490229512)
+            }
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 32)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A2_Vectors_one_elem_struct() -> $result {
+            let $t1, $t2, $t3, $t4, $t5, $t6
+            let $locals := $Malloc(32)
+            // $t0 := vector::empty<Vectors::S>()
+            mstore($locals, A1_vector_empty$A2_Vectors_S$())
+            // $t1 := borrow_local($t0)
+            $t1 := $MakePtr(false, $locals)
+            // $t2 := 42
+            $t2 := 42
+            // $t3 := true
+            $t3 := true
+            // $t4 := 789
+            $t4 := 789
+            // $t5 := pack Vectors::S($t2, $t3, $t4)
+            {
+                let $mem := $Malloc(25)
+                $MemoryStoreU128(add($mem, 0), $t2)
+                $MemoryStoreU8(add($mem, 24), $t3)
+                $MemoryStoreU64(add($mem, 16), $t4)
+                $t5 := $mem
+            }
+            // vector::push_back<Vectors::S>($t1, $t5)
+            A1_vector_push_back$A2_Vectors_S$($t1, $t5)
+            // $t6 := move($t0)
+            $t6 := mload($locals)
+            // return $t6
+            $result := $t6
+            $Free($locals, 32)
+        }
+
+        function A1_vector_empty$A2_Vectors_S$() -> vector {
+            vector := $Malloc(96)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU8(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU8(offs)
+          }
+          default {
+            val := $StorageLoadU8(offs)
+          }
+        }
+        function $MemoryLoadU8(offs) -> val {
+          val := $MemoryLoadBytes(offs, 1)
+        }
+        function $StorageLoadU8(offs) -> val {
+          val := $StorageLoadBytes(offs, 1)
+        }
+        function $StoreU8(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU8(offs, val)
+          }
+          default {
+            $StorageStoreU8(offs, val)
+          }
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $StorageStoreU8(offs, val) {
+          $StorageStoreBytes(offs, 1, val)
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU128(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU128(offs)
+          }
+          default {
+            val := $StorageLoadU128(offs)
+          }
+        }
+        function $MemoryLoadU128(offs) -> val {
+          val := $MemoryLoadBytes(offs, 16)
+        }
+        function $StorageLoadU128(offs) -> val {
+          val := $StorageLoadBytes(offs, 16)
+        }
+        function $StoreU128(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU128(offs, val)
+          }
+          default {
+            $StorageStoreU128(offs, val)
+          }
+        }
+        function $MemoryStoreU128(offs, val) {
+          $MemoryStoreBytes(offs, 16, val)
+        }
+        function $StorageStoreU128(offs, val) {
+          $StorageStoreBytes(offs, 16, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $GtEq(x, y) -> r {
+            r := or(gt(x, y), eq(x, y))
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of Vectors::test_borrow_mut: Succeed(Stopped) (used_gas=14880): []
+
+// test of Vectors::test_destroy_empty
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_Vectors_test_destroy_empty" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_Vectors_test_destroy_empty()
+        return (0, 0)
+        function A2_Vectors_test_destroy_empty() {
+            let $t0
+            // $t0 := vector::empty<address>()
+            $t0 := A1_vector_empty$address$()
+            // vector::destroy_empty<address>($t0)
+            A1_vector_destroy_empty$address$($t0)
+            // return ()
+        }
+
+        function A1_vector_destroy_empty$address$(v) {
+            let size := $MemoryLoadU64(v)
+            if $LogicalNot(iszero(size)) { $AbortBuiltin() }
+            let capacity := $MemoryLoadU64(add(v, 8))
+            $Free(v, add(32, mul(capacity, 32)))
+        }
+        function A1_vector_empty$address$() -> vector {
+            vector := $Malloc(96)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of Vectors::test_destroy_empty: Succeed(Stopped) (used_gas=100): []
+
+// test of Vectors::test_destroy_non_empty_fail
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_Vectors_test_destroy_non_empty_fail" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_Vectors_test_destroy_non_empty_fail()
+        return (0, 0)
+        function A2_Vectors_test_destroy_non_empty_fail() {
+            let $t0
+            // $t0 := Vectors::one_elem_struct()
+            $t0 := A2_Vectors_one_elem_struct()
+            // vector::destroy_empty<Vectors::S>($t0)
+            A1_vector_destroy_empty$A2_Vectors_S$($t0)
+            // return ()
+        }
+
+        function A1_vector_destroy_empty$A2_Vectors_S$(v) {
+            let size := $MemoryLoadU64(v)
+            if $LogicalNot(iszero(size)) { $AbortBuiltin() }
+            let capacity := $MemoryLoadU64(add(v, 8))
+            $Free(v, add(32, mul(capacity, 32)))
+        }
+        function A2_Vectors_one_elem_struct() -> $result {
+            let $t1, $t2, $t3, $t4, $t5, $t6
+            let $locals := $Malloc(32)
+            // $t0 := vector::empty<Vectors::S>()
+            mstore($locals, A1_vector_empty$A2_Vectors_S$())
+            // $t1 := borrow_local($t0)
+            $t1 := $MakePtr(false, $locals)
+            // $t2 := 42
+            $t2 := 42
+            // $t3 := true
+            $t3 := true
+            // $t4 := 789
+            $t4 := 789
+            // $t5 := pack Vectors::S($t2, $t3, $t4)
+            {
+                let $mem := $Malloc(25)
+                $MemoryStoreU128(add($mem, 0), $t2)
+                $MemoryStoreU8(add($mem, 24), $t3)
+                $MemoryStoreU64(add($mem, 16), $t4)
+                $t5 := $mem
+            }
+            // vector::push_back<Vectors::S>($t1, $t5)
+            A1_vector_push_back$A2_Vectors_S$($t1, $t5)
+            // $t6 := move($t0)
+            $t6 := mload($locals)
+            // return $t6
+            $result := $t6
+            $Free($locals, 32)
+        }
+
+        function A1_vector_push_back$A2_Vectors_S$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 32)))
+            $StoreU256(e_ptr, e)
+            if $IsStoragePtr(e_ptr) {
+                let e_offs := $OffsetPtr(e_ptr)
+                let $linked_dst_490229512 := $NewLinkedStorageBase(0x1d384f08)
+                $AlignedStorageStore(add($linked_dst_490229512, 0), mload(add(e, 0)))
+                $Free(e, 25)
+                $AlignedStorageStore(e_offs, $linked_dst_490229512)
+            }
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 32)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_vector_empty$A2_Vectors_S$() -> vector {
+            vector := $Malloc(96)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $MemoryStoreU128(offs, val) {
+          $MemoryStoreBytes(offs, 16, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of Vectors::test_destroy_non_empty_fail: Revert(Reverted) (used_gas=894): [255, 255, 255, 255, 255, 255, 255, 255]
+
+// test of Vectors::test_empty
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_Vectors_test_empty" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_Vectors_test_empty()
+        return (0, 0)
+        function A2_Vectors_test_empty() {
+            let $t1, $t2, $t3, $t4, $t5
+            let $locals := $Malloc(32)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t5 := 101
+                    $t5 := 101
+                    // abort($t5)
+                    $Abort($t5)
+                }
+                case 4 {
+                    // $t0 := Vectors::empty_vector()
+                    mstore($locals, A2_Vectors_empty_vector())
+                    // $t1 := borrow_local($t0)
+                    $t1 := $MakePtr(false, $locals)
+                    // $t2 := vector::length<u64>($t1)
+                    $t2 := A1_vector_length$u64$($t1)
+                    // $t3 := 0
+                    $t3 := 0
+                    // $t4 := ==($t2, $t3)
+                    $t4 := $Eq($t2, $t3)
+                    // if ($t4) goto L1 else goto L0
+                    switch $t4
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // return ()
+                    $Free($locals, 32)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_length$u64$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A2_Vectors_empty_vector() -> $result {
+            let $t0
+            // $t0 := vector::empty<u64>()
+            $t0 := A1_vector_empty$u64$()
+            // return $t0
+            $result := $t0
+        }
+
+        function A1_vector_empty$u64$() -> vector {
+            vector := $Malloc(48)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of Vectors::test_empty: Succeed(Stopped) (used_gas=605): []
+
+// test of Vectors::test_nested_vector_equality
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_Vectors_test_nested_vector_equality" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_Vectors_test_nested_vector_equality()
+        return (0, 0)
+        function A2_Vectors_test_nested_vector_equality() {
+            let $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29
+            let $locals := $Malloc(64)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t5 := 101
+                    $t5 := 101
+                    // abort($t5)
+                    $Abort($t5)
+                }
+                case 4 {
+                    // $t0 := vector::empty<vector<u8>>()
+                    mstore($locals, A1_vector_empty$vec$u8$$())
+                    // $t1 := vector::empty<vector<u8>>()
+                    mstore(add($locals, 32), A1_vector_empty$vec$u8$$())
+                    // $t2 := copy($t0)
+                    $t2 := mload($locals)
+                    // $t3 := copy($t1)
+                    $t3 := mload(add($locals, 32))
+                    // $t4 := ==($t2, $t3)
+                    $t4 := $Eq_$vec$vec$u8$$$($t2, $t3)
+                    // if ($t4) goto L1 else goto L0
+                    switch $t4
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t6 := borrow_local($t0)
+                    $t6 := $MakePtr(false, $locals)
+                    // $t7 := [97, 98, 99]
+                    $t7 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(3)))
+                    $MemoryStoreU64($t7, 3)
+                    $MemoryStoreU64(add($t7, 8), $ClosestGreaterPowerOfTwo(3))
+                    copy_literal_string_to_memory_2053440334(add($t7, 32))
+                    // vector::push_back<vector<u8>>($t6, $t7)
+                    A1_vector_push_back$vec$u8$$($t6, $t7)
+                    // $t8 := borrow_local($t1)
+                    $t8 := $MakePtr(false, add($locals, 32))
+                    // $t9 := [97, 98, 99]
+                    $t9 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(3)))
+                    $MemoryStoreU64($t9, 3)
+                    $MemoryStoreU64(add($t9, 8), $ClosestGreaterPowerOfTwo(3))
+                    copy_literal_string_to_memory_2053440334(add($t9, 32))
+                    // vector::push_back<vector<u8>>($t8, $t9)
+                    A1_vector_push_back$vec$u8$$($t8, $t9)
+                    // $t10 := copy($t0)
+                    $t10 := mload($locals)
+                    // $t11 := copy($t1)
+                    $t11 := mload(add($locals, 32))
+                    // $t12 := ==($t10, $t11)
+                    $t12 := $Eq_$vec$vec$u8$$$($t10, $t11)
+                    // if ($t12) goto L4 else goto L3
+                    switch $t12
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t13 := 102
+                    $t13 := 102
+                    // abort($t13)
+                    $Abort($t13)
+                }
+                case 8 {
+                    // label L5
+                    // $t14 := borrow_local($t0)
+                    $t14 := $MakePtr(false, $locals)
+                    // $t15 := [100, 101, 102]
+                    $t15 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(3)))
+                    $MemoryStoreU64($t15, 3)
+                    $MemoryStoreU64(add($t15, 8), $ClosestGreaterPowerOfTwo(3))
+                    copy_literal_string_to_memory_2608619572(add($t15, 32))
+                    // vector::push_back<vector<u8>>($t14, $t15)
+                    A1_vector_push_back$vec$u8$$($t14, $t15)
+                    // $t16 := borrow_local($t1)
+                    $t16 := $MakePtr(false, add($locals, 32))
+                    // $t17 := [100, 101, 102]
+                    $t17 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(3)))
+                    $MemoryStoreU64($t17, 3)
+                    $MemoryStoreU64(add($t17, 8), $ClosestGreaterPowerOfTwo(3))
+                    copy_literal_string_to_memory_2608619572(add($t17, 32))
+                    // vector::push_back<vector<u8>>($t16, $t17)
+                    A1_vector_push_back$vec$u8$$($t16, $t17)
+                    // $t18 := copy($t0)
+                    $t18 := mload($locals)
+                    // $t19 := copy($t1)
+                    $t19 := mload(add($locals, 32))
+                    // $t20 := ==($t18, $t19)
+                    $t20 := $Eq_$vec$vec$u8$$$($t18, $t19)
+                    // if ($t20) goto L7 else goto L6
+                    switch $t20
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t21 := 103
+                    $t21 := 103
+                    // abort($t21)
+                    $Abort($t21)
+                }
+                case 11 {
+                    // label L8
+                    // $t22 := borrow_local($t0)
+                    $t22 := $MakePtr(false, $locals)
+                    // $t23 := [103, 104, 105]
+                    $t23 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(3)))
+                    $MemoryStoreU64($t23, 3)
+                    $MemoryStoreU64(add($t23, 8), $ClosestGreaterPowerOfTwo(3))
+                    copy_literal_string_to_memory_4185735457(add($t23, 32))
+                    // vector::push_back<vector<u8>>($t22, $t23)
+                    A1_vector_push_back$vec$u8$$($t22, $t23)
+                    // $t24 := borrow_local($t1)
+                    $t24 := $MakePtr(false, add($locals, 32))
+                    // $t25 := [103, 104, 105, 106]
+                    $t25 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(4)))
+                    $MemoryStoreU64($t25, 4)
+                    $MemoryStoreU64(add($t25, 8), $ClosestGreaterPowerOfTwo(4))
+                    copy_literal_string_to_memory_3979718947(add($t25, 32))
+                    // vector::push_back<vector<u8>>($t24, $t25)
+                    A1_vector_push_back$vec$u8$$($t24, $t25)
+                    // $t26 := move($t0)
+                    $t26 := mload($locals)
+                    // $t27 := move($t1)
+                    $t27 := mload(add($locals, 32))
+                    // $t28 := !=($t26, $t27)
+                    $t28 := $LogicalNot($Eq_$vec$vec$u8$$$($t26, $t27))
+                    // if ($t28) goto L10 else goto L9
+                    switch $t28
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t29 := 104
+                    $t29 := 104
+                    // abort($t29)
+                    $Abort($t29)
+                }
+                case 14 {
+                    // label L11
+                    // return ()
+                    $Free($locals, 64)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_push_back$vec$u8$$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 32)))
+            $StoreU256(e_ptr, e)
+            if $IsStoragePtr(e_ptr) {
+                let e_offs := $OffsetPtr(e_ptr)
+                let $linked_dst_2300595445 := $NewLinkedStorageBase(0x89204cf5)
+                let $size_2300595445 := $MemoryLoadU64(e)
+                let $data_size_2300595445 := mul($size_2300595445, 1)
+                $AlignedStorageStore($linked_dst_2300595445, mload(e))
+                let $data_src_2300595445 := add(e, 32)
+                let $data_dst_2300595445 := add($linked_dst_2300595445, 32)
+                for { let $offs_2300595445 := 0 } lt($offs_2300595445, $data_size_2300595445) { $offs_2300595445 := add($offs_2300595445, 32)} {
+                    $AlignedStorageStore(add($data_dst_2300595445, $offs_2300595445), mload(add($data_src_2300595445, $offs_2300595445)))
+                    $Free(e, add($data_size_2300595445, 32))
+                }
+                $AlignedStorageStore(e_offs, $linked_dst_2300595445)
+            }
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 32)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_vector_empty$vec$u8$$() -> vector {
+            vector := $Malloc(96)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Eq_$vec$vec$u8$$$(x, y) -> res
+        {
+            let len_x := $MemoryLoadU64(x)
+            let len_y := $MemoryLoadU64(y)
+            if $Neq(len_x, len_y) {
+              res:= false
+              leave
+            }
+            for { let i := 0 } lt(i, len_x) { i := add(i, 1) }
+            {
+                let e_x := $MemoryLoadU256(add(32, add(x, mul(i, 32))))
+                let e_y := $MemoryLoadU256(add(32, add(y, mul(i, 32))))
+                if $LogicalNot($Eq_$vec$u8$$(e_x, e_y)) {
+                  res:= false
+                  leave
+                }
+            }
+            res := true
+        }
+        function $Eq_$vec$u8$$(x, y) -> res
+        {
+            res := $EqVector(x, y, 1)
+        }
+        function copy_literal_string_to_memory_3979718947(value) {
+            $MemoryStoreU8(value, 103)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 104)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 105)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 106)
+            value := add(value, 1)
+        }
+        function copy_literal_string_to_memory_4185735457(value) {
+            $MemoryStoreU8(value, 103)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 104)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 105)
+            value := add(value, 1)
+        }
+        function copy_literal_string_to_memory_2608619572(value) {
+            $MemoryStoreU8(value, 100)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 101)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 102)
+            value := add(value, 1)
+        }
+        function copy_literal_string_to_memory_2053440334(value) {
+            $MemoryStoreU8(value, 97)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 98)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 99)
+            value := add(value, 1)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $EqVector(x, y, elem_size) -> r {
+            let len_x := $MemoryLoadU64(x)
+            let len_y := $MemoryLoadU64(y)
+            if $Neq(len_x, len_y) {
+                r := false
+                leave
+            }
+            let data_size_bytes := mul(elem_size, len_x)
+            let num_words, overflow_bytes := $ToWordOffs(data_size_bytes)
+            let i := 0
+            for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+                if $Neq(mload(add(x, add(i, 32))), mload(add(y, add(i, 32)))) {
+                    r := false
+                    leave
+                }
+            }
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let x_overflow := mload(add(x, add(overflow_offs, 32)))
+            let y_overflow := mload(add(y, add(overflow_offs, 32)))
+            r := eq(or(mask, x_overflow), or(mask, y_overflow))
+        }
+        function $Neq(x, y) -> r {
+            r := $LogicalNot(eq(x, y))
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $ClosestGreaterPowerOfTwo(x) -> r {
+            r := or(r, shr(1, x))
+            r := or(r, shr(2, r))
+            r := or(r, shr(4, r))
+            r := or(r, shr(8, r))
+            r := or(r, shr(16, r))
+            r := or(r, shr(32, r))
+            r := add(x, 1)
+        }
+    }
+}
+===> Test result of Vectors::test_nested_vector_equality: Succeed(Stopped) (used_gas=11041): []
+
+// test of Vectors::test_nested_vectors
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_Vectors_test_nested_vectors" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_Vectors_test_nested_vectors()
+        return (0, 0)
+        function A2_Vectors_test_nested_vectors() {
+            let $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32, $t33, $t34, $t35, $t36, $t37, $t38, $t39, $t40, $t41, $t42, $t43, $t44, $t45, $t46, $t47, $t48, $t49, $t50, $t51, $t52, $t53, $t54, $t55, $t56, $t57, $t58, $t59, $t60, $t61, $t62, $t63, $t64, $t65, $t66, $t67, $t68, $t69, $t70, $t71, $t72, $t73, $t74, $t75, $t76, $t77, $t78, $t79, $t80, $t81, $t82, $t83, $t84, $t85, $t86, $t87, $t88, $t89
+            let $locals := $Malloc(128)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t32 := 101
+                    $t32 := 101
+                    // abort($t32)
+                    $Abort($t32)
+                }
+                case 4 {
+                    // $t1 := vector::empty<u64>()
+                    mstore($locals, A1_vector_empty$u64$())
+                    // $t4 := borrow_local($t1)
+                    $t4 := $MakePtr(false, $locals)
+                    // $t5 := 10
+                    $t5 := 10
+                    // vector::push_back<u64>($t4, $t5)
+                    A1_vector_push_back$u64$($t4, $t5)
+                    // $t6 := borrow_local($t1)
+                    $t6 := $MakePtr(false, $locals)
+                    // $t7 := 11
+                    $t7 := 11
+                    // vector::push_back<u64>($t6, $t7)
+                    A1_vector_push_back$u64$($t6, $t7)
+                    // $t2 := vector::empty<u64>()
+                    mstore(add($locals, 32), A1_vector_empty$u64$())
+                    // $t8 := borrow_local($t2)
+                    $t8 := $MakePtr(false, add($locals, 32))
+                    // $t9 := 12
+                    $t9 := 12
+                    // vector::push_back<u64>($t8, $t9)
+                    A1_vector_push_back$u64$($t8, $t9)
+                    // $t10 := borrow_local($t2)
+                    $t10 := $MakePtr(false, add($locals, 32))
+                    // $t11 := 13
+                    $t11 := 13
+                    // vector::push_back<u64>($t10, $t11)
+                    A1_vector_push_back$u64$($t10, $t11)
+                    // $t12 := borrow_local($t2)
+                    $t12 := $MakePtr(false, add($locals, 32))
+                    // $t13 := 14
+                    $t13 := 14
+                    // vector::push_back<u64>($t12, $t13)
+                    A1_vector_push_back$u64$($t12, $t13)
+                    // $t3 := vector::empty<u64>()
+                    mstore(add($locals, 64), A1_vector_empty$u64$())
+                    // $t14 := borrow_local($t3)
+                    $t14 := $MakePtr(false, add($locals, 64))
+                    // $t15 := 15
+                    $t15 := 15
+                    // vector::push_back<u64>($t14, $t15)
+                    A1_vector_push_back$u64$($t14, $t15)
+                    // $t16 := borrow_local($t3)
+                    $t16 := $MakePtr(false, add($locals, 64))
+                    // $t17 := 16
+                    $t17 := 16
+                    // vector::push_back<u64>($t16, $t17)
+                    A1_vector_push_back$u64$($t16, $t17)
+                    // $t18 := borrow_local($t3)
+                    $t18 := $MakePtr(false, add($locals, 64))
+                    // $t19 := 17
+                    $t19 := 17
+                    // vector::push_back<u64>($t18, $t19)
+                    A1_vector_push_back$u64$($t18, $t19)
+                    // $t20 := borrow_local($t3)
+                    $t20 := $MakePtr(false, add($locals, 64))
+                    // $t21 := 18
+                    $t21 := 18
+                    // vector::push_back<u64>($t20, $t21)
+                    A1_vector_push_back$u64$($t20, $t21)
+                    // $t0 := vector::empty<vector<u64>>()
+                    mstore(add($locals, 96), A1_vector_empty$vec$u64$$())
+                    // $t22 := borrow_local($t0)
+                    $t22 := $MakePtr(false, add($locals, 96))
+                    // $t23 := move($t1)
+                    $t23 := mload($locals)
+                    // vector::push_back<vector<u64>>($t22, $t23)
+                    A1_vector_push_back$vec$u64$$($t22, $t23)
+                    // $t24 := borrow_local($t0)
+                    $t24 := $MakePtr(false, add($locals, 96))
+                    // $t25 := move($t2)
+                    $t25 := mload(add($locals, 32))
+                    // vector::push_back<vector<u64>>($t24, $t25)
+                    A1_vector_push_back$vec$u64$$($t24, $t25)
+                    // $t26 := borrow_local($t0)
+                    $t26 := $MakePtr(false, add($locals, 96))
+                    // $t27 := move($t3)
+                    $t27 := mload(add($locals, 64))
+                    // vector::push_back<vector<u64>>($t26, $t27)
+                    A1_vector_push_back$vec$u64$$($t26, $t27)
+                    // $t28 := borrow_local($t0)
+                    $t28 := $MakePtr(false, add($locals, 96))
+                    // $t29 := vector::length<vector<u64>>($t28)
+                    $t29 := A1_vector_length$vec$u64$$($t28)
+                    // $t30 := 3
+                    $t30 := 3
+                    // $t31 := ==($t29, $t30)
+                    $t31 := $Eq($t29, $t30)
+                    // if ($t31) goto L1 else goto L0
+                    switch $t31
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t33 := borrow_local($t0)
+                    $t33 := $MakePtr(false, add($locals, 96))
+                    // $t34 := 0
+                    $t34 := 0
+                    // $t35 := vector::borrow<vector<u64>>($t33, $t34)
+                    $t35 := A1_vector_borrow$vec$u64$$($t33, $t34)
+                    // $t36 := vector::length<u64>($t35)
+                    $t36 := A1_vector_length$u64$($t35)
+                    // $t37 := 2
+                    $t37 := 2
+                    // $t38 := ==($t36, $t37)
+                    $t38 := $Eq($t36, $t37)
+                    // if ($t38) goto L4 else goto L3
+                    switch $t38
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t39 := 102
+                    $t39 := 102
+                    // abort($t39)
+                    $Abort($t39)
+                }
+                case 8 {
+                    // label L5
+                    // $t40 := borrow_local($t0)
+                    $t40 := $MakePtr(false, add($locals, 96))
+                    // $t41 := 1
+                    $t41 := 1
+                    // $t42 := vector::borrow<vector<u64>>($t40, $t41)
+                    $t42 := A1_vector_borrow$vec$u64$$($t40, $t41)
+                    // $t43 := vector::length<u64>($t42)
+                    $t43 := A1_vector_length$u64$($t42)
+                    // $t44 := 3
+                    $t44 := 3
+                    // $t45 := ==($t43, $t44)
+                    $t45 := $Eq($t43, $t44)
+                    // if ($t45) goto L7 else goto L6
+                    switch $t45
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t46 := 103
+                    $t46 := 103
+                    // abort($t46)
+                    $Abort($t46)
+                }
+                case 11 {
+                    // label L8
+                    // $t47 := borrow_local($t0)
+                    $t47 := $MakePtr(false, add($locals, 96))
+                    // $t48 := 2
+                    $t48 := 2
+                    // $t49 := vector::borrow<vector<u64>>($t47, $t48)
+                    $t49 := A1_vector_borrow$vec$u64$$($t47, $t48)
+                    // $t50 := vector::length<u64>($t49)
+                    $t50 := A1_vector_length$u64$($t49)
+                    // $t51 := 4
+                    $t51 := 4
+                    // $t52 := ==($t50, $t51)
+                    $t52 := $Eq($t50, $t51)
+                    // if ($t52) goto L10 else goto L9
+                    switch $t52
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t53 := 104
+                    $t53 := 104
+                    // abort($t53)
+                    $Abort($t53)
+                }
+                case 14 {
+                    // label L11
+                    // $t54 := borrow_local($t0)
+                    $t54 := $MakePtr(false, add($locals, 96))
+                    // $t55 := 0
+                    $t55 := 0
+                    // $t56 := vector::borrow<vector<u64>>($t54, $t55)
+                    $t56 := A1_vector_borrow$vec$u64$$($t54, $t55)
+                    // $t57 := 0
+                    $t57 := 0
+                    // $t58 := vector::borrow<u64>($t56, $t57)
+                    $t58 := A1_vector_borrow$u64$($t56, $t57)
+                    // $t59 := read_ref($t58)
+                    $t59 := $LoadU64($t58)
+                    // $t60 := 10
+                    $t60 := 10
+                    // $t61 := ==($t59, $t60)
+                    $t61 := $Eq($t59, $t60)
+                    // if ($t61) goto L13 else goto L12
+                    switch $t61
+                    case 0  { $block := 16 }
+                    default { $block := 15 }
+                }
+                case 15 {
+                    // label L13
+                    // goto L14
+                    $block := 17
+                }
+                case 16 {
+                    // label L12
+                    // $t62 := 105
+                    $t62 := 105
+                    // abort($t62)
+                    $Abort($t62)
+                }
+                case 17 {
+                    // label L14
+                    // $t63 := borrow_local($t0)
+                    $t63 := $MakePtr(false, add($locals, 96))
+                    // $t64 := 1
+                    $t64 := 1
+                    // $t65 := vector::borrow<vector<u64>>($t63, $t64)
+                    $t65 := A1_vector_borrow$vec$u64$$($t63, $t64)
+                    // $t66 := 1
+                    $t66 := 1
+                    // $t67 := vector::borrow<u64>($t65, $t66)
+                    $t67 := A1_vector_borrow$u64$($t65, $t66)
+                    // $t68 := read_ref($t67)
+                    $t68 := $LoadU64($t67)
+                    // $t69 := 13
+                    $t69 := 13
+                    // $t70 := ==($t68, $t69)
+                    $t70 := $Eq($t68, $t69)
+                    // if ($t70) goto L16 else goto L15
+                    switch $t70
+                    case 0  { $block := 19 }
+                    default { $block := 18 }
+                }
+                case 18 {
+                    // label L16
+                    // goto L17
+                    $block := 20
+                }
+                case 19 {
+                    // label L15
+                    // $t71 := 105
+                    $t71 := 105
+                    // abort($t71)
+                    $Abort($t71)
+                }
+                case 20 {
+                    // label L17
+                    // $t72 := borrow_local($t0)
+                    $t72 := $MakePtr(false, add($locals, 96))
+                    // $t73 := 2
+                    $t73 := 2
+                    // $t74 := vector::borrow<vector<u64>>($t72, $t73)
+                    $t74 := A1_vector_borrow$vec$u64$$($t72, $t73)
+                    // $t75 := 2
+                    $t75 := 2
+                    // $t76 := vector::borrow<u64>($t74, $t75)
+                    $t76 := A1_vector_borrow$u64$($t74, $t75)
+                    // $t77 := read_ref($t76)
+                    $t77 := $LoadU64($t76)
+                    // $t78 := 17
+                    $t78 := 17
+                    // $t79 := ==($t77, $t78)
+                    $t79 := $Eq($t77, $t78)
+                    // if ($t79) goto L19 else goto L18
+                    switch $t79
+                    case 0  { $block := 22 }
+                    default { $block := 21 }
+                }
+                case 21 {
+                    // label L19
+                    // goto L20
+                    $block := 23
+                }
+                case 22 {
+                    // label L18
+                    // $t80 := 105
+                    $t80 := 105
+                    // abort($t80)
+                    $Abort($t80)
+                }
+                case 23 {
+                    // label L20
+                    // $t81 := borrow_local($t0)
+                    $t81 := $MakePtr(false, add($locals, 96))
+                    // $t82 := 2
+                    $t82 := 2
+                    // $t83 := vector::borrow<vector<u64>>($t81, $t82)
+                    $t83 := A1_vector_borrow$vec$u64$$($t81, $t82)
+                    // $t84 := 3
+                    $t84 := 3
+                    // $t85 := vector::borrow<u64>($t83, $t84)
+                    $t85 := A1_vector_borrow$u64$($t83, $t84)
+                    // $t86 := read_ref($t85)
+                    $t86 := $LoadU64($t85)
+                    // $t87 := 18
+                    $t87 := 18
+                    // $t88 := ==($t86, $t87)
+                    $t88 := $Eq($t86, $t87)
+                    // if ($t88) goto L22 else goto L21
+                    switch $t88
+                    case 0  { $block := 25 }
+                    default { $block := 24 }
+                }
+                case 24 {
+                    // label L22
+                    // goto L23
+                    $block := 26
+                }
+                case 25 {
+                    // label L21
+                    // $t89 := 105
+                    $t89 := 105
+                    // abort($t89)
+                    $Abort($t89)
+                }
+                case 26 {
+                    // label L23
+                    // return ()
+                    $Free($locals, 128)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_borrow$u64$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 8)))
+        }
+        function A1_vector_borrow$vec$u64$$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 32)))
+        }
+        function A1_vector_length$u64$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A1_vector_length$vec$u64$$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A1_vector_push_back$vec$u64$$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 32)))
+            $StoreU256(e_ptr, e)
+            if $IsStoragePtr(e_ptr) {
+                let e_offs := $OffsetPtr(e_ptr)
+                let $linked_dst_814019441 := $NewLinkedStorageBase(0x3084f371)
+                let $size_814019441 := $MemoryLoadU64(e)
+                let $data_size_814019441 := mul($size_814019441, 8)
+                $AlignedStorageStore($linked_dst_814019441, mload(e))
+                let $data_src_814019441 := add(e, 32)
+                let $data_dst_814019441 := add($linked_dst_814019441, 32)
+                for { let $offs_814019441 := 0 } lt($offs_814019441, $data_size_814019441) { $offs_814019441 := add($offs_814019441, 32)} {
+                    $AlignedStorageStore(add($data_dst_814019441, $offs_814019441), mload(add($data_src_814019441, $offs_814019441)))
+                    $Free(e, add($data_size_814019441, 32))
+                }
+                $AlignedStorageStore(e_offs, $linked_dst_814019441)
+            }
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 32)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_vector_empty$vec$u64$$() -> vector {
+            vector := $Malloc(96)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function A1_vector_push_back$u64$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 8)))
+            $StoreU64(e_ptr, e)
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 8)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_vector_empty$u64$() -> vector {
+            vector := $Malloc(48)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $GtEq(x, y) -> r {
+            r := or(gt(x, y), eq(x, y))
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of Vectors::test_nested_vectors: Succeed(Stopped) (used_gas=20935): []
+
+// test of Vectors::test_one_elem_struct
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_Vectors_test_one_elem_struct" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_Vectors_test_one_elem_struct()
+        return (0, 0)
+        function A2_Vectors_test_one_elem_struct() {
+            let $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29
+            let $locals := $Malloc(32)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t5 := 101
+                    $t5 := 101
+                    // abort($t5)
+                    $Abort($t5)
+                }
+                case 4 {
+                    // $t0 := Vectors::one_elem_struct()
+                    mstore($locals, A2_Vectors_one_elem_struct())
+                    // $t1 := borrow_local($t0)
+                    $t1 := $MakePtr(false, $locals)
+                    // $t2 := vector::length<Vectors::S>($t1)
+                    $t2 := A1_vector_length$A2_Vectors_S$($t1)
+                    // $t3 := 1
+                    $t3 := 1
+                    // $t4 := ==($t2, $t3)
+                    $t4 := $Eq($t2, $t3)
+                    // if ($t4) goto L1 else goto L0
+                    switch $t4
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t6 := borrow_local($t0)
+                    $t6 := $MakePtr(false, $locals)
+                    // $t7 := 0
+                    $t7 := 0
+                    // $t8 := vector::borrow<Vectors::S>($t6, $t7)
+                    $t8 := A1_vector_borrow$A2_Vectors_S$($t6, $t7)
+                    // $t9 := borrow_field<Vectors::S>.x($t8)
+                    $t9 := $t8
+                    // $t10 := read_ref($t9)
+                    $t10 := $LoadU128($t9)
+                    // $t11 := 42
+                    $t11 := 42
+                    // $t12 := ==($t10, $t11)
+                    $t12 := $Eq($t10, $t11)
+                    // if ($t12) goto L4 else goto L3
+                    switch $t12
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t13 := 102
+                    $t13 := 102
+                    // abort($t13)
+                    $Abort($t13)
+                }
+                case 8 {
+                    // label L5
+                    // $t14 := borrow_local($t0)
+                    $t14 := $MakePtr(false, $locals)
+                    // $t15 := 0
+                    $t15 := 0
+                    // $t16 := vector::borrow<Vectors::S>($t14, $t15)
+                    $t16 := A1_vector_borrow$A2_Vectors_S$($t14, $t15)
+                    // $t17 := borrow_field<Vectors::S>.y($t16)
+                    $t17 := $IndexPtr($t16, 24)
+                    // $t18 := read_ref($t17)
+                    $t18 := $LoadU8($t17)
+                    // $t19 := true
+                    $t19 := true
+                    // $t20 := ==($t18, $t19)
+                    $t20 := $Eq($t18, $t19)
+                    // if ($t20) goto L7 else goto L6
+                    switch $t20
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t21 := 103
+                    $t21 := 103
+                    // abort($t21)
+                    $Abort($t21)
+                }
+                case 11 {
+                    // label L8
+                    // $t22 := borrow_local($t0)
+                    $t22 := $MakePtr(false, $locals)
+                    // $t23 := 0
+                    $t23 := 0
+                    // $t24 := vector::borrow<Vectors::S>($t22, $t23)
+                    $t24 := A1_vector_borrow$A2_Vectors_S$($t22, $t23)
+                    // $t25 := borrow_field<Vectors::S>.z($t24)
+                    $t25 := $IndexPtr($t24, 16)
+                    // $t26 := read_ref($t25)
+                    $t26 := $LoadU64($t25)
+                    // $t27 := 789
+                    $t27 := 789
+                    // $t28 := ==($t26, $t27)
+                    $t28 := $Eq($t26, $t27)
+                    // if ($t28) goto L10 else goto L9
+                    switch $t28
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t29 := 104
+                    $t29 := 104
+                    // abort($t29)
+                    $Abort($t29)
+                }
+                case 14 {
+                    // label L11
+                    // return ()
+                    $Free($locals, 32)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_borrow$A2_Vectors_S$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 32)))
+            let e := $LoadU256(e_ptr)
+            e_ptr := $MakePtr($IsStoragePtr(v_ref), e)
+        }
+        function A1_vector_length$A2_Vectors_S$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A2_Vectors_one_elem_struct() -> $result {
+            let $t1, $t2, $t3, $t4, $t5, $t6
+            let $locals := $Malloc(32)
+            // $t0 := vector::empty<Vectors::S>()
+            mstore($locals, A1_vector_empty$A2_Vectors_S$())
+            // $t1 := borrow_local($t0)
+            $t1 := $MakePtr(false, $locals)
+            // $t2 := 42
+            $t2 := 42
+            // $t3 := true
+            $t3 := true
+            // $t4 := 789
+            $t4 := 789
+            // $t5 := pack Vectors::S($t2, $t3, $t4)
+            {
+                let $mem := $Malloc(25)
+                $MemoryStoreU128(add($mem, 0), $t2)
+                $MemoryStoreU8(add($mem, 24), $t3)
+                $MemoryStoreU64(add($mem, 16), $t4)
+                $t5 := $mem
+            }
+            // vector::push_back<Vectors::S>($t1, $t5)
+            A1_vector_push_back$A2_Vectors_S$($t1, $t5)
+            // $t6 := move($t0)
+            $t6 := mload($locals)
+            // return $t6
+            $result := $t6
+            $Free($locals, 32)
+        }
+
+        function A1_vector_push_back$A2_Vectors_S$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 32)))
+            $StoreU256(e_ptr, e)
+            if $IsStoragePtr(e_ptr) {
+                let e_offs := $OffsetPtr(e_ptr)
+                let $linked_dst_490229512 := $NewLinkedStorageBase(0x1d384f08)
+                $AlignedStorageStore(add($linked_dst_490229512, 0), mload(add(e, 0)))
+                $Free(e, 25)
+                $AlignedStorageStore(e_offs, $linked_dst_490229512)
+            }
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 32)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_vector_empty$A2_Vectors_S$() -> vector {
+            vector := $Malloc(96)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU8(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU8(offs)
+          }
+          default {
+            val := $StorageLoadU8(offs)
+          }
+        }
+        function $MemoryLoadU8(offs) -> val {
+          val := $MemoryLoadBytes(offs, 1)
+        }
+        function $StorageLoadU8(offs) -> val {
+          val := $StorageLoadBytes(offs, 1)
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU128(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU128(offs)
+          }
+          default {
+            val := $StorageLoadU128(offs)
+          }
+        }
+        function $MemoryLoadU128(offs) -> val {
+          val := $MemoryLoadBytes(offs, 16)
+        }
+        function $StorageLoadU128(offs) -> val {
+          val := $StorageLoadBytes(offs, 16)
+        }
+        function $MemoryStoreU128(offs, val) {
+          $MemoryStoreBytes(offs, 16, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $GtEq(x, y) -> r {
+            r := or(gt(x, y), eq(x, y))
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of Vectors::test_one_elem_struct: Succeed(Stopped) (used_gas=4291): []
+
+// test of Vectors::test_one_elem_u64
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_Vectors_test_one_elem_u64" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_Vectors_test_one_elem_u64()
+        return (0, 0)
+        function A2_Vectors_test_one_elem_u64() {
+            let $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12
+            let $locals := $Malloc(32)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t5 := 101
+                    $t5 := 101
+                    // abort($t5)
+                    $Abort($t5)
+                }
+                case 4 {
+                    // $t0 := Vectors::one_elem_u64()
+                    mstore($locals, A2_Vectors_one_elem_u64())
+                    // $t1 := borrow_local($t0)
+                    $t1 := $MakePtr(false, $locals)
+                    // $t2 := vector::length<u64>($t1)
+                    $t2 := A1_vector_length$u64$($t1)
+                    // $t3 := 1
+                    $t3 := 1
+                    // $t4 := ==($t2, $t3)
+                    $t4 := $Eq($t2, $t3)
+                    // if ($t4) goto L1 else goto L0
+                    switch $t4
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t6 := borrow_local($t0)
+                    $t6 := $MakePtr(false, $locals)
+                    // $t7 := 0
+                    $t7 := 0
+                    // $t8 := vector::borrow<u64>($t6, $t7)
+                    $t8 := A1_vector_borrow$u64$($t6, $t7)
+                    // $t9 := read_ref($t8)
+                    $t9 := $LoadU64($t8)
+                    // $t10 := 42
+                    $t10 := 42
+                    // $t11 := ==($t9, $t10)
+                    $t11 := $Eq($t9, $t10)
+                    // if ($t11) goto L4 else goto L3
+                    switch $t11
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t12 := 102
+                    $t12 := 102
+                    // abort($t12)
+                    $Abort($t12)
+                }
+                case 8 {
+                    // label L5
+                    // return ()
+                    $Free($locals, 32)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_borrow$u64$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 8)))
+        }
+        function A1_vector_length$u64$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A2_Vectors_one_elem_u64() -> $result {
+            let $t1, $t2, $t3
+            let $locals := $Malloc(32)
+            // $t0 := vector::empty<u64>()
+            mstore($locals, A1_vector_empty$u64$())
+            // $t1 := borrow_local($t0)
+            $t1 := $MakePtr(false, $locals)
+            // $t2 := 42
+            $t2 := 42
+            // vector::push_back<u64>($t1, $t2)
+            A1_vector_push_back$u64$($t1, $t2)
+            // $t3 := move($t0)
+            $t3 := mload($locals)
+            // return $t3
+            $result := $t3
+            $Free($locals, 32)
+        }
+
+        function A1_vector_push_back$u64$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 8)))
+            $StoreU64(e_ptr, e)
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 8)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_vector_empty$u64$() -> vector {
+            vector := $Malloc(48)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $GtEq(x, y) -> r {
+            r := or(gt(x, y), eq(x, y))
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of Vectors::test_one_elem_u64: Succeed(Stopped) (used_gas=2012): []
+
+// test of Vectors::test_pop_back
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_Vectors_test_pop_back" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_Vectors_test_pop_back()
+        return (0, 0)
+        function A2_Vectors_test_pop_back() {
+            let e, e_1, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32, $t33, $t34, $t35, $t36, $t37, $t38, $t39, $t40, $t41, $t42, $t43, $t44
+            let $locals := $Malloc(32)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t9 := 101
+                    $t9 := 101
+                    // abort($t9)
+                    $Abort($t9)
+                }
+                case 4 {
+                    // $t2 := Vectors::one_elem_u64()
+                    mstore($locals, A2_Vectors_one_elem_u64())
+                    // $t3 := borrow_local($t2)
+                    $t3 := $MakePtr(false, $locals)
+                    // $t4 := 43
+                    $t4 := 43
+                    // vector::push_back<u64>($t3, $t4)
+                    A1_vector_push_back$u64$($t3, $t4)
+                    // $t5 := borrow_local($t2)
+                    $t5 := $MakePtr(false, $locals)
+                    // $t6 := vector::length<u64>($t5)
+                    $t6 := A1_vector_length$u64$($t5)
+                    // $t7 := 2
+                    $t7 := 2
+                    // $t8 := ==($t6, $t7)
+                    $t8 := $Eq($t6, $t7)
+                    // if ($t8) goto L1 else goto L0
+                    switch $t8
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t10 := borrow_local($t2)
+                    $t10 := $MakePtr(false, $locals)
+                    // $t11 := 0
+                    $t11 := 0
+                    // $t12 := vector::borrow<u64>($t10, $t11)
+                    $t12 := A1_vector_borrow$u64$($t10, $t11)
+                    // $t13 := read_ref($t12)
+                    $t13 := $LoadU64($t12)
+                    // $t14 := 42
+                    $t14 := 42
+                    // $t15 := ==($t13, $t14)
+                    $t15 := $Eq($t13, $t14)
+                    // if ($t15) goto L4 else goto L3
+                    switch $t15
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t16 := 102
+                    $t16 := 102
+                    // abort($t16)
+                    $Abort($t16)
+                }
+                case 8 {
+                    // label L5
+                    // $t17 := borrow_local($t2)
+                    $t17 := $MakePtr(false, $locals)
+                    // $t18 := 1
+                    $t18 := 1
+                    // $t19 := vector::borrow<u64>($t17, $t18)
+                    $t19 := A1_vector_borrow$u64$($t17, $t18)
+                    // $t20 := read_ref($t19)
+                    $t20 := $LoadU64($t19)
+                    // $t21 := 43
+                    $t21 := 43
+                    // $t22 := ==($t20, $t21)
+                    $t22 := $Eq($t20, $t21)
+                    // if ($t22) goto L7 else goto L6
+                    switch $t22
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t23 := 103
+                    $t23 := 103
+                    // abort($t23)
+                    $Abort($t23)
+                }
+                case 11 {
+                    // label L8
+                    // $t24 := borrow_local($t2)
+                    $t24 := $MakePtr(false, $locals)
+                    // $t25 := vector::pop_back<u64>($t24)
+                    $t25 := A1_vector_pop_back$u64$($t24)
+                    // $t26 := borrow_local($t2)
+                    $t26 := $MakePtr(false, $locals)
+                    // $t27 := vector::length<u64>($t26)
+                    $t27 := A1_vector_length$u64$($t26)
+                    // $t28 := 1
+                    $t28 := 1
+                    // $t29 := ==($t27, $t28)
+                    $t29 := $Eq($t27, $t28)
+                    // if ($t29) goto L10 else goto L9
+                    switch $t29
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t30 := 104
+                    $t30 := 104
+                    // abort($t30)
+                    $Abort($t30)
+                }
+                case 14 {
+                    // label L11
+                    // $t31 := 43
+                    $t31 := 43
+                    // $t32 := ==($t25, $t31)
+                    $t32 := $Eq($t25, $t31)
+                    // if ($t32) goto L13 else goto L12
+                    switch $t32
+                    case 0  { $block := 16 }
+                    default { $block := 15 }
+                }
+                case 15 {
+                    // label L13
+                    // goto L14
+                    $block := 17
+                }
+                case 16 {
+                    // label L12
+                    // $t33 := 105
+                    $t33 := 105
+                    // abort($t33)
+                    $Abort($t33)
+                }
+                case 17 {
+                    // label L14
+                    // $t34 := borrow_local($t2)
+                    $t34 := $MakePtr(false, $locals)
+                    // $t35 := vector::pop_back<u64>($t34)
+                    $t35 := A1_vector_pop_back$u64$($t34)
+                    // $t36 := borrow_local($t2)
+                    $t36 := $MakePtr(false, $locals)
+                    // $t37 := vector::length<u64>($t36)
+                    $t37 := A1_vector_length$u64$($t36)
+                    // $t38 := 0
+                    $t38 := 0
+                    // $t39 := ==($t37, $t38)
+                    $t39 := $Eq($t37, $t38)
+                    // if ($t39) goto L16 else goto L15
+                    switch $t39
+                    case 0  { $block := 19 }
+                    default { $block := 18 }
+                }
+                case 18 {
+                    // label L16
+                    // goto L17
+                    $block := 20
+                }
+                case 19 {
+                    // label L15
+                    // $t40 := 106
+                    $t40 := 106
+                    // abort($t40)
+                    $Abort($t40)
+                }
+                case 20 {
+                    // label L17
+                    // $t41 := 42
+                    $t41 := 42
+                    // $t42 := ==($t35, $t41)
+                    $t42 := $Eq($t35, $t41)
+                    // if ($t42) goto L19 else goto L18
+                    switch $t42
+                    case 0  { $block := 22 }
+                    default { $block := 21 }
+                }
+                case 21 {
+                    // label L19
+                    // goto L20
+                    $block := 23
+                }
+                case 22 {
+                    // label L18
+                    // $t43 := 107
+                    $t43 := 107
+                    // abort($t43)
+                    $Abort($t43)
+                }
+                case 23 {
+                    // label L20
+                    // $t44 := move($t2)
+                    $t44 := mload($locals)
+                    // vector::destroy_empty<u64>($t44)
+                    A1_vector_destroy_empty$u64$($t44)
+                    // return ()
+                    $Free($locals, 32)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_destroy_empty$u64$(v) {
+            let size := $MemoryLoadU64(v)
+            if $LogicalNot(iszero(size)) { $AbortBuiltin() }
+            let capacity := $MemoryLoadU64(add(v, 8))
+            $Free(v, add(32, mul(capacity, 8)))
+        }
+        function A1_vector_length$u64$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A1_vector_pop_back$u64$(v_ref) -> e {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if iszero(size) { $AbortBuiltin() }
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(sub(size, 1), 8)))
+            e := $LoadU64(e_ptr)
+            $StoreU64(v_ptr, sub(size, 1))
+        }
+        function A1_vector_borrow$u64$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 8)))
+        }
+        function A1_vector_push_back$u64$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 8)))
+            $StoreU64(e_ptr, e)
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 8)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A2_Vectors_one_elem_u64() -> $result {
+            let $t1, $t2, $t3
+            let $locals := $Malloc(32)
+            // $t0 := vector::empty<u64>()
+            mstore($locals, A1_vector_empty$u64$())
+            // $t1 := borrow_local($t0)
+            $t1 := $MakePtr(false, $locals)
+            // $t2 := 42
+            $t2 := 42
+            // vector::push_back<u64>($t1, $t2)
+            A1_vector_push_back$u64$($t1, $t2)
+            // $t3 := move($t0)
+            $t3 := mload($locals)
+            // return $t3
+            $result := $t3
+            $Free($locals, 32)
+        }
+
+        function A1_vector_empty$u64$() -> vector {
+            vector := $Malloc(48)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $GtEq(x, y) -> r {
+            r := or(gt(x, y), eq(x, y))
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of Vectors::test_pop_back: Succeed(Stopped) (used_gas=8729): []
+
+// test of Vectors::test_pop_back_empty_fail
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_Vectors_test_pop_back_empty_fail" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_Vectors_test_pop_back_empty_fail()
+        return (0, 0)
+        function A2_Vectors_test_pop_back_empty_fail() {
+            let $t1, $t2
+            let $locals := $Malloc(32)
+            // $t0 := vector::empty<address>()
+            mstore($locals, A1_vector_empty$address$())
+            // $t1 := borrow_local($t0)
+            $t1 := $MakePtr(false, $locals)
+            // $t2 := vector::pop_back<address>($t1)
+            $t2 := A1_vector_pop_back$address$($t1)
+            // drop($t2)
+            // return ()
+            $Free($locals, 32)
+        }
+
+        function A1_vector_pop_back$address$(v_ref) -> e {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if iszero(size) { $AbortBuiltin() }
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(sub(size, 1), 32)))
+            e := $LoadU256(e_ptr)
+            $StoreU64(v_ptr, sub(size, 1))
+        }
+        function A1_vector_empty$address$() -> vector {
+            vector := $Malloc(96)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of Vectors::test_pop_back_empty_fail: Revert(Reverted) (used_gas=324): [255, 255, 255, 255, 255, 255, 255, 255]
+
+// test of Vectors::test_push_back
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_Vectors_test_push_back" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_Vectors_test_push_back()
+        return (0, 0)
+        function A2_Vectors_test_push_back() {
+            let $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32, $t33, $t34, $t35, $t36, $t37, $t38, $t39, $t40, $t41, $t42, $t43, $t44, $t45, $t46, $t47, $t48, $t49, $t50, $t51, $t52, $t53, $t54, $t55, $t56, $t57, $t58, $t59, $t60, $t61, $t62, $t63, $t64, $t65, $t66, $t67, $t68, $t69, $t70, $t71, $t72, $t73, $t74, $t75, $t76, $t77, $t78, $t79, $t80, $t81, $t82, $t83, $t84, $t85, $t86, $t87, $t88, $t89, $t90, $t91, $t92, $t93, $t94, $t95, $t96
+            let $locals := $Malloc(32)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t5 := 101
+                    $t5 := 101
+                    // abort($t5)
+                    $Abort($t5)
+                }
+                case 4 {
+                    // $t0 := Vectors::one_elem_u64()
+                    mstore($locals, A2_Vectors_one_elem_u64())
+                    // $t1 := borrow_local($t0)
+                    $t1 := $MakePtr(false, $locals)
+                    // $t2 := vector::length<u64>($t1)
+                    $t2 := A1_vector_length$u64$($t1)
+                    // $t3 := 1
+                    $t3 := 1
+                    // $t4 := ==($t2, $t3)
+                    $t4 := $Eq($t2, $t3)
+                    // if ($t4) goto L1 else goto L0
+                    switch $t4
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t6 := borrow_local($t0)
+                    $t6 := $MakePtr(false, $locals)
+                    // $t7 := 0
+                    $t7 := 0
+                    // $t8 := vector::borrow<u64>($t6, $t7)
+                    $t8 := A1_vector_borrow$u64$($t6, $t7)
+                    // $t9 := read_ref($t8)
+                    $t9 := $LoadU64($t8)
+                    // $t10 := 42
+                    $t10 := 42
+                    // $t11 := ==($t9, $t10)
+                    $t11 := $Eq($t9, $t10)
+                    // if ($t11) goto L4 else goto L3
+                    switch $t11
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t12 := 102
+                    $t12 := 102
+                    // abort($t12)
+                    $Abort($t12)
+                }
+                case 8 {
+                    // label L5
+                    // $t13 := borrow_local($t0)
+                    $t13 := $MakePtr(false, $locals)
+                    // $t14 := 43
+                    $t14 := 43
+                    // vector::push_back<u64>($t13, $t14)
+                    A1_vector_push_back$u64$($t13, $t14)
+                    // $t15 := borrow_local($t0)
+                    $t15 := $MakePtr(false, $locals)
+                    // $t16 := vector::length<u64>($t15)
+                    $t16 := A1_vector_length$u64$($t15)
+                    // $t17 := 2
+                    $t17 := 2
+                    // $t18 := ==($t16, $t17)
+                    $t18 := $Eq($t16, $t17)
+                    // if ($t18) goto L7 else goto L6
+                    switch $t18
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t19 := 103
+                    $t19 := 103
+                    // abort($t19)
+                    $Abort($t19)
+                }
+                case 11 {
+                    // label L8
+                    // $t20 := borrow_local($t0)
+                    $t20 := $MakePtr(false, $locals)
+                    // $t21 := 0
+                    $t21 := 0
+                    // $t22 := vector::borrow<u64>($t20, $t21)
+                    $t22 := A1_vector_borrow$u64$($t20, $t21)
+                    // $t23 := read_ref($t22)
+                    $t23 := $LoadU64($t22)
+                    // $t24 := 42
+                    $t24 := 42
+                    // $t25 := ==($t23, $t24)
+                    $t25 := $Eq($t23, $t24)
+                    // if ($t25) goto L10 else goto L9
+                    switch $t25
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t26 := 104
+                    $t26 := 104
+                    // abort($t26)
+                    $Abort($t26)
+                }
+                case 14 {
+                    // label L11
+                    // $t27 := borrow_local($t0)
+                    $t27 := $MakePtr(false, $locals)
+                    // $t28 := 1
+                    $t28 := 1
+                    // $t29 := vector::borrow<u64>($t27, $t28)
+                    $t29 := A1_vector_borrow$u64$($t27, $t28)
+                    // $t30 := read_ref($t29)
+                    $t30 := $LoadU64($t29)
+                    // $t31 := 43
+                    $t31 := 43
+                    // $t32 := ==($t30, $t31)
+                    $t32 := $Eq($t30, $t31)
+                    // if ($t32) goto L13 else goto L12
+                    switch $t32
+                    case 0  { $block := 16 }
+                    default { $block := 15 }
+                }
+                case 15 {
+                    // label L13
+                    // goto L14
+                    $block := 17
+                }
+                case 16 {
+                    // label L12
+                    // $t33 := 105
+                    $t33 := 105
+                    // abort($t33)
+                    $Abort($t33)
+                }
+                case 17 {
+                    // label L14
+                    // $t34 := borrow_local($t0)
+                    $t34 := $MakePtr(false, $locals)
+                    // $t35 := 44
+                    $t35 := 44
+                    // vector::push_back<u64>($t34, $t35)
+                    A1_vector_push_back$u64$($t34, $t35)
+                    // $t36 := borrow_local($t0)
+                    $t36 := $MakePtr(false, $locals)
+                    // $t37 := vector::length<u64>($t36)
+                    $t37 := A1_vector_length$u64$($t36)
+                    // $t38 := 3
+                    $t38 := 3
+                    // $t39 := ==($t37, $t38)
+                    $t39 := $Eq($t37, $t38)
+                    // if ($t39) goto L16 else goto L15
+                    switch $t39
+                    case 0  { $block := 19 }
+                    default { $block := 18 }
+                }
+                case 18 {
+                    // label L16
+                    // goto L17
+                    $block := 20
+                }
+                case 19 {
+                    // label L15
+                    // $t40 := 106
+                    $t40 := 106
+                    // abort($t40)
+                    $Abort($t40)
+                }
+                case 20 {
+                    // label L17
+                    // $t41 := borrow_local($t0)
+                    $t41 := $MakePtr(false, $locals)
+                    // $t42 := 0
+                    $t42 := 0
+                    // $t43 := vector::borrow<u64>($t41, $t42)
+                    $t43 := A1_vector_borrow$u64$($t41, $t42)
+                    // $t44 := read_ref($t43)
+                    $t44 := $LoadU64($t43)
+                    // $t45 := 42
+                    $t45 := 42
+                    // $t46 := ==($t44, $t45)
+                    $t46 := $Eq($t44, $t45)
+                    // if ($t46) goto L19 else goto L18
+                    switch $t46
+                    case 0  { $block := 22 }
+                    default { $block := 21 }
+                }
+                case 21 {
+                    // label L19
+                    // goto L20
+                    $block := 23
+                }
+                case 22 {
+                    // label L18
+                    // $t47 := 107
+                    $t47 := 107
+                    // abort($t47)
+                    $Abort($t47)
+                }
+                case 23 {
+                    // label L20
+                    // $t48 := borrow_local($t0)
+                    $t48 := $MakePtr(false, $locals)
+                    // $t49 := 1
+                    $t49 := 1
+                    // $t50 := vector::borrow<u64>($t48, $t49)
+                    $t50 := A1_vector_borrow$u64$($t48, $t49)
+                    // $t51 := read_ref($t50)
+                    $t51 := $LoadU64($t50)
+                    // $t52 := 43
+                    $t52 := 43
+                    // $t53 := ==($t51, $t52)
+                    $t53 := $Eq($t51, $t52)
+                    // if ($t53) goto L22 else goto L21
+                    switch $t53
+                    case 0  { $block := 25 }
+                    default { $block := 24 }
+                }
+                case 24 {
+                    // label L22
+                    // goto L23
+                    $block := 26
+                }
+                case 25 {
+                    // label L21
+                    // $t54 := 108
+                    $t54 := 108
+                    // abort($t54)
+                    $Abort($t54)
+                }
+                case 26 {
+                    // label L23
+                    // $t55 := borrow_local($t0)
+                    $t55 := $MakePtr(false, $locals)
+                    // $t56 := 2
+                    $t56 := 2
+                    // $t57 := vector::borrow<u64>($t55, $t56)
+                    $t57 := A1_vector_borrow$u64$($t55, $t56)
+                    // $t58 := read_ref($t57)
+                    $t58 := $LoadU64($t57)
+                    // $t59 := 44
+                    $t59 := 44
+                    // $t60 := ==($t58, $t59)
+                    $t60 := $Eq($t58, $t59)
+                    // if ($t60) goto L25 else goto L24
+                    switch $t60
+                    case 0  { $block := 28 }
+                    default { $block := 27 }
+                }
+                case 27 {
+                    // label L25
+                    // goto L26
+                    $block := 29
+                }
+                case 28 {
+                    // label L24
+                    // $t61 := 109
+                    $t61 := 109
+                    // abort($t61)
+                    $Abort($t61)
+                }
+                case 29 {
+                    // label L26
+                    // $t62 := borrow_local($t0)
+                    $t62 := $MakePtr(false, $locals)
+                    // $t63 := 45
+                    $t63 := 45
+                    // vector::push_back<u64>($t62, $t63)
+                    A1_vector_push_back$u64$($t62, $t63)
+                    // $t64 := borrow_local($t0)
+                    $t64 := $MakePtr(false, $locals)
+                    // $t65 := vector::length<u64>($t64)
+                    $t65 := A1_vector_length$u64$($t64)
+                    // $t66 := 4
+                    $t66 := 4
+                    // $t67 := ==($t65, $t66)
+                    $t67 := $Eq($t65, $t66)
+                    // if ($t67) goto L28 else goto L27
+                    switch $t67
+                    case 0  { $block := 31 }
+                    default { $block := 30 }
+                }
+                case 30 {
+                    // label L28
+                    // goto L29
+                    $block := 32
+                }
+                case 31 {
+                    // label L27
+                    // $t68 := 110
+                    $t68 := 110
+                    // abort($t68)
+                    $Abort($t68)
+                }
+                case 32 {
+                    // label L29
+                    // $t69 := borrow_local($t0)
+                    $t69 := $MakePtr(false, $locals)
+                    // $t70 := 0
+                    $t70 := 0
+                    // $t71 := vector::borrow<u64>($t69, $t70)
+                    $t71 := A1_vector_borrow$u64$($t69, $t70)
+                    // $t72 := read_ref($t71)
+                    $t72 := $LoadU64($t71)
+                    // $t73 := 42
+                    $t73 := 42
+                    // $t74 := ==($t72, $t73)
+                    $t74 := $Eq($t72, $t73)
+                    // if ($t74) goto L31 else goto L30
+                    switch $t74
+                    case 0  { $block := 34 }
+                    default { $block := 33 }
+                }
+                case 33 {
+                    // label L31
+                    // goto L32
+                    $block := 35
+                }
+                case 34 {
+                    // label L30
+                    // $t75 := 111
+                    $t75 := 111
+                    // abort($t75)
+                    $Abort($t75)
+                }
+                case 35 {
+                    // label L32
+                    // $t76 := borrow_local($t0)
+                    $t76 := $MakePtr(false, $locals)
+                    // $t77 := 1
+                    $t77 := 1
+                    // $t78 := vector::borrow<u64>($t76, $t77)
+                    $t78 := A1_vector_borrow$u64$($t76, $t77)
+                    // $t79 := read_ref($t78)
+                    $t79 := $LoadU64($t78)
+                    // $t80 := 43
+                    $t80 := 43
+                    // $t81 := ==($t79, $t80)
+                    $t81 := $Eq($t79, $t80)
+                    // if ($t81) goto L34 else goto L33
+                    switch $t81
+                    case 0  { $block := 37 }
+                    default { $block := 36 }
+                }
+                case 36 {
+                    // label L34
+                    // goto L35
+                    $block := 38
+                }
+                case 37 {
+                    // label L33
+                    // $t82 := 112
+                    $t82 := 112
+                    // abort($t82)
+                    $Abort($t82)
+                }
+                case 38 {
+                    // label L35
+                    // $t83 := borrow_local($t0)
+                    $t83 := $MakePtr(false, $locals)
+                    // $t84 := 2
+                    $t84 := 2
+                    // $t85 := vector::borrow<u64>($t83, $t84)
+                    $t85 := A1_vector_borrow$u64$($t83, $t84)
+                    // $t86 := read_ref($t85)
+                    $t86 := $LoadU64($t85)
+                    // $t87 := 44
+                    $t87 := 44
+                    // $t88 := ==($t86, $t87)
+                    $t88 := $Eq($t86, $t87)
+                    // if ($t88) goto L37 else goto L36
+                    switch $t88
+                    case 0  { $block := 40 }
+                    default { $block := 39 }
+                }
+                case 39 {
+                    // label L37
+                    // goto L38
+                    $block := 41
+                }
+                case 40 {
+                    // label L36
+                    // $t89 := 113
+                    $t89 := 113
+                    // abort($t89)
+                    $Abort($t89)
+                }
+                case 41 {
+                    // label L38
+                    // $t90 := borrow_local($t0)
+                    $t90 := $MakePtr(false, $locals)
+                    // $t91 := 3
+                    $t91 := 3
+                    // $t92 := vector::borrow<u64>($t90, $t91)
+                    $t92 := A1_vector_borrow$u64$($t90, $t91)
+                    // $t93 := read_ref($t92)
+                    $t93 := $LoadU64($t92)
+                    // $t94 := 45
+                    $t94 := 45
+                    // $t95 := ==($t93, $t94)
+                    $t95 := $Eq($t93, $t94)
+                    // if ($t95) goto L40 else goto L39
+                    switch $t95
+                    case 0  { $block := 43 }
+                    default { $block := 42 }
+                }
+                case 42 {
+                    // label L40
+                    // goto L41
+                    $block := 44
+                }
+                case 43 {
+                    // label L39
+                    // $t96 := 114
+                    $t96 := 114
+                    // abort($t96)
+                    $Abort($t96)
+                }
+                case 44 {
+                    // label L41
+                    // return ()
+                    $Free($locals, 32)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_borrow$u64$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 8)))
+        }
+        function A1_vector_length$u64$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A1_vector_push_back$u64$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 8)))
+            $StoreU64(e_ptr, e)
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 8)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A2_Vectors_one_elem_u64() -> $result {
+            let $t1, $t2, $t3
+            let $locals := $Malloc(32)
+            // $t0 := vector::empty<u64>()
+            mstore($locals, A1_vector_empty$u64$())
+            // $t1 := borrow_local($t0)
+            $t1 := $MakePtr(false, $locals)
+            // $t2 := 42
+            $t2 := 42
+            // vector::push_back<u64>($t1, $t2)
+            A1_vector_push_back$u64$($t1, $t2)
+            // $t3 := move($t0)
+            $t3 := mload($locals)
+            // return $t3
+            $result := $t3
+            $Free($locals, 32)
+        }
+
+        function A1_vector_empty$u64$() -> vector {
+            vector := $Malloc(48)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $GtEq(x, y) -> r {
+            r := or(gt(x, y), eq(x, y))
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of Vectors::test_push_back: Succeed(Stopped) (used_gas=23283): []
+
+// test of Vectors::test_swap
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_Vectors_test_swap" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_Vectors_test_swap()
+        return (0, 0)
+        function A2_Vectors_test_swap() {
+            let $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32, $t33, $t34, $t35, $t36, $t37, $t38, $t39, $t40, $t41, $t42, $t43, $t44, $t45, $t46, $t47, $t48, $t49
+            let $locals := $Malloc(32)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t11 := 101
+                    $t11 := 101
+                    // abort($t11)
+                    $Abort($t11)
+                }
+                case 4 {
+                    // $t0 := Vectors::one_elem_u64()
+                    mstore($locals, A2_Vectors_one_elem_u64())
+                    // $t1 := borrow_local($t0)
+                    $t1 := $MakePtr(false, $locals)
+                    // $t2 := 43
+                    $t2 := 43
+                    // vector::push_back<u64>($t1, $t2)
+                    A1_vector_push_back$u64$($t1, $t2)
+                    // $t3 := borrow_local($t0)
+                    $t3 := $MakePtr(false, $locals)
+                    // $t4 := 44
+                    $t4 := 44
+                    // vector::push_back<u64>($t3, $t4)
+                    A1_vector_push_back$u64$($t3, $t4)
+                    // $t5 := borrow_local($t0)
+                    $t5 := $MakePtr(false, $locals)
+                    // $t6 := 0
+                    $t6 := 0
+                    // $t7 := vector::borrow<u64>($t5, $t6)
+                    $t7 := A1_vector_borrow$u64$($t5, $t6)
+                    // $t8 := read_ref($t7)
+                    $t8 := $LoadU64($t7)
+                    // $t9 := 42
+                    $t9 := 42
+                    // $t10 := ==($t8, $t9)
+                    $t10 := $Eq($t8, $t9)
+                    // if ($t10) goto L1 else goto L0
+                    switch $t10
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t12 := borrow_local($t0)
+                    $t12 := $MakePtr(false, $locals)
+                    // $t13 := 1
+                    $t13 := 1
+                    // $t14 := vector::borrow<u64>($t12, $t13)
+                    $t14 := A1_vector_borrow$u64$($t12, $t13)
+                    // $t15 := read_ref($t14)
+                    $t15 := $LoadU64($t14)
+                    // $t16 := 43
+                    $t16 := 43
+                    // $t17 := ==($t15, $t16)
+                    $t17 := $Eq($t15, $t16)
+                    // if ($t17) goto L4 else goto L3
+                    switch $t17
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t18 := 102
+                    $t18 := 102
+                    // abort($t18)
+                    $Abort($t18)
+                }
+                case 8 {
+                    // label L5
+                    // $t19 := borrow_local($t0)
+                    $t19 := $MakePtr(false, $locals)
+                    // $t20 := 2
+                    $t20 := 2
+                    // $t21 := vector::borrow<u64>($t19, $t20)
+                    $t21 := A1_vector_borrow$u64$($t19, $t20)
+                    // $t22 := read_ref($t21)
+                    $t22 := $LoadU64($t21)
+                    // $t23 := 44
+                    $t23 := 44
+                    // $t24 := ==($t22, $t23)
+                    $t24 := $Eq($t22, $t23)
+                    // if ($t24) goto L7 else goto L6
+                    switch $t24
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t25 := 103
+                    $t25 := 103
+                    // abort($t25)
+                    $Abort($t25)
+                }
+                case 11 {
+                    // label L8
+                    // $t26 := borrow_local($t0)
+                    $t26 := $MakePtr(false, $locals)
+                    // $t27 := 0
+                    $t27 := 0
+                    // $t28 := 2
+                    $t28 := 2
+                    // vector::swap<u64>($t26, $t27, $t28)
+                    A1_vector_swap$u64$($t26, $t27, $t28)
+                    // $t29 := borrow_local($t0)
+                    $t29 := $MakePtr(false, $locals)
+                    // $t30 := 0
+                    $t30 := 0
+                    // $t31 := vector::borrow<u64>($t29, $t30)
+                    $t31 := A1_vector_borrow$u64$($t29, $t30)
+                    // $t32 := read_ref($t31)
+                    $t32 := $LoadU64($t31)
+                    // $t33 := 44
+                    $t33 := 44
+                    // $t34 := ==($t32, $t33)
+                    $t34 := $Eq($t32, $t33)
+                    // if ($t34) goto L10 else goto L9
+                    switch $t34
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t35 := 104
+                    $t35 := 104
+                    // abort($t35)
+                    $Abort($t35)
+                }
+                case 14 {
+                    // label L11
+                    // $t36 := borrow_local($t0)
+                    $t36 := $MakePtr(false, $locals)
+                    // $t37 := 1
+                    $t37 := 1
+                    // $t38 := vector::borrow<u64>($t36, $t37)
+                    $t38 := A1_vector_borrow$u64$($t36, $t37)
+                    // $t39 := read_ref($t38)
+                    $t39 := $LoadU64($t38)
+                    // $t40 := 43
+                    $t40 := 43
+                    // $t41 := ==($t39, $t40)
+                    $t41 := $Eq($t39, $t40)
+                    // if ($t41) goto L13 else goto L12
+                    switch $t41
+                    case 0  { $block := 16 }
+                    default { $block := 15 }
+                }
+                case 15 {
+                    // label L13
+                    // goto L14
+                    $block := 17
+                }
+                case 16 {
+                    // label L12
+                    // $t42 := 105
+                    $t42 := 105
+                    // abort($t42)
+                    $Abort($t42)
+                }
+                case 17 {
+                    // label L14
+                    // $t43 := borrow_local($t0)
+                    $t43 := $MakePtr(false, $locals)
+                    // $t44 := 2
+                    $t44 := 2
+                    // $t45 := vector::borrow<u64>($t43, $t44)
+                    $t45 := A1_vector_borrow$u64$($t43, $t44)
+                    // $t46 := read_ref($t45)
+                    $t46 := $LoadU64($t45)
+                    // $t47 := 42
+                    $t47 := 42
+                    // $t48 := ==($t46, $t47)
+                    $t48 := $Eq($t46, $t47)
+                    // if ($t48) goto L16 else goto L15
+                    switch $t48
+                    case 0  { $block := 19 }
+                    default { $block := 18 }
+                }
+                case 18 {
+                    // label L16
+                    // goto L17
+                    $block := 20
+                }
+                case 19 {
+                    // label L15
+                    // $t49 := 106
+                    $t49 := 106
+                    // abort($t49)
+                    $Abort($t49)
+                }
+                case 20 {
+                    // label L17
+                    // return ()
+                    $Free($locals, 32)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_borrow$u64$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 8)))
+        }
+        function A1_vector_swap$u64$(v_ref, i, j) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if or($GtEq(i, size), $GtEq(j, size)) { $AbortBuiltin() }
+            let i_ptr := $IndexPtr(v_ptr, add(32, mul(i, 8)))
+            let j_ptr := $IndexPtr(v_ptr, add(32, mul(j, 8)))
+            let i_val := $LoadU64(i_ptr)
+            let j_val := $LoadU64(j_ptr)
+            $StoreU64(i_ptr, j_val)
+            $StoreU64(j_ptr, i_val)
+        }
+        function A1_vector_push_back$u64$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 8)))
+            $StoreU64(e_ptr, e)
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 8)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A2_Vectors_one_elem_u64() -> $result {
+            let $t1, $t2, $t3
+            let $locals := $Malloc(32)
+            // $t0 := vector::empty<u64>()
+            mstore($locals, A1_vector_empty$u64$())
+            // $t1 := borrow_local($t0)
+            $t1 := $MakePtr(false, $locals)
+            // $t2 := 42
+            $t2 := 42
+            // vector::push_back<u64>($t1, $t2)
+            A1_vector_push_back$u64$($t1, $t2)
+            // $t3 := move($t0)
+            $t3 := mload($locals)
+            // return $t3
+            $result := $t3
+            $Free($locals, 32)
+        }
+
+        function A1_vector_empty$u64$() -> vector {
+            vector := $Malloc(48)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $GtEq(x, y) -> r {
+            r := or(gt(x, y), eq(x, y))
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of Vectors::test_swap: Succeed(Stopped) (used_gas=8941): []
+
+// test of Vectors::test_swap_fail
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_Vectors_test_swap_fail" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_Vectors_test_swap_fail()
+        return (0, 0)
+        function A2_Vectors_test_swap_fail() {
+            let $t1, $t2, $t3, $t4, $t5
+            let $locals := $Malloc(32)
+            // $t0 := Vectors::one_elem_u64()
+            mstore($locals, A2_Vectors_one_elem_u64())
+            // $t1 := borrow_local($t0)
+            $t1 := $MakePtr(false, $locals)
+            // $t2 := 34
+            $t2 := 34
+            // vector::push_back<u64>($t1, $t2)
+            A1_vector_push_back$u64$($t1, $t2)
+            // $t3 := borrow_local($t0)
+            $t3 := $MakePtr(false, $locals)
+            // $t4 := 1
+            $t4 := 1
+            // $t5 := 2
+            $t5 := 2
+            // vector::swap<u64>($t3, $t4, $t5)
+            A1_vector_swap$u64$($t3, $t4, $t5)
+            // return ()
+            $Free($locals, 32)
+        }
+
+        function A1_vector_swap$u64$(v_ref, i, j) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if or($GtEq(i, size), $GtEq(j, size)) { $AbortBuiltin() }
+            let i_ptr := $IndexPtr(v_ptr, add(32, mul(i, 8)))
+            let j_ptr := $IndexPtr(v_ptr, add(32, mul(j, 8)))
+            let i_val := $LoadU64(i_ptr)
+            let j_val := $LoadU64(j_ptr)
+            $StoreU64(i_ptr, j_val)
+            $StoreU64(j_ptr, i_val)
+        }
+        function A1_vector_push_back$u64$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 8)))
+            $StoreU64(e_ptr, e)
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 8)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A2_Vectors_one_elem_u64() -> $result {
+            let $t1, $t2, $t3
+            let $locals := $Malloc(32)
+            // $t0 := vector::empty<u64>()
+            mstore($locals, A1_vector_empty$u64$())
+            // $t1 := borrow_local($t0)
+            $t1 := $MakePtr(false, $locals)
+            // $t2 := 42
+            $t2 := 42
+            // vector::push_back<u64>($t1, $t2)
+            A1_vector_push_back$u64$($t1, $t2)
+            // $t3 := move($t0)
+            $t3 := mload($locals)
+            // return $t3
+            $result := $t3
+            $Free($locals, 32)
+        }
+
+        function A1_vector_empty$u64$() -> vector {
+            vector := $Malloc(48)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $GtEq(x, y) -> r {
+            r := or(gt(x, y), eq(x, y))
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of Vectors::test_swap_fail: Revert(Reverted) (used_gas=2289): [255, 255, 255, 255, 255, 255, 255, 255]
+
+// test of Vectors::test_vector_equality
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_Vectors_test_vector_equality" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_Vectors_test_vector_equality()
+        return (0, 0)
+        function A2_Vectors_test_vector_equality() {
+            let $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32
+            let $locals := $Malloc(32)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t12 := 101
+                    $t12 := 101
+                    // abort($t12)
+                    $Abort($t12)
+                }
+                case 4 {
+                    // $t0 := vector::empty<u8>()
+                    mstore($locals, A1_vector_empty$u8$())
+                    // $t1 := borrow_local($t0)
+                    $t1 := $MakePtr(false, $locals)
+                    // $t2 := 10
+                    $t2 := 10
+                    // vector::push_back<u8>($t1, $t2)
+                    A1_vector_push_back$u8$($t1, $t2)
+                    // $t3 := borrow_local($t0)
+                    $t3 := $MakePtr(false, $locals)
+                    // $t4 := 11
+                    $t4 := 11
+                    // vector::push_back<u8>($t3, $t4)
+                    A1_vector_push_back$u8$($t3, $t4)
+                    // $t5 := borrow_local($t0)
+                    $t5 := $MakePtr(false, $locals)
+                    // $t6 := 12
+                    $t6 := 12
+                    // vector::push_back<u8>($t5, $t6)
+                    A1_vector_push_back$u8$($t5, $t6)
+                    // $t7 := borrow_local($t0)
+                    $t7 := $MakePtr(false, $locals)
+                    // $t8 := 13
+                    $t8 := 13
+                    // vector::push_back<u8>($t7, $t8)
+                    A1_vector_push_back$u8$($t7, $t8)
+                    // $t9 := copy($t0)
+                    $t9 := mload($locals)
+                    // $t10 := [10, 11, 12, 13]
+                    $t10 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(4)))
+                    $MemoryStoreU64($t10, 4)
+                    $MemoryStoreU64(add($t10, 8), $ClosestGreaterPowerOfTwo(4))
+                    copy_literal_string_to_memory_512532313(add($t10, 32))
+                    // $t11 := ==($t9, $t10)
+                    $t11 := $Eq_$vec$u8$$($t9, $t10)
+                    // if ($t11) goto L1 else goto L0
+                    switch $t11
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t13 := copy($t0)
+                    $t13 := mload($locals)
+                    // $t14 := [10, 11, 12, 13]
+                    $t14 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(4)))
+                    $MemoryStoreU64($t14, 4)
+                    $MemoryStoreU64(add($t14, 8), $ClosestGreaterPowerOfTwo(4))
+                    copy_literal_string_to_memory_512532313(add($t14, 32))
+                    // $t15 := !=($t13, $t14)
+                    $t15 := $LogicalNot($Eq_$vec$u8$$($t13, $t14))
+                    // $t16 := !($t15)
+                    $t16 := $LogicalNot($t15)
+                    // if ($t16) goto L4 else goto L3
+                    switch $t16
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t17 := 102
+                    $t17 := 102
+                    // abort($t17)
+                    $Abort($t17)
+                }
+                case 8 {
+                    // label L5
+                    // $t18 := copy($t0)
+                    $t18 := mload($locals)
+                    // $t19 := [10, 11, 12]
+                    $t19 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(3)))
+                    $MemoryStoreU64($t19, 3)
+                    $MemoryStoreU64(add($t19, 8), $ClosestGreaterPowerOfTwo(3))
+                    copy_literal_string_to_memory_2815201339(add($t19, 32))
+                    // $t20 := !=($t18, $t19)
+                    $t20 := $LogicalNot($Eq_$vec$u8$$($t18, $t19))
+                    // if ($t20) goto L7 else goto L6
+                    switch $t20
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t21 := 103
+                    $t21 := 103
+                    // abort($t21)
+                    $Abort($t21)
+                }
+                case 11 {
+                    // label L8
+                    // $t22 := copy($t0)
+                    $t22 := mload($locals)
+                    // $t23 := [10, 11, 12]
+                    $t23 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(3)))
+                    $MemoryStoreU64($t23, 3)
+                    $MemoryStoreU64(add($t23, 8), $ClosestGreaterPowerOfTwo(3))
+                    copy_literal_string_to_memory_2815201339(add($t23, 32))
+                    // $t24 := ==($t22, $t23)
+                    $t24 := $Eq_$vec$u8$$($t22, $t23)
+                    // $t25 := !($t24)
+                    $t25 := $LogicalNot($t24)
+                    // if ($t25) goto L10 else goto L9
+                    switch $t25
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t26 := 104
+                    $t26 := 104
+                    // abort($t26)
+                    $Abort($t26)
+                }
+                case 14 {
+                    // label L11
+                    // $t27 := borrow_local($t0)
+                    $t27 := $MakePtr(false, $locals)
+                    // $t28 := 14
+                    $t28 := 14
+                    // vector::push_back<u8>($t27, $t28)
+                    A1_vector_push_back$u8$($t27, $t28)
+                    // $t29 := move($t0)
+                    $t29 := mload($locals)
+                    // $t30 := [10, 11, 12, 13, 14]
+                    $t30 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(5)))
+                    $MemoryStoreU64($t30, 5)
+                    $MemoryStoreU64(add($t30, 8), $ClosestGreaterPowerOfTwo(5))
+                    copy_literal_string_to_memory_337779769(add($t30, 32))
+                    // $t31 := ==($t29, $t30)
+                    $t31 := $Eq_$vec$u8$$($t29, $t30)
+                    // if ($t31) goto L13 else goto L12
+                    switch $t31
+                    case 0  { $block := 16 }
+                    default { $block := 15 }
+                }
+                case 15 {
+                    // label L13
+                    // goto L14
+                    $block := 17
+                }
+                case 16 {
+                    // label L12
+                    // $t32 := 105
+                    $t32 := 105
+                    // abort($t32)
+                    $Abort($t32)
+                }
+                case 17 {
+                    // label L14
+                    // return ()
+                    $Free($locals, 32)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_push_back$u8$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 1)))
+            $StoreU8(e_ptr, e)
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 1)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_vector_empty$u8$() -> vector {
+            vector := $Malloc(34)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Eq_$vec$u8$$(x, y) -> res
+        {
+            res := $EqVector(x, y, 1)
+        }
+        function copy_literal_string_to_memory_337779769(value) {
+            $MemoryStoreU8(value, 10)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 11)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 12)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 13)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 14)
+            value := add(value, 1)
+        }
+        function copy_literal_string_to_memory_2815201339(value) {
+            $MemoryStoreU8(value, 10)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 11)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 12)
+            value := add(value, 1)
+        }
+        function copy_literal_string_to_memory_512532313(value) {
+            $MemoryStoreU8(value, 10)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 11)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 12)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 13)
+            value := add(value, 1)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $StoreU8(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU8(offs, val)
+          }
+          default {
+            $StorageStoreU8(offs, val)
+          }
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $StorageStoreU8(offs, val) {
+          $StorageStoreBytes(offs, 1, val)
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $EqVector(x, y, elem_size) -> r {
+            let len_x := $MemoryLoadU64(x)
+            let len_y := $MemoryLoadU64(y)
+            if $Neq(len_x, len_y) {
+                r := false
+                leave
+            }
+            let data_size_bytes := mul(elem_size, len_x)
+            let num_words, overflow_bytes := $ToWordOffs(data_size_bytes)
+            let i := 0
+            for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+                if $Neq(mload(add(x, add(i, 32))), mload(add(y, add(i, 32)))) {
+                    r := false
+                    leave
+                }
+            }
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let x_overflow := mload(add(x, add(overflow_offs, 32)))
+            let y_overflow := mload(add(y, add(overflow_offs, 32)))
+            r := eq(or(mask, x_overflow), or(mask, y_overflow))
+        }
+        function $Neq(x, y) -> r {
+            r := $LogicalNot(eq(x, y))
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $ClosestGreaterPowerOfTwo(x) -> r {
+            r := or(r, shr(1, x))
+            r := or(r, shr(2, r))
+            r := or(r, shr(4, r))
+            r := or(r, shr(8, r))
+            r := or(r, shr(16, r))
+            r := or(r, shr(32, r))
+            r := add(x, 1)
+        }
+    }
+}
+===> Test result of Vectors::test_vector_equality: Succeed(Stopped) (used_gas=8658): []
+
+// test of Vectors::test_vector_equality_struct
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_Vectors_test_vector_equality_struct" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_Vectors_test_vector_equality_struct()
+        return (0, 0)
+        function A2_Vectors_test_vector_equality_struct() {
+            let r1, r2, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32, $t33, $t34, $t35, $t36, $t37, $t38, $t39
+            let $locals := $Malloc(64)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t7 := 101
+                    $t7 := 101
+                    // abort($t7)
+                    $Abort($t7)
+                }
+                case 4 {
+                    // $t2 := vector::empty<Vectors::R>()
+                    mstore($locals, A1_vector_empty$A2_Vectors_R$())
+                    // $t3 := vector::empty<Vectors::R>()
+                    mstore(add($locals, 32), A1_vector_empty$A2_Vectors_R$())
+                    // $t4 := copy($t2)
+                    $t4 := mload($locals)
+                    // $t5 := copy($t3)
+                    $t5 := mload(add($locals, 32))
+                    // $t6 := ==($t4, $t5)
+                    $t6 := $Eq_$vec$A2_Vectors_R$$($t4, $t5)
+                    // if ($t6) goto L1 else goto L0
+                    switch $t6
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t8 := 42
+                    $t8 := 42
+                    // $t9 := true
+                    $t9 := true
+                    // $t10 := 9
+                    $t10 := 9
+                    // $t11 := pack Vectors::S($t8, $t9, $t10)
+                    {
+                        let $mem := $Malloc(25)
+                        $MemoryStoreU128(add($mem, 0), $t8)
+                        $MemoryStoreU8(add($mem, 24), $t9)
+                        $MemoryStoreU64(add($mem, 16), $t10)
+                        $t11 := $mem
+                    }
+                    // $t12 := Vectors::one_elem_u64()
+                    $t12 := A2_Vectors_one_elem_u64()
+                    // $t13 := pack Vectors::R($t11, $t12)
+                    {
+                        let $mem := $Malloc(64)
+                        $MemoryStoreU256(add($mem, 0), $t11)
+                        $MemoryStoreU256(add($mem, 32), $t12)
+                        $t13 := $mem
+                    }
+                    // $t14 := borrow_local($t2)
+                    $t14 := $MakePtr(false, $locals)
+                    // vector::push_back<Vectors::R>($t14, $t13)
+                    A1_vector_push_back$A2_Vectors_R$($t14, $t13)
+                    // $t15 := copy($t2)
+                    $t15 := mload($locals)
+                    // $t16 := copy($t3)
+                    $t16 := mload(add($locals, 32))
+                    // $t17 := !=($t15, $t16)
+                    $t17 := $LogicalNot($Eq_$vec$A2_Vectors_R$$($t15, $t16))
+                    // if ($t17) goto L4 else goto L3
+                    switch $t17
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t18 := 102
+                    $t18 := 102
+                    // abort($t18)
+                    $Abort($t18)
+                }
+                case 8 {
+                    // label L5
+                    // $t19 := borrow_local($t3)
+                    $t19 := $MakePtr(false, add($locals, 32))
+                    // vector::push_back<Vectors::R>($t19, $t13)
+                    A1_vector_push_back$A2_Vectors_R$($t19, $t13)
+                    // $t20 := copy($t2)
+                    $t20 := mload($locals)
+                    // $t21 := copy($t3)
+                    $t21 := mload(add($locals, 32))
+                    // $t22 := ==($t20, $t21)
+                    $t22 := $Eq_$vec$A2_Vectors_R$$($t20, $t21)
+                    // if ($t22) goto L7 else goto L6
+                    switch $t22
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t23 := 103
+                    $t23 := 103
+                    // abort($t23)
+                    $Abort($t23)
+                }
+                case 11 {
+                    // label L8
+                    // $t24 := 42
+                    $t24 := 42
+                    // $t25 := false
+                    $t25 := false
+                    // $t26 := 9
+                    $t26 := 9
+                    // $t27 := pack Vectors::S($t24, $t25, $t26)
+                    {
+                        let $mem := $Malloc(25)
+                        $MemoryStoreU128(add($mem, 0), $t24)
+                        $MemoryStoreU8(add($mem, 24), $t25)
+                        $MemoryStoreU64(add($mem, 16), $t26)
+                        $t27 := $mem
+                    }
+                    // $t28 := Vectors::one_elem_u64()
+                    $t28 := A2_Vectors_one_elem_u64()
+                    // $t29 := pack Vectors::R($t27, $t28)
+                    {
+                        let $mem := $Malloc(64)
+                        $MemoryStoreU256(add($mem, 0), $t27)
+                        $MemoryStoreU256(add($mem, 32), $t28)
+                        $t29 := $mem
+                    }
+                    // $t30 := borrow_local($t2)
+                    $t30 := $MakePtr(false, $locals)
+                    // vector::push_back<Vectors::R>($t30, $t13)
+                    A1_vector_push_back$A2_Vectors_R$($t30, $t13)
+                    // $t31 := copy($t2)
+                    $t31 := mload($locals)
+                    // $t32 := copy($t3)
+                    $t32 := mload(add($locals, 32))
+                    // $t33 := !=($t31, $t32)
+                    $t33 := $LogicalNot($Eq_$vec$A2_Vectors_R$$($t31, $t32))
+                    // if ($t33) goto L10 else goto L9
+                    switch $t33
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t34 := 104
+                    $t34 := 104
+                    // abort($t34)
+                    $Abort($t34)
+                }
+                case 14 {
+                    // label L11
+                    // $t35 := borrow_local($t3)
+                    $t35 := $MakePtr(false, add($locals, 32))
+                    // vector::push_back<Vectors::R>($t35, $t29)
+                    A1_vector_push_back$A2_Vectors_R$($t35, $t29)
+                    // $t36 := move($t2)
+                    $t36 := mload($locals)
+                    // $t37 := move($t3)
+                    $t37 := mload(add($locals, 32))
+                    // $t38 := !=($t36, $t37)
+                    $t38 := $LogicalNot($Eq_$vec$A2_Vectors_R$$($t36, $t37))
+                    // if ($t38) goto L13 else goto L12
+                    switch $t38
+                    case 0  { $block := 16 }
+                    default { $block := 15 }
+                }
+                case 15 {
+                    // label L13
+                    // goto L14
+                    $block := 17
+                }
+                case 16 {
+                    // label L12
+                    // $t39 := 105
+                    $t39 := 105
+                    // abort($t39)
+                    $Abort($t39)
+                }
+                case 17 {
+                    // label L14
+                    // return ()
+                    $Free($locals, 64)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_push_back$A2_Vectors_R$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 32)))
+            $StoreU256(e_ptr, e)
+            if $IsStoragePtr(e_ptr) {
+                let e_offs := $OffsetPtr(e_ptr)
+                let $linked_dst_1348728112 := $NewLinkedStorageBase(0x5063f530)
+                {
+                    let $linked_src_490229512 := mload(add(e, 0))
+                    let $linked_dst_490229512 := $NewLinkedStorageBase(0x1d384f08)
+                    $AlignedStorageStore(add($linked_dst_490229512, 0), mload(add($linked_src_490229512, 0)))
+                    $Free($linked_src_490229512, 25)
+                    $AlignedStorageStore(add($linked_dst_1348728112, 0), $linked_dst_490229512)
+                }
+                {
+                    let $linked_src_814019441 := mload(add(e, 32))
+                    let $linked_dst_814019441 := $NewLinkedStorageBase(0x3084f371)
+                    let $size_814019441 := $MemoryLoadU64($linked_src_814019441)
+                    let $data_size_814019441 := mul($size_814019441, 8)
+                    $AlignedStorageStore($linked_dst_814019441, mload($linked_src_814019441))
+                    let $data_src_814019441 := add($linked_src_814019441, 32)
+                    let $data_dst_814019441 := add($linked_dst_814019441, 32)
+                    for { let $offs_814019441 := 0 } lt($offs_814019441, $data_size_814019441) { $offs_814019441 := add($offs_814019441, 32)} {
+                        $AlignedStorageStore(add($data_dst_814019441, $offs_814019441), mload(add($data_src_814019441, $offs_814019441)))
+                        $Free($linked_src_814019441, add($data_size_814019441, 32))
+                    }
+                    $AlignedStorageStore(add($linked_dst_1348728112, 32), $linked_dst_814019441)
+                }
+                $Free(e, 64)
+                $AlignedStorageStore(e_offs, $linked_dst_1348728112)
+            }
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 32)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A2_Vectors_one_elem_u64() -> $result {
+            let $t1, $t2, $t3
+            let $locals := $Malloc(32)
+            // $t0 := vector::empty<u64>()
+            mstore($locals, A1_vector_empty$u64$())
+            // $t1 := borrow_local($t0)
+            $t1 := $MakePtr(false, $locals)
+            // $t2 := 42
+            $t2 := 42
+            // vector::push_back<u64>($t1, $t2)
+            A1_vector_push_back$u64$($t1, $t2)
+            // $t3 := move($t0)
+            $t3 := mload($locals)
+            // return $t3
+            $result := $t3
+            $Free($locals, 32)
+        }
+
+        function A1_vector_push_back$u64$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 8)))
+            $StoreU64(e_ptr, e)
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 8)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_vector_empty$u64$() -> vector {
+            vector := $Malloc(48)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function A1_vector_empty$A2_Vectors_R$() -> vector {
+            vector := $Malloc(96)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Eq_$vec$A2_Vectors_R$$(x, y) -> res
+        {
+            let len_x := $MemoryLoadU64(x)
+            let len_y := $MemoryLoadU64(y)
+            if $Neq(len_x, len_y) {
+              res:= false
+              leave
+            }
+            for { let i := 0 } lt(i, len_x) { i := add(i, 1) }
+            {
+                let e_x := $MemoryLoadU256(add(32, add(x, mul(i, 32))))
+                let e_y := $MemoryLoadU256(add(32, add(y, mul(i, 32))))
+                if $LogicalNot($Eq_$A2_Vectors_R$(e_x, e_y)) {
+                  res:= false
+                  leave
+                }
+            }
+            res := true
+        }
+        function $Eq_$A2_Vectors_R$(x, y) -> res
+        {
+            let f_x_0 := mload(add(x, 0))
+            let f_y_0 := mload(add(y, 0))
+            if $LogicalNot($Eq_$A2_Vectors_S$(f_x_0, f_y_0)) {
+              res:= false
+              leave
+            }
+            let f_x_1 := mload(add(x, 32))
+            let f_y_1 := mload(add(y, 32))
+            if $LogicalNot($Eq_$vec$u64$$(f_x_1, f_y_1)) {
+              res:= false
+              leave
+            }
+            res := true
+        }
+        function $Eq_$vec$u64$$(x, y) -> res
+        {
+            res := $EqVector(x, y, 8)
+        }
+        function $Eq_$A2_Vectors_S$(x, y) -> res
+        {
+            if $Neq(mload(add(x, 0)), mload(add(y, 0))) {
+              res:= false
+              leave
+            }
+            res := true
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $MemoryStoreU128(offs, val) {
+          $MemoryStoreBytes(offs, 16, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $EqVector(x, y, elem_size) -> r {
+            let len_x := $MemoryLoadU64(x)
+            let len_y := $MemoryLoadU64(y)
+            if $Neq(len_x, len_y) {
+                r := false
+                leave
+            }
+            let data_size_bytes := mul(elem_size, len_x)
+            let num_words, overflow_bytes := $ToWordOffs(data_size_bytes)
+            let i := 0
+            for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+                if $Neq(mload(add(x, add(i, 32))), mload(add(y, add(i, 32)))) {
+                    r := false
+                    leave
+                }
+            }
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let x_overflow := mload(add(x, add(overflow_offs, 32)))
+            let y_overflow := mload(add(y, add(overflow_offs, 32)))
+            r := eq(or(mask, x_overflow), or(mask, y_overflow))
+        }
+        function $Neq(x, y) -> r {
+            r := $LogicalNot(eq(x, y))
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of Vectors::test_vector_equality_struct: Succeed(Stopped) (used_gas=10390): []
+
+// test of Vectors::test_vectors_in_structs
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_Vectors_test_vectors_in_structs" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_Vectors_test_vectors_in_structs()
+        return (0, 0)
+        function A2_Vectors_test_vectors_in_structs() {
+            let r, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32, $t33, $t34, $t35, $t36, $t37, $t38, $t39, $t40, $t41, $t42, $t43, $t44, $t45, $t46, $t47, $t48, $t49, $t50, $t51, $t52, $t53, $t54, $t55, $t56, $t57, $t58, $t59, $t60, $t61, $t62, $t63, $t64, $t65, $t66, $t67, $t68, $t69, $t70, $t71, $t72
+            let $locals := $Malloc(32)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t18 := 101
+                    $t18 := 101
+                    // abort($t18)
+                    $Abort($t18)
+                }
+                case 4 {
+                    // $t1 := vector::empty<u64>()
+                    mstore($locals, A1_vector_empty$u64$())
+                    // $t2 := borrow_local($t1)
+                    $t2 := $MakePtr(false, $locals)
+                    // $t3 := 10
+                    $t3 := 10
+                    // vector::push_back<u64>($t2, $t3)
+                    A1_vector_push_back$u64$($t2, $t3)
+                    // $t4 := borrow_local($t1)
+                    $t4 := $MakePtr(false, $locals)
+                    // $t5 := 11
+                    $t5 := 11
+                    // vector::push_back<u64>($t4, $t5)
+                    A1_vector_push_back$u64$($t4, $t5)
+                    // $t6 := borrow_local($t1)
+                    $t6 := $MakePtr(false, $locals)
+                    // $t7 := 12
+                    $t7 := 12
+                    // vector::push_back<u64>($t6, $t7)
+                    A1_vector_push_back$u64$($t6, $t7)
+                    // $t8 := 42
+                    $t8 := 42
+                    // $t9 := true
+                    $t9 := true
+                    // $t10 := 9
+                    $t10 := 9
+                    // $t11 := pack Vectors::S($t8, $t9, $t10)
+                    {
+                        let $mem := $Malloc(25)
+                        $MemoryStoreU128(add($mem, 0), $t8)
+                        $MemoryStoreU8(add($mem, 24), $t9)
+                        $MemoryStoreU64(add($mem, 16), $t10)
+                        $t11 := $mem
+                    }
+                    // $t12 := move($t1)
+                    $t12 := mload($locals)
+                    // $t0 := pack Vectors::R($t11, $t12)
+                    {
+                        let $mem := $Malloc(64)
+                        $MemoryStoreU256(add($mem, 0), $t11)
+                        $MemoryStoreU256(add($mem, 32), $t12)
+                        r := $mem
+                    }
+                    // $t13 := borrow_local($t0)
+                    $t13 := $MakePtr(false, r)
+                    // $t14 := borrow_field<Vectors::R>.v($t13)
+                    $t14 := $IndexPtr($t13, 32)
+                    // $t15 := vector::length<u64>($t14)
+                    $t15 := A1_vector_length$u64$($t14)
+                    // $t16 := 3
+                    $t16 := 3
+                    // $t17 := ==($t15, $t16)
+                    $t17 := $Eq($t15, $t16)
+                    // if ($t17) goto L1 else goto L0
+                    switch $t17
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t19 := borrow_local($t0)
+                    $t19 := $MakePtr(false, r)
+                    // $t20 := borrow_field<Vectors::R>.v($t19)
+                    $t20 := $IndexPtr($t19, 32)
+                    // $t21 := 0
+                    $t21 := 0
+                    // $t22 := vector::borrow<u64>($t20, $t21)
+                    $t22 := A1_vector_borrow$u64$($t20, $t21)
+                    // $t23 := read_ref($t22)
+                    $t23 := $LoadU64($t22)
+                    // $t24 := 10
+                    $t24 := 10
+                    // $t25 := ==($t23, $t24)
+                    $t25 := $Eq($t23, $t24)
+                    // if ($t25) goto L4 else goto L3
+                    switch $t25
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t26 := 102
+                    $t26 := 102
+                    // abort($t26)
+                    $Abort($t26)
+                }
+                case 8 {
+                    // label L5
+                    // $t27 := borrow_local($t0)
+                    $t27 := $MakePtr(false, r)
+                    // $t28 := borrow_field<Vectors::R>.v($t27)
+                    $t28 := $IndexPtr($t27, 32)
+                    // $t29 := 1
+                    $t29 := 1
+                    // $t30 := vector::borrow<u64>($t28, $t29)
+                    $t30 := A1_vector_borrow$u64$($t28, $t29)
+                    // $t31 := read_ref($t30)
+                    $t31 := $LoadU64($t30)
+                    // $t32 := 11
+                    $t32 := 11
+                    // $t33 := ==($t31, $t32)
+                    $t33 := $Eq($t31, $t32)
+                    // if ($t33) goto L7 else goto L6
+                    switch $t33
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t34 := 103
+                    $t34 := 103
+                    // abort($t34)
+                    $Abort($t34)
+                }
+                case 11 {
+                    // label L8
+                    // $t35 := borrow_local($t0)
+                    $t35 := $MakePtr(false, r)
+                    // $t36 := borrow_field<Vectors::R>.v($t35)
+                    $t36 := $IndexPtr($t35, 32)
+                    // $t37 := 2
+                    $t37 := 2
+                    // $t38 := vector::borrow<u64>($t36, $t37)
+                    $t38 := A1_vector_borrow$u64$($t36, $t37)
+                    // $t39 := read_ref($t38)
+                    $t39 := $LoadU64($t38)
+                    // $t40 := 12
+                    $t40 := 12
+                    // $t41 := ==($t39, $t40)
+                    $t41 := $Eq($t39, $t40)
+                    // if ($t41) goto L10 else goto L9
+                    switch $t41
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t42 := 104
+                    $t42 := 104
+                    // abort($t42)
+                    $Abort($t42)
+                }
+                case 14 {
+                    // label L11
+                    // $t43 := 41
+                    $t43 := 41
+                    // $t44 := borrow_local($t0)
+                    $t44 := $MakePtr(false, r)
+                    // $t45 := borrow_field<Vectors::R>.v($t44)
+                    $t45 := $IndexPtr($t44, 32)
+                    // $t46 := 1
+                    $t46 := 1
+                    // $t47 := vector::borrow_mut<u64>($t45, $t46)
+                    $t47 := A1_vector_borrow_mut$u64$($t45, $t46)
+                    // write_ref($t47, $t43)
+                    $StoreU64($t47, $t43)
+                    // $t48 := borrow_local($t0)
+                    $t48 := $MakePtr(false, r)
+                    // $t49 := borrow_field<Vectors::R>.v($t48)
+                    $t49 := $IndexPtr($t48, 32)
+                    // $t50 := 1
+                    $t50 := 1
+                    // $t51 := vector::borrow<u64>($t49, $t50)
+                    $t51 := A1_vector_borrow$u64$($t49, $t50)
+                    // $t52 := read_ref($t51)
+                    $t52 := $LoadU64($t51)
+                    // $t53 := 41
+                    $t53 := 41
+                    // $t54 := ==($t52, $t53)
+                    $t54 := $Eq($t52, $t53)
+                    // if ($t54) goto L13 else goto L12
+                    switch $t54
+                    case 0  { $block := 16 }
+                    default { $block := 15 }
+                }
+                case 15 {
+                    // label L13
+                    // goto L14
+                    $block := 17
+                }
+                case 16 {
+                    // label L12
+                    // $t55 := 105
+                    $t55 := 105
+                    // abort($t55)
+                    $Abort($t55)
+                }
+                case 17 {
+                    // label L14
+                    // $t56 := Vectors::one_elem_u64()
+                    $t56 := A2_Vectors_one_elem_u64()
+                    // $t57 := borrow_local($t0)
+                    $t57 := $MakePtr(false, r)
+                    // $t58 := borrow_field<Vectors::R>.v($t57)
+                    $t58 := $IndexPtr($t57, 32)
+                    // write_ref($t58, $t56)
+                    if $IsStoragePtr($t58){
+                        let $storage_ptr_814019441 := $NewLinkedStorageBase(0x3084f371)
+                        let $size_814019441 := $MemoryLoadU64($t56)
+                        let $data_size_814019441 := mul($size_814019441, 8)
+                        $AlignedStorageStore($storage_ptr_814019441, mload($t56))
+                        let $data_src_814019441 := add($t56, 32)
+                        let $data_dst_814019441 := add($storage_ptr_814019441, 32)
+                        for { let $offs_814019441 := 0 } lt($offs_814019441, $data_size_814019441) { $offs_814019441 := add($offs_814019441, 32)} {
+                            $AlignedStorageStore(add($data_dst_814019441, $offs_814019441), mload(add($data_src_814019441, $offs_814019441)))
+                        }
+                        $t56 := $storage_ptr_814019441
+                    }
+                    $StoreU256($t58, $t56)
+                    // $t59 := borrow_local($t0)
+                    $t59 := $MakePtr(false, r)
+                    // $t60 := borrow_field<Vectors::R>.v($t59)
+                    $t60 := $IndexPtr($t59, 32)
+                    // $t61 := vector::length<u64>($t60)
+                    $t61 := A1_vector_length$u64$($t60)
+                    // $t62 := 1
+                    $t62 := 1
+                    // $t63 := ==($t61, $t62)
+                    $t63 := $Eq($t61, $t62)
+                    // if ($t63) goto L16 else goto L15
+                    switch $t63
+                    case 0  { $block := 19 }
+                    default { $block := 18 }
+                }
+                case 18 {
+                    // label L16
+                    // goto L17
+                    $block := 20
+                }
+                case 19 {
+                    // label L15
+                    // $t64 := 106
+                    $t64 := 106
+                    // abort($t64)
+                    $Abort($t64)
+                }
+                case 20 {
+                    // label L17
+                    // $t65 := borrow_local($t0)
+                    $t65 := $MakePtr(false, r)
+                    // $t66 := borrow_field<Vectors::R>.v($t65)
+                    $t66 := $IndexPtr($t65, 32)
+                    // $t67 := 0
+                    $t67 := 0
+                    // $t68 := vector::borrow<u64>($t66, $t67)
+                    $t68 := A1_vector_borrow$u64$($t66, $t67)
+                    // $t69 := read_ref($t68)
+                    $t69 := $LoadU64($t68)
+                    // $t70 := 42
+                    $t70 := 42
+                    // $t71 := ==($t69, $t70)
+                    $t71 := $Eq($t69, $t70)
+                    // if ($t71) goto L19 else goto L18
+                    switch $t71
+                    case 0  { $block := 22 }
+                    default { $block := 21 }
+                }
+                case 21 {
+                    // label L19
+                    // goto L20
+                    $block := 23
+                }
+                case 22 {
+                    // label L18
+                    // $t72 := 107
+                    $t72 := 107
+                    // abort($t72)
+                    $Abort($t72)
+                }
+                case 23 {
+                    // label L20
+                    // return ()
+                    $Free($locals, 32)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_borrow$u64$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 8)))
+        }
+        function A1_vector_length$u64$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A2_Vectors_one_elem_u64() -> $result {
+            let $t1, $t2, $t3
+            let $locals := $Malloc(32)
+            // $t0 := vector::empty<u64>()
+            mstore($locals, A1_vector_empty$u64$())
+            // $t1 := borrow_local($t0)
+            $t1 := $MakePtr(false, $locals)
+            // $t2 := 42
+            $t2 := 42
+            // vector::push_back<u64>($t1, $t2)
+            A1_vector_push_back$u64$($t1, $t2)
+            // $t3 := move($t0)
+            $t3 := mload($locals)
+            // return $t3
+            $result := $t3
+            $Free($locals, 32)
+        }
+
+        function A1_vector_push_back$u64$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 8)))
+            $StoreU64(e_ptr, e)
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 8)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_vector_empty$u64$() -> vector {
+            vector := $Malloc(48)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function A1_vector_borrow_mut$u64$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 8)))
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $MemoryStoreU128(offs, val) {
+          $MemoryStoreBytes(offs, 16, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $GtEq(x, y) -> r {
+            r := or(gt(x, y), eq(x, y))
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of Vectors::test_vectors_in_structs: Succeed(Stopped) (used_gas=11062): []
diff --git a/third_party/move/evm/move-to-yul/tests/dispatcher_testsuite.rs b/third_party/move/evm/move-to-yul/tests/dispatcher_testsuite.rs
index 903de4abd8cd9..7d24920cc87f1 100644
--- a/third_party/move/evm/move-to-yul/tests/dispatcher_testsuite.rs
+++ b/third_party/move/evm/move-to-yul/tests/dispatcher_testsuite.rs
@@ -3,6 +3,10 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use anyhow::Result;
+use codespan_reporting::{
+    diagnostic::Severity,
+    term::termcolor::{ColorChoice, StandardStream},
+};
 use evm::{backend::MemoryVicinity, ExitReason};
 use evm_exec_utils::{compile, exec::Executor};
 use move_compiler::{
@@ -83,6 +87,11 @@ fn compile_yul_to_bytecode_bytes(filename: &str) -> Result<Vec<u8>> {
         flags,
         &known_attributes,
     )?;
+    if env.has_errors() {
+        let mut error_writer = StandardStream::stderr(ColorChoice::Auto);
+        env.report_diag(&mut error_writer, Severity::Warning);
+        panic!("compilation failed");
+    }
     let options = Options::default();
     let (_, out, _) = Generator::run(&options, &env)
         .pop()
diff --git a/third_party/move/evm/move-to-yul/tests/fallback-receive-test/FallbackOnly.v2_exp b/third_party/move/evm/move-to-yul/tests/fallback-receive-test/FallbackOnly.v2_exp
new file mode 100644
index 0000000000000..bb3a10d4002d8
--- /dev/null
+++ b/third_party/move/evm/move-to-yul/tests/fallback-receive-test/FallbackOnly.v2_exp
@@ -0,0 +1,43 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_M" {
+    code {
+        codecopy(0, dataoffset("A2_M_deployed"), datasize("A2_M_deployed"))
+        return(0, datasize("A2_M_deployed"))
+    }
+    object "A2_M_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                default {}
+            }
+            if callvalue()
+            {
+                $Abort(99)
+            }
+            {
+                A2_M_fallback() stop()
+            }
+            function A2_M_fallback() {
+                // return ()
+            }
+
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
diff --git a/third_party/move/evm/move-to-yul/tests/fallback-receive-test/FallbackPayableOnly.v2_exp b/third_party/move/evm/move-to-yul/tests/fallback-receive-test/FallbackPayableOnly.v2_exp
new file mode 100644
index 0000000000000..92a008b49e419
--- /dev/null
+++ b/third_party/move/evm/move-to-yul/tests/fallback-receive-test/FallbackPayableOnly.v2_exp
@@ -0,0 +1,35 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_M" {
+    code {
+        codecopy(0, dataoffset("A2_M_deployed"), datasize("A2_M_deployed"))
+        return(0, datasize("A2_M_deployed"))
+    }
+    object "A2_M_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                default {}
+            }
+            {
+                A2_M_fallback() stop()
+            }
+            function A2_M_fallback() {
+                // return ()
+            }
+
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
diff --git a/third_party/move/evm/move-to-yul/tests/fallback-receive-test/ReceiveFallback.v2_exp b/third_party/move/evm/move-to-yul/tests/fallback-receive-test/ReceiveFallback.v2_exp
new file mode 100644
index 0000000000000..c224229c604ea
--- /dev/null
+++ b/third_party/move/evm/move-to-yul/tests/fallback-receive-test/ReceiveFallback.v2_exp
@@ -0,0 +1,77 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_M" {
+    code {
+        codecopy(0, dataoffset("A2_M_deployed"), datasize("A2_M_deployed"))
+        return(0, datasize("A2_M_deployed"))
+    }
+    object "A2_M_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                default {}
+            }
+            {
+                if iszero(calldatasize()) { A2_M_receive() stop() }
+            }
+            if callvalue()
+            {
+                $Abort(99)
+            }
+            {
+                let retval := A2_M_fallback(0, calldatasize()) stop()
+                return(add(retval, 0x20), mload(retval))
+            }
+            function A2_M_receive() {
+                // return ()
+            }
+
+            function A2_M_fallback(x) -> $result {
+                let $t1, $t2
+                // $t1 := 1
+                $t1 := 1
+                // $t2 := +($t0, $t1)
+                $t2 := $AddU64(x, $t1)
+                // return $t2
+                $result := $t2
+            }
+
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $AbortBuiltin() {
+                $Abort(sub(0, 1))
+            }
+            function $AddU64(x, y) -> r {
+                if lt(sub(0xffffffffffffffff, x), y) { $AbortBuiltin() }
+                r := add(x, y)
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+        }
+    }
+}
+
+
+!! Errors compiling Yul
+
+Warning: Yul is still experimental. Please use the output with care.
+Warning: "switch" statement with only a default case.
+  --> <stdin>:17:17:
+   |
+17 |                 switch selector
+   |                 ^ (Relevant source part starts here and spans across multiple lines).
+
+Error: Function "A2_M_fallback" expects 1 arguments but got 2.
+  --> <stdin>:28:31:
+   |
+28 |                 let retval := A2_M_fallback(0, calldatasize()) stop()
+   |                               ^^^^^^^^^^^^^
diff --git a/third_party/move/evm/move-to-yul/tests/fallback-receive-test/ReceiveOnly.v2_exp b/third_party/move/evm/move-to-yul/tests/fallback-receive-test/ReceiveOnly.v2_exp
new file mode 100644
index 0000000000000..c7adf1a8a36e7
--- /dev/null
+++ b/third_party/move/evm/move-to-yul/tests/fallback-receive-test/ReceiveOnly.v2_exp
@@ -0,0 +1,40 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_M" {
+    code {
+        codecopy(0, dataoffset("A2_M_deployed"), datasize("A2_M_deployed"))
+        return(0, datasize("A2_M_deployed"))
+    }
+    object "A2_M_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                default {}
+            }
+            {
+                if iszero(calldatasize()) { A2_M_receive() stop() }
+            }
+            $Abort(98)
+            function A2_M_receive() {
+                // return ()
+            }
+
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
diff --git a/third_party/move/evm/move-to-yul/tests/fallback-receive-test/expect-failure/FallbackMultipleParams.v2_exp b/third_party/move/evm/move-to-yul/tests/fallback-receive-test/expect-failure/FallbackMultipleParams.v2_exp
new file mode 100644
index 0000000000000..1b35753d70b5c
--- /dev/null
+++ b/third_party/move/evm/move-to-yul/tests/fallback-receive-test/expect-failure/FallbackMultipleParams.v2_exp
@@ -0,0 +1,10 @@
+
+
+!! Move-To-Yul Diagnostics:
+ error: fallback function must have at most 1 parameter and 1 return value
+  ┌─ tests/fallback-receive-test/expect-failure/FallbackMultipleParams.move:5:2
+  │
+5 │ ╭     fun fallback(x: u64, y: u64): u64 {
+6 │ │         x + y
+7 │ │     }
+  │ ╰─────^
diff --git a/third_party/move/evm/move-to-yul/tests/fallback-receive-test/expect-failure/FallbackReciveFailure.v2_exp b/third_party/move/evm/move-to-yul/tests/fallback-receive-test/expect-failure/FallbackReciveFailure.v2_exp
new file mode 100644
index 0000000000000..02d8c4cac56c2
--- /dev/null
+++ b/third_party/move/evm/move-to-yul/tests/fallback-receive-test/expect-failure/FallbackReciveFailure.v2_exp
@@ -0,0 +1,18 @@
+
+
+!! Move-To-Yul Diagnostics:
+ error: only one #[fallback] function allowed per contract module
+   ┌─ tests/fallback-receive-test/expect-failure/FallbackReciveFailure.move:10:2
+   │
+10 │ ╭     fun receive(x: u64): u64 {
+11 │ │         x
+12 │ │     }
+   │ ╰─────^
+
+error: only one #[receive] function allowed per contract module
+   ┌─ tests/fallback-receive-test/expect-failure/FallbackReciveFailure.move:10:2
+   │
+10 │ ╭     fun receive(x: u64): u64 {
+11 │ │         x
+12 │ │     }
+   │ ╰─────^
diff --git a/third_party/move/evm/move-to-yul/tests/test-dispatcher/DispatcherArrayDecoding.v2_exp b/third_party/move/evm/move-to-yul/tests/test-dispatcher/DispatcherArrayDecoding.v2_exp
new file mode 100644
index 0000000000000..970b17cc61d8c
--- /dev/null
+++ b/third_party/move/evm/move-to-yul/tests/test-dispatcher/DispatcherArrayDecoding.v2_exp
@@ -0,0 +1,2302 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_M" {
+    code {
+        codecopy(0, dataoffset("A2_M_deployed"), datasize("A2_M_deployed"))
+        return(0, datasize("A2_M_deployed"))
+    }
+    object "A2_M_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                case 0x52044bf1
+                {
+                    // test_u64(uint64[2])
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint64_2_$_$vec$u64$$(4, calldatasize())
+                    let ret_0 := A2_M_test_array_u64(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint64$_$u64$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xf03cf98d
+                {
+                    // test_u8(uint8[2])
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint8_2_$_$vec$u8$$(4, calldatasize())
+                    let ret_0 := A2_M_test_array_u8(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint8$_$u8$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x5bbb1b40
+                {
+                    // test_uint16_u64(uint16[2][])
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint16_2___$_$vec$vec$u64$$$(4, calldatasize())
+                    let ret_0 := A2_M_test_array_uint16_u64(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint16$_$u64$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xaae0ca0b
+                {
+                    // test_uint72_u128(uint72[][2])
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint72___2_$_$vec$vec$u128$$$(4, calldatasize())
+                    let ret_0 := A2_M_test_array_uint72_u128(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint72$_$u128$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xeb158528
+                {
+                    // test_uint8_U256(uint8[2][])
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint8_2___$_$vec$vec$A2_U256_U256$$$(4, calldatasize())
+                    let ret_0 := A2_M_test_array_uint8_U256(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint8$_$A2_U256_U256$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x2baf810d
+                {
+                    // test_uint8_u64(uint8[2])
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint8_2_$_$vec$u64$$(4, calldatasize())
+                    let ret_0 := A2_M_test_array_uint8_u64(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint8$_$u64$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x77689027
+                {
+                    // test_u64(uint64[2][2])
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint64_2__2_$_$vec$vec$u64$$$(4, calldatasize())
+                    let ret_0 := A2_M_test_one_elem_para_array_2_array_2_u64(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint64$_$u64$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xecefc49c
+                {
+                    // test_u8(uint8[2][2])
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint8_2__2_$_$vec$vec$u8$$$(4, calldatasize())
+                    let ret_0 := A2_M_test_one_elem_para_array_2_array_2_u8(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint8$_$u8$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x4c976153
+                {
+                    // test_u256(uint256[][2])
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint256___2_$_$vec$vec$A2_U256_U256$$$(4, calldatasize())
+                    let ret_0 := A2_M_test_one_elem_para_array_2_array_dynamic_u256(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint256$_$A2_U256_U256$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x17041a2e
+                {
+                    // test_u64(uint64[][2])
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint64___2_$_$vec$vec$u64$$$(4, calldatasize())
+                    let ret_0 := A2_M_test_one_elem_para_array_2_array_dynamic_u64(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint64$_$u64$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x3b09967a
+                {
+                    // test_u8(uint8[][2])
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint8___2_$_$vec$vec$u8$$$(4, calldatasize())
+                    let ret_0 := A2_M_test_one_elem_para_array_2_array_dynamic_u8(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint8$_$u8$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x374cb568
+                {
+                    // test_u256(uint256[2][])
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint256_2___$_$vec$vec$A2_U256_U256$$$(4, calldatasize())
+                    let ret_0 := A2_M_test_one_elem_para_array_dynamic_array_2_u256(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint256$_$A2_U256_U256$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x6a829009
+                {
+                    // test_u64(uint64[2][])
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint64_2___$_$vec$vec$u64$$$(4, calldatasize())
+                    let ret_0 := A2_M_test_one_elem_para_array_dynamic_array_2_u64(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint64$_$u64$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x43ed1d2f
+                {
+                    // test_u8(uint8[2][])
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint8_2___$_$vec$vec$u8$$$(4, calldatasize())
+                    let ret_0 := A2_M_test_one_elem_para_array_dynamic_array_2_u8(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint8$_$u8$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x14fda38d
+                {
+                    // test_u128(uint128[][])
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint128____$_$vec$vec$u128$$$(4, calldatasize())
+                    let ret_0 := A2_M_test_one_elem_para_array_dynamic_array_u128(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint128$_$u128$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                default {}
+            }
+            $Abort(97)
+            function A2_M_test_array_u64(v) -> $result {
+                let val_1, val_2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11
+                let $locals := $Malloc(32)
+                mstore($locals, v)
+                // $t3 := borrow_local($t0)
+                $t3 := $MakePtr(false, $locals)
+                // $t4 := 0
+                $t4 := 0
+                // $t5 := vector::borrow<u64>($t3, $t4)
+                $t5 := A1_vector_borrow$u64$($t3, $t4)
+                // $t6 := read_ref($t5)
+                $t6 := $LoadU64($t5)
+                // $t7 := borrow_local($t0)
+                $t7 := $MakePtr(false, $locals)
+                // $t8 := 1
+                $t8 := 1
+                // $t9 := vector::borrow<u64>($t7, $t8)
+                $t9 := A1_vector_borrow$u64$($t7, $t8)
+                // $t10 := read_ref($t9)
+                $t10 := $LoadU64($t9)
+                // $t11 := +($t6, $t10)
+                $t11 := $AddU64($t6, $t10)
+                // return $t11
+                $result := $t11
+                $Free($locals, 32)
+            }
+
+            function A2_M_test_array_u8(v) -> $result {
+                let val_1, val_2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11
+                let $locals := $Malloc(32)
+                mstore($locals, v)
+                // $t3 := borrow_local($t0)
+                $t3 := $MakePtr(false, $locals)
+                // $t4 := 0
+                $t4 := 0
+                // $t5 := vector::borrow<u8>($t3, $t4)
+                $t5 := A1_vector_borrow$u8$($t3, $t4)
+                // $t6 := read_ref($t5)
+                $t6 := $LoadU8($t5)
+                // $t7 := borrow_local($t0)
+                $t7 := $MakePtr(false, $locals)
+                // $t8 := 1
+                $t8 := 1
+                // $t9 := vector::borrow<u8>($t7, $t8)
+                $t9 := A1_vector_borrow$u8$($t7, $t8)
+                // $t10 := read_ref($t9)
+                $t10 := $LoadU8($t9)
+                // $t11 := +($t6, $t10)
+                $t11 := $AddU8($t6, $t10)
+                // return $t11
+                $result := $t11
+                $Free($locals, 32)
+            }
+
+            function A2_M_test_array_uint16_u64(v) -> $result {
+                let i, len_v, sum, vec, vec_val_1, vec_val_2, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21
+                let $locals := $Malloc(32)
+                mstore($locals, v)
+                let $block := 3
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L3
+                        // $t11 := <($t1, $t8)
+                        $t11 := $Lt(i, $t8)
+                        // if ($t11) goto L1 else goto L0
+                        switch $t11
+                        case 0  { $block := 5 }
+                        default { $block := 4 }
+                    }
+                    case 3 {
+                        // $t7 := borrow_local($t0)
+                        $t7 := $MakePtr(false, $locals)
+                        // $t8 := vector::length<vector<u64>>($t7)
+                        $t8 := A1_vector_length$vec$u64$$($t7)
+                        // $t9 := 0
+                        $t9 := 0
+                        // $t1 := $t9
+                        i := $t9
+                        // $t10 := 0
+                        $t10 := 0
+                        // $t3 := $t10
+                        sum := $t10
+                        // goto L3
+                        $block := 2
+                    }
+                    case 4 {
+                        // label L1
+                        // goto L2
+                        $block := 6
+                    }
+                    case 5 {
+                        // label L0
+                        // return $t3
+                        $result := sum
+                        $Free($locals, 32)
+                        leave
+                    }
+                    case 6 {
+                        // label L2
+                        // $t12 := borrow_local($t0)
+                        $t12 := $MakePtr(false, $locals)
+                        // $t13 := vector::borrow<vector<u64>>($t12, $t1)
+                        $t13 := A1_vector_borrow$vec$u64$$($t12, i)
+                        // $t14 := 0
+                        $t14 := 0
+                        // $t15 := vector::borrow<u64>($t13, $t14)
+                        $t15 := A1_vector_borrow$u64$($t13, $t14)
+                        // $t16 := read_ref($t15)
+                        $t16 := $LoadU64($t15)
+                        // $t17 := 1
+                        $t17 := 1
+                        // $t18 := vector::borrow<u64>($t13, $t17)
+                        $t18 := A1_vector_borrow$u64$($t13, $t17)
+                        // $t19 := read_ref($t18)
+                        $t19 := $LoadU64($t18)
+                        // $t20 := +($t3, $t16)
+                        $t20 := $AddU64(sum, $t16)
+                        // $t3 := +($t20, $t19)
+                        sum := $AddU64($t20, $t19)
+                        // $t21 := 1
+                        $t21 := 1
+                        // $t1 := +($t1, $t21)
+                        i := $AddU64(i, $t21)
+                        // goto L3
+                        $block := 2
+                    }
+                }
+            }
+
+            function A2_M_test_array_uint72_u128(v) -> $result {
+                let i, j, len_vec, sum, vec, vec_val, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19
+                let $locals := $Malloc(32)
+                mstore($locals, v)
+                let $block := 3
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L7
+                        // $t9 := 2
+                        $t9 := 2
+                        // $t10 := <($t1, $t9)
+                        $t10 := $Lt(i, $t9)
+                        // if ($t10) goto L1 else goto L0
+                        switch $t10
+                        case 0  { $block := 5 }
+                        default { $block := 4 }
+                    }
+                    case 3 {
+                        // $t7 := 0
+                        $t7 := 0
+                        // $t1 := $t7
+                        i := $t7
+                        // $t8 := 0
+                        $t8 := 0
+                        // $t4 := $t8
+                        sum := $t8
+                        // goto L7
+                        $block := 2
+                    }
+                    case 4 {
+                        // label L1
+                        // goto L2
+                        $block := 6
+                    }
+                    case 5 {
+                        // label L0
+                        // return $t4
+                        $result := sum
+                        $Free($locals, 32)
+                        leave
+                    }
+                    case 6 {
+                        // label L2
+                        // $t11 := borrow_local($t0)
+                        $t11 := $MakePtr(false, $locals)
+                        // $t12 := vector::borrow<vector<u128>>($t11, $t1)
+                        $t12 := A1_vector_borrow$vec$u128$$($t11, i)
+                        // $t13 := vector::length<u128>($t12)
+                        $t13 := A1_vector_length$u128$($t12)
+                        // $t14 := 0
+                        $t14 := 0
+                        // $t2 := $t14
+                        j := $t14
+                        // goto L6
+                        $block := 7
+                    }
+                    case 7 {
+                        // label L6
+                        // $t15 := <($t2, $t13)
+                        $t15 := $Lt(j, $t13)
+                        // if ($t15) goto L4 else goto L3
+                        switch $t15
+                        case 0  { $block := 9 }
+                        default { $block := 8 }
+                    }
+                    case 8 {
+                        // label L4
+                        // goto L5
+                        $block := 10
+                    }
+                    case 9 {
+                        // label L3
+                        // drop($t12)
+                        // $t19 := 1
+                        $t19 := 1
+                        // $t1 := +($t1, $t19)
+                        i := $AddU64(i, $t19)
+                        // goto L7
+                        $block := 2
+                    }
+                    case 10 {
+                        // label L5
+                        // $t16 := vector::borrow<u128>($t12, $t2)
+                        $t16 := A1_vector_borrow$u128$($t12, j)
+                        // $t17 := read_ref($t16)
+                        $t17 := $LoadU128($t16)
+                        // $t4 := +($t4, $t17)
+                        sum := $AddU128(sum, $t17)
+                        // $t18 := 1
+                        $t18 := 1
+                        // $t2 := +($t2, $t18)
+                        j := $AddU64(j, $t18)
+                        // goto L6
+                        $block := 7
+                    }
+                }
+            }
+
+            function A2_M_test_array_uint8_U256(v) -> $result {
+                let i, len_v, sum, vec, vec_val_1, vec_val_2, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20
+                let $locals := $Malloc(32)
+                mstore($locals, v)
+                let $block := 3
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L3
+                        // $t10 := <($t1, $t8)
+                        $t10 := $Lt(i, $t8)
+                        // if ($t10) goto L1 else goto L0
+                        switch $t10
+                        case 0  { $block := 5 }
+                        default { $block := 4 }
+                    }
+                    case 3 {
+                        // $t7 := borrow_local($t0)
+                        $t7 := $MakePtr(false, $locals)
+                        // $t8 := vector::length<vector<U256::U256>>($t7)
+                        $t8 := A1_vector_length$vec$A2_U256_U256$$($t7)
+                        // $t9 := 0
+                        $t9 := 0
+                        // $t1 := $t9
+                        i := $t9
+                        // $t3 := U256::zero()
+                        sum := A2_U256_zero()
+                        // goto L3
+                        $block := 2
+                    }
+                    case 4 {
+                        // label L1
+                        // goto L2
+                        $block := 6
+                    }
+                    case 5 {
+                        // label L0
+                        // return $t3
+                        $result := sum
+                        $Free($locals, 32)
+                        leave
+                    }
+                    case 6 {
+                        // label L2
+                        // $t11 := borrow_local($t0)
+                        $t11 := $MakePtr(false, $locals)
+                        // $t12 := vector::borrow<vector<U256::U256>>($t11, $t1)
+                        $t12 := A1_vector_borrow$vec$A2_U256_U256$$($t11, i)
+                        // $t13 := 0
+                        $t13 := 0
+                        // $t14 := vector::borrow<U256::U256>($t12, $t13)
+                        $t14 := A1_vector_borrow$A2_U256_U256$($t12, $t13)
+                        // $t15 := read_ref($t14)
+                        $t15 := $LoadU256($t14)
+                        // $t16 := 1
+                        $t16 := 1
+                        // $t17 := vector::borrow<U256::U256>($t12, $t16)
+                        $t17 := A1_vector_borrow$A2_U256_U256$($t12, $t16)
+                        // $t18 := read_ref($t17)
+                        $t18 := $LoadU256($t17)
+                        // $t19 := +($t15, $t18)
+                        $t19 := $AddU256($t15, $t18)
+                        // $t3 := +($t3, $t19)
+                        sum := $AddU256(sum, $t19)
+                        // $t20 := 1
+                        $t20 := 1
+                        // $t1 := +($t1, $t20)
+                        i := $AddU64(i, $t20)
+                        // goto L3
+                        $block := 2
+                    }
+                }
+            }
+
+            function A2_M_test_array_uint8_u64(v) -> $result {
+                let val_1, val_2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11
+                let $locals := $Malloc(32)
+                mstore($locals, v)
+                // $t3 := borrow_local($t0)
+                $t3 := $MakePtr(false, $locals)
+                // $t4 := 0
+                $t4 := 0
+                // $t5 := vector::borrow<u64>($t3, $t4)
+                $t5 := A1_vector_borrow$u64$($t3, $t4)
+                // $t6 := read_ref($t5)
+                $t6 := $LoadU64($t5)
+                // $t7 := borrow_local($t0)
+                $t7 := $MakePtr(false, $locals)
+                // $t8 := 1
+                $t8 := 1
+                // $t9 := vector::borrow<u64>($t7, $t8)
+                $t9 := A1_vector_borrow$u64$($t7, $t8)
+                // $t10 := read_ref($t9)
+                $t10 := $LoadU64($t9)
+                // $t11 := +($t6, $t10)
+                $t11 := $AddU64($t6, $t10)
+                // return $t11
+                $result := $t11
+                $Free($locals, 32)
+            }
+
+            function A2_M_test_one_elem_para_array_2_array_2_u64(v) -> $result {
+                let vec_1, vec_1_val_1, vec_1_val_2, vec_2, vec_2_val_1, vec_2_val_2, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27
+                let $locals := $Malloc(32)
+                mstore($locals, v)
+                // $t7 := borrow_local($t0)
+                $t7 := $MakePtr(false, $locals)
+                // $t8 := 0
+                $t8 := 0
+                // $t9 := vector::borrow<vector<u64>>($t7, $t8)
+                $t9 := A1_vector_borrow$vec$u64$$($t7, $t8)
+                // $t10 := borrow_local($t0)
+                $t10 := $MakePtr(false, $locals)
+                // $t11 := 1
+                $t11 := 1
+                // $t12 := vector::borrow<vector<u64>>($t10, $t11)
+                $t12 := A1_vector_borrow$vec$u64$$($t10, $t11)
+                // $t13 := 0
+                $t13 := 0
+                // $t14 := vector::borrow<u64>($t9, $t13)
+                $t14 := A1_vector_borrow$u64$($t9, $t13)
+                // $t15 := read_ref($t14)
+                $t15 := $LoadU64($t14)
+                // $t16 := 1
+                $t16 := 1
+                // $t17 := vector::borrow<u64>($t9, $t16)
+                $t17 := A1_vector_borrow$u64$($t9, $t16)
+                // $t18 := read_ref($t17)
+                $t18 := $LoadU64($t17)
+                // $t19 := 0
+                $t19 := 0
+                // $t20 := vector::borrow<u64>($t12, $t19)
+                $t20 := A1_vector_borrow$u64$($t12, $t19)
+                // $t21 := read_ref($t20)
+                $t21 := $LoadU64($t20)
+                // $t22 := 1
+                $t22 := 1
+                // $t23 := vector::borrow<u64>($t12, $t22)
+                $t23 := A1_vector_borrow$u64$($t12, $t22)
+                // $t24 := read_ref($t23)
+                $t24 := $LoadU64($t23)
+                // $t25 := +($t15, $t18)
+                $t25 := $AddU64($t15, $t18)
+                // $t26 := +($t25, $t21)
+                $t26 := $AddU64($t25, $t21)
+                // $t27 := +($t26, $t24)
+                $t27 := $AddU64($t26, $t24)
+                // return $t27
+                $result := $t27
+                $Free($locals, 32)
+            }
+
+            function A2_M_test_one_elem_para_array_2_array_2_u8(v) -> $result {
+                let vec_1, vec_1_val_1, vec_1_val_2, vec_2, vec_2_val_1, vec_2_val_2, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27
+                let $locals := $Malloc(32)
+                mstore($locals, v)
+                // $t7 := borrow_local($t0)
+                $t7 := $MakePtr(false, $locals)
+                // $t8 := 0
+                $t8 := 0
+                // $t9 := vector::borrow<vector<u8>>($t7, $t8)
+                $t9 := A1_vector_borrow$vec$u8$$($t7, $t8)
+                // $t10 := borrow_local($t0)
+                $t10 := $MakePtr(false, $locals)
+                // $t11 := 1
+                $t11 := 1
+                // $t12 := vector::borrow<vector<u8>>($t10, $t11)
+                $t12 := A1_vector_borrow$vec$u8$$($t10, $t11)
+                // $t13 := 0
+                $t13 := 0
+                // $t14 := vector::borrow<u8>($t9, $t13)
+                $t14 := A1_vector_borrow$u8$($t9, $t13)
+                // $t15 := read_ref($t14)
+                $t15 := $LoadU8($t14)
+                // $t16 := 1
+                $t16 := 1
+                // $t17 := vector::borrow<u8>($t9, $t16)
+                $t17 := A1_vector_borrow$u8$($t9, $t16)
+                // $t18 := read_ref($t17)
+                $t18 := $LoadU8($t17)
+                // $t19 := 0
+                $t19 := 0
+                // $t20 := vector::borrow<u8>($t12, $t19)
+                $t20 := A1_vector_borrow$u8$($t12, $t19)
+                // $t21 := read_ref($t20)
+                $t21 := $LoadU8($t20)
+                // $t22 := 1
+                $t22 := 1
+                // $t23 := vector::borrow<u8>($t12, $t22)
+                $t23 := A1_vector_borrow$u8$($t12, $t22)
+                // $t24 := read_ref($t23)
+                $t24 := $LoadU8($t23)
+                // $t25 := +($t15, $t18)
+                $t25 := $AddU8($t15, $t18)
+                // $t26 := +($t25, $t21)
+                $t26 := $AddU8($t25, $t21)
+                // $t27 := -($t26, $t24)
+                $t27 := $Sub($t26, $t24)
+                // return $t27
+                $result := $t27
+                $Free($locals, 32)
+            }
+
+            function A2_M_test_one_elem_para_array_2_array_dynamic_u256(v) -> $result {
+                let i, j, len_vec, sum, vec, vec_val, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18
+                let $locals := $Malloc(32)
+                mstore($locals, v)
+                let $block := 3
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L7
+                        // $t8 := 2
+                        $t8 := 2
+                        // $t9 := <($t1, $t8)
+                        $t9 := $Lt(i, $t8)
+                        // if ($t9) goto L1 else goto L0
+                        switch $t9
+                        case 0  { $block := 5 }
+                        default { $block := 4 }
+                    }
+                    case 3 {
+                        // $t7 := 0
+                        $t7 := 0
+                        // $t1 := $t7
+                        i := $t7
+                        // $t4 := U256::zero()
+                        sum := A2_U256_zero()
+                        // goto L7
+                        $block := 2
+                    }
+                    case 4 {
+                        // label L1
+                        // goto L2
+                        $block := 6
+                    }
+                    case 5 {
+                        // label L0
+                        // return $t4
+                        $result := sum
+                        $Free($locals, 32)
+                        leave
+                    }
+                    case 6 {
+                        // label L2
+                        // $t10 := borrow_local($t0)
+                        $t10 := $MakePtr(false, $locals)
+                        // $t11 := vector::borrow<vector<U256::U256>>($t10, $t1)
+                        $t11 := A1_vector_borrow$vec$A2_U256_U256$$($t10, i)
+                        // $t12 := vector::length<U256::U256>($t11)
+                        $t12 := A1_vector_length$A2_U256_U256$($t11)
+                        // $t13 := 0
+                        $t13 := 0
+                        // $t2 := $t13
+                        j := $t13
+                        // goto L6
+                        $block := 7
+                    }
+                    case 7 {
+                        // label L6
+                        // $t14 := <($t2, $t12)
+                        $t14 := $Lt(j, $t12)
+                        // if ($t14) goto L4 else goto L3
+                        switch $t14
+                        case 0  { $block := 9 }
+                        default { $block := 8 }
+                    }
+                    case 8 {
+                        // label L4
+                        // goto L5
+                        $block := 10
+                    }
+                    case 9 {
+                        // label L3
+                        // drop($t11)
+                        // $t18 := 1
+                        $t18 := 1
+                        // $t1 := +($t1, $t18)
+                        i := $AddU64(i, $t18)
+                        // goto L7
+                        $block := 2
+                    }
+                    case 10 {
+                        // label L5
+                        // $t15 := vector::borrow<U256::U256>($t11, $t2)
+                        $t15 := A1_vector_borrow$A2_U256_U256$($t11, j)
+                        // $t16 := read_ref($t15)
+                        $t16 := $LoadU256($t15)
+                        // $t4 := +($t4, $t16)
+                        sum := $AddU256(sum, $t16)
+                        // $t17 := 1
+                        $t17 := 1
+                        // $t2 := +($t2, $t17)
+                        j := $AddU64(j, $t17)
+                        // goto L6
+                        $block := 7
+                    }
+                }
+            }
+
+            function A2_M_test_one_elem_para_array_2_array_dynamic_u64(v) -> $result {
+                let i, j, len_vec, sum, vec, vec_val, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19
+                let $locals := $Malloc(32)
+                mstore($locals, v)
+                let $block := 3
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L7
+                        // $t9 := 2
+                        $t9 := 2
+                        // $t10 := <($t1, $t9)
+                        $t10 := $Lt(i, $t9)
+                        // if ($t10) goto L1 else goto L0
+                        switch $t10
+                        case 0  { $block := 5 }
+                        default { $block := 4 }
+                    }
+                    case 3 {
+                        // $t7 := 0
+                        $t7 := 0
+                        // $t1 := $t7
+                        i := $t7
+                        // $t8 := 0
+                        $t8 := 0
+                        // $t4 := $t8
+                        sum := $t8
+                        // goto L7
+                        $block := 2
+                    }
+                    case 4 {
+                        // label L1
+                        // goto L2
+                        $block := 6
+                    }
+                    case 5 {
+                        // label L0
+                        // return $t4
+                        $result := sum
+                        $Free($locals, 32)
+                        leave
+                    }
+                    case 6 {
+                        // label L2
+                        // $t11 := borrow_local($t0)
+                        $t11 := $MakePtr(false, $locals)
+                        // $t12 := vector::borrow<vector<u64>>($t11, $t1)
+                        $t12 := A1_vector_borrow$vec$u64$$($t11, i)
+                        // $t13 := vector::length<u64>($t12)
+                        $t13 := A1_vector_length$u64$($t12)
+                        // $t14 := 0
+                        $t14 := 0
+                        // $t2 := $t14
+                        j := $t14
+                        // goto L6
+                        $block := 7
+                    }
+                    case 7 {
+                        // label L6
+                        // $t15 := <($t2, $t13)
+                        $t15 := $Lt(j, $t13)
+                        // if ($t15) goto L4 else goto L3
+                        switch $t15
+                        case 0  { $block := 9 }
+                        default { $block := 8 }
+                    }
+                    case 8 {
+                        // label L4
+                        // goto L5
+                        $block := 10
+                    }
+                    case 9 {
+                        // label L3
+                        // drop($t12)
+                        // $t19 := 1
+                        $t19 := 1
+                        // $t1 := +($t1, $t19)
+                        i := $AddU64(i, $t19)
+                        // goto L7
+                        $block := 2
+                    }
+                    case 10 {
+                        // label L5
+                        // $t16 := vector::borrow<u64>($t12, $t2)
+                        $t16 := A1_vector_borrow$u64$($t12, j)
+                        // $t17 := read_ref($t16)
+                        $t17 := $LoadU64($t16)
+                        // $t4 := +($t4, $t17)
+                        sum := $AddU64(sum, $t17)
+                        // $t18 := 1
+                        $t18 := 1
+                        // $t2 := +($t2, $t18)
+                        j := $AddU64(j, $t18)
+                        // goto L6
+                        $block := 7
+                    }
+                }
+            }
+
+            function A2_M_test_one_elem_para_array_2_array_dynamic_u8(v) -> $result {
+                let i, j, len_vec, sum, vec, vec_val, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19
+                let $locals := $Malloc(32)
+                mstore($locals, v)
+                let $block := 3
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L7
+                        // $t9 := 2
+                        $t9 := 2
+                        // $t10 := <($t1, $t9)
+                        $t10 := $Lt(i, $t9)
+                        // if ($t10) goto L1 else goto L0
+                        switch $t10
+                        case 0  { $block := 5 }
+                        default { $block := 4 }
+                    }
+                    case 3 {
+                        // $t7 := 0
+                        $t7 := 0
+                        // $t1 := $t7
+                        i := $t7
+                        // $t8 := 0
+                        $t8 := 0
+                        // $t4 := $t8
+                        sum := $t8
+                        // goto L7
+                        $block := 2
+                    }
+                    case 4 {
+                        // label L1
+                        // goto L2
+                        $block := 6
+                    }
+                    case 5 {
+                        // label L0
+                        // return $t4
+                        $result := sum
+                        $Free($locals, 32)
+                        leave
+                    }
+                    case 6 {
+                        // label L2
+                        // $t11 := borrow_local($t0)
+                        $t11 := $MakePtr(false, $locals)
+                        // $t12 := vector::borrow<vector<u8>>($t11, $t1)
+                        $t12 := A1_vector_borrow$vec$u8$$($t11, i)
+                        // $t13 := vector::length<u8>($t12)
+                        $t13 := A1_vector_length$u8$($t12)
+                        // $t14 := 0
+                        $t14 := 0
+                        // $t2 := $t14
+                        j := $t14
+                        // goto L6
+                        $block := 7
+                    }
+                    case 7 {
+                        // label L6
+                        // $t15 := <($t2, $t13)
+                        $t15 := $Lt(j, $t13)
+                        // if ($t15) goto L4 else goto L3
+                        switch $t15
+                        case 0  { $block := 9 }
+                        default { $block := 8 }
+                    }
+                    case 8 {
+                        // label L4
+                        // goto L5
+                        $block := 10
+                    }
+                    case 9 {
+                        // label L3
+                        // drop($t12)
+                        // $t19 := 1
+                        $t19 := 1
+                        // $t1 := +($t1, $t19)
+                        i := $AddU64(i, $t19)
+                        // goto L7
+                        $block := 2
+                    }
+                    case 10 {
+                        // label L5
+                        // $t16 := vector::borrow<u8>($t12, $t2)
+                        $t16 := A1_vector_borrow$u8$($t12, j)
+                        // $t17 := read_ref($t16)
+                        $t17 := $LoadU8($t16)
+                        // $t4 := +($t4, $t17)
+                        sum := $AddU8(sum, $t17)
+                        // $t18 := 1
+                        $t18 := 1
+                        // $t2 := +($t2, $t18)
+                        j := $AddU64(j, $t18)
+                        // goto L6
+                        $block := 7
+                    }
+                }
+            }
+
+            function A2_M_test_one_elem_para_array_dynamic_array_2_u256(v) -> $result {
+                let i, len_v, sum, vec, vec_val_1, vec_val_2, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20
+                let $locals := $Malloc(32)
+                mstore($locals, v)
+                let $block := 3
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L3
+                        // $t10 := <($t1, $t8)
+                        $t10 := $Lt(i, $t8)
+                        // if ($t10) goto L1 else goto L0
+                        switch $t10
+                        case 0  { $block := 5 }
+                        default { $block := 4 }
+                    }
+                    case 3 {
+                        // $t7 := borrow_local($t0)
+                        $t7 := $MakePtr(false, $locals)
+                        // $t8 := vector::length<vector<U256::U256>>($t7)
+                        $t8 := A1_vector_length$vec$A2_U256_U256$$($t7)
+                        // $t9 := 0
+                        $t9 := 0
+                        // $t1 := $t9
+                        i := $t9
+                        // $t3 := U256::zero()
+                        sum := A2_U256_zero()
+                        // goto L3
+                        $block := 2
+                    }
+                    case 4 {
+                        // label L1
+                        // goto L2
+                        $block := 6
+                    }
+                    case 5 {
+                        // label L0
+                        // return $t3
+                        $result := sum
+                        $Free($locals, 32)
+                        leave
+                    }
+                    case 6 {
+                        // label L2
+                        // $t11 := borrow_local($t0)
+                        $t11 := $MakePtr(false, $locals)
+                        // $t12 := vector::borrow<vector<U256::U256>>($t11, $t1)
+                        $t12 := A1_vector_borrow$vec$A2_U256_U256$$($t11, i)
+                        // $t13 := 0
+                        $t13 := 0
+                        // $t14 := vector::borrow<U256::U256>($t12, $t13)
+                        $t14 := A1_vector_borrow$A2_U256_U256$($t12, $t13)
+                        // $t15 := read_ref($t14)
+                        $t15 := $LoadU256($t14)
+                        // $t16 := 1
+                        $t16 := 1
+                        // $t17 := vector::borrow<U256::U256>($t12, $t16)
+                        $t17 := A1_vector_borrow$A2_U256_U256$($t12, $t16)
+                        // $t18 := read_ref($t17)
+                        $t18 := $LoadU256($t17)
+                        // $t19 := +($t15, $t18)
+                        $t19 := $AddU256($t15, $t18)
+                        // $t3 := +($t3, $t19)
+                        sum := $AddU256(sum, $t19)
+                        // $t20 := 1
+                        $t20 := 1
+                        // $t1 := +($t1, $t20)
+                        i := $AddU64(i, $t20)
+                        // goto L3
+                        $block := 2
+                    }
+                }
+            }
+
+            function A2_M_test_one_elem_para_array_dynamic_array_2_u64(v) -> $result {
+                let i, len_v, sum, vec, vec_val_1, vec_val_2, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21
+                let $locals := $Malloc(32)
+                mstore($locals, v)
+                let $block := 3
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L3
+                        // $t11 := <($t1, $t8)
+                        $t11 := $Lt(i, $t8)
+                        // if ($t11) goto L1 else goto L0
+                        switch $t11
+                        case 0  { $block := 5 }
+                        default { $block := 4 }
+                    }
+                    case 3 {
+                        // $t7 := borrow_local($t0)
+                        $t7 := $MakePtr(false, $locals)
+                        // $t8 := vector::length<vector<u64>>($t7)
+                        $t8 := A1_vector_length$vec$u64$$($t7)
+                        // $t9 := 0
+                        $t9 := 0
+                        // $t1 := $t9
+                        i := $t9
+                        // $t10 := 0
+                        $t10 := 0
+                        // $t3 := $t10
+                        sum := $t10
+                        // goto L3
+                        $block := 2
+                    }
+                    case 4 {
+                        // label L1
+                        // goto L2
+                        $block := 6
+                    }
+                    case 5 {
+                        // label L0
+                        // return $t3
+                        $result := sum
+                        $Free($locals, 32)
+                        leave
+                    }
+                    case 6 {
+                        // label L2
+                        // $t12 := borrow_local($t0)
+                        $t12 := $MakePtr(false, $locals)
+                        // $t13 := vector::borrow<vector<u64>>($t12, $t1)
+                        $t13 := A1_vector_borrow$vec$u64$$($t12, i)
+                        // $t14 := 0
+                        $t14 := 0
+                        // $t15 := vector::borrow<u64>($t13, $t14)
+                        $t15 := A1_vector_borrow$u64$($t13, $t14)
+                        // $t16 := read_ref($t15)
+                        $t16 := $LoadU64($t15)
+                        // $t17 := 1
+                        $t17 := 1
+                        // $t18 := vector::borrow<u64>($t13, $t17)
+                        $t18 := A1_vector_borrow$u64$($t13, $t17)
+                        // $t19 := read_ref($t18)
+                        $t19 := $LoadU64($t18)
+                        // $t20 := +($t3, $t16)
+                        $t20 := $AddU64(sum, $t16)
+                        // $t3 := +($t20, $t19)
+                        sum := $AddU64($t20, $t19)
+                        // $t21 := 1
+                        $t21 := 1
+                        // $t1 := +($t1, $t21)
+                        i := $AddU64(i, $t21)
+                        // goto L3
+                        $block := 2
+                    }
+                }
+            }
+
+            function A2_M_test_one_elem_para_array_dynamic_array_2_u8(v) -> $result {
+                let i, len_v, sum, vec, vec_val_1, vec_val_2, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21
+                let $locals := $Malloc(32)
+                mstore($locals, v)
+                let $block := 3
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L3
+                        // $t11 := <($t1, $t8)
+                        $t11 := $Lt(i, $t8)
+                        // if ($t11) goto L1 else goto L0
+                        switch $t11
+                        case 0  { $block := 5 }
+                        default { $block := 4 }
+                    }
+                    case 3 {
+                        // $t7 := borrow_local($t0)
+                        $t7 := $MakePtr(false, $locals)
+                        // $t8 := vector::length<vector<u8>>($t7)
+                        $t8 := A1_vector_length$vec$u8$$($t7)
+                        // $t9 := 0
+                        $t9 := 0
+                        // $t1 := $t9
+                        i := $t9
+                        // $t10 := 0
+                        $t10 := 0
+                        // $t3 := $t10
+                        sum := $t10
+                        // goto L3
+                        $block := 2
+                    }
+                    case 4 {
+                        // label L1
+                        // goto L2
+                        $block := 6
+                    }
+                    case 5 {
+                        // label L0
+                        // return $t3
+                        $result := sum
+                        $Free($locals, 32)
+                        leave
+                    }
+                    case 6 {
+                        // label L2
+                        // $t12 := borrow_local($t0)
+                        $t12 := $MakePtr(false, $locals)
+                        // $t13 := vector::borrow<vector<u8>>($t12, $t1)
+                        $t13 := A1_vector_borrow$vec$u8$$($t12, i)
+                        // $t14 := 0
+                        $t14 := 0
+                        // $t15 := vector::borrow<u8>($t13, $t14)
+                        $t15 := A1_vector_borrow$u8$($t13, $t14)
+                        // $t16 := read_ref($t15)
+                        $t16 := $LoadU8($t15)
+                        // $t17 := 1
+                        $t17 := 1
+                        // $t18 := vector::borrow<u8>($t13, $t17)
+                        $t18 := A1_vector_borrow$u8$($t13, $t17)
+                        // $t19 := read_ref($t18)
+                        $t19 := $LoadU8($t18)
+                        // $t20 := +($t3, $t16)
+                        $t20 := $AddU8(sum, $t16)
+                        // $t3 := +($t20, $t19)
+                        sum := $AddU8($t20, $t19)
+                        // $t21 := 1
+                        $t21 := 1
+                        // $t1 := +($t1, $t21)
+                        i := $AddU64(i, $t21)
+                        // goto L3
+                        $block := 2
+                    }
+                }
+            }
+
+            function A2_M_test_one_elem_para_array_dynamic_array_u128(v) -> $result {
+                let i, j, len_v, sum, vec, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19
+                let $locals := $Malloc(32)
+                mstore($locals, v)
+                let $block := 3
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L7
+                        // $t10 := <($t1, $t7)
+                        $t10 := $Lt(i, $t7)
+                        // if ($t10) goto L1 else goto L0
+                        switch $t10
+                        case 0  { $block := 5 }
+                        default { $block := 4 }
+                    }
+                    case 3 {
+                        // $t6 := borrow_local($t0)
+                        $t6 := $MakePtr(false, $locals)
+                        // $t7 := vector::length<vector<u128>>($t6)
+                        $t7 := A1_vector_length$vec$u128$$($t6)
+                        // $t8 := 0
+                        $t8 := 0
+                        // $t1 := $t8
+                        i := $t8
+                        // $t9 := 0
+                        $t9 := 0
+                        // $t4 := $t9
+                        sum := $t9
+                        // goto L7
+                        $block := 2
+                    }
+                    case 4 {
+                        // label L1
+                        // goto L2
+                        $block := 6
+                    }
+                    case 5 {
+                        // label L0
+                        // return $t4
+                        $result := sum
+                        $Free($locals, 32)
+                        leave
+                    }
+                    case 6 {
+                        // label L2
+                        // $t11 := borrow_local($t0)
+                        $t11 := $MakePtr(false, $locals)
+                        // $t12 := vector::borrow<vector<u128>>($t11, $t1)
+                        $t12 := A1_vector_borrow$vec$u128$$($t11, i)
+                        // $t13 := 0
+                        $t13 := 0
+                        // $t2 := $t13
+                        j := $t13
+                        // goto L6
+                        $block := 7
+                    }
+                    case 7 {
+                        // label L6
+                        // $t14 := vector::length<u128>($t12)
+                        $t14 := A1_vector_length$u128$($t12)
+                        // $t15 := <($t2, $t14)
+                        $t15 := $Lt(j, $t14)
+                        // if ($t15) goto L4 else goto L3
+                        switch $t15
+                        case 0  { $block := 9 }
+                        default { $block := 8 }
+                    }
+                    case 8 {
+                        // label L4
+                        // goto L5
+                        $block := 10
+                    }
+                    case 9 {
+                        // label L3
+                        // drop($t12)
+                        // $t19 := 1
+                        $t19 := 1
+                        // $t1 := +($t1, $t19)
+                        i := $AddU64(i, $t19)
+                        // goto L7
+                        $block := 2
+                    }
+                    case 10 {
+                        // label L5
+                        // $t16 := vector::borrow<u128>($t12, $t2)
+                        $t16 := A1_vector_borrow$u128$($t12, j)
+                        // $t17 := read_ref($t16)
+                        $t17 := $LoadU128($t16)
+                        // $t4 := +($t4, $t17)
+                        sum := $AddU128(sum, $t17)
+                        // $t18 := 1
+                        $t18 := 1
+                        // $t2 := +($t2, $t18)
+                        j := $AddU64(j, $t18)
+                        // goto L6
+                        $block := 7
+                    }
+                }
+            }
+
+            function A1_vector_borrow$u128$(v_ref, i) -> e_ptr {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                let size := $LoadU64(v_ptr)
+                if $GtEq(i, size) { $AbortBuiltin() }
+                e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 16)))
+            }
+            function A1_vector_length$u128$(v_ref) -> len {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                len := $LoadU64(v_ptr)
+            }
+            function A1_vector_borrow$vec$u128$$(v_ref, i) -> e_ptr {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                let size := $LoadU64(v_ptr)
+                if $GtEq(i, size) { $AbortBuiltin() }
+                e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 32)))
+            }
+            function A1_vector_length$vec$u128$$(v_ref) -> len {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                len := $LoadU64(v_ptr)
+            }
+            function A1_vector_borrow$u8$(v_ref, i) -> e_ptr {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                let size := $LoadU64(v_ptr)
+                if $GtEq(i, size) { $AbortBuiltin() }
+                e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 1)))
+            }
+            function A1_vector_borrow$vec$u8$$(v_ref, i) -> e_ptr {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                let size := $LoadU64(v_ptr)
+                if $GtEq(i, size) { $AbortBuiltin() }
+                e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 32)))
+            }
+            function A1_vector_length$vec$u8$$(v_ref) -> len {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                len := $LoadU64(v_ptr)
+            }
+            function A1_vector_borrow$u64$(v_ref, i) -> e_ptr {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                let size := $LoadU64(v_ptr)
+                if $GtEq(i, size) { $AbortBuiltin() }
+                e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 8)))
+            }
+            function A1_vector_borrow$vec$u64$$(v_ref, i) -> e_ptr {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                let size := $LoadU64(v_ptr)
+                if $GtEq(i, size) { $AbortBuiltin() }
+                e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 32)))
+            }
+            function A1_vector_length$vec$u64$$(v_ref) -> len {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                len := $LoadU64(v_ptr)
+            }
+            function A1_vector_borrow$A2_U256_U256$(v_ref, i) -> e_ptr {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                let size := $LoadU64(v_ptr)
+                if $GtEq(i, size) { $AbortBuiltin() }
+                e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 32)))
+            }
+            function A1_vector_borrow$vec$A2_U256_U256$$(v_ref, i) -> e_ptr {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                let size := $LoadU64(v_ptr)
+                if $GtEq(i, size) { $AbortBuiltin() }
+                e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 32)))
+            }
+            function A2_U256_zero() -> $result {
+                let $t0
+                // $t0 := 0
+                $t0 := 0
+                // return $t0
+                $result := $t0
+            }
+
+            function A1_vector_length$vec$A2_U256_U256$$(v_ref) -> len {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                len := $LoadU64(v_ptr)
+            }
+            function A1_vector_length$u8$(v_ref) -> len {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                len := $LoadU64(v_ptr)
+            }
+            function A1_vector_length$u64$(v_ref) -> len {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                len := $LoadU64(v_ptr)
+            }
+            function A1_vector_length$A2_U256_U256$(v_ref) -> len {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                len := $LoadU64(v_ptr)
+            }
+            function abi_encode_tuple_$uint128$_$u128$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_uint128(value_0, add(headStart, 0))
+            }
+            function abi_encode_uint128(value, pos) {
+                mstore(pos, cleanup_uint128(value))
+            }
+            function cleanup_uint128(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffffffffffffffffffff)
+            }
+            function abi_decode_tuple_$uint128____$_$vec$vec$u128$$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_uint128_____vec$vec$u128$$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint128_____vec$vec$u128$$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(32, length), 32)
+                array := abi_decode_available_length__uint128_____vec$vec$u128$$(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__uint128_____vec$vec$u128$$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let innerOffset := calldataload(src)
+                    if gt(innerOffset, 0xffffffffffffffff) { $Abort(94) }
+                    let elementPos := add(offset, innerOffset)
+                    let value := abi_decode_uint128___vec$u128$(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode_uint128___vec$u128$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(16, length), 32)
+                array := abi_decode_available_length__uint128___vec$u128$(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__uint128___vec$u128$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint128(elementPos, end)
+                    $MemoryStoreU128(dst, value)
+                    dst := add(dst, 16)
+                }
+            }
+            function abi_decode_uint128(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint128(value)
+            }
+            function validator_uint128(value) {
+                if iszero(eq(value, cleanup_uint128(value))) { $Abort(95) }
+            }
+            function abi_encode_tuple_$uint8$_$u8$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_uint8(value_0, add(headStart, 0))
+            }
+            function abi_encode_uint8(value, pos) {
+                mstore(pos, cleanup_uint8(value))
+            }
+            function cleanup_uint8(value) -> cleaned {
+                cleaned := and(value, 0xff)
+            }
+            function abi_decode_tuple_$uint8_2___$_$vec$vec$u8$$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_uint8_2____vec$vec$u8$$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint8_2____vec$vec$u8$$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(32, length), 32)
+                array := abi_decode_available_length__uint8_2____vec$vec$u8$$(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__uint8_2____vec$vec$u8$$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 64))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 64) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint8_2__vec$u8$(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode_uint8_2__vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 2
+                let size := 34
+                array := abi_decode_available_length__uint8_2__vec$u8$(offset, length, size, end)
+            }
+            function abi_decode_available_length__uint8_2__vec$u8$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint8(elementPos, end)
+                    $MemoryStoreU8(dst, value)
+                    dst := add(dst, 1)
+                }
+            }
+            function abi_decode_uint8(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint8(value)
+            }
+            function validator_uint8(value) {
+                if iszero(eq(value, cleanup_uint8(value))) { $Abort(95) }
+            }
+            function abi_encode_tuple_$uint64$_$u64$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_uint64(value_0, add(headStart, 0))
+            }
+            function abi_encode_uint64(value, pos) {
+                mstore(pos, cleanup_uint64(value))
+            }
+            function cleanup_uint64(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffff)
+            }
+            function abi_decode_tuple_$uint64_2___$_$vec$vec$u64$$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_uint64_2____vec$vec$u64$$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint64_2____vec$vec$u64$$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(32, length), 32)
+                array := abi_decode_available_length__uint64_2____vec$vec$u64$$(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__uint64_2____vec$vec$u64$$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 64))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 64) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint64_2__vec$u64$(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode_uint64_2__vec$u64$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 2
+                let size := 48
+                array := abi_decode_available_length__uint64_2__vec$u64$(offset, length, size, end)
+            }
+            function abi_decode_available_length__uint64_2__vec$u64$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint64(elementPos, end)
+                    $MemoryStoreU64(dst, value)
+                    dst := add(dst, 8)
+                }
+            }
+            function abi_decode_uint64(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint64(value)
+            }
+            function validator_uint64(value) {
+                if iszero(eq(value, cleanup_uint64(value))) { $Abort(95) }
+            }
+            function abi_encode_tuple_$uint256$_$A2_U256_U256$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_uint256(value_0, add(headStart, 0))
+            }
+            function abi_encode_uint256(value, pos) {
+                mstore(pos, cleanup_uint256(value))
+            }
+            function cleanup_uint256(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)
+            }
+            function abi_decode_tuple_$uint256_2___$_$vec$vec$A2_U256_U256$$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_uint256_2____vec$vec$A2_U256_U256$$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint256_2____vec$vec$A2_U256_U256$$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(32, length), 32)
+                array := abi_decode_available_length__uint256_2____vec$vec$A2_U256_U256$$(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__uint256_2____vec$vec$A2_U256_U256$$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 64))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 64) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint256_2__vec$A2_U256_U256$(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode_uint256_2__vec$A2_U256_U256$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 2
+                let size := 96
+                array := abi_decode_available_length__uint256_2__vec$A2_U256_U256$(offset, length, size, end)
+            }
+            function abi_decode_available_length__uint256_2__vec$A2_U256_U256$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint256(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode_uint256(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint256(value)
+            }
+            function validator_uint256(value) {
+                if iszero(eq(value, cleanup_uint256(value))) { $Abort(95) }
+            }
+            function abi_decode_tuple_$uint8___2_$_$vec$vec$u8$$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_uint8___2__vec$vec$u8$$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint8___2__vec$vec$u8$$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 2
+                let size := 96
+                array := abi_decode_available_length__uint8___2__vec$vec$u8$$(offset, length, size, end)
+            }
+            function abi_decode_available_length__uint8___2__vec$vec$u8$$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let innerOffset := calldataload(src)
+                    if gt(innerOffset, 0xffffffffffffffff) { $Abort(94) }
+                    let elementPos := add(offset, innerOffset)
+                    let value := abi_decode_uint8___vec$u8$(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode_uint8___vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(1, length), 32)
+                array := abi_decode_available_length__uint8___vec$u8$(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__uint8___vec$u8$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint8(elementPos, end)
+                    $MemoryStoreU8(dst, value)
+                    dst := add(dst, 1)
+                }
+            }
+            function abi_decode_tuple_$uint64___2_$_$vec$vec$u64$$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_uint64___2__vec$vec$u64$$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint64___2__vec$vec$u64$$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 2
+                let size := 96
+                array := abi_decode_available_length__uint64___2__vec$vec$u64$$(offset, length, size, end)
+            }
+            function abi_decode_available_length__uint64___2__vec$vec$u64$$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let innerOffset := calldataload(src)
+                    if gt(innerOffset, 0xffffffffffffffff) { $Abort(94) }
+                    let elementPos := add(offset, innerOffset)
+                    let value := abi_decode_uint64___vec$u64$(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode_uint64___vec$u64$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(8, length), 32)
+                array := abi_decode_available_length__uint64___vec$u64$(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__uint64___vec$u64$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint64(elementPos, end)
+                    $MemoryStoreU64(dst, value)
+                    dst := add(dst, 8)
+                }
+            }
+            function abi_decode_tuple_$uint256___2_$_$vec$vec$A2_U256_U256$$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_uint256___2__vec$vec$A2_U256_U256$$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint256___2__vec$vec$A2_U256_U256$$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 2
+                let size := 96
+                array := abi_decode_available_length__uint256___2__vec$vec$A2_U256_U256$$(offset, length, size, end)
+            }
+            function abi_decode_available_length__uint256___2__vec$vec$A2_U256_U256$$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let innerOffset := calldataload(src)
+                    if gt(innerOffset, 0xffffffffffffffff) { $Abort(94) }
+                    let elementPos := add(offset, innerOffset)
+                    let value := abi_decode_uint256___vec$A2_U256_U256$(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode_uint256___vec$A2_U256_U256$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(32, length), 32)
+                array := abi_decode_available_length__uint256___vec$A2_U256_U256$(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__uint256___vec$A2_U256_U256$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint256(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode_tuple_$uint8_2__2_$_$vec$vec$u8$$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 128) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_uint8_2__2__vec$vec$u8$$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint8_2__2__vec$vec$u8$$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 2
+                let size := 96
+                array := abi_decode_available_length__uint8_2__2__vec$vec$u8$$(offset, length, size, end)
+            }
+            function abi_decode_available_length__uint8_2__2__vec$vec$u8$$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 64))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 64) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint8_2__vec$u8$(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode_tuple_$uint64_2__2_$_$vec$vec$u64$$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 128) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_uint64_2__2__vec$vec$u64$$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint64_2__2__vec$vec$u64$$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 2
+                let size := 96
+                array := abi_decode_available_length__uint64_2__2__vec$vec$u64$$(offset, length, size, end)
+            }
+            function abi_decode_available_length__uint64_2__2__vec$vec$u64$$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 64))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 64) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint64_2__vec$u64$(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_encode_tuple_$uint8$_$u64$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_uint8(value_0, add(headStart, 0))
+            }
+            function abi_decode_tuple_$uint8_2_$_$vec$u64$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_uint8_2__vec$u64$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint8_2__vec$u64$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 2
+                let size := 48
+                array := abi_decode_available_length__uint8_2__vec$u64$(offset, length, size, end)
+            }
+            function abi_decode_available_length__uint8_2__vec$u64$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint8(elementPos, end)
+                    $MemoryStoreU64(dst, value)
+                    dst := add(dst, 8)
+                }
+            }
+            function abi_encode_tuple_$uint8$_$A2_U256_U256$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_uint8(value_0, add(headStart, 0))
+            }
+            function abi_decode_tuple_$uint8_2___$_$vec$vec$A2_U256_U256$$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_uint8_2____vec$vec$A2_U256_U256$$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint8_2____vec$vec$A2_U256_U256$$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(32, length), 32)
+                array := abi_decode_available_length__uint8_2____vec$vec$A2_U256_U256$$(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__uint8_2____vec$vec$A2_U256_U256$$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 64))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 64) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint8_2__vec$A2_U256_U256$(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode_uint8_2__vec$A2_U256_U256$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 2
+                let size := 96
+                array := abi_decode_available_length__uint8_2__vec$A2_U256_U256$(offset, length, size, end)
+            }
+            function abi_decode_available_length__uint8_2__vec$A2_U256_U256$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint8(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_encode_tuple_$uint72$_$u128$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_uint72(value_0, add(headStart, 0))
+            }
+            function abi_encode_uint72(value, pos) {
+                mstore(pos, cleanup_uint72(value))
+            }
+            function cleanup_uint72(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffffff)
+            }
+            function abi_decode_tuple_$uint72___2_$_$vec$vec$u128$$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_uint72___2__vec$vec$u128$$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint72___2__vec$vec$u128$$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 2
+                let size := 96
+                array := abi_decode_available_length__uint72___2__vec$vec$u128$$(offset, length, size, end)
+            }
+            function abi_decode_available_length__uint72___2__vec$vec$u128$$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let innerOffset := calldataload(src)
+                    if gt(innerOffset, 0xffffffffffffffff) { $Abort(94) }
+                    let elementPos := add(offset, innerOffset)
+                    let value := abi_decode_uint72___vec$u128$(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode_uint72___vec$u128$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(16, length), 32)
+                array := abi_decode_available_length__uint72___vec$u128$(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__uint72___vec$u128$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint72(elementPos, end)
+                    $MemoryStoreU128(dst, value)
+                    dst := add(dst, 16)
+                }
+            }
+            function abi_decode_uint72(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint72(value)
+            }
+            function validator_uint72(value) {
+                if iszero(eq(value, cleanup_uint72(value))) { $Abort(95) }
+            }
+            function abi_encode_tuple_$uint16$_$u64$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_uint16(value_0, add(headStart, 0))
+            }
+            function abi_encode_uint16(value, pos) {
+                mstore(pos, cleanup_uint16(value))
+            }
+            function cleanup_uint16(value) -> cleaned {
+                cleaned := and(value, 0xffff)
+            }
+            function abi_decode_tuple_$uint16_2___$_$vec$vec$u64$$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_uint16_2____vec$vec$u64$$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint16_2____vec$vec$u64$$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(32, length), 32)
+                array := abi_decode_available_length__uint16_2____vec$vec$u64$$(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__uint16_2____vec$vec$u64$$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 64))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 64) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint16_2__vec$u64$(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode_uint16_2__vec$u64$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 2
+                let size := 48
+                array := abi_decode_available_length__uint16_2__vec$u64$(offset, length, size, end)
+            }
+            function abi_decode_available_length__uint16_2__vec$u64$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint16(elementPos, end)
+                    $MemoryStoreU64(dst, value)
+                    dst := add(dst, 8)
+                }
+            }
+            function abi_decode_uint16(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint16(value)
+            }
+            function validator_uint16(value) {
+                if iszero(eq(value, cleanup_uint16(value))) { $Abort(95) }
+            }
+            function abi_decode_tuple_$uint8_2_$_$vec$u8$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_uint8_2__vec$u8$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_tuple_$uint64_2_$_$vec$u64$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_uint64_2__vec$u64$(add(headStart, offset), dataEnd)
+                }
+            }
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $AbortBuiltin() {
+                $Abort(sub(0, 1))
+            }
+            function $Malloc(size) -> offs {
+                offs := mload(0)
+                // pad to word size
+                mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+            }
+            function $Free(offs, size) {
+            }
+            function $MakePtr(is_storage, offs) -> ptr {
+              ptr := or(is_storage, shl(1, offs))
+            }
+            function $IsStoragePtr(ptr) -> b {
+              b := and(ptr, 0x1)
+            }
+            function $OffsetPtr(ptr) -> offs {
+              offs := shr(1, ptr)
+            }
+            function $MaskForSize(size) -> mask {
+              mask := sub(shl(shl(3, size), 1), 1)
+            }
+            function $ExtractBytes(word, start, size) -> bytes {
+               switch size
+               case 1 {
+                  // use the faster byte primitive
+                  bytes := byte(start, word)
+               }
+               default {
+                  // As we have big endian, we need to right shift the value from
+                  // where the highest byte starts in the word (32 - start), minus
+                  // the size.
+                  let shift_bits := shl(3, sub(sub(32, start), size))
+                  bytes := and(shr(shift_bits, word), $MaskForSize(size))
+               }
+            }
+            function $ToWordOffs(offs) -> word_offs, byte_offset {
+              word_offs := shr(5, offs)
+              byte_offset := and(offs, 0x1F)
+            }
+            function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+              let available_bytes := sub(32, byte_offset)
+              switch gt(size, available_bytes)
+              case 0 {
+                overflow_bytes := 0
+              }
+              default {
+                overflow_bytes := sub(size, available_bytes)
+              }
+            }
+            function $MemoryLoadBytes(offs, size) -> val {
+              // Lower bit where the value in the higher bytes ends
+              let bit_end := shl(3, sub(32, size))
+              val := shr(bit_end, mload(offs))
+            }
+            function $MemoryStoreBytes(offs, size, val) {
+              let bit_end := shl(3, sub(32, size))
+              let mask := shl(bit_end, $MaskForSize(size))
+              mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+            }
+            function $StorageLoadBytes(offs, size) -> val {
+              let word_offs, byte_offs := $ToWordOffs(offs)
+              let key := $StorageKey(0, word_offs)
+              val := $ExtractBytes(sload(key), byte_offs, size)
+              let overflow_bytes := $OverflowBytes(byte_offs, size)
+              if $LogicalNot(iszero(overflow_bytes)) {
+                key := $StorageKey(0, add(word_offs, 1))
+                let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+                val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+              }
+            }
+            function $StorageKey(group, word) -> key {
+              mstore(32, word)
+              mstore(64, shl(224, group))
+              key := keccak256(32, 36)
+            }
+            function $IndexPtr(ptr, offs) -> new_ptr {
+              new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+            }
+            function $LoadU8(ptr) -> val {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                val := $MemoryLoadU8(offs)
+              }
+              default {
+                val := $StorageLoadU8(offs)
+              }
+            }
+            function $MemoryLoadU8(offs) -> val {
+              val := $MemoryLoadBytes(offs, 1)
+            }
+            function $StorageLoadU8(offs) -> val {
+              val := $StorageLoadBytes(offs, 1)
+            }
+            function $MemoryStoreU8(offs, val) {
+              // Shortcut via special instruction
+              mstore8(offs, val)
+            }
+            function $LoadU64(ptr) -> val {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                val := $MemoryLoadU64(offs)
+              }
+              default {
+                val := $StorageLoadU64(offs)
+              }
+            }
+            function $MemoryLoadU64(offs) -> val {
+              val := $MemoryLoadBytes(offs, 8)
+            }
+            function $StorageLoadU64(offs) -> val {
+              val := $StorageLoadBytes(offs, 8)
+            }
+            function $MemoryStoreU64(offs, val) {
+              $MemoryStoreBytes(offs, 8, val)
+            }
+            function $LoadU128(ptr) -> val {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                val := $MemoryLoadU128(offs)
+              }
+              default {
+                val := $StorageLoadU128(offs)
+              }
+            }
+            function $MemoryLoadU128(offs) -> val {
+              val := $MemoryLoadBytes(offs, 16)
+            }
+            function $StorageLoadU128(offs) -> val {
+              val := $StorageLoadBytes(offs, 16)
+            }
+            function $MemoryStoreU128(offs, val) {
+              $MemoryStoreBytes(offs, 16, val)
+            }
+            function $LoadU256(ptr) -> val {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                val := $MemoryLoadU256(offs)
+              }
+              default {
+                val := $StorageLoadU256(offs)
+              }
+            }
+            function $MemoryLoadU256(offs) -> val {
+              val := $MemoryLoadBytes(offs, 32)
+            }
+            function $StorageLoadU256(offs) -> val {
+              val := $StorageLoadBytes(offs, 32)
+            }
+            function $MemoryStoreU256(offs, val) {
+              $MemoryStoreBytes(offs, 32, val)
+            }
+            function $CheckMemorySize(len) -> checked_len {
+                if gt(len, 0xffffffffffffffff) { $AbortBuiltin() }
+                checked_len := len
+            }
+            function $AddU64(x, y) -> r {
+                if lt(sub(0xffffffffffffffff, x), y) { $AbortBuiltin() }
+                r := add(x, y)
+            }
+            function $AddU8(x, y) -> r {
+                if lt(sub(0xff, x), y) { $AbortBuiltin() }
+                r := add(x, y)
+            }
+            function $AddU128(x, y) -> r {
+                if lt(sub(0xffffffffffffffffffffffffffffffff, x), y) { $AbortBuiltin() }
+                r := add(x, y)
+            }
+            function $AddU256(x, y) -> r {
+                if lt(sub(0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff, x), y) { $AbortBuiltin() }
+                r := add(x, y)
+            }
+            function $Sub(x, y) -> r {
+                if lt(x, y) { $AbortBuiltin() }
+                r := sub(x, y)
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+            function $Lt(x, y) -> r {
+                r := lt(x, y)
+            }
+            function $GtEq(x, y) -> r {
+                r := or(gt(x, y), eq(x, y))
+            }
+            function $LogicalNot(x) -> r {
+                r := iszero(x)
+            }
+            function $ClosestGreaterPowerOfTwo(x) -> r {
+                r := or(r, shr(1, x))
+                r := or(r, shr(2, r))
+                r := or(r, shr(4, r))
+                r := or(r, shr(8, r))
+                r := or(r, shr(16, r))
+                r := or(r, shr(32, r))
+                r := add(x, 1)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
diff --git a/third_party/move/evm/move-to-yul/tests/test-dispatcher/DispatcherArrayEncoding.v2_exp b/third_party/move/evm/move-to-yul/tests/test-dispatcher/DispatcherArrayEncoding.v2_exp
new file mode 100644
index 0000000000000..bd6bd702cf420
--- /dev/null
+++ b/third_party/move/evm/move-to-yul/tests/test-dispatcher/DispatcherArrayEncoding.v2_exp
@@ -0,0 +1,862 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_M" {
+    code {
+        codecopy(0, dataoffset("A2_M_deployed"), datasize("A2_M_deployed"))
+        return(0, datasize("A2_M_deployed"))
+    }
+    object "A2_M_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                case 0x52044bf1
+                {
+                    // test_u64(uint64[2])
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint64_2_$_$vec$u64$$(4, calldatasize())
+                    let ret_0 := A2_M_test_array_u64(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint64_2_$_$vec$u64$$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xf03cf98d
+                {
+                    // test_u8(uint8[2])
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint8_2_$_$vec$u8$$(4, calldatasize())
+                    let ret_0 := A2_M_test_array_u8(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint8_2_$_$vec$u8$$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xaae0ca0b
+                {
+                    // test_uint72_u128(uint72[][2])
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint72___2_$_$vec$vec$u128$$$(4, calldatasize())
+                    let ret_0 := A2_M_test_array_uint72_u128(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint72___2_$_$vec$vec$u128$$$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xecefc49c
+                {
+                    // test_u8(uint8[2][2])
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint8_2__2_$_$vec$vec$u8$$$(4, calldatasize())
+                    let ret_0 := A2_M_test_one_elem_para_array_2_array_2_u8(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint8_2__2_$_$vec$vec$u8$$$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x4c976153
+                {
+                    // test_u256(uint256[][2])
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint256___2_$_$vec$vec$A2_U256_U256$$$(4, calldatasize())
+                    let ret_0 := A2_M_test_one_elem_para_array_2_array_dynamic_u256(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint256___2_$_$vec$vec$A2_U256_U256$$$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x3b09967a
+                {
+                    // test_u8(uint8[][2])
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint8___2_$_$vec$vec$u8$$$(4, calldatasize())
+                    let ret_0 := A2_M_test_one_elem_para_array_2_array_dynamic_u8(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint8___2_$_$vec$vec$u8$$$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x43ed1d2f
+                {
+                    // test_u8(uint8[2][])
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint8_2___$_$vec$vec$u8$$$(4, calldatasize())
+                    let ret_0 := A2_M_test_one_elem_para_array_dynamic_array_2_u8(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint8_2___$_$vec$vec$u8$$$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x14fda38d
+                {
+                    // test_u128(uint128[][])
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint128____$_$vec$vec$u128$$$(4, calldatasize())
+                    let ret_0 := A2_M_test_one_elem_para_array_dynamic_array_u128(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint128____$_$vec$vec$u128$$$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                default {}
+            }
+            $Abort(97)
+            function A2_M_test_array_u64(v) -> $result {
+                // return $t0
+                $result := v
+            }
+
+            function A2_M_test_array_u8(v) -> $result {
+                // return $t0
+                $result := v
+            }
+
+            function A2_M_test_array_uint72_u128(v) -> $result {
+                // return $t0
+                $result := v
+            }
+
+            function A2_M_test_one_elem_para_array_2_array_2_u8(v) -> $result {
+                // return $t0
+                $result := v
+            }
+
+            function A2_M_test_one_elem_para_array_2_array_dynamic_u256(v) -> $result {
+                // return $t0
+                $result := v
+            }
+
+            function A2_M_test_one_elem_para_array_2_array_dynamic_u8(v) -> $result {
+                // return $t0
+                $result := v
+            }
+
+            function A2_M_test_one_elem_para_array_dynamic_array_2_u8(v) -> $result {
+                // return $t0
+                $result := v
+            }
+
+            function A2_M_test_one_elem_para_array_dynamic_array_u128(v) -> $result {
+                // return $t0
+                $result := v
+            }
+
+            function abi_encode_tuple_$uint128____$_$vec$vec$u128$$$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                mstore(add(headStart, 0), sub(tail, headStart))
+                tail := abi_encode_uint128_____vec$vec$u128$$(value_0,  tail)
+            }
+            function abi_encode_uint128_____vec$vec$u128$$(value, pos) -> end {
+                let length := $MemoryLoadU64(value)
+                mstore(pos, length)
+                pos := add(pos, 0x20)
+                let headStart := pos
+                let tail := add(pos, mul(length, 0x20))
+                let start := add(value, 32)
+                let srcEnd := add(start, mul(length, 32))
+                for { let src := start } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    mstore(pos, sub(tail, headStart))
+                    let v := $MemoryLoadU256(src)
+                    tail := abi_encode_uint128___vec$u128$_with_updated_pos(v, tail)
+                    pos := add(pos, 0x20)
+                }
+                pos := tail
+                end := pos
+            }
+            function abi_encode_uint128___vec$u128$_with_updated_pos(value, pos) -> updated_pos{
+                updated_pos := abi_encode_uint128___vec$u128$(value, pos)
+            }
+            function abi_encode_uint128___vec$u128$(value, pos) -> end {
+                let length := $MemoryLoadU64(value)
+                mstore(pos, length)
+                pos := add(pos, 0x20)
+                let start := add(value, 32)
+                let srcEnd := add(start, mul(length, 16))
+                for { let src := start } lt(src, srcEnd) { src := add(src, 16) }
+                {
+                    let v := $MemoryLoadU128(src)
+                    pos := abi_encode_uint128_with_updated_pos(v, pos)
+                }
+                end := pos
+            }
+            function abi_encode_uint128_with_updated_pos(value, pos) -> updated_pos{
+                abi_encode_uint128(value, pos)
+                updated_pos := add(pos, 32)
+            }
+            function abi_encode_uint128(value, pos) {
+                mstore(pos, cleanup_uint128(value))
+            }
+            function cleanup_uint128(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffffffffffffffffffff)
+            }
+            function abi_decode_tuple_$uint128____$_$vec$vec$u128$$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_uint128_____vec$vec$u128$$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint128_____vec$vec$u128$$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(32, length), 32)
+                array := abi_decode_available_length__uint128_____vec$vec$u128$$(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__uint128_____vec$vec$u128$$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let innerOffset := calldataload(src)
+                    if gt(innerOffset, 0xffffffffffffffff) { $Abort(94) }
+                    let elementPos := add(offset, innerOffset)
+                    let value := abi_decode_uint128___vec$u128$(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode_uint128___vec$u128$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(16, length), 32)
+                array := abi_decode_available_length__uint128___vec$u128$(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__uint128___vec$u128$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint128(elementPos, end)
+                    $MemoryStoreU128(dst, value)
+                    dst := add(dst, 16)
+                }
+            }
+            function abi_decode_uint128(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint128(value)
+            }
+            function validator_uint128(value) {
+                if iszero(eq(value, cleanup_uint128(value))) { $Abort(95) }
+            }
+            function abi_encode_tuple_$uint8_2___$_$vec$vec$u8$$$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                mstore(add(headStart, 0), sub(tail, headStart))
+                tail := abi_encode_uint8_2____vec$vec$u8$$(value_0,  tail)
+            }
+            function abi_encode_uint8_2____vec$vec$u8$$(value, pos) -> end {
+                let length := $MemoryLoadU64(value)
+                mstore(pos, length)
+                pos := add(pos, 0x20)
+                let start := add(value, 32)
+                let srcEnd := add(start, mul(length, 32))
+                for { let src := start } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let v := $MemoryLoadU256(src)
+                    pos := abi_encode_uint8_2__vec$u8$_with_updated_pos(v, pos)
+                }
+                end := pos
+            }
+            function abi_encode_uint8_2__vec$u8$_with_updated_pos(value, pos) -> updated_pos{
+                abi_encode_uint8_2__vec$u8$(value, pos)
+                updated_pos := add(pos, 64)
+            }
+            function abi_encode_uint8_2__vec$u8$(value, pos)  {
+                let length := $MemoryLoadU64(value)
+                if iszero(eq(length, 2)) { $Abort(92) }
+                let start := add(value, 32)
+                let srcEnd := add(start, mul(length, 1))
+                for { let src := start } lt(src, srcEnd) { src := add(src, 1) }
+                {
+                    let v := $MemoryLoadU8(src)
+                    pos := abi_encode_uint8_with_updated_pos(v, pos)
+                }
+            }
+            function abi_encode_uint8_with_updated_pos(value, pos) -> updated_pos{
+                abi_encode_uint8(value, pos)
+                updated_pos := add(pos, 32)
+            }
+            function abi_encode_uint8(value, pos) {
+                mstore(pos, cleanup_uint8(value))
+            }
+            function cleanup_uint8(value) -> cleaned {
+                cleaned := and(value, 0xff)
+            }
+            function abi_decode_tuple_$uint8_2___$_$vec$vec$u8$$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_uint8_2____vec$vec$u8$$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint8_2____vec$vec$u8$$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(32, length), 32)
+                array := abi_decode_available_length__uint8_2____vec$vec$u8$$(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__uint8_2____vec$vec$u8$$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 64))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 64) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint8_2__vec$u8$(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode_uint8_2__vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 2
+                let size := 34
+                array := abi_decode_available_length__uint8_2__vec$u8$(offset, length, size, end)
+            }
+            function abi_decode_available_length__uint8_2__vec$u8$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint8(elementPos, end)
+                    $MemoryStoreU8(dst, value)
+                    dst := add(dst, 1)
+                }
+            }
+            function abi_decode_uint8(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint8(value)
+            }
+            function validator_uint8(value) {
+                if iszero(eq(value, cleanup_uint8(value))) { $Abort(95) }
+            }
+            function abi_encode_tuple_$uint8___2_$_$vec$vec$u8$$$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                mstore(add(headStart, 0), sub(tail, headStart))
+                tail := abi_encode_uint8___2__vec$vec$u8$$(value_0,  tail)
+            }
+            function abi_encode_uint8___2__vec$vec$u8$$(value, pos) -> end {
+                let length := $MemoryLoadU64(value)
+                if iszero(eq(length, 2)) { $Abort(92) }
+                let headStart := pos
+                let tail := add(pos, mul(length, 0x20))
+                let start := add(value, 32)
+                let srcEnd := add(start, mul(length, 32))
+                for { let src := start } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    mstore(pos, sub(tail, headStart))
+                    let v := $MemoryLoadU256(src)
+                    tail := abi_encode_uint8___vec$u8$_with_updated_pos(v, tail)
+                    pos := add(pos, 0x20)
+                }
+                pos := tail
+                end := pos
+            }
+            function abi_encode_uint8___vec$u8$_with_updated_pos(value, pos) -> updated_pos{
+                updated_pos := abi_encode_uint8___vec$u8$(value, pos)
+            }
+            function abi_encode_uint8___vec$u8$(value, pos) -> end {
+                let length := $MemoryLoadU64(value)
+                mstore(pos, length)
+                pos := add(pos, 0x20)
+                let start := add(value, 32)
+                let srcEnd := add(start, mul(length, 1))
+                for { let src := start } lt(src, srcEnd) { src := add(src, 1) }
+                {
+                    let v := $MemoryLoadU8(src)
+                    pos := abi_encode_uint8_with_updated_pos(v, pos)
+                }
+                end := pos
+            }
+            function abi_decode_tuple_$uint8___2_$_$vec$vec$u8$$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_uint8___2__vec$vec$u8$$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint8___2__vec$vec$u8$$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 2
+                let size := 96
+                array := abi_decode_available_length__uint8___2__vec$vec$u8$$(offset, length, size, end)
+            }
+            function abi_decode_available_length__uint8___2__vec$vec$u8$$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let innerOffset := calldataload(src)
+                    if gt(innerOffset, 0xffffffffffffffff) { $Abort(94) }
+                    let elementPos := add(offset, innerOffset)
+                    let value := abi_decode_uint8___vec$u8$(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode_uint8___vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(1, length), 32)
+                array := abi_decode_available_length__uint8___vec$u8$(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__uint8___vec$u8$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint8(elementPos, end)
+                    $MemoryStoreU8(dst, value)
+                    dst := add(dst, 1)
+                }
+            }
+            function abi_encode_tuple_$uint256___2_$_$vec$vec$A2_U256_U256$$$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                mstore(add(headStart, 0), sub(tail, headStart))
+                tail := abi_encode_uint256___2__vec$vec$A2_U256_U256$$(value_0,  tail)
+            }
+            function abi_encode_uint256___2__vec$vec$A2_U256_U256$$(value, pos) -> end {
+                let length := $MemoryLoadU64(value)
+                if iszero(eq(length, 2)) { $Abort(92) }
+                let headStart := pos
+                let tail := add(pos, mul(length, 0x20))
+                let start := add(value, 32)
+                let srcEnd := add(start, mul(length, 32))
+                for { let src := start } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    mstore(pos, sub(tail, headStart))
+                    let v := $MemoryLoadU256(src)
+                    tail := abi_encode_uint256___vec$A2_U256_U256$_with_updated_pos(v, tail)
+                    pos := add(pos, 0x20)
+                }
+                pos := tail
+                end := pos
+            }
+            function abi_encode_uint256___vec$A2_U256_U256$_with_updated_pos(value, pos) -> updated_pos{
+                updated_pos := abi_encode_uint256___vec$A2_U256_U256$(value, pos)
+            }
+            function abi_encode_uint256___vec$A2_U256_U256$(value, pos) -> end {
+                let length := $MemoryLoadU64(value)
+                mstore(pos, length)
+                pos := add(pos, 0x20)
+                let start := add(value, 32)
+                let srcEnd := add(start, mul(length, 32))
+                for { let src := start } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let v := $MemoryLoadU256(src)
+                    pos := abi_encode_uint256_with_updated_pos(v, pos)
+                }
+                end := pos
+            }
+            function abi_encode_uint256_with_updated_pos(value, pos) -> updated_pos{
+                abi_encode_uint256(value, pos)
+                updated_pos := add(pos, 32)
+            }
+            function abi_encode_uint256(value, pos) {
+                mstore(pos, cleanup_uint256(value))
+            }
+            function cleanup_uint256(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)
+            }
+            function abi_decode_tuple_$uint256___2_$_$vec$vec$A2_U256_U256$$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_uint256___2__vec$vec$A2_U256_U256$$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint256___2__vec$vec$A2_U256_U256$$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 2
+                let size := 96
+                array := abi_decode_available_length__uint256___2__vec$vec$A2_U256_U256$$(offset, length, size, end)
+            }
+            function abi_decode_available_length__uint256___2__vec$vec$A2_U256_U256$$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let innerOffset := calldataload(src)
+                    if gt(innerOffset, 0xffffffffffffffff) { $Abort(94) }
+                    let elementPos := add(offset, innerOffset)
+                    let value := abi_decode_uint256___vec$A2_U256_U256$(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode_uint256___vec$A2_U256_U256$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(32, length), 32)
+                array := abi_decode_available_length__uint256___vec$A2_U256_U256$(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__uint256___vec$A2_U256_U256$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint256(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode_uint256(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint256(value)
+            }
+            function validator_uint256(value) {
+                if iszero(eq(value, cleanup_uint256(value))) { $Abort(95) }
+            }
+            function abi_encode_tuple_$uint8_2__2_$_$vec$vec$u8$$$(headStart ,value_0) -> tail {
+                tail := add(headStart, 128)
+                abi_encode_uint8_2__2__vec$vec$u8$$(value_0, add(headStart, 0))
+            }
+            function abi_encode_uint8_2__2__vec$vec$u8$$(value, pos)  {
+                let length := $MemoryLoadU64(value)
+                if iszero(eq(length, 2)) { $Abort(92) }
+                let start := add(value, 32)
+                let srcEnd := add(start, mul(length, 32))
+                for { let src := start } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let v := $MemoryLoadU256(src)
+                    pos := abi_encode_uint8_2__vec$u8$_with_updated_pos(v, pos)
+                }
+            }
+            function abi_decode_tuple_$uint8_2__2_$_$vec$vec$u8$$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 128) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_uint8_2__2__vec$vec$u8$$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint8_2__2__vec$vec$u8$$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 2
+                let size := 96
+                array := abi_decode_available_length__uint8_2__2__vec$vec$u8$$(offset, length, size, end)
+            }
+            function abi_decode_available_length__uint8_2__2__vec$vec$u8$$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 64))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 64) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint8_2__vec$u8$(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_encode_tuple_$uint72___2_$_$vec$vec$u128$$$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                mstore(add(headStart, 0), sub(tail, headStart))
+                tail := abi_encode_uint72___2__vec$vec$u128$$(value_0,  tail)
+            }
+            function abi_encode_uint72___2__vec$vec$u128$$(value, pos) -> end {
+                let length := $MemoryLoadU64(value)
+                if iszero(eq(length, 2)) { $Abort(92) }
+                let headStart := pos
+                let tail := add(pos, mul(length, 0x20))
+                let start := add(value, 32)
+                let srcEnd := add(start, mul(length, 32))
+                for { let src := start } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    mstore(pos, sub(tail, headStart))
+                    let v := $MemoryLoadU256(src)
+                    tail := abi_encode_uint72___vec$u128$_with_updated_pos(v, tail)
+                    pos := add(pos, 0x20)
+                }
+                pos := tail
+                end := pos
+            }
+            function abi_encode_uint72___vec$u128$_with_updated_pos(value, pos) -> updated_pos{
+                updated_pos := abi_encode_uint72___vec$u128$(value, pos)
+            }
+            function abi_encode_uint72___vec$u128$(value, pos) -> end {
+                let length := $MemoryLoadU64(value)
+                mstore(pos, length)
+                pos := add(pos, 0x20)
+                let start := add(value, 32)
+                let srcEnd := add(start, mul(length, 16))
+                for { let src := start } lt(src, srcEnd) { src := add(src, 16) }
+                {
+                    let v := $MemoryLoadU128(src)
+                    pos := abi_encode_uint72_with_updated_pos(v, pos)
+                }
+                end := pos
+            }
+            function abi_encode_uint72_with_updated_pos(value, pos) -> updated_pos{
+                abi_encode_uint72(value, pos)
+                updated_pos := add(pos, 32)
+            }
+            function abi_encode_uint72(value, pos) {
+                mstore(pos, cleanup_uint72(value))
+            }
+            function cleanup_uint72(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffffff)
+            }
+            function abi_decode_tuple_$uint72___2_$_$vec$vec$u128$$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_uint72___2__vec$vec$u128$$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint72___2__vec$vec$u128$$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 2
+                let size := 96
+                array := abi_decode_available_length__uint72___2__vec$vec$u128$$(offset, length, size, end)
+            }
+            function abi_decode_available_length__uint72___2__vec$vec$u128$$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let innerOffset := calldataload(src)
+                    if gt(innerOffset, 0xffffffffffffffff) { $Abort(94) }
+                    let elementPos := add(offset, innerOffset)
+                    let value := abi_decode_uint72___vec$u128$(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode_uint72___vec$u128$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(16, length), 32)
+                array := abi_decode_available_length__uint72___vec$u128$(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__uint72___vec$u128$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint72(elementPos, end)
+                    $MemoryStoreU128(dst, value)
+                    dst := add(dst, 16)
+                }
+            }
+            function abi_decode_uint72(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint72(value)
+            }
+            function validator_uint72(value) {
+                if iszero(eq(value, cleanup_uint72(value))) { $Abort(95) }
+            }
+            function abi_encode_tuple_$uint8_2_$_$vec$u8$$(headStart ,value_0) -> tail {
+                tail := add(headStart, 64)
+                abi_encode_uint8_2__vec$u8$(value_0, add(headStart, 0))
+            }
+            function abi_decode_tuple_$uint8_2_$_$vec$u8$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_uint8_2__vec$u8$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_encode_tuple_$uint64_2_$_$vec$u64$$(headStart ,value_0) -> tail {
+                tail := add(headStart, 64)
+                abi_encode_uint64_2__vec$u64$(value_0, add(headStart, 0))
+            }
+            function abi_encode_uint64_2__vec$u64$(value, pos)  {
+                let length := $MemoryLoadU64(value)
+                if iszero(eq(length, 2)) { $Abort(92) }
+                let start := add(value, 32)
+                let srcEnd := add(start, mul(length, 8))
+                for { let src := start } lt(src, srcEnd) { src := add(src, 8) }
+                {
+                    let v := $MemoryLoadU64(src)
+                    pos := abi_encode_uint64_with_updated_pos(v, pos)
+                }
+            }
+            function abi_encode_uint64_with_updated_pos(value, pos) -> updated_pos{
+                abi_encode_uint64(value, pos)
+                updated_pos := add(pos, 32)
+            }
+            function abi_encode_uint64(value, pos) {
+                mstore(pos, cleanup_uint64(value))
+            }
+            function cleanup_uint64(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffff)
+            }
+            function abi_decode_tuple_$uint64_2_$_$vec$u64$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_uint64_2__vec$u64$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint64_2__vec$u64$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 2
+                let size := 48
+                array := abi_decode_available_length__uint64_2__vec$u64$(offset, length, size, end)
+            }
+            function abi_decode_available_length__uint64_2__vec$u64$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint64(elementPos, end)
+                    $MemoryStoreU64(dst, value)
+                    dst := add(dst, 8)
+                }
+            }
+            function abi_decode_uint64(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint64(value)
+            }
+            function validator_uint64(value) {
+                if iszero(eq(value, cleanup_uint64(value))) { $Abort(95) }
+            }
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $AbortBuiltin() {
+                $Abort(sub(0, 1))
+            }
+            function $Malloc(size) -> offs {
+                offs := mload(0)
+                // pad to word size
+                mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+            }
+            function $MaskForSize(size) -> mask {
+              mask := sub(shl(shl(3, size), 1), 1)
+            }
+            function $MemoryLoadBytes(offs, size) -> val {
+              // Lower bit where the value in the higher bytes ends
+              let bit_end := shl(3, sub(32, size))
+              val := shr(bit_end, mload(offs))
+            }
+            function $MemoryStoreBytes(offs, size, val) {
+              let bit_end := shl(3, sub(32, size))
+              let mask := shl(bit_end, $MaskForSize(size))
+              mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+            }
+            function $MemoryLoadU8(offs) -> val {
+              val := $MemoryLoadBytes(offs, 1)
+            }
+            function $MemoryStoreU8(offs, val) {
+              // Shortcut via special instruction
+              mstore8(offs, val)
+            }
+            function $MemoryLoadU64(offs) -> val {
+              val := $MemoryLoadBytes(offs, 8)
+            }
+            function $MemoryStoreU64(offs, val) {
+              $MemoryStoreBytes(offs, 8, val)
+            }
+            function $MemoryLoadU128(offs) -> val {
+              val := $MemoryLoadBytes(offs, 16)
+            }
+            function $MemoryStoreU128(offs, val) {
+              $MemoryStoreBytes(offs, 16, val)
+            }
+            function $MemoryLoadU256(offs) -> val {
+              val := $MemoryLoadBytes(offs, 32)
+            }
+            function $MemoryStoreU256(offs, val) {
+              $MemoryStoreBytes(offs, 32, val)
+            }
+            function $CheckMemorySize(len) -> checked_len {
+                if gt(len, 0xffffffffffffffff) { $AbortBuiltin() }
+                checked_len := len
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+            function $ClosestGreaterPowerOfTwo(x) -> r {
+                r := or(r, shr(1, x))
+                r := or(r, shr(2, r))
+                r := or(r, shr(4, r))
+                r := or(r, shr(8, r))
+                r := or(r, shr(16, r))
+                r := or(r, shr(32, r))
+                r := add(x, 1)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
diff --git a/third_party/move/evm/move-to-yul/tests/test-dispatcher/DispatcherBasic.v2_exp b/third_party/move/evm/move-to-yul/tests/test-dispatcher/DispatcherBasic.v2_exp
new file mode 100644
index 0000000000000..c7e0818447591
--- /dev/null
+++ b/third_party/move/evm/move-to-yul/tests/test-dispatcher/DispatcherBasic.v2_exp
@@ -0,0 +1,103 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_M" {
+    code {
+        codecopy(0, dataoffset("A2_M_deployed"), datasize("A2_M_deployed"))
+        return(0, datasize("A2_M_deployed"))
+    }
+    object "A2_M_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                case 0xe44f11ec
+                {
+                    // return_0()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let ret_0 := A2_M_return_0()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint128$_$u128$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x5087af69
+                {
+                    // return_1()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let ret_0 := A2_M_return_1()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint128$_$u128$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x249088d0
+                {
+                    // return_2()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let ret_0 := A2_M_return_2()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint128$_$u128$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                default {}
+            }
+            $Abort(97)
+            function A2_M_return_0() -> $result {
+                let $t0
+                // $t0 := 0
+                $t0 := 0
+                // return $t0
+                $result := $t0
+            }
+
+            function A2_M_return_1() -> $result {
+                let $t0
+                // $t0 := 1
+                $t0 := 1
+                // return $t0
+                $result := $t0
+            }
+
+            function A2_M_return_2() -> $result {
+                let $t0
+                // $t0 := 2
+                $t0 := 2
+                // return $t0
+                $result := $t0
+            }
+
+            function abi_encode_tuple_$uint128$_$u128$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_uint128(value_0, add(headStart, 0))
+            }
+            function abi_encode_uint128(value, pos) {
+                mstore(pos, cleanup_uint128(value))
+            }
+            function cleanup_uint128(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffffffffffffffffffff)
+            }
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
diff --git a/third_party/move/evm/move-to-yul/tests/test-dispatcher/DispatcherBasicStorage.v2_exp b/third_party/move/evm/move-to-yul/tests/test-dispatcher/DispatcherBasicStorage.v2_exp
new file mode 100644
index 0000000000000..bc0463b511e92
--- /dev/null
+++ b/third_party/move/evm/move-to-yul/tests/test-dispatcher/DispatcherBasicStorage.v2_exp
@@ -0,0 +1,354 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_M" {
+    code {
+        mstore(0, memoryguard(160))
+        let $new_value := A2_M_create()
+        {
+            let $base_offset := $MakeTypeStorageBase(0, 0xd5520090, address())
+            if $AlignedStorageLoad($base_offset) {
+              $AbortBuiltin()
+            }
+            $AlignedStorageStore($base_offset, true)
+            {
+                let $dst := add($base_offset, 32)
+                let $src := $new_value
+                $AlignedStorageStore(add($dst, 0), mload(add($src, 0)))
+                $Free($src, 8)
+            }
+        }
+        codecopy(0, dataoffset("A2_M_deployed"), datasize("A2_M_deployed"))
+        return(0, datasize("A2_M_deployed"))
+        function A2_M_create() -> $result {
+            let $t0, $t1
+            // $t0 := 0
+            $t0 := 0
+            // $t1 := pack M::Storage($t0)
+            {
+                let $mem := $Malloc(8)
+                $MemoryStoreU64(add($mem, 0), $t0)
+                $t1 := $mem
+            }
+            // return $t1
+            $result := $t1
+        }
+
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+    }
+    object "A2_M_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                case 0x9fa6a6e3
+                {
+                    // current()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let $base_offset := $MakeTypeStorageBase(0, 0xd5520090, address())
+                    if iszero($AlignedStorageLoad($base_offset)) {
+                      $AbortBuiltin()
+                    }
+                    let ret_0 := A2_M_current($MakePtr(true, add($base_offset, 32)))
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint64$_$u64$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xd09de08a
+                {
+                    // increment()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let $base_offset := $MakeTypeStorageBase(0, 0xd5520090, address())
+                    if iszero($AlignedStorageLoad($base_offset)) {
+                      $AbortBuiltin()
+                    }
+                    A2_M_increment($MakePtr(true, add($base_offset, 32)))
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                default {}
+            }
+            {
+                let $base_offset := $MakeTypeStorageBase(0, 0xd5520090, address())
+                if iszero($AlignedStorageLoad($base_offset)) {
+                  $AbortBuiltin()
+                }
+                if iszero(calldatasize()) { A2_M_receive($MakePtr(true, add($base_offset, 32))) stop() }
+            }
+            if callvalue()
+            {
+                $Abort(99)
+            }
+            {
+                let $base_offset := $MakeTypeStorageBase(0, 0xd5520090, address())
+                if iszero($AlignedStorageLoad($base_offset)) {
+                  $AbortBuiltin()
+                }
+                A2_M_fallback($MakePtr(true, add($base_offset, 32))) stop()
+            }
+            function A2_M_current(self) -> $result {
+                let $t1, $t2
+                // $t1 := borrow_field<M::Storage>.counter($t0)
+                $t1 := self
+                // $t2 := read_ref($t1)
+                $t2 := $LoadU64($t1)
+                // return $t2
+                $result := $t2
+            }
+
+            function A2_M_increment(self) {
+                let $t1, $t2, $t3, $t4, $t5
+                // $t1 := borrow_field<M::Storage>.counter($t0)
+                $t1 := self
+                // $t2 := read_ref($t1)
+                $t2 := $LoadU64($t1)
+                // $t3 := 1
+                $t3 := 1
+                // $t4 := +($t2, $t3)
+                $t4 := $AddU64($t2, $t3)
+                // $t5 := borrow_field<M::Storage>.counter($t0)
+                $t5 := self
+                // write_ref($t5, $t4)
+                $StoreU64($t5, $t4)
+                // return ()
+            }
+
+            function A2_M_receive(self) {
+                let $t1, $t2, $t3, $t4, $t5
+                // $t1 := borrow_field<M::Storage>.counter($t0)
+                $t1 := self
+                // $t2 := read_ref($t1)
+                $t2 := $LoadU64($t1)
+                // $t3 := 2
+                $t3 := 2
+                // $t4 := +($t2, $t3)
+                $t4 := $AddU64($t2, $t3)
+                // $t5 := borrow_field<M::Storage>.counter($t0)
+                $t5 := self
+                // write_ref($t5, $t4)
+                $StoreU64($t5, $t4)
+                // return ()
+            }
+
+            function A2_M_fallback(_self) {
+                // return ()
+            }
+
+            function abi_encode_tuple__(headStart ) -> tail {
+                tail := add(headStart, 0)
+            }
+            function abi_encode_tuple_$uint64$_$u64$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_uint64(value_0, add(headStart, 0))
+            }
+            function abi_encode_uint64(value, pos) {
+                mstore(pos, cleanup_uint64(value))
+            }
+            function cleanup_uint64(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffff)
+            }
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $AbortBuiltin() {
+                $Abort(sub(0, 1))
+            }
+            function $MakePtr(is_storage, offs) -> ptr {
+              ptr := or(is_storage, shl(1, offs))
+            }
+            function $IsStoragePtr(ptr) -> b {
+              b := and(ptr, 0x1)
+            }
+            function $OffsetPtr(ptr) -> offs {
+              offs := shr(1, ptr)
+            }
+            function $MaskForSize(size) -> mask {
+              mask := sub(shl(shl(3, size), 1), 1)
+            }
+            function $ExtractBytes(word, start, size) -> bytes {
+               switch size
+               case 1 {
+                  // use the faster byte primitive
+                  bytes := byte(start, word)
+               }
+               default {
+                  // As we have big endian, we need to right shift the value from
+                  // where the highest byte starts in the word (32 - start), minus
+                  // the size.
+                  let shift_bits := shl(3, sub(sub(32, start), size))
+                  bytes := and(shr(shift_bits, word), $MaskForSize(size))
+               }
+            }
+            function $InjectBytes(word, start, size, bytes) -> new_word {
+               let shift_bits := shl(3, sub(sub(32, start), size))
+               // Blend out the bits which we inject
+               let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+               word := and(word, neg_mask)
+               // Overlay the bits we inject
+               new_word := or(word, shl(shift_bits, bytes))
+            }
+            function $ToWordOffs(offs) -> word_offs, byte_offset {
+              word_offs := shr(5, offs)
+              byte_offset := and(offs, 0x1F)
+            }
+            function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+              let available_bytes := sub(32, byte_offset)
+              switch gt(size, available_bytes)
+              case 0 {
+                overflow_bytes := 0
+              }
+              default {
+                overflow_bytes := sub(size, available_bytes)
+              }
+            }
+            function $MemoryLoadBytes(offs, size) -> val {
+              // Lower bit where the value in the higher bytes ends
+              let bit_end := shl(3, sub(32, size))
+              val := shr(bit_end, mload(offs))
+            }
+            function $MemoryStoreBytes(offs, size, val) {
+              let bit_end := shl(3, sub(32, size))
+              let mask := shl(bit_end, $MaskForSize(size))
+              mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+            }
+            function $StorageLoadBytes(offs, size) -> val {
+              let word_offs, byte_offs := $ToWordOffs(offs)
+              let key := $StorageKey(0, word_offs)
+              val := $ExtractBytes(sload(key), byte_offs, size)
+              let overflow_bytes := $OverflowBytes(byte_offs, size)
+              if $LogicalNot(iszero(overflow_bytes)) {
+                key := $StorageKey(0, add(word_offs, 1))
+                let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+                val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+              }
+            }
+            function $StorageStoreBytes(offs, size, bytes) {
+              let word_offs, byte_offs := $ToWordOffs(offs)
+              let key := $StorageKey(0, word_offs)
+              let overflow_bytes := $OverflowBytes(byte_offs, size)
+              switch overflow_bytes
+              case 0 {
+                sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+              }
+              default {
+                // Shift the higher bytes to the right
+                let used_bytes := sub(size, overflow_bytes)
+                let higher_bytes := shr(used_bytes, bytes)
+                let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+                sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+                key := $StorageKey(0, add(word_offs, 1))
+                sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+              }
+            }
+            function $StorageKey(group, word) -> key {
+              mstore(32, word)
+              mstore(64, shl(224, group))
+              key := keccak256(32, 36)
+            }
+            function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+              offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+            }
+            function $LoadU64(ptr) -> val {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                val := $MemoryLoadU64(offs)
+              }
+              default {
+                val := $StorageLoadU64(offs)
+              }
+            }
+            function $MemoryLoadU64(offs) -> val {
+              val := $MemoryLoadBytes(offs, 8)
+            }
+            function $StorageLoadU64(offs) -> val {
+              val := $StorageLoadBytes(offs, 8)
+            }
+            function $StoreU64(ptr, val) {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                $MemoryStoreU64(offs, val)
+              }
+              default {
+                $StorageStoreU64(offs, val)
+              }
+            }
+            function $MemoryStoreU64(offs, val) {
+              $MemoryStoreBytes(offs, 8, val)
+            }
+            function $StorageStoreU64(offs, val) {
+              $StorageStoreBytes(offs, 8, val)
+            }
+            function $AlignedStorageLoad(offs) -> val {
+              let word_offs := shr(5, offs)
+              val := sload($StorageKey(0, word_offs))
+            }
+            function $AddU64(x, y) -> r {
+                if lt(sub(0xffffffffffffffff, x), y) { $AbortBuiltin() }
+                r := add(x, y)
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+            function $LogicalNot(x) -> r {
+                r := iszero(x)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
diff --git a/third_party/move/evm/move-to-yul/tests/test-dispatcher/DispatcherBytesDecoding.v2_exp b/third_party/move/evm/move-to-yul/tests/test-dispatcher/DispatcherBytesDecoding.v2_exp
new file mode 100644
index 0000000000000..c81409fd31b99
--- /dev/null
+++ b/third_party/move/evm/move-to-yul/tests/test-dispatcher/DispatcherBytesDecoding.v2_exp
@@ -0,0 +1,705 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_M" {
+    code {
+        codecopy(0, dataoffset("A2_M_deployed"), datasize("A2_M_deployed"))
+        return(0, datasize("A2_M_deployed"))
+    }
+    object "A2_M_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                case 0x75747573
+                {
+                    // test_bytes5_2_dynamic_size_sum(bytes5[2][])
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$bytes5_2___$_$vec$vec$vec$u8$$$$(4, calldatasize())
+                    let ret_0, ret_1 := A2_M_test_bytes5_2_dynamic_size_sum(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint64_uint8$_$u64_u8$(memPos, ret_0, ret_1)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xcaf983d4
+                {
+                    // test_dynamic_bytes_last_elem(bytes)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$bytes$_$vec$u8$$(4, calldatasize())
+                    let ret_0 := A2_M_test_dynamic_bytes_last_elem(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint8$_$u8$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xb8da1d50
+                {
+                    // test_dynamic_bytes_len(bytes)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$bytes$_$vec$u8$$(4, calldatasize())
+                    let ret_0 := A2_M_test_dynamic_bytes_length(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint8$_$u64$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xb8a04d00
+                {
+                    // test_static_bytes_last_elem(bytes32)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$bytes32$_$vec$u8$$(4, calldatasize())
+                    let ret_0 := A2_M_test_static_bytes_last_element(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint8$_$u8$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x272c5904
+                {
+                    // test_static_bytes_len(bytes4)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$bytes4$_$vec$u8$$(4, calldatasize())
+                    let ret_0 := A2_M_test_static_bytes_length(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint8$_$u64$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x16e560f4
+                {
+                    // test_string(string)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$string$_$vec$u8$$(4, calldatasize())
+                    let ret_0, ret_1 := A2_M_test_string(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint64_uint8$_$u64_u8$(memPos, ret_0, ret_1)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                default {}
+            }
+            $Abort(97)
+            function A2_M_test_bytes5_2_dynamic_size_sum(v) -> $result0, $result1 {
+                let i, j, len_v, len_vec, len_vec_bytes, sum, sum_len, v_1, vec, vec_bytes, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29
+                let $locals := $Malloc(32)
+                mstore($locals, v)
+                let $block := 3
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L7
+                        // $t16 := <($t1, $t12)
+                        $t16 := $Lt(i, $t12)
+                        // if ($t16) goto L1 else goto L0
+                        switch $t16
+                        case 0  { $block := 5 }
+                        default { $block := 4 }
+                    }
+                    case 3 {
+                        // $t11 := borrow_local($t0)
+                        $t11 := $MakePtr(false, $locals)
+                        // $t12 := vector::length<vector<vector<u8>>>($t11)
+                        $t12 := A1_vector_length$vec$vec$u8$$$($t11)
+                        // $t13 := 0
+                        $t13 := 0
+                        // $t6 := $t13
+                        sum := $t13
+                        // $t14 := 0
+                        $t14 := 0
+                        // $t7 := $t14
+                        sum_len := $t14
+                        // $t15 := 0
+                        $t15 := 0
+                        // $t1 := $t15
+                        i := $t15
+                        // goto L7
+                        $block := 2
+                    }
+                    case 4 {
+                        // label L1
+                        // goto L2
+                        $block := 6
+                    }
+                    case 5 {
+                        // label L0
+                        // return ($t7, $t6)
+                        $result0 := sum_len
+                        $result1 := sum
+                        $Free($locals, 32)
+                        leave
+                    }
+                    case 6 {
+                        // label L2
+                        // $t17 := borrow_local($t0)
+                        $t17 := $MakePtr(false, $locals)
+                        // $t18 := vector::borrow<vector<vector<u8>>>($t17, $t1)
+                        $t18 := A1_vector_borrow$vec$vec$u8$$$($t17, i)
+                        // $t19 := vector::length<vector<u8>>($t18)
+                        $t19 := A1_vector_length$vec$u8$$($t18)
+                        // $t20 := 0
+                        $t20 := 0
+                        // $t2 := $t20
+                        j := $t20
+                        // goto L6
+                        $block := 7
+                    }
+                    case 7 {
+                        // label L6
+                        // $t21 := <($t2, $t19)
+                        $t21 := $Lt(j, $t19)
+                        // if ($t21) goto L4 else goto L3
+                        switch $t21
+                        case 0  { $block := 9 }
+                        default { $block := 8 }
+                    }
+                    case 8 {
+                        // label L4
+                        // goto L5
+                        $block := 10
+                    }
+                    case 9 {
+                        // label L3
+                        // drop($t18)
+                        // $t29 := 1
+                        $t29 := 1
+                        // $t1 := +($t1, $t29)
+                        i := $AddU64(i, $t29)
+                        // goto L7
+                        $block := 2
+                    }
+                    case 10 {
+                        // label L5
+                        // $t22 := vector::borrow<vector<u8>>($t18, $t2)
+                        $t22 := A1_vector_borrow$vec$u8$$($t18, j)
+                        // $t23 := vector::length<u8>($t22)
+                        $t23 := A1_vector_length$u8$($t22)
+                        // $t24 := 1
+                        $t24 := 1
+                        // $t25 := -($t23, $t24)
+                        $t25 := $Sub($t23, $t24)
+                        // $t26 := vector::borrow<u8>($t22, $t25)
+                        $t26 := A1_vector_borrow$u8$($t22, $t25)
+                        // $t27 := read_ref($t26)
+                        $t27 := $LoadU8($t26)
+                        // $t7 := +($t7, $t23)
+                        sum_len := $AddU64(sum_len, $t23)
+                        // $t6 := +($t6, $t27)
+                        sum := $AddU8(sum, $t27)
+                        // $t28 := 1
+                        $t28 := 1
+                        // $t2 := +($t2, $t28)
+                        j := $AddU64(j, $t28)
+                        // goto L6
+                        $block := 7
+                    }
+                }
+            }
+
+            function A2_M_test_dynamic_bytes_last_elem(v) -> $result {
+                let $t1, $t2, $t3, $t4, $t5, $t6, $t7
+                let $locals := $Malloc(32)
+                mstore($locals, v)
+                // $t1 := borrow_local($t0)
+                $t1 := $MakePtr(false, $locals)
+                // $t2 := borrow_local($t0)
+                $t2 := $MakePtr(false, $locals)
+                // $t3 := vector::length<u8>($t2)
+                $t3 := A1_vector_length$u8$($t2)
+                // $t4 := 1
+                $t4 := 1
+                // $t5 := -($t3, $t4)
+                $t5 := $Sub($t3, $t4)
+                // $t6 := vector::borrow<u8>($t1, $t5)
+                $t6 := A1_vector_borrow$u8$($t1, $t5)
+                // $t7 := read_ref($t6)
+                $t7 := $LoadU8($t6)
+                // return $t7
+                $result := $t7
+                $Free($locals, 32)
+            }
+
+            function A2_M_test_dynamic_bytes_length(v) -> $result {
+                let $t1, $t2
+                let $locals := $Malloc(32)
+                mstore($locals, v)
+                // $t1 := borrow_local($t0)
+                $t1 := $MakePtr(false, $locals)
+                // $t2 := vector::length<u8>($t1)
+                $t2 := A1_vector_length$u8$($t1)
+                // return $t2
+                $result := $t2
+                $Free($locals, 32)
+            }
+
+            function A2_M_test_static_bytes_last_element(v) -> $result {
+                let $t1, $t2, $t3, $t4, $t5, $t6, $t7
+                let $locals := $Malloc(32)
+                mstore($locals, v)
+                // $t1 := borrow_local($t0)
+                $t1 := $MakePtr(false, $locals)
+                // $t2 := borrow_local($t0)
+                $t2 := $MakePtr(false, $locals)
+                // $t3 := vector::length<u8>($t2)
+                $t3 := A1_vector_length$u8$($t2)
+                // $t4 := 1
+                $t4 := 1
+                // $t5 := -($t3, $t4)
+                $t5 := $Sub($t3, $t4)
+                // $t6 := vector::borrow<u8>($t1, $t5)
+                $t6 := A1_vector_borrow$u8$($t1, $t5)
+                // $t7 := read_ref($t6)
+                $t7 := $LoadU8($t6)
+                // return $t7
+                $result := $t7
+                $Free($locals, 32)
+            }
+
+            function A2_M_test_static_bytes_length(v) -> $result {
+                let $t1, $t2
+                let $locals := $Malloc(32)
+                mstore($locals, v)
+                // $t1 := borrow_local($t0)
+                $t1 := $MakePtr(false, $locals)
+                // $t2 := vector::length<u8>($t1)
+                $t2 := A1_vector_length$u8$($t1)
+                // return $t2
+                $result := $t2
+                $Free($locals, 32)
+            }
+
+            function A2_M_test_string(v) -> $result0, $result1 {
+                let len_str, $t2, $t3, $t4, $t5, $t6, $t7, $t8
+                let $locals := $Malloc(32)
+                mstore($locals, v)
+                // $t2 := borrow_local($t0)
+                $t2 := $MakePtr(false, $locals)
+                // $t3 := vector::length<u8>($t2)
+                $t3 := A1_vector_length$u8$($t2)
+                // $t4 := borrow_local($t0)
+                $t4 := $MakePtr(false, $locals)
+                // $t5 := 1
+                $t5 := 1
+                // $t6 := -($t3, $t5)
+                $t6 := $Sub($t3, $t5)
+                // $t7 := vector::borrow<u8>($t4, $t6)
+                $t7 := A1_vector_borrow$u8$($t4, $t6)
+                // $t8 := read_ref($t7)
+                $t8 := $LoadU8($t7)
+                // return ($t3, $t8)
+                $result0 := $t3
+                $result1 := $t8
+                $Free($locals, 32)
+            }
+
+            function A1_vector_borrow$u8$(v_ref, i) -> e_ptr {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                let size := $LoadU64(v_ptr)
+                if $GtEq(i, size) { $AbortBuiltin() }
+                e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 1)))
+            }
+            function A1_vector_length$u8$(v_ref) -> len {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                len := $LoadU64(v_ptr)
+            }
+            function A1_vector_borrow$vec$u8$$(v_ref, i) -> e_ptr {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                let size := $LoadU64(v_ptr)
+                if $GtEq(i, size) { $AbortBuiltin() }
+                e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 32)))
+            }
+            function A1_vector_length$vec$u8$$(v_ref) -> len {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                len := $LoadU64(v_ptr)
+            }
+            function A1_vector_borrow$vec$vec$u8$$$(v_ref, i) -> e_ptr {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                let size := $LoadU64(v_ptr)
+                if $GtEq(i, size) { $AbortBuiltin() }
+                e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 32)))
+            }
+            function A1_vector_length$vec$vec$u8$$$(v_ref) -> len {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                len := $LoadU64(v_ptr)
+            }
+            function abi_encode_tuple_$uint64_uint8$_$u64_u8$(headStart ,value_0, value_1) -> tail {
+                tail := add(headStart, 64)
+                abi_encode_uint64(value_0, add(headStart, 0))
+                abi_encode_uint8(value_1, add(headStart, 32))
+            }
+            function abi_encode_uint8(value, pos) {
+                mstore(pos, cleanup_uint8(value))
+            }
+            function cleanup_uint8(value) -> cleaned {
+                cleaned := and(value, 0xff)
+            }
+            function abi_encode_uint64(value, pos) {
+                mstore(pos, cleanup_uint64(value))
+            }
+            function cleanup_uint64(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffff)
+            }
+            function abi_decode_tuple_$string$_$vec$u8$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_string_vec$u8$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_string_vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(1, length), 32)
+                array := abi_decode_available_length__string(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__string(src, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                if gt(add(src, sub(size, 32)), end) { $Abort(93) }
+                $CopyFromCallDataToMemory(src, dst, length)
+            }
+            function abi_encode_tuple_$uint8$_$u64$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_uint8(value_0, add(headStart, 0))
+            }
+            function abi_decode_tuple_$bytes4$_$vec$u8$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_bytes4_vec$u8$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_bytes4_vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 4
+                let size := 36
+                array := abi_decode_available_length__bytes4(offset, length, size, end)
+            }
+            function abi_decode_available_length__bytes4(src, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                if gt(add(src, sub(size, 32)), end) { $Abort(93) }
+                $CopyFromCallDataToMemory(src, dst, length)
+            }
+            function abi_encode_tuple_$uint8$_$u8$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_uint8(value_0, add(headStart, 0))
+            }
+            function abi_decode_tuple_$bytes32$_$vec$u8$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_bytes32_vec$u8$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_bytes32_vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 32
+                let size := 64
+                array := abi_decode_available_length__bytes32(offset, length, size, end)
+            }
+            function abi_decode_available_length__bytes32(src, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                if gt(add(src, sub(size, 32)), end) { $Abort(93) }
+                $CopyFromCallDataToMemory(src, dst, length)
+            }
+            function abi_decode_tuple_$bytes$_$vec$u8$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_bytes_vec$u8$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_bytes_vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(1, length), 32)
+                array := abi_decode_available_length__bytes(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__bytes(src, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                if gt(add(src, sub(size, 32)), end) { $Abort(93) }
+                $CopyFromCallDataToMemory(src, dst, length)
+            }
+            function abi_decode_tuple_$bytes5_2___$_$vec$vec$vec$u8$$$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_bytes5_2____vec$vec$vec$u8$$$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_bytes5_2____vec$vec$vec$u8$$$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(32, length), 32)
+                array := abi_decode_available_length__bytes5_2____vec$vec$vec$u8$$$(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__bytes5_2____vec$vec$vec$u8$$$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 64))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 64) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_bytes5_2__vec$vec$u8$$(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode_bytes5_2__vec$vec$u8$$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 2
+                let size := 96
+                array := abi_decode_available_length__bytes5_2__vec$vec$u8$$(offset, length, size, end)
+            }
+            function abi_decode_available_length__bytes5_2__vec$vec$u8$$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_bytes5_vec$u8$(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode_bytes5_vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 5
+                let size := 37
+                array := abi_decode_available_length__bytes5(offset, length, size, end)
+            }
+            function abi_decode_available_length__bytes5(src, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                if gt(add(src, sub(size, 32)), end) { $Abort(93) }
+                $CopyFromCallDataToMemory(src, dst, length)
+            }
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $AbortBuiltin() {
+                $Abort(sub(0, 1))
+            }
+            function $Malloc(size) -> offs {
+                offs := mload(0)
+                // pad to word size
+                mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+            }
+            function $Free(offs, size) {
+            }
+            function $MakePtr(is_storage, offs) -> ptr {
+              ptr := or(is_storage, shl(1, offs))
+            }
+            function $IsStoragePtr(ptr) -> b {
+              b := and(ptr, 0x1)
+            }
+            function $OffsetPtr(ptr) -> offs {
+              offs := shr(1, ptr)
+            }
+            function $MaskForSize(size) -> mask {
+              mask := sub(shl(shl(3, size), 1), 1)
+            }
+            function $ExtractBytes(word, start, size) -> bytes {
+               switch size
+               case 1 {
+                  // use the faster byte primitive
+                  bytes := byte(start, word)
+               }
+               default {
+                  // As we have big endian, we need to right shift the value from
+                  // where the highest byte starts in the word (32 - start), minus
+                  // the size.
+                  let shift_bits := shl(3, sub(sub(32, start), size))
+                  bytes := and(shr(shift_bits, word), $MaskForSize(size))
+               }
+            }
+            function $ToWordOffs(offs) -> word_offs, byte_offset {
+              word_offs := shr(5, offs)
+              byte_offset := and(offs, 0x1F)
+            }
+            function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+              let available_bytes := sub(32, byte_offset)
+              switch gt(size, available_bytes)
+              case 0 {
+                overflow_bytes := 0
+              }
+              default {
+                overflow_bytes := sub(size, available_bytes)
+              }
+            }
+            function $MemoryLoadBytes(offs, size) -> val {
+              // Lower bit where the value in the higher bytes ends
+              let bit_end := shl(3, sub(32, size))
+              val := shr(bit_end, mload(offs))
+            }
+            function $MemoryStoreBytes(offs, size, val) {
+              let bit_end := shl(3, sub(32, size))
+              let mask := shl(bit_end, $MaskForSize(size))
+              mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+            }
+            function $StorageLoadBytes(offs, size) -> val {
+              let word_offs, byte_offs := $ToWordOffs(offs)
+              let key := $StorageKey(0, word_offs)
+              val := $ExtractBytes(sload(key), byte_offs, size)
+              let overflow_bytes := $OverflowBytes(byte_offs, size)
+              if $LogicalNot(iszero(overflow_bytes)) {
+                key := $StorageKey(0, add(word_offs, 1))
+                let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+                val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+              }
+            }
+            function $StorageKey(group, word) -> key {
+              mstore(32, word)
+              mstore(64, shl(224, group))
+              key := keccak256(32, 36)
+            }
+            function $IndexPtr(ptr, offs) -> new_ptr {
+              new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+            }
+            function $LoadU8(ptr) -> val {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                val := $MemoryLoadU8(offs)
+              }
+              default {
+                val := $StorageLoadU8(offs)
+              }
+            }
+            function $MemoryLoadU8(offs) -> val {
+              val := $MemoryLoadBytes(offs, 1)
+            }
+            function $StorageLoadU8(offs) -> val {
+              val := $StorageLoadBytes(offs, 1)
+            }
+            function $LoadU64(ptr) -> val {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                val := $MemoryLoadU64(offs)
+              }
+              default {
+                val := $StorageLoadU64(offs)
+              }
+            }
+            function $MemoryLoadU64(offs) -> val {
+              val := $MemoryLoadBytes(offs, 8)
+            }
+            function $StorageLoadU64(offs) -> val {
+              val := $StorageLoadBytes(offs, 8)
+            }
+            function $MemoryStoreU64(offs, val) {
+              $MemoryStoreBytes(offs, 8, val)
+            }
+            function $LoadU256(ptr) -> val {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                val := $MemoryLoadU256(offs)
+              }
+              default {
+                val := $StorageLoadU256(offs)
+              }
+            }
+            function $MemoryLoadU256(offs) -> val {
+              val := $MemoryLoadBytes(offs, 32)
+            }
+            function $StorageLoadU256(offs) -> val {
+              val := $StorageLoadBytes(offs, 32)
+            }
+            function $MemoryStoreU256(offs, val) {
+              $MemoryStoreBytes(offs, 32, val)
+            }
+            function $CheckMemorySize(len) -> checked_len {
+                if gt(len, 0xffffffffffffffff) { $AbortBuiltin() }
+                checked_len := len
+            }
+            function $CopyFromCallDataToMemory(src, dst, length) {
+                calldatacopy(dst, src, length)
+                mstore(add(dst, length), 0)
+            }
+            function $AddU64(x, y) -> r {
+                if lt(sub(0xffffffffffffffff, x), y) { $AbortBuiltin() }
+                r := add(x, y)
+            }
+            function $AddU8(x, y) -> r {
+                if lt(sub(0xff, x), y) { $AbortBuiltin() }
+                r := add(x, y)
+            }
+            function $Sub(x, y) -> r {
+                if lt(x, y) { $AbortBuiltin() }
+                r := sub(x, y)
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+            function $Lt(x, y) -> r {
+                r := lt(x, y)
+            }
+            function $GtEq(x, y) -> r {
+                r := or(gt(x, y), eq(x, y))
+            }
+            function $LogicalNot(x) -> r {
+                r := iszero(x)
+            }
+            function $ClosestGreaterPowerOfTwo(x) -> r {
+                r := or(r, shr(1, x))
+                r := or(r, shr(2, r))
+                r := or(r, shr(4, r))
+                r := or(r, shr(8, r))
+                r := or(r, shr(16, r))
+                r := or(r, shr(32, r))
+                r := add(x, 1)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
diff --git a/third_party/move/evm/move-to-yul/tests/test-dispatcher/DispatcherBytesEncoding.v2_exp b/third_party/move/evm/move-to-yul/tests/test-dispatcher/DispatcherBytesEncoding.v2_exp
new file mode 100644
index 0000000000000..da26c299cc4ca
--- /dev/null
+++ b/third_party/move/evm/move-to-yul/tests/test-dispatcher/DispatcherBytesEncoding.v2_exp
@@ -0,0 +1,577 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_M" {
+    code {
+        codecopy(0, dataoffset("A2_M_deployed"), datasize("A2_M_deployed"))
+        return(0, datasize("A2_M_deployed"))
+    }
+    object "A2_M_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                case 0xa90fdf20
+                {
+                    // test_bytes(bytes)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$bytes$_$vec$u8$$(4, calldatasize())
+                    let ret_0 := A2_M_test_bytes(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$bytes$_$vec$u8$$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x5a49914b
+                {
+                    // test_bytes5_2_dynamic(bytes5[2][])
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$bytes5_2___$_$vec$vec$vec$u8$$$$(4, calldatasize())
+                    let ret_0 := A2_M_test_bytes5_2_dynamic(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$bytes5_2___$_$vec$vec$vec$u8$$$$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xb8dfacf2
+                {
+                    // test_static_bytes(bytes4,uint8)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1 := abi_decode_tuple_$bytes4_uint8$_$vec$u8$_u8$(4, calldatasize())
+                    let ret_0 := A2_M_test_static_bytes_length(param_0, param_1)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$bytes5$_$vec$u8$$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x16e560f4
+                {
+                    // test_string(string)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$string$_$vec$u8$$(4, calldatasize())
+                    let ret_0 := A2_M_test_string(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$string$_$vec$u8$$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                default {}
+            }
+            $Abort(97)
+            function A2_M_test_bytes(v) -> $result {
+                // return $t0
+                $result := v
+            }
+
+            function A2_M_test_bytes5_2_dynamic(v) -> $result {
+                // return $t0
+                $result := v
+            }
+
+            function A2_M_test_static_bytes_length(v, c) -> $result {
+                let $t2, $t3
+                let $locals := $Malloc(32)
+                mstore($locals, v)
+                // $t2 := borrow_local($t0)
+                $t2 := $MakePtr(false, $locals)
+                // vector::push_back<u8>($t2, $t1)
+                A1_vector_push_back$u8$($t2, c)
+                // $t3 := move($t0)
+                $t3 := mload($locals)
+                // return $t3
+                $result := $t3
+                $Free($locals, 32)
+            }
+
+            function A2_M_test_string(v) -> $result {
+                // return $t0
+                $result := v
+            }
+
+            function A1_vector_push_back$u8$(v_ref, e) {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                let size := $LoadU64(v_ptr)
+                let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 1)))
+                $StoreU8(e_ptr, e)
+                size := add(size, 1)
+                $StoreU64(v_ptr, size)
+                let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+                if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                    let new_v_offs := $ResizeVector(v_offs, capacity, 1)
+                    $StoreU256(v_ref, new_v_offs)
+                }
+            }
+            function abi_encode_tuple_$string$_$vec$u8$$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                mstore(add(headStart, 0), sub(tail, headStart))
+                tail := abi_encode_string(value_0,  tail)
+            }
+            function abi_encode_string(value, pos) -> end{
+                let size := $MemoryLoadU64(value)
+                mstore(pos, size)
+                pos := add(pos, 0x20)
+                $CopyMemory(add(value, 0x20), pos, size)
+                size := $RoundUp(size)
+                end := add(pos, size)
+            }
+            function abi_decode_tuple_$string$_$vec$u8$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_string_vec$u8$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_string_vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(1, length), 32)
+                array := abi_decode_available_length__string(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__string(src, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                if gt(add(src, sub(size, 32)), end) { $Abort(93) }
+                $CopyFromCallDataToMemory(src, dst, length)
+            }
+            function abi_encode_tuple_$bytes5$_$vec$u8$$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_bytes5(value_0, add(headStart, 0))
+            }
+            function abi_encode_bytes5(value, pos) {
+                let size := $MemoryLoadU64(value)
+                if iszero(eq(size, 5)) { $Abort(92) }
+                $CopyMemory(add(value, 0x20), pos, size)
+            }
+            function abi_decode_tuple_$bytes4_uint8$_$vec$u8$_u8$(headStart, dataEnd) -> value_0, value_1 {
+                if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_bytes4_vec$u8$(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_uint8(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint8(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint8(value)
+            }
+            function validator_uint8(value) {
+                if iszero(eq(value, cleanup_uint8(value))) { $Abort(95) }
+            }
+            function cleanup_uint8(value) -> cleaned {
+                cleaned := and(value, 0xff)
+            }
+            function abi_decode_bytes4_vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 4
+                let size := 36
+                array := abi_decode_available_length__bytes4(offset, length, size, end)
+            }
+            function abi_decode_available_length__bytes4(src, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                if gt(add(src, sub(size, 32)), end) { $Abort(93) }
+                $CopyFromCallDataToMemory(src, dst, length)
+            }
+            function abi_encode_tuple_$bytes5_2___$_$vec$vec$vec$u8$$$$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                mstore(add(headStart, 0), sub(tail, headStart))
+                tail := abi_encode_bytes5_2____vec$vec$vec$u8$$$(value_0,  tail)
+            }
+            function abi_encode_bytes5_2____vec$vec$vec$u8$$$(value, pos) -> end {
+                let length := $MemoryLoadU64(value)
+                mstore(pos, length)
+                pos := add(pos, 0x20)
+                let start := add(value, 32)
+                let srcEnd := add(start, mul(length, 32))
+                for { let src := start } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let v := $MemoryLoadU256(src)
+                    pos := abi_encode_bytes5_2__vec$vec$u8$$_with_updated_pos(v, pos)
+                }
+                end := pos
+            }
+            function abi_encode_bytes5_2__vec$vec$u8$$_with_updated_pos(value, pos) -> updated_pos{
+                abi_encode_bytes5_2__vec$vec$u8$$(value, pos)
+                updated_pos := add(pos, 64)
+            }
+            function abi_encode_bytes5_2__vec$vec$u8$$(value, pos)  {
+                let length := $MemoryLoadU64(value)
+                if iszero(eq(length, 2)) { $Abort(92) }
+                let start := add(value, 32)
+                let srcEnd := add(start, mul(length, 32))
+                for { let src := start } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let v := $MemoryLoadU256(src)
+                    pos := abi_encode_bytes5_with_updated_pos(v, pos)
+                }
+            }
+            function abi_encode_bytes5_with_updated_pos(value, pos) -> updated_pos{
+                abi_encode_bytes5(value, pos)
+                updated_pos := add(pos, 32)
+            }
+            function abi_decode_tuple_$bytes5_2___$_$vec$vec$vec$u8$$$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_bytes5_2____vec$vec$vec$u8$$$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_bytes5_2____vec$vec$vec$u8$$$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(32, length), 32)
+                array := abi_decode_available_length__bytes5_2____vec$vec$vec$u8$$$(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__bytes5_2____vec$vec$vec$u8$$$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 64))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 64) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_bytes5_2__vec$vec$u8$$(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode_bytes5_2__vec$vec$u8$$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 2
+                let size := 96
+                array := abi_decode_available_length__bytes5_2__vec$vec$u8$$(offset, length, size, end)
+            }
+            function abi_decode_available_length__bytes5_2__vec$vec$u8$$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_bytes5_vec$u8$(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode_bytes5_vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 5
+                let size := 37
+                array := abi_decode_available_length__bytes5(offset, length, size, end)
+            }
+            function abi_decode_available_length__bytes5(src, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                if gt(add(src, sub(size, 32)), end) { $Abort(93) }
+                $CopyFromCallDataToMemory(src, dst, length)
+            }
+            function abi_encode_tuple_$bytes$_$vec$u8$$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                mstore(add(headStart, 0), sub(tail, headStart))
+                tail := abi_encode_bytes(value_0,  tail)
+            }
+            function abi_encode_bytes(value, pos) -> end{
+                let size := $MemoryLoadU64(value)
+                mstore(pos, size)
+                pos := add(pos, 0x20)
+                $CopyMemory(add(value, 0x20), pos, size)
+                size := $RoundUp(size)
+                end := add(pos, size)
+            }
+            function abi_decode_tuple_$bytes$_$vec$u8$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_bytes_vec$u8$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_bytes_vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(1, length), 32)
+                array := abi_decode_available_length__bytes(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__bytes(src, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                if gt(add(src, sub(size, 32)), end) { $Abort(93) }
+                $CopyFromCallDataToMemory(src, dst, length)
+            }
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $AbortBuiltin() {
+                $Abort(sub(0, 1))
+            }
+            function $Malloc(size) -> offs {
+                offs := mload(0)
+                // pad to word size
+                mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+            }
+            function $Free(offs, size) {
+            }
+            function $MakePtr(is_storage, offs) -> ptr {
+              ptr := or(is_storage, shl(1, offs))
+            }
+            function $IsStoragePtr(ptr) -> b {
+              b := and(ptr, 0x1)
+            }
+            function $OffsetPtr(ptr) -> offs {
+              offs := shr(1, ptr)
+            }
+            function $MaskForSize(size) -> mask {
+              mask := sub(shl(shl(3, size), 1), 1)
+            }
+            function $ExtractBytes(word, start, size) -> bytes {
+               switch size
+               case 1 {
+                  // use the faster byte primitive
+                  bytes := byte(start, word)
+               }
+               default {
+                  // As we have big endian, we need to right shift the value from
+                  // where the highest byte starts in the word (32 - start), minus
+                  // the size.
+                  let shift_bits := shl(3, sub(sub(32, start), size))
+                  bytes := and(shr(shift_bits, word), $MaskForSize(size))
+               }
+            }
+            function $InjectBytes(word, start, size, bytes) -> new_word {
+               let shift_bits := shl(3, sub(sub(32, start), size))
+               // Blend out the bits which we inject
+               let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+               word := and(word, neg_mask)
+               // Overlay the bits we inject
+               new_word := or(word, shl(shift_bits, bytes))
+            }
+            function $ToWordOffs(offs) -> word_offs, byte_offset {
+              word_offs := shr(5, offs)
+              byte_offset := and(offs, 0x1F)
+            }
+            function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+              let available_bytes := sub(32, byte_offset)
+              switch gt(size, available_bytes)
+              case 0 {
+                overflow_bytes := 0
+              }
+              default {
+                overflow_bytes := sub(size, available_bytes)
+              }
+            }
+            function $MemoryLoadBytes(offs, size) -> val {
+              // Lower bit where the value in the higher bytes ends
+              let bit_end := shl(3, sub(32, size))
+              val := shr(bit_end, mload(offs))
+            }
+            function $MemoryStoreBytes(offs, size, val) {
+              let bit_end := shl(3, sub(32, size))
+              let mask := shl(bit_end, $MaskForSize(size))
+              mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+            }
+            function $StorageLoadBytes(offs, size) -> val {
+              let word_offs, byte_offs := $ToWordOffs(offs)
+              let key := $StorageKey(0, word_offs)
+              val := $ExtractBytes(sload(key), byte_offs, size)
+              let overflow_bytes := $OverflowBytes(byte_offs, size)
+              if $LogicalNot(iszero(overflow_bytes)) {
+                key := $StorageKey(0, add(word_offs, 1))
+                let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+                val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+              }
+            }
+            function $StorageStoreBytes(offs, size, bytes) {
+              let word_offs, byte_offs := $ToWordOffs(offs)
+              let key := $StorageKey(0, word_offs)
+              let overflow_bytes := $OverflowBytes(byte_offs, size)
+              switch overflow_bytes
+              case 0 {
+                sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+              }
+              default {
+                // Shift the higher bytes to the right
+                let used_bytes := sub(size, overflow_bytes)
+                let higher_bytes := shr(used_bytes, bytes)
+                let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+                sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+                key := $StorageKey(0, add(word_offs, 1))
+                sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+              }
+            }
+            function $StorageKey(group, word) -> key {
+              mstore(32, word)
+              mstore(64, shl(224, group))
+              key := keccak256(32, 36)
+            }
+            function $IndexPtr(ptr, offs) -> new_ptr {
+              new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+            }
+            function $StoreU8(ptr, val) {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                $MemoryStoreU8(offs, val)
+              }
+              default {
+                $StorageStoreU8(offs, val)
+              }
+            }
+            function $MemoryStoreU8(offs, val) {
+              // Shortcut via special instruction
+              mstore8(offs, val)
+            }
+            function $StorageStoreU8(offs, val) {
+              $StorageStoreBytes(offs, 1, val)
+            }
+            function $LoadU64(ptr) -> val {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                val := $MemoryLoadU64(offs)
+              }
+              default {
+                val := $StorageLoadU64(offs)
+              }
+            }
+            function $MemoryLoadU64(offs) -> val {
+              val := $MemoryLoadBytes(offs, 8)
+            }
+            function $StorageLoadU64(offs) -> val {
+              val := $StorageLoadBytes(offs, 8)
+            }
+            function $StoreU64(ptr, val) {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                $MemoryStoreU64(offs, val)
+              }
+              default {
+                $StorageStoreU64(offs, val)
+              }
+            }
+            function $MemoryStoreU64(offs, val) {
+              $MemoryStoreBytes(offs, 8, val)
+            }
+            function $StorageStoreU64(offs, val) {
+              $StorageStoreBytes(offs, 8, val)
+            }
+            function $LoadU256(ptr) -> val {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                val := $MemoryLoadU256(offs)
+              }
+              default {
+                val := $StorageLoadU256(offs)
+              }
+            }
+            function $MemoryLoadU256(offs) -> val {
+              val := $MemoryLoadBytes(offs, 32)
+            }
+            function $StorageLoadU256(offs) -> val {
+              val := $StorageLoadBytes(offs, 32)
+            }
+            function $StoreU256(ptr, val) {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                $MemoryStoreU256(offs, val)
+              }
+              default {
+                $StorageStoreU256(offs, val)
+              }
+            }
+            function $MemoryStoreU256(offs, val) {
+              $MemoryStoreBytes(offs, 32, val)
+            }
+            function $StorageStoreU256(offs, val) {
+              $StorageStoreBytes(offs, 32, val)
+            }
+            function $CopyMemory(src, dst, size) {
+              let num_words, overflow_bytes := $ToWordOffs(size)
+              let i := 0
+              for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+                mstore(add(dst, i), mload(add(src, i)))
+              }
+              if overflow_bytes {
+                let mask := $MaskForSize(sub(32, overflow_bytes))
+                let overflow_offs := mul(num_words, 32)
+                let dst_word := and(mload(add(dst, overflow_offs)), mask)
+                let src_word := and(mload(add(src, overflow_offs)), not(mask))
+                mstore(add(dst, overflow_offs), or(dst_word, src_word))
+              }
+            }
+            function $CheckMemorySize(len) -> checked_len {
+                if gt(len, 0xffffffffffffffff) { $AbortBuiltin() }
+                checked_len := len
+            }
+            function $CopyFromCallDataToMemory(src, dst, length) {
+                calldatacopy(dst, src, length)
+                mstore(add(dst, length), 0)
+            }
+            function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+                let new_capacity := mul(capacity, 2)
+                let data_size := add(32, mul(capacity, type_size))
+                let new_data_size := add(32, mul(new_capacity, type_size))
+                new_v_offs := $Malloc(new_data_size)
+                $CopyMemory(v_offs, new_v_offs, data_size)
+                // update capacity at new location
+                $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+                $Free(v_offs, data_size)
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+            function $LogicalNot(x) -> r {
+                r := iszero(x)
+            }
+            function $ClosestGreaterPowerOfTwo(x) -> r {
+                r := or(r, shr(1, x))
+                r := or(r, shr(2, r))
+                r := or(r, shr(4, r))
+                r := or(r, shr(8, r))
+                r := or(r, shr(16, r))
+                r := or(r, shr(32, r))
+                r := add(x, 1)
+            }
+            function $RoundUp(value) -> result {
+                result := and(add(value, 31), not(31))
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
diff --git a/third_party/move/evm/move-to-yul/tests/test-dispatcher/DispatcherEncodingStorage.v2_exp b/third_party/move/evm/move-to-yul/tests/test-dispatcher/DispatcherEncodingStorage.v2_exp
new file mode 100644
index 0000000000000..9112f59810d17
--- /dev/null
+++ b/third_party/move/evm/move-to-yul/tests/test-dispatcher/DispatcherEncodingStorage.v2_exp
@@ -0,0 +1,614 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_M" {
+    code {
+        codecopy(0, dataoffset("A2_M_deployed"), datasize("A2_M_deployed"))
+        return(0, datasize("A2_M_deployed"))
+    }
+    object "A2_M_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                case 0xfb4da14d
+                {
+                    // test_string()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let ret_0 := A2_M_test_string()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$string$_$vec$u8$$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x1f5ac11e
+                {
+                    // test_vec_u64()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let ret_0, ret_1 := A2_M_test_vec_u64()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$string_uint256__$_$vec$u8$_vec$A2_U256_U256$$(memPos, ret_0, ret_1)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                default {}
+            }
+            $Abort(97)
+            function A2_M_test_string() -> $result {
+                let $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11
+                let $locals := $Malloc(64)
+                // $t1 := vector::empty<u8>()
+                mstore($locals, A1_vector_empty$u8$())
+                // $t2 := borrow_local($t1)
+                $t2 := $MakePtr(false, $locals)
+                // $t3 := 65
+                $t3 := 65
+                // vector::push_back<u8>($t2, $t3)
+                A1_vector_push_back$u8$($t2, $t3)
+                // $t4 := 0x42
+                $t4 := 0x42
+                // $t0 := Evm::sign($t4)
+                mstore(add($locals, 32), A2_Evm_sign($t4))
+                // $t5 := borrow_local($t0)
+                $t5 := $MakePtr(false, add($locals, 32))
+                // $t6 := move($t1)
+                $t6 := mload($locals)
+                // $t7 := pack M::T<u8>($t6)
+                {
+                    let $mem := $Malloc(32)
+                    $MemoryStoreU256(add($mem, 0), $t6)
+                    $t7 := $mem
+                }
+                // move_to<M::T<u8>>($t7, $t5)
+                {
+                    let $base_offset := $MakeTypeStorageBase(0, 0x2e75402e, $LoadU256($t5))
+                    if $AlignedStorageLoad($base_offset) {
+                      $AbortBuiltin()
+                    }
+                    $AlignedStorageStore($base_offset, true)
+                    {
+                        let $dst := add($base_offset, 32)
+                        let $src := $t7
+                        {
+                            let $linked_src_2300595445 := mload(add($src, 0))
+                            let $linked_dst_2300595445 := $NewLinkedStorageBase(0x89204cf5)
+                            let $size_2300595445 := $MemoryLoadU64($linked_src_2300595445)
+                            let $data_size_2300595445 := mul($size_2300595445, 1)
+                            $AlignedStorageStore($linked_dst_2300595445, mload($linked_src_2300595445))
+                            let $data_src_2300595445 := add($linked_src_2300595445, 32)
+                            let $data_dst_2300595445 := add($linked_dst_2300595445, 32)
+                            for { let $offs_2300595445 := 0 } lt($offs_2300595445, $data_size_2300595445) { $offs_2300595445 := add($offs_2300595445, 32)} {
+                                $AlignedStorageStore(add($data_dst_2300595445, $offs_2300595445), mload(add($data_src_2300595445, $offs_2300595445)))
+                                $Free($linked_src_2300595445, add($data_size_2300595445, 32))
+                            }
+                            $AlignedStorageStore(add($dst, 0), $linked_dst_2300595445)
+                        }
+                        $Free($src, 32)
+                    }
+                }
+                // $t8 := 0x42
+                $t8 := 0x42
+                // $t9 := borrow_global<M::T<u8>>($t8)
+                {
+                    let $base_offset := $MakeTypeStorageBase(0, 0x2e75402e, $t8)
+                    if iszero($AlignedStorageLoad($base_offset)) {
+                      $AbortBuiltin()
+                    }
+                    $t9 := $MakePtr(true, add($base_offset, 32))
+                }
+                // $t10 := borrow_field<M::T<u8>>.v($t9)
+                $t10 := $t9
+                // $t11 := read_ref($t10)
+                $t11 := $LoadU256($t10)
+                if $IsStoragePtr($t10){
+                    let $storage_ptr_2300595445
+                    let $size_2300595445 := $StorageLoadU64($t11)
+                    let $capacity_2300595445 := $ClosestGreaterPowerOfTwo($size_2300595445)
+                    $storage_ptr_2300595445 := $Malloc(add(32, mul($capacity_2300595445, 1)))
+                    let $data_size_2300595445 := mul($size_2300595445, 1)
+                    mstore($storage_ptr_2300595445, $AlignedStorageLoad($t11))
+                    $MemoryStoreU64(add($storage_ptr_2300595445, 8), $capacity_2300595445)
+                    let $data_src_2300595445 := add($t11, 32)
+                    let $data_dst_2300595445 := add($storage_ptr_2300595445, 32)
+                    for { let $offs_2300595445 := 0 } lt($offs_2300595445, $data_size_2300595445) { $offs_2300595445 := add($offs_2300595445, 32)} {
+                        mstore(add($data_dst_2300595445, $offs_2300595445), $AlignedStorageLoad(add($data_src_2300595445, $offs_2300595445)))
+                    }
+                    $t11 := $storage_ptr_2300595445
+                }
+                // return $t11
+                $result := $t11
+                $Free($locals, 64)
+            }
+
+            function A2_M_test_vec_u64() -> $result0, $result1 {
+                let $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21
+                let $locals := $Malloc(96)
+                // $t1 := vector::empty<u8>()
+                mstore($locals, A1_vector_empty$u8$())
+                // $t3 := borrow_local($t1)
+                $t3 := $MakePtr(false, $locals)
+                // $t4 := 65
+                $t4 := 65
+                // vector::push_back<u8>($t3, $t4)
+                A1_vector_push_back$u8$($t3, $t4)
+                // $t2 := vector::empty<U256::U256>()
+                mstore(add($locals, 32), A1_vector_empty$A2_U256_U256$())
+                // $t5 := borrow_local($t2)
+                $t5 := $MakePtr(false, add($locals, 32))
+                // $t6 := 64
+                $t6 := 64
+                // vector::push_back<U256::U256>($t5, $t6)
+                A1_vector_push_back$A2_U256_U256$($t5, $t6)
+                // $t7 := borrow_local($t2)
+                $t7 := $MakePtr(false, add($locals, 32))
+                // $t8 := 65
+                $t8 := 65
+                // vector::push_back<U256::U256>($t7, $t8)
+                A1_vector_push_back$A2_U256_U256$($t7, $t8)
+                // $t9 := 0x42
+                $t9 := 0x42
+                // $t0 := Evm::sign($t9)
+                mstore(add($locals, 64), A2_Evm_sign($t9))
+                // $t10 := borrow_local($t0)
+                $t10 := $MakePtr(false, add($locals, 64))
+                // $t11 := move($t1)
+                $t11 := mload($locals)
+                // $t12 := move($t2)
+                $t12 := mload(add($locals, 32))
+                // $t13 := pack M::State($t11, $t12)
+                {
+                    let $mem := $Malloc(64)
+                    $MemoryStoreU256(add($mem, 0), $t11)
+                    $MemoryStoreU256(add($mem, 32), $t12)
+                    $t13 := $mem
+                }
+                // move_to<M::State>($t13, $t10)
+                {
+                    let $base_offset := $MakeTypeStorageBase(0, 0x7d9cc237, $LoadU256($t10))
+                    if $AlignedStorageLoad($base_offset) {
+                      $AbortBuiltin()
+                    }
+                    $AlignedStorageStore($base_offset, true)
+                    {
+                        let $dst := add($base_offset, 32)
+                        let $src := $t13
+                        {
+                            let $linked_src_2300595445 := mload(add($src, 0))
+                            let $linked_dst_2300595445 := $NewLinkedStorageBase(0x89204cf5)
+                            let $size_2300595445 := $MemoryLoadU64($linked_src_2300595445)
+                            let $data_size_2300595445 := mul($size_2300595445, 1)
+                            $AlignedStorageStore($linked_dst_2300595445, mload($linked_src_2300595445))
+                            let $data_src_2300595445 := add($linked_src_2300595445, 32)
+                            let $data_dst_2300595445 := add($linked_dst_2300595445, 32)
+                            for { let $offs_2300595445 := 0 } lt($offs_2300595445, $data_size_2300595445) { $offs_2300595445 := add($offs_2300595445, 32)} {
+                                $AlignedStorageStore(add($data_dst_2300595445, $offs_2300595445), mload(add($data_src_2300595445, $offs_2300595445)))
+                                $Free($linked_src_2300595445, add($data_size_2300595445, 32))
+                            }
+                            $AlignedStorageStore(add($dst, 0), $linked_dst_2300595445)
+                        }
+                        {
+                            let $linked_src_3901948120 := mload(add($src, 32))
+                            let $linked_dst_3901948120 := $NewLinkedStorageBase(0xe89300d8)
+                            let $size_3901948120 := $MemoryLoadU64($linked_src_3901948120)
+                            let $data_size_3901948120 := mul($size_3901948120, 32)
+                            $AlignedStorageStore($linked_dst_3901948120, mload($linked_src_3901948120))
+                            let $data_src_3901948120 := add($linked_src_3901948120, 32)
+                            let $data_dst_3901948120 := add($linked_dst_3901948120, 32)
+                            for { let $offs_3901948120 := 0 } lt($offs_3901948120, $data_size_3901948120) { $offs_3901948120 := add($offs_3901948120, 32)} {
+                                $AlignedStorageStore(add($data_dst_3901948120, $offs_3901948120), mload(add($data_src_3901948120, $offs_3901948120)))
+                                $Free($linked_src_3901948120, add($data_size_3901948120, 32))
+                            }
+                            $AlignedStorageStore(add($dst, 32), $linked_dst_3901948120)
+                        }
+                        $Free($src, 64)
+                    }
+                }
+                // $t14 := 0x42
+                $t14 := 0x42
+                // $t15 := borrow_global<M::State>($t14)
+                {
+                    let $base_offset := $MakeTypeStorageBase(0, 0x7d9cc237, $t14)
+                    if iszero($AlignedStorageLoad($base_offset)) {
+                      $AbortBuiltin()
+                    }
+                    $t15 := $MakePtr(true, add($base_offset, 32))
+                }
+                // $t16 := borrow_field<M::State>.s1($t15)
+                $t16 := $t15
+                // $t17 := read_ref($t16)
+                $t17 := $LoadU256($t16)
+                if $IsStoragePtr($t16){
+                    let $storage_ptr_2300595445
+                    let $size_2300595445 := $StorageLoadU64($t17)
+                    let $capacity_2300595445 := $ClosestGreaterPowerOfTwo($size_2300595445)
+                    $storage_ptr_2300595445 := $Malloc(add(32, mul($capacity_2300595445, 1)))
+                    let $data_size_2300595445 := mul($size_2300595445, 1)
+                    mstore($storage_ptr_2300595445, $AlignedStorageLoad($t17))
+                    $MemoryStoreU64(add($storage_ptr_2300595445, 8), $capacity_2300595445)
+                    let $data_src_2300595445 := add($t17, 32)
+                    let $data_dst_2300595445 := add($storage_ptr_2300595445, 32)
+                    for { let $offs_2300595445 := 0 } lt($offs_2300595445, $data_size_2300595445) { $offs_2300595445 := add($offs_2300595445, 32)} {
+                        mstore(add($data_dst_2300595445, $offs_2300595445), $AlignedStorageLoad(add($data_src_2300595445, $offs_2300595445)))
+                    }
+                    $t17 := $storage_ptr_2300595445
+                }
+                // $t18 := 0x42
+                $t18 := 0x42
+                // $t19 := borrow_global<M::State>($t18)
+                {
+                    let $base_offset := $MakeTypeStorageBase(0, 0x7d9cc237, $t18)
+                    if iszero($AlignedStorageLoad($base_offset)) {
+                      $AbortBuiltin()
+                    }
+                    $t19 := $MakePtr(true, add($base_offset, 32))
+                }
+                // $t20 := borrow_field<M::State>.s2($t19)
+                $t20 := $IndexPtr($t19, 32)
+                // $t21 := read_ref($t20)
+                $t21 := $LoadU256($t20)
+                if $IsStoragePtr($t20){
+                    let $storage_ptr_3901948120
+                    let $size_3901948120 := $StorageLoadU64($t21)
+                    let $capacity_3901948120 := $ClosestGreaterPowerOfTwo($size_3901948120)
+                    $storage_ptr_3901948120 := $Malloc(add(32, mul($capacity_3901948120, 32)))
+                    let $data_size_3901948120 := mul($size_3901948120, 32)
+                    mstore($storage_ptr_3901948120, $AlignedStorageLoad($t21))
+                    $MemoryStoreU64(add($storage_ptr_3901948120, 8), $capacity_3901948120)
+                    let $data_src_3901948120 := add($t21, 32)
+                    let $data_dst_3901948120 := add($storage_ptr_3901948120, 32)
+                    for { let $offs_3901948120 := 0 } lt($offs_3901948120, $data_size_3901948120) { $offs_3901948120 := add($offs_3901948120, 32)} {
+                        mstore(add($data_dst_3901948120, $offs_3901948120), $AlignedStorageLoad(add($data_src_3901948120, $offs_3901948120)))
+                    }
+                    $t21 := $storage_ptr_3901948120
+                }
+                // return ($t17, $t21)
+                $result0 := $t17
+                $result1 := $t21
+                $Free($locals, 96)
+            }
+
+            function A2_Evm_sign(addr) -> signer {
+              signer := addr
+            }
+            function A1_vector_push_back$A2_U256_U256$(v_ref, e) {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                let size := $LoadU64(v_ptr)
+                let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 32)))
+                $StoreU256(e_ptr, e)
+                size := add(size, 1)
+                $StoreU64(v_ptr, size)
+                let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+                if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                    let new_v_offs := $ResizeVector(v_offs, capacity, 32)
+                    $StoreU256(v_ref, new_v_offs)
+                }
+            }
+            function A1_vector_empty$A2_U256_U256$() -> vector {
+                vector := $Malloc(96)
+                $MemoryStoreU64(add(vector, 8), 2)
+            }
+            function A1_vector_push_back$u8$(v_ref, e) {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                let size := $LoadU64(v_ptr)
+                let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 1)))
+                $StoreU8(e_ptr, e)
+                size := add(size, 1)
+                $StoreU64(v_ptr, size)
+                let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+                if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                    let new_v_offs := $ResizeVector(v_offs, capacity, 1)
+                    $StoreU256(v_ref, new_v_offs)
+                }
+            }
+            function A1_vector_empty$u8$() -> vector {
+                vector := $Malloc(34)
+                $MemoryStoreU64(add(vector, 8), 2)
+            }
+            function abi_encode_tuple_$string_uint256__$_$vec$u8$_vec$A2_U256_U256$$(headStart ,value_0, value_1) -> tail {
+                tail := add(headStart, 64)
+                mstore(add(headStart, 0), sub(tail, headStart))
+                tail := abi_encode_string(value_0,  tail)
+                mstore(add(headStart, 32), sub(tail, headStart))
+                tail := abi_encode_uint256___vec$A2_U256_U256$(value_1,  tail)
+            }
+            function abi_encode_uint256___vec$A2_U256_U256$(value, pos) -> end {
+                let length := $MemoryLoadU64(value)
+                mstore(pos, length)
+                pos := add(pos, 0x20)
+                let start := add(value, 32)
+                let srcEnd := add(start, mul(length, 32))
+                for { let src := start } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let v := $MemoryLoadU256(src)
+                    pos := abi_encode_uint256_with_updated_pos(v, pos)
+                }
+                end := pos
+            }
+            function abi_encode_uint256_with_updated_pos(value, pos) -> updated_pos{
+                abi_encode_uint256(value, pos)
+                updated_pos := add(pos, 32)
+            }
+            function abi_encode_uint256(value, pos) {
+                mstore(pos, cleanup_uint256(value))
+            }
+            function cleanup_uint256(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)
+            }
+            function abi_encode_string(value, pos) -> end{
+                let size := $MemoryLoadU64(value)
+                mstore(pos, size)
+                pos := add(pos, 0x20)
+                $CopyMemory(add(value, 0x20), pos, size)
+                size := $RoundUp(size)
+                end := add(pos, size)
+            }
+            function abi_encode_tuple_$string$_$vec$u8$$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                mstore(add(headStart, 0), sub(tail, headStart))
+                tail := abi_encode_string(value_0,  tail)
+            }
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $AbortBuiltin() {
+                $Abort(sub(0, 1))
+            }
+            function $Malloc(size) -> offs {
+                offs := mload(0)
+                // pad to word size
+                mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+            }
+            function $Free(offs, size) {
+            }
+            function $MakePtr(is_storage, offs) -> ptr {
+              ptr := or(is_storage, shl(1, offs))
+            }
+            function $IsStoragePtr(ptr) -> b {
+              b := and(ptr, 0x1)
+            }
+            function $OffsetPtr(ptr) -> offs {
+              offs := shr(1, ptr)
+            }
+            function $MaskForSize(size) -> mask {
+              mask := sub(shl(shl(3, size), 1), 1)
+            }
+            function $ExtractBytes(word, start, size) -> bytes {
+               switch size
+               case 1 {
+                  // use the faster byte primitive
+                  bytes := byte(start, word)
+               }
+               default {
+                  // As we have big endian, we need to right shift the value from
+                  // where the highest byte starts in the word (32 - start), minus
+                  // the size.
+                  let shift_bits := shl(3, sub(sub(32, start), size))
+                  bytes := and(shr(shift_bits, word), $MaskForSize(size))
+               }
+            }
+            function $InjectBytes(word, start, size, bytes) -> new_word {
+               let shift_bits := shl(3, sub(sub(32, start), size))
+               // Blend out the bits which we inject
+               let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+               word := and(word, neg_mask)
+               // Overlay the bits we inject
+               new_word := or(word, shl(shift_bits, bytes))
+            }
+            function $ToWordOffs(offs) -> word_offs, byte_offset {
+              word_offs := shr(5, offs)
+              byte_offset := and(offs, 0x1F)
+            }
+            function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+              let available_bytes := sub(32, byte_offset)
+              switch gt(size, available_bytes)
+              case 0 {
+                overflow_bytes := 0
+              }
+              default {
+                overflow_bytes := sub(size, available_bytes)
+              }
+            }
+            function $MemoryLoadBytes(offs, size) -> val {
+              // Lower bit where the value in the higher bytes ends
+              let bit_end := shl(3, sub(32, size))
+              val := shr(bit_end, mload(offs))
+            }
+            function $MemoryStoreBytes(offs, size, val) {
+              let bit_end := shl(3, sub(32, size))
+              let mask := shl(bit_end, $MaskForSize(size))
+              mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+            }
+            function $StorageLoadBytes(offs, size) -> val {
+              let word_offs, byte_offs := $ToWordOffs(offs)
+              let key := $StorageKey(0, word_offs)
+              val := $ExtractBytes(sload(key), byte_offs, size)
+              let overflow_bytes := $OverflowBytes(byte_offs, size)
+              if $LogicalNot(iszero(overflow_bytes)) {
+                key := $StorageKey(0, add(word_offs, 1))
+                let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+                val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+              }
+            }
+            function $StorageStoreBytes(offs, size, bytes) {
+              let word_offs, byte_offs := $ToWordOffs(offs)
+              let key := $StorageKey(0, word_offs)
+              let overflow_bytes := $OverflowBytes(byte_offs, size)
+              switch overflow_bytes
+              case 0 {
+                sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+              }
+              default {
+                // Shift the higher bytes to the right
+                let used_bytes := sub(size, overflow_bytes)
+                let higher_bytes := shr(used_bytes, bytes)
+                let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+                sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+                key := $StorageKey(0, add(word_offs, 1))
+                sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+              }
+            }
+            function $StorageKey(group, word) -> key {
+              mstore(32, word)
+              mstore(64, shl(224, group))
+              key := keccak256(32, 36)
+            }
+            function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+              offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+            }
+            function $NewLinkedStorageBase(type_hash) -> offs {
+              let key := $StorageKey(1, 1)
+              let handle := sload(key)
+              sstore(key, add(handle, 1))
+              offs := $MakeTypeStorageBase(1, type_hash, handle)
+            }
+            function $IndexPtr(ptr, offs) -> new_ptr {
+              new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+            }
+            function $StoreU8(ptr, val) {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                $MemoryStoreU8(offs, val)
+              }
+              default {
+                $StorageStoreU8(offs, val)
+              }
+            }
+            function $MemoryStoreU8(offs, val) {
+              // Shortcut via special instruction
+              mstore8(offs, val)
+            }
+            function $StorageStoreU8(offs, val) {
+              $StorageStoreBytes(offs, 1, val)
+            }
+            function $LoadU64(ptr) -> val {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                val := $MemoryLoadU64(offs)
+              }
+              default {
+                val := $StorageLoadU64(offs)
+              }
+            }
+            function $MemoryLoadU64(offs) -> val {
+              val := $MemoryLoadBytes(offs, 8)
+            }
+            function $StorageLoadU64(offs) -> val {
+              val := $StorageLoadBytes(offs, 8)
+            }
+            function $StoreU64(ptr, val) {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                $MemoryStoreU64(offs, val)
+              }
+              default {
+                $StorageStoreU64(offs, val)
+              }
+            }
+            function $MemoryStoreU64(offs, val) {
+              $MemoryStoreBytes(offs, 8, val)
+            }
+            function $StorageStoreU64(offs, val) {
+              $StorageStoreBytes(offs, 8, val)
+            }
+            function $LoadU256(ptr) -> val {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                val := $MemoryLoadU256(offs)
+              }
+              default {
+                val := $StorageLoadU256(offs)
+              }
+            }
+            function $MemoryLoadU256(offs) -> val {
+              val := $MemoryLoadBytes(offs, 32)
+            }
+            function $StorageLoadU256(offs) -> val {
+              val := $StorageLoadBytes(offs, 32)
+            }
+            function $StoreU256(ptr, val) {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                $MemoryStoreU256(offs, val)
+              }
+              default {
+                $StorageStoreU256(offs, val)
+              }
+            }
+            function $MemoryStoreU256(offs, val) {
+              $MemoryStoreBytes(offs, 32, val)
+            }
+            function $StorageStoreU256(offs, val) {
+              $StorageStoreBytes(offs, 32, val)
+            }
+            function $AlignedStorageLoad(offs) -> val {
+              let word_offs := shr(5, offs)
+              val := sload($StorageKey(0, word_offs))
+            }
+            function $AlignedStorageStore(offs, val) {
+              let word_offs := shr(5, offs)
+              sstore($StorageKey(0, word_offs), val)
+            }
+            function $CopyMemory(src, dst, size) {
+              let num_words, overflow_bytes := $ToWordOffs(size)
+              let i := 0
+              for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+                mstore(add(dst, i), mload(add(src, i)))
+              }
+              if overflow_bytes {
+                let mask := $MaskForSize(sub(32, overflow_bytes))
+                let overflow_offs := mul(num_words, 32)
+                let dst_word := and(mload(add(dst, overflow_offs)), mask)
+                let src_word := and(mload(add(src, overflow_offs)), not(mask))
+                mstore(add(dst, overflow_offs), or(dst_word, src_word))
+              }
+            }
+            function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+                let new_capacity := mul(capacity, 2)
+                let data_size := add(32, mul(capacity, type_size))
+                let new_data_size := add(32, mul(new_capacity, type_size))
+                new_v_offs := $Malloc(new_data_size)
+                $CopyMemory(v_offs, new_v_offs, data_size)
+                // update capacity at new location
+                $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+                $Free(v_offs, data_size)
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+            function $LogicalNot(x) -> r {
+                r := iszero(x)
+            }
+            function $ClosestGreaterPowerOfTwo(x) -> r {
+                r := or(r, shr(1, x))
+                r := or(r, shr(2, r))
+                r := or(r, shr(4, r))
+                r := or(r, shr(8, r))
+                r := or(r, shr(16, r))
+                r := or(r, shr(32, r))
+                r := add(x, 1)
+            }
+            function $RoundUp(value) -> result {
+                result := and(add(value, 31), not(31))
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
diff --git a/third_party/move/evm/move-to-yul/tests/test-dispatcher/DispatcherFallback.v2_exp b/third_party/move/evm/move-to-yul/tests/test-dispatcher/DispatcherFallback.v2_exp
new file mode 100644
index 0000000000000..e502cfce412d7
--- /dev/null
+++ b/third_party/move/evm/move-to-yul/tests/test-dispatcher/DispatcherFallback.v2_exp
@@ -0,0 +1,73 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_M" {
+    code {
+        codecopy(0, dataoffset("A2_M_deployed"), datasize("A2_M_deployed"))
+        return(0, datasize("A2_M_deployed"))
+    }
+    object "A2_M_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                case 0xe44f11ec
+                {
+                    // return_0()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let ret_0 := A2_M_return_0()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint128$_$u128$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                default {}
+            }
+            if callvalue()
+            {
+                $Abort(99)
+            }
+            {
+                A2_M_fallback() stop()
+            }
+            function A2_M_return_0() -> $result {
+                let $t0
+                // $t0 := 0
+                $t0 := 0
+                // return $t0
+                $result := $t0
+            }
+
+            function A2_M_fallback() {
+                // return ()
+            }
+
+            function abi_encode_tuple_$uint128$_$u128$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_uint128(value_0, add(headStart, 0))
+            }
+            function abi_encode_uint128(value, pos) {
+                mstore(pos, cleanup_uint128(value))
+            }
+            function cleanup_uint128(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffffffffffffffffffff)
+            }
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
diff --git a/third_party/move/evm/move-to-yul/tests/test-dispatcher/DispatcherMultiParaDecoding.v2_exp b/third_party/move/evm/move-to-yul/tests/test-dispatcher/DispatcherMultiParaDecoding.v2_exp
new file mode 100644
index 0000000000000..66c6c90a602dd
--- /dev/null
+++ b/third_party/move/evm/move-to-yul/tests/test-dispatcher/DispatcherMultiParaDecoding.v2_exp
@@ -0,0 +1,620 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_M" {
+    code {
+        codecopy(0, dataoffset("A2_M_deployed"), datasize("A2_M_deployed"))
+        return(0, datasize("A2_M_deployed"))
+    }
+    object "A2_M_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                case 0x1132a93c
+                {
+                    // test_static_array_string_static_array_string(string,uint8[2],string,uint8[2])
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1, param_2, param_3 := abi_decode_tuple_$string_uint8_2__string_uint8_2_$_$vec$u8$_vec$u8$_vec$u8$_vec$u8$$(4, calldatasize())
+                    let ret_0, ret_1 := A2_M_test_static_array_string_static_array_string(param_0, param_1, param_2, param_3)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint64_uint8$_$u64_u8$(memPos, ret_0, ret_1)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x1b27dd62
+                {
+                    // test_string_length_sum(string,string)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1 := abi_decode_tuple_$string_string$_$vec$u8$_vec$u8$$(4, calldatasize())
+                    let ret_0 := A2_M_test_string_length_sum(param_0, param_1)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint64$_$u64$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xfd03176e
+                {
+                    // test_u8_array_2_uint64(uint8[2],uint64)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1 := abi_decode_tuple_$uint8_2__uint64$_$vec$u8$_u64$(4, calldatasize())
+                    let ret_0 := A2_M_test_u8_array_2_uint_64(param_0, param_1)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint8$_$u8$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xa1e082ab
+                {
+                    // test_u8_array_uint64_u8_array_uint64(uint8[2],uint64,uint8[2],uint64)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1, param_2, param_3 := abi_decode_tuple_$uint8_2__uint64_uint8_2__uint64$_$vec$u8$_u64_vec$u8$_u64$(4, calldatasize())
+                    let ret_0 := A2_M_test_u8_array_uint64_u8_array_uint64(param_0, param_1, param_2, param_3)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint8$_$u8$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x1483ff3b
+                {
+                    // test_uint64_u8_array_3_uint64(uint64,uint8[3],uint64)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1, param_2 := abi_decode_tuple_$uint64_uint8_3__uint64$_$u64_vec$u8$_u64$(4, calldatasize())
+                    let ret_0, ret_1 := A2_M_test_u8_uint_64_array_2(param_0, param_1, param_2)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint8_uint8$_$u8_u8$(memPos, ret_0, ret_1)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                default {}
+            }
+            $Abort(97)
+            function A2_M_test_static_array_string_static_array_string(str_1, array_1, str_2, array_2) -> $result0, $result1 {
+                let len_array_1, len_array_2, len_str_1, len_str_2, len_sum, val_1, val_2, val_3, val_4, val_sum, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32, $t33, $t34, $t35, $t36, $t37, $t38, $t39, $t40, $t41, $t42, $t43, $t44, $t45, $t46, $t47
+                let $locals := $Malloc(128)
+                mstore($locals, str_1)
+                mstore(add($locals, 64), array_1)
+                mstore(add($locals, 32), str_2)
+                mstore(add($locals, 96), array_2)
+                // $t14 := borrow_local($t0)
+                $t14 := $MakePtr(false, $locals)
+                // $t15 := vector::length<u8>($t14)
+                $t15 := A1_vector_length$u8$($t14)
+                // $t16 := borrow_local($t2)
+                $t16 := $MakePtr(false, add($locals, 32))
+                // $t17 := vector::length<u8>($t16)
+                $t17 := A1_vector_length$u8$($t16)
+                // $t18 := borrow_local($t1)
+                $t18 := $MakePtr(false, add($locals, 64))
+                // $t19 := vector::length<u8>($t18)
+                $t19 := A1_vector_length$u8$($t18)
+                // $t20 := borrow_local($t3)
+                $t20 := $MakePtr(false, add($locals, 96))
+                // $t21 := vector::length<u8>($t20)
+                $t21 := A1_vector_length$u8$($t20)
+                // $t22 := +($t15, $t17)
+                $t22 := $AddU64($t15, $t17)
+                // $t23 := +($t22, $t19)
+                $t23 := $AddU64($t22, $t19)
+                // $t24 := +($t23, $t21)
+                $t24 := $AddU64($t23, $t21)
+                // $t25 := borrow_local($t0)
+                $t25 := $MakePtr(false, $locals)
+                // $t26 := 1
+                $t26 := 1
+                // $t27 := -($t15, $t26)
+                $t27 := $Sub($t15, $t26)
+                // $t28 := vector::borrow<u8>($t25, $t27)
+                $t28 := A1_vector_borrow$u8$($t25, $t27)
+                // $t29 := read_ref($t28)
+                $t29 := $LoadU8($t28)
+                // $t30 := borrow_local($t2)
+                $t30 := $MakePtr(false, add($locals, 32))
+                // $t31 := 1
+                $t31 := 1
+                // $t32 := -($t17, $t31)
+                $t32 := $Sub($t17, $t31)
+                // $t33 := vector::borrow<u8>($t30, $t32)
+                $t33 := A1_vector_borrow$u8$($t30, $t32)
+                // $t34 := read_ref($t33)
+                $t34 := $LoadU8($t33)
+                // $t35 := borrow_local($t1)
+                $t35 := $MakePtr(false, add($locals, 64))
+                // $t36 := 1
+                $t36 := 1
+                // $t37 := -($t19, $t36)
+                $t37 := $Sub($t19, $t36)
+                // $t38 := vector::borrow<u8>($t35, $t37)
+                $t38 := A1_vector_borrow$u8$($t35, $t37)
+                // $t39 := read_ref($t38)
+                $t39 := $LoadU8($t38)
+                // $t40 := borrow_local($t3)
+                $t40 := $MakePtr(false, add($locals, 96))
+                // $t41 := 1
+                $t41 := 1
+                // $t42 := -($t21, $t41)
+                $t42 := $Sub($t21, $t41)
+                // $t43 := vector::borrow<u8>($t40, $t42)
+                $t43 := A1_vector_borrow$u8$($t40, $t42)
+                // $t44 := read_ref($t43)
+                $t44 := $LoadU8($t43)
+                // $t45 := +($t29, $t34)
+                $t45 := $AddU8($t29, $t34)
+                // $t46 := +($t45, $t39)
+                $t46 := $AddU8($t45, $t39)
+                // $t47 := +($t46, $t44)
+                $t47 := $AddU8($t46, $t44)
+                // return ($t24, $t47)
+                $result0 := $t24
+                $result1 := $t47
+                $Free($locals, 128)
+            }
+
+            function A2_M_test_string_length_sum(str_1, str_2) -> $result {
+                let $t2, $t3, $t4, $t5, $t6
+                let $locals := $Malloc(64)
+                mstore($locals, str_1)
+                mstore(add($locals, 32), str_2)
+                // $t2 := borrow_local($t0)
+                $t2 := $MakePtr(false, $locals)
+                // $t3 := vector::length<u8>($t2)
+                $t3 := A1_vector_length$u8$($t2)
+                // $t4 := borrow_local($t1)
+                $t4 := $MakePtr(false, add($locals, 32))
+                // $t5 := vector::length<u8>($t4)
+                $t5 := A1_vector_length$u8$($t4)
+                // $t6 := +($t3, $t5)
+                $t6 := $AddU64($t3, $t5)
+                // return $t6
+                $result := $t6
+                $Free($locals, 64)
+            }
+
+            function A2_M_test_u8_array_2_uint_64(v, idx) -> $result {
+                let $t2, $t3, $t4
+                let $locals := $Malloc(32)
+                mstore($locals, v)
+                // $t2 := borrow_local($t0)
+                $t2 := $MakePtr(false, $locals)
+                // $t3 := vector::borrow<u8>($t2, $t1)
+                $t3 := A1_vector_borrow$u8$($t2, idx)
+                // $t4 := read_ref($t3)
+                $t4 := $LoadU8($t3)
+                // return $t4
+                $result := $t4
+                $Free($locals, 32)
+            }
+
+            function A2_M_test_u8_array_uint64_u8_array_uint64(v_1, idx_1, v_2, idx_2) -> $result {
+                let $t4, $t5, $t6, $t7, $t8, $t9, $t10
+                let $locals := $Malloc(64)
+                mstore($locals, v_1)
+                mstore(add($locals, 32), v_2)
+                // $t4 := borrow_local($t0)
+                $t4 := $MakePtr(false, $locals)
+                // $t5 := vector::borrow<u8>($t4, $t1)
+                $t5 := A1_vector_borrow$u8$($t4, idx_1)
+                // $t6 := read_ref($t5)
+                $t6 := $LoadU8($t5)
+                // $t7 := borrow_local($t2)
+                $t7 := $MakePtr(false, add($locals, 32))
+                // $t8 := vector::borrow<u8>($t7, $t3)
+                $t8 := A1_vector_borrow$u8$($t7, idx_2)
+                // $t9 := read_ref($t8)
+                $t9 := $LoadU8($t8)
+                // $t10 := +($t6, $t9)
+                $t10 := $AddU8($t6, $t9)
+                // return $t10
+                $result := $t10
+                $Free($locals, 64)
+            }
+
+            function A2_M_test_u8_uint_64_array_2(idx_1, v, idx_2) -> $result0, $result1 {
+                let $t3, $t4, $t5, $t6, $t7, $t8
+                let $locals := $Malloc(32)
+                mstore($locals, v)
+                // $t3 := borrow_local($t1)
+                $t3 := $MakePtr(false, $locals)
+                // $t4 := vector::borrow<u8>($t3, $t0)
+                $t4 := A1_vector_borrow$u8$($t3, idx_1)
+                // $t5 := read_ref($t4)
+                $t5 := $LoadU8($t4)
+                // $t6 := borrow_local($t1)
+                $t6 := $MakePtr(false, $locals)
+                // $t7 := vector::borrow<u8>($t6, $t2)
+                $t7 := A1_vector_borrow$u8$($t6, idx_2)
+                // $t8 := read_ref($t7)
+                $t8 := $LoadU8($t7)
+                // return ($t5, $t8)
+                $result0 := $t5
+                $result1 := $t8
+                $Free($locals, 32)
+            }
+
+            function A1_vector_borrow$u8$(v_ref, i) -> e_ptr {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                let size := $LoadU64(v_ptr)
+                if $GtEq(i, size) { $AbortBuiltin() }
+                e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 1)))
+            }
+            function A1_vector_length$u8$(v_ref) -> len {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                len := $LoadU64(v_ptr)
+            }
+            function abi_encode_tuple_$uint8_uint8$_$u8_u8$(headStart ,value_0, value_1) -> tail {
+                tail := add(headStart, 64)
+                abi_encode_uint8(value_0, add(headStart, 0))
+                abi_encode_uint8(value_1, add(headStart, 32))
+            }
+            function abi_encode_uint8(value, pos) {
+                mstore(pos, cleanup_uint8(value))
+            }
+            function cleanup_uint8(value) -> cleaned {
+                cleaned := and(value, 0xff)
+            }
+            function abi_decode_tuple_$uint64_uint8_3__uint64$_$u64_vec$u8$_u64$(headStart, dataEnd) -> value_0, value_1, value_2 {
+                if slt(sub(dataEnd, headStart), 160) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_uint64(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_uint8_3__vec$u8$(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 128
+                    value_2 := abi_decode_uint64(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint64(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint64(value)
+            }
+            function validator_uint64(value) {
+                if iszero(eq(value, cleanup_uint64(value))) { $Abort(95) }
+            }
+            function cleanup_uint64(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffff)
+            }
+            function abi_decode_uint8_3__vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 3
+                let size := 35
+                array := abi_decode_available_length__uint8_3__vec$u8$(offset, length, size, end)
+            }
+            function abi_decode_available_length__uint8_3__vec$u8$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint8(elementPos, end)
+                    $MemoryStoreU8(dst, value)
+                    dst := add(dst, 1)
+                }
+            }
+            function abi_decode_uint8(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint8(value)
+            }
+            function validator_uint8(value) {
+                if iszero(eq(value, cleanup_uint8(value))) { $Abort(95) }
+            }
+            function abi_encode_tuple_$uint8$_$u8$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_uint8(value_0, add(headStart, 0))
+            }
+            function abi_decode_tuple_$uint8_2__uint64_uint8_2__uint64$_$vec$u8$_u64_vec$u8$_u64$(headStart, dataEnd) -> value_0, value_1, value_2, value_3 {
+                if slt(sub(dataEnd, headStart), 192) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_uint8_2__vec$u8$(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 64
+                    value_1 := abi_decode_uint64(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 96
+                    value_2 := abi_decode_uint8_2__vec$u8$(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 160
+                    value_3 := abi_decode_uint64(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint8_2__vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 2
+                let size := 34
+                array := abi_decode_available_length__uint8_2__vec$u8$(offset, length, size, end)
+            }
+            function abi_decode_available_length__uint8_2__vec$u8$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint8(elementPos, end)
+                    $MemoryStoreU8(dst, value)
+                    dst := add(dst, 1)
+                }
+            }
+            function abi_decode_tuple_$uint8_2__uint64$_$vec$u8$_u64$(headStart, dataEnd) -> value_0, value_1 {
+                if slt(sub(dataEnd, headStart), 96) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_uint8_2__vec$u8$(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 64
+                    value_1 := abi_decode_uint64(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_encode_tuple_$uint64$_$u64$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_uint64(value_0, add(headStart, 0))
+            }
+            function abi_encode_uint64(value, pos) {
+                mstore(pos, cleanup_uint64(value))
+            }
+            function abi_decode_tuple_$string_string$_$vec$u8$_vec$u8$$(headStart, dataEnd) -> value_0, value_1 {
+                if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_string_vec$u8$(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := calldataload(add(headStart, 32))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_1 := abi_decode_string_vec$u8$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_string_vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(1, length), 32)
+                array := abi_decode_available_length__string(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__string(src, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                if gt(add(src, sub(size, 32)), end) { $Abort(93) }
+                $CopyFromCallDataToMemory(src, dst, length)
+            }
+            function abi_encode_tuple_$uint64_uint8$_$u64_u8$(headStart ,value_0, value_1) -> tail {
+                tail := add(headStart, 64)
+                abi_encode_uint64(value_0, add(headStart, 0))
+                abi_encode_uint8(value_1, add(headStart, 32))
+            }
+            function abi_decode_tuple_$string_uint8_2__string_uint8_2_$_$vec$u8$_vec$u8$_vec$u8$_vec$u8$$(headStart, dataEnd) -> value_0, value_1, value_2, value_3 {
+                if slt(sub(dataEnd, headStart), 192) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_string_vec$u8$(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_uint8_2__vec$u8$(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := calldataload(add(headStart, 96))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_2 := abi_decode_string_vec$u8$(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 128
+                    value_3 := abi_decode_uint8_2__vec$u8$(add(headStart, offset), dataEnd)
+                }
+            }
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $AbortBuiltin() {
+                $Abort(sub(0, 1))
+            }
+            function $Malloc(size) -> offs {
+                offs := mload(0)
+                // pad to word size
+                mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+            }
+            function $Free(offs, size) {
+            }
+            function $MakePtr(is_storage, offs) -> ptr {
+              ptr := or(is_storage, shl(1, offs))
+            }
+            function $IsStoragePtr(ptr) -> b {
+              b := and(ptr, 0x1)
+            }
+            function $OffsetPtr(ptr) -> offs {
+              offs := shr(1, ptr)
+            }
+            function $MaskForSize(size) -> mask {
+              mask := sub(shl(shl(3, size), 1), 1)
+            }
+            function $ExtractBytes(word, start, size) -> bytes {
+               switch size
+               case 1 {
+                  // use the faster byte primitive
+                  bytes := byte(start, word)
+               }
+               default {
+                  // As we have big endian, we need to right shift the value from
+                  // where the highest byte starts in the word (32 - start), minus
+                  // the size.
+                  let shift_bits := shl(3, sub(sub(32, start), size))
+                  bytes := and(shr(shift_bits, word), $MaskForSize(size))
+               }
+            }
+            function $ToWordOffs(offs) -> word_offs, byte_offset {
+              word_offs := shr(5, offs)
+              byte_offset := and(offs, 0x1F)
+            }
+            function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+              let available_bytes := sub(32, byte_offset)
+              switch gt(size, available_bytes)
+              case 0 {
+                overflow_bytes := 0
+              }
+              default {
+                overflow_bytes := sub(size, available_bytes)
+              }
+            }
+            function $MemoryLoadBytes(offs, size) -> val {
+              // Lower bit where the value in the higher bytes ends
+              let bit_end := shl(3, sub(32, size))
+              val := shr(bit_end, mload(offs))
+            }
+            function $MemoryStoreBytes(offs, size, val) {
+              let bit_end := shl(3, sub(32, size))
+              let mask := shl(bit_end, $MaskForSize(size))
+              mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+            }
+            function $StorageLoadBytes(offs, size) -> val {
+              let word_offs, byte_offs := $ToWordOffs(offs)
+              let key := $StorageKey(0, word_offs)
+              val := $ExtractBytes(sload(key), byte_offs, size)
+              let overflow_bytes := $OverflowBytes(byte_offs, size)
+              if $LogicalNot(iszero(overflow_bytes)) {
+                key := $StorageKey(0, add(word_offs, 1))
+                let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+                val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+              }
+            }
+            function $StorageKey(group, word) -> key {
+              mstore(32, word)
+              mstore(64, shl(224, group))
+              key := keccak256(32, 36)
+            }
+            function $IndexPtr(ptr, offs) -> new_ptr {
+              new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+            }
+            function $LoadU8(ptr) -> val {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                val := $MemoryLoadU8(offs)
+              }
+              default {
+                val := $StorageLoadU8(offs)
+              }
+            }
+            function $MemoryLoadU8(offs) -> val {
+              val := $MemoryLoadBytes(offs, 1)
+            }
+            function $StorageLoadU8(offs) -> val {
+              val := $StorageLoadBytes(offs, 1)
+            }
+            function $MemoryStoreU8(offs, val) {
+              // Shortcut via special instruction
+              mstore8(offs, val)
+            }
+            function $LoadU64(ptr) -> val {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                val := $MemoryLoadU64(offs)
+              }
+              default {
+                val := $StorageLoadU64(offs)
+              }
+            }
+            function $MemoryLoadU64(offs) -> val {
+              val := $MemoryLoadBytes(offs, 8)
+            }
+            function $StorageLoadU64(offs) -> val {
+              val := $StorageLoadBytes(offs, 8)
+            }
+            function $MemoryStoreU64(offs, val) {
+              $MemoryStoreBytes(offs, 8, val)
+            }
+            function $LoadU256(ptr) -> val {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                val := $MemoryLoadU256(offs)
+              }
+              default {
+                val := $StorageLoadU256(offs)
+              }
+            }
+            function $MemoryLoadU256(offs) -> val {
+              val := $MemoryLoadBytes(offs, 32)
+            }
+            function $StorageLoadU256(offs) -> val {
+              val := $StorageLoadBytes(offs, 32)
+            }
+            function $CheckMemorySize(len) -> checked_len {
+                if gt(len, 0xffffffffffffffff) { $AbortBuiltin() }
+                checked_len := len
+            }
+            function $CopyFromCallDataToMemory(src, dst, length) {
+                calldatacopy(dst, src, length)
+                mstore(add(dst, length), 0)
+            }
+            function $AddU64(x, y) -> r {
+                if lt(sub(0xffffffffffffffff, x), y) { $AbortBuiltin() }
+                r := add(x, y)
+            }
+            function $AddU8(x, y) -> r {
+                if lt(sub(0xff, x), y) { $AbortBuiltin() }
+                r := add(x, y)
+            }
+            function $Sub(x, y) -> r {
+                if lt(x, y) { $AbortBuiltin() }
+                r := sub(x, y)
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+            function $GtEq(x, y) -> r {
+                r := or(gt(x, y), eq(x, y))
+            }
+            function $LogicalNot(x) -> r {
+                r := iszero(x)
+            }
+            function $ClosestGreaterPowerOfTwo(x) -> r {
+                r := or(r, shr(1, x))
+                r := or(r, shr(2, r))
+                r := or(r, shr(4, r))
+                r := or(r, shr(8, r))
+                r := or(r, shr(16, r))
+                r := or(r, shr(32, r))
+                r := add(x, 1)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
diff --git a/third_party/move/evm/move-to-yul/tests/test-dispatcher/DispatcherMultiRetEncoding.v2_exp b/third_party/move/evm/move-to-yul/tests/test-dispatcher/DispatcherMultiRetEncoding.v2_exp
new file mode 100644
index 0000000000000..a83a9c44bec2d
--- /dev/null
+++ b/third_party/move/evm/move-to-yul/tests/test-dispatcher/DispatcherMultiRetEncoding.v2_exp
@@ -0,0 +1,602 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_M" {
+    code {
+        codecopy(0, dataoffset("A2_M_deployed"), datasize("A2_M_deployed"))
+        return(0, datasize("A2_M_deployed"))
+    }
+    object "A2_M_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                case 0x5cfc83ac
+                {
+                    // test_bytes_string(bytes,uint8[2],string,uint8[2])
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1, param_2, param_3 := abi_decode_tuple_$bytes_uint8_2__string_uint8_2_$_$vec$u8$_vec$u8$_vec$u8$_vec$u8$$(4, calldatasize())
+                    let ret_0, ret_1 := A2_M_test_bytes_string(param_0, param_1, param_2, param_3)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint8_2__bytes$_$vec$u8$_vec$u8$$(memPos, ret_0, ret_1)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x60489524
+                {
+                    // test_two_strings(string,string)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1 := abi_decode_tuple_$string_string$_$vec$u8$_vec$u8$$(4, calldatasize())
+                    let ret_0, ret_1 := A2_M_test_string_length_sum(param_0, param_1)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$string_string$_$vec$u8$_vec$u8$$(memPos, ret_0, ret_1)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x1f5db62a
+                {
+                    // test_string_uint8(string)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$string$_$vec$u8$$(4, calldatasize())
+                    let ret_0, ret_1 := A2_M_test_string_uint8(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$string_uint8$_$vec$u8$_u8$(memPos, ret_0, ret_1)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xfd03176e
+                {
+                    // test_u8_array_2_uint64(uint8[2],uint64)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1 := abi_decode_tuple_$uint8_2__uint64$_$vec$u8$_u64$(4, calldatasize())
+                    let ret_0, ret_1 := A2_M_test_u8_array_2_uint_64(param_0, param_1)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint8_uint8_2_$_$u8_vec$u8$$(memPos, ret_0, ret_1)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x1483ff3b
+                {
+                    // test_uint64_u8_array_3_uint64(uint64,uint8[3],uint64)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1, param_2 := abi_decode_tuple_$uint64_uint8_3__uint64$_$u64_vec$u8$_u64$(4, calldatasize())
+                    let ret_0, ret_1, ret_2 := A2_M_test_u8_uint_64_array_2(param_0, param_1, param_2)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint8_uint8_3__uint8$_$u8_vec$u8$_u8$(memPos, ret_0, ret_1, ret_2)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                default {}
+            }
+            $Abort(97)
+            function A2_M_test_bytes_string(str_1, _array_1, _str_2, array_2) -> $result0, $result1 {
+                // return ($t3, $t0)
+                $result0 := array_2
+                $result1 := str_1
+            }
+
+            function A2_M_test_string_length_sum(str_1, str_2) -> $result0, $result1 {
+                // return ($t1, $t0)
+                $result0 := str_2
+                $result1 := str_1
+            }
+
+            function A2_M_test_string_uint8(v) -> $result0, $result1 {
+                let len_str, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9
+                let $locals := $Malloc(32)
+                mstore($locals, v)
+                // $t2 := borrow_local($t0)
+                $t2 := $MakePtr(false, $locals)
+                // $t3 := vector::length<u8>($t2)
+                $t3 := A1_vector_length$u8$($t2)
+                // $t4 := copy($t0)
+                $t4 := mload($locals)
+                // $t5 := borrow_local($t0)
+                $t5 := $MakePtr(false, $locals)
+                // $t6 := 1
+                $t6 := 1
+                // $t7 := -($t3, $t6)
+                $t7 := $Sub($t3, $t6)
+                // $t8 := vector::borrow<u8>($t5, $t7)
+                $t8 := A1_vector_borrow$u8$($t5, $t7)
+                // $t9 := read_ref($t8)
+                $t9 := $LoadU8($t8)
+                // return ($t4, $t9)
+                $result0 := $t4
+                $result1 := $t9
+                $Free($locals, 32)
+            }
+
+            function A2_M_test_u8_array_2_uint_64(v, idx) -> $result0, $result1 {
+                let $t2, $t3, $t4, $t5
+                let $locals := $Malloc(32)
+                mstore($locals, v)
+                // $t2 := borrow_local($t0)
+                $t2 := $MakePtr(false, $locals)
+                // $t3 := vector::borrow<u8>($t2, $t1)
+                $t3 := A1_vector_borrow$u8$($t2, idx)
+                // $t4 := read_ref($t3)
+                $t4 := $LoadU8($t3)
+                // $t5 := move($t0)
+                $t5 := mload($locals)
+                // return ($t4, $t5)
+                $result0 := $t4
+                $result1 := $t5
+                $Free($locals, 32)
+            }
+
+            function A2_M_test_u8_uint_64_array_2(idx_1, v, idx_2) -> $result0, $result1, $result2 {
+                let $t3, $t4, $t5, $t6, $t7, $t8, $t9
+                let $locals := $Malloc(32)
+                mstore($locals, v)
+                // $t3 := borrow_local($t1)
+                $t3 := $MakePtr(false, $locals)
+                // $t4 := vector::borrow<u8>($t3, $t0)
+                $t4 := A1_vector_borrow$u8$($t3, idx_1)
+                // $t5 := read_ref($t4)
+                $t5 := $LoadU8($t4)
+                // $t6 := copy($t1)
+                $t6 := mload($locals)
+                // $t7 := borrow_local($t1)
+                $t7 := $MakePtr(false, $locals)
+                // $t8 := vector::borrow<u8>($t7, $t2)
+                $t8 := A1_vector_borrow$u8$($t7, idx_2)
+                // $t9 := read_ref($t8)
+                $t9 := $LoadU8($t8)
+                // return ($t5, $t6, $t9)
+                $result0 := $t5
+                $result1 := $t6
+                $result2 := $t9
+                $Free($locals, 32)
+            }
+
+            function A1_vector_borrow$u8$(v_ref, i) -> e_ptr {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                let size := $LoadU64(v_ptr)
+                if $GtEq(i, size) { $AbortBuiltin() }
+                e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 1)))
+            }
+            function A1_vector_length$u8$(v_ref) -> len {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                len := $LoadU64(v_ptr)
+            }
+            function abi_encode_tuple_$uint8_uint8_3__uint8$_$u8_vec$u8$_u8$(headStart ,value_0, value_1, value_2) -> tail {
+                tail := add(headStart, 160)
+                abi_encode_uint8(value_0, add(headStart, 0))
+                abi_encode_uint8_3__vec$u8$(value_1, add(headStart, 32))
+                abi_encode_uint8(value_2, add(headStart, 128))
+            }
+            function abi_encode_uint8(value, pos) {
+                mstore(pos, cleanup_uint8(value))
+            }
+            function cleanup_uint8(value) -> cleaned {
+                cleaned := and(value, 0xff)
+            }
+            function abi_encode_uint8_3__vec$u8$(value, pos)  {
+                let length := $MemoryLoadU64(value)
+                if iszero(eq(length, 3)) { $Abort(92) }
+                let start := add(value, 32)
+                let srcEnd := add(start, mul(length, 1))
+                for { let src := start } lt(src, srcEnd) { src := add(src, 1) }
+                {
+                    let v := $MemoryLoadU8(src)
+                    pos := abi_encode_uint8_with_updated_pos(v, pos)
+                }
+            }
+            function abi_encode_uint8_with_updated_pos(value, pos) -> updated_pos{
+                abi_encode_uint8(value, pos)
+                updated_pos := add(pos, 32)
+            }
+            function abi_decode_tuple_$uint64_uint8_3__uint64$_$u64_vec$u8$_u64$(headStart, dataEnd) -> value_0, value_1, value_2 {
+                if slt(sub(dataEnd, headStart), 160) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_uint64(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_uint8_3__vec$u8$(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 128
+                    value_2 := abi_decode_uint64(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint64(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint64(value)
+            }
+            function validator_uint64(value) {
+                if iszero(eq(value, cleanup_uint64(value))) { $Abort(95) }
+            }
+            function cleanup_uint64(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffff)
+            }
+            function abi_decode_uint8_3__vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 3
+                let size := 35
+                array := abi_decode_available_length__uint8_3__vec$u8$(offset, length, size, end)
+            }
+            function abi_decode_available_length__uint8_3__vec$u8$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint8(elementPos, end)
+                    $MemoryStoreU8(dst, value)
+                    dst := add(dst, 1)
+                }
+            }
+            function abi_decode_uint8(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint8(value)
+            }
+            function validator_uint8(value) {
+                if iszero(eq(value, cleanup_uint8(value))) { $Abort(95) }
+            }
+            function abi_encode_tuple_$uint8_uint8_2_$_$u8_vec$u8$$(headStart ,value_0, value_1) -> tail {
+                tail := add(headStart, 96)
+                abi_encode_uint8(value_0, add(headStart, 0))
+                abi_encode_uint8_2__vec$u8$(value_1, add(headStart, 32))
+            }
+            function abi_encode_uint8_2__vec$u8$(value, pos)  {
+                let length := $MemoryLoadU64(value)
+                if iszero(eq(length, 2)) { $Abort(92) }
+                let start := add(value, 32)
+                let srcEnd := add(start, mul(length, 1))
+                for { let src := start } lt(src, srcEnd) { src := add(src, 1) }
+                {
+                    let v := $MemoryLoadU8(src)
+                    pos := abi_encode_uint8_with_updated_pos(v, pos)
+                }
+            }
+            function abi_decode_tuple_$uint8_2__uint64$_$vec$u8$_u64$(headStart, dataEnd) -> value_0, value_1 {
+                if slt(sub(dataEnd, headStart), 96) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_uint8_2__vec$u8$(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 64
+                    value_1 := abi_decode_uint64(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint8_2__vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 2
+                let size := 34
+                array := abi_decode_available_length__uint8_2__vec$u8$(offset, length, size, end)
+            }
+            function abi_decode_available_length__uint8_2__vec$u8$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint8(elementPos, end)
+                    $MemoryStoreU8(dst, value)
+                    dst := add(dst, 1)
+                }
+            }
+            function abi_encode_tuple_$string_uint8$_$vec$u8$_u8$(headStart ,value_0, value_1) -> tail {
+                tail := add(headStart, 64)
+                mstore(add(headStart, 0), sub(tail, headStart))
+                tail := abi_encode_string(value_0,  tail)
+                abi_encode_uint8(value_1, add(headStart, 32))
+            }
+            function abi_encode_string(value, pos) -> end{
+                let size := $MemoryLoadU64(value)
+                mstore(pos, size)
+                pos := add(pos, 0x20)
+                $CopyMemory(add(value, 0x20), pos, size)
+                size := $RoundUp(size)
+                end := add(pos, size)
+            }
+            function abi_decode_tuple_$string$_$vec$u8$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_string_vec$u8$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_string_vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(1, length), 32)
+                array := abi_decode_available_length__string(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__string(src, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                if gt(add(src, sub(size, 32)), end) { $Abort(93) }
+                $CopyFromCallDataToMemory(src, dst, length)
+            }
+            function abi_encode_tuple_$string_string$_$vec$u8$_vec$u8$$(headStart ,value_0, value_1) -> tail {
+                tail := add(headStart, 64)
+                mstore(add(headStart, 0), sub(tail, headStart))
+                tail := abi_encode_string(value_0,  tail)
+                mstore(add(headStart, 32), sub(tail, headStart))
+                tail := abi_encode_string(value_1,  tail)
+            }
+            function abi_decode_tuple_$string_string$_$vec$u8$_vec$u8$$(headStart, dataEnd) -> value_0, value_1 {
+                if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_string_vec$u8$(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := calldataload(add(headStart, 32))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_1 := abi_decode_string_vec$u8$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_encode_tuple_$uint8_2__bytes$_$vec$u8$_vec$u8$$(headStart ,value_0, value_1) -> tail {
+                tail := add(headStart, 96)
+                abi_encode_uint8_2__vec$u8$(value_0, add(headStart, 0))
+                mstore(add(headStart, 64), sub(tail, headStart))
+                tail := abi_encode_bytes(value_1,  tail)
+            }
+            function abi_encode_bytes(value, pos) -> end{
+                let size := $MemoryLoadU64(value)
+                mstore(pos, size)
+                pos := add(pos, 0x20)
+                $CopyMemory(add(value, 0x20), pos, size)
+                size := $RoundUp(size)
+                end := add(pos, size)
+            }
+            function abi_decode_tuple_$bytes_uint8_2__string_uint8_2_$_$vec$u8$_vec$u8$_vec$u8$_vec$u8$$(headStart, dataEnd) -> value_0, value_1, value_2, value_3 {
+                if slt(sub(dataEnd, headStart), 192) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_bytes_vec$u8$(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_uint8_2__vec$u8$(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := calldataload(add(headStart, 96))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_2 := abi_decode_string_vec$u8$(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 128
+                    value_3 := abi_decode_uint8_2__vec$u8$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_bytes_vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(1, length), 32)
+                array := abi_decode_available_length__bytes(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__bytes(src, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                if gt(add(src, sub(size, 32)), end) { $Abort(93) }
+                $CopyFromCallDataToMemory(src, dst, length)
+            }
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $AbortBuiltin() {
+                $Abort(sub(0, 1))
+            }
+            function $Malloc(size) -> offs {
+                offs := mload(0)
+                // pad to word size
+                mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+            }
+            function $Free(offs, size) {
+            }
+            function $MakePtr(is_storage, offs) -> ptr {
+              ptr := or(is_storage, shl(1, offs))
+            }
+            function $IsStoragePtr(ptr) -> b {
+              b := and(ptr, 0x1)
+            }
+            function $OffsetPtr(ptr) -> offs {
+              offs := shr(1, ptr)
+            }
+            function $MaskForSize(size) -> mask {
+              mask := sub(shl(shl(3, size), 1), 1)
+            }
+            function $ExtractBytes(word, start, size) -> bytes {
+               switch size
+               case 1 {
+                  // use the faster byte primitive
+                  bytes := byte(start, word)
+               }
+               default {
+                  // As we have big endian, we need to right shift the value from
+                  // where the highest byte starts in the word (32 - start), minus
+                  // the size.
+                  let shift_bits := shl(3, sub(sub(32, start), size))
+                  bytes := and(shr(shift_bits, word), $MaskForSize(size))
+               }
+            }
+            function $ToWordOffs(offs) -> word_offs, byte_offset {
+              word_offs := shr(5, offs)
+              byte_offset := and(offs, 0x1F)
+            }
+            function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+              let available_bytes := sub(32, byte_offset)
+              switch gt(size, available_bytes)
+              case 0 {
+                overflow_bytes := 0
+              }
+              default {
+                overflow_bytes := sub(size, available_bytes)
+              }
+            }
+            function $MemoryLoadBytes(offs, size) -> val {
+              // Lower bit where the value in the higher bytes ends
+              let bit_end := shl(3, sub(32, size))
+              val := shr(bit_end, mload(offs))
+            }
+            function $MemoryStoreBytes(offs, size, val) {
+              let bit_end := shl(3, sub(32, size))
+              let mask := shl(bit_end, $MaskForSize(size))
+              mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+            }
+            function $StorageLoadBytes(offs, size) -> val {
+              let word_offs, byte_offs := $ToWordOffs(offs)
+              let key := $StorageKey(0, word_offs)
+              val := $ExtractBytes(sload(key), byte_offs, size)
+              let overflow_bytes := $OverflowBytes(byte_offs, size)
+              if $LogicalNot(iszero(overflow_bytes)) {
+                key := $StorageKey(0, add(word_offs, 1))
+                let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+                val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+              }
+            }
+            function $StorageKey(group, word) -> key {
+              mstore(32, word)
+              mstore(64, shl(224, group))
+              key := keccak256(32, 36)
+            }
+            function $IndexPtr(ptr, offs) -> new_ptr {
+              new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+            }
+            function $LoadU8(ptr) -> val {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                val := $MemoryLoadU8(offs)
+              }
+              default {
+                val := $StorageLoadU8(offs)
+              }
+            }
+            function $MemoryLoadU8(offs) -> val {
+              val := $MemoryLoadBytes(offs, 1)
+            }
+            function $StorageLoadU8(offs) -> val {
+              val := $StorageLoadBytes(offs, 1)
+            }
+            function $MemoryStoreU8(offs, val) {
+              // Shortcut via special instruction
+              mstore8(offs, val)
+            }
+            function $LoadU64(ptr) -> val {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                val := $MemoryLoadU64(offs)
+              }
+              default {
+                val := $StorageLoadU64(offs)
+              }
+            }
+            function $MemoryLoadU64(offs) -> val {
+              val := $MemoryLoadBytes(offs, 8)
+            }
+            function $StorageLoadU64(offs) -> val {
+              val := $StorageLoadBytes(offs, 8)
+            }
+            function $MemoryStoreU64(offs, val) {
+              $MemoryStoreBytes(offs, 8, val)
+            }
+            function $LoadU256(ptr) -> val {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                val := $MemoryLoadU256(offs)
+              }
+              default {
+                val := $StorageLoadU256(offs)
+              }
+            }
+            function $MemoryLoadU256(offs) -> val {
+              val := $MemoryLoadBytes(offs, 32)
+            }
+            function $StorageLoadU256(offs) -> val {
+              val := $StorageLoadBytes(offs, 32)
+            }
+            function $CopyMemory(src, dst, size) {
+              let num_words, overflow_bytes := $ToWordOffs(size)
+              let i := 0
+              for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+                mstore(add(dst, i), mload(add(src, i)))
+              }
+              if overflow_bytes {
+                let mask := $MaskForSize(sub(32, overflow_bytes))
+                let overflow_offs := mul(num_words, 32)
+                let dst_word := and(mload(add(dst, overflow_offs)), mask)
+                let src_word := and(mload(add(src, overflow_offs)), not(mask))
+                mstore(add(dst, overflow_offs), or(dst_word, src_word))
+              }
+            }
+            function $CheckMemorySize(len) -> checked_len {
+                if gt(len, 0xffffffffffffffff) { $AbortBuiltin() }
+                checked_len := len
+            }
+            function $CopyFromCallDataToMemory(src, dst, length) {
+                calldatacopy(dst, src, length)
+                mstore(add(dst, length), 0)
+            }
+            function $Sub(x, y) -> r {
+                if lt(x, y) { $AbortBuiltin() }
+                r := sub(x, y)
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+            function $GtEq(x, y) -> r {
+                r := or(gt(x, y), eq(x, y))
+            }
+            function $LogicalNot(x) -> r {
+                r := iszero(x)
+            }
+            function $ClosestGreaterPowerOfTwo(x) -> r {
+                r := or(r, shr(1, x))
+                r := or(r, shr(2, r))
+                r := or(r, shr(4, r))
+                r := or(r, shr(8, r))
+                r := or(r, shr(16, r))
+                r := or(r, shr(32, r))
+                r := add(x, 1)
+            }
+            function $RoundUp(value) -> result {
+                result := and(add(value, 31), not(31))
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
diff --git a/third_party/move/evm/move-to-yul/tests/test-dispatcher/DispatcherRevert.v2_exp b/third_party/move/evm/move-to-yul/tests/test-dispatcher/DispatcherRevert.v2_exp
new file mode 100644
index 0000000000000..49e2b2b5d8d5d
--- /dev/null
+++ b/third_party/move/evm/move-to-yul/tests/test-dispatcher/DispatcherRevert.v2_exp
@@ -0,0 +1,63 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_M" {
+    code {
+        codecopy(0, dataoffset("A2_M_deployed"), datasize("A2_M_deployed"))
+        return(0, datasize("A2_M_deployed"))
+    }
+    object "A2_M_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                case 0xe44f11ec
+                {
+                    // return_0()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let ret_0 := A2_M_return_0()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint128$_$u128$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                default {}
+            }
+            $Abort(97)
+            function A2_M_return_0() -> $result {
+                let $t0
+                // $t0 := 0
+                $t0 := 0
+                // return $t0
+                $result := $t0
+            }
+
+            function abi_encode_tuple_$uint128$_$u128$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_uint128(value_0, add(headStart, 0))
+            }
+            function abi_encode_uint128(value, pos) {
+                mstore(pos, cleanup_uint128(value))
+            }
+            function cleanup_uint128(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffffffffffffffffffff)
+            }
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
diff --git a/third_party/move/evm/move-to-yul/tests/test-dispatcher/ExternalCall.v2_exp b/third_party/move/evm/move-to-yul/tests/test-dispatcher/ExternalCall.v2_exp
new file mode 100644
index 0000000000000..a4be571a266c6
--- /dev/null
+++ b/third_party/move/evm/move-to-yul/tests/test-dispatcher/ExternalCall.v2_exp
@@ -0,0 +1,1737 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_M" {
+    code {
+        codecopy(0, dataoffset("A2_M_deployed"), datasize("A2_M_deployed"))
+        return(0, datasize("A2_M_deployed"))
+    }
+    object "A2_M_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                case 0x2fe88122
+                {
+                    // call_success(address)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$address$_$address$(4, calldatasize())
+                    let ret_0 := A2_M_call_success(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint256$_$A2_U256_U256$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x0d5ec7b5
+                {
+                    // call_unit(address)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$address$_$address$(4, calldatasize())
+                    A2_M_call_unit(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x640f7372
+                {
+                    // test_is_approved_for_all()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let ret_0 := A2_M_test_is_approved_for_all()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$bool$_$bool$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xe88da6c6
+                {
+                    // test_multi_ret()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let ret_0, ret_1 := A2_M_test_multi_ret()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint256___uint256$_$vec$A2_U256_U256$_A2_U256_U256$(memPos, ret_0, ret_1)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x221ea1ee
+                {
+                    // test_no_para()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    A2_M_test_no_para()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xb930a1da
+                {
+                    // test_safe_transfer_from(uint128,uint128)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1 := abi_decode_tuple_$uint128_uint128$_$u128_u128$(4, calldatasize())
+                    A2_M_test_safe_transfer_from(param_0, param_1)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x8494fb4a
+                {
+                    // test_try()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let ret_0 := A2_M_test_try()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint8$_$u8$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                default {}
+            }
+            $Abort(97)
+            function A2_M_call_success(addr) -> $result {
+                let v, $t2, $t3, $t4, $t5, $t6
+                let $block := 4
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L1
+                        // $t4 := move($t1)
+                        $t4 := v
+                        // $t5 := ExternalResult::unwrap<U256::U256>($t4)
+                        $t5 := A2_ExternalResult_unwrap$A2_U256_U256$($t4)
+                        // return $t5
+                        $result := $t5
+                        leave
+                    }
+                    case 3 {
+                        // label L0
+                        // $t6 := U256::one()
+                        $t6 := A2_U256_one()
+                        // return $t6
+                        $result := $t6
+                        leave
+                    }
+                    case 4 {
+                        // $t1 := M::success($t0)
+                        v := A2_M_success(addr)
+                        // $t2 := borrow_local($t1)
+                        $t2 := $MakePtr(false, v)
+                        // $t3 := ExternalResult::is_ok<U256::U256>($t2)
+                        $t3 := A2_ExternalResult_is_ok$A2_U256_U256$($t2)
+                        // if ($t3) goto L1 else goto L0
+                        switch $t3
+                        case 0  { $block := 3 }
+                        default { $block := 2 }
+                    }
+                }
+            }
+
+            function A2_M_call_unit(addr) {
+                let v, $t2, $t3, $t4, $t5
+                let $block := 4
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L1
+                        // $t4 := move($t1)
+                        $t4 := v
+                        // $t5 := ExternalResult::unwrap<Evm::Unit>($t4)
+                        $t5 := A2_ExternalResult_unwrap$A2_Evm_Unit$($t4)
+                        // drop($t5)
+                        $Free($t5, 1)
+                        // goto L0
+                        $block := 3
+                    }
+                    case 3 {
+                        // label L0
+                        // return ()
+                        leave
+                    }
+                    case 4 {
+                        // $t1 := M::test_unit($t0)
+                        v := A2_M_test_unit(addr)
+                        // $t2 := borrow_local($t1)
+                        $t2 := $MakePtr(false, v)
+                        // $t3 := ExternalResult::is_ok<Evm::Unit>($t2)
+                        $t3 := A2_ExternalResult_is_ok$A2_Evm_Unit$($t2)
+                        // if ($t3) goto L1 else goto L0
+                        switch $t3
+                        case 0  { $block := 3 }
+                        default { $block := 2 }
+                    }
+                }
+            }
+
+            function A2_M_test_is_approved_for_all() -> $result {
+                let $t0, $t1, $t2, $t3
+                // $t0 := 0x3
+                $t0 := 0x3
+                // $t1 := 0x4
+                $t1 := 0x4
+                // $t2 := 0x5
+                $t2 := 0x5
+                // $t3 := M::is_approved_for_all($t0, $t1, $t2)
+                $t3 := A2_M_is_approved_for_all($t0, $t1, $t2)
+                // return $t3
+                $result := $t3
+            }
+
+            function A2_M_test_multi_ret() -> $result0, $result1 {
+                let data, v, $t2, $t3, $t4, $t5, $t6
+                // $t2 := 0
+                $t2 := 0
+                // $t3 := vector::empty<U256::U256>()
+                $t3 := A1_vector_empty$A2_U256_U256$()
+                // $t4 := 0x3
+                $t4 := 0x3
+                // ($t5, $t6) := M::multi_ret($t4, $t2, $t3)
+                $t5, $t6 := A2_M_multi_ret($t4, $t2, $t3)
+                // return ($t5, $t6)
+                $result0 := $t5
+                $result1 := $t6
+            }
+
+            function A2_M_test_no_para() {
+                let $t0
+                // $t0 := 0x3
+                $t0 := 0x3
+                // M::no_para($t0)
+                A2_M_no_para($t0)
+                // return ()
+            }
+
+            function A2_M_test_safe_transfer_from(x, y) {
+                let data, token_id, $t4, $t5, $t6, $t7, $t8
+                // $t4 := (u256)($t0, $t1)
+                $t4 := $CastU256(x, y)
+                // $t5 := vector::empty<u8>()
+                $t5 := A1_vector_empty$u8$()
+                // $t6 := 0x3
+                $t6 := 0x3
+                // $t7 := 0x4
+                $t7 := 0x4
+                // $t8 := 0x5
+                $t8 := 0x5
+                // M::safe_transfer_form($t6, $t7, $t8, $t4, $t5)
+                A2_M_safe_transfer_form($t6, $t7, $t8, $t4, $t5)
+                // return ()
+            }
+
+            function A2_M_test_try() -> $result {
+                let v, value, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13
+                let $block := 4
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L1
+                        // $t6 := 0
+                        $t6 := 0
+                        // return $t6
+                        $result := $t6
+                        leave
+                    }
+                    case 3 {
+                        // label L0
+                        // $t7 := borrow_local($t1)
+                        $t7 := $MakePtr(false, value)
+                        // $t8 := ExternalResult::is_err_reason<U256::U256>($t7)
+                        $t8 := A2_ExternalResult_is_err_reason$A2_U256_U256$($t7)
+                        // if ($t8) goto L3 else goto L2
+                        switch $t8
+                        case 0  { $block := 6 }
+                        default { $block := 5 }
+                    }
+                    case 4 {
+                        // $t2 := 340282366920938463463374607431768211458
+                        $t2 := 340282366920938463463374607431768211458
+                        // $t3 := 0x3
+                        $t3 := 0x3
+                        // $t1 := M::test_try_call($t3, $t2)
+                        value := A2_M_test_try_call($t3, $t2)
+                        // $t4 := borrow_local($t1)
+                        $t4 := $MakePtr(false, value)
+                        // $t5 := ExternalResult::is_ok<U256::U256>($t4)
+                        $t5 := A2_ExternalResult_is_ok$A2_U256_U256$($t4)
+                        // if ($t5) goto L1 else goto L0
+                        switch $t5
+                        case 0  { $block := 3 }
+                        default { $block := 2 }
+                    }
+                    case 5 {
+                        // label L3
+                        // $t9 := 1
+                        $t9 := 1
+                        // return $t9
+                        $result := $t9
+                        leave
+                    }
+                    case 6 {
+                        // label L2
+                        // $t10 := borrow_local($t1)
+                        $t10 := $MakePtr(false, value)
+                        // $t11 := ExternalResult::is_panic<U256::U256>($t10)
+                        $t11 := A2_ExternalResult_is_panic$A2_U256_U256$($t10)
+                        // if ($t11) goto L5 else goto L4
+                        switch $t11
+                        case 0  { $block := 8 }
+                        default { $block := 7 }
+                    }
+                    case 7 {
+                        // label L5
+                        // $t12 := 2
+                        $t12 := 2
+                        // return $t12
+                        $result := $t12
+                        leave
+                    }
+                    case 8 {
+                        // label L4
+                        // $t13 := 3
+                        $t13 := 3
+                        // return $t13
+                        $result := $t13
+                        leave
+                    }
+                }
+            }
+
+            function A2_ExternalResult_is_panic$A2_U256_U256$(result) -> $result {
+                let $t1, $t2
+                // $t1 := borrow_field<ExternalResult::ExternalResult<#0>>.panic_code($t0)
+                {
+                    let $field_ptr := $IndexPtr(result, 96)
+                    $t1 := $MakePtr($IsStoragePtr($field_ptr), $LoadU256($field_ptr))
+                }
+                // $t2 := option::is_some<U256::U256>($t1)
+                $t2 := A1_option_is_some$A2_U256_U256$($t1)
+                // return $t2
+                $result := $t2
+            }
+
+            function A1_option_is_some$A2_U256_U256$(t) -> $result {
+                let $t1, $t2, $t3
+                // $t1 := borrow_field<option::Option<#0>>.vec($t0)
+                $t1 := t
+                // $t2 := vector::is_empty<#0>($t1)
+                $t2 := A1_vector_is_empty$A2_U256_U256$($t1)
+                // $t3 := !($t2)
+                $t3 := $LogicalNot($t2)
+                // return $t3
+                $result := $t3
+            }
+
+            function A1_vector_is_empty$A2_U256_U256$(v) -> $result {
+                let $t1, $t2, $t3
+                // $t1 := vector::length<#0>($t0)
+                $t1 := A1_vector_length$A2_U256_U256$(v)
+                // $t2 := 0
+                $t2 := 0
+                // $t3 := ==($t1, $t2)
+                $t3 := $Eq($t1, $t2)
+                // return $t3
+                $result := $t3
+            }
+
+            function A1_vector_length$A2_U256_U256$(v_ref) -> len {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                len := $LoadU64(v_ptr)
+            }
+            function A2_ExternalResult_is_ok$A2_U256_U256$(result) -> $result {
+                let $t1, $t2
+                // $t1 := borrow_field<ExternalResult::ExternalResult<#0>>.value($t0)
+                {
+                    $t1 := $MakePtr($IsStoragePtr(result), $LoadU256(result))
+                }
+                // $t2 := option::is_some<#0>($t1)
+                $t2 := A1_option_is_some$A2_U256_U256$($t1)
+                // return $t2
+                $result := $t2
+            }
+
+            function A2_M_test_try_call(contract, v) -> $result  {
+                // storage for arguments and returned data
+                let $t2 := mload(0)
+                mstore($t2, $Shl(0x81b91ddb, 224))
+                let $t3 := abi_encode_tuple_$uint256$_$A2_U256_U256$(add($t2, 4), v)
+                let $t4 := call(gas(), contract, 0,  $t2, sub($t3, $t2), $t2, 32)
+                // set freeMemoryPointer
+                mstore(0, $t3)
+                switch iszero($t4)
+                case 0 {
+                    // decode return parameters from external try-call into retVars
+                    $result := abi_decode_tuple_$uint256$_$A2_U256_U256$_from_memory($t2, add($t2, returndatasize()))
+                    $result := A2_ExternalResult_ok$A2_U256_U256$($result)
+                }
+                default {
+                    let $t5 := 1
+                    switch $ReturnDataSelector()
+                    case 0x08c379a0 {
+                        $result := $TryDecodeErrMsg()
+                        if $result {
+                            $t5 := 0
+                            $result := A2_ExternalResult_err_reason$A2_U256_U256$($result)
+                        }
+                    }
+                    case 0x4e487b71 {
+                        let $t6, $t7 := $TryDecodePanicData()
+                        if $t6 {
+                            $t5 := 0
+                            $result := $t7
+                            $result := A2_ExternalResult_panic$A2_U256_U256$($result)
+                        }
+                    }
+                    if $t5 {
+                        $result := $PackErrData()
+                        $result := A2_ExternalResult_err_data$A2_U256_U256$($result)
+                    }
+                }
+            }
+            function A2_ExternalResult_err_data$A2_U256_U256$(error) -> $result {
+                let $t1, $t2, $t3, $t4, $t5
+                // $t1 := option::none<#0>()
+                $t1 := A1_option_none$A2_U256_U256$()
+                // $t2 := option::some<vector<u8>>($t0)
+                $t2 := A1_option_some$vec$u8$$(error)
+                // $t3 := option::none<vector<u8>>()
+                $t3 := A1_option_none$vec$u8$$()
+                // $t4 := option::none<U256::U256>()
+                $t4 := A1_option_none$A2_U256_U256$()
+                // $t5 := pack ExternalResult::ExternalResult<#0>($t1, $t2, $t3, $t4)
+                {
+                    let $mem := $Malloc(128)
+                    $MemoryStoreU256(add($mem, 0), $t1)
+                    $MemoryStoreU256(add($mem, 32), $t2)
+                    $MemoryStoreU256(add($mem, 64), $t3)
+                    $MemoryStoreU256(add($mem, 96), $t4)
+                    $t5 := $mem
+                }
+                // return $t5
+                $result := $t5
+            }
+
+            function A1_option_none$A2_U256_U256$() -> $result {
+                let $t0, $t1
+                // $t0 := vector::empty<#0>()
+                $t0 := A1_vector_empty$A2_U256_U256$()
+                // $t1 := pack option::Option<#0>($t0)
+                {
+                    let $mem := $Malloc(32)
+                    $MemoryStoreU256(add($mem, 0), $t0)
+                    $t1 := $mem
+                }
+                // return $t1
+                $result := $t1
+            }
+
+            function A1_vector_empty$A2_U256_U256$() -> vector {
+                vector := $Malloc(96)
+                $MemoryStoreU64(add(vector, 8), 2)
+            }
+            function A1_option_none$vec$u8$$() -> $result {
+                let $t0, $t1
+                // $t0 := vector::empty<#0>()
+                $t0 := A1_vector_empty$vec$u8$$()
+                // $t1 := pack option::Option<#0>($t0)
+                {
+                    let $mem := $Malloc(32)
+                    $MemoryStoreU256(add($mem, 0), $t0)
+                    $t1 := $mem
+                }
+                // return $t1
+                $result := $t1
+            }
+
+            function A1_vector_empty$vec$u8$$() -> vector {
+                vector := $Malloc(96)
+                $MemoryStoreU64(add(vector, 8), 2)
+            }
+            function A1_option_some$vec$u8$$(e) -> $result {
+                let $t1, $t2
+                // $t1 := vector::singleton<#0>($t0)
+                $t1 := A1_vector_singleton$vec$u8$$(e)
+                // $t2 := pack option::Option<#0>($t1)
+                {
+                    let $mem := $Malloc(32)
+                    $MemoryStoreU256(add($mem, 0), $t1)
+                    $t2 := $mem
+                }
+                // return $t2
+                $result := $t2
+            }
+
+            function A1_vector_singleton$vec$u8$$(e) -> $result {
+                let $t2, $t3
+                let $locals := $Malloc(32)
+                // $t1 := vector::empty<#0>()
+                mstore($locals, A1_vector_empty$vec$u8$$())
+                // $t2 := borrow_local($t1)
+                $t2 := $MakePtr(false, $locals)
+                // vector::push_back<#0>($t2, $t0)
+                A1_vector_push_back$vec$u8$$($t2, e)
+                // $t3 := move($t1)
+                $t3 := mload($locals)
+                // return $t3
+                $result := $t3
+                $Free($locals, 32)
+            }
+
+            function A1_vector_push_back$vec$u8$$(v_ref, e) {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                let size := $LoadU64(v_ptr)
+                let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 32)))
+                $StoreU256(e_ptr, e)
+                if $IsStoragePtr(e_ptr) {
+                    let e_offs := $OffsetPtr(e_ptr)
+                    let $linked_dst_2300595445 := $NewLinkedStorageBase(0x89204cf5)
+                    let $size_2300595445 := $MemoryLoadU64(e)
+                    let $data_size_2300595445 := mul($size_2300595445, 1)
+                    $AlignedStorageStore($linked_dst_2300595445, mload(e))
+                    let $data_src_2300595445 := add(e, 32)
+                    let $data_dst_2300595445 := add($linked_dst_2300595445, 32)
+                    for { let $offs_2300595445 := 0 } lt($offs_2300595445, $data_size_2300595445) { $offs_2300595445 := add($offs_2300595445, 32)} {
+                        $AlignedStorageStore(add($data_dst_2300595445, $offs_2300595445), mload(add($data_src_2300595445, $offs_2300595445)))
+                        $Free(e, add($data_size_2300595445, 32))
+                    }
+                    $AlignedStorageStore(e_offs, $linked_dst_2300595445)
+                }
+                size := add(size, 1)
+                $StoreU64(v_ptr, size)
+                let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+                if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                    let new_v_offs := $ResizeVector(v_offs, capacity, 32)
+                    $StoreU256(v_ref, new_v_offs)
+                }
+            }
+            function A2_ExternalResult_panic$A2_U256_U256$(panic_code) -> $result {
+                let tmp_$1, tmp_$2, tmp_$3, tmp_$4, $t5, $t6, $t7, $t8, $t9
+                // $t5 := option::none<#0>()
+                $t5 := A1_option_none$A2_U256_U256$()
+                // $t6 := option::none<vector<u8>>()
+                $t6 := A1_option_none$vec$u8$$()
+                // $t7 := option::none<vector<u8>>()
+                $t7 := A1_option_none$vec$u8$$()
+                // $t8 := option::some<U256::U256>($t0)
+                $t8 := A1_option_some$A2_U256_U256$(panic_code)
+                // $t9 := pack ExternalResult::ExternalResult<#0>($t5, $t7, $t6, $t8)
+                {
+                    let $mem := $Malloc(128)
+                    $MemoryStoreU256(add($mem, 0), $t5)
+                    $MemoryStoreU256(add($mem, 32), $t7)
+                    $MemoryStoreU256(add($mem, 64), $t6)
+                    $MemoryStoreU256(add($mem, 96), $t8)
+                    $t9 := $mem
+                }
+                // return $t9
+                $result := $t9
+            }
+
+            function A1_option_some$A2_U256_U256$(e) -> $result {
+                let $t1, $t2
+                // $t1 := vector::singleton<#0>($t0)
+                $t1 := A1_vector_singleton$A2_U256_U256$(e)
+                // $t2 := pack option::Option<#0>($t1)
+                {
+                    let $mem := $Malloc(32)
+                    $MemoryStoreU256(add($mem, 0), $t1)
+                    $t2 := $mem
+                }
+                // return $t2
+                $result := $t2
+            }
+
+            function A1_vector_singleton$A2_U256_U256$(e) -> $result {
+                let $t2, $t3
+                let $locals := $Malloc(32)
+                // $t1 := vector::empty<#0>()
+                mstore($locals, A1_vector_empty$A2_U256_U256$())
+                // $t2 := borrow_local($t1)
+                $t2 := $MakePtr(false, $locals)
+                // vector::push_back<#0>($t2, $t0)
+                A1_vector_push_back$A2_U256_U256$($t2, e)
+                // $t3 := move($t1)
+                $t3 := mload($locals)
+                // return $t3
+                $result := $t3
+                $Free($locals, 32)
+            }
+
+            function A1_vector_push_back$A2_U256_U256$(v_ref, e) {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                let size := $LoadU64(v_ptr)
+                let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 32)))
+                $StoreU256(e_ptr, e)
+                size := add(size, 1)
+                $StoreU64(v_ptr, size)
+                let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+                if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                    let new_v_offs := $ResizeVector(v_offs, capacity, 32)
+                    $StoreU256(v_ref, new_v_offs)
+                }
+            }
+            function A2_ExternalResult_err_reason$A2_U256_U256$(error) -> $result {
+                let tmp_$1, tmp_$2, tmp_$3, tmp_$4, $t5, $t6, $t7, $t8, $t9
+                // $t5 := option::none<#0>()
+                $t5 := A1_option_none$A2_U256_U256$()
+                // $t6 := option::some<vector<u8>>($t0)
+                $t6 := A1_option_some$vec$u8$$(error)
+                // $t7 := option::none<vector<u8>>()
+                $t7 := A1_option_none$vec$u8$$()
+                // $t8 := option::none<U256::U256>()
+                $t8 := A1_option_none$A2_U256_U256$()
+                // $t9 := pack ExternalResult::ExternalResult<#0>($t5, $t7, $t6, $t8)
+                {
+                    let $mem := $Malloc(128)
+                    $MemoryStoreU256(add($mem, 0), $t5)
+                    $MemoryStoreU256(add($mem, 32), $t7)
+                    $MemoryStoreU256(add($mem, 64), $t6)
+                    $MemoryStoreU256(add($mem, 96), $t8)
+                    $t9 := $mem
+                }
+                // return $t9
+                $result := $t9
+            }
+
+            function A2_ExternalResult_ok$A2_U256_U256$(value) -> $result {
+                let $t1, $t2, $t3, $t4, $t5
+                // $t1 := option::some<#0>($t0)
+                $t1 := A1_option_some$A2_U256_U256$(value)
+                // $t2 := option::none<vector<u8>>()
+                $t2 := A1_option_none$vec$u8$$()
+                // $t3 := option::none<vector<u8>>()
+                $t3 := A1_option_none$vec$u8$$()
+                // $t4 := option::none<U256::U256>()
+                $t4 := A1_option_none$A2_U256_U256$()
+                // $t5 := pack ExternalResult::ExternalResult<#0>($t1, $t2, $t3, $t4)
+                {
+                    let $mem := $Malloc(128)
+                    $MemoryStoreU256(add($mem, 0), $t1)
+                    $MemoryStoreU256(add($mem, 32), $t2)
+                    $MemoryStoreU256(add($mem, 64), $t3)
+                    $MemoryStoreU256(add($mem, 96), $t4)
+                    $t5 := $mem
+                }
+                // return $t5
+                $result := $t5
+            }
+
+            function A2_ExternalResult_is_err_reason$A2_U256_U256$(result) -> $result {
+                let $t1, $t2
+                // $t1 := borrow_field<ExternalResult::ExternalResult<#0>>.err_reason($t0)
+                {
+                    let $field_ptr := $IndexPtr(result, 64)
+                    $t1 := $MakePtr($IsStoragePtr($field_ptr), $LoadU256($field_ptr))
+                }
+                // $t2 := option::is_some<vector<u8>>($t1)
+                $t2 := A1_option_is_some$vec$u8$$($t1)
+                // return $t2
+                $result := $t2
+            }
+
+            function A1_option_is_some$vec$u8$$(t) -> $result {
+                let $t1, $t2, $t3
+                // $t1 := borrow_field<option::Option<#0>>.vec($t0)
+                $t1 := t
+                // $t2 := vector::is_empty<#0>($t1)
+                $t2 := A1_vector_is_empty$vec$u8$$($t1)
+                // $t3 := !($t2)
+                $t3 := $LogicalNot($t2)
+                // return $t3
+                $result := $t3
+            }
+
+            function A1_vector_is_empty$vec$u8$$(v) -> $result {
+                let $t1, $t2, $t3
+                // $t1 := vector::length<#0>($t0)
+                $t1 := A1_vector_length$vec$u8$$(v)
+                // $t2 := 0
+                $t2 := 0
+                // $t3 := ==($t1, $t2)
+                $t3 := $Eq($t1, $t2)
+                // return $t3
+                $result := $t3
+            }
+
+            function A1_vector_length$vec$u8$$(v_ref) -> len {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                len := $LoadU64(v_ptr)
+            }
+            function A2_M_safe_transfer_form(contract, from, to, tokenId, data) {
+                if iszero(extcodesize(contract)) { $Abort(91) }
+                // storage for arguments and returned data
+                let $t5 := mload(0)
+                mstore($t5, $Shl(0xb88d4fde, 224))
+                let $t6 := abi_encode_tuple_$address_address_uint256_bytes$_$address_address_A2_U256_U256_vec$u8$$(add($t5, 4), from, to, tokenId, data)
+                let $t7 := call(gas(), contract, 0,  $t5, sub($t6, $t5), $t5, 0)
+                // set freeMemoryPointer
+                mstore(0, $t6)
+                if iszero($t7) { $RevertForward() }
+                if $t7 {
+                    // decode return parameters from external try-call into retVars
+                    abi_decode_tuple___from_memory($t5, add($t5, returndatasize()))
+                }
+            }
+            function A1_vector_empty$u8$() -> vector {
+                vector := $Malloc(34)
+                $MemoryStoreU64(add(vector, 8), 2)
+            }
+            function A2_M_no_para(contract) {
+                if iszero(extcodesize(contract)) { $Abort(91) }
+                // storage for arguments and returned data
+                let $t1 := mload(0)
+                mstore($t1, $Shl(0x557c379b, 224))
+                let $t2 := abi_encode_tuple__(add($t1, 4))
+                let $t3 := call(gas(), contract, 0,  $t1, sub($t2, $t1), $t1, 0)
+                // set freeMemoryPointer
+                mstore(0, $t2)
+                if iszero($t3) { $RevertForward() }
+                if $t3 {
+                    // decode return parameters from external try-call into retVars
+                    abi_decode_tuple___from_memory($t1, add($t1, returndatasize()))
+                }
+            }
+            function A2_M_multi_ret(contract, v, vec) -> $result0, $result1  {
+                // storage for arguments and returned data
+                let $t3 := mload(0)
+                mstore($t3, $Shl(0x7f547216, 224))
+                let $t4 := abi_encode_tuple_$uint256_uint256__$_$A2_U256_U256_vec$A2_U256_U256$$(add($t3, 4), v, vec)
+                let $t5 := call(gas(), contract, 0,  $t3, sub($t4, $t3), $t3, 0)
+                // set freeMemoryPointer
+                mstore(0, $t4)
+                if iszero($t5) { $RevertForward() }
+                if $t5 {
+                    // copy dynamic return data out
+                    returndatacopy($t3, 0, returndatasize())
+                    // decode return parameters from external try-call into retVars
+                    $result0, $result1 := abi_decode_tuple_$uint256___uint256$_$vec$A2_U256_U256$_A2_U256_U256$_from_memory($t3, add($t3, returndatasize()))
+                }
+            }
+            function A2_M_is_approved_for_all(contract, account, operator) -> $result  {
+                // storage for arguments and returned data
+                let $t3 := mload(0)
+                mstore($t3, $Shl(0xe985e9c5, 224))
+                let $t4 := abi_encode_tuple_$address_address$_$address_address$(add($t3, 4), account, operator)
+                let $t5 := call(gas(), contract, 0,  $t3, sub($t4, $t3), $t3, 32)
+                // set freeMemoryPointer
+                mstore(0, $t4)
+                if iszero($t5) { $RevertForward() }
+                if $t5 {
+                    // decode return parameters from external try-call into retVars
+                    $result := abi_decode_tuple_$bool$_$bool$_from_memory($t3, add($t3, returndatasize()))
+                }
+            }
+            function A2_ExternalResult_is_ok$A2_Evm_Unit$(result) -> $result {
+                let $t1, $t2
+                // $t1 := borrow_field<ExternalResult::ExternalResult<#0>>.value($t0)
+                {
+                    $t1 := $MakePtr($IsStoragePtr(result), $LoadU256(result))
+                }
+                // $t2 := option::is_some<#0>($t1)
+                $t2 := A1_option_is_some$A2_Evm_Unit$($t1)
+                // return $t2
+                $result := $t2
+            }
+
+            function A1_option_is_some$A2_Evm_Unit$(t) -> $result {
+                let $t1, $t2, $t3
+                // $t1 := borrow_field<option::Option<#0>>.vec($t0)
+                $t1 := t
+                // $t2 := vector::is_empty<#0>($t1)
+                $t2 := A1_vector_is_empty$A2_Evm_Unit$($t1)
+                // $t3 := !($t2)
+                $t3 := $LogicalNot($t2)
+                // return $t3
+                $result := $t3
+            }
+
+            function A1_vector_is_empty$A2_Evm_Unit$(v) -> $result {
+                let $t1, $t2, $t3
+                // $t1 := vector::length<#0>($t0)
+                $t1 := A1_vector_length$A2_Evm_Unit$(v)
+                // $t2 := 0
+                $t2 := 0
+                // $t3 := ==($t1, $t2)
+                $t3 := $Eq($t1, $t2)
+                // return $t3
+                $result := $t3
+            }
+
+            function A1_vector_length$A2_Evm_Unit$(v_ref) -> len {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                len := $LoadU64(v_ptr)
+            }
+            function A2_M_test_unit(contract) -> $result  {
+                if iszero(extcodesize(contract)) { $Abort(91) }
+                // storage for arguments and returned data
+                let $t1 := mload(0)
+                mstore($t1, $Shl(0xb76fa7ae, 224))
+                let $t2 := abi_encode_tuple__(add($t1, 4))
+                let $t3 := call(gas(), contract, 0,  $t1, sub($t2, $t1), $t1, 0)
+                // set freeMemoryPointer
+                mstore(0, $t2)
+                switch iszero($t3)
+                case 0 {
+                    // decode return parameters from external try-call into retVars
+                    abi_decode_tuple___from_memory($t1, add($t1, returndatasize()))
+                }
+                default {
+                    let $t4 := 1
+                    switch $ReturnDataSelector()
+                    case 0x08c379a0 {
+                        $result := $TryDecodeErrMsg()
+                        if $result {
+                            $t4 := 0
+                            $result := A2_ExternalResult_err_reason$A2_Evm_Unit$($result)
+                        }
+                    }
+                    case 0x4e487b71 {
+                        let $t5, $t6 := $TryDecodePanicData()
+                        if $t5 {
+                            $t4 := 0
+                            $result := $t6
+                            $result := A2_ExternalResult_panic$A2_Evm_Unit$($result)
+                        }
+                    }
+                    if $t4 {
+                        $result := $PackErrData()
+                        $result := A2_ExternalResult_err_data$A2_Evm_Unit$($result)
+                    }
+                }
+            }
+            function A2_ExternalResult_err_data$A2_Evm_Unit$(error) -> $result {
+                let $t1, $t2, $t3, $t4, $t5
+                // $t1 := option::none<#0>()
+                $t1 := A1_option_none$A2_Evm_Unit$()
+                // $t2 := option::some<vector<u8>>($t0)
+                $t2 := A1_option_some$vec$u8$$(error)
+                // $t3 := option::none<vector<u8>>()
+                $t3 := A1_option_none$vec$u8$$()
+                // $t4 := option::none<U256::U256>()
+                $t4 := A1_option_none$A2_U256_U256$()
+                // $t5 := pack ExternalResult::ExternalResult<#0>($t1, $t2, $t3, $t4)
+                {
+                    let $mem := $Malloc(128)
+                    $MemoryStoreU256(add($mem, 0), $t1)
+                    $MemoryStoreU256(add($mem, 32), $t2)
+                    $MemoryStoreU256(add($mem, 64), $t3)
+                    $MemoryStoreU256(add($mem, 96), $t4)
+                    $t5 := $mem
+                }
+                // return $t5
+                $result := $t5
+            }
+
+            function A1_option_none$A2_Evm_Unit$() -> $result {
+                let $t0, $t1
+                // $t0 := vector::empty<#0>()
+                $t0 := A1_vector_empty$A2_Evm_Unit$()
+                // $t1 := pack option::Option<#0>($t0)
+                {
+                    let $mem := $Malloc(32)
+                    $MemoryStoreU256(add($mem, 0), $t0)
+                    $t1 := $mem
+                }
+                // return $t1
+                $result := $t1
+            }
+
+            function A1_vector_empty$A2_Evm_Unit$() -> vector {
+                vector := $Malloc(96)
+                $MemoryStoreU64(add(vector, 8), 2)
+            }
+            function A2_ExternalResult_panic$A2_Evm_Unit$(panic_code) -> $result {
+                let tmp_$1, tmp_$2, tmp_$3, tmp_$4, $t5, $t6, $t7, $t8, $t9
+                // $t5 := option::none<#0>()
+                $t5 := A1_option_none$A2_Evm_Unit$()
+                // $t6 := option::none<vector<u8>>()
+                $t6 := A1_option_none$vec$u8$$()
+                // $t7 := option::none<vector<u8>>()
+                $t7 := A1_option_none$vec$u8$$()
+                // $t8 := option::some<U256::U256>($t0)
+                $t8 := A1_option_some$A2_U256_U256$(panic_code)
+                // $t9 := pack ExternalResult::ExternalResult<#0>($t5, $t7, $t6, $t8)
+                {
+                    let $mem := $Malloc(128)
+                    $MemoryStoreU256(add($mem, 0), $t5)
+                    $MemoryStoreU256(add($mem, 32), $t7)
+                    $MemoryStoreU256(add($mem, 64), $t6)
+                    $MemoryStoreU256(add($mem, 96), $t8)
+                    $t9 := $mem
+                }
+                // return $t9
+                $result := $t9
+            }
+
+            function A2_ExternalResult_err_reason$A2_Evm_Unit$(error) -> $result {
+                let tmp_$1, tmp_$2, tmp_$3, tmp_$4, $t5, $t6, $t7, $t8, $t9
+                // $t5 := option::none<#0>()
+                $t5 := A1_option_none$A2_Evm_Unit$()
+                // $t6 := option::some<vector<u8>>($t0)
+                $t6 := A1_option_some$vec$u8$$(error)
+                // $t7 := option::none<vector<u8>>()
+                $t7 := A1_option_none$vec$u8$$()
+                // $t8 := option::none<U256::U256>()
+                $t8 := A1_option_none$A2_U256_U256$()
+                // $t9 := pack ExternalResult::ExternalResult<#0>($t5, $t7, $t6, $t8)
+                {
+                    let $mem := $Malloc(128)
+                    $MemoryStoreU256(add($mem, 0), $t5)
+                    $MemoryStoreU256(add($mem, 32), $t7)
+                    $MemoryStoreU256(add($mem, 64), $t6)
+                    $MemoryStoreU256(add($mem, 96), $t8)
+                    $t9 := $mem
+                }
+                // return $t9
+                $result := $t9
+            }
+
+            function A2_ExternalResult_unwrap$A2_Evm_Unit$(result) -> $result {
+                let err_data, err_reason, panic_code, value, $t5, $t6, $t7, $t8, $t9
+                // ($t5, $t6, $t7, $t8) := unpack ExternalResult::ExternalResult<#0>($t0)
+                $t5 := $MemoryLoadU256(add(result, 0))
+                $t6 := $MemoryLoadU256(add(result, 32))
+                $t7 := $MemoryLoadU256(add(result, 64))
+                $t8 := $MemoryLoadU256(add(result, 96))
+                $Free(result, 128)
+                // option::destroy_none<vector<u8>>($t6)
+                A1_option_destroy_none$vec$u8$$($t6)
+                // option::destroy_none<vector<u8>>($t7)
+                A1_option_destroy_none$vec$u8$$($t7)
+                // option::destroy_none<U256::U256>($t8)
+                A1_option_destroy_none$A2_U256_U256$($t8)
+                // $t9 := option::destroy_some<#0>($t5)
+                $t9 := A1_option_destroy_some$A2_Evm_Unit$($t5)
+                // return $t9
+                $result := $t9
+            }
+
+            function A1_option_destroy_some$A2_Evm_Unit$(t) -> $result {
+                let elem, $t3, $t4, $t5, $t6, $t7, $t8, $t9
+                let $locals := $Malloc(32)
+                let $block := 4
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L1
+                        // goto L2
+                        $block := 5
+                    }
+                    case 3 {
+                        // label L0
+                        // $t5 := 262145
+                        $t5 := 262145
+                        // abort($t5)
+                        $Abort($t5)
+                    }
+                    case 4 {
+                        // $t3 := borrow_local($t0)
+                        $t3 := $MakePtr(false, t)
+                        // $t4 := option::is_some<#0>($t3)
+                        $t4 := A1_option_is_some$A2_Evm_Unit$($t3)
+                        // if ($t4) goto L1 else goto L0
+                        switch $t4
+                        case 0  { $block := 3 }
+                        default { $block := 2 }
+                    }
+                    case 5 {
+                        // label L2
+                        // $t6 := move($t0)
+                        $t6 := t
+                        // $t2 := unpack option::Option<#0>($t6)
+                        mstore($locals, $MemoryLoadU256(add($t6, 0)))
+                        $Free($t6, 32)
+                        // $t7 := borrow_local($t2)
+                        $t7 := $MakePtr(false, $locals)
+                        // $t8 := vector::pop_back<#0>($t7)
+                        $t8 := A1_vector_pop_back$A2_Evm_Unit$($t7)
+                        // $t9 := move($t2)
+                        $t9 := mload($locals)
+                        // vector::destroy_empty<#0>($t9)
+                        A1_vector_destroy_empty$A2_Evm_Unit$($t9)
+                        // return $t8
+                        $result := $t8
+                        $Free($locals, 32)
+                        leave
+                    }
+                }
+            }
+
+            function A1_vector_destroy_empty$A2_Evm_Unit$(v) {
+                let size := $MemoryLoadU64(v)
+                if $LogicalNot(iszero(size)) { $AbortBuiltin() }
+                let capacity := $MemoryLoadU64(add(v, 8))
+                $Free(v, add(32, mul(capacity, 32)))
+            }
+            function A1_vector_pop_back$A2_Evm_Unit$(v_ref) -> e {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                let size := $LoadU64(v_ptr)
+                if iszero(size) { $AbortBuiltin() }
+                let e_ptr := $IndexPtr(v_ptr, add(32, mul(sub(size, 1), 32)))
+                e := $LoadU256(e_ptr)
+                if $IsStoragePtr(e_ptr) {
+                    let e_offs := $OffsetPtr(e_ptr)
+                    let linked_src := $AlignedStorageLoad(e_offs)
+                    e := $Malloc(1)
+                    mstore(add(e, 0), $AlignedStorageLoad(add(linked_src, 0)))
+                    $AlignedStorageStore(add(linked_src, 0), 0)
+                    $AlignedStorageStore(e_offs, 0)
+                }
+                $StoreU64(v_ptr, sub(size, 1))
+            }
+            function A1_option_destroy_none$A2_U256_U256$(t) {
+                let $t1, $t2, $t3, $t4, $t5
+                let $block := 4
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L1
+                        // goto L2
+                        $block := 5
+                    }
+                    case 3 {
+                        // label L0
+                        // $t3 := 262144
+                        $t3 := 262144
+                        // abort($t3)
+                        $Abort($t3)
+                    }
+                    case 4 {
+                        // $t1 := borrow_local($t0)
+                        $t1 := $MakePtr(false, t)
+                        // $t2 := option::is_none<#0>($t1)
+                        $t2 := A1_option_is_none$A2_U256_U256$($t1)
+                        // if ($t2) goto L1 else goto L0
+                        switch $t2
+                        case 0  { $block := 3 }
+                        default { $block := 2 }
+                    }
+                    case 5 {
+                        // label L2
+                        // $t4 := move($t0)
+                        $t4 := t
+                        // $t5 := unpack option::Option<#0>($t4)
+                        $t5 := $MemoryLoadU256(add($t4, 0))
+                        $Free($t4, 32)
+                        // vector::destroy_empty<#0>($t5)
+                        A1_vector_destroy_empty$A2_U256_U256$($t5)
+                        // return ()
+                        leave
+                    }
+                }
+            }
+
+            function A1_vector_destroy_empty$A2_U256_U256$(v) {
+                let size := $MemoryLoadU64(v)
+                if $LogicalNot(iszero(size)) { $AbortBuiltin() }
+                let capacity := $MemoryLoadU64(add(v, 8))
+                $Free(v, add(32, mul(capacity, 32)))
+            }
+            function A1_option_is_none$A2_U256_U256$(t) -> $result {
+                let $t1, $t2
+                // $t1 := borrow_field<option::Option<#0>>.vec($t0)
+                $t1 := t
+                // $t2 := vector::is_empty<#0>($t1)
+                $t2 := A1_vector_is_empty$A2_U256_U256$($t1)
+                // return $t2
+                $result := $t2
+            }
+
+            function A1_option_destroy_none$vec$u8$$(t) {
+                let $t1, $t2, $t3, $t4, $t5
+                let $block := 4
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L1
+                        // goto L2
+                        $block := 5
+                    }
+                    case 3 {
+                        // label L0
+                        // $t3 := 262144
+                        $t3 := 262144
+                        // abort($t3)
+                        $Abort($t3)
+                    }
+                    case 4 {
+                        // $t1 := borrow_local($t0)
+                        $t1 := $MakePtr(false, t)
+                        // $t2 := option::is_none<#0>($t1)
+                        $t2 := A1_option_is_none$vec$u8$$($t1)
+                        // if ($t2) goto L1 else goto L0
+                        switch $t2
+                        case 0  { $block := 3 }
+                        default { $block := 2 }
+                    }
+                    case 5 {
+                        // label L2
+                        // $t4 := move($t0)
+                        $t4 := t
+                        // $t5 := unpack option::Option<#0>($t4)
+                        $t5 := $MemoryLoadU256(add($t4, 0))
+                        $Free($t4, 32)
+                        // vector::destroy_empty<#0>($t5)
+                        A1_vector_destroy_empty$vec$u8$$($t5)
+                        // return ()
+                        leave
+                    }
+                }
+            }
+
+            function A1_vector_destroy_empty$vec$u8$$(v) {
+                let size := $MemoryLoadU64(v)
+                if $LogicalNot(iszero(size)) { $AbortBuiltin() }
+                let capacity := $MemoryLoadU64(add(v, 8))
+                $Free(v, add(32, mul(capacity, 32)))
+            }
+            function A1_option_is_none$vec$u8$$(t) -> $result {
+                let $t1, $t2
+                // $t1 := borrow_field<option::Option<#0>>.vec($t0)
+                $t1 := t
+                // $t2 := vector::is_empty<#0>($t1)
+                $t2 := A1_vector_is_empty$vec$u8$$($t1)
+                // return $t2
+                $result := $t2
+            }
+
+            function A2_M_success(contract) -> $result  {
+                // storage for arguments and returned data
+                let $t1 := mload(0)
+                mstore($t1, $Shl(0x14056b3d, 224))
+                let $t2 := abi_encode_tuple__(add($t1, 4))
+                let $t3 := call(gas(), contract, 0,  $t1, sub($t2, $t1), $t1, 32)
+                // set freeMemoryPointer
+                mstore(0, $t2)
+                switch iszero($t3)
+                case 0 {
+                    // decode return parameters from external try-call into retVars
+                    $result := abi_decode_tuple_$uint256$_$A2_U256_U256$_from_memory($t1, add($t1, returndatasize()))
+                    $result := A2_ExternalResult_ok$A2_U256_U256$($result)
+                }
+                default {
+                    let $t4 := 1
+                    switch $ReturnDataSelector()
+                    case 0x08c379a0 {
+                        $result := $TryDecodeErrMsg()
+                        if $result {
+                            $t4 := 0
+                            $result := A2_ExternalResult_err_reason$A2_U256_U256$($result)
+                        }
+                    }
+                    case 0x4e487b71 {
+                        let $t5, $t6 := $TryDecodePanicData()
+                        if $t5 {
+                            $t4 := 0
+                            $result := $t6
+                            $result := A2_ExternalResult_panic$A2_U256_U256$($result)
+                        }
+                    }
+                    if $t4 {
+                        $result := $PackErrData()
+                        $result := A2_ExternalResult_err_data$A2_U256_U256$($result)
+                    }
+                }
+            }
+            function A2_U256_one() -> $result {
+                let $t0
+                // $t0 := 1
+                $t0 := 1
+                // return $t0
+                $result := $t0
+            }
+
+            function A2_ExternalResult_unwrap$A2_U256_U256$(result) -> $result {
+                let err_data, err_reason, panic_code, value, $t5, $t6, $t7, $t8, $t9
+                // ($t5, $t6, $t7, $t8) := unpack ExternalResult::ExternalResult<#0>($t0)
+                $t5 := $MemoryLoadU256(add(result, 0))
+                $t6 := $MemoryLoadU256(add(result, 32))
+                $t7 := $MemoryLoadU256(add(result, 64))
+                $t8 := $MemoryLoadU256(add(result, 96))
+                $Free(result, 128)
+                // option::destroy_none<vector<u8>>($t6)
+                A1_option_destroy_none$vec$u8$$($t6)
+                // option::destroy_none<vector<u8>>($t7)
+                A1_option_destroy_none$vec$u8$$($t7)
+                // option::destroy_none<U256::U256>($t8)
+                A1_option_destroy_none$A2_U256_U256$($t8)
+                // $t9 := option::destroy_some<#0>($t5)
+                $t9 := A1_option_destroy_some$A2_U256_U256$($t5)
+                // return $t9
+                $result := $t9
+            }
+
+            function A1_option_destroy_some$A2_U256_U256$(t) -> $result {
+                let elem, $t3, $t4, $t5, $t6, $t7, $t8, $t9
+                let $locals := $Malloc(32)
+                let $block := 4
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L1
+                        // goto L2
+                        $block := 5
+                    }
+                    case 3 {
+                        // label L0
+                        // $t5 := 262145
+                        $t5 := 262145
+                        // abort($t5)
+                        $Abort($t5)
+                    }
+                    case 4 {
+                        // $t3 := borrow_local($t0)
+                        $t3 := $MakePtr(false, t)
+                        // $t4 := option::is_some<#0>($t3)
+                        $t4 := A1_option_is_some$A2_U256_U256$($t3)
+                        // if ($t4) goto L1 else goto L0
+                        switch $t4
+                        case 0  { $block := 3 }
+                        default { $block := 2 }
+                    }
+                    case 5 {
+                        // label L2
+                        // $t6 := move($t0)
+                        $t6 := t
+                        // $t2 := unpack option::Option<#0>($t6)
+                        mstore($locals, $MemoryLoadU256(add($t6, 0)))
+                        $Free($t6, 32)
+                        // $t7 := borrow_local($t2)
+                        $t7 := $MakePtr(false, $locals)
+                        // $t8 := vector::pop_back<#0>($t7)
+                        $t8 := A1_vector_pop_back$A2_U256_U256$($t7)
+                        // $t9 := move($t2)
+                        $t9 := mload($locals)
+                        // vector::destroy_empty<#0>($t9)
+                        A1_vector_destroy_empty$A2_U256_U256$($t9)
+                        // return $t8
+                        $result := $t8
+                        $Free($locals, 32)
+                        leave
+                    }
+                }
+            }
+
+            function A1_vector_pop_back$A2_U256_U256$(v_ref) -> e {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                let size := $LoadU64(v_ptr)
+                if iszero(size) { $AbortBuiltin() }
+                let e_ptr := $IndexPtr(v_ptr, add(32, mul(sub(size, 1), 32)))
+                e := $LoadU256(e_ptr)
+                $StoreU64(v_ptr, sub(size, 1))
+            }
+            function abi_decode_tuple_$uint256$_$A2_U256_U256$_from_memory(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_uint256_from_memory(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint256_from_memory(offset, end) -> value {
+                value := mload(offset)
+                validator_uint256(value)
+            }
+            function validator_uint256(value) {
+                if iszero(eq(value, cleanup_uint256(value))) { $Abort(95) }
+            }
+            function cleanup_uint256(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)
+            }
+            function abi_encode_tuple__(headStart ) -> tail {
+                tail := add(headStart, 0)
+            }
+            function abi_decode_tuple___from_memory(headStart, dataEnd) {
+                if slt(sub(dataEnd, headStart), 0) { $Abort(96) }
+            }
+            function abi_decode_tuple_$bool$_$bool$_from_memory(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_bool_from_memory(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_bool_from_memory(offset, end) -> value {
+                value := mload(offset)
+                validator_bool(value)
+            }
+            function validator_bool(value) {
+                if iszero(eq(value, cleanup_bool(value))) { $Abort(95) }
+            }
+            function cleanup_bool(value) -> cleaned {
+                cleaned := and(value, 0xff)
+            }
+            function abi_encode_tuple_$address_address$_$address_address$(headStart ,value_0, value_1) -> tail {
+                tail := add(headStart, 64)
+                abi_encode_address(value_0, add(headStart, 0))
+                abi_encode_address(value_1, add(headStart, 32))
+            }
+            function abi_encode_address(value, pos) {
+                mstore(pos, cleanup_address(value))
+            }
+            function cleanup_address(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffffffffffffffffffffffffffff)
+            }
+            function abi_decode_tuple_$uint256___uint256$_$vec$A2_U256_U256$_A2_U256_U256$_from_memory(headStart, dataEnd) -> value_0, value_1 {
+                if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+                {
+                    let offset := mload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_uint256___vec$A2_U256_U256$_from_memory(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_uint256_from_memory(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint256___vec$A2_U256_U256$_from_memory(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := mload(offset)
+                let size := add(mul(32, length), 32)
+                array := abi_decode_available_length__uint256___vec$A2_U256_U256$_from_memory(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__uint256___vec$A2_U256_U256$_from_memory(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint256_from_memory(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_encode_tuple_$uint256_uint256__$_$A2_U256_U256_vec$A2_U256_U256$$(headStart ,value_0, value_1) -> tail {
+                tail := add(headStart, 64)
+                abi_encode_uint256(value_0, add(headStart, 0))
+                mstore(add(headStart, 32), sub(tail, headStart))
+                tail := abi_encode_uint256___vec$A2_U256_U256$(value_1,  tail)
+            }
+            function abi_encode_uint256___vec$A2_U256_U256$(value, pos) -> end {
+                let length := $MemoryLoadU64(value)
+                mstore(pos, length)
+                pos := add(pos, 0x20)
+                let start := add(value, 32)
+                let srcEnd := add(start, mul(length, 32))
+                for { let src := start } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let v := $MemoryLoadU256(src)
+                    pos := abi_encode_uint256_with_updated_pos(v, pos)
+                }
+                end := pos
+            }
+            function abi_encode_uint256_with_updated_pos(value, pos) -> updated_pos{
+                abi_encode_uint256(value, pos)
+                updated_pos := add(pos, 32)
+            }
+            function abi_encode_uint256(value, pos) {
+                mstore(pos, cleanup_uint256(value))
+            }
+            function abi_encode_tuple_$address_address_uint256_bytes$_$address_address_A2_U256_U256_vec$u8$$(headStart ,value_0, value_1, value_2, value_3) -> tail {
+                tail := add(headStart, 128)
+                abi_encode_address(value_0, add(headStart, 0))
+                abi_encode_address(value_1, add(headStart, 32))
+                abi_encode_uint256(value_2, add(headStart, 64))
+                mstore(add(headStart, 96), sub(tail, headStart))
+                tail := abi_encode_bytes(value_3,  tail)
+            }
+            function abi_encode_bytes(value, pos) -> end{
+                let size := $MemoryLoadU64(value)
+                mstore(pos, size)
+                pos := add(pos, 0x20)
+                $CopyMemory(add(value, 0x20), pos, size)
+                size := $RoundUp(size)
+                end := add(pos, size)
+            }
+            function abi_encode_tuple_$uint256$_$A2_U256_U256$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_uint256(value_0, add(headStart, 0))
+            }
+            function abi_encode_tuple_$uint8$_$u8$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_uint8(value_0, add(headStart, 0))
+            }
+            function abi_encode_uint8(value, pos) {
+                mstore(pos, cleanup_uint8(value))
+            }
+            function cleanup_uint8(value) -> cleaned {
+                cleaned := and(value, 0xff)
+            }
+            function abi_decode_tuple_$uint128_uint128$_$u128_u128$(headStart, dataEnd) -> value_0, value_1 {
+                if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_uint128(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_uint128(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint128(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint128(value)
+            }
+            function validator_uint128(value) {
+                if iszero(eq(value, cleanup_uint128(value))) { $Abort(95) }
+            }
+            function cleanup_uint128(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffffffffffffffffffff)
+            }
+            function abi_encode_tuple_$uint256___uint256$_$vec$A2_U256_U256$_A2_U256_U256$(headStart ,value_0, value_1) -> tail {
+                tail := add(headStart, 64)
+                mstore(add(headStart, 0), sub(tail, headStart))
+                tail := abi_encode_uint256___vec$A2_U256_U256$(value_0,  tail)
+                abi_encode_uint256(value_1, add(headStart, 32))
+            }
+            function abi_encode_tuple_$bool$_$bool$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_bool(value_0, add(headStart, 0))
+            }
+            function abi_encode_bool(value, pos) {
+                mstore(pos, cleanup_bool(value))
+            }
+            function abi_decode_tuple_$address$_$address$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_address(offset, end) -> value {
+                value := calldataload(offset)
+                validator_address(value)
+            }
+            function validator_address(value) {
+                if iszero(eq(value, cleanup_address(value))) { $Abort(95) }
+            }
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $AbortBuiltin() {
+                $Abort(sub(0, 1))
+            }
+            function $RevertForward() {
+              let pos := mload(0)
+              returndatacopy(pos, 0, returndatasize())
+              revert(pos, returndatasize())
+            }
+            function $Malloc(size) -> offs {
+                offs := mload(0)
+                // pad to word size
+                mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+            }
+            function $Free(offs, size) {
+            }
+            function $MakePtr(is_storage, offs) -> ptr {
+              ptr := or(is_storage, shl(1, offs))
+            }
+            function $IsStoragePtr(ptr) -> b {
+              b := and(ptr, 0x1)
+            }
+            function $OffsetPtr(ptr) -> offs {
+              offs := shr(1, ptr)
+            }
+            function $MaskForSize(size) -> mask {
+              mask := sub(shl(shl(3, size), 1), 1)
+            }
+            function $ExtractBytes(word, start, size) -> bytes {
+               switch size
+               case 1 {
+                  // use the faster byte primitive
+                  bytes := byte(start, word)
+               }
+               default {
+                  // As we have big endian, we need to right shift the value from
+                  // where the highest byte starts in the word (32 - start), minus
+                  // the size.
+                  let shift_bits := shl(3, sub(sub(32, start), size))
+                  bytes := and(shr(shift_bits, word), $MaskForSize(size))
+               }
+            }
+            function $InjectBytes(word, start, size, bytes) -> new_word {
+               let shift_bits := shl(3, sub(sub(32, start), size))
+               // Blend out the bits which we inject
+               let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+               word := and(word, neg_mask)
+               // Overlay the bits we inject
+               new_word := or(word, shl(shift_bits, bytes))
+            }
+            function $ToWordOffs(offs) -> word_offs, byte_offset {
+              word_offs := shr(5, offs)
+              byte_offset := and(offs, 0x1F)
+            }
+            function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+              let available_bytes := sub(32, byte_offset)
+              switch gt(size, available_bytes)
+              case 0 {
+                overflow_bytes := 0
+              }
+              default {
+                overflow_bytes := sub(size, available_bytes)
+              }
+            }
+            function $MemoryLoadBytes(offs, size) -> val {
+              // Lower bit where the value in the higher bytes ends
+              let bit_end := shl(3, sub(32, size))
+              val := shr(bit_end, mload(offs))
+            }
+            function $MemoryStoreBytes(offs, size, val) {
+              let bit_end := shl(3, sub(32, size))
+              let mask := shl(bit_end, $MaskForSize(size))
+              mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+            }
+            function $StorageLoadBytes(offs, size) -> val {
+              let word_offs, byte_offs := $ToWordOffs(offs)
+              let key := $StorageKey(0, word_offs)
+              val := $ExtractBytes(sload(key), byte_offs, size)
+              let overflow_bytes := $OverflowBytes(byte_offs, size)
+              if $LogicalNot(iszero(overflow_bytes)) {
+                key := $StorageKey(0, add(word_offs, 1))
+                let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+                val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+              }
+            }
+            function $StorageStoreBytes(offs, size, bytes) {
+              let word_offs, byte_offs := $ToWordOffs(offs)
+              let key := $StorageKey(0, word_offs)
+              let overflow_bytes := $OverflowBytes(byte_offs, size)
+              switch overflow_bytes
+              case 0 {
+                sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+              }
+              default {
+                // Shift the higher bytes to the right
+                let used_bytes := sub(size, overflow_bytes)
+                let higher_bytes := shr(used_bytes, bytes)
+                let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+                sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+                key := $StorageKey(0, add(word_offs, 1))
+                sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+              }
+            }
+            function $StorageKey(group, word) -> key {
+              mstore(32, word)
+              mstore(64, shl(224, group))
+              key := keccak256(32, 36)
+            }
+            function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+              offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+            }
+            function $NewLinkedStorageBase(type_hash) -> offs {
+              let key := $StorageKey(1, 1)
+              let handle := sload(key)
+              sstore(key, add(handle, 1))
+              offs := $MakeTypeStorageBase(1, type_hash, handle)
+            }
+            function $IndexPtr(ptr, offs) -> new_ptr {
+              new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+            }
+            function $LoadU64(ptr) -> val {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                val := $MemoryLoadU64(offs)
+              }
+              default {
+                val := $StorageLoadU64(offs)
+              }
+            }
+            function $MemoryLoadU64(offs) -> val {
+              val := $MemoryLoadBytes(offs, 8)
+            }
+            function $StorageLoadU64(offs) -> val {
+              val := $StorageLoadBytes(offs, 8)
+            }
+            function $StoreU64(ptr, val) {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                $MemoryStoreU64(offs, val)
+              }
+              default {
+                $StorageStoreU64(offs, val)
+              }
+            }
+            function $MemoryStoreU64(offs, val) {
+              $MemoryStoreBytes(offs, 8, val)
+            }
+            function $StorageStoreU64(offs, val) {
+              $StorageStoreBytes(offs, 8, val)
+            }
+            function $LoadU256(ptr) -> val {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                val := $MemoryLoadU256(offs)
+              }
+              default {
+                val := $StorageLoadU256(offs)
+              }
+            }
+            function $MemoryLoadU256(offs) -> val {
+              val := $MemoryLoadBytes(offs, 32)
+            }
+            function $StorageLoadU256(offs) -> val {
+              val := $StorageLoadBytes(offs, 32)
+            }
+            function $StoreU256(ptr, val) {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                $MemoryStoreU256(offs, val)
+              }
+              default {
+                $StorageStoreU256(offs, val)
+              }
+            }
+            function $MemoryStoreU256(offs, val) {
+              $MemoryStoreBytes(offs, 32, val)
+            }
+            function $StorageStoreU256(offs, val) {
+              $StorageStoreBytes(offs, 32, val)
+            }
+            function $AlignedStorageLoad(offs) -> val {
+              let word_offs := shr(5, offs)
+              val := sload($StorageKey(0, word_offs))
+            }
+            function $AlignedStorageStore(offs, val) {
+              let word_offs := shr(5, offs)
+              sstore($StorageKey(0, word_offs), val)
+            }
+            function $CopyMemory(src, dst, size) {
+              let num_words, overflow_bytes := $ToWordOffs(size)
+              let i := 0
+              for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+                mstore(add(dst, i), mload(add(src, i)))
+              }
+              if overflow_bytes {
+                let mask := $MaskForSize(sub(32, overflow_bytes))
+                let overflow_offs := mul(num_words, 32)
+                let dst_word := and(mload(add(dst, overflow_offs)), mask)
+                let src_word := and(mload(add(src, overflow_offs)), not(mask))
+                mstore(add(dst, overflow_offs), or(dst_word, src_word))
+              }
+            }
+            function $CheckMemorySize(len) -> checked_len {
+                if gt(len, 0xffffffffffffffff) { $AbortBuiltin() }
+                checked_len := len
+            }
+            function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+                let new_capacity := mul(capacity, 2)
+                let data_size := add(32, mul(capacity, type_size))
+                let new_data_size := add(32, mul(new_capacity, type_size))
+                new_v_offs := $Malloc(new_data_size)
+                $CopyMemory(v_offs, new_v_offs, data_size)
+                // update capacity at new location
+                $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+                $Free(v_offs, data_size)
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+            function $Shl(x, y) -> r {
+              r := shl(y, x)
+            }
+            function $Eq(x, y) -> r {
+                r := eq(x, y)
+            }
+            function $LogicalNot(x) -> r {
+                r := iszero(x)
+            }
+            function $CastU256(hi, lo) -> r {
+                if gt(hi, 0xffffffffffffffffffffffffffffffff) { $AbortBuiltin() }
+                if gt(lo, 0xffffffffffffffffffffffffffffffff) { $AbortBuiltin() }
+                r := add(shl(128, hi), lo)
+            }
+            function $ClosestGreaterPowerOfTwo(x) -> r {
+                r := or(r, shr(1, x))
+                r := or(r, shr(2, r))
+                r := or(r, shr(4, r))
+                r := or(r, shr(8, r))
+                r := or(r, shr(16, r))
+                r := or(r, shr(32, r))
+                r := add(x, 1)
+            }
+            function $RoundUp(value) -> result {
+                result := and(add(value, 31), not(31))
+            }
+            function $ReturnDataSelector() -> sig {
+              if gt(returndatasize(), 3) {
+                let pos := $Malloc(4)
+                returndatacopy(pos, 0, 4)
+                sig := shr(224, mload(pos))
+              }
+            }
+            function $TryDecodePanicData() -> success, data {
+              if gt(returndatasize(), 0x23) {
+                let pos := $Malloc(0x20)
+                returndatacopy(pos, 4, 0x20)
+                success := 1
+                data := mload(pos)
+              }
+            }
+            function $PackErrData() -> data {
+              data := $Malloc(add(returndatasize(), 0x20))
+              $MemoryStoreU64(data, returndatasize())
+              $MemoryStoreU64(add(data, 8), returndatasize())
+              returndatacopy(add(data, 0x20), 0, returndatasize())
+            }
+
+            function $TryDecodeErrMsg() -> data {
+              if lt(returndatasize(), 0x44) { leave }
+              data := $Malloc(0x20)
+              returndatacopy(data, 4, 0x20)
+              let offset := mload(data)
+              if or(
+                  gt(offset, 0xffffffffffffffff),
+                  gt(add(offset, 0x24), returndatasize())
+                  ) {
+                  leave
+              }
+              data := $Malloc(0x20)
+              returndatacopy(data, add(4, offset), 0x20)
+              let length := mload(data)
+              if or(
+                gt(length, 0xffffffffffffffff),
+                gt(add(add(offset, 0x24), length), returndatasize())
+              ) {
+                leave
+              }
+              data := $Malloc(add(length, 0x20))
+              $MemoryStoreU64(data, length)
+              $MemoryStoreU64(add(data, 8), length)
+              returndatacopy(add(data, 0x20), add(offset, 0x24), length)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
diff --git a/third_party/move/evm/move-to-yul/tests/test-dispatcher/ExternalCallFailure.v2_exp b/third_party/move/evm/move-to-yul/tests/test-dispatcher/ExternalCallFailure.v2_exp
new file mode 100644
index 0000000000000..e0d053e53823c
--- /dev/null
+++ b/third_party/move/evm/move-to-yul/tests/test-dispatcher/ExternalCallFailure.v2_exp
@@ -0,0 +1,26 @@
+
+
+!! Move-To-Yul Diagnostics:
+ error: error happens when parsing the signature
+  ┌─ tests/test-dispatcher/ExternalCallFailure.move:5:5
+  │
+5 │     public native fun failure_1();
+  │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: external function must have at least one argument
+  ┌─ tests/test-dispatcher/ExternalCallFailure.move:5:5
+  │
+5 │     public native fun failure_1();
+  │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: solidity signature is not compatible with the move signature
+  ┌─ tests/test-dispatcher/ExternalCallFailure.move:8:5
+  │
+8 │     public native fun failure_2(add: u128, i:u8);
+  │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: solidity signature is not compatible with the move signature
+   ┌─ tests/test-dispatcher/ExternalCallFailure.move:11:5
+   │
+11 │     public native fun failure_3(add: address, i:u8);
+   │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/third_party/move/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/ParsingSoliditySig.v2_exp b/third_party/move/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/ParsingSoliditySig.v2_exp
new file mode 100644
index 0000000000000..e81fedd4610dc
--- /dev/null
+++ b/third_party/move/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/ParsingSoliditySig.v2_exp
@@ -0,0 +1,511 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_M" {
+    code {
+        codecopy(0, dataoffset("A2_M_deployed"), datasize("A2_M_deployed"))
+        return(0, datasize("A2_M_deployed"))
+    }
+    object "A2_M_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                case 0xc938cd4b
+                {
+                    // add(int192,uint32)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1 := abi_decode_tuple_$int192_uint32$_$A2_U256_U256_u64$(4, calldatasize())
+                    let ret_0, ret_1 := A2_M_f1(param_0, param_1)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$int256_int24$_$A2_U256_U256_u64$(memPos, ret_0, ret_1)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x90b89a6b
+                {
+                    // fun_address(address,address)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1 := abi_decode_tuple_$address_address$_$signer_address$(4, calldatasize())
+                    let ret_0 := A2_M_f2(param_0, param_1)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$address$_$address$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xdf19e4ed
+                {
+                    // fun_2(int120[3][][5],address[],bytes[2],bytes1,bytes32)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1, param_2, param_3, param_4 := abi_decode_tuple_$int120_3____5__address___bytes_2__bytes1_bytes32$_$vec$vec$vec$u128$$$_vec$address$_vec$vec$u8$$_vec$u8$_vec$u8$$(4, calldatasize())
+                    let ret_0 := A2_M_f3(param_0, param_1, param_2, param_3, param_4)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint64$_$u128$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x18159cfb
+                {
+                    // f(string,string)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1 := abi_decode_tuple_$string_string$_$vec$u8$_vec$u8$$(4, calldatasize())
+                    A2_M_f4(param_0, param_1)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x7d19f4c8
+                {
+                    // $_fun1$(uint64)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint64$_$u64$(4, calldatasize())
+                    let ret_0 := A2_M_fun_1(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$int64$_$u64$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xf0619891
+                {
+                    // no_para_return()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    A2_M_no_para_return()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                default {}
+            }
+            $Abort(97)
+            function A2_M_f1(x, y) -> $result0, $result1 {
+                // return ($t0, $t1)
+                $result0 := x
+                $result1 := y
+            }
+
+            function A2_M_f2(_signer, addr) -> $result {
+                // return $t1
+                $result := addr
+            }
+
+            function A2_M_f3(_vec0, _vec1, _vec2, _vec3, _vec4) -> $result {
+                let $t5
+                // $t5 := 2
+                $t5 := 2
+                // return $t5
+                $result := $t5
+            }
+
+            function A2_M_f4(_s, _s1) {
+                // return ()
+            }
+
+            function A2_M_fun_1(x) -> $result {
+                // return $t0
+                $result := x
+            }
+
+            function A2_M_no_para_return() {
+                // return ()
+            }
+
+            function abi_encode_tuple__(headStart ) -> tail {
+                tail := add(headStart, 0)
+            }
+            function abi_encode_tuple_$int64$_$u64$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_int64(value_0, add(headStart, 0))
+            }
+            function abi_encode_int64(value, pos) {
+                mstore(pos, cleanup_int64(value))
+            }
+            function cleanup_int64(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffff)
+            }
+            function abi_decode_tuple_$uint64$_$u64$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_uint64(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint64(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint64(value)
+            }
+            function validator_uint64(value) {
+                if iszero(eq(value, cleanup_uint64(value))) { $Abort(95) }
+            }
+            function cleanup_uint64(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffff)
+            }
+            function abi_decode_tuple_$string_string$_$vec$u8$_vec$u8$$(headStart, dataEnd) -> value_0, value_1 {
+                if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_string_vec$u8$(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := calldataload(add(headStart, 32))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_1 := abi_decode_string_vec$u8$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_string_vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(1, length), 32)
+                array := abi_decode_available_length__string(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__string(src, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                if gt(add(src, sub(size, 32)), end) { $Abort(93) }
+                $CopyFromCallDataToMemory(src, dst, length)
+            }
+            function abi_encode_tuple_$uint64$_$u128$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_uint64(value_0, add(headStart, 0))
+            }
+            function abi_encode_uint64(value, pos) {
+                mstore(pos, cleanup_uint64(value))
+            }
+            function abi_decode_tuple_$int120_3____5__address___bytes_2__bytes1_bytes32$_$vec$vec$vec$u128$$$_vec$address$_vec$vec$u8$$_vec$u8$_vec$u8$$(headStart, dataEnd) -> value_0, value_1, value_2, value_3, value_4 {
+                if slt(sub(dataEnd, headStart), 160) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_int120_3____5__vec$vec$vec$u128$$$(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := calldataload(add(headStart, 32))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_1 := abi_decode_address___vec$address$(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := calldataload(add(headStart, 64))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_2 := abi_decode_bytes_2__vec$vec$u8$$(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 96
+                    value_3 := abi_decode_bytes1_vec$u8$(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 128
+                    value_4 := abi_decode_bytes32_vec$u8$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_bytes32_vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 32
+                let size := 64
+                array := abi_decode_available_length__bytes32(offset, length, size, end)
+            }
+            function abi_decode_available_length__bytes32(src, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                if gt(add(src, sub(size, 32)), end) { $Abort(93) }
+                $CopyFromCallDataToMemory(src, dst, length)
+            }
+            function abi_decode_bytes1_vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 1
+                let size := 33
+                array := abi_decode_available_length__bytes1(offset, length, size, end)
+            }
+            function abi_decode_available_length__bytes1(src, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                if gt(add(src, sub(size, 32)), end) { $Abort(93) }
+                $CopyFromCallDataToMemory(src, dst, length)
+            }
+            function abi_decode_bytes_2__vec$vec$u8$$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 2
+                let size := 96
+                array := abi_decode_available_length__bytes_2__vec$vec$u8$$(offset, length, size, end)
+            }
+            function abi_decode_available_length__bytes_2__vec$vec$u8$$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let innerOffset := calldataload(src)
+                    if gt(innerOffset, 0xffffffffffffffff) { $Abort(94) }
+                    let elementPos := add(offset, innerOffset)
+                    let value := abi_decode_bytes_vec$u8$(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode_bytes_vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(1, length), 32)
+                array := abi_decode_available_length__bytes(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__bytes(src, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                if gt(add(src, sub(size, 32)), end) { $Abort(93) }
+                $CopyFromCallDataToMemory(src, dst, length)
+            }
+            function abi_decode_address___vec$address$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(32, length), 32)
+                array := abi_decode_available_length__address___vec$address$(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__address___vec$address$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_address(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode_address(offset, end) -> value {
+                value := calldataload(offset)
+                validator_address(value)
+            }
+            function validator_address(value) {
+                if iszero(eq(value, cleanup_address(value))) { $Abort(95) }
+            }
+            function cleanup_address(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffffffffffffffffffffffffffff)
+            }
+            function abi_decode_int120_3____5__vec$vec$vec$u128$$$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 5
+                let size := 192
+                array := abi_decode_available_length__int120_3____5__vec$vec$vec$u128$$$(offset, length, size, end)
+            }
+            function abi_decode_available_length__int120_3____5__vec$vec$vec$u128$$$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let innerOffset := calldataload(src)
+                    if gt(innerOffset, 0xffffffffffffffff) { $Abort(94) }
+                    let elementPos := add(offset, innerOffset)
+                    let value := abi_decode_int120_3____vec$vec$u128$$(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode_int120_3____vec$vec$u128$$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(32, length), 32)
+                array := abi_decode_available_length__int120_3____vec$vec$u128$$(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__int120_3____vec$vec$u128$$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 96))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 96) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_int120_3__vec$u128$(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode_int120_3__vec$u128$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 3
+                let size := 80
+                array := abi_decode_available_length__int120_3__vec$u128$(offset, length, size, end)
+            }
+            function abi_decode_available_length__int120_3__vec$u128$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_int120(elementPos, end)
+                    $MemoryStoreU128(dst, value)
+                    dst := add(dst, 16)
+                }
+            }
+            function abi_decode_int120(offset, end) -> value {
+                value := calldataload(offset)
+                validator_int120(value)
+            }
+            function validator_int120(value) {
+                if iszero(eq(value, cleanup_int120(value))) { $Abort(95) }
+            }
+            function cleanup_int120(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffffffffffffffffff)
+            }
+            function abi_encode_tuple_$address$_$address$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_address(value_0, add(headStart, 0))
+            }
+            function abi_encode_address(value, pos) {
+                mstore(pos, cleanup_address(value))
+            }
+            function abi_decode_tuple_$address_address$_$signer_address$(headStart, dataEnd) -> value_0, value_1 {
+                if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_encode_tuple_$int256_int24$_$A2_U256_U256_u64$(headStart ,value_0, value_1) -> tail {
+                tail := add(headStart, 64)
+                abi_encode_int256(value_0, add(headStart, 0))
+                abi_encode_int24(value_1, add(headStart, 32))
+            }
+            function abi_encode_int24(value, pos) {
+                mstore(pos, cleanup_int24(value))
+            }
+            function cleanup_int24(value) -> cleaned {
+                cleaned := and(value, 0xffffff)
+            }
+            function abi_encode_int256(value, pos) {
+                mstore(pos, cleanup_int256(value))
+            }
+            function cleanup_int256(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)
+            }
+            function abi_decode_tuple_$int192_uint32$_$A2_U256_U256_u64$(headStart, dataEnd) -> value_0, value_1 {
+                if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_int192(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_uint32(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint32(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint32(value)
+            }
+            function validator_uint32(value) {
+                if iszero(eq(value, cleanup_uint32(value))) { $Abort(95) }
+            }
+            function cleanup_uint32(value) -> cleaned {
+                cleaned := and(value, 0xffffffff)
+            }
+            function abi_decode_int192(offset, end) -> value {
+                value := calldataload(offset)
+                validator_int192(value)
+            }
+            function validator_int192(value) {
+                if iszero(eq(value, cleanup_int192(value))) { $Abort(95) }
+            }
+            function cleanup_int192(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffffffffffffffffffffffffffffffffffff)
+            }
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $AbortBuiltin() {
+                $Abort(sub(0, 1))
+            }
+            function $Malloc(size) -> offs {
+                offs := mload(0)
+                // pad to word size
+                mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+            }
+            function $MaskForSize(size) -> mask {
+              mask := sub(shl(shl(3, size), 1), 1)
+            }
+            function $MemoryStoreBytes(offs, size, val) {
+              let bit_end := shl(3, sub(32, size))
+              let mask := shl(bit_end, $MaskForSize(size))
+              mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+            }
+            function $MemoryStoreU64(offs, val) {
+              $MemoryStoreBytes(offs, 8, val)
+            }
+            function $MemoryStoreU128(offs, val) {
+              $MemoryStoreBytes(offs, 16, val)
+            }
+            function $MemoryStoreU256(offs, val) {
+              $MemoryStoreBytes(offs, 32, val)
+            }
+            function $CheckMemorySize(len) -> checked_len {
+                if gt(len, 0xffffffffffffffff) { $AbortBuiltin() }
+                checked_len := len
+            }
+            function $CopyFromCallDataToMemory(src, dst, length) {
+                calldatacopy(dst, src, length)
+                mstore(add(dst, length), 0)
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+            function $ClosestGreaterPowerOfTwo(x) -> r {
+                r := or(r, shr(1, x))
+                r := or(r, shr(2, r))
+                r := or(r, shr(4, r))
+                r := or(r, shr(8, r))
+                r := or(r, shr(16, r))
+                r := or(r, shr(32, r))
+                r := add(x, 1)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
diff --git a/third_party/move/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/evm-examples/ERC1155.v2_exp b/third_party/move/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/evm-examples/ERC1155.v2_exp
new file mode 100644
index 0000000000000..1f2c070652e2c
--- /dev/null
+++ b/third_party/move/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/evm-examples/ERC1155.v2_exp
@@ -0,0 +1,465 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_ERC1155" {
+    code {
+        codecopy(0, dataoffset("A2_ERC1155_deployed"), datasize("A2_ERC1155_deployed"))
+        return(0, datasize("A2_ERC1155_deployed"))
+    }
+    object "A2_ERC1155_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                case 0x00fdd58e
+                {
+                    // balanceOf(address,uint256)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1 := abi_decode_tuple_$address_uint256$_$address_A2_U256_U256$(4, calldatasize())
+                    let ret_0 := A2_ERC1155_balanceOf(param_0, param_1)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint256$_$A2_U256_U256$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x4e1273f4
+                {
+                    // balanceOfBatch(address[],uint256[])
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1 := abi_decode_tuple_$address___uint256__$_$vec$address$_vec$A2_U256_U256$$(4, calldatasize())
+                    let ret_0 := A2_ERC1155_balanceOfBatch(param_0, param_1)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint256__$_$vec$A2_U256_U256$$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xebd1d359
+                {
+                    // isApprovalForAll(address,address)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1 := abi_decode_tuple_$address_address$_$address_address$(4, calldatasize())
+                    let ret_0 := A2_ERC1155_isApprovalForAll(param_0, param_1)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$bool$_$bool$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x2eb2c2d6
+                {
+                    // safeBatchTransferFrom(address,address,uint256[],uint256[],bytes)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1, param_2, param_3, param_4 := abi_decode_tuple_$address_address_uint256___uint256___bytes$_$address_address_vec$A2_U256_U256$_vec$A2_U256_U256$_vec$u8$$(4, calldatasize())
+                    A2_ERC1155_safeBatchTransferFrom(param_0, param_1, param_2, param_3, param_4)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xf242432a
+                {
+                    // safeTransferFrom(address,address,uint256,uint256,bytes)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1, param_2, param_3, param_4 := abi_decode_tuple_$address_address_uint256_uint256_bytes$_$address_address_A2_U256_U256_A2_U256_U256_vec$u8$$(4, calldatasize())
+                    A2_ERC1155_safeTransferFrom(param_0, param_1, param_2, param_3, param_4)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xa22cb465
+                {
+                    // setApprovalForAll(address,bool)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1 := abi_decode_tuple_$address_bool$_$address_bool$(4, calldatasize())
+                    A2_ERC1155_setApprovalForAll(param_0, param_1)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x01ffc9a7
+                {
+                    // supportsInterface(bytes4)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$bytes4$_$vec$u8$$(4, calldatasize())
+                    let ret_0 := A2_ERC1155_supportsInterface(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$bool$_$bool$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                default {}
+            }
+            $Abort(97)
+            function A2_ERC1155_balanceOf(_account, _id) -> $result {
+                let $t2
+                // $t2 := 0
+                $t2 := 0
+                // return $t2
+                $result := $t2
+            }
+
+            function A2_ERC1155_balanceOfBatch(_accounts, ids) -> $result {
+                // return $t1
+                $result := ids
+            }
+
+            function A2_ERC1155_isApprovalForAll(_account, _operator) -> $result {
+                let $t2
+                // $t2 := true
+                $t2 := true
+                // return $t2
+                $result := $t2
+            }
+
+            function A2_ERC1155_safeBatchTransferFrom(_from, _to, _ids, _amounts, _data) {
+                // return ()
+            }
+
+            function A2_ERC1155_safeTransferFrom(_from, _to, _id, _amount, _data) {
+                // return ()
+            }
+
+            function A2_ERC1155_setApprovalForAll(_operator, _approved) {
+                // return ()
+            }
+
+            function A2_ERC1155_supportsInterface(_interfaceId) -> $result {
+                let $t1
+                // $t1 := true
+                $t1 := true
+                // return $t1
+                $result := $t1
+            }
+
+            function abi_encode_tuple_$bool$_$bool$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_bool(value_0, add(headStart, 0))
+            }
+            function abi_encode_bool(value, pos) {
+                mstore(pos, cleanup_bool(value))
+            }
+            function cleanup_bool(value) -> cleaned {
+                cleaned := and(value, 0xff)
+            }
+            function abi_decode_tuple_$bytes4$_$vec$u8$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_bytes4_vec$u8$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_bytes4_vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 4
+                let size := 36
+                array := abi_decode_available_length__bytes4(offset, length, size, end)
+            }
+            function abi_decode_available_length__bytes4(src, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                if gt(add(src, sub(size, 32)), end) { $Abort(93) }
+                $CopyFromCallDataToMemory(src, dst, length)
+            }
+            function abi_encode_tuple__(headStart ) -> tail {
+                tail := add(headStart, 0)
+            }
+            function abi_decode_tuple_$address_bool$_$address_bool$(headStart, dataEnd) -> value_0, value_1 {
+                if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_bool(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_bool(offset, end) -> value {
+                value := calldataload(offset)
+                validator_bool(value)
+            }
+            function validator_bool(value) {
+                if iszero(eq(value, cleanup_bool(value))) { $Abort(95) }
+            }
+            function abi_decode_address(offset, end) -> value {
+                value := calldataload(offset)
+                validator_address(value)
+            }
+            function validator_address(value) {
+                if iszero(eq(value, cleanup_address(value))) { $Abort(95) }
+            }
+            function cleanup_address(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffffffffffffffffffffffffffff)
+            }
+            function abi_decode_tuple_$address_address_uint256_uint256_bytes$_$address_address_A2_U256_U256_A2_U256_U256_vec$u8$$(headStart, dataEnd) -> value_0, value_1, value_2, value_3, value_4 {
+                if slt(sub(dataEnd, headStart), 160) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 64
+                    value_2 := abi_decode_uint256(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 96
+                    value_3 := abi_decode_uint256(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := calldataload(add(headStart, 128))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_4 := abi_decode_bytes_vec$u8$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_bytes_vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(1, length), 32)
+                array := abi_decode_available_length__bytes(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__bytes(src, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                if gt(add(src, sub(size, 32)), end) { $Abort(93) }
+                $CopyFromCallDataToMemory(src, dst, length)
+            }
+            function abi_decode_uint256(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint256(value)
+            }
+            function validator_uint256(value) {
+                if iszero(eq(value, cleanup_uint256(value))) { $Abort(95) }
+            }
+            function cleanup_uint256(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)
+            }
+            function abi_decode_tuple_$address_address_uint256___uint256___bytes$_$address_address_vec$A2_U256_U256$_vec$A2_U256_U256$_vec$u8$$(headStart, dataEnd) -> value_0, value_1, value_2, value_3, value_4 {
+                if slt(sub(dataEnd, headStart), 160) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := calldataload(add(headStart, 64))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_2 := abi_decode_uint256___vec$A2_U256_U256$(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := calldataload(add(headStart, 96))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_3 := abi_decode_uint256___vec$A2_U256_U256$(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := calldataload(add(headStart, 128))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_4 := abi_decode_bytes_vec$u8$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint256___vec$A2_U256_U256$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(32, length), 32)
+                array := abi_decode_available_length__uint256___vec$A2_U256_U256$(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__uint256___vec$A2_U256_U256$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint256(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode_tuple_$address_address$_$address_address$(headStart, dataEnd) -> value_0, value_1 {
+                if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_encode_tuple_$uint256__$_$vec$A2_U256_U256$$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                mstore(add(headStart, 0), sub(tail, headStart))
+                tail := abi_encode_uint256___vec$A2_U256_U256$(value_0,  tail)
+            }
+            function abi_encode_uint256___vec$A2_U256_U256$(value, pos) -> end {
+                let length := $MemoryLoadU64(value)
+                mstore(pos, length)
+                pos := add(pos, 0x20)
+                let start := add(value, 32)
+                let srcEnd := add(start, mul(length, 32))
+                for { let src := start } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let v := $MemoryLoadU256(src)
+                    pos := abi_encode_uint256_with_updated_pos(v, pos)
+                }
+                end := pos
+            }
+            function abi_encode_uint256_with_updated_pos(value, pos) -> updated_pos{
+                abi_encode_uint256(value, pos)
+                updated_pos := add(pos, 32)
+            }
+            function abi_encode_uint256(value, pos) {
+                mstore(pos, cleanup_uint256(value))
+            }
+            function abi_decode_tuple_$address___uint256__$_$vec$address$_vec$A2_U256_U256$$(headStart, dataEnd) -> value_0, value_1 {
+                if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_address___vec$address$(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := calldataload(add(headStart, 32))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_1 := abi_decode_uint256___vec$A2_U256_U256$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_address___vec$address$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(32, length), 32)
+                array := abi_decode_available_length__address___vec$address$(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__address___vec$address$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_address(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_encode_tuple_$uint256$_$A2_U256_U256$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_uint256(value_0, add(headStart, 0))
+            }
+            function abi_decode_tuple_$address_uint256$_$address_A2_U256_U256$(headStart, dataEnd) -> value_0, value_1 {
+                if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_uint256(add(headStart, offset), dataEnd)
+                }
+            }
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $AbortBuiltin() {
+                $Abort(sub(0, 1))
+            }
+            function $Malloc(size) -> offs {
+                offs := mload(0)
+                // pad to word size
+                mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+            }
+            function $MaskForSize(size) -> mask {
+              mask := sub(shl(shl(3, size), 1), 1)
+            }
+            function $MemoryLoadBytes(offs, size) -> val {
+              // Lower bit where the value in the higher bytes ends
+              let bit_end := shl(3, sub(32, size))
+              val := shr(bit_end, mload(offs))
+            }
+            function $MemoryStoreBytes(offs, size, val) {
+              let bit_end := shl(3, sub(32, size))
+              let mask := shl(bit_end, $MaskForSize(size))
+              mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+            }
+            function $MemoryLoadU64(offs) -> val {
+              val := $MemoryLoadBytes(offs, 8)
+            }
+            function $MemoryStoreU64(offs, val) {
+              $MemoryStoreBytes(offs, 8, val)
+            }
+            function $MemoryLoadU256(offs) -> val {
+              val := $MemoryLoadBytes(offs, 32)
+            }
+            function $MemoryStoreU256(offs, val) {
+              $MemoryStoreBytes(offs, 32, val)
+            }
+            function $CheckMemorySize(len) -> checked_len {
+                if gt(len, 0xffffffffffffffff) { $AbortBuiltin() }
+                checked_len := len
+            }
+            function $CopyFromCallDataToMemory(src, dst, length) {
+                calldatacopy(dst, src, length)
+                mstore(add(dst, length), 0)
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+            function $ClosestGreaterPowerOfTwo(x) -> r {
+                r := or(r, shr(1, x))
+                r := or(r, shr(2, r))
+                r := or(r, shr(4, r))
+                r := or(r, shr(8, r))
+                r := or(r, shr(16, r))
+                r := or(r, shr(32, r))
+                r := add(x, 1)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
+
+
+!! Move-To-Yul Diagnostics:
+ warning: unused alias
+  ┌─ tests/test-dispatcher/signature-parsing-test/baseline/evm-examples/ERC1155.move:4:22
+  │
+4 │     use std::ascii::{String};
+  │                      ^^^^^^ Unused 'use' of alias 'String'. Consider removing it
diff --git a/third_party/move/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/evm-examples/ERC721.v2_exp b/third_party/move/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/evm-examples/ERC721.v2_exp
new file mode 100644
index 0000000000000..5c745b49220cc
--- /dev/null
+++ b/third_party/move/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/evm-examples/ERC721.v2_exp
@@ -0,0 +1,440 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_ERC721" {
+    code {
+        codecopy(0, dataoffset("A2_ERC721_deployed"), datasize("A2_ERC721_deployed"))
+        return(0, datasize("A2_ERC721_deployed"))
+    }
+    object "A2_ERC721_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                case 0x095ea7b3
+                {
+                    // approve(address,uint256)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1 := abi_decode_tuple_$address_uint256$_$address_A2_U256_U256$(4, calldatasize())
+                    A2_ERC721_approve(param_0, param_1)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x70a08231
+                {
+                    // balanceOf(address)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$address$_$address$(4, calldatasize())
+                    let ret_0 := A2_ERC721_balanceOf(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint256$_$A2_U256_U256$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x081812fc
+                {
+                    // getApproved(uint256)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint256$_$A2_U256_U256$(4, calldatasize())
+                    let ret_0 := A2_ERC721_getApproved(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$address$_$address$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xebd1d359
+                {
+                    // isApprovalForAll(address,address)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1 := abi_decode_tuple_$address_address$_$address_address$(4, calldatasize())
+                    let ret_0 := A2_ERC721_isApprovalForAll(param_0, param_1)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$bool$_$bool$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x6352211e
+                {
+                    // ownerOf(uint256)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint256$_$A2_U256_U256$(4, calldatasize())
+                    let ret_0 := A2_ERC721_ownerOf(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$address$_$address$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x42842e0e
+                {
+                    // safeTransferFrom(address,address,uint256)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1, param_2 := abi_decode_tuple_$address_address_uint256$_$address_address_A2_U256_U256$(4, calldatasize())
+                    A2_ERC721_safeTransferFrom(param_0, param_1, param_2)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xb88d4fde
+                {
+                    // safeTransferFrom(address,address,uint256,bytes)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1, param_2, param_3 := abi_decode_tuple_$address_address_uint256_bytes$_$address_address_A2_U256_U256_vec$u8$$(4, calldatasize())
+                    A2_ERC721_safeTransferFrom_with_data(param_0, param_1, param_2, param_3)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xa22cb465
+                {
+                    // setApprovalForAll(address,bool)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1 := abi_decode_tuple_$address_bool$_$address_bool$(4, calldatasize())
+                    A2_ERC721_setApprovalForAll(param_0, param_1)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x01ffc9a7
+                {
+                    // supportsInterface(bytes4)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$bytes4$_$vec$u8$$(4, calldatasize())
+                    let ret_0 := A2_ERC721_supportsInterface(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$bool$_$bool$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x23b872dd
+                {
+                    // transferFrom(address,address,uint256)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1, param_2 := abi_decode_tuple_$address_address_uint256$_$address_address_A2_U256_U256$(4, calldatasize())
+                    A2_ERC721_transferFrom(param_0, param_1, param_2)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                default {}
+            }
+            $Abort(97)
+            function A2_ERC721_approve(_approved, _tokenId) {
+                // return ()
+            }
+
+            function A2_ERC721_balanceOf(_owner) -> $result {
+                let $t1
+                // $t1 := 0
+                $t1 := 0
+                // return $t1
+                $result := $t1
+            }
+
+            function A2_ERC721_getApproved(_tokenId) -> $result {
+                let $t1
+                // $t1 := 0x1
+                $t1 := 0x1
+                // return $t1
+                $result := $t1
+            }
+
+            function A2_ERC721_isApprovalForAll(_account, _operator) -> $result {
+                let $t2
+                // $t2 := true
+                $t2 := true
+                // return $t2
+                $result := $t2
+            }
+
+            function A2_ERC721_ownerOf(_tokenId) -> $result {
+                let $t1
+                // $t1 := 0x1
+                $t1 := 0x1
+                // return $t1
+                $result := $t1
+            }
+
+            function A2_ERC721_safeTransferFrom(from, to, tokenId) {
+                let $t3
+                // $t3 := []
+                $t3 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(0)))
+                $MemoryStoreU64($t3, 0)
+                $MemoryStoreU64(add($t3, 8), $ClosestGreaterPowerOfTwo(0))
+                copy_literal_string_to_memory_21418693(add($t3, 32))
+                // ERC721::safeTransferFrom_with_data($t0, $t1, $t2, $t3)
+                A2_ERC721_safeTransferFrom_with_data(from, to, tokenId, $t3)
+                // return ()
+            }
+
+            function A2_ERC721_safeTransferFrom_with_data(_from, _to, _tokenId, _data) {
+                // return ()
+            }
+
+            function A2_ERC721_setApprovalForAll(_operator, _approved) {
+                // return ()
+            }
+
+            function A2_ERC721_supportsInterface(_interfaceId) -> $result {
+                let $t1
+                // $t1 := true
+                $t1 := true
+                // return $t1
+                $result := $t1
+            }
+
+            function A2_ERC721_transferFrom(_from, _to, _tokenId) {
+                // return ()
+            }
+
+            function copy_literal_string_to_memory_21418693(value) {
+            }
+            function abi_encode_tuple__(headStart ) -> tail {
+                tail := add(headStart, 0)
+            }
+            function abi_decode_tuple_$address_address_uint256$_$address_address_A2_U256_U256$(headStart, dataEnd) -> value_0, value_1, value_2 {
+                if slt(sub(dataEnd, headStart), 96) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 64
+                    value_2 := abi_decode_uint256(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint256(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint256(value)
+            }
+            function validator_uint256(value) {
+                if iszero(eq(value, cleanup_uint256(value))) { $Abort(95) }
+            }
+            function cleanup_uint256(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)
+            }
+            function abi_decode_address(offset, end) -> value {
+                value := calldataload(offset)
+                validator_address(value)
+            }
+            function validator_address(value) {
+                if iszero(eq(value, cleanup_address(value))) { $Abort(95) }
+            }
+            function cleanup_address(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffffffffffffffffffffffffffff)
+            }
+            function abi_encode_tuple_$bool$_$bool$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_bool(value_0, add(headStart, 0))
+            }
+            function abi_encode_bool(value, pos) {
+                mstore(pos, cleanup_bool(value))
+            }
+            function cleanup_bool(value) -> cleaned {
+                cleaned := and(value, 0xff)
+            }
+            function abi_decode_tuple_$bytes4$_$vec$u8$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_bytes4_vec$u8$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_bytes4_vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 4
+                let size := 36
+                array := abi_decode_available_length__bytes4(offset, length, size, end)
+            }
+            function abi_decode_available_length__bytes4(src, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                if gt(add(src, sub(size, 32)), end) { $Abort(93) }
+                $CopyFromCallDataToMemory(src, dst, length)
+            }
+            function abi_decode_tuple_$address_bool$_$address_bool$(headStart, dataEnd) -> value_0, value_1 {
+                if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_bool(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_bool(offset, end) -> value {
+                value := calldataload(offset)
+                validator_bool(value)
+            }
+            function validator_bool(value) {
+                if iszero(eq(value, cleanup_bool(value))) { $Abort(95) }
+            }
+            function abi_decode_tuple_$address_address_uint256_bytes$_$address_address_A2_U256_U256_vec$u8$$(headStart, dataEnd) -> value_0, value_1, value_2, value_3 {
+                if slt(sub(dataEnd, headStart), 128) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 64
+                    value_2 := abi_decode_uint256(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := calldataload(add(headStart, 96))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_3 := abi_decode_bytes_vec$u8$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_bytes_vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(1, length), 32)
+                array := abi_decode_available_length__bytes(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__bytes(src, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                if gt(add(src, sub(size, 32)), end) { $Abort(93) }
+                $CopyFromCallDataToMemory(src, dst, length)
+            }
+            function abi_encode_tuple_$address$_$address$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_address(value_0, add(headStart, 0))
+            }
+            function abi_encode_address(value, pos) {
+                mstore(pos, cleanup_address(value))
+            }
+            function abi_decode_tuple_$uint256$_$A2_U256_U256$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_uint256(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_tuple_$address_address$_$address_address$(headStart, dataEnd) -> value_0, value_1 {
+                if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_encode_tuple_$uint256$_$A2_U256_U256$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_uint256(value_0, add(headStart, 0))
+            }
+            function abi_encode_uint256(value, pos) {
+                mstore(pos, cleanup_uint256(value))
+            }
+            function abi_decode_tuple_$address$_$address$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_tuple_$address_uint256$_$address_A2_U256_U256$(headStart, dataEnd) -> value_0, value_1 {
+                if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_uint256(add(headStart, offset), dataEnd)
+                }
+            }
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $AbortBuiltin() {
+                $Abort(sub(0, 1))
+            }
+            function $Malloc(size) -> offs {
+                offs := mload(0)
+                // pad to word size
+                mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+            }
+            function $MaskForSize(size) -> mask {
+              mask := sub(shl(shl(3, size), 1), 1)
+            }
+            function $MemoryStoreBytes(offs, size, val) {
+              let bit_end := shl(3, sub(32, size))
+              let mask := shl(bit_end, $MaskForSize(size))
+              mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+            }
+            function $MemoryStoreU64(offs, val) {
+              $MemoryStoreBytes(offs, 8, val)
+            }
+            function $CheckMemorySize(len) -> checked_len {
+                if gt(len, 0xffffffffffffffff) { $AbortBuiltin() }
+                checked_len := len
+            }
+            function $CopyFromCallDataToMemory(src, dst, length) {
+                calldatacopy(dst, src, length)
+                mstore(add(dst, length), 0)
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+            function $ClosestGreaterPowerOfTwo(x) -> r {
+                r := or(r, shr(1, x))
+                r := or(r, shr(2, r))
+                r := or(r, shr(4, r))
+                r := or(r, shr(8, r))
+                r := or(r, shr(16, r))
+                r := or(r, shr(32, r))
+                r := add(x, 1)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
diff --git a/third_party/move/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/evm-examples/Token.v2_exp b/third_party/move/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/evm-examples/Token.v2_exp
new file mode 100644
index 0000000000000..c0f7c0c52f07b
--- /dev/null
+++ b/third_party/move/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/evm-examples/Token.v2_exp
@@ -0,0 +1,239 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_ERC20" {
+    code {
+        codecopy(0, dataoffset("A2_ERC20_deployed"), datasize("A2_ERC20_deployed"))
+        return(0, datasize("A2_ERC20_deployed"))
+    }
+    object "A2_ERC20_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                case 0xdd62ed3e
+                {
+                    // allowance(address,address)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1 := abi_decode_tuple_$address_address$_$address_address$(4, calldatasize())
+                    let ret_0 := A2_ERC20_allowance(param_0, param_1)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint256$_$A2_U256_U256$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x095ea7b3
+                {
+                    // approve(address,uint256)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1 := abi_decode_tuple_$address_uint256$_$address_A2_U256_U256$(4, calldatasize())
+                    let ret_0 := A2_ERC20_approve(param_0, param_1)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$bool$_$bool$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x70a08231
+                {
+                    // balanceOf(address)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$address$_$address$(4, calldatasize())
+                    let ret_0 := A2_ERC20_balance_of(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint256$_$A2_U256_U256$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x18160ddd
+                {
+                    // totalSupply()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let ret_0 := A2_ERC20_total_supply()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint256$_$A2_U256_U256$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xa9059cbb
+                {
+                    // transfer(address,uint256)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1 := abi_decode_tuple_$address_uint256$_$address_A2_U256_U256$(4, calldatasize())
+                    let ret_0 := A2_ERC20_transfer(param_0, param_1)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$bool$_$bool$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x23b872dd
+                {
+                    // transferFrom(address,address,uint256)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1, param_2 := abi_decode_tuple_$address_address_uint256$_$address_address_A2_U256_U256$(4, calldatasize())
+                    let ret_0 := A2_ERC20_transfer_from(param_0, param_1, param_2)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$bool$_$bool$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                default {}
+            }
+            $Abort(97)
+            function A2_ERC20_allowance(_owner, _spender) -> $result {
+                let $t2
+                // $t2 := 0
+                $t2 := 0
+                // return $t2
+                $result := $t2
+            }
+
+            function A2_ERC20_approve(_spender, _amount) -> $result {
+                let $t2
+                // $t2 := true
+                $t2 := true
+                // return $t2
+                $result := $t2
+            }
+
+            function A2_ERC20_balance_of(_owner) -> $result {
+                let $t1
+                // $t1 := 0
+                $t1 := 0
+                // return $t1
+                $result := $t1
+            }
+
+            function A2_ERC20_total_supply() -> $result {
+                let $t0
+                // $t0 := 0
+                $t0 := 0
+                // return $t0
+                $result := $t0
+            }
+
+            function A2_ERC20_transfer(_to, _amount) -> $result {
+                let $t2
+                // $t2 := true
+                $t2 := true
+                // return $t2
+                $result := $t2
+            }
+
+            function A2_ERC20_transfer_from(_from, _to, _amount) -> $result {
+                let $t3
+                // $t3 := true
+                $t3 := true
+                // return $t3
+                $result := $t3
+            }
+
+            function abi_encode_tuple_$bool$_$bool$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_bool(value_0, add(headStart, 0))
+            }
+            function abi_encode_bool(value, pos) {
+                mstore(pos, cleanup_bool(value))
+            }
+            function cleanup_bool(value) -> cleaned {
+                cleaned := and(value, 0xff)
+            }
+            function abi_decode_tuple_$address_address_uint256$_$address_address_A2_U256_U256$(headStart, dataEnd) -> value_0, value_1, value_2 {
+                if slt(sub(dataEnd, headStart), 96) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 64
+                    value_2 := abi_decode_uint256(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint256(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint256(value)
+            }
+            function validator_uint256(value) {
+                if iszero(eq(value, cleanup_uint256(value))) { $Abort(95) }
+            }
+            function cleanup_uint256(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)
+            }
+            function abi_decode_address(offset, end) -> value {
+                value := calldataload(offset)
+                validator_address(value)
+            }
+            function validator_address(value) {
+                if iszero(eq(value, cleanup_address(value))) { $Abort(95) }
+            }
+            function cleanup_address(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffffffffffffffffffffffffffff)
+            }
+            function abi_decode_tuple_$address_uint256$_$address_A2_U256_U256$(headStart, dataEnd) -> value_0, value_1 {
+                if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_uint256(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_encode_tuple_$uint256$_$A2_U256_U256$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_uint256(value_0, add(headStart, 0))
+            }
+            function abi_encode_uint256(value, pos) {
+                mstore(pos, cleanup_uint256(value))
+            }
+            function abi_decode_tuple_$address$_$address$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_tuple_$address_address$_$address_address$(headStart, dataEnd) -> value_0, value_1 {
+                if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+            }
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
diff --git a/third_party/move/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalDataLocation.v2_exp b/third_party/move/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalDataLocation.v2_exp
new file mode 100644
index 0000000000000..f7082390ff200
--- /dev/null
+++ b/third_party/move/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalDataLocation.v2_exp
@@ -0,0 +1,25 @@
+
+
+!! Move-To-Yul Diagnostics:
+ error: data location can only be specified for array or struct types
+  ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalDataLocation.move:5:5
+  │
+5 │ ╭     fun primitive_memory(_x:u128) {
+6 │ │     }
+  │ ╰─────^
+
+error: calldata is not supported yet
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalDataLocation.move:9:5
+   │
+ 9 │ ╭     fun primitive_calldata(): u128 {
+10 │ │         0
+11 │ │     }
+   │ ╰─────^
+
+error: calldata is not supported yet
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalDataLocation.move:14:5
+   │
+14 │ ╭     fun bytes_calldata(_v: vector<u8>): u128 {
+15 │ │         0
+16 │ │     }
+   │ ╰─────^
diff --git a/third_party/move/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalFunctionName.v2_exp b/third_party/move/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalFunctionName.v2_exp
new file mode 100644
index 0000000000000..0701c1158620d
--- /dev/null
+++ b/third_party/move/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalFunctionName.v2_exp
@@ -0,0 +1,17 @@
+
+
+!! Move-To-Yul Diagnostics:
+ error: error happens when parsing the signature
+  ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalFunctionName.move:5:5
+  │
+5 │ ╭     fun illegal_char_begin() {
+6 │ │     }
+  │ ╰─────^
+
+error: error happens when parsing the signature
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalFunctionName.move:9:5
+   │
+ 9 │ ╭     fun illegal_char() {
+10 │ │
+11 │ │     }
+   │ ╰─────^
diff --git a/third_party/move/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalTypeList.v2_exp b/third_party/move/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalTypeList.v2_exp
new file mode 100644
index 0000000000000..dad06433650d5
--- /dev/null
+++ b/third_party/move/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalTypeList.v2_exp
@@ -0,0 +1,141 @@
+
+
+!! Move-To-Yul Diagnostics:
+ error: error happens when parsing the signature
+  ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalTypeList.move:7:5
+  │
+7 │ ╭     fun extra_comma_1(_x: u64) {
+8 │ │
+9 │ │     }
+  │ ╰─────^
+
+error: error happens when parsing the signature
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalTypeList.move:12:5
+   │
+12 │ ╭     fun extra_comma_2(_x: u64) {
+13 │ │
+14 │ │     }
+   │ ╰─────^
+
+error: error happens when parsing the signature
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalTypeList.move:17:5
+   │
+17 │ ╭     fun extra_comma_3() : u64 {
+18 │ │         1
+19 │ │     }
+   │ ╰─────^
+
+error: error happens when parsing the return types in the signature
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalTypeList.move:24:5
+   │
+24 │ ╭     fun illegal_char_1() {
+25 │ │     }
+   │ ╰─────^
+
+error: error happens when parsing the signature
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalTypeList.move:28:5
+   │
+28 │ ╭     fun illegal_char_2() {
+29 │ │     }
+   │ ╰─────^
+
+error: error happens when parsing the return types in the signature
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalTypeList.move:32:5
+   │
+32 │ ╭     fun illegal_char_3() {
+33 │ │     }
+   │ ╰─────^
+
+error: error happens when parsing the return types in the signature
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalTypeList.move:36:5
+   │
+36 │ ╭     fun no_bracket() : u64 {
+37 │ │         0
+38 │ │     }
+   │ ╰─────^
+
+error: error happens when parsing a simple type
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalTypeList.move:43:5
+   │
+43 │ ╭     fun illegal_int_1(_x: u8) : u64 {
+44 │ │         0
+45 │ │     }
+   │ ╰─────^
+
+error: error happens when parsing a simple type
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalTypeList.move:48:5
+   │
+48 │ ╭     fun illegal_int_2(_x: u8) : u64 {
+49 │ │         0
+50 │ │     }
+   │ ╰─────^
+
+error: error happens when parsing a simple type
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalTypeList.move:53:5
+   │
+53 │ ╭     fun illegal_int_3(_x: u8) : u64 {
+54 │ │         0
+55 │ │     }
+   │ ╰─────^
+
+error: error happens when parsing a simple type
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalTypeList.move:58:5
+   │
+58 │ ╭     fun illegal_fixed_1(_x: u8) : u64 {
+59 │ │         0
+60 │ │     }
+   │ ╰─────^
+
+error: error happens when parsing a simple type
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalTypeList.move:63:5
+   │
+63 │ ╭     fun illegal_fixed_2(_x: u8) : u64 {
+64 │ │         0
+65 │ │     }
+   │ ╰─────^
+
+error: cannot create struct abi:fix64x18
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalTypeList.move:68:5
+   │
+68 │ ╭     fun illegal_fixed_3(_x: u128) {
+69 │ │     }
+   │ ╰─────^
+
+error: error happens when parsing the signature
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalTypeList.move:72:5
+   │
+72 │ ╭     fun illegal_fixed_4(_x: u128) {
+73 │ │     }
+   │ ╰─────^
+
+error: error happens when parsing a simple type
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalTypeList.move:77:5
+   │
+77 │ ╭     fun illegal_bytes_1(_v: vector<u8>) : u64 {
+78 │ │         0
+79 │ │     }
+   │ ╰─────^
+
+error: error happens when parsing a simple type
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalTypeList.move:82:5
+   │
+82 │ ╭     fun illegal_bytes_2(_v: vector<u8>) : u64 {
+83 │ │         0
+84 │ │     }
+   │ ╰─────^
+
+error: error happens when parsing a simple type
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalTypeList.move:87:5
+   │
+87 │ ╭     fun illegal_address_1(_x: address) : u64 {
+88 │ │         0
+89 │ │     }
+   │ ╰─────^
+
+error: error happens when parsing a simple type
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalTypeList.move:92:5
+   │
+92 │ ╭     fun illegal_address_2(x: address) : address {
+93 │ │         x
+94 │ │     }
+   │ ╰─────^
diff --git a/third_party/move/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IncompatibileType.v2_exp b/third_party/move/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IncompatibileType.v2_exp
new file mode 100644
index 0000000000000..69a7ab80575d5
--- /dev/null
+++ b/third_party/move/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IncompatibileType.v2_exp
@@ -0,0 +1,115 @@
+
+
+!! Move-To-Yul Diagnostics:
+ error: solidity signature is not compatible with the move signature
+  ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IncompatibileType.move:7:5
+  │
+7 │ ╭     fun len_typ_diff(x: u64): u64 {
+8 │ │         x
+9 │ │     }
+  │ ╰─────^
+
+error: solidity signature is not compatible with the move signature
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IncompatibileType.move:12:5
+   │
+12 │ ╭     fun len_ret_diff(): u128 {
+13 │ │         0
+14 │ │     }
+   │ ╰─────^
+
+error: solidity signature is not compatible with the move signature
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IncompatibileType.move:19:5
+   │
+19 │ ╭     fun fun_u8(_x:u8) {
+20 │ │     }
+   │ ╰─────^
+
+error: solidity signature is not compatible with the move signature
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IncompatibileType.move:23:5
+   │
+23 │ ╭     fun fun_u64(_x:u64) {
+24 │ │     }
+   │ ╰─────^
+
+error: solidity signature is not compatible with the move signature
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IncompatibileType.move:27:5
+   │
+27 │ ╭     fun fun_u128(): u128 {
+28 │ │         0
+29 │ │     }
+   │ ╰─────^
+
+error: solidity signature is not compatible with the move signature
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IncompatibileType.move:32:5
+   │
+32 │ ╭     fun fun_u8_bool(_b: u8) {
+33 │ │     }
+   │ ╰─────^
+
+error: solidity signature is not compatible with the move signature
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IncompatibileType.move:36:5
+   │
+36 │ ╭     fun fun_u128_address(_a: u128) {
+37 │ │     }
+   │ ╰─────^
+
+error: solidity signature is not compatible with the move signature
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IncompatibileType.move:40:5
+   │
+40 │ ╭     fun fun_address_u160(_a: address) {
+41 │ │     }
+   │ ╰─────^
+
+error: solidity signature is not compatible with the move signature
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IncompatibileType.move:44:5
+   │
+44 │ ╭     fun fun_u128_ufixed(_a: u128) {
+45 │ │     }
+   │ ╰─────^
+
+error: solidity signature is not compatible with the move signature
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IncompatibileType.move:48:5
+   │
+48 │ ╭     fun fun_u128_fixed(_a: u128) {
+49 │ │     }
+   │ ╰─────^
+
+error: solidity signature is not compatible with the move signature
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IncompatibileType.move:54:5
+   │
+54 │ ╭     fun fun_vec_u128_str(_vec0: vector<u128>): u128 {
+55 │ │         2
+56 │ │     }
+   │ ╰─────^
+
+error: solidity signature is not compatible with the move signature
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IncompatibileType.move:61:5
+   │
+61 │ ╭     fun fun_vec_u128_bytes(_vec0: vector<u128>): u128 {
+62 │ │         2
+63 │ │     }
+   │ ╰─────^
+
+error: solidity signature is not compatible with the move signature
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IncompatibileType.move:68:5
+   │
+68 │ ╭     fun fun_vec_u64(_vec0: vector<u64>): u128 {
+69 │ │         2
+70 │ │     }
+   │ ╰─────^
+
+error: solidity signature is not compatible with the move signature
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IncompatibileType.move:75:5
+   │
+75 │ ╭     fun fun_vec_u64_int72_static(_vec0: vector<u64>): u128 {
+76 │ │         2
+77 │ │     }
+   │ ╰─────^
+
+error: solidity signature is not compatible with the move signature
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IncompatibileType.move:82:5
+   │
+82 │ ╭     fun fun_vec_u64_int72_dynamic(_vec0: vector<u64>): u128 {
+83 │ │         2
+84 │ │     }
+   │ ╰─────^
diff --git a/third_party/move/evm/move-to-yul/tests/test-events/CallEmit.v2_exp b/third_party/move/evm/move-to-yul/tests/test-events/CallEmit.v2_exp
new file mode 100644
index 0000000000000..ab8e443702abe
--- /dev/null
+++ b/third_party/move/evm/move-to-yul/tests/test-events/CallEmit.v2_exp
@@ -0,0 +1,967 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_M" {
+    code {
+        codecopy(0, dataoffset("A2_M_deployed"), datasize("A2_M_deployed"))
+        return(0, datasize("A2_M_deployed"))
+    }
+    object "A2_M_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                case 0x18e09622
+                {
+                    // do_event_1(uint8,address,uint256)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1, param_2 := abi_decode_tuple_$uint8_address_uint256$_$u8_address_A2_U256_U256$(4, calldatasize())
+                    A2_M_do_event_1(param_0, param_1, param_2)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x72ef91b8
+                {
+                    // ev(uint8,address,uint16,bytes)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1, param_2, param_3 := abi_decode_tuple_$uint8_address_uint16_bytes$_$u8_address_u64_vec$u8$$(4, calldatasize())
+                    A2_M_do_event_2(param_0, param_1, param_2, param_3)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x9b39a853
+                {
+                    // do_event_3(uint8,address,uint256)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1, param_2 := abi_decode_tuple_$uint8_address_uint256$_$u8_address_A2_U256_U256$(4, calldatasize())
+                    A2_M_do_event_3(param_0, param_1, param_2)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x66325f65
+                {
+                    // ev(bytes1,bytes2,bytes32)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1, param_2 := abi_decode_tuple_$bytes1_bytes2_bytes32$_$vec$u8$_vec$u8$_vec$u8$$(4, calldatasize())
+                    A2_M_do_event_4(param_0, param_1, param_2)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x2dd328e6
+                {
+                    // ev(bytes,string)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1 := abi_decode_tuple_$bytes_string$_$vec$u8$_vec$u8$$(4, calldatasize())
+                    A2_M_do_event_5(param_0, param_1)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x14b66c9c
+                {
+                    // ev(bytes,string,uint16[3])
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1, param_2 := abi_decode_tuple_$bytes_string_uint16_3_$_$vec$u8$_vec$u8$_vec$u64$$(4, calldatasize())
+                    A2_M_do_event_6(param_0, param_1, param_2)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x19b52855
+                {
+                    // ev(bytes[])
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$bytes__$_$vec$vec$u8$$$(4, calldatasize())
+                    A2_M_do_event_7(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x8632c0cf
+                {
+                    // ev(bytes[],string[3])
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1 := abi_decode_tuple_$bytes___string_3_$_$vec$vec$u8$$_vec$vec$u8$$$(4, calldatasize())
+                    A2_M_do_event_8(param_0, param_1)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xb5cfa220
+                {
+                    // do_transfer(address,address,uint256)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1, param_2 := abi_decode_tuple_$address_address_uint256$_$address_address_A2_U256_U256$(4, calldatasize())
+                    A2_M_do_transfer(param_0, param_1, param_2)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                default {}
+            }
+            $Abort(97)
+            function A2_M_do_event_1(from, to, amount) {
+                let $t3
+                // $t3 := pack M::Event_1($t0, $t1, $t2)
+                {
+                    let $mem := $Malloc(65)
+                    $MemoryStoreU8(add($mem, 64), from)
+                    $MemoryStoreU256(add($mem, 0), to)
+                    $MemoryStoreU256(add($mem, 32), amount)
+                    $t3 := $mem
+                }
+                // Evm::emit<M::Event_1>($t3)
+                A2_Evm_emit$A2_M_Event_1$($t3)
+                // return ()
+            }
+
+            function A2_M_do_event_2(v1, v2, v3, v4) {
+                let $t4
+                // $t4 := pack M::Event_2($t0, $t1, $t2, $t3)
+                {
+                    let $mem := $Malloc(73)
+                    $MemoryStoreU8(add($mem, 72), v1)
+                    $MemoryStoreU256(add($mem, 32), v2)
+                    $MemoryStoreU64(add($mem, 64), v3)
+                    $MemoryStoreU256(add($mem, 0), v4)
+                    $t4 := $mem
+                }
+                // Evm::emit<M::Event_2>($t4)
+                A2_Evm_emit$A2_M_Event_2$($t4)
+                // return ()
+            }
+
+            function A2_M_do_event_3(from, to, amount) {
+                let $t3
+                // $t3 := pack M::Event_3($t0, $t1, $t2)
+                {
+                    let $mem := $Malloc(65)
+                    $MemoryStoreU8(add($mem, 64), from)
+                    $MemoryStoreU256(add($mem, 0), to)
+                    $MemoryStoreU256(add($mem, 32), amount)
+                    $t3 := $mem
+                }
+                // Evm::emit<M::Event_3>($t3)
+                A2_Evm_emit$A2_M_Event_3$($t3)
+                // return ()
+            }
+
+            function A2_M_do_event_4(v1, v2, v3) {
+                let $t3
+                // $t3 := pack M::Event_4($t0, $t1, $t2)
+                {
+                    let $mem := $Malloc(96)
+                    $MemoryStoreU256(add($mem, 0), v1)
+                    $MemoryStoreU256(add($mem, 32), v2)
+                    $MemoryStoreU256(add($mem, 64), v3)
+                    $t3 := $mem
+                }
+                // Evm::emit<M::Event_4>($t3)
+                A2_Evm_emit$A2_M_Event_4$($t3)
+                // return ()
+            }
+
+            function A2_M_do_event_5(bys, str) {
+                let $t2
+                // $t2 := pack M::Event_5($t0, $t1)
+                {
+                    let $mem := $Malloc(64)
+                    $MemoryStoreU256(add($mem, 0), bys)
+                    $MemoryStoreU256(add($mem, 32), str)
+                    $t2 := $mem
+                }
+                // Evm::emit<M::Event_5>($t2)
+                A2_Evm_emit$A2_M_Event_5$($t2)
+                // return ()
+            }
+
+            function A2_M_do_event_6(bys, str, uint16_array) {
+                let $t3
+                // $t3 := pack M::Event_6($t0, $t1, $t2)
+                {
+                    let $mem := $Malloc(96)
+                    $MemoryStoreU256(add($mem, 0), bys)
+                    $MemoryStoreU256(add($mem, 32), str)
+                    $MemoryStoreU256(add($mem, 64), uint16_array)
+                    $t3 := $mem
+                }
+                // Evm::emit<M::Event_6>($t3)
+                A2_Evm_emit$A2_M_Event_6$($t3)
+                // return ()
+            }
+
+            function A2_M_do_event_7(bys) {
+                let $t1
+                // $t1 := pack M::Event_7($t0)
+                {
+                    let $mem := $Malloc(32)
+                    $MemoryStoreU256(add($mem, 0), bys)
+                    $t1 := $mem
+                }
+                // Evm::emit<M::Event_7>($t1)
+                A2_Evm_emit$A2_M_Event_7$($t1)
+                // return ()
+            }
+
+            function A2_M_do_event_8(bys, strs) {
+                let $t2
+                // $t2 := pack M::Event_8($t0, $t1)
+                {
+                    let $mem := $Malloc(64)
+                    $MemoryStoreU256(add($mem, 0), bys)
+                    $MemoryStoreU256(add($mem, 32), strs)
+                    $t2 := $mem
+                }
+                // Evm::emit<M::Event_8>($t2)
+                A2_Evm_emit$A2_M_Event_8$($t2)
+                // return ()
+            }
+
+            function A2_M_do_transfer(from, to, amount) {
+                let $t3
+                // $t3 := pack M::Transfer($t0, $t1, $t2)
+                {
+                    let $mem := $Malloc(96)
+                    $MemoryStoreU256(add($mem, 0), from)
+                    $MemoryStoreU256(add($mem, 32), to)
+                    $MemoryStoreU256(add($mem, 64), amount)
+                    $t3 := $mem
+                }
+                // Evm::emit<M::Transfer>($t3)
+                A2_Evm_emit$A2_M_Transfer$($t3)
+                // return ()
+            }
+
+            function A2_Evm_emit$A2_M_Transfer$(e) {
+                let $t1 := 0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef
+                let $t2 := $MemoryLoadU256(add(e, 0))
+                let $t3 := $MemoryLoadU256(add(e, 32))
+                let $t4 := $MemoryLoadU256(add(e, 64))
+                {
+                    let $t5 := mload(0)
+                    let $t6 := abi_encode_tuple_$address_address_uint256$_$address_address_A2_U256_U256$($t5, $t2,$t3,$t4)
+                    log1($t5, sub($t6, $t5), $t1)
+                    mstore(0, $t6)
+                }
+            }
+            function A2_Evm_emit$A2_M_Event_8$(e) {
+                let $t1 := 0xc93e9a8cc20289a6f17bb089da7c4f35f1c7bed2d207c99c389aa67a29856919
+                let $t2 := $MemoryLoadU256(add(e, 0))
+                let $t3 := $MemoryLoadU256(add(e, 32))
+                let $t4 := packed_hashed__$string_3_$_$vec$vec$u8$$$($t3)
+                {
+                    let $t5 := mload(0)
+                    let $t6 := abi_encode_tuple_$bytes__$_$vec$vec$u8$$$($t5, $t2)
+                    log2($t5, sub($t6, $t5), $t1,$t4)
+                    mstore(0, $t6)
+                }
+            }
+            function A2_Evm_emit$A2_M_Event_7$(e) {
+                let $t1 := 0xbf5527d30da2fb3f39b16da435128c62ee89ac7b8284997e9e437fa88bab6ad9
+                let $t2 := $MemoryLoadU256(add(e, 0))
+                let $t3 := packed_hashed__$bytes__$_$vec$vec$u8$$$($t2)
+                {
+                    let $t4 := mload(0)
+                    let $t5 := abi_encode_tuple__($t4)
+                    log2($t4, sub($t5, $t4), $t1,$t3)
+                    mstore(0, $t5)
+                }
+            }
+            function A2_Evm_emit$A2_M_Event_6$(e) {
+                let $t1 := 0x51d171607b25f521bb07d41cd58b450228834cf4490222c5a931dd370818d29a
+                let $t2 := $MemoryLoadU256(add(e, 0))
+                let $t3 := packed_hashed__$bytes$_$vec$u8$$($t2)
+                let $t4 := $MemoryLoadU256(add(e, 32))
+                let $t5 := $MemoryLoadU256(add(e, 64))
+                let $t6 := packed_hashed__$uint16_3_$_$vec$u64$$($t5)
+                {
+                    let $t7 := mload(0)
+                    let $t8 := abi_encode_tuple_$string$_$vec$u8$$($t7, $t4)
+                    log3($t7, sub($t8, $t7), $t1,$t3,$t6)
+                    mstore(0, $t8)
+                }
+            }
+            function A2_Evm_emit$A2_M_Event_5$(e) {
+                let $t1 := 0x2b464a26b2d3d179ea7c25de12665c6f95f5a635036da98598ae01785f5eca98
+                let $t2 := $MemoryLoadU256(add(e, 0))
+                let $t3 := packed_hashed__$bytes$_$vec$u8$$($t2)
+                let $t4 := $MemoryLoadU256(add(e, 32))
+                let $t5 := packed_hashed__$string$_$vec$u8$$($t4)
+                {
+                    let $t6 := mload(0)
+                    let $t7 := abi_encode_tuple__($t6)
+                    log3($t6, sub($t7, $t6), $t1,$t3,$t5)
+                    mstore(0, $t7)
+                }
+            }
+            function A2_Evm_emit$A2_M_Event_4$(e) {
+                let $t1 := 0x4e3a2adb61a9a9a7807dfd78dc9a15809d318764f94b823392c0bc010a29453a
+                let $t2 := $MemoryLoadU256(add(e, 0))
+                let $t3 := $MemoryLoadU256(add(e, 32))
+                let $t4 := $MemoryLoadU256(add(e, 64))
+                {
+                    let $t5 := mload(0)
+                    let $t6 := abi_encode_tuple__($t5)
+                    log4($t5, sub($t6, $t5), $t1,$t2,$t3,$t4)
+                    mstore(0, $t6)
+                }
+            }
+            function A2_Evm_emit$A2_M_Event_3$(e) {
+                let $t1 := 0x46d7aa1d21879f4f2a9e4aaf35176d0ed1665d7aa48ac5221d218547d905f238
+                let $t2 := $MemoryLoadU8(add(e, 64))
+                let $t3 := $MemoryLoadU256(add(e, 0))
+                let $t4 := $MemoryLoadU256(add(e, 32))
+                {
+                    let $t5 := mload(0)
+                    let $t6 := abi_encode_tuple_$address$_$address$($t5, $t3)
+                    log3($t5, sub($t6, $t5), $t1,$t2,$t4)
+                    mstore(0, $t6)
+                }
+            }
+            function A2_Evm_emit$A2_M_Event_2$(e) {
+                let $t1 := 0xdf4ad6039dcb9f423721e54cfde43c41a053fb271f037bdb96aef91dbe2ef532
+                let $t2 := $MemoryLoadU8(add(e, 72))
+                let $t3 := $MemoryLoadU256(add(e, 32))
+                let $t4 := $MemoryLoadU64(add(e, 64))
+                let $t5 := $MemoryLoadU256(add(e, 0))
+                {
+                    let $t6 := mload(0)
+                    let $t7 := abi_encode_tuple_$uint8_address_uint16_bytes$_$u8_address_u64_vec$u8$$($t6, $t2,$t3,$t4,$t5)
+                    log1($t6, sub($t7, $t6), $t1)
+                    mstore(0, $t7)
+                }
+            }
+            function A2_Evm_emit$A2_M_Event_1$(e) {
+                let $t1 := 0x46d7aa1d21879f4f2a9e4aaf35176d0ed1665d7aa48ac5221d218547d905f238
+                let $t2 := $MemoryLoadU8(add(e, 64))
+                let $t3 := $MemoryLoadU256(add(e, 0))
+                let $t4 := $MemoryLoadU256(add(e, 32))
+                {
+                    let $t5 := mload(0)
+                    let $t6 := abi_encode_tuple_$uint8_address_uint256$_$u8_address_A2_U256_U256$($t5, $t2,$t3,$t4)
+                    log1($t5, sub($t6, $t5), $t1)
+                    mstore(0, $t6)
+                }
+            }
+            function abi_encode_tuple_$uint8_address_uint256$_$u8_address_A2_U256_U256$(headStart ,value_0, value_1, value_2) -> tail {
+                tail := add(headStart, 96)
+                abi_encode_uint8(value_0, add(headStart, 0))
+                abi_encode_address(value_1, add(headStart, 32))
+                abi_encode_uint256(value_2, add(headStart, 64))
+            }
+            function abi_encode_uint256(value, pos) {
+                mstore(pos, cleanup_uint256(value))
+            }
+            function cleanup_uint256(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)
+            }
+            function abi_encode_address(value, pos) {
+                mstore(pos, cleanup_address(value))
+            }
+            function cleanup_address(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffffffffffffffffffffffffffff)
+            }
+            function abi_encode_uint8(value, pos) {
+                mstore(pos, cleanup_uint8(value))
+            }
+            function cleanup_uint8(value) -> cleaned {
+                cleaned := and(value, 0xff)
+            }
+            function abi_encode_tuple_$uint8_address_uint16_bytes$_$u8_address_u64_vec$u8$$(headStart ,value_0, value_1, value_2, value_3) -> tail {
+                tail := add(headStart, 128)
+                abi_encode_uint8(value_0, add(headStart, 0))
+                abi_encode_address(value_1, add(headStart, 32))
+                abi_encode_uint16(value_2, add(headStart, 64))
+                mstore(add(headStart, 96), sub(tail, headStart))
+                tail := abi_encode_bytes(value_3,  tail)
+            }
+            function abi_encode_bytes(value, pos) -> end{
+                let size := $MemoryLoadU64(value)
+                mstore(pos, size)
+                pos := add(pos, 0x20)
+                $CopyMemory(add(value, 0x20), pos, size)
+                size := $RoundUp(size)
+                end := add(pos, size)
+            }
+            function abi_encode_uint16(value, pos) {
+                mstore(pos, cleanup_uint16(value))
+            }
+            function cleanup_uint16(value) -> cleaned {
+                cleaned := and(value, 0xffff)
+            }
+            function abi_encode_tuple_$address$_$address$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_address(value_0, add(headStart, 0))
+            }
+            function abi_encode_tuple__(headStart ) -> tail {
+                tail := add(headStart, 0)
+            }
+            function packed_hashed__$string$_$vec$u8$$(value_0) -> hash {
+                let pos := mload(0)
+                let end := abi_encode_tuple_packed_$string$_$vec$u8$$_not_padded_inplace(pos ,value_0)
+                mstore(0, end)
+                hash := keccak256(pos, sub(end, pos))
+            }
+            function abi_encode_tuple_packed_$string$_$vec$u8$$_not_padded_inplace(pos ,value_0) -> end {
+                pos := abi_encode_string_not_padded_inplace(value_0,  pos)
+                end := pos
+            }
+            function abi_encode_string_not_padded_inplace(value, pos) -> end{
+                let size := $MemoryLoadU64(value)
+                $CopyMemory(add(value, 0x20), pos, size)
+                end := add(pos, size)
+            }
+            function packed_hashed__$bytes$_$vec$u8$$(value_0) -> hash {
+                let pos := mload(0)
+                let end := abi_encode_tuple_packed_$bytes$_$vec$u8$$_not_padded_inplace(pos ,value_0)
+                mstore(0, end)
+                hash := keccak256(pos, sub(end, pos))
+            }
+            function abi_encode_tuple_packed_$bytes$_$vec$u8$$_not_padded_inplace(pos ,value_0) -> end {
+                pos := abi_encode_bytes_not_padded_inplace(value_0,  pos)
+                end := pos
+            }
+            function abi_encode_bytes_not_padded_inplace(value, pos) -> end{
+                let size := $MemoryLoadU64(value)
+                $CopyMemory(add(value, 0x20), pos, size)
+                end := add(pos, size)
+            }
+            function abi_encode_tuple_$string$_$vec$u8$$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                mstore(add(headStart, 0), sub(tail, headStart))
+                tail := abi_encode_string(value_0,  tail)
+            }
+            function abi_encode_string(value, pos) -> end{
+                let size := $MemoryLoadU64(value)
+                mstore(pos, size)
+                pos := add(pos, 0x20)
+                $CopyMemory(add(value, 0x20), pos, size)
+                size := $RoundUp(size)
+                end := add(pos, size)
+            }
+            function packed_hashed__$uint16_3_$_$vec$u64$$(value_0) -> hash {
+                let pos := mload(0)
+                let end := abi_encode_tuple_packed_$uint16_3_$_$vec$u64$$_not_padded_inplace(pos ,value_0)
+                mstore(0, end)
+                hash := keccak256(pos, sub(end, pos))
+            }
+            function abi_encode_tuple_packed_$uint16_3_$_$vec$u64$$_not_padded_inplace(pos ,value_0) -> end {
+                abi_encode_uint16_3__vec$u64$_not_padded_inplace(value_0,  pos)
+                pos := add(pos, 96)
+                end := pos
+            }
+            function abi_encode_uint16_3__vec$u64$_not_padded_inplace(value, pos)  {
+                let length := $MemoryLoadU64(value)
+                if iszero(eq(length, 3)) { $Abort(92) }
+                let start := add(value, 32)
+                let srcEnd := add(start, mul(length, 8))
+                for { let src := start } lt(src, srcEnd) { src := add(src, 8) }
+                {
+                    let v := $MemoryLoadU64(src)
+                    pos := abi_encode_uint16_with_updated_pos(v, pos)
+                }
+            }
+            function abi_encode_uint16_with_updated_pos(value, pos) -> updated_pos{
+                abi_encode_uint16(value, pos)
+                updated_pos := add(pos, 32)
+            }
+            function packed_hashed__$bytes__$_$vec$vec$u8$$$(value_0) -> hash {
+                let pos := mload(0)
+                let end := abi_encode_tuple_packed_$bytes__$_$vec$vec$u8$$$_not_padded_inplace(pos ,value_0)
+                mstore(0, end)
+                hash := keccak256(pos, sub(end, pos))
+            }
+            function abi_encode_tuple_packed_$bytes__$_$vec$vec$u8$$$_not_padded_inplace(pos ,value_0) -> end {
+                pos := abi_encode_bytes___vec$vec$u8$$_not_padded_inplace(value_0,  pos)
+                end := pos
+            }
+            function abi_encode_bytes___vec$vec$u8$$_not_padded_inplace(value, pos) -> end {
+                let length := $MemoryLoadU64(value)
+                let start := add(value, 32)
+                let srcEnd := add(start, mul(length, 32))
+                for { let src := start } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let v := $MemoryLoadU256(src)
+                    pos := abi_encode_bytes_inplace_with_updated_pos(v, pos)
+                }
+                end := pos
+            }
+            function abi_encode_bytes_inplace_with_updated_pos(value, pos) -> updated_pos{
+                updated_pos := abi_encode_bytes_inplace(value, pos)
+            }
+            function abi_encode_bytes_inplace(value, pos) -> end{
+                let size := $MemoryLoadU64(value)
+                $CopyMemory(add(value, 0x20), pos, size)
+                size := $RoundUp(size)
+                end := add(pos, size)
+            }
+            function abi_encode_tuple_$bytes__$_$vec$vec$u8$$$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                mstore(add(headStart, 0), sub(tail, headStart))
+                tail := abi_encode_bytes___vec$vec$u8$$(value_0,  tail)
+            }
+            function abi_encode_bytes___vec$vec$u8$$(value, pos) -> end {
+                let length := $MemoryLoadU64(value)
+                mstore(pos, length)
+                pos := add(pos, 0x20)
+                let headStart := pos
+                let tail := add(pos, mul(length, 0x20))
+                let start := add(value, 32)
+                let srcEnd := add(start, mul(length, 32))
+                for { let src := start } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    mstore(pos, sub(tail, headStart))
+                    let v := $MemoryLoadU256(src)
+                    tail := abi_encode_bytes_with_updated_pos(v, tail)
+                    pos := add(pos, 0x20)
+                }
+                pos := tail
+                end := pos
+            }
+            function abi_encode_bytes_with_updated_pos(value, pos) -> updated_pos{
+                updated_pos := abi_encode_bytes(value, pos)
+            }
+            function packed_hashed__$string_3_$_$vec$vec$u8$$$(value_0) -> hash {
+                let pos := mload(0)
+                let end := abi_encode_tuple_packed_$string_3_$_$vec$vec$u8$$$_not_padded_inplace(pos ,value_0)
+                mstore(0, end)
+                hash := keccak256(pos, sub(end, pos))
+            }
+            function abi_encode_tuple_packed_$string_3_$_$vec$vec$u8$$$_not_padded_inplace(pos ,value_0) -> end {
+                pos := abi_encode_string_3__vec$vec$u8$$_not_padded_inplace(value_0,  pos)
+                end := pos
+            }
+            function abi_encode_string_3__vec$vec$u8$$_not_padded_inplace(value, pos) -> end {
+                let length := $MemoryLoadU64(value)
+                if iszero(eq(length, 3)) { $Abort(92) }
+                let start := add(value, 32)
+                let srcEnd := add(start, mul(length, 32))
+                for { let src := start } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let v := $MemoryLoadU256(src)
+                    pos := abi_encode_string_inplace_with_updated_pos(v, pos)
+                }
+                end := pos
+            }
+            function abi_encode_string_inplace_with_updated_pos(value, pos) -> updated_pos{
+                updated_pos := abi_encode_string_inplace(value, pos)
+            }
+            function abi_encode_string_inplace(value, pos) -> end{
+                let size := $MemoryLoadU64(value)
+                $CopyMemory(add(value, 0x20), pos, size)
+                size := $RoundUp(size)
+                end := add(pos, size)
+            }
+            function abi_encode_tuple_$address_address_uint256$_$address_address_A2_U256_U256$(headStart ,value_0, value_1, value_2) -> tail {
+                tail := add(headStart, 96)
+                abi_encode_address(value_0, add(headStart, 0))
+                abi_encode_address(value_1, add(headStart, 32))
+                abi_encode_uint256(value_2, add(headStart, 64))
+            }
+            function abi_decode_tuple_$address_address_uint256$_$address_address_A2_U256_U256$(headStart, dataEnd) -> value_0, value_1, value_2 {
+                if slt(sub(dataEnd, headStart), 96) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 64
+                    value_2 := abi_decode_uint256(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint256(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint256(value)
+            }
+            function validator_uint256(value) {
+                if iszero(eq(value, cleanup_uint256(value))) { $Abort(95) }
+            }
+            function abi_decode_address(offset, end) -> value {
+                value := calldataload(offset)
+                validator_address(value)
+            }
+            function validator_address(value) {
+                if iszero(eq(value, cleanup_address(value))) { $Abort(95) }
+            }
+            function abi_decode_tuple_$bytes___string_3_$_$vec$vec$u8$$_vec$vec$u8$$$(headStart, dataEnd) -> value_0, value_1 {
+                if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_bytes___vec$vec$u8$$(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := calldataload(add(headStart, 32))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_1 := abi_decode_string_3__vec$vec$u8$$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_string_3__vec$vec$u8$$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 3
+                let size := 128
+                array := abi_decode_available_length__string_3__vec$vec$u8$$(offset, length, size, end)
+            }
+            function abi_decode_available_length__string_3__vec$vec$u8$$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let innerOffset := calldataload(src)
+                    if gt(innerOffset, 0xffffffffffffffff) { $Abort(94) }
+                    let elementPos := add(offset, innerOffset)
+                    let value := abi_decode_string_vec$u8$(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode_string_vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(1, length), 32)
+                array := abi_decode_available_length__string(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__string(src, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                if gt(add(src, sub(size, 32)), end) { $Abort(93) }
+                $CopyFromCallDataToMemory(src, dst, length)
+            }
+            function abi_decode_bytes___vec$vec$u8$$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(32, length), 32)
+                array := abi_decode_available_length__bytes___vec$vec$u8$$(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__bytes___vec$vec$u8$$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let innerOffset := calldataload(src)
+                    if gt(innerOffset, 0xffffffffffffffff) { $Abort(94) }
+                    let elementPos := add(offset, innerOffset)
+                    let value := abi_decode_bytes_vec$u8$(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode_bytes_vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(1, length), 32)
+                array := abi_decode_available_length__bytes(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__bytes(src, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                if gt(add(src, sub(size, 32)), end) { $Abort(93) }
+                $CopyFromCallDataToMemory(src, dst, length)
+            }
+            function abi_decode_tuple_$bytes__$_$vec$vec$u8$$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_bytes___vec$vec$u8$$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_tuple_$bytes_string_uint16_3_$_$vec$u8$_vec$u8$_vec$u64$$(headStart, dataEnd) -> value_0, value_1, value_2 {
+                if slt(sub(dataEnd, headStart), 160) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_bytes_vec$u8$(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := calldataload(add(headStart, 32))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_1 := abi_decode_string_vec$u8$(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 64
+                    value_2 := abi_decode_uint16_3__vec$u64$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint16_3__vec$u64$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 3
+                let size := 56
+                array := abi_decode_available_length__uint16_3__vec$u64$(offset, length, size, end)
+            }
+            function abi_decode_available_length__uint16_3__vec$u64$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint16(elementPos, end)
+                    $MemoryStoreU64(dst, value)
+                    dst := add(dst, 8)
+                }
+            }
+            function abi_decode_uint16(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint16(value)
+            }
+            function validator_uint16(value) {
+                if iszero(eq(value, cleanup_uint16(value))) { $Abort(95) }
+            }
+            function abi_decode_tuple_$bytes_string$_$vec$u8$_vec$u8$$(headStart, dataEnd) -> value_0, value_1 {
+                if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_bytes_vec$u8$(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := calldataload(add(headStart, 32))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_1 := abi_decode_string_vec$u8$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_tuple_$bytes1_bytes2_bytes32$_$vec$u8$_vec$u8$_vec$u8$$(headStart, dataEnd) -> value_0, value_1, value_2 {
+                if slt(sub(dataEnd, headStart), 96) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_bytes1_vec$u8$(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_bytes2_vec$u8$(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 64
+                    value_2 := abi_decode_bytes32_vec$u8$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_bytes32_vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 32
+                let size := 64
+                array := abi_decode_available_length__bytes32(offset, length, size, end)
+            }
+            function abi_decode_available_length__bytes32(src, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                if gt(add(src, sub(size, 32)), end) { $Abort(93) }
+                $CopyFromCallDataToMemory(src, dst, length)
+            }
+            function abi_decode_bytes2_vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 2
+                let size := 34
+                array := abi_decode_available_length__bytes2(offset, length, size, end)
+            }
+            function abi_decode_available_length__bytes2(src, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                if gt(add(src, sub(size, 32)), end) { $Abort(93) }
+                $CopyFromCallDataToMemory(src, dst, length)
+            }
+            function abi_decode_bytes1_vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 1
+                let size := 33
+                array := abi_decode_available_length__bytes1(offset, length, size, end)
+            }
+            function abi_decode_available_length__bytes1(src, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                if gt(add(src, sub(size, 32)), end) { $Abort(93) }
+                $CopyFromCallDataToMemory(src, dst, length)
+            }
+            function abi_decode_tuple_$uint8_address_uint256$_$u8_address_A2_U256_U256$(headStart, dataEnd) -> value_0, value_1, value_2 {
+                if slt(sub(dataEnd, headStart), 96) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_uint8(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 64
+                    value_2 := abi_decode_uint256(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint8(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint8(value)
+            }
+            function validator_uint8(value) {
+                if iszero(eq(value, cleanup_uint8(value))) { $Abort(95) }
+            }
+            function abi_decode_tuple_$uint8_address_uint16_bytes$_$u8_address_u64_vec$u8$$(headStart, dataEnd) -> value_0, value_1, value_2, value_3 {
+                if slt(sub(dataEnd, headStart), 128) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_uint8(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 64
+                    value_2 := abi_decode_uint16(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := calldataload(add(headStart, 96))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_3 := abi_decode_bytes_vec$u8$(add(headStart, offset), dataEnd)
+                }
+            }
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $AbortBuiltin() {
+                $Abort(sub(0, 1))
+            }
+            function $Malloc(size) -> offs {
+                offs := mload(0)
+                // pad to word size
+                mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+            }
+            function $MaskForSize(size) -> mask {
+              mask := sub(shl(shl(3, size), 1), 1)
+            }
+            function $ToWordOffs(offs) -> word_offs, byte_offset {
+              word_offs := shr(5, offs)
+              byte_offset := and(offs, 0x1F)
+            }
+            function $MemoryLoadBytes(offs, size) -> val {
+              // Lower bit where the value in the higher bytes ends
+              let bit_end := shl(3, sub(32, size))
+              val := shr(bit_end, mload(offs))
+            }
+            function $MemoryStoreBytes(offs, size, val) {
+              let bit_end := shl(3, sub(32, size))
+              let mask := shl(bit_end, $MaskForSize(size))
+              mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+            }
+            function $MemoryLoadU8(offs) -> val {
+              val := $MemoryLoadBytes(offs, 1)
+            }
+            function $MemoryStoreU8(offs, val) {
+              // Shortcut via special instruction
+              mstore8(offs, val)
+            }
+            function $MemoryLoadU64(offs) -> val {
+              val := $MemoryLoadBytes(offs, 8)
+            }
+            function $MemoryStoreU64(offs, val) {
+              $MemoryStoreBytes(offs, 8, val)
+            }
+            function $MemoryLoadU256(offs) -> val {
+              val := $MemoryLoadBytes(offs, 32)
+            }
+            function $MemoryStoreU256(offs, val) {
+              $MemoryStoreBytes(offs, 32, val)
+            }
+            function $CopyMemory(src, dst, size) {
+              let num_words, overflow_bytes := $ToWordOffs(size)
+              let i := 0
+              for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+                mstore(add(dst, i), mload(add(src, i)))
+              }
+              if overflow_bytes {
+                let mask := $MaskForSize(sub(32, overflow_bytes))
+                let overflow_offs := mul(num_words, 32)
+                let dst_word := and(mload(add(dst, overflow_offs)), mask)
+                let src_word := and(mload(add(src, overflow_offs)), not(mask))
+                mstore(add(dst, overflow_offs), or(dst_word, src_word))
+              }
+            }
+            function $CheckMemorySize(len) -> checked_len {
+                if gt(len, 0xffffffffffffffff) { $AbortBuiltin() }
+                checked_len := len
+            }
+            function $CopyFromCallDataToMemory(src, dst, length) {
+                calldatacopy(dst, src, length)
+                mstore(add(dst, length), 0)
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+            function $ClosestGreaterPowerOfTwo(x) -> r {
+                r := or(r, shr(1, x))
+                r := or(r, shr(2, r))
+                r := or(r, shr(4, r))
+                r := or(r, shr(8, r))
+                r := or(r, shr(16, r))
+                r := or(r, shr(32, r))
+                r := add(x, 1)
+            }
+            function $RoundUp(value) -> result {
+                result := and(add(value, 31), not(31))
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
diff --git a/third_party/move/evm/move-to-yul/tests/test-events/compilation_failure/EventSigCompatibilityFailure.v2_exp b/third_party/move/evm/move-to-yul/tests/test-events/compilation_failure/EventSigCompatibilityFailure.v2_exp
new file mode 100644
index 0000000000000..c4d915b103713
--- /dev/null
+++ b/third_party/move/evm/move-to-yul/tests/test-events/compilation_failure/EventSigCompatibilityFailure.v2_exp
@@ -0,0 +1,32 @@
+
+
+!! Move-To-Yul Diagnostics:
+ error: event signature is not compatible with the move struct
+   ┌─ tests/test-events/compilation_failure/EventSigCompatibilityFailure.move:6:5
+   │
+ 6 │ ╭     struct Transfer_Err_1 {
+ 7 │ │         from: address,
+ 8 │ │         to: address,
+ 9 │ │         value: U256,
+10 │ │     }
+   │ ╰─────^
+
+error: event signature is not compatible with the move struct
+   ┌─ tests/test-events/compilation_failure/EventSigCompatibilityFailure.move:13:5
+   │
+13 │ ╭     struct Transfer_Err_2 {
+14 │ │         from: address,
+15 │ │         to: address,
+16 │ │         value: U256,
+17 │ │     }
+   │ ╰─────^
+
+error: event signature is not compatible with the move struct
+   ┌─ tests/test-events/compilation_failure/EventSigCompatibilityFailure.move:20:5
+   │
+20 │ ╭     struct Transfer_Err_3 {
+21 │ │         from: address,
+22 │ │         to: address,
+23 │ │         value: U256,
+24 │ │     }
+   │ ╰─────^
diff --git a/third_party/move/evm/move-to-yul/tests/test-events/compilation_failure/EventTooManyTopics.v2_exp b/third_party/move/evm/move-to-yul/tests/test-events/compilation_failure/EventTooManyTopics.v2_exp
new file mode 100644
index 0000000000000..fa4e6569968cd
--- /dev/null
+++ b/third_party/move/evm/move-to-yul/tests/test-events/compilation_failure/EventTooManyTopics.v2_exp
@@ -0,0 +1,13 @@
+
+
+!! Move-To-Yul Diagnostics:
+ error: too many indexed arguments
+   ┌─ tests/test-events/compilation_failure/EventTooManyTopics.move:5:5
+   │
+ 5 │ ╭     struct Transfer_Err_1 {
+ 6 │ │         from: address,
+ 7 │ │         to: address,
+ 8 │ │         v1: u128,
+ 9 │ │         v2: u128
+10 │ │     }
+   │ ╰─────^
diff --git a/third_party/move/evm/move-to-yul/tests/test-events/compilation_failure/ParsingEventSigFailure.v2_exp b/third_party/move/evm/move-to-yul/tests/test-events/compilation_failure/ParsingEventSigFailure.v2_exp
new file mode 100644
index 0000000000000..a37a89267e708
--- /dev/null
+++ b/third_party/move/evm/move-to-yul/tests/test-events/compilation_failure/ParsingEventSigFailure.v2_exp
@@ -0,0 +1,32 @@
+
+
+!! Move-To-Yul Diagnostics:
+ error: error happens when parsing the signature
+   ┌─ tests/test-events/compilation_failure/ParsingEventSigFailure.move:6:5
+   │
+ 6 │ ╭     struct Transfer_Err {
+ 7 │ │         from: address,
+ 8 │ │         to: address,
+ 9 │ │         value: U256,
+10 │ │     }
+   │ ╰─────^
+
+error: error happens when parsing the signature
+   ┌─ tests/test-events/compilation_failure/ParsingEventSigFailure.move:13:5
+   │
+13 │ ╭     struct Approval_Err_1 {
+14 │ │         owner: address,
+15 │ │         spender: address,
+16 │ │         value: U256,
+17 │ │     }
+   │ ╰─────^
+
+error: error happens when parsing the signature
+   ┌─ tests/test-events/compilation_failure/ParsingEventSigFailure.move:20:5
+   │
+20 │ ╭     struct Approval_Err_2 {
+21 │ │         owner: address,
+22 │ │         spender: address,
+23 │ │         value: U256,
+24 │ │     }
+   │ ╰─────^
diff --git a/third_party/move/evm/move-to-yul/tests/test-events/compilation_failure/ParsingEventSigFailureGeneric.v2_exp b/third_party/move/evm/move-to-yul/tests/test-events/compilation_failure/ParsingEventSigFailureGeneric.v2_exp
new file mode 100644
index 0000000000000..2dabfdcd98584
--- /dev/null
+++ b/third_party/move/evm/move-to-yul/tests/test-events/compilation_failure/ParsingEventSigFailureGeneric.v2_exp
@@ -0,0 +1,11 @@
+
+
+!! Move-To-Yul Diagnostics:
+ error: #[event] structs cannot be generic
+   ┌─ tests/test-events/compilation_failure/ParsingEventSigFailureGeneric.move:21:5
+   │
+21 │ ╭     struct Bar<T1, T2>{
+22 │ │         x: T1,
+23 │ │         y: vector<T2>,
+24 │ │     }
+   │ ╰─────^
diff --git a/third_party/move/evm/move-to-yul/tests/testsuite.rs b/third_party/move/evm/move-to-yul/tests/testsuite.rs
index 53c267da728f6..125794b6f4936 100644
--- a/third_party/move/evm/move-to-yul/tests/testsuite.rs
+++ b/third_party/move/evm/move-to-yul/tests/testsuite.rs
@@ -6,7 +6,7 @@ use anyhow::Context;
 use codespan_reporting::{diagnostic::Severity, term::termcolor::Buffer};
 use evm::backend::MemoryVicinity;
 use evm_exec_utils::{compile, exec::Executor, tracing};
-use move_command_line_common::testing::EXP_EXT;
+use move_command_line_common::testing::get_compiler_exp_extension;
 use move_compiler::{
     attr_derivation,
     shared::{NumericalAddress, PackagePaths},
@@ -75,10 +75,10 @@ fn test_runner(path: &Path) -> datatest_stable::Result<()> {
             ..Options::default()
         };
         let ext = if exp.is_empty() {
-            EXP_EXT.to_string()
+            get_compiler_exp_extension().to_string()
         } else {
             options.experiments.push(exp.clone());
-            format!("{}.{}", EXP_EXT, exp)
+            format!("{}.{}", get_compiler_exp_extension(), exp)
         };
         let mut contracts = Generator::run(&options, &env);
         let mut out = "".to_string();
diff --git a/third_party/move/extensions/async/move-async-vm/src/async_vm.rs b/third_party/move/extensions/async/move-async-vm/src/async_vm.rs
index 57a87509c91c7..f1225bc1a9d44 100644
--- a/third_party/move/extensions/async/move-async-vm/src/async_vm.rs
+++ b/third_party/move/extensions/async/move-async-vm/src/async_vm.rs
@@ -14,7 +14,6 @@ use move_core_types::{
     effects::{ChangeSet, Op},
     identifier::Identifier,
     language_storage::{ModuleId, StructTag, TypeTag},
-    resolver::MoveResolver,
     vm_status::StatusCode,
 };
 use move_vm_runtime::{
@@ -25,7 +24,10 @@ use move_vm_runtime::{
     session::{SerializedReturnValues, Session},
 };
 use move_vm_test_utils::gas_schedule::{Gas, GasStatus};
-use move_vm_types::values::{Reference, Value};
+use move_vm_types::{
+    resolver::MoveResolver,
+    values::{Reference, Value},
+};
 use std::{
     collections::HashMap,
     error::Error,
@@ -68,10 +70,10 @@ impl AsyncVM {
             .collect();
         Ok(AsyncVM {
             move_vm: MoveVM::new(
-                natives.into_iter().chain(
-                    natives::actor_natives(async_lib_addr, actor_gas_parameters).into_iter(),
-                ),
-            )?,
+                natives
+                    .into_iter()
+                    .chain(natives::actor_natives(async_lib_addr, actor_gas_parameters)),
+            ),
             actor_metadata,
             message_table,
         })
@@ -82,7 +84,7 @@ impl AsyncVM {
         &'l self,
         for_actor: AccountAddress,
         virtual_time: u128,
-        move_resolver: &'r mut impl MoveResolver<PartialVMError>,
+        move_resolver: &'r impl MoveResolver,
     ) -> AsyncSession<'r, 'l> {
         self.new_session_with_extensions(
             for_actor,
@@ -97,7 +99,7 @@ impl AsyncVM {
         &'l self,
         for_actor: AccountAddress,
         virtual_time: u128,
-        move_resolver: &'r mut impl MoveResolver<PartialVMError>,
+        move_resolver: &'r impl MoveResolver,
         ext: NativeContextExtensions<'r>,
     ) -> AsyncSession<'r, 'l> {
         let extensions = make_extensions(ext, for_actor, virtual_time, true);
diff --git a/third_party/move/extensions/async/move-async-vm/tests/sources/AccountStateMachine.v2_exp b/third_party/move/extensions/async/move-async-vm/tests/sources/AccountStateMachine.v2_exp
new file mode 100644
index 0000000000000..5eb135b86d2c3
--- /dev/null
+++ b/third_party/move/extensions/async/move-async-vm/tests/sources/AccountStateMachine.v2_exp
@@ -0,0 +1,55 @@
+publishing Actor
+publishing Runtime
+publishing bcs
+publishing vector
+publishing AccountStateMachine
+actor 0x4 created from 0x3::AccountStateMachine
+  SUCCESS
+  commit 0x3::AccountStateMachine::AccountStateMachine[0x4] := New("b\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\"")
+actor 0x5 created from 0x3::AccountStateMachine
+  SUCCESS
+  commit 0x3::AccountStateMachine::AccountStateMachine[0x5] := New("b\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\"")
+actor 0x4 handling 0x3::AccountStateMachine::start (hash=0xD6E3904B884A26E2)
+  SUCCESS
+  sent 0x4 <- 0xC4FB1F887A3B60A6 argc=1
+  sent 0x5 <- 0xC4FB1F887A3B60A6 argc=1
+  sent 0x4 <- 0x477572D21970BF04 argc=2
+  sent 0x4 <- 0xFC3DE2B500D5B460 argc=0
+  sent 0x5 <- 0xFC3DE2B500D5B460 argc=0
+actor 0x5 handling 0x3::AccountStateMachine::start (hash=0xD6E3904B884A26E2)
+  SUCCESS
+actor 0x4 handling 0x3::AccountStateMachine::deposit (hash=0xC4FB1F887A3B60A6)
+  SUCCESS
+  commit 0x3::AccountStateMachine::AccountStateMachine[0x4] := Modify("b\"d\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\"")
+actor 0x5 handling 0x3::AccountStateMachine::deposit (hash=0xC4FB1F887A3B60A6)
+  SUCCESS
+  commit 0x3::AccountStateMachine::AccountStateMachine[0x5] := Modify("b\"d\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\"")
+actor 0x4 handling 0x3::AccountStateMachine::xfer (hash=0x477572D21970BF04)
+  SUCCESS
+  sent 0x5 <- 0x8EEEA8A2C8DCFA6D argc=3
+  commit 0x3::AccountStateMachine::AccountStateMachine[0x4] := Modify("b\"d\\0\\0\\0\\0\\0\\0\\0\\x01\\0\\0\\0\\0\\0\\0\\0\\x01\\0\\0\\0\\0\\0\\0\\0\\0\\x14\\0\\0\\0\\0\\0\\0\\0\\xa0ib\\x02\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\"")
+actor 0x4 handling 0x3::AccountStateMachine::cleanup (hash=0xFC3DE2B500D5B460)
+  SUCCESS
+  commit 0x3::AccountStateMachine::AccountStateMachine[0x4] := Modify("b\"d\\0\\0\\0\\0\\0\\0\\0\\x01\\0\\0\\0\\0\\0\\0\\0\\x01\\0\\0\\0\\0\\0\\0\\0\\0\\x14\\0\\0\\0\\0\\0\\0\\0\\xa0ib\\x02\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\"")
+actor 0x5 handling 0x3::AccountStateMachine::cleanup (hash=0xFC3DE2B500D5B460)
+  SUCCESS
+  commit 0x3::AccountStateMachine::AccountStateMachine[0x5] := Modify("b\"d\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\"")
+actor 0x5 handling 0x3::AccountStateMachine::xfer_deposit (hash=0x8EEEA8A2C8DCFA6D)
+  SUCCESS
+  sent 0x4 <- 0x9D2FDA886DFF001 argc=1
+  commit 0x3::AccountStateMachine::AccountStateMachine[0x5] := Modify("b\"x\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\"")
+actor 0x4 handling 0x3::AccountStateMachine::xfer_finish (hash=0x9D2FDA886DFF001)
+  SUCCESS
+  sent 0x4 <- 0xDAF369BA2554ECF1 argc=0
+  commit 0x3::AccountStateMachine::AccountStateMachine[0x4] := Modify("b\"P\\0\\0\\0\\0\\0\\0\\0\\x01\\0\\0\\0\\0\\0\\0\\0\\0\"")
+actor 0x4 handling 0x3::AccountStateMachine::end (hash=0xDAF369BA2554ECF1)
+  SUCCESS
+  sent 0x4 <- 0x2BAA2A2D643B5C3B argc=1
+  sent 0x5 <- 0x2BAA2A2D643B5C3B argc=1
+  sent 0x5 <- 0x2BAA2A2D643B5C3B argc=1
+actor 0x4 handling 0x3::AccountStateMachine::verify (hash=0x2BAA2A2D643B5C3B)
+  SUCCESS
+actor 0x5 handling 0x3::AccountStateMachine::verify (hash=0x2BAA2A2D643B5C3B)
+  SUCCESS
+actor 0x5 handling 0x3::AccountStateMachine::verify (hash=0x2BAA2A2D643B5C3B)
+  FAIL  VMError with status ABORTED with sub status 2 at location Module ModuleId { address: 0000000000000000000000000000000000000000000000000000000000000003, name: Identifier("AccountStateMachine") } and message 0x0000000000000000000000000000000000000000000000000000000000000003::AccountStateMachine::verify at offset 8 at code offset 8 in function definition 16
diff --git a/third_party/move/extensions/async/move-async-vm/tests/sources/Basic.v2_exp b/third_party/move/extensions/async/move-async-vm/tests/sources/Basic.v2_exp
new file mode 100644
index 0000000000000..05e05c30ccf02
--- /dev/null
+++ b/third_party/move/extensions/async/move-async-vm/tests/sources/Basic.v2_exp
@@ -0,0 +1,32 @@
+publishing Runtime
+publishing bcs
+publishing Basic
+actor 0x4 created from 0x3::Basic
+  SUCCESS
+  commit 0x3::Basic::Basic[0x4] := New("b\"\\0\\0\\0\\0\\0\\0\\0\\0\"")
+actor 0x4 handling 0x3::Basic::start (hash=0xD4CC9A1B01199BB9)
+  SUCCESS
+  sent 0x4 <- 0xEBAC30B69450533F argc=1
+actor 0x4 handling 0x3::Basic::count_down (hash=0xEBAC30B69450533F)
+  SUCCESS
+  sent 0x4 <- 0xEBAC30B69450533F argc=1
+  commit 0x3::Basic::Basic[0x4] := Modify("b\"\\x01\\0\\0\\0\\0\\0\\0\\0\"")
+actor 0x4 handling 0x3::Basic::count_down (hash=0xEBAC30B69450533F)
+  SUCCESS
+  sent 0x4 <- 0xEBAC30B69450533F argc=1
+  commit 0x3::Basic::Basic[0x4] := Modify("b\"\\x02\\0\\0\\0\\0\\0\\0\\0\"")
+actor 0x4 handling 0x3::Basic::count_down (hash=0xEBAC30B69450533F)
+  SUCCESS
+  sent 0x4 <- 0xEBAC30B69450533F argc=1
+  commit 0x3::Basic::Basic[0x4] := Modify("b\"\\x03\\0\\0\\0\\0\\0\\0\\0\"")
+actor 0x4 handling 0x3::Basic::count_down (hash=0xEBAC30B69450533F)
+  SUCCESS
+  sent 0x4 <- 0xEBAC30B69450533F argc=1
+  commit 0x3::Basic::Basic[0x4] := Modify("b\"\\x04\\0\\0\\0\\0\\0\\0\\0\"")
+actor 0x4 handling 0x3::Basic::count_down (hash=0xEBAC30B69450533F)
+  SUCCESS
+  sent 0x4 <- 0xEBAC30B69450533F argc=1
+  commit 0x3::Basic::Basic[0x4] := Modify("b\"\\x05\\0\\0\\0\\0\\0\\0\\0\"")
+actor 0x4 handling 0x3::Basic::count_down (hash=0xEBAC30B69450533F)
+  SUCCESS
+  commit 0x3::Basic::Basic[0x4] := Modify("b\"\\x05\\0\\0\\0\\0\\0\\0\\0\"")
diff --git a/third_party/move/extensions/async/move-async-vm/tests/testsuite.rs b/third_party/move/extensions/async/move-async-vm/tests/testsuite.rs
index 235de9fac53a9..d6031021a2f02 100644
--- a/third_party/move/extensions/async/move-async-vm/tests/testsuite.rs
+++ b/third_party/move/extensions/async/move-async-vm/tests/testsuite.rs
@@ -10,8 +10,8 @@ use move_async_vm::{
     async_vm::{AsyncResult, AsyncSession, AsyncVM, Message},
     natives::GasParameters as ActorGasParameters,
 };
-use move_binary_format::{access::ModuleAccess, errors::PartialVMError};
-use move_command_line_common::testing::EXP_EXT;
+use move_binary_format::{access::ModuleAccess, errors::PartialVMResult};
+use move_command_line_common::testing::get_compiler_exp_extension;
 use move_compiler::{
     attr_derivation, compiled_unit::CompiledUnit, diagnostics::report_diagnostics_to_buffer,
     shared::NumericalAddress, Compiler, Flags,
@@ -23,11 +23,11 @@ use move_core_types::{
     identifier::{IdentStr, Identifier},
     language_storage::{ModuleId, StructTag},
     metadata::Metadata,
-    resolver::{resource_size, ModuleResolver, ResourceResolver},
     value::MoveTypeLayout,
 };
 use move_prover_test_utils::{baseline_test::verify_or_update_baseline, extract_test_directives};
 use move_vm_test_utils::gas_schedule::GasStatus;
+use move_vm_types::resolver::{resource_size, ModuleResolver, ResourceResolver};
 use std::{
     cell::RefCell,
     collections::{BTreeMap, BTreeSet, VecDeque},
@@ -72,7 +72,7 @@ fn test_runner(path: &Path) -> datatest_stable::Result<()> {
         instances,
     )?;
     harness.run(&target_module)?;
-    let baseline_path = path.with_extension(EXP_EXT);
+    let baseline_path = path.with_extension(get_compiler_exp_extension());
     verify_or_update_baseline(baseline_path.as_path(), harness.baseline.borrow().as_str())?;
     Ok(())
 }
@@ -87,8 +87,8 @@ impl Harness {
         let mut gas = GasStatus::new_unmetered();
         let mut tick = 0;
         // Publish modules.
-        let mut proxy = HarnessProxy { harness: self };
-        let mut session = self.vm.new_session(test_account(), 0, &mut proxy);
+        let proxy = HarnessProxy { harness: self };
+        let mut session = self.vm.new_session(test_account(), 0, &proxy);
         let mut done = BTreeSet::new();
         for id in self.module_cache.keys() {
             self.publish_module(&mut session, id, &mut gas, &mut done)?;
@@ -102,8 +102,8 @@ impl Harness {
                 actor.short_str_lossless()
             ));
             {
-                let mut proxy = HarnessProxy { harness: self };
-                let session = self.vm.new_session(addr, 0, &mut proxy);
+                let proxy = HarnessProxy { harness: self };
+                let session = self.vm.new_session(addr, 0, &proxy);
                 let result = session.new_actor(&actor, addr, &mut gas);
                 self.handle_result(&mut mailbox, result);
             };
@@ -133,8 +133,8 @@ impl Harness {
                 ))
             }
             // Handling
-            let mut proxy = HarnessProxy { harness: self };
-            let session = self.vm.new_session(actor, tick, &mut proxy);
+            let proxy = HarnessProxy { harness: self };
+            let session = self.vm.new_session(actor, tick, &proxy);
             tick += 1000_1000; // micros
             let result = session.handle_message(actor, message_hash, args, &mut gas);
             self.handle_result(&mut mailbox, result);
@@ -382,13 +382,11 @@ struct HarnessProxy<'a> {
 }
 
 impl<'a> ModuleResolver for HarnessProxy<'a> {
-    type Error = PartialVMError;
-
     fn get_module_metadata(&self, _module_id: &ModuleId) -> Vec<Metadata> {
         vec![]
     }
 
-    fn get_module(&self, id: &ModuleId) -> Result<Option<Bytes>, Self::Error> {
+    fn get_module(&self, id: &ModuleId) -> PartialVMResult<Option<Bytes>> {
         Ok(self
             .harness
             .module_cache
@@ -398,15 +396,13 @@ impl<'a> ModuleResolver for HarnessProxy<'a> {
 }
 
 impl<'a> ResourceResolver for HarnessProxy<'a> {
-    type Error = PartialVMError;
-
     fn get_resource_bytes_with_metadata_and_layout(
         &self,
         address: &AccountAddress,
         typ: &StructTag,
         _metadata: &[Metadata],
         _maybe_layout: Option<&MoveTypeLayout>,
-    ) -> Result<(Option<Bytes>, usize), Self::Error> {
+    ) -> PartialVMResult<(Option<Bytes>, usize)> {
         let res = self
             .harness
             .resource_store
diff --git a/third_party/move/move-binary-format/Cargo.toml b/third_party/move/move-binary-format/Cargo.toml
index 3d238656d40d5..eac71298e6626 100644
--- a/third_party/move/move-binary-format/Cargo.toml
+++ b/third_party/move/move-binary-format/Cargo.toml
@@ -14,6 +14,7 @@ anyhow = { workspace = true }
 arbitrary = { workspace = true, optional = true, features = ["derive"] }
 backtrace = { workspace = true }
 indexmap = { workspace = true }
+move-bytecode-spec = { workspace = true }
 move-core-types = { path = "../move-core/types" }
 proptest = { workspace = true, optional = true }
 proptest-derive = { workspace = true, optional = true }
diff --git a/third_party/move/move-binary-format/serializer-tests/tests/serializer_tests.proptest-regressions b/third_party/move/move-binary-format/serializer-tests/tests/serializer_tests.proptest-regressions
index 988ff09ce66d8..c6765cae79845 100644
--- a/third_party/move/move-binary-format/serializer-tests/tests/serializer_tests.proptest-regressions
+++ b/third_party/move/move-binary-format/serializer-tests/tests/serializer_tests.proptest-regressions
@@ -7,3 +7,4 @@
 cc 3d00be1cbcb9f344e7bce080015d7a755f6e69acd37dbde62e449732af226fe4 # shrinks to module = CompiledModule: { module_handles: [ 	ModuleHandle { address: AddressPoolIndex(0), name: IdentifierIndex(0) },] struct_handles: [ 	StructHandle { module: ModuleHandleIndex(0), name: IdentifierIndex(0), is_resource: false }, 	StructHandle { module: ModuleHandleIndex(0), name: IdentifierIndex(0), is_resource: false },] function_handles: [ 	FunctionHandle { module: ModuleHandleIndex(0), name: IdentifierIndex(0), signature: FunctionSignatureIndex(0) }, 	FunctionHandle { module: ModuleHandleIndex(0), name: IdentifierIndex(0), signature: FunctionSignatureIndex(1) },] struct_defs: [ 	StructDefinition { struct_handle: 1, field_count: 0, fields: 0 },] field_defs: [] function_defs: [ 	FunctionDefinition { function: 1, flags: 0x0, 		code: CodeUnit { 			max_stack_size: 0, 			locals: 0 			code: [] } },] type_signatures: [ 	TypeSignature(Unit), 	TypeSignature(Unit),] function_signatures: [ 	FunctionSignature { return_type: Unit, arg_types: [] }, 	FunctionSignature { return_type: Unit, arg_types: [] },] locals_signatures: [ 	LocalsSignature([]),] string_pool: [ 	"",] address_pool: [ 	Address([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]),] }
 cc 7b1bb969b87bfcdbb0f635eb46212f8437d21bcd1ba754de84d66bb552e6aec2 # shrinks to module = CompiledModule { module_handles: [], struct_handles: [], function_handles: [], type_signatures: [], function_signatures: [], locals_signatures: [], string_pool: [], byte_array_pool: [], address_pool: [0000000000000000000000000000000000000000000000000000000000000000, 0000000000000000000000000000000000000000000000000000000000000000], struct_defs: [], field_defs: [], function_defs: [] }
 cc 4118fc247fb7d48382876de931d47a8999a6e42658bbecc93afff9245ade141b # shrinks to module = CompiledModule { module_handles: [], struct_handles: [], function_handles: [], type_signatures: [], function_signatures: [], locals_signatures: [], string_pool: [], byte_array_pool: [], address_pool: [], struct_defs: [], field_defs: [FieldDefinition { struct_: StructHandleIndex(0), name: IdentifierIndex(0), signature: TypeSignatureIndex(0) }], function_defs: [] }
+cc 42cd5d033842c708fc3a704a573a77455676f33b4cb987516cee12efeaa33655 # shrinks to module = CompiledModule { version: 7, self_module_handle_idx: ModuleHandleIndex(0), module_handles: [ModuleHandle { address: AddressIdentifierIndex(0), name: IdentifierIndex(0) }], struct_handles: [StructHandle { module: ModuleHandleIndex(0), name: IdentifierIndex(7), abilities: [Copy, Store, ], type_parameters: [StructTypeParameter { constraints: [Copy, ], is_phantom: true }] }, StructHandle { module: ModuleHandleIndex(0), name: IdentifierIndex(16), abilities: [Copy, Drop, Store, ], type_parameters: [StructTypeParameter { constraints: [Drop, ], is_phantom: false }, StructTypeParameter { constraints: [], is_phantom: true }] }, StructHandle { module: ModuleHandleIndex(0), name: IdentifierIndex(10), abilities: [Copy, ], type_parameters: [] }, StructHandle { module: ModuleHandleIndex(0), name: IdentifierIndex(15), abilities: [], type_parameters: [StructTypeParameter { constraints: [], is_phantom: true }, StructTypeParameter { constraints: [Copy, Store, ], is_phantom: false }] }, StructHandle { module: ModuleHandleIndex(0), name: IdentifierIndex(12), abilities: [Copy, ], type_parameters: [] }, StructHandle { module: ModuleHandleIndex(0), name: IdentifierIndex(0), abilities: [Drop, ], type_parameters: [StructTypeParameter { constraints: [Copy, Drop, Store, ], is_phantom: true }] }, StructHandle { module: ModuleHandleIndex(0), name: IdentifierIndex(5), abilities: [Copy, ], type_parameters: [StructTypeParameter { constraints: [Copy, Store, ], is_phantom: false }, StructTypeParameter { constraints: [], is_phantom: true }] }, StructHandle { module: ModuleHandleIndex(0), name: IdentifierIndex(13), abilities: [Drop, ], type_parameters: [StructTypeParameter { constraints: [Copy, Drop, ], is_phantom: true }] }, StructHandle { module: ModuleHandleIndex(0), name: IdentifierIndex(3), abilities: [Drop, ], type_parameters: [StructTypeParameter { constraints: [Drop, Store, ], is_phantom: false }, StructTypeParameter { constraints: [Copy, Drop, Store, ], is_phantom: false }] }, StructHandle { module: ModuleHandleIndex(0), name: IdentifierIndex(4), abilities: [Drop, ], type_parameters: [StructTypeParameter { constraints: [Copy, Drop, Store, ], is_phantom: true }] }, StructHandle { module: ModuleHandleIndex(0), name: IdentifierIndex(6), abilities: [Copy, ], type_parameters: [StructTypeParameter { constraints: [], is_phantom: false }, StructTypeParameter { constraints: [Drop, Store, ], is_phantom: true }] }], function_handles: [FunctionHandle { module: ModuleHandleIndex(0), name: IdentifierIndex(9), parameters: SignatureIndex(2), return_: SignatureIndex(3), type_parameters: [], access_specifiers: None }, FunctionHandle { module: ModuleHandleIndex(0), name: IdentifierIndex(16), parameters: SignatureIndex(5), return_: SignatureIndex(6), type_parameters: [], access_specifiers: None }, FunctionHandle { module: ModuleHandleIndex(0), name: IdentifierIndex(4), parameters: SignatureIndex(9), return_: SignatureIndex(10), type_parameters: [], access_specifiers: None }], field_handles: [], friend_decls: [ModuleHandle { address: AddressIdentifierIndex(0), name: IdentifierIndex(0) }, ModuleHandle { address: AddressIdentifierIndex(0), name: IdentifierIndex(2) }, ModuleHandle { address: AddressIdentifierIndex(0), name: IdentifierIndex(4) }, ModuleHandle { address: AddressIdentifierIndex(0), name: IdentifierIndex(5) }, ModuleHandle { address: AddressIdentifierIndex(0), name: IdentifierIndex(10) }, ModuleHandle { address: AddressIdentifierIndex(0), name: IdentifierIndex(12) }, ModuleHandle { address: AddressIdentifierIndex(0), name: IdentifierIndex(13) }, ModuleHandle { address: AddressIdentifierIndex(0), name: IdentifierIndex(14) }], struct_def_instantiations: [StructDefInstantiation { def: StructDefinitionIndex(10), type_parameters: SignatureIndex(4) }, StructDefInstantiation { def: StructDefinitionIndex(5), type_parameters: SignatureIndex(7) }, StructDefInstantiation { def: StructDefinitionIndex(8), type_parameters: SignatureIndex(4) }], function_instantiations: [], field_instantiations: [], signatures: [Signature([U32, Bool]), Signature([U16, Address, U32]), Signature([]), Signature([Reference(Bool)]), Signature([U64, U64]), Signature([StructInstantiation(StructHandleIndex(7), [U64]), Reference(U32)]), Signature([U16, Reference(U256)]), Signature([U64]), Signature([StructInstantiation(StructHandleIndex(3), [U64, U64])]), Signature([StructInstantiation(StructHandleIndex(8), [U64, U64]), Vector(Signer), U8]), Signature([U128, MutableReference(Address)]), Signature([Bool])], identifiers: [Identifier("A"), Identifier("A0"), Identifier("AA"), Identifier("AB"), Identifier("AC"), Identifier("AD"), Identifier("AE"), Identifier("A_"), Identifier("Aa"), Identifier("a"), Identifier("a0"), Identifier("a1"), Identifier("a2"), Identifier("a3"), Identifier("aA"), Identifier("a_"), Identifier("aa")], address_identifiers: [0000000000000000000000000000000000000000000000000000000000000000], constant_pool: [], metadata: [], struct_defs: [StructDefinition { struct_handle: StructHandleIndex(0), field_information: Native }, StructDefinition { struct_handle: StructHandleIndex(1), field_information: Native }, StructDefinition { struct_handle: StructHandleIndex(2), field_information: Native }, StructDefinition { struct_handle: StructHandleIndex(3), field_information: Native }, StructDefinition { struct_handle: StructHandleIndex(4), field_information: Native }, StructDefinition { struct_handle: StructHandleIndex(5), field_information: Declared([FieldDefinition { name: IdentifierIndex(16), signature: TypeSignature(U64) }, FieldDefinition { name: IdentifierIndex(7), signature: TypeSignature(Address) }, FieldDefinition { name: IdentifierIndex(12), signature: TypeSignature(U64) }]) }, StructDefinition { struct_handle: StructHandleIndex(6), field_information: DeclaredVariants([VariantDefinition { name: IdentifierIndex(2), fields: [FieldDefinition { name: IdentifierIndex(5), signature: TypeSignature(U256) }] }]) }, StructDefinition { struct_handle: StructHandleIndex(7), field_information: Native }, StructDefinition { struct_handle: StructHandleIndex(8), field_information: DeclaredVariants([VariantDefinition { name: IdentifierIndex(14), fields: [FieldDefinition { name: IdentifierIndex(11), signature: TypeSignature(StructInstantiation(StructHandleIndex(1), [Signer, U64])) }] }, VariantDefinition { name: IdentifierIndex(10), fields: [] }]) }, StructDefinition { struct_handle: StructHandleIndex(9), field_information: DeclaredVariants([VariantDefinition { name: IdentifierIndex(14), fields: [FieldDefinition { name: IdentifierIndex(13), signature: TypeSignature(Bool) }, FieldDefinition { name: IdentifierIndex(9), signature: TypeSignature(U16) }, FieldDefinition { name: IdentifierIndex(14), signature: TypeSignature(Address) }, FieldDefinition { name: IdentifierIndex(7), signature: TypeSignature(Signer) }] }]) }, StructDefinition { struct_handle: StructHandleIndex(10), field_information: Native }], function_defs: [FunctionDefinition { function: FunctionHandleIndex(0), visibility: Private, is_entry: true, acquires_global_resources: [StructDefinitionIndex(5)], code: Some(CodeUnit { locals: SignatureIndex(2), code: [MutBorrowGlobalGeneric(StructDefInstantiationIndex(0)), Branch(0)] }) }, FunctionDefinition { function: FunctionHandleIndex(1), visibility: Private, is_entry: false, acquires_global_resources: [StructDefinitionIndex(10)], code: Some(CodeUnit { locals: SignatureIndex(8), code: [Call(0), Xor, ImmBorrowVariantFieldGeneric(VariantFieldInstantiationIndex(0)), ExistsGeneric(StructDefInstantiationIndex(1)), ImmBorrowGlobal(StructDefinitionIndex(4)), MoveFromGeneric(StructDefInstantiationIndex(2)), BrFalse(1), ImmBorrowLoc(0), MutBorrowGlobalGeneric(StructDefInstantiationIndex(1)), ImmBorrowLoc(0), ExistsGeneric(StructDefInstantiationIndex(0)), ImmBorrowLoc(0), Exists(StructDefinitionIndex(2)), MutBorrowLoc(0), MoveToGeneric(StructDefInstantiationIndex(1))] }) }, FunctionDefinition { function: FunctionHandleIndex(2), visibility: Friend, is_entry: true, acquires_global_resources: [], code: Some(CodeUnit { locals: SignatureIndex(11), code: [StLoc(0), ImmBorrowVariantFieldGeneric(VariantFieldInstantiationIndex(1))] }) }], struct_variant_handles: [], struct_variant_instantiations: [], variant_field_handles: [VariantFieldHandle { owner: StructDefinitionIndex(9), variants: [0], field: 3 }, VariantFieldHandle { owner: StructDefinitionIndex(6), variants: [0], field: 0 }], variant_field_instantiations: [VariantFieldInstantiation { handle: VariantFieldHandleIndex(0), type_parameters: SignatureIndex(7) }, VariantFieldInstantiation { handle: VariantFieldHandleIndex(1), type_parameters: SignatureIndex(4) }] }
diff --git a/third_party/move/move-binary-format/src/access.rs b/third_party/move/move-binary-format/src/access.rs
index 904619fad022f..c0c3e1114de8e 100644
--- a/third_party/move/move-binary-format/src/access.rs
+++ b/third_party/move/move-binary-format/src/access.rs
@@ -66,6 +66,19 @@ pub trait ModuleAccess: Sync {
         handle
     }
 
+    fn variant_field_handle_at(&self, idx: VariantFieldHandleIndex) -> &VariantFieldHandle {
+        let handle = &self.as_module().variant_field_handles[idx.into_index()];
+        debug_assert!(handle.struct_index.into_index() < self.as_module().struct_defs.len()); // invariant
+
+        handle
+    }
+
+    fn struct_variant_handle_at(&self, idx: StructVariantHandleIndex) -> &StructVariantHandle {
+        let handle = &self.as_module().struct_variant_handles[idx.into_index()];
+        debug_assert!(handle.struct_index.into_index() < self.as_module().struct_defs.len()); // invariant
+        handle
+    }
+
     fn struct_instantiation_at(&self, idx: StructDefInstantiationIndex) -> &StructDefInstantiation {
         &self.as_module().struct_def_instantiations[idx.into_index()]
     }
@@ -78,6 +91,20 @@ pub trait ModuleAccess: Sync {
         &self.as_module().field_instantiations[idx.into_index()]
     }
 
+    fn variant_field_instantiation_at(
+        &self,
+        idx: VariantFieldInstantiationIndex,
+    ) -> &VariantFieldInstantiation {
+        &self.as_module().variant_field_instantiations[idx.into_index()]
+    }
+
+    fn struct_variant_instantiation_at(
+        &self,
+        idx: StructVariantInstantiationIndex,
+    ) -> &StructVariantInstantiation {
+        &self.as_module().struct_variant_instantiations[idx.into_index()]
+    }
+
     fn signature_at(&self, idx: SignatureIndex) -> &Signature {
         &self.as_module().signatures[idx.into_index()]
     }
@@ -124,6 +151,14 @@ pub trait ModuleAccess: Sync {
         &self.as_module().field_handles
     }
 
+    fn variant_field_handles(&self) -> &[VariantFieldHandle] {
+        &self.as_module().variant_field_handles
+    }
+
+    fn struct_variant_handles(&self) -> &[StructVariantHandle] {
+        &self.as_module().struct_variant_handles
+    }
+
     fn struct_instantiations(&self) -> &[StructDefInstantiation] {
         &self.as_module().struct_def_instantiations
     }
@@ -136,6 +171,14 @@ pub trait ModuleAccess: Sync {
         &self.as_module().field_instantiations
     }
 
+    fn variant_field_instantiations(&self) -> &[VariantFieldInstantiation] {
+        &self.as_module().variant_field_instantiations
+    }
+
+    fn struct_variant_instantiations(&self) -> &[StructVariantInstantiation] {
+        &self.as_module().struct_variant_instantiations
+    }
+
     fn signatures(&self) -> &[Signature] {
         &self.as_module().signatures
     }
diff --git a/third_party/move/move-binary-format/src/binary_views.rs b/third_party/move/move-binary-format/src/binary_views.rs
index 58367db2aa2d0..840754c3a565f 100644
--- a/third_party/move/move-binary-format/src/binary_views.rs
+++ b/third_party/move/move-binary-format/src/binary_views.rs
@@ -13,7 +13,9 @@ use crate::{
         FunctionInstantiation, FunctionInstantiationIndex, IdentifierIndex, ModuleHandle,
         ModuleHandleIndex, Signature, SignatureIndex, SignatureToken, StructDefInstantiation,
         StructDefInstantiationIndex, StructDefinition, StructDefinitionIndex, StructHandle,
-        StructHandleIndex,
+        StructHandleIndex, StructVariantHandle, StructVariantHandleIndex,
+        StructVariantInstantiation, StructVariantInstantiationIndex, VariantFieldHandle,
+        VariantFieldHandleIndex, VariantFieldInstantiation, VariantFieldInstantiationIndex,
     },
     CompiledModule,
 };
@@ -157,6 +159,13 @@ impl<'a> BinaryIndexedView<'a> {
         }
     }
 
+    pub fn variant_field_handles(&self) -> Option<&[VariantFieldHandle]> {
+        match self {
+            BinaryIndexedView::Module(module) => Some(&module.variant_field_handles),
+            BinaryIndexedView::Script(_) => None,
+        }
+    }
+
     pub fn field_handle_at(&self, idx: FieldHandleIndex) -> PartialVMResult<&FieldHandle> {
         match self {
             BinaryIndexedView::Module(module) => Ok(module.field_handle_at(idx)),
@@ -166,6 +175,42 @@ impl<'a> BinaryIndexedView<'a> {
         }
     }
 
+    pub fn variant_field_handle_at(
+        &self,
+        idx: VariantFieldHandleIndex,
+    ) -> PartialVMResult<&VariantFieldHandle> {
+        match self {
+            BinaryIndexedView::Module(module) => Ok(module.variant_field_handle_at(idx)),
+            BinaryIndexedView::Script(_) => {
+                Err(PartialVMError::new(StatusCode::INVALID_OPERATION_IN_SCRIPT))
+            },
+        }
+    }
+
+    pub fn struct_variant_handle_at(
+        &self,
+        idx: StructVariantHandleIndex,
+    ) -> PartialVMResult<&StructVariantHandle> {
+        match self {
+            BinaryIndexedView::Module(module) => Ok(module.struct_variant_handle_at(idx)),
+            BinaryIndexedView::Script(_) => {
+                Err(PartialVMError::new(StatusCode::INVALID_OPERATION_IN_SCRIPT))
+            },
+        }
+    }
+
+    pub fn struct_variant_instantiation_at(
+        &self,
+        idx: StructVariantInstantiationIndex,
+    ) -> PartialVMResult<&StructVariantInstantiation> {
+        match self {
+            BinaryIndexedView::Module(module) => Ok(module.struct_variant_instantiation_at(idx)),
+            BinaryIndexedView::Script(_) => {
+                Err(PartialVMError::new(StatusCode::INVALID_OPERATION_IN_SCRIPT))
+            },
+        }
+    }
+
     pub fn friend_decls(&self) -> Option<&[ModuleHandle]> {
         match self {
             BinaryIndexedView::Module(module) => Some(module.friend_decls()),
@@ -199,6 +244,13 @@ impl<'a> BinaryIndexedView<'a> {
         }
     }
 
+    pub fn variant_field_instantiations(&self) -> Option<&[VariantFieldInstantiation]> {
+        match self {
+            BinaryIndexedView::Module(module) => Some(&module.variant_field_instantiations),
+            BinaryIndexedView::Script(_) => None,
+        }
+    }
+
     pub fn field_instantiation_at(
         &self,
         idx: FieldInstantiationIndex,
@@ -211,6 +263,18 @@ impl<'a> BinaryIndexedView<'a> {
         }
     }
 
+    pub fn variant_field_instantiation_at(
+        &self,
+        idx: VariantFieldInstantiationIndex,
+    ) -> PartialVMResult<&VariantFieldInstantiation> {
+        match self {
+            BinaryIndexedView::Module(module) => Ok(module.variant_field_instantiation_at(idx)),
+            BinaryIndexedView::Script(_) => {
+                Err(PartialVMError::new(StatusCode::INVALID_OPERATION_IN_SCRIPT))
+            },
+        }
+    }
+
     pub fn struct_defs(&self) -> Option<&[StructDefinition]> {
         match self {
             BinaryIndexedView::Module(module) => Some(module.struct_defs()),
@@ -227,6 +291,20 @@ impl<'a> BinaryIndexedView<'a> {
         }
     }
 
+    pub fn struct_variant_handles(&self) -> Option<&[StructVariantHandle]> {
+        match self {
+            BinaryIndexedView::Module(module) => Some(&module.struct_variant_handles),
+            BinaryIndexedView::Script(_) => None,
+        }
+    }
+
+    pub fn struct_variant_instantiations(&self) -> Option<&[StructVariantInstantiation]> {
+        match self {
+            BinaryIndexedView::Module(module) => Some(&module.struct_variant_instantiations),
+            BinaryIndexedView::Script(_) => None,
+        }
+    }
+
     pub fn function_defs(&self) -> Option<&[FunctionDefinition]> {
         match self {
             BinaryIndexedView::Module(module) => Some(module.function_defs()),
diff --git a/third_party/move/move-binary-format/src/check_bounds.rs b/third_party/move/move-binary-format/src/check_bounds.rs
index c877872fe3ffe..a3629a450af90 100644
--- a/third_party/move/move-binary-format/src/check_bounds.rs
+++ b/third_party/move/move-binary-format/src/check_bounds.rs
@@ -10,10 +10,12 @@ use crate::{
     },
     file_format::{
         AbilitySet, Bytecode, CodeOffset, CodeUnit, CompiledModule, CompiledScript, Constant,
-        FieldHandle, FieldInstantiation, FunctionDefinition, FunctionDefinitionIndex,
-        FunctionHandle, FunctionInstantiation, LocalIndex, ModuleHandle, Signature, SignatureIndex,
-        SignatureToken, StructDefInstantiation, StructDefinition, StructFieldInformation,
-        StructHandle, TableIndex, TypeParameterIndex,
+        FieldDefinition, FieldHandle, FieldInstantiation, FunctionDefinition,
+        FunctionDefinitionIndex, FunctionHandle, FunctionInstantiation, LocalIndex, ModuleHandle,
+        Signature, SignatureIndex, SignatureToken, StructDefInstantiation, StructDefinition,
+        StructFieldInformation, StructHandle, StructVariantHandle, StructVariantInstantiation,
+        TableIndex, TypeParameterIndex, VariantFieldHandle, VariantFieldInstantiation,
+        VariantIndex,
     },
     internals::ModuleIndex,
     IndexKind,
@@ -95,7 +97,38 @@ impl<'a> BoundsChecker<'a> {
         self.check_function_instantiations()?;
         self.check_field_instantiations()?;
         self.check_struct_defs()?;
-        self.check_function_defs()
+        self.check_function_defs()?;
+        // Since bytecode version 7
+        self.check_table(
+            self.view.variant_field_handles(),
+            Self::check_variant_field_handle,
+        )?;
+        self.check_table(
+            self.view.struct_variant_handles(),
+            Self::check_struct_variant_handle,
+        )?;
+        self.check_table(
+            self.view.variant_field_instantiations(),
+            Self::check_variant_field_instantiation,
+        )?;
+        self.check_table(
+            self.view.struct_variant_instantiations(),
+            Self::check_struct_variant_instantiation,
+        )?;
+        Ok(())
+    }
+
+    fn check_table<T>(
+        &self,
+        table: Option<&[T]>,
+        checker: impl Fn(&Self, &T) -> PartialVMResult<()>,
+    ) -> PartialVMResult<()> {
+        if let Some(table) = table {
+            for elem in table {
+                checker(self, elem)?
+            }
+        }
+        Ok(())
     }
 
     fn check_signatures(&self) -> PartialVMResult<()> {
@@ -169,8 +202,10 @@ impl<'a> BoundsChecker<'a> {
     }
 
     fn check_struct_defs(&self) -> PartialVMResult<()> {
-        for struct_def in self.view.struct_defs().into_iter().flatten() {
-            self.check_struct_def(struct_def)?
+        for (struct_def_idx, struct_def) in
+            self.view.struct_defs().into_iter().flatten().enumerate()
+        {
+            self.check_struct_def(struct_def, struct_def_idx)?
         }
         Ok(())
     }
@@ -222,10 +257,7 @@ impl<'a> BoundsChecker<'a> {
             .struct_defs()
             .and_then(|d| d.get(field_handle.owner.into_index()))
         {
-            let fields_count = match &struct_def.field_information {
-                StructFieldInformation::Native => 0,
-                StructFieldInformation::Declared(fields) => fields.len(),
-            };
+            let fields_count = struct_def.field_information.field_count(None);
             if field_handle.field as usize >= fields_count {
                 return Err(bounds_error(
                     StatusCode::INDEX_OUT_OF_BOUNDS,
@@ -238,6 +270,47 @@ impl<'a> BoundsChecker<'a> {
         Ok(())
     }
 
+    fn check_variant_field_handle(&self, field_handle: &VariantFieldHandle) -> PartialVMResult<()> {
+        check_bounds_impl_opt(&self.view.struct_defs(), field_handle.struct_index)?;
+        let struct_def = self.view.struct_def_at(field_handle.struct_index)?;
+        for variant in &field_handle.variants {
+            Self::check_variant_index(struct_def, *variant)?;
+            let field_count = struct_def.field_information.field_count(Some(*variant));
+            if field_handle.field as usize >= field_count {
+                return Err(bounds_error(
+                    StatusCode::INDEX_OUT_OF_BOUNDS,
+                    IndexKind::MemberCount,
+                    field_handle.field,
+                    field_count,
+                ));
+            }
+        }
+        Ok(())
+    }
+
+    fn check_struct_variant_handle(&self, handle: &StructVariantHandle) -> PartialVMResult<()> {
+        check_bounds_impl_opt(&self.view.struct_defs(), handle.struct_index)?;
+        let struct_def = self.view.struct_def_at(handle.struct_index)?;
+        Self::check_variant_index(struct_def, handle.variant)
+    }
+
+    fn check_variant_index(
+        struct_def: &StructDefinition,
+        variant_index: VariantIndex,
+    ) -> PartialVMResult<()> {
+        let count = struct_def.field_information.variant_count();
+        if (variant_index as usize) >= count {
+            Err(bounds_error(
+                StatusCode::INDEX_OUT_OF_BOUNDS,
+                IndexKind::MemberCount,
+                variant_index,
+                count,
+            ))
+        } else {
+            Ok(())
+        }
+    }
+
     fn check_struct_instantiation(
         &self,
         struct_instantiation: &StructDefInstantiation,
@@ -265,6 +338,22 @@ impl<'a> BoundsChecker<'a> {
         check_bounds_impl(self.view.signatures(), field_instantiation.type_parameters)
     }
 
+    fn check_variant_field_instantiation(
+        &self,
+        inst: &VariantFieldInstantiation,
+    ) -> PartialVMResult<()> {
+        check_bounds_impl_opt(&self.view.variant_field_handles(), inst.handle)?;
+        check_bounds_impl(self.view.signatures(), inst.type_parameters)
+    }
+
+    fn check_struct_variant_instantiation(
+        &self,
+        inst: &StructVariantInstantiation,
+    ) -> PartialVMResult<()> {
+        check_bounds_impl_opt(&self.view.struct_variant_handles(), inst.handle)?;
+        check_bounds_impl(self.view.signatures(), inst.type_parameters)
+    }
+
     fn check_signature(&self, signature: &Signature) -> PartialVMResult<()> {
         for ty in &signature.0 {
             self.check_type(ty)?
@@ -276,25 +365,54 @@ impl<'a> BoundsChecker<'a> {
         self.check_type(&constant.type_)
     }
 
-    fn check_struct_def(&self, struct_def: &StructDefinition) -> PartialVMResult<()> {
+    fn check_struct_def(
+        &self,
+        struct_def: &StructDefinition,
+        struct_def_idx: usize,
+    ) -> PartialVMResult<()> {
         check_bounds_impl(self.view.struct_handles(), struct_def.struct_handle)?;
-        // check signature (type) and type parameter for the field type
-        if let StructFieldInformation::Declared(fields) = &struct_def.field_information {
-            let type_param_count = self
-                .view
-                .struct_handles()
-                .get(struct_def.struct_handle.into_index())
-                .map_or(0, |sh| sh.type_parameters.len());
-            // field signatures are inlined
-            for field in fields {
-                check_bounds_impl(self.view.identifiers(), field.name)?;
-                self.check_type(&field.signature.0)?;
-                self.check_type_parameters_in_ty(&field.signature.0, type_param_count)?;
-            }
+        // check signature (type) and type parameter for the field types
+        let type_param_count = self
+            .view
+            .struct_handles()
+            .get(struct_def.struct_handle.into_index())
+            .map_or(0, |sh| sh.type_parameters.len());
+        match &struct_def.field_information {
+            StructFieldInformation::Declared(fields) => {
+                // field signatures are inlined
+                for field in fields {
+                    self.check_field_def(type_param_count, field)?;
+                }
+            },
+            StructFieldInformation::DeclaredVariants(variants) => {
+                for field in variants.iter().flat_map(|v| v.fields.iter()) {
+                    self.check_field_def(type_param_count, field)?;
+                }
+                if variants.is_empty() {
+                    // Empty variants are not allowed
+                    return Err(verification_error(
+                        StatusCode::ZERO_VARIANTS_ERROR,
+                        IndexKind::StructDefinition,
+                        struct_def_idx as TableIndex,
+                    ));
+                }
+            },
+            StructFieldInformation::Native => {},
         }
         Ok(())
     }
 
+    fn check_field_def(
+        &self,
+        type_param_count: usize,
+        field: &FieldDefinition,
+    ) -> Result<(), PartialVMError> {
+        check_bounds_impl(self.view.identifiers(), field.name)?;
+        self.check_type(&field.signature.0)?;
+        self.check_type_parameters_in_ty(&field.signature.0, type_param_count)?;
+        Ok(())
+    }
+
     fn check_function_def(
         &mut self,
         function_def_idx: usize,
@@ -379,13 +497,18 @@ impl<'a> BoundsChecker<'a> {
                     *idx,
                     bytecode_offset,
                 )?,
+                MutBorrowVariantField(idx) | ImmBorrowVariantField(idx) => self
+                    .check_code_unit_bounds_impl_opt(
+                        &self.view.variant_field_handles(),
+                        *idx,
+                        bytecode_offset,
+                    )?,
                 MutBorrowFieldGeneric(idx) | ImmBorrowFieldGeneric(idx) => {
                     self.check_code_unit_bounds_impl_opt(
                         &self.view.field_instantiations(),
                         *idx,
                         bytecode_offset,
                     )?;
-                    // check type parameters in borrow are bound to the function type parameters
                     if let Some(field_inst) = self
                         .view
                         .field_instantiations()
@@ -397,6 +520,23 @@ impl<'a> BoundsChecker<'a> {
                         )?;
                     }
                 },
+                MutBorrowVariantFieldGeneric(idx) | ImmBorrowVariantFieldGeneric(idx) => {
+                    self.check_code_unit_bounds_impl_opt(
+                        &self.view.variant_field_instantiations(),
+                        *idx,
+                        bytecode_offset,
+                    )?;
+                    if let Some(field_inst) = self
+                        .view
+                        .variant_field_instantiations()
+                        .and_then(|f| f.get(idx.into_index()))
+                    {
+                        self.check_type_parameters_in_signature(
+                            field_inst.type_parameters,
+                            type_param_count,
+                        )?;
+                    }
+                },
                 Call(idx) => self.check_code_unit_bounds_impl(
                     self.view.function_handles(),
                     *idx,
@@ -408,7 +548,6 @@ impl<'a> BoundsChecker<'a> {
                         *idx,
                         bytecode_offset,
                     )?;
-                    // check type parameters in call are bound to the function type parameters
                     if let Some(func_inst) =
                         self.view.function_instantiations().get(idx.into_index())
                     {
@@ -425,6 +564,12 @@ impl<'a> BoundsChecker<'a> {
                         *idx,
                         bytecode_offset,
                     )?,
+                PackVariant(idx) | UnpackVariant(idx) | TestVariant(idx) => self
+                    .check_code_unit_bounds_impl_opt(
+                        &self.view.struct_variant_handles(),
+                        *idx,
+                        bytecode_offset,
+                    )?,
                 PackGeneric(idx)
                 | UnpackGeneric(idx)
                 | ExistsGeneric(idx)
@@ -449,6 +594,24 @@ impl<'a> BoundsChecker<'a> {
                         )?;
                     }
                 },
+                PackVariantGeneric(idx) | UnpackVariantGeneric(idx) | TestVariantGeneric(idx) => {
+                    self.check_code_unit_bounds_impl_opt(
+                        &self.view.struct_variant_instantiations(),
+                        *idx,
+                        bytecode_offset,
+                    )?;
+                    // check type parameters
+                    if let Some(struct_variant_inst) = self
+                        .view
+                        .struct_variant_instantiations()
+                        .and_then(|s| s.get(idx.into_index()))
+                    {
+                        self.check_type_parameters_in_signature(
+                            struct_variant_inst.type_parameters,
+                            type_param_count,
+                        )?;
+                    }
+                },
                 // Instructions that refer to this code block.
                 BrTrue(offset) | BrFalse(offset) | Branch(offset) => {
                     let offset = *offset as usize;
diff --git a/third_party/move/move-binary-format/src/check_complexity.rs b/third_party/move/move-binary-format/src/check_complexity.rs
new file mode 100644
index 0000000000000..79ccc6b48bfc3
--- /dev/null
+++ b/third_party/move/move-binary-format/src/check_complexity.rs
@@ -0,0 +1,420 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    binary_views::BinaryIndexedView,
+    errors::{PartialVMError, PartialVMResult},
+    file_format::{
+        Bytecode, CodeUnit, CompiledModule, CompiledScript, FieldInstantiationIndex,
+        FunctionInstantiationIndex, IdentifierIndex, ModuleHandleIndex, SignatureIndex,
+        SignatureToken, StructDefInstantiationIndex, StructFieldInformation,
+        StructVariantInstantiationIndex, TableIndex, VariantFieldInstantiationIndex,
+    },
+};
+use move_core_types::vm_status::StatusCode;
+use std::{
+    cell::RefCell,
+    collections::{btree_map, BTreeMap},
+};
+
+const COST_PER_TYPE_NODE: u64 = 8;
+const COST_PER_IDENT_BYTE: u64 = 1;
+
+fn safe_get_table<T>(table: &[T], idx: TableIndex) -> PartialVMResult<&T> {
+    table.get(idx as usize).ok_or_else(|| {
+        PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+            .with_message("Index out of bounds while checking binary complexity.".to_string())
+    })
+}
+
+struct BinaryComplexityMeter<'a> {
+    resolver: BinaryIndexedView<'a>,
+
+    cached_signature_costs: RefCell<BTreeMap<SignatureIndex, u64>>,
+    balance: RefCell<u64>,
+}
+
+impl<'a> BinaryComplexityMeter<'a> {
+    fn charge(&self, amount: u64) -> PartialVMResult<()> {
+        let mut balance = self.balance.borrow_mut();
+        match balance.checked_sub(amount) {
+            Some(new_balance) => {
+                *balance = new_balance;
+                Ok(())
+            },
+            None => {
+                *balance = 0;
+                Err(PartialVMError::new(StatusCode::PROGRAM_TOO_COMPLEX))
+            },
+        }
+    }
+
+    fn signature_token_cost(&self, tok: &SignatureToken) -> PartialVMResult<u64> {
+        use SignatureToken::*;
+
+        let mut cost: u64 = 0;
+
+        for node in tok.preorder_traversal() {
+            cost = cost.saturating_add(COST_PER_TYPE_NODE);
+
+            match node {
+                Struct(sh_idx) | StructInstantiation(sh_idx, _) => {
+                    let sh = safe_get_table(self.resolver.struct_handles(), sh_idx.0)?;
+                    let mh = safe_get_table(self.resolver.module_handles(), sh.module.0)?;
+                    let struct_name = safe_get_table(self.resolver.identifiers(), sh.name.0)?;
+                    let moduel_name = safe_get_table(self.resolver.identifiers(), mh.name.0)?;
+
+                    cost = cost.saturating_add(struct_name.len() as u64 * COST_PER_IDENT_BYTE);
+                    cost = cost.saturating_add(moduel_name.len() as u64 * COST_PER_IDENT_BYTE);
+                },
+                U8 | U16 | U32 | U64 | U128 | U256 | Signer | Address | Bool | Vector(_)
+                | TypeParameter(_) | Reference(_) | MutableReference(_) => (),
+            }
+        }
+
+        Ok(cost)
+    }
+
+    fn meter_identifier(&self, idx: IdentifierIndex) -> PartialVMResult<()> {
+        let ident = safe_get_table(self.resolver.identifiers(), idx.0)?;
+        self.charge(ident.len() as u64 * COST_PER_IDENT_BYTE)
+    }
+
+    fn meter_signature(&self, idx: SignatureIndex) -> PartialVMResult<()> {
+        let cost = match self.cached_signature_costs.borrow_mut().entry(idx) {
+            btree_map::Entry::Occupied(entry) => *entry.into_mut(),
+            btree_map::Entry::Vacant(entry) => {
+                let sig = safe_get_table(self.resolver.signatures(), idx.0)?;
+
+                let mut cost: u64 = 0;
+                for ty in &sig.0 {
+                    cost = cost.saturating_add(self.signature_token_cost(ty)?);
+                }
+
+                *entry.insert(cost)
+            },
+        };
+
+        self.charge(cost)?;
+
+        Ok(())
+    }
+
+    fn meter_signatures(&self) -> PartialVMResult<()> {
+        for sig_idx in 0..self.resolver.signatures().len() {
+            self.meter_signature(SignatureIndex(sig_idx as u16))?;
+        }
+        Ok(())
+    }
+
+    fn meter_function_instantiation(
+        &self,
+        func_inst_idx: FunctionInstantiationIndex,
+    ) -> PartialVMResult<()> {
+        let func_inst = safe_get_table(self.resolver.function_instantiations(), func_inst_idx.0)?;
+        self.meter_signature(func_inst.type_parameters)
+    }
+
+    fn meter_function_instantiations(&self) -> PartialVMResult<()> {
+        for func_inst_idx in 0..self.resolver.function_instantiations().len() {
+            self.meter_function_instantiation(FunctionInstantiationIndex(func_inst_idx as u16))?;
+        }
+        Ok(())
+    }
+
+    fn meter_struct_instantiation(
+        &self,
+        struct_inst_idx: StructDefInstantiationIndex,
+    ) -> PartialVMResult<()> {
+        let struct_insts = self.resolver.struct_instantiations().ok_or_else(|| {
+            PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                .with_message("Can't get struct instantiations -- not a module.".to_string())
+        })?;
+        let struct_inst = safe_get_table(struct_insts, struct_inst_idx.0)?;
+
+        self.meter_signature(struct_inst.type_parameters)
+    }
+
+    fn meter_struct_variant_instantiation(
+        &self,
+        struct_inst_idx: StructVariantInstantiationIndex,
+    ) -> PartialVMResult<()> {
+        let struct_variant_insts =
+            self.resolver
+                .struct_variant_instantiations()
+                .ok_or_else(|| {
+                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR).with_message(
+                        "Can't get enum type instantiation -- not a module.".to_string(),
+                    )
+                })?;
+        let struct_variant_inst = safe_get_table(struct_variant_insts, struct_inst_idx.0)?;
+        self.meter_signature(struct_variant_inst.type_parameters)
+    }
+
+    fn meter_struct_def_instantiations(&self) -> PartialVMResult<()> {
+        let struct_insts = self.resolver.struct_instantiations().ok_or_else(|| {
+            PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                .with_message("Can't get struct instantiations -- not a module.".to_string())
+        })?;
+
+        for struct_inst_idx in 0..struct_insts.len() {
+            self.meter_struct_instantiation(StructDefInstantiationIndex(struct_inst_idx as u16))?;
+        }
+        Ok(())
+    }
+
+    fn meter_field_instantiation(
+        &self,
+        field_inst_idx: FieldInstantiationIndex,
+    ) -> PartialVMResult<()> {
+        let field_insts = self.resolver.field_instantiations().ok_or_else(|| {
+            PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                .with_message("Can't get field instantiations -- not a module.".to_string())
+        })?;
+        let field_inst = safe_get_table(field_insts, field_inst_idx.0)?;
+
+        self.meter_signature(field_inst.type_parameters)
+    }
+
+    fn meter_variant_field_instantiation(
+        &self,
+        variant_field_inst_idx: VariantFieldInstantiationIndex,
+    ) -> PartialVMResult<()> {
+        let variant_field_insts =
+            self.resolver
+                .variant_field_instantiations()
+                .ok_or_else(|| {
+                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR).with_message(
+                        "Can't get variant field instantiations -- not a module.".to_string(),
+                    )
+                })?;
+        let field_inst = safe_get_table(variant_field_insts, variant_field_inst_idx.0)?;
+
+        self.meter_signature(field_inst.type_parameters)
+    }
+
+    fn meter_field_instantiations(&self) -> PartialVMResult<()> {
+        let field_insts = self.resolver.field_instantiations().ok_or_else(|| {
+            PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                .with_message("Can't get field instantiations -- not a module.".to_string())
+        })?;
+
+        for field_inst_idx in 0..field_insts.len() {
+            self.meter_field_instantiation(FieldInstantiationIndex(field_inst_idx as u16))?;
+        }
+        Ok(())
+    }
+
+    fn meter_module_handle(&self, mh_idx: ModuleHandleIndex) -> PartialVMResult<()> {
+        let mh = safe_get_table(self.resolver.module_handles(), mh_idx.0)?;
+        self.meter_identifier(mh.name)
+    }
+
+    fn meter_function_handles(&self) -> PartialVMResult<()> {
+        for fh in self.resolver.function_handles() {
+            self.meter_module_handle(fh.module)?;
+            self.meter_identifier(fh.name)?;
+            self.meter_signature(fh.parameters)?;
+            self.meter_signature(fh.return_)?;
+        }
+        Ok(())
+    }
+
+    fn meter_struct_handles(&self) -> PartialVMResult<()> {
+        for sh in self.resolver.struct_handles() {
+            self.meter_module_handle(sh.module)?;
+            self.meter_identifier(sh.name)?;
+        }
+        Ok(())
+    }
+
+    fn meter_struct_defs(&self) -> PartialVMResult<()> {
+        let struct_defs = self.resolver.struct_defs().ok_or_else(|| {
+            PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                .with_message("Can't get struct defs -- not a module.".to_string())
+        })?;
+
+        for sdef in struct_defs {
+            match &sdef.field_information {
+                StructFieldInformation::Native => continue,
+                StructFieldInformation::Declared(fields) => {
+                    for field in fields {
+                        self.charge(field.signature.0.num_nodes() as u64)?;
+                    }
+                },
+                StructFieldInformation::DeclaredVariants(variants) => {
+                    for variant in variants {
+                        for field in &variant.fields {
+                            self.charge(field.signature.0.num_nodes() as u64)?;
+                        }
+                    }
+                },
+            }
+        }
+        Ok(())
+    }
+
+    fn meter_code(&self, code: &CodeUnit) -> PartialVMResult<()> {
+        use Bytecode::*;
+
+        self.meter_signature(code.locals)?;
+
+        for instr in &code.code {
+            match instr {
+                CallGeneric(idx) => {
+                    self.meter_function_instantiation(*idx)?;
+                },
+                PackGeneric(idx) | UnpackGeneric(idx) => {
+                    self.meter_struct_instantiation(*idx)?;
+                },
+                PackVariantGeneric(idx) | UnpackVariantGeneric(idx) | TestVariantGeneric(idx) => {
+                    self.meter_struct_variant_instantiation(*idx)?;
+                },
+                ExistsGeneric(idx)
+                | MoveFromGeneric(idx)
+                | MoveToGeneric(idx)
+                | ImmBorrowGlobalGeneric(idx)
+                | MutBorrowGlobalGeneric(idx) => {
+                    self.meter_struct_instantiation(*idx)?;
+                },
+                ImmBorrowFieldGeneric(idx) | MutBorrowFieldGeneric(idx) => {
+                    self.meter_field_instantiation(*idx)?;
+                },
+                ImmBorrowVariantFieldGeneric(idx) | MutBorrowVariantFieldGeneric(idx) => {
+                    self.meter_variant_field_instantiation(*idx)?;
+                },
+                VecPack(idx, _)
+                | VecLen(idx)
+                | VecImmBorrow(idx)
+                | VecMutBorrow(idx)
+                | VecPushBack(idx)
+                | VecPopBack(idx)
+                | VecUnpack(idx, _)
+                | VecSwap(idx) => {
+                    self.meter_signature(*idx)?;
+                },
+
+                // List out the other options explicitly so there's a compile error if a new
+                // bytecode gets added.
+                Pop
+                | Ret
+                | Branch(_)
+                | BrTrue(_)
+                | BrFalse(_)
+                | LdU8(_)
+                | LdU16(_)
+                | LdU32(_)
+                | LdU64(_)
+                | LdU128(_)
+                | LdU256(_)
+                | LdConst(_)
+                | CastU8
+                | CastU16
+                | CastU32
+                | CastU64
+                | CastU128
+                | CastU256
+                | LdTrue
+                | LdFalse
+                | Call(_)
+                | Pack(_)
+                | Unpack(_)
+                | PackVariant(_)
+                | UnpackVariant(_)
+                | TestVariant(_)
+                | ReadRef
+                | WriteRef
+                | FreezeRef
+                | Add
+                | Sub
+                | Mul
+                | Mod
+                | Div
+                | BitOr
+                | BitAnd
+                | Xor
+                | Shl
+                | Shr
+                | Or
+                | And
+                | Not
+                | Eq
+                | Neq
+                | Lt
+                | Gt
+                | Le
+                | Ge
+                | CopyLoc(_)
+                | MoveLoc(_)
+                | StLoc(_)
+                | MutBorrowLoc(_)
+                | ImmBorrowLoc(_)
+                | MutBorrowField(_)
+                | ImmBorrowField(_)
+                | MutBorrowVariantField(_)
+                | ImmBorrowVariantField(_)
+                | MutBorrowGlobal(_)
+                | ImmBorrowGlobal(_)
+                | Exists(_)
+                | MoveTo(_)
+                | MoveFrom(_)
+                | Abort
+                | Nop => (),
+            }
+        }
+        Ok(())
+    }
+
+    fn meter_function_defs(&self) -> PartialVMResult<()> {
+        let func_defs = self.resolver.function_defs().ok_or_else(|| {
+            PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                .with_message("Can't get func defs -- not a module.".to_string())
+        })?;
+
+        for func_def in func_defs {
+            if let Some(code) = &func_def.code {
+                self.meter_code(code)?;
+            }
+        }
+        Ok(())
+    }
+}
+
+pub fn check_module_complexity(module: &CompiledModule, budget: u64) -> PartialVMResult<u64> {
+    let meter = BinaryComplexityMeter {
+        resolver: BinaryIndexedView::Module(module),
+        cached_signature_costs: RefCell::new(BTreeMap::new()),
+        balance: RefCell::new(budget),
+    };
+
+    meter.meter_signatures()?;
+    meter.meter_function_instantiations()?;
+    meter.meter_struct_def_instantiations()?;
+    meter.meter_field_instantiations()?;
+
+    meter.meter_function_handles()?;
+    meter.meter_struct_handles()?;
+    meter.meter_function_defs()?;
+    meter.meter_struct_defs()?;
+
+    let used = budget - *meter.balance.borrow();
+    Ok(used)
+}
+
+pub fn check_script_complexity(script: &CompiledScript, budget: u64) -> PartialVMResult<u64> {
+    let meter = BinaryComplexityMeter {
+        resolver: BinaryIndexedView::Script(script),
+        cached_signature_costs: RefCell::new(BTreeMap::new()),
+        balance: RefCell::new(budget),
+    };
+
+    meter.meter_signatures()?;
+    meter.meter_function_instantiations()?;
+
+    meter.meter_function_handles()?;
+    meter.meter_struct_handles()?;
+    meter.meter_code(&script.code)?;
+
+    let used = budget - *meter.balance.borrow();
+    Ok(used)
+}
diff --git a/third_party/move/move-binary-format/src/compatibility.rs b/third_party/move/move-binary-format/src/compatibility.rs
index 6954f0c9ee65d..35706526ac9d2 100644
--- a/third_party/move/move-binary-format/src/compatibility.rs
+++ b/third_party/move/move-binary-format/src/compatibility.rs
@@ -1,12 +1,19 @@
-// Copyright (c) The Diem Core Contributors
-// Copyright (c) The Move Contributors
+// Copyright © Aptos Foundation
+// Parts of the project are originally copyright © Meta Platforms, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{
+    access::ModuleAccess,
     errors::{PartialVMError, PartialVMResult},
-    file_format::{AbilitySet, StructTypeParameter, Visibility},
+    file_format::{
+        AbilitySet, Signature, SignatureToken, StructHandleIndex, StructTypeParameter,
+        VariantIndex, Visibility,
+    },
     file_format_common::VERSION_5,
-    normalized::Module,
+    views::{
+        FieldDefinitionView, ModuleView, StructDefinitionView, StructHandleView, ViewInternals,
+    },
+    CompiledModule,
 };
 use move_core_types::vm_status::StatusCode;
 use std::collections::BTreeSet;
@@ -21,11 +28,11 @@ use std::collections::BTreeSet;
 #[derive(PartialEq, Eq, Debug, Clone, Copy)]
 pub struct Compatibility {
     /// if false, do not ensure the dependent modules that reference public functions or structs in this module can link
-    check_struct_and_pub_function_linking: bool,
+    pub(crate) check_struct_and_pub_function_linking: bool,
     /// if false, do not ensure the struct layout capability
-    check_struct_layout: bool,
+    pub(crate) check_struct_layout: bool,
     /// if false, treat `friend` as `private` when `check_struct_and_function_linking`.
-    check_friend_linking: bool,
+    pub(crate) check_friend_linking: bool,
 }
 
 impl Default for Compatibility {
@@ -51,13 +58,9 @@ impl Compatibility {
         }
     }
 
-    pub fn new(
-        check_struct_and_pub_function_linking: bool,
-        check_struct_layout: bool,
-        check_friend_linking: bool,
-    ) -> Self {
+    pub fn new(check_struct_layout: bool, check_friend_linking: bool) -> Self {
         Self {
-            check_struct_and_pub_function_linking,
+            check_struct_and_pub_function_linking: true,
             check_struct_layout,
             check_friend_linking,
         }
@@ -70,46 +73,59 @@ impl Compatibility {
     }
 
     /// Check compatibility for `new_module` relative to old module `old_module`.
-    pub fn check(&self, old_module: &Module, new_module: &Module) -> PartialVMResult<()> {
-        let mut struct_and_pub_function_linking = true;
-        let mut struct_layout = true;
-        let mut friend_linking = true;
+    pub fn check(
+        &self,
+        old_module: &CompiledModule,
+        new_module: &CompiledModule,
+    ) -> PartialVMResult<()> {
+        let mut errors = vec![];
 
         // module's name and address are unchanged
-        if old_module.address != new_module.address || old_module.name != new_module.name {
-            struct_and_pub_function_linking = false;
+        if old_module.address() != new_module.address() {
+            errors.push(format!(
+                "module address changed to `{}`",
+                new_module.address()
+            ));
+        }
+        if old_module.name() != new_module.name() {
+            errors.push(format!("module name changed to `{}`", new_module.name()));
         }
 
+        let old_view = ModuleView::new(old_module);
+        let new_view = ModuleView::new(new_module);
+
         // old module's structs are a subset of the new module's structs
-        for (name, old_struct) in &old_module.structs {
-            let new_struct = match new_module.structs.get(name) {
+        for old_struct in old_view.structs() {
+            let new_struct = match new_view.struct_definition(old_struct.name()) {
                 Some(new_struct) => new_struct,
                 None => {
                     // Struct not present in new . Existing modules that depend on this struct will fail to link with the new version of the module.
                     // Also, struct layout cannot be guaranteed transitively, because after
                     // removing the struct, it could be re-added later with a different layout.
-                    struct_and_pub_function_linking = false;
-                    struct_layout = false;
+                    errors.push(format!("removed struct `{}`", old_struct.name()));
                     break;
                 },
             };
 
-            if !struct_abilities_compatibile(old_struct.abilities, new_struct.abilities)
-                || !struct_type_parameters_compatibile(
-                    &old_struct.type_parameters,
-                    &new_struct.type_parameters,
-                )
-            {
-                struct_and_pub_function_linking = false;
+            if !struct_abilities_compatible(old_struct.abilities(), new_struct.abilities()) {
+                errors.push(format!(
+                    "removed abilities `{}` from struct `{}`",
+                    old_struct.abilities().setminus(new_struct.abilities()),
+                    old_struct.name()
+                ));
+            }
+            if !struct_type_parameters_compatible(
+                old_struct.type_parameters(),
+                new_struct.type_parameters(),
+            ) {
+                errors.push(format!(
+                    "changed type parameters of struct `{}`",
+                    old_struct.name()
+                ));
             }
-            if new_struct.fields != old_struct.fields {
-                // Fields changed. Code in this module will fail at runtime if it tries to
-                // read a previously published struct value
-                // TODO: this is a stricter definition than required. We could in principle
-                // choose that changing the name (but not position or type) of a field is
-                // compatible. The VM does not care about the name of a field
-                // (it's purely informational), but clients presumably do.
-                struct_layout = false
+            // Layout of old and new struct need to be compatible
+            if self.check_struct_layout && !struct_layout_compatible(&old_struct, new_struct) {
+                errors.push(format!("changed layout of struct `{}`", old_struct.name()));
             }
         }
 
@@ -127,19 +143,27 @@ impl Compatibility {
         // we can remove/change a friend function if the function is not used by any module in the
         // friend list. But for simplicity, we decided to go to the more restrictive form now and
         // we may revisit this in the future.
-        for (name, old_func) in &old_module.exposed_functions {
-            let new_func = match new_module.exposed_functions.get(name) {
+        for old_func in old_view.functions() {
+            if old_func.visibility() == Visibility::Private && !old_func.is_entry() {
+                // Function not exposed, continue with next one
+                continue;
+            }
+            let new_func = match new_view.function_definition(old_func.name()) {
                 Some(new_func) => new_func,
                 None => {
-                    if matches!(old_func.visibility, Visibility::Friend) {
-                        friend_linking = false;
-                    } else {
-                        struct_and_pub_function_linking = false;
+                    // Function has been removed
+                    if !matches!(old_func.visibility(), Visibility::Friend)
+                        || self.check_friend_linking
+                    {
+                        errors.push(format!("removed function `{}`", old_func.name()));
                     }
                     continue;
                 },
             };
-            let is_vis_compatible = match (old_func.visibility, new_func.visibility) {
+            if matches!(old_func.visibility(), Visibility::Friend) && !self.check_friend_linking {
+                continue;
+            }
+            let is_vis_compatible = match (old_func.visibility(), new_func.visibility()) {
                 // public must remain public
                 (Visibility::Public, Visibility::Public) => true,
                 (Visibility::Public, _) => false,
@@ -150,31 +174,44 @@ impl Compatibility {
                 // private can become public or friend, or stay private
                 (Visibility::Private, _) => true,
             };
-            let is_entry_compatible = if old_module.file_format_version < VERSION_5
-                && new_module.file_format_version < VERSION_5
-            {
-                // if it was public(script), it must remain pubic(script)
-                // if it was not public(script), it _cannot_ become public(script)
-                old_func.is_entry == new_func.is_entry
+            let is_entry_compatible =
+                if old_view.module().version < VERSION_5 && new_view.module().version < VERSION_5 {
+                    // if it was public(script), it must remain public(script)
+                    // if it was not public(script), it _cannot_ become public(script)
+                    old_func.is_entry() == new_func.is_entry()
+                } else {
+                    // If it was an entry function, it must remain one.
+                    // If it was not an entry function, it is allowed to become one.
+                    !old_func.is_entry() || new_func.is_entry()
+                };
+            let error_msg = if !is_vis_compatible {
+                Some("changed visibility")
+            } else if !is_entry_compatible {
+                Some("removed `entry` modifier")
+            } else if !signature_compatible(
+                old_module,
+                old_func.parameters(),
+                new_module,
+                new_func.parameters(),
+            ) {
+                Some("changed parameter types")
+            } else if !signature_compatible(
+                old_module,
+                old_func.return_type(),
+                new_module,
+                new_func.return_type(),
+            ) {
+                Some("changed return type")
+            } else if !fun_type_parameters_compatible(
+                old_func.type_parameters(),
+                new_func.type_parameters(),
+            ) {
+                Some("changed type parameters")
             } else {
-                // If it was an entry function, it must remain one.
-                // If it was not an entry function, it is allowed to become one.
-                !old_func.is_entry || new_func.is_entry
+                None
             };
-            if !is_vis_compatible
-                || !is_entry_compatible
-                || old_func.parameters != new_func.parameters
-                || old_func.return_ != new_func.return_
-                || !fun_type_parameters_compatibile(
-                    &old_func.type_parameters,
-                    &new_func.type_parameters,
-                )
-            {
-                if matches!(old_func.visibility, Visibility::Friend) {
-                    friend_linking = false;
-                } else {
-                    struct_and_pub_function_linking = false;
-                }
+            if let Some(msg) = error_msg {
+                errors.push(format!("{} of function `{}`", msg, old_func.name()));
             }
         }
 
@@ -183,48 +220,56 @@ impl Compatibility {
         // - additions to the list are allowed
         // - removals are not allowed
         //
-        let old_friend_module_ids: BTreeSet<_> = old_module.friends.iter().cloned().collect();
-        let new_friend_module_ids: BTreeSet<_> = new_module.friends.iter().cloned().collect();
-        if !old_friend_module_ids.is_subset(&new_friend_module_ids) {
-            friend_linking = false;
+        if self.check_friend_linking {
+            let old_friend_module_ids: BTreeSet<_> =
+                old_module.immediate_friends().iter().cloned().collect();
+            let new_friend_module_ids: BTreeSet<_> =
+                new_module.immediate_friends().iter().cloned().collect();
+            if !old_friend_module_ids.is_subset(&new_friend_module_ids) {
+                errors.push(format!(
+                    "removed friend declaration {}",
+                    old_friend_module_ids
+                        .difference(&new_friend_module_ids)
+                        .map(|id| format!("`{}`", id))
+                        .collect::<Vec<_>>()
+                        .join(" and ")
+                ))
+            }
         }
 
-        if self.check_struct_and_pub_function_linking && !struct_and_pub_function_linking {
-            return Err(PartialVMError::new(
-                StatusCode::BACKWARD_INCOMPATIBLE_MODULE_UPDATE,
-            ).with_message(format!("Module Update Failure: Public function/struct signature of new module differs from existing module in {:?}::{}", old_module.address, old_module.name)));
-        }
-        if self.check_struct_layout && !struct_layout {
-            return Err(PartialVMError::new(
-                StatusCode::BACKWARD_INCOMPATIBLE_MODULE_UPDATE,
-            ).with_message(format!("Module Update Failure: Struct layout of new module differs from existing modul in {:?}::{}", old_module.address, old_module.name)));
+        if !errors.is_empty() {
+            Err(
+                PartialVMError::new(StatusCode::BACKWARD_INCOMPATIBLE_MODULE_UPDATE).with_message(
+                    format!(
+                        "Module update failure: new module not compatible with \
+                        existing module in `{}`: {}",
+                        old_view.id(),
+                        errors.join(", ")
+                    ),
+                ),
+            )
+        } else {
+            Ok(())
         }
-        if self.check_friend_linking && !friend_linking {
-            return Err(PartialVMError::new(
-                StatusCode::BACKWARD_INCOMPATIBLE_MODULE_UPDATE,
-            ).with_message(format!("Module Update Failure: Friend signature of new module differs from existing module in {:?}::{}", old_module.address, old_module.name)));
-        }
-
-        Ok(())
     }
 }
 
 // When upgrading, the new abilities must be a superset of the old abilities.
 // Adding an ability is fine, but removing an ability could cause existing usages to fail.
-fn struct_abilities_compatibile(old_abilities: AbilitySet, new_abilities: AbilitySet) -> bool {
+fn struct_abilities_compatible(old_abilities: AbilitySet, new_abilities: AbilitySet) -> bool {
     old_abilities.is_subset(new_abilities)
 }
 
 // When upgrading, the new type parameters must be the same length, and the new type parameter
 // constraints must be compatible
-fn fun_type_parameters_compatibile(
+fn fun_type_parameters_compatible(
     old_type_parameters: &[AbilitySet],
     new_type_parameters: &[AbilitySet],
 ) -> bool {
     old_type_parameters.len() == new_type_parameters.len()
         && old_type_parameters.iter().zip(new_type_parameters).all(
             |(old_type_parameter_constraint, new_type_parameter_constraint)| {
-                type_parameter_constraints_compatibile(
+                type_parameter_constraints_compatible(
                     *old_type_parameter_constraint,
                     *new_type_parameter_constraint,
                 )
@@ -232,15 +277,15 @@ fn fun_type_parameters_compatibile(
         )
 }
 
-fn struct_type_parameters_compatibile(
+fn struct_type_parameters_compatible(
     old_type_parameters: &[StructTypeParameter],
     new_type_parameters: &[StructTypeParameter],
 ) -> bool {
     old_type_parameters.len() == new_type_parameters.len()
         && old_type_parameters.iter().zip(new_type_parameters).all(
             |(old_type_parameter, new_type_parameter)| {
-                type_parameter_phantom_decl_compatibile(old_type_parameter, new_type_parameter)
-                    && type_parameter_constraints_compatibile(
+                type_parameter_phantom_decl_compatible(old_type_parameter, new_type_parameter)
+                    && type_parameter_constraints_compatible(
                         old_type_parameter.constraints,
                         new_type_parameter.constraints,
                     )
@@ -248,9 +293,132 @@ fn struct_type_parameters_compatibile(
         )
 }
 
+fn struct_layout_compatible(
+    old_struct: &StructDefinitionView<CompiledModule>,
+    new_struct: &StructDefinitionView<CompiledModule>,
+) -> bool {
+    if old_struct.variant_count() == 0 {
+        // Old is regular struct, new needs to be as well (i.e. have zero variants) and compatible
+        // fields.
+        new_struct.variant_count() == 0
+            && fields_compatible(
+                old_struct.fields_optional_variant(None),
+                new_struct.fields_optional_variant(None),
+            )
+    } else {
+        // Enum: the prefix of variants in the old definition must be the same as in the new one.
+        // (a) the variant names need to match
+        // (b) the variant fields need to be compatible
+        old_struct.variant_count() <= new_struct.variant_count()
+            && (0..old_struct.variant_count()).all(|i| {
+                let v_idx = i as VariantIndex;
+                old_struct.variant_name(v_idx) == new_struct.variant_name(v_idx)
+                    && fields_compatible(
+                        old_struct.fields_optional_variant(Some(v_idx)),
+                        new_struct.fields_optional_variant(Some(v_idx)),
+                    )
+            })
+    }
+}
+
+fn fields_compatible<'a, 'b>(
+    mut old_fields: impl Iterator<Item = FieldDefinitionView<'a, CompiledModule>>,
+    mut new_fields: impl Iterator<Item = FieldDefinitionView<'b, CompiledModule>>,
+) -> bool {
+    loop {
+        match (old_fields.next(), new_fields.next()) {
+            (Some(old_field), Some(new_field)) => {
+                // Require names and types to be equal. Notice this is a stricter definition
+                // than required. We could in principle choose that changing the name
+                // (but not position or type) of a field is compatible. The VM does not care about
+                // the name of a field but clients presumably do.
+                if old_field.name() != new_field.name()
+                    || !signature_token_compatible(
+                        old_field.module(),
+                        old_field.signature_token(),
+                        new_field.module(),
+                        new_field.signature_token(),
+                    )
+                {
+                    return false;
+                }
+            },
+            (None, None) => return true,
+            _ => return false,
+        }
+    }
+}
+
+fn signature_compatible(
+    old_module: &CompiledModule,
+    old_sig: &Signature,
+    new_module: &CompiledModule,
+    new_sig: &Signature,
+) -> bool {
+    old_sig.0.len() == new_sig.0.len()
+        && old_sig
+            .0
+            .iter()
+            .zip(new_sig.0.iter())
+            .all(|(old_tok, new_tok)| {
+                signature_token_compatible(old_module, old_tok, new_module, new_tok)
+            })
+}
+
+fn signature_token_compatible(
+    old_module: &CompiledModule,
+    old_tok: &SignatureToken,
+    new_module: &CompiledModule,
+    new_tok: &SignatureToken,
+) -> bool {
+    match (old_tok, new_tok) {
+        (SignatureToken::Reference(old_elem), SignatureToken::Reference(new_elem)) => {
+            signature_token_compatible(old_module, old_elem, new_module, new_elem)
+        },
+        (
+            SignatureToken::MutableReference(old_elem),
+            SignatureToken::MutableReference(new_elem),
+        ) => signature_token_compatible(old_module, old_elem, new_module, new_elem),
+        (SignatureToken::Vector(old_elem), SignatureToken::Vector(new_elem)) => {
+            signature_token_compatible(old_module, old_elem, new_module, new_elem)
+        },
+        (SignatureToken::Struct(old_handle), SignatureToken::Struct(new_handle)) => {
+            struct_equal(old_module, *old_handle, new_module, *new_handle)
+        },
+        (
+            SignatureToken::StructInstantiation(old_handle, old_args),
+            SignatureToken::StructInstantiation(new_handle, new_args),
+        ) => {
+            struct_equal(old_module, *old_handle, new_module, *new_handle)
+                && old_args.len() == new_args.len()
+                && (0..old_args.len()).all(|i| {
+                    signature_token_compatible(old_module, &old_args[i], new_module, &new_args[i])
+                })
+        },
+        _ => {
+            // Map to representation equality. Notice that after handling of the cases above,
+            // two signature tokens which have equal representation are also logically equal.
+            // This is _not_ the case if handles are involved: for instance, Struct(h1) and
+            // Struct(h2) can be different even if h1 == h2, but stem from different modules.
+            old_tok == new_tok
+        },
+    }
+}
+
+fn struct_equal(
+    old_module: &CompiledModule,
+    old_handle: StructHandleIndex,
+    new_module: &CompiledModule,
+    new_handle: StructHandleIndex,
+) -> bool {
+    let old_struct = StructHandleView::new(old_module, old_module.struct_handle_at(old_handle));
+    let new_struct = StructHandleView::new(new_module, new_module.struct_handle_at(new_handle));
+    old_struct.name() == new_struct.name() && old_struct.module_id() == new_struct.module_id()
+}
+
 // When upgrading, the new constraints must be a subset of (or equal to) the old constraints.
 // Removing an ability is fine, but adding an ability could cause existing callsites to fail
-fn type_parameter_constraints_compatibile(
+fn type_parameter_constraints_compatible(
     old_type_constraints: AbilitySet,
     new_type_constraints: AbilitySet,
 ) -> bool {
@@ -260,7 +428,7 @@ fn type_parameter_constraints_compatibile(
 // Adding a phantom annotation to a parameter won't break clients because that can only increase the
 // the set of abilities in struct instantiations. Put it differently, adding phantom declarations
 // relaxes the requirements for clients.
-fn type_parameter_phantom_decl_compatibile(
+fn type_parameter_phantom_decl_compatible(
     old_type_parameter: &StructTypeParameter,
     new_type_parameter: &StructTypeParameter,
 ) -> bool {
diff --git a/third_party/move/move-binary-format/src/compatibility_legacy.rs b/third_party/move/move-binary-format/src/compatibility_legacy.rs
new file mode 100644
index 0000000000000..a140863d65137
--- /dev/null
+++ b/third_party/move/move-binary-format/src/compatibility_legacy.rs
@@ -0,0 +1,217 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![allow(deprecated)]
+
+use crate::{
+    compatibility,
+    errors::{PartialVMError, PartialVMResult},
+    file_format::{AbilitySet, StructTypeParameter, Visibility},
+    file_format_common::VERSION_5,
+    normalized::Module,
+};
+use compatibility::Compatibility;
+use move_core_types::vm_status::StatusCode;
+use std::collections::BTreeSet;
+
+impl Compatibility {
+    /// Check compatibility for `new_module` relative to old module `old_module`.
+    pub fn legacy_check(&self, old_module: &Module, new_module: &Module) -> PartialVMResult<()> {
+        let mut struct_and_pub_function_linking = true;
+        let mut struct_layout = true;
+        let mut friend_linking = true;
+
+        // module's name and address are unchanged
+        if old_module.address != new_module.address || old_module.name != new_module.name {
+            struct_and_pub_function_linking = false;
+        }
+
+        // old module's structs are a subset of the new module's structs
+        for (name, old_struct) in &old_module.structs {
+            let new_struct = match new_module.structs.get(name) {
+                Some(new_struct) => new_struct,
+                None => {
+                    // Struct not present in new . Existing modules that depend on this struct will fail to link with the new version of the module.
+                    // Also, struct layout cannot be guaranteed transitively, because after
+                    // removing the struct, it could be re-added later with a different layout.
+                    struct_and_pub_function_linking = false;
+                    struct_layout = false;
+                    break;
+                },
+            };
+
+            if !struct_abilities_compatibile(old_struct.abilities, new_struct.abilities)
+                || !struct_type_parameters_compatibile(
+                    &old_struct.type_parameters,
+                    &new_struct.type_parameters,
+                )
+            {
+                struct_and_pub_function_linking = false;
+            }
+            if new_struct.fields != old_struct.fields {
+                // TODO(#13806): implement struct variants
+                // Fields changed. Code in this module will fail at runtime if it tries to
+                // read a previously published struct value
+                // TODO: this is a stricter definition than required. We could in principle
+                // choose that changing the name (but not position or type) of a field is
+                // compatible. The VM does not care about the name of a field
+                // (it's purely informational), but clients presumably do.
+                struct_layout = false
+            }
+        }
+
+        // The modules are considered as compatible function-wise when all the conditions are met:
+        //
+        // - old module's public functions are a subset of the new module's public functions
+        //   (i.e. we cannot remove or change public functions)
+        // - old module's script functions are a subset of the new module's script functions
+        //   (i.e. we cannot remove or change script functions)
+        // - for any friend function that is removed or changed in the old module
+        //   - if the function visibility is upgraded to public, it is OK
+        //   - otherwise, it is considered as incompatible.
+        //
+        // NOTE: it is possible to relax the compatibility checking for a friend function, i.e.,
+        // we can remove/change a friend function if the function is not used by any module in the
+        // friend list. But for simplicity, we decided to go to the more restrictive form now and
+        // we may revisit this in the future.
+        for (name, old_func) in &old_module.exposed_functions {
+            let new_func = match new_module.exposed_functions.get(name) {
+                Some(new_func) => new_func,
+                None => {
+                    if matches!(old_func.visibility, Visibility::Friend) {
+                        friend_linking = false;
+                    } else {
+                        struct_and_pub_function_linking = false;
+                    }
+                    continue;
+                },
+            };
+            let is_vis_compatible = match (old_func.visibility, new_func.visibility) {
+                // public must remain public
+                (Visibility::Public, Visibility::Public) => true,
+                (Visibility::Public, _) => false,
+                // friend can become public or remain friend
+                (Visibility::Friend, Visibility::Public)
+                | (Visibility::Friend, Visibility::Friend) => true,
+                (Visibility::Friend, _) => false,
+                // private can become public or friend, or stay private
+                (Visibility::Private, _) => true,
+            };
+            let is_entry_compatible = if old_module.file_format_version < VERSION_5
+                && new_module.file_format_version < VERSION_5
+            {
+                // if it was public(script), it must remain pubic(script)
+                // if it was not public(script), it _cannot_ become public(script)
+                old_func.is_entry == new_func.is_entry
+            } else {
+                // If it was an entry function, it must remain one.
+                // If it was not an entry function, it is allowed to become one.
+                !old_func.is_entry || new_func.is_entry
+            };
+            if !is_vis_compatible
+                || !is_entry_compatible
+                || old_func.parameters != new_func.parameters
+                || old_func.return_ != new_func.return_
+                || !fun_type_parameters_compatibile(
+                    &old_func.type_parameters,
+                    &new_func.type_parameters,
+                )
+            {
+                if matches!(old_func.visibility, Visibility::Friend) {
+                    friend_linking = false;
+                } else {
+                    struct_and_pub_function_linking = false;
+                }
+            }
+        }
+
+        // check friend declarations compatibility
+        //
+        // - additions to the list are allowed
+        // - removals are not allowed
+        //
+        let old_friend_module_ids: BTreeSet<_> = old_module.friends.iter().cloned().collect();
+        let new_friend_module_ids: BTreeSet<_> = new_module.friends.iter().cloned().collect();
+        if !old_friend_module_ids.is_subset(&new_friend_module_ids) {
+            friend_linking = false;
+        }
+
+        if self.check_struct_and_pub_function_linking && !struct_and_pub_function_linking {
+            return Err(PartialVMError::new(
+                StatusCode::BACKWARD_INCOMPATIBLE_MODULE_UPDATE,
+            ).with_message(format!("Module Update Failure: Public function/struct signature of new module differs from existing module in {:?}::{}", old_module.address, old_module.name)));
+        }
+        if self.check_struct_layout && !struct_layout {
+            return Err(PartialVMError::new(
+                StatusCode::BACKWARD_INCOMPATIBLE_MODULE_UPDATE,
+            ).with_message(format!("Module Update Failure: Struct layout of new module differs from existing modul in {:?}::{}", old_module.address, old_module.name)));
+        }
+        if self.check_friend_linking && !friend_linking {
+            return Err(PartialVMError::new(
+                StatusCode::BACKWARD_INCOMPATIBLE_MODULE_UPDATE,
+            ).with_message(format!("Module Update Failure: Friend signature of new module differs from existing module in {:?}::{}", old_module.address, old_module.name)));
+        }
+
+        Ok(())
+    }
+}
+
+// When upgrading, the new abilities must be a superset of the old abilities.
+// Adding an ability is fine, but removing an ability could cause existing usages to fail.
+fn struct_abilities_compatibile(old_abilities: AbilitySet, new_abilities: AbilitySet) -> bool {
+    old_abilities.is_subset(new_abilities)
+}
+
+// When upgrading, the new type parameters must be the same length, and the new type parameter
+// constraints must be compatible
+fn fun_type_parameters_compatibile(
+    old_type_parameters: &[AbilitySet],
+    new_type_parameters: &[AbilitySet],
+) -> bool {
+    old_type_parameters.len() == new_type_parameters.len()
+        && old_type_parameters.iter().zip(new_type_parameters).all(
+            |(old_type_parameter_constraint, new_type_parameter_constraint)| {
+                type_parameter_constraints_compatibile(
+                    *old_type_parameter_constraint,
+                    *new_type_parameter_constraint,
+                )
+            },
+        )
+}
+
+fn struct_type_parameters_compatibile(
+    old_type_parameters: &[StructTypeParameter],
+    new_type_parameters: &[StructTypeParameter],
+) -> bool {
+    old_type_parameters.len() == new_type_parameters.len()
+        && old_type_parameters.iter().zip(new_type_parameters).all(
+            |(old_type_parameter, new_type_parameter)| {
+                type_parameter_phantom_decl_compatibile(old_type_parameter, new_type_parameter)
+                    && type_parameter_constraints_compatibile(
+                        old_type_parameter.constraints,
+                        new_type_parameter.constraints,
+                    )
+            },
+        )
+}
+
+// When upgrading, the new constraints must be a subset of (or equal to) the old constraints.
+// Removing an ability is fine, but adding an ability could cause existing callsites to fail
+fn type_parameter_constraints_compatibile(
+    old_type_constraints: AbilitySet,
+    new_type_constraints: AbilitySet,
+) -> bool {
+    new_type_constraints.is_subset(old_type_constraints)
+}
+
+// Adding a phantom annotation to a parameter won't break clients because that can only increase the
+// the set of abilities in struct instantiations. Put it differently, adding phantom declarations
+// relaxes the requirements for clients.
+fn type_parameter_phantom_decl_compatibile(
+    old_type_parameter: &StructTypeParameter,
+    new_type_parameter: &StructTypeParameter,
+) -> bool {
+    // old_type_paramter.is_phantom => new_type_parameter.is_phantom
+    !old_type_parameter.is_phantom || new_type_parameter.is_phantom
+}
diff --git a/third_party/move/move-binary-format/src/deserializer.rs b/third_party/move/move-binary-format/src/deserializer.rs
index e08231e0e0b14..98a10e62096a3 100644
--- a/third_party/move/move-binary-format/src/deserializer.rs
+++ b/third_party/move/move-binary-format/src/deserializer.rs
@@ -87,6 +87,14 @@ impl DeserializerConfig {
     }
 }
 
+impl Default for DeserializerConfig {
+    fn default() -> Self {
+        // Note that here version max is used as a default version, as this how
+        // it was previously defined in VM config.
+        Self::new(VERSION_MAX, IDENTIFIER_SIZE_MAX)
+    }
+}
+
 /// Table info: table type, offset where the table content starts from, count of bytes for
 /// the table content.
 #[derive(Clone, Debug)]
@@ -277,6 +285,42 @@ fn load_struct_def_inst_index(
     )?))
 }
 
+fn load_variant_field_handle_index(
+    cursor: &mut VersionedCursor,
+) -> BinaryLoaderResult<VariantFieldHandleIndex> {
+    Ok(VariantFieldHandleIndex(read_uleb_internal(
+        cursor,
+        TABLE_INDEX_MAX,
+    )?))
+}
+
+fn load_variant_field_inst_index(
+    cursor: &mut VersionedCursor,
+) -> BinaryLoaderResult<VariantFieldInstantiationIndex> {
+    Ok(VariantFieldInstantiationIndex(read_uleb_internal(
+        cursor,
+        TABLE_INDEX_MAX,
+    )?))
+}
+
+fn load_struct_variant_handle_index(
+    cursor: &mut VersionedCursor,
+) -> BinaryLoaderResult<StructVariantHandleIndex> {
+    Ok(StructVariantHandleIndex(read_uleb_internal(
+        cursor,
+        TABLE_INDEX_MAX,
+    )?))
+}
+
+fn load_struct_variant_inst_index(
+    cursor: &mut VersionedCursor,
+) -> BinaryLoaderResult<StructVariantInstantiationIndex> {
+    Ok(StructVariantInstantiationIndex(read_uleb_internal(
+        cursor,
+        TABLE_INDEX_MAX,
+    )?))
+}
+
 fn load_constant_pool_index(cursor: &mut VersionedCursor) -> BinaryLoaderResult<ConstantPoolIndex> {
     Ok(ConstantPoolIndex(read_uleb_internal(
         cursor,
@@ -300,6 +344,10 @@ fn load_field_count(cursor: &mut VersionedCursor) -> BinaryLoaderResult<u64> {
     read_uleb_internal(cursor, FIELD_COUNT_MAX)
 }
 
+fn load_variant_count(cursor: &mut VersionedCursor) -> BinaryLoaderResult<u64> {
+    read_uleb_internal(cursor, VARIANT_COUNT_MAX)
+}
+
 fn load_type_parameter_count(cursor: &mut VersionedCursor) -> BinaryLoaderResult<usize> {
     read_uleb_internal(cursor, TYPE_PARAMETER_COUNT_MAX)
 }
@@ -336,6 +384,10 @@ fn load_field_offset(cursor: &mut VersionedCursor) -> BinaryLoaderResult<u16> {
     read_uleb_internal(cursor, FIELD_OFFSET_MAX)
 }
 
+fn load_variant_offset(cursor: &mut VersionedCursor) -> BinaryLoaderResult<u16> {
+    read_uleb_internal(cursor, VARIANT_OFFSET_MAX)
+}
+
 fn load_table_count(cursor: &mut VersionedCursor) -> BinaryLoaderResult<u8> {
     read_uleb_internal(cursor, TABLE_COUNT_MAX)
 }
@@ -493,6 +545,23 @@ fn check_tables(tables: &mut Vec<Table>, binary_len: usize) -> BinaryLoaderResul
     Ok(current_offset)
 }
 
+impl Table {
+    /// Generic function to deserialize a table into a vector of given type.
+    fn load<T>(
+        &self,
+        binary: &VersionedBinary,
+        result: &mut Vec<T>,
+        deserializer: impl Fn(&mut VersionedCursor) -> BinaryLoaderResult<T>,
+    ) -> BinaryLoaderResult<()> {
+        let start = self.offset as usize;
+        let end = start + self.count as usize;
+        let mut cursor = binary.new_cursor(start, end);
+        while cursor.position() < self.count as u64 {
+            result.push(deserializer(&mut cursor)?)
+        }
+        Ok(())
+    }
+}
 //
 // Trait to read common tables from CompiledScript or CompiledModule
 //
@@ -616,22 +685,28 @@ fn build_common_tables(
     for table in tables {
         match table.kind {
             TableType::MODULE_HANDLES => {
-                load_module_handles(binary, table, common.get_module_handles())?;
+                table.load(binary, common.get_module_handles(), load_module_handle)?;
             },
             TableType::STRUCT_HANDLES => {
-                load_struct_handles(binary, table, common.get_struct_handles())?;
+                table.load(binary, common.get_struct_handles(), load_struct_handle)?;
             },
             TableType::FUNCTION_HANDLES => {
-                load_function_handles(binary, table, common.get_function_handles())?;
+                table.load(binary, common.get_function_handles(), |cursor| {
+                    load_function_handle(binary.version(), cursor)
+                })?;
             },
             TableType::FUNCTION_INST => {
-                load_function_instantiations(binary, table, common.get_function_instantiations())?;
+                table.load(
+                    binary,
+                    common.get_function_instantiations(),
+                    load_function_instantiation,
+                )?;
             },
             TableType::SIGNATURES => {
-                load_signatures(binary, table, common.get_signatures())?;
+                table.load(binary, common.get_signatures(), load_signature)?;
             },
             TableType::CONSTANT_POOL => {
-                load_constant_pool(binary, table, common.get_constant_pool())?;
+                table.load(binary, common.get_constant_pool(), load_constant)?;
             },
             TableType::METADATA => {
                 if binary.version() < VERSION_5 {
@@ -642,18 +717,22 @@ fn build_common_tables(
                         )),
                     );
                 }
-                load_metadata(binary, table, common.get_metadata())?;
+                table.load(binary, common.get_metadata(), load_metadata_entry)?;
             },
             TableType::IDENTIFIERS => {
-                load_identifiers(binary, table, common.get_identifiers())?;
+                table.load(binary, common.get_identifiers(), load_identifier)?;
             },
             TableType::ADDRESS_IDENTIFIERS => {
-                load_address_identifiers(binary, table, common.get_address_identifiers())?;
+                table.load(
+                    binary,
+                    common.get_address_identifiers(),
+                    load_address_identifier,
+                )?;
             },
             TableType::FUNCTION_DEFS
             | TableType::STRUCT_DEFS
             | TableType::STRUCT_DEF_INST
-            | TableType::FIELD_HANDLE
+            | TableType::FIELD_HANDLES
             | TableType::FIELD_INST => continue,
             TableType::FRIEND_DECLS => {
                 // friend declarations do not exist before VERSION_2
@@ -664,6 +743,19 @@ fn build_common_tables(
                 }
                 continue;
             },
+            TableType::VARIANT_FIELD_HANDLES
+            | TableType::VARIANT_FIELD_INST
+            | TableType::STRUCT_VARIANT_HANDLES
+            | TableType::STRUCT_VARIANT_INST => {
+                if binary.version() < VERSION_7 {
+                    return Err(
+                        PartialVMError::new(StatusCode::MALFORMED).with_message(format!(
+                            "Enum types not available for bytecode version {}",
+                            binary.version()
+                        )),
+                    );
+                }
+            },
         }
     }
     Ok(())
@@ -678,23 +770,60 @@ fn build_module_tables(
     for table in tables {
         match table.kind {
             TableType::STRUCT_DEFS => {
-                load_struct_defs(binary, table, &mut module.struct_defs)?;
+                table.load(binary, &mut module.struct_defs, load_struct_def)?;
             },
             TableType::STRUCT_DEF_INST => {
-                load_struct_instantiations(binary, table, &mut module.struct_def_instantiations)?;
+                table.load(
+                    binary,
+                    &mut module.struct_def_instantiations,
+                    load_struct_instantiation,
+                )?;
             },
             TableType::FUNCTION_DEFS => {
-                load_function_defs(binary, table, &mut module.function_defs)?;
+                table.load(binary, &mut module.function_defs, load_function_def)?;
             },
-            TableType::FIELD_HANDLE => {
-                load_field_handles(binary, table, &mut module.field_handles)?;
+            TableType::FIELD_HANDLES => {
+                table.load(binary, &mut module.field_handles, load_field_handle)?;
             },
             TableType::FIELD_INST => {
-                load_field_instantiations(binary, table, &mut module.field_instantiations)?;
+                table.load(
+                    binary,
+                    &mut module.field_instantiations,
+                    load_field_instantiation,
+                )?;
             },
             TableType::FRIEND_DECLS => {
-                load_module_handles(binary, table, &mut module.friend_decls)?;
+                table.load(binary, &mut module.friend_decls, load_module_handle)?;
+            },
+            TableType::VARIANT_FIELD_HANDLES => {
+                table.load(
+                    binary,
+                    &mut module.variant_field_handles,
+                    load_variant_field_handle,
+                )?;
+            },
+            TableType::VARIANT_FIELD_INST => {
+                table.load(
+                    binary,
+                    &mut module.variant_field_instantiations,
+                    load_variant_field_instantiation,
+                )?;
             },
+            TableType::STRUCT_VARIANT_HANDLES => {
+                table.load(
+                    binary,
+                    &mut module.struct_variant_handles,
+                    load_struct_variant_handle,
+                )?;
+            },
+            TableType::STRUCT_VARIANT_INST => {
+                table.load(
+                    binary,
+                    &mut module.struct_variant_instantiations,
+                    load_struct_variant_instantiation,
+                )?;
+            },
+            // The remaining are handled via common tables
             TableType::MODULE_HANDLES
             | TableType::STRUCT_HANDLES
             | TableType::FUNCTION_HANDLES
@@ -734,8 +863,12 @@ fn build_script_tables(
             | TableType::STRUCT_DEF_INST
             | TableType::FUNCTION_DEFS
             | TableType::FIELD_INST
-            | TableType::FIELD_HANDLE
-            | TableType::FRIEND_DECLS => {
+            | TableType::FIELD_HANDLES
+            | TableType::FRIEND_DECLS
+            | TableType::VARIANT_FIELD_HANDLES
+            | TableType::VARIANT_FIELD_INST
+            | TableType::STRUCT_VARIANT_HANDLES
+            | TableType::STRUCT_VARIANT_INST => {
                 return Err(PartialVMError::new(StatusCode::MALFORMED)
                     .with_message("Bad table in Script".to_string()));
             },
@@ -744,213 +877,109 @@ fn build_script_tables(
     Ok(())
 }
 
-/// Builds the `ModuleHandle` table.
-fn load_module_handles(
-    binary: &VersionedBinary,
-    table: &Table,
-    module_handles: &mut Vec<ModuleHandle>,
-) -> BinaryLoaderResult<()> {
-    let start = table.offset as usize;
-    let end = start + table.count as usize;
-    let mut cursor = binary.new_cursor(start, end);
-    while cursor.position() < table.count as u64 {
-        let address = load_address_identifier_index(&mut cursor)?;
-        let name = load_identifier_index(&mut cursor)?;
-        module_handles.push(ModuleHandle { address, name });
-    }
-    Ok(())
+fn load_module_handle(cursor: &mut VersionedCursor) -> Result<ModuleHandle, PartialVMError> {
+    let address = load_address_identifier_index(cursor)?;
+    let name = load_identifier_index(cursor)?;
+    Ok(ModuleHandle { address, name })
 }
 
-/// Builds the `StructHandle` table.
-fn load_struct_handles(
-    binary: &VersionedBinary,
-    table: &Table,
-    struct_handles: &mut Vec<StructHandle>,
-) -> BinaryLoaderResult<()> {
-    let start = table.offset as usize;
-    let end = start + table.count as usize;
-    let mut cursor = binary.new_cursor(start, end);
-    while cursor.position() < table.count as u64 {
-        let module = load_module_handle_index(&mut cursor)?;
-        let name = load_identifier_index(&mut cursor)?;
-        let abilities = load_ability_set(&mut cursor, AbilitySetPosition::StructHandle)?;
-        let type_parameters = load_struct_type_parameters(&mut cursor)?;
-        struct_handles.push(StructHandle {
-            module,
-            name,
-            abilities,
-            type_parameters,
-        });
-    }
-    Ok(())
+fn load_struct_handle(cursor: &mut VersionedCursor) -> Result<StructHandle, PartialVMError> {
+    let module = load_module_handle_index(cursor)?;
+    let name = load_identifier_index(cursor)?;
+    let abilities = load_ability_set(cursor, AbilitySetPosition::StructHandle)?;
+    let type_parameters = load_struct_type_parameters(cursor)?;
+    Ok(StructHandle {
+        module,
+        name,
+        abilities,
+        type_parameters,
+    })
 }
 
-/// Builds the `FunctionHandle` table.
-fn load_function_handles(
-    binary: &VersionedBinary,
-    table: &Table,
-    function_handles: &mut Vec<FunctionHandle>,
-) -> BinaryLoaderResult<()> {
-    let start = table.offset as usize;
-    let end = start + table.count as usize;
-    let mut cursor = binary.new_cursor(start, end);
-    while cursor.position() < table.count as u64 {
-        let module = load_module_handle_index(&mut cursor)?;
-        let name = load_identifier_index(&mut cursor)?;
-        let parameters = load_signature_index(&mut cursor)?;
-        let return_ = load_signature_index(&mut cursor)?;
-        let type_parameters =
-            load_ability_sets(&mut cursor, AbilitySetPosition::FunctionTypeParameters)?;
-
-        let accesses = if binary.version() >= VERSION_7 {
-            load_access_specifiers(&mut cursor)?
-        } else {
-            None
-        };
+fn load_function_handle(
+    version: u32,
+    cursor: &mut VersionedCursor,
+) -> Result<FunctionHandle, PartialVMError> {
+    let module = load_module_handle_index(cursor)?;
+    let name = load_identifier_index(cursor)?;
+    let parameters = load_signature_index(cursor)?;
+    let return_ = load_signature_index(cursor)?;
+    let type_parameters = load_ability_sets(cursor, AbilitySetPosition::FunctionTypeParameters)?;
 
-        function_handles.push(FunctionHandle {
-            module,
-            name,
-            parameters,
-            return_,
-            type_parameters,
-            access_specifiers: accesses,
-        });
-    }
-    Ok(())
-}
+    let accesses = if version >= VERSION_7 {
+        load_access_specifiers(cursor)?
+    } else {
+        None
+    };
 
-/// Builds the `StructInstantiation` table.
-fn load_struct_instantiations(
-    binary: &VersionedBinary,
-    table: &Table,
-    struct_insts: &mut Vec<StructDefInstantiation>,
-) -> BinaryLoaderResult<()> {
-    let start = table.offset as usize;
-    let end = start + table.count as usize;
-    let mut cursor = binary.new_cursor(start, end);
-
-    while cursor.position() < table.count as u64 {
-        let def = load_struct_def_index(&mut cursor)?;
-        let type_parameters = load_signature_index(&mut cursor)?;
-        struct_insts.push(StructDefInstantiation {
-            def,
-            type_parameters,
-        });
-    }
-    Ok(())
+    Ok(FunctionHandle {
+        module,
+        name,
+        parameters,
+        return_,
+        type_parameters,
+        access_specifiers: accesses,
+    })
 }
 
-/// Builds the `FunctionInstantiation` table.
-fn load_function_instantiations(
-    binary: &VersionedBinary,
-    table: &Table,
-    func_insts: &mut Vec<FunctionInstantiation>,
-) -> BinaryLoaderResult<()> {
-    let start = table.offset as usize;
-    let end = start + table.count as usize;
-    let mut cursor = binary.new_cursor(start, end);
-    while cursor.position() < table.count as u64 {
-        let handle = load_function_handle_index(&mut cursor)?;
-        let type_parameters = load_signature_index(&mut cursor)?;
-        func_insts.push(FunctionInstantiation {
-            handle,
-            type_parameters,
-        });
-    }
-    Ok(())
+fn load_struct_instantiation(
+    cursor: &mut VersionedCursor,
+) -> Result<StructDefInstantiation, PartialVMError> {
+    let def = load_struct_def_index(cursor)?;
+    let type_parameters = load_signature_index(cursor)?;
+    Ok(StructDefInstantiation {
+        def,
+        type_parameters,
+    })
 }
 
-/// Builds the `IdentifierPool`.
-fn load_identifiers(
-    binary: &VersionedBinary,
-    table: &Table,
-    identifiers: &mut IdentifierPool,
-) -> BinaryLoaderResult<()> {
-    let start = table.offset as usize;
-    let end = start + table.count as usize;
-    let mut cursor = binary.new_cursor(start, end);
-    while cursor.position() < u64::from(table.count) {
-        let size = load_identifier_size(&mut cursor)?;
-        let mut buffer: Vec<u8> = vec![0u8; size];
-        if let Ok(count) = cursor.read(&mut buffer) {
-            if count != size {
-                return Err(PartialVMError::new(StatusCode::MALFORMED)
-                    .with_message("Bad Identifier pool size".to_string()));
-            }
-            let s = Identifier::from_utf8(buffer).map_err(|_| {
-                PartialVMError::new(StatusCode::MALFORMED)
-                    .with_message("Invalid Identifier".to_string())
-            })?;
-            identifiers.push(s);
-        }
-    }
-    Ok(())
+fn load_function_instantiation(
+    cursor: &mut VersionedCursor,
+) -> Result<FunctionInstantiation, PartialVMError> {
+    let handle = load_function_handle_index(cursor)?;
+    let type_parameters = load_signature_index(cursor)?;
+    Ok(FunctionInstantiation {
+        handle,
+        type_parameters,
+    })
 }
 
-/// Builds the `AddressIdentifierPool`.
-fn load_address_identifiers(
-    binary: &VersionedBinary,
-    table: &Table,
-    addresses: &mut AddressIdentifierPool,
-) -> BinaryLoaderResult<()> {
-    let mut start = table.offset as usize;
-    if table.count as usize % AccountAddress::LENGTH != 0 {
-        return Err(PartialVMError::new(StatusCode::MALFORMED)
-            .with_message("Bad Address Identifier pool size".to_string()));
-    }
-    for _i in 0..table.count as usize / AccountAddress::LENGTH {
-        let end_addr = start + AccountAddress::LENGTH;
-        let address = binary.slice(start, end_addr).try_into();
-        if address.is_err() {
-            return Err(PartialVMError::new(StatusCode::MALFORMED)
-                .with_message("Invalid Address format".to_string()));
-        }
-        start = end_addr;
-
-        addresses.push(address.unwrap());
+fn load_identifier(cursor: &mut VersionedCursor) -> BinaryLoaderResult<Identifier> {
+    let size = load_identifier_size(cursor)?;
+    let mut buffer: Vec<u8> = vec![0u8; size];
+    if !cursor.read(&mut buffer).map(|count| count == size).unwrap() {
+        Err(PartialVMError::new(StatusCode::MALFORMED)
+            .with_message("Bad Identifier pool size".to_string()))?
     }
-    Ok(())
+    Identifier::from_utf8(buffer).map_err(|_| {
+        PartialVMError::new(StatusCode::MALFORMED).with_message("Invalid Identifier".to_string())
+    })
 }
 
-/// Builds the `ConstantPool`.
-fn load_constant_pool(
-    binary: &VersionedBinary,
-    table: &Table,
-    constants: &mut ConstantPool,
-) -> BinaryLoaderResult<()> {
-    let start = table.offset as usize;
-    let end = start + table.count as usize;
-    let mut cursor = binary.new_cursor(start, end);
-    while cursor.position() < u64::from(table.count) {
-        constants.push(load_constant(&mut cursor)?)
+fn load_address_identifier(cursor: &mut VersionedCursor) -> BinaryLoaderResult<AccountAddress> {
+    let mut buffer: Vec<u8> = vec![0u8; AccountAddress::LENGTH];
+    if !cursor
+        .read(&mut buffer)
+        .map(|count| count == AccountAddress::LENGTH)
+        .unwrap()
+    {
+        Err(PartialVMError::new(StatusCode::MALFORMED)
+            .with_message("Bad Address pool size".to_string()))?
     }
-    Ok(())
+    buffer.try_into().map_err(|_| {
+        PartialVMError::new(StatusCode::MALFORMED)
+            .with_message("Invalid Address format".to_string())
+    })
 }
 
-/// Build a single `Constant`
+/// Build a `Constant`
 fn load_constant(cursor: &mut VersionedCursor) -> BinaryLoaderResult<Constant> {
     let type_ = load_signature_token(cursor)?;
     let data = load_byte_blob(cursor, load_constant_size)?;
     Ok(Constant { type_, data })
 }
 
-/// Builds a metadata vector.
-fn load_metadata(
-    binary: &VersionedBinary,
-    table: &Table,
-    metadata: &mut Vec<Metadata>,
-) -> BinaryLoaderResult<()> {
-    let start = table.offset as usize;
-    let end = start + table.count as usize;
-    let mut cursor = binary.new_cursor(start, end);
-    while cursor.position() < u64::from(table.count) {
-        metadata.push(load_metadata_entry(&mut cursor)?)
-    }
-    Ok(())
-}
-
-/// Build a single metadata entry.
+/// Build a metadata entry.
 fn load_metadata_entry(cursor: &mut VersionedCursor) -> BinaryLoaderResult<Metadata> {
     let key = load_byte_blob(cursor, load_metadata_key_size)?;
     let value = load_byte_blob(cursor, load_metadata_value_size)?;
@@ -975,19 +1004,8 @@ fn load_byte_blob(
     Ok(data)
 }
 
-/// Builds the `SignaturePool`.
-fn load_signatures(
-    binary: &VersionedBinary,
-    table: &Table,
-    signatures: &mut SignaturePool,
-) -> BinaryLoaderResult<()> {
-    let start = table.offset as usize;
-    let end = start + table.count as usize;
-    let mut cursor = binary.new_cursor(start, end);
-    while cursor.position() < u64::from(table.count) {
-        signatures.push(Signature(load_signature_tokens(&mut cursor)?));
-    }
-    Ok(())
+fn load_signature(cursor: &mut VersionedCursor) -> BinaryLoaderResult<Signature> {
+    Ok(Signature(load_signature_tokens(cursor)?))
 }
 
 fn load_signature_tokens(cursor: &mut VersionedCursor) -> BinaryLoaderResult<Vec<SignatureToken>> {
@@ -1344,37 +1362,39 @@ fn load_struct_type_parameter(
     })
 }
 
-/// Builds the `StructDefinition` table.
-fn load_struct_defs(
-    binary: &VersionedBinary,
-    table: &Table,
-    struct_defs: &mut Vec<StructDefinition>,
-) -> BinaryLoaderResult<()> {
-    let start = table.offset as usize;
-    let end = start + table.count as usize;
-    let mut cursor = binary.new_cursor(start, end);
-    while cursor.position() < u64::from(table.count) {
-        let struct_handle = load_struct_handle_index(&mut cursor)?;
-        let field_information_flag = match cursor.read_u8() {
-            Ok(byte) => SerializedNativeStructFlag::from_u8(byte)?,
-            Err(_) => {
-                return Err(PartialVMError::new(StatusCode::MALFORMED)
-                    .with_message("Invalid field info in struct".to_string()));
-            },
-        };
-        let field_information = match field_information_flag {
-            SerializedNativeStructFlag::NATIVE => StructFieldInformation::Native,
-            SerializedNativeStructFlag::DECLARED => {
-                let fields = load_field_defs(&mut cursor)?;
-                StructFieldInformation::Declared(fields)
-            },
-        };
-        struct_defs.push(StructDefinition {
-            struct_handle,
-            field_information,
-        });
-    }
-    Ok(())
+fn load_struct_def(cursor: &mut VersionedCursor) -> BinaryLoaderResult<StructDefinition> {
+    let struct_handle = load_struct_handle_index(cursor)?;
+    let field_information_flag = match cursor.read_u8() {
+        Ok(byte) => SerializedNativeStructFlag::from_u8(byte)?,
+        Err(_) => {
+            return Err(PartialVMError::new(StatusCode::MALFORMED)
+                .with_message("Invalid field info in struct".to_string()));
+        },
+    };
+    let field_information = match field_information_flag {
+        SerializedNativeStructFlag::NATIVE => StructFieldInformation::Native,
+        SerializedNativeStructFlag::DECLARED => {
+            let fields = load_field_defs(cursor)?;
+            StructFieldInformation::Declared(fields)
+        },
+        SerializedNativeStructFlag::DECLARED_VARIANTS => {
+            if cursor.version() >= VERSION_7 {
+                let variants = load_variants(cursor)?;
+                StructFieldInformation::DeclaredVariants(variants)
+            } else {
+                return Err(
+                    PartialVMError::new(StatusCode::MALFORMED).with_message(format!(
+                        "Enum types not supported in version {}",
+                        cursor.version()
+                    )),
+                );
+            }
+        },
+    };
+    Ok(StructDefinition {
+        struct_handle,
+        field_information,
+    })
 }
 
 fn load_field_defs(cursor: &mut VersionedCursor) -> BinaryLoaderResult<Vec<FieldDefinition>> {
@@ -1395,64 +1415,90 @@ fn load_field_def(cursor: &mut VersionedCursor) -> BinaryLoaderResult<FieldDefin
     })
 }
 
-/// Builds the `FunctionDefinition` table.
-fn load_function_defs(
-    binary: &VersionedBinary,
-    table: &Table,
-    func_defs: &mut Vec<FunctionDefinition>,
-) -> BinaryLoaderResult<()> {
-    let start = table.offset as usize;
-    let end = start + table.count as usize;
-    let mut cursor = binary.new_cursor(start, end);
-    while cursor.position() < u64::from(table.count) {
-        let func_def = load_function_def(&mut cursor)?;
-        func_defs.push(func_def);
+fn load_variants(cursor: &mut VersionedCursor) -> BinaryLoaderResult<Vec<VariantDefinition>> {
+    let mut variants = Vec::new();
+    let variant_count = load_variant_count(cursor)?;
+    for _ in 0..variant_count {
+        variants.push(load_variant(cursor)?);
     }
-    Ok(())
+    Ok(variants)
 }
 
-fn load_field_handles(
-    binary: &VersionedBinary,
-    table: &Table,
-    field_handles: &mut Vec<FieldHandle>,
-) -> BinaryLoaderResult<()> {
-    let start = table.offset as usize;
-    let end = start + table.count as usize;
-    let mut cursor = binary.new_cursor(start, end);
-    loop {
-        if cursor.position() == u64::from(table.count) {
-            break;
-        }
-        let struct_idx = load_struct_def_index(&mut cursor)?;
-        let offset = load_field_offset(&mut cursor)?;
-        field_handles.push(FieldHandle {
-            owner: struct_idx,
-            field: offset,
-        });
-    }
-    Ok(())
+#[inline(always)]
+fn load_variant(cursor: &mut VersionedCursor) -> BinaryLoaderResult<VariantDefinition> {
+    let name = load_identifier_index(cursor)?;
+    let fields = load_field_defs(cursor)?;
+    Ok(VariantDefinition { name, fields })
 }
 
-fn load_field_instantiations(
-    binary: &VersionedBinary,
-    table: &Table,
-    field_insts: &mut Vec<FieldInstantiation>,
-) -> BinaryLoaderResult<()> {
-    let start = table.offset as usize;
-    let end = start + table.count as usize;
-    let mut cursor = binary.new_cursor(start, end);
-    loop {
-        if cursor.position() == u64::from(table.count) {
-            break;
-        }
-        let handle = load_field_handle_index(&mut cursor)?;
-        let type_parameters = load_signature_index(&mut cursor)?;
-        field_insts.push(FieldInstantiation {
-            handle,
-            type_parameters,
-        });
-    }
-    Ok(())
+fn load_field_handle(cursor: &mut VersionedCursor) -> Result<FieldHandle, PartialVMError> {
+    let struct_idx = load_struct_def_index(cursor)?;
+    let offset = load_field_offset(cursor)?;
+    Ok(FieldHandle {
+        owner: struct_idx,
+        field: offset,
+    })
+}
+
+fn load_field_instantiation(
+    cursor: &mut VersionedCursor,
+) -> Result<FieldInstantiation, PartialVMError> {
+    let handle = load_field_handle_index(cursor)?;
+    let type_parameters = load_signature_index(cursor)?;
+    Ok(FieldInstantiation {
+        handle,
+        type_parameters,
+    })
+}
+
+fn load_variant_field_handle(
+    cursor: &mut VersionedCursor,
+) -> Result<VariantFieldHandle, PartialVMError> {
+    let owner = load_struct_def_index(cursor)?;
+    let offset = load_field_offset(cursor)?;
+    let variant_count = load_variant_count(cursor)?;
+    let mut variants = vec![];
+    for _ in 0..variant_count {
+        variants.push(load_variant_offset(cursor)?)
+    }
+    Ok(VariantFieldHandle {
+        struct_index: owner,
+        variants,
+        field: offset,
+    })
+}
+
+fn load_variant_field_instantiation(
+    cursor: &mut VersionedCursor,
+) -> Result<VariantFieldInstantiation, PartialVMError> {
+    let handle = load_variant_field_handle_index(cursor)?;
+    let type_parameters = load_signature_index(cursor)?;
+    Ok(VariantFieldInstantiation {
+        handle,
+        type_parameters,
+    })
+}
+
+fn load_struct_variant_handle(
+    cursor: &mut VersionedCursor,
+) -> Result<StructVariantHandle, PartialVMError> {
+    let struct_index = load_struct_def_index(cursor)?;
+    let variant = load_variant_offset(cursor)?;
+    Ok(StructVariantHandle {
+        struct_index,
+        variant,
+    })
+}
+
+fn load_struct_variant_instantiation(
+    cursor: &mut VersionedCursor,
+) -> Result<StructVariantInstantiation, PartialVMError> {
+    let handle = load_struct_variant_handle_index(cursor)?;
+    let type_parameters = load_signature_index(cursor)?;
+    Ok(StructVariantInstantiation {
+        handle,
+        type_parameters,
+    })
 }
 
 /// Deserializes a `FunctionDefinition`.
@@ -1573,15 +1619,32 @@ fn load_code(cursor: &mut VersionedCursor, code: &mut Vec<Bytecode>) -> BinaryLo
             | Opcodes::VEC_PUSH_BACK
             | Opcodes::VEC_POP_BACK
             | Opcodes::VEC_UNPACK
-            | Opcodes::VEC_SWAP => {
-                if cursor.version() < VERSION_4 {
-                    return Err(
-                        PartialVMError::new(StatusCode::MALFORMED).with_message(format!(
-                            "Vector operations not available before bytecode version {}",
-                            VERSION_4
-                        )),
-                    );
-                }
+            | Opcodes::VEC_SWAP
+                if cursor.version() < VERSION_4 =>
+            {
+                return Err(
+                    PartialVMError::new(StatusCode::MALFORMED).with_message(format!(
+                        "Vector operations not available before bytecode version {}",
+                        VERSION_4
+                    )),
+                );
+            },
+            Opcodes::TEST_VARIANT
+            | Opcodes::TEST_VARIANT_GENERIC
+            | Opcodes::PACK_VARIANT
+            | Opcodes::PACK_VARIANT_GENERIC
+            | Opcodes::IMM_BORROW_VARIANT_FIELD
+            | Opcodes::IMM_BORROW_VARIANT_FIELD_GENERIC
+            | Opcodes::MUT_BORROW_VARIANT_FIELD
+            | Opcodes::MUT_BORROW_VARIANT_FIELD_GENERIC
+                if cursor.version() < VERSION_7 =>
+            {
+                return Err(
+                    PartialVMError::new(StatusCode::MALFORMED).with_message(format!(
+                        "Enum type operations not available before bytecode version {}",
+                        VERSION_7
+                    )),
+                );
             },
             _ => {},
         };
@@ -1646,12 +1709,42 @@ fn load_code(cursor: &mut VersionedCursor, code: &mut Vec<Bytecode>) -> BinaryLo
             Opcodes::IMM_BORROW_FIELD_GENERIC => {
                 Bytecode::ImmBorrowFieldGeneric(load_field_inst_index(cursor)?)
             },
+            Opcodes::MUT_BORROW_VARIANT_FIELD => {
+                Bytecode::MutBorrowVariantField(load_variant_field_handle_index(cursor)?)
+            },
+            Opcodes::MUT_BORROW_VARIANT_FIELD_GENERIC => {
+                Bytecode::MutBorrowVariantFieldGeneric(load_variant_field_inst_index(cursor)?)
+            },
+            Opcodes::IMM_BORROW_VARIANT_FIELD => {
+                Bytecode::ImmBorrowVariantField(load_variant_field_handle_index(cursor)?)
+            },
+            Opcodes::IMM_BORROW_VARIANT_FIELD_GENERIC => {
+                Bytecode::ImmBorrowVariantFieldGeneric(load_variant_field_inst_index(cursor)?)
+            },
             Opcodes::CALL => Bytecode::Call(load_function_handle_index(cursor)?),
             Opcodes::CALL_GENERIC => Bytecode::CallGeneric(load_function_inst_index(cursor)?),
             Opcodes::PACK => Bytecode::Pack(load_struct_def_index(cursor)?),
             Opcodes::PACK_GENERIC => Bytecode::PackGeneric(load_struct_def_inst_index(cursor)?),
             Opcodes::UNPACK => Bytecode::Unpack(load_struct_def_index(cursor)?),
             Opcodes::UNPACK_GENERIC => Bytecode::UnpackGeneric(load_struct_def_inst_index(cursor)?),
+            Opcodes::PACK_VARIANT => {
+                Bytecode::PackVariant(load_struct_variant_handle_index(cursor)?)
+            },
+            Opcodes::UNPACK_VARIANT => {
+                Bytecode::UnpackVariant(load_struct_variant_handle_index(cursor)?)
+            },
+            Opcodes::PACK_VARIANT_GENERIC => {
+                Bytecode::PackVariantGeneric(load_struct_variant_inst_index(cursor)?)
+            },
+            Opcodes::UNPACK_VARIANT_GENERIC => {
+                Bytecode::UnpackVariantGeneric(load_struct_variant_inst_index(cursor)?)
+            },
+            Opcodes::TEST_VARIANT => {
+                Bytecode::TestVariant(load_struct_variant_handle_index(cursor)?)
+            },
+            Opcodes::TEST_VARIANT_GENERIC => {
+                Bytecode::TestVariantGeneric(load_struct_variant_inst_index(cursor)?)
+            },
             Opcodes::READ_REF => Bytecode::ReadRef,
             Opcodes::WRITE_REF => Bytecode::WriteRef,
             Opcodes::ADD => Bytecode::Add,
@@ -1741,10 +1834,14 @@ impl TableType {
             0xA => Ok(TableType::STRUCT_DEFS),
             0xB => Ok(TableType::STRUCT_DEF_INST),
             0xC => Ok(TableType::FUNCTION_DEFS),
-            0xD => Ok(TableType::FIELD_HANDLE),
+            0xD => Ok(TableType::FIELD_HANDLES),
             0xE => Ok(TableType::FIELD_INST),
             0xF => Ok(TableType::FRIEND_DECLS),
             0x10 => Ok(TableType::METADATA),
+            0x11 => Ok(TableType::VARIANT_FIELD_HANDLES),
+            0x12 => Ok(TableType::VARIANT_FIELD_INST),
+            0x13 => Ok(TableType::STRUCT_VARIANT_HANDLES),
+            0x14 => Ok(TableType::STRUCT_VARIANT_INST),
             _ => Err(PartialVMError::new(StatusCode::UNKNOWN_TABLE_TYPE)),
         }
     }
@@ -1817,6 +1914,7 @@ impl SerializedNativeStructFlag {
         match value {
             0x1 => Ok(SerializedNativeStructFlag::NATIVE),
             0x2 => Ok(SerializedNativeStructFlag::DECLARED),
+            0x3 => Ok(SerializedNativeStructFlag::DECLARED_VARIANTS),
             _ => Err(PartialVMError::new(StatusCode::UNKNOWN_NATIVE_STRUCT_FLAG)),
         }
     }
@@ -1902,6 +2000,17 @@ impl Opcodes {
             0x4B => Ok(Opcodes::CAST_U16),
             0x4C => Ok(Opcodes::CAST_U32),
             0x4D => Ok(Opcodes::CAST_U256),
+            // Since bytecode version 7
+            0x4E => Ok(Opcodes::IMM_BORROW_VARIANT_FIELD),
+            0x4F => Ok(Opcodes::MUT_BORROW_VARIANT_FIELD),
+            0x50 => Ok(Opcodes::IMM_BORROW_VARIANT_FIELD_GENERIC),
+            0x51 => Ok(Opcodes::MUT_BORROW_VARIANT_FIELD_GENERIC),
+            0x52 => Ok(Opcodes::PACK_VARIANT),
+            0x53 => Ok(Opcodes::PACK_VARIANT_GENERIC),
+            0x54 => Ok(Opcodes::UNPACK_VARIANT),
+            0x55 => Ok(Opcodes::UNPACK_VARIANT_GENERIC),
+            0x56 => Ok(Opcodes::TEST_VARIANT),
+            0x57 => Ok(Opcodes::TEST_VARIANT_GENERIC),
             _ => Err(PartialVMError::new(StatusCode::UNKNOWN_OPCODE)),
         }
     }
@@ -1919,7 +2028,7 @@ impl SerializedBool {
 }
 
 impl SerializedOption {
-    /// Returns a boolean to indice NONE or SOME (NONE = false)
+    /// Returns a boolean to indicate NONE or SOME (NONE = false)
     fn from_u8(value: u8) -> BinaryLoaderResult<bool> {
         match value {
             0x1 => Ok(false),
diff --git a/third_party/move/move-binary-format/src/errors.rs b/third_party/move/move-binary-format/src/errors.rs
index 5cdf08553292e..a5f5e447786b1 100644
--- a/third_party/move/move-binary-format/src/errors.rs
+++ b/third_party/move/move-binary-format/src/errors.rs
@@ -545,7 +545,7 @@ impl fmt::Display for PartialVMError {
         }
 
         if let Some(msg) = &self.0.message {
-            status = format!("{} and message {}", status, msg);
+            status = format!("{} and message '{}'", status, msg);
         }
 
         for (kind, index) in &self.0.indices {
diff --git a/third_party/move/move-binary-format/src/file_format.rs b/third_party/move/move-binary-format/src/file_format.rs
index d3f68284eb37d..6feb954f8191e 100644
--- a/third_party/move/move-binary-format/src/file_format.rs
+++ b/third_party/move/move-binary-format/src/file_format.rs
@@ -36,6 +36,7 @@ use crate::{
     internals::ModuleIndex,
     IndexKind, SignatureTokenKind,
 };
+use move_bytecode_spec::bytecode_spec;
 use move_core_types::{
     account_address::AccountAddress,
     identifier::{IdentStr, Identifier},
@@ -162,12 +163,36 @@ define_index! {
     doc: "Index into the `FunctionDefinition` table.",
 }
 
+// Since bytecode version 7
+define_index! {
+    name: StructVariantHandleIndex,
+    kind: StructVariantHandle,
+    doc: "Index into the `StructVariantHandle` table.",
+}
+define_index! {
+    name: StructVariantInstantiationIndex,
+    kind: StructVariantInstantiation,
+    doc: "Index into the `StructVariantInstantiation` table.",
+}
+define_index! {
+    name: VariantFieldHandleIndex,
+    kind: VariantFieldHandle,
+    doc: "Index into the `VariantFieldHandle` table.",
+}
+define_index! {
+    name: VariantFieldInstantiationIndex,
+    kind: VariantFieldInstantiation,
+    doc: "Index into the `VariantFieldInstantiation` table.",
+}
+
 /// Index of a local variable in a function.
 ///
 /// Bytecodes that operate on locals carry indexes to the locals of a function.
 pub type LocalIndex = u8;
 /// Max number of fields in a `StructDefinition`.
 pub type MemberCount = u16;
+/// Max number of variants in a `StructDefinition`, as well as index for variants.
+pub type VariantIndex = u16;
 /// Index into the code stream for a jump. The offset is relative to the beginning of
 /// the instruction stream.
 pub type CodeOffset = u16;
@@ -318,6 +343,31 @@ pub struct FieldHandle {
     pub field: MemberCount,
 }
 
+/// A variant field access info
+#[derive(Clone, Debug, Eq, Hash, PartialEq)]
+#[cfg_attr(any(test, feature = "fuzzing"), derive(proptest_derive::Arbitrary))]
+#[cfg_attr(any(test, feature = "fuzzing"), proptest(no_params))]
+#[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))]
+pub struct VariantFieldHandle {
+    /// The structure which defines the variant.
+    pub struct_index: StructDefinitionIndex,
+    /// The sequence of variants which share the field at the given
+    /// field offset.
+    pub variants: Vec<VariantIndex>,
+    /// The field offset.
+    pub field: MemberCount,
+}
+
+/// A struct variant access info
+#[derive(Clone, Debug, Eq, Hash, PartialEq)]
+#[cfg_attr(any(test, feature = "fuzzing"), derive(proptest_derive::Arbitrary))]
+#[cfg_attr(any(test, feature = "fuzzing"), proptest(no_params))]
+#[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))]
+pub struct StructVariantHandle {
+    pub struct_index: StructDefinitionIndex,
+    pub variant: VariantIndex,
+}
+
 // DEFINITIONS:
 // Definitions are the module code. So the set of types and functions in the module.
 
@@ -329,6 +379,62 @@ pub struct FieldHandle {
 pub enum StructFieldInformation {
     Native,
     Declared(Vec<FieldDefinition>),
+    DeclaredVariants(Vec<VariantDefinition>),
+}
+
+impl StructFieldInformation {
+    /// Returns the fields described by this field information. If no variant is
+    /// provided, this returns all fields of a struct. Otherwise, the fields of the
+    /// variant are returned.
+    pub fn fields(&self, variant: Option<VariantIndex>) -> Vec<&FieldDefinition> {
+        use StructFieldInformation::*;
+        match self {
+            Native => vec![],
+            Declared(fields) => fields.iter().collect(),
+            DeclaredVariants(variants) => {
+                if let Some(variant) = variant.filter(|v| (*v as usize) < variants.len()) {
+                    variants[variant as usize].fields.iter().collect()
+                } else {
+                    vec![]
+                }
+            },
+        }
+    }
+
+    /// Returns the number of fields. This is an optimized version of
+    /// `self.fields(variant).len()`
+    pub fn field_count(&self, variant: Option<VariantIndex>) -> usize {
+        use StructFieldInformation::*;
+        match self {
+            Native => 0,
+            Declared(fields) => fields.len(),
+            DeclaredVariants(variants) => {
+                if let Some(variant) = variant.filter(|v| (*v as usize) < variants.len()) {
+                    variants[variant as usize].fields.len()
+                } else {
+                    0
+                }
+            },
+        }
+    }
+
+    /// Returns the variant definitions. For non-variant types, an empty
+    /// slice is returned.
+    pub fn variants(&self) -> &[VariantDefinition] {
+        use StructFieldInformation::*;
+        match self {
+            Native | Declared(_) => &[],
+            DeclaredVariants(variants) => variants,
+        }
+    }
+
+    /// Returns the number of variants (zero for struct or native)
+    pub fn variant_count(&self) -> usize {
+        match self {
+            StructFieldInformation::Native | StructFieldInformation::Declared(_) => 0,
+            StructFieldInformation::DeclaredVariants(variants) => variants.len(),
+        }
+    }
 }
 
 //
@@ -349,6 +455,16 @@ pub struct StructDefInstantiation {
     pub type_parameters: SignatureIndex,
 }
 
+/// A complete or partial instantiation of a generic struct variant
+#[derive(Clone, Debug, Eq, Hash, PartialEq)]
+#[cfg_attr(any(test, feature = "fuzzing"), derive(proptest_derive::Arbitrary))]
+#[cfg_attr(any(test, feature = "fuzzing"), proptest(no_params))]
+#[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))]
+pub struct StructVariantInstantiation {
+    pub handle: StructVariantHandleIndex,
+    pub type_parameters: SignatureIndex,
+}
+
 /// A complete or partial instantiation of a function
 #[derive(Clone, Debug, Eq, Hash, PartialEq)]
 #[cfg_attr(any(test, feature = "fuzzing"), derive(proptest_derive::Arbitrary))]
@@ -374,6 +490,16 @@ pub struct FieldInstantiation {
     pub type_parameters: SignatureIndex,
 }
 
+/// A complete or partial instantiation of a variant field.
+#[derive(Clone, Debug, Eq, Hash, PartialEq)]
+#[cfg_attr(any(test, feature = "fuzzing"), derive(proptest_derive::Arbitrary))]
+#[cfg_attr(any(test, feature = "fuzzing"), proptest(no_params))]
+#[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))]
+pub struct VariantFieldInstantiation {
+    pub handle: VariantFieldHandleIndex,
+    pub type_parameters: SignatureIndex,
+}
+
 /// A `StructDefinition` is a type definition. It either indicates it is native or defines all the
 /// user-specified fields declared on the type.
 #[derive(Clone, Debug, Eq, PartialEq)]
@@ -390,23 +516,6 @@ pub struct StructDefinition {
     pub field_information: StructFieldInformation,
 }
 
-impl StructDefinition {
-    pub fn declared_field_count(&self) -> PartialVMResult<MemberCount> {
-        match &self.field_information {
-            StructFieldInformation::Native => Err(PartialVMError::new(StatusCode::LINKER_ERROR)
-                .with_message("Looking for field in native structure. Native structures have no accessible fields.".to_string())),
-            StructFieldInformation::Declared(fields) => Ok(fields.len() as u16),
-        }
-    }
-
-    pub fn field(&self, offset: usize) -> Option<&FieldDefinition> {
-        match &self.field_information {
-            StructFieldInformation::Native => None,
-            StructFieldInformation::Declared(fields) => fields.get(offset),
-        }
-    }
-}
-
 /// A `FieldDefinition` is the definition of a field: its name and the field type.
 #[derive(Clone, Debug, Eq, PartialEq)]
 #[cfg_attr(any(test, feature = "fuzzing"), derive(proptest_derive::Arbitrary))]
@@ -419,6 +528,15 @@ pub struct FieldDefinition {
     pub signature: TypeSignature,
 }
 
+#[derive(Clone, Debug, Eq, PartialEq)]
+#[cfg_attr(any(test, feature = "fuzzing"), derive(proptest_derive::Arbitrary))]
+#[cfg_attr(any(test, feature = "fuzzing"), proptest(no_params))]
+#[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))]
+pub struct VariantDefinition {
+    pub name: IdentifierIndex,
+    pub fields: Vec<FieldDefinition>,
+}
+
 /// `Visibility` restricts the accessibility of the associated entity.
 /// - For function visibility, it restricts who may call into the associated function.
 #[derive(Clone, Copy, Debug, Default, Eq, PartialEq, PartialOrd, Ord, Serialize, Deserialize)]
@@ -1311,7 +1429,7 @@ impl SignatureToken {
 }
 
 /// A `Constant` is a serialized value along with its type. That type will be deserialized by the
-/// loader/evauluator
+/// loader/evaluator
 #[derive(Clone, Debug, Eq, PartialEq, Hash)]
 #[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))]
 pub struct Constant {
@@ -1335,503 +1453,1459 @@ pub struct CodeUnit {
     pub code: Vec<Bytecode>,
 }
 
+// Note: custom attributes are used to specify the bytecode instructions.
+//
+// Please refer to the `move-bytecode-spec` crate for
+//   1. The list of supported attributes and whether they are always required
+//     a. Currently three attributes are required: `group`, `description`, `semantics`
+//   2. The list of groups allowed
+// In the rare case of needing to add new attributes or groups, you can also add them there.
+//
+// Common notations for the semantics:
+//   - `stack >> a`: pop an item off the stack and store it in variable a
+//   - `stack << a`: push the value stored in variable a onto the stack
+
 /// `Bytecode` is a VM instruction of variable size. The type of the bytecode (opcode) defines
 /// the size of the bytecode.
 ///
 /// Bytecodes operate on a stack machine and each bytecode has side effect on the stack and the
 /// instruction stream.
+#[bytecode_spec]
 #[derive(Clone, Hash, Eq, VariantCount, PartialEq)]
 #[cfg_attr(any(test, feature = "fuzzing"), derive(proptest_derive::Arbitrary))]
 #[cfg_attr(any(test, feature = "fuzzing"), proptest(no_params))]
 #[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))]
 pub enum Bytecode {
-    /// Pop and discard the value at the top of the stack.
-    /// The value on the stack must be an copyable type.
-    ///
-    /// Stack transition:
-    ///
-    /// ```..., value -> ...```
+    #[group = "stack_and_local"]
+    #[description = "Pop and discard the value at the top of the stack. The value on the stack must be an copyable type."]
+    #[semantics = "stack >> _"]
+    #[runtime_check_epilogue = r#"
+        ty_stack >> ty
+        assert ty has drop
+    "#]
     Pop,
-    /// Return from function, possibly with values according to the return types in the
-    /// function signature. The returned values are pushed on the stack.
-    /// The function signature of the function being executed defines the semantic of
-    /// the Ret opcode.
-    ///
-    /// Stack transition:
-    ///
-    /// ```..., arg_val(1), ..., arg_val(n) -> ..., return_val(1), ..., return_val(n)```
+
+    #[group = "control_flow"]
+    #[description = r#"
+        Return from current function call, possibly with values according to the return types in the function signature.
+
+        The returned values need to be pushed on the stack prior to the return instruction.
+    "#]
+    #[semantics = r#"
+        call_stack >> current_frame
+        // The frame of the function being returned from is dropped.
+
+        current_frame.pc += 1
+    "#]
     Ret,
-    /// Branch to the instruction at position `CodeOffset` if the value at the top of the stack
-    /// is true. Code offsets are relative to the start of the instruction stream.
-    ///
-    /// Stack transition:
-    ///
-    /// ```..., bool_value -> ...```
+
+    #[group = "control_flow"]
+    #[description = r#"
+        Branch to the instruction at position `code_offset` if the value at the top of the stack is true.
+        Code offsets are relative to the start of the function body.
+    "#]
+    #[static_operands = "[code_offset]"]
+    #[semantics = r#"
+        stack >> flag
+        if flag is true
+            current_frame.pc = code_offset
+        else
+            current_frame.pc += 1
+    "#]
+    #[runtime_check_prologue = "ty_stack >> _"]
     BrTrue(CodeOffset),
-    /// Branch to the instruction at position `CodeOffset` if the value at the top of the stack
-    /// is false. Code offsets are relative to the start of the instruction stream.
-    ///
-    /// Stack transition:
-    ///
-    /// ```..., bool_value -> ...```
+
+    #[group = "control_flow"]
+    #[description = r#"
+        Branch to the instruction at position `code_offset` if the value at the top of the stack is false.
+        Code offsets are relative to the start of the function body.
+    "#]
+    #[static_operands = "[code_offset]"]
+    #[semantics = r#"
+        stack >> flag
+        if flag is false
+            current_frame.pc = code_offset
+        else
+            current_frame.pc += 1
+    "#]
+    #[runtime_check_prologue = "ty_stack >> _"]
     BrFalse(CodeOffset),
-    /// Branch unconditionally to the instruction at position `CodeOffset`. Code offsets are
-    /// relative to the start of the instruction stream.
-    ///
-    /// Stack transition: none
+
+    #[group = "control_flow"]
+    #[description = r#"
+        Branch unconditionally to the instruction at position `code_offset`.
+        Code offsets are relative to the start of a function body.
+    "#]
+    #[static_operands = "[code_offset]"]
+    #[semantics = "current_frame.pc = code_offset"]
     Branch(CodeOffset),
-    /// Push a U8 constant onto the stack.
-    ///
-    /// Stack transition:
-    ///
-    /// ```... -> ..., u8_value```
+
+    #[group = "stack_and_local"]
+    #[description = "Push a u8 constant onto the stack."]
+    #[static_operands = "[u8_value]"]
+    #[semantics = "stack << u8_value"]
+    #[runtime_check_epilogue = "ty_stack << u8"]
     LdU8(u8),
-    /// Push a U64 constant onto the stack.
-    ///
-    /// Stack transition:
-    ///
-    /// ```... -> ..., u64_value```
+
+    #[group = "stack_and_local"]
+    #[description = "Push a u64 constant onto the stack."]
+    #[static_operands = "[u64_value]"]
+    #[semantics = "stack << u64_value"]
+    #[runtime_check_epilogue = "ty_stack << u64"]
     LdU64(u64),
-    /// Push a U128 constant onto the stack.
-    ///
-    /// Stack transition:
-    ///
-    /// ```... -> ..., u128_value```
+
+    #[group = "stack_and_local"]
+    #[description = "Push a u128 constant onto the stack."]
+    #[static_operands = "[u128_value]"]
+    #[semantics = "stack << u128_value"]
+    #[runtime_check_epilogue = "ty_stack << u128"]
     LdU128(u128),
-    /// Convert the value at the top of the stack into u8.
-    ///
-    /// Stack transition:
-    ///
-    /// ```..., integer_value -> ..., u8_value```
+
+    #[group = "casting"]
+    #[description = r#"
+        Convert the integer value at the top of the stack into a u8.
+        An arithmetic error will be raised if the value cannot be represented as a u8.
+    "#]
+    #[semantics = r#"
+        stack >> int_val
+        if int_val > u8::MAX:
+            arithmetic error
+        else:
+            stack << int_val as u8
+    "#]
+    #[runtime_check_epilogue = r#"
+        ty_stack >> _
+        ty_stack << u8
+    "#]
     CastU8,
-    /// Convert the value at the top of the stack into u64.
-    ///
-    /// Stack transition:
-    ///
-    /// ```..., integer_value -> ..., u8_value```
+
+    #[group = "casting"]
+    #[description = r#"
+        Convert the integer value at the top of the stack into a u64.
+        An arithmetic error will be raised if the value cannot be represented as a u64.
+    "#]
+    #[semantics = r#"
+        stack >> int_val
+        if int_val > u64::MAX:
+            arithmetic error
+        else:
+            stack << int_val as u64
+    "#]
+    #[runtime_check_epilogue = r#"
+        ty_stack >> _
+        ty_stack << u64
+    "#]
     CastU64,
-    /// Convert the value at the top of the stack into u128.
-    ///
-    /// Stack transition:
-    ///
-    /// ```..., integer_value -> ..., u128_value```
+
+    #[group = "casting"]
+    #[description = r#"
+        Convert the integer value at the top of the stack into a u128.
+        An arithmetic error will be raised if the value cannot be represented as a u128.
+    "#]
+    #[semantics = r#"
+        stack >> int_val
+        if int_val > u128::MAX:
+            arithmetic error
+        else:
+            stack << int_val as u128
+    "#]
+    #[runtime_check_epilogue = r#"
+        ty_stack >> _
+        ty_stack << u128
+    "#]
     CastU128,
-    /// Push a `Constant` onto the stack. The value is loaded and deserialized (according to its
-    /// type) from the `ConstantPool` via `ConstantPoolIndex`
-    ///
-    /// Stack transition:
-    ///
-    /// ```... -> ..., value```
+
+    #[group = "stack_and_local"]
+    #[description = r#"
+        Push a constant value onto the stack.
+        The value is loaded and deserialized (according to its type) from the the file format.
+    "#]
+    #[static_operands = "[const_idx]"]
+    #[semantics = "stack << constants[const_idx]"]
+    #[runtime_check_epilogue = "ty_stack << const_ty"]
+    #[gas_type_creation_tier_1 = "const_ty"]
     LdConst(ConstantPoolIndex),
-    /// Push `true` onto the stack.
-    ///
-    /// Stack transition:
-    ///
-    /// ```... -> ..., true```
+
+    #[group = "stack_and_local"]
+    #[description = "Push a true value onto the stack."]
+    #[semantics = "stack << true"]
+    #[runtime_check_epilogue = "ty_stack << bool"]
     LdTrue,
-    /// Push `false` onto the stack.
-    ///
-    /// Stack transition:
-    ///
-    /// ```... -> ..., false```
+
+    #[group = "stack_and_local"]
+    #[description = "Push a false value onto the stack."]
+    #[semantics = "stack << false"]
+    #[runtime_check_epilogue = "ty_stack << bool"]
     LdFalse,
-    /// Push the local identified by `LocalIndex` onto the stack. The value is copied and the
-    /// local is still safe to use.
-    ///
-    /// Stack transition:
-    ///
-    /// ```... -> ..., value```
+
+    #[group = "stack_and_local"]
+    #[description = r#"
+        Push the local identified by the local index onto the stack.
+        The value must be copyable and the local remains safe to use.
+    "#]
+    #[semantics = r#"
+        stack << locals[local_idx]
+    "#]
+    #[runtime_check_epilogue = r#"
+        ty = clone local_ty
+        assert ty has copy
+        ty_stack << ty
+    "#]
     CopyLoc(LocalIndex),
-    /// Push the local identified by `LocalIndex` onto the stack. The local is moved and it is
-    /// invalid to use from that point on, unless a store operation writes to the local before
-    /// any read to that local.
-    ///
-    /// Stack transition:
-    ///
-    /// ```... -> ..., value```
+
+    #[group = "stack_and_local"]
+    #[description = r#"
+        Move the local identified by the local index onto the stack.
+
+        Once moved, the local becomes invalid to use, unless a store operation writes
+        to the local before any read to that local.
+    "#]
+    #[static_operands = "[local_idx]"]
+    #[semantics = r#"
+        stack << locals[local_idx]
+        locals[local_idx] = invalid
+    "#]
+    #[runtime_check_epilogue = r#"
+        ty = clone local_ty
+        ty_stack << ty
+    "#]
     MoveLoc(LocalIndex),
-    /// Pop value from the top of the stack and store it into the function locals at
-    /// position `LocalIndex`.
-    ///
-    /// Stack transition:
-    ///
-    /// ```..., value -> ...```
+
+    #[group = "stack_and_local"]
+    #[description = r#"
+        Pop value from the top of the stack and store it into the local identified by the local index.
+
+        If the local contains an old value, then that value is dropped.
+    "#]
+    #[static_operands = "[local_idx]"]
+    #[semantics = "stack >> locals[local_idx]"]
+    #[runtime_check_prologue = r#"
+        ty = clone local_ty
+        ty_stack >> val_ty
+        assert ty == val_ty
+        if locals[local_idx] != invalid
+            assert ty has drop
+    "#]
     StLoc(LocalIndex),
-    /// Call a function. The stack has the arguments pushed first to last.
-    /// The arguments are consumed and pushed to the locals of the function.
-    /// Return values are pushed on the stack and available to the caller.
-    ///
-    /// Stack transition:
-    ///
-    /// ```..., arg(1), arg(2), ...,  arg(n) -> ..., return_value(1), return_value(2), ...,
-    /// return_value(k)```
+
+    #[group = "control_flow"]
+    #[static_operands = "[func_handle_idx]"]
+    #[description = r#"
+        Call a function. The stack has the arguments pushed first to last.
+        The arguments are consumed and pushed to the locals of the function.
+
+        Return values are pushed onto the stack from the first to the last and
+        available to the caller after returning from the callee.
+    "#]
+    #[semantics = r#"
+        func = <func from handle or instantiation>
+        // Here `func` is loaded from the file format, containing information like the
+        // the function signature, the locals, and the body.
+
+        ty_args = if func.is_generic then func.ty_args else []
+
+        n = func.num_params
+        stack >> arg_n-1
+        ..
+        stack >> arg_0
+
+        if func.is_native()
+            call_native(func.name, ty_args, args = [arg_0, .., arg_n-1])
+            current_frame.pc += 1
+        else
+            call_stack << current_frame
+
+            current_frame = new_frame_from_func(
+                func,
+                ty_args,
+                locals = [arg_0, .., arg_n-1, invalid, ..]
+                                           // ^ other locals
+            )
+    "#]
+    #[runtime_check_epilogue = r#"
+        assert func visibility rules
+        for i in 0..#args:
+            ty_stack >> ty
+            assert ty == locals[#args -  i - 1]
+    "#]
+    #[gas_type_creation_tier_1 = "local_tys"]
     Call(FunctionHandleIndex),
+
+    #[group = "control_flow"]
+    #[static_operands = "[func_inst_idx]"]
+    #[description = "Generic version of `Call`."]
+    #[semantics = "See `Call`."]
+    #[runtime_check_epilogue = "See `Call`."]
+    #[gas_type_creation_tier_0 = "ty_args"]
+    #[gas_type_creation_tier_1 = "local_tys"]
     CallGeneric(FunctionInstantiationIndex),
-    /// Create an instance of the type specified via `StructHandleIndex` and push it on the stack.
-    /// The values of the fields of the struct, in the order they appear in the struct declaration,
-    /// must be pushed on the stack. All fields must be provided.
-    ///
-    /// A Pack instruction must fully initialize an instance.
-    ///
-    /// Stack transition:
-    ///
-    /// ```..., field(1)_value, field(2)_value, ..., field(n)_value -> ..., instance_value```
+
+    #[group = "struct"]
+    #[static_operands = "[struct_def_idx]"]
+    #[description = r#"
+        Create an instance of the struct specified by the struct def index and push it on the stack.
+        The values of the fields of the struct, in the order they appear in the struct declaration,
+        must be pushed on the stack. All fields must be provided.
+    "#]
+    #[semantics = r#"
+        stack >> field_n-1
+        ...
+        stack >> field_0
+        stack << struct { field_0, ..., field_n-1 }
+    "#]
+    #[runtime_check_epilogue = r#"
+        ty_stack >> tys
+        assert tys == field_tys
+        check field abilities
+        ty_stack << struct_ty
+    "#]
     Pack(StructDefinitionIndex),
+    #[group = "struct"]
+    #[static_operands = "[struct_inst_idx]"]
+    #[description = "Generic version of `Pack`."]
+    #[semantics = "See `Pack`."]
+    #[runtime_check_epilogue = "See `Pack`."]
+    #[gas_type_creation_tier_0 = "struct_ty"]
+    #[gas_type_creation_tier_1 = "field_tys"]
     PackGeneric(StructDefInstantiationIndex),
-    /// Destroy an instance of a type and push the values bound to each field on the
-    /// stack.
-    ///
-    /// The values of the fields of the instance appear on the stack in the order defined
-    /// in the struct definition.
-    ///
-    /// This order makes `Unpack<T>` the inverse of `Pack<T>`. So `Unpack<T>; Pack<T>` is the identity
-    /// for struct `T`.
-    ///
-    /// Stack transition:
-    ///
-    /// ```..., instance_value -> ..., field(1)_value, field(2)_value, ..., field(n)_value```
+
+    #[group = "variant"]
+    #[static_operands = "[struct_variant_handle_idx]"]
+    #[description = r#"
+        Create an instance of the struct variant specified by the handle and push it on the stack.
+        The values of the fields of the variant, in the order they are determined by the
+        declaration, must be pushed on the stack. All fields must be provided.
+    "#]
+    #[semantics = r#"
+        stack >> field_n-1
+        ...
+        stack >> field_0
+        stack << struct/variant { field_0, ..., field_n-1 }
+    "#]
+    #[runtime_check_epilogue = r#"
+        ty_stack >> tys
+        assert tys == field_tys
+        check field abilities
+        ty_stack << struct_ty
+    "#]
+    PackVariant(StructVariantHandleIndex),
+
+    #[group = "variant"]
+    #[static_operands = "[struct_variant_inst_idx]"]
+    #[description = "Generic version of `PackVariant`."]
+    #[semantics = "See `PackVariant`."]
+    #[runtime_check_epilogue = "See `PackVariant`."]
+    #[gas_type_creation_tier_0 = "struct_ty"]
+    #[gas_type_creation_tier_1 = "field_tys"]
+    PackVariantGeneric(StructVariantInstantiationIndex),
+
+    //TODO: Unpack, Test
+    #[group = "struct"]
+    #[static_operands = "[struct_def_idx]"]
+    #[description = "Destroy an instance of a struct and push the values bound to each field onto the stack."]
+    #[semantics = r#"
+        stack >> struct { field_0, .., field_n-1 }
+        stack << field_0
+        ...
+        stack << field_n-1
+    "#]
+    #[runtime_check_epilogue = r#"
+        ty_stack >> ty
+        assert ty == struct_ty
+        ty_stack << field_tys
+    "#]
     Unpack(StructDefinitionIndex),
+    #[group = "struct"]
+    #[static_operands = "[struct_inst_idx]"]
+    #[description = "Generic version of `Unpack`."]
+    #[semantics = "See `Unpack`."]
+    #[runtime_check_epilogue = "See `Unpack`."]
+    #[gas_type_creation_tier_0 = "struct_ty"]
+    #[gas_type_creation_tier_1 = "field_tys"]
     UnpackGeneric(StructDefInstantiationIndex),
-    /// Read a reference. The reference is on the stack, it is consumed and the value read is
-    /// pushed on the stack.
-    ///
-    /// Reading a reference performs a copy of the value referenced.
-    /// As such, ReadRef requires that the type of the value has the `Copy` ability.
-    ///
-    /// Stack transition:
-    ///
-    /// ```..., reference_value -> ..., value```
+
+    #[group = "variant"]
+    #[static_operands = "[struct_variant_handle_idx]"]
+    #[description = r#"
+        If the value on the stack is of the specified variant, destroy it and push the
+        values bound to each field onto the stack.
+
+        Aborts if the value is not of the specified variant.
+    "#]
+    #[semantics = r#"
+        if struct_ref is variant_field.variant
+            stack >> struct/variant { field_0, .., field_n-1 }
+            stack << field_0
+            ...
+            stack << field_n-1
+        else
+            error
+    "#]
+    #[runtime_check_epilogue = r#"
+        ty_stack >> ty
+        assert ty == struct_ty
+        ty_stack << field_tys
+    "#]
+    #[gas_type_creation_tier_0 = "struct_ty"]
+    #[gas_type_creation_tier_1 = "field_tys"]
+    UnpackVariant(StructVariantHandleIndex),
+
+    #[group = "struct"]
+    #[static_operands = "[struct_variant_inst_idx]"]
+    #[description = "Generic version of `UnpackVariant`."]
+    #[semantics = "See `UnpackVariant`."]
+    #[runtime_check_epilogue = "See `UnpackVariant`."]
+    #[gas_type_creation_tier_0 = "struct_ty"]
+    #[gas_type_creation_tier_1 = "field_tys"]
+    UnpackVariantGeneric(StructVariantInstantiationIndex),
+
+    #[group = "variant"]
+    #[static_operands = "[struct_variant_handle_idx]"]
+    #[description = r#"
+        Tests whether the reference value on the stack is of the specified variant.
+    "#]
+    #[semantics = r#"
+        stack >> struct_ref
+        stack << struct_if is variant
+    "#]
+    #[runtime_check_epilogue = r#"
+        ty_stack >> ty
+        assert ty == &struct_ty
+        ty_stack << bool
+    "#]
+    TestVariant(StructVariantHandleIndex),
+
+    #[group = "variant"]
+    #[description = "Generic version of `TestVariant`."]
+    #[semantics = "See `TestVariant`."]
+    #[runtime_check_epilogue = "See `TestVariant`."]
+    TestVariantGeneric(StructVariantInstantiationIndex),
+
+    #[group = "reference"]
+    #[description = r#"
+        Consume the reference at the top of the stack, read the value referenced, and push the value onto the stack.
+
+        Reading a reference performs a copy of the value referenced.
+        As such, ReadRef requires that the type of the value has the `copy` ability.
+    "#]
+    #[semantics = r#"
+        stack >> ref
+        stack << copy *ref
+    "#]
+    #[runtime_check_epilogue = r#"
+        ty_stack >> ref_ty
+        assert ty has copy
+    "#]
     ReadRef,
-    /// Write to a reference. The reference and the value are on the stack and are consumed.
-    ///
-    ///
-    /// WriteRef requires that the type of the value has the `Drop` ability as the previous value
-    /// is lost
-    ///
-    /// Stack transition:
-    ///
-    /// ```..., value, reference_value -> ...```
+
+    #[group = "reference"]
+    #[description = r#"
+        Pop a reference and a value off the stack, and write the value to the reference.
+
+        It is required that the type of the value has the `drop` ability, as the previous value is dropped.
+    "#]
+    #[semantics = r#"
+        stack >> ref
+        stack >> val
+        *ref = val
+    "#]
+    #[runtime_check_epilogue = r#"
+        ty_stack >> ref_ty
+        ty_stack >> val_ty
+        assert ref_ty == &val_ty
+        assert val_ty has drop
+    "#]
     WriteRef,
-    /// Convert a mutable reference to an immutable reference.
-    ///
-    /// Stack transition:
-    ///
-    /// ```..., reference_value -> ..., reference_value```
+
+    #[group = "reference"]
+    #[description = r#"
+        Convert a mutable reference into an immutable reference.
+    "#]
+    #[semantics = r#"
+        stack >> mutable_ref
+        stack << mutable_ref.into_immutable()
+    "#]
+    #[runtime_check_epilogue = r#"
+        ty_stack >> &mut ty
+        ty_stack << &ty
+    "#]
     FreezeRef,
-    /// Load a mutable reference to a local identified by LocalIndex.
-    ///
-    /// The local must not be a reference.
-    ///
-    /// Stack transition:
-    ///
-    /// ```... -> ..., reference```
+
+    #[group = "stack_and_local"]
+    #[description = "Load a mutable reference to a local identified by the local index."]
+    #[static_operands = "[local_idx]"]
+    #[semantics = "stack << &mut locals[local_idx]"]
+    #[runtime_check_epilogue = r#"
+        ty = clone local_ty
+        ty_stack << &mut ty
+    "#]
     MutBorrowLoc(LocalIndex),
-    /// Load an immutable reference to a local identified by LocalIndex.
-    ///
-    /// The local must not be a reference.
-    ///
-    /// Stack transition:
-    ///
-    /// ```... -> ..., reference```
+
+    #[group = "stack_and_local"]
+    #[description = "Load an immutable reference to a local identified by the local index."]
+    #[static_operands = "[local_idx]"]
+    #[semantics = "stack << &locals[local_idx]"]
+    #[runtime_check_epilogue = r#"
+        ty << clone local_ty
+        ty_stack << &ty
+    "#]
     ImmBorrowLoc(LocalIndex),
-    /// Load a mutable reference to a field identified by `FieldHandleIndex`.
-    /// The top of the stack must be a mutable reference to a type that contains the field
-    /// definition.
-    ///
-    /// Stack transition:
-    ///
-    /// ```..., reference -> ..., field_reference```
+
+    #[group = "struct"]
+    #[static_operands = "[field_handle_idx]"]
+    #[description = r#"
+        Consume the reference to a struct at the top of the stack,
+        and load a mutable reference to the field identified by the field handle index.
+    "#]
+    #[semantics = r#"
+        stack >> struct_ref
+        stack << &mut (*struct_ref).field(field_index)
+    "#]
+    #[runtime_check_epilogue = r#"
+        ty_stack >> ty
+        assert ty == &mut struct_ty
+        ty_stack << &mut field_ty
+    "#]
     MutBorrowField(FieldHandleIndex),
-    /// Load a mutable reference to a field identified by `FieldInstantiationIndex`.
-    /// The top of the stack must be a mutable reference to a type that contains the field
-    /// definition.
-    ///
-    /// Stack transition:
-    ///
-    /// ```..., reference -> ..., field_reference```
+
+    #[group = "variant"]
+    #[static_operands = "[variant_field_handle_idx]"]
+    #[description = r#"
+        Consume the reference to a struct at the top of the stack,
+        and provided that the struct is of the given variant, load a mutable reference to
+        the field of the variant.
+
+        Aborts execution if the operand is not of the given variant.
+    "#]
+    #[semantics = r#"
+        stack >> struct_ref
+        if struct_ref is variant
+            stack << &mut (*struct_ref).field(variant_field.field_index)
+        else
+            error
+    "#]
+    #[runtime_check_epilogue = r#"
+        ty_stack >> ty
+        assert ty == &mut struct_ty
+        ty_stack << &mut field_ty
+    "#]
+    MutBorrowVariantField(VariantFieldHandleIndex),
+
+    #[group = "struct"]
+    #[static_operands = "[field_inst_idx]"]
+    #[description = r#"
+        Consume the reference to a generic struct at the top of the stack,
+        and load a mutable reference to the field identified by the field handle index.
+    "#]
+    #[semantics = r#"
+        stack >> struct_ref
+        stack << &mut (*struct_ref).field(field_index)
+    "#]
+    #[runtime_check_epilogue = r#"
+        ty_stack >> ty
+        assert ty == &struct_ty
+        ty_stack << &mut field_ty
+    "#]
+    #[gas_type_creation_tier_0 = "struct_ty"]
+    #[gas_type_creation_tier_1 = "field_ty"]
     MutBorrowFieldGeneric(FieldInstantiationIndex),
-    /// Load an immutable reference to a field identified by `FieldHandleIndex`.
-    /// The top of the stack must be a reference to a type that contains the field definition.
-    ///
-    /// Stack transition:
-    ///
-    /// ```..., reference -> ..., field_reference```
+
+    #[group = "variant"]
+    #[static_operands = "[variant_field_inst_idx]"]
+    #[description = r#"
+        Consume the reference to a generic struct at the top of the stack,
+        and provided that the struct is of the given variant, load a mutable reference to
+        the field of the variant.
+
+        Aborts execution if the operand is not of the given variant.
+    "#]
+    #[semantics = r#"
+        stack >> struct_ref
+        if struct_ref is variant_field
+            stack << &mut (*struct_ref).field(field_index)
+        else
+            error
+    "#]
+    #[runtime_check_epilogue = r#"
+        ty_stack >> ty
+        assert ty == &mut struct_ty
+        ty_stack << &mut field_ty
+    "#]
+    MutBorrowVariantFieldGeneric(VariantFieldInstantiationIndex),
+
+    #[group = "struct"]
+    #[static_operands = "[field_handle_idx]"]
+    #[description = r#"
+        Consume the reference to a struct at the top of the stack,
+        and load an immutable reference to the field identified by the field handle index.
+    "#]
+    #[semantics = r#"
+        stack >> struct_ref
+        stack << &(*struct_ref).field(field_index)
+    "#]
+    #[runtime_check_epilogue = r#"
+        ty_stack >> ty
+        assert ty == &struct_ty
+        ty_stack << &field_ty
+    "#]
     ImmBorrowField(FieldHandleIndex),
-    /// Load an immutable reference to a field identified by `FieldInstantiationIndex`.
-    /// The top of the stack must be a reference to a type that contains the field definition.
-    ///
-    /// Stack transition:
-    ///
-    /// ```..., reference -> ..., field_reference```
+
+    #[group = "variant"]
+    #[static_operands = "[variant_field_inst_idx]"]
+    #[description = r#"
+        Consume the reference to a struct at the top of the stack,
+        and provided that the struct is of the given variant, load an
+        immutable reference to the field of the variant.
+
+        Aborts execution if the operand is not of the given variant.
+    "#]
+    #[semantics = r#"
+        stack >> struct_ref
+        if struct_ref is variant
+            stack << &(*struct_ref).field(field_index)
+        else
+            error
+    "#]
+    #[runtime_check_epilogue = r#"
+        ty_stack >> ty
+        assert ty == &mut struct_ty
+        ty_stack << &mut field_ty
+    "#]
+    ImmBorrowVariantField(VariantFieldHandleIndex),
+
+    #[group = "struct"]
+    #[static_operands = "[field_inst_idx]"]
+    #[description = r#"
+        Consume the reference to a generic struct at the top of the stack,
+        and load an immutable reference to the field identified by the
+        field handle index.
+    "#]
+    #[semantics = r#"
+        stack >> struct_ref
+        stack << &(*struct_ref).field(field_index)
+    "#]
+    #[runtime_check_epilogue = r#"
+        ty_stack >> ty
+        assert ty == &struct_ty
+        ty_stack << &field_ty
+    "#]
+    #[gas_type_creation_tier_0 = "struct_ty"]
+    #[gas_type_creation_tier_1 = "field_ty"]
     ImmBorrowFieldGeneric(FieldInstantiationIndex),
-    /// Return a mutable reference to an instance of type `StructDefinitionIndex` published at the
-    /// address passed as argument. Abort execution if such an object does not exist or if a
-    /// reference has already been handed out.
-    ///
-    /// Stack transition:
-    ///
-    /// ```..., address_value -> ..., reference_value```
+
+    #[group = "variant"]
+    #[static_operands = "[variant_field_inst_idx]"]
+    #[description = r#"
+        Consume the reference to a generic struct at the top of the stack,
+        and provided that the struct is of the given variant, load an immutable
+        reference to the field of the variant.
+
+        Aborts execution if the operand is not of the given variant.
+    "#]
+    #[semantics = r#"
+        stack >> struct_ref
+        if struct_ref is variant_field.variant
+            stack << &(*struct_ref).field(variant_field.field_index)
+        else
+            error
+    "#]
+    #[runtime_check_epilogue = r#"
+        ty_stack >> ty
+        assert ty == &mut struct_ty
+        ty_stack << &mut field_ty
+    "#]
+    ImmBorrowVariantFieldGeneric(VariantFieldInstantiationIndex),
+
+    #[group = "global"]
+    #[static_operands = "[struct_def_idx]"]
+    #[description = r#"
+        Return a mutable reference to an instance of the specified type under the address passed as argument.
+
+        Abort execution if such an object does not exist.
+    "#]
+    #[semantics = r#"
+        stack >> addr
+
+        if global_state[addr] contains struct_type
+            stack << &mut global_state[addr][struct_type]
+        else
+            error
+    "#]
+    #[runtime_check_epilogue = r#"
+        ty_stack >> ty
+        assert ty == address
+        assert struct_ty has key
+        ty_stack << &mut struct_ty
+    "#]
     MutBorrowGlobal(StructDefinitionIndex),
+    #[group = "global"]
+    #[static_operands = "[struct_inst_idx]"]
+    #[description = "Generic version of `mut_borrow_global`."]
+    #[semantics = "See `mut_borrow_global`."]
+    #[runtime_check_epilogue = "See `mut_borrow_global`."]
+    #[gas_type_creation_tier_0 = "resource_ty"]
     MutBorrowGlobalGeneric(StructDefInstantiationIndex),
-    /// Return an immutable reference to an instance of type `StructDefinitionIndex` published at
-    /// the address passed as argument. Abort execution if such an object does not exist or if a
-    /// reference has already been handed out.
-    ///
-    /// Stack transition:
-    ///
-    /// ```..., address_value -> ..., reference_value```
+
+    #[group = "global"]
+    #[static_operands = "[struct_def_idx]"]
+    #[description = r#"
+        Return an immutable reference to an instance of the specified type under the address passed as argument.
+
+        Abort execution if such an object does not exist.
+    "#]
+    #[semantics = r#"
+        stack >> addr
+
+        if global_state[addr] contains struct_type
+            stack << &global_state[addr][struct_type]
+        else
+            error
+    "#]
+    #[runtime_check_epilogue = r#"
+        ty_stack >> ty
+        assert ty == address
+        assert struct_ty has key
+        ty_stack << &struct_ty
+    "#]
     ImmBorrowGlobal(StructDefinitionIndex),
+    #[group = "global"]
+    #[static_operands = "[struct_inst_idx]"]
+    #[description = "Generic version of `imm_borrow_global`."]
+    #[semantics = "See `imm_borrow_global`."]
+    #[runtime_check_epilogue = "See `imm_borrow_global`."]
+    #[gas_type_creation_tier_0 = "resource_ty"]
     ImmBorrowGlobalGeneric(StructDefInstantiationIndex),
-    /// Add the 2 u64 at the top of the stack and pushes the result on the stack.
-    /// The operation aborts the transaction in case of overflow.
-    ///
-    /// Stack transition:
-    ///
-    /// ```..., u64_value(1), u64_value(2) -> ..., u64_value```
+
+    #[group = "arithmetic"]
+    #[description = r#"
+        Add the two integer values at the top of the stack and push the result on the stack.
+
+        This operation aborts the transaction in case of overflow.
+    "#]
+    #[semantics = r#"
+        stack >> rhs
+        stack >> lhs
+        if lhs + rhs > int_ty::max
+            arithmetic error
+        else
+            stack << (lhs + rhs)
+    "#]
+    #[runtime_check_epilogue = r#"
+        ty_stack >> right_ty
+        ty_stack >> left_ty
+        assert left_ty == right_ty
+        ty_stack << right_ty
+    "#]
     Add,
-    /// Subtract the 2 u64 at the top of the stack and pushes the result on the stack.
-    /// The operation aborts the transaction in case of underflow.
-    ///
-    /// Stack transition:
-    ///
-    /// ```..., u64_value(1), u64_value(2) -> ..., u64_value```
+
+    #[group = "arithmetic"]
+    #[description = r#"
+        Subtract the two integer values at the top of the stack and push the result on the stack.
+
+        This operation aborts the transaction in case of underflow.
+    "#]
+    #[semantics = r#"
+        stack >> rhs
+        stack >> lhs
+        if lhs < rhs
+            arithmetic error
+        else
+            stack << (lhs - rhs)
+    "#]
+    #[runtime_check_epilogue = r#"
+        ty_stack >> right_ty
+        ty_stack >> left_ty
+        assert left_ty == right_ty
+        ty_stack << right_ty
+    "#]
     Sub,
-    /// Multiply the 2 u64 at the top of the stack and pushes the result on the stack.
-    /// The operation aborts the transaction in case of overflow.
-    ///
-    /// Stack transition:
-    ///
-    /// ```..., u64_value(1), u64_value(2) -> ..., u64_value```
+
+    #[group = "arithmetic"]
+    #[description = r#"
+        Multiply the two integer values at the top of the stack and push the result on the stack.
+
+        This operation aborts the transaction in case of overflow.
+    "#]
+    #[semantics = r#"
+        stack >> rhs
+        stack >> lhs
+        if lhs * rhs > int_ty::max
+            arithmetic error
+        else
+            stack << (lhs * rhs)
+    "#]
+    #[runtime_check_epilogue = r#"
+        ty_stack >> right_ty
+        ty_stack >> left_ty
+        assert left_ty == right_ty
+        ty_stack << right_ty
+    "#]
     Mul,
-    /// Perform a modulo operation on the 2 u64 at the top of the stack and pushes the
-    /// result on the stack.
-    ///
-    /// Stack transition:
-    ///
-    /// ```..., u64_value(1), u64_value(2) -> ..., u64_value```
+
+    #[group = "arithmetic"]
+    #[description = r#"
+        Perform a modulo operation on the two integer values at the top of the stack and push the result on the stack.
+
+        This operation aborts the transaction in case the right hand side is zero.
+    "#]
+    #[semantics = r#"
+        stack >> rhs
+        stack >> lhs
+        if rhs == 0
+            arithmetic error
+        else
+            stack << (lhs % rhs)
+    "#]
+    #[runtime_check_epilogue = r#"
+        ty_stack >> right_ty
+        ty_stack >> left_ty
+        assert left_ty == right_ty
+        ty_stack << right_ty
+    "#]
     Mod,
-    /// Divide the 2 u64 at the top of the stack and pushes the result on the stack.
-    /// The operation aborts the transaction in case of "divide by 0".
-    ///
-    /// Stack transition:
-    ///
-    /// ```..., u64_value(1), u64_value(2) -> ..., u64_value```
+
+    #[group = "arithmetic"]
+    #[description = r#"
+        Divide the two integer values at the top of the stack and push the result on the stack.
+
+        This operation aborts the transaction in case the right hand side is zero.
+    "#]
+    #[semantics = r#"
+        stack >> rhs
+        stack >> lhs
+        if rhs == 0
+            arithmetic error
+        else
+            stack << (lhs / rhs)
+    "#]
+    #[runtime_check_epilogue = r#"
+        ty_stack >> right_ty
+        ty_stack >> left_ty
+        assert left_ty == right_ty
+        ty_stack << right_ty
+    "#]
     Div,
-    /// Bitwise OR the 2 u64 at the top of the stack and pushes the result on the stack.
-    ///
-    /// Stack transition:
-    ///
-    /// ```..., u64_value(1), u64_value(2) -> ..., u64_value```
+
+    #[group = "bitwise"]
+    #[description = r#"
+        Perform a bitwise OR operation on the two integer values at the top of the stack
+        and push the result on the stack.
+
+        The operands can be of any (but the same) primitive integer type.
+    "#]
+    #[semantics = r#"
+        stack >> rhs
+        stack >> lhs
+        stack << lhs | rhs
+    "#]
+    #[runtime_check_epilogue = r#"
+        ty_stack >> right_ty
+        ty_stack >> left_ty
+        assert left_ty == right_ty
+        ty_stack << right_ty
+    "#]
     BitOr,
-    /// Bitwise AND the 2 u64 at the top of the stack and pushes the result on the stack.
-    ///
-    /// Stack transition:
-    ///
-    /// ```..., u64_value(1), u64_value(2) -> ..., u64_value```
+
+    #[group = "bitwise"]
+    #[description = r#"
+        Perform a bitwise AND operation on the two integer values at the top of the stack
+        and push the result on the stack.
+
+        The operands can be of any (but the same) primitive integer type.
+    "#]
+    #[semantics = r#"
+        stack >> rhs
+        stack >> lhs
+        stack << lhs & rhs
+    "#]
+    #[runtime_check_epilogue = r#"
+        ty_stack >> right_ty
+        ty_stack >> left_ty
+        assert left_ty == right_ty
+        ty_stack << right_ty
+    "#]
     BitAnd,
-    /// Bitwise XOR the 2 u64 at the top of the stack and pushes the result on the stack.
-    ///
-    /// Stack transition:
-    ///
-    /// ```..., u64_value(1), u64_value(2) -> ..., u64_value```
+
+    // TODO: Rename the enum variant to BitXor for consistency.
+    #[name = "bit_xor"]
+    #[group = "bitwise"]
+    #[description = r#"
+        Perform a bitwise XOR operation on the two integer values at the top of the stack
+        and push the result on the stack.
+
+        The operands can be of any (but the same) primitive integer type.
+    "#]
+    #[semantics = r#"
+        stack >> rhs
+        stack >> lhs
+        stack << lhs ^ rhs
+    "#]
+    #[runtime_check_epilogue = r#"
+        ty_stack >> right_ty
+        ty_stack >> left_ty
+        assert left_ty == right_ty
+        ty_stack << right_ty
+    "#]
     Xor,
-    /// Logical OR the 2 bool at the top of the stack and pushes the result on the stack.
-    ///
-    /// Stack transition:
-    ///
-    /// ```..., bool_value(1), bool_value(2) -> ..., bool_value```
+
+    #[group = "boolean"]
+    #[description = r#"
+        Perform a boolean OR operation on the two bool values at the top of the stack
+        and push the result on the stack.
+    "#]
+    #[semantics = r#"
+        stack >> rhs
+        stack >> lhs
+        stack << lhs || rhs
+    "#]
+    #[runtime_check_epilogue = r#"
+        ty_stack >> right_ty
+        ty_stack >> left_ty
+        assert left_ty == right_ty
+        ty_stack << right_ty
+    "#]
     Or,
-    /// Logical AND the 2 bool at the top of the stack and pushes the result on the stack.
-    ///
-    /// Stack transition:
-    ///
-    /// ```..., bool_value(1), bool_value(2) -> ..., bool_value```
+
+    #[group = "boolean"]
+    #[description = r#"
+        Perform a boolean AND operation on the two bool values at the top of the stack
+        and push the result on the stack.
+    "#]
+    #[semantics = r#"
+        stack >> rhs
+        stack >> lhs
+        stack << lhs && rhs
+    "#]
+    #[runtime_check_epilogue = r#"
+        ty_stack >> right_ty
+        ty_stack >> left_ty
+        assert left_ty == right_ty
+        ty_stack << right_ty
+    "#]
     And,
-    /// Logical NOT the bool at the top of the stack and pushes the result on the stack.
-    ///
-    /// Stack transition:
-    ///
-    /// ```..., bool_value -> ..., bool_value```
+
+    #[group = "boolean"]
+    #[description = r#"
+        Invert the bool value at the top of the stack and push the result on the stack.
+    "#]
+    #[semantics = r#"
+        stack >> bool_val
+        stack << (not bool_val)
+    "#]
+    #[runtime_check_epilogue = r#"
+        ty_stack >> ty
+        assert ty == bool
+        ty_stack << bool
+    "#]
     Not,
-    /// Compare for equality the 2 value at the top of the stack and pushes the
-    /// result on the stack.
-    /// The values on the stack must have `Drop` as they will be consumed and destroyed.
-    ///
-    /// Stack transition:
-    ///
-    /// ```..., value(1), value(2) -> ..., bool_value```
+
+    #[group = "comparison"]
+    #[description = r#"
+        Compare for equality the two values at the top of the stack and push the result on the stack.
+
+        The values must have the `drop` ability as they will be consumed and destroyed.
+    "#]
+    #[semantics = r#"
+        stack >> rhs
+        stack >> lhs
+        stack << (lhs == rhs)
+
+        Note that equality is only defined for
+            - Simple primitive types: u8, u16, u32, u64, u128, u256, bool, address
+            - vector<T> where equality is defined for T
+            - &T (or &mut T) where equality is defined for T
+    "#]
+    #[runtime_check_epilogue = r#"
+        ty_stack >> right_ty
+        ty_stack >> left_ty
+        assert right_ty == left_ty
+        assert right_ty has drop
+        ty_stack << bool
+    "#]
     Eq,
-    /// Compare for inequality the 2 value at the top of the stack and pushes the
-    /// result on the stack.
-    /// The values on the stack must have `Drop` as they will be consumed and destroyed.
-    ///
-    /// Stack transition:
-    ///
-    /// ```..., value(1), value(2) -> ..., bool_value```
+
+    #[group = "comparison"]
+    #[description = r#"
+        Similar to `eq`, but with the result being inverted.
+    "#]
+    #[semantics = r#"
+        stack >> rhs
+        stack >> lhs
+        stack << (lhs != rhs)
+    "#]
+    #[runtime_check_epilogue = r#"
+        ty_stack >> right_ty
+        ty_stack >> left_ty
+        assert right_ty == left_ty
+        assert right_ty has drop
+        ty_stack << bool
+    "#]
     Neq,
-    /// Perform a "less than" operation of the 2 u64 at the top of the stack and pushes the
-    /// result on the stack.
-    ///
-    /// Stack transition:
-    ///
-    /// ```..., u64_value(1), u64_value(2) -> ..., bool_value```
+
+    #[group = "comparison"]
+    #[description = r#"
+        Perform a "less than" operation of the two integer values at the top of the stack
+        and push the boolean result on the stack.
+
+        The operands can be of any (but the same) primitive integer type.
+    "#]
+    #[semantics = r#"
+        stack >> (rhs: int_ty)
+        stack >> (lhs: int_ty)
+        stack << (lhs < rhs)
+    "#]
+    #[runtime_check_epilogue = r#"
+        ty_stack >> right_ty
+        ty_stack >> left_ty
+        assert right_ty == left_ty
+        assert right_ty has drop
+        ty_stack << bool
+    "#]
     Lt,
-    /// Perform a "greater than" operation of the 2 u64 at the top of the stack and pushes the
-    /// result on the stack.
-    ///
-    /// Stack transition:
-    ///
-    /// ```..., u64_value(1), u64_value(2) -> ..., bool_value```
+
+    #[group = "comparison"]
+    #[description = r#"
+        Perform a "greater than" operation of the two integer values at the top of the stack
+        and push the boolean result on the stack.
+
+        The operands can be of any (but the same) primitive integer type.
+    "#]
+    #[semantics = r#"
+        stack >> (rhs: int_ty)
+        stack >> (lhs: int_ty)
+        stack << (lhs > rhs)
+    "#]
+    #[runtime_check_epilogue = r#"
+        ty_stack >> right_ty
+        ty_stack >> left_ty
+        assert right_ty == left_ty
+        assert right_ty has drop
+        ty_stack << bool
+    "#]
     Gt,
-    /// Perform a "less than or equal" operation of the 2 u64 at the top of the stack and pushes
-    /// the result on the stack.
-    ///
-    /// Stack transition:
-    ///
-    /// ```..., u64_value(1), u64_value(2) -> ..., bool_value```
+
+    #[group = "comparison"]
+    #[description = r#"
+        Perform a "less than or equal to" operation of the two integer values at the top of the stack
+        and push the boolean result on the stack.
+
+        The operands can be of any (but the same) primitive integer type.
+    "#]
+    #[semantics = r#"
+        stack >> (rhs: int_ty)
+        stack >> (lhs: int_ty)
+        stack << (lhs <= rhs)
+    "#]
+    #[runtime_check_epilogue = r#"
+        ty_stack >> right_ty
+        ty_stack >> left_ty
+        assert right_ty == left_ty
+        assert right_ty has drop
+        ty_stack << bool
+    "#]
     Le,
-    /// Perform a "greater than or equal" than operation of the 2 u64 at the top of the stack
-    /// and pushes the result on the stack.
-    ///
-    /// Stack transition:
-    ///
-    /// ```..., u64_value(1), u64_value(2) -> ..., bool_value```
+
+    #[group = "comparison"]
+    #[description = r#"
+        Perform a "greater than or equal to" operation of the two integer values at the top of the stack
+        and push the boolean result on the stack.
+
+        The operands can be of any (but the same) primitive integer type.
+    "#]
+    #[semantics = r#"
+        stack >> (rhs: int_ty)
+        stack >> (lhs: int_ty)
+        stack << (lhs >= rhs)
+    "#]
+    #[runtime_check_epilogue = r#"
+        ty_stack >> right_ty
+        ty_stack >> left_ty
+        assert right_ty == left_ty
+        assert right_ty has drop
+        ty_stack << bool
+    "#]
     Ge,
-    /// Abort execution with errorcode
-    ///
-    ///
-    /// Stack transition:
-    ///
-    /// ```..., errorcode -> ...```
+
+    #[group = "control_flow"]
+    #[description = r#"
+        Abort the transaction with an error code.
+    "#]
+    #[semantics = r#"
+        stack >> (error_code: u64)
+        abort transaction with error_code
+    "#]
+    #[runtime_check_prologue = "ty_stack >> _"]
     Abort,
-    /// No operation.
-    ///
-    /// Stack transition: none
+
+    #[group = "control_flow"]
+    #[description = r#"
+        A "no operation" -- an instruction that does not perform any meaningful operation.
+        It can be however, useful as a placeholder in certain cases.
+    "#]
+    #[semantics = "current_frame.pc += 1"]
     Nop,
-    /// Returns whether or not a given address has an object of type StructDefinitionIndex
-    /// published already
-    ///
-    /// Stack transition:
-    ///
-    /// ```..., address_value -> ..., bool_value```
+
+    #[group = "global"]
+    #[static_operands = "[struct_def_idx]"]
+    #[description = "Check whether or not a given address in the global storage has an object of the specified type already."]
+    #[semantics = r#"
+        stack >> addr
+        stack << (global_state[addr] contains struct_type)
+    "#]
+    #[runtime_check_epilogue = r#"
+        ty_stack >> ty
+        assert ty == address
+        ty_stack << bool
+    "#]
     Exists(StructDefinitionIndex),
+    #[group = "global"]
+    #[static_operands = "[struct_inst_idx]"]
+    #[description = "Generic version of `Exists`"]
+    #[semantics = "See `Exists`."]
+    #[runtime_check_epilogue = "See `Exists`."]
+    #[gas_type_creation_tier_0 = "resource_ty"]
     ExistsGeneric(StructDefInstantiationIndex),
-    /// Move the instance of type StructDefinitionIndex, at the address at the top of the stack.
-    /// Abort execution if such an object does not exist.
-    ///
-    /// Stack transition:
-    ///
-    /// ```..., address_value -> ..., value```
+
+    #[group = "global"]
+    #[static_operands = "[struct_def_idx]"]
+    #[description = r#"
+        Move the value of the specified type under the address in the global storage onto the top of the stack.
+
+        Abort execution if such an value does not exist.
+    "#]
+    #[semantics = r#"
+        stack >> addr
+
+        if global_state[addr] contains struct_type
+            stack << global_state[addr][struct_type]
+            delete global_state[addr][struct_type]
+        else
+            error
+    "#]
+    #[runtime_check_epilogue = r#"
+        ty_stack >> ty
+        assert ty == address
+        assert struct_ty has key
+        ty_stack << struct_ty
+    "#]
     MoveFrom(StructDefinitionIndex),
+    #[group = "global"]
+    #[static_operands = "[struct_inst_idx]"]
+    #[description = "Generic version of `MoveFrom`"]
+    #[semantics = "See `MoveFrom`."]
+    #[runtime_check_epilogue = "See `MoveFrom`."]
+    #[gas_type_creation_tier_0 = "resource_ty"]
     MoveFromGeneric(StructDefInstantiationIndex),
-    /// Move the instance at the top of the stack to the address of the `Signer` on the stack below
-    /// it
-    /// Abort execution if an object of type StructDefinitionIndex already exists in address.
-    ///
-    /// Stack transition:
-    ///
-    /// ```..., signer_value, value -> ...```
+
+    #[group = "global"]
+    #[static_operands = "[struct_def_idx]"]
+    #[description = r#"
+        Move the value at the top of the stack into the global storage,
+        under the address of the `signer` on the stack below it.
+
+        Abort execution if an object of the same type already exists under that address.
+    "#]
+    #[semantics = r#"
+        stack >> struct_val
+        stack >> &signer
+
+        if global_state[signer.addr] contains struct_type
+            error
+        else
+            global_state[signer.addr][struct_type] = struct_val
+    "#]
+    #[runtime_check_epilogue = r#"
+        ty_stack >> ty1
+        ty_stack >> ty2
+        assert ty2 == signer
+        assert ty1 == struct_ty
+        assert struct_ty has key
+    "#]
     MoveTo(StructDefinitionIndex),
+    #[group = "global"]
+    #[static_operands = "[struct_inst_idx]"]
+    #[description = "Generic version of `MoveTo`"]
+    #[semantics = "See `MoveTo`."]
+    #[runtime_check_epilogue = "See `MoveTo`."]
+    #[gas_type_creation_tier_0 = "resource_ty"]
     MoveToGeneric(StructDefInstantiationIndex),
-    /// Shift the (second top value) left (top value) bits and pushes the result on the stack.
-    ///
-    /// Stack transition:
-    ///
-    /// ```..., u64_value(1), u64_value(2) -> ..., u64_value```
+
+    #[group = "bitwise"]
+    #[description = r#"
+        Shift the (second top value) right (top value) bits and pushes the result on the stack.
+
+        The number of bits shifted must be less than the number of bits in the integer value being shifted,
+        or the transaction will be aborted with an arithmetic error.
+
+        The number being shifted can be of any primitive integer type, but the number of bits
+        shifted must be u64.
+    "#]
+    #[semantics = r#"
+        stack >> (rhs: u8)
+        stack >> (lhs: int_ty)
+        if rhs >= num_bits_in(int_ty)
+            arithmetic error
+        else
+            stack << (lhs __shift_left__ rhs)
+    "#]
+    #[runtime_check_epilogue = r#"
+        ty_stack >> right_ty
+        ty_stack >> left_ty
+        ty_stack << left_ty
+    "#]
     Shl,
-    /// Shift the (second top value) right (top value) bits and pushes the result on the stack.
-    ///
-    /// Stack transition:
-    ///
-    /// ```..., u64_value(1), u64_value(2) -> ..., u64_value```
+
+    #[group = "bitwise"]
+    #[description = r#"
+        Shift the (second top value) left (top value) bits and pushes the result on the stack.
+
+        The number of bits shifted must be less than the number of bits in the integer value being shifted,
+        or the transaction will be aborted with an arithmetic error.
+
+        The number being shifted can be of any primitive integer type, but the number of bits
+        shifted must be u64.
+    "#]
+    #[semantics = r#"
+        stack >> (rhs: u8)
+        stack >> (lhs: int_ty)
+        if rhs >= num_bits_in(int_ty)
+            arithmetic error
+        else
+            stack << (lhs __shift_right__ rhs)
+    "#]
+    #[runtime_check_epilogue = r#"
+        ty_stack >> right_ty
+        ty_stack >> left_ty
+        ty_stack << left_ty
+    "#]
     Shr,
-    /// Create a vector by packing a statically known number of elements from the stack. Abort the
-    /// execution if there are not enough number of elements on the stack to pack from or they don't
-    /// have the same type identified by the SignatureIndex.
-    ///
-    /// Stack transition:
-    ///
-    /// ```..., e1, e2, ..., eN -> ..., vec[e1, e2, ..., eN]```
+
+    #[group = "vector"]
+    #[description = r#"
+        Create a vector by packing a statically known number of elements from the stack.
+
+        Abort the execution if there are not enough number of elements on the stack
+        to pack from or they do not have the same type identified by the `elem_ty_idx`.
+    "#]
+    #[static_operands = "[elem_ty_idx] [num_elements]"]
+    #[semantics = r#"
+        stack >> elem_n-1
+        ..
+        stack >> elem_0
+        stack << vector[elem_0, .., elem_n-1]
+    "#]
+    #[runtime_check_epilogue = r#"
+        elem_ty = instantiate elem_ty
+        for i in 1..=n:
+            ty_stack >> ty
+            assert ty == elem_ty
+        ty_stack << vector<elem_ty>
+    "#]
+    #[gas_type_creation_tier_0 = "elem_ty"]
     VecPack(SignatureIndex, u64),
-    /// Return the length of the vector,
-    ///
-    /// Stack transition:
-    ///
-    /// ```..., vector_reference -> ..., u64_value```
+
+    #[group = "vector"]
+    #[description = "Get the length of a vector."]
+    #[static_operands = "[elem_ty_idx]"]
+    #[semantics = r#"
+        stack >> vec_ref
+        stack << (*vec_ref).len
+    "#]
+    #[runtime_check_epilogue = r#"
+        elem_ty = instantiate elem_ty
+        ty_stack >> ty
+        assert ty == &elem_ty
+        ty_stack << u64
+    "#]
+    #[gas_type_creation_tier_0 = "elem_ty"]
     VecLen(SignatureIndex),
-    /// Acquire an immutable reference to the element at a given index of the vector. Abort the
-    /// execution if the index is out of bounds.
-    ///
-    /// Stack transition:
-    ///
-    /// ```..., vector_reference, u64_value -> .., element_reference```
+
+    #[group = "vector"]
+    #[description = r#"
+        Acquire an immutable reference to the element at a given index of the vector.
+        Abort the execution if the index is out of bounds.
+    "#]
+    #[static_operands = "[elem_ty_idx]"]
+    #[semantics = r#"
+        stack >> i
+        stack >> vec_ref
+        stack << &((*vec_ref)[i])
+    "#]
+    #[runtime_check_epilogue = r#"
+        ty_stack >> idx_ty
+        assert idx_ty == u64
+        ty_stack >> ref_ty
+        assert ref_ty == &vector<elem_ty>
+        ty_stack << &elem_ty
+    "#]
+    #[gas_type_creation_tier_0 = "elem_ty"]
     VecImmBorrow(SignatureIndex),
-    /// Acquire a mutable reference to the element at a given index of the vector. Abort the
-    /// execution if the index is out of bounds.
-    ///
-    /// Stack transition:
-    ///
-    /// ```..., vector_reference, u64_value -> .., element_reference```
+
+    #[group = "vector"]
+    #[description = r#"
+        Acquire a mutable reference to the element at a given index of the vector.
+        Abort the execution if the index is out of bounds.
+    "#]
+    #[static_operands = "[elem_ty_idx]"]
+    #[semantics = r#"
+        stack >> i
+        stack >> vec_ref
+        stack << &mut ((*vec_ref)[i])
+    "#]
+    #[runtime_check_epilogue = r#"
+        ty_stack >> idx_ty
+        assert idx_ty == u64
+        ty_stack >> ref_ty
+        assert ref_ty == &mut vector<elem_ty>
+        ty_stack << &mut elem_ty
+    "#]
+    #[gas_type_creation_tier_0 = "elem_ty"]
     VecMutBorrow(SignatureIndex),
-    /// Add an element to the end of the vector.
-    ///
-    /// Stack transition:
-    ///
-    /// ```..., vector_reference, element -> ...```
+
+    #[group = "vector"]
+    #[description = "Add an element to the end of the vector."]
+    #[static_operands = "[elem_ty_idx]"]
+    #[semantics = r#"
+        stack >> val
+        stack >> vec_ref
+        (*vec_ref) << val
+    "#]
+    #[runtime_check_epilogue = r#"
+        ty_stack >> val_ty
+        assert val_ty == elem_ty
+        ty_stack >> ref_ty
+        assert ref_ty == &mut vector<elem_ty>
+    "#]
     VecPushBack(SignatureIndex),
-    /// Pop an element from the end of vector. Aborts if the vector is empty.
-    ///
-    /// Stack transition:
-    ///
-    /// ```..., vector_reference -> ..., element```
+
+    #[group = "vector"]
+    #[description = r#"
+        Pop an element from the end of vector.
+        Aborts if the vector is empty.
+    "#]
+    #[static_operands = "[elem_ty_idx]"]
+    #[semantics = r#"
+        stack >> vec_ref
+        (*vec_ref) >> val
+        stack << val
+    "#]
+    #[runtime_check_epilogue = r#"
+        ty_stack >> ref_ty
+        assert ref_ty == &mut vector<elem_ty>
+        ty_stack << val_ty
+    "#]
     VecPopBack(SignatureIndex),
-    /// Destroy the vector and unpack a statically known number of elements onto the stack. Aborts
-    /// if the vector does not have a length N.
-    ///
-    /// Stack transition:
-    ///
-    /// ```..., vec[e1, e2, ..., eN] -> ..., e1, e2, ..., eN```
+
+    #[group = "vector"]
+    #[description = r#"
+        Destroy the vector and unpack a statically known number of elements onto the stack.
+        Abort if the vector does not have a length `n`.
+    "#]
+    #[static_operands = "[elem_ty_idx] [num_elements]"]
+    #[semantics = r#"
+        stack >> vector[elem_0, ..., elem_n-1]
+        stack << elem_0
+        ...
+        stack << elem_n
+    "#]
+    #[runtime_check_epilogue = r#"
+        ty_stack >> ty
+        assert ty == vector<elem_ty>
+        ty_stack << [elem_ty]*n
+    "#]
     VecUnpack(SignatureIndex, u64),
-    /// Swaps the elements at two indices in the vector. Abort the execution if any of the indice
-    /// is out of bounds.
-    ///
-    /// ```..., vector_reference, u64_value(1), u64_value(2) -> ...```
+
+    #[group = "vector"]
+    #[description = r#"
+        Swaps the elements at two indices in the vector.
+        Abort the execution if any of the indices are out of bounds.
+    "#]
+    #[static_operands = "[elem_ty_idx]"]
+    #[semantics = r#"
+        stack >> j
+        stack >> i
+        stack >> vec_ref
+        (*vec_ref)[i], (*vec_ref)[j] = (*vec_ref)[j], (*vec_ref)[i]
+    "#]
+    #[runtime_check_epilogue = r#"
+        ty_stack >> ty1
+        ty_stack >> ty2
+        ty_stack >> ty3
+        assert ty1 == u64
+        assert ty2 == u64
+        assert ty3 == &vector<elem_ty>
+    "#]
     VecSwap(SignatureIndex),
-    /// Push a U16 constant onto the stack.
-    ///
-    /// Stack transition:
-    ///
-    /// ```... -> ..., u16_value```
+
+    #[group = "stack_and_local"]
+    #[description = "Push a u16 constant onto the stack."]
+    #[static_operands = "[u16_value]"]
+    #[semantics = "stack << u16_value"]
+    #[runtime_check_epilogue = "ty_stack << u16"]
     LdU16(u16),
-    /// Push a U32 constant onto the stack.
-    ///
-    /// Stack transition:
-    ///
-    /// ```... -> ..., u32_value```
+
+    #[group = "stack_and_local"]
+    #[description = "Push a u32 constant onto the stack."]
+    #[static_operands = "[u32_value]"]
+    #[semantics = "stack << u32_value"]
+    #[runtime_check_epilogue = "ty_stack << u32"]
     LdU32(u32),
-    /// Push a U256 constant onto the stack.
-    ///
-    /// Stack transition:
-    ///
-    /// ```... -> ..., u256_value```
+
+    #[group = "stack_and_local"]
+    #[description = "Push a u256 constant onto the stack."]
+    #[static_operands = "[u256_value]"]
+    #[semantics = "stack << u256_value"]
+    #[runtime_check_epilogue = "ty_stack << u256"]
     LdU256(move_core_types::u256::U256),
-    /// Convert the value at the top of the stack into u16.
-    ///
-    /// Stack transition:
-    ///
-    /// ```..., integer_value -> ..., u16_value```
+
+    #[group = "casting"]
+    #[description = r#"
+        Convert the integer value at the top of the stack into a u16.
+        An arithmetic error will be raised if the value cannot be represented as a u16.
+    "#]
+    #[semantics = r#"
+        stack >> int_val
+        if int_val > u16::MAX:
+            arithmetic error
+        else:
+            stack << int_val as u16
+    "#]
+    #[runtime_check_epilogue = r#"
+        ty_stack >> _
+        ty_stack << u16
+    "#]
     CastU16,
-    /// Convert the value at the top of the stack into u32.
-    ///
-    /// Stack transition:
-    ///
-    /// ```..., integer_value -> ..., u32_value```
+
+    #[group = "casting"]
+    #[description = r#"
+        Convert the integer value at the top of the stack into a u32.
+        An arithmetic error will be raised if the value cannot be represented as a u32.
+    "#]
+    #[semantics = r#"
+        stack >> int_val
+        if int_val > u32::MAX:
+            arithmetic error
+        else:
+            stack << int_val as u32
+    "#]
+    #[runtime_check_epilogue = r#"
+        ty_stack >> _
+        ty_stack << u32
+    "#]
     CastU32,
-    /// Convert the value at the top of the stack into u256.
-    ///
-    /// Stack transition:
-    ///
-    /// ```..., integer_value -> ..., u256_value```
+
+    #[group = "casting"]
+    #[description = r#"
+        Convert the integer value at the top of the stack into a u256.
+    "#]
+    #[semantics = r#"
+        stack >> int_val
+        stack << int_val as u256
+    "#]
+    #[runtime_check_epilogue = r#"
+        ty_stack >> _
+        ty_stack << u256
+    "#]
     CastU256,
 }
 
@@ -1865,8 +2939,14 @@ impl ::std::fmt::Debug for Bytecode {
             Bytecode::CallGeneric(a) => write!(f, "CallGeneric({})", a),
             Bytecode::Pack(a) => write!(f, "Pack({})", a),
             Bytecode::PackGeneric(a) => write!(f, "PackGeneric({})", a),
+            Bytecode::PackVariant(a) => write!(f, "PackVariant({})", a),
+            Bytecode::TestVariant(a) => write!(f, "TestVariant({})", a),
+            Bytecode::PackVariantGeneric(a) => write!(f, "PackVariantGeneric({})", a),
+            Bytecode::TestVariantGeneric(a) => write!(f, "TestVariantGeneric({})", a),
             Bytecode::Unpack(a) => write!(f, "Unpack({})", a),
             Bytecode::UnpackGeneric(a) => write!(f, "UnpackGeneric({})", a),
+            Bytecode::UnpackVariant(a) => write!(f, "UnpackVariant({})", a),
+            Bytecode::UnpackVariantGeneric(a) => write!(f, "UnpackVariantGeneric({})", a),
             Bytecode::ReadRef => write!(f, "ReadRef"),
             Bytecode::WriteRef => write!(f, "WriteRef"),
             Bytecode::FreezeRef => write!(f, "FreezeRef"),
@@ -1874,8 +2954,16 @@ impl ::std::fmt::Debug for Bytecode {
             Bytecode::ImmBorrowLoc(a) => write!(f, "ImmBorrowLoc({})", a),
             Bytecode::MutBorrowField(a) => write!(f, "MutBorrowField({:?})", a),
             Bytecode::MutBorrowFieldGeneric(a) => write!(f, "MutBorrowFieldGeneric({:?})", a),
+            Bytecode::MutBorrowVariantField(a) => write!(f, "MutBorrowVariantField({:?})", a),
+            Bytecode::MutBorrowVariantFieldGeneric(a) => {
+                write!(f, "MutBorrowVariantFieldGeneric({:?})", a)
+            },
             Bytecode::ImmBorrowField(a) => write!(f, "ImmBorrowField({:?})", a),
             Bytecode::ImmBorrowFieldGeneric(a) => write!(f, "ImmBorrowFieldGeneric({:?})", a),
+            Bytecode::ImmBorrowVariantField(a) => write!(f, "ImmBorrowVariantField({:?})", a),
+            Bytecode::ImmBorrowVariantFieldGeneric(a) => {
+                write!(f, "ImmBorrowVariantFieldGeneric({:?})", a)
+            },
             Bytecode::MutBorrowGlobal(a) => write!(f, "MutBorrowGlobal({:?})", a),
             Bytecode::MutBorrowGlobalGeneric(a) => write!(f, "MutBorrowGlobalGeneric({:?})", a),
             Bytecode::ImmBorrowGlobal(a) => write!(f, "ImmBorrowGlobal({:?})", a),
@@ -2078,6 +3166,12 @@ pub struct CompiledModule {
     pub struct_defs: Vec<StructDefinition>,
     /// Function defined in this module.
     pub function_defs: Vec<FunctionDefinition>,
+
+    /// Since bytecode version 7: variant related handle tables
+    pub struct_variant_handles: Vec<StructVariantHandle>,
+    pub struct_variant_instantiations: Vec<StructVariantInstantiation>,
+    pub variant_field_handles: Vec<VariantFieldHandle>,
+    pub variant_field_instantiations: Vec<VariantFieldInstantiation>,
 }
 
 // Need a custom implementation of Arbitrary because as of proptest-derive 0.1.1, the derivation
@@ -2188,6 +3282,10 @@ impl Arbitrary for CompiledModule {
                         metadata: vec![],
                         struct_defs,
                         function_defs,
+                        struct_variant_handles: vec![],
+                        struct_variant_instantiations: vec![],
+                        variant_field_handles: vec![],
+                        variant_field_instantiations: vec![],
                     }
                 },
             )
@@ -2203,6 +3301,7 @@ impl CompiledModule {
             IndexKind::LocalPool
                 | IndexKind::CodeDefinition
                 | IndexKind::FieldDefinition
+                | IndexKind::VariantDefinition
                 | IndexKind::TypeParameter
                 | IndexKind::MemberCount
         ));
@@ -2221,10 +3320,17 @@ impl CompiledModule {
             IndexKind::Identifier => self.identifiers.len(),
             IndexKind::AddressIdentifier => self.address_identifiers.len(),
             IndexKind::ConstantPool => self.constant_pool.len(),
+            // Since bytecode version 7
+            IndexKind::VariantFieldHandle => self.variant_field_handles.len(),
+            IndexKind::VariantFieldInstantiation => self.variant_field_instantiations.len(),
+            IndexKind::StructVariantHandle => self.struct_variant_handles.len(),
+            IndexKind::StructVariantInstantiation => self.struct_variant_instantiations.len(),
+
             // XXX these two don't seem to belong here
             other @ IndexKind::LocalPool
             | other @ IndexKind::CodeDefinition
             | other @ IndexKind::FieldDefinition
+            | other @ IndexKind::VariantDefinition
             | other @ IndexKind::TypeParameter
             | other @ IndexKind::MemberCount => unreachable!("invalid kind for count: {:?}", other),
         }
@@ -2275,6 +3381,10 @@ pub fn empty_module() -> CompiledModule {
         function_instantiations: vec![],
         field_instantiations: vec![],
         signatures: vec![Signature(vec![])],
+        struct_variant_handles: vec![],
+        struct_variant_instantiations: vec![],
+        variant_field_handles: vec![],
+        variant_field_instantiations: vec![],
     }
 }
 
diff --git a/third_party/move/move-binary-format/src/file_format_common.rs b/third_party/move/move-binary-format/src/file_format_common.rs
index b5446c81260e4..3a85904097856 100644
--- a/third_party/move/move-binary-format/src/file_format_common.rs
+++ b/third_party/move/move-binary-format/src/file_format_common.rs
@@ -13,6 +13,7 @@
 //! It's used to compress mostly indexes into the main binary tables.
 use crate::file_format::Bytecode;
 use anyhow::{bail, Result};
+use move_core_types::value;
 use std::{
     io::{Cursor, Read},
     mem::size_of,
@@ -50,8 +51,12 @@ pub const FUNCTION_HANDLE_INDEX_MAX: u64 = TABLE_INDEX_MAX;
 pub const FUNCTION_INST_INDEX_MAX: u64 = TABLE_INDEX_MAX;
 pub const FIELD_HANDLE_INDEX_MAX: u64 = TABLE_INDEX_MAX;
 pub const FIELD_INST_INDEX_MAX: u64 = TABLE_INDEX_MAX;
+pub const VARIANT_FIELD_HANDLE_INDEX_MAX: u64 = TABLE_INDEX_MAX;
+pub const VARIANT_FIELD_INST_INDEX_MAX: u64 = TABLE_INDEX_MAX;
 pub const STRUCT_DEF_INST_INDEX_MAX: u64 = TABLE_INDEX_MAX;
 pub const CONSTANT_INDEX_MAX: u64 = TABLE_INDEX_MAX;
+pub const STRUCT_VARIANT_HANDLE_INDEX_MAX: u64 = TABLE_INDEX_MAX;
+pub const STRUCT_VARIANT_INST_INDEX_MAX: u64 = TABLE_INDEX_MAX;
 
 pub const BYTECODE_COUNT_MAX: u64 = 65535;
 pub const BYTECODE_INDEX_MAX: u64 = 65535;
@@ -72,6 +77,8 @@ pub const ACQUIRES_COUNT_MAX: u64 = 255;
 
 pub const FIELD_COUNT_MAX: u64 = 255;
 pub const FIELD_OFFSET_MAX: u64 = 255;
+pub const VARIANT_COUNT_MAX: u64 = value::VARIANT_COUNT_MAX;
+pub const VARIANT_OFFSET_MAX: u64 = 127;
 
 pub const TYPE_PARAMETER_COUNT_MAX: u64 = 255;
 pub const TYPE_PARAMETER_INDEX_MAX: u64 = 65536;
@@ -84,6 +91,8 @@ pub const SIGNATURE_TOKEN_DEPTH_MAX: usize = 256;
 ///
 /// The binary contains a subset of those tables. A table specification is a tuple (table type,
 /// start offset, byte count) for a given table.
+///
+/// Notice there must not be more than `max(u8) - 1` tables.
 #[rustfmt::skip]
 #[allow(non_camel_case_types)]
 #[repr(u8)]
@@ -100,10 +109,14 @@ pub enum TableType {
     STRUCT_DEFS             = 0xA,
     STRUCT_DEF_INST         = 0xB,
     FUNCTION_DEFS           = 0xC,
-    FIELD_HANDLE            = 0xD,
+    FIELD_HANDLES           = 0xD,
     FIELD_INST              = 0xE,
     FRIEND_DECLS            = 0xF,
     METADATA                = 0x10,
+    VARIANT_FIELD_HANDLES   = 0x11,
+    VARIANT_FIELD_INST      = 0x12,
+    STRUCT_VARIANT_HANDLES  = 0x13,
+    STRUCT_VARIANT_INST     = 0x14,
 }
 
 /// Constants for signature blob values.
@@ -189,6 +202,7 @@ pub enum SerializedAddressSpecifier {
 pub enum SerializedNativeStructFlag {
     NATIVE                  = 0x1,
     DECLARED                = 0x2,
+    DECLARED_VARIANTS       = 0x3,
 }
 
 /// List of opcodes constants.
@@ -274,6 +288,17 @@ pub enum Opcodes {
     CAST_U16                    = 0x4B,
     CAST_U32                    = 0x4C,
     CAST_U256                   = 0x4D,
+    // Since bytecode version 7
+    IMM_BORROW_VARIANT_FIELD    = 0x4E,
+    MUT_BORROW_VARIANT_FIELD    = 0x4F,
+    IMM_BORROW_VARIANT_FIELD_GENERIC    = 0x50,
+    MUT_BORROW_VARIANT_FIELD_GENERIC    = 0x51,
+    PACK_VARIANT                = 0x52,
+    PACK_VARIANT_GENERIC        = 0x53,
+    UNPACK_VARIANT              = 0x54,
+    UNPACK_VARIANT_GENERIC      = 0x55,
+    TEST_VARIANT                = 0x56,
+    TEST_VARIANT_GENERIC        = 0x57,
 }
 
 /// Upper limit on the binary size
@@ -447,6 +472,11 @@ pub fn read_uleb128_as_u64(cursor: &mut Cursor<&[u8]>) -> Result<u64> {
 // Bytecode evolution
 //
 
+/// From bytecode version 7 onwards, Aptos distinguishes from
+/// other Move flavors by masking the version with the highest
+/// byte 0xA.
+pub const APTOS_BYTECODE_VERSION_MASK: u32 = 0x0A000000;
+
 /// Version 1: the initial version
 pub const VERSION_1: u32 = 1;
 
@@ -476,24 +506,26 @@ pub const VERSION_6: u32 = 6;
 
 /// Version 7: changes compare to version 6
 /// + access specifiers (read/write set)
+/// + enum types
 pub const VERSION_7: u32 = 7;
 
-/// Mark which version is the default version
-pub const VERSION_DEFAULT: u32 = VERSION_6;
+/// Version 8: changes compared to version 7
+/// + TBD
+pub const VERSION_8: u32 = 8;
 
-/// Mark which version is the latest version
+/// Mark which version is the latest version. Should be set to v8 once features
+/// are added.
 pub const VERSION_MAX: u32 = VERSION_7;
 
-/// A version value which is used for experimental code which is not allowed in
-/// production. The bytecode deserializer accepts modules with this version only when the
-/// cargo feature `testing` is enabled.
-///
-/// This is currently set to VERSION_7, the next major version, and should be updated once
-/// this version is ready for production.
-pub const VERSION_NEXT: u32 = VERSION_7;
+/// Mark which version is the default version. This is the version used by default by tools like
+/// the compiler. Notice that this version might be different than the one supported on nodes.
+/// The node's max version is determined by the on-chain config for that node.
+pub const VERSION_DEFAULT: u32 = VERSION_6;
+
+/// Mark which version is the default version if compiling Move 2.
+pub const VERSION_DEFAULT_LANG_V2: u32 = VERSION_7;
 
 // Mark which oldest version is supported.
-// TODO(#145): finish v4 compatibility; as of now, only metadata is implemented
 pub const VERSION_MIN: u32 = VERSION_5;
 
 pub(crate) mod versioned_data {
@@ -530,33 +562,25 @@ pub(crate) mod versioned_data {
                     .with_message("Bad binary header".to_string()));
             }
             let version = match read_u32(&mut cursor) {
-                Ok(v) => v,
+                Ok(v) => v & !APTOS_BYTECODE_VERSION_MASK,
                 Err(_) => {
                     return Err(PartialVMError::new(StatusCode::MALFORMED)
                         .with_message("Bad binary header".to_string()));
                 },
             };
             if version == 0 || version > u32::min(max_version, VERSION_MAX) {
-                return Err(PartialVMError::new(StatusCode::UNKNOWN_VERSION)
-                    .with_message(format!("bytecode version {} unsupported", version)));
-            } else if version == VERSION_NEXT
-                && !cfg!(any(test, feature = "testing", feature = "fuzzing"))
-            {
-                return Err(
-                    PartialVMError::new(StatusCode::UNKNOWN_VERSION).with_message(format!(
-                        "bytecode version {} only allowed in test code",
-                        VERSION_NEXT
-                    )),
-                );
+                Err(PartialVMError::new(StatusCode::UNKNOWN_VERSION)
+                    .with_message(format!("bytecode version {} unsupported", version)))
+            } else {
+                Ok((
+                    Self {
+                        version,
+                        max_identifier_size,
+                        binary,
+                    },
+                    cursor,
+                ))
             }
-            Ok((
-                Self {
-                    version,
-                    max_identifier_size,
-                    binary,
-                },
-                cursor,
-            ))
         }
 
         #[allow(dead_code)]
@@ -576,10 +600,6 @@ pub(crate) mod versioned_data {
                 cursor: Cursor::new(&self.binary[start..end]),
             }
         }
-
-        pub fn slice(&self, start: usize, end: usize) -> &'a [u8] {
-            &self.binary[start..end]
-        }
     }
 
     impl<'a> VersionedCursor<'a> {
@@ -758,6 +778,17 @@ pub fn instruction_key(instruction: &Bytecode) -> u8 {
         CastU16 => Opcodes::CAST_U16,
         CastU32 => Opcodes::CAST_U32,
         CastU256 => Opcodes::CAST_U256,
+        // Since bytecode version 7
+        ImmBorrowVariantField(_) => Opcodes::IMM_BORROW_VARIANT_FIELD,
+        ImmBorrowVariantFieldGeneric(_) => Opcodes::IMM_BORROW_VARIANT_FIELD_GENERIC,
+        MutBorrowVariantField(_) => Opcodes::MUT_BORROW_VARIANT_FIELD,
+        MutBorrowVariantFieldGeneric(_) => Opcodes::MUT_BORROW_VARIANT_FIELD_GENERIC,
+        PackVariant(_) => Opcodes::PACK_VARIANT,
+        PackVariantGeneric(_) => Opcodes::PACK_VARIANT_GENERIC,
+        UnpackVariant(_) => Opcodes::UNPACK_VARIANT,
+        UnpackVariantGeneric(_) => Opcodes::UNPACK_VARIANT_GENERIC,
+        TestVariant(_) => Opcodes::TEST_VARIANT,
+        TestVariantGeneric(_) => Opcodes::TEST_VARIANT_GENERIC,
     };
     opcode as u8
 }
diff --git a/third_party/move/move-binary-format/src/lib.rs b/third_party/move/move-binary-format/src/lib.rs
index 3077aa00f25d6..55c65eaeac94a 100644
--- a/third_party/move/move-binary-format/src/lib.rs
+++ b/third_party/move/move-binary-format/src/lib.rs
@@ -3,6 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #![forbid(unsafe_code)]
+#![deny(deprecated)]
 
 use std::fmt;
 
@@ -10,8 +11,10 @@ pub mod access;
 pub mod binary_views;
 pub mod check_bounds;
 pub mod compatibility;
+pub mod compatibility_legacy;
 #[macro_use]
 pub mod errors;
+pub mod check_complexity;
 pub mod constant;
 pub mod control_flow_graph;
 pub mod deserializer;
@@ -51,6 +54,12 @@ pub enum IndexKind {
     CodeDefinition,
     TypeParameter,
     MemberCount,
+    // Since bytecode version 7
+    VariantDefinition,
+    VariantFieldHandle,
+    VariantFieldInstantiation,
+    StructVariantHandle,
+    StructVariantInstantiation,
 }
 
 impl IndexKind {
@@ -77,6 +86,12 @@ impl IndexKind {
             CodeDefinition,
             TypeParameter,
             MemberCount,
+            // Since bytecode version 7
+            VariantDefinition,
+            VariantFieldHandle,
+            VariantFieldInstantiation,
+            StructVariantHandle,
+            StructVariantInstantiation,
         ]
     }
 }
@@ -97,6 +112,7 @@ impl fmt::Display for IndexKind {
             StructDefinition => "struct definition",
             FunctionDefinition => "function definition",
             FieldDefinition => "field definition",
+            VariantDefinition => "variant definition",
             Signature => "signature",
             Identifier => "identifier",
             AddressIdentifier => "address identifier",
@@ -105,6 +121,10 @@ impl fmt::Display for IndexKind {
             CodeDefinition => "code definition pool",
             TypeParameter => "type parameter",
             MemberCount => "field offset",
+            VariantFieldHandle => "variant field handle",
+            VariantFieldInstantiation => "variant field instantiation",
+            StructVariantHandle => "struct variant handle",
+            StructVariantInstantiation => "struct variant instantiation",
         };
 
         f.write_str(desc)
diff --git a/third_party/move/move-binary-format/src/normalized.rs b/third_party/move/move-binary-format/src/normalized.rs
index 678bb8cc8d7bb..ef61a63963692 100644
--- a/third_party/move/move-binary-format/src/normalized.rs
+++ b/third_party/move/move-binary-format/src/normalized.rs
@@ -2,8 +2,11 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
+#![allow(deprecated)]
+
 use crate::{
     access::ModuleAccess,
+    errors::{PartialVMError, PartialVMResult},
     file_format::{
         AbilitySet, CompiledModule, FieldDefinition, FunctionDefinition, SignatureToken,
         StructDefinition, StructFieldInformation, StructTypeParameter, TypeParameterIndex,
@@ -14,6 +17,7 @@ use move_core_types::{
     account_address::AccountAddress,
     identifier::{IdentStr, Identifier},
     language_storage::{ModuleId, StructTag, TypeTag},
+    vm_status::StatusCode,
 };
 use serde::{Deserialize, Serialize};
 use std::collections::BTreeMap;
@@ -28,6 +32,7 @@ use std::collections::BTreeMap;
 /// A normalized version of `SignatureToken`, a type expression appearing in struct or function
 /// declarations. Unlike `SignatureToken`s, `normalized::Type`s from different modules can safely be
 /// compared.
+#[deprecated = "Normalized types are known to have serious performance issues and should be avoided for new use cases."]
 #[derive(Clone, Debug, Ord, PartialOrd, Eq, PartialEq, Serialize, Deserialize)]
 pub enum Type {
     #[serde(rename = "bool")]
@@ -66,6 +71,7 @@ pub enum Type {
 /// metadata that it is ignored by the VM. The reason: names are important to clients. We would
 /// want a change from `Account { bal: u64, seq: u64 }` to `Account { seq: u64, bal: u64 }` to be
 /// marked as incompatible. Not safe to compare without an enclosing `Struct`.
+#[deprecated = "Normalized types are known to have serious performance issues and should be avoided for new use cases."]
 #[derive(Clone, Debug, Eq, PartialEq, Serialize, Deserialize)]
 pub struct Field {
     pub name: Identifier,
@@ -74,6 +80,7 @@ pub struct Field {
 
 /// Normalized version of a `StructDefinition`. Not safe to compare without an associated
 /// `ModuleId` or `Module`.
+#[deprecated = "Normalized types are known to have serious performance issues and should be avoided for new use cases."]
 #[derive(Clone, Debug, Eq, PartialEq, Serialize, Deserialize)]
 pub struct Struct {
     pub abilities: AbilitySet,
@@ -83,6 +90,7 @@ pub struct Struct {
 
 /// Normalized version of a `FunctionDefinition`. Not safe to compare without an associated
 /// `ModuleId` or `Module`.
+#[deprecated = "Normalized types are known to have serious performance issues and should be avoided for new use cases."]
 #[derive(Clone, Debug, Ord, PartialOrd, Eq, PartialEq, Serialize, Deserialize)]
 pub struct Function {
     pub visibility: Visibility,
@@ -94,6 +102,7 @@ pub struct Function {
 
 /// Normalized version of a `CompiledModule`: its address, name, struct declarations, and public
 /// function declarations.
+#[deprecated = "Normalized types are known to have serious performance issues and should be avoided for new use cases."]
 #[derive(Clone, Debug, Eq, PartialEq, Serialize, Deserialize)]
 pub struct Module {
     pub file_format_version: u32,
@@ -108,9 +117,13 @@ impl Module {
     /// Extract a normalized module from a `CompiledModule`. The module `m` should be verified.
     /// Nothing will break here if that is not the case, but there is little point in computing a
     /// normalized representation of a module that won't verify (since it can't be published).
-    pub fn new(m: &CompiledModule) -> Self {
+    pub fn new(m: &CompiledModule) -> PartialVMResult<Self> {
         let friends = m.immediate_friends();
-        let structs = m.struct_defs().iter().map(|d| Struct::new(m, d)).collect();
+        let structs = m
+            .struct_defs()
+            .iter()
+            .map(|d| Struct::new(m, d))
+            .collect::<PartialVMResult<BTreeMap<_, _>>>()?;
         let exposed_functions = m
             .function_defs()
             .iter()
@@ -125,14 +138,14 @@ impl Module {
             .map(|func_def| Function::new(m, func_def))
             .collect();
 
-        Self {
+        Ok(Self {
             file_format_version: m.version(),
             address: *m.address(),
             name: m.name().to_owned(),
             friends,
             structs,
             exposed_functions,
-        }
+        })
     }
 
     pub fn module_id(&self) -> ModuleId {
@@ -295,7 +308,7 @@ impl Field {
 impl Struct {
     /// Create a `Struct` for `StructDefinition` `def` in module `m`. Panics if `def` is a
     /// a native struct definition.
-    pub fn new(m: &CompiledModule, def: &StructDefinition) -> (Identifier, Self) {
+    pub fn new(m: &CompiledModule, def: &StructDefinition) -> PartialVMResult<(Identifier, Self)> {
         let handle = m.struct_handle_at(def.struct_handle);
         let fields = match &def.field_information {
             StructFieldInformation::Native => {
@@ -305,6 +318,13 @@ impl Struct {
             StructFieldInformation::Declared(fields) => {
                 fields.iter().map(|f| Field::new(m, f)).collect()
             },
+            StructFieldInformation::DeclaredVariants(..) => {
+                // If we run into this it means that the legacy compatibility checker is run
+                // which is based on deprecated normalized representation since the new one
+                // is feature gated.
+                return Err(PartialVMError::new(StatusCode::FEATURE_NOT_ENABLED)
+                    .with_message("enum types".to_string()));
+            },
         };
         let name = m.identifier_at(handle.name).to_owned();
         let s = Struct {
@@ -312,7 +332,7 @@ impl Struct {
             type_parameters: handle.type_parameters.clone(),
             fields,
         };
-        (name, s)
+        Ok((name, s))
     }
 
     pub fn type_param_constraints(&self) -> impl ExactSizeIterator<Item = &AbilitySet> {
diff --git a/third_party/move/move-binary-format/src/proptest_types.rs b/third_party/move/move-binary-format/src/proptest_types.rs
index 011d518efe4de..9625fc5457fb4 100644
--- a/third_party/move/move-binary-format/src/proptest_types.rs
+++ b/third_party/move/move-binary-format/src/proptest_types.rs
@@ -32,7 +32,7 @@ use constants::ConstantPoolGen;
 use functions::{
     FnDefnMaterializeState, FnHandleMaterializeState, FunctionDefinitionGen, FunctionHandleGen,
 };
-use std::collections::{BTreeSet, HashMap};
+use std::collections::BTreeSet;
 
 /// Represents how large [`CompiledModule`] tables can be.
 pub type TableSize = u16;
@@ -300,14 +300,10 @@ impl CompiledModuleStrategyGen {
                         identifiers_len,
                         struct_handles,
                     );
-                    let mut struct_def_to_field_count: HashMap<usize, usize> = HashMap::new();
                     let mut struct_defs: Vec<StructDefinition> = vec![];
                     for struct_def_gen in struct_def_gens {
-                        if let (Some(struct_def), offset) = struct_def_gen.materialize(&mut state) {
+                        if let Some(struct_def) = struct_def_gen.materialize(&mut state) {
                             struct_defs.push(struct_def);
-                            if offset > 0 {
-                                struct_def_to_field_count.insert(struct_defs.len() - 1, offset);
-                            }
                         }
                     }
                     let StDefnMaterializeState { struct_handles, .. } = state;
@@ -352,7 +348,6 @@ impl CompiledModuleStrategyGen {
                         &struct_defs,
                         signatures,
                         function_handles,
-                        struct_def_to_field_count,
                     );
                     let mut function_defs: Vec<FunctionDefinition> = vec![];
                     for function_def_gen in function_def_gens {
@@ -367,6 +362,10 @@ impl CompiledModuleStrategyGen {
                         struct_def_instantiations,
                         function_instantiations,
                         field_instantiations,
+                        variant_field_handles,
+                        variant_field_instantiations,
+                        struct_variant_handles,
+                        struct_variant_instantiations,
                     ) = state.return_tables();
 
                     // Build a compiled module
@@ -386,6 +385,11 @@ impl CompiledModuleStrategyGen {
                         struct_defs,
                         function_defs,
 
+                        variant_field_handles,
+                        variant_field_instantiations,
+                        struct_variant_handles,
+                        struct_variant_instantiations,
+
                         signatures,
 
                         identifiers,
diff --git a/third_party/move/move-binary-format/src/proptest_types/functions.rs b/third_party/move/move-binary-format/src/proptest_types/functions.rs
index e2857b3c80986..806ca57aba9e9 100644
--- a/third_party/move/move-binary-format/src/proptest_types/functions.rs
+++ b/third_party/move/move-binary-format/src/proptest_types/functions.rs
@@ -9,7 +9,10 @@ use crate::{
         FunctionDefinition, FunctionHandle, FunctionHandleIndex, FunctionInstantiation,
         FunctionInstantiationIndex, IdentifierIndex, LocalIndex, ModuleHandleIndex, Signature,
         SignatureIndex, SignatureToken, StructDefInstantiation, StructDefInstantiationIndex,
-        StructDefinition, StructDefinitionIndex, StructHandle, TableIndex, Visibility,
+        StructDefinition, StructDefinitionIndex, StructFieldInformation, StructHandle,
+        StructVariantHandle, StructVariantHandleIndex, StructVariantInstantiation,
+        StructVariantInstantiationIndex, TableIndex, VariantFieldHandle, VariantFieldHandleIndex,
+        VariantFieldInstantiation, VariantFieldInstantiationIndex, VariantIndex, Visibility,
     },
     internals::ModuleIndex,
     proptest_types::{
@@ -30,60 +33,54 @@ use std::{
     hash::Hash,
 };
 
-#[derive(Debug, Default)]
-struct SignatureState {
-    signatures: Vec<Signature>,
-    signature_map: HashMap<Signature, SignatureIndex>,
+#[derive(Debug)]
+struct HandleState<HandleT, IndexT> {
+    handles: Vec<HandleT>,
+    map: HashMap<HandleT, IndexT>,
 }
 
-impl SignatureState {
-    fn new(signatures: Vec<Signature>) -> Self {
-        let mut state = Self::default();
-        for sig in signatures {
-            state.add_signature(sig);
+impl<HandleT, IndexT> Default for HandleState<HandleT, IndexT> {
+    fn default() -> Self {
+        Self {
+            handles: vec![],
+            map: HashMap::new(),
         }
-        state
-    }
-
-    fn signatures(self) -> Vec<Signature> {
-        self.signatures
     }
+}
 
-    fn add_signature(&mut self, sig: Signature) -> SignatureIndex {
-        debug_assert!(self.signatures.len() < TableSize::max_value() as usize);
-        if let Some(idx) = self.signature_map.get(&sig) {
-            return *idx;
+impl<HandleT, IndexT> HandleState<HandleT, IndexT>
+where
+    HandleT: Hash + PartialEq + Eq + Clone,
+    IndexT: Clone,
+{
+    fn add(&mut self, handle: HandleT, make_index: impl Fn(TableIndex) -> IndexT) -> IndexT {
+        debug_assert!(self.handles.len() < TableSize::max_value() as usize);
+        if let Some(idx) = self.map.get(&handle) {
+            return idx.clone();
         }
-        let idx = SignatureIndex(self.signatures.len() as u16);
-        self.signatures.push(sig.clone());
-        self.signature_map.insert(sig, idx);
+        let idx = make_index(self.handles.len() as TableIndex);
+        self.handles.push(handle.clone());
+        self.map.insert(handle, idx.clone());
         idx
     }
-}
 
-#[derive(Debug, Default)]
-#[allow(unused)]
-struct FieldHandleState {
-    field_handles: Vec<FieldHandle>,
-    field_map: HashMap<FieldHandle, FieldHandleIndex>,
+    fn handles(self) -> Vec<HandleT> {
+        self.handles
+    }
 }
 
-impl FieldHandleState {
-    #[allow(unused)]
-    pub fn field_handles(self) -> Vec<FieldHandle> {
-        self.field_handles
-    }
+type SignatureState = HandleState<Signature, SignatureIndex>;
+type FieldHandleState = HandleState<FieldHandle, FieldHandleIndex>;
+type VariantFieldHandleState = HandleState<VariantFieldHandle, VariantFieldHandleIndex>;
+type StructVariantHandleState = HandleState<StructVariantHandle, StructVariantHandleIndex>;
 
-    #[allow(unused)]
-    fn add_field_handle(&mut self, fh: FieldHandle) -> FieldHandleIndex {
-        debug_assert!(self.field_handles.len() < TableSize::max_value() as usize);
-        if let Some(idx) = self.field_map.get(&fh) {
-            return *idx;
+impl SignatureState {
+    fn from(sigs: Vec<Signature>) -> Self {
+        let mut state = Self::default();
+        for sig in sigs {
+            state.add(sig, SignatureIndex);
         }
-        let idx = FieldHandleIndex(self.field_handles.len() as u16);
-        self.field_handles.push(fh.clone());
-        self.field_map.insert(fh, idx);
-        idx
+        state
     }
 }
 
@@ -150,17 +147,17 @@ impl<'a> FnHandleMaterializeState<'a> {
             module_handles_len,
             identifiers_len,
             struct_handles,
-            signatures: SignatureState::new(signatures),
+            signatures: SignatureState::from(signatures),
             function_handles: HashSet::new(),
         }
     }
 
     pub fn signatures(self) -> Vec<Signature> {
-        self.signatures.signatures()
+        self.signatures.handles()
     }
 
     fn add_signature(&mut self, sig: Signature) -> SignatureIndex {
-        self.signatures.add_signature(sig)
+        self.signatures.add(sig, SignatureIndex)
     }
 }
 
@@ -245,12 +242,15 @@ pub struct FnDefnMaterializeState<'a> {
     struct_defs: &'a [StructDefinition],
     signatures: SignatureState,
     function_handles: Vec<FunctionHandle>,
-    struct_def_to_field_count: HashMap<usize, usize>,
     def_function_handles: HashSet<(ModuleHandleIndex, IdentifierIndex)>,
     field_handles: FieldHandleState,
+    variant_field_handles: VariantFieldHandleState,
     type_instantiations: InstantiationState<StructDefInstantiation>,
     function_instantiations: InstantiationState<FunctionInstantiation>,
     field_instantiations: InstantiationState<FieldInstantiation>,
+    variant_field_instantiations: InstantiationState<VariantFieldInstantiation>,
+    struct_variant_handles: StructVariantHandleState,
+    struct_variant_instantiations: InstantiationState<StructVariantInstantiation>,
 }
 
 impl<'a> FnDefnMaterializeState<'a> {
@@ -262,7 +262,6 @@ impl<'a> FnDefnMaterializeState<'a> {
         struct_defs: &'a [StructDefinition],
         signatures: Vec<Signature>,
         function_handles: Vec<FunctionHandle>,
-        struct_def_to_field_count: HashMap<usize, usize>,
     ) -> Self {
         Self {
             self_module_handle_idx,
@@ -270,14 +269,17 @@ impl<'a> FnDefnMaterializeState<'a> {
             constant_pool_len,
             struct_handles,
             struct_defs,
-            signatures: SignatureState::new(signatures),
+            signatures: SignatureState::from(signatures),
             function_handles,
-            struct_def_to_field_count,
             def_function_handles: HashSet::new(),
             field_handles: FieldHandleState::default(),
+            variant_field_handles: VariantFieldHandleState::default(),
             type_instantiations: InstantiationState::new(),
             function_instantiations: InstantiationState::new(),
             field_instantiations: InstantiationState::new(),
+            variant_field_instantiations: InstantiationState::new(),
+            struct_variant_handles: StructVariantHandleState::default(),
+            struct_variant_instantiations: InstantiationState::new(),
         }
     }
 
@@ -290,19 +292,27 @@ impl<'a> FnDefnMaterializeState<'a> {
         Vec<StructDefInstantiation>,
         Vec<FunctionInstantiation>,
         Vec<FieldInstantiation>,
+        Vec<VariantFieldHandle>,
+        Vec<VariantFieldInstantiation>,
+        Vec<StructVariantHandle>,
+        Vec<StructVariantInstantiation>,
     ) {
         (
-            self.signatures.signatures(),
+            self.signatures.handles(),
             self.function_handles,
-            self.field_handles.field_handles(),
+            self.field_handles.handles(),
             self.type_instantiations.instantiations(),
             self.function_instantiations.instantiations(),
             self.field_instantiations.instantiations(),
+            self.variant_field_handles.handles(),
+            self.variant_field_instantiations.instantiations(),
+            self.struct_variant_handles.handles(),
+            self.struct_variant_instantiations.instantiations(),
         )
     }
 
     fn add_signature(&mut self, sig: Signature) -> SignatureIndex {
-        self.signatures.add_signature(sig)
+        self.signatures.add(sig, SignatureIndex)
     }
 
     fn add_function_handle(&mut self, handle: FunctionHandle) -> FunctionHandleIndex {
@@ -331,7 +341,7 @@ impl<'a> FnDefnMaterializeState<'a> {
         abilities: impl IntoIterator<Item = AbilitySet>,
     ) -> SignatureIndex {
         let sig = self.get_signature_from_type_params(abilities);
-        self.signatures.add_signature(sig)
+        self.signatures.add(sig, SignatureIndex)
     }
 
     fn get_function_instantiation(&mut self, fh_idx: usize) -> FunctionInstantiationIndex {
@@ -345,15 +355,19 @@ impl<'a> FnDefnMaterializeState<'a> {
     }
 
     fn get_type_instantiation(&mut self, sd_idx: usize) -> StructDefInstantiationIndex {
-        let sd = &self.struct_defs[sd_idx];
-        let struct_handle = &self.struct_handles[sd.struct_handle.0 as usize];
-        let sig_idx = self.add_signature_from_type_params(struct_handle.type_param_constraints());
+        let sig_idx = self.get_struct_instantiation_sig(sd_idx);
         let si = StructDefInstantiation {
             def: StructDefinitionIndex(sd_idx as TableIndex),
             type_parameters: sig_idx,
         };
         StructDefInstantiationIndex(self.type_instantiations.add_instantiation(si))
     }
+
+    fn get_struct_instantiation_sig(&mut self, sd_idx: usize) -> SignatureIndex {
+        let sd = &self.struct_defs[sd_idx];
+        let struct_handle = &self.struct_handles[sd.struct_handle.0 as usize];
+        self.add_signature_from_type_params(struct_handle.type_param_constraints())
+    }
 }
 
 #[derive(Clone, Debug)]
@@ -496,11 +510,16 @@ enum BytecodeGen {
 
     MutBorrowField((PropIndex, PropIndex)),
     ImmBorrowField((PropIndex, PropIndex)),
+    MutBorrowVariantField((PropIndex, PropIndex, PropIndex)),
+    ImmBorrowVariantField((PropIndex, PropIndex, PropIndex)),
 
     Call(PropIndex),
 
     Pack(PropIndex),
     Unpack(PropIndex),
+    PackVariant((PropIndex, PropIndex)),
+    UnpackVariant((PropIndex, PropIndex)),
+
     Exists(PropIndex),
     MutBorrowGlobal(PropIndex),
     ImmBorrowGlobal(PropIndex),
@@ -536,9 +555,15 @@ impl BytecodeGen {
             any::<PropIndex>().prop_map(LdConst),
             (any::<PropIndex>(), any::<PropIndex>()).prop_map(ImmBorrowField),
             (any::<PropIndex>(), any::<PropIndex>()).prop_map(MutBorrowField),
+            (any::<PropIndex>(), any::<PropIndex>(), any::<PropIndex>())
+                .prop_map(ImmBorrowVariantField),
+            (any::<PropIndex>(), any::<PropIndex>(), any::<PropIndex>())
+                .prop_map(MutBorrowVariantField),
             any::<PropIndex>().prop_map(Call),
             any::<PropIndex>().prop_map(Pack),
             any::<PropIndex>().prop_map(Unpack),
+            (any::<PropIndex>(), any::<PropIndex>()).prop_map(PackVariant),
+            (any::<PropIndex>(), any::<PropIndex>()).prop_map(UnpackVariant),
             any::<PropIndex>().prop_map(Exists),
             any::<PropIndex>().prop_map(ImmBorrowGlobal),
             any::<PropIndex>().prop_map(MutBorrowGlobal),
@@ -580,58 +605,16 @@ impl BytecodeGen {
                 ))
             },
             BytecodeGen::MutBorrowField((def, field)) => {
-                let sd_idx = def.index(state.struct_defs.len());
-                let field_count = state.struct_def_to_field_count.get(&sd_idx)?;
-                if *field_count == 0 {
-                    return None;
-                }
-                let fh_idx = state.field_handles.add_field_handle(FieldHandle {
-                    owner: StructDefinitionIndex(sd_idx as TableIndex),
-                    field: field.index(*field_count) as TableIndex,
-                });
-
-                let struct_handle =
-                    &state.struct_handles[state.struct_defs[sd_idx].struct_handle.0 as usize];
-                if struct_handle.type_parameters.is_empty() {
-                    Bytecode::MutBorrowField(fh_idx)
-                } else {
-                    let sig_idx = state
-                        .add_signature_from_type_params(struct_handle.type_param_constraints());
-                    let fi_idx = state
-                        .field_instantiations
-                        .add_instantiation(FieldInstantiation {
-                            handle: fh_idx,
-                            type_parameters: sig_idx,
-                        });
-                    Bytecode::MutBorrowFieldGeneric(FieldInstantiationIndex(fi_idx))
-                }
+                Self::materialize_borrow(state, def, false, None, field)?
             },
             BytecodeGen::ImmBorrowField((def, field)) => {
-                let sd_idx = def.index(state.struct_defs.len());
-                let field_count = state.struct_def_to_field_count.get(&sd_idx)?;
-                if *field_count == 0 {
-                    return None;
-                }
-                let fh_idx = state.field_handles.add_field_handle(FieldHandle {
-                    owner: StructDefinitionIndex(sd_idx as TableIndex),
-                    field: field.index(*field_count) as TableIndex,
-                });
-
-                let struct_handle =
-                    &state.struct_handles[state.struct_defs[sd_idx].struct_handle.0 as usize];
-                if struct_handle.type_parameters.is_empty() {
-                    Bytecode::ImmBorrowField(fh_idx)
-                } else {
-                    let sig_idx = state
-                        .add_signature_from_type_params(struct_handle.type_param_constraints());
-                    let fi_idx = state
-                        .field_instantiations
-                        .add_instantiation(FieldInstantiation {
-                            handle: fh_idx,
-                            type_parameters: sig_idx,
-                        });
-                    Bytecode::ImmBorrowFieldGeneric(FieldInstantiationIndex(fi_idx))
-                }
+                Self::materialize_borrow(state, def, true, None, field)?
+            },
+            BytecodeGen::MutBorrowVariantField((def, variant, field)) => {
+                Self::materialize_borrow(state, def, false, Some(variant), field)?
+            },
+            BytecodeGen::ImmBorrowVariantField((def, variant, field)) => {
+                Self::materialize_borrow(state, def, true, Some(variant), field)?
             },
             BytecodeGen::Call(idx) => {
                 let func_handles_len = state.function_handles.len();
@@ -643,34 +626,15 @@ impl BytecodeGen {
                     Bytecode::CallGeneric(state.get_function_instantiation(fh_idx))
                 }
             },
-            BytecodeGen::Pack(idx) => {
-                let struct_defs_len = state.struct_defs.len();
-                let sd_idx = idx.index(struct_defs_len);
-
-                let sd = &state.struct_defs[sd_idx];
-                if state.struct_handles[sd.struct_handle.0 as usize]
-                    .type_parameters
-                    .is_empty()
-                {
-                    Bytecode::Pack(StructDefinitionIndex(sd_idx as TableIndex))
-                } else {
-                    Bytecode::PackGeneric(state.get_type_instantiation(sd_idx))
-                }
+            BytecodeGen::Pack(def) => Self::materialize_pack_unpack(state, true, def, None)?,
+            BytecodeGen::Unpack(def) => Self::materialize_pack_unpack(state, false, def, None)?,
+            BytecodeGen::PackVariant((def, variant)) => {
+                Self::materialize_pack_unpack(state, true, def, Some(variant))?
             },
-            BytecodeGen::Unpack(idx) => {
-                let struct_defs_len = state.struct_defs.len();
-                let sd_idx = idx.index(struct_defs_len);
-
-                let sd = &state.struct_defs[sd_idx];
-                if state.struct_handles[sd.struct_handle.0 as usize]
-                    .type_parameters
-                    .is_empty()
-                {
-                    Bytecode::Unpack(StructDefinitionIndex(sd_idx as TableIndex))
-                } else {
-                    Bytecode::UnpackGeneric(state.get_type_instantiation(sd_idx))
-                }
+            BytecodeGen::UnpackVariant((def, variant)) => {
+                Self::materialize_pack_unpack(state, false, def, Some(variant))?
             },
+
             BytecodeGen::Exists(idx) => {
                 let struct_defs_len = state.struct_defs.len();
                 let sd_idx = idx.index(struct_defs_len);
@@ -793,72 +757,72 @@ impl BytecodeGen {
                 if num > u16::MAX as u64 {
                     return None;
                 }
-                let sigs_len = state.signatures.signatures.len();
+                let sigs_len = state.signatures.handles.len();
                 if sigs_len == 0 {
                     return None;
                 }
                 let sig_idx = idx.index(sigs_len);
-                let sig = &state.signatures.signatures[sig_idx];
+                let sig = &state.signatures.handles[sig_idx];
                 if !BytecodeGen::is_valid_vector_element_sig(sig) {
                     return None;
                 }
                 Bytecode::VecPack(SignatureIndex(sig_idx as TableIndex), num)
             },
             BytecodeGen::VecLen(idx) => {
-                let sigs_len = state.signatures.signatures.len();
+                let sigs_len = state.signatures.handles.len();
                 if sigs_len == 0 {
                     return None;
                 }
                 let sig_idx = idx.index(sigs_len);
-                let sig = &state.signatures.signatures[sig_idx];
+                let sig = &state.signatures.handles[sig_idx];
                 if !BytecodeGen::is_valid_vector_element_sig(sig) {
                     return None;
                 }
                 Bytecode::VecLen(SignatureIndex(sig_idx as TableIndex))
             },
             BytecodeGen::VecImmBorrow(idx) => {
-                let sigs_len = state.signatures.signatures.len();
+                let sigs_len = state.signatures.handles.len();
                 if sigs_len == 0 {
                     return None;
                 }
                 let sig_idx = idx.index(sigs_len);
-                let sig = &state.signatures.signatures[sig_idx];
+                let sig = &state.signatures.handles[sig_idx];
                 if !BytecodeGen::is_valid_vector_element_sig(sig) {
                     return None;
                 }
                 Bytecode::VecImmBorrow(SignatureIndex(sig_idx as TableIndex))
             },
             BytecodeGen::VecMutBorrow(idx) => {
-                let sigs_len = state.signatures.signatures.len();
+                let sigs_len = state.signatures.handles.len();
                 if sigs_len == 0 {
                     return None;
                 }
                 let sig_idx = idx.index(sigs_len);
-                let sig = &state.signatures.signatures[sig_idx];
+                let sig = &state.signatures.handles[sig_idx];
                 if !BytecodeGen::is_valid_vector_element_sig(sig) {
                     return None;
                 }
                 Bytecode::VecMutBorrow(SignatureIndex(sig_idx as TableIndex))
             },
             BytecodeGen::VecPushBack(idx) => {
-                let sigs_len = state.signatures.signatures.len();
+                let sigs_len = state.signatures.handles.len();
                 if sigs_len == 0 {
                     return None;
                 }
                 let sig_idx = idx.index(sigs_len);
-                let sig = &state.signatures.signatures[sig_idx];
+                let sig = &state.signatures.handles[sig_idx];
                 if !BytecodeGen::is_valid_vector_element_sig(sig) {
                     return None;
                 }
                 Bytecode::VecPushBack(SignatureIndex(sig_idx as TableIndex))
             },
             BytecodeGen::VecPopBack(idx) => {
-                let sigs_len = state.signatures.signatures.len();
+                let sigs_len = state.signatures.handles.len();
                 if sigs_len == 0 {
                     return None;
                 }
                 let sig_idx = idx.index(sigs_len);
-                let sig = &state.signatures.signatures[sig_idx];
+                let sig = &state.signatures.handles[sig_idx];
                 if !BytecodeGen::is_valid_vector_element_sig(sig) {
                     return None;
                 }
@@ -868,24 +832,24 @@ impl BytecodeGen {
                 if num > u16::MAX as u64 {
                     return None;
                 }
-                let sigs_len = state.signatures.signatures.len();
+                let sigs_len = state.signatures.handles.len();
                 if sigs_len == 0 {
                     return None;
                 }
                 let sig_idx = idx.index(sigs_len);
-                let sig = &state.signatures.signatures[sig_idx];
+                let sig = &state.signatures.handles[sig_idx];
                 if !BytecodeGen::is_valid_vector_element_sig(sig) {
                     return None;
                 }
                 Bytecode::VecUnpack(SignatureIndex(sig_idx as TableIndex), num)
             },
             BytecodeGen::VecSwap(idx) => {
-                let sigs_len = state.signatures.signatures.len();
+                let sigs_len = state.signatures.handles.len();
                 if sigs_len == 0 {
                     return None;
                 }
                 let sig_idx = idx.index(sigs_len);
-                let sig = &state.signatures.signatures[sig_idx];
+                let sig = &state.signatures.handles[sig_idx];
                 if !BytecodeGen::is_valid_vector_element_sig(sig) {
                     return None;
                 }
@@ -896,6 +860,202 @@ impl BytecodeGen {
         Some(bytecode)
     }
 
+    fn materialize_pack_unpack(
+        state: &mut FnDefnMaterializeState,
+        is_pack: bool,
+        def: PropIndex,
+        variant: Option<PropIndex>,
+    ) -> Option<Bytecode> {
+        let struct_defs_len = state.struct_defs.len();
+        let struct_idx = def.index(struct_defs_len);
+        let struct_def_idx = StructDefinitionIndex(struct_idx as TableIndex);
+        let struct_def = &state.struct_defs[struct_idx];
+        let struct_handle = &state.struct_handles[struct_def.struct_handle.0 as usize];
+        let make_opc = |handle: StructDefinitionIndex| {
+            if is_pack {
+                Bytecode::Pack(handle)
+            } else {
+                Bytecode::Unpack(handle)
+            }
+        };
+        let make_gen_opc = |handle: StructDefInstantiationIndex| {
+            if is_pack {
+                Bytecode::PackGeneric(handle)
+            } else {
+                Bytecode::UnpackGeneric(handle)
+            }
+        };
+        let make_variant_opc = |handle: StructVariantHandleIndex| {
+            if is_pack {
+                Bytecode::PackVariant(handle)
+            } else {
+                Bytecode::UnpackVariant(handle)
+            }
+        };
+        let make_gen_variant_opc = |handle: StructVariantInstantiationIndex| {
+            if is_pack {
+                Bytecode::PackVariantGeneric(handle)
+            } else {
+                Bytecode::UnpackVariantGeneric(handle)
+            }
+        };
+        match (&struct_def.field_information, variant) {
+            (StructFieldInformation::Declared(..), None) => {
+                if struct_handle.type_parameters.is_empty() {
+                    Some(make_opc(struct_def_idx))
+                } else {
+                    let sig_idx = state
+                        .add_signature_from_type_params(struct_handle.type_param_constraints());
+                    let si_idx =
+                        state
+                            .type_instantiations
+                            .add_instantiation(StructDefInstantiation {
+                                def: struct_def_idx,
+                                type_parameters: sig_idx,
+                            });
+                    Some(make_gen_opc(StructDefInstantiationIndex(
+                        si_idx as TableIndex,
+                    )))
+                }
+            },
+            (StructFieldInformation::DeclaredVariants(..), Some(var_index)) => {
+                let variant =
+                    var_index.index(struct_def.field_information.variant_count()) as VariantIndex;
+                // Create a new variant handle. Currently, this is not internalized as some
+                // other handles.
+                let sv_idx = state.struct_variant_handles.add(
+                    StructVariantHandle {
+                        struct_index: struct_def_idx,
+                        variant,
+                    },
+                    StructVariantHandleIndex,
+                );
+                if struct_handle.type_parameters.is_empty() {
+                    Some(make_variant_opc(sv_idx))
+                } else {
+                    let sig_idx = state
+                        .add_signature_from_type_params(struct_handle.type_param_constraints());
+                    let si_idx = StructVariantInstantiationIndex(
+                        state.struct_variant_instantiations.add_instantiation(
+                            StructVariantInstantiation {
+                                handle: sv_idx,
+                                type_parameters: sig_idx,
+                            },
+                        ) as TableIndex,
+                    );
+                    Some(make_gen_variant_opc(si_idx))
+                }
+            },
+            _ => {
+                // All other cases pack/unpack not available
+                None
+            },
+        }
+    }
+
+    fn materialize_borrow(
+        state: &mut FnDefnMaterializeState,
+        def: PropIndex,
+        is_imm_borrow: bool,
+        variant: Option<PropIndex>,
+        field: PropIndex,
+    ) -> Option<Bytecode> {
+        let sd_idx = def.index(state.struct_defs.len());
+        let struct_def = &state.struct_defs[sd_idx];
+        let struct_handle = &state.struct_handles[struct_def.struct_handle.0 as usize];
+        let make_opc = |handle: FieldHandleIndex| {
+            if is_imm_borrow {
+                Bytecode::ImmBorrowField(handle)
+            } else {
+                Bytecode::MutBorrowField(handle)
+            }
+        };
+        let make_gen_opc = |handle: FieldInstantiationIndex| {
+            if is_imm_borrow {
+                Bytecode::ImmBorrowFieldGeneric(handle)
+            } else {
+                Bytecode::MutBorrowFieldGeneric(handle)
+            }
+        };
+        let make_variant_opc = |handle: VariantFieldHandleIndex| {
+            if is_imm_borrow {
+                Bytecode::ImmBorrowVariantField(handle)
+            } else {
+                Bytecode::MutBorrowVariantField(handle)
+            }
+        };
+        let make_gen_variant_opc = |handle: VariantFieldInstantiationIndex| {
+            if is_imm_borrow {
+                Bytecode::ImmBorrowVariantFieldGeneric(handle)
+            } else {
+                Bytecode::MutBorrowVariantFieldGeneric(handle)
+            }
+        };
+        match (&struct_def.field_information, variant) {
+            (StructFieldInformation::Declared(..), None) => {
+                let field_count = struct_def.field_information.field_count(None);
+                if field_count == 0 {
+                    return None;
+                }
+                let fh_idx = state.field_handles.add(
+                    FieldHandle {
+                        owner: StructDefinitionIndex(sd_idx as TableIndex),
+                        field: field.index(field_count) as TableIndex,
+                    },
+                    FieldHandleIndex,
+                );
+                if struct_handle.type_parameters.is_empty() {
+                    Some(make_opc(fh_idx))
+                } else {
+                    let sig_idx = state
+                        .add_signature_from_type_params(struct_handle.type_param_constraints());
+                    let fi_idx = state
+                        .field_instantiations
+                        .add_instantiation(FieldInstantiation {
+                            handle: fh_idx,
+                            type_parameters: sig_idx,
+                        });
+                    Some(make_gen_opc(FieldInstantiationIndex(fi_idx as TableIndex)))
+                }
+            },
+            (StructFieldInformation::DeclaredVariants(..), Some(var_index)) => {
+                let variant =
+                    var_index.index(struct_def.field_information.variant_count()) as VariantIndex;
+                let field_count = struct_def.field_information.field_count(Some(variant));
+                if field_count == 0 {
+                    return None;
+                }
+                let fh_idx = state.variant_field_handles.add(
+                    VariantFieldHandle {
+                        struct_index: StructDefinitionIndex(sd_idx as TableIndex),
+                        variants: vec![variant],
+                        field: field.index(field_count) as TableIndex,
+                    },
+                    VariantFieldHandleIndex,
+                );
+                if struct_handle.type_parameters.is_empty() {
+                    Some(make_variant_opc(fh_idx))
+                } else {
+                    let sig_idx = state
+                        .add_signature_from_type_params(struct_handle.type_param_constraints());
+                    let fi_idx = state.variant_field_instantiations.add_instantiation(
+                        VariantFieldInstantiation {
+                            handle: fh_idx,
+                            type_parameters: sig_idx,
+                        },
+                    );
+                    Some(make_gen_variant_opc(VariantFieldInstantiationIndex(
+                        fi_idx as TableIndex,
+                    )))
+                }
+            },
+            _ => {
+                // All other cases borrow not available
+                None
+            },
+        }
+    }
+
     /// Checks if the given type is well defined in the given context.
     /// No references are permitted.
     fn check_signature_token(token: &SignatureToken) -> bool {
diff --git a/third_party/move/move-binary-format/src/proptest_types/types.rs b/third_party/move/move-binary-format/src/proptest_types/types.rs
index a1877c703c52e..03f5a4f7544c3 100644
--- a/third_party/move/move-binary-format/src/proptest_types/types.rs
+++ b/third_party/move/move-binary-format/src/proptest_types/types.rs
@@ -6,7 +6,7 @@ use crate::{
     file_format::{
         AbilitySet, FieldDefinition, IdentifierIndex, ModuleHandleIndex, SignatureToken,
         StructDefinition, StructFieldInformation, StructHandle, StructHandleIndex,
-        StructTypeParameter, TableIndex, TypeSignature,
+        StructTypeParameter, TableIndex, TypeSignature, VariantDefinition,
     },
     internals::ModuleIndex,
     proptest_types::{
@@ -23,6 +23,7 @@ use proptest::{
 };
 use std::collections::BTreeSet;
 
+#[allow(dead_code)]
 #[derive(Debug)]
 struct TypeSignatureIndex(u16);
 
@@ -147,6 +148,8 @@ pub struct StructDefinitionGen {
     type_parameters: Vec<(AbilitySetGen, bool)>,
     #[allow(dead_code)]
     is_public: bool,
+    // Variants to generate, with prop index the name of the variant.
+    variants: Vec<PropIndex>,
     field_defs: Option<Vec<FieldDefinitionGen>>,
 }
 
@@ -163,23 +166,22 @@ impl StructDefinitionGen {
                 type_parameter_count,
             ),
             any::<bool>(),
+            vec(any::<PropIndex>(), 0..4), // Generate up to 4 variants (0 is pure struct)
             option::of(vec(FieldDefinitionGen::strategy(), field_count)),
         )
             .prop_map(
-                |(name_idx, abilities, type_parameters, is_public, field_defs)| Self {
+                |(name_idx, abilities, type_parameters, is_public, variants, field_defs)| Self {
                     name_idx,
                     abilities,
                     type_parameters,
                     is_public,
+                    variants,
                     field_defs,
                 },
             )
     }
 
-    pub fn materialize(
-        self,
-        state: &mut StDefnMaterializeState,
-    ) -> (Option<StructDefinition>, usize) {
+    pub fn materialize(self, state: &mut StDefnMaterializeState) -> Option<StructDefinition> {
         let mut field_names = HashSet::new();
         let mut fields = vec![];
         match self.field_defs {
@@ -215,27 +217,38 @@ impl StructDefinitionGen {
         };
         match state.add_struct_handle(handle) {
             Some(struct_handle) => {
-                if fields.is_empty() {
-                    (
-                        Some(StructDefinition {
-                            struct_handle,
-                            field_information: StructFieldInformation::Native,
-                        }),
-                        0,
-                    )
+                let field_information = if self.variants.is_empty() {
+                    if fields.is_empty() {
+                        StructFieldInformation::Native
+                    } else {
+                        StructFieldInformation::Declared(fields)
+                    }
                 } else {
-                    let field_count = fields.len();
-                    let field_information = StructFieldInformation::Declared(fields);
-                    (
-                        Some(StructDefinition {
-                            struct_handle,
-                            field_information,
-                        }),
-                        field_count,
+                    // partition fields among variants
+                    let mut variant_fields: Vec<Vec<FieldDefinition>> =
+                        (0..self.variants.len()).map(|_| vec![]).collect();
+                    for (i, fd) in fields.into_iter().enumerate() {
+                        variant_fields[i % self.variants.len()].push(fd)
+                    }
+                    StructFieldInformation::DeclaredVariants(
+                        variant_fields
+                            .into_iter()
+                            .zip(self.variants.iter())
+                            .map(|(fields, name)| VariantDefinition {
+                                name: IdentifierIndex(
+                                    name.index(state.identifiers_len) as TableIndex
+                                ),
+                                fields,
+                            })
+                            .collect(),
                     )
-                }
+                };
+                Some(StructDefinition {
+                    struct_handle,
+                    field_information,
+                })
             },
-            None => (None, 0),
+            None => None,
         }
     }
 }
diff --git a/third_party/move/move-binary-format/src/serializer.rs b/third_party/move/move-binary-format/src/serializer.rs
index 4d2ba20bf4d81..78f98741ad6b5 100644
--- a/third_party/move/move-binary-format/src/serializer.rs
+++ b/third_party/move/move-binary-format/src/serializer.rs
@@ -118,6 +118,34 @@ fn serialize_field_inst_index(
     write_as_uleb128(binary, idx.0, FIELD_INST_INDEX_MAX)
 }
 
+fn serialize_variant_field_handle_index(
+    binary: &mut BinaryData,
+    idx: &VariantFieldHandleIndex,
+) -> Result<()> {
+    write_as_uleb128(binary, idx.0, VARIANT_FIELD_HANDLE_INDEX_MAX)
+}
+
+fn serialize_variant_field_inst_index(
+    binary: &mut BinaryData,
+    idx: &VariantFieldInstantiationIndex,
+) -> Result<()> {
+    write_as_uleb128(binary, idx.0, VARIANT_FIELD_INST_INDEX_MAX)
+}
+
+fn serialize_struct_variant_handle_index(
+    binary: &mut BinaryData,
+    idx: &StructVariantHandleIndex,
+) -> Result<()> {
+    write_as_uleb128(binary, idx.0, STRUCT_VARIANT_HANDLE_INDEX_MAX)
+}
+
+fn serialize_struct_variant_inst_index(
+    binary: &mut BinaryData,
+    idx: &StructVariantInstantiationIndex,
+) -> Result<()> {
+    write_as_uleb128(binary, idx.0, STRUCT_VARIANT_INST_INDEX_MAX)
+}
+
 fn serialize_function_inst_index(
     binary: &mut BinaryData,
     idx: &FunctionInstantiationIndex,
@@ -168,10 +196,18 @@ fn serialize_field_count(binary: &mut BinaryData, len: usize) -> Result<()> {
     write_as_uleb128(binary, len as u64, FIELD_COUNT_MAX)
 }
 
+fn serialize_variant_count(binary: &mut BinaryData, len: usize) -> Result<()> {
+    write_as_uleb128(binary, len as u64, VARIANT_COUNT_MAX)
+}
+
 fn serialize_field_offset(binary: &mut BinaryData, offset: u16) -> Result<()> {
     write_as_uleb128(binary, offset, FIELD_OFFSET_MAX)
 }
 
+fn serialize_variant_offset(binary: &mut BinaryData, offset: u16) -> Result<()> {
+    write_as_uleb128(binary, offset, VARIANT_OFFSET_MAX)
+}
+
 fn serialize_acquires_count(binary: &mut BinaryData, len: usize) -> Result<()> {
     write_as_uleb128(binary, len as u64, ACQUIRES_COUNT_MAX)
 }
@@ -300,6 +336,11 @@ struct ModuleSerializer {
     field_handles: (u32, u32),
     field_instantiations: (u32, u32),
     friend_decls: (u32, u32),
+    // Since bytecode version 7
+    variant_field_handles: (u32, u32),
+    variant_field_instantiations: (u32, u32),
+    struct_variant_handles: (u32, u32),
+    struct_variant_instantiations: (u32, u32),
 }
 
 /// Holds data to compute the header of a transaction script binary.
@@ -527,7 +568,7 @@ fn serialize_function_instantiation(
 /// A `String` gets serialized as follows:
 /// - `String` size as a ULEB128
 /// - `String` bytes - *exact format to be defined, Rust utf8 right now*
-fn serialize_identifier(binary: &mut BinaryData, string: &str) -> Result<()> {
+fn serialize_identifier(binary: &mut BinaryData, string: &Identifier) -> Result<()> {
     let bytes = string.as_bytes();
     serialize_identifier_size(binary, bytes.len())?;
     for byte in bytes {
@@ -578,12 +619,8 @@ fn serialize_byte_blob(
 }
 
 /// Serializes a `StructDefinition`.
-///
-/// A `StructDefinition` gets serialized as follows:
-/// - `StructDefinition.handle` as a ULEB128 (index into the `ModuleHandle` table)
-/// - `StructDefinition.field_count` as a ULEB128 (number of fields defined in the type)
-/// - `StructDefinition.fields` as a ULEB128 (index into the `FieldDefinition` table)
 fn serialize_struct_definition(
+    major_version: u32,
     binary: &mut BinaryData,
     struct_definition: &StructDefinition,
 ) -> Result<()> {
@@ -594,6 +631,21 @@ fn serialize_struct_definition(
             binary.push(SerializedNativeStructFlag::DECLARED as u8)?;
             serialize_field_definitions(binary, fields)
         },
+        StructFieldInformation::DeclaredVariants(variants) => {
+            if major_version >= VERSION_7 {
+                binary.push(SerializedNativeStructFlag::DECLARED_VARIANTS as u8)?;
+                serialize_variant_count(binary, variants.len())?;
+                for variant in variants {
+                    serialize_variant_definition(binary, variant)?
+                }
+                Ok(())
+            } else {
+                Err(anyhow!(
+                    "Enum types not supported in bytecode version {}",
+                    major_version
+                ))
+            }
+        },
     }
 }
 
@@ -606,7 +658,7 @@ fn serialize_struct_def_instantiation(
     Ok(())
 }
 
-/// Serializes `FieldDefinition` within a struct.
+/// Serializes `FieldDefinition` list within a struct.
 fn serialize_field_definitions(binary: &mut BinaryData, fields: &[FieldDefinition]) -> Result<()> {
     serialize_field_count(binary, fields.len())?;
     for field_definition in fields {
@@ -615,12 +667,7 @@ fn serialize_field_definitions(binary: &mut BinaryData, fields: &[FieldDefinitio
     Ok(())
 }
 
-/// Serializes a `FieldDefinition`.
-///
-/// A `FieldDefinition` gets serialized as follows:
-/// - `FieldDefinition.struct_` as a ULEB128 (index into the `StructHandle` table)
-/// - `StructDefinition.name` as a ULEB128 (index into the `IdentifierPool` table)
-/// - `StructDefinition.signature` a serialized `TypeSignatureToekn`)
+/// Serializes a `FieldDefinition` within a struct.
 fn serialize_field_definition(
     binary: &mut BinaryData,
     field_definition: &FieldDefinition,
@@ -629,6 +676,14 @@ fn serialize_field_definition(
     serialize_signature_token(binary, &field_definition.signature.0)
 }
 
+fn serialize_variant_definition(
+    binary: &mut BinaryData,
+    variant_definition: &VariantDefinition,
+) -> Result<()> {
+    serialize_identifier_index(binary, &variant_definition.name)?;
+    serialize_field_definitions(binary, &variant_definition.fields)
+}
+
 fn serialize_field_handle(binary: &mut BinaryData, field_handle: &FieldHandle) -> Result<()> {
     serialize_struct_def_index(binary, &field_handle.owner)?;
     serialize_field_offset(binary, field_handle.field)?;
@@ -644,6 +699,46 @@ fn serialize_field_instantiation(
     Ok(())
 }
 
+fn serialize_variant_field_handle(
+    binary: &mut BinaryData,
+    handle: &VariantFieldHandle,
+) -> Result<()> {
+    serialize_struct_def_index(binary, &handle.struct_index)?;
+    serialize_field_offset(binary, handle.field)?;
+    serialize_variant_count(binary, handle.variants.len())?;
+    for variant in &handle.variants {
+        serialize_variant_offset(binary, *variant)?
+    }
+    Ok(())
+}
+
+fn serialize_variant_field_instantiation(
+    binary: &mut BinaryData,
+    inst: &VariantFieldInstantiation,
+) -> Result<()> {
+    serialize_variant_field_handle_index(binary, &inst.handle)?;
+    serialize_signature_index(binary, &inst.type_parameters)?;
+    Ok(())
+}
+
+fn serialize_struct_variant_handle(
+    binary: &mut BinaryData,
+    handle: &StructVariantHandle,
+) -> Result<()> {
+    serialize_struct_def_index(binary, &handle.struct_index)?;
+    serialize_variant_offset(binary, handle.variant)?;
+    Ok(())
+}
+
+fn serialize_struct_variant_instantiation(
+    binary: &mut BinaryData,
+    inst: &StructVariantInstantiation,
+) -> Result<()> {
+    serialize_struct_variant_handle_index(binary, &inst.handle)?;
+    serialize_signature_index(binary, &inst.type_parameters)?;
+    Ok(())
+}
+
 /// Serializes a `Vec<StructDefinitionIndex>`.
 fn serialize_acquires(binary: &mut BinaryData, indices: &[StructDefinitionIndex]) -> Result<()> {
     serialize_acquires_count(binary, indices.len())?;
@@ -933,6 +1028,22 @@ fn serialize_instruction_inner(
             binary.push(Opcodes::IMM_BORROW_FIELD_GENERIC as u8)?;
             serialize_field_inst_index(binary, field_idx)
         },
+        Bytecode::MutBorrowVariantField(field_idx) => {
+            binary.push(Opcodes::MUT_BORROW_VARIANT_FIELD as u8)?;
+            serialize_variant_field_handle_index(binary, field_idx)
+        },
+        Bytecode::MutBorrowVariantFieldGeneric(field_idx) => {
+            binary.push(Opcodes::MUT_BORROW_VARIANT_FIELD_GENERIC as u8)?;
+            serialize_variant_field_inst_index(binary, field_idx)
+        },
+        Bytecode::ImmBorrowVariantField(field_idx) => {
+            binary.push(Opcodes::IMM_BORROW_VARIANT_FIELD as u8)?;
+            serialize_variant_field_handle_index(binary, field_idx)
+        },
+        Bytecode::ImmBorrowVariantFieldGeneric(field_idx) => {
+            binary.push(Opcodes::IMM_BORROW_VARIANT_FIELD_GENERIC as u8)?;
+            serialize_variant_field_inst_index(binary, field_idx)
+        },
         Bytecode::Call(method_idx) => {
             binary.push(Opcodes::CALL as u8)?;
             serialize_function_handle_index(binary, method_idx)
@@ -957,6 +1068,30 @@ fn serialize_instruction_inner(
             binary.push(Opcodes::UNPACK_GENERIC as u8)?;
             serialize_struct_def_inst_index(binary, class_idx)
         },
+        Bytecode::UnpackVariant(class_idx) => {
+            binary.push(Opcodes::UNPACK_VARIANT as u8)?;
+            serialize_struct_variant_handle_index(binary, class_idx)
+        },
+        Bytecode::PackVariant(class_idx) => {
+            binary.push(Opcodes::PACK_VARIANT as u8)?;
+            serialize_struct_variant_handle_index(binary, class_idx)
+        },
+        Bytecode::UnpackVariantGeneric(class_idx) => {
+            binary.push(Opcodes::UNPACK_VARIANT_GENERIC as u8)?;
+            serialize_struct_variant_inst_index(binary, class_idx)
+        },
+        Bytecode::PackVariantGeneric(class_idx) => {
+            binary.push(Opcodes::PACK_VARIANT_GENERIC as u8)?;
+            serialize_struct_variant_inst_index(binary, class_idx)
+        },
+        Bytecode::TestVariant(class_idx) => {
+            binary.push(Opcodes::TEST_VARIANT as u8)?;
+            serialize_struct_variant_handle_index(binary, class_idx)
+        },
+        Bytecode::TestVariantGeneric(class_idx) => {
+            binary.push(Opcodes::TEST_VARIANT_GENERIC as u8)?;
+            serialize_struct_variant_inst_index(binary, class_idx)
+        },
         Bytecode::ReadRef => binary.push(Opcodes::READ_REF as u8),
         Bytecode::WriteRef => binary.push(Opcodes::WRITE_REF as u8),
         Bytecode::Add => binary.push(Opcodes::ADD as u8),
@@ -1083,6 +1218,27 @@ fn serialize_code(major_version: u32, binary: &mut BinaryData, code: &[Bytecode]
     Ok(())
 }
 
+/// Generic function to serialize a table. Maintains a table counter, skipping empty table
+/// entries, and returns start index and length in the binary.
+fn serialize_table<T>(
+    table_count: &mut u8,
+    binary: &mut BinaryData,
+    table: &[T],
+    serializer: impl Fn(&mut BinaryData, &T) -> Result<()>,
+) -> Result<(u32, u32)> {
+    if !table.is_empty() {
+        // Note:  table count is smaller than `max(u8)`, so wrapping_add is safe
+        *table_count = table_count.wrapping_add(1);
+        let start = check_index_in_binary(binary.len())?;
+        for elem in table {
+            serializer(binary, elem)?
+        }
+        Ok((start, checked_calculate_table_size(binary, start)?))
+    } else {
+        Ok((0, 0))
+    }
+}
+
 /// Compute the table size with a check for underflow
 fn checked_calculate_table_size(binary: &mut BinaryData, start: u32) -> Result<u32> {
     let offset = check_index_in_binary(binary.len())?;
@@ -1109,7 +1265,12 @@ impl CommonSerializer {
 
     fn serialize_header(&mut self, binary: &mut BinaryData) -> Result<()> {
         serialize_magic(binary)?;
-        write_u32(binary, self.major_version)?;
+        let version = if self.major_version >= VERSION_7 {
+            APTOS_BYTECODE_VERSION_MASK | self.major_version
+        } else {
+            self.major_version
+        };
+        write_u32(binary, version)?;
         Ok(())
     }
 
@@ -1183,171 +1344,65 @@ impl CommonSerializer {
         tables: &T,
     ) -> Result<()> {
         debug_assert!(self.table_count == 0);
-        self.serialize_module_handles(binary, tables.get_module_handles())?;
-        self.serialize_struct_handles(binary, tables.get_struct_handles())?;
-        self.serialize_function_handles(binary, tables.get_function_handles())?;
+        let mut table_count = self.table_count; // avoid &mut on self
+        self.module_handles = serialize_table(
+            &mut table_count,
+            binary,
+            tables.get_module_handles(),
+            serialize_module_handle,
+        )?;
+        self.struct_handles = serialize_table(
+            &mut table_count,
+            binary,
+            tables.get_struct_handles(),
+            serialize_struct_handle,
+        )?;
+        self.function_handles = serialize_table(
+            &mut table_count,
+            binary,
+            tables.get_function_handles(),
+            |binary, handle| serialize_function_handle(self.major_version, binary, handle),
+        )?;
         debug_assert!(self.table_count < 6);
-        self.serialize_function_instantiations(binary, tables.get_function_instantiations())?;
-        self.serialize_signatures(binary, tables.get_signatures())?;
-        self.serialize_identifiers(binary, tables.get_identifiers())?;
-        self.serialize_address_identifiers(binary, tables.get_address_identifiers())?;
-        self.serialize_constants(binary, tables.get_constant_pool())?;
+        self.function_instantiations = serialize_table(
+            &mut table_count,
+            binary,
+            tables.get_function_instantiations(),
+            serialize_function_instantiation,
+        )?;
+        self.signatures = serialize_table(
+            &mut table_count,
+            binary,
+            tables.get_signatures(),
+            serialize_signature,
+        )?;
+        self.identifiers = serialize_table(
+            &mut table_count,
+            binary,
+            tables.get_identifiers(),
+            serialize_identifier,
+        )?;
+        self.address_identifiers = serialize_table(
+            &mut table_count,
+            binary,
+            tables.get_address_identifiers(),
+            serialize_address,
+        )?;
+        self.constant_pool = serialize_table(
+            &mut table_count,
+            binary,
+            tables.get_constant_pool(),
+            serialize_constant,
+        )?;
         if self.major_version >= VERSION_5 {
-            self.serialize_metadata(binary, tables.get_metadata())?;
-        }
-        Ok(())
-    }
-
-    /// Serializes `ModuleHandle` table.
-    fn serialize_module_handles(
-        &mut self,
-        binary: &mut BinaryData,
-        module_handles: &[ModuleHandle],
-    ) -> Result<()> {
-        if !module_handles.is_empty() {
-            self.table_count += 1;
-            self.module_handles.0 = check_index_in_binary(binary.len())?;
-            for module_handle in module_handles {
-                serialize_module_handle(binary, module_handle)?;
-            }
-            self.module_handles.1 = checked_calculate_table_size(binary, self.module_handles.0)?;
-        }
-        Ok(())
-    }
-
-    /// Serializes `StructHandle` table.
-    fn serialize_struct_handles(
-        &mut self,
-        binary: &mut BinaryData,
-        struct_handles: &[StructHandle],
-    ) -> Result<()> {
-        if !struct_handles.is_empty() {
-            self.table_count += 1;
-            self.struct_handles.0 = check_index_in_binary(binary.len())?;
-            for struct_handle in struct_handles {
-                serialize_struct_handle(binary, struct_handle)?;
-            }
-            self.struct_handles.1 = checked_calculate_table_size(binary, self.struct_handles.0)?;
-        }
-        Ok(())
-    }
-
-    /// Serializes `FunctionHandle` table.
-    fn serialize_function_handles(
-        &mut self,
-        binary: &mut BinaryData,
-        function_handles: &[FunctionHandle],
-    ) -> Result<()> {
-        if !function_handles.is_empty() {
-            self.table_count += 1;
-            self.function_handles.0 = check_index_in_binary(binary.len())?;
-            for function_handle in function_handles {
-                serialize_function_handle(self.major_version, binary, function_handle)?;
-            }
-            self.function_handles.1 =
-                checked_calculate_table_size(binary, self.function_handles.0)?;
-        }
-        Ok(())
-    }
-
-    /// Serializes `FunctionInstantiation` table.
-    fn serialize_function_instantiations(
-        &mut self,
-        binary: &mut BinaryData,
-        function_instantiations: &[FunctionInstantiation],
-    ) -> Result<()> {
-        if !function_instantiations.is_empty() {
-            self.table_count += 1;
-            self.function_instantiations.0 = check_index_in_binary(binary.len())?;
-            for function_instantiation in function_instantiations {
-                serialize_function_instantiation(binary, function_instantiation)?;
-            }
-            self.function_instantiations.1 =
-                checked_calculate_table_size(binary, self.function_instantiations.0)?;
-        }
-        Ok(())
-    }
-
-    /// Serializes `Identifiers`.
-    fn serialize_identifiers(
-        &mut self,
-        binary: &mut BinaryData,
-        identifiers: &[Identifier],
-    ) -> Result<()> {
-        if !identifiers.is_empty() {
-            self.table_count += 1;
-            self.identifiers.0 = check_index_in_binary(binary.len())?;
-            for identifier in identifiers {
-                // User strings and identifiers use the same serialization.
-                serialize_identifier(binary, identifier.as_str())?;
-            }
-            self.identifiers.1 = checked_calculate_table_size(binary, self.identifiers.0)?;
-        }
-        Ok(())
-    }
-
-    /// Serializes `AddressIdentifiers`.
-    fn serialize_address_identifiers(
-        &mut self,
-        binary: &mut BinaryData,
-        addresses: &[AccountAddress],
-    ) -> Result<()> {
-        if !addresses.is_empty() {
-            self.table_count += 1;
-            self.address_identifiers.0 = check_index_in_binary(binary.len())?;
-            for address in addresses {
-                serialize_address(binary, address)?;
-            }
-            self.address_identifiers.1 =
-                checked_calculate_table_size(binary, self.address_identifiers.0)?;
-        }
-        Ok(())
-    }
-
-    /// Serializes `ConstantPool`.
-    fn serialize_constants(
-        &mut self,
-        binary: &mut BinaryData,
-        constants: &[Constant],
-    ) -> Result<()> {
-        if !constants.is_empty() {
-            self.table_count += 1;
-            self.constant_pool.0 = check_index_in_binary(binary.len())?;
-            for constant in constants {
-                serialize_constant(binary, constant)?;
-            }
-            self.constant_pool.1 = checked_calculate_table_size(binary, self.constant_pool.0)?;
-        }
-        Ok(())
-    }
-
-    /// Serializes metadata.
-    fn serialize_metadata(&mut self, binary: &mut BinaryData, metadata: &[Metadata]) -> Result<()> {
-        if !metadata.is_empty() {
-            self.table_count += 1;
-            self.metadata.0 = check_index_in_binary(binary.len())?;
-            for entry in metadata {
-                serialize_metadata_entry(binary, entry)?;
-            }
-            self.metadata.1 = checked_calculate_table_size(binary, self.metadata.0)?;
-        }
-        Ok(())
-    }
-
-    /// Serializes `SignaturePool` table.
-    fn serialize_signatures(
-        &mut self,
-        binary: &mut BinaryData,
-        signatures: &[Signature],
-    ) -> Result<()> {
-        if !signatures.is_empty() {
-            self.table_count += 1;
-            self.signatures.0 = check_index_in_binary(binary.len())?;
-            for signature in signatures {
-                serialize_signature(binary, signature)?;
-            }
-            self.signatures.1 = checked_calculate_table_size(binary, self.signatures.0)?;
+            self.metadata = serialize_table(
+                &mut table_count,
+                binary,
+                tables.get_metadata(),
+                serialize_metadata_entry,
+            )?;
         }
+        self.table_count = table_count;
         Ok(())
     }
 
@@ -1366,17 +1421,82 @@ impl ModuleSerializer {
             field_handles: (0, 0),
             field_instantiations: (0, 0),
             friend_decls: (0, 0),
+            // Since bytecode version 7
+            variant_field_handles: (0, 0),
+            variant_field_instantiations: (0, 0),
+            struct_variant_handles: (0, 0),
+            struct_variant_instantiations: (0, 0),
         }
     }
 
     fn serialize_tables(&mut self, binary: &mut BinaryData, module: &CompiledModule) -> Result<()> {
         self.common.serialize_common_tables(binary, module)?;
-        self.serialize_struct_definitions(binary, &module.struct_defs)?;
-        self.serialize_struct_def_instantiations(binary, &module.struct_def_instantiations)?;
-        self.serialize_function_definitions(binary, &module.function_defs)?;
-        self.serialize_field_handles(binary, &module.field_handles)?;
-        self.serialize_field_instantiations(binary, &module.field_instantiations)?;
-        self.serialize_friend_declarations(binary, &module.friend_decls)
+        let mut table_count = self.common.table_count; // avoid holding &mut on self
+        self.struct_defs = serialize_table(
+            &mut table_count,
+            binary,
+            &module.struct_defs,
+            |binary, def| serialize_struct_definition(self.common.major_version, binary, def),
+        )?;
+        self.struct_def_instantiations = serialize_table(
+            &mut table_count,
+            binary,
+            &module.struct_def_instantiations,
+            serialize_struct_def_instantiation,
+        )?;
+        self.function_defs = serialize_table(
+            &mut table_count,
+            binary,
+            &module.function_defs,
+            |binary, def| self.serialize_function_definition(binary, def),
+        )?;
+        self.field_handles = serialize_table(
+            &mut table_count,
+            binary,
+            &module.field_handles,
+            serialize_field_handle,
+        )?;
+        self.field_instantiations = serialize_table(
+            &mut table_count,
+            binary,
+            &module.field_instantiations,
+            serialize_field_instantiation,
+        )?;
+        self.friend_decls = serialize_table(
+            &mut table_count,
+            binary,
+            &module.friend_decls,
+            serialize_module_handle,
+        )?;
+
+        if self.common.major_version() >= VERSION_7 {
+            self.variant_field_handles = serialize_table(
+                &mut table_count,
+                binary,
+                &module.variant_field_handles,
+                serialize_variant_field_handle,
+            )?;
+            self.variant_field_instantiations = serialize_table(
+                &mut table_count,
+                binary,
+                &module.variant_field_instantiations,
+                serialize_variant_field_instantiation,
+            )?;
+            self.struct_variant_handles = serialize_table(
+                &mut table_count,
+                binary,
+                &module.struct_variant_handles,
+                serialize_struct_variant_handle,
+            )?;
+            self.struct_variant_instantiations = serialize_table(
+                &mut table_count,
+                binary,
+                &module.struct_variant_instantiations,
+                serialize_struct_variant_instantiation,
+            )?;
+        }
+        self.common.table_count = table_count;
+        Ok(())
     }
 
     fn serialize_table_indices(&mut self, binary: &mut BinaryData) -> Result<()> {
@@ -1401,7 +1521,7 @@ impl ModuleSerializer {
         )?;
         serialize_table_index(
             binary,
-            TableType::FIELD_HANDLE,
+            TableType::FIELD_HANDLES,
             self.field_handles.0,
             self.field_handles.1,
         )?;
@@ -1417,91 +1537,33 @@ impl ModuleSerializer {
             self.friend_decls.0,
             self.friend_decls.1,
         )?;
-        Ok(())
-    }
-
-    /// Serializes `StructDefinition` table.
-    fn serialize_struct_definitions(
-        &mut self,
-        binary: &mut BinaryData,
-        struct_definitions: &[StructDefinition],
-    ) -> Result<()> {
-        if !struct_definitions.is_empty() {
-            self.common.table_count = self.common.table_count.wrapping_add(1); // the count will bound to a small number
-            self.struct_defs.0 = check_index_in_binary(binary.len())?;
-            for struct_definition in struct_definitions {
-                serialize_struct_definition(binary, struct_definition)?;
-            }
-            self.struct_defs.1 = checked_calculate_table_size(binary, self.struct_defs.0)?;
-        }
-        Ok(())
-    }
-
-    /// Serializes `StructInstantiation` table.
-    fn serialize_struct_def_instantiations(
-        &mut self,
-        binary: &mut BinaryData,
-        struct_def_instantiations: &[StructDefInstantiation],
-    ) -> Result<()> {
-        if !struct_def_instantiations.is_empty() {
-            self.common.table_count = self.common.table_count.wrapping_add(1); // the count will bound to a small number
-            self.struct_def_instantiations.0 = check_index_in_binary(binary.len())?;
-            for struct_instantiation in struct_def_instantiations {
-                serialize_struct_def_instantiation(binary, struct_instantiation)?;
-            }
-            self.struct_def_instantiations.1 =
-                checked_calculate_table_size(binary, self.struct_def_instantiations.0)?;
-        }
-        Ok(())
-    }
-
-    /// Serializes `FunctionDefinition` table.
-    fn serialize_field_handles(
-        &mut self,
-        binary: &mut BinaryData,
-        field_handles: &[FieldHandle],
-    ) -> Result<()> {
-        if !field_handles.is_empty() {
-            self.common.table_count += 1;
-            self.field_handles.0 = check_index_in_binary(binary.len())?;
-            for field_handle in field_handles {
-                serialize_field_handle(binary, field_handle)?;
-            }
-            self.field_handles.1 = checked_calculate_table_size(binary, self.field_handles.0)?;
-        }
-        Ok(())
-    }
-
-    fn serialize_field_instantiations(
-        &mut self,
-        binary: &mut BinaryData,
-        field_instantiations: &[FieldInstantiation],
-    ) -> Result<()> {
-        if !field_instantiations.is_empty() {
-            self.common.table_count += 1;
-            self.field_instantiations.0 = check_index_in_binary(binary.len())?;
-            for field_instantiation in field_instantiations {
-                serialize_field_instantiation(binary, field_instantiation)?;
-            }
-            self.field_instantiations.1 =
-                checked_calculate_table_size(binary, self.field_instantiations.0)?;
+        if self.common.major_version >= VERSION_7 {
+            serialize_table_index(
+                binary,
+                TableType::VARIANT_FIELD_HANDLES,
+                self.variant_field_handles.0,
+                self.variant_field_handles.1,
+            )?;
+            serialize_table_index(
+                binary,
+                TableType::VARIANT_FIELD_INST,
+                self.variant_field_instantiations.0,
+                self.variant_field_instantiations.1,
+            )?;
+            serialize_table_index(
+                binary,
+                TableType::STRUCT_VARIANT_HANDLES,
+                self.struct_variant_handles.0,
+                self.struct_variant_handles.1,
+            )?;
+            serialize_table_index(
+                binary,
+                TableType::STRUCT_VARIANT_INST,
+                self.struct_variant_instantiations.0,
+                self.struct_variant_instantiations.1,
+            )?;
         }
-        Ok(())
-    }
 
-    fn serialize_function_definitions(
-        &mut self,
-        binary: &mut BinaryData,
-        function_definitions: &[FunctionDefinition],
-    ) -> Result<()> {
-        if !function_definitions.is_empty() {
-            self.common.table_count = self.common.table_count.wrapping_add(1); // the count will bound to a small number
-            self.function_defs.0 = check_index_in_binary(binary.len())?;
-            for function_definition in function_definitions {
-                self.serialize_function_definition(binary, function_definition)?;
-            }
-            self.function_defs.1 = checked_calculate_table_size(binary, self.function_defs.0)?;
-        }
         Ok(())
     }
 
@@ -1515,7 +1577,7 @@ impl ModuleSerializer {
     ///   - bit 0x2: native indicator, indicates whether the function is a native function.
     /// - `FunctionDefinition.code` a variable size stream for the `CodeUnit`
     fn serialize_function_definition(
-        &mut self,
+        &self,
         binary: &mut BinaryData,
         function_definition: &FunctionDefinition,
     ) -> Result<()> {
@@ -1548,22 +1610,6 @@ impl ModuleSerializer {
         }
         Ok(())
     }
-
-    fn serialize_friend_declarations(
-        &mut self,
-        binary: &mut BinaryData,
-        friend_declarations: &[ModuleHandle],
-    ) -> Result<()> {
-        if !friend_declarations.is_empty() {
-            self.common.table_count = self.common.table_count.wrapping_add(1); // the count will bound to a small number
-            self.friend_decls.0 = check_index_in_binary(binary.len())?;
-            for module in friend_declarations {
-                serialize_module_handle(binary, module)?;
-            }
-            self.friend_decls.1 = checked_calculate_table_size(binary, self.friend_decls.0)?;
-        }
-        Ok(())
-    }
 }
 
 impl ScriptSerializer {
diff --git a/third_party/move/move-binary-format/src/unit_tests/compatibility_tests.rs b/third_party/move/move-binary-format/src/unit_tests/compatibility_tests.rs
index b87e4ffe8ae89..4269e0afac7b8 100644
--- a/third_party/move/move-binary-format/src/unit_tests/compatibility_tests.rs
+++ b/third_party/move/move-binary-format/src/unit_tests/compatibility_tests.rs
@@ -1,17 +1,18 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::{compatibility::Compatibility, file_format::*, normalized};
+use crate::{compatibility::Compatibility, file_format::*};
 use move_core_types::{account_address::AccountAddress, identifier::Identifier};
 use std::convert::TryFrom;
 
-fn mk_module(vis: u8) -> normalized::Module {
+#[allow(deprecated)]
+fn mk_module(vis: u8) -> CompiledModule {
     let (visibility, is_entry) = if vis == Visibility::DEPRECATED_SCRIPT {
         (Visibility::Public, true)
     } else {
         (Visibility::try_from(vis).unwrap(), false)
     };
-    let m = CompiledModule {
+    CompiledModule {
         version: crate::file_format_common::VERSION_4,
         module_handles: vec![
             // only self module
@@ -64,8 +65,11 @@ fn mk_module(vis: u8) -> normalized::Module {
         struct_def_instantiations: vec![],
         function_instantiations: vec![],
         field_instantiations: vec![],
-    };
-    normalized::Module::new(&m)
+        struct_variant_handles: vec![],
+        struct_variant_instantiations: vec![],
+        variant_field_handles: vec![],
+        variant_field_instantiations: vec![],
+    }
 }
 
 #[test]
diff --git a/third_party/move/move-binary-format/src/views.rs b/third_party/move/move-binary-format/src/views.rs
index c269e0855a6dd..06f6da840c1e7 100644
--- a/third_party/move/move-binary-format/src/views.rs
+++ b/third_party/move/move-binary-format/src/views.rs
@@ -352,7 +352,9 @@ impl<'a, T: ModuleAccess> StructDefinitionView<'a, T> {
     pub fn is_native(&self) -> bool {
         match &self.struct_def.field_information {
             StructFieldInformation::Native => true,
-            StructFieldInformation::Declared { .. } => false,
+            StructFieldInformation::Declared(..) | StructFieldInformation::DeclaredVariants(..) => {
+                false
+            },
         }
     }
 
@@ -363,20 +365,33 @@ impl<'a, T: ModuleAccess> StructDefinitionView<'a, T> {
     pub fn fields(
         &self,
     ) -> Option<impl DoubleEndedIterator<Item = FieldDefinitionView<'a, T>> + Send> {
+        Some(self.fields_optional_variant(None))
+    }
+
+    pub fn fields_optional_variant(
+        &self,
+        variant: Option<VariantIndex>,
+    ) -> impl DoubleEndedIterator<Item = FieldDefinitionView<'a, T>> + Send {
         let module = self.module;
-        match &self.struct_def.field_information {
-            StructFieldInformation::Native => None,
-            StructFieldInformation::Declared(fields) => Some(
-                fields
-                    .iter()
-                    .map(move |field_def| FieldDefinitionView::new(module, field_def)),
-            ),
-        }
+        self.struct_def
+            .field_information
+            .fields(variant)
+            .into_iter()
+            .map(move |field_def| FieldDefinitionView::new(module, field_def))
     }
 
     pub fn name(&self) -> &'a IdentStr {
         self.struct_handle_view.name()
     }
+
+    pub fn variant_count(&self) -> usize {
+        self.struct_def.field_information.variant_count()
+    }
+
+    pub fn variant_name(&self, idx: VariantIndex) -> &IdentStr {
+        self.module
+            .identifier_at(self.struct_def.field_information.variants()[idx as usize].name)
+    }
 }
 
 pub struct FieldDefinitionView<'a, T> {
@@ -500,7 +515,7 @@ impl<'a, T: ModuleAccess> FunctionDefinitionView<'a, T> {
         self.function_handle_view.parameters()
     }
 
-    pub fn return_(&self) -> &'a Signature {
+    pub fn return_type(&self) -> &'a Signature {
         self.function_handle_view.return_()
     }
 
@@ -729,3 +744,10 @@ impl_view_internals!(FieldDefinitionView, FieldDefinition, field_def);
 impl_view_internals!(TypeSignatureView, TypeSignature, type_signature);
 impl_view_internals!(SignatureView, Signature, signature);
 impl_view_internals!(SignatureTokenView, SignatureToken, token);
+
+/// A type to represent either a FieldHandleIndex or a VariantFieldHandleIndex.
+#[derive(Clone, Copy, Debug, Eq, Ord, PartialEq, PartialOrd)]
+pub enum FieldOrVariantIndex {
+    FieldIndex(FieldHandleIndex),
+    VariantFieldIndex(VariantFieldHandleIndex),
+}
diff --git a/third_party/move/move-bytecode-spec/Cargo.toml b/third_party/move/move-bytecode-spec/Cargo.toml
new file mode 100644
index 0000000000000..56d48533bfe44
--- /dev/null
+++ b/third_party/move/move-bytecode-spec/Cargo.toml
@@ -0,0 +1,18 @@
+[package]
+name = "move-bytecode-spec"
+version = "0.1.0"
+authors = ["Aptos Labs"]
+description = "Procedural macros to generate Move bytecode specification"
+repository = "https://github.com/aptos-labs/aptos-core"
+homepage = "https://aptosfoundation.org/"
+license = "Apache-2.0"
+publish = false
+edition = "2021"
+
+[dependencies]
+once_cell = { workspace = true }
+quote = { workspace = true }
+syn = { workspace = true }
+
+[lib]
+proc-macro = true
diff --git a/third_party/move/move-bytecode-spec/src/lib.rs b/third_party/move/move-bytecode-spec/src/lib.rs
new file mode 100644
index 0000000000000..c0e573d29c304
--- /dev/null
+++ b/third_party/move/move-bytecode-spec/src/lib.rs
@@ -0,0 +1,238 @@
+// Copyright (c) Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+extern crate proc_macro;
+
+use once_cell::sync::Lazy;
+use proc_macro::TokenStream;
+use quote::quote;
+use std::collections::{btree_map, BTreeMap};
+use syn::{parse_macro_input, Data, DeriveInput, Meta};
+
+/// Helper function to convert upper camel case to lower snake case.
+/// This is programmed using a state machine, capable of handling edge cases like
+//  `StudentIDCard -> student_id_card`.
+fn upper_camel_to_lower_snake_case(s: &str) -> String {
+    let mut res = String::new();
+
+    let mut chars = s.chars();
+
+    let mut buffer = match chars.next() {
+        Some(c) => c,
+        None => return res,
+    };
+    let mut ends_with_upper = false;
+
+    for c in chars {
+        match (buffer.is_ascii_uppercase(), c.is_ascii_uppercase()) {
+            (true, true) => {
+                res.push(buffer.to_ascii_lowercase());
+                ends_with_upper = true;
+            },
+            (false, true) => {
+                res.push(buffer);
+                if buffer != '_' {
+                    res.push('_');
+                }
+                ends_with_upper = false;
+            },
+            (true, false) => {
+                if ends_with_upper {
+                    res.push('_');
+                }
+                res.push(buffer.to_ascii_lowercase());
+                ends_with_upper = true;
+            },
+            (false, false) => {
+                res.push(buffer);
+                ends_with_upper = false;
+            },
+        }
+        buffer = c;
+    }
+
+    res.push(buffer.to_ascii_lowercase());
+
+    res
+}
+
+fn trim_leading_indentation(input: &str) -> String {
+    // Split the input into lines and collect into a vector with trailing spaces trimmed
+    let lines: Vec<&str> = input.lines().map(|line| line.trim_end()).collect();
+    if lines.is_empty() {
+        return "".to_string();
+    }
+
+    // Find the first non-empty line
+    let start = lines.iter().position(|line| !line.is_empty()).unwrap_or(0);
+    // Find the last non-empty line
+    let end = lines.iter().rposition(|line| !line.is_empty()).unwrap_or(0);
+
+    // Slice the lines to remove leading and trailing empty lines
+    let trimmed_lines: &[&str] = &lines[start..=end];
+
+    // Determine the minimum indentation (number of leading spaces) across all non-empty lines
+    let min_indent = trimmed_lines
+        .iter()
+        .filter(|line| !line.is_empty())
+        .map(|line| line.chars().take_while(|c| *c == ' ').count())
+        .min()
+        .unwrap_or(0);
+
+    // Create a new string with the leading spaces trimmed according to the minimum indentation
+    let result_lines: Vec<String> = trimmed_lines
+        .iter()
+        .map(|line| {
+            if line.len() > min_indent {
+                line[min_indent..].to_string()
+            } else {
+                line.to_string()
+            }
+        })
+        .collect();
+
+    // Join the lines back together with newline characters
+    result_lines.join("\n")
+}
+
+static KNOWN_ATTRIBUTES: Lazy<BTreeMap<&str, bool>> = Lazy::new(|| {
+    [
+        // The name of the instruction.
+        // Will be automatically derived if not specified.
+        // No need to define it manually unless you want to override it.
+        ("name", false),
+        // The group the instruction belongs to, used to group instructions in rendered docs.
+        ("group", true),
+        // Description of the instruction in human language.
+        ("description", true),
+        // The operands encoded as part of the instruction in the binary format.
+        ("static_operands", false),
+        // The semantics of the instruction, described in pseudocode.
+        ("semantics", true),
+        // Runtime checks performed before the execution of the instruction.
+        ("runtime_check_prologue", false),
+        // Runtime checks performed after the execution of the instruction.
+        ("runtime_check_epilogue", false),
+        // Gas semantics for type creations that are explicitly carried by the instruction.
+        ("gas_type_creation_tier_0", false),
+        // Gas semantics for type creations that are implied by the instruction.
+        ("gas_type_creation_tier_1", false),
+    ]
+    .into_iter()
+    .collect()
+});
+
+static VALID_GROUPS: Lazy<BTreeMap<&str, ()>> = Lazy::new(|| {
+    [
+        "control_flow",
+        "stack_and_local",
+        "reference",
+        "arithmetic",
+        "casting",
+        "bitwise",
+        "comparison",
+        "boolean",
+        "struct",
+        "variant",
+        "global",
+        "vector",
+    ]
+    .into_iter()
+    .map(|attr_name| (attr_name, ()))
+    .collect()
+});
+
+#[proc_macro_attribute]
+pub fn bytecode_spec(_attr: TokenStream, tokens: TokenStream) -> TokenStream {
+    let mut input = parse_macro_input!(tokens as DeriveInput);
+
+    let enum_name = &input.ident;
+    let data = match &mut input.data {
+        Data::Enum(data) => data,
+        _ => panic!("#[bytecode_spec] can only be applied to enums"),
+    };
+
+    let mut maps = Vec::new();
+    for variant in &mut data.variants {
+        let instr_name = variant.ident.to_string();
+
+        let mut map_entries = BTreeMap::new();
+        variant.attrs.retain(|attr| {
+            if let Ok(Meta::NameValue(nv)) = attr.parse_meta() {
+                if let Some(attr_name) = nv.path.get_ident() {
+                    let attr_name = attr_name.to_string();
+                    if KNOWN_ATTRIBUTES.contains_key(attr_name.as_str()) {
+                        match nv.lit {
+                            syn::Lit::Str(s) => {
+                                match map_entries.entry(attr_name) {
+                                    btree_map::Entry::Occupied(entry) => {
+                                        panic!(
+                                            "Instruction {}: attribute \"{}\" defined more than once.",
+                                            instr_name,
+                                            entry.key()
+                                        );
+                                    },
+                                    btree_map::Entry::Vacant(entry) => {
+                                        entry.insert(trim_leading_indentation(&s.value()));
+                                    },
+                                }
+                                return false;
+                            },
+                            _ => panic!("Instruction {}: Invalid value for attribute {}. Expected string literal.", instr_name, attr_name),
+                        }
+                    }
+                }
+            }
+            true
+        });
+
+        match map_entries.entry("name".to_string()) {
+            btree_map::Entry::Occupied(_entry) => (),
+            btree_map::Entry::Vacant(entry) => {
+                entry.insert(upper_camel_to_lower_snake_case(&instr_name));
+            },
+        }
+
+        for (attr, is_required) in &*KNOWN_ATTRIBUTES {
+            if *is_required && !map_entries.contains_key(*attr) {
+                panic!(
+                    "Instruction {}: missing required attribute {}",
+                    instr_name, attr
+                )
+            }
+        }
+        let group = map_entries.get("group").unwrap();
+        if !VALID_GROUPS.contains_key(group.as_str()) {
+            panic!("Instruction {}: invalid group {}", instr_name, group)
+        }
+
+        let mut code = quote! {};
+        for (attr_name, val) in map_entries {
+            code.extend(quote! {
+                map.insert(#attr_name.to_string(), #val.to_string());
+            })
+        }
+
+        maps.push(quote! {
+            {
+                let mut map = std::collections::BTreeMap::new();
+                #code
+                map
+            }
+        });
+    }
+
+    let output = quote! {
+        #input
+
+        impl #enum_name {
+            pub fn spec() -> Vec<std::collections::BTreeMap<String, String>> {
+                vec![
+                    #(#maps),*
+                ]
+            }
+        }
+    };
+
+    output.into()
+}
diff --git a/third_party/move/move-bytecode-spec/tests/tests.rs b/third_party/move/move-bytecode-spec/tests/tests.rs
new file mode 100644
index 0000000000000..83c2ce566f498
--- /dev/null
+++ b/third_party/move/move-bytecode-spec/tests/tests.rs
@@ -0,0 +1,180 @@
+// Copyright (c) Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use move_bytecode_spec::bytecode_spec;
+use std::collections::BTreeMap;
+
+fn test_map(
+    entries: impl IntoIterator<Item = (&'static str, &'static str)>,
+) -> BTreeMap<String, String> {
+    entries
+        .into_iter()
+        .map(|(k, v)| (k.to_string(), v.to_string()))
+        .collect()
+}
+
+#[test]
+fn test_empty_enum() {
+    #[bytecode_spec]
+    enum Empty {}
+
+    assert_eq!(Empty::spec(), vec![]);
+}
+
+#[test]
+#[allow(dead_code)]
+fn test_two_instructions() {
+    #[bytecode_spec]
+    enum Bytecode {
+        #[group = "arithmetic"]
+        #[description = "add two numbers up"]
+        #[semantics = "stack >> a; stack >> b; stack << a + b;"]
+        Add,
+        #[group = "arithmetic"]
+        #[description = "subtract two numbers"]
+        #[semantics = "stack >> a; stack >> b; stack << b - a;"]
+        Sub,
+    }
+
+    assert_eq!(Bytecode::spec(), vec![
+        test_map([
+            ("name", "add"),
+            ("group", "arithmetic"),
+            ("description", "add two numbers up"),
+            ("semantics", "stack >> a; stack >> b; stack << a + b;")
+        ]),
+        test_map([
+            ("name", "sub"),
+            ("group", "arithmetic"),
+            ("description", "subtract two numbers"),
+            ("semantics", "stack >> a; stack >> b; stack << b - a;")
+        ]),
+    ]);
+}
+
+#[test]
+#[allow(dead_code)]
+fn test_name_optional() {
+    #[bytecode_spec]
+    enum Bytecode {
+        #[group = "arithmetic"]
+        #[description = ""]
+        #[semantics = ""]
+        Add,
+    }
+
+    assert_eq!(Bytecode::spec(), vec![test_map([
+        ("name", "add"),
+        ("description", ""),
+        ("semantics", ""),
+        ("group", "arithmetic"),
+    ])]);
+}
+
+#[test]
+#[allow(dead_code)]
+fn test_name_override() {
+    #[bytecode_spec]
+    enum Bytecode {
+        #[name = "ADD"]
+        #[group = "arithmetic"]
+        #[description = ""]
+        #[semantics = ""]
+        Add,
+    }
+
+    assert_eq!(Bytecode::spec(), vec![test_map([
+        ("name", "ADD"),
+        ("description", ""),
+        ("semantics", ""),
+        ("group", "arithmetic"),
+    ])]);
+}
+
+#[test]
+#[allow(dead_code)]
+fn test_indentation() {
+    #[bytecode_spec]
+    enum Bytecode {
+        #[group = "arithmetic"]
+        #[description = r#"
+             first line
+               second line
+              third line
+        "#]
+        #[semantics = ""]
+        Add,
+    }
+
+    assert_eq!(Bytecode::spec(), vec![test_map([
+        ("name", "add"),
+        ("group", "arithmetic"),
+        ("description", "first line\n  second line\n third line"),
+        ("semantics", ""),
+    ])]);
+}
+
+#[test]
+#[allow(dead_code)]
+fn test_empty_lines_in_between() {
+    #[bytecode_spec]
+    enum Bytecode {
+        #[group = "arithmetic"]
+        #[description = r#"
+
+             first line
+
+
+               second line
+
+
+        "#]
+        #[semantics = ""]
+        Add,
+    }
+
+    assert_eq!(Bytecode::spec(), vec![test_map([
+        ("name", "add"),
+        ("group", "arithmetic"),
+        ("description", "first line\n\n\n  second line"),
+        ("semantics", ""),
+    ])]);
+}
+
+#[test]
+#[allow(dead_code)]
+fn test_empty_entry_1() {
+    #[bytecode_spec]
+    enum Bytecode {
+        #[group = "arithmetic"]
+        #[description = ""]
+        #[semantics = ""]
+        Add,
+    }
+
+    assert_eq!(Bytecode::spec(), vec![test_map([
+        ("name", "add"),
+        ("group", "arithmetic"),
+        ("description", ""),
+        ("semantics", ""),
+    ])]);
+}
+
+#[test]
+#[allow(dead_code)]
+fn test_empty_entry_2() {
+    #[bytecode_spec]
+    enum Bytecode {
+        #[group = "arithmetic"]
+        #[description = "  "]
+        #[semantics = ""]
+        Add,
+    }
+
+    assert_eq!(Bytecode::spec(), vec![test_map([
+        ("name", "add"),
+        ("group", "arithmetic"),
+        ("description", ""),
+        ("semantics", ""),
+    ])]);
+}
diff --git a/third_party/move/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/dependencies_tests.rs b/third_party/move/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/dependencies_tests.rs
index ffc0d59f78dc8..0fb0b54bb01f4 100644
--- a/third_party/move/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/dependencies_tests.rs
+++ b/third_party/move/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/dependencies_tests.rs
@@ -70,6 +70,9 @@ fn mk_script_function_module() -> CompiledModule {
                 }),
             },
         ],
+        struct_variant_handles: vec![],
+        struct_variant_instantiations: vec![],
+        variant_field_handles: vec![],
         signatures: vec![
             Signature(vec![]), // void
         ],
@@ -82,6 +85,7 @@ fn mk_script_function_module() -> CompiledModule {
         struct_def_instantiations: vec![],
         function_instantiations: vec![],
         field_instantiations: vec![],
+        variant_field_instantiations: vec![],
     };
     move_bytecode_verifier::verify_module(&m).unwrap();
     m
@@ -165,6 +169,9 @@ fn mk_invoking_module(use_generic: bool, valid: bool) -> CompiledModule {
                 }),
             },
         ],
+        struct_variant_handles: vec![],
+        struct_variant_instantiations: vec![],
+        variant_field_handles: vec![],
         signatures: vec![
             Signature(vec![]),                    // void
             Signature(vec![SignatureToken::U64]), // u64
@@ -177,6 +184,7 @@ fn mk_invoking_module(use_generic: bool, valid: bool) -> CompiledModule {
         friend_decls: vec![],
         struct_def_instantiations: vec![],
         field_instantiations: vec![],
+        variant_field_instantiations: vec![],
     };
     move_bytecode_verifier::verify_module(&m).unwrap();
     m
diff --git a/third_party/move/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/generic_ops_tests.rs b/third_party/move/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/generic_ops_tests.rs
index b1b6ea8ff1b7e..7808e41642981 100644
--- a/third_party/move/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/generic_ops_tests.rs
+++ b/third_party/move/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/generic_ops_tests.rs
@@ -166,6 +166,9 @@ fn make_module() -> CompiledModule {
                 }),
             },
         ],
+        struct_variant_handles: vec![],
+        struct_variant_instantiations: vec![],
+        variant_field_handles: vec![],
         signatures: vec![
             Signature(vec![]),                       // void
             Signature(vec![SignatureToken::Signer]), // Signer
@@ -183,6 +186,7 @@ fn make_module() -> CompiledModule {
         struct_def_instantiations: vec![],
         function_instantiations: vec![],
         field_instantiations: vec![],
+        variant_field_instantiations: vec![],
     }
 }
 
diff --git a/third_party/move/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/limit_tests.rs b/third_party/move/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/limit_tests.rs
index 0118c6455e5a9..4156b1c567fda 100644
--- a/third_party/move/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/limit_tests.rs
+++ b/third_party/move/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/limit_tests.rs
@@ -243,6 +243,10 @@ fn big_vec_unpacks() {
                 code,
             }),
         }],
+        struct_variant_handles: vec![],
+        struct_variant_instantiations: vec![],
+        variant_field_handles: vec![],
+        variant_field_instantiations: vec![],
     };
 
     // save module and verify that it can ser/de
diff --git a/third_party/move/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/signature_tests.rs b/third_party/move/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/signature_tests.rs
index e0b4267e3d72a..e7b9f123d8b86 100644
--- a/third_party/move/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/signature_tests.rs
+++ b/third_party/move/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/signature_tests.rs
@@ -127,6 +127,10 @@ fn no_verify_locals_good() {
                 }),
             },
         ],
+        struct_variant_handles: vec![],
+        struct_variant_instantiations: vec![],
+        variant_field_handles: vec![],
+        variant_field_instantiations: vec![],
     };
     assert!(verify_module(&compiled_module_good).is_ok());
 }
@@ -211,6 +215,10 @@ fn big_signature_test() {
                 code,
             }),
         }],
+        struct_variant_handles: vec![],
+        struct_variant_instantiations: vec![],
+        variant_field_handles: vec![],
+        variant_field_instantiations: vec![],
     };
 
     // save module and verify that it can ser/de
diff --git a/third_party/move/move-bytecode-verifier/invalid-mutations/src/bounds/code_unit.rs b/third_party/move/move-bytecode-verifier/invalid-mutations/src/bounds/code_unit.rs
index 0e1e80282c883..0146087e0cbe3 100644
--- a/third_party/move/move-bytecode-verifier/invalid-mutations/src/bounds/code_unit.rs
+++ b/third_party/move/move-bytecode-verifier/invalid-mutations/src/bounds/code_unit.rs
@@ -485,6 +485,19 @@ impl<'a> ApplyCodeUnitBoundsContext<'a> {
                     | Gt | Le | Ge | Abort | Nop => {
                         panic!("Bytecode has no internal index: {:?}", code[bytecode_idx])
                     },
+                    PackVariant(_)
+                    | PackVariantGeneric(_)
+                    | UnpackVariant(_)
+                    | UnpackVariantGeneric(_)
+                    | TestVariant(_)
+                    | TestVariantGeneric(_)
+                    | MutBorrowVariantField(_)
+                    | MutBorrowVariantFieldGeneric(_)
+                    | ImmBorrowVariantField(_)
+                    | ImmBorrowVariantFieldGeneric(_) => {
+                        // TODO(#13806): implement
+                        panic!("Enum types bytecode NYI: {:?}", code[bytecode_idx])
+                    },
                 };
 
                 code[bytecode_idx] = new_bytecode;
@@ -543,5 +556,19 @@ fn is_interesting(bytecode: &Bytecode) -> bool {
         | LdU256(_) | CastU8 | CastU16 | CastU32 | CastU64 | CastU128 | CastU256 | LdTrue
         | LdFalse | ReadRef | WriteRef | Add | Sub | Mul | Mod | Div | BitOr | BitAnd | Xor
         | Shl | Shr | Or | And | Not | Eq | Neq | Lt | Gt | Le | Ge | Abort | Nop => false,
+
+        PackVariant(_)
+        | PackVariantGeneric(_)
+        | UnpackVariant(_)
+        | UnpackVariantGeneric(_)
+        | TestVariant(_)
+        | TestVariantGeneric(_)
+        | MutBorrowVariantField(_)
+        | MutBorrowVariantFieldGeneric(_)
+        | ImmBorrowVariantField(_)
+        | ImmBorrowVariantFieldGeneric(_) => {
+            // TODO(#13806): implement
+            false
+        },
     }
 }
diff --git a/third_party/move/move-bytecode-verifier/invalid-mutations/src/signature.rs b/third_party/move/move-bytecode-verifier/invalid-mutations/src/signature.rs
index 6181bf66d3ce6..e353e30547b23 100644
--- a/third_party/move/move-bytecode-verifier/invalid-mutations/src/signature.rs
+++ b/third_party/move/move-bytecode-verifier/invalid-mutations/src/signature.rs
@@ -59,15 +59,36 @@ impl<'a> FieldRefMutation<'a> {
         for (s_idx, f_idx) in self.mutations {
             let struct_idx = s_idx.index(module.struct_defs.len());
             let struct_def = &mut module.struct_defs[struct_idx];
-            if let StructFieldInformation::Declared(fields) = &mut struct_def.field_information {
-                if fields.is_empty() {
-                    continue;
-                }
-                let field_idx = f_idx.index(fields.len());
-                let field_def = &mut fields[field_idx];
-                let new_ty = mutate_field(&field_def.signature.0);
-                fields[field_idx].signature = TypeSignature(new_ty);
-                mutations = true;
+            match &mut struct_def.field_information {
+                StructFieldInformation::Declared(fields) => {
+                    if fields.is_empty() {
+                        continue;
+                    }
+                    let field_idx = f_idx.index(fields.len());
+                    let field_def = &mut fields[field_idx];
+                    let new_ty = mutate_field(&field_def.signature.0);
+                    fields[field_idx].signature = TypeSignature(new_ty);
+                    mutations = true;
+                },
+                StructFieldInformation::DeclaredVariants(variants) => {
+                    let all_fields_count = variants.iter().map(|v| v.fields.len()).sum();
+                    if all_fields_count == 0 {
+                        continue;
+                    }
+                    let mut field_idx = f_idx.index(all_fields_count);
+                    let mut variant = 0;
+                    let mut variant_fields = &mut variants[variant].fields;
+                    while field_idx >= variant_fields.len() {
+                        field_idx -= variant_fields.len();
+                        variant += 1;
+                        variant_fields = &mut variants[variant].fields;
+                    }
+                    let field_def = &mut variant_fields[field_idx];
+                    let new_ty = mutate_field(&field_def.signature.0);
+                    variant_fields[field_idx].signature = TypeSignature(new_ty);
+                    mutations = true;
+                },
+                StructFieldInformation::Native => {},
             }
         }
         mutations
diff --git a/third_party/move/move-bytecode-verifier/src/ability_field_requirements.rs b/third_party/move/move-bytecode-verifier/src/ability_field_requirements.rs
index 4480800c71384..c4b67c9c87bda 100644
--- a/third_party/move/move-bytecode-verifier/src/ability_field_requirements.rs
+++ b/third_party/move/move-bytecode-verifier/src/ability_field_requirements.rs
@@ -8,7 +8,9 @@ use move_binary_format::{
     access::ModuleAccess,
     binary_views::BinaryIndexedView,
     errors::{verification_error, Location, PartialVMResult, VMResult},
-    file_format::{AbilitySet, CompiledModule, StructFieldInformation, TableIndex},
+    file_format::{
+        AbilitySet, CompiledModule, FieldDefinition, StructFieldInformation, TableIndex,
+    },
     IndexKind,
 };
 use move_core_types::vm_status::StatusCode;
@@ -21,10 +23,6 @@ fn verify_module_impl(module: &CompiledModule) -> PartialVMResult<()> {
     let view = BinaryIndexedView::Module(module);
     for (idx, struct_def) in module.struct_defs().iter().enumerate() {
         let sh = module.struct_handle_at(struct_def.struct_handle);
-        let fields = match &struct_def.field_information {
-            StructFieldInformation::Native => continue,
-            StructFieldInformation::Declared(fields) => fields,
-        };
         let required_abilities = sh
             .abilities
             .into_iter()
@@ -37,15 +35,42 @@ fn verify_module_impl(module: &CompiledModule) -> PartialVMResult<()> {
             .iter()
             .map(|_| AbilitySet::ALL)
             .collect::<Vec<_>>();
-        for field in fields {
-            let field_abilities = view.abilities(&field.signature.0, &type_parameter_abilities)?;
-            if !required_abilities.is_subset(field_abilities) {
-                return Err(verification_error(
-                    StatusCode::FIELD_MISSING_TYPE_ABILITY,
-                    IndexKind::StructDefinition,
-                    idx as TableIndex,
-                ));
-            }
+        match &struct_def.field_information {
+            StructFieldInformation::Native => continue,
+            StructFieldInformation::Declared(fields) => check_field_abilities(
+                view,
+                idx,
+                required_abilities,
+                &type_parameter_abilities,
+                fields.iter(),
+            )?,
+            StructFieldInformation::DeclaredVariants(variants) => check_field_abilities(
+                view,
+                idx,
+                required_abilities,
+                &type_parameter_abilities,
+                variants.iter().flat_map(|v| v.fields.iter()),
+            )?,
+        }
+    }
+    Ok(())
+}
+
+fn check_field_abilities<'a>(
+    view: BinaryIndexedView,
+    idx: usize,
+    required_abilities: AbilitySet,
+    type_parameter_abilities: &[AbilitySet],
+    fields: impl Iterator<Item = &'a FieldDefinition>,
+) -> PartialVMResult<()> {
+    for field in fields {
+        let field_abilities = view.abilities(&field.signature.0, type_parameter_abilities)?;
+        if !required_abilities.is_subset(field_abilities) {
+            return Err(verification_error(
+                StatusCode::FIELD_MISSING_TYPE_ABILITY,
+                IndexKind::StructDefinition,
+                idx as TableIndex,
+            ));
         }
     }
     Ok(())
diff --git a/third_party/move/move-bytecode-verifier/src/acquires_list_verifier.rs b/third_party/move/move-bytecode-verifier/src/acquires_list_verifier.rs
index 60e76973a7e95..6b15a043ea97b 100644
--- a/third_party/move/move-bytecode-verifier/src/acquires_list_verifier.rs
+++ b/third_party/move/move-bytecode-verifier/src/acquires_list_verifier.rs
@@ -119,6 +119,10 @@ impl<'a> AcquiresVerifier<'a> {
             | Bytecode::MutBorrowFieldGeneric(_)
             | Bytecode::ImmBorrowField(_)
             | Bytecode::ImmBorrowFieldGeneric(_)
+            | Bytecode::MutBorrowVariantField(_)
+            | Bytecode::MutBorrowVariantFieldGeneric(_)
+            | Bytecode::ImmBorrowVariantField(_)
+            | Bytecode::ImmBorrowVariantFieldGeneric(_)
             | Bytecode::LdU8(_)
             | Bytecode::LdU16(_)
             | Bytecode::LdU32(_)
@@ -132,6 +136,12 @@ impl<'a> AcquiresVerifier<'a> {
             | Bytecode::PackGeneric(_)
             | Bytecode::Unpack(_)
             | Bytecode::UnpackGeneric(_)
+            | Bytecode::PackVariant(_)
+            | Bytecode::PackVariantGeneric(_)
+            | Bytecode::UnpackVariant(_)
+            | Bytecode::UnpackVariantGeneric(_)
+            | Bytecode::TestVariant(_)
+            | Bytecode::TestVariantGeneric(_)
             | Bytecode::ReadRef
             | Bytecode::WriteRef
             | Bytecode::CastU8
diff --git a/third_party/move/move-bytecode-verifier/src/check_duplication.rs b/third_party/move/move-bytecode-verifier/src/check_duplication.rs
index 0847657f7cbe0..e79f279dc021d 100644
--- a/third_party/move/move-bytecode-verifier/src/check_duplication.rs
+++ b/third_party/move/move-bytecode-verifier/src/check_duplication.rs
@@ -13,9 +13,9 @@ use move_binary_format::{
     access::{ModuleAccess, ScriptAccess},
     errors::{verification_error, Location, PartialVMResult, VMResult},
     file_format::{
-        CompiledModule, CompiledScript, Constant, FunctionHandle, FunctionHandleIndex,
-        FunctionInstantiation, ModuleHandle, Signature, StructFieldInformation, StructHandle,
-        StructHandleIndex, TableIndex,
+        CompiledModule, CompiledScript, Constant, FieldDefinition, FunctionHandle,
+        FunctionHandleIndex, FunctionInstantiation, ModuleHandle, Signature,
+        StructFieldInformation, StructHandle, StructHandleIndex, TableIndex,
     },
     IndexKind,
 };
@@ -30,7 +30,12 @@ pub struct DuplicationChecker<'a> {
 
 impl<'a> DuplicationChecker<'a> {
     pub fn verify_module(module: &'a CompiledModule) -> VMResult<()> {
-        Self::verify_module_impl(module).map_err(|e| e.finish(Location::Module(module.self_id())))
+        let res = Self::verify_module_impl(module)
+            .map_err(|e| e.finish(Location::Module(module.self_id())));
+        if let Err(e) = res.clone() {
+            println!("error: {}", e)
+        }
+        res
     }
 
     fn verify_module_impl(module: &'a CompiledModule) -> PartialVMResult<()> {
@@ -47,7 +52,7 @@ impl<'a> DuplicationChecker<'a> {
         let checker = Self { module };
         checker.check_field_handles()?;
         checker.check_field_instantiations()?;
-        checker.check_function_defintions()?;
+        checker.check_function_definitions()?;
         checker.check_struct_definitions()?;
         checker.check_struct_instantiations()
     }
@@ -209,24 +214,24 @@ impl<'a> DuplicationChecker<'a> {
         }
         // Field names in structs must be unique
         for (struct_idx, struct_def) in self.module.struct_defs().iter().enumerate() {
-            let fields = match &struct_def.field_information {
+            match &struct_def.field_information {
                 StructFieldInformation::Native => continue,
-                StructFieldInformation::Declared(fields) => fields,
+                StructFieldInformation::Declared(fields) => {
+                    if fields.is_empty() {
+                        return Err(verification_error(
+                            StatusCode::ZERO_SIZED_STRUCT,
+                            IndexKind::StructDefinition,
+                            struct_idx as TableIndex,
+                        ));
+                    }
+                    Self::check_duplicate_fields(fields.iter())?
+                },
+                StructFieldInformation::DeclaredVariants(variants) => {
+                    for variant in variants {
+                        Self::check_duplicate_fields(variant.fields.iter())?
+                    }
+                },
             };
-            if fields.is_empty() {
-                return Err(verification_error(
-                    StatusCode::ZERO_SIZED_STRUCT,
-                    IndexKind::StructDefinition,
-                    struct_idx as TableIndex,
-                ));
-            }
-            if let Some(idx) = Self::first_duplicate_element(fields.iter().map(|x| x.name)) {
-                return Err(verification_error(
-                    StatusCode::DUPLICATE_ELEMENT,
-                    IndexKind::FieldDefinition,
-                    idx,
-                ));
-            }
         }
         // Check that each struct definition is pointing to the self module
         if let Some(idx) = self.module.struct_defs().iter().position(|x| {
@@ -259,7 +264,21 @@ impl<'a> DuplicationChecker<'a> {
         Ok(())
     }
 
-    fn check_function_defintions(&self) -> PartialVMResult<()> {
+    fn check_duplicate_fields<'l>(
+        fields: impl Iterator<Item = &'l FieldDefinition>,
+    ) -> PartialVMResult<()> {
+        if let Some(idx) = Self::first_duplicate_element(fields.map(|x| x.name)) {
+            Err(verification_error(
+                StatusCode::DUPLICATE_ELEMENT,
+                IndexKind::FieldDefinition,
+                idx,
+            ))
+        } else {
+            Ok(())
+        }
+    }
+
+    fn check_function_definitions(&self) -> PartialVMResult<()> {
         // FunctionDefinition - contained FunctionHandle defines uniqueness
         if let Some(idx) =
             Self::first_duplicate_element(self.module.function_defs().iter().map(|x| x.function))
diff --git a/third_party/move/move-bytecode-verifier/src/control_flow_v5.rs b/third_party/move/move-bytecode-verifier/src/control_flow_v5.rs
index 701721117ef2b..bd2d39c073214 100644
--- a/third_party/move/move-bytecode-verifier/src/control_flow_v5.rs
+++ b/third_party/move/move-bytecode-verifier/src/control_flow_v5.rs
@@ -37,7 +37,7 @@ pub fn verify(
 
 fn verify_fallthrough(
     current_function: FunctionDefinitionIndex,
-    code: &Vec<Bytecode>,
+    code: &[Bytecode],
 ) -> PartialVMResult<()> {
     // Check to make sure that the bytecode vector ends with a branching instruction.
     match code.last() {
diff --git a/third_party/move/move-bytecode-verifier/src/features.rs b/third_party/move/move-bytecode-verifier/src/features.rs
new file mode 100644
index 0000000000000..9ea211b09f8ab
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/src/features.rs
@@ -0,0 +1,84 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+//! Verification pass which checks for any features gated by feature flags. Produces
+//! an error if a feature is used which is not enabled.
+
+use crate::VerifierConfig;
+use move_binary_format::{
+    binary_views::BinaryIndexedView,
+    errors::{Location, PartialVMError, PartialVMResult, VMResult},
+    file_format::{CompiledModule, CompiledScript, StructFieldInformation},
+    IndexKind,
+};
+use move_core_types::vm_status::StatusCode;
+
+pub struct FeatureVerifier<'a> {
+    config: &'a VerifierConfig,
+    code: BinaryIndexedView<'a>,
+}
+
+impl<'a> FeatureVerifier<'a> {
+    pub fn verify_module(config: &'a VerifierConfig, module: &'a CompiledModule) -> VMResult<()> {
+        Self::verify_module_impl(config, module)
+            .map_err(|e| e.finish(Location::Module(module.self_id())))
+    }
+
+    fn verify_module_impl(
+        config: &'a VerifierConfig,
+        module: &'a CompiledModule,
+    ) -> PartialVMResult<()> {
+        let verifier = Self {
+            config,
+            code: BinaryIndexedView::Module(module),
+        };
+        verifier.verify_function_handles()?;
+        verifier.verify_struct_defs()
+    }
+
+    pub fn verify_script(config: &'a VerifierConfig, module: &'a CompiledScript) -> VMResult<()> {
+        Self::verify_script_impl(config, module).map_err(|e| e.finish(Location::Script))
+    }
+
+    fn verify_script_impl(
+        config: &'a VerifierConfig,
+        script: &'a CompiledScript,
+    ) -> PartialVMResult<()> {
+        let verifier = Self {
+            config,
+            code: BinaryIndexedView::Script(script),
+        };
+        verifier.verify_function_handles()
+    }
+
+    fn verify_struct_defs(&self) -> PartialVMResult<()> {
+        if !self.config.enable_enum_types {
+            if let Some(defs) = self.code.struct_defs() {
+                for (idx, sdef) in defs.iter().enumerate() {
+                    if matches!(
+                        sdef.field_information,
+                        StructFieldInformation::DeclaredVariants(..)
+                    ) {
+                        return Err(PartialVMError::new(StatusCode::FEATURE_NOT_ENABLED)
+                            .at_index(IndexKind::StructDefinition, idx as u16)
+                            .with_message("enum type feature not enabled".to_string()));
+                    }
+                }
+            }
+        }
+        Ok(())
+    }
+
+    fn verify_function_handles(&self) -> PartialVMResult<()> {
+        if !self.config.enable_resource_access_control {
+            for (idx, function_handle) in self.code.function_handles().iter().enumerate() {
+                if function_handle.access_specifiers.is_some() {
+                    return Err(PartialVMError::new(StatusCode::FEATURE_NOT_ENABLED)
+                        .at_index(IndexKind::FunctionHandle, idx as u16)
+                        .with_message("resource access control feature not enabled".to_string()));
+                }
+            }
+        }
+        Ok(())
+    }
+}
diff --git a/third_party/move/move-bytecode-verifier/src/instruction_consistency.rs b/third_party/move/move-bytecode-verifier/src/instruction_consistency.rs
index de4446e29c502..84abbb3306032 100644
--- a/third_party/move/move-bytecode-verifier/src/instruction_consistency.rs
+++ b/third_party/move/move-bytecode-verifier/src/instruction_consistency.rs
@@ -12,7 +12,8 @@ use move_binary_format::{
     errors::{Location, PartialVMError, PartialVMResult, VMResult},
     file_format::{
         Bytecode, CodeOffset, CodeUnit, CompiledModule, CompiledScript, FieldHandleIndex,
-        FunctionDefinitionIndex, FunctionHandleIndex, StructDefinitionIndex, TableIndex,
+        FunctionDefinitionIndex, FunctionHandleIndex, StructDefinitionIndex,
+        StructVariantHandleIndex, TableIndex, VariantFieldHandleIndex,
     },
 };
 use move_core_types::vm_status::StatusCode;
@@ -62,19 +63,32 @@ impl<'a> InstructionConsistency<'a> {
             use Bytecode::*;
 
             match instr {
-                MutBorrowField(field_handle_index) => {
+                MutBorrowField(field_handle_index) | ImmBorrowField(field_handle_index) => {
                     self.check_field_op(offset, *field_handle_index, /* generic */ false)?;
                 },
-                MutBorrowFieldGeneric(field_inst_index) => {
+                MutBorrowFieldGeneric(field_inst_index)
+                | ImmBorrowFieldGeneric(field_inst_index) => {
                     let field_inst = self.resolver.field_instantiation_at(*field_inst_index)?;
                     self.check_field_op(offset, field_inst.handle, /* generic */ true)?;
                 },
-                ImmBorrowField(field_handle_index) => {
-                    self.check_field_op(offset, *field_handle_index, /* generic */ false)?;
-                },
-                ImmBorrowFieldGeneric(field_inst_index) => {
-                    let field_inst = self.resolver.field_instantiation_at(*field_inst_index)?;
-                    self.check_field_op(offset, field_inst.handle, /* non_ */ true)?;
+                MutBorrowVariantField(field_handle_index)
+                | ImmBorrowVariantField(field_handle_index) => {
+                    self.check_variant_field_op(
+                        offset,
+                        *field_handle_index,
+                        /* generic */ false,
+                    )?;
+                },
+                MutBorrowVariantFieldGeneric(field_inst_index)
+                | ImmBorrowVariantFieldGeneric(field_inst_index) => {
+                    let field_inst = self
+                        .resolver
+                        .variant_field_instantiation_at(*field_inst_index)?;
+                    self.check_variant_field_op(
+                        offset,
+                        field_inst.handle,
+                        /* generic */ true,
+                    )?;
                 },
                 Call(idx) => {
                     self.check_function_op(offset, *idx, /* generic */ false)?;
@@ -83,54 +97,33 @@ impl<'a> InstructionConsistency<'a> {
                     let func_inst = self.resolver.function_instantiation_at(*idx);
                     self.check_function_op(offset, func_inst.handle, /* generic */ true)?;
                 },
-                Pack(idx) => {
-                    self.check_type_op(offset, *idx, /* generic */ false)?;
+                Pack(idx) | Unpack(idx) => {
+                    self.check_struct_op(offset, *idx, /* generic */ false)?;
                 },
-                PackGeneric(idx) => {
+                PackGeneric(idx) | UnpackGeneric(idx) => {
                     let struct_inst = self.resolver.struct_instantiation_at(*idx)?;
-                    self.check_type_op(offset, struct_inst.def, /* generic */ true)?;
+                    self.check_struct_op(offset, struct_inst.def, /* generic */ true)?;
                 },
-                Unpack(idx) => {
-                    self.check_type_op(offset, *idx, /* generic */ false)?;
+                PackVariant(idx) | UnpackVariant(idx) | TestVariant(idx) => {
+                    self.check_variant_op(offset, *idx, /* generic */ false)?;
                 },
-                UnpackGeneric(idx) => {
-                    let struct_inst = self.resolver.struct_instantiation_at(*idx)?;
-                    self.check_type_op(offset, struct_inst.def, /* generic */ true)?;
+                PackVariantGeneric(idx) | UnpackVariantGeneric(idx) | TestVariantGeneric(idx) => {
+                    let struct_inst = self.resolver.struct_variant_instantiation_at(*idx)?;
+                    self.check_variant_op(offset, struct_inst.handle, /* generic */ true)?;
                 },
-                MutBorrowGlobal(idx) => {
-                    self.check_type_op(offset, *idx, /* generic */ false)?;
+                MutBorrowGlobal(idx) | ImmBorrowGlobal(idx) => {
+                    self.check_struct_op(offset, *idx, /* generic */ false)?;
                 },
-                MutBorrowGlobalGeneric(idx) => {
+                MutBorrowGlobalGeneric(idx) | ImmBorrowGlobalGeneric(idx) => {
                     let struct_inst = self.resolver.struct_instantiation_at(*idx)?;
-                    self.check_type_op(offset, struct_inst.def, /* generic */ true)?;
+                    self.check_struct_op(offset, struct_inst.def, /* generic */ true)?;
                 },
-                ImmBorrowGlobal(idx) => {
-                    self.check_type_op(offset, *idx, /* generic */ false)?;
+                Exists(idx) | MoveFrom(idx) | MoveTo(idx) => {
+                    self.check_struct_op(offset, *idx, /* generic */ false)?;
                 },
-                ImmBorrowGlobalGeneric(idx) => {
+                ExistsGeneric(idx) | MoveFromGeneric(idx) | MoveToGeneric(idx) => {
                     let struct_inst = self.resolver.struct_instantiation_at(*idx)?;
-                    self.check_type_op(offset, struct_inst.def, /* generic */ true)?;
-                },
-                Exists(idx) => {
-                    self.check_type_op(offset, *idx, /* generic */ false)?;
-                },
-                ExistsGeneric(idx) => {
-                    let struct_inst = self.resolver.struct_instantiation_at(*idx)?;
-                    self.check_type_op(offset, struct_inst.def, /* generic */ true)?;
-                },
-                MoveFrom(idx) => {
-                    self.check_type_op(offset, *idx, /* generic */ false)?;
-                },
-                MoveFromGeneric(idx) => {
-                    let struct_inst = self.resolver.struct_instantiation_at(*idx)?;
-                    self.check_type_op(offset, struct_inst.def, /* generic */ true)?;
-                },
-                MoveTo(idx) => {
-                    self.check_type_op(offset, *idx, /* generic */ false)?;
-                },
-                MoveToGeneric(idx) => {
-                    let struct_inst = self.resolver.struct_instantiation_at(*idx)?;
-                    self.check_type_op(offset, struct_inst.def, /* generic */ true)?;
+                    self.check_struct_op(offset, struct_inst.def, /* generic */ true)?;
                 },
                 VecPack(_, num) | VecUnpack(_, num) => {
                     if *num > u16::MAX as u64 {
@@ -167,14 +160,24 @@ impl<'a> InstructionConsistency<'a> {
         generic: bool,
     ) -> PartialVMResult<()> {
         let field_handle = self.resolver.field_handle_at(field_handle_index)?;
-        self.check_type_op(offset, field_handle.owner, generic)
+        self.check_struct_op(offset, field_handle.owner, generic)
+    }
+
+    fn check_variant_field_op(
+        &self,
+        offset: usize,
+        field_handle_index: VariantFieldHandleIndex,
+        generic: bool,
+    ) -> PartialVMResult<()> {
+        let field_handle = self.resolver.variant_field_handle_at(field_handle_index)?;
+        self.check_struct_op(offset, field_handle.struct_index, generic)
     }
 
     fn current_function(&self) -> FunctionDefinitionIndex {
         self.current_function.unwrap_or(FunctionDefinitionIndex(0))
     }
 
-    fn check_type_op(
+    fn check_struct_op(
         &self,
         offset: usize,
         struct_def_index: StructDefinitionIndex,
@@ -191,6 +194,24 @@ impl<'a> InstructionConsistency<'a> {
         Ok(())
     }
 
+    fn check_variant_op(
+        &self,
+        offset: usize,
+        idx: StructVariantHandleIndex,
+        generic: bool,
+    ) -> PartialVMResult<()> {
+        let variant_handle = self.resolver.struct_variant_handle_at(idx)?;
+        let struct_def = self.resolver.struct_def_at(variant_handle.struct_index)?;
+        let struct_handle = self.resolver.struct_handle_at(struct_def.struct_handle);
+        if struct_handle.type_parameters.is_empty() == generic {
+            return Err(
+                PartialVMError::new(StatusCode::GENERIC_MEMBER_OPCODE_MISMATCH)
+                    .at_code_offset(self.current_function(), offset as CodeOffset),
+            );
+        }
+        Ok(())
+    }
+
     fn check_function_op(
         &self,
         offset: usize,
diff --git a/third_party/move/move-bytecode-verifier/src/lib.rs b/third_party/move/move-bytecode-verifier/src/lib.rs
index 96ecc43bd54c0..19e53f730c710 100644
--- a/third_party/move/move-bytecode-verifier/src/lib.rs
+++ b/third_party/move/move-bytecode-verifier/src/lib.rs
@@ -41,6 +41,7 @@ pub use verifier::{
 };
 
 mod acquires_list_verifier;
+mod features;
 mod locals_safety;
 pub mod meter;
 mod reference_safety;
diff --git a/third_party/move/move-bytecode-verifier/src/limits.rs b/third_party/move/move-bytecode-verifier/src/limits.rs
index e8019b70ff9f1..8d95b0b55aa13 100644
--- a/third_party/move/move-bytecode-verifier/src/limits.rs
+++ b/third_party/move/move-bytecode-verifier/src/limits.rs
@@ -9,6 +9,7 @@ use move_binary_format::{
     IndexKind,
 };
 use move_core_types::vm_status::StatusCode;
+use std::cmp;
 
 pub struct LimitsVerifier<'a> {
     resolver: BinaryIndexedView<'a>,
@@ -155,16 +156,36 @@ impl<'a> LimitsVerifier<'a> {
             }
             if let Some(max_fields_in_struct) = config.max_fields_in_struct {
                 for def in defs {
+                    let mut max = 0;
                     match &def.field_information {
-                        StructFieldInformation::Native => (),
-                        StructFieldInformation::Declared(fields) => {
-                            if fields.len() > max_fields_in_struct {
-                                return Err(PartialVMError::new(
-                                    StatusCode::MAX_FIELD_DEFINITIONS_REACHED,
-                                ));
+                        StructFieldInformation::Native => {},
+                        StructFieldInformation::Declared(fields) => max += fields.len(),
+                        StructFieldInformation::DeclaredVariants(variants) => {
+                            // Notice we interpret the bound as a maximum of the combined
+                            // size of fields of a given variant, not the
+                            // sum of all fields in all variants. An upper bound for
+                            // overall fields of a variant struct is given by
+                            // `max_fields_in_struct * max_struct_variants`
+                            for variant in variants {
+                                let count = variant.fields.len();
+                                max = cmp::max(max, count)
                             }
                         },
                     }
+                    if max > max_fields_in_struct {
+                        return Err(PartialVMError::new(
+                            StatusCode::MAX_FIELD_DEFINITIONS_REACHED,
+                        ));
+                    }
+                }
+            }
+            if let Some(max_struct_variants) = config.max_struct_variants {
+                for def in defs {
+                    if matches!(&def.field_information,
+                        StructFieldInformation::DeclaredVariants(variants) if variants.len() > max_struct_variants)
+                    {
+                        return Err(PartialVMError::new(StatusCode::MAX_STRUCT_VARIANTS_REACHED));
+                    }
                 }
             }
         }
diff --git a/third_party/move/move-bytecode-verifier/src/locals_safety/mod.rs b/third_party/move/move-bytecode-verifier/src/locals_safety/mod.rs
index 444a8c2f42414..7d27f91f54e83 100644
--- a/third_party/move/move-bytecode-verifier/src/locals_safety/mod.rs
+++ b/third_party/move/move-bytecode-verifier/src/locals_safety/mod.rs
@@ -100,6 +100,10 @@ fn execute_inner(
         | Bytecode::MutBorrowFieldGeneric(_)
         | Bytecode::ImmBorrowField(_)
         | Bytecode::ImmBorrowFieldGeneric(_)
+        | Bytecode::MutBorrowVariantField(_)
+        | Bytecode::MutBorrowVariantFieldGeneric(_)
+        | Bytecode::ImmBorrowVariantField(_)
+        | Bytecode::ImmBorrowVariantFieldGeneric(_)
         | Bytecode::LdU8(_)
         | Bytecode::LdU16(_)
         | Bytecode::LdU32(_)
@@ -115,6 +119,12 @@ fn execute_inner(
         | Bytecode::PackGeneric(_)
         | Bytecode::Unpack(_)
         | Bytecode::UnpackGeneric(_)
+        | Bytecode::PackVariant(_)
+        | Bytecode::PackVariantGeneric(_)
+        | Bytecode::UnpackVariant(_)
+        | Bytecode::UnpackVariantGeneric(_)
+        | Bytecode::TestVariant(_)
+        | Bytecode::TestVariantGeneric(_)
         | Bytecode::ReadRef
         | Bytecode::WriteRef
         | Bytecode::CastU8
diff --git a/third_party/move/move-bytecode-verifier/src/reference_safety/abstract_state.rs b/third_party/move/move-bytecode-verifier/src/reference_safety/abstract_state.rs
index 2e31fb5bcb509..11d368ac9d6e7 100644
--- a/third_party/move/move-bytecode-verifier/src/reference_safety/abstract_state.rs
+++ b/third_party/move/move-bytecode-verifier/src/reference_safety/abstract_state.rs
@@ -11,10 +11,11 @@ use move_binary_format::{
     binary_views::FunctionView,
     errors::{PartialVMError, PartialVMResult},
     file_format::{
-        CodeOffset, FieldHandleIndex, FunctionDefinitionIndex, LocalIndex, Signature,
-        SignatureToken, StructDefinitionIndex,
+        CodeOffset, FunctionDefinitionIndex, LocalIndex, Signature, SignatureToken,
+        StructDefinitionIndex,
     },
     safe_unwrap,
+    views::FieldOrVariantIndex,
 };
 use move_borrow_graph::references::RefID;
 use move_core_types::vm_status::StatusCode;
@@ -58,7 +59,7 @@ impl AbstractValue {
 enum Label {
     Local(LocalIndex),
     Global(StructDefinitionIndex),
-    Field(FieldHandleIndex),
+    Field(FieldOrVariantIndex),
 }
 
 // Needed for debugging with the borrow graph
@@ -67,7 +68,10 @@ impl std::fmt::Display for Label {
         match self {
             Label::Local(i) => write!(f, "local#{}", i),
             Label::Global(i) => write!(f, "resource@{}", i),
-            Label::Field(i) => write!(f, "field#{}", i),
+            Label::Field(FieldOrVariantIndex::FieldIndex(i)) => write!(f, "field#{}", i),
+            Label::Field(FieldOrVariantIndex::VariantFieldIndex(i)) => {
+                write!(f, "variant_field#{}", i)
+            },
         }
     }
 }
@@ -172,7 +176,7 @@ impl AbstractState {
         self.borrow_graph.add_weak_borrow((), parent, child)
     }
 
-    fn add_field_borrow(&mut self, parent: RefID, field: FieldHandleIndex, child: RefID) {
+    fn add_field_borrow(&mut self, parent: RefID, field: FieldOrVariantIndex, child: RefID) {
         self.borrow_graph
             .add_strong_field_borrow((), parent, Label::Field(field), child)
     }
@@ -248,7 +252,7 @@ impl AbstractState {
     /// checks if `id` is freezable
     /// - Mutable references are freezable if there are no consistent mutable borrows
     /// - Immutable references are not freezable by the typing rules
-    fn is_freezable(&self, id: RefID, at_field_opt: Option<FieldHandleIndex>) -> bool {
+    fn is_freezable(&self, id: RefID, at_field_opt: Option<FieldOrVariantIndex>) -> bool {
         assert!(self.borrow_graph.is_mutable(id));
         !self.has_consistent_mutable_borrows(id, at_field_opt.map(Label::Field))
     }
@@ -256,7 +260,7 @@ impl AbstractState {
     /// checks if `id` is readable
     /// - Mutable references are readable if they are freezable
     /// - Immutable references are always readable
-    fn is_readable(&self, id: RefID, at_field_opt: Option<FieldHandleIndex>) -> bool {
+    fn is_readable(&self, id: RefID, at_field_opt: Option<FieldOrVariantIndex>) -> bool {
         let is_mutable = self.borrow_graph.is_mutable(id);
         !is_mutable || self.is_freezable(id, at_field_opt)
     }
@@ -433,7 +437,7 @@ impl AbstractState {
         offset: CodeOffset,
         mut_: bool,
         id: RefID,
-        field: FieldHandleIndex,
+        field: FieldOrVariantIndex,
     ) -> PartialVMResult<AbstractValue> {
         // Any field borrows will be factored out, so don't check in the mutable case
         let is_mut_borrow_with_full_borrows = || mut_ && self.has_full_borrows(id);
diff --git a/third_party/move/move-bytecode-verifier/src/reference_safety/mod.rs b/third_party/move/move-bytecode-verifier/src/reference_safety/mod.rs
index 90a89194b6b2d..2d70d91ae314f 100644
--- a/third_party/move/move-bytecode-verifier/src/reference_safety/mod.rs
+++ b/third_party/move/move-bytecode-verifier/src/reference_safety/mod.rs
@@ -23,9 +23,10 @@ use move_binary_format::{
     errors::{PartialVMError, PartialVMResult},
     file_format::{
         Bytecode, CodeOffset, FunctionDefinitionIndex, FunctionHandle, IdentifierIndex,
-        SignatureIndex, SignatureToken, StructDefinition, StructFieldInformation,
+        SignatureIndex, SignatureToken, StructDefinition, StructVariantHandle, VariantIndex,
     },
     safe_assert, safe_unwrap,
+    views::FieldOrVariantIndex,
 };
 use move_core_types::vm_status::StatusCode;
 use std::collections::{BTreeSet, HashMap};
@@ -100,10 +101,11 @@ fn call(
 }
 
 fn num_fields(struct_def: &StructDefinition) -> usize {
-    match &struct_def.field_information {
-        StructFieldInformation::Native => 0,
-        StructFieldInformation::Declared(fields) => fields.len(),
-    }
+    struct_def.field_information.field_count(None)
+}
+
+fn num_fields_variant(struct_def: &StructDefinition, variant: VariantIndex) -> usize {
+    struct_def.field_information.field_count(Some(variant))
 }
 
 fn pack(
@@ -130,6 +132,47 @@ fn unpack(
     Ok(())
 }
 
+fn pack_variant(
+    verifier: &mut ReferenceSafetyAnalysis,
+    struct_variant_handle: &StructVariantHandle,
+) -> PartialVMResult<()> {
+    let struct_def = verifier
+        .resolver
+        .struct_def_at(struct_variant_handle.struct_index)?;
+    for _ in 0..num_fields_variant(struct_def, struct_variant_handle.variant) {
+        safe_assert!(safe_unwrap!(verifier.stack.pop()).is_value())
+    }
+    verifier.stack.push(AbstractValue::NonReference);
+    Ok(())
+}
+
+fn unpack_variant(
+    verifier: &mut ReferenceSafetyAnalysis,
+    struct_variant_handle: &StructVariantHandle,
+) -> PartialVMResult<()> {
+    let struct_def = verifier
+        .resolver
+        .struct_def_at(struct_variant_handle.struct_index)?;
+    safe_assert!(safe_unwrap!(verifier.stack.pop()).is_value());
+    for _ in 0..num_fields_variant(struct_def, struct_variant_handle.variant) {
+        verifier.stack.push(AbstractValue::NonReference)
+    }
+    Ok(())
+}
+
+fn test_variant(
+    verifier: &mut ReferenceSafetyAnalysis,
+    state: &mut AbstractState,
+    _struct_variant_handle: &StructVariantHandle,
+    offset: CodeOffset,
+) -> PartialVMResult<()> {
+    let id = safe_unwrap!(safe_unwrap!(verifier.stack.pop()).ref_id());
+    // Testing a variant behaves like a read operation on the reference
+    let value = state.read_ref(offset, id)?;
+    verifier.stack.push(value);
+    Ok(())
+}
+
 fn vec_element_type(
     verifier: &mut ReferenceSafetyAnalysis,
     idx: SignatureIndex,
@@ -205,7 +248,12 @@ fn execute_inner(
         },
         Bytecode::MutBorrowField(field_handle_index) => {
             let id = safe_unwrap!(safe_unwrap!(verifier.stack.pop()).ref_id());
-            let value = state.borrow_field(offset, true, id, *field_handle_index)?;
+            let value = state.borrow_field(
+                offset,
+                true,
+                id,
+                FieldOrVariantIndex::FieldIndex(*field_handle_index),
+            )?;
             verifier.stack.push(value)
         },
         Bytecode::MutBorrowFieldGeneric(field_inst_index) => {
@@ -213,12 +261,22 @@ fn execute_inner(
                 .resolver
                 .field_instantiation_at(*field_inst_index)?;
             let id = safe_unwrap!(safe_unwrap!(verifier.stack.pop()).ref_id());
-            let value = state.borrow_field(offset, true, id, field_inst.handle)?;
+            let value = state.borrow_field(
+                offset,
+                true,
+                id,
+                FieldOrVariantIndex::FieldIndex(field_inst.handle),
+            )?;
             verifier.stack.push(value)
         },
         Bytecode::ImmBorrowField(field_handle_index) => {
             let id = safe_unwrap!(safe_unwrap!(verifier.stack.pop()).ref_id());
-            let value = state.borrow_field(offset, false, id, *field_handle_index)?;
+            let value = state.borrow_field(
+                offset,
+                false,
+                id,
+                FieldOrVariantIndex::FieldIndex(*field_handle_index),
+            )?;
             verifier.stack.push(value)
         },
         Bytecode::ImmBorrowFieldGeneric(field_inst_index) => {
@@ -226,10 +284,60 @@ fn execute_inner(
                 .resolver
                 .field_instantiation_at(*field_inst_index)?;
             let id = safe_unwrap!(safe_unwrap!(verifier.stack.pop()).ref_id());
-            let value = state.borrow_field(offset, false, id, field_inst.handle)?;
+            let value = state.borrow_field(
+                offset,
+                false,
+                id,
+                FieldOrVariantIndex::FieldIndex(field_inst.handle),
+            )?;
+            verifier.stack.push(value)
+        },
+        Bytecode::MutBorrowVariantField(field_handle_index) => {
+            let id = safe_unwrap!(safe_unwrap!(verifier.stack.pop()).ref_id());
+            let value = state.borrow_field(
+                offset,
+                true,
+                id,
+                FieldOrVariantIndex::VariantFieldIndex(*field_handle_index),
+            )?;
+            verifier.stack.push(value)
+        },
+        Bytecode::MutBorrowVariantFieldGeneric(field_inst_index) => {
+            let field_inst = verifier
+                .resolver
+                .variant_field_instantiation_at(*field_inst_index)?;
+            let id = safe_unwrap!(safe_unwrap!(verifier.stack.pop()).ref_id());
+            let value = state.borrow_field(
+                offset,
+                true,
+                id,
+                FieldOrVariantIndex::VariantFieldIndex(field_inst.handle),
+            )?;
+            verifier.stack.push(value)
+        },
+        Bytecode::ImmBorrowVariantField(field_handle_index) => {
+            let id = safe_unwrap!(safe_unwrap!(verifier.stack.pop()).ref_id());
+            let value = state.borrow_field(
+                offset,
+                false,
+                id,
+                FieldOrVariantIndex::VariantFieldIndex(*field_handle_index),
+            )?;
+            verifier.stack.push(value)
+        },
+        Bytecode::ImmBorrowVariantFieldGeneric(field_inst_index) => {
+            let field_inst = verifier
+                .resolver
+                .variant_field_instantiation_at(*field_inst_index)?;
+            let id = safe_unwrap!(safe_unwrap!(verifier.stack.pop()).ref_id());
+            let value = state.borrow_field(
+                offset,
+                false,
+                id,
+                FieldOrVariantIndex::VariantFieldIndex(field_inst.handle),
+            )?;
             verifier.stack.push(value)
         },
-
         Bytecode::MutBorrowGlobal(idx) => {
             safe_assert!(safe_unwrap!(verifier.stack.pop()).is_value());
             let value = state.borrow_global(offset, true, *idx)?;
@@ -361,6 +469,34 @@ fn execute_inner(
             unpack(verifier, struct_def)?
         },
 
+        Bytecode::TestVariant(idx) => {
+            let handle = verifier.resolver.struct_variant_handle_at(*idx)?;
+            test_variant(verifier, state, handle, offset)?
+        },
+        Bytecode::TestVariantGeneric(idx) => {
+            let inst = verifier.resolver.struct_variant_instantiation_at(*idx)?;
+            let handle = verifier.resolver.struct_variant_handle_at(inst.handle)?;
+            test_variant(verifier, state, handle, offset)?
+        },
+        Bytecode::PackVariant(idx) => {
+            let handle = verifier.resolver.struct_variant_handle_at(*idx)?;
+            pack_variant(verifier, handle)?
+        },
+        Bytecode::PackVariantGeneric(idx) => {
+            let inst = verifier.resolver.struct_variant_instantiation_at(*idx)?;
+            let handle = verifier.resolver.struct_variant_handle_at(inst.handle)?;
+            pack_variant(verifier, handle)?
+        },
+        Bytecode::UnpackVariant(idx) => {
+            let handle = verifier.resolver.struct_variant_handle_at(*idx)?;
+            unpack_variant(verifier, handle)?
+        },
+        Bytecode::UnpackVariantGeneric(idx) => {
+            let inst = verifier.resolver.struct_variant_instantiation_at(*idx)?;
+            let handle = verifier.resolver.struct_variant_handle_at(inst.handle)?;
+            unpack_variant(verifier, handle)?
+        },
+
         Bytecode::VecPack(idx, num) => {
             for _ in 0..*num {
                 safe_assert!(safe_unwrap!(verifier.stack.pop()).is_value())
diff --git a/third_party/move/move-bytecode-verifier/src/regression_tests/reference_analysis.rs b/third_party/move/move-bytecode-verifier/src/regression_tests/reference_analysis.rs
index bdefebf1544ea..f2ac68a054591 100644
--- a/third_party/move/move-bytecode-verifier/src/regression_tests/reference_analysis.rs
+++ b/third_party/move/move-bytecode-verifier/src/regression_tests/reference_analysis.rs
@@ -155,6 +155,10 @@ fn too_many_locals() {
                 code: vec![CopyLoc(2), StLoc(33), Branch(0)],
             }),
         }],
+        struct_variant_handles: vec![],
+        struct_variant_instantiations: vec![],
+        variant_field_handles: vec![],
+        variant_field_instantiations: vec![],
     };
 
     let res = crate::verify_module(&module);
@@ -207,6 +211,10 @@ fn borrow_graph() {
                 code: vec![MoveLoc(0), MoveLoc(1), StLoc(0), StLoc(1), Branch(0)],
             }),
         }],
+        struct_variant_handles: vec![],
+        struct_variant_instantiations: vec![],
+        variant_field_handles: vec![],
+        variant_field_instantiations: vec![],
     };
 
     let res = crate::verify_module(&module);
@@ -312,6 +320,10 @@ fn indirect_code() {
                 code,
             }),
         }],
+        struct_variant_handles: vec![],
+        struct_variant_instantiations: vec![],
+        variant_field_handles: vec![],
+        variant_field_instantiations: vec![],
     };
 
     let res = crate::verify_module_with_config(&VerifierConfig::unbounded(), &module).unwrap_err();
diff --git a/third_party/move/move-bytecode-verifier/src/signature.rs b/third_party/move/move-bytecode-verifier/src/signature.rs
index 12cec4ceccf92..fdd845ffc871a 100644
--- a/third_party/move/move-bytecode-verifier/src/signature.rs
+++ b/third_party/move/move-bytecode-verifier/src/signature.rs
@@ -10,9 +10,9 @@ use move_binary_format::{
     binary_views::BinaryIndexedView,
     errors::{Location, PartialVMError, PartialVMResult, VMResult},
     file_format::{
-        AbilitySet, Bytecode, CodeUnit, CompiledModule, CompiledScript, FunctionDefinition,
-        FunctionHandle, Signature, SignatureIndex, SignatureToken, StructDefinition,
-        StructFieldInformation, StructTypeParameter, TableIndex,
+        AbilitySet, Bytecode, CodeUnit, CompiledModule, CompiledScript, FieldDefinition,
+        FunctionDefinition, FunctionHandle, Signature, SignatureIndex, SignatureToken,
+        StructDefinition, StructFieldInformation, StructTypeParameter, TableIndex,
     },
     file_format_common::VERSION_6,
     IndexKind,
@@ -84,30 +84,60 @@ impl<'a> SignatureChecker<'a> {
 
     fn verify_fields(&self, struct_defs: &[StructDefinition]) -> PartialVMResult<()> {
         for (struct_def_idx, struct_def) in struct_defs.iter().enumerate() {
-            let fields = match &struct_def.field_information {
-                StructFieldInformation::Native => continue,
-                StructFieldInformation::Declared(fields) => fields,
-            };
-            let struct_handle = self.resolver.struct_handle_at(struct_def.struct_handle);
-            let err_handler = |err: PartialVMError, idx| {
-                err.at_index(IndexKind::FieldDefinition, idx as TableIndex)
-                    .at_index(IndexKind::StructDefinition, struct_def_idx as TableIndex)
+            match &struct_def.field_information {
+                StructFieldInformation::Native => {},
+                StructFieldInformation::Declared(fields) => {
+                    self.verify_fields_of_struct(struct_def_idx, struct_def, None, fields.iter())?
+                },
+                StructFieldInformation::DeclaredVariants(variants) => {
+                    variants
+                        .iter()
+                        .enumerate()
+                        .try_for_each(|(variant_offset, variant)| {
+                            self.verify_fields_of_struct(
+                                struct_def_idx,
+                                struct_def,
+                                Some(variant_offset),
+                                variant.fields.iter(),
+                            )
+                        })?
+                },
             };
-            for (field_offset, field_def) in fields.iter().enumerate() {
-                self.check_signature_token(&field_def.signature.0)
-                    .map_err(|err| err_handler(err, field_offset))?;
-                let type_param_constraints: Vec<_> =
-                    struct_handle.type_param_constraints().collect();
-                self.check_type_instantiation(&field_def.signature.0, &type_param_constraints)
-                    .map_err(|err| err_handler(err, field_offset))?;
+        }
+        Ok(())
+    }
 
-                self.check_phantom_params(
-                    &field_def.signature.0,
-                    false,
-                    &struct_handle.type_parameters,
-                )
-                .map_err(|err| err_handler(err, field_offset))?;
+    fn verify_fields_of_struct<'l>(
+        &self,
+        struct_def_idx: usize,
+        struct_def: &StructDefinition,
+        variant: Option<usize>,
+        fields: impl Iterator<Item = &'l FieldDefinition>,
+    ) -> Result<(), PartialVMError> {
+        let struct_handle = self.resolver.struct_handle_at(struct_def.struct_handle);
+        let err_handler = |err: PartialVMError, offset| {
+            let err = err
+                .at_index(IndexKind::FieldDefinition, offset as TableIndex)
+                .at_index(IndexKind::StructDefinition, struct_def_idx as TableIndex);
+            if let Some(variant) = variant {
+                err.at_index(IndexKind::VariantDefinition, variant as TableIndex)
+            } else {
+                err
             }
+        };
+        for (field_offset, field_def) in fields.enumerate() {
+            self.check_signature_token(&field_def.signature.0)
+                .map_err(|err| err_handler(err, field_offset))?;
+            let type_param_constraints: Vec<_> = struct_handle.type_param_constraints().collect();
+            self.check_type_instantiation(&field_def.signature.0, &type_param_constraints)
+                .map_err(|err| err_handler(err, field_offset))?;
+
+            self.check_phantom_params(
+                &field_def.signature.0,
+                false,
+                &struct_handle.type_parameters,
+            )
+            .map_err(|err| err_handler(err, field_offset))?;
         }
         Ok(())
     }
@@ -166,6 +196,22 @@ impl<'a> SignatureChecker<'a> {
                         type_parameters,
                     )
                 },
+                PackVariantGeneric(idx) | UnpackVariantGeneric(idx) | TestVariantGeneric(idx) => {
+                    let variant_inst = self.resolver.struct_variant_instantiation_at(*idx)?;
+                    let variant_handle = self
+                        .resolver
+                        .struct_variant_handle_at(variant_inst.handle)?;
+                    let struct_def = self.resolver.struct_def_at(variant_handle.struct_index)?;
+                    let struct_handle = self.resolver.struct_handle_at(struct_def.struct_handle);
+                    let type_arguments =
+                        &self.resolver.signature_at(variant_inst.type_parameters).0;
+                    self.check_signature_tokens(type_arguments)?;
+                    self.check_generic_instance(
+                        type_arguments,
+                        struct_handle.type_param_constraints(),
+                        type_parameters,
+                    )
+                },
                 ImmBorrowFieldGeneric(idx) | MutBorrowFieldGeneric(idx) => {
                     let field_inst = self.resolver.field_instantiation_at(*idx)?;
                     let field_handle = self.resolver.field_handle_at(field_inst.handle)?;
@@ -179,6 +225,19 @@ impl<'a> SignatureChecker<'a> {
                         type_parameters,
                     )
                 },
+                ImmBorrowVariantFieldGeneric(idx) | MutBorrowVariantFieldGeneric(idx) => {
+                    let field_inst = self.resolver.variant_field_instantiation_at(*idx)?;
+                    let field_handle = self.resolver.variant_field_handle_at(field_inst.handle)?;
+                    let struct_def = self.resolver.struct_def_at(field_handle.struct_index)?;
+                    let struct_handle = self.resolver.struct_handle_at(struct_def.struct_handle);
+                    let type_arguments = &self.resolver.signature_at(field_inst.type_parameters).0;
+                    self.check_signature_tokens(type_arguments)?;
+                    self.check_generic_instance(
+                        type_arguments,
+                        struct_handle.type_param_constraints(),
+                        type_parameters,
+                    )
+                },
                 VecPack(idx, _)
                 | VecLen(idx)
                 | VecImmBorrow(idx)
@@ -202,14 +261,70 @@ impl<'a> SignatureChecker<'a> {
 
                 // List out the other options explicitly so there's a compile error if a new
                 // bytecode gets added.
-                Pop | Ret | Branch(_) | BrTrue(_) | BrFalse(_) | LdU8(_) | LdU16(_) | LdU32(_)
-                | LdU64(_) | LdU128(_) | LdU256(_) | LdConst(_) | CastU8 | CastU16 | CastU32
-                | CastU64 | CastU128 | CastU256 | LdTrue | LdFalse | Call(_) | Pack(_)
-                | Unpack(_) | ReadRef | WriteRef | FreezeRef | Add | Sub | Mul | Mod | Div
-                | BitOr | BitAnd | Xor | Shl | Shr | Or | And | Not | Eq | Neq | Lt | Gt | Le
-                | Ge | CopyLoc(_) | MoveLoc(_) | StLoc(_) | MutBorrowLoc(_) | ImmBorrowLoc(_)
-                | MutBorrowField(_) | ImmBorrowField(_) | MutBorrowGlobal(_)
-                | ImmBorrowGlobal(_) | Exists(_) | MoveTo(_) | MoveFrom(_) | Abort | Nop => Ok(()),
+                Pop
+                | Ret
+                | Branch(_)
+                | BrTrue(_)
+                | BrFalse(_)
+                | LdU8(_)
+                | LdU16(_)
+                | LdU32(_)
+                | LdU64(_)
+                | LdU128(_)
+                | LdU256(_)
+                | LdConst(_)
+                | CastU8
+                | CastU16
+                | CastU32
+                | CastU64
+                | CastU128
+                | CastU256
+                | LdTrue
+                | LdFalse
+                | Call(_)
+                | Pack(_)
+                | Unpack(_)
+                | PackVariant(_)
+                | UnpackVariant(_)
+                | TestVariant(_)
+                | ReadRef
+                | WriteRef
+                | FreezeRef
+                | Add
+                | Sub
+                | Mul
+                | Mod
+                | Div
+                | BitOr
+                | BitAnd
+                | Xor
+                | Shl
+                | Shr
+                | Or
+                | And
+                | Not
+                | Eq
+                | Neq
+                | Lt
+                | Gt
+                | Le
+                | Ge
+                | CopyLoc(_)
+                | MoveLoc(_)
+                | StLoc(_)
+                | MutBorrowLoc(_)
+                | ImmBorrowLoc(_)
+                | MutBorrowField(_)
+                | ImmBorrowField(_)
+                | MutBorrowVariantField(_)
+                | ImmBorrowVariantField(_)
+                | MutBorrowGlobal(_)
+                | ImmBorrowGlobal(_)
+                | Exists(_)
+                | MoveTo(_)
+                | MoveFrom(_)
+                | Abort
+                | Nop => Ok(()),
             };
             result.map_err(|err| {
                 err.append_message_with_separator(' ', format!("at offset {} ", offset))
diff --git a/third_party/move/move-bytecode-verifier/src/signature_v2.rs b/third_party/move/move-bytecode-verifier/src/signature_v2.rs
index 48283b993c382..e618353a0725f 100644
--- a/third_party/move/move-bytecode-verifier/src/signature_v2.rs
+++ b/third_party/move/move-bytecode-verifier/src/signature_v2.rs
@@ -6,11 +6,12 @@ use move_binary_format::{
     binary_views::BinaryIndexedView,
     errors::{Location, PartialVMError, PartialVMResult, VMResult},
     file_format::{
-        Ability, AbilitySet, Bytecode, CodeUnit, CompiledModule, CompiledScript,
+        Ability, AbilitySet, Bytecode, CodeUnit, CompiledModule, CompiledScript, FieldDefinition,
         FieldInstantiationIndex, FunctionDefinition, FunctionHandle, FunctionHandleIndex,
         FunctionInstantiationIndex, SignatureIndex, SignatureToken, StructDefInstantiationIndex,
-        StructDefinition, StructFieldInformation, StructHandle, StructTypeParameter,
-        TypeParameterIndex,
+        StructDefinition, StructDefinitionIndex, StructFieldInformation, StructHandle,
+        StructTypeParameter, StructVariantInstantiationIndex, TypeParameterIndex,
+        VariantFieldInstantiationIndex,
     },
     IndexKind,
 };
@@ -318,6 +319,14 @@ struct SignatureChecker<'a, const N: usize> {
     >,
     field_inst_results:
         RefCell<BTreeMap<FieldInstantiationIndex, &'a BitsetTypeParameterConstraints<N>>>,
+    variant_field_inst_results:
+        RefCell<BTreeMap<VariantFieldInstantiationIndex, &'a BitsetTypeParameterConstraints<N>>>,
+    struct_variant_inst_results: RefCell<
+        BTreeMap<
+            (StructVariantInstantiationIndex, AbilitySet),
+            &'a BitsetTypeParameterConstraints<N>,
+        >,
+    >,
 }
 
 impl<'a, const N: usize> SignatureChecker<'a, N> {
@@ -334,6 +343,8 @@ impl<'a, const N: usize> SignatureChecker<'a, N> {
             func_inst_results: RefCell::new(BTreeMap::new()),
             struct_inst_results: RefCell::new(BTreeMap::new()),
             field_inst_results: RefCell::new(BTreeMap::new()),
+            variant_field_inst_results: RefCell::new(BTreeMap::new()),
+            struct_variant_inst_results: RefCell::new(BTreeMap::new()),
         }
     }
 
@@ -507,16 +518,8 @@ impl<'a, const N: usize> SignatureChecker<'a, N> {
         Ok(())
     }
 
-    /// Checks if a struct instantiation is well-formed, in a context-less fashion.
-    ///
-    /// A struct instantiation is well-formed if
-    /// - There are no references in the type arguments
-    /// - All type arguments are well-formed and have declared abilities
-    ///
-    /// Returns the minimal set of constraints the type parameters need to satisfy, with the result
-    /// being cached.
-    ///
-    /// Time complexity: `O(total_size_of_all_type_args)` if not cached.
+    /// Checks if a struct instantiation is well-formed, in a context-less fashion,
+    /// with the result being cached.
     fn verify_struct_instantiation_contextless(
         &self,
         struct_inst_idx: StructDefInstantiationIndex,
@@ -530,56 +533,54 @@ impl<'a, const N: usize> SignatureChecker<'a, N> {
             btree_map::Entry::Occupied(entry) => *entry.into_mut(),
             btree_map::Entry::Vacant(entry) => {
                 let struct_inst = self.resolver.struct_instantiation_at(struct_inst_idx)?;
-                let struct_def = self.resolver.struct_def_at(struct_inst.def)?;
-                let struct_handle = self.resolver.struct_handle_at(struct_def.struct_handle);
-                let ty_args_idx = struct_inst.type_parameters;
-                let ty_args = &self.resolver.signature_at(ty_args_idx).0;
-
-                // TODO: is this needed?
-                if struct_handle.type_parameters.len() != ty_args.len() {
-                    return Err(
-                        PartialVMError::new(StatusCode::NUMBER_OF_TYPE_ARGUMENTS_MISMATCH)
-                            .with_message(format!(
-                                "expected {} type argument(s), got {}",
-                                struct_handle.type_parameters.len(),
-                                ty_args.len()
-                            ))
-                            .at_index(IndexKind::StructDefInstantiation, struct_inst_idx.0),
-                    );
-                }
-
-                if !required_abilities.is_subset(struct_handle.abilities) {
-                    return Err(PartialVMError::new(StatusCode::CONSTRAINT_NOT_SATISFIED)
-                        .with_message(format!(
-                            "expected struct with abilities {:?} got {:?}",
-                            required_abilities, struct_handle.abilities
-                        ))
-                        .at_index(IndexKind::StructDefInstantiation, struct_inst_idx.0));
-                }
-
-                let mut constraints = BitsetTypeParameterConstraints::new();
-                for (ty_idx, ty) in ty_args.iter().enumerate() {
-                    if ty.is_reference() {
-                        return Err(PartialVMError::new(StatusCode::INVALID_SIGNATURE_TOKEN)
-                            .with_message("reference not allowed".to_string())
-                            .at_index(IndexKind::StructDefInstantiation, struct_inst_idx.0));
-                    }
-
-                    let arg_abilities = if struct_handle.type_parameters[ty_idx].is_phantom {
-                        struct_handle.type_parameters[ty_idx].constraints
-                    } else {
-                        struct_handle.type_parameters[ty_idx]
-                            .constraints
-                            .union(required_abilities.requires())
-                    };
+                let constraints = self
+                    .verify_struct_type_params(
+                        required_abilities,
+                        struct_inst.def,
+                        struct_inst.type_parameters,
+                    )
+                    .map_err(|err| {
+                        err.at_index(IndexKind::StructDefInstantiation, struct_inst_idx.0)
+                    })?;
+                *entry.insert(self.constraints.alloc(constraints))
+            },
+        };
 
-                    constraints.merge(self.verify_type_in_signature_contextless(
-                        ty_args_idx,
-                        ty_idx,
-                        arg_abilities,
-                    )?);
-                }
+        Ok(r)
+    }
 
+    /// Checks if a struct variant instantiation is well-formed, in a context-less fashion,
+    /// with the result being cached.
+    fn verify_struct_variant_instantiation_contextless(
+        &self,
+        struct_variant_inst_idx: StructVariantInstantiationIndex,
+        required_abilities: AbilitySet,
+    ) -> PartialVMResult<&'a BitsetTypeParameterConstraints<N>> {
+        let r = match self
+            .struct_variant_inst_results
+            .borrow_mut()
+            .entry((struct_variant_inst_idx, required_abilities))
+        {
+            btree_map::Entry::Occupied(entry) => *entry.into_mut(),
+            btree_map::Entry::Vacant(entry) => {
+                let struct_variant_inst = self
+                    .resolver
+                    .struct_variant_instantiation_at(struct_variant_inst_idx)?;
+                let struct_variant_handle = self
+                    .resolver
+                    .struct_variant_handle_at(struct_variant_inst.handle)?;
+                let constraints = self
+                    .verify_struct_type_params(
+                        required_abilities,
+                        struct_variant_handle.struct_index,
+                        struct_variant_inst.type_parameters,
+                    )
+                    .map_err(|err| {
+                        err.at_index(
+                            IndexKind::StructVariantInstantiation,
+                            struct_variant_inst_idx.0,
+                        )
+                    })?;
                 *entry.insert(self.constraints.alloc(constraints))
             },
         };
@@ -587,6 +588,70 @@ impl<'a, const N: usize> SignatureChecker<'a, N> {
         Ok(r)
     }
 
+    /// Checks if a struct instantiation is well-formed, in a context-less fashion.
+    ///
+    /// A struct instantiation is well-formed if
+    /// - There are no references in the type arguments
+    /// - All type arguments are well-formed and have declared abilities
+    ///
+    /// Returns the minimal set of constraints the type parameters need to satisfy.
+    ///
+    /// Time complexity: `O(total_size_of_all_type_args)` if not cached.
+    fn verify_struct_type_params(
+        &self,
+        required_abilities: AbilitySet,
+        struct_def_idx: StructDefinitionIndex,
+        ty_args_idx: SignatureIndex,
+    ) -> PartialVMResult<BitsetTypeParameterConstraints<N>> {
+        let struct_def = self.resolver.struct_def_at(struct_def_idx)?;
+        let struct_handle = self.resolver.struct_handle_at(struct_def.struct_handle);
+        let ty_args = &self.resolver.signature_at(ty_args_idx).0;
+
+        if struct_handle.type_parameters.len() != ty_args.len() {
+            return Err(
+                PartialVMError::new(StatusCode::NUMBER_OF_TYPE_ARGUMENTS_MISMATCH).with_message(
+                    format!(
+                        "expected {} type argument(s), got {}",
+                        struct_handle.type_parameters.len(),
+                        ty_args.len()
+                    ),
+                ),
+            );
+        }
+
+        if !required_abilities.is_subset(struct_handle.abilities) {
+            return Err(
+                PartialVMError::new(StatusCode::CONSTRAINT_NOT_SATISFIED).with_message(format!(
+                    "expected struct with abilities {:?} got {:?}",
+                    required_abilities, struct_handle.abilities
+                )),
+            );
+        }
+
+        let mut constraints = BitsetTypeParameterConstraints::new();
+        for (ty_idx, ty) in ty_args.iter().enumerate() {
+            if ty.is_reference() {
+                return Err(PartialVMError::new(StatusCode::INVALID_SIGNATURE_TOKEN)
+                    .with_message("reference not allowed".to_string()));
+            }
+
+            let arg_abilities = if struct_handle.type_parameters[ty_idx].is_phantom {
+                struct_handle.type_parameters[ty_idx].constraints
+            } else {
+                struct_handle.type_parameters[ty_idx]
+                    .constraints
+                    .union(required_abilities.requires())
+            };
+
+            constraints.merge(self.verify_type_in_signature_contextless(
+                ty_args_idx,
+                ty_idx,
+                arg_abilities,
+            )?);
+        }
+        Ok(constraints)
+    }
+
     /// Checks if all struct instantiations are well-formed, in a context-less fashion.
     ///
     /// Time complexity: `O(total_size_of_all_type_args_in_all_instantiations)`
@@ -600,16 +665,21 @@ impl<'a, const N: usize> SignatureChecker<'a, N> {
         Ok(())
     }
 
-    /// Checks if a field instantiation is well-formed, in a context-less fashion.
-    ///
-    /// A field instantiation is well-formed if
-    /// - There are no references in the type arguments
-    /// - All type arguments are well-formed and have declared abilities
-    ///
-    /// Returns the minimal set of constraints the type parameters need to satisfy, with the result
-    /// being cached.
+    /// Checks if all struct variant instantiations are well-formed, in a context-less fashion.
     ///
-    /// Time complexity: `O(total_size_of_all_type_args)` if not cached.
+    /// Time complexity: `O(total_size_of_all_type_args_in_all_instantiations)`
+    fn verify_struct_variant_instantiations_contextless(&self) -> PartialVMResult<()> {
+        for struct_inst_idx in 0..self.resolver.struct_variant_instantiations().unwrap().len() {
+            self.verify_struct_variant_instantiation_contextless(
+                StructVariantInstantiationIndex(struct_inst_idx as u16),
+                AbilitySet::EMPTY,
+            )?;
+        }
+        Ok(())
+    }
+
+    /// Checks if a field instantiation is well-formed, in a context-less fashion,
+    /// with the result being cached.
     fn verify_field_instantiation_contextless(
         &self,
         field_inst_idx: FieldInstantiationIndex,
@@ -619,39 +689,46 @@ impl<'a, const N: usize> SignatureChecker<'a, N> {
             btree_map::Entry::Vacant(entry) => {
                 let field_inst = self.resolver.field_instantiation_at(field_inst_idx)?;
                 let field_handle = self.resolver.field_handle_at(field_inst.handle)?;
-                let struct_def = self.resolver.struct_def_at(field_handle.owner)?;
-                let struct_handle = self.resolver.struct_handle_at(struct_def.struct_handle);
-                let ty_args_idx = field_inst.type_parameters;
-                let ty_args = &self.resolver.signature_at(ty_args_idx).0;
-
-                // TODO: is this needed?
-                if struct_handle.type_parameters.len() != ty_args.len() {
-                    return Err(
-                        PartialVMError::new(StatusCode::NUMBER_OF_TYPE_ARGUMENTS_MISMATCH)
-                            .with_message(format!(
-                                "expected {} type argument(s), got {}",
-                                struct_handle.type_parameters.len(),
-                                ty_args.len()
-                            ))
-                            .at_index(IndexKind::FieldInstantiation, field_inst_idx.0),
-                    );
-                }
-
-                let mut constraints = BitsetTypeParameterConstraints::new();
-                for (ty_idx, ty) in ty_args.iter().enumerate() {
-                    if ty.is_reference() {
-                        return Err(PartialVMError::new(StatusCode::INVALID_SIGNATURE_TOKEN)
-                            .with_message("reference not allowed".to_string())
-                            .at_index(IndexKind::FieldInstantiation, field_inst_idx.0));
-                    }
-
-                    constraints.merge(self.verify_type_in_signature_contextless(
-                        ty_args_idx,
-                        ty_idx,
-                        struct_handle.type_parameters[ty_idx].constraints,
-                    )?);
-                }
+                let constraints = self
+                    .verify_struct_type_params(
+                        AbilitySet::EMPTY,
+                        field_handle.owner,
+                        field_inst.type_parameters,
+                    )
+                    .map_err(|err| err.at_index(IndexKind::FieldInstantiation, field_inst_idx.0))?;
+                *entry.insert(self.constraints.alloc(constraints))
+            },
+        };
+        Ok(r)
+    }
 
+    /// Same like `verify_field_instantiation_contextless` but for variant fields.
+    fn verify_variant_field_instantiation_contextless(
+        &self,
+        field_inst_idx: VariantFieldInstantiationIndex,
+    ) -> PartialVMResult<&'a BitsetTypeParameterConstraints<N>> {
+        let r = match self
+            .variant_field_inst_results
+            .borrow_mut()
+            .entry(field_inst_idx)
+        {
+            btree_map::Entry::Occupied(entry) => *entry.into_mut(),
+            btree_map::Entry::Vacant(entry) => {
+                let variant_field_inst = self
+                    .resolver
+                    .variant_field_instantiation_at(field_inst_idx)?;
+                let field_handle = self
+                    .resolver
+                    .variant_field_handle_at(variant_field_inst.handle)?;
+                let constraints = self
+                    .verify_struct_type_params(
+                        AbilitySet::EMPTY,
+                        field_handle.struct_index,
+                        variant_field_inst.type_parameters,
+                    )
+                    .map_err(|err| {
+                        err.at_index(IndexKind::VariantFieldInstantiation, field_inst_idx.0)
+                    })?;
                 *entry.insert(self.constraints.alloc(constraints))
             },
         };
@@ -670,6 +747,18 @@ impl<'a, const N: usize> SignatureChecker<'a, N> {
         Ok(())
     }
 
+    /// Checks if all variant field instantiations are well-formed, in a context-less fashion.
+    ///
+    /// Time complexity: `O(total_size_of_all_type_args_in_all_instantiations)`
+    fn verify_variant_field_instantiations_contextless(&self) -> PartialVMResult<()> {
+        for field_inst_idx in 0..self.resolver.variant_field_instantiations().unwrap().len() {
+            self.verify_variant_field_instantiation_contextless(VariantFieldInstantiationIndex(
+                field_inst_idx as u16,
+            ))?;
+        }
+        Ok(())
+    }
+
     /// Checks if a function handle is well-formed.
     ///
     /// A function handle is well-formed if all parameter and return types are well-formed, with references
@@ -716,6 +805,9 @@ impl<'a, const N: usize> SignatureChecker<'a, N> {
             BTreeMap::<StructDefInstantiationIndex, ()>::new();
         let mut checked_vec_insts = BTreeMap::<SignatureIndex, ()>::new();
         let mut checked_field_insts = BTreeMap::<FieldInstantiationIndex, ()>::new();
+        let mut checked_variant_field_insts = BTreeMap::<VariantFieldInstantiationIndex, ()>::new();
+        let mut checked_struct_variant_insts =
+            BTreeMap::<StructVariantInstantiationIndex, ()>::new();
 
         for (offset, instr) in code.code.iter().enumerate() {
             let map_err = |res: PartialVMResult<()>| {
@@ -739,6 +831,18 @@ impl<'a, const N: usize> SignatureChecker<'a, N> {
                         entry.insert(());
                     }
                 },
+                PackVariantGeneric(idx) | UnpackVariantGeneric(idx) | TestVariantGeneric(idx) => {
+                    if let btree_map::Entry::Vacant(entry) =
+                        checked_struct_variant_insts.entry(*idx)
+                    {
+                        let constraints = self.verify_struct_variant_instantiation_contextless(
+                            *idx,
+                            AbilitySet::EMPTY,
+                        )?;
+                        map_err(constraints.check_in_context(&ability_context))?;
+                        entry.insert(());
+                    }
+                },
                 ExistsGeneric(idx)
                 | MoveFromGeneric(idx)
                 | MoveToGeneric(idx)
@@ -762,6 +866,15 @@ impl<'a, const N: usize> SignatureChecker<'a, N> {
                         entry.insert(());
                     }
                 },
+                ImmBorrowVariantFieldGeneric(idx) | MutBorrowVariantFieldGeneric(idx) => {
+                    if let btree_map::Entry::Vacant(entry) = checked_variant_field_insts.entry(*idx)
+                    {
+                        let constraints =
+                            self.verify_variant_field_instantiation_contextless(*idx)?;
+                        map_err(constraints.check_in_context(&ability_context))?;
+                        entry.insert(());
+                    }
+                },
                 VecPack(idx, _)
                 | VecLen(idx)
                 | VecImmBorrow(idx)
@@ -796,14 +909,70 @@ impl<'a, const N: usize> SignatureChecker<'a, N> {
 
                 // List out the other options explicitly so there's a compile error if a new
                 // bytecode gets added.
-                Pop | Ret | Branch(_) | BrTrue(_) | BrFalse(_) | LdU8(_) | LdU16(_) | LdU32(_)
-                | LdU64(_) | LdU128(_) | LdU256(_) | LdConst(_) | CastU8 | CastU16 | CastU32
-                | CastU64 | CastU128 | CastU256 | LdTrue | LdFalse | Call(_) | Pack(_)
-                | Unpack(_) | ReadRef | WriteRef | FreezeRef | Add | Sub | Mul | Mod | Div
-                | BitOr | BitAnd | Xor | Shl | Shr | Or | And | Not | Eq | Neq | Lt | Gt | Le
-                | Ge | CopyLoc(_) | MoveLoc(_) | StLoc(_) | MutBorrowLoc(_) | ImmBorrowLoc(_)
-                | MutBorrowField(_) | ImmBorrowField(_) | MutBorrowGlobal(_)
-                | ImmBorrowGlobal(_) | Exists(_) | MoveTo(_) | MoveFrom(_) | Abort | Nop => (),
+                Pop
+                | Ret
+                | Branch(_)
+                | BrTrue(_)
+                | BrFalse(_)
+                | LdU8(_)
+                | LdU16(_)
+                | LdU32(_)
+                | LdU64(_)
+                | LdU128(_)
+                | LdU256(_)
+                | LdConst(_)
+                | CastU8
+                | CastU16
+                | CastU32
+                | CastU64
+                | CastU128
+                | CastU256
+                | LdTrue
+                | LdFalse
+                | Call(_)
+                | Pack(_)
+                | Unpack(_)
+                | TestVariant(_)
+                | PackVariant(_)
+                | UnpackVariant(_)
+                | ReadRef
+                | WriteRef
+                | FreezeRef
+                | Add
+                | Sub
+                | Mul
+                | Mod
+                | Div
+                | BitOr
+                | BitAnd
+                | Xor
+                | Shl
+                | Shr
+                | Or
+                | And
+                | Not
+                | Eq
+                | Neq
+                | Lt
+                | Gt
+                | Le
+                | Ge
+                | CopyLoc(_)
+                | MoveLoc(_)
+                | StLoc(_)
+                | MutBorrowLoc(_)
+                | ImmBorrowLoc(_)
+                | MutBorrowField(_)
+                | ImmBorrowField(_)
+                | MutBorrowVariantField(_)
+                | ImmBorrowVariantField(_)
+                | MutBorrowGlobal(_)
+                | ImmBorrowGlobal(_)
+                | Exists(_)
+                | MoveTo(_)
+                | MoveFrom(_)
+                | Abort
+                | Nop => (),
             }
         }
 
@@ -839,10 +1008,6 @@ impl<'a, const N: usize> SignatureChecker<'a, N> {
     ///
     /// Time complexity: `O(total_size_of_field_types)`
     fn verify_struct_def(&self, struct_def: &StructDefinition) -> PartialVMResult<()> {
-        let fields = match &struct_def.field_information {
-            StructFieldInformation::Native => return Ok(()),
-            StructFieldInformation::Declared(fields) => fields,
-        };
         let struct_handle = self.resolver.struct_handle_at(struct_def.struct_handle);
         let context = struct_handle
             .type_param_constraints()
@@ -855,13 +1020,40 @@ impl<'a, const N: usize> SignatureChecker<'a, N> {
             .map(|idx| (idx as TypeParameterIndex, AbilitySet::ALL))
             .collect::<BitsetTypeParameterConstraints<N>>();
 
-        for field_def in fields.iter() {
+        match &struct_def.field_information {
+            StructFieldInformation::Native => Ok(()),
+            StructFieldInformation::Declared(fields) => self.verify_fields_of_struct(
+                &struct_handle,
+                &context,
+                required_abilities_conditional,
+                &context_all_abilities,
+                fields.iter(),
+            ),
+            StructFieldInformation::DeclaredVariants(variants) => self.verify_fields_of_struct(
+                &struct_handle,
+                &context,
+                required_abilities_conditional,
+                &context_all_abilities,
+                variants.iter().flat_map(|v| v.fields.iter()),
+            ),
+        }
+    }
+
+    fn verify_fields_of_struct<'l>(
+        &self,
+        struct_handle: &&StructHandle,
+        context: &BitsetTypeParameterConstraints<{ N }>,
+        required_abilities_conditional: AbilitySet,
+        context_all_abilities: &BitsetTypeParameterConstraints<{ N }>,
+        fields: impl Iterator<Item = &'l FieldDefinition>,
+    ) -> Result<(), PartialVMError> {
+        for field_def in fields {
             let field_ty = &field_def.signature.0;
 
             // Check if the field type itself is well-formed.
             check_ty_in_context(
                 self.resolver.struct_handles(),
-                &context,
+                context,
                 field_ty,
                 false,
                 AbilitySet::EMPTY,
@@ -870,7 +1062,7 @@ impl<'a, const N: usize> SignatureChecker<'a, N> {
             // Check if the field type satisfies the conditional ability requirements.
             check_ty_in_context(
                 self.resolver.struct_handles(),
-                &context_all_abilities,
+                context_all_abilities,
                 field_ty,
                 false,
                 required_abilities_conditional,
@@ -884,7 +1076,6 @@ impl<'a, const N: usize> SignatureChecker<'a, N> {
                 field_ty,
             )?;
         }
-
         Ok(())
     }
 
@@ -908,6 +1099,8 @@ fn verify_module_impl<const N: usize>(module: &CompiledModule) -> PartialVMResul
     checker.verify_function_instantiations_contextless()?;
     checker.verify_struct_instantiations_contextless()?;
     checker.verify_field_instantiations_contextless()?;
+    checker.verify_struct_variant_instantiations_contextless()?;
+    checker.verify_variant_field_instantiations_contextless()?;
 
     checker.verify_function_handles()?;
     checker.verify_function_defs()?;
diff --git a/third_party/move/move-bytecode-verifier/src/stack_usage_verifier.rs b/third_party/move/move-bytecode-verifier/src/stack_usage_verifier.rs
index 1bd8a7d55a425..7e43a64fe36d6 100644
--- a/third_party/move/move-bytecode-verifier/src/stack_usage_verifier.rs
+++ b/third_party/move/move-bytecode-verifier/src/stack_usage_verifier.rs
@@ -14,7 +14,7 @@ use move_binary_format::{
     binary_views::{BinaryIndexedView, FunctionView},
     control_flow_graph::{BlockId, ControlFlowGraph},
     errors::{PartialVMError, PartialVMResult},
-    file_format::{Bytecode, CodeUnit, FunctionDefinitionIndex, Signature, StructFieldInformation},
+    file_format::{Bytecode, CodeUnit, FunctionDefinitionIndex, Signature},
 };
 use move_core_types::vm_status::StatusCode;
 
@@ -151,6 +151,12 @@ impl<'a> StackUsageVerifier<'a> {
             | Bytecode::MutBorrowFieldGeneric(_)
             | Bytecode::ImmBorrowField(_)
             | Bytecode::ImmBorrowFieldGeneric(_)
+            | Bytecode::MutBorrowVariantField(_)
+            | Bytecode::MutBorrowVariantFieldGeneric(_)
+            | Bytecode::ImmBorrowVariantField(_)
+            | Bytecode::ImmBorrowVariantFieldGeneric(_)
+            | Bytecode::TestVariant(_)
+            | Bytecode::TestVariantGeneric(_)
             | Bytecode::MoveFrom(_)
             | Bytecode::MoveFromGeneric(_)
             | Bytecode::CastU8
@@ -225,43 +231,69 @@ impl<'a> StackUsageVerifier<'a> {
             // Pack performs `num_fields` pops and one push
             Bytecode::Pack(idx) => {
                 let struct_definition = self.resolver.struct_def_at(*idx)?;
-                let field_count = match &struct_definition.field_information {
-                    // 'Native' here is an error that will be caught by the bytecode verifier later
-                    StructFieldInformation::Native => 0,
-                    StructFieldInformation::Declared(fields) => fields.len(),
-                };
-                (field_count as u64, 1)
+                let field_count = struct_definition.field_information.field_count(None) as u64;
+                (field_count, 1)
             },
             Bytecode::PackGeneric(idx) => {
                 let struct_inst = self.resolver.struct_instantiation_at(*idx)?;
                 let struct_definition = self.resolver.struct_def_at(struct_inst.def)?;
-                let field_count = match &struct_definition.field_information {
-                    // 'Native' here is an error that will be caught by the bytecode verifier later
-                    StructFieldInformation::Native => 0,
-                    StructFieldInformation::Declared(fields) => fields.len(),
-                };
-                (field_count as u64, 1)
+                let field_count = struct_definition.field_information.field_count(None) as u64;
+                (field_count, 1)
+            },
+            Bytecode::PackVariant(idx) => {
+                let variant_handle = self.resolver.struct_variant_handle_at(*idx)?;
+                let struct_definition = self.resolver.struct_def_at(variant_handle.struct_index)?;
+                let field_count = struct_definition
+                    .field_information
+                    .field_count(Some(variant_handle.variant))
+                    as u64;
+                (field_count, 1)
+            },
+            Bytecode::PackVariantGeneric(idx) => {
+                let variant_inst = self.resolver.struct_variant_instantiation_at(*idx)?;
+                let variant_handle = self
+                    .resolver
+                    .struct_variant_handle_at(variant_inst.handle)?;
+                let struct_definition = self.resolver.struct_def_at(variant_handle.struct_index)?;
+                let field_count = struct_definition
+                    .field_information
+                    .field_count(Some(variant_handle.variant))
+                    as u64;
+                (field_count, 1)
             },
 
             // Unpack performs one pop and `num_fields` pushes
             Bytecode::Unpack(idx) => {
                 let struct_definition = self.resolver.struct_def_at(*idx)?;
-                let field_count = match &struct_definition.field_information {
-                    // 'Native' here is an error that will be caught by the bytecode verifier later
-                    StructFieldInformation::Native => 0,
-                    StructFieldInformation::Declared(fields) => fields.len(),
-                };
-                (1, field_count as u64)
+                let field_count = struct_definition.field_information.field_count(None) as u64;
+                (1, field_count)
             },
             Bytecode::UnpackGeneric(idx) => {
                 let struct_inst = self.resolver.struct_instantiation_at(*idx)?;
                 let struct_definition = self.resolver.struct_def_at(struct_inst.def)?;
-                let field_count = match &struct_definition.field_information {
-                    // 'Native' here is an error that will be caught by the bytecode verifier later
-                    StructFieldInformation::Native => 0,
-                    StructFieldInformation::Declared(fields) => fields.len(),
-                };
-                (1, field_count as u64)
+                let field_count = struct_definition.field_information.field_count(None) as u64;
+                (1, field_count)
+            },
+            Bytecode::UnpackVariant(idx) => {
+                let variant_handle = self.resolver.struct_variant_handle_at(*idx)?;
+                let struct_definition = self.resolver.struct_def_at(variant_handle.struct_index)?;
+                let field_count = struct_definition
+                    .field_information
+                    .field_count(Some(variant_handle.variant))
+                    as u64;
+                (1, field_count)
+            },
+            Bytecode::UnpackVariantGeneric(idx) => {
+                let variant_inst = self.resolver.struct_variant_instantiation_at(*idx)?;
+                let variant_handle = self
+                    .resolver
+                    .struct_variant_handle_at(variant_inst.handle)?;
+                let struct_definition = self.resolver.struct_def_at(variant_handle.struct_index)?;
+                let field_count = struct_definition
+                    .field_information
+                    .field_count(Some(variant_handle.variant))
+                    as u64;
+                (1, field_count)
             },
         })
     }
diff --git a/third_party/move/move-bytecode-verifier/src/type_safety.rs b/third_party/move/move-bytecode-verifier/src/type_safety.rs
index 69b2aee72fe0c..e50efc0cf23b0 100644
--- a/third_party/move/move-bytecode-verifier/src/type_safety.rs
+++ b/third_party/move/move-bytecode-verifier/src/type_safety.rs
@@ -11,11 +11,12 @@ use move_binary_format::{
     control_flow_graph::ControlFlowGraph,
     errors::{PartialVMError, PartialVMResult},
     file_format::{
-        AbilitySet, Bytecode, CodeOffset, FieldHandleIndex, FunctionDefinitionIndex,
-        FunctionHandle, LocalIndex, Signature, SignatureToken, SignatureToken as ST,
-        StructDefinition, StructDefinitionIndex, StructFieldInformation, StructHandleIndex,
+        AbilitySet, Bytecode, CodeOffset, FunctionDefinitionIndex, FunctionHandle, LocalIndex,
+        Signature, SignatureToken, SignatureToken as ST, StructDefinition, StructDefinitionIndex,
+        StructFieldInformation, StructHandleIndex, VariantIndex,
     },
     safe_unwrap,
+    views::FieldOrVariantIndex,
 };
 use move_core_types::vm_status::StatusCode;
 
@@ -131,7 +132,7 @@ fn borrow_field(
     meter: &mut impl Meter,
     offset: CodeOffset,
     mut_: bool,
-    field_handle_index: FieldHandleIndex,
+    field_handle_index: FieldOrVariantIndex,
     type_args: &Signature,
 ) -> PartialVMResult<()> {
     // load operand and check mutability constraints
@@ -143,34 +144,80 @@ fn borrow_field(
     // check the reference on the stack is the expected type.
     // Load the type that owns the field according to the instruction.
     // For generic fields access, this step materializes that type
-    let field_handle = verifier.resolver.field_handle_at(field_handle_index)?;
-    let struct_def = verifier.resolver.struct_def_at(field_handle.owner)?;
+    let (struct_def_index, variants, field_idx) = match field_handle_index {
+        FieldOrVariantIndex::FieldIndex(idx) => {
+            let field_handle = verifier.resolver.field_handle_at(idx)?;
+            (field_handle.owner, None, field_handle.field as usize)
+        },
+        FieldOrVariantIndex::VariantFieldIndex(idx) => {
+            let field_handle = verifier.resolver.variant_field_handle_at(idx)?;
+            (
+                field_handle.struct_index,
+                Some(field_handle.variants.clone()),
+                field_handle.field as usize,
+            )
+        },
+    };
+    let struct_def = verifier.resolver.struct_def_at(struct_def_index)?;
     let expected_type = materialize_type(struct_def.struct_handle, type_args);
     match operand {
         ST::Reference(inner) | ST::MutableReference(inner) if expected_type == *inner => (),
         _ => return Err(verifier.error(StatusCode::BORROWFIELD_TYPE_MISMATCH_ERROR, offset)),
     }
 
-    let field_def = match &struct_def.field_information {
-        StructFieldInformation::Native => {
-            return Err(verifier.error(StatusCode::BORROWFIELD_BAD_FIELD_ERROR, offset));
-        },
-        StructFieldInformation::Declared(fields) => {
-            // TODO: review the whole error story here, way too much is left to chances...
-            // definition of a more proper OM for the verifier could work around the problem
-            // (maybe, maybe not..)
-            &fields[field_handle.field as usize]
-        },
+    // Check and determine the type loaded onto the stack
+    let field_ty = if let Some(variants) = variants {
+        if variants.is_empty() {
+            // It is not allowed to have no variants provided here, otherwise we cannot
+            // determine the type.
+            return Err(verifier.error(StatusCode::ZERO_VARIANTS_ERROR, offset));
+        }
+        // For all provided variants, the field type must be the same.
+        let mut field_ty = None;
+        for variant in variants {
+            if let Some(field_def) = struct_def
+                .field_information
+                .fields(Some(variant))
+                .get(field_idx)
+            {
+                let ty = instantiate(&field_def.signature.0, type_args);
+                if let Some(field_ty) = &field_ty {
+                    // More than one field possible, compare types.
+                    if &ty != field_ty {
+                        return Err(
+                            verifier.error(StatusCode::BORROWFIELD_TYPE_MISMATCH_ERROR, offset)
+                        );
+                    }
+                } else {
+                    field_ty = Some(ty)
+                }
+            } else {
+                // If the struct variant has no field at this idx, this is an error
+                return Err(verifier.error(StatusCode::BORROWFIELD_BAD_FIELD_ERROR, offset));
+            }
+        }
+        field_ty
+    } else {
+        struct_def
+            .field_information
+            .fields(None)
+            .get(field_idx)
+            .map(|field_def| instantiate(&field_def.signature.0, type_args))
     };
-    let field_type = Box::new(instantiate(&field_def.signature.0, type_args));
-    verifier.push(
-        meter,
-        if mut_ {
-            ST::MutableReference(field_type)
-        } else {
-            ST::Reference(field_type)
-        },
-    )?;
+    if let Some(field_ty) = field_ty {
+        verifier.push(
+            meter,
+            if mut_ {
+                ST::MutableReference(Box::new(field_ty))
+            } else {
+                ST::Reference(Box::new(field_ty))
+            },
+        )?;
+    } else {
+        // If the field is not defined, we are reporting an error in `instruction_consistency`.
+        // Here push a dummy type to keep the abstract stack happy
+        verifier.push(meter, ST::Bool)?;
+    }
     Ok(())
 }
 
@@ -258,20 +305,31 @@ fn type_fields_signature(
     _meter: &mut impl Meter, // TODO: metering
     offset: CodeOffset,
     struct_def: &StructDefinition,
+    variant: Option<VariantIndex>,
     type_args: &Signature,
 ) -> PartialVMResult<Signature> {
-    match &struct_def.field_information {
-        StructFieldInformation::Native => {
+    match (&struct_def.field_information, variant) {
+        (StructFieldInformation::Declared(fields), None) => Ok(Signature(
+            fields
+                .iter()
+                .map(|field_def| instantiate(&field_def.signature.0, type_args))
+                .collect(),
+        )),
+        (StructFieldInformation::DeclaredVariants(variants), Some(variant))
+            if (variant as usize) < variants.len() =>
+        {
+            Ok(Signature(
+                variants[variant as usize]
+                    .fields
+                    .iter()
+                    .map(|field_def| instantiate(&field_def.signature.0, type_args))
+                    .collect(),
+            ))
+        },
+        _ => {
             // TODO: this is more of "unreachable"
             Err(verifier.error(StatusCode::PACK_TYPE_MISMATCH_ERROR, offset))
         },
-        StructFieldInformation::Declared(fields) => {
-            let mut field_sig = vec![];
-            for field_def in fields.iter() {
-                field_sig.push(instantiate(&field_def.signature.0, type_args));
-            }
-            Ok(Signature(field_sig))
-        },
     }
 }
 
@@ -280,10 +338,11 @@ fn pack(
     meter: &mut impl Meter,
     offset: CodeOffset,
     struct_def: &StructDefinition,
+    variant: Option<VariantIndex>,
     type_args: &Signature,
 ) -> PartialVMResult<()> {
     let struct_type = materialize_type(struct_def.struct_handle, type_args);
-    let field_sig = type_fields_signature(verifier, meter, offset, struct_def, type_args)?;
+    let field_sig = type_fields_signature(verifier, meter, offset, struct_def, variant, type_args)?;
     for sig in field_sig.0.iter().rev() {
         let arg = safe_unwrap!(verifier.stack.pop());
         if &arg != sig {
@@ -300,6 +359,7 @@ fn unpack(
     meter: &mut impl Meter,
     offset: CodeOffset,
     struct_def: &StructDefinition,
+    variant: Option<VariantIndex>,
     type_args: &Signature,
 ) -> PartialVMResult<()> {
     let struct_type = materialize_type(struct_def.struct_handle, type_args);
@@ -311,13 +371,29 @@ fn unpack(
         return Err(verifier.error(StatusCode::UNPACK_TYPE_MISMATCH_ERROR, offset));
     }
 
-    let field_sig = type_fields_signature(verifier, meter, offset, struct_def, type_args)?;
+    let field_sig = type_fields_signature(verifier, meter, offset, struct_def, variant, type_args)?;
     for sig in field_sig.0 {
         verifier.push(meter, sig)?
     }
     Ok(())
 }
 
+fn test_variant(
+    verifier: &mut TypeSafetyChecker,
+    meter: &mut impl Meter,
+    offset: CodeOffset,
+    struct_def: &StructDefinition,
+    type_args: &Signature,
+) -> PartialVMResult<()> {
+    let struct_type = materialize_type(struct_def.struct_handle, type_args);
+    let arg = safe_unwrap!(verifier.stack.pop());
+    match arg {
+        ST::Reference(inner) | ST::MutableReference(inner) if struct_type == *inner => (),
+        _ => return Err(verifier.error(StatusCode::TEST_VARIANT_TYPE_MISMATCH_ERROR, offset)),
+    }
+    verifier.push(meter, ST::Bool)
+}
+
 fn exists(
     verifier: &mut TypeSafetyChecker,
     meter: &mut impl Meter,
@@ -487,7 +563,7 @@ fn verify_instr(
             meter,
             offset,
             true,
-            *field_handle_index,
+            FieldOrVariantIndex::FieldIndex(*field_handle_index),
             &Signature(vec![]),
         )?,
 
@@ -497,7 +573,14 @@ fn verify_instr(
                 .field_instantiation_at(*field_inst_index)?;
             let type_inst = verifier.resolver.signature_at(field_inst.type_parameters);
             verifier.charge_tys(meter, &type_inst.0)?;
-            borrow_field(verifier, meter, offset, true, field_inst.handle, type_inst)?
+            borrow_field(
+                verifier,
+                meter,
+                offset,
+                true,
+                FieldOrVariantIndex::FieldIndex(field_inst.handle),
+                type_inst,
+            )?
         },
 
         Bytecode::ImmBorrowField(field_handle_index) => borrow_field(
@@ -505,7 +588,7 @@ fn verify_instr(
             meter,
             offset,
             false,
-            *field_handle_index,
+            FieldOrVariantIndex::FieldIndex(*field_handle_index),
             &Signature(vec![]),
         )?,
 
@@ -515,7 +598,64 @@ fn verify_instr(
                 .field_instantiation_at(*field_inst_index)?;
             let type_inst = verifier.resolver.signature_at(field_inst.type_parameters);
             verifier.charge_tys(meter, &type_inst.0)?;
-            borrow_field(verifier, meter, offset, false, field_inst.handle, type_inst)?
+            borrow_field(
+                verifier,
+                meter,
+                offset,
+                false,
+                FieldOrVariantIndex::FieldIndex(field_inst.handle),
+                type_inst,
+            )?
+        },
+
+        Bytecode::MutBorrowVariantField(field_handle_index) => borrow_field(
+            verifier,
+            meter,
+            offset,
+            true,
+            FieldOrVariantIndex::VariantFieldIndex(*field_handle_index),
+            &Signature(vec![]),
+        )?,
+
+        Bytecode::MutBorrowVariantFieldGeneric(field_inst_index) => {
+            let field_inst = verifier
+                .resolver
+                .variant_field_instantiation_at(*field_inst_index)?;
+            let type_inst = verifier.resolver.signature_at(field_inst.type_parameters);
+            verifier.charge_tys(meter, &type_inst.0)?;
+            borrow_field(
+                verifier,
+                meter,
+                offset,
+                true,
+                FieldOrVariantIndex::VariantFieldIndex(field_inst.handle),
+                type_inst,
+            )?
+        },
+
+        Bytecode::ImmBorrowVariantField(field_handle_index) => borrow_field(
+            verifier,
+            meter,
+            offset,
+            false,
+            FieldOrVariantIndex::VariantFieldIndex(*field_handle_index),
+            &Signature(vec![]),
+        )?,
+
+        Bytecode::ImmBorrowVariantFieldGeneric(field_inst_index) => {
+            let field_inst = verifier
+                .resolver
+                .variant_field_instantiation_at(*field_inst_index)?;
+            let type_inst = verifier.resolver.signature_at(field_inst.type_parameters);
+            verifier.charge_tys(meter, &type_inst.0)?;
+            borrow_field(
+                verifier,
+                meter,
+                offset,
+                false,
+                FieldOrVariantIndex::VariantFieldIndex(field_inst.handle),
+                type_inst,
+            )?
         },
 
         Bytecode::LdU8(_) => {
@@ -592,18 +732,17 @@ fn verify_instr(
                 meter,
                 offset,
                 struct_definition,
+                None,
                 &Signature(vec![]),
             )?
         },
-
         Bytecode::PackGeneric(idx) => {
             let struct_inst = verifier.resolver.struct_instantiation_at(*idx)?;
             let struct_def = verifier.resolver.struct_def_at(struct_inst.def)?;
             let type_args = verifier.resolver.signature_at(struct_inst.type_parameters);
             verifier.charge_tys(meter, &type_args.0)?;
-            pack(verifier, meter, offset, struct_def, type_args)?
+            pack(verifier, meter, offset, struct_def, None, type_args)?
         },
-
         Bytecode::Unpack(idx) => {
             let struct_definition = verifier.resolver.struct_def_at(*idx)?;
             unpack(
@@ -611,16 +750,84 @@ fn verify_instr(
                 meter,
                 offset,
                 struct_definition,
+                None,
                 &Signature(vec![]),
             )?
         },
-
         Bytecode::UnpackGeneric(idx) => {
             let struct_inst = verifier.resolver.struct_instantiation_at(*idx)?;
             let struct_def = verifier.resolver.struct_def_at(struct_inst.def)?;
             let type_args = verifier.resolver.signature_at(struct_inst.type_parameters);
             verifier.charge_tys(meter, &type_args.0)?;
-            unpack(verifier, meter, offset, struct_def, type_args)?
+            unpack(verifier, meter, offset, struct_def, None, type_args)?
+        },
+
+        Bytecode::PackVariant(idx) => {
+            let handle = verifier.resolver.struct_variant_handle_at(*idx)?;
+            let struct_definition = verifier.resolver.struct_def_at(handle.struct_index)?;
+            pack(
+                verifier,
+                meter,
+                offset,
+                struct_definition,
+                Some(handle.variant),
+                &Signature(vec![]),
+            )?
+        },
+        Bytecode::PackVariantGeneric(idx) => {
+            let inst = verifier.resolver.struct_variant_instantiation_at(*idx)?;
+            let handle = verifier.resolver.struct_variant_handle_at(inst.handle)?;
+            let struct_def = verifier.resolver.struct_def_at(handle.struct_index)?;
+            let type_args = verifier.resolver.signature_at(inst.type_parameters);
+            verifier.charge_tys(meter, &type_args.0)?;
+            pack(
+                verifier,
+                meter,
+                offset,
+                struct_def,
+                Some(handle.variant),
+                type_args,
+            )?
+        },
+        Bytecode::UnpackVariant(idx) => {
+            let handle = verifier.resolver.struct_variant_handle_at(*idx)?;
+            let struct_definition = verifier.resolver.struct_def_at(handle.struct_index)?;
+            unpack(
+                verifier,
+                meter,
+                offset,
+                struct_definition,
+                Some(handle.variant),
+                &Signature(vec![]),
+            )?
+        },
+        Bytecode::UnpackVariantGeneric(idx) => {
+            let inst = verifier.resolver.struct_variant_instantiation_at(*idx)?;
+            let handle = verifier.resolver.struct_variant_handle_at(inst.handle)?;
+            let struct_def = verifier.resolver.struct_def_at(handle.struct_index)?;
+            let type_args = verifier.resolver.signature_at(inst.type_parameters);
+            verifier.charge_tys(meter, &type_args.0)?;
+            unpack(
+                verifier,
+                meter,
+                offset,
+                struct_def,
+                Some(handle.variant),
+                type_args,
+            )?
+        },
+
+        Bytecode::TestVariant(idx) => {
+            let handle = verifier.resolver.struct_variant_handle_at(*idx)?;
+            let struct_def = verifier.resolver.struct_def_at(handle.struct_index)?;
+            test_variant(verifier, meter, offset, struct_def, &Signature(vec![]))?
+        },
+        Bytecode::TestVariantGeneric(idx) => {
+            let inst = verifier.resolver.struct_variant_instantiation_at(*idx)?;
+            let handle = verifier.resolver.struct_variant_handle_at(inst.handle)?;
+            let struct_def = verifier.resolver.struct_def_at(handle.struct_index)?;
+            let type_args = verifier.resolver.signature_at(inst.type_parameters);
+            test_variant(verifier, meter, offset, struct_def, type_args)?
         },
 
         Bytecode::ReadRef => {
diff --git a/third_party/move/move-bytecode-verifier/src/verifier.rs b/third_party/move/move-bytecode-verifier/src/verifier.rs
index 082dcdcec4b62..9783d8f33e9e3 100644
--- a/third_party/move/move-bytecode-verifier/src/verifier.rs
+++ b/third_party/move/move-bytecode-verifier/src/verifier.rs
@@ -5,7 +5,7 @@
 //! This module contains the public APIs supported by the bytecode verifier.
 use crate::{
     ability_field_requirements, check_duplication::DuplicationChecker,
-    code_unit_verifier::CodeUnitVerifier, constants, friends,
+    code_unit_verifier::CodeUnitVerifier, constants, features::FeatureVerifier, friends,
     instantiation_loops::InstantiationLoopChecker, instruction_consistency::InstructionConsistency,
     limits::LimitsVerifier, script_signature,
     script_signature::no_additional_script_signature_checks, signature::SignatureChecker,
@@ -31,6 +31,7 @@ pub struct VerifierConfig {
     pub max_push_size: Option<usize>,
     pub max_dependency_depth: Option<usize>,
     pub max_struct_definitions: Option<usize>,
+    pub max_struct_variants: Option<usize>,
     pub max_fields_in_struct: Option<usize>,
     pub max_function_definitions: Option<usize>,
     pub max_back_edges_per_function: Option<usize>,
@@ -40,6 +41,8 @@ pub struct VerifierConfig {
     pub max_per_mod_meter_units: Option<u128>,
     pub use_signature_checker_v2: bool,
     pub sig_checker_v2_fix_script_ty_param_count: bool,
+    pub enable_enum_types: bool,
+    pub enable_resource_access_control: bool,
 }
 
 /// Helper for a "canonical" verification of a module.
@@ -90,11 +93,13 @@ pub fn verify_module_with_config_for_test(
 pub fn verify_module_with_config(config: &VerifierConfig, module: &CompiledModule) -> VMResult<()> {
     let prev_state = move_core_types::state::set_state(VMState::VERIFIER);
     let result = std::panic::catch_unwind(|| {
+        // Always needs to run bound checker first as subsequent passes depend on it
         BoundsChecker::verify_module(module).map_err(|e| {
             // We can't point the error at the module, because if bounds-checking
             // failed, we cannot safely index into module's handle to itself.
             e.finish(Location::Undefined)
         })?;
+        FeatureVerifier::verify_module(config, module)?;
         LimitsVerifier::verify_module(config, module)?;
         DuplicationChecker::verify_module(module)?;
 
@@ -145,9 +150,17 @@ pub fn verify_script(script: &CompiledScript) -> VMResult<()> {
 }
 
 pub fn verify_script_with_config(config: &VerifierConfig, script: &CompiledScript) -> VMResult<()> {
+    fail::fail_point!("verifier-failpoint-3", |_| { Ok(()) });
+
     let prev_state = move_core_types::state::set_state(VMState::VERIFIER);
     let result = std::panic::catch_unwind(|| {
-        BoundsChecker::verify_script(script).map_err(|e| e.finish(Location::Script))?;
+        // Always needs to run bound checker first as subsequent passes depend on it
+        BoundsChecker::verify_script(script).map_err(|e| {
+            // We can't point the error at the script, because if bounds-checking
+            // failed, we cannot safely index into script
+            e.finish(Location::Undefined)
+        })?;
+        FeatureVerifier::verify_script(config, script)?;
         LimitsVerifier::verify_script(config, script)?;
         DuplicationChecker::verify_script(script)?;
 
@@ -192,6 +205,8 @@ impl Default for VerifierConfig {
             max_struct_definitions: None,
             // Max count of fields in a struct
             max_fields_in_struct: None,
+            // Max count of variants in a struct
+            max_struct_variants: None,
             // Max count of functions in a module
             max_function_definitions: None,
             // Max size set to 10000 to restrict number of pushes in one function
@@ -212,6 +227,9 @@ impl Default for VerifierConfig {
             use_signature_checker_v2: true,
 
             sig_checker_v2_fix_script_ty_param_count: true,
+
+            enable_enum_types: true,
+            enable_resource_access_control: true,
         }
     }
 }
@@ -240,6 +258,7 @@ impl VerifierConfig {
             max_dependency_depth: Some(100),
             max_struct_definitions: Some(200),
             max_fields_in_struct: Some(30),
+            max_struct_variants: Some(90),
             max_function_definitions: Some(1000),
 
             // Do not use back edge constraints as they are superseded by metering
@@ -253,6 +272,9 @@ impl VerifierConfig {
             use_signature_checker_v2: true,
 
             sig_checker_v2_fix_script_ty_param_count: true,
+
+            enable_enum_types: true,
+            enable_resource_access_control: true,
         }
     }
 }
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/ability_field_requirements/fields_conditional_abilities.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/ability_field_requirements/fields_conditional_abilities.v2_exp
new file mode 100644
index 0000000000000..2e1d987e60659
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/ability_field_requirements/fields_conditional_abilities.v2_exp
@@ -0,0 +1,37 @@
+processed 8 tasks
+
+task 1 'publish'. lines 11-19:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::m1_bad'. Got VMError: {
+    major_status: FIELD_MISSING_TYPE_ABILITY,
+    sub_status: None,
+    location: 0x1::m1_bad,
+    indices: [(StructDefinition, 1)],
+    offsets: [],
+}
+
+task 4 'publish'. lines 41-53:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::m4'. Got VMError: {
+    major_status: FIELD_MISSING_TYPE_ABILITY,
+    sub_status: None,
+    location: 0x1::m4,
+    indices: [(StructDefinition, 2)],
+    offsets: [],
+}
+
+task 6 'publish'. lines 67-77:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::m5_bad'. Got VMError: {
+    major_status: FIELD_MISSING_TYPE_ABILITY,
+    sub_status: None,
+    location: 0x1::m5_bad,
+    indices: [(StructDefinition, 1)],
+    offsets: [],
+}
+
+task 7 'publish'. lines 79-92:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::m6'. Got VMError: {
+    major_status: FIELD_MISSING_TYPE_ABILITY,
+    sub_status: None,
+    location: 0x1::m6,
+    indices: [(StructDefinition, 2)],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/ability_field_requirements/procedure_args.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/ability_field_requirements/procedure_args.v2_exp
new file mode 100644
index 0000000000000..ecf403fb87a7f
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/ability_field_requirements/procedure_args.v2_exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 9-17:
+Error: Script execution failed with VMError: {
+    major_status: CALL_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/ability_field_requirements/resource_has_resource_field.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/ability_field_requirements/resource_has_resource_field.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/ability_field_requirements/resource_has_resource_field.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/ability_field_requirements/unrestricted_has_resource_field.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/ability_field_requirements/unrestricted_has_resource_field.v2_exp
new file mode 100644
index 0000000000000..8fc6a9cda1f20
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/ability_field_requirements/unrestricted_has_resource_field.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-10:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::Test'. Got VMError: {
+    major_status: FIELD_MISSING_TYPE_ABILITY,
+    sub_status: None,
+    location: 0x42::Test,
+    indices: [(StructDefinition, 1)],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/check_bounds/128_params_and_128_locals.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/check_bounds/128_params_and_128_locals.v2_exp
new file mode 100644
index 0000000000000..0d1108cb066f0
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/check_bounds/128_params_and_128_locals.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-265:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: TOO_MANY_LOCALS,
+    sub_status: None,
+    location: undefined,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/check_bounds/1_param_and_255_locals.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/check_bounds/1_param_and_255_locals.v2_exp
new file mode 100644
index 0000000000000..f5cf0a7794371
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/check_bounds/1_param_and_255_locals.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-264:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: TOO_MANY_LOCALS,
+    sub_status: None,
+    location: undefined,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/check_bounds/256_locals.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/check_bounds/256_locals.v2_exp
new file mode 100644
index 0000000000000..cb05a36a19c0a
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/check_bounds/256_locals.v2_exp
@@ -0,0 +1,4 @@
+processed 1 task
+
+task 0 'publish'. lines 1-263:
+Error: value (256) cannot exceed (255)
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/check_bounds/256_params.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/check_bounds/256_params.v2_exp
new file mode 100644
index 0000000000000..b62ab7bb96ffa
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/check_bounds/256_params.v2_exp
@@ -0,0 +1,4 @@
+processed 1 task
+
+task 0 'publish'. lines 1-264:
+Error: value (256) cannot exceed (255)
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/check_bounds/too_few_type_actuals.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/check_bounds/too_few_type_actuals.v2_exp
new file mode 100644
index 0000000000000..6f873d8ae353d
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/check_bounds/too_few_type_actuals.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-11:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: NUMBER_OF_TYPE_ARGUMENTS_MISMATCH,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/check_bounds/too_many_type_actuals.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/check_bounds/too_many_type_actuals.v2_exp
new file mode 100644
index 0000000000000..6f873d8ae353d
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/check_bounds/too_many_type_actuals.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-11:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: NUMBER_OF_TYPE_ARGUMENTS_MISMATCH,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/check_duplication/duplicate_field_name.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/check_duplication/duplicate_field_name.v2_exp
new file mode 100644
index 0000000000000..5495d3b884ed2
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/check_duplication/duplicate_field_name.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-7:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: DUPLICATE_ELEMENT,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(FieldDefinition, 1)],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/check_duplication/duplicate_function_name.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/check_duplication/duplicate_function_name.v2_exp
new file mode 100644
index 0000000000000..86db5c831716b
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/check_duplication/duplicate_function_name.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-6:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: DUPLICATE_ELEMENT,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/check_duplication/duplicate_struct_name.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/check_duplication/duplicate_struct_name.v2_exp
new file mode 100644
index 0000000000000..cedea2736a311
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/check_duplication/duplicate_struct_name.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-6:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: DUPLICATE_ELEMENT,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(StructDefinition, 1)],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/check_duplication/empty_structs.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/check_duplication/empty_structs.v2_exp
new file mode 100644
index 0000000000000..1f49c06d237a0
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/check_duplication/empty_structs.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-6:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::EmptyStruct'. Got VMError: {
+    major_status: ZERO_SIZED_STRUCT,
+    sub_status: None,
+    location: 0x1::EmptyStruct,
+    indices: [(StructDefinition, 0)],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/check_duplication/friend_decl_duplicated.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/check_duplication/friend_decl_duplicated.v2_exp
new file mode 100644
index 0000000000000..a0c4d8fa72c5f
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/check_duplication/friend_decl_duplicated.v2_exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'publish'. lines 5-10:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::B'. Got VMError: {
+    major_status: DUPLICATE_ELEMENT,
+    sub_status: None,
+    location: 0x42::B,
+    indices: [(ModuleHandle, 1)],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/control_flow/block_traversal_order_alias.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/control_flow/block_traversal_order_alias.v2_exp
new file mode 100644
index 0000000000000..8337459bd9af0
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/control_flow/block_traversal_order_alias.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-51:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::Test'. Got VMError: {
+    major_status: CALL_BORROWED_MUTABLE_REFERENCE_ERROR,
+    sub_status: None,
+    location: 0x1::Test,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 16)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/control_flow/block_traversal_order_hot_potato.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/control_flow/block_traversal_order_hot_potato.v2_exp
new file mode 100644
index 0000000000000..bfb97e05350b0
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/control_flow/block_traversal_order_hot_potato.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-39:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::Test'. Got VMError: {
+    major_status: STLOC_UNSAFE_TO_DESTROY_ERROR,
+    sub_status: None,
+    location: 0x1::Test,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 8)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/control_flow/break_nested.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/control_flow/break_nested.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/control_flow/break_nested.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/control_flow/break_simple.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/control_flow/break_simple.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/control_flow/break_simple.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/control_flow/break_unreachable.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/control_flow/break_unreachable.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/control_flow/break_unreachable.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/control_flow/dead_return.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/control_flow/dead_return.v2_exp
new file mode 100644
index 0000000000000..5d92c423f3fd8
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/control_flow/dead_return.v2_exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/control_flow/dead_return_local.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/control_flow/dead_return_local.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/control_flow/dead_return_local.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/control_flow/if_branch_diverges_5.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/control_flow/if_branch_diverges_5.v2_exp
new file mode 100644
index 0000000000000..7f57ebf8ce349
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/control_flow/if_branch_diverges_5.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-14:
+Error: Script execution failed with VMError: {
+    major_status: CODE_DESERIALIZATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/control_flow/if_branch_diverges_6.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/control_flow/if_branch_diverges_6.v2_exp
new file mode 100644
index 0000000000000..599e4aef117e0
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/control_flow/if_branch_diverges_6.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-17:
+Error: Script execution failed with VMError: {
+    major_status: CODE_DESERIALIZATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/control_flow/if_branch_diverges_8.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/control_flow/if_branch_diverges_8.v2_exp
new file mode 100644
index 0000000000000..1e5c6da6ef8aa
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/control_flow/if_branch_diverges_8.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-20:
+Error: Script execution failed with VMError: {
+    major_status: CODE_DESERIALIZATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/control_flow/invalid_fallthrough1.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/control_flow/invalid_fallthrough1.v2_exp
new file mode 100644
index 0000000000000..de05f2fa7eea0
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/control_flow/invalid_fallthrough1.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-4:
+Error: Script execution failed with VMError: {
+    major_status: EMPTY_CODE_UNIT,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/control_flow/invalid_fallthrough2.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/control_flow/invalid_fallthrough2.v2_exp
new file mode 100644
index 0000000000000..889d8a263c83a
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/control_flow/invalid_fallthrough2.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-8:
+Error: Script execution failed with VMError: {
+    major_status: INVALID_FALL_THROUGH,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/control_flow/invalid_fallthrough3.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/control_flow/invalid_fallthrough3.v2_exp
new file mode 100644
index 0000000000000..dd092ca7a31b9
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/control_flow/invalid_fallthrough3.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-13:
+Error: Script execution failed with VMError: {
+    major_status: INVALID_FALL_THROUGH,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 5)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/control_flow/regression_test_496.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/control_flow/regression_test_496.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/control_flow/regression_test_496.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/control_flow/regression_test_678.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/control_flow/regression_test_678.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/control_flow/regression_test_678.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/dependencies/access_friend_function_invalid.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/dependencies/access_friend_function_invalid.v2_exp
new file mode 100644
index 0000000000000..c08c13cd90371
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/dependencies/access_friend_function_invalid.v2_exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'publish'. lines 9-18:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::N'. Got VMError: {
+    major_status: LOOKUP_FAILED,
+    sub_status: None,
+    location: 0x42::N,
+    indices: [(FunctionHandle, 1)],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/dependencies/access_friend_function_valid.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/dependencies/access_friend_function_valid.v2_exp
new file mode 100644
index 0000000000000..fc5a4436b29d4
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/dependencies/access_friend_function_valid.v2_exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/dependencies/access_private_function.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/dependencies/access_private_function.v2_exp
new file mode 100644
index 0000000000000..29da56131b7c5
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/dependencies/access_private_function.v2_exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 9-20:
+Error: Script execution failed with VMError: {
+    major_status: LOOKUP_FAILED,
+    sub_status: None,
+    location: script,
+    indices: [(FunctionHandle, 0)],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/dependencies/access_public_function.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/dependencies/access_public_function.v2_exp
new file mode 100644
index 0000000000000..5d92c423f3fd8
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/dependencies/access_public_function.v2_exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/dependencies/all_fields_accessible.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/dependencies/all_fields_accessible.v2_exp
new file mode 100644
index 0000000000000..5d92c423f3fd8
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/dependencies/all_fields_accessible.v2_exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/dependencies/call_integers_valid.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/dependencies/call_integers_valid.v2_exp
new file mode 100644
index 0000000000000..5d92c423f3fd8
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/dependencies/call_integers_valid.v2_exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/dependencies/internal_function_invalid_call.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/dependencies/internal_function_invalid_call.v2_exp
new file mode 100644
index 0000000000000..fcab61c77e28e
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/dependencies/internal_function_invalid_call.v2_exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 41-54:
+Error: Script execution failed with VMError: {
+    major_status: CALL_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 6)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/dependencies/non_internal_function_valid_call.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/dependencies/non_internal_function_valid_call.v2_exp
new file mode 100644
index 0000000000000..5d92c423f3fd8
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/dependencies/non_internal_function_valid_call.v2_exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/dependencies/use_unpublished_module.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/dependencies/use_unpublished_module.v2_exp
new file mode 100644
index 0000000000000..3f44c1d8cdb78
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/dependencies/use_unpublished_module.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-8:
+Error: Script execution failed with VMError: {
+    major_status: LINKER_ERROR,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/friends/friend_decl_cyclic.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/friends/friend_decl_cyclic.v2_exp
new file mode 100644
index 0000000000000..ada95f4f97b7b
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/friends/friend_decl_cyclic.v2_exp
@@ -0,0 +1,10 @@
+processed 3 tasks
+
+task 2 'publish'. lines 10-14:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::A'. Got VMError: {
+    major_status: CYCLIC_MODULE_FRIENDSHIP,
+    sub_status: None,
+    location: 0x42::A,
+    indices: [],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/friends/friend_decl_cyclic_transitive.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/friends/friend_decl_cyclic_transitive.v2_exp
new file mode 100644
index 0000000000000..06c9a2109b4e2
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/friends/friend_decl_cyclic_transitive.v2_exp
@@ -0,0 +1,10 @@
+processed 4 tasks
+
+task 3 'publish'. lines 15-19:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::A'. Got VMError: {
+    major_status: CYCLIC_MODULE_FRIENDSHIP,
+    sub_status: None,
+    location: 0x42::A,
+    indices: [],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/friends/friend_decl_deps.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/friends/friend_decl_deps.v2_exp
new file mode 100644
index 0000000000000..ac562143f75bc
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/friends/friend_decl_deps.v2_exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'publish'. lines 9-19:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INVALID_FRIEND_DECL_WITH_MODULES_IN_DEPENDENCIES,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/friends/friend_decl_deps_transitive.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/friends/friend_decl_deps_transitive.v2_exp
new file mode 100644
index 0000000000000..aa9576fc45675
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/friends/friend_decl_deps_transitive.v2_exp
@@ -0,0 +1,10 @@
+processed 3 tasks
+
+task 2 'publish'. lines 19-29:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::C'. Got VMError: {
+    major_status: INVALID_FRIEND_DECL_WITH_MODULES_IN_DEPENDENCIES,
+    sub_status: None,
+    location: 0x42::C,
+    indices: [],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/friends/friend_decl_different_address.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/friends/friend_decl_different_address.v2_exp
new file mode 100644
index 0000000000000..233693e52c531
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/friends/friend_decl_different_address.v2_exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'publish'. lines 5-9:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000044::N'. Got VMError: {
+    major_status: INVALID_FRIEND_DECL_WITH_MODULES_OUTSIDE_ACCOUNT_ADDRESS,
+    sub_status: None,
+    location: 0x44::N,
+    indices: [],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/friends/friend_decl_non_existing.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/friends/friend_decl_non_existing.v2_exp
new file mode 100644
index 0000000000000..bccb4f0e9171b
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/friends/friend_decl_non_existing.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-5:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: LINKER_ERROR,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/friends/friend_decl_self.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/friends/friend_decl_self.v2_exp
new file mode 100644
index 0000000000000..1cf0800e87b10
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/friends/friend_decl_self.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-5:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INVALID_FRIEND_DECL_WITH_SELF,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/instantiation_loops/complex_1.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/instantiation_loops/complex_1.v2_exp
new file mode 100644
index 0000000000000..88822b962886e
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/instantiation_loops/complex_1.v2_exp
@@ -0,0 +1,28 @@
+processed 3 tasks
+
+task 0 'publish'. lines 1-51:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: LOOP_IN_INSTANTIATION_GRAPH,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [],
+    offsets: [],
+}
+
+task 1 'publish'. lines 53-70:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M2'. Got VMError: {
+    major_status: LOOP_IN_INSTANTIATION_GRAPH,
+    sub_status: None,
+    location: 0x1::M2,
+    indices: [],
+    offsets: [],
+}
+
+task 2 'publish'. lines 72-122:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M3'. Got VMError: {
+    major_status: LOOP_IN_INSTANTIATION_GRAPH,
+    sub_status: None,
+    location: 0x1::M3,
+    indices: [],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/instantiation_loops/mutually_recursive_just_type_params_ok.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/instantiation_loops/mutually_recursive_just_type_params_ok.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/instantiation_loops/mutually_recursive_just_type_params_ok.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/instantiation_loops/mutually_recursive_non_generic_type_ok.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/instantiation_loops/mutually_recursive_non_generic_type_ok.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/instantiation_loops/mutually_recursive_non_generic_type_ok.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/instantiation_loops/mutually_recursive_three_args_just_type_params_shitfing_ok.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/instantiation_loops/mutually_recursive_three_args_just_type_params_shitfing_ok.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/instantiation_loops/mutually_recursive_three_args_just_type_params_shitfing_ok.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/instantiation_loops/mutually_recursive_three_args_type_con_non_generic_types_ok.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/instantiation_loops/mutually_recursive_three_args_type_con_non_generic_types_ok.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/instantiation_loops/mutually_recursive_three_args_type_con_non_generic_types_ok.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/instantiation_loops/mutually_recursive_three_args_type_con_shifting.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/instantiation_loops/mutually_recursive_three_args_type_con_shifting.v2_exp
new file mode 100644
index 0000000000000..3b9f372dec827
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/instantiation_loops/mutually_recursive_three_args_type_con_shifting.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-23:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: LOOP_IN_INSTANTIATION_GRAPH,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/instantiation_loops/mutually_recursive_two_args_non_generic_type_and_type_param_ok.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/instantiation_loops/mutually_recursive_two_args_non_generic_type_and_type_param_ok.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/instantiation_loops/mutually_recursive_two_args_non_generic_type_and_type_param_ok.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/instantiation_loops/mutually_recursive_two_args_swapping_just_type_params_ok.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/instantiation_loops/mutually_recursive_two_args_swapping_just_type_params_ok.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/instantiation_loops/mutually_recursive_two_args_swapping_just_type_params_ok.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/instantiation_loops/mutually_recursive_two_args_swapping_type_con.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/instantiation_loops/mutually_recursive_two_args_swapping_type_con.v2_exp
new file mode 100644
index 0000000000000..6457e989da40e
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/instantiation_loops/mutually_recursive_two_args_swapping_type_con.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-17:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: LOOP_IN_INSTANTIATION_GRAPH,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/instantiation_loops/mutually_recursive_type_con.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/instantiation_loops/mutually_recursive_type_con.v2_exp
new file mode 100644
index 0000000000000..e68aa0a009bca
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/instantiation_loops/mutually_recursive_type_con.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-20:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: LOOP_IN_INSTANTIATION_GRAPH,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/instantiation_loops/nested_types_1.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/instantiation_loops/nested_types_1.v2_exp
new file mode 100644
index 0000000000000..011ac8091e033
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/instantiation_loops/nested_types_1.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-11:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: LOOP_IN_INSTANTIATION_GRAPH,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/instantiation_loops/nested_types_2.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/instantiation_loops/nested_types_2.v2_exp
new file mode 100644
index 0000000000000..e7a1ab8d9a110
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/instantiation_loops/nested_types_2.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-13:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: LOOP_IN_INSTANTIATION_GRAPH,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/instantiation_loops/recursive_infinite_type_terminates.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/instantiation_loops/recursive_infinite_type_terminates.v2_exp
new file mode 100644
index 0000000000000..f4a66de93b693
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/instantiation_loops/recursive_infinite_type_terminates.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-45:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: LOOP_IN_INSTANTIATION_GRAPH,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/instantiation_loops/recursive_one_arg_just_type_params_ok.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/instantiation_loops/recursive_one_arg_just_type_params_ok.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/instantiation_loops/recursive_one_arg_just_type_params_ok.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/instantiation_loops/recursive_one_arg_non_generic_type_ok.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/instantiation_loops/recursive_one_arg_non_generic_type_ok.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/instantiation_loops/recursive_one_arg_non_generic_type_ok.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/instantiation_loops/recursive_one_arg_type_con.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/instantiation_loops/recursive_one_arg_type_con.v2_exp
new file mode 100644
index 0000000000000..e7a1ab8d9a110
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/instantiation_loops/recursive_one_arg_type_con.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-13:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: LOOP_IN_INSTANTIATION_GRAPH,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/instantiation_loops/recursive_two_args_swapping_type_con.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/instantiation_loops/recursive_two_args_swapping_type_con.v2_exp
new file mode 100644
index 0000000000000..2d87672574bf7
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/instantiation_loops/recursive_two_args_swapping_type_con.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-14:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: LOOP_IN_INSTANTIATION_GRAPH,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/instantiation_loops/two_loops.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/instantiation_loops/two_loops.v2_exp
new file mode 100644
index 0000000000000..e68aa0a009bca
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/instantiation_loops/two_loops.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-20:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: LOOP_IN_INSTANTIATION_GRAPH,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/abort_unreleased_reference.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/abort_unreleased_reference.v2_exp
new file mode 100644
index 0000000000000..48eadf4974c62
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/abort_unreleased_reference.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-9:
+Error: Script execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(0),
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 5)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/abort_unused_resource.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/abort_unused_resource.v2_exp
new file mode 100644
index 0000000000000..1dc8054975253
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/abort_unused_resource.v2_exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 10-18:
+Error: Script execution failed with VMError: {
+    major_status: LOOKUP_FAILED,
+    sub_status: None,
+    location: script,
+    indices: [(FunctionHandle, 0)],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/assign_copy.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/assign_copy.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/assign_copy.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/assign_in_one_if_branch.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/assign_in_one_if_branch.v2_exp
new file mode 100644
index 0000000000000..37ce98a283195
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/assign_in_one_if_branch.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-19:
+Error: Script execution failed with VMError: {
+    major_status: COPYLOC_UNAVAILABLE_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 14)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/assign_move.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/assign_move.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/assign_move.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/assign_resource.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/assign_resource.v2_exp
new file mode 100644
index 0000000000000..3e48acb9662c7
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/assign_resource.v2_exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 10-20:
+Error: Script execution failed with VMError: {
+    major_status: STLOC_UNSAFE_TO_DESTROY_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/assign_wrong_if_branch.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/assign_wrong_if_branch.v2_exp
new file mode 100644
index 0000000000000..b1807704caf12
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/assign_wrong_if_branch.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-15:
+Error: Script execution failed with VMError: {
+    major_status: COPYLOC_UNAVAILABLE_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 10)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/assign_wrong_if_branch_no_else.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/assign_wrong_if_branch_no_else.v2_exp
new file mode 100644
index 0000000000000..932cb9fbf7395
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/assign_wrong_if_branch_no_else.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-11:
+Error: Script execution failed with VMError: {
+    major_status: COPYLOC_UNAVAILABLE_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 4)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/branch_assigns_then_moves.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/branch_assigns_then_moves.v2_exp
new file mode 100644
index 0000000000000..5ea7f07864da1
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/branch_assigns_then_moves.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-17:
+Error: Script execution failed with VMError: {
+    major_status: COPYLOC_UNAVAILABLE_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 9)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/branch_assigns_then_moves_then_assigns.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/branch_assigns_then_moves_then_assigns.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/branch_assigns_then_moves_then_assigns.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/deep_return_branch_doesnt_assign.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/deep_return_branch_doesnt_assign.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/deep_return_branch_doesnt_assign.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/else_assigns_if_doesnt.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/else_assigns_if_doesnt.v2_exp
new file mode 100644
index 0000000000000..21e91f82ad771
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/else_assigns_if_doesnt.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-16:
+Error: Script execution failed with VMError: {
+    major_status: COPYLOC_UNAVAILABLE_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 7)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/else_moves_if_doesnt.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/else_moves_if_doesnt.v2_exp
new file mode 100644
index 0000000000000..5ea7f07864da1
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/else_moves_if_doesnt.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-17:
+Error: Script execution failed with VMError: {
+    major_status: COPYLOC_UNAVAILABLE_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 9)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/if_assigns_else_doesnt.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/if_assigns_else_doesnt.v2_exp
new file mode 100644
index 0000000000000..21e91f82ad771
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/if_assigns_else_doesnt.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-16:
+Error: Script execution failed with VMError: {
+    major_status: COPYLOC_UNAVAILABLE_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 7)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/if_assigns_no_else.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/if_assigns_no_else.v2_exp
new file mode 100644
index 0000000000000..79031505c4774
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/if_assigns_no_else.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-12:
+Error: Script execution failed with VMError: {
+    major_status: COPYLOC_UNAVAILABLE_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 4)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/if_moves_else_doesnt.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/if_moves_else_doesnt.v2_exp
new file mode 100644
index 0000000000000..5ea7f07864da1
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/if_moves_else_doesnt.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-17:
+Error: Script execution failed with VMError: {
+    major_status: COPYLOC_UNAVAILABLE_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 9)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/if_moves_no_else.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/if_moves_no_else.v2_exp
new file mode 100644
index 0000000000000..5bf2215c142de
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/if_moves_no_else.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-14:
+Error: Script execution failed with VMError: {
+    major_status: COPYLOC_UNAVAILABLE_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 6)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/join_failure.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/join_failure.v2_exp
new file mode 100644
index 0000000000000..8fb0fb20b2748
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/join_failure.v2_exp
@@ -0,0 +1,46 @@
+processed 5 tasks
+
+task 0 'publish'. lines 1-20:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: MOVELOC_UNAVAILABLE_ERROR,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 15)],
+}
+
+task 1 'publish'. lines 22-40:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: UNSAFE_RET_UNUSED_VALUES_WITHOUT_DROP,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 15)],
+}
+
+task 2 'publish'. lines 42-61:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: STLOC_UNSAFE_TO_DESTROY_ERROR,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 17)],
+}
+
+task 3 'publish'. lines 63-82:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: COPYLOC_UNAVAILABLE_ERROR,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 15)],
+}
+
+task 4 'publish'. lines 84-104:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: BORROWLOC_UNAVAILABLE_ERROR,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 15)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/move_before_assign.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/move_before_assign.v2_exp
new file mode 100644
index 0000000000000..4b2d0cbf4f11e
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/move_before_assign.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-11:
+Error: Script execution failed with VMError: {
+    major_status: MOVELOC_UNAVAILABLE_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/return_branch_doesnt_assign.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/return_branch_doesnt_assign.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/return_branch_doesnt_assign.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/return_branch_moves.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/return_branch_moves.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/return_branch_moves.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/signer_st_loc_partial.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/signer_st_loc_partial.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/signer_st_loc_partial.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/signer_unused.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/signer_unused.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/signer_unused.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/signer_unused_partial.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/signer_unused_partial.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/signer_unused_partial.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/use_before_assign.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/use_before_assign.v2_exp
new file mode 100644
index 0000000000000..88792dc35557a
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/use_before_assign.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-9:
+Error: Script execution failed with VMError: {
+    major_status: COPYLOC_UNAVAILABLE_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/vector_ops_non_droppable_resource_not_destroyed.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/vector_ops_non_droppable_resource_not_destroyed.v2_exp
new file mode 100644
index 0000000000000..7a8a07c5bfa15
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/vector_ops_non_droppable_resource_not_destroyed.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-10:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: UNSAFE_RET_UNUSED_VALUES_WITHOUT_DROP,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/while_move_local.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/while_move_local.v2_exp
new file mode 100644
index 0000000000000..8f8c8555066bf
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/while_move_local.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-19:
+Error: Script execution failed with VMError: {
+    major_status: MOVELOC_UNAVAILABLE_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 6)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/while_move_local_2.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/while_move_local_2.v2_exp
new file mode 100644
index 0000000000000..b59c1c88f3e10
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/locals_safety/while_move_local_2.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-23:
+Error: Script execution failed with VMError: {
+    major_status: MOVELOC_UNAVAILABLE_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 8)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/assign_field_after_local.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/assign_field_after_local.v2_exp
new file mode 100644
index 0000000000000..56a1524b0ac08
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/assign_field_after_local.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-22:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::Tester'. Got VMError: {
+    major_status: WRITEREF_EXISTS_BORROW_ERROR,
+    sub_status: None,
+    location: 0x42::Tester,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 8)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/assign_local_after_move.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/assign_local_after_move.v2_exp
new file mode 100644
index 0000000000000..e1edd1b962017
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/assign_local_after_move.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-13:
+Error: Script execution failed with VMError: {
+    major_status: MOVELOC_EXISTS_BORROW_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 12)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/assign_local_struct.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/assign_local_struct.v2_exp
new file mode 100644
index 0000000000000..5d92c423f3fd8
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/assign_local_struct.v2_exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/assign_local_struct_invalidated.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/assign_local_struct_invalidated.v2_exp
new file mode 100644
index 0000000000000..7bd47c8c4ad3c
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/assign_local_struct_invalidated.v2_exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 36-61:
+Error: Script execution failed with VMError: {
+    major_status: CALL_BORROWED_MUTABLE_REFERENCE_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 8)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/assign_local_value.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/assign_local_value.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/assign_local_value.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_copy_ok.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_copy_ok.v2_exp
new file mode 100644
index 0000000000000..5d92c423f3fd8
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_copy_ok.v2_exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_field_ok.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_field_ok.v2_exp
new file mode 100644
index 0000000000000..5d92c423f3fd8
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_field_ok.v2_exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_global_acquires_1.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_global_acquires_1.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_global_acquires_1.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_global_acquires_2.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_global_acquires_2.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_global_acquires_2.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_global_acquires_3.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_global_acquires_3.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_global_acquires_3.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_global_acquires_duplicate_annotation.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_global_acquires_duplicate_annotation.v2_exp
new file mode 100644
index 0000000000000..b7e3960f80b98
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_global_acquires_duplicate_annotation.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-13:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::A'. Got VMError: {
+    major_status: DUPLICATE_ACQUIRES_ANNOTATION,
+    sub_status: None,
+    location: 0x1::A,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_global_acquires_extraneous_annotation.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_global_acquires_extraneous_annotation.v2_exp
new file mode 100644
index 0000000000000..27feec460e02e
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_global_acquires_extraneous_annotation.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-11:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::A'. Got VMError: {
+    major_status: EXTRANEOUS_ACQUIRES_ANNOTATION,
+    sub_status: None,
+    location: 0x1::A,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_global_acquires_invalid_1.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_global_acquires_invalid_1.v2_exp
new file mode 100644
index 0000000000000..e16c4e5f84691
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_global_acquires_invalid_1.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-23:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::A'. Got VMError: {
+    major_status: GLOBAL_REFERENCE_ERROR,
+    sub_status: None,
+    location: 0x1::A,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 5)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_global_acquires_invalid_2.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_global_acquires_invalid_2.v2_exp
new file mode 100644
index 0000000000000..6b5b4c4ac26cf
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_global_acquires_invalid_2.v2_exp
@@ -0,0 +1,28 @@
+processed 3 tasks
+
+task 0 'publish'. lines 1-29:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::A'. Got VMError: {
+    major_status: GLOBAL_REFERENCE_ERROR,
+    sub_status: None,
+    location: 0x1::A,
+    indices: [(FunctionDefinition, 2)],
+    offsets: [(FunctionDefinitionIndex(2), 7)],
+}
+
+task 1 'publish'. lines 31-59:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::A2'. Got VMError: {
+    major_status: GLOBAL_REFERENCE_ERROR,
+    sub_status: None,
+    location: 0x1::A2,
+    indices: [(FunctionDefinition, 2)],
+    offsets: [(FunctionDefinitionIndex(2), 7)],
+}
+
+task 2 'publish'. lines 61-89:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::A2'. Got VMError: {
+    major_status: GLOBAL_REFERENCE_ERROR,
+    sub_status: None,
+    location: 0x1::A2,
+    indices: [(FunctionDefinition, 2)],
+    offsets: [(FunctionDefinitionIndex(2), 5)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_global_acquires_invalid_3.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_global_acquires_invalid_3.v2_exp
new file mode 100644
index 0000000000000..88b629cac51d8
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_global_acquires_invalid_3.v2_exp
@@ -0,0 +1,28 @@
+processed 3 tasks
+
+task 0 'publish'. lines 1-33:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::A'. Got VMError: {
+    major_status: GLOBAL_REFERENCE_ERROR,
+    sub_status: None,
+    location: 0x1::A,
+    indices: [(FunctionDefinition, 3)],
+    offsets: [(FunctionDefinitionIndex(3), 8)],
+}
+
+task 1 'publish'. lines 35-68:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::A2'. Got VMError: {
+    major_status: GLOBAL_REFERENCE_ERROR,
+    sub_status: None,
+    location: 0x1::A2,
+    indices: [(FunctionDefinition, 3)],
+    offsets: [(FunctionDefinitionIndex(3), 10)],
+}
+
+task 2 'publish'. lines 70-102:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::A3'. Got VMError: {
+    major_status: GLOBAL_REFERENCE_ERROR,
+    sub_status: None,
+    location: 0x1::A3,
+    indices: [(FunctionDefinition, 3)],
+    offsets: [(FunctionDefinitionIndex(3), 8)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_global_acquires_invalid_annotation.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_global_acquires_invalid_annotation.v2_exp
new file mode 100644
index 0000000000000..56a34f0dd15f6
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_global_acquires_invalid_annotation.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-12:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::A'. Got VMError: {
+    major_status: INVALID_ACQUIRES_ANNOTATION,
+    sub_status: None,
+    location: 0x1::A,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_global_acquires_missing_annotation.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_global_acquires_missing_annotation.v2_exp
new file mode 100644
index 0000000000000..451f76b7e2886
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_global_acquires_missing_annotation.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-13:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::A'. Got VMError: {
+    major_status: MISSING_ACQUIRES_ANNOTATION,
+    sub_status: None,
+    location: 0x1::A,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_global_acquires_return_reference_1.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_global_acquires_return_reference_1.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_global_acquires_return_reference_1.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_global_acquires_return_reference_invalid_1.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_global_acquires_return_reference_invalid_1.v2_exp
new file mode 100644
index 0000000000000..e9f84e17e5ee5
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_global_acquires_return_reference_invalid_1.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-17:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::A'. Got VMError: {
+    major_status: UNSAFE_RET_LOCAL_OR_RESOURCE_STILL_BORROWED,
+    sub_status: None,
+    location: 0x1::A,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 3)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_global_bad0.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_global_bad0.v2_exp
new file mode 100644
index 0000000000000..ec909b80a0fae
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_global_bad0.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-17:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::A'. Got VMError: {
+    major_status: GLOBAL_REFERENCE_ERROR,
+    sub_status: None,
+    location: 0x1::A,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 7)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_global_bad1.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_global_bad1.v2_exp
new file mode 100644
index 0000000000000..b36375914c448
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_global_bad1.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-18:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::A'. Got VMError: {
+    major_status: GLOBAL_REFERENCE_ERROR,
+    sub_status: None,
+    location: 0x1::A,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 7)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_global_bad2.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_global_bad2.v2_exp
new file mode 100644
index 0000000000000..8aec91d43fb3b
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_global_bad2.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-19:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::A'. Got VMError: {
+    major_status: GLOBAL_REFERENCE_ERROR,
+    sub_status: None,
+    location: 0x1::A,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 7)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_global_bad5.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_global_bad5.v2_exp
new file mode 100644
index 0000000000000..8f741b7df7bf3
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_global_bad5.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-28:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::A'. Got VMError: {
+    major_status: GLOBAL_REFERENCE_ERROR,
+    sub_status: None,
+    location: 0x1::A,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 15)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_global_good.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_global_good.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_global_good.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_if.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_if.v2_exp
new file mode 100644
index 0000000000000..4f66e9a976b7f
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_if.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-14:
+Error: Script execution failed with VMError: {
+    major_status: MOVELOC_UNAVAILABLE_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 6)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_in_loop.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_in_loop.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_in_loop.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_return_mutable_borrow_bad.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_return_mutable_borrow_bad.v2_exp
new file mode 100644
index 0000000000000..cefe0fe3aa085
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_return_mutable_borrow_bad.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-16:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: RET_BORROWED_MUTABLE_REFERENCE_ERROR,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 8)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_x_in_if_y_in_else.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_x_in_if_y_in_else.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_x_in_if_y_in_else.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/call_function_with_many_acquires.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/call_function_with_many_acquires.v2_exp
new file mode 100644
index 0000000000000..f8d6784e6d2d7
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/call_function_with_many_acquires.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 2-416:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::pwn'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x42::pwn,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/copy_loc_borrowed.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/copy_loc_borrowed.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/copy_loc_borrowed.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/copy_loc_borrowed_field.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/copy_loc_borrowed_field.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/copy_loc_borrowed_field.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/copy_loc_borrowed_field_invalid.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/copy_loc_borrowed_field_invalid.v2_exp
new file mode 100644
index 0000000000000..58c50b9f5be58
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/copy_loc_borrowed_field_invalid.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-17:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::Tester'. Got VMError: {
+    major_status: COPYLOC_EXISTS_BORROW_ERROR,
+    sub_status: None,
+    location: 0x1::Tester,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 6)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/copy_loc_borrowed_indirect.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/copy_loc_borrowed_indirect.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/copy_loc_borrowed_indirect.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/copy_loc_borrowed_indirect_invalid.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/copy_loc_borrowed_indirect_invalid.v2_exp
new file mode 100644
index 0000000000000..a666808ceded3
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/copy_loc_borrowed_indirect_invalid.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-20:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::Tester'. Got VMError: {
+    major_status: COPYLOC_EXISTS_BORROW_ERROR,
+    sub_status: None,
+    location: 0x1::Tester,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 8)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/copy_loc_borrowed_invalid.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/copy_loc_borrowed_invalid.v2_exp
new file mode 100644
index 0000000000000..e10bfcc93730d
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/copy_loc_borrowed_invalid.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-13:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::Tester'. Got VMError: {
+    major_status: COPYLOC_EXISTS_BORROW_ERROR,
+    sub_status: None,
+    location: 0x1::Tester,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 4)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/deref_borrow_field_ok.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/deref_borrow_field_ok.v2_exp
new file mode 100644
index 0000000000000..5d92c423f3fd8
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/deref_borrow_field_ok.v2_exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/deref_copy_bad.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/deref_copy_bad.v2_exp
new file mode 100644
index 0000000000000..e1edd1b962017
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/deref_copy_bad.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-13:
+Error: Script execution failed with VMError: {
+    major_status: MOVELOC_EXISTS_BORROW_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 12)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/deref_eq_bad.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/deref_eq_bad.v2_exp
new file mode 100644
index 0000000000000..de038a27cb216
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/deref_eq_bad.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-18:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: READREF_EXISTS_MUTABLE_BORROW_ERROR,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 5)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/deref_eq_good.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/deref_eq_good.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/deref_eq_good.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/eq_bad.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/eq_bad.v2_exp
new file mode 100644
index 0000000000000..7c78f043bf404
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/eq_bad.v2_exp
@@ -0,0 +1,37 @@
+processed 4 tasks
+
+task 0 'publish'. lines 1-13:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::Tester'. Got VMError: {
+    major_status: READREF_EXISTS_MUTABLE_BORROW_ERROR,
+    sub_status: None,
+    location: 0x1::Tester,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 6)],
+}
+
+task 1 'publish'. lines 15-27:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::Tester2'. Got VMError: {
+    major_status: READREF_EXISTS_MUTABLE_BORROW_ERROR,
+    sub_status: None,
+    location: 0x1::Tester2,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 6)],
+}
+
+task 2 'publish'. lines 29-41:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::Tester3'. Got VMError: {
+    major_status: READREF_EXISTS_MUTABLE_BORROW_ERROR,
+    sub_status: None,
+    location: 0x1::Tester3,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 6)],
+}
+
+task 3 'publish'. lines 43-55:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::Tester4'. Got VMError: {
+    major_status: READREF_EXISTS_MUTABLE_BORROW_ERROR,
+    sub_status: None,
+    location: 0x1::Tester4,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 6)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/eq_ok.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/eq_ok.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/eq_ok.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/factor_invalid_1.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/factor_invalid_1.v2_exp
new file mode 100644
index 0000000000000..782b6965557cd
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/factor_invalid_1.v2_exp
@@ -0,0 +1,19 @@
+processed 2 tasks
+
+task 0 'publish'. lines 1-28:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: CALL_BORROWED_MUTABLE_REFERENCE_ERROR,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 15)],
+}
+
+task 1 'publish'. lines 30-57:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M2'. Got VMError: {
+    major_status: CALL_BORROWED_MUTABLE_REFERENCE_ERROR,
+    sub_status: None,
+    location: 0x1::M2,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 15)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/factor_invalid_2.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/factor_invalid_2.v2_exp
new file mode 100644
index 0000000000000..92041c10d4621
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/factor_invalid_2.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-31:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: BORROWFIELD_EXISTS_MUTABLE_BORROW_ERROR,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 13)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/factor_valid_1.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/factor_valid_1.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/factor_valid_1.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/factor_valid_2.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/factor_valid_2.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/factor_valid_2.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/imm_borrow_global.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/imm_borrow_global.v2_exp
new file mode 100644
index 0000000000000..fc5a4436b29d4
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/imm_borrow_global.v2_exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/imm_borrow_global_invalid.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/imm_borrow_global_invalid.v2_exp
new file mode 100644
index 0000000000000..1debe98a83826
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/imm_borrow_global_invalid.v2_exp
@@ -0,0 +1,28 @@
+processed 4 tasks
+
+task 1 'publish'. lines 31-46:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::Tester'. Got VMError: {
+    major_status: GLOBAL_REFERENCE_ERROR,
+    sub_status: None,
+    location: 0x1::Tester,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 4)],
+}
+
+task 2 'publish'. lines 48-62:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::Tester'. Got VMError: {
+    major_status: GLOBAL_REFERENCE_ERROR,
+    sub_status: None,
+    location: 0x1::Tester,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 5)],
+}
+
+task 3 'publish'. lines 64-82:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::Tester'. Got VMError: {
+    major_status: GLOBAL_REFERENCE_ERROR,
+    sub_status: None,
+    location: 0x1::Tester,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 7)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/imm_borrow_global_lossy_acquire_invalid.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/imm_borrow_global_lossy_acquire_invalid.v2_exp
new file mode 100644
index 0000000000000..6aca78fb364f0
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/imm_borrow_global_lossy_acquire_invalid.v2_exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'publish'. lines 32-58:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::Tester'. Got VMError: {
+    major_status: GLOBAL_REFERENCE_ERROR,
+    sub_status: None,
+    location: 0x1::Tester,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 5)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/imm_borrow_global_requires_acquire.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/imm_borrow_global_requires_acquire.v2_exp
new file mode 100644
index 0000000000000..23a48a16da490
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/imm_borrow_global_requires_acquire.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-12:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::A'. Got VMError: {
+    major_status: MISSING_ACQUIRES_ANNOTATION,
+    sub_status: None,
+    location: 0x1::A,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/imm_borrow_loc.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/imm_borrow_loc.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/imm_borrow_loc.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/imm_borrow_loc_trivial.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/imm_borrow_loc_trivial.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/imm_borrow_loc_trivial.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/imm_borrow_loc_trivial_valid.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/imm_borrow_loc_trivial_valid.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/imm_borrow_loc_trivial_valid.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/imm_borrow_loc_valid.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/imm_borrow_loc_valid.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/imm_borrow_loc_valid.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/imm_borrow_on_mut.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/imm_borrow_on_mut.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/imm_borrow_on_mut.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/imm_borrow_on_mut_invalid.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/imm_borrow_on_mut_invalid.v2_exp
new file mode 100644
index 0000000000000..893405511c8cc
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/imm_borrow_on_mut_invalid.v2_exp
@@ -0,0 +1,19 @@
+processed 2 tasks
+
+task 0 'publish'. lines 1-51:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::Tester'. Got VMError: {
+    major_status: BORROWFIELD_EXISTS_MUTABLE_BORROW_ERROR,
+    sub_status: None,
+    location: 0x1::Tester,
+    indices: [(FunctionDefinition, 2)],
+    offsets: [(FunctionDefinitionIndex(2), 23)],
+}
+
+task 1 'publish'. lines 53-103:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::Tester2'. Got VMError: {
+    major_status: FREEZEREF_EXISTS_MUTABLE_BORROW_ERROR,
+    sub_status: None,
+    location: 0x1::Tester2,
+    indices: [(FunctionDefinition, 2)],
+    offsets: [(FunctionDefinitionIndex(2), 23)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/imm_borrow_on_mut_trivial.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/imm_borrow_on_mut_trivial.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/imm_borrow_on_mut_trivial.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/imm_borrow_on_mut_trivial_invalid.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/imm_borrow_on_mut_trivial_invalid.v2_exp
new file mode 100644
index 0000000000000..fd136e2a4d2d2
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/imm_borrow_on_mut_trivial_invalid.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-29:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::Tester'. Got VMError: {
+    major_status: BORROWFIELD_EXISTS_MUTABLE_BORROW_ERROR,
+    sub_status: None,
+    location: 0x1::Tester,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 6)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/join_borrow_unavailable_valid.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/join_borrow_unavailable_valid.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/join_borrow_unavailable_valid.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/move_one_branch.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/move_one_branch.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/move_one_branch.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/mutable_borrow_invalid.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/mutable_borrow_invalid.v2_exp
new file mode 100644
index 0000000000000..80a12b0918aa5
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/mutable_borrow_invalid.v2_exp
@@ -0,0 +1,19 @@
+processed 2 tasks
+
+task 0 'publish'. lines 1-19:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: WRITEREF_EXISTS_BORROW_ERROR,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 12)],
+}
+
+task 1 'publish'. lines 21-44:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M2'. Got VMError: {
+    major_status: CALL_BORROWED_MUTABLE_REFERENCE_ERROR,
+    sub_status: None,
+    location: 0x1::M2,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 12)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/mutable_borrow_local_twice.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/mutable_borrow_local_twice.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/mutable_borrow_local_twice.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/mutable_borrow_local_twice_invalid.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/mutable_borrow_local_twice_invalid.v2_exp
new file mode 100644
index 0000000000000..8b2edcf88605c
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/mutable_borrow_local_twice_invalid.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-17:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: WRITEREF_EXISTS_BORROW_ERROR,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 8)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/mutate_borrow_field_ok.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/mutate_borrow_field_ok.v2_exp
new file mode 100644
index 0000000000000..5d92c423f3fd8
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/mutate_borrow_field_ok.v2_exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/mutate_resource_holder.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/mutate_resource_holder.v2_exp
new file mode 100644
index 0000000000000..509d5fddf0c13
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/mutate_resource_holder.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-11:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::A'. Got VMError: {
+    major_status: WRITEREF_WITHOUT_DROP_ABILITY,
+    sub_status: None,
+    location: 0x42::A,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/mutate_resource_holder_2.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/mutate_resource_holder_2.v2_exp
new file mode 100644
index 0000000000000..5d92c423f3fd8
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/mutate_resource_holder_2.v2_exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/mutate_with_borrowed_loc.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/mutate_with_borrowed_loc.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/mutate_with_borrowed_loc.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/mutate_with_borrowed_loc_invalid.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/mutate_with_borrowed_loc_invalid.v2_exp
new file mode 100644
index 0000000000000..f7f6be1fd5607
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/mutate_with_borrowed_loc_invalid.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-13:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: STLOC_UNSAFE_TO_DESTROY_ERROR,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 5)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/mutate_with_borrowed_loc_struct_invalid.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/mutate_with_borrowed_loc_struct_invalid.v2_exp
new file mode 100644
index 0000000000000..06d18baed1ef5
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/mutate_with_borrowed_loc_struct_invalid.v2_exp
@@ -0,0 +1,19 @@
+processed 2 tasks
+
+task 0 'publish'. lines 1-17:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: STLOC_UNSAFE_TO_DESTROY_ERROR,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 7)],
+}
+
+task 1 'publish'. lines 19-35:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::N'. Got VMError: {
+    major_status: STLOC_UNSAFE_TO_DESTROY_ERROR,
+    sub_status: None,
+    location: 0x1::N,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 10)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/nested_mutate.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/nested_mutate.v2_exp
new file mode 100644
index 0000000000000..fc5a4436b29d4
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/nested_mutate.v2_exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/no_borrow_ref.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/no_borrow_ref.v2_exp
new file mode 100644
index 0000000000000..f55db2936607e
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/no_borrow_ref.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-10:
+Error: Script execution failed with VMError: {
+    major_status: BORROWLOC_REFERENCE_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 4)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/read_field_after_assign_local.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/read_field_after_assign_local.v2_exp
new file mode 100644
index 0000000000000..bac0e5bb93245
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/read_field_after_assign_local.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-21:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::Tester'. Got VMError: {
+    major_status: WRITEREF_EXISTS_BORROW_ERROR,
+    sub_status: None,
+    location: 0x42::Tester,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 8)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/read_local_ref_after_assign.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/read_local_ref_after_assign.v2_exp
new file mode 100644
index 0000000000000..f9ea14c07e34f
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/read_local_ref_after_assign.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-16:
+Error: Script execution failed with VMError: {
+    major_status: READREF_EXISTS_MUTABLE_BORROW_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 18)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/read_local_ref_after_move.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/read_local_ref_after_move.v2_exp
new file mode 100644
index 0000000000000..068b8819b9bc7
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/read_local_ref_after_move.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-11:
+Error: Script execution failed with VMError: {
+    major_status: MOVELOC_EXISTS_BORROW_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 4)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/ref_moved_one_branch.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/ref_moved_one_branch.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/ref_moved_one_branch.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/release_cycle.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/release_cycle.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/release_cycle.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/return_local_ref.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/return_local_ref.v2_exp
new file mode 100644
index 0000000000000..e9f47104d9015
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/return_local_ref.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-12:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::Tester'. Got VMError: {
+    major_status: UNSAFE_RET_LOCAL_OR_RESOURCE_STILL_BORROWED,
+    sub_status: None,
+    location: 0x42::Tester,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 5)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/return_with_borrowed_loc.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/return_with_borrowed_loc.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/return_with_borrowed_loc.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/return_with_borrowed_loc_invalid.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/return_with_borrowed_loc_invalid.v2_exp
new file mode 100644
index 0000000000000..d1360176893f8
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/return_with_borrowed_loc_invalid.v2_exp
@@ -0,0 +1,37 @@
+processed 4 tasks
+
+task 0 'publish'. lines 1-15:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: UNSAFE_RET_LOCAL_OR_RESOURCE_STILL_BORROWED,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 5)],
+}
+
+task 1 'publish'. lines 17-30:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M2'. Got VMError: {
+    major_status: UNSAFE_RET_LOCAL_OR_RESOURCE_STILL_BORROWED,
+    sub_status: None,
+    location: 0x1::M2,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 5)],
+}
+
+task 2 'publish'. lines 32-49:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M3'. Got VMError: {
+    major_status: UNSAFE_RET_LOCAL_OR_RESOURCE_STILL_BORROWED,
+    sub_status: None,
+    location: 0x1::M3,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 13)],
+}
+
+task 3 'publish'. lines 51-68:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M4'. Got VMError: {
+    major_status: UNSAFE_RET_LOCAL_OR_RESOURCE_STILL_BORROWED,
+    sub_status: None,
+    location: 0x1::M4,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 13)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/return_with_borrowed_loc_resource_invalid.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/return_with_borrowed_loc_resource_invalid.v2_exp
new file mode 100644
index 0000000000000..28a4b4f71eabe
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/return_with_borrowed_loc_resource_invalid.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-13:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: UNSAFE_RET_UNUSED_VALUES_WITHOUT_DROP,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 6)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/simple_mutate.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/simple_mutate.v2_exp
new file mode 100644
index 0000000000000..5d92c423f3fd8
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/simple_mutate.v2_exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/two_mutable_ref.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/two_mutable_ref.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/two_mutable_ref.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/use_after_move.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/use_after_move.v2_exp
new file mode 100644
index 0000000000000..e9762e99ad711
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/use_after_move.v2_exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'publish'. lines 12-37:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::A'. Got VMError: {
+    major_status: WRITEREF_EXISTS_BORROW_ERROR,
+    sub_status: None,
+    location: 0x42::A,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 10)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/use_prefix_after_move.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/use_prefix_after_move.v2_exp
new file mode 100644
index 0000000000000..fc5a4436b29d4
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/use_prefix_after_move.v2_exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/use_suffix_after_move.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/use_suffix_after_move.v2_exp
new file mode 100644
index 0000000000000..4a14be9c9a552
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/use_suffix_after_move.v2_exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'publish'. lines 19-41:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::A'. Got VMError: {
+    major_status: WRITEREF_EXISTS_BORROW_ERROR,
+    sub_status: None,
+    location: 0x42::A,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 12)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/vector_ops_double_borrow.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/vector_ops_double_borrow.v2_exp
new file mode 100644
index 0000000000000..fe00bc7961c0f
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/vector_ops_double_borrow.v2_exp
@@ -0,0 +1,28 @@
+processed 3 tasks
+
+task 0 'run'. lines 1-15:
+Error: Script execution failed with VMError: {
+    major_status: VEC_BORROW_ELEMENT_EXISTS_MUTABLE_BORROW_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 14)],
+}
+
+task 1 'run'. lines 17-31:
+Error: Script execution failed with VMError: {
+    major_status: BORROWLOC_EXISTS_BORROW_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 12)],
+}
+
+task 2 'run'. lines 33-47:
+Error: Script execution failed with VMError: {
+    major_status: VEC_BORROW_ELEMENT_EXISTS_MUTABLE_BORROW_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 14)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/vector_ops_move_after_borrow.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/vector_ops_move_after_borrow.v2_exp
new file mode 100644
index 0000000000000..0c783f82df667
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/vector_ops_move_after_borrow.v2_exp
@@ -0,0 +1,19 @@
+processed 2 tasks
+
+task 0 'run'. lines 1-12:
+Error: Script execution failed with VMError: {
+    major_status: MOVELOC_EXISTS_BORROW_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 9)],
+}
+
+task 1 'run'. lines 14-25:
+Error: Script execution failed with VMError: {
+    major_status: MOVELOC_EXISTS_BORROW_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 9)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/vector_ops_pop_after_borrow.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/vector_ops_pop_after_borrow.v2_exp
new file mode 100644
index 0000000000000..cf012f0cc74b5
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/vector_ops_pop_after_borrow.v2_exp
@@ -0,0 +1,19 @@
+processed 2 tasks
+
+task 0 'run'. lines 1-12:
+Error: Script execution failed with VMError: {
+    major_status: VEC_UPDATE_EXISTS_MUTABLE_BORROW_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 10)],
+}
+
+task 1 'run'. lines 14-25:
+Error: Script execution failed with VMError: {
+    major_status: VEC_UPDATE_EXISTS_MUTABLE_BORROW_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 10)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/writeref_borrow_invalid.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/writeref_borrow_invalid.v2_exp
new file mode 100644
index 0000000000000..7eb266510233b
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/writeref_borrow_invalid.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-17:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: WRITEREF_EXISTS_BORROW_ERROR,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 10)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/writeref_borrow_valid1.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/writeref_borrow_valid1.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/writeref_borrow_valid1.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/writeref_borrow_valid2.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/writeref_borrow_valid2.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/reference_safety/writeref_borrow_valid2.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/script_signature/script_type_parameters_in_args.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/script_signature/script_type_parameters_in_args.v2_exp
new file mode 100644
index 0000000000000..b134af1aea2b5
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/script_signature/script_type_parameters_in_args.v2_exp
@@ -0,0 +1 @@
+processed 5 tasks
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/script_signature/script_with_generic_type_arg.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/script_signature/script_with_generic_type_arg.v2_exp
new file mode 100644
index 0000000000000..5d92c423f3fd8
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/script_signature/script_with_generic_type_arg.v2_exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/script_signature/script_with_type_parameters.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/script_signature/script_with_type_parameters.v2_exp
new file mode 100644
index 0000000000000..1dddbff45c64e
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/script_signature/script_with_type_parameters.v2_exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 20-24:
+Error: Script execution failed with VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/script_signature/signer_double_signer.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/script_signature/signer_double_signer.v2_exp
new file mode 100644
index 0000000000000..4b0549d55c296
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/script_signature/signer_double_signer.v2_exp
@@ -0,0 +1,19 @@
+processed 3 tasks
+
+task 0 'run'. lines 1-6:
+Error: Script execution failed with VMError: {
+    major_status: NUMBER_OF_ARGUMENTS_MISMATCH,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
+
+task 1 'run'. lines 8-13:
+Error: Script execution failed with VMError: {
+    major_status: NUMBER_OF_ARGUMENTS_MISMATCH,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/script_signature/signer_misplaced_signer_arg.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/script_signature/signer_misplaced_signer_arg.v2_exp
new file mode 100644
index 0000000000000..5d92c423f3fd8
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/script_signature/signer_misplaced_signer_arg.v2_exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/script_signature/struct_arguments.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/script_signature/struct_arguments.v2_exp
new file mode 100644
index 0000000000000..8f8129931bf3f
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/script_signature/struct_arguments.v2_exp
@@ -0,0 +1,19 @@
+processed 3 tasks
+
+task 1 'run'. lines 15-20:
+Error: Script execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(0),
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 2 'run'. lines 22-22:
+Error: Function execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(0),
+    location: 0x42::M,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/signature/all_as_all_ok.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/signature/all_as_all_ok.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/signature/all_as_all_ok.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/signature/all_as_resource.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/signature/all_as_resource.v2_exp
new file mode 100644
index 0000000000000..b15334ba4bf10
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/signature/all_as_resource.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-11:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(Signature, 1), (FunctionDefinition, 0)],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/signature/all_as_unrestricted.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/signature/all_as_unrestricted.v2_exp
new file mode 100644
index 0000000000000..b15334ba4bf10
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/signature/all_as_unrestricted.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-11:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(Signature, 1), (FunctionDefinition, 0)],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/signature/bad_type_in_context.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/signature/bad_type_in_context.v2_exp
new file mode 100644
index 0000000000000..fb9b9ccf9a271
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/signature/bad_type_in_context.v2_exp
@@ -0,0 +1,64 @@
+processed 7 tasks
+
+task 0 'publish'. lines 1-11:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::m1'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x1::m1,
+    indices: [(Signature, 1), (FunctionDefinition, 0)],
+    offsets: [],
+}
+
+task 1 'publish'. lines 13-22:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::m2'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x1::m2,
+    indices: [(FunctionHandle, 0)],
+    offsets: [],
+}
+
+task 2 'publish'. lines 24-30:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::m3'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x1::m3,
+    indices: [(StructDefinition, 1)],
+    offsets: [],
+}
+
+task 3 'publish'. lines 32-38:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::m4'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x1::m4,
+    indices: [(StructDefinition, 1)],
+    offsets: [],
+}
+
+task 4 'publish'. lines 40-50:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::m5'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x1::m5,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [],
+}
+
+task 5 'publish'. lines 52-65:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::m6'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x1::m6,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [],
+}
+
+task 6 'publish'. lines 67-77:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::m7'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x1::m7,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/signature/bad_type_move_to_after_pack.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/signature/bad_type_move_to_after_pack.v2_exp
new file mode 100644
index 0000000000000..5396e86e00744
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/signature/bad_type_move_to_after_pack.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-13:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::m'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x1::m,
+    indices: [(StructDefInstantiation, 0), (FunctionDefinition, 0)],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/signature/check_constraints_script.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/signature/check_constraints_script.v2_exp
new file mode 100644
index 0000000000000..88cabce756593
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/signature/check_constraints_script.v2_exp
@@ -0,0 +1,73 @@
+processed 9 tasks
+
+task 1 'run'. lines 19-24:
+Error: Script execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(0),
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 2 'run'. lines 26-31:
+Error: Script execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(0),
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 3 'run'. lines 33-38:
+Error: Script execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(0),
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 4 'run'. lines 40-45:
+Error: Script execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(0),
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 5 'run'. lines 47-52:
+Error: Script execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(0),
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 6 'run'. lines 54-59:
+Error: Script execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(0),
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 7 'run'. lines 61-66:
+Error: Script execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(0),
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 8 'run'. lines 68-73:
+Error: Script execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(0),
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/signature/check_constraints_script_invalid.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/signature/check_constraints_script_invalid.v2_exp
new file mode 100644
index 0000000000000..6958d8d8d9fbf
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/signature/check_constraints_script_invalid.v2_exp
@@ -0,0 +1,73 @@
+processed 9 tasks
+
+task 1 'run'. lines 17-22:
+Error: Script execution failed with VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [],
+}
+
+task 2 'run'. lines 24-29:
+Error: Script execution failed with VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [],
+}
+
+task 3 'run'. lines 31-36:
+Error: Script execution failed with VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [],
+}
+
+task 4 'run'. lines 38-43:
+Error: Script execution failed with VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [],
+}
+
+task 5 'run'. lines 45-50:
+Error: Script execution failed with VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [],
+}
+
+task 6 'run'. lines 52-57:
+Error: Script execution failed with VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [],
+}
+
+task 7 'run'. lines 59-64:
+Error: Script execution failed with VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [],
+}
+
+task 8 'run'. lines 66-71:
+Error: Script execution failed with VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/signature/global_ops_bad_inner_type.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/signature/global_ops_bad_inner_type.v2_exp
new file mode 100644
index 0000000000000..1ea1314362aa1
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/signature/global_ops_bad_inner_type.v2_exp
@@ -0,0 +1,46 @@
+processed 5 tasks
+
+task 0 'publish'. lines 1-15:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::m1'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x1::m1,
+    indices: [(Signature, 2)],
+    offsets: [],
+}
+
+task 1 'publish'. lines 17-31:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::m2'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x1::m2,
+    indices: [(Signature, 2)],
+    offsets: [],
+}
+
+task 2 'publish'. lines 33-47:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::m3'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x1::m3,
+    indices: [(Signature, 2)],
+    offsets: [],
+}
+
+task 3 'publish'. lines 49-63:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::m4'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x1::m4,
+    indices: [(Signature, 2)],
+    offsets: [],
+}
+
+task 4 'publish'. lines 65-79:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::m5'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x1::m5,
+    indices: [(Signature, 2)],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/signature/reference_as_type_actual_for_bytecode_instruction.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/signature/reference_as_type_actual_for_bytecode_instruction.v2_exp
new file mode 100644
index 0000000000000..6193148848b69
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/signature/reference_as_type_actual_for_bytecode_instruction.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-14:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: INVALID_SIGNATURE_TOKEN,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(FunctionInstantiation, 0)],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/signature/reference_as_type_actual_for_struct.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/signature/reference_as_type_actual_for_struct.v2_exp
new file mode 100644
index 0000000000000..5c410b7de2677
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/signature/reference_as_type_actual_for_struct.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-11:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: INVALID_SIGNATURE_TOKEN,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(Signature, 1)],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/signature/reference_as_type_actual_in_struct_inst_for_bytecode_instruction.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/signature/reference_as_type_actual_in_struct_inst_for_bytecode_instruction.v2_exp
new file mode 100644
index 0000000000000..308112724e6db
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/signature/reference_as_type_actual_in_struct_inst_for_bytecode_instruction.v2_exp
@@ -0,0 +1,82 @@
+processed 9 tasks
+
+task 0 'publish'. lines 1-13:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: INVALID_SIGNATURE_TOKEN,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(StructDefInstantiation, 0)],
+    offsets: [],
+}
+
+task 1 'publish'. lines 15-28:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: INVALID_SIGNATURE_TOKEN,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(StructDefInstantiation, 0)],
+    offsets: [],
+}
+
+task 2 'publish'. lines 30-42:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: INVALID_SIGNATURE_TOKEN,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(StructDefInstantiation, 0)],
+    offsets: [],
+}
+
+task 3 'publish'. lines 44-57:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: INVALID_SIGNATURE_TOKEN,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(StructDefInstantiation, 0)],
+    offsets: [],
+}
+
+task 4 'publish'. lines 59-70:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: INVALID_SIGNATURE_TOKEN,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(StructDefInstantiation, 0)],
+    offsets: [],
+}
+
+task 5 'publish'. lines 72-86:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: INVALID_SIGNATURE_TOKEN,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(StructDefInstantiation, 0)],
+    offsets: [],
+}
+
+task 6 'publish'. lines 88-100:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: INVALID_SIGNATURE_TOKEN,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(StructDefInstantiation, 0)],
+    offsets: [],
+}
+
+task 7 'publish'. lines 102-111:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: INVALID_SIGNATURE_TOKEN,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(Signature, 0)],
+    offsets: [],
+}
+
+task 8 'publish'. lines 113-122:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: INVALID_SIGNATURE_TOKEN,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(Signature, 0)],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/signature/reference_in_fields.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/signature/reference_in_fields.v2_exp
new file mode 100644
index 0000000000000..f606abadc3c2c
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/signature/reference_in_fields.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-5:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INVALID_SIGNATURE_TOKEN,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(StructDefinition, 0)],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/signature/reference_in_locals_ok.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/signature/reference_in_locals_ok.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/signature/reference_in_locals_ok.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/signature/resource_as_all_ok.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/signature/resource_as_all_ok.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/signature/resource_as_all_ok.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/signature/resource_as_unrestricted.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/signature/resource_as_unrestricted.v2_exp
new file mode 100644
index 0000000000000..07c9297f09198
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/signature/resource_as_unrestricted.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-12:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(Signature, 1)],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/signature/two_type_actuals_ok.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/signature/two_type_actuals_ok.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/signature/two_type_actuals_ok.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/signature/two_type_actuals_reverse_order.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/signature/two_type_actuals_reverse_order.v2_exp
new file mode 100644
index 0000000000000..a6a2d382aaf89
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/signature/two_type_actuals_reverse_order.v2_exp
@@ -0,0 +1,19 @@
+processed 2 tasks
+
+task 0 'publish'. lines 1-11:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(Signature, 1)],
+    offsets: [],
+}
+
+task 1 'publish'. lines 13-24:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M2'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x1::M2,
+    indices: [(Signature, 1)],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/signature/unrestricted_as_all_ok.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/signature/unrestricted_as_all_ok.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/signature/unrestricted_as_all_ok.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/signature/unrestricted_as_resource.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/signature/unrestricted_as_resource.v2_exp
new file mode 100644
index 0000000000000..9ce36d4352754
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/signature/unrestricted_as_resource.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-11:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(Signature, 1)],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/signature/vector_ops_invalid_type_args.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/signature/vector_ops_invalid_type_args.v2_exp
new file mode 100644
index 0000000000000..ead8050a5fdae
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/signature/vector_ops_invalid_type_args.v2_exp
@@ -0,0 +1,28 @@
+processed 3 tasks
+
+task 0 'run'. lines 1-6:
+Error: Script execution failed with VMError: {
+    major_status: NUMBER_OF_TYPE_ARGUMENTS_MISMATCH,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [],
+}
+
+task 1 'run'. lines 8-13:
+Error: Script execution failed with VMError: {
+    major_status: NUMBER_OF_TYPE_ARGUMENTS_MISMATCH,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [],
+}
+
+task 2 'run'. lines 15-20:
+Error: Script execution failed with VMError: {
+    major_status: INVALID_SIGNATURE_TOKEN,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/abort_negative_stack_size.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/abort_negative_stack_size.v2_exp
new file mode 100644
index 0000000000000..7ee696b46eeef
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/abort_negative_stack_size.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-6:
+Error: Script execution failed with VMError: {
+    major_status: NEGATIVE_STACK_SIZE_WITHIN_BLOCK,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/abort_no_return.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/abort_no_return.v2_exp
new file mode 100644
index 0000000000000..cbe3f217dbc5b
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/abort_no_return.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-6:
+Error: Script execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(0),
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/abort_positive_stack_size.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/abort_positive_stack_size.v2_exp
new file mode 100644
index 0000000000000..b5ff75d93db04
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/abort_positive_stack_size.v2_exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 11-19:
+Error: Script execution failed with VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/cast_negative_stack.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/cast_negative_stack.v2_exp
new file mode 100644
index 0000000000000..fb39cf47b328f
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/cast_negative_stack.v2_exp
@@ -0,0 +1,55 @@
+processed 6 tasks
+
+task 0 'run'. lines 1-6:
+Error: Script execution failed with VMError: {
+    major_status: NEGATIVE_STACK_SIZE_WITHIN_BLOCK,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
+
+task 1 'run'. lines 8-13:
+Error: Script execution failed with VMError: {
+    major_status: NEGATIVE_STACK_SIZE_WITHIN_BLOCK,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
+
+task 2 'run'. lines 15-20:
+Error: Script execution failed with VMError: {
+    major_status: NEGATIVE_STACK_SIZE_WITHIN_BLOCK,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
+
+task 3 'run'. lines 22-27:
+Error: Script execution failed with VMError: {
+    major_status: NEGATIVE_STACK_SIZE_WITHIN_BLOCK,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
+
+task 4 'run'. lines 29-34:
+Error: Script execution failed with VMError: {
+    major_status: NEGATIVE_STACK_SIZE_WITHIN_BLOCK,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
+
+task 5 'run'. lines 36-41:
+Error: Script execution failed with VMError: {
+    major_status: NEGATIVE_STACK_SIZE_WITHIN_BLOCK,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/cast_positive_stack.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/cast_positive_stack.v2_exp
new file mode 100644
index 0000000000000..7537209e3172f
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/cast_positive_stack.v2_exp
@@ -0,0 +1,55 @@
+processed 6 tasks
+
+task 0 'run'. lines 1-7:
+Error: Script execution failed with VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
+
+task 1 'run'. lines 9-15:
+Error: Script execution failed with VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
+
+task 2 'run'. lines 17-23:
+Error: Script execution failed with VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
+
+task 3 'run'. lines 25-31:
+Error: Script execution failed with VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
+
+task 4 'run'. lines 33-39:
+Error: Script execution failed with VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
+
+task 5 'run'. lines 41-47:
+Error: Script execution failed with VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/consume_stack.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/consume_stack.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/consume_stack.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/exp_in_if_and_else_branch.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/exp_in_if_and_else_branch.v2_exp
new file mode 100644
index 0000000000000..e2e5d56821fd1
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/exp_in_if_and_else_branch.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-15:
+Error: Script execution failed with VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/function_call_negative_stack_err_1.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/function_call_negative_stack_err_1.v2_exp
new file mode 100644
index 0000000000000..575994437920d
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/function_call_negative_stack_err_1.v2_exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 11-19:
+Error: Script execution failed with VMError: {
+    major_status: NEGATIVE_STACK_SIZE_WITHIN_BLOCK,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/function_call_negative_stack_err_2.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/function_call_negative_stack_err_2.v2_exp
new file mode 100644
index 0000000000000..f3216bb069d72
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/function_call_negative_stack_err_2.v2_exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 24-35:
+Error: Script execution failed with VMError: {
+    major_status: NEGATIVE_STACK_SIZE_WITHIN_BLOCK,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/function_composition_pos_and_neg_stack_err.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/function_composition_pos_and_neg_stack_err.v2_exp
new file mode 100644
index 0000000000000..69e4fd879d8db
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/function_composition_pos_and_neg_stack_err.v2_exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 23-38:
+Error: Script execution failed with VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/function_composition_positive_stack_err_1.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/function_composition_positive_stack_err_1.v2_exp
new file mode 100644
index 0000000000000..70daa8491fbb6
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/function_composition_positive_stack_err_1.v2_exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 18-31:
+Error: Script execution failed with VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/function_composition_positive_stack_err_2.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/function_composition_positive_stack_err_2.v2_exp
new file mode 100644
index 0000000000000..f0a3934dd7a0d
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/function_composition_positive_stack_err_2.v2_exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 18-30:
+Error: Script execution failed with VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/integer_stack_balanced.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/integer_stack_balanced.v2_exp
new file mode 100644
index 0000000000000..2301000e50ae4
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/integer_stack_balanced.v2_exp
@@ -0,0 +1 @@
+processed 6 tasks
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/integer_stack_negative.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/integer_stack_negative.v2_exp
new file mode 100644
index 0000000000000..14f3442e13379
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/integer_stack_negative.v2_exp
@@ -0,0 +1,55 @@
+processed 6 tasks
+
+task 0 'publish'. lines 1-14:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::A'. Got VMError: {
+    major_status: NEGATIVE_STACK_SIZE_WITHIN_BLOCK,
+    sub_status: None,
+    location: 0x1::A,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 0)],
+}
+
+task 1 'publish'. lines 17-30:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::A'. Got VMError: {
+    major_status: NEGATIVE_STACK_SIZE_WITHIN_BLOCK,
+    sub_status: None,
+    location: 0x1::A,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 0)],
+}
+
+task 2 'publish'. lines 32-45:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::A'. Got VMError: {
+    major_status: NEGATIVE_STACK_SIZE_WITHIN_BLOCK,
+    sub_status: None,
+    location: 0x1::A,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 0)],
+}
+
+task 3 'publish'. lines 47-60:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::A'. Got VMError: {
+    major_status: NEGATIVE_STACK_SIZE_WITHIN_BLOCK,
+    sub_status: None,
+    location: 0x1::A,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 0)],
+}
+
+task 4 'publish'. lines 62-75:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::A'. Got VMError: {
+    major_status: NEGATIVE_STACK_SIZE_WITHIN_BLOCK,
+    sub_status: None,
+    location: 0x1::A,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 0)],
+}
+
+task 5 'publish'. lines 77-90:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::A'. Got VMError: {
+    major_status: NEGATIVE_STACK_SIZE_WITHIN_BLOCK,
+    sub_status: None,
+    location: 0x1::A,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 0)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/integer_stack_positive.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/integer_stack_positive.v2_exp
new file mode 100644
index 0000000000000..e3e8ca2c39aac
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/integer_stack_positive.v2_exp
@@ -0,0 +1,55 @@
+processed 6 tasks
+
+task 0 'publish'. lines 1-14:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::A'. Got VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: 0x1::A,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 0)],
+}
+
+task 1 'publish'. lines 17-30:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::A'. Got VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: 0x1::A,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 0)],
+}
+
+task 2 'publish'. lines 32-45:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::A'. Got VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: 0x1::A,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 0)],
+}
+
+task 3 'publish'. lines 47-60:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::A'. Got VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: 0x1::A,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 0)],
+}
+
+task 4 'publish'. lines 62-75:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::A'. Got VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: 0x1::A,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 0)],
+}
+
+task 5 'publish'. lines 77-90:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::A'. Got VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: 0x1::A,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 0)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/load_positive_stack.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/load_positive_stack.v2_exp
new file mode 100644
index 0000000000000..01c291322c90a
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/load_positive_stack.v2_exp
@@ -0,0 +1,55 @@
+processed 6 tasks
+
+task 0 'run'. lines 1-6:
+Error: Script execution failed with VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
+
+task 1 'run'. lines 8-13:
+Error: Script execution failed with VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
+
+task 2 'run'. lines 15-20:
+Error: Script execution failed with VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
+
+task 3 'run'. lines 22-27:
+Error: Script execution failed with VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
+
+task 4 'run'. lines 29-34:
+Error: Script execution failed with VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
+
+task 5 'run'. lines 36-41:
+Error: Script execution failed with VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/multiple_bindings_negative_stack.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/multiple_bindings_negative_stack.v2_exp
new file mode 100644
index 0000000000000..91529eed122b3
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/multiple_bindings_negative_stack.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-10:
+Error: Script execution failed with VMError: {
+    major_status: NEGATIVE_STACK_SIZE_WITHIN_BLOCK,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/multiple_bindings_positive_stack.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/multiple_bindings_positive_stack.v2_exp
new file mode 100644
index 0000000000000..39f276bf0c921
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/multiple_bindings_positive_stack.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-9:
+Error: Script execution failed with VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/multiple_return_values.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/multiple_return_values.v2_exp
new file mode 100644
index 0000000000000..5d92c423f3fd8
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/multiple_return_values.v2_exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/multiple_return_values_extra_binding.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/multiple_return_values_extra_binding.v2_exp
new file mode 100644
index 0000000000000..a9b16505dbd99
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/multiple_return_values_extra_binding.v2_exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 23-43:
+Error: Script execution failed with VMError: {
+    major_status: NEGATIVE_STACK_SIZE_WITHIN_BLOCK,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/multiple_return_values_extra_value.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/multiple_return_values_extra_value.v2_exp
new file mode 100644
index 0000000000000..892b8117ea364
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/multiple_return_values_extra_value.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-22:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::Test'. Got VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: 0x1::Test,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 0)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/multiple_return_values_missing_binding.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/multiple_return_values_missing_binding.v2_exp
new file mode 100644
index 0000000000000..69e4fd879d8db
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/multiple_return_values_missing_binding.v2_exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 23-38:
+Error: Script execution failed with VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/multiple_return_values_missing_value.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/multiple_return_values_missing_value.v2_exp
new file mode 100644
index 0000000000000..e7dbcda0a6607
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/multiple_return_values_missing_value.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-22:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::Test'. Got VMError: {
+    major_status: NEGATIVE_STACK_SIZE_WITHIN_BLOCK,
+    sub_status: None,
+    location: 0x1::Test,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 0)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/pop_exact.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/pop_exact.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/pop_exact.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/pop_negative.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/pop_negative.v2_exp
new file mode 100644
index 0000000000000..559dd06120be6
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/pop_negative.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-14:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::A'. Got VMError: {
+    major_status: NEGATIVE_STACK_SIZE_WITHIN_BLOCK,
+    sub_status: None,
+    location: 0x1::A,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 0)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/pop_positive.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/pop_positive.v2_exp
new file mode 100644
index 0000000000000..269d1dd064ab9
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/pop_positive.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-14:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::A'. Got VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: 0x1::A,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 0)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/signer_move_to_extra_arg.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/signer_move_to_extra_arg.v2_exp
new file mode 100644
index 0000000000000..d385bf5798e53
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/signer_move_to_extra_arg.v2_exp
@@ -0,0 +1,19 @@
+processed 2 tasks
+
+task 0 'publish'. lines 1-13:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
+
+task 1 'publish'. lines 15-24:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::N'. Got VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: 0x42::N,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/signer_move_to_missing_resource.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/signer_move_to_missing_resource.v2_exp
new file mode 100644
index 0000000000000..5cf0785cbdc08
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/signer_move_to_missing_resource.v2_exp
@@ -0,0 +1,19 @@
+processed 2 tasks
+
+task 0 'publish'. lines 1-11:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: NEGATIVE_STACK_SIZE_WITHIN_BLOCK,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
+
+task 1 'publish'. lines 13-22:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::N'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x42::N,
+    indices: [(StructDefInstantiation, 0), (FunctionDefinition, 0)],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/signer_move_to_missing_signer.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/signer_move_to_missing_signer.v2_exp
new file mode 100644
index 0000000000000..5cf0785cbdc08
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/signer_move_to_missing_signer.v2_exp
@@ -0,0 +1,19 @@
+processed 2 tasks
+
+task 0 'publish'. lines 1-11:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: NEGATIVE_STACK_SIZE_WITHIN_BLOCK,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
+
+task 1 'publish'. lines 13-22:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::N'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x42::N,
+    indices: [(StructDefInstantiation, 0), (FunctionDefinition, 0)],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/signer_move_to_no_args.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/signer_move_to_no_args.v2_exp
new file mode 100644
index 0000000000000..773ae7b550bff
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/signer_move_to_no_args.v2_exp
@@ -0,0 +1,19 @@
+processed 2 tasks
+
+task 0 'publish'. lines 1-10:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: NEGATIVE_STACK_SIZE_WITHIN_BLOCK,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
+
+task 1 'publish'. lines 12-21:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::N'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x42::N,
+    indices: [(StructDefInstantiation, 0), (FunctionDefinition, 0)],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/unpack_extra_binding.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/unpack_extra_binding.v2_exp
new file mode 100644
index 0000000000000..99f3813d6921a
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/unpack_extra_binding.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-23:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::Test'. Got VMError: {
+    major_status: NEGATIVE_STACK_SIZE_WITHIN_BLOCK,
+    sub_status: None,
+    location: 0x1::Test,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 0)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/unpack_missing_binding.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/unpack_missing_binding.v2_exp
new file mode 100644
index 0000000000000..49c6e9980ccaf
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/unpack_missing_binding.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-23:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::Test'. Got VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: 0x1::Test,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 0)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/vector_ops_pack_unpack.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/vector_ops_pack_unpack.v2_exp
new file mode 100644
index 0000000000000..364055d4b5c46
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/vector_ops_pack_unpack.v2_exp
@@ -0,0 +1,37 @@
+processed 4 tasks
+
+task 0 'run'. lines 1-7:
+Error: Script execution failed with VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
+
+task 1 'run'. lines 9-15:
+Error: Script execution failed with VMError: {
+    major_status: NEGATIVE_STACK_SIZE_WITHIN_BLOCK,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
+
+task 2 'run'. lines 17-25:
+Error: Script execution failed with VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
+
+task 3 'run'. lines 27-35:
+Error: Script execution failed with VMError: {
+    major_status: NEGATIVE_STACK_SIZE_WITHIN_BLOCK,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/struct_defs/module_struct_shared_name.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/struct_defs/module_struct_shared_name.v2_exp
new file mode 100644
index 0000000000000..5d92c423f3fd8
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/struct_defs/module_struct_shared_name.v2_exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/struct_defs/mutual_recursive_struct.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/struct_defs/mutual_recursive_struct.v2_exp
new file mode 100644
index 0000000000000..e6cc45c48b1e0
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/struct_defs/mutual_recursive_struct.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-6:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: RECURSIVE_STRUCT_DEFINITION,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(StructDefinition, 1)],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/struct_defs/recursive_struct.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/struct_defs/recursive_struct.v2_exp
new file mode 100644
index 0000000000000..67e995bfc2f6b
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/struct_defs/recursive_struct.v2_exp
@@ -0,0 +1,46 @@
+processed 6 tasks
+
+task 1 'publish'. lines 10-14:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M0'. Got VMError: {
+    major_status: RECURSIVE_STRUCT_DEFINITION,
+    sub_status: None,
+    location: 0x1::M0,
+    indices: [(StructDefinition, 0)],
+    offsets: [],
+}
+
+task 2 'publish'. lines 16-28:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M1'. Got VMError: {
+    major_status: RECURSIVE_STRUCT_DEFINITION,
+    sub_status: None,
+    location: 0x1::M1,
+    indices: [(StructDefinition, 0)],
+    offsets: [],
+}
+
+task 3 'publish'. lines 30-49:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M2'. Got VMError: {
+    major_status: RECURSIVE_STRUCT_DEFINITION,
+    sub_status: None,
+    location: 0x1::M2,
+    indices: [(StructDefinition, 1)],
+    offsets: [],
+}
+
+task 4 'publish'. lines 51-58:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M3'. Got VMError: {
+    major_status: RECURSIVE_STRUCT_DEFINITION,
+    sub_status: None,
+    location: 0x1::M3,
+    indices: [(StructDefinition, 0)],
+    offsets: [],
+}
+
+task 5 'publish'. lines 60-70:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M3'. Got VMError: {
+    major_status: RECURSIVE_STRUCT_DEFINITION,
+    sub_status: None,
+    location: 0x1::M3,
+    indices: [(StructDefinition, 3)],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/struct_defs/ref_in_struct.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/struct_defs/ref_in_struct.v2_exp
new file mode 100644
index 0000000000000..1457d52cadff7
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/struct_defs/ref_in_struct.v2_exp
@@ -0,0 +1,37 @@
+processed 4 tasks
+
+task 0 'publish'. lines 1-4:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M1'. Got VMError: {
+    major_status: INVALID_SIGNATURE_TOKEN,
+    sub_status: None,
+    location: 0x42::M1,
+    indices: [(StructDefinition, 0)],
+    offsets: [],
+}
+
+task 1 'publish'. lines 6-9:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M2'. Got VMError: {
+    major_status: INVALID_SIGNATURE_TOKEN,
+    sub_status: None,
+    location: 0x42::M2,
+    indices: [(StructDefinition, 0)],
+    offsets: [],
+}
+
+task 2 'publish'. lines 11-14:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M3'. Got VMError: {
+    major_status: INVALID_SIGNATURE_TOKEN,
+    sub_status: None,
+    location: 0x42::M3,
+    indices: [(StructDefinition, 0)],
+    offsets: [],
+}
+
+task 3 'publish'. lines 16-19:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M4'. Got VMError: {
+    major_status: INVALID_SIGNATURE_TOKEN,
+    sub_status: None,
+    location: 0x42::M4,
+    indices: [(StructDefinition, 0)],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/assign_local_resource.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/assign_local_resource.v2_exp
new file mode 100644
index 0000000000000..509d5fddf0c13
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/assign_local_resource.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-11:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::A'. Got VMError: {
+    major_status: WRITEREF_WITHOUT_DROP_ABILITY,
+    sub_status: None,
+    location: 0x42::A,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/assign_local_resource_twice.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/assign_local_resource_twice.v2_exp
new file mode 100644
index 0000000000000..04ab2b89db996
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/assign_local_resource_twice.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-13:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::A'. Got VMError: {
+    major_status: WRITEREF_WITHOUT_DROP_ABILITY,
+    sub_status: None,
+    location: 0x42::A,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/assign_resource_type.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/assign_resource_type.v2_exp
new file mode 100644
index 0000000000000..a830d1e9baf17
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/assign_resource_type.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-14:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::A'. Got VMError: {
+    major_status: WRITEREF_WITHOUT_DROP_ABILITY,
+    sub_status: None,
+    location: 0x42::A,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 5)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/assign_wrong_type.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/assign_wrong_type.v2_exp
new file mode 100644
index 0000000000000..8020e634d57d6
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/assign_wrong_type.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-7:
+Error: Script execution failed with VMError: {
+    major_status: STLOC_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/boolean_not_non_boolean.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/boolean_not_non_boolean.v2_exp
new file mode 100644
index 0000000000000..887cbe5c1f840
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/boolean_not_non_boolean.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-9:
+Error: Script execution failed with VMError: {
+    major_status: BOOLEAN_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/bug_9459_notworking.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/bug_9459_notworking.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/bug_9459_notworking.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/bug_9459_working.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/bug_9459_working.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/bug_9459_working.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/cant_deref_resource.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/cant_deref_resource.v2_exp
new file mode 100644
index 0000000000000..21025e25e7a0d
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/cant_deref_resource.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-48:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::Token'. Got VMError: {
+    major_status: READREF_WITHOUT_COPY_ABILITY,
+    sub_status: None,
+    location: 0x1::Token,
+    indices: [(FunctionDefinition, 4)],
+    offsets: [(FunctionDefinitionIndex(4), 13)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/casting_operators_types_mismatch.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/casting_operators_types_mismatch.v2_exp
new file mode 100644
index 0000000000000..8804a80a8b961
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/casting_operators_types_mismatch.v2_exp
@@ -0,0 +1,163 @@
+processed 18 tasks
+
+task 0 'run'. lines 1-7:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 1 'run'. lines 9-14:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 2 'run'. lines 16-21:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 3 'run'. lines 23-28:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 4 'run'. lines 30-35:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 5 'run'. lines 37-42:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 6 'run'. lines 45-50:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 7 'run'. lines 52-57:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 8 'run'. lines 59-64:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 9 'run'. lines 66-71:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 10 'run'. lines 73-78:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 11 'run'. lines 80-85:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 12 'publish'. lines 88-96:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 13 'publish'. lines 98-106:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 14 'publish'. lines 108-116:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 15 'publish'. lines 118-126:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 16 'publish'. lines 128-136:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 17 'publish'. lines 138-146:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/deref_non_reference.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/deref_non_reference.v2_exp
new file mode 100644
index 0000000000000..48938fbb13203
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/deref_non_reference.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-9:
+Error: Script execution failed with VMError: {
+    major_status: READREF_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/deref_not_reference_bad.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/deref_not_reference_bad.v2_exp
new file mode 100644
index 0000000000000..52031e1a9ce12
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/deref_not_reference_bad.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-9:
+Error: Script execution failed with VMError: {
+    major_status: BOOLEAN_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/destroy_resource_holder.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/destroy_resource_holder.v2_exp
new file mode 100644
index 0000000000000..9029cccd4683e
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/destroy_resource_holder.v2_exp
@@ -0,0 +1,4 @@
+processed 2 tasks
+
+task 1 'run'. lines 22-33:
+Error: Unbound module alias Diem
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/equality_one_ref.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/equality_one_ref.v2_exp
new file mode 100644
index 0000000000000..96059e4c886db
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/equality_one_ref.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-11:
+Error: Script execution failed with VMError: {
+    major_status: EQUALITY_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 6)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/equality_resource_refs.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/equality_resource_refs.v2_exp
new file mode 100644
index 0000000000000..5d92c423f3fd8
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/equality_resource_refs.v2_exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/equality_resource_values.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/equality_resource_values.v2_exp
new file mode 100644
index 0000000000000..9f367810cbad1
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/equality_resource_values.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-11:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::Token'. Got VMError: {
+    major_status: EQUALITY_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x1::Token,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 4)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/freeze_makes_imm.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/freeze_makes_imm.v2_exp
new file mode 100644
index 0000000000000..6afb8900a4fbf
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/freeze_makes_imm.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-13:
+Error: Script execution failed with VMError: {
+    major_status: WRITEREF_NO_MUTABLE_REFERENCE_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 9)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/freeze_on_imm.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/freeze_on_imm.v2_exp
new file mode 100644
index 0000000000000..ab1dba46f71fe
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/freeze_on_imm.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-12:
+Error: Script execution failed with VMError: {
+    major_status: FREEZEREF_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 5)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/freeze_valid.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/freeze_valid.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/freeze_valid.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/freeze_wrong_type.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/freeze_wrong_type.v2_exp
new file mode 100644
index 0000000000000..60ba13b716a94
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/freeze_wrong_type.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-13:
+Error: Script execution failed with VMError: {
+    major_status: STLOC_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 6)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_abilities_borrow_field.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_abilities_borrow_field.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_abilities_borrow_field.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_abilities_borrow_global.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_abilities_borrow_global.v2_exp
new file mode 100644
index 0000000000000..bf502bcfc4ab4
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_abilities_borrow_global.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-12:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(StructDefInstantiation, 0), (FunctionDefinition, 0)],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_abilities_borrow_global_mut.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_abilities_borrow_global_mut.v2_exp
new file mode 100644
index 0000000000000..849d979b310eb
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_abilities_borrow_global_mut.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-11:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(StructDefInstantiation, 0), (FunctionDefinition, 0)],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_abilities_call.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_abilities_call.v2_exp
new file mode 100644
index 0000000000000..69762fde12943
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_abilities_call.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-15:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: COPYLOC_WITHOUT_COPY_ABILITY,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 3)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_abilities_exists.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_abilities_exists.v2_exp
new file mode 100644
index 0000000000000..3f42db671be9b
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_abilities_exists.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-9:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(StructDefInstantiation, 0), (FunctionDefinition, 0)],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_abilities_imm_borrow_field.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_abilities_imm_borrow_field.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_abilities_imm_borrow_field.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_abilities_pack.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_abilities_pack.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_abilities_pack.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_abilities_struct_non_nominal_resource.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_abilities_struct_non_nominal_resource.v2_exp
new file mode 100644
index 0000000000000..6e22edc070f94
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_abilities_struct_non_nominal_resource.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-12:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: COPYLOC_WITHOUT_COPY_ABILITY,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_abilities_type_param_all.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_abilities_type_param_all.v2_exp
new file mode 100644
index 0000000000000..1a4232f281586
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_abilities_type_param_all.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-9:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: COPYLOC_WITHOUT_COPY_ABILITY,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_abilities_type_param_resource.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_abilities_type_param_resource.v2_exp
new file mode 100644
index 0000000000000..1a4232f281586
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_abilities_type_param_resource.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-9:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: COPYLOC_WITHOUT_COPY_ABILITY,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_abilities_unpack.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_abilities_unpack.v2_exp
new file mode 100644
index 0000000000000..59701471c163d
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_abilities_unpack.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-11:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: UNSAFE_RET_UNUSED_VALUES_WITHOUT_DROP,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_builtins.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_builtins.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_builtins.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_call.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_call.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_call.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_field_borrow.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_field_borrow.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_field_borrow.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_field_borrow_after_call.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_field_borrow_after_call.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_field_borrow_after_call.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_function_def.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_function_def.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_function_def.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_id_function.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_id_function.v2_exp
new file mode 100644
index 0000000000000..5d92c423f3fd8
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_id_function.v2_exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_import_function.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_import_function.v2_exp
new file mode 100644
index 0000000000000..7c33296901391
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_import_function.v2_exp
@@ -0,0 +1,19 @@
+processed 3 tasks
+
+task 1 'run'. lines 21-28:
+Error: Script execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(0),
+    location: 0x1::M,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 2 'run'. lines 30-37:
+Error: Script execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(0),
+    location: 0x1::M,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(1), 1)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_import_struct.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_import_struct.v2_exp
new file mode 100644
index 0000000000000..fc5a4436b29d4
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_import_struct.v2_exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_option.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_option.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_option.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_pack.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_pack.v2_exp
new file mode 100644
index 0000000000000..5d92c423f3fd8
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_pack.v2_exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_struct_def.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_struct_def.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_struct_def.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_unpack.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_unpack.v2_exp
new file mode 100644
index 0000000000000..5d92c423f3fd8
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/generic_unpack.v2_exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/gerbens_test.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/gerbens_test.v2_exp
new file mode 100644
index 0000000000000..0d2a8cf708b95
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/gerbens_test.v2_exp
@@ -0,0 +1,11 @@
+processed 1 task
+
+task 0 'publish'. lines 1-93:
+Error: compilation errors:
+ error: Only inline functions may have function-typed parameters, but non-inline function `test_case::for_each_ref` has a function parameter:
+  ┌─ TEMPFILE:9:16
+  │
+9 │     public fun for_each_ref<Element>(v: &vector<Element>, f: |&Element|) {
+  │                ^^^^^^^^^^^^                               - Parameter `f` has a function type.
+
+
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/gerbens_test1.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/gerbens_test1.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/gerbens_test1.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/integer_binary_operators_types_mismatch.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/integer_binary_operators_types_mismatch.v2_exp
new file mode 100644
index 0000000000000..13167fe2e24ae
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/integer_binary_operators_types_mismatch.v2_exp
@@ -0,0 +1,1720 @@
+processed 191 tasks
+
+task 0 'run'. lines 1-11:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 1 'run'. lines 14-19:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 2 'run'. lines 22-27:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 3 'run'. lines 30-35:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 4 'run'. lines 38-43:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 5 'run'. lines 46-51:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 6 'run'. lines 54-59:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 7 'run'. lines 62-67:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 8 'run'. lines 70-75:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 9 'run'. lines 78-83:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 10 'run'. lines 86-91:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 11 'run'. lines 94-99:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 12 'publish'. lines 102-110:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
+
+task 13 'publish'. lines 112-120:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
+
+task 14 'publish'. lines 122-134:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 4)],
+}
+
+task 15 'run'. lines 135-140:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 16 'run'. lines 143-148:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 17 'run'. lines 151-156:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 18 'run'. lines 159-164:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 19 'run'. lines 167-172:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 20 'run'. lines 175-180:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 21 'run'. lines 183-188:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 22 'run'. lines 191-196:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 23 'run'. lines 199-204:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 24 'run'. lines 207-212:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 25 'run'. lines 215-220:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 26 'run'. lines 223-228:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 27 'publish'. lines 231-239:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
+
+task 28 'publish'. lines 241-249:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
+
+task 29 'publish'. lines 251-263:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 4)],
+}
+
+task 30 'run'. lines 264-269:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 31 'run'. lines 272-277:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 32 'run'. lines 280-285:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 33 'run'. lines 288-293:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 34 'run'. lines 296-301:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 35 'run'. lines 304-309:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 36 'run'. lines 312-317:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 37 'run'. lines 320-325:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 38 'run'. lines 328-333:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 39 'run'. lines 336-341:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 40 'run'. lines 344-349:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 41 'run'. lines 352-357:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 42 'publish'. lines 360-368:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
+
+task 43 'publish'. lines 370-378:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
+
+task 44 'publish'. lines 380-392:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 4)],
+}
+
+task 45 'run'. lines 393-398:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 46 'run'. lines 401-406:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 47 'run'. lines 409-414:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 48 'run'. lines 417-422:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 49 'run'. lines 425-430:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 50 'run'. lines 433-438:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 51 'run'. lines 441-446:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 52 'run'. lines 449-454:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 53 'run'. lines 457-462:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 54 'run'. lines 465-470:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 55 'run'. lines 473-478:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 56 'run'. lines 481-486:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 57 'publish'. lines 489-497:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
+
+task 58 'publish'. lines 499-507:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
+
+task 59 'publish'. lines 509-521:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 4)],
+}
+
+task 60 'run'. lines 522-527:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 61 'run'. lines 530-535:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 62 'run'. lines 538-543:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 63 'run'. lines 546-551:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 64 'run'. lines 554-559:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 65 'run'. lines 562-567:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 66 'run'. lines 570-575:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 67 'run'. lines 578-583:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 68 'run'. lines 586-591:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 69 'run'. lines 594-599:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 70 'run'. lines 602-607:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 71 'run'. lines 610-615:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 72 'publish'. lines 618-626:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
+
+task 73 'publish'. lines 628-636:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
+
+task 74 'publish'. lines 638-650:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 4)],
+}
+
+task 75 'run'. lines 651-656:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 76 'run'. lines 659-664:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 77 'run'. lines 667-672:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 78 'run'. lines 675-680:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 79 'run'. lines 683-688:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 80 'run'. lines 691-696:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 81 'run'. lines 699-704:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 82 'run'. lines 707-712:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 83 'run'. lines 715-720:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 84 'run'. lines 723-728:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 85 'run'. lines 731-736:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 86 'run'. lines 739-744:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 87 'publish'. lines 747-755:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
+
+task 88 'publish'. lines 757-765:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
+
+task 89 'publish'. lines 767-779:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 4)],
+}
+
+task 90 'run'. lines 780-785:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 91 'run'. lines 788-793:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 92 'run'. lines 796-801:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 93 'run'. lines 804-809:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 94 'run'. lines 812-817:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 95 'run'. lines 820-825:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 96 'run'. lines 828-833:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 97 'run'. lines 836-841:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 98 'run'. lines 844-849:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 99 'run'. lines 852-857:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 100 'run'. lines 860-865:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 101 'run'. lines 868-873:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 102 'publish'. lines 876-884:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
+
+task 103 'publish'. lines 886-894:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
+
+task 104 'publish'. lines 896-908:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 4)],
+}
+
+task 105 'run'. lines 909-914:
+Error: Script execution failed with VMError: {
+    major_status: EQUALITY_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 106 'run'. lines 917-922:
+Error: Script execution failed with VMError: {
+    major_status: EQUALITY_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 107 'run'. lines 925-930:
+Error: Script execution failed with VMError: {
+    major_status: EQUALITY_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 108 'run'. lines 933-938:
+Error: Script execution failed with VMError: {
+    major_status: EQUALITY_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 109 'run'. lines 941-946:
+Error: Script execution failed with VMError: {
+    major_status: EQUALITY_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 110 'run'. lines 949-954:
+Error: Script execution failed with VMError: {
+    major_status: EQUALITY_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 111 'run'. lines 957-962:
+Error: Script execution failed with VMError: {
+    major_status: EQUALITY_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 112 'run'. lines 965-970:
+Error: Script execution failed with VMError: {
+    major_status: EQUALITY_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 113 'run'. lines 973-978:
+Error: Script execution failed with VMError: {
+    major_status: EQUALITY_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 114 'run'. lines 981-986:
+Error: Script execution failed with VMError: {
+    major_status: EQUALITY_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 115 'publish'. lines 989-997:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: EQUALITY_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
+
+task 116 'publish'. lines 999-1010:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: EQUALITY_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
+
+task 117 'run'. lines 1011-1016:
+Error: Script execution failed with VMError: {
+    major_status: EQUALITY_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 118 'run'. lines 1019-1024:
+Error: Script execution failed with VMError: {
+    major_status: EQUALITY_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 119 'run'. lines 1027-1032:
+Error: Script execution failed with VMError: {
+    major_status: EQUALITY_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 120 'run'. lines 1035-1040:
+Error: Script execution failed with VMError: {
+    major_status: EQUALITY_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 121 'run'. lines 1043-1048:
+Error: Script execution failed with VMError: {
+    major_status: EQUALITY_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 122 'run'. lines 1051-1056:
+Error: Script execution failed with VMError: {
+    major_status: EQUALITY_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 123 'run'. lines 1059-1064:
+Error: Script execution failed with VMError: {
+    major_status: EQUALITY_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 124 'run'. lines 1067-1072:
+Error: Script execution failed with VMError: {
+    major_status: EQUALITY_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 125 'run'. lines 1075-1080:
+Error: Script execution failed with VMError: {
+    major_status: EQUALITY_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 126 'run'. lines 1083-1088:
+Error: Script execution failed with VMError: {
+    major_status: EQUALITY_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 127 'publish'. lines 1091-1099:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: EQUALITY_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
+
+task 128 'publish'. lines 1101-1113:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: EQUALITY_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
+
+task 129 'run'. lines 1114-1119:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 130 'run'. lines 1122-1127:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 131 'run'. lines 1130-1135:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 132 'run'. lines 1138-1143:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 133 'run'. lines 1146-1151:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 134 'run'. lines 1154-1159:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 135 'run'. lines 1162-1167:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 136 'run'. lines 1170-1175:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 137 'run'. lines 1178-1183:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 138 'run'. lines 1186-1194:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 139 'run'. lines 1195-1200:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 140 'run'. lines 1203-1208:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 141 'run'. lines 1211-1216:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 142 'run'. lines 1219-1224:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 143 'run'. lines 1227-1232:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 144 'run'. lines 1235-1240:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 145 'run'. lines 1243-1248:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 146 'run'. lines 1251-1256:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 147 'run'. lines 1259-1264:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 148 'run'. lines 1267-1275:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 149 'run'. lines 1276-1281:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 150 'run'. lines 1284-1289:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 151 'run'. lines 1292-1297:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 152 'run'. lines 1300-1305:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 153 'run'. lines 1308-1313:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 154 'run'. lines 1316-1321:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 155 'run'. lines 1324-1329:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 156 'run'. lines 1332-1337:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 157 'run'. lines 1340-1345:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 158 'run'. lines 1348-1356:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 159 'run'. lines 1357-1362:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 160 'run'. lines 1365-1370:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 161 'run'. lines 1373-1378:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 162 'run'. lines 1381-1386:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 163 'run'. lines 1389-1394:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 164 'run'. lines 1397-1402:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 165 'run'. lines 1405-1410:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 166 'run'. lines 1413-1418:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 167 'run'. lines 1421-1426:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 168 'run'. lines 1429-1437:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 169 'run'. lines 1438-1443:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 170 'run'. lines 1446-1451:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 171 'run'. lines 1454-1459:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 172 'run'. lines 1462-1467:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 173 'run'. lines 1470-1475:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 174 'run'. lines 1478-1483:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 175 'run'. lines 1486-1491:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 176 'run'. lines 1494-1499:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 177 'publish'. lines 1502-1510:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
+
+task 178 'publish'. lines 1512-1520:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
+
+task 179 'publish'. lines 1522-1534:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 4)],
+}
+
+task 180 'run'. lines 1535-1540:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 181 'run'. lines 1543-1548:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 182 'run'. lines 1551-1556:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 183 'run'. lines 1559-1564:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 184 'run'. lines 1567-1572:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 185 'run'. lines 1575-1580:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 186 'run'. lines 1583-1588:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 187 'run'. lines 1591-1596:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 188 'publish'. lines 1599-1607:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
+
+task 189 'publish'. lines 1609-1617:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
+
+task 190 'publish'. lines 1619-1627:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 4)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/integers_valid.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/integers_valid.v2_exp
new file mode 100644
index 0000000000000..2301000e50ae4
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/integers_valid.v2_exp
@@ -0,0 +1 @@
+processed 6 tasks
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/invalid_field_write.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/invalid_field_write.v2_exp
new file mode 100644
index 0000000000000..9927b5107daae
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/invalid_field_write.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-18:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::Test'. Got VMError: {
+    major_status: WRITEREF_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::Test,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 5)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/invalid_resource_write.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/invalid_resource_write.v2_exp
new file mode 100644
index 0000000000000..b1ff69815060e
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/invalid_resource_write.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-14:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::RTest'. Got VMError: {
+    major_status: WRITEREF_WITHOUT_DROP_ABILITY,
+    sub_status: None,
+    location: 0x42::RTest,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 5)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/mut_borrow_from_imm_ref.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/mut_borrow_from_imm_ref.v2_exp
new file mode 100644
index 0000000000000..5e1d9de7a69fb
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/mut_borrow_from_imm_ref.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-25:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::Token'. Got VMError: {
+    major_status: BORROWFIELD_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::Token,
+    indices: [(FunctionDefinition, 2)],
+    offsets: [(FunctionDefinitionIndex(2), 1)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/mut_call_from_get_resource.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/mut_call_from_get_resource.v2_exp
new file mode 100644
index 0000000000000..5d92c423f3fd8
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/mut_call_from_get_resource.v2_exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/mut_call_with_imm_ref.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/mut_call_with_imm_ref.v2_exp
new file mode 100644
index 0000000000000..db9153197af6e
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/mut_call_with_imm_ref.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-33:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::Token'. Got VMError: {
+    major_status: CALL_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::Token,
+    indices: [(FunctionDefinition, 2)],
+    offsets: [(FunctionDefinitionIndex(2), 4)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/phantom_params/bytecode_ops_abilities_bad.exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/phantom_params/bytecode_ops_abilities_bad.exp
index 9a4d7deeba221..d3090ae863756 100644
--- a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/phantom_params/bytecode_ops_abilities_bad.exp
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/phantom_params/bytecode_ops_abilities_bad.exp
@@ -41,7 +41,7 @@ Error: Unable to publish module '00000000000000000000000000000000000000000000000
     major_status: CONSTRAINT_NOT_SATISFIED,
     sub_status: None,
     location: 0x1::M6,
-    indices: [(Signature, 2), (FunctionDefinition, 0)],
+    indices: [(Signature, 2), (StructDefInstantiation, 0), (FunctionDefinition, 0)],
     offsets: [],
 }
 
@@ -50,7 +50,7 @@ Error: Unable to publish module '00000000000000000000000000000000000000000000000
     major_status: CONSTRAINT_NOT_SATISFIED,
     sub_status: None,
     location: 0x1::M7,
-    indices: [(Signature, 2), (FunctionDefinition, 0)],
+    indices: [(Signature, 2), (StructDefInstantiation, 0), (FunctionDefinition, 0)],
     offsets: [],
 }
 
@@ -59,7 +59,7 @@ Error: Unable to publish module '00000000000000000000000000000000000000000000000
     major_status: CONSTRAINT_NOT_SATISFIED,
     sub_status: None,
     location: 0x1::M8,
-    indices: [(Signature, 2), (FunctionDefinition, 0)],
+    indices: [(Signature, 2), (StructDefInstantiation, 0), (FunctionDefinition, 0)],
     offsets: [],
 }
 
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/phantom_params/bytecode_ops_abilities_bad.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/phantom_params/bytecode_ops_abilities_bad.v2_exp
new file mode 100644
index 0000000000000..d3090ae863756
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/phantom_params/bytecode_ops_abilities_bad.v2_exp
@@ -0,0 +1,73 @@
+processed 9 tasks
+
+task 1 'publish'. lines 10-22:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M2'. Got VMError: {
+    major_status: WRITEREF_WITHOUT_DROP_ABILITY,
+    sub_status: None,
+    location: 0x1::M2,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
+
+task 2 'publish'. lines 24-36:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M3'. Got VMError: {
+    major_status: POP_WITHOUT_DROP_ABILITY,
+    sub_status: None,
+    location: 0x1::M3,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 3 'publish'. lines 38-49:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M4'. Got VMError: {
+    major_status: UNSAFE_RET_UNUSED_VALUES_WITHOUT_DROP,
+    sub_status: None,
+    location: 0x1::M4,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
+
+task 4 'publish'. lines 51-61:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M5'. Got VMError: {
+    major_status: COPYLOC_WITHOUT_COPY_ABILITY,
+    sub_status: None,
+    location: 0x1::M5,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
+
+task 5 'publish'. lines 63-76:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M6'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x1::M6,
+    indices: [(Signature, 2), (StructDefInstantiation, 0), (FunctionDefinition, 0)],
+    offsets: [],
+}
+
+task 6 'publish'. lines 78-89:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M7'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x1::M7,
+    indices: [(Signature, 2), (StructDefInstantiation, 0), (FunctionDefinition, 0)],
+    offsets: [],
+}
+
+task 7 'publish'. lines 91-102:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M8'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x1::M8,
+    indices: [(Signature, 2), (StructDefInstantiation, 0), (FunctionDefinition, 0)],
+    offsets: [],
+}
+
+task 8 'publish'. lines 104-115:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M9'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x1::M9,
+    indices: [(Signature, 1)],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/phantom_params/bytecode_ops_abilities_ok.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/phantom_params/bytecode_ops_abilities_ok.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/phantom_params/bytecode_ops_abilities_ok.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/phantom_params/constraints_abilities_bad.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/phantom_params/constraints_abilities_bad.v2_exp
new file mode 100644
index 0000000000000..3804591814561
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/phantom_params/constraints_abilities_bad.v2_exp
@@ -0,0 +1,37 @@
+processed 6 tasks
+
+task 1 'publish'. lines 7-15:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M2'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x1::M2,
+    indices: [(StructDefinition, 1)],
+    offsets: [],
+}
+
+task 2 'publish'. lines 17-34:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M3'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x1::M3,
+    indices: [(StructDefinition, 5)],
+    offsets: [],
+}
+
+task 3 'publish'. lines 36-46:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M4'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x1::M4,
+    indices: [(Signature, 1)],
+    offsets: [],
+}
+
+task 5 'publish'. lines 60-75:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M5'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x1::M5,
+    indices: [(Signature, 1)],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/phantom_params/constraints_abilities_ok.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/phantom_params/constraints_abilities_ok.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/phantom_params/constraints_abilities_ok.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/phantom_params/fields_abilities_bad.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/phantom_params/fields_abilities_bad.v2_exp
new file mode 100644
index 0000000000000..43e65b417613a
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/phantom_params/fields_abilities_bad.v2_exp
@@ -0,0 +1,37 @@
+processed 5 tasks
+
+task 1 'publish'. lines 16-21:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M2'. Got VMError: {
+    major_status: FIELD_MISSING_TYPE_ABILITY,
+    sub_status: None,
+    location: 0x1::M2,
+    indices: [(StructDefinition, 0)],
+    offsets: [],
+}
+
+task 2 'publish'. lines 23-28:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M3'. Got VMError: {
+    major_status: FIELD_MISSING_TYPE_ABILITY,
+    sub_status: None,
+    location: 0x1::M3,
+    indices: [(StructDefinition, 0)],
+    offsets: [],
+}
+
+task 3 'publish'. lines 30-35:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M4'. Got VMError: {
+    major_status: FIELD_MISSING_TYPE_ABILITY,
+    sub_status: None,
+    location: 0x1::M4,
+    indices: [(StructDefinition, 0)],
+    offsets: [],
+}
+
+task 4 'publish'. lines 37-42:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M5'. Got VMError: {
+    major_status: FIELD_MISSING_TYPE_ABILITY,
+    sub_status: None,
+    location: 0x1::M5,
+    indices: [(StructDefinition, 0)],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/phantom_params/fields_abilities_ok.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/phantom_params/fields_abilities_ok.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/phantom_params/fields_abilities_ok.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/phantom_params/struct_definition_bad.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/phantom_params/struct_definition_bad.v2_exp
new file mode 100644
index 0000000000000..600468a8b3573
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/phantom_params/struct_definition_bad.v2_exp
@@ -0,0 +1,55 @@
+processed 6 tasks
+
+task 0 'publish'. lines 1-11:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M1'. Got VMError: {
+    major_status: INVALID_PHANTOM_TYPE_PARAM_POSITION,
+    sub_status: None,
+    location: 0x1::M1,
+    indices: [(StructDefinition, 0)],
+    offsets: [],
+}
+
+task 1 'publish'. lines 13-19:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M2'. Got VMError: {
+    major_status: INVALID_PHANTOM_TYPE_PARAM_POSITION,
+    sub_status: None,
+    location: 0x1::M2,
+    indices: [(StructDefinition, 0)],
+    offsets: [],
+}
+
+task 2 'publish'. lines 21-28:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M3'. Got VMError: {
+    major_status: INVALID_PHANTOM_TYPE_PARAM_POSITION,
+    sub_status: None,
+    location: 0x1::M3,
+    indices: [(StructDefinition, 1)],
+    offsets: [],
+}
+
+task 3 'publish'. lines 30-39:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M4'. Got VMError: {
+    major_status: INVALID_PHANTOM_TYPE_PARAM_POSITION,
+    sub_status: None,
+    location: 0x1::M4,
+    indices: [(StructDefinition, 2)],
+    offsets: [],
+}
+
+task 4 'publish'. lines 41-47:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M5'. Got VMError: {
+    major_status: INVALID_PHANTOM_TYPE_PARAM_POSITION,
+    sub_status: None,
+    location: 0x1::M5,
+    indices: [(StructDefinition, 0)],
+    offsets: [],
+}
+
+task 5 'publish'. lines 49-56:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M6'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x1::M6,
+    indices: [(StructDefinition, 1)],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/phantom_params/struct_definition_ok.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/phantom_params/struct_definition_ok.v2_exp
new file mode 100644
index 0000000000000..fc5a4436b29d4
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/phantom_params/struct_definition_ok.v2_exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/procedure_args_subtype.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/procedure_args_subtype.v2_exp
new file mode 100644
index 0000000000000..47e3c11d774bf
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/procedure_args_subtype.v2_exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 11-22:
+Error: Script execution failed with VMError: {
+    major_status: CALL_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/procedure_return_invalid_subtype.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/procedure_return_invalid_subtype.v2_exp
new file mode 100644
index 0000000000000..b1a59d8fc5fdb
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/procedure_return_invalid_subtype.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-9:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::Test'. Got VMError: {
+    major_status: RET_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::Test,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/procedure_return_invalid_type.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/procedure_return_invalid_type.v2_exp
new file mode 100644
index 0000000000000..b1a59d8fc5fdb
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/procedure_return_invalid_type.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-9:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::Test'. Got VMError: {
+    major_status: RET_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::Test,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/ref_type_param.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/ref_type_param.v2_exp
new file mode 100644
index 0000000000000..3cd6db23021fb
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/ref_type_param.v2_exp
@@ -0,0 +1,37 @@
+processed 4 tasks
+
+task 0 'publish'. lines 1-10:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M1'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x42::M1,
+    indices: [(FunctionHandle, 0)],
+    offsets: [],
+}
+
+task 1 'publish'. lines 12-21:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M2'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x42::M2,
+    indices: [(FunctionHandle, 0)],
+    offsets: [],
+}
+
+task 2 'publish'. lines 23-32:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M3'. Got VMError: {
+    major_status: NUMBER_OF_TYPE_ARGUMENTS_MISMATCH,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
+
+task 3 'publish'. lines 34-44:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M4'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x42::M4,
+    indices: [(FunctionHandle, 0)],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/ref_type_param_exploits.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/ref_type_param_exploits.v2_exp
new file mode 100644
index 0000000000000..daecd5cf37fe9
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/ref_type_param_exploits.v2_exp
@@ -0,0 +1,46 @@
+processed 5 tasks
+
+task 0 'publish'. lines 1-11:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M1'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x42::M1,
+    indices: [(FunctionHandle, 0)],
+    offsets: [],
+}
+
+task 1 'publish'. lines 13-23:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M2'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x42::M2,
+    indices: [(FunctionHandle, 0)],
+    offsets: [],
+}
+
+task 2 'publish'. lines 25-36:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M3'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x42::M3,
+    indices: [(FunctionHandle, 0)],
+    offsets: [],
+}
+
+task 3 'publish'. lines 38-54:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M4'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x42::M4,
+    indices: [(FunctionHandle, 0)],
+    offsets: [],
+}
+
+task 4 'publish'. lines 56-72:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M5'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x42::M5,
+    indices: [(Signature, 3)],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/release.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/release.v2_exp
new file mode 100644
index 0000000000000..f3a7de94e648d
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/release.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-10:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: NEGATIVE_STACK_SIZE_WITHIN_BLOCK,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/resource_instantiate_bad_type.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/resource_instantiate_bad_type.v2_exp
new file mode 100644
index 0000000000000..f8cfe0681b77f
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/resource_instantiate_bad_type.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-14:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::Test'. Got VMError: {
+    major_status: PACK_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::Test,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/return_type_mismatch_and_unused_resource.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/return_type_mismatch_and_unused_resource.v2_exp
new file mode 100644
index 0000000000000..63337530dac68
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/return_type_mismatch_and_unused_resource.v2_exp
@@ -0,0 +1,37 @@
+processed 4 tasks
+
+task 0 'publish'. lines 1-13:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: RET_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 4)],
+}
+
+task 1 'publish'. lines 15-27:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M2'. Got VMError: {
+    major_status: RET_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x1::M2,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 5)],
+}
+
+task 2 'publish'. lines 29-40:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: UNSAFE_RET_UNUSED_VALUES_WITHOUT_DROP,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 4)],
+}
+
+task 3 'publish'. lines 42-53:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M2'. Got VMError: {
+    major_status: UNSAFE_RET_LOCAL_OR_RESOURCE_STILL_BORROWED,
+    sub_status: None,
+    location: 0x1::M2,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 5)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/signer_copy_loc.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/signer_copy_loc.v2_exp
new file mode 100644
index 0000000000000..c1dde036e20c0
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/signer_copy_loc.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-8:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: COPYLOC_WITHOUT_COPY_ABILITY,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/signer_copy_loc_transitive.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/signer_copy_loc_transitive.v2_exp
new file mode 100644
index 0000000000000..0325d662d1ba6
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/signer_copy_loc_transitive.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-11:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: COPYLOC_WITHOUT_COPY_ABILITY,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/signer_does_not_have_store.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/signer_does_not_have_store.v2_exp
new file mode 100644
index 0000000000000..43d375719360a
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/signer_does_not_have_store.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-13:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(StructDefInstantiation, 0), (FunctionDefinition, 0)],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/signer_equality.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/signer_equality.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/signer_equality.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/signer_move_to_mutable_signer.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/signer_move_to_mutable_signer.v2_exp
new file mode 100644
index 0000000000000..75588e9f172a3
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/signer_move_to_mutable_signer.v2_exp
@@ -0,0 +1,19 @@
+processed 2 tasks
+
+task 0 'publish'. lines 1-12:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: MOVETO_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
+
+task 1 'publish'. lines 14-23:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::N'. Got VMError: {
+    major_status: MOVETO_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::N,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/signer_move_to_non_resource.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/signer_move_to_non_resource.v2_exp
new file mode 100644
index 0000000000000..3018ac82175a0
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/signer_move_to_non_resource.v2_exp
@@ -0,0 +1,19 @@
+processed 2 tasks
+
+task 0 'publish'. lines 1-12:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: MOVETO_WITHOUT_KEY_ABILITY,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
+
+task 1 'publish'. lines 14-23:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::N'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x42::N,
+    indices: [(StructDefInstantiation, 0), (FunctionDefinition, 0)],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/signer_move_to_non_signer.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/signer_move_to_non_signer.v2_exp
new file mode 100644
index 0000000000000..75588e9f172a3
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/signer_move_to_non_signer.v2_exp
@@ -0,0 +1,19 @@
+processed 2 tasks
+
+task 0 'publish'. lines 1-12:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: MOVETO_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
+
+task 1 'publish'. lines 14-23:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::N'. Got VMError: {
+    major_status: MOVETO_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::N,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/signer_move_to_non_struct.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/signer_move_to_non_struct.v2_exp
new file mode 100644
index 0000000000000..bb82c8d342b0d
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/signer_move_to_non_struct.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-10:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::N'. Got VMError: {
+    major_status: MOVETO_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::N,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/signer_move_to_reference_to_args_flipped.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/signer_move_to_reference_to_args_flipped.v2_exp
new file mode 100644
index 0000000000000..75588e9f172a3
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/signer_move_to_reference_to_args_flipped.v2_exp
@@ -0,0 +1,19 @@
+processed 2 tasks
+
+task 0 'publish'. lines 1-12:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: MOVETO_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
+
+task 1 'publish'. lines 14-23:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::N'. Got VMError: {
+    major_status: MOVETO_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::N,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/signer_move_to_reference_to_resource.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/signer_move_to_reference_to_resource.v2_exp
new file mode 100644
index 0000000000000..53af9e0e2e395
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/signer_move_to_reference_to_resource.v2_exp
@@ -0,0 +1,19 @@
+processed 2 tasks
+
+task 0 'publish'. lines 1-12:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: MOVETO_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 1 'publish'. lines 14-23:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::N'. Got VMError: {
+    major_status: MOVETO_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::N,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/signer_move_to_reference_to_wrong_resource.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/signer_move_to_reference_to_wrong_resource.v2_exp
new file mode 100644
index 0000000000000..42149f180d999
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/signer_move_to_reference_to_wrong_resource.v2_exp
@@ -0,0 +1,19 @@
+processed 2 tasks
+
+task 0 'publish'. lines 1-13:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: MOVETO_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
+
+task 1 'publish'. lines 15-25:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::N'. Got VMError: {
+    major_status: MOVETO_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::N,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/signer_move_to_valid.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/signer_move_to_valid.v2_exp
new file mode 100644
index 0000000000000..5d92c423f3fd8
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/signer_move_to_valid.v2_exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/signer_read_ref.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/signer_read_ref.v2_exp
new file mode 100644
index 0000000000000..8bad387623f99
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/signer_read_ref.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-8:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: READREF_WITHOUT_COPY_ABILITY,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/signer_read_ref_transitive.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/signer_read_ref_transitive.v2_exp
new file mode 100644
index 0000000000000..91e9dd2f2bb8e
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/signer_read_ref_transitive.v2_exp
@@ -0,0 +1,19 @@
+processed 2 tasks
+
+task 0 'publish'. lines 1-11:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: READREF_WITHOUT_COPY_ABILITY,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 4)],
+}
+
+task 1 'publish'. lines 13-23:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: READREF_WITHOUT_COPY_ABILITY,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 5)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/signer_st_loc.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/signer_st_loc.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/signer_st_loc.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/signer_transitive.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/signer_transitive.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/signer_transitive.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/signer_write_ref.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/signer_write_ref.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/signer_write_ref.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/struct_kind_inference.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/struct_kind_inference.v2_exp
new file mode 100644
index 0000000000000..65b2121aeca2c
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/struct_kind_inference.v2_exp
@@ -0,0 +1,46 @@
+processed 5 tasks
+
+task 0 'publish'. lines 1-12:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M1'. Got VMError: {
+    major_status: UNSAFE_RET_UNUSED_VALUES_WITHOUT_DROP,
+    sub_status: None,
+    location: 0x1::M1,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
+
+task 1 'publish'. lines 14-25:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M2'. Got VMError: {
+    major_status: STLOC_UNSAFE_TO_DESTROY_ERROR,
+    sub_status: None,
+    location: 0x1::M2,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 2 'publish'. lines 27-37:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M3'. Got VMError: {
+    major_status: READREF_WITHOUT_COPY_ABILITY,
+    sub_status: None,
+    location: 0x1::M3,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 3 'publish'. lines 39-50:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M4'. Got VMError: {
+    major_status: WRITEREF_WITHOUT_DROP_ABILITY,
+    sub_status: None,
+    location: 0x1::M4,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 4 'publish'. lines 52-62:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M5'. Got VMError: {
+    major_status: COPYLOC_WITHOUT_COPY_ABILITY,
+    sub_status: None,
+    location: 0x1::M5,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/type_error_after_branch.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/type_error_after_branch.v2_exp
new file mode 100644
index 0000000000000..e46998e2583df
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/type_error_after_branch.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-15:
+Error: Script execution failed with VMError: {
+    major_status: STLOC_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 8)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/unpack_resource.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/unpack_resource.v2_exp
new file mode 100644
index 0000000000000..5d92c423f3fd8
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/unpack_resource.v2_exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/unpack_wrong_type.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/unpack_wrong_type.v2_exp
new file mode 100644
index 0000000000000..776bf60546e18
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/unpack_wrong_type.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-19:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::Test'. Got VMError: {
+    major_status: UNPACK_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x1::Test,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 1)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/unrestricted_instantiate.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/unrestricted_instantiate.v2_exp
new file mode 100644
index 0000000000000..5d92c423f3fd8
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/unrestricted_instantiate.v2_exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/unrestricted_instantiate_bad_type.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/unrestricted_instantiate_bad_type.v2_exp
new file mode 100644
index 0000000000000..6603cc3260298
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/unrestricted_instantiate_bad_type.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-10:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::Test'. Got VMError: {
+    major_status: PACK_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::Test,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/unused_resource_holder.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/unused_resource_holder.v2_exp
new file mode 100644
index 0000000000000..4ea140c610e47
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/unused_resource_holder.v2_exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 18-31:
+Error: Script execution failed with VMError: {
+    major_status: UNSAFE_RET_UNUSED_VALUES_WITHOUT_DROP,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 5)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/vector_ops_type_mismatch.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/vector_ops_type_mismatch.v2_exp
new file mode 100644
index 0000000000000..375939935ea61
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/vector_ops_type_mismatch.v2_exp
@@ -0,0 +1,73 @@
+processed 8 tasks
+
+task 0 'run'. lines 1-7:
+Error: Script execution failed with VMError: {
+    major_status: STLOC_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 1 'run'. lines 9-18:
+Error: Script execution failed with VMError: {
+    major_status: STLOC_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
+
+task 2 'run'. lines 20-31:
+Error: Script execution failed with VMError: {
+    major_status: STLOC_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 6)],
+}
+
+task 3 'run'. lines 33-45:
+Error: Script execution failed with VMError: {
+    major_status: TYPE_MISMATCH,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 8)],
+}
+
+task 4 'run'. lines 47-59:
+Error: Script execution failed with VMError: {
+    major_status: TYPE_MISMATCH,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 6)],
+}
+
+task 5 'run'. lines 61-77:
+Error: Script execution failed with VMError: {
+    major_status: STLOC_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 6 'run'. lines 78-86:
+Error: Script execution failed with VMError: {
+    major_status: TYPE_MISMATCH,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 7 'run'. lines 87-96:
+Error: Script execution failed with VMError: {
+    major_status: TYPE_MISMATCH,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 5)],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/vector_type_param.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/vector_type_param.v2_exp
new file mode 100644
index 0000000000000..31b017ab448fb
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/vector_type_param.v2_exp
@@ -0,0 +1,28 @@
+processed 3 tasks
+
+task 0 'publish'. lines 1-10:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M1'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x42::M1,
+    indices: [(FunctionHandle, 0)],
+    offsets: [],
+}
+
+task 1 'publish'. lines 12-21:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M2'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x42::M2,
+    indices: [(FunctionHandle, 0)],
+    offsets: [],
+}
+
+task 2 'publish'. lines 23-32:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M3'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x42::M3,
+    indices: [(FunctionHandle, 0)],
+    offsets: [],
+}
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/vector_type_param_exploits.v2_exp b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/vector_type_param_exploits.v2_exp
new file mode 100644
index 0000000000000..14cdd9a3eb6ff
--- /dev/null
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/tests/type_safety/vector_type_param_exploits.v2_exp
@@ -0,0 +1,37 @@
+processed 4 tasks
+
+task 0 'publish'. lines 1-11:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M1'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x42::M1,
+    indices: [(FunctionHandle, 0)],
+    offsets: [],
+}
+
+task 1 'publish'. lines 13-22:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M2'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x42::M2,
+    indices: [(FunctionHandle, 0)],
+    offsets: [],
+}
+
+task 2 'publish'. lines 24-40:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M3'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x42::M3,
+    indices: [(FunctionHandle, 0)],
+    offsets: [],
+}
+
+task 3 'publish'. lines 42-58:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M4'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x42::M4,
+    indices: [(Signature, 2)],
+    offsets: [],
+}
diff --git a/third_party/move/move-command-line-common/src/address.rs b/third_party/move/move-command-line-common/src/address.rs
index 018b804525f60..2121f16addbbf 100644
--- a/third_party/move/move-command-line-common/src/address.rs
+++ b/third_party/move/move-command-line-common/src/address.rs
@@ -44,6 +44,11 @@ impl NumericalAddress {
         bytes: AccountAddress::ONE,
         format: NumberFormat::Hex,
     };
+    // bytes used for scripts, which don't have an address
+    pub const MAX_ADDRESS: Self = NumericalAddress {
+        bytes: AccountAddress::MAX_ADDRESS,
+        format: NumberFormat::Hex,
+    };
 
     pub const fn new(bytes: [u8; AccountAddress::LENGTH], format: NumberFormat) -> Self {
         Self {
diff --git a/third_party/move/move-command-line-common/src/testing.rs b/third_party/move/move-command-line-common/src/testing.rs
index 68aa6734dc674..612321d12059d 100644
--- a/third_party/move/move-command-line-common/src/testing.rs
+++ b/third_party/move/move-command-line-common/src/testing.rs
@@ -2,7 +2,7 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::env::read_bool_env_var;
+use crate::env::{get_move_compiler_v2_from_env, read_bool_env_var};
 
 /// Extension for raw output files
 pub const OUT_EXT: &str = "out";
@@ -11,6 +11,14 @@ pub const EXP_EXT: &str = "exp";
 /// Extension for expected output files compiled by v2
 pub const EXP_EXT_V2: &str = "v2_exp";
 
+pub fn get_compiler_exp_extension() -> &'static str {
+    if get_move_compiler_v2_from_env() {
+        EXP_EXT_V2
+    } else {
+        EXP_EXT
+    }
+}
+
 /// If any of these env vars is set, the test harness should overwrite
 /// the existing .exp files with the output instead of checking
 /// them against the output.
diff --git a/third_party/move/move-compiler-v2/Cargo.toml b/third_party/move/move-compiler-v2/Cargo.toml
index 9b133f283b8d4..0fe76a5c12d52 100644
--- a/third_party/move/move-compiler-v2/Cargo.toml
+++ b/third_party/move/move-compiler-v2/Cargo.toml
@@ -15,8 +15,8 @@ anyhow = { workspace = true }
 bcs = { workspace = true }
 move-binary-format = { path = "../move-binary-format" }
 move-bytecode-source-map = { path = "../move-ir-compiler/move-bytecode-source-map" }
+move-bytecode-verifier = { path = "../move-bytecode-verifier" }
 move-command-line-common = { path = "../move-command-line-common" }
-#move-package = { path = "../tools/move-package" }
 move-compiler = { path = "../move-compiler" }
 move-core-types = { path = "../move-core/types" }
 move-disassembler = { path = "../tools/move-disassembler" }
diff --git a/third_party/move/move-compiler-v2/src/ast_simplifier.rs b/third_party/move/move-compiler-v2/src/ast_simplifier.rs
index 968856cfede05..f60012a917544 100644
--- a/third_party/move/move-compiler-v2/src/ast_simplifier.rs
+++ b/third_party/move/move-compiler-v2/src/ast_simplifier.rs
@@ -407,6 +407,28 @@ fn find_possibly_modified_vars(
                     _ => {},
                 };
             },
+            Match(node_id, _, arms) => {
+                match pos {
+                    VisitorPosition::Pre => {
+                        modifying_stack.push(modifying);
+                        modifying = false;
+                    }
+                    VisitorPosition::BeforeMatchBody(idx) => {
+                        let arm = &arms[idx];
+                        visiting_binding.enter_scope();
+                        for (_, sym) in arm.pattern.vars() {
+                            visiting_binding.insert(sym, *node_id);
+                        }
+                    }
+                    VisitorPosition::AfterMatchBody(_) => {
+                        visiting_binding.exit_scope();
+                    }
+                    VisitorPosition::Post => {
+                        modifying = modifying_stack.pop().expect("unbalanced visit 8");
+                    }
+                    _ => {}
+                }
+            }
             IfElse(..) | Sequence(..) => {
                 match pos {
                     VisitorPosition::Pre => {
@@ -887,7 +909,7 @@ impl<'env> ExpRewriterFunctions for SimplifierRewriter<'env> {
             trace!(
                 "Starting rewrite_block(id={}, pat={}, opt_binding={}, body={}, pat_type={}, exp_type={}, {})",
                 id.as_usize(),
-                pat.to_string(self.env(), &type_display_context),
+                pat.to_string(self.func_env),
                 exp.display_verbose(self.env()),
                 body.display_verbose(self.env()),
                 pat_type.display(&type_display_context),
@@ -898,7 +920,7 @@ impl<'env> ExpRewriterFunctions for SimplifierRewriter<'env> {
             trace!(
                 "Starting rewrite_block(id={}, pat={}, opt_binding={}, body={})",
                 id.as_usize(),
-                pat.to_string(self.env(), &TypeDisplayContext::new(self.env())),
+                pat.to_string(self.func_env),
                 "None",
                 body.display_verbose(self.env())
             );
diff --git a/third_party/move/move-compiler-v2/src/bytecode_generator.rs b/third_party/move/move-compiler-v2/src/bytecode_generator.rs
index 0b83dfe74af54..dc810d8eb6f17 100644
--- a/third_party/move/move-compiler-v2/src/bytecode_generator.rs
+++ b/third_party/move/move-compiler-v2/src/bytecode_generator.rs
@@ -4,8 +4,10 @@
 
 use codespan_reporting::diagnostic::Severity;
 use ethnum::U256;
+use itertools::Itertools;
+use move_binary_format::file_format::Ability;
 use move_model::{
-    ast::{Exp, ExpData, Operation, Pattern, SpecBlockTarget, TempIndex, Value},
+    ast::{Exp, ExpData, MatchArm, Operation, Pattern, SpecBlockTarget, TempIndex, Value},
     exp_rewriter::{ExpRewriter, ExpRewriterFunctions, RewriteTarget},
     model::{
         FieldId, FunId, FunctionEnv, GlobalEnv, Loc, NodeId, Parameter, QualifiedId,
@@ -13,6 +15,7 @@ use move_model::{
     },
     symbol::Symbol,
     ty::{PrimitiveType, ReferenceKind, Type},
+    well_known,
 };
 use move_stackless_bytecode::{
     function_target::FunctionData,
@@ -22,7 +25,10 @@ use move_stackless_bytecode::{
     stackless_bytecode_generator::BytecodeGeneratorContext,
 };
 use num::ToPrimitive;
-use std::collections::{BTreeMap, BTreeSet};
+use std::{
+    collections::{BTreeMap, BTreeSet},
+    fmt,
+};
 
 // ======================================================================================
 // Entry
@@ -427,6 +433,7 @@ impl<'env> Generator<'env> {
                 self.gen(targets, else_exp);
                 self.emit_with(else_id, |attr| Bytecode::Label(attr, end_label));
             },
+            ExpData::Match(id, exp, arms) => self.gen_match(targets, *id, exp, arms),
             ExpData::Loop(id, body) => {
                 let continue_label = self.new_label(*id);
                 let break_label = self.new_label(*id);
@@ -596,9 +603,14 @@ impl<'env> Generator<'env> {
                     }
                 }
             },
-            Operation::Pack(mid, sid) => {
+            Operation::Pack(mid, sid, variant) => {
                 let inst = self.env().get_node_instantiation(id);
-                self.gen_op_call(targets, id, BytecodeOperation::Pack(*mid, *sid, inst), args)
+                let oper = if let Some(variant) = variant {
+                    BytecodeOperation::PackVariant(*mid, *sid, *variant, inst)
+                } else {
+                    BytecodeOperation::Pack(*mid, *sid, inst)
+                };
+                self.gen_op_call(targets, id, oper, args)
             },
             Operation::Select(mid, sid, fid) => {
                 let target = self.require_unary_target(id, targets);
@@ -614,7 +626,28 @@ impl<'env> Generator<'env> {
                         target,
                         id,
                         mid.qualified_inst(*sid, inst.to_vec()),
-                        *fid,
+                        &[*fid],
+                        &arg,
+                    )
+                } else {
+                    self.internal_error(id, "inconsistent type in select expression")
+                }
+            },
+            Operation::SelectVariants(mid, sid, fids) => {
+                let target = self.require_unary_target(id, targets);
+                let arg = self.require_unary_arg(id, args);
+                // Get the instantiation of the struct. It is not contained in the select
+                // expression but in the type of it's operand.
+                if let Some((_, inst)) = self
+                    .get_node_type(arg.node_id())
+                    .skip_reference()
+                    .get_struct(self.env())
+                {
+                    self.gen_select(
+                        target,
+                        id,
+                        mid.qualified_inst(*sid, inst.to_vec()),
+                        fids,
                         &arg,
                     )
                 } else {
@@ -712,10 +745,13 @@ impl<'env> Generator<'env> {
                 let temp = self.gen_escape_auto_ref_arg(&arg, false);
                 self.emit_with(id, |attr| Bytecode::Abort(attr, temp))
             },
-            Operation::Deref => self.gen_op_call(targets, id, BytecodeOperation::ReadRef, args),
+            Operation::Deref => self.gen_deref(targets, id, args),
             Operation::MoveFunction(m, f) => {
                 self.gen_function_call(targets, id, m.qualified(*f), args)
             },
+            Operation::TestVariants(mid, sid, variants) => {
+                self.gen_test_variants(targets, id, mid.qualified(*sid), variants, args)
+            },
             Operation::Cast => self.gen_cast_call(targets, id, args),
             Operation::Add => self.gen_op_call(targets, id, BytecodeOperation::Add, args),
             Operation::Sub => self.gen_op_call(targets, id, BytecodeOperation::Sub, args),
@@ -792,6 +828,31 @@ impl<'env> Generator<'env> {
         }
     }
 
+    fn gen_test_variants(
+        &mut self,
+        targets: Vec<TempIndex>,
+        id: NodeId,
+        struct_id: QualifiedId<StructId>,
+        variants: &[Symbol],
+        args: &[Exp],
+    ) {
+        let target = self.require_unary_target(id, targets);
+        let temp =
+            self.gen_auto_ref_arg(&self.require_unary_arg(id, args), ReferenceKind::Immutable);
+        let mut bool_temp = Some(target);
+        let success_label = self.new_label(id);
+        let inst = self.env().get_node_instantiation(id);
+        self.gen_test_variants_operation(
+            id,
+            &mut bool_temp,
+            success_label,
+            &struct_id.instantiate(inst),
+            variants.to_vec(),
+            temp,
+        );
+        self.emit_with(id, |attr| Bytecode::Label(attr, success_label))
+    }
+
     fn gen_cast_call(&mut self, targets: Vec<TempIndex>, id: NodeId, args: &[Exp]) {
         let ty = self.get_node_type(id);
         let bytecode_op = match ty {
@@ -822,6 +883,18 @@ impl<'env> Generator<'env> {
         })
     }
 
+    fn gen_deref(&mut self, targets: Vec<TempIndex>, id: NodeId, args: &[Exp]) {
+        // Optimize case of `Deref(Borrow(x)) => x`.
+        // This is safe and supports generation for matches, where rewriting of code may result
+        // in such expressions.
+        match args[0].as_ref() {
+            ExpData::Call(_, Operation::Borrow(_), borrow_args) => {
+                self.gen(targets, &borrow_args[0])
+            },
+            _ => self.gen_op_call(targets, id, BytecodeOperation::ReadRef, args),
+        }
+    }
+
     fn gen_logical_shortcut(
         &mut self,
         is_and: bool,
@@ -975,6 +1048,31 @@ impl<'env> Generator<'env> {
         }
     }
 
+    // Generates code for an expression which can represent a tuple. This flattens
+    // the tuple if explicit or introduces temporaries to hold the tuple value. If
+    // the expression is not a tuple, a singleton vector will be returned. This
+    // reflects the current special semantics of tuples in Move which cannot be
+    // nested.
+    fn gen_tuple(&mut self, exp: &Exp, with_forced_temp: bool) -> Vec<TempIndex> {
+        if let ExpData::Call(_, Operation::Tuple, args) = exp.as_ref() {
+            args.iter().map(|arg| self.gen_arg(arg, false)).collect()
+        } else {
+            let exp_ty = self.env().get_node_type(exp.node_id());
+            if exp_ty.is_tuple() {
+                // Need to allocate new temps to store the tuple elements.
+                let temps = exp_ty
+                    .flatten()
+                    .into_iter()
+                    .map(|ty| self.new_temp(ty))
+                    .collect::<Vec<_>>();
+                self.gen(temps.clone(), exp);
+                temps
+            } else {
+                vec![self.gen_arg(exp, with_forced_temp)]
+            }
+        }
+    }
+
     /// Compile the expression in reference mode. This enables automatic creation of references
     /// (e.g. for locals) and disables automatic dereferencing. This is used for compilation
     /// of expressions in 'lvalue' mode.
@@ -1024,10 +1122,30 @@ impl<'env> Generator<'env> {
                     id,
                     kind,
                     mid.qualified(*sid),
-                    *fid,
+                    &[*fid],
                     &self.require_unary_arg(id, args),
                 )
             },
+            ExpData::Call(_arg_id, Operation::SelectVariants(mid, sid, fids), args) => {
+                return self.gen_borrow_field(
+                    target,
+                    id,
+                    kind,
+                    mid.qualified(*sid),
+                    fids,
+                    &self.require_unary_arg(id, args),
+                )
+            },
+            ExpData::Call(_arg_id, Operation::Deref, args) => {
+                // Optimize `Borrow(Deref(x)) => x`
+                // only when `kind` is equal to the reference kind of `x`
+                let arg_type = self.env().get_node_type(args[0].node_id());
+                if let Type::Reference(ref_kind, _) = arg_type {
+                    if ref_kind == kind {
+                        return self.gen(vec![target], &args[0]);
+                    }
+                }
+            },
             ExpData::LocalVar(_arg_id, sym) => return self.gen_borrow_local(target, id, *sym),
             ExpData::Temporary(_arg_id, temp) => return self.gen_borrow_temp(target, id, *temp),
             _ => {},
@@ -1053,14 +1171,9 @@ impl<'env> Generator<'env> {
         id: NodeId,
         kind: ReferenceKind,
         struct_id: QualifiedId<StructId>,
-        field_id: FieldId,
+        fields: &[FieldId],
         oper: &Exp,
     ) {
-        let field_offset = {
-            let struct_env = self.env().get_struct(struct_id);
-            let field_env = struct_env.get_field(field_id);
-            field_env.get_offset()
-        };
         let temp = self.gen_auto_ref_arg(oper, kind);
         // Get instantiation of field. It is not contained in the select expression but in the
         // type of its operand.
@@ -1069,17 +1182,13 @@ impl<'env> Generator<'env> {
             .skip_reference()
             .get_struct(self.env())
         {
-            self.emit_call(
+            self.gen_borrow_field_operation(
                 id,
-                vec![target],
-                BytecodeOperation::BorrowField(
-                    struct_id.module_id,
-                    struct_id.id,
-                    inst.to_vec(),
-                    field_offset,
-                ),
-                vec![temp],
-            );
+                target,
+                struct_id.instantiate(inst.to_vec()),
+                fields,
+                temp,
+            )
         } else {
             self.internal_error(id, "inconsistent type in select expression")
         }
@@ -1099,12 +1208,9 @@ impl<'env> Generator<'env> {
         target: TempIndex,
         id: NodeId,
         str: QualifiedInstId<StructId>,
-        field: FieldId,
+        fields: &[FieldId],
         oper: &Exp,
     ) {
-        let struct_env = self.env().get_struct(str.to_qualified_id());
-        let field_offset = struct_env.get_field(field).get_offset();
-
         // Compile operand in reference mode, defaulting to immutable mode.
         let oper_temp = self.gen_auto_ref_arg(oper, ReferenceKind::Immutable);
         let oper_type = self.get_node_type(oper.node_id());
@@ -1141,23 +1247,230 @@ impl<'env> Generator<'env> {
         } else {
             target
         };
-        self.emit_call(
-            id,
-            vec![borrow_dest],
-            BytecodeOperation::BorrowField(str.module_id, str.id, str.inst, field_offset),
-            vec![oper_temp],
-        );
+        self.gen_borrow_field_operation(id, borrow_dest, str, fields, oper_temp);
         if need_read_ref {
             self.emit_call(id, vec![target], BytecodeOperation::ReadRef, vec![
                 borrow_dest,
             ])
         }
     }
+
+    /// Generate a borrow field operation, possibly for a variant struct, which may require
+    /// switching over variants.
+    fn gen_borrow_field_operation(
+        &mut self,
+        id: NodeId,
+        dest: TempIndex,
+        str: QualifiedInstId<StructId>,
+        fields: &[FieldId],
+        src: TempIndex,
+    ) {
+        let struct_env = self.env().get_struct(str.to_qualified_id());
+        if struct_env.has_variants() {
+            // Not all the fields in this operation maybe at the same offset, however,
+            // bytecode only supports selection of multiple variant fields at the same
+            // offset. A switch need to be generated over fields at the same offset.
+            let mut fields_by_offset: BTreeMap<usize, BTreeSet<FieldId>> = BTreeMap::new();
+            for field in fields {
+                fields_by_offset
+                    .entry(struct_env.get_field(*field).get_offset())
+                    .or_default()
+                    .insert(*field);
+            }
+            // Go over the groups, with the smallest group
+            // first, so the largest group is handled as the default, and directly maps
+            // to the native BorrowVariantField. This reduces the number of tests
+            // generated.
+            let mut ordered_groups = fields_by_offset
+                .iter()
+                .sorted_by(|g1, g2| g1.1.len().cmp(&g2.1.len()))
+                .collect_vec();
+            let mut bool_temp: Option<TempIndex> = None;
+            let end_label = if ordered_groups.len() > 1 {
+                Some(self.new_label(id))
+            } else {
+                None
+            };
+            while let Some((offset, group_fields)) = ordered_groups.pop() {
+                let next_group_label = if !ordered_groups.is_empty() {
+                    let next_group_label = self.new_label(id);
+                    let this_group_label = self.new_label(id);
+                    self.gen_test_variants_operation(
+                        id,
+                        &mut bool_temp,
+                        this_group_label,
+                        &str,
+                        group_fields
+                            .iter()
+                            .map(|fid| {
+                                self.env()
+                                    .get_struct(str.to_qualified_id())
+                                    .get_field(*fid)
+                                    .get_variant()
+                                    .expect("variant name defined")
+                            })
+                            .collect(),
+                        src,
+                    );
+                    // Ending here means no test succeeded
+                    self.emit_with(id, |attr| Bytecode::Jump(attr, next_group_label));
+                    // Ending here means some test succeeded
+                    self.emit_with(id, |attr| Bytecode::Label(attr, this_group_label));
+                    Some(next_group_label)
+                } else {
+                    None
+                };
+                // Generate the underlying borrow operation with all fields at the same offset.
+                let fields = group_fields.iter().cloned().collect_vec();
+                self.gen_borrow_field_same_offset(id, dest, str.clone(), &fields, *offset, src);
+                if let Some(label) = next_group_label {
+                    // Jump to end label
+                    self.emit_with(id, |attr| Bytecode::Jump(attr, end_label.unwrap()));
+                    // Next group continues here
+                    self.emit_with(id, |attr| Bytecode::Label(attr, label))
+                }
+            }
+            if let Some(label) = end_label {
+                self.emit_with(id, |attr| Bytecode::Label(attr, label))
+            }
+        } else {
+            assert_eq!(fields.len(), 1);
+            self.gen_borrow_field_same_offset(
+                id,
+                dest,
+                str.clone(),
+                fields,
+                struct_env.get_field(fields[0]).get_offset(),
+                src,
+            );
+        }
+    }
+
+    /// Generate a test for variants.
+    fn gen_test_variants_operation(
+        &mut self,
+        id: NodeId,
+        bool_temp: &mut Option<TempIndex>,
+        success_label: Label,
+        str: &QualifiedInstId<StructId>,
+        variants: Vec<Symbol>,
+        src: TempIndex,
+    ) {
+        let bool_temp =
+            *bool_temp.get_or_insert_with(|| self.new_temp(Type::new_prim(PrimitiveType::Bool)));
+        for variant in variants {
+            self.emit_call(
+                id,
+                vec![bool_temp],
+                BytecodeOperation::TestVariant(str.module_id, str.id, variant, str.inst.clone()),
+                vec![src],
+            );
+            self.branch_to_exit_if_true(id, bool_temp, success_label)
+        }
+    }
+
+    /// Generate field borrow for fields at the same offset.
+    fn gen_borrow_field_same_offset(
+        &mut self,
+        id: NodeId,
+        dest: TempIndex,
+        str: QualifiedInstId<StructId>,
+        fields: &[FieldId],
+        offset: usize,
+        src: TempIndex,
+    ) {
+        let struct_env = self.env().get_struct(str.to_qualified_id());
+        debug_assert!(fields
+            .iter()
+            .all(|id| struct_env.get_field(*id).get_offset() == offset));
+        let oper = if struct_env.has_variants() {
+            let variants = fields
+                .iter()
+                .map(|id| {
+                    struct_env
+                        .get_field(*id)
+                        .get_variant()
+                        .expect("variant field has variant name")
+                })
+                .collect_vec();
+            BytecodeOperation::BorrowVariantField(str.module_id, str.id, variants, str.inst, offset)
+        } else {
+            // Regular BorrowField
+            BytecodeOperation::BorrowField(str.module_id, str.id, str.inst, offset)
+        };
+        self.emit_call(id, vec![dest], oper, vec![src])
+    }
 }
 
 // ======================================================================================
 // Pattern matching
 
+/// Translation of patterns, both for irrefutable matches as in `let p = e`, and
+/// refutable matches as in `match (e) { p1 => e1, p2 => e2, ..}`.
+///
+/// The challenge with refutable match translation is to deal with consuming matches.
+/// Consider `let s = S{x: C{y}}; match (s) { S{C{y}}} if p(&y) => y, t => t }`. In order
+/// to check whether the match is true, the value in `s` must not be moved until the match
+/// is decided, while still being able to look at sub-fields and evaluate predicates.
+/// Therefore, the match needs to evaluated first using a reference to `s`. We call this
+/// _probing_ of a match.
+///
+/// The type `MatchMode` is used to describe in which mode matching is performed.
+/// In irrefutable mode, it is expected that the pattern succeeds to match. In
+/// refutable mode, on match failure an exit branch is taken. Refutable mode
+/// can be furthermore characterized to be probing.
+enum MatchMode {
+    /// A match which cannot be refuted
+    Irrefutable,
+    /// A refutable match as in the match arm of the `match` expression
+    Refutable {
+        /// A temporary where to store the result of variant tests
+        bool_temp: TempIndex,
+        /// A branch to the exit point of the match fails
+        exit_path: Label,
+        /// Set if this is a probing match, and if so, the set of vars which need to
+        /// be bound for the match condition. In probing mode, we only need to
+        /// bind certain variables. For example, in `S{x, y} if p(y)` we do not need
+        /// to bind `x`.
+        probing_vars: Option<BTreeSet<Symbol>>,
+    },
+}
+
+impl MatchMode {
+    /// Whether this match is in probing mode.
+    fn is_probing(&self) -> bool {
+        matches!(self, MatchMode::Refutable {
+            probing_vars: Some(_),
+            ..
+        })
+    }
+
+    /// Whether a variable appearing in the pattern should be bound to a temporary.
+    /// In probing mode, only selected variables which appear in the optional guard of
+    /// a match arm need to be bound.
+    fn shall_bind_var(&self, var: Symbol) -> bool {
+        if let MatchMode::Refutable {
+            probing_vars: Some(vars),
+            ..
+        } = self
+        {
+            vars.contains(&var)
+        } else {
+            true
+        }
+    }
+
+    /// Returns the effective type. In probing mode, all non-reference types
+    /// are lifted to references.
+    fn effective_var_type(&self, ty: Type) -> Type {
+        if self.is_probing() && !ty.is_reference() {
+            Type::Reference(ReferenceKind::Immutable, Box::new(ty))
+        } else {
+            ty
+        }
+    }
+}
+
 impl<'env> Generator<'env> {
     /// Generate code for assignment of an expression to a pattern. This involves
     /// flattening nested patterns as needed. The optional `next_scope` is a
@@ -1167,7 +1480,7 @@ impl<'env> Generator<'env> {
             self.gen_tuple_assign(id, pat_args, exp, next_scope)
         } else {
             let arg = self.gen_escape_auto_ref_arg(exp, false);
-            self.gen_assign_from_temp(id, pat, arg, next_scope)
+            self.gen_match_from_temp(id, pat, &[arg], &MatchMode::Irrefutable, next_scope)
         }
     }
 
@@ -1186,7 +1499,10 @@ impl<'env> Generator<'env> {
                 if args.len() != pats.len() {
                     // Type checker should have complained already
                     self.internal_error(id, "inconsistent tuple arity")
-                } else if args.len() != 1 && self.have_overlapping_vars(pats, exp) {
+                } else if next_scope.is_none() // assignment, not declaration
+                    && args.len() != 1
+                    && self.have_overlapping_vars(pats, exp)
+                {
                     // We want to simulate the semantics for "simultaneous" assignment with
                     // overlapping variables, eg., `(x, y) = (y, x)`.
                     // To do so, we save each tuple arg (from rhs) into a temporary.
@@ -1196,167 +1512,458 @@ impl<'env> Generator<'env> {
                         .map(|exp| self.gen_escape_auto_ref_arg(exp, true))
                         .collect::<Vec<_>>();
                     for (pat, temp) in pats.iter().zip(temps.into_iter()) {
-                        self.gen_assign_from_temp(id, pat, temp, next_scope)
+                        self.gen_match_from_temp(
+                            id,
+                            pat,
+                            &[temp],
+                            &MatchMode::Irrefutable,
+                            next_scope,
+                        )
                     }
                 } else {
-                    // No overlap, or a 1-tuple: just do point-wise assignment.
+                    // No overlap, a 1-tuple, or not an assignment: just do point-wise match.
                     for (pat, exp) in pats.iter().zip(args.iter()) {
                         self.gen_assign(id, pat, exp, next_scope)
                     }
                 }
             },
             _ => {
-                // The type checker has ensured that this expression represents  tuple
-                let (temps, cont_assigns) = self.flatten_patterns(pats, next_scope);
-                self.gen(temps, exp);
-                for (cont_id, cont_pat, cont_temp) in cont_assigns {
-                    self.gen_assign_from_temp(cont_id, &cont_pat, cont_temp, next_scope)
+                // The type checker has ensured that this expression represents a function call
+                // resulting in a tuple. Collect the sub-matches to determine the targets to which
+                // assign the call results.
+                let match_mode = &MatchMode::Irrefutable;
+                let sub_matches = self.collect_sub_matches(true, pats, match_mode, next_scope);
+                self.gen(sub_matches.values().map(|(temp, _)| *temp).collect(), exp);
+                for (_, (temp, cont_opt)) in sub_matches.into_iter() {
+                    if let Some(cont_pat) = cont_opt {
+                        self.gen_match_from_temp(
+                            cont_pat.node_id(),
+                            &cont_pat,
+                            &[temp],
+                            match_mode,
+                            next_scope,
+                        )
+                    }
                 }
             },
         }
     }
 
-    /// Generate borrow_field when unpacking a reference to a struct
-    // e.g. `let s = &S; let (a, b, c) = &s`, a, b, and c are references
-    fn gen_borrow_field_for_unpack_ref(
-        &mut self,
-        id: &NodeId,
-        str: &QualifiedInstId<StructId>,
-        arg: TempIndex,
-        temps: Vec<TempIndex>,
-        ref_kind: ReferenceKind,
-    ) {
-        let struct_env = self.env().get_struct(str.to_qualified_id());
-        let mut temp_to_field_offsets = BTreeMap::new();
-        for (field, input_temp) in struct_env.get_fields().zip(temps.clone()) {
-            temp_to_field_offsets.insert(input_temp, field.get_offset());
+    /// Generates code for a match expression.
+    fn gen_match(&mut self, targets: Vec<TempIndex>, id: NodeId, exp: &Exp, arms: &[MatchArm]) {
+        // Generate temps for the exp we are matching over. The exp can be a tuple, so
+        // we have a vector of temps.
+        let values: Vec<TempIndex> = self.gen_tuple(exp, false);
+        // For each temp not a reference, create one, so we can match it without consuming it.
+        // Also set `needs_probing` to true if there are any non-references. This indicates
+        // that we need to generate a specialized, non-consuming 'probing' match.
+        let mut needs_probing = false;
+        let value_refs: Vec<TempIndex> = values
+            .iter()
+            .cloned()
+            .map(|value| {
+                let value_ty = self.temp_type(value);
+                if value_ty.is_reference() {
+                    value
+                } else {
+                    let value_ref = self.new_temp(Type::Reference(
+                        ReferenceKind::Immutable,
+                        Box::new(value_ty.clone()),
+                    ));
+                    self.emit_call(id, vec![value_ref], BytecodeOperation::BorrowLoc, vec![
+                        value,
+                    ]);
+                    needs_probing = true;
+                    value_ref
+                }
+            })
+            .collect();
+        // Label to jump to on success of a match arm
+        let success_path = self.new_label(id);
+        // Boolean temporary to store match results.
+        let bool_temp = self.new_temp(Type::new_prim(PrimitiveType::Bool));
+        for arm in arms {
+            let pat_id = arm.pattern.node_id();
+            let exit_path = self.new_label(pat_id);
+            let match_mode = if needs_probing {
+                // If we needed to create a reference (i.e. we match against a value)
+                // we need to evaluate whether the pattern matches in
+                // probe mode, without consuming the matched value.
+                self.gen_match_probe(pat_id, &value_refs, bool_temp, exit_path, arm);
+                // On success of the probe, matching the pattern will be irrefutable
+                MatchMode::Irrefutable
+            } else {
+                // Otherwise we perform a directly refutable match.
+                MatchMode::Refutable {
+                    exit_path,
+                    bool_temp,
+                    probing_vars: None,
+                }
+            };
+            // Declare all variables bound by the pattern
+            let scope = self.create_scope(arm.pattern.vars().into_iter(), false);
+            // Match the pattern, potentially branching to exit_path
+            self.gen_match_from_temp(id, &arm.pattern, &values, &match_mode, Some(&scope));
+            // If we have not yet executed the condition during probing, execute it now.
+            self.scopes.push(scope);
+            if let Some(cond) = arm.condition.as_ref().filter(|_| !needs_probing) {
+                self.gen(vec![bool_temp], cond);
+                self.branch_to_exit_if_false(cond.node_id(), bool_temp, exit_path)
+            }
+            // Translate the body
+            self.gen(targets.clone(), &arm.body);
+            self.scopes.pop().expect("scope stack balanced");
+            // Exit match with success
+            self.emit_with(id, |attr| Bytecode::Jump(attr, success_path));
+            // Point to continue if match failed
+            self.emit_with(id, |attr| Bytecode::Label(attr, exit_path))
         }
-        for (temp, field_offset) in temp_to_field_offsets {
-            self.with_reference_mode(|s, entering| {
-                if entering {
-                    s.reference_mode_kind = ref_kind
+        // At last, emit an abort that no arm matched
+        let abort_code = self.new_temp(Type::new_prim(PrimitiveType::U64));
+        self.emit_with(id, |attr| {
+            Bytecode::Load(
+                attr,
+                abort_code,
+                Constant::U64(well_known::INCOMPLETE_MATCH_ABORT_CODE),
+            )
+        });
+        self.emit_with(id, |attr| Bytecode::Abort(attr, abort_code));
+        // Here we end if some path was successful
+        self.emit_with(id, |attr| Bytecode::Label(attr, success_path));
+        // Finally check exhaustiveness of match
+        ValueShape::analyze_match_coverage(
+            self.env(),
+            exp.node_id(),
+            arms.iter().filter_map(|arm| {
+                if arm.condition.is_none() {
+                    Some(&arm.pattern)
+                } else {
+                    None
                 }
-                if !s.temp_type(temp).is_reference() {
-                    s.env().diag(
-                        Severity::Bug,
-                        &s.env().get_node_loc(*id),
-                        "Unpacking a reference to a struct must return the references of fields",
-                    );
+            }),
+        );
+    }
+
+    // Generates a probing match for a given match arm. The probing match doesn't consume
+    // the value which is expected to be a reference.
+    fn gen_match_probe(
+        &mut self,
+        id: NodeId,
+        value_refs: &[TempIndex],
+        bool_temp: TempIndex,
+        exit_path: Label,
+        arm: &MatchArm,
+    ) {
+        // Compute the set of vars we need to bind during the match.
+        let probing_vars = if let Some(exp) = &arm.condition {
+            // Include all vars in the condition
+            exp.free_vars()
+        } else {
+            // No condition, probing does not need to bind anything
+            BTreeSet::new()
+        };
+        let mode = MatchMode::Refutable {
+            bool_temp,
+            exit_path,
+            probing_vars: Some(probing_vars.clone()),
+        };
+        // Create a scope with variables bound by the pattern and needed for probing. All
+        // vars are lifted to be references to the original type.
+        let needed_vars = arm
+            .pattern
+            .vars()
+            .into_iter()
+            .filter(|(_, var)| probing_vars.contains(var))
+            .collect_vec();
+        let probe_scope = self.create_scope(needed_vars.clone().into_iter(), true);
+        // Match the pattern, potentially branching to exit_path
+        self.gen_match_from_temp(id, &arm.pattern, value_refs, &mode, Some(&probe_scope));
+        if let Some(exp) = &arm.condition {
+            // Evaluate matching condition, by rewriting the expression, such that
+            // references to `x` are replaced by references to `*x`. This is needed
+            // because in the original pattern, `x` is bound to a value, not a reference.
+            let env = self.env();
+            let rewritten_exp = ExpRewriter::new(env, &mut |id, target| {
+                if let RewriteTarget::LocalVar(var) = target {
+                    if probe_scope.contains_key(&var) {
+                        let new_id = env.new_node(
+                            env.get_node_loc(id),
+                            Type::Reference(
+                                ReferenceKind::Immutable,
+                                Box::new(env.get_node_type(id)),
+                            ),
+                        );
+                        return Some(
+                            ExpData::Call(id, Operation::Deref, vec![ExpData::LocalVar(
+                                new_id, var,
+                            )
+                            .into_exp()])
+                            .into_exp(),
+                        );
+                    }
                 }
-                s.emit_call(
-                    *id,
-                    vec![temp],
-                    BytecodeOperation::BorrowField(
-                        str.module_id,
-                        str.id,
-                        str.inst.to_owned(),
-                        field_offset,
-                    ),
-                    vec![arg],
-                );
-            });
+                None
+            })
+            .rewrite_exp(exp.clone());
+            self.scopes.push(probe_scope);
+            self.gen(vec![bool_temp], &rewritten_exp);
+            self.branch_to_exit_if_false(id, bool_temp, exit_path);
+            self.scopes.pop();
         }
     }
 
-    fn gen_assign_from_temp(
+    /// Generate match of values against pattern.
+    fn gen_match_from_temp(
         &mut self,
         id: NodeId,
         pat: &Pattern,
-        arg: TempIndex,
+        values: &[TempIndex],
+        match_mode: &MatchMode,
         next_scope: Option<&Scope>,
     ) {
+        if !matches!(pat, Pattern::Tuple(..)) && values.len() != 1 {
+            self.internal_error(id, "inconsistent tuple value in match");
+            return;
+        }
         match pat {
-            Pattern::Wildcard(_) => {
-                let ty = self.temp_type(arg).to_owned();
-                let temp = self.new_temp(ty);
-                // Assign to a temporary to allow stackless bytecode checkers to report any errors
-                // due to the assignment.
-                self.emit_with(id, |attr| {
-                    Bytecode::Assign(attr, temp, arg, AssignKind::Inferred)
-                })
+            Pattern::Wildcard(id) => {
+                let pat_ty = self.env().get_node_type(*id);
+                if !match_mode.is_probing() {
+                    let temp = self.new_temp(pat_ty);
+                    self.emit_with(*id, |attr| {
+                        Bytecode::Assign(attr, temp, values[0], AssignKind::Inferred)
+                    })
+                }
             },
             Pattern::Var(var_id, sym) => {
-                let local = self.find_local_for_pattern(*var_id, *sym, next_scope);
-                self.emit_with(id, |attr| {
-                    Bytecode::Assign(attr, local, arg, AssignKind::Inferred)
-                })
+                if match_mode.shall_bind_var(*sym) {
+                    let local = self.find_local_for_pattern(*var_id, *sym, next_scope);
+                    self.emit_with(id, |attr| {
+                        Bytecode::Assign(attr, local, values[0], AssignKind::Inferred)
+                    })
+                }
             },
-            Pattern::Struct(id, str, args) => {
-                let (temps, cont_assigns) = self.flatten_patterns(args, next_scope);
-                let ty = self.temp_type(arg);
-                if ty.is_reference() {
-                    let ref_kind = if ty.is_immutable_reference() {
-                        ReferenceKind::Immutable
-                    } else {
-                        ReferenceKind::Mutable
-                    };
-                    self.gen_borrow_field_for_unpack_ref(id, str, arg, temps, ref_kind);
+            Pattern::Struct(id, str, variant, args) => {
+                // If this is a variant, and we are doing a refutable match,
+                // insert a test and exit if it fails.
+                let value = values[0];
+                if let (
+                    Some(variant),
+                    MatchMode::Refutable {
+                        bool_temp,
+                        exit_path,
+                        ..
+                    },
+                ) = (variant, match_mode)
+                {
+                    self.emit_call(
+                        *id,
+                        vec![*bool_temp],
+                        BytecodeOperation::TestVariant(
+                            str.module_id,
+                            str.id,
+                            *variant,
+                            str.inst.clone(),
+                        ),
+                        vec![value],
+                    );
+                    self.branch_to_exit_if_false(*id, *bool_temp, *exit_path);
+                }
+                let ref_kind = self.temp_type(value).ref_kind();
+                let uses_unpack = ref_kind.is_none();
+                let sub_matches = self.collect_sub_matches(
+                    uses_unpack, // need all sub-patterns if unpack is used
+                    args,
+                    match_mode,
+                    next_scope,
+                );
+                if !uses_unpack {
+                    self.gen_borrow_field_for_unpack_ref(
+                        id,
+                        str,
+                        *variant,
+                        value,
+                        &sub_matches,
+                        ref_kind.expect("type is reference"),
+                    )
                 } else {
+                    assert_eq!(
+                        args.len(),
+                        sub_matches.len(),
+                        "contiguous allocation of temps for unpack"
+                    );
                     self.emit_call(
                         *id,
-                        temps,
-                        BytecodeOperation::Unpack(str.module_id, str.id, str.inst.to_owned()),
-                        vec![arg],
+                        sub_matches.values().map(|(temp, ..)| *temp).collect(),
+                        if let Some(variant) = variant {
+                            BytecodeOperation::UnpackVariant(
+                                str.module_id,
+                                str.id,
+                                *variant,
+                                str.inst.to_owned(),
+                            )
+                        } else {
+                            BytecodeOperation::Unpack(str.module_id, str.id, str.inst.to_owned())
+                        },
+                        vec![values[0]],
                     );
                 }
-                for (cont_id, cont_pat, cont_temp) in cont_assigns {
-                    self.gen_assign_from_temp(cont_id, &cont_pat, cont_temp, next_scope)
+                for (_, (temp, cont_opt)) in sub_matches.into_iter() {
+                    if let Some(cont_pat) = cont_opt {
+                        self.gen_match_from_temp(
+                            cont_pat.node_id(),
+                            &cont_pat,
+                            &[temp],
+                            match_mode,
+                            next_scope,
+                        )
+                    }
+                }
+            },
+            Pattern::Tuple(id, pats) => {
+                if values.len() != pats.len() {
+                    self.internal_error(*id, "inconsistent pattern tuple");
+                    return;
+                }
+                for (elem, sub_pat) in values.iter().zip(pats.iter()) {
+                    self.gen_match_from_temp(
+                        sub_pat.node_id(),
+                        sub_pat,
+                        &[*elem],
+                        match_mode,
+                        next_scope,
+                    )
                 }
             },
-            Pattern::Tuple(id, _) => self.error(*id, "tuple not allowed here"),
             Pattern::Error(_) => self.internal_error(id, "unexpected error pattern"),
         }
     }
 
-    /// Flatten a pattern, returning a temporary to receive the value being matched against,
-    /// and an optional continuation assignment to match the sub-pattern. The optional
-    /// `next_scope` is used to lookup locals which are introduced by this binding
+    /// Generate borrow_field when unpacking a reference to a struct
+    /// e.g. `let s = &S; let S(a, b, c) = &s`, a, b, and c are references
+    fn gen_borrow_field_for_unpack_ref(
+        &mut self,
+        id: &NodeId,
+        str: &QualifiedInstId<StructId>,
+        variant: Option<Symbol>,
+        arg: TempIndex,
+        sub_matches: &BTreeMap<usize, (TempIndex, Option<Pattern>)>,
+        ref_kind: ReferenceKind,
+    ) {
+        let struct_env = self.env().get_struct(str.to_qualified_id());
+        let fields = struct_env
+            .get_fields_optional_variant(variant)
+            .map(|f| f.get_offset())
+            .collect_vec();
+        for (pos, (temp, _)) in sub_matches {
+            let field_offset = fields[*pos];
+            self.with_reference_mode(|gen, entering| {
+                if entering {
+                    gen.reference_mode_kind = ref_kind
+                }
+                if !gen.temp_type(*temp).is_reference() {
+                    gen.env().diag(
+                        Severity::Bug,
+                        &gen.env().get_node_loc(*id),
+                        "Unpacking a reference to a struct must return the references of fields",
+                    );
+                }
+                gen.emit_call(
+                    *id,
+                    vec![*temp],
+                    if let Some(var) = variant {
+                        BytecodeOperation::BorrowVariantField(
+                            str.module_id,
+                            str.id,
+                            vec![var],
+                            str.inst.to_owned(),
+                            field_offset,
+                        )
+                    } else {
+                        BytecodeOperation::BorrowField(
+                            str.module_id,
+                            str.id,
+                            str.inst.to_owned(),
+                            field_offset,
+                        )
+                    },
+                    vec![arg],
+                );
+            })
+        }
+    }
+
+    /// Collect a sub-match for a given pattern `pat` at argument position `pos`.
+    /// This returns a temporary in which to store the matched argument at `pos`, and
+    /// an optional continuation pattern to match on that value. For example,
+    /// for `S{x}`, this will insert `(temp, Some(S{x})` at `pos` in the accumulated
+    /// `sub_matches` map. In turn, for a pattern `x`, this will insert `(x, None)`.
+    /// Depending on the mode, obsolete sub-matches will not be produced. (See code
+    /// comments.)
+    ///
+    /// The optional `next_scope` is used to lookup locals which are introduced by this binding
     /// but are not yet in scope; this is needed to deal with assignments of the form
     /// `let x = f(x)` where the 2nd x refers to a variable in the current scope, but the first
     /// to one which we introduce right now.
-    fn flatten_pattern(
+    fn collect_sub_match(
         &mut self,
+        include_all: bool,
+        sub_matches: &mut BTreeMap<usize, (TempIndex, Option<Pattern>)>,
+        pos: usize,
         pat: &Pattern,
+        match_mode: &MatchMode,
         next_scope: Option<&Scope>,
-    ) -> (TempIndex, Option<(NodeId, Pattern, TempIndex)>) {
+    ) {
         match pat {
             Pattern::Wildcard(id) => {
-                // Wildcard pattern: we need to create a temporary to receive the value, even
-                // if its dropped afterwards.
-                let temp = self.new_temp(self.get_node_type(*id));
-                (temp, None)
+                let pat_ty = self.env().get_node_type(*id);
+                // If inclusion is not required, we can skip wildcards if either
+                // we are probing or the type is a reference.
+                if include_all || !match_mode.is_probing() && self.ty_requires_binding(&pat_ty) {
+                    let temp = self.new_temp(self.get_node_type(*id));
+                    sub_matches.insert(pos, (temp, None));
+                }
             },
             Pattern::Var(id, sym) => {
-                // Variable pattern: no continuation assignment needed as it is already in
-                // the expected form.
-                (self.find_local_for_pattern(*id, *sym, next_scope), None)
+                // If inclusion is not required, we only include variables as determined
+                // by matching mode.
+                if include_all || match_mode.shall_bind_var(*sym) {
+                    sub_matches.insert(
+                        pos,
+                        (self.find_local_for_pattern(*id, *sym, next_scope), None),
+                    );
+                }
             },
             _ => {
-                // Pattern is not flat: create a new temporary and an Assignment of this
+                // Pattern is not flat: create a new temporary and an assignment of this
                 // temporary to the pattern.
                 let id = pat.node_id();
-                let ty = self.get_node_type(id);
+                let ty = match_mode.effective_var_type(self.get_node_type(id));
                 let temp = self.new_temp(ty);
-                (temp, Some((id, pat.clone(), temp)))
+                sub_matches.insert(pos, (temp, Some(pat.clone())));
             },
         }
     }
 
-    fn flatten_patterns(
+    fn collect_sub_matches(
         &mut self,
-        pats: &[Pattern],
+        include_all: bool,
+        args: &[Pattern],
+        match_mode: &MatchMode,
         next_scope: Option<&Scope>,
-    ) -> (Vec<TempIndex>, Vec<(NodeId, Pattern, TempIndex)>) {
-        let mut temps = vec![];
-        let mut cont_assigns = vec![];
-        for pat in pats {
-            let (temp, opt_cont) = self.flatten_pattern(pat, next_scope);
-            temps.push(temp);
-            if let Some(cont) = opt_cont {
-                cont_assigns.push(cont)
-            }
+    ) -> BTreeMap<usize, (TempIndex, Option<Pattern>)> {
+        let mut sub_matches = BTreeMap::new();
+        for (pos, pat) in args.iter().enumerate() {
+            self.collect_sub_match(
+                include_all,
+                &mut sub_matches,
+                pos,
+                pat,
+                match_mode,
+                next_scope,
+            )
         }
-        (temps, cont_assigns)
+        sub_matches
     }
 
     fn find_local_for_pattern(
@@ -1389,6 +1996,331 @@ impl<'env> Generator<'env> {
         let rhs_vars = rhs.free_vars_and_used_params(&param_symbols);
         lhs_vars.intersection(&rhs_vars).next().is_some()
     }
+
+    fn branch_to_exit_if_false(&mut self, id: NodeId, cond: TempIndex, exit_path: Label) {
+        let fall_through = self.new_label(id);
+        self.emit_with(id, |attr| {
+            Bytecode::Branch(attr, fall_through, exit_path, cond)
+        });
+        self.emit_with(id, |attr| Bytecode::Label(attr, fall_through))
+    }
+
+    fn branch_to_exit_if_true(&mut self, id: NodeId, cond: TempIndex, exit_path: Label) {
+        let fall_through = self.new_label(id);
+        self.emit_with(id, |attr| {
+            Bytecode::Branch(attr, exit_path, fall_through, cond)
+        });
+        self.emit_with(id, |attr| Bytecode::Label(attr, fall_through))
+    }
+
+    fn create_scope(
+        &mut self,
+        vars: impl Iterator<Item = (NodeId, Symbol)>,
+        as_ref: bool,
+    ) -> BTreeMap<Symbol, TempIndex> {
+        let mut scope = BTreeMap::new();
+        for (id, sym) in vars {
+            let mut ty = self.get_node_type(id);
+            if as_ref {
+                ty = Type::Reference(ReferenceKind::Immutable, Box::new(ty))
+            }
+            let temp = self.new_temp(ty);
+            scope.insert(sym, temp);
+            self.local_names.insert(temp, sym);
+        }
+        scope
+    }
+
+    /// Returns true if a value of given type need to be bound to a temporary, even if unused,
+    /// so it can be properly processed. Types which are known to be droppable
+    /// return false here.
+    fn ty_requires_binding(&self, ty: &Type) -> bool {
+        !self
+            .env()
+            .type_abilities(ty, &[])
+            .has_ability(Ability::Drop)
+    }
+}
+
+// ======================================================================================
+// Pattern coverage analysis
+
+/// Pattern coverage analysis is complicated by that patterns are
+/// matched sequentially (in contrast to so-called 'best fit' pattern matching).
+/// Consider the sequence of patterns from a match, `S{R{p}, q1}` and `S{_, q2}`.
+/// `R{p}` is only matched under the condition that `q1` is also matched. On
+/// the other hand, any arbitrary other value for the first parameter of `S` depends
+/// on that `q2` matches as well. These dependencies between patterns make it
+/// hard to decompose the analysis of completeness into independent sub-problems,
+/// and to apply some kind of algebraic simplification on patterns (e.g. something
+/// like `S{_, q1 | q2}` is _not_ equivalent to the above two patterns).
+///
+/// Another challenge in pattern coverage analysis is to produce useful error messages
+/// which show the counterexamples of missed patterns, but only up to the shape as the user
+/// has inspected values via patterns. For example, if the user has written `R{S{_}, _}`
+/// the counter example should not contain irrelevant other parts of the value (as e.g.
+/// in `R{T{x:_}, S}`). Moreover, patterns which can never be matched because there is
+/// a previous pattern which captures all covered values, should
+/// be reported, as dead code analysis will not determine this without flow dependent
+/// analysis.
+///
+/// The solution to those problems performs some kind of 'abstract interpretation'
+/// of what happens during matching at runtime.
+///
+/// 1. The type `ValueShape` represents both patterns, as partial,
+///    _abstract_ values to be matched against.
+/// 2. All patterns are translated to a list of pattern shapes.
+/// 3. The list of abstract values which are needed to explore coverage of the
+///    shapes in (2) is computed. Those values are only as detailed
+///    as needed to fully explore the pattern shapes.
+/// 4. For each abstract value, at least one matching pattern shape must exist,
+///    otherwise the value (its shape) is reported as missing. Also, a pattern must
+///    match at least one value to be reachable.
+///
+#[derive(Clone, PartialEq, Eq, PartialOrd, Ord)]
+enum ValueShape {
+    Any,
+    Tuple(Vec<ValueShape>),
+    // Struct(struct_id, optional_variant, argument_shapes)
+    Struct(QualifiedId<StructId>, Option<Symbol>, Vec<ValueShape>),
+}
+
+struct ValueShapeDisplay<'a> {
+    env: &'a GlobalEnv,
+    shape: &'a ValueShape,
+}
+
+impl ValueShape {
+    /// Main entrypoint for analyzing match coverage.
+    fn analyze_match_coverage<'a>(
+        env: &GlobalEnv,
+        value_exp_id: NodeId,
+        patterns: impl Iterator<Item = &'a Pattern>,
+    ) {
+        // Translate patterns into shapes
+        let pattern_shapes: Vec<(NodeId, ValueShape)> = patterns
+            .map(|p| (p.node_id(), ValueShape::for_pattern(p)))
+            .collect();
+        // Compute the set of abstract values which need to be matched.
+        let mut values = BTreeSet::new();
+        for (_, shape) in &pattern_shapes {
+            for partial_value in shape.possible_values(env) {
+                Self::join_value_shape(&mut values, partial_value)
+            }
+        }
+        // Now go over all patterns in sequence and incrementally remove matched
+        // values. If a pattern doesn't match any values, report it as unreachable.
+        for (pat_id, pattern_shape) in pattern_shapes {
+            let mut matched = false;
+            let mut remaining_values = BTreeSet::new();
+            while let Some(value) = values.pop_first() {
+                if value.instance_of(&pattern_shape) {
+                    matched = true;
+                } else {
+                    remaining_values.insert(value);
+                }
+            }
+            if !matched {
+                env.error(&env.get_node_loc(pat_id), "unreachable pattern");
+            }
+            values = remaining_values
+        }
+        // Finally, report any unmatched value shapes
+        if !values.is_empty() {
+            env.error_with_notes(
+                &env.get_node_loc(value_exp_id),
+                "match not exhaustive",
+                values
+                    .into_iter()
+                    .map(|s| format!("missing `{}`", s.display(env)))
+                    .collect(),
+            )
+        }
+    }
+
+    /// Creates a value shape from a pattern.
+    fn for_pattern(pat: &Pattern) -> ValueShape {
+        use Pattern::*;
+        match pat {
+            Var(_, _) | Wildcard(_) => ValueShape::Any,
+            Tuple(_, pats) => ValueShape::Tuple(pats.iter().map(Self::for_pattern).collect()),
+            Struct(_, sid, variant, pats) => ValueShape::Struct(
+                sid.to_qualified_id(),
+                *variant,
+                pats.iter().map(Self::for_pattern).collect(),
+            ),
+            Error(_) => ValueShape::Any,
+        }
+    }
+
+    /// Creates all value shapes needed to explore the given pattern shape's completeness.
+    fn possible_values(&self, env: &GlobalEnv) -> Vec<ValueShape> {
+        use ValueShape::*;
+        match self {
+            Any => vec![Any],
+            Tuple(args) => Self::possible_values_product(env, args)
+                .map(Tuple)
+                .collect(),
+            Struct(sid, variant, args) => {
+                let derived = if args.is_empty() {
+                    vec![Struct(*sid, *variant, vec![])]
+                } else {
+                    Self::possible_values_product(env, args)
+                        .map(|new_args| Struct(*sid, *variant, new_args))
+                        .collect_vec()
+                };
+                if let Some(v) = variant {
+                    // If this is a variant pattern, need to add all _other_ variants to
+                    // explore for completeness.
+                    let struct_env = env.get_struct(*sid);
+                    derived
+                        .into_iter()
+                        .chain(
+                            struct_env
+                                .get_variants()
+                                .filter(|other_variant| v != other_variant)
+                                .map(|other_variant| {
+                                    let field_count =
+                                        struct_env.get_fields_of_variant(other_variant).count();
+                                    Struct(
+                                        *sid,
+                                        Some(other_variant),
+                                        (0..field_count).map(|_| Any).collect(),
+                                    )
+                                }),
+                        )
+                        .collect()
+                } else {
+                    derived
+                }
+            },
+        }
+    }
+
+    /// From a slice of pattern shapes, construct all value shapes needed to explore completeness
+    /// of the slice. The cartesian product of all value shapes for each individual pattern is
+    /// returned. Note that this can lead to some computational complexity, but because of
+    /// the sequential character matching as discussed at the top of this section, this is
+    /// currently not known how to avoid.
+    fn possible_values_product(
+        env: &GlobalEnv,
+        shapes: &[ValueShape],
+    ) -> impl Iterator<Item = Vec<ValueShape>> {
+        shapes
+            .iter()
+            .map(|shape| shape.possible_values(env))
+            .multi_cartesian_product()
+    }
+
+    /// Attempt to join two shapes. If the join exists, it can be used in place of the others
+    /// to explore pattern completeness. For example, `join(R{v, _}, R{_, w}) == R{v,w}`.
+    fn try_join(&self, other: &ValueShape) -> Option<ValueShape> {
+        use ValueShape::*;
+        let unify_n = |shapes1: &[ValueShape], shapes2: &[ValueShape]| -> Option<Vec<ValueShape>> {
+            let mut result = vec![];
+            for (s1, s2) in shapes1.iter().zip(shapes2) {
+                if let Some(s) = s1.try_join(s2) {
+                    result.push(s);
+                    break;
+                }
+            }
+            if result.len() == shapes1.len() {
+                Some(result)
+            } else {
+                None
+            }
+        };
+        match (self, other) {
+            (Any, _) => Some(other.clone()),
+            (_, Any) => Some(self.clone()),
+            (Struct(sid1, var1, args1), Struct(sid2, var2, args2))
+                if sid1 == sid2 && var1 == var2 =>
+            {
+                unify_n(args1, args2).map(|args| Struct(*sid1, *var1, args))
+            },
+            (Tuple(args1), Tuple(args2)) => unify_n(args1, args2).map(Tuple),
+            _ => None,
+        }
+    }
+
+    /// Given a list of value shapes, join a new one. This attempts specializing existing shapes
+    /// via the join operator in order to keep the list minimal.
+    fn join_value_shape(set: &mut BTreeSet<ValueShape>, value: ValueShape) {
+        for v in set.iter() {
+            if let Some(unified) = v.try_join(&value) {
+                let v = v.clone(); // to free set
+                set.remove(&v);
+                set.insert(unified);
+                return;
+            }
+        }
+        set.insert(value);
+    }
+
+    /// Checks whether one shape is instance of another. It holds that
+    /// `s1.instance_of(s2) <==> s1.unify(s2) == Some(s1)`.
+    fn instance_of(&self, other: &ValueShape) -> bool {
+        use ValueShape::*;
+        match (self, other) {
+            (_, Any) => true,
+            (Tuple(args1), Tuple(args2)) => {
+                args1.iter().zip(args2).all(|(a1, a2)| a1.instance_of(a2))
+            },
+            (Struct(str1, variant1, args1), Struct(str2, variant2, args2))
+                if str1 == str2 && variant1 == variant2 =>
+            {
+                args1.iter().zip(args2).all(|(a1, a2)| a1.instance_of(a2))
+            },
+            _ => false,
+        }
+    }
+
+    fn display<'a>(&'a self, env: &'a GlobalEnv) -> ValueShapeDisplay<'a> {
+        ValueShapeDisplay { env, shape: self }
+    }
+}
+
+impl<'a> fmt::Display for ValueShapeDisplay<'a> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        use ValueShape::*;
+        let fmt_list = |list: &[ValueShape], sep: &str| {
+            list.iter()
+                .map(|s| s.display(self.env).to_string())
+                .join(sep)
+        };
+        match self.shape {
+            Any => write!(f, "_"),
+            Tuple(elems) => write!(f, "({})", fmt_list(elems, ",")),
+            Struct(sid, var, args) => {
+                let struct_env = self.env.get_struct(*sid);
+                write!(
+                    f,
+                    "{}",
+                    struct_env.get_name().display(self.env.symbol_pool())
+                )?;
+                if let Some(v) = var {
+                    write!(f, "::{}", v.display(self.env.symbol_pool()))?
+                }
+                if var.is_none() || !args.is_empty() {
+                    if args.iter().all(|a| matches!(a, Any)) {
+                        write!(f, "{{..}}")?
+                    } else {
+                        write!(
+                            f,
+                            "{{{}}}",
+                            struct_env
+                                .get_fields_optional_variant(*var)
+                                .map(|f| f.get_name().display(self.env.symbol_pool()).to_string())
+                                .zip(args.iter())
+                                .map(|(f, e)| format!("{}: {}", f, e.display(self.env)))
+                                .join(", ")
+                        )?
+                    }
+                }
+                Ok(())
+            },
+        }
+    }
 }
 
 // ======================================================================================
diff --git a/third_party/move/move-compiler-v2/src/cyclic_instantiation_checker.rs b/third_party/move/move-compiler-v2/src/cyclic_instantiation_checker.rs
index a143ce26602bb..c2651e2d1565e 100644
--- a/third_party/move/move-compiler-v2/src/cyclic_instantiation_checker.rs
+++ b/third_party/move/move-compiler-v2/src/cyclic_instantiation_checker.rs
@@ -175,7 +175,7 @@ impl<'a> CyclicInstantiationChecker<'a> {
         &self,
         nid: NodeId,
         callee: QualifiedInstId<FunId>,
-        callers_chain: &mut Vec<(Loc, QualifiedInstId<FunId>)>,
+        callers_chain: &mut [(Loc, QualifiedInstId<FunId>)],
     ) {
         let root = callers_chain[0].1.id;
         let mut labels = (0..callers_chain.len() - 1)
diff --git a/third_party/move/move-compiler-v2/src/env_pipeline/lambda_lifter.rs b/third_party/move/move-compiler-v2/src/env_pipeline/lambda_lifter.rs
index 10cf0e9c61aac..cb11736440a66 100644
--- a/third_party/move/move-compiler-v2/src/env_pipeline/lambda_lifter.rs
+++ b/third_party/move/move-compiler-v2/src/env_pipeline/lambda_lifter.rs
@@ -112,6 +112,7 @@ pub fn lift_lambdas(options: LambdaLiftingOptions, env: &mut GlobalEnv) {
                 fun_id.symbol(),
                 loc,
                 Visibility::Private,
+                false,
                 type_params,
                 params,
                 result_type,
diff --git a/third_party/move/move-compiler-v2/src/env_pipeline/spec_rewriter.rs b/third_party/move/move-compiler-v2/src/env_pipeline/spec_rewriter.rs
index baeb4125b9257..1077b7b3af83e 100644
--- a/third_party/move/move-compiler-v2/src/env_pipeline/spec_rewriter.rs
+++ b/third_party/move/move-compiler-v2/src/env_pipeline/spec_rewriter.rs
@@ -198,8 +198,8 @@ pub fn run_spec_rewriter(env: &mut GlobalEnv) {
         // Store result back
         for qid in scc {
             let decl_mut = env.get_spec_fun_mut(qid);
-            decl_mut.callees = transitive_callees.clone();
-            decl_mut.used_memory = transitive_usage.clone();
+            decl_mut.callees.clone_from(&transitive_callees);
+            decl_mut.used_memory.clone_from(&transitive_usage);
         }
     }
 
@@ -255,6 +255,7 @@ fn derive_spec_fun(env: &mut GlobalEnv, fun_id: QualifiedId<FunId>) -> Qualified
         body,
         callees: BTreeSet::new(),
         is_recursive: RefCell::new(None),
+        insts_using_generic_type_reflection: Default::default(),
     };
     env.add_spec_function_def(fun_id.module_id, decl)
 }
diff --git a/third_party/move/move-compiler-v2/src/experiments.rs b/third_party/move/move-compiler-v2/src/experiments.rs
index 6a75cebb01639..a92486d44e745 100644
--- a/third_party/move/move-compiler-v2/src/experiments.rs
+++ b/third_party/move/move-compiler-v2/src/experiments.rs
@@ -136,11 +136,22 @@ pub static EXPERIMENTS: Lazy<BTreeMap<String, Experiment>> = Lazy::new(|| {
             description: "Whether to run dead store and unreachable code elimination".to_string(),
             default: Inherited(Experiment::OPTIMIZE.to_string()),
         },
+        Experiment {
+            name: Experiment::PEEPHOLE_OPTIMIZATION.to_string(),
+            description: "Whether to run peephole optimization on generated file format"
+                .to_string(),
+            default: Inherited(Experiment::OPTIMIZE.to_string()),
+        },
         Experiment {
             name: Experiment::UNUSED_STRUCT_PARAMS_CHECK.to_string(),
             description: "Whether to check for unused struct type parameters".to_string(),
             default: Inherited(Experiment::CHECKS.to_string()),
         },
+        Experiment {
+            name: Experiment::UNUSED_ASSIGNMENT_CHECK.to_string(),
+            description: "Whether to check for unused assignments".to_string(),
+            default: Inherited(Experiment::CHECKS.to_string()),
+        },
         Experiment {
             name: Experiment::VARIABLE_COALESCING.to_string(),
             description: "Whether to run variable coalescing".to_string(),
@@ -207,6 +218,7 @@ impl Experiment {
     pub const KEEP_UNINIT_ANNOTATIONS: &'static str = "keep-uninit-annotations";
     pub const LAMBDA_LIFTING: &'static str = "lambda-lifting";
     pub const OPTIMIZE: &'static str = "optimize";
+    pub const PEEPHOLE_OPTIMIZATION: &'static str = "peephole-optimization";
     pub const RECURSIVE_TYPE_CHECK: &'static str = "recursive-type-check";
     pub const REFERENCE_SAFETY: &'static str = "reference-safety";
     pub const SEQS_IN_BINOPS_CHECK: &'static str = "seqs-in-binops-check";
@@ -214,6 +226,7 @@ impl Experiment {
     pub const SPEC_REWRITE: &'static str = "spec-rewrite";
     pub const SPLIT_CRITICAL_EDGES: &'static str = "split-critical-edges";
     pub const UNINITIALIZED_CHECK: &'static str = "uninitialized-check";
+    pub const UNUSED_ASSIGNMENT_CHECK: &'static str = "unused-assignment-check";
     pub const UNUSED_STRUCT_PARAMS_CHECK: &'static str = "unused-struct-params-check";
     pub const USAGE_CHECK: &'static str = "usage-check";
     pub const VARIABLE_COALESCING: &'static str = "variable-coalescing";
diff --git a/third_party/move/move-compiler-v2/src/file_format_generator/function_generator.rs b/third_party/move/move-compiler-v2/src/file_format_generator/function_generator.rs
index 2767f6e0befc0..1bfb4c3faeda3 100644
--- a/third_party/move/move-compiler-v2/src/file_format_generator/function_generator.rs
+++ b/third_party/move/move-compiler-v2/src/file_format_generator/function_generator.rs
@@ -2,9 +2,10 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{
+    experiments::Experiment,
     file_format_generator::{
         module_generator::{ModuleContext, ModuleGenerator, SOURCE_MAP_OK},
-        MAX_FUNCTION_DEF_COUNT, MAX_LOCAL_COUNT,
+        peephole_optimizer, Options, MAX_FUNCTION_DEF_COUNT, MAX_LOCAL_COUNT,
     },
     pipeline::livevar_analysis_processor::LiveVarAnnotation,
 };
@@ -16,6 +17,7 @@ use move_model::{
     ast::{ExpData, Spec, SpecBlockTarget, TempIndex},
     exp_rewriter::{ExpRewriter, ExpRewriterFunctions, RewriteTarget},
     model::{FunId, FunctionEnv, Loc, NodeId, Parameter, QualifiedId, StructId, TypeParameter},
+    symbol::Symbol,
     ty::{PrimitiveType, Type},
 };
 use move_stackless_bytecode::{
@@ -135,15 +137,27 @@ impl<'a> FunctionGenerator<'a> {
                 code: vec![],
             };
             let target = ctx.targets.get_target(&fun_env, &FunctionVariant::Baseline);
-            let code = fun_gen.gen_code(&FunctionContext {
+            let mut code = fun_gen.gen_code(&FunctionContext {
                 module: ctx.clone(),
                 fun: target,
                 loc: loc.clone(),
                 type_parameters: fun_env.get_type_parameters(),
                 def_idx,
             });
-            // Write the spec block table back to the environment.
-            if !fun_gen.spec_blocks.is_empty() {
+            if fun_gen.spec_blocks.is_empty() {
+                // Currently, peephole optimizations require that there are no inline spec blocks.
+                // This is to ensure that spec-related data structures do not refer to code
+                // offsets which could be changed by the peephole optimizer.
+                let options = ctx
+                    .env
+                    .get_extension::<Options>()
+                    .expect("Options is available");
+                if options.experiment_on(Experiment::PEEPHOLE_OPTIMIZATION) {
+                    // TODO: fix source mapping (#14167)
+                    peephole_optimizer::run(&mut code);
+                }
+            } else {
+                // Write the spec block table back to the environment.
                 fun_env.get_mut_spec().on_impl = fun_gen.spec_blocks;
             }
             (fun_gen.gen, Some(code))
@@ -357,7 +371,7 @@ impl<'a> FunctionGenerator<'a> {
             .insert(offset);
     }
 
-    /// Sets the resolution of a lable to the current code offset.
+    /// Sets the resolution of a label to the current code offset.
     fn define_label(&mut self, label: Label) {
         let offset = self.code.len() as FF::CodeOffset;
         self.label_info.entry(label).or_default().resolution = Some(offset)
@@ -388,6 +402,18 @@ impl<'a> FunctionGenerator<'a> {
                     FF::Bytecode::PackGeneric,
                 );
             },
+            Operation::PackVariant(mid, sid, variant, inst) => {
+                self.gen_struct_variant_oper(
+                    ctx,
+                    dest,
+                    mid.qualified(*sid),
+                    *variant,
+                    inst,
+                    source,
+                    FF::Bytecode::PackVariant,
+                    FF::Bytecode::PackVariantGeneric,
+                );
+            },
             Operation::Unpack(mid, sid, inst) => {
                 self.gen_struct_oper(
                     ctx,
@@ -399,6 +425,30 @@ impl<'a> FunctionGenerator<'a> {
                     FF::Bytecode::UnpackGeneric,
                 );
             },
+            Operation::UnpackVariant(mid, sid, variant, inst) => {
+                self.gen_struct_variant_oper(
+                    ctx,
+                    dest,
+                    mid.qualified(*sid),
+                    *variant,
+                    inst,
+                    source,
+                    FF::Bytecode::UnpackVariant,
+                    FF::Bytecode::UnpackVariantGeneric,
+                );
+            },
+            Operation::TestVariant(mid, sid, variant, inst) => {
+                self.gen_struct_variant_oper(
+                    ctx,
+                    dest,
+                    mid.qualified(*sid),
+                    *variant,
+                    inst,
+                    source,
+                    FF::Bytecode::TestVariant,
+                    FF::Bytecode::TestVariantGeneric,
+                );
+            },
             Operation::MoveTo(mid, sid, inst) => {
                 self.gen_struct_oper(
                     ctx,
@@ -447,6 +497,18 @@ impl<'a> FunctionGenerator<'a> {
                     dest,
                     mid.qualified(*sid),
                     inst.clone(),
+                    None,
+                    *offset,
+                    source,
+                );
+            },
+            Operation::BorrowVariantField(mid, sid, variants, inst, offset) => {
+                self.gen_borrow_field(
+                    ctx,
+                    dest,
+                    mid.qualified(*sid),
+                    inst.clone(),
+                    Some(variants),
                     *offset,
                     source,
                 );
@@ -631,6 +693,39 @@ impl<'a> FunctionGenerator<'a> {
         self.abstract_push_result(ctx, dest);
     }
 
+    fn gen_struct_variant_oper(
+        &mut self,
+        ctx: &BytecodeContext,
+        dest: &[TempIndex],
+        id: QualifiedId<StructId>,
+        variant: Symbol,
+        inst: &[Type],
+        source: &[TempIndex],
+        mk_simple: impl FnOnce(FF::StructVariantHandleIndex) -> FF::Bytecode,
+        mk_generic: impl FnOnce(FF::StructVariantInstantiationIndex) -> FF::Bytecode,
+    ) {
+        let fun_ctx = ctx.fun_ctx;
+        self.abstract_push_args(ctx, source, None);
+        let struct_env = &fun_ctx.module.env.get_struct(id);
+        if inst.is_empty() {
+            let idx =
+                self.gen
+                    .struct_variant_index(&fun_ctx.module, &fun_ctx.loc, struct_env, variant);
+            self.emit(mk_simple(idx))
+        } else {
+            let idx = self.gen.struct_variant_inst_index(
+                &fun_ctx.module,
+                &fun_ctx.loc,
+                struct_env,
+                variant,
+                inst.to_vec(),
+            );
+            self.emit(mk_generic(idx))
+        }
+        self.abstract_pop_n(ctx, source.len());
+        self.abstract_push_result(ctx, dest);
+    }
+
     /// Generate code for the borrow-field instruction.
     fn gen_borrow_field(
         &mut self,
@@ -638,31 +733,65 @@ impl<'a> FunctionGenerator<'a> {
         dest: &[TempIndex],
         id: QualifiedId<StructId>,
         inst: Vec<Type>,
+        variants: Option<&[Symbol]>,
         offset: usize,
         source: &[TempIndex],
     ) {
         let fun_ctx = ctx.fun_ctx;
         self.abstract_push_args(ctx, source, None);
         let struct_env = &fun_ctx.module.env.get_struct(id);
-        let field_env = &struct_env.get_field_by_offset(offset);
         let is_mut = fun_ctx.fun.get_local_type(dest[0]).is_mutable_reference();
-        if inst.is_empty() {
-            let idx = self
-                .gen
-                .field_index(&fun_ctx.module, &fun_ctx.loc, field_env);
-            if is_mut {
-                self.emit(FF::Bytecode::MutBorrowField(idx))
+
+        if let Some(variants) = variants {
+            assert!(!variants.is_empty());
+            let field_env =
+                &struct_env.get_field_by_offset_optional_variant(Some(variants[0]), offset);
+            if inst.is_empty() {
+                let idx = self.gen.variant_field_index(
+                    &fun_ctx.module,
+                    &fun_ctx.loc,
+                    variants,
+                    field_env,
+                );
+                if is_mut {
+                    self.emit(FF::Bytecode::MutBorrowVariantField(idx))
+                } else {
+                    self.emit(FF::Bytecode::ImmBorrowVariantField(idx))
+                }
             } else {
-                self.emit(FF::Bytecode::ImmBorrowField(idx))
+                let idx = self.gen.variant_field_inst_index(
+                    &fun_ctx.module,
+                    &fun_ctx.loc,
+                    variants,
+                    field_env,
+                    inst,
+                );
+                if is_mut {
+                    self.emit(FF::Bytecode::MutBorrowVariantFieldGeneric(idx))
+                } else {
+                    self.emit(FF::Bytecode::ImmBorrowVariantFieldGeneric(idx))
+                }
             }
         } else {
-            let idx = self
-                .gen
-                .field_inst_index(&fun_ctx.module, &fun_ctx.loc, field_env, inst);
-            if is_mut {
-                self.emit(FF::Bytecode::MutBorrowFieldGeneric(idx))
+            let field_env = &struct_env.get_field_by_offset_optional_variant(None, offset);
+            if inst.is_empty() {
+                let idx = self
+                    .gen
+                    .field_index(&fun_ctx.module, &fun_ctx.loc, field_env);
+                if is_mut {
+                    self.emit(FF::Bytecode::MutBorrowField(idx))
+                } else {
+                    self.emit(FF::Bytecode::ImmBorrowField(idx))
+                }
             } else {
-                self.emit(FF::Bytecode::ImmBorrowFieldGeneric(idx))
+                let idx = self
+                    .gen
+                    .field_inst_index(&fun_ctx.module, &fun_ctx.loc, field_env, inst);
+                if is_mut {
+                    self.emit(FF::Bytecode::MutBorrowFieldGeneric(idx))
+                } else {
+                    self.emit(FF::Bytecode::ImmBorrowFieldGeneric(idx))
+                }
             }
         }
         self.abstract_pop_n(ctx, source.len());
@@ -720,12 +849,7 @@ impl<'a> FunctionGenerator<'a> {
         }
     }
 
-    fn gen_vector_load_push(
-        &mut self,
-        ctx: &BytecodeContext,
-        vec: &Vec<Constant>,
-        vec_type: &Type,
-    ) {
+    fn gen_vector_load_push(&mut self, ctx: &BytecodeContext, vec: &[Constant], vec_type: &Type) {
         let fun_ctx = ctx.fun_ctx;
         let elem_type = if let Type::Vector(el) = vec_type {
             el.as_ref().clone()
@@ -997,7 +1121,10 @@ impl<'a> FunctionGenerator<'a> {
 impl<'env> FunctionContext<'env> {
     /// Emits an internal error for this function.
     pub fn internal_error(&self, msg: impl AsRef<str>) {
-        self.module.internal_error(&self.loc, msg)
+        self.module.internal_error(
+            &self.loc,
+            format!("file format generator: {}", msg.as_ref()),
+        )
     }
 
     /// Gets the type of the temporary.
diff --git a/third_party/move/move-compiler-v2/src/file_format_generator/mod.rs b/third_party/move/move-compiler-v2/src/file_format_generator/mod.rs
index 2143de5397d3c..375c3c206f1bd 100644
--- a/third_party/move/move-compiler-v2/src/file_format_generator/mod.rs
+++ b/third_party/move/move-compiler-v2/src/file_format_generator/mod.rs
@@ -3,6 +3,7 @@
 
 mod function_generator;
 mod module_generator;
+mod peephole_optimizer;
 
 use crate::{file_format_generator::module_generator::ModuleContext, options::Options, Experiment};
 use module_generator::ModuleGenerator;
@@ -145,6 +146,8 @@ const MAX_STRUCT_COUNT: usize = FF::TableIndex::MAX as usize;
 const MAX_SIGNATURE_COUNT: usize = FF::TableIndex::MAX as usize;
 const MAX_STRUCT_DEF_COUNT: usize = FF::TableIndex::MAX as usize;
 const MAX_STRUCT_DEF_INST_COUNT: usize = FF::TableIndex::MAX as usize;
+const MAX_STRUCT_VARIANT_COUNT: usize = FF::TableIndex::MAX as usize;
+const MAX_STRUCT_VARIANT_INST_COUNT: usize = FF::TableIndex::MAX as usize;
 const MAX_FIELD_COUNT: usize = FF::TableIndex::MAX as usize;
 const MAX_FIELD_INST_COUNT: usize = FF::TableIndex::MAX as usize;
 const MAX_FUNCTION_COUNT: usize = FF::TableIndex::MAX as usize;
diff --git a/third_party/move/move-compiler-v2/src/file_format_generator/module_generator.rs b/third_party/move/move-compiler-v2/src/file_format_generator/module_generator.rs
index cc8648e06d356..8a4d2be6e437c 100644
--- a/third_party/move/move-compiler-v2/src/file_format_generator/module_generator.rs
+++ b/third_party/move/move-compiler-v2/src/file_format_generator/module_generator.rs
@@ -6,11 +6,12 @@ use crate::{
         function_generator::FunctionGenerator, MAX_ADDRESS_COUNT, MAX_CONST_COUNT, MAX_FIELD_COUNT,
         MAX_FIELD_INST_COUNT, MAX_FUNCTION_COUNT, MAX_FUNCTION_INST_COUNT, MAX_IDENTIFIER_COUNT,
         MAX_MODULE_COUNT, MAX_SIGNATURE_COUNT, MAX_STRUCT_COUNT, MAX_STRUCT_DEF_COUNT,
-        MAX_STRUCT_DEF_INST_COUNT,
+        MAX_STRUCT_DEF_INST_COUNT, MAX_STRUCT_VARIANT_COUNT, MAX_STRUCT_VARIANT_INST_COUNT,
     },
     Experiment, Options,
 };
 use codespan_reporting::diagnostic::Severity;
+use itertools::Itertools;
 use move_binary_format::{
     file_format as FF,
     file_format::{AccessKind, FunctionHandle, ModuleHandle, StructDefinitionIndex, TableIndex},
@@ -77,6 +78,22 @@ pub struct ModuleGenerator {
     types_to_signature: BTreeMap<Vec<Type>, FF::SignatureIndex>,
     /// A mapping from constants sequences (with the corresponding type information) to pool indices.
     cons_to_idx: BTreeMap<(Constant, Type), FF::ConstantPoolIndex>,
+    variant_field_to_idx:
+        BTreeMap<(QualifiedId<StructId>, Vec<Symbol>, usize), FF::VariantFieldHandleIndex>,
+    variant_field_inst_to_idx: BTreeMap<
+        (
+            QualifiedId<StructId>,
+            Vec<Symbol>,
+            usize,
+            FF::SignatureIndex,
+        ),
+        FF::VariantFieldInstantiationIndex,
+    >,
+    struct_variant_to_idx: BTreeMap<(QualifiedId<StructId>, Symbol), FF::StructVariantHandleIndex>,
+    struct_variant_inst_to_idx: BTreeMap<
+        (QualifiedId<StructId>, Symbol, FF::SignatureIndex),
+        FF::StructVariantInstantiationIndex,
+    >,
     /// The file-format module we are building.
     pub module: FF::CompiledModule,
     /// The source map for the module.
@@ -105,7 +122,7 @@ impl ModuleGenerator {
     ) -> (FF::CompiledModule, SourceMap, Option<FF::FunctionHandle>) {
         let options = module_env.env.get_extension::<Options>().expect("options");
         let language_version = options.language_version.unwrap_or_default();
-        let gen_access_specifiers = language_version >= LanguageVersion::V2_0
+        let gen_access_specifiers = language_version.is_at_least(LanguageVersion::V2_0)
             && options.experiment_on(Experiment::GEN_ACCESS_SPECIFIERS);
         let compilation_metadata =
             CompilationMetadata::new(CompilerVersion::V2_0, language_version);
@@ -115,7 +132,7 @@ impl ModuleGenerator {
                 .expect("Serialization of CompilationMetadata should succeed"),
         };
         let module = move_binary_format::CompiledModule {
-            version: file_format_common::VERSION_NEXT,
+            version: file_format_common::VERSION_MAX,
             self_module_handle_idx: FF::ModuleHandleIndex(0),
             metadata: vec![metadata],
             ..Default::default()
@@ -147,6 +164,10 @@ impl ModuleGenerator {
             field_inst_to_idx: Default::default(),
             types_to_signature: Default::default(),
             cons_to_idx: Default::default(),
+            variant_field_to_idx: Default::default(),
+            variant_field_inst_to_idx: Default::default(),
+            struct_variant_to_idx: Default::default(),
+            struct_variant_inst_to_idx: Default::default(),
             fun_inst_to_idx: Default::default(),
             main_handle: None,
             script_handle: None,
@@ -216,21 +237,26 @@ impl ModuleGenerator {
                 .expect(SOURCE_MAP_OK);
         }
         let struct_handle = self.struct_index(ctx, loc, struct_env);
-        let fields = struct_env.get_fields();
-        let field_information = FF::StructFieldInformation::Declared(
-            fields
-                .map(|f| {
-                    let field_loc = f.get_loc();
-                    self.source_map
-                        .add_struct_field_mapping(def_idx, ctx.env.to_ir_loc(field_loc))
-                        .expect(SOURCE_MAP_OK);
-                    let name = self.name_index(ctx, field_loc, f.get_name());
-                    let signature =
-                        FF::TypeSignature(self.signature_token(ctx, loc, &f.get_type()));
-                    FF::FieldDefinition { name, signature }
+        let field_information = if struct_env.has_variants() {
+            let variants = struct_env
+                .get_variants()
+                .map(|v| FF::VariantDefinition {
+                    name: self.name_index(ctx, struct_env.get_variant_loc(v), v),
+                    fields: struct_env
+                        .get_fields_of_variant(v)
+                        .map(|f| self.field(ctx, def_idx, &f))
+                        .collect_vec(),
                 })
-                .collect(),
-        );
+                .collect_vec();
+            FF::StructFieldInformation::DeclaredVariants(variants)
+        } else if struct_env.is_native() {
+            FF::StructFieldInformation::Native
+        } else {
+            let fields = struct_env.get_fields();
+            FF::StructFieldInformation::Declared(
+                fields.map(|f| self.field(ctx, def_idx, &f)).collect(),
+            )
+        };
         let def = FF::StructDefinition {
             struct_handle,
             field_information,
@@ -238,6 +264,31 @@ impl ModuleGenerator {
         self.module.struct_defs.push(def)
     }
 
+    fn field(
+        &mut self,
+        ctx: &ModuleContext,
+        struct_def_idx: StructDefinitionIndex,
+        field_env: &FieldEnv,
+    ) -> FF::FieldDefinition {
+        let field_loc = field_env.get_loc();
+        let variant_idx = field_env
+            .get_variant()
+            .and_then(|v| field_env.struct_env.get_variant_idx(v));
+        self.source_map
+            .add_struct_field_mapping(struct_def_idx, variant_idx, ctx.env.to_ir_loc(field_loc))
+            .expect(SOURCE_MAP_OK);
+        let mut field_symbol = field_env.get_name();
+        let field_name = ctx.symbol_to_str(field_symbol);
+        // Append `_` if this is a positional field (digits), as the binary format expects proper identifiers
+        if field_name.starts_with(|c: char| c.is_ascii_digit()) {
+            field_symbol = ctx.env.symbol_pool().make(&format!("_{}", field_name));
+        }
+        let name = self.name_index(ctx, field_loc, field_symbol);
+        let signature =
+            FF::TypeSignature(self.signature_token(ctx, field_loc, &field_env.get_type()));
+        FF::FieldDefinition { name, signature }
+    }
+
     /// Obtains or creates an index for a signature, a sequence of types.
     pub fn signature(
         &mut self,
@@ -759,6 +810,140 @@ impl ModuleGenerator {
         field_inst_idx
     }
 
+    /// Obtains or creates a variant field handle index.
+    pub fn variant_field_index(
+        &mut self,
+        ctx: &ModuleContext,
+        loc: &Loc,
+        variants: &[Symbol],
+        field_env: &FieldEnv,
+    ) -> FF::VariantFieldHandleIndex {
+        let key = (
+            field_env.struct_env.get_qualified_id(),
+            variants.to_vec(),
+            field_env.get_offset(),
+        );
+        if let Some(idx) = self.variant_field_to_idx.get(&key) {
+            return *idx;
+        }
+        let field_idx = FF::VariantFieldHandleIndex(ctx.checked_bound(
+            loc,
+            self.module.variant_field_handles.len(),
+            MAX_FIELD_COUNT,
+            "variant field",
+        ));
+        let variant_offsets = variants
+            .iter()
+            .filter_map(|v| field_env.struct_env.get_variant_idx(*v))
+            .collect_vec();
+        let owner = self.struct_def_index(ctx, loc, &field_env.struct_env);
+        self.module
+            .variant_field_handles
+            .push(FF::VariantFieldHandle {
+                struct_index: owner,
+                variants: variant_offsets,
+                field: field_env.get_offset() as FF::MemberCount,
+            });
+        self.variant_field_to_idx.insert(key, field_idx);
+        field_idx
+    }
+
+    /// Obtains or creates a variant field instantiation handle index.
+    pub fn variant_field_inst_index(
+        &mut self,
+        ctx: &ModuleContext,
+        loc: &Loc,
+        variants: &[Symbol],
+        field_env: &FieldEnv,
+        inst: Vec<Type>,
+    ) -> FF::VariantFieldInstantiationIndex {
+        let type_parameters = self.signature(ctx, loc, inst);
+        let key = (
+            field_env.struct_env.get_qualified_id(),
+            variants.to_vec(),
+            field_env.get_offset(),
+            type_parameters,
+        );
+        if let Some(idx) = self.variant_field_inst_to_idx.get(&key) {
+            return *idx;
+        }
+        let idx = FF::VariantFieldInstantiationIndex(ctx.checked_bound(
+            loc,
+            self.module.variant_field_instantiations.len(),
+            MAX_FIELD_INST_COUNT,
+            "variant field instantiation",
+        ));
+        let handle = self.variant_field_index(ctx, loc, variants, field_env);
+        self.module
+            .variant_field_instantiations
+            .push(FF::VariantFieldInstantiation {
+                handle,
+                type_parameters,
+            });
+        self.variant_field_inst_to_idx.insert(key, idx);
+        idx
+    }
+
+    /// Obtains or creates a struct variant handle index.
+    pub fn struct_variant_index(
+        &mut self,
+        ctx: &ModuleContext,
+        loc: &Loc,
+        struct_env: &StructEnv,
+        variant: Symbol,
+    ) -> FF::StructVariantHandleIndex {
+        let key = (struct_env.get_qualified_id(), variant);
+        if let Some(idx) = self.struct_variant_to_idx.get(&key) {
+            return *idx;
+        }
+        let idx = FF::StructVariantHandleIndex(ctx.checked_bound(
+            loc,
+            self.module.struct_variant_handles.len(),
+            MAX_STRUCT_VARIANT_COUNT,
+            "struct variant",
+        ));
+        let struct_index = self.struct_def_index(ctx, loc, struct_env);
+        self.module
+            .struct_variant_handles
+            .push(FF::StructVariantHandle {
+                struct_index,
+                variant: struct_env.get_variant_idx(variant).expect("variant idx"),
+            });
+        self.struct_variant_to_idx.insert(key, idx);
+        idx
+    }
+
+    /// Obtains or creates a struct variant instantiation index.
+    pub fn struct_variant_inst_index(
+        &mut self,
+        ctx: &ModuleContext,
+        loc: &Loc,
+        struct_env: &StructEnv,
+        variant: Symbol,
+        inst: Vec<Type>,
+    ) -> FF::StructVariantInstantiationIndex {
+        let type_parameters = self.signature(ctx, loc, inst);
+        let key = (struct_env.get_qualified_id(), variant, type_parameters);
+        if let Some(idx) = self.struct_variant_inst_to_idx.get(&key) {
+            return *idx;
+        }
+        let idx = FF::StructVariantInstantiationIndex(ctx.checked_bound(
+            loc,
+            self.module.struct_variant_instantiations.len(),
+            MAX_STRUCT_VARIANT_INST_COUNT,
+            "struct variant instantiation",
+        ));
+        let handle = self.struct_variant_index(ctx, loc, struct_env, variant);
+        self.module
+            .struct_variant_instantiations
+            .push(FF::StructVariantInstantiation {
+                handle,
+                type_parameters,
+            });
+        self.struct_variant_inst_to_idx.insert(key, idx);
+        idx
+    }
+
     /// Obtains or generates a constant index.
     pub fn constant_index(
         &mut self,
diff --git a/third_party/move/move-compiler-v2/src/file_format_generator/peephole_optimizer.rs b/third_party/move/move-compiler-v2/src/file_format_generator/peephole_optimizer.rs
new file mode 100644
index 0000000000000..12490558c89b0
--- /dev/null
+++ b/third_party/move/move-compiler-v2/src/file_format_generator/peephole_optimizer.rs
@@ -0,0 +1,91 @@
+// Copyright (c) Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module contains the peephole optimizer for the Move file format bytecode.
+//! Peephole optimizations assume that the bytecode is valid, and all user-facing
+//! error checks have already been performed.
+
+pub mod inefficient_binops;
+pub mod optimizers;
+pub mod reducible_pairs;
+
+use inefficient_binops::TransformInefficientBinops;
+use move_binary_format::{
+    control_flow_graph::{ControlFlowGraph, VMControlFlowGraph},
+    file_format::{Bytecode, CodeOffset, CodeUnit},
+};
+use optimizers::{BasicBlockOptimizer, FixedWindowProcessor};
+use reducible_pairs::ReduciblePairs;
+use std::{collections::BTreeMap, mem};
+
+/// Pre-requisite: `code` should not have spec block associations.
+/// Run peephole optimizers on the given `code`, possibly modifying it.
+pub fn run(code: &mut CodeUnit) {
+    let original_code = mem::take(&mut code.code);
+    code.code = BasicBlockOptimizerPipeline::default().optimize(original_code);
+}
+
+/// A pipeline of basic block optimizers.
+/// Each optimizer is applied to each basic block in the code, in order.
+struct BasicBlockOptimizerPipeline {
+    optimizers: Vec<Box<dyn BasicBlockOptimizer>>,
+}
+
+impl BasicBlockOptimizerPipeline {
+    /// Default optimization pipeline of basic block optimizers.
+    pub fn default() -> Self {
+        Self {
+            optimizers: vec![
+                Box::new(FixedWindowProcessor::new(ReduciblePairs)),
+                Box::new(FixedWindowProcessor::new(TransformInefficientBinops)),
+            ],
+        }
+    }
+
+    /// Run the basic block optimization pipeline on the given `code`,
+    /// returning new (possibly optimized) code.
+    pub fn optimize(&self, code: Vec<Bytecode>) -> Vec<Bytecode> {
+        Self::flatten_blocks(self.get_optimized_blocks(&code))
+    }
+
+    /// Returns a mapping from the original code's basic block start offsets to the optimized
+    /// basic blocks.
+    fn get_optimized_blocks(&self, code: &[Bytecode]) -> BTreeMap<CodeOffset, Vec<Bytecode>> {
+        let cfg = VMControlFlowGraph::new(code);
+        let mut optimized_blocks = BTreeMap::new();
+        for block_id in cfg.blocks() {
+            let start = cfg.block_start(block_id);
+            let end = cfg.block_end(block_id); // `end` is inclusive
+            let mut block = code[start as usize..=end as usize].to_vec();
+            for bb_optimizer in self.optimizers.iter() {
+                block = bb_optimizer.optimize(&block);
+            }
+            optimized_blocks.insert(start, block);
+        }
+        optimized_blocks
+    }
+
+    /// Flatten the individually optimized basic blocks into a single code vector.
+    fn flatten_blocks(optimized_blocks: BTreeMap<CodeOffset, Vec<Bytecode>>) -> Vec<Bytecode> {
+        let mut optimized_code = vec![];
+        let mut block_mapping = BTreeMap::new();
+        for (offset, mut block) in optimized_blocks {
+            block_mapping.insert(offset, optimized_code.len() as CodeOffset);
+            optimized_code.append(&mut block);
+        }
+        Self::remap_branch_targets(&mut optimized_code, &block_mapping);
+        optimized_code
+    }
+
+    /// Use `remap` to update branch targets in the given `code`.
+    fn remap_branch_targets(code: &mut [Bytecode], remap: &BTreeMap<CodeOffset, CodeOffset>) {
+        for bc in code.iter_mut() {
+            match bc {
+                Bytecode::Branch(offset) | Bytecode::BrTrue(offset) | Bytecode::BrFalse(offset) => {
+                    *offset = *remap.get(offset).expect("mapping should exist");
+                },
+                _ => {},
+            }
+        }
+    }
+}
diff --git a/third_party/move/move-compiler-v2/src/file_format_generator/peephole_optimizer/inefficient_binops.rs b/third_party/move/move-compiler-v2/src/file_format_generator/peephole_optimizer/inefficient_binops.rs
new file mode 100644
index 0000000000000..83ac33aa387f5
--- /dev/null
+++ b/third_party/move/move-compiler-v2/src/file_format_generator/peephole_optimizer/inefficient_binops.rs
@@ -0,0 +1,51 @@
+// Copyright (c) Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module contains a fixed window peephole optimizer for the Move bytecode.
+//! As with all peephole optimizers here, it assumes that the bytecode is valid.
+//!
+//! We consider fixed windows of size 5 for this optimizer.
+//!
+//! This optimizer addresses a commonly appearing pattern when compiling binary
+//! operations where the second operand to the operation is a constant.
+//!
+//! The pattern is:
+//! 1. Load the constant (second operand) on the stack.
+//! 2. Store the constant in a local `u`.
+//! 3. Copy or Move some value on the stack (first operand) from local `v`.
+//! 4. Move the constant from `u` back to the stack (second operand).
+//!
+//! We replace it with:
+//! 1. Copy or Move the first operand to the stack.
+//! 2. Load the constant (second operand) on the stack.
+//!
+//! This transformation leaves the stack in the same state.
+//! The local `u` in the original code has been moved from, so later code
+//! cannot use it without a subsequent store.
+//! So, not writing back to `u` is safe, as long as `u` != `v`.
+
+use crate::file_format_generator::peephole_optimizer::optimizers::FixedWindowOptimizer;
+use move_binary_format::file_format::Bytecode;
+
+pub struct TransformInefficientBinops;
+
+impl FixedWindowOptimizer for TransformInefficientBinops {
+    fn fixed_window_size(&self) -> usize {
+        4
+    }
+
+    fn optimize_fixed_window(&self, window: &[Bytecode]) -> Option<Vec<Bytecode>> {
+        use Bytecode::*;
+        // See module documentation for more behind the rationale.
+        match (&window[0], &window[1], &window[2], &window[3]) {
+            (
+                LdU8(_) | LdU16(_) | LdU32(_) | LdU64(_) | LdU128(_) | LdU256(_) | LdConst(_)
+                | LdTrue | LdFalse,
+                StLoc(u),
+                CopyLoc(v) | MoveLoc(v),
+                MoveLoc(w),
+            ) if *u == *w && *u != *v => Some(vec![window[2].clone(), window[0].clone()]),
+            _ => None,
+        }
+    }
+}
diff --git a/third_party/move/move-compiler-v2/src/file_format_generator/peephole_optimizer/optimizers.rs b/third_party/move/move-compiler-v2/src/file_format_generator/peephole_optimizer/optimizers.rs
new file mode 100644
index 0000000000000..7a6fb10817079
--- /dev/null
+++ b/third_party/move/move-compiler-v2/src/file_format_generator/peephole_optimizer/optimizers.rs
@@ -0,0 +1,76 @@
+// Copyright (c) Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module contains setup for basic block peephole optimizers.
+
+use move_binary_format::file_format::Bytecode;
+
+/// A basic block optimizer that optimizes a basic block of bytecode.
+pub trait BasicBlockOptimizer {
+    /// Given a basic `block`, return its optimized version.
+    fn optimize(&self, block: &[Bytecode]) -> Vec<Bytecode>;
+}
+
+/// An optimizer for a fixed window of bytecode.
+/// The fixed window can be assumed to be within a basic block.
+pub trait FixedWindowOptimizer {
+    /// The fixed window size for this optimizer.
+    fn fixed_window_size(&self) -> usize;
+
+    /// Given a fixed `window` of bytecode of size `self.fixed_window_size()`,
+    /// optionally return its optimized version.
+    /// If `None` is returned, the `window` is not optimized.
+    fn optimize_fixed_window(&self, window: &[Bytecode]) -> Option<Vec<Bytecode>>;
+}
+
+/// A processor to perform fixed window optimizations of a particular style on a basic block.
+pub struct FixedWindowProcessor<T: FixedWindowOptimizer>(T);
+
+impl<T: FixedWindowOptimizer> BasicBlockOptimizer for FixedWindowProcessor<T> {
+    fn optimize(&self, block: &[Bytecode]) -> Vec<Bytecode> {
+        let mut old_block = block.to_vec();
+        // Run single passes until code stops changing.
+        while let Some(new_block) = self.optimize_single_pass(&old_block) {
+            old_block = new_block;
+        }
+        old_block
+    }
+}
+
+impl<T: FixedWindowOptimizer> FixedWindowProcessor<T> {
+    /// Create a new `FixedWindowProcessor` with the given `optimizer`.
+    pub fn new(optimizer: T) -> Self {
+        Self(optimizer)
+    }
+
+    /// Run a single pass of fixed window peephole optimization on the given basic `block`.
+    /// If the block cannot be optimized further, return `None`.
+    fn optimize_single_pass(&self, block: &[Bytecode]) -> Option<Vec<Bytecode>> {
+        let window_size = self.0.fixed_window_size();
+        let mut changed = false;
+        let mut new_block: Vec<Bytecode> = vec![];
+        let mut left = 0;
+        while left < block.len() {
+            let right = left + window_size;
+            if right > block.len() {
+                // At the end, not enough instructions to form a fixed window.
+                new_block.extend(block[left..].to_vec());
+                break;
+            }
+            let window = &block[left..right];
+            if let Some(optimized_window) = self.0.optimize_fixed_window(window) {
+                new_block.extend(optimized_window);
+                left = right;
+                changed = true;
+            } else {
+                new_block.push(block[left].clone());
+                left += 1;
+            }
+        }
+        if changed {
+            Some(new_block)
+        } else {
+            None
+        }
+    }
+}
diff --git a/third_party/move/move-compiler-v2/src/file_format_generator/peephole_optimizer/reducible_pairs.rs b/third_party/move/move-compiler-v2/src/file_format_generator/peephole_optimizer/reducible_pairs.rs
new file mode 100644
index 0000000000000..6b80a50319e31
--- /dev/null
+++ b/third_party/move/move-compiler-v2/src/file_format_generator/peephole_optimizer/reducible_pairs.rs
@@ -0,0 +1,65 @@
+// Copyright (c) Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module contains a fixed window peephole optimizer for the Move bytecode.
+//! As with all peephole optimizers here, it assumes that the bytecode is valid.
+//!
+//! We consider fixed windows of size 2 for this optimizer.
+//!
+//! To reason about the correctness of the optimizations, we need to think about the
+//! effect on (1) the stack, (2) the locals, (3) control flow behavior.
+//!
+//! Below are the implemented optimizations (which all retain the control flow behavior):
+//! 1. `StLoc` and `MoveLoc` of the same local `l`: Remove the pair.
+//!    - stack is left unaffected (the top remains the same)
+//!    - local `l` would not be accessed again (without a future store), because before
+//!      the transformation, the value in it has been moved from, leaving it invalid.
+//! 2. `CopyLoc` and `StLoc` of the same local `l`: Remove the pair.
+//!    - stack is left unaffected
+//!    - local `l` has the same valid value as before.
+//! 3. `MoveLoc` and `StLoc` of the same local `l`: Remove the pair.
+//!    - stack is left unaffected
+//!    - local `l` has the same valid value as before.
+//! 4. `CopyLoc` followed by `Pop`: Remove the pair.
+//!    - stack is left unaffected (value is copied to the top and then removed)
+//!    - local is unaffected: it still has a valid value because of copy.
+//! 5. [`LdTrue`, `BrTrue`] or [`LdFalse`, `BrFalse`]: Replace with `Branch` to the same
+//!    target.
+//!    - stack is left unaffected (the first instruction pushes a constant, the second
+//!      takes it off).
+//!    - locals are unaffected.
+//! 6. [`Not`, `BrFalse`] or [`Not`, `BrTrue`]: Replace with `BrTrue` or `BrFalse`.
+//!    - stack is left unaffected (first instruction negates the top, second takes it
+//!      off, vs. just take off the top).
+//!    - locals are unaffected.
+//!
+//! Finally, note that fixed window optimizations are performed on windows within a basic
+//! block, not spanning across multiple basic blocks.
+
+use crate::file_format_generator::peephole_optimizer::optimizers::FixedWindowOptimizer;
+use move_binary_format::file_format::Bytecode;
+
+pub struct ReduciblePairs;
+
+impl FixedWindowOptimizer for ReduciblePairs {
+    fn fixed_window_size(&self) -> usize {
+        2
+    }
+
+    fn optimize_fixed_window(&self, window: &[Bytecode]) -> Option<Vec<Bytecode>> {
+        use Bytecode::*;
+        // See module documentation for the reasoning behind these optimizations.
+        match (&window[0], &window[1]) {
+            (StLoc(u), MoveLoc(v)) | (CopyLoc(u), StLoc(v)) | (MoveLoc(u), StLoc(v))
+                if *u == *v =>
+            {
+                Some(vec![])
+            },
+            (CopyLoc(_), Pop) => Some(vec![]),
+            (LdTrue, BrTrue(target)) | (LdFalse, BrFalse(target)) => Some(vec![Branch(*target)]),
+            (Not, BrFalse(target)) => Some(vec![BrTrue(*target)]),
+            (Not, BrTrue(target)) => Some(vec![BrFalse(*target)]),
+            _ => None,
+        }
+    }
+}
diff --git a/third_party/move/move-compiler-v2/src/flow_insensitive_checkers.rs b/third_party/move/move-compiler-v2/src/flow_insensitive_checkers.rs
index cdb77eb0379ef..dd6dabec91723 100644
--- a/third_party/move/move-compiler-v2/src/flow_insensitive_checkers.rs
+++ b/third_party/move/move-compiler-v2/src/flow_insensitive_checkers.rs
@@ -132,9 +132,21 @@ impl<'env, 'params> SymbolVisitor<'env, 'params> {
                         }
                         self.seen_uses.exit_scope();
                     },
-                    Pre | MidMutate | BeforeThen | BeforeElse | PreSequenceValue => {},
+                    Pre | MidMutate | BeforeThen | BeforeElse | PreSequenceValue
+                    | BeforeMatchBody(_) | AfterMatchBody(_) => {},
                 };
             },
+            Match(_, _, arms) => match position {
+                BeforeMatchBody(_) => self.seen_uses.enter_scope(),
+                AfterMatchBody(idx) => {
+                    for (id, var) in arms[idx].pattern.vars() {
+                        self.node_symbol_decl_visitor(true, &id, &var, UsageKind::LocalVar)
+                    }
+                    self.seen_uses.exit_scope();
+                },
+                Pre | Post | BeforeBody | MidMutate | BeforeThen | BeforeElse
+                | PreSequenceValue => {},
+            },
             Lambda(_, pat, _) => {
                 match position {
                     Pre => self.seen_uses.enter_scope(),
@@ -144,7 +156,8 @@ impl<'env, 'params> SymbolVisitor<'env, 'params> {
                         }
                         self.seen_uses.exit_scope();
                     },
-                    BeforeBody | MidMutate | BeforeThen | BeforeElse | PreSequenceValue => {},
+                    BeforeBody | MidMutate | BeforeThen | BeforeElse | PreSequenceValue
+                    | BeforeMatchBody(_) | AfterMatchBody(_) => {},
                 };
             },
             Quant(_, _, ranges, ..) => {
@@ -161,7 +174,8 @@ impl<'env, 'params> SymbolVisitor<'env, 'params> {
                         }
                         self.seen_uses.exit_scope();
                     },
-                    BeforeBody | MidMutate | BeforeThen | BeforeElse | PreSequenceValue => {},
+                    BeforeBody | MidMutate | BeforeThen | BeforeElse | PreSequenceValue
+                    | BeforeMatchBody(_) | AfterMatchBody(_) => {},
                 };
             },
             Assign(_, pat, _) => {
diff --git a/third_party/move/move-compiler-v2/src/function_checker.rs b/third_party/move/move-compiler-v2/src/function_checker.rs
index 3248c07fade94..57a9976ed3635 100644
--- a/third_party/move/move-compiler-v2/src/function_checker.rs
+++ b/third_party/move/move-compiler-v2/src/function_checker.rs
@@ -18,7 +18,7 @@ type QualifiedFunId = QualifiedId<FunId>;
 /// check that non-inline function parameters do not have function type.
 pub fn check_for_function_typed_parameters(env: &mut GlobalEnv) {
     for caller_module in env.get_modules() {
-        if caller_module.is_target() {
+        if caller_module.is_primary_target() {
             for caller_func in caller_module.get_functions() {
                 // Check that non-inline function parameters don't have function type
                 if !caller_func.is_inline() {
@@ -127,7 +127,7 @@ fn check_privileged_operations_on_structs(env: &GlobalEnv, fun_env: &FunctionEnv
                             &struct_env.module_env,
                         );
                     },
-                    Operation::Pack(mid, sid) => {
+                    Operation::Pack(mid, sid, _) => {
                         if *mid != caller_module_id {
                             let qualified_struct_id = mid.qualified(*sid);
                             let struct_env = env.get_struct(qualified_struct_id);
@@ -147,7 +147,7 @@ fn check_privileged_operations_on_structs(env: &GlobalEnv, fun_env: &FunctionEnv
                 | ExpData::Block(_, pat, _, _)
                 | ExpData::Lambda(_, pat, _) => {
                     pat.visit_pre_post(&mut |_, pat| {
-                        if let Pattern::Struct(id, str, _) = pat {
+                        if let Pattern::Struct(id, str, _, _) = pat {
                             let module_id = str.module_id;
                             if module_id != caller_module_id {
                                 let struct_env = env.get_struct(str.to_qualified_id());
@@ -191,7 +191,7 @@ pub fn check_access_and_use(env: &mut GlobalEnv, before_inlining: bool) {
     let mut private_funcs: BTreeSet<QualifiedFunId> = BTreeSet::new();
 
     for caller_module in env.get_modules() {
-        if caller_module.is_target() {
+        if caller_module.is_primary_target() {
             let caller_module_id = caller_module.get_id();
             let caller_module_has_friends = !caller_module.has_no_friends();
             let caller_module_is_script = caller_module.get_name().is_script();
@@ -253,6 +253,36 @@ pub fn check_access_and_use(env: &mut GlobalEnv, before_inlining: bool) {
                                 Visibility::Friend => {
                                     if callee_func.module_env.has_friend(&caller_module_id) {
                                         true
+                                    } else if callee_func.has_package_visibility() {
+                                        if callee_func.module_env.self_address()
+                                            == caller_func.module_env.self_address()
+                                        {
+                                            // if callee is also a primary target, then they are in the same package
+                                            if callee_func.module_env.is_primary_target() {
+                                                // we should've inferred the friend declaration
+                                                panic!(
+                                                    "{} should have friend {}",
+                                                    callee_func.module_env.get_full_name_str(),
+                                                    caller_func.module_env.get_full_name_str()
+                                                );
+                                            } else {
+                                                call_package_fun_from_diff_package_error(
+                                                    env,
+                                                    sites,
+                                                    &caller_func,
+                                                    &callee_func,
+                                                );
+                                                false
+                                            }
+                                        } else {
+                                            call_package_fun_from_diff_addr_error(
+                                                env,
+                                                sites,
+                                                &caller_func,
+                                                &callee_func,
+                                            );
+                                            false
+                                        }
                                     } else {
                                         not_a_friend_error(env, sites, &caller_func, &callee_func);
                                         false
@@ -336,7 +366,13 @@ fn generic_error(
     let msg = format!(
         "{}function `{}` cannot be called from {}\
          because {}",
-        if callee.is_inline() { "inline " } else { "" },
+        if callee.is_inline() {
+            "inline "
+        } else if callee.has_package_visibility() {
+            "public(package) "
+        } else {
+            ""
+        },
         callee_name,
         called_from,
         why,
@@ -391,3 +427,23 @@ fn not_a_friend_error(
     );
     cannot_call_error(env, &why, sites, caller, callee);
 }
+
+fn call_package_fun_from_diff_package_error(
+    env: &GlobalEnv,
+    sites: &BTreeSet<NodeId>,
+    caller: &FunctionEnv,
+    callee: &FunctionEnv,
+) {
+    let why = "they are from different packages";
+    cannot_call_error(env, why, sites, caller, callee);
+}
+
+fn call_package_fun_from_diff_addr_error(
+    env: &GlobalEnv,
+    sites: &BTreeSet<NodeId>,
+    caller: &FunctionEnv,
+    callee: &FunctionEnv,
+) {
+    let why = "they are from different addresses";
+    cannot_call_error(env, why, sites, caller, callee);
+}
diff --git a/third_party/move/move-compiler-v2/src/inliner.rs b/third_party/move/move-compiler-v2/src/inliner.rs
index d989fd99be354..6047eae1a82ab 100644
--- a/third_party/move/move-compiler-v2/src/inliner.rs
+++ b/third_party/move/move-compiler-v2/src/inliner.rs
@@ -978,7 +978,7 @@ impl<'env, 'rewriter> InlinedRewriter<'env, 'rewriter> {
     ///
     /// (Helper for check_pattern_args_types_need_freezeref)
     fn check_params_args_types_vectors_need_freezeref(
-        params_types: &Vec<Type>,
+        params_types: &[Type],
         args_types: &Vec<Type>,
     ) -> Option<Vec<bool>> {
         // element is Some(true) if a FreezeRef is needed, Some(false) if not, and None if types
@@ -1191,9 +1191,14 @@ impl<'env, 'rewriter> ExpRewriterFunctions for InlinedRewriter<'env, 'rewriter>
                 .map(|new_sym| Pattern::Var(new_id, new_sym))
                 .or_else(|| new_id_opt.map(|id| Pattern::Var(id, *sym))),
             Pattern::Tuple(_, pattern_vec) => Some(Pattern::Tuple(new_id, pattern_vec.clone())),
-            Pattern::Struct(_, struct_id, pattern_vec) => {
+            Pattern::Struct(_, struct_id, variant, pattern_vec) => {
                 let new_struct_id = struct_id.clone().instantiate(self.type_args);
-                Some(Pattern::Struct(new_id, new_struct_id, pattern_vec.clone()))
+                Some(Pattern::Struct(
+                    new_id,
+                    new_struct_id,
+                    *variant,
+                    pattern_vec.clone(),
+                ))
             },
             Pattern::Wildcard(_) => None,
             Pattern::Error(_) => None,
diff --git a/third_party/move/move-compiler-v2/src/lib.rs b/third_party/move/move-compiler-v2/src/lib.rs
index c87b7446b7134..f817957b6b274 100644
--- a/third_party/move/move-compiler-v2/src/lib.rs
+++ b/third_party/move/move-compiler-v2/src/lib.rs
@@ -33,27 +33,37 @@ use crate::{
         split_critical_edges_processor::SplitCriticalEdgesProcessor,
         uninitialized_use_checker::UninitializedUseChecker,
         unreachable_code_analysis::UnreachableCodeProcessor,
-        unreachable_code_remover::UnreachableCodeRemover, variable_coalescing::VariableCoalescing,
+        unreachable_code_remover::UnreachableCodeRemover,
+        unused_assignment_checker::UnusedAssignmentChecker,
+        variable_coalescing::VariableCoalescing,
     },
 };
 use anyhow::bail;
-use codespan_reporting::term::termcolor::{ColorChoice, StandardStream, WriteColor};
+use codespan_reporting::{
+    diagnostic::Severity,
+    term::termcolor::{ColorChoice, StandardStream, WriteColor},
+};
 pub use experiments::Experiment;
 use log::{debug, info, log_enabled, Level};
-use move_binary_format::binary_views::BinaryIndexedView;
+use move_binary_format::{binary_views::BinaryIndexedView, errors::VMError};
+use move_bytecode_source_map::source_map::SourceMap;
 use move_command_line_common::files::FileHash;
 use move_compiler::{
+    command_line,
     compiled_unit::{
-        verify_units, AnnotatedCompiledModule, AnnotatedCompiledScript, AnnotatedCompiledUnit,
-        CompiledUnit, FunctionInfo,
+        AnnotatedCompiledModule, AnnotatedCompiledScript, AnnotatedCompiledUnit, CompiledUnit,
+        FunctionInfo, NamedCompiledModule, NamedCompiledScript,
     },
     diagnostics::FilesSourceText,
     shared::{known_attributes::KnownAttribute, unique_map::UniqueMap},
 };
+use move_core_types::vm_status::{StatusCode, StatusType};
 use move_disassembler::disassembler::Disassembler;
 use move_ir_types::location;
 use move_model::{
-    add_move_lang_diagnostics, metadata::LanguageVersion, model::GlobalEnv, PackageInfo,
+    metadata::LanguageVersion,
+    model::{GlobalEnv, Loc, MoveIrLoc},
+    PackageInfo,
 };
 use move_stackless_bytecode::function_target_pipeline::{
     FunctionTargetPipeline, FunctionTargetsHolder, FunctionVariant,
@@ -175,7 +185,10 @@ pub fn run_checker(options: Options) -> anyhow::Result<GlobalEnv> {
             &options.known_attributes
         },
         options.language_version.unwrap_or_default(),
+        options.warn_deprecated,
+        options.warn_of_deprecation_use_in_aptos_libs,
         options.compile_test_code,
+        options.compile_verify_code,
     )?;
     // Store address aliases
     let map = addrs
@@ -297,7 +310,10 @@ pub fn check_and_rewrite_pipeline<'a, 'b>(
         );
     }
 
-    let check_seqs_in_binops = options.language_version.unwrap_or_default() < LanguageVersion::V2_0
+    let check_seqs_in_binops = !options
+        .language_version
+        .unwrap_or_default()
+        .is_at_least(LanguageVersion::V2_0)
         && options.experiment_on(Experiment::SEQS_IN_BINOPS_CHECK);
 
     if !for_v1_model && check_seqs_in_binops {
@@ -383,6 +399,11 @@ pub fn bytecode_pipeline(env: &GlobalEnv) -> FunctionTargetPipeline {
         pipeline.add_processor(Box::new(UninitializedUseChecker { keep_annotations }));
     }
 
+    if options.experiment_on(Experiment::UNUSED_ASSIGNMENT_CHECK) {
+        pipeline.add_processor(Box::new(LiveVarAnalysisProcessor::new(false)));
+        pipeline.add_processor(Box::new(UnusedAssignmentChecker {}));
+    }
+
     // Reference check is always run, but the processor decides internally
     // based on `Experiment::REFERENCE_SAFETY` whether to report errors.
     pipeline.add_processor(Box::new(LiveVarAnalysisProcessor::new(false)));
@@ -449,15 +470,111 @@ pub fn disassemble_compiled_units(units: &[CompiledUnit]) -> anyhow::Result<Stri
 
 /// Run the bytecode verifier on the given compiled units and add any diagnostics to the global env.
 pub fn run_bytecode_verifier(units: &[AnnotatedCompiledUnit], env: &mut GlobalEnv) -> bool {
-    let diags = verify_units(units);
-    if !diags.is_empty() {
-        add_move_lang_diagnostics(env, diags);
-        false
+    let mut errors = false;
+    for unit in units {
+        match unit {
+            AnnotatedCompiledUnit::Module(AnnotatedCompiledModule {
+                loc,
+                named_module:
+                    NamedCompiledModule {
+                        module, source_map, ..
+                    },
+                ..
+            }) => {
+                if let Err(e) = move_bytecode_verifier::verify_module(module) {
+                    report_bytecode_verification_error(env, loc, source_map, &e);
+                    errors = true
+                }
+            },
+            AnnotatedCompiledUnit::Script(AnnotatedCompiledScript {
+                loc,
+                named_script:
+                    NamedCompiledScript {
+                        script, source_map, ..
+                    },
+                ..
+            }) => {
+                if let Err(e) = move_bytecode_verifier::verify_script(script) {
+                    report_bytecode_verification_error(env, loc, source_map, &e);
+                    errors = true
+                }
+            },
+        }
+    }
+    !errors
+}
+
+fn report_bytecode_verification_error(
+    env: &GlobalEnv,
+    module_ir_loc: &MoveIrLoc,
+    source_map: &SourceMap,
+    e: &VMError,
+) {
+    let mut precise_loc = true;
+    let loc = &get_vm_error_loc(env, source_map, e).unwrap_or_else(|| {
+        precise_loc = false;
+        env.to_loc(module_ir_loc)
+    });
+    if e.status_type() != StatusType::Verification {
+        env.diag(
+            Severity::Bug,
+            loc,
+            &format!(
+                "unexpected error returned from bytecode verification. This is a compiler bug, consider reporting it.\n{:#?}",
+                e
+            ),
+        )
     } else {
-        true
+        let debug_info = if command_line::get_move_compiler_backtrace_from_env() {
+            format!("\n{:#?}", e)
+        } else {
+            "".to_string()
+        };
+        use StatusCode::*;
+        match e.major_status() {
+            // Only treat verification errors known to be an issue here
+            BORROWFIELD_EXISTS_MUTABLE_BORROW_ERROR
+            | MOVELOC_EXISTS_BORROW_ERROR
+            | BORROWLOC_EXISTS_BORROW_ERROR
+            | READREF_EXISTS_MUTABLE_BORROW_ERROR
+                if precise_loc =>
+            {
+                env.diag(
+                    Severity::Error,
+                    loc,
+                    &format!(
+                        "reference safety check failed on bytecode level. \
+                This is a known issue, to be fixed later, resulting from differences between \
+                safety rules of the v1 and v2 compiler. Try to rewrite your code \
+                 to workaround this problem.{}",
+                        debug_info
+                    ),
+                )
+            },
+            _ => env.diag(
+                Severity::Bug,
+                loc,
+                &format!(
+                    "bytecode verification failed with \
+                unexpected status code `{:?}`. This is a compiler bug, consider reporting it.{}",
+                    e.major_status(),
+                    debug_info
+                ),
+            ),
+        }
     }
 }
 
+/// Gets the location associated with the VM error, if available.
+fn get_vm_error_loc(env: &GlobalEnv, source_map: &SourceMap, e: &VMError) -> Option<Loc> {
+    e.offsets().first().and_then(|(fdef_idx, offset)| {
+        source_map
+            .get_code_location(*fdef_idx, *offset)
+            .ok()
+            .map(|l| env.to_loc(&l))
+    })
+}
+
 /// Report any diags in the env to the writer and fail if there are errors.
 pub fn check_errors<W>(
     env: &GlobalEnv,
diff --git a/third_party/move/move-compiler-v2/src/options.rs b/third_party/move/move-compiler-v2/src/options.rs
index ed0f774b76400..ece7a48ffd1a7 100644
--- a/third_party/move/move-compiler-v2/src/options.rs
+++ b/third_party/move/move-compiler-v2/src/options.rs
@@ -6,8 +6,14 @@ use crate::experiments::{DefaultValue, EXPERIMENTS};
 use clap::Parser;
 use codespan_reporting::diagnostic::Severity;
 use itertools::Itertools;
-use move_command_line_common::env::read_env_var;
-use move_compiler::command_line as cli;
+use move_command_line_common::env::{bool_to_str, read_env_var};
+use move_compiler::{
+    command_line as cli,
+    shared::{
+        move_compiler_warn_of_deprecation_use_env_var,
+        warn_of_deprecation_use_in_aptos_libs_env_var,
+    },
+};
 use move_model::metadata::LanguageVersion;
 use once_cell::sync::Lazy;
 use std::{
@@ -19,35 +25,42 @@ use std::{
 #[derive(Parser, Clone, Debug)]
 #[clap(author, version, about)]
 pub struct Options {
-    /// Directories where to lookup dependencies.
+    /// Directories where to lookup (already compiled) dependencies.
     #[clap(
         short,
         num_args = 0..
     )]
     pub dependencies: Vec<String>,
+
     /// Named address mapping.
     #[clap(
         short,
         num_args = 0..
     )]
     pub named_address_mapping: Vec<String>,
+
     /// Output directory.
     #[clap(short, long, default_value = "")]
     pub output_dir: String,
+
     /// The language version to use.
     #[clap(long, value_parser = clap::value_parser!(LanguageVersion))]
     pub language_version: Option<LanguageVersion>,
+
     /// Do not complain about unknown attributes in Move code.
     #[clap(long, default_value = "false")]
     pub skip_attribute_checks: bool,
+
     /// Known attributes for this dialect of move; if empty, assumes third-party Move.
     /// Only used if skip_attribute_checks is false.
     #[clap(skip)]
     pub known_attributes: BTreeSet<String>,
+
     /// Whether we generate code for tests. This specifically guarantees stable output
     /// for baseline testing.
     #[clap(long)]
     pub testing: bool,
+
     /// Active experiments. Experiments alter default behavior of the compiler.
     /// See `Experiment` struct.
     #[clap(short)]
@@ -56,24 +69,52 @@ pub struct Options {
         num_args = 0..
     )]
     pub experiments: Vec<String>,
+
     /// A transient cache for memoization of experiment checks.
     #[clap(skip)]
     pub experiment_cache: RefCell<BTreeMap<String, bool>>,
-    /// Sources to compile (positional arg, therefore last)
+
+    /// Sources to compile (positional arg, therefore last).
+    /// Each source should be a path to either (1) a Move file or (2) a directory containing Move
+    /// files, all to be compiled (e.g., not the root directory of a package---which contains
+    /// Move.toml---but a specific subdirectory such as `sources`, `scripts`, and/or `tests`,
+    /// depending on compilation mode).
     pub sources: Vec<String>,
+
     /// Dependencies to compile but not treat as a test/docgen/warning/prover target.
+    /// Each source_dep should be a path to either (1) a Move file or (2) a directory containing
+    /// Move files, all to be compiled (e.g., not the root directory of a package---which contains
+    /// Move.toml---but a specific subdirectory such as `sources`).
     #[clap(skip)]
     pub sources_deps: Vec<String>,
+
+    #[clap(long = cli::MOVE_COMPILER_WARN_OF_DEPRECATION_USE_FLAG,
+           default_value=bool_to_str(move_compiler_warn_of_deprecation_use_env_var()))]
+    pub warn_deprecated: bool,
+
+    /// Show warnings about use of deprecated usage in the Aptos libraries,
+    /// which we should generally not bother users with.
+    /// Note that current value of this constant is "Wdeprecation-aptos"
+    #[clap(long = cli::WARN_OF_DEPRECATION_USE_IN_APTOS_LIBS_FLAG,
+           default_value=bool_to_str(warn_of_deprecation_use_in_aptos_libs_env_var()))]
+    pub warn_of_deprecation_use_in_aptos_libs: bool,
+
     /// Show warnings about unused functions, fields, constants, etc.
     /// Note that the current value of this constant is "Wunused"
     #[clap(long = cli::WARN_UNUSED_FLAG, default_value="false")]
     pub warn_unused: bool,
+
     /// Whether to compile everything, including dependencies.
     #[clap(long)]
     pub whole_program: bool,
+
     /// Whether to compile #[test] and #[test_only] code
     #[clap(skip)]
     pub compile_test_code: bool,
+
+    /// Whether to compile #[verify_only] code
+    #[clap(skip)]
+    pub compile_verify_code: bool,
 }
 
 impl Default for Options {
@@ -162,6 +203,34 @@ impl Options {
             ..self
         }
     }
+
+    pub fn set_compile_verify_code(self, value: bool) -> Self {
+        Self {
+            compile_verify_code: value,
+            ..self
+        }
+    }
+
+    pub fn set_warn_deprecated(self, value: bool) -> Self {
+        Self {
+            warn_deprecated: value,
+            ..self
+        }
+    }
+
+    pub fn set_warn_of_deprecation_use_in_aptos_libs(self, value: bool) -> Self {
+        Self {
+            warn_of_deprecation_use_in_aptos_libs: value,
+            ..self
+        }
+    }
+
+    pub fn set_warn_unused(self, value: bool) -> Self {
+        Self {
+            warn_unused: value,
+            ..self
+        }
+    }
 }
 
 /// Finds the experiment in the list of definitions. A definition
diff --git a/third_party/move/move-compiler-v2/src/pipeline/mod.rs b/third_party/move/move-compiler-v2/src/pipeline/mod.rs
index aad9578b3f430..ece4cbf80e4d8 100644
--- a/third_party/move/move-compiler-v2/src/pipeline/mod.rs
+++ b/third_party/move/move-compiler-v2/src/pipeline/mod.rs
@@ -23,6 +23,7 @@ pub mod split_critical_edges_processor;
 pub mod uninitialized_use_checker;
 pub mod unreachable_code_analysis;
 pub mod unreachable_code_remover;
+pub mod unused_assignment_checker;
 pub mod variable_coalescing;
 pub mod visibility_checker;
 
diff --git a/third_party/move/move-compiler-v2/src/pipeline/reference_safety_processor.rs b/third_party/move/move-compiler-v2/src/pipeline/reference_safety_processor.rs
index 0d49d10dcbabe..d4a24ea248c23 100644
--- a/third_party/move/move-compiler-v2/src/pipeline/reference_safety_processor.rs
+++ b/third_party/move/move-compiler-v2/src/pipeline/reference_safety_processor.rs
@@ -116,10 +116,11 @@ use abstract_domain_derive::AbstractDomain;
 use codespan_reporting::diagnostic::Severity;
 use itertools::Itertools;
 use log::{debug, log_enabled, Level};
-use move_binary_format::file_format::CodeOffset;
+use move_binary_format::{file_format, file_format::CodeOffset};
 use move_model::{
     ast::TempIndex,
-    model::{FieldId, FunctionEnv, GlobalEnv, Loc, Parameter, QualifiedInstId, StructId},
+    model::{FieldId, FunId, FunctionEnv, GlobalEnv, Loc, Parameter, QualifiedInstId, StructId},
+    symbol::Symbol,
     ty::Type,
 };
 use move_stackless_bytecode::{
@@ -240,6 +241,27 @@ impl BorrowEdgeKind {
             Freeze => false,
         }
     }
+
+    /// Returns true if any of the edge kinds in the set is mut
+    fn any_is_mut(kinds: &BTreeSet<BorrowEdgeKind>) -> bool {
+        kinds.iter().any(|k| k.is_mut())
+    }
+
+    /// Determines whether the region derived from this edge has overlap with the region
+    /// of the other edge. Overlap can only be excluded for field edges.
+    fn could_overlap(&self, other: &BorrowEdgeKind) -> bool {
+        use BorrowEdgeKind::*;
+        match (self, other) {
+            (BorrowField(_, field1), BorrowField(_, field2)) => field1 == field2,
+            _ => true,
+        }
+    }
+
+    /// Returns true if there is any overlap between the edges in the two sets.
+    fn any_could_overlap(set1: &BTreeSet<BorrowEdgeKind>, set2: &BTreeSet<BorrowEdgeKind>) -> bool {
+        set1.iter()
+            .any(|k1| set2.iter().any(|k2| k1.could_overlap(k2)))
+    }
 }
 
 impl LifetimeLabel {
@@ -266,17 +288,7 @@ impl BorrowEdge {
     }
 }
 
-impl BorrowEdgeKind {
-    /// Determines whether the region derived from this edge has overlap with the region
-    /// of the other edge. Overlap can only be excluded for field edges.
-    fn overlaps(&self, other: &BorrowEdgeKind) -> bool {
-        use BorrowEdgeKind::*;
-        match (self, other) {
-            (BorrowField(_, field1), BorrowField(_, field2)) => field1 == field2,
-            _ => true,
-        }
-    }
-}
+impl BorrowEdgeKind {}
 
 impl AbstractDomain for LifetimeState {
     /// The join operator of the dataflow analysis domain.
@@ -518,16 +530,55 @@ impl LifetimeState {
         self.parent_edges(label).any(|(_, e)| e.kind.is_mut())
     }
 
-    /// Returns the children grouped by their edge kind.
-    fn grouped_children(
+    /// Returns the children of the given nodes, grouped into hyper edges. A hyper edge
+    /// is constituted by a set of edge kinds and associated list of edges. Each hyper edge
+    /// represents an abstract borrow operation.
+    ///
+    /// 1) All edges which lead into the same node are considered to be part of the same hyper
+    /// edge. Consider:
+    ///
+    /// ```text
+    ///           \     /
+    ///         e1 \   / e2
+    ///             \ /
+    ///              n
+    /// ```
+    /// This forms a hyper edge `{e1.kind, e2.kind} -> [e1, e2]`. Both edges have to be in the same
+    /// group because `n` has a 'weak' borrow history, it can either stem from `e1` or `e2`.
+    ///
+    /// 2) For all other edges not leading into the same node, they are grouped according
+    /// their kind. Consider:
+    ///
+    /// ```text
+    ///            |    |
+    ///         e1 |    | e2
+    ///            |    |
+    ///           n1   n2
+    /// ```
+    /// If `kind == e1.kind == e2.kind`, this forms a hyper edge `{kind} -> [e1, e2]`, otherwise
+    /// it will be two independent hyper edges `{e1.kind} -> [e1]` and `{e2.kind} -> [e2]`. The
+    /// former reflects that the edges of the same kind are the same abstract borrow operation,
+    /// independent of the number of edges involved.
+    fn group_children_into_hyper_edges(
         &self,
         labels: &BTreeSet<LifetimeLabel>,
-    ) -> BTreeMap<BorrowEdgeKind, Vec<&BorrowEdge>> {
-        let mut result: BTreeMap<BorrowEdgeKind, Vec<&BorrowEdge>> = BTreeMap::new();
-        for label in labels {
-            for edge in self.children(label) {
-                result.entry(edge.kind.clone()).or_default().push(edge)
-            }
+    ) -> BTreeMap<BTreeSet<BorrowEdgeKind>, Vec<&BorrowEdge>> {
+        // First compute map from target nodes to edges, allowing to identify weak edges.
+        let mut target_to_incoming: BTreeMap<LifetimeLabel, Vec<&BorrowEdge>> = BTreeMap::new();
+        for edge in labels.iter().flat_map(|l| self.children(l)) {
+            target_to_incoming
+                .entry(edge.target)
+                .or_default()
+                .push(edge)
+        }
+        // Now compute the result.
+        let mut result: BTreeMap<BTreeSet<BorrowEdgeKind>, Vec<&BorrowEdge>> = BTreeMap::new();
+        for (_, mut edges) in target_to_incoming {
+            let key = edges
+                .iter()
+                .map(|e| e.kind.clone())
+                .collect::<BTreeSet<_>>();
+            result.entry(key).or_default().append(&mut edges);
         }
         result
     }
@@ -689,7 +740,8 @@ impl LifetimeState {
     fn release_ref(&mut self, temp: TempIndex) {
         if let Some(label) = self.temp_to_label_map.remove(&temp) {
             if self.is_leaf(&label) {
-                // We can drop the underlying node, as there are no borrows out.
+                // We can drop the underlying node, as there are no borrows out, and
+                // it is not mapped from another temp.
                 let in_use = self.leaves().keys().cloned().collect();
                 let mut indirectly_removed = BTreeSet::new();
                 self.drop_leaf_node(&label, &in_use, &mut indirectly_removed);
@@ -863,6 +915,8 @@ enum ReadMode {
     Copy,
     /// The local is transferred as an argument to another function
     Argument,
+    /// The local is used as a branch condition
+    BranchCondition,
 }
 
 impl<'env> LifeTimeAnalysis<'env> {
@@ -999,32 +1053,32 @@ impl<'env, 'state> LifetimeAnalysisStep<'env, 'state> {
                         true
                     }
                 },
+                ReadMode::BranchCondition => {
+                    // Mutable borrow not allowed
+                    if self.state.has_mut_edges(label) {
+                        self.error_with_hints(
+                            loc,
+                            format!(
+                                "cannot use {} which is still mutably \
+                                    borrowed as branch condition",
+                                self.display(local)
+                            ),
+                            "used in this context",
+                            self.borrow_info(label, |_| true)
+                                .into_iter()
+                                .chain(usage_info()),
+                        );
+                        false
+                    } else {
+                        true
+                    }
+                },
             }
         } else {
             true
         }
     }
 
-    /// Release all references that are not alive after this program point
-    /// from temp_to_label_map if `dests` do not contain any references
-    /// This function should be called before `check_write_local`
-    fn release_before_write_local(&mut self, dests: &[TempIndex]) {
-        let alive_temps = self.alive.after_set();
-        if !dests.iter().any(|temp| self.is_ref(*temp)) {
-            for temp in self
-                .state
-                .temp_to_label_map
-                .keys()
-                .cloned()
-                .collect::<Vec<_>>()
-            {
-                if !alive_temps.contains(&temp) && self.is_ref(temp) {
-                    self.state.release_ref(temp)
-                }
-            }
-        }
-    }
-
     /// Check whether a local can be written. This is only allowed if no borrowed references exist.
     fn check_write_local(&self, local: TempIndex) {
         if self.is_ref(local) {
@@ -1044,6 +1098,24 @@ impl<'env, 'state> LifetimeAnalysisStep<'env, 'state> {
         }
     }
 
+    /// Marks in the borrow state that the inputs of an instruction have been consumed. At
+    /// this point all references which are not alive after this program point can be
+    /// released. Notice that this must be called before a check_write_local can be
+    /// performed. This function is idempotent for a given program step.
+    fn release_refs_not_alive_after(&mut self) {
+        for temp in self
+            .state
+            .temp_to_label_map
+            .keys()
+            .cloned()
+            .collect::<Vec<_>>()
+        {
+            if self.is_ref(temp) && !self.alive.after.contains_key(&temp) {
+                self.state.release_ref(temp)
+            }
+        }
+    }
+
     /// Check whether the borrow graph is 'safe' w.r.t a set of `exclusive_temps`. Those temporaries
     /// are used as a list of arguments to a function call and need to follow borrow rules of
     /// exclusive access, as discussed at the beginning of this file.
@@ -1105,13 +1177,36 @@ impl<'env, 'state> LifetimeAnalysisStep<'env, 'state> {
         let mut edges_reported: BTreeSet<BTreeSet<&BorrowEdge>> = BTreeSet::new();
         // Continue to process hyper nodes
         while let Some(hyper) = hyper_nodes.pop_first() {
-            let hyper_edges = self.state.grouped_children(&hyper);
+            let hyper_edges = self.state.group_children_into_hyper_edges(&hyper);
             // Check 2-wise combinations of hyper edges for issues. This discovers cases where edges
             // conflict because of mutability.
             for mut perm in hyper_edges.iter().combinations(2) {
-                let (kind1, edges1) = perm.pop().unwrap();
-                let (kind2, edges2) = perm.pop().unwrap();
-                if (kind1.is_mut() || kind2.is_mut()) && kind1.overlaps(kind2) {
+                let (kinds1, edges1) = perm.pop().unwrap();
+                let (kinds2, edges2) = perm.pop().unwrap();
+                if DEBUG {
+                    debug!(
+                        "{}[{}] vs {}[{}]",
+                        kinds1
+                            .iter()
+                            .map(|k| k.display(self.target()).to_string())
+                            .join("|"),
+                        edges1
+                            .iter()
+                            .map(|e| e.display(self.target(), true).to_string())
+                            .join(","),
+                        kinds2
+                            .iter()
+                            .map(|k| k.display(self.target()).to_string())
+                            .join("|"),
+                        edges2
+                            .iter()
+                            .map(|e| e.display(self.target(), true).to_string())
+                            .join(","),
+                    );
+                }
+                if (BorrowEdgeKind::any_is_mut(kinds1) || BorrowEdgeKind::any_is_mut(kinds2))
+                    && BorrowEdgeKind::any_could_overlap(kinds1, kinds2)
+                {
                     for (e1, e2) in edges1.iter().cartesian_product(edges2.iter()) {
                         if e1 == e2 || !edges_reported.insert([*e1, *e2].into_iter().collect()) {
                             continue;
@@ -1453,7 +1548,7 @@ impl<'env, 'state> LifetimeAnalysisStep<'env, 'state> {
             }
         } else {
             self.check_read_local(src, mode);
-            self.release_before_write_local(&[dest]);
+            self.release_refs_not_alive_after();
             self.check_write_local(dest);
         }
     }
@@ -1490,6 +1585,7 @@ impl<'env, 'state> LifetimeAnalysisStep<'env, 'state> {
     fn borrow_field(
         &mut self,
         struct_: QualifiedInstId<StructId>,
+        variant: Option<Symbol>,
         field_offs: &usize,
         dest: TempIndex,
         src: TempIndex,
@@ -1498,31 +1594,56 @@ impl<'env, 'state> LifetimeAnalysisStep<'env, 'state> {
         let child = self.state.replace_ref(dest, self.code_offset, 1);
         self.state.mark_derived_from(child, src);
         let loc = self.cur_loc();
-        let is_mut = self.ty(dest).is_mutable_reference();
         let struct_env = self.global_env().get_struct(struct_.to_qualified_id());
-        let field_id = struct_env.get_field_by_offset(*field_offs).get_id();
+        let field_id = struct_env
+            .get_field_by_offset_optional_variant(variant, *field_offs)
+            .get_id();
+        let is_mut = self.ty(dest).is_mutable_reference();
         self.state.add_edge(
             label,
             BorrowEdge::new(BorrowEdgeKind::BorrowField(is_mut, field_id), loc, child),
         );
+        // In v1, borrow safety is enforced even when `dest` is not used after this
+        // program point, AND when `label` has an outgoing call edge. However, our
+        // `check_borrow_safety` implementation will (correctly) not trigger an error since
+        // the borrowed reference is never used. To simulate v1 behavior, we check for those
+        // conditions and produce an error ad-hoc.
+        if is_mut
+            && !self.alive.after.contains_key(&dest)
+            && self
+                .state
+                .children(&label)
+                .any(|e| matches!(&e.kind, BorrowEdgeKind::Call(..)))
+        {
+            self.error_with_hints(
+                self.cur_loc(),
+                format!(
+                    "cannot mutably borrow field of {} since references derived from a call exist",
+                    self.display(src),
+                ),
+                "mutable borrow attempted here",
+                self.borrow_info(&label, |_| true)
+                    .into_iter()
+                    .chain(self.usage_info(&label, |_| true)),
+            )
+        }
     }
 
-    /// Process a function call. For now we implement standard Move semantics, where
+    /// Process a function call. For now, we implement standard Move semantics, where
     /// 1) every output immutable reference is a child of all input references;
     /// 2) every output mutable reference is a child of all input mutable references,
     /// because mutable references cannot be derived from immutable references.
     /// Here would be the point where to
     /// evaluate lifetime modifiers in future language versions.
     fn call_operation(&mut self, oper: Operation, dests: &[TempIndex], srcs: &[TempIndex]) {
+        // If this a function call, check acquires conditions for global borrows.
+        if let Operation::Function(mid, fid, inst) = &oper {
+            self.check_global_access(mid.qualified_inst(*fid, inst.clone()))
+        }
         // Check validness of arguments
         for src in srcs {
             self.check_read_local(*src, ReadMode::Argument);
         }
-        // Next check whether we can assign to the destinations.
-        self.release_before_write_local(dests);
-        for dest in dests {
-            self.check_write_local(*dest)
-        }
         // Now draw edges
         // 1) from all reference sources to all immutable reference destinations.
         // 2) from all mutable reference sources to all mutable reference destinations.
@@ -1571,6 +1692,51 @@ impl<'env, 'state> LifetimeAnalysisStep<'env, 'state> {
                 }
             }
         }
+        // Check whether destinations can be written.
+        self.release_refs_not_alive_after();
+        for dest in dests {
+            self.check_write_local(*dest)
+        }
+    }
+
+    /// Checks whether a function potentially accesses a global resource which is
+    /// currently borrowed.
+    fn check_global_access(&mut self, fun_id: QualifiedInstId<FunId>) {
+        let fun = self.global_env().get_function(fun_id.to_qualified_id());
+        let specifiers = fun.get_access_specifiers().unwrap_or(&[]);
+
+        for (global, label) in &self.state.global_to_label_map {
+            let is_mut = self.state.children(label).any(|e| e.kind.is_mut());
+            // We are only checking positive specifiers, as negatives say nothing
+            // about what is accessed.
+            for spec in specifiers.iter().filter(|s| !s.negated) {
+                if spec
+                    .resource
+                    .1
+                    .matches(self.global_env(), &fun_id.inst, global)
+                    // For mut global borrows, no access is allowed at all. For
+                    // non-mut, write access is not allowed.
+                    && (is_mut || spec.kind.subsumes(&file_format::AccessKind::Writes))
+                {
+                    self.error_with_hints(
+                        self.cur_loc(),
+                        format!(
+                            "function {} global `{}` which is currently {}borrowed",
+                            spec.kind,
+                            self.global_env().display(global),
+                            if is_mut { "mutably " } else { "" }
+                        ),
+                        "function called here",
+                        self.borrow_info(label, |_| true)
+                            .into_iter()
+                            .chain(iter::once((
+                                spec.loc.clone(),
+                                "access declared here".to_owned(),
+                            ))),
+                    )
+                }
+            }
+        }
     }
 
     /// Process a FreezeRef instruction.
@@ -1616,7 +1782,7 @@ impl<'env, 'state> LifetimeAnalysisStep<'env, 'state> {
                     if &sibling_edge.target == label
                         || sibling_edge.kind == edge.kind
                             && matches!(edge.kind, BorrowEdgeKind::Call(..))
-                        || !sibling_edge.kind.overlaps(&edge.kind)
+                        || !sibling_edge.kind.could_overlap(&edge.kind)
                     {
                         // The sibling edge is harmless if
                         // (a) it is not actually a sibling but leads to the same target
@@ -1653,7 +1819,10 @@ impl<'env, 'state> LifetimeAnalysisStep<'env, 'state> {
                 {
                     continue;
                 }
-                if other_label == label {
+                // Apart from the same memory location, locations mutably borrowed from label also need to be included
+                if other_label == label
+                    || self.state.transitive_children(label).contains(other_label)
+                {
                     // Compute all visible usages at leaves to show the conflict.
                     // It is not enough to just show the usage of `temp`, because the
                     // actual usage might be something derived from it, and `temp`
@@ -1710,7 +1879,7 @@ impl<'env, 'state> LifetimeAnalysisStep<'env, 'state> {
     /// Process a MoveFrom instruction.
     fn move_from(&mut self, dest: TempIndex, resource: &QualifiedInstId<StructId>, src: TempIndex) {
         self.check_read_local(src, ReadMode::Argument);
-        self.release_before_write_local(&[dest]);
+        self.release_refs_not_alive_after();
         self.check_write_local(dest);
         if let Some(label) = self.state.label_for_global_with_children(resource) {
             self.error_with_hints(
@@ -1769,7 +1938,7 @@ impl<'env, 'state> LifetimeAnalysisStep<'env, 'state> {
     /// Process a ReadRef instruction.
     fn read_ref(&mut self, dest: TempIndex, src: TempIndex) {
         debug_assert!(self.is_ref(src));
-        self.release_before_write_local(&[dest]);
+        self.release_refs_not_alive_after();
         self.check_write_local(dest);
         self.check_read_local(src, ReadMode::Argument);
     }
@@ -1806,26 +1975,11 @@ impl<'env> TransferFunctions for LifeTimeAnalysis<'env> {
         // Construct step context
         let mut step = self.new_step(code_offset, instr.get_attr_id(), state);
 
-        // Preprocessing: release all temps in the label map which are no longer alive at this point.
-        step.state.debug_print("before enter release");
-        let alive_temps = step.alive.before_set();
-        for temp in step
-            .state
-            .temp_to_label_map
-            .keys()
-            .cloned()
-            .collect::<Vec<_>>()
-        {
-            if !alive_temps.contains(&temp) && step.is_ref(temp) {
-                step.state.release_ref(temp)
-            }
-        }
-
-        // Preprocessing: check borrow safety of the currently active borrow graph for read ref,
-        // write ref, and function calls.
+        // Preprocessing: check borrow safety of the currently active borrow graph for
+        // selected instructions.
         #[allow(clippy::single_match)]
         match instr {
-            // Only handle operations which can take references
+            // Call operations which can take references
             Call(_, _, oper, srcs, ..) => match oper {
                 Operation::ReadRef
                 | Operation::WriteRef
@@ -1861,6 +2015,9 @@ impl<'env> TransferFunctions for LifeTimeAnalysis<'env> {
                 step.assign(*dest, *src, *kind);
             },
             Ret(_, srcs) => step.return_(srcs),
+            Branch(_, _, _, src) => {
+                step.check_read_local(*src, ReadMode::BranchCondition);
+            },
             Call(_, dests, oper, srcs, _) => {
                 use Operation::*;
                 match oper {
@@ -1874,6 +2031,19 @@ impl<'env> TransferFunctions for LifeTimeAnalysis<'env> {
                         let (dest, src) = (dests[0], srcs[0]);
                         step.borrow_field(
                             mid.qualified_inst(*sid, inst.clone()),
+                            None,
+                            field_offs,
+                            dest,
+                            src,
+                        );
+                    },
+                    BorrowVariantField(mid, sid, variants, inst, field_offs) => {
+                        let (dest, src) = (dests[0], srcs[0]);
+
+                        step.borrow_field(
+                            mid.qualified_inst(*sid, inst.clone()),
+                            // Use one representative variant
+                            Some(variants[0]),
                             field_offs,
                             dest,
                             src,
@@ -1892,21 +2062,10 @@ impl<'env> TransferFunctions for LifeTimeAnalysis<'env> {
             },
             _ => {},
         }
-        // After processing, release any temporaries which are dying at this program point.
-        // Variables which are introduced in this step but not alive after need to be released as well, as they
-        // are not in the before set.
-        step.state.debug_print("before exit release");
-        let after_set = step.alive.after_set();
-        for released in step.alive.before.keys().chain(
-            instr
-                .dests()
-                .iter()
-                .filter(|t| !step.alive.before.contains_key(t)),
-        ) {
-            if !after_set.contains(released) && step.is_ref(*released) {
-                step.state.release_ref(*released)
-            }
-        }
+
+        // Some instructions may not have released inputs, do so now. The operation
+        // is idempotent.
+        step.release_refs_not_alive_after()
     }
 }
 
@@ -2034,15 +2193,8 @@ struct BorrowEdgeDisplay<'a>(&'a FunctionTarget<'a>, &'a BorrowEdge, bool);
 impl<'a> Display for BorrowEdgeDisplay<'a> {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         let edge = &self.1;
+        write!(f, "{}", edge.kind.display(self.0))?;
         let display_child = self.2;
-        use BorrowEdgeKind::*;
-        (match &edge.kind {
-            BorrowLocal(is_mut) => write!(f, "borrow({})", is_mut),
-            BorrowGlobal(is_mut, offs) => write!(f, "borrow_global({}, {})", is_mut, offs),
-            BorrowField(is_mut, _) => write!(f, "borrow_field({})", is_mut),
-            Call(is_mut, _, offs) => write!(f, "call({}, {})", is_mut, offs),
-            Freeze => write!(f, "freeze"),
-        })?;
         if display_child {
             write!(f, " -> {}", edge.target)
         } else {
@@ -2061,6 +2213,32 @@ impl BorrowEdge {
     }
 }
 
+struct BorrowEdgeKindDisplay<'a>(&'a FunctionTarget<'a>, &'a BorrowEdgeKind);
+impl<'a> Display for BorrowEdgeKindDisplay<'a> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        use BorrowEdgeKind::*;
+        let mut_str = if self.1.is_mut() { "mut" } else { "imm" };
+        match &self.1 {
+            BorrowLocal(_) => write!(f, "borrow_{}", mut_str),
+            BorrowGlobal(_, offs) => write!(f, "borrow_global_{}@{}", mut_str, offs),
+            BorrowField(_, field_id) => write!(
+                f,
+                "borrow_{}.{}",
+                mut_str,
+                field_id.symbol().display(self.0.symbol_pool()),
+            ),
+            Call(_, _, offs) => write!(f, "call_{}@{}", mut_str, offs),
+            Freeze => write!(f, "freeze"),
+        }
+    }
+}
+
+impl BorrowEdgeKind {
+    fn display<'a>(&'a self, target: &'a FunctionTarget) -> BorrowEdgeKindDisplay<'a> {
+        BorrowEdgeKindDisplay(target, self)
+    }
+}
+
 impl Display for LifetimeLabel {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         write!(f, "@{:X}", self.0)
diff --git a/third_party/move/move-compiler-v2/src/pipeline/unused_assignment_checker.rs b/third_party/move/move-compiler-v2/src/pipeline/unused_assignment_checker.rs
new file mode 100644
index 0000000000000..631ed8b56ac8d
--- /dev/null
+++ b/third_party/move/move-compiler-v2/src/pipeline/unused_assignment_checker.rs
@@ -0,0 +1,84 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+//! Implements a pipeline that checks and gives warning on unused assignments.
+//! Prerequisite: live variable annotation.
+
+use crate::pipeline::livevar_analysis_processor::LiveVarAnnotation;
+use codespan_reporting::diagnostic::Severity;
+use move_binary_format::file_format::CodeOffset;
+use move_model::{ast::TempIndex, model::FunctionEnv};
+use move_stackless_bytecode::{
+    function_target::{FunctionData, FunctionTarget},
+    function_target_pipeline::{FunctionTargetProcessor, FunctionTargetsHolder},
+    stackless_bytecode::{AttrId, Bytecode},
+};
+
+pub struct UnusedAssignmentChecker {}
+
+impl UnusedAssignmentChecker {
+    /// Check if the assignment to `dst` at offset after the position given by `offset` and `after`.
+    fn check_unused_assignment(
+        target: &FunctionTarget,
+        id: AttrId,
+        offset: CodeOffset,
+        dst: TempIndex,
+    ) {
+        let data = target.data;
+        // only check for user defined variables
+        if let Some(dst_name) = data.local_names.get(&dst) {
+            let live_var_info = target
+                .get_annotations()
+                .get::<LiveVarAnnotation>()
+                .expect("live variable annotation")
+                .get_info_at(offset);
+            let live_after = &live_var_info.after;
+            let dst_name = dst_name.display(target.func_env.symbol_pool()).to_string();
+            if !dst_name.starts_with('_') && live_after.get(&dst).is_none() {
+                let loc = target.get_bytecode_loc(id);
+                target
+                    .global_env()
+                    .diag(
+                        Severity::Warning,
+                        &loc,
+                        &format!("Unused assignment to `{}`. Consider removing or prefixing with an underscore: `_{}`", dst_name, dst_name)
+                    );
+            }
+        }
+    }
+}
+
+impl FunctionTargetProcessor for UnusedAssignmentChecker {
+    fn process(
+        &self,
+        _targets: &mut FunctionTargetsHolder,
+        func_env: &FunctionEnv,
+        data: FunctionData,
+        _scc_opt: Option<&[FunctionEnv]>,
+    ) -> FunctionData {
+        if func_env.is_native() {
+            return data;
+        }
+        let target = FunctionTarget::new(func_env, &data);
+        for (offset, bytecode) in data.code.iter().enumerate() {
+            let offset = offset as u16;
+            use Bytecode::*;
+            match bytecode {
+                Load(id, dst, _) | Assign(id, dst, _, _) => {
+                    UnusedAssignmentChecker::check_unused_assignment(&target, *id, offset, *dst)
+                },
+                Call(id, dsts, _, _, _) => {
+                    for dst in dsts {
+                        UnusedAssignmentChecker::check_unused_assignment(&target, *id, offset, *dst)
+                    }
+                },
+                _ => {},
+            }
+        }
+        data
+    }
+
+    fn name(&self) -> String {
+        "UnusedAssignmentChecker".to_string()
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/ability-check/index_ability_err.exp b/third_party/move/move-compiler-v2/tests/ability-check/index_ability_err.exp
new file mode 100644
index 0000000000000..f43ecc4cd3d91
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/ability-check/index_ability_err.exp
@@ -0,0 +1,7 @@
+
+Diagnostics:
+error: value of type `test::Y<test::X<bool>>` does not have the `copy` ability
+   ┌─ tests/ability-check/index_ability_err.move:12:17
+   │
+12 │         let _ = Y<X<bool>>[addr];
+   │                 ^^^^^^^^^^^^^^^^ reference content copied here
diff --git a/third_party/move/move-compiler-v2/tests/ability-check/index_ability_err.move b/third_party/move/move-compiler-v2/tests/ability-check/index_ability_err.move
new file mode 100644
index 0000000000000..b577118be038b
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/ability-check/index_ability_err.move
@@ -0,0 +1,15 @@
+module 0x42::test {
+
+    struct X<M> has copy, drop, store {
+        value: M
+    }
+    struct Y<T> has key, drop {
+        field: T
+    }
+
+    fun test_resource_no_copy() acquires Y {
+        let addr = @0x1;
+        let _ = Y<X<bool>>[addr];
+    }
+
+}
diff --git a/third_party/move/move-compiler-v2/tests/ability-check/index_ability_err_2.exp b/third_party/move/move-compiler-v2/tests/ability-check/index_ability_err_2.exp
new file mode 100644
index 0000000000000..ab52f302465d8
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/ability-check/index_ability_err_2.exp
@@ -0,0 +1,7 @@
+
+Diagnostics:
+error: resource indexing can only applied to a resource type (a struct type which has key ability)
+  ┌─ tests/ability-check/index_ability_err_2.move:9:17
+  │
+9 │         let _ = X<bool>[addr];
+  │                 ^^^^^^^^^^^^^
diff --git a/third_party/move/move-compiler-v2/tests/ability-check/index_ability_err_2.move b/third_party/move/move-compiler-v2/tests/ability-check/index_ability_err_2.move
new file mode 100644
index 0000000000000..3417377361c05
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/ability-check/index_ability_err_2.move
@@ -0,0 +1,12 @@
+module 0x42::test {
+
+    struct X<M> has copy, drop, store {
+        value: M
+    }
+
+    fun test_struct_no_resource() acquires X {
+        let addr = @0x1;
+        let _ = X<bool>[addr];
+    }
+
+}
diff --git a/third_party/move/move-compiler-v2/tests/ability-check/v1-signer/read_ref_transitive.exp b/third_party/move/move-compiler-v2/tests/ability-check/v1-signer/read_ref_transitive.exp
index 66717148197eb..42c97c706b815 100644
--- a/third_party/move/move-compiler-v2/tests/ability-check/v1-signer/read_ref_transitive.exp
+++ b/third_party/move/move-compiler-v2/tests/ability-check/v1-signer/read_ref_transitive.exp
@@ -1,11 +1,5 @@
 
 Diagnostics:
-error: value of type `M::S<signer>` does not have the `copy` ability
-  ┌─ tests/ability-check/v1-signer/read_ref_transitive.move:5:9
-  │
-5 │         *&x
-  │         ^^^ reference content copied here
-
 error: value of type `signer` does not have the `copy` ability
    ┌─ tests/ability-check/v1-signer/read_ref_transitive.move:15:9
    │
diff --git a/third_party/move/move-compiler-v2/tests/ability-check/v1-typing/assign_pop_resource.exp b/third_party/move/move-compiler-v2/tests/ability-check/v1-typing/assign_pop_resource.exp
index 6b23c900f6a24..4094f23a8ee64 100644
--- a/third_party/move/move-compiler-v2/tests/ability-check/v1-typing/assign_pop_resource.exp
+++ b/third_party/move/move-compiler-v2/tests/ability-check/v1-typing/assign_pop_resource.exp
@@ -4,10 +4,16 @@ error: value of type `M::R` does not have the `drop` ability
   ┌─ tests/ability-check/v1-typing/assign_pop_resource.move:5:9
   │
 5 │         _ = R{};
-  │         ^^^^^^^ implicitly dropped here since it is no longer used
+  │         ^ implicitly dropped here since it is no longer used
 
 error: value of type `M::R` does not have the `drop` ability
-  ┌─ tests/ability-check/v1-typing/assign_pop_resource.move:6:9
+  ┌─ tests/ability-check/v1-typing/assign_pop_resource.move:6:10
   │
 6 │         (_, _) = (R{}, R{});
-  │         ^^^^^^^^^^^^^^^^^^^ implicitly dropped here since it is no longer used
+  │          ^ implicitly dropped here since it is no longer used
+
+error: value of type `M::R` does not have the `drop` ability
+  ┌─ tests/ability-check/v1-typing/assign_pop_resource.move:6:13
+  │
+6 │         (_, _) = (R{}, R{});
+  │             ^ implicitly dropped here since it is no longer used
diff --git a/third_party/move/move-compiler-v2/tests/ability-check/v1-typing/bind_pop_resource.exp b/third_party/move/move-compiler-v2/tests/ability-check/v1-typing/bind_pop_resource.exp
index 4c302bc9b9956..2c2f2e34d9686 100644
--- a/third_party/move/move-compiler-v2/tests/ability-check/v1-typing/bind_pop_resource.exp
+++ b/third_party/move/move-compiler-v2/tests/ability-check/v1-typing/bind_pop_resource.exp
@@ -13,7 +13,13 @@ error: local `_r` of type `M::R` does not have the `drop` ability
   │                     ^^^ implicitly dropped here since it is no longer used
 
 error: value of type `M::R` does not have the `drop` ability
-  ┌─ tests/ability-check/v1-typing/bind_pop_resource.move:9:13
+  ┌─ tests/ability-check/v1-typing/bind_pop_resource.move:9:14
   │
 9 │         let (_, _):(R, R) = (R{}, R{});
-  │             ^^^^^^ implicitly dropped here since it is no longer used
+  │              ^ implicitly dropped here since it is no longer used
+
+error: value of type `M::R` does not have the `drop` ability
+  ┌─ tests/ability-check/v1-typing/bind_pop_resource.move:9:17
+  │
+9 │         let (_, _):(R, R) = (R{}, R{});
+  │                 ^ implicitly dropped here since it is no longer used
diff --git a/third_party/move/move-compiler-v2/tests/ability-check/v1-typing/constraints_not_satisfied_lvalues_pack_type_args.exp b/third_party/move/move-compiler-v2/tests/ability-check/v1-typing/constraints_not_satisfied_lvalues_pack_type_args.exp
new file mode 100644
index 0000000000000..06bd59f6294f0
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/ability-check/v1-typing/constraints_not_satisfied_lvalues_pack_type_args.exp
@@ -0,0 +1,12 @@
+
+Diagnostics:
+error: type `R` is missing required ability `copy`
+  ┌─ tests/ability-check/v1-typing/constraints_not_satisfied_lvalues_pack_type_args.move:8:20
+  │
+2 │     struct CupC<phantom T: copy> {}
+  │                         - declaration of type parameter `T`
+  ·
+8 │         let B<CupC<R>> {} = abort 0;
+  │                    ^
+  │
+  = required by instantiating type parameter `phantom T:copy` of struct `CupC`
diff --git a/third_party/move/move-compiler-v2/tests/ability-check/v1-typing/constraints_not_satisfied_lvalues_pack_type_args.move b/third_party/move/move-compiler-v2/tests/ability-check/v1-typing/constraints_not_satisfied_lvalues_pack_type_args.move
new file mode 100644
index 0000000000000..2e5b4e4a7dfbe
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/ability-check/v1-typing/constraints_not_satisfied_lvalues_pack_type_args.move
@@ -0,0 +1,11 @@
+module 0x8675309::M {
+    struct CupC<phantom T: copy> {}
+    struct R {}
+
+    struct B<phantom T>{}
+
+    fun foo() {
+        let B<CupC<R>> {} = abort 0;
+        B<CupC<R>> {} = abort 0;
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/ability-check/v1-typing/instantiate_signatures.exp b/third_party/move/move-compiler-v2/tests/ability-check/v1-typing/instantiate_signatures.exp
new file mode 100644
index 0000000000000..3137b238c7efd
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/ability-check/v1-typing/instantiate_signatures.exp
@@ -0,0 +1,131 @@
+
+Diagnostics:
+error: type `R` is missing required ability `drop`
+   ┌─ tests/ability-check/v1-typing/instantiate_signatures.move:11:15
+   │
+ 3 │     struct S<T: drop> has drop { f: T }
+   │              - declaration of type parameter `T`
+   ·
+11 │         f1: S<R>,
+   │               ^
+   │
+   = required by instantiating type parameter `T:drop` of struct `S`
+
+error: reference type `&u64` is not allowed as a type argument
+   ┌─ tests/ability-check/v1-typing/instantiate_signatures.move:12:15
+   │
+ 3 │     struct S<T: drop> has drop { f: T }
+   │              - declaration of type parameter `T`
+   ·
+12 │         f2: S<&u64>,
+   │               ^^^^
+   │
+   = required by instantiating type parameter `T:drop` of struct `S`
+
+error: reference type `&&u64` is not allowed as a field type
+   ┌─ tests/ability-check/v1-typing/instantiate_signatures.move:13:13
+   │
+13 │         f3: &(&u64),
+   │             ^^^^^^^
+   │
+   = required by declaration of field `f3`
+
+error: tuple type `(u64, u64)` is not allowed as a type argument
+   ┌─ tests/ability-check/v1-typing/instantiate_signatures.move:14:15
+   │
+ 3 │     struct S<T: drop> has drop { f: T }
+   │              - declaration of type parameter `T`
+   ·
+14 │         f4: S<(u64, u64)>,
+   │               ^^^^^^^^^^
+   │
+   = required by instantiating type parameter `T:drop` of struct `S`
+
+error: type `R` is missing required ability `drop`
+   ┌─ tests/ability-check/v1-typing/instantiate_signatures.move:18:16
+   │
+ 3 │     struct S<T: drop> has drop { f: T }
+   │              - declaration of type parameter `T`
+   ·
+18 │         _f1: S<R>,
+   │                ^
+   │
+   = required by instantiating type parameter `T:drop` of struct `S`
+
+error: reference type `&u64` is not allowed as a type argument
+   ┌─ tests/ability-check/v1-typing/instantiate_signatures.move:19:16
+   │
+ 3 │     struct S<T: drop> has drop { f: T }
+   │              - declaration of type parameter `T`
+   ·
+19 │         _f2: S<&u64>,
+   │                ^^^^
+   │
+   = required by instantiating type parameter `T:drop` of struct `S`
+
+error: tuple type `(u64, u64)` is not allowed as a type argument
+   ┌─ tests/ability-check/v1-typing/instantiate_signatures.move:21:16
+   │
+ 3 │     struct S<T: drop> has drop { f: T }
+   │              - declaration of type parameter `T`
+   ·
+21 │         _f4: S<(u64, u64)>,
+   │                ^^^^^^^^^^
+   │
+   = required by instantiating type parameter `T:drop` of struct `S`
+
+error: type `R` is missing required ability `drop`
+   ┌─ tests/ability-check/v1-typing/instantiate_signatures.move:32:19
+   │
+ 3 │     struct S<T: drop> has drop { f: T }
+   │              - declaration of type parameter `T`
+   ·
+32 │         let f1: S<R> = abort 0;
+   │                   ^
+   │
+   = required by instantiating type parameter `T:drop` of struct `S`
+
+error: reference type `&u64` is not allowed as a type argument
+   ┌─ tests/ability-check/v1-typing/instantiate_signatures.move:33:19
+   │
+ 3 │     struct S<T: drop> has drop { f: T }
+   │              - declaration of type parameter `T`
+   ·
+33 │         let f2: S<&u64> = abort 0;
+   │                   ^^^^
+   │
+   = required by instantiating type parameter `T:drop` of struct `S`
+
+error: tuple type `(u64, u64)` is not allowed as a type argument
+   ┌─ tests/ability-check/v1-typing/instantiate_signatures.move:35:19
+   │
+ 3 │     struct S<T: drop> has drop { f: T }
+   │              - declaration of type parameter `T`
+   ·
+35 │         let f4: S<(u64, u64)> = abort 0;
+   │                   ^^^^^^^^^^
+   │
+   = required by instantiating type parameter `T:drop` of struct `S`
+
+error: reference type `&&u64` is not allowed as a type argument
+   ┌─ tests/ability-check/v1-typing/instantiate_signatures.move:39:12
+   │
+ 5 │     fun id<T>(x: T): T { x }
+   │            - declaration of type parameter `T`
+   ·
+39 │         id<&(&u64)>(abort 0);
+   │            ^^^^^^^
+   │
+   = required by instantiating type parameter `T` of function `id`
+
+error: type `R` is missing required ability `drop`
+   ┌─ tests/ability-check/v1-typing/instantiate_signatures.move:42:11
+   │
+ 3 │     struct S<T: drop> has drop { f: T }
+   │              - declaration of type parameter `T`
+   ·
+42 │         S<S<R>> { f: abort 0 };
+   │           ^^^^
+   │
+   = required by instantiating type parameter `T:drop` of struct `S`
+   = required by instantiating type parameter `T:drop` of struct `S`
diff --git a/third_party/move/move-compiler-v2/tests/ability-check/v1-typing/instantiate_signatures.move b/third_party/move/move-compiler-v2/tests/ability-check/v1-typing/instantiate_signatures.move
new file mode 100644
index 0000000000000..33f84f31b4ae2
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/ability-check/v1-typing/instantiate_signatures.move
@@ -0,0 +1,48 @@
+address 0x42 {
+module M {
+    struct S<T: drop> has drop { f: T }
+    struct R {}
+    fun id<T>(x: T): T { x }
+
+    // Written types with unsatisified constraints
+    // Checked in various positions
+
+    struct S1 {
+        f1: S<R>,
+        f2: S<&u64>,
+        f3: &(&u64),
+        f4: S<(u64, u64)>,
+    }
+
+    fun f1(
+        _f1: S<R>,
+        _f2: S<&u64>,
+        _f3: &(&u64),
+        _f4: S<(u64, u64)>,
+    ): (
+        S<R>,
+        S<&u64>,
+        &(&u64),
+        S<(u64, u64)>,
+    ) {
+        abort 0
+    }
+
+    fun f2() {
+        let f1: S<R> = abort 0;
+        let f2: S<&u64> = abort 0;
+        let f3: &(&u64) = abort 0;
+        let f4: S<(u64, u64)> = abort 0;
+
+        id<S<R>>(abort 0);
+        id<S<&u64>>(abort 0);
+        id<&(&u64)>(abort 0);
+        id<S<(u64, u64)>>(abort 0);
+
+        S<S<R>> { f: abort 0 };
+        S<S<&u64>> { f: abort 0 };
+        S<&(&u64)> { f: abort 0 };
+        S<S<(u64, u64)>> { f: abort 0 };
+    }
+}
+}
diff --git a/third_party/move/move-compiler-v2/tests/ability-check/v1-typing/pack_constraint_not_satisfied.exp b/third_party/move/move-compiler-v2/tests/ability-check/v1-typing/pack_constraint_not_satisfied.exp
index 167e609fa7334..f849cbe9d7022 100644
--- a/third_party/move/move-compiler-v2/tests/ability-check/v1-typing/pack_constraint_not_satisfied.exp
+++ b/third_party/move/move-compiler-v2/tests/ability-check/v1-typing/pack_constraint_not_satisfied.exp
@@ -11,18 +11,18 @@ error: type `Coin` is missing required ability `drop` (type was inferred)
   │
   = required by instantiating type parameter `T:drop` of struct `S`
 
-error: type `R<key>` is missing required ability `key` (type was inferred)
-   ┌─ tests/ability-check/v1-typing/pack_constraint_not_satisfied.move:12:9
+error: type `R<key + integer>` is missing required ability `key` (type was inferred)
+   ┌─ tests/ability-check/v1-typing/pack_constraint_not_satisfied.move:12:30
    │
  3 │     struct R<T: key>  { r: T }
    │              - declaration of type parameter `T`
    ·
 12 │         R {r: R { r: _ } } = R { r: R { r: 0 }};
-   │         ^
+   │                              ^
    │
    = required by instantiating type parameter `T:key` of struct `R`
 
-error: type `R<key + integer>` is missing required ability `key` (type was inferred)
+error: type `R<key>` is missing required ability `key` (type was inferred)
    ┌─ tests/ability-check/v1-typing/pack_constraint_not_satisfied.move:12:30
    │
  3 │     struct R<T: key>  { r: T }
diff --git a/third_party/move/move-compiler-v2/tests/ability-transform/borrowed_from_one_path.exp b/third_party/move/move-compiler-v2/tests/ability-transform/borrowed_from_one_path.exp
index 2aa668fef3106..ae4da36466455 100644
--- a/third_party/move/move-compiler-v2/tests/ability-transform/borrowed_from_one_path.exp
+++ b/third_party/move/move-compiler-v2/tests/ability-transform/borrowed_from_one_path.exp
@@ -71,6 +71,50 @@ fun m::f($t0: u8, $t1: &vector<u64>): u64 {
  14: return $t2
 }
 
+============ after LiveVarAnalysisProcessor: ================
+
+[variant baseline]
+fun m::f($t0: u8, $t1: &vector<u64>): u64 {
+     var $t2: u64
+     var $t3: &vector<u64>
+     var $t4: bool
+     var $t5: u8
+     var $t6: &m::R
+     var $t7: address
+     var $t8: &u64
+     var $t9: u64
+     # live vars: $t0, $t1
+  0: $t5 := 0
+     # live vars: $t0, $t1, $t5
+  1: $t4 := ==($t0, $t5)
+     # live vars: $t1, $t4
+  2: if ($t4) goto 3 else goto 8
+     # live vars: $t1
+  3: label L0
+     # live vars:
+  4: $t7 := 0x1
+     # live vars: $t7
+  5: $t6 := borrow_global<m::R>($t7)
+     # live vars: $t6
+  6: $t3 := borrow_field<m::R>.data($t6)
+     # live vars: $t3
+  7: goto 10
+     # live vars: $t1
+  8: label L1
+     # live vars: $t1
+  9: $t3 := infer($t1)
+     # live vars: $t3
+ 10: label L2
+     # live vars: $t3
+ 11: $t9 := 0
+     # live vars: $t3, $t9
+ 12: $t8 := vector::borrow<u64>($t3, $t9)
+     # live vars: $t8
+ 13: $t2 := read_ref($t8)
+     # live vars: $t2
+ 14: return $t2
+}
+
 ============ after ReferenceSafetyProcessor: ================
 
 [variant baseline]
@@ -84,25 +128,25 @@ fun m::f($t0: u8, $t1: &vector<u64>): u64 {
      var $t8: &u64
      var $t9: u64
      # live vars: $t0, $t1
-     # graph: {@1000000=external[borrow(false) -> @2000000],@2000000=derived[]}
+     # graph: {@1000000=external[borrow_imm -> @2000000],@2000000=derived[]}
      # locals: {$t1=@2000000}
      # globals: {}
      #
   0: $t5 := 0
      # live vars: $t0, $t1, $t5
-     # graph: {@1000000=external[borrow(false) -> @2000000],@2000000=derived[]}
+     # graph: {@1000000=external[borrow_imm -> @2000000],@2000000=derived[]}
      # locals: {$t1=@2000000}
      # globals: {}
      #
   1: $t4 := ==($t0, $t5)
      # live vars: $t1, $t4
-     # graph: {@1000000=external[borrow(false) -> @2000000],@2000000=derived[]}
+     # graph: {@1000000=external[borrow_imm -> @2000000],@2000000=derived[]}
      # locals: {$t1=@2000000}
      # globals: {}
      #
   2: if ($t4) goto 3 else goto 8
      # live vars: $t1
-     # graph: {@1000000=external[borrow(false) -> @2000000],@2000000=derived[]}
+     # graph: {@1000000=external[borrow_imm -> @2000000],@2000000=derived[]}
      # locals: {$t1=@2000000}
      # globals: {}
      #
@@ -120,53 +164,53 @@ fun m::f($t0: u8, $t1: &vector<u64>): u64 {
      #
   5: $t6 := borrow_global<m::R>($t7)
      # live vars: $t6
-     # graph: {@500=global<m::R>[borrow_global(false, 5) -> @501],@501=derived[]}
+     # graph: {@500=global<m::R>[borrow_global_imm@5 -> @501],@501=derived[]}
      # locals: {$t6=@501}
      # globals: {m::R=@500}
      #
   6: $t3 := borrow_field<m::R>.data($t6)
      # live vars: $t3
-     # graph: {@500=global<m::R>[borrow_global(false, 5) -> @501],@501=derived[borrow_field(false) -> @601],@601=derived[]}
+     # graph: {@500=global<m::R>[borrow_global_imm@5 -> @501],@501=derived[borrow_imm.data -> @601],@601=derived[]}
      # locals: {$t3=@601}
      # globals: {m::R=@500}
      # derived-from: @601=$t6
      #
   7: goto 10
      # live vars: $t1
-     # graph: {@1000000=external[borrow(false) -> @2000000],@2000000=derived[]}
+     # graph: {@1000000=external[borrow_imm -> @2000000],@2000000=derived[]}
      # locals: {$t1=@2000000}
      # globals: {}
      #
   8: label L1
      # live vars: $t1
-     # graph: {@1000000=external[borrow(false) -> @2000000],@2000000=derived[]}
+     # graph: {@1000000=external[borrow_imm -> @2000000],@2000000=derived[]}
      # locals: {$t1=@2000000}
      # globals: {}
      #
   9: $t3 := infer($t1)
      # live vars: $t3
-     # graph: {@500=global<m::R>[borrow_global(false, 5) -> @501],@501=derived[borrow_field(false) -> @601],@601=derived[],@1000000=external[borrow(false) -> @601]}
+     # graph: {@500=global<m::R>[borrow_global_imm@5 -> @501],@501=derived[borrow_imm.data -> @601],@601=derived[],@1000000=external[borrow_imm -> @601]}
      # locals: {$t3=@601}
      # globals: {m::R=@500}
      # derived-from: @601=$t6
      #
  10: label L2
      # live vars: $t3
-     # graph: {@500=global<m::R>[borrow_global(false, 5) -> @501],@501=derived[borrow_field(false) -> @601],@601=derived[],@1000000=external[borrow(false) -> @601]}
+     # graph: {@500=global<m::R>[borrow_global_imm@5 -> @501],@501=derived[borrow_imm.data -> @601],@601=derived[],@1000000=external[borrow_imm -> @601]}
      # locals: {$t3=@601}
      # globals: {m::R=@500}
      # derived-from: @601=$t6
      #
  11: $t9 := 0
      # live vars: $t3, $t9
-     # graph: {@500=global<m::R>[borrow_global(false, 5) -> @501],@501=derived[borrow_field(false) -> @601],@601=derived[],@1000000=external[borrow(false) -> @601]}
+     # graph: {@500=global<m::R>[borrow_global_imm@5 -> @501],@501=derived[borrow_imm.data -> @601],@601=derived[],@1000000=external[borrow_imm -> @601]}
      # locals: {$t3=@601}
      # globals: {m::R=@500}
      # derived-from: @601=$t6
      #
  12: $t8 := vector::borrow<u64>($t3, $t9)
      # live vars: $t8
-     # graph: {@500=global<m::R>[borrow_global(false, 5) -> @501],@501=derived[borrow_field(false) -> @601],@601=derived[call(false, 12) -> @C00],@C00=derived[],@1000000=external[borrow(false) -> @601]}
+     # graph: {@500=global<m::R>[borrow_global_imm@5 -> @501],@501=derived[borrow_imm.data -> @601],@601=derived[call_imm@12 -> @C00],@C00=derived[],@1000000=external[borrow_imm -> @601]}
      # locals: {$t8=@C00}
      # globals: {m::R=@500}
      # derived-from: @601=$t6,@C00=$t3
@@ -194,28 +238,28 @@ fun m::f($t0: u8, $t1: &vector<u64>): u64 {
      var $t9: u64
      # abort state: {returns,aborts}
      # live vars: $t0, $t1
-     # graph: {@1000000=external[borrow(false) -> @2000000],@2000000=derived[]}
+     # graph: {@1000000=external[borrow_imm -> @2000000],@2000000=derived[]}
      # locals: {$t1=@2000000}
      # globals: {}
      #
   0: $t5 := 0
      # abort state: {returns,aborts}
      # live vars: $t0, $t1, $t5
-     # graph: {@1000000=external[borrow(false) -> @2000000],@2000000=derived[]}
+     # graph: {@1000000=external[borrow_imm -> @2000000],@2000000=derived[]}
      # locals: {$t1=@2000000}
      # globals: {}
      #
   1: $t4 := ==($t0, $t5)
      # abort state: {returns,aborts}
      # live vars: $t1, $t4
-     # graph: {@1000000=external[borrow(false) -> @2000000],@2000000=derived[]}
+     # graph: {@1000000=external[borrow_imm -> @2000000],@2000000=derived[]}
      # locals: {$t1=@2000000}
      # globals: {}
      #
   2: if ($t4) goto 3 else goto 8
      # abort state: {returns,aborts}
      # live vars: $t1
-     # graph: {@1000000=external[borrow(false) -> @2000000],@2000000=derived[]}
+     # graph: {@1000000=external[borrow_imm -> @2000000],@2000000=derived[]}
      # locals: {$t1=@2000000}
      # globals: {}
      #
@@ -236,14 +280,14 @@ fun m::f($t0: u8, $t1: &vector<u64>): u64 {
   5: $t6 := borrow_global<m::R>($t7)
      # abort state: {returns,aborts}
      # live vars: $t6
-     # graph: {@500=global<m::R>[borrow_global(false, 5) -> @501],@501=derived[]}
+     # graph: {@500=global<m::R>[borrow_global_imm@5 -> @501],@501=derived[]}
      # locals: {$t6=@501}
      # globals: {m::R=@500}
      #
   6: $t3 := borrow_field<m::R>.data($t6)
      # abort state: {returns,aborts}
      # live vars: $t3
-     # graph: {@500=global<m::R>[borrow_global(false, 5) -> @501],@501=derived[borrow_field(false) -> @601],@601=derived[]}
+     # graph: {@500=global<m::R>[borrow_global_imm@5 -> @501],@501=derived[borrow_imm.data -> @601],@601=derived[]}
      # locals: {$t3=@601}
      # globals: {m::R=@500}
      # derived-from: @601=$t6
@@ -251,21 +295,21 @@ fun m::f($t0: u8, $t1: &vector<u64>): u64 {
   7: goto 10
      # abort state: {returns,aborts}
      # live vars: $t1
-     # graph: {@1000000=external[borrow(false) -> @2000000],@2000000=derived[]}
+     # graph: {@1000000=external[borrow_imm -> @2000000],@2000000=derived[]}
      # locals: {$t1=@2000000}
      # globals: {}
      #
   8: label L1
      # abort state: {returns,aborts}
      # live vars: $t1
-     # graph: {@1000000=external[borrow(false) -> @2000000],@2000000=derived[]}
+     # graph: {@1000000=external[borrow_imm -> @2000000],@2000000=derived[]}
      # locals: {$t1=@2000000}
      # globals: {}
      #
   9: $t3 := infer($t1)
      # abort state: {returns,aborts}
      # live vars: $t3
-     # graph: {@500=global<m::R>[borrow_global(false, 5) -> @501],@501=derived[borrow_field(false) -> @601],@601=derived[],@1000000=external[borrow(false) -> @601]}
+     # graph: {@500=global<m::R>[borrow_global_imm@5 -> @501],@501=derived[borrow_imm.data -> @601],@601=derived[],@1000000=external[borrow_imm -> @601]}
      # locals: {$t3=@601}
      # globals: {m::R=@500}
      # derived-from: @601=$t6
@@ -273,7 +317,7 @@ fun m::f($t0: u8, $t1: &vector<u64>): u64 {
  10: label L2
      # abort state: {returns,aborts}
      # live vars: $t3
-     # graph: {@500=global<m::R>[borrow_global(false, 5) -> @501],@501=derived[borrow_field(false) -> @601],@601=derived[],@1000000=external[borrow(false) -> @601]}
+     # graph: {@500=global<m::R>[borrow_global_imm@5 -> @501],@501=derived[borrow_imm.data -> @601],@601=derived[],@1000000=external[borrow_imm -> @601]}
      # locals: {$t3=@601}
      # globals: {m::R=@500}
      # derived-from: @601=$t6
@@ -281,7 +325,7 @@ fun m::f($t0: u8, $t1: &vector<u64>): u64 {
  11: $t9 := 0
      # abort state: {returns,aborts}
      # live vars: $t3, $t9
-     # graph: {@500=global<m::R>[borrow_global(false, 5) -> @501],@501=derived[borrow_field(false) -> @601],@601=derived[],@1000000=external[borrow(false) -> @601]}
+     # graph: {@500=global<m::R>[borrow_global_imm@5 -> @501],@501=derived[borrow_imm.data -> @601],@601=derived[],@1000000=external[borrow_imm -> @601]}
      # locals: {$t3=@601}
      # globals: {m::R=@500}
      # derived-from: @601=$t6
@@ -289,7 +333,7 @@ fun m::f($t0: u8, $t1: &vector<u64>): u64 {
  12: $t8 := vector::borrow<u64>($t3, $t9)
      # abort state: {returns}
      # live vars: $t8
-     # graph: {@500=global<m::R>[borrow_global(false, 5) -> @501],@501=derived[borrow_field(false) -> @601],@601=derived[call(false, 12) -> @C00],@C00=derived[],@1000000=external[borrow(false) -> @601]}
+     # graph: {@500=global<m::R>[borrow_global_imm@5 -> @501],@501=derived[borrow_imm.data -> @601],@601=derived[call_imm@12 -> @C00],@C00=derived[],@1000000=external[borrow_imm -> @601]}
      # locals: {$t8=@C00}
      # globals: {m::R=@500}
      # derived-from: @601=$t6,@C00=$t3
diff --git a/third_party/move/move-compiler-v2/tests/ability-transform/by_reference.exp b/third_party/move/move-compiler-v2/tests/ability-transform/by_reference.exp
index 761d5645c73c3..b6044fa8bb79c 100644
--- a/third_party/move/move-compiler-v2/tests/ability-transform/by_reference.exp
+++ b/third_party/move/move-compiler-v2/tests/ability-transform/by_reference.exp
@@ -8,34 +8,30 @@ fun <SELF>_0::check() {
      var $t3: u64
      var $t4: bool
      var $t5: u64
-     var $t6: &u64
+     var $t6: u64
      var $t7: u64
-     var $t8: u64
-     var $t9: u64
-     var $t10: bool
-     var $t11: vector<u8>
-     var $t12: &vector<u8>
-     var $t13: vector<u8>
-     var $t14: vector<u8>
-     var $t15: u64
-     var $t16: &mut u64
-     var $t17: u64
-     var $t18: u64
-     var $t19: &mut vector<u8>
-     var $t20: vector<u8>
-     var $t21: vector<u8>
+     var $t8: bool
+     var $t9: vector<u8>
+     var $t10: vector<u8>
+     var $t11: u64
+     var $t12: &mut u64
+     var $t13: u64
+     var $t14: u64
+     var $t15: &mut vector<u8>
+     var $t16: vector<u8>
+     var $t17: vector<u8>
+     var $t18: bool
+     var $t19: u64
+     var $t20: u64
+     var $t21: u64
      var $t22: bool
-     var $t23: u64
-     var $t24: u64
+     var $t23: vector<u8>
+     var $t24: vector<u8>
      var $t25: u64
      var $t26: bool
-     var $t27: vector<u8>
-     var $t28: vector<u8>
+     var $t27: u64
+     var $t28: bool
      var $t29: u64
-     var $t30: bool
-     var $t31: u64
-     var $t32: bool
-     var $t33: u64
   0: $t0 := true
   1: if ($t0) goto 2 else goto 4
   2: label L0
@@ -52,75 +48,71 @@ fun <SELF>_0::check() {
  13: $t3 := 42
  14: abort($t3)
  15: label L5
- 16: $t7 := 0
- 17: $t6 := borrow_local($t7)
- 18: $t5 := read_ref($t6)
- 19: $t8 := 0
- 20: $t4 := ==($t5, $t8)
- 21: if ($t4) goto 22 else goto 24
- 22: label L6
- 23: goto 27
- 24: label L7
- 25: $t9 := 42
- 26: abort($t9)
- 27: label L8
- 28: $t13 := [104, 101, 108, 108, 111]
- 29: $t12 := borrow_local($t13)
- 30: $t11 := read_ref($t12)
- 31: $t14 := [104, 101, 108, 108, 111]
- 32: $t10 := ==($t11, $t14)
- 33: if ($t10) goto 34 else goto 36
- 34: label L9
- 35: goto 39
- 36: label L10
- 37: $t15 := 42
- 38: abort($t15)
- 39: label L11
- 40: $t17 := 0
- 41: $t16 := borrow_local($t17)
- 42: $t18 := 1
- 43: write_ref($t16, $t18)
- 44: $t20 := [104, 101, 108, 108, 111]
- 45: $t19 := borrow_local($t20)
- 46: $t21 := [98, 121, 101]
- 47: write_ref($t19, $t21)
- 48: $t23 := read_ref($t16)
- 49: $t24 := 1
- 50: $t22 := ==($t23, $t24)
- 51: if ($t22) goto 52 else goto 54
- 52: label L12
- 53: goto 57
- 54: label L13
- 55: $t25 := 42
- 56: abort($t25)
- 57: label L14
- 58: $t27 := read_ref($t19)
- 59: $t28 := [98, 121, 101]
- 60: $t26 := ==($t27, $t28)
- 61: if ($t26) goto 62 else goto 64
- 62: label L15
- 63: goto 67
- 64: label L16
- 65: $t29 := 42
- 66: abort($t29)
- 67: label L17
- 68: $t30 := true
- 69: if ($t30) goto 70 else goto 72
- 70: label L18
- 71: goto 75
- 72: label L19
- 73: $t31 := 42
- 74: abort($t31)
- 75: label L20
- 76: $t32 := true
- 77: if ($t32) goto 78 else goto 80
- 78: label L21
- 79: goto 83
- 80: label L22
- 81: $t33 := 42
- 82: abort($t33)
- 83: label L23
- 84: return ()
+ 16: $t5 := 0
+ 17: $t6 := 0
+ 18: $t4 := ==($t5, $t6)
+ 19: if ($t4) goto 20 else goto 22
+ 20: label L6
+ 21: goto 25
+ 22: label L7
+ 23: $t7 := 42
+ 24: abort($t7)
+ 25: label L8
+ 26: $t9 := [104, 101, 108, 108, 111]
+ 27: $t10 := [104, 101, 108, 108, 111]
+ 28: $t8 := ==($t9, $t10)
+ 29: if ($t8) goto 30 else goto 32
+ 30: label L9
+ 31: goto 35
+ 32: label L10
+ 33: $t11 := 42
+ 34: abort($t11)
+ 35: label L11
+ 36: $t13 := 0
+ 37: $t12 := borrow_local($t13)
+ 38: $t14 := 1
+ 39: write_ref($t12, $t14)
+ 40: $t16 := [104, 101, 108, 108, 111]
+ 41: $t15 := borrow_local($t16)
+ 42: $t17 := [98, 121, 101]
+ 43: write_ref($t15, $t17)
+ 44: $t19 := read_ref($t12)
+ 45: $t20 := 1
+ 46: $t18 := ==($t19, $t20)
+ 47: if ($t18) goto 48 else goto 50
+ 48: label L12
+ 49: goto 53
+ 50: label L13
+ 51: $t21 := 42
+ 52: abort($t21)
+ 53: label L14
+ 54: $t23 := read_ref($t15)
+ 55: $t24 := [98, 121, 101]
+ 56: $t22 := ==($t23, $t24)
+ 57: if ($t22) goto 58 else goto 60
+ 58: label L15
+ 59: goto 63
+ 60: label L16
+ 61: $t25 := 42
+ 62: abort($t25)
+ 63: label L17
+ 64: $t26 := true
+ 65: if ($t26) goto 66 else goto 68
+ 66: label L18
+ 67: goto 71
+ 68: label L19
+ 69: $t27 := 42
+ 70: abort($t27)
+ 71: label L20
+ 72: $t28 := true
+ 73: if ($t28) goto 74 else goto 76
+ 74: label L21
+ 75: goto 79
+ 76: label L22
+ 77: $t29 := 42
+ 78: abort($t29)
+ 79: label L23
+ 80: return ()
 }
 
 ============ after LiveVarAnalysisProcessor: ================
@@ -133,34 +125,30 @@ fun <SELF>_0::check() {
      var $t3: u64
      var $t4: bool
      var $t5: u64
-     var $t6: &u64
+     var $t6: u64
      var $t7: u64
-     var $t8: u64
-     var $t9: u64
-     var $t10: bool
-     var $t11: vector<u8>
-     var $t12: &vector<u8>
-     var $t13: vector<u8>
-     var $t14: vector<u8>
-     var $t15: u64
-     var $t16: &mut u64
-     var $t17: u64
-     var $t18: u64
-     var $t19: &mut vector<u8>
-     var $t20: vector<u8>
-     var $t21: vector<u8>
+     var $t8: bool
+     var $t9: vector<u8>
+     var $t10: vector<u8>
+     var $t11: u64
+     var $t12: &mut u64
+     var $t13: u64
+     var $t14: u64
+     var $t15: &mut vector<u8>
+     var $t16: vector<u8>
+     var $t17: vector<u8>
+     var $t18: bool
+     var $t19: u64
+     var $t20: u64
+     var $t21: u64
      var $t22: bool
-     var $t23: u64
-     var $t24: u64
+     var $t23: vector<u8>
+     var $t24: vector<u8>
      var $t25: u64
      var $t26: bool
-     var $t27: vector<u8>
-     var $t28: vector<u8>
+     var $t27: u64
+     var $t28: bool
      var $t29: u64
-     var $t30: bool
-     var $t31: u64
-     var $t32: bool
-     var $t33: u64
      # live vars:
   0: $t0 := true
      # live vars: $t0
@@ -194,143 +182,333 @@ fun <SELF>_0::check() {
      # live vars:
  15: label L5
      # live vars:
- 16: $t7 := 0
-     # live vars: $t7
- 17: $t6 := borrow_local($t7)
-     # live vars: $t6
- 18: $t5 := read_ref($t6)
+ 16: $t5 := 0
      # live vars: $t5
- 19: $t8 := 0
-     # live vars: $t5, $t8
- 20: $t4 := ==($t5, $t8)
+ 17: $t6 := 0
+     # live vars: $t5, $t6
+ 18: $t4 := ==($t5, $t6)
      # live vars: $t4
- 21: if ($t4) goto 22 else goto 24
+ 19: if ($t4) goto 20 else goto 22
+     # live vars:
+ 20: label L6
      # live vars:
- 22: label L6
+ 21: goto 25
      # live vars:
- 23: goto 27
+ 22: label L7
      # live vars:
- 24: label L7
+ 23: $t7 := 42
+     # live vars: $t7
+ 24: abort($t7)
      # live vars:
- 25: $t9 := 42
+ 25: label L8
+     # live vars:
+ 26: $t9 := [104, 101, 108, 108, 111]
      # live vars: $t9
- 26: abort($t9)
+ 27: $t10 := [104, 101, 108, 108, 111]
+     # live vars: $t9, $t10
+ 28: $t8 := ==($t9, $t10)
+     # live vars: $t8
+ 29: if ($t8) goto 30 else goto 32
+     # live vars:
+ 30: label L9
+     # live vars:
+ 31: goto 35
+     # live vars:
+ 32: label L10
+     # live vars:
+ 33: $t11 := 42
+     # live vars: $t11
+ 34: abort($t11)
      # live vars:
- 27: label L8
+ 35: label L11
      # live vars:
- 28: $t13 := [104, 101, 108, 108, 111]
+ 36: $t13 := 0
      # live vars: $t13
- 29: $t12 := borrow_local($t13)
+ 37: $t12 := borrow_local($t13)
      # live vars: $t12
- 30: $t11 := read_ref($t12)
-     # live vars: $t11
- 31: $t14 := [104, 101, 108, 108, 111]
-     # live vars: $t11, $t14
- 32: $t10 := ==($t11, $t14)
-     # live vars: $t10
- 33: if ($t10) goto 34 else goto 36
+ 38: $t14 := 1
+     # live vars: $t12, $t14
+ 39: write_ref($t12, $t14)
+     # live vars: $t12
+ 40: $t16 := [104, 101, 108, 108, 111]
+     # live vars: $t12, $t16
+ 41: $t15 := borrow_local($t16)
+     # live vars: $t12, $t15
+ 42: $t17 := [98, 121, 101]
+     # live vars: $t12, $t15, $t17
+ 43: write_ref($t15, $t17)
+     # live vars: $t12, $t15
+ 44: $t19 := read_ref($t12)
+     # live vars: $t15, $t19
+ 45: $t20 := 1
+     # live vars: $t15, $t19, $t20
+ 46: $t18 := ==($t19, $t20)
+     # live vars: $t15, $t18
+ 47: if ($t18) goto 48 else goto 50
+     # live vars: $t15
+ 48: label L12
+     # live vars: $t15
+ 49: goto 53
+     # live vars: $t15
+ 50: label L13
      # live vars:
- 34: label L9
+ 51: $t21 := 42
+     # live vars: $t21
+ 52: abort($t21)
+     # live vars: $t15
+ 53: label L14
+     # live vars: $t15
+ 54: $t23 := read_ref($t15)
+     # live vars: $t23
+ 55: $t24 := [98, 121, 101]
+     # live vars: $t23, $t24
+ 56: $t22 := ==($t23, $t24)
+     # live vars: $t22
+ 57: if ($t22) goto 58 else goto 60
      # live vars:
- 35: goto 39
+ 58: label L15
      # live vars:
- 36: label L10
+ 59: goto 63
      # live vars:
- 37: $t15 := 42
-     # live vars: $t15
- 38: abort($t15)
-     # live vars:
- 39: label L11
-     # live vars:
- 40: $t17 := 0
-     # live vars: $t17
- 41: $t16 := borrow_local($t17)
-     # live vars: $t16
- 42: $t18 := 1
-     # live vars: $t16, $t18
- 43: write_ref($t16, $t18)
-     # live vars: $t16
- 44: $t20 := [104, 101, 108, 108, 111]
-     # live vars: $t16, $t20
- 45: $t19 := borrow_local($t20)
-     # live vars: $t16, $t19
- 46: $t21 := [98, 121, 101]
-     # live vars: $t16, $t19, $t21
- 47: write_ref($t19, $t21)
-     # live vars: $t16, $t19
- 48: $t23 := read_ref($t16)
-     # live vars: $t19, $t23
- 49: $t24 := 1
-     # live vars: $t19, $t23, $t24
- 50: $t22 := ==($t23, $t24)
-     # live vars: $t19, $t22
- 51: if ($t22) goto 52 else goto 54
-     # live vars: $t19
- 52: label L12
-     # live vars: $t19
- 53: goto 57
-     # live vars: $t19
- 54: label L13
-     # live vars:
- 55: $t25 := 42
+ 60: label L16
+     # live vars:
+ 61: $t25 := 42
      # live vars: $t25
- 56: abort($t25)
-     # live vars: $t19
- 57: label L14
-     # live vars: $t19
- 58: $t27 := read_ref($t19)
-     # live vars: $t27
- 59: $t28 := [98, 121, 101]
-     # live vars: $t27, $t28
- 60: $t26 := ==($t27, $t28)
+ 62: abort($t25)
+     # live vars:
+ 63: label L17
+     # live vars:
+ 64: $t26 := true
      # live vars: $t26
- 61: if ($t26) goto 62 else goto 64
+ 65: if ($t26) goto 66 else goto 68
+     # live vars:
+ 66: label L18
+     # live vars:
+ 67: goto 71
+     # live vars:
+ 68: label L19
+     # live vars:
+ 69: $t27 := 42
+     # live vars: $t27
+ 70: abort($t27)
      # live vars:
- 62: label L15
+ 71: label L20
      # live vars:
- 63: goto 67
+ 72: $t28 := true
+     # live vars: $t28
+ 73: if ($t28) goto 74 else goto 76
      # live vars:
- 64: label L16
+ 74: label L21
      # live vars:
- 65: $t29 := 42
+ 75: goto 79
+     # live vars:
+ 76: label L22
+     # live vars:
+ 77: $t29 := 42
      # live vars: $t29
- 66: abort($t29)
+ 78: abort($t29)
+     # live vars:
+ 79: label L23
+     # live vars:
+ 80: return ()
+}
+
+============ after LiveVarAnalysisProcessor: ================
+
+[variant baseline]
+fun <SELF>_0::check() {
+     var $t0: bool
+     var $t1: u64
+     var $t2: bool
+     var $t3: u64
+     var $t4: bool
+     var $t5: u64
+     var $t6: u64
+     var $t7: u64
+     var $t8: bool
+     var $t9: vector<u8>
+     var $t10: vector<u8>
+     var $t11: u64
+     var $t12: &mut u64
+     var $t13: u64
+     var $t14: u64
+     var $t15: &mut vector<u8>
+     var $t16: vector<u8>
+     var $t17: vector<u8>
+     var $t18: bool
+     var $t19: u64
+     var $t20: u64
+     var $t21: u64
+     var $t22: bool
+     var $t23: vector<u8>
+     var $t24: vector<u8>
+     var $t25: u64
+     var $t26: bool
+     var $t27: u64
+     var $t28: bool
+     var $t29: u64
+     # live vars:
+  0: $t0 := true
+     # live vars: $t0
+  1: if ($t0) goto 2 else goto 4
+     # live vars:
+  2: label L0
+     # live vars:
+  3: goto 7
+     # live vars:
+  4: label L1
+     # live vars:
+  5: $t1 := 42
+     # live vars: $t1
+  6: abort($t1)
+     # live vars:
+  7: label L2
+     # live vars:
+  8: $t2 := true
+     # live vars: $t2
+  9: if ($t2) goto 10 else goto 12
      # live vars:
- 67: label L17
+ 10: label L3
+     # live vars:
+ 11: goto 15
+     # live vars:
+ 12: label L4
+     # live vars:
+ 13: $t3 := 42
+     # live vars: $t3
+ 14: abort($t3)
+     # live vars:
+ 15: label L5
+     # live vars:
+ 16: $t5 := 0
+     # live vars: $t5
+ 17: $t6 := 0
+     # live vars: $t5, $t6
+ 18: $t4 := ==($t5, $t6)
+     # live vars: $t4
+ 19: if ($t4) goto 20 else goto 22
+     # live vars:
+ 20: label L6
+     # live vars:
+ 21: goto 25
+     # live vars:
+ 22: label L7
      # live vars:
- 68: $t30 := true
-     # live vars: $t30
- 69: if ($t30) goto 70 else goto 72
+ 23: $t7 := 42
+     # live vars: $t7
+ 24: abort($t7)
      # live vars:
- 70: label L18
+ 25: label L8
      # live vars:
- 71: goto 75
+ 26: $t9 := [104, 101, 108, 108, 111]
+     # live vars: $t9
+ 27: $t10 := [104, 101, 108, 108, 111]
+     # live vars: $t9, $t10
+ 28: $t8 := ==($t9, $t10)
+     # live vars: $t8
+ 29: if ($t8) goto 30 else goto 32
      # live vars:
- 72: label L19
+ 30: label L9
      # live vars:
- 73: $t31 := 42
-     # live vars: $t31
- 74: abort($t31)
+ 31: goto 35
      # live vars:
- 75: label L20
+ 32: label L10
      # live vars:
- 76: $t32 := true
-     # live vars: $t32
- 77: if ($t32) goto 78 else goto 80
+ 33: $t11 := 42
+     # live vars: $t11
+ 34: abort($t11)
      # live vars:
- 78: label L21
+ 35: label L11
      # live vars:
- 79: goto 83
+ 36: $t13 := 0
+     # live vars: $t13
+ 37: $t12 := borrow_local($t13)
+     # live vars: $t12
+ 38: $t14 := 1
+     # live vars: $t12, $t14
+ 39: write_ref($t12, $t14)
+     # live vars: $t12
+ 40: $t16 := [104, 101, 108, 108, 111]
+     # live vars: $t12, $t16
+ 41: $t15 := borrow_local($t16)
+     # live vars: $t12, $t15
+ 42: $t17 := [98, 121, 101]
+     # live vars: $t12, $t15, $t17
+ 43: write_ref($t15, $t17)
+     # live vars: $t12, $t15
+ 44: $t19 := read_ref($t12)
+     # live vars: $t15, $t19
+ 45: $t20 := 1
+     # live vars: $t15, $t19, $t20
+ 46: $t18 := ==($t19, $t20)
+     # live vars: $t15, $t18
+ 47: if ($t18) goto 48 else goto 50
+     # live vars: $t15
+ 48: label L12
+     # live vars: $t15
+ 49: goto 53
+     # live vars: $t15
+ 50: label L13
      # live vars:
- 80: label L22
+ 51: $t21 := 42
+     # live vars: $t21
+ 52: abort($t21)
+     # live vars: $t15
+ 53: label L14
+     # live vars: $t15
+ 54: $t23 := read_ref($t15)
+     # live vars: $t23
+ 55: $t24 := [98, 121, 101]
+     # live vars: $t23, $t24
+ 56: $t22 := ==($t23, $t24)
+     # live vars: $t22
+ 57: if ($t22) goto 58 else goto 60
+     # live vars:
+ 58: label L15
+     # live vars:
+ 59: goto 63
      # live vars:
- 81: $t33 := 42
-     # live vars: $t33
- 82: abort($t33)
+ 60: label L16
      # live vars:
- 83: label L23
+ 61: $t25 := 42
+     # live vars: $t25
+ 62: abort($t25)
+     # live vars:
+ 63: label L17
+     # live vars:
+ 64: $t26 := true
+     # live vars: $t26
+ 65: if ($t26) goto 66 else goto 68
      # live vars:
- 84: return ()
+ 66: label L18
+     # live vars:
+ 67: goto 71
+     # live vars:
+ 68: label L19
+     # live vars:
+ 69: $t27 := 42
+     # live vars: $t27
+ 70: abort($t27)
+     # live vars:
+ 71: label L20
+     # live vars:
+ 72: $t28 := true
+     # live vars: $t28
+ 73: if ($t28) goto 74 else goto 76
+     # live vars:
+ 74: label L21
+     # live vars:
+ 75: goto 79
+     # live vars:
+ 76: label L22
+     # live vars:
+ 77: $t29 := 42
+     # live vars: $t29
+ 78: abort($t29)
+     # live vars:
+ 79: label L23
+     # live vars:
+ 80: return ()
 }
 
 ============ after ReferenceSafetyProcessor: ================
@@ -343,34 +521,30 @@ fun <SELF>_0::check() {
      var $t3: u64
      var $t4: bool
      var $t5: u64
-     var $t6: &u64
+     var $t6: u64
      var $t7: u64
-     var $t8: u64
-     var $t9: u64
-     var $t10: bool
-     var $t11: vector<u8>
-     var $t12: &vector<u8>
-     var $t13: vector<u8>
-     var $t14: vector<u8>
-     var $t15: u64
-     var $t16: &mut u64
-     var $t17: u64
-     var $t18: u64
-     var $t19: &mut vector<u8>
-     var $t20: vector<u8>
-     var $t21: vector<u8>
+     var $t8: bool
+     var $t9: vector<u8>
+     var $t10: vector<u8>
+     var $t11: u64
+     var $t12: &mut u64
+     var $t13: u64
+     var $t14: u64
+     var $t15: &mut vector<u8>
+     var $t16: vector<u8>
+     var $t17: vector<u8>
+     var $t18: bool
+     var $t19: u64
+     var $t20: u64
+     var $t21: u64
      var $t22: bool
-     var $t23: u64
-     var $t24: u64
+     var $t23: vector<u8>
+     var $t24: vector<u8>
      var $t25: u64
      var $t26: bool
-     var $t27: vector<u8>
-     var $t28: vector<u8>
+     var $t27: u64
+     var $t28: bool
      var $t29: u64
-     var $t30: bool
-     var $t31: u64
-     var $t32: bool
-     var $t33: u64
      # live vars:
      # graph: {}
      # locals: {}
@@ -472,415 +646,391 @@ fun <SELF>_0::check() {
      # locals: {}
      # globals: {}
      #
- 16: $t7 := 0
-     # live vars: $t7
+ 16: $t5 := 0
+     # live vars: $t5
      # graph: {}
      # locals: {}
      # globals: {}
      #
- 17: $t6 := borrow_local($t7)
-     # live vars: $t6
-     # graph: {@1100=local($t7)[borrow(false) -> @1101],@1101=derived[]}
-     # locals: {$t6=@1101,$t7=@1100}
-     # globals: {}
-     #
- 18: $t5 := read_ref($t6)
-     # live vars: $t5
-     # graph: {@1100=local($t7)[]}
-     # locals: {$t7=@1100}
-     # globals: {}
-     #
- 19: $t8 := 0
-     # live vars: $t5, $t8
-     # graph: {@1100=local($t7)[]}
-     # locals: {$t7=@1100}
+ 17: $t6 := 0
+     # live vars: $t5, $t6
+     # graph: {}
+     # locals: {}
      # globals: {}
      #
- 20: $t4 := ==($t5, $t8)
+ 18: $t4 := ==($t5, $t6)
      # live vars: $t4
-     # graph: {@1100=local($t7)[]}
-     # locals: {$t7=@1100}
+     # graph: {}
+     # locals: {}
      # globals: {}
      #
- 21: if ($t4) goto 22 else goto 24
+ 19: if ($t4) goto 20 else goto 22
      # live vars:
-     # graph: {@1100=local($t7)[]}
-     # locals: {$t7=@1100}
+     # graph: {}
+     # locals: {}
      # globals: {}
      #
- 22: label L6
+ 20: label L6
      # live vars:
-     # graph: {@1100=local($t7)[]}
-     # locals: {$t7=@1100}
+     # graph: {}
+     # locals: {}
      # globals: {}
      #
- 23: goto 27
+ 21: goto 25
      # live vars:
-     # graph: {@1100=local($t7)[]}
-     # locals: {$t7=@1100}
+     # graph: {}
+     # locals: {}
      # globals: {}
      #
- 24: label L7
+ 22: label L7
      # live vars:
-     # graph: {@1100=local($t7)[]}
-     # locals: {$t7=@1100}
+     # graph: {}
+     # locals: {}
      # globals: {}
      #
- 25: $t9 := 42
-     # live vars: $t9
-     # graph: {@1100=local($t7)[]}
-     # locals: {$t7=@1100}
+ 23: $t7 := 42
+     # live vars: $t7
+     # graph: {}
+     # locals: {}
      # globals: {}
      #
- 26: abort($t9)
+ 24: abort($t7)
      # live vars:
-     # graph: {@1100=local($t7)[]}
-     # locals: {$t7=@1100}
+     # graph: {}
+     # locals: {}
      # globals: {}
      #
- 27: label L8
+ 25: label L8
      # live vars:
-     # graph: {@1100=local($t7)[]}
-     # locals: {$t7=@1100}
-     # globals: {}
-     #
- 28: $t13 := [104, 101, 108, 108, 111]
-     # live vars: $t13
-     # graph: {@1100=local($t7)[]}
-     # locals: {$t7=@1100}
-     # globals: {}
-     #
- 29: $t12 := borrow_local($t13)
-     # live vars: $t12
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[borrow(false) -> @1D01],@1D01=derived[]}
-     # locals: {$t7=@1100,$t12=@1D01,$t13=@1D00}
+     # graph: {}
+     # locals: {}
      # globals: {}
      #
- 30: $t11 := read_ref($t12)
-     # live vars: $t11
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[]}
-     # locals: {$t7=@1100,$t13=@1D00}
+ 26: $t9 := [104, 101, 108, 108, 111]
+     # live vars: $t9
+     # graph: {}
+     # locals: {}
      # globals: {}
      #
- 31: $t14 := [104, 101, 108, 108, 111]
-     # live vars: $t11, $t14
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[]}
-     # locals: {$t7=@1100,$t13=@1D00}
+ 27: $t10 := [104, 101, 108, 108, 111]
+     # live vars: $t9, $t10
+     # graph: {}
+     # locals: {}
      # globals: {}
      #
- 32: $t10 := ==($t11, $t14)
-     # live vars: $t10
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[]}
-     # locals: {$t7=@1100,$t13=@1D00}
+ 28: $t8 := ==($t9, $t10)
+     # live vars: $t8
+     # graph: {}
+     # locals: {}
      # globals: {}
      #
- 33: if ($t10) goto 34 else goto 36
+ 29: if ($t8) goto 30 else goto 32
      # live vars:
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[]}
-     # locals: {$t7=@1100,$t13=@1D00}
+     # graph: {}
+     # locals: {}
      # globals: {}
      #
- 34: label L9
+ 30: label L9
      # live vars:
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[]}
-     # locals: {$t7=@1100,$t13=@1D00}
+     # graph: {}
+     # locals: {}
      # globals: {}
      #
- 35: goto 39
+ 31: goto 35
      # live vars:
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[]}
-     # locals: {$t7=@1100,$t13=@1D00}
+     # graph: {}
+     # locals: {}
      # globals: {}
      #
- 36: label L10
+ 32: label L10
      # live vars:
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[]}
-     # locals: {$t7=@1100,$t13=@1D00}
+     # graph: {}
+     # locals: {}
      # globals: {}
      #
- 37: $t15 := 42
-     # live vars: $t15
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[]}
-     # locals: {$t7=@1100,$t13=@1D00}
+ 33: $t11 := 42
+     # live vars: $t11
+     # graph: {}
+     # locals: {}
      # globals: {}
      #
- 38: abort($t15)
+ 34: abort($t11)
      # live vars:
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[]}
-     # locals: {$t7=@1100,$t13=@1D00}
+     # graph: {}
+     # locals: {}
      # globals: {}
      #
- 39: label L11
+ 35: label L11
      # live vars:
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[]}
-     # locals: {$t7=@1100,$t13=@1D00}
+     # graph: {}
+     # locals: {}
      # globals: {}
      #
- 40: $t17 := 0
-     # live vars: $t17
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[]}
-     # locals: {$t7=@1100,$t13=@1D00}
+ 36: $t13 := 0
+     # live vars: $t13
+     # graph: {}
+     # locals: {}
      # globals: {}
      #
- 41: $t16 := borrow_local($t17)
-     # live vars: $t16
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[borrow(true) -> @2901],@2901=derived[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t16=@2901,$t17=@2900}
+ 37: $t12 := borrow_local($t13)
+     # live vars: $t12
+     # graph: {@2500=local($t13)[borrow_mut -> @2501],@2501=derived[]}
+     # locals: {$t12=@2501,$t13=@2500}
      # globals: {}
      #
- 42: $t18 := 1
-     # live vars: $t16, $t18
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[borrow(true) -> @2901],@2901=derived[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t16=@2901,$t17=@2900}
+ 38: $t14 := 1
+     # live vars: $t12, $t14
+     # graph: {@2500=local($t13)[borrow_mut -> @2501],@2501=derived[]}
+     # locals: {$t12=@2501,$t13=@2500}
      # globals: {}
      #
- 43: write_ref($t16, $t18)
-     # live vars: $t16
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[borrow(true) -> @2901],@2901=derived[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t16=@2901,$t17=@2900}
+ 39: write_ref($t12, $t14)
+     # live vars: $t12
+     # graph: {@2500=local($t13)[borrow_mut -> @2501],@2501=derived[]}
+     # locals: {$t12=@2501,$t13=@2500}
      # globals: {}
      #
- 44: $t20 := [104, 101, 108, 108, 111]
-     # live vars: $t16, $t20
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[borrow(true) -> @2901],@2901=derived[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t16=@2901,$t17=@2900}
+ 40: $t16 := [104, 101, 108, 108, 111]
+     # live vars: $t12, $t16
+     # graph: {@2500=local($t13)[borrow_mut -> @2501],@2501=derived[]}
+     # locals: {$t12=@2501,$t13=@2500}
      # globals: {}
      #
- 45: $t19 := borrow_local($t20)
-     # live vars: $t16, $t19
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[borrow(true) -> @2901],@2901=derived[],@2D00=local($t20)[borrow(true) -> @2D01],@2D01=derived[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t16=@2901,$t17=@2900,$t19=@2D01,$t20=@2D00}
+ 41: $t15 := borrow_local($t16)
+     # live vars: $t12, $t15
+     # graph: {@2500=local($t13)[borrow_mut -> @2501],@2501=derived[],@2900=local($t16)[borrow_mut -> @2901],@2901=derived[]}
+     # locals: {$t12=@2501,$t13=@2500,$t15=@2901,$t16=@2900}
      # globals: {}
      #
- 46: $t21 := [98, 121, 101]
-     # live vars: $t16, $t19, $t21
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[borrow(true) -> @2901],@2901=derived[],@2D00=local($t20)[borrow(true) -> @2D01],@2D01=derived[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t16=@2901,$t17=@2900,$t19=@2D01,$t20=@2D00}
+ 42: $t17 := [98, 121, 101]
+     # live vars: $t12, $t15, $t17
+     # graph: {@2500=local($t13)[borrow_mut -> @2501],@2501=derived[],@2900=local($t16)[borrow_mut -> @2901],@2901=derived[]}
+     # locals: {$t12=@2501,$t13=@2500,$t15=@2901,$t16=@2900}
      # globals: {}
      #
- 47: write_ref($t19, $t21)
-     # live vars: $t16, $t19
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[borrow(true) -> @2901],@2901=derived[],@2D00=local($t20)[borrow(true) -> @2D01],@2D01=derived[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t16=@2901,$t17=@2900,$t19=@2D01,$t20=@2D00}
+ 43: write_ref($t15, $t17)
+     # live vars: $t12, $t15
+     # graph: {@2500=local($t13)[borrow_mut -> @2501],@2501=derived[],@2900=local($t16)[borrow_mut -> @2901],@2901=derived[]}
+     # locals: {$t12=@2501,$t13=@2500,$t15=@2901,$t16=@2900}
      # globals: {}
      #
- 48: $t23 := read_ref($t16)
-     # live vars: $t19, $t23
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[borrow(true) -> @2D01],@2D01=derived[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t19=@2D01,$t20=@2D00}
+ 44: $t19 := read_ref($t12)
+     # live vars: $t15, $t19
+     # graph: {@2500=local($t13)[],@2900=local($t16)[borrow_mut -> @2901],@2901=derived[]}
+     # locals: {$t13=@2500,$t15=@2901,$t16=@2900}
      # globals: {}
      #
- 49: $t24 := 1
-     # live vars: $t19, $t23, $t24
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[borrow(true) -> @2D01],@2D01=derived[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t19=@2D01,$t20=@2D00}
+ 45: $t20 := 1
+     # live vars: $t15, $t19, $t20
+     # graph: {@2500=local($t13)[],@2900=local($t16)[borrow_mut -> @2901],@2901=derived[]}
+     # locals: {$t13=@2500,$t15=@2901,$t16=@2900}
      # globals: {}
      #
- 50: $t22 := ==($t23, $t24)
-     # live vars: $t19, $t22
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[borrow(true) -> @2D01],@2D01=derived[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t19=@2D01,$t20=@2D00}
+ 46: $t18 := ==($t19, $t20)
+     # live vars: $t15, $t18
+     # graph: {@2500=local($t13)[],@2900=local($t16)[borrow_mut -> @2901],@2901=derived[]}
+     # locals: {$t13=@2500,$t15=@2901,$t16=@2900}
      # globals: {}
      #
- 51: if ($t22) goto 52 else goto 54
-     # live vars: $t19
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[borrow(true) -> @2D01],@2D01=derived[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t19=@2D01,$t20=@2D00}
+ 47: if ($t18) goto 48 else goto 50
+     # live vars: $t15
+     # graph: {@2500=local($t13)[],@2900=local($t16)[borrow_mut -> @2901],@2901=derived[]}
+     # locals: {$t13=@2500,$t15=@2901,$t16=@2900}
      # globals: {}
      #
- 52: label L12
-     # live vars: $t19
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[borrow(true) -> @2D01],@2D01=derived[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t19=@2D01,$t20=@2D00}
+ 48: label L12
+     # live vars: $t15
+     # graph: {@2500=local($t13)[],@2900=local($t16)[borrow_mut -> @2901],@2901=derived[]}
+     # locals: {$t13=@2500,$t15=@2901,$t16=@2900}
      # globals: {}
      #
- 53: goto 57
-     # live vars: $t19
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[borrow(true) -> @2D01],@2D01=derived[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t19=@2D01,$t20=@2D00}
+ 49: goto 53
+     # live vars: $t15
+     # graph: {@2500=local($t13)[],@2900=local($t16)[borrow_mut -> @2901],@2901=derived[]}
+     # locals: {$t13=@2500,$t15=@2901,$t16=@2900}
      # globals: {}
      #
- 54: label L13
+ 50: label L13
      # live vars:
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t20=@2D00}
+     # graph: {@2500=local($t13)[],@2900=local($t16)[]}
+     # locals: {$t13=@2500,$t16=@2900}
      # globals: {}
      #
- 55: $t25 := 42
-     # live vars: $t25
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t20=@2D00}
+ 51: $t21 := 42
+     # live vars: $t21
+     # graph: {@2500=local($t13)[],@2900=local($t16)[]}
+     # locals: {$t13=@2500,$t16=@2900}
      # globals: {}
      #
- 56: abort($t25)
-     # live vars: $t19
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[borrow(true) -> @2D01],@2D01=derived[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t19=@2D01,$t20=@2D00}
+ 52: abort($t21)
+     # live vars: $t15
+     # graph: {@2500=local($t13)[],@2900=local($t16)[borrow_mut -> @2901],@2901=derived[]}
+     # locals: {$t13=@2500,$t15=@2901,$t16=@2900}
      # globals: {}
      #
- 57: label L14
-     # live vars: $t19
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[borrow(true) -> @2D01],@2D01=derived[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t19=@2D01,$t20=@2D00}
+ 53: label L14
+     # live vars: $t15
+     # graph: {@2500=local($t13)[],@2900=local($t16)[borrow_mut -> @2901],@2901=derived[]}
+     # locals: {$t13=@2500,$t15=@2901,$t16=@2900}
      # globals: {}
      #
- 58: $t27 := read_ref($t19)
-     # live vars: $t27
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t20=@2D00}
+ 54: $t23 := read_ref($t15)
+     # live vars: $t23
+     # graph: {@2500=local($t13)[],@2900=local($t16)[]}
+     # locals: {$t13=@2500,$t16=@2900}
      # globals: {}
      #
- 59: $t28 := [98, 121, 101]
-     # live vars: $t27, $t28
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t20=@2D00}
+ 55: $t24 := [98, 121, 101]
+     # live vars: $t23, $t24
+     # graph: {@2500=local($t13)[],@2900=local($t16)[]}
+     # locals: {$t13=@2500,$t16=@2900}
      # globals: {}
      #
- 60: $t26 := ==($t27, $t28)
-     # live vars: $t26
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t20=@2D00}
+ 56: $t22 := ==($t23, $t24)
+     # live vars: $t22
+     # graph: {@2500=local($t13)[],@2900=local($t16)[]}
+     # locals: {$t13=@2500,$t16=@2900}
      # globals: {}
      #
- 61: if ($t26) goto 62 else goto 64
+ 57: if ($t22) goto 58 else goto 60
      # live vars:
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t20=@2D00}
+     # graph: {@2500=local($t13)[],@2900=local($t16)[]}
+     # locals: {$t13=@2500,$t16=@2900}
      # globals: {}
      #
- 62: label L15
+ 58: label L15
      # live vars:
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t20=@2D00}
+     # graph: {@2500=local($t13)[],@2900=local($t16)[]}
+     # locals: {$t13=@2500,$t16=@2900}
      # globals: {}
      #
- 63: goto 67
+ 59: goto 63
      # live vars:
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t20=@2D00}
+     # graph: {@2500=local($t13)[],@2900=local($t16)[]}
+     # locals: {$t13=@2500,$t16=@2900}
      # globals: {}
      #
- 64: label L16
+ 60: label L16
      # live vars:
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t20=@2D00}
+     # graph: {@2500=local($t13)[],@2900=local($t16)[]}
+     # locals: {$t13=@2500,$t16=@2900}
      # globals: {}
      #
- 65: $t29 := 42
-     # live vars: $t29
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t20=@2D00}
+ 61: $t25 := 42
+     # live vars: $t25
+     # graph: {@2500=local($t13)[],@2900=local($t16)[]}
+     # locals: {$t13=@2500,$t16=@2900}
      # globals: {}
      #
- 66: abort($t29)
+ 62: abort($t25)
      # live vars:
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t20=@2D00}
+     # graph: {@2500=local($t13)[],@2900=local($t16)[]}
+     # locals: {$t13=@2500,$t16=@2900}
      # globals: {}
      #
- 67: label L17
+ 63: label L17
      # live vars:
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t20=@2D00}
+     # graph: {@2500=local($t13)[],@2900=local($t16)[]}
+     # locals: {$t13=@2500,$t16=@2900}
      # globals: {}
      #
- 68: $t30 := true
-     # live vars: $t30
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t20=@2D00}
+ 64: $t26 := true
+     # live vars: $t26
+     # graph: {@2500=local($t13)[],@2900=local($t16)[]}
+     # locals: {$t13=@2500,$t16=@2900}
      # globals: {}
      #
- 69: if ($t30) goto 70 else goto 72
+ 65: if ($t26) goto 66 else goto 68
      # live vars:
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t20=@2D00}
+     # graph: {@2500=local($t13)[],@2900=local($t16)[]}
+     # locals: {$t13=@2500,$t16=@2900}
      # globals: {}
      #
- 70: label L18
+ 66: label L18
      # live vars:
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t20=@2D00}
+     # graph: {@2500=local($t13)[],@2900=local($t16)[]}
+     # locals: {$t13=@2500,$t16=@2900}
      # globals: {}
      #
- 71: goto 75
+ 67: goto 71
      # live vars:
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t20=@2D00}
+     # graph: {@2500=local($t13)[],@2900=local($t16)[]}
+     # locals: {$t13=@2500,$t16=@2900}
      # globals: {}
      #
- 72: label L19
+ 68: label L19
      # live vars:
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t20=@2D00}
+     # graph: {@2500=local($t13)[],@2900=local($t16)[]}
+     # locals: {$t13=@2500,$t16=@2900}
      # globals: {}
      #
- 73: $t31 := 42
-     # live vars: $t31
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t20=@2D00}
+ 69: $t27 := 42
+     # live vars: $t27
+     # graph: {@2500=local($t13)[],@2900=local($t16)[]}
+     # locals: {$t13=@2500,$t16=@2900}
      # globals: {}
      #
- 74: abort($t31)
+ 70: abort($t27)
      # live vars:
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t20=@2D00}
+     # graph: {@2500=local($t13)[],@2900=local($t16)[]}
+     # locals: {$t13=@2500,$t16=@2900}
      # globals: {}
      #
- 75: label L20
+ 71: label L20
      # live vars:
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t20=@2D00}
+     # graph: {@2500=local($t13)[],@2900=local($t16)[]}
+     # locals: {$t13=@2500,$t16=@2900}
      # globals: {}
      #
- 76: $t32 := true
-     # live vars: $t32
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t20=@2D00}
+ 72: $t28 := true
+     # live vars: $t28
+     # graph: {@2500=local($t13)[],@2900=local($t16)[]}
+     # locals: {$t13=@2500,$t16=@2900}
      # globals: {}
      #
- 77: if ($t32) goto 78 else goto 80
+ 73: if ($t28) goto 74 else goto 76
      # live vars:
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t20=@2D00}
+     # graph: {@2500=local($t13)[],@2900=local($t16)[]}
+     # locals: {$t13=@2500,$t16=@2900}
      # globals: {}
      #
- 78: label L21
+ 74: label L21
      # live vars:
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t20=@2D00}
+     # graph: {@2500=local($t13)[],@2900=local($t16)[]}
+     # locals: {$t13=@2500,$t16=@2900}
      # globals: {}
      #
- 79: goto 83
+ 75: goto 79
      # live vars:
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t20=@2D00}
+     # graph: {@2500=local($t13)[],@2900=local($t16)[]}
+     # locals: {$t13=@2500,$t16=@2900}
      # globals: {}
      #
- 80: label L22
+ 76: label L22
      # live vars:
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t20=@2D00}
+     # graph: {@2500=local($t13)[],@2900=local($t16)[]}
+     # locals: {$t13=@2500,$t16=@2900}
      # globals: {}
      #
- 81: $t33 := 42
-     # live vars: $t33
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t20=@2D00}
+ 77: $t29 := 42
+     # live vars: $t29
+     # graph: {@2500=local($t13)[],@2900=local($t16)[]}
+     # locals: {$t13=@2500,$t16=@2900}
      # globals: {}
      #
- 82: abort($t33)
+ 78: abort($t29)
      # live vars:
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t20=@2D00}
+     # graph: {@2500=local($t13)[],@2900=local($t16)[]}
+     # locals: {$t13=@2500,$t16=@2900}
      # globals: {}
      #
- 83: label L23
+ 79: label L23
      # live vars:
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t20=@2D00}
+     # graph: {@2500=local($t13)[],@2900=local($t16)[]}
+     # locals: {$t13=@2500,$t16=@2900}
      # globals: {}
      #
- 84: return ()
+ 80: return ()
 }
 
 ============ after AbortAnalysisProcessor: ================
@@ -893,34 +1043,30 @@ fun <SELF>_0::check() {
      var $t3: u64
      var $t4: bool
      var $t5: u64
-     var $t6: &u64
+     var $t6: u64
      var $t7: u64
-     var $t8: u64
-     var $t9: u64
-     var $t10: bool
-     var $t11: vector<u8>
-     var $t12: &vector<u8>
-     var $t13: vector<u8>
-     var $t14: vector<u8>
-     var $t15: u64
-     var $t16: &mut u64
-     var $t17: u64
-     var $t18: u64
-     var $t19: &mut vector<u8>
-     var $t20: vector<u8>
-     var $t21: vector<u8>
+     var $t8: bool
+     var $t9: vector<u8>
+     var $t10: vector<u8>
+     var $t11: u64
+     var $t12: &mut u64
+     var $t13: u64
+     var $t14: u64
+     var $t15: &mut vector<u8>
+     var $t16: vector<u8>
+     var $t17: vector<u8>
+     var $t18: bool
+     var $t19: u64
+     var $t20: u64
+     var $t21: u64
      var $t22: bool
-     var $t23: u64
-     var $t24: u64
+     var $t23: vector<u8>
+     var $t24: vector<u8>
      var $t25: u64
      var $t26: bool
-     var $t27: vector<u8>
-     var $t28: vector<u8>
+     var $t27: u64
+     var $t28: bool
      var $t29: u64
-     var $t30: bool
-     var $t31: u64
-     var $t32: bool
-     var $t33: u64
      # abort state: {returns,aborts}
      # live vars:
      # graph: {}
@@ -1039,483 +1185,455 @@ fun <SELF>_0::check() {
      # locals: {}
      # globals: {}
      #
- 16: $t7 := 0
+ 16: $t5 := 0
      # abort state: {returns,aborts}
-     # live vars: $t7
+     # live vars: $t5
      # graph: {}
      # locals: {}
      # globals: {}
      #
- 17: $t6 := borrow_local($t7)
-     # abort state: {returns,aborts}
-     # live vars: $t6
-     # graph: {@1100=local($t7)[borrow(false) -> @1101],@1101=derived[]}
-     # locals: {$t6=@1101,$t7=@1100}
-     # globals: {}
-     #
- 18: $t5 := read_ref($t6)
-     # abort state: {returns,aborts}
-     # live vars: $t5
-     # graph: {@1100=local($t7)[]}
-     # locals: {$t7=@1100}
-     # globals: {}
-     #
- 19: $t8 := 0
+ 17: $t6 := 0
      # abort state: {returns,aborts}
-     # live vars: $t5, $t8
-     # graph: {@1100=local($t7)[]}
-     # locals: {$t7=@1100}
+     # live vars: $t5, $t6
+     # graph: {}
+     # locals: {}
      # globals: {}
      #
- 20: $t4 := ==($t5, $t8)
+ 18: $t4 := ==($t5, $t6)
      # abort state: {returns,aborts}
      # live vars: $t4
-     # graph: {@1100=local($t7)[]}
-     # locals: {$t7=@1100}
+     # graph: {}
+     # locals: {}
      # globals: {}
      #
- 21: if ($t4) goto 22 else goto 24
+ 19: if ($t4) goto 20 else goto 22
      # abort state: {returns,aborts}
      # live vars:
-     # graph: {@1100=local($t7)[]}
-     # locals: {$t7=@1100}
+     # graph: {}
+     # locals: {}
      # globals: {}
      #
- 22: label L6
+ 20: label L6
      # abort state: {returns,aborts}
      # live vars:
-     # graph: {@1100=local($t7)[]}
-     # locals: {$t7=@1100}
+     # graph: {}
+     # locals: {}
      # globals: {}
      #
- 23: goto 27
+ 21: goto 25
      # abort state: {aborts}
      # live vars:
-     # graph: {@1100=local($t7)[]}
-     # locals: {$t7=@1100}
+     # graph: {}
+     # locals: {}
      # globals: {}
      #
- 24: label L7
+ 22: label L7
      # abort state: {aborts}
      # live vars:
-     # graph: {@1100=local($t7)[]}
-     # locals: {$t7=@1100}
+     # graph: {}
+     # locals: {}
      # globals: {}
      #
- 25: $t9 := 42
+ 23: $t7 := 42
      # abort state: {aborts}
-     # live vars: $t9
-     # graph: {@1100=local($t7)[]}
-     # locals: {$t7=@1100}
+     # live vars: $t7
+     # graph: {}
+     # locals: {}
      # globals: {}
      #
- 26: abort($t9)
+ 24: abort($t7)
      # abort state: {returns,aborts}
      # live vars:
-     # graph: {@1100=local($t7)[]}
-     # locals: {$t7=@1100}
+     # graph: {}
+     # locals: {}
      # globals: {}
      #
- 27: label L8
+ 25: label L8
      # abort state: {returns,aborts}
      # live vars:
-     # graph: {@1100=local($t7)[]}
-     # locals: {$t7=@1100}
-     # globals: {}
-     #
- 28: $t13 := [104, 101, 108, 108, 111]
-     # abort state: {returns,aborts}
-     # live vars: $t13
-     # graph: {@1100=local($t7)[]}
-     # locals: {$t7=@1100}
-     # globals: {}
-     #
- 29: $t12 := borrow_local($t13)
-     # abort state: {returns,aborts}
-     # live vars: $t12
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[borrow(false) -> @1D01],@1D01=derived[]}
-     # locals: {$t7=@1100,$t12=@1D01,$t13=@1D00}
+     # graph: {}
+     # locals: {}
      # globals: {}
      #
- 30: $t11 := read_ref($t12)
+ 26: $t9 := [104, 101, 108, 108, 111]
      # abort state: {returns,aborts}
-     # live vars: $t11
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[]}
-     # locals: {$t7=@1100,$t13=@1D00}
+     # live vars: $t9
+     # graph: {}
+     # locals: {}
      # globals: {}
      #
- 31: $t14 := [104, 101, 108, 108, 111]
+ 27: $t10 := [104, 101, 108, 108, 111]
      # abort state: {returns,aborts}
-     # live vars: $t11, $t14
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[]}
-     # locals: {$t7=@1100,$t13=@1D00}
+     # live vars: $t9, $t10
+     # graph: {}
+     # locals: {}
      # globals: {}
      #
- 32: $t10 := ==($t11, $t14)
+ 28: $t8 := ==($t9, $t10)
      # abort state: {returns,aborts}
-     # live vars: $t10
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[]}
-     # locals: {$t7=@1100,$t13=@1D00}
+     # live vars: $t8
+     # graph: {}
+     # locals: {}
      # globals: {}
      #
- 33: if ($t10) goto 34 else goto 36
+ 29: if ($t8) goto 30 else goto 32
      # abort state: {returns,aborts}
      # live vars:
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[]}
-     # locals: {$t7=@1100,$t13=@1D00}
+     # graph: {}
+     # locals: {}
      # globals: {}
      #
- 34: label L9
+ 30: label L9
      # abort state: {returns,aborts}
      # live vars:
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[]}
-     # locals: {$t7=@1100,$t13=@1D00}
+     # graph: {}
+     # locals: {}
      # globals: {}
      #
- 35: goto 39
+ 31: goto 35
      # abort state: {aborts}
      # live vars:
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[]}
-     # locals: {$t7=@1100,$t13=@1D00}
+     # graph: {}
+     # locals: {}
      # globals: {}
      #
- 36: label L10
+ 32: label L10
      # abort state: {aborts}
      # live vars:
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[]}
-     # locals: {$t7=@1100,$t13=@1D00}
+     # graph: {}
+     # locals: {}
      # globals: {}
      #
- 37: $t15 := 42
+ 33: $t11 := 42
      # abort state: {aborts}
-     # live vars: $t15
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[]}
-     # locals: {$t7=@1100,$t13=@1D00}
+     # live vars: $t11
+     # graph: {}
+     # locals: {}
      # globals: {}
      #
- 38: abort($t15)
+ 34: abort($t11)
      # abort state: {returns,aborts}
      # live vars:
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[]}
-     # locals: {$t7=@1100,$t13=@1D00}
+     # graph: {}
+     # locals: {}
      # globals: {}
      #
- 39: label L11
+ 35: label L11
      # abort state: {returns,aborts}
      # live vars:
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[]}
-     # locals: {$t7=@1100,$t13=@1D00}
+     # graph: {}
+     # locals: {}
      # globals: {}
      #
- 40: $t17 := 0
+ 36: $t13 := 0
      # abort state: {returns,aborts}
-     # live vars: $t17
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[]}
-     # locals: {$t7=@1100,$t13=@1D00}
+     # live vars: $t13
+     # graph: {}
+     # locals: {}
      # globals: {}
      #
- 41: $t16 := borrow_local($t17)
+ 37: $t12 := borrow_local($t13)
      # abort state: {returns,aborts}
-     # live vars: $t16
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[borrow(true) -> @2901],@2901=derived[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t16=@2901,$t17=@2900}
+     # live vars: $t12
+     # graph: {@2500=local($t13)[borrow_mut -> @2501],@2501=derived[]}
+     # locals: {$t12=@2501,$t13=@2500}
      # globals: {}
      #
- 42: $t18 := 1
+ 38: $t14 := 1
      # abort state: {returns,aborts}
-     # live vars: $t16, $t18
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[borrow(true) -> @2901],@2901=derived[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t16=@2901,$t17=@2900}
+     # live vars: $t12, $t14
+     # graph: {@2500=local($t13)[borrow_mut -> @2501],@2501=derived[]}
+     # locals: {$t12=@2501,$t13=@2500}
      # globals: {}
      #
- 43: write_ref($t16, $t18)
+ 39: write_ref($t12, $t14)
      # abort state: {returns,aborts}
-     # live vars: $t16
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[borrow(true) -> @2901],@2901=derived[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t16=@2901,$t17=@2900}
+     # live vars: $t12
+     # graph: {@2500=local($t13)[borrow_mut -> @2501],@2501=derived[]}
+     # locals: {$t12=@2501,$t13=@2500}
      # globals: {}
      #
- 44: $t20 := [104, 101, 108, 108, 111]
+ 40: $t16 := [104, 101, 108, 108, 111]
      # abort state: {returns,aborts}
-     # live vars: $t16, $t20
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[borrow(true) -> @2901],@2901=derived[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t16=@2901,$t17=@2900}
+     # live vars: $t12, $t16
+     # graph: {@2500=local($t13)[borrow_mut -> @2501],@2501=derived[]}
+     # locals: {$t12=@2501,$t13=@2500}
      # globals: {}
      #
- 45: $t19 := borrow_local($t20)
+ 41: $t15 := borrow_local($t16)
      # abort state: {returns,aborts}
-     # live vars: $t16, $t19
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[borrow(true) -> @2901],@2901=derived[],@2D00=local($t20)[borrow(true) -> @2D01],@2D01=derived[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t16=@2901,$t17=@2900,$t19=@2D01,$t20=@2D00}
+     # live vars: $t12, $t15
+     # graph: {@2500=local($t13)[borrow_mut -> @2501],@2501=derived[],@2900=local($t16)[borrow_mut -> @2901],@2901=derived[]}
+     # locals: {$t12=@2501,$t13=@2500,$t15=@2901,$t16=@2900}
      # globals: {}
      #
- 46: $t21 := [98, 121, 101]
+ 42: $t17 := [98, 121, 101]
      # abort state: {returns,aborts}
-     # live vars: $t16, $t19, $t21
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[borrow(true) -> @2901],@2901=derived[],@2D00=local($t20)[borrow(true) -> @2D01],@2D01=derived[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t16=@2901,$t17=@2900,$t19=@2D01,$t20=@2D00}
+     # live vars: $t12, $t15, $t17
+     # graph: {@2500=local($t13)[borrow_mut -> @2501],@2501=derived[],@2900=local($t16)[borrow_mut -> @2901],@2901=derived[]}
+     # locals: {$t12=@2501,$t13=@2500,$t15=@2901,$t16=@2900}
      # globals: {}
      #
- 47: write_ref($t19, $t21)
+ 43: write_ref($t15, $t17)
      # abort state: {returns,aborts}
-     # live vars: $t16, $t19
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[borrow(true) -> @2901],@2901=derived[],@2D00=local($t20)[borrow(true) -> @2D01],@2D01=derived[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t16=@2901,$t17=@2900,$t19=@2D01,$t20=@2D00}
+     # live vars: $t12, $t15
+     # graph: {@2500=local($t13)[borrow_mut -> @2501],@2501=derived[],@2900=local($t16)[borrow_mut -> @2901],@2901=derived[]}
+     # locals: {$t12=@2501,$t13=@2500,$t15=@2901,$t16=@2900}
      # globals: {}
      #
- 48: $t23 := read_ref($t16)
+ 44: $t19 := read_ref($t12)
      # abort state: {returns,aborts}
-     # live vars: $t19, $t23
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[borrow(true) -> @2D01],@2D01=derived[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t19=@2D01,$t20=@2D00}
+     # live vars: $t15, $t19
+     # graph: {@2500=local($t13)[],@2900=local($t16)[borrow_mut -> @2901],@2901=derived[]}
+     # locals: {$t13=@2500,$t15=@2901,$t16=@2900}
      # globals: {}
      #
- 49: $t24 := 1
+ 45: $t20 := 1
      # abort state: {returns,aborts}
-     # live vars: $t19, $t23, $t24
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[borrow(true) -> @2D01],@2D01=derived[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t19=@2D01,$t20=@2D00}
+     # live vars: $t15, $t19, $t20
+     # graph: {@2500=local($t13)[],@2900=local($t16)[borrow_mut -> @2901],@2901=derived[]}
+     # locals: {$t13=@2500,$t15=@2901,$t16=@2900}
      # globals: {}
      #
- 50: $t22 := ==($t23, $t24)
+ 46: $t18 := ==($t19, $t20)
      # abort state: {returns,aborts}
-     # live vars: $t19, $t22
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[borrow(true) -> @2D01],@2D01=derived[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t19=@2D01,$t20=@2D00}
+     # live vars: $t15, $t18
+     # graph: {@2500=local($t13)[],@2900=local($t16)[borrow_mut -> @2901],@2901=derived[]}
+     # locals: {$t13=@2500,$t15=@2901,$t16=@2900}
      # globals: {}
      #
- 51: if ($t22) goto 52 else goto 54
+ 47: if ($t18) goto 48 else goto 50
      # abort state: {returns,aborts}
-     # live vars: $t19
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[borrow(true) -> @2D01],@2D01=derived[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t19=@2D01,$t20=@2D00}
+     # live vars: $t15
+     # graph: {@2500=local($t13)[],@2900=local($t16)[borrow_mut -> @2901],@2901=derived[]}
+     # locals: {$t13=@2500,$t15=@2901,$t16=@2900}
      # globals: {}
      #
- 52: label L12
+ 48: label L12
      # abort state: {returns,aborts}
-     # live vars: $t19
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[borrow(true) -> @2D01],@2D01=derived[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t19=@2D01,$t20=@2D00}
+     # live vars: $t15
+     # graph: {@2500=local($t13)[],@2900=local($t16)[borrow_mut -> @2901],@2901=derived[]}
+     # locals: {$t13=@2500,$t15=@2901,$t16=@2900}
      # globals: {}
      #
- 53: goto 57
+ 49: goto 53
      # abort state: {aborts}
-     # live vars: $t19
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[borrow(true) -> @2D01],@2D01=derived[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t19=@2D01,$t20=@2D00}
+     # live vars: $t15
+     # graph: {@2500=local($t13)[],@2900=local($t16)[borrow_mut -> @2901],@2901=derived[]}
+     # locals: {$t13=@2500,$t15=@2901,$t16=@2900}
      # globals: {}
      #
- 54: label L13
+ 50: label L13
      # abort state: {aborts}
      # live vars:
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t20=@2D00}
+     # graph: {@2500=local($t13)[],@2900=local($t16)[]}
+     # locals: {$t13=@2500,$t16=@2900}
      # globals: {}
      #
- 55: $t25 := 42
+ 51: $t21 := 42
      # abort state: {aborts}
-     # live vars: $t25
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t20=@2D00}
+     # live vars: $t21
+     # graph: {@2500=local($t13)[],@2900=local($t16)[]}
+     # locals: {$t13=@2500,$t16=@2900}
      # globals: {}
      #
- 56: abort($t25)
+ 52: abort($t21)
      # abort state: {returns,aborts}
-     # live vars: $t19
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[borrow(true) -> @2D01],@2D01=derived[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t19=@2D01,$t20=@2D00}
+     # live vars: $t15
+     # graph: {@2500=local($t13)[],@2900=local($t16)[borrow_mut -> @2901],@2901=derived[]}
+     # locals: {$t13=@2500,$t15=@2901,$t16=@2900}
      # globals: {}
      #
- 57: label L14
+ 53: label L14
      # abort state: {returns,aborts}
-     # live vars: $t19
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[borrow(true) -> @2D01],@2D01=derived[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t19=@2D01,$t20=@2D00}
+     # live vars: $t15
+     # graph: {@2500=local($t13)[],@2900=local($t16)[borrow_mut -> @2901],@2901=derived[]}
+     # locals: {$t13=@2500,$t15=@2901,$t16=@2900}
      # globals: {}
      #
- 58: $t27 := read_ref($t19)
+ 54: $t23 := read_ref($t15)
      # abort state: {returns,aborts}
-     # live vars: $t27
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t20=@2D00}
+     # live vars: $t23
+     # graph: {@2500=local($t13)[],@2900=local($t16)[]}
+     # locals: {$t13=@2500,$t16=@2900}
      # globals: {}
      #
- 59: $t28 := [98, 121, 101]
+ 55: $t24 := [98, 121, 101]
      # abort state: {returns,aborts}
-     # live vars: $t27, $t28
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t20=@2D00}
+     # live vars: $t23, $t24
+     # graph: {@2500=local($t13)[],@2900=local($t16)[]}
+     # locals: {$t13=@2500,$t16=@2900}
      # globals: {}
      #
- 60: $t26 := ==($t27, $t28)
+ 56: $t22 := ==($t23, $t24)
      # abort state: {returns,aborts}
-     # live vars: $t26
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t20=@2D00}
+     # live vars: $t22
+     # graph: {@2500=local($t13)[],@2900=local($t16)[]}
+     # locals: {$t13=@2500,$t16=@2900}
      # globals: {}
      #
- 61: if ($t26) goto 62 else goto 64
+ 57: if ($t22) goto 58 else goto 60
      # abort state: {returns,aborts}
      # live vars:
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t20=@2D00}
+     # graph: {@2500=local($t13)[],@2900=local($t16)[]}
+     # locals: {$t13=@2500,$t16=@2900}
      # globals: {}
      #
- 62: label L15
+ 58: label L15
      # abort state: {returns,aborts}
      # live vars:
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t20=@2D00}
+     # graph: {@2500=local($t13)[],@2900=local($t16)[]}
+     # locals: {$t13=@2500,$t16=@2900}
      # globals: {}
      #
- 63: goto 67
+ 59: goto 63
      # abort state: {aborts}
      # live vars:
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t20=@2D00}
+     # graph: {@2500=local($t13)[],@2900=local($t16)[]}
+     # locals: {$t13=@2500,$t16=@2900}
      # globals: {}
      #
- 64: label L16
+ 60: label L16
      # abort state: {aborts}
      # live vars:
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t20=@2D00}
+     # graph: {@2500=local($t13)[],@2900=local($t16)[]}
+     # locals: {$t13=@2500,$t16=@2900}
      # globals: {}
      #
- 65: $t29 := 42
+ 61: $t25 := 42
      # abort state: {aborts}
-     # live vars: $t29
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t20=@2D00}
+     # live vars: $t25
+     # graph: {@2500=local($t13)[],@2900=local($t16)[]}
+     # locals: {$t13=@2500,$t16=@2900}
      # globals: {}
      #
- 66: abort($t29)
+ 62: abort($t25)
      # abort state: {returns,aborts}
      # live vars:
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t20=@2D00}
+     # graph: {@2500=local($t13)[],@2900=local($t16)[]}
+     # locals: {$t13=@2500,$t16=@2900}
      # globals: {}
      #
- 67: label L17
+ 63: label L17
      # abort state: {returns,aborts}
      # live vars:
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t20=@2D00}
+     # graph: {@2500=local($t13)[],@2900=local($t16)[]}
+     # locals: {$t13=@2500,$t16=@2900}
      # globals: {}
      #
- 68: $t30 := true
+ 64: $t26 := true
      # abort state: {returns,aborts}
-     # live vars: $t30
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t20=@2D00}
+     # live vars: $t26
+     # graph: {@2500=local($t13)[],@2900=local($t16)[]}
+     # locals: {$t13=@2500,$t16=@2900}
      # globals: {}
      #
- 69: if ($t30) goto 70 else goto 72
+ 65: if ($t26) goto 66 else goto 68
      # abort state: {returns,aborts}
      # live vars:
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t20=@2D00}
+     # graph: {@2500=local($t13)[],@2900=local($t16)[]}
+     # locals: {$t13=@2500,$t16=@2900}
      # globals: {}
      #
- 70: label L18
+ 66: label L18
      # abort state: {returns,aborts}
      # live vars:
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t20=@2D00}
+     # graph: {@2500=local($t13)[],@2900=local($t16)[]}
+     # locals: {$t13=@2500,$t16=@2900}
      # globals: {}
      #
- 71: goto 75
+ 67: goto 71
      # abort state: {aborts}
      # live vars:
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t20=@2D00}
+     # graph: {@2500=local($t13)[],@2900=local($t16)[]}
+     # locals: {$t13=@2500,$t16=@2900}
      # globals: {}
      #
- 72: label L19
+ 68: label L19
      # abort state: {aborts}
      # live vars:
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t20=@2D00}
+     # graph: {@2500=local($t13)[],@2900=local($t16)[]}
+     # locals: {$t13=@2500,$t16=@2900}
      # globals: {}
      #
- 73: $t31 := 42
+ 69: $t27 := 42
      # abort state: {aborts}
-     # live vars: $t31
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t20=@2D00}
+     # live vars: $t27
+     # graph: {@2500=local($t13)[],@2900=local($t16)[]}
+     # locals: {$t13=@2500,$t16=@2900}
      # globals: {}
      #
- 74: abort($t31)
+ 70: abort($t27)
      # abort state: {returns,aborts}
      # live vars:
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t20=@2D00}
+     # graph: {@2500=local($t13)[],@2900=local($t16)[]}
+     # locals: {$t13=@2500,$t16=@2900}
      # globals: {}
      #
- 75: label L20
+ 71: label L20
      # abort state: {returns,aborts}
      # live vars:
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t20=@2D00}
+     # graph: {@2500=local($t13)[],@2900=local($t16)[]}
+     # locals: {$t13=@2500,$t16=@2900}
      # globals: {}
      #
- 76: $t32 := true
+ 72: $t28 := true
      # abort state: {returns,aborts}
-     # live vars: $t32
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t20=@2D00}
+     # live vars: $t28
+     # graph: {@2500=local($t13)[],@2900=local($t16)[]}
+     # locals: {$t13=@2500,$t16=@2900}
      # globals: {}
      #
- 77: if ($t32) goto 78 else goto 80
+ 73: if ($t28) goto 74 else goto 76
      # abort state: {returns}
      # live vars:
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t20=@2D00}
+     # graph: {@2500=local($t13)[],@2900=local($t16)[]}
+     # locals: {$t13=@2500,$t16=@2900}
      # globals: {}
      #
- 78: label L21
+ 74: label L21
      # abort state: {returns}
      # live vars:
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t20=@2D00}
+     # graph: {@2500=local($t13)[],@2900=local($t16)[]}
+     # locals: {$t13=@2500,$t16=@2900}
      # globals: {}
      #
- 79: goto 83
+ 75: goto 79
      # abort state: {aborts}
      # live vars:
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t20=@2D00}
+     # graph: {@2500=local($t13)[],@2900=local($t16)[]}
+     # locals: {$t13=@2500,$t16=@2900}
      # globals: {}
      #
- 80: label L22
+ 76: label L22
      # abort state: {aborts}
      # live vars:
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t20=@2D00}
+     # graph: {@2500=local($t13)[],@2900=local($t16)[]}
+     # locals: {$t13=@2500,$t16=@2900}
      # globals: {}
      #
- 81: $t33 := 42
+ 77: $t29 := 42
      # abort state: {aborts}
-     # live vars: $t33
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t20=@2D00}
+     # live vars: $t29
+     # graph: {@2500=local($t13)[],@2900=local($t16)[]}
+     # locals: {$t13=@2500,$t16=@2900}
      # globals: {}
      #
- 82: abort($t33)
+ 78: abort($t29)
      # abort state: {returns}
      # live vars:
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t20=@2D00}
+     # graph: {@2500=local($t13)[],@2900=local($t16)[]}
+     # locals: {$t13=@2500,$t16=@2900}
      # globals: {}
      #
- 83: label L23
+ 79: label L23
      # abort state: {returns}
      # live vars:
-     # graph: {@1100=local($t7)[],@1D00=local($t13)[],@2900=local($t17)[],@2D00=local($t20)[]}
-     # locals: {$t7=@1100,$t13=@1D00,$t17=@2900,$t20=@2D00}
+     # graph: {@2500=local($t13)[],@2900=local($t16)[]}
+     # locals: {$t13=@2500,$t16=@2900}
      # globals: {}
      #
- 84: return ()
+ 80: return ()
 }
 
 ============ after AbilityProcessor: ================
@@ -1528,34 +1646,30 @@ fun <SELF>_0::check() {
      var $t3: u64
      var $t4: bool
      var $t5: u64
-     var $t6: &u64
+     var $t6: u64
      var $t7: u64
-     var $t8: u64
-     var $t9: u64
-     var $t10: bool
-     var $t11: vector<u8>
-     var $t12: &vector<u8>
-     var $t13: vector<u8>
-     var $t14: vector<u8>
-     var $t15: u64
-     var $t16: &mut u64
-     var $t17: u64
-     var $t18: u64
-     var $t19: &mut vector<u8>
-     var $t20: vector<u8>
-     var $t21: vector<u8>
+     var $t8: bool
+     var $t9: vector<u8>
+     var $t10: vector<u8>
+     var $t11: u64
+     var $t12: &mut u64
+     var $t13: u64
+     var $t14: u64
+     var $t15: &mut vector<u8>
+     var $t16: vector<u8>
+     var $t17: vector<u8>
+     var $t18: bool
+     var $t19: u64
+     var $t20: u64
+     var $t21: u64
      var $t22: bool
-     var $t23: u64
-     var $t24: u64
+     var $t23: vector<u8>
+     var $t24: vector<u8>
      var $t25: u64
      var $t26: bool
-     var $t27: vector<u8>
-     var $t28: vector<u8>
+     var $t27: u64
+     var $t28: bool
      var $t29: u64
-     var $t30: bool
-     var $t31: u64
-     var $t32: bool
-     var $t33: u64
   0: $t0 := true
   1: if ($t0) goto 2 else goto 4
   2: label L0
@@ -1572,74 +1686,70 @@ fun <SELF>_0::check() {
  13: $t3 := 42
  14: abort($t3)
  15: label L5
- 16: $t7 := 0
- 17: $t6 := borrow_local($t7)
- 18: $t5 := read_ref($t6)
- 19: $t8 := 0
- 20: $t4 := ==($t5, $t8)
- 21: if ($t4) goto 22 else goto 24
- 22: label L6
- 23: goto 27
- 24: label L7
- 25: $t9 := 42
- 26: abort($t9)
- 27: label L8
- 28: $t13 := [104, 101, 108, 108, 111]
- 29: $t12 := borrow_local($t13)
- 30: $t11 := read_ref($t12)
- 31: $t14 := [104, 101, 108, 108, 111]
- 32: $t10 := ==($t11, $t14)
- 33: if ($t10) goto 34 else goto 36
- 34: label L9
- 35: goto 39
- 36: label L10
- 37: $t15 := 42
- 38: abort($t15)
- 39: label L11
- 40: $t17 := 0
- 41: $t16 := borrow_local($t17)
- 42: $t18 := 1
- 43: write_ref($t16, $t18)
- 44: $t20 := [104, 101, 108, 108, 111]
- 45: $t19 := borrow_local($t20)
- 46: $t21 := [98, 121, 101]
- 47: write_ref($t19, $t21)
- 48: $t23 := read_ref($t16)
- 49: $t24 := 1
- 50: $t22 := ==($t23, $t24)
- 51: if ($t22) goto 52 else goto 54
- 52: label L12
- 53: goto 58
- 54: label L13
- 55: drop($t19)
- 56: $t25 := 42
- 57: abort($t25)
- 58: label L14
- 59: $t27 := read_ref($t19)
- 60: $t28 := [98, 121, 101]
- 61: $t26 := ==($t27, $t28)
- 62: if ($t26) goto 63 else goto 65
- 63: label L15
- 64: goto 68
- 65: label L16
- 66: $t29 := 42
- 67: abort($t29)
- 68: label L17
- 69: $t30 := true
- 70: if ($t30) goto 71 else goto 73
- 71: label L18
- 72: goto 76
- 73: label L19
- 74: $t31 := 42
- 75: abort($t31)
- 76: label L20
- 77: $t32 := true
- 78: if ($t32) goto 79 else goto 81
- 79: label L21
- 80: goto 84
- 81: label L22
- 82: $t33 := 42
- 83: abort($t33)
- 84: label L23
- 85: return ()
+ 16: $t5 := 0
+ 17: $t6 := 0
+ 18: $t4 := ==($t5, $t6)
+ 19: if ($t4) goto 20 else goto 22
+ 20: label L6
+ 21: goto 25
+ 22: label L7
+ 23: $t7 := 42
+ 24: abort($t7)
+ 25: label L8
+ 26: $t9 := [104, 101, 108, 108, 111]
+ 27: $t10 := [104, 101, 108, 108, 111]
+ 28: $t8 := ==($t9, $t10)
+ 29: if ($t8) goto 30 else goto 32
+ 30: label L9
+ 31: goto 35
+ 32: label L10
+ 33: $t11 := 42
+ 34: abort($t11)
+ 35: label L11
+ 36: $t13 := 0
+ 37: $t12 := borrow_local($t13)
+ 38: $t14 := 1
+ 39: write_ref($t12, $t14)
+ 40: $t16 := [104, 101, 108, 108, 111]
+ 41: $t15 := borrow_local($t16)
+ 42: $t17 := [98, 121, 101]
+ 43: write_ref($t15, $t17)
+ 44: $t19 := read_ref($t12)
+ 45: $t20 := 1
+ 46: $t18 := ==($t19, $t20)
+ 47: if ($t18) goto 48 else goto 50
+ 48: label L12
+ 49: goto 54
+ 50: label L13
+ 51: drop($t15)
+ 52: $t21 := 42
+ 53: abort($t21)
+ 54: label L14
+ 55: $t23 := read_ref($t15)
+ 56: $t24 := [98, 121, 101]
+ 57: $t22 := ==($t23, $t24)
+ 58: if ($t22) goto 59 else goto 61
+ 59: label L15
+ 60: goto 64
+ 61: label L16
+ 62: $t25 := 42
+ 63: abort($t25)
+ 64: label L17
+ 65: $t26 := true
+ 66: if ($t26) goto 67 else goto 69
+ 67: label L18
+ 68: goto 72
+ 69: label L19
+ 70: $t27 := 42
+ 71: abort($t27)
+ 72: label L20
+ 73: $t28 := true
+ 74: if ($t28) goto 75 else goto 77
+ 75: label L21
+ 76: goto 80
+ 77: label L22
+ 78: $t29 := 42
+ 79: abort($t29)
+ 80: label L23
+ 81: return ()
 }
diff --git a/third_party/move/move-compiler-v2/tests/ability-transform/copy_ability_tuple.exp b/third_party/move/move-compiler-v2/tests/ability-transform/copy_ability_tuple.exp
index 93d1066335712..739afae97ab0f 100644
--- a/third_party/move/move-compiler-v2/tests/ability-transform/copy_ability_tuple.exp
+++ b/third_party/move/move-compiler-v2/tests/ability-transform/copy_ability_tuple.exp
@@ -38,6 +38,40 @@ public fun M::f($t0: M::R): (M::R, u64) {
 }
 
 
+[variant baseline]
+public fun M::g($t0: &signer) {
+     var $t1: M::R
+     var $t2: u64
+     var $t3: u64
+     # live vars: $t0
+  0: $t2 := 1
+     # live vars: $t0, $t2
+  1: $t1 := pack M::R($t2)
+     # live vars: $t0, $t1
+  2: $t3 := 3
+     # live vars: $t0, $t1
+  3: ($t1, $t3) := M::f($t1)
+     # live vars: $t0, $t1
+  4: move_to<M::R>($t0, $t1)
+     # live vars:
+  5: return ()
+}
+
+============ after LiveVarAnalysisProcessor: ================
+
+[variant baseline]
+public fun M::f($t0: M::R): (M::R, u64) {
+     var $t1: M::R
+     var $t2: u64
+     # live vars: $t0
+  0: $t1 := infer($t0)
+     # live vars: $t1
+  1: $t2 := 0
+     # live vars: $t1, $t2
+  2: return ($t1, $t2)
+}
+
+
 [variant baseline]
 public fun M::g($t0: &signer) {
      var $t1: M::R
@@ -90,31 +124,31 @@ public fun M::g($t0: &signer) {
      var $t2: u64
      var $t3: u64
      # live vars: $t0
-     # graph: {@1000000=external[borrow(false) -> @2000000],@2000000=derived[]}
+     # graph: {@1000000=external[borrow_imm -> @2000000],@2000000=derived[]}
      # locals: {$t0=@2000000}
      # globals: {}
      #
   0: $t2 := 1
      # live vars: $t0, $t2
-     # graph: {@1000000=external[borrow(false) -> @2000000],@2000000=derived[]}
+     # graph: {@1000000=external[borrow_imm -> @2000000],@2000000=derived[]}
      # locals: {$t0=@2000000}
      # globals: {}
      #
   1: $t1 := pack M::R($t2)
      # live vars: $t0, $t1
-     # graph: {@1000000=external[borrow(false) -> @2000000],@2000000=derived[]}
+     # graph: {@1000000=external[borrow_imm -> @2000000],@2000000=derived[]}
      # locals: {$t0=@2000000}
      # globals: {}
      #
   2: $t3 := 3
      # live vars: $t0, $t1
-     # graph: {@1000000=external[borrow(false) -> @2000000],@2000000=derived[]}
+     # graph: {@1000000=external[borrow_imm -> @2000000],@2000000=derived[]}
      # locals: {$t0=@2000000}
      # globals: {}
      #
   3: ($t1, $t3) := M::f($t1)
      # live vars: $t0, $t1
-     # graph: {@1000000=external[borrow(false) -> @2000000],@2000000=derived[]}
+     # graph: {@1000000=external[borrow_imm -> @2000000],@2000000=derived[]}
      # locals: {$t0=@2000000}
      # globals: {}
      #
@@ -164,35 +198,35 @@ public fun M::g($t0: &signer) {
      var $t3: u64
      # abort state: {returns,aborts}
      # live vars: $t0
-     # graph: {@1000000=external[borrow(false) -> @2000000],@2000000=derived[]}
+     # graph: {@1000000=external[borrow_imm -> @2000000],@2000000=derived[]}
      # locals: {$t0=@2000000}
      # globals: {}
      #
   0: $t2 := 1
      # abort state: {returns,aborts}
      # live vars: $t0, $t2
-     # graph: {@1000000=external[borrow(false) -> @2000000],@2000000=derived[]}
+     # graph: {@1000000=external[borrow_imm -> @2000000],@2000000=derived[]}
      # locals: {$t0=@2000000}
      # globals: {}
      #
   1: $t1 := pack M::R($t2)
      # abort state: {returns,aborts}
      # live vars: $t0, $t1
-     # graph: {@1000000=external[borrow(false) -> @2000000],@2000000=derived[]}
+     # graph: {@1000000=external[borrow_imm -> @2000000],@2000000=derived[]}
      # locals: {$t0=@2000000}
      # globals: {}
      #
   2: $t3 := 3
      # abort state: {returns,aborts}
      # live vars: $t0, $t1
-     # graph: {@1000000=external[borrow(false) -> @2000000],@2000000=derived[]}
+     # graph: {@1000000=external[borrow_imm -> @2000000],@2000000=derived[]}
      # locals: {$t0=@2000000}
      # globals: {}
      #
   3: ($t1, $t3) := M::f($t1)
      # abort state: {returns,aborts}
      # live vars: $t0, $t1
-     # graph: {@1000000=external[borrow(false) -> @2000000],@2000000=derived[]}
+     # graph: {@1000000=external[borrow_imm -> @2000000],@2000000=derived[]}
      # locals: {$t0=@2000000}
      # globals: {}
      #
diff --git a/third_party/move/move-compiler-v2/tests/ability-transform/dead_but_borrowed.exp b/third_party/move/move-compiler-v2/tests/ability-transform/dead_but_borrowed.exp
index fb8ea2f580d51..2f9cb7596ce67 100644
--- a/third_party/move/move-compiler-v2/tests/ability-transform/dead_but_borrowed.exp
+++ b/third_party/move/move-compiler-v2/tests/ability-transform/dead_but_borrowed.exp
@@ -28,6 +28,23 @@ fun explicate_drop::test0(): u8 {
   3: return $t0
 }
 
+============ after LiveVarAnalysisProcessor: ================
+
+[variant baseline]
+fun explicate_drop::test0(): u8 {
+     var $t0: u8
+     var $t1: &u8
+     var $t2: u8
+     # live vars:
+  0: $t2 := 42
+     # live vars: $t2
+  1: $t1 := borrow_local($t2)
+     # live vars: $t1
+  2: $t0 := read_ref($t1)
+     # live vars: $t0
+  3: return $t0
+}
+
 ============ after ReferenceSafetyProcessor: ================
 
 [variant baseline]
@@ -48,7 +65,7 @@ fun explicate_drop::test0(): u8 {
      #
   1: $t1 := borrow_local($t2)
      # live vars: $t1
-     # graph: {@100=local($t2)[borrow(false) -> @101],@101=derived[]}
+     # graph: {@100=local($t2)[borrow_imm -> @101],@101=derived[]}
      # locals: {$t1=@101,$t2=@100}
      # globals: {}
      #
@@ -84,7 +101,7 @@ fun explicate_drop::test0(): u8 {
   1: $t1 := borrow_local($t2)
      # abort state: {returns}
      # live vars: $t1
-     # graph: {@100=local($t2)[borrow(false) -> @101],@101=derived[]}
+     # graph: {@100=local($t2)[borrow_imm -> @101],@101=derived[]}
      # locals: {$t1=@101,$t2=@100}
      # globals: {}
      #
diff --git a/third_party/move/move-compiler-v2/tests/ability-transform/destroy_after_call.exp b/third_party/move/move-compiler-v2/tests/ability-transform/destroy_after_call.exp
index 9a0f654c8d1d9..1a8be7b364eb7 100644
--- a/third_party/move/move-compiler-v2/tests/ability-transform/destroy_after_call.exp
+++ b/third_party/move/move-compiler-v2/tests/ability-transform/destroy_after_call.exp
@@ -34,6 +34,46 @@ fun m::f($t0: &mut u64): &mut u64 {
 }
 
 
+[variant baseline]
+fun m::g() {
+     var $t0: u64
+     var $t1: &mut u64
+     var $t2: &mut u64
+     var $t3: &u64
+     # live vars:
+  0: $t0 := 22
+     # live vars: $t0
+  1: $t1 := borrow_local($t0)
+     # live vars: $t0, $t1
+  2: $t2 := m::f($t1)
+     # live vars: $t0, $t2
+  3: $t1 := infer($t2)
+     # live vars: $t0
+  4: $t3 := borrow_local($t0)
+     # live vars:
+  5: return ()
+}
+
+
+Diagnostics:
+warning: Unused assignment to `r`. Consider removing or prefixing with an underscore: `_r`
+  ┌─ tests/ability-transform/destroy_after_call.move:8:9
+  │
+8 │         r = f(r);
+  │         ^^^^^^^^
+
+============ after LiveVarAnalysisProcessor: ================
+
+[variant baseline]
+fun m::f($t0: &mut u64): &mut u64 {
+     var $t1: &mut u64
+     # live vars: $t0
+  0: $t1 := infer($t0)
+     # live vars: $t1
+  1: return $t1
+}
+
+
 [variant baseline]
 fun m::g() {
      var $t0: u64
@@ -60,13 +100,13 @@ fun m::g() {
 fun m::f($t0: &mut u64): &mut u64 {
      var $t1: &mut u64
      # live vars: $t0
-     # graph: {@1000000=external[borrow(true) -> @2000000],@2000000=derived[]}
+     # graph: {@1000000=external[borrow_mut -> @2000000],@2000000=derived[]}
      # locals: {$t0=@2000000}
      # globals: {}
      #
   0: $t1 := infer($t0)
      # live vars: $t1
-     # graph: {@1000000=external[borrow(true) -> @2000000],@2000000=derived[]}
+     # graph: {@1000000=external[borrow_mut -> @2000000],@2000000=derived[]}
      # locals: {$t1=@2000000}
      # globals: {}
      #
@@ -93,13 +133,13 @@ fun m::g() {
      #
   1: $t1 := borrow_local($t0)
      # live vars: $t0, $t1
-     # graph: {@100=local($t0)[borrow(true) -> @101],@101=derived[]}
+     # graph: {@100=local($t0)[borrow_mut -> @101],@101=derived[]}
      # locals: {$t0=@100,$t1=@101}
      # globals: {}
      #
   2: $t2 := m::f($t1)
      # live vars: $t0, $t2
-     # graph: {@100=local($t0)[borrow(true) -> @101],@101=derived[call(true, 2) -> @200],@200=derived[]}
+     # graph: {@100=local($t0)[borrow_mut -> @101],@101=derived[call_mut@2 -> @200],@200=derived[]}
      # locals: {$t0=@100,$t2=@200}
      # globals: {}
      # derived-from: @200=$t1
@@ -126,14 +166,14 @@ fun m::f($t0: &mut u64): &mut u64 {
      var $t1: &mut u64
      # abort state: {returns}
      # live vars: $t0
-     # graph: {@1000000=external[borrow(true) -> @2000000],@2000000=derived[]}
+     # graph: {@1000000=external[borrow_mut -> @2000000],@2000000=derived[]}
      # locals: {$t0=@2000000}
      # globals: {}
      #
   0: $t1 := infer($t0)
      # abort state: {returns}
      # live vars: $t1
-     # graph: {@1000000=external[borrow(true) -> @2000000],@2000000=derived[]}
+     # graph: {@1000000=external[borrow_mut -> @2000000],@2000000=derived[]}
      # locals: {$t1=@2000000}
      # globals: {}
      #
@@ -163,14 +203,14 @@ fun m::g() {
   1: $t1 := borrow_local($t0)
      # abort state: {returns,aborts}
      # live vars: $t0, $t1
-     # graph: {@100=local($t0)[borrow(true) -> @101],@101=derived[]}
+     # graph: {@100=local($t0)[borrow_mut -> @101],@101=derived[]}
      # locals: {$t0=@100,$t1=@101}
      # globals: {}
      #
   2: $t2 := m::f($t1)
      # abort state: {returns}
      # live vars: $t0, $t2
-     # graph: {@100=local($t0)[borrow(true) -> @101],@101=derived[call(true, 2) -> @200],@200=derived[]}
+     # graph: {@100=local($t0)[borrow_mut -> @101],@101=derived[call_mut@2 -> @200],@200=derived[]}
      # locals: {$t0=@100,$t2=@200}
      # globals: {}
      # derived-from: @200=$t1
diff --git a/third_party/move/move-compiler-v2/tests/ability-transform/drop_after_loop.exp b/third_party/move/move-compiler-v2/tests/ability-transform/drop_after_loop.exp
index 48608a72d41e4..77edac67936f6 100644
--- a/third_party/move/move-compiler-v2/tests/ability-transform/drop_after_loop.exp
+++ b/third_party/move/move-compiler-v2/tests/ability-transform/drop_after_loop.exp
@@ -104,6 +104,72 @@ fun m::drop_after_loop() {
  25: return ()
 }
 
+============ after LiveVarAnalysisProcessor: ================
+
+[variant baseline]
+fun m::drop_after_loop() {
+     var $t0: u64
+     var $t1: &mut u64
+     var $t2: bool
+     var $t3: u64
+     var $t4: bool
+     var $t5: bool
+     var $t6: u64
+     var $t7: u64
+     # live vars:
+  0: $t0 := 1
+     # live vars: $t0
+  1: $t1 := borrow_local($t0)
+     # live vars: $t0, $t1
+  2: $t2 := true
+     # live vars: $t0, $t1, $t2
+  3: label L0
+     # live vars: $t0, $t1, $t2
+  4: if ($t2) goto 5 else goto 11
+     # live vars: $t0, $t1
+  5: label L2
+     # live vars: $t0, $t1
+  6: $t3 := 2
+     # live vars: $t0, $t1, $t3
+  7: write_ref($t1, $t3)
+     # live vars: $t0, $t1
+  8: $t4 := false
+     # live vars: $t0, $t1, $t4
+  9: $t2 := infer($t4)
+     # live vars: $t0, $t1, $t2
+ 10: goto 13
+     # live vars: $t0, $t1
+ 11: label L3
+     # live vars: $t0
+ 12: goto 15
+     # live vars: $t0, $t1, $t2
+ 13: label L4
+     # live vars: $t0, $t1, $t2
+ 14: goto 3
+     # live vars: $t0
+ 15: label L1
+     # live vars: $t0
+ 16: $t6 := 2
+     # live vars: $t0, $t6
+ 17: $t5 := ==($t0, $t6)
+     # live vars: $t5
+ 18: if ($t5) goto 19 else goto 21
+     # live vars:
+ 19: label L5
+     # live vars:
+ 20: goto 24
+     # live vars:
+ 21: label L6
+     # live vars:
+ 22: $t7 := 0
+     # live vars: $t7
+ 23: abort($t7)
+     # live vars:
+ 24: label L7
+     # live vars:
+ 25: return ()
+}
+
 ============ after ReferenceSafetyProcessor: ================
 
 [variant baseline]
@@ -129,61 +195,61 @@ fun m::drop_after_loop() {
      #
   1: $t1 := borrow_local($t0)
      # live vars: $t0, $t1
-     # graph: {@100=local($t0)[borrow(true) -> @101],@101=derived[]}
+     # graph: {@100=local($t0)[borrow_mut -> @101],@101=derived[]}
      # locals: {$t0=@100,$t1=@101}
      # globals: {}
      #
   2: $t2 := true
      # live vars: $t0, $t1, $t2
-     # graph: {@100=local($t0)[borrow(true) -> @101],@101=derived[]}
+     # graph: {@100=local($t0)[borrow_mut -> @101],@101=derived[]}
      # locals: {$t0=@100,$t1=@101}
      # globals: {}
      #
   3: label L0
      # live vars: $t0, $t1, $t2
-     # graph: {@100=local($t0)[borrow(true) -> @101],@101=derived[]}
+     # graph: {@100=local($t0)[borrow_mut -> @101],@101=derived[]}
      # locals: {$t0=@100,$t1=@101}
      # globals: {}
      #
   4: if ($t2) goto 5 else goto 11
      # live vars: $t0, $t1
-     # graph: {@100=local($t0)[borrow(true) -> @101],@101=derived[]}
+     # graph: {@100=local($t0)[borrow_mut -> @101],@101=derived[]}
      # locals: {$t0=@100,$t1=@101}
      # globals: {}
      #
   5: label L2
      # live vars: $t0, $t1
-     # graph: {@100=local($t0)[borrow(true) -> @101],@101=derived[]}
+     # graph: {@100=local($t0)[borrow_mut -> @101],@101=derived[]}
      # locals: {$t0=@100,$t1=@101}
      # globals: {}
      #
   6: $t3 := 2
      # live vars: $t0, $t1, $t3
-     # graph: {@100=local($t0)[borrow(true) -> @101],@101=derived[]}
+     # graph: {@100=local($t0)[borrow_mut -> @101],@101=derived[]}
      # locals: {$t0=@100,$t1=@101}
      # globals: {}
      #
   7: write_ref($t1, $t3)
      # live vars: $t0, $t1
-     # graph: {@100=local($t0)[borrow(true) -> @101],@101=derived[]}
+     # graph: {@100=local($t0)[borrow_mut -> @101],@101=derived[]}
      # locals: {$t0=@100,$t1=@101}
      # globals: {}
      #
   8: $t4 := false
      # live vars: $t0, $t1, $t4
-     # graph: {@100=local($t0)[borrow(true) -> @101],@101=derived[]}
+     # graph: {@100=local($t0)[borrow_mut -> @101],@101=derived[]}
      # locals: {$t0=@100,$t1=@101}
      # globals: {}
      #
   9: $t2 := infer($t4)
      # live vars: $t0, $t1, $t2
-     # graph: {@100=local($t0)[borrow(true) -> @101],@101=derived[]}
+     # graph: {@100=local($t0)[borrow_mut -> @101],@101=derived[]}
      # locals: {$t0=@100,$t1=@101}
      # globals: {}
      #
  10: goto 13
      # live vars: $t0, $t1
-     # graph: {@100=local($t0)[borrow(true) -> @101],@101=derived[]}
+     # graph: {@100=local($t0)[borrow_mut -> @101],@101=derived[]}
      # locals: {$t0=@100,$t1=@101}
      # globals: {}
      #
@@ -195,13 +261,13 @@ fun m::drop_after_loop() {
      #
  12: goto 15
      # live vars: $t0, $t1, $t2
-     # graph: {@100=local($t0)[borrow(true) -> @101],@101=derived[]}
+     # graph: {@100=local($t0)[borrow_mut -> @101],@101=derived[]}
      # locals: {$t0=@100,$t1=@101}
      # globals: {}
      #
  13: label L4
      # live vars: $t0, $t1, $t2
-     # graph: {@100=local($t0)[borrow(true) -> @101],@101=derived[]}
+     # graph: {@100=local($t0)[borrow_mut -> @101],@101=derived[]}
      # locals: {$t0=@100,$t1=@101}
      # globals: {}
      #
@@ -302,70 +368,70 @@ fun m::drop_after_loop() {
   1: $t1 := borrow_local($t0)
      # abort state: {returns,aborts}
      # live vars: $t0, $t1
-     # graph: {@100=local($t0)[borrow(true) -> @101],@101=derived[]}
+     # graph: {@100=local($t0)[borrow_mut -> @101],@101=derived[]}
      # locals: {$t0=@100,$t1=@101}
      # globals: {}
      #
   2: $t2 := true
      # abort state: {returns,aborts}
      # live vars: $t0, $t1, $t2
-     # graph: {@100=local($t0)[borrow(true) -> @101],@101=derived[]}
+     # graph: {@100=local($t0)[borrow_mut -> @101],@101=derived[]}
      # locals: {$t0=@100,$t1=@101}
      # globals: {}
      #
   3: label L0
      # abort state: {returns,aborts}
      # live vars: $t0, $t1, $t2
-     # graph: {@100=local($t0)[borrow(true) -> @101],@101=derived[]}
+     # graph: {@100=local($t0)[borrow_mut -> @101],@101=derived[]}
      # locals: {$t0=@100,$t1=@101}
      # globals: {}
      #
   4: if ($t2) goto 5 else goto 11
      # abort state: {returns,aborts}
      # live vars: $t0, $t1
-     # graph: {@100=local($t0)[borrow(true) -> @101],@101=derived[]}
+     # graph: {@100=local($t0)[borrow_mut -> @101],@101=derived[]}
      # locals: {$t0=@100,$t1=@101}
      # globals: {}
      #
   5: label L2
      # abort state: {returns,aborts}
      # live vars: $t0, $t1
-     # graph: {@100=local($t0)[borrow(true) -> @101],@101=derived[]}
+     # graph: {@100=local($t0)[borrow_mut -> @101],@101=derived[]}
      # locals: {$t0=@100,$t1=@101}
      # globals: {}
      #
   6: $t3 := 2
      # abort state: {returns,aborts}
      # live vars: $t0, $t1, $t3
-     # graph: {@100=local($t0)[borrow(true) -> @101],@101=derived[]}
+     # graph: {@100=local($t0)[borrow_mut -> @101],@101=derived[]}
      # locals: {$t0=@100,$t1=@101}
      # globals: {}
      #
   7: write_ref($t1, $t3)
      # abort state: {returns,aborts}
      # live vars: $t0, $t1
-     # graph: {@100=local($t0)[borrow(true) -> @101],@101=derived[]}
+     # graph: {@100=local($t0)[borrow_mut -> @101],@101=derived[]}
      # locals: {$t0=@100,$t1=@101}
      # globals: {}
      #
   8: $t4 := false
      # abort state: {returns,aborts}
      # live vars: $t0, $t1, $t4
-     # graph: {@100=local($t0)[borrow(true) -> @101],@101=derived[]}
+     # graph: {@100=local($t0)[borrow_mut -> @101],@101=derived[]}
      # locals: {$t0=@100,$t1=@101}
      # globals: {}
      #
   9: $t2 := infer($t4)
      # abort state: {returns,aborts}
      # live vars: $t0, $t1, $t2
-     # graph: {@100=local($t0)[borrow(true) -> @101],@101=derived[]}
+     # graph: {@100=local($t0)[borrow_mut -> @101],@101=derived[]}
      # locals: {$t0=@100,$t1=@101}
      # globals: {}
      #
  10: goto 13
      # abort state: {returns,aborts}
      # live vars: $t0, $t1
-     # graph: {@100=local($t0)[borrow(true) -> @101],@101=derived[]}
+     # graph: {@100=local($t0)[borrow_mut -> @101],@101=derived[]}
      # locals: {$t0=@100,$t1=@101}
      # globals: {}
      #
@@ -379,14 +445,14 @@ fun m::drop_after_loop() {
  12: goto 15
      # abort state: {returns,aborts}
      # live vars: $t0, $t1, $t2
-     # graph: {@100=local($t0)[borrow(true) -> @101],@101=derived[]}
+     # graph: {@100=local($t0)[borrow_mut -> @101],@101=derived[]}
      # locals: {$t0=@100,$t1=@101}
      # globals: {}
      #
  13: label L4
      # abort state: {returns,aborts}
      # live vars: $t0, $t1, $t2
-     # graph: {@100=local($t0)[borrow(true) -> @101],@101=derived[]}
+     # graph: {@100=local($t0)[borrow_mut -> @101],@101=derived[]}
      # locals: {$t0=@100,$t1=@101}
      # globals: {}
      #
diff --git a/third_party/move/move-compiler-v2/tests/ability-transform/drop_at_branch.exp b/third_party/move/move-compiler-v2/tests/ability-transform/drop_at_branch.exp
index 7b5153dffd6dd..baaa593bf4a38 100644
--- a/third_party/move/move-compiler-v2/tests/ability-transform/drop_at_branch.exp
+++ b/third_party/move/move-compiler-v2/tests/ability-transform/drop_at_branch.exp
@@ -36,6 +36,29 @@ fun explicate_drop::drop_at_branch($t0: bool): u8 {
   7: return $t1
 }
 
+============ after LiveVarAnalysisProcessor: ================
+
+[variant baseline]
+fun explicate_drop::drop_at_branch($t0: bool): u8 {
+     var $t1: u8
+     # live vars: $t0
+  0: if ($t0) goto 1 else goto 4
+     # live vars:
+  1: label L0
+     # live vars:
+  2: $t1 := 1
+     # live vars: $t1
+  3: goto 6
+     # live vars:
+  4: label L1
+     # live vars:
+  5: $t1 := 0
+     # live vars: $t1
+  6: label L2
+     # live vars: $t1
+  7: return $t1
+}
+
 ============ after ReferenceSafetyProcessor: ================
 
 [variant baseline]
diff --git a/third_party/move/move-compiler-v2/tests/ability-transform/foreach_mut_expanded.exp b/third_party/move/move-compiler-v2/tests/ability-transform/foreach_mut_expanded.exp
index 0fa363db495c6..57cddffaf1f90 100644
--- a/third_party/move/move-compiler-v2/tests/ability-transform/foreach_mut_expanded.exp
+++ b/third_party/move/move-compiler-v2/tests/ability-transform/foreach_mut_expanded.exp
@@ -129,6 +129,87 @@ fun m::test_for_each_mut() {
  30: return ()
 }
 
+============ after LiveVarAnalysisProcessor: ================
+
+[variant baseline]
+fun m::test_for_each_mut() {
+     var $t0: vector<u64>
+     var $t1: u64
+     var $t2: u64
+     var $t3: &vector<u64>
+     var $t4: &mut vector<u64>
+     var $t5: bool
+     var $t6: &mut u64
+     var $t7: u64
+     var $t8: u64
+     var $t9: u64
+     var $t10: bool
+     var $t11: vector<u64>
+     var $t12: u64
+     # live vars:
+  0: $t0 := ["1", "2", "3"]
+     # live vars: $t0
+  1: $t1 := 0
+     # live vars: $t0, $t1
+  2: $t3 := borrow_local($t0)
+     # live vars: $t0, $t1, $t3
+  3: $t2 := vector::length<u64>($t3)
+     # live vars: $t0, $t1, $t2
+  4: $t4 := borrow_local($t0)
+     # live vars: $t0, $t1, $t2, $t4
+  5: label L0
+     # live vars: $t0, $t1, $t2, $t4
+  6: $t5 := <($t1, $t2)
+     # live vars: $t0, $t1, $t2, $t4, $t5
+  7: if ($t5) goto 8 else goto 16
+     # live vars: $t0, $t1, $t2, $t4
+  8: label L2
+     # live vars: $t0, $t1, $t2, $t4
+  9: $t6 := vector::borrow_mut<u64>($t4, $t1)
+     # live vars: $t0, $t1, $t2, $t4, $t6
+ 10: $t7 := 2
+     # live vars: $t0, $t1, $t2, $t4, $t6, $t7
+ 11: write_ref($t6, $t7)
+     # live vars: $t0, $t1, $t2, $t4
+ 12: $t9 := 1
+     # live vars: $t0, $t1, $t2, $t4, $t9
+ 13: $t8 := +($t1, $t9)
+     # live vars: $t0, $t2, $t4, $t8
+ 14: $t1 := infer($t8)
+     # live vars: $t0, $t1, $t2, $t4
+ 15: goto 18
+     # live vars: $t0, $t1, $t2, $t4
+ 16: label L3
+     # live vars: $t0
+ 17: goto 20
+     # live vars: $t0, $t1, $t2, $t4
+ 18: label L4
+     # live vars: $t0, $t1, $t2, $t4
+ 19: goto 5
+     # live vars: $t0
+ 20: label L1
+     # live vars: $t0
+ 21: $t11 := ["2", "3", "4"]
+     # live vars: $t0, $t11
+ 22: $t10 := ==($t0, $t11)
+     # live vars: $t10
+ 23: if ($t10) goto 24 else goto 26
+     # live vars:
+ 24: label L5
+     # live vars:
+ 25: goto 29
+     # live vars:
+ 26: label L6
+     # live vars:
+ 27: $t12 := 0
+     # live vars: $t12
+ 28: abort($t12)
+     # live vars:
+ 29: label L7
+     # live vars:
+ 30: return ()
+}
+
 ============ after ReferenceSafetyProcessor: ================
 
 [variant baseline]
@@ -165,7 +246,7 @@ fun m::test_for_each_mut() {
      #
   2: $t3 := borrow_local($t0)
      # live vars: $t0, $t1, $t3
-     # graph: {@200=local($t0)[borrow(false) -> @201],@201=derived[]}
+     # graph: {@200=local($t0)[borrow_imm -> @201],@201=derived[]}
      # locals: {$t0=@200,$t3=@201}
      # globals: {}
      #
@@ -177,75 +258,75 @@ fun m::test_for_each_mut() {
      #
   4: $t4 := borrow_local($t0)
      # live vars: $t0, $t1, $t2, $t4
-     # graph: {@200=local($t0)[borrow(true) -> @401],@401=derived[]}
+     # graph: {@200=local($t0)[borrow_mut -> @401],@401=derived[]}
      # locals: {$t0=@200,$t4=@401}
      # globals: {}
      #
   5: label L0
      # live vars: $t0, $t1, $t2, $t4
-     # graph: {@200=local($t0)[borrow(true) -> @401],@401=derived[]}
+     # graph: {@200=local($t0)[borrow_mut -> @401],@401=derived[]}
      # locals: {$t0=@200,$t4=@401}
      # globals: {}
      #
   6: $t5 := <($t1, $t2)
      # live vars: $t0, $t1, $t2, $t4, $t5
-     # graph: {@200=local($t0)[borrow(true) -> @401],@401=derived[]}
+     # graph: {@200=local($t0)[borrow_mut -> @401],@401=derived[]}
      # locals: {$t0=@200,$t4=@401}
      # globals: {}
      #
   7: if ($t5) goto 8 else goto 16
      # live vars: $t0, $t1, $t2, $t4
-     # graph: {@200=local($t0)[borrow(true) -> @401],@401=derived[]}
+     # graph: {@200=local($t0)[borrow_mut -> @401],@401=derived[]}
      # locals: {$t0=@200,$t4=@401}
      # globals: {}
      #
   8: label L2
      # live vars: $t0, $t1, $t2, $t4
-     # graph: {@200=local($t0)[borrow(true) -> @401],@401=derived[]}
+     # graph: {@200=local($t0)[borrow_mut -> @401],@401=derived[]}
      # locals: {$t0=@200,$t4=@401}
      # globals: {}
      #
   9: $t6 := vector::borrow_mut<u64>($t4, $t1)
      # live vars: $t0, $t1, $t2, $t4, $t6
-     # graph: {@200=local($t0)[borrow(true) -> @401],@401=derived[call(true, 9) -> @900],@900=derived[]}
+     # graph: {@200=local($t0)[borrow_mut -> @401],@401=derived[call_mut@9 -> @900],@900=derived[]}
      # locals: {$t0=@200,$t4=@401,$t6=@900}
      # globals: {}
      # derived-from: @900=$t4
      #
  10: $t7 := 2
      # live vars: $t0, $t1, $t2, $t4, $t6, $t7
-     # graph: {@200=local($t0)[borrow(true) -> @401],@401=derived[call(true, 9) -> @900],@900=derived[]}
+     # graph: {@200=local($t0)[borrow_mut -> @401],@401=derived[call_mut@9 -> @900],@900=derived[]}
      # locals: {$t0=@200,$t4=@401,$t6=@900}
      # globals: {}
      # derived-from: @900=$t4
      #
  11: write_ref($t6, $t7)
      # live vars: $t0, $t1, $t2, $t4
-     # graph: {@200=local($t0)[borrow(true) -> @401],@401=derived[]}
+     # graph: {@200=local($t0)[borrow_mut -> @401],@401=derived[]}
      # locals: {$t0=@200,$t4=@401}
      # globals: {}
      #
  12: $t9 := 1
      # live vars: $t0, $t1, $t2, $t4, $t9
-     # graph: {@200=local($t0)[borrow(true) -> @401],@401=derived[]}
+     # graph: {@200=local($t0)[borrow_mut -> @401],@401=derived[]}
      # locals: {$t0=@200,$t4=@401}
      # globals: {}
      #
  13: $t8 := +($t1, $t9)
      # live vars: $t0, $t2, $t4, $t8
-     # graph: {@200=local($t0)[borrow(true) -> @401],@401=derived[]}
+     # graph: {@200=local($t0)[borrow_mut -> @401],@401=derived[]}
      # locals: {$t0=@200,$t4=@401}
      # globals: {}
      #
  14: $t1 := infer($t8)
      # live vars: $t0, $t1, $t2, $t4
-     # graph: {@200=local($t0)[borrow(true) -> @401],@401=derived[]}
+     # graph: {@200=local($t0)[borrow_mut -> @401],@401=derived[]}
      # locals: {$t0=@200,$t4=@401}
      # globals: {}
      #
  15: goto 18
      # live vars: $t0, $t1, $t2, $t4
-     # graph: {@200=local($t0)[borrow(true) -> @401],@401=derived[]}
+     # graph: {@200=local($t0)[borrow_mut -> @401],@401=derived[]}
      # locals: {$t0=@200,$t4=@401}
      # globals: {}
      #
@@ -257,13 +338,13 @@ fun m::test_for_each_mut() {
      #
  17: goto 20
      # live vars: $t0, $t1, $t2, $t4
-     # graph: {@200=local($t0)[borrow(true) -> @401],@401=derived[]}
+     # graph: {@200=local($t0)[borrow_mut -> @401],@401=derived[]}
      # locals: {$t0=@200,$t4=@401}
      # globals: {}
      #
  18: label L4
      # live vars: $t0, $t1, $t2, $t4
-     # graph: {@200=local($t0)[borrow(true) -> @401],@401=derived[]}
+     # graph: {@200=local($t0)[borrow_mut -> @401],@401=derived[]}
      # locals: {$t0=@200,$t4=@401}
      # globals: {}
      #
@@ -376,7 +457,7 @@ fun m::test_for_each_mut() {
   2: $t3 := borrow_local($t0)
      # abort state: {returns,aborts}
      # live vars: $t0, $t1, $t3
-     # graph: {@200=local($t0)[borrow(false) -> @201],@201=derived[]}
+     # graph: {@200=local($t0)[borrow_imm -> @201],@201=derived[]}
      # locals: {$t0=@200,$t3=@201}
      # globals: {}
      #
@@ -390,42 +471,42 @@ fun m::test_for_each_mut() {
   4: $t4 := borrow_local($t0)
      # abort state: {returns,aborts}
      # live vars: $t0, $t1, $t2, $t4
-     # graph: {@200=local($t0)[borrow(true) -> @401],@401=derived[]}
+     # graph: {@200=local($t0)[borrow_mut -> @401],@401=derived[]}
      # locals: {$t0=@200,$t4=@401}
      # globals: {}
      #
   5: label L0
      # abort state: {returns,aborts}
      # live vars: $t0, $t1, $t2, $t4
-     # graph: {@200=local($t0)[borrow(true) -> @401],@401=derived[]}
+     # graph: {@200=local($t0)[borrow_mut -> @401],@401=derived[]}
      # locals: {$t0=@200,$t4=@401}
      # globals: {}
      #
   6: $t5 := <($t1, $t2)
      # abort state: {returns,aborts}
      # live vars: $t0, $t1, $t2, $t4, $t5
-     # graph: {@200=local($t0)[borrow(true) -> @401],@401=derived[]}
+     # graph: {@200=local($t0)[borrow_mut -> @401],@401=derived[]}
      # locals: {$t0=@200,$t4=@401}
      # globals: {}
      #
   7: if ($t5) goto 8 else goto 16
      # abort state: {returns,aborts}
      # live vars: $t0, $t1, $t2, $t4
-     # graph: {@200=local($t0)[borrow(true) -> @401],@401=derived[]}
+     # graph: {@200=local($t0)[borrow_mut -> @401],@401=derived[]}
      # locals: {$t0=@200,$t4=@401}
      # globals: {}
      #
   8: label L2
      # abort state: {returns,aborts}
      # live vars: $t0, $t1, $t2, $t4
-     # graph: {@200=local($t0)[borrow(true) -> @401],@401=derived[]}
+     # graph: {@200=local($t0)[borrow_mut -> @401],@401=derived[]}
      # locals: {$t0=@200,$t4=@401}
      # globals: {}
      #
   9: $t6 := vector::borrow_mut<u64>($t4, $t1)
      # abort state: {returns,aborts}
      # live vars: $t0, $t1, $t2, $t4, $t6
-     # graph: {@200=local($t0)[borrow(true) -> @401],@401=derived[call(true, 9) -> @900],@900=derived[]}
+     # graph: {@200=local($t0)[borrow_mut -> @401],@401=derived[call_mut@9 -> @900],@900=derived[]}
      # locals: {$t0=@200,$t4=@401,$t6=@900}
      # globals: {}
      # derived-from: @900=$t4
@@ -433,7 +514,7 @@ fun m::test_for_each_mut() {
  10: $t7 := 2
      # abort state: {returns,aborts}
      # live vars: $t0, $t1, $t2, $t4, $t6, $t7
-     # graph: {@200=local($t0)[borrow(true) -> @401],@401=derived[call(true, 9) -> @900],@900=derived[]}
+     # graph: {@200=local($t0)[borrow_mut -> @401],@401=derived[call_mut@9 -> @900],@900=derived[]}
      # locals: {$t0=@200,$t4=@401,$t6=@900}
      # globals: {}
      # derived-from: @900=$t4
@@ -441,35 +522,35 @@ fun m::test_for_each_mut() {
  11: write_ref($t6, $t7)
      # abort state: {returns,aborts}
      # live vars: $t0, $t1, $t2, $t4
-     # graph: {@200=local($t0)[borrow(true) -> @401],@401=derived[]}
+     # graph: {@200=local($t0)[borrow_mut -> @401],@401=derived[]}
      # locals: {$t0=@200,$t4=@401}
      # globals: {}
      #
  12: $t9 := 1
      # abort state: {returns,aborts}
      # live vars: $t0, $t1, $t2, $t4, $t9
-     # graph: {@200=local($t0)[borrow(true) -> @401],@401=derived[]}
+     # graph: {@200=local($t0)[borrow_mut -> @401],@401=derived[]}
      # locals: {$t0=@200,$t4=@401}
      # globals: {}
      #
  13: $t8 := +($t1, $t9)
      # abort state: {returns,aborts}
      # live vars: $t0, $t2, $t4, $t8
-     # graph: {@200=local($t0)[borrow(true) -> @401],@401=derived[]}
+     # graph: {@200=local($t0)[borrow_mut -> @401],@401=derived[]}
      # locals: {$t0=@200,$t4=@401}
      # globals: {}
      #
  14: $t1 := infer($t8)
      # abort state: {returns,aborts}
      # live vars: $t0, $t1, $t2, $t4
-     # graph: {@200=local($t0)[borrow(true) -> @401],@401=derived[]}
+     # graph: {@200=local($t0)[borrow_mut -> @401],@401=derived[]}
      # locals: {$t0=@200,$t4=@401}
      # globals: {}
      #
  15: goto 18
      # abort state: {returns,aborts}
      # live vars: $t0, $t1, $t2, $t4
-     # graph: {@200=local($t0)[borrow(true) -> @401],@401=derived[]}
+     # graph: {@200=local($t0)[borrow_mut -> @401],@401=derived[]}
      # locals: {$t0=@200,$t4=@401}
      # globals: {}
      #
@@ -483,14 +564,14 @@ fun m::test_for_each_mut() {
  17: goto 20
      # abort state: {returns,aborts}
      # live vars: $t0, $t1, $t2, $t4
-     # graph: {@200=local($t0)[borrow(true) -> @401],@401=derived[]}
+     # graph: {@200=local($t0)[borrow_mut -> @401],@401=derived[]}
      # locals: {$t0=@200,$t4=@401}
      # globals: {}
      #
  18: label L4
      # abort state: {returns,aborts}
      # live vars: $t0, $t1, $t2, $t4
-     # graph: {@200=local($t0)[borrow(true) -> @401],@401=derived[]}
+     # graph: {@200=local($t0)[borrow_mut -> @401],@401=derived[]}
      # locals: {$t0=@200,$t4=@401}
      # globals: {}
      #
diff --git a/third_party/move/move-compiler-v2/tests/ability-transform/mutate_return.exp b/third_party/move/move-compiler-v2/tests/ability-transform/mutate_return.exp
index b9037dc8a96e9..f7f2e990167a2 100644
--- a/third_party/move/move-compiler-v2/tests/ability-transform/mutate_return.exp
+++ b/third_party/move/move-compiler-v2/tests/ability-transform/mutate_return.exp
@@ -38,6 +38,32 @@ public fun m::singleton<#0>($t0: #0): vector<#0> {
 }
 
 
+[variant baseline]
+fun m::g<#0>($t0: &mut vector<#0>) {
+     # live vars: $t0
+  0: return ()
+}
+
+============ after LiveVarAnalysisProcessor: ================
+
+[variant baseline]
+public fun m::singleton<#0>($t0: #0): vector<#0> {
+     var $t1: vector<#0>
+     var $t2: vector<#0>
+     var $t3: &mut vector<#0>
+     # live vars: $t0
+  0: $t2 := vector($t0)
+     # live vars: $t2
+  1: $t3 := borrow_local($t2)
+     # live vars: $t2, $t3
+  2: m::g<#0>($t3)
+     # live vars: $t2
+  3: $t1 := infer($t2)
+     # live vars: $t1
+  4: return $t1
+}
+
+
 [variant baseline]
 fun m::g<#0>($t0: &mut vector<#0>) {
      # live vars: $t0
@@ -64,7 +90,7 @@ public fun m::singleton<#0>($t0: #0): vector<#0> {
      #
   1: $t3 := borrow_local($t2)
      # live vars: $t2, $t3
-     # graph: {@100=local($t2)[borrow(true) -> @101],@101=derived[]}
+     # graph: {@100=local($t2)[borrow_mut -> @101],@101=derived[]}
      # locals: {$t2=@100,$t3=@101}
      # globals: {}
      #
@@ -87,7 +113,7 @@ public fun m::singleton<#0>($t0: #0): vector<#0> {
 [variant baseline]
 fun m::g<#0>($t0: &mut vector<#0>) {
      # live vars: $t0
-     # graph: {@1000000=external[borrow(true) -> @2000000],@2000000=derived[]}
+     # graph: {@1000000=external[borrow_mut -> @2000000],@2000000=derived[]}
      # locals: {$t0=@2000000}
      # globals: {}
      #
@@ -117,7 +143,7 @@ public fun m::singleton<#0>($t0: #0): vector<#0> {
   1: $t3 := borrow_local($t2)
      # abort state: {returns,aborts}
      # live vars: $t2, $t3
-     # graph: {@100=local($t2)[borrow(true) -> @101],@101=derived[]}
+     # graph: {@100=local($t2)[borrow_mut -> @101],@101=derived[]}
      # locals: {$t2=@100,$t3=@101}
      # globals: {}
      #
@@ -143,7 +169,7 @@ public fun m::singleton<#0>($t0: #0): vector<#0> {
 fun m::g<#0>($t0: &mut vector<#0>) {
      # abort state: {returns}
      # live vars: $t0
-     # graph: {@1000000=external[borrow(true) -> @2000000],@2000000=derived[]}
+     # graph: {@1000000=external[borrow_mut -> @2000000],@2000000=derived[]}
      # locals: {$t0=@2000000}
      # globals: {}
      #
diff --git a/third_party/move/move-compiler-v2/tests/ability-transform/mutate_vector.exp b/third_party/move/move-compiler-v2/tests/ability-transform/mutate_vector.exp
index 6518aab05cf61..c9b8e8c2e4574 100644
--- a/third_party/move/move-compiler-v2/tests/ability-transform/mutate_vector.exp
+++ b/third_party/move/move-compiler-v2/tests/ability-transform/mutate_vector.exp
@@ -57,6 +57,47 @@ public fun m::new_scalar_from_u8($t0: u8): m::Scalar {
 }
 
 
+[variant baseline]
+public fun m::scalar_zero(): m::Scalar {
+     var $t0: m::Scalar
+     var $t1: vector<u8>
+     # live vars:
+  0: $t1 := [0]
+     # live vars: $t1
+  1: $t0 := pack m::Scalar($t1)
+     # live vars: $t0
+  2: return $t0
+}
+
+============ after LiveVarAnalysisProcessor: ================
+
+[variant baseline]
+public fun m::new_scalar_from_u8($t0: u8): m::Scalar {
+     var $t1: m::Scalar
+     var $t2: m::Scalar
+     var $t3: &mut u8
+     var $t4: &mut vector<u8>
+     var $t5: &mut m::Scalar
+     var $t6: u64
+     # live vars: $t0
+  0: $t2 := m::scalar_zero()
+     # live vars: $t0, $t2
+  1: $t5 := borrow_local($t2)
+     # live vars: $t0, $t2, $t5
+  2: $t4 := borrow_field<m::Scalar>.data($t5)
+     # live vars: $t0, $t2, $t4
+  3: $t6 := 0
+     # live vars: $t0, $t2, $t4, $t6
+  4: $t3 := vector::borrow_mut<u8>($t4, $t6)
+     # live vars: $t0, $t2, $t3
+  5: write_ref($t3, $t0)
+     # live vars: $t2
+  6: $t1 := infer($t2)
+     # live vars: $t1
+  7: return $t1
+}
+
+
 [variant baseline]
 public fun m::scalar_zero(): m::Scalar {
      var $t0: m::Scalar
@@ -92,27 +133,27 @@ public fun m::new_scalar_from_u8($t0: u8): m::Scalar {
      #
   1: $t5 := borrow_local($t2)
      # live vars: $t0, $t2, $t5
-     # graph: {@100=local($t2)[borrow(true) -> @101],@101=derived[]}
+     # graph: {@100=local($t2)[borrow_mut -> @101],@101=derived[]}
      # locals: {$t2=@100,$t5=@101}
      # globals: {}
      #
   2: $t4 := borrow_field<m::Scalar>.data($t5)
      # live vars: $t0, $t2, $t4
-     # graph: {@100=local($t2)[borrow(true) -> @101],@101=derived[borrow_field(true) -> @201],@201=derived[]}
+     # graph: {@100=local($t2)[borrow_mut -> @101],@101=derived[borrow_mut.data -> @201],@201=derived[]}
      # locals: {$t2=@100,$t4=@201}
      # globals: {}
      # derived-from: @201=$t5
      #
   3: $t6 := 0
      # live vars: $t0, $t2, $t4, $t6
-     # graph: {@100=local($t2)[borrow(true) -> @101],@101=derived[borrow_field(true) -> @201],@201=derived[]}
+     # graph: {@100=local($t2)[borrow_mut -> @101],@101=derived[borrow_mut.data -> @201],@201=derived[]}
      # locals: {$t2=@100,$t4=@201}
      # globals: {}
      # derived-from: @201=$t5
      #
   4: $t3 := vector::borrow_mut<u8>($t4, $t6)
      # live vars: $t0, $t2, $t3
-     # graph: {@100=local($t2)[borrow(true) -> @101],@101=derived[borrow_field(true) -> @201],@201=derived[call(true, 4) -> @400],@400=derived[]}
+     # graph: {@100=local($t2)[borrow_mut -> @101],@101=derived[borrow_mut.data -> @201],@201=derived[call_mut@4 -> @400],@400=derived[]}
      # locals: {$t2=@100,$t3=@400}
      # globals: {}
      # derived-from: @201=$t5,@400=$t4
@@ -183,14 +224,14 @@ public fun m::new_scalar_from_u8($t0: u8): m::Scalar {
   1: $t5 := borrow_local($t2)
      # abort state: {returns,aborts}
      # live vars: $t0, $t2, $t5
-     # graph: {@100=local($t2)[borrow(true) -> @101],@101=derived[]}
+     # graph: {@100=local($t2)[borrow_mut -> @101],@101=derived[]}
      # locals: {$t2=@100,$t5=@101}
      # globals: {}
      #
   2: $t4 := borrow_field<m::Scalar>.data($t5)
      # abort state: {returns,aborts}
      # live vars: $t0, $t2, $t4
-     # graph: {@100=local($t2)[borrow(true) -> @101],@101=derived[borrow_field(true) -> @201],@201=derived[]}
+     # graph: {@100=local($t2)[borrow_mut -> @101],@101=derived[borrow_mut.data -> @201],@201=derived[]}
      # locals: {$t2=@100,$t4=@201}
      # globals: {}
      # derived-from: @201=$t5
@@ -198,7 +239,7 @@ public fun m::new_scalar_from_u8($t0: u8): m::Scalar {
   3: $t6 := 0
      # abort state: {returns,aborts}
      # live vars: $t0, $t2, $t4, $t6
-     # graph: {@100=local($t2)[borrow(true) -> @101],@101=derived[borrow_field(true) -> @201],@201=derived[]}
+     # graph: {@100=local($t2)[borrow_mut -> @101],@101=derived[borrow_mut.data -> @201],@201=derived[]}
      # locals: {$t2=@100,$t4=@201}
      # globals: {}
      # derived-from: @201=$t5
@@ -206,7 +247,7 @@ public fun m::new_scalar_from_u8($t0: u8): m::Scalar {
   4: $t3 := vector::borrow_mut<u8>($t4, $t6)
      # abort state: {returns}
      # live vars: $t0, $t2, $t3
-     # graph: {@100=local($t2)[borrow(true) -> @101],@101=derived[borrow_field(true) -> @201],@201=derived[call(true, 4) -> @400],@400=derived[]}
+     # graph: {@100=local($t2)[borrow_mut -> @101],@101=derived[borrow_mut.data -> @201],@201=derived[call_mut@4 -> @400],@400=derived[]}
      # locals: {$t2=@100,$t3=@400}
      # globals: {}
      # derived-from: @201=$t5,@400=$t4
diff --git a/third_party/move/move-compiler-v2/tests/abort-analysis/drop_on_abort.exp b/third_party/move/move-compiler-v2/tests/abort-analysis/drop_on_abort.exp
index 8e2e3897b78ed..b663c8d7c1b6c 100644
--- a/third_party/move/move-compiler-v2/tests/abort-analysis/drop_on_abort.exp
+++ b/third_party/move/move-compiler-v2/tests/abort-analysis/drop_on_abort.exp
@@ -42,7 +42,7 @@ public fun m::from_vec<#0>($t0: vector<#0>): m::Option<#0> {
   0: $t4 := borrow_local($t0)
      # abort state: {returns,aborts}
      # live vars: $t0, $t4
-     # graph: {@0=local($t0)[borrow(false) -> @1],@1=derived[]}
+     # graph: {@0=local($t0)[borrow_imm -> @1],@1=derived[]}
      # locals: {$t0=@0,$t4=@1}
      # globals: {}
      #
diff --git a/third_party/move/move-compiler-v2/tests/bytecode-generator/assign.exp b/third_party/move/move-compiler-v2/tests/bytecode-generator/assign.exp
index 9adcabd110f95..61a31095ee499 100644
--- a/third_party/move/move-compiler-v2/tests/bytecode-generator/assign.exp
+++ b/third_party/move/move-compiler-v2/tests/bytecode-generator/assign.exp
@@ -16,7 +16,7 @@ module 0x42::assign {
         Tuple()
     }
     private fun assign_pattern(s: assign::S,f: u64,h: u64): u64 {
-        assign::S{ f: f: u64, g: assign::T{ h: h: u64 } }: assign::S = s;
+        assign::S{ f, g: assign::T{ h } } = s;
         Add<u64>(f, h)
     }
     private fun assign_struct(s: &mut assign::S) {
diff --git a/third_party/move/move-compiler-v2/tests/bytecode-generator/borrow_deref_optimize.exp b/third_party/move/move-compiler-v2/tests/bytecode-generator/borrow_deref_optimize.exp
new file mode 100644
index 0000000000000..a80f9f4e4a890
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/bytecode-generator/borrow_deref_optimize.exp
@@ -0,0 +1,117 @@
+// -- Model dump before bytecode pipeline
+module 0x42::test {
+    struct X {
+        value: bool,
+    }
+    private fun no_optimize_resource(): bool
+        acquires test::X(*)
+     {
+        {
+          let x: &mut test::X = Borrow(Mutable)(Deref(BorrowGlobal(Immutable)<test::X>(0x1)));
+          select test::X.value<&mut test::X>(x)
+        }
+    }
+    private fun no_optimize_vector() {
+        {
+          let _: &mut u64 = vector::borrow_mut<u64>(Borrow(Mutable)(Deref(vector::borrow<vector<u64>>(Borrow(Immutable)([Vector([Number(1), Number(2)])]), 0))), 1);
+          Tuple()
+        }
+    }
+    private fun optimize_resource(): bool
+        acquires test::X(*)
+     {
+        {
+          let x: &test::X = Borrow(Immutable)(Deref(BorrowGlobal(Immutable)<test::X>(0x1)));
+          select test::X.value<&test::X>(x)
+        }
+    }
+    private fun optimize_vector() {
+        {
+          let x: vector<vector<u64>> = [Vector([Number(1), Number(2)])];
+          {
+            let _: &mut u64 = vector::borrow_mut<u64>(Borrow(Mutable)(Deref(vector::borrow_mut<vector<u64>>(Borrow(Mutable)(x), 0))), 1);
+            Tuple()
+          }
+        }
+    }
+} // end 0x42::test
+
+============ initial bytecode ================
+
+[variant baseline]
+fun test::no_optimize_resource(): bool {
+     var $t0: bool
+     var $t1: &mut test::X
+     var $t2: test::X
+     var $t3: &test::X
+     var $t4: address
+     var $t5: &bool
+  0: $t4 := 0x1
+  1: $t3 := borrow_global<test::X>($t4)
+  2: $t2 := read_ref($t3)
+  3: $t1 := borrow_local($t2)
+  4: $t5 := borrow_field<test::X>.value($t1)
+  5: $t0 := read_ref($t5)
+  6: return $t0
+}
+
+
+[variant baseline]
+fun test::no_optimize_vector() {
+     var $t0: &mut u64
+     var $t1: &mut vector<u64>
+     var $t2: vector<u64>
+     var $t3: &vector<u64>
+     var $t4: &vector<vector<u64>>
+     var $t5: vector<vector<u64>>
+     var $t6: u64
+     var $t7: u64
+     var $t8: &mut u64
+  0: $t5 := ["[\"1\", \"2\"]"]
+  1: $t4 := borrow_local($t5)
+  2: $t6 := 0
+  3: $t3 := vector::borrow<vector<u64>>($t4, $t6)
+  4: $t2 := read_ref($t3)
+  5: $t1 := borrow_local($t2)
+  6: $t7 := 1
+  7: $t0 := vector::borrow_mut<u64>($t1, $t7)
+  8: $t8 := infer($t0)
+  9: return ()
+}
+
+
+[variant baseline]
+fun test::optimize_resource(): bool {
+     var $t0: bool
+     var $t1: &test::X
+     var $t2: address
+     var $t3: &bool
+  0: $t2 := 0x1
+  1: $t1 := borrow_global<test::X>($t2)
+  2: $t3 := borrow_field<test::X>.value($t1)
+  3: $t0 := read_ref($t3)
+  4: return $t0
+}
+
+
+[variant baseline]
+fun test::optimize_vector() {
+     var $t0: vector<vector<u64>>
+     var $t1: &mut u64
+     var $t2: &mut vector<u64>
+     var $t3: &mut vector<vector<u64>>
+     var $t4: u64
+     var $t5: u64
+     var $t6: &mut u64
+  0: $t0 := ["[\"1\", \"2\"]"]
+  1: $t3 := borrow_local($t0)
+  2: $t4 := 0
+  3: $t2 := vector::borrow_mut<vector<u64>>($t3, $t4)
+  4: $t5 := 1
+  5: $t1 := vector::borrow_mut<u64>($t2, $t5)
+  6: $t6 := infer($t1)
+  7: return ()
+}
+
+
+============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/bytecode-generator/borrow_deref_optimize.move b/third_party/move/move-compiler-v2/tests/bytecode-generator/borrow_deref_optimize.move
new file mode 100644
index 0000000000000..6a84b1ef36246
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/bytecode-generator/borrow_deref_optimize.move
@@ -0,0 +1,29 @@
+module 0x42::test {
+
+    fun no_optimize_vector() {
+        use std::vector;
+        let x = vector[vector[1, 2]];
+        let _ = vector::borrow_mut(&mut (*vector::borrow(&x, 0)), 1);
+    }
+
+    fun optimize_vector() {
+        use std::vector;
+        let x = vector[vector[1, 2]];
+        let _ = vector::borrow_mut(&mut (*vector::borrow_mut(&mut x, 0)), 1);
+    }
+
+    struct X has key, drop, copy {
+        value: bool
+    }
+
+    fun no_optimize_resource(): bool acquires X {
+        let x = &mut (*borrow_global<X>(@0x1));
+        x.value
+    }
+
+    fun optimize_resource(): bool acquires X {
+        let x = &(*borrow_global<X>(@0x1));
+        x.value
+    }
+
+}
diff --git a/third_party/move/move-compiler-v2/tests/bytecode-generator/freeze_mut_ref.exp b/third_party/move/move-compiler-v2/tests/bytecode-generator/freeze_mut_ref.exp
index ab3905586b4a9..faedb01487623 100644
--- a/third_party/move/move-compiler-v2/tests/bytecode-generator/freeze_mut_ref.exp
+++ b/third_party/move/move-compiler-v2/tests/bytecode-generator/freeze_mut_ref.exp
@@ -294,6 +294,44 @@ fun freeze_mut_ref::t8($t0: bool, $t1: &mut freeze_mut_ref::S, $t2: &freeze_mut_
 }
 
 
+Diagnostics:
+warning: Unused assignment to `x`. Consider removing or prefixing with an underscore: `_x`
+   ┌─ tests/bytecode-generator/freeze_mut_ref.move:58:9
+   │
+58 │         (x, y) = (&mut 0, &mut 0);
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^
+
+warning: Unused assignment to `y`. Consider removing or prefixing with an underscore: `_y`
+   ┌─ tests/bytecode-generator/freeze_mut_ref.move:58:9
+   │
+58 │         (x, y) = (&mut 0, &mut 0);
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^
+
+warning: Unused assignment to `x`. Consider removing or prefixing with an underscore: `_x`
+   ┌─ tests/bytecode-generator/freeze_mut_ref.move:66:24
+   │
+66 │         let g = &mut ({x = x + 1; s}).f;
+   │                        ^^^^^^^^^
+
+warning: Unused assignment to `z`. Consider removing or prefixing with an underscore: `_z`
+   ┌─ tests/bytecode-generator/freeze_mut_ref.move:69:20
+   │
+69 │         *({*f = 0; z = y; g}) = 2;
+   │                    ^^^^^
+
+warning: Unused assignment to `x`. Consider removing or prefixing with an underscore: `_x`
+   ┌─ tests/bytecode-generator/freeze_mut_ref.move:74:19
+   │
+74 │         if (cond) x = copy s else x = other;
+   │                   ^^^^^^^^^^
+
+warning: Unused assignment to `x`. Consider removing or prefixing with an underscore: `_x`
+   ┌─ tests/bytecode-generator/freeze_mut_ref.move:74:35
+   │
+74 │         if (cond) x = copy s else x = other;
+   │                                   ^^^^^^^^^
+
+
 Diagnostics:
 error: mutable reference in local `s` requires exclusive access but is borrowed
    ┌─ tests/bytecode-generator/freeze_mut_ref.move:66:35
diff --git a/third_party/move/move-compiler-v2/tests/bytecode-generator/matching_ability_err.exp b/third_party/move/move-compiler-v2/tests/bytecode-generator/matching_ability_err.exp
new file mode 100644
index 0000000000000..9fb6f4c14fe92
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/bytecode-generator/matching_ability_err.exp
@@ -0,0 +1,168 @@
+// -- Model dump before bytecode pipeline
+module 0xc0ffee::m {
+    struct Box {
+        x: u64,
+    }
+    enum Inner {
+        Inner1 {
+            x: u64,
+        }
+        Inner2 {
+            x: u64,
+            y: u64,
+        }
+    }
+    enum Outer {
+        None,
+        One {
+            i: m::Inner,
+        }
+        Two {
+            i: m::Inner,
+            b: m::Box,
+        }
+    }
+    public fun condition_requires_copy(o: m::Outer): m::Outer {
+        match (o) {
+          m::Outer::One{ i } if m::consume(i) => {
+            pack m::Outer::One(i)
+          }
+          o: m::Outer => {
+            o
+          }
+        }
+
+    }
+    private fun consume(self: m::Inner): bool {
+        match (self) {
+          m::Inner::Inner1{ x: _ } => {
+            Tuple()
+          }
+          m::Inner::Inner2{ x: _, y: _ } => {
+            Tuple()
+          }
+        }
+        ;
+        true
+    }
+    public fun matched_value_not_consumed(o: m::Outer) {
+        match (o) {
+          m::Outer::One{ i: _ } => {
+            Tuple()
+          }
+          _: m::Outer => {
+            Tuple()
+          }
+        }
+
+    }
+} // end 0xc0ffee::m
+
+============ initial bytecode ================
+
+[variant baseline]
+public fun m::condition_requires_copy($t0: m::Outer): m::Outer {
+     var $t1: m::Outer
+     var $t2: &m::Outer
+     var $t3: bool
+     var $t4: &m::Inner
+     var $t5: m::Inner
+     var $t6: m::Inner
+     var $t7: m::Outer
+     var $t8: u64
+  0: $t2 := borrow_local($t0)
+  1: $t3 := test_variant m::Outer::One($t2)
+  2: if ($t3) goto 3 else goto 12
+  3: label L2
+  4: $t4 := borrow_variant_field<m::Outer::One>.i($t2)
+  5: $t5 := read_ref($t4)
+  6: $t3 := m::consume($t5)
+  7: if ($t3) goto 8 else goto 12
+  8: label L3
+  9: $t6 := unpack_variant m::Outer::One($t0)
+ 10: $t1 := pack_variant m::Outer::One($t6)
+ 11: goto 19
+ 12: label L1
+ 13: $t7 := infer($t0)
+ 14: $t1 := infer($t7)
+ 15: goto 19
+ 16: label L4
+ 17: $t8 := 15621340914461310977
+ 18: abort($t8)
+ 19: label L0
+ 20: return $t1
+}
+
+
+[variant baseline]
+fun m::consume($t0: m::Inner): bool {
+     var $t1: bool
+     var $t2: &m::Inner
+     var $t3: bool
+     var $t4: u64
+     var $t5: u64
+     var $t6: u64
+     var $t7: u64
+  0: $t2 := borrow_local($t0)
+  1: $t3 := test_variant m::Inner::Inner1($t2)
+  2: if ($t3) goto 3 else goto 6
+  3: label L2
+  4: $t4 := unpack_variant m::Inner::Inner1($t0)
+  5: goto 15
+  6: label L1
+  7: $t3 := test_variant m::Inner::Inner2($t2)
+  8: if ($t3) goto 9 else goto 12
+  9: label L4
+ 10: ($t5, $t6) := unpack_variant m::Inner::Inner2($t0)
+ 11: goto 15
+ 12: label L3
+ 13: $t7 := 15621340914461310977
+ 14: abort($t7)
+ 15: label L0
+ 16: $t1 := true
+ 17: return $t1
+}
+
+
+[variant baseline]
+public fun m::matched_value_not_consumed($t0: m::Outer) {
+     var $t1: &m::Outer
+     var $t2: bool
+     var $t3: m::Inner
+     var $t4: m::Outer
+     var $t5: u64
+  0: $t1 := borrow_local($t0)
+  1: $t2 := test_variant m::Outer::One($t1)
+  2: if ($t2) goto 3 else goto 6
+  3: label L2
+  4: $t3 := unpack_variant m::Outer::One($t0)
+  5: goto 12
+  6: label L1
+  7: $t4 := infer($t0)
+  8: goto 12
+  9: label L3
+ 10: $t5 := 15621340914461310977
+ 11: abort($t5)
+ 12: label L0
+ 13: return ()
+}
+
+
+Diagnostics:
+error: value of type `m::Inner` does not have the `drop` ability
+   ┌─ tests/bytecode-generator/matching_ability_err.move:28:13
+   │
+28 │             One{i: _} => {}
+   │             ^^^^^^^^^ implicitly dropped here since it is no longer used
+
+error: value of type `m::Outer` does not have the `drop` ability
+   ┌─ tests/bytecode-generator/matching_ability_err.move:29:13
+   │
+29 │             _ => {}
+   │             ^ implicitly dropped here since it is no longer used
+
+error: local `i` of type `m::Inner` does not have the `copy` ability
+   ┌─ tests/bytecode-generator/matching_ability_err.move:35:31
+   │
+35 │             One{i} if consume(i) => Outer::One{i},
+   │                               ^ reference content copied here
diff --git a/third_party/move/move-compiler-v2/tests/bytecode-generator/matching_ability_err.move b/third_party/move/move-compiler-v2/tests/bytecode-generator/matching_ability_err.move
new file mode 100644
index 0000000000000..efc7337feff74
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/bytecode-generator/matching_ability_err.move
@@ -0,0 +1,39 @@
+module 0xc0ffee::m {
+
+    enum Inner {
+        Inner1{ x: u64 }
+        Inner2{ x: u64, y: u64 }
+    }
+
+    fun consume(self: Inner): bool {
+        match (self) {
+            Inner1{x: _} => {}
+            Inner2{x: _, y:_ } => {}
+        };
+        true
+    }
+
+    struct Box has drop {
+        x: u64
+    }
+
+    enum Outer {
+        None,
+        One{i: Inner},
+        Two{i: Inner, b: Box},
+    }
+
+    public fun matched_value_not_consumed(o: Outer) {
+        match (o) {
+            One{i: _} => {}
+            _ => {}
+        }
+    }
+
+    public fun condition_requires_copy(o: Outer): Outer {
+        match (o) {
+            One{i} if consume(i) => Outer::One{i},
+            o => o
+        }
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/bytecode-generator/matching_coverage_err.exp b/third_party/move/move-compiler-v2/tests/bytecode-generator/matching_coverage_err.exp
new file mode 100644
index 0000000000000..bd94845343123
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/bytecode-generator/matching_coverage_err.exp
@@ -0,0 +1,226 @@
+// -- Model dump before bytecode pipeline
+module 0xc0ffee::m {
+    struct Box {
+        x: u64,
+    }
+    enum Inner {
+        Inner1 {
+            x: u64,
+        }
+        Inner2 {
+            x: u64,
+            y: u64,
+        }
+    }
+    enum Outer {
+        None,
+        One {
+            i: m::Inner,
+        }
+        Two {
+            i: m::Inner,
+            b: m::Box,
+        }
+    }
+    public fun exhaustive_tuple(i: &m::Inner) {
+        match (Tuple(i, i)) {
+          (m::Inner::Inner1{ x: _ }, _: &m::Inner): (&m::Inner, &m::Inner) => {
+            Tuple()
+          }
+          (m::Inner::Inner2{ x: _, y: _ }, _: &m::Inner): (&m::Inner, &m::Inner) => {
+            Tuple()
+          }
+        }
+
+    }
+    public fun exhaustive_via_merge(o: &m::Outer) {
+        match (o) {
+          m::Outer::None => {
+            Tuple()
+          }
+          m::Outer::One{ i: m::Inner::Inner1{ x: _ } } => {
+            Tuple()
+          }
+          m::Outer::One{ i: m::Inner::Inner2{ x: _, y: _ } } => {
+            Tuple()
+          }
+          m::Outer::Two{ i: _, b: _ } => {
+            Tuple()
+          }
+        }
+
+    }
+    public fun non_exhaustive(o: &m::Outer) {
+        match (o) {
+          m::Outer::None => {
+            Tuple()
+          }
+          m::Outer::One{ i: _ } => {
+            Tuple()
+          }
+        }
+
+    }
+    public fun non_exhaustive_because_of_cond(o: &m::Outer) {
+        match (o) {
+          m::Outer::None => {
+            Tuple()
+          }
+          m::Outer::One{ i: _ } => {
+            Tuple()
+          }
+          m::Outer::Two{ i: _, b } if Gt<u64>(select m::Box.x<&m::Box>(b), 0) => {
+            Tuple()
+          }
+        }
+
+    }
+    public fun non_exhaustive_because_of_nested(o: &m::Outer) {
+        match (o) {
+          m::Outer::None => {
+            Tuple()
+          }
+          m::Outer::One{ i: m::Inner::Inner1{ x: _ } } => {
+            Tuple()
+          }
+          m::Outer::Two{ i: _, b: _ } => {
+            Tuple()
+          }
+        }
+
+    }
+    public fun non_exhaustive_tuple(i: &m::Inner) {
+        match (Tuple(i, i)) {
+          (m::Inner::Inner1{ x: _ }, _: &m::Inner): (&m::Inner, &m::Inner) => {
+            Tuple()
+          }
+        }
+
+    }
+    public fun non_exhaustive_tuple2(i: &m::Inner) {
+        match (Tuple(i, i)) {
+          (m::Inner::Inner1{ x: _ }, _: &m::Inner): (&m::Inner, &m::Inner) => {
+            Tuple()
+          }
+          (_: &m::Inner, m::Inner::Inner2{ x: _, y: _ }): (&m::Inner, &m::Inner) => {
+            Tuple()
+          }
+        }
+
+    }
+    public fun unreachable(o: &m::Outer) {
+        match (o) {
+          m::Outer::None => {
+            Tuple()
+          }
+          m::Outer::One{ i: _ } => {
+            Tuple()
+          }
+          m::Outer::Two{ i: _, b: _ } => {
+            Tuple()
+          }
+          _: &m::Outer => {
+            Tuple()
+          }
+        }
+
+    }
+    public fun unreachable_via_overlaying_pattern(o: &m::Outer) {
+        match (o) {
+          m::Outer::None => {
+            Tuple()
+          }
+          m::Outer::One{ i: m::Inner::Inner1{ x: _ } } => {
+            Tuple()
+          }
+          m::Outer::One{ i: _ } => {
+            Tuple()
+          }
+          m::Outer::One{ i: m::Inner::Inner1{ x: _ } } => {
+            Tuple()
+          }
+          _: &m::Outer => {
+            Tuple()
+          }
+        }
+
+    }
+    public fun unreachable_via_repeated_pattern(o: &m::Outer) {
+        match (o) {
+          m::Outer::None => {
+            Tuple()
+          }
+          m::Outer::One{ i: _ } => {
+            Tuple()
+          }
+          m::Outer::One{ i: _ } => {
+            Tuple()
+          }
+          _: &m::Outer => {
+            Tuple()
+          }
+        }
+
+    }
+} // end 0xc0ffee::m
+
+
+Diagnostics:
+error: match not exhaustive
+   ┌─ tests/bytecode-generator/matching_coverage_err.move:21:16
+   │
+21 │         match (o) {
+   │                ^
+   │
+   = missing `Outer::Two{..}`
+
+error: match not exhaustive
+   ┌─ tests/bytecode-generator/matching_coverage_err.move:28:16
+   │
+28 │         match (o) {
+   │                ^
+   │
+   = missing `Outer::Two{..}`
+
+error: match not exhaustive
+   ┌─ tests/bytecode-generator/matching_coverage_err.move:36:16
+   │
+36 │         match (o) {
+   │                ^
+   │
+   = missing `Outer::One{i: Inner::Inner2{..}}`
+
+error: match not exhaustive
+   ┌─ tests/bytecode-generator/matching_coverage_err.move:52:16
+   │
+52 │         match ((i, i)) {
+   │                ^^^^^^
+   │
+   = missing `(Inner::Inner2{..},_)`
+
+error: match not exhaustive
+   ┌─ tests/bytecode-generator/matching_coverage_err.move:65:16
+   │
+65 │         match ((i, i)) {
+   │                ^^^^^^
+   │
+   = missing `(_,Inner::Inner1{..})`
+   = missing `(Inner::Inner2{..},_)`
+
+error: unreachable pattern
+   ┌─ tests/bytecode-generator/matching_coverage_err.move:78:14
+   │
+78 │              _ => {}
+   │              ^
+
+error: unreachable pattern
+   ┌─ tests/bytecode-generator/matching_coverage_err.move:86:14
+   │
+86 │              One{i: _} => {}
+   │              ^^^^^^^^^
+
+error: unreachable pattern
+   ┌─ tests/bytecode-generator/matching_coverage_err.move:96:14
+   │
+96 │              One{i: Inner1{x:_}} => {}
+   │              ^^^^^^^^^^^^^^^^^^^
diff --git a/third_party/move/move-compiler-v2/tests/bytecode-generator/matching_coverage_err.move b/third_party/move/move-compiler-v2/tests/bytecode-generator/matching_coverage_err.move
new file mode 100644
index 0000000000000..c20c1083d8f9f
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/bytecode-generator/matching_coverage_err.move
@@ -0,0 +1,100 @@
+module 0xc0ffee::m {
+
+    enum Inner {
+        Inner1{ x: u64 }
+        Inner2{ x: u64, y: u64 }
+    }
+
+    struct Box has drop {
+        x: u64
+    }
+
+    enum Outer {
+        None,
+        One{i: Inner},
+        Two{i: Inner, b: Box},
+    }
+
+    // Exhaustiveness
+
+    public fun non_exhaustive(o: &Outer) {
+        match (o) {
+            None => {}
+            One{i: _} => {}
+        }
+    }
+
+    public fun non_exhaustive_because_of_cond(o: &Outer) {
+        match (o) {
+            None => {}
+            One{i: _} => {}
+            Two{i: _, b} if b.x > 0 => {}
+        }
+    }
+
+    public fun non_exhaustive_because_of_nested(o: &Outer) {
+        match (o) {
+            None => {}
+            One{i: Inner1{x: _}} => {}
+            Two{i: _, b: _} => {}
+        }
+    }
+
+    public fun exhaustive_via_merge(o: &Outer) {
+        match (o) {
+            None => {}
+            One{i: Inner1{x: _}} => {}
+            One{i: Inner2{x: _, y: _}} => {}
+            Two{i: _, b: _} => {}
+        }
+    }
+    public fun non_exhaustive_tuple(i: &Inner) {
+        match ((i, i)) {
+            (Inner1{x: _}, _) => {}
+        }
+    }
+
+    public fun exhaustive_tuple(i: &Inner) {
+        match ((i, i)) {
+            (Inner1{x: _}, _) => {}
+            (Inner2{x: _, y: _}, _) => {}
+        }
+    }
+
+    public fun non_exhaustive_tuple2(i: &Inner) {
+        match ((i, i)) {
+            (Inner1{x: _}, _) => {}
+            (_, Inner2{x: _, y: _}) => {}
+        }
+    }
+
+    // Reachability
+
+    public fun unreachable(o: &Outer) {
+         match (o) {
+             None => {}
+             One{i: _} => {}
+             Two{i: _, b: _} => {}
+             _ => {}
+         }
+    }
+
+    public fun unreachable_via_repeated_pattern(o: &Outer) {
+         match (o) {
+             None => {}
+             One{i: _} => {}
+             One{i: _} => {}
+             _ => {}
+         }
+    }
+
+    public fun unreachable_via_overlaying_pattern(o: &Outer) {
+         match (o) {
+             None => {}
+             One{i: Inner1{x:_}} => {}
+             One{i: _} => {}
+             One{i: Inner1{x:_}} => {}
+             _ => {}
+         }
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/bytecode-generator/matching_ok.exp b/third_party/move/move-compiler-v2/tests/bytecode-generator/matching_ok.exp
new file mode 100644
index 0000000000000..559a893eacf01
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/bytecode-generator/matching_ok.exp
@@ -0,0 +1,666 @@
+// -- Model dump before bytecode pipeline
+module 0xc0ffee::m {
+    struct Box {
+        x: u64,
+    }
+    enum CommonFields {
+        Foo {
+            x: u64,
+            y: u64,
+        }
+        Bar {
+            x: u64,
+            z: u64,
+        }
+    }
+    enum CommonFieldsAtDifferentOffset {
+        Foo {
+            x: u64,
+            y: u64,
+        }
+        Bar {
+            x: u64,
+            z: u64,
+        }
+        Baz {
+            z: u64,
+        }
+        Balt {
+            foo: u8,
+            z: u64,
+        }
+    }
+    enum Inner {
+        Inner1 {
+            x: u64,
+        }
+        Inner2 {
+            x: u64,
+            y: u64,
+        }
+    }
+    enum Option {
+        None,
+        Some {
+            value: #0,
+        }
+    }
+    enum Outer {
+        None,
+        One {
+            i: m::Inner,
+        }
+        Two {
+            i: m::Inner,
+            b: m::Box,
+        }
+    }
+    public fun inner_value(self: m::Inner): u64 {
+        match (self) {
+          m::Inner::Inner1{ x } => {
+            x
+          }
+          m::Inner::Inner2{ x, y } => {
+            Add<u64>(x, y)
+          }
+        }
+
+    }
+    public fun is_inner1(self: &m::Inner): bool {
+        match (self) {
+          m::Inner::Inner1{ x: _ } => {
+            true
+          }
+          _: &m::Inner => {
+            false
+          }
+        }
+
+    }
+    public fun is_some<A>(x: &m::Option<#0>): bool {
+        match (x) {
+          m::Option::None<A> => {
+            false
+          }
+          m::Option::Some<A>{ value: _ } => {
+            true
+          }
+        }
+
+    }
+    public fun is_some_dropped<A>(x: m::Option<#0>): bool {
+        match (x) {
+          m::Option::None<A> => {
+            false
+          }
+          _: m::Option<A> => {
+            true
+          }
+        }
+
+    }
+    public fun is_some_specialized(x: &m::Option<m::Option<u64>>): bool {
+        match (x) {
+          m::Option::None<m::Option<u64>> => {
+            false
+          }
+          m::Option::Some<m::Option<u64>>{ value: m::Option::None<u64> } => {
+            false
+          }
+          m::Option::Some<m::Option<u64>>{ value: m::Option::Some<u64>{ value: _ } } => {
+            true
+          }
+        }
+
+    }
+    public fun outer_value(o: m::Outer): u64 {
+        match (o) {
+          m::Outer::None => {
+            0
+          }
+          m::Outer::One{ i } => {
+            m::inner_value(i)
+          }
+          m::Outer::Two{ i, b } => {
+            Add<u64>(m::inner_value(i), select m::Box.x<m::Box>(b))
+          }
+        }
+
+    }
+    public fun outer_value_nested(o: m::Outer): u64 {
+        match (o) {
+          m::Outer::None => {
+            0
+          }
+          m::Outer::One{ i: m::Inner::Inner1{ x } } => {
+            x
+          }
+          m::Outer::One{ i } => {
+            m::inner_value(i)
+          }
+          m::Outer::Two{ i, b } => {
+            Add<u64>(m::inner_value(i), select m::Box.x<m::Box>(b))
+          }
+        }
+
+    }
+    public fun outer_value_with_cond(o: m::Outer): u64 {
+        match (o) {
+          m::Outer::None => {
+            0
+          }
+          m::Outer::One{ i } if m::is_inner1(Borrow(Immutable)(i)) => {
+            Mod<u64>(m::inner_value(i), 2)
+          }
+          m::Outer::One{ i } => {
+            m::inner_value(i)
+          }
+          m::Outer::Two{ i, b } => {
+            Add<u64>(m::inner_value(i), select m::Box.x<m::Box>(b))
+          }
+        }
+
+    }
+    public fun outer_value_with_cond_ref(o: &m::Outer): bool {
+        match (o) {
+          m::Outer::None => {
+            false
+          }
+          m::Outer::One{ i } if m::is_inner1(i) => {
+            true
+          }
+          m::Outer::One{ i } => {
+            m::is_inner1(i)
+          }
+          m::Outer::Two{ i, b: _ } => {
+            m::is_inner1(i)
+          }
+        }
+
+    }
+    private fun select_common_fields(s: m::CommonFields): u64 {
+        Add<u64>(select_variants m::CommonFields.Foo.x|m::CommonFields.Bar.x<m::CommonFields>(s), match (s) {
+          m::CommonFields::Foo{ x: _, y } => {
+            y
+          }
+          m::CommonFields::Bar{ x: _, z } => {
+            z
+          }
+        }
+        )
+    }
+    private fun select_common_fields_different_offset(s: m::CommonFieldsAtDifferentOffset): u64 {
+        select_variants m::CommonFieldsAtDifferentOffset.Bar.z|m::CommonFieldsAtDifferentOffset.Baz.z|m::CommonFieldsAtDifferentOffset.Balt.z<m::CommonFieldsAtDifferentOffset>(s)
+    }
+    private fun test_common(s: m::CommonFields): bool {
+        test_variants m::CommonFields::Foo|Bar(s)
+    }
+    private fun test_common_ref(s: &m::CommonFields): bool {
+        test_variants m::CommonFields::Foo|Bar(s)
+    }
+} // end 0xc0ffee::m
+
+============ initial bytecode ================
+
+[variant baseline]
+public fun m::inner_value($t0: m::Inner): u64 {
+     var $t1: u64
+     var $t2: &m::Inner
+     var $t3: bool
+     var $t4: u64
+     var $t5: u64
+     var $t6: u64
+     var $t7: u64
+  0: $t2 := borrow_local($t0)
+  1: $t3 := test_variant m::Inner::Inner1($t2)
+  2: if ($t3) goto 3 else goto 7
+  3: label L2
+  4: $t4 := unpack_variant m::Inner::Inner1($t0)
+  5: $t1 := infer($t4)
+  6: goto 17
+  7: label L1
+  8: $t3 := test_variant m::Inner::Inner2($t2)
+  9: if ($t3) goto 10 else goto 14
+ 10: label L4
+ 11: ($t5, $t6) := unpack_variant m::Inner::Inner2($t0)
+ 12: $t1 := +($t5, $t6)
+ 13: goto 17
+ 14: label L3
+ 15: $t7 := 15621340914461310977
+ 16: abort($t7)
+ 17: label L0
+ 18: return $t1
+}
+
+
+[variant baseline]
+public fun m::is_inner1($t0: &m::Inner): bool {
+     var $t1: bool
+     var $t2: bool
+     var $t3: &m::Inner
+     var $t4: u64
+  0: $t2 := test_variant m::Inner::Inner1($t0)
+  1: if ($t2) goto 2 else goto 5
+  2: label L2
+  3: $t1 := true
+  4: goto 12
+  5: label L1
+  6: $t3 := infer($t0)
+  7: $t1 := false
+  8: goto 12
+  9: label L3
+ 10: $t4 := 15621340914461310977
+ 11: abort($t4)
+ 12: label L0
+ 13: return $t1
+}
+
+
+[variant baseline]
+public fun m::is_some<#0>($t0: &m::Option<#0>): bool {
+     var $t1: bool
+     var $t2: bool
+     var $t3: u64
+  0: $t2 := test_variant m::Option<#0>::None($t0)
+  1: if ($t2) goto 2 else goto 5
+  2: label L2
+  3: $t1 := false
+  4: goto 14
+  5: label L1
+  6: $t2 := test_variant m::Option<#0>::Some($t0)
+  7: if ($t2) goto 8 else goto 11
+  8: label L4
+  9: $t1 := true
+ 10: goto 14
+ 11: label L3
+ 12: $t3 := 15621340914461310977
+ 13: abort($t3)
+ 14: label L0
+ 15: return $t1
+}
+
+
+[variant baseline]
+public fun m::is_some_dropped<#0>($t0: m::Option<#0>): bool {
+     var $t1: bool
+     var $t2: &m::Option<#0>
+     var $t3: bool
+     var $t4: m::Option<#0>
+     var $t5: u64
+  0: $t2 := borrow_local($t0)
+  1: $t3 := test_variant m::Option<#0>::None($t2)
+  2: if ($t3) goto 3 else goto 7
+  3: label L2
+  4: unpack_variant m::Option<#0>::None($t0)
+  5: $t1 := false
+  6: goto 14
+  7: label L1
+  8: $t4 := infer($t0)
+  9: $t1 := true
+ 10: goto 14
+ 11: label L3
+ 12: $t5 := 15621340914461310977
+ 13: abort($t5)
+ 14: label L0
+ 15: return $t1
+}
+
+
+[variant baseline]
+public fun m::is_some_specialized($t0: &m::Option<m::Option<u64>>): bool {
+     var $t1: bool
+     var $t2: bool
+     var $t3: &m::Option<u64>
+     var $t4: &m::Option<u64>
+     var $t5: u64
+  0: $t2 := test_variant m::Option<m::Option<u64>>::None($t0)
+  1: if ($t2) goto 2 else goto 5
+  2: label L2
+  3: $t1 := false
+  4: goto 28
+  5: label L1
+  6: $t2 := test_variant m::Option<m::Option<u64>>::Some($t0)
+  7: if ($t2) goto 8 else goto 15
+  8: label L4
+  9: $t3 := borrow_variant_field<m::Option<m::Option<u64>>::Some>.value($t0)
+ 10: $t2 := test_variant m::Option<u64>::None($t3)
+ 11: if ($t2) goto 12 else goto 15
+ 12: label L5
+ 13: $t1 := false
+ 14: goto 28
+ 15: label L3
+ 16: $t2 := test_variant m::Option<m::Option<u64>>::Some($t0)
+ 17: if ($t2) goto 18 else goto 25
+ 18: label L7
+ 19: $t4 := borrow_variant_field<m::Option<m::Option<u64>>::Some>.value($t0)
+ 20: $t2 := test_variant m::Option<u64>::Some($t4)
+ 21: if ($t2) goto 22 else goto 25
+ 22: label L8
+ 23: $t1 := true
+ 24: goto 28
+ 25: label L6
+ 26: $t5 := 15621340914461310977
+ 27: abort($t5)
+ 28: label L0
+ 29: return $t1
+}
+
+
+[variant baseline]
+public fun m::outer_value($t0: m::Outer): u64 {
+     var $t1: u64
+     var $t2: &m::Outer
+     var $t3: bool
+     var $t4: m::Inner
+     var $t5: m::Inner
+     var $t6: m::Box
+     var $t7: u64
+     var $t8: u64
+     var $t9: &m::Box
+     var $t10: &u64
+     var $t11: u64
+  0: $t2 := borrow_local($t0)
+  1: $t3 := test_variant m::Outer::None($t2)
+  2: if ($t3) goto 3 else goto 7
+  3: label L2
+  4: unpack_variant m::Outer::None($t0)
+  5: $t1 := 0
+  6: goto 28
+  7: label L1
+  8: $t3 := test_variant m::Outer::One($t2)
+  9: if ($t3) goto 10 else goto 14
+ 10: label L4
+ 11: $t4 := unpack_variant m::Outer::One($t0)
+ 12: $t1 := m::inner_value($t4)
+ 13: goto 28
+ 14: label L3
+ 15: $t3 := test_variant m::Outer::Two($t2)
+ 16: if ($t3) goto 17 else goto 25
+ 17: label L6
+ 18: ($t5, $t6) := unpack_variant m::Outer::Two($t0)
+ 19: $t7 := m::inner_value($t5)
+ 20: $t9 := borrow_local($t6)
+ 21: $t10 := borrow_field<m::Box>.x($t9)
+ 22: $t8 := read_ref($t10)
+ 23: $t1 := +($t7, $t8)
+ 24: goto 28
+ 25: label L5
+ 26: $t11 := 15621340914461310977
+ 27: abort($t11)
+ 28: label L0
+ 29: return $t1
+}
+
+
+[variant baseline]
+public fun m::outer_value_nested($t0: m::Outer): u64 {
+     var $t1: u64
+     var $t2: &m::Outer
+     var $t3: bool
+     var $t4: &m::Inner
+     var $t5: u64
+     var $t6: m::Inner
+     var $t7: m::Inner
+     var $t8: m::Inner
+     var $t9: m::Box
+     var $t10: u64
+     var $t11: u64
+     var $t12: &m::Box
+     var $t13: &u64
+     var $t14: u64
+  0: $t2 := borrow_local($t0)
+  1: $t3 := test_variant m::Outer::None($t2)
+  2: if ($t3) goto 3 else goto 7
+  3: label L2
+  4: unpack_variant m::Outer::None($t0)
+  5: $t1 := 0
+  6: goto 40
+  7: label L1
+  8: $t3 := test_variant m::Outer::One($t2)
+  9: if ($t3) goto 10 else goto 19
+ 10: label L4
+ 11: $t4 := borrow_variant_field<m::Outer::One>.i($t2)
+ 12: $t3 := test_variant m::Inner::Inner1($t4)
+ 13: if ($t3) goto 14 else goto 19
+ 14: label L5
+ 15: $t6 := unpack_variant m::Outer::One($t0)
+ 16: $t5 := unpack_variant m::Inner::Inner1($t6)
+ 17: $t1 := infer($t5)
+ 18: goto 40
+ 19: label L3
+ 20: $t3 := test_variant m::Outer::One($t2)
+ 21: if ($t3) goto 22 else goto 26
+ 22: label L7
+ 23: $t7 := unpack_variant m::Outer::One($t0)
+ 24: $t1 := m::inner_value($t7)
+ 25: goto 40
+ 26: label L6
+ 27: $t3 := test_variant m::Outer::Two($t2)
+ 28: if ($t3) goto 29 else goto 37
+ 29: label L9
+ 30: ($t8, $t9) := unpack_variant m::Outer::Two($t0)
+ 31: $t10 := m::inner_value($t8)
+ 32: $t12 := borrow_local($t9)
+ 33: $t13 := borrow_field<m::Box>.x($t12)
+ 34: $t11 := read_ref($t13)
+ 35: $t1 := +($t10, $t11)
+ 36: goto 40
+ 37: label L8
+ 38: $t14 := 15621340914461310977
+ 39: abort($t14)
+ 40: label L0
+ 41: return $t1
+}
+
+
+[variant baseline]
+public fun m::outer_value_with_cond($t0: m::Outer): u64 {
+     var $t1: u64
+     var $t2: &m::Outer
+     var $t3: bool
+     var $t4: &m::Inner
+     var $t5: &m::Inner
+     var $t6: m::Inner
+     var $t7: u64
+     var $t8: u64
+     var $t9: m::Inner
+     var $t10: m::Inner
+     var $t11: m::Box
+     var $t12: u64
+     var $t13: u64
+     var $t14: &m::Box
+     var $t15: &u64
+     var $t16: u64
+  0: $t2 := borrow_local($t0)
+  1: $t3 := test_variant m::Outer::None($t2)
+  2: if ($t3) goto 3 else goto 7
+  3: label L2
+  4: unpack_variant m::Outer::None($t0)
+  5: $t1 := 0
+  6: goto 42
+  7: label L1
+  8: $t3 := test_variant m::Outer::One($t2)
+  9: if ($t3) goto 10 else goto 21
+ 10: label L4
+ 11: $t4 := borrow_variant_field<m::Outer::One>.i($t2)
+ 12: $t5 := infer($t4)
+ 13: $t3 := m::is_inner1($t5)
+ 14: if ($t3) goto 15 else goto 21
+ 15: label L5
+ 16: $t6 := unpack_variant m::Outer::One($t0)
+ 17: $t7 := m::inner_value($t6)
+ 18: $t8 := 2
+ 19: $t1 := %($t7, $t8)
+ 20: goto 42
+ 21: label L3
+ 22: $t3 := test_variant m::Outer::One($t2)
+ 23: if ($t3) goto 24 else goto 28
+ 24: label L7
+ 25: $t9 := unpack_variant m::Outer::One($t0)
+ 26: $t1 := m::inner_value($t9)
+ 27: goto 42
+ 28: label L6
+ 29: $t3 := test_variant m::Outer::Two($t2)
+ 30: if ($t3) goto 31 else goto 39
+ 31: label L9
+ 32: ($t10, $t11) := unpack_variant m::Outer::Two($t0)
+ 33: $t12 := m::inner_value($t10)
+ 34: $t14 := borrow_local($t11)
+ 35: $t15 := borrow_field<m::Box>.x($t14)
+ 36: $t13 := read_ref($t15)
+ 37: $t1 := +($t12, $t13)
+ 38: goto 42
+ 39: label L8
+ 40: $t16 := 15621340914461310977
+ 41: abort($t16)
+ 42: label L0
+ 43: return $t1
+}
+
+
+[variant baseline]
+public fun m::outer_value_with_cond_ref($t0: &m::Outer): bool {
+     var $t1: bool
+     var $t2: bool
+     var $t3: &m::Inner
+     var $t4: &m::Inner
+     var $t5: &m::Inner
+     var $t6: u64
+  0: $t2 := test_variant m::Outer::None($t0)
+  1: if ($t2) goto 2 else goto 5
+  2: label L2
+  3: $t1 := false
+  4: goto 32
+  5: label L1
+  6: $t2 := test_variant m::Outer::One($t0)
+  7: if ($t2) goto 8 else goto 15
+  8: label L4
+  9: $t3 := borrow_variant_field<m::Outer::One>.i($t0)
+ 10: $t2 := m::is_inner1($t3)
+ 11: if ($t2) goto 12 else goto 15
+ 12: label L5
+ 13: $t1 := true
+ 14: goto 32
+ 15: label L3
+ 16: $t2 := test_variant m::Outer::One($t0)
+ 17: if ($t2) goto 18 else goto 22
+ 18: label L7
+ 19: $t4 := borrow_variant_field<m::Outer::One>.i($t0)
+ 20: $t1 := m::is_inner1($t4)
+ 21: goto 32
+ 22: label L6
+ 23: $t2 := test_variant m::Outer::Two($t0)
+ 24: if ($t2) goto 25 else goto 29
+ 25: label L9
+ 26: $t5 := borrow_variant_field<m::Outer::Two>.i($t0)
+ 27: $t1 := m::is_inner1($t5)
+ 28: goto 32
+ 29: label L8
+ 30: $t6 := 15621340914461310977
+ 31: abort($t6)
+ 32: label L0
+ 33: return $t1
+}
+
+
+[variant baseline]
+fun m::select_common_fields($t0: m::CommonFields): u64 {
+     var $t1: u64
+     var $t2: u64
+     var $t3: &m::CommonFields
+     var $t4: &u64
+     var $t5: u64
+     var $t6: &m::CommonFields
+     var $t7: bool
+     var $t8: u64
+     var $t9: u64
+     var $t10: u64
+     var $t11: u64
+     var $t12: u64
+  0: $t3 := borrow_local($t0)
+  1: $t4 := borrow_variant_field<m::CommonFields::Foo|Bar>.x($t3)
+  2: $t2 := read_ref($t4)
+  3: $t6 := borrow_local($t0)
+  4: $t7 := test_variant m::CommonFields::Foo($t6)
+  5: if ($t7) goto 6 else goto 10
+  6: label L2
+  7: ($t9, $t8) := unpack_variant m::CommonFields::Foo($t0)
+  8: $t5 := infer($t8)
+  9: goto 20
+ 10: label L1
+ 11: $t7 := test_variant m::CommonFields::Bar($t6)
+ 12: if ($t7) goto 13 else goto 17
+ 13: label L4
+ 14: ($t11, $t10) := unpack_variant m::CommonFields::Bar($t0)
+ 15: $t5 := infer($t10)
+ 16: goto 20
+ 17: label L3
+ 18: $t12 := 15621340914461310977
+ 19: abort($t12)
+ 20: label L0
+ 21: $t1 := +($t2, $t5)
+ 22: return $t1
+}
+
+
+[variant baseline]
+fun m::select_common_fields_different_offset($t0: m::CommonFieldsAtDifferentOffset): u64 {
+     var $t1: u64
+     var $t2: &m::CommonFieldsAtDifferentOffset
+     var $t3: &u64
+     var $t4: bool
+  0: $t2 := borrow_local($t0)
+  1: $t4 := test_variant m::CommonFieldsAtDifferentOffset::Bar($t2)
+  2: if ($t4) goto 8 else goto 3
+  3: label L3
+  4: $t4 := test_variant m::CommonFieldsAtDifferentOffset::Balt($t2)
+  5: if ($t4) goto 8 else goto 6
+  6: label L4
+  7: goto 11
+  8: label L2
+  9: $t3 := borrow_variant_field<m::CommonFieldsAtDifferentOffset::Bar|Balt>.z($t2)
+ 10: goto 13
+ 11: label L1
+ 12: $t3 := borrow_variant_field<m::CommonFieldsAtDifferentOffset::Baz>.z($t2)
+ 13: label L0
+ 14: $t1 := read_ref($t3)
+ 15: return $t1
+}
+
+
+[variant baseline]
+fun m::test_common($t0: m::CommonFields): bool {
+     var $t1: bool
+     var $t2: &m::CommonFields
+  0: $t2 := borrow_local($t0)
+  1: $t1 := test_variant m::CommonFields::Foo($t2)
+  2: if ($t1) goto 7 else goto 3
+  3: label L1
+  4: $t1 := test_variant m::CommonFields::Bar($t2)
+  5: if ($t1) goto 7 else goto 6
+  6: label L2
+  7: label L0
+  8: return $t1
+}
+
+
+[variant baseline]
+fun m::test_common_ref($t0: &m::CommonFields): bool {
+     var $t1: bool
+  0: $t1 := test_variant m::CommonFields::Foo($t0)
+  1: if ($t1) goto 6 else goto 2
+  2: label L1
+  3: $t1 := test_variant m::CommonFields::Bar($t0)
+  4: if ($t1) goto 6 else goto 5
+  5: label L2
+  6: label L0
+  7: return $t1
+}
+
+
+Diagnostics:
+error: local `s` of type `m::CommonFields` does not have the `drop` ability
+    ┌─ tests/bytecode-generator/matching_ok.move:128:10
+    │
+128 │         (s is Foo|Bar)
+    │          ^ still borrowed but will be implicitly dropped later since it is no longer used
diff --git a/third_party/move/move-compiler-v2/tests/bytecode-generator/matching_ok.move b/third_party/move/move-compiler-v2/tests/bytecode-generator/matching_ok.move
new file mode 100644
index 0000000000000..1573e37f065d3
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/bytecode-generator/matching_ok.move
@@ -0,0 +1,134 @@
+module 0xc0ffee::m {
+
+    enum Inner {
+        Inner1{ x: u64 }
+        Inner2{ x: u64, y: u64 }
+    }
+
+    struct Box has drop {
+        x: u64
+    }
+
+    enum Outer {
+        None,
+        One{i: Inner},
+        Two{i: Inner, b: Box},
+    }
+
+    /// Simple matching
+    public fun inner_value(self: Inner): u64 {
+        match (self) {
+            Inner1{x} => x,
+            Inner2{x, y} => x + y
+        }
+    }
+
+    /// Matching with wildcard and reference
+    public fun is_inner1(self: &Inner): bool {
+        match (self) {
+            Inner1{x: _} => true,
+            _ => false
+        }
+    }
+
+    /// Matching which delegates ownership
+    public fun outer_value(o: Outer): u64 {
+        match (o) {
+            None => 0,
+            // `i` is moved and consumed by `inner_value`
+            One{i} => i.inner_value(),
+            Two{i, b} => i.inner_value() + b.x
+        }
+    }
+
+    /// Nested matching with delegation
+    public fun outer_value_nested(o: Outer): u64 {
+        match (o) {
+            None => 0,
+            // Nested match will require multiple probing steps
+            One{i: Inner::Inner1{x}} => x,
+            One{i} => i.inner_value(),
+            Two{i, b} => i.inner_value() + b.x
+        }
+    }
+
+    /// Matching with condition
+    public fun outer_value_with_cond(o: Outer): u64 {
+        match (o) {
+            None => 0,
+            // Match with condition requires probing and conversion from 'Deref(Borrow(x))` to `x`.
+            One{i} if i.is_inner1() => i.inner_value() % 2,
+            One{i} => i.inner_value(),
+            Two{i, b} => i.inner_value() + b.x
+        }
+    }
+
+    /// Matching with condition with references and wildcard
+    public fun outer_value_with_cond_ref(o: &Outer): bool {
+        match (o) {
+            None => false,
+            One{i} if i.is_inner1() => true,
+            One{i} => i.is_inner1(),
+            Two{i, b: _} => i.is_inner1()
+        }
+    }
+
+    /// Matching with abilities and generics
+    enum Option<A> has drop {
+        None,
+        Some{value: A}
+    }
+
+    public fun is_some<A>(x: &Option<A>): bool {
+        match (x) {
+            None => false,
+            Some{value: _} => true
+        }
+    }
+
+    public fun is_some_specialized(x: &Option<Option<u64>>): bool {
+        match (x) {
+            None => false,
+            Some{value: Option::None} => false,
+            Some{value: Option::Some{value: _}} => true,
+        }
+    }
+
+    public fun is_some_dropped<A:drop>(x: Option<A>): bool {
+        match (x) {
+            None => false,
+            _ => true
+        }
+    }
+
+    // Common fields
+    enum CommonFields {
+        Foo{x: u64, y: u64},
+        Bar{x: u64, z: u64}
+    }
+
+    fun select_common_fields(s: CommonFields): u64 {
+        s.x + (match (s) { Foo{x: _, y} => y, Bar{z, x: _} => z })
+    }
+
+    enum CommonFieldsAtDifferentOffset has drop {
+       Foo{x: u64, y: u64},
+       Bar{x: u64, z: u64},
+       Baz{z: u64} // `z` at different offset
+       Balt{foo: u8, z: u64}
+    }
+
+    fun select_common_fields_different_offset(s: CommonFieldsAtDifferentOffset): u64 {
+        // We expect branching over the variant to select this field
+        s.z
+    }
+
+    // Variant tests
+    fun test_common(s: CommonFields): bool {
+        (s is Foo|Bar)
+    }
+
+    fun test_common_ref(s: &CommonFields): bool {
+        (s is Foo|Bar)
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/bytecode-generator/pack_unpack.exp b/third_party/move/move-compiler-v2/tests/bytecode-generator/pack_unpack.exp
index aa74645f1e360..2bb77b7ee5e8e 100644
--- a/third_party/move/move-compiler-v2/tests/bytecode-generator/pack_unpack.exp
+++ b/third_party/move/move-compiler-v2/tests/bytecode-generator/pack_unpack.exp
@@ -12,7 +12,7 @@ module 0x42::pack_unpack {
     }
     private fun unpack(s: pack_unpack::S): (u64, u64) {
         {
-          let pack_unpack::S{ f: f: u64, g: pack_unpack::T{ h: h: u64 } }: pack_unpack::S = s;
+          let pack_unpack::S{ f, g: pack_unpack::T{ h } } = s;
           Tuple(f, h)
         }
     }
diff --git a/third_party/move/move-compiler-v2/tests/bytecode-generator/wildcard1.exp b/third_party/move/move-compiler-v2/tests/bytecode-generator/wildcard1.exp
index 413cd6c8f2ca3..52c1be1809af0 100644
--- a/third_party/move/move-compiler-v2/tests/bytecode-generator/wildcard1.exp
+++ b/third_party/move/move-compiler-v2/tests/bytecode-generator/wildcard1.exp
@@ -1,6 +1,6 @@
 
 Diagnostics:
-error: the left-hand side has 1 item but the right-hand side provided 2
+error: tuple type `(u64, u64)` is not allowed as a type argument
   ┌─ tests/bytecode-generator/wildcard1.move:7:13
   │
 7 │         let _ = tup();
diff --git a/third_party/move/move-compiler-v2/tests/bytecode-generator/wildcard5.exp b/third_party/move/move-compiler-v2/tests/bytecode-generator/wildcard5.exp
index 5964ecaf52dfd..1608427e72ff7 100644
--- a/third_party/move/move-compiler-v2/tests/bytecode-generator/wildcard5.exp
+++ b/third_party/move/move-compiler-v2/tests/bytecode-generator/wildcard5.exp
@@ -8,7 +8,7 @@ module 0xc0ffee::m {
         {
           let s: m::S = pack m::S(3, 4);
           {
-            let m::S{ x: _, y: _ }: m::S = s;
+            let m::S{ x: _, y: _ } = s;
             Tuple()
           }
         }
diff --git a/third_party/move/move-compiler-v2/tests/bytecode-generator/wildcard6.exp b/third_party/move/move-compiler-v2/tests/bytecode-generator/wildcard6.exp
index a2fcf0f8df3e3..a7e13399a8a0e 100644
--- a/third_party/move/move-compiler-v2/tests/bytecode-generator/wildcard6.exp
+++ b/third_party/move/move-compiler-v2/tests/bytecode-generator/wildcard6.exp
@@ -4,7 +4,7 @@ module 0xc0ffee::m {
         {
           let x: u64 = 40;
           {
-            let (y: u64, _): (u64, u64) = Tuple(Move(x), x);
+            let (y: u64, _: u64): (u64, u64) = Tuple(Move(x), x);
             y
           }
         }
@@ -34,6 +34,6 @@ error: cannot move local `x` since it is still in use
   ┌─ tests/bytecode-generator/wildcard6.move:4:23
   │
 4 │         let (y, _) = (move x, x);
-  │             ------    ^^^^^^ attempted to move here
-  │             │
-  │             used here
+  │                 -     ^^^^^^ attempted to move here
+  │                 │
+  │                 used here
diff --git a/third_party/move/move-compiler-v2/tests/bytecode-generator/wildcard7.exp b/third_party/move/move-compiler-v2/tests/bytecode-generator/wildcard7.exp
index 1e6874b74166b..86431acca3905 100644
--- a/third_party/move/move-compiler-v2/tests/bytecode-generator/wildcard7.exp
+++ b/third_party/move/move-compiler-v2/tests/bytecode-generator/wildcard7.exp
@@ -14,7 +14,7 @@ module 0xc0ffee::m {
           {
             let y: u8 = Move(x);
             {
-              let (_, q: u64): (u8, u64) = Tuple(x, 30);
+              let (_: u8, q: u64): (u8, u64) = Tuple(x, 30);
               y
             }
           }
@@ -42,6 +42,14 @@ public fun m::test(): u8 {
 }
 
 
+Diagnostics:
+warning: Unused assignment to `q`. Consider removing or prefixing with an underscore: `_q`
+  ┌─ tests/bytecode-generator/wildcard7.move:6:13
+  │
+6 │         let (_, q) = (x, z);
+  │             ^^^^^^
+
+
 Diagnostics:
 error: cannot move local `x` since it is still in use
   ┌─ tests/bytecode-generator/wildcard7.move:5:17
@@ -49,4 +57,4 @@ error: cannot move local `x` since it is still in use
 5 │         let y = move x;
   │                 ^^^^^^ attempted to move here
 6 │         let (_, q) = (x, z);
-  │             ------ used here
+  │              - used here
diff --git a/third_party/move/move-compiler-v2/tests/bytecode-generator/wildcard8.exp b/third_party/move/move-compiler-v2/tests/bytecode-generator/wildcard8.exp
index effcb2e6745e9..5b6d62f20943e 100644
--- a/third_party/move/move-compiler-v2/tests/bytecode-generator/wildcard8.exp
+++ b/third_party/move/move-compiler-v2/tests/bytecode-generator/wildcard8.exp
@@ -4,7 +4,7 @@ module 0xc0ffee::m {
         {
           let x: u64;
           {
-            let (_, _): (u64, u64) = Tuple(x, x);
+            let (_: u64, _: u64): (u64, u64) = Tuple(x, x);
             Tuple()
           }
         }
@@ -26,7 +26,13 @@ public fun m::test() {
 
 Diagnostics:
 error: use of unassigned local `x`
-  ┌─ tests/bytecode-generator/wildcard8.move:4:13
+  ┌─ tests/bytecode-generator/wildcard8.move:4:14
   │
 4 │         let (_, _) = (x, x);
-  │             ^^^^^^
+  │              ^
+
+error: use of unassigned local `x`
+  ┌─ tests/bytecode-generator/wildcard8.move:4:17
+  │
+4 │         let (_, _) = (x, x);
+  │                 ^
diff --git a/third_party/move/move-compiler-v2/tests/bytecode-verify-failure/equality.exp b/third_party/move/move-compiler-v2/tests/bytecode-verify-failure/equality.exp
index a65ef69cc29c6..2dc489f6b900f 100644
--- a/third_party/move/move-compiler-v2/tests/bytecode-verify-failure/equality.exp
+++ b/third_party/move/move-compiler-v2/tests/bytecode-verify-failure/equality.exp
@@ -15,33 +15,8 @@ B0:
 ============ bytecode verification failed ========
 
 Diagnostics:
-bug: BYTECODE VERIFICATION FAILED
+bug: bytecode verification failed with unexpected status code `EQUALITY_OP_TYPE_MISMATCH_ERROR`. This is a compiler bug, consider reporting it.
   ┌─ tests/bytecode-verify-failure/equality.move:3:9
   │
 3 │         x == y
-  │         ^^^^^^ ICE failed bytecode verifier: VMError {
-    major_status: EQUALITY_OP_TYPE_MISMATCH_ERROR,
-    sub_status: None,
-    message: None,
-    exec_state: None,
-    location: Module(
-        ModuleId {
-            address: 0000000000000000000000000000000000000000000000000000000000c0ffee,
-            name: Identifier(
-                "m",
-            ),
-        },
-    ),
-    indices: [
-        (
-            FunctionDefinition,
-            0,
-        ),
-    ],
-    offsets: [
-        (
-            FunctionDefinitionIndex(0),
-            2,
-        ),
-    ],
-}
+  │         ^^^^^^
diff --git a/third_party/move/move-compiler-v2/tests/checking-lang-v1/access_ok.exp b/third_party/move/move-compiler-v2/tests/checking-lang-v1/access_ok.exp
index 87fdfa3004da6..c8a86116c1112 100644
--- a/third_party/move/move-compiler-v2/tests/checking-lang-v1/access_ok.exp
+++ b/third_party/move/move-compiler-v2/tests/checking-lang-v1/access_ok.exp
@@ -1,139 +1,49 @@
 
 Diagnostics:
-error: not supported before language version `2.0-unstable`: read/write access specifiers. Try `acquires` instead.
-   ┌─ tests/checking-lang-v1/access_ok.move:11:20
+error: unsupported language construct
+   ┌─ tests/checking-lang-v1/access_ok.move:11:14
    │
 11 │     fun f2() reads S {
-   │                    ^^
+   │              ^^^^^ Move 2 language construct is not enabled: access specifiers
 
-error: not supported before language version `2.0-unstable`: read/write access specifiers. Try `acquires` instead.
-   ┌─ tests/checking-lang-v1/access_ok.move:14:21
+error: unsupported language construct
+   ┌─ tests/checking-lang-v1/access_ok.move:14:14
    │
 14 │     fun f3() writes S {
-   │                     ^^
+   │              ^^^^^^ Move 2 language construct is not enabled: access specifiers
 
-error: not supported before language version `2.0-unstable`: wildcard address specifiers
-   ┌─ tests/checking-lang-v1/access_ok.move:17:24
-   │
-17 │     fun f4() acquires S(*) {
-   │                        ^^^
-
-error: not supported before language version `2.0-unstable`: read/write access specifiers. Try `acquires` instead.
-   ┌─ tests/checking-lang-v1/access_ok.move:20:39
-   │
-20 │     fun f_multiple() acquires R reads R writes T, S reads G<u64> {
-   │                                       ^^
-
-error: not supported before language version `2.0-unstable`: read/write access specifiers. Try `acquires` instead.
-   ┌─ tests/checking-lang-v1/access_ok.move:20:48
+error: unsupported language construct
+   ┌─ tests/checking-lang-v1/access_ok.move:20:33
    │
 20 │     fun f_multiple() acquires R reads R writes T, S reads G<u64> {
-   │                                                ^
+   │                                 ^^^^^ Move 2 language construct is not enabled: access specifiers
 
-error: not supported before language version `2.0-unstable`: read/write access specifiers. Try `acquires` instead.
-   ┌─ tests/checking-lang-v1/access_ok.move:20:51
+error: unsupported language construct
+   ┌─ tests/checking-lang-v1/access_ok.move:20:41
    │
 20 │     fun f_multiple() acquires R reads R writes T, S reads G<u64> {
-   │                                                   ^^
+   │                                         ^^^^^^ Move 2 language construct is not enabled: access specifiers
 
-error: not supported before language version `2.0-unstable`: read/write access specifiers. Try `acquires` instead.
-   ┌─ tests/checking-lang-v1/access_ok.move:20:59
+error: unsupported language construct
+   ┌─ tests/checking-lang-v1/access_ok.move:20:53
    │
 20 │     fun f_multiple() acquires R reads R writes T, S reads G<u64> {
-   │                                                           ^^^^^^^
-
-error: not supported before language version `2.0-unstable`: address and wildcard access specifiers. Only resource type names can be provided.
-   ┌─ tests/checking-lang-v1/access_ok.move:23:23
-   │
-23 │     fun f5() acquires 0x42::*::* {
-   │                       ^^^^^^^^^^^
-
-error: not supported before language version `2.0-unstable`: address and wildcard access specifiers. Only resource type names can be provided.
-   ┌─ tests/checking-lang-v1/access_ok.move:26:23
-   │
-26 │     fun f6() acquires 0x42::m::* {
-   │                       ^^^^^^^^^^^
+   │                                                     ^^^^^ Move 2 language construct is not enabled: access specifiers
 
-error: not supported before language version `2.0-unstable`: wildcard address specifiers
-   ┌─ tests/checking-lang-v1/access_ok.move:29:24
-   │
-29 │     fun f7() acquires *(*) {
-   │                        ^^^
-
-error: not supported before language version `2.0-unstable`: address and wildcard access specifiers. Only resource type names can be provided.
-   ┌─ tests/checking-lang-v1/access_ok.move:29:23
-   │
-29 │     fun f7() acquires *(*) {
-   │                       ^^^^
-
-error: not supported before language version `2.0-unstable`: literal address specifiers
-   ┌─ tests/checking-lang-v1/access_ok.move:32:24
-   │
-32 │     fun f8() acquires *(0x42) {
-   │                        ^^^^^^
-
-error: not supported before language version `2.0-unstable`: address and wildcard access specifiers. Only resource type names can be provided.
-   ┌─ tests/checking-lang-v1/access_ok.move:32:23
-   │
-32 │     fun f8() acquires *(0x42) {
-   │                       ^^^^^^^
-
-error: not supported before language version `2.0-unstable`: named address specifiers
-   ┌─ tests/checking-lang-v1/access_ok.move:35:34
-   │
-35 │     fun f9(a: address) acquires *(a) {
-   │                                  ^^^
-
-error: not supported before language version `2.0-unstable`: address and wildcard access specifiers. Only resource type names can be provided.
-   ┌─ tests/checking-lang-v1/access_ok.move:35:33
-   │
-35 │     fun f9(a: address) acquires *(a) {
-   │                                 ^^^^
-
-error: not supported before language version `2.0-unstable`: derived address specifiers
-   ┌─ tests/checking-lang-v1/access_ok.move:38:31
-   │
-38 │     fun f10(x: u64) acquires *(make_up_address(x)) {
-   │                               ^^^^^^^^^^^^^^^^^^^^
-
-error: not supported before language version `2.0-unstable`: address and wildcard access specifiers. Only resource type names can be provided.
-   ┌─ tests/checking-lang-v1/access_ok.move:38:30
-   │
-38 │     fun f10(x: u64) acquires *(make_up_address(x)) {
-   │                              ^^^^^^^^^^^^^^^^^^^^^
-
-error: not supported before language version `2.0-unstable`: literal address specifiers
-   ┌─ tests/checking-lang-v1/access_ok.move:45:23
+error: unsupported language construct
+   ┌─ tests/checking-lang-v1/access_ok.move:45:15
    │
 45 │     fun f11() !reads *(0x42), *(0x43) {
-   │                       ^^^^^^
+   │               ^ Move 2 language construct is not enabled: access specifiers
 
-error: not supported before language version `2.0-unstable`: address and wildcard access specifiers. Only resource type names can be provided.
-   ┌─ tests/checking-lang-v1/access_ok.move:45:22
+error: unsupported language construct
+   ┌─ tests/checking-lang-v1/access_ok.move:45:16
    │
 45 │     fun f11() !reads *(0x42), *(0x43) {
-   │                      ^^^^^^^
+   │                ^^^^^ Move 2 language construct is not enabled: access specifiers
 
-error: not supported before language version `2.0-unstable`: read/write access specifiers. Try `acquires` instead.
-   ┌─ tests/checking-lang-v1/access_ok.move:45:22
+error: unsupported language construct
+   ┌─ tests/checking-lang-v1/access_ok.move:48:15
    │
-45 │     fun f11() !reads *(0x42), *(0x43) {
-   │                      ^^^^^^^
-
-error: not supported before language version `2.0-unstable`: literal address specifiers
-   ┌─ tests/checking-lang-v1/access_ok.move:45:32
-   │
-45 │     fun f11() !reads *(0x42), *(0x43) {
-   │                                ^^^^^^
-
-error: not supported before language version `2.0-unstable`: address and wildcard access specifiers. Only resource type names can be provided.
-   ┌─ tests/checking-lang-v1/access_ok.move:45:31
-   │
-45 │     fun f11() !reads *(0x42), *(0x43) {
-   │                               ^^^^^^^
-
-error: not supported before language version `2.0-unstable`: read/write access specifiers. Try `acquires` instead.
-   ┌─ tests/checking-lang-v1/access_ok.move:45:31
-   │
-45 │     fun f11() !reads *(0x42), *(0x43) {
-   │                               ^^^^^^^
+48 │     fun f12() pure {
+   │               ^^^^ Move 2 language construct is not enabled: access specifiers
diff --git a/third_party/move/move-compiler-v2/tests/checking-lang-v1/entry_inline_err_no_report.exp b/third_party/move/move-compiler-v2/tests/checking-lang-v1/entry_inline_err_no_report.exp
new file mode 100644
index 0000000000000..65d74465d64d0
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking-lang-v1/entry_inline_err_no_report.exp
@@ -0,0 +1,14 @@
+// -- Model dump before bytecode pipeline
+module 0x123::a {
+    friend entry fun a() {
+        Tuple()
+    }
+} // end 0x123::a
+module 0x123::b {
+    private entry fun a() {
+        Tuple()
+    }
+    private fun b() {
+        b::a()
+    }
+} // end 0x123::b
diff --git a/third_party/move/move-compiler-v2/tests/checking-lang-v1/entry_inline_err_no_report.move b/third_party/move/move-compiler-v2/tests/checking-lang-v1/entry_inline_err_no_report.move
new file mode 100644
index 0000000000000..bf4a894878f11
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking-lang-v1/entry_inline_err_no_report.move
@@ -0,0 +1,11 @@
+module 0x123::a{
+    public(friend) entry inline fun a(){}
+}
+
+module 0x123::b{
+    entry inline fun a(){}
+
+    fun b() {
+        a()
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/checking-lang-v1/index.exp b/third_party/move/move-compiler-v2/tests/checking-lang-v1/index.exp
new file mode 100644
index 0000000000000..e09cc1425dc4e
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking-lang-v1/index.exp
@@ -0,0 +1,91 @@
+
+Diagnostics:
+error: unsupported language construct
+   ┌─ tests/checking-lang-v1/index.move:11:17
+   │
+11 │         assert!((test::R[@0x1]).value == true, 0);
+   │                 ^^^^^^^^^^^^^^^ `_[_]` index operator in non-specification code only allowed in Move 2 and beyond
+
+error: unsupported language construct
+   ┌─ tests/checking-lang-v1/index.move:15:9
+   │
+15 │         0x42::test::R[@0x1].value = false;
+   │         ^^^^^^^^^^^^^^^^^^^ `_[_]` index operator in non-specification code only allowed in Move 2 and beyond
+
+error: unsupported language construct
+   ┌─ tests/checking-lang-v1/index.move:16:17
+   │
+16 │         assert!(R[@0x1].value == false, 1);
+   │                 ^^^^^^^ `_[_]` index operator in non-specification code only allowed in Move 2 and beyond
+
+error: unsupported language construct
+   ┌─ tests/checking-lang-v1/index.move:38:17
+   │
+38 │         assert!(test::Y<X<bool>>[@0x1].field.value == true, 0);
+   │                 ^^^^^^^^^^^^^^^^^^^^^^ `_[_]` index operator in non-specification code only allowed in Move 2 and beyond
+
+error: unsupported language construct
+   ┌─ tests/checking-lang-v1/index.move:43:22
+   │
+43 │         let y = &mut 0x42::test ::Y<X<bool>> [addr];
+   │                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `_[_]` index operator in non-specification code only allowed in Move 2 and beyond
+
+error: unsupported language construct
+   ┌─ tests/checking-lang-v1/index.move:45:17
+   │
+45 │         assert!(Y<X<bool>>[addr].field.value == false, 1);
+   │                 ^^^^^^^^^^^^^^^^ `_[_]` index operator in non-specification code only allowed in Move 2 and beyond
+
+error: unsupported language construct
+   ┌─ tests/checking-lang-v1/index.move:53:17
+   │
+53 │         assert!(v[0].value == 2, 0);
+   │                 ^^^^ `_[_]` index operator in non-specification code only allowed in Move 2 and beyond
+
+error: unsupported language construct
+   ┌─ tests/checking-lang-v1/index.move:70:17
+   │
+70 │         assert!(v[0].field.value == true, 0);
+   │                 ^^^^ `_[_]` index operator in non-specification code only allowed in Move 2 and beyond
+
+error: unsupported language construct
+   ┌─ tests/checking-lang-v1/index.move:71:17
+   │
+71 │         assert!(v[1].field.value == false, 0);
+   │                 ^^^^ `_[_]` index operator in non-specification code only allowed in Move 2 and beyond
+
+error: unsupported language construct
+   ┌─ tests/checking-lang-v1/index.move:88:17
+   │
+88 │         assert!(v[0].field.value == true, 0);
+   │                 ^^^^ `_[_]` index operator in non-specification code only allowed in Move 2 and beyond
+
+error: unsupported language construct
+   ┌─ tests/checking-lang-v1/index.move:89:17
+   │
+89 │         assert!(v[1].field.value == false, 0);
+   │                 ^^^^ `_[_]` index operator in non-specification code only allowed in Move 2 and beyond
+
+error: unsupported language construct
+   ┌─ tests/checking-lang-v1/index.move:90:9
+   │
+90 │         v[0].field.value = false;
+   │         ^^^^ `_[_]` index operator in non-specification code only allowed in Move 2 and beyond
+
+error: unsupported language construct
+   ┌─ tests/checking-lang-v1/index.move:91:9
+   │
+91 │         v[1].field.value = true;
+   │         ^^^^ `_[_]` index operator in non-specification code only allowed in Move 2 and beyond
+
+error: unsupported language construct
+   ┌─ tests/checking-lang-v1/index.move:92:17
+   │
+92 │         assert!(v[0].field.value == false, 0);
+   │                 ^^^^ `_[_]` index operator in non-specification code only allowed in Move 2 and beyond
+
+error: unsupported language construct
+   ┌─ tests/checking-lang-v1/index.move:93:17
+   │
+93 │         assert!(v[1].field.value == true, 0);
+   │                 ^^^^ `_[_]` index operator in non-specification code only allowed in Move 2 and beyond
diff --git a/third_party/move/move-compiler-v2/tests/checking-lang-v1/index.move b/third_party/move/move-compiler-v2/tests/checking-lang-v1/index.move
new file mode 100644
index 0000000000000..bc24338a2b93d
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking-lang-v1/index.move
@@ -0,0 +1,98 @@
+module 0x42::test {
+
+    struct R has key, drop { value: bool }
+
+    fun init(s: &signer) {
+        move_to(s, R{value: true});
+    }
+
+    fun test_resource_1() acquires R {
+        use 0x42::test;
+        assert!((test::R[@0x1]).value == true, 0);
+    }
+
+    fun test_resource_2() acquires R {
+        0x42::test::R[@0x1].value = false;
+        assert!(R[@0x1].value == false, 1);
+    }
+
+    struct X<M> has copy, drop, store {
+        value: M
+    }
+    struct Y<T> has key, drop {
+        field: T
+    }
+
+    fun init_2(s: &signer) {
+        let x = X {
+            value: true
+        };
+        let y = Y {
+            field: x
+        };
+        move_to(s, y);
+    }
+
+    fun test_resource_3() {
+        use 0x42::test;
+        assert!(test::Y<X<bool>>[@0x1].field.value == true, 0);
+    }
+
+    fun test_resource_4() {
+        let addr = @0x1;
+        let y = &mut 0x42::test ::Y<X<bool>> [addr];
+        y.field.value = false;
+        assert!(Y<X<bool>>[addr].field.value == false, 1);
+    }
+
+    fun test_vector() {
+        let x = X {
+            value: 2
+        };
+        let v = vector[x, x];
+        assert!(v[0].value == 2, 0);
+    }
+
+    fun test_vector_borrow() {
+        let x1 = X {
+            value: true
+        };
+        let x2 = X {
+            value: false
+        };
+        let y1 = Y {
+            field: x1
+        };
+        let y2 = Y {
+            field: x2
+        };
+        let v = vector[y1, y2];
+        assert!(v[0].field.value == true, 0);
+        assert!(v[1].field.value == false, 0);
+    }
+
+    fun test_vector_borrow_mut() {
+        let x1 = X {
+            value: true
+        };
+        let x2 = X {
+            value: false
+        };
+        let y1 = Y {
+            field: x1
+        };
+        let y2 = Y {
+            field: x2
+        };
+        let v = vector[y1, y2];
+        assert!(v[0].field.value == true, 0);
+        assert!(v[1].field.value == false, 0);
+        v[0].field.value = false;
+        v[1].field.value = true;
+        assert!(v[0].field.value == false, 0);
+        assert!(v[1].field.value == true, 0);
+    }
+
+
+
+}
diff --git a/third_party/move/move-compiler-v2/tests/checking-lang-v1/struct_variants.exp b/third_party/move/move-compiler-v2/tests/checking-lang-v1/struct_variants.exp
new file mode 100644
index 0000000000000..06a67103dcb6b
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking-lang-v1/struct_variants.exp
@@ -0,0 +1,13 @@
+
+Diagnostics:
+error: unsupported language construct
+  ┌─ tests/checking-lang-v1/struct_variants.move:3:5
+  │
+3 │     enum S { None, Some{x: u64} }
+  │     ^^^^ Move 2 language construct is not enabled: enum types
+
+error: unsupported language construct
+  ┌─ tests/checking-lang-v1/struct_variants.move:6:9
+  │
+6 │         match (s) {
+  │         ^^^^^ Move 2 language construct is not enabled: match expression
diff --git a/third_party/move/move-compiler-v2/tests/checking-lang-v1/struct_variants.move b/third_party/move/move-compiler-v2/tests/checking-lang-v1/struct_variants.move
new file mode 100644
index 0000000000000..e26ed1ff792ac
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking-lang-v1/struct_variants.move
@@ -0,0 +1,11 @@
+module 0x42::m {
+
+    enum S { None, Some{x: u64} }
+
+    fun f(s: S) {
+        match (s) {
+            None => {}
+            Some{x: _} => {}
+        }
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/checking/abilities/tuple.exp b/third_party/move/move-compiler-v2/tests/checking/abilities/tuple.exp
index 36f6a3a527412..132846113b36a 100644
--- a/third_party/move/move-compiler-v2/tests/checking/abilities/tuple.exp
+++ b/third_party/move/move-compiler-v2/tests/checking/abilities/tuple.exp
@@ -8,7 +8,7 @@ module 0x42::tuple {
     }
     private fun use_tuple(x: u64): u64 {
         {
-          let (x: u64, tuple::S{ f: y: u64 }): (u64, tuple::S) = tuple::tuple(x);
+          let (x: u64, tuple::S{ f: y }): (u64, tuple::S) = tuple::tuple(x);
           Add<u64>(x, y)
         }
     }
diff --git a/third_party/move/move-compiler-v2/tests/checking/abilities/v1/ability_constraints.exp b/third_party/move/move-compiler-v2/tests/checking/abilities/v1/ability_constraints.exp
index f5fdc5eaa7fd2..93bcfd12e634f 100644
--- a/third_party/move/move-compiler-v2/tests/checking/abilities/v1/ability_constraints.exp
+++ b/third_party/move/move-compiler-v2/tests/checking/abilities/v1/ability_constraints.exp
@@ -59,21 +59,21 @@ module 0x42::M {
         M::s<vector<bool>>();
         M::cds<vector<address>>();
         {
-          let M::Sc<u64>{ dummy_field: _ }: M::Sc<u64> = pack M::Sc<u64>(false);
+          let M::Sc<u64>{ dummy_field: _ } = pack M::Sc<u64>(false);
           {
-            let M::Sd<signer>{ dummy_field: _ }: M::Sd<signer> = pack M::Sd<signer>(false);
+            let M::Sd<signer>{ dummy_field: _ } = pack M::Sd<signer>(false);
             {
-              let M::Ss<bool>{ dummy_field: _ }: M::Ss<bool> = pack M::Ss<bool>(false);
+              let M::Ss<bool>{ dummy_field: _ } = pack M::Ss<bool>(false);
               {
-                let M::Scds<address>{ dummy_field: _ }: M::Scds<address> = pack M::Scds<address>(false);
+                let M::Scds<address>{ dummy_field: _ } = pack M::Scds<address>(false);
                 {
-                  let M::Sc<vector<u64>>{ dummy_field: _ }: M::Sc<vector<u64>> = pack M::Sc<vector<u64>>(false);
+                  let M::Sc<vector<u64>>{ dummy_field: _ } = pack M::Sc<vector<u64>>(false);
                   {
-                    let M::Sd<vector<signer>>{ dummy_field: _ }: M::Sd<vector<signer>> = pack M::Sd<vector<signer>>(false);
+                    let M::Sd<vector<signer>>{ dummy_field: _ } = pack M::Sd<vector<signer>>(false);
                     {
-                      let M::Ss<vector<bool>>{ dummy_field: _ }: M::Ss<vector<bool>> = pack M::Ss<vector<bool>>(false);
+                      let M::Ss<vector<bool>>{ dummy_field: _ } = pack M::Ss<vector<bool>>(false);
                       {
-                        let M::Scds<vector<address>>{ dummy_field: _ }: M::Scds<vector<address>> = pack M::Scds<vector<address>>(false);
+                        let M::Scds<vector<address>>{ dummy_field: _ } = pack M::Scds<vector<address>>(false);
                         M::c<Tc>();
                         M::c<Tcd>();
                         M::c<Tcs>();
@@ -92,39 +92,39 @@ module 0x42::M {
                         M::sk<Tsk>();
                         M::cds<Tcds>();
                         {
-                          let M::Sc<Tc>{ dummy_field: _ }: M::Sc<Tc> = pack M::Sc<Tc>(false);
+                          let M::Sc<Tc>{ dummy_field: _ } = pack M::Sc<Tc>(false);
                           {
-                            let M::Sc<Tcd>{ dummy_field: _ }: M::Sc<Tcd> = pack M::Sc<Tcd>(false);
+                            let M::Sc<Tcd>{ dummy_field: _ } = pack M::Sc<Tcd>(false);
                             {
-                              let M::Sc<Tcs>{ dummy_field: _ }: M::Sc<Tcs> = pack M::Sc<Tcs>(false);
+                              let M::Sc<Tcs>{ dummy_field: _ } = pack M::Sc<Tcs>(false);
                               {
-                                let M::Sc<Tcds>{ dummy_field: _ }: M::Sc<Tcds> = pack M::Sc<Tcds>(false);
+                                let M::Sc<Tcds>{ dummy_field: _ } = pack M::Sc<Tcds>(false);
                                 {
-                                  let M::Sd<Td>{ dummy_field: _ }: M::Sd<Td> = pack M::Sd<Td>(false);
+                                  let M::Sd<Td>{ dummy_field: _ } = pack M::Sd<Td>(false);
                                   {
-                                    let M::Sd<Tcd>{ dummy_field: _ }: M::Sd<Tcd> = pack M::Sd<Tcd>(false);
+                                    let M::Sd<Tcd>{ dummy_field: _ } = pack M::Sd<Tcd>(false);
                                     {
-                                      let M::Sd<Tds>{ dummy_field: _ }: M::Sd<Tds> = pack M::Sd<Tds>(false);
+                                      let M::Sd<Tds>{ dummy_field: _ } = pack M::Sd<Tds>(false);
                                       {
-                                        let M::Sd<Tcds>{ dummy_field: _ }: M::Sd<Tcds> = pack M::Sd<Tcds>(false);
+                                        let M::Sd<Tcds>{ dummy_field: _ } = pack M::Sd<Tcds>(false);
                                         {
-                                          let M::Ss<Ts>{ dummy_field: _ }: M::Ss<Ts> = pack M::Ss<Ts>(false);
+                                          let M::Ss<Ts>{ dummy_field: _ } = pack M::Ss<Ts>(false);
                                           {
-                                            let M::Ss<Tcs>{ dummy_field: _ }: M::Ss<Tcs> = pack M::Ss<Tcs>(false);
+                                            let M::Ss<Tcs>{ dummy_field: _ } = pack M::Ss<Tcs>(false);
                                             {
-                                              let M::Ss<Tds>{ dummy_field: _ }: M::Ss<Tds> = pack M::Ss<Tds>(false);
+                                              let M::Ss<Tds>{ dummy_field: _ } = pack M::Ss<Tds>(false);
                                               {
-                                                let M::Ss<Tsk>{ dummy_field: _ }: M::Ss<Tsk> = pack M::Ss<Tsk>(false);
+                                                let M::Ss<Tsk>{ dummy_field: _ } = pack M::Ss<Tsk>(false);
                                                 {
-                                                  let M::Ss<Tcds>{ dummy_field: _ }: M::Ss<Tcds> = pack M::Ss<Tcds>(false);
+                                                  let M::Ss<Tcds>{ dummy_field: _ } = pack M::Ss<Tcds>(false);
                                                   {
-                                                    let M::Sk<Tk>{ dummy_field: _ }: M::Sk<Tk> = pack M::Sk<Tk>(false);
+                                                    let M::Sk<Tk>{ dummy_field: _ } = pack M::Sk<Tk>(false);
                                                     {
-                                                      let M::Sk<Tsk>{ dummy_field: _ }: M::Sk<Tsk> = pack M::Sk<Tsk>(false);
+                                                      let M::Sk<Tsk>{ dummy_field: _ } = pack M::Sk<Tsk>(false);
                                                       {
-                                                        let M::Ssk<Tsk>{ dummy_field: _ }: M::Ssk<Tsk> = pack M::Ssk<Tsk>(false);
+                                                        let M::Ssk<Tsk>{ dummy_field: _ } = pack M::Ssk<Tsk>(false);
                                                         {
-                                                          let M::Scds<Tcds>{ dummy_field: _ }: M::Scds<Tcds> = pack M::Scds<Tcds>(false);
+                                                          let M::Scds<Tcds>{ dummy_field: _ } = pack M::Scds<Tcds>(false);
                                                           M::c<M::S>();
                                                           M::c<M::Box<M::S>>();
                                                           M::c<M::Pair<M::Box<M::S>, M::S>>();
@@ -149,51 +149,51 @@ module 0x42::M {
                                                           M::cds<M::Box<M::S>>();
                                                           M::cds<M::Pair<M::Box<M::S>, M::S>>();
                                                           {
-                                                            let M::Sc<M::S>{ dummy_field: _ }: M::Sc<M::S> = pack M::Sc<M::S>(false);
+                                                            let M::Sc<M::S>{ dummy_field: _ } = pack M::Sc<M::S>(false);
                                                             {
-                                                              let M::Sc<M::Box<M::S>>{ dummy_field: _ }: M::Sc<M::Box<M::S>> = pack M::Sc<M::Box<M::S>>(false);
+                                                              let M::Sc<M::Box<M::S>>{ dummy_field: _ } = pack M::Sc<M::Box<M::S>>(false);
                                                               {
-                                                                let M::Sc<M::Pair<M::Box<M::S>, M::S>>{ dummy_field: _ }: M::Sc<M::Pair<M::Box<M::S>, M::S>> = pack M::Sc<M::Pair<M::Box<M::S>, M::S>>(false);
+                                                                let M::Sc<M::Pair<M::Box<M::S>, M::S>>{ dummy_field: _ } = pack M::Sc<M::Pair<M::Box<M::S>, M::S>>(false);
                                                                 {
-                                                                  let M::Sd<M::S>{ dummy_field: _ }: M::Sd<M::S> = pack M::Sd<M::S>(false);
+                                                                  let M::Sd<M::S>{ dummy_field: _ } = pack M::Sd<M::S>(false);
                                                                   {
-                                                                    let M::Sd<M::Box<M::S>>{ dummy_field: _ }: M::Sd<M::Box<M::S>> = pack M::Sd<M::Box<M::S>>(false);
+                                                                    let M::Sd<M::Box<M::S>>{ dummy_field: _ } = pack M::Sd<M::Box<M::S>>(false);
                                                                     {
-                                                                      let M::Sd<M::Pair<M::Box<M::S>, M::S>>{ dummy_field: _ }: M::Sd<M::Pair<M::Box<M::S>, M::S>> = pack M::Sd<M::Pair<M::Box<M::S>, M::S>>(false);
+                                                                      let M::Sd<M::Pair<M::Box<M::S>, M::S>>{ dummy_field: _ } = pack M::Sd<M::Pair<M::Box<M::S>, M::S>>(false);
                                                                       {
-                                                                        let M::Ss<M::S>{ dummy_field: _ }: M::Ss<M::S> = pack M::Ss<M::S>(false);
+                                                                        let M::Ss<M::S>{ dummy_field: _ } = pack M::Ss<M::S>(false);
                                                                         {
-                                                                          let M::Ss<M::R>{ dummy_field: _ }: M::Ss<M::R> = pack M::Ss<M::R>(false);
+                                                                          let M::Ss<M::R>{ dummy_field: _ } = pack M::Ss<M::R>(false);
                                                                           {
-                                                                            let M::Ss<M::Box<M::S>>{ dummy_field: _ }: M::Ss<M::Box<M::S>> = pack M::Ss<M::Box<M::S>>(false);
+                                                                            let M::Ss<M::Box<M::S>>{ dummy_field: _ } = pack M::Ss<M::Box<M::S>>(false);
                                                                             {
-                                                                              let M::Ss<M::Box<M::R>>{ dummy_field: _ }: M::Ss<M::Box<M::R>> = pack M::Ss<M::Box<M::R>>(false);
+                                                                              let M::Ss<M::Box<M::R>>{ dummy_field: _ } = pack M::Ss<M::Box<M::R>>(false);
                                                                               {
-                                                                                let M::Ss<M::Pair<M::Box<M::S>, M::S>>{ dummy_field: _ }: M::Ss<M::Pair<M::Box<M::S>, M::S>> = pack M::Ss<M::Pair<M::Box<M::S>, M::S>>(false);
+                                                                                let M::Ss<M::Pair<M::Box<M::S>, M::S>>{ dummy_field: _ } = pack M::Ss<M::Pair<M::Box<M::S>, M::S>>(false);
                                                                                 {
-                                                                                  let M::Ss<M::Pair<M::R, M::Box<M::Pair<M::R, M::S>>>>{ dummy_field: _ }: M::Ss<M::Pair<M::R, M::Box<M::Pair<M::R, M::S>>>> = pack M::Ss<M::Pair<M::R, M::Box<M::Pair<M::R, M::S>>>>(false);
+                                                                                  let M::Ss<M::Pair<M::R, M::Box<M::Pair<M::R, M::S>>>>{ dummy_field: _ } = pack M::Ss<M::Pair<M::R, M::Box<M::Pair<M::R, M::S>>>>(false);
                                                                                   {
-                                                                                    let M::Sk<M::R>{ dummy_field: _ }: M::Sk<M::R> = pack M::Sk<M::R>(false);
+                                                                                    let M::Sk<M::R>{ dummy_field: _ } = pack M::Sk<M::R>(false);
                                                                                     {
-                                                                                      let M::Sk<M::Box<M::R>>{ dummy_field: _ }: M::Sk<M::Box<M::R>> = pack M::Sk<M::Box<M::R>>(false);
+                                                                                      let M::Sk<M::Box<M::R>>{ dummy_field: _ } = pack M::Sk<M::Box<M::R>>(false);
                                                                                       {
-                                                                                        let M::Sk<M::Pair<M::R, M::Box<M::R>>>{ dummy_field: _ }: M::Sk<M::Pair<M::R, M::Box<M::R>>> = pack M::Sk<M::Pair<M::R, M::Box<M::R>>>(false);
+                                                                                        let M::Sk<M::Pair<M::R, M::Box<M::R>>>{ dummy_field: _ } = pack M::Sk<M::Pair<M::R, M::Box<M::R>>>(false);
                                                                                         {
-                                                                                          let M::Sk<M::Pair<M::R, M::Box<M::Pair<M::R, M::S>>>>{ dummy_field: _ }: M::Sk<M::Pair<M::R, M::Box<M::Pair<M::R, M::S>>>> = pack M::Sk<M::Pair<M::R, M::Box<M::Pair<M::R, M::S>>>>(false);
+                                                                                          let M::Sk<M::Pair<M::R, M::Box<M::Pair<M::R, M::S>>>>{ dummy_field: _ } = pack M::Sk<M::Pair<M::R, M::Box<M::Pair<M::R, M::S>>>>(false);
                                                                                           {
-                                                                                            let M::Ssk<M::R>{ dummy_field: _ }: M::Ssk<M::R> = pack M::Ssk<M::R>(false);
+                                                                                            let M::Ssk<M::R>{ dummy_field: _ } = pack M::Ssk<M::R>(false);
                                                                                             {
-                                                                                              let M::Ssk<M::Box<M::R>>{ dummy_field: _ }: M::Ssk<M::Box<M::R>> = pack M::Ssk<M::Box<M::R>>(false);
+                                                                                              let M::Ssk<M::Box<M::R>>{ dummy_field: _ } = pack M::Ssk<M::Box<M::R>>(false);
                                                                                               {
-                                                                                                let M::Ssk<M::Pair<M::R, M::Box<M::R>>>{ dummy_field: _ }: M::Ssk<M::Pair<M::R, M::Box<M::R>>> = pack M::Ssk<M::Pair<M::R, M::Box<M::R>>>(false);
+                                                                                                let M::Ssk<M::Pair<M::R, M::Box<M::R>>>{ dummy_field: _ } = pack M::Ssk<M::Pair<M::R, M::Box<M::R>>>(false);
                                                                                                 {
-                                                                                                  let M::Ssk<M::Pair<M::R, M::Box<M::Pair<M::R, M::S>>>>{ dummy_field: _ }: M::Ssk<M::Pair<M::R, M::Box<M::Pair<M::R, M::S>>>> = pack M::Ssk<M::Pair<M::R, M::Box<M::Pair<M::R, M::S>>>>(false);
+                                                                                                  let M::Ssk<M::Pair<M::R, M::Box<M::Pair<M::R, M::S>>>>{ dummy_field: _ } = pack M::Ssk<M::Pair<M::R, M::Box<M::Pair<M::R, M::S>>>>(false);
                                                                                                   {
-                                                                                                    let M::Scds<M::S>{ dummy_field: _ }: M::Scds<M::S> = pack M::Scds<M::S>(false);
+                                                                                                    let M::Scds<M::S>{ dummy_field: _ } = pack M::Scds<M::S>(false);
                                                                                                     {
-                                                                                                      let M::Scds<M::Box<M::S>>{ dummy_field: _ }: M::Scds<M::Box<M::S>> = pack M::Scds<M::Box<M::S>>(false);
+                                                                                                      let M::Scds<M::Box<M::S>>{ dummy_field: _ } = pack M::Scds<M::Box<M::S>>(false);
                                                                                                       {
-                                                                                                        let M::Scds<M::Pair<M::Box<M::S>, M::S>>{ dummy_field: _ }: M::Scds<M::Pair<M::Box<M::S>, M::S>> = pack M::Scds<M::Pair<M::Box<M::S>, M::S>>(false);
+                                                                                                        let M::Scds<M::Pair<M::Box<M::S>, M::S>>{ dummy_field: _ } = pack M::Scds<M::Pair<M::Box<M::S>, M::S>>(false);
                                                                                                         Tuple()
                                                                                                       }
                                                                                                     }
diff --git a/third_party/move/move-compiler-v2/tests/checking/error_context/assign.exp b/third_party/move/move-compiler-v2/tests/checking/error_context/assign.exp
index e9bed3c84906b..36582040cc7df 100644
--- a/third_party/move/move-compiler-v2/tests/checking/error_context/assign.exp
+++ b/third_party/move/move-compiler-v2/tests/checking/error_context/assign.exp
@@ -7,10 +7,10 @@ error: cannot assign `R` to left-hand side of type `S`
    │          ^^^^^^^
 
 error: cannot assign `S` to left-hand side of type `R`
-   ┌─ tests/checking/error_context/assign.move:15:19
+   ┌─ tests/checking/error_context/assign.move:15:24
    │
 15 │         (S{x, y}, R{z, s}) = (r, s);
-   │                   ^^^^^^^
+   │                        ^
 
 error: the left-hand side has 2 items but the right-hand side provided 3
    ┌─ tests/checking/error_context/assign.move:20:9
diff --git a/third_party/move/move-compiler-v2/tests/checking/naming/global_builtin_one_type_argument.exp b/third_party/move/move-compiler-v2/tests/checking/naming/global_builtin_one_type_argument.exp
index 126eb1e9aaa6b..441e25f4f2b3b 100644
--- a/third_party/move/move-compiler-v2/tests/checking/naming/global_builtin_one_type_argument.exp
+++ b/third_party/move/move-compiler-v2/tests/checking/naming/global_builtin_one_type_argument.exp
@@ -15,7 +15,7 @@ module 0x8675309::M {
               {
                 let _: &mut M::R = BorrowGlobal(Mutable)<M::R>(0x0);
                 {
-                  let M::R{ dummy_field: _ }: M::R = MoveFrom<M::R>(0x0);
+                  let M::R{ dummy_field: _ } = MoveFrom<M::R>(0x0);
                   Tuple()
                 }
               }
diff --git a/third_party/move/move-compiler-v2/tests/checking/naming/struct_in_current_module.exp b/third_party/move/move-compiler-v2/tests/checking/naming/struct_in_current_module.exp
index 93ba4b71e23df..8e0fcca2100b4 100644
--- a/third_party/move/move-compiler-v2/tests/checking/naming/struct_in_current_module.exp
+++ b/third_party/move/move-compiler-v2/tests/checking/naming/struct_in_current_module.exp
@@ -10,7 +10,7 @@ module 0x8675309::M {
         {
           let _: M::S = pack M::S(0);
           {
-            let M::R{ f: _ }: M::R = pack M::R(0);
+            let M::R{ f: _ } = pack M::R(0);
             Tuple()
           }
         }
diff --git a/third_party/move/move-compiler-v2/tests/checking/naming/unbound_constant.exp b/third_party/move/move-compiler-v2/tests/checking/naming/unbound_constant.exp
index 5588e782ccafe..5e3ee6617e204 100644
--- a/third_party/move/move-compiler-v2/tests/checking/naming/unbound_constant.exp
+++ b/third_party/move/move-compiler-v2/tests/checking/naming/unbound_constant.exp
@@ -4,10 +4,10 @@ error: unbound module
    ┌─ tests/checking/naming/unbound_constant.move:14:17
    │
 14 │         let y = Self::CONSTANT;
-   │                 ^^^^ Unbound module alias 'Self'
+   │                 ^^^^ Unbound module or type alias 'Self'
 
 error: unbound module
    ┌─ tests/checking/naming/unbound_constant.move:15:24
    │
 15 │         0 + CONSTANT + Self::CONSTANT;
-   │                        ^^^^ Unbound module alias 'Self'
+   │                        ^^^^ Unbound module or type alias 'Self'
diff --git a/third_party/move/move-compiler-v2/tests/checking/naming/unbound_module.exp b/third_party/move/move-compiler-v2/tests/checking/naming/unbound_module.exp
index c884e4383b476..d435475cb10ba 100644
--- a/third_party/move/move-compiler-v2/tests/checking/naming/unbound_module.exp
+++ b/third_party/move/move-compiler-v2/tests/checking/naming/unbound_module.exp
@@ -10,4 +10,4 @@ error: unbound module
   ┌─ tests/checking/naming/unbound_module.move:4:9
   │
 4 │         X::foo();
-  │         ^ Unbound module alias 'X'
+  │         ^ Unbound module or type alias 'X'
diff --git a/third_party/move/move-compiler-v2/tests/checking/naming/warning_dependency.exp b/third_party/move/move-compiler-v2/tests/checking/naming/warning_dependency.exp
new file mode 100644
index 0000000000000..d18cbc88a3820
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/naming/warning_dependency.exp
@@ -0,0 +1,33 @@
+
+Diagnostics:
+warning: unused alias
+  ┌─ tests/checking/naming/warning_dependency.move:3:21
+  │
+3 │     use 0x42::test::S0;
+  │                     ^^ Unused 'use' of alias 'S0'. Consider removing it
+
+// -- Model dump before bytecode pipeline
+module 0x42::dependency {
+    use 0x42::test::{S0};
+} // end 0x42::dependency
+module 0x42::test {
+    struct S0 {
+        dummy_field: bool,
+    }
+    struct S1 {
+        dummy_field: bool,
+    }
+    struct S2 {
+        f: test::S3<#1>,
+    }
+    struct S3 {
+        dummy_field: bool,
+    }
+    struct S4 {
+        f: vector<#0>,
+    }
+    struct S5 {
+        f: vector<#0>,
+        g: vector<#1>,
+    }
+} // end 0x42::test
diff --git a/third_party/move/move-compiler-v2/tests/checking/naming/warning_dependency.move b/third_party/move/move-compiler-v2/tests/checking/naming/warning_dependency.move
new file mode 100644
index 0000000000000..176719eaa0256
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/naming/warning_dependency.move
@@ -0,0 +1,4 @@
+// dep: tests/checking/naming/unused_type_parameter_struct.move
+module 0x42::dependency {
+    use 0x42::test::S0;
+}
diff --git a/third_party/move/move-compiler-v2/tests/checking/positional_fields/assign_field.exp b/third_party/move/move-compiler-v2/tests/checking/positional_fields/assign_field.exp
new file mode 100644
index 0000000000000..f84ae045ce12c
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/positional_fields/assign_field.exp
@@ -0,0 +1,96 @@
+// -- Model dump before bytecode pipeline
+module 0x42::test {
+    enum E {
+        V1 {
+            0: u8,
+            1: bool,
+        }
+        V2 {
+            0: test::S3,
+        }
+    }
+    struct S0 {
+        x: u8,
+    }
+    struct S1 {
+        0: u64,
+        1: bool,
+    }
+    struct S2 {
+        0: test::S0,
+        1: u8,
+    }
+    struct S3 {
+        0: test::S2,
+        1: test::S0,
+        2: test::S2,
+    }
+    private fun assign0(a: u64,b: bool) {
+        {
+          let x: test::S1 = pack test::S1(a, b);
+          loop {
+            if select test::S1.1<test::S1>(x) {
+              x: test::S1 = pack test::S1(Sub<u64>(select test::S1.0<test::S1>(x), 1), Ge<u64>(select test::S1.0<test::S1>(x), 1));
+              Tuple()
+            } else {
+              break
+            }
+          }
+        }
+    }
+    private fun assign1(x: test::S1): u64 {
+        {
+          let count: u64 = 0;
+          loop {
+            if select test::S1.1<test::S1>(x) {
+              {
+                let y: u64 = if Gt<u64>(select test::S1.0<test::S1>(x), 0) {
+                  Sub<u64>(select test::S1.0<test::S1>(x), 1)
+                } else {
+                  0
+                };
+                x: test::S1 = pack test::S1(y, Ge<u64>(y, 1));
+                count: u64 = Add<u64>(count, 1);
+                Tuple()
+              }
+            } else {
+              break
+            }
+          };
+          count
+        }
+    }
+    private fun assign_chained(x: test::S3) {
+        Add<u8>(Add<u8>(select test::S0.x<test::S0>(select test::S2.0<test::S2>(select test::S3.0<test::S3>(x))), select test::S0.x<test::S0>(select test::S3.1<test::S3>(x))), select test::S0.x<test::S0>(select test::S2.0<test::S2>(select test::S3.2<test::S3>(x))));
+        select test::S0.x<test::S0>(select test::S2.0<test::S2>(select test::S3.0<test::S3>(x))) = 0;
+        select test::S0.x<test::S0>(select test::S3.1<test::S3>(x)) = 1;
+        select test::S0.x<test::S0>(select test::S2.0<test::S2>(select test::S3.2<test::S3>(x))) = 2;
+        Tuple()
+    }
+    private fun assign_enum(x: &mut test::E) {
+        match (x) {
+          test::E::V1{ 0: x, 1: y } => {
+            x = 42;
+            y = true;
+            Tuple()
+          }
+          test::E::V2{ 0: x } => {
+            select test::S0.x<test::S0>(select test::S2.0<test::S2>(select test::S3.0<&mut test::S3>(x))) = 0;
+            select test::S0.x<test::S0>(select test::S3.1<&mut test::S3>(x)) = 1;
+            select test::S0.x<test::S0>(select test::S2.0<test::S2>(select test::S3.2<&mut test::S3>(x))) = 2;
+            Tuple()
+          }
+        }
+
+    }
+    private fun simple(x: test::S1) {
+        select test::S1.0<test::S1>(x) = 42;
+        select test::S1.1<test::S1>(x) = true;
+        Tuple()
+    }
+    private fun simple_ref(x: &mut test::S1) {
+        select test::S1.0<&mut test::S1>(x) = 42;
+        select test::S1.1<&mut test::S1>(x) = true;
+        Tuple()
+    }
+} // end 0x42::test
diff --git a/third_party/move/move-compiler-v2/tests/checking/positional_fields/assign_field.move b/third_party/move/move-compiler-v2/tests/checking/positional_fields/assign_field.move
new file mode 100644
index 0000000000000..fef27798ae22a
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/positional_fields/assign_field.move
@@ -0,0 +1,64 @@
+module 0x42::test {
+    struct S0 {
+        x: u8,
+    }
+
+    struct S1(u64, bool);
+
+    struct S2(S0, u8);
+
+    struct S3(S2, S0, S2);
+
+    enum E {
+        V1(u8, bool),
+        V2(S3),
+    }
+
+    fun simple(x: S1) {
+        x.0 = 42;
+        x.1 = true;
+    }
+
+    fun simple_ref(x: &mut S1) {
+        x.0 = 42;
+        x.1 = true;
+    }
+
+    fun assign0 (a: u64, b: bool) {
+        let x = S1(a, b);
+        while (x.1) {
+                x = S1(x.0 - 1, x.0 >= 1);
+            }
+    }
+
+    fun assign1 (x: S1): u64 {
+        let count = 0;
+        while (x.1) {
+            let y = if (x.0 > 0) { x.0 - 1 } else { 0 };
+            x = S1(y, y >=1);
+            count = count + 1;
+        };
+        count
+    }
+
+    fun assign_chained(x: S3) {
+        x.0.0.x + x.1.x + x.2.0.x;
+        x.0.0.x = 0;
+        x.1.x = 1;
+        x.2.0.x = 2;
+    }
+
+    fun assign_enum(x: &mut E) {
+        match (x) {
+            E::V1(x, y) => {
+                *x = 42;
+                *y = true;
+            },
+            E::V2(x) => {
+                x.0.0.x = 0;
+                x.1.x = 1;
+                x.2.0.x = 2;
+            }
+        }
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/checking/positional_fields/bind_anonymous_field.exp b/third_party/move/move-compiler-v2/tests/checking/positional_fields/bind_anonymous_field.exp
new file mode 100644
index 0000000000000..09aaa32647c33
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/positional_fields/bind_anonymous_field.exp
@@ -0,0 +1,41 @@
+// -- Model dump before bytecode pipeline
+module 0x42::test {
+    enum E1 {
+        V1 {
+            0: test::S0,
+        }
+        V2 {
+            0: test::S1,
+        }
+    }
+    struct S0 {
+        0: u8,
+    }
+    struct S1 {
+        0: bool,
+        1: test::S0,
+    }
+    private fun match(x: test::E1) {
+        match (x) {
+          test::E1::V1{ 0: test::S0{ 0: _x } } => {
+            Tuple()
+          }
+          test::E1::V2{ 0: test::S1{ 0: _x, 1: test::S0{ 0: _y } } } => {
+            Tuple()
+          }
+        }
+
+    }
+    private fun nested(x: test::S1) {
+        {
+          let test::S1{ 0: _x, 1: test::S0{ 0: _y } } = x;
+          Tuple()
+        }
+    }
+    private fun simple(x: test::S0) {
+        {
+          let test::S0{ 0: _x } = x;
+          Tuple()
+        }
+    }
+} // end 0x42::test
diff --git a/third_party/move/move-compiler-v2/tests/checking/positional_fields/bind_anonymous_field.move b/third_party/move/move-compiler-v2/tests/checking/positional_fields/bind_anonymous_field.move
new file mode 100644
index 0000000000000..ffe3a80b1dece
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/positional_fields/bind_anonymous_field.move
@@ -0,0 +1,25 @@
+module 0x42::test {
+	struct S0(u8);
+
+	struct S1(bool, S0);
+
+	enum E1 {
+		V1(S0),
+		V2(S1)
+	}
+
+	fun simple(x: S0) {
+		let S0(_x) = x;
+	}
+
+	fun nested(x: S1) {
+		let S1(_x, S0(_y)) = x;
+	}
+
+	fun match(x: E1) {
+		match (x) {
+			E1::V1(S0(_x)) => {},
+			E1::V2(S1(_x, S0(_y))) => {}
+		}
+	}
+}
diff --git a/third_party/move/move-compiler-v2/tests/checking/positional_fields/bind_anonymous_field_invalid.exp b/third_party/move/move-compiler-v2/tests/checking/positional_fields/bind_anonymous_field_invalid.exp
new file mode 100644
index 0000000000000..e7ee76f3d591d
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/positional_fields/bind_anonymous_field_invalid.exp
@@ -0,0 +1,31 @@
+
+Diagnostics:
+error: missing field `0`
+   ┌─ tests/checking/positional_fields/bind_anonymous_field_invalid.move:12:7
+   │
+12 │         let S0() = x;
+   │             ^^^^
+
+error: field `1` not declared in `test::S0`
+   ┌─ tests/checking/positional_fields/bind_anonymous_field_invalid.move:16:14
+   │
+16 │         let S0(_x, _y) = x;
+   │                    ^^
+
+error: field `1` not declared in `test::S0`
+   ┌─ tests/checking/positional_fields/bind_anonymous_field_invalid.move:20:21
+   │
+20 │         let S1(_x, S0(_y, _z)) = x;
+   │                           ^^
+
+error: field `1` not declared in `test::S0`
+   ┌─ tests/checking/positional_fields/bind_anonymous_field_invalid.move:26:18
+   │
+26 │             E1::V1(S0(_x, _y)) => {},
+   │                           ^^
+
+error: field `1` not declared in `test::S0`
+   ┌─ tests/checking/positional_fields/bind_anonymous_field_invalid.move:27:25
+   │
+27 │             E1::V2(S1(_x, S0(_y, _z))) => {}
+   │                                  ^^
diff --git a/third_party/move/move-compiler-v2/tests/checking/positional_fields/bind_anonymous_field_invalid.move b/third_party/move/move-compiler-v2/tests/checking/positional_fields/bind_anonymous_field_invalid.move
new file mode 100644
index 0000000000000..0dc3fe6ab5603
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/positional_fields/bind_anonymous_field_invalid.move
@@ -0,0 +1,30 @@
+module 0x42::test {
+	struct S0(u8);
+
+	struct S1(bool, S0);
+
+	enum E1 {
+		V1(S0),
+		V2(S1)
+	}
+
+	fun simple_arity_mismatch1(x: S0) {
+		let S0() = x;
+	}
+
+	fun simple_arity_mismatch2(x: S0) {
+		let S0(_x, _y) = x;
+	}
+
+	fun nested_arity_mismatch(x: S1) {
+		let S1(_x, S0(_y, _z)) = x;
+	}
+
+	fun match_invalid(x: E1) {
+		match (x) {
+			E1::V1(S0(_)) => {},
+			E1::V1(S0(_x, _y)) => {},
+			E1::V2(S1(_x, S0(_y, _z))) => {}
+		}
+	}
+}
diff --git a/third_party/move/move-compiler-v2/tests/checking/positional_fields/common_access.exp b/third_party/move/move-compiler-v2/tests/checking/positional_fields/common_access.exp
new file mode 100644
index 0000000000000..b0f4b0957c213
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/positional_fields/common_access.exp
@@ -0,0 +1,14 @@
+// -- Model dump before bytecode pipeline
+module 0x42::test {
+    enum Foo {
+        A {
+            0: u8,
+        }
+        B {
+            0: u8,
+        }
+    }
+    private fun common_access(x: test::Foo): u8 {
+        select_variants test::Foo.A.0|test::Foo.B.0<test::Foo>(x)
+    }
+} // end 0x42::test
diff --git a/third_party/move/move-compiler-v2/tests/checking/positional_fields/common_access.move b/third_party/move/move-compiler-v2/tests/checking/positional_fields/common_access.move
new file mode 100644
index 0000000000000..cfdeb0c36713e
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/positional_fields/common_access.move
@@ -0,0 +1,10 @@
+module 0x42::test {
+    enum Foo has drop {
+        A(u8),
+        B(u8),
+    }
+
+    fun common_access(x: Foo): u8 {
+        x.0
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/checking/positional_fields/constructor_invalid0.exp b/third_party/move/move-compiler-v2/tests/checking/positional_fields/constructor_invalid0.exp
new file mode 100644
index 0000000000000..fe7f9012bd1c1
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/positional_fields/constructor_invalid0.exp
@@ -0,0 +1,10 @@
+
+Diagnostics:
+error: unexpected token
+  ┌─ tests/checking/positional_fields/constructor_invalid0.move:5:13
+  │
+5 │         S { 0: 42, 1: 42 };
+  │             ^
+  │             │
+  │             Unexpected '0'
+  │             Expected an identifier
diff --git a/third_party/move/move-compiler-v2/tests/checking/positional_fields/constructor_invalid0.move b/third_party/move/move-compiler-v2/tests/checking/positional_fields/constructor_invalid0.move
new file mode 100644
index 0000000000000..addec28562504
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/positional_fields/constructor_invalid0.move
@@ -0,0 +1,7 @@
+module 0x42::test {
+    struct S(u8, bool);
+
+    fun foo() {
+        S { 0: 42, 1: 42 };
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/checking/positional_fields/constructor_invalid1.exp b/third_party/move/move-compiler-v2/tests/checking/positional_fields/constructor_invalid1.exp
new file mode 100644
index 0000000000000..f898cbe765d50
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/positional_fields/constructor_invalid1.exp
@@ -0,0 +1,7 @@
+
+Diagnostics:
+error: expected positional constructor `test::S(..)` for struct `test::S`
+  ┌─ tests/checking/positional_fields/constructor_invalid1.move:5:9
+  │
+5 │         S { _0: 42, _1: 42 };
+  │         ^^^^^^^^^^^^^^^^^^^^
diff --git a/third_party/move/move-compiler-v2/tests/checking/positional_fields/constructor_invalid1.move b/third_party/move/move-compiler-v2/tests/checking/positional_fields/constructor_invalid1.move
new file mode 100644
index 0000000000000..8ff1c9c034e99
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/positional_fields/constructor_invalid1.move
@@ -0,0 +1,7 @@
+module 0x42::test {
+    struct S(u8, bool);
+
+    fun foo() {
+        S { _0: 42, _1: 42 };
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/checking/positional_fields/decl_invalid.exp b/third_party/move/move-compiler-v2/tests/checking/positional_fields/decl_invalid.exp
new file mode 100644
index 0000000000000..15a3a62903f47
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/positional_fields/decl_invalid.exp
@@ -0,0 +1,9 @@
+
+Diagnostics:
+error: reference type `&u8` is not allowed as a field type
+  ┌─ tests/checking/positional_fields/decl_invalid.move:2:11
+  │
+2 │     struct S(&u8);
+  │              ^^^
+  │
+  = required by declaration of field `0`
diff --git a/third_party/move/move-compiler-v2/tests/checking/positional_fields/decl_invalid.move b/third_party/move/move-compiler-v2/tests/checking/positional_fields/decl_invalid.move
new file mode 100644
index 0000000000000..033ba8c028858
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/positional_fields/decl_invalid.move
@@ -0,0 +1,3 @@
+module 0x42::test {
+	struct S(&u8);
+}
diff --git a/third_party/move/move-compiler-v2/tests/checking/positional_fields/decl_ok.exp b/third_party/move/move-compiler-v2/tests/checking/positional_fields/decl_ok.exp
new file mode 100644
index 0000000000000..5280e3ddd0a51
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/positional_fields/decl_ok.exp
@@ -0,0 +1,38 @@
+// -- Model dump before bytecode pipeline
+module 0x42::test {
+    enum E1 {
+        V1,
+        V2,
+        V3 {
+            0: u8,
+            1: bool,
+        }
+    }
+    struct S1 {
+        dummy_field: bool,
+    }
+    struct S2 {
+        0: u8,
+        1: bool,
+    }
+    struct S3 {
+        0: #1,
+        1: u8,
+        2: #0,
+    }
+    private fun bar(x: test::S2) {
+        select test::S2.0<test::S2>(x);
+        Tuple()
+    }
+    private fun baz() {
+        pack test::E1::V1();
+        pack test::E1::V2();
+        pack test::E1::V3(42, true);
+        Tuple()
+    }
+    private fun foo(x: test::S2) {
+        select test::S2.0<test::S2>(x);
+        select test::S2.1<test::S2>(x);
+        Tuple()
+    }
+} // end 0x42::test
diff --git a/third_party/move/move-compiler-v2/tests/checking/positional_fields/decl_ok.move b/third_party/move/move-compiler-v2/tests/checking/positional_fields/decl_ok.move
new file mode 100644
index 0000000000000..83aa23ebf0e96
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/positional_fields/decl_ok.move
@@ -0,0 +1,28 @@
+module 0x42::test {
+    struct S1();
+
+    struct S2(u8, bool);
+
+    struct S3<T1, T2>(T2, u8, T1);
+
+    enum E1 {
+        V1,
+        V2(),
+        V3(u8, bool)
+    }
+
+    fun foo(x : S2) {
+        x.0;
+        x.1;
+    }
+
+    fun bar(x : S2) {
+        x.0;
+    }
+
+    fun baz() {
+        E1::V1 {};
+        E1::V2();
+        E1::V3(42, true);
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/checking/positional_fields/invalid_anonymous_field1.exp b/third_party/move/move-compiler-v2/tests/checking/positional_fields/invalid_anonymous_field1.exp
new file mode 100644
index 0000000000000..c2d0a943bf143
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/positional_fields/invalid_anonymous_field1.exp
@@ -0,0 +1,10 @@
+
+Diagnostics:
+error: unexpected token
+  ┌─ tests/checking/positional_fields/invalid_anonymous_field1.move:5:11
+  │
+5 │         x.0x42;
+  │           ^^^^
+  │           │
+  │           Unexpected '0x42'
+  │           Expected an identifier or a positional field `0`, `1`, ...
diff --git a/third_party/move/move-compiler-v2/tests/checking/positional_fields/invalid_anonymous_field1.move b/third_party/move/move-compiler-v2/tests/checking/positional_fields/invalid_anonymous_field1.move
new file mode 100644
index 0000000000000..4a6c1ec451575
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/positional_fields/invalid_anonymous_field1.move
@@ -0,0 +1,7 @@
+module 0x42::test {
+    struct S(u8);
+
+    fun foo(x: S) {
+        x.0x42;
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/checking/positional_fields/invalid_anonymous_field2.exp b/third_party/move/move-compiler-v2/tests/checking/positional_fields/invalid_anonymous_field2.exp
new file mode 100644
index 0000000000000..47286152a75a1
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/positional_fields/invalid_anonymous_field2.exp
@@ -0,0 +1,10 @@
+
+Diagnostics:
+error: unexpected token
+  ┌─ tests/checking/positional_fields/invalid_anonymous_field2.move:5:11
+  │
+5 │         x.0u8;
+  │           ^^^
+  │           │
+  │           Unexpected '0u8'
+  │           Expected an identifier or a positional field `0`, `1`, ...
diff --git a/third_party/move/move-compiler-v2/tests/checking/positional_fields/invalid_anonymous_field2.move b/third_party/move/move-compiler-v2/tests/checking/positional_fields/invalid_anonymous_field2.move
new file mode 100644
index 0000000000000..29aee36b87c40
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/positional_fields/invalid_anonymous_field2.move
@@ -0,0 +1,7 @@
+module 0x42::test {
+    struct S(u8);
+
+    fun foo(x: S) {
+        x.0u8;
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/checking/positional_fields/invalid_anonymous_field3.exp b/third_party/move/move-compiler-v2/tests/checking/positional_fields/invalid_anonymous_field3.exp
new file mode 100644
index 0000000000000..72d8aa0acef34
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/positional_fields/invalid_anonymous_field3.exp
@@ -0,0 +1,7 @@
+
+Diagnostics:
+error: field `1` not declared in struct `S`
+  ┌─ tests/checking/positional_fields/invalid_anonymous_field3.move:5:9
+  │
+5 │         x.1;
+  │         ^
diff --git a/third_party/move/move-compiler-v2/tests/checking/positional_fields/invalid_anonymous_field3.move b/third_party/move/move-compiler-v2/tests/checking/positional_fields/invalid_anonymous_field3.move
new file mode 100644
index 0000000000000..642b7b1c6a54d
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/positional_fields/invalid_anonymous_field3.move
@@ -0,0 +1,7 @@
+module 0x42::test {
+    struct S(u8);
+
+    fun foo(x: S) {
+        x.1;
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/checking/positional_fields/invalid_common_access.exp b/third_party/move/move-compiler-v2/tests/checking/positional_fields/invalid_common_access.exp
new file mode 100644
index 0000000000000..7a7be47987f90
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/positional_fields/invalid_common_access.exp
@@ -0,0 +1,9 @@
+
+Diagnostics:
+error: cannot select field `1` since it has different types in variants of enum `Foo`
+  ┌─ tests/checking/positional_fields/invalid_common_access.move:8:9
+  │
+8 │         x.1
+  │         ^
+  │
+  = field `1` has type `u8` in variant `B` and type `bool` in variant `A`
diff --git a/third_party/move/move-compiler-v2/tests/checking/positional_fields/invalid_common_access.move b/third_party/move/move-compiler-v2/tests/checking/positional_fields/invalid_common_access.move
new file mode 100644
index 0000000000000..da7451bd248f2
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/positional_fields/invalid_common_access.move
@@ -0,0 +1,10 @@
+module 0x42::test {
+    enum Foo has drop {
+        A(u8, bool),
+        B(u8, u8),
+    }
+
+    fun common_access(x: Foo): u8 {
+        x.1
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/checking/positional_fields/named_tuple_ability_decl_invalid1.exp b/third_party/move/move-compiler-v2/tests/checking/positional_fields/named_tuple_ability_decl_invalid1.exp
new file mode 100644
index 0000000000000..6656bb2107168
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/positional_fields/named_tuple_ability_decl_invalid1.exp
@@ -0,0 +1,10 @@
+
+Diagnostics:
+error: unexpected token
+  ┌─ tests/checking/positional_fields/named_tuple_ability_decl_invalid1.move:2:23
+  │
+2 │     struct S has copy ();
+  │                       ^
+  │                       │
+  │                       Unexpected '('
+  │                       Expected one of: ',', '{', or ';'
diff --git a/third_party/move/move-compiler-v2/tests/checking/positional_fields/named_tuple_ability_decl_invalid1.move b/third_party/move/move-compiler-v2/tests/checking/positional_fields/named_tuple_ability_decl_invalid1.move
new file mode 100644
index 0000000000000..508440239fc63
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/positional_fields/named_tuple_ability_decl_invalid1.move
@@ -0,0 +1,3 @@
+module 0x42::test {
+    struct S has copy ();
+}
diff --git a/third_party/move/move-compiler-v2/tests/checking/positional_fields/named_tuple_ability_decl_invalid2.exp b/third_party/move/move-compiler-v2/tests/checking/positional_fields/named_tuple_ability_decl_invalid2.exp
new file mode 100644
index 0000000000000..3ddf758fd5766
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/positional_fields/named_tuple_ability_decl_invalid2.exp
@@ -0,0 +1,10 @@
+
+Diagnostics:
+error: unexpected token
+  ┌─ tests/checking/positional_fields/named_tuple_ability_decl_invalid2.move:2:19
+  │
+2 │     struct S has copy;
+  │                      ^
+  │                      │
+  │                      Unexpected ';'
+  │                      Expected '{'
diff --git a/third_party/move/move-compiler-v2/tests/checking/positional_fields/named_tuple_ability_decl_invalid2.move b/third_party/move/move-compiler-v2/tests/checking/positional_fields/named_tuple_ability_decl_invalid2.move
new file mode 100644
index 0000000000000..94beb521d8eb4
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/positional_fields/named_tuple_ability_decl_invalid2.move
@@ -0,0 +1,3 @@
+module 0x42::test {
+	struct S has copy;
+}
diff --git a/third_party/move/move-compiler-v2/tests/checking/positional_fields/named_tuple_ability_decl_ok.exp b/third_party/move/move-compiler-v2/tests/checking/positional_fields/named_tuple_ability_decl_ok.exp
new file mode 100644
index 0000000000000..3271dea2b7566
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/positional_fields/named_tuple_ability_decl_ok.exp
@@ -0,0 +1,28 @@
+// -- Model dump before bytecode pipeline
+module 0x42::test {
+    struct S {
+        dummy_field: bool,
+    }
+    struct S1 {
+        0: u8,
+    }
+    struct S2 {
+        0: #0,
+        1: u8,
+    }
+    struct S3 {
+        0: #0,
+        1: u8,
+    }
+    struct S4 {
+        x: u8,
+        y: #0,
+    }
+    struct S5 {
+        0: #0,
+        1: test::S3<#0>,
+    }
+    struct S6 {
+        dummy_field: bool,
+    }
+} // end 0x42::test
diff --git a/third_party/move/move-compiler-v2/tests/checking/positional_fields/named_tuple_ability_decl_ok.move b/third_party/move/move-compiler-v2/tests/checking/positional_fields/named_tuple_ability_decl_ok.move
new file mode 100644
index 0000000000000..e215df6ba5eef
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/positional_fields/named_tuple_ability_decl_ok.move
@@ -0,0 +1,18 @@
+module 0x42::test {
+    struct S() has copy, key;
+
+    struct S1(u8) has drop;
+
+    struct S2<T>(T, u8) has key;
+
+    struct S3<T: key>(T, u8) has key;
+
+    struct S4<T: key> has drop {
+        x: u8,
+        y: T,
+    }
+
+    struct S5<T: copy + key>(T, S3<T>) has key;
+
+    struct S6<phantom T: store>();
+}
diff --git a/third_party/move/move-compiler-v2/tests/checking/positional_fields/named_tuple_construct_invalid.exp b/third_party/move/move-compiler-v2/tests/checking/positional_fields/named_tuple_construct_invalid.exp
new file mode 100644
index 0000000000000..bf38901a5630b
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/positional_fields/named_tuple_construct_invalid.exp
@@ -0,0 +1,79 @@
+
+Diagnostics:
+error: missing field `0`
+   ┌─ tests/checking/positional_fields/named_tuple_construct_invalid.move:18:9
+   │
+18 │         S1()
+   │         ^^^^
+
+error: field `1` not declared in `test::S1`
+   ┌─ tests/checking/positional_fields/named_tuple_construct_invalid.move:22:15
+   │
+22 │         S1(0, 1)
+   │               ^
+
+error: missing fields `0`, `1`
+   ┌─ tests/checking/positional_fields/named_tuple_construct_invalid.move:26:9
+   │
+26 │         S2();
+   │         ^^^^
+
+error: missing field `1`
+   ┌─ tests/checking/positional_fields/named_tuple_construct_invalid.move:27:9
+   │
+27 │         S2(1);
+   │         ^^^^^
+
+error: field `2` not declared in `test::S2`
+   ┌─ tests/checking/positional_fields/named_tuple_construct_invalid.move:28:22
+   │
+28 │         S2(1, false, 2);
+   │                      ^
+
+error: field `0` not declared in `test::S0`
+   ┌─ tests/checking/positional_fields/named_tuple_construct_invalid.move:32:12
+   │
+32 │         S0(false);
+   │            ^^^^^
+
+error: expected `u8` but found a value of type `address`
+   ┌─ tests/checking/positional_fields/named_tuple_construct_invalid.move:33:12
+   │
+33 │         S1(@0x42);
+   │            ^^^^^
+
+error: expected `u8` but found a value of type `()`
+   ┌─ tests/checking/positional_fields/named_tuple_construct_invalid.move:34:12
+   │
+34 │         S2((), 1);
+   │            ^^
+
+error: expected `bool` but found a value of type `integer`
+   ┌─ tests/checking/positional_fields/named_tuple_construct_invalid.move:34:16
+   │
+34 │         S2((), 1);
+   │                ^
+
+error: expected struct constructor `test::Unit { .. }` for struct `test::Unit`
+   ┌─ tests/checking/positional_fields/named_tuple_construct_invalid.move:38:9
+   │
+38 │         Unit();
+   │         ^^^^^^
+
+error: expected struct constructor `test::E::V1 { .. }` for struct variant `test::E`
+   ┌─ tests/checking/positional_fields/named_tuple_construct_invalid.move:39:9
+   │
+39 │         E::V1();
+   │         ^^^^^^^
+
+error: expected struct constructor `test::E::V2 { .. }` for struct variant `test::E`
+   ┌─ tests/checking/positional_fields/named_tuple_construct_invalid.move:40:9
+   │
+40 │         E::V2();
+   │         ^^^^^^^
+
+error: expected positional constructor `test::E::V3(..)` for struct variant `test::E`
+   ┌─ tests/checking/positional_fields/named_tuple_construct_invalid.move:41:9
+   │
+41 │         E::V3 {};
+   │         ^^^^^^^^
diff --git a/third_party/move/move-compiler-v2/tests/checking/positional_fields/named_tuple_construct_invalid.move b/third_party/move/move-compiler-v2/tests/checking/positional_fields/named_tuple_construct_invalid.move
new file mode 100644
index 0000000000000..d744b6fd0a7c4
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/positional_fields/named_tuple_construct_invalid.move
@@ -0,0 +1,43 @@
+module 0x42::test {
+    struct S0();
+
+    struct S1(u8);
+
+    struct S2(u8, bool);
+
+    struct Unit {}
+
+    enum E {
+        V1,
+        V2 {},
+        V3(),
+
+    }
+
+    fun arity_mismatch_0(): S1 {
+        S1()
+    }
+
+    fun arity_mismatch1(): S1 {
+        S1(0, 1)
+    }
+
+    fun arity_mismatch2() {
+        S2();
+        S2(1);
+        S2(1, false, 2);
+    }
+
+    fun type_mismatch() {
+        S0(false);
+        S1(@0x42);
+        S2((), 1);
+    }
+
+    fun unit_constructor() {
+        Unit();
+        E::V1();
+        E::V2();
+        E::V3 {};
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/checking/positional_fields/named_tuple_construct_ok.exp b/third_party/move/move-compiler-v2/tests/checking/positional_fields/named_tuple_construct_ok.exp
new file mode 100644
index 0000000000000..c56d7f9c7a5c1
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/positional_fields/named_tuple_construct_ok.exp
@@ -0,0 +1,56 @@
+// -- Model dump before bytecode pipeline
+module 0x42::test {
+    enum E1 {
+        V1,
+        V2,
+        V3 {
+            0: u8,
+            1: bool,
+        }
+    }
+    struct S0 {
+        dummy_field: bool,
+    }
+    struct S1 {
+        0: u8,
+    }
+    struct S2 {
+        0: u8,
+        1: bool,
+    }
+    struct S3 {
+        0: #0,
+        1: u8,
+    }
+    struct S4 {
+        dummy_field: bool,
+    }
+    struct S5 {
+        x: #0,
+        y: u8,
+    }
+    private fun S0_inhabited(): test::S0 {
+        pack test::S0(false)
+    }
+    private fun S1_inhabited(): test::S1 {
+        pack test::S1(0)
+    }
+    private fun S2_inhabited(): test::S2 {
+        pack test::S2(0, false)
+    }
+    private fun S3_test<T>(x: #0): test::S3<#0> {
+        pack test::S3<T>(x, 0)
+    }
+    private fun nested_0(): test::S3<test::S4> {
+        pack test::S3<test::S4>(pack test::S4(false), 0)
+    }
+    private fun nested_1(): test::S5<test::S0> {
+        pack test::S5<test::S0>(pack test::S0(false), 0)
+    }
+    private fun test_variant() {
+        pack test::E1::V1();
+        pack test::E1::V2();
+        pack test::E1::V3(42, true);
+        Tuple()
+    }
+} // end 0x42::test
diff --git a/third_party/move/move-compiler-v2/tests/checking/positional_fields/named_tuple_construct_ok.move b/third_party/move/move-compiler-v2/tests/checking/positional_fields/named_tuple_construct_ok.move
new file mode 100644
index 0000000000000..eae1c39418e06
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/positional_fields/named_tuple_construct_ok.move
@@ -0,0 +1,55 @@
+module 0x42::test {
+    struct S0();
+
+    struct S1(u8);
+
+    struct S2(u8, bool);
+
+    struct S3<T>(T, u8);
+
+    struct S4 {}
+
+    struct S5<T> {
+        x: T,
+        y: u8
+    }
+
+    enum E1 {
+        V1,
+        V2(),
+        V3(u8, bool)
+    }
+
+    fun S0_inhabited(): S0 {
+        S0()
+    }
+
+    fun S1_inhabited(): S1 {
+        S1(0)
+    }
+
+    fun S2_inhabited(): S2 {
+        S2(0, false)
+    }
+
+    fun S3_test<T>(x: T): S3<T> {
+        S3(x, 0)
+    }
+
+    fun nested_0(): S3<S4> {
+        S3(S4 {}, 0)
+    }
+
+    fun nested_1(): S5<S0> {
+        S5<S0> {
+            x: S0(),
+            y: 0
+        }
+    }
+
+    fun test_variant() {
+        E1::V1 {};
+        E1::V2();
+        E1::V3(42, true);
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/checking/positional_fields/struct_duplicate_ability_decls.exp b/third_party/move/move-compiler-v2/tests/checking/positional_fields/struct_duplicate_ability_decls.exp
new file mode 100644
index 0000000000000..ebc30cd7ea38d
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/positional_fields/struct_duplicate_ability_decls.exp
@@ -0,0 +1,13 @@
+
+Diagnostics:
+error: invalid modifier
+  ┌─ tests/checking/positional_fields/struct_duplicate_ability_decls.move:2:27
+  │
+2 │     struct S has copy {} has copy;
+  │                              ^^^^ Conflicting ability declarations. Abilities must be declared either before or after the variant list, not both.
+
+error: invalid modifier
+  ┌─ tests/checking/positional_fields/struct_duplicate_ability_decls.move:4:36
+  │
+4 │     struct T<T> has copy { x: T } has drop;
+  │                                       ^^^^ Conflicting ability declarations. Abilities must be declared either before or after the variant list, not both.
diff --git a/third_party/move/move-compiler-v2/tests/checking/positional_fields/struct_duplicate_ability_decls.move b/third_party/move/move-compiler-v2/tests/checking/positional_fields/struct_duplicate_ability_decls.move
new file mode 100644
index 0000000000000..a6aba746316fd
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/positional_fields/struct_duplicate_ability_decls.move
@@ -0,0 +1,5 @@
+module 0x42::test {
+	struct S has copy {} has copy;
+
+	struct T<T> has copy { x: T } has drop;
+}
diff --git a/third_party/move/move-compiler-v2/tests/checking/positional_fields/struct_postfix_ability_decl.exp b/third_party/move/move-compiler-v2/tests/checking/positional_fields/struct_postfix_ability_decl.exp
new file mode 100644
index 0000000000000..f540d5326c337
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/positional_fields/struct_postfix_ability_decl.exp
@@ -0,0 +1,9 @@
+
+Diagnostics:
+error: type `S` is missing required ability `drop`
+  ┌─ tests/checking/positional_fields/struct_postfix_ability_decl.move:4:28
+  │
+4 │     struct T<T> { x: T, y: S } has drop;
+  │                            ^
+  │
+  = required by declaration of field `y`
diff --git a/third_party/move/move-compiler-v2/tests/checking/positional_fields/struct_postfix_ability_decl.move b/third_party/move/move-compiler-v2/tests/checking/positional_fields/struct_postfix_ability_decl.move
new file mode 100644
index 0000000000000..1c772c05941d7
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/positional_fields/struct_postfix_ability_decl.move
@@ -0,0 +1,5 @@
+module 0x42::test {
+    struct S {} has copy;
+
+    struct T<T> { x: T, y: S } has drop;
+}
diff --git a/third_party/move/move-compiler-v2/tests/checking/positional_fields/struct_postfix_ability_decl_invalid.exp b/third_party/move/move-compiler-v2/tests/checking/positional_fields/struct_postfix_ability_decl_invalid.exp
new file mode 100644
index 0000000000000..9ad649d7c95f4
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/positional_fields/struct_postfix_ability_decl_invalid.exp
@@ -0,0 +1,10 @@
+
+Diagnostics:
+error: unexpected token
+  ┌─ tests/checking/positional_fields/struct_postfix_ability_decl_invalid.move:2:25
+  │
+2 │     struct S has drop {};
+  │                         ^
+  │                         │
+  │                         Unexpected ';'
+  │                         Expected a module member: 'spec', 'use', 'friend', 'const', 'fun', 'inline', or 'struct'
diff --git a/third_party/move/move-compiler-v2/tests/checking/positional_fields/struct_postfix_ability_decl_invalid.move b/third_party/move/move-compiler-v2/tests/checking/positional_fields/struct_postfix_ability_decl_invalid.move
new file mode 100644
index 0000000000000..b0f5c76e03d14
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/positional_fields/struct_postfix_ability_decl_invalid.move
@@ -0,0 +1,3 @@
+module 0x42::test {
+    struct S has drop {};
+}
diff --git a/third_party/move/move-compiler-v2/tests/checking/positional_fields/variant_ability_decl_ok.exp b/third_party/move/move-compiler-v2/tests/checking/positional_fields/variant_ability_decl_ok.exp
new file mode 100644
index 0000000000000..2b5cb1622dfa7
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/positional_fields/variant_ability_decl_ok.exp
@@ -0,0 +1,21 @@
+// -- Model dump before bytecode pipeline
+module 0x42::test {
+    enum Bar {
+        A {
+            0: #0,
+        }
+        B {
+            0: u8,
+            1: bool,
+        }
+    }
+    enum Foo {
+        A {
+            0: #0,
+        }
+        B {
+            0: u8,
+            1: bool,
+        }
+    }
+} // end 0x42::test
diff --git a/third_party/move/move-compiler-v2/tests/checking/positional_fields/variant_ability_decl_ok.move b/third_party/move/move-compiler-v2/tests/checking/positional_fields/variant_ability_decl_ok.move
new file mode 100644
index 0000000000000..8bb0e04e8f8c9
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/positional_fields/variant_ability_decl_ok.move
@@ -0,0 +1,11 @@
+module 0x42::test {
+    enum Foo<T> has drop, copy {
+        A(T),
+        B(u8, bool),
+    }
+
+    enum Bar<T> {
+        A(T),
+        B(u8, bool),
+    } has drop, copy;
+}
diff --git a/third_party/move/move-compiler-v2/tests/checking/positional_fields/variant_abiliy_decl_invalid.exp b/third_party/move/move-compiler-v2/tests/checking/positional_fields/variant_abiliy_decl_invalid.exp
new file mode 100644
index 0000000000000..796891ea6b71b
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/positional_fields/variant_abiliy_decl_invalid.exp
@@ -0,0 +1,7 @@
+
+Diagnostics:
+error: invalid modifier
+  ┌─ tests/checking/positional_fields/variant_abiliy_decl_invalid.move:5:8
+  │
+5 │     } has drop, copy;
+  │           ^^^^ Conflicting ability declarations. Abilities must be declared either before or after the variant list, not both.
diff --git a/third_party/move/move-compiler-v2/tests/checking/positional_fields/variant_abiliy_decl_invalid.move b/third_party/move/move-compiler-v2/tests/checking/positional_fields/variant_abiliy_decl_invalid.move
new file mode 100644
index 0000000000000..e2934928d8748
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/positional_fields/variant_abiliy_decl_invalid.move
@@ -0,0 +1,6 @@
+module 0x42::test {
+	enum Foo<T> has drop {
+		A(T),
+		B(u8, bool),
+	} has drop, copy;
+}
diff --git a/third_party/move/move-compiler-v2/tests/checking/positional_fields/variant_decl_invalid.exp b/third_party/move/move-compiler-v2/tests/checking/positional_fields/variant_decl_invalid.exp
new file mode 100644
index 0000000000000..82f576b24234a
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/positional_fields/variant_decl_invalid.exp
@@ -0,0 +1,10 @@
+
+Diagnostics:
+error: unexpected token
+  ┌─ tests/checking/positional_fields/variant_decl_invalid.move:4:3
+  │
+4 │         Variant1()
+  │         ^^^^^^^^
+  │         │
+  │         Unexpected 'Variant1'
+  │         Expected ','
diff --git a/third_party/move/move-compiler-v2/tests/checking/positional_fields/variant_decl_invalid.move b/third_party/move/move-compiler-v2/tests/checking/positional_fields/variant_decl_invalid.move
new file mode 100644
index 0000000000000..9eaafa76ebb26
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/positional_fields/variant_decl_invalid.move
@@ -0,0 +1,6 @@
+module 0x42::test {
+	enum E {
+		Variant0(u8, bool)
+		Variant1()
+	}
+}
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/annotated_types.exp b/third_party/move/move-compiler-v2/tests/checking/typing/annotated_types.exp
index 7043502d05cac..7547136a5af2a 100644
--- a/third_party/move/move-compiler-v2/tests/checking/typing/annotated_types.exp
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/annotated_types.exp
@@ -10,8 +10,8 @@ module 0x8675309::M {
         Tuple();
         0;
         pack M::S(false);
-        M::R{ dummy_field: _ }: M::R = pack M::R(false);
-        (_, _, M::R{ dummy_field: _ }): (u64, M::S, M::R) = Tuple(0, pack M::S(false), pack M::R(false));
+        M::R{ dummy_field: _ } = pack M::R(false);
+        (_: u64, _: M::S, M::R{ dummy_field: _ }): (u64, M::S, M::R) = Tuple(0, pack M::S(false), pack M::R(false));
         Tuple()
     }
 } // end 0x8675309::M
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/assign_unpack_references.exp b/third_party/move/move-compiler-v2/tests/checking/typing/assign_unpack_references.exp
index 113c874445846..0013af0023a25 100644
--- a/third_party/move/move-compiler-v2/tests/checking/typing/assign_unpack_references.exp
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/assign_unpack_references.exp
@@ -12,7 +12,7 @@ module 0x8675309::M {
           let f: u64;
           {
             let s2: M::S;
-            M::R{ s1: M::S{ f: f: u64 }, s2: s2: M::S }: M::R = pack M::R(pack M::S(0), pack M::S(1));
+            M::R{ s1: M::S{ f }, s2 } = pack M::R(pack M::S(0), pack M::S(1));
             f;
             s2;
             f: u64 = 0;
@@ -28,7 +28,7 @@ module 0x8675309::M {
           let f: &u64;
           {
             let s2: &M::S;
-            M::R{ s1: M::S{ f: f: &u64 }, s2: s2: &M::S }: &M::R = Borrow(Immutable)(pack M::R(pack M::S(0), pack M::S(1)));
+            M::R{ s1: M::S{ f }, s2 } = Borrow(Immutable)(pack M::R(pack M::S(0), pack M::S(1)));
             f;
             s2;
             f: &u64 = Borrow(Immutable)(0);
@@ -44,7 +44,7 @@ module 0x8675309::M {
           let f: &mut u64;
           {
             let s2: &mut M::S;
-            M::R{ s1: M::S{ f: f: &mut u64 }, s2: s2: &mut M::S }: &mut M::R = Borrow(Mutable)(pack M::R(pack M::S(0), pack M::S(1)));
+            M::R{ s1: M::S{ f }, s2 } = Borrow(Mutable)(pack M::R(pack M::S(0), pack M::S(1)));
             f;
             s2;
             f: &mut u64 = Borrow(Mutable)(0);
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/bad_type_argument_arity_struct_unpack.exp b/third_party/move/move-compiler-v2/tests/checking/typing/bad_type_argument_arity_struct_unpack.exp
index dbc956ddccf4d..9593d670e3841 100644
--- a/third_party/move/move-compiler-v2/tests/checking/typing/bad_type_argument_arity_struct_unpack.exp
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/bad_type_argument_arity_struct_unpack.exp
@@ -4,7 +4,7 @@ error: expected 1 type argument but 0 were provided
   ┌─ tests/checking/typing/bad_type_argument_arity_struct_unpack.move:7:13
   │
 7 │         let S<> { f } = copy s;
-  │             ^
+  │             ^^^^^^^^^
 
 error: undeclared `f`
   ┌─ tests/checking/typing/bad_type_argument_arity_struct_unpack.move:8:9
@@ -16,7 +16,7 @@ error: expected 1 type argument but 2 were provided
   ┌─ tests/checking/typing/bad_type_argument_arity_struct_unpack.move:9:13
   │
 9 │         let S<u64, u64> { f } = copy s;
-  │             ^
+  │             ^^^^^^^^^^^^^^^^^
 
 error: undeclared `f`
    ┌─ tests/checking/typing/bad_type_argument_arity_struct_unpack.move:10:9
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/binary_add.exp b/third_party/move/move-compiler-v2/tests/checking/typing/binary_add.exp
index 9e087eb9543ed..499d07865f69a 100644
--- a/third_party/move/move-compiler-v2/tests/checking/typing/binary_add.exp
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/binary_add.exp
@@ -16,7 +16,7 @@ module 0x8675309::M {
         Add<u64>(select M::R.f<M::R>(r), select M::R.f<M::R>(r));
         Add<u64>(Add<u64>(Add<u64>(1, select M::R.f<M::R>(r)), select M::R.f<M::R>(r)), 0);
         {
-          let M::R{ f: _ }: M::R = r;
+          let M::R{ f: _ } = r;
           Tuple()
         }
     }
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/binary_and.exp b/third_party/move/move-compiler-v2/tests/checking/typing/binary_and.exp
index 32ca4b79ac6ea..dcc109892aa00 100644
--- a/third_party/move/move-compiler-v2/tests/checking/typing/binary_and.exp
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/binary_and.exp
@@ -12,7 +12,7 @@ module 0x8675309::M {
         And(select M::R.f<M::R>(r), select M::R.f<M::R>(r));
         false;
         {
-          let M::R{ f: _ }: M::R = r;
+          let M::R{ f: _ } = r;
           Tuple()
         }
     }
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/binary_bit_and.exp b/third_party/move/move-compiler-v2/tests/checking/typing/binary_bit_and.exp
index 2790687e71d0d..176d035a54ab7 100644
--- a/third_party/move/move-compiler-v2/tests/checking/typing/binary_bit_and.exp
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/binary_bit_and.exp
@@ -16,7 +16,7 @@ module 0x8675309::M {
         BitAnd<u64>(select M::R.f<M::R>(r), select M::R.f<M::R>(r));
         BitAnd<u64>(BitAnd<u64>(BitAnd<u64>(1, select M::R.f<M::R>(r)), select M::R.f<M::R>(r)), 0);
         {
-          let M::R{ f: _ }: M::R = r;
+          let M::R{ f: _ } = r;
           Tuple()
         }
     }
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/binary_bit_or.exp b/third_party/move/move-compiler-v2/tests/checking/typing/binary_bit_or.exp
index dbf054f66724d..a0dd5a3086d89 100644
--- a/third_party/move/move-compiler-v2/tests/checking/typing/binary_bit_or.exp
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/binary_bit_or.exp
@@ -16,7 +16,7 @@ module 0x8675309::M {
         BitOr<u64>(select M::R.f<M::R>(r), select M::R.f<M::R>(r));
         BitOr<u64>(BitOr<u64>(BitOr<u64>(1, select M::R.f<M::R>(r)), select M::R.f<M::R>(r)), 0);
         {
-          let M::R{ f: _ }: M::R = r;
+          let M::R{ f: _ } = r;
           Tuple()
         }
     }
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/binary_div.exp b/third_party/move/move-compiler-v2/tests/checking/typing/binary_div.exp
index ae44a168cf687..619ea3afb311a 100644
--- a/third_party/move/move-compiler-v2/tests/checking/typing/binary_div.exp
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/binary_div.exp
@@ -16,7 +16,7 @@ module 0x8675309::M {
         Div<u64>(select M::R.f<M::R>(r), select M::R.f<M::R>(r));
         Div<u64>(Div<u64>(Div<u64>(1, select M::R.f<M::R>(r)), select M::R.f<M::R>(r)), 0);
         {
-          let M::R{ f: _ }: M::R = r;
+          let M::R{ f: _ } = r;
           Tuple()
         }
     }
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/binary_geq.exp b/third_party/move/move-compiler-v2/tests/checking/typing/binary_geq.exp
index 7d908dce88634..1cb8410cde8ec 100644
--- a/third_party/move/move-compiler-v2/tests/checking/typing/binary_geq.exp
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/binary_geq.exp
@@ -16,7 +16,7 @@ module 0x8675309::M {
         Ge<u64>(select M::R.f<M::R>(r), select M::R.f<M::R>(r));
         And(Ge<u64>(1, select M::R.f<M::R>(r)), Ge<u64>(select M::R.f<M::R>(r), 0));
         {
-          let M::R{ f: _ }: M::R = r;
+          let M::R{ f: _ } = r;
           Tuple()
         }
     }
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/binary_gt.exp b/third_party/move/move-compiler-v2/tests/checking/typing/binary_gt.exp
index d20902dce81f9..550c2c2a85560 100644
--- a/third_party/move/move-compiler-v2/tests/checking/typing/binary_gt.exp
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/binary_gt.exp
@@ -16,7 +16,7 @@ module 0x8675309::M {
         Gt<u64>(select M::R.f<M::R>(r), select M::R.f<M::R>(r));
         And(Gt<u64>(1, select M::R.f<M::R>(r)), Gt<u64>(select M::R.f<M::R>(r), 0));
         {
-          let M::R{ f: _ }: M::R = r;
+          let M::R{ f: _ } = r;
           Tuple()
         }
     }
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/binary_leq.exp b/third_party/move/move-compiler-v2/tests/checking/typing/binary_leq.exp
index a638674bf270d..72c2b34c7462a 100644
--- a/third_party/move/move-compiler-v2/tests/checking/typing/binary_leq.exp
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/binary_leq.exp
@@ -16,7 +16,7 @@ module 0x8675309::M {
         Le<u64>(select M::R.f<M::R>(r), select M::R.f<M::R>(r));
         And(Le<u64>(1, select M::R.f<M::R>(r)), Le<u64>(select M::R.f<M::R>(r), 0));
         {
-          let M::R{ f: _ }: M::R = r;
+          let M::R{ f: _ } = r;
           Tuple()
         }
     }
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/binary_lt.exp b/third_party/move/move-compiler-v2/tests/checking/typing/binary_lt.exp
index 2b114f9cb3ebb..39c7c05043c27 100644
--- a/third_party/move/move-compiler-v2/tests/checking/typing/binary_lt.exp
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/binary_lt.exp
@@ -16,7 +16,7 @@ module 0x8675309::M {
         Lt<u64>(select M::R.f<M::R>(r), select M::R.f<M::R>(r));
         And(Lt<u64>(1, select M::R.f<M::R>(r)), Lt<u64>(select M::R.f<M::R>(r), 0));
         {
-          let M::R{ f: _ }: M::R = r;
+          let M::R{ f: _ } = r;
           Tuple()
         }
     }
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/binary_mod.exp b/third_party/move/move-compiler-v2/tests/checking/typing/binary_mod.exp
index 250074d80f316..354e15f5bb020 100644
--- a/third_party/move/move-compiler-v2/tests/checking/typing/binary_mod.exp
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/binary_mod.exp
@@ -16,7 +16,7 @@ module 0x8675309::M {
         Mod<u64>(select M::R.f<M::R>(r), select M::R.f<M::R>(r));
         Mod<u64>(Mod<u64>(Mod<u64>(1, select M::R.f<M::R>(r)), select M::R.f<M::R>(r)), 0);
         {
-          let M::R{ f: _ }: M::R = r;
+          let M::R{ f: _ } = r;
           Tuple()
         }
     }
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/binary_mul.exp b/third_party/move/move-compiler-v2/tests/checking/typing/binary_mul.exp
index 433d904698cde..061c338dc982b 100644
--- a/third_party/move/move-compiler-v2/tests/checking/typing/binary_mul.exp
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/binary_mul.exp
@@ -16,7 +16,7 @@ module 0x8675309::M {
         Mul<u64>(select M::R.f<M::R>(r), select M::R.f<M::R>(r));
         Mul<u64>(Mul<u64>(Mul<u64>(1, select M::R.f<M::R>(r)), select M::R.f<M::R>(r)), 0);
         {
-          let M::R{ f: _ }: M::R = r;
+          let M::R{ f: _ } = r;
           Tuple()
         }
     }
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/binary_or.exp b/third_party/move/move-compiler-v2/tests/checking/typing/binary_or.exp
index 454508a1be28d..ba12114e3fabb 100644
--- a/third_party/move/move-compiler-v2/tests/checking/typing/binary_or.exp
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/binary_or.exp
@@ -12,7 +12,7 @@ module 0x8675309::M {
         Or(select M::R.f<M::R>(r), select M::R.f<M::R>(r));
         true;
         {
-          let M::R{ f: _ }: M::R = r;
+          let M::R{ f: _ } = r;
           Tuple()
         }
     }
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/binary_shl.exp b/third_party/move/move-compiler-v2/tests/checking/typing/binary_shl.exp
index 5b13887916dc0..d5774d480eedc 100644
--- a/third_party/move/move-compiler-v2/tests/checking/typing/binary_shl.exp
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/binary_shl.exp
@@ -15,6 +15,6 @@ module 0x8675309::M {
         Shl<u64>(Copy(x), Copy(b));
         Shl<u64>(select M::R.f<M::R>(r), select M::R.b<M::R>(r));
         Shl<u64>(Shl<u64>(Shl<u64>(1, select M::R.b<M::R>(r)), select M::R.b<M::R>(r)), 0);
-        M::R{ f: _, b: _ }: M::R = r
+        M::R{ f: _, b: _ } = r
     }
 } // end 0x8675309::M
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/binary_shr.exp b/third_party/move/move-compiler-v2/tests/checking/typing/binary_shr.exp
index 0de2faf0e9406..9f84205f4b470 100644
--- a/third_party/move/move-compiler-v2/tests/checking/typing/binary_shr.exp
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/binary_shr.exp
@@ -15,6 +15,6 @@ module 0x8675309::M {
         Shr<u64>(Copy(x), Copy(b));
         Shr<u64>(select M::R.f<M::R>(r), select M::R.b<M::R>(r));
         Shr<u64>(Shr<u64>(Shr<u64>(1, select M::R.b<M::R>(r)), select M::R.b<M::R>(r)), 0);
-        M::R{ f: _, b: _ }: M::R = r
+        M::R{ f: _, b: _ } = r
     }
 } // end 0x8675309::M
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/binary_sub.exp b/third_party/move/move-compiler-v2/tests/checking/typing/binary_sub.exp
index 8389a80b3c605..7165eb499e522 100644
--- a/third_party/move/move-compiler-v2/tests/checking/typing/binary_sub.exp
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/binary_sub.exp
@@ -16,7 +16,7 @@ module 0x8675309::M {
         Sub<u64>(select M::R.f<M::R>(r), select M::R.f<M::R>(r));
         Sub<u64>(Sub<u64>(Sub<u64>(1, select M::R.f<M::R>(r)), select M::R.f<M::R>(r)), 0);
         {
-          let M::R{ f: _ }: M::R = r;
+          let M::R{ f: _ } = r;
           Tuple()
         }
     }
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/binary_xor.exp b/third_party/move/move-compiler-v2/tests/checking/typing/binary_xor.exp
index 254f493239fbf..e0ca221882df9 100644
--- a/third_party/move/move-compiler-v2/tests/checking/typing/binary_xor.exp
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/binary_xor.exp
@@ -16,7 +16,7 @@ module 0x8675309::M {
         Xor<u64>(select M::R.f<M::R>(r), select M::R.f<M::R>(r));
         Xor<u64>(Xor<u64>(Xor<u64>(1, select M::R.f<M::R>(r)), select M::R.f<M::R>(r)), 0);
         {
-          let M::R{ f: _ }: M::R = r;
+          let M::R{ f: _ } = r;
           Tuple()
         }
     }
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/bind_unpack_references.exp b/third_party/move/move-compiler-v2/tests/checking/typing/bind_unpack_references.exp
index db76d4d023d61..8a20a43e515fb 100644
--- a/third_party/move/move-compiler-v2/tests/checking/typing/bind_unpack_references.exp
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/bind_unpack_references.exp
@@ -9,7 +9,7 @@ module 0x8675309::M {
     }
     private fun t0() {
         {
-          let M::R{ s1: M::S{ f: f: u64 }, s2: s2: M::S }: M::R = pack M::R(pack M::S(0), pack M::S(1));
+          let M::R{ s1: M::S{ f }, s2 } = pack M::R(pack M::S(0), pack M::S(1));
           f;
           s2;
           f: u64 = 0;
@@ -21,7 +21,7 @@ module 0x8675309::M {
     }
     private fun t1() {
         {
-          let M::R{ s1: M::S{ f: f: &u64 }, s2: s2: &M::S }: &M::R = Borrow(Immutable)(pack M::R(pack M::S(0), pack M::S(1)));
+          let M::R{ s1: M::S{ f }, s2 } = Borrow(Immutable)(pack M::R(pack M::S(0), pack M::S(1)));
           f;
           s2;
           f: &u64 = Borrow(Immutable)(0);
@@ -33,7 +33,7 @@ module 0x8675309::M {
     }
     private fun t2() {
         {
-          let M::R{ s1: M::S{ f: f: &mut u64 }, s2: s2: &mut M::S }: &mut M::R = Borrow(Mutable)(pack M::R(pack M::S(0), pack M::S(1)));
+          let M::R{ s1: M::S{ f }, s2 } = Borrow(Mutable)(pack M::R(pack M::S(0), pack M::S(1)));
           f;
           s2;
           f: &mut u64 = Borrow(Mutable)(0);
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/bind_with_type_annot.exp b/third_party/move/move-compiler-v2/tests/checking/typing/bind_with_type_annot.exp
index b1f83a37dd8ff..76be5734e6def 100644
--- a/third_party/move/move-compiler-v2/tests/checking/typing/bind_with_type_annot.exp
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/bind_with_type_annot.exp
@@ -6,7 +6,7 @@ module 0x8675309::M {
     private fun t0() {
         0;
         {
-          let (x: u64, b: bool, M::R{ f: f: u64 }): (u64, bool, M::R) = Tuple(0, false, pack M::R(0));
+          let (x: u64, b: bool, M::R{ f }): (u64, bool, M::R) = Tuple(0, false, pack M::R(0));
           0;
           false;
           0;
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/block_single_expr.exp b/third_party/move/move-compiler-v2/tests/checking/typing/block_single_expr.exp
index d95820b32500b..d443f1578d571 100644
--- a/third_party/move/move-compiler-v2/tests/checking/typing/block_single_expr.exp
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/block_single_expr.exp
@@ -7,7 +7,7 @@ module 0x8675309::M {
         0;
         Borrow(Immutable)(0);
         Borrow(Mutable)(0);
-        M::R{ dummy_field: _ }: M::R = pack M::R(false);
+        M::R{ dummy_field: _ } = pack M::R(false);
         Tuple(0, false);
         Tuple()
     }
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/block_with_statements.exp b/third_party/move/move-compiler-v2/tests/checking/typing/block_with_statements.exp
index 49da61a60044d..ab55de9be63c6 100644
--- a/third_party/move/move-compiler-v2/tests/checking/typing/block_with_statements.exp
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/block_with_statements.exp
@@ -7,7 +7,7 @@ module 0x8675309::M {
         0;
         Borrow(Immutable)(0);
         Borrow(Mutable)(1);
-        M::R{ dummy_field: _ }: M::R = {
+        M::R{ dummy_field: _ } = {
           let r: M::R = {
             let r: M::R = pack M::R(false);
             r
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/break_any_type.exp b/third_party/move/move-compiler-v2/tests/checking/typing/break_any_type.exp
index 83c13df9c03f2..cd7b6720f3e26 100644
--- a/third_party/move/move-compiler-v2/tests/checking/typing/break_any_type.exp
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/break_any_type.exp
@@ -4,7 +4,7 @@ module 0x8675309::M {
         dummy_field: bool,
     }
     private fun foo(c: M::Coin) {
-        M::Coin{ dummy_field: _ }: M::Coin = c;
+        M::Coin{ dummy_field: _ } = c;
         Tuple()
     }
     private fun t0() {
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/constant_all_valid_types.exp b/third_party/move/move-compiler-v2/tests/checking/typing/constant_all_valid_types.exp
index 925d790a3832e..c34eff7c70090 100644
--- a/third_party/move/move-compiler-v2/tests/checking/typing/constant_all_valid_types.exp
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/constant_all_valid_types.exp
@@ -21,6 +21,9 @@ module 0x42::M {
     private fun t7(): vector<u8> {
         [97, 98, 99, 100]
     }
+    private fun t8(): vector<address> {
+        [Address(Numerical(0000000000000000000000000000000000000000000000000000000000000000)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000000001))]
+    }
 } // end 0x42::M
 module <SELF>_0 {
     private fun t() {
@@ -31,6 +34,7 @@ module <SELF>_0 {
         0x0;
         [1, 35];
         [97, 98, 99, 100];
+        [Address(Numerical(0000000000000000000000000000000000000000000000000000000000000000)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000000001))];
         Tuple()
     }
 } // end <SELF>_0
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/constant_all_valid_types.move b/third_party/move/move-compiler-v2/tests/checking/typing/constant_all_valid_types.move
index 6a942539c8086..cfc80d6c3e564 100644
--- a/third_party/move/move-compiler-v2/tests/checking/typing/constant_all_valid_types.move
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/constant_all_valid_types.move
@@ -7,6 +7,7 @@ module M {
     const C5: address = @0x0;
     const C6: vector<u8> = x"0123";
     const C7: vector<u8> = b"abcd";
+    const C8: vector<address> = vector[@0x0, @0x01];
 
     fun t1(): u8 { C1 }
     fun t2(): u64 { C2 }
@@ -15,6 +16,7 @@ module M {
     fun t5(): address { C5 }
     fun t6(): vector<u8> { C6 }
     fun t7(): vector<u8> { C7 }
+    fun t8(): vector<address> { C8 }
 }
 }
 
@@ -26,6 +28,7 @@ script {
     const C5: address = @0x0;
     const C6: vector<u8> = x"0123";
     const C7: vector<u8> = b"abcd";
+    const C8: vector<address> = vector[@0x0, @0x01];
 
     fun t() {
         (C1: u8);
@@ -35,5 +38,6 @@ script {
         (C5: address);
         (C6: vector<u8>);
         (C7: vector<u8>);
+        (C8: vector<address>);
     }
 }
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/continue_any_type.exp b/third_party/move/move-compiler-v2/tests/checking/typing/continue_any_type.exp
index cbe7dcef440a5..d24bcf657bd5c 100644
--- a/third_party/move/move-compiler-v2/tests/checking/typing/continue_any_type.exp
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/continue_any_type.exp
@@ -4,7 +4,7 @@ module 0x8675309::M {
         dummy_field: bool,
     }
     private fun foo(c: M::Coin) {
-        M::Coin{ dummy_field: _ }: M::Coin = c;
+        M::Coin{ dummy_field: _ } = c;
         Tuple()
     }
     private fun t0() {
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/decl_unpack_references.exp b/third_party/move/move-compiler-v2/tests/checking/typing/decl_unpack_references.exp
index 4ae85cde80802..9a0164bc1800c 100644
--- a/third_party/move/move-compiler-v2/tests/checking/typing/decl_unpack_references.exp
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/decl_unpack_references.exp
@@ -9,7 +9,7 @@ module 0x8675309::M {
     }
     private fun t0() {
         {
-          let M::R{ s1: M::S{ f: f: u64 }, s2: s2: M::S }: M::R;
+          let M::R{ s1: M::S{ f }, s2 };
           f: u64 = 0;
           f;
           s2: M::S = pack M::S(0);
@@ -19,7 +19,7 @@ module 0x8675309::M {
     }
     private fun t1() {
         {
-          let M::R{ s1: M::S{ f: f: &u64 }, s2: s2: &M::S }: &M::R;
+          let M::R{ s1: M::S{ f }, s2 };
           f: &u64 = Borrow(Immutable)(0);
           f;
           s2: &M::S = Borrow(Immutable)(pack M::S(0));
@@ -29,7 +29,7 @@ module 0x8675309::M {
     }
     private fun t2() {
         {
-          let M::R{ s1: M::S{ f: f: &mut u64 }, s2: s2: &mut M::S }: &mut M::R;
+          let M::R{ s1: M::S{ f }, s2 };
           f: &mut u64 = Borrow(Mutable)(0);
           f;
           s2: &mut M::S = Borrow(Mutable)(pack M::S(0));
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/declare_with_type_annot.exp b/third_party/move/move-compiler-v2/tests/checking/typing/declare_with_type_annot.exp
index 5cd9dba7c12ef..1963ff3280348 100644
--- a/third_party/move/move-compiler-v2/tests/checking/typing/declare_with_type_annot.exp
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/declare_with_type_annot.exp
@@ -31,7 +31,7 @@ module 0x8675309::M {
     }
     private fun t0() {
         {
-          let (x: u64, b: bool, M::R{ f: f: u64 }): (u64, bool, M::R);
+          let (x: u64, b: bool, M::R{ f }): (u64, bool, M::R);
           Tuple()
         }
     }
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/derefrence_reference.exp b/third_party/move/move-compiler-v2/tests/checking/typing/derefrence_reference.exp
index 08e7e8e5752fb..23c269a5f9e30 100644
--- a/third_party/move/move-compiler-v2/tests/checking/typing/derefrence_reference.exp
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/derefrence_reference.exp
@@ -7,16 +7,16 @@ module 0x8675309::M {
         dummy_field: bool,
     }
     private fun t0(r: &M::R,b: &M::B) {
-        M::R{ dummy_field: _ }: M::R = Deref(r);
-        M::B{ r: M::R{ dummy_field: _ } }: M::B = Deref(b);
-        M::R{ dummy_field: _ }: M::R = Deref(Borrow(Immutable)(select M::B.r<&M::B>(b)));
+        M::R{ dummy_field: _ } = Deref(r);
+        M::B{ r: M::R{ dummy_field: _ } } = Deref(b);
+        M::R{ dummy_field: _ } = Deref(Borrow(Immutable)(select M::B.r<&M::B>(b)));
         Tuple()
     }
     private fun t1(r: &mut M::R,b: &mut M::B) {
-        M::R{ dummy_field: _ }: M::R = Deref(r);
-        M::B{ r: M::R{ dummy_field: _ } }: M::B = Deref(b);
-        M::R{ dummy_field: _ }: M::R = Deref(Borrow(Immutable)(select M::B.r<&mut M::B>(b)));
-        M::R{ dummy_field: _ }: M::R = Deref(Borrow(Mutable)(select M::B.r<&mut M::B>(b)));
+        M::R{ dummy_field: _ } = Deref(r);
+        M::B{ r: M::R{ dummy_field: _ } } = Deref(b);
+        M::R{ dummy_field: _ } = Deref(Borrow(Immutable)(select M::B.r<&mut M::B>(b)));
+        M::R{ dummy_field: _ } = Deref(Borrow(Mutable)(select M::B.r<&mut M::B>(b)));
         Tuple()
     }
 } // end 0x8675309::M
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/dummy_field.exp b/third_party/move/move-compiler-v2/tests/checking/typing/dummy_field.exp
new file mode 100644
index 0000000000000..31d482ecaceb0
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/dummy_field.exp
@@ -0,0 +1,38 @@
+// -- Model dump before bytecode pipeline
+module 0x42::test {
+    struct T {
+        dummy_field: bool,
+    }
+    struct R {
+        dummy_field: bool,
+    }
+    public entry fun test(addr: address)
+        acquires test::R(*)
+     {
+        {
+          let test::R{ dummy_field: _dummy_field } = MoveFrom<test::R>(addr);
+          Tuple()
+        }
+    }
+    private fun test2(): bool {
+        {
+          let r: test::R = pack test::R(true);
+          select test::R.dummy_field<test::R>(r)
+        }
+    }
+    public entry fun test3(addr: address)
+        acquires test::T(*)
+     {
+        {
+          let test::T{ dummy_field: _ } = MoveFrom<test::T>(addr);
+          Tuple()
+        }
+    }
+    public entry fun test4(s: &signer) {
+        {
+          let r: test::T = pack test::T(false);
+          MoveTo<test::T>(s, r);
+          Tuple()
+        }
+    }
+} // end 0x42::test
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/dummy_field.move b/third_party/move/move-compiler-v2/tests/checking/typing/dummy_field.move
new file mode 100644
index 0000000000000..fe1bd07f4cd21
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/dummy_field.move
@@ -0,0 +1,30 @@
+module 0x42::test {
+
+    struct R has store, key, drop {
+        dummy_field: bool,
+    }
+
+    public entry fun test(addr: address) acquires R {
+        let R { dummy_field: _dummy_field  } = move_from<R>(addr);
+    }
+
+    fun test2(): bool {
+        let r = R {
+            dummy_field: true
+        };
+        r.dummy_field
+    }
+
+    struct T has store, key, drop {
+    }
+
+    public entry fun test3(addr: address) acquires T {
+        let T {  } = move_from<T>(addr);
+    }
+
+    public entry fun test4(s: &signer) {
+        let r = T {};
+        move_to<T>(s, r);
+    }
+
+}
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/dummy_field_err.exp b/third_party/move/move-compiler-v2/tests/checking/typing/dummy_field_err.exp
new file mode 100644
index 0000000000000..1fa5552ca16dc
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/dummy_field_err.exp
@@ -0,0 +1,43 @@
+
+Diagnostics:
+error: missing field `dummy_field`
+  ┌─ tests/checking/typing/dummy_field_err.move:8:13
+  │
+8 │         let R {  } = move_from<R>(addr);
+  │             ^^^^^^
+
+error: missing field `dummy_field`
+   ┌─ tests/checking/typing/dummy_field_err.move:12:17
+   │
+12 │         let r = R {};
+   │                 ^^^^
+
+error: field `dummy_field` not declared in `test::T`
+   ┌─ tests/checking/typing/dummy_field_err.move:20:17
+   │
+20 │         let T { dummy_field } = move_from<T>(addr);
+   │                 ^^^^^^^^^^^
+
+error: empty struct `test::T` cannot access the field `dummy_field`
+   ┌─ tests/checking/typing/dummy_field_err.move:26:9
+   │
+26 │         t.dummy_field
+   │         ^^^^^^^^^^^^^
+
+error: missing field `dummy_field_1`
+   ┌─ tests/checking/typing/dummy_field_err.move:34:13
+   │
+34 │         let G {  } = move_from<G>(addr);
+   │             ^^^^^^
+
+error: missing field `dummy_field_1`
+   ┌─ tests/checking/typing/dummy_field_err.move:38:17
+   │
+38 │         let r = G {};
+   │                 ^^^^
+
+error: empty struct `test::A` cannot access the field `dummy_field`
+   ┌─ tests/checking/typing/dummy_field_err.move:47:17
+   │
+47 │         let x = a.dummy_field;
+   │                 ^^^^^^^^^^^^^
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/dummy_field_err.move b/third_party/move/move-compiler-v2/tests/checking/typing/dummy_field_err.move
new file mode 100644
index 0000000000000..fbbabb0f57f62
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/dummy_field_err.move
@@ -0,0 +1,52 @@
+module 0x42::test {
+
+    struct R has store, key, drop {
+        dummy_field: bool,
+    }
+
+    public entry fun test(addr: address) acquires R {
+        let R {  } = move_from<R>(addr);
+    }
+
+    public entry fun test2(s: &signer) {
+        let r = R {};
+        move_to<R>(s, r);
+    }
+
+    struct T has store, key, drop {
+    }
+
+    public entry fun test3(addr: address) acquires T {
+        let T { dummy_field } = move_from<T>(addr);
+    }
+
+    fun test4(): bool {
+        let t = T {
+        };
+        t.dummy_field
+    }
+
+    struct G has store, key, drop {
+        dummy_field_1: bool,
+    }
+
+    public entry fun test5(addr: address) acquires G {
+        let G {  } = move_from<G>(addr);
+    }
+
+    public entry fun test6(s: &signer) {
+        let r = G {};
+        move_to<G>(s, r);
+    }
+
+    struct A has key, drop {
+    }
+
+    public fun test7(input: address): bool acquires A {
+        let a = move_from(input);
+        let x = a.dummy_field;
+        let A {} = a;
+        x
+    }
+
+}
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/entry_inline_err.exp b/third_party/move/move-compiler-v2/tests/checking/typing/entry_inline_err.exp
new file mode 100644
index 0000000000000..dadf6a8162e05
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/entry_inline_err.exp
@@ -0,0 +1,13 @@
+
+Diagnostics:
+error: An entry function cannot be inlined.
+  ┌─ tests/checking/typing/entry_inline_err.move:2:5
+  │
+2 │     public(friend) entry inline fun a(){}
+  │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: An entry function cannot be inlined.
+  ┌─ tests/checking/typing/entry_inline_err.move:6:5
+  │
+6 │     entry inline fun a(){}
+  │     ^^^^^^^^^^^^^^^^^^^^^^
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/entry_inline_err.move b/third_party/move/move-compiler-v2/tests/checking/typing/entry_inline_err.move
new file mode 100644
index 0000000000000..bf4a894878f11
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/entry_inline_err.move
@@ -0,0 +1,11 @@
+module 0x123::a{
+    public(friend) entry inline fun a(){}
+}
+
+module 0x123::b{
+    entry inline fun a(){}
+
+    fun b() {
+        a()
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/explicit_move.exp b/third_party/move/move-compiler-v2/tests/checking/typing/explicit_move.exp
index fca6d43199aa7..27cbe3d3c17ea 100644
--- a/third_party/move/move-compiler-v2/tests/checking/typing/explicit_move.exp
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/explicit_move.exp
@@ -15,7 +15,7 @@ module 0x8675309::M {
               let r: M::R = pack M::R(false);
               Move(u);
               Move(s);
-              M::R{ dummy_field: _ }: M::R = Move(r);
+              M::R{ dummy_field: _ } = Move(r);
               Tuple()
             }
           }
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/global_builtins.exp b/third_party/move/move-compiler-v2/tests/checking/typing/global_builtins.exp
index 49fea56f30c37..90546524be56a 100644
--- a/third_party/move/move-compiler-v2/tests/checking/typing/global_builtins.exp
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/global_builtins.exp
@@ -15,7 +15,7 @@ module 0x8675309::M {
               {
                 let _: &mut M::R = BorrowGlobal(Mutable)<M::R>(0x0);
                 {
-                  let M::R{ dummy_field: _ }: M::R = MoveFrom<M::R>(0x0);
+                  let M::R{ dummy_field: _ } = MoveFrom<M::R>(0x0);
                   Tuple()
                 }
               }
@@ -35,7 +35,7 @@ module 0x8675309::M {
               {
                 let _: &mut M::R = BorrowGlobal(Mutable)<M::R>(0x0);
                 {
-                  let M::R{ dummy_field: _ }: M::R = MoveFrom<M::R>(0x0);
+                  let M::R{ dummy_field: _ } = MoveFrom<M::R>(0x0);
                   Tuple()
                 }
               }
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/global_builtins_inferred.exp b/third_party/move/move-compiler-v2/tests/checking/typing/global_builtins_inferred.exp
index 7d309300ae608..8e154566ebee7 100644
--- a/third_party/move/move-compiler-v2/tests/checking/typing/global_builtins_inferred.exp
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/global_builtins_inferred.exp
@@ -9,7 +9,7 @@ module 0x42::m {
         {
           let a: m::A = MoveFrom<m::A>(input);
           {
-            let m::A{ addr: addr: address }: m::A = a;
+            let m::A{ addr } = a;
             addr
           }
         }
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/if_branches_subtype.exp b/third_party/move/move-compiler-v2/tests/checking/typing/if_branches_subtype.exp
index 890936aec05ac..9d0e1d8462b55 100644
--- a/third_party/move/move-compiler-v2/tests/checking/typing/if_branches_subtype.exp
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/if_branches_subtype.exp
@@ -26,19 +26,19 @@ module 0x8675309::M {
     }
     private fun t1(cond: bool,u: &u64,u_mut: &mut u64) {
         {
-          let (_, _): (&u64, &u64) = if cond {
+          let (_: &u64, _: &u64): (&u64, &u64) = if cond {
             Tuple(u, u)
           } else {
             Tuple(Freeze(false)(u_mut), Freeze(false)(u_mut))
           };
           {
-            let (_, _): (&u64, &u64) = if cond {
+            let (_: &u64, _: &u64): (&u64, &u64) = if cond {
               Tuple(Freeze(false)(u_mut), u)
             } else {
               Tuple(u, Freeze(false)(u_mut))
             };
             {
-              let (_, _): (&u64, &u64) = if cond {
+              let (_: &u64, _: &u64): (&u64, &u64) = if cond {
                 Tuple(u, Freeze(false)(u_mut))
               } else {
                 Tuple(Freeze(false)(u_mut), u)
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/if_matched_branches.exp b/third_party/move/move-compiler-v2/tests/checking/typing/if_matched_branches.exp
index dde6ad390175b..780bf81624ba8 100644
--- a/third_party/move/move-compiler-v2/tests/checking/typing/if_matched_branches.exp
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/if_matched_branches.exp
@@ -22,7 +22,7 @@ module 0x8675309::M {
         } else {
           false
         };
-        M::R{ dummy_field: _ }: M::R = if cond {
+        M::R{ dummy_field: _ } = if cond {
           pack M::R(false)
         } else {
           pack M::R(false)
@@ -45,7 +45,7 @@ module 0x8675309::M {
         } else {
           Tuple(1, true)
         };
-        (_, _, _, M::R{ dummy_field: _ }): (u64, u64, &u64, M::R) = if cond {
+        (_: u64, _: u64, _: &u64, M::R{ dummy_field: _ }): (u64, u64, &u64, M::R) = if cond {
           Tuple(0, 0, Borrow(Immutable)(0), pack M::R(false))
         } else {
           Tuple(1, 1, Borrow(Immutable)(1), pack M::R(false))
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/index_err.exp b/third_party/move/move-compiler-v2/tests/checking/typing/index_err.exp
new file mode 100644
index 0000000000000..b29b7bc9f3cd3
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/index_err.exp
@@ -0,0 +1,13 @@
+
+Diagnostics:
+error: indexing can only be applied to a vector or a resource type (a struct type which has key ability)
+   ┌─ tests/checking/typing/index_err.move:14:9
+   │
+14 │         UNUSED_Test[@0x1];
+   │         ^^^^^^^^^^^^^^^^^
+
+error: indexing can only be applied to a vector or a resource type (a struct type which has key ability)
+   ┌─ tests/checking/typing/index_err.move:19:9
+   │
+19 │         &test::UNUSED_Test[@0x1];
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/index_err.move b/third_party/move/move-compiler-v2/tests/checking/typing/index_err.move
new file mode 100644
index 0000000000000..1208c0c44334b
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/index_err.move
@@ -0,0 +1,22 @@
+module 0x42::test {
+
+    struct R has key, drop { value: bool }
+
+    spec schema UNUSED_Test {
+    }
+
+    fun test_no_ref_for_resource() acquires R {
+        use 0x42::test;
+        assert!((test::R[@0x1]).value == true, 0);
+    }
+
+    fun test_no_schema() {
+        UNUSED_Test[@0x1];
+    }
+
+    fun test_no_schema_ref() {
+        use 0x42::test;
+        &test::UNUSED_Test[@0x1];
+    }
+
+}
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/index_err_2.exp b/third_party/move/move-compiler-v2/tests/checking/typing/index_err_2.exp
new file mode 100644
index 0000000000000..fd1d47a3ccdf1
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/index_err_2.exp
@@ -0,0 +1,7 @@
+
+Diagnostics:
+error: expected `vector<struct{value}>` but found a value of type `X<integer>`
+   ┌─ tests/checking/typing/index_err_2.move:11:17
+   │
+11 │         assert!(x[0].value == 2, 0);
+   │                 ^
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/index_err_2.move b/third_party/move/move-compiler-v2/tests/checking/typing/index_err_2.move
new file mode 100644
index 0000000000000..d6c5ac142ef57
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/index_err_2.move
@@ -0,0 +1,14 @@
+module 0x42::test {
+
+    struct X<M> has copy, drop, store {
+        value: M
+    }
+
+    fun test_vector() {
+        let x = X {
+            value: 2
+        };
+        assert!(x[0].value == 2, 0);
+    }
+
+}
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/main_arguments_various_caes.exp b/third_party/move/move-compiler-v2/tests/checking/typing/main_arguments_various_caes.exp
index 4506397b17329..a729ac9e9d988 100644
--- a/third_party/move/move-compiler-v2/tests/checking/typing/main_arguments_various_caes.exp
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/main_arguments_various_caes.exp
@@ -10,7 +10,7 @@ module 0x42::M {
         dummy_field: bool,
     }
     public fun eat(r: M::R) {
-        M::R{ dummy_field: _ }: M::R = r
+        M::R{ dummy_field: _ } = r
     }
 } // end 0x42::M
 module <SELF>_0 {
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/move_from_type_argument.exp b/third_party/move/move-compiler-v2/tests/checking/typing/move_from_type_argument.exp
index 7d309300ae608..8e154566ebee7 100644
--- a/third_party/move/move-compiler-v2/tests/checking/typing/move_from_type_argument.exp
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/move_from_type_argument.exp
@@ -9,7 +9,7 @@ module 0x42::m {
         {
           let a: m::A = MoveFrom<m::A>(input);
           {
-            let m::A{ addr: addr: address }: m::A = a;
+            let m::A{ addr } = a;
             addr
           }
         }
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/native_structs_pack_unpack.exp b/third_party/move/move-compiler-v2/tests/checking/typing/native_structs_pack_unpack.exp
index de0895bc5f938..a612877c96823 100644
--- a/third_party/move/move-compiler-v2/tests/checking/typing/native_structs_pack_unpack.exp
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/native_structs_pack_unpack.exp
@@ -1,17 +1,23 @@
 
 Diagnostics:
-error: native struct `C::T` cannot be packed or unpacked
+bug: inconsistent struct definition
   ┌─ tests/checking/typing/native_structs_pack_unpack.move:9:9
   │
 9 │         C::T {}
   │         ^^^^
 
-error: native struct `C::T` cannot be packed or unpacked
+bug: inconsistent struct definition
    ┌─ tests/checking/typing/native_structs_pack_unpack.move:12:13
    │
 12 │         let C::T {} = c;
    │             ^^^^
 
+error: unable to infer instantiation of type `_` (consider providing type arguments or annotating the type)
+   ┌─ tests/checking/typing/native_structs_pack_unpack.move:12:13
+   │
+12 │         let C::T {} = c;
+   │             ^^^^^^^
+
 error: field `f` not declared in struct `C::T`
    ┌─ tests/checking/typing/native_structs_pack_unpack.move:15:17
    │
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/pack.exp b/third_party/move/move-compiler-v2/tests/checking/typing/pack.exp
index 0f3dc465a790b..ce3eca24ab5c2 100644
--- a/third_party/move/move-compiler-v2/tests/checking/typing/pack.exp
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/pack.exp
@@ -16,7 +16,7 @@ module 0x8675309::M {
         pack M::S(0);
         {
           let s: M::S = pack M::S(0);
-          M::R{ s: _, f: _, n1: _, n2: _ }: M::R = {
+          M::R{ s: _, f: _, n1: _, n2: _ } = {
             let $s: M::S = pack M::S(0);
             {
               let $n2: M::Nat<M::S> = pack M::Nat<M::S>(s);
@@ -32,7 +32,7 @@ module 0x8675309::M {
               let n1: M::Nat<u64> = pack M::Nat<u64>(0);
               {
                 let n2: M::Nat<M::S> = pack M::Nat<M::S>(Deref(Borrow(Immutable)(s)));
-                M::R{ s: _, f: _, n1: _, n2: _ }: M::R = {
+                M::R{ s: _, f: _, n1: _, n2: _ } = {
                   let $s: M::S = s;
                   {
                     let $n2: M::Nat<M::S> = n2;
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/pack_missing_field.exp b/third_party/move/move-compiler-v2/tests/checking/typing/pack_missing_field.exp
index 40af2c08e76f8..f202b4166347c 100644
--- a/third_party/move/move-compiler-v2/tests/checking/typing/pack_missing_field.exp
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/pack_missing_field.exp
@@ -1,24 +1,24 @@
 
 Diagnostics:
-error: missing fields `f`
+error: missing field `f`
   ┌─ tests/checking/typing/pack_missing_field.move:7:10
   │
 7 │         (S { } : S);
   │          ^^^^^
 
-error: missing fields `n2`
+error: missing field `n2`
   ┌─ tests/checking/typing/pack_missing_field.move:8:37
   │
 8 │         R {s:_, f:_, n1:_, n2:_} = (R { s: S{f: 0}, n1: Nat{f: 0}, f: 0, } : R);
   │                                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error: missing fields `f`
+error: missing field `f`
    ┌─ tests/checking/typing/pack_missing_field.move:14:37
    │
 14 │         R {s:_, f:_, n1:_, n2:_} = (R { s, n2, n1 }: R);
    │                                     ^^^^^^^^^^^^^^^
 
-error: missing fields `f`
+error: missing field `f`
    ┌─ tests/checking/typing/pack_missing_field.move:16:28
    │
 16 │         (Nat { f: Nat { f: Nat { }}}: Nat<Nat<Nat<S>>>);
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/phantom_param_struct_decl.exp b/third_party/move/move-compiler-v2/tests/checking/typing/phantom_param_struct_decl.exp
new file mode 100644
index 0000000000000..4e1a345132678
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/phantom_param_struct_decl.exp
@@ -0,0 +1,20 @@
+// -- Model dump before bytecode pipeline
+module 0x42::M1 {
+    struct S1 {
+        a: u64,
+    }
+    struct S2 {
+        a: M1::S1<#0>,
+        b: vector<M1::S1<#0>>,
+    }
+    struct S3 {
+        a: #1,
+        b: #3,
+    }
+    struct S4 {
+        a: u64,
+    }
+    struct S5 {
+        a: M1::S4<#0>,
+    }
+} // end 0x42::M1
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/phantom_param_struct_decl.move b/third_party/move/move-compiler-v2/tests/checking/typing/phantom_param_struct_decl.move
new file mode 100644
index 0000000000000..f1fb0944caffa
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/phantom_param_struct_decl.move
@@ -0,0 +1,26 @@
+module 0x42::M1 {
+    // Not using a phantom parameter at all is ok.
+    struct S1<phantom T> {
+        a: u64
+    }
+
+    // Phantom parameters can be used in phantom position.
+    struct S2<phantom T> {
+        a: S1<T>,
+        b: vector<S1<T>>
+    }
+
+    // Mixing phantom and non-phantom parameters
+    struct S3<phantom T1, T2, phantom T3, T4> {
+        a: T2,
+        b: T4
+    }
+
+    // Phantom parameters should be allowed to be declared with constraints.
+    struct S4<phantom T: copy> {
+        a: u64
+    }
+    struct S5<phantom T: copy + drop + store> {
+        a: S4<T>
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/return_any_type.exp b/third_party/move/move-compiler-v2/tests/checking/typing/return_any_type.exp
index aaa4fa5685abc..bdaaf2919cd70 100644
--- a/third_party/move/move-compiler-v2/tests/checking/typing/return_any_type.exp
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/return_any_type.exp
@@ -4,7 +4,7 @@ module 0x8675309::M {
         dummy_field: bool,
     }
     private fun foo(c: M::Coin) {
-        M::Coin{ dummy_field: _ }: M::Coin = c;
+        M::Coin{ dummy_field: _ } = c;
         Tuple()
     }
     private fun t0() {
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/shadowing.exp b/third_party/move/move-compiler-v2/tests/checking/typing/shadowing.exp
index 68a67cb66924f..7c470644e168e 100644
--- a/third_party/move/move-compiler-v2/tests/checking/typing/shadowing.exp
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/shadowing.exp
@@ -32,7 +32,7 @@ module 0x8675309::M {
     private fun t2() {
         loop {
           {
-            let M::S{ f: _, b: x: bool }: M::S = pack M::S(0, false);
+            let M::S{ f: _, b: x } = pack M::S(0, false);
             false;
             break
           }
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/tuple.exp b/third_party/move/move-compiler-v2/tests/checking/typing/tuple.exp
index 36f6a3a527412..132846113b36a 100644
--- a/third_party/move/move-compiler-v2/tests/checking/typing/tuple.exp
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/tuple.exp
@@ -8,7 +8,7 @@ module 0x42::tuple {
     }
     private fun use_tuple(x: u64): u64 {
         {
-          let (x: u64, tuple::S{ f: y: u64 }): (u64, tuple::S) = tuple::tuple(x);
+          let (x: u64, tuple::S{ f: y }): (u64, tuple::S) = tuple::tuple(x);
           Add<u64>(x, y)
         }
     }
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/type_variable_join_single_unpack.exp b/third_party/move/move-compiler-v2/tests/checking/typing/type_variable_join_single_unpack.exp
index ad69dde0ab356..63252d1509136 100644
--- a/third_party/move/move-compiler-v2/tests/checking/typing/type_variable_join_single_unpack.exp
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/type_variable_join_single_unpack.exp
@@ -9,11 +9,11 @@ module 0x8675309::M {
     }
     private fun t0() {
         {
-          let M::Box<u64>{ f1: f1: u64, f2: f2: u64 }: M::Box<u64> = M::new<u64>();
+          let M::Box<u64>{ f1, f2 } = M::new<u64>();
           f1;
           f2;
           {
-            let M::Box<M::Box<u64>>{ f1: f1: M::Box<u64>, f2: f2: M::Box<u64> }: M::Box<M::Box<u64>> = M::new<M::Box<u64>>();
+            let M::Box<M::Box<u64>>{ f1, f2 } = M::new<M::Box<u64>>();
             f1;
             f2;
             Tuple()
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/type_variable_join_single_unpack_assign.exp b/third_party/move/move-compiler-v2/tests/checking/typing/type_variable_join_single_unpack_assign.exp
index 8d92a003aa660..141500cd03452 100644
--- a/third_party/move/move-compiler-v2/tests/checking/typing/type_variable_join_single_unpack_assign.exp
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/type_variable_join_single_unpack_assign.exp
@@ -12,14 +12,14 @@ module 0x8675309::M {
           let f1: u64;
           {
             let f2: u64;
-            M::Box<u64>{ f1: f1: u64, f2: f2: u64 }: M::Box<u64> = M::new<u64>();
+            M::Box<u64>{ f1, f2 } = M::new<u64>();
             f1;
             f2;
             {
               let f1: M::Box<u64>;
               {
                 let f2: M::Box<u64>;
-                M::Box<M::Box<u64>>{ f1: f1: M::Box<u64>, f2: f2: M::Box<u64> }: M::Box<M::Box<u64>> = M::new<M::Box<u64>>();
+                M::Box<M::Box<u64>>{ f1, f2 } = M::new<M::Box<u64>>();
                 f1;
                 f2;
                 Tuple()
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/type_variable_join_threaded_unpack.exp b/third_party/move/move-compiler-v2/tests/checking/typing/type_variable_join_threaded_unpack.exp
index 7cd966403489e..867745d67f570 100644
--- a/third_party/move/move-compiler-v2/tests/checking/typing/type_variable_join_threaded_unpack.exp
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/type_variable_join_threaded_unpack.exp
@@ -26,7 +26,7 @@ module 0x2::M {
         {
           let v: Container::T<M::Box<u64>> = Container::new<M::Box<u64>>();
           {
-            let M::Box<u64>{ f1: f1: u64, f2: f2: u64 }: M::Box<u64> = Container::get<M::Box<u64>>(Borrow(Immutable)(v));
+            let M::Box<u64>{ f1, f2 } = Container::get<M::Box<u64>>(Borrow(Immutable)(v));
             f2;
             Container::put<M::Box<u64>>(Borrow(Mutable)(v), pack M::Box<u64>(0, 0));
             f1
@@ -37,7 +37,7 @@ module 0x2::M {
         {
           let v: Container::T<M::Box<M::Box<M::Box<u64>>>> = Container::new<M::Box<M::Box<M::Box<u64>>>>();
           {
-            let M::Box<M::Box<M::Box<u64>>>{ f1: f1: M::Box<M::Box<u64>>, f2: f2: M::Box<M::Box<u64>> }: M::Box<M::Box<M::Box<u64>>> = Container::get<M::Box<M::Box<M::Box<u64>>>>(Borrow(Immutable)(v));
+            let M::Box<M::Box<M::Box<u64>>>{ f1, f2 } = Container::get<M::Box<M::Box<M::Box<u64>>>>(Borrow(Immutable)(v));
             Container::put<M::Box<M::Box<M::Box<u64>>>>(Borrow(Mutable)(v), pack M::Box<M::Box<M::Box<u64>>>(Deref(Borrow(Immutable)(f1)), f2));
             f1
           }
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/type_variable_join_threaded_unpack_assign.exp b/third_party/move/move-compiler-v2/tests/checking/typing/type_variable_join_threaded_unpack_assign.exp
index 85dc36f23ede4..0638a9144b677 100644
--- a/third_party/move/move-compiler-v2/tests/checking/typing/type_variable_join_threaded_unpack_assign.exp
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/type_variable_join_threaded_unpack_assign.exp
@@ -29,7 +29,7 @@ module 0x2::M {
             let f1: u64;
             {
               let f2: u64;
-              M::Box<u64>{ f1: f1: u64, f2: f2: u64 }: M::Box<u64> = Container::get<M::Box<u64>>(Borrow(Immutable)(v));
+              M::Box<u64>{ f1, f2 } = Container::get<M::Box<u64>>(Borrow(Immutable)(v));
               f2;
               Container::put<M::Box<u64>>(Borrow(Mutable)(v), pack M::Box<u64>(0, 0));
               f1
@@ -44,7 +44,7 @@ module 0x2::M {
             let f1: M::Box<M::Box<u64>>;
             {
               let f2: M::Box<M::Box<u64>>;
-              M::Box<M::Box<M::Box<u64>>>{ f1: f1: M::Box<M::Box<u64>>, f2: f2: M::Box<M::Box<u64>> }: M::Box<M::Box<M::Box<u64>>> = Container::get<M::Box<M::Box<M::Box<u64>>>>(Borrow(Immutable)(v));
+              M::Box<M::Box<M::Box<u64>>>{ f1, f2 } = Container::get<M::Box<M::Box<M::Box<u64>>>>(Borrow(Immutable)(v));
               Container::put<M::Box<M::Box<M::Box<u64>>>>(Borrow(Mutable)(v), pack M::Box<M::Box<M::Box<u64>>>(Deref(Borrow(Immutable)(f1)), f2));
               f1
             }
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/unary_not.exp b/third_party/move/move-compiler-v2/tests/checking/typing/unary_not.exp
index 25bc49cbbf818..da126c647eb2c 100644
--- a/third_party/move/move-compiler-v2/tests/checking/typing/unary_not.exp
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/unary_not.exp
@@ -11,7 +11,7 @@ module 0x8675309::M {
         Not(Move(x));
         Not(select M::R.f<M::R>(r));
         {
-          let M::R{ f: _ }: M::R = r;
+          let M::R{ f: _ } = r;
           Tuple()
         }
     }
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/unused_local.exp b/third_party/move/move-compiler-v2/tests/checking/typing/unused_local.exp
index 49b636efbf57e..0e221c884baf1 100644
--- a/third_party/move/move-compiler-v2/tests/checking/typing/unused_local.exp
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/unused_local.exp
@@ -74,7 +74,7 @@ module 0x8675309::M {
     }
     private fun t2() {
         {
-          let M::S{ f: f: u64, g: g: bool }: M::S;
+          let M::S{ f, g };
           Tuple()
         }
     }
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/use_local.exp b/third_party/move/move-compiler-v2/tests/checking/typing/use_local.exp
index 5cc996e832f89..d211b57c21a2e 100644
--- a/third_party/move/move-compiler-v2/tests/checking/typing/use_local.exp
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/use_local.exp
@@ -13,7 +13,7 @@ module 0x8675309::M {
             let r: M::R = pack M::R(false);
             0;
             s;
-            M::R{ dummy_field: _ }: M::R = r;
+            M::R{ dummy_field: _ } = r;
             Tuple()
           }
         }
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/v1-commands/pop_weird.exp b/third_party/move/move-compiler-v2/tests/checking/typing/v1-commands/pop_weird.exp
index b79b50668a2bd..9a62cda269e10 100644
--- a/third_party/move/move-compiler-v2/tests/checking/typing/v1-commands/pop_weird.exp
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/v1-commands/pop_weird.exp
@@ -6,7 +6,7 @@ error: the left-hand side has 2 items but the right-hand side provided 0
 13 │         (_, _) = ();
    │         ^^^^^^
 
-error: the left-hand side has 1 item but the right-hand side provided 0
+error: tuple type `()` is not allowed as a type argument
    ┌─ tests/checking/typing/v1-commands/pop_weird.move:14:9
    │
 14 │         (_) = ();
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/v1-commands/unpack_extra_binding.exp b/third_party/move/move-compiler-v2/tests/checking/typing/v1-commands/unpack_extra_binding.exp
index a528311281808..97786b5bd24ad 100644
--- a/third_party/move/move-compiler-v2/tests/checking/typing/v1-commands/unpack_extra_binding.exp
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/v1-commands/unpack_extra_binding.exp
@@ -1,6 +1,6 @@
 
 Diagnostics:
-error: field `b` not declared in struct `Test::T`
+error: field `b` not declared in `Test::T`
    ┌─ tests/checking/typing/v1-commands/unpack_extra_binding.move:11:23
    │
 11 │         let T { i, x, b: flag } = t;
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/v1-commands/unpack_missing_binding.exp b/third_party/move/move-compiler-v2/tests/checking/typing/v1-commands/unpack_missing_binding.exp
index 003300161680d..4504d9a106fc9 100644
--- a/third_party/move/move-compiler-v2/tests/checking/typing/v1-commands/unpack_missing_binding.exp
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/v1-commands/unpack_missing_binding.exp
@@ -1,6 +1,6 @@
 
 Diagnostics:
-error: missing fields `y`
+error: missing field `y`
    ┌─ tests/checking/typing/v1-commands/unpack_missing_binding.move:11:13
    │
 11 │         let T { i, x, b: flag } = t;
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/v1-examples/multi_pool_money_market_token.exp b/third_party/move/move-compiler-v2/tests/checking/typing/v1-examples/multi_pool_money_market_token.exp
new file mode 100644
index 0000000000000..afd5f2f73d767
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/v1-examples/multi_pool_money_market_token.exp
@@ -0,0 +1,300 @@
+
+Diagnostics:
+warning: unused type parameter
+  ┌─ tests/checking/typing/v1-examples/multi_pool_money_market_token.move:5:21
+  │
+5 │     native struct T<K, V> has copy, drop, store;
+  │                     ^
+  │                     │
+  │                     Unused type parameter `K`. Consider declaring it as phantom
+
+warning: unused type parameter
+  ┌─ tests/checking/typing/v1-examples/multi_pool_money_market_token.move:5:24
+  │
+5 │     native struct T<K, V> has copy, drop, store;
+  │                        ^
+  │                        │
+  │                        Unused type parameter `V`. Consider declaring it as phantom
+
+// -- Model dump before bytecode pipeline
+module 0x2::Token {
+    struct Coin {
+        type: #0,
+        value: u64,
+    }
+    public fun create<ATy>(type: #0,value: u64): Token::Coin<#0> {
+        pack Token::Coin<ATy>(type, value)
+    }
+    public fun value<ATy>(coin: &Token::Coin<#0>): u64 {
+        select Token::Coin.value<&Token::Coin<ATy>>(coin)
+    }
+    public fun deposit<ATy>(coin: &mut Token::Coin<#0>,check: Token::Coin<#0>) {
+        {
+          let Token::Coin<ATy>{ type, value } = check;
+          if Eq<ATy>(Borrow(Immutable)(select Token::Coin.type<&mut Token::Coin<ATy>>(coin)), Borrow(Immutable)(type)) {
+            Tuple()
+          } else {
+            Abort(42)
+          };
+          select Token::Coin.value<&mut Token::Coin<ATy>>(coin) = Add<u64>(select Token::Coin.value<&mut Token::Coin<ATy>>(coin), value);
+          Tuple()
+        }
+    }
+    public fun destroy_zero<ATy>(coin: Token::Coin<#0>) {
+        {
+          let Token::Coin<ATy>{ type: _, value } = coin;
+          if Eq<u64>(value, 0) {
+            Tuple()
+          } else {
+            Abort(11)
+          }
+        }
+    }
+    public fun join<ATy>(xus: Token::Coin<#0>,coin2: Token::Coin<#0>): Token::Coin<#0> {
+        Token::deposit<ATy>(Borrow(Mutable)(xus), coin2);
+        xus
+    }
+    public fun split<ATy>(coin: Token::Coin<#0>,amount: u64): (Token::Coin<#0>, Token::Coin<#0>) {
+        {
+          let other: Token::Coin<ATy> = Token::withdraw<ATy>(Borrow(Mutable)(coin), amount);
+          Tuple(coin, other)
+        }
+    }
+    public fun withdraw<ATy>(coin: &mut Token::Coin<#0>,amount: u64): Token::Coin<#0> {
+        if Ge<u64>(select Token::Coin.value<&mut Token::Coin<ATy>>(coin), amount) {
+          Tuple()
+        } else {
+          Abort(10)
+        };
+        select Token::Coin.value<&mut Token::Coin<ATy>>(coin) = Sub<u64>(select Token::Coin.value<&mut Token::Coin<ATy>>(coin), amount);
+        pack Token::Coin<ATy>(Deref(Borrow(Immutable)(select Token::Coin.type<&mut Token::Coin<ATy>>(coin))), amount)
+    }
+} // end 0x2::Token
+module 0x2::Map {
+    struct T {
+    }
+    public native fun empty<K,V>(): Map::T<#0, #1>;
+    public native fun remove<K,V>(m: &Map::T<#0, #1>,k: &#0): #1;
+    public native fun contains_key<K,V>(m: &Map::T<#0, #1>,k: &#0): bool;
+    public native fun get<K,V>(m: &Map::T<#0, #1>,k: &#0): &#1;
+    public native fun get_mut<K,V>(m: &mut Map::T<#0, #1>,k: &#0): &mut #1;
+    public native fun insert<K,V>(m: &Map::T<#0, #1>,k: #0,v: #1);
+} // end 0x2::Map
+module 0x3::OneToOneMarket {
+    use std::signer;
+    use 0x2::Map; // resolved as: 0x2::Map
+    use 0x2::Token; // resolved as: 0x2::Token
+    struct BorrowRecord {
+        record: Map::T<address, u64>,
+    }
+    struct DepositRecord {
+        record: Map::T<address, u64>,
+    }
+    struct Pool {
+        coin: Token::Coin<#0>,
+    }
+    struct Price {
+        price: u64,
+    }
+    public fun borrow<In,Out>(account: &signer,pool_owner: address,amount: u64): Token::Coin<#1>
+        acquires OneToOneMarket::Price(*)
+        acquires OneToOneMarket::Pool(*)
+        acquires OneToOneMarket::DepositRecord(*)
+        acquires OneToOneMarket::BorrowRecord(*)
+     {
+        if Le<u64>(amount, OneToOneMarket::max_borrow_amount<In, Out>(account, pool_owner)) {
+          Tuple()
+        } else {
+          Abort(1025)
+        };
+        OneToOneMarket::update_borrow_record<In, Out>(account, pool_owner, amount);
+        {
+          let pool: &mut OneToOneMarket::Pool<Out> = BorrowGlobal(Mutable)<OneToOneMarket::Pool<Out>>(pool_owner);
+          Token::withdraw<Out>(Borrow(Mutable)(select OneToOneMarket::Pool.coin<&mut OneToOneMarket::Pool<Out>>(pool)), amount)
+        }
+    }
+    public fun deposit<In,Out>(account: &signer,pool_owner: address,coin: Token::Coin<#0>)
+        acquires OneToOneMarket::Pool(*)
+        acquires OneToOneMarket::DepositRecord(*)
+     {
+        {
+          let amount: u64 = Token::value<In>(Borrow(Immutable)(coin));
+          OneToOneMarket::update_deposit_record<In, Out>(account, pool_owner, amount);
+          {
+            let pool: &mut OneToOneMarket::Pool<In> = BorrowGlobal(Mutable)<OneToOneMarket::Pool<In>>(pool_owner);
+            Token::deposit<In>(Borrow(Mutable)(select OneToOneMarket::Pool.coin<&mut OneToOneMarket::Pool<In>>(pool)), coin)
+          }
+        }
+    }
+    private fun accept<AssetType>(account: &signer,init: Token::Coin<#0>) {
+        {
+          let sender: address = signer::address_of(account);
+          if Not(exists<OneToOneMarket::Pool<AssetType>>(sender)) {
+            Tuple()
+          } else {
+            Abort(42)
+          };
+          MoveTo<OneToOneMarket::Pool<AssetType>>(account, pack OneToOneMarket::Pool<AssetType>(init))
+        }
+    }
+    private fun borrowed_amount<In,Out>(account: &signer,pool_owner: address): u64
+        acquires OneToOneMarket::BorrowRecord(*)
+     {
+        {
+          let sender: address = signer::address_of(account);
+          if Not(exists<OneToOneMarket::BorrowRecord<In, Out>>(sender)) {
+            return 0
+          } else {
+            Tuple()
+          };
+          {
+            let record: &Map::T<address, u64> = Borrow(Immutable)(select OneToOneMarket::BorrowRecord.record<&OneToOneMarket::BorrowRecord<In, Out>>(BorrowGlobal(Immutable)<OneToOneMarket::BorrowRecord<In, Out>>(sender)));
+            if Map::contains_key<address, u64>(record, Borrow(Immutable)(pool_owner)) {
+              Deref(Map::get<address, u64>(record, Borrow(Immutable)(pool_owner)))
+            } else {
+              0
+            }
+          }
+        }
+    }
+    private fun deposited_amount<In,Out>(account: &signer,pool_owner: address): u64
+        acquires OneToOneMarket::DepositRecord(*)
+     {
+        {
+          let sender: address = signer::address_of(account);
+          if Not(exists<OneToOneMarket::DepositRecord<In, Out>>(sender)) {
+            return 0
+          } else {
+            Tuple()
+          };
+          {
+            let record: &Map::T<address, u64> = Borrow(Immutable)(select OneToOneMarket::DepositRecord.record<&OneToOneMarket::DepositRecord<In, Out>>(BorrowGlobal(Immutable)<OneToOneMarket::DepositRecord<In, Out>>(sender)));
+            if Map::contains_key<address, u64>(record, Borrow(Immutable)(pool_owner)) {
+              Deref(Map::get<address, u64>(record, Borrow(Immutable)(pool_owner)))
+            } else {
+              0
+            }
+          }
+        }
+    }
+    private fun max_borrow_amount<In,Out>(account: &signer,pool_owner: address): u64
+        acquires OneToOneMarket::Price(*)
+        acquires OneToOneMarket::Pool(*)
+        acquires OneToOneMarket::DepositRecord(*)
+        acquires OneToOneMarket::BorrowRecord(*)
+     {
+        {
+          let input_deposited: u64 = OneToOneMarket::deposited_amount<In, Out>(account, pool_owner);
+          {
+            let output_deposited: u64 = OneToOneMarket::borrowed_amount<In, Out>(account, pool_owner);
+            {
+              let input_into_output: u64 = Mul<u64>(input_deposited, select OneToOneMarket::Price.price<&OneToOneMarket::Price<In, Out>>(BorrowGlobal(Immutable)<OneToOneMarket::Price<In, Out>>(pool_owner)));
+              {
+                let max_output: u64 = if Lt<u64>(input_into_output, output_deposited) {
+                  0
+                } else {
+                  Sub<u64>(input_into_output, output_deposited)
+                };
+                {
+                  let available_output: u64 = {
+                    let pool: &OneToOneMarket::Pool<Out> = BorrowGlobal(Immutable)<OneToOneMarket::Pool<Out>>(pool_owner);
+                    Token::value<Out>(Borrow(Immutable)(select OneToOneMarket::Pool.coin<&OneToOneMarket::Pool<Out>>(pool)))
+                  };
+                  if Lt<u64>(max_output, available_output) {
+                    max_output
+                  } else {
+                    available_output
+                  }
+                }
+              }
+            }
+          }
+        }
+    }
+    public fun register_price<In,Out>(account: &signer,initial_in: Token::Coin<#0>,initial_out: Token::Coin<#1>,price: u64) {
+        OneToOneMarket::accept<In>(account, initial_in);
+        OneToOneMarket::accept<Out>(account, initial_out);
+        MoveTo<OneToOneMarket::Price<In, Out>>(account, pack OneToOneMarket::Price<In, Out>(price))
+    }
+    private fun update_borrow_record<In,Out>(account: &signer,pool_owner: address,amount: u64)
+        acquires OneToOneMarket::BorrowRecord(*)
+     {
+        {
+          let sender: address = signer::address_of(account);
+          if Not(exists<OneToOneMarket::BorrowRecord<In, Out>>(sender)) {
+            MoveTo<OneToOneMarket::BorrowRecord<In, Out>>(account, pack OneToOneMarket::BorrowRecord<In, Out>(Map::empty<address, u64>()))
+          } else {
+            Tuple()
+          };
+          {
+            let record: &mut Map::T<address, u64> = Borrow(Mutable)(select OneToOneMarket::BorrowRecord.record<&mut OneToOneMarket::BorrowRecord<In, Out>>(BorrowGlobal(Mutable)<OneToOneMarket::BorrowRecord<In, Out>>(sender)));
+            if Map::contains_key<address, u64>(Freeze(false)(record), Borrow(Immutable)(pool_owner)) {
+              {
+                let old_amount: u64 = Map::remove<address, u64>(Freeze(false)(record), Borrow(Immutable)(pool_owner));
+                amount: u64 = Add<u64>(amount, old_amount);
+                Tuple()
+              }
+            } else {
+              Tuple()
+            };
+            Map::insert<address, u64>(Freeze(false)(record), pool_owner, amount)
+          }
+        }
+    }
+    private fun update_deposit_record<In,Out>(account: &signer,pool_owner: address,amount: u64)
+        acquires OneToOneMarket::DepositRecord(*)
+     {
+        {
+          let sender: address = signer::address_of(account);
+          if Not(exists<OneToOneMarket::DepositRecord<In, Out>>(sender)) {
+            MoveTo<OneToOneMarket::DepositRecord<In, Out>>(account, pack OneToOneMarket::DepositRecord<In, Out>(Map::empty<address, u64>()))
+          } else {
+            Tuple()
+          };
+          {
+            let record: &mut Map::T<address, u64> = Borrow(Mutable)(select OneToOneMarket::DepositRecord.record<&mut OneToOneMarket::DepositRecord<In, Out>>(BorrowGlobal(Mutable)<OneToOneMarket::DepositRecord<In, Out>>(sender)));
+            if Map::contains_key<address, u64>(Freeze(false)(record), Borrow(Immutable)(pool_owner)) {
+              {
+                let old_amount: u64 = Map::remove<address, u64>(Freeze(false)(record), Borrow(Immutable)(pool_owner));
+                amount: u64 = Add<u64>(amount, old_amount);
+                Tuple()
+              }
+            } else {
+              Tuple()
+            };
+            Map::insert<address, u64>(Freeze(false)(record), pool_owner, amount)
+          }
+        }
+    }
+} // end 0x3::OneToOneMarket
+module 0x70dd::ToddNickels {
+    use 0x2::Token; // resolved as: 0x2::Token
+    use std::signer;
+    struct T {
+        dummy_field: bool,
+    }
+    struct Wallet {
+        nickels: Token::Coin<ToddNickels::T>,
+    }
+    public fun init(account: &signer) {
+        if Eq<address>(signer::address_of(account), 0x70dd) {
+          Tuple()
+        } else {
+          Abort(42)
+        };
+        MoveTo<ToddNickels::Wallet>(account, pack ToddNickels::Wallet(Token::create<ToddNickels::T>(pack ToddNickels::T(false), 0)))
+    }
+    public fun destroy(c: Token::Coin<ToddNickels::T>)
+        acquires ToddNickels::Wallet(*)
+     {
+        Token::deposit<ToddNickels::T>(Borrow(Mutable)(select ToddNickels::Wallet.nickels<&mut ToddNickels::Wallet>(BorrowGlobal(Mutable)<ToddNickels::Wallet>(0x70dd))), c)
+    }
+    public fun mint(account: &signer): Token::Coin<ToddNickels::T> {
+        if Eq<address>(signer::address_of(account), 0x70dd) {
+          Tuple()
+        } else {
+          Abort(42)
+        };
+        Token::create<ToddNickels::T>(pack ToddNickels::T(false), 5)
+    }
+} // end 0x70dd::ToddNickels
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/v1-examples/multi_pool_money_market_token.move b/third_party/move/move-compiler-v2/tests/checking/typing/v1-examples/multi_pool_money_market_token.move
new file mode 100644
index 0000000000000..a7cdc2f366054
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/v1-examples/multi_pool_money_market_token.move
@@ -0,0 +1,240 @@
+
+address 0x2 {
+
+module Map {
+    native struct T<K, V> has copy, drop, store;
+
+    native public fun empty<K, V>(): T<K, V>;
+
+    native public fun get<K, V>(m: &T<K, V>, k: &K): &V;
+    native public fun get_mut<K, V>(m: &mut T<K, V>, k: &K): &mut V;
+
+    native public fun contains_key<K, V>(m: &T<K, V>, k: &K): bool;
+    // throws on duplicate as I don't feel like mocking up Option
+    native public fun insert<K, V>(m: &T<K, V>, k: K, v: V);
+    // throws on miss as I don't feel like mocking up Option
+    native public fun remove<K, V>(m: &T<K, V>, k: &K): V;
+}
+
+}
+
+address 0x2 {
+
+module Token {
+
+    struct Coin<AssetType: copy + drop> has store {
+        type: AssetType,
+        value: u64,
+    }
+
+    // control the minting/creation in the defining module of `ATy`
+    public fun create<ATy: copy + drop>(type: ATy, value: u64): Coin<ATy> {
+        Coin { type, value }
+    }
+
+    public fun value<ATy: copy + drop>(coin: &Coin<ATy>): u64 {
+        coin.value
+    }
+
+    public fun split<ATy: copy + drop>(coin: Coin<ATy>, amount: u64): (Coin<ATy>, Coin<ATy>) {
+        let other = withdraw(&mut coin, amount);
+        (coin, other)
+    }
+
+    public fun withdraw<ATy: copy + drop>(coin: &mut Coin<ATy>, amount: u64): Coin<ATy> {
+        assert!(coin.value >= amount, 10);
+        coin.value = coin.value - amount;
+        Coin { type: *&coin.type, value: amount }
+    }
+
+    public fun join<ATy: copy + drop>(xus: Coin<ATy>, coin2: Coin<ATy>): Coin<ATy> {
+        deposit(&mut xus, coin2);
+        xus
+    }
+
+    public fun deposit<ATy: copy + drop>(coin: &mut Coin<ATy>, check: Coin<ATy>) {
+        let Coin { value, type } = check;
+        assert!(&coin.type == &type, 42);
+        coin.value = coin.value + value;
+    }
+
+    public fun destroy_zero<ATy: copy + drop>(coin: Coin<ATy>) {
+        let Coin { value, type: _ } = coin;
+        assert!(value == 0, 11)
+    }
+
+}
+
+}
+
+address 0x3 {
+
+module OneToOneMarket {
+    use std::signer;
+    use 0x2::Map;
+    use 0x2::Token;
+
+    struct Pool<AssetType: copy + drop> has key {
+        coin: Token::Coin<AssetType>,
+    }
+
+    struct DepositRecord<phantom InputAsset: copy + drop, phantom OutputAsset: copy + drop> has key {
+        // pool owner => amount
+        record: Map::T<address, u64>
+    }
+
+    struct BorrowRecord<phantom InputAsset: copy + drop, phantom OutputAsset: copy + drop> has key {
+        // pool owner => amount
+        record: Map::T<address, u64>
+    }
+
+    struct Price<phantom InputAsset: copy + drop, phantom OutputAsset: copy + drop> has key {
+        price: u64,
+    }
+
+    fun accept<AssetType: copy + drop + store>(account: &signer, init: Token::Coin<AssetType>) {
+        let sender = signer::address_of(account);
+        assert!(!exists<Pool<AssetType>>(sender), 42);
+        move_to(account, Pool<AssetType> { coin: init })
+    }
+
+    public fun register_price<In: copy + drop + store, Out: copy + drop + store>(
+        account: &signer,
+        initial_in: Token::Coin<In>,
+        initial_out: Token::Coin<Out>,
+        price: u64
+    ) {
+        accept<In>(account, initial_in);
+        accept<Out>(account, initial_out);
+        move_to(account, Price<In, Out> { price })
+    }
+
+    public fun deposit<In: copy + drop + store, Out: copy + drop + store>(account: &signer, pool_owner: address, coin: Token::Coin<In>)
+        acquires Pool, DepositRecord
+    {
+        let amount = Token::value(&coin);
+
+        update_deposit_record<In, Out>(account, pool_owner, amount);
+
+        let pool = borrow_global_mut<Pool<In>>(pool_owner);
+        Token::deposit(&mut pool.coin, coin)
+    }
+
+    public fun borrow<In: copy + drop + store, Out: copy + drop + store>(
+        account: &signer,
+        pool_owner: address,
+        amount: u64,
+    ): Token::Coin<Out>
+        acquires Price, Pool, DepositRecord, BorrowRecord
+    {
+        assert!(amount <= max_borrow_amount<In, Out>(account, pool_owner), 1025);
+
+        update_borrow_record<In, Out>(account, pool_owner, amount);
+
+        let pool = borrow_global_mut<Pool<Out>>(pool_owner);
+        Token::withdraw(&mut pool.coin, amount)
+    }
+
+    fun max_borrow_amount<In: copy + drop + store, Out: copy + drop + store>(account: &signer, pool_owner: address): u64
+        acquires Price, Pool, DepositRecord, BorrowRecord
+    {
+        let input_deposited = deposited_amount<In, Out>(account, pool_owner);
+        let output_deposited = borrowed_amount<In, Out>(account, pool_owner);
+
+        let input_into_output =
+            input_deposited * borrow_global<Price<In, Out>>(pool_owner).price;
+        let max_output =
+            if (input_into_output < output_deposited) 0
+            else (input_into_output - output_deposited);
+        let available_output = {
+            let pool = borrow_global<Pool<Out>>(pool_owner);
+            Token::value(&pool.coin)
+        };
+        if (max_output < available_output) max_output else available_output
+
+    }
+
+    fun update_deposit_record<In: copy + drop + store, Out: copy + drop + store>(account: &signer, pool_owner: address, amount: u64)
+        acquires DepositRecord
+    {
+        let sender = signer::address_of(account);
+        if (!exists<DepositRecord<In, Out>>(sender)) {
+            move_to(account, DepositRecord<In, Out> { record: Map::empty() })
+        };
+        let record = &mut borrow_global_mut<DepositRecord<In, Out>>(sender).record;
+        if (Map::contains_key(record, &pool_owner)) {
+            let old_amount = Map::remove(record, &pool_owner);
+            amount = amount + old_amount;
+        };
+        Map::insert(record, pool_owner, amount)
+    }
+
+    fun update_borrow_record<In: copy + drop + store, Out: copy + drop + store>(account: &signer, pool_owner: address, amount: u64)
+        acquires BorrowRecord
+    {
+        let sender = signer::address_of(account);
+        if (!exists<BorrowRecord<In, Out>>(sender)) {
+            move_to(account, BorrowRecord<In, Out> { record: Map::empty() })
+        };
+        let record = &mut borrow_global_mut<BorrowRecord<In, Out>>(sender).record;
+        if (Map::contains_key(record, &pool_owner)) {
+            let old_amount = Map::remove(record, &pool_owner);
+            amount = amount + old_amount;
+        };
+        Map::insert(record, pool_owner, amount)
+    }
+
+    fun deposited_amount<In: copy + drop + store, Out: copy + drop + store>(account: &signer, pool_owner: address): u64
+        acquires DepositRecord
+    {
+        let sender = signer::address_of(account);
+        if (!exists<DepositRecord<In, Out>>(sender)) return 0;
+
+        let record = &borrow_global<DepositRecord<In, Out>>(sender).record;
+        if (Map::contains_key(record, &pool_owner)) *Map::get(record, &pool_owner)
+        else 0
+    }
+
+    fun borrowed_amount<In: copy + drop + store, Out: copy + drop + store>(account: &signer, pool_owner: address): u64
+        acquires BorrowRecord
+    {
+        let sender = signer::address_of(account);
+        if (!exists<BorrowRecord<In, Out>>(sender)) return 0;
+
+        let record = &borrow_global<BorrowRecord<In, Out>>(sender).record;
+        if (Map::contains_key(record, &pool_owner)) *Map::get(record, &pool_owner)
+        else 0
+    }
+}
+
+}
+
+address 0x70DD {
+
+module ToddNickels {
+    use 0x2::Token;
+    use std::signer;
+
+    struct T has copy, drop, store {}
+
+    struct Wallet has key {
+        nickels: Token::Coin<T>,
+    }
+
+    public fun init(account: &signer) {
+        assert!(signer::address_of(account) == @0x70DD, 42);
+        move_to(account, Wallet { nickels: Token::create(T{}, 0) })
+    }
+
+    public fun mint(account: &signer): Token::Coin<T> {
+        assert!(signer::address_of(account) == @0x70DD, 42);
+        Token::create(T{}, 5)
+    }
+
+    public fun destroy(c: Token::Coin<T>) acquires Wallet {
+        Token::deposit(&mut borrow_global_mut<Wallet>(@0x70DD).nickels, c)
+    }
+
+}
+
+}
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/v1-examples/simple_money_market_token.exp b/third_party/move/move-compiler-v2/tests/checking/typing/v1-examples/simple_money_market_token.exp
new file mode 100644
index 0000000000000..b2f8b5a64657b
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/v1-examples/simple_money_market_token.exp
@@ -0,0 +1,247 @@
+// -- Model dump before bytecode pipeline
+module 0x2::Token {
+    struct Coin {
+        type: #0,
+        value: u64,
+    }
+    public fun create<ATy>(type: #0,value: u64): Token::Coin<#0> {
+        pack Token::Coin<ATy>(type, value)
+    }
+    public fun value<ATy>(coin: &Token::Coin<#0>): u64 {
+        select Token::Coin.value<&Token::Coin<ATy>>(coin)
+    }
+    public fun deposit<ATy>(coin: &mut Token::Coin<#0>,check: Token::Coin<#0>) {
+        {
+          let Token::Coin<ATy>{ type, value } = check;
+          if Eq<ATy>(Borrow(Immutable)(select Token::Coin.type<&mut Token::Coin<ATy>>(coin)), Borrow(Immutable)(type)) {
+            Tuple()
+          } else {
+            Abort(42)
+          };
+          select Token::Coin.value<&mut Token::Coin<ATy>>(coin) = Add<u64>(select Token::Coin.value<&mut Token::Coin<ATy>>(coin), value);
+          Tuple()
+        }
+    }
+    public fun destroy_zero<ATy>(coin: Token::Coin<#0>) {
+        {
+          let Token::Coin<ATy>{ type: _, value } = coin;
+          if Eq<u64>(value, 0) {
+            Tuple()
+          } else {
+            Abort(11)
+          }
+        }
+    }
+    public fun join<ATy>(xus: Token::Coin<#0>,coin2: Token::Coin<#0>): Token::Coin<#0> {
+        Token::deposit<ATy>(Borrow(Mutable)(xus), coin2);
+        xus
+    }
+    public fun split<ATy>(coin: Token::Coin<#0>,amount: u64): (Token::Coin<#0>, Token::Coin<#0>) {
+        {
+          let other: Token::Coin<ATy> = Token::withdraw<ATy>(Borrow(Mutable)(coin), amount);
+          Tuple(coin, other)
+        }
+    }
+    public fun withdraw<ATy>(coin: &mut Token::Coin<#0>,amount: u64): Token::Coin<#0> {
+        if Ge<u64>(select Token::Coin.value<&mut Token::Coin<ATy>>(coin), amount) {
+          Tuple()
+        } else {
+          Abort(10)
+        };
+        select Token::Coin.value<&mut Token::Coin<ATy>>(coin) = Sub<u64>(select Token::Coin.value<&mut Token::Coin<ATy>>(coin), amount);
+        pack Token::Coin<ATy>(Deref(Borrow(Immutable)(select Token::Coin.type<&mut Token::Coin<ATy>>(coin))), amount)
+    }
+} // end 0x2::Token
+module 0x70dd::ToddNickels {
+    use 0x2::Token; // resolved as: 0x2::Token
+    use std::signer;
+    struct T {
+        dummy_field: bool,
+    }
+    struct Wallet {
+        nickels: Token::Coin<ToddNickels::T>,
+    }
+    public fun init(account: &signer) {
+        if Eq<address>(signer::address_of(account), 0x70dd) {
+          Tuple()
+        } else {
+          Abort(42)
+        };
+        MoveTo<ToddNickels::Wallet>(account, pack ToddNickels::Wallet(Token::create<ToddNickels::T>(pack ToddNickels::T(false), 0)))
+    }
+    public fun destroy(c: Token::Coin<ToddNickels::T>)
+        acquires ToddNickels::Wallet(*)
+     {
+        Token::deposit<ToddNickels::T>(Borrow(Mutable)(select ToddNickels::Wallet.nickels<&mut ToddNickels::Wallet>(BorrowGlobal(Mutable)<ToddNickels::Wallet>(0x70dd))), c)
+    }
+    public fun mint(account: &signer): Token::Coin<ToddNickels::T> {
+        if Eq<address>(signer::address_of(account), 0x70dd) {
+          Tuple()
+        } else {
+          Abort(42)
+        };
+        Token::create<ToddNickels::T>(pack ToddNickels::T(false), 5)
+    }
+} // end 0x70dd::ToddNickels
+module 0xb055::OneToOneMarket {
+    use std::signer;
+    use 0x2::Token; // resolved as: 0x2::Token
+    struct BorrowRecord {
+        record: u64,
+    }
+    struct DepositRecord {
+        record: u64,
+    }
+    struct Pool {
+        coin: Token::Coin<#0>,
+    }
+    struct Price {
+        price: u64,
+    }
+    public fun borrow<In,Out>(account: &signer,amount: u64): Token::Coin<#1>
+        acquires OneToOneMarket::Price(*)
+        acquires OneToOneMarket::Pool(*)
+        acquires OneToOneMarket::DepositRecord(*)
+        acquires OneToOneMarket::BorrowRecord(*)
+     {
+        if Le<u64>(amount, OneToOneMarket::max_borrow_amount<In, Out>(account)) {
+          Tuple()
+        } else {
+          Abort(1025)
+        };
+        OneToOneMarket::update_borrow_record<In, Out>(account, amount);
+        {
+          let pool: &mut OneToOneMarket::Pool<Out> = BorrowGlobal(Mutable)<OneToOneMarket::Pool<Out>>(0xb055);
+          Token::withdraw<Out>(Borrow(Mutable)(select OneToOneMarket::Pool.coin<&mut OneToOneMarket::Pool<Out>>(pool)), amount)
+        }
+    }
+    public fun deposit<In,Out>(account: &signer,coin: Token::Coin<#0>)
+        acquires OneToOneMarket::Pool(*)
+        acquires OneToOneMarket::DepositRecord(*)
+     {
+        {
+          let amount: u64 = Token::value<In>(Borrow(Immutable)(coin));
+          OneToOneMarket::update_deposit_record<In, Out>(account, amount);
+          {
+            let pool: &mut OneToOneMarket::Pool<In> = BorrowGlobal(Mutable)<OneToOneMarket::Pool<In>>(0xb055);
+            Token::deposit<In>(Borrow(Mutable)(select OneToOneMarket::Pool.coin<&mut OneToOneMarket::Pool<In>>(pool)), coin)
+          }
+        }
+    }
+    private fun accept<AssetType>(account: &signer,init: Token::Coin<#0>) {
+        {
+          let sender: address = signer::address_of(account);
+          if Not(exists<OneToOneMarket::Pool<AssetType>>(sender)) {
+            Tuple()
+          } else {
+            Abort(42)
+          };
+          MoveTo<OneToOneMarket::Pool<AssetType>>(account, pack OneToOneMarket::Pool<AssetType>(init))
+        }
+    }
+    private fun borrowed_amount<In,Out>(account: &signer): u64
+        acquires OneToOneMarket::BorrowRecord(*)
+     {
+        {
+          let sender: address = signer::address_of(account);
+          if Not(exists<OneToOneMarket::BorrowRecord<In, Out>>(sender)) {
+            return 0
+          } else {
+            Tuple()
+          };
+          select OneToOneMarket::BorrowRecord.record<&OneToOneMarket::BorrowRecord<In, Out>>(BorrowGlobal(Immutable)<OneToOneMarket::BorrowRecord<In, Out>>(sender))
+        }
+    }
+    private fun deposited_amount<In,Out>(account: &signer): u64
+        acquires OneToOneMarket::DepositRecord(*)
+     {
+        {
+          let sender: address = signer::address_of(account);
+          if Not(exists<OneToOneMarket::DepositRecord<In, Out>>(sender)) {
+            return 0
+          } else {
+            Tuple()
+          };
+          select OneToOneMarket::DepositRecord.record<&OneToOneMarket::DepositRecord<In, Out>>(BorrowGlobal(Immutable)<OneToOneMarket::DepositRecord<In, Out>>(sender))
+        }
+    }
+    private fun max_borrow_amount<In,Out>(account: &signer): u64
+        acquires OneToOneMarket::Price(*)
+        acquires OneToOneMarket::Pool(*)
+        acquires OneToOneMarket::DepositRecord(*)
+        acquires OneToOneMarket::BorrowRecord(*)
+     {
+        {
+          let input_deposited: u64 = OneToOneMarket::deposited_amount<In, Out>(account);
+          {
+            let output_deposited: u64 = OneToOneMarket::borrowed_amount<In, Out>(account);
+            {
+              let input_into_output: u64 = Mul<u64>(input_deposited, select OneToOneMarket::Price.price<&OneToOneMarket::Price<In, Out>>(BorrowGlobal(Immutable)<OneToOneMarket::Price<In, Out>>(0xb055)));
+              {
+                let max_output: u64 = if Lt<u64>(input_into_output, output_deposited) {
+                  0
+                } else {
+                  Sub<u64>(input_into_output, output_deposited)
+                };
+                {
+                  let available_output: u64 = {
+                    let pool: &OneToOneMarket::Pool<Out> = BorrowGlobal(Immutable)<OneToOneMarket::Pool<Out>>(0xb055);
+                    Token::value<Out>(Borrow(Immutable)(select OneToOneMarket::Pool.coin<&OneToOneMarket::Pool<Out>>(pool)))
+                  };
+                  if Lt<u64>(max_output, available_output) {
+                    max_output
+                  } else {
+                    available_output
+                  }
+                }
+              }
+            }
+          }
+        }
+    }
+    public fun register_price<In,Out>(account: &signer,initial_in: Token::Coin<#0>,initial_out: Token::Coin<#1>,price: u64) {
+        {
+          let sender: address = signer::address_of(account);
+          if Eq<address>(sender, 0xb055) {
+            Tuple()
+          } else {
+            Abort(42)
+          };
+          OneToOneMarket::accept<In>(account, initial_in);
+          OneToOneMarket::accept<Out>(account, initial_out);
+          MoveTo<OneToOneMarket::Price<In, Out>>(account, pack OneToOneMarket::Price<In, Out>(price))
+        }
+    }
+    private fun update_borrow_record<In,Out>(account: &signer,amount: u64)
+        acquires OneToOneMarket::BorrowRecord(*)
+     {
+        {
+          let sender: address = signer::address_of(account);
+          if Not(exists<OneToOneMarket::BorrowRecord<In, Out>>(sender)) {
+            MoveTo<OneToOneMarket::BorrowRecord<In, Out>>(account, pack OneToOneMarket::BorrowRecord<In, Out>(0))
+          } else {
+            Tuple()
+          };
+          {
+            let record: &mut u64 = Borrow(Mutable)(select OneToOneMarket::BorrowRecord.record<&mut OneToOneMarket::BorrowRecord<In, Out>>(BorrowGlobal(Mutable)<OneToOneMarket::BorrowRecord<In, Out>>(sender)));
+            record = Add<u64>(Deref(record), amount)
+          }
+        }
+    }
+    private fun update_deposit_record<In,Out>(account: &signer,amount: u64)
+        acquires OneToOneMarket::DepositRecord(*)
+     {
+        {
+          let sender: address = signer::address_of(account);
+          if Not(exists<OneToOneMarket::DepositRecord<In, Out>>(sender)) {
+            MoveTo<OneToOneMarket::DepositRecord<In, Out>>(account, pack OneToOneMarket::DepositRecord<In, Out>(0))
+          } else {
+            Tuple()
+          };
+          {
+            let record: &mut u64 = Borrow(Mutable)(select OneToOneMarket::DepositRecord.record<&mut OneToOneMarket::DepositRecord<In, Out>>(BorrowGlobal(Mutable)<OneToOneMarket::DepositRecord<In, Out>>(sender)));
+            record = Add<u64>(Deref(record), amount)
+          }
+        }
+    }
+} // end 0xb055::OneToOneMarket
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/v1-examples/simple_money_market_token.move b/third_party/move/move-compiler-v2/tests/checking/typing/v1-examples/simple_money_market_token.move
new file mode 100644
index 0000000000000..64e69446ed1f7
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/v1-examples/simple_money_market_token.move
@@ -0,0 +1,204 @@
+address 0x2 {
+
+module Token {
+
+    struct Coin<AssetType: copy + drop> has store {
+        type: AssetType,
+        value: u64,
+    }
+
+    // control the minting/creation in the defining module of `ATy`
+    public fun create<ATy: copy + drop + store>(type: ATy, value: u64): Coin<ATy> {
+        Coin { type, value }
+    }
+
+    public fun value<ATy: copy + drop + store>(coin: &Coin<ATy>): u64 {
+        coin.value
+    }
+
+    public fun split<ATy: copy + drop + store>(coin: Coin<ATy>, amount: u64): (Coin<ATy>, Coin<ATy>) {
+        let other = withdraw(&mut coin, amount);
+        (coin, other)
+    }
+
+    public fun withdraw<ATy: copy + drop + store>(coin: &mut Coin<ATy>, amount: u64): Coin<ATy> {
+        assert!(coin.value >= amount, 10);
+        coin.value = coin.value - amount;
+        Coin { type: *&coin.type, value: amount }
+    }
+
+    public fun join<ATy: copy + drop + store>(xus: Coin<ATy>, coin2: Coin<ATy>): Coin<ATy> {
+        deposit(&mut xus, coin2);
+        xus
+    }
+
+    public fun deposit<ATy: copy + drop + store>(coin: &mut Coin<ATy>, check: Coin<ATy>) {
+        let Coin { value, type } = check;
+        assert!(&coin.type == &type, 42);
+        coin.value = coin.value + value;
+    }
+
+    public fun destroy_zero<ATy: copy + drop + store>(coin: Coin<ATy>) {
+        let Coin { value, type: _ } = coin;
+        assert!(value == 0, 11)
+    }
+
+}
+
+}
+
+address 0xB055 {
+
+module OneToOneMarket {
+    use std::signer;
+    use 0x2::Token;
+
+    struct Pool<AssetType: copy + drop> has key {
+        coin: Token::Coin<AssetType>,
+    }
+
+    struct DepositRecord<phantom InputAsset: copy + drop, phantom OutputAsset: copy + drop> has key {
+        record: u64,
+    }
+
+    struct BorrowRecord<phantom InputAsset: copy + drop, phantom OutputAsset: copy + drop> has key {
+        record: u64,
+    }
+
+    struct Price<phantom InputAsset: copy + drop, phantom OutputAsset: copy + drop> has key {
+        price: u64,
+    }
+
+    fun accept<AssetType: copy + drop + store>(account: &signer, init: Token::Coin<AssetType>) {
+        let sender = signer::address_of(account);
+        assert!(!exists<Pool<AssetType>>(sender), 42);
+        move_to(account, Pool<AssetType> { coin: init })
+    }
+
+    public fun register_price<In: copy + drop + store, Out: copy + drop + store>(
+        account: &signer,
+        initial_in: Token::Coin<In>,
+        initial_out: Token::Coin<Out>,
+        price: u64
+    ) {
+        let sender = signer::address_of(account);
+        assert!(sender == @0xB055, 42); // assert sender is module writer
+        accept<In>(account, initial_in);
+        accept<Out>(account, initial_out);
+        move_to(account, Price<In, Out> { price })
+    }
+
+    public fun deposit<In: copy + drop + store, Out: copy + drop + store>(account: &signer, coin: Token::Coin<In>)
+        acquires Pool, DepositRecord
+    {
+        let amount = Token::value(&coin);
+
+        update_deposit_record<In, Out>(account, amount);
+
+        let pool = borrow_global_mut<Pool<In>>(@0xB055);
+        Token::deposit(&mut pool.coin, coin)
+    }
+
+    public fun borrow<In: copy + drop + store, Out: copy + drop + store>(
+        account: &signer,
+        amount: u64,
+    ): Token::Coin<Out>
+        acquires Price, Pool, DepositRecord, BorrowRecord
+    {
+        assert!(amount <= max_borrow_amount<In, Out>(account), 1025);
+
+        update_borrow_record<In, Out>(account, amount);
+
+        let pool = borrow_global_mut<Pool<Out>>(@0xB055);
+        Token::withdraw(&mut pool.coin, amount)
+    }
+
+    fun max_borrow_amount<In: copy + drop + store, Out: copy + drop + store>(account: &signer): u64
+        acquires Price, Pool, DepositRecord, BorrowRecord
+    {
+        let input_deposited = deposited_amount<In, Out>(account);
+        let output_deposited = borrowed_amount<In, Out>(account);
+
+        let input_into_output =
+            input_deposited * borrow_global<Price<In, Out>>(@0xB055).price;
+        let max_output =
+            if (input_into_output < output_deposited) 0
+            else (input_into_output - output_deposited);
+        let available_output = {
+            let pool = borrow_global<Pool<Out>>(@0xB055);
+            Token::value(&pool.coin)
+        };
+        if (max_output < available_output) max_output else available_output
+
+    }
+
+    fun update_deposit_record<In: copy + drop + store, Out: copy + drop + store>(account: &signer, amount: u64)
+        acquires DepositRecord
+    {
+        let sender = signer::address_of(account);
+        if (!exists<DepositRecord<In, Out>>(sender)) {
+            move_to(account, DepositRecord<In, Out> { record: 0 })
+        };
+        let record = &mut borrow_global_mut<DepositRecord<In, Out>>(sender).record;
+        *record = *record + amount
+    }
+
+    fun update_borrow_record<In: copy + drop + store, Out: copy + drop + store>(account: &signer, amount: u64)
+        acquires BorrowRecord
+    {
+        let sender = signer::address_of(account);
+        if (!exists<BorrowRecord<In, Out>>(sender)) {
+            move_to(account, BorrowRecord<In, Out> { record: 0 })
+        };
+        let record = &mut borrow_global_mut<BorrowRecord<In, Out>>(sender).record;
+        *record = *record + amount
+    }
+
+    fun deposited_amount<In: copy + drop + store, Out: copy + drop + store>(account: &signer): u64
+        acquires DepositRecord
+    {
+        let sender = signer::address_of(account);
+        if (!exists<DepositRecord<In, Out>>(sender)) return 0;
+        borrow_global<DepositRecord<In, Out>>(sender).record
+    }
+
+    fun borrowed_amount<In: copy + drop + store, Out: copy + drop + store>(account: &signer): u64
+        acquires BorrowRecord
+    {
+        let sender = signer::address_of(account);
+        if (!exists<BorrowRecord<In, Out>>(sender)) return 0;
+        borrow_global<BorrowRecord<In, Out>>(sender).record
+    }
+}
+
+}
+
+address 0x70DD {
+
+module ToddNickels {
+    use 0x2::Token;
+    use std::signer;
+
+    struct T has copy, drop, store {}
+
+    struct Wallet has key {
+        nickels: Token::Coin<T>,
+    }
+
+    public fun init(account: &signer) {
+        assert!(signer::address_of(account) == @0x70DD, 42);
+        move_to(account, Wallet { nickels: Token::create(T{}, 0) })
+    }
+
+    public fun mint(account: &signer): Token::Coin<T> {
+        assert!(signer::address_of(account) == @0x70DD, 42);
+        Token::create(T{}, 5)
+    }
+
+    public fun destroy(c: Token::Coin<T>) acquires Wallet {
+        Token::deposit(&mut borrow_global_mut<Wallet>(@0x70DD).nickels, c)
+    }
+
+}
+
+}
diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/vector_basic_cases.exp b/third_party/move/move-compiler-v2/tests/checking/typing/vector_basic_cases.exp
index 97e9c3cb46940..fd4c8a5d38bce 100644
--- a/third_party/move/move-compiler-v2/tests/checking/typing/vector_basic_cases.exp
+++ b/third_party/move/move-compiler-v2/tests/checking/typing/vector_basic_cases.exp
@@ -7,7 +7,7 @@ module 0x42::Test {
         [Number(0), Number(1), Number(2)];
         [Number(0), Number(1), Number(2)];
         [Number(0), Number(1), Number(2)];
-        Vector<address>(0x0, 0x1);
+        [Address(Numerical(0000000000000000000000000000000000000000000000000000000000000000)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000000001))];
         Vector<Test::X>(pack Test::X(false), pack Test::X(false));
         Vector<vector<address>>(Vector<address>(), Vector<address>());
         Vector<vector<vector<address>>>(Vector<vector<address>>(Vector<address>(), Vector<address>()), Vector<vector<address>>());
@@ -21,7 +21,7 @@ module 0x42::Test {
         [Number(0)];
         [Number(0)];
         [Number(0)];
-        Vector<address>(0x0);
+        [Address(Numerical(0000000000000000000000000000000000000000000000000000000000000000))];
         Vector<Test::X>(pack Test::X(false));
         Vector<vector<address>>(Vector<address>());
         Vector<vector<vector<address>>>(Vector<vector<address>>(Vector<address>()));
diff --git a/third_party/move/move-compiler-v2/tests/checking/variants/variants_allow_match_empty_block.exp b/third_party/move/move-compiler-v2/tests/checking/variants/variants_allow_match_empty_block.exp
new file mode 100644
index 0000000000000..763597db69434
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/variants/variants_allow_match_empty_block.exp
@@ -0,0 +1,6 @@
+// -- Model dump before bytecode pipeline
+module 0x815::m {
+    private fun match() {
+        Tuple()
+    }
+} // end 0x815::m
diff --git a/third_party/move/move-compiler-v2/tests/checking/variants/variants_allow_match_empty_block.move b/third_party/move/move-compiler-v2/tests/checking/variants/variants_allow_match_empty_block.move
new file mode 100644
index 0000000000000..f4cfbdba4831a
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/variants/variants_allow_match_empty_block.move
@@ -0,0 +1,3 @@
+module 0x815::m {
+    fun match() {}
+}
diff --git a/third_party/move/move-compiler-v2/tests/checking/variants/variants_allow_match_fun_1.exp b/third_party/move/move-compiler-v2/tests/checking/variants/variants_allow_match_fun_1.exp
new file mode 100644
index 0000000000000..310eee4728c3c
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/variants/variants_allow_match_fun_1.exp
@@ -0,0 +1,27 @@
+// -- Model dump before bytecode pipeline
+module 0x815::m {
+    enum CommonFields {
+        Foo {
+            x: u64,
+            y: u8,
+        }
+        Bar {
+            x: u64,
+            z: u32,
+        }
+    }
+    private fun caller(c: m::CommonFields): bool {
+        m::match(c)
+    }
+    private fun match(c: m::CommonFields): bool {
+        match (c) {
+          m::CommonFields::Foo{ x, y: _ } => {
+            Gt<u64>(x, 0)
+          }
+          _: m::CommonFields => {
+            false
+          }
+        }
+
+    }
+} // end 0x815::m
diff --git a/third_party/move/move-compiler-v2/tests/checking/variants/variants_allow_match_fun_1.move b/third_party/move/move-compiler-v2/tests/checking/variants/variants_allow_match_fun_1.move
new file mode 100644
index 0000000000000..b739d24051b01
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/variants/variants_allow_match_fun_1.move
@@ -0,0 +1,17 @@
+module 0x815::m {
+    enum CommonFields {
+        Foo{x: u64, y: u8},
+        Bar{x: u64, z: u32}
+    }
+
+    fun match(c: CommonFields): bool {
+        match (c) {
+            Foo{x, y: _} => x > 0,
+            _ => false
+        }
+    }
+
+    fun caller(c: CommonFields): bool {
+        match(c)
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/checking/variants/variants_allow_match_fun_2.exp b/third_party/move/move-compiler-v2/tests/checking/variants/variants_allow_match_fun_2.exp
new file mode 100644
index 0000000000000..4f144439aeab2
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/variants/variants_allow_match_fun_2.exp
@@ -0,0 +1,30 @@
+// -- Model dump before bytecode pipeline
+module 0x815::m {
+    enum CommonFields {
+        Foo {
+            x: u64,
+            y: u8,
+        }
+        Bar {
+            x: u64,
+            z: u32,
+        }
+    }
+    private fun caller(): bool {
+        m::match()
+    }
+    private fun match(): bool {
+        {
+          let c: m::CommonFields = pack m::CommonFields::Foo(0, 0);
+          match (c) {
+            m::CommonFields::Foo{ x, y: _ } => {
+              Gt<u64>(x, 0)
+            }
+            _: m::CommonFields => {
+              false
+            }
+          }
+
+        }
+    }
+} // end 0x815::m
diff --git a/third_party/move/move-compiler-v2/tests/checking/variants/variants_allow_match_fun_2.move b/third_party/move/move-compiler-v2/tests/checking/variants/variants_allow_match_fun_2.move
new file mode 100644
index 0000000000000..6535ba91b030e
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/variants/variants_allow_match_fun_2.move
@@ -0,0 +1,18 @@
+module 0x815::m {
+    enum CommonFields {
+        Foo{x: u64, y: u8},
+        Bar{x: u64, z: u32}
+    }
+
+    fun match(): bool {
+        let c = CommonFields::Foo{x: 0, y: 0};
+        match (c) {
+            Foo{x, y: _} => x > 0,
+            _ => false
+        }
+    }
+
+    fun caller(): bool {
+        match()
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/checking/variants/variants_allow_match_fun_3.exp b/third_party/move/move-compiler-v2/tests/checking/variants/variants_allow_match_fun_3.exp
new file mode 100644
index 0000000000000..fd62c81d4e4be
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/variants/variants_allow_match_fun_3.exp
@@ -0,0 +1,27 @@
+// -- Model dump before bytecode pipeline
+module 0x815::m {
+    enum CommonFields {
+        Foo {
+            x: u64,
+            y: u8,
+        }
+        Bar {
+            x: u64,
+            z: u32,
+        }
+    }
+    private fun caller(c: m::CommonFields): bool {
+        And(m::match(c, 22), true)
+    }
+    private fun match(c: m::CommonFields,t: u64): bool {
+        match (c) {
+          m::CommonFields::Foo{ x, y: _ } => {
+            Gt<u64>(x, t)
+          }
+          _: m::CommonFields => {
+            false
+          }
+        }
+
+    }
+} // end 0x815::m
diff --git a/third_party/move/move-compiler-v2/tests/checking/variants/variants_allow_match_fun_3.move b/third_party/move/move-compiler-v2/tests/checking/variants/variants_allow_match_fun_3.move
new file mode 100644
index 0000000000000..23d84a4dc63ee
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/variants/variants_allow_match_fun_3.move
@@ -0,0 +1,17 @@
+module 0x815::m {
+    enum CommonFields {
+        Foo{x: u64, y: u8},
+        Bar{x: u64, z: u32}
+    }
+
+    fun match(c: CommonFields, t: u64): bool {
+        match (c) {
+            Foo{x, y: _} => x > t,
+            _ => false
+        }
+    }
+
+    fun caller(c: CommonFields): bool {
+        match(c, 22) && true
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/checking/variants/variants_allow_match_var.exp b/third_party/move/move-compiler-v2/tests/checking/variants/variants_allow_match_var.exp
new file mode 100644
index 0000000000000..b9760d48fca83
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/variants/variants_allow_match_var.exp
@@ -0,0 +1,27 @@
+// -- Model dump before bytecode pipeline
+module 0x815::m {
+    enum CommonFields {
+        Foo {
+            x: u64,
+            y: u8,
+        }
+        Bar {
+            x: u64,
+            z: u32,
+        }
+    }
+    private fun match(c: m::CommonFields,t: u64): bool {
+        match (c) {
+          m::CommonFields::Foo{ x, y: _ } => {
+            {
+              let match: bool = Gt<u64>(x, t);
+              match
+            }
+          }
+          _: m::CommonFields => {
+            false
+          }
+        }
+
+    }
+} // end 0x815::m
diff --git a/third_party/move/move-compiler-v2/tests/checking/variants/variants_allow_match_var.move b/third_party/move/move-compiler-v2/tests/checking/variants/variants_allow_match_var.move
new file mode 100644
index 0000000000000..82ef8dc2cd531
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/variants/variants_allow_match_var.move
@@ -0,0 +1,16 @@
+module 0x815::m {
+    enum CommonFields {
+        Foo{x: u64, y: u8},
+        Bar{x: u64, z: u32}
+    }
+
+    fun match(c: CommonFields, t: u64): bool {
+        match (c) {
+            Foo{x, y: _} => {
+                let match = x > t;
+                match
+            }
+            _ => false
+        }
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/checking/variants/variants_check_duplicate_variant_err.exp b/third_party/move/move-compiler-v2/tests/checking/variants/variants_check_duplicate_variant_err.exp
new file mode 100644
index 0000000000000..c881a619e805c
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/variants/variants_check_duplicate_variant_err.exp
@@ -0,0 +1,10 @@
+
+Diagnostics:
+error: duplicate declaration, item, or annotation
+  ┌─ tests/checking/variants/variants_check_duplicate_variant_err.move:7:9
+  │
+4 │         RGB{red: u64, green: u64, blue: u64},
+  │         ------------------------------------ Variant previously defined here
+  ·
+7 │         RGB{red: u64, green: u64, blue: u64},
+  │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Duplicate definition for variant 'RGB'
diff --git a/third_party/move/move-compiler-v2/tests/checking/variants/variants_check_duplicate_variant_err.move b/third_party/move/move-compiler-v2/tests/checking/variants/variants_check_duplicate_variant_err.move
new file mode 100644
index 0000000000000..e015ff9635a45
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/variants/variants_check_duplicate_variant_err.move
@@ -0,0 +1,9 @@
+module 0x815::m {
+
+    enum ColorDuplicateVariant {
+        RGB{red: u64, green: u64, blue: u64},
+        Red,
+        Blue,
+        RGB{red: u64, green: u64, blue: u64},
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/checking/variants/variants_check_err.exp b/third_party/move/move-compiler-v2/tests/checking/variants/variants_check_err.exp
new file mode 100644
index 0000000000000..ce154d33e000c
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/variants/variants_check_err.exp
@@ -0,0 +1,45 @@
+
+Diagnostics:
+error: variant `Rgb` not declared in `m::Color`
+   ┌─ tests/checking/variants/variants_check_err.move:21:13
+   │
+21 │             Color::Rgb{red, green, blue} => false,
+   │             ^^^^^^^^^^
+
+error: variants not allowed in this context
+   ┌─ tests/checking/variants/variants_check_err.move:27:34
+   │
+27 │     fun missplaced_variant(self: Color::Red): bool {
+   │                                  ^^^^^^^^^^
+
+error: undeclared struct `m::missplaced_variant`
+   ┌─ tests/checking/variants/variants_check_err.move:28:9
+   │
+28 │         0x815::m::missplaced_variant::Red();
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: variants not allowed in this context
+   ┌─ tests/checking/variants/variants_check_err.move:32:29
+   │
+32 │     fun missing_field(self: Color::Red): bool {
+   │                             ^^^^^^^^^^
+
+error: missing field `blue`
+   ┌─ tests/checking/variants/variants_check_err.move:34:13
+   │
+34 │             Color::RGB{red, green} => false,
+   │             ^^^^^^^^^^^^^^^^^^^^^^
+
+error: field `black` not declared in `m::Color`
+   ┌─ tests/checking/variants/variants_check_err.move:40:42
+   │
+40 │             Color::RGB{red, green, blue, black} => false,
+   │                                          ^^^^^
+
+error: cannot select field `f1` since it has different types in variants of enum `Fields`
+   ┌─ tests/checking/variants/variants_check_err.move:49:9
+   │
+49 │         self.f1 + (self.f2 as u64)
+   │         ^^^^
+   │
+   = field `f1` has type `u8` in variant `V3` and type `u64` in variant `V1` and type `u64` in variant `V2`
diff --git a/third_party/move/move-compiler-v2/tests/checking/variants/variants_check_err.move b/third_party/move/move-compiler-v2/tests/checking/variants/variants_check_err.move
new file mode 100644
index 0000000000000..b8d8673da7f7c
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/variants/variants_check_err.move
@@ -0,0 +1,52 @@
+module 0x815::m {
+
+    enum Color {
+        RGB{red: u64, green: u64, blue: u64},
+        Red,
+        Blue,
+    }
+
+    struct NoColor {
+        red: u64
+    }
+
+    enum Fields {
+        V1{f1: u64},
+        V2{f1: u64, f2: u8},
+        V3{f1: u8, f2: u8}
+    }
+
+    fun misspelled_variant(self: Color): bool {
+        match (self) {
+            Color::Rgb{red, green, blue} => false,
+            Color::Red => true,
+            Color::Blue => false,
+        }
+    }
+
+    fun missplaced_variant(self: Color::Red): bool {
+        0x815::m::missplaced_variant::Red();
+        false
+    }
+
+    fun missing_field(self: Color::Red): bool {
+        match (self) {
+            Color::RGB{red, green} => false,
+        }
+    }
+
+    fun extra_field(self: Color): bool {
+        match (self) {
+            Color::RGB{red, green, blue, black} => false,
+        }
+    }
+
+    fun select_variant_field_ok(self: Color): u64 {
+        self.red
+    }
+
+    fun select_variant_field_err_multiple(self: Fields): u64 {
+        self.f1 + (self.f2 as u64)
+    }
+
+}
diff --git a/third_party/move/move-compiler-v2/tests/checking/variants/variants_check_wrongly_named_variant_err.exp b/third_party/move/move-compiler-v2/tests/checking/variants/variants_check_wrongly_named_variant_err.exp
new file mode 100644
index 0000000000000..2fff281b5257b
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/variants/variants_check_wrongly_named_variant_err.exp
@@ -0,0 +1,7 @@
+
+Diagnostics:
+error: invalid name
+  ┌─ tests/checking/variants/variants_check_wrongly_named_variant_err.move:4:9
+  │
+4 │         rgb{red: u64, green: u64, blue: u64},
+  │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid variant name 'rgb'. variant names must start with 'A'..'Z'
diff --git a/third_party/move/move-compiler-v2/tests/checking/variants/variants_check_wrongly_named_variant_err.move b/third_party/move/move-compiler-v2/tests/checking/variants/variants_check_wrongly_named_variant_err.move
new file mode 100644
index 0000000000000..9f71495d329d7
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/variants/variants_check_wrongly_named_variant_err.move
@@ -0,0 +1,8 @@
+module 0x815::m {
+
+    enum ColorDuplicateVariant {
+        rgb{red: u64, green: u64, blue: u64},
+        Red,
+        Blue,
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/checking/variants/variants_ok.exp b/third_party/move/move-compiler-v2/tests/checking/variants/variants_ok.exp
new file mode 100644
index 0000000000000..94a7918c9b8f3
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/variants/variants_ok.exp
@@ -0,0 +1,210 @@
+// -- Model dump before bytecode pipeline
+module 0x815::m {
+    use 0x815::m; // resolved as: 0x815::m
+    enum Color {
+        RGB {
+            red: u64,
+            green: u64,
+            blue: u64,
+        }
+        Red,
+        Blue,
+    }
+    enum ColorUsesBlockNoComma {
+        RGB {
+            red: u64,
+            green: u64,
+            blue: u64,
+        }
+        Red,
+        Blue,
+    }
+    enum CommonFields {
+        Foo {
+            x: u64,
+            y: u8,
+        }
+        Bar {
+            x: u64,
+            z: u32,
+        }
+        Baz {
+            other: u32,
+        }
+    }
+    private fun t1(self: m::Color): bool {
+        match (self) {
+          m::Color::RGB{ red, green, blue } => {
+            Gt<u64>(Add<u64>(Add<u64>(red, green), blue), 0)
+          }
+          m::Color::Red => {
+            true
+          }
+          m::Color::Blue => {
+            false
+          }
+        }
+
+    }
+    private fun t1_address_qualified(self: m::Color): bool {
+        match (self) {
+          m::Color::RGB{ red, green, blue } => {
+            Gt<u64>(Add<u64>(Add<u64>(red, green), blue), 0)
+          }
+          m::Color::Red => {
+            true
+          }
+          m::Color::Blue => {
+            false
+          }
+        }
+
+    }
+    private fun t1_field_named(self: m::Color): bool {
+        match (self) {
+          m::Color::RGB{ red: r, green: g, blue } => {
+            Gt<u64>(Add<u64>(Add<u64>(r, g), blue), 0)
+          }
+          m::Color::Red => {
+            true
+          }
+          m::Color::Blue => {
+            false
+          }
+        }
+
+    }
+    private fun t1_module_qualified(self: m::Color): bool {
+        match (self) {
+          m::Color::RGB{ red, green, blue } => {
+            Gt<u64>(Add<u64>(Add<u64>(red, green), blue), 0)
+          }
+          m::Color::Red => {
+            true
+          }
+          m::Color::Blue => {
+            false
+          }
+        }
+
+    }
+    private fun t1_uses_block(self: m::Color): bool {
+        match (self) {
+          m::Color::RGB{ red, green, blue } => {
+            Gt<u64>(Add<u64>(Add<u64>(red, green), blue), 0)
+          }
+          m::Color::Red => {
+            true
+          }
+          m::Color::Blue => {
+            false
+          }
+        }
+
+    }
+    private fun t1_uses_block_no_comma(self: m::Color): bool {
+        match (self) {
+          m::Color::RGB{ red, green, blue } => {
+            Gt<u64>(Add<u64>(Add<u64>(red, green), blue), 0)
+          }
+          m::Color::Red => {
+            true
+          }
+          m::Color::Blue => {
+            false
+          }
+        }
+
+    }
+    private fun t2(self: m::Color): bool {
+        match (self) {
+          m::Color::RGB{ red, green, blue } => {
+            Gt<u64>(Add<u64>(Add<u64>(red, green), blue), 0)
+          }
+          _: m::Color => {
+            true
+          }
+        }
+
+    }
+    private fun t3(self: m::Color): bool {
+        match (Borrow(Immutable)(self)) {
+          m::Color::RGB{ red, green, blue } => {
+            Gt<u64>(Add<u64>(Add<u64>(Deref(red), Deref(green)), Deref(blue)), 0)
+          }
+          _: &m::Color => {
+            true
+          }
+        }
+
+    }
+    private fun t4(self: m::Color): m::Color {
+        match (Borrow(Mutable)(self)) {
+          m::Color::RGB{ red, green: _, blue: _ } => {
+            red = 2
+          }
+          _: &mut m::Color => {
+            Tuple()
+          }
+        }
+        ;
+        self
+    }
+    private fun t5_freeze(self: m::Color): u64 {
+        {
+          let x: u64 = 1;
+          {
+            let r: &u64 = match (Borrow(Mutable)(self)) {
+              m::Color::Red => {
+                Borrow(Immutable)(x)
+              }
+              m::Color::Blue => {
+                Freeze(false)(Borrow(Mutable)(x))
+              }
+              _: &mut m::Color => {
+                Freeze(false)(Borrow(Mutable)(x))
+              }
+            }
+            ;
+            Deref(r)
+          }
+        }
+    }
+    private fun t6_construct(self: m::Color): m::Color {
+        match (self) {
+          m::Color::RGB{ red, green, blue } => {
+            pack m::Color::RGB(Add<u64>(red, 1), Sub<u64>(green, 1), blue)
+          }
+          _: m::Color => {
+            self
+          }
+        }
+
+    }
+    private fun t7_let_unpack(self: m::Color): u64 {
+        {
+          let m::Color::RGB{ red, green, blue } = self;
+          Add<u64>(Add<u64>(red, green), blue)
+        }
+    }
+    private fun t8_unqualified_variant(self: m::Color): bool {
+        match (self) {
+          m::Color::RGB{ red, green, blue } => {
+            And(Neq<u64>(red, green), Neq<u64>(green, blue))
+          }
+          m::Color::Red => {
+            true
+          }
+          m::Color::Blue => {
+            false
+          }
+        }
+
+    }
+    private fun t9_common_field(self: m::CommonFields): u64 {
+        select_variants m::CommonFields.Foo.x|m::CommonFields.Bar.x<m::CommonFields>(self)
+    }
+    private fun t9_common_field_ref(self: &m::CommonFields): &u64 {
+        Borrow(Immutable)(select_variants m::CommonFields.Foo.x|m::CommonFields.Bar.x<&m::CommonFields>(self))
+    }
+} // end 0x815::m
diff --git a/third_party/move/move-compiler-v2/tests/checking/variants/variants_ok.move b/third_party/move/move-compiler-v2/tests/checking/variants/variants_ok.move
new file mode 100644
index 0000000000000..475d96cba7825
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/variants/variants_ok.move
@@ -0,0 +1,130 @@
+module 0x815::m {
+    use 0x815::m;
+
+    enum Color {
+        RGB{red: u64, green: u64, blue: u64},
+        Red,
+        Blue,
+    }
+
+    enum ColorUsesBlockNoComma {
+        RGB{red: u64, green: u64, blue: u64}
+        Red,
+        Blue,
+    }
+
+    enum CommonFields {
+        Foo{x: u64, y: u8},
+        Bar{x: u64, z: u32}
+        Baz{other: u32}
+    }
+
+    fun t1(self: Color): bool {
+        match (self) {
+            Color::RGB{red, green, blue} => red + green + blue > 0,
+            Color::Red => true,
+            Color::Blue => false,
+        }
+    }
+
+    fun t1_field_named(self: Color): bool {
+        match (self) {
+            Color::RGB{red: r, green: g, blue} => r + g + blue > 0,
+            Color::Red => true,
+            Color::Blue => false,
+        }
+    }
+
+    fun t1_uses_block(self: Color): bool {
+        match (self) {
+            Color::RGB{red, green, blue} => { red + green + blue > 0 },
+            Color::Red => true,
+            Color::Blue => false,
+        }
+    }
+
+    fun t1_uses_block_no_comma(self: Color): bool {
+        match (self) {
+            Color::RGB{red, green, blue} => { red + green + blue > 0 }
+            Color::Red => true,
+            Color::Blue => false,
+        }
+    }
+
+    fun t1_module_qualified(self: m::Color): bool {
+        match (self) {
+            m::Color::RGB{red, green, blue} => red + green + blue > 0,
+            m::Color::Red => true,
+            m::Color::Blue => false,
+        }
+    }
+
+    fun t1_address_qualified(self: m::Color): bool {
+        match (self) {
+            0x815::m::Color::RGB{red, green, blue} => red + green + blue > 0,
+            0x815::m::Color::Red => true,
+            Color::Blue => false,
+        }
+    }
+
+    fun t2(self: Color): bool {
+        match (self) {
+            Color::RGB{red, green, blue} => red + green + blue > 0,
+            _ => true,
+        }
+    }
+
+    fun t3(self: Color): bool {
+        match (&self) {
+            Color::RGB{red, green, blue} => *red + *green + *blue > 0,
+            _ => true,
+        }
+    }
+
+    fun t4(self: Color): Color {
+        match (&mut self) {
+            Color::RGB{red, green: _, blue: _} => *red = 2,
+            _ => {},
+        };
+        self
+    }
+
+    fun t5_freeze(self: Color): u64 {
+        let x = 1;
+        let r = match (&mut self) {
+            Color::Red => &x,
+            Color::Blue => &mut x,
+            _ => &mut x,
+        };
+        *r
+    }
+
+    fun t6_construct(self: Color): Color {
+        match (self) {
+            Color::RGB{red, green, blue} => Color::RGB{red: red + 1, green: green - 1, blue},
+            _ => self
+        }
+    }
+
+    fun t7_let_unpack(self: Color): u64 {
+        // This is allowed by the checker -- bytecode generator will decide if its valid
+        let Color::RGB{red, green, blue} = self;
+        red + green + blue
+    }
+
+    fun t8_unqualified_variant(self: Color): bool {
+        match (self) {
+            RGB{red, green, blue} => red != green && green != blue,
+            Red => true,
+            Blue => false,
+        }
+    }
+
+    fun t9_common_field(self: CommonFields): u64 {
+        self.x
+    }
+
+    fun t9_common_field_ref(self: &CommonFields): &u64 {
+        &self.x
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/checking/variants/variants_parse_err1.exp b/third_party/move/move-compiler-v2/tests/checking/variants/variants_parse_err1.exp
new file mode 100644
index 0000000000000..5d8542d6650d6
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/variants/variants_parse_err1.exp
@@ -0,0 +1,10 @@
+
+Diagnostics:
+error: unexpected token
+  ┌─ tests/checking/variants/variants_parse_err1.move:7:9
+  │
+7 │         Blue,
+  │         ^^^^
+  │         │
+  │         Unexpected 'Blue'
+  │         Expected ','
diff --git a/third_party/move/move-compiler-v2/tests/checking/variants/variants_parse_err1.move b/third_party/move/move-compiler-v2/tests/checking/variants/variants_parse_err1.move
new file mode 100644
index 0000000000000..a083d82ec0db2
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/variants/variants_parse_err1.move
@@ -0,0 +1,9 @@
+module 0x815::m {
+    use 0x815::m;
+
+    enum ColorMissingComma {
+        RGB{red: u64, green: u64, blue: u64}
+        Red // , missing
+        Blue,
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/checking/variants/variants_parse_err2.exp b/third_party/move/move-compiler-v2/tests/checking/variants/variants_parse_err2.exp
new file mode 100644
index 0000000000000..726bcf634ceb8
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/variants/variants_parse_err2.exp
@@ -0,0 +1,10 @@
+
+Diagnostics:
+error: unexpected token
+  ┌─ tests/checking/variants/variants_parse_err2.move:5:12
+  │
+5 │         red: u64
+  │            ^
+  │            │
+  │            Unexpected ':'
+  │            Expected ','
diff --git a/third_party/move/move-compiler-v2/tests/checking/variants/variants_parse_err2.move b/third_party/move/move-compiler-v2/tests/checking/variants/variants_parse_err2.move
new file mode 100644
index 0000000000000..ffdbca30e6184
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/variants/variants_parse_err2.move
@@ -0,0 +1,7 @@
+module 0x815::m {
+    use 0x815::m;
+
+    enum ColorMissingVariants {
+        red: u64
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/checking/variants/variants_parse_err3.exp b/third_party/move/move-compiler-v2/tests/checking/variants/variants_parse_err3.exp
new file mode 100644
index 0000000000000..abc3bf80b42ce
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/variants/variants_parse_err3.exp
@@ -0,0 +1,10 @@
+
+Diagnostics:
+error: unexpected token
+   ┌─ tests/checking/variants/variants_parse_err3.move:13:13
+   │
+13 │             Color::Blue => false,
+   │             ^^^^^
+   │             │
+   │             Unexpected 'Color'
+   │             Expected ','
diff --git a/third_party/move/move-compiler-v2/tests/checking/variants/variants_parse_err3.move b/third_party/move/move-compiler-v2/tests/checking/variants/variants_parse_err3.move
new file mode 100644
index 0000000000000..dd3bfeb39d4cc
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/variants/variants_parse_err3.move
@@ -0,0 +1,17 @@
+module 0x815::m {
+    use 0x815::m;
+
+    enum Color {
+        RGB{red: u64, green: u64, blue: u64},
+        Red,
+        Blue,
+    }
+
+    fun match_no_comma(self: Color): bool {
+        match (self) {
+            Color::Red => true
+            Color::Blue => false,
+        }
+    }
+
+}
diff --git a/third_party/move/move-compiler-v2/tests/checking/variants/variants_parse_err4.exp b/third_party/move/move-compiler-v2/tests/checking/variants/variants_parse_err4.exp
new file mode 100644
index 0000000000000..82009fa1e716a
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/variants/variants_parse_err4.exp
@@ -0,0 +1,10 @@
+
+Diagnostics:
+error: unexpected token
+   ┌─ tests/checking/variants/variants_parse_err4.move:11:15
+   │
+11 │         match self {
+   │               ^^^^
+   │               │
+   │               Unexpected 'self'
+   │               Expected ';'
diff --git a/third_party/move/move-compiler-v2/tests/checking/variants/variants_parse_err4.move b/third_party/move/move-compiler-v2/tests/checking/variants/variants_parse_err4.move
new file mode 100644
index 0000000000000..8e38602e89129
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/variants/variants_parse_err4.move
@@ -0,0 +1,17 @@
+module 0x815::m {
+    use 0x815::m;
+
+    enum Color {
+        RGB{red: u64, green: u64, blue: u64},
+        Red,
+        Blue,
+    }
+
+    fun match_no_parenthesis(self: Color): bool {
+        match self {
+            Color::Red => true
+            Color::Blue => false,
+        }
+    }
+
+}
diff --git a/third_party/move/move-compiler-v2/tests/checking/variants/variants_test_err.exp b/third_party/move/move-compiler-v2/tests/checking/variants/variants_test_err.exp
new file mode 100644
index 0000000000000..bfc37995e884f
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/variants/variants_test_err.exp
@@ -0,0 +1,25 @@
+
+Diagnostics:
+error: variant `Circle` not declared in `m::Color`
+   ┌─ tests/checking/variants/variants_test_err.move:16:19
+   │
+16 │         (c is Red|Circle)
+   │                   ^^^^^^
+
+error: cannot return `Shape` from a function with result type `Color`
+   ┌─ tests/checking/variants/variants_test_err.move:20:19
+   │
+20 │         (c is Red|Shape::Circle)
+   │                   ^^^^^^^^^^^^^
+
+error: cannot return `Generic<u64>` from a function with result type `Generic<T>`
+   ┌─ tests/checking/variants/variants_test_err.move:29:15
+   │
+29 │         (x is Foo<u64>)
+   │               ^^^^^^^^
+
+error: cannot return `Generic<u64>` from a function with result type `Generic<T>`
+   ┌─ tests/checking/variants/variants_test_err.move:33:22
+   │
+33 │         (x is Foo<T>|Bar<u64>)
+   │                      ^^^^^^^^
diff --git a/third_party/move/move-compiler-v2/tests/checking/variants/variants_test_err.move b/third_party/move/move-compiler-v2/tests/checking/variants/variants_test_err.move
new file mode 100644
index 0000000000000..b579fd04f0f0d
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/variants/variants_test_err.move
@@ -0,0 +1,35 @@
+module 0x815::m {
+
+    enum Color {
+        RGB{red: u64, green: u64, blue: u64},
+        Red,
+        Blue,
+    }
+
+    enum Shape {
+        Quadrant{length: u64},
+        Circle{radius: u64}
+
+    }
+
+    fun test1(c: Color): bool {
+        (c is Red|Circle)
+    }
+
+    fun test2(c: Color): bool {
+        (c is Red|Shape::Circle)
+    }
+
+    enum Generic<T> {
+        Foo(T),
+        Bar(u64)
+    }
+
+    fun test_generic<T>(x: &Generic<T>): bool {
+        (x is Foo<u64>)
+    }
+
+    fun test_generic_qualified<T>(x: &Generic<T>): bool {
+        (x is Foo<T>|Bar<u64>)
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/checking/variants/variants_test_ok.exp b/third_party/move/move-compiler-v2/tests/checking/variants/variants_test_ok.exp
new file mode 100644
index 0000000000000..2662bcbd649a7
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/variants/variants_test_ok.exp
@@ -0,0 +1,35 @@
+// -- Model dump before bytecode pipeline
+module 0x815::m {
+    enum Color {
+        RGB {
+            red: u64,
+            green: u64,
+            blue: u64,
+        }
+        Red,
+        Blue,
+    }
+    enum Generic {
+        Foo {
+            0: #0,
+        }
+        Bar {
+            0: u64,
+        }
+    }
+    private fun test(c: m::Color): bool {
+        test_variants m::Color::Red|RGB(c)
+    }
+    private fun test_fully_qualified(c: m::Color): bool {
+        test_variants m::Color::Red(c)
+    }
+    private fun test_generic<T>(x: &m::Generic<#0>): bool {
+        test_variants m::Generic::Foo<T>(x)
+    }
+    private fun test_generic_qualified<T>(x: &m::Generic<#0>): bool {
+        test_variants m::Generic::Foo<T>(x)
+    }
+    private fun test_qualified(c: m::Color): bool {
+        test_variants m::Color::Red|RGB(c)
+    }
+} // end 0x815::m
diff --git a/third_party/move/move-compiler-v2/tests/checking/variants/variants_test_ok.move b/third_party/move/move-compiler-v2/tests/checking/variants/variants_test_ok.move
new file mode 100644
index 0000000000000..74ed71023aaa9
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/variants/variants_test_ok.move
@@ -0,0 +1,33 @@
+module 0x815::m {
+
+    enum Color {
+        RGB{red: u64, green: u64, blue: u64},
+        Red,
+        Blue,
+    }
+
+    fun test(c: Color): bool {
+        (c is Red|RGB)
+    }
+
+    fun test_qualified(c: Color): bool {
+        (c is Color::Red|RGB)
+    }
+
+    fun test_fully_qualified(c: Color): bool {
+        (c is 0x815::m::Color::Red)
+    }
+
+    enum Generic<T> {
+        Foo(T),
+        Bar(u64)
+    }
+
+    fun test_generic<T>(x: &Generic<T>): bool {
+        (x is Foo<T>)
+    }
+
+    fun test_generic_qualified<T>(x: &Generic<T>): bool {
+        (x is Generic::Foo<T>)
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/checking/variants/variants_test_parse_err1.exp b/third_party/move/move-compiler-v2/tests/checking/variants/variants_test_parse_err1.exp
new file mode 100644
index 0000000000000..130b590f4bc6a
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/variants/variants_test_parse_err1.exp
@@ -0,0 +1,10 @@
+
+Diagnostics:
+error: unexpected token
+   ┌─ tests/checking/variants/variants_test_parse_err1.move:10:19
+   │
+10 │         (c is Red|)
+   │                   ^
+   │                   │
+   │                   Unexpected ')'
+   │                   Expected a type name
diff --git a/third_party/move/move-compiler-v2/tests/checking/variants/variants_test_parse_err1.move b/third_party/move/move-compiler-v2/tests/checking/variants/variants_test_parse_err1.move
new file mode 100644
index 0000000000000..a0c9f2cf2fd6f
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/variants/variants_test_parse_err1.move
@@ -0,0 +1,12 @@
+module 0x815::m {
+
+    enum Color {
+        RGB{red: u64, green: u64, blue: u64},
+        Red,
+        Blue,
+    }
+
+    fun test_red_or_rgb(c: Color): bool {
+        (c is Red|)
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/checking/variants/variants_test_parse_err2.exp b/third_party/move/move-compiler-v2/tests/checking/variants/variants_test_parse_err2.exp
new file mode 100644
index 0000000000000..bd2f9396972d9
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/variants/variants_test_parse_err2.exp
@@ -0,0 +1,10 @@
+
+Diagnostics:
+error: unexpected token
+   ┌─ tests/checking/variants/variants_test_parse_err2.move:10:11
+   │
+10 │         c is Red
+   │           ^^
+   │           │
+   │           Unexpected 'is'
+   │           Expected ';'
diff --git a/third_party/move/move-compiler-v2/tests/checking/variants/variants_test_parse_err2.move b/third_party/move/move-compiler-v2/tests/checking/variants/variants_test_parse_err2.move
new file mode 100644
index 0000000000000..fc577120faaef
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/variants/variants_test_parse_err2.move
@@ -0,0 +1,12 @@
+module 0x815::m {
+
+    enum Color {
+        RGB{red: u64, green: u64, blue: u64},
+        Red,
+        Blue,
+    }
+
+    fun test_red_or_rgb(c: Color): bool {
+        c is Red
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/checking/visibility-checker/parser_package_keyword.exp b/third_party/move/move-compiler-v2/tests/checking/visibility-checker/parser_package_keyword.exp
new file mode 100644
index 0000000000000..89a30d8357d83
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/visibility-checker/parser_package_keyword.exp
@@ -0,0 +1,9 @@
+// -- Model dump before bytecode pipeline
+module 0x42::package {
+    friend fun package(package: u8): u8 {
+        {
+          let package: u8 = Add<u8>(package, 1);
+          package
+        }
+    }
+} // end 0x42::package
diff --git a/third_party/move/move-compiler-v2/tests/checking/visibility-checker/parser_package_keyword.move b/third_party/move/move-compiler-v2/tests/checking/visibility-checker/parser_package_keyword.move
new file mode 100644
index 0000000000000..ef150d5c57293
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/checking/visibility-checker/parser_package_keyword.move
@@ -0,0 +1,6 @@
+module 0x42::package {
+    public(package) fun package(package: u8): u8 {
+        let package = package + 1;
+        package
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/copy-propagation/call_1.exp b/third_party/move/move-compiler-v2/tests/copy-propagation/call_1.exp
index 1d261d0a9ea43..4f541ca8bee89 100644
--- a/third_party/move/move-compiler-v2/tests/copy-propagation/call_1.exp
+++ b/third_party/move/move-compiler-v2/tests/copy-propagation/call_1.exp
@@ -33,6 +33,14 @@ fun m::test($t0: u64): u64 {
   6: return $t1
 }
 
+
+Diagnostics:
+warning: Unused assignment to `a`. Consider removing or prefixing with an underscore: `_a`
+  ┌─ tests/copy-propagation/call_1.move:7:17
+  │
+7 │         let a = p;
+  │                 ^
+
 ============ after DeadStoreElimination: ================
 
 [variant baseline]
diff --git a/third_party/move/move-compiler-v2/tests/copy-propagation/immut_refs_2.exp b/third_party/move/move-compiler-v2/tests/copy-propagation/immut_refs_2.exp
index 44e212ca9cdf2..e8f24c1e067df 100644
--- a/third_party/move/move-compiler-v2/tests/copy-propagation/immut_refs_2.exp
+++ b/third_party/move/move-compiler-v2/tests/copy-propagation/immut_refs_2.exp
@@ -23,6 +23,14 @@ fun m::test($t0: u64): u64 {
   5: return $t1
 }
 
+
+Diagnostics:
+warning: Unused assignment to `a`. Consider removing or prefixing with an underscore: `_a`
+  ┌─ tests/copy-propagation/immut_refs_2.move:4:17
+  │
+4 │         let a = &p;
+  │                 ^^
+
 ============ after DeadStoreElimination: ================
 
 [variant baseline]
diff --git a/third_party/move/move-compiler-v2/tests/copy-propagation/seq_kills_1.exp b/third_party/move/move-compiler-v2/tests/copy-propagation/seq_kills_1.exp
index 55bc0e2c25d3d..5cafa1aff0973 100644
--- a/third_party/move/move-compiler-v2/tests/copy-propagation/seq_kills_1.exp
+++ b/third_party/move/move-compiler-v2/tests/copy-propagation/seq_kills_1.exp
@@ -18,6 +18,14 @@ fun m::test($t0: u64): bool {
   7: return $t1
 }
 
+
+Diagnostics:
+warning: Unused assignment to `b`. Consider removing or prefixing with an underscore: `_b`
+  ┌─ tests/copy-propagation/seq_kills_1.move:7:9
+  │
+7 │         b = p + 1; // kill b := a, which removes the whole copy chain
+  │         ^^^^^^^^^
+
 ============ after DeadStoreElimination: ================
 
 [variant baseline]
diff --git a/third_party/move/move-compiler-v2/tests/copy-propagation/seq_kills_2.exp b/third_party/move/move-compiler-v2/tests/copy-propagation/seq_kills_2.exp
index 3680de01d0e30..c4103b2556510 100644
--- a/third_party/move/move-compiler-v2/tests/copy-propagation/seq_kills_2.exp
+++ b/third_party/move/move-compiler-v2/tests/copy-propagation/seq_kills_2.exp
@@ -18,6 +18,14 @@ fun m::test($t0: u64): bool {
   7: return $t1
 }
 
+
+Diagnostics:
+warning: Unused assignment to `a`. Consider removing or prefixing with an underscore: `_a`
+  ┌─ tests/copy-propagation/seq_kills_2.move:7:9
+  │
+7 │         a = p + 1; // kill b := a
+  │         ^^^^^^^^^
+
 ============ after DeadStoreElimination: ================
 
 [variant baseline]
diff --git a/third_party/move/move-compiler-v2/tests/copy-propagation/straight_line_kills.exp b/third_party/move/move-compiler-v2/tests/copy-propagation/straight_line_kills.exp
index aeb8910c1d774..5b0207d4fbdac 100644
--- a/third_party/move/move-compiler-v2/tests/copy-propagation/straight_line_kills.exp
+++ b/third_party/move/move-compiler-v2/tests/copy-propagation/straight_line_kills.exp
@@ -16,6 +16,14 @@ fun m::copy_kill($t0: u64): u64 {
   6: return $t1
 }
 
+
+Diagnostics:
+warning: Unused assignment to `p`. Consider removing or prefixing with an underscore: `_p`
+  ┌─ tests/copy-propagation/straight_line_kills.move:5:9
+  │
+5 │         p = p + 1;
+  │         ^^^^^^^^^
+
 ============ after DeadStoreElimination: ================
 
 [variant baseline]
diff --git a/third_party/move/move-compiler-v2/tests/deprecated/deprecated_constant_duplicated_struct.exp b/third_party/move/move-compiler-v2/tests/deprecated/deprecated_constant_duplicated_struct.exp
new file mode 100644
index 0000000000000..a30fe67df07d0
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/deprecated/deprecated_constant_duplicated_struct.exp
@@ -0,0 +1,27 @@
+
+Diagnostics:
+error: duplicate declaration, item, or annotation
+  ┌─ tests/deprecated/deprecated_constant_duplicated_struct.move:5:11
+  │
+4 │     struct C { }
+  │            - Alias previously defined here
+5 │     const C: u64 = 0;
+  │           ^ Duplicate module member or alias 'C'. Top level names in a namespace must be unique
+
+warning: unused alias
+   ┌─ tests/deprecated/deprecated_constant_duplicated_struct.move:12:15
+   │
+12 │     use 0x42::mod1;
+   │               ^^^^ Unused 'use' of alias 'mod1'. Consider removing it
+
+warning: unused alias
+   ┌─ tests/deprecated/deprecated_constant_duplicated_struct.move:31:15
+   │
+31 │     use 0x42::mod1;
+   │               ^^^^ Unused 'use' of alias 'mod1'. Consider removing it
+
+error: invalid name
+   ┌─ tests/deprecated/deprecated_constant_duplicated_struct.move:32:26
+   │
+32 │     use 0x42::mod1::C as mod1;
+   │                          ^^^^ Invalid constant alias name 'mod1'. Constant alias names must start with 'A'..'Z'
diff --git a/third_party/move/move-compiler-v2/tests/deprecated/deprecated_constant_duplicated_struct.move b/third_party/move/move-compiler-v2/tests/deprecated/deprecated_constant_duplicated_struct.move
new file mode 100644
index 0000000000000..e700dd74e7aec
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/deprecated/deprecated_constant_duplicated_struct.move
@@ -0,0 +1,44 @@
+address 0x42 {
+module mod1 {
+    #[deprecated]
+    struct C { }
+    const C: u64 = 0;
+    public fun mod1() {}
+}
+}
+
+address 0x41 {
+module N {
+    use 0x42::mod1;
+    use 0x42::mod1::C as D;
+    use 0x42::mod1::C as C;
+    use 0x42::mod1::mod1;
+
+    fun f1(): 0x42::mod1::C {
+	mod1();
+	C;
+	{
+	    use 0x42::mod1::C;
+	    C
+	};
+	D
+    }
+}
+}
+
+
+script {
+    use 0x42::mod1;
+    use 0x42::mod1::C as mod1;
+    use 0x42::mod1::C as C;
+    use 0x42::mod1::mod1;
+
+    fun f1(): 0x42::mod1::C {
+	mod1();
+	C;
+	{
+	    use 0x42::mod1::C;
+	    C
+	}
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/deprecated/deprecated_constant_duplicated_struct2.exp b/third_party/move/move-compiler-v2/tests/deprecated/deprecated_constant_duplicated_struct2.exp
new file mode 100644
index 0000000000000..9f0348c6e4d2e
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/deprecated/deprecated_constant_duplicated_struct2.exp
@@ -0,0 +1,145 @@
+
+Diagnostics:
+error: duplicate declaration, item, or annotation
+  ┌─ tests/deprecated/deprecated_constant_duplicated_struct2.move:5:11
+  │
+3 │     struct C { }
+  │            - Alias previously defined here
+4 │     #[deprecated]
+5 │     const C: u64 = 0;
+  │           ^ Duplicate module member or alias 'C'. Top level names in a namespace must be unique
+
+warning: unused alias
+   ┌─ tests/deprecated/deprecated_constant_duplicated_struct2.move:12:15
+   │
+12 │     use 0x42::mod1;
+   │               ^^^^ Unused 'use' of alias 'mod1'. Consider removing it
+
+warning: Use of deprecated constant
+   ┌─ tests/deprecated/deprecated_constant_duplicated_struct2.move:13:21
+   │
+ 4 │     #[deprecated]
+   │       ---------- Constant 'C' in module '0x42::mod1' deprecated here
+   ·
+13 │     use 0x42::mod1::C as D;
+   │                     ^ Use of deprecated constant 'C' from module '0x42::mod1'
+
+warning: Use of deprecated constant
+   ┌─ tests/deprecated/deprecated_constant_duplicated_struct2.move:14:21
+   │
+ 4 │     #[deprecated]
+   │       ---------- Constant 'C' in module '0x42::mod1' deprecated here
+   ·
+14 │     use 0x42::mod1::C as C;
+   │                     ^ Use of deprecated constant 'C' from module '0x42::mod1'
+
+warning: Use of deprecated struct
+   ┌─ tests/deprecated/deprecated_constant_duplicated_struct2.move:17:27
+   │
+ 4 │     #[deprecated]
+   │       ---------- Struct 'C' in module '0x42::mod1' deprecated here
+   ·
+17 │     fun f1(): 0x42::mod1::C {
+   │                           ^ Use of deprecated struct 'C' from module '0x42::mod1'
+
+warning: Use of deprecated member
+   ┌─ tests/deprecated/deprecated_constant_duplicated_struct2.move:19:2
+   │
+ 4 │     #[deprecated]
+   │       ---------- Member 'C' in module '0x42::mod1' deprecated here
+   ·
+19 │     C;
+   │     ^ Use of deprecated member 'C' from module '0x42::mod1'
+
+warning: Use of deprecated constant
+   ┌─ tests/deprecated/deprecated_constant_duplicated_struct2.move:21:22
+   │
+ 4 │     #[deprecated]
+   │       ---------- Constant 'C' in module '0x42::mod1' deprecated here
+   ·
+21 │         use 0x42::mod1::C;
+   │                         ^ Use of deprecated constant 'C' from module '0x42::mod1'
+
+warning: Use of deprecated member
+   ┌─ tests/deprecated/deprecated_constant_duplicated_struct2.move:22:6
+   │
+ 4 │     #[deprecated]
+   │       ---------- Member 'C' in module '0x42::mod1' deprecated here
+   ·
+22 │         C
+   │         ^ Use of deprecated member 'C' from module '0x42::mod1'
+
+warning: Use of deprecated member
+   ┌─ tests/deprecated/deprecated_constant_duplicated_struct2.move:24:2
+   │
+ 4 │     #[deprecated]
+   │       ---------- Member 'C' in module '0x42::mod1' deprecated here
+   ·
+24 │     D
+   │     ^ Use of deprecated member 'C' from module '0x42::mod1'
+
+warning: unused alias
+   ┌─ tests/deprecated/deprecated_constant_duplicated_struct2.move:31:15
+   │
+31 │     use 0x42::mod1;
+   │               ^^^^ Unused 'use' of alias 'mod1'. Consider removing it
+
+warning: Use of deprecated constant
+   ┌─ tests/deprecated/deprecated_constant_duplicated_struct2.move:32:21
+   │
+ 4 │     #[deprecated]
+   │       ---------- Constant 'C' in module '0x42::mod1' deprecated here
+   ·
+32 │     use 0x42::mod1::C as mod1;
+   │                     ^ Use of deprecated constant 'C' from module '0x42::mod1'
+
+error: invalid name
+   ┌─ tests/deprecated/deprecated_constant_duplicated_struct2.move:32:26
+   │
+32 │     use 0x42::mod1::C as mod1;
+   │                          ^^^^ Invalid constant alias name 'mod1'. Constant alias names must start with 'A'..'Z'
+
+warning: Use of deprecated constant
+   ┌─ tests/deprecated/deprecated_constant_duplicated_struct2.move:33:21
+   │
+ 4 │     #[deprecated]
+   │       ---------- Constant 'C' in module '0x42::mod1' deprecated here
+   ·
+33 │     use 0x42::mod1::C as C;
+   │                     ^ Use of deprecated constant 'C' from module '0x42::mod1'
+
+warning: Use of deprecated struct
+   ┌─ tests/deprecated/deprecated_constant_duplicated_struct2.move:36:27
+   │
+ 4 │     #[deprecated]
+   │       ---------- Struct 'C' in module '0x42::mod1' deprecated here
+   ·
+36 │     fun f1(): 0x42::mod1::C {
+   │                           ^ Use of deprecated struct 'C' from module '0x42::mod1'
+
+warning: Use of deprecated member
+   ┌─ tests/deprecated/deprecated_constant_duplicated_struct2.move:38:2
+   │
+ 4 │     #[deprecated]
+   │       ---------- Member 'C' in module '0x42::mod1' deprecated here
+   ·
+38 │     C;
+   │     ^ Use of deprecated member 'C' from module '0x42::mod1'
+
+warning: Use of deprecated constant
+   ┌─ tests/deprecated/deprecated_constant_duplicated_struct2.move:40:22
+   │
+ 4 │     #[deprecated]
+   │       ---------- Constant 'C' in module '0x42::mod1' deprecated here
+   ·
+40 │         use 0x42::mod1::C;
+   │                         ^ Use of deprecated constant 'C' from module '0x42::mod1'
+
+warning: Use of deprecated member
+   ┌─ tests/deprecated/deprecated_constant_duplicated_struct2.move:41:6
+   │
+ 4 │     #[deprecated]
+   │       ---------- Member 'C' in module '0x42::mod1' deprecated here
+   ·
+41 │         C
+   │         ^ Use of deprecated member 'C' from module '0x42::mod1'
diff --git a/third_party/move/move-compiler-v2/tests/deprecated/deprecated_constant_duplicated_struct2.move b/third_party/move/move-compiler-v2/tests/deprecated/deprecated_constant_duplicated_struct2.move
new file mode 100644
index 0000000000000..faf1c9ff4b518
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/deprecated/deprecated_constant_duplicated_struct2.move
@@ -0,0 +1,44 @@
+address 0x42 {
+module mod1 {
+    struct C { }
+    #[deprecated]
+    const C: u64 = 0;
+    public fun mod1() {}
+}
+}
+
+address 0x41 {
+module N {
+    use 0x42::mod1;
+    use 0x42::mod1::C as D;
+    use 0x42::mod1::C as C;
+    use 0x42::mod1::mod1;
+
+    fun f1(): 0x42::mod1::C {
+	mod1();
+	C;
+	{
+	    use 0x42::mod1::C;
+	    C
+	};
+	D
+    }
+}
+}
+
+
+script {
+    use 0x42::mod1;
+    use 0x42::mod1::C as mod1;
+    use 0x42::mod1::C as C;
+    use 0x42::mod1::mod1;
+
+    fun f1(): 0x42::mod1::C {
+	mod1();
+	C;
+	{
+	    use 0x42::mod1::C;
+	    C
+	}
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/deprecated/deprecated_field_type.exp b/third_party/move/move-compiler-v2/tests/deprecated/deprecated_field_type.exp
new file mode 100644
index 0000000000000..9b2175d2d571a
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/deprecated/deprecated_field_type.exp
@@ -0,0 +1,31 @@
+
+Diagnostics:
+warning: Use of deprecated struct
+   ┌─ tests/deprecated/deprecated_field_type.move:17:22
+   │
+ 3 │     #[deprecated]
+   │       ---------- Struct 'EventHandle' in module '0x42::event' deprecated here
+   ·
+17 │     use 0x42::event::EventHandle;
+   │                      ^^^^^^^^^^^ Use of deprecated struct 'EventHandle' from module '0x42::event'
+
+warning: Use of deprecated struct
+   ┌─ tests/deprecated/deprecated_field_type.move:27:25
+   │
+ 3 │     #[deprecated]
+   │       ---------- Struct 'EventHandle' in module '0x42::event' deprecated here
+   ·
+27 │         deposit_events: EventHandle<DepositEvent>,
+   │                         ^^^^^^^^^^^ Use of deprecated struct 'EventHandle' from module '0x42::event'
+
+warning: Use of deprecated struct
+   ┌─ tests/deprecated/deprecated_field_type.move:28:26
+   │
+ 3 │     #[deprecated]
+   │       ---------- Struct 'EventHandle' in module '0x42::event' deprecated here
+   ·
+28 │         withdraw_events: EventHandle<WithdrawEvent>,
+   │                          ^^^^^^^^^^^ Use of deprecated struct 'EventHandle' from module '0x42::event'
+
+
+============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/deprecated/deprecated_field_type.move b/third_party/move/move-compiler-v2/tests/deprecated/deprecated_field_type.move
new file mode 100644
index 0000000000000..7b8603579e617
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/deprecated/deprecated_field_type.move
@@ -0,0 +1,30 @@
+module 0x42::event {
+
+    #[deprecated]
+    /// A handle for an event such that:
+    /// 1. Other modules can emit events to this handle.
+    /// 2. Storage can use this handle to prove the total number of events that happened in the past.
+    struct EventHandle<phantom T: drop + store> has store {
+        /// Total number of events emitted to this event stream.
+        counter: u64,
+        /// A globally unique ID for this event stream.
+        guid: u64,
+    }
+
+}
+
+module 0x41::coin {
+    use 0x42::event::EventHandle;
+
+    struct Coin<phantom T> has store { }
+    struct CoinType has key {}
+    struct DepositEvent has drop, store {}
+    struct WithdrawEvent has drop, store {}
+
+    struct CoinStore<phantom CoinType> has key {
+        coin: Coin<CoinType>,
+        frozen: bool,
+        deposit_events: EventHandle<DepositEvent>,
+        withdraw_events: EventHandle<WithdrawEvent>,
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/deprecated/deprecated_field_type2.exp b/third_party/move/move-compiler-v2/tests/deprecated/deprecated_field_type2.exp
new file mode 100644
index 0000000000000..9fd7327c3f1ee
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/deprecated/deprecated_field_type2.exp
@@ -0,0 +1,13 @@
+
+Diagnostics:
+warning: Use of deprecated struct
+   ┌─ tests/deprecated/deprecated_field_type2.move:29:38
+   │
+22 │     #[deprecated]
+   │       ---------- Struct 'WithdrawEvent' in module '0x41::coin' deprecated here
+   ·
+29 │         withdraw_events: EventHandle<WithdrawEvent>,
+   │                                      ^^^^^^^^^^^^^ Use of deprecated struct 'WithdrawEvent' from module '0x41::coin'
+
+
+============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/deprecated/deprecated_field_type2.move b/third_party/move/move-compiler-v2/tests/deprecated/deprecated_field_type2.move
new file mode 100644
index 0000000000000..f21a61fedec9a
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/deprecated/deprecated_field_type2.move
@@ -0,0 +1,31 @@
+module 0x42::event {
+
+    /// A handle for an event such that:
+    /// 1. Other modules can emit events to this handle.
+    /// 2. Storage can use this handle to prove the total number of events that happened in the past.
+    struct EventHandle<phantom T: drop + store> has store {
+        /// Total number of events emitted to this event stream.
+        counter: u64,
+        /// A globally unique ID for this event stream.
+        guid: u64,
+    }
+
+}
+
+module 0x41::coin {
+    use 0x42::event::EventHandle;
+
+    struct Coin<phantom T> has store { }
+    struct CoinType has key {}
+    struct DepositEvent has drop, store {}
+
+    #[deprecated]
+    struct WithdrawEvent has drop, store {}
+
+    struct CoinStore<phantom CoinType> has key {
+        coin: Coin<CoinType>,
+        frozen: bool,
+        deposit_events: EventHandle<DepositEvent>,
+        withdraw_events: EventHandle<WithdrawEvent>,
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/deprecated/deprecated_placement_address.exp b/third_party/move/move-compiler-v2/tests/deprecated/deprecated_placement_address.exp
new file mode 100644
index 0000000000000..c492663d4fe27
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/deprecated/deprecated_placement_address.exp
@@ -0,0 +1,22 @@
+
+Diagnostics:
+warning: Use of deprecated module
+   ┌─ tests/deprecated/deprecated_placement_address.move:25:9
+   │
+ 1 │ #[deprecated]
+   │   ---------- Module '0x42::M' deprecated here
+   ·
+25 │     use 0x42::M;
+   │         ^^^^^^^ Use of deprecated module '0x42::M'
+
+warning: Use of deprecated module
+   ┌─ tests/deprecated/deprecated_placement_address.move:29:15
+   │
+ 1 │ #[deprecated]
+   │   ---------- Module '0x42::M' deprecated here
+   ·
+29 │     let foo: S = M::foo();
+   │                  ^ Use of deprecated module '0x42::M'
+
+
+============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/deprecated/deprecated_placement_address.move b/third_party/move/move-compiler-v2/tests/deprecated/deprecated_placement_address.move
new file mode 100644
index 0000000000000..368cb7469e473
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/deprecated/deprecated_placement_address.move
@@ -0,0 +1,34 @@
+#[deprecated]
+address 0x42 {
+module M {
+    use 0x41::N;
+
+    struct S {}
+
+    const C: u64 = 0;
+
+    public fun foo(): N::S { let _foo = C + 3; N::bar() }
+
+    spec foo {}
+}
+}
+
+module 0x41::N {
+    struct S has drop { }
+
+    public fun bar(): S { S { } }
+
+    public fun consume(_x: S) { }
+}
+
+script {
+    use 0x42::M;
+    use 0x41::N::S;
+
+    fun main() {
+	let foo: S = M::foo();
+	0x41::N::consume(foo);
+    }
+
+    spec main { }
+}
diff --git a/third_party/move/move-compiler-v2/tests/deprecated/deprecated_placement_address_module_members.exp b/third_party/move/move-compiler-v2/tests/deprecated/deprecated_placement_address_module_members.exp
new file mode 100644
index 0000000000000..9e1d702f7c4a8
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/deprecated/deprecated_placement_address_module_members.exp
@@ -0,0 +1,76 @@
+
+Diagnostics:
+warning: Use of deprecated module
+   ┌─ tests/deprecated/deprecated_placement_address_module_members.move:33:9
+   │
+ 1 │ #[deprecated]  // Think about using 0x43 instead
+   │   ---------- Module '0x42::M' deprecated here
+   ·
+33 │     use 0x42::M;
+   │         ^^^^^^^ Use of deprecated module '0x42::M'
+
+warning: Use of deprecated module
+   ┌─ tests/deprecated/deprecated_placement_address_module_members.move:34:9
+   │
+20 │ #[deprecated]
+   │   ---------- Module '0x41::N' deprecated here
+   ·
+34 │     use 0x41::N::S;
+   │         ^^^^^^^ Use of deprecated module '0x41::N'
+
+warning: Use of deprecated struct
+   ┌─ tests/deprecated/deprecated_placement_address_module_members.move:34:18
+   │
+22 │     #[deprecated]
+   │       ---------- Struct 'S' in module '0x41::N' deprecated here
+   ·
+34 │     use 0x41::N::S;
+   │                  ^ Use of deprecated struct 'S' from module '0x41::N'
+
+warning: Use of deprecated struct
+   ┌─ tests/deprecated/deprecated_placement_address_module_members.move:37:11
+   │
+22 │     #[deprecated]
+   │       ---------- Struct 'S' in module '0x41::N' deprecated here
+   ·
+37 │     let foo: S = M::foo();
+   │              ^ Use of deprecated struct 'S' from module '0x41::N'
+
+warning: Use of deprecated module
+   ┌─ tests/deprecated/deprecated_placement_address_module_members.move:37:15
+   │
+ 1 │ #[deprecated]  // Think about using 0x43 instead
+   │   ---------- Module '0x42::M' deprecated here
+   ·
+37 │     let foo: S = M::foo();
+   │                  ^ Use of deprecated module '0x42::M'
+
+warning: Use of deprecated function
+   ┌─ tests/deprecated/deprecated_placement_address_module_members.move:37:18
+   │
+13 │     #[deprecated]
+   │       ---------- Function 'foo' in module '0x42::M' deprecated here
+   ·
+37 │     let foo: S = M::foo();
+   │                     ^^^ Use of deprecated function 'foo' from module '0x42::M'
+
+warning: Use of deprecated module
+   ┌─ tests/deprecated/deprecated_placement_address_module_members.move:38:2
+   │
+20 │ #[deprecated]
+   │   ---------- Module '0x41::N' deprecated here
+   ·
+38 │     0x41::N::consume(foo);
+   │     ^^^^^^^ Use of deprecated module '0x41::N'
+
+warning: Use of deprecated function
+   ┌─ tests/deprecated/deprecated_placement_address_module_members.move:38:11
+   │
+28 │     #[deprecated]
+   │       ---------- Function 'consume' in module '0x41::N' deprecated here
+   ·
+38 │     0x41::N::consume(foo);
+   │              ^^^^^^^ Use of deprecated function 'consume' from module '0x41::N'
+
+
+============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/deprecated/deprecated_placement_address_module_members.move b/third_party/move/move-compiler-v2/tests/deprecated/deprecated_placement_address_module_members.move
new file mode 100644
index 0000000000000..361ac55d38042
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/deprecated/deprecated_placement_address_module_members.move
@@ -0,0 +1,42 @@
+#[deprecated]  // Think about using 0x43 instead
+address 0x42 {
+#[deprecated]  // Try module M2
+module M {
+    use 0x41::N;
+
+    #[deprecated]
+    struct S {}
+
+    #[deprecated]
+    const C: u64 = 0;
+
+    #[deprecated]
+    public fun foo(): N::S { let _foo = C + 3; N::bar() }
+
+    spec foo {}
+}
+}
+
+#[deprecated]
+module 0x41::N {
+    #[deprecated]
+    struct S has drop { }
+
+    #[deprecated]
+    public fun bar(): S { S { } }
+
+    #[deprecated]
+    public fun consume(_x: S) { }
+}
+
+script {
+    use 0x42::M;
+    use 0x41::N::S;
+
+    fun main() {
+	let foo: S = M::foo();
+	0x41::N::consume(foo);
+    }
+
+    spec main { }
+}
diff --git a/third_party/move/move-compiler-v2/tests/deprecated/deprecated_placement_members.exp b/third_party/move/move-compiler-v2/tests/deprecated/deprecated_placement_members.exp
new file mode 100644
index 0000000000000..c5aa40b0e3e3f
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/deprecated/deprecated_placement_members.exp
@@ -0,0 +1,40 @@
+
+Diagnostics:
+warning: Use of deprecated struct
+   ┌─ tests/deprecated/deprecated_placement_members.move:31:18
+   │
+19 │     #[deprecated]
+   │       ---------- Struct 'S' in module '0x41::N' deprecated here
+   ·
+31 │     use 0x41::N::S;
+   │                  ^ Use of deprecated struct 'S' from module '0x41::N'
+
+warning: Use of deprecated struct
+   ┌─ tests/deprecated/deprecated_placement_members.move:34:11
+   │
+19 │     #[deprecated]
+   │       ---------- Struct 'S' in module '0x41::N' deprecated here
+   ·
+34 │     let foo: S = M::foo();
+   │              ^ Use of deprecated struct 'S' from module '0x41::N'
+
+warning: Use of deprecated function
+   ┌─ tests/deprecated/deprecated_placement_members.move:34:18
+   │
+11 │     #[deprecated]
+   │       ---------- Function 'foo' in module '0x42::M' deprecated here
+   ·
+34 │     let foo: S = M::foo();
+   │                     ^^^ Use of deprecated function 'foo' from module '0x42::M'
+
+warning: Use of deprecated function
+   ┌─ tests/deprecated/deprecated_placement_members.move:35:11
+   │
+25 │     #[deprecated]
+   │       ---------- Function 'consume' in module '0x41::N' deprecated here
+   ·
+35 │     0x41::N::consume(foo);
+   │              ^^^^^^^ Use of deprecated function 'consume' from module '0x41::N'
+
+
+============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/deprecated/deprecated_placement_members.move b/third_party/move/move-compiler-v2/tests/deprecated/deprecated_placement_members.move
new file mode 100644
index 0000000000000..c05b48447a29a
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/deprecated/deprecated_placement_members.move
@@ -0,0 +1,39 @@
+address 0x42 {
+module M {
+    use 0x41::N;
+
+    #[deprecated]
+    struct S {}
+
+    #[deprecated]
+    const C: u64 = 0;
+
+    #[deprecated]
+    public fun foo(): N::S { let _foo = C + 3; N::bar() }
+
+    spec foo {}
+}
+}
+
+module 0x41::N {
+    #[deprecated]
+    struct S has drop { }
+
+    #[deprecated]
+    public fun bar(): S { S { } }
+
+    #[deprecated]
+    public fun consume(_x: S) { }
+}
+
+script {
+    use 0x42::M;
+    use 0x41::N::S;
+
+    fun main() {
+	let foo: S = M::foo();
+	0x41::N::consume(foo);
+    }
+
+    spec main { }
+}
diff --git a/third_party/move/move-compiler-v2/tests/deprecated/deprecated_placement_module.exp b/third_party/move/move-compiler-v2/tests/deprecated/deprecated_placement_module.exp
new file mode 100644
index 0000000000000..68a6f21363dd5
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/deprecated/deprecated_placement_module.exp
@@ -0,0 +1,22 @@
+
+Diagnostics:
+warning: Use of deprecated module
+   ┌─ tests/deprecated/deprecated_placement_module.move:25:9
+   │
+ 2 │ #[deprecated]
+   │   ---------- Module '0x42::M' deprecated here
+   ·
+25 │     use 0x42::M;
+   │         ^^^^^^^ Use of deprecated module '0x42::M'
+
+warning: Use of deprecated module
+   ┌─ tests/deprecated/deprecated_placement_module.move:29:15
+   │
+ 2 │ #[deprecated]
+   │   ---------- Module '0x42::M' deprecated here
+   ·
+29 │     let foo: S = M::foo();
+   │                  ^ Use of deprecated module '0x42::M'
+
+
+============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/deprecated/deprecated_placement_module.move b/third_party/move/move-compiler-v2/tests/deprecated/deprecated_placement_module.move
new file mode 100644
index 0000000000000..7f2041ed6215a
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/deprecated/deprecated_placement_module.move
@@ -0,0 +1,34 @@
+address 0x42 {
+#[deprecated]
+module M {
+    use 0x41::N;
+
+    struct S {}
+
+    const C: u64 = 0;
+
+    public fun foo(): N::S { let _foo = C + 3; N::bar() }
+
+    spec foo {}
+}
+}
+
+module 0x41::N {
+    struct S has drop { }
+
+    public fun bar(): S { S { } }
+
+    public fun consume(_x: S) { }
+}
+
+script {
+    use 0x42::M;
+    use 0x41::N::S;
+
+    fun main() {
+	let foo: S = M::foo();
+	0x41::N::consume(foo);
+    }
+
+    spec main { }
+}
diff --git a/third_party/move/move-compiler-v2/tests/deprecated/deprecated_placement_module2.exp b/third_party/move/move-compiler-v2/tests/deprecated/deprecated_placement_module2.exp
new file mode 100644
index 0000000000000..ab9447a567186
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/deprecated/deprecated_placement_module2.exp
@@ -0,0 +1,49 @@
+
+Diagnostics:
+warning: Use of deprecated module
+   ┌─ tests/deprecated/deprecated_placement_module2.move:3:9
+   │
+ 3 │     use 0x41::N;
+   │         ^^^^^^^ Use of deprecated module '0x41::N'
+   ·
+15 │ #[deprecated]
+   │   ---------- Module '0x41::N' deprecated here
+
+warning: Use of deprecated module
+   ┌─ tests/deprecated/deprecated_placement_module2.move:9:23
+   │
+ 9 │     public fun foo(): N::S { let _foo = C + 3; N::bar() }
+   │                       ^ Use of deprecated module '0x41::N'
+   ·
+15 │ #[deprecated]
+   │   ---------- Module '0x41::N' deprecated here
+
+warning: Use of deprecated module
+   ┌─ tests/deprecated/deprecated_placement_module2.move:9:48
+   │
+ 9 │     public fun foo(): N::S { let _foo = C + 3; N::bar() }
+   │                                                ^ Use of deprecated module '0x41::N'
+   ·
+15 │ #[deprecated]
+   │   ---------- Module '0x41::N' deprecated here
+
+warning: Use of deprecated module
+   ┌─ tests/deprecated/deprecated_placement_module2.move:26:9
+   │
+15 │ #[deprecated]
+   │   ---------- Module '0x41::N' deprecated here
+   ·
+26 │     use 0x41::N::S;
+   │         ^^^^^^^ Use of deprecated module '0x41::N'
+
+warning: Use of deprecated module
+   ┌─ tests/deprecated/deprecated_placement_module2.move:30:2
+   │
+15 │ #[deprecated]
+   │   ---------- Module '0x41::N' deprecated here
+   ·
+30 │     0x41::N::consume(foo);
+   │     ^^^^^^^ Use of deprecated module '0x41::N'
+
+
+============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/deprecated/deprecated_placement_module2.move b/third_party/move/move-compiler-v2/tests/deprecated/deprecated_placement_module2.move
new file mode 100644
index 0000000000000..a1a98631b86d8
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/deprecated/deprecated_placement_module2.move
@@ -0,0 +1,34 @@
+address 0x42 {
+module M {
+    use 0x41::N;
+
+    struct S {}
+
+    const C: u64 = 0;
+
+    public fun foo(): N::S { let _foo = C + 3; N::bar() }
+
+    spec foo {}
+}
+}
+
+#[deprecated]
+module 0x41::N {
+    struct S has drop { }
+
+    public fun bar(): S { S { } }
+
+    public fun consume(_x: S) { }
+}
+
+script {
+    use 0x42::M;
+    use 0x41::N::S;
+
+    fun main() {
+	let foo: S = M::foo();
+	0x41::N::consume(foo);
+    }
+
+    spec main { }
+}
diff --git a/third_party/move/move-compiler-v2/tests/deprecated/deprecated_placement_module_members.exp b/third_party/move/move-compiler-v2/tests/deprecated/deprecated_placement_module_members.exp
new file mode 100644
index 0000000000000..d8e3badc5994f
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/deprecated/deprecated_placement_module_members.exp
@@ -0,0 +1,76 @@
+
+Diagnostics:
+warning: Use of deprecated module
+   ┌─ tests/deprecated/deprecated_placement_module_members.move:32:9
+   │
+ 2 │ #[deprecated]
+   │   ---------- Module '0x42::M' deprecated here
+   ·
+32 │     use 0x42::M;
+   │         ^^^^^^^ Use of deprecated module '0x42::M'
+
+warning: Use of deprecated module
+   ┌─ tests/deprecated/deprecated_placement_module_members.move:33:9
+   │
+19 │ #[deprecated]
+   │   ---------- Module '0x41::N' deprecated here
+   ·
+33 │     use 0x41::N::S;
+   │         ^^^^^^^ Use of deprecated module '0x41::N'
+
+warning: Use of deprecated struct
+   ┌─ tests/deprecated/deprecated_placement_module_members.move:33:18
+   │
+21 │     #[deprecated]
+   │       ---------- Struct 'S' in module '0x41::N' deprecated here
+   ·
+33 │     use 0x41::N::S;
+   │                  ^ Use of deprecated struct 'S' from module '0x41::N'
+
+warning: Use of deprecated struct
+   ┌─ tests/deprecated/deprecated_placement_module_members.move:36:11
+   │
+21 │     #[deprecated]
+   │       ---------- Struct 'S' in module '0x41::N' deprecated here
+   ·
+36 │     let foo: S = M::foo();
+   │              ^ Use of deprecated struct 'S' from module '0x41::N'
+
+warning: Use of deprecated module
+   ┌─ tests/deprecated/deprecated_placement_module_members.move:36:15
+   │
+ 2 │ #[deprecated]
+   │   ---------- Module '0x42::M' deprecated here
+   ·
+36 │     let foo: S = M::foo();
+   │                  ^ Use of deprecated module '0x42::M'
+
+warning: Use of deprecated function
+   ┌─ tests/deprecated/deprecated_placement_module_members.move:36:18
+   │
+12 │     #[deprecated]
+   │       ---------- Function 'foo' in module '0x42::M' deprecated here
+   ·
+36 │     let foo: S = M::foo();
+   │                     ^^^ Use of deprecated function 'foo' from module '0x42::M'
+
+warning: Use of deprecated module
+   ┌─ tests/deprecated/deprecated_placement_module_members.move:37:2
+   │
+19 │ #[deprecated]
+   │   ---------- Module '0x41::N' deprecated here
+   ·
+37 │     0x41::N::consume(foo);
+   │     ^^^^^^^ Use of deprecated module '0x41::N'
+
+warning: Use of deprecated function
+   ┌─ tests/deprecated/deprecated_placement_module_members.move:37:11
+   │
+27 │     #[deprecated]
+   │       ---------- Function 'consume' in module '0x41::N' deprecated here
+   ·
+37 │     0x41::N::consume(foo);
+   │              ^^^^^^^ Use of deprecated function 'consume' from module '0x41::N'
+
+
+============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/deprecated/deprecated_placement_module_members.move b/third_party/move/move-compiler-v2/tests/deprecated/deprecated_placement_module_members.move
new file mode 100644
index 0000000000000..e3b71a074b341
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/deprecated/deprecated_placement_module_members.move
@@ -0,0 +1,41 @@
+address 0x42 {
+#[deprecated]
+module M {
+    use 0x41::N;
+
+    #[deprecated]
+    struct S {}
+
+    #[deprecated]
+    const C: u64 = 0;
+
+    #[deprecated]
+    public fun foo(): N::S { let _foo = C + 3; N::bar() }
+
+    spec foo {}
+}
+}
+
+#[deprecated]
+module 0x41::N {
+    #[deprecated]
+    struct S has drop { }
+
+    #[deprecated]
+    public fun bar(): S { S { } }
+
+    #[deprecated]
+    public fun consume(_x: S) { }
+}
+
+script {
+    use 0x42::M;
+    use 0x41::N::S;
+
+    fun main() {
+	let foo: S = M::foo();
+	0x41::N::consume(foo);
+    }
+
+    spec main { }
+}
diff --git a/third_party/move/move-compiler-v2/tests/deprecated/public_script.exp b/third_party/move/move-compiler-v2/tests/deprecated/public_script.exp
new file mode 100644
index 0000000000000..1463c4ca97cdf
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/deprecated/public_script.exp
@@ -0,0 +1,13 @@
+
+Diagnostics:
+warning: DEPRECATED. will be removed
+  ┌─ tests/deprecated/public_script.move:2:5
+  │
+2 │     public(script) fun main() {
+  │     ^^^^^^^^^^^^^^ 'public(script)' is deprecated in favor of the 'entry' modifier. Replace with 'public entry'
+
+error: address with no value
+  ┌─ tests/deprecated/public_script.move:4:30
+  │
+4 │         let _addr:address = @Test;
+  │                              ^^^^ address 'Test' is not assigned a value. Try assigning it a value when calling the compiler
diff --git a/third_party/move/move-compiler-v2/tests/deprecated/public_script.move b/third_party/move/move-compiler-v2/tests/deprecated/public_script.move
new file mode 100644
index 0000000000000..d225e0f525526
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/deprecated/public_script.move
@@ -0,0 +1,6 @@
+module 0x1::Test {
+    public(script) fun main() {
+        // Previously, deprecation plus an error led to a compiler assert.  Make sure that doesn't come back.
+        let _addr:address = @Test;
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/file-format-generator/const.exp b/third_party/move/move-compiler-v2/tests/file-format-generator/const.exp
index 5be541cbc8b90..e3c70827b11a7 100644
--- a/third_party/move/move-compiler-v2/tests/file-format-generator/const.exp
+++ b/third_party/move/move-compiler-v2/tests/file-format-generator/const.exp
@@ -67,6 +67,74 @@ warning: Unused local variable `s`. Consider removing or prefixing with an under
    │             ^
 
 
+Diagnostics:
+warning: Unused assignment to `const_true`. Consider removing or prefixing with an underscore: `_const_true`
+  ┌─ tests/file-format-generator/const.move:3:26
+  │
+3 │         let const_true = u(true);
+  │                          ^^^^^^^
+
+warning: Unused assignment to `const_false`. Consider removing or prefixing with an underscore: `_const_false`
+  ┌─ tests/file-format-generator/const.move:4:27
+  │
+4 │         let const_false = u(false);
+  │                           ^^^^^^^^
+
+warning: Unused assignment to `hex_u8`. Consider removing or prefixing with an underscore: `_hex_u8`
+  ┌─ tests/file-format-generator/const.move:5:26
+  │
+5 │         let hex_u8: u8 = u(0x1);
+  │                          ^^^^^^
+
+warning: Unused assignment to `hex_u16`. Consider removing or prefixing with an underscore: `_hex_u16`
+  ┌─ tests/file-format-generator/const.move:6:28
+  │
+6 │         let hex_u16: u16 = u(0x1BAE);
+  │                            ^^^^^^^^^
+
+warning: Unused assignment to `hex_u32`. Consider removing or prefixing with an underscore: `_hex_u32`
+  ┌─ tests/file-format-generator/const.move:7:28
+  │
+7 │         let hex_u32: u32 = u(0xDEAD80);
+  │                            ^^^^^^^^^^^
+
+warning: Unused assignment to `hex_u64`. Consider removing or prefixing with an underscore: `_hex_u64`
+  ┌─ tests/file-format-generator/const.move:8:28
+  │
+8 │         let hex_u64: u64 = u(0xCAFE);
+  │                            ^^^^^^^^^
+
+warning: Unused assignment to `hex_u128`. Consider removing or prefixing with an underscore: `_hex_u128`
+  ┌─ tests/file-format-generator/const.move:9:30
+  │
+9 │         let hex_u128: u128 = u(0xDEADBEEF);
+  │                              ^^^^^^^^^^^^^
+
+warning: Unused assignment to `hex_u256`. Consider removing or prefixing with an underscore: `_hex_u256`
+   ┌─ tests/file-format-generator/const.move:10:30
+   │
+10 │         let hex_u256: u256 = u(0x1123_456A_BCDE_F);
+   │                              ^^^^^^^^^^^^^^^^^^^^^
+
+warning: Unused assignment to `a`. Consider removing or prefixing with an underscore: `_a`
+   ┌─ tests/file-format-generator/const.move:11:17
+   │
+11 │         let a = u(@0x42);
+   │                 ^^^^^^^^
+
+warning: Unused assignment to `vec`. Consider removing or prefixing with an underscore: `_vec`
+   ┌─ tests/file-format-generator/const.move:12:19
+   │
+12 │         let vec = u(vector[1, 2, 3]);
+   │                   ^^^^^^^^^^^^^^^^^^
+
+warning: Unused assignment to `s`. Consider removing or prefixing with an underscore: `_s`
+   ┌─ tests/file-format-generator/const.move:13:17
+   │
+13 │         let s = u(b"Hello!\n");
+   │                 ^^^^^^^^^^^^^^
+
+
 ============ disassembled file-format ==================
 // Move bytecode v7
 module 42.constant {
diff --git a/third_party/move/move-compiler-v2/tests/file-format-generator/const.opt.exp b/third_party/move/move-compiler-v2/tests/file-format-generator/const.opt.exp
index a198ea19fbd64..8c6bd9d68e95d 100644
--- a/third_party/move/move-compiler-v2/tests/file-format-generator/const.opt.exp
+++ b/third_party/move/move-compiler-v2/tests/file-format-generator/const.opt.exp
@@ -67,6 +67,74 @@ warning: Unused local variable `s`. Consider removing or prefixing with an under
    │             ^
 
 
+Diagnostics:
+warning: Unused assignment to `const_true`. Consider removing or prefixing with an underscore: `_const_true`
+  ┌─ tests/file-format-generator/const.move:3:26
+  │
+3 │         let const_true = u(true);
+  │                          ^^^^^^^
+
+warning: Unused assignment to `const_false`. Consider removing or prefixing with an underscore: `_const_false`
+  ┌─ tests/file-format-generator/const.move:4:27
+  │
+4 │         let const_false = u(false);
+  │                           ^^^^^^^^
+
+warning: Unused assignment to `hex_u8`. Consider removing or prefixing with an underscore: `_hex_u8`
+  ┌─ tests/file-format-generator/const.move:5:26
+  │
+5 │         let hex_u8: u8 = u(0x1);
+  │                          ^^^^^^
+
+warning: Unused assignment to `hex_u16`. Consider removing or prefixing with an underscore: `_hex_u16`
+  ┌─ tests/file-format-generator/const.move:6:28
+  │
+6 │         let hex_u16: u16 = u(0x1BAE);
+  │                            ^^^^^^^^^
+
+warning: Unused assignment to `hex_u32`. Consider removing or prefixing with an underscore: `_hex_u32`
+  ┌─ tests/file-format-generator/const.move:7:28
+  │
+7 │         let hex_u32: u32 = u(0xDEAD80);
+  │                            ^^^^^^^^^^^
+
+warning: Unused assignment to `hex_u64`. Consider removing or prefixing with an underscore: `_hex_u64`
+  ┌─ tests/file-format-generator/const.move:8:28
+  │
+8 │         let hex_u64: u64 = u(0xCAFE);
+  │                            ^^^^^^^^^
+
+warning: Unused assignment to `hex_u128`. Consider removing or prefixing with an underscore: `_hex_u128`
+  ┌─ tests/file-format-generator/const.move:9:30
+  │
+9 │         let hex_u128: u128 = u(0xDEADBEEF);
+  │                              ^^^^^^^^^^^^^
+
+warning: Unused assignment to `hex_u256`. Consider removing or prefixing with an underscore: `_hex_u256`
+   ┌─ tests/file-format-generator/const.move:10:30
+   │
+10 │         let hex_u256: u256 = u(0x1123_456A_BCDE_F);
+   │                              ^^^^^^^^^^^^^^^^^^^^^
+
+warning: Unused assignment to `a`. Consider removing or prefixing with an underscore: `_a`
+   ┌─ tests/file-format-generator/const.move:11:17
+   │
+11 │         let a = u(@0x42);
+   │                 ^^^^^^^^
+
+warning: Unused assignment to `vec`. Consider removing or prefixing with an underscore: `_vec`
+   ┌─ tests/file-format-generator/const.move:12:19
+   │
+12 │         let vec = u(vector[1, 2, 3]);
+   │                   ^^^^^^^^^^^^^^^^^^
+
+warning: Unused assignment to `s`. Consider removing or prefixing with an underscore: `_s`
+   ┌─ tests/file-format-generator/const.move:13:17
+   │
+13 │         let s = u(b"Hello!\n");
+   │                 ^^^^^^^^^^^^^^
+
+
 ============ disassembled file-format ==================
 // Move bytecode v7
 module 42.constant {
diff --git a/third_party/move/move-compiler-v2/tests/file-format-generator/fields.opt.exp b/third_party/move/move-compiler-v2/tests/file-format-generator/fields.opt.exp
index 70d71108d70db..202d6e5378226 100644
--- a/third_party/move/move-compiler-v2/tests/file-format-generator/fields.opt.exp
+++ b/third_party/move/move-compiler-v2/tests/file-format-generator/fields.opt.exp
@@ -41,9 +41,7 @@ B0:
 	8: MutBorrowField[1](T.h: u64)
 	9: WriteRef
 	10: MoveLoc[0](loc0: S)
-	11: StLoc[1](loc1: S)
-	12: MoveLoc[1](loc1: S)
-	13: Ret
+	11: Ret
 }
 write_local_via_ref(): S /* def_idx: 3 */ {
 L0:	loc0: S
@@ -60,18 +58,14 @@ B0:
 	5: MutBorrowLoc[0](loc0: S)
 	6: LdU64(42)
 	7: StLoc[1](loc1: u64)
-	8: StLoc[2](loc2: &mut S)
-	9: MoveLoc[2](loc2: &mut S)
-	10: MutBorrowField[0](S.g: T)
-	11: MutBorrowField[1](T.h: u64)
-	12: StLoc[3](loc3: &mut u64)
-	13: MoveLoc[1](loc1: u64)
-	14: MoveLoc[3](loc3: &mut u64)
-	15: WriteRef
-	16: MoveLoc[0](loc0: S)
-	17: StLoc[4](loc4: S)
-	18: MoveLoc[4](loc4: S)
-	19: Ret
+	8: MutBorrowField[0](S.g: T)
+	9: MutBorrowField[1](T.h: u64)
+	10: StLoc[3](loc3: &mut u64)
+	11: MoveLoc[1](loc1: u64)
+	12: MoveLoc[3](loc3: &mut u64)
+	13: WriteRef
+	14: MoveLoc[0](loc0: S)
+	15: Ret
 }
 write_param(Arg0: &mut S) /* def_idx: 4 */ {
 B0:
@@ -91,9 +85,7 @@ B0:
 	3: MutBorrowField[1](T.h: u64)
 	4: WriteRef
 	5: MoveLoc[0](Arg0: S)
-	6: StLoc[1](loc0: S)
-	7: MoveLoc[1](loc0: S)
-	8: Ret
+	6: Ret
 }
 }
 ============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/file-format-generator/globals.opt.exp b/third_party/move/move-compiler-v2/tests/file-format-generator/globals.opt.exp
index 9a4c0b07393bb..326fea066b89e 100644
--- a/third_party/move/move-compiler-v2/tests/file-format-generator/globals.opt.exp
+++ b/third_party/move/move-compiler-v2/tests/file-format-generator/globals.opt.exp
@@ -47,15 +47,13 @@ B0:
 	1: MutBorrowGlobal[0](R)
 	2: LdU64(2)
 	3: StLoc[1](Arg1: u64)
-	4: StLoc[2](loc0: &mut R)
-	5: MoveLoc[2](loc0: &mut R)
-	6: MutBorrowField[0](R.f: u64)
-	7: StLoc[3](loc1: &mut u64)
-	8: MoveLoc[1](Arg1: u64)
-	9: MoveLoc[3](loc1: &mut u64)
-	10: WriteRef
-	11: LdU64(9)
-	12: Ret
+	4: MutBorrowField[0](R.f: u64)
+	5: StLoc[3](loc1: &mut u64)
+	6: MoveLoc[1](Arg1: u64)
+	7: MoveLoc[3](loc1: &mut u64)
+	8: WriteRef
+	9: LdU64(9)
+	10: Ret
 }
 }
 ============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/file-format-generator/if_else.opt.exp b/third_party/move/move-compiler-v2/tests/file-format-generator/if_else.opt.exp
index dc3c0ddd0b9fd..fa42fd98cf534 100644
--- a/third_party/move/move-compiler-v2/tests/file-format-generator/if_else.opt.exp
+++ b/third_party/move/move-compiler-v2/tests/file-format-generator/if_else.opt.exp
@@ -9,72 +9,58 @@ L2:	loc0: u64
 L3:	loc1: u64
 B0:
 	0: MoveLoc[0](Arg0: bool)
-	1: BrFalse(9)
+	1: BrFalse(7)
 B1:
-	2: LdU64(1)
-	3: StLoc[2](loc0: u64)
-	4: MoveLoc[1](Arg1: u64)
-	5: MoveLoc[2](loc0: u64)
-	6: Add
-	7: StLoc[2](loc0: u64)
-	8: Branch(15)
+	2: MoveLoc[1](Arg1: u64)
+	3: LdU64(1)
+	4: Add
+	5: StLoc[2](loc0: u64)
+	6: Branch(11)
 B2:
-	9: LdU64(1)
-	10: StLoc[3](loc1: u64)
-	11: MoveLoc[1](Arg1: u64)
-	12: MoveLoc[3](loc1: u64)
-	13: Sub
-	14: StLoc[2](loc0: u64)
+	7: MoveLoc[1](Arg1: u64)
+	8: LdU64(1)
+	9: Sub
+	10: StLoc[2](loc0: u64)
 B3:
-	15: MoveLoc[2](loc0: u64)
-	16: Ret
+	11: MoveLoc[2](loc0: u64)
+	12: Ret
 }
 if_else_nested(Arg0: bool, Arg1: u64): u64 /* def_idx: 1 */ {
 L2:	loc0: u64
 L3:	loc1: u64
 B0:
 	0: MoveLoc[0](Arg0: bool)
-	1: BrFalse(9)
+	1: BrFalse(7)
 B1:
-	2: LdU64(1)
-	3: StLoc[2](loc0: u64)
-	4: CopyLoc[1](Arg1: u64)
-	5: MoveLoc[2](loc0: u64)
-	6: Add
-	7: StLoc[2](loc0: u64)
-	8: Branch(15)
+	2: CopyLoc[1](Arg1: u64)
+	3: LdU64(1)
+	4: Add
+	5: StLoc[2](loc0: u64)
+	6: Branch(11)
 B2:
-	9: LdU64(1)
-	10: StLoc[3](loc1: u64)
-	11: CopyLoc[1](Arg1: u64)
-	12: MoveLoc[3](loc1: u64)
-	13: Sub
-	14: StLoc[2](loc0: u64)
+	7: CopyLoc[1](Arg1: u64)
+	8: LdU64(1)
+	9: Sub
+	10: StLoc[2](loc0: u64)
 B3:
-	15: LdU64(10)
-	16: StLoc[3](loc1: u64)
-	17: MoveLoc[2](loc0: u64)
-	18: MoveLoc[3](loc1: u64)
-	19: Gt
-	20: BrFalse(28)
+	11: MoveLoc[2](loc0: u64)
+	12: LdU64(10)
+	13: Gt
+	14: BrFalse(20)
 B4:
-	21: LdU64(2)
-	22: StLoc[2](loc0: u64)
-	23: MoveLoc[1](Arg1: u64)
-	24: MoveLoc[2](loc0: u64)
-	25: Mul
-	26: StLoc[2](loc0: u64)
-	27: Branch(34)
+	15: MoveLoc[1](Arg1: u64)
+	16: LdU64(2)
+	17: Mul
+	18: StLoc[2](loc0: u64)
+	19: Branch(24)
 B5:
-	28: LdU64(2)
-	29: StLoc[3](loc1: u64)
-	30: MoveLoc[1](Arg1: u64)
-	31: MoveLoc[3](loc1: u64)
-	32: Div
-	33: StLoc[2](loc0: u64)
+	20: MoveLoc[1](Arg1: u64)
+	21: LdU64(2)
+	22: Div
+	23: StLoc[2](loc0: u64)
 B6:
-	34: MoveLoc[2](loc0: u64)
-	35: Ret
+	24: MoveLoc[2](loc0: u64)
+	25: Ret
 }
 }
 ============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/file-format-generator/index_acquires_err.exp b/third_party/move/move-compiler-v2/tests/file-format-generator/index_acquires_err.exp
new file mode 100644
index 0000000000000..f5de8b96bbaec
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/file-format-generator/index_acquires_err.exp
@@ -0,0 +1,28 @@
+
+Diagnostics:
+error: Invalid operation: storage operation on type `test::Y` can only be done within the defining module `0x42::test`
+   ┌─ tests/file-format-generator/index_acquires_err.move:14:9
+   │
+14 │     fun test_resource_other_module() acquires 0x42::test::Y {
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^
+15 │         let addr = @0x1;
+16 │         assert!((&0x42::test::Y<0x42::test::X<bool>>[addr]).field.value == true, 1);
+   │                 ------------------------------------------- called here
+
+error: Invalid operation: access of the field `field` on type `test::Y` can only be done within the defining module `0x42::test`
+   ┌─ tests/file-format-generator/index_acquires_err.move:14:9
+   │
+14 │     fun test_resource_other_module() acquires 0x42::test::Y {
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^
+15 │         let addr = @0x1;
+16 │         assert!((&0x42::test::Y<0x42::test::X<bool>>[addr]).field.value == true, 1);
+   │                 ------------------------------------------------- accessed here
+
+error: Invalid operation: access of the field `value` on type `test::X` can only be done within the defining module `0x42::test`
+   ┌─ tests/file-format-generator/index_acquires_err.move:14:9
+   │
+14 │     fun test_resource_other_module() acquires 0x42::test::Y {
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^
+15 │         let addr = @0x1;
+16 │         assert!((&0x42::test::Y<0x42::test::X<bool>>[addr]).field.value == true, 1);
+   │                 ------------------------------------------------------- accessed here
diff --git a/third_party/move/move-compiler-v2/tests/file-format-generator/index_acquires_err.move b/third_party/move/move-compiler-v2/tests/file-format-generator/index_acquires_err.move
new file mode 100644
index 0000000000000..432c3e211b774
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/file-format-generator/index_acquires_err.move
@@ -0,0 +1,23 @@
+module 0x42::test {
+
+    struct X<M> has copy, drop, store {
+        value: M
+    }
+    struct Y<T> has key, drop {
+        field: T
+    }
+
+}
+
+module 0x42::test2 {
+
+    fun test_resource_other_module() acquires 0x42::test::Y {
+        let addr = @0x1;
+        assert!((&0x42::test::Y<0x42::test::X<bool>>[addr]).field.value == true, 1);
+        spec {
+            // This is OK
+            assert 0x42::test::Y<0x42::test::X<bool>>[addr].field.value == true;
+        }
+    }
+
+}
diff --git a/third_party/move/move-compiler-v2/tests/file-format-generator/index_acquires_err.opt.exp b/third_party/move/move-compiler-v2/tests/file-format-generator/index_acquires_err.opt.exp
new file mode 100644
index 0000000000000..f5de8b96bbaec
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/file-format-generator/index_acquires_err.opt.exp
@@ -0,0 +1,28 @@
+
+Diagnostics:
+error: Invalid operation: storage operation on type `test::Y` can only be done within the defining module `0x42::test`
+   ┌─ tests/file-format-generator/index_acquires_err.move:14:9
+   │
+14 │     fun test_resource_other_module() acquires 0x42::test::Y {
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^
+15 │         let addr = @0x1;
+16 │         assert!((&0x42::test::Y<0x42::test::X<bool>>[addr]).field.value == true, 1);
+   │                 ------------------------------------------- called here
+
+error: Invalid operation: access of the field `field` on type `test::Y` can only be done within the defining module `0x42::test`
+   ┌─ tests/file-format-generator/index_acquires_err.move:14:9
+   │
+14 │     fun test_resource_other_module() acquires 0x42::test::Y {
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^
+15 │         let addr = @0x1;
+16 │         assert!((&0x42::test::Y<0x42::test::X<bool>>[addr]).field.value == true, 1);
+   │                 ------------------------------------------------- accessed here
+
+error: Invalid operation: access of the field `value` on type `test::X` can only be done within the defining module `0x42::test`
+   ┌─ tests/file-format-generator/index_acquires_err.move:14:9
+   │
+14 │     fun test_resource_other_module() acquires 0x42::test::Y {
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^
+15 │         let addr = @0x1;
+16 │         assert!((&0x42::test::Y<0x42::test::X<bool>>[addr]).field.value == true, 1);
+   │                 ------------------------------------------------------- accessed here
diff --git a/third_party/move/move-compiler-v2/tests/file-format-generator/loop.opt.exp b/third_party/move/move-compiler-v2/tests/file-format-generator/loop.opt.exp
index 3afa0a7453e1d..8db3e7debc4a0 100644
--- a/third_party/move/move-compiler-v2/tests/file-format-generator/loop.opt.exp
+++ b/third_party/move/move-compiler-v2/tests/file-format-generator/loop.opt.exp
@@ -7,110 +7,90 @@ module 42.loops {
 nested_loop(Arg0: u64): u64 /* def_idx: 0 */ {
 L1:	loc0: u64
 B0:
-	0: LdU64(0)
-	1: StLoc[1](loc0: u64)
-	2: CopyLoc[0](Arg0: u64)
-	3: MoveLoc[1](loc0: u64)
-	4: Gt
-	5: BrFalse(27)
+	0: CopyLoc[0](Arg0: u64)
+	1: LdU64(0)
+	2: Gt
+	3: BrFalse(19)
 B1:
-	6: LdU64(10)
-	7: StLoc[1](loc0: u64)
-	8: CopyLoc[0](Arg0: u64)
-	9: MoveLoc[1](loc0: u64)
-	10: Gt
-	11: BrFalse(19)
+	4: CopyLoc[0](Arg0: u64)
+	5: LdU64(10)
+	6: Gt
+	7: BrFalse(13)
 B2:
-	12: LdU64(1)
-	13: StLoc[1](loc0: u64)
+	8: MoveLoc[0](Arg0: u64)
+	9: LdU64(1)
+	10: Sub
+	11: StLoc[0](Arg0: u64)
+	12: Branch(14)
+B3:
+	13: Branch(14)
+B4:
 	14: MoveLoc[0](Arg0: u64)
-	15: MoveLoc[1](loc0: u64)
+	15: LdU64(1)
 	16: Sub
 	17: StLoc[0](Arg0: u64)
-	18: Branch(20)
-B3:
-	19: Branch(20)
-B4:
-	20: LdU64(1)
-	21: StLoc[1](loc0: u64)
-	22: MoveLoc[0](Arg0: u64)
-	23: MoveLoc[1](loc0: u64)
-	24: Sub
-	25: StLoc[0](Arg0: u64)
-	26: Branch(0)
+	18: Branch(0)
 B5:
-	27: Branch(28)
+	19: Branch(20)
 B6:
-	28: MoveLoc[0](Arg0: u64)
-	29: Ret
+	20: MoveLoc[0](Arg0: u64)
+	21: Ret
 }
 while_loop(Arg0: u64): u64 /* def_idx: 1 */ {
 L1:	loc0: u64
 B0:
-	0: LdU64(0)
-	1: StLoc[1](loc0: u64)
-	2: CopyLoc[0](Arg0: u64)
-	3: MoveLoc[1](loc0: u64)
-	4: Gt
-	5: BrFalse(13)
+	0: CopyLoc[0](Arg0: u64)
+	1: LdU64(0)
+	2: Gt
+	3: BrFalse(9)
 B1:
-	6: LdU64(1)
-	7: StLoc[1](loc0: u64)
-	8: MoveLoc[0](Arg0: u64)
-	9: MoveLoc[1](loc0: u64)
-	10: Sub
-	11: StLoc[0](Arg0: u64)
-	12: Branch(14)
+	4: MoveLoc[0](Arg0: u64)
+	5: LdU64(1)
+	6: Sub
+	7: StLoc[0](Arg0: u64)
+	8: Branch(10)
 B2:
-	13: Branch(15)
+	9: Branch(11)
 B3:
-	14: Branch(0)
+	10: Branch(0)
 B4:
-	15: MoveLoc[0](Arg0: u64)
-	16: Ret
+	11: MoveLoc[0](Arg0: u64)
+	12: Ret
 }
 while_loop_with_break_and_continue(Arg0: u64): u64 /* def_idx: 2 */ {
 L1:	loc0: u64
 B0:
-	0: LdU64(0)
-	1: StLoc[1](loc0: u64)
-	2: CopyLoc[0](Arg0: u64)
-	3: MoveLoc[1](loc0: u64)
-	4: Gt
-	5: BrFalse(27)
+	0: CopyLoc[0](Arg0: u64)
+	1: LdU64(0)
+	2: Gt
+	3: BrFalse(19)
 B1:
-	6: LdU64(42)
-	7: StLoc[1](loc0: u64)
-	8: CopyLoc[0](Arg0: u64)
-	9: MoveLoc[1](loc0: u64)
-	10: Eq
-	11: BrFalse(13)
+	4: CopyLoc[0](Arg0: u64)
+	5: LdU64(42)
+	6: Eq
+	7: BrFalse(9)
 B2:
-	12: Branch(29)
+	8: Branch(21)
 B3:
-	13: LdU64(21)
-	14: StLoc[1](loc0: u64)
-	15: CopyLoc[0](Arg0: u64)
-	16: MoveLoc[1](loc0: u64)
-	17: Eq
-	18: BrFalse(20)
+	9: CopyLoc[0](Arg0: u64)
+	10: LdU64(21)
+	11: Eq
+	12: BrFalse(14)
 B4:
-	19: Branch(0)
+	13: Branch(0)
 B5:
-	20: LdU64(1)
-	21: StLoc[1](loc0: u64)
-	22: MoveLoc[0](Arg0: u64)
-	23: MoveLoc[1](loc0: u64)
-	24: Sub
-	25: StLoc[0](Arg0: u64)
-	26: Branch(28)
+	14: MoveLoc[0](Arg0: u64)
+	15: LdU64(1)
+	16: Sub
+	17: StLoc[0](Arg0: u64)
+	18: Branch(20)
 B6:
-	27: Branch(29)
+	19: Branch(21)
 B7:
-	28: Branch(0)
+	20: Branch(0)
 B8:
-	29: MoveLoc[0](Arg0: u64)
-	30: Ret
+	21: MoveLoc[0](Arg0: u64)
+	22: Ret
 }
 }
 ============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/file-format-generator/multi_use.exp b/third_party/move/move-compiler-v2/tests/file-format-generator/multi_use.exp
new file mode 100644
index 0000000000000..f88ec059166e4
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/file-format-generator/multi_use.exp
@@ -0,0 +1,24 @@
+
+============ disassembled file-format ==================
+// Move bytecode v7
+module c0ffee.m {
+
+
+public consume(Arg0: u64, Arg1: u64, Arg2: u64, Arg3: u64) /* def_idx: 0 */ {
+B0:
+	0: Ret
+}
+public test(Arg0: u64) /* def_idx: 1 */ {
+L1:	loc0: u64
+B0:
+	0: LdU64(1)
+	1: StLoc[1](loc0: u64)
+	2: CopyLoc[0](Arg0: u64)
+	3: CopyLoc[0](Arg0: u64)
+	4: MoveLoc[1](loc0: u64)
+	5: MoveLoc[0](Arg0: u64)
+	6: Call consume(u64, u64, u64, u64)
+	7: Ret
+}
+}
+============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/file-format-generator/multi_use.move b/third_party/move/move-compiler-v2/tests/file-format-generator/multi_use.move
new file mode 100644
index 0000000000000..81ac1a8994b20
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/file-format-generator/multi_use.move
@@ -0,0 +1,8 @@
+module 0xc0ffee::m {
+    public fun consume(_a: u64, _b: u64, _c: u64, _d: u64) {
+    }
+
+    public fun test(x: u64) {
+        consume(x, x, 1, x);
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/file-format-generator/multi_use.opt.exp b/third_party/move/move-compiler-v2/tests/file-format-generator/multi_use.opt.exp
new file mode 100644
index 0000000000000..f88ec059166e4
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/file-format-generator/multi_use.opt.exp
@@ -0,0 +1,24 @@
+
+============ disassembled file-format ==================
+// Move bytecode v7
+module c0ffee.m {
+
+
+public consume(Arg0: u64, Arg1: u64, Arg2: u64, Arg3: u64) /* def_idx: 0 */ {
+B0:
+	0: Ret
+}
+public test(Arg0: u64) /* def_idx: 1 */ {
+L1:	loc0: u64
+B0:
+	0: LdU64(1)
+	1: StLoc[1](loc0: u64)
+	2: CopyLoc[0](Arg0: u64)
+	3: CopyLoc[0](Arg0: u64)
+	4: MoveLoc[1](loc0: u64)
+	5: MoveLoc[0](Arg0: u64)
+	6: Call consume(u64, u64, u64, u64)
+	7: Ret
+}
+}
+============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/file-format-generator/operators.opt.exp b/third_party/move/move-compiler-v2/tests/file-format-generator/operators.opt.exp
index 2edb1d9fe51b4..e73f56bfc0555 100644
--- a/third_party/move/move-compiler-v2/tests/file-format-generator/operators.opt.exp
+++ b/third_party/move/move-compiler-v2/tests/file-format-generator/operators.opt.exp
@@ -75,40 +75,38 @@ B8:
 B9:
 	22: LdTrue
 	23: StLoc[2](loc0: bool)
-	24: Branch(33)
+	24: Branch(32)
 B10:
 	25: CopyLoc[0](Arg0: bool)
-	26: Not
-	27: BrFalse(31)
+	26: BrTrue(30)
 B11:
-	28: CopyLoc[1](Arg1: bool)
-	29: StLoc[2](loc0: bool)
-	30: Branch(33)
+	27: CopyLoc[1](Arg1: bool)
+	28: StLoc[2](loc0: bool)
+	29: Branch(32)
 B12:
-	31: LdFalse
-	32: StLoc[2](loc0: bool)
+	30: LdFalse
+	31: StLoc[2](loc0: bool)
 B13:
-	33: MoveLoc[2](loc0: bool)
-	34: BrFalse(38)
+	32: MoveLoc[2](loc0: bool)
+	33: BrFalse(37)
 B14:
-	35: LdTrue
-	36: StLoc[2](loc0: bool)
-	37: Branch(47)
+	34: LdTrue
+	35: StLoc[2](loc0: bool)
+	36: Branch(45)
 B15:
-	38: MoveLoc[0](Arg0: bool)
-	39: Not
-	40: BrFalse(45)
+	37: MoveLoc[0](Arg0: bool)
+	38: BrTrue(43)
 B16:
-	41: MoveLoc[1](Arg1: bool)
-	42: Not
-	43: StLoc[2](loc0: bool)
-	44: Branch(47)
+	39: MoveLoc[1](Arg1: bool)
+	40: Not
+	41: StLoc[2](loc0: bool)
+	42: Branch(45)
 B17:
-	45: LdFalse
-	46: StLoc[2](loc0: bool)
+	43: LdFalse
+	44: StLoc[2](loc0: bool)
 B18:
-	47: MoveLoc[2](loc0: bool)
-	48: Ret
+	45: MoveLoc[2](loc0: bool)
+	46: Ret
 }
 equality<Ty0: drop>(Arg0: Ty0, Arg1: Ty0): bool /* def_idx: 3 */ {
 B0:
diff --git a/third_party/move/move-compiler-v2/tests/file-format-generator/pack_unpack_ref.opt.exp b/third_party/move/move-compiler-v2/tests/file-format-generator/pack_unpack_ref.opt.exp
index 0fb3e8a2b5395..63e25d410bbcf 100644
--- a/third_party/move/move-compiler-v2/tests/file-format-generator/pack_unpack_ref.opt.exp
+++ b/third_party/move/move-compiler-v2/tests/file-format-generator/pack_unpack_ref.opt.exp
@@ -23,12 +23,10 @@ B0:
 	4: MoveLoc[0](Arg0: &mut S)
 	5: Pop
 	6: StLoc[1](loc0: &mut u64)
-	7: StLoc[2](loc1: &mut u64)
-	8: MoveLoc[2](loc1: &mut u64)
+	7: ReadRef
+	8: MoveLoc[1](loc0: &mut u64)
 	9: ReadRef
-	10: MoveLoc[1](loc0: &mut u64)
-	11: ReadRef
-	12: Ret
+	10: Ret
 }
 unpack_ref(Arg0: &S): u64 * u64 /* def_idx: 1 */ {
 L1:	loc0: &u64
@@ -41,12 +39,10 @@ B0:
 	4: MoveLoc[0](Arg0: &S)
 	5: Pop
 	6: StLoc[1](loc0: &u64)
-	7: StLoc[2](loc1: &u64)
-	8: MoveLoc[2](loc1: &u64)
+	7: ReadRef
+	8: MoveLoc[1](loc0: &u64)
 	9: ReadRef
-	10: MoveLoc[1](loc0: &u64)
-	11: ReadRef
-	12: Ret
+	10: Ret
 }
 unpack_ref_G(Arg0: &G): u64 * u64 * u64 * u64 /* def_idx: 2 */ {
 L1:	loc0: &S
@@ -73,16 +69,14 @@ B0:
 	15: StLoc[2](loc1: &u64)
 	16: StLoc[3](loc2: &u64)
 	17: StLoc[4](loc3: &u64)
-	18: StLoc[5](loc4: &u64)
-	19: MoveLoc[5](loc4: &u64)
+	18: ReadRef
+	19: MoveLoc[4](loc3: &u64)
 	20: ReadRef
-	21: MoveLoc[4](loc3: &u64)
+	21: MoveLoc[3](loc2: &u64)
 	22: ReadRef
-	23: MoveLoc[3](loc2: &u64)
+	23: MoveLoc[2](loc1: &u64)
 	24: ReadRef
-	25: MoveLoc[2](loc1: &u64)
-	26: ReadRef
-	27: Ret
+	25: Ret
 }
 }
 ============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/file-format-generator/struct_variants.exp b/third_party/move/move-compiler-v2/tests/file-format-generator/struct_variants.exp
new file mode 100644
index 0000000000000..f95898930c8b4
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/file-format-generator/struct_variants.exp
@@ -0,0 +1,551 @@
+
+============ disassembled file-format ==================
+// Move bytecode v7
+module c0ffee.m {
+struct Box has drop {
+	x: u64
+}
+enum CommonFields {
+ Foo{
+	x: u64,
+	y: u64
+ },
+ Bar{
+	x: u64,
+	z: u64
+ }
+}
+enum CommonFieldsAtDifferentOffset has drop {
+ Foo{
+	x: u64,
+	y: u64
+ },
+ Bar{
+	x: u64,
+	z: u64
+ },
+ Baz{
+	z: u64
+ },
+ Balt{
+	foo: u8,
+	z: u64
+ }
+}
+enum Inner {
+ Inner1{
+	x: u64
+ },
+ Inner2{
+	x: u64,
+	y: u64
+ }
+}
+enum Option<Ty0> has drop {
+ None{
+
+ },
+ Some{
+	value: Ty0
+ }
+}
+enum Outer {
+ None{
+
+ },
+ One{
+	i: Inner
+ },
+ Two{
+	i: Inner,
+	b: Box
+ }
+}
+
+public inner_value(Arg0: Inner): u64 /* def_idx: 0 */ {
+L1:	loc0: &Inner
+L2:	loc1: u64
+B0:
+	0: ImmBorrowLoc[0](Arg0: Inner)
+	1: StLoc[1](loc0: &Inner)
+	2: CopyLoc[1](loc0: &Inner)
+	3: TestVariant[0](Inner/Inner1)
+	4: BrFalse(11)
+B1:
+	5: MoveLoc[1](loc0: &Inner)
+	6: Pop
+	7: MoveLoc[0](Arg0: Inner)
+	8: UnpackVariant[0](Inner/Inner1)
+	9: StLoc[2](loc1: u64)
+	10: Branch(21)
+B2:
+	11: MoveLoc[1](loc0: &Inner)
+	12: TestVariant[1](Inner/Inner2)
+	13: BrFalse(19)
+B3:
+	14: MoveLoc[0](Arg0: Inner)
+	15: UnpackVariant[1](Inner/Inner2)
+	16: Add
+	17: StLoc[2](loc1: u64)
+	18: Branch(21)
+B4:
+	19: LdU64(15621340914461310977)
+	20: Abort
+B5:
+	21: MoveLoc[2](loc1: u64)
+	22: Ret
+}
+public is_inner1(Arg0: &Inner): bool /* def_idx: 1 */ {
+L1:	loc0: bool
+L2:	loc1: &Inner
+B0:
+	0: CopyLoc[0](Arg0: &Inner)
+	1: TestVariant[0](Inner/Inner1)
+	2: BrFalse(8)
+B1:
+	3: MoveLoc[0](Arg0: &Inner)
+	4: Pop
+	5: LdTrue
+	6: StLoc[1](loc0: bool)
+	7: Branch(17)
+B2:
+	8: MoveLoc[0](Arg0: &Inner)
+	9: StLoc[2](loc1: &Inner)
+	10: MoveLoc[2](loc1: &Inner)
+	11: Pop
+	12: LdFalse
+	13: StLoc[1](loc0: bool)
+	14: Branch(17)
+B3:
+	15: LdU64(15621340914461310977)
+	16: Abort
+B4:
+	17: MoveLoc[1](loc0: bool)
+	18: Ret
+}
+public is_some<Ty0>(Arg0: &Option<Ty0>): bool /* def_idx: 2 */ {
+L1:	loc0: bool
+B0:
+	0: CopyLoc[0](Arg0: &Option<Ty0>)
+	1: TestVariantGeneric[0](Option/None<Ty0>)
+	2: BrFalse(8)
+B1:
+	3: MoveLoc[0](Arg0: &Option<Ty0>)
+	4: Pop
+	5: LdFalse
+	6: StLoc[1](loc0: bool)
+	7: Branch(16)
+B2:
+	8: MoveLoc[0](Arg0: &Option<Ty0>)
+	9: TestVariantGeneric[1](Option/Some<Ty0>)
+	10: BrFalse(14)
+B3:
+	11: LdTrue
+	12: StLoc[1](loc0: bool)
+	13: Branch(16)
+B4:
+	14: LdU64(15621340914461310977)
+	15: Abort
+B5:
+	16: MoveLoc[1](loc0: bool)
+	17: Ret
+}
+public is_some_dropped<Ty0: drop>(Arg0: Option<Ty0>): bool /* def_idx: 3 */ {
+L1:	loc0: bool
+L2:	loc1: Option<Ty0>
+B0:
+	0: ImmBorrowLoc[0](Arg0: Option<Ty0>)
+	1: TestVariantGeneric[0](Option/None<Ty0>)
+	2: BrFalse(8)
+B1:
+	3: MoveLoc[0](Arg0: Option<Ty0>)
+	4: UnpackVariantGeneric[0](Option/None<Ty0>)
+	5: LdFalse
+	6: StLoc[1](loc0: bool)
+	7: Branch(15)
+B2:
+	8: MoveLoc[0](Arg0: Option<Ty0>)
+	9: StLoc[2](loc1: Option<Ty0>)
+	10: LdTrue
+	11: StLoc[1](loc0: bool)
+	12: Branch(15)
+B3:
+	13: LdU64(15621340914461310977)
+	14: Abort
+B4:
+	15: MoveLoc[1](loc0: bool)
+	16: Ret
+}
+public is_some_specialized(Arg0: &Option<Option<u64>>): bool /* def_idx: 4 */ {
+L1:	loc0: bool
+B0:
+	0: CopyLoc[0](Arg0: &Option<Option<u64>>)
+	1: TestVariantGeneric[2](Option/None<Option<u64>>)
+	2: BrFalse(8)
+B1:
+	3: MoveLoc[0](Arg0: &Option<Option<u64>>)
+	4: Pop
+	5: LdFalse
+	6: StLoc[1](loc0: bool)
+	7: Branch(32)
+B2:
+	8: CopyLoc[0](Arg0: &Option<Option<u64>>)
+	9: TestVariantGeneric[3](Option/Some<Option<u64>>)
+	10: BrFalse(20)
+B3:
+	11: CopyLoc[0](Arg0: &Option<Option<u64>>)
+	12: ImmBorrowVariantFieldGeneric[0](Some.value: Ty0)
+	13: TestVariantGeneric[4](Option/None<u64>)
+	14: BrFalse(20)
+B4:
+	15: MoveLoc[0](Arg0: &Option<Option<u64>>)
+	16: Pop
+	17: LdFalse
+	18: StLoc[1](loc0: bool)
+	19: Branch(32)
+B5:
+	20: CopyLoc[0](Arg0: &Option<Option<u64>>)
+	21: TestVariantGeneric[3](Option/Some<Option<u64>>)
+	22: BrFalse(30)
+B6:
+	23: MoveLoc[0](Arg0: &Option<Option<u64>>)
+	24: ImmBorrowVariantFieldGeneric[0](Some.value: Ty0)
+	25: TestVariantGeneric[5](Option/Some<u64>)
+	26: BrFalse(30)
+B7:
+	27: LdTrue
+	28: StLoc[1](loc0: bool)
+	29: Branch(32)
+B8:
+	30: LdU64(15621340914461310977)
+	31: Abort
+B9:
+	32: MoveLoc[1](loc0: bool)
+	33: Ret
+}
+public outer_value(Arg0: Outer): u64 /* def_idx: 5 */ {
+L1:	loc0: &Outer
+L2:	loc1: u64
+L3:	loc2: Box
+B0:
+	0: ImmBorrowLoc[0](Arg0: Outer)
+	1: StLoc[1](loc0: &Outer)
+	2: CopyLoc[1](loc0: &Outer)
+	3: TestVariant[4](Outer/None)
+	4: BrFalse(12)
+B1:
+	5: MoveLoc[1](loc0: &Outer)
+	6: Pop
+	7: MoveLoc[0](Arg0: Outer)
+	8: UnpackVariant[4](Outer/None)
+	9: LdU64(0)
+	10: StLoc[2](loc1: u64)
+	11: Branch(37)
+B2:
+	12: CopyLoc[1](loc0: &Outer)
+	13: TestVariant[5](Outer/One)
+	14: BrFalse(22)
+B3:
+	15: MoveLoc[1](loc0: &Outer)
+	16: Pop
+	17: MoveLoc[0](Arg0: Outer)
+	18: UnpackVariant[5](Outer/One)
+	19: Call inner_value(Inner): u64
+	20: StLoc[2](loc1: u64)
+	21: Branch(37)
+B4:
+	22: MoveLoc[1](loc0: &Outer)
+	23: TestVariant[6](Outer/Two)
+	24: BrFalse(35)
+B5:
+	25: MoveLoc[0](Arg0: Outer)
+	26: UnpackVariant[6](Outer/Two)
+	27: StLoc[3](loc2: Box)
+	28: Call inner_value(Inner): u64
+	29: ImmBorrowLoc[3](loc2: Box)
+	30: ImmBorrowField[0](Box.x: u64)
+	31: ReadRef
+	32: Add
+	33: StLoc[2](loc1: u64)
+	34: Branch(37)
+B6:
+	35: LdU64(15621340914461310977)
+	36: Abort
+B7:
+	37: MoveLoc[2](loc1: u64)
+	38: Ret
+}
+public outer_value_nested(Arg0: Outer): u64 /* def_idx: 6 */ {
+L1:	loc0: &Outer
+L2:	loc1: u64
+L3:	loc2: Box
+B0:
+	0: ImmBorrowLoc[0](Arg0: Outer)
+	1: StLoc[1](loc0: &Outer)
+	2: CopyLoc[1](loc0: &Outer)
+	3: TestVariant[4](Outer/None)
+	4: BrFalse(12)
+B1:
+	5: MoveLoc[1](loc0: &Outer)
+	6: Pop
+	7: MoveLoc[0](Arg0: Outer)
+	8: UnpackVariant[4](Outer/None)
+	9: LdU64(0)
+	10: StLoc[2](loc1: u64)
+	11: Branch(51)
+B2:
+	12: CopyLoc[1](loc0: &Outer)
+	13: TestVariant[5](Outer/One)
+	14: BrFalse(26)
+B3:
+	15: CopyLoc[1](loc0: &Outer)
+	16: ImmBorrowVariantField[1](One.i: Inner)
+	17: TestVariant[0](Inner/Inner1)
+	18: BrFalse(26)
+B4:
+	19: MoveLoc[1](loc0: &Outer)
+	20: Pop
+	21: MoveLoc[0](Arg0: Outer)
+	22: UnpackVariant[5](Outer/One)
+	23: UnpackVariant[0](Inner/Inner1)
+	24: StLoc[2](loc1: u64)
+	25: Branch(51)
+B5:
+	26: CopyLoc[1](loc0: &Outer)
+	27: TestVariant[5](Outer/One)
+	28: BrFalse(36)
+B6:
+	29: MoveLoc[1](loc0: &Outer)
+	30: Pop
+	31: MoveLoc[0](Arg0: Outer)
+	32: UnpackVariant[5](Outer/One)
+	33: Call inner_value(Inner): u64
+	34: StLoc[2](loc1: u64)
+	35: Branch(51)
+B7:
+	36: MoveLoc[1](loc0: &Outer)
+	37: TestVariant[6](Outer/Two)
+	38: BrFalse(49)
+B8:
+	39: MoveLoc[0](Arg0: Outer)
+	40: UnpackVariant[6](Outer/Two)
+	41: StLoc[3](loc2: Box)
+	42: Call inner_value(Inner): u64
+	43: ImmBorrowLoc[3](loc2: Box)
+	44: ImmBorrowField[0](Box.x: u64)
+	45: ReadRef
+	46: Add
+	47: StLoc[2](loc1: u64)
+	48: Branch(51)
+B9:
+	49: LdU64(15621340914461310977)
+	50: Abort
+B10:
+	51: MoveLoc[2](loc1: u64)
+	52: Ret
+}
+public outer_value_with_cond(Arg0: Outer): u64 /* def_idx: 7 */ {
+L1:	loc0: &Outer
+L2:	loc1: u64
+L3:	loc2: &Inner
+L4:	loc3: Box
+B0:
+	0: ImmBorrowLoc[0](Arg0: Outer)
+	1: StLoc[1](loc0: &Outer)
+	2: CopyLoc[1](loc0: &Outer)
+	3: TestVariant[4](Outer/None)
+	4: BrFalse(12)
+B1:
+	5: MoveLoc[1](loc0: &Outer)
+	6: Pop
+	7: MoveLoc[0](Arg0: Outer)
+	8: UnpackVariant[4](Outer/None)
+	9: LdU64(0)
+	10: StLoc[2](loc1: u64)
+	11: Branch(55)
+B2:
+	12: CopyLoc[1](loc0: &Outer)
+	13: TestVariant[5](Outer/One)
+	14: BrFalse(30)
+B3:
+	15: CopyLoc[1](loc0: &Outer)
+	16: ImmBorrowVariantField[1](One.i: Inner)
+	17: StLoc[3](loc2: &Inner)
+	18: MoveLoc[3](loc2: &Inner)
+	19: Call is_inner1(&Inner): bool
+	20: BrFalse(30)
+B4:
+	21: MoveLoc[1](loc0: &Outer)
+	22: Pop
+	23: MoveLoc[0](Arg0: Outer)
+	24: UnpackVariant[5](Outer/One)
+	25: Call inner_value(Inner): u64
+	26: LdU64(2)
+	27: Mod
+	28: StLoc[2](loc1: u64)
+	29: Branch(55)
+B5:
+	30: CopyLoc[1](loc0: &Outer)
+	31: TestVariant[5](Outer/One)
+	32: BrFalse(40)
+B6:
+	33: MoveLoc[1](loc0: &Outer)
+	34: Pop
+	35: MoveLoc[0](Arg0: Outer)
+	36: UnpackVariant[5](Outer/One)
+	37: Call inner_value(Inner): u64
+	38: StLoc[2](loc1: u64)
+	39: Branch(55)
+B7:
+	40: MoveLoc[1](loc0: &Outer)
+	41: TestVariant[6](Outer/Two)
+	42: BrFalse(53)
+B8:
+	43: MoveLoc[0](Arg0: Outer)
+	44: UnpackVariant[6](Outer/Two)
+	45: StLoc[4](loc3: Box)
+	46: Call inner_value(Inner): u64
+	47: ImmBorrowLoc[4](loc3: Box)
+	48: ImmBorrowField[0](Box.x: u64)
+	49: ReadRef
+	50: Add
+	51: StLoc[2](loc1: u64)
+	52: Branch(55)
+B9:
+	53: LdU64(15621340914461310977)
+	54: Abort
+B10:
+	55: MoveLoc[2](loc1: u64)
+	56: Ret
+}
+public outer_value_with_cond_ref(Arg0: &Outer): bool /* def_idx: 8 */ {
+L1:	loc0: bool
+B0:
+	0: CopyLoc[0](Arg0: &Outer)
+	1: TestVariant[4](Outer/None)
+	2: BrFalse(8)
+B1:
+	3: MoveLoc[0](Arg0: &Outer)
+	4: Pop
+	5: LdFalse
+	6: StLoc[1](loc0: bool)
+	7: Branch(40)
+B2:
+	8: CopyLoc[0](Arg0: &Outer)
+	9: TestVariant[5](Outer/One)
+	10: BrFalse(20)
+B3:
+	11: CopyLoc[0](Arg0: &Outer)
+	12: ImmBorrowVariantField[1](One.i: Inner)
+	13: Call is_inner1(&Inner): bool
+	14: BrFalse(20)
+B4:
+	15: MoveLoc[0](Arg0: &Outer)
+	16: Pop
+	17: LdTrue
+	18: StLoc[1](loc0: bool)
+	19: Branch(40)
+B5:
+	20: CopyLoc[0](Arg0: &Outer)
+	21: TestVariant[5](Outer/One)
+	22: BrFalse(28)
+B6:
+	23: MoveLoc[0](Arg0: &Outer)
+	24: ImmBorrowVariantField[1](One.i: Inner)
+	25: Call is_inner1(&Inner): bool
+	26: StLoc[1](loc0: bool)
+	27: Branch(40)
+B7:
+	28: CopyLoc[0](Arg0: &Outer)
+	29: TestVariant[6](Outer/Two)
+	30: BrFalse(36)
+B8:
+	31: MoveLoc[0](Arg0: &Outer)
+	32: ImmBorrowVariantField[2](Two.i: Inner)
+	33: Call is_inner1(&Inner): bool
+	34: StLoc[1](loc0: bool)
+	35: Branch(40)
+B9:
+	36: MoveLoc[0](Arg0: &Outer)
+	37: Pop
+	38: LdU64(15621340914461310977)
+	39: Abort
+B10:
+	40: MoveLoc[1](loc0: bool)
+	41: Ret
+}
+select_common_fields(Arg0: CommonFields): u64 /* def_idx: 9 */ {
+L1:	loc0: &CommonFields
+L2:	loc1: bool
+L3:	loc2: u64
+L4:	loc3: u64
+B0:
+	0: ImmBorrowLoc[0](Arg0: CommonFields)
+	1: ImmBorrowVariantField[3](Foo.x|Bar.x: u64)
+	2: ReadRef
+	3: ImmBorrowLoc[0](Arg0: CommonFields)
+	4: StLoc[1](loc0: &CommonFields)
+	5: CopyLoc[1](loc0: &CommonFields)
+	6: TestVariant[7](CommonFields/Foo)
+	7: StLoc[2](loc1: bool)
+	8: StLoc[3](loc2: u64)
+	9: MoveLoc[2](loc1: bool)
+	10: BrFalse(18)
+B1:
+	11: MoveLoc[1](loc0: &CommonFields)
+	12: Pop
+	13: MoveLoc[0](Arg0: CommonFields)
+	14: UnpackVariant[7](CommonFields/Foo)
+	15: StLoc[4](loc3: u64)
+	16: Pop
+	17: Branch(28)
+B2:
+	18: MoveLoc[1](loc0: &CommonFields)
+	19: TestVariant[8](CommonFields/Bar)
+	20: BrFalse(26)
+B3:
+	21: MoveLoc[0](Arg0: CommonFields)
+	22: UnpackVariant[8](CommonFields/Bar)
+	23: StLoc[4](loc3: u64)
+	24: Pop
+	25: Branch(28)
+B4:
+	26: LdU64(15621340914461310977)
+	27: Abort
+B5:
+	28: MoveLoc[3](loc2: u64)
+	29: MoveLoc[4](loc3: u64)
+	30: Add
+	31: Ret
+}
+select_common_fields_different_offset(Arg0: CommonFieldsAtDifferentOffset): u64 /* def_idx: 10 */ {
+L1:	loc0: &CommonFieldsAtDifferentOffset
+L2:	loc1: &u64
+B0:
+	0: ImmBorrowLoc[0](Arg0: CommonFieldsAtDifferentOffset)
+	1: StLoc[1](loc0: &CommonFieldsAtDifferentOffset)
+	2: CopyLoc[1](loc0: &CommonFieldsAtDifferentOffset)
+	3: TestVariant[9](CommonFieldsAtDifferentOffset/Bar)
+	4: BrTrue(9)
+B1:
+	5: CopyLoc[1](loc0: &CommonFieldsAtDifferentOffset)
+	6: TestVariant[10](CommonFieldsAtDifferentOffset/Balt)
+	7: BrTrue(9)
+B2:
+	8: Branch(13)
+B3:
+	9: MoveLoc[1](loc0: &CommonFieldsAtDifferentOffset)
+	10: ImmBorrowVariantField[4](Bar.z|Balt.z: u64)
+	11: StLoc[2](loc1: &u64)
+	12: Branch(16)
+B4:
+	13: MoveLoc[1](loc0: &CommonFieldsAtDifferentOffset)
+	14: ImmBorrowVariantField[5](Baz.z: u64)
+	15: StLoc[2](loc1: &u64)
+B5:
+	16: MoveLoc[2](loc1: &u64)
+	17: ReadRef
+	18: Ret
+}
+}
+============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/file-format-generator/struct_variants.move b/third_party/move/move-compiler-v2/tests/file-format-generator/struct_variants.move
new file mode 100644
index 0000000000000..955b0292ca74e
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/file-format-generator/struct_variants.move
@@ -0,0 +1,125 @@
+module 0xc0ffee::m {
+
+    enum Inner {
+        Inner1{ x: u64 }
+        Inner2{ x: u64, y: u64 }
+    }
+
+    struct Box has drop {
+        x: u64
+    }
+
+    enum Outer {
+        None,
+        One{i: Inner},
+        Two{i: Inner, b: Box},
+    }
+
+    /// Simple matching
+    public fun inner_value(self: Inner): u64 {
+        match (self) {
+            Inner1{x} => x,
+            Inner2{x, y} => x + y
+        }
+    }
+
+    /// Matching with wildcard and reference
+    public fun is_inner1(self: &Inner): bool {
+        match (self) {
+            Inner1{x: _} => true,
+            _ => false
+        }
+    }
+
+    /// Matching which delegates ownership
+    public fun outer_value(o: Outer): u64 {
+        match (o) {
+            None => 0,
+            // `i` is moved and consumed by `inner_value`
+            One{i} => i.inner_value(),
+            Two{i, b} => i.inner_value() + b.x
+        }
+    }
+
+    /// Nested matching with delegation
+    public fun outer_value_nested(o: Outer): u64 {
+        match (o) {
+            None => 0,
+            // Nested match will require multiple probing steps
+            One{i: Inner::Inner1{x}} => x,
+            One{i} => i.inner_value(),
+            Two{i, b} => i.inner_value() + b.x
+        }
+    }
+
+    /// Matching with condition
+    public fun outer_value_with_cond(o: Outer): u64 {
+        match (o) {
+            None => 0,
+            // Match with condition requires probing and conversion from 'Deref(Borrow(x))` to `x`.
+            One{i} if i.is_inner1() => i.inner_value() % 2,
+            One{i} => i.inner_value(),
+            Two{i, b} => i.inner_value() + b.x
+        }
+    }
+
+    /// Matching with condition with references and wildcard
+    public fun outer_value_with_cond_ref(o: &Outer): bool {
+        match (o) {
+            None => false,
+            One{i} if i.is_inner1() => true,
+            One{i} => i.is_inner1(),
+            Two{i, b: _} => i.is_inner1()
+        }
+    }
+
+    /// Matching with abilities and generics
+    enum Option<A> has drop {
+        None,
+        Some{value: A}
+    }
+
+    public fun is_some<A>(x: &Option<A>): bool {
+        match (x) {
+            None => false,
+            Some{value: _} => true
+        }
+    }
+
+    public fun is_some_specialized(x: &Option<Option<u64>>): bool {
+        match (x) {
+            None => false,
+            Some{value: Option::None} => false,
+            Some{value: Option::Some{value: _}} => true,
+        }
+    }
+
+    public fun is_some_dropped<A:drop>(x: Option<A>): bool {
+        match (x) {
+            None => false,
+            _ => true
+        }
+    }
+
+    // Common fields
+    enum CommonFields {
+        Foo{x: u64, y: u64},
+        Bar{x: u64, z: u64}
+    }
+
+    fun select_common_fields(s: CommonFields): u64 {
+        s.x + (match (s) { Foo{x: _, y} => y, Bar{z, x: _} => z })
+    }
+
+    enum CommonFieldsAtDifferentOffset has drop {
+       Foo{x: u64, y: u64},
+       Bar{x: u64, z: u64},
+       Baz{z: u64} // `z` at different offset
+       Balt{foo: u8, z: u64}
+    }
+
+    fun select_common_fields_different_offset(s: CommonFieldsAtDifferentOffset): u64 {
+        // We expect branching over the variant to select this field
+        s.z
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/file-format-generator/struct_variants.opt.exp b/third_party/move/move-compiler-v2/tests/file-format-generator/struct_variants.opt.exp
new file mode 100644
index 0000000000000..56d5925342e6c
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/file-format-generator/struct_variants.opt.exp
@@ -0,0 +1,536 @@
+
+============ disassembled file-format ==================
+// Move bytecode v7
+module c0ffee.m {
+struct Box has drop {
+	x: u64
+}
+enum CommonFields {
+ Foo{
+	x: u64,
+	y: u64
+ },
+ Bar{
+	x: u64,
+	z: u64
+ }
+}
+enum CommonFieldsAtDifferentOffset has drop {
+ Foo{
+	x: u64,
+	y: u64
+ },
+ Bar{
+	x: u64,
+	z: u64
+ },
+ Baz{
+	z: u64
+ },
+ Balt{
+	foo: u8,
+	z: u64
+ }
+}
+enum Inner {
+ Inner1{
+	x: u64
+ },
+ Inner2{
+	x: u64,
+	y: u64
+ }
+}
+enum Option<Ty0> has drop {
+ None{
+
+ },
+ Some{
+	value: Ty0
+ }
+}
+enum Outer {
+ None{
+
+ },
+ One{
+	i: Inner
+ },
+ Two{
+	i: Inner,
+	b: Box
+ }
+}
+
+public inner_value(Arg0: Inner): u64 /* def_idx: 0 */ {
+L1:	loc0: &Inner
+L2:	loc1: u64
+B0:
+	0: ImmBorrowLoc[0](Arg0: Inner)
+	1: StLoc[1](loc0: &Inner)
+	2: CopyLoc[1](loc0: &Inner)
+	3: TestVariant[0](Inner/Inner1)
+	4: BrFalse(11)
+B1:
+	5: MoveLoc[1](loc0: &Inner)
+	6: Pop
+	7: MoveLoc[0](Arg0: Inner)
+	8: UnpackVariant[0](Inner/Inner1)
+	9: StLoc[2](loc1: u64)
+	10: Branch(21)
+B2:
+	11: MoveLoc[1](loc0: &Inner)
+	12: TestVariant[1](Inner/Inner2)
+	13: BrFalse(19)
+B3:
+	14: MoveLoc[0](Arg0: Inner)
+	15: UnpackVariant[1](Inner/Inner2)
+	16: Add
+	17: StLoc[2](loc1: u64)
+	18: Branch(21)
+B4:
+	19: LdU64(15621340914461310977)
+	20: Abort
+B5:
+	21: MoveLoc[2](loc1: u64)
+	22: Ret
+}
+public is_inner1(Arg0: &Inner): bool /* def_idx: 1 */ {
+L1:	loc0: bool
+B0:
+	0: CopyLoc[0](Arg0: &Inner)
+	1: TestVariant[0](Inner/Inner1)
+	2: BrFalse(8)
+B1:
+	3: MoveLoc[0](Arg0: &Inner)
+	4: Pop
+	5: LdTrue
+	6: StLoc[1](loc0: bool)
+	7: Branch(13)
+B2:
+	8: MoveLoc[0](Arg0: &Inner)
+	9: Pop
+	10: LdFalse
+	11: StLoc[1](loc0: bool)
+	12: Branch(13)
+B3:
+	13: MoveLoc[1](loc0: bool)
+	14: Ret
+}
+public is_some<Ty0>(Arg0: &Option<Ty0>): bool /* def_idx: 2 */ {
+L1:	loc0: bool
+B0:
+	0: CopyLoc[0](Arg0: &Option<Ty0>)
+	1: TestVariantGeneric[0](Option/None<Ty0>)
+	2: BrFalse(8)
+B1:
+	3: MoveLoc[0](Arg0: &Option<Ty0>)
+	4: Pop
+	5: LdFalse
+	6: StLoc[1](loc0: bool)
+	7: Branch(16)
+B2:
+	8: MoveLoc[0](Arg0: &Option<Ty0>)
+	9: TestVariantGeneric[1](Option/Some<Ty0>)
+	10: BrFalse(14)
+B3:
+	11: LdTrue
+	12: StLoc[1](loc0: bool)
+	13: Branch(16)
+B4:
+	14: LdU64(15621340914461310977)
+	15: Abort
+B5:
+	16: MoveLoc[1](loc0: bool)
+	17: Ret
+}
+public is_some_dropped<Ty0: drop>(Arg0: Option<Ty0>): bool /* def_idx: 3 */ {
+L1:	loc0: bool
+B0:
+	0: ImmBorrowLoc[0](Arg0: Option<Ty0>)
+	1: TestVariantGeneric[0](Option/None<Ty0>)
+	2: BrFalse(8)
+B1:
+	3: MoveLoc[0](Arg0: Option<Ty0>)
+	4: UnpackVariantGeneric[0](Option/None<Ty0>)
+	5: LdFalse
+	6: StLoc[1](loc0: bool)
+	7: Branch(11)
+B2:
+	8: LdTrue
+	9: StLoc[1](loc0: bool)
+	10: Branch(11)
+B3:
+	11: MoveLoc[1](loc0: bool)
+	12: Ret
+}
+public is_some_specialized(Arg0: &Option<Option<u64>>): bool /* def_idx: 4 */ {
+L1:	loc0: bool
+B0:
+	0: CopyLoc[0](Arg0: &Option<Option<u64>>)
+	1: TestVariantGeneric[2](Option/None<Option<u64>>)
+	2: BrFalse(8)
+B1:
+	3: MoveLoc[0](Arg0: &Option<Option<u64>>)
+	4: Pop
+	5: LdFalse
+	6: StLoc[1](loc0: bool)
+	7: Branch(32)
+B2:
+	8: CopyLoc[0](Arg0: &Option<Option<u64>>)
+	9: TestVariantGeneric[3](Option/Some<Option<u64>>)
+	10: BrFalse(20)
+B3:
+	11: CopyLoc[0](Arg0: &Option<Option<u64>>)
+	12: ImmBorrowVariantFieldGeneric[0](Some.value: Ty0)
+	13: TestVariantGeneric[4](Option/None<u64>)
+	14: BrFalse(20)
+B4:
+	15: MoveLoc[0](Arg0: &Option<Option<u64>>)
+	16: Pop
+	17: LdFalse
+	18: StLoc[1](loc0: bool)
+	19: Branch(32)
+B5:
+	20: CopyLoc[0](Arg0: &Option<Option<u64>>)
+	21: TestVariantGeneric[3](Option/Some<Option<u64>>)
+	22: BrFalse(30)
+B6:
+	23: MoveLoc[0](Arg0: &Option<Option<u64>>)
+	24: ImmBorrowVariantFieldGeneric[0](Some.value: Ty0)
+	25: TestVariantGeneric[5](Option/Some<u64>)
+	26: BrFalse(30)
+B7:
+	27: LdTrue
+	28: StLoc[1](loc0: bool)
+	29: Branch(32)
+B8:
+	30: LdU64(15621340914461310977)
+	31: Abort
+B9:
+	32: MoveLoc[1](loc0: bool)
+	33: Ret
+}
+public outer_value(Arg0: Outer): u64 /* def_idx: 5 */ {
+L1:	loc0: &Outer
+L2:	loc1: u64
+L3:	loc2: Box
+B0:
+	0: ImmBorrowLoc[0](Arg0: Outer)
+	1: StLoc[1](loc0: &Outer)
+	2: CopyLoc[1](loc0: &Outer)
+	3: TestVariant[4](Outer/None)
+	4: BrFalse(12)
+B1:
+	5: MoveLoc[1](loc0: &Outer)
+	6: Pop
+	7: MoveLoc[0](Arg0: Outer)
+	8: UnpackVariant[4](Outer/None)
+	9: LdU64(0)
+	10: StLoc[2](loc1: u64)
+	11: Branch(37)
+B2:
+	12: CopyLoc[1](loc0: &Outer)
+	13: TestVariant[5](Outer/One)
+	14: BrFalse(22)
+B3:
+	15: MoveLoc[1](loc0: &Outer)
+	16: Pop
+	17: MoveLoc[0](Arg0: Outer)
+	18: UnpackVariant[5](Outer/One)
+	19: Call inner_value(Inner): u64
+	20: StLoc[2](loc1: u64)
+	21: Branch(37)
+B4:
+	22: MoveLoc[1](loc0: &Outer)
+	23: TestVariant[6](Outer/Two)
+	24: BrFalse(35)
+B5:
+	25: MoveLoc[0](Arg0: Outer)
+	26: UnpackVariant[6](Outer/Two)
+	27: StLoc[3](loc2: Box)
+	28: Call inner_value(Inner): u64
+	29: ImmBorrowLoc[3](loc2: Box)
+	30: ImmBorrowField[0](Box.x: u64)
+	31: ReadRef
+	32: Add
+	33: StLoc[2](loc1: u64)
+	34: Branch(37)
+B6:
+	35: LdU64(15621340914461310977)
+	36: Abort
+B7:
+	37: MoveLoc[2](loc1: u64)
+	38: Ret
+}
+public outer_value_nested(Arg0: Outer): u64 /* def_idx: 6 */ {
+L1:	loc0: &Outer
+L2:	loc1: u64
+L3:	loc2: Box
+B0:
+	0: ImmBorrowLoc[0](Arg0: Outer)
+	1: StLoc[1](loc0: &Outer)
+	2: CopyLoc[1](loc0: &Outer)
+	3: TestVariant[4](Outer/None)
+	4: BrFalse(12)
+B1:
+	5: MoveLoc[1](loc0: &Outer)
+	6: Pop
+	7: MoveLoc[0](Arg0: Outer)
+	8: UnpackVariant[4](Outer/None)
+	9: LdU64(0)
+	10: StLoc[2](loc1: u64)
+	11: Branch(51)
+B2:
+	12: CopyLoc[1](loc0: &Outer)
+	13: TestVariant[5](Outer/One)
+	14: BrFalse(26)
+B3:
+	15: CopyLoc[1](loc0: &Outer)
+	16: ImmBorrowVariantField[1](One.i: Inner)
+	17: TestVariant[0](Inner/Inner1)
+	18: BrFalse(26)
+B4:
+	19: MoveLoc[1](loc0: &Outer)
+	20: Pop
+	21: MoveLoc[0](Arg0: Outer)
+	22: UnpackVariant[5](Outer/One)
+	23: UnpackVariant[0](Inner/Inner1)
+	24: StLoc[2](loc1: u64)
+	25: Branch(51)
+B5:
+	26: CopyLoc[1](loc0: &Outer)
+	27: TestVariant[5](Outer/One)
+	28: BrFalse(36)
+B6:
+	29: MoveLoc[1](loc0: &Outer)
+	30: Pop
+	31: MoveLoc[0](Arg0: Outer)
+	32: UnpackVariant[5](Outer/One)
+	33: Call inner_value(Inner): u64
+	34: StLoc[2](loc1: u64)
+	35: Branch(51)
+B7:
+	36: MoveLoc[1](loc0: &Outer)
+	37: TestVariant[6](Outer/Two)
+	38: BrFalse(49)
+B8:
+	39: MoveLoc[0](Arg0: Outer)
+	40: UnpackVariant[6](Outer/Two)
+	41: StLoc[3](loc2: Box)
+	42: Call inner_value(Inner): u64
+	43: ImmBorrowLoc[3](loc2: Box)
+	44: ImmBorrowField[0](Box.x: u64)
+	45: ReadRef
+	46: Add
+	47: StLoc[2](loc1: u64)
+	48: Branch(51)
+B9:
+	49: LdU64(15621340914461310977)
+	50: Abort
+B10:
+	51: MoveLoc[2](loc1: u64)
+	52: Ret
+}
+public outer_value_with_cond(Arg0: Outer): u64 /* def_idx: 7 */ {
+L1:	loc0: &Outer
+L2:	loc1: u64
+L3:	loc2: Box
+B0:
+	0: ImmBorrowLoc[0](Arg0: Outer)
+	1: StLoc[1](loc0: &Outer)
+	2: CopyLoc[1](loc0: &Outer)
+	3: TestVariant[4](Outer/None)
+	4: BrFalse(12)
+B1:
+	5: MoveLoc[1](loc0: &Outer)
+	6: Pop
+	7: MoveLoc[0](Arg0: Outer)
+	8: UnpackVariant[4](Outer/None)
+	9: LdU64(0)
+	10: StLoc[2](loc1: u64)
+	11: Branch(53)
+B2:
+	12: CopyLoc[1](loc0: &Outer)
+	13: TestVariant[5](Outer/One)
+	14: BrFalse(28)
+B3:
+	15: CopyLoc[1](loc0: &Outer)
+	16: ImmBorrowVariantField[1](One.i: Inner)
+	17: Call is_inner1(&Inner): bool
+	18: BrFalse(28)
+B4:
+	19: MoveLoc[1](loc0: &Outer)
+	20: Pop
+	21: MoveLoc[0](Arg0: Outer)
+	22: UnpackVariant[5](Outer/One)
+	23: Call inner_value(Inner): u64
+	24: LdU64(2)
+	25: Mod
+	26: StLoc[2](loc1: u64)
+	27: Branch(53)
+B5:
+	28: CopyLoc[1](loc0: &Outer)
+	29: TestVariant[5](Outer/One)
+	30: BrFalse(38)
+B6:
+	31: MoveLoc[1](loc0: &Outer)
+	32: Pop
+	33: MoveLoc[0](Arg0: Outer)
+	34: UnpackVariant[5](Outer/One)
+	35: Call inner_value(Inner): u64
+	36: StLoc[2](loc1: u64)
+	37: Branch(53)
+B7:
+	38: MoveLoc[1](loc0: &Outer)
+	39: TestVariant[6](Outer/Two)
+	40: BrFalse(51)
+B8:
+	41: MoveLoc[0](Arg0: Outer)
+	42: UnpackVariant[6](Outer/Two)
+	43: StLoc[3](loc2: Box)
+	44: Call inner_value(Inner): u64
+	45: ImmBorrowLoc[3](loc2: Box)
+	46: ImmBorrowField[0](Box.x: u64)
+	47: ReadRef
+	48: Add
+	49: StLoc[2](loc1: u64)
+	50: Branch(53)
+B9:
+	51: LdU64(15621340914461310977)
+	52: Abort
+B10:
+	53: MoveLoc[2](loc1: u64)
+	54: Ret
+}
+public outer_value_with_cond_ref(Arg0: &Outer): bool /* def_idx: 8 */ {
+L1:	loc0: bool
+B0:
+	0: CopyLoc[0](Arg0: &Outer)
+	1: TestVariant[4](Outer/None)
+	2: BrFalse(8)
+B1:
+	3: MoveLoc[0](Arg0: &Outer)
+	4: Pop
+	5: LdFalse
+	6: StLoc[1](loc0: bool)
+	7: Branch(40)
+B2:
+	8: CopyLoc[0](Arg0: &Outer)
+	9: TestVariant[5](Outer/One)
+	10: BrFalse(20)
+B3:
+	11: CopyLoc[0](Arg0: &Outer)
+	12: ImmBorrowVariantField[1](One.i: Inner)
+	13: Call is_inner1(&Inner): bool
+	14: BrFalse(20)
+B4:
+	15: MoveLoc[0](Arg0: &Outer)
+	16: Pop
+	17: LdTrue
+	18: StLoc[1](loc0: bool)
+	19: Branch(40)
+B5:
+	20: CopyLoc[0](Arg0: &Outer)
+	21: TestVariant[5](Outer/One)
+	22: BrFalse(28)
+B6:
+	23: MoveLoc[0](Arg0: &Outer)
+	24: ImmBorrowVariantField[1](One.i: Inner)
+	25: Call is_inner1(&Inner): bool
+	26: StLoc[1](loc0: bool)
+	27: Branch(40)
+B7:
+	28: CopyLoc[0](Arg0: &Outer)
+	29: TestVariant[6](Outer/Two)
+	30: BrFalse(36)
+B8:
+	31: MoveLoc[0](Arg0: &Outer)
+	32: ImmBorrowVariantField[2](Two.i: Inner)
+	33: Call is_inner1(&Inner): bool
+	34: StLoc[1](loc0: bool)
+	35: Branch(40)
+B9:
+	36: MoveLoc[0](Arg0: &Outer)
+	37: Pop
+	38: LdU64(15621340914461310977)
+	39: Abort
+B10:
+	40: MoveLoc[1](loc0: bool)
+	41: Ret
+}
+select_common_fields(Arg0: CommonFields): u64 /* def_idx: 9 */ {
+L1:	loc0: &CommonFields
+L2:	loc1: bool
+L3:	loc2: u64
+L4:	loc3: u64
+B0:
+	0: ImmBorrowLoc[0](Arg0: CommonFields)
+	1: ImmBorrowVariantField[3](Foo.x|Bar.x: u64)
+	2: ReadRef
+	3: ImmBorrowLoc[0](Arg0: CommonFields)
+	4: StLoc[1](loc0: &CommonFields)
+	5: CopyLoc[1](loc0: &CommonFields)
+	6: TestVariant[7](CommonFields/Foo)
+	7: StLoc[2](loc1: bool)
+	8: StLoc[3](loc2: u64)
+	9: MoveLoc[2](loc1: bool)
+	10: BrFalse(18)
+B1:
+	11: MoveLoc[1](loc0: &CommonFields)
+	12: Pop
+	13: MoveLoc[0](Arg0: CommonFields)
+	14: UnpackVariant[7](CommonFields/Foo)
+	15: StLoc[4](loc3: u64)
+	16: Pop
+	17: Branch(28)
+B2:
+	18: MoveLoc[1](loc0: &CommonFields)
+	19: TestVariant[8](CommonFields/Bar)
+	20: BrFalse(26)
+B3:
+	21: MoveLoc[0](Arg0: CommonFields)
+	22: UnpackVariant[8](CommonFields/Bar)
+	23: StLoc[4](loc3: u64)
+	24: Pop
+	25: Branch(28)
+B4:
+	26: LdU64(15621340914461310977)
+	27: Abort
+B5:
+	28: MoveLoc[3](loc2: u64)
+	29: MoveLoc[4](loc3: u64)
+	30: Add
+	31: Ret
+}
+select_common_fields_different_offset(Arg0: CommonFieldsAtDifferentOffset): u64 /* def_idx: 10 */ {
+L1:	loc0: &CommonFieldsAtDifferentOffset
+L2:	loc1: &u64
+B0:
+	0: ImmBorrowLoc[0](Arg0: CommonFieldsAtDifferentOffset)
+	1: StLoc[1](loc0: &CommonFieldsAtDifferentOffset)
+	2: CopyLoc[1](loc0: &CommonFieldsAtDifferentOffset)
+	3: TestVariant[9](CommonFieldsAtDifferentOffset/Bar)
+	4: BrTrue(9)
+B1:
+	5: CopyLoc[1](loc0: &CommonFieldsAtDifferentOffset)
+	6: TestVariant[10](CommonFieldsAtDifferentOffset/Balt)
+	7: BrTrue(9)
+B2:
+	8: Branch(13)
+B3:
+	9: MoveLoc[1](loc0: &CommonFieldsAtDifferentOffset)
+	10: ImmBorrowVariantField[4](Bar.z|Balt.z: u64)
+	11: StLoc[2](loc1: &u64)
+	12: Branch(16)
+B4:
+	13: MoveLoc[1](loc0: &CommonFieldsAtDifferentOffset)
+	14: ImmBorrowVariantField[5](Baz.z: u64)
+	15: StLoc[2](loc1: &u64)
+B5:
+	16: MoveLoc[2](loc1: &u64)
+	17: ReadRef
+	18: Ret
+}
+}
+============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/file-format-generator/vector.opt.exp b/third_party/move/move-compiler-v2/tests/file-format-generator/vector.opt.exp
index 6e5f12695ba14..e7f10b6e4fd74 100644
--- a/third_party/move/move-compiler-v2/tests/file-format-generator/vector.opt.exp
+++ b/third_party/move/move-compiler-v2/tests/file-format-generator/vector.opt.exp
@@ -27,43 +27,39 @@ B1:
 	10: LdU64(1)
 	11: Abort
 B2:
-	12: LdU64(1)
-	13: StLoc[3](loc1: u64)
-	14: MoveLoc[2](loc0: u64)
-	15: MoveLoc[3](loc1: u64)
-	16: Sub
-	17: StLoc[2](loc0: u64)
+	12: MoveLoc[2](loc0: u64)
+	13: LdU64(1)
+	14: Sub
+	15: StLoc[2](loc0: u64)
 B3:
-	18: CopyLoc[1](Arg1: u64)
-	19: CopyLoc[2](loc0: u64)
-	20: Lt
-	21: BrFalse(39)
+	16: CopyLoc[1](Arg1: u64)
+	17: CopyLoc[2](loc0: u64)
+	18: Lt
+	19: BrFalse(35)
 B4:
-	22: CopyLoc[0](Arg0: &mut vector<Ty0>)
-	23: StLoc[4](loc2: &mut vector<Ty0>)
-	24: CopyLoc[1](Arg1: u64)
-	25: StLoc[3](loc1: u64)
-	26: LdU64(1)
-	27: StLoc[5](loc3: u64)
-	28: MoveLoc[1](Arg1: u64)
-	29: MoveLoc[5](loc3: u64)
-	30: Add
-	31: StLoc[1](Arg1: u64)
-	32: CopyLoc[1](Arg1: u64)
-	33: StLoc[5](loc3: u64)
-	34: MoveLoc[4](loc2: &mut vector<Ty0>)
-	35: MoveLoc[3](loc1: u64)
-	36: MoveLoc[5](loc3: u64)
-	37: VecSwap(1)
-	38: Branch(40)
+	20: CopyLoc[0](Arg0: &mut vector<Ty0>)
+	21: StLoc[4](loc2: &mut vector<Ty0>)
+	22: CopyLoc[1](Arg1: u64)
+	23: StLoc[3](loc1: u64)
+	24: MoveLoc[1](Arg1: u64)
+	25: LdU64(1)
+	26: Add
+	27: StLoc[1](Arg1: u64)
+	28: CopyLoc[1](Arg1: u64)
+	29: StLoc[5](loc3: u64)
+	30: MoveLoc[4](loc2: &mut vector<Ty0>)
+	31: MoveLoc[3](loc1: u64)
+	32: MoveLoc[5](loc3: u64)
+	33: VecSwap(1)
+	34: Branch(36)
 B5:
-	39: Branch(41)
+	35: Branch(37)
 B6:
-	40: Branch(18)
+	36: Branch(16)
 B7:
-	41: MoveLoc[0](Arg0: &mut vector<Ty0>)
-	42: VecPopBack(1)
-	43: Ret
+	37: MoveLoc[0](Arg0: &mut vector<Ty0>)
+	38: VecPopBack(1)
+	39: Ret
 }
 create(): vector<u64> /* def_idx: 1 */ {
 B0:
@@ -84,33 +80,30 @@ B0:
 B1:
 	6: ImmBorrowLoc[0](loc0: vector<u64>)
 	7: Call 1vector::is_empty<u64>(&vector<u64>): bool
-	8: Not
-	9: BrFalse(16)
+	8: BrTrue(15)
 B2:
-	10: MutBorrowLoc[0](loc0: vector<u64>)
-	11: VecPopBack(5)
-	12: LdU64(0)
-	13: StLoc[1](loc1: u64)
-	14: Pop
-	15: Branch(17)
+	9: MutBorrowLoc[0](loc0: vector<u64>)
+	10: VecPopBack(5)
+	11: LdU64(0)
+	12: StLoc[1](loc1: u64)
+	13: Pop
+	14: Branch(16)
 B3:
-	16: Branch(18)
+	15: Branch(17)
 B4:
-	17: Branch(6)
+	16: Branch(6)
 B5:
+	17: MoveLoc[1](loc1: u64)
 	18: LdU64(0)
-	19: StLoc[2](loc2: u64)
-	20: MoveLoc[1](loc1: u64)
-	21: MoveLoc[2](loc2: u64)
-	22: Eq
-	23: BrFalse(25)
+	19: Eq
+	20: BrFalse(22)
 B6:
-	24: Branch(27)
+	21: Branch(24)
 B7:
-	25: LdU64(0)
-	26: Abort
+	22: LdU64(0)
+	23: Abort
 B8:
-	27: Ret
+	24: Ret
 }
 }
 ============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/folding/constant_folding_addresses.exp b/third_party/move/move-compiler-v2/tests/folding/constant_folding_addresses.exp
new file mode 100644
index 0000000000000..42c1f4eb0702c
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/folding/constant_folding_addresses.exp
@@ -0,0 +1,12 @@
+// -- Model dump before bytecode pipeline
+module 0x8675309::M {
+    private fun const_addr(): address {
+        0x1234
+    }
+    private fun const_addr_let(): address {
+        0x1234
+    }
+} // end 0x8675309::M
+
+
+============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/folding/constant_folding_addresses.move b/third_party/move/move-compiler-v2/tests/folding/constant_folding_addresses.move
new file mode 100644
index 0000000000000..2f623a27b44ef
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/folding/constant_folding_addresses.move
@@ -0,0 +1,9 @@
+module 0x8675309::M {
+    fun const_addr(): address {
+        @0x1234
+    }
+    fun const_addr_let(): address {
+        let x = @0x1234;
+        x
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/lambda-lifting/pattern.exp b/third_party/move/move-compiler-v2/tests/lambda-lifting/pattern.exp
index ef4ec3980fdd8..c61dde92a484d 100644
--- a/third_party/move/move-compiler-v2/tests/lambda-lifting/pattern.exp
+++ b/third_party/move/move-compiler-v2/tests/lambda-lifting/pattern.exp
@@ -7,7 +7,7 @@ module 0xcafe::m {
         (f)(s, x)
     }
     private fun pattern(s: m::S<u64>,x: u64): u64 {
-        m::consume<u64>(s, x, |(m::S<u64>{ x: x: u64 }, _y: u64): (m::S<u64>, u64)| {
+        m::consume<u64>(s, x, |(m::S<u64>{ x }, _y: u64): (m::S<u64>, u64)| {
           let y: u64 = x;
           Add<u64>(x, y)
         })
@@ -28,7 +28,7 @@ module 0xcafe::m {
     }
     private fun pattern$lambda$1(param$0: m::S<u64>,_y: u64): u64 {
         {
-          let m::S<u64>{ x: x: u64 }: m::S<u64> = param$0;
+          let m::S<u64>{ x } = param$0;
           {
             let y: u64 = x;
             Add<u64>(x, y)
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/bug_12394.exp b/third_party/move/move-compiler-v2/tests/reference-safety/bug_12394.exp
new file mode 100644
index 0000000000000..209cbc1c02212
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/bug_12394.exp
@@ -0,0 +1,23 @@
+
+Diagnostics:
+warning: Unused assignment to `x`. Consider removing or prefixing with an underscore: `_x`
+  ┌─ tests/reference-safety/bug_12394.move:9:18
+  │
+9 │         (x, y) = t2(&mut 3, &mut 4);
+  │                  ^^^^^^^^^^^^^^^^^^
+
+warning: Unused assignment to `y`. Consider removing or prefixing with an underscore: `_y`
+  ┌─ tests/reference-safety/bug_12394.move:9:18
+  │
+9 │         (x, y) = t2(&mut 3, &mut 4);
+  │                  ^^^^^^^^^^^^^^^^^^
+
+
+============ bytecode verification failed ========
+
+Diagnostics:
+bug: bytecode verification failed with unexpected status code `STLOC_TYPE_MISMATCH_ERROR`. This is a compiler bug, consider reporting it.
+  ┌─ tests/reference-safety/bug_12394.move:9:18
+  │
+9 │         (x, y) = t2(&mut 3, &mut 4);
+  │                  ^^^^^^^^^^^^^^^^^^
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/bug_12394.move b/third_party/move/move-compiler-v2/tests/reference-safety/bug_12394.move
new file mode 100644
index 0000000000000..371ce0b5d3e63
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/bug_12394.move
@@ -0,0 +1,11 @@
+// TODO(#12394): after fix, rename file to reflect issue (`bug_nnn.move` to `bug_nnn_<issue>.move`)
+module 0x815::m {
+    fun t2(u1: &mut u64, u2: &mut u64): (&mut u64, &mut u64) {
+        (u1, u2)
+    }
+    fun test_4() {
+        let x: &u64;
+        let y: &u64;
+        (x, y) = t2(&mut 3, &mut 4);
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/bug_12394.no-opt.exp b/third_party/move/move-compiler-v2/tests/reference-safety/bug_12394.no-opt.exp
new file mode 100644
index 0000000000000..209cbc1c02212
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/bug_12394.no-opt.exp
@@ -0,0 +1,23 @@
+
+Diagnostics:
+warning: Unused assignment to `x`. Consider removing or prefixing with an underscore: `_x`
+  ┌─ tests/reference-safety/bug_12394.move:9:18
+  │
+9 │         (x, y) = t2(&mut 3, &mut 4);
+  │                  ^^^^^^^^^^^^^^^^^^
+
+warning: Unused assignment to `y`. Consider removing or prefixing with an underscore: `_y`
+  ┌─ tests/reference-safety/bug_12394.move:9:18
+  │
+9 │         (x, y) = t2(&mut 3, &mut 4);
+  │                  ^^^^^^^^^^^^^^^^^^
+
+
+============ bytecode verification failed ========
+
+Diagnostics:
+bug: bytecode verification failed with unexpected status code `STLOC_TYPE_MISMATCH_ERROR`. This is a compiler bug, consider reporting it.
+  ┌─ tests/reference-safety/bug_12394.move:9:18
+  │
+9 │         (x, y) = t2(&mut 3, &mut 4);
+  │                  ^^^^^^^^^^^^^^^^^^
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/bug_12817_order_dependency.exp b/third_party/move/move-compiler-v2/tests/reference-safety/bug_12817_order_dependency.exp
new file mode 100644
index 0000000000000..25fce3ee48e8d
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/bug_12817_order_dependency.exp
@@ -0,0 +1,9 @@
+
+============ bytecode verification failed ========
+
+Diagnostics:
+error: reference safety check failed on bytecode level. This is a known issue, to be fixed later, resulting from differences between safety rules of the v1 and v2 compiler. Try to rewrite your code to workaround this problem.
+   ┌─ tests/reference-safety/bug_12817_order_dependency.move:14:9
+   │
+14 │         *r2 + *r1 // <- changed order here
+   │         ^^^
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/bug_12817_order_dependency.move b/third_party/move/move-compiler-v2/tests/reference-safety/bug_12817_order_dependency.move
new file mode 100644
index 0000000000000..dae157279fc5b
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/bug_12817_order_dependency.move
@@ -0,0 +1,16 @@
+module 0xcafe::m {
+
+    public fun test1(): u64 {
+        let x = 0;
+        let r1 = &mut x;
+        let r2 = &mut x;
+        *r1 + *r2
+    }
+
+    public fun test2(): u64 {
+        let x = 0;
+        let r1 = &mut x;
+        let r2 = &mut x;
+        *r2 + *r1 // <- changed order here
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/bug_12817_order_dependency.no-opt.exp b/third_party/move/move-compiler-v2/tests/reference-safety/bug_12817_order_dependency.no-opt.exp
new file mode 100644
index 0000000000000..25fce3ee48e8d
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/bug_12817_order_dependency.no-opt.exp
@@ -0,0 +1,9 @@
+
+============ bytecode verification failed ========
+
+Diagnostics:
+error: reference safety check failed on bytecode level. This is a known issue, to be fixed later, resulting from differences between safety rules of the v1 and v2 compiler. Try to rewrite your code to workaround this problem.
+   ┌─ tests/reference-safety/bug_12817_order_dependency.move:14:9
+   │
+14 │         *r2 + *r1 // <- changed order here
+   │         ^^^
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/bug_13149.exp b/third_party/move/move-compiler-v2/tests/reference-safety/bug_13149.exp
new file mode 100644
index 0000000000000..76f872ecaac28
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/bug_13149.exp
@@ -0,0 +1,9 @@
+
+============ bytecode verification failed ========
+
+Diagnostics:
+bug: bytecode verification failed with unexpected status code `WRITEREF_EXISTS_BORROW_ERROR`. This is a compiler bug, consider reporting it.
+  ┌─ tests/reference-safety/bug_13149.move:7:9
+  │
+7 │         *r2 = 2;
+  │         ^^^^^^^
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/bug_13149.move b/third_party/move/move-compiler-v2/tests/reference-safety/bug_13149.move
new file mode 100644
index 0000000000000..cf9fb155be480
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/bug_13149.move
@@ -0,0 +1,10 @@
+// TODO(#13149): after fix, rename file to reflect issue (`bug_nnn.move` to `bug_nnn_<issue>.move`)
+module 0x815::m {
+    fun t1() {
+        let a = 0;
+        let r1 = &mut a;
+        let r2 = &mut a;
+        *r2 = 2;
+        *r1 = 1;
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/bug_13149.no-opt.exp b/third_party/move/move-compiler-v2/tests/reference-safety/bug_13149.no-opt.exp
new file mode 100644
index 0000000000000..76f872ecaac28
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/bug_13149.no-opt.exp
@@ -0,0 +1,9 @@
+
+============ bytecode verification failed ========
+
+Diagnostics:
+bug: bytecode verification failed with unexpected status code `WRITEREF_EXISTS_BORROW_ERROR`. This is a compiler bug, consider reporting it.
+  ┌─ tests/reference-safety/bug_13149.move:7:9
+  │
+7 │         *r2 = 2;
+  │         ^^^^^^^
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/bug_13488.exp b/third_party/move/move-compiler-v2/tests/reference-safety/bug_13488.exp
new file mode 100644
index 0000000000000..90b32906711cc
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/bug_13488.exp
@@ -0,0 +1,2 @@
+
+============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/bug_13488.move b/third_party/move/move-compiler-v2/tests/reference-safety/bug_13488.move
new file mode 100644
index 0000000000000..fe1b0e871d3ec
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/bug_13488.move
@@ -0,0 +1,17 @@
+// TODO(#13488): after fix, rename file to reflect issue (`bug_nnn.move` to `bug_nnn_<issue>.move`)
+module 0x8675309::Tester {
+    fun t() {
+        let x = 0;
+        let y = 0;
+        let r1 = foo(&x, &y);
+        let r2 = foo(&x, &y);
+        x + copy x;
+        y + copy y;
+        r1;
+        r2;
+    }
+
+    fun foo(_r: &u64, r2: &u64): &u64 {
+        r2
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/bug_13488.no-opt.exp b/third_party/move/move-compiler-v2/tests/reference-safety/bug_13488.no-opt.exp
new file mode 100644
index 0000000000000..b20dd956ee408
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/bug_13488.no-opt.exp
@@ -0,0 +1,9 @@
+
+============ bytecode verification failed ========
+
+Diagnostics:
+error: reference safety check failed on bytecode level. This is a known issue, to be fixed later, resulting from differences between safety rules of the v1 and v2 compiler. Try to rewrite your code to workaround this problem.
+  ┌─ tests/reference-safety/bug_13488.move:8:9
+  │
+8 │         x + copy x;
+  │         ^^^^^^^^^^
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/bug_13687.exp b/third_party/move/move-compiler-v2/tests/reference-safety/bug_13687.exp
new file mode 100644
index 0000000000000..90b32906711cc
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/bug_13687.exp
@@ -0,0 +1,2 @@
+
+============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/bug_13687.move b/third_party/move/move-compiler-v2/tests/reference-safety/bug_13687.move
new file mode 100644
index 0000000000000..09f92b4aa8367
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/bug_13687.move
@@ -0,0 +1,22 @@
+// TODO(#13912): after fix, rename file to reflect issue (`bug_nnn.move` to `bug_nnn_<issue>.move`)
+module 0xCAFE::Module1 {
+    struct Struct3 has drop, copy {
+        var32: u16,
+        var33: u32,
+        var34: u8,
+        var35: u32,
+        var36: u32,
+    }
+
+    public fun function6(): Struct3 {
+        let var44: u16 =  21859u16;
+        let var45: u32 =  1399722001u32;
+        Struct3 {
+            var32: var44,
+            var33: var45,
+            var34: 154u8,
+            var35: var45,
+            var36: var45,
+        }
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/bug_13687.no-opt.exp b/third_party/move/move-compiler-v2/tests/reference-safety/bug_13687.no-opt.exp
new file mode 100644
index 0000000000000..e34791244b187
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/bug_13687.no-opt.exp
@@ -0,0 +1,15 @@
+
+============ bytecode verification failed ========
+
+Diagnostics:
+bug: bytecode verification failed with unexpected status code `MOVELOC_UNAVAILABLE_ERROR`. This is a compiler bug, consider reporting it.
+   ┌─ tests/reference-safety/bug_13687.move:14:9
+   │
+14 │ ╭         Struct3 {
+15 │ │             var32: var44,
+16 │ │             var33: var45,
+17 │ │             var34: 154u8,
+18 │ │             var35: var45,
+19 │ │             var36: var45,
+20 │ │         }
+   │ ╰─────────^
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/bug_13912.exp b/third_party/move/move-compiler-v2/tests/reference-safety/bug_13912.exp
new file mode 100644
index 0000000000000..bb6384cced35a
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/bug_13912.exp
@@ -0,0 +1,12 @@
+
+Diagnostics:
+error: cannot copy local `var4` which is still mutably borrowed
+  ┌─ tests/reference-safety/bug_13912.move:5:30
+  │
+5 │         (&mut (var4) != &mut (copy var4))
+  │         ---------------------^^^^^^^^^^^-
+  │         ││                   │
+  │         ││                   copied here
+  │         │previous mutable local borrow
+  │         │used by freeze
+  │         conflicting reference used here
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/bug_13912.move b/third_party/move/move-compiler-v2/tests/reference-safety/bug_13912.move
new file mode 100644
index 0000000000000..d8f5eb9628d92
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/bug_13912.move
@@ -0,0 +1,7 @@
+// TODO(#13912): after fix, rename file to reflect issue (`bug_nnn.move` to `bug_nnn_<issue>.move`)
+module 0xCAFE::Module0 {
+    // Expected to succeed without borrow errors
+    public fun function2(var4: u8): bool {
+        (&mut (var4) != &mut (copy var4))
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/bug_13912.no-opt.exp b/third_party/move/move-compiler-v2/tests/reference-safety/bug_13912.no-opt.exp
new file mode 100644
index 0000000000000..bb6384cced35a
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/bug_13912.no-opt.exp
@@ -0,0 +1,12 @@
+
+Diagnostics:
+error: cannot copy local `var4` which is still mutably borrowed
+  ┌─ tests/reference-safety/bug_13912.move:5:30
+  │
+5 │         (&mut (var4) != &mut (copy var4))
+  │         ---------------------^^^^^^^^^^^-
+  │         ││                   │
+  │         ││                   copied here
+  │         │previous mutable local borrow
+  │         │used by freeze
+  │         conflicting reference used here
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/bug_13927.exp b/third_party/move/move-compiler-v2/tests/reference-safety/bug_13927.exp
new file mode 100644
index 0000000000000..2bbecf1e74a8a
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/bug_13927.exp
@@ -0,0 +1,9 @@
+
+Diagnostics:
+error: cannot freeze local `result` since other mutable usages for this reference exist
+   ┌─ tests/reference-safety/bug_13927.move:10:9
+   │
+10 │         freeze(result);
+   │         ^^^^^^^^^^^^^^ frozen here
+11 │         returned_ref
+   │         ------------ used here
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/bug_13927.move b/third_party/move/move-compiler-v2/tests/reference-safety/bug_13927.move
new file mode 100644
index 0000000000000..5fd92696ea9b5
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/bug_13927.move
@@ -0,0 +1,13 @@
+// TODO(#13927): after fix, rename file to reflect issue (`bug_nnn.move` to `bug_nnn_<issue>.move`)
+module 0x8675309::Tester {
+
+    fun foo(_other: &mut u64): &mut u64 {
+        _other
+    }
+
+    fun test(result: &mut u64): &u64 {
+        let returned_ref = foo(result);
+        freeze(result);
+        returned_ref
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/bug_13927.no-opt.exp b/third_party/move/move-compiler-v2/tests/reference-safety/bug_13927.no-opt.exp
new file mode 100644
index 0000000000000..2bbecf1e74a8a
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/bug_13927.no-opt.exp
@@ -0,0 +1,9 @@
+
+Diagnostics:
+error: cannot freeze local `result` since other mutable usages for this reference exist
+   ┌─ tests/reference-safety/bug_13927.move:10:9
+   │
+10 │         freeze(result);
+   │         ^^^^^^^^^^^^^^ frozen here
+11 │         returned_ref
+   │         ------------ used here
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/bug_13952.exp b/third_party/move/move-compiler-v2/tests/reference-safety/bug_13952.exp
new file mode 100644
index 0000000000000..0d39080c23336
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/bug_13952.exp
@@ -0,0 +1,18 @@
+
+Diagnostics:
+warning: Unused local variable `var67`. Consider removing or prefixing with an underscore: `_var67`
+  ┌─ tests/reference-safety/bug_13952.move:8:13
+  │
+8 │         let var67 =  (&(var21) != &((var21 || var23)));
+  │             ^^^^^
+
+
+Diagnostics:
+warning: Unused assignment to `var67`. Consider removing or prefixing with an underscore: `_var67`
+  ┌─ tests/reference-safety/bug_13952.move:8:22
+  │
+8 │         let var67 =  (&(var21) != &((var21 || var23)));
+  │                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+
+============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/bug_13952.move b/third_party/move/move-compiler-v2/tests/reference-safety/bug_13952.move
new file mode 100644
index 0000000000000..023aad7730fc3
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/bug_13952.move
@@ -0,0 +1,13 @@
+// TODO(#13952): after fix, rename file to reflect issue (`bug_nnn.move` to `bug_nnn_<issue>.move`)
+module 0xCAFE::Module0 {
+    struct Struct0 has drop, copy {
+        x: bool,
+    }
+
+    public fun function5(var21: bool, var23: bool) {
+        let var67 =  (&(var21) != &((var21 || var23)));
+        Struct0 {
+            x: var21
+        };
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/bug_13952.no-opt.exp b/third_party/move/move-compiler-v2/tests/reference-safety/bug_13952.no-opt.exp
new file mode 100644
index 0000000000000..a08282154d59f
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/bug_13952.no-opt.exp
@@ -0,0 +1,25 @@
+
+Diagnostics:
+warning: Unused local variable `var67`. Consider removing or prefixing with an underscore: `_var67`
+  ┌─ tests/reference-safety/bug_13952.move:8:13
+  │
+8 │         let var67 =  (&(var21) != &((var21 || var23)));
+  │             ^^^^^
+
+
+Diagnostics:
+warning: Unused assignment to `var67`. Consider removing or prefixing with an underscore: `_var67`
+  ┌─ tests/reference-safety/bug_13952.move:8:22
+  │
+8 │         let var67 =  (&(var21) != &((var21 || var23)));
+  │                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+
+============ bytecode verification failed ========
+
+Diagnostics:
+bug: bytecode verification failed with unexpected status code `STLOC_UNSAFE_TO_DESTROY_ERROR`. This is a compiler bug, consider reporting it.
+  ┌─ tests/reference-safety/bug_13952.move:8:36
+  │
+8 │         let var67 =  (&(var21) != &((var21 || var23)));
+  │                                    ^^^^^^^^^^^^^^^^^^
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/bug_13973_branch_cond_borrowed.exp b/third_party/move/move-compiler-v2/tests/reference-safety/bug_13973_branch_cond_borrowed.exp
new file mode 100644
index 0000000000000..51395ce1543b5
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/bug_13973_branch_cond_borrowed.exp
@@ -0,0 +1,24 @@
+
+Diagnostics:
+error: cannot use local `x` which is still mutably borrowed as branch condition
+  ┌─ tests/reference-safety/bug_13973_branch_cond_borrowed.move:4:9
+  │
+3 │           let y: &mut bool =  &mut x;
+  │                               ------ previous mutable local borrow
+4 │ ╭         if (x) {
+5 │ │         } else {
+6 │ │             *y= false;
+  │ │             --------- conflicting reference `y` used here
+7 │ │         };
+  │ ╰─────────^ used in this context
+
+error: cannot use local `x` which is still mutably borrowed as branch condition
+   ┌─ tests/reference-safety/bug_13973_branch_cond_borrowed.move:13:9
+   │
+12 │           let y: &mut bool =  &mut x;
+   │                               ------ previous mutable local borrow
+13 │ ╭         while (x) {
+14 │ │             *y= false;
+   │ │             --------- conflicting reference `y` used here
+15 │ │         };
+   │ ╰─────────^ used in this context
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/bug_13973_branch_cond_borrowed.move b/third_party/move/move-compiler-v2/tests/reference-safety/bug_13973_branch_cond_borrowed.move
new file mode 100644
index 0000000000000..ca1bfb39e4933
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/bug_13973_branch_cond_borrowed.move
@@ -0,0 +1,19 @@
+module 0xCAFE::Module0 {
+    public fun f1(x: bool) {
+        let y: &mut bool =  &mut x;
+        if (x) {
+        } else {
+            *y= false;
+        };
+        if (copy x) { } else { };
+    }
+
+    public fun f2(x: bool) {
+        let y: &mut bool =  &mut x;
+        while (x) {
+            *y= false;
+        };
+        if (copy x) { } else { };
+    }
+
+}
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/bug_13973_branch_cond_borrowed.no-opt.exp b/third_party/move/move-compiler-v2/tests/reference-safety/bug_13973_branch_cond_borrowed.no-opt.exp
new file mode 100644
index 0000000000000..51395ce1543b5
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/bug_13973_branch_cond_borrowed.no-opt.exp
@@ -0,0 +1,24 @@
+
+Diagnostics:
+error: cannot use local `x` which is still mutably borrowed as branch condition
+  ┌─ tests/reference-safety/bug_13973_branch_cond_borrowed.move:4:9
+  │
+3 │           let y: &mut bool =  &mut x;
+  │                               ------ previous mutable local borrow
+4 │ ╭         if (x) {
+5 │ │         } else {
+6 │ │             *y= false;
+  │ │             --------- conflicting reference `y` used here
+7 │ │         };
+  │ ╰─────────^ used in this context
+
+error: cannot use local `x` which is still mutably borrowed as branch condition
+   ┌─ tests/reference-safety/bug_13973_branch_cond_borrowed.move:13:9
+   │
+12 │           let y: &mut bool =  &mut x;
+   │                               ------ previous mutable local borrow
+13 │ ╭         while (x) {
+14 │ │             *y= false;
+   │ │             --------- conflicting reference `y` used here
+15 │ │         };
+   │ ╰─────────^ used in this context
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/bug_13976.exp b/third_party/move/move-compiler-v2/tests/reference-safety/bug_13976.exp
new file mode 100644
index 0000000000000..88a6a551180a7
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/bug_13976.exp
@@ -0,0 +1,9 @@
+
+============ bytecode verification failed ========
+
+Diagnostics:
+bug: bytecode verification failed with unexpected status code `CALL_BORROWED_MUTABLE_REFERENCE_ERROR`. This is a compiler bug, consider reporting it.
+   ┌─ tests/reference-safety/bug_13976.move:12:13
+   │
+12 │             lifted_lambda(&mut a, z))
+   │             ^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/bug_13976.move b/third_party/move/move-compiler-v2/tests/reference-safety/bug_13976.move
new file mode 100644
index 0000000000000..938f973a39039
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/bug_13976.move
@@ -0,0 +1,14 @@
+// TODO(#13976): after fix, rename file to reflect issue (`bug_nnn.move` to `bug_nnn_<issue>.move`)
+module 0x815::m {
+    fun lifted_lambda(ap: &mut u64, z: u64): u64 {
+        *ap = *ap + 1;
+        z * *ap
+    }
+
+    entry fun foo2(): u64 {
+        let a = 2;
+        let z = 3;
+        lifted_lambda(&mut a,
+            lifted_lambda(&mut a, z))
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/bug_13976.no-opt.exp b/third_party/move/move-compiler-v2/tests/reference-safety/bug_13976.no-opt.exp
new file mode 100644
index 0000000000000..88a6a551180a7
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/bug_13976.no-opt.exp
@@ -0,0 +1,9 @@
+
+============ bytecode verification failed ========
+
+Diagnostics:
+bug: bytecode verification failed with unexpected status code `CALL_BORROWED_MUTABLE_REFERENCE_ERROR`. This is a compiler bug, consider reporting it.
+   ┌─ tests/reference-safety/bug_13976.move:12:13
+   │
+12 │             lifted_lambda(&mut a, z))
+   │             ^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/bug_14060.exp b/third_party/move/move-compiler-v2/tests/reference-safety/bug_14060.exp
new file mode 100644
index 0000000000000..36f5599b0bc89
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/bug_14060.exp
@@ -0,0 +1,9 @@
+
+============ bytecode verification failed ========
+
+Diagnostics:
+bug: bytecode verification failed with unexpected status code `EQUALITY_OP_TYPE_MISMATCH_ERROR`. This is a compiler bug, consider reporting it.
+  ┌─ tests/reference-safety/bug_14060.move:6:9
+  │
+6 │         x != copy y;
+  │         ^^^^^^^^^^^
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/bug_14060.move b/third_party/move/move-compiler-v2/tests/reference-safety/bug_14060.move
new file mode 100644
index 0000000000000..909fb37ee994c
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/bug_14060.move
@@ -0,0 +1,8 @@
+// TODO(#14060): after fix, rename file to reflect issue (`bug_nnn.move` to `bug_nnn_<issue>.move`)
+module 0xCAFE::Module0 {
+    public fun f() {
+        let x = &mut 0u8;
+        let y = &mut 1u8;
+        x != copy y;
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/bug_14060.no-opt.exp b/third_party/move/move-compiler-v2/tests/reference-safety/bug_14060.no-opt.exp
new file mode 100644
index 0000000000000..36f5599b0bc89
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/bug_14060.no-opt.exp
@@ -0,0 +1,9 @@
+
+============ bytecode verification failed ========
+
+Diagnostics:
+bug: bytecode verification failed with unexpected status code `EQUALITY_OP_TYPE_MISMATCH_ERROR`. This is a compiler bug, consider reporting it.
+  ┌─ tests/reference-safety/bug_14060.move:6:9
+  │
+6 │         x != copy y;
+  │         ^^^^^^^^^^^
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/bug_14096.exp b/third_party/move/move-compiler-v2/tests/reference-safety/bug_14096.exp
new file mode 100644
index 0000000000000..e946e2fed7f03
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/bug_14096.exp
@@ -0,0 +1,18 @@
+
+Diagnostics:
+error: mutable reference in local `x` requires exclusive access but is borrowed
+  ┌─ tests/reference-safety/bug_14096.move:6:20
+  │
+6 │         (copy x == copy x);
+  │         -----------^^^^^^-
+  │         │          │
+  │         │          requirement enforced here
+  │         conflicting reference used here
+
+error: same mutable reference in value is also used in other value in argument list
+  ┌─ tests/reference-safety/bug_14096.move:6:9
+  │
+5 │         let x = &mut 0u8;
+  │                 -------- previous mutable local borrow
+6 │         (copy x == copy x);
+  │         ^^^^^^^^^^^^^^^^^^ requirement enforced here
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/bug_14096.move b/third_party/move/move-compiler-v2/tests/reference-safety/bug_14096.move
new file mode 100644
index 0000000000000..f72038e107a5b
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/bug_14096.move
@@ -0,0 +1,8 @@
+// TODO(#14096): after fix, rename file to reflect issue (`bug_nnn.move` to `bug_nnn_<issue>.move`)
+module 0xCAFE::Module0 {
+    // Expected to compile without errors
+    public fun function2() {
+        let x = &mut 0u8;
+        (copy x == copy x);
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/bug_14096.no-opt.exp b/third_party/move/move-compiler-v2/tests/reference-safety/bug_14096.no-opt.exp
new file mode 100644
index 0000000000000..e946e2fed7f03
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/bug_14096.no-opt.exp
@@ -0,0 +1,18 @@
+
+Diagnostics:
+error: mutable reference in local `x` requires exclusive access but is borrowed
+  ┌─ tests/reference-safety/bug_14096.move:6:20
+  │
+6 │         (copy x == copy x);
+  │         -----------^^^^^^-
+  │         │          │
+  │         │          requirement enforced here
+  │         conflicting reference used here
+
+error: same mutable reference in value is also used in other value in argument list
+  ┌─ tests/reference-safety/bug_14096.move:6:9
+  │
+5 │         let x = &mut 0u8;
+  │                 -------- previous mutable local borrow
+6 │         (copy x == copy x);
+  │         ^^^^^^^^^^^^^^^^^^ requirement enforced here
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/call_access_invalid.exp b/third_party/move/move-compiler-v2/tests/reference-safety/call_access_invalid.exp
new file mode 100644
index 0000000000000..f7ccea79cb588
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/call_access_invalid.exp
@@ -0,0 +1,47 @@
+
+Diagnostics:
+error: function reads global `m::R<u64>` which is currently mutably borrowed
+   ┌─ tests/reference-safety/call_access_invalid.move:27:9
+   │
+ 5 │     fun reads_any_R(addr: address) reads R {
+   │                                          -- access declared here
+   ·
+26 │         let _r1 = borrow_global_mut<R<u64>>(addr);
+   │                   ------------------------------- previous mutable global borrow
+27 │         reads_any_R(addr);
+   │         ^^^^^^^^^^^^^^^^^ function called here
+
+error: function reads global `m::R<u64>` which is currently mutably borrowed
+   ┌─ tests/reference-safety/call_access_invalid.move:28:9
+   │
+ 9 │     fun reads_any_cafe(addr: address) reads 0xcafe::*::* {
+   │                                             ------------- access declared here
+   ·
+26 │         let _r1 = borrow_global_mut<R<u64>>(addr);
+   │                   ------------------------------- previous mutable global borrow
+27 │         reads_any_R(addr);
+28 │         reads_any_cafe(addr);
+   │         ^^^^^^^^^^^^^^^^^^^^ function called here
+
+error: function reads global `m::R<u64>` which is currently mutably borrowed
+   ┌─ tests/reference-safety/call_access_invalid.move:29:9
+   │
+13 │     fun reads_any_m(addr: address) reads 0xcafe::m::* {
+   │                                          ------------- access declared here
+   ·
+26 │         let _r1 = borrow_global_mut<R<u64>>(addr);
+   │                   ------------------------------- previous mutable global borrow
+   ·
+29 │         reads_any_m(addr);
+   │         ^^^^^^^^^^^^^^^^^ function called here
+
+error: function writes global `m::R<u64>` which is currently borrowed
+   ┌─ tests/reference-safety/call_access_invalid.move:45:9
+   │
+21 │     fun writes_any_R_u64(addr: address) writes R<u64>(addr) {
+   │                                                ------------ access declared here
+   ·
+44 │         let _r1 = borrow_global<R<u64>>(addr);
+   │                   --------------------------- previous global borrow
+45 │         writes_any_R_u64(addr);
+   │         ^^^^^^^^^^^^^^^^^^^^^^ function called here
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/call_access_invalid.move b/third_party/move/move-compiler-v2/tests/reference-safety/call_access_invalid.move
new file mode 100644
index 0000000000000..08ecd90297297
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/call_access_invalid.move
@@ -0,0 +1,55 @@
+module 0xcafe::m {
+
+    struct R<phantom T> has key, copy, drop { }
+
+    fun reads_any_R(addr: address) reads R {
+        let _x = borrow_global<R<u64>>(addr);
+    }
+
+    fun reads_any_cafe(addr: address) reads 0xcafe::*::* {
+        let _x = borrow_global<R<u64>>(addr);
+    }
+
+    fun reads_any_m(addr: address) reads 0xcafe::m::* {
+        let _x = borrow_global<R<u64>>(addr);
+    }
+
+    fun reads_not_any_m(addr: address) !reads 0xcafe::m::* {
+       let _x = borrow_global<R<u64>>(addr);
+    }
+
+    fun writes_any_R_u64(addr: address) writes R<u64>(addr) {
+        let _x = borrow_global_mut<R<u64>>(addr);
+    }
+
+    fun t0_invalid(addr: address) acquires R {
+        let _r1 = borrow_global_mut<R<u64>>(addr);
+        reads_any_R(addr);
+        reads_any_cafe(addr);
+        reads_any_m(addr);
+        reads_not_any_m(addr); // no error
+        *_r1;
+    }
+
+    fun t1_valid(addr: address) acquires R {
+        let _r1 = borrow_global<R<u64>>(addr);
+        reads_any_R(addr);
+        reads_any_cafe(addr);
+        reads_any_m(addr);
+        reads_not_any_m(addr);
+        *_r1;
+    }
+
+    fun t2_invalid(addr: address) acquires R {
+        let _r1 = borrow_global<R<u64>>(addr);
+        writes_any_R_u64(addr);
+        *_r1;
+    }
+
+    fun t3_valid(addr: address) acquires R {
+        let _r1 = borrow_global<R<u128>>(addr);
+        writes_any_R_u64(addr);
+        *_r1;
+    }
+
+}
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/call_access_invalid.no-opt.exp b/third_party/move/move-compiler-v2/tests/reference-safety/call_access_invalid.no-opt.exp
new file mode 100644
index 0000000000000..f7ccea79cb588
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/call_access_invalid.no-opt.exp
@@ -0,0 +1,47 @@
+
+Diagnostics:
+error: function reads global `m::R<u64>` which is currently mutably borrowed
+   ┌─ tests/reference-safety/call_access_invalid.move:27:9
+   │
+ 5 │     fun reads_any_R(addr: address) reads R {
+   │                                          -- access declared here
+   ·
+26 │         let _r1 = borrow_global_mut<R<u64>>(addr);
+   │                   ------------------------------- previous mutable global borrow
+27 │         reads_any_R(addr);
+   │         ^^^^^^^^^^^^^^^^^ function called here
+
+error: function reads global `m::R<u64>` which is currently mutably borrowed
+   ┌─ tests/reference-safety/call_access_invalid.move:28:9
+   │
+ 9 │     fun reads_any_cafe(addr: address) reads 0xcafe::*::* {
+   │                                             ------------- access declared here
+   ·
+26 │         let _r1 = borrow_global_mut<R<u64>>(addr);
+   │                   ------------------------------- previous mutable global borrow
+27 │         reads_any_R(addr);
+28 │         reads_any_cafe(addr);
+   │         ^^^^^^^^^^^^^^^^^^^^ function called here
+
+error: function reads global `m::R<u64>` which is currently mutably borrowed
+   ┌─ tests/reference-safety/call_access_invalid.move:29:9
+   │
+13 │     fun reads_any_m(addr: address) reads 0xcafe::m::* {
+   │                                          ------------- access declared here
+   ·
+26 │         let _r1 = borrow_global_mut<R<u64>>(addr);
+   │                   ------------------------------- previous mutable global borrow
+   ·
+29 │         reads_any_m(addr);
+   │         ^^^^^^^^^^^^^^^^^ function called here
+
+error: function writes global `m::R<u64>` which is currently borrowed
+   ┌─ tests/reference-safety/call_access_invalid.move:45:9
+   │
+21 │     fun writes_any_R_u64(addr: address) writes R<u64>(addr) {
+   │                                                ------------ access declared here
+   ·
+44 │         let _r1 = borrow_global<R<u64>>(addr);
+   │                   --------------------------- previous global borrow
+45 │         writes_any_R_u64(addr);
+   │         ^^^^^^^^^^^^^^^^^^^^^^ function called here
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/freeze_mutable.exp b/third_party/move/move-compiler-v2/tests/reference-safety/freeze_mutable.exp
new file mode 100644
index 0000000000000..29f51c5185f8e
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/freeze_mutable.exp
@@ -0,0 +1,9 @@
+
+Diagnostics:
+error: cannot freeze local `result` since other mutable usages for this reference exist
+   ┌─ tests/reference-safety/freeze_mutable.move:9:9
+   │
+ 9 │         freeze(result);
+   │         ^^^^^^^^^^^^^^ frozen here
+10 │         returned_ref
+   │         ------------ used here
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/freeze_mutable.move b/third_party/move/move-compiler-v2/tests/reference-safety/freeze_mutable.move
new file mode 100644
index 0000000000000..e238eba78dd75
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/freeze_mutable.move
@@ -0,0 +1,18 @@
+module 0x8675309::Tester {
+
+    fun foo(_other: &mut u64): &mut u64 {
+        _other
+    }
+
+    fun test(result: &mut u64): &u64 {
+        let returned_ref = foo(result);
+        freeze(result);
+        returned_ref
+    }
+
+    fun test_return_ref_no_use(result: &mut u64) {
+        let _returned_ref = foo(result);
+        freeze(result);
+    }
+
+}
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/freeze_mutable.no-opt.exp b/third_party/move/move-compiler-v2/tests/reference-safety/freeze_mutable.no-opt.exp
new file mode 100644
index 0000000000000..29f51c5185f8e
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/freeze_mutable.no-opt.exp
@@ -0,0 +1,9 @@
+
+Diagnostics:
+error: cannot freeze local `result` since other mutable usages for this reference exist
+   ┌─ tests/reference-safety/freeze_mutable.move:9:9
+   │
+ 9 │         freeze(result);
+   │         ^^^^^^^^^^^^^^ frozen here
+10 │         returned_ref
+   │         ------------ used here
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/borrow_global_acquires_invalid_1.exp b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/borrow_global_acquires_invalid_1.exp
new file mode 100644
index 0000000000000..a7de92f62785c
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/borrow_global_acquires_invalid_1.exp
@@ -0,0 +1,12 @@
+
+Diagnostics:
+error: function acquires global `A::T1` which is currently mutably borrowed
+   ┌─ tests/reference-safety/v1-borrow-tests/borrow_global_acquires_invalid_1.move:7:9
+   │
+ 6 │         let x = borrow_global_mut<T1>(signer::address_of(account));
+   │                 -------------------------------------------------- previous mutable global borrow
+ 7 │         acquires_t1(account);
+   │         ^^^^^^^^^^^^^^^^^^^^ function called here
+   ·
+11 │     fun acquires_t1(account: &signer) acquires T1 {
+   │                                                --- access declared here
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/borrow_global_acquires_invalid_1.move b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/borrow_global_acquires_invalid_1.move
new file mode 100644
index 0000000000000..90ab5d4302386
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/borrow_global_acquires_invalid_1.move
@@ -0,0 +1,15 @@
+module 0x8675309::A {
+    use std::signer;
+    struct T1 has key {v: u64}
+
+    public fun test(account: &signer) acquires T1 {
+        let x = borrow_global_mut<T1>(signer::address_of(account));
+        acquires_t1(account);
+        move x;
+    }
+
+    fun acquires_t1(account: &signer) acquires T1 {
+        T1 { v: _ } = move_from<T1>(signer::address_of(account));
+    }
+
+}
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/borrow_global_acquires_invalid_1.no-opt.exp b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/borrow_global_acquires_invalid_1.no-opt.exp
new file mode 100644
index 0000000000000..a7de92f62785c
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/borrow_global_acquires_invalid_1.no-opt.exp
@@ -0,0 +1,12 @@
+
+Diagnostics:
+error: function acquires global `A::T1` which is currently mutably borrowed
+   ┌─ tests/reference-safety/v1-borrow-tests/borrow_global_acquires_invalid_1.move:7:9
+   │
+ 6 │         let x = borrow_global_mut<T1>(signer::address_of(account));
+   │                 -------------------------------------------------- previous mutable global borrow
+ 7 │         acquires_t1(account);
+   │         ^^^^^^^^^^^^^^^^^^^^ function called here
+   ·
+11 │     fun acquires_t1(account: &signer) acquires T1 {
+   │                                                --- access declared here
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/borrow_global_acquires_invalid_2.exp b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/borrow_global_acquires_invalid_2.exp
new file mode 100644
index 0000000000000..e0ee25e9314e5
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/borrow_global_acquires_invalid_2.exp
@@ -0,0 +1,36 @@
+
+Diagnostics:
+error: function acquires global `A::T1` which is currently mutably borrowed
+   ┌─ tests/reference-safety/v1-borrow-tests/borrow_global_acquires_invalid_2.move:9:9
+   │
+ 7 │         let x = borrow_global_mut<T1>(signer::address_of(account));
+   │                 -------------------------------------------------- previous mutable global borrow
+ 8 │         acquires_t2(account);
+ 9 │         acquires_t1(account);
+   │         ^^^^^^^^^^^^^^^^^^^^ function called here
+   ·
+27 │     fun acquires_t1(account: &signer) acquires T1 {
+   │                                                --- access declared here
+
+error: function acquires global `A::T1` which is currently mutably borrowed
+   ┌─ tests/reference-safety/v1-borrow-tests/borrow_global_acquires_invalid_2.move:16:9
+   │
+14 │         let x = borrow_global_mut<T1>(signer::address_of(account));
+   │                 -------------------------------------------------- previous mutable global borrow
+15 │         acquires_t2(account);
+16 │         acquires_t1(account);
+   │         ^^^^^^^^^^^^^^^^^^^^ function called here
+   ·
+27 │     fun acquires_t1(account: &signer) acquires T1 {
+   │                                                --- access declared here
+
+error: function acquires global `A::T1` which is currently mutably borrowed
+   ┌─ tests/reference-safety/v1-borrow-tests/borrow_global_acquires_invalid_2.move:22:9
+   │
+21 │         let x = borrow_global_mut<T1>(signer::address_of(account));
+   │                 -------------------------------------------------- previous mutable global borrow
+22 │         acquires_t1(account);
+   │         ^^^^^^^^^^^^^^^^^^^^ function called here
+   ·
+27 │     fun acquires_t1(account: &signer) acquires T1 {
+   │                                                --- access declared here
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/borrow_global_acquires_invalid_2.move b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/borrow_global_acquires_invalid_2.move
new file mode 100644
index 0000000000000..3a150e6efbb0c
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/borrow_global_acquires_invalid_2.move
@@ -0,0 +1,35 @@
+module 0x8675309::A {
+    use std::signer;
+    struct T1 has key {v: u64}
+    struct T2 has key {v: u64}
+
+    public fun test1(account: &signer) acquires T1, T2 {
+        let x = borrow_global_mut<T1>(signer::address_of(account));
+        acquires_t2(account);
+        acquires_t1(account);
+        move x;
+    }
+
+    public fun test2(account: &signer) acquires T1, T2 {
+        let x = borrow_global_mut<T1>(signer::address_of(account));
+        acquires_t2(account);
+        acquires_t1(account);
+        move x;
+    }
+
+    public fun test3(account: &signer) acquires T1, T2 {
+        let x = borrow_global_mut<T1>(signer::address_of(account));
+        acquires_t1(account);
+        move x;
+        acquires_t2(account);
+    }
+
+    fun acquires_t1(account: &signer) acquires T1 {
+        T1 { v: _ } = move_from<T1>(signer::address_of(account));
+    }
+
+    fun acquires_t2(account: &signer) acquires T2 {
+        T2 { v: _ } = move_from<T2>(signer::address_of(account));
+    }
+
+}
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/borrow_global_acquires_invalid_2.no-opt.exp b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/borrow_global_acquires_invalid_2.no-opt.exp
new file mode 100644
index 0000000000000..e0ee25e9314e5
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/borrow_global_acquires_invalid_2.no-opt.exp
@@ -0,0 +1,36 @@
+
+Diagnostics:
+error: function acquires global `A::T1` which is currently mutably borrowed
+   ┌─ tests/reference-safety/v1-borrow-tests/borrow_global_acquires_invalid_2.move:9:9
+   │
+ 7 │         let x = borrow_global_mut<T1>(signer::address_of(account));
+   │                 -------------------------------------------------- previous mutable global borrow
+ 8 │         acquires_t2(account);
+ 9 │         acquires_t1(account);
+   │         ^^^^^^^^^^^^^^^^^^^^ function called here
+   ·
+27 │     fun acquires_t1(account: &signer) acquires T1 {
+   │                                                --- access declared here
+
+error: function acquires global `A::T1` which is currently mutably borrowed
+   ┌─ tests/reference-safety/v1-borrow-tests/borrow_global_acquires_invalid_2.move:16:9
+   │
+14 │         let x = borrow_global_mut<T1>(signer::address_of(account));
+   │                 -------------------------------------------------- previous mutable global borrow
+15 │         acquires_t2(account);
+16 │         acquires_t1(account);
+   │         ^^^^^^^^^^^^^^^^^^^^ function called here
+   ·
+27 │     fun acquires_t1(account: &signer) acquires T1 {
+   │                                                --- access declared here
+
+error: function acquires global `A::T1` which is currently mutably borrowed
+   ┌─ tests/reference-safety/v1-borrow-tests/borrow_global_acquires_invalid_2.move:22:9
+   │
+21 │         let x = borrow_global_mut<T1>(signer::address_of(account));
+   │                 -------------------------------------------------- previous mutable global borrow
+22 │         acquires_t1(account);
+   │         ^^^^^^^^^^^^^^^^^^^^ function called here
+   ·
+27 │     fun acquires_t1(account: &signer) acquires T1 {
+   │                                                --- access declared here
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/borrow_global_acquires_invalid_3.exp b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/borrow_global_acquires_invalid_3.exp
new file mode 100644
index 0000000000000..6113079f44de2
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/borrow_global_acquires_invalid_3.exp
@@ -0,0 +1,41 @@
+
+Diagnostics:
+error: function acquires global `A::T1` which is currently mutably borrowed
+   ┌─ tests/reference-safety/v1-borrow-tests/borrow_global_acquires_invalid_3.move:9:9
+   │
+ 7 │         let x = borrow_global_mut<T1>(signer::address_of(account));
+   │                 -------------------------------------------------- previous mutable global borrow
+ 8 │         let y = get_v(x);
+   │                 -------- used by mutable call result
+ 9 │         acquires_t1(account);
+   │         ^^^^^^^^^^^^^^^^^^^^ function called here
+   ·
+34 │     fun acquires_t1(account: &signer) acquires T1 {
+   │                                                --- access declared here
+
+error: function acquires global `A::T1` which is currently mutably borrowed
+   ┌─ tests/reference-safety/v1-borrow-tests/borrow_global_acquires_invalid_3.move:18:9
+   │
+15 │         let x = borrow_global_mut<T1>(signer::address_of(account));
+   │                 -------------------------------------------------- previous mutable global borrow
+16 │         let y = get_v(x);
+   │                 -------- used by mutable call result
+17 │         acquires_t2(account);
+18 │         acquires_t1(account);
+   │         ^^^^^^^^^^^^^^^^^^^^ function called here
+   ·
+34 │     fun acquires_t1(account: &signer) acquires T1 {
+   │                                                --- access declared here
+
+error: function acquires global `A::T1` which is currently mutably borrowed
+   ┌─ tests/reference-safety/v1-borrow-tests/borrow_global_acquires_invalid_3.move:25:9
+   │
+23 │         let x = borrow_global_mut<T1>(signer::address_of(account));
+   │                 -------------------------------------------------- previous mutable global borrow
+24 │         let y = get_v(x);
+   │                 -------- used by mutable call result
+25 │         acquires_t1(account);
+   │         ^^^^^^^^^^^^^^^^^^^^ function called here
+   ·
+34 │     fun acquires_t1(account: &signer) acquires T1 {
+   │                                                --- access declared here
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/borrow_global_acquires_invalid_3.move b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/borrow_global_acquires_invalid_3.move
new file mode 100644
index 0000000000000..04d07d867cc11
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/borrow_global_acquires_invalid_3.move
@@ -0,0 +1,42 @@
+module 0x8675309::A {
+    use std::signer;
+    struct T1 has key {v: u64}
+    struct T2 has key {v: u64}
+
+    public fun test1(account: &signer) acquires T1, T2 {
+        let x = borrow_global_mut<T1>(signer::address_of(account));
+        let y = get_v(x);
+        acquires_t1(account);
+        acquires_t2(account);
+        move y;
+    }
+
+    public fun test2(account: &signer) acquires T1, T2 {
+        let x = borrow_global_mut<T1>(signer::address_of(account));
+        let y = get_v(x);
+        acquires_t2(account);
+        acquires_t1(account);
+        move y;
+    }
+
+    public fun test3(account: &signer) acquires T1, T2 {
+        let x = borrow_global_mut<T1>(signer::address_of(account));
+        let y = get_v(x);
+        acquires_t1(account);
+        move y;
+        acquires_t2(account);
+    }
+
+    fun get_v(x: &mut T1): &mut u64 {
+        &mut x.v
+    }
+
+    fun acquires_t1(account: &signer) acquires T1 {
+        T1 { v: _ } = move_from<T1>(signer::address_of(account))
+    }
+
+    fun acquires_t2(account: &signer) acquires T2 {
+        T2 { v: _ } = move_from<T2>(signer::address_of(account))
+    }
+
+}
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/borrow_global_acquires_invalid_3.no-opt.exp b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/borrow_global_acquires_invalid_3.no-opt.exp
new file mode 100644
index 0000000000000..6113079f44de2
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/borrow_global_acquires_invalid_3.no-opt.exp
@@ -0,0 +1,41 @@
+
+Diagnostics:
+error: function acquires global `A::T1` which is currently mutably borrowed
+   ┌─ tests/reference-safety/v1-borrow-tests/borrow_global_acquires_invalid_3.move:9:9
+   │
+ 7 │         let x = borrow_global_mut<T1>(signer::address_of(account));
+   │                 -------------------------------------------------- previous mutable global borrow
+ 8 │         let y = get_v(x);
+   │                 -------- used by mutable call result
+ 9 │         acquires_t1(account);
+   │         ^^^^^^^^^^^^^^^^^^^^ function called here
+   ·
+34 │     fun acquires_t1(account: &signer) acquires T1 {
+   │                                                --- access declared here
+
+error: function acquires global `A::T1` which is currently mutably borrowed
+   ┌─ tests/reference-safety/v1-borrow-tests/borrow_global_acquires_invalid_3.move:18:9
+   │
+15 │         let x = borrow_global_mut<T1>(signer::address_of(account));
+   │                 -------------------------------------------------- previous mutable global borrow
+16 │         let y = get_v(x);
+   │                 -------- used by mutable call result
+17 │         acquires_t2(account);
+18 │         acquires_t1(account);
+   │         ^^^^^^^^^^^^^^^^^^^^ function called here
+   ·
+34 │     fun acquires_t1(account: &signer) acquires T1 {
+   │                                                --- access declared here
+
+error: function acquires global `A::T1` which is currently mutably borrowed
+   ┌─ tests/reference-safety/v1-borrow-tests/borrow_global_acquires_invalid_3.move:25:9
+   │
+23 │         let x = borrow_global_mut<T1>(signer::address_of(account));
+   │                 -------------------------------------------------- previous mutable global borrow
+24 │         let y = get_v(x);
+   │                 -------- used by mutable call result
+25 │         acquires_t1(account);
+   │         ^^^^^^^^^^^^^^^^^^^^ function called here
+   ·
+34 │     fun acquires_t1(account: &signer) acquires T1 {
+   │                                                --- access declared here
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/borrow_global_bad0.exp b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/borrow_global_bad0.exp
new file mode 100644
index 0000000000000..90b32906711cc
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/borrow_global_bad0.exp
@@ -0,0 +1,2 @@
+
+============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/borrow_global_bad0.move b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/borrow_global_bad0.move
new file mode 100644
index 0000000000000..10bf268887808
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/borrow_global_bad0.move
@@ -0,0 +1,12 @@
+module 0x8675309::A {
+    use std::signer;
+    struct T has key {v: u64}
+
+    public fun t0(account: &signer) acquires T {
+        let sender = signer::address_of(account);
+        let x = borrow_global_mut<T>(sender);
+        copy x;
+        x = borrow_global_mut<T>(sender);
+        copy x;
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/borrow_global_bad0.no-opt.exp b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/borrow_global_bad0.no-opt.exp
new file mode 100644
index 0000000000000..90b32906711cc
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/borrow_global_bad0.no-opt.exp
@@ -0,0 +1,2 @@
+
+============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/copy_loc_borrowed.exp b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/copy_loc_borrowed.exp
new file mode 100644
index 0000000000000..90b32906711cc
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/copy_loc_borrowed.exp
@@ -0,0 +1,2 @@
+
+============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/copy_loc_borrowed.move b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/copy_loc_borrowed.move
new file mode 100644
index 0000000000000..b78a43d41aa35
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/copy_loc_borrowed.move
@@ -0,0 +1,10 @@
+module 0x8675309::Tester {
+    fun t() {
+        let x = 0;
+        let r1 = &x;
+        let r2 = &x;
+        x + copy x;
+        r1;
+        r2;
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/copy_loc_borrowed.no-opt.exp b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/copy_loc_borrowed.no-opt.exp
new file mode 100644
index 0000000000000..93b491aff37af
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/copy_loc_borrowed.no-opt.exp
@@ -0,0 +1,9 @@
+
+============ bytecode verification failed ========
+
+Diagnostics:
+error: reference safety check failed on bytecode level. This is a known issue, to be fixed later, resulting from differences between safety rules of the v1 and v2 compiler. Try to rewrite your code to workaround this problem.
+  ┌─ tests/reference-safety/v1-borrow-tests/copy_loc_borrowed.move:6:9
+  │
+6 │         x + copy x;
+  │         ^^^^^^^^^^
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/copy_loc_borrowed_field.exp b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/copy_loc_borrowed_field.exp
new file mode 100644
index 0000000000000..90b32906711cc
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/copy_loc_borrowed_field.exp
@@ -0,0 +1,2 @@
+
+============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/copy_loc_borrowed_field.move b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/copy_loc_borrowed_field.move
new file mode 100644
index 0000000000000..acccf1dd7f9bb
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/copy_loc_borrowed_field.move
@@ -0,0 +1,12 @@
+module 0x8675309::Tester {
+    struct T has copy, drop { f: u64 }
+
+    fun t() {
+        let x = T { f: 0 };
+        let r1 = &x.f;
+        let r2 = &x.f;
+        copy x;
+        r1;
+        r2;
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/copy_loc_borrowed_field.no-opt.exp b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/copy_loc_borrowed_field.no-opt.exp
new file mode 100644
index 0000000000000..90b32906711cc
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/copy_loc_borrowed_field.no-opt.exp
@@ -0,0 +1,2 @@
+
+============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/copy_loc_borrowed_indirect.exp b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/copy_loc_borrowed_indirect.exp
new file mode 100644
index 0000000000000..90b32906711cc
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/copy_loc_borrowed_indirect.exp
@@ -0,0 +1,2 @@
+
+============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/copy_loc_borrowed_indirect.move b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/copy_loc_borrowed_indirect.move
new file mode 100644
index 0000000000000..be29aae6d6ab3
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/copy_loc_borrowed_indirect.move
@@ -0,0 +1,16 @@
+module 0x8675309::Tester {
+    fun t() {
+        let x = 0;
+        let y = 0;
+        let r1 = foo(&x, &y);
+        let r2 = foo(&x, &y);
+        x + copy x;
+        y + copy y;
+        r1;
+        r2;
+    }
+
+    fun foo(_r: &u64, r2: &u64): &u64 {
+        r2
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/copy_loc_borrowed_indirect.no-opt.exp b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/copy_loc_borrowed_indirect.no-opt.exp
new file mode 100644
index 0000000000000..5c703b3018452
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/copy_loc_borrowed_indirect.no-opt.exp
@@ -0,0 +1,9 @@
+
+============ bytecode verification failed ========
+
+Diagnostics:
+error: reference safety check failed on bytecode level. This is a known issue, to be fixed later, resulting from differences between safety rules of the v1 and v2 compiler. Try to rewrite your code to workaround this problem.
+  ┌─ tests/reference-safety/v1-borrow-tests/copy_loc_borrowed_indirect.move:7:9
+  │
+7 │         x + copy x;
+  │         ^^^^^^^^^^
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/factor_invalid_2.exp b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/factor_invalid_2.exp
new file mode 100644
index 0000000000000..f8ed1bb00bacf
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/factor_invalid_2.exp
@@ -0,0 +1,15 @@
+
+Diagnostics:
+error: cannot mutably borrow field of local `root` since references derived from a call exist
+  ┌─ tests/reference-safety/v1-borrow-tests/factor_invalid_2.move:8:9
+  │
+6 │         let eps = if (cond) bar(root) else &x1;
+  │                             --------- previous call result
+7 │         // Error: root has weak empty borrow and hence a field cannot be borrowed mutably
+8 │         &mut root.g;
+  │         ^^^^^^^^^^^
+  │         │
+  │         mutable borrow attempted here
+  │         previous mutable field borrow
+9 │         eps;
+  │         --- conflicting reference `eps` used here
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/factor_invalid_2.move b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/factor_invalid_2.move
new file mode 100644
index 0000000000000..df43dbb337feb
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/factor_invalid_2.move
@@ -0,0 +1,17 @@
+module 0x8675309::M {
+    struct S { g: u64 }
+
+    fun t1(root: &mut S, cond: bool) {
+        let x1 = 0;
+        let eps = if (cond) bar(root) else &x1;
+        // Error: root has weak empty borrow and hence a field cannot be borrowed mutably
+        &mut root.g;
+        eps;
+    }
+
+    fun bar(a: &mut S): &u64 {
+        &a.g
+    }
+}
+
+// check: BORROWFIELD_EXISTS_MUTABLE_BORROW_ERROR
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/factor_invalid_2.no-opt.exp b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/factor_invalid_2.no-opt.exp
new file mode 100644
index 0000000000000..f8ed1bb00bacf
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/factor_invalid_2.no-opt.exp
@@ -0,0 +1,15 @@
+
+Diagnostics:
+error: cannot mutably borrow field of local `root` since references derived from a call exist
+  ┌─ tests/reference-safety/v1-borrow-tests/factor_invalid_2.move:8:9
+  │
+6 │         let eps = if (cond) bar(root) else &x1;
+  │                             --------- previous call result
+7 │         // Error: root has weak empty borrow and hence a field cannot be borrowed mutably
+8 │         &mut root.g;
+  │         ^^^^^^^^^^^
+  │         │
+  │         mutable borrow attempted here
+  │         previous mutable field borrow
+9 │         eps;
+  │         --- conflicting reference `eps` used here
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/imm_borrow_loc_trivial.exp b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/imm_borrow_loc_trivial.exp
new file mode 100644
index 0000000000000..bded14151328f
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/imm_borrow_loc_trivial.exp
@@ -0,0 +1,18 @@
+
+Diagnostics:
+error: cannot immutably borrow since mutable references exist
+   ┌─ tests/reference-safety/v1-borrow-tests/imm_borrow_loc_trivial.move:14:34
+   │
+12 │         let returned_ref = bump_and_give(&mut x, &other);
+   │                            -----------------------------
+   │                            │             │
+   │                            │             previous mutable local borrow
+   │                            used by call result
+13 │         // imagine some more interesting check than this assert
+14 │         assert!(*returned_ref == x.f, 42);
+   │                                  ^--
+   │                                  │
+   │                                  requirement enforced here
+   │                                  immutable borrow attempted here
+15 │         *result = *returned_ref;
+   │                   ------------- conflicting reference `returned_ref` used here
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/imm_borrow_loc_trivial.move b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/imm_borrow_loc_trivial.move
new file mode 100644
index 0000000000000..d4d213a04bee5
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/imm_borrow_loc_trivial.move
@@ -0,0 +1,18 @@
+module 0x8675309::Tester {
+    struct X has key { f: u64 }
+
+    fun bump_and_give(x_ref: &mut X, _other: &u64): &u64 {
+        x_ref.f = x_ref.f + 1;
+        &x_ref.f
+    }
+
+    fun contrived_example(result: &mut u64) {
+        let x = X { f: 0 };
+        let other = 100;
+        let returned_ref = bump_and_give(&mut x, &other);
+        // imagine some more interesting check than this assert
+        assert!(*returned_ref == x.f, 42);
+        *result = *returned_ref;
+        X { f: _ } = x;
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/imm_borrow_loc_trivial.no-opt.exp b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/imm_borrow_loc_trivial.no-opt.exp
new file mode 100644
index 0000000000000..bded14151328f
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/imm_borrow_loc_trivial.no-opt.exp
@@ -0,0 +1,18 @@
+
+Diagnostics:
+error: cannot immutably borrow since mutable references exist
+   ┌─ tests/reference-safety/v1-borrow-tests/imm_borrow_loc_trivial.move:14:34
+   │
+12 │         let returned_ref = bump_and_give(&mut x, &other);
+   │                            -----------------------------
+   │                            │             │
+   │                            │             previous mutable local borrow
+   │                            used by call result
+13 │         // imagine some more interesting check than this assert
+14 │         assert!(*returned_ref == x.f, 42);
+   │                                  ^--
+   │                                  │
+   │                                  requirement enforced here
+   │                                  immutable borrow attempted here
+15 │         *result = *returned_ref;
+   │                   ------------- conflicting reference `returned_ref` used here
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/imm_borrow_on_mut.exp b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/imm_borrow_on_mut.exp
new file mode 100644
index 0000000000000..7bfb1620c8e95
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/imm_borrow_on_mut.exp
@@ -0,0 +1,37 @@
+
+Diagnostics:
+error: cannot immutably borrow since mutable references exist
+   ┌─ tests/reference-safety/v1-borrow-tests/imm_borrow_on_mut.move:30:31
+   │
+25 │         let field_ref = set_and_pick(account, point_ref);
+   │                         -------------------------------- previous mutable call result
+26 │         let returned_ref = bump_and_give(field_ref);
+   │                            ------------------------ used by call result
+   ·
+30 │             (*returned_ref == point_ref.x) &&
+   │                               ^^^^^^^^^^^
+   │                               │
+   │                               immutable borrow attempted here
+   │                               requirement enforced here
+31 │             (*returned_ref != point_ref.y),
+   │              ------------- conflicting reference `returned_ref` used here
+   ·
+34 │         returned_ref
+   │         ------------ conflicting reference `returned_ref` used here
+
+error: cannot immutably borrow since mutable references exist
+   ┌─ tests/reference-safety/v1-borrow-tests/imm_borrow_on_mut.move:31:31
+   │
+25 │         let field_ref = set_and_pick(account, point_ref);
+   │                         -------------------------------- previous mutable call result
+26 │         let returned_ref = bump_and_give(field_ref);
+   │                            ------------------------ used by call result
+   ·
+31 │             (*returned_ref != point_ref.y),
+   │                               ^^^^^^^^^^^
+   │                               │
+   │                               immutable borrow attempted here
+   │                               requirement enforced here
+   ·
+34 │         returned_ref
+   │         ------------ conflicting reference `returned_ref` used here
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/imm_borrow_on_mut.move b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/imm_borrow_on_mut.move
new file mode 100644
index 0000000000000..6f10ce9162f8e
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/imm_borrow_on_mut.move
@@ -0,0 +1,36 @@
+module 0x8675309::Tester {
+    use std::signer;
+
+    struct Initializer has key { x: u64, y: u64 }
+    struct Point has copy, drop { x: u64, y: u64 }
+
+    // the resource struct is here to just give a feeling why the computation might not be reorderable
+    fun set_and_pick(account: &signer, p: &mut Point): &mut u64 acquires Initializer {
+        let sender = signer::address_of(account);
+        let init = borrow_global_mut<Initializer>(sender);
+        p.x = init.x;
+        p.y = init.y;
+        if (p.x >= p.y) &mut p.x else &mut p.y
+    }
+
+    fun bump_and_give(u: &mut u64): &u64 {
+        *u = *u + 1;
+        freeze(u)
+    }
+
+    fun larger_field(account: &signer, point_ref: &mut Point): &u64 acquires Initializer {
+        assert!(point_ref.x == 0, 42);
+        assert!(point_ref.y == 0, 42);
+
+        let field_ref = set_and_pick(account, point_ref);
+        let returned_ref = bump_and_give(field_ref);
+
+        // imagine some more interesting check than this assert
+        assert!(
+            (*returned_ref == point_ref.x) &&
+            (*returned_ref != point_ref.y),
+            42
+        );
+        returned_ref
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/imm_borrow_on_mut.no-opt.exp b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/imm_borrow_on_mut.no-opt.exp
new file mode 100644
index 0000000000000..7bfb1620c8e95
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/imm_borrow_on_mut.no-opt.exp
@@ -0,0 +1,37 @@
+
+Diagnostics:
+error: cannot immutably borrow since mutable references exist
+   ┌─ tests/reference-safety/v1-borrow-tests/imm_borrow_on_mut.move:30:31
+   │
+25 │         let field_ref = set_and_pick(account, point_ref);
+   │                         -------------------------------- previous mutable call result
+26 │         let returned_ref = bump_and_give(field_ref);
+   │                            ------------------------ used by call result
+   ·
+30 │             (*returned_ref == point_ref.x) &&
+   │                               ^^^^^^^^^^^
+   │                               │
+   │                               immutable borrow attempted here
+   │                               requirement enforced here
+31 │             (*returned_ref != point_ref.y),
+   │              ------------- conflicting reference `returned_ref` used here
+   ·
+34 │         returned_ref
+   │         ------------ conflicting reference `returned_ref` used here
+
+error: cannot immutably borrow since mutable references exist
+   ┌─ tests/reference-safety/v1-borrow-tests/imm_borrow_on_mut.move:31:31
+   │
+25 │         let field_ref = set_and_pick(account, point_ref);
+   │                         -------------------------------- previous mutable call result
+26 │         let returned_ref = bump_and_give(field_ref);
+   │                            ------------------------ used by call result
+   ·
+31 │             (*returned_ref != point_ref.y),
+   │                               ^^^^^^^^^^^
+   │                               │
+   │                               immutable borrow attempted here
+   │                               requirement enforced here
+   ·
+34 │         returned_ref
+   │         ------------ conflicting reference `returned_ref` used here
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/imm_borrow_on_mut_invalid.exp b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/imm_borrow_on_mut_invalid.exp
index 039b8e1b1fa37..e9450aaffd539 100644
--- a/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/imm_borrow_on_mut_invalid.exp
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/imm_borrow_on_mut_invalid.exp
@@ -30,9 +30,17 @@ error: cannot immutably borrow since mutable references exist
 38 │         let field_ref = set_and_pick(account, copy point_ref);
    │                         ------------------------------------- previous mutable call result
 39 │         let x_val = *&freeze(point_ref).x;
-   │                     --^^^^^^^^^^^^^^^^^--
-   │                     │ │
-   │                     │ immutable borrow attempted here
-   │                     requirement enforced here
+   │                       ^^^^^^^^^^^^^^^^^--
+   │                       │
+   │                       requirement enforced here
+   │                       immutable borrow attempted here
 40 │         let returned_ref = bump_and_give(field_ref);
    │                            ------------------------ conflicting reference `field_ref` used here
+
+error: cannot freeze local `point_ref` since other mutable usages for this reference exist
+   ┌─ tests/reference-safety/v1-borrow-tests/imm_borrow_on_mut_invalid.move:39:23
+   │
+39 │         let x_val = *&freeze(point_ref).x;
+   │                       ^^^^^^^^^^^^^^^^^ frozen here
+40 │         let returned_ref = bump_and_give(field_ref);
+   │                            ------------------------ used here
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/imm_borrow_on_mut_invalid.no-opt.exp b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/imm_borrow_on_mut_invalid.no-opt.exp
index 039b8e1b1fa37..e9450aaffd539 100644
--- a/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/imm_borrow_on_mut_invalid.no-opt.exp
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/imm_borrow_on_mut_invalid.no-opt.exp
@@ -30,9 +30,17 @@ error: cannot immutably borrow since mutable references exist
 38 │         let field_ref = set_and_pick(account, copy point_ref);
    │                         ------------------------------------- previous mutable call result
 39 │         let x_val = *&freeze(point_ref).x;
-   │                     --^^^^^^^^^^^^^^^^^--
-   │                     │ │
-   │                     │ immutable borrow attempted here
-   │                     requirement enforced here
+   │                       ^^^^^^^^^^^^^^^^^--
+   │                       │
+   │                       requirement enforced here
+   │                       immutable borrow attempted here
 40 │         let returned_ref = bump_and_give(field_ref);
    │                            ------------------------ conflicting reference `field_ref` used here
+
+error: cannot freeze local `point_ref` since other mutable usages for this reference exist
+   ┌─ tests/reference-safety/v1-borrow-tests/imm_borrow_on_mut_invalid.move:39:23
+   │
+39 │         let x_val = *&freeze(point_ref).x;
+   │                       ^^^^^^^^^^^^^^^^^ frozen here
+40 │         let returned_ref = bump_and_give(field_ref);
+   │                            ------------------------ used here
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/mutable_borrow_invalid.exp b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/mutable_borrow_invalid.exp
index 426fc9fde7ed3..b7f26d30922f2 100644
--- a/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/mutable_borrow_invalid.exp
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/mutable_borrow_invalid.exp
@@ -1,7 +1,23 @@
 
 Diagnostics:
-error: same mutable reference in local `x` is also used in other value in argument list
-   ┌─ tests/reference-safety/v1-borrow-tests/mutable_borrow_invalid.move:17:9
+error: cannot mutably borrow since mutable references exist
+   ┌─ tests/reference-safety/v1-borrow-tests/mutable_borrow_invalid.move:9:9
+   │
+ 6 │         let x = if (cond) &mut root.f else &mut root.g;
+   │                           -----------      ----------- previous mutable field borrow
+   │                           │
+   │                           previous mutable field borrow
+   ·
+ 9 │         root.f = 1;
+   │         ^^^^^^----
+   │         │
+   │         requirement enforced here
+   │         mutable borrow attempted here
+10 │         *x;
+   │         -- conflicting reference `x` used here
+
+error: cannot mutably borrow since mutable references exist
+   ┌─ tests/reference-safety/v1-borrow-tests/mutable_borrow_invalid.move:17:16
    │
 14 │         let x = if (cond) &mut root.f else &mut root.g;
    │                           -----------      ----------- previous mutable field borrow
@@ -9,7 +25,7 @@ error: same mutable reference in local `x` is also used in other value in argume
    │                           previous mutable field borrow
    ·
 17 │         foo(x, &mut root.f);
-   │         ^^^^^^^^^^^^^^^^^^^
+   │         -------^^^^^^^^^^^-
    │         │      │
-   │         │      previous mutable field borrow
+   │         │      mutable borrow attempted here
    │         requirement enforced here
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/mutable_borrow_invalid.no-opt.exp b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/mutable_borrow_invalid.no-opt.exp
index 426fc9fde7ed3..b7f26d30922f2 100644
--- a/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/mutable_borrow_invalid.no-opt.exp
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/mutable_borrow_invalid.no-opt.exp
@@ -1,7 +1,23 @@
 
 Diagnostics:
-error: same mutable reference in local `x` is also used in other value in argument list
-   ┌─ tests/reference-safety/v1-borrow-tests/mutable_borrow_invalid.move:17:9
+error: cannot mutably borrow since mutable references exist
+   ┌─ tests/reference-safety/v1-borrow-tests/mutable_borrow_invalid.move:9:9
+   │
+ 6 │         let x = if (cond) &mut root.f else &mut root.g;
+   │                           -----------      ----------- previous mutable field borrow
+   │                           │
+   │                           previous mutable field borrow
+   ·
+ 9 │         root.f = 1;
+   │         ^^^^^^----
+   │         │
+   │         requirement enforced here
+   │         mutable borrow attempted here
+10 │         *x;
+   │         -- conflicting reference `x` used here
+
+error: cannot mutably borrow since mutable references exist
+   ┌─ tests/reference-safety/v1-borrow-tests/mutable_borrow_invalid.move:17:16
    │
 14 │         let x = if (cond) &mut root.f else &mut root.g;
    │                           -----------      ----------- previous mutable field borrow
@@ -9,7 +25,7 @@ error: same mutable reference in local `x` is also used in other value in argume
    │                           previous mutable field borrow
    ·
 17 │         foo(x, &mut root.f);
-   │         ^^^^^^^^^^^^^^^^^^^
+   │         -------^^^^^^^^^^^-
    │         │      │
-   │         │      previous mutable field borrow
+   │         │      mutable borrow attempted here
    │         requirement enforced here
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/mutable_borrow_invalid_2.exp b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/mutable_borrow_invalid_2.exp
new file mode 100644
index 0000000000000..e3bcfaedbe741
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/mutable_borrow_invalid_2.exp
@@ -0,0 +1,17 @@
+
+Diagnostics:
+error: cannot mutably borrow since mutable references exist
+   ┌─ tests/reference-safety/v1-borrow-tests/mutable_borrow_invalid_2.move:9:9
+   │
+ 6 │         let x = if (cond) &mut root.f else &mut root.g;
+   │                           -----------      ----------- previous mutable field borrow
+   │                           │
+   │                           previous mutable field borrow
+   ·
+ 9 │         root.f = 1;
+   │         ^^^^^^----
+   │         │
+   │         requirement enforced here
+   │         mutable borrow attempted here
+10 │         *x;
+   │         -- conflicting reference `x` used here
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/mutable_borrow_invalid_2.move b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/mutable_borrow_invalid_2.move
new file mode 100644
index 0000000000000..adb2b4d093cfa
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/mutable_borrow_invalid_2.move
@@ -0,0 +1,12 @@
+// Extracted out of mutable_borrow_invalid to verify in an isolated setting
+module 0x8675309::M {
+    struct S { f: u64, g: u64, h: u64 }
+
+    fun t1(root: &mut S, cond: bool) {
+        let x = if (cond) &mut root.f else &mut root.g;
+
+        // INVALID
+        root.f = 1;
+        *x;
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/mutable_borrow_invalid_2.no-opt.exp b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/mutable_borrow_invalid_2.no-opt.exp
new file mode 100644
index 0000000000000..e3bcfaedbe741
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/v1-borrow-tests/mutable_borrow_invalid_2.no-opt.exp
@@ -0,0 +1,17 @@
+
+Diagnostics:
+error: cannot mutably borrow since mutable references exist
+   ┌─ tests/reference-safety/v1-borrow-tests/mutable_borrow_invalid_2.move:9:9
+   │
+ 6 │         let x = if (cond) &mut root.f else &mut root.g;
+   │                           -----------      ----------- previous mutable field borrow
+   │                           │
+   │                           previous mutable field borrow
+   ·
+ 9 │         root.f = 1;
+   │         ^^^^^^----
+   │         │
+   │         requirement enforced here
+   │         mutable borrow attempted here
+10 │         *x;
+   │         -- conflicting reference `x` used here
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/v1-tests/borrow_field_combo.exp b/third_party/move/move-compiler-v2/tests/reference-safety/v1-tests/borrow_field_combo.exp
index ffbcf390d1f69..dade286a4d599 100644
--- a/third_party/move/move-compiler-v2/tests/reference-safety/v1-tests/borrow_field_combo.exp
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/v1-tests/borrow_field_combo.exp
@@ -119,3 +119,18 @@ error: mutable reference in local `inner` requires exclusive access but is borro
    │         ^^^^^^ requirement enforced here
 98 │         *c;
    │         -- conflicting reference `c` used here
+
+error: cannot mutably borrow since mutable references exist
+    ┌─ tests/reference-safety/v1-tests/borrow_field_combo.move:104:18
+    │
+103 │         let c; if (cond) c = &mut inner.f1 else c = &mut inner.f2;
+    │                              -------------          ------------- previous mutable field borrow
+    │                              │
+    │                              previous mutable field borrow
+104 │         let f1 = &mut inner.f1; // no error in v1, but should error.
+    │                  ^^^^^^^^^^^^^ mutable borrow attempted here
+105 │         *c;
+    │         -- requirement enforced here
+106 │         *f1;
+107 │         *inner;
+    │         ------ conflicting reference `inner` used here
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/v1-tests/borrow_field_combo.no-opt.exp b/third_party/move/move-compiler-v2/tests/reference-safety/v1-tests/borrow_field_combo.no-opt.exp
index ffbcf390d1f69..dade286a4d599 100644
--- a/third_party/move/move-compiler-v2/tests/reference-safety/v1-tests/borrow_field_combo.no-opt.exp
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/v1-tests/borrow_field_combo.no-opt.exp
@@ -119,3 +119,18 @@ error: mutable reference in local `inner` requires exclusive access but is borro
    │         ^^^^^^ requirement enforced here
 98 │         *c;
    │         -- conflicting reference `c` used here
+
+error: cannot mutably borrow since mutable references exist
+    ┌─ tests/reference-safety/v1-tests/borrow_field_combo.move:104:18
+    │
+103 │         let c; if (cond) c = &mut inner.f1 else c = &mut inner.f2;
+    │                              -------------          ------------- previous mutable field borrow
+    │                              │
+    │                              previous mutable field borrow
+104 │         let f1 = &mut inner.f1; // no error in v1, but should error.
+    │                  ^^^^^^^^^^^^^ mutable borrow attempted here
+105 │         *c;
+    │         -- requirement enforced here
+106 │         *f1;
+107 │         *inner;
+    │         ------ conflicting reference `inner` used here
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/v1-tests/call_acquires_invalid.exp b/third_party/move/move-compiler-v2/tests/reference-safety/v1-tests/call_acquires_invalid.exp
index f6767e62f1787..26684d5afb4d4 100644
--- a/third_party/move/move-compiler-v2/tests/reference-safety/v1-tests/call_acquires_invalid.exp
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/v1-tests/call_acquires_invalid.exp
@@ -1,34 +1,118 @@
 
-============ bytecode verification failed ========
-
 Diagnostics:
-bug: BYTECODE VERIFICATION FAILED
+error: function acquires global `M::R` which is currently mutably borrowed
    ┌─ tests/reference-safety/v1-tests/call_acquires_invalid.move:16:23
    │
+10 │     fun acq(addr: address): R acquires R {
+   │                                        -- access declared here
+   ·
+15 │         let r1 = borrow_global_mut<R>(addr);
+   │                  -------------------------- previous mutable global borrow
 16 │         let R { f } = acq(addr);
-   │                       ^^^^^^^^^ ICE failed bytecode verifier: VMError {
-    major_status: GLOBAL_REFERENCE_ERROR,
-    sub_status: None,
-    message: None,
-    exec_state: None,
-    location: Module(
-        ModuleId {
-            address: 0000000000000000000000000000000000000000000000000000000008675309,
-            name: Identifier(
-                "M",
-            ),
-        },
-    ),
-    indices: [
-        (
-            FunctionDefinition,
-            3,
-        ),
-    ],
-    offsets: [
-        (
-            FunctionDefinitionIndex(3),
-            3,
-        ),
-    ],
-}
+   │                       ^^^^^^^^^ function called here
+
+error: function acquires global `M::R` which is currently mutably borrowed
+   ┌─ tests/reference-safety/v1-tests/call_acquires_invalid.move:22:23
+   │
+10 │     fun acq(addr: address): R acquires R {
+   │                                        -- access declared here
+   ·
+21 │         let f_ref = &mut borrow_global_mut<R>(addr).f;
+   │                     ---------------------------------
+   │                     │    │
+   │                     │    previous mutable global borrow
+   │                     used by mutable field borrow
+22 │         let R { f } = acq(addr);
+   │                       ^^^^^^^^^ function called here
+
+error: function acquires global `M::R` which is currently mutably borrowed
+   ┌─ tests/reference-safety/v1-tests/call_acquires_invalid.move:28:23
+   │
+10 │     fun acq(addr: address): R acquires R {
+   │                                        -- access declared here
+   ·
+27 │         let r1 = id_mut(borrow_global_mut<R>(addr));
+   │                  ----------------------------------
+   │                  │      │
+   │                  │      previous mutable global borrow
+   │                  used by mutable call result
+28 │         let R { f } = acq(addr);
+   │                       ^^^^^^^^^ function called here
+
+error: function acquires global `M::R` which is currently mutably borrowed
+   ┌─ tests/reference-safety/v1-tests/call_acquires_invalid.move:34:23
+   │
+10 │     fun acq(addr: address): R acquires R {
+   │                                        -- access declared here
+   ·
+33 │         let f_ref = id_mut(&mut borrow_global_mut<R>(addr).f);
+   │                            ---------------------------------
+   │                            │    │
+   │                            │    previous mutable global borrow
+   │                            used by mutable field borrow
+34 │         let R { f } = acq(addr);
+   │                       ^^^^^^^^^ function called here
+
+error: function acquires global `M::R` which is currently borrowed
+   ┌─ tests/reference-safety/v1-tests/call_acquires_invalid.move:40:23
+   │
+10 │     fun acq(addr: address): R acquires R {
+   │                                        -- access declared here
+   ·
+39 │         let r1 = borrow_global<R>(addr);
+   │                  ---------------------- previous global borrow
+40 │         let R { f } = acq(addr);
+   │                       ^^^^^^^^^ function called here
+
+error: function acquires global `M::R` which is currently borrowed
+   ┌─ tests/reference-safety/v1-tests/call_acquires_invalid.move:46:23
+   │
+10 │     fun acq(addr: address): R acquires R {
+   │                                        -- access declared here
+   ·
+45 │         let f_ref = &borrow_global<R>(addr).f;
+   │                     -------------------------
+   │                     ││
+   │                     │previous global borrow
+   │                     used by field borrow
+46 │         let R { f } = acq(addr);
+   │                       ^^^^^^^^^ function called here
+
+error: function acquires global `M::R` which is currently borrowed
+   ┌─ tests/reference-safety/v1-tests/call_acquires_invalid.move:52:23
+   │
+10 │     fun acq(addr: address): R acquires R {
+   │                                        -- access declared here
+   ·
+51 │         let r1 = id(borrow_global<R>(addr));
+   │                  --------------------------
+   │                  │  │
+   │                  │  previous global borrow
+   │                  used by call result
+52 │         let R { f } = acq(addr);
+   │                       ^^^^^^^^^ function called here
+
+error: function acquires global `M::R` which is currently borrowed
+   ┌─ tests/reference-safety/v1-tests/call_acquires_invalid.move:58:23
+   │
+10 │     fun acq(addr: address): R acquires R {
+   │                                        -- access declared here
+   ·
+57 │         let f_ref = id(&borrow_global<R>(addr).f);
+   │                        -------------------------
+   │                        ││
+   │                        │previous global borrow
+   │                        used by field borrow
+58 │         let R { f } = acq(addr);
+   │                       ^^^^^^^^^ function called here
+
+error: function acquires global `M::R` which is currently mutably borrowed
+   ┌─ tests/reference-safety/v1-tests/call_acquires_invalid.move:66:23
+   │
+10 │     fun acq(addr: address): R acquires R {
+   │                                        -- access declared here
+   ·
+65 │         let r1; if (cond) r1 = borrow_global_mut<R>(addr) else r1 = &mut r;
+   │                                -------------------------- previous mutable global borrow
+66 │         let R { f } = acq(addr);
+   │                       ^^^^^^^^^ function called here
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/v1-tests/call_acquires_invalid.no-opt.exp b/third_party/move/move-compiler-v2/tests/reference-safety/v1-tests/call_acquires_invalid.no-opt.exp
index f6767e62f1787..26684d5afb4d4 100644
--- a/third_party/move/move-compiler-v2/tests/reference-safety/v1-tests/call_acquires_invalid.no-opt.exp
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/v1-tests/call_acquires_invalid.no-opt.exp
@@ -1,34 +1,118 @@
 
-============ bytecode verification failed ========
-
 Diagnostics:
-bug: BYTECODE VERIFICATION FAILED
+error: function acquires global `M::R` which is currently mutably borrowed
    ┌─ tests/reference-safety/v1-tests/call_acquires_invalid.move:16:23
    │
+10 │     fun acq(addr: address): R acquires R {
+   │                                        -- access declared here
+   ·
+15 │         let r1 = borrow_global_mut<R>(addr);
+   │                  -------------------------- previous mutable global borrow
 16 │         let R { f } = acq(addr);
-   │                       ^^^^^^^^^ ICE failed bytecode verifier: VMError {
-    major_status: GLOBAL_REFERENCE_ERROR,
-    sub_status: None,
-    message: None,
-    exec_state: None,
-    location: Module(
-        ModuleId {
-            address: 0000000000000000000000000000000000000000000000000000000008675309,
-            name: Identifier(
-                "M",
-            ),
-        },
-    ),
-    indices: [
-        (
-            FunctionDefinition,
-            3,
-        ),
-    ],
-    offsets: [
-        (
-            FunctionDefinitionIndex(3),
-            3,
-        ),
-    ],
-}
+   │                       ^^^^^^^^^ function called here
+
+error: function acquires global `M::R` which is currently mutably borrowed
+   ┌─ tests/reference-safety/v1-tests/call_acquires_invalid.move:22:23
+   │
+10 │     fun acq(addr: address): R acquires R {
+   │                                        -- access declared here
+   ·
+21 │         let f_ref = &mut borrow_global_mut<R>(addr).f;
+   │                     ---------------------------------
+   │                     │    │
+   │                     │    previous mutable global borrow
+   │                     used by mutable field borrow
+22 │         let R { f } = acq(addr);
+   │                       ^^^^^^^^^ function called here
+
+error: function acquires global `M::R` which is currently mutably borrowed
+   ┌─ tests/reference-safety/v1-tests/call_acquires_invalid.move:28:23
+   │
+10 │     fun acq(addr: address): R acquires R {
+   │                                        -- access declared here
+   ·
+27 │         let r1 = id_mut(borrow_global_mut<R>(addr));
+   │                  ----------------------------------
+   │                  │      │
+   │                  │      previous mutable global borrow
+   │                  used by mutable call result
+28 │         let R { f } = acq(addr);
+   │                       ^^^^^^^^^ function called here
+
+error: function acquires global `M::R` which is currently mutably borrowed
+   ┌─ tests/reference-safety/v1-tests/call_acquires_invalid.move:34:23
+   │
+10 │     fun acq(addr: address): R acquires R {
+   │                                        -- access declared here
+   ·
+33 │         let f_ref = id_mut(&mut borrow_global_mut<R>(addr).f);
+   │                            ---------------------------------
+   │                            │    │
+   │                            │    previous mutable global borrow
+   │                            used by mutable field borrow
+34 │         let R { f } = acq(addr);
+   │                       ^^^^^^^^^ function called here
+
+error: function acquires global `M::R` which is currently borrowed
+   ┌─ tests/reference-safety/v1-tests/call_acquires_invalid.move:40:23
+   │
+10 │     fun acq(addr: address): R acquires R {
+   │                                        -- access declared here
+   ·
+39 │         let r1 = borrow_global<R>(addr);
+   │                  ---------------------- previous global borrow
+40 │         let R { f } = acq(addr);
+   │                       ^^^^^^^^^ function called here
+
+error: function acquires global `M::R` which is currently borrowed
+   ┌─ tests/reference-safety/v1-tests/call_acquires_invalid.move:46:23
+   │
+10 │     fun acq(addr: address): R acquires R {
+   │                                        -- access declared here
+   ·
+45 │         let f_ref = &borrow_global<R>(addr).f;
+   │                     -------------------------
+   │                     ││
+   │                     │previous global borrow
+   │                     used by field borrow
+46 │         let R { f } = acq(addr);
+   │                       ^^^^^^^^^ function called here
+
+error: function acquires global `M::R` which is currently borrowed
+   ┌─ tests/reference-safety/v1-tests/call_acquires_invalid.move:52:23
+   │
+10 │     fun acq(addr: address): R acquires R {
+   │                                        -- access declared here
+   ·
+51 │         let r1 = id(borrow_global<R>(addr));
+   │                  --------------------------
+   │                  │  │
+   │                  │  previous global borrow
+   │                  used by call result
+52 │         let R { f } = acq(addr);
+   │                       ^^^^^^^^^ function called here
+
+error: function acquires global `M::R` which is currently borrowed
+   ┌─ tests/reference-safety/v1-tests/call_acquires_invalid.move:58:23
+   │
+10 │     fun acq(addr: address): R acquires R {
+   │                                        -- access declared here
+   ·
+57 │         let f_ref = id(&borrow_global<R>(addr).f);
+   │                        -------------------------
+   │                        ││
+   │                        │previous global borrow
+   │                        used by field borrow
+58 │         let R { f } = acq(addr);
+   │                       ^^^^^^^^^ function called here
+
+error: function acquires global `M::R` which is currently mutably borrowed
+   ┌─ tests/reference-safety/v1-tests/call_acquires_invalid.move:66:23
+   │
+10 │     fun acq(addr: address): R acquires R {
+   │                                        -- access declared here
+   ·
+65 │         let r1; if (cond) r1 = borrow_global_mut<R>(addr) else r1 = &mut r;
+   │                                -------------------------- previous mutable global borrow
+66 │         let R { f } = acq(addr);
+   │                       ^^^^^^^^^ function called here
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/v1-tests/call_ordering.exp b/third_party/move/move-compiler-v2/tests/reference-safety/v1-tests/call_ordering.exp
index 6dd19116b2918..a0700b265559c 100644
--- a/third_party/move/move-compiler-v2/tests/reference-safety/v1-tests/call_ordering.exp
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/v1-tests/call_ordering.exp
@@ -9,3 +9,11 @@ error: cannot immutably borrow since mutable references exist
   │             ^^^^^^^^^    ------ requirement enforced here
   │             │
   │             immutable borrow attempted here
+
+error: cannot freeze local `s` since other mutable usages for this reference exist
+  ┌─ tests/reference-safety/v1-tests/call_ordering.move:7:13
+  │
+7 │         foo(freeze(s), { *f = 0; 1 })
+  │             ^^^^^^^^^    ------ used here
+  │             │
+  │             frozen here
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/v1-tests/call_ordering.no-opt.exp b/third_party/move/move-compiler-v2/tests/reference-safety/v1-tests/call_ordering.no-opt.exp
index 6dd19116b2918..a0700b265559c 100644
--- a/third_party/move/move-compiler-v2/tests/reference-safety/v1-tests/call_ordering.no-opt.exp
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/v1-tests/call_ordering.no-opt.exp
@@ -9,3 +9,11 @@ error: cannot immutably borrow since mutable references exist
   │             ^^^^^^^^^    ------ requirement enforced here
   │             │
   │             immutable borrow attempted here
+
+error: cannot freeze local `s` since other mutable usages for this reference exist
+  ┌─ tests/reference-safety/v1-tests/call_ordering.move:7:13
+  │
+7 │         foo(freeze(s), { *f = 0; 1 })
+  │             ^^^^^^^^^    ------ used here
+  │             │
+  │             frozen here
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/v1-tests/freeze_combo_invalid.exp b/third_party/move/move-compiler-v2/tests/reference-safety/v1-tests/freeze_combo_invalid.exp
index 8cc98332b410a..4a579f85bc628 100644
--- a/third_party/move/move-compiler-v2/tests/reference-safety/v1-tests/freeze_combo_invalid.exp
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/v1-tests/freeze_combo_invalid.exp
@@ -1,5 +1,21 @@
 
 Diagnostics:
+error: cannot freeze local `s` since other mutable usages for this reference exist
+   ┌─ tests/reference-safety/v1-tests/freeze_combo_invalid.move:13:9
+   │
+13 │         freeze(s);
+   │         ^^^^^^^^^ frozen here
+14 │         *f;
+   │         -- used here
+
+error: cannot freeze local `s` since other mutable usages for this reference exist
+   ┌─ tests/reference-safety/v1-tests/freeze_combo_invalid.move:20:9
+   │
+20 │         freeze(s);
+   │         ^^^^^^^^^ frozen here
+21 │         *f;
+   │         -- used here
+
 error: cannot freeze local `s` since other mutable usages for this reference exist
    ┌─ tests/reference-safety/v1-tests/freeze_combo_invalid.move:27:9
    │
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/v1-tests/freeze_combo_invalid.no-opt.exp b/third_party/move/move-compiler-v2/tests/reference-safety/v1-tests/freeze_combo_invalid.no-opt.exp
index 8cc98332b410a..4a579f85bc628 100644
--- a/third_party/move/move-compiler-v2/tests/reference-safety/v1-tests/freeze_combo_invalid.no-opt.exp
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/v1-tests/freeze_combo_invalid.no-opt.exp
@@ -1,5 +1,21 @@
 
 Diagnostics:
+error: cannot freeze local `s` since other mutable usages for this reference exist
+   ┌─ tests/reference-safety/v1-tests/freeze_combo_invalid.move:13:9
+   │
+13 │         freeze(s);
+   │         ^^^^^^^^^ frozen here
+14 │         *f;
+   │         -- used here
+
+error: cannot freeze local `s` since other mutable usages for this reference exist
+   ┌─ tests/reference-safety/v1-tests/freeze_combo_invalid.move:20:9
+   │
+20 │         freeze(s);
+   │         ^^^^^^^^^ frozen here
+21 │         *f;
+   │         -- used here
+
 error: cannot freeze local `s` since other mutable usages for this reference exist
    ┌─ tests/reference-safety/v1-tests/freeze_combo_invalid.move:27:9
    │
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/v1-tests/freeze_field_invalid.exp b/third_party/move/move-compiler-v2/tests/reference-safety/v1-tests/freeze_field_invalid.exp
index 2b1829d7d5e2f..8382c9c92f242 100644
--- a/third_party/move/move-compiler-v2/tests/reference-safety/v1-tests/freeze_field_invalid.exp
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/v1-tests/freeze_field_invalid.exp
@@ -1,5 +1,13 @@
 
 Diagnostics:
+error: cannot freeze local `s` since other mutable usages for this reference exist
+   ┌─ tests/reference-safety/v1-tests/freeze_field_invalid.move:12:9
+   │
+12 │         freeze(s);
+   │         ^^^^^^^^^ frozen here
+13 │         *f;
+   │         -- used here
+
 error: cannot mutably borrow since immutable references exist
    ┌─ tests/reference-safety/v1-tests/freeze_field_invalid.move:18:17
    │
@@ -10,3 +18,12 @@ error: cannot mutably borrow since immutable references exist
 19 │         freeze(s);
 20 │         *f;
    │         -- requirement enforced here
+
+error: cannot freeze local `s` since other mutable usages for this reference exist
+   ┌─ tests/reference-safety/v1-tests/freeze_field_invalid.move:19:9
+   │
+19 │         freeze(s);
+   │         ^^^^^^^^^ frozen here
+20 │         *f;
+21 │         *g;
+   │         -- used here
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/v1-tests/freeze_field_invalid.no-opt.exp b/third_party/move/move-compiler-v2/tests/reference-safety/v1-tests/freeze_field_invalid.no-opt.exp
index 2b1829d7d5e2f..8382c9c92f242 100644
--- a/third_party/move/move-compiler-v2/tests/reference-safety/v1-tests/freeze_field_invalid.no-opt.exp
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/v1-tests/freeze_field_invalid.no-opt.exp
@@ -1,5 +1,13 @@
 
 Diagnostics:
+error: cannot freeze local `s` since other mutable usages for this reference exist
+   ┌─ tests/reference-safety/v1-tests/freeze_field_invalid.move:12:9
+   │
+12 │         freeze(s);
+   │         ^^^^^^^^^ frozen here
+13 │         *f;
+   │         -- used here
+
 error: cannot mutably borrow since immutable references exist
    ┌─ tests/reference-safety/v1-tests/freeze_field_invalid.move:18:17
    │
@@ -10,3 +18,12 @@ error: cannot mutably borrow since immutable references exist
 19 │         freeze(s);
 20 │         *f;
    │         -- requirement enforced here
+
+error: cannot freeze local `s` since other mutable usages for this reference exist
+   ┌─ tests/reference-safety/v1-tests/freeze_field_invalid.move:19:9
+   │
+19 │         freeze(s);
+   │         ^^^^^^^^^ frozen here
+20 │         *f;
+21 │         *g;
+   │         -- used here
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/v1-typing/mutable_borrow_from_immutable.exp b/third_party/move/move-compiler-v2/tests/reference-safety/v1-typing/mutable_borrow_from_immutable.exp
new file mode 100644
index 0000000000000..fd28da16c1661
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/v1-typing/mutable_borrow_from_immutable.exp
@@ -0,0 +1,13 @@
+
+Diagnostics:
+error: cannot mutably borrow from an immutable ref
+  ┌─ tests/reference-safety/v1-typing/mutable_borrow_from_immutable.move:6:9
+  │
+6 │         &mut (&s).v;
+  │         ^^^^^^^^^^^
+
+error: field `v` not declared in struct `X`
+   ┌─ tests/reference-safety/v1-typing/mutable_borrow_from_immutable.move:11:14
+   │
+11 │         &mut xref.v;
+   │              ^^^^
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/v1-typing/mutable_borrow_from_immutable.move b/third_party/move/move-compiler-v2/tests/reference-safety/v1-typing/mutable_borrow_from_immutable.move
new file mode 100644
index 0000000000000..1c42e445e59cb
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/v1-typing/mutable_borrow_from_immutable.move
@@ -0,0 +1,18 @@
+module 0x8675309::M {
+    struct X { f: u64 }
+    struct S { v: u64, x: X }
+    fun t() {
+        let s = S { v: 0, x: X { f: 0 }};
+        &mut (&s).v;
+        &mut (&s.x).f;
+        let sref = &s;
+        let xref = &s.x;
+        &mut sref.v;
+        &mut xref.v;
+    }
+
+    fun t2(s: &S, x: &X) {
+        x.f = x.f + 1;
+        s.x.f = s.x.f + 1
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/v1-typing/mutable_borrow_from_immutable.no-opt.exp b/third_party/move/move-compiler-v2/tests/reference-safety/v1-typing/mutable_borrow_from_immutable.no-opt.exp
new file mode 100644
index 0000000000000..fd28da16c1661
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/v1-typing/mutable_borrow_from_immutable.no-opt.exp
@@ -0,0 +1,13 @@
+
+Diagnostics:
+error: cannot mutably borrow from an immutable ref
+  ┌─ tests/reference-safety/v1-typing/mutable_borrow_from_immutable.move:6:9
+  │
+6 │         &mut (&s).v;
+  │         ^^^^^^^^^^^
+
+error: field `v` not declared in struct `X`
+   ┌─ tests/reference-safety/v1-typing/mutable_borrow_from_immutable.move:11:14
+   │
+11 │         &mut xref.v;
+   │              ^^^^
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/v1-typing/mutable_eq_and_neq_invalid.exp b/third_party/move/move-compiler-v2/tests/reference-safety/v1-typing/mutable_eq_and_neq_invalid.exp
new file mode 100644
index 0000000000000..ccb010009038a
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/v1-typing/mutable_eq_and_neq_invalid.exp
@@ -0,0 +1,49 @@
+
+Diagnostics:
+error: cannot implicitly freeze value  since multiple mutable references exist
+  ┌─ tests/reference-safety/v1-typing/mutable_eq_and_neq_invalid.move:7:20
+  │
+6 │         let f = &mut p.b1.f;
+  │                      ---- conflicting mutable field borrow
+7 │         let comp = (&mut p.b1) == (&mut p.b2);
+  │                    ^^^^^^^^^^^
+  │                    │
+  │                    implicitly frozen here
+  │                    originating mutable field borrow
+
+error: cannot immutably borrow since mutable references exist
+  ┌─ tests/reference-safety/v1-typing/mutable_eq_and_neq_invalid.move:7:20
+  │
+6 │         let f = &mut p.b1.f;
+  │                 ----------- previous mutable field borrow
+7 │         let comp = (&mut p.b1) == (&mut p.b2);
+  │                    ^^^^^^^^^^^---------------
+  │                    │
+  │                    requirement enforced here
+  │                    immutable borrow attempted here
+8 │         *f = comp
+  │         --------- conflicting reference `f` used here
+
+error: cannot implicitly freeze value  since multiple mutable references exist
+   ┌─ tests/reference-safety/v1-typing/mutable_eq_and_neq_invalid.move:13:20
+   │
+12 │         let f = &mut p.b1.f;
+   │                      ---- conflicting mutable field borrow
+13 │         let comp = (&mut p.b1) != (&mut p.b2);
+   │                    ^^^^^^^^^^^
+   │                    │
+   │                    implicitly frozen here
+   │                    originating mutable field borrow
+
+error: cannot immutably borrow since mutable references exist
+   ┌─ tests/reference-safety/v1-typing/mutable_eq_and_neq_invalid.move:13:20
+   │
+12 │         let f = &mut p.b1.f;
+   │                 ----------- previous mutable field borrow
+13 │         let comp = (&mut p.b1) != (&mut p.b2);
+   │                    ^^^^^^^^^^^---------------
+   │                    │
+   │                    requirement enforced here
+   │                    immutable borrow attempted here
+14 │         *f = comp
+   │         --------- conflicting reference `f` used here
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/v1-typing/mutable_eq_and_neq_invalid.move b/third_party/move/move-compiler-v2/tests/reference-safety/v1-typing/mutable_eq_and_neq_invalid.move
new file mode 100644
index 0000000000000..a36ce668e68e9
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/v1-typing/mutable_eq_and_neq_invalid.move
@@ -0,0 +1,16 @@
+module 0x8675309::M {
+    struct B { f: bool }
+    struct P { b1: B, b2: B }
+
+    fun t0(p: &mut P) {
+        let f = &mut p.b1.f;
+        let comp = (&mut p.b1) == (&mut p.b2);
+        *f = comp
+    }
+
+    fun t1(p: &mut P) {
+        let f = &mut p.b1.f;
+        let comp = (&mut p.b1) != (&mut p.b2);
+        *f = comp
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/v1-typing/mutable_eq_and_neq_invalid.no-opt.exp b/third_party/move/move-compiler-v2/tests/reference-safety/v1-typing/mutable_eq_and_neq_invalid.no-opt.exp
new file mode 100644
index 0000000000000..ccb010009038a
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/v1-typing/mutable_eq_and_neq_invalid.no-opt.exp
@@ -0,0 +1,49 @@
+
+Diagnostics:
+error: cannot implicitly freeze value  since multiple mutable references exist
+  ┌─ tests/reference-safety/v1-typing/mutable_eq_and_neq_invalid.move:7:20
+  │
+6 │         let f = &mut p.b1.f;
+  │                      ---- conflicting mutable field borrow
+7 │         let comp = (&mut p.b1) == (&mut p.b2);
+  │                    ^^^^^^^^^^^
+  │                    │
+  │                    implicitly frozen here
+  │                    originating mutable field borrow
+
+error: cannot immutably borrow since mutable references exist
+  ┌─ tests/reference-safety/v1-typing/mutable_eq_and_neq_invalid.move:7:20
+  │
+6 │         let f = &mut p.b1.f;
+  │                 ----------- previous mutable field borrow
+7 │         let comp = (&mut p.b1) == (&mut p.b2);
+  │                    ^^^^^^^^^^^---------------
+  │                    │
+  │                    requirement enforced here
+  │                    immutable borrow attempted here
+8 │         *f = comp
+  │         --------- conflicting reference `f` used here
+
+error: cannot implicitly freeze value  since multiple mutable references exist
+   ┌─ tests/reference-safety/v1-typing/mutable_eq_and_neq_invalid.move:13:20
+   │
+12 │         let f = &mut p.b1.f;
+   │                      ---- conflicting mutable field borrow
+13 │         let comp = (&mut p.b1) != (&mut p.b2);
+   │                    ^^^^^^^^^^^
+   │                    │
+   │                    implicitly frozen here
+   │                    originating mutable field borrow
+
+error: cannot immutably borrow since mutable references exist
+   ┌─ tests/reference-safety/v1-typing/mutable_eq_and_neq_invalid.move:13:20
+   │
+12 │         let f = &mut p.b1.f;
+   │                 ----------- previous mutable field borrow
+13 │         let comp = (&mut p.b1) != (&mut p.b2);
+   │                    ^^^^^^^^^^^---------------
+   │                    │
+   │                    requirement enforced here
+   │                    immutable borrow attempted here
+14 │         *f = comp
+   │         --------- conflicting reference `f` used here
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/write_ref_dest.exp b/third_party/move/move-compiler-v2/tests/reference-safety/write_ref_dest.exp
index 90b32906711cc..ea5c005f76f31 100644
--- a/third_party/move/move-compiler-v2/tests/reference-safety/write_ref_dest.exp
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/write_ref_dest.exp
@@ -1,2 +1,10 @@
 
+Diagnostics:
+warning: Unused assignment to `y`. Consider removing or prefixing with an underscore: `_y`
+   ┌─ tests/reference-safety/write_ref_dest.move:16:9
+   │
+16 │         (y, _) = (*&y, 1);
+   │         ^^^^^^^^^^^^^^^^^
+
+
 ============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/reference-safety/write_ref_dest.no-opt.exp b/third_party/move/move-compiler-v2/tests/reference-safety/write_ref_dest.no-opt.exp
index 90b32906711cc..ea5c005f76f31 100644
--- a/third_party/move/move-compiler-v2/tests/reference-safety/write_ref_dest.no-opt.exp
+++ b/third_party/move/move-compiler-v2/tests/reference-safety/write_ref_dest.no-opt.exp
@@ -1,2 +1,10 @@
 
+Diagnostics:
+warning: Unused assignment to `y`. Consider removing or prefixing with an underscore: `_y`
+   ┌─ tests/reference-safety/write_ref_dest.move:16:9
+   │
+16 │         (y, _) = (*&y, 1);
+   │         ^^^^^^^^^^^^^^^^^
+
+
 ============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/simplifier-elimination/assign_unpack_references.exp b/third_party/move/move-compiler-v2/tests/simplifier-elimination/assign_unpack_references.exp
index b8c218e6fa304..338b267835624 100644
--- a/third_party/move/move-compiler-v2/tests/simplifier-elimination/assign_unpack_references.exp
+++ b/third_party/move/move-compiler-v2/tests/simplifier-elimination/assign_unpack_references.exp
@@ -12,7 +12,7 @@ module 0x8675309::M {
           let f: u64;
           {
             let s2: M::S;
-            M::R{ s1: M::S{ f: f: u64 }, s2: s2: M::S }: M::R = pack M::R(pack M::S(0), pack M::S(1));
+            M::R{ s1: M::S{ f }, s2 } = pack M::R(pack M::S(0), pack M::S(1));
             f;
             s2;
             f: u64 = 0;
@@ -28,7 +28,7 @@ module 0x8675309::M {
           let f: &u64;
           {
             let s2: &M::S;
-            M::R{ s1: M::S{ f: f: &u64 }, s2: s2: &M::S }: &M::R = Borrow(Immutable)(pack M::R(pack M::S(0), pack M::S(1)));
+            M::R{ s1: M::S{ f }, s2 } = Borrow(Immutable)(pack M::R(pack M::S(0), pack M::S(1)));
             f;
             s2;
             f: &u64 = Borrow(Immutable)(0);
@@ -44,7 +44,7 @@ module 0x8675309::M {
           let f: &mut u64;
           {
             let s2: &mut M::S;
-            M::R{ s1: M::S{ f: f: &mut u64 }, s2: s2: &mut M::S }: &mut M::R = Borrow(Mutable)(pack M::R(pack M::S(0), pack M::S(1)));
+            M::R{ s1: M::S{ f }, s2 } = Borrow(Mutable)(pack M::R(pack M::S(0), pack M::S(1)));
             f;
             s2;
             f: &mut u64 = Borrow(Mutable)(0);
diff --git a/third_party/move/move-compiler-v2/tests/simplifier-elimination/binary_add.exp b/third_party/move/move-compiler-v2/tests/simplifier-elimination/binary_add.exp
index 4d22f28e939cd..2cf7745cb0aa4 100644
--- a/third_party/move/move-compiler-v2/tests/simplifier-elimination/binary_add.exp
+++ b/third_party/move/move-compiler-v2/tests/simplifier-elimination/binary_add.exp
@@ -58,7 +58,7 @@ module 0x8675309::M {
         Add<u64>(select M::R.f<M::R>(r), select M::R.f<M::R>(r));
         Add<u64>(Add<u64>(Add<u64>(1, select M::R.f<M::R>(r)), select M::R.f<M::R>(r)), 0);
         {
-          let M::R{ f: _ }: M::R = r;
+          let M::R{ f: _ } = r;
           Tuple()
         }
     }
diff --git a/third_party/move/move-compiler-v2/tests/simplifier-elimination/bind_with_type_annot.exp b/third_party/move/move-compiler-v2/tests/simplifier-elimination/bind_with_type_annot.exp
index bd47ab1047bbe..8568e22ecebc0 100644
--- a/third_party/move/move-compiler-v2/tests/simplifier-elimination/bind_with_type_annot.exp
+++ b/third_party/move/move-compiler-v2/tests/simplifier-elimination/bind_with_type_annot.exp
@@ -31,11 +31,31 @@ module 0x8675309::M {
     }
     private fun t0() {
         {
-          let (x: u64, b: bool, M::R{ f: f: u64 }): (u64, bool, M::R) = Tuple(0, false, pack M::R(0));
+          let (x: u64, b: bool, M::R{ f }): (u64, bool, M::R) = Tuple(0, false, pack M::R(0));
           Tuple()
         }
     }
 } // end 0x8675309::M
 
 
+Diagnostics:
+warning: Unused assignment to `f`. Consider removing or prefixing with an underscore: `_f`
+  ┌─ tests/simplifier-elimination/bind_with_type_annot.move:7:20
+  │
+7 │         let (x, b, R{f}): (u64, bool, R) = (0, false, R { f: 0 }); x; b; f;
+  │                    ^^^^
+
+warning: Unused assignment to `b`. Consider removing or prefixing with an underscore: `_b`
+  ┌─ tests/simplifier-elimination/bind_with_type_annot.move:7:13
+  │
+7 │         let (x, b, R{f}): (u64, bool, R) = (0, false, R { f: 0 }); x; b; f;
+  │             ^^^^^^^^^^^^
+
+warning: Unused assignment to `x`. Consider removing or prefixing with an underscore: `_x`
+  ┌─ tests/simplifier-elimination/bind_with_type_annot.move:7:13
+  │
+7 │         let (x, b, R{f}): (u64, bool, R) = (0, false, R { f: 0 }); x; b; f;
+  │             ^^^^^^^^^^^^
+
+
 ============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/simplifier-elimination/use_before_assign.exp b/third_party/move/move-compiler-v2/tests/simplifier-elimination/use_before_assign.exp
index ac63e9d86f699..f10a3cdb4ab96 100644
--- a/third_party/move/move-compiler-v2/tests/simplifier-elimination/use_before_assign.exp
+++ b/third_party/move/move-compiler-v2/tests/simplifier-elimination/use_before_assign.exp
@@ -26,3 +26,11 @@ error: use of unassigned local `x`
   │
 4 │     let y = x;
   │             ^
+
+
+Diagnostics:
+warning: Unused assignment to `y`. Consider removing or prefixing with an underscore: `_y`
+  ┌─ tests/simplifier-elimination/use_before_assign.move:4:13
+  │
+4 │     let y = x;
+  │             ^
diff --git a/third_party/move/move-compiler-v2/tests/simplifier-elimination/use_before_assign_while.exp b/third_party/move/move-compiler-v2/tests/simplifier-elimination/use_before_assign_while.exp
index 223526a98870c..3f769d77944f3 100644
--- a/third_party/move/move-compiler-v2/tests/simplifier-elimination/use_before_assign_while.exp
+++ b/third_party/move/move-compiler-v2/tests/simplifier-elimination/use_before_assign_while.exp
@@ -105,6 +105,14 @@ error: use of unassigned local `x`
    │                                ^^
 
 
+Diagnostics:
+warning: Unused assignment to `x`. Consider removing or prefixing with an underscore: `_x`
+   ┌─ tests/simplifier-elimination/use_before_assign_while.move:19:60
+   │
+19 │         while (cond) { let y = &x; _ = move y; if (cond) { x = 0 }; break }
+   │                                                            ^^^^^
+
+
 Diagnostics:
 error: cannot move local `x` since it is still in use
   ┌─ tests/simplifier-elimination/use_before_assign_while.move:9:32
diff --git a/third_party/move/move-compiler-v2/tests/simplifier/constant_folding_addresses.exp b/third_party/move/move-compiler-v2/tests/simplifier/constant_folding_addresses.exp
new file mode 100644
index 0000000000000..4d021dd51d00d
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/simplifier/constant_folding_addresses.exp
@@ -0,0 +1,15 @@
+// -- Model dump before bytecode pipeline
+module 0xcafe::Addresses {
+    use std::vector;
+    public fun test() {
+        if Eq<u64>(vector::length<address>(Borrow(Immutable)([Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234)), Address(Numerical(0000000000000000000000000000000000000000000000000000000000001234))])), 1845) {
+          Tuple()
+        } else {
+          Abort(1)
+        };
+        Tuple()
+    }
+} // end 0xcafe::Addresses
+
+
+============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/simplifier/constant_folding_addresses.move b/third_party/move/move-compiler-v2/tests/simplifier/constant_folding_addresses.move
new file mode 100644
index 0000000000000..5ab779566182b
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/simplifier/constant_folding_addresses.move
@@ -0,0 +1,10 @@
+//# publish --print-bytecode
+module 0xcafe::Addresses {
+    use std::vector;
+    public fun test() {
+        let addresses = vector[@0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234, @0x1234];
+        assert!(vector::length(&addresses) == 1845, 1);
+    }
+}
+
+//# run 0xcafe::Addresses::test
diff --git a/third_party/move/move-compiler-v2/tests/simplifier/random.exp b/third_party/move/move-compiler-v2/tests/simplifier/random.exp
index c476659b15e23..0e9d3d0e91e5b 100644
--- a/third_party/move/move-compiler-v2/tests/simplifier/random.exp
+++ b/third_party/move/move-compiler-v2/tests/simplifier/random.exp
@@ -144,6 +144,14 @@ module 0x8675::M {
 } // end 0x8675::M
 
 
+Diagnostics:
+warning: Unused assignment to `q`. Consider removing or prefixing with an underscore: `_q`
+   ┌─ tests/simplifier/random.move:48:17
+   │
+48 │         let q = v;
+   │                 ^
+
+
 Diagnostics:
 error: cannot mutably borrow since immutable references exist
    ┌─ tests/simplifier/random.move:56:17
diff --git a/third_party/move/move-compiler-v2/tests/simplifier/simplifier_test4.exp b/third_party/move/move-compiler-v2/tests/simplifier/simplifier_test4.exp
index e14adb546af30..bfa5c67187dfa 100644
--- a/third_party/move/move-compiler-v2/tests/simplifier/simplifier_test4.exp
+++ b/third_party/move/move-compiler-v2/tests/simplifier/simplifier_test4.exp
@@ -63,3 +63,11 @@ error: cannot immutably borrow since mutable references exist
    │                 ^^^^^^^^^    --------------------- requirement enforced here
    │                 │
    │                 immutable borrow attempted here
+
+error: cannot freeze local `s` since other mutable usages for this reference exist
+   ┌─ tests/simplifier/simplifier_test4.move:11:17
+   │
+11 │             foo(freeze(s), { *({x = x + 1; f}) = 0; 1 })
+   │                 ^^^^^^^^^                  - used here
+   │                 │
+   │                 frozen here
diff --git a/third_party/move/move-compiler-v2/tests/testsuite.rs b/third_party/move/move-compiler-v2/tests/testsuite.rs
index 3468659ae5bda..10de13ae4b13a 100644
--- a/third_party/move/move-compiler-v2/tests/testsuite.rs
+++ b/third_party/move/move-compiler-v2/tests/testsuite.rs
@@ -145,6 +145,20 @@ const TEST_CONFIGS: Lazy<BTreeMap<&str, TestConfig>> = Lazy::new(|| {
             dump_bytecode: DumpLevel::None,
             dump_bytecode_filter: None,
         },
+        TestConfig {
+            name: "unused-assignment",
+            runner: |p| run_test(p, get_config_by_name("unused-assignment")),
+            include: vec!["/unused-assignment/"],
+            exclude: vec![],
+            exp_suffix: None,
+            options: opts
+                .clone()
+                .set_experiment(Experiment::UNUSED_ASSIGNMENT_CHECK, true),
+            stop_after: StopAfter::BytecodePipeline(Some("UnusedAssignmentChecker")),
+            dump_ast: DumpLevel::None,
+            dump_bytecode: DumpLevel::None,
+            dump_bytecode_filter: None,
+        },
         // Tests for lambda lifting
         TestConfig {
             name: "lambda-lifting",
@@ -184,7 +198,7 @@ const TEST_CONFIGS: Lazy<BTreeMap<&str, TestConfig>> = Lazy::new(|| {
             dump_bytecode: DumpLevel::None, // do not dump anything
             dump_bytecode_filter: None,
         },
-        // Tests for inlining, simplifier, and folding
+        // Tests for front-end, diagnostics (inlining, simplifier, folding, etc.)
         TestConfig {
             name: "inlining-et-al",
             runner: |p| run_test(p, get_config_by_name("inlining-et-al")),
@@ -212,6 +226,20 @@ const TEST_CONFIGS: Lazy<BTreeMap<&str, TestConfig>> = Lazy::new(|| {
             dump_bytecode: DumpLevel::None, // do not dump anything
             dump_bytecode_filter: None,
         },
+        // Tests for diagnostics, where dumping AST isn't useful.
+        TestConfig {
+            name: "diagnostics",
+            runner: |p| run_test(p, get_config_by_name("diagnostics")),
+            include: vec!["/deprecated/"],
+            exclude: vec![],
+            exp_suffix: None,
+            options: opts.clone().set_experiment(Experiment::AST_SIMPLIFY, true),
+            // Run the entire compiler pipeline to double-check the result
+            stop_after: StopAfter::FileFormat,
+            dump_ast: DumpLevel::None,
+            dump_bytecode: DumpLevel::None, // do not dump anything
+            dump_bytecode_filter: None,
+        },
         // --- Tests for bytecode generation
         TestConfig {
             name: "bytecode-gen",
@@ -247,12 +275,13 @@ const TEST_CONFIGS: Lazy<BTreeMap<&str, TestConfig>> = Lazy::new(|| {
             include: vec!["/reference-safety/"],
             exclude: vec![],
             exp_suffix: None,
-            options: opts.clone(),
+            // TODO(#13485): Need to turn off acquires check for now to test 2.0 access specifiers
+            options: opts.clone().set_experiment(Experiment::ACQUIRES_CHECK, false),
             stop_after: StopAfter::FileFormat,
             dump_ast: DumpLevel::None,
             dump_bytecode: DumpLevel::None,
             dump_bytecode_filter:
-            // For debugging:
+            // For debugging (dump_bytecode set DumpLevel::AllStages)
              Some(vec![
                INITIAL_BYTECODE_STAGE,
                "ReferenceSafetyProcessor",
@@ -269,7 +298,8 @@ const TEST_CONFIGS: Lazy<BTreeMap<&str, TestConfig>> = Lazy::new(|| {
             // Some reference tests create different errors since variable names are
             // known without optimizations, so we need to have a different exp file
             exp_suffix: Some("no-opt.exp"),
-            options: opts.clone().set_experiment(Experiment::OPTIMIZE, false),
+            options: opts.clone().set_experiment(Experiment::OPTIMIZE, false)
+                .set_experiment(Experiment::ACQUIRES_CHECK, false),
             stop_after: StopAfter::FileFormat,
             dump_ast: DumpLevel::None,
             dump_bytecode: DumpLevel::None,
@@ -523,6 +553,39 @@ const TEST_CONFIGS: Lazy<BTreeMap<&str, TestConfig>> = Lazy::new(|| {
             dump_bytecode: DumpLevel::None,
             dump_bytecode_filter: None,
         },
+        // Test for verify on and off
+        TestConfig {
+            name: "verification",
+            runner: |p| run_test(p, get_config_by_name("verification")),
+            include: vec!["/verification/verify/"],
+            exclude: vec![],
+            exp_suffix: None,
+            options: opts
+                .clone()
+                .set_experiment(Experiment::AST_SIMPLIFY, true)
+                .set_compile_test_code(true),
+            // Run the entire compiler pipeline to double-check the result
+            stop_after: StopAfter::FileFormat,
+            dump_ast: DumpLevel::None,
+            dump_bytecode: DumpLevel::None,
+            dump_bytecode_filter: None,
+        },
+        TestConfig {
+            name: "verification-off",
+            runner: |p| run_test(p, get_config_by_name("verification-off")),
+            include: vec!["/verification/noverify/"],
+            exclude: vec![],
+            exp_suffix: None,
+            options: opts
+                .clone()
+                .set_experiment(Experiment::AST_SIMPLIFY, true)
+                .set_compile_test_code(false),
+            // Run the entire compiler pipeline to double-check the result
+            stop_after: StopAfter::FileFormat,
+            dump_ast: DumpLevel::None,
+            dump_bytecode: DumpLevel::None,
+            dump_bytecode_filter: None,
+        },
         TestConfig {
             name: "skip-attribute-checks",
             runner: |p| run_test(p, get_config_by_name("skip-attribute-checks")),
@@ -558,6 +621,8 @@ fn run_test(path: &Path, config: TestConfig) -> datatest_stable::Result<()> {
     let path_str = path.display().to_string();
     let mut options = config.options.clone();
     options.warn_unused = path_str.contains("/unused/");
+    options.warn_deprecated = path_str.contains("/deprecated/");
+    options.compile_verify_code = path_str.contains("/verification/verify/");
     options.sources_deps = extract_test_directives(path, "// dep:")?;
     options.sources = vec![path_str.clone()];
     options.dependencies = if extract_test_directives(path, "// no-stdlib")?.is_empty() {
diff --git a/third_party/move/move-compiler-v2/tests/unit_test/notest/cross_module_members_non_test_function.exp b/third_party/move/move-compiler-v2/tests/unit_test/notest/cross_module_members_non_test_function.exp
index c0e6aba44b631..5b42e54a2628a 100644
--- a/third_party/move/move-compiler-v2/tests/unit_test/notest/cross_module_members_non_test_function.exp
+++ b/third_party/move/move-compiler-v2/tests/unit_test/notest/cross_module_members_non_test_function.exp
@@ -4,4 +4,4 @@ error: unbound module
    ┌─ tests/unit_test/notest/cross_module_members_non_test_function.move:24:9
    │
 24 │         A::build_foo()
-   │         ^ Unbound module alias 'A'
+   │         ^ Unbound module or type alias 'A'
diff --git a/third_party/move/move-compiler-v2/tests/unit_test/notest/cross_module_test_only_module.exp b/third_party/move/move-compiler-v2/tests/unit_test/notest/cross_module_test_only_module.exp
index 9921e6e56d93d..ea783b0a7336c 100644
--- a/third_party/move/move-compiler-v2/tests/unit_test/notest/cross_module_test_only_module.exp
+++ b/third_party/move/move-compiler-v2/tests/unit_test/notest/cross_module_test_only_module.exp
@@ -10,4 +10,4 @@ error: unbound module
    ┌─ tests/unit_test/notest/cross_module_test_only_module.move:13:9
    │
 13 │         M::foo()
-   │         ^ Unbound module alias 'M'
+   │         ^ Unbound module or type alias 'M'
diff --git a/third_party/move/move-compiler-v2/tests/unit_test/notest/function_with_spec.exp b/third_party/move/move-compiler-v2/tests/unit_test/notest/function_with_spec.exp
new file mode 100644
index 0000000000000..ed74cc91d766e
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/unit_test/notest/function_with_spec.exp
@@ -0,0 +1,7 @@
+
+Diagnostics:
+error: unresolved spec target
+   ┌─ tests/unit_test/notest/function_with_spec.move:18:10
+   │
+18 │     spec baz {
+   │          ^^^
diff --git a/third_party/move/move-compiler-v2/tests/unit_test/notest/function_with_spec.move b/third_party/move/move-compiler-v2/tests/unit_test/notest/function_with_spec.move
new file mode 100644
index 0000000000000..ed9d79304088e
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/unit_test/notest/function_with_spec.move
@@ -0,0 +1,22 @@
+// #[test_only] functions should be filtered out in non-test mode
+address 0x1234 {
+module M {
+    public fun foo() { }
+
+    #[test]
+    public fun bar_test() { bar() }
+
+    #[test_only]
+    public fun bar() { }
+
+    // This should not cause an error in either test- nor non-test-mode.
+    spec bar {
+        aborts_if false;
+    }
+
+    // This should always cause an error due to typo.
+    spec baz {
+        aborts_if false;
+    }
+}
+}
diff --git a/third_party/move/move-compiler-v2/tests/unit_test/test/function_with_spec.exp b/third_party/move/move-compiler-v2/tests/unit_test/test/function_with_spec.exp
new file mode 100644
index 0000000000000..fbcda8c812a5b
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/unit_test/test/function_with_spec.exp
@@ -0,0 +1,10 @@
+
+Diagnostics:
+error: unresolved spec target
+   ┌─ tests/unit_test/test/function_with_spec.move:18:10
+   │
+18 │     spec baz {
+   │          ^^^
+
+
+============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/unit_test/test/function_with_spec.move b/third_party/move/move-compiler-v2/tests/unit_test/test/function_with_spec.move
new file mode 100644
index 0000000000000..ed9d79304088e
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/unit_test/test/function_with_spec.move
@@ -0,0 +1,22 @@
+// #[test_only] functions should be filtered out in non-test mode
+address 0x1234 {
+module M {
+    public fun foo() { }
+
+    #[test]
+    public fun bar_test() { bar() }
+
+    #[test_only]
+    public fun bar() { }
+
+    // This should not cause an error in either test- nor non-test-mode.
+    spec bar {
+        aborts_if false;
+    }
+
+    // This should always cause an error due to typo.
+    spec baz {
+        aborts_if false;
+    }
+}
+}
diff --git a/third_party/move/move-compiler-v2/tests/unreachable-code-remover/conditional_loop_unreachable.exp b/third_party/move/move-compiler-v2/tests/unreachable-code-remover/conditional_loop_unreachable.exp
index 189a01e97ca64..6dc6b6253bb77 100644
--- a/third_party/move/move-compiler-v2/tests/unreachable-code-remover/conditional_loop_unreachable.exp
+++ b/third_party/move/move-compiler-v2/tests/unreachable-code-remover/conditional_loop_unreachable.exp
@@ -37,6 +37,20 @@ fun m::test($t0: bool, $t1: bool) {
  26: return ()
 }
 
+
+Diagnostics:
+warning: Unused assignment to `i`. Consider removing or prefixing with an underscore: `_i`
+  ┌─ tests/unreachable-code-remover/conditional_loop_unreachable.move:7:17
+  │
+7 │                 i = i + 1;
+  │                 ^^^^^^^^^
+
+warning: Unused assignment to `i`. Consider removing or prefixing with an underscore: `_i`
+   ┌─ tests/unreachable-code-remover/conditional_loop_unreachable.move:12:13
+   │
+12 │             i = i + 1;
+   │             ^^^^^^^^^
+
 ============ after UnreachableCodeProcessor: ================
 
 [variant baseline]
diff --git a/third_party/move/move-compiler-v2/tests/unused-assignment/assignment_in_loops.move b/third_party/move/move-compiler-v2/tests/unused-assignment/assignment_in_loops.move
new file mode 100644
index 0000000000000..7c0c38cc7faa7
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/unused-assignment/assignment_in_loops.move
@@ -0,0 +1,8 @@
+module 0x42::test {
+    fun unused_assignment_in_loop() {
+        let x = 1;
+        for (i in 0..10) {
+            x = x + 1;
+        };
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/unused-assignment/struct_assign_swap.exp b/third_party/move/move-compiler-v2/tests/unused-assignment/struct_assign_swap.exp
new file mode 100644
index 0000000000000..ced32810aeec8
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/unused-assignment/struct_assign_swap.exp
@@ -0,0 +1,13 @@
+
+Diagnostics:
+warning: Unused assignment to `x`. Consider removing or prefixing with an underscore: `_x`
+   ┌─ tests/unused-assignment/struct_assign_swap.move:16:13
+   │
+16 │         let S { f: x, g: y } = S { f: y, g: x };
+   │             ^^^^^^^^^^^^^^^^
+
+warning: Unused assignment to `y`. Consider removing or prefixing with an underscore: `_y`
+   ┌─ tests/unused-assignment/struct_assign_swap.move:16:13
+   │
+16 │         let S { f: x, g: y } = S { f: y, g: x };
+   │             ^^^^^^^^^^^^^^^^
diff --git a/third_party/move/move-compiler-v2/tests/unused-assignment/struct_assign_swap.move b/third_party/move/move-compiler-v2/tests/unused-assignment/struct_assign_swap.move
new file mode 100644
index 0000000000000..dbc71d497f38e
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/unused-assignment/struct_assign_swap.move
@@ -0,0 +1,27 @@
+//# publish
+module 0xc0ffee::m {
+    struct S {
+        f: u32,
+        g: u32,
+    }
+
+    fun swap1(x: u32, y: u32): (u32, u32) {
+        let S { f: x, g: y } = S { f: y, g: x };
+        (x, y)
+    }
+
+    fun swap2(): (u32, u32) {
+        let x = 44;
+        let y = 55;
+        let S { f: x, g: y } = S { f: y, g: x };
+        (x, y)
+    }
+
+    fun test1(): (u32, u32) {
+        swap1(1, 2)
+    }
+}
+
+//# run 0xc0ffee::m::test1
+
+//# run 0xc0ffee::m::swap2
diff --git a/third_party/move/move-compiler-v2/tests/unused-assignment/unused_assign_to_param.exp b/third_party/move/move-compiler-v2/tests/unused-assignment/unused_assign_to_param.exp
new file mode 100644
index 0000000000000..32ccfbd544060
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/unused-assignment/unused_assign_to_param.exp
@@ -0,0 +1,19 @@
+
+Diagnostics:
+warning: Unused assignment to `x`. Consider removing or prefixing with an underscore: `_x`
+  ┌─ tests/unused-assignment/unused_assign_to_param.move:3:9
+  │
+3 │         x = 42;
+  │         ^^^^^^
+
+warning: Unused assignment to `x`. Consider removing or prefixing with an underscore: `_x`
+  ┌─ tests/unused-assignment/unused_assign_to_param.move:8:13
+  │
+8 │             x = 42;
+  │             ^^^^^^
+
+warning: Unused assignment to `x`. Consider removing or prefixing with an underscore: `_x`
+   ┌─ tests/unused-assignment/unused_assign_to_param.move:10:9
+   │
+10 │         x = 42;
+   │         ^^^^^^
diff --git a/third_party/move/move-compiler-v2/tests/unused-assignment/unused_assign_to_param.move b/third_party/move/move-compiler-v2/tests/unused-assignment/unused_assign_to_param.move
new file mode 100644
index 0000000000000..7557fef94a3fa
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/unused-assignment/unused_assign_to_param.move
@@ -0,0 +1,12 @@
+module 0x42::test {
+    fun foo(x: u8) {
+        x = 42;
+    }
+
+    fun bar(x: u8) {
+        if (x > 3) {
+            x = 42;
+        };
+        x = 42;
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/unused-assignment/unused_call_assign_shadow.exp b/third_party/move/move-compiler-v2/tests/unused-assignment/unused_call_assign_shadow.exp
new file mode 100644
index 0000000000000..6b733974dbdba
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/unused-assignment/unused_call_assign_shadow.exp
@@ -0,0 +1,57 @@
+
+Diagnostics:
+warning: Unused parameter `a`. Consider removing or prefixing with an underscore: `_a`
+  ┌─ tests/unused-assignment/unused_call_assign_shadow.move:2:13
+  │
+2 │     fun foo(a: u8, _b: u8) {
+  │             ^
+
+warning: Unused local variable `y`. Consider removing or prefixing with an underscore: `_y`
+  ┌─ tests/unused-assignment/unused_call_assign_shadow.move:5:13
+  │
+5 │         let y = 0;
+  │             ^
+
+warning: Unused local variable `w`. Consider removing or prefixing with an underscore: `_w`
+  ┌─ tests/unused-assignment/unused_call_assign_shadow.move:8:13
+  │
+8 │         let w = bar(false);
+  │             ^
+
+warning: Unused local variable `x`. Consider removing or prefixing with an underscore: `_x`
+   ┌─ tests/unused-assignment/unused_call_assign_shadow.move:22:13
+   │
+22 │         let x = 0;
+   │             ^
+
+warning: Unused local variable `x`. Consider removing or prefixing with an underscore: `_x`
+   ┌─ tests/unused-assignment/unused_call_assign_shadow.move:24:13
+   │
+24 │         let x = 1;
+   │             ^
+
+
+Diagnostics:
+warning: Unused assignment to `x`. Consider removing or prefixing with an underscore: `_x`
+  ┌─ tests/unused-assignment/unused_call_assign_shadow.move:4:9
+  │
+4 │         x = x + 1;
+  │         ^^^^^^^^^
+
+warning: Unused assignment to `w`. Consider removing or prefixing with an underscore: `_w`
+  ┌─ tests/unused-assignment/unused_call_assign_shadow.move:8:17
+  │
+8 │         let w = bar(false);
+  │                 ^^^^^^^^^^
+
+warning: Unused assignment to `y`. Consider removing or prefixing with an underscore: `_y`
+   ┌─ tests/unused-assignment/unused_call_assign_shadow.move:14:13
+   │
+14 │             y = y + 1;
+   │             ^^^^^^^^^
+
+warning: Unused assignment to `y`. Consider removing or prefixing with an underscore: `_y`
+   ┌─ tests/unused-assignment/unused_call_assign_shadow.move:16:13
+   │
+16 │             y = y + 2;
+   │             ^^^^^^^^^
diff --git a/third_party/move/move-compiler-v2/tests/unused-assignment/unused_call_assign_shadow.move b/third_party/move/move-compiler-v2/tests/unused-assignment/unused_call_assign_shadow.move
new file mode 100644
index 0000000000000..70e9688d98c36
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/unused-assignment/unused_call_assign_shadow.move
@@ -0,0 +1,26 @@
+module 0x42::test {
+    fun foo(a: u8, _b: u8) {
+        let x = 0;
+        x = x + 1;
+        let y = 0;
+        let _z = 42;
+        // unused call assignment
+        let w = bar(false);
+    }
+
+    fun bar(x: bool): u8 {
+        let y = 0;
+        if (x) {
+            y = y + 1;
+        } else {
+            y = y + 2;
+        };
+        42
+    }
+
+    fun baz() {
+        let x = 0;
+        // shadowing
+        let x = 1;
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/unused-assignment/unused_in_pattern.exp b/third_party/move/move-compiler-v2/tests/unused-assignment/unused_in_pattern.exp
new file mode 100644
index 0000000000000..b4f2ce138890c
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/unused-assignment/unused_in_pattern.exp
@@ -0,0 +1,81 @@
+
+Diagnostics:
+warning: Unused local variable `x`. Consider removing or prefixing with an underscore: `_x`
+   ┌─ tests/unused-assignment/unused_in_pattern.move:20:11
+   │
+20 │         let S { x, y } = s;
+   │                 ^
+
+warning: Unused local variable `y`. Consider removing or prefixing with an underscore: `_y`
+   ┌─ tests/unused-assignment/unused_in_pattern.move:20:14
+   │
+20 │         let S { x, y } = s;
+   │                    ^
+
+warning: Unused local variable `z`. Consider removing or prefixing with an underscore: `_z`
+   ┌─ tests/unused-assignment/unused_in_pattern.move:26:7
+   │
+26 │         let z: S;
+   │             ^
+
+warning: Unused local variable `x`. Consider removing or prefixing with an underscore: `_x`
+   ┌─ tests/unused-assignment/unused_in_pattern.move:33:18
+   │
+33 │         let T { z: S { x, y } } = t;
+   │                        ^
+
+warning: Unused local variable `y`. Consider removing or prefixing with an underscore: `_y`
+   ┌─ tests/unused-assignment/unused_in_pattern.move:33:21
+   │
+33 │         let T { z: S { x, y } } = t;
+   │                           ^
+
+
+Diagnostics:
+warning: Unused assignment to `x`. Consider removing or prefixing with an underscore: `_x`
+   ┌─ tests/unused-assignment/unused_in_pattern.move:15:3
+   │
+15 │         S { x, y } = s;
+   │         ^^^^^^^^^^
+
+warning: Unused assignment to `y`. Consider removing or prefixing with an underscore: `_y`
+   ┌─ tests/unused-assignment/unused_in_pattern.move:15:3
+   │
+15 │         S { x, y } = s;
+   │         ^^^^^^^^^^
+
+warning: Unused assignment to `x`. Consider removing or prefixing with an underscore: `_x`
+   ┌─ tests/unused-assignment/unused_in_pattern.move:20:7
+   │
+20 │         let S { x, y } = s;
+   │             ^^^^^^^^^^
+
+warning: Unused assignment to `y`. Consider removing or prefixing with an underscore: `_y`
+   ┌─ tests/unused-assignment/unused_in_pattern.move:20:7
+   │
+20 │         let S { x, y } = s;
+   │             ^^^^^^^^^^
+
+warning: Unused assignment to `x`. Consider removing or prefixing with an underscore: `_x`
+   ┌─ tests/unused-assignment/unused_in_pattern.move:28:10
+   │
+28 │         T { z: S { x, y } } = t;
+   │                ^^^^^^^^^^
+
+warning: Unused assignment to `y`. Consider removing or prefixing with an underscore: `_y`
+   ┌─ tests/unused-assignment/unused_in_pattern.move:28:10
+   │
+28 │         T { z: S { x, y } } = t;
+   │                ^^^^^^^^^^
+
+warning: Unused assignment to `x`. Consider removing or prefixing with an underscore: `_x`
+   ┌─ tests/unused-assignment/unused_in_pattern.move:33:14
+   │
+33 │         let T { z: S { x, y } } = t;
+   │                    ^^^^^^^^^^
+
+warning: Unused assignment to `y`. Consider removing or prefixing with an underscore: `_y`
+   ┌─ tests/unused-assignment/unused_in_pattern.move:33:14
+   │
+33 │         let T { z: S { x, y } } = t;
+   │                    ^^^^^^^^^^
diff --git a/third_party/move/move-compiler-v2/tests/unused-assignment/unused_in_pattern.move b/third_party/move/move-compiler-v2/tests/unused-assignment/unused_in_pattern.move
new file mode 100644
index 0000000000000..921c5d0a1a95e
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/unused-assignment/unused_in_pattern.move
@@ -0,0 +1,40 @@
+module 0x42::test {
+	struct S {
+		x: u8,
+		y: bool,
+	}
+
+	struct T {
+		z: S,
+	}
+
+	fun unused_assign_in_pattern() {
+		let x;
+		let y;
+		let s = S { x: 42, y: true };
+		S { x, y } = s;
+	}
+
+	fun unused_decl_in_pattern() {
+		let s = S { x: 42, y: true };
+		let S { x, y } = s;
+	}
+
+	fun unused_assign_in_nested_pattern() {
+		let x;
+		let y;
+		let z: S;
+		let t = T { z: S { x: 42, y: true } };
+		T { z: S { x, y } } = t;
+	}
+
+	fun unused_decl_in_nested_pattern() {
+		let t = T { z: S { x: 42, y: true } };
+		let T { z: S { x, y } } = t;
+	}
+
+	fun unused_in_pattern_ok() {
+		let s = S { x: 42, y: true };
+		let S { x: _x, y: _y }= s;
+	}
+}
diff --git a/third_party/move/move-compiler-v2/tests/unused-assignment/v1-commands/mixed_lvalue.exp b/third_party/move/move-compiler-v2/tests/unused-assignment/v1-commands/mixed_lvalue.exp
new file mode 100644
index 0000000000000..f13c591a2243b
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/unused-assignment/v1-commands/mixed_lvalue.exp
@@ -0,0 +1,13 @@
+
+Diagnostics:
+error: invalid assignment
+   ┌─ tests/unused-assignment/v1-commands/mixed_lvalue.move:14:19
+   │
+14 │         (_, _, _, s.f) = four();
+   │                   ^^^ Invalid assignment syntax. Expected: a local, a field write, or a deconstructing assignment
+
+error: invalid assignment
+   ┌─ tests/unused-assignment/v1-commands/mixed_lvalue.move:15:19
+   │
+15 │         (_, _, _, *r_ref) = four();
+   │                   ^^^^^^ Invalid assignment syntax. Expected: a local, a field write, or a deconstructing assignment
diff --git a/third_party/move/move-compiler-v2/tests/unused-assignment/v1-commands/mixed_lvalue.move b/third_party/move/move-compiler-v2/tests/unused-assignment/v1-commands/mixed_lvalue.move
new file mode 100644
index 0000000000000..2858e5b6d2a34
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/unused-assignment/v1-commands/mixed_lvalue.move
@@ -0,0 +1,17 @@
+module 0x8675309::A {
+
+    struct S has drop { f: u64 }
+
+    fun four(): (u64, u64, u64, u64) {
+        (0, 1, 2, 3)
+    }
+
+    public fun mixed() {
+        let r = 0;
+        let r_ref = &mut r;
+        let s = S { f: 0 };
+
+        (_, _, _, s.f) = four();
+        (_, _, _, *r_ref) = four();
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/unused-assignment/v1-liveness/unused_assignment.exp b/third_party/move/move-compiler-v2/tests/unused-assignment/v1-liveness/unused_assignment.exp
new file mode 100644
index 0000000000000..8106befe7dad4
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/unused-assignment/v1-liveness/unused_assignment.exp
@@ -0,0 +1,57 @@
+
+Diagnostics:
+warning: Unused local variable `x`. Consider removing or prefixing with an underscore: `_x`
+  ┌─ tests/unused-assignment/v1-liveness/unused_assignment.move:3:13
+  │
+3 │         let x = 0;
+  │             ^
+
+warning: Unused local variable `x`. Consider removing or prefixing with an underscore: `_x`
+   ┌─ tests/unused-assignment/v1-liveness/unused_assignment.move:13:17
+   │
+13 │             let x = 0;
+   │                 ^
+
+
+Diagnostics:
+warning: Unused assignment to `x`. Consider removing or prefixing with an underscore: `_x`
+  ┌─ tests/unused-assignment/v1-liveness/unused_assignment.move:7:17
+  │
+7 │         let x = 0;
+  │                 ^
+
+warning: Unused assignment to `x`. Consider removing or prefixing with an underscore: `_x`
+  ┌─ tests/unused-assignment/v1-liveness/unused_assignment.move:8:9
+  │
+8 │         x = 0;
+  │         ^^^^^
+
+warning: Unused assignment to `x`. Consider removing or prefixing with an underscore: `_x`
+   ┌─ tests/unused-assignment/v1-liveness/unused_assignment.move:21:13
+   │
+21 │             x = 0;
+   │             ^^^^^
+
+warning: Unused assignment to `x`. Consider removing or prefixing with an underscore: `_x`
+   ┌─ tests/unused-assignment/v1-liveness/unused_assignment.move:26:17
+   │
+26 │         let x = 0;
+   │                 ^
+
+warning: Unused assignment to `x`. Consider removing or prefixing with an underscore: `_x`
+   ┌─ tests/unused-assignment/v1-liveness/unused_assignment.move:28:13
+   │
+28 │             x = 1;
+   │             ^^^^^
+
+warning: Unused assignment to `x`. Consider removing or prefixing with an underscore: `_x`
+   ┌─ tests/unused-assignment/v1-liveness/unused_assignment.move:30:13
+   │
+30 │             x = 2;
+   │             ^^^^^
+
+warning: Unused assignment to `x`. Consider removing or prefixing with an underscore: `_x`
+   ┌─ tests/unused-assignment/v1-liveness/unused_assignment.move:41:13
+   │
+41 │             x = 1;
+   │             ^^^^^
diff --git a/third_party/move/move-compiler-v2/tests/unused-assignment/v1-liveness/unused_assignment.move b/third_party/move/move-compiler-v2/tests/unused-assignment/v1-liveness/unused_assignment.move
new file mode 100644
index 0000000000000..6b0516e51f7f7
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/unused-assignment/v1-liveness/unused_assignment.move
@@ -0,0 +1,45 @@
+module 0x8675309::M {
+    fun t0() {
+        let x = 0;
+    }
+
+    fun t1() {
+        let x = 0;
+        x = 0;
+    }
+
+    fun t2(cond: bool) {
+        if (cond) {
+            let x = 0;
+        }
+    }
+
+    fun t3(cond: bool) {
+        let x = 0;
+        x;
+        if (cond) {
+            x = 0;
+        }
+    }
+
+    fun t4(cond: bool) {
+        let x = 0;
+        if (cond) {
+            x = 1;
+        } else {
+            x = 2;
+        }
+    }
+
+    fun t5(cond: bool) {
+        let x;
+        while (cond) {
+            x = 0;
+            if (cond) {
+                x;
+            };
+            x = 1;
+        }
+    }
+
+}
diff --git a/third_party/move/move-compiler-v2/tests/unused-assignment/v1-locals/assign_partial_resource.exp b/third_party/move/move-compiler-v2/tests/unused-assignment/v1-locals/assign_partial_resource.exp
new file mode 100644
index 0000000000000..7a85759453cee
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/unused-assignment/v1-locals/assign_partial_resource.exp
@@ -0,0 +1,25 @@
+
+Diagnostics:
+warning: Unused assignment to `r`. Consider removing or prefixing with an underscore: `_r`
+  ┌─ tests/unused-assignment/v1-locals/assign_partial_resource.move:6:21
+  │
+6 │         if (cond) { r = R{}; };
+  │                     ^^^^^^^
+
+warning: Unused assignment to `r`. Consider removing or prefixing with an underscore: `_r`
+   ┌─ tests/unused-assignment/v1-locals/assign_partial_resource.move:13:29
+   │
+13 │         if (cond) {} else { r = R{}; };
+   │                             ^^^^^^^
+
+warning: Unused assignment to `r`. Consider removing or prefixing with an underscore: `_r`
+   ┌─ tests/unused-assignment/v1-locals/assign_partial_resource.move:20:24
+   │
+20 │         while (cond) { r = R{} };
+   │                        ^^^^^^^
+
+warning: Unused assignment to `r`. Consider removing or prefixing with an underscore: `_r`
+   ┌─ tests/unused-assignment/v1-locals/assign_partial_resource.move:27:16
+   │
+27 │         loop { r = R{} }
+   │                ^^^^^^^
diff --git a/third_party/move/move-compiler-v2/tests/unused-assignment/v1-locals/assign_partial_resource.move b/third_party/move/move-compiler-v2/tests/unused-assignment/v1-locals/assign_partial_resource.move
new file mode 100644
index 0000000000000..6b77947727f1e
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/unused-assignment/v1-locals/assign_partial_resource.move
@@ -0,0 +1,34 @@
+module 0x8675309::M {
+    struct R {}
+
+    fun t1(cond: bool) {
+        let r: R;
+        if (cond) { r = R{}; };
+        r = R{};
+        R{} = r;
+    }
+
+    fun t2(cond: bool) {
+        let r: R;
+        if (cond) {} else { r = R{}; };
+        r = R{};
+        R{} = r;
+    }
+
+    fun t3(cond: bool) {
+        let r: R;
+        while (cond) { r = R{} };
+        r = R{};
+        R{} = r;
+    }
+
+    fun t4() {
+        let r: R;
+        loop { r = R{} }
+    }
+
+    fun t5<T>(cond: bool, x: T, y: T): (T, T) {
+        if (cond) { x = y };
+        (x, y)
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/unused-assignment/v1-locals/assign_resource.exp b/third_party/move/move-compiler-v2/tests/unused-assignment/v1-locals/assign_resource.exp
new file mode 100644
index 0000000000000..a0ba8ccfbfe60
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/unused-assignment/v1-locals/assign_resource.exp
@@ -0,0 +1,13 @@
+
+Diagnostics:
+warning: Unused assignment to `r`. Consider removing or prefixing with an underscore: `_r`
+  ┌─ tests/unused-assignment/v1-locals/assign_resource.move:5:17
+  │
+5 │         let r = R{};
+  │                 ^^^
+
+warning: Unused assignment to `r`. Consider removing or prefixing with an underscore: `_r`
+   ┌─ tests/unused-assignment/v1-locals/assign_resource.move:29:17
+   │
+29 │         let r = R{};
+   │                 ^^^
diff --git a/third_party/move/move-compiler-v2/tests/unused-assignment/v1-locals/assign_resource.move b/third_party/move/move-compiler-v2/tests/unused-assignment/v1-locals/assign_resource.move
new file mode 100644
index 0000000000000..cd6ace6d63360
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/unused-assignment/v1-locals/assign_resource.move
@@ -0,0 +1,37 @@
+module 0x8675309::M {
+    struct R {}
+
+    fun t0() {
+        let r = R{};
+        r = R{};
+        R{} = r;
+    }
+
+    fun t1(cond: bool) {
+        let r = R{};
+        if (cond) { r = R{}; };
+        R{} = r;
+    }
+
+    fun t2(cond: bool) {
+        let r = R{};
+        if (cond) {} else { r = R{}; };
+        R{} = r;
+    }
+
+    fun t3(cond: bool) {
+        let r = R{};
+        while (cond) { r = R{} };
+        R{} = r;
+    }
+
+    fun t4() {
+        let r = R{};
+        loop { r = R{}; R {} = r }
+    }
+
+    fun t5<T>(x: T, y: T): T {
+        x = y;
+        x
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/unused-assignment/v1-locals/struct_use_before_assign.exp b/third_party/move/move-compiler-v2/tests/unused-assignment/v1-locals/struct_use_before_assign.exp
new file mode 100644
index 0000000000000..e8dbffafd0ea6
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/unused-assignment/v1-locals/struct_use_before_assign.exp
@@ -0,0 +1,131 @@
+
+Diagnostics:
+warning: Unused local variable `z`. Consider removing or prefixing with an underscore: `_z`
+  ┌─ tests/unused-assignment/v1-locals/struct_use_before_assign.move:8:13
+  │
+8 │         let z = y;
+  │             ^
+
+warning: Unused local variable `q`. Consider removing or prefixing with an underscore: `_q`
+  ┌─ tests/unused-assignment/v1-locals/struct_use_before_assign.move:9:13
+  │
+9 │         let q = x;
+  │             ^
+
+warning: Unused local variable `z`. Consider removing or prefixing with an underscore: `_z`
+   ┌─ tests/unused-assignment/v1-locals/struct_use_before_assign.move:17:13
+   │
+17 │         let z = y;
+   │             ^
+
+warning: Unused local variable `q`. Consider removing or prefixing with an underscore: `_q`
+   ┌─ tests/unused-assignment/v1-locals/struct_use_before_assign.move:18:13
+   │
+18 │         let q = x;
+   │             ^
+
+warning: Unused local variable `z`. Consider removing or prefixing with an underscore: `_z`
+   ┌─ tests/unused-assignment/v1-locals/struct_use_before_assign.move:24:13
+   │
+24 │         let z = y;
+   │             ^
+
+warning: Unused local variable `q`. Consider removing or prefixing with an underscore: `_q`
+   ┌─ tests/unused-assignment/v1-locals/struct_use_before_assign.move:25:13
+   │
+25 │         let q = x;
+   │             ^
+
+warning: Unused local variable `z`. Consider removing or prefixing with an underscore: `_z`
+   ┌─ tests/unused-assignment/v1-locals/struct_use_before_assign.move:30:13
+   │
+30 │         let z = y;
+   │             ^
+
+warning: Unused local variable `q`. Consider removing or prefixing with an underscore: `_q`
+   ┌─ tests/unused-assignment/v1-locals/struct_use_before_assign.move:31:13
+   │
+31 │         let q = x;
+   │             ^
+
+
+Diagnostics:
+error: use of unassigned local `g`
+  ┌─ tests/unused-assignment/v1-locals/struct_use_before_assign.move:6:17
+  │
+6 │         let r = R { f: 3, g };
+  │                 ^^^^^^^^^^^^^
+
+error: use of unassigned local `y0`
+   ┌─ tests/unused-assignment/v1-locals/struct_use_before_assign.move:15:17
+   │
+15 │         let r = R { f: x0, g: y0 };
+   │                 ^^^^^^^^^^^^^^^^^^
+
+error: use of unassigned local `r`
+   ┌─ tests/unused-assignment/v1-locals/struct_use_before_assign.move:23:13
+   │
+23 │         let R { f: x, g: y } = r;
+   │             ^^^^^^^^^^^^^^^^
+
+error: use of unassigned local `y`
+   ┌─ tests/unused-assignment/v1-locals/struct_use_before_assign.move:30:17
+   │
+30 │         let z = y;
+   │                 ^
+
+error: use of unassigned local `x`
+   ┌─ tests/unused-assignment/v1-locals/struct_use_before_assign.move:31:17
+   │
+31 │         let q = x;
+   │                 ^
+
+
+Diagnostics:
+warning: Unused assignment to `z`. Consider removing or prefixing with an underscore: `_z`
+  ┌─ tests/unused-assignment/v1-locals/struct_use_before_assign.move:8:17
+  │
+8 │         let z = y;
+  │                 ^
+
+warning: Unused assignment to `q`. Consider removing or prefixing with an underscore: `_q`
+  ┌─ tests/unused-assignment/v1-locals/struct_use_before_assign.move:9:17
+  │
+9 │         let q = x;
+  │                 ^
+
+warning: Unused assignment to `z`. Consider removing or prefixing with an underscore: `_z`
+   ┌─ tests/unused-assignment/v1-locals/struct_use_before_assign.move:17:17
+   │
+17 │         let z = y;
+   │                 ^
+
+warning: Unused assignment to `q`. Consider removing or prefixing with an underscore: `_q`
+   ┌─ tests/unused-assignment/v1-locals/struct_use_before_assign.move:18:17
+   │
+18 │         let q = x;
+   │                 ^
+
+warning: Unused assignment to `z`. Consider removing or prefixing with an underscore: `_z`
+   ┌─ tests/unused-assignment/v1-locals/struct_use_before_assign.move:24:17
+   │
+24 │         let z = y;
+   │                 ^
+
+warning: Unused assignment to `q`. Consider removing or prefixing with an underscore: `_q`
+   ┌─ tests/unused-assignment/v1-locals/struct_use_before_assign.move:25:17
+   │
+25 │         let q = x;
+   │                 ^
+
+warning: Unused assignment to `z`. Consider removing or prefixing with an underscore: `_z`
+   ┌─ tests/unused-assignment/v1-locals/struct_use_before_assign.move:30:17
+   │
+30 │         let z = y;
+   │                 ^
+
+warning: Unused assignment to `q`. Consider removing or prefixing with an underscore: `_q`
+   ┌─ tests/unused-assignment/v1-locals/struct_use_before_assign.move:31:17
+   │
+31 │         let q = x;
+   │                 ^
diff --git a/third_party/move/move-compiler-v2/tests/unused-assignment/v1-locals/struct_use_before_assign.move b/third_party/move/move-compiler-v2/tests/unused-assignment/v1-locals/struct_use_before_assign.move
new file mode 100644
index 0000000000000..8d8997c73852d
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/unused-assignment/v1-locals/struct_use_before_assign.move
@@ -0,0 +1,33 @@
+module 0x876543::M {
+    struct R { f: u64, g: u64 }
+
+    fun main() {
+        let g: u64;
+        let r = R { f: 3, g };
+        let R { f: x, g: y } = r;
+        let z = y;
+        let q = x;
+    }
+
+    fun main2() {
+        let x0: u64 = 0;
+        let y0: u64;
+        let r = R { f: x0, g: y0 };
+        let R { f: x, g: y } = r;
+        let z = y;
+        let q = x;
+    }
+
+    fun main3() {
+        let r: R;
+        let R { f: x, g: y } = r;
+        let z = y;
+        let q = x;
+    }
+
+    fun main4() {
+        let R { f: x, g: y };
+        let z = y;
+        let q = x;
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/unused-assignment/v1-locals/unused_copyable.exp b/third_party/move/move-compiler-v2/tests/unused-assignment/v1-locals/unused_copyable.exp
new file mode 100644
index 0000000000000..2a79d71797f43
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/unused-assignment/v1-locals/unused_copyable.exp
@@ -0,0 +1,27 @@
+
+Diagnostics:
+warning: Unused parameter `i`. Consider removing or prefixing with an underscore: `_i`
+  ┌─ tests/unused-assignment/v1-locals/unused_copyable.move:5:12
+  │
+5 │     fun t0(i: u64, s: S) {
+  │            ^
+
+warning: Unused parameter `s`. Consider removing or prefixing with an underscore: `_s`
+  ┌─ tests/unused-assignment/v1-locals/unused_copyable.move:5:20
+  │
+5 │     fun t0(i: u64, s: S) {
+  │                    ^
+
+warning: Unused local variable `s`. Consider removing or prefixing with an underscore: `_s`
+  ┌─ tests/unused-assignment/v1-locals/unused_copyable.move:9:13
+  │
+9 │         let s = S{};
+  │             ^
+
+
+Diagnostics:
+warning: Unused assignment to `s`. Consider removing or prefixing with an underscore: `_s`
+  ┌─ tests/unused-assignment/v1-locals/unused_copyable.move:9:17
+  │
+9 │         let s = S{};
+  │                 ^^^
diff --git a/third_party/move/move-compiler-v2/tests/unused-assignment/v1-locals/unused_copyable.move b/third_party/move/move-compiler-v2/tests/unused-assignment/v1-locals/unused_copyable.move
new file mode 100644
index 0000000000000..db26cb54321f7
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/unused-assignment/v1-locals/unused_copyable.move
@@ -0,0 +1,16 @@
+module 0x8675309::M {
+    struct S has drop {}
+
+    // this produces unused parameter warnings for i and s, but not unused resource warnings
+    fun t0(i: u64, s: S) {
+    }
+
+    fun t1() {
+        let s = S{};
+    }
+
+    fun t2() {
+        // prefixing an unused non-resource with _ suppresses the warning
+        let _s = S{};
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/unused-assignment/v1-locals/unused_resource.exp b/third_party/move/move-compiler-v2/tests/unused-assignment/v1-locals/unused_resource.exp
new file mode 100644
index 0000000000000..13d05060d21fd
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/unused-assignment/v1-locals/unused_resource.exp
@@ -0,0 +1,45 @@
+
+Diagnostics:
+warning: Unused local variable `r`. Consider removing or prefixing with an underscore: `_r`
+  ┌─ tests/unused-assignment/v1-locals/unused_resource.move:5:13
+  │
+5 │         let r = R{};
+  │             ^
+
+warning: Unused local variable `r`. Consider removing or prefixing with an underscore: `_r`
+   ┌─ tests/unused-assignment/v1-locals/unused_resource.move:29:20
+   │
+29 │         loop { let r = R{}; }
+   │                    ^
+
+
+Diagnostics:
+warning: Unused assignment to `r`. Consider removing or prefixing with an underscore: `_r`
+  ┌─ tests/unused-assignment/v1-locals/unused_resource.move:5:17
+  │
+5 │         let r = R{};
+  │                 ^^^
+
+warning: Unused assignment to `r`. Consider removing or prefixing with an underscore: `_r`
+   ┌─ tests/unused-assignment/v1-locals/unused_resource.move:15:21
+   │
+15 │         if (cond) { r = R{}; };
+   │                     ^^^^^^^
+
+warning: Unused assignment to `r`. Consider removing or prefixing with an underscore: `_r`
+   ┌─ tests/unused-assignment/v1-locals/unused_resource.move:20:29
+   │
+20 │         if (cond) {} else { r = R{}; };
+   │                             ^^^^^^^
+
+warning: Unused assignment to `r`. Consider removing or prefixing with an underscore: `_r`
+   ┌─ tests/unused-assignment/v1-locals/unused_resource.move:25:24
+   │
+25 │         while (cond) { r = R{} };
+   │                        ^^^^^^^
+
+warning: Unused assignment to `r`. Consider removing or prefixing with an underscore: `_r`
+   ┌─ tests/unused-assignment/v1-locals/unused_resource.move:29:24
+   │
+29 │         loop { let r = R{}; }
+   │                        ^^^
diff --git a/third_party/move/move-compiler-v2/tests/unused-assignment/v1-locals/unused_resource.move b/third_party/move/move-compiler-v2/tests/unused-assignment/v1-locals/unused_resource.move
new file mode 100644
index 0000000000000..4121a8c05ea11
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/unused-assignment/v1-locals/unused_resource.move
@@ -0,0 +1,39 @@
+module 0x8675309::M {
+    struct R {}
+
+    fun t0() {
+        let r = R{};
+    }
+
+    fun t1() {
+        // prefixing an unused resource with _ does not work
+        let _r = R{};
+    }
+
+    fun t2(cond: bool) {
+        let r;
+        if (cond) { r = R{}; };
+    }
+
+    fun t3(cond: bool) {
+        let r;
+        if (cond) {} else { r = R{}; };
+    }
+
+    fun t4(cond: bool) {
+        let r;
+        while (cond) { r = R{} };
+    }
+
+    fun t5() {
+        loop { let r = R{}; }
+    }
+
+    fun t6() {
+        let _ = &R{};
+    }
+
+    fun t7<T>(_x: R) {
+    }
+
+}
diff --git a/third_party/move/move-compiler-v2/tests/unused-assignment/v1-locals/unused_resource_explicit_return.exp b/third_party/move/move-compiler-v2/tests/unused-assignment/v1-locals/unused_resource_explicit_return.exp
new file mode 100644
index 0000000000000..8d78b5a05aadb
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/unused-assignment/v1-locals/unused_resource_explicit_return.exp
@@ -0,0 +1,39 @@
+
+Diagnostics:
+warning: Unused local variable `r`. Consider removing or prefixing with an underscore: `_r`
+  ┌─ tests/unused-assignment/v1-locals/unused_resource_explicit_return.move:5:13
+  │
+5 │         let r = R{};
+  │             ^
+
+warning: Unused local variable `r`. Consider removing or prefixing with an underscore: `_r`
+   ┌─ tests/unused-assignment/v1-locals/unused_resource_explicit_return.move:28:13
+   │
+28 │         let r = R{};
+   │             ^
+
+warning: Unused local variable `x`. Consider removing or prefixing with an underscore: `_x`
+   ┌─ tests/unused-assignment/v1-locals/unused_resource_explicit_return.move:33:13
+   │
+33 │         let x = &R{};
+   │             ^
+
+
+Diagnostics:
+warning: Unused assignment to `r`. Consider removing or prefixing with an underscore: `_r`
+  ┌─ tests/unused-assignment/v1-locals/unused_resource_explicit_return.move:5:17
+  │
+5 │         let r = R{};
+  │                 ^^^
+
+warning: Unused assignment to `r`. Consider removing or prefixing with an underscore: `_r`
+   ┌─ tests/unused-assignment/v1-locals/unused_resource_explicit_return.move:28:17
+   │
+28 │         let r = R{};
+   │                 ^^^
+
+warning: Unused assignment to `x`. Consider removing or prefixing with an underscore: `_x`
+   ┌─ tests/unused-assignment/v1-locals/unused_resource_explicit_return.move:33:17
+   │
+33 │         let x = &R{};
+   │                 ^^^^
diff --git a/third_party/move/move-compiler-v2/tests/unused-assignment/v1-locals/unused_resource_explicit_return.move b/third_party/move/move-compiler-v2/tests/unused-assignment/v1-locals/unused_resource_explicit_return.move
new file mode 100644
index 0000000000000..cb70af3240e97
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/unused-assignment/v1-locals/unused_resource_explicit_return.move
@@ -0,0 +1,40 @@
+module 0x8675309::M {
+    struct R {}
+
+    fun t0() {
+        let r = R{};
+        return ()
+    }
+
+    fun t1(cond: bool) {
+        let r = R {};
+        if (cond) { return () };
+        R {} = r;
+    }
+
+    fun t2(cond: bool) {
+        let r = R{};
+        if (cond) {} else { return () };
+        R {} = r;
+    }
+
+    fun t3(cond: bool) {
+        let r = R {};
+        while (cond) { return () };
+        R {} = r;
+    }
+
+    fun t4() {
+        let r = R{};
+        loop { return () }
+    }
+
+    fun t5() {
+        let x = &R{};
+        return ()
+    }
+
+    fun t6<T>(_x: R) {
+        return ()
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/v1.matched b/third_party/move/move-compiler-v2/tests/v1.matched
index b2fcfcea0222b..08c5009b44dbf 100644
--- a/third_party/move/move-compiler-v2/tests/v1.matched
+++ b/third_party/move/move-compiler-v2/tests/v1.matched
@@ -2,25 +2,35 @@ move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/borrow_glob
 move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/borrow_global_acquires_2.exp   move-compiler-v2/tests/acquires-checker/v1-borrow-tests/borrow_global_acquires_2.exp
 move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/borrow_global_acquires_3.exp   move-compiler-v2/tests/acquires-checker/v1-borrow-tests/borrow_global_acquires_3.exp
 move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/borrow_global_acquires_extraneous_annotation.exp   move-compiler-v2/tests/acquires-checker/v1-borrow-tests/borrow_global_acquires_extraneous_annotation.exp
+move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/borrow_global_acquires_invalid_1.exp   move-compiler-v2/tests/reference-safety/v1-borrow-tests/borrow_global_acquires_invalid_1.exp
+move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/borrow_global_acquires_invalid_2.exp   move-compiler-v2/tests/reference-safety/v1-borrow-tests/borrow_global_acquires_invalid_2.exp
+move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/borrow_global_acquires_invalid_3.exp   move-compiler-v2/tests/reference-safety/v1-borrow-tests/borrow_global_acquires_invalid_3.exp
 move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/borrow_global_acquires_invalid_annotation.exp   move-compiler-v2/tests/acquires-checker/v1-borrow-tests/borrow_global_acquires_invalid_annotation.exp
 move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/borrow_global_acquires_missing_annotation.exp   move-compiler-v2/tests/acquires-checker/v1-borrow-tests/borrow_global_acquires_missing_annotation.exp
 move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/borrow_global_acquires_return_reference_1.exp   move-compiler-v2/tests/acquires-checker/v1-borrow-tests/borrow_global_acquires_return_reference_1.exp
 move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/borrow_global_acquires_return_reference_invalid_1.exp   move-compiler-v2/tests/acquires-checker/v1-borrow-tests/borrow_global_acquires_return_reference_invalid_1.exp
+move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/borrow_global_bad0.exp   move-compiler-v2/tests/reference-safety/v1-borrow-tests/borrow_global_bad0.exp
 move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/borrow_global_bad1.exp   move-compiler-v2/tests/reference-safety/v1-borrow-tests/borrow_global_bad1.exp
 move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/borrow_global_bad2.exp   move-compiler-v2/tests/reference-safety/v1-borrow-tests/borrow_global_bad2.exp
 move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/borrow_global_bad5.exp   move-compiler-v2/tests/reference-safety/v1-borrow-tests/borrow_global_bad5.exp
 move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/borrow_global_good.exp   move-compiler-v2/tests/reference-safety/v1-borrow-tests/borrow_global_good.exp
 move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/borrow_if.exp   move-compiler-v2/tests/uninit-use-checker/v1-borrow-tests/borrow_if.exp
 move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/borrow_return_mutable_borrow_bad.exp   move-compiler-v2/tests/reference-safety/v1-borrow-tests/borrow_return_mutable_borrow_bad.exp
+move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/copy_loc_borrowed.exp   move-compiler-v2/tests/reference-safety/v1-borrow-tests/copy_loc_borrowed.exp
+move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/copy_loc_borrowed_field.exp   move-compiler-v2/tests/reference-safety/v1-borrow-tests/copy_loc_borrowed_field.exp
 move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/copy_loc_borrowed_field_invalid.exp   move-compiler-v2/tests/reference-safety/v1-borrow-tests/copy_loc_borrowed_field_invalid.exp
+move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/copy_loc_borrowed_indirect.exp   move-compiler-v2/tests/reference-safety/v1-borrow-tests/copy_loc_borrowed_indirect.exp
 move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/copy_loc_borrowed_indirect_invalid.exp   move-compiler-v2/tests/reference-safety/v1-borrow-tests/copy_loc_borrowed_indirect_invalid.exp
 move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/copy_loc_borrowed_invalid.exp   move-compiler-v2/tests/reference-safety/v1-borrow-tests/copy_loc_borrowed_invalid.exp
 move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/factor_invalid_1.exp   move-compiler-v2/tests/reference-safety/v1-borrow-tests/factor_invalid_1.exp
+move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/factor_invalid_2.exp   move-compiler-v2/tests/reference-safety/v1-borrow-tests/factor_invalid_2.exp
 move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/factor_valid_1.exp   move-compiler-v2/tests/acquires-checker/v1-borrow-tests/factor_valid_1.exp
 move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/imm_borrow_global_invalid.exp   move-compiler-v2/tests/reference-safety/v1-borrow-tests/imm_borrow_global_invalid.exp
 move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/imm_borrow_global_requires_acquire.exp   move-compiler-v2/tests/acquires-checker/v1-borrow-tests/imm_borrow_global_requires_acquire.exp
 move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/imm_borrow_loc.exp   move-compiler-v2/tests/reference-safety/v1-borrow-tests/imm_borrow_loc.exp
+move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/imm_borrow_loc_trivial.exp   move-compiler-v2/tests/reference-safety/v1-borrow-tests/imm_borrow_loc_trivial.exp
 move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/imm_borrow_loc_trivial_valid.exp   move-compiler-v2/tests/reference-safety/v1-borrow-tests/imm_borrow_loc_trivial_valid.exp
+move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/imm_borrow_on_mut.exp   move-compiler-v2/tests/reference-safety/v1-borrow-tests/imm_borrow_on_mut.exp
 move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/imm_borrow_on_mut_invalid.exp   move-compiler-v2/tests/reference-safety/v1-borrow-tests/imm_borrow_on_mut_invalid.exp
 move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/imm_borrow_on_mut_trivial.exp   move-compiler-v2/tests/reference-safety/v1-borrow-tests/imm_borrow_on_mut_trivial.exp
 move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/imm_borrow_on_mut_trivial_invalid.exp   move-compiler-v2/tests/reference-safety/v1-borrow-tests/imm_borrow_on_mut_trivial_invalid.exp
@@ -128,6 +138,7 @@ move-compiler/tests/move_check/translated_ir_tests/move/commands/continue_outsid
 move-compiler/tests/move_check/translated_ir_tests/move/commands/else_assigns_if_doesnt.exp   move-compiler-v2/tests/uninit-use-checker/v1-commands/else_assigns_if_doesnt.exp
 move-compiler/tests/move_check/translated_ir_tests/move/commands/if_assigns_else_doesnt.exp   move-compiler-v2/tests/uninit-use-checker/v1-commands/if_assigns_else_doesnt.exp
 move-compiler/tests/move_check/translated_ir_tests/move/commands/if_assigns_no_else.exp   move-compiler-v2/tests/uninit-use-checker/v1-commands/if_assigns_no_else.exp
+move-compiler/tests/move_check/translated_ir_tests/move/commands/mixed_lvalue.exp   move-compiler-v2/tests/unused-assignment/v1-commands/mixed_lvalue.exp
 move-compiler/tests/move_check/translated_ir_tests/move/commands/move_before_assign.exp   move-compiler-v2/tests/uninit-use-checker/v1-commands/move_before_assign.exp
 move-compiler/tests/move_check/translated_ir_tests/move/commands/no_let_outside_if.exp   move-compiler-v2/tests/checking/typing/v1-commands/no_let_outside_if.exp
 move-compiler/tests/move_check/translated_ir_tests/move/commands/pop_negative.exp   move-compiler-v2/tests/checking/typing/v1-commands/pop_negative.exp
@@ -141,7 +152,23 @@ move-compiler/tests/move_check/translated_ir_tests/move/commands/use_before_assi
 move-compiler/tests/move_check/control_flow/for_loop_empty_novar.exp   move-compiler-v2/tests/checking/control_flow/for_loop_empty_novar.exp
 move-compiler/tests/move_check/control_flow/for_type_mismatch.exp   move-compiler-v2/tests/checking/control_flow/for_type_mismatch.exp
 move-compiler/tests/move_check/control_flow/loop_after_loop.exp   move-compiler-v2/tests/checking/control_flow/loop_after_loop.exp
+move-compiler/tests/move_check/deprecated/deprecated_constant_duplicated_struct.exp   move-compiler-v2/tests/deprecated/deprecated_constant_duplicated_struct.exp
+move-compiler/tests/move_check/deprecated/deprecated_constant_duplicated_struct2.exp   move-compiler-v2/tests/deprecated/deprecated_constant_duplicated_struct2.exp
+move-compiler/tests/move_check/deprecated/deprecated_field_type.exp   move-compiler-v2/tests/deprecated/deprecated_field_type.exp
+move-compiler/tests/move_check/deprecated/deprecated_field_type2.exp   move-compiler-v2/tests/deprecated/deprecated_field_type2.exp
+move-compiler/tests/move_check/deprecated/deprecated_placement_address.exp   move-compiler-v2/tests/deprecated/deprecated_placement_address.exp
+move-compiler/tests/move_check/deprecated/deprecated_placement_address_module_members.exp   move-compiler-v2/tests/deprecated/deprecated_placement_address_module_members.exp
+move-compiler/tests/move_check/deprecated/deprecated_placement_members.exp   move-compiler-v2/tests/deprecated/deprecated_placement_members.exp
+move-compiler/tests/move_check/deprecated/deprecated_placement_module.exp   move-compiler-v2/tests/deprecated/deprecated_placement_module.exp
+move-compiler/tests/move_check/deprecated/deprecated_placement_module2.exp   move-compiler-v2/tests/deprecated/deprecated_placement_module2.exp
+move-compiler/tests/move_check/deprecated/deprecated_placement_module_members.exp   move-compiler-v2/tests/deprecated/deprecated_placement_module_members.exp
+move-compiler/tests/move_check/deprecated/public_script.exp   move-compiler-v2/tests/deprecated/public_script.exp
+move-compiler/tests/move_check/examples/multi_pool_money_market_token.exp   move-compiler-v2/tests/checking/typing/v1-examples/multi_pool_money_market_token.exp
+move-compiler/tests/move_check/examples/simple_money_market_token.exp   move-compiler-v2/tests/checking/typing/v1-examples/simple_money_market_token.exp
+move-compiler/tests/move_check/folding/empty_vectors.exp   move-compiler-v2/tests/folding/empty_vectors.exp
+move-compiler/tests/move_check/folding/empty_vectors2.exp   move-compiler-v2/tests/folding/empty_vectors2.exp
 move-compiler/tests/move_check/folding/non_constant_empty_vec.exp   move-compiler-v2/tests/folding/non_constant_empty_vec.exp
+move-compiler/tests/move_check/folding/nonempty_vectors.exp   move-compiler-v2/tests/folding/nonempty_vectors.exp
 move-compiler/tests/move_check/folding/unfoldable_constants.exp   move-compiler-v2/tests/folding/unfoldable_constants.exp
 move-compiler/tests/move_check/folding/unfoldable_constants_blocks.exp   move-compiler-v2/tests/folding/unfoldable_constants_blocks.exp
 move-compiler/tests/move_check/inlining/acquires_error_msg.exp   move-compiler-v2/tests/checking/inlining/acquires_error_msg.exp
@@ -192,9 +219,16 @@ move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_l
 move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/two_loops.exp   move-compiler-v2/tests/cyclic-instantiation-checker/v1-tests/two_loops.exp
 move-compiler/tests/move_check/liveness/mut_inline.exp   move-compiler-v2/tests/live-var/mut_inline.exp
 move-compiler/tests/move_check/liveness/mut_ref.exp   move-compiler-v2/tests/live-var/mut_ref.exp
+move-compiler/tests/move_check/liveness/unused_assignment.exp   move-compiler-v2/tests/unused-assignment/v1-liveness/unused_assignment.exp
+move-compiler/tests/move_check/locals/assign_partial_resource.exp   move-compiler-v2/tests/unused-assignment/v1-locals/assign_partial_resource.exp
+move-compiler/tests/move_check/locals/assign_resource.exp   move-compiler-v2/tests/unused-assignment/v1-locals/assign_resource.exp
 move-compiler/tests/move_check/locals/drop_conditional.exp   move-compiler-v2/tests/ability-check/v1-locals/drop_conditional.exp
 move-compiler/tests/move_check/locals/eliminate_temps.exp   move-compiler-v2/tests/reference-safety/v1-locals/eliminate_temps.exp
 move-compiler/tests/move_check/locals/reassign_parameter.exp   move-compiler-v2/tests/ability-check/v1-locals/reassign_parameter.exp
+move-compiler/tests/move_check/locals/struct_use_before_assign.exp   move-compiler-v2/tests/unused-assignment/v1-locals/struct_use_before_assign.exp
+move-compiler/tests/move_check/locals/unused_copyable.exp   move-compiler-v2/tests/unused-assignment/v1-locals/unused_copyable.exp
+move-compiler/tests/move_check/locals/unused_resource.exp   move-compiler-v2/tests/unused-assignment/v1-locals/unused_resource.exp
+move-compiler/tests/move_check/locals/unused_resource_explicit_return.exp   move-compiler-v2/tests/unused-assignment/v1-locals/unused_resource_explicit_return.exp
 move-compiler/tests/move_check/locals/use_before_assign_if.exp   move-compiler-v2/tests/uninit-use-checker/v1-locals/use_before_assign_if.exp
 move-compiler/tests/move_check/locals/use_before_assign_if_else.exp   move-compiler-v2/tests/uninit-use-checker/v1-locals/use_before_assign_if_else.exp
 move-compiler/tests/move_check/locals/use_before_assign_loop.exp   move-compiler-v2/tests/uninit-use-checker/v1-locals/use_before_assign_loop.exp
@@ -368,6 +402,7 @@ move-compiler/tests/move_check/typing/constraints_not_satisfied_all_cases.exp
 move-compiler/tests/move_check/typing/constraints_not_satisfied_function_parameter.exp   move-compiler-v2/tests/ability-check/v1-typing/constraints_not_satisfied_function_parameter.exp
 move-compiler/tests/move_check/typing/constraints_not_satisfied_function_return_type.exp   move-compiler-v2/tests/ability-check/v1-typing/constraints_not_satisfied_function_return_type.exp
 move-compiler/tests/move_check/typing/constraints_not_satisfied_lvalues_decl_type.exp   move-compiler-v2/tests/ability-check/v1-typing/constraints_not_satisfied_lvalues_decl_type.exp
+move-compiler/tests/move_check/typing/constraints_not_satisfied_lvalues_pack_type_args.exp   move-compiler-v2/tests/ability-check/v1-typing/constraints_not_satisfied_lvalues_pack_type_args.exp
 move-compiler/tests/move_check/typing/constraints_not_satisfied_struct_field.exp   move-compiler-v2/tests/ability-check/v1-typing/constraints_not_satisfied_struct_field.exp
 move-compiler/tests/move_check/typing/constraints_not_satisfied_type_arguments_internal_call.exp   move-compiler-v2/tests/ability-check/v1-typing/constraints_not_satisfied_type_arguments_internal_call.exp
 move-compiler/tests/move_check/typing/continue_any_type.exp   move-compiler-v2/tests/checking/typing/continue_any_type.exp
@@ -417,6 +452,7 @@ move-compiler/tests/move_check/typing/implicit_deref_borrow_field_non_ref_root.e
 move-compiler/tests/move_check/typing/implicit_deref_borrow_field_not_copyable.exp   move-compiler-v2/tests/ability-check/v1-typing/implicit_deref_borrow_field_not_copyable.exp
 move-compiler/tests/move_check/typing/infinite_instantiations_invalid.exp   move-compiler-v2/tests/cyclic-instantiation-checker/v1-typing/infinite_instantiations_invalid.exp
 move-compiler/tests/move_check/typing/infinite_instantiations_valid.exp   move-compiler-v2/tests/cyclic-instantiation-checker/v1-typing/infinite_instantiations_valid.exp
+move-compiler/tests/move_check/typing/instantiate_signatures.exp   move-compiler-v2/tests/ability-check/v1-typing/instantiate_signatures.exp
 move-compiler/tests/move_check/typing/invalid_type_acquire.exp   move-compiler-v2/tests/checking-lang-v1/v1-typing/invalid_type_acquire.exp
 move-compiler/tests/move_check/typing/lambda.exp   move-compiler-v2/tests/checking/typing/lambda.exp
 move-compiler/tests/move_check/typing/large_binop.exp   move-compiler-v2/tests/checking/typing/large_binop.exp
@@ -446,7 +482,9 @@ move-compiler/tests/move_check/typing/module_call_wrong_argument_in_list.exp   m
 move-compiler/tests/move_check/typing/module_call_wrong_arity.exp   move-compiler-v2/tests/checking/typing/module_call_wrong_arity.exp
 move-compiler/tests/move_check/typing/module_call_wrong_single_argument.exp   move-compiler-v2/tests/checking/typing/module_call_wrong_single_argument.exp
 move-compiler/tests/move_check/typing/move_from_type_argument.exp   move-compiler-v2/tests/checking/typing/move_from_type_argument.exp
+move-compiler/tests/move_check/typing/mutable_borrow_from_immutable.exp   move-compiler-v2/tests/reference-safety/v1-typing/mutable_borrow_from_immutable.exp
 move-compiler/tests/move_check/typing/mutable_eq_and_neq.exp   move-compiler-v2/tests/checking/typing/mutable_eq_and_neq.exp
+move-compiler/tests/move_check/typing/mutable_eq_and_neq_invalid.exp   move-compiler-v2/tests/reference-safety/v1-typing/mutable_eq_and_neq_invalid.exp
 move-compiler/tests/move_check/typing/mutate.exp   move-compiler-v2/tests/checking/typing/mutate.exp
 move-compiler/tests/move_check/typing/mutate_field_internal.exp   move-compiler-v2/tests/checking/typing/mutate_field_internal.exp
 move-compiler/tests/move_check/typing/mutate_immutable.exp   move-compiler-v2/tests/bytecode-generator/v1-typing/mutate_immutable.exp
@@ -472,6 +510,7 @@ move-compiler/tests/move_check/typing/pack_unpack_private_script.exp   move-comp
 move-compiler/tests/move_check/typing/pay_me_a_river.exp   move-compiler-v2/tests/checking/abilities/v1/pay_me_a_river.exp
 move-compiler/tests/move_check/typing/phantom_param_op_abilities.exp   move-compiler-v2/tests/checking/abilities/v1/phantom_param_op_abilities.exp
 move-compiler/tests/move_check/typing/phantom_param_op_abilities_invalid.exp   move-compiler-v2/tests/checking/abilities/v1/phantom_param_op_abilities_invalid.exp
+move-compiler/tests/move_check/typing/phantom_param_struct_decl.exp   move-compiler-v2/tests/checking/typing/phantom_param_struct_decl.exp
 move-compiler/tests/move_check/typing/phantom_param_struct_decl_invalid.exp   move-compiler-v2/tests/ability-check/v1-typing/phantom_param_struct_decl_invalid.exp
 move-compiler/tests/move_check/typing/phantom_params_constraint_abilities.exp   move-compiler-v2/tests/checking/abilities/v1/phantom_params_constraint_abilities.exp
 move-compiler/tests/move_check/typing/phantom_params_constraint_abilities_invalid.exp   move-compiler-v2/tests/checking/abilities/v1/phantom_params_constraint_abilities_invalid.exp
@@ -597,3 +636,12 @@ move-compiler/tests/move_check/unit_test/test_filter_function.exp   move-compile
 move-compiler/tests/move_check/unit_test/test_filter_struct.exp   move-compiler-v2/tests/unit_test/notest/test_filter_struct.exp
 move-compiler/tests/move_check/unit_test/valid_test_module.exp   move-compiler-v2/tests/unit_test/notest/valid_test_module.exp
 move-compiler/tests/move_check/unit_test/valid_test_module.unit_test.exp   move-compiler-v2/tests/unit_test/test/valid_test_module.exp
+move-compiler/tests/move_check/verification/cross_module_invalid.exp   move-compiler-v2/tests/verification/noverify/cross_module_invalid.exp
+move-compiler/tests/move_check/verification/cross_module_valid.exp   move-compiler-v2/tests/verification/noverify/cross_module_valid.exp
+move-compiler/tests/move_check/verification/cross_module_valid.verification.exp   move-compiler-v2/tests/verification/verify/cross_module_valid.exp
+move-compiler/tests/move_check/verification/double_annotation.exp   move-compiler-v2/tests/verification/noverify/double_annotation.exp
+move-compiler/tests/move_check/verification/double_annotation.verification.exp   move-compiler-v2/tests/verification/verify/double_annotation.exp
+move-compiler/tests/move_check/verification/single_module_invalid.exp   move-compiler-v2/tests/verification/noverify/single_module_invalid.exp
+move-compiler/tests/move_check/verification/single_module_invalid.verification.exp   move-compiler-v2/tests/verification/verify/single_module_invalid.exp
+move-compiler/tests/move_check/verification/single_module_valid.exp   move-compiler-v2/tests/verification/noverify/single_module_valid.exp
+move-compiler/tests/move_check/verification/single_module_valid.verification.exp   move-compiler-v2/tests/verification/verify/single_module_valid.exp
diff --git a/third_party/move/move-compiler-v2/tests/v1.unmatched b/third_party/move/move-compiler-v2/tests/v1.unmatched
index 9ef9261891542..3479a58a78b1c 100644
--- a/third_party/move/move-compiler-v2/tests/v1.unmatched
+++ b/third_party/move/move-compiler-v2/tests/v1.unmatched
@@ -1,20 +1,10 @@
 move-compiler/tests/move_check/borrow_tests/{
   borrow_global_acquires_duplicate_annotation.move,
-  borrow_global_acquires_invalid_1.move,
-  borrow_global_acquires_invalid_2.move,
-  borrow_global_acquires_invalid_3.move,
-  borrow_global_bad0.move,
-  copy_loc_borrowed.move,
-  copy_loc_borrowed_field.move,
-  copy_loc_borrowed_indirect.move,
   eq_bad.move,
   eq_ok.move,
-  factor_invalid_2.move,
   factor_valid_2.move,
   imm_borrow_global_lossy_acquire_invalid.move,
-  imm_borrow_loc_trivial.move,
   imm_borrow_loc_valid.move,
-  imm_borrow_on_mut.move,
   mutable_borrow_local_twice_invalid.move,
   writeref_borrow_invalid.move,
 }
@@ -31,7 +21,6 @@ move-compiler/tests/move_check/commands/{
   invalid_fallthrough2.move,
   invalid_fallthrough3.move,
   join_failure.move,
-  mixed_lvalue.move,
   while_move_local.move,
   while_move_local_2.move,
 }
@@ -42,22 +31,7 @@ move-compiler/tests/move_check/control_flow/{
 }
 move-compiler/tests/move_check/deprecated/{
   assert_function.move,
-  deprecated_constant_duplicated_struct.move,
-  deprecated_constant_duplicated_struct2.move,
-  deprecated_field_type.move,
-  deprecated_field_type2.move,
-  deprecated_placement_address.move,
-  deprecated_placement_address_module_members.move,
   deprecated_placement_basecase.move,
-  deprecated_placement_members.move,
-  deprecated_placement_module.move,
-  deprecated_placement_module2.move,
-  deprecated_placement_module_members.move,
-  public_script.move,
-}
-move-compiler/tests/move_check/examples/{
-  multi_pool_money_market_token.move,
-  simple_money_market_token.move,
 }
 move-compiler/tests/move_check/liveness/{
   copy_after_move.move,
@@ -76,15 +50,8 @@ move-compiler/tests/move_check/liveness/{
   move_in_infinite_loop_branched.move,
   trailing_semi.move,
   trailing_semi_loops.move,
-  unused_assignment.move,
 }
 move-compiler/tests/move_check/locals/{
-  assign_partial_resource.move,
-  assign_resource.move,
-  struct_use_before_assign.move,
-  unused_copyable.move,
-  unused_resource.move,
-  unused_resource_explicit_return.move,
   use_after_move_if.move,
   use_after_move_if_else.move,
   use_after_move_loop.move,
@@ -288,24 +255,12 @@ move-compiler/tests/move_check/typing/{
   abort_any_type.move,
   borrow_divergent.move,
   constraints_not_satisfied_lvalues_bind_type.move,
-  constraints_not_satisfied_lvalues_pack_type_args.move,
   constraints_not_satisfied_type_annotation.move,
   constraints_not_satisfied_type_arguments_internal_pack.move,
   declare_pop_resource.move,
-  instantiate_signatures.move,
-  mutable_borrow_from_immutable.move,
-  mutable_eq_and_neq_invalid.move,
   non_phantom_in_phantom_pos.move,
-  phantom_param_struct_decl.move,
   unused_non_phantom_param.move,
 }
 move-compiler/tests/move_check/v2-not-supported/{
   no_receiver_calls.move,
 }
-move-compiler/tests/move_check/verification/{
-  cross_module_invalid.move,
-  cross_module_valid.move,
-  double_annotation.move,
-  single_module_invalid.move,
-  single_module_valid.move,
-}
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/args_with_side_effects.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/args_with_side_effects.exp
index f5e6cf623195e..eb59c1bd4fbf0 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/args_with_side_effects.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/args_with_side_effects.exp
@@ -164,16 +164,14 @@ L2:	loc1: u64
 B0:
 	0: CopyLoc[0](Arg0: u64)
 	1: StLoc[1](loc0: u64)
-	2: LdU64(1)
-	3: StLoc[2](loc1: u64)
-	4: MoveLoc[0](Arg0: u64)
-	5: MoveLoc[2](loc1: u64)
-	6: Add
-	7: StLoc[0](Arg0: u64)
-	8: MoveLoc[1](loc0: u64)
-	9: MoveLoc[0](Arg0: u64)
-	10: Call add(u64, u64): u64
-	11: Ret
+	2: MoveLoc[0](Arg0: u64)
+	3: LdU64(1)
+	4: Add
+	5: StLoc[0](Arg0: u64)
+	6: MoveLoc[1](loc0: u64)
+	7: MoveLoc[0](Arg0: u64)
+	8: Call add(u64, u64): u64
+	9: Ret
 }
 }
 ============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/args_with_side_effects.opt.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/args_with_side_effects.opt.exp
index f5e6cf623195e..eb59c1bd4fbf0 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/args_with_side_effects.opt.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/args_with_side_effects.opt.exp
@@ -164,16 +164,14 @@ L2:	loc1: u64
 B0:
 	0: CopyLoc[0](Arg0: u64)
 	1: StLoc[1](loc0: u64)
-	2: LdU64(1)
-	3: StLoc[2](loc1: u64)
-	4: MoveLoc[0](Arg0: u64)
-	5: MoveLoc[2](loc1: u64)
-	6: Add
-	7: StLoc[0](Arg0: u64)
-	8: MoveLoc[1](loc0: u64)
-	9: MoveLoc[0](Arg0: u64)
-	10: Call add(u64, u64): u64
-	11: Ret
+	2: MoveLoc[0](Arg0: u64)
+	3: LdU64(1)
+	4: Add
+	5: StLoc[0](Arg0: u64)
+	6: MoveLoc[1](loc0: u64)
+	7: MoveLoc[0](Arg0: u64)
+	8: Call add(u64, u64): u64
+	9: Ret
 }
 }
 ============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/borrowed_var.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/borrowed_var.exp
index 8a45711f3a46a..95104220eaeb7 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/borrowed_var.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/borrowed_var.exp
@@ -144,19 +144,13 @@ B0:
 	0: LdU64(5)
 	1: StLoc[0](loc0: u64)
 	2: ImmBorrowLoc[0](loc0: u64)
-	3: StLoc[1](loc1: &u64)
-	4: MoveLoc[1](loc1: &u64)
-	5: Pop
-	6: ImmBorrowLoc[0](loc0: u64)
-	7: StLoc[1](loc1: &u64)
-	8: MoveLoc[1](loc1: &u64)
-	9: StLoc[2](loc2: &u64)
-	10: MoveLoc[2](loc2: &u64)
-	11: ReadRef
-	12: LdU64(5)
-	13: Eq
-	14: Pop
-	15: Ret
+	3: Pop
+	4: ImmBorrowLoc[0](loc0: u64)
+	5: ReadRef
+	6: LdU64(5)
+	7: Eq
+	8: Pop
+	9: Ret
 }
 }
 ============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/borrowed_var.opt.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/borrowed_var.opt.exp
index a965c2cc62ec0..6b10a489c154c 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/borrowed_var.opt.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/borrowed_var.opt.exp
@@ -156,21 +156,15 @@ B0:
 	0: LdU64(5)
 	1: StLoc[0](loc0: u64)
 	2: ImmBorrowLoc[0](loc0: u64)
-	3: StLoc[1](loc1: &u64)
-	4: MoveLoc[1](loc1: &u64)
-	5: Pop
-	6: LdU64(5)
-	7: StLoc[2](loc2: u64)
-	8: ImmBorrowLoc[2](loc2: u64)
-	9: StLoc[1](loc1: &u64)
-	10: MoveLoc[1](loc1: &u64)
-	11: StLoc[3](loc3: &u64)
-	12: MoveLoc[3](loc3: &u64)
-	13: ReadRef
-	14: LdU64(5)
-	15: Eq
-	16: Pop
-	17: Ret
+	3: Pop
+	4: LdU64(5)
+	5: StLoc[2](loc2: u64)
+	6: ImmBorrowLoc[2](loc2: u64)
+	7: ReadRef
+	8: LdU64(5)
+	9: Eq
+	10: Pop
+	11: Ret
 }
 }
 ============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/branch_1.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/branch_1.exp
index de6e28e6987f7..2e5629760616b 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/branch_1.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/branch_1.exp
@@ -136,12 +136,10 @@ B1:
 	3: StLoc[1](Arg1: u64)
 	4: Branch(5)
 B2:
-	5: LdU64(1)
-	6: StLoc[2](loc0: u64)
-	7: MoveLoc[1](Arg1: u64)
-	8: MoveLoc[2](loc0: u64)
-	9: Add
-	10: Ret
+	5: MoveLoc[1](Arg1: u64)
+	6: LdU64(1)
+	7: Add
+	8: Ret
 }
 }
 ============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/branch_1.opt.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/branch_1.opt.exp
index de6e28e6987f7..2e5629760616b 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/branch_1.opt.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/branch_1.opt.exp
@@ -136,12 +136,10 @@ B1:
 	3: StLoc[1](Arg1: u64)
 	4: Branch(5)
 B2:
-	5: LdU64(1)
-	6: StLoc[2](loc0: u64)
-	7: MoveLoc[1](Arg1: u64)
-	8: MoveLoc[2](loc0: u64)
-	9: Add
-	10: Ret
+	5: MoveLoc[1](Arg1: u64)
+	6: LdU64(1)
+	7: Add
+	8: Ret
 }
 }
 ============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/branch_assigns_then_moves_then_assigns.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/branch_assigns_then_moves_then_assigns.exp
index 79c5859bbe98a..5b22258442d59 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/branch_assigns_then_moves_then_assigns.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/branch_assigns_then_moves_then_assigns.exp
@@ -249,19 +249,17 @@ B2:
 	5: LdU64(0)
 	6: StLoc[0](loc0: u64)
 B3:
-	7: LdU64(5)
-	8: StLoc[1](loc1: u64)
-	9: MoveLoc[0](loc0: u64)
-	10: MoveLoc[1](loc1: u64)
-	11: Eq
-	12: BrFalse(14)
+	7: MoveLoc[0](loc0: u64)
+	8: LdU64(5)
+	9: Eq
+	10: BrFalse(12)
 B4:
-	13: Branch(16)
+	11: Branch(14)
 B5:
-	14: LdU64(42)
-	15: Abort
+	12: LdU64(42)
+	13: Abort
 B6:
-	16: Ret
+	14: Ret
 }
 }
 ============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/branch_assigns_then_moves_then_assigns.opt.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/branch_assigns_then_moves_then_assigns.opt.exp
index 79c5859bbe98a..5b22258442d59 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/branch_assigns_then_moves_then_assigns.opt.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/branch_assigns_then_moves_then_assigns.opt.exp
@@ -249,19 +249,17 @@ B2:
 	5: LdU64(0)
 	6: StLoc[0](loc0: u64)
 B3:
-	7: LdU64(5)
-	8: StLoc[1](loc1: u64)
-	9: MoveLoc[0](loc0: u64)
-	10: MoveLoc[1](loc1: u64)
-	11: Eq
-	12: BrFalse(14)
+	7: MoveLoc[0](loc0: u64)
+	8: LdU64(5)
+	9: Eq
+	10: BrFalse(12)
 B4:
-	13: Branch(16)
+	11: Branch(14)
 B5:
-	14: LdU64(42)
-	15: Abort
+	12: LdU64(42)
+	13: Abort
 B6:
-	16: Ret
+	14: Ret
 }
 }
 ============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/bug_12068.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/bug_12068.exp
index 8461312378afe..86876e8a62aa4 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/bug_12068.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/bug_12068.exp
@@ -222,31 +222,27 @@ B0:
 	0: LdU64(0)
 	1: StLoc[0](loc0: u64)
 	2: LdTrue
-	3: BrFalse(11)
+	3: BrFalse(9)
 B1:
-	4: LdU64(1)
-	5: StLoc[1](loc1: u64)
-	6: MoveLoc[0](loc0: u64)
-	7: MoveLoc[1](loc1: u64)
-	8: Add
-	9: StLoc[0](loc0: u64)
-	10: Branch(12)
+	4: MoveLoc[0](loc0: u64)
+	5: LdU64(1)
+	6: Add
+	7: StLoc[0](loc0: u64)
+	8: Branch(10)
 B2:
-	11: Branch(12)
+	9: Branch(10)
 B3:
-	12: LdU64(1)
-	13: StLoc[1](loc1: u64)
-	14: MoveLoc[0](loc0: u64)
-	15: MoveLoc[1](loc1: u64)
-	16: Eq
-	17: BrFalse(19)
+	10: MoveLoc[0](loc0: u64)
+	11: LdU64(1)
+	12: Eq
+	13: BrFalse(15)
 B4:
-	18: Branch(21)
+	14: Branch(17)
 B5:
-	19: LdU64(42)
-	20: Abort
+	15: LdU64(42)
+	16: Abort
 B6:
-	21: Ret
+	17: Ret
 }
 }
 ============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/bug_12068.opt.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/bug_12068.opt.exp
index 8461312378afe..86876e8a62aa4 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/bug_12068.opt.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/bug_12068.opt.exp
@@ -222,31 +222,27 @@ B0:
 	0: LdU64(0)
 	1: StLoc[0](loc0: u64)
 	2: LdTrue
-	3: BrFalse(11)
+	3: BrFalse(9)
 B1:
-	4: LdU64(1)
-	5: StLoc[1](loc1: u64)
-	6: MoveLoc[0](loc0: u64)
-	7: MoveLoc[1](loc1: u64)
-	8: Add
-	9: StLoc[0](loc0: u64)
-	10: Branch(12)
+	4: MoveLoc[0](loc0: u64)
+	5: LdU64(1)
+	6: Add
+	7: StLoc[0](loc0: u64)
+	8: Branch(10)
 B2:
-	11: Branch(12)
+	9: Branch(10)
 B3:
-	12: LdU64(1)
-	13: StLoc[1](loc1: u64)
-	14: MoveLoc[0](loc0: u64)
-	15: MoveLoc[1](loc1: u64)
-	16: Eq
-	17: BrFalse(19)
+	10: MoveLoc[0](loc0: u64)
+	11: LdU64(1)
+	12: Eq
+	13: BrFalse(15)
 B4:
-	18: Branch(21)
+	14: Branch(17)
 B5:
-	19: LdU64(42)
-	20: Abort
+	15: LdU64(42)
+	16: Abort
 B6:
-	21: Ret
+	17: Ret
 }
 }
 ============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/call_1.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/call_1.exp
index 8cb6654d0e563..3f4ff64c3e1c9 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/call_1.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/call_1.exp
@@ -33,6 +33,14 @@ fun m::test($t0: u64): u64 {
   6: return $t1
 }
 
+
+Diagnostics:
+warning: Unused assignment to `a`. Consider removing or prefixing with an underscore: `_a`
+  ┌─ tests/variable-coalescing/call_1.move:7:17
+  │
+7 │         let a = p;
+  │                 ^
+
 ============ after DeadStoreElimination: ================
 
 [variant baseline]
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/call_1.opt.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/call_1.opt.exp
index 8cb6654d0e563..3f4ff64c3e1c9 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/call_1.opt.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/call_1.opt.exp
@@ -33,6 +33,14 @@ fun m::test($t0: u64): u64 {
   6: return $t1
 }
 
+
+Diagnostics:
+warning: Unused assignment to `a`. Consider removing or prefixing with an underscore: `_a`
+  ┌─ tests/variable-coalescing/call_1.move:7:17
+  │
+7 │         let a = p;
+  │                 ^
+
 ============ after DeadStoreElimination: ================
 
 [variant baseline]
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/cant_coalesce_1.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/cant_coalesce_1.exp
index c15fb7fa2d8ce..c3193e31baca1 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/cant_coalesce_1.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/cant_coalesce_1.exp
@@ -19,6 +19,14 @@ public fun m::test($t0: u64): u64 {
   3: return $t1
 }
 
+
+Diagnostics:
+warning: Unused assignment to `x`. Consider removing or prefixing with an underscore: `_x`
+  ┌─ tests/variable-coalescing/cant_coalesce_1.move:3:17
+  │
+3 │         let x = a + a;
+  │                 ^^^^^
+
 ============ after DeadStoreElimination: ================
 
 [variant baseline]
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/cant_coalesce_1.opt.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/cant_coalesce_1.opt.exp
index 0421981781a4e..fbea2c056a83b 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/cant_coalesce_1.opt.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/cant_coalesce_1.opt.exp
@@ -17,6 +17,14 @@ public fun m::test($t0: u64): u64 {
   2: return $t1
 }
 
+
+Diagnostics:
+warning: Unused assignment to `x`. Consider removing or prefixing with an underscore: `_x`
+  ┌─ tests/variable-coalescing/cant_coalesce_1.move:3:17
+  │
+3 │         let x = a + a;
+  │                 ^^^^^
+
 ============ after DeadStoreElimination: ================
 
 [variant baseline]
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/cant_copy_propagate.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/cant_copy_propagate.exp
index 714466fd830f4..797553d0ab0c1 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/cant_copy_propagate.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/cant_copy_propagate.exp
@@ -31,6 +31,20 @@ fun m::test($t0: u64, $t1: bool) {
  13: return ()
 }
 
+
+Diagnostics:
+warning: Unused assignment to `a`. Consider removing or prefixing with an underscore: `_a`
+   ┌─ tests/variable-coalescing/cant_copy_propagate.move:11:13
+   │
+11 │             a = 99;
+   │             ^^^^^^
+
+warning: Unused assignment to `c`. Consider removing or prefixing with an underscore: `_c`
+   ┌─ tests/variable-coalescing/cant_copy_propagate.move:13:13
+   │
+13 │             c = c + 1;
+   │             ^^^^^^^^^
+
 ============ after DeadStoreElimination: ================
 
 [variant baseline]
@@ -181,16 +195,14 @@ B0:
 B1:
 	2: MoveLoc[0](Arg0: u64)
 	3: Call consume(u64)
-	4: Branch(11)
+	4: Branch(9)
 B2:
-	5: LdU64(1)
-	6: StLoc[2](loc0: u64)
-	7: MoveLoc[0](Arg0: u64)
-	8: MoveLoc[2](loc0: u64)
-	9: Add
-	10: Pop
+	5: MoveLoc[0](Arg0: u64)
+	6: LdU64(1)
+	7: Add
+	8: Pop
 B3:
-	11: Ret
+	9: Ret
 }
 }
 ============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/cant_copy_propagate.opt.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/cant_copy_propagate.opt.exp
index 714466fd830f4..797553d0ab0c1 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/cant_copy_propagate.opt.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/cant_copy_propagate.opt.exp
@@ -31,6 +31,20 @@ fun m::test($t0: u64, $t1: bool) {
  13: return ()
 }
 
+
+Diagnostics:
+warning: Unused assignment to `a`. Consider removing or prefixing with an underscore: `_a`
+   ┌─ tests/variable-coalescing/cant_copy_propagate.move:11:13
+   │
+11 │             a = 99;
+   │             ^^^^^^
+
+warning: Unused assignment to `c`. Consider removing or prefixing with an underscore: `_c`
+   ┌─ tests/variable-coalescing/cant_copy_propagate.move:13:13
+   │
+13 │             c = c + 1;
+   │             ^^^^^^^^^
+
 ============ after DeadStoreElimination: ================
 
 [variant baseline]
@@ -181,16 +195,14 @@ B0:
 B1:
 	2: MoveLoc[0](Arg0: u64)
 	3: Call consume(u64)
-	4: Branch(11)
+	4: Branch(9)
 B2:
-	5: LdU64(1)
-	6: StLoc[2](loc0: u64)
-	7: MoveLoc[0](Arg0: u64)
-	8: MoveLoc[2](loc0: u64)
-	9: Add
-	10: Pop
+	5: MoveLoc[0](Arg0: u64)
+	6: LdU64(1)
+	7: Add
+	8: Pop
 B3:
-	11: Ret
+	9: Ret
 }
 }
 ============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/conditional.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/conditional.exp
index 87baa0b16e9c5..923c511f2f301 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/conditional.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/conditional.exp
@@ -144,25 +144,21 @@ L2:	loc1: u64
 L3:	loc2: u64
 B0:
 	0: LdU64(2)
-	1: MoveLoc[0](Arg0: bool)
-	2: StLoc[0](Arg0: bool)
-	3: StLoc[1](loc0: u64)
-	4: MoveLoc[0](Arg0: bool)
-	5: BrFalse(9)
+	1: StLoc[1](loc0: u64)
+	2: MoveLoc[0](Arg0: bool)
+	3: BrFalse(7)
 B1:
-	6: LdU64(3)
-	7: StLoc[2](loc1: u64)
-	8: Branch(15)
+	4: LdU64(3)
+	5: StLoc[2](loc1: u64)
+	6: Branch(11)
 B2:
-	9: LdU64(1)
-	10: StLoc[3](loc2: u64)
-	11: MoveLoc[1](loc0: u64)
-	12: MoveLoc[3](loc2: u64)
-	13: Add
-	14: StLoc[2](loc1: u64)
+	7: MoveLoc[1](loc0: u64)
+	8: LdU64(1)
+	9: Add
+	10: StLoc[2](loc1: u64)
 B3:
-	15: MoveLoc[2](loc1: u64)
-	16: Ret
+	11: MoveLoc[2](loc1: u64)
+	12: Ret
 }
 }
 ============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/consume_1.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/consume_1.exp
index ab7c97f7a44e7..2f685d7e7352d 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/consume_1.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/consume_1.exp
@@ -326,12 +326,10 @@ public test2(Arg0: u64) /* def_idx: 3 */ {
 L1:	loc0: u64
 B0:
 	0: CopyLoc[0](Arg0: u64)
-	1: StLoc[1](loc0: u64)
-	2: MoveLoc[1](loc0: u64)
+	1: Call consume(u64)
+	2: MoveLoc[0](Arg0: u64)
 	3: Call consume(u64)
-	4: MoveLoc[0](Arg0: u64)
-	5: Call consume(u64)
-	6: Ret
+	4: Ret
 }
 public test3(Arg0: W) /* def_idx: 4 */ {
 L1:	loc0: W
@@ -348,12 +346,10 @@ public test4(Arg0: W) /* def_idx: 5 */ {
 L1:	loc0: W
 B0:
 	0: CopyLoc[0](Arg0: W)
-	1: StLoc[1](loc0: W)
-	2: MoveLoc[1](loc0: W)
+	1: Call consume_(W)
+	2: MoveLoc[0](Arg0: W)
 	3: Call consume_(W)
-	4: MoveLoc[0](Arg0: W)
-	5: Call consume_(W)
-	6: Ret
+	4: Ret
 }
 }
 ============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/consume_1.opt.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/consume_1.opt.exp
index ab7c97f7a44e7..2f685d7e7352d 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/consume_1.opt.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/consume_1.opt.exp
@@ -326,12 +326,10 @@ public test2(Arg0: u64) /* def_idx: 3 */ {
 L1:	loc0: u64
 B0:
 	0: CopyLoc[0](Arg0: u64)
-	1: StLoc[1](loc0: u64)
-	2: MoveLoc[1](loc0: u64)
+	1: Call consume(u64)
+	2: MoveLoc[0](Arg0: u64)
 	3: Call consume(u64)
-	4: MoveLoc[0](Arg0: u64)
-	5: Call consume(u64)
-	6: Ret
+	4: Ret
 }
 public test3(Arg0: W) /* def_idx: 4 */ {
 L1:	loc0: W
@@ -348,12 +346,10 @@ public test4(Arg0: W) /* def_idx: 5 */ {
 L1:	loc0: W
 B0:
 	0: CopyLoc[0](Arg0: W)
-	1: StLoc[1](loc0: W)
-	2: MoveLoc[1](loc0: W)
+	1: Call consume_(W)
+	2: MoveLoc[0](Arg0: W)
 	3: Call consume_(W)
-	4: MoveLoc[0](Arg0: W)
-	5: Call consume_(W)
-	6: Ret
+	4: Ret
 }
 }
 ============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/consume_2.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/consume_2.exp
index b799b997faf13..2f06956cfca9e 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/consume_2.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/consume_2.exp
@@ -216,12 +216,10 @@ public test2(Arg0: W) /* def_idx: 3 */ {
 L1:	loc0: W
 B0:
 	0: CopyLoc[0](Arg0: W)
-	1: StLoc[1](loc0: W)
-	2: MoveLoc[1](loc0: W)
+	1: Call consume_(W)
+	2: MoveLoc[0](Arg0: W)
 	3: Call consume_(W)
-	4: MoveLoc[0](Arg0: W)
-	5: Call consume_(W)
-	6: Ret
+	4: Ret
 }
 }
 ============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/consume_2.opt.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/consume_2.opt.exp
index b799b997faf13..2f06956cfca9e 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/consume_2.opt.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/consume_2.opt.exp
@@ -216,12 +216,10 @@ public test2(Arg0: W) /* def_idx: 3 */ {
 L1:	loc0: W
 B0:
 	0: CopyLoc[0](Arg0: W)
-	1: StLoc[1](loc0: W)
-	2: MoveLoc[1](loc0: W)
+	1: Call consume_(W)
+	2: MoveLoc[0](Arg0: W)
 	3: Call consume_(W)
-	4: MoveLoc[0](Arg0: W)
-	5: Call consume_(W)
-	6: Ret
+	4: Ret
 }
 }
 ============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/consume_3.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/consume_3.exp
index 65e69a5f90eab..606dd277acd0c 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/consume_3.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/consume_3.exp
@@ -201,23 +201,19 @@ public test(Arg0: u32) /* def_idx: 2 */ {
 L1:	loc0: u32
 B0:
 	0: CopyLoc[0](Arg0: u32)
-	1: StLoc[1](loc0: u32)
-	2: MoveLoc[1](loc0: u32)
+	1: Call consume(u32)
+	2: MoveLoc[0](Arg0: u32)
 	3: Call consume(u32)
-	4: MoveLoc[0](Arg0: u32)
-	5: Call consume(u32)
-	6: Ret
+	4: Ret
 }
 public test_(Arg0: W) /* def_idx: 3 */ {
 L1:	loc0: W
 B0:
 	0: CopyLoc[0](Arg0: W)
-	1: StLoc[1](loc0: W)
-	2: MoveLoc[1](loc0: W)
+	1: Call consume_(W)
+	2: MoveLoc[0](Arg0: W)
 	3: Call consume_(W)
-	4: MoveLoc[0](Arg0: W)
-	5: Call consume_(W)
-	6: Ret
+	4: Ret
 }
 }
 ============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/consume_3.opt.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/consume_3.opt.exp
index 65e69a5f90eab..606dd277acd0c 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/consume_3.opt.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/consume_3.opt.exp
@@ -201,23 +201,19 @@ public test(Arg0: u32) /* def_idx: 2 */ {
 L1:	loc0: u32
 B0:
 	0: CopyLoc[0](Arg0: u32)
-	1: StLoc[1](loc0: u32)
-	2: MoveLoc[1](loc0: u32)
+	1: Call consume(u32)
+	2: MoveLoc[0](Arg0: u32)
 	3: Call consume(u32)
-	4: MoveLoc[0](Arg0: u32)
-	5: Call consume(u32)
-	6: Ret
+	4: Ret
 }
 public test_(Arg0: W) /* def_idx: 3 */ {
 L1:	loc0: W
 B0:
 	0: CopyLoc[0](Arg0: W)
-	1: StLoc[1](loc0: W)
-	2: MoveLoc[1](loc0: W)
+	1: Call consume_(W)
+	2: MoveLoc[0](Arg0: W)
 	3: Call consume_(W)
-	4: MoveLoc[0](Arg0: W)
-	5: Call consume_(W)
-	6: Ret
+	4: Ret
 }
 }
 ============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/consume_4.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/consume_4.exp
index e1ea8e5518654..0c6d1f781f678 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/consume_4.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/consume_4.exp
@@ -223,23 +223,19 @@ public test(Arg0: u32) /* def_idx: 2 */ {
 L1:	loc0: u32
 B0:
 	0: CopyLoc[0](Arg0: u32)
-	1: StLoc[1](loc0: u32)
-	2: MoveLoc[1](loc0: u32)
+	1: Call consume(u32)
+	2: MoveLoc[0](Arg0: u32)
 	3: Call consume(u32)
-	4: MoveLoc[0](Arg0: u32)
-	5: Call consume(u32)
-	6: Ret
+	4: Ret
 }
 public test_struct(Arg0: W) /* def_idx: 3 */ {
 L1:	loc0: W
 B0:
 	0: CopyLoc[0](Arg0: W)
-	1: StLoc[1](loc0: W)
-	2: MoveLoc[1](loc0: W)
+	1: Call consume_(W)
+	2: MoveLoc[0](Arg0: W)
 	3: Call consume_(W)
-	4: MoveLoc[0](Arg0: W)
-	5: Call consume_(W)
-	6: Ret
+	4: Ret
 }
 }
 ============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/consume_4.opt.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/consume_4.opt.exp
index e1ea8e5518654..0c6d1f781f678 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/consume_4.opt.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/consume_4.opt.exp
@@ -223,23 +223,19 @@ public test(Arg0: u32) /* def_idx: 2 */ {
 L1:	loc0: u32
 B0:
 	0: CopyLoc[0](Arg0: u32)
-	1: StLoc[1](loc0: u32)
-	2: MoveLoc[1](loc0: u32)
+	1: Call consume(u32)
+	2: MoveLoc[0](Arg0: u32)
 	3: Call consume(u32)
-	4: MoveLoc[0](Arg0: u32)
-	5: Call consume(u32)
-	6: Ret
+	4: Ret
 }
 public test_struct(Arg0: W) /* def_idx: 3 */ {
 L1:	loc0: W
 B0:
 	0: CopyLoc[0](Arg0: W)
-	1: StLoc[1](loc0: W)
-	2: MoveLoc[1](loc0: W)
+	1: Call consume_(W)
+	2: MoveLoc[0](Arg0: W)
 	3: Call consume_(W)
-	4: MoveLoc[0](Arg0: W)
-	5: Call consume_(W)
-	6: Ret
+	4: Ret
 }
 }
 ============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/consume_5.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/consume_5.exp
index 5be2286c87db9..e85dc3bd778ff 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/consume_5.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/consume_5.exp
@@ -405,17 +405,16 @@ B2:
 	8: Call consume(u32)
 B3:
 	9: MoveLoc[0](Arg0: bool)
-	10: Not
-	11: BrFalse(15)
+	10: BrTrue(14)
 B4:
-	12: MoveLoc[1](Arg1: u32)
-	13: Call consume(u32)
-	14: Branch(17)
+	11: MoveLoc[1](Arg1: u32)
+	12: Call consume(u32)
+	13: Branch(16)
 B5:
-	15: MoveLoc[2](loc0: u32)
-	16: Call consume(u32)
+	14: MoveLoc[2](loc0: u32)
+	15: Call consume(u32)
 B6:
-	17: Ret
+	16: Ret
 }
 public test_struct(Arg0: bool, Arg1: W) /* def_idx: 3 */ {
 L2:	loc0: W
@@ -424,31 +423,26 @@ B0:
 	0: CopyLoc[1](Arg1: W)
 	1: StLoc[2](loc0: W)
 	2: CopyLoc[0](Arg0: bool)
-	3: BrFalse(9)
+	3: BrFalse(7)
 B1:
 	4: CopyLoc[2](loc0: W)
-	5: StLoc[3](loc1: W)
-	6: MoveLoc[3](loc1: W)
-	7: Call consume_(W)
-	8: Branch(13)
+	5: Call consume_(W)
+	6: Branch(9)
 B2:
-	9: CopyLoc[1](Arg1: W)
-	10: StLoc[3](loc1: W)
-	11: MoveLoc[3](loc1: W)
-	12: Call consume_(W)
+	7: CopyLoc[1](Arg1: W)
+	8: Call consume_(W)
 B3:
-	13: MoveLoc[0](Arg0: bool)
-	14: Not
-	15: BrFalse(19)
+	9: MoveLoc[0](Arg0: bool)
+	10: BrTrue(14)
 B4:
-	16: MoveLoc[1](Arg1: W)
-	17: Call consume_(W)
-	18: Branch(21)
+	11: MoveLoc[1](Arg1: W)
+	12: Call consume_(W)
+	13: Branch(16)
 B5:
-	19: MoveLoc[2](loc0: W)
-	20: Call consume_(W)
+	14: MoveLoc[2](loc0: W)
+	15: Call consume_(W)
 B6:
-	21: Ret
+	16: Ret
 }
 }
 ============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/consume_5.opt.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/consume_5.opt.exp
index 5be2286c87db9..e85dc3bd778ff 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/consume_5.opt.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/consume_5.opt.exp
@@ -405,17 +405,16 @@ B2:
 	8: Call consume(u32)
 B3:
 	9: MoveLoc[0](Arg0: bool)
-	10: Not
-	11: BrFalse(15)
+	10: BrTrue(14)
 B4:
-	12: MoveLoc[1](Arg1: u32)
-	13: Call consume(u32)
-	14: Branch(17)
+	11: MoveLoc[1](Arg1: u32)
+	12: Call consume(u32)
+	13: Branch(16)
 B5:
-	15: MoveLoc[2](loc0: u32)
-	16: Call consume(u32)
+	14: MoveLoc[2](loc0: u32)
+	15: Call consume(u32)
 B6:
-	17: Ret
+	16: Ret
 }
 public test_struct(Arg0: bool, Arg1: W) /* def_idx: 3 */ {
 L2:	loc0: W
@@ -424,31 +423,26 @@ B0:
 	0: CopyLoc[1](Arg1: W)
 	1: StLoc[2](loc0: W)
 	2: CopyLoc[0](Arg0: bool)
-	3: BrFalse(9)
+	3: BrFalse(7)
 B1:
 	4: CopyLoc[2](loc0: W)
-	5: StLoc[3](loc1: W)
-	6: MoveLoc[3](loc1: W)
-	7: Call consume_(W)
-	8: Branch(13)
+	5: Call consume_(W)
+	6: Branch(9)
 B2:
-	9: CopyLoc[1](Arg1: W)
-	10: StLoc[3](loc1: W)
-	11: MoveLoc[3](loc1: W)
-	12: Call consume_(W)
+	7: CopyLoc[1](Arg1: W)
+	8: Call consume_(W)
 B3:
-	13: MoveLoc[0](Arg0: bool)
-	14: Not
-	15: BrFalse(19)
+	9: MoveLoc[0](Arg0: bool)
+	10: BrTrue(14)
 B4:
-	16: MoveLoc[1](Arg1: W)
-	17: Call consume_(W)
-	18: Branch(21)
+	11: MoveLoc[1](Arg1: W)
+	12: Call consume_(W)
+	13: Branch(16)
 B5:
-	19: MoveLoc[2](loc0: W)
-	20: Call consume_(W)
+	14: MoveLoc[2](loc0: W)
+	15: Call consume_(W)
 B6:
-	21: Ret
+	16: Ret
 }
 }
 ============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/cyclic_assignment_without_use.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/cyclic_assignment_without_use.exp
index 1be5d8b6fc8ed..e6a15a35a4e75 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/cyclic_assignment_without_use.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/cyclic_assignment_without_use.exp
@@ -12,6 +12,14 @@ public fun m::test($t0: u64) {
   4: return ()
 }
 
+
+Diagnostics:
+warning: Unused assignment to `a`. Consider removing or prefixing with an underscore: `_a`
+  ┌─ tests/variable-coalescing/cyclic_assignment_without_use.move:6:9
+  │
+6 │         a = c;
+  │         ^^^^^
+
 ============ after DeadStoreElimination: ================
 
 [variant baseline]
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/cyclic_assignment_without_use.opt.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/cyclic_assignment_without_use.opt.exp
index 1be5d8b6fc8ed..e6a15a35a4e75 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/cyclic_assignment_without_use.opt.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/cyclic_assignment_without_use.opt.exp
@@ -12,6 +12,14 @@ public fun m::test($t0: u64) {
   4: return ()
 }
 
+
+Diagnostics:
+warning: Unused assignment to `a`. Consider removing or prefixing with an underscore: `_a`
+  ┌─ tests/variable-coalescing/cyclic_assignment_without_use.move:6:9
+  │
+6 │         a = c;
+  │         ^^^^^
+
 ============ after DeadStoreElimination: ================
 
 [variant baseline]
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/cyclic_assignments.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/cyclic_assignments.exp
index e7bb1111ab30a..6a5b5d0f8d8ff 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/cyclic_assignments.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/cyclic_assignments.exp
@@ -86,11 +86,7 @@ cyclic(Arg0: u64): u64 /* def_idx: 0 */ {
 L1:	loc0: u64
 B0:
 	0: MoveLoc[0](Arg0: u64)
-	1: StLoc[1](loc0: u64)
-	2: MoveLoc[1](loc0: u64)
-	3: StLoc[0](Arg0: u64)
-	4: MoveLoc[0](Arg0: u64)
-	5: Ret
+	1: Ret
 }
 }
 ============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/cyclic_assignments.opt.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/cyclic_assignments.opt.exp
index e7bb1111ab30a..6a5b5d0f8d8ff 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/cyclic_assignments.opt.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/cyclic_assignments.opt.exp
@@ -86,11 +86,7 @@ cyclic(Arg0: u64): u64 /* def_idx: 0 */ {
 L1:	loc0: u64
 B0:
 	0: MoveLoc[0](Arg0: u64)
-	1: StLoc[1](loc0: u64)
-	2: MoveLoc[1](loc0: u64)
-	3: StLoc[0](Arg0: u64)
-	4: MoveLoc[0](Arg0: u64)
-	5: Ret
+	1: Ret
 }
 }
 ============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/cyclic_dead_store.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/cyclic_dead_store.exp
index 467e6fdde809e..8e58be7614c71 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/cyclic_dead_store.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/cyclic_dead_store.exp
@@ -316,25 +316,19 @@ B1:
 	2: CopyLoc[3](loc0: u64)
 	3: CopyLoc[0](Arg0: u64)
 	4: Lt
-	5: BrFalse(17)
+	5: BrFalse(11)
 B2:
-	6: MoveLoc[2](Arg2: u64)
-	7: StLoc[1](Arg1: u64)
-	8: MoveLoc[1](Arg1: u64)
-	9: StLoc[2](Arg2: u64)
-	10: LdU64(1)
-	11: StLoc[1](Arg1: u64)
-	12: MoveLoc[3](loc0: u64)
-	13: MoveLoc[1](Arg1: u64)
-	14: Add
-	15: StLoc[3](loc0: u64)
-	16: Branch(18)
+	6: MoveLoc[3](loc0: u64)
+	7: LdU64(1)
+	8: Add
+	9: StLoc[3](loc0: u64)
+	10: Branch(12)
 B3:
-	17: Branch(19)
+	11: Branch(13)
 B4:
-	18: Branch(2)
+	12: Branch(2)
 B5:
-	19: Ret
+	13: Ret
 }
 public test2(Arg0: u64, Arg1: u64) /* def_idx: 1 */ {
 L2:	loc0: u64
@@ -345,21 +339,19 @@ B1:
 	2: CopyLoc[1](Arg1: u64)
 	3: CopyLoc[0](Arg0: u64)
 	4: Lt
-	5: BrFalse(13)
+	5: BrFalse(11)
 B2:
-	6: LdU64(1)
-	7: StLoc[2](loc0: u64)
-	8: MoveLoc[1](Arg1: u64)
-	9: MoveLoc[2](loc0: u64)
-	10: Add
-	11: StLoc[1](Arg1: u64)
-	12: Branch(14)
+	6: MoveLoc[1](Arg1: u64)
+	7: LdU64(1)
+	8: Add
+	9: StLoc[1](Arg1: u64)
+	10: Branch(12)
 B3:
-	13: Branch(15)
+	11: Branch(13)
 B4:
-	14: Branch(2)
+	12: Branch(2)
 B5:
-	15: Ret
+	13: Ret
 }
 }
 ============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/cyclic_dead_store.opt.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/cyclic_dead_store.opt.exp
index 467e6fdde809e..8e58be7614c71 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/cyclic_dead_store.opt.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/cyclic_dead_store.opt.exp
@@ -316,25 +316,19 @@ B1:
 	2: CopyLoc[3](loc0: u64)
 	3: CopyLoc[0](Arg0: u64)
 	4: Lt
-	5: BrFalse(17)
+	5: BrFalse(11)
 B2:
-	6: MoveLoc[2](Arg2: u64)
-	7: StLoc[1](Arg1: u64)
-	8: MoveLoc[1](Arg1: u64)
-	9: StLoc[2](Arg2: u64)
-	10: LdU64(1)
-	11: StLoc[1](Arg1: u64)
-	12: MoveLoc[3](loc0: u64)
-	13: MoveLoc[1](Arg1: u64)
-	14: Add
-	15: StLoc[3](loc0: u64)
-	16: Branch(18)
+	6: MoveLoc[3](loc0: u64)
+	7: LdU64(1)
+	8: Add
+	9: StLoc[3](loc0: u64)
+	10: Branch(12)
 B3:
-	17: Branch(19)
+	11: Branch(13)
 B4:
-	18: Branch(2)
+	12: Branch(2)
 B5:
-	19: Ret
+	13: Ret
 }
 public test2(Arg0: u64, Arg1: u64) /* def_idx: 1 */ {
 L2:	loc0: u64
@@ -345,21 +339,19 @@ B1:
 	2: CopyLoc[1](Arg1: u64)
 	3: CopyLoc[0](Arg0: u64)
 	4: Lt
-	5: BrFalse(13)
+	5: BrFalse(11)
 B2:
-	6: LdU64(1)
-	7: StLoc[2](loc0: u64)
-	8: MoveLoc[1](Arg1: u64)
-	9: MoveLoc[2](loc0: u64)
-	10: Add
-	11: StLoc[1](Arg1: u64)
-	12: Branch(14)
+	6: MoveLoc[1](Arg1: u64)
+	7: LdU64(1)
+	8: Add
+	9: StLoc[1](Arg1: u64)
+	10: Branch(12)
 B3:
-	13: Branch(15)
+	11: Branch(13)
 B4:
-	14: Branch(2)
+	12: Branch(2)
 B5:
-	15: Ret
+	13: Ret
 }
 }
 ============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/dead_assignment_3.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/dead_assignment_3.exp
index 2ab2fd8b365f9..8eb1d0beecd06 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/dead_assignment_3.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/dead_assignment_3.exp
@@ -20,6 +20,14 @@ public fun m::test($t0: bool): u32 {
  12: return $t1
 }
 
+
+Diagnostics:
+warning: Unused assignment to `y`. Consider removing or prefixing with an underscore: `_y`
+   ┌─ tests/variable-coalescing/dead_assignment_3.move:10:13
+   │
+10 │             y = y;
+   │             ^^^^^
+
 ============ after DeadStoreElimination: ================
 
 [variant baseline]
@@ -122,21 +130,19 @@ L1:	loc0: u32
 L2:	loc1: u32
 B0:
 	0: LdU32(1)
-	1: MoveLoc[0](Arg0: bool)
-	2: StLoc[0](Arg0: bool)
-	3: StLoc[1](loc0: u32)
-	4: MoveLoc[0](Arg0: bool)
-	5: BrFalse(9)
+	1: StLoc[1](loc0: u32)
+	2: MoveLoc[0](Arg0: bool)
+	3: BrFalse(7)
 B1:
-	6: MoveLoc[1](loc0: u32)
-	7: StLoc[2](loc1: u32)
-	8: Branch(11)
+	4: MoveLoc[1](loc0: u32)
+	5: StLoc[2](loc1: u32)
+	6: Branch(9)
 B2:
-	9: LdU32(9)
-	10: StLoc[2](loc1: u32)
+	7: LdU32(9)
+	8: StLoc[2](loc1: u32)
 B3:
-	11: MoveLoc[2](loc1: u32)
-	12: Ret
+	9: MoveLoc[2](loc1: u32)
+	10: Ret
 }
 }
 ============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/dead_assignment_3.opt.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/dead_assignment_3.opt.exp
index 10501d30e9943..08e147032f0cc 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/dead_assignment_3.opt.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/dead_assignment_3.opt.exp
@@ -18,6 +18,14 @@ public fun m::test($t0: bool): u32 {
  11: return $t1
 }
 
+
+Diagnostics:
+warning: Unused assignment to `y`. Consider removing or prefixing with an underscore: `_y`
+   ┌─ tests/variable-coalescing/dead_assignment_3.move:10:13
+   │
+10 │             y = y;
+   │             ^^^^^
+
 ============ after DeadStoreElimination: ================
 
 [variant baseline]
@@ -111,21 +119,19 @@ L1:	loc0: u32
 L2:	loc1: u32
 B0:
 	0: LdU32(1)
-	1: MoveLoc[0](Arg0: bool)
-	2: StLoc[0](Arg0: bool)
-	3: StLoc[1](loc0: u32)
-	4: MoveLoc[0](Arg0: bool)
-	5: BrFalse(9)
+	1: StLoc[1](loc0: u32)
+	2: MoveLoc[0](Arg0: bool)
+	3: BrFalse(7)
 B1:
-	6: MoveLoc[1](loc0: u32)
-	7: StLoc[2](loc1: u32)
-	8: Branch(11)
+	4: MoveLoc[1](loc0: u32)
+	5: StLoc[2](loc1: u32)
+	6: Branch(9)
 B2:
-	9: LdU32(9)
-	10: StLoc[2](loc1: u32)
+	7: LdU32(9)
+	8: StLoc[2](loc1: u32)
 B3:
-	11: MoveLoc[2](loc1: u32)
-	12: Ret
+	9: MoveLoc[2](loc1: u32)
+	10: Ret
 }
 }
 ============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/dead_assignment_4.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/dead_assignment_4.exp
index 4dac314323337..970a6b84ab094 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/dead_assignment_4.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/dead_assignment_4.exp
@@ -67,6 +67,26 @@ public fun m::test4($t0: u64): u64 {
   2: return $t1
 }
 
+
+Diagnostics:
+warning: Unused assignment to `x`. Consider removing or prefixing with an underscore: `_x`
+  ┌─ tests/variable-coalescing/dead_assignment_4.move:3:17
+  │
+3 │         let x = 1;
+  │                 ^
+
+warning: Unused assignment to `x`. Consider removing or prefixing with an underscore: `_x`
+  ┌─ tests/variable-coalescing/dead_assignment_4.move:9:17
+  │
+9 │         let x = y;
+  │                 ^
+
+warning: Unused assignment to `x`. Consider removing or prefixing with an underscore: `_x`
+   ┌─ tests/variable-coalescing/dead_assignment_4.move:14:17
+   │
+14 │         let x = y;
+   │                 ^
+
 ============ after DeadStoreElimination: ================
 
 [variant baseline]
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/dead_assignment_4.opt.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/dead_assignment_4.opt.exp
index 6a523fee558e2..c4b4326890f8a 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/dead_assignment_4.opt.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/dead_assignment_4.opt.exp
@@ -61,6 +61,20 @@ public fun m::test4($t0: u64): u64 {
   1: return $t1
 }
 
+
+Diagnostics:
+warning: Unused assignment to `x`. Consider removing or prefixing with an underscore: `_x`
+  ┌─ tests/variable-coalescing/dead_assignment_4.move:9:17
+  │
+9 │         let x = y;
+  │                 ^
+
+warning: Unused assignment to `x`. Consider removing or prefixing with an underscore: `_x`
+   ┌─ tests/variable-coalescing/dead_assignment_4.move:14:17
+   │
+14 │         let x = y;
+   │                 ^
+
 ============ after DeadStoreElimination: ================
 
 [variant baseline]
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/immut_refs_2.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/immut_refs_2.exp
index aef9456582cdc..154ea1d90c925 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/immut_refs_2.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/immut_refs_2.exp
@@ -23,6 +23,14 @@ fun m::test($t0: u64): u64 {
   5: return $t1
 }
 
+
+Diagnostics:
+warning: Unused assignment to `a`. Consider removing or prefixing with an underscore: `_a`
+  ┌─ tests/variable-coalescing/immut_refs_2.move:4:17
+  │
+4 │         let a = &p;
+  │                 ^^
+
 ============ after DeadStoreElimination: ================
 
 [variant baseline]
@@ -117,13 +125,9 @@ L1:	loc0: &u64
 L2:	loc1: u64
 B0:
 	0: ImmBorrowLoc[0](Arg0: u64)
-	1: StLoc[1](loc0: &u64)
-	2: MoveLoc[1](loc0: &u64)
-	3: Pop
-	4: MoveLoc[0](Arg0: u64)
-	5: StLoc[2](loc1: u64)
-	6: MoveLoc[2](loc1: u64)
-	7: Ret
+	1: Pop
+	2: MoveLoc[0](Arg0: u64)
+	3: Ret
 }
 }
 ============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/immut_refs_2.opt.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/immut_refs_2.opt.exp
index aef9456582cdc..154ea1d90c925 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/immut_refs_2.opt.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/immut_refs_2.opt.exp
@@ -23,6 +23,14 @@ fun m::test($t0: u64): u64 {
   5: return $t1
 }
 
+
+Diagnostics:
+warning: Unused assignment to `a`. Consider removing or prefixing with an underscore: `_a`
+  ┌─ tests/variable-coalescing/immut_refs_2.move:4:17
+  │
+4 │         let a = &p;
+  │                 ^^
+
 ============ after DeadStoreElimination: ================
 
 [variant baseline]
@@ -117,13 +125,9 @@ L1:	loc0: &u64
 L2:	loc1: u64
 B0:
 	0: ImmBorrowLoc[0](Arg0: u64)
-	1: StLoc[1](loc0: &u64)
-	2: MoveLoc[1](loc0: &u64)
-	3: Pop
-	4: MoveLoc[0](Arg0: u64)
-	5: StLoc[2](loc1: u64)
-	6: MoveLoc[2](loc1: u64)
-	7: Ret
+	1: Pop
+	2: MoveLoc[0](Arg0: u64)
+	3: Ret
 }
 }
 ============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/intermingled_1.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/intermingled_1.exp
index 8ad92bf681375..017a90bb91874 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/intermingled_1.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/intermingled_1.exp
@@ -16,6 +16,14 @@ fun m::test(): u64 {
   6: return $t0
 }
 
+
+Diagnostics:
+warning: Unused assignment to `t`. Consider removing or prefixing with an underscore: `_t`
+  ┌─ tests/variable-coalescing/intermingled_1.move:5:9
+  │
+5 │         t = t + u;
+  │         ^^^^^^^^^
+
 ============ after DeadStoreElimination: ================
 
 [variant baseline]
@@ -112,14 +120,12 @@ B0:
 	3: CopyLoc[0](loc0: u64)
 	4: Add
 	5: CopyLoc[0](loc0: u64)
-	6: StLoc[1](loc1: u64)
-	7: MoveLoc[1](loc1: u64)
-	8: MoveLoc[0](loc0: u64)
-	9: Add
-	10: StLoc[0](loc0: u64)
-	11: Pop
-	12: MoveLoc[0](loc0: u64)
-	13: Ret
+	6: MoveLoc[0](loc0: u64)
+	7: Add
+	8: StLoc[0](loc0: u64)
+	9: Pop
+	10: MoveLoc[0](loc0: u64)
+	11: Ret
 }
 }
 ============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/intermingled_1.opt.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/intermingled_1.opt.exp
index c8d8e9c9ea66b..1669a1b36c2a9 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/intermingled_1.opt.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/intermingled_1.opt.exp
@@ -14,6 +14,14 @@ fun m::test(): u64 {
   5: return $t0
 }
 
+
+Diagnostics:
+warning: Unused assignment to `t`. Consider removing or prefixing with an underscore: `_t`
+  ┌─ tests/variable-coalescing/intermingled_1.move:5:9
+  │
+5 │         t = t + u;
+  │         ^^^^^^^^^
+
 ============ after DeadStoreElimination: ================
 
 [variant baseline]
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/intermingled_2.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/intermingled_2.exp
index 675e4b1a4960c..e96b4b2606af0 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/intermingled_2.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/intermingled_2.exp
@@ -129,15 +129,13 @@ B0:
 	2: LdU64(1)
 	3: StLoc[0](loc0: u64)
 	4: StLoc[1](loc1: u64)
-	5: StLoc[2](loc2: u64)
-	6: MoveLoc[2](loc2: u64)
-	7: MoveLoc[0](loc0: u64)
-	8: Add
-	9: StLoc[2](loc2: u64)
-	10: MoveLoc[1](loc1: u64)
-	11: MoveLoc[2](loc2: u64)
-	12: Add
-	13: Ret
+	5: MoveLoc[0](loc0: u64)
+	6: Add
+	7: StLoc[2](loc2: u64)
+	8: MoveLoc[1](loc1: u64)
+	9: MoveLoc[2](loc2: u64)
+	10: Add
+	11: Ret
 }
 }
 ============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/intermingled_3.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/intermingled_3.exp
index 5d50b3f39fdac..3430fdcadc2db 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/intermingled_3.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/intermingled_3.exp
@@ -18,6 +18,14 @@ fun m::test(): u64 {
   7: return $t0
 }
 
+
+Diagnostics:
+warning: Unused assignment to `t`. Consider removing or prefixing with an underscore: `_t`
+  ┌─ tests/variable-coalescing/intermingled_3.move:5:9
+  │
+5 │         t = t + 1;
+  │         ^^^^^^^^^
+
 ============ after DeadStoreElimination: ================
 
 [variant baseline]
@@ -122,15 +130,11 @@ B0:
 	2: LdU64(1)
 	3: StLoc[0](loc0: u64)
 	4: StLoc[1](loc1: u64)
-	5: StLoc[2](loc2: u64)
-	6: MoveLoc[2](loc2: u64)
-	7: MoveLoc[0](loc0: u64)
-	8: Add
-	9: MoveLoc[1](loc1: u64)
-	10: StLoc[1](loc1: u64)
-	11: Pop
-	12: MoveLoc[1](loc1: u64)
-	13: Ret
+	5: MoveLoc[0](loc0: u64)
+	6: Add
+	7: Pop
+	8: MoveLoc[1](loc1: u64)
+	9: Ret
 }
 }
 ============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/intermingled_3.opt.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/intermingled_3.opt.exp
index dd35312daf6a4..4a5daedbda24a 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/intermingled_3.opt.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/intermingled_3.opt.exp
@@ -14,6 +14,14 @@ fun m::test(): u64 {
   5: return $t0
 }
 
+
+Diagnostics:
+warning: Unused assignment to `t`. Consider removing or prefixing with an underscore: `_t`
+  ┌─ tests/variable-coalescing/intermingled_3.move:5:9
+  │
+5 │         t = t + 1;
+  │         ^^^^^^^^^
+
 ============ after DeadStoreElimination: ================
 
 [variant baseline]
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/loop_1.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/loop_1.exp
index d483a330b93f6..94fa224018e22 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/loop_1.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/loop_1.exp
@@ -203,29 +203,25 @@ B0:
 	2: StLoc[1](loc0: u64)
 	3: StLoc[2](loc1: u64)
 B1:
-	4: LdU64(10)
-	5: StLoc[3](loc2: u64)
-	6: CopyLoc[1](loc0: u64)
-	7: MoveLoc[3](loc2: u64)
-	8: Lt
-	9: BrFalse(19)
+	4: CopyLoc[1](loc0: u64)
+	5: LdU64(10)
+	6: Lt
+	7: BrFalse(15)
 B2:
-	10: CopyLoc[0](Arg0: u64)
-	11: StLoc[2](loc1: u64)
-	12: LdU64(1)
-	13: StLoc[3](loc2: u64)
-	14: MoveLoc[1](loc0: u64)
-	15: MoveLoc[3](loc2: u64)
-	16: Add
-	17: StLoc[1](loc0: u64)
-	18: Branch(20)
+	8: CopyLoc[0](Arg0: u64)
+	9: StLoc[2](loc1: u64)
+	10: MoveLoc[1](loc0: u64)
+	11: LdU64(1)
+	12: Add
+	13: StLoc[1](loc0: u64)
+	14: Branch(16)
 B3:
-	19: Branch(21)
+	15: Branch(17)
 B4:
-	20: Branch(4)
+	16: Branch(4)
 B5:
-	21: MoveLoc[2](loc1: u64)
-	22: Ret
+	17: MoveLoc[2](loc1: u64)
+	18: Ret
 }
 }
 ============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/loop_1.opt.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/loop_1.opt.exp
index d483a330b93f6..94fa224018e22 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/loop_1.opt.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/loop_1.opt.exp
@@ -203,29 +203,25 @@ B0:
 	2: StLoc[1](loc0: u64)
 	3: StLoc[2](loc1: u64)
 B1:
-	4: LdU64(10)
-	5: StLoc[3](loc2: u64)
-	6: CopyLoc[1](loc0: u64)
-	7: MoveLoc[3](loc2: u64)
-	8: Lt
-	9: BrFalse(19)
+	4: CopyLoc[1](loc0: u64)
+	5: LdU64(10)
+	6: Lt
+	7: BrFalse(15)
 B2:
-	10: CopyLoc[0](Arg0: u64)
-	11: StLoc[2](loc1: u64)
-	12: LdU64(1)
-	13: StLoc[3](loc2: u64)
-	14: MoveLoc[1](loc0: u64)
-	15: MoveLoc[3](loc2: u64)
-	16: Add
-	17: StLoc[1](loc0: u64)
-	18: Branch(20)
+	8: CopyLoc[0](Arg0: u64)
+	9: StLoc[2](loc1: u64)
+	10: MoveLoc[1](loc0: u64)
+	11: LdU64(1)
+	12: Add
+	13: StLoc[1](loc0: u64)
+	14: Branch(16)
 B3:
-	19: Branch(21)
+	15: Branch(17)
 B4:
-	20: Branch(4)
+	16: Branch(4)
 B5:
-	21: MoveLoc[2](loc1: u64)
-	22: Ret
+	17: MoveLoc[2](loc1: u64)
+	18: Ret
 }
 }
 ============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/loop_2.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/loop_2.exp
index 2e9f50fb4673f..221427d022bc5 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/loop_2.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/loop_2.exp
@@ -203,29 +203,25 @@ B0:
 	2: LdU64(0)
 	3: StLoc[2](loc1: u64)
 B1:
-	4: LdU64(10)
-	5: StLoc[3](loc2: u64)
-	6: CopyLoc[2](loc1: u64)
-	7: MoveLoc[3](loc2: u64)
-	8: Lt
-	9: BrFalse(19)
+	4: CopyLoc[2](loc1: u64)
+	5: LdU64(10)
+	6: Lt
+	7: BrFalse(15)
 B2:
-	10: CopyLoc[0](Arg0: u64)
-	11: StLoc[1](loc0: u64)
-	12: LdU64(1)
-	13: StLoc[3](loc2: u64)
-	14: MoveLoc[2](loc1: u64)
-	15: MoveLoc[3](loc2: u64)
-	16: Add
-	17: StLoc[2](loc1: u64)
-	18: Branch(20)
+	8: CopyLoc[0](Arg0: u64)
+	9: StLoc[1](loc0: u64)
+	10: MoveLoc[2](loc1: u64)
+	11: LdU64(1)
+	12: Add
+	13: StLoc[2](loc1: u64)
+	14: Branch(16)
 B3:
-	19: Branch(21)
+	15: Branch(17)
 B4:
-	20: Branch(4)
+	16: Branch(4)
 B5:
-	21: MoveLoc[1](loc0: u64)
-	22: Ret
+	17: MoveLoc[1](loc0: u64)
+	18: Ret
 }
 }
 ============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/loop_2.opt.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/loop_2.opt.exp
index 2e9f50fb4673f..221427d022bc5 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/loop_2.opt.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/loop_2.opt.exp
@@ -203,29 +203,25 @@ B0:
 	2: LdU64(0)
 	3: StLoc[2](loc1: u64)
 B1:
-	4: LdU64(10)
-	5: StLoc[3](loc2: u64)
-	6: CopyLoc[2](loc1: u64)
-	7: MoveLoc[3](loc2: u64)
-	8: Lt
-	9: BrFalse(19)
+	4: CopyLoc[2](loc1: u64)
+	5: LdU64(10)
+	6: Lt
+	7: BrFalse(15)
 B2:
-	10: CopyLoc[0](Arg0: u64)
-	11: StLoc[1](loc0: u64)
-	12: LdU64(1)
-	13: StLoc[3](loc2: u64)
-	14: MoveLoc[2](loc1: u64)
-	15: MoveLoc[3](loc2: u64)
-	16: Add
-	17: StLoc[2](loc1: u64)
-	18: Branch(20)
+	8: CopyLoc[0](Arg0: u64)
+	9: StLoc[1](loc0: u64)
+	10: MoveLoc[2](loc1: u64)
+	11: LdU64(1)
+	12: Add
+	13: StLoc[2](loc1: u64)
+	14: Branch(16)
 B3:
-	19: Branch(21)
+	15: Branch(17)
 B4:
-	20: Branch(4)
+	16: Branch(4)
 B5:
-	21: MoveLoc[1](loc0: u64)
-	22: Ret
+	17: MoveLoc[1](loc0: u64)
+	18: Ret
 }
 }
 ============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/multi_assigns.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/multi_assigns.exp
index 487f77be960ef..23af347b74613 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/multi_assigns.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/multi_assigns.exp
@@ -12,6 +12,14 @@ fun m::test(): u64 {
   4: return $t0
 }
 
+
+Diagnostics:
+warning: Unused assignment to `x`. Consider removing or prefixing with an underscore: `_x`
+  ┌─ tests/variable-coalescing/multi_assigns.move:3:17
+  │
+3 │         let x = 1;
+  │                 ^
+
 ============ after DeadStoreElimination: ================
 
 [variant baseline]
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/multi_assigns.opt.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/multi_assigns.opt.exp
index 487f77be960ef..23af347b74613 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/multi_assigns.opt.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/multi_assigns.opt.exp
@@ -12,6 +12,14 @@ fun m::test(): u64 {
   4: return $t0
 }
 
+
+Diagnostics:
+warning: Unused assignment to `x`. Consider removing or prefixing with an underscore: `_x`
+  ┌─ tests/variable-coalescing/multi_assigns.move:3:17
+  │
+3 │         let x = 1;
+  │                 ^
+
 ============ after DeadStoreElimination: ================
 
 [variant baseline]
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/non_overlapping_vars1.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/non_overlapping_vars1.exp
index 754941c708880..e15966fe20563 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/non_overlapping_vars1.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/non_overlapping_vars1.exp
@@ -19,6 +19,20 @@ fun m::test() {
   8: return ()
 }
 
+
+Diagnostics:
+warning: Unused assignment to `x`. Consider removing or prefixing with an underscore: `_x`
+  ┌─ tests/variable-coalescing/non_overlapping_vars1.move:4:9
+  │
+4 │         x = x + 1;
+  │         ^^^^^^^^^
+
+warning: Unused assignment to `y`. Consider removing or prefixing with an underscore: `_y`
+  ┌─ tests/variable-coalescing/non_overlapping_vars1.move:6:9
+  │
+6 │         y = y + 1;
+  │         ^^^^^^^^^
+
 ============ after DeadStoreElimination: ================
 
 [variant baseline]
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/non_overlapping_vars1.opt.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/non_overlapping_vars1.opt.exp
index 754941c708880..e15966fe20563 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/non_overlapping_vars1.opt.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/non_overlapping_vars1.opt.exp
@@ -19,6 +19,20 @@ fun m::test() {
   8: return ()
 }
 
+
+Diagnostics:
+warning: Unused assignment to `x`. Consider removing or prefixing with an underscore: `_x`
+  ┌─ tests/variable-coalescing/non_overlapping_vars1.move:4:9
+  │
+4 │         x = x + 1;
+  │         ^^^^^^^^^
+
+warning: Unused assignment to `y`. Consider removing or prefixing with an underscore: `_y`
+  ┌─ tests/variable-coalescing/non_overlapping_vars1.move:6:9
+  │
+6 │         y = y + 1;
+  │         ^^^^^^^^^
+
 ============ after DeadStoreElimination: ================
 
 [variant baseline]
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/non_overlapping_vars_diff_type.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/non_overlapping_vars_diff_type.exp
index b7f839ff0a194..ad657705a8322 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/non_overlapping_vars_diff_type.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/non_overlapping_vars_diff_type.exp
@@ -19,6 +19,20 @@ fun m::test() {
   8: return ()
 }
 
+
+Diagnostics:
+warning: Unused assignment to `x`. Consider removing or prefixing with an underscore: `_x`
+  ┌─ tests/variable-coalescing/non_overlapping_vars_diff_type.move:4:9
+  │
+4 │         x = x + 1;
+  │         ^^^^^^^^^
+
+warning: Unused assignment to `y`. Consider removing or prefixing with an underscore: `_y`
+  ┌─ tests/variable-coalescing/non_overlapping_vars_diff_type.move:6:9
+  │
+6 │         y = y + 1;
+  │         ^^^^^^^^^
+
 ============ after DeadStoreElimination: ================
 
 [variant baseline]
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/non_overlapping_vars_diff_type.opt.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/non_overlapping_vars_diff_type.opt.exp
index b7f839ff0a194..ad657705a8322 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/non_overlapping_vars_diff_type.opt.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/non_overlapping_vars_diff_type.opt.exp
@@ -19,6 +19,20 @@ fun m::test() {
   8: return ()
 }
 
+
+Diagnostics:
+warning: Unused assignment to `x`. Consider removing or prefixing with an underscore: `_x`
+  ┌─ tests/variable-coalescing/non_overlapping_vars_diff_type.move:4:9
+  │
+4 │         x = x + 1;
+  │         ^^^^^^^^^
+
+warning: Unused assignment to `y`. Consider removing or prefixing with an underscore: `_y`
+  ┌─ tests/variable-coalescing/non_overlapping_vars_diff_type.move:6:9
+  │
+6 │         y = y + 1;
+  │         ^^^^^^^^^
+
 ============ after DeadStoreElimination: ================
 
 [variant baseline]
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/overlapping_vars.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/overlapping_vars.exp
index 4ce45efbf53dd..42d3547d56e0b 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/overlapping_vars.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/overlapping_vars.exp
@@ -110,14 +110,10 @@ B0:
 	1: LdU64(2)
 	2: LdU64(3)
 	3: StLoc[0](loc0: u64)
-	4: StLoc[1](loc1: u64)
-	5: StLoc[2](loc2: u64)
-	6: MoveLoc[2](loc2: u64)
-	7: MoveLoc[1](loc1: u64)
-	8: Add
-	9: MoveLoc[0](loc0: u64)
-	10: Add
-	11: Ret
+	4: Add
+	5: MoveLoc[0](loc0: u64)
+	6: Add
+	7: Ret
 }
 }
 ============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/reassigned_var.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/reassigned_var.exp
index 5a165b49ca4ca..a7a192cb48679 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/reassigned_var.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/reassigned_var.exp
@@ -14,6 +14,14 @@ fun m::test(): u64 {
   5: return $t0
 }
 
+
+Diagnostics:
+warning: Unused assignment to `a`. Consider removing or prefixing with an underscore: `_a`
+  ┌─ tests/variable-coalescing/reassigned_var.move:3:17
+  │
+3 │         let a = 1;
+  │                 ^
+
 ============ after DeadStoreElimination: ================
 
 [variant baseline]
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/reassigned_var.opt.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/reassigned_var.opt.exp
index 23428eb311af1..0bff15a1e37e6 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/reassigned_var.opt.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/reassigned_var.opt.exp
@@ -14,6 +14,14 @@ fun m::test(): u64 {
   5: return $t0
 }
 
+
+Diagnostics:
+warning: Unused assignment to `a`. Consider removing or prefixing with an underscore: `_a`
+  ┌─ tests/variable-coalescing/reassigned_var.move:3:17
+  │
+3 │         let a = 1;
+  │                 ^
+
 ============ after DeadStoreElimination: ================
 
 [variant baseline]
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/self_assigns.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/self_assigns.exp
index 22650ed85bc01..41172b0fec2f3 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/self_assigns.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/self_assigns.exp
@@ -75,6 +75,14 @@ public fun m::test4($t0: u64): u64 {
  17: return $t1
 }
 
+
+Diagnostics:
+warning: Unused assignment to `x`. Consider removing or prefixing with an underscore: `_x`
+  ┌─ tests/variable-coalescing/self_assigns.move:3:9
+  │
+3 │         x = x;
+  │         ^^^^^
+
 ============ after DeadStoreElimination: ================
 
 [variant baseline]
@@ -451,27 +459,23 @@ B0:
 	2: StLoc[0](loc0: u64)
 	3: StLoc[1](loc1: u64)
 B1:
-	4: LdU64(42)
-	5: StLoc[2](loc2: u64)
-	6: CopyLoc[1](loc1: u64)
-	7: MoveLoc[2](loc2: u64)
-	8: Lt
-	9: BrFalse(17)
+	4: CopyLoc[1](loc1: u64)
+	5: LdU64(42)
+	6: Lt
+	7: BrFalse(13)
 B2:
-	10: LdU64(1)
-	11: StLoc[2](loc2: u64)
-	12: MoveLoc[1](loc1: u64)
-	13: MoveLoc[2](loc2: u64)
-	14: Add
-	15: StLoc[1](loc1: u64)
-	16: Branch(18)
+	8: MoveLoc[1](loc1: u64)
+	9: LdU64(1)
+	10: Add
+	11: StLoc[1](loc1: u64)
+	12: Branch(14)
 B3:
-	17: Branch(19)
+	13: Branch(15)
 B4:
-	18: Branch(4)
+	14: Branch(4)
 B5:
-	19: MoveLoc[0](loc0: u64)
-	20: Ret
+	15: MoveLoc[0](loc0: u64)
+	16: Ret
 }
 public test4(Arg0: u64): u64 /* def_idx: 3 */ {
 L1:	loc0: u64
@@ -480,27 +484,23 @@ B0:
 	0: LdU64(0)
 	1: StLoc[1](loc0: u64)
 B1:
-	2: LdU64(42)
-	3: StLoc[2](loc1: u64)
-	4: CopyLoc[1](loc0: u64)
-	5: MoveLoc[2](loc1: u64)
-	6: Lt
-	7: BrFalse(15)
+	2: CopyLoc[1](loc0: u64)
+	3: LdU64(42)
+	4: Lt
+	5: BrFalse(11)
 B2:
-	8: LdU64(1)
-	9: StLoc[2](loc1: u64)
-	10: MoveLoc[1](loc0: u64)
-	11: MoveLoc[2](loc1: u64)
-	12: Add
-	13: StLoc[1](loc0: u64)
-	14: Branch(16)
+	6: MoveLoc[1](loc0: u64)
+	7: LdU64(1)
+	8: Add
+	9: StLoc[1](loc0: u64)
+	10: Branch(12)
 B3:
-	15: Branch(17)
+	11: Branch(13)
 B4:
-	16: Branch(2)
+	12: Branch(2)
 B5:
-	17: MoveLoc[0](Arg0: u64)
-	18: Ret
+	13: MoveLoc[0](Arg0: u64)
+	14: Ret
 }
 }
 ============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/self_assigns.opt.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/self_assigns.opt.exp
index 22650ed85bc01..41172b0fec2f3 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/self_assigns.opt.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/self_assigns.opt.exp
@@ -75,6 +75,14 @@ public fun m::test4($t0: u64): u64 {
  17: return $t1
 }
 
+
+Diagnostics:
+warning: Unused assignment to `x`. Consider removing or prefixing with an underscore: `_x`
+  ┌─ tests/variable-coalescing/self_assigns.move:3:9
+  │
+3 │         x = x;
+  │         ^^^^^
+
 ============ after DeadStoreElimination: ================
 
 [variant baseline]
@@ -451,27 +459,23 @@ B0:
 	2: StLoc[0](loc0: u64)
 	3: StLoc[1](loc1: u64)
 B1:
-	4: LdU64(42)
-	5: StLoc[2](loc2: u64)
-	6: CopyLoc[1](loc1: u64)
-	7: MoveLoc[2](loc2: u64)
-	8: Lt
-	9: BrFalse(17)
+	4: CopyLoc[1](loc1: u64)
+	5: LdU64(42)
+	6: Lt
+	7: BrFalse(13)
 B2:
-	10: LdU64(1)
-	11: StLoc[2](loc2: u64)
-	12: MoveLoc[1](loc1: u64)
-	13: MoveLoc[2](loc2: u64)
-	14: Add
-	15: StLoc[1](loc1: u64)
-	16: Branch(18)
+	8: MoveLoc[1](loc1: u64)
+	9: LdU64(1)
+	10: Add
+	11: StLoc[1](loc1: u64)
+	12: Branch(14)
 B3:
-	17: Branch(19)
+	13: Branch(15)
 B4:
-	18: Branch(4)
+	14: Branch(4)
 B5:
-	19: MoveLoc[0](loc0: u64)
-	20: Ret
+	15: MoveLoc[0](loc0: u64)
+	16: Ret
 }
 public test4(Arg0: u64): u64 /* def_idx: 3 */ {
 L1:	loc0: u64
@@ -480,27 +484,23 @@ B0:
 	0: LdU64(0)
 	1: StLoc[1](loc0: u64)
 B1:
-	2: LdU64(42)
-	3: StLoc[2](loc1: u64)
-	4: CopyLoc[1](loc0: u64)
-	5: MoveLoc[2](loc1: u64)
-	6: Lt
-	7: BrFalse(15)
+	2: CopyLoc[1](loc0: u64)
+	3: LdU64(42)
+	4: Lt
+	5: BrFalse(11)
 B2:
-	8: LdU64(1)
-	9: StLoc[2](loc1: u64)
-	10: MoveLoc[1](loc0: u64)
-	11: MoveLoc[2](loc1: u64)
-	12: Add
-	13: StLoc[1](loc0: u64)
-	14: Branch(16)
+	6: MoveLoc[1](loc0: u64)
+	7: LdU64(1)
+	8: Add
+	9: StLoc[1](loc0: u64)
+	10: Branch(12)
 B3:
-	15: Branch(17)
+	11: Branch(13)
 B4:
-	16: Branch(2)
+	12: Branch(2)
 B5:
-	17: MoveLoc[0](Arg0: u64)
-	18: Ret
+	13: MoveLoc[0](Arg0: u64)
+	14: Ret
 }
 }
 ============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/seq_kills_1.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/seq_kills_1.exp
index dc7553994cc1a..8573ed988e8b7 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/seq_kills_1.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/seq_kills_1.exp
@@ -18,6 +18,14 @@ fun m::test($t0: u64): bool {
   7: return $t1
 }
 
+
+Diagnostics:
+warning: Unused assignment to `b`. Consider removing or prefixing with an underscore: `_b`
+  ┌─ tests/variable-coalescing/seq_kills_1.move:7:9
+  │
+7 │         b = p + 1; // kill b := a, which removes the whole copy chain
+  │         ^^^^^^^^^
+
 ============ after DeadStoreElimination: ================
 
 [variant baseline]
@@ -123,18 +131,16 @@ B0:
 	1: StLoc[1](loc0: u64)
 	2: CopyLoc[1](loc0: u64)
 	3: StLoc[2](loc1: u64)
-	4: LdU64(1)
-	5: StLoc[3](loc2: u64)
-	6: MoveLoc[0](Arg0: u64)
-	7: MoveLoc[3](loc2: u64)
-	8: Add
-	9: MoveLoc[1](loc0: u64)
-	10: MoveLoc[2](loc1: u64)
-	11: Eq
-	12: StLoc[4](loc3: bool)
-	13: Pop
-	14: MoveLoc[4](loc3: bool)
-	15: Ret
+	4: MoveLoc[0](Arg0: u64)
+	5: LdU64(1)
+	6: Add
+	7: MoveLoc[1](loc0: u64)
+	8: MoveLoc[2](loc1: u64)
+	9: Eq
+	10: StLoc[4](loc3: bool)
+	11: Pop
+	12: MoveLoc[4](loc3: bool)
+	13: Ret
 }
 }
 ============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/seq_kills_1.opt.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/seq_kills_1.opt.exp
index dc7553994cc1a..8573ed988e8b7 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/seq_kills_1.opt.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/seq_kills_1.opt.exp
@@ -18,6 +18,14 @@ fun m::test($t0: u64): bool {
   7: return $t1
 }
 
+
+Diagnostics:
+warning: Unused assignment to `b`. Consider removing or prefixing with an underscore: `_b`
+  ┌─ tests/variable-coalescing/seq_kills_1.move:7:9
+  │
+7 │         b = p + 1; // kill b := a, which removes the whole copy chain
+  │         ^^^^^^^^^
+
 ============ after DeadStoreElimination: ================
 
 [variant baseline]
@@ -123,18 +131,16 @@ B0:
 	1: StLoc[1](loc0: u64)
 	2: CopyLoc[1](loc0: u64)
 	3: StLoc[2](loc1: u64)
-	4: LdU64(1)
-	5: StLoc[3](loc2: u64)
-	6: MoveLoc[0](Arg0: u64)
-	7: MoveLoc[3](loc2: u64)
-	8: Add
-	9: MoveLoc[1](loc0: u64)
-	10: MoveLoc[2](loc1: u64)
-	11: Eq
-	12: StLoc[4](loc3: bool)
-	13: Pop
-	14: MoveLoc[4](loc3: bool)
-	15: Ret
+	4: MoveLoc[0](Arg0: u64)
+	5: LdU64(1)
+	6: Add
+	7: MoveLoc[1](loc0: u64)
+	8: MoveLoc[2](loc1: u64)
+	9: Eq
+	10: StLoc[4](loc3: bool)
+	11: Pop
+	12: MoveLoc[4](loc3: bool)
+	13: Ret
 }
 }
 ============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/seq_kills_2.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/seq_kills_2.exp
index 3cbb873f10bd0..c39d9bdd97fd6 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/seq_kills_2.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/seq_kills_2.exp
@@ -18,6 +18,14 @@ fun m::test($t0: u64): bool {
   7: return $t1
 }
 
+
+Diagnostics:
+warning: Unused assignment to `a`. Consider removing or prefixing with an underscore: `_a`
+  ┌─ tests/variable-coalescing/seq_kills_2.move:7:9
+  │
+7 │         a = p + 1; // kill b := a
+  │         ^^^^^^^^^
+
 ============ after DeadStoreElimination: ================
 
 [variant baseline]
@@ -123,18 +131,16 @@ B0:
 	1: StLoc[1](loc0: u64)
 	2: CopyLoc[1](loc0: u64)
 	3: StLoc[2](loc1: u64)
-	4: LdU64(1)
-	5: StLoc[3](loc2: u64)
-	6: MoveLoc[0](Arg0: u64)
-	7: MoveLoc[3](loc2: u64)
-	8: Add
-	9: MoveLoc[1](loc0: u64)
-	10: MoveLoc[2](loc1: u64)
-	11: Eq
-	12: StLoc[4](loc3: bool)
-	13: Pop
-	14: MoveLoc[4](loc3: bool)
-	15: Ret
+	4: MoveLoc[0](Arg0: u64)
+	5: LdU64(1)
+	6: Add
+	7: MoveLoc[1](loc0: u64)
+	8: MoveLoc[2](loc1: u64)
+	9: Eq
+	10: StLoc[4](loc3: bool)
+	11: Pop
+	12: MoveLoc[4](loc3: bool)
+	13: Ret
 }
 }
 ============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/seq_kills_2.opt.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/seq_kills_2.opt.exp
index 3cbb873f10bd0..c39d9bdd97fd6 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/seq_kills_2.opt.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/seq_kills_2.opt.exp
@@ -18,6 +18,14 @@ fun m::test($t0: u64): bool {
   7: return $t1
 }
 
+
+Diagnostics:
+warning: Unused assignment to `a`. Consider removing or prefixing with an underscore: `_a`
+  ┌─ tests/variable-coalescing/seq_kills_2.move:7:9
+  │
+7 │         a = p + 1; // kill b := a
+  │         ^^^^^^^^^
+
 ============ after DeadStoreElimination: ================
 
 [variant baseline]
@@ -123,18 +131,16 @@ B0:
 	1: StLoc[1](loc0: u64)
 	2: CopyLoc[1](loc0: u64)
 	3: StLoc[2](loc1: u64)
-	4: LdU64(1)
-	5: StLoc[3](loc2: u64)
-	6: MoveLoc[0](Arg0: u64)
-	7: MoveLoc[3](loc2: u64)
-	8: Add
-	9: MoveLoc[1](loc0: u64)
-	10: MoveLoc[2](loc1: u64)
-	11: Eq
-	12: StLoc[4](loc3: bool)
-	13: Pop
-	14: MoveLoc[4](loc3: bool)
-	15: Ret
+	4: MoveLoc[0](Arg0: u64)
+	5: LdU64(1)
+	6: Add
+	7: MoveLoc[1](loc0: u64)
+	8: MoveLoc[2](loc1: u64)
+	9: Eq
+	10: StLoc[4](loc3: bool)
+	11: Pop
+	12: MoveLoc[4](loc3: bool)
+	13: Ret
 }
 }
 ============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/straight_line_kills.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/straight_line_kills.exp
index 244a78cdaba55..f1ddfc821ff50 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/straight_line_kills.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/straight_line_kills.exp
@@ -16,6 +16,14 @@ fun m::copy_kill($t0: u64): u64 {
   6: return $t1
 }
 
+
+Diagnostics:
+warning: Unused assignment to `p`. Consider removing or prefixing with an underscore: `_p`
+  ┌─ tests/variable-coalescing/straight_line_kills.move:5:9
+  │
+5 │         p = p + 1;
+  │         ^^^^^^^^^
+
 ============ after DeadStoreElimination: ================
 
 [variant baseline]
@@ -111,18 +119,16 @@ B0:
 	1: StLoc[1](loc0: u64)
 	2: CopyLoc[1](loc0: u64)
 	3: StLoc[2](loc1: u64)
-	4: LdU64(1)
-	5: StLoc[3](loc2: u64)
-	6: MoveLoc[0](Arg0: u64)
-	7: MoveLoc[3](loc2: u64)
-	8: Add
-	9: MoveLoc[2](loc1: u64)
-	10: MoveLoc[1](loc0: u64)
-	11: Add
-	12: StLoc[1](loc0: u64)
-	13: Pop
-	14: MoveLoc[1](loc0: u64)
-	15: Ret
+	4: MoveLoc[0](Arg0: u64)
+	5: LdU64(1)
+	6: Add
+	7: MoveLoc[2](loc1: u64)
+	8: MoveLoc[1](loc0: u64)
+	9: Add
+	10: StLoc[1](loc0: u64)
+	11: Pop
+	12: MoveLoc[1](loc0: u64)
+	13: Ret
 }
 }
 ============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/straight_line_kills.opt.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/straight_line_kills.opt.exp
index 244a78cdaba55..f1ddfc821ff50 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/straight_line_kills.opt.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/straight_line_kills.opt.exp
@@ -16,6 +16,14 @@ fun m::copy_kill($t0: u64): u64 {
   6: return $t1
 }
 
+
+Diagnostics:
+warning: Unused assignment to `p`. Consider removing or prefixing with an underscore: `_p`
+  ┌─ tests/variable-coalescing/straight_line_kills.move:5:9
+  │
+5 │         p = p + 1;
+  │         ^^^^^^^^^
+
 ============ after DeadStoreElimination: ================
 
 [variant baseline]
@@ -111,18 +119,16 @@ B0:
 	1: StLoc[1](loc0: u64)
 	2: CopyLoc[1](loc0: u64)
 	3: StLoc[2](loc1: u64)
-	4: LdU64(1)
-	5: StLoc[3](loc2: u64)
-	6: MoveLoc[0](Arg0: u64)
-	7: MoveLoc[3](loc2: u64)
-	8: Add
-	9: MoveLoc[2](loc1: u64)
-	10: MoveLoc[1](loc0: u64)
-	11: Add
-	12: StLoc[1](loc0: u64)
-	13: Pop
-	14: MoveLoc[1](loc0: u64)
-	15: Ret
+	4: MoveLoc[0](Arg0: u64)
+	5: LdU64(1)
+	6: Add
+	7: MoveLoc[2](loc1: u64)
+	8: MoveLoc[1](loc0: u64)
+	9: Add
+	10: StLoc[1](loc0: u64)
+	11: Pop
+	12: MoveLoc[1](loc0: u64)
+	13: Ret
 }
 }
 ============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/swap_in_a_loop.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/swap_in_a_loop.exp
index db6c1acb9f291..da24c0611844b 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/swap_in_a_loop.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/swap_in_a_loop.exp
@@ -218,34 +218,30 @@ B0:
 	0: CopyLoc[0](Arg0: u64)
 	1: StLoc[2](loc0: u64)
 B1:
-	2: LdU64(0)
-	3: StLoc[3](loc1: u64)
-	4: CopyLoc[2](loc0: u64)
-	5: MoveLoc[3](loc1: u64)
-	6: Gt
-	7: BrFalse(21)
+	2: CopyLoc[2](loc0: u64)
+	3: LdU64(0)
+	4: Gt
+	5: BrFalse(17)
 B2:
-	8: MoveLoc[0](Arg0: u64)
-	9: StLoc[3](loc1: u64)
-	10: MoveLoc[1](Arg1: u64)
-	11: StLoc[0](Arg0: u64)
-	12: MoveLoc[3](loc1: u64)
-	13: StLoc[1](Arg1: u64)
-	14: LdU64(1)
-	15: StLoc[3](loc1: u64)
-	16: MoveLoc[2](loc0: u64)
-	17: MoveLoc[3](loc1: u64)
-	18: Sub
-	19: StLoc[2](loc0: u64)
-	20: Branch(22)
+	6: MoveLoc[0](Arg0: u64)
+	7: StLoc[3](loc1: u64)
+	8: MoveLoc[1](Arg1: u64)
+	9: StLoc[0](Arg0: u64)
+	10: MoveLoc[3](loc1: u64)
+	11: StLoc[1](Arg1: u64)
+	12: MoveLoc[2](loc0: u64)
+	13: LdU64(1)
+	14: Sub
+	15: StLoc[2](loc0: u64)
+	16: Branch(18)
 B3:
-	21: Branch(23)
+	17: Branch(19)
 B4:
-	22: Branch(2)
+	18: Branch(2)
 B5:
-	23: MoveLoc[0](Arg0: u64)
-	24: MoveLoc[1](Arg1: u64)
-	25: Ret
+	19: MoveLoc[0](Arg0: u64)
+	20: MoveLoc[1](Arg1: u64)
+	21: Ret
 }
 }
 ============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/swap_in_a_loop.opt.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/swap_in_a_loop.opt.exp
index db6c1acb9f291..da24c0611844b 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/swap_in_a_loop.opt.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/swap_in_a_loop.opt.exp
@@ -218,34 +218,30 @@ B0:
 	0: CopyLoc[0](Arg0: u64)
 	1: StLoc[2](loc0: u64)
 B1:
-	2: LdU64(0)
-	3: StLoc[3](loc1: u64)
-	4: CopyLoc[2](loc0: u64)
-	5: MoveLoc[3](loc1: u64)
-	6: Gt
-	7: BrFalse(21)
+	2: CopyLoc[2](loc0: u64)
+	3: LdU64(0)
+	4: Gt
+	5: BrFalse(17)
 B2:
-	8: MoveLoc[0](Arg0: u64)
-	9: StLoc[3](loc1: u64)
-	10: MoveLoc[1](Arg1: u64)
-	11: StLoc[0](Arg0: u64)
-	12: MoveLoc[3](loc1: u64)
-	13: StLoc[1](Arg1: u64)
-	14: LdU64(1)
-	15: StLoc[3](loc1: u64)
-	16: MoveLoc[2](loc0: u64)
-	17: MoveLoc[3](loc1: u64)
-	18: Sub
-	19: StLoc[2](loc0: u64)
-	20: Branch(22)
+	6: MoveLoc[0](Arg0: u64)
+	7: StLoc[3](loc1: u64)
+	8: MoveLoc[1](Arg1: u64)
+	9: StLoc[0](Arg0: u64)
+	10: MoveLoc[3](loc1: u64)
+	11: StLoc[1](Arg1: u64)
+	12: MoveLoc[2](loc0: u64)
+	13: LdU64(1)
+	14: Sub
+	15: StLoc[2](loc0: u64)
+	16: Branch(18)
 B3:
-	21: Branch(23)
+	17: Branch(19)
 B4:
-	22: Branch(2)
+	18: Branch(2)
 B5:
-	23: MoveLoc[0](Arg0: u64)
-	24: MoveLoc[1](Arg1: u64)
-	25: Ret
+	19: MoveLoc[0](Arg0: u64)
+	20: MoveLoc[1](Arg1: u64)
+	21: Ret
 }
 }
 ============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/variable-coalescing/unused_add.exp b/third_party/move/move-compiler-v2/tests/variable-coalescing/unused_add.exp
index e1e09de6b41e0..850ba7d9bb591 100644
--- a/third_party/move/move-compiler-v2/tests/variable-coalescing/unused_add.exp
+++ b/third_party/move/move-compiler-v2/tests/variable-coalescing/unused_add.exp
@@ -19,6 +19,14 @@ public fun m::test() {
   3: return ()
 }
 
+
+Diagnostics:
+warning: Unused assignment to `z`. Consider removing or prefixing with an underscore: `_z`
+  ┌─ tests/variable-coalescing/unused_add.move:5:17
+  │
+5 │         let z = x + y;
+  │                 ^^^^^
+
 ============ after DeadStoreElimination: ================
 
 [variant baseline]
diff --git a/third_party/move/move-compiler-v2/tests/verification/noverify/cross_module_invalid.exp b/third_party/move/move-compiler-v2/tests/verification/noverify/cross_module_invalid.exp
new file mode 100644
index 0000000000000..ca9e9067e0ff9
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/verification/noverify/cross_module_invalid.exp
@@ -0,0 +1,7 @@
+
+Diagnostics:
+error: unbound module
+   ┌─ tests/verification/noverify/cross_module_invalid.move:23:9
+   │
+23 │         A::build_foo()
+   │         ^ Unbound module or type alias 'A'
diff --git a/third_party/move/move-compiler-v2/tests/verification/noverify/cross_module_invalid.move b/third_party/move/move-compiler-v2/tests/verification/noverify/cross_module_invalid.move
new file mode 100644
index 0000000000000..9d78d065a3d6c
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/verification/noverify/cross_module_invalid.move
@@ -0,0 +1,26 @@
+// check that `use`'s are filtered out correctly
+address 0x1 {
+module A {
+    struct Foo has drop {}
+
+    public fun build_foo(): Foo { Foo {} }
+}
+
+module B {
+    #[verify_only]
+    use 0x1::A::{Self, Foo};
+
+    #[verify_only]
+    fun x(_: Foo) { }
+
+    #[verify_only]
+    fun tester() {
+        x(A::build_foo())
+    }
+
+    // this should fail
+    public fun bad(): Foo {
+        A::build_foo()
+    }
+}
+}
diff --git a/third_party/move/move-compiler-v2/tests/verification/noverify/cross_module_valid.exp b/third_party/move/move-compiler-v2/tests/verification/noverify/cross_module_valid.exp
new file mode 100644
index 0000000000000..90b32906711cc
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/verification/noverify/cross_module_valid.exp
@@ -0,0 +1,2 @@
+
+============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/verification/noverify/cross_module_valid.move b/third_party/move/move-compiler-v2/tests/verification/noverify/cross_module_valid.move
new file mode 100644
index 0000000000000..c141dc283e65f
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/verification/noverify/cross_module_valid.move
@@ -0,0 +1,24 @@
+// Check that verify_only filtering and calling is supported across modules and
+// different types of module members
+address 0x1 {
+module A {
+    #[verify_only]
+    struct Foo has drop {}
+
+    #[verify_only]
+    public fun build_foo(): Foo { Foo {} }
+}
+
+module B {
+    #[verify_only]
+    use 0x1::A::{Self, Foo};
+
+    #[verify_only]
+    fun x(_: Foo) { }
+
+    #[verify_only]
+    fun tester() {
+        x(A::build_foo())
+    }
+}
+}
diff --git a/third_party/move/move-compiler-v2/tests/verification/noverify/double_annotation.exp b/third_party/move/move-compiler-v2/tests/verification/noverify/double_annotation.exp
new file mode 100644
index 0000000000000..90b32906711cc
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/verification/noverify/double_annotation.exp
@@ -0,0 +1,2 @@
+
+============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/verification/noverify/double_annotation.move b/third_party/move/move-compiler-v2/tests/verification/noverify/double_annotation.move
new file mode 100644
index 0000000000000..60f63be52a624
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/verification/noverify/double_annotation.move
@@ -0,0 +1,21 @@
+address 0x1 {
+module M {
+    #[verify_only]
+    struct Foo {}
+
+    // failure: double annotation
+    #[verify_only]
+    #[verify_only]
+    struct Bar {}
+
+    public fun foo() { }
+
+    #[verify_only]
+    public fun bar() { }
+
+    // failure: double annotation
+    #[verify_only]
+    #[verify_only]
+    public fun d(_a: signer, _b: signer) { }
+}
+}
diff --git a/third_party/move/move-compiler-v2/tests/verification/noverify/function_with_spec.exp b/third_party/move/move-compiler-v2/tests/verification/noverify/function_with_spec.exp
new file mode 100644
index 0000000000000..ea64cb0f09875
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/verification/noverify/function_with_spec.exp
@@ -0,0 +1,7 @@
+
+Diagnostics:
+error: unresolved spec target
+   ┌─ tests/verification/noverify/function_with_spec.move:15:10
+   │
+15 │     spec baz {
+   │          ^^^
diff --git a/third_party/move/move-compiler-v2/tests/verification/noverify/function_with_spec.move b/third_party/move/move-compiler-v2/tests/verification/noverify/function_with_spec.move
new file mode 100644
index 0000000000000..4671968e37fd2
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/verification/noverify/function_with_spec.move
@@ -0,0 +1,19 @@
+// #[test_only] functions should be filtered out in non-test mode
+address 0x1234 {
+module M {
+    public fun foo() { }
+
+    #[verify_only]
+    public fun bar() { }
+
+    // This should not cause an error in either test- nor non-test-mode.
+    spec bar {
+        aborts_if false;
+    }
+
+    // This should always cause an error due to typo.
+    spec baz {
+        aborts_if false;
+    }
+}
+}
diff --git a/third_party/move/move-compiler-v2/tests/verification/noverify/single_module_invalid.exp b/third_party/move/move-compiler-v2/tests/verification/noverify/single_module_invalid.exp
new file mode 100644
index 0000000000000..232c3ee5c36c7
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/verification/noverify/single_module_invalid.exp
@@ -0,0 +1,19 @@
+
+Diagnostics:
+error: undeclared `0x1::M::Foo`
+  ┌─ tests/verification/noverify/single_module_invalid.move:8:23
+  │
+8 │     public fun foo(): Foo {
+  │                       ^^^
+
+error: undeclared struct `M::Foo`
+  ┌─ tests/verification/noverify/single_module_invalid.move:9:9
+  │
+9 │         Foo {}
+  │         ^^^
+
+error: no function named `bar` found
+   ┌─ tests/verification/noverify/single_module_invalid.move:17:24
+   │
+17 │     public fun baz() { bar() }
+   │                        ^^^^^
diff --git a/third_party/move/move-compiler-v2/tests/verification/noverify/single_module_invalid.move b/third_party/move/move-compiler-v2/tests/verification/noverify/single_module_invalid.move
new file mode 100644
index 0000000000000..06043755f6307
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/verification/noverify/single_module_invalid.move
@@ -0,0 +1,19 @@
+address 0x1 {
+module M {
+    #[verify_only]
+    struct Foo {}
+
+    // This should cause an unbound type error in non-verify mode
+    // as the Foo struct declaration was filtered out
+    public fun foo(): Foo {
+        Foo {}
+    }
+
+    #[verify_only]
+    public fun bar() { }
+
+    // This should cause an unbound function error in non-verify mode
+    // as `bar` was filtered out
+    public fun baz() { bar() }
+}
+}
diff --git a/third_party/move/move-compiler-v2/tests/verification/noverify/single_module_valid.exp b/third_party/move/move-compiler-v2/tests/verification/noverify/single_module_valid.exp
new file mode 100644
index 0000000000000..90b32906711cc
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/verification/noverify/single_module_valid.exp
@@ -0,0 +1,2 @@
+
+============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/verification/noverify/single_module_valid.move b/third_party/move/move-compiler-v2/tests/verification/noverify/single_module_valid.move
new file mode 100644
index 0000000000000..a50d4ab3cf7da
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/verification/noverify/single_module_valid.move
@@ -0,0 +1,16 @@
+// Make sure that legal usage is allowed
+module 0x1::M {
+    // verify-only struct
+    #[verify_only]
+    struct Foo {}
+
+    public fun foo() { }
+
+    // verify-only struct used in a verify-only function
+    #[verify_only]
+    public fun bar(): Foo { Foo{} }
+
+    // verify-only function used in a verify-only function
+    #[verify_only]
+    public fun baz(): Foo { bar() }
+}
diff --git a/third_party/move/move-compiler-v2/tests/verification/verify/cross_module_valid.exp b/third_party/move/move-compiler-v2/tests/verification/verify/cross_module_valid.exp
new file mode 100644
index 0000000000000..90b32906711cc
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/verification/verify/cross_module_valid.exp
@@ -0,0 +1,2 @@
+
+============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/verification/verify/cross_module_valid.move b/third_party/move/move-compiler-v2/tests/verification/verify/cross_module_valid.move
new file mode 100644
index 0000000000000..c141dc283e65f
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/verification/verify/cross_module_valid.move
@@ -0,0 +1,24 @@
+// Check that verify_only filtering and calling is supported across modules and
+// different types of module members
+address 0x1 {
+module A {
+    #[verify_only]
+    struct Foo has drop {}
+
+    #[verify_only]
+    public fun build_foo(): Foo { Foo {} }
+}
+
+module B {
+    #[verify_only]
+    use 0x1::A::{Self, Foo};
+
+    #[verify_only]
+    fun x(_: Foo) { }
+
+    #[verify_only]
+    fun tester() {
+        x(A::build_foo())
+    }
+}
+}
diff --git a/third_party/move/move-compiler-v2/tests/verification/verify/double_annotation.exp b/third_party/move/move-compiler-v2/tests/verification/verify/double_annotation.exp
new file mode 100644
index 0000000000000..fbc781f959cb2
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/verification/verify/double_annotation.exp
@@ -0,0 +1,20 @@
+
+Diagnostics:
+error: duplicate declaration, item, or annotation
+  ┌─ tests/verification/verify/double_annotation.move:8:7
+  │
+7 │     #[verify_only]
+  │       ----------- Attribute previously given here
+8 │     #[verify_only]
+  │       ^^^^^^^^^^^ Duplicate attribute 'verify_only' attached to the same item
+
+error: duplicate declaration, item, or annotation
+   ┌─ tests/verification/verify/double_annotation.move:18:7
+   │
+17 │     #[verify_only]
+   │       ----------- Attribute previously given here
+18 │     #[verify_only]
+   │       ^^^^^^^^^^^ Duplicate attribute 'verify_only' attached to the same item
+
+
+============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/verification/verify/double_annotation.move b/third_party/move/move-compiler-v2/tests/verification/verify/double_annotation.move
new file mode 100644
index 0000000000000..60f63be52a624
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/verification/verify/double_annotation.move
@@ -0,0 +1,21 @@
+address 0x1 {
+module M {
+    #[verify_only]
+    struct Foo {}
+
+    // failure: double annotation
+    #[verify_only]
+    #[verify_only]
+    struct Bar {}
+
+    public fun foo() { }
+
+    #[verify_only]
+    public fun bar() { }
+
+    // failure: double annotation
+    #[verify_only]
+    #[verify_only]
+    public fun d(_a: signer, _b: signer) { }
+}
+}
diff --git a/third_party/move/move-compiler-v2/tests/verification/verify/function_with_spec.exp b/third_party/move/move-compiler-v2/tests/verification/verify/function_with_spec.exp
new file mode 100644
index 0000000000000..47f7a09cccdad
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/verification/verify/function_with_spec.exp
@@ -0,0 +1,10 @@
+
+Diagnostics:
+error: unresolved spec target
+   ┌─ tests/verification/verify/function_with_spec.move:15:10
+   │
+15 │     spec baz {
+   │          ^^^
+
+
+============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/verification/verify/function_with_spec.move b/third_party/move/move-compiler-v2/tests/verification/verify/function_with_spec.move
new file mode 100644
index 0000000000000..4671968e37fd2
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/verification/verify/function_with_spec.move
@@ -0,0 +1,19 @@
+// #[test_only] functions should be filtered out in non-test mode
+address 0x1234 {
+module M {
+    public fun foo() { }
+
+    #[verify_only]
+    public fun bar() { }
+
+    // This should not cause an error in either test- nor non-test-mode.
+    spec bar {
+        aborts_if false;
+    }
+
+    // This should always cause an error due to typo.
+    spec baz {
+        aborts_if false;
+    }
+}
+}
diff --git a/third_party/move/move-compiler-v2/tests/verification/verify/single_module_invalid.exp b/third_party/move/move-compiler-v2/tests/verification/verify/single_module_invalid.exp
new file mode 100644
index 0000000000000..90b32906711cc
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/verification/verify/single_module_invalid.exp
@@ -0,0 +1,2 @@
+
+============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/verification/verify/single_module_invalid.move b/third_party/move/move-compiler-v2/tests/verification/verify/single_module_invalid.move
new file mode 100644
index 0000000000000..06043755f6307
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/verification/verify/single_module_invalid.move
@@ -0,0 +1,19 @@
+address 0x1 {
+module M {
+    #[verify_only]
+    struct Foo {}
+
+    // This should cause an unbound type error in non-verify mode
+    // as the Foo struct declaration was filtered out
+    public fun foo(): Foo {
+        Foo {}
+    }
+
+    #[verify_only]
+    public fun bar() { }
+
+    // This should cause an unbound function error in non-verify mode
+    // as `bar` was filtered out
+    public fun baz() { bar() }
+}
+}
diff --git a/third_party/move/move-compiler-v2/tests/verification/verify/single_module_valid.exp b/third_party/move/move-compiler-v2/tests/verification/verify/single_module_valid.exp
new file mode 100644
index 0000000000000..90b32906711cc
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/verification/verify/single_module_valid.exp
@@ -0,0 +1,2 @@
+
+============ bytecode verification succeeded ========
diff --git a/third_party/move/move-compiler-v2/tests/verification/verify/single_module_valid.move b/third_party/move/move-compiler-v2/tests/verification/verify/single_module_valid.move
new file mode 100644
index 0000000000000..a50d4ab3cf7da
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/verification/verify/single_module_valid.move
@@ -0,0 +1,16 @@
+// Make sure that legal usage is allowed
+module 0x1::M {
+    // verify-only struct
+    #[verify_only]
+    struct Foo {}
+
+    public fun foo() { }
+
+    // verify-only struct used in a verify-only function
+    #[verify_only]
+    public fun bar(): Foo { Foo{} }
+
+    // verify-only function used in a verify-only function
+    #[verify_only]
+    public fun baz(): Foo { bar() }
+}
diff --git a/third_party/move/move-compiler-v2/tests/visibility-checker/mix_friend_package_visibility_invalid.exp b/third_party/move/move-compiler-v2/tests/visibility-checker/mix_friend_package_visibility_invalid.exp
new file mode 100644
index 0000000000000..d6787d3802706
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/visibility-checker/mix_friend_package_visibility_invalid.exp
@@ -0,0 +1,34 @@
+
+Diagnostics:
+error: Cannot use both package and friend visibility in the same module
+  ┌─ tests/visibility-checker/mix_friend_package_visibility_invalid.move:7:9
+  │
+3 │         public(package) fun foo() {
+  │         --------------- package visibility declared here
+  ·
+7 │         public(friend) fun bar() {
+  │         ^^^^^^^^^^^^^^
+  │         │
+  │         friend visibility declared here
+
+error: Cannot use both package and friend visibility in the same module
+   ┌─ tests/visibility-checker/mix_friend_package_visibility_invalid.move:15:9
+   │
+15 │         public(friend) fun foo() {
+   │         ^^^^^^^^^^^^^^
+   │         │
+   │         friend visibility declared here
+   ·
+19 │         public(package) fun bar() {
+   │         --------------- package visibility declared here
+
+error: Cannot use both package and friend visibility in the same module
+   ┌─ tests/visibility-checker/mix_friend_package_visibility_invalid.move:27:9
+   │
+27 │         friend 0x44::B;
+   │         ^^^^^^^^^^^^^^^
+   │         │
+   │         friend visibility declared here
+28 │
+29 │         public(package) fun bar() {
+   │         --------------- package visibility declared here
diff --git a/third_party/move/move-compiler-v2/tests/visibility-checker/mix_friend_package_visibility_invalid.move b/third_party/move/move-compiler-v2/tests/visibility-checker/mix_friend_package_visibility_invalid.move
new file mode 100644
index 0000000000000..acce51139a892
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/visibility-checker/mix_friend_package_visibility_invalid.move
@@ -0,0 +1,35 @@
+address 0x42 {
+    module A {
+        public(package) fun foo() {
+
+        }
+
+        public(friend) fun bar() {
+
+        }
+    }
+}
+
+address 0x43 {
+    module A {
+        public(friend) fun foo() {
+
+        }
+
+        public(package) fun bar() {
+
+        }
+    }
+}
+
+address 0x44 {
+    module A {
+        friend 0x44::B;
+
+        public(package) fun bar() {
+
+        }
+    }
+
+    module B {}
+}
diff --git a/third_party/move/move-compiler-v2/tests/visibility-checker/mix_friend_package_visibility_valid.exp b/third_party/move/move-compiler-v2/tests/visibility-checker/mix_friend_package_visibility_valid.exp
new file mode 100644
index 0000000000000..cd4161e3b9462
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/visibility-checker/mix_friend_package_visibility_valid.exp
@@ -0,0 +1,12 @@
+// -- Model dump before bytecode pipeline
+module 0x42::B {
+    friend fun foo() {
+        Tuple()
+    }
+} // end 0x42::B
+module 0x42::A {
+    friend fun foo() {
+        B::foo();
+        Tuple()
+    }
+} // end 0x42::A
diff --git a/third_party/move/move-compiler-v2/tests/visibility-checker/mix_friend_package_visibility_valid.move b/third_party/move/move-compiler-v2/tests/visibility-checker/mix_friend_package_visibility_valid.move
new file mode 100644
index 0000000000000..3274fda31d175
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/visibility-checker/mix_friend_package_visibility_valid.move
@@ -0,0 +1,13 @@
+// It's ok to use (public)friend and public(package) in different modules
+
+module 0x42::A {
+    public(friend) fun foo() {
+        0x42::B::foo();
+    }
+}
+
+module 0x42::B {
+    public(package) fun foo() {
+
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/visibility-checker/package_visibility.exp b/third_party/move/move-compiler-v2/tests/visibility-checker/package_visibility.exp
new file mode 100644
index 0000000000000..1423e7fb8a51c
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/visibility-checker/package_visibility.exp
@@ -0,0 +1,33 @@
+// -- Model dump before bytecode pipeline
+module 0x42::A {
+    friend fun bar() {
+        Tuple()
+    }
+    private fun foo() {
+        Tuple()
+    }
+} // end 0x42::A
+module 0x42::B {
+    use 0x42::A; // resolved as: 0x42::A
+    public fun bar() {
+        A::bar()
+    }
+    friend fun foo() {
+        A::bar()
+    }
+    private fun baz() {
+        A::bar()
+    }
+} // end 0x42::B
+module 0x42::C {
+    use 0x42::B; // resolved as: 0x42::B
+    public fun bar() {
+        B::foo()
+    }
+    friend fun foo() {
+        B::foo()
+    }
+    private fun baz() {
+        B::foo()
+    }
+} // end 0x42::C
diff --git a/third_party/move/move-compiler-v2/tests/visibility-checker/package_visibility.move b/third_party/move/move-compiler-v2/tests/visibility-checker/package_visibility.move
new file mode 100644
index 0000000000000..a7f7cd40b1319
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/visibility-checker/package_visibility.move
@@ -0,0 +1,36 @@
+module 0x42::A {
+    fun foo() {}
+    public(package) fun bar() {}
+}
+
+module 0x42::B {
+    use 0x42::A;
+
+    public(package) fun foo() {
+        A::bar()
+    }
+
+    public fun bar() {
+        A::bar()
+    }
+
+    fun baz() {
+        A::bar()
+    }
+}
+
+module 0x42::C {
+    use 0x42::B;
+
+    public(package) fun foo() {
+        B::foo()
+    }
+
+    public fun bar() {
+        B::foo()
+    }
+
+    fun baz() {
+        B::foo()
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/visibility-checker/package_visibility_already_friend.exp b/third_party/move/move-compiler-v2/tests/visibility-checker/package_visibility_already_friend.exp
new file mode 100644
index 0000000000000..a19cfd508ff60
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/visibility-checker/package_visibility_already_friend.exp
@@ -0,0 +1,12 @@
+
+Diagnostics:
+error: Cannot use both package and friend visibility in the same module
+  ┌─ tests/visibility-checker/package_visibility_already_friend.move:4:5
+  │
+4 │     friend 0x42::B;
+  │     ^^^^^^^^^^^^^^^
+  │     │
+  │     friend visibility declared here
+5 │     fun foo() {}
+6 │     public(package) fun bar() {}
+  │     --------------- package visibility declared here
diff --git a/third_party/move/move-compiler-v2/tests/visibility-checker/package_visibility_already_friend.move b/third_party/move/move-compiler-v2/tests/visibility-checker/package_visibility_already_friend.move
new file mode 100644
index 0000000000000..140072ee47fb0
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/visibility-checker/package_visibility_already_friend.move
@@ -0,0 +1,33 @@
+module 0x42::A {
+    // check we don't add duplicate `friend 0x42::B;`
+    // during the transformation
+    friend 0x42::B;
+    fun foo() {}
+    public(package) fun bar() {}
+}
+
+module 0x42::B {
+    use 0x42::A;
+
+    public(package) fun foo() {
+        A::bar()
+    }
+
+    public fun bar() {
+        A::bar()
+    }
+
+    fun baz() {
+        A::bar()
+    }
+}
+
+module 0x42::C {
+    public(package) fun foo() {
+        bar()
+    }
+
+    public(package) fun bar() {
+
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/visibility-checker/package_visibility_cycle.exp b/third_party/move/move-compiler-v2/tests/visibility-checker/package_visibility_cycle.exp
new file mode 100644
index 0000000000000..0cd6bd70ddc95
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/visibility-checker/package_visibility_cycle.exp
@@ -0,0 +1,10 @@
+
+Diagnostics:
+error: invalid 'module' declaration
+  ┌─ tests/visibility-checker/package_visibility_cycle.move:3:9
+  │
+3 │         0x42::B::foo()
+  │         ^^^^^^^^^^^^ '0x42::B' uses '0x42::A'. This 'use' relationship creates a dependency cycle.
+  ·
+9 │         0x42::A::foo()
+  │         ------------ '0x42::A' uses '0x42::B'
diff --git a/third_party/move/move-compiler-v2/tests/visibility-checker/package_visibility_cycle.move b/third_party/move/move-compiler-v2/tests/visibility-checker/package_visibility_cycle.move
new file mode 100644
index 0000000000000..b820a137f2951
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/visibility-checker/package_visibility_cycle.move
@@ -0,0 +1,11 @@
+module 0x42::A {
+    public(package) fun foo() {
+        0x42::B::foo()
+    }
+}
+
+module 0x42::B {
+    public(package) fun foo() {
+        0x42::A::foo()
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/visibility-checker/package_visibility_diff_addr.exp b/third_party/move/move-compiler-v2/tests/visibility-checker/package_visibility_diff_addr.exp
new file mode 100644
index 0000000000000..d9e6a68cb2029
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/visibility-checker/package_visibility_diff_addr.exp
@@ -0,0 +1,28 @@
+
+Diagnostics:
+error: public(package) function `0x42::A::bar` cannot be called from function `0x43::B::foo` because they are from different addresses
+   ┌─ tests/visibility-checker/package_visibility_diff_addr.move:3:25
+   │
+ 3 │     public(package) fun bar() {}
+   │                         ^^^ callee
+   ·
+10 │         A::bar()
+   │         -------- called here
+
+error: public(package) function `0x42::A::bar` cannot be called from function `0x43::B::bar` because they are from different addresses
+   ┌─ tests/visibility-checker/package_visibility_diff_addr.move:3:25
+   │
+ 3 │     public(package) fun bar() {}
+   │                         ^^^ callee
+   ·
+14 │         A::bar()
+   │         -------- called here
+
+error: public(package) function `0x42::A::bar` cannot be called from function `0x43::B::baz` because they are from different addresses
+   ┌─ tests/visibility-checker/package_visibility_diff_addr.move:3:25
+   │
+ 3 │     public(package) fun bar() {}
+   │                         ^^^ callee
+   ·
+18 │         A::bar()
+   │         -------- called here
diff --git a/third_party/move/move-compiler-v2/tests/visibility-checker/package_visibility_diff_addr.move b/third_party/move/move-compiler-v2/tests/visibility-checker/package_visibility_diff_addr.move
new file mode 100644
index 0000000000000..73abffca90959
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/visibility-checker/package_visibility_diff_addr.move
@@ -0,0 +1,20 @@
+module 0x42::A {
+    fun foo() {}
+    public(package) fun bar() {}
+}
+
+module 0x43::B {
+    use 0x42::A;
+
+    public(package) fun foo() {
+        A::bar()
+    }
+
+    public fun bar() {
+        A::bar()
+    }
+
+    fun baz() {
+        A::bar()
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/visibility-checker/package_visibility_script.exp b/third_party/move/move-compiler-v2/tests/visibility-checker/package_visibility_script.exp
new file mode 100644
index 0000000000000..4b9b87337bd07
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/visibility-checker/package_visibility_script.exp
@@ -0,0 +1,10 @@
+
+Diagnostics:
+error: public(package) function `0x42::test::foo` cannot be called from a script because it is not public
+  ┌─ tests/visibility-checker/package_visibility_script.move:2:25
+  │
+2 │     public(package) fun foo() {}
+  │                         ^^^ callee
+  ·
+7 │         0x42::test::foo();
+  │         ----------------- called here
diff --git a/third_party/move/move-compiler-v2/tests/visibility-checker/package_visibility_script.move b/third_party/move/move-compiler-v2/tests/visibility-checker/package_visibility_script.move
new file mode 100644
index 0000000000000..9ccc3524ddccf
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/visibility-checker/package_visibility_script.move
@@ -0,0 +1,9 @@
+module 0x42::test {
+    public(package) fun foo() {}
+}
+
+script {
+    fun main() {
+        0x42::test::foo();
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/visibility-checker/public_package_fun_in_script.exp b/third_party/move/move-compiler-v2/tests/visibility-checker/public_package_fun_in_script.exp
new file mode 100644
index 0000000000000..39fb244e19d4e
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/visibility-checker/public_package_fun_in_script.exp
@@ -0,0 +1,7 @@
+
+Diagnostics:
+error: unnecessary or extraneous item
+  ┌─ tests/visibility-checker/public_package_fun_in_script.move:2:5
+  │
+2 │     public(package) fun main() {}
+  │     ^^^^^^^^^^^^^^^ Invalid 'public(package)' visibility modifier. Script functions are not callable from other Move functions.
diff --git a/third_party/move/move-compiler-v2/tests/visibility-checker/public_package_fun_in_script.move b/third_party/move/move-compiler-v2/tests/visibility-checker/public_package_fun_in_script.move
new file mode 100644
index 0000000000000..307ba0ad38aca
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/visibility-checker/public_package_fun_in_script.move
@@ -0,0 +1,3 @@
+script {
+    public(package) fun main() {}
+}
diff --git a/third_party/move/move-compiler-v2/tests/visibility-checker/script_call_package_fun.exp b/third_party/move/move-compiler-v2/tests/visibility-checker/script_call_package_fun.exp
new file mode 100644
index 0000000000000..bc469c0b79c41
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/visibility-checker/script_call_package_fun.exp
@@ -0,0 +1,10 @@
+
+Diagnostics:
+error: public(package) function `0x42::test::foo` cannot be called from a script because it is not public
+  ┌─ tests/visibility-checker/script_call_package_fun.move:2:25
+  │
+2 │     public(package) fun foo() {}
+  │                         ^^^ callee
+  ·
+7 │         0x42::test::foo()
+  │         ----------------- called here
diff --git a/third_party/move/move-compiler-v2/tests/visibility-checker/script_call_package_fun.move b/third_party/move/move-compiler-v2/tests/visibility-checker/script_call_package_fun.move
new file mode 100644
index 0000000000000..b00b34ad14274
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/visibility-checker/script_call_package_fun.move
@@ -0,0 +1,9 @@
+module 0x42::test {
+    public(package) fun foo() {}
+}
+
+script {
+    fun main() {
+        0x42::test::foo()
+    }
+}
diff --git a/third_party/move/move-compiler-v2/tests/visibility-checker/visibility_complex.exp b/third_party/move/move-compiler-v2/tests/visibility-checker/visibility_complex.exp
new file mode 100644
index 0000000000000..6cf8b10e577f7
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/visibility-checker/visibility_complex.exp
@@ -0,0 +1,25 @@
+// -- Model dump before bytecode pipeline
+module 0x42::B {
+    friend fun foo() {
+        Tuple()
+    }
+} // end 0x42::B
+module 0x42::A {
+    friend fun foo() {
+        Tuple()
+    }
+} // end 0x42::A
+module 0x42::C {
+    friend fun foo() {
+        A::foo();
+        B::foo();
+        Tuple()
+    }
+} // end 0x42::C
+module 0x42::D {
+    friend fun bar() {
+        B::foo();
+        C::foo();
+        Tuple()
+    }
+} // end 0x42::D
diff --git a/third_party/move/move-compiler-v2/tests/visibility-checker/visibility_complex.move b/third_party/move/move-compiler-v2/tests/visibility-checker/visibility_complex.move
new file mode 100644
index 0000000000000..d3d85b905f7e6
--- /dev/null
+++ b/third_party/move/move-compiler-v2/tests/visibility-checker/visibility_complex.move
@@ -0,0 +1,23 @@
+module 0x42::A {
+	friend 0x42::C;
+	public(friend) fun foo() {}
+}
+
+module 0x42::B {
+	public(package) fun foo() {}
+}
+
+module 0x42::C {
+	friend 0x42::D;
+	public(friend) fun foo() {
+		0x42::A::foo();
+		0x42::B::foo();
+	}
+}
+
+module 0x42::D {
+	public(package) fun bar() {
+		0x42::B::foo();
+		0x42::C::foo();
+	}
+}
diff --git a/third_party/move/move-compiler-v2/tools/testdiff/src/main.rs b/third_party/move/move-compiler-v2/tools/testdiff/src/main.rs
index fb65193734ca6..1384458cb3422 100644
--- a/third_party/move/move-compiler-v2/tools/testdiff/src/main.rs
+++ b/third_party/move/move-compiler-v2/tools/testdiff/src/main.rs
@@ -71,6 +71,7 @@ static UNIT_PATH_REMAP: Lazy<Vec<(&'static str, &'static str)>> = Lazy::new(|| {
         ("reference-safety/v1-tests", "borrows"),
         ("reference-safety/v1-borrow-tests", "borrow_tests"),
         ("reference-safety/v1-locals", "locals"),
+        ("reference-safety/v1-typing", "typing"),
         ("friends/v1-tests", "naming"),
         ("uninit-use-checker/v1-commands", "commands"),
         ("uninit-use-checker/v1-locals", "locals"),
@@ -82,6 +83,7 @@ static UNIT_PATH_REMAP: Lazy<Vec<(&'static str, &'static str)>> = Lazy::new(|| {
         ("typing/v1-naming", "naming"),
         ("typing/v1-operators", "operators"),
         ("typing/v1-signer", "signer"),
+        ("typing/v1-examples", "examples"),
         ("live-var/v1-commands", "commands"),
         ("live-var", "liveness"),
         ("visibility-checker/v1-typing", "typing"),
@@ -96,14 +98,21 @@ static UNIT_PATH_REMAP: Lazy<Vec<(&'static str, &'static str)>> = Lazy::new(|| {
         ("acquires-checker/v1-borrow-tests", "borrow_tests"),
         ("attributes", "parser"),
         ("unit_test/notest", "unit_test"),
-        // Map file v2../unit_test/test/foo.move
-        //   to file v1../unit_test/foo.unit_test.move.
+        // Map file v2../unit_test/test/foo.exp
+        //   to file v1../unit_test/foo.unit_test.exp.
         ("unit_test/test", "unit_test.unit_test"),
+        ("unused-assignment/v1-locals", "locals"),
+        ("unused-assignment/v1-liveness", "liveness"),
+        ("unused-assignment/v1-commands", "commands"),
         ("checking-lang-v1/v1-typing", "typing"),
         ("ability-check/v1-typing", "typing"),
         ("ability-check/v1-signer", "signer"),
         ("ability-check/v1-borrow-tests", "commands"),
         ("ability-check/v1-locals", "locals"),
+        ("verification/noverify", "verification"),
+        // Map file v2../verification/verify/foo.exp
+        //   to file v1../verification/foo.verification.exp.
+        ("verification/verify", "verification.verification"),
     ]
 });
 
@@ -201,7 +210,7 @@ fn collect_tests(root: &str) -> anyhow::Result<BTreeSet<PathBuf>> {
         let path_str = path.display().to_string();
         if path_str.ends_with(".move") {
             result.insert(path);
-        } else if path_str.ends_with(".unit_test") {
+        } else if path_str.ends_with(".unit_test") || path_str.ends_with(".verification") {
             result.insert(PathBuf::from(format!("{}.{}", path_str, "move")));
         }
     }
diff --git a/third_party/move/move-compiler-v2/transactional-tests/tests/constants/large_vectors.no-optimize.exp b/third_party/move/move-compiler-v2/transactional-tests/tests/constants/large_vectors.no-optimize.exp
index 57268142aba56..6c0273afde077 100644
--- a/third_party/move/move-compiler-v2/transactional-tests/tests/constants/large_vectors.no-optimize.exp
+++ b/third_party/move/move-compiler-v2/transactional-tests/tests/constants/large_vectors.no-optimize.exp
@@ -3,36 +3,11 @@ comparison between v1 and v2 failed:
 = 
 + task 0 'publish'. lines 1-15:
 + Error: compilation errors:
-+  bug: BYTECODE VERIFICATION FAILED
++  bug: bytecode verification failed with unexpected status code `VALUE_STACK_OVERFLOW`. This is a compiler bug, consider reporting it.
 +   ┌─ TEMPFILE:5:24
 +   │
 + 5 │         let v = vector[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, 358, 359, 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371, 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, 384, 385, 386, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 419, 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, 431, 432, 433, 434, 435, 436, 437, 438, 439, 440, 441, 442, 443, 444, 445, 446, 447, 448, 449, 450, 451, 452, 453, 454, 455, 456, 457, 458, 459, 460, 461, 462, 463, 464, 465, 466, 467, 468, 469, 470, 471, 472, 473, 474, 475, 476, 477, 478, 479, 480, 481, 482, 483, 484, 485, 486, 487, 488, 489, 490, 491, 492, 493, 494, 495, 496, 497, 498, 499, 500, 501, 502, 503, 504, 505, 506, 507, 508, 509, 510, 511, 512, 513, 514, 515, 516, 517, 518, 519, 520, 521, 522, 523, 524, 525, 526, 527, 528, 529, 530, 531, 532, 533, 534, 535, 536, 537, 538, 539, 540, 541, 542, 543, 544, 545, 546, 547, 548, 549, 550, 551, 552, 553, 554, 555, 556, 557, 558, 559, 560, 561, 562, 563, 564, 565, 566, 567, 568, 569, 570, 571, 572, 573, 574, 575, 576, 577, 578, 579, 580, 581, 582, 583, 584, 585, 586, 587, 588, 589, 590, 591, 592, 593, 594, 595, 596, 597, 598, 599, 600, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 614, 615, 616, 617, 618, 619, 620, 621, 622, 623, 624, 625, 626, 627, 628, 629, 630, 631, 632, 633, 634, 635, 636, 637, 638, 639, 640, 641, 642, 643, 644, 645, 646, 647, 648, 649, 650, 651, 652, 653, 654, 655, 656, 657, 658, 659, 660, 661, 662, 663, 664, 665, 666, 667, 668, 669, 670, 671, 672, 673, 674, 675, 676, 677, 678, 679, 680, 681, 682, 683, 684, 685, 686, 687, 688, 689, 690, 691, 692, 693, 694, 695, 696, 697, 698, 699, 700, 701, 702, 703, 704, 705, 706, 707, 708, 709, 710, 711, 712, 713, 714, 715, 716, 717, 718, 719, 720, 721, 722, 723, 724, 725, 726, 727, 728, 729, 730, 731, 732, 733, 734, 735, 736, 737, 738, 739, 740, 741, 742, 743, 744, 745, 746, 747, 748, 749, 750, 751, 752, 753, 754, 755, 756, 757, 758, 759, 760, 761, 762, 763, 764, 765, 766, 767, 768, 769, 770, 771, 772, 773, 774, 775, 776, 777, 778, 779, 780, 781, 782, 783, 784, 785, 786, 787, 788, 789, 790, 791, 792, 793, 794, 795, 796, 797, 798, 799, 800, 801, 802, 803, 804, 805, 806, 807, 808, 809, 810, 811, 812, 813, 814, 815, 816, 817, 818, 819, 820, 821, 822, 823, 824, 825, 826, 827, 828, 829, 830, 831, 832, 833, 834, 835, 836, 837, 838, 839, 840, 841, 842, 843, 844, 845, 846, 847, 848, 849, 850, 851, 852, 853, 854, 855, 856, 857, 858, 859, 860, 861, 862, 863, 864, 865, 866, 867, 868, 869, 870, 871, 872, 873, 874, 875, 876, 877, 878, 879, 880, 881, 882, 883, 884, 885, 886, 887, 888, 889, 890, 891, 892, 893, 894, 895, 896, 897, 898, 899, 900, 901, 902, 903, 904, 905, 906, 907, 908, 909, 910, 911, 912, 913, 914, 915, 916, 917, 918, 919, 920, 921, 922, 923, 924, 925, 926, 927, 928, 929, 930, 931, 932, 933, 934, 935, 936, 937, 938, 939, 940, 941, 942, 943, 944, 945, 946, 947, 948, 949, 950, 951, 952, 953, 954, 955, 956, 957, 958, 959, 960, 961, 962, 963, 964, 965, 966, 967, 968, 969, 970, 971, 972, 973, 974, 975, 976, 977, 978, 979, 980, 981, 982, 983, 984, 985, 986, 987, 988, 989, 990, 991, 992, 993, 994, 995, 996, 997, 998, 999, 1000, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017, 1018, 1019, 1020, 1021, 1022, 1023, 1024, 1025, 1026];
-+   │                        ^ ICE failed bytecode verifier: VMError {
-+     major_status: VALUE_STACK_OVERFLOW,
-+     sub_status: None,
-+     message: None,
-+     exec_state: None,
-+     location: Module(
-+         ModuleId {
-+             address: 0000000000000000000000000000000000000000000000000000000000c0ffee,
-+             name: Identifier(
-+                 "m",
-+             ),
-+         },
-+     ),
-+     indices: [
-+         (
-+             FunctionDefinition,
-+             0,
-+         ),
-+     ],
-+     offsets: [
-+         (
-+             FunctionDefinitionIndex(0),
-+             0,
-+         ),
-+     ],
-+ }
++   │                        ^
 + 
 + 
 + 
diff --git a/third_party/move/move-compiler-v2/transactional-tests/tests/constants/large_vectors.optimize-no-simplify.exp b/third_party/move/move-compiler-v2/transactional-tests/tests/constants/large_vectors.optimize-no-simplify.exp
index 57268142aba56..6c0273afde077 100644
--- a/third_party/move/move-compiler-v2/transactional-tests/tests/constants/large_vectors.optimize-no-simplify.exp
+++ b/third_party/move/move-compiler-v2/transactional-tests/tests/constants/large_vectors.optimize-no-simplify.exp
@@ -3,36 +3,11 @@ comparison between v1 and v2 failed:
 = 
 + task 0 'publish'. lines 1-15:
 + Error: compilation errors:
-+  bug: BYTECODE VERIFICATION FAILED
++  bug: bytecode verification failed with unexpected status code `VALUE_STACK_OVERFLOW`. This is a compiler bug, consider reporting it.
 +   ┌─ TEMPFILE:5:24
 +   │
 + 5 │         let v = vector[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, 358, 359, 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371, 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, 384, 385, 386, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 419, 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, 431, 432, 433, 434, 435, 436, 437, 438, 439, 440, 441, 442, 443, 444, 445, 446, 447, 448, 449, 450, 451, 452, 453, 454, 455, 456, 457, 458, 459, 460, 461, 462, 463, 464, 465, 466, 467, 468, 469, 470, 471, 472, 473, 474, 475, 476, 477, 478, 479, 480, 481, 482, 483, 484, 485, 486, 487, 488, 489, 490, 491, 492, 493, 494, 495, 496, 497, 498, 499, 500, 501, 502, 503, 504, 505, 506, 507, 508, 509, 510, 511, 512, 513, 514, 515, 516, 517, 518, 519, 520, 521, 522, 523, 524, 525, 526, 527, 528, 529, 530, 531, 532, 533, 534, 535, 536, 537, 538, 539, 540, 541, 542, 543, 544, 545, 546, 547, 548, 549, 550, 551, 552, 553, 554, 555, 556, 557, 558, 559, 560, 561, 562, 563, 564, 565, 566, 567, 568, 569, 570, 571, 572, 573, 574, 575, 576, 577, 578, 579, 580, 581, 582, 583, 584, 585, 586, 587, 588, 589, 590, 591, 592, 593, 594, 595, 596, 597, 598, 599, 600, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 614, 615, 616, 617, 618, 619, 620, 621, 622, 623, 624, 625, 626, 627, 628, 629, 630, 631, 632, 633, 634, 635, 636, 637, 638, 639, 640, 641, 642, 643, 644, 645, 646, 647, 648, 649, 650, 651, 652, 653, 654, 655, 656, 657, 658, 659, 660, 661, 662, 663, 664, 665, 666, 667, 668, 669, 670, 671, 672, 673, 674, 675, 676, 677, 678, 679, 680, 681, 682, 683, 684, 685, 686, 687, 688, 689, 690, 691, 692, 693, 694, 695, 696, 697, 698, 699, 700, 701, 702, 703, 704, 705, 706, 707, 708, 709, 710, 711, 712, 713, 714, 715, 716, 717, 718, 719, 720, 721, 722, 723, 724, 725, 726, 727, 728, 729, 730, 731, 732, 733, 734, 735, 736, 737, 738, 739, 740, 741, 742, 743, 744, 745, 746, 747, 748, 749, 750, 751, 752, 753, 754, 755, 756, 757, 758, 759, 760, 761, 762, 763, 764, 765, 766, 767, 768, 769, 770, 771, 772, 773, 774, 775, 776, 777, 778, 779, 780, 781, 782, 783, 784, 785, 786, 787, 788, 789, 790, 791, 792, 793, 794, 795, 796, 797, 798, 799, 800, 801, 802, 803, 804, 805, 806, 807, 808, 809, 810, 811, 812, 813, 814, 815, 816, 817, 818, 819, 820, 821, 822, 823, 824, 825, 826, 827, 828, 829, 830, 831, 832, 833, 834, 835, 836, 837, 838, 839, 840, 841, 842, 843, 844, 845, 846, 847, 848, 849, 850, 851, 852, 853, 854, 855, 856, 857, 858, 859, 860, 861, 862, 863, 864, 865, 866, 867, 868, 869, 870, 871, 872, 873, 874, 875, 876, 877, 878, 879, 880, 881, 882, 883, 884, 885, 886, 887, 888, 889, 890, 891, 892, 893, 894, 895, 896, 897, 898, 899, 900, 901, 902, 903, 904, 905, 906, 907, 908, 909, 910, 911, 912, 913, 914, 915, 916, 917, 918, 919, 920, 921, 922, 923, 924, 925, 926, 927, 928, 929, 930, 931, 932, 933, 934, 935, 936, 937, 938, 939, 940, 941, 942, 943, 944, 945, 946, 947, 948, 949, 950, 951, 952, 953, 954, 955, 956, 957, 958, 959, 960, 961, 962, 963, 964, 965, 966, 967, 968, 969, 970, 971, 972, 973, 974, 975, 976, 977, 978, 979, 980, 981, 982, 983, 984, 985, 986, 987, 988, 989, 990, 991, 992, 993, 994, 995, 996, 997, 998, 999, 1000, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017, 1018, 1019, 1020, 1021, 1022, 1023, 1024, 1025, 1026];
-+   │                        ^ ICE failed bytecode verifier: VMError {
-+     major_status: VALUE_STACK_OVERFLOW,
-+     sub_status: None,
-+     message: None,
-+     exec_state: None,
-+     location: Module(
-+         ModuleId {
-+             address: 0000000000000000000000000000000000000000000000000000000000c0ffee,
-+             name: Identifier(
-+                 "m",
-+             ),
-+         },
-+     ),
-+     indices: [
-+         (
-+             FunctionDefinition,
-+             0,
-+         ),
-+     ],
-+     offsets: [
-+         (
-+             FunctionDefinitionIndex(0),
-+             0,
-+         ),
-+     ],
-+ }
++   │                        ^
 + 
 + 
 + 
diff --git a/third_party/move/move-compiler-v2/transactional-tests/tests/inlining/shadowing_renamed.exp b/third_party/move/move-compiler-v2/transactional-tests/tests/inlining/shadowing_renamed.exp
index 3504b5c31c5bd..dc09697dd69eb 100644
--- a/third_party/move/move-compiler-v2/transactional-tests/tests/inlining/shadowing_renamed.exp
+++ b/third_party/move/move-compiler-v2/transactional-tests/tests/inlining/shadowing_renamed.exp
@@ -1,14 +1,15 @@
 comparison between v1 and v2 failed:
-- processed 2 tasks
-- 
-- task 0 'publish'. lines 1-19:
+= processed 2 tasks
+= 
+= task 0 'publish'. lines 1-19:
 - warning[W09003]: unused assignment
 -   ┌─ TEMPFILE:8:13
--   │
-- 8 │         let x = 1;
++ warning: Unused assignment to `x`. Consider removing or prefixing with an underscore: `_x`
++   ┌─ TEMPFILE:8:17
+=   │
+= 8 │         let x = 1;
 -   │             ^ Unused assignment or binding for local 'x'. Consider removing, replacing with '_', or prefixing with '_' (e.g., '_x')
-- 
-- 
-- 
-+ processed 2 tasks
-+ 
++   │                 ^
+= 
+= 
+= 
diff --git a/third_party/move/move-compiler-v2/transactional-tests/tests/inlining/shadowing_renamed_param.exp b/third_party/move/move-compiler-v2/transactional-tests/tests/inlining/shadowing_renamed_param.exp
index d14d8c03995e3..968bf96261b93 100644
--- a/third_party/move/move-compiler-v2/transactional-tests/tests/inlining/shadowing_renamed_param.exp
+++ b/third_party/move/move-compiler-v2/transactional-tests/tests/inlining/shadowing_renamed_param.exp
@@ -1,14 +1,15 @@
 comparison between v1 and v2 failed:
-- processed 2 tasks
-- 
-- task 0 'publish'. lines 1-46:
+= processed 2 tasks
+= 
+= task 0 'publish'. lines 1-46:
 - warning[W09003]: unused assignment
 -    ┌─ TEMPFILE:23:13
--    │
-- 23 │         let x = q;
++ warning: Unused assignment to `x`. Consider removing or prefixing with an underscore: `_x`
++    ┌─ TEMPFILE:23:17
+=    │
+= 23 │         let x = q;
 -    │             ^ Unused assignment or binding for local 'x'. Consider removing, replacing with '_', or prefixing with '_' (e.g., '_x')
-- 
-- 
-- 
-+ processed 2 tasks
-+ 
++    │                 ^
+= 
+= 
+= 
diff --git a/third_party/move/move-compiler-v2/transactional-tests/tests/misc/bug_14243_stack_size.move b/third_party/move/move-compiler-v2/transactional-tests/tests/misc/bug_14243_stack_size.move
new file mode 100644
index 0000000000000..0b3b0d274a86f
--- /dev/null
+++ b/third_party/move/move-compiler-v2/transactional-tests/tests/misc/bug_14243_stack_size.move
@@ -0,0 +1,14 @@
+// TODO(#14243)
+//# print-bytecode --input=module
+module 0xc0ffee::m {
+   fun id_mut<T>(r: &mut T): &mut T {
+        r
+    }
+
+    fun t0() {
+        let x = &mut 0;
+        let y = id_mut(x);
+        *y;
+        *x;
+    }
+}
diff --git a/third_party/move/move-compiler-v2/transactional-tests/tests/misc/bug_14243_stack_size.no-optimize.exp b/third_party/move/move-compiler-v2/transactional-tests/tests/misc/bug_14243_stack_size.no-optimize.exp
new file mode 100644
index 0000000000000..c9e006770cba4
--- /dev/null
+++ b/third_party/move/move-compiler-v2/transactional-tests/tests/misc/bug_14243_stack_size.no-optimize.exp
@@ -0,0 +1,47 @@
+comparison between v1 and v2 failed:
+= processed 1 task
+= 
+= task 0 'print-bytecode'. lines 2-14:
+- // Move bytecode v6
++ // Move bytecode v7
+= module c0ffee.m {
+= 
+= 
+= id_mut<Ty0>(Arg0: &mut Ty0): &mut Ty0 /* def_idx: 0 */ {
++ L1:	loc0: &mut Ty0
+= B0:
+= 	0: MoveLoc[0](Arg0: &mut Ty0)
+- 	1: Ret
++ 	1: StLoc[1](loc0: &mut Ty0)
++ 	2: MoveLoc[1](loc0: &mut Ty0)
++ 	3: Ret
+= }
+= t0() /* def_idx: 1 */ {
+= L0:	loc0: u64
+= L1:	loc1: &mut u64
++ L2:	loc2: &mut u64
+= B0:
+= 	0: LdU64(0)
+= 	1: StLoc[0](loc0: u64)
+= 	2: MutBorrowLoc[0](loc0: u64)
+= 	3: StLoc[1](loc1: &mut u64)
+= 	4: CopyLoc[1](loc1: &mut u64)
+- 	5: Call id_mut<u64>(&mut u64): &mut u64
+- 	6: ReadRef
+- 	7: Pop
+- 	8: MoveLoc[1](loc1: &mut u64)
+- 	9: ReadRef
+- 	10: Pop
+- 	11: Ret
++ 	5: StLoc[2](loc2: &mut u64)
++ 	6: MoveLoc[2](loc2: &mut u64)
++ 	7: Call id_mut<u64>(&mut u64): &mut u64
++ 	8: ReadRef
++ 	9: MoveLoc[1](loc1: &mut u64)
++ 	10: ReadRef
++ 	11: Pop
++ 	12: Pop
++ 	13: Ret
+= }
+= }
+= 
diff --git a/third_party/move/move-compiler-v2/transactional-tests/tests/misc/bug_14243_stack_size.optimize-no-simplify.exp b/third_party/move/move-compiler-v2/transactional-tests/tests/misc/bug_14243_stack_size.optimize-no-simplify.exp
new file mode 100644
index 0000000000000..91e1a5328d361
--- /dev/null
+++ b/third_party/move/move-compiler-v2/transactional-tests/tests/misc/bug_14243_stack_size.optimize-no-simplify.exp
@@ -0,0 +1,37 @@
+comparison between v1 and v2 failed:
+= processed 1 task
+= 
+= task 0 'print-bytecode'. lines 2-14:
+- // Move bytecode v6
++ // Move bytecode v7
+= module c0ffee.m {
+= 
+= 
+= id_mut<Ty0>(Arg0: &mut Ty0): &mut Ty0 /* def_idx: 0 */ {
+= B0:
+= 	0: MoveLoc[0](Arg0: &mut Ty0)
+= 	1: Ret
+= }
+= t0() /* def_idx: 1 */ {
+= L0:	loc0: u64
+= L1:	loc1: &mut u64
++ L2:	loc2: &mut u64
+= B0:
+= 	0: LdU64(0)
+= 	1: StLoc[0](loc0: u64)
+= 	2: MutBorrowLoc[0](loc0: u64)
+= 	3: StLoc[1](loc1: &mut u64)
+= 	4: CopyLoc[1](loc1: &mut u64)
+= 	5: Call id_mut<u64>(&mut u64): &mut u64
+= 	6: ReadRef
+- 	7: Pop
+- 	8: MoveLoc[1](loc1: &mut u64)
+- 	9: ReadRef
++ 	7: MoveLoc[1](loc1: &mut u64)
++ 	8: ReadRef
++ 	9: Pop
+= 	10: Pop
+= 	11: Ret
+= }
+= }
+= 
diff --git a/third_party/move/move-compiler-v2/transactional-tests/tests/misc/bug_14243_stack_size.optimize.exp b/third_party/move/move-compiler-v2/transactional-tests/tests/misc/bug_14243_stack_size.optimize.exp
new file mode 100644
index 0000000000000..91e1a5328d361
--- /dev/null
+++ b/third_party/move/move-compiler-v2/transactional-tests/tests/misc/bug_14243_stack_size.optimize.exp
@@ -0,0 +1,37 @@
+comparison between v1 and v2 failed:
+= processed 1 task
+= 
+= task 0 'print-bytecode'. lines 2-14:
+- // Move bytecode v6
++ // Move bytecode v7
+= module c0ffee.m {
+= 
+= 
+= id_mut<Ty0>(Arg0: &mut Ty0): &mut Ty0 /* def_idx: 0 */ {
+= B0:
+= 	0: MoveLoc[0](Arg0: &mut Ty0)
+= 	1: Ret
+= }
+= t0() /* def_idx: 1 */ {
+= L0:	loc0: u64
+= L1:	loc1: &mut u64
++ L2:	loc2: &mut u64
+= B0:
+= 	0: LdU64(0)
+= 	1: StLoc[0](loc0: u64)
+= 	2: MutBorrowLoc[0](loc0: u64)
+= 	3: StLoc[1](loc1: &mut u64)
+= 	4: CopyLoc[1](loc1: &mut u64)
+= 	5: Call id_mut<u64>(&mut u64): &mut u64
+= 	6: ReadRef
+- 	7: Pop
+- 	8: MoveLoc[1](loc1: &mut u64)
+- 	9: ReadRef
++ 	7: MoveLoc[1](loc1: &mut u64)
++ 	8: ReadRef
++ 	9: Pop
+= 	10: Pop
+= 	11: Ret
+= }
+= }
+= 
diff --git a/third_party/move/move-compiler-v2/transactional-tests/tests/misc/struct_assign_swap.exp b/third_party/move/move-compiler-v2/transactional-tests/tests/misc/struct_assign_swap.exp
index 22c8628d19fe1..4ba64b1433cc0 100644
--- a/third_party/move/move-compiler-v2/transactional-tests/tests/misc/struct_assign_swap.exp
+++ b/third_party/move/move-compiler-v2/transactional-tests/tests/misc/struct_assign_swap.exp
@@ -1,9 +1,15 @@
-processed 3 tasks
+processed 5 tasks
 
-task 1 'run'. lines 25-25:
+task 1 'run'. lines 43-43:
 return values: 2, 1
 
-task 2 'run'. lines 27-27:
+task 2 'run'. lines 45-45:
 return values: 55, 44
 
+task 3 'run'. lines 47-47:
+return values: 2, 1
+
+task 4 'run'. lines 49-49:
+return values: 2, 1
+
 ==> Compiler v2 delivered same results!
diff --git a/third_party/move/move-compiler-v2/transactional-tests/tests/misc/struct_assign_swap.move b/third_party/move/move-compiler-v2/transactional-tests/tests/misc/struct_assign_swap.move
index dbc71d497f38e..b34d11454b033 100644
--- a/third_party/move/move-compiler-v2/transactional-tests/tests/misc/struct_assign_swap.move
+++ b/third_party/move/move-compiler-v2/transactional-tests/tests/misc/struct_assign_swap.move
@@ -13,15 +13,37 @@ module 0xc0ffee::m {
     fun swap2(): (u32, u32) {
         let x = 44;
         let y = 55;
-        let S { f: x, g: y } = S { f: y, g: x };
+        let S { f: _x, g: _y } = S { f: y, g: x };
+        (_x, _y)
+    }
+
+    fun swap3(x: u32, y: u32): (u32, u32) {
+        let S { f: y, g: x } = S { f: x, g: y };
         (x, y)
     }
 
+    fun swap4(f: u32, g: u32): (u32, u32) {
+        let S { f: g, g: f } = S { f: f, g: g };
+        (f, g)
+    }
+
     fun test1(): (u32, u32) {
         swap1(1, 2)
     }
+
+    fun test3(): (u32, u32) {
+        swap3(1, 2)
+    }
+
+    fun test4(): (u32, u32) {
+        swap4(1, 2)
+    }
 }
 
 //# run 0xc0ffee::m::test1
 
 //# run 0xc0ffee::m::swap2
+
+//# run 0xc0ffee::m::test3
+
+//# run 0xc0ffee::m::test4
diff --git a/third_party/move/move-compiler-v2/transactional-tests/tests/misc/write_ref_dest.move b/third_party/move/move-compiler-v2/transactional-tests/tests/misc/write_ref_dest.move
index 9eec374c2fa60..a485c7abc639d 100644
--- a/third_party/move/move-compiler-v2/transactional-tests/tests/misc/write_ref_dest.move
+++ b/third_party/move/move-compiler-v2/transactional-tests/tests/misc/write_ref_dest.move
@@ -20,6 +20,6 @@ module 0x42::m {
 
 }
 
-//# run 0x42::m::test_call --check-runtime-types
+//# run 0x42::m::test_call
 
-//# run 0x42::m::test_assign --check-runtime-types
+//# run 0x42::m::test_assign
diff --git a/third_party/move/move-compiler-v2/transactional-tests/tests/no-v1-comparison/enum/enum_field_select.move b/third_party/move/move-compiler-v2/transactional-tests/tests/no-v1-comparison/enum/enum_field_select.move
new file mode 100644
index 0000000000000..06382f7161d17
--- /dev/null
+++ b/third_party/move/move-compiler-v2/transactional-tests/tests/no-v1-comparison/enum/enum_field_select.move
@@ -0,0 +1,43 @@
+//# publish
+module 0x42::m {
+
+  enum Data has drop {
+    V1{x: u64},
+    V2{x: u64, y: bool}
+  }
+
+  fun get_y(self: &Data): bool {
+    match (self) {
+      V2{x: _, y} => *y,
+      _ => abort 33
+    }
+  }
+
+  fun test_get_x_v1(): u64 {
+    let d = Data::V1{x: 43};
+    d.x
+  }
+
+  fun test_get_x_v2(): u64 {
+    let d = Data::V2{x: 43, y: false};
+    d.x
+  }
+
+  fun test_get_y_v1(): bool {
+    let d = Data::V1{x: 43};
+    d.get_y()
+  }
+
+  fun test_get_y_v2(): bool {
+    let d = Data::V2{x: 43, y: true};
+    d.get_y()
+  }
+}
+
+//# run 0x42::m::test_get_x_v1
+
+//# run 0x42::m::test_get_x_v2
+
+//# run 0x42::m::test_get_y_v1
+
+//# run 0x42::m::test_get_y_v2
diff --git a/third_party/move/move-compiler-v2/transactional-tests/tests/no-v1-comparison/enum/enum_field_select.no-optimize.exp b/third_party/move/move-compiler-v2/transactional-tests/tests/no-v1-comparison/enum/enum_field_select.no-optimize.exp
new file mode 100644
index 0000000000000..fc020d774df59
--- /dev/null
+++ b/third_party/move/move-compiler-v2/transactional-tests/tests/no-v1-comparison/enum/enum_field_select.no-optimize.exp
@@ -0,0 +1,19 @@
+processed 5 tasks
+
+task 1 'run'. lines 37-37:
+return values: 43
+
+task 2 'run'. lines 39-39:
+return values: 43
+
+task 3 'run'. lines 41-41:
+Error: Function execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(33),
+    location: 0x42::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 13)],
+}
+
+task 4 'run'. lines 43-43:
+return values: true
diff --git a/third_party/move/move-compiler-v2/transactional-tests/tests/no-v1-comparison/enum/enum_field_select.optimize-no-simplify.exp b/third_party/move/move-compiler-v2/transactional-tests/tests/no-v1-comparison/enum/enum_field_select.optimize-no-simplify.exp
new file mode 100644
index 0000000000000..fdb1dbad56255
--- /dev/null
+++ b/third_party/move/move-compiler-v2/transactional-tests/tests/no-v1-comparison/enum/enum_field_select.optimize-no-simplify.exp
@@ -0,0 +1,19 @@
+processed 5 tasks
+
+task 1 'run'. lines 37-37:
+return values: 43
+
+task 2 'run'. lines 39-39:
+return values: 43
+
+task 3 'run'. lines 41-41:
+Error: Function execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(33),
+    location: 0x42::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 11)],
+}
+
+task 4 'run'. lines 43-43:
+return values: true
diff --git a/third_party/move/move-compiler-v2/transactional-tests/tests/no-v1-comparison/enum/enum_field_select.optimize.exp b/third_party/move/move-compiler-v2/transactional-tests/tests/no-v1-comparison/enum/enum_field_select.optimize.exp
new file mode 100644
index 0000000000000..fdb1dbad56255
--- /dev/null
+++ b/third_party/move/move-compiler-v2/transactional-tests/tests/no-v1-comparison/enum/enum_field_select.optimize.exp
@@ -0,0 +1,19 @@
+processed 5 tasks
+
+task 1 'run'. lines 37-37:
+return values: 43
+
+task 2 'run'. lines 39-39:
+return values: 43
+
+task 3 'run'. lines 41-41:
+Error: Function execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(33),
+    location: 0x42::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 11)],
+}
+
+task 4 'run'. lines 43-43:
+return values: true
diff --git a/third_party/move/move-compiler-v2/transactional-tests/tests/no-v1-comparison/enum/enum_field_select_different_offsets.exp b/third_party/move/move-compiler-v2/transactional-tests/tests/no-v1-comparison/enum/enum_field_select_different_offsets.exp
new file mode 100644
index 0000000000000..1352cb7967ab0
--- /dev/null
+++ b/third_party/move/move-compiler-v2/transactional-tests/tests/no-v1-comparison/enum/enum_field_select_different_offsets.exp
@@ -0,0 +1,31 @@
+processed 7 tasks
+
+task 1 'run'. lines 42-42:
+return values: 43
+
+task 2 'run'. lines 44-44:
+return values: 43
+
+task 3 'run'. lines 46-46:
+return values: 43
+
+task 4 'run'. lines 48-48:
+Error: Function execution failed with VMError: {
+    major_status: STRUCT_VARIANT_MISMATCH,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(3), 4)],
+}
+
+task 5 'run'. lines 50-50:
+return values: true
+
+task 6 'run'. lines 52-52:
+Error: Function execution failed with VMError: {
+    major_status: STRUCT_VARIANT_MISMATCH,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(5), 5)],
+}
diff --git a/third_party/move/move-compiler-v2/transactional-tests/tests/no-v1-comparison/enum/enum_field_select_different_offsets.move b/third_party/move/move-compiler-v2/transactional-tests/tests/no-v1-comparison/enum/enum_field_select_different_offsets.move
new file mode 100644
index 0000000000000..e50807d826679
--- /dev/null
+++ b/third_party/move/move-compiler-v2/transactional-tests/tests/no-v1-comparison/enum/enum_field_select_different_offsets.move
@@ -0,0 +1,52 @@
+//# publish
+module 0x42::m {
+
+  enum Data has drop {
+    V1{x: u64},
+    V2{y: bool, x: u64}
+    V3{z: u8, x: u64}
+  }
+
+  fun test_get_x_v1(): u64 {
+    let d = Data::V1{x: 43};
+    d.x
+  }
+
+  fun test_get_x_v2(): u64 {
+    let d = Data::V2{x: 43, y: false};
+    d.x
+  }
+
+  fun test_get_x_v3(): u64 {
+    let d = Data::V3{z: 1, x: 43};
+    d.x
+  }
+
+  fun test_get_y_v1(): bool {
+    let d = Data::V1{x: 43};
+    d.y
+  }
+
+  fun test_get_y_v2(): bool {
+    let d = Data::V2{x: 43, y: true};
+    d.y
+  }
+
+  fun test_get_y_v3(): bool {
+    let d = Data::V3{x: 43, z: 1};
+    d.y
+  }
+
+}
+
+//# run 0x42::m::test_get_x_v1
+
+//# run 0x42::m::test_get_x_v2
+
+//# run 0x42::m::test_get_x_v3
+
+//# run 0x42::m::test_get_y_v1
+
+//# run 0x42::m::test_get_y_v2
+
+//# run 0x42::m::test_get_y_v3
diff --git a/third_party/move/move-compiler-v2/transactional-tests/tests/no-v1-comparison/enum/enum_field_select_different_offsets.no-optimize.exp b/third_party/move/move-compiler-v2/transactional-tests/tests/no-v1-comparison/enum/enum_field_select_different_offsets.no-optimize.exp
new file mode 100644
index 0000000000000..69190b974ae0f
--- /dev/null
+++ b/third_party/move/move-compiler-v2/transactional-tests/tests/no-v1-comparison/enum/enum_field_select_different_offsets.no-optimize.exp
@@ -0,0 +1,31 @@
+processed 7 tasks
+
+task 1 'run'. lines 42-42:
+return values: 43
+
+task 2 'run'. lines 44-44:
+return values: 43
+
+task 3 'run'. lines 46-46:
+return values: 43
+
+task 4 'run'. lines 48-48:
+Error: Function execution failed with VMError: {
+    major_status: STRUCT_VARIANT_MISMATCH,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(3), 4)],
+}
+
+task 5 'run'. lines 50-50:
+return values: true
+
+task 6 'run'. lines 52-52:
+Error: Function execution failed with VMError: {
+    major_status: STRUCT_VARIANT_MISMATCH,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(5), 9)],
+}
diff --git a/third_party/move/move-compiler-v2/transactional-tests/tests/no-v1-comparison/enum/enum_field_select_different_offsets.optimize-no-simplify.exp b/third_party/move/move-compiler-v2/transactional-tests/tests/no-v1-comparison/enum/enum_field_select_different_offsets.optimize-no-simplify.exp
new file mode 100644
index 0000000000000..69190b974ae0f
--- /dev/null
+++ b/third_party/move/move-compiler-v2/transactional-tests/tests/no-v1-comparison/enum/enum_field_select_different_offsets.optimize-no-simplify.exp
@@ -0,0 +1,31 @@
+processed 7 tasks
+
+task 1 'run'. lines 42-42:
+return values: 43
+
+task 2 'run'. lines 44-44:
+return values: 43
+
+task 3 'run'. lines 46-46:
+return values: 43
+
+task 4 'run'. lines 48-48:
+Error: Function execution failed with VMError: {
+    major_status: STRUCT_VARIANT_MISMATCH,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(3), 4)],
+}
+
+task 5 'run'. lines 50-50:
+return values: true
+
+task 6 'run'. lines 52-52:
+Error: Function execution failed with VMError: {
+    major_status: STRUCT_VARIANT_MISMATCH,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(5), 9)],
+}
diff --git a/third_party/move/move-compiler-v2/transactional-tests/tests/no-v1-comparison/enum/enum_field_select_different_offsets.optimize.exp b/third_party/move/move-compiler-v2/transactional-tests/tests/no-v1-comparison/enum/enum_field_select_different_offsets.optimize.exp
new file mode 100644
index 0000000000000..1352cb7967ab0
--- /dev/null
+++ b/third_party/move/move-compiler-v2/transactional-tests/tests/no-v1-comparison/enum/enum_field_select_different_offsets.optimize.exp
@@ -0,0 +1,31 @@
+processed 7 tasks
+
+task 1 'run'. lines 42-42:
+return values: 43
+
+task 2 'run'. lines 44-44:
+return values: 43
+
+task 3 'run'. lines 46-46:
+return values: 43
+
+task 4 'run'. lines 48-48:
+Error: Function execution failed with VMError: {
+    major_status: STRUCT_VARIANT_MISMATCH,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(3), 4)],
+}
+
+task 5 'run'. lines 50-50:
+return values: true
+
+task 6 'run'. lines 52-52:
+Error: Function execution failed with VMError: {
+    major_status: STRUCT_VARIANT_MISMATCH,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(5), 5)],
+}
diff --git a/third_party/move/move-compiler-v2/transactional-tests/tests/no-v1-comparison/enum/enum_matching.exp b/third_party/move/move-compiler-v2/transactional-tests/tests/no-v1-comparison/enum/enum_matching.exp
new file mode 100644
index 0000000000000..3e25bc6106615
--- /dev/null
+++ b/third_party/move/move-compiler-v2/transactional-tests/tests/no-v1-comparison/enum/enum_matching.exp
@@ -0,0 +1,43 @@
+processed 15 tasks
+
+task 1 'run'. lines 175-175:
+return values: true
+
+task 2 'run'. lines 177-177:
+return values: false
+
+task 3 'run'. lines 179-179:
+return values: 7
+
+task 4 'run'. lines 181-181:
+return values: 0
+
+task 5 'run'. lines 183-183:
+return values: 3
+
+task 6 'run'. lines 185-185:
+return values: 8
+
+task 7 'run'. lines 187-187:
+return values: 27
+
+task 8 'run'. lines 189-189:
+return values: 12
+
+task 9 'run'. lines 191-191:
+return values: 1
+
+task 10 'run'. lines 193-193:
+return values: true
+
+task 11 'run'. lines 195-195:
+return values: false
+
+task 12 'run'. lines 197-197:
+return values: true
+
+task 13 'run'. lines 199-199:
+return values: false
+
+task 14 'run'. lines 201-201:
+return values: true
diff --git a/third_party/move/move-compiler-v2/transactional-tests/tests/no-v1-comparison/enum/enum_matching.move b/third_party/move/move-compiler-v2/transactional-tests/tests/no-v1-comparison/enum/enum_matching.move
new file mode 100644
index 0000000000000..a20260e81dc5a
--- /dev/null
+++ b/third_party/move/move-compiler-v2/transactional-tests/tests/no-v1-comparison/enum/enum_matching.move
@@ -0,0 +1,201 @@
+//# publish
+module 0x42::m {
+
+    enum Inner has drop {
+        Inner1{ x: u64 }
+        Inner2{ x: u64, y: u64 }
+    }
+
+    struct Box has drop {
+        x: u64
+    }
+
+    enum Outer has drop {
+        None,
+        One{i: Inner},
+        Two{i: Inner, b: Box},
+    }
+
+    /// Simple matching
+    public fun inner_value(self: Inner): u64 {
+        match (self) {
+            Inner1{x} => x,
+            Inner2{x, y} => x + y
+        }
+    }
+
+    /// Matching with wildcard and reference
+    public fun is_inner1(self: &Inner): bool {
+        match (self) {
+            Inner1{x: _} => true,
+            _ => false
+        }
+    }
+
+    /// Matching which delegates ownership
+    public fun outer_value(o: Outer): u64 {
+        match (o) {
+            None => 0,
+            // `i` is moved and consumed by `inner_value`
+            One{i} => i.inner_value(),
+            Two{i, b} => i.inner_value() + b.x
+        }
+    }
+
+    /// Nested matching with delegation
+    public fun outer_value_nested(o: Outer): u64 {
+        match (o) {
+            None => 0,
+            // Nested match will require multiple probing steps
+            One{i: Inner::Inner1{x}} => x,
+            One{i} => i.inner_value(),
+            Two{i, b} => i.inner_value() + b.x
+        }
+    }
+
+    /// Matching with condition
+    public fun outer_value_with_cond(o: Outer): u64 {
+        match (o) {
+            None => 0,
+            // Match with condition requires probing and conversion from 'Deref(Borrow(x))` to `x`.
+            One{i} if i.is_inner1() => i.inner_value() % 2,
+            One{i} => i.inner_value(),
+            Two{i, b} => i.inner_value() + b.x
+        }
+    }
+
+    /// Matching with condition with references and wildcard
+    public fun outer_value_with_cond_ref(o: &Outer): bool {
+        match (o) {
+            None => false,
+            One{i} if i.is_inner1() => true,
+            One{i} => i.is_inner1(),
+            Two{i, b: _} => i.is_inner1()
+        }
+    }
+
+    /// Matching with abilities and generics
+    enum Option<A> has drop {
+        None,
+        Some{value: A}
+    }
+
+    public fun is_some<A>(x: &Option<A>): bool {
+        match (x) {
+            None => false,
+            Some{value: _} => true
+        }
+    }
+
+    public fun is_some_specialized(x: &Option<Option<u64>>): bool {
+        match (x) {
+            None => false,
+            Some{value: Option::None} => false,
+            Some{value: Option::Some{value: _}} => true,
+        }
+    }
+
+    public fun is_some_dropped<A:drop>(x: Option<A>): bool {
+        match (x) {
+            None => false,
+            _ => true
+        }
+    }
+
+    // Common fields
+    enum CommonFields {
+        Foo{x: u64, y: u64},
+        Bar{z: u64, x: u64}
+    }
+
+    fun select_common_fields(s: CommonFields): u64 {
+        s.x + (match (s) { Foo{x: _, y} => y, Bar{z, x: _} => z })
+    }
+
+    // -------------------
+    // Test entry points
+
+    fun t1_is_inner1(): bool {
+        is_inner1(&Inner::Inner1{x: 2})
+    }
+
+    fun t2_is_inner1(): bool {
+        is_inner1(&Inner::Inner2{x: 2, y: 3})
+    }
+
+    fun t1_inner_value(): u64 {
+        inner_value(Inner::Inner2{x: 2, y: 5})
+    }
+
+    fun t1_outer_value(): u64 {
+        outer_value(Outer::None{})
+    }
+
+    fun t2_outer_value(): u64 {
+        outer_value(Outer::One{i: Inner::Inner2{x: 1, y: 2}})
+    }
+
+    fun t3_outer_value(): u64 {
+        outer_value(Outer::Two{i: Inner::Inner1{x: 1}, b: Box{x: 7}})
+    }
+
+    fun t1_outer_value_nested(): u64 {
+        outer_value_nested(Outer::One{i: Inner::Inner1{x: 27}})
+    }
+
+    fun t2_outer_value_nested(): u64 {
+        outer_value_nested(Outer::Two{i: Inner::Inner1{x: 5}, b: Box{x: 7}})
+    }
+
+    fun t1_outer_value_with_cond(): u64 {
+        outer_value_with_cond(Outer::One{i: Inner::Inner1{x: 43}})
+    }
+
+    fun t1_outer_value_with_cond_ref(): bool {
+        outer_value_with_cond_ref(&Outer::One{i: Inner::Inner1{x: 43}})
+    }
+
+    fun t1_is_some(): bool {
+        is_some(&Option::None<u64>{})
+    }
+
+    fun t2_is_some(): bool {
+        is_some(&Option::Some{value: 3})
+    }
+
+    fun t1_is_some_specialized(): bool {
+        is_some_specialized(&Option::Some{value: Option::None{}})
+    }
+
+    fun t2_is_some_specialized(): bool {
+        is_some_specialized(&Option::Some{value: Option::Some{value: 1}})
+    }
+}
+
+//# run 0x42::m::t1_is_inner1
+
+//# run 0x42::m::t2_is_inner1
+
+//# run 0x42::m::t1_inner_value
+
+//# run 0x42::m::t1_outer_value
+
+//# run 0x42::m::t2_outer_value
+
+//# run 0x42::m::t3_outer_value
+
+//# run 0x42::m::t1_outer_value_nested
+
+//# run 0x42::m::t2_outer_value_nested
+
+//# run 0x42::m::t1_outer_value_with_cond
+
+//# run 0x42::m::t1_outer_value_with_cond_ref
+
+//# run 0x42::m::t1_is_some
+
+//# run 0x42::m::t2_is_some
+
+//# run 0x42::m::t1_is_some_specialized
+
+//# run 0x42::m::t2_is_some_specialized
diff --git a/third_party/move/move-compiler-v2/transactional-tests/tests/no-v1-comparison/enum/enum_variant_test.exp b/third_party/move/move-compiler-v2/transactional-tests/tests/no-v1-comparison/enum/enum_variant_test.exp
new file mode 100644
index 0000000000000..a25982ced2ccc
--- /dev/null
+++ b/third_party/move/move-compiler-v2/transactional-tests/tests/no-v1-comparison/enum/enum_variant_test.exp
@@ -0,0 +1,7 @@
+processed 3 tasks
+
+task 1 'run'. lines 23-23:
+return values: true
+
+task 2 'run'. lines 25-25:
+return values: true
diff --git a/third_party/move/move-compiler-v2/transactional-tests/tests/no-v1-comparison/enum/enum_variant_test.move b/third_party/move/move-compiler-v2/transactional-tests/tests/no-v1-comparison/enum/enum_variant_test.move
new file mode 100644
index 0000000000000..8762c7930e72c
--- /dev/null
+++ b/third_party/move/move-compiler-v2/transactional-tests/tests/no-v1-comparison/enum/enum_variant_test.move
@@ -0,0 +1,25 @@
+//# publish
+module 0x42::m {
+
+  enum Data has drop {
+    V1{x: u64},
+    V2{x: u64, y: bool}
+    V3
+  }
+
+  fun test_v1(): bool {
+    let d = Data::V1{x: 43};
+    (d is V1)
+  }
+
+  fun test_v1v3(): bool {
+    let d = Data::V1{x: 43};
+    let t = (d is V1|V3);
+    let d = Data::V3{};
+    t && (d is V1|V3)
+  }
+}
+
+//# run 0x42::m::test_v1
+
+//# run 0x42::m::test_v1v3
diff --git a/third_party/move/move-compiler-v2/transactional-tests/tests/no-v1-comparison/index.exp b/third_party/move/move-compiler-v2/transactional-tests/tests/no-v1-comparison/index.exp
new file mode 100644
index 0000000000000..c40f8232f0285
--- /dev/null
+++ b/third_party/move/move-compiler-v2/transactional-tests/tests/no-v1-comparison/index.exp
@@ -0,0 +1 @@
+processed 21 tasks
diff --git a/third_party/move/move-compiler-v2/transactional-tests/tests/no-v1-comparison/index.move b/third_party/move/move-compiler-v2/transactional-tests/tests/no-v1-comparison/index.move
new file mode 100644
index 0000000000000..1129ee1d16605
--- /dev/null
+++ b/third_party/move/move-compiler-v2/transactional-tests/tests/no-v1-comparison/index.move
@@ -0,0 +1,270 @@
+//# publish
+module 0x42::test {
+
+    struct R has key, drop { value: bool }
+
+    const CONSTANT_VEC: vector<u8> = vector[1, 2, 3];
+
+    fun init(s: &signer) {
+        move_to(s, R{value: true});
+    }
+
+    fun test_resource_1() acquires R {
+        use 0x42::test;
+        assert!(test::R[@0x1].value == true, 0);
+        R[@0x1] = R{value: false};
+        assert!(test::R[@0x1].value == false, 0);
+    }
+
+    fun test_resource_2() acquires R {
+        let x = &mut 0x42::test::R[@0x1];
+        x.value = false;
+        assert!(R[@0x1].value == false, 1);
+    }
+
+    struct X<M> has copy, drop, store {
+        value: M
+    }
+    struct Y<T> has key, drop, copy {
+        field: T
+    }
+
+    fun init_2(s: &signer) {
+        let x = X {
+            value: true
+        };
+        let y = Y {
+            field: x
+        };
+        move_to(s, y);
+    }
+
+    fun test_resource_3() acquires Y {
+        use 0x42::test;
+        assert!(test::Y<X<bool>>[@0x1].field.value == true, 0);
+    }
+
+    fun test_resource_freeze() acquires Y {
+        use 0x42::test;
+        let y: &Y<X<bool>> = &mut test::Y<X<bool>>[@0x1];
+        assert!(y.field.value == true, 0);
+    }
+
+    fun test_resource_4() acquires Y {
+        let addr = @0x1;
+        let y = &mut 0x42::test ::Y<X<bool>> [addr];
+        y.field.value = false;
+        spec {
+            assert Y<X<bool>>[addr].field.value == false;
+        };
+        assert!(Y<X<bool>>[addr].field.value == false, 1);
+    }
+
+    fun test_resource_5() acquires Y {
+        let addr = @0x1;
+        0x42::test ::Y<X<bool>> [addr].field.value = false;
+        spec {
+            assert Y<X<bool>>[addr].field.value == false;
+        };
+        let y_resource = Y<X<bool>>[addr];
+        assert!(y_resource.field.value == false, 1);
+    }
+
+    fun test_vector() {
+        let x = X {
+            value: 2
+        };
+        let v = vector[x, x];
+        assert!(v[0].value == 2, 0);
+        v[0].value = 3;
+        assert!(v[0].value == 3, 0);
+    }
+
+    fun test_two_dimension() {
+        let x = vector[vector[1, 2], vector[3, 4]];
+        assert!(x[0][0] == 1, 0);
+        x[0] = vector[2, 3, 4];
+        assert!(x[0][0] == 2, 0);
+        x[0][1] = 4;
+        assert!(x[0][1] == 4, 0);
+        let x = vector[vector[1, 2], vector[3, 4]];
+        let y = 0;
+        assert!(x[{y = y + 1; y}][{y = y - 1; y}] == 3, 0);
+    }
+
+    fun test_vector_borrow() {
+        let x1 = X {
+            value: true
+        };
+        let x2 = X {
+            value: false
+        };
+        let y1 = Y {
+            field: x1
+        };
+        let y2 = Y {
+            field: x2
+        };
+        let v = vector[y1, y2];
+        assert!(v[0].field.value == true, 0);
+        assert!(v[1].field.value == false, 0);
+    }
+
+    fun foo(v: &Y<X<bool>>) {
+        assert!(v.field.value == true, 0);
+    }
+
+    fun test_vector_borrow_freeze() {
+        let x1 = X {
+            value: true
+        };
+        let x2 = X {
+            value: false
+        };
+        let y1 = Y {
+            field: x1
+        };
+        let y2 = Y {
+            field: x2
+        };
+        let v = vector[y1, y2];
+        let v_y1: &Y<X<bool>> = &mut v[0];
+        assert!(v_y1.field.value == true, 0);
+        assert!(v[0].field.value == true, 0);
+        assert!(v[1].field.value == false, 0);
+        foo(&mut v[0]);
+    }
+
+    fun test_vector_borrow_mut() {
+        let x1 = X {
+            value: true
+        };
+        let x2 = X {
+            value: false
+        };
+        let y1 = Y {
+            field: x1
+        };
+        let y2 = Y {
+            field: x2
+        };
+        let v = vector[y1, y2];
+        assert!(v[0].field.value == true, 0);
+        assert!(v[1].field.value == false, 0);
+        v[0].field.value = false;
+        v[1].field.value = true;
+        assert!(v[0].field.value == false, 0);
+        assert!(v[1].field.value == true, 0);
+    }
+
+    fun test_vector_const() {
+        assert!(CONSTANT_VEC[0] == 1, 0);
+    }
+
+    struct M has drop, copy {
+        vec: vector<u8>,
+    }
+
+    fun test_vector_in_struct() {
+        let x = M {
+            vec: vector[1, 2, 3]
+        };
+        let v = vector[x, x];
+        assert!(v[0].vec == vector[1,2,3], 0);
+    }
+
+    fun test_vector_in_struct_2() {
+        let x = M {
+            vec: vector[1, 2, 3]
+        };
+        let v = vector[x, x];
+        assert!(v[0].vec[0] == 1, 0);
+    }
+
+    fun test_vector_in_struct_3() {
+        let x = M {
+            vec: vector[1, 2, 3]
+        };
+        let v = vector[x, x];
+        let y = &(v[0].vec)[2];
+        assert!(*y == 3, 0);
+        assert!(v[1].vec[0] == 1, 0);
+    }
+
+    fun init_3(s: &signer) {
+        let y = Y {
+            field: vector[(1 as u8),2,3]
+        };
+        move_to(s, y);
+    }
+
+    fun test_resource_with_vector() acquires Y {
+        assert!(Y<vector<u8>>[@0x2].field[0] == 1, 0);
+    }
+
+    fun bubble_sort(v: vector<u64>) {
+        use std::vector;
+        let n = vector::length(&v);
+        let i = 0;
+
+        while (i < n) {
+           let j = 0;
+           while (j < n - i - 1) {
+               if (v[j] > v[j + 1]) {
+                   let t = v[j];
+                   v[j] = v[j + 1];
+                   v[j + 1] = t;
+               };
+           j = j + 1;
+           };
+           i = i + 1;
+        };
+        assert!(v[0] == 1, 0);
+    }
+
+    fun call_sort() {
+        let v = vector[3, 1, 2];
+        bubble_sort(v);
+    }
+
+}
+
+//# run --verbose --signers 0x1 -- 0x42::test::init
+
+//# run --verbose -- 0x42::test::test_resource_1
+
+//# run --verbose -- 0x42::test::test_resource_2
+
+//# run --verbose -- 0x42::test::test_vector
+
+//# run --verbose -- 0x42::test::test_two_dimension
+
+//# run --verbose -- 0x42::test::test_vector_borrow
+
+//# run --verbose -- 0x42::test::test_vector_borrow_freeze
+
+//# run --verbose -- 0x42::test::test_vector_borrow_mut
+
+//# run --verbose --signers 0x1 -- 0x42::test::init_2
+
+//# run --verbose -- 0x42::test::test_resource_3
+
+//# run --verbose -- 0x42::test::test_resource_freeze
+
+//# run --verbose -- 0x42::test::test_resource_4
+
+//# run --verbose -- 0x42::test::test_resource_5
+
+//# run --verbose -- 0x42::test::test_vector_const
+
+//# run --verbose -- 0x42::test::test_vector_in_struct
+
+//# run --verbose -- 0x42::test::test_vector_in_struct_2
+
+//# run --verbose -- 0x42::test::test_vector_in_struct_3
+
+//# run --verbose --signers 0x2 -- 0x42::test::init_3
+
+//# run --verbose -- 0x42::test::test_resource_with_vector
+
+//# run --verbose -- 0x42::test::call_sort
diff --git a/third_party/move/move-compiler-v2/transactional-tests/tests/no-v1-comparison/positional_fields/assign_field.exp b/third_party/move/move-compiler-v2/transactional-tests/tests/no-v1-comparison/positional_fields/assign_field.exp
new file mode 100644
index 0000000000000..21bb7557901b3
--- /dev/null
+++ b/third_party/move/move-compiler-v2/transactional-tests/tests/no-v1-comparison/positional_fields/assign_field.exp
@@ -0,0 +1,22 @@
+processed 8 tasks
+
+task 1 'run'. lines 122-122:
+return values: { 42, true }
+
+task 2 'run'. lines 124-124:
+return values: { 42, true }
+
+task 3 'run'. lines 126-126:
+return values: { 0, false }
+
+task 4 'run'. lines 128-128:
+return values: 4
+
+task 5 'run'. lines 130-130:
+return values: { { { 0 }, 42 }, { 1 }, { { 2 }, 42 } }
+
+task 6 'run'. lines 132-132:
+return values: true
+
+task 7 'run'. lines 134-134:
+return values: true
diff --git a/third_party/move/move-compiler-v2/transactional-tests/tests/no-v1-comparison/positional_fields/assign_field.move b/third_party/move/move-compiler-v2/transactional-tests/tests/no-v1-comparison/positional_fields/assign_field.move
new file mode 100644
index 0000000000000..3dcf4bbc03e2e
--- /dev/null
+++ b/third_party/move/move-compiler-v2/transactional-tests/tests/no-v1-comparison/positional_fields/assign_field.move
@@ -0,0 +1,134 @@
+//# publish
+module 0x42::test {
+    struct S0 has copy, drop {
+        x: u8,
+    }
+
+    struct S1(u64, bool) has drop;
+
+    struct S2(S0, u8) has copy, drop;
+
+    struct S3(S2, S0, S2) has drop;
+
+    enum E has drop {
+        V1(u8, bool),
+        V2(S3),
+    }
+
+    fun simple(x: S1): S1 {
+        x.0 = 42;
+        x.1 = true;
+        x
+    }
+
+    fun simple_ref(x: &mut S1) {
+        x.0 = 42;
+        x.1 = true;
+    }
+
+    fun assign0(a: u64, b: bool): S1 {
+        let x = S1(a, b);
+        while (x.1) {
+            x = S1(x.0 - 1, x.0 >= 2);
+        };
+        x
+    }
+
+    fun assign1(x: S1): u64 {
+        let count = 0;
+        while (x.1) {
+            let y = if (x.0 > 0) { x.0 - 1 } else { 0 };
+            x = S1(y, y >=1);
+            count = count + 1;
+        };
+        count
+    }
+
+    fun assign_chained(x: S3): S3 {
+        x.0.0.x + x.1.x + x.2.0.x;
+        x.0.0.x = 0;
+        x.1.x = 1;
+        x.2.0.x = 2;
+        x
+    }
+
+    fun assign_enum(x: &mut E) {
+        match (x) {
+            E::V1(x, y) => {
+                *x = 42;
+                *y = true;
+            },
+            E::V2(x) => {
+                x.0.0.x = 0;
+                x.1.x = 1;
+                x.2.0.x = 2;
+            }
+        }
+    }
+
+    fun test_simple(): S1 {
+        let x = S1(0, false);
+        let y = simple(x);
+        y
+    }
+
+    fun test_simple_ref(): S1 {
+        let x = S1(0, false);
+        simple_ref(&mut x);
+        x
+    }
+
+    fun test_assign0(): S1 {
+        assign0(4, true)
+    }
+
+    fun test_assign1(): u64 {
+        let x = S1(4, true);
+        assign1(x)
+    }
+
+    fun test_assign_chained(): S3 {
+        let x0 = S0 { x: 42 };
+        let x1 = S2(x0, 42);
+        let x2 = S3(x1, x0, x1);
+        x2 = assign_chained(x2);
+        x2
+    }
+
+    fun test_assign_enum_1(): bool {
+        let x0 = S0 { x: 43 };
+        let x1 = S2(x0, 42);
+        let x2 = S3(x1, x0, x1);
+        let x3 = E::V2(x2);
+        assign_enum(&mut x3);
+        let y0 = S0 { x: 0 };
+        let y1 = S0 { x: 1 };
+        let y2 = S0 { x: 2 };
+        let y3 = S2(y0, 42);
+        let y4 = S2(y2, 42);
+        let y5 = S3(y3, y1, y4);
+        let y6 = E::V2(y5);
+        x3 == y6
+    }
+
+    fun test_assign_enum_2(): bool {
+        let x = E::V1(0, false);
+        assign_enum(&mut x);
+        let y = E::V1(42, true);
+        x == y
+    }
+}
+
+//# run --verbose -- 0x42::test::test_simple
+
+//# run --verbose -- 0x42::test::test_simple_ref
+
+//# run --verbose -- 0x42::test::test_assign0
+
+//# run --verbose -- 0x42::test::test_assign1
+
+//# run --verbose -- 0x42::test::test_assign_chained
+
+//# run --verbose -- 0x42::test::test_assign_enum_1
+
+//# run --verbose -- 0x42::test::test_assign_enum_2
diff --git a/third_party/move/move-compiler-v2/transactional-tests/tests/no-v1-comparison/positional_fields/common_access.exp b/third_party/move/move-compiler-v2/transactional-tests/tests/no-v1-comparison/positional_fields/common_access.exp
new file mode 100644
index 0000000000000..c438c0e127cf8
--- /dev/null
+++ b/third_party/move/move-compiler-v2/transactional-tests/tests/no-v1-comparison/positional_fields/common_access.exp
@@ -0,0 +1,4 @@
+processed 2 tasks
+
+task 1 'run'. lines 18-18:
+return values: 42
diff --git a/third_party/move/move-compiler-v2/transactional-tests/tests/no-v1-comparison/positional_fields/common_access.move b/third_party/move/move-compiler-v2/transactional-tests/tests/no-v1-comparison/positional_fields/common_access.move
new file mode 100644
index 0000000000000..ea1dd015d930b
--- /dev/null
+++ b/third_party/move/move-compiler-v2/transactional-tests/tests/no-v1-comparison/positional_fields/common_access.move
@@ -0,0 +1,18 @@
+//# publish
+module 0x42::test {
+    enum Foo has drop {
+        A(u8),
+        B(u8),
+    }
+
+    fun common_access(x: Foo): u8 {
+        x.0
+    }
+
+    fun test_common_access(): u8 {
+        let x = Foo::A(42);
+        common_access(x)
+    }
+}
+
+//# run --verbose -- 0x42::test::test_common_access
diff --git a/third_party/move/move-compiler-v2/transactional-tests/tests/no-v1-comparison/positional_fields/positional_fields.exp b/third_party/move/move-compiler-v2/transactional-tests/tests/no-v1-comparison/positional_fields/positional_fields.exp
new file mode 100644
index 0000000000000..5d92c423f3fd8
--- /dev/null
+++ b/third_party/move/move-compiler-v2/transactional-tests/tests/no-v1-comparison/positional_fields/positional_fields.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/third_party/move/move-compiler-v2/transactional-tests/tests/no-v1-comparison/positional_fields/positional_fields.move b/third_party/move/move-compiler-v2/transactional-tests/tests/no-v1-comparison/positional_fields/positional_fields.move
new file mode 100644
index 0000000000000..53419cbd87ab9
--- /dev/null
+++ b/third_party/move/move-compiler-v2/transactional-tests/tests/no-v1-comparison/positional_fields/positional_fields.move
@@ -0,0 +1,15 @@
+//# publish
+module 0x42::test {
+	struct Tup<T, U>(T, U);
+
+	fun baz(x: u64, y: u64): u64 {
+		let Tup(y, x) = Tup(x, y);
+		y - x
+	}
+
+	fun test_ok() {
+		assert!(baz(2, 1) == 1, 42);
+	}
+}
+
+//# run --verbose -- 0x42::test::test_ok
diff --git a/third_party/move/move-compiler-v2/transactional-tests/tests/operator_eval/op_with_side_effect_14.operator-eval-lang-2.exp b/third_party/move/move-compiler-v2/transactional-tests/tests/operator_eval/op_with_side_effect_14.operator-eval-lang-2.exp
index 4a6daef3b154c..66a78666a3ae6 100644
--- a/third_party/move/move-compiler-v2/transactional-tests/tests/operator_eval/op_with_side_effect_14.operator-eval-lang-2.exp
+++ b/third_party/move/move-compiler-v2/transactional-tests/tests/operator_eval/op_with_side_effect_14.operator-eval-lang-2.exp
@@ -1,6 +1,36 @@
 comparison between v1 and v2 failed:
 = processed 3 tasks
 = 
++ task 0 'publish'. lines 1-26:
++ warning: Unused assignment to `by`. Consider removing or prefixing with an underscore: `_by`
++    ┌─ TEMPFILE:11:16
++    │
++ 11 │     inline fun inc_xx(self: &mut S, by: u64) {
++    │                ^^^^^^
++    ·
++ 20 │         {inc_xx(&mut s, 6); s.x} + {inc_xx(&mut s, 47); s.x} + {inc_xx(&mut s, 117); s.x}
++    │          ----------------- from a call inlined at this callsite
++ 
++ warning: Unused assignment to `by`. Consider removing or prefixing with an underscore: `_by`
++    ┌─ TEMPFILE:11:16
++    │
++ 11 │     inline fun inc_xx(self: &mut S, by: u64) {
++    │                ^^^^^^
++    ·
++ 20 │         {inc_xx(&mut s, 6); s.x} + {inc_xx(&mut s, 47); s.x} + {inc_xx(&mut s, 117); s.x}
++    │                                     ------------------ from a call inlined at this callsite
++ 
++ warning: Unused assignment to `by`. Consider removing or prefixing with an underscore: `_by`
++    ┌─ TEMPFILE:11:16
++    │
++ 11 │     inline fun inc_xx(self: &mut S, by: u64) {
++    │                ^^^^^^
++    ·
++ 20 │         {inc_xx(&mut s, 6); s.x} + {inc_xx(&mut s, 47); s.x} + {inc_xx(&mut s, 117); s.x}
++    │                                                                 ------------------- from a call inlined at this callsite
++ 
++ 
++ 
 = task 1 'run'. lines 28-28:
 - return values: 513
 + return values: 232
diff --git a/third_party/move/move-compiler-v2/transactional-tests/tests/tests.rs b/third_party/move/move-compiler-v2/transactional-tests/tests/tests.rs
index 121249ce8f792..5d08aeb892aa7 100644
--- a/third_party/move/move-compiler-v2/transactional-tests/tests/tests.rs
+++ b/third_party/move/move-compiler-v2/transactional-tests/tests/tests.rs
@@ -96,8 +96,12 @@ const SEPARATE_BASELINE: &[&str] = &[
     "constants/large_vectors.move",
     // Printing bytecode is different depending on optimizations
     "no-v1-comparison/print_bytecode.move",
+    "bug_14243_stack_size.move",
     // The output of the tests could be different depending on the language version
     "/operator_eval/",
+    // Creates different code if optimized
+    "no-v1-comparison/enum/enum_field_select.move",
+    "no-v1-comparison/enum/enum_field_select_different_offsets.move",
 ];
 
 fn get_config_by_name(name: &str) -> TestConfig {
diff --git a/third_party/move/move-compiler-v2/transactional-tests/tests/v1.matched b/third_party/move/move-compiler-v2/transactional-tests/tests/v1.matched
index fecee90c8f243..db793a356d40e 100644
--- a/third_party/move/move-compiler-v2/transactional-tests/tests/v1.matched
+++ b/third_party/move/move-compiler-v2/transactional-tests/tests/v1.matched
@@ -1,5 +1,7 @@
 move-compiler/transactional-tests/tests/constants/by_reference.exp   move-compiler-v2/transactional-tests/tests/constants/by_reference.exp
 move-compiler/transactional-tests/tests/constants/default_int_size.exp   move-compiler-v2/transactional-tests/tests/constants/default_int_size.exp
+move-compiler/transactional-tests/tests/constants/empty_vectors.exp   move-compiler-v2/transactional-tests/tests/constants/empty_vectors.exp
+move-compiler/transactional-tests/tests/constants/empty_vectors2.exp   move-compiler-v2/transactional-tests/tests/constants/empty_vectors2.exp
 move-compiler/transactional-tests/tests/constants/folding_boolean.exp   move-compiler-v2/transactional-tests/tests/constants/folding_boolean.exp
 move-compiler/transactional-tests/tests/constants/folding_complex.exp   move-compiler-v2/transactional-tests/tests/constants/folding_complex.exp
 move-compiler/transactional-tests/tests/constants/folding_equality.exp   move-compiler-v2/transactional-tests/tests/constants/folding_equality.exp
@@ -8,8 +10,9 @@ move-compiler/transactional-tests/tests/constants/folding_values.exp   move-comp
 move-compiler/transactional-tests/tests/constants/folding_vector.exp   move-compiler-v2/transactional-tests/tests/constants/folding_vector.exp
 move-compiler/transactional-tests/tests/constants/folding_vector_large.exp   move-compiler-v2/transactional-tests/tests/constants/folding_vector_large.exp
 move-compiler/transactional-tests/tests/constants/non_constant_empty_vec.exp   move-compiler-v2/transactional-tests/tests/constants/non_constant_empty_vec.exp
+move-compiler/transactional-tests/tests/constants/nonempty_vectors.exp   move-compiler-v2/transactional-tests/tests/constants/nonempty_vectors.exp
 move-compiler/transactional-tests/tests/control_flow/assert_in_while.exp   move-compiler-v2/transactional-tests/tests/control_flow/assert_in_while.exp
-move-compiler/transactional-tests/tests/control_flow/binop_eval_order.exp   move-compiler-v2/transactional-tests/tests/control_flow/binop_eval_order.exp
+move-compiler/transactional-tests/tests/control_flow/binop_eval_order.exp   move-compiler-v2/transactional-tests/tests/operator_eval/control_flow/binop_eval_order.exp
 move-compiler/transactional-tests/tests/control_flow/branch_assigns_then_moves_then_assigns.exp   move-compiler-v2/transactional-tests/tests/control_flow/branch_assigns_then_moves_then_assigns.exp
 move-compiler/transactional-tests/tests/control_flow/break_accumulator.exp   move-compiler-v2/transactional-tests/tests/control_flow/break_accumulator.exp
 move-compiler/transactional-tests/tests/control_flow/break_continue_for_loop.exp   move-compiler-v2/transactional-tests/tests/control_flow/break_continue_for_loop.exp
diff --git a/third_party/move/move-compiler/src/attr_derivation/async_deriver.rs b/third_party/move/move-compiler/src/attr_derivation/async_deriver.rs
index c565d56e3d90e..4382ce0c40ed7 100644
--- a/third_party/move/move-compiler/src/attr_derivation/async_deriver.rs
+++ b/third_party/move/move-compiler/src/attr_derivation/async_deriver.rs
@@ -10,7 +10,7 @@ use crate::{
     diag,
     parser::ast::{
         Definition, Exp, Exp_, Field, Function, FunctionName, LeadingNameAccess_, ModuleDefinition,
-        ModuleMember, NameAccessChain_, StructFields, StructName, Type, Type_, Visibility,
+        ModuleMember, NameAccessChain_, StructLayout, StructName, Type, Type_, Visibility,
     },
     shared::{CompilationEnv, NamedAddressMap},
 };
@@ -164,7 +164,7 @@ fn derive_module_for_async(
                 new_structs.push(new_struct(
                     loc,
                     StructName(sp(loc, Symbol::from(struct_name))),
-                    StructFields::Defined(fields),
+                    StructLayout::Singleton(fields, false),
                 ));
             }
         }
diff --git a/third_party/move/move-compiler/src/attr_derivation/mod.rs b/third_party/move/move-compiler/src/attr_derivation/mod.rs
index 75bb8f6627970..b007e2356d1a1 100644
--- a/third_party/move/move-compiler/src/attr_derivation/mod.rs
+++ b/third_party/move/move-compiler/src/attr_derivation/mod.rs
@@ -10,7 +10,7 @@ use crate::{
     parser::ast::{
         Attribute, AttributeValue, Attribute_, Attributes, CallKind, Definition, Exp, Exp_,
         Function, FunctionBody_, FunctionName, FunctionSignature, LeadingNameAccess_,
-        NameAccessChain, NameAccessChain_, StructDefinition, StructFields, StructName, Type, Type_,
+        NameAccessChain, NameAccessChain_, StructDefinition, StructLayout, StructName, Type, Type_,
         Value_, Var, Visibility,
     },
     shared::{
@@ -163,7 +163,7 @@ pub(crate) fn new_fun(
 }
 
 /// Helper to create a new struct declaration.
-pub(crate) fn new_struct(loc: Loc, name: StructName, fields: StructFields) -> StructDefinition {
+pub(crate) fn new_struct(loc: Loc, name: StructName, layout: StructLayout) -> StructDefinition {
     StructDefinition {
         attributes: vec![sp(
             // #[event]
@@ -174,7 +174,7 @@ pub(crate) fn new_struct(loc: Loc, name: StructName, fields: StructFields) -> St
         abilities: vec![],
         name,
         type_parameters: vec![],
-        fields,
+        layout,
     }
 }
 
diff --git a/third_party/move/move-compiler/src/cfgir/cfg.rs b/third_party/move/move-compiler/src/cfgir/cfg.rs
index 8fd6104b7d5e2..8691a73e11c6a 100644
--- a/third_party/move/move-compiler/src/cfgir/cfg.rs
+++ b/third_party/move/move-compiler/src/cfgir/cfg.rs
@@ -21,7 +21,7 @@ use std::{
 //**************************************************************************************************
 // CFG
 //**************************************************************************************************
-
+#[allow(dead_code)]
 pub trait CFG {
     fn successors(&self, label: Label) -> &BTreeSet<Label>;
 
diff --git a/third_party/move/move-compiler/src/command_line/compiler.rs b/third_party/move/move-compiler/src/command_line/compiler.rs
index 5ea05c48f1fd3..fd535d5cd4d99 100644
--- a/third_party/move/move-compiler/src/command_line/compiler.rs
+++ b/third_party/move/move-compiler/src/command_line/compiler.rs
@@ -24,6 +24,7 @@ use move_core_types::language_storage::ModuleId as CompiledModuleId;
 use move_symbol_pool::Symbol;
 use std::{
     collections::{BTreeMap, BTreeSet},
+    fmt::Debug,
     fs,
     fs::File,
     io::{Read, Write},
@@ -94,7 +95,7 @@ pub struct FullyCompiledProgram {
 //**************************************************************************************************
 
 impl<'a> Compiler<'a> {
-    pub fn from_package_paths<Paths: Into<Symbol>, NamedAddress: Into<Symbol>>(
+    pub fn from_package_paths<Paths: Into<Symbol> + Debug, NamedAddress: Into<Symbol> + Debug>(
         targets: Vec<PackagePaths<Paths, NamedAddress>>,
         deps: Vec<PackagePaths<Paths, NamedAddress>>,
         flags: Flags,
@@ -102,7 +103,7 @@ impl<'a> Compiler<'a> {
     ) -> Self {
         fn indexed_scopes(
             maps: &mut NamedAddressMaps,
-            all_pkgs: Vec<PackagePaths<impl Into<Symbol>, impl Into<Symbol>>>,
+            all_pkgs: Vec<PackagePaths<impl Into<Symbol> + Debug, impl Into<Symbol> + Debug>>,
         ) -> Vec<IndexedPackagePath> {
             let mut idx_paths = vec![];
             for PackagePaths {
@@ -141,7 +142,7 @@ impl<'a> Compiler<'a> {
         }
     }
 
-    pub fn from_files<Paths: Into<Symbol>, NamedAddress: Into<Symbol> + Clone>(
+    pub fn from_files<Paths: Into<Symbol> + Debug, NamedAddress: Into<Symbol> + Clone + Debug>(
         targets: Vec<Paths>,
         deps: Vec<Paths>,
         named_address_map: BTreeMap<NamedAddress, NumericalAddress>,
@@ -427,7 +428,10 @@ impl<'a> SteppedCompiler<'a, PASS_COMPILATION> {
 
 /// Given a set of dependencies, precompile them and save the ASTs so that they can be used again
 /// to compile against without having to recompile these dependencies
-pub fn construct_pre_compiled_lib<Paths: Into<Symbol>, NamedAddress: Into<Symbol>>(
+pub fn construct_pre_compiled_lib<
+    Paths: Into<Symbol> + Debug,
+    NamedAddress: Into<Symbol> + Debug,
+>(
     targets: Vec<PackagePaths<Paths, NamedAddress>>,
     interface_files_dir_opt: Option<String>,
     flags: Flags,
diff --git a/third_party/move/move-compiler/src/command_line/mod.rs b/third_party/move/move-compiler/src/command_line/mod.rs
index c5fe374abe3b3..4439856d1ab52 100644
--- a/third_party/move/move-compiler/src/command_line/mod.rs
+++ b/third_party/move/move-compiler/src/command_line/mod.rs
@@ -64,7 +64,8 @@ pub const WARN_OF_DEPRECATION_USE_IN_APTOS_LIBS_FLAG: &str = "Wdeprecation-aptos
 
 pub const WARN_UNUSED_FLAG: &str = "Wunused";
 
-pub const V2_FLAG: &str = "v2";
+pub const LANG_V2_FLAG: &str = "lang_v2";
+pub const COMPILER_V2_FLAG: &str = "compiler_v2";
 
 // Flag to dump a stacktrace on a compiler error, for users who like
 // to keep RUST_BACKTRACE always enabled.
diff --git a/third_party/move/move-compiler/src/diagnostics/codes.rs b/third_party/move/move-compiler/src/diagnostics/codes.rs
index 8d6c41d33eb69..3b4b7bdee649d 100644
--- a/third_party/move/move-compiler/src/diagnostics/codes.rs
+++ b/third_party/move/move-compiler/src/diagnostics/codes.rs
@@ -116,6 +116,7 @@ codes!(
         InvalidSpecBlockMember: { msg: "invalid spec block member", severity: NonblockingError },
         InvalidAccessSpecifier: { msg: "invalid access specifier", severity: NonblockingError },
         UnsupportedLanguageItem: { msg: "unsupported language construct", severity: BlockingError },
+        InvalidVariantAccess: { msg: "invalid variant name", severity: BlockingError },
     ],
     // errors for any rules around declaration items
     Declarations: [
diff --git a/third_party/move/move-compiler/src/diagnostics/mod.rs b/third_party/move/move-compiler/src/diagnostics/mod.rs
index 865cda6bc6bbb..290d60ccdd40b 100644
--- a/third_party/move/move-compiler/src/diagnostics/mod.rs
+++ b/third_party/move/move-compiler/src/diagnostics/mod.rs
@@ -5,7 +5,7 @@
 pub mod codes;
 
 use crate::{
-    command_line::{COLOR_MODE_ENV_VAR, MOVE_COMPILER_BACKTRACE_ENV_VAR},
+    command_line::COLOR_MODE_ENV_VAR,
     diagnostics::codes::{DiagnosticCode, DiagnosticInfo, Severity},
 };
 use codespan_reporting::{
@@ -299,10 +299,14 @@ impl Diagnostic {
         }
     }
 
-    fn add_backtrace(msg: &str, is_bug: bool) -> String {
-        static DUMP_BACKTRACE: Lazy<bool> =
-            Lazy::new(|| read_bool_env_var(MOVE_COMPILER_BACKTRACE_ENV_VAR));
-        if is_bug || *DUMP_BACKTRACE {
+    fn add_backtrace(msg: &str, _is_bug: bool) -> String {
+        // Note that you need both MOVE_COMPILER_BACKTRACE=1 and RUST_BACKTRACE=1 for this to
+        // actually generate a backtrace.
+        static DUMP_BACKTRACE: Lazy<bool> = Lazy::new(|| {
+            read_bool_env_var(crate::command_line::MOVE_COMPILER_BACKTRACE_ENV_VAR)
+                | read_bool_env_var(crate::command_line::MVC_BACKTRACE_ENV_VAR)
+        });
+        if *DUMP_BACKTRACE {
             let bt = Backtrace::capture();
             if BacktraceStatus::Captured == bt.status() {
                 format!("{}\nBacktrace: {:#?}", msg, bt)
diff --git a/third_party/move/move-compiler/src/expansion/ast.rs b/third_party/move/move-compiler/src/expansion/ast.rs
index 865148c7155e8..badcb8096e8a5 100644
--- a/third_party/move/move-compiler/src/expansion/ast.rs
+++ b/third_party/move/move-compiler/src/expansion/ast.rs
@@ -3,9 +3,11 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{
+    expansion::translate::is_valid_struct_constant_or_schema_name,
     parser::ast::{
         self as P, Ability, Ability_, BinOp, CallKind, ConstantName, Field, FunctionName,
-        ModuleName, QuantKind, SpecApplyPattern, StructName, UnaryOp, UseDecl, Var, ENTRY_MODIFIER,
+        ModuleName, QuantKind, SpecApplyPattern, StructName, UnaryOp, UseDecl, Var, VariantName,
+        ENTRY_MODIFIER,
     },
     shared::{
         ast_debug::*,
@@ -165,15 +167,26 @@ pub struct StructDefinition {
     pub loc: Loc,
     pub abilities: AbilitySet,
     pub type_parameters: Vec<StructTypeParameter>,
-    pub fields: StructFields,
+    pub layout: StructLayout,
 }
 
 #[derive(Debug, Clone, PartialEq)]
-pub enum StructFields {
-    Defined(Fields<Type>),
+pub enum StructLayout {
+    // the second field is true iff the struct has positional fields
+    Singleton(Fields<Type>, bool),
+    Variants(Vec<StructVariant>),
     Native(Loc),
 }
 
+#[derive(Debug, PartialEq, Clone)]
+pub struct StructVariant {
+    pub attributes: Attributes,
+    pub loc: Loc,
+    pub name: VariantName,
+    pub fields: Fields<Type>,
+    pub is_positional: bool,
+}
+
 //**************************************************************************************************
 // Functions
 //**************************************************************************************************
@@ -182,6 +195,7 @@ pub enum StructFields {
 pub enum Visibility {
     Public(Loc),
     Friend(Loc),
+    Package(Loc),
     Internal,
 }
 
@@ -363,8 +377,22 @@ pub struct AbilitySet(UniqueSet<Ability>);
 #[allow(clippy::large_enum_variant)]
 pub enum ModuleAccess_ {
     Name(Name),
-    ModuleAccess(ModuleIdent, Name),
+    // ModuleAccess(module_ident, member_ident, optional_variant_ident)
+    ModuleAccess(ModuleIdent, Name, Option<Name>),
 }
+
+impl ModuleAccess_ {
+    fn get_name(&self) -> &Name {
+        match self {
+            ModuleAccess_::Name(n) | ModuleAccess_::ModuleAccess(_, n, _) => n,
+        }
+    }
+
+    pub fn is_valid_struct_constant_or_schema_name(&self) -> bool {
+        is_valid_struct_constant_or_schema_name(self.get_name().value.as_str())
+    }
+}
+
 pub type ModuleAccess = Spanned<ModuleAccess_>;
 
 #[derive(Debug, Clone, PartialEq)]
@@ -387,6 +415,7 @@ pub type Type = Spanned<Type_>;
 pub enum LValue_ {
     Var(ModuleAccess, Option<Vec<Type>>),
     Unpack(ModuleAccess, Option<Vec<Type>>, Fields<LValue>),
+    PositionalUnpack(ModuleAccess, Option<Vec<Type>>, LValueList),
 }
 pub type LValue = Spanned<LValue_>;
 pub type LValueList_ = Vec<LValue>;
@@ -443,6 +472,7 @@ pub enum Exp_ {
     Vector(Loc, Option<Vec<Type>>, Spanned<Vec<Exp>>),
 
     IfElse(Box<Exp>, Box<Exp>, Box<Exp>),
+    Match(Box<Exp>, Vec<Spanned<(LValueList, Option<Exp>, Exp)>>),
     While(Box<Exp>, Box<Exp>),
     Loop(Box<Exp>),
     Block(Sequence),
@@ -475,10 +505,11 @@ pub enum Exp_ {
 
     Borrow(bool, Box<Exp>),
     ExpDotted(Box<ExpDotted>),
-    Index(Box<Exp>, Box<Exp>), // spec only (no mutation needed right now)
+    Index(Box<Exp>, Box<Exp>), // spec only unless language >= v2
 
     Cast(Box<Exp>, Type),
     Annotate(Box<Exp>, Type),
+    Test(Box<Exp>, Vec<Type>),
 
     Spec(SpecId, BTreeSet<Name>, BTreeSet<Name>),
 
@@ -715,11 +746,14 @@ impl AbilitySet {
 impl Visibility {
     pub const FRIEND: &'static str = P::Visibility::FRIEND;
     pub const INTERNAL: &'static str = P::Visibility::INTERNAL;
+    pub const PACKAGE: &'static str = P::Visibility::PACKAGE;
     pub const PUBLIC: &'static str = P::Visibility::PUBLIC;
 
     pub fn loc(&self) -> Option<Loc> {
         match self {
-            Visibility::Public(loc) | Visibility::Friend(loc) => Some(*loc),
+            Visibility::Public(loc) | Visibility::Friend(loc) | Visibility::Package(loc) => {
+                Some(*loc)
+            },
             Visibility::Internal => None,
         }
     }
@@ -818,7 +852,17 @@ impl fmt::Display for ModuleAccess_ {
         use ModuleAccess_::*;
         match self {
             Name(n) => write!(f, "{}", n),
-            ModuleAccess(m, n) => write!(f, "{}::{}", m, n),
+            ModuleAccess(m, n, opt_v) => write!(
+                f,
+                "{}::{}{}",
+                m,
+                n,
+                if let Some(v) = opt_v {
+                    format!("::{}", v)
+                } else {
+                    "".to_string()
+                }
+            ),
         }
     }
 }
@@ -827,6 +871,7 @@ impl fmt::Display for Visibility {
     fn fmt(&self, f: &mut fmt::Formatter) -> std::fmt::Result {
         write!(f, "{}", match &self {
             Visibility::Public(_) => Visibility::PUBLIC,
+            Visibility::Package(_) => Visibility::PACKAGE,
             Visibility::Friend(_) => Visibility::FRIEND,
             Visibility::Internal => Visibility::INTERNAL,
         })
@@ -1046,20 +1091,20 @@ impl AstDebug for (StructName, &StructDefinition) {
                 loc: _loc,
                 abilities,
                 type_parameters,
-                fields,
+                layout: fields,
             },
         ) = self;
 
         attributes.ast_debug(w);
 
-        if let StructFields::Native(_) = fields {
+        if let StructLayout::Native(_) = fields {
             w.write("native ");
         }
 
         w.write(&format!("struct {}", name));
         type_parameters.ast_debug(w);
         ability_modifiers_ast_debug(w, abilities);
-        if let StructFields::Defined(fields) = fields {
+        if let StructLayout::Singleton(fields, _) = fields {
             w.block(|w| {
                 w.list(fields, ",", |w, (_, f, idx_st)| {
                     let (idx, st) = idx_st;
@@ -1443,7 +1488,16 @@ impl AstDebug for ModuleAccess_ {
     fn ast_debug(&self, w: &mut AstWriter) {
         w.write(&match self {
             ModuleAccess_::Name(n) => format!("{}", n),
-            ModuleAccess_::ModuleAccess(m, n) => format!("{}::{}", m, n),
+            ModuleAccess_::ModuleAccess(m, n, opt_v) => format!(
+                "{}::{}{}",
+                m,
+                n,
+                if let Some(v) = opt_v {
+                    format!("::{}", v)
+                } else {
+                    "".to_string()
+                }
+            ),
         })
     }
 }
@@ -1569,6 +1623,20 @@ impl AstDebug for Exp_ {
                 w.write("loop ");
                 e.ast_debug(w);
             },
+            E::Match(e, arms) => {
+                w.write("match (");
+                e.ast_debug(w);
+                w.write(") {");
+                for arm in arms {
+                    arm.value.0.ast_debug(w);
+                    if let Some(cond) = &arm.value.1 {
+                        w.write(" if ");
+                        cond.ast_debug(w);
+                    }
+                    w.write(" => ");
+                    arm.value.2.ast_debug(w)
+                }
+            },
             E::Block(seq) => w.block(|w| seq.ast_debug(w)),
             E::Lambda(sp!(_, bs), e) => {
                 w.write("|");
@@ -1605,7 +1673,9 @@ impl AstDebug for Exp_ {
                 rhs.ast_debug(w);
             },
             E::Mutate(lhs, rhs) => {
-                w.write("*");
+                if !matches!(lhs.value, E::Index(_, _)) {
+                    w.write("*");
+                }
                 lhs.ast_debug(w);
                 w.write(" = ");
                 rhs.ast_debug(w);
@@ -1652,6 +1722,16 @@ impl AstDebug for Exp_ {
                 ty.ast_debug(w);
                 w.write(")");
             },
+            E::Test(e, tys) => {
+                w.write("(");
+                e.ast_debug(w);
+                w.write(" is ");
+                w.list(tys, "|", |w, item| {
+                    item.ast_debug(w);
+                    false
+                });
+                w.write(")");
+            },
             E::Index(oper, index) => {
                 oper.ast_debug(w);
                 w.write("[");
@@ -1736,6 +1816,17 @@ impl AstDebug for LValue_ {
                 });
                 w.write("}");
             },
+            L::PositionalUnpack(ma, tys_opt, args) => {
+                ma.ast_debug(w);
+                if let Some(ss) = tys_opt {
+                    w.write("<");
+                    ss.ast_debug(w);
+                    w.write(">");
+                }
+                w.write("(");
+                w.comma(&args.value, |w, b| b.ast_debug(w));
+                w.write(")");
+            },
         }
     }
 }
diff --git a/third_party/move/move-compiler/src/expansion/dependency_ordering.rs b/third_party/move/move-compiler/src/expansion/dependency_ordering.rs
index f38178875ace7..291fc17a5d19e 100644
--- a/third_party/move/move-compiler/src/expansion/dependency_ordering.rs
+++ b/third_party/move/move-compiler/src/expansion/dependency_ordering.rs
@@ -335,7 +335,7 @@ fn function_acquires(context: &mut Context, acqs: &[E::ModuleAccess]) {
 //**************************************************************************************************
 
 fn struct_def(context: &mut Context, sdef: &E::StructDefinition) {
-    if let E::StructFields::Defined(fields) = &sdef.fields {
+    if let E::StructLayout::Singleton(fields, _) = &sdef.layout {
         fields.iter().for_each(|(_, _, (_, bt))| type_(context, bt));
     }
 }
@@ -345,7 +345,7 @@ fn struct_def(context: &mut Context, sdef: &E::StructDefinition) {
 //**************************************************************************************************
 
 fn module_access(context: &mut Context, sp!(loc, ma_): &E::ModuleAccess) {
-    if let E::ModuleAccess_::ModuleAccess(m, _) = ma_ {
+    if let E::ModuleAccess_::ModuleAccess(m, _, _) = ma_ {
         context.add_usage(*m, *loc)
     }
 }
@@ -460,6 +460,17 @@ fn exp(context: &mut Context, sp!(_loc, e_): &E::Exp) {
             exp(context, ef)
         },
 
+        E::Match(ed, arms) => {
+            exp(context, ed);
+            for arm in arms {
+                lvalues(context, &arm.value.0.value);
+                if let Some(e) = &arm.value.1 {
+                    exp(context, e)
+                }
+                exp(context, &arm.value.2)
+            }
+        },
+
         E::BinopExp(e1, _, e2) | E::Mutate(e1, e2) | E::While(e1, e2) | E::Index(e1, e2) => {
             exp(context, e1);
             exp(context, e2)
@@ -489,6 +500,10 @@ fn exp(context: &mut Context, sp!(_loc, e_): &E::Exp) {
             exp(context, e);
             type_(context, ty)
         },
+        E::Test(e, tys) => {
+            exp(context, e);
+            tys.iter().for_each(|ty| type_(context, ty))
+        },
 
         E::Lambda(ll, e) => {
             lvalues(context, &ll.value);
@@ -568,7 +583,7 @@ fn spec_block_member(context: &mut Context, sp!(_, sbm_): &E::SpecBlockMember) {
                         Some(E::PragmaValue::Literal(_)) => (),
                         Some(E::PragmaValue::Ident(maccess)) => match &maccess.value {
                             E::ModuleAccess_::Name(_) => (),
-                            E::ModuleAccess_::ModuleAccess(mident, _) => {
+                            E::ModuleAccess_::ModuleAccess(mident, _, _) => {
                                 context.add_friend(*mident, maccess.loc);
                             },
                         },
diff --git a/third_party/move/move-compiler/src/expansion/translate.rs b/third_party/move/move-compiler/src/expansion/translate.rs
index e89c4b9ff2aa5..e94bab5579662 100644
--- a/third_party/move/move-compiler/src/expansion/translate.rs
+++ b/third_party/move/move-compiler/src/expansion/translate.rs
@@ -9,7 +9,7 @@ use crate::{
     diagnostics::{codes::DeprecatedItem, Diagnostic},
     expansion::{
         aliases::{AliasMap, AliasSet},
-        ast::{self as E, Address, Fields, ModuleIdent, ModuleIdent_, SpecId},
+        ast::{self as E, Address, Fields, ModuleAccess_, ModuleIdent, ModuleIdent_, SpecId},
         byte_string, hex_string,
     },
     parser::ast::{
@@ -83,7 +83,7 @@ impl<'env, 'map> Context<'env, 'map> {
 
     fn set_current_module(&mut self, module: Option<ModuleIdent>) {
         self.in_deprecated_code = match &module {
-            Some(m) => self.module_deprecation_attribute_locs.get(m).is_some(),
+            Some(m) => self.module_deprecation_attribute_locs.contains_key(m),
             None => false,
         };
         self.current_module = module;
@@ -527,8 +527,7 @@ fn module_(
     let current_module = sp(name_loc, ModuleIdent_::new(*context.cur_address(), name));
     if context
         .module_deprecation_attribute_locs
-        .get(&current_module)
-        .is_some()
+        .contains_key(&current_module)
     {
         context.in_deprecated_code = true;
     }
@@ -646,7 +645,7 @@ fn script_(context: &mut Context, package_name: Option<Symbol>, pscript: P::Scri
     check_valid_module_member_name(context, ModuleMemberKind::Function, pfunction.name.0);
     let (function_name, function) = function_(context, pfunction);
     match &function.visibility {
-        E::Visibility::Public(loc) | E::Visibility::Friend(loc) => {
+        E::Visibility::Public(loc) | E::Visibility::Package(loc) | E::Visibility::Friend(loc) => {
             let msg = format!(
                 "Invalid '{}' visibility modifier. \
                 Script functions are not callable from other Move functions.",
@@ -1396,7 +1395,7 @@ fn struct_def_(
         name,
         abilities: abilities_vec,
         type_parameters: pty_params,
-        fields: pfields,
+        layout: pfields,
     } = pstruct;
     let was_in_deprecated_code = context.enter_possibly_deprecated_member(&name.0);
     let attributes = flatten_attributes(context, AttributePosition::Struct, attributes);
@@ -1405,46 +1404,88 @@ fn struct_def_(
         .aliases
         .shadow_for_type_parameters(type_parameters.iter().map(|tp| &tp.name));
     let abilities = ability_set(context, "modifier", abilities_vec);
-    let fields = struct_fields(context, &name, pfields);
+    let fields = struct_layout(context, &name, pfields);
     let sdef = E::StructDefinition {
         attributes,
         loc,
         abilities,
         type_parameters,
-        fields,
+        layout: fields,
     };
     context.set_to_outer_scope(old_aliases);
     context.set_in_deprecated_code(was_in_deprecated_code);
     (name, sdef)
 }
 
-fn struct_fields(
+fn struct_layout(
     context: &mut Context,
-    sname: &StructName,
-    pfields: P::StructFields,
-) -> E::StructFields {
-    let pfields_vec = match pfields {
-        P::StructFields::Native(loc) => return E::StructFields::Native(loc),
-        P::StructFields::Defined(v) => v,
-    };
+    _sname: &StructName,
+    parsed_layout: P::StructLayout,
+) -> E::StructLayout {
+    match parsed_layout {
+        P::StructLayout::Native(loc) => E::StructLayout::Native(loc),
+        P::StructLayout::Singleton(fields, is_positional) => {
+            E::StructLayout::Singleton(struct_fields(context, fields), is_positional)
+        },
+        P::StructLayout::Variants(variants) => {
+            let mut previous_variants = BTreeMap::new();
+            E::StructLayout::Variants(
+                variants
+                    .into_iter()
+                    .map(|v| {
+                        if !is_valid_struct_constant_or_schema_name(v.name.0.value.as_str()) {
+                            let msg = format!(
+                                "Invalid variant name '{}'. variant names must start with 'A'..'Z'",
+                                v.name
+                            );
+                            context
+                                .env
+                                .add_diag(diag!(Declarations::InvalidName, (v.loc, msg)));
+                        }
+                        if let Some(old_loc) = previous_variants.insert(v.name, v.loc) {
+                            context.env.add_diag(diag!(
+                                Declarations::DuplicateItem,
+                                (
+                                    v.loc,
+                                    format!("Duplicate definition for variant '{}'", v.name),
+                                ),
+                                (old_loc, "Variant previously defined here"),
+                            ));
+                        }
+                        E::StructVariant {
+                            attributes: flatten_attributes(
+                                context,
+                                AttributePosition::Struct,
+                                v.attributes,
+                            ),
+                            loc: v.loc,
+                            name: v.name,
+                            fields: struct_fields(context, v.fields),
+                            is_positional: v.is_positional,
+                        }
+                    })
+                    .collect(),
+            )
+        },
+    }
+}
+
+fn struct_fields(context: &mut Context, fields: Vec<(P::Field, P::Type)>) -> Fields<E::Type> {
     let mut field_map = UniqueMap::new();
-    for (idx, (field, pt)) in pfields_vec.into_iter().enumerate() {
+    for (idx, (field, pt)) in fields.into_iter().enumerate() {
         let t = type_(context, pt);
         if let Err((field, old_loc)) = field_map.add(field, (idx, t)) {
             context.env.add_diag(diag!(
                 Declarations::DuplicateItem,
                 (
                     field.loc(),
-                    format!(
-                        "Duplicate definition for field '{}' in struct '{}'",
-                        field, sname
-                    ),
+                    format!("Duplicate definition for field '{}'", field),
                 ),
                 (old_loc, "Field previously defined here"),
             ));
         }
     }
-    E::StructFields::Defined(field_map)
+    field_map
 }
 
 //**************************************************************************************************
@@ -1559,7 +1600,7 @@ fn function_(context: &mut Context, pfunction: P::Function) -> (FunctionName, E:
     let attributes = flatten_attributes(context, AttributePosition::Function, pattributes);
     let visibility = visibility(pvisibility);
     let (old_aliases, signature) = function_signature(context, psignature);
-    let (acquires, access_specifiers) = if context.env.flags().v2() {
+    let (acquires, access_specifiers) = if context.env.flags().compiler_v2() {
         (vec![], access_specifier_list(context, access_specifiers))
     } else {
         (
@@ -1608,7 +1649,7 @@ fn access_specifier_list_as_acquires(
             Syntax::InvalidAccessSpecifier,
             (
                 loc,
-                "compiler version 1 only supports simple 'acquires <resource_name>' clauses"
+                "language version 1 only supports simple 'acquires <resource_name>' clauses"
                     .to_owned()
             )
         ));
@@ -1649,6 +1690,10 @@ fn access_specifier_list_as_acquires(
                             && check_wildcard(context, second)
                             && check_wildcard(context, third)
                     },
+                    NameAccessChain_::Four(..) => {
+                        invalid_variant_access(context, specifier.loc);
+                        false
+                    },
                 };
                 if ok {
                     if let Some(maccess) = name_access_chain(
@@ -1668,6 +1713,13 @@ fn access_specifier_list_as_acquires(
     acquires
 }
 
+fn invalid_variant_access(context: &mut Context, loc: Loc) {
+    context.env.add_diag(diag!(
+        Syntax::InvalidVariantAccess,
+        (loc, "variant name not expected in this context".to_owned())
+    ));
+}
+
 fn access_specifier(context: &mut Context, specifier: P::AccessSpecifier) -> E::AccessSpecifier {
     let (negated, kind, chain, type_args, address) = match specifier.value {
         AccessSpecifier_::Acquires(negated, chain, type_args, address) => (
@@ -1712,6 +1764,10 @@ fn access_specifier_name_access_chain(
     chain: NameAccessChain,
 ) -> (Option<Address>, Option<ModuleName>, Option<Name>) {
     match chain.value {
+        NameAccessChain_::Four(..) => {
+            invalid_variant_access(context, chain.loc);
+            (None, None, None)
+        },
         NameAccessChain_::One(name) if name.value.as_str() == "*" => {
             // A single wildcard means any resource at the specified address, e.g. `*(0x2)`
             (None, None, None)
@@ -1835,6 +1891,7 @@ fn visibility(pvisibility: P::Visibility) -> E::Visibility {
     match pvisibility {
         P::Visibility::Public(loc) => E::Visibility::Public(loc),
         P::Visibility::Script(loc) => E::Visibility::Public(loc),
+        P::Visibility::Package(loc) => E::Visibility::Package(loc),
         P::Visibility::Friend(loc) => E::Visibility::Friend(loc),
         P::Visibility::Internal => E::Visibility::Internal,
     }
@@ -2208,6 +2265,7 @@ enum Access {
     Term,
 }
 
+#[allow(dead_code)]
 #[derive(Clone, Copy)]
 enum DeprecatedMemberKind {}
 
@@ -2224,12 +2282,15 @@ fn name_access_chain(
         (Access::ApplyPositional, PN::One(n))
         | (Access::ApplyNamed, PN::One(n))
         | (Access::Type, PN::One(n)) => match context.aliases.member_alias_get(&n) {
-            Some((mident, mem)) => EN::ModuleAccess(mident, mem),
-            None => EN::Name(n),
+            Some((mident, mem)) => EN::ModuleAccess(mident, mem, None),
+            None => {
+                // left unresolved
+                EN::Name(n)
+            },
         },
         (Access::Term, PN::One(n)) if is_valid_struct_constant_or_schema_name(n.value.as_str()) => {
             match context.aliases.member_alias_get(&n) {
-                Some((mident, mem)) => EN::ModuleAccess(mident, mem),
+                Some((mident, mem)) => EN::ModuleAccess(mident, mem, None),
                 None => EN::Name(n),
             }
         },
@@ -2240,27 +2301,56 @@ fn name_access_chain(
                 .add_diag(unexpected_address_module_error(loc, nloc, access));
             return None;
         },
-
-        (_, PN::Two(sp!(_, LN::Name(n1)), n2)) => match context.aliases.module_alias_get(&n1) {
-            None => {
+        (_, PN::Two(sp!(_, LN::Name(n1)), n2)) => {
+            if let Some((mident, mem)) = context.aliases.member_alias_get(&n1).filter(|_| {
+                context.env.flags().lang_v2()
+                    && is_valid_struct_constant_or_schema_name(n1.value.as_str())
+                    && is_valid_struct_constant_or_schema_name(n2.value.as_str())
+            }) {
+                // n1 is interpreted as a type and n2 as a variant in the type
+                EN::ModuleAccess(mident, mem, Some(n2))
+            } else if let Some(mident) = context.aliases.module_alias_get(&n1) {
+                // n1 is interpreted as a module and n2 as type.
+                EN::ModuleAccess(mident, n2, None)
+            } else {
                 context.env.add_diag(diag!(
                     NameResolution::UnboundModule,
-                    (n1.loc, format!("Unbound module alias '{}'", n1))
+                    (n1.loc, format!("Unbound module or type alias '{}'", n1))
                 ));
                 return None;
-            },
-            Some(mident) => EN::ModuleAccess(mident, n2),
+            }
         },
         (_, PN::Three(sp!(ident_loc, (ln, n2)), n3)) => {
+            let default_interpretation = |context: &mut Context| {
+                let addr = address(context, /* suggest_declaration */ false, ln);
+                let mident = sp(ident_loc, ModuleIdent_::new(addr, ModuleName(n2)));
+                EN::ModuleAccess(mident, n3, None)
+            };
+            match &ln.value {
+                LeadingNameAccess_::Name(n1)
+                    if is_valid_struct_constant_or_schema_name(n2.value.as_str()) =>
+                {
+                    // Attempt to interpret n1 as module alias. This is for
+                    // reaching struct variants as in `module::Struct::Variant`.
+                    if let Some(mident) = context.aliases.module_alias_get(n1) {
+                        EN::ModuleAccess(mident, n2, Some(n3))
+                    } else {
+                        default_interpretation(context)
+                    }
+                },
+                _ => default_interpretation(context),
+            }
+        },
+        (_, PN::Four(sp!(ident_loc, (ln, n2)), n3, n4)) => {
             let addr = address(context, /* suggest_declaration */ false, ln);
             let mident = sp(ident_loc, ModuleIdent_::new(addr, ModuleName(n2)));
-            EN::ModuleAccess(mident, n3)
+            EN::ModuleAccess(mident, n3, Some(n4))
         },
     };
 
     if let Some(deprecated_item_kind) = deprecated_item_kind {
         match &tn_ {
-            EN::ModuleAccess(mident, n) => {
+            EN::ModuleAccess(mident, n, _) => {
                 check_for_deprecated_member_use(context, Some(mident), n, deprecated_item_kind);
             },
             EN::Name(n) => {
@@ -2298,7 +2388,7 @@ fn name_access_chain_to_module_ident(
             };
             Some(module_ident(context, sp(loc, pmident_)))
         },
-        PN::Three(sp!(ident_loc, (ln, n)), mem) => {
+        PN::Three(sp!(ident_loc, (ln, n)), mem) | PN::Four(sp!(ident_loc, (ln, n)), mem, _) => {
             // Process the module ident just for errors
             let pmident_ = P::ModuleIdent_ {
                 address: ln,
@@ -2421,7 +2511,7 @@ fn exp_(context: &mut Context, sp!(loc, pe_): P::Exp) -> E::Exp {
         },
         PE::Move(v) => EE::Move(v),
         PE::Copy(v) => EE::Copy(v),
-        PE::Name(_pn, Some(_ty)) if !context.in_spec_context => {
+        PE::Name(_pn, Some(_ty)) if !context.in_spec_context && !context.env.flags().lang_v2() => {
             context.env.add_diag(diag!(
                 Syntax::SpecContextRestricted,
                 (
@@ -2503,6 +2593,21 @@ fn exp_(context: &mut Context, sp!(loc, pe_): P::Exp) -> E::Exp {
             };
             EE::IfElse(eb, et, ef)
         },
+        PE::Match(pd, parms) => {
+            let discriminator = exp(context, *pd);
+            let match_arms = parms
+                .into_iter()
+                .map(|parm| {
+                    let loc = parm.loc;
+                    let (pbl, pc, pb) = parm.value;
+                    let bind_list = bind_list(context, pbl).expect("bind list always present");
+                    let opt_cond = pc.map(|e| *exp(context, e));
+                    let body = *exp(context, pb);
+                    sp(loc, (bind_list, opt_cond, body))
+                })
+                .collect::<Vec<_>>();
+            EE::Match(discriminator, match_arms)
+        },
         PE::While(pb, ploop) => EE::While(exp(context, *pb), exp(context, *ploop)),
         PE::Loop(ploop) => EE::Loop(exp(context, *ploop)),
         PE::Block(seq) => EE::Block(sequence(context, loc, seq)),
@@ -2594,14 +2699,26 @@ fn exp_(context: &mut Context, sp!(loc, pe_): P::Exp) -> E::Exp {
             },
         },
         PE::Cast(e, ty) => EE::Cast(exp(context, *e), type_(context, ty)),
+        PE::Test(e, tys) => EE::Test(
+            exp(context, *e),
+            tys.into_iter().map(|ty| type_(context, ty)).collect(),
+        ),
         PE::Index(e, i) => {
-            if context.in_spec_context {
+            if context.env.flags().lang_v2() || context.in_spec_context {
                 EE::Index(exp(context, *e), exp(context, *i))
             } else {
-                let msg = "`_[_]` index operator only allowed in specifications";
-                context
-                    .env
-                    .add_diag(diag!(Syntax::SpecContextRestricted, (loc, msg)));
+                // If it is a name, call `name_access_chain` to avoid
+                // the unused alias warning
+                if let PE::Name(pn, _) = e.value {
+                    let _ = name_access_chain(context, Access::Term, pn, None);
+                }
+                context.env.add_diag(diag!(
+                    Syntax::UnsupportedLanguageItem,
+                    (
+                        loc,
+                        "`_[_]` index operator in non-specification code only allowed in Move 2 and beyond"
+                    )
+                ));
                 EE::UnresolvedError
             }
         },
@@ -2791,8 +2908,15 @@ fn bind(context: &mut Context, sp!(loc, pb_): P::Bind) -> Option<E::LValue> {
     use P::Bind_ as PB;
     let b_ = match pb_ {
         PB::Var(v) => {
-            check_valid_local_name(context, &v);
-            EL::Var(sp(loc, E::ModuleAccess_::Name(v.0)), None)
+            if context.env.flags().lang_v2()
+                && is_valid_struct_constant_or_schema_name(v.value().as_str())
+            {
+                // Interpret as an unqualified module access
+                EL::Unpack(sp(v.loc(), ModuleAccess_::Name(v.0)), None, Fields::new())
+            } else {
+                check_valid_local_name(context, &v);
+                EL::Var(sp(loc, E::ModuleAccess_::Name(v.0)), None)
+            }
         },
         PB::Unpack(ptn, ptys_opt, pfields) => {
             // check for type use
@@ -2810,6 +2934,18 @@ fn bind(context: &mut Context, sp!(loc, pb_): P::Bind) -> Option<E::LValue> {
             let fields = fields(context, loc, "deconstruction binding", "binding", vfields?);
             EL::Unpack(tn, tys_opt, fields)
         },
+        PB::PositionalUnpack(ptn, ptys_opt, pargs) => {
+            let tn = name_access_chain(
+                context,
+                Access::ApplyPositional,
+                *ptn,
+                Some(DeprecatedItem::Struct),
+            )?;
+            let tys_opt = optional_types(context, ptys_opt);
+            let fields: Option<Vec<E::LValue>> =
+                pargs.into_iter().map(|pb| bind(context, pb)).collect();
+            EL::PositionalUnpack(tn, tys_opt, Spanned::new(loc, fields?))
+        },
     };
     Some(sp(loc, b_))
 }
@@ -2830,6 +2966,10 @@ fn lvalues(context: &mut Context, sp!(loc, e_): P::Exp) -> Option<LValue> {
                 pes.into_iter().map(|pe| assign(context, pe)).collect();
             L::Assigns(sp(loc, al_opt?))
         },
+        PE::Index(_, _) if context.env.flags().lang_v2() => {
+            let er = exp(context, sp(loc, e_));
+            L::Mutate(er)
+        },
         PE::Dereference(pr) => {
             let er = exp(context, *pr);
             L::Mutate(er)
@@ -2865,6 +3005,10 @@ fn assign(context: &mut Context, sp!(loc, e_): P::Exp) -> Option<E::LValue> {
 
             return None;
         },
+        PE::Name(sp!(_, P::NameAccessChain_::Four(_, _, _)), _) => {
+            invalid_variant_access(context, loc);
+            return None;
+        },
         PE::Name(n, Some(_)) if !context.in_spec_context => {
             let msg = format!(
                 "Unexpected assignment of instantiated type without fields outside of a spec \
@@ -2883,7 +3027,7 @@ fn assign(context: &mut Context, sp!(loc, e_): P::Exp) -> Option<E::LValue> {
         PE::Name(pn, ptys_opt) => {
             let en = name_access_chain(context, Access::Term, pn, Some(DeprecatedItem::Struct))?;
             match &en.value {
-                E::ModuleAccess_::ModuleAccess(m, n) if !context.in_spec_context => {
+                E::ModuleAccess_::ModuleAccess(m, n, _) if !context.in_spec_context => {
                     let msg = format!(
                         "Unexpected assignment of module access without fields outside of a spec \
                          context.\nIf you are trying to unpack a struct, try adding fields, e.g. \
@@ -3022,6 +3166,16 @@ fn unbound_names_exp(unbound: &mut UnboundNames, sp!(_, e_): &E::Exp) {
             unbound_names_exp(unbound, et);
             unbound_names_exp(unbound, econd)
         },
+        EE::Match(ed, arms) => {
+            unbound_names_exp(unbound, ed);
+            for arm in arms {
+                unbound_names_binds(unbound, &arm.value.0);
+                if let Some(c) = &arm.value.1 {
+                    unbound_names_exp(unbound, c)
+                }
+                unbound_names_exp(unbound, &arm.value.2)
+            }
+        },
         EE::While(econd, eloop) => {
             unbound_names_exp(unbound, eloop);
             unbound_names_exp(unbound, econd)
@@ -3056,6 +3210,7 @@ fn unbound_names_exp(unbound: &mut UnboundNames, sp!(_, e_): &E::Exp) {
         | EE::UnaryExp(_, e)
         | EE::Borrow(_, e)
         | EE::Cast(e, _)
+        | EE::Test(e, _)
         | EE::Annotate(e, _) => unbound_names_exp(unbound, e),
         EE::FieldMutate(ed, er) => {
             unbound_names_exp(unbound, er);
@@ -3131,6 +3286,7 @@ fn unbound_names_bind(unbound: &mut UnboundNames, sp!(_, l_): &E::LValue) {
         EL::Unpack(_, _, efields) => efields
             .iter()
             .for_each(|(_, _, (_, l))| unbound_names_bind(unbound, l)),
+        EL::PositionalUnpack(_, _, ls) => unbound_names_binds(unbound, ls),
     }
 }
 
@@ -3152,6 +3308,7 @@ fn unbound_names_assign(unbound: &mut UnboundNames, sp!(_, l_): &E::LValue) {
         EL::Unpack(_, _, efields) => efields
             .iter()
             .for_each(|(_, _, (_, l))| unbound_names_assign(unbound, l)),
+        EL::PositionalUnpack(_, _, ls) => unbound_names_assigns(unbound, ls),
     }
 }
 
diff --git a/third_party/move/move-compiler/src/interface_generator.rs b/third_party/move/move-compiler/src/interface_generator.rs
index 3c9d3ce5e468a..4e0e3fd118b07 100644
--- a/third_party/move/move-compiler/src/interface_generator.rs
+++ b/third_party/move/move-compiler/src/interface_generator.rs
@@ -201,6 +201,11 @@ fn write_struct_def(ctx: &mut Context, sdef: &StructDefinition) -> String {
             return out;
         },
         StructFieldInformation::Declared(fields) => fields,
+        StructFieldInformation::DeclaredVariants(..) => {
+            // TODO(#13806): consider implement if interface generator will be
+            //   reused once v1 compiler retires
+            panic!("variants not yet supported by interface generator")
+        },
     };
     for field in fields {
         push_line!(
diff --git a/third_party/move/move-compiler/src/naming/translate.rs b/third_party/move/move-compiler/src/naming/translate.rs
index 901e284483e3b..d6e134b561f96 100644
--- a/third_party/move/move-compiler/src/naming/translate.rs
+++ b/third_party/move/move-compiler/src/naming/translate.rs
@@ -279,7 +279,7 @@ impl<'env> Context<'env> {
                     None
                 },
             },
-            EA::ModuleAccess(m, n) => match self.resolve_module_type(nloc, &m, &n) {
+            EA::ModuleAccess(m, n, _) => match self.resolve_module_type(nloc, &m, &n) {
                 None => {
                     assert!(self.env.has_errors());
                     None
@@ -312,7 +312,7 @@ impl<'env> Context<'env> {
                 },
                 Some(_) => Some((None, ConstantName(n))),
             },
-            EA::ModuleAccess(m, n) => match self.resolve_module_constant(loc, &m, &n) {
+            EA::ModuleAccess(m, n, _) => match self.resolve_module_constant(loc, &m, &n) {
                 None => {
                     assert!(self.env.has_errors());
                     None
@@ -597,7 +597,7 @@ fn acquires_type(context: &mut Context, sp!(loc, en_): E::ModuleAccess) -> Optio
                 .add_diag(diag!(NameResolution::NamePositionMismatch, (loc, msg)));
             None
         },
-        EN::ModuleAccess(m, n) => {
+        EN::ModuleAccess(m, n, _) => {
             let (decl_loc, _, abilities, _) = context.resolve_module_type(loc, &m, &n)?;
             acquires_type_struct(context, loc, decl_loc, m, StructName(n), &abilities)
         },
@@ -666,7 +666,7 @@ fn struct_def(
     let attributes = sdef.attributes;
     let abilities = sdef.abilities;
     let type_parameters = struct_type_parameters(context, sdef.type_parameters);
-    let fields = struct_fields(context, sdef.fields);
+    let fields = struct_fields(context, sdef.loc, sdef.layout);
     N::StructDefinition {
         attributes,
         abilities,
@@ -675,12 +675,15 @@ fn struct_def(
     }
 }
 
-fn struct_fields(context: &mut Context, efields: E::StructFields) -> N::StructFields {
-    match efields {
-        E::StructFields::Native(loc) => N::StructFields::Native(loc),
-        E::StructFields::Defined(em) => {
+fn struct_fields(context: &mut Context, _loc: Loc, elayout: E::StructLayout) -> N::StructFields {
+    match elayout {
+        E::StructLayout::Native(loc) => N::StructFields::Native(loc),
+        E::StructLayout::Singleton(em, _) => {
             N::StructFields::Defined(em.map(|_f, (idx, t)| (idx, type_(context, t))))
         },
+        E::StructLayout::Variants(_) => {
+            panic!("ICE unexpected Move 2 struct layout")
+        },
     }
 }
 
@@ -809,7 +812,7 @@ fn type_(context: &mut Context, sp!(loc, ety_): E::Type) -> N::Type {
             args.push(type_(context, *result));
             NT::builtin_(sp(loc, N::BuiltinTypeName_::Fun), args)
         },
-        ET::Apply(sp!(nloc, EN::ModuleAccess(m, n)), tys) => {
+        ET::Apply(sp!(nloc, EN::ModuleAccess(m, n, _)), tys) => {
             match context.resolve_module_type(nloc, &m, &n) {
                 None => {
                     assert!(context.env.has_errors());
@@ -1065,7 +1068,7 @@ fn exp_(context: &mut Context, e: E::Exp) -> N::Exp {
                 },
 
                 EA::Name(n) => NE::VarCall(Var(n), nes),
-                EA::ModuleAccess(m, n) => match context.resolve_module_function(mloc, &m, &n) {
+                EA::ModuleAccess(m, n, _) => match context.resolve_module_function(mloc, &m, &n) {
                     None => {
                         assert!(context.env.has_errors());
                         NE::UnresolvedError
@@ -1104,6 +1107,10 @@ fn exp_(context: &mut Context, e: E::Exp) -> N::Exp {
             assert!(context.env.has_errors());
             NE::UnresolvedError
         },
+        // Variants only allowed in Move 2
+        EE::Match(..) | EE::Test(..) => {
+            panic!("ICE unexpected Move 2 construct")
+        },
         // Matches variants only allowed in specs (we handle the allowed ones above)
         EE::Index(..) | EE::Quant(..) | EE::Name(_, Some(_)) => {
             panic!("ICE unexpected specification construct")
@@ -1174,6 +1181,7 @@ fn lvalue(context: &mut Context, case: LValueCase, sp!(loc, l_): E::LValue) -> O
                 nfields.expect("ICE fields were already unique"),
             )
         },
+        EL::PositionalUnpack(_, _, _) => panic!("positional fields only allowed in v2"),
         EL::Var(_, _) => panic!("unexpected specification construct"),
     };
     Some(sp(loc, nl_))
diff --git a/third_party/move/move-compiler/src/parser/ast.rs b/third_party/move/move-compiler/src/parser/ast.rs
index de516ecf5780a..98840ff661610 100644
--- a/third_party/move/move-compiler/src/parser/ast.rs
+++ b/third_party/move/move-compiler/src/parser/ast.rs
@@ -199,6 +199,7 @@ pub struct FriendDecl {
 
 new_name!(Field);
 new_name!(StructName);
+new_name!(VariantName);
 
 pub type ResourceLoc = Option<Loc>;
 
@@ -216,15 +217,26 @@ pub struct StructDefinition {
     pub abilities: Vec<Ability>,
     pub name: StructName,
     pub type_parameters: Vec<StructTypeParameter>,
-    pub fields: StructFields,
+    pub layout: StructLayout,
 }
 
 #[derive(Debug, PartialEq, Clone)]
-pub enum StructFields {
-    Defined(Vec<(Field, Type)>),
+pub enum StructLayout {
+    // the second field is true iff the struct has positional fields
+    Singleton(Vec<(Field, Type)>, bool),
+    Variants(Vec<StructVariant>),
     Native(Loc),
 }
 
+#[derive(Debug, PartialEq, Clone)]
+pub struct StructVariant {
+    pub attributes: Vec<Attributes>,
+    pub loc: Loc,
+    pub name: VariantName,
+    pub fields: Vec<(Field, Type)>,
+    pub is_positional: bool,
+}
+
 //**************************************************************************************************
 // Functions
 //**************************************************************************************************
@@ -275,6 +287,7 @@ pub enum Visibility {
     Public(Loc),
     Script(Loc),
     Friend(Loc),
+    Package(Loc),
     Internal,
 }
 
@@ -452,6 +465,8 @@ pub enum NameAccessChain_ {
     Two(LeadingNameAccess, Name),
     // (<Name>|<Num>)::<Name>::<Name>
     Three(Spanned<(LeadingNameAccess, Name)>, Name),
+    // (<Name>|<Num>)::<Name>::<Name>::<Name>
+    Four(Spanned<(LeadingNameAccess, Name)>, Name, Name),
 }
 pub type NameAccessChain = Spanned<NameAccessChain_>;
 
@@ -495,6 +510,9 @@ pub enum Bind_ {
     // T { f1: b1, ... fn: bn }
     // T<t1, ... , tn> { f1: b1, ... fn: bn }
     Unpack(Box<NameAccessChain>, Option<Vec<Type>>, Vec<(Field, Bind)>),
+    // T(e1, ..., en)
+    // T<t1, ... , tn>(e1, ..., en)
+    PositionalUnpack(Box<NameAccessChain>, Option<Vec<Type>>, Vec<Bind>),
 }
 pub type Bind = Spanned<Bind_>;
 // b1, ..., bn
@@ -634,6 +652,8 @@ pub enum Exp_ {
     While(Box<Exp>, Box<Exp>),
     // loop eloop
     Loop(Box<Exp>),
+    // match (e) { b1 [ if c_1] => e1, ... }
+    Match(Box<Exp>, Vec<Spanned<(BindList, Option<Exp>, Exp)>>),
 
     // { seq }
     Block(Sequence),
@@ -685,6 +705,9 @@ pub enum Exp_ {
     // (e: t)
     Annotate(Box<Exp>, Type),
 
+    // (e is t1 | .. | tn)
+    Test(Box<Exp>, Vec<Type>),
+
     // spec { ... }
     Spec(SpecBlock),
 
@@ -717,6 +740,16 @@ pub enum SequenceItem_ {
 }
 pub type SequenceItem = Spanned<SequenceItem_>;
 
+pub type MatchArm = Spanned<MatchArm_>;
+
+#[derive(Debug, Clone, PartialEq)]
+pub struct MatchArm_ {
+    bind: Bind,
+    variant_name: NameAccessChain,
+    type_args: Option<Vec<Type>>,
+    bindings: Vec<(Field, Bind)>,
+}
+
 //**************************************************************************************************
 // Traits
 //**************************************************************************************************
@@ -929,14 +962,16 @@ impl BinOp_ {
 impl Visibility {
     pub const FRIEND: &'static str = "public(friend)";
     pub const INTERNAL: &'static str = "";
+    pub const PACKAGE: &'static str = "public(package)";
     pub const PUBLIC: &'static str = "public";
     pub const SCRIPT: &'static str = "public(script)";
 
     pub fn loc(&self) -> Option<Loc> {
         match self {
-            Visibility::Public(loc) | Visibility::Script(loc) | Visibility::Friend(loc) => {
-                Some(*loc)
-            },
+            Visibility::Public(loc)
+            | Visibility::Script(loc)
+            | Visibility::Friend(loc)
+            | Visibility::Package(loc) => Some(*loc),
             Visibility::Internal => None,
         }
     }
@@ -967,6 +1002,9 @@ impl fmt::Display for NameAccessChain_ {
             NameAccessChain_::One(n) => write!(f, "{}", n),
             NameAccessChain_::Two(ln, n2) => write!(f, "{}::{}", ln, n2),
             NameAccessChain_::Three(sp!(_, (ln, n2)), n3) => write!(f, "{}::{}::{}", ln, n2, n3),
+            NameAccessChain_::Four(sp!(_, (ln, n2)), n3, n4) => {
+                write!(f, "{}::{}::{}::{}", ln, n2, n3, n4)
+            },
         }
     }
 }
@@ -989,6 +1027,7 @@ impl fmt::Display for Visibility {
             Visibility::Public(_) => Visibility::PUBLIC,
             Visibility::Script(_) => Visibility::SCRIPT,
             Visibility::Friend(_) => Visibility::FRIEND,
+            Visibility::Package(_) => Visibility::PACKAGE,
             Visibility::Internal => Visibility::INTERNAL,
         })
     }
@@ -1265,7 +1304,7 @@ impl AstDebug for StructDefinition {
             abilities,
             name,
             type_parameters,
-            fields,
+            layout,
         } = self;
         attributes.ast_debug(w);
 
@@ -1274,19 +1313,21 @@ impl AstDebug for StructDefinition {
             false
         });
 
-        if let StructFields::Native(_) = fields {
+        if let StructLayout::Native(_) = layout {
             w.write("native ");
         }
 
         w.write(&format!("struct {}", name));
         type_parameters.ast_debug(w);
-        if let StructFields::Defined(fields) = fields {
-            w.block(|w| {
+        match layout {
+            StructLayout::Singleton(fields, _) => w.block(|w| {
                 w.semicolon(fields, |w, (f, st)| {
                     w.write(&format!("{}: ", f));
                     st.ast_debug(w);
                 });
-            })
+            }),
+            StructLayout::Variants(_) => w.writeln("variant printing NYI"),
+            StructLayout::Native(_) => {},
         }
     }
 }
@@ -1795,6 +1836,20 @@ impl AstDebug for Exp_ {
                     f.ast_debug(w);
                 }
             },
+            E::Match(e, arms) => {
+                w.write("match (");
+                e.ast_debug(w);
+                w.write(") {");
+                for arm in arms {
+                    arm.value.0.ast_debug(w);
+                    if let Some(cond) = &arm.value.1 {
+                        w.write(" if ");
+                        cond.ast_debug(w);
+                    }
+                    w.write(" => ");
+                    arm.value.2.ast_debug(w)
+                }
+            },
             E::While(b, e) => {
                 w.write("while (");
                 b.ast_debug(w);
@@ -1881,6 +1936,16 @@ impl AstDebug for Exp_ {
                 ty.ast_debug(w);
                 w.write(")");
             },
+            E::Test(e, tys) => {
+                w.write("(");
+                e.ast_debug(w);
+                w.write(" is ");
+                w.list(tys, "|", |w, item| {
+                    item.ast_debug(w);
+                    false
+                });
+                w.write(")");
+            },
             E::Index(e, i) => {
                 e.ast_debug(w);
                 w.write("[");
@@ -2003,6 +2068,17 @@ impl AstDebug for Bind_ {
                 });
                 w.write("}");
             },
+            B::PositionalUnpack(ma, tys_opt, args) => {
+                ma.ast_debug(w);
+                if let Some(ss) = tys_opt {
+                    w.write("<");
+                    ss.ast_debug(w);
+                    w.write(">");
+                }
+                w.write("(");
+                w.comma(args, |w, b| b.ast_debug(w));
+                w.write(")");
+            },
         }
     }
 }
diff --git a/third_party/move/move-compiler/src/parser/filter.rs b/third_party/move/move-compiler/src/parser/filter.rs
index c205a3ffa36ed..fe09adcb4af28 100644
--- a/third_party/move/move-compiler/src/parser/filter.rs
+++ b/third_party/move/move-compiler/src/parser/filter.rs
@@ -2,8 +2,13 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::parser::ast as P;
+use crate::parser::{
+    ast as P,
+    ast::{ModuleMember, SpecBlockTarget_},
+};
 use move_ir_types::location::sp;
+use move_symbol_pool::Symbol;
+use std::collections::BTreeSet;
 
 /// A trait that decides whether to include a parsed element in the compilation
 pub trait FilterContext {
@@ -56,8 +61,10 @@ pub trait FilterContext {
         &mut self,
         function_def: P::Function,
         is_source_def: bool,
+        filtered_members: &mut BTreeSet<Symbol>,
     ) -> Option<P::Function> {
         if self.should_remove_by_attributes(&function_def.attributes, is_source_def) {
+            filtered_members.insert(function_def.name.0.value);
             None
         } else {
             Some(function_def)
@@ -68,8 +75,10 @@ pub trait FilterContext {
         &mut self,
         struct_def: P::StructDefinition,
         is_source_def: bool,
+        filtered_members: &mut BTreeSet<Symbol>,
     ) -> Option<P::StructDefinition> {
         if self.should_remove_by_attributes(&struct_def.attributes, is_source_def) {
+            filtered_members.insert(struct_def.name.0.value);
             None
         } else {
             Some(struct_def)
@@ -233,7 +242,8 @@ fn filter_script<T: FilterContext>(
 
     // This is a bit weird, if the only function in the script is filtered, we consider
     // the whole script is filtered as well
-    let new_function = context.filter_map_function(function, is_source_def)?;
+    let new_function =
+        context.filter_map_function(function, is_source_def, &mut BTreeSet::new())?;
 
     let new_uses = uses
         .into_iter()
@@ -278,9 +288,29 @@ fn filter_module<T: FilterContext>(
         members,
     } = module_def;
 
+    // Collected filtered members in this set (functions and structs)
+    let mut filtered_members = BTreeSet::new();
+
     let new_members: Vec<_> = members
         .into_iter()
-        .filter_map(|member| filter_module_member(context, member, is_source_def))
+        .filter_map(|member| {
+            filter_module_member(context, member, is_source_def, &mut filtered_members)
+        })
+        .collect();
+
+    // Now remove all spec blocks for members which are filtered out
+    let new_members_filtered_spec_blocks = new_members
+        .into_iter()
+        .filter(|mem| {
+            if let ModuleMember::Spec(spec) = mem {
+                if let SpecBlockTarget_::Member(name, _) = &spec.value.target.value {
+                    if filtered_members.contains(&name.value) {
+                        return false;
+                    }
+                }
+            }
+            true
+        })
         .collect();
 
     Some(P::ModuleDefinition {
@@ -289,7 +319,7 @@ fn filter_module<T: FilterContext>(
         address,
         name,
         is_spec_module,
-        members: new_members,
+        members: new_members_filtered_spec_blocks,
     })
 }
 
@@ -297,15 +327,16 @@ fn filter_module_member<T: FilterContext>(
     context: &mut T,
     module_member: P::ModuleMember,
     is_source_def: bool,
+    filtered_members: &mut BTreeSet<Symbol>,
 ) -> Option<P::ModuleMember> {
     use P::ModuleMember as PM;
 
     match module_member {
         PM::Function(func_def) => context
-            .filter_map_function(func_def, is_source_def)
+            .filter_map_function(func_def, is_source_def, filtered_members)
             .map(PM::Function),
         PM::Struct(struct_def) => context
-            .filter_map_struct(struct_def, is_source_def)
+            .filter_map_struct(struct_def, is_source_def, filtered_members)
             .map(PM::Struct),
         PM::Spec(sp!(spec_loc, spec)) => context
             .filter_map_spec(spec, is_source_def)
diff --git a/third_party/move/move-compiler/src/parser/keywords.rs b/third_party/move/move-compiler/src/parser/keywords.rs
index dae3cc77ef18b..4525b07b7fe28 100644
--- a/third_party/move/move-compiler/src/parser/keywords.rs
+++ b/third_party/move/move-compiler/src/parser/keywords.rs
@@ -52,6 +52,7 @@ pub const CONTEXTUAL_KEYWORDS: &[&str] = &[
     "min",
     "modifies",
     "mut",
+    "package",
     "phantom",
     "post",
     "pragma",
diff --git a/third_party/move/move-compiler/src/parser/lexer.rs b/third_party/move/move-compiler/src/parser/lexer.rs
index 6ad463d63abe0..71bfd10c28daa 100644
--- a/third_party/move/move-compiler/src/parser/lexer.rs
+++ b/third_party/move/move-compiler/src/parser/lexer.rs
@@ -42,6 +42,7 @@ pub enum Tok {
     LessLess,
     Equal,
     EqualEqual,
+    EqualGreater,
     EqualEqualGreater,
     LessEqualEqualGreater,
     Greater,
@@ -117,6 +118,7 @@ impl fmt::Display for Tok {
             LessLess => "<<",
             Equal => "=",
             EqualEqual => "==",
+            EqualGreater => "=>",
             EqualEqualGreater => "==>",
             LessEqualEqualGreater => "<==>",
             Greater => ">",
@@ -495,6 +497,8 @@ fn find_token(
         '=' => {
             if text.starts_with("==>") {
                 (Tok::EqualEqualGreater, 3)
+            } else if text.starts_with("=>") {
+                (Tok::EqualGreater, 2)
             } else if text.starts_with("==") {
                 (Tok::EqualEqual, 2)
             } else {
diff --git a/third_party/move/move-compiler/src/parser/mod.rs b/third_party/move/move-compiler/src/parser/mod.rs
index 610ecbfc53f3b..55a0b778d40da 100644
--- a/third_party/move/move-compiler/src/parser/mod.rs
+++ b/third_party/move/move-compiler/src/parser/mod.rs
@@ -26,6 +26,10 @@ use std::{
     io::Read,
 };
 
+/// Note that all directory paths must be restricted so that all
+/// Move files under the are suitable for use: e.g., rather than
+/// pointing to a package's Move.toml's directory, they point
+/// to `.../source`, `.../scripts`, and/or `../tests` as appropriate.
 pub(crate) fn parse_program(
     compilation_env: &mut CompilationEnv,
     named_address_maps: NamedAddressMaps,
diff --git a/third_party/move/move-compiler/src/parser/syntax.rs b/third_party/move/move-compiler/src/parser/syntax.rs
index 7381231464422..0103a11023cf1 100644
--- a/third_party/move/move-compiler/src/parser/syntax.rs
+++ b/third_party/move/move-compiler/src/parser/syntax.rs
@@ -77,6 +77,30 @@ fn add_type_args_ambiguity_label(loc: Loc, mut diag: Box<Diagnostic>) -> Box<Dia
 // Miscellaneous Utilities
 //**************************************************************************************************
 
+fn require_move_2(context: &mut Context, loc: Loc, description: &str) -> bool {
+    if !context.env.flags().lang_v2() {
+        context.env.add_diag(diag!(
+            Syntax::UnsupportedLanguageItem,
+            (
+                loc,
+                format!("Move 2 language construct is not enabled: {}", description)
+            )
+        ));
+        false
+    } else {
+        true
+    }
+}
+
+fn require_move_2_and_advance(
+    context: &mut Context,
+    description: &str,
+) -> Result<bool, Box<Diagnostic>> {
+    let loc = current_token_loc(context.tokens);
+    context.tokens.advance()?;
+    Ok(require_move_2(context, loc, description))
+}
+
 pub fn make_loc(file_hash: FileHash, start: usize, end: usize) -> Loc {
     Loc::new(file_hash, start as u32, end as u32)
 }
@@ -286,6 +310,43 @@ fn parse_identifier(context: &mut Context) -> Result<Name, Box<Diagnostic>> {
     Ok(spanned(context.tokens.file_hash(), start_loc, end_loc, id))
 }
 
+// Parse an identifier or an positional field
+//     <Identifier> | [0-9]+
+fn parse_identifier_or_positional_field(context: &mut Context) -> Result<Name, Box<Diagnostic>> {
+    let start_loc = context.tokens.start_loc();
+    let id: Symbol = context.tokens.content().into();
+    if !(context.tokens.peek() == Tok::Identifier || next_token_is_positional_field(context)) {
+        return Err(unexpected_token_error(
+            context.tokens,
+            &format!(
+                "an identifier {}",
+                if context.env.flags().lang_v2() {
+                    "or a positional field `0`, `1`, ..."
+                } else {
+                    ""
+                }
+            ),
+        ));
+    }
+    let is_positional_field = context.tokens.peek() == Tok::NumValue;
+    context.tokens.advance()?;
+    let end_loc = context.tokens.previous_end_loc();
+    let loc = make_loc(context.tokens.file_hash(), start_loc, end_loc);
+    if is_positional_field {
+        require_move_2(context, loc, "positional field");
+    }
+    Ok(Spanned::new(loc, id))
+}
+
+fn next_token_is_positional_field(context: &mut Context) -> bool {
+    if context.tokens.peek() == Tok::NumValue {
+        let id: Symbol = context.tokens.content().into();
+        id.as_str().chars().all(|c| c.is_ascii_digit())
+    } else {
+        false
+    }
+}
+
 // Parse a numerical address value
 //     NumericalAddress = <Number>
 fn parse_address_bytes(
@@ -434,7 +495,13 @@ fn parse_name_access_chain_<'a, F: FnOnce() -> &'a str>(
     );
     consume_token(context.tokens, Tok::ColonColon)?;
     let n3 = parse_identifier_or_possibly_wildcard(context, allow_wildcard)?;
-    Ok(NameAccessChain_::Three(sp(ln_n2_loc, (ln, n2)), n3))
+    if context.tokens.peek() != Tok::ColonColon {
+        return Ok(NameAccessChain_::Three(sp(ln_n2_loc, (ln, n2)), n3));
+    }
+    consume_token(context.tokens, Tok::ColonColon)?;
+    let n4 = parse_identifier_or_possibly_wildcard(context, allow_wildcard)?;
+    require_move_2(context, n4.loc, "fully qualified variant name");
+    Ok(NameAccessChain_::Four(sp(ln_n2_loc, (ln, n2)), n3, n4))
 }
 
 fn parse_identifier_or_possibly_wildcard(
@@ -478,7 +545,7 @@ impl Modifiers {
 // Parse module member modifiers: visiblility and native.
 // The modifiers are also used for script-functions
 //      ModuleMemberModifiers = <ModuleMemberModifier>*
-//      ModuleMemberModifier = <Visibility> | "native"
+//      ModuleMemberModifier = <Visibility> | "native" | "entry"
 // ModuleMemberModifiers checks for uniqueness, meaning each individual ModuleMemberModifier can
 // appear only once
 fn parse_module_member_modifiers(context: &mut Context) -> Result<Modifiers, Box<Diagnostic>> {
@@ -533,17 +600,18 @@ fn parse_module_member_modifiers(context: &mut Context) -> Result<Modifiers, Box
 }
 
 // Parse a function visibility modifier:
-//      Visibility = "public" ( "(" "script" | "friend" ")" )?
+//      Visibility = "public" ( "(" "script" | "friend" | "package" ")" )?
 fn parse_visibility(context: &mut Context) -> Result<Visibility, Box<Diagnostic>> {
     let start_loc = context.tokens.start_loc();
     consume_token(context.tokens, Tok::Public)?;
     let sub_public_vis = if match_token(context.tokens, Tok::LParen)? {
         let sub_token = context.tokens.peek();
+        let sub_token_content = context.tokens.content();
         context.tokens.advance()?;
         if sub_token != Tok::RParen {
             consume_token(context.tokens, Tok::RParen)?;
         }
-        Some(sub_token)
+        Some((sub_token, sub_token_content))
     } else {
         None
     };
@@ -552,18 +620,24 @@ fn parse_visibility(context: &mut Context) -> Result<Visibility, Box<Diagnostic>
     let loc = make_loc(context.tokens.file_hash(), start_loc, end_loc);
     Ok(match sub_public_vis {
         None => Visibility::Public(loc),
-        Some(Tok::Script) => Visibility::Script(loc),
-        Some(Tok::Friend) => Visibility::Friend(loc),
+        Some((Tok::Script, _)) => Visibility::Script(loc),
+        Some((Tok::Friend, _)) => Visibility::Friend(loc),
+        Some((Tok::Identifier, "package")) => {
+            require_move_2(context, loc, "public(package) visibility");
+            Visibility::Package(loc)
+        },
         _ => {
             let msg = format!(
-                "Invalid visibility modifier. Consider removing it or using '{}' or '{}'",
+                "Invalid visibility modifier. Consider removing it or using '{}', '{}', or '{}'",
                 Visibility::PUBLIC,
-                Visibility::FRIEND
+                Visibility::FRIEND,
+                Visibility::PACKAGE,
             );
             return Err(Box::new(diag!(Syntax::UnexpectedToken, (loc, msg))));
         },
     })
 }
+
 // Parse an attribute value. Either a value literal or a module access
 //      AttributeValue =
 //          <Value>
@@ -579,12 +653,19 @@ fn parse_attribute_value(context: &mut Context) -> Result<AttributeValue, Box<Di
 
 // Parse a single attribute
 //      Attribute =
-//          <Identifier>
-//          | <Identifier> "=" <AttributeValue>
-//          | <Identifier> "(" Comma<Attribute> ")"
+//          <AttributeName>
+//          | <AttributeName> "=" <AttributeValue>
+//          | <AttributeName> "(" Comma<Attribute> ")"
+//      AttributeName = <Identifier> ( "::" Identifier )* // merged into one identifier
 fn parse_attribute(context: &mut Context) -> Result<Attribute, Box<Diagnostic>> {
     let start_loc = context.tokens.start_loc();
-    let n = parse_identifier(context)?;
+    let mut n = parse_identifier(context)?;
+    while match_token(context.tokens, Tok::ColonColon)? {
+        let n1 = parse_identifier(context)?;
+        let id = Symbol::from(format!("{}::{}", n.value.as_str(), n1.value.as_str()));
+        let end_loc = context.tokens.previous_end_loc();
+        n = spanned(context.tokens.file_hash(), start_loc, end_loc, id);
+    }
     let attr_ = match context.tokens.peek() {
         Tok::Equal => {
             context.tokens.advance()?;
@@ -679,11 +760,17 @@ fn parse_bind_field(context: &mut Context) -> Result<(Field, Bind), Box<Diagnost
 //      Bind =
 //          <Var>
 //          | <NameAccessChain> <OptionalTypeArgs> "{" Comma<BindField> "}"
+//          | <NameAccessChain> <OptionalTypeArgs> "(" Comma<Bind> "," ")"
+//          | <NameAccessChain> <OptionalTypeArgs>
 fn parse_bind(context: &mut Context) -> Result<Bind, Box<Diagnostic>> {
     let start_loc = context.tokens.start_loc();
     if context.tokens.peek() == Tok::Identifier {
         let next_tok = context.tokens.lookahead()?;
-        if next_tok != Tok::LBrace && next_tok != Tok::Less && next_tok != Tok::ColonColon {
+        if next_tok != Tok::LBrace
+            && next_tok != Tok::LParen
+            && next_tok != Tok::Less
+            && next_tok != Tok::ColonColon
+        {
             let v = Bind_::Var(parse_var(context)?);
             let end_loc = context.tokens.previous_end_loc();
             return Ok(spanned(context.tokens.file_hash(), start_loc, end_loc, v));
@@ -692,17 +779,35 @@ fn parse_bind(context: &mut Context) -> Result<Bind, Box<Diagnostic>> {
     // The item description specified here should include the special case above for
     // variable names, because if the current context cannot be parsed as a struct name
     // it is possible that the user intention was to use a variable name.
-    let ty = parse_name_access_chain(context, false, || "a variable or struct name")?;
+    let ty = parse_name_access_chain(context, false, || "a variable or struct or variant name")?;
     let ty_args = parse_optional_type_args(context)?;
-    let args = parse_comma_list(
-        context,
-        Tok::LBrace,
-        Tok::RBrace,
-        parse_bind_field,
-        "a field binding",
-    )?;
+
+    let unpack = if !context.env.flags().lang_v2() || context.tokens.peek() == Tok::LBrace {
+        let args = parse_comma_list(
+            context,
+            Tok::LBrace,
+            Tok::RBrace,
+            parse_bind_field,
+            "a field binding",
+        )?;
+        Bind_::Unpack(Box::new(ty), ty_args, args)
+    } else if context.tokens.peek() == Tok::LParen {
+        let start_loc = context.tokens.start_loc();
+        let args = parse_comma_list(
+            context,
+            Tok::LParen,
+            Tok::RParen,
+            parse_bind,
+            "a positional field binding",
+        )?;
+        let end_loc = context.tokens.previous_end_loc();
+        let loc = make_loc(context.tokens.file_hash(), start_loc, end_loc);
+        require_move_2(context, loc, "positional field");
+        Bind_::PositionalUnpack(Box::new(ty), ty_args, args)
+    } else {
+        Bind_::Unpack(Box::new(ty), ty_args, vec![])
+    };
     let end_loc = context.tokens.previous_end_loc();
-    let unpack = Bind_::Unpack(Box::new(ty), ty_args, args);
     Ok(spanned(
         context.tokens.file_hash(),
         start_loc,
@@ -927,11 +1032,13 @@ fn parse_sequence(context: &mut Context) -> Result<Sequence, Box<Diagnostic>> {
 //          | "while" "(" <Exp> ")" <Exp> (SpecBlock)?
 //          | "loop" <Exp>
 //          | "loop" "{" <Exp> "}"
+//          | <Match>
 //          | "return" "{" <Exp> "}"
 //          | "return" <Exp>?
 //          | "abort" "{" <Exp> "}"
 //          | "abort" <Exp>
 //          | "for" "(" <Exp> "in" <Exp> ".." <Exp> ")" "{" <Exp> "}"
+//          | <NameExp>
 fn parse_term(context: &mut Context) -> Result<Exp, Box<Diagnostic>> {
     const VECTOR_IDENT: &str = "vector";
     const FOR_IDENT: &str = "for";
@@ -945,6 +1052,17 @@ fn parse_term(context: &mut Context) -> Result<Exp, Box<Diagnostic>> {
             }
             return parse_binop_exp(context, control_exp, /* min_prec */ 1);
         },
+        Tok::Identifier
+            if context.tokens.content() == "match"
+                && context.tokens.lookahead()? == Tok::LParen =>
+        {
+            // Match always ends in block (see above case for comparison)
+            let match_exp = parse_match_exp(context)?;
+            if at_end_of_exp(context) {
+                return Ok(match_exp);
+            }
+            return parse_binop_exp(context, match_exp, 1);
+        },
         Tok::Identifier
             if context.tokens.content() == FOR_IDENT
                 && matches!(context.tokens.lookahead_nth(0), Ok(Tok::LParen))
@@ -1019,6 +1137,7 @@ fn parse_term(context: &mut Context) -> Result<Exp, Box<Diagnostic>> {
         // "(" Comma<Exp> ")"
         // "(" <Exp> ":" <Type> ")"
         // "(" <Exp> "as" <Type> ")"
+        // "(" <Exp> "is" <Type> ( "|" <Type> )* ")"
         Tok::LParen => {
             let list_loc = context.tokens.start_loc();
             context.tokens.advance()?; // consume the LParen
@@ -1026,7 +1145,8 @@ fn parse_term(context: &mut Context) -> Result<Exp, Box<Diagnostic>> {
                 Exp_::Unit
             } else {
                 // If there is a single expression inside the parens,
-                // then it may be followed by a colon and a type annotation.
+                // then it may be followed by a colon and a type annotation, an 'as' and a type,
+                // or an 'is' and a list of variants.
                 let e = parse_exp(context)?;
                 if match_token(context.tokens, Tok::Colon)? {
                     let ty = parse_type(context)?;
@@ -1036,6 +1156,22 @@ fn parse_term(context: &mut Context) -> Result<Exp, Box<Diagnostic>> {
                     let ty = parse_type(context)?;
                     consume_token(context.tokens, Tok::RParen)?;
                     Exp_::Cast(Box::new(e), ty)
+                } else if context.tokens.peek() == Tok::Identifier
+                    && context.tokens.content() == "is"
+                {
+                    require_move_2(
+                        context,
+                        current_token_loc(context.tokens),
+                        "`is` expression",
+                    );
+                    context.tokens.advance()?;
+                    let types = parse_list(
+                        context,
+                        |ctx| match_token(ctx.tokens, Tok::Pipe),
+                        parse_type,
+                    )?;
+                    consume_token(context.tokens, Tok::RParen)?;
+                    Exp_::Test(Box::new(e), types)
                 } else {
                     if context.tokens.peek() != Tok::RParen {
                         consume_token(context.tokens, Tok::Comma)?;
@@ -1405,11 +1541,119 @@ fn parse_for_loop(context: &mut Context) -> Result<(Exp, bool), Box<Diagnostic>>
     Ok((parsed_for_loop, ends_in_block))
 }
 
+// Match = "match" "(" <Exp> ")" "{" ( <MatchArm> ","? )* "}"
+// MatchArm = <BindList> ( "if" <Exp> )? "=>" <Exp>
+// If called, we know we are looking at `match (`.
+fn parse_match_exp(context: &mut Context) -> Result<Exp, Box<Diagnostic>> {
+    // We cannot uniquely determine this is actually a match expression
+    // until we have seen the `match (exp) {` prefix. We parse the parts and
+    // decide on the go whether to interpret this as a call to a function `match`.
+    let start_loc = context.tokens.start_loc();
+    let match_ident = parse_identifier(context)?;
+    debug_assert!(match_ident.value.as_str() == "match");
+    let start_lparen_loc = context.tokens.start_loc();
+    assert!(consume_token(context.tokens, Tok::LParen).is_ok());
+    if match_token(context.tokens, Tok::RParen)? {
+        // Interpret as function call `match()`
+        let end_loc = context.tokens.previous_end_loc();
+        Ok(spanned(
+            context.tokens.file_hash(),
+            start_loc,
+            end_loc,
+            Exp_::Call(
+                sp(match_ident.loc, NameAccessChain_::One(match_ident)),
+                CallKind::Regular,
+                None,
+                spanned(
+                    match_ident.loc.file_hash(),
+                    start_lparen_loc,
+                    end_loc,
+                    vec![],
+                ),
+            ),
+        ))
+    } else {
+        let exp = parse_exp(context)?;
+        // As we have seen `match (exp`, now check whether we are looking at `match (exp) {`
+        // to confirm match expression
+        if (context.tokens.peek(), context.tokens.lookahead()?) == (Tok::RParen, Tok::LBrace) {
+            require_move_2(context, match_ident.loc, "match expression");
+            consume_token(context.tokens, Tok::RParen)?;
+            consume_token(context.tokens, Tok::LBrace)?;
+            let arms = parse_match_arms(context)?;
+            consume_token(context.tokens, Tok::RBrace)?;
+            Ok(spanned(
+                context.tokens.file_hash(),
+                start_loc,
+                context.tokens.previous_end_loc(),
+                Exp_::Match(Box::new(exp), arms),
+            ))
+        } else {
+            // Interpret as a function call `match(arg1, .., argn)`
+            let mut args = vec![exp];
+            if context.tokens.peek() == Tok::Comma {
+                // parse remaining `, arg2, arg3, ..)`
+                args.append(&mut parse_comma_list(
+                    context,
+                    Tok::Comma,
+                    Tok::RParen,
+                    parse_exp,
+                    "a call argument expression",
+                )?);
+            } else {
+                consume_token(context.tokens, Tok::RParen)?;
+            }
+            let end_loc = context.tokens.previous_end_loc();
+            Ok(spanned(
+                match_ident.loc.file_hash(),
+                start_loc,
+                end_loc,
+                Exp_::Call(
+                    sp(match_ident.loc, NameAccessChain_::One(match_ident)),
+                    CallKind::Regular,
+                    None,
+                    spanned(match_ident.loc.file_hash(), start_lparen_loc, end_loc, args),
+                ),
+            ))
+        }
+    }
+}
+
+fn parse_match_arms(
+    context: &mut Context,
+) -> Result<Vec<Spanned<(BindList, Option<Exp>, Exp)>>, Box<Diagnostic>> {
+    let mut arms = vec![];
+    while context.tokens.peek() != Tok::RBrace {
+        let start_loc = context.tokens.start_loc();
+        let bind_list = parse_bind_list(context)?;
+        let cond = if match_token(context.tokens, Tok::If)? {
+            Some(parse_exp(context)?)
+        } else {
+            None
+        };
+        consume_token(context.tokens, Tok::EqualGreater)?;
+        let (body, body_is_block) = parse_exp_or_control_sequence(context)?;
+        let next = context.tokens.peek();
+        // Block based arms are optionally separated by comma, otherwise
+        // a comma is required if not at end of the list.
+        if (!body_is_block && next != Tok::RBrace) || next == Tok::Comma {
+            consume_token(context.tokens, Tok::Comma)?
+        }
+        arms.push(spanned(
+            context.tokens.file_hash(),
+            start_loc,
+            context.tokens.previous_end_loc(),
+            (bind_list, cond, body),
+        ))
+    }
+    Ok(arms)
+}
+
 // Parse a pack, call, or other reference to a name:
 //      NameExp =
 //          <NameAccessChain> <OptionalTypeArgs> "{" Comma<ExpField> "}"
-//          | <NameAccessChain> <OptionalTypeArgs> "(" Comma<Exp> ")"
-//          | <NameAccessChain> "!" "(" Comma<Exp> ")"
+//          | <NameAccessChain> <OptionalTypeArgs> <CallArgs>
+//          | <NameAccessChain> "!" <CallArgs>
 //          | <NameAccessChain> <OptionalTypeArgs>
 fn parse_name_exp(context: &mut Context) -> Result<Exp_, Box<Diagnostic>> {
     let n = parse_name_access_chain(context, false, || {
@@ -1446,7 +1690,7 @@ fn parse_name_exp(context: &mut Context) -> Result<Exp_, Box<Diagnostic>> {
             Ok(Exp_::Pack(n, tys, fs))
         },
 
-        // Call: "(" Comma<Exp> ")"
+        // Call: <CallArgs>
         Tok::Exclaim | Tok::LParen => {
             let rhs = parse_call_args(context)?;
             Ok(Exp_::Call(n, CallKind::Regular, tys, rhs))
@@ -1457,7 +1701,9 @@ fn parse_name_exp(context: &mut Context) -> Result<Exp_, Box<Diagnostic>> {
     }
 }
 
-// Parse the arguments to a call: "(" Comma<Exp> ")"
+// Parse the arguments to a call:
+//      CallArgs =
+//          "(" Comma<Exp> ")"
 fn parse_call_args(context: &mut Context) -> Result<Spanned<Vec<Exp>>, Box<Diagnostic>> {
     let start_loc = context.tokens.start_loc();
     let args = parse_comma_list(
@@ -1492,7 +1738,6 @@ fn at_end_of_exp(context: &mut Context) -> bool {
 fn at_start_of_exp(context: &mut Context) -> bool {
     matches!(
         context.tokens.peek(),
-        // value
         Tok::NumValue
             | Tok::NumTypedValue
             | Tok::ByteStringValue
@@ -1723,8 +1968,8 @@ fn parse_unary_exp(context: &mut Context) -> Result<Exp, Box<Diagnostic>> {
 
 // Parse an expression term optionally followed by a chain of dot or index accesses:
 //      DotOrIndexChain =
-//          <DotOrIndexChain> "." <Identifier> [  "(" Comma<Exp> ")" ]
-//          | <DotOrIndexChain> "[" <Exp> "]"                      spec only
+//          <DotOrIndexChain> "." <Identifier> [ ["::" "<" Comma<Type> ">"]? <CallArgs> ]?
+//          | <DotOrIndexChain> "[" <Exp> "]"
 //          | <Term>
 fn parse_dot_or_index_chain(context: &mut Context) -> Result<Exp, Box<Diagnostic>> {
     let start_loc = context.tokens.start_loc();
@@ -1733,7 +1978,7 @@ fn parse_dot_or_index_chain(context: &mut Context) -> Result<Exp, Box<Diagnostic
         let exp = match context.tokens.peek() {
             Tok::Period => {
                 context.tokens.advance()?;
-                let n = parse_identifier(context)?;
+                let n = parse_identifier_or_positional_field(context)?;
                 let ahead = context.tokens.peek();
                 if matches!(ahead, Tok::LParen | Tok::ColonColon) {
                     let generics = if ahead == Tok::ColonColon {
@@ -1796,7 +2041,7 @@ fn is_quant(context: &mut Context) -> bool {
 // Parses a quantifier expressions, assuming is_quant(context) is true.
 //
 //   <Quantifier> =
-//       ( "forall" | "exists" ) <QuantifierBindings> ({ (<Exp>)* })* ("where" <Exp>)? ":" Exp
+//       ( "forall" | "exists" ) <QuantifierBindings> ("{" Comma<Exp> "}")* ("where" <Exp>)? ":" <Exp>
 //     | ( "choose" [ "min" ] ) <QuantifierBind> "where" <Exp>
 //   <QuantifierBindings> = <QuantifierBind> ("," <QuantifierBind>)*
 //   <QuantifierBind> = <Identifier> ":" <Type> | <Identifier> "in" <Exp>
@@ -1957,7 +2202,7 @@ fn make_builtin_call(loc: Loc, name: Symbol, type_args: Option<Vec<Type>>, args:
 //          <NameAccessChain> ('<' Comma<Type> ">")?
 //          | "&" <Type>
 //          | "&mut" <Type>
-//          | "|" Comma<Type> "|" Type
+//          | "|" Comma<Type> "|" <Type>?
 //          | "(" Comma<Type> ")"
 fn parse_type(context: &mut Context) -> Result<Type, Box<Diagnostic>> {
     let start_loc = context.tokens.start_loc();
@@ -2180,7 +2425,8 @@ fn parse_struct_type_parameters(
 //          (":" <Type>)?
 //          ("acquires" <NameAccessChain> ("," <NameAccessChain>)*)?
 //          ("{" <Sequence> "}" | ";")
-//
+//      FunctionDefName =
+//          <Identifier> <OptionalTypeParameters>
 fn parse_function_decl(
     attributes: Vec<Attributes>,
     start_loc: usize,
@@ -2236,12 +2482,12 @@ fn parse_function_decl(
         sp(name.loc(), Type_::Unit)
     };
 
-    // ( ( "!" )? ("acquires" | "reads" | "writes" ) <AccessSpecifierList> )*
+    // "pure" | ( ( "!" )? ("acquires" | "reads" | "writes" ) <AccessSpecifierList> )*
     let mut access_specifiers = vec![];
     let mut pure_loc = None;
     loop {
         let negated = if context.tokens.peek() == Tok::Exclaim {
-            context.tokens.advance()?;
+            require_move_2_and_advance(context, "access specifiers")?;
             true
         } else {
             false
@@ -2256,7 +2502,7 @@ fn parse_function_decl(
                 )?)
             },
             Tok::Identifier if context.tokens.content() == "reads" => {
-                context.tokens.advance()?;
+                require_move_2_and_advance(context, "access specifiers")?;
                 access_specifiers.extend(parse_access_specifier_list(
                     context,
                     negated,
@@ -2264,7 +2510,7 @@ fn parse_function_decl(
                 )?)
             },
             Tok::Identifier if context.tokens.content() == "writes" => {
-                context.tokens.advance()?;
+                require_move_2_and_advance(context, "access specifiers")?;
                 access_specifiers.extend(parse_access_specifier_list(
                     context,
                     negated,
@@ -2273,13 +2519,13 @@ fn parse_function_decl(
             },
             Tok::Identifier if context.tokens.content() == "pure" => {
                 pure_loc = Some(current_token_loc(context.tokens));
+                require_move_2_and_advance(context, "access specifiers")?;
                 if negated {
                     return Err(Box::new(diag!(
                         Syntax::InvalidAccessSpecifier,
                         (pure_loc.unwrap(), "'pure' cannot be negated")
                     )));
                 }
-                context.tokens.advance()?;
             },
             _ => break,
         }
@@ -2382,7 +2628,7 @@ fn parse_access_specifier_list(
 }
 
 // Parse an access specifier:
-//   AccessSpecifier = <NameAccessChainWithWildcard> <AddressSpecifier>
+//   AccessSpecifier = <NameAccessChainWithWildcard> <OptionalTypeArgs> <AddressSpecifier>
 fn parse_access_specifier(
     context: &mut Context,
     negated: bool,
@@ -2402,7 +2648,7 @@ fn parse_access_specifier(
 
 // Parse an address specifier:
 //   AddressSpecifier = <empty> | "(" <AddressSpecifierArg> ")"
-//   AddressSpecifierArg = "*" | <Identifier> | <NameAccessChain> "(" <Identifier> ")"
+//   AddressSpecifierArg = "*" | <AddressBytes> | <NameAccessChain> ( <TypeArgs>? "(" <Identifier> ")" )?
 fn parse_address_specifier(context: &mut Context) -> Result<AddressSpecifier, Box<Diagnostic>> {
     let start = context.tokens.start_loc();
     let (spec, end) = if match_token(context.tokens, Tok::LParen)? {
@@ -2452,11 +2698,20 @@ fn parse_address_specifier(context: &mut Context) -> Result<AddressSpecifier, Bo
 
 // Parse a struct definition:
 //      StructDecl =
-//          "struct" <StructDefName> ("has" <Ability> (, <Ability>)+)?
-//          ("{" Comma<FieldAnnot> "}" | ";")
+//          native struct <StructDefName> <Abilities>? ";"
+//        | "struct" <StructDefName> <Abilities>? "{" Comma<FieldAnnot> "}" (<Abilities> ";")?
+//        | "struct" <StructDefName> "(" Comma<Type> ")" <Abilities>?";"
+//        | "enum" <StructDefName> <Abilities>? "{" Comma<EnumVariant> "}" (<Abilities> ";")?
 //      StructDefName =
-//          <Identifier> <OptionalTypeParameters>
+//          <Identifier> <StructTypeParameter>
+//      EnumVariant =
+//          <Identifier> "{" Comma<FieldAnnot> "}"
+//          <Identifier> "(" Comma<Type> ")"
+//          <Identifier>
+//      Abilities =
+//          "has" <Ability> (, <Ability>)+
 fn parse_struct_decl(
+    is_enum: bool,
     attributes: Vec<Attributes>,
     start_loc: usize,
     modifiers: Modifiers,
@@ -2467,19 +2722,22 @@ fn parse_struct_decl(
         entry,
         native,
     } = modifiers;
-    if let Some(vis) = visibility {
-        let msg = format!(
-            "Invalid struct declaration. Structs cannot have visibility modifiers as they are \
+    match visibility {
+        Some(vis) if !context.env.flags().lang_v2() => {
+            let msg = format!(
+                "Invalid struct declaration. Structs cannot have visibility modifiers as they are \
              always '{}'",
-            Visibility::PUBLIC
-        );
-        context
-            .env
-            .add_diag(diag!(Syntax::InvalidModifier, (vis.loc().unwrap(), msg)));
+                Visibility::PUBLIC
+            );
+            context
+                .env
+                .add_diag(diag!(Syntax::InvalidModifier, (vis.loc().unwrap(), msg)));
+        },
+        _ => {},
     }
     if let Some(loc) = entry {
         let msg = format!(
-            "Invalid constant declaration. '{}' is used only on functions",
+            "Invalid type declaration. '{}' is used only on functions",
             ENTRY_MODIFIER
         );
         context
@@ -2487,14 +2745,84 @@ fn parse_struct_decl(
             .add_diag(diag!(Syntax::InvalidModifier, (loc, msg)));
     }
 
-    consume_token(context.tokens, Tok::Struct)?;
+    if is_enum {
+        require_move_2_and_advance(context, "enum types")?;
+    } else {
+        consume_token(context.tokens, Tok::Struct)?;
+    }
 
     // <StructDefName>
     let name = StructName(parse_identifier(context)?);
     let type_parameters = parse_struct_type_parameters(context)?;
 
-    let abilities = if context.tokens.peek() == Tok::Identifier && context.tokens.content() == "has"
-    {
+    let mut abilities = parse_abilities(context)?;
+
+    let layout = match native {
+        Some(loc) => {
+            consume_token(context.tokens, Tok::Semicolon)?;
+            StructLayout::Native(loc)
+        },
+        None => {
+            if is_enum {
+                let mut list = vec![];
+                consume_token(context.tokens, Tok::LBrace)?;
+                while context.tokens.peek() != Tok::RBrace {
+                    // If the variant is based on a block, we allow but do not require
+                    // a `,`. Otherwise, a comma is required.
+                    let (variant, has_block) = parse_struct_variant(context)?;
+                    let next = context.tokens.peek();
+                    if (!has_block && next != Tok::RBrace) || next == Tok::Comma {
+                        consume_token(context.tokens, Tok::Comma)?;
+                    }
+                    list.push(variant)
+                }
+                consume_token(context.tokens, Tok::RBrace)?;
+                parse_postfix_abilities(context, &mut abilities)?;
+                StructLayout::Variants(list)
+            } else {
+                let (list, is_positional) = if context.tokens.peek() == Tok::LParen {
+                    let loc = current_token_loc(context.tokens);
+                    require_move_2(context, loc, "positional fields");
+                    let list = parse_anonymous_fields(context)?;
+                    abilities = parse_abilities(context)?;
+                    consume_token(context.tokens, Tok::Semicolon)?;
+                    (list, true)
+                } else {
+                    let list = parse_comma_list(
+                        context,
+                        Tok::LBrace,
+                        Tok::RBrace,
+                        parse_field_annot,
+                        "a field",
+                    )?;
+                    parse_postfix_abilities(context, &mut abilities)?;
+                    (list, false)
+                };
+                StructLayout::Singleton(list, is_positional)
+            }
+        },
+    };
+
+    let loc = make_loc(
+        context.tokens.file_hash(),
+        start_loc,
+        context.tokens.previous_end_loc(),
+    );
+    Ok(StructDefinition {
+        attributes,
+        loc,
+        abilities,
+        name,
+        type_parameters,
+        layout,
+    })
+}
+
+/// Parse ability declarations:
+///
+///    Abilities = "has" <Ability> (, <Ability>)+
+fn parse_abilities(context: &mut Context) -> Result<Vec<Ability>, Box<Diagnostic>> {
+    if context.tokens.peek() == Tok::Identifier && context.tokens.content() == "has" {
         context.tokens.advance()?;
         parse_list(
             context,
@@ -2515,41 +2843,78 @@ fn parse_struct_decl(
                 )),
             },
             parse_ability,
-        )?
+        )
     } else {
-        vec![]
-    };
+        Ok(vec![])
+    }
+}
 
-    let fields = match native {
-        Some(loc) => {
-            consume_token(context.tokens, Tok::Semicolon)?;
-            StructFields::Native(loc)
-        },
-        _ => {
-            let list = parse_comma_list(
+/// Parse postfix ability declarations:
+///   PostfixAbilities = (<Abilities> ";")?
+fn parse_postfix_abilities(
+    context: &mut Context,
+    prefix_abilities: &mut Vec<Ability>,
+) -> Result<(), Box<Diagnostic>> {
+    let postfix_abilities = parse_abilities(context)?;
+    if !postfix_abilities.is_empty() {
+        consume_token(context.tokens, Tok::Semicolon)?;
+    }
+    if let (Some(sp!(_l1, _)), Some(sp!(l2, _))) =
+        (prefix_abilities.first(), postfix_abilities.first())
+    {
+        let msg =
+            "Conflicting ability declarations. Abilities must be declared either before or after \
+             the variant list, not both.";
+        context
+            .env
+            .add_diag(diag!(Syntax::InvalidModifier, (*l2, msg)));
+    } else if !postfix_abilities.is_empty() {
+        *prefix_abilities = postfix_abilities;
+    }
+    Ok(())
+}
+
+// Parse a struct variant, which may have positional fields. The returned boolean indicates whether the variant has a braced (`{..}`)
+// field list.
+fn parse_struct_variant(context: &mut Context) -> Result<(StructVariant, bool), Box<Diagnostic>> {
+    let start_loc = context.tokens.start_loc();
+    let attributes = parse_attributes(context)?;
+    context.tokens.match_doc_comments();
+    let name = VariantName(parse_identifier(context)?);
+    let (fields, has_block, is_positional) = if context.tokens.peek() == Tok::LBrace {
+        (
+            parse_comma_list(
                 context,
                 Tok::LBrace,
                 Tok::RBrace,
                 parse_field_annot,
                 "a field",
-            )?;
-            StructFields::Defined(list)
-        },
+            )?,
+            true,
+            false,
+        )
+    } else if context.tokens.peek() == Tok::LParen {
+        let loc = current_token_loc(context.tokens);
+        require_move_2(context, loc, "positional fields");
+        (parse_anonymous_fields(context)?, false, true)
+    } else {
+        (vec![], false, false)
     };
-
     let loc = make_loc(
         context.tokens.file_hash(),
         start_loc,
         context.tokens.previous_end_loc(),
     );
-    Ok(StructDefinition {
-        attributes,
-        loc,
-        abilities,
-        name,
-        type_parameters,
-        fields,
-    })
+    Ok((
+        StructVariant {
+            attributes,
+            loc,
+            name,
+            fields,
+            is_positional,
+        },
+        has_block,
+    ))
 }
 
 // Parse a field annotated with a type:
@@ -2562,6 +2927,29 @@ fn parse_field_annot(context: &mut Context) -> Result<(Field, Type), Box<Diagnos
     Ok((f, st))
 }
 
+/// Parse a comma list of types surrounded by parenthesis into a vector of `(Field, Type)` pairs
+/// where the fields are named "0", "1", ... with location of the type in the second field
+/// AnonymousFields = "(" Comma<Type> ")"
+fn parse_anonymous_fields(context: &mut Context) -> Result<Vec<(Field, Type)>, Box<Diagnostic>> {
+    let field_types = parse_comma_list(
+        context,
+        Tok::LParen,
+        Tok::RParen,
+        parse_type,
+        "a field type",
+    )?;
+    Ok(field_types
+        .into_iter()
+        .enumerate()
+        .map(|(field_offset, st)| {
+            let field_name_ = Symbol::from(field_offset.to_string());
+            let field_name = Spanned::new(st.loc, field_name_);
+            let field = Field(field_name);
+            (field, st)
+        })
+        .collect())
+}
+
 //**************************************************************************************************
 // Constants
 //**************************************************************************************************
@@ -2769,7 +3157,7 @@ fn parse_use_alias(context: &mut Context) -> Result<Option<Name>, Box<Diagnostic
 //      Module =
 //          <DocComments> ( "spec" | "module") (<LeadingNameAccess>::)?<ModuleName> "{"
 //              ( <Attributes>
-//                  ( <UseDecl> | <FriendDecl> | <SpecBlock> |
+//                  ( <UseDecl> | <FriendDecl> | <SpecBlock> | <Invariant> |
 //                    <DocComments> <ModuleMemberModifiers>
 //                        (<ConstantDecl> | <StructDecl> | <FunctionDecl>) )
 //                  )
@@ -2859,8 +3247,13 @@ fn parse_module(
                             attributes, start_loc, modifiers, context,
                         )?),
                         Tok::Struct => ModuleMember::Struct(parse_struct_decl(
-                            attributes, start_loc, modifiers, context,
+                            false, attributes, start_loc, modifiers, context,
                         )?),
+                        Tok::Identifier if context.tokens.content() == "enum" => {
+                            ModuleMember::Struct(parse_struct_decl(
+                                true, attributes, start_loc, modifiers, context,
+                            )?)
+                        },
                         _ => {
                             return Err(unexpected_token_error(
                                 context.tokens,
@@ -2978,7 +3371,7 @@ fn parse_script(
 
 // Parse an optional specification block:
 //     SpecBlockTarget =
-//          <Identifier>
+//          <Identifier> <SpecTargetSignatureOpt>
 //        |  "fun" <Identifier>  # deprecated
 //        | "struct <Identifier> # deprecated
 //        | "module"
@@ -3063,6 +3456,9 @@ fn parse_spec_block(
     ))
 }
 
+// Parse an optional specification target signature block:
+//      SpecTargetSignatureOpt = <TypeParameters>? "(" Comma<Parameter> ")" (":" <Type>)?
+//                             | <empty>
 fn parse_spec_target_signature_opt(
     loc: &Loc,
     context: &mut Context,
@@ -3132,7 +3528,7 @@ fn parse_spec_block_member(context: &mut Context) -> Result<SpecBlockMember, Box
 //    SpecCondition =
 //        ("assert" | "assume" | "ensures" | "requires" ) <ConditionProperties> <Exp> ";"
 //      | "aborts_if" <ConditionProperties> <Exp> ["with" <Exp>] ";"
-//      | "aborts_with" <ConditionProperties> <Exp> [Comma <Exp>]* ";"
+//      | ("aborts_with" | "modifies") <ConditionProperties> <Exp> [Comma <Exp>]* ";"
 //      | "decreases" <ConditionProperties> <Exp> ";"
 //      | "emits" <ConditionProperties> <Exp> "to" <Exp> [If <Exp>] ";"
 fn parse_condition(context: &mut Context) -> Result<SpecBlockMember, Box<Diagnostic>> {
@@ -3291,8 +3687,8 @@ fn parse_invariant(context: &mut Context) -> Result<SpecBlockMember, Box<Diagnos
 }
 
 // Parse a specification function.
-//     SpecFunction = "define" <SpecFunctionSignature> ( "{" <Sequence> "}" | ";" )
-//                  | "native" "define" <SpecFunctionSignature> ";"
+//     SpecFunction = "fun" <SpecFunctionSignature> ( "{" <Sequence> "}" | ";" )
+//                  | "native" "fun" <SpecFunctionSignature> ";"
 //     SpecFunctionSignature =
 //         <Identifier> <OptionalTypeParameters> "(" Comma<Parameter> ")" ":" <Type>
 fn parse_spec_function(context: &mut Context) -> Result<SpecBlockMember, Box<Diagnostic>> {
@@ -3396,7 +3792,7 @@ fn parse_spec_variable(context: &mut Context) -> Result<SpecBlockMember, Box<Dia
 }
 
 // Parse a specification update.
-//     SpecUpdate = "update" <Exp> = <Exp> ";"
+//     SpecUpdate = "update" <UnaryExp> "=" <Exp> ";"
 fn parse_spec_update(context: &mut Context) -> Result<SpecBlockMember, Box<Diagnostic>> {
     let start_loc = context.tokens.start_loc();
     consume_token(context.tokens, Tok::Identifier)?;
@@ -3441,7 +3837,7 @@ fn parse_spec_let(context: &mut Context) -> Result<SpecBlockMember, Box<Diagnost
 }
 
 // Parse a specification schema include.
-//    SpecInclude = "include" <Exp>
+//    SpecInclude = "include" <ConditionProperties> <Exp> ";"
 fn parse_spec_include(context: &mut Context) -> Result<SpecBlockMember, Box<Diagnostic>> {
     let start_loc = context.tokens.start_loc();
     consume_identifier(context.tokens, "include")?;
@@ -3500,7 +3896,7 @@ fn parse_spec_apply(context: &mut Context) -> Result<SpecBlockMember, Box<Diagno
 }
 
 // Parse a function pattern:
-//     SpecApplyPattern = <SpecApplyFragment>+ <OptionalTypeArgs>
+//     SpecApplyPattern = ( "public" | "internal" )? <SpecApplyFragment>+ <OptionalTypeArgs>
 fn parse_spec_apply_pattern(context: &mut Context) -> Result<SpecApplyPattern, Box<Diagnostic>> {
     let start_loc = context.tokens.start_loc();
     // TODO: update the visibility parsing in the spec as well
@@ -3588,7 +3984,7 @@ fn parse_spec_pragma(context: &mut Context) -> Result<SpecBlockMember, Box<Diagn
 }
 
 // Parse a specification pragma property:
-//    SpecPragmaProperty = <Identifier> ( "=" <Value> | <NameAccessChain> )?
+//    SpecPragmaProperty = <Identifier> ( "=" ( <Value> | <NameAccessChain> ) )?
 fn parse_spec_property(context: &mut Context) -> Result<PragmaProperty, Box<Diagnostic>> {
     let start_loc = context.tokens.start_loc();
     let name = match consume_optional_token_with_loc(context.tokens, Tok::Friend)? {
diff --git a/third_party/move/move-compiler/src/shared/mod.rs b/third_party/move/move-compiler/src/shared/mod.rs
index 1288625ba7bc4..2a5c50f9a6ada 100644
--- a/third_party/move/move-compiler/src/shared/mod.rs
+++ b/third_party/move/move-compiler/src/shared/mod.rs
@@ -18,7 +18,7 @@ use once_cell::sync::Lazy;
 use petgraph::{algo::astar as petgraph_astar, graphmap::DiGraphMap};
 use std::{
     collections::{BTreeMap, BTreeSet},
-    fmt,
+    fmt::{self, Debug},
     hash::Hash,
     string::ToString,
     sync::atomic::{AtomicUsize, Ordering as AtomicOrdering},
@@ -161,7 +161,10 @@ impl NamedAddressMaps {
 }
 
 #[derive(Clone, Debug, Eq, PartialEq)]
-pub struct PackagePaths<Path: Into<Symbol> = Symbol, NamedAddress: Into<Symbol> = Symbol> {
+pub struct PackagePaths<
+    Path: Into<Symbol> + Debug = Symbol,
+    NamedAddress: Into<Symbol> + Debug = Symbol,
+> {
     pub name: Option<Symbol>,
     pub paths: Vec<Path>,
     pub named_address_map: BTreeMap<NamedAddress, NumericalAddress>,
@@ -174,6 +177,31 @@ pub struct IndexedPackagePath {
     pub named_address_map: NamedAddressMapIndex,
 }
 
+// Convenient helper functions for dealing with PackagePaths
+pub fn string_vec_to_symbol_vec(string_vec: &[String]) -> Vec<Symbol> {
+    string_vec
+        .iter()
+        .map(|s| Symbol::from(s.as_str()))
+        .collect()
+}
+
+pub fn string_map_to_symbol_map<T: Clone>(string_map: &BTreeMap<String, T>) -> BTreeMap<Symbol, T> {
+    string_map
+        .iter()
+        .map(|(s, v)| (Symbol::from(s.as_str()), v.clone()))
+        .collect()
+}
+
+pub fn string_packagepath_to_symbol_packagepath<T: Clone>(
+    input: &PackagePaths<String, String>,
+) -> PackagePaths {
+    PackagePaths {
+        name: input.name,
+        paths: string_vec_to_symbol_vec(&input.paths),
+        named_address_map: string_map_to_symbol_map(&input.named_address_map),
+    }
+}
+
 pub type AttributeDeriver = dyn Fn(&mut CompilationEnv, &mut ModuleDefinition);
 
 #[derive(Clone, Debug, Eq, PartialEq)]
@@ -378,9 +406,13 @@ pub struct Flags {
     #[clap(long = cli::WARN_UNUSED_FLAG, default_value="false")]
     warn_unused: bool,
 
-    /// Support v2 syntax (up to expansion phase)
-    #[clap(long = cli::V2_FLAG)]
-    v2: bool,
+    /// Support Move 2 language features (up to expansion phase)
+    #[clap(long = cli::LANG_V2_FLAG)]
+    lang_v2: bool,
+
+    /// Support compiler v2 (up to expansion phase)
+    #[clap(long = cli::COMPILER_V2_FLAG)]
+    compiler_v2: bool,
 
     /// Block v1 runs past expansion phase
     #[clap(long = MOVE_COMPILER_BLOCK_V1_FLAG, default_value=bool_to_str(get_move_compiler_block_v1_from_env()))]
@@ -401,7 +433,8 @@ impl Flags {
             warn_of_deprecation_use: move_compiler_warn_of_deprecation_use_env_var(),
             warn_of_deprecation_use_in_aptos_libs: warn_of_deprecation_use_in_aptos_libs_env_var(),
             warn_unused: false,
-            v2: false,
+            lang_v2: false,
+            compiler_v2: false,
             block_v1_compiler: get_move_compiler_block_v1_from_env(),
         }
     }
@@ -436,7 +469,7 @@ impl Flags {
             verify: true,
             shadow: true, // allows overlapping between sources and deps
             keep_testing_functions: true,
-            v2: true,
+            lang_v2: true,
             ..Self::empty()
         }
     }
@@ -448,6 +481,13 @@ impl Flags {
         }
     }
 
+    pub fn set_verify(self, value: bool) -> Self {
+        Self {
+            verify: value,
+            ..self
+        }
+    }
+
     pub fn set_keep_testing_functions(self, value: bool) -> Self {
         Self {
             keep_testing_functions: value,
@@ -549,12 +589,26 @@ impl Flags {
         self.debug
     }
 
-    pub fn v2(&self) -> bool {
-        self.v2
+    pub fn lang_v2(&self) -> bool {
+        self.lang_v2
+    }
+
+    pub fn set_lang_v2(self, v2: bool) -> Self {
+        Self {
+            lang_v2: v2,
+            ..self
+        }
     }
 
-    pub fn set_v2(self, v2: bool) -> Self {
-        Self { v2, ..self }
+    pub fn compiler_v2(&self) -> bool {
+        self.compiler_v2
+    }
+
+    pub fn set_compiler_v2(self, v2: bool) -> Self {
+        Self {
+            compiler_v2: v2,
+            ..self
+        }
     }
 }
 
diff --git a/third_party/move/move-compiler/src/to_bytecode/translate.rs b/third_party/move/move-compiler/src/to_bytecode/translate.rs
index 6c485a2ef7ca1..1e11182e40236 100644
--- a/third_party/move/move-compiler/src/to_bytecode/translate.rs
+++ b/third_party/move/move-compiler/src/to_bytecode/translate.rs
@@ -618,6 +618,7 @@ fn visibility(v: Visibility) -> IR::FunctionVisibility {
         Visibility::Public(_) => IR::FunctionVisibility::Public,
         Visibility::Friend(_) => IR::FunctionVisibility::Friend,
         Visibility::Internal => IR::FunctionVisibility::Internal,
+        _ => panic!("unexpected visibility"),
     }
 }
 
diff --git a/third_party/move/move-compiler/src/typing/core.rs b/third_party/move/move-compiler/src/typing/core.rs
index 892ef169546d8..1b1c196e57f3a 100644
--- a/third_party/move/move-compiler/src/typing/core.rs
+++ b/third_party/move/move-compiler/src/typing/core.rs
@@ -835,10 +835,11 @@ pub fn make_function_type(
         Visibility::Internal if in_current_module => (),
         Visibility::Internal => {
             let internal_msg = format!(
-                "This function is internal to its module. Only '{}' and '{}' functions can \
+                "This function is internal to its module. Only '{}', '{}', and '{}' functions can \
                  be called outside of their module",
                 Visibility::PUBLIC,
-                Visibility::FRIEND
+                Visibility::PACKAGE,
+                Visibility::FRIEND,
             );
             context.env.add_diag(diag!(
                 TypeSafety::Visibility,
@@ -859,6 +860,7 @@ pub fn make_function_type(
                 (vis_loc, internal_msg),
             ));
         },
+        Visibility::Package(_) => panic!("unexpected visibility"),
         Visibility::Public(_) => (),
     };
     (defined_loc, ty_args, params, acquires, return_ty)
diff --git a/third_party/move/move-compiler/src/unit_test/plan_builder.rs b/third_party/move/move-compiler/src/unit_test/plan_builder.rs
index d70235765350d..c53926366cbd9 100644
--- a/third_party/move/move-compiler/src/unit_test/plan_builder.rs
+++ b/third_party/move/move-compiler/src/unit_test/plan_builder.rs
@@ -565,7 +565,7 @@ fn convert_constant_value_u64_constant_or_value(
     let (vloc, module, member) = match value {
         sp!(
             vloc,
-            EAV::ModuleAccess(sp!(_, ModuleAccess_::ModuleAccess(m, n)))
+            EAV::ModuleAccess(sp!(_, ModuleAccess_::ModuleAccess(m, n, _)))
         ) => (*vloc, m, n),
         _ => {
             let (vloc, u) = convert_attribute_value_u64(context, loc, value)?;
diff --git a/third_party/move/move-compiler/tests/move_check/expansion/access_specifier_not_supported.exp b/third_party/move/move-compiler/tests/move_check/expansion/access_specifier_not_supported.exp
index 58cf800109a42..277f6d3ff2e41 100644
--- a/third_party/move/move-compiler/tests/move_check/expansion/access_specifier_not_supported.exp
+++ b/third_party/move/move-compiler/tests/move_check/expansion/access_specifier_not_supported.exp
@@ -1,24 +1,12 @@
-error[E01012]: invalid access specifier
-   ┌─ tests/move_check/expansion/access_specifier_not_supported.move:14:23
-   │
-14 │     fun f4() acquires S(*) {
-   │                       ^^^^ compiler version 1 only supports simple 'acquires <resource_name>' clauses
-
-error[E01012]: invalid access specifier
-   ┌─ tests/move_check/expansion/access_specifier_not_supported.move:23:23
-   │
-23 │     fun f7() acquires *(*) {
-   │                       ^^^^ compiler version 1 only supports simple 'acquires <resource_name>' clauses
-
-error[E01012]: invalid access specifier
-   ┌─ tests/move_check/expansion/access_specifier_not_supported.move:26:23
-   │
-26 │     fun f8() acquires *(0x42) {
-   │                       ^^^^^^^ compiler version 1 only supports simple 'acquires <resource_name>' clauses
+error[E01013]: unsupported language construct
+  ┌─ tests/move_check/expansion/access_specifier_not_supported.move:8:14
+  │
+8 │     fun f2() reads S {
+  │              ^^^^^ Move 2 language construct is not enabled: access specifiers
 
-error[E01012]: invalid access specifier
-   ┌─ tests/move_check/expansion/access_specifier_not_supported.move:29:34
+error[E01013]: unsupported language construct
+   ┌─ tests/move_check/expansion/access_specifier_not_supported.move:11:14
    │
-29 │     fun f9(_a: address) acquires *(_a) {
-   │                                  ^^^^^ compiler version 1 only supports simple 'acquires <resource_name>' clauses
+11 │     fun f3() writes S {
+   │              ^^^^^^ Move 2 language construct is not enabled: access specifiers
 
diff --git a/third_party/move/move-compiler/tests/move_check/expansion/duplicate_field.exp b/third_party/move/move-compiler/tests/move_check/expansion/duplicate_field.exp
index ff609e65f0de8..00bc94c64791a 100644
--- a/third_party/move/move-compiler/tests/move_check/expansion/duplicate_field.exp
+++ b/third_party/move/move-compiler/tests/move_check/expansion/duplicate_field.exp
@@ -4,5 +4,5 @@ error[E02001]: duplicate declaration, item, or annotation
 3 │         f: u64,
   │         - Field previously defined here
 4 │         f: u64,
-  │         ^ Duplicate definition for field 'f' in struct 'S'
+  │         ^ Duplicate definition for field 'f'
 
diff --git a/third_party/move/move-compiler/tests/move_check/expansion/unbound_module_alias_in_type.exp b/third_party/move/move-compiler/tests/move_check/expansion/unbound_module_alias_in_type.exp
index c40ba886dd0e4..8cb8a822705ef 100644
--- a/third_party/move/move-compiler/tests/move_check/expansion/unbound_module_alias_in_type.exp
+++ b/third_party/move/move-compiler/tests/move_check/expansion/unbound_module_alias_in_type.exp
@@ -2,5 +2,5 @@ error[E03002]: unbound module
   ┌─ tests/move_check/expansion/unbound_module_alias_in_type.move:2:16
   │
 2 │     fun foo(x: X::T) {}
-  │                ^ Unbound module alias 'X'
+  │                ^ Unbound module or type alias 'X'
 
diff --git a/third_party/move/move-compiler/tests/move_check/expansion/use_nested_self_as_invalid.exp b/third_party/move/move-compiler/tests/move_check/expansion/use_nested_self_as_invalid.exp
index 5901c05a81ffe..e01d51e50596f 100644
--- a/third_party/move/move-compiler/tests/move_check/expansion/use_nested_self_as_invalid.exp
+++ b/third_party/move/move-compiler/tests/move_check/expansion/use_nested_self_as_invalid.exp
@@ -8,11 +8,11 @@ error[E03002]: unbound module
    ┌─ tests/move_check/expansion/use_nested_self_as_invalid.move:10:19
    │
 10 │     struct X { f: X::S, f2: S }
-   │                   ^ Unbound module alias 'X'
+   │                   ^ Unbound module or type alias 'X'
 
 error[E03002]: unbound module
    ┌─ tests/move_check/expansion/use_nested_self_as_invalid.move:12:9
    │
 12 │         X::foo();
-   │         ^ Unbound module alias 'X'
+   │         ^ Unbound module or type alias 'X'
 
diff --git a/third_party/move/move-compiler/tests/move_check/naming/unbound_constant.exp b/third_party/move/move-compiler/tests/move_check/naming/unbound_constant.exp
index be6d2cd10119b..14d11c2b715e9 100644
--- a/third_party/move/move-compiler/tests/move_check/naming/unbound_constant.exp
+++ b/third_party/move/move-compiler/tests/move_check/naming/unbound_constant.exp
@@ -32,7 +32,7 @@ error[E03002]: unbound module
    ┌─ tests/move_check/naming/unbound_constant.move:14:17
    │
 14 │         let y = Self::CONSTANT;
-   │                 ^^^^ Unbound module alias 'Self'
+   │                 ^^^^ Unbound module or type alias 'Self'
 
 error[E03005]: unbound unscoped name
    ┌─ tests/move_check/naming/unbound_constant.move:15:13
@@ -44,5 +44,5 @@ error[E03002]: unbound module
    ┌─ tests/move_check/naming/unbound_constant.move:15:24
    │
 15 │         0 + CONSTANT + Self::CONSTANT;
-   │                        ^^^^ Unbound module alias 'Self'
+   │                        ^^^^ Unbound module or type alias 'Self'
 
diff --git a/third_party/move/move-compiler/tests/move_check/naming/unbound_module.exp b/third_party/move/move-compiler/tests/move_check/naming/unbound_module.exp
index 094aaa515f5c1..4dee5e0464933 100644
--- a/third_party/move/move-compiler/tests/move_check/naming/unbound_module.exp
+++ b/third_party/move/move-compiler/tests/move_check/naming/unbound_module.exp
@@ -8,5 +8,5 @@ error[E03002]: unbound module
   ┌─ tests/move_check/naming/unbound_module.move:4:9
   │
 4 │         X::foo();
-  │         ^ Unbound module alias 'X'
+  │         ^ Unbound module or type alias 'X'
 
diff --git a/third_party/move/move-compiler/tests/move_check/parser/acquires_list_generic.exp b/third_party/move/move-compiler/tests/move_check/parser/acquires_list_generic.exp
index 5bf3f0bedf569..efd50e83d1e51 100644
--- a/third_party/move/move-compiler/tests/move_check/parser/acquires_list_generic.exp
+++ b/third_party/move/move-compiler/tests/move_check/parser/acquires_list_generic.exp
@@ -2,5 +2,5 @@ error[E01012]: invalid access specifier
   ┌─ tests/move_check/parser/acquires_list_generic.move:6:24
   │
 6 │     fun foo() acquires B<CupC<R>> {
-  │                        ^^^^^^^^^^^ compiler version 1 only supports simple 'acquires <resource_name>' clauses
+  │                        ^^^^^^^^^^^ language version 1 only supports simple 'acquires <resource_name>' clauses
 
diff --git a/third_party/move/move-compiler/tests/move_check/parser/anonymous_field_fail.exp b/third_party/move/move-compiler/tests/move_check/parser/anonymous_field_fail.exp
new file mode 100644
index 0000000000000..dbe0ed321a5f3
--- /dev/null
+++ b/third_party/move/move-compiler/tests/move_check/parser/anonymous_field_fail.exp
@@ -0,0 +1,33 @@
+error[E01013]: unsupported language construct
+  ┌─ tests/move_check/parser/anonymous_field_fail.move:2:13
+  │
+2 │     struct S(u8);
+  │             ^ Move 2 language construct is not enabled: positional fields
+
+error[E01013]: unsupported language construct
+  ┌─ tests/move_check/parser/anonymous_field_fail.move:4:5
+  │
+4 │     enum E {
+  │     ^^^^ Move 2 language construct is not enabled: enum types
+
+error[E01013]: unsupported language construct
+  ┌─ tests/move_check/parser/anonymous_field_fail.move:5:10
+  │
+5 │         V(S)
+  │          ^ Move 2 language construct is not enabled: positional fields
+
+error[E01013]: unsupported language construct
+  ┌─ tests/move_check/parser/anonymous_field_fail.move:9:11
+  │
+9 │         x.1;
+  │           ^ Move 2 language construct is not enabled: positional field
+
+error[E01002]: unexpected token
+   ┌─ tests/move_check/parser/anonymous_field_fail.move:10:14
+   │
+10 │         let S(_x) = x;
+   │              ^
+   │              │
+   │              Unexpected '('
+   │              Expected '{'
+
diff --git a/third_party/move/move-compiler/tests/move_check/parser/anonymous_field_fail.move b/third_party/move/move-compiler/tests/move_check/parser/anonymous_field_fail.move
new file mode 100644
index 0000000000000..bdaf4ed087c2c
--- /dev/null
+++ b/third_party/move/move-compiler/tests/move_check/parser/anonymous_field_fail.move
@@ -0,0 +1,15 @@
+module 0x42::test {
+    struct S(u8);
+
+    enum E {
+        V(S)
+    }
+
+    fun foo(x: S, y: E) {
+        x.1;
+        let S(_x) = x;
+        match (y) {
+            E::V(_y) => {}
+        }
+    }
+}
diff --git a/third_party/move/move-compiler/tests/move_check/parser/entry_struct.exp b/third_party/move/move-compiler/tests/move_check/parser/entry_struct.exp
index db53d092459da..20f301db84752 100644
--- a/third_party/move/move-compiler/tests/move_check/parser/entry_struct.exp
+++ b/third_party/move/move-compiler/tests/move_check/parser/entry_struct.exp
@@ -2,5 +2,5 @@ error[E01003]: invalid modifier
   ┌─ tests/move_check/parser/entry_struct.move:3:5
   │
 3 │     entry struct S {}
-  │     ^^^^^ Invalid constant declaration. 'entry' is used only on functions
+  │     ^^^^^ Invalid type declaration. 'entry' is used only on functions
 
diff --git a/third_party/move/move-compiler/tests/move_check/parser/function_visibility_empty.exp b/third_party/move/move-compiler/tests/move_check/parser/function_visibility_empty.exp
index 3819d29e6743b..2cc625df48613 100644
--- a/third_party/move/move-compiler/tests/move_check/parser/function_visibility_empty.exp
+++ b/third_party/move/move-compiler/tests/move_check/parser/function_visibility_empty.exp
@@ -2,5 +2,5 @@ error[E01002]: unexpected token
   ┌─ tests/move_check/parser/function_visibility_empty.move:2:5
   │
 2 │     public() fun f() {}
-  │     ^^^^^^^^ Invalid visibility modifier. Consider removing it or using 'public' or 'public(friend)'
+  │     ^^^^^^^^ Invalid visibility modifier. Consider removing it or using 'public', 'public(friend)', or 'public(package)'
 
diff --git a/third_party/move/move-compiler/tests/move_check/parser/function_visibility_invalid.exp b/third_party/move/move-compiler/tests/move_check/parser/function_visibility_invalid.exp
index af28c8db25f41..b4e64e00560c4 100644
--- a/third_party/move/move-compiler/tests/move_check/parser/function_visibility_invalid.exp
+++ b/third_party/move/move-compiler/tests/move_check/parser/function_visibility_invalid.exp
@@ -2,5 +2,5 @@ error[E01002]: unexpected token
   ┌─ tests/move_check/parser/function_visibility_invalid.move:2:5
   │
 2 │     public(invalid_modifier) fun f() {}
-  │     ^^^^^^^^^^^^^^^^^^^^^^^^ Invalid visibility modifier. Consider removing it or using 'public' or 'public(friend)'
+  │     ^^^^^^^^^^^^^^^^^^^^^^^^ Invalid visibility modifier. Consider removing it or using 'public', 'public(friend)', or 'public(package)'
 
diff --git a/third_party/move/move-compiler/tests/move_check/parser/let_binding_bad_name.exp b/third_party/move/move-compiler/tests/move_check/parser/let_binding_bad_name.exp
index c318d5bd8c099..7de3584e3c4ba 100644
--- a/third_party/move/move-compiler/tests/move_check/parser/let_binding_bad_name.exp
+++ b/third_party/move/move-compiler/tests/move_check/parser/let_binding_bad_name.exp
@@ -5,5 +5,5 @@ error[E01002]: unexpected token
   │             ^
   │             │
   │             Unexpected '{'
-  │             Expected a variable or struct name
+  │             Expected a variable or struct or variant name
 
diff --git a/third_party/move/move-compiler/tests/move_check/parser/public_packge_visibility.exp b/third_party/move/move-compiler/tests/move_check/parser/public_packge_visibility.exp
new file mode 100644
index 0000000000000..18fec7a3083c9
--- /dev/null
+++ b/third_party/move/move-compiler/tests/move_check/parser/public_packge_visibility.exp
@@ -0,0 +1,12 @@
+error[E01013]: unsupported language construct
+  ┌─ tests/move_check/parser/public_packge_visibility.move:2:5
+  │
+2 │     public(package) fun foo() {}
+  │     ^^^^^^^^^^^^^^^ Move 2 language construct is not enabled: public(package) visibility
+
+error[E01013]: unsupported language construct
+  ┌─ tests/move_check/parser/public_packge_visibility.move:6:5
+  │
+6 │     public(package) fun main() {}
+  │     ^^^^^^^^^^^^^^^ Move 2 language construct is not enabled: public(package) visibility
+
diff --git a/third_party/move/move-compiler/tests/move_check/parser/public_packge_visibility.move b/third_party/move/move-compiler/tests/move_check/parser/public_packge_visibility.move
new file mode 100644
index 0000000000000..234bf5c71c6c9
--- /dev/null
+++ b/third_party/move/move-compiler/tests/move_check/parser/public_packge_visibility.move
@@ -0,0 +1,7 @@
+module 0x42::M {
+    public(package) fun foo() {}
+}
+
+script {
+    public(package) fun main() {}
+}
diff --git a/third_party/move/move-compiler/tests/move_check/parser/spec_parsing_index_fail.exp b/third_party/move/move-compiler/tests/move_check/parser/spec_parsing_index_fail.exp
index 7fe7ee1dd097c..58d12e8a6325b 100644
--- a/third_party/move/move-compiler/tests/move_check/parser/spec_parsing_index_fail.exp
+++ b/third_party/move/move-compiler/tests/move_check/parser/spec_parsing_index_fail.exp
@@ -1,6 +1,6 @@
-error[E01010]: syntax item restricted to spec contexts
+error[E01013]: unsupported language construct
   ┌─ tests/move_check/parser/spec_parsing_index_fail.move:3:15
   │
 3 │       let _ = x[1];
-  │               ^^^^ `_[_]` index operator only allowed in specifications
+  │               ^^^^ `_[_]` index operator in non-specification code only allowed in Move 2 and beyond
 
diff --git a/third_party/move/move-compiler/tests/move_check/typing/constant_unsupported_exps.exp b/third_party/move/move-compiler/tests/move_check/typing/constant_unsupported_exps.exp
index 2aebbbd77fdff..67bbc32a59c79 100644
--- a/third_party/move/move-compiler/tests/move_check/typing/constant_unsupported_exps.exp
+++ b/third_party/move/move-compiler/tests/move_check/typing/constant_unsupported_exps.exp
@@ -101,7 +101,7 @@ error[E04001]: restricted visibility
    ┌─ tests/move_check/typing/constant_unsupported_exps.move:27:9
    │
  5 │     fun f_private() {}
-   │         --------- This function is internal to its module. Only 'public' and 'public(friend)' functions can be called outside of their module
+   │         --------- This function is internal to its module. Only 'public', 'public(package)', and 'public(friend)' functions can be called outside of their module
    ·
 27 │         0x42::X::f_private();
    │         ^^^^^^^^^^^^^^^^^^^^ Invalid call to '0x42::X::f_private'
diff --git a/third_party/move/move-compiler/tests/move_check/typing/module_call_entry_function_was_invalid.exp b/third_party/move/move-compiler/tests/move_check/typing/module_call_entry_function_was_invalid.exp
index 05aa6b294d5b5..08e74e74af352 100644
--- a/third_party/move/move-compiler/tests/move_check/typing/module_call_entry_function_was_invalid.exp
+++ b/third_party/move/move-compiler/tests/move_check/typing/module_call_entry_function_was_invalid.exp
@@ -2,7 +2,7 @@ error[E04001]: restricted visibility
    ┌─ tests/move_check/typing/module_call_entry_function_was_invalid.move:26:48
    │
  8 │     fun f_private() {}
-   │         --------- This function is internal to its module. Only 'public' and 'public(friend)' functions can be called outside of their module
+   │         --------- This function is internal to its module. Only 'public', 'public(package)', and 'public(friend)' functions can be called outside of their module
    ·
 26 │     public entry fun f_script_call_private() { X::f_private() }
    │                                                ^^^^^^^^^^^^^^ Invalid call to '0x2::X::f_private'
diff --git a/third_party/move/move-compiler/tests/move_check/typing/module_call_internal.exp b/third_party/move/move-compiler/tests/move_check/typing/module_call_internal.exp
index 2d282221e7fd6..6a1c531733ece 100644
--- a/third_party/move/move-compiler/tests/move_check/typing/module_call_internal.exp
+++ b/third_party/move/move-compiler/tests/move_check/typing/module_call_internal.exp
@@ -2,7 +2,7 @@ error[E04001]: restricted visibility
    ┌─ tests/move_check/typing/module_call_internal.move:10:9
    │
  4 │     fun foo() {}
-   │         --- This function is internal to its module. Only 'public' and 'public(friend)' functions can be called outside of their module
+   │         --- This function is internal to its module. Only 'public', 'public(package)', and 'public(friend)' functions can be called outside of their module
    ·
 10 │         X::foo()
    │         ^^^^^^^^ Invalid call to '0x2::X::foo'
diff --git a/third_party/move/move-compiler/tests/move_check/typing/module_call_visibility_friend_invalid.exp b/third_party/move/move-compiler/tests/move_check/typing/module_call_visibility_friend_invalid.exp
index 09b8a8ddfe7cd..b008bb3691f2f 100644
--- a/third_party/move/move-compiler/tests/move_check/typing/module_call_visibility_friend_invalid.exp
+++ b/third_party/move/move-compiler/tests/move_check/typing/module_call_visibility_friend_invalid.exp
@@ -11,7 +11,7 @@ error[E04001]: restricted visibility
    ┌─ tests/move_check/typing/module_call_visibility_friend_invalid.move:22:52
    │
  4 │     fun f_private() {}
-   │         --------- This function is internal to its module. Only 'public' and 'public(friend)' functions can be called outside of their module
+   │         --------- This function is internal to its module. Only 'public', 'public(package)', and 'public(friend)' functions can be called outside of their module
    ·
 22 │     public(friend) fun f_friend_call_private_1() { X::f_private() }
    │                                                    ^^^^^^^^^^^^^^ Invalid call to '0x2::X::f_private'
@@ -20,7 +20,7 @@ error[E04001]: restricted visibility
    ┌─ tests/move_check/typing/module_call_visibility_friend_invalid.move:23:52
    │
 10 │     fun f_private() {}
-   │         --------- This function is internal to its module. Only 'public' and 'public(friend)' functions can be called outside of their module
+   │         --------- This function is internal to its module. Only 'public', 'public(package)', and 'public(friend)' functions can be called outside of their module
    ·
 23 │     public(friend) fun f_friend_call_private_2() { Y::f_private() }
    │                                                    ^^^^^^^^^^^^^^ Invalid call to '0x2::Y::f_private'
diff --git a/third_party/move/move-compiler/tests/move_check/unit_test/cross_module_members_non_test_function.exp b/third_party/move/move-compiler/tests/move_check/unit_test/cross_module_members_non_test_function.exp
index 416d8f009c0c2..2dd487bebe569 100644
--- a/third_party/move/move-compiler/tests/move_check/unit_test/cross_module_members_non_test_function.exp
+++ b/third_party/move/move-compiler/tests/move_check/unit_test/cross_module_members_non_test_function.exp
@@ -8,5 +8,5 @@ error[E03002]: unbound module
    ┌─ tests/move_check/unit_test/cross_module_members_non_test_function.move:24:9
    │
 24 │         A::build_foo()
-   │         ^ Unbound module alias 'A'
+   │         ^ Unbound module or type alias 'A'
 
diff --git a/third_party/move/move-compiler/tests/move_check/unit_test/cross_module_test_only_module.exp b/third_party/move/move-compiler/tests/move_check/unit_test/cross_module_test_only_module.exp
index d1d5dd6fcbab2..409d1b7d3d820 100644
--- a/third_party/move/move-compiler/tests/move_check/unit_test/cross_module_test_only_module.exp
+++ b/third_party/move/move-compiler/tests/move_check/unit_test/cross_module_test_only_module.exp
@@ -8,5 +8,5 @@ error[E03002]: unbound module
    ┌─ tests/move_check/unit_test/cross_module_test_only_module.move:13:9
    │
 13 │         M::foo()
-   │         ^ Unbound module alias 'M'
+   │         ^ Unbound module or type alias 'M'
 
diff --git a/third_party/move/move-compiler/tests/move_check/verification/cross_module_invalid.exp b/third_party/move/move-compiler/tests/move_check/verification/cross_module_invalid.exp
index b2f6304e5b896..1a882635fbf38 100644
--- a/third_party/move/move-compiler/tests/move_check/verification/cross_module_invalid.exp
+++ b/third_party/move/move-compiler/tests/move_check/verification/cross_module_invalid.exp
@@ -8,5 +8,5 @@ error[E03002]: unbound module
    ┌─ tests/move_check/verification/cross_module_invalid.move:23:9
    │
 23 │         A::build_foo()
-   │         ^ Unbound module alias 'A'
+   │         ^ Unbound module or type alias 'A'
 
diff --git a/third_party/move/move-compiler/transactional-tests/tests/generics/global_invalid.exp b/third_party/move/move-compiler/transactional-tests/tests/generics/global_invalid.exp
index aea203752bf00..39f173075a42a 100644
--- a/third_party/move/move-compiler/transactional-tests/tests/generics/global_invalid.exp
+++ b/third_party/move/move-compiler/transactional-tests/tests/generics/global_invalid.exp
@@ -68,6 +68,6 @@ error[E03002]: unbound module
    ┌─ TEMPFILE2:28:9
    │
 28 │         M::test_resource(&account)
-   │         ^ Unbound module alias 'M'
+   │         ^ Unbound module or type alias 'M'
 
 
diff --git a/third_party/move/move-core/types/src/lib.rs b/third_party/move/move-core/types/src/lib.rs
index 7e6b2637ef9e1..abcda6742d674 100644
--- a/third_party/move/move-core/types/src/lib.rs
+++ b/third_party/move/move-core/types/src/lib.rs
@@ -16,7 +16,6 @@ pub mod move_resource;
 pub mod parser;
 #[cfg(any(test, feature = "fuzzing"))]
 pub mod proptest_types;
-pub mod resolver;
 mod safe_serialize;
 pub mod state;
 pub mod transaction_argument;
diff --git a/third_party/move/move-core/types/src/resolver.rs b/third_party/move/move-core/types/src/resolver.rs
deleted file mode 100644
index a0b3200aff64c..0000000000000
--- a/third_party/move/move-core/types/src/resolver.rs
+++ /dev/null
@@ -1,87 +0,0 @@
-// Copyright (c) The Diem Core Contributors
-// Copyright (c) The Move Contributors
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::{
-    account_address::AccountAddress,
-    language_storage::{ModuleId, StructTag},
-    metadata::Metadata,
-    value::MoveTypeLayout,
-};
-use bytes::Bytes;
-use std::fmt::Debug;
-
-/// Traits for resolving Move modules and resources from persistent storage
-
-/// A persistent storage backend that can resolve modules by address + name.
-/// Storage backends should return
-///   - Ok(Some(..)) if the data exists
-///   - Ok(None)     if the data does not exist
-///   - Err(..)      only when something really wrong happens, for example
-///                    - invariants are broken and observable from the storage side
-///                      (this is not currently possible as ModuleId and StructTag
-///                       are always structurally valid)
-///                    - storage encounters internal error
-pub trait ModuleResolver {
-    type Error: Debug;
-
-    fn get_module_metadata(&self, module_id: &ModuleId) -> Vec<Metadata>;
-
-    fn get_module(&self, id: &ModuleId) -> Result<Option<Bytes>, Self::Error>;
-}
-
-pub fn resource_size(resource: &Option<Bytes>) -> usize {
-    resource.as_ref().map(|bytes| bytes.len()).unwrap_or(0)
-}
-
-/// A persistent storage backend that can resolve resources by address + type
-/// Storage backends should return
-///   - Ok(Some(..)) if the data exists
-///   - Ok(None)     if the data does not exist
-///   - Err(..)      only when something really wrong happens, for example
-///                    - invariants are broken and observable from the storage side
-///                      (this is not currently possible as ModuleId and StructTag
-///                       are always structurally valid)
-///                    - storage encounters internal error
-pub trait ResourceResolver {
-    type Error: Debug;
-
-    fn get_resource_bytes_with_metadata_and_layout(
-        &self,
-        address: &AccountAddress,
-        struct_tag: &StructTag,
-        metadata: &[Metadata],
-        layout: Option<&MoveTypeLayout>,
-    ) -> Result<(Option<Bytes>, usize), Self::Error>;
-}
-
-/// A persistent storage implementation that can resolve both resources and modules
-pub trait MoveResolver<E: Debug>: ModuleResolver<Error = E> + ResourceResolver<Error = E> {
-    fn get_resource(
-        &self,
-        address: &AccountAddress,
-        struct_tag: &StructTag,
-    ) -> Result<Option<Bytes>, <Self as ResourceResolver>::Error> {
-        Ok(self
-            .get_resource_with_metadata(
-                address,
-                struct_tag,
-                &self.get_module_metadata(&struct_tag.module_id()),
-            )?
-            .0)
-    }
-
-    fn get_resource_with_metadata(
-        &self,
-        address: &AccountAddress,
-        struct_tag: &StructTag,
-        metadata: &[Metadata],
-    ) -> Result<(Option<Bytes>, usize), <Self as ResourceResolver>::Error> {
-        self.get_resource_bytes_with_metadata_and_layout(address, struct_tag, metadata, None)
-    }
-}
-
-impl<E: Debug, T: ModuleResolver<Error = E> + ResourceResolver<Error = E> + ?Sized> MoveResolver<E>
-    for T
-{
-}
diff --git a/third_party/move/move-core/types/src/safe_serialize.rs b/third_party/move/move-core/types/src/safe_serialize.rs
index f25422fa25b1d..421ce53e628ed 100644
--- a/third_party/move/move-core/types/src/safe_serialize.rs
+++ b/third_party/move/move-core/types/src/safe_serialize.rs
@@ -14,7 +14,7 @@ use std::cell::RefCell;
 pub(crate) const MAX_TYPE_TAG_NESTING: u8 = 9;
 
 thread_local! {
-    static TYPE_TAG_DEPTH: RefCell<u8> = RefCell::new(0);
+    static TYPE_TAG_DEPTH: RefCell<u8> = const { RefCell::new(0) };
 }
 
 pub(crate) fn type_tag_recursive_serialize<S, T>(t: &T, s: S) -> Result<S::Ok, S::Error>
diff --git a/third_party/move/move-core/types/src/state.rs b/third_party/move/move-core/types/src/state.rs
index 6d94c574a9dd6..f57e1abdcad79 100644
--- a/third_party/move/move-core/types/src/state.rs
+++ b/third_party/move/move-core/types/src/state.rs
@@ -13,7 +13,7 @@ pub enum VMState {
 }
 
 thread_local! {
-    static STATE: RefCell<VMState> = RefCell::new(VMState::OTHER);
+    static STATE: RefCell<VMState> = const { RefCell::new(VMState::OTHER) };
 }
 
 pub fn set_state(state: VMState) -> VMState {
diff --git a/third_party/move/move-core/types/src/transaction_argument.rs b/third_party/move/move-core/types/src/transaction_argument.rs
index 687433b46b1c8..701fbce112f48 100644
--- a/third_party/move/move-core/types/src/transaction_argument.rs
+++ b/third_party/move/move-core/types/src/transaction_argument.rs
@@ -19,6 +19,8 @@ pub enum TransactionArgument {
     U16(u16),
     U32(u32),
     U256(u256::U256),
+    // Note: Gated by feature flag ALLOW_SERIALIZED_SCRIPT_ARGS
+    Serialized(#[serde(with = "serde_bytes")] Vec<u8>),
 }
 
 impl fmt::Debug for TransactionArgument {
@@ -35,6 +37,9 @@ impl fmt::Debug for TransactionArgument {
             TransactionArgument::U16(value) => write!(f, "{{U16: {}}}", value),
             TransactionArgument::U32(value) => write!(f, "{{U32: {}}}", value),
             TransactionArgument::U256(value) => write!(f, "{{U256: {}}}", value),
+            TransactionArgument::Serialized(value) => {
+                write!(f, "{{RAW_BYTES: {}}}", hex::encode(value))
+            },
         }
     }
 }
@@ -51,6 +56,7 @@ impl From<TransactionArgument> for MoveValue {
             TransactionArgument::U16(i) => MoveValue::U16(i),
             TransactionArgument::U32(i) => MoveValue::U32(i),
             TransactionArgument::U256(i) => MoveValue::U256(i),
+            TransactionArgument::Serialized(value) => MoveValue::vector_u8(value),
         }
     }
 }
@@ -90,9 +96,13 @@ impl TryFrom<MoveValue> for TransactionArgument {
 pub fn convert_txn_args(args: &[TransactionArgument]) -> Vec<Vec<u8>> {
     args.iter()
         .map(|arg| {
-            MoveValue::from(arg.clone())
-                .simple_serialize()
-                .expect("transaction arguments must serialize")
+            if let TransactionArgument::Serialized(bytes) = arg {
+                bytes.clone()
+            } else {
+                MoveValue::from(arg.clone())
+                    .simple_serialize()
+                    .expect("transaction arguments must serialize")
+            }
         })
         .collect()
 }
diff --git a/third_party/move/move-core/types/src/value.rs b/third_party/move/move-core/types/src/value.rs
index 3f783987e2cac..49a4d4eada8df 100644
--- a/third_party/move/move-core/types/src/value.rs
+++ b/third_party/move/move-core/types/src/value.rs
@@ -9,30 +9,79 @@ use crate::{
     u256,
 };
 use anyhow::{anyhow, bail, Result as AResult};
+use once_cell::sync::Lazy;
 use serde::{
-    de::Error as DeError,
-    ser::{SerializeMap, SerializeSeq, SerializeStruct, SerializeTuple},
+    de::{EnumAccess, Error as DeError, VariantAccess},
+    ser::{SerializeMap, SerializeSeq, SerializeStruct, SerializeTuple, SerializeTupleVariant},
     Deserialize, Serialize,
 };
 use std::{
+    collections::{btree_map::Entry, BTreeMap},
     convert::TryInto,
     fmt::{self, Debug},
+    sync::Mutex,
 };
 
+/// The maximal number of enum variants which are supported in values. This must align with
+/// the configuration in the binary format, so the bytecode verifier checks its validness.
+pub const VARIANT_COUNT_MAX: u64 = 127;
+
 /// In the `WithTypes` configuration, a Move struct gets serialized into a Serde struct with this name
 pub const MOVE_STRUCT_NAME: &str = "struct";
 
+/// A Move enum gets serialized into a Serde struct with this name
+pub const MOVE_ENUM_NAME: &str = "enum";
+
 /// In the `WithTypes` configuration, a Move struct gets serialized into a Serde struct with this as the first field
 pub const MOVE_STRUCT_TYPE: &str = "type";
 
 /// In the `WithTypes` configuration, a Move struct gets serialized into a Serde struct with this as the second field
 pub const MOVE_STRUCT_FIELDS: &str = "fields";
 
+/// In the `WithVariant` configuration, a Move enum variant gets serialized into a Serde struct with this name
+pub const MOVE_VARIANT_NAME: &str = "variant";
+
+/// In the `WithVariant` configuration, a Move enum variant gets serialized into a Serde struct with this as the first field
+pub const MOVE_VARIANT_NAME_FIELD: &str = "name";
+
+/// In order to serialize enums with serde, we have to provide `&'static str` names for
+/// variants. This static cache is used to generate those names, and contains
+/// signatures of the form `["0", "1", "2", ..]`. The size of this cache
+/// is bound by `VARIANT_COUNT_MAX * VARIANT_COUNT_MAX / 2` (8064 with max 127)
+static VARIANT_NAME_PLACEHOLDER_CACHE: Lazy<Mutex<BTreeMap<usize, &'static [&'static str]>>> =
+    Lazy::new(|| Mutex::new(Default::default()));
+
+/// Returns variant name placeholders for providing dummy names in serde serialization.
+pub fn variant_name_placeholder(len: usize) -> &'static [&'static str] {
+    assert!(
+        len < VARIANT_COUNT_MAX as usize,
+        "variant count is restricted to {}",
+        VARIANT_COUNT_MAX
+    );
+    let mutex = &VARIANT_NAME_PLACEHOLDER_CACHE;
+    let mut lock = mutex.lock().expect("acquire index name lock");
+    match lock.entry(len) {
+        Entry::Vacant(e) => {
+            let signature = Box::new(
+                (0..len)
+                    .map(|idx| Box::new(format!("{}", idx)).leak() as &str)
+                    .collect::<Vec<_>>(),
+            )
+            .leak();
+            e.insert(signature);
+            signature
+        },
+        Entry::Occupied(e) => e.get(),
+    }
+}
+
 #[derive(Debug, PartialEq, Eq, Clone)]
 #[cfg_attr(any(test, feature = "fuzzing"), derive(arbitrary::Arbitrary))]
 pub enum MoveStruct {
     /// The representation used by the MoveVM
     Runtime(Vec<MoveValue>),
+    /// The representation used by the MoveVM for a variant value.
+    RuntimeVariant(u16, Vec<MoveValue>),
     /// A decorated representation with human-readable field names
     WithFields(Vec<(Identifier, MoveValue)>),
     /// An even more decorated representation with both types and human-readable field names
@@ -40,6 +89,8 @@ pub enum MoveStruct {
         type_: StructTag,
         fields: Vec<(Identifier, MoveValue)>,
     },
+    /// A decorated representation of a variant, with the variant name, tag value, and field values.
+    WithVariantFields(Identifier, u16, Vec<(Identifier, MoveValue)>),
 }
 
 #[derive(Debug, PartialEq, Eq, Clone)]
@@ -73,18 +124,30 @@ impl MoveFieldLayout {
     }
 }
 
+#[derive(Debug, Clone, Hash, Serialize, Deserialize, PartialEq, Eq)]
+#[cfg_attr(any(test, feature = "fuzzing"), derive(arbitrary::Arbitrary))]
+pub struct MoveVariantLayout {
+    pub name: Identifier,
+    pub fields: Vec<MoveFieldLayout>,
+}
+
 #[derive(Debug, Clone, Hash, Serialize, Deserialize, PartialEq, Eq)]
 #[cfg_attr(any(test, feature = "fuzzing"), derive(arbitrary::Arbitrary))]
 pub enum MoveStructLayout {
-    /// The representation used by the MoveVM
+    /// The representation used by the MoveVM for plain structs
     Runtime(Vec<MoveTypeLayout>),
+    /// The representation used by the MoveVM for plain struct variants.
+    RuntimeVariants(Vec<Vec<MoveTypeLayout>>),
     /// A decorated representation with human-readable field names that can be used by clients
     WithFields(Vec<MoveFieldLayout>),
-    /// An even more decorated representation with both types and human-readable field names
+    /// An even more decorated representation which carries the tag of struct this layout belongs
+    /// to. This allows specialized rendering for framework types like strings.
     WithTypes {
         type_: StructTag,
         fields: Vec<MoveFieldLayout>,
     },
+    /// A decorated representation of struct variants, containing variant and field names.
+    WithVariants(Vec<MoveVariantLayout>),
 }
 
 /// Used to distinguish between aggregators ans snapshots.
@@ -210,6 +273,10 @@ impl MoveStruct {
         Self::Runtime(value)
     }
 
+    pub fn new_variant(tag: u16, value: Vec<MoveValue>) -> Self {
+        Self::RuntimeVariant(tag, value)
+    }
+
     pub fn with_fields(values: Vec<(Identifier, MoveValue)>) -> Self {
         Self::WithFields(values)
     }
@@ -242,6 +309,19 @@ impl MoveStruct {
                         .collect(),
                 }
             },
+            (MoveStruct::RuntimeVariant(tag, vals), MoveStructLayout::WithVariants(variants))
+                if (tag as usize) < variants.len() =>
+            {
+                let MoveVariantLayout { name, fields } = &variants[tag as usize];
+                MoveStruct::WithVariantFields(
+                    name.clone(),
+                    tag,
+                    vals.into_iter()
+                        .zip(fields)
+                        .map(|(v, l)| (l.name.clone(), v.decorate(&l.layout)))
+                        .collect(),
+                )
+            },
             (MoveStruct::WithFields(vals), MoveStructLayout::WithTypes { type_, fields }) => {
                 MoveStruct::WithTypes {
                     type_: type_.clone(),
@@ -252,14 +332,17 @@ impl MoveStruct {
                         .collect(),
                 }
             },
-            (v, _) => v, // already decorated
+
+            (v, _) => v, // already decorated (or invalid, in which case we ignore this as
+                         // we cannot return a Result here)
         }
     }
 
-    pub fn fields(&self) -> &[MoveValue] {
+    pub fn optional_variant_and_fields(&self) -> (Option<u16>, &[MoveValue]) {
         match self {
-            Self::Runtime(vals) => vals,
-            Self::WithFields(_) | Self::WithTypes { .. } => {
+            Self::Runtime(vals) => (None, vals),
+            Self::RuntimeVariant(tag, vals) => (Some(*tag), vals),
+            Self::WithFields(_) | Self::WithTypes { .. } | Self::WithVariantFields(..) => {
                 // It's not possible to implement this without changing the return type, and thus
                 // panicking is the best move
                 panic!("Getting fields for decorated representation")
@@ -267,22 +350,36 @@ impl MoveStruct {
         }
     }
 
-    pub fn into_fields(self) -> Vec<MoveValue> {
+    pub fn into_optional_variant_and_fields(self) -> (Option<u16>, Vec<MoveValue>) {
         match self {
-            Self::Runtime(vals) => vals,
+            Self::Runtime(vals) => (None, vals),
+            Self::RuntimeVariant(tag, vals) => (Some(tag), vals),
             Self::WithFields(fields) | Self::WithTypes { fields, .. } => {
-                fields.into_iter().map(|(_, f)| f).collect()
+                (None, fields.into_iter().map(|(_, f)| f).collect())
+            },
+            Self::WithVariantFields(_, tag, fields) => {
+                (Some(tag), fields.into_iter().map(|(_, f)| f).collect())
             },
         }
     }
 
     pub fn undecorate(self) -> Self {
-        Self::Runtime(
-            self.into_fields()
-                .into_iter()
-                .map(MoveValue::undecorate)
-                .collect(),
-        )
+        match self {
+            MoveStruct::WithFields(fields) | MoveStruct::WithTypes { fields, .. } => Self::Runtime(
+                fields
+                    .into_iter()
+                    .map(|(_, v)| MoveValue::undecorate(v))
+                    .collect(),
+            ),
+            MoveStruct::WithVariantFields(_, tag, fields) => Self::RuntimeVariant(
+                tag,
+                fields
+                    .into_iter()
+                    .map(|(_, v)| MoveValue::undecorate(v))
+                    .collect(),
+            ),
+            _ => self,
+        }
     }
 }
 
@@ -291,6 +388,10 @@ impl MoveStructLayout {
         Self::Runtime(types)
     }
 
+    pub fn new_variants(types: Vec<Vec<MoveTypeLayout>>) -> Self {
+        Self::RuntimeVariants(types)
+    }
+
     pub fn with_fields(types: Vec<MoveFieldLayout>) -> Self {
         Self::WithFields(types)
     }
@@ -299,10 +400,21 @@ impl MoveStructLayout {
         Self::WithTypes { type_, fields }
     }
 
-    pub fn fields(&self) -> &[MoveTypeLayout] {
+    pub fn with_variants(variants: Vec<MoveVariantLayout>) -> Self {
+        Self::WithVariants(variants)
+    }
+
+    pub fn fields(&self, variant: Option<usize>) -> &[MoveTypeLayout] {
         match self {
             Self::Runtime(vals) => vals,
-            Self::WithFields(_) | Self::WithTypes { .. } => {
+            Self::RuntimeVariants(variants) => match variant {
+                Some(idx) if idx < variants.len() => &variants[idx],
+                _ => {
+                    // API does not allow to return error, return empty fields instead of crashing
+                    &[]
+                },
+            },
+            Self::WithFields(_) | Self::WithTypes { .. } | Self::WithVariants(_) => {
                 // It's not possible to implement this without changing the return type, and some
                 // performance-critical VM serialization code uses the Runtime case of this.
                 // panicking is the best move
@@ -311,12 +423,33 @@ impl MoveStructLayout {
         }
     }
 
-    pub fn into_fields(self) -> Vec<MoveTypeLayout> {
+    pub fn into_fields(self, variant: Option<usize>) -> Vec<MoveTypeLayout> {
         match self {
             Self::Runtime(vals) => vals,
+            Self::RuntimeVariants(mut variants) => {
+                match variant {
+                    Some(idx) if idx < variants.len() => variants.remove(idx),
+                    _ => {
+                        // be on the robust side and remove empty vec instead of crash
+                        vec![]
+                    },
+                }
+            },
             Self::WithFields(fields) | Self::WithTypes { fields, .. } => {
                 fields.into_iter().map(|f| f.layout).collect()
             },
+            Self::WithVariants(mut variants) => match variant {
+                Some(idx) if idx < variants.len() => variants
+                    .remove(idx)
+                    .fields
+                    .into_iter()
+                    .map(|f| f.layout)
+                    .collect(),
+                _ => {
+                    // be on the robust side and return empty vec instead of crash
+                    vec![]
+                },
+            },
         }
     }
 }
@@ -424,6 +557,42 @@ impl<'d, 'a> serde::de::Visitor<'d> for StructFieldVisitor<'a> {
     }
 }
 
+struct StructVariantVisitor<'a>(&'a [Vec<MoveTypeLayout>]);
+
+impl<'d, 'a> serde::de::Visitor<'d> for StructVariantVisitor<'a> {
+    type Value = (u16, Vec<MoveValue>);
+
+    fn expecting(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
+        formatter.write_str("Variant")
+    }
+
+    fn visit_enum<A>(self, data: A) -> Result<Self::Value, A::Error>
+    where
+        A: EnumAccess<'d>,
+    {
+        let (tag, rest) = data.variant()?;
+        if tag as usize >= self.0.len() {
+            Err(A::Error::invalid_length(0, &self))
+        } else {
+            let fields = &self.0[tag as usize];
+            match fields.len() {
+                0 => {
+                    rest.unit_variant()?;
+                    Ok((tag, vec![]))
+                },
+                1 => {
+                    let value = rest.newtype_variant_seed(&fields[0])?;
+                    Ok((tag, vec![value]))
+                },
+                _ => {
+                    let values = rest.tuple_variant(fields.len(), StructFieldVisitor(fields))?;
+                    Ok((tag, values))
+                },
+            }
+        }
+    }
+}
+
 impl<'d> serde::de::DeserializeSeed<'d> for &MoveFieldLayout {
     type Value = (Identifier, MoveValue);
 
@@ -448,6 +617,18 @@ impl<'d> serde::de::DeserializeSeed<'d> for &MoveStructLayout {
                     deserializer.deserialize_tuple(layout.len(), StructFieldVisitor(layout))?;
                 Ok(MoveStruct::Runtime(fields))
             },
+            MoveStructLayout::RuntimeVariants(variants) => {
+                if variants.len() > (u16::MAX as usize) {
+                    return Err(D::Error::custom("variant count out of range"));
+                }
+                let variant_names = variant_name_placeholder(variants.len());
+                let (tag, fields) = deserializer.deserialize_enum(
+                    MOVE_ENUM_NAME,
+                    variant_names,
+                    StructVariantVisitor(variants),
+                )?;
+                Ok(MoveStruct::RuntimeVariant(tag, fields))
+            },
             MoveStructLayout::WithFields(layout) => {
                 let fields = deserializer
                     .deserialize_tuple(layout.len(), DecoratedStructFieldVisitor(layout))?;
@@ -464,6 +645,23 @@ impl<'d> serde::de::DeserializeSeed<'d> for &MoveStructLayout {
                     fields,
                 })
             },
+            MoveStructLayout::WithVariants(decorated_variants) => {
+                // Downgrade the decorated variants to simple layouts to deserialize the fields.
+                let variant_names = variant_name_placeholder(decorated_variants.len());
+                let (tag, fields) = deserializer.deserialize_enum(
+                    MOVE_ENUM_NAME,
+                    variant_names,
+                    StructVariantVisitor(
+                        &decorated_variants
+                            .iter()
+                            .map(|v| v.fields.iter().map(|f| f.layout.clone()).collect())
+                            .collect::<Vec<_>>(),
+                    ),
+                )?;
+                // Now decorate the raw value. This is not optimally efficient but
+                // decorated values should not be in the execution path.
+                Ok(MoveStruct::RuntimeVariant(tag, fields).decorate(self))
+            },
         }
     }
 }
@@ -507,13 +705,42 @@ impl<'a> serde::Serialize for MoveFields<'a> {
 impl serde::Serialize for MoveStruct {
     fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
         match self {
-            Self::Runtime(s) => {
-                let mut t = serializer.serialize_tuple(s.len())?;
-                for v in s.iter() {
+            Self::Runtime(values) => {
+                let mut t = serializer.serialize_tuple(values.len())?;
+                for v in values.iter() {
                     t.serialize_element(v)?;
                 }
                 t.end()
             },
+            Self::RuntimeVariant(tag, values) => {
+                // Variants need to be serialized as sequences, as the size is not statically known.
+                let tag_idx = *tag as usize;
+                let variant_tag = tag_idx as u32;
+                let variant_name = variant_name_placeholder((tag + 1) as usize)[tag_idx];
+                match values.len() {
+                    0 => {
+                        serializer.serialize_unit_variant(MOVE_ENUM_NAME, variant_tag, variant_name)
+                    },
+                    1 => serializer.serialize_newtype_variant(
+                        MOVE_ENUM_NAME,
+                        variant_tag,
+                        variant_name,
+                        &values[0],
+                    ),
+                    _ => {
+                        let mut t = serializer.serialize_tuple_variant(
+                            MOVE_ENUM_NAME,
+                            variant_tag,
+                            variant_name,
+                            values.len(),
+                        )?;
+                        for v in values {
+                            t.serialize_field(v)?
+                        }
+                        t.end()
+                    },
+                }
+            },
             Self::WithFields(fields) => MoveFields(fields).serialize(serializer),
             Self::WithTypes { type_, fields } => {
                 // Serialize a Move struct as Serde struct type named `struct `with two fields named `type` and `fields`.
@@ -527,6 +754,14 @@ impl serde::Serialize for MoveStruct {
                 t.serialize_field(MOVE_STRUCT_FIELDS, &MoveFields(fields))?;
                 t.end()
             },
+            Self::WithVariantFields(name, _tag, fields) => {
+                // Serialize a variant as Serde struct name `variant` with two fields `name` and
+                // `fields`.
+                let mut t = serializer.serialize_struct(MOVE_VARIANT_NAME, 2)?;
+                t.serialize_field(MOVE_VARIANT_NAME_FIELD, &name.to_string())?;
+                t.serialize_field(MOVE_STRUCT_FIELDS, &MoveFields(fields))?;
+                t.end()
+            },
         }
     }
 }
@@ -567,6 +802,15 @@ impl fmt::Display for MoveStructLayout {
                     write!(f, "{}: {}, ", i, l)?
                 }
             },
+            Self::RuntimeVariants(variants) => {
+                for (i, v) in variants.iter().enumerate() {
+                    write!(f, "#{}{{", i)?;
+                    for (i, l) in v.iter().enumerate() {
+                        write!(f, "{}: {}, ", i, l)?
+                    }
+                    write!(f, "}}")?;
+                }
+            },
             Self::WithFields(layouts) => {
                 for layout in layouts {
                     write!(f, "{}, ", layout)?
@@ -579,6 +823,15 @@ impl fmt::Display for MoveStructLayout {
                     write!(f, "{}, ", field)?
                 }
             },
+            Self::WithVariants(variants) => {
+                for v in variants {
+                    write!(f, "{}{{", v.name)?;
+                    for layout in &v.fields {
+                        write!(f, "{}", layout)?;
+                    }
+                    write!(f, "}}")?;
+                }
+            },
         }
         write!(f, "}}")
     }
@@ -614,7 +867,7 @@ impl TryInto<StructTag> for &MoveStructLayout {
     fn try_into(self) -> Result<StructTag, Self::Error> {
         use MoveStructLayout::*;
         match self {
-            Runtime(..) | WithFields(..) => bail!(
+            Runtime(..) | RuntimeVariants(..) | WithFields(..) | WithVariants(..) => bail!(
                 "Invalid MoveTypeLayout -> StructTag conversion--needed MoveLayoutType::WithTypes"
             ),
             WithTypes { type_, .. } => Ok(type_.clone()),
@@ -645,6 +898,7 @@ impl fmt::Display for MoveStruct {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
             MoveStruct::Runtime(v) => fmt_list(f, "struct[", v, "]"),
+            MoveStruct::RuntimeVariant(tag, v) => fmt_list(f, &format!("variant#{}[", tag), v, "]"),
             MoveStruct::WithFields(fields) => {
                 fmt_list(f, "{", fields.iter().map(DisplayFieldBinding), "}")
             },
@@ -652,6 +906,12 @@ impl fmt::Display for MoveStruct {
                 fmt::Display::fmt(type_, f)?;
                 fmt_list(f, " {", fields.iter().map(DisplayFieldBinding), "}")
             },
+            MoveStruct::WithVariantFields(name, _tag, fields) => fmt_list(
+                f,
+                &format!("{}{{", name),
+                fields.iter().map(DisplayFieldBinding),
+                "}",
+            ),
         }
     }
 }
diff --git a/third_party/move/move-core/types/src/vm_status.rs b/third_party/move/move-core/types/src/vm_status.rs
index 965883162eb1e..9c4fd678b6fa1 100644
--- a/third_party/move/move-core/types/src/vm_status.rs
+++ b/third_party/move/move-core/types/src/vm_status.rs
@@ -565,7 +565,9 @@ pub enum StatusCode {
     SEQUENCE_NUMBER_TOO_BIG = 24,
     // The gas currency is not registered as a TransactionFee currency
     BAD_TRANSACTION_FEE_CURRENCY = 25,
-    // The feature requested is intended for a future Diem version instead of the current one
+    // DEPRECATED. The feature requested is intended for a future Diem version instead of the current
+    // This code is deprecated as it is discarded. Use the verification error code
+    // FEATURE_NOT_ENABLED instead.
     FEATURE_UNDER_GATING = 26,
     // The number of secondary signer addresses is different from the number of secondary
     // public keys provided.
@@ -586,11 +588,13 @@ pub enum StatusCode {
     INSUFFICIENT_BALANCE_FOR_REQUIRED_DEPOSIT = 37,
     GAS_PARAMS_MISSING = 38,
     REQUIRED_DEPOSIT_INCONSISTENT_WITH_TXN_MAX_GAS = 39,
+    MULTISIG_TRANSACTION_PAYLOAD_DOES_NOT_MATCH = 40,
+
     // Reserved error code for future use
-    RESERVED_VALIDATION_ERROR_5 = 40,
     RESERVED_VALIDATION_ERROR_6 = 41,
     RESERVED_VALIDATION_ERROR_7 = 42,
     RESERVED_VALIDATION_ERROR_8 = 43,
+    RESERVED_VALIDATION_ERROR_9 = 44,
 
     // When a code module/script is published it is verified. These are the
     // possible errors that can arise from the verification process.
@@ -720,11 +724,22 @@ pub enum StatusCode {
     DEPENDENCY_LIMIT_REACHED = 1124,
     // This error indicates that unstable bytecode generated by the compiler cannot be published to mainnet
     UNSTABLE_BYTECODE_REJECTED = 1125,
+    PROGRAM_TOO_COMPLEX = 1126,
+    USER_DEFINED_NATIVE_NOT_ALLOWED = 1127,
+    // Bound on the number of struct variants per struct exceeded.
+    MAX_STRUCT_VARIANTS_REACHED = 1128,
+    // A variant test has wrong argument type
+    TEST_VARIANT_TYPE_MISMATCH_ERROR = 1129,
+    // A variant list is empty
+    ZERO_VARIANTS_ERROR = 1130,
+    // A feature is not enabled.
+    FEATURE_NOT_ENABLED = 1131,
+
     // Reserved error code for future use
-    RESERVED_VERIFICATION_ERROR_2 = 1126,
-    RESERVED_VERIFICATION_ERROR_3 = 1127,
-    RESERVED_VERIFICATION_ERROR_4 = 1128,
-    RESERVED_VERIFICATION_ERROR_5 = 1129,
+    RESERVED_VERIFICATION_ERROR_2 = 1132,
+    RESERVED_VERIFICATION_ERROR_3 = 1133,
+    RESERVED_VERIFICATION_ERROR_4 = 1134,
+    RESERVED_VERIFICATION_ERROR_5 = 1135,
 
     // These are errors that the VM might raise if a violation of internal
     // invariants takes place.
@@ -834,11 +849,14 @@ pub enum StatusCode {
     TOO_MANY_DELAYED_FIELDS = 4036,
     // Dynamic function call errors.
     RUNTIME_DISPATCH_ERROR = 4037,
+    // Struct variant not matching. This error appears on an attempt to unpack or borrow a
+    // field from a value which is not of the expected variant.
+    STRUCT_VARIANT_MISMATCH = 4038,
     // Reserved error code for future use. Always keep this buffer of well-defined new codes.
-    RESERVED_RUNTIME_ERROR_1 = 4038,
-    RESERVED_RUNTIME_ERROR_2 = 4039,
-    RESERVED_RUNTIME_ERROR_3 = 4040,
-    RESERVED_RUNTIME_ERROR_4 = 4041,
+    RESERVED_RUNTIME_ERROR_1 = 4039,
+    RESERVED_RUNTIME_ERROR_2 = 4040,
+    RESERVED_RUNTIME_ERROR_3 = 4041,
+    RESERVED_RUNTIME_ERROR_4 = 4042,
 
     // A reserved status to represent an unknown vm status.
     // this is std::u64::MAX, but we can't pattern match on that, so put the hardcoded value in
diff --git a/third_party/move/move-examples/Cargo.toml b/third_party/move/move-examples/Cargo.toml
index a6c8cae8de76e..89f791811f482 100644
--- a/third_party/move/move-examples/Cargo.toml
+++ b/third_party/move/move-examples/Cargo.toml
@@ -11,5 +11,6 @@ publish = false
 
 [dev-dependencies]
 move-cli = { path = "../tools/move-cli" }
+move-stdlib = { path = "../move-stdlib" }
 
 [features]
diff --git a/third_party/move/move-examples/experimental/defi/Move.toml b/third_party/move/move-examples/experimental/defi/Move.toml
new file mode 100644
index 0000000000000..3c2470b21402a
--- /dev/null
+++ b/third_party/move/move-examples/experimental/defi/Move.toml
@@ -0,0 +1,10 @@
+[package]
+name = "DeFi"
+version = "0.0.0"
+
+[addresses]
+std = "0x1"
+defi = "0xDEF1"
+
+[dependencies]
+MoveStdlib = { local = "../../../move-stdlib" }
diff --git a/third_party/move/move-examples/experimental/defi/README.md b/third_party/move/move-examples/experimental/defi/README.md
new file mode 100644
index 0000000000000..6c5777e8a69d6
--- /dev/null
+++ b/third_party/move/move-examples/experimental/defi/README.md
@@ -0,0 +1,7 @@
+# DeFi Examples for Move Prover
+
+This package includes simplified versions of decentralized finance (DeFi) contracts written in Move, designed for specification and verification using the Move Prover.
+
+1. **reserve.move**: A straightforward reserve-backed currency system. This contract defines a currency backed by a reserve of another currency, allowing users to mint and burn the currency as well as deposit and withdraw the reserve currency. It ensures that the total supply of the currency is always fully backed by the reserve. Additionally, it includes intentionally incorrect implementations of the mint and burn functions to demonstrate the Move Prover's capabilities.
+
+2. **uniswap.move**: A basic implementation of the Uniswap v1 automated market maker. This contract defines a pair of tokens, enabling users to swap one token for the other and add or remove liquidity from the pool. It specifies the [constant product invariant](https://docs.uniswap.org/contracts/v2/concepts/protocol-overview/glossary#constant-product-formula) of the Uniswap protocol, which ensures that the product of the token balances remains constant (more precisely, non-decreasing). The contract also contains the flawed algorithm of the swap function (found in the Uniswap v1's whitepaper) to showcase the Move Prover's capabilities.
diff --git a/third_party/move/move-examples/experimental/defi/sources/reserve.move b/third_party/move/move-examples/experimental/defi/sources/reserve.move
new file mode 100644
index 0000000000000..decc904b54797
--- /dev/null
+++ b/third_party/move/move-examples/experimental/defi/sources/reserve.move
@@ -0,0 +1,99 @@
+// This module implements a simple reserve-backed currency system.
+module defi::reserve {
+    use std::fixed_point32::{Self, FixedPoint32};
+    const ADMIN: address = @defi;
+
+    struct Coin1Info has key {
+        total_value: u64,
+        reserve_coin2: ReserveComponent,
+    }
+    spec Coin1Info {
+        // Safety property: the backing value always satisfies the backing ratio.
+        invariant fixed_point32::spec_multiply_u64(total_value, reserve_coin2.backing_ratio)
+            <= reserve_coin2.backing_value;
+    }
+
+    struct ReserveComponent has store {
+        backing_value: u64,
+        backing_ratio: FixedPoint32,
+    }
+
+    // Mint Coin1 by providing Coin2 as backing.
+    // For simplicity, `backing_coin2` should be the exact amount of Coin2 to reserve for the minted Coin1.
+    public fun mint_coin1(amount_to_mint: u64, backing_coin2: u64): u64 // returns the minted Coin1.
+    acquires Coin1Info {
+        assert!(amount_to_mint > 0, 1);
+        let coin1info = borrow_global_mut<Coin1Info>(ADMIN);
+        let coin2_amount_to_reserve = fixed_point32::multiply_u64(amount_to_mint, *& coin1info.reserve_coin2.backing_ratio) + 1;
+        assert!(backing_coin2 == coin2_amount_to_reserve, 2);
+        coin1info.reserve_coin2.backing_value = coin1info.reserve_coin2.backing_value + coin2_amount_to_reserve;
+        coin1info.total_value = coin1info.total_value + amount_to_mint;
+        amount_to_mint
+    }
+    spec mint_coin1 {
+        let coin1info = global<Coin1Info>(ADMIN);
+        let coin2_amount_to_reserve = fixed_point32::spec_multiply_u64(amount_to_mint, coin1info.reserve_coin2.backing_ratio) + 1;
+        aborts_if amount_to_mint == 0;
+        aborts_if backing_coin2 != coin2_amount_to_reserve;
+        aborts_if global<Coin1Info>(ADMIN).total_value + amount_to_mint > MAX_U64;
+        aborts_if coin1info.reserve_coin2.backing_value + backing_coin2 > MAX_U64;
+        aborts_if !exists<Coin1Info>(ADMIN);
+
+        ensures global<Coin1Info>(ADMIN).total_value == old(global<Coin1Info>(ADMIN).total_value) + amount_to_mint;
+        ensures global<Coin1Info>(ADMIN).reserve_coin2.backing_value == old(global<Coin1Info>(ADMIN).reserve_coin2.backing_value) + backing_coin2;
+        ensures backing_coin2 == coin2_amount_to_reserve;
+    }
+
+    // Mint Coin1 by providing Coin2 as backing.
+    // This function is incorrect because it does not reserve enough Coin2 due to miscalculation.
+    public fun mint_coin1_incorrect(amount_to_mint: u64, backing_coin2: u64): u64 // returns the minted Coin1.
+    acquires Coin1Info {
+        assert!(amount_to_mint > 0, 1);
+        let coin1info = borrow_global_mut<Coin1Info>(ADMIN);
+        let coin2_amount_to_reserve = fixed_point32::multiply_u64(amount_to_mint, *& coin1info.reserve_coin2.backing_ratio);
+        assert!(backing_coin2 == coin2_amount_to_reserve, 2);
+        coin1info.reserve_coin2.backing_value = coin1info.reserve_coin2.backing_value + coin2_amount_to_reserve;
+        coin1info.total_value = coin1info.total_value + amount_to_mint;
+        amount_to_mint
+    }
+
+    // Burn Coin1 and get back Coin2.
+    public fun burn_coin1(amount_to_burn: u64): u64 // returns the Coin2 that was reserved.
+    acquires Coin1Info {
+        let coin1info = borrow_global_mut<Coin1Info>(ADMIN);
+        let coin2_amount_to_return = fixed_point32::multiply_u64(amount_to_burn, *& coin1info.reserve_coin2.backing_ratio);
+        assert!(coin1info.reserve_coin2.backing_value >= coin2_amount_to_return, 1);
+        coin1info.reserve_coin2.backing_value = coin1info.reserve_coin2.backing_value - coin2_amount_to_return;
+        coin1info.total_value = coin1info.total_value - amount_to_burn;
+        coin2_amount_to_return
+    }
+
+    // Burn Coin1 and get back Coin2.
+    // This function is incorrect because it does not reserve enough Coin2 due to miscalculation.
+    public fun burn_coin1_incorrect(amount_to_burn: u64): u64 // returns the Coin2 that was reserved.
+    acquires Coin1Info {
+        let coin1info = borrow_global_mut<Coin1Info>(ADMIN);
+        let coin2_amount_to_return = fixed_point32::multiply_u64(amount_to_burn, *& coin1info.reserve_coin2.backing_ratio) + 1;
+        assert!(coin1info.reserve_coin2.backing_value >= coin2_amount_to_return, 1);
+        coin1info.reserve_coin2.backing_value = coin1info.reserve_coin2.backing_value - coin2_amount_to_return;
+        coin1info.total_value = coin1info.total_value - amount_to_burn;
+        coin2_amount_to_return
+    }
+
+    #[verify_only]
+    // This theorems shows that one cannot take out more backing coins from the reserve than the backing value.
+    fun mint_and_burn(amount_to_mint: u64, backing_coin2: u64): u64 acquires Coin1Info{
+        let coin1 = mint_coin1(amount_to_mint, backing_coin2);
+        let coin2 = burn_coin1(coin1);
+        coin2
+    }
+    spec mint_and_burn {
+        ensures result <= backing_coin2;
+    }
+
+    spec module {
+        // We assume that the backing ratio is fixed at 1:3, and never changes.
+        invariant exists<Coin1Info>(ADMIN) ==>
+            global<Coin1Info>(ADMIN).reserve_coin2.backing_ratio == fixed_point32::spec_create_from_rational(1, 5);
+    }
+}
diff --git a/third_party/move/move-examples/experimental/defi/sources/uniswap.move b/third_party/move/move-examples/experimental/defi/sources/uniswap.move
new file mode 100644
index 0000000000000..d796f40fcde09
--- /dev/null
+++ b/third_party/move/move-examples/experimental/defi/sources/uniswap.move
@@ -0,0 +1,140 @@
+// This module defines a simple dex pool based on Uniswap V1
+// that supports swapping coins and adding and removing liquidity.
+module defi::uniswap {
+    const PoolAddr: address = @defi;
+
+    struct Pool has key {
+        coin1: u64,
+        coin2: u64,
+        total_share: u64
+    }
+
+    // This swapping function is based on the formula from the Uniswap v1 codebase.
+    public fun coin1_to_coin2_swap_code(coin1_in: u64): u64 acquires Pool {
+        let pool = borrow_global_mut<Pool>(PoolAddr);
+        let coin2_out = getInputPrice(coin1_in, pool.coin1, pool.coin2);
+        pool.coin1 = pool.coin1 + coin1_in;
+        pool.coin2 = pool.coin2 - coin2_out;
+        coin2_out
+    }
+    spec coin1_to_coin2_swap_code {
+        let old_pool = global<Pool>(PoolAddr);
+        let post new_pool = global<Pool>(PoolAddr);
+        ensures old_pool.coin1 * old_pool.coin2 <= new_pool.coin1 * new_pool.coin2; // safety property
+    }
+    fun getInputPrice(input_amount: u64, input_reserve: u64, output_reserve: u64): u64 {
+        let input_amount_with_fee = input_amount * 997;
+        let numerator = input_amount_with_fee * output_reserve;
+        let denominator = (input_reserve * 1000) + input_amount_with_fee;
+        numerator / denominator
+    }
+
+    // This swapping function simplifies the function `coin1_to_coin2_swap_code`.
+    public fun coin1_to_coin2_swap_code_simple(coin1_in: u64): u64 acquires Pool {
+        let pool = borrow_global_mut<Pool>(PoolAddr);
+        let coin2_out = (997 * coin1_in * pool.coin2) / (1000 * pool.coin1 + 997 * coin1_in);
+        pool.coin1 = pool.coin1 + coin1_in;
+        pool.coin2 = pool.coin2 - coin2_out;
+        coin2_out
+    }
+    spec coin1_to_coin2_swap_code_simple {
+        let old_pool = global<Pool>(PoolAddr);
+        let post new_pool = global<Pool>(PoolAddr);
+        ensures old_pool.coin1 * old_pool.coin2 <= new_pool.coin1 * new_pool.coin2; // safety property
+    }
+
+    // This swapping function is based on the whitepaper that can be found at:
+    // https://hackmd.io/@HaydenAdams/HJ9jLsfTz?type=view#ETH-%E2%87%84-ERC20-Trades
+    // This version of the swapping function is not safe because it does not satisfy the safety property,
+    // having an unbounded rounding error.
+    public fun coin1_to_coin2_swap_whitepaper(coin1_in: u64): u64 acquires Pool {
+        assert! (coin1_in > 0, 1);
+        let fee = coin1_in * 3 / 1000; // 0.3%
+        let pool = borrow_global_mut<Pool>(PoolAddr);
+        spec {
+            assume pool.coin1 > 0;
+            assume pool.coin2 > 0;
+        };
+        let inv = pool.coin1 * pool.coin2; // `inv` may need to be u128
+        let new_pool_coin1 = pool.coin1 + coin1_in;
+        let new_pool_coin2 = inv / (new_pool_coin1 - fee); // No div-by-zero because (new_pool_coin1 - fee) cannot be 0.
+        let coin2_out = pool.coin2 - new_pool_coin2;
+        pool.coin1 = new_pool_coin1;
+        pool.coin2 = new_pool_coin2;
+        coin2_out
+    }
+    spec coin1_to_coin2_swap_whitepaper {
+        let old_pool = global<Pool>(PoolAddr);
+        let post new_pool = global<Pool>(PoolAddr);
+        ensures old_pool.coin1 < new_pool.coin1;
+        ensures old_pool.coin2 >= new_pool.coin2;
+        ensures old_pool.coin1 * old_pool.coin2 <= new_pool.coin1 * new_pool.coin2; // safety property
+    }
+
+    // Adds liquidity to the pool and returns the liquidity share.
+    public fun add_liquidity(coin1_in: u64, coin2_in: u64): u64 // returns liquidity share
+    acquires Pool {
+        let pool = borrow_global_mut<Pool>(PoolAddr);
+        spec {
+            assume pool.coin1 > 0;
+            assume pool.coin2 > 0;
+        };
+
+        let coin1_added = coin1_in;
+        let share_minted = (coin1_added * pool.total_share) / pool.coin1;
+        let coin2_added = (share_minted * pool.coin2) / pool.total_share;
+        // An alternative definition of coin2_added is as follows:
+        // let coin2_added = (coin1_added  * pool.coin2 ) / pool.coin1;
+
+        assert!(coin2_in == coin2_added, 1);
+
+        pool.coin1 = pool.coin1 + coin1_added;
+        pool.coin2 = pool.coin2 + coin2_added;
+        pool.total_share = pool.total_share + share_minted;
+
+        share_minted
+    }
+    spec add_liquidity {
+        let old_pool = global<Pool>(PoolAddr);
+        let post new_pool = global<Pool>(PoolAddr);
+        ensures old_pool.coin1 <= new_pool.coin1;
+        ensures old_pool.coin2 <= new_pool.coin2;
+        ensures old_pool.total_share <= new_pool.total_share;
+    }
+
+    // Removes liquidity from the pool and returns the coins.
+    public fun remove_liquidity(share: u64): (u64, u64) // returns (coin1, coin2)
+    acquires Pool {
+        let pool = borrow_global_mut<Pool>(PoolAddr);
+
+        assert!(share <= pool.total_share, 1);
+
+        let coin1_removed = (pool.coin1 * share) / pool.total_share;
+        let coin2_removed = (pool.coin2 * share) / pool.total_share;
+
+        pool.coin1 = pool.coin1 - coin1_removed;
+        pool.coin2 = pool.coin2 - coin2_removed;
+        pool.total_share = pool.total_share - share;
+
+        (coin1_removed, coin2_removed)
+    }
+    spec remove_liquidity {
+        let old_pool = global<Pool>(PoolAddr);
+        let post new_pool = global<Pool>(PoolAddr);
+        ensures old_pool.coin1 >= new_pool.coin1;
+        ensures old_pool.coin2 >= new_pool.coin2;
+        ensures old_pool.total_share >= new_pool.total_share;
+    }
+
+    #[verify_only]
+    // The "No Free Money Theorem" states that if you add liquidity to a pool, then remove liquidity from the pool,
+    // you will not end up with more money than you started with.
+    fun no_free_money_theorem(coin1_in: u64, coin2_in: u64): (u64, u64) acquires Pool {
+        let share = add_liquidity(coin1_in, coin2_in);
+        remove_liquidity(share)
+    }
+    spec no_free_money_theorem {
+        ensures result_1 <= coin1_in;
+        ensures result_2 <= coin2_in;
+    }
+}
diff --git a/third_party/move/move-examples/experimental/rounding-error/Move.toml b/third_party/move/move-examples/experimental/rounding-error/Move.toml
deleted file mode 100644
index 53bfc31191c1a..0000000000000
--- a/third_party/move/move-examples/experimental/rounding-error/Move.toml
+++ /dev/null
@@ -1,10 +0,0 @@
-[package]
-name = "RoundingError"
-version = "0.0.0"
-
-[addresses]
-std = "0x1"
-NamedAddr = "0xCAFE"
-
-[dependencies]
-MoveStdlib = { local = "../../../move-stdlib" }
diff --git a/third_party/move/move-examples/experimental/rounding-error/sources/Reserve.move b/third_party/move/move-examples/experimental/rounding-error/sources/Reserve.move
deleted file mode 100644
index aaffd36cad763..0000000000000
--- a/third_party/move/move-examples/experimental/rounding-error/sources/Reserve.move
+++ /dev/null
@@ -1,89 +0,0 @@
-module NamedAddr::Reserve {
-    use std::fixed_point32::{Self, FixedPoint32};
-
-    const ADMIN: address = @NamedAddr;
-
-    struct ReserveComponent has store {
-        backing_value: u64,
-        backing_ratio: FixedPoint32,
-    }
-
-    struct Coin1Info has key {
-        total_value: u64,
-        reserve_coin2: ReserveComponent,
-    }
-
-    public fun mint_coin1(amount_to_mint: u64, backing_coin2: u64): u64 // returns the minted Coin1.
-    acquires Coin1Info {
-        assert!(amount_to_mint > 0, 1);
-        let coin1info = borrow_global_mut<Coin1Info>(ADMIN);
-        let coin2_amount_to_reserve = fixed_point32::multiply_u64(amount_to_mint, *& coin1info.reserve_coin2.backing_ratio) + 1;
-        assert!(backing_coin2 == coin2_amount_to_reserve, 2);
-        coin1info.reserve_coin2.backing_value = coin1info.reserve_coin2.backing_value + coin2_amount_to_reserve;
-        coin1info.total_value = coin1info.total_value + amount_to_mint;
-        amount_to_mint
-    }
-    spec mint_coin1 {
-        let coin1info = global<Coin1Info>(ADMIN);
-        let coin2_amount_to_reserve = fixed_point32::spec_multiply_u64(amount_to_mint, coin1info.reserve_coin2.backing_ratio) + 1;
-        aborts_if amount_to_mint == 0;
-        aborts_if backing_coin2 != coin2_amount_to_reserve;
-        aborts_if global<Coin1Info>(ADMIN).total_value + amount_to_mint > MAX_U64;
-        aborts_if coin1info.reserve_coin2.backing_value + backing_coin2 > MAX_U64;
-        aborts_if !exists<Coin1Info>(ADMIN);
-
-        ensures global<Coin1Info>(ADMIN).total_value == old(global<Coin1Info>(ADMIN).total_value) + amount_to_mint;
-        ensures global<Coin1Info>(ADMIN).reserve_coin2.backing_value == old(global<Coin1Info>(ADMIN).reserve_coin2.backing_value) + backing_coin2;
-        ensures backing_coin2 == coin2_amount_to_reserve;
-    }
-
-    public fun mint_coin1_incorrect(amount_to_mint: u64, backing_coin2: u64): u64 // returns the minted Coin1.
-    acquires Coin1Info {
-        assert!(amount_to_mint > 0, 1);
-        let coin1info = borrow_global_mut<Coin1Info>(ADMIN);
-        let coin2_amount_to_reserve = fixed_point32::multiply_u64(amount_to_mint, *& coin1info.reserve_coin2.backing_ratio);
-        assert!(backing_coin2 == coin2_amount_to_reserve, 2);
-        coin1info.reserve_coin2.backing_value = coin1info.reserve_coin2.backing_value + coin2_amount_to_reserve;
-        coin1info.total_value = coin1info.total_value + amount_to_mint;
-        amount_to_mint
-    }
-
-    public fun burn_coin1(amount_to_burn: u64): u64 // returns the Coin2 that was reserved.
-    acquires Coin1Info {
-        let coin1info = borrow_global_mut<Coin1Info>(ADMIN);
-        let coin2_amount_to_return = fixed_point32::multiply_u64(amount_to_burn, *& coin1info.reserve_coin2.backing_ratio);
-        assert!(coin1info.reserve_coin2.backing_value >= coin2_amount_to_return, 1);
-        coin1info.reserve_coin2.backing_value = coin1info.reserve_coin2.backing_value - coin2_amount_to_return;
-        coin1info.total_value = coin1info.total_value - amount_to_burn;
-        coin2_amount_to_return
-    }
-
-    public fun burn_coin1_incorrect(amount_to_burn: u64): u64 // returns the Coin2 that was reserved.
-    acquires Coin1Info {
-        let coin1info = borrow_global_mut<Coin1Info>(ADMIN);
-        let coin2_amount_to_return = fixed_point32::multiply_u64(amount_to_burn, *& coin1info.reserve_coin2.backing_ratio) + 1;
-        assert!(coin1info.reserve_coin2.backing_value >= coin2_amount_to_return, 1);
-        coin1info.reserve_coin2.backing_value = coin1info.reserve_coin2.backing_value - coin2_amount_to_return;
-        coin1info.total_value = coin1info.total_value - amount_to_burn;
-        coin2_amount_to_return
-    }
-
-    fun mint_and_burn(amount_to_mint: u64, backing_coin2: u64): u64 acquires Coin1Info{
-        let coin1 = mint_coin1(amount_to_mint, backing_coin2);
-        let coin2 = burn_coin1(coin1);
-        spec {
-            assert coin2 <= backing_coin2;
-        };
-        coin2
-    }
-
-    spec module {
-        invariant exists<Coin1Info>(ADMIN) ==>
-            global<Coin1Info>(ADMIN).reserve_coin2.backing_ratio == fixed_point32::spec_create_from_rational(1, 2);
-
-        invariant
-            exists<Coin1Info>(ADMIN) ==>
-            fixed_point32::spec_multiply_u64(global<Coin1Info>(ADMIN).total_value, global<Coin1Info>(ADMIN).reserve_coin2.backing_ratio)
-                <= global<Coin1Info>(ADMIN).reserve_coin2.backing_value;
-    }
-}
diff --git a/third_party/move/move-examples/experimental/rounding-error/sources/Uniswap.move b/third_party/move/move-examples/experimental/rounding-error/sources/Uniswap.move
deleted file mode 100644
index 1f24eb5ee4a7f..0000000000000
--- a/third_party/move/move-examples/experimental/rounding-error/sources/Uniswap.move
+++ /dev/null
@@ -1,130 +0,0 @@
-module NamedAddr::Uniswap {
-
-    const PoolAddr: address = @NamedAddr;
-
-    struct Pool has key {
-        coin1: u64,
-        coin2: u64,
-        total_share: u64
-    }
-
-    fun getInputPrice(input_amount: u64, input_reserve: u64, output_reserve: u64): u64 {
-        let input_amount_with_fee = input_amount * 997;
-        let numerator = input_amount_with_fee * output_reserve;
-        let denominator = (input_reserve * 1000) + input_amount_with_fee;
-        numerator / denominator
-    }
-    public fun coin1_to_coin2_swap_code(coin1_in: u64): u64 acquires Pool {
-        let pool = borrow_global_mut<Pool>(PoolAddr);
-        let coin2_out = getInputPrice(coin1_in, pool.coin1, pool.coin2);
-        pool.coin1 = pool.coin1 + coin1_in;
-        pool.coin2 = pool.coin2 - coin2_out;
-        coin2_out
-    }
-    spec coin1_to_coin2_swap_code {
-        let old_pool = global<Pool>(PoolAddr);
-        let post new_pool = global<Pool>(PoolAddr);
-        ensures old_pool.coin1 * old_pool.coin2 <= new_pool.coin1 * new_pool.coin2; // safety property
-    }
-
-    // https://hackmd.io/@HaydenAdams/HJ9jLsfTz?type=view#ETH-%E2%87%84-ERC20-Trades
-    public fun coin1_to_coin2_swap_whitepaper(coin1_in: u64): u64 acquires Pool {
-        assert! (coin1_in > 0, 1);
-        let fee = coin1_in * 3 / 1000; // 0.3%
-        let pool = borrow_global_mut<Pool>(PoolAddr);
-        spec {
-            assume pool.coin1 > 0;
-            assume pool.coin2 > 0;
-            assume pool.coin1 == 1337;
-            assume pool.coin2 == 252;
-        };
-        let inv = pool.coin1 * pool.coin2; // `inv` may need to be u128
-        let new_pool_coin1 = pool.coin1 + coin1_in;
-        let new_pool_coin2 = inv / (new_pool_coin1 - fee); // No div-by-zero because (new_pool_coin1 - fee) cannot be 0.
-        let coin2_out = pool.coin2 - new_pool_coin2;
-        pool.coin1 = new_pool_coin1;
-        pool.coin2 = new_pool_coin2;
-        coin2_out
-    }
-    spec coin1_to_coin2_swap_whitepaper {
-        let old_pool = global<Pool>(PoolAddr);
-        let post new_pool = global<Pool>(PoolAddr);
-        ensures old_pool.coin1 < new_pool.coin1;
-        ensures old_pool.coin2 >= new_pool.coin2;
-        ensures old_pool.coin1 * old_pool.coin2 <= new_pool.coin1 * new_pool.coin2;
-    }
-
-    public fun add_liquidity(coin1_in: u64, coin2_in: u64): u64 // returns liquidity share
-    acquires Pool {
-        let pool = borrow_global_mut<Pool>(PoolAddr);
-
-        let coin1_added = coin1_in;
-        let share_minted = (coin1_added * pool.total_share) / pool.coin1;
-        let coin2_added = (share_minted * pool.coin2) / pool.total_share;
-        // let coin2_added = (coin1_added  * pool.coin2 ) / pool.coin1; // alternatively ...
-
-        assert!(coin2_in == coin2_added, 1);
-
-        pool.coin1 = pool.coin1 + coin1_added;
-        pool.coin2 = pool.coin2 + coin2_added;
-        pool.total_share = pool.total_share + share_minted;
-
-        share_minted
-    }
-    spec add_liquidity {
-        let old_pool = global<Pool>(PoolAddr);
-        let post new_pool = global<Pool>(PoolAddr);
-        ensures old_pool.coin1 <= new_pool.coin1;
-        ensures old_pool.coin2 <= new_pool.coin2;
-        ensures old_pool.total_share <= new_pool.total_share;
-        ensures old_pool.coin1 * old_pool.coin2 <= new_pool.coin1 * new_pool.coin2;
-    }
-
-    public fun remove_liquidity(share: u64): (u64, u64) // returns (coin1, coin2)
-    acquires Pool {
-        let pool = borrow_global_mut<Pool>(PoolAddr);
-
-        let coin1_removed = (pool.coin1 * share) / pool.total_share;
-        let coin2_removed = (pool.coin2 * share) / pool.total_share;
-
-        pool.coin1 = pool.coin1 - coin1_removed;
-        pool.coin2 = pool.coin2 - coin2_removed;
-        pool.total_share = pool.total_share - share;
-
-        (coin1_removed, coin2_removed)
-    }
-    spec remove_liquidity {
-        pragma verify=false;
-        let old_pool = global<Pool>(PoolAddr);
-        let post new_pool = global<Pool>(PoolAddr);
-        ensures old_pool.coin1 <= new_pool.coin1;
-        ensures old_pool.coin2 <= new_pool.coin2;
-        ensures old_pool.total_share <= new_pool.total_share;
-        ensures old_pool.coin1 * old_pool.coin2 <= new_pool.coin1 * new_pool.coin2;
-    }
-
-    // #[test] // TODO: cannot specify the test-only functions
-    fun no_free_money_theorem(coin1_in: u64, coin2_in: u64): (u64, u64) acquires Pool {
-        let share = add_liquidity(coin1_in, coin2_in);
-        remove_liquidity(share)
-    }
-    spec no_free_money_theorem {
-        pragma verify=false;
-        ensures result_1 <= coin1_in;
-        ensures result_2 <= coin2_in;
-    }
-
-
-    public fun coin1_to_coin2_swap_code_simple(coin1_in: u64): u64 acquires Pool {
-        assert! (coin1_in > 0, 1);
-        let pool = borrow_global_mut<Pool>(PoolAddr);
-        spec {
-            assume pool.coin1 > 0;
-            assume pool.coin2 > 0;
-        };
-        let coin2_out = (997 * coin1_in * pool.coin2) / (1000 * pool.coin1 + 997 * coin1_in);
-        pool.coin1 = pool.coin1 + coin1_in;
-        pool.coin2 = pool.coin2 - coin2_out;
-        coin2_out
-    }
-}
diff --git a/third_party/move/move-ir-compiler/move-bytecode-source-map/src/source_map.rs b/third_party/move/move-ir-compiler/move-bytecode-source-map/src/source_map.rs
index 26466739af6fc..ec101a84c7001 100644
--- a/third_party/move/move-ir-compiler/move-bytecode-source-map/src/source_map.rs
+++ b/third_party/move/move-ir-compiler/move-bytecode-source-map/src/source_map.rs
@@ -9,7 +9,7 @@ use move_binary_format::{
     file_format::{
         AbilitySet, CodeOffset, CodeUnit, ConstantPoolIndex, FunctionDefinitionIndex, LocalIndex,
         MemberCount, ModuleHandleIndex, SignatureIndex, StructDefinition, StructDefinitionIndex,
-        TableIndex,
+        TableIndex, VariantIndex,
     },
 };
 use move_command_line_common::files::FileHash;
@@ -37,8 +37,9 @@ pub struct StructSourceMap {
     pub type_parameters: Vec<SourceName>,
 
     /// Note that fields to a struct source map need to be added in the order of the fields in the
-    /// struct definition.
-    pub fields: Vec<Loc>,
+    /// struct definition, variant by variant. If the struct has no variant, there is only
+    /// one outer vector.
+    pub fields: Vec<Vec<Loc>>,
 }
 
 #[derive(Debug, Serialize, Deserialize, Clone)]
@@ -108,12 +109,24 @@ impl StructSourceMap {
         self.type_parameters.get(type_parameter_idx).cloned()
     }
 
-    pub fn add_field_location(&mut self, field_loc: Loc) {
-        self.fields.push(field_loc)
+    pub fn add_field_location(&mut self, variant: Option<VariantIndex>, field_loc: Loc) {
+        let variant = variant.unwrap_or_default() as usize;
+        while self.fields.len() <= variant {
+            self.fields.push(vec![])
+        }
+        self.fields[variant].push(field_loc)
     }
 
-    pub fn get_field_location(&self, field_index: MemberCount) -> Option<Loc> {
-        self.fields.get(field_index as usize).cloned()
+    pub fn get_field_location(
+        &self,
+        variant: Option<VariantIndex>,
+        field_index: MemberCount,
+    ) -> Option<Loc> {
+        let variant = variant.unwrap_or_default() as usize;
+        self.fields
+            .get(variant)
+            .and_then(|v| v.get(field_index as usize))
+            .cloned()
     }
 
     pub fn dummy_struct_map(
@@ -125,11 +138,24 @@ impl StructSourceMap {
         let struct_handle = view.struct_handle_at(struct_def.struct_handle);
 
         // Add dummy locations for the fields
-        match struct_def.declared_field_count() {
-            Err(_) => (),
-            Ok(count) => (0..count).for_each(|_| self.fields.push(default_loc)),
+        let variant_count = struct_def.field_information.variant_count();
+        if variant_count > 0 {
+            for variant in 0..variant_count {
+                self.fields.push(
+                    (0..struct_def
+                        .field_information
+                        .field_count(Some(variant as VariantIndex)))
+                        .map(|_| default_loc)
+                        .collect(),
+                )
+            }
+        } else {
+            self.fields.push(
+                (0..struct_def.field_information.field_count(None))
+                    .map(|_| default_loc)
+                    .collect(),
+            )
         }
-
         for i in 0..struct_handle.type_parameters.len() {
             let name = format!("Ty{}", i);
             self.add_type_parameter((name, default_loc))
@@ -426,24 +452,26 @@ impl SourceMap {
     pub fn add_struct_field_mapping(
         &mut self,
         struct_def_idx: StructDefinitionIndex,
+        variant: Option<VariantIndex>,
         location: Loc,
     ) -> Result<()> {
         let struct_entry = self
             .struct_map
             .get_mut(&struct_def_idx.0)
             .ok_or_else(|| format_err!("Tried to add file mapping to undefined struct index"))?;
-        struct_entry.add_field_location(location);
+        struct_entry.add_field_location(variant, location);
         Ok(())
     }
 
     pub fn get_struct_field_name(
         &self,
         struct_def_idx: StructDefinitionIndex,
+        variant: Option<VariantIndex>,
         field_idx: MemberCount,
     ) -> Option<Loc> {
         self.struct_map
             .get(&struct_def_idx.0)
-            .and_then(|struct_source_map| struct_source_map.get_field_location(field_idx))
+            .and_then(|struct_source_map| struct_source_map.get_field_location(variant, field_idx))
     }
 
     pub fn add_struct_type_parameter_mapping(
diff --git a/third_party/move/move-ir-compiler/move-ir-to-bytecode/src/compiler.rs b/third_party/move/move-ir-compiler/move-ir-to-bytecode/src/compiler.rs
index bb6e33886b4e8..c2be4e3537147 100644
--- a/third_party/move/move-ir-compiler/move-ir-to-bytecode/src/compiler.rs
+++ b/third_party/move/move-ir-compiler/move-ir-to-bytecode/src/compiler.rs
@@ -46,7 +46,7 @@ macro_rules! record_src_loc {
     (field: $context:expr, $idx:expr, $field:expr) => {{
         $context
             .source_map
-            .add_struct_field_mapping($idx, $field.loc)?;
+            .add_struct_field_mapping($idx, None, $field.loc)?;
     }};
     (function_type_formals: $context:expr, $var:expr) => {
         for (ty_var, _) in $var.iter() {
@@ -485,6 +485,12 @@ pub fn compile_module<'a>(
         metadata: vec![],
         struct_defs,
         function_defs,
+        // TODO(#13806): Move IR does not support enums and it is likely be retired. Decide
+        //    whether we want to support this here.
+        struct_variant_handles: vec![],
+        struct_variant_instantiations: vec![],
+        variant_field_handles: vec![],
+        variant_field_instantiations: vec![],
     };
     Ok((module, source_map))
 }
@@ -564,6 +570,10 @@ fn compile_explicit_dependency_declarations(
             metadata: vec![],
             struct_defs: vec![],
             function_defs: vec![],
+            struct_variant_handles: vec![],
+            struct_variant_instantiations: vec![],
+            variant_field_handles: vec![],
+            variant_field_instantiations: vec![],
         };
         dependencies_acc = compiled_deps;
         dependencies_acc.insert(
diff --git a/third_party/move/move-model/bytecode-test-utils/src/lib.rs b/third_party/move/move-model/bytecode-test-utils/src/lib.rs
index 71e0b206d9229..6231a398230e8 100644
--- a/third_party/move/move-model/bytecode-test-utils/src/lib.rs
+++ b/third_party/move/move-model/bytecode-test-utils/src/lib.rs
@@ -4,7 +4,7 @@
 
 use anyhow::anyhow;
 use codespan_reporting::{diagnostic::Severity, term::termcolor::Buffer};
-use move_command_line_common::testing::EXP_EXT;
+use move_command_line_common::testing::get_compiler_exp_extension;
 use move_compiler::shared::{known_attributes::KnownAttribute, PackagePaths};
 use move_compiler_v2::{self, env_pipeline::rewrite_target::RewritingScope, Experiment};
 use move_model::{model::GlobalEnv, options::ModelBuilderOptions, run_model_builder_with_options};
@@ -102,7 +102,7 @@ pub fn test_runner(
         }
         text
     };
-    let baseline_path = path.with_extension(EXP_EXT);
+    let baseline_path = path.with_extension(get_compiler_exp_extension());
     verify_or_update_baseline(baseline_path.as_path(), &out)?;
     Ok(())
 }
diff --git a/third_party/move/move-model/bytecode/abstract_domain_derive/Cargo.toml b/third_party/move/move-model/bytecode/abstract_domain_derive/Cargo.toml
index 33fb294cf577c..27a8a2c0fb76f 100644
--- a/third_party/move/move-model/bytecode/abstract_domain_derive/Cargo.toml
+++ b/third_party/move/move-model/bytecode/abstract_domain_derive/Cargo.toml
@@ -2,6 +2,7 @@
 name = "abstract-domain-derive"
 version = "0.1.0"
 edition = "2021"
+license = { workspace = true }
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
diff --git a/third_party/move/move-model/bytecode/abstract_domain_derive/src/lib.rs b/third_party/move/move-model/bytecode/abstract_domain_derive/src/lib.rs
index eba20df93b1bd..2c6ca2b0f8285 100644
--- a/third_party/move/move-model/bytecode/abstract_domain_derive/src/lib.rs
+++ b/third_party/move/move-model/bytecode/abstract_domain_derive/src/lib.rs
@@ -21,7 +21,7 @@ fn gen_join_field(field: proc_macro2::TokenStream) -> proc_macro2::TokenStream {
 
 #[proc_macro_derive(AbstractDomain, attributes(no_join))]
 /// Derives `AbstractDomain` for structs. The derived `join` method pair-wise joins selected fields of a struct,
-/// or all fields for structs with anonymous fields, and returns the combined join results.
+/// or all fields for structs with positional fields, and returns the combined join results.
 /// The joined fields must implement `AbstractDomain`.
 /// # Usage
 ///
diff --git a/third_party/move/move-model/bytecode/src/borrow_analysis.rs b/third_party/move/move-model/bytecode/src/borrow_analysis.rs
index 9a61cea49ca27..2ab8c96f9843a 100644
--- a/third_party/move/move-model/bytecode/src/borrow_analysis.rs
+++ b/third_party/move/move-model/bytecode/src/borrow_analysis.rs
@@ -676,7 +676,11 @@ impl<'a> TransferFunctions for BorrowAnalysis<'a> {
                         state.add_edge(
                             src_node,
                             dest_node,
-                            BorrowEdge::Field(mid.qualified_inst(*sid, inst.to_owned()), *field),
+                            BorrowEdge::Field(
+                                mid.qualified_inst(*sid, inst.to_owned()),
+                                None,
+                                *field,
+                            ),
                         );
                     },
                     Function(mid, fid, targs) => {
diff --git a/third_party/move/move-model/bytecode/src/stackless_bytecode.rs b/third_party/move/move-model/bytecode/src/stackless_bytecode.rs
index 7e80f868681ba..0b9f56e82fd64 100644
--- a/third_party/move/move-model/bytecode/src/stackless_bytecode.rs
+++ b/third_party/move/move-model/bytecode/src/stackless_bytecode.rs
@@ -12,6 +12,7 @@ use move_model::{
     ast::{Address, Exp, ExpData, MemoryLabel, Spec, TempIndex, TraceKind},
     exp_rewriter::{ExpRewriter, ExpRewriterFunctions, RewriteTarget},
     model::{FunId, GlobalEnv, ModuleId, NodeId, QualifiedInstId, SpecVarId, StructId},
+    symbol::Symbol,
     ty::{Type, TypeDisplayContext},
 };
 use std::{
@@ -159,6 +160,14 @@ pub enum Operation {
     MoveFrom(ModuleId, StructId, Vec<Type>),
     Exists(ModuleId, StructId, Vec<Type>),
 
+    // Variants
+    // Below the `Symbol` is the name of the variant. In the case of `Vec<Symbol>`,
+    // it is a list of variants the value needs to have
+    TestVariant(ModuleId, StructId, Symbol, Vec<Type>),
+    PackVariant(ModuleId, StructId, Symbol, Vec<Type>),
+    UnpackVariant(ModuleId, StructId, Symbol, Vec<Type>),
+    BorrowVariantField(ModuleId, StructId, Vec<Symbol>, Vec<Type>, usize),
+
     // Borrow
     BorrowLoc,
     BorrowField(ModuleId, StructId, Vec<Type>, usize),
@@ -252,6 +261,10 @@ impl Operation {
             Operation::OpaqueCallEnd(_, _, _) => false,
             Operation::Pack(_, _, _) => false,
             Operation::Unpack(_, _, _) => false,
+            Operation::TestVariant(_, _, _, _) => false,
+            Operation::PackVariant(_, _, _, _) => false,
+            Operation::UnpackVariant(_, _, _, _) => true, // aborts if not given variant
+            Operation::BorrowVariantField(_, _, _, _, _) => true, // aborts if not given variant
             Operation::MoveTo(_, _, _) => true,
             Operation::MoveFrom(_, _, _) => true,
             Operation::Exists(_, _, _) => false,
@@ -356,7 +369,7 @@ pub enum BorrowEdge {
     /// Direct borrow.
     Direct,
     /// Field borrow with static offset.
-    Field(QualifiedInstId<StructId>, usize),
+    Field(QualifiedInstId<StructId>, Option<Symbol>, usize),
     /// Vector borrow with dynamic index.
     Index(IndexEdgeKind),
     /// Composed sequence of edges.
@@ -374,7 +387,9 @@ impl BorrowEdge {
 
     pub fn instantiate(&self, params: &[Type]) -> Self {
         match self {
-            Self::Field(qid, offset) => Self::Field(qid.instantiate_ref(params), *offset),
+            Self::Field(qid, variant, offset) => {
+                Self::Field(qid.instantiate_ref(params), *variant, *offset)
+            },
             Self::Hyper(edges) => {
                 let new_edges = edges.iter().map(|e| e.instantiate(params)).collect();
                 Self::Hyper(new_edges)
@@ -1100,6 +1115,32 @@ impl<'env> fmt::Display for OperationDisplay<'env> {
                 write!(f, "unpack {}", self.struct_str(*mid, *sid, targs))?;
             },
 
+            // Variants
+            TestVariant(mid, sid, variant, targs) => {
+                write!(
+                    f,
+                    "test_variant {}::{}",
+                    self.struct_str(*mid, *sid, targs),
+                    variant.display(self.func_target.symbol_pool())
+                )?;
+            },
+            PackVariant(mid, sid, variant, targs) => {
+                write!(
+                    f,
+                    "pack_variant {}::{}",
+                    self.struct_str(*mid, *sid, targs),
+                    variant.display(self.func_target.symbol_pool())
+                )?;
+            },
+            UnpackVariant(mid, sid, variant, targs) => {
+                write!(
+                    f,
+                    "unpack_variant {}::{}",
+                    self.struct_str(*mid, *sid, targs),
+                    variant.display(self.func_target.symbol_pool())
+                )?;
+            },
+
             // Borrow
             BorrowLoc => {
                 write!(f, "borrow_local")?;
@@ -1118,6 +1159,31 @@ impl<'env> fmt::Display for OperationDisplay<'env> {
                     field_env.get_name().display(struct_env.symbol_pool())
                 )?;
             },
+            BorrowVariantField(mid, sid, variants, targs, offset) => {
+                assert!(!variants.is_empty());
+                let variants_str = variants
+                    .iter()
+                    .map(|v| v.display(self.func_target.symbol_pool()))
+                    .join("|");
+                write!(
+                    f,
+                    "borrow_variant_field<{}::{}>",
+                    self.struct_str(*mid, *sid, targs),
+                    variants_str,
+                )?;
+                let struct_env = self
+                    .func_target
+                    .global_env()
+                    .get_module(*mid)
+                    .into_struct(*sid);
+                let field_env =
+                    struct_env.get_field_by_offset_optional_variant(Some(variants[0]), *offset);
+                write!(
+                    f,
+                    ".{}",
+                    field_env.get_name().display(struct_env.symbol_pool())
+                )?;
+            },
             BorrowGlobal(mid, sid, targs) => {
                 write!(f, "borrow_global<{}>", self.struct_str(*mid, *sid, targs))?;
             },
@@ -1379,9 +1445,9 @@ impl<'a> std::fmt::Display for BorrowEdgeDisplay<'a> {
         use BorrowEdge::*;
         let tctx = TypeDisplayContext::new(self.env);
         match self.edge {
-            Field(qid, field) => {
+            Field(qid, variant, field) => {
                 let struct_env = self.env.get_struct(qid.to_qualified_id());
-                let field_env = struct_env.get_field_by_offset(*field);
+                let field_env = struct_env.get_field_by_offset_optional_variant(*variant, *field);
                 let field_type = field_env.get_type().instantiate(&qid.inst);
                 write!(
                     f,
diff --git a/third_party/move/move-model/bytecode/src/stackless_bytecode_generator.rs b/third_party/move/move-model/bytecode/src/stackless_bytecode_generator.rs
index 6c615c2e2ae14..a1db2225c0956 100644
--- a/third_party/move/move-model/bytecode/src/stackless_bytecode_generator.rs
+++ b/third_party/move/move-model/bytecode/src/stackless_bytecode_generator.rs
@@ -17,6 +17,7 @@ use move_binary_format::{
     access::ModuleAccess,
     file_format::{
         Bytecode as MoveBytecode, CodeOffset, CompiledModule, FieldHandleIndex, SignatureIndex,
+        VariantFieldHandleIndex,
     },
     views::{FunctionHandleView, ViewInternals},
 };
@@ -28,6 +29,7 @@ use move_model::{
     ast::{Address, Condition, ConditionKind, ExpData, PropertyValue, Spec, TempIndex, Value},
     model::{FunId, FunctionEnv, Loc, ModuleId, NodeId, StructId},
     pragmas::CONDITION_UNROLL_PROP,
+    symbol::Symbol,
     ty::{PrimitiveType, ReferenceKind, Type},
 };
 use num::ToPrimitive;
@@ -106,14 +108,14 @@ impl<'a> StacklessBytecodeGenerator<'a> {
             | MoveBytecode::Branch(code_offset) = bytecode
             {
                 let offs = *code_offset as CodeOffset;
-                if label_map.get(&offs).is_none() {
+                if !label_map.contains_key(&offs) {
                     let label = Label::new(label_map.len());
                     label_map.insert(offs, label);
                 }
             }
             if let MoveBytecode::BrTrue(_) | MoveBytecode::BrFalse(_) = bytecode {
                 let next_offs = (pos + 1) as CodeOffset;
-                if label_map.get(&next_offs).is_none() {
+                if !label_map.contains_key(&next_offs) {
                     let fall_through_label = Label::new(label_map.len());
                     label_map.insert(next_offs, fall_through_label);
                     self.fallthrough_labels.insert(fall_through_label);
@@ -192,6 +194,33 @@ impl<'a> StacklessBytecodeGenerator<'a> {
         (struct_id, field_handle.field as usize, field_env.get_type())
     }
 
+    fn get_variant_field_info(
+        &self,
+        field_handle_index: VariantFieldHandleIndex,
+    ) -> (StructId, usize, Type, Vec<Symbol>) {
+        let field_handle = self.module.variant_field_handle_at(field_handle_index);
+        let struct_id = self
+            .func_env
+            .module_env
+            .get_struct_id(field_handle.struct_index);
+        let struct_env = self.func_env.module_env.get_struct(struct_id);
+        let variant_names = field_handle
+            .variants
+            .iter()
+            .map(|idx| struct_env.get_variant_name_by_idx(*idx).unwrap())
+            .collect_vec();
+        let field_env = struct_env.get_field_by_offset_optional_variant(
+            variant_names.first().cloned(),
+            field_handle.field as usize,
+        );
+        (
+            struct_id,
+            field_handle.field as usize,
+            field_env.get_type(),
+            variant_names,
+        )
+    }
+
     fn get_type_params(&self, type_params_index: SignatureIndex) -> Vec<Type> {
         self.func_env
             .module_env
@@ -416,6 +445,63 @@ impl<'a> StacklessBytecodeGenerator<'a> {
                 ));
             },
 
+            MoveBytecode::ImmBorrowVariantField(field_handle_index)
+            | MoveBytecode::MutBorrowVariantField(field_handle_index) => {
+                let struct_ref_index = self.temp_stack.pop().unwrap();
+                let (struct_id, field_offset, field_type, variant_names) =
+                    self.get_variant_field_info(*field_handle_index);
+                let field_ref_index = self.temp_count;
+                self.temp_stack.push(field_ref_index);
+                self.code.push(mk_call(
+                    Operation::BorrowVariantField(
+                        self.func_env.module_env.get_id(),
+                        struct_id,
+                        variant_names,
+                        vec![],
+                        field_offset,
+                    ),
+                    vec![field_ref_index],
+                    vec![struct_ref_index],
+                ));
+                self.temp_count += 1;
+                let is_mut = matches!(bytecode, MoveBytecode::MutBorrowField(..));
+                self.local_types.push(Type::Reference(
+                    ReferenceKind::from_is_mut(is_mut),
+                    Box::new(field_type),
+                ));
+            },
+
+            MoveBytecode::ImmBorrowVariantFieldGeneric(field_handle_index)
+            | MoveBytecode::MutBorrowVariantFieldGeneric(field_handle_index) => {
+                let inst_handle = self
+                    .module
+                    .variant_field_instantiation_at(*field_handle_index);
+                let actuals = self.get_type_params(inst_handle.type_parameters);
+                let struct_ref_index = self.temp_stack.pop().unwrap();
+                let (struct_id, field_offset, base_field_type, variant_names) =
+                    self.get_variant_field_info(inst_handle.handle);
+                let field_type = base_field_type.instantiate(&actuals);
+                let field_ref_index = self.temp_count;
+                self.temp_stack.push(field_ref_index);
+                self.code.push(mk_call(
+                    Operation::BorrowVariantField(
+                        self.func_env.module_env.get_id(),
+                        struct_id,
+                        variant_names,
+                        actuals,
+                        field_offset,
+                    ),
+                    vec![field_ref_index],
+                    vec![struct_ref_index],
+                ));
+                self.temp_count += 1;
+                let is_mut = matches!(bytecode, MoveBytecode::MutBorrowField(..));
+                self.local_types.push(Type::Reference(
+                    ReferenceKind::from_is_mut(is_mut),
+                    Box::new(field_type),
+                ));
+            },
+
             MoveBytecode::LdU8(number) => {
                 let temp_index = self.temp_count;
                 self.temp_stack.push(temp_index);
@@ -773,6 +859,78 @@ impl<'a> StacklessBytecodeGenerator<'a> {
                 self.temp_count += 1;
             },
 
+            MoveBytecode::PackVariant(idx) => {
+                let variant_handle = self.module.struct_variant_handle_at(*idx);
+                let struct_env = self
+                    .func_env
+                    .module_env
+                    .get_struct_by_def_idx(variant_handle.struct_index);
+                let variant_name = struct_env
+                    .get_variant_name_by_idx(variant_handle.variant)
+                    .expect("variant index");
+                let mut field_temp_indices = vec![];
+                let struct_temp_index = self.temp_count;
+                for _ in struct_env.get_fields_of_variant(variant_name) {
+                    let field_temp_index = self.temp_stack.pop().unwrap();
+                    field_temp_indices.push(field_temp_index);
+                }
+                self.local_types.push(Type::Struct(
+                    struct_env.module_env.get_id(),
+                    struct_env.get_id(),
+                    vec![],
+                ));
+                self.temp_stack.push(struct_temp_index);
+                field_temp_indices.reverse();
+                self.code.push(mk_call(
+                    Operation::PackVariant(
+                        struct_env.module_env.get_id(),
+                        struct_env.get_id(),
+                        variant_name,
+                        vec![],
+                    ),
+                    vec![struct_temp_index],
+                    field_temp_indices,
+                ));
+                self.temp_count += 1;
+            },
+
+            MoveBytecode::PackVariantGeneric(idx) => {
+                let inst_handle = self.module.struct_variant_instantiation_at(*idx);
+                let actuals = self.get_type_params(inst_handle.type_parameters);
+                let variant_handle = self.module.struct_variant_handle_at(inst_handle.handle);
+                let struct_env = self
+                    .func_env
+                    .module_env
+                    .get_struct_by_def_idx(variant_handle.struct_index);
+                let variant_name = struct_env
+                    .get_variant_name_by_idx(variant_handle.variant)
+                    .expect("variant index");
+                let mut field_temp_indices = vec![];
+                let struct_temp_index = self.temp_count;
+                for _ in struct_env.get_fields_of_variant(variant_name) {
+                    let field_temp_index = self.temp_stack.pop().unwrap();
+                    field_temp_indices.push(field_temp_index);
+                }
+                self.local_types.push(Type::Struct(
+                    struct_env.module_env.get_id(),
+                    struct_env.get_id(),
+                    actuals.clone(),
+                ));
+                self.temp_stack.push(struct_temp_index);
+                field_temp_indices.reverse();
+                self.code.push(mk_call(
+                    Operation::PackVariant(
+                        struct_env.module_env.get_id(),
+                        struct_env.get_id(),
+                        variant_name,
+                        actuals,
+                    ),
+                    vec![struct_temp_index],
+                    field_temp_indices,
+                ));
+                self.temp_count += 1;
+            },
+
             MoveBytecode::Unpack(idx) => {
                 let struct_env = self.func_env.module_env.get_struct_by_def_idx(*idx);
                 let mut field_temp_indices = vec![];
@@ -815,6 +973,122 @@ impl<'a> StacklessBytecodeGenerator<'a> {
                 ));
             },
 
+            MoveBytecode::UnpackVariant(idx) => {
+                let variant_handle = self.module.struct_variant_handle_at(*idx);
+                let struct_env = self
+                    .func_env
+                    .module_env
+                    .get_struct_by_def_idx(variant_handle.struct_index);
+                let variant_name = struct_env
+                    .get_variant_name_by_idx(variant_handle.variant)
+                    .expect("variant index");
+                let mut field_temp_indices = vec![];
+                let struct_temp_index = self.temp_stack.pop().unwrap();
+                for field_env in struct_env.get_fields_of_variant(variant_name) {
+                    let field_temp_index = self.temp_count;
+                    field_temp_indices.push(field_temp_index);
+                    self.temp_stack.push(field_temp_index);
+                    self.local_types.push(field_env.get_type());
+                    self.temp_count += 1;
+                }
+                self.code.push(mk_call(
+                    Operation::UnpackVariant(
+                        struct_env.module_env.get_id(),
+                        struct_env.get_id(),
+                        variant_name,
+                        vec![],
+                    ),
+                    field_temp_indices,
+                    vec![struct_temp_index],
+                ));
+            },
+            MoveBytecode::UnpackVariantGeneric(idx) => {
+                let inst_handle = self.module.struct_variant_instantiation_at(*idx);
+                let actuals = self.get_type_params(inst_handle.type_parameters);
+                let variant_handle = self.module.struct_variant_handle_at(inst_handle.handle);
+                let struct_env = self
+                    .func_env
+                    .module_env
+                    .get_struct_by_def_idx(variant_handle.struct_index);
+                let variant_name = struct_env
+                    .get_variant_name_by_idx(variant_handle.variant)
+                    .expect("variant index to name mapping must be defined");
+                let mut field_temp_indices = vec![];
+                let struct_temp_index = self.temp_stack.pop().unwrap();
+                for field_env in struct_env.get_fields_of_variant(variant_name) {
+                    let field_type = field_env.get_type().instantiate(&actuals);
+                    let field_temp_index = self.temp_count;
+                    field_temp_indices.push(field_temp_index);
+                    self.temp_stack.push(field_temp_index);
+                    self.local_types.push(field_type);
+                    self.temp_count += 1;
+                }
+                self.code.push(mk_call(
+                    Operation::UnpackVariant(
+                        struct_env.module_env.get_id(),
+                        struct_env.get_id(),
+                        variant_name,
+                        actuals,
+                    ),
+                    field_temp_indices,
+                    vec![struct_temp_index],
+                ));
+            },
+
+            MoveBytecode::TestVariant(idx) => {
+                let variant_handle = self.module.struct_variant_handle_at(*idx);
+                let struct_env = self
+                    .func_env
+                    .module_env
+                    .get_struct_by_def_idx(variant_handle.struct_index);
+                let variant_name = struct_env
+                    .get_variant_name_by_idx(variant_handle.variant)
+                    .expect("variant index");
+                let struct_ref_temp_index = self.temp_stack.pop().unwrap();
+                let result_temp_index = self.temp_count;
+                self.local_types.push(Type::new_prim(PrimitiveType::Bool));
+                self.temp_stack.push(result_temp_index);
+                self.code.push(mk_call(
+                    Operation::TestVariant(
+                        struct_env.module_env.get_id(),
+                        struct_env.get_id(),
+                        variant_name,
+                        vec![],
+                    ),
+                    vec![result_temp_index],
+                    vec![struct_ref_temp_index],
+                ));
+                self.temp_count += 1;
+            },
+
+            MoveBytecode::TestVariantGeneric(idx) => {
+                let inst_handle = self.module.struct_variant_instantiation_at(*idx);
+                let actuals = self.get_type_params(inst_handle.type_parameters);
+                let variant_handle = self.module.struct_variant_handle_at(inst_handle.handle);
+                let struct_env = self
+                    .func_env
+                    .module_env
+                    .get_struct_by_def_idx(variant_handle.struct_index);
+                let variant_name = struct_env
+                    .get_variant_name_by_idx(variant_handle.variant)
+                    .expect("variant index");
+                let struct_ref_temp_index = self.temp_stack.pop().unwrap();
+                let result_temp_index = self.temp_count;
+                self.local_types.push(Type::new_prim(PrimitiveType::Bool));
+                self.temp_stack.push(result_temp_index);
+                self.code.push(mk_call(
+                    Operation::TestVariant(
+                        struct_env.module_env.get_id(),
+                        struct_env.get_id(),
+                        variant_name,
+                        actuals,
+                    ),
+                    vec![result_temp_index],
+                    vec![struct_ref_temp_index],
+                ));
+                self.temp_count += 1;
+            },
+
             MoveBytecode::ReadRef => {
                 let operand_index = self.temp_stack.pop().unwrap();
                 let operand_sig = self.local_types[operand_index].clone();
diff --git a/third_party/move/move-model/bytecode/tests/borrow/basic_test.v2_exp b/third_party/move/move-model/bytecode/tests/borrow/basic_test.v2_exp
new file mode 100644
index 0000000000000..56d9c7305b1cd
--- /dev/null
+++ b/third_party/move/move-model/bytecode/tests/borrow/basic_test.v2_exp
@@ -0,0 +1,658 @@
+============ initial translation from Move ================
+
+[variant baseline]
+fun TestBorrow::test1(): TestBorrow::R {
+     var $t0|r: TestBorrow::R
+     var $t1|x_ref: &mut u64
+     var $t2: u64
+     var $t3: TestBorrow::R
+     var $t4: &mut TestBorrow::R
+     var $t5: &mut u64
+     var $t6: u64
+     var $t7: &mut u64
+     var $t8: TestBorrow::R
+  0: $t2 := 3
+  1: $t3 := pack TestBorrow::R($t2)
+  2: $t0 := $t3
+  3: $t4 := borrow_local($t0)
+  4: $t5 := borrow_field<TestBorrow::R>.x($t4)
+  5: $t1 := $t5
+  6: $t6 := 0
+  7: $t7 := move($t1)
+  8: write_ref($t7, $t6)
+  9: $t8 := move($t0)
+ 10: return $t8
+}
+
+
+[variant baseline]
+fun TestBorrow::test2($t0|x_ref: &mut u64, $t1|v: u64) {
+     var $t2: u64
+     var $t3: &mut u64
+  0: $t2 := move($t1)
+  1: $t3 := move($t0)
+  2: write_ref($t3, $t2)
+  3: return ()
+}
+
+
+[variant baseline]
+public fun TestBorrow::test3($t0|r_ref: &mut TestBorrow::R, $t1|v: u64) {
+     var $t2: &mut TestBorrow::R
+     var $t3: &mut u64
+     var $t4: u64
+  0: $t2 := move($t0)
+  1: $t3 := borrow_field<TestBorrow::R>.x($t2)
+  2: $t4 := move($t1)
+  3: TestBorrow::test2($t3, $t4)
+  4: return ()
+}
+
+
+[variant baseline]
+fun TestBorrow::test4(): TestBorrow::R {
+     var $t0|r: TestBorrow::R
+     var $t1: u64
+     var $t2: TestBorrow::R
+     var $t3: &mut TestBorrow::R
+     var $t4: u64
+     var $t5: TestBorrow::R
+  0: $t1 := 3
+  1: $t2 := pack TestBorrow::R($t1)
+  2: $t0 := $t2
+  3: $t3 := borrow_local($t0)
+  4: $t4 := 0
+  5: TestBorrow::test3($t3, $t4)
+  6: $t5 := move($t0)
+  7: return $t5
+}
+
+
+[variant baseline]
+public fun TestBorrow::test5($t0|r_ref: &mut TestBorrow::R): &mut u64 {
+     var $t1: &mut TestBorrow::R
+     var $t2: &mut u64
+  0: $t1 := move($t0)
+  1: $t2 := borrow_field<TestBorrow::R>.x($t1)
+  2: return $t2
+}
+
+
+[variant baseline]
+fun TestBorrow::test6(): TestBorrow::R {
+     var $t0|r: TestBorrow::R
+     var $t1: u64
+     var $t2: TestBorrow::R
+     var $t3: &mut TestBorrow::R
+     var $t4: &mut u64
+     var $t5: u64
+     var $t6: TestBorrow::R
+  0: $t1 := 3
+  1: $t2 := pack TestBorrow::R($t1)
+  2: $t0 := $t2
+  3: $t3 := borrow_local($t0)
+  4: $t4 := TestBorrow::test5($t3)
+  5: $t5 := 0
+  6: TestBorrow::test2($t4, $t5)
+  7: $t6 := move($t0)
+  8: return $t6
+}
+
+
+[variant baseline]
+fun TestBorrow::test7($t0|b: bool) {
+     var $t1|r1: TestBorrow::R
+     var $t2|r2: TestBorrow::R
+     var $t3|r_ref: &mut TestBorrow::R
+     var $t4: u64
+     var $t5: TestBorrow::R
+     var $t6: u64
+     var $t7: TestBorrow::R
+     var $t8: &mut TestBorrow::R
+     var $t9: bool
+     var $t10: &mut TestBorrow::R
+     var $t11: &mut TestBorrow::R
+     var $t12: &mut TestBorrow::R
+     var $t13: u64
+  0: $t4 := 3
+  1: $t5 := pack TestBorrow::R($t4)
+  2: $t1 := $t5
+  3: $t6 := 4
+  4: $t7 := pack TestBorrow::R($t6)
+  5: $t2 := $t7
+  6: $t8 := borrow_local($t1)
+  7: $t3 := $t8
+  8: $t9 := move($t0)
+  9: if ($t9) goto 10 else goto 16
+ 10: label L1
+ 11: $t10 := move($t3)
+ 12: drop($t10)
+ 13: $t11 := borrow_local($t2)
+ 14: $t3 := $t11
+ 15: goto 16
+ 16: label L0
+ 17: $t12 := move($t3)
+ 18: $t13 := 0
+ 19: TestBorrow::test3($t12, $t13)
+ 20: return ()
+}
+
+
+[variant baseline]
+fun TestBorrow::test8($t0|b: bool, $t1|n: u64, $t2|r_ref: &mut TestBorrow::R) {
+     var $t3|r1: TestBorrow::R
+     var $t4|r2: TestBorrow::R
+     var $t5|t_ref: &mut TestBorrow::R
+     var $t6: u64
+     var $t7: TestBorrow::R
+     var $t8: u64
+     var $t9: TestBorrow::R
+     var $t10: &mut TestBorrow::R
+     var $t11: u64
+     var $t12: u64
+     var $t13: bool
+     var $t14: &mut TestBorrow::R
+     var $t15: u64
+     var $t16: u64
+     var $t17: u64
+     var $t18: u64
+     var $t19: bool
+     var $t20: &mut TestBorrow::R
+     var $t21: &mut TestBorrow::R
+     var $t22: u64
+     var $t23: u64
+     var $t24: u64
+     var $t25: bool
+     var $t26: &mut TestBorrow::R
+     var $t27: &mut TestBorrow::R
+     var $t28: u64
+     var $t29: &mut TestBorrow::R
+     var $t30: &mut TestBorrow::R
+     var $t31: u64
+  0: $t6 := 3
+  1: $t7 := pack TestBorrow::R($t6)
+  2: $t3 := $t7
+  3: $t8 := 4
+  4: $t9 := pack TestBorrow::R($t8)
+  5: $t4 := $t9
+  6: $t10 := borrow_local($t4)
+  7: $t5 := $t10
+  8: goto 9
+  9: label L6
+ 10: $t11 := 0
+ 11: $t12 := copy($t1)
+ 12: $t13 := <($t11, $t12)
+ 13: if ($t13) goto 14 else goto 39
+ 14: label L1
+ 15: goto 16
+ 16: label L2
+ 17: $t14 := move($t5)
+ 18: drop($t14)
+ 19: $t15 := copy($t1)
+ 20: $t16 := 2
+ 21: $t17 := /($t15, $t16)
+ 22: $t18 := 0
+ 23: $t19 := ==($t17, $t18)
+ 24: if ($t19) goto 25 else goto 29
+ 25: label L4
+ 26: $t20 := borrow_local($t3)
+ 27: $t5 := $t20
+ 28: goto 33
+ 29: label L3
+ 30: $t21 := borrow_local($t4)
+ 31: $t5 := $t21
+ 32: goto 33
+ 33: label L5
+ 34: $t22 := move($t1)
+ 35: $t23 := 1
+ 36: $t24 := -($t22, $t23)
+ 37: $t1 := $t24
+ 38: goto 9
+ 39: label L0
+ 40: $t25 := move($t0)
+ 41: if ($t25) goto 42 else goto 49
+ 42: label L8
+ 43: $t26 := move($t5)
+ 44: drop($t26)
+ 45: $t27 := move($t2)
+ 46: $t28 := 0
+ 47: TestBorrow::test3($t27, $t28)
+ 48: goto 56
+ 49: label L7
+ 50: $t29 := move($t2)
+ 51: drop($t29)
+ 52: $t30 := move($t5)
+ 53: $t31 := 0
+ 54: TestBorrow::test3($t30, $t31)
+ 55: goto 56
+ 56: label L9
+ 57: return ()
+}
+
+============ after pipeline `borrow` ================
+
+[variant baseline]
+fun TestBorrow::test1(): TestBorrow::R {
+     var $t0|r: TestBorrow::R
+     var $t1|x_ref: &mut u64 [unused]
+     var $t2: u64
+     var $t3: &mut TestBorrow::R
+     var $t4: &mut u64
+     var $t5: u64
+     var $t6: TestBorrow::R
+  0: $t2 := 3
+  1: $t0 := pack TestBorrow::R($t2)
+  2: $t3 := borrow_local($t0)
+     # live_nodes: Reference($t3)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, LocalRoot($t0))}
+  3: $t4 := borrow_field<TestBorrow::R>.x($t3)
+     # live_nodes: Reference($t4)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t4))}
+     # borrows_from: Reference($t3) -> {(@, LocalRoot($t0))}, Reference($t4) -> {(.x (u64), Reference($t3))}
+  4: $t5 := 0
+     # live_nodes: Reference($t4)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t4))}
+     # borrows_from: Reference($t3) -> {(@, LocalRoot($t0))}, Reference($t4) -> {(.x (u64), Reference($t3))}
+  5: write_ref($t4, $t5)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t4))}
+     # borrows_from: Reference($t3) -> {(@, LocalRoot($t0))}, Reference($t4) -> {(.x (u64), Reference($t3))}
+  6: $t6 := move($t0)
+     # live_nodes: LocalRoot($t6)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t4))}
+     # borrows_from: Reference($t3) -> {(@, LocalRoot($t0))}, Reference($t4) -> {(.x (u64), Reference($t3))}
+  7: return $t6
+}
+
+
+[variant baseline]
+fun TestBorrow::test2($t0|x_ref: &mut u64, $t1|v: u64) {
+     # live_nodes: LocalRoot($t1), Reference($t0)
+  0: write_ref($t0, $t1)
+     # live_nodes: LocalRoot($t1)
+  1: return ()
+}
+
+
+[variant baseline]
+public fun TestBorrow::test3($t0|r_ref: &mut TestBorrow::R, $t1|v: u64) {
+     var $t2: &mut u64
+     # live_nodes: LocalRoot($t1), Reference($t0)
+  0: $t2 := borrow_field<TestBorrow::R>.x($t0)
+     # live_nodes: LocalRoot($t1), Reference($t2)
+     # borrowed_by: Reference($t0) -> {(.x (u64), Reference($t2))}
+     # borrows_from: Reference($t2) -> {(.x (u64), Reference($t0))}
+  1: TestBorrow::test2($t2, $t1)
+     # live_nodes: LocalRoot($t1)
+     # borrowed_by: Reference($t0) -> {(.x (u64), Reference($t2))}
+     # borrows_from: Reference($t2) -> {(.x (u64), Reference($t0))}
+  2: return ()
+}
+
+
+[variant baseline]
+fun TestBorrow::test4(): TestBorrow::R {
+     var $t0|r: TestBorrow::R
+     var $t1: u64
+     var $t2: &mut TestBorrow::R
+     var $t3: u64
+     var $t4: TestBorrow::R
+  0: $t1 := 3
+  1: $t0 := pack TestBorrow::R($t1)
+  2: $t2 := borrow_local($t0)
+     # live_nodes: Reference($t2)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, LocalRoot($t0))}
+  3: $t3 := 0
+     # live_nodes: Reference($t2)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, LocalRoot($t0))}
+  4: TestBorrow::test3($t2, $t3)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, LocalRoot($t0))}
+  5: $t4 := move($t0)
+     # live_nodes: LocalRoot($t4)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, LocalRoot($t0))}
+  6: return $t4
+}
+
+
+[variant baseline]
+public fun TestBorrow::test5($t0|r_ref: &mut TestBorrow::R): &mut u64 {
+     var $t1: &mut u64
+     # live_nodes: Reference($t0)
+  0: $t1 := borrow_field<TestBorrow::R>.x($t0)
+     # live_nodes: Reference($t1)
+     # borrowed_by: Reference($t0) -> {(.x (u64), Reference($t1))}
+     # borrows_from: Reference($t1) -> {(.x (u64), Reference($t0))}
+  1: return $t1
+}
+
+
+[variant baseline]
+fun TestBorrow::test6(): TestBorrow::R {
+     var $t0|r: TestBorrow::R
+     var $t1: u64
+     var $t2: &mut TestBorrow::R
+     var $t3: &mut u64
+     var $t4: u64
+     var $t5: TestBorrow::R
+  0: $t1 := 3
+  1: $t0 := pack TestBorrow::R($t1)
+  2: $t2 := borrow_local($t0)
+     # live_nodes: Reference($t2)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, LocalRoot($t0))}
+  3: $t3 := TestBorrow::test5($t2)
+     # live_nodes: Reference($t3)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t2))}, Reference($t2) -> {(.x (u64), Reference($t3))}
+     # borrows_from: Reference($t2) -> {(@, LocalRoot($t0))}, Reference($t3) -> {(.x (u64), Reference($t2))}
+  4: $t4 := 0
+     # live_nodes: Reference($t3)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t2))}, Reference($t2) -> {(.x (u64), Reference($t3))}
+     # borrows_from: Reference($t2) -> {(@, LocalRoot($t0))}, Reference($t3) -> {(.x (u64), Reference($t2))}
+  5: TestBorrow::test2($t3, $t4)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t2))}, Reference($t2) -> {(.x (u64), Reference($t3))}
+     # borrows_from: Reference($t2) -> {(@, LocalRoot($t0))}, Reference($t3) -> {(.x (u64), Reference($t2))}
+  6: $t5 := move($t0)
+     # live_nodes: LocalRoot($t5)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t2))}, Reference($t2) -> {(.x (u64), Reference($t3))}
+     # borrows_from: Reference($t2) -> {(@, LocalRoot($t0))}, Reference($t3) -> {(.x (u64), Reference($t2))}
+  7: return $t5
+}
+
+
+[variant baseline]
+fun TestBorrow::test7($t0|b: bool) {
+     var $t1|r1: TestBorrow::R
+     var $t2|r2: TestBorrow::R
+     var $t3|r_ref: &mut TestBorrow::R
+     var $t4: u64
+     var $t5: u64
+     var $t6: &mut TestBorrow::R
+     var $t7: &mut TestBorrow::R
+     var $t8: u64
+     # live_nodes: LocalRoot($t0)
+  0: $t4 := 3
+     # live_nodes: LocalRoot($t0)
+  1: $t1 := pack TestBorrow::R($t4)
+     # live_nodes: LocalRoot($t0)
+  2: $t5 := 4
+     # live_nodes: LocalRoot($t0)
+  3: $t2 := pack TestBorrow::R($t5)
+     # live_nodes: LocalRoot($t0)
+  4: $t6 := borrow_local($t1)
+     # live_nodes: LocalRoot($t0), Reference($t6)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t1))}
+  5: $t3 := $t6
+     # live_nodes: LocalRoot($t0), Reference($t3), Reference($t6)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t6))}, Reference($t6) -> {(@, LocalRoot($t1))}
+  6: if ($t0) goto 16 else goto 19
+     # live_nodes: LocalRoot($t0), Reference($t6)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t6))}, Reference($t6) -> {(@, LocalRoot($t1))}
+  7: label L1
+     # live_nodes: LocalRoot($t0), Reference($t6)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t6))}, Reference($t6) -> {(@, LocalRoot($t1))}
+  8: drop($t6)
+     # live_nodes: LocalRoot($t0)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t6))}, Reference($t6) -> {(@, LocalRoot($t1))}
+  9: $t7 := borrow_local($t2)
+     # live_nodes: LocalRoot($t0), Reference($t7)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, LocalRoot($t2) -> {(@, Reference($t7))}, Reference($t6) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t6))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t2))}
+ 10: $t3 := $t7
+     # live_nodes: LocalRoot($t0), Reference($t3)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, LocalRoot($t2) -> {(@, Reference($t7))}, Reference($t6) -> {(@, Reference($t3))}, Reference($t7) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t6)), (@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t2))}
+ 11: goto 12
+     # live_nodes: LocalRoot($t0), Reference($t3)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, LocalRoot($t2) -> {(@, Reference($t7))}, Reference($t6) -> {(@, Reference($t3))}, Reference($t7) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t6)), (@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t2))}
+ 12: label L0
+     # live_nodes: LocalRoot($t0), Reference($t3)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, LocalRoot($t2) -> {(@, Reference($t7))}, Reference($t6) -> {(@, Reference($t3))}, Reference($t7) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t6)), (@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t2))}
+ 13: $t8 := 0
+     # live_nodes: LocalRoot($t0), Reference($t3)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, LocalRoot($t2) -> {(@, Reference($t7))}, Reference($t6) -> {(@, Reference($t3))}, Reference($t7) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t6)), (@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t2))}
+ 14: TestBorrow::test3($t3, $t8)
+     # live_nodes: LocalRoot($t0)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, LocalRoot($t2) -> {(@, Reference($t7))}, Reference($t6) -> {(@, Reference($t3))}, Reference($t7) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t6)), (@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t2))}
+ 15: return ()
+     # live_nodes: LocalRoot($t0), Reference($t3), Reference($t6)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t6))}, Reference($t6) -> {(@, LocalRoot($t1))}
+ 16: label L2
+     # live_nodes: LocalRoot($t0), Reference($t3), Reference($t6)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t6))}, Reference($t6) -> {(@, LocalRoot($t1))}
+ 17: drop($t3)
+     # live_nodes: LocalRoot($t0), Reference($t6)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t6))}, Reference($t6) -> {(@, LocalRoot($t1))}
+ 18: goto 7
+     # live_nodes: LocalRoot($t0), Reference($t3), Reference($t6)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t6))}, Reference($t6) -> {(@, LocalRoot($t1))}
+ 19: label L3
+     # live_nodes: LocalRoot($t0), Reference($t3), Reference($t6)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t6))}, Reference($t6) -> {(@, LocalRoot($t1))}
+ 20: drop($t6)
+     # live_nodes: LocalRoot($t0), Reference($t3)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t6))}, Reference($t6) -> {(@, LocalRoot($t1))}
+ 21: goto 12
+}
+
+
+[variant baseline]
+fun TestBorrow::test8($t0|b: bool, $t1|n: u64, $t2|r_ref: &mut TestBorrow::R) {
+     var $t3|r1: TestBorrow::R
+     var $t4|r2: TestBorrow::R
+     var $t5|t_ref: &mut TestBorrow::R
+     var $t6: u64
+     var $t7: u64
+     var $t8: &mut TestBorrow::R
+     var $t9: u64
+     var $t10: bool
+     var $t11: u64
+     var $t12: u64
+     var $t13: u64
+     var $t14: bool
+     var $t15: &mut TestBorrow::R
+     var $t16: &mut TestBorrow::R
+     var $t17: u64
+     var $t18: u64
+     var $t19: u64
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+  0: $t6 := 3
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+  1: $t3 := pack TestBorrow::R($t6)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+  2: $t7 := 4
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+  3: $t4 := pack TestBorrow::R($t7)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+  4: $t8 := borrow_local($t4)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t8)
+     # borrowed_by: LocalRoot($t4) -> {(@, Reference($t8))}
+     # borrows_from: Reference($t8) -> {(@, LocalRoot($t4))}
+  5: $t5 := $t8
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t4) -> {(@, Reference($t8))}, Reference($t8) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8))}, Reference($t8) -> {(@, LocalRoot($t4))}
+  6: goto 7
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+  7: label L6
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+  8: $t9 := 0
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+  9: $t10 := <($t9, $t1)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 10: if ($t10) goto 11 else goto 32
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 11: label L1
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 12: goto 13
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 13: label L2
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 14: drop($t5)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 15: $t11 := 2
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 16: $t12 := /($t1, $t11)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 17: $t13 := 0
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 18: $t14 := ==($t12, $t13)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 19: if ($t14) goto 20 else goto 24
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 20: label L4
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 21: $t15 := borrow_local($t3)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t15)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 22: $t5 := $t15
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 23: goto 28
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 24: label L3
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 25: $t16 := borrow_local($t4)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t16)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 26: $t5 := $t16
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 27: goto 28
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 28: label L5
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 29: $t17 := 1
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 30: $t1 := -($t1, $t17)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 31: goto 7
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 32: label L0
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 33: if ($t0) goto 34 else goto 39
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 34: label L8
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 35: drop($t5)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 36: $t18 := 0
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 37: TestBorrow::test3($t2, $t18)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 38: goto 44
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 39: label L7
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 40: drop($t2)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 41: $t19 := 0
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 42: TestBorrow::test3($t5, $t19)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 43: goto 44
+     # live_nodes: LocalRoot($t0), LocalRoot($t1)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 44: label L9
+     # live_nodes: LocalRoot($t0), LocalRoot($t1)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 45: return ()
+}
+
+
+
+==== borrow analysis summaries ====
+
+fun TestBorrow::test5[baseline]
+borrowed_by: Reference($t0) -> {(.x (u64), Return(0))}
+borrows_from: Return(0) -> {(.x (u64), Reference($t0))}
diff --git a/third_party/move/move-model/bytecode/tests/borrow/function_call.v2_exp b/third_party/move/move-model/bytecode/tests/borrow/function_call.v2_exp
new file mode 100644
index 0000000000000..38764bb039850
--- /dev/null
+++ b/third_party/move/move-model/bytecode/tests/borrow/function_call.v2_exp
@@ -0,0 +1,276 @@
+============ initial translation from Move ================
+
+[variant baseline]
+public intrinsic fun vector::contains<#0>($t0|v: &vector<#0>, $t1|e: &#0): bool;
+
+
+[variant baseline]
+public intrinsic fun vector::index_of<#0>($t0|v: &vector<#0>, $t1|e: &#0): (bool, u64);
+
+
+[variant baseline]
+public intrinsic fun vector::append<#0>($t0|lhs: &mut vector<#0>, $t1|other: vector<#0>);
+
+
+[variant baseline]
+public native fun vector::borrow<#0>($t0|v: &vector<#0>, $t1|i: u64): &#0;
+
+
+[variant baseline]
+public native fun vector::borrow_mut<#0>($t0|v: &mut vector<#0>, $t1|i: u64): &mut #0;
+
+
+[variant baseline]
+public native fun vector::destroy_empty<#0>($t0|v: vector<#0>);
+
+
+[variant baseline]
+public native fun vector::empty<#0>(): vector<#0>;
+
+
+[variant baseline]
+public intrinsic fun vector::is_empty<#0>($t0|v: &vector<#0>): bool;
+
+
+[variant baseline]
+public native fun vector::length<#0>($t0|v: &vector<#0>): u64;
+
+
+[variant baseline]
+public native fun vector::pop_back<#0>($t0|v: &mut vector<#0>): #0;
+
+
+[variant baseline]
+public native fun vector::push_back<#0>($t0|v: &mut vector<#0>, $t1|e: #0);
+
+
+[variant baseline]
+public intrinsic fun vector::remove<#0>($t0|v: &mut vector<#0>, $t1|i: u64): #0;
+
+
+[variant baseline]
+public intrinsic fun vector::reverse<#0>($t0|v: &mut vector<#0>);
+
+
+[variant baseline]
+public fun vector::singleton<#0>($t0|e: #0): vector<#0> {
+     var $t1|v: vector<#0>
+     var $t2: vector<#0>
+     var $t3: &mut vector<#0>
+     var $t4: #0
+     var $t5: vector<#0>
+  0: $t2 := vector::empty<#0>()
+  1: $t1 := $t2
+  2: $t3 := borrow_local($t1)
+  3: $t4 := move($t0)
+  4: vector::push_back<#0>($t3, $t4)
+  5: $t5 := move($t1)
+  6: return $t5
+}
+
+
+[variant baseline]
+public native fun vector::swap<#0>($t0|v: &mut vector<#0>, $t1|i: u64, $t2|j: u64);
+
+
+[variant baseline]
+public intrinsic fun vector::swap_remove<#0>($t0|v: &mut vector<#0>, $t1|i: u64): #0;
+
+
+[variant baseline]
+fun MultiLayerCalling::inner($t0|has_vector: &mut MultiLayerCalling::HasVector): &mut MultiLayerCalling::HasAnotherVector {
+     var $t1: &mut MultiLayerCalling::HasVector
+     var $t2: &mut vector<MultiLayerCalling::HasAnotherVector>
+     var $t3: u64
+     var $t4: &mut MultiLayerCalling::HasAnotherVector
+  0: $t1 := move($t0)
+  1: $t2 := borrow_field<MultiLayerCalling::HasVector>.v($t1)
+  2: $t3 := 7
+  3: $t4 := vector::borrow_mut<MultiLayerCalling::HasAnotherVector>($t2, $t3)
+  4: return $t4
+}
+
+
+[variant baseline]
+fun MultiLayerCalling::mid($t0|has_vector: &mut MultiLayerCalling::HasVector): &mut MultiLayerCalling::HasAnotherVector {
+     var $t1: &mut MultiLayerCalling::HasVector
+     var $t2: &mut MultiLayerCalling::HasAnotherVector
+  0: $t1 := move($t0)
+  1: $t2 := MultiLayerCalling::inner($t1)
+  2: return $t2
+}
+
+
+[variant baseline]
+fun MultiLayerCalling::outer($t0|has_vector: &mut MultiLayerCalling::HasVector) {
+     var $t1: &mut MultiLayerCalling::HasVector
+     var $t2: &mut MultiLayerCalling::HasAnotherVector
+     var $t3: &mut vector<u8>
+     var $t4: u8
+  0: $t1 := move($t0)
+  1: $t2 := MultiLayerCalling::mid($t1)
+  2: $t3 := borrow_field<MultiLayerCalling::HasAnotherVector>.v($t2)
+  3: $t4 := 42
+  4: vector::push_back<u8>($t3, $t4)
+  5: return ()
+}
+
+============ after pipeline `borrow` ================
+
+[variant baseline]
+public intrinsic fun vector::contains<#0>($t0|v: &vector<#0>, $t1|e: &#0): bool;
+
+
+[variant baseline]
+public intrinsic fun vector::index_of<#0>($t0|v: &vector<#0>, $t1|e: &#0): (bool, u64);
+
+
+[variant baseline]
+public intrinsic fun vector::append<#0>($t0|lhs: &mut vector<#0>, $t1|other: vector<#0>);
+
+
+[variant baseline]
+public native fun vector::borrow<#0>($t0|v: &vector<#0>, $t1|i: u64): &#0;
+
+
+[variant baseline]
+public native fun vector::borrow_mut<#0>($t0|v: &mut vector<#0>, $t1|i: u64): &mut #0;
+
+
+[variant baseline]
+public native fun vector::destroy_empty<#0>($t0|v: vector<#0>);
+
+
+[variant baseline]
+public native fun vector::empty<#0>(): vector<#0>;
+
+
+[variant baseline]
+public intrinsic fun vector::is_empty<#0>($t0|v: &vector<#0>): bool;
+
+
+[variant baseline]
+public native fun vector::length<#0>($t0|v: &vector<#0>): u64;
+
+
+[variant baseline]
+public native fun vector::pop_back<#0>($t0|v: &mut vector<#0>): #0;
+
+
+[variant baseline]
+public native fun vector::push_back<#0>($t0|v: &mut vector<#0>, $t1|e: #0);
+
+
+[variant baseline]
+public intrinsic fun vector::remove<#0>($t0|v: &mut vector<#0>, $t1|i: u64): #0;
+
+
+[variant baseline]
+public intrinsic fun vector::reverse<#0>($t0|v: &mut vector<#0>);
+
+
+[variant baseline]
+public fun vector::singleton<#0>($t0|e: #0): vector<#0> {
+     var $t1|v: vector<#0>
+     var $t2: &mut vector<#0>
+     var $t3: vector<#0>
+     # live_nodes: LocalRoot($t0)
+  0: $t1 := vector::empty<#0>()
+     # live_nodes: LocalRoot($t0)
+  1: $t2 := borrow_local($t1)
+     # live_nodes: LocalRoot($t0), Reference($t2)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, LocalRoot($t1))}
+  2: vector::push_back<#0>($t2, $t0)
+     # live_nodes: LocalRoot($t0)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, LocalRoot($t1))}
+  3: $t3 := move($t1)
+     # live_nodes: LocalRoot($t0), LocalRoot($t3)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, LocalRoot($t1))}
+  4: return $t3
+}
+
+
+[variant baseline]
+public native fun vector::swap<#0>($t0|v: &mut vector<#0>, $t1|i: u64, $t2|j: u64);
+
+
+[variant baseline]
+public intrinsic fun vector::swap_remove<#0>($t0|v: &mut vector<#0>, $t1|i: u64): #0;
+
+
+[variant baseline]
+fun MultiLayerCalling::inner($t0|has_vector: &mut MultiLayerCalling::HasVector): &mut MultiLayerCalling::HasAnotherVector {
+     var $t1: &mut vector<MultiLayerCalling::HasAnotherVector>
+     var $t2: u64
+     var $t3: &mut MultiLayerCalling::HasAnotherVector
+     # live_nodes: Reference($t0)
+  0: $t1 := borrow_field<MultiLayerCalling::HasVector>.v($t0)
+     # live_nodes: Reference($t1)
+     # borrowed_by: Reference($t0) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>), Reference($t1))}
+     # borrows_from: Reference($t1) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>), Reference($t0))}
+  1: $t2 := 7
+     # live_nodes: Reference($t1)
+     # borrowed_by: Reference($t0) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>), Reference($t1))}
+     # borrows_from: Reference($t1) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>), Reference($t0))}
+  2: $t3 := vector::borrow_mut<MultiLayerCalling::HasAnotherVector>($t1, $t2)
+     # live_nodes: Reference($t3)
+     # borrowed_by: Reference($t0) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>), Reference($t1))}, Reference($t1) -> {([], Reference($t3))}
+     # borrows_from: Reference($t1) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>), Reference($t0))}, Reference($t3) -> {([], Reference($t1))}
+  3: return $t3
+}
+
+
+[variant baseline]
+fun MultiLayerCalling::mid($t0|has_vector: &mut MultiLayerCalling::HasVector): &mut MultiLayerCalling::HasAnotherVector {
+     var $t1: &mut MultiLayerCalling::HasAnotherVector
+     # live_nodes: Reference($t0)
+  0: $t1 := MultiLayerCalling::inner($t0)
+     # live_nodes: Reference($t1)
+     # borrowed_by: Reference($t0) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>)/[], Reference($t1))}
+     # borrows_from: Reference($t1) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>)/[], Reference($t0))}
+  1: return $t1
+}
+
+
+[variant baseline]
+fun MultiLayerCalling::outer($t0|has_vector: &mut MultiLayerCalling::HasVector) {
+     var $t1: &mut MultiLayerCalling::HasAnotherVector
+     var $t2: &mut vector<u8>
+     var $t3: u8
+     # live_nodes: Reference($t0)
+  0: $t1 := MultiLayerCalling::mid($t0)
+     # live_nodes: Reference($t1)
+     # borrowed_by: Reference($t0) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>)/[], Reference($t1))}
+     # borrows_from: Reference($t1) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>)/[], Reference($t0))}
+  1: $t2 := borrow_field<MultiLayerCalling::HasAnotherVector>.v($t1)
+     # live_nodes: Reference($t2)
+     # borrowed_by: Reference($t0) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>)/[], Reference($t1))}, Reference($t1) -> {(.v (vector<u8>), Reference($t2))}
+     # borrows_from: Reference($t1) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>)/[], Reference($t0))}, Reference($t2) -> {(.v (vector<u8>), Reference($t1))}
+  2: $t3 := 42
+     # live_nodes: Reference($t2)
+     # borrowed_by: Reference($t0) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>)/[], Reference($t1))}, Reference($t1) -> {(.v (vector<u8>), Reference($t2))}
+     # borrows_from: Reference($t1) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>)/[], Reference($t0))}, Reference($t2) -> {(.v (vector<u8>), Reference($t1))}
+  3: vector::push_back<u8>($t2, $t3)
+     # borrowed_by: Reference($t0) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>)/[], Reference($t1))}, Reference($t1) -> {(.v (vector<u8>), Reference($t2))}
+     # borrows_from: Reference($t1) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>)/[], Reference($t0))}, Reference($t2) -> {(.v (vector<u8>), Reference($t1))}
+  4: return ()
+}
+
+
+
+==== borrow analysis summaries ====
+
+fun vector::borrow_mut[baseline]
+borrowed_by: Reference($t0) -> {([], Return(0))}
+borrows_from: Return(0) -> {([], Reference($t0))}
+
+fun MultiLayerCalling::inner[baseline]
+borrowed_by: Reference($t0) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>)/[], Return(0))}
+borrows_from: Return(0) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>)/[], Reference($t0))}
+
+fun MultiLayerCalling::mid[baseline]
+borrowed_by: Reference($t0) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>)/[], Return(0))}
+borrows_from: Return(0) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>)/[], Reference($t0))}
diff --git a/third_party/move/move-model/bytecode/tests/borrow/hyper_edge.v2_exp b/third_party/move/move-model/bytecode/tests/borrow/hyper_edge.v2_exp
new file mode 100644
index 0000000000000..40b0b00802900
--- /dev/null
+++ b/third_party/move/move-model/bytecode/tests/borrow/hyper_edge.v2_exp
@@ -0,0 +1,289 @@
+============ initial translation from Move ================
+
+[variant baseline]
+public intrinsic fun vector::contains<#0>($t0|v: &vector<#0>, $t1|e: &#0): bool;
+
+
+[variant baseline]
+public intrinsic fun vector::index_of<#0>($t0|v: &vector<#0>, $t1|e: &#0): (bool, u64);
+
+
+[variant baseline]
+public intrinsic fun vector::append<#0>($t0|lhs: &mut vector<#0>, $t1|other: vector<#0>);
+
+
+[variant baseline]
+public native fun vector::borrow<#0>($t0|v: &vector<#0>, $t1|i: u64): &#0;
+
+
+[variant baseline]
+public native fun vector::borrow_mut<#0>($t0|v: &mut vector<#0>, $t1|i: u64): &mut #0;
+
+
+[variant baseline]
+public native fun vector::destroy_empty<#0>($t0|v: vector<#0>);
+
+
+[variant baseline]
+public native fun vector::empty<#0>(): vector<#0>;
+
+
+[variant baseline]
+public intrinsic fun vector::is_empty<#0>($t0|v: &vector<#0>): bool;
+
+
+[variant baseline]
+public native fun vector::length<#0>($t0|v: &vector<#0>): u64;
+
+
+[variant baseline]
+public native fun vector::pop_back<#0>($t0|v: &mut vector<#0>): #0;
+
+
+[variant baseline]
+public native fun vector::push_back<#0>($t0|v: &mut vector<#0>, $t1|e: #0);
+
+
+[variant baseline]
+public intrinsic fun vector::remove<#0>($t0|v: &mut vector<#0>, $t1|i: u64): #0;
+
+
+[variant baseline]
+public intrinsic fun vector::reverse<#0>($t0|v: &mut vector<#0>);
+
+
+[variant baseline]
+public fun vector::singleton<#0>($t0|e: #0): vector<#0> {
+     var $t1|v: vector<#0>
+     var $t2: vector<#0>
+     var $t3: &mut vector<#0>
+     var $t4: #0
+     var $t5: vector<#0>
+  0: $t2 := vector::empty<#0>()
+  1: $t1 := $t2
+  2: $t3 := borrow_local($t1)
+  3: $t4 := move($t0)
+  4: vector::push_back<#0>($t3, $t4)
+  5: $t5 := move($t1)
+  6: return $t5
+}
+
+
+[variant baseline]
+public native fun vector::swap<#0>($t0|v: &mut vector<#0>, $t1|i: u64, $t2|j: u64);
+
+
+[variant baseline]
+public intrinsic fun vector::swap_remove<#0>($t0|v: &mut vector<#0>, $t1|i: u64): #0;
+
+
+[variant baseline]
+public fun Collection::borrow_mut<#0>($t0|c: &mut Collection::Collection<#0>, $t1|i: u64): &mut #0 {
+     var $t2: &mut Collection::Collection<#0>
+     var $t3: &mut vector<#0>
+     var $t4: u64
+     var $t5: &mut #0
+  0: $t2 := move($t0)
+  1: $t3 := borrow_field<Collection::Collection<#0>>.items($t2)
+  2: $t4 := move($t1)
+  3: $t5 := vector::borrow_mut<#0>($t3, $t4)
+  4: return $t5
+}
+
+
+[variant baseline]
+public fun Collection::make_collection<#0>(): Collection::Collection<#0> {
+     var $t0: vector<#0>
+     var $t1: address
+     var $t2: Collection::Collection<#0>
+  0: $t0 := vector::empty<#0>()
+  1: $t1 := 0x2
+  2: $t2 := pack Collection::Collection<#0>($t0, $t1)
+  3: return $t2
+}
+
+
+[variant baseline]
+public fun Test::foo<#0>($t0|i: u64) {
+     var $t1|c: Collection::Collection<Test::Token<#0>>
+     var $t2|t: &mut Test::Token<#0>
+     var $t3: Collection::Collection<Test::Token<#0>>
+     var $t4: &mut Collection::Collection<Test::Token<#0>>
+     var $t5: u64
+     var $t6: &mut Test::Token<#0>
+     var $t7: u64
+     var $t8: &mut Test::Token<#0>
+     var $t9: &mut u64
+  0: $t3 := Collection::make_collection<Test::Token<#0>>()
+  1: $t1 := $t3
+  2: $t4 := borrow_local($t1)
+  3: $t5 := move($t0)
+  4: $t6 := Collection::borrow_mut<Test::Token<#0>>($t4, $t5)
+  5: $t2 := $t6
+  6: $t7 := 0
+  7: $t8 := move($t2)
+  8: $t9 := borrow_field<Test::Token<#0>>.value($t8)
+  9: write_ref($t9, $t7)
+ 10: return ()
+}
+
+============ after pipeline `borrow` ================
+
+[variant baseline]
+public intrinsic fun vector::contains<#0>($t0|v: &vector<#0>, $t1|e: &#0): bool;
+
+
+[variant baseline]
+public intrinsic fun vector::index_of<#0>($t0|v: &vector<#0>, $t1|e: &#0): (bool, u64);
+
+
+[variant baseline]
+public intrinsic fun vector::append<#0>($t0|lhs: &mut vector<#0>, $t1|other: vector<#0>);
+
+
+[variant baseline]
+public native fun vector::borrow<#0>($t0|v: &vector<#0>, $t1|i: u64): &#0;
+
+
+[variant baseline]
+public native fun vector::borrow_mut<#0>($t0|v: &mut vector<#0>, $t1|i: u64): &mut #0;
+
+
+[variant baseline]
+public native fun vector::destroy_empty<#0>($t0|v: vector<#0>);
+
+
+[variant baseline]
+public native fun vector::empty<#0>(): vector<#0>;
+
+
+[variant baseline]
+public intrinsic fun vector::is_empty<#0>($t0|v: &vector<#0>): bool;
+
+
+[variant baseline]
+public native fun vector::length<#0>($t0|v: &vector<#0>): u64;
+
+
+[variant baseline]
+public native fun vector::pop_back<#0>($t0|v: &mut vector<#0>): #0;
+
+
+[variant baseline]
+public native fun vector::push_back<#0>($t0|v: &mut vector<#0>, $t1|e: #0);
+
+
+[variant baseline]
+public intrinsic fun vector::remove<#0>($t0|v: &mut vector<#0>, $t1|i: u64): #0;
+
+
+[variant baseline]
+public intrinsic fun vector::reverse<#0>($t0|v: &mut vector<#0>);
+
+
+[variant baseline]
+public fun vector::singleton<#0>($t0|e: #0): vector<#0> {
+     var $t1|v: vector<#0>
+     var $t2: &mut vector<#0>
+     var $t3: vector<#0>
+     # live_nodes: LocalRoot($t0)
+  0: $t1 := vector::empty<#0>()
+     # live_nodes: LocalRoot($t0)
+  1: $t2 := borrow_local($t1)
+     # live_nodes: LocalRoot($t0), Reference($t2)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, LocalRoot($t1))}
+  2: vector::push_back<#0>($t2, $t0)
+     # live_nodes: LocalRoot($t0)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, LocalRoot($t1))}
+  3: $t3 := move($t1)
+     # live_nodes: LocalRoot($t0), LocalRoot($t3)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, LocalRoot($t1))}
+  4: return $t3
+}
+
+
+[variant baseline]
+public native fun vector::swap<#0>($t0|v: &mut vector<#0>, $t1|i: u64, $t2|j: u64);
+
+
+[variant baseline]
+public intrinsic fun vector::swap_remove<#0>($t0|v: &mut vector<#0>, $t1|i: u64): #0;
+
+
+[variant baseline]
+public fun Collection::borrow_mut<#0>($t0|c: &mut Collection::Collection<#0>, $t1|i: u64): &mut #0 {
+     var $t2: &mut vector<#0>
+     var $t3: &mut #0
+     # live_nodes: LocalRoot($t1), Reference($t0)
+  0: $t2 := borrow_field<Collection::Collection<#0>>.items($t0)
+     # live_nodes: LocalRoot($t1), Reference($t2)
+     # borrowed_by: Reference($t0) -> {(.items (vector<#0>), Reference($t2))}
+     # borrows_from: Reference($t2) -> {(.items (vector<#0>), Reference($t0))}
+  1: $t3 := vector::borrow_mut<#0>($t2, $t1)
+     # live_nodes: LocalRoot($t1), Reference($t3)
+     # borrowed_by: Reference($t0) -> {(.items (vector<#0>), Reference($t2))}, Reference($t2) -> {([], Reference($t3))}
+     # borrows_from: Reference($t2) -> {(.items (vector<#0>), Reference($t0))}, Reference($t3) -> {([], Reference($t2))}
+  2: return $t3
+}
+
+
+[variant baseline]
+public fun Collection::make_collection<#0>(): Collection::Collection<#0> {
+     var $t0: vector<#0>
+     var $t1: address
+     var $t2: Collection::Collection<#0>
+  0: $t0 := vector::empty<#0>()
+  1: $t1 := 0x2
+  2: $t2 := pack Collection::Collection<#0>($t0, $t1)
+  3: return $t2
+}
+
+
+[variant baseline]
+public fun Test::foo<#0>($t0|i: u64) {
+     var $t1|c: Collection::Collection<Test::Token<#0>>
+     var $t2|t: &mut Test::Token<#0> [unused]
+     var $t3: &mut Collection::Collection<Test::Token<#0>>
+     var $t4: &mut Test::Token<#0>
+     var $t5: u64
+     var $t6: &mut u64
+     # live_nodes: LocalRoot($t0)
+  0: $t1 := Collection::make_collection<Test::Token<#0>>()
+     # live_nodes: LocalRoot($t0)
+  1: $t3 := borrow_local($t1)
+     # live_nodes: LocalRoot($t0), Reference($t3)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, LocalRoot($t1))}
+  2: $t4 := Collection::borrow_mut<Test::Token<#0>>($t3, $t0)
+     # live_nodes: LocalRoot($t0), Reference($t4)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t3))}, Reference($t3) -> {(.items (vector<Test::Token<#0>>)/[], Reference($t4))}
+     # borrows_from: Reference($t3) -> {(@, LocalRoot($t1))}, Reference($t4) -> {(.items (vector<Test::Token<#0>>)/[], Reference($t3))}
+  3: $t5 := 0
+     # live_nodes: LocalRoot($t0), Reference($t4)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t3))}, Reference($t3) -> {(.items (vector<Test::Token<#0>>)/[], Reference($t4))}
+     # borrows_from: Reference($t3) -> {(@, LocalRoot($t1))}, Reference($t4) -> {(.items (vector<Test::Token<#0>>)/[], Reference($t3))}
+  4: $t6 := borrow_field<Test::Token<#0>>.value($t4)
+     # live_nodes: LocalRoot($t0), Reference($t6)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t3))}, Reference($t3) -> {(.items (vector<Test::Token<#0>>)/[], Reference($t4))}, Reference($t4) -> {(.value (u64), Reference($t6))}
+     # borrows_from: Reference($t3) -> {(@, LocalRoot($t1))}, Reference($t4) -> {(.items (vector<Test::Token<#0>>)/[], Reference($t3))}, Reference($t6) -> {(.value (u64), Reference($t4))}
+  5: write_ref($t6, $t5)
+     # live_nodes: LocalRoot($t0)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t3))}, Reference($t3) -> {(.items (vector<Test::Token<#0>>)/[], Reference($t4))}, Reference($t4) -> {(.value (u64), Reference($t6))}
+     # borrows_from: Reference($t3) -> {(@, LocalRoot($t1))}, Reference($t4) -> {(.items (vector<Test::Token<#0>>)/[], Reference($t3))}, Reference($t6) -> {(.value (u64), Reference($t4))}
+  6: return ()
+}
+
+
+
+==== borrow analysis summaries ====
+
+fun vector::borrow_mut[baseline]
+borrowed_by: Reference($t0) -> {([], Return(0))}
+borrows_from: Return(0) -> {([], Reference($t0))}
+
+fun Collection::borrow_mut[baseline]
+borrowed_by: Reference($t0) -> {(.items (vector<#0>)/[], Return(0))}
+borrows_from: Return(0) -> {(.items (vector<#0>)/[], Reference($t0))}
diff --git a/third_party/move/move-model/bytecode/tests/borrow_strong/basic_test.v2_exp b/third_party/move/move-model/bytecode/tests/borrow_strong/basic_test.v2_exp
new file mode 100644
index 0000000000000..306d38d91de86
--- /dev/null
+++ b/third_party/move/move-model/bytecode/tests/borrow_strong/basic_test.v2_exp
@@ -0,0 +1,976 @@
+============ initial translation from Move ================
+
+[variant baseline]
+fun TestBorrow::test1(): TestBorrow::R {
+     var $t0|r: TestBorrow::R
+     var $t1|x_ref: &mut u64
+     var $t2: u64
+     var $t3: u64
+     var $t4: TestBorrow::R
+     var $t5: &mut TestBorrow::R
+     var $t6: &mut u64
+     var $t7: u64
+     var $t8: &mut u64
+     var $t9: TestBorrow::R
+  0: $t2 := 3
+  1: $t3 := 4
+  2: $t4 := pack TestBorrow::R($t2, $t3)
+  3: $t0 := $t4
+  4: $t5 := borrow_local($t0)
+  5: $t6 := borrow_field<TestBorrow::R>.x($t5)
+  6: $t1 := $t6
+  7: $t7 := 0
+  8: $t8 := move($t1)
+  9: write_ref($t8, $t7)
+ 10: $t9 := move($t0)
+ 11: return $t9
+}
+
+
+[variant baseline]
+fun TestBorrow::test10($t0|b: bool): TestBorrow::R {
+     var $t1|r: TestBorrow::R
+     var $t2|r_field: &mut u64
+     var $t3|r_ref: &mut TestBorrow::R
+     var $t4: u64
+     var $t5: u64
+     var $t6: TestBorrow::R
+     var $t7: &mut TestBorrow::R
+     var $t8: &mut TestBorrow::R
+     var $t9: &mut u64
+     var $t10: bool
+     var $t11: &mut u64
+     var $t12: bool
+     var $t13: &mut TestBorrow::R
+     var $t14: &mut u64
+     var $t15: &mut TestBorrow::R
+     var $t16: u64
+     var $t17: &mut u64
+     var $t18: TestBorrow::R
+  0: $t4 := 3
+  1: $t5 := 4
+  2: $t6 := pack TestBorrow::R($t4, $t5)
+  3: $t1 := $t6
+  4: $t7 := borrow_local($t1)
+  5: $t3 := $t7
+  6: $t8 := copy($t3)
+  7: $t9 := borrow_field<TestBorrow::R>.x($t8)
+  8: $t2 := $t9
+  9: $t10 := copy($t0)
+ 10: if ($t10) goto 11 else goto 19
+ 11: label L1
+ 12: $t11 := move($t2)
+ 13: drop($t11)
+ 14: $t12 := move($t0)
+ 15: $t13 := move($t3)
+ 16: $t14 := TestBorrow::test9($t12, $t13)
+ 17: $t2 := $t14
+ 18: goto 23
+ 19: label L0
+ 20: $t15 := move($t3)
+ 21: drop($t15)
+ 22: goto 23
+ 23: label L2
+ 24: $t16 := 0
+ 25: $t17 := move($t2)
+ 26: write_ref($t17, $t16)
+ 27: $t18 := move($t1)
+ 28: return $t18
+}
+
+
+[variant baseline]
+fun TestBorrow::test2($t0|x_ref: &mut u64, $t1|v: u64) {
+     var $t2: u64
+     var $t3: &mut u64
+  0: $t2 := move($t1)
+  1: $t3 := move($t0)
+  2: write_ref($t3, $t2)
+  3: return ()
+}
+
+
+[variant baseline]
+public fun TestBorrow::test3($t0|r_ref: &mut TestBorrow::R, $t1|v: u64) {
+     var $t2: &mut TestBorrow::R
+     var $t3: &mut u64
+     var $t4: u64
+  0: $t2 := move($t0)
+  1: $t3 := borrow_field<TestBorrow::R>.x($t2)
+  2: $t4 := move($t1)
+  3: TestBorrow::test2($t3, $t4)
+  4: return ()
+}
+
+
+[variant baseline]
+fun TestBorrow::test4(): TestBorrow::R {
+     var $t0|r: TestBorrow::R
+     var $t1: u64
+     var $t2: u64
+     var $t3: TestBorrow::R
+     var $t4: &mut TestBorrow::R
+     var $t5: u64
+     var $t6: TestBorrow::R
+  0: $t1 := 3
+  1: $t2 := 4
+  2: $t3 := pack TestBorrow::R($t1, $t2)
+  3: $t0 := $t3
+  4: $t4 := borrow_local($t0)
+  5: $t5 := 0
+  6: TestBorrow::test3($t4, $t5)
+  7: $t6 := move($t0)
+  8: return $t6
+}
+
+
+[variant baseline]
+public fun TestBorrow::test5($t0|r_ref: &mut TestBorrow::R): &mut u64 {
+     var $t1: &mut TestBorrow::R
+     var $t2: &mut u64
+  0: $t1 := move($t0)
+  1: $t2 := borrow_field<TestBorrow::R>.x($t1)
+  2: return $t2
+}
+
+
+[variant baseline]
+fun TestBorrow::test6(): TestBorrow::R {
+     var $t0|r: TestBorrow::R
+     var $t1: u64
+     var $t2: u64
+     var $t3: TestBorrow::R
+     var $t4: &mut TestBorrow::R
+     var $t5: &mut u64
+     var $t6: u64
+     var $t7: TestBorrow::R
+  0: $t1 := 3
+  1: $t2 := 4
+  2: $t3 := pack TestBorrow::R($t1, $t2)
+  3: $t0 := $t3
+  4: $t4 := borrow_local($t0)
+  5: $t5 := TestBorrow::test5($t4)
+  6: $t6 := 0
+  7: TestBorrow::test2($t5, $t6)
+  8: $t7 := move($t0)
+  9: return $t7
+}
+
+
+[variant baseline]
+fun TestBorrow::test7($t0|b: bool) {
+     var $t1|r1: TestBorrow::R
+     var $t2|r2: TestBorrow::R
+     var $t3|r_ref: &mut TestBorrow::R
+     var $t4: u64
+     var $t5: u64
+     var $t6: TestBorrow::R
+     var $t7: u64
+     var $t8: u64
+     var $t9: TestBorrow::R
+     var $t10: &mut TestBorrow::R
+     var $t11: bool
+     var $t12: &mut TestBorrow::R
+     var $t13: &mut TestBorrow::R
+     var $t14: &mut TestBorrow::R
+     var $t15: u64
+  0: $t4 := 3
+  1: $t5 := 4
+  2: $t6 := pack TestBorrow::R($t4, $t5)
+  3: $t1 := $t6
+  4: $t7 := 4
+  5: $t8 := 5
+  6: $t9 := pack TestBorrow::R($t7, $t8)
+  7: $t2 := $t9
+  8: $t10 := borrow_local($t1)
+  9: $t3 := $t10
+ 10: $t11 := move($t0)
+ 11: if ($t11) goto 12 else goto 18
+ 12: label L1
+ 13: $t12 := move($t3)
+ 14: drop($t12)
+ 15: $t13 := borrow_local($t2)
+ 16: $t3 := $t13
+ 17: goto 18
+ 18: label L0
+ 19: $t14 := move($t3)
+ 20: $t15 := 0
+ 21: TestBorrow::test3($t14, $t15)
+ 22: return ()
+}
+
+
+[variant baseline]
+fun TestBorrow::test8($t0|b: bool, $t1|n: u64, $t2|r_ref: &mut TestBorrow::R) {
+     var $t3|r1: TestBorrow::R
+     var $t4|r2: TestBorrow::R
+     var $t5|t_ref: &mut TestBorrow::R
+     var $t6: u64
+     var $t7: u64
+     var $t8: TestBorrow::R
+     var $t9: u64
+     var $t10: u64
+     var $t11: TestBorrow::R
+     var $t12: &mut TestBorrow::R
+     var $t13: u64
+     var $t14: u64
+     var $t15: bool
+     var $t16: &mut TestBorrow::R
+     var $t17: u64
+     var $t18: u64
+     var $t19: u64
+     var $t20: u64
+     var $t21: bool
+     var $t22: &mut TestBorrow::R
+     var $t23: &mut TestBorrow::R
+     var $t24: u64
+     var $t25: u64
+     var $t26: u64
+     var $t27: bool
+     var $t28: &mut TestBorrow::R
+     var $t29: &mut TestBorrow::R
+     var $t30: u64
+     var $t31: &mut TestBorrow::R
+     var $t32: &mut TestBorrow::R
+     var $t33: u64
+  0: $t6 := 3
+  1: $t7 := 4
+  2: $t8 := pack TestBorrow::R($t6, $t7)
+  3: $t3 := $t8
+  4: $t9 := 4
+  5: $t10 := 5
+  6: $t11 := pack TestBorrow::R($t9, $t10)
+  7: $t4 := $t11
+  8: $t12 := borrow_local($t4)
+  9: $t5 := $t12
+ 10: goto 11
+ 11: label L6
+ 12: $t13 := 0
+ 13: $t14 := copy($t1)
+ 14: $t15 := <($t13, $t14)
+ 15: if ($t15) goto 16 else goto 41
+ 16: label L1
+ 17: goto 18
+ 18: label L2
+ 19: $t16 := move($t5)
+ 20: drop($t16)
+ 21: $t17 := copy($t1)
+ 22: $t18 := 2
+ 23: $t19 := /($t17, $t18)
+ 24: $t20 := 0
+ 25: $t21 := ==($t19, $t20)
+ 26: if ($t21) goto 27 else goto 31
+ 27: label L4
+ 28: $t22 := borrow_local($t3)
+ 29: $t5 := $t22
+ 30: goto 35
+ 31: label L3
+ 32: $t23 := borrow_local($t4)
+ 33: $t5 := $t23
+ 34: goto 35
+ 35: label L5
+ 36: $t24 := move($t1)
+ 37: $t25 := 1
+ 38: $t26 := -($t24, $t25)
+ 39: $t1 := $t26
+ 40: goto 11
+ 41: label L0
+ 42: $t27 := move($t0)
+ 43: if ($t27) goto 44 else goto 51
+ 44: label L8
+ 45: $t28 := move($t5)
+ 46: drop($t28)
+ 47: $t29 := move($t2)
+ 48: $t30 := 0
+ 49: TestBorrow::test3($t29, $t30)
+ 50: goto 58
+ 51: label L7
+ 52: $t31 := move($t2)
+ 53: drop($t31)
+ 54: $t32 := move($t5)
+ 55: $t33 := 0
+ 56: TestBorrow::test3($t32, $t33)
+ 57: goto 58
+ 58: label L9
+ 59: return ()
+}
+
+
+[variant baseline]
+fun TestBorrow::test9($t0|b: bool, $t1|r_ref: &mut TestBorrow::R): &mut u64 {
+     var $t2|r_field: &mut u64
+     var $t3: &mut TestBorrow::R
+     var $t4: &mut u64
+     var $t5: bool
+     var $t6: &mut u64
+     var $t7: &mut TestBorrow::R
+     var $t8: &mut u64
+     var $t9: &mut TestBorrow::R
+     var $t10: u64
+     var $t11: &mut u64
+     var $t12: &mut u64
+  0: $t3 := copy($t1)
+  1: $t4 := borrow_field<TestBorrow::R>.x($t3)
+  2: $t2 := $t4
+  3: $t5 := move($t0)
+  4: if ($t5) goto 5 else goto 12
+  5: label L1
+  6: $t6 := move($t2)
+  7: drop($t6)
+  8: $t7 := move($t1)
+  9: $t8 := borrow_field<TestBorrow::R>.y($t7)
+ 10: $t2 := $t8
+ 11: goto 16
+ 12: label L0
+ 13: $t9 := move($t1)
+ 14: drop($t9)
+ 15: goto 16
+ 16: label L2
+ 17: $t10 := 0
+ 18: $t11 := copy($t2)
+ 19: write_ref($t11, $t10)
+ 20: $t12 := move($t2)
+ 21: return $t12
+}
+
+============ after pipeline `borrow_strong` ================
+
+[variant baseline]
+fun TestBorrow::test1(): TestBorrow::R {
+     var $t0|r: TestBorrow::R
+     var $t1|x_ref: &mut u64 [unused]
+     var $t2: u64
+     var $t3: u64
+     var $t4: &mut TestBorrow::R
+     var $t5: &mut u64
+     var $t6: u64
+     var $t7: TestBorrow::R
+  0: $t2 := 3
+  1: $t3 := 4
+  2: $t0 := pack TestBorrow::R($t2, $t3)
+  3: $t4 := borrow_local($t0)
+     # live_nodes: Reference($t4)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t4))}
+     # borrows_from: Reference($t4) -> {(@, LocalRoot($t0))}
+  4: $t5 := borrow_field<TestBorrow::R>.x($t4)
+     # live_nodes: Reference($t5)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t4))}, Reference($t4) -> {(.x (u64), Reference($t5))}
+     # borrows_from: Reference($t4) -> {(@, LocalRoot($t0))}, Reference($t5) -> {(.x (u64), Reference($t4))}
+  5: $t6 := 0
+     # live_nodes: Reference($t5)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t4))}, Reference($t4) -> {(.x (u64), Reference($t5))}
+     # borrows_from: Reference($t4) -> {(@, LocalRoot($t0))}, Reference($t5) -> {(.x (u64), Reference($t4))}
+  6: write_ref($t5, $t6)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t4))}, Reference($t4) -> {(.x (u64), Reference($t5))}
+     # borrows_from: Reference($t4) -> {(@, LocalRoot($t0))}, Reference($t5) -> {(.x (u64), Reference($t4))}
+  7: $t7 := move($t0)
+     # live_nodes: LocalRoot($t7)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t4))}, Reference($t4) -> {(.x (u64), Reference($t5))}
+     # borrows_from: Reference($t4) -> {(@, LocalRoot($t0))}, Reference($t5) -> {(.x (u64), Reference($t4))}
+  8: return $t7
+}
+
+
+[variant baseline]
+fun TestBorrow::test10($t0|b: bool): TestBorrow::R {
+     var $t1|r: TestBorrow::R
+     var $t2|r_field: &mut u64
+     var $t3|r_ref: &mut TestBorrow::R [unused]
+     var $t4: u64
+     var $t5: u64
+     var $t6: &mut TestBorrow::R
+     var $t7: &mut u64
+     var $t8: u64
+     var $t9: TestBorrow::R
+     # live_nodes: LocalRoot($t0)
+  0: $t4 := 3
+     # live_nodes: LocalRoot($t0)
+  1: $t5 := 4
+     # live_nodes: LocalRoot($t0)
+  2: $t1 := pack TestBorrow::R($t4, $t5)
+     # live_nodes: LocalRoot($t0)
+  3: $t6 := borrow_local($t1)
+     # live_nodes: LocalRoot($t0), Reference($t6)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t1))}
+  4: $t7 := borrow_field<TestBorrow::R>.x($t6)
+     # live_nodes: LocalRoot($t0), Reference($t6), Reference($t7)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.x (u64), Reference($t7))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(.x (u64), Reference($t6))}
+  5: $t2 := $t7
+     # live_nodes: LocalRoot($t0), Reference($t2), Reference($t6), Reference($t7)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.x (u64), Reference($t7))}, Reference($t7) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(.x (u64), Reference($t6))}
+  6: if ($t0) goto 19 else goto 22
+     # live_nodes: LocalRoot($t0), Reference($t6), Reference($t7)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.x (u64), Reference($t7))}, Reference($t7) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(.x (u64), Reference($t6))}
+  7: label L1
+     # live_nodes: LocalRoot($t0), Reference($t6), Reference($t7)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.x (u64), Reference($t7))}, Reference($t7) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(.x (u64), Reference($t6))}
+  8: drop($t7)
+     # live_nodes: LocalRoot($t0), Reference($t6)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.x (u64), Reference($t7))}, Reference($t7) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(.x (u64), Reference($t6))}
+  9: $t2 := TestBorrow::test9($t0, $t6)
+     # live_nodes: LocalRoot($t0), Reference($t2)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.y (u64), Reference($t2)), (.x (u64)/@, Reference($t2)), (.x (u64), Reference($t7))}, Reference($t7) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(.y (u64), Reference($t6)), (.x (u64)/@, Reference($t6)), (@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(.x (u64), Reference($t6))}
+ 10: goto 14
+     # live_nodes: LocalRoot($t0), Reference($t2), Reference($t6)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.x (u64), Reference($t7))}, Reference($t7) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(.x (u64), Reference($t6))}
+ 11: label L0
+     # live_nodes: LocalRoot($t0), Reference($t2), Reference($t6)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.x (u64), Reference($t7))}, Reference($t7) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(.x (u64), Reference($t6))}
+ 12: drop($t6)
+     # live_nodes: LocalRoot($t0), Reference($t2)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.x (u64), Reference($t7))}, Reference($t7) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(.x (u64), Reference($t6))}
+ 13: goto 14
+     # live_nodes: LocalRoot($t0), Reference($t2)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.y (u64), Reference($t2)), (.x (u64)/@, Reference($t2)), (.x (u64), Reference($t7))}, Reference($t7) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(.y (u64), Reference($t6)), (.x (u64)/@, Reference($t6)), (@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(.x (u64), Reference($t6))}
+ 14: label L2
+     # live_nodes: LocalRoot($t0), Reference($t2)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.y (u64), Reference($t2)), (.x (u64)/@, Reference($t2)), (.x (u64), Reference($t7))}, Reference($t7) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(.y (u64), Reference($t6)), (.x (u64)/@, Reference($t6)), (@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(.x (u64), Reference($t6))}
+ 15: $t8 := 0
+     # live_nodes: LocalRoot($t0), Reference($t2)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.y (u64), Reference($t2)), (.x (u64)/@, Reference($t2)), (.x (u64), Reference($t7))}, Reference($t7) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(.y (u64), Reference($t6)), (.x (u64)/@, Reference($t6)), (@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(.x (u64), Reference($t6))}
+ 16: write_ref($t2, $t8)
+     # live_nodes: LocalRoot($t0)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.y (u64), Reference($t2)), (.x (u64)/@, Reference($t2)), (.x (u64), Reference($t7))}, Reference($t7) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(.y (u64), Reference($t6)), (.x (u64)/@, Reference($t6)), (@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(.x (u64), Reference($t6))}
+ 17: $t9 := move($t1)
+     # live_nodes: LocalRoot($t0), LocalRoot($t9)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.y (u64), Reference($t2)), (.x (u64)/@, Reference($t2)), (.x (u64), Reference($t7))}, Reference($t7) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(.y (u64), Reference($t6)), (.x (u64)/@, Reference($t6)), (@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(.x (u64), Reference($t6))}
+ 18: return $t9
+     # live_nodes: LocalRoot($t0), Reference($t2), Reference($t6), Reference($t7)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.x (u64), Reference($t7))}, Reference($t7) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(.x (u64), Reference($t6))}
+ 19: label L3
+     # live_nodes: LocalRoot($t0), Reference($t2), Reference($t6), Reference($t7)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.x (u64), Reference($t7))}, Reference($t7) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(.x (u64), Reference($t6))}
+ 20: drop($t2)
+     # live_nodes: LocalRoot($t0), Reference($t6), Reference($t7)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.x (u64), Reference($t7))}, Reference($t7) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(.x (u64), Reference($t6))}
+ 21: goto 7
+     # live_nodes: LocalRoot($t0), Reference($t2), Reference($t6), Reference($t7)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.x (u64), Reference($t7))}, Reference($t7) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(.x (u64), Reference($t6))}
+ 22: label L4
+     # live_nodes: LocalRoot($t0), Reference($t2), Reference($t6), Reference($t7)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.x (u64), Reference($t7))}, Reference($t7) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(.x (u64), Reference($t6))}
+ 23: drop($t7)
+     # live_nodes: LocalRoot($t0), Reference($t2), Reference($t6)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.x (u64), Reference($t7))}, Reference($t7) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(.x (u64), Reference($t6))}
+ 24: goto 11
+}
+
+
+[variant baseline]
+fun TestBorrow::test2($t0|x_ref: &mut u64, $t1|v: u64) {
+     # live_nodes: LocalRoot($t1), Reference($t0)
+  0: write_ref($t0, $t1)
+     # live_nodes: LocalRoot($t1)
+  1: return ()
+}
+
+
+[variant baseline]
+public fun TestBorrow::test3($t0|r_ref: &mut TestBorrow::R, $t1|v: u64) {
+     var $t2: &mut u64
+     # live_nodes: LocalRoot($t1), Reference($t0)
+  0: $t2 := borrow_field<TestBorrow::R>.x($t0)
+     # live_nodes: LocalRoot($t1), Reference($t2)
+     # borrowed_by: Reference($t0) -> {(.x (u64), Reference($t2))}
+     # borrows_from: Reference($t2) -> {(.x (u64), Reference($t0))}
+  1: TestBorrow::test2($t2, $t1)
+     # live_nodes: LocalRoot($t1)
+     # borrowed_by: Reference($t0) -> {(.x (u64), Reference($t2))}
+     # borrows_from: Reference($t2) -> {(.x (u64), Reference($t0))}
+  2: return ()
+}
+
+
+[variant baseline]
+fun TestBorrow::test4(): TestBorrow::R {
+     var $t0|r: TestBorrow::R
+     var $t1: u64
+     var $t2: u64
+     var $t3: &mut TestBorrow::R
+     var $t4: u64
+     var $t5: TestBorrow::R
+  0: $t1 := 3
+  1: $t2 := 4
+  2: $t0 := pack TestBorrow::R($t1, $t2)
+  3: $t3 := borrow_local($t0)
+     # live_nodes: Reference($t3)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, LocalRoot($t0))}
+  4: $t4 := 0
+     # live_nodes: Reference($t3)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, LocalRoot($t0))}
+  5: TestBorrow::test3($t3, $t4)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, LocalRoot($t0))}
+  6: $t5 := move($t0)
+     # live_nodes: LocalRoot($t5)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, LocalRoot($t0))}
+  7: return $t5
+}
+
+
+[variant baseline]
+public fun TestBorrow::test5($t0|r_ref: &mut TestBorrow::R): &mut u64 {
+     var $t1: &mut u64
+     # live_nodes: Reference($t0)
+  0: $t1 := borrow_field<TestBorrow::R>.x($t0)
+     # live_nodes: Reference($t1)
+     # borrowed_by: Reference($t0) -> {(.x (u64), Reference($t1))}
+     # borrows_from: Reference($t1) -> {(.x (u64), Reference($t0))}
+  1: return $t1
+}
+
+
+[variant baseline]
+fun TestBorrow::test6(): TestBorrow::R {
+     var $t0|r: TestBorrow::R
+     var $t1: u64
+     var $t2: u64
+     var $t3: &mut TestBorrow::R
+     var $t4: &mut u64
+     var $t5: u64
+     var $t6: TestBorrow::R
+  0: $t1 := 3
+  1: $t2 := 4
+  2: $t0 := pack TestBorrow::R($t1, $t2)
+  3: $t3 := borrow_local($t0)
+     # live_nodes: Reference($t3)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, LocalRoot($t0))}
+  4: $t4 := TestBorrow::test5($t3)
+     # live_nodes: Reference($t4)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t4))}
+     # borrows_from: Reference($t3) -> {(@, LocalRoot($t0))}, Reference($t4) -> {(.x (u64), Reference($t3))}
+  5: $t5 := 0
+     # live_nodes: Reference($t4)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t4))}
+     # borrows_from: Reference($t3) -> {(@, LocalRoot($t0))}, Reference($t4) -> {(.x (u64), Reference($t3))}
+  6: TestBorrow::test2($t4, $t5)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t4))}
+     # borrows_from: Reference($t3) -> {(@, LocalRoot($t0))}, Reference($t4) -> {(.x (u64), Reference($t3))}
+  7: $t6 := move($t0)
+     # live_nodes: LocalRoot($t6)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t4))}
+     # borrows_from: Reference($t3) -> {(@, LocalRoot($t0))}, Reference($t4) -> {(.x (u64), Reference($t3))}
+  8: return $t6
+}
+
+
+[variant baseline]
+fun TestBorrow::test7($t0|b: bool) {
+     var $t1|r1: TestBorrow::R
+     var $t2|r2: TestBorrow::R
+     var $t3|r_ref: &mut TestBorrow::R
+     var $t4: u64
+     var $t5: u64
+     var $t6: u64
+     var $t7: u64
+     var $t8: &mut TestBorrow::R
+     var $t9: &mut TestBorrow::R
+     var $t10: u64
+     # live_nodes: LocalRoot($t0)
+  0: $t4 := 3
+     # live_nodes: LocalRoot($t0)
+  1: $t5 := 4
+     # live_nodes: LocalRoot($t0)
+  2: $t1 := pack TestBorrow::R($t4, $t5)
+     # live_nodes: LocalRoot($t0)
+  3: $t6 := 4
+     # live_nodes: LocalRoot($t0)
+  4: $t7 := 5
+     # live_nodes: LocalRoot($t0)
+  5: $t2 := pack TestBorrow::R($t6, $t7)
+     # live_nodes: LocalRoot($t0)
+  6: $t8 := borrow_local($t1)
+     # live_nodes: LocalRoot($t0), Reference($t8)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t8))}
+     # borrows_from: Reference($t8) -> {(@, LocalRoot($t1))}
+  7: $t3 := $t8
+     # live_nodes: LocalRoot($t0), Reference($t3), Reference($t8)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t8))}, Reference($t8) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t8))}, Reference($t8) -> {(@, LocalRoot($t1))}
+  8: if ($t0) goto 18 else goto 21
+     # live_nodes: LocalRoot($t0), Reference($t8)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t8))}, Reference($t8) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t8))}, Reference($t8) -> {(@, LocalRoot($t1))}
+  9: label L1
+     # live_nodes: LocalRoot($t0), Reference($t8)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t8))}, Reference($t8) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t8))}, Reference($t8) -> {(@, LocalRoot($t1))}
+ 10: drop($t8)
+     # live_nodes: LocalRoot($t0)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t8))}, Reference($t8) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t8))}, Reference($t8) -> {(@, LocalRoot($t1))}
+ 11: $t9 := borrow_local($t2)
+     # live_nodes: LocalRoot($t0), Reference($t9)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t8))}, LocalRoot($t2) -> {(@, Reference($t9))}, Reference($t8) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t8))}, Reference($t8) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t2))}
+ 12: $t3 := $t9
+     # live_nodes: LocalRoot($t0), Reference($t3)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t8))}, LocalRoot($t2) -> {(@, Reference($t9))}, Reference($t8) -> {(@, Reference($t3))}, Reference($t9) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t8)), (@, Reference($t9))}, Reference($t8) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t2))}
+ 13: goto 14
+     # live_nodes: LocalRoot($t0), Reference($t3)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t8))}, LocalRoot($t2) -> {(@, Reference($t9))}, Reference($t8) -> {(@, Reference($t3))}, Reference($t9) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t8)), (@, Reference($t9))}, Reference($t8) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t2))}
+ 14: label L0
+     # live_nodes: LocalRoot($t0), Reference($t3)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t8))}, LocalRoot($t2) -> {(@, Reference($t9))}, Reference($t8) -> {(@, Reference($t3))}, Reference($t9) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t8)), (@, Reference($t9))}, Reference($t8) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t2))}
+ 15: $t10 := 0
+     # live_nodes: LocalRoot($t0), Reference($t3)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t8))}, LocalRoot($t2) -> {(@, Reference($t9))}, Reference($t8) -> {(@, Reference($t3))}, Reference($t9) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t8)), (@, Reference($t9))}, Reference($t8) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t2))}
+ 16: TestBorrow::test3($t3, $t10)
+     # live_nodes: LocalRoot($t0)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t8))}, LocalRoot($t2) -> {(@, Reference($t9))}, Reference($t8) -> {(@, Reference($t3))}, Reference($t9) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t8)), (@, Reference($t9))}, Reference($t8) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t2))}
+ 17: return ()
+     # live_nodes: LocalRoot($t0), Reference($t3), Reference($t8)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t8))}, Reference($t8) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t8))}, Reference($t8) -> {(@, LocalRoot($t1))}
+ 18: label L2
+     # live_nodes: LocalRoot($t0), Reference($t3), Reference($t8)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t8))}, Reference($t8) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t8))}, Reference($t8) -> {(@, LocalRoot($t1))}
+ 19: drop($t3)
+     # live_nodes: LocalRoot($t0), Reference($t8)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t8))}, Reference($t8) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t8))}, Reference($t8) -> {(@, LocalRoot($t1))}
+ 20: goto 9
+     # live_nodes: LocalRoot($t0), Reference($t3), Reference($t8)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t8))}, Reference($t8) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t8))}, Reference($t8) -> {(@, LocalRoot($t1))}
+ 21: label L3
+     # live_nodes: LocalRoot($t0), Reference($t3), Reference($t8)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t8))}, Reference($t8) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t8))}, Reference($t8) -> {(@, LocalRoot($t1))}
+ 22: drop($t8)
+     # live_nodes: LocalRoot($t0), Reference($t3)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t8))}, Reference($t8) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t8))}, Reference($t8) -> {(@, LocalRoot($t1))}
+ 23: goto 14
+}
+
+
+[variant baseline]
+fun TestBorrow::test8($t0|b: bool, $t1|n: u64, $t2|r_ref: &mut TestBorrow::R) {
+     var $t3|r1: TestBorrow::R
+     var $t4|r2: TestBorrow::R
+     var $t5|t_ref: &mut TestBorrow::R
+     var $t6: u64
+     var $t7: u64
+     var $t8: u64
+     var $t9: u64
+     var $t10: &mut TestBorrow::R
+     var $t11: u64
+     var $t12: bool
+     var $t13: u64
+     var $t14: u64
+     var $t15: u64
+     var $t16: bool
+     var $t17: &mut TestBorrow::R
+     var $t18: &mut TestBorrow::R
+     var $t19: u64
+     var $t20: u64
+     var $t21: u64
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+  0: $t6 := 3
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+  1: $t7 := 4
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+  2: $t3 := pack TestBorrow::R($t6, $t7)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+  3: $t8 := 4
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+  4: $t9 := 5
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+  5: $t4 := pack TestBorrow::R($t8, $t9)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+  6: $t10 := borrow_local($t4)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t10)
+     # borrowed_by: LocalRoot($t4) -> {(@, Reference($t10))}
+     # borrows_from: Reference($t10) -> {(@, LocalRoot($t4))}
+  7: $t5 := $t10
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t4) -> {(@, Reference($t10))}, Reference($t10) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10))}, Reference($t10) -> {(@, LocalRoot($t4))}
+  8: goto 9
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+  9: label L6
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 10: $t11 := 0
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 11: $t12 := <($t11, $t1)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 12: if ($t12) goto 13 else goto 34
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 13: label L1
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 14: goto 15
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 15: label L2
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 16: drop($t5)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 17: $t13 := 2
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 18: $t14 := /($t1, $t13)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 19: $t15 := 0
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 20: $t16 := ==($t14, $t15)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 21: if ($t16) goto 22 else goto 26
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 22: label L4
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 23: $t17 := borrow_local($t3)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t17)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 24: $t5 := $t17
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 25: goto 30
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 26: label L3
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 27: $t18 := borrow_local($t4)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t18)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 28: $t5 := $t18
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 29: goto 30
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 30: label L5
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 31: $t19 := 1
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 32: $t1 := -($t1, $t19)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 33: goto 9
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 34: label L0
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 35: if ($t0) goto 36 else goto 41
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 36: label L8
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 37: drop($t5)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 38: $t20 := 0
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 39: TestBorrow::test3($t2, $t20)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 40: goto 46
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 41: label L7
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 42: drop($t2)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 43: $t21 := 0
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 44: TestBorrow::test3($t5, $t21)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 45: goto 46
+     # live_nodes: LocalRoot($t0), LocalRoot($t1)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 46: label L9
+     # live_nodes: LocalRoot($t0), LocalRoot($t1)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 47: return ()
+}
+
+
+[variant baseline]
+fun TestBorrow::test9($t0|b: bool, $t1|r_ref: &mut TestBorrow::R): &mut u64 {
+     var $t2|r_field: &mut u64
+     var $t3: &mut u64
+     var $t4: u64
+     # live_nodes: LocalRoot($t0), Reference($t1)
+  0: $t3 := borrow_field<TestBorrow::R>.x($t1)
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t3)
+     # borrowed_by: Reference($t1) -> {(.x (u64), Reference($t3))}
+     # borrows_from: Reference($t3) -> {(.x (u64), Reference($t1))}
+  1: $t2 := $t3
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2), Reference($t3)
+     # borrowed_by: Reference($t1) -> {(.x (u64), Reference($t3))}, Reference($t3) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t1))}
+  2: if ($t0) goto 14 else goto 17
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t3)
+     # borrowed_by: Reference($t1) -> {(.x (u64), Reference($t3))}, Reference($t3) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t1))}
+  3: label L1
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t3)
+     # borrowed_by: Reference($t1) -> {(.x (u64), Reference($t3))}, Reference($t3) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t1))}
+  4: drop($t3)
+     # live_nodes: LocalRoot($t0), Reference($t1)
+     # borrowed_by: Reference($t1) -> {(.x (u64), Reference($t3))}, Reference($t3) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t1))}
+  5: $t2 := borrow_field<TestBorrow::R>.y($t1)
+     # live_nodes: LocalRoot($t0), Reference($t2)
+     # borrowed_by: Reference($t1) -> {(.y (u64), Reference($t2)), (.x (u64), Reference($t3))}, Reference($t3) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(.y (u64), Reference($t1)), (@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t1))}
+  6: goto 10
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2)
+     # borrowed_by: Reference($t1) -> {(.x (u64), Reference($t3))}, Reference($t3) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t1))}
+  7: label L0
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2)
+     # borrowed_by: Reference($t1) -> {(.x (u64), Reference($t3))}, Reference($t3) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t1))}
+  8: drop($t1)
+     # live_nodes: LocalRoot($t0), Reference($t2)
+     # borrowed_by: Reference($t1) -> {(.x (u64), Reference($t3))}, Reference($t3) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t1))}
+  9: goto 10
+     # live_nodes: LocalRoot($t0), Reference($t2)
+     # borrowed_by: Reference($t1) -> {(.y (u64), Reference($t2)), (.x (u64), Reference($t3))}, Reference($t3) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(.y (u64), Reference($t1)), (@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t1))}
+ 10: label L2
+     # live_nodes: LocalRoot($t0), Reference($t2)
+     # borrowed_by: Reference($t1) -> {(.y (u64), Reference($t2)), (.x (u64), Reference($t3))}, Reference($t3) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(.y (u64), Reference($t1)), (@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t1))}
+ 11: $t4 := 0
+     # live_nodes: LocalRoot($t0), Reference($t2)
+     # borrowed_by: Reference($t1) -> {(.y (u64), Reference($t2)), (.x (u64), Reference($t3))}, Reference($t3) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(.y (u64), Reference($t1)), (@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t1))}
+ 12: write_ref($t2, $t4)
+     # live_nodes: LocalRoot($t0), Reference($t2)
+     # borrowed_by: Reference($t1) -> {(.y (u64), Reference($t2)), (.x (u64), Reference($t3))}, Reference($t3) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(.y (u64), Reference($t1)), (@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t1))}
+ 13: return $t2
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2), Reference($t3)
+     # borrowed_by: Reference($t1) -> {(.x (u64), Reference($t3))}, Reference($t3) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t1))}
+ 14: label L3
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2), Reference($t3)
+     # borrowed_by: Reference($t1) -> {(.x (u64), Reference($t3))}, Reference($t3) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t1))}
+ 15: drop($t2)
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t3)
+     # borrowed_by: Reference($t1) -> {(.x (u64), Reference($t3))}, Reference($t3) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t1))}
+ 16: goto 3
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2), Reference($t3)
+     # borrowed_by: Reference($t1) -> {(.x (u64), Reference($t3))}, Reference($t3) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t1))}
+ 17: label L4
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2), Reference($t3)
+     # borrowed_by: Reference($t1) -> {(.x (u64), Reference($t3))}, Reference($t3) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t1))}
+ 18: drop($t3)
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2)
+     # borrowed_by: Reference($t1) -> {(.x (u64), Reference($t3))}, Reference($t3) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t1))}
+ 19: goto 7
+}
+
+
+
+==== borrow analysis summaries ====
+
+fun TestBorrow::test5[baseline]
+borrowed_by: Reference($t0) -> {(.x (u64), Return(0))}
+borrows_from: Return(0) -> {(.x (u64), Reference($t0))}
+
+fun TestBorrow::test9[baseline]
+borrowed_by: Reference($t1) -> {(.y (u64), Return(0)), (.x (u64)/@, Return(0))}
+borrows_from: Return(0) -> {(.y (u64), Reference($t1)), (.x (u64)/@, Reference($t1))}
diff --git a/third_party/move/move-model/bytecode/tests/borrow_strong/mut_ref.v2_exp b/third_party/move/move-model/bytecode/tests/borrow_strong/mut_ref.v2_exp
new file mode 100644
index 0000000000000..d241c08064816
--- /dev/null
+++ b/third_party/move/move-model/bytecode/tests/borrow_strong/mut_ref.v2_exp
@@ -0,0 +1,1152 @@
+============ initial translation from Move ================
+
+[variant baseline]
+public intrinsic fun vector::contains<#0>($t0|v: &vector<#0>, $t1|e: &#0): bool;
+
+
+[variant baseline]
+public intrinsic fun vector::index_of<#0>($t0|v: &vector<#0>, $t1|e: &#0): (bool, u64);
+
+
+[variant baseline]
+public intrinsic fun vector::append<#0>($t0|lhs: &mut vector<#0>, $t1|other: vector<#0>);
+
+
+[variant baseline]
+public native fun vector::borrow<#0>($t0|v: &vector<#0>, $t1|i: u64): &#0;
+
+
+[variant baseline]
+public native fun vector::borrow_mut<#0>($t0|v: &mut vector<#0>, $t1|i: u64): &mut #0;
+
+
+[variant baseline]
+public native fun vector::destroy_empty<#0>($t0|v: vector<#0>);
+
+
+[variant baseline]
+public native fun vector::empty<#0>(): vector<#0>;
+
+
+[variant baseline]
+public intrinsic fun vector::is_empty<#0>($t0|v: &vector<#0>): bool;
+
+
+[variant baseline]
+public native fun vector::length<#0>($t0|v: &vector<#0>): u64;
+
+
+[variant baseline]
+public native fun vector::pop_back<#0>($t0|v: &mut vector<#0>): #0;
+
+
+[variant baseline]
+public native fun vector::push_back<#0>($t0|v: &mut vector<#0>, $t1|e: #0);
+
+
+[variant baseline]
+public intrinsic fun vector::remove<#0>($t0|v: &mut vector<#0>, $t1|i: u64): #0;
+
+
+[variant baseline]
+public intrinsic fun vector::reverse<#0>($t0|v: &mut vector<#0>);
+
+
+[variant baseline]
+public fun vector::singleton<#0>($t0|e: #0): vector<#0> {
+     var $t1|v: vector<#0>
+     var $t2: vector<#0>
+     var $t3: &mut vector<#0>
+     var $t4: #0
+     var $t5: vector<#0>
+  0: $t2 := vector::empty<#0>()
+  1: $t1 := $t2
+  2: $t3 := borrow_local($t1)
+  3: $t4 := move($t0)
+  4: vector::push_back<#0>($t3, $t4)
+  5: $t5 := move($t1)
+  6: return $t5
+}
+
+
+[variant baseline]
+public native fun vector::swap<#0>($t0|v: &mut vector<#0>, $t1|i: u64, $t2|j: u64);
+
+
+[variant baseline]
+public intrinsic fun vector::swap_remove<#0>($t0|v: &mut vector<#0>, $t1|i: u64): #0;
+
+
+[variant baseline]
+fun TestMutRef::call_return_ref_different_path($t0|b: bool): TestMutRef::N {
+     var $t1|r: &mut u64
+     var $t2|x: TestMutRef::N
+     var $t3: u64
+     var $t4: u64
+     var $t5: TestMutRef::T
+     var $t6: TestMutRef::N
+     var $t7: bool
+     var $t8: &mut TestMutRef::N
+     var $t9: &mut u64
+     var $t10: u64
+     var $t11: &mut u64
+     var $t12: TestMutRef::N
+  0: $t3 := 1
+  1: $t4 := 2
+  2: $t5 := pack TestMutRef::T($t4)
+  3: $t6 := pack TestMutRef::N($t3, $t5)
+  4: $t2 := $t6
+  5: $t7 := move($t0)
+  6: $t8 := borrow_local($t2)
+  7: $t9 := TestMutRef::return_ref_different_path($t7, $t8)
+  8: $t1 := $t9
+  9: $t10 := 5
+ 10: $t11 := move($t1)
+ 11: write_ref($t11, $t10)
+ 12: $t12 := move($t2)
+ 13: return $t12
+}
+
+
+[variant baseline]
+fun TestMutRef::call_return_ref_different_path_vec($t0|b: bool): TestMutRef::V {
+     var $t1|is: vector<u64>
+     var $t2|r: &mut u64
+     var $t3|ts: vector<TestMutRef::T>
+     var $t4|x: TestMutRef::V
+     var $t5: vector<u64>
+     var $t6: vector<TestMutRef::T>
+     var $t7: &mut vector<u64>
+     var $t8: u64
+     var $t9: &mut vector<u64>
+     var $t10: u64
+     var $t11: vector<u64>
+     var $t12: vector<TestMutRef::T>
+     var $t13: TestMutRef::V
+     var $t14: bool
+     var $t15: &mut TestMutRef::V
+     var $t16: &mut u64
+     var $t17: u64
+     var $t18: &mut u64
+     var $t19: TestMutRef::V
+  0: $t5 := vector::empty<u64>()
+  1: $t1 := $t5
+  2: $t6 := vector::empty<TestMutRef::T>()
+  3: $t3 := $t6
+  4: $t7 := borrow_local($t1)
+  5: $t8 := 1
+  6: vector::push_back<u64>($t7, $t8)
+  7: $t9 := borrow_local($t1)
+  8: $t10 := 2
+  9: vector::push_back<u64>($t9, $t10)
+ 10: $t11 := move($t1)
+ 11: $t12 := move($t3)
+ 12: $t13 := pack TestMutRef::V($t11, $t12)
+ 13: $t4 := $t13
+ 14: $t14 := move($t0)
+ 15: $t15 := borrow_local($t4)
+ 16: $t16 := TestMutRef::return_ref_different_path_vec($t14, $t15)
+ 17: $t2 := $t16
+ 18: $t17 := 5
+ 19: $t18 := move($t2)
+ 20: write_ref($t18, $t17)
+ 21: $t19 := move($t4)
+ 22: return $t19
+}
+
+
+[variant baseline]
+fun TestMutRef::call_return_ref_different_path_vec2($t0|b: bool): TestMutRef::V {
+     var $t1|is: vector<u64>
+     var $t2|r: &mut u64
+     var $t3|ts: vector<TestMutRef::T>
+     var $t4|x: TestMutRef::V
+     var $t5: vector<u64>
+     var $t6: vector<TestMutRef::T>
+     var $t7: &mut vector<u64>
+     var $t8: u64
+     var $t9: &mut vector<u64>
+     var $t10: u64
+     var $t11: &mut vector<TestMutRef::T>
+     var $t12: u64
+     var $t13: TestMutRef::T
+     var $t14: &mut vector<TestMutRef::T>
+     var $t15: u64
+     var $t16: TestMutRef::T
+     var $t17: vector<u64>
+     var $t18: vector<TestMutRef::T>
+     var $t19: TestMutRef::V
+     var $t20: bool
+     var $t21: &mut TestMutRef::V
+     var $t22: &mut u64
+     var $t23: u64
+     var $t24: &mut u64
+     var $t25: TestMutRef::V
+  0: $t5 := vector::empty<u64>()
+  1: $t1 := $t5
+  2: $t6 := vector::empty<TestMutRef::T>()
+  3: $t3 := $t6
+  4: $t7 := borrow_local($t1)
+  5: $t8 := 1
+  6: vector::push_back<u64>($t7, $t8)
+  7: $t9 := borrow_local($t1)
+  8: $t10 := 2
+  9: vector::push_back<u64>($t9, $t10)
+ 10: $t11 := borrow_local($t3)
+ 11: $t12 := 3
+ 12: $t13 := pack TestMutRef::T($t12)
+ 13: vector::push_back<TestMutRef::T>($t11, $t13)
+ 14: $t14 := borrow_local($t3)
+ 15: $t15 := 4
+ 16: $t16 := pack TestMutRef::T($t15)
+ 17: vector::push_back<TestMutRef::T>($t14, $t16)
+ 18: $t17 := move($t1)
+ 19: $t18 := move($t3)
+ 20: $t19 := pack TestMutRef::V($t17, $t18)
+ 21: $t4 := $t19
+ 22: $t20 := move($t0)
+ 23: $t21 := borrow_local($t4)
+ 24: $t22 := TestMutRef::return_ref_different_path_vec2($t20, $t21)
+ 25: $t2 := $t22
+ 26: $t23 := 5
+ 27: $t24 := move($t2)
+ 28: write_ref($t24, $t23)
+ 29: $t25 := move($t4)
+ 30: return $t25
+}
+
+
+[variant baseline]
+fun TestMutRef::call_return_ref_different_path_vec2_incorrect($t0|b: bool): TestMutRef::V {
+     var $t1|is: vector<u64>
+     var $t2|r: &mut u64
+     var $t3|ts: vector<TestMutRef::T>
+     var $t4|x: TestMutRef::V
+     var $t5: vector<u64>
+     var $t6: vector<TestMutRef::T>
+     var $t7: &mut vector<u64>
+     var $t8: u64
+     var $t9: &mut vector<u64>
+     var $t10: u64
+     var $t11: &mut vector<TestMutRef::T>
+     var $t12: u64
+     var $t13: TestMutRef::T
+     var $t14: &mut vector<TestMutRef::T>
+     var $t15: u64
+     var $t16: TestMutRef::T
+     var $t17: vector<u64>
+     var $t18: vector<TestMutRef::T>
+     var $t19: TestMutRef::V
+     var $t20: bool
+     var $t21: &mut TestMutRef::V
+     var $t22: &mut u64
+     var $t23: u64
+     var $t24: &mut u64
+     var $t25: TestMutRef::V
+  0: $t5 := vector::empty<u64>()
+  1: $t1 := $t5
+  2: $t6 := vector::empty<TestMutRef::T>()
+  3: $t3 := $t6
+  4: $t7 := borrow_local($t1)
+  5: $t8 := 1
+  6: vector::push_back<u64>($t7, $t8)
+  7: $t9 := borrow_local($t1)
+  8: $t10 := 2
+  9: vector::push_back<u64>($t9, $t10)
+ 10: $t11 := borrow_local($t3)
+ 11: $t12 := 3
+ 12: $t13 := pack TestMutRef::T($t12)
+ 13: vector::push_back<TestMutRef::T>($t11, $t13)
+ 14: $t14 := borrow_local($t3)
+ 15: $t15 := 4
+ 16: $t16 := pack TestMutRef::T($t15)
+ 17: vector::push_back<TestMutRef::T>($t14, $t16)
+ 18: $t17 := move($t1)
+ 19: $t18 := move($t3)
+ 20: $t19 := pack TestMutRef::V($t17, $t18)
+ 21: $t4 := $t19
+ 22: $t20 := move($t0)
+ 23: $t21 := borrow_local($t4)
+ 24: $t22 := TestMutRef::return_ref_different_path_vec2($t20, $t21)
+ 25: $t2 := $t22
+ 26: $t23 := 0
+ 27: $t24 := move($t2)
+ 28: write_ref($t24, $t23)
+ 29: $t25 := move($t4)
+ 30: return $t25
+}
+
+
+[variant baseline]
+fun TestMutRef::call_return_ref_different_root($t0|b: bool): (TestMutRef::T, TestMutRef::R) {
+     var $t1|r: &mut u64
+     var $t2|x: TestMutRef::T
+     var $t3|y: TestMutRef::R
+     var $t4: u64
+     var $t5: TestMutRef::T
+     var $t6: u64
+     var $t7: TestMutRef::R
+     var $t8: bool
+     var $t9: &mut TestMutRef::T
+     var $t10: &mut TestMutRef::R
+     var $t11: &mut u64
+     var $t12: u64
+     var $t13: &mut u64
+     var $t14: TestMutRef::T
+     var $t15: TestMutRef::R
+  0: $t4 := 1
+  1: $t5 := pack TestMutRef::T($t4)
+  2: $t2 := $t5
+  3: $t6 := 10
+  4: $t7 := pack TestMutRef::R($t6)
+  5: $t3 := $t7
+  6: $t8 := move($t0)
+  7: $t9 := borrow_local($t2)
+  8: $t10 := borrow_local($t3)
+  9: $t11 := TestMutRef::return_ref_different_root($t8, $t9, $t10)
+ 10: $t1 := $t11
+ 11: $t12 := 5
+ 12: $t13 := move($t1)
+ 13: write_ref($t13, $t12)
+ 14: $t14 := move($t2)
+ 15: $t15 := move($t3)
+ 16: return ($t14, $t15)
+}
+
+
+[variant baseline]
+fun TestMutRef::return_ref_different_path($t0|b: bool, $t1|x: &mut TestMutRef::N): &mut u64 {
+     var $t2|tmp#$2: &mut u64
+     var $t3: bool
+     var $t4: &mut TestMutRef::N
+     var $t5: &mut u64
+     var $t6: &mut TestMutRef::N
+     var $t7: &mut TestMutRef::T
+     var $t8: &mut u64
+     var $t9: &mut u64
+  0: $t3 := move($t0)
+  1: if ($t3) goto 2 else goto 7
+  2: label L1
+  3: $t4 := move($t1)
+  4: $t5 := borrow_field<TestMutRef::N>.value($t4)
+  5: $t2 := $t5
+  6: goto 13
+  7: label L0
+  8: $t6 := move($t1)
+  9: $t7 := borrow_field<TestMutRef::N>.t($t6)
+ 10: $t8 := borrow_field<TestMutRef::T>.value($t7)
+ 11: $t2 := $t8
+ 12: goto 13
+ 13: label L2
+ 14: $t9 := move($t2)
+ 15: return $t9
+}
+
+
+[variant baseline]
+fun TestMutRef::return_ref_different_path_vec($t0|b: bool, $t1|x: &mut TestMutRef::V): &mut u64 {
+     var $t2|tmp#$2: &mut u64
+     var $t3: bool
+     var $t4: &mut TestMutRef::V
+     var $t5: &mut vector<u64>
+     var $t6: u64
+     var $t7: &mut u64
+     var $t8: &mut TestMutRef::V
+     var $t9: &mut vector<u64>
+     var $t10: u64
+     var $t11: &mut u64
+     var $t12: &mut u64
+  0: $t3 := move($t0)
+  1: if ($t3) goto 2 else goto 9
+  2: label L1
+  3: $t4 := move($t1)
+  4: $t5 := borrow_field<TestMutRef::V>.is($t4)
+  5: $t6 := 1
+  6: $t7 := vector::borrow_mut<u64>($t5, $t6)
+  7: $t2 := $t7
+  8: goto 16
+  9: label L0
+ 10: $t8 := move($t1)
+ 11: $t9 := borrow_field<TestMutRef::V>.is($t8)
+ 12: $t10 := 0
+ 13: $t11 := vector::borrow_mut<u64>($t9, $t10)
+ 14: $t2 := $t11
+ 15: goto 16
+ 16: label L2
+ 17: $t12 := move($t2)
+ 18: return $t12
+}
+
+
+[variant baseline]
+fun TestMutRef::return_ref_different_path_vec2($t0|b: bool, $t1|x: &mut TestMutRef::V): &mut u64 {
+     var $t2|tmp#$2: &mut u64
+     var $t3: bool
+     var $t4: &mut TestMutRef::V
+     var $t5: &mut vector<u64>
+     var $t6: u64
+     var $t7: &mut u64
+     var $t8: &mut TestMutRef::V
+     var $t9: &mut vector<TestMutRef::T>
+     var $t10: u64
+     var $t11: &mut TestMutRef::T
+     var $t12: &mut u64
+     var $t13: &mut u64
+  0: $t3 := move($t0)
+  1: if ($t3) goto 2 else goto 9
+  2: label L1
+  3: $t4 := move($t1)
+  4: $t5 := borrow_field<TestMutRef::V>.is($t4)
+  5: $t6 := 1
+  6: $t7 := vector::borrow_mut<u64>($t5, $t6)
+  7: $t2 := $t7
+  8: goto 17
+  9: label L0
+ 10: $t8 := move($t1)
+ 11: $t9 := borrow_field<TestMutRef::V>.ts($t8)
+ 12: $t10 := 0
+ 13: $t11 := vector::borrow_mut<TestMutRef::T>($t9, $t10)
+ 14: $t12 := borrow_field<TestMutRef::T>.value($t11)
+ 15: $t2 := $t12
+ 16: goto 17
+ 17: label L2
+ 18: $t13 := move($t2)
+ 19: return $t13
+}
+
+
+[variant baseline]
+fun TestMutRef::return_ref_different_root($t0|b: bool, $t1|x: &mut TestMutRef::T, $t2|y: &mut TestMutRef::R): &mut u64 {
+     var $t3|tmp#$3: &mut u64
+     var $t4: bool
+     var $t5: &mut TestMutRef::R
+     var $t6: &mut TestMutRef::T
+     var $t7: &mut u64
+     var $t8: &mut TestMutRef::T
+     var $t9: &mut TestMutRef::R
+     var $t10: &mut u64
+     var $t11: &mut u64
+  0: $t4 := move($t0)
+  1: if ($t4) goto 2 else goto 9
+  2: label L1
+  3: $t5 := move($t2)
+  4: drop($t5)
+  5: $t6 := move($t1)
+  6: $t7 := borrow_field<TestMutRef::T>.value($t6)
+  7: $t3 := $t7
+  8: goto 16
+  9: label L0
+ 10: $t8 := move($t1)
+ 11: drop($t8)
+ 12: $t9 := move($t2)
+ 13: $t10 := borrow_field<TestMutRef::R>.value($t9)
+ 14: $t3 := $t10
+ 15: goto 16
+ 16: label L2
+ 17: $t11 := move($t3)
+ 18: return $t11
+}
+
+============ after pipeline `borrow_strong` ================
+
+[variant baseline]
+public intrinsic fun vector::contains<#0>($t0|v: &vector<#0>, $t1|e: &#0): bool;
+
+
+[variant baseline]
+public intrinsic fun vector::index_of<#0>($t0|v: &vector<#0>, $t1|e: &#0): (bool, u64);
+
+
+[variant baseline]
+public intrinsic fun vector::append<#0>($t0|lhs: &mut vector<#0>, $t1|other: vector<#0>);
+
+
+[variant baseline]
+public native fun vector::borrow<#0>($t0|v: &vector<#0>, $t1|i: u64): &#0;
+
+
+[variant baseline]
+public native fun vector::borrow_mut<#0>($t0|v: &mut vector<#0>, $t1|i: u64): &mut #0;
+
+
+[variant baseline]
+public native fun vector::destroy_empty<#0>($t0|v: vector<#0>);
+
+
+[variant baseline]
+public native fun vector::empty<#0>(): vector<#0>;
+
+
+[variant baseline]
+public intrinsic fun vector::is_empty<#0>($t0|v: &vector<#0>): bool;
+
+
+[variant baseline]
+public native fun vector::length<#0>($t0|v: &vector<#0>): u64;
+
+
+[variant baseline]
+public native fun vector::pop_back<#0>($t0|v: &mut vector<#0>): #0;
+
+
+[variant baseline]
+public native fun vector::push_back<#0>($t0|v: &mut vector<#0>, $t1|e: #0);
+
+
+[variant baseline]
+public intrinsic fun vector::remove<#0>($t0|v: &mut vector<#0>, $t1|i: u64): #0;
+
+
+[variant baseline]
+public intrinsic fun vector::reverse<#0>($t0|v: &mut vector<#0>);
+
+
+[variant baseline]
+public fun vector::singleton<#0>($t0|e: #0): vector<#0> {
+     var $t1|v: vector<#0>
+     var $t2: &mut vector<#0>
+     var $t3: vector<#0>
+     # live_nodes: LocalRoot($t0)
+  0: $t1 := vector::empty<#0>()
+     # live_nodes: LocalRoot($t0)
+  1: $t2 := borrow_local($t1)
+     # live_nodes: LocalRoot($t0), Reference($t2)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, LocalRoot($t1))}
+  2: vector::push_back<#0>($t2, $t0)
+     # live_nodes: LocalRoot($t0)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, LocalRoot($t1))}
+  3: $t3 := move($t1)
+     # live_nodes: LocalRoot($t0), LocalRoot($t3)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, LocalRoot($t1))}
+  4: return $t3
+}
+
+
+[variant baseline]
+public native fun vector::swap<#0>($t0|v: &mut vector<#0>, $t1|i: u64, $t2|j: u64);
+
+
+[variant baseline]
+public intrinsic fun vector::swap_remove<#0>($t0|v: &mut vector<#0>, $t1|i: u64): #0;
+
+
+[variant baseline]
+fun TestMutRef::call_return_ref_different_path($t0|b: bool): TestMutRef::N {
+     var $t1|r: &mut u64 [unused]
+     var $t2|x: TestMutRef::N
+     var $t3: u64
+     var $t4: u64
+     var $t5: TestMutRef::T
+     var $t6: &mut TestMutRef::N
+     var $t7: &mut u64
+     var $t8: u64
+     var $t9: TestMutRef::N
+     # live_nodes: LocalRoot($t0)
+  0: $t3 := 1
+     # live_nodes: LocalRoot($t0)
+  1: $t4 := 2
+     # live_nodes: LocalRoot($t0)
+  2: $t5 := pack TestMutRef::T($t4)
+     # live_nodes: LocalRoot($t0)
+  3: $t2 := pack TestMutRef::N($t3, $t5)
+     # live_nodes: LocalRoot($t0)
+  4: $t6 := borrow_local($t2)
+     # live_nodes: LocalRoot($t0), Reference($t6)
+     # borrowed_by: LocalRoot($t2) -> {(@, Reference($t6))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t2))}
+  5: $t7 := TestMutRef::return_ref_different_path($t0, $t6)
+     # live_nodes: LocalRoot($t0), Reference($t7)
+     # borrowed_by: LocalRoot($t2) -> {(@, Reference($t6))}, Reference($t6) -> {(.value (u64), Reference($t7)), (.t (TestMutRef::T)/.value (u64), Reference($t7))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t2))}, Reference($t7) -> {(.value (u64), Reference($t6)), (.t (TestMutRef::T)/.value (u64), Reference($t6))}
+  6: $t8 := 5
+     # live_nodes: LocalRoot($t0), Reference($t7)
+     # borrowed_by: LocalRoot($t2) -> {(@, Reference($t6))}, Reference($t6) -> {(.value (u64), Reference($t7)), (.t (TestMutRef::T)/.value (u64), Reference($t7))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t2))}, Reference($t7) -> {(.value (u64), Reference($t6)), (.t (TestMutRef::T)/.value (u64), Reference($t6))}
+  7: write_ref($t7, $t8)
+     # live_nodes: LocalRoot($t0)
+     # borrowed_by: LocalRoot($t2) -> {(@, Reference($t6))}, Reference($t6) -> {(.value (u64), Reference($t7)), (.t (TestMutRef::T)/.value (u64), Reference($t7))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t2))}, Reference($t7) -> {(.value (u64), Reference($t6)), (.t (TestMutRef::T)/.value (u64), Reference($t6))}
+  8: $t9 := move($t2)
+     # live_nodes: LocalRoot($t0), LocalRoot($t9)
+     # borrowed_by: LocalRoot($t2) -> {(@, Reference($t6))}, Reference($t6) -> {(.value (u64), Reference($t7)), (.t (TestMutRef::T)/.value (u64), Reference($t7))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t2))}, Reference($t7) -> {(.value (u64), Reference($t6)), (.t (TestMutRef::T)/.value (u64), Reference($t6))}
+  9: return $t9
+}
+
+
+[variant baseline]
+fun TestMutRef::call_return_ref_different_path_vec($t0|b: bool): TestMutRef::V {
+     var $t1|is: vector<u64>
+     var $t2|r: &mut u64 [unused]
+     var $t3|ts: vector<TestMutRef::T> [unused]
+     var $t4|x: TestMutRef::V
+     var $t5: vector<TestMutRef::T>
+     var $t6: &mut vector<u64>
+     var $t7: u64
+     var $t8: &mut vector<u64>
+     var $t9: u64
+     var $t10: vector<u64>
+     var $t11: &mut TestMutRef::V
+     var $t12: &mut u64
+     var $t13: u64
+     var $t14: TestMutRef::V
+     # live_nodes: LocalRoot($t0)
+  0: $t1 := vector::empty<u64>()
+     # live_nodes: LocalRoot($t0)
+  1: $t5 := vector::empty<TestMutRef::T>()
+     # live_nodes: LocalRoot($t0)
+  2: $t6 := borrow_local($t1)
+     # live_nodes: LocalRoot($t0), Reference($t6)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t1))}
+  3: $t7 := 1
+     # live_nodes: LocalRoot($t0), Reference($t6)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t1))}
+  4: vector::push_back<u64>($t6, $t7)
+     # live_nodes: LocalRoot($t0)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t1))}
+  5: $t8 := borrow_local($t1)
+     # live_nodes: LocalRoot($t0), Reference($t8)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6)), (@, Reference($t8))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t8) -> {(@, LocalRoot($t1))}
+  6: $t9 := 2
+     # live_nodes: LocalRoot($t0), Reference($t8)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6)), (@, Reference($t8))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t8) -> {(@, LocalRoot($t1))}
+  7: vector::push_back<u64>($t8, $t9)
+     # live_nodes: LocalRoot($t0)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6)), (@, Reference($t8))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t8) -> {(@, LocalRoot($t1))}
+  8: $t10 := move($t1)
+     # live_nodes: LocalRoot($t0), LocalRoot($t10)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6)), (@, Reference($t8))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t8) -> {(@, LocalRoot($t1))}
+  9: $t4 := pack TestMutRef::V($t10, $t5)
+     # live_nodes: LocalRoot($t0), LocalRoot($t10)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6)), (@, Reference($t8))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t8) -> {(@, LocalRoot($t1))}
+ 10: $t11 := borrow_local($t4)
+     # live_nodes: LocalRoot($t0), LocalRoot($t10), Reference($t11)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6)), (@, Reference($t8))}, LocalRoot($t4) -> {(@, Reference($t11))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t8) -> {(@, LocalRoot($t1))}, Reference($t11) -> {(@, LocalRoot($t4))}
+ 11: $t12 := TestMutRef::return_ref_different_path_vec($t0, $t11)
+     # live_nodes: LocalRoot($t0), LocalRoot($t10), Reference($t12)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6)), (@, Reference($t8))}, LocalRoot($t4) -> {(@, Reference($t11))}, Reference($t11) -> {(.is (vector<u64>)/[], Reference($t12))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t8) -> {(@, LocalRoot($t1))}, Reference($t11) -> {(@, LocalRoot($t4))}, Reference($t12) -> {(.is (vector<u64>)/[], Reference($t11))}
+ 12: $t13 := 5
+     # live_nodes: LocalRoot($t0), LocalRoot($t10), Reference($t12)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6)), (@, Reference($t8))}, LocalRoot($t4) -> {(@, Reference($t11))}, Reference($t11) -> {(.is (vector<u64>)/[], Reference($t12))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t8) -> {(@, LocalRoot($t1))}, Reference($t11) -> {(@, LocalRoot($t4))}, Reference($t12) -> {(.is (vector<u64>)/[], Reference($t11))}
+ 13: write_ref($t12, $t13)
+     # live_nodes: LocalRoot($t0), LocalRoot($t10)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6)), (@, Reference($t8))}, LocalRoot($t4) -> {(@, Reference($t11))}, Reference($t11) -> {(.is (vector<u64>)/[], Reference($t12))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t8) -> {(@, LocalRoot($t1))}, Reference($t11) -> {(@, LocalRoot($t4))}, Reference($t12) -> {(.is (vector<u64>)/[], Reference($t11))}
+ 14: $t14 := move($t4)
+     # live_nodes: LocalRoot($t0), LocalRoot($t10), LocalRoot($t14)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6)), (@, Reference($t8))}, LocalRoot($t4) -> {(@, Reference($t11))}, Reference($t11) -> {(.is (vector<u64>)/[], Reference($t12))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t8) -> {(@, LocalRoot($t1))}, Reference($t11) -> {(@, LocalRoot($t4))}, Reference($t12) -> {(.is (vector<u64>)/[], Reference($t11))}
+ 15: return $t14
+}
+
+
+[variant baseline]
+fun TestMutRef::call_return_ref_different_path_vec2($t0|b: bool): TestMutRef::V {
+     var $t1|is: vector<u64>
+     var $t2|r: &mut u64 [unused]
+     var $t3|ts: vector<TestMutRef::T>
+     var $t4|x: TestMutRef::V
+     var $t5: &mut vector<u64>
+     var $t6: u64
+     var $t7: &mut vector<u64>
+     var $t8: u64
+     var $t9: &mut vector<TestMutRef::T>
+     var $t10: u64
+     var $t11: TestMutRef::T
+     var $t12: &mut vector<TestMutRef::T>
+     var $t13: u64
+     var $t14: TestMutRef::T
+     var $t15: vector<u64>
+     var $t16: vector<TestMutRef::T>
+     var $t17: &mut TestMutRef::V
+     var $t18: &mut u64
+     var $t19: u64
+     var $t20: TestMutRef::V
+     # live_nodes: LocalRoot($t0)
+  0: $t1 := vector::empty<u64>()
+     # live_nodes: LocalRoot($t0)
+  1: $t3 := vector::empty<TestMutRef::T>()
+     # live_nodes: LocalRoot($t0)
+  2: $t5 := borrow_local($t1)
+     # live_nodes: LocalRoot($t0), Reference($t5)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}
+  3: $t6 := 1
+     # live_nodes: LocalRoot($t0), Reference($t5)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}
+  4: vector::push_back<u64>($t5, $t6)
+     # live_nodes: LocalRoot($t0)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}
+  5: $t7 := borrow_local($t1)
+     # live_nodes: LocalRoot($t0), Reference($t7)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}
+  6: $t8 := 2
+     # live_nodes: LocalRoot($t0), Reference($t7)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}
+  7: vector::push_back<u64>($t7, $t8)
+     # live_nodes: LocalRoot($t0)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}
+  8: $t9 := borrow_local($t3)
+     # live_nodes: LocalRoot($t0), Reference($t9)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}
+  9: $t10 := 3
+     # live_nodes: LocalRoot($t0), Reference($t9)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}
+ 10: $t11 := pack TestMutRef::T($t10)
+     # live_nodes: LocalRoot($t0), Reference($t9)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}
+ 11: vector::push_back<TestMutRef::T>($t9, $t11)
+     # live_nodes: LocalRoot($t0)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}
+ 12: $t12 := borrow_local($t3)
+     # live_nodes: LocalRoot($t0), Reference($t12)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}
+ 13: $t13 := 4
+     # live_nodes: LocalRoot($t0), Reference($t12)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}
+ 14: $t14 := pack TestMutRef::T($t13)
+     # live_nodes: LocalRoot($t0), Reference($t12)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}
+ 15: vector::push_back<TestMutRef::T>($t12, $t14)
+     # live_nodes: LocalRoot($t0)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}
+ 16: $t15 := move($t1)
+     # live_nodes: LocalRoot($t0), LocalRoot($t15)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}
+ 17: $t16 := move($t3)
+     # live_nodes: LocalRoot($t0), LocalRoot($t15), LocalRoot($t16)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}
+ 18: $t4 := pack TestMutRef::V($t15, $t16)
+     # live_nodes: LocalRoot($t0), LocalRoot($t15), LocalRoot($t16)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}
+ 19: $t17 := borrow_local($t4)
+     # live_nodes: LocalRoot($t0), LocalRoot($t15), LocalRoot($t16), Reference($t17)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}, LocalRoot($t4) -> {(@, Reference($t17))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}, Reference($t17) -> {(@, LocalRoot($t4))}
+ 20: $t18 := TestMutRef::return_ref_different_path_vec2($t0, $t17)
+     # live_nodes: LocalRoot($t0), LocalRoot($t15), LocalRoot($t16), Reference($t18)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}, LocalRoot($t4) -> {(@, Reference($t17))}, Reference($t17) -> {(.is (vector<u64>)/[], Reference($t18)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t18))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}, Reference($t17) -> {(@, LocalRoot($t4))}, Reference($t18) -> {(.is (vector<u64>)/[], Reference($t17)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t17))}
+ 21: $t19 := 5
+     # live_nodes: LocalRoot($t0), LocalRoot($t15), LocalRoot($t16), Reference($t18)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}, LocalRoot($t4) -> {(@, Reference($t17))}, Reference($t17) -> {(.is (vector<u64>)/[], Reference($t18)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t18))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}, Reference($t17) -> {(@, LocalRoot($t4))}, Reference($t18) -> {(.is (vector<u64>)/[], Reference($t17)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t17))}
+ 22: write_ref($t18, $t19)
+     # live_nodes: LocalRoot($t0), LocalRoot($t15), LocalRoot($t16)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}, LocalRoot($t4) -> {(@, Reference($t17))}, Reference($t17) -> {(.is (vector<u64>)/[], Reference($t18)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t18))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}, Reference($t17) -> {(@, LocalRoot($t4))}, Reference($t18) -> {(.is (vector<u64>)/[], Reference($t17)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t17))}
+ 23: $t20 := move($t4)
+     # live_nodes: LocalRoot($t0), LocalRoot($t15), LocalRoot($t16), LocalRoot($t20)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}, LocalRoot($t4) -> {(@, Reference($t17))}, Reference($t17) -> {(.is (vector<u64>)/[], Reference($t18)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t18))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}, Reference($t17) -> {(@, LocalRoot($t4))}, Reference($t18) -> {(.is (vector<u64>)/[], Reference($t17)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t17))}
+ 24: return $t20
+}
+
+
+[variant baseline]
+fun TestMutRef::call_return_ref_different_path_vec2_incorrect($t0|b: bool): TestMutRef::V {
+     var $t1|is: vector<u64>
+     var $t2|r: &mut u64 [unused]
+     var $t3|ts: vector<TestMutRef::T>
+     var $t4|x: TestMutRef::V
+     var $t5: &mut vector<u64>
+     var $t6: u64
+     var $t7: &mut vector<u64>
+     var $t8: u64
+     var $t9: &mut vector<TestMutRef::T>
+     var $t10: u64
+     var $t11: TestMutRef::T
+     var $t12: &mut vector<TestMutRef::T>
+     var $t13: u64
+     var $t14: TestMutRef::T
+     var $t15: vector<u64>
+     var $t16: vector<TestMutRef::T>
+     var $t17: &mut TestMutRef::V
+     var $t18: &mut u64
+     var $t19: u64
+     var $t20: TestMutRef::V
+     # live_nodes: LocalRoot($t0)
+  0: $t1 := vector::empty<u64>()
+     # live_nodes: LocalRoot($t0)
+  1: $t3 := vector::empty<TestMutRef::T>()
+     # live_nodes: LocalRoot($t0)
+  2: $t5 := borrow_local($t1)
+     # live_nodes: LocalRoot($t0), Reference($t5)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}
+  3: $t6 := 1
+     # live_nodes: LocalRoot($t0), Reference($t5)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}
+  4: vector::push_back<u64>($t5, $t6)
+     # live_nodes: LocalRoot($t0)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}
+  5: $t7 := borrow_local($t1)
+     # live_nodes: LocalRoot($t0), Reference($t7)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}
+  6: $t8 := 2
+     # live_nodes: LocalRoot($t0), Reference($t7)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}
+  7: vector::push_back<u64>($t7, $t8)
+     # live_nodes: LocalRoot($t0)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}
+  8: $t9 := borrow_local($t3)
+     # live_nodes: LocalRoot($t0), Reference($t9)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}
+  9: $t10 := 3
+     # live_nodes: LocalRoot($t0), Reference($t9)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}
+ 10: $t11 := pack TestMutRef::T($t10)
+     # live_nodes: LocalRoot($t0), Reference($t9)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}
+ 11: vector::push_back<TestMutRef::T>($t9, $t11)
+     # live_nodes: LocalRoot($t0)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}
+ 12: $t12 := borrow_local($t3)
+     # live_nodes: LocalRoot($t0), Reference($t12)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}
+ 13: $t13 := 4
+     # live_nodes: LocalRoot($t0), Reference($t12)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}
+ 14: $t14 := pack TestMutRef::T($t13)
+     # live_nodes: LocalRoot($t0), Reference($t12)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}
+ 15: vector::push_back<TestMutRef::T>($t12, $t14)
+     # live_nodes: LocalRoot($t0)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}
+ 16: $t15 := move($t1)
+     # live_nodes: LocalRoot($t0), LocalRoot($t15)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}
+ 17: $t16 := move($t3)
+     # live_nodes: LocalRoot($t0), LocalRoot($t15), LocalRoot($t16)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}
+ 18: $t4 := pack TestMutRef::V($t15, $t16)
+     # live_nodes: LocalRoot($t0), LocalRoot($t15), LocalRoot($t16)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}
+ 19: $t17 := borrow_local($t4)
+     # live_nodes: LocalRoot($t0), LocalRoot($t15), LocalRoot($t16), Reference($t17)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}, LocalRoot($t4) -> {(@, Reference($t17))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}, Reference($t17) -> {(@, LocalRoot($t4))}
+ 20: $t18 := TestMutRef::return_ref_different_path_vec2($t0, $t17)
+     # live_nodes: LocalRoot($t0), LocalRoot($t15), LocalRoot($t16), Reference($t18)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}, LocalRoot($t4) -> {(@, Reference($t17))}, Reference($t17) -> {(.is (vector<u64>)/[], Reference($t18)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t18))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}, Reference($t17) -> {(@, LocalRoot($t4))}, Reference($t18) -> {(.is (vector<u64>)/[], Reference($t17)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t17))}
+ 21: $t19 := 0
+     # live_nodes: LocalRoot($t0), LocalRoot($t15), LocalRoot($t16), Reference($t18)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}, LocalRoot($t4) -> {(@, Reference($t17))}, Reference($t17) -> {(.is (vector<u64>)/[], Reference($t18)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t18))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}, Reference($t17) -> {(@, LocalRoot($t4))}, Reference($t18) -> {(.is (vector<u64>)/[], Reference($t17)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t17))}
+ 22: write_ref($t18, $t19)
+     # live_nodes: LocalRoot($t0), LocalRoot($t15), LocalRoot($t16)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}, LocalRoot($t4) -> {(@, Reference($t17))}, Reference($t17) -> {(.is (vector<u64>)/[], Reference($t18)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t18))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}, Reference($t17) -> {(@, LocalRoot($t4))}, Reference($t18) -> {(.is (vector<u64>)/[], Reference($t17)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t17))}
+ 23: $t20 := move($t4)
+     # live_nodes: LocalRoot($t0), LocalRoot($t15), LocalRoot($t16), LocalRoot($t20)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}, LocalRoot($t4) -> {(@, Reference($t17))}, Reference($t17) -> {(.is (vector<u64>)/[], Reference($t18)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t18))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}, Reference($t17) -> {(@, LocalRoot($t4))}, Reference($t18) -> {(.is (vector<u64>)/[], Reference($t17)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t17))}
+ 24: return $t20
+}
+
+
+[variant baseline]
+fun TestMutRef::call_return_ref_different_root($t0|b: bool): (TestMutRef::T, TestMutRef::R) {
+     var $t1|r: &mut u64 [unused]
+     var $t2|x: TestMutRef::T
+     var $t3|y: TestMutRef::R
+     var $t4: u64
+     var $t5: u64
+     var $t6: &mut TestMutRef::T
+     var $t7: &mut TestMutRef::R
+     var $t8: &mut u64
+     var $t9: u64
+     var $t10: TestMutRef::T
+     var $t11: TestMutRef::R
+     # live_nodes: LocalRoot($t0)
+  0: $t4 := 1
+     # live_nodes: LocalRoot($t0)
+  1: $t2 := pack TestMutRef::T($t4)
+     # live_nodes: LocalRoot($t0)
+  2: $t5 := 10
+     # live_nodes: LocalRoot($t0)
+  3: $t3 := pack TestMutRef::R($t5)
+     # live_nodes: LocalRoot($t0)
+  4: $t6 := borrow_local($t2)
+     # live_nodes: LocalRoot($t0), Reference($t6)
+     # borrowed_by: LocalRoot($t2) -> {(@, Reference($t6))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t2))}
+  5: $t7 := borrow_local($t3)
+     # live_nodes: LocalRoot($t0), Reference($t6), Reference($t7)
+     # borrowed_by: LocalRoot($t2) -> {(@, Reference($t6))}, LocalRoot($t3) -> {(@, Reference($t7))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t2))}, Reference($t7) -> {(@, LocalRoot($t3))}
+  6: $t8 := TestMutRef::return_ref_different_root($t0, $t6, $t7)
+     # live_nodes: LocalRoot($t0), Reference($t8)
+     # borrowed_by: LocalRoot($t2) -> {(@, Reference($t6))}, LocalRoot($t3) -> {(@, Reference($t7))}, Reference($t6) -> {(.value (u64), Reference($t8))}, Reference($t7) -> {(.value (u64), Reference($t8))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t2))}, Reference($t7) -> {(@, LocalRoot($t3))}, Reference($t8) -> {(.value (u64), Reference($t6)), (.value (u64), Reference($t7))}
+  7: $t9 := 5
+     # live_nodes: LocalRoot($t0), Reference($t8)
+     # borrowed_by: LocalRoot($t2) -> {(@, Reference($t6))}, LocalRoot($t3) -> {(@, Reference($t7))}, Reference($t6) -> {(.value (u64), Reference($t8))}, Reference($t7) -> {(.value (u64), Reference($t8))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t2))}, Reference($t7) -> {(@, LocalRoot($t3))}, Reference($t8) -> {(.value (u64), Reference($t6)), (.value (u64), Reference($t7))}
+  8: write_ref($t8, $t9)
+     # live_nodes: LocalRoot($t0)
+     # borrowed_by: LocalRoot($t2) -> {(@, Reference($t6))}, LocalRoot($t3) -> {(@, Reference($t7))}, Reference($t6) -> {(.value (u64), Reference($t8))}, Reference($t7) -> {(.value (u64), Reference($t8))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t2))}, Reference($t7) -> {(@, LocalRoot($t3))}, Reference($t8) -> {(.value (u64), Reference($t6)), (.value (u64), Reference($t7))}
+  9: $t10 := move($t2)
+     # live_nodes: LocalRoot($t0), LocalRoot($t10)
+     # borrowed_by: LocalRoot($t2) -> {(@, Reference($t6))}, LocalRoot($t3) -> {(@, Reference($t7))}, Reference($t6) -> {(.value (u64), Reference($t8))}, Reference($t7) -> {(.value (u64), Reference($t8))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t2))}, Reference($t7) -> {(@, LocalRoot($t3))}, Reference($t8) -> {(.value (u64), Reference($t6)), (.value (u64), Reference($t7))}
+ 10: $t11 := move($t3)
+     # live_nodes: LocalRoot($t0), LocalRoot($t10), LocalRoot($t11)
+     # borrowed_by: LocalRoot($t2) -> {(@, Reference($t6))}, LocalRoot($t3) -> {(@, Reference($t7))}, Reference($t6) -> {(.value (u64), Reference($t8))}, Reference($t7) -> {(.value (u64), Reference($t8))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t2))}, Reference($t7) -> {(@, LocalRoot($t3))}, Reference($t8) -> {(.value (u64), Reference($t6)), (.value (u64), Reference($t7))}
+ 11: return ($t10, $t11)
+}
+
+
+[variant baseline]
+fun TestMutRef::return_ref_different_path($t0|b: bool, $t1|x: &mut TestMutRef::N): &mut u64 {
+     var $t2|tmp#$2: &mut u64
+     var $t3: &mut TestMutRef::T
+     # live_nodes: LocalRoot($t0), Reference($t1)
+  0: if ($t0) goto 1 else goto 4
+     # live_nodes: LocalRoot($t0), Reference($t1)
+  1: label L1
+     # live_nodes: LocalRoot($t0), Reference($t1)
+  2: $t2 := borrow_field<TestMutRef::N>.value($t1)
+     # live_nodes: LocalRoot($t0), Reference($t2)
+     # borrowed_by: Reference($t1) -> {(.value (u64), Reference($t2))}
+     # borrows_from: Reference($t2) -> {(.value (u64), Reference($t1))}
+  3: goto 8
+     # live_nodes: LocalRoot($t0), Reference($t1)
+  4: label L0
+     # live_nodes: LocalRoot($t0), Reference($t1)
+  5: $t3 := borrow_field<TestMutRef::N>.t($t1)
+     # live_nodes: LocalRoot($t0), Reference($t3)
+     # borrowed_by: Reference($t1) -> {(.t (TestMutRef::T), Reference($t3))}
+     # borrows_from: Reference($t3) -> {(.t (TestMutRef::T), Reference($t1))}
+  6: $t2 := borrow_field<TestMutRef::T>.value($t3)
+     # live_nodes: LocalRoot($t0), Reference($t2)
+     # borrowed_by: Reference($t1) -> {(.t (TestMutRef::T), Reference($t3))}, Reference($t3) -> {(.value (u64), Reference($t2))}
+     # borrows_from: Reference($t2) -> {(.value (u64), Reference($t3))}, Reference($t3) -> {(.t (TestMutRef::T), Reference($t1))}
+  7: goto 8
+     # live_nodes: LocalRoot($t0), Reference($t2)
+     # borrowed_by: Reference($t1) -> {(.value (u64), Reference($t2)), (.t (TestMutRef::T), Reference($t3))}, Reference($t3) -> {(.value (u64), Reference($t2))}
+     # borrows_from: Reference($t2) -> {(.value (u64), Reference($t1)), (.value (u64), Reference($t3))}, Reference($t3) -> {(.t (TestMutRef::T), Reference($t1))}
+  8: label L2
+     # live_nodes: LocalRoot($t0), Reference($t2)
+     # borrowed_by: Reference($t1) -> {(.value (u64), Reference($t2)), (.t (TestMutRef::T), Reference($t3))}, Reference($t3) -> {(.value (u64), Reference($t2))}
+     # borrows_from: Reference($t2) -> {(.value (u64), Reference($t1)), (.value (u64), Reference($t3))}, Reference($t3) -> {(.t (TestMutRef::T), Reference($t1))}
+  9: return $t2
+}
+
+
+[variant baseline]
+fun TestMutRef::return_ref_different_path_vec($t0|b: bool, $t1|x: &mut TestMutRef::V): &mut u64 {
+     var $t2|tmp#$2: &mut u64
+     var $t3: &mut vector<u64>
+     var $t4: u64
+     var $t5: &mut vector<u64>
+     var $t6: u64
+     # live_nodes: LocalRoot($t0), Reference($t1)
+  0: if ($t0) goto 1 else goto 6
+     # live_nodes: LocalRoot($t0), Reference($t1)
+  1: label L1
+     # live_nodes: LocalRoot($t0), Reference($t1)
+  2: $t3 := borrow_field<TestMutRef::V>.is($t1)
+     # live_nodes: LocalRoot($t0), Reference($t3)
+     # borrowed_by: Reference($t1) -> {(.is (vector<u64>), Reference($t3))}
+     # borrows_from: Reference($t3) -> {(.is (vector<u64>), Reference($t1))}
+  3: $t4 := 1
+     # live_nodes: LocalRoot($t0), Reference($t3)
+     # borrowed_by: Reference($t1) -> {(.is (vector<u64>), Reference($t3))}
+     # borrows_from: Reference($t3) -> {(.is (vector<u64>), Reference($t1))}
+  4: $t2 := vector::borrow_mut<u64>($t3, $t4)
+     # live_nodes: LocalRoot($t0), Reference($t2)
+     # borrowed_by: Reference($t1) -> {(.is (vector<u64>), Reference($t3))}, Reference($t3) -> {([], Reference($t2))}
+     # borrows_from: Reference($t2) -> {([], Reference($t3))}, Reference($t3) -> {(.is (vector<u64>), Reference($t1))}
+  5: goto 11
+     # live_nodes: LocalRoot($t0), Reference($t1)
+  6: label L0
+     # live_nodes: LocalRoot($t0), Reference($t1)
+  7: $t5 := borrow_field<TestMutRef::V>.is($t1)
+     # live_nodes: LocalRoot($t0), Reference($t5)
+     # borrowed_by: Reference($t1) -> {(.is (vector<u64>), Reference($t5))}
+     # borrows_from: Reference($t5) -> {(.is (vector<u64>), Reference($t1))}
+  8: $t6 := 0
+     # live_nodes: LocalRoot($t0), Reference($t5)
+     # borrowed_by: Reference($t1) -> {(.is (vector<u64>), Reference($t5))}
+     # borrows_from: Reference($t5) -> {(.is (vector<u64>), Reference($t1))}
+  9: $t2 := vector::borrow_mut<u64>($t5, $t6)
+     # live_nodes: LocalRoot($t0), Reference($t2)
+     # borrowed_by: Reference($t1) -> {(.is (vector<u64>), Reference($t5))}, Reference($t5) -> {([], Reference($t2))}
+     # borrows_from: Reference($t2) -> {([], Reference($t5))}, Reference($t5) -> {(.is (vector<u64>), Reference($t1))}
+ 10: goto 11
+     # live_nodes: LocalRoot($t0), Reference($t2)
+     # borrowed_by: Reference($t1) -> {(.is (vector<u64>), Reference($t3)), (.is (vector<u64>), Reference($t5))}, Reference($t3) -> {([], Reference($t2))}, Reference($t5) -> {([], Reference($t2))}
+     # borrows_from: Reference($t2) -> {([], Reference($t3)), ([], Reference($t5))}, Reference($t3) -> {(.is (vector<u64>), Reference($t1))}, Reference($t5) -> {(.is (vector<u64>), Reference($t1))}
+ 11: label L2
+     # live_nodes: LocalRoot($t0), Reference($t2)
+     # borrowed_by: Reference($t1) -> {(.is (vector<u64>), Reference($t3)), (.is (vector<u64>), Reference($t5))}, Reference($t3) -> {([], Reference($t2))}, Reference($t5) -> {([], Reference($t2))}
+     # borrows_from: Reference($t2) -> {([], Reference($t3)), ([], Reference($t5))}, Reference($t3) -> {(.is (vector<u64>), Reference($t1))}, Reference($t5) -> {(.is (vector<u64>), Reference($t1))}
+ 12: return $t2
+}
+
+
+[variant baseline]
+fun TestMutRef::return_ref_different_path_vec2($t0|b: bool, $t1|x: &mut TestMutRef::V): &mut u64 {
+     var $t2|tmp#$2: &mut u64
+     var $t3: &mut vector<u64>
+     var $t4: u64
+     var $t5: &mut vector<TestMutRef::T>
+     var $t6: u64
+     var $t7: &mut TestMutRef::T
+     # live_nodes: LocalRoot($t0), Reference($t1)
+  0: if ($t0) goto 1 else goto 6
+     # live_nodes: LocalRoot($t0), Reference($t1)
+  1: label L1
+     # live_nodes: LocalRoot($t0), Reference($t1)
+  2: $t3 := borrow_field<TestMutRef::V>.is($t1)
+     # live_nodes: LocalRoot($t0), Reference($t3)
+     # borrowed_by: Reference($t1) -> {(.is (vector<u64>), Reference($t3))}
+     # borrows_from: Reference($t3) -> {(.is (vector<u64>), Reference($t1))}
+  3: $t4 := 1
+     # live_nodes: LocalRoot($t0), Reference($t3)
+     # borrowed_by: Reference($t1) -> {(.is (vector<u64>), Reference($t3))}
+     # borrows_from: Reference($t3) -> {(.is (vector<u64>), Reference($t1))}
+  4: $t2 := vector::borrow_mut<u64>($t3, $t4)
+     # live_nodes: LocalRoot($t0), Reference($t2)
+     # borrowed_by: Reference($t1) -> {(.is (vector<u64>), Reference($t3))}, Reference($t3) -> {([], Reference($t2))}
+     # borrows_from: Reference($t2) -> {([], Reference($t3))}, Reference($t3) -> {(.is (vector<u64>), Reference($t1))}
+  5: goto 12
+     # live_nodes: LocalRoot($t0), Reference($t1)
+  6: label L0
+     # live_nodes: LocalRoot($t0), Reference($t1)
+  7: $t5 := borrow_field<TestMutRef::V>.ts($t1)
+     # live_nodes: LocalRoot($t0), Reference($t5)
+     # borrowed_by: Reference($t1) -> {(.ts (vector<TestMutRef::T>), Reference($t5))}
+     # borrows_from: Reference($t5) -> {(.ts (vector<TestMutRef::T>), Reference($t1))}
+  8: $t6 := 0
+     # live_nodes: LocalRoot($t0), Reference($t5)
+     # borrowed_by: Reference($t1) -> {(.ts (vector<TestMutRef::T>), Reference($t5))}
+     # borrows_from: Reference($t5) -> {(.ts (vector<TestMutRef::T>), Reference($t1))}
+  9: $t7 := vector::borrow_mut<TestMutRef::T>($t5, $t6)
+     # live_nodes: LocalRoot($t0), Reference($t7)
+     # borrowed_by: Reference($t1) -> {(.ts (vector<TestMutRef::T>), Reference($t5))}, Reference($t5) -> {([], Reference($t7))}
+     # borrows_from: Reference($t5) -> {(.ts (vector<TestMutRef::T>), Reference($t1))}, Reference($t7) -> {([], Reference($t5))}
+ 10: $t2 := borrow_field<TestMutRef::T>.value($t7)
+     # live_nodes: LocalRoot($t0), Reference($t2)
+     # borrowed_by: Reference($t1) -> {(.ts (vector<TestMutRef::T>), Reference($t5))}, Reference($t5) -> {([], Reference($t7))}, Reference($t7) -> {(.value (u64), Reference($t2))}
+     # borrows_from: Reference($t2) -> {(.value (u64), Reference($t7))}, Reference($t5) -> {(.ts (vector<TestMutRef::T>), Reference($t1))}, Reference($t7) -> {([], Reference($t5))}
+ 11: goto 12
+     # live_nodes: LocalRoot($t0), Reference($t2)
+     # borrowed_by: Reference($t1) -> {(.is (vector<u64>), Reference($t3)), (.ts (vector<TestMutRef::T>), Reference($t5))}, Reference($t3) -> {([], Reference($t2))}, Reference($t5) -> {([], Reference($t7))}, Reference($t7) -> {(.value (u64), Reference($t2))}
+     # borrows_from: Reference($t2) -> {([], Reference($t3)), (.value (u64), Reference($t7))}, Reference($t3) -> {(.is (vector<u64>), Reference($t1))}, Reference($t5) -> {(.ts (vector<TestMutRef::T>), Reference($t1))}, Reference($t7) -> {([], Reference($t5))}
+ 12: label L2
+     # live_nodes: LocalRoot($t0), Reference($t2)
+     # borrowed_by: Reference($t1) -> {(.is (vector<u64>), Reference($t3)), (.ts (vector<TestMutRef::T>), Reference($t5))}, Reference($t3) -> {([], Reference($t2))}, Reference($t5) -> {([], Reference($t7))}, Reference($t7) -> {(.value (u64), Reference($t2))}
+     # borrows_from: Reference($t2) -> {([], Reference($t3)), (.value (u64), Reference($t7))}, Reference($t3) -> {(.is (vector<u64>), Reference($t1))}, Reference($t5) -> {(.ts (vector<TestMutRef::T>), Reference($t1))}, Reference($t7) -> {([], Reference($t5))}
+ 13: return $t2
+}
+
+
+[variant baseline]
+fun TestMutRef::return_ref_different_root($t0|b: bool, $t1|x: &mut TestMutRef::T, $t2|y: &mut TestMutRef::R): &mut u64 {
+     var $t3|tmp#$3: &mut u64
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2)
+  0: if ($t0) goto 1 else goto 5
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2)
+  1: label L1
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2)
+  2: drop($t2)
+     # live_nodes: LocalRoot($t0), Reference($t1)
+  3: $t3 := borrow_field<TestMutRef::T>.value($t1)
+     # live_nodes: LocalRoot($t0), Reference($t3)
+     # borrowed_by: Reference($t1) -> {(.value (u64), Reference($t3))}
+     # borrows_from: Reference($t3) -> {(.value (u64), Reference($t1))}
+  4: goto 9
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2)
+  5: label L0
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2)
+  6: drop($t1)
+     # live_nodes: LocalRoot($t0), Reference($t2)
+  7: $t3 := borrow_field<TestMutRef::R>.value($t2)
+     # live_nodes: LocalRoot($t0), Reference($t3)
+     # borrowed_by: Reference($t2) -> {(.value (u64), Reference($t3))}
+     # borrows_from: Reference($t3) -> {(.value (u64), Reference($t2))}
+  8: goto 9
+     # live_nodes: LocalRoot($t0), Reference($t3)
+     # borrowed_by: Reference($t1) -> {(.value (u64), Reference($t3))}, Reference($t2) -> {(.value (u64), Reference($t3))}
+     # borrows_from: Reference($t3) -> {(.value (u64), Reference($t1)), (.value (u64), Reference($t2))}
+  9: label L2
+     # live_nodes: LocalRoot($t0), Reference($t3)
+     # borrowed_by: Reference($t1) -> {(.value (u64), Reference($t3))}, Reference($t2) -> {(.value (u64), Reference($t3))}
+     # borrows_from: Reference($t3) -> {(.value (u64), Reference($t1)), (.value (u64), Reference($t2))}
+ 10: return $t3
+}
+
+
+
+==== borrow analysis summaries ====
+
+fun vector::borrow_mut[baseline]
+borrowed_by: Reference($t0) -> {([], Return(0))}
+borrows_from: Return(0) -> {([], Reference($t0))}
+
+fun TestMutRef::return_ref_different_path[baseline]
+borrowed_by: Reference($t1) -> {(.value (u64), Return(0)), (.t (TestMutRef::T)/.value (u64), Return(0))}
+borrows_from: Return(0) -> {(.value (u64), Reference($t1)), (.t (TestMutRef::T)/.value (u64), Reference($t1))}
+
+fun TestMutRef::return_ref_different_path_vec[baseline]
+borrowed_by: Reference($t1) -> {(.is (vector<u64>)/[], Return(0))}
+borrows_from: Return(0) -> {(.is (vector<u64>)/[], Reference($t1))}
+
+fun TestMutRef::return_ref_different_path_vec2[baseline]
+borrowed_by: Reference($t1) -> {(.is (vector<u64>)/[], Return(0)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Return(0))}
+borrows_from: Return(0) -> {(.is (vector<u64>)/[], Reference($t1)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t1))}
+
+fun TestMutRef::return_ref_different_root[baseline]
+borrowed_by: Reference($t1) -> {(.value (u64), Return(0))}, Reference($t2) -> {(.value (u64), Return(0))}
+borrows_from: Return(0) -> {(.value (u64), Reference($t1)), (.value (u64), Reference($t2))}
diff --git a/third_party/move/move-model/bytecode/tests/from_move/regression_generic_and_native_type.v2_exp b/third_party/move/move-model/bytecode/tests/from_move/regression_generic_and_native_type.v2_exp
new file mode 100644
index 0000000000000..3adb0bf62745c
--- /dev/null
+++ b/third_party/move/move-model/bytecode/tests/from_move/regression_generic_and_native_type.v2_exp
@@ -0,0 +1,188 @@
+============ initial translation from Move ================
+
+[variant baseline]
+public intrinsic fun vector::contains<#0>($t0|v: &vector<#0>, $t1|e: &#0): bool;
+
+
+[variant baseline]
+public intrinsic fun vector::index_of<#0>($t0|v: &vector<#0>, $t1|e: &#0): (bool, u64);
+
+
+[variant baseline]
+public intrinsic fun vector::append<#0>($t0|lhs: &mut vector<#0>, $t1|other: vector<#0>);
+
+
+[variant baseline]
+public native fun vector::borrow<#0>($t0|v: &vector<#0>, $t1|i: u64): &#0;
+
+
+[variant baseline]
+public native fun vector::borrow_mut<#0>($t0|v: &mut vector<#0>, $t1|i: u64): &mut #0;
+
+
+[variant baseline]
+public native fun vector::destroy_empty<#0>($t0|v: vector<#0>);
+
+
+[variant baseline]
+public native fun vector::empty<#0>(): vector<#0>;
+
+
+[variant baseline]
+public intrinsic fun vector::is_empty<#0>($t0|v: &vector<#0>): bool;
+
+
+[variant baseline]
+public native fun vector::length<#0>($t0|v: &vector<#0>): u64;
+
+
+[variant baseline]
+public native fun vector::pop_back<#0>($t0|v: &mut vector<#0>): #0;
+
+
+[variant baseline]
+public native fun vector::push_back<#0>($t0|v: &mut vector<#0>, $t1|e: #0);
+
+
+[variant baseline]
+public intrinsic fun vector::remove<#0>($t0|v: &mut vector<#0>, $t1|i: u64): #0;
+
+
+[variant baseline]
+public intrinsic fun vector::reverse<#0>($t0|v: &mut vector<#0>);
+
+
+[variant baseline]
+public fun vector::singleton<#0>($t0|e: #0): vector<#0> {
+     var $t1|v: vector<#0>
+     var $t2: vector<#0>
+     var $t3: &mut vector<#0>
+     var $t4: #0
+     var $t5: vector<#0>
+  0: $t2 := vector::empty<#0>()
+  1: $t1 := $t2
+  2: $t3 := borrow_local($t1)
+  3: $t4 := move($t0)
+  4: vector::push_back<#0>($t3, $t4)
+  5: $t5 := move($t1)
+  6: return $t5
+}
+
+
+[variant baseline]
+public native fun vector::swap<#0>($t0|v: &mut vector<#0>, $t1|i: u64, $t2|j: u64);
+
+
+[variant baseline]
+public intrinsic fun vector::swap_remove<#0>($t0|v: &mut vector<#0>, $t1|i: u64): #0;
+
+
+[variant baseline]
+public fun signer::address_of($t0|s: &signer): address {
+     var $t1: &signer
+     var $t2: &address
+     var $t3: address
+  0: $t1 := move($t0)
+  1: $t2 := signer::borrow_address($t1)
+  2: $t3 := read_ref($t2)
+  3: return $t3
+}
+
+
+[variant baseline]
+public native fun signer::borrow_address($t0|s: &signer): &address;
+
+
+[variant baseline]
+public fun Diem::market_cap<#0>(): u128 {
+     var $t0: address
+     var $t1: &Diem::Info<#0>
+     var $t2: &u128
+     var $t3: u128
+  0: $t0 := 0xa550c18
+  1: $t1 := borrow_global<Diem::Info<#0>>($t0)
+  2: $t2 := borrow_field<Diem::Info<#0>>.total_value($t1)
+  3: $t3 := read_ref($t2)
+  4: return $t3
+}
+
+
+[variant baseline]
+public fun Diem::preburn<#0>($t0|preburn_ref: &mut Diem::Preburn<#0>, $t1|coin: Diem::T<#0>) {
+     var $t2|coin_value: u64
+     var $t3|market_cap: &mut Diem::Info<#0>
+     var $t4: &Diem::T<#0>
+     var $t5: u64
+     var $t6: &mut Diem::Preburn<#0>
+     var $t7: &mut vector<Diem::T<#0>>
+     var $t8: Diem::T<#0>
+     var $t9: address
+     var $t10: &mut Diem::Info<#0>
+     var $t11: &mut Diem::Info<#0>
+     var $t12: &u64
+     var $t13: u64
+     var $t14: u64
+     var $t15: u64
+     var $t16: &mut Diem::Info<#0>
+     var $t17: &mut u64
+  0: $t4 := borrow_local($t1)
+  1: $t5 := Diem::value<#0>($t4)
+  2: $t2 := $t5
+  3: $t6 := move($t0)
+  4: $t7 := borrow_field<Diem::Preburn<#0>>.requests($t6)
+  5: $t8 := move($t1)
+  6: vector::push_back<Diem::T<#0>>($t7, $t8)
+  7: $t9 := 0xa550c18
+  8: $t10 := borrow_global<Diem::Info<#0>>($t9)
+  9: $t3 := $t10
+ 10: $t11 := copy($t3)
+ 11: $t12 := borrow_field<Diem::Info<#0>>.preburn_value($t11)
+ 12: $t13 := read_ref($t12)
+ 13: $t14 := move($t2)
+ 14: $t15 := +($t13, $t14)
+ 15: $t16 := move($t3)
+ 16: $t17 := borrow_field<Diem::Info<#0>>.preburn_value($t16)
+ 17: write_ref($t17, $t15)
+ 18: return ()
+}
+
+
+[variant baseline]
+public fun Diem::preburn_to<#0>($t0|account: &signer, $t1|coin: Diem::T<#0>) {
+     var $t2: &signer
+     var $t3: address
+     var $t4: &mut Diem::Preburn<#0>
+     var $t5: Diem::T<#0>
+  0: $t2 := move($t0)
+  1: $t3 := signer::address_of($t2)
+  2: $t4 := borrow_global<Diem::Preburn<#0>>($t3)
+  3: $t5 := move($t1)
+  4: Diem::preburn<#0>($t4, $t5)
+  5: return ()
+}
+
+
+[variant baseline]
+public fun Diem::preburn_value<#0>(): u64 {
+     var $t0: address
+     var $t1: &Diem::Info<#0>
+     var $t2: &u64
+     var $t3: u64
+  0: $t0 := 0xa550c18
+  1: $t1 := borrow_global<Diem::Info<#0>>($t0)
+  2: $t2 := borrow_field<Diem::Info<#0>>.preburn_value($t1)
+  3: $t3 := read_ref($t2)
+  4: return $t3
+}
+
+
+[variant baseline]
+public fun Diem::value<#0>($t0|coin_ref: &Diem::T<#0>): u64 {
+     var $t1: &Diem::T<#0>
+     var $t2: &u64
+     var $t3: u64
+  0: $t1 := move($t0)
+  1: $t2 := borrow_field<Diem::T<#0>>.value($t1)
+  2: $t3 := read_ref($t2)
+  3: return $t3
+}
diff --git a/third_party/move/move-model/bytecode/tests/from_move/smoke_test.v2_exp b/third_party/move/move-model/bytecode/tests/from_move/smoke_test.v2_exp
new file mode 100644
index 0000000000000..ba97b2cb44214
--- /dev/null
+++ b/third_party/move/move-model/bytecode/tests/from_move/smoke_test.v2_exp
@@ -0,0 +1,437 @@
+============ initial translation from Move ================
+
+[variant baseline]
+public fun signer::address_of($t0|s: &signer): address {
+     var $t1: &signer
+     var $t2: &address
+     var $t3: address
+  0: $t1 := move($t0)
+  1: $t2 := signer::borrow_address($t1)
+  2: $t3 := read_ref($t2)
+  3: return $t3
+}
+
+
+[variant baseline]
+public native fun signer::borrow_address($t0|s: &signer): &address;
+
+
+[variant baseline]
+fun SmokeTest::arithmetic_ops($t0|a: u64): (u64, u64) {
+     var $t1|c: u64
+     var $t2: u64
+     var $t3: u64
+     var $t4: u64
+     var $t5: bool
+     var $t6: u64
+     var $t7: u64
+     var $t8: u64
+  0: $t2 := 2
+  1: $t1 := $t2
+  2: $t3 := copy($t1)
+  3: $t4 := 2
+  4: $t5 := !=($t3, $t4)
+  5: if ($t5) goto 6 else goto 9
+  6: label L1
+  7: $t6 := 42
+  8: abort($t6)
+  9: label L0
+ 10: $t7 := move($t1)
+ 11: $t8 := move($t0)
+ 12: return ($t7, $t8)
+}
+
+
+[variant baseline]
+fun SmokeTest::bool_ops($t0|a: u64, $t1|b: u64): (bool, bool) {
+     var $t2|tmp#$2: bool
+     var $t3|tmp#$3: bool
+     var $t4|c: bool
+     var $t5|d: bool
+     var $t6: u64
+     var $t7: u64
+     var $t8: bool
+     var $t9: u64
+     var $t10: u64
+     var $t11: bool
+     var $t12: bool
+     var $t13: bool
+     var $t14: u64
+     var $t15: u64
+     var $t16: bool
+     var $t17: bool
+     var $t18: u64
+     var $t19: u64
+     var $t20: bool
+     var $t21: bool
+     var $t22: bool
+     var $t23: bool
+     var $t24: bool
+     var $t25: bool
+     var $t26: u64
+     var $t27: bool
+     var $t28: bool
+  0: $t6 := copy($t0)
+  1: $t7 := copy($t1)
+  2: $t8 := >($t6, $t7)
+  3: if ($t8) goto 4 else goto 10
+  4: label L1
+  5: $t9 := copy($t0)
+  6: $t10 := copy($t1)
+  7: $t11 := >=($t9, $t10)
+  8: $t2 := $t11
+  9: goto 14
+ 10: label L0
+ 11: $t12 := false
+ 12: $t2 := $t12
+ 13: goto 14
+ 14: label L2
+ 15: $t13 := move($t2)
+ 16: $t4 := $t13
+ 17: $t14 := copy($t0)
+ 18: $t15 := copy($t1)
+ 19: $t16 := <($t14, $t15)
+ 20: if ($t16) goto 21 else goto 25
+ 21: label L4
+ 22: $t17 := true
+ 23: $t3 := $t17
+ 24: goto 31
+ 25: label L3
+ 26: $t18 := move($t0)
+ 27: $t19 := move($t1)
+ 28: $t20 := <=($t18, $t19)
+ 29: $t3 := $t20
+ 30: goto 31
+ 31: label L5
+ 32: $t21 := move($t3)
+ 33: $t5 := $t21
+ 34: $t22 := copy($t4)
+ 35: $t23 := copy($t5)
+ 36: $t24 := !=($t22, $t23)
+ 37: $t25 := !($t24)
+ 38: if ($t25) goto 39 else goto 42
+ 39: label L7
+ 40: $t26 := 42
+ 41: abort($t26)
+ 42: label L6
+ 43: $t27 := move($t4)
+ 44: $t28 := move($t5)
+ 45: return ($t27, $t28)
+}
+
+
+[variant baseline]
+fun SmokeTest::borrow_global_mut_test($t0|a: address) {
+     var $t1: address
+     var $t2: &mut SmokeTest::R
+     var $t3: address
+     var $t4: &mut SmokeTest::R
+  0: $t1 := copy($t0)
+  1: $t2 := borrow_global<SmokeTest::R>($t1)
+  2: drop($t2)
+  3: $t3 := move($t0)
+  4: $t4 := borrow_global<SmokeTest::R>($t3)
+  5: drop($t4)
+  6: return ()
+}
+
+
+[variant baseline]
+fun SmokeTest::create_resource($t0|sender: &signer) {
+     var $t1: &signer
+     var $t2: u64
+     var $t3: SmokeTest::R
+  0: $t1 := move($t0)
+  1: $t2 := 1
+  2: $t3 := pack SmokeTest::R($t2)
+  3: move_to<SmokeTest::R>($t3, $t1)
+  4: return ()
+}
+
+
+[variant baseline]
+fun SmokeTest::create_resoure_generic($t0|sender: &signer) {
+     var $t1: &signer
+     var $t2: u64
+     var $t3: SmokeTest::G<u64>
+  0: $t1 := move($t0)
+  1: $t2 := 1
+  2: $t3 := pack SmokeTest::G<u64>($t2)
+  3: move_to<SmokeTest::G<u64>>($t3, $t1)
+  4: return ()
+}
+
+
+[variant baseline]
+fun SmokeTest::exists_resource($t0|sender: &signer): bool {
+     var $t1: &signer
+     var $t2: address
+     var $t3: bool
+  0: $t1 := move($t0)
+  1: $t2 := signer::address_of($t1)
+  2: $t3 := exists<SmokeTest::R>($t2)
+  3: return $t3
+}
+
+
+[variant baseline]
+fun SmokeTest::identity($t0|a: SmokeTest::A, $t1|b: SmokeTest::B, $t2|c: SmokeTest::C): (SmokeTest::A, SmokeTest::B, SmokeTest::C) {
+     var $t3: SmokeTest::A
+     var $t4: SmokeTest::B
+     var $t5: SmokeTest::C
+  0: $t3 := move($t0)
+  1: $t4 := move($t1)
+  2: $t5 := move($t2)
+  3: return ($t3, $t4, $t5)
+}
+
+
+[variant baseline]
+fun SmokeTest::move_from_addr($t0|a: address) {
+     var $t1: address
+     var $t2: SmokeTest::R
+     var $t3: u64
+  0: $t1 := move($t0)
+  1: $t2 := move_from<SmokeTest::R>($t1)
+  2: $t3 := unpack SmokeTest::R($t2)
+  3: drop($t3)
+  4: return ()
+}
+
+
+[variant baseline]
+fun SmokeTest::move_from_addr_to_sender($t0|sender: &signer, $t1|a: address) {
+     var $t2|x: u64
+     var $t3: address
+     var $t4: SmokeTest::R
+     var $t5: u64
+     var $t6: &signer
+     var $t7: u64
+     var $t8: SmokeTest::R
+  0: $t3 := move($t1)
+  1: $t4 := move_from<SmokeTest::R>($t3)
+  2: $t5 := unpack SmokeTest::R($t4)
+  3: $t2 := $t5
+  4: $t6 := move($t0)
+  5: $t7 := move($t2)
+  6: $t8 := pack SmokeTest::R($t7)
+  7: move_to<SmokeTest::R>($t8, $t6)
+  8: return ()
+}
+
+
+[variant baseline]
+fun SmokeTest::pack_A($t0|a: address, $t1|va: u64): SmokeTest::A {
+     var $t2: address
+     var $t3: u64
+     var $t4: SmokeTest::A
+  0: $t2 := move($t0)
+  1: $t3 := move($t1)
+  2: $t4 := pack SmokeTest::A($t2, $t3)
+  3: return $t4
+}
+
+
+[variant baseline]
+fun SmokeTest::pack_B($t0|a: address, $t1|va: u64, $t2|vb: u64): SmokeTest::B {
+     var $t3|var_a: SmokeTest::A
+     var $t4: address
+     var $t5: u64
+     var $t6: SmokeTest::A
+     var $t7: u64
+     var $t8: SmokeTest::A
+     var $t9: SmokeTest::B
+  0: $t4 := move($t0)
+  1: $t5 := move($t1)
+  2: $t6 := pack SmokeTest::A($t4, $t5)
+  3: $t3 := $t6
+  4: $t7 := move($t2)
+  5: $t8 := move($t3)
+  6: $t9 := pack SmokeTest::B($t7, $t8)
+  7: return $t9
+}
+
+
+[variant baseline]
+fun SmokeTest::pack_C($t0|a: address, $t1|va: u64, $t2|vb: u64, $t3|vc: u64): SmokeTest::C {
+     var $t4|var_a: SmokeTest::A
+     var $t5|var_b: SmokeTest::B
+     var $t6: address
+     var $t7: u64
+     var $t8: SmokeTest::A
+     var $t9: u64
+     var $t10: SmokeTest::A
+     var $t11: SmokeTest::B
+     var $t12: u64
+     var $t13: SmokeTest::B
+     var $t14: SmokeTest::C
+  0: $t6 := move($t0)
+  1: $t7 := move($t1)
+  2: $t8 := pack SmokeTest::A($t6, $t7)
+  3: $t4 := $t8
+  4: $t9 := move($t2)
+  5: $t10 := move($t4)
+  6: $t11 := pack SmokeTest::B($t9, $t10)
+  7: $t5 := $t11
+  8: $t12 := move($t3)
+  9: $t13 := move($t5)
+ 10: $t14 := pack SmokeTest::C($t12, $t13)
+ 11: return $t14
+}
+
+
+[variant baseline]
+fun SmokeTest::ref_A($t0|a: address, $t1|b: bool): SmokeTest::A {
+     var $t2|tmp#$2: SmokeTest::A
+     var $t3|var_a: SmokeTest::A
+     var $t4: bool
+     var $t5: address
+     var $t6: u64
+     var $t7: SmokeTest::A
+     var $t8: address
+     var $t9: u64
+     var $t10: SmokeTest::A
+     var $t11: SmokeTest::A
+     var $t12: &SmokeTest::A
+     var $t13: &u64
+     var $t14: u64
+     var $t15: u64
+     var $t16: bool
+     var $t17: u64
+     var $t18: SmokeTest::A
+  0: $t4 := move($t1)
+  1: if ($t4) goto 2 else goto 8
+  2: label L1
+  3: $t5 := move($t0)
+  4: $t6 := 1
+  5: $t7 := pack SmokeTest::A($t5, $t6)
+  6: $t2 := $t7
+  7: goto 14
+  8: label L0
+  9: $t8 := move($t0)
+ 10: $t9 := 42
+ 11: $t10 := pack SmokeTest::A($t8, $t9)
+ 12: $t2 := $t10
+ 13: goto 14
+ 14: label L2
+ 15: $t11 := move($t2)
+ 16: $t3 := $t11
+ 17: $t12 := borrow_local($t3)
+ 18: $t13 := borrow_field<SmokeTest::A>.val($t12)
+ 19: $t14 := read_ref($t13)
+ 20: $t15 := 42
+ 21: $t16 := !=($t14, $t15)
+ 22: if ($t16) goto 23 else goto 26
+ 23: label L4
+ 24: $t17 := 42
+ 25: abort($t17)
+ 26: label L3
+ 27: $t18 := move($t3)
+ 28: return $t18
+}
+
+
+[variant baseline]
+fun SmokeTest::unpack_A($t0|a: address, $t1|va: u64): (address, u64) {
+     var $t2: address
+     var $t3: u64
+     var $t4: SmokeTest::A
+     var $t5: address
+     var $t6: u64
+  0: $t2 := move($t0)
+  1: $t3 := move($t1)
+  2: $t4 := pack SmokeTest::A($t2, $t3)
+  3: ($t5, $t6) := unpack SmokeTest::A($t4)
+  4: return ($t5, $t6)
+}
+
+
+[variant baseline]
+fun SmokeTest::unpack_B($t0|a: address, $t1|va: u64, $t2|vb: u64): (address, u64, u64) {
+     var $t3|aa: address
+     var $t4|v1: u64
+     var $t5|v2: u64
+     var $t6|var_a: SmokeTest::A
+     var $t7: address
+     var $t8: u64
+     var $t9: SmokeTest::A
+     var $t10: u64
+     var $t11: SmokeTest::A
+     var $t12: SmokeTest::B
+     var $t13: u64
+     var $t14: SmokeTest::A
+     var $t15: address
+     var $t16: u64
+     var $t17: address
+     var $t18: u64
+     var $t19: u64
+  0: $t7 := move($t0)
+  1: $t8 := move($t1)
+  2: $t9 := pack SmokeTest::A($t7, $t8)
+  3: $t6 := $t9
+  4: $t10 := move($t2)
+  5: $t11 := move($t6)
+  6: $t12 := pack SmokeTest::B($t10, $t11)
+  7: ($t13, $t14) := unpack SmokeTest::B($t12)
+  8: ($t15, $t16) := unpack SmokeTest::A($t14)
+  9: $t4 := $t16
+ 10: $t3 := $t15
+ 11: $t5 := $t13
+ 12: $t17 := move($t3)
+ 13: $t18 := move($t4)
+ 14: $t19 := move($t5)
+ 15: return ($t17, $t18, $t19)
+}
+
+
+[variant baseline]
+fun SmokeTest::unpack_C($t0|a: address, $t1|va: u64, $t2|vb: u64, $t3|vc: u64): (address, u64, u64, u64) {
+     var $t4|aa: address
+     var $t5|v1: u64
+     var $t6|v2: u64
+     var $t7|v3: u64
+     var $t8|var_a: SmokeTest::A
+     var $t9|var_b: SmokeTest::B
+     var $t10: address
+     var $t11: u64
+     var $t12: SmokeTest::A
+     var $t13: u64
+     var $t14: SmokeTest::A
+     var $t15: SmokeTest::B
+     var $t16: u64
+     var $t17: SmokeTest::B
+     var $t18: SmokeTest::C
+     var $t19: u64
+     var $t20: SmokeTest::B
+     var $t21: u64
+     var $t22: SmokeTest::A
+     var $t23: address
+     var $t24: u64
+     var $t25: address
+     var $t26: u64
+     var $t27: u64
+     var $t28: u64
+  0: $t10 := move($t0)
+  1: $t11 := move($t1)
+  2: $t12 := pack SmokeTest::A($t10, $t11)
+  3: $t8 := $t12
+  4: $t13 := move($t2)
+  5: $t14 := move($t8)
+  6: $t15 := pack SmokeTest::B($t13, $t14)
+  7: $t9 := $t15
+  8: $t16 := move($t3)
+  9: $t17 := move($t9)
+ 10: $t18 := pack SmokeTest::C($t16, $t17)
+ 11: ($t19, $t20) := unpack SmokeTest::C($t18)
+ 12: ($t21, $t22) := unpack SmokeTest::B($t20)
+ 13: ($t23, $t24) := unpack SmokeTest::A($t22)
+ 14: $t5 := $t24
+ 15: $t4 := $t23
+ 16: $t6 := $t21
+ 17: $t7 := $t19
+ 18: $t25 := move($t4)
+ 19: $t26 := move($t5)
+ 20: $t27 := move($t6)
+ 21: $t28 := move($t7)
+ 22: return ($t25, $t26, $t27, $t28)
+}
diff --git a/third_party/move/move-model/bytecode/tests/from_move/specs-in-fun.v2_exp b/third_party/move/move-model/bytecode/tests/from_move/specs-in-fun.v2_exp
new file mode 100644
index 0000000000000..a245bfe24237e
--- /dev/null
+++ b/third_party/move/move-model/bytecode/tests/from_move/specs-in-fun.v2_exp
@@ -0,0 +1,92 @@
+============ initial translation from Move ================
+
+[variant baseline]
+fun TestSpecBlock::looping($t0|x: u64): u64 {
+     var $t1: u64
+     var $t2: u64
+     var $t3: bool
+     var $t4: u64
+     var $t5: u64
+     var $t6: u64
+     var $t7: u64
+  0: assume Le($t0, 10)
+  1: goto 2
+  2: label L3
+  3: $t1 := copy($t0)
+  4: $t2 := 10
+  5: $t3 := <($t1, $t2)
+  6: if ($t3) goto 7 else goto 16
+  7: label L1
+  8: goto 9
+  9: label L2
+ 10: assume Lt($t0, 10)
+ 11: $t4 := move($t0)
+ 12: $t5 := 1
+ 13: $t6 := +($t4, $t5)
+ 14: $t0 := $t6
+ 15: goto 2
+ 16: label L0
+ 17: assert Eq<u64>($t0, 10)
+ 18: $t7 := move($t0)
+ 19: return $t7
+}
+
+
+[variant baseline]
+fun TestSpecBlock::simple1($t0|x: u64, $t1|y: u64) {
+     var $t2: u64
+     var $t3: u64
+     var $t4: bool
+     var $t5: bool
+     var $t6: u64
+  0: $t2 := copy($t0)
+  1: $t3 := copy($t1)
+  2: $t4 := >($t2, $t3)
+  3: $t5 := !($t4)
+  4: if ($t5) goto 5 else goto 8
+  5: label L1
+  6: $t6 := 1
+  7: abort($t6)
+  8: label L0
+  9: assert Gt($t0, $t1)
+ 10: return ()
+}
+
+
+[variant baseline]
+fun TestSpecBlock::simple2($t0|x: u64) {
+     var $t1|y: u64
+     var $t2: u64
+     var $t3: u64
+     var $t4: u64
+  0: $t2 := copy($t0)
+  1: $t3 := 1
+  2: $t4 := +($t2, $t3)
+  3: $t1 := $t4
+  4: assert Eq<u64>($t0, Sub($t1, 1))
+  5: return ()
+}
+
+
+[variant baseline]
+fun TestSpecBlock::simple3($t0|x: u64, $t1|y: u64) {
+  0: assume Gt($t0, $t1)
+  1: assert Ge($t0, $t1)
+  2: return ()
+}
+
+
+[variant baseline]
+fun TestSpecBlock::simple4($t0|x: u64, $t1|y: u64) {
+     var $t2|z: u64
+     var $t3: u64
+     var $t4: u64
+     var $t5: u64
+  0: $t3 := copy($t0)
+  1: $t4 := copy($t1)
+  2: $t5 := +($t3, $t4)
+  3: $t2 := $t5
+  4: assume Gt($t0, $t1)
+  5: assert Gt($t2, Mul(2, $t1))
+  6: return ()
+}
diff --git a/third_party/move/move-model/bytecode/tests/from_move/vector_instructions.v2_exp b/third_party/move/move-model/bytecode/tests/from_move/vector_instructions.v2_exp
new file mode 100644
index 0000000000000..a5aa9dd73665e
--- /dev/null
+++ b/third_party/move/move-model/bytecode/tests/from_move/vector_instructions.v2_exp
@@ -0,0 +1,111 @@
+============ initial translation from Move ================
+
+[variant baseline]
+public intrinsic fun vector::contains<#0>($t0|v: &vector<#0>, $t1|e: &#0): bool;
+
+
+[variant baseline]
+public intrinsic fun vector::index_of<#0>($t0|v: &vector<#0>, $t1|e: &#0): (bool, u64);
+
+
+[variant baseline]
+public intrinsic fun vector::append<#0>($t0|lhs: &mut vector<#0>, $t1|other: vector<#0>);
+
+
+[variant baseline]
+public native fun vector::borrow<#0>($t0|v: &vector<#0>, $t1|i: u64): &#0;
+
+
+[variant baseline]
+public native fun vector::borrow_mut<#0>($t0|v: &mut vector<#0>, $t1|i: u64): &mut #0;
+
+
+[variant baseline]
+public native fun vector::destroy_empty<#0>($t0|v: vector<#0>);
+
+
+[variant baseline]
+public native fun vector::empty<#0>(): vector<#0>;
+
+
+[variant baseline]
+public intrinsic fun vector::is_empty<#0>($t0|v: &vector<#0>): bool;
+
+
+[variant baseline]
+public native fun vector::length<#0>($t0|v: &vector<#0>): u64;
+
+
+[variant baseline]
+public native fun vector::pop_back<#0>($t0|v: &mut vector<#0>): #0;
+
+
+[variant baseline]
+public native fun vector::push_back<#0>($t0|v: &mut vector<#0>, $t1|e: #0);
+
+
+[variant baseline]
+public intrinsic fun vector::remove<#0>($t0|v: &mut vector<#0>, $t1|i: u64): #0;
+
+
+[variant baseline]
+public intrinsic fun vector::reverse<#0>($t0|v: &mut vector<#0>);
+
+
+[variant baseline]
+public fun vector::singleton<#0>($t0|e: #0): vector<#0> {
+     var $t1|v: vector<#0>
+     var $t2: vector<#0>
+     var $t3: &mut vector<#0>
+     var $t4: #0
+     var $t5: vector<#0>
+  0: $t2 := vector::empty<#0>()
+  1: $t1 := $t2
+  2: $t3 := borrow_local($t1)
+  3: $t4 := move($t0)
+  4: vector::push_back<#0>($t3, $t4)
+  5: $t5 := move($t1)
+  6: return $t5
+}
+
+
+[variant baseline]
+public native fun vector::swap<#0>($t0|v: &mut vector<#0>, $t1|i: u64, $t2|j: u64);
+
+
+[variant baseline]
+public intrinsic fun vector::swap_remove<#0>($t0|v: &mut vector<#0>, $t1|i: u64): #0;
+
+
+[variant baseline]
+fun M::f() {
+     var $t0|v: vector<u8>
+     var $t1: u8
+     var $t2: u8
+     var $t3: vector<u8>
+     var $t4: &mut vector<u8>
+     var $t5: &vector<u8>
+     var $t6: u64
+     var $t7: u64
+     var $t8: bool
+     var $t9: u64
+  0: $t1 := 0
+  1: $t2 := 0
+  2: $t3 := vector::empty<u8>()
+  3: $t4 := borrow_local($t3)
+  4: vector::push_back<u8>($t4, $t1)
+  5: vector::push_back<u8>($t4, $t2)
+  6: $t0 := $t3
+  7: $t5 := borrow_local($t0)
+  8: $t6 := vector::length<u8>($t5)
+  9: $t7 := 1
+ 10: $t8 := ==($t6, $t7)
+ 11: if ($t8) goto 12 else goto 14
+ 12: label L1
+ 13: goto 17
+ 14: label L0
+ 15: $t9 := 0
+ 16: abort($t9)
+ 17: label L2
+ 18: return ()
+}
diff --git a/third_party/move/move-model/bytecode/tests/livevar/basic_test.v2_exp b/third_party/move/move-model/bytecode/tests/livevar/basic_test.v2_exp
new file mode 100644
index 0000000000000..b86f412b221d5
--- /dev/null
+++ b/third_party/move/move-model/bytecode/tests/livevar/basic_test.v2_exp
@@ -0,0 +1,272 @@
+============ initial translation from Move ================
+
+[variant baseline]
+fun TestLiveVars::test1($t0|r_ref: &TestLiveVars::R): u64 {
+     var $t1: &TestLiveVars::R
+     var $t2: &u64
+     var $t3: u64
+  0: $t1 := move($t0)
+  1: $t2 := borrow_field<TestLiveVars::R>.x($t1)
+  2: $t3 := read_ref($t2)
+  3: return $t3
+}
+
+
+[variant baseline]
+fun TestLiveVars::test2($t0|b: bool): u64 {
+     var $t1|r1: TestLiveVars::R
+     var $t2|r2: TestLiveVars::R
+     var $t3|r_ref: &TestLiveVars::R
+     var $t4: u64
+     var $t5: TestLiveVars::R
+     var $t6: u64
+     var $t7: TestLiveVars::R
+     var $t8: &TestLiveVars::R
+     var $t9: bool
+     var $t10: &TestLiveVars::R
+     var $t11: &TestLiveVars::R
+     var $t12: &TestLiveVars::R
+     var $t13: u64
+  0: $t4 := 3
+  1: $t5 := pack TestLiveVars::R($t4)
+  2: $t1 := $t5
+  3: $t6 := 4
+  4: $t7 := pack TestLiveVars::R($t6)
+  5: $t2 := $t7
+  6: $t8 := borrow_local($t1)
+  7: $t3 := $t8
+  8: $t9 := move($t0)
+  9: if ($t9) goto 10 else goto 16
+ 10: label L1
+ 11: $t10 := move($t3)
+ 12: drop($t10)
+ 13: $t11 := borrow_local($t2)
+ 14: $t3 := $t11
+ 15: goto 16
+ 16: label L0
+ 17: $t12 := move($t3)
+ 18: $t13 := TestLiveVars::test1($t12)
+ 19: return $t13
+}
+
+
+[variant baseline]
+fun TestLiveVars::test3($t0|n: u64, $t1|r_ref: &TestLiveVars::R): u64 {
+     var $t2|r1: TestLiveVars::R
+     var $t3|r2: TestLiveVars::R
+     var $t4: u64
+     var $t5: TestLiveVars::R
+     var $t6: u64
+     var $t7: TestLiveVars::R
+     var $t8: u64
+     var $t9: u64
+     var $t10: bool
+     var $t11: &TestLiveVars::R
+     var $t12: u64
+     var $t13: u64
+     var $t14: u64
+     var $t15: u64
+     var $t16: bool
+     var $t17: &TestLiveVars::R
+     var $t18: &TestLiveVars::R
+     var $t19: u64
+     var $t20: u64
+     var $t21: u64
+     var $t22: &TestLiveVars::R
+     var $t23: u64
+  0: $t4 := 3
+  1: $t5 := pack TestLiveVars::R($t4)
+  2: $t2 := $t5
+  3: $t6 := 4
+  4: $t7 := pack TestLiveVars::R($t6)
+  5: $t3 := $t7
+  6: goto 7
+  7: label L6
+  8: $t8 := 0
+  9: $t9 := copy($t0)
+ 10: $t10 := <($t8, $t9)
+ 11: if ($t10) goto 12 else goto 37
+ 12: label L1
+ 13: goto 14
+ 14: label L2
+ 15: $t11 := move($t1)
+ 16: drop($t11)
+ 17: $t12 := copy($t0)
+ 18: $t13 := 2
+ 19: $t14 := /($t12, $t13)
+ 20: $t15 := 0
+ 21: $t16 := ==($t14, $t15)
+ 22: if ($t16) goto 23 else goto 27
+ 23: label L4
+ 24: $t17 := borrow_local($t2)
+ 25: $t1 := $t17
+ 26: goto 31
+ 27: label L3
+ 28: $t18 := borrow_local($t3)
+ 29: $t1 := $t18
+ 30: goto 31
+ 31: label L5
+ 32: $t19 := move($t0)
+ 33: $t20 := 1
+ 34: $t21 := -($t19, $t20)
+ 35: $t0 := $t21
+ 36: goto 7
+ 37: label L0
+ 38: $t22 := move($t1)
+ 39: $t23 := TestLiveVars::test1($t22)
+ 40: return $t23
+}
+
+============ after pipeline `livevar` ================
+
+[variant baseline]
+fun TestLiveVars::test1($t0|r_ref: &TestLiveVars::R): u64 {
+     var $t1: &u64
+     var $t2: u64
+     # live vars: r_ref
+  0: $t1 := borrow_field<TestLiveVars::R>.x($t0)
+     # live vars: $t1
+  1: $t2 := read_ref($t1)
+     # live vars: $t2
+  2: return $t2
+}
+
+
+[variant baseline]
+fun TestLiveVars::test2($t0|b: bool): u64 {
+     var $t1|r1: TestLiveVars::R
+     var $t2|r2: TestLiveVars::R
+     var $t3|r_ref: &TestLiveVars::R
+     var $t4: u64
+     var $t5: u64
+     var $t6: &TestLiveVars::R
+     var $t7: &TestLiveVars::R
+     var $t8: u64
+     # live vars: b
+  0: $t4 := 3
+     # live vars: b, $t4
+  1: $t1 := pack TestLiveVars::R($t4)
+     # live vars: b, r1
+  2: $t5 := 4
+     # live vars: b, r1, $t5
+  3: $t2 := pack TestLiveVars::R($t5)
+     # live vars: b, r1, r2
+  4: $t6 := borrow_local($t1)
+     # live vars: b, r2, $t6
+  5: $t3 := $t6
+     # live vars: b, r2, r_ref, $t6
+  6: if ($t0) goto 15 else goto 18
+     # live vars: r2, $t6
+  7: label L1
+     # live vars: r2, $t6
+  8: drop($t6)
+     # live vars: r2
+  9: $t7 := borrow_local($t2)
+     # live vars: $t7
+ 10: $t3 := $t7
+     # live vars: r_ref
+ 11: goto 12
+     # live vars: r_ref
+ 12: label L0
+     # live vars: r_ref
+ 13: $t8 := TestLiveVars::test1($t3)
+     # live vars: $t8
+ 14: return $t8
+     # live vars: r2, r_ref, $t6
+ 15: label L2
+     # live vars: r2, r_ref, $t6
+ 16: drop($t3)
+     # live vars: r2, $t6
+ 17: goto 7
+     # live vars: r_ref, $t6
+ 18: label L3
+     # live vars: r_ref, $t6
+ 19: drop($t6)
+     # live vars: r_ref
+ 20: goto 12
+}
+
+
+[variant baseline]
+fun TestLiveVars::test3($t0|n: u64, $t1|r_ref: &TestLiveVars::R): u64 {
+     var $t2|r1: TestLiveVars::R
+     var $t3|r2: TestLiveVars::R
+     var $t4: u64
+     var $t5: u64
+     var $t6: u64
+     var $t7: bool
+     var $t8: u64
+     var $t9: u64
+     var $t10: u64
+     var $t11: bool
+     var $t12: &TestLiveVars::R
+     var $t13: &TestLiveVars::R
+     var $t14: u64
+     var $t15: u64
+     # live vars: n, r_ref
+  0: $t4 := 3
+     # live vars: n, r_ref, $t4
+  1: $t2 := pack TestLiveVars::R($t4)
+     # live vars: n, r_ref, r1
+  2: $t5 := 4
+     # live vars: n, r_ref, r1, $t5
+  3: $t3 := pack TestLiveVars::R($t5)
+     # live vars: n, r_ref, r1, r2
+  4: goto 5
+     # live vars: n, r_ref, r1, r2
+  5: label L6
+     # live vars: n, r_ref, r1, r2
+  6: $t6 := 0
+     # live vars: n, r_ref, r1, r2, $t6
+  7: $t7 := <($t6, $t0)
+     # live vars: n, r_ref, r1, r2, $t7
+  8: if ($t7) goto 9 else goto 30
+     # live vars: n, r_ref, r1, r2
+  9: label L1
+     # live vars: n, r_ref, r1, r2
+ 10: goto 11
+     # live vars: n, r_ref, r1, r2
+ 11: label L2
+     # live vars: n, r_ref, r1, r2
+ 12: drop($t1)
+     # live vars: n, r1, r2
+ 13: $t8 := 2
+     # live vars: n, r1, r2, $t8
+ 14: $t9 := /($t0, $t8)
+     # live vars: n, r1, r2, $t9
+ 15: $t10 := 0
+     # live vars: n, r1, r2, $t9, $t10
+ 16: $t11 := ==($t9, $t10)
+     # live vars: n, r1, r2, $t11
+ 17: if ($t11) goto 18 else goto 22
+     # live vars: n, r1, r2
+ 18: label L4
+     # live vars: n, r1, r2
+ 19: $t12 := borrow_local($t2)
+     # live vars: n, r1, r2, $t12
+ 20: $t1 := $t12
+     # live vars: n, r_ref, r1, r2
+ 21: goto 26
+     # live vars: n, r1, r2
+ 22: label L3
+     # live vars: n, r1, r2
+ 23: $t13 := borrow_local($t3)
+     # live vars: n, r1, r2, $t13
+ 24: $t1 := $t13
+     # live vars: n, r_ref, r1, r2
+ 25: goto 26
+     # live vars: n, r_ref, r1, r2
+ 26: label L5
+     # live vars: n, r_ref, r1, r2
+ 27: $t14 := 1
+     # live vars: n, r_ref, r1, r2, $t14
+ 28: $t0 := -($t0, $t14)
+     # live vars: n, r_ref, r1, r2
+ 29: goto 5
+     # live vars: r_ref
+ 30: label L0
+     # live vars: r_ref
+ 31: $t15 := TestLiveVars::test1($t1)
+     # live vars: $t15
+ 32: return $t15
+}
diff --git a/third_party/move/move-model/bytecode/tests/reaching_def/basic_test.v2_exp b/third_party/move/move-model/bytecode/tests/reaching_def/basic_test.v2_exp
new file mode 100644
index 0000000000000..f6a91b898b558
--- /dev/null
+++ b/third_party/move/move-model/bytecode/tests/reaching_def/basic_test.v2_exp
@@ -0,0 +1,71 @@
+============ initial translation from Move ================
+
+[variant baseline]
+fun ReachingDefTest::basic($t0|a: u64, $t1|b: u64): u64 {
+     var $t2: u64
+     var $t3: u64
+     var $t4: u64
+     var $t5: u64
+     var $t6: u64
+     var $t7: u64
+     var $t8: u64
+  0: $t2 := copy($t0)
+  1: $t3 := move($t1)
+  2: $t4 := +($t2, $t3)
+  3: $t5 := move($t0)
+  4: $t6 := /($t4, $t5)
+  5: $t7 := 1
+  6: $t8 := +($t6, $t7)
+  7: return $t8
+}
+
+
+[variant baseline]
+fun ReachingDefTest::create_resource($t0|sender: &signer) {
+     var $t1: &signer
+     var $t2: u64
+     var $t3: bool
+     var $t4: ReachingDefTest::R
+  0: $t1 := move($t0)
+  1: $t2 := 1
+  2: $t3 := false
+  3: $t4 := pack ReachingDefTest::R($t2, $t3)
+  4: move_to<ReachingDefTest::R>($t4, $t1)
+  5: return ()
+}
+
+============ after pipeline `reaching_def` ================
+
+[variant baseline]
+fun ReachingDefTest::basic($t0|a: u64, $t1|b: u64): u64 {
+     var $t2: u64
+     var $t3: u64
+     var $t4: u64
+     var $t5: u64
+     var $t6: u64
+     var $t7: u64
+     var $t8: u64
+  0: $t2 := copy($t0)
+  1: $t3 := move($t1)
+  2: $t4 := +($t0, $t1)
+  3: $t5 := move($t0)
+  4: $t6 := /($t4, $t0)
+  5: $t7 := 1
+  6: $t8 := +($t6, $t7)
+  7: return $t8
+}
+
+
+[variant baseline]
+fun ReachingDefTest::create_resource($t0|sender: &signer) {
+     var $t1: &signer
+     var $t2: u64
+     var $t3: bool
+     var $t4: ReachingDefTest::R
+  0: $t1 := move($t0)
+  1: $t2 := 1
+  2: $t3 := false
+  3: $t4 := pack ReachingDefTest::R($t2, $t3)
+  4: move_to<ReachingDefTest::R>($t4, $t0)
+  5: return ()
+}
diff --git a/third_party/move/move-model/bytecode/tests/reaching_def/test_branching.v2_exp b/third_party/move/move-model/bytecode/tests/reaching_def/test_branching.v2_exp
new file mode 100644
index 0000000000000..335f083dfeaf0
--- /dev/null
+++ b/third_party/move/move-model/bytecode/tests/reaching_def/test_branching.v2_exp
@@ -0,0 +1,47 @@
+============ initial translation from Move ================
+
+[variant baseline]
+fun TestBranching::branching($t0|cond: bool): u64 {
+     var $t1|tmp#$1: u64
+     var $t2: bool
+     var $t3: u64
+     var $t4: u64
+     var $t5: u64
+  0: $t2 := move($t0)
+  1: if ($t2) goto 2 else goto 6
+  2: label L1
+  3: $t3 := 3
+  4: $t1 := $t3
+  5: goto 10
+  6: label L0
+  7: $t4 := 4
+  8: $t1 := $t4
+  9: goto 10
+ 10: label L2
+ 11: $t5 := move($t1)
+ 12: return $t5
+}
+
+============ after pipeline `reaching_def` ================
+
+[variant baseline]
+fun TestBranching::branching($t0|cond: bool): u64 {
+     var $t1|tmp#$1: u64
+     var $t2: bool
+     var $t3: u64
+     var $t4: u64
+     var $t5: u64
+  0: $t2 := move($t0)
+  1: if ($t0) goto 2 else goto 6
+  2: label L1
+  3: $t3 := 3
+  4: $t1 := $t3
+  5: goto 10
+  6: label L0
+  7: $t4 := 4
+  8: $t1 := $t4
+  9: goto 10
+ 10: label L2
+ 11: $t5 := move($t1)
+ 12: return $t1
+}
diff --git a/third_party/move/move-model/bytecode/tests/usage_analysis/test.v2_exp b/third_party/move/move-model/bytecode/tests/usage_analysis/test.v2_exp
new file mode 100644
index 0000000000000..3d955b5512ada
--- /dev/null
+++ b/third_party/move/move-model/bytecode/tests/usage_analysis/test.v2_exp
@@ -0,0 +1,227 @@
+============ initial translation from Move ================
+
+[variant baseline]
+public fun Test::update<#0>($t0|x: #0) {
+     var $t1: #0
+     var $t2: address
+     var $t3: &mut Test::A<#0, #0>
+     var $t4: &mut #0
+  0: $t1 := move($t0)
+  1: $t2 := 0x1
+  2: $t3 := borrow_global<Test::A<#0, #0>>($t2)
+  3: $t4 := borrow_field<Test::A<#0, #0>>.x1($t3)
+  4: write_ref($t4, $t1)
+  5: return ()
+}
+
+
+[variant baseline]
+public fun Test::assert_assume_memory() {
+  0: assume exists<Test::A<bool, u64>>(0x1)
+  1: assert exists<Test::A<u64, bool>>(0x1)
+  2: return ()
+}
+
+
+[variant baseline]
+public fun Test::call_assert_assume_memory() {
+  0: Test::assert_assume_memory()
+  1: return ()
+}
+
+
+[variant baseline]
+public fun Test::publish<#0>($t0|signer: &signer, $t1|x: Test::A<#0, u8>) {
+     var $t2: &signer
+     var $t3: Test::A<#0, u8>
+  0: $t2 := move($t0)
+  1: $t3 := move($t1)
+  2: move_to<Test::A<#0, u8>>($t3, $t2)
+  3: return ()
+}
+
+
+[variant baseline]
+public fun Test::test<#0>(): bool {
+     var $t0: address
+     var $t1: bool
+  0: $t0 := 0x1
+  1: $t1 := exists<Test::A<u64, #0>>($t0)
+  2: return $t1
+}
+
+
+[variant baseline]
+public fun Test::update_caller() {
+     var $t0: u8
+  0: $t0 := 1
+  1: Test::update<u8>($t0)
+  2: return ()
+}
+
+
+[variant baseline]
+public fun Test::update_ints() {
+     var $t0: u64
+     var $t1: address
+     var $t2: &mut Test::A<u64, u128>
+     var $t3: &mut u64
+  0: $t0 := 22
+  1: $t1 := 0x1
+  2: $t2 := borrow_global<Test::A<u64, u128>>($t1)
+  3: $t3 := borrow_field<Test::A<u64, u128>>.x1($t2)
+  4: write_ref($t3, $t0)
+  5: return ()
+}
+
+============ after pipeline `usage_analysis` ================
+
+[variant baseline]
+public fun Test::update<#0>($t0|x: #0) {
+     var $t1: #0
+     var $t2: address
+     var $t3: &mut Test::A<#0, #0>
+     var $t4: &mut #0
+  0: $t1 := move($t0)
+  1: $t2 := 0x1
+  2: $t3 := borrow_global<Test::A<#0, #0>>($t2)
+  3: $t4 := borrow_field<Test::A<#0, #0>>.x1($t3)
+  4: write_ref($t4, $t1)
+  5: return ()
+}
+
+
+[variant baseline]
+public fun Test::assert_assume_memory() {
+  0: assume exists<Test::A<bool, u64>>(0x1)
+  1: assert exists<Test::A<u64, bool>>(0x1)
+  2: return ()
+}
+
+
+[variant baseline]
+public fun Test::call_assert_assume_memory() {
+  0: Test::assert_assume_memory()
+  1: return ()
+}
+
+
+[variant baseline]
+public fun Test::publish<#0>($t0|signer: &signer, $t1|x: Test::A<#0, u8>) {
+     var $t2: &signer
+     var $t3: Test::A<#0, u8>
+  0: $t2 := move($t0)
+  1: $t3 := move($t1)
+  2: move_to<Test::A<#0, u8>>($t3, $t2)
+  3: return ()
+}
+
+
+[variant baseline]
+public fun Test::test<#0>(): bool {
+     var $t0: address
+     var $t1: bool
+  0: $t0 := 0x1
+  1: $t1 := exists<Test::A<u64, #0>>($t0)
+  2: return $t1
+}
+
+
+[variant baseline]
+public fun Test::update_caller() {
+     var $t0: u8
+  0: $t0 := 1
+  1: Test::update<u8>($t0)
+  2: return ()
+}
+
+
+[variant baseline]
+public fun Test::update_ints() {
+     var $t0: u64
+     var $t1: address
+     var $t2: &mut Test::A<u64, u128>
+     var $t3: &mut u64
+  0: $t0 := 22
+  1: $t1 := 0x1
+  2: $t2 := borrow_global<Test::A<u64, u128>>($t1)
+  3: $t3 := borrow_field<Test::A<u64, u128>>.x1($t2)
+  4: write_ref($t3, $t0)
+  5: return ()
+}
+
+
+
+********* Result of usage analysis *********
+
+
+function Test::update [baseline] {
+  accessed = {Test::A<#0, #0>}
+  directly accessed = {Test::A<#0, #0>}
+  modified = {Test::A<#0, #0>}
+  directly modified = {Test::A<#0, #0>}
+  assumed = {}
+  directly assumed = {}
+  asserted = {}
+  directly asserted = {}
+}
+function Test::assert_assume_memory [baseline] {
+  accessed = {Test::A<bool, u64>, Test::A<u64, bool>}
+  directly accessed = {Test::A<bool, u64>, Test::A<u64, bool>}
+  modified = {}
+  directly modified = {}
+  assumed = {Test::A<bool, u64>}
+  directly assumed = {Test::A<bool, u64>}
+  asserted = {Test::A<u64, bool>}
+  directly asserted = {Test::A<u64, bool>}
+}
+function Test::call_assert_assume_memory [baseline] {
+  accessed = {Test::A<bool, u64>, Test::A<u64, bool>}
+  directly accessed = {}
+  modified = {}
+  directly modified = {}
+  assumed = {Test::A<bool, u64>}
+  directly assumed = {}
+  asserted = {Test::A<u64, bool>}
+  directly asserted = {}
+}
+function Test::publish [baseline] {
+  accessed = {Test::A<#0, u8>}
+  directly accessed = {Test::A<#0, u8>}
+  modified = {Test::A<#0, u8>}
+  directly modified = {Test::A<#0, u8>}
+  assumed = {}
+  directly assumed = {}
+  asserted = {}
+  directly asserted = {}
+}
+function Test::test [baseline] {
+  accessed = {Test::A<u64, #0>}
+  directly accessed = {Test::A<u64, #0>}
+  modified = {}
+  directly modified = {}
+  assumed = {}
+  directly assumed = {}
+  asserted = {}
+  directly asserted = {}
+}
+function Test::update_caller [baseline] {
+  accessed = {Test::A<u8, u8>}
+  directly accessed = {}
+  modified = {Test::A<u8, u8>}
+  directly modified = {}
+  assumed = {}
+  directly assumed = {}
+  asserted = {}
+  directly asserted = {}
+}
+function Test::update_ints [baseline] {
+  accessed = {Test::A<u64, u128>}
+  directly accessed = {Test::A<u64, u128>}
+  modified = {Test::A<u64, u128>}
+  directly modified = {Test::A<u64, u128>}
+  assumed = {}
+  directly assumed = {}
+  asserted = {}
+  directly asserted = {}
+}
diff --git a/third_party/move/move-model/src/ast.rs b/third_party/move/move-model/src/ast.rs
index 1406092cc3696..8c500ea8e4df3 100644
--- a/third_party/move/move-model/src/ast.rs
+++ b/third_party/move/move-model/src/ast.rs
@@ -27,7 +27,7 @@ use std::{
     cell::RefCell,
     collections::{BTreeMap, BTreeSet, HashSet},
     fmt,
-    fmt::{Debug, Display, Error, Formatter},
+    fmt::{Debug, Error, Formatter},
     hash::Hash,
     iter,
     ops::Deref,
@@ -60,6 +60,8 @@ pub struct SpecFunDecl {
     pub body: Option<Exp>,
     pub callees: BTreeSet<QualifiedInstId<SpecFunId>>,
     pub is_recursive: RefCell<Option<bool>>,
+    /// The instantiations for which this function is known to use generic type reflection.
+    pub insts_using_generic_type_reflection: RefCell<BTreeMap<Vec<Type>, bool>>,
 }
 
 // =================================================================================================
@@ -182,7 +184,7 @@ impl ConditionKind {
     }
 }
 
-impl std::fmt::Display for ConditionKind {
+impl fmt::Display for ConditionKind {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         fn display_ty_params(
             f: &mut Formatter<'_>,
@@ -251,7 +253,7 @@ impl QuantKind {
     }
 }
 
-impl std::fmt::Display for QuantKind {
+impl fmt::Display for QuantKind {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         use QuantKind::*;
         match self {
@@ -510,6 +512,35 @@ pub enum AddressSpecifier {
     Call(QualifiedInstId<FunId>, Symbol),
 }
 
+impl ResourceSpecifier {
+    /// Checks whether this resource specifier matches the given struct. A function
+    /// instantiation is passed to instantiate the specifier in the calling context
+    /// of the function where it is declared for.
+    pub fn matches(
+        &self,
+        env: &GlobalEnv,
+        fun_inst: &[Type],
+        struct_id: &QualifiedInstId<StructId>,
+    ) -> bool {
+        use ResourceSpecifier::*;
+        let struct_env = env.get_struct(struct_id.to_qualified_id());
+        match self {
+            Any => true,
+            DeclaredAtAddress(addr) => struct_env.module_env.get_name().addr() == addr,
+            DeclaredInModule(mod_id) => struct_env.module_env.get_id() == *mod_id,
+            Resource(spec_struct_id) => {
+                // Since this resource specifier is declared for a specific function,
+                // need to instantiate it with the function instantiation.
+                let spec_struct_id = spec_struct_id.clone().instantiate(fun_inst);
+                struct_id.to_qualified_id() == spec_struct_id.to_qualified_id()
+                    // If the specified instance has no parameters, every type instance is
+                    // allowed, otherwise only the given one.
+                    && (spec_struct_id.inst.is_empty() || spec_struct_id.inst == struct_id.inst)
+            },
+        }
+    }
+}
+
 // =================================================================================================
 /// # Expressions
 
@@ -567,6 +598,8 @@ pub enum ExpData {
     Block(NodeId, Pattern, Option<Exp>, Exp),
     /// Represents a conditional.
     IfElse(NodeId, Exp, Exp, Exp),
+    /// Represents a variant match
+    Match(NodeId, Exp, Vec<MatchArm>),
 
     // ---------------------------------------------------------
     // Subsequent expressions only appear in imperative context
@@ -589,6 +622,14 @@ pub enum ExpData {
     SpecBlock(NodeId, Spec),
 }
 
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct MatchArm {
+    pub loc: Loc,
+    pub pattern: Pattern,
+    pub condition: Option<Exp>,
+    pub body: Exp,
+}
+
 /// An internalized expression. We do use a wrapper around the underlying internement implementation
 /// variant to ensure a unique API (LocalIntern and ArcIntern e.g. differ in the presence of
 /// the Copy trait, and by wrapping we effectively remove the Copy from LocalIntern).
@@ -651,13 +692,15 @@ pub enum RewriteResult {
 /// Visitor position
 #[derive(Clone)]
 pub enum VisitorPosition {
-    Pre,              // before visiting any subexpressions
-    MidMutate,        // after RHS and before LHS of Mutate expression.
-    BeforeBody,       // Before body of Block expression.
-    BeforeThen,       // Before then clause of IfElse expression.
-    BeforeElse,       // Before else clause of IfElse expression.
-    PreSequenceValue, // Before final expr in a Sequence (or before Post, if seq is empty)
-    Post,             // after visiting all subexpressions
+    Pre,                    // before visiting any subexpressions
+    MidMutate,              // after RHS and before LHS of Mutate expression.
+    BeforeBody,             // Before body of Block expression.
+    BeforeMatchBody(usize), // Before the ith body of a Match arm.
+    AfterMatchBody(usize),  // After the ith body of a Match arm.
+    BeforeThen,             // Before then clause of IfElse expression.
+    BeforeElse,             // Before else clause of IfElse expression.
+    PreSequenceValue,       // Before final expr in a Sequence (or before Post, if seq is empty)
+    Post,                   // after visiting all subexpressions
 }
 
 impl ExpData {
@@ -704,6 +747,7 @@ impl ExpData {
             | Quant(node_id, ..)
             | Block(node_id, ..)
             | IfElse(node_id, ..)
+            | Match(node_id, ..)
             | Sequence(node_id, ..)
             | Loop(node_id, ..)
             | LoopCont(node_id, ..)
@@ -819,6 +863,13 @@ impl ExpData {
                     // Remove declared variables from shadow
                     for_syms_in_pat_shadow_or_unshadow(pat, false, &mut shadow_map);
                 },
+                (Match(_, _, arms), BeforeMatchBody(idx)) => {
+                    // Add declared variables to shadow
+                    for_syms_in_pat_shadow_or_unshadow(&arms[idx].pattern, true, &mut shadow_map)
+                },
+                (Match(_, _, arms), AfterMatchBody(idx)) => {
+                    for_syms_in_pat_shadow_or_unshadow(&arms[idx].pattern, false, &mut shadow_map)
+                },
                 (Quant(_, _, ranges, ..), Pre) => {
                     for_syms_in_ranges_shadow_or_unshadow(ranges, true, &mut shadow_map);
                 },
@@ -1132,7 +1183,8 @@ impl ExpData {
             let should_continue = match x {
                 Pre => visitor(false, e),
                 Post => visitor(true, e),
-                MidMutate | BeforeBody | BeforeThen | BeforeElse | PreSequenceValue => true,
+                MidMutate | BeforeBody | BeforeThen | BeforeElse | BeforeMatchBody(_)
+                | AfterMatchBody(_) | PreSequenceValue => true,
             };
             if should_continue {
                 Some(())
@@ -1230,6 +1282,17 @@ impl ExpData {
                 visitor(VisitorPosition::BeforeElse, self)?;
                 e.visit_positions_impl(visitor)?;
             },
+            Match(_, d, arms) => {
+                d.visit_positions_impl(visitor)?;
+                for (i, arm) in arms.iter().enumerate() {
+                    visitor(VisitorPosition::BeforeMatchBody(i), self)?;
+                    if let Some(c) = &arm.condition {
+                        c.visit_positions_impl(visitor)?;
+                    }
+                    arm.body.visit_positions_impl(visitor)?;
+                    visitor(VisitorPosition::AfterMatchBody(i), self)?;
+                }
+            },
             Loop(_, e) => e.visit_positions_impl(visitor)?,
             Return(_, e) => e.visit_positions_impl(visitor)?,
             Sequence(_, es) => {
@@ -1454,7 +1517,7 @@ impl ExpData {
             if let ExpData::Call(_, oper, _) = e {
                 use Operation::*;
                 match oper {
-                    Select(mid, sid, ..) | UpdateField(mid, sid, ..) | Pack(mid, sid) => {
+                    Select(mid, sid, ..) | UpdateField(mid, sid, ..) | Pack(mid, sid, _) => {
                         usage.insert(mid.qualified(*sid));
                     },
                     _ => {},
@@ -1535,13 +1598,19 @@ impl<'a> ExpRewriterFunctions for ExpRewriter<'a> {
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub enum Operation {
     MoveFunction(ModuleId, FunId),
-    Pack(ModuleId, StructId),
+    Pack(ModuleId, StructId, /*variant*/ Option<Symbol>),
     Tuple,
+    Select(ModuleId, StructId, FieldId),
+    SelectVariants(
+        ModuleId,
+        StructId,
+        /* fields from different variants */ Vec<FieldId>,
+    ),
+    TestVariants(ModuleId, StructId, /* variants */ Vec<Symbol>),
 
     // Specification specific
     SpecFunction(ModuleId, SpecFunId, Option<Vec<MemoryLabel>>),
     Closure(ModuleId, FunId),
-    Select(ModuleId, StructId, FieldId),
     UpdateField(ModuleId, StructId, FieldId),
     Result(usize),
     Index,
@@ -1645,7 +1714,13 @@ pub enum Pattern {
     Var(NodeId, Symbol),
     Wildcard(NodeId),
     Tuple(NodeId, Vec<Pattern>),
-    Struct(NodeId, QualifiedInstId<StructId>, Vec<Pattern>),
+    Struct(
+        // Struct(_, struct_id, optional_variant, patterns)
+        NodeId,
+        QualifiedInstId<StructId>,
+        Option<Symbol>,
+        Vec<Pattern>,
+    ),
     Error(NodeId),
 }
 
@@ -1656,7 +1731,7 @@ impl Pattern {
             Pattern::Var(id, _)
             | Pattern::Wildcard(id)
             | Pattern::Tuple(id, _)
-            | Pattern::Struct(id, _, _)
+            | Pattern::Struct(id, _, _, _)
             | Pattern::Error(id) => *id,
         }
     }
@@ -1700,7 +1775,7 @@ impl Pattern {
     fn collect_vars(r: &mut Vec<(NodeId, Symbol)>, p: &Pattern) {
         use Pattern::*;
         match p {
-            Struct(_, _, args) | Tuple(_, args) => {
+            Struct(_, _, _, args) | Tuple(_, args) => {
                 for arg in args {
                     Self::collect_vars(r, arg)
                 }
@@ -1735,9 +1810,10 @@ impl Pattern {
     ) -> bool {
         use Pattern::*;
         match p {
-            Struct(_nodeid, qsid, args) => {
+            Struct(_nodeid, qsid, _, args) => {
                 if let Some(exp) = opt_exp {
-                    if let ExpData::Call(_, Operation::Pack(modid, sid), actuals) = exp.as_ref() {
+                    if let ExpData::Call(_, Operation::Pack(modid, sid, _), actuals) = exp.as_ref()
+                    {
                         if *sid == qsid.id && *modid == qsid.module_id {
                             Self::collect_vars_exprs_from_vector_exprs(r, args, actuals)
                         } else {
@@ -1795,7 +1871,9 @@ impl Pattern {
     ) -> bool {
         use Pattern::*;
         match p {
-            Struct(_nodeid, _qsid, args) => Self::collect_vars_exprs_from_vector_none(r, args),
+            Struct(_nodeid, _qsid, _variant, args) => {
+                Self::collect_vars_exprs_from_vector_none(r, args)
+            },
             Tuple(_, args) => {
                 if let Some(value) = opt_v {
                     match value {
@@ -1913,9 +1991,10 @@ impl Pattern {
                     .map(|pat| pat.remove_vars(vars))
                     .collect(),
             ),
-            Pattern::Struct(id, qsid, patvec) => Pattern::Struct(
+            Pattern::Struct(id, qsid, variant, patvec) => Pattern::Struct(
                 id,
                 qsid,
+                variant,
                 patvec
                     .into_iter()
                     .map(|pat| pat.remove_vars(vars))
@@ -1947,7 +2026,7 @@ impl Pattern {
                     None
                 }
             },
-            Pattern::Tuple(_, patvec) | Pattern::Struct(_, _, patvec) => {
+            Pattern::Tuple(_, patvec) | Pattern::Struct(_, _, _, patvec) => {
                 let pat_out: Vec<_> = patvec.iter().map(|pat| pat.replace_vars(var_map)).collect();
                 if pat_out.iter().any(|opt_pat| opt_pat.is_some()) {
                     // Need to build a new vec.
@@ -1959,8 +2038,8 @@ impl Pattern {
                         .collect();
                     match self {
                         Pattern::Tuple(id, _) => Some(Pattern::Tuple(*id, new_vec)),
-                        Pattern::Struct(id, qsid, _) => {
-                            Some(Pattern::Struct(*id, qsid.clone(), new_vec))
+                        Pattern::Struct(id, qsid, variant, _) => {
+                            Some(Pattern::Struct(*id, qsid.clone(), *variant, new_vec))
                         },
                         _ => None,
                     }
@@ -1988,7 +2067,7 @@ impl Pattern {
                     pat.visit_pre_post(visitor);
                 }
             },
-            Struct(_, _, patvec) => {
+            Struct(_, _, _, patvec) => {
                 for pat in patvec {
                     pat.visit_pre_post(visitor);
                 }
@@ -1997,50 +2076,14 @@ impl Pattern {
         visitor(true, self);
     }
 
-    pub fn to_string<'a>(&self, env: &GlobalEnv, tctx: &'a TypeDisplayContext<'a>) -> String {
-        match self {
-            Pattern::Var(id, name) => {
-                let ty = env.get_node_type(*id);
-                format!("{}: {}", name.display(env.symbol_pool()), ty.display(tctx))
-            },
-            Pattern::Tuple(_, args) => format!(
-                "({})",
-                args.iter().map(|pat| pat.to_string(env, tctx)).join(", ")
-            ),
-            Pattern::Struct(_, struct_id, args) => {
-                let inst_str = if !struct_id.inst.is_empty() {
-                    format!(
-                        "<{}>",
-                        struct_id.inst.iter().map(|ty| ty.display(tctx)).join(", ")
-                    )
-                } else {
-                    "".to_string()
-                };
-                let struct_env = env.get_struct(struct_id.to_qualified_id());
-                let field_names = struct_env.get_fields().map(|f| f.get_name());
-                let args_str = args
-                    .iter()
-                    .zip(field_names)
-                    .map(|(pat, sym)| {
-                        let field_name = env.symbol_pool().string(sym);
-                        let pattern_str = pat.to_string(env, tctx);
-                        if &pattern_str != field_name.as_ref() {
-                            format!("{}: {}", field_name.as_ref(), pat.to_string(env, tctx))
-                        } else {
-                            pattern_str
-                        }
-                    })
-                    .join(", ");
-                format!(
-                    "{}{}{{ {} }}",
-                    struct_env.get_full_name_str(),
-                    inst_str,
-                    args_str
-                )
-            },
-            Pattern::Wildcard(_) => "_".to_string(),
-            Pattern::Error(_) => "<error>".to_string(),
+    pub fn to_string(&self, fun_env: &FunctionEnv) -> String {
+        PatDisplay {
+            env: fun_env.module_env.env,
+            pat: self,
+            fun_env: Some(fun_env.clone()),
+            show_type: false,
         }
+        .to_string()
     }
 
     pub fn display<'a>(&'a self, env: &'a GlobalEnv) -> PatDisplay<'a> {
@@ -2048,7 +2091,7 @@ impl Pattern {
             env,
             pat: self,
             fun_env: None,
-            verbose: true,
+            show_type: true,
         }
     }
 
@@ -2057,7 +2100,7 @@ impl Pattern {
             env: other.env,
             pat: self,
             fun_env: other.fun_env.clone(),
-            verbose: other.verbose,
+            show_type: other.show_type,
         }
     }
 
@@ -2066,19 +2109,24 @@ impl Pattern {
             env: other.env,
             pat: self,
             fun_env: other.fun_env.clone(),
-            verbose: other.verbose,
+            show_type: true,
         }
     }
 }
 
+#[derive(Clone)]
 pub struct PatDisplay<'a> {
     env: &'a GlobalEnv,
     pat: &'a Pattern,
     fun_env: Option<FunctionEnv<'a>>,
-    verbose: bool,
+    show_type: bool,
 }
 
 impl<'a> PatDisplay<'a> {
+    fn set_show_type(self, show_type: bool) -> Self {
+        Self { show_type, ..self }
+    }
+
     fn type_ctx(&self) -> TypeDisplayContext<'a> {
         if let Some(fe) = &self.fun_env {
             fe.get_type_display_ctx()
@@ -2089,16 +2137,16 @@ impl<'a> PatDisplay<'a> {
 
     fn fmt_patterns(&self, f: &mut Formatter<'_>, patterns: &[Pattern]) -> Result<(), Error> {
         if let Some(first) = patterns.first() {
-            first.display_cont(self).fmt_pattern(f, false)?;
+            first.display_cont(self).fmt_pattern(f)?;
             for pat in patterns.iter().skip(1) {
                 write!(f, ", ")?;
-                pat.display_cont(self).fmt_pattern(f, false)?;
+                pat.display_cont(self).fmt_pattern(f)?;
             }
         }
         Ok(())
     }
 
-    fn fmt_pattern(&self, f: &mut Formatter<'_>, show_type: bool) -> Result<(), Error> {
+    fn fmt_pattern(&self, f: &mut Formatter<'_>) -> Result<(), Error> {
         use Pattern::*;
         let node_id = self.pat.node_id();
         let node_type = self.env.get_node_type(node_id);
@@ -2106,13 +2154,7 @@ impl<'a> PatDisplay<'a> {
         let mut showed_type = false;
         match self.pat {
             Var(_, sym) => {
-                write!(
-                    f,
-                    "{}: {}",
-                    sym.display(self.env.symbol_pool()),
-                    node_type.display(type_ctx)
-                )?;
-                showed_type = true;
+                write!(f, "{}", sym.display(self.env.symbol_pool()))?;
             },
             Wildcard(_) => write!(f, "_")?,
             Tuple(_, pattern_vec) => {
@@ -2120,7 +2162,7 @@ impl<'a> PatDisplay<'a> {
                 self.fmt_patterns(f, pattern_vec)?;
                 write!(f, ")")?
             },
-            Struct(_, struct_qfid, pattern_vec) => {
+            Struct(_, struct_qfid, variant, pattern_vec) => {
                 let inst_str = if !struct_qfid.inst.is_empty() {
                     format!(
                         "<{}>",
@@ -2134,35 +2176,44 @@ impl<'a> PatDisplay<'a> {
                     "".to_string()
                 };
                 let struct_env = self.env.get_struct(struct_qfid.to_qualified_id());
-                let field_names = struct_env.get_fields().map(|f| f.get_name());
-                let args_str = pattern_vec
-                    .iter()
-                    .zip(field_names)
-                    .map(|(pat, sym)| {
-                        let field_name = self.env.symbol_pool().string(sym);
-                        let pattern_str = pat.to_string(self.env, type_ctx);
-                        if &pattern_str != field_name.as_ref() {
-                            format!(
-                                "{}: {}",
-                                field_name.as_ref(),
-                                pat.to_string(self.env, type_ctx)
-                            )
-                        } else {
-                            pattern_str
-                        }
-                    })
-                    .join(", ");
+                let field_names = struct_env
+                    .get_fields_optional_variant(*variant)
+                    .map(|f| f.get_name());
+                let pool = self.env.symbol_pool();
+                let args_str = if variant.is_some() && pattern_vec.is_empty() {
+                    "".to_string()
+                } else {
+                    format!(
+                        "{{ {} }}",
+                        pattern_vec
+                            .iter()
+                            .zip(field_names)
+                            .map(|(pat, sym)| {
+                                let field_name = pool.string(sym);
+                                let pattern_str =
+                                    pat.display_cont(self).set_show_type(false).to_string();
+                                if &pattern_str != field_name.as_ref() {
+                                    format!("{}: {}", field_name.as_ref(), pattern_str)
+                                } else {
+                                    pattern_str
+                                }
+                            })
+                            .join(", ")
+                    )
+                };
                 write!(
                     f,
-                    "{}{}{{ {} }}",
+                    "{}{}{}{}",
                     struct_env.get_full_name_str(),
+                    optional_variant_suffix(pool, variant),
                     inst_str,
                     args_str
-                )?
+                )?;
+                showed_type = true
             },
             Error(_) => write!(f, "Pattern::Error")?,
         }
-        if show_type && !showed_type {
+        if self.show_type && !showed_type {
             write!(f, ": {}", node_type.display(type_ctx))
         } else {
             Ok(())
@@ -2170,9 +2221,9 @@ impl<'a> PatDisplay<'a> {
     }
 }
 
-impl<'a> Display for PatDisplay<'a> {
+impl<'a> fmt::Display for PatDisplay<'a> {
     fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), Error> {
-        self.fmt_pattern(f, true)
+        self.fmt_pattern(f)
     }
 }
 
@@ -2385,8 +2436,9 @@ impl Operation {
             Closure(..) => false,      // Spec
             Pack(..) => false,         // Could yield an undroppable value
             Tuple => true,
-            Select(..) => false,      // Move-related
-            UpdateField(..) => false, // Move-related
+            Select(..) => false,         // Move-related
+            SelectVariants(..) => false, // Move-related
+            UpdateField(..) => false,    // Move-related
 
             // Specification specific
             Result(..) => false, // Spec
@@ -2478,6 +2530,7 @@ impl Operation {
             EventStoreIncludedIn => false, // Spec
 
             // Operation with no effect
+            TestVariants(..) => true, // Cannot abort
             NoOp => true,
         }
     }
@@ -2615,7 +2668,7 @@ impl ExpData {
                     // Technically pure, but we don't want to eliminate it.
                     is_pure = false;
                 },
-                Block(..) | IfElse(..) => {}, // depends on contents
+                Block(..) | IfElse(..) | Match(..) => {}, // depends on contents
                 Return(..) => {
                     is_pure = false;
                 },
@@ -2661,6 +2714,10 @@ impl Address {
             panic!("expected numerical address, found symbolic")
         }
     }
+
+    pub fn is_one(&self) -> bool {
+        matches!(self, Address::Numerical(AccountAddress::ONE))
+    }
 }
 
 // enables `env.display(address)`
@@ -2993,6 +3050,19 @@ impl<'a> fmt::Display for ExpDisplay<'a> {
                     indent(else_exp.display_cont(self))
                 )
             },
+            Match(_, discriminator, arms) => {
+                writeln!(f, "match ({}) {{", discriminator.display_cont(self))?;
+                for arm in arms {
+                    write!(f, "  {}", indent(arm.pattern.display_for_exp(self)))?;
+                    if let Some(c) = &arm.condition {
+                        write!(f, " if {}", c.display_cont(self))?
+                    }
+                    writeln!(f, " => {{")?;
+                    writeln!(f, "    {}", indent(indent(arm.body.display_cont(self))))?;
+                    writeln!(f, "  }}")?
+                }
+                writeln!(f, "}}")
+            },
             Sequence(_, es) => {
                 for (i, e) in es.iter().enumerate() {
                     if i > 0 {
@@ -3176,10 +3246,35 @@ impl<'a> fmt::Display for OperationDisplay<'a> {
                 }
                 Ok(())
             },
-            Pack(mid, sid) => write!(f, "pack {}", self.struct_str(mid, sid)),
+            Pack(mid, sid, variant) => write!(
+                f,
+                "pack {}{}",
+                self.struct_str(mid, sid),
+                optional_variant_suffix(self.env.symbol_pool(), variant)
+            ),
             Select(mid, sid, fid) => {
                 write!(f, "select {}", self.field_str(mid, sid, fid))
             },
+            SelectVariants(mid, sid, fids) => {
+                write!(
+                    f,
+                    "select_variants {}",
+                    fids.iter()
+                        .map(|fid| self.field_str(mid, sid, fid))
+                        .join("|")
+                )
+            },
+            TestVariants(mid, sid, variants) => {
+                write!(
+                    f,
+                    "test_variants {}::{}",
+                    self.struct_str(mid, sid),
+                    variants
+                        .iter()
+                        .map(|v| v.display(self.env.symbol_pool()).to_string())
+                        .join("|")
+                )
+            },
             UpdateField(mid, sid, fid) => {
                 write!(f, "update {}", self.field_str(mid, sid, fid))
             },
@@ -3222,8 +3317,7 @@ impl<'a> OperationDisplay<'a> {
     }
 
     fn field_str(&self, mid: &ModuleId, sid: &StructId, fid: &FieldId) -> String {
-        let struct_env = self.env.get_module(*mid).into_struct(*sid);
-        let field_name = struct_env.get_field(*fid).get_name();
+        let field_name = fid.symbol();
         format!(
             "{}.{}",
             self.struct_str(mid, sid),
@@ -3292,6 +3386,14 @@ impl<'a> fmt::Display for EnvDisplay<'a, Spec> {
     }
 }
 
+fn optional_variant_suffix(pool: &SymbolPool, variant: &Option<Symbol>) -> String {
+    if let Some(v) = variant {
+        format!("::{}", v.display(pool))
+    } else {
+        String::new()
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use crate::{
diff --git a/third_party/move/move-model/src/builder/exp_builder.rs b/third_party/move/move-model/src/builder/exp_builder.rs
index 944620fcf7b13..4c5ae343ddad9 100644
--- a/third_party/move/move-model/src/builder/exp_builder.rs
+++ b/third_party/move/move-model/src/builder/exp_builder.rs
@@ -4,17 +4,20 @@
 
 use crate::{
     ast::{
-        AccessSpecifier, Address, AddressSpecifier, Exp, ExpData, ModuleName, Operation, Pattern,
-        QualifiedSymbol, QuantKind, ResourceSpecifier, RewriteResult, Spec, TempIndex, Value,
+        AccessSpecifier, Address, AddressSpecifier, Exp, ExpData, MatchArm, ModuleName, Operation,
+        Pattern, QualifiedSymbol, QuantKind, ResourceSpecifier, RewriteResult, Spec, TempIndex,
+        Value,
     },
     builder::{
-        model_builder::{AnyFunEntry, ConstEntry, EntryVisibility, LocalVarEntry, StructEntry},
+        model_builder::{
+            AnyFunEntry, ConstEntry, EntryVisibility, LocalVarEntry, StructEntry, StructLayout,
+        },
         module_builder::{ModuleBuilder, SpecBlockContext},
     },
     metadata::LanguageVersion,
     model::{
-        FieldId, GlobalEnv, Loc, ModuleId, NodeId, Parameter, QualifiedId, QualifiedInstId,
-        SpecFunId, StructId, TypeParameter, TypeParameterKind,
+        FieldData, FieldId, GlobalEnv, Loc, ModuleId, NodeId, Parameter, QualifiedId,
+        QualifiedInstId, SpecFunId, StructId, TypeParameter, TypeParameterKind,
     },
     symbol::{Symbol, SymbolPool},
     ty::{
@@ -22,21 +25,23 @@ use crate::{
         ReceiverFunctionInstance, ReferenceKind, Substitution, Type, TypeDisplayContext,
         TypeUnificationError, UnificationContext, Variance, WideningOrder, BOOL_TYPE,
     },
+    FunId,
 };
 use codespan_reporting::diagnostic::Severity;
 use itertools::Itertools;
-use move_binary_format::file_format::{self, AbilitySet};
+use move_binary_format::file_format::{self, Ability, AbilitySet};
 use move_compiler::{
     expansion::ast as EA,
     hlir::ast as HA,
     naming::ast as NA,
-    parser::{ast as PA, ast::CallKind},
-    shared::{Identifier, Name},
+    parser::ast::{self as PA, CallKind, Field},
+    shared::{unique_map::UniqueMap, Identifier, Name},
 };
 use move_core_types::{account_address::AccountAddress, value::MoveValue};
 use move_ir_types::location::{sp, Spanned};
 use num::{BigInt, FromPrimitive, Zero};
 use std::{
+    cell::RefCell,
     collections::{BTreeMap, BTreeSet, LinkedList},
     mem,
 };
@@ -74,7 +79,7 @@ pub(crate) struct ExpTranslator<'env, 'translator, 'module_translator> {
     /// `accessed_locals`. See also documentation of function `mark_context_scopes`.
     pub outer_context_scopes: usize,
     /// A flag to indicate whether errors have been generated so far.
-    pub had_errors: bool,
+    pub had_errors: RefCell<bool>,
     /// Set containing all the functions called during translation.
     pub called_spec_funs: BTreeSet<(ModuleId, SpecFunId)>,
     /// A mapping from SpecId to SpecBlock (expansion ast)
@@ -97,7 +102,7 @@ pub enum ExpPlaceholder {
         /// Locals at the point of the spec block, with an optional assigned TempIndex.
         locals: BTreeMap<Symbol, (Loc, Type, Option<TempIndex>)>,
     },
-    /// If attached to an expression, a placeholder for an field selection for which the full
+    /// If attached to an expression, a placeholder for a field selection for which the full
     /// structure type was not known yet, but should be at the end of function body checking.
     FieldSelectInfo { struct_ty: Type, field_name: Symbol },
     /// If attached to an expression, a placeholder for a receiver call which has not been
@@ -146,7 +151,7 @@ impl<'env, 'translator, 'module_translator> ExpTranslator<'env, 'translator, 'mo
             node_counter_start,
             accessed_locals: BTreeSet::new(),
             outer_context_scopes: 0,
-            had_errors: false,
+            had_errors: RefCell::default(),
             called_spec_funs: BTreeSet::new(),
             spec_block_map: BTreeMap::new(),
             placeholder_map: BTreeMap::new(),
@@ -168,7 +173,7 @@ impl<'env, 'translator, 'module_translator> ExpTranslator<'env, 'translator, 'mo
     }
 
     pub fn check_language_version(&self, loc: &Loc, feature: &str, version_min: LanguageVersion) {
-        if self.env().language_version() < version_min {
+        if !self.env().language_version().is_at_least(version_min) {
             self.env().error(
                 loc,
                 &format!(
@@ -261,19 +266,19 @@ impl<'env, 'translator, 'module_translator> ExpTranslator<'env, 'translator, 'mo
     }
 
     /// Shortcut for reporting an error.
-    pub fn error(&mut self, loc: &Loc, msg: &str) {
+    pub fn error(&self, loc: &Loc, msg: &str) {
         self.error_with_notes(loc, msg, vec![])
     }
 
     /// Shortcut for reporting an error.
-    pub fn error_with_notes(&mut self, loc: &Loc, msg: &str, notes: Vec<String>) {
-        self.had_errors = true;
+    pub fn error_with_notes(&self, loc: &Loc, msg: &str, notes: Vec<String>) {
+        *self.had_errors.borrow_mut() = true;
         self.parent.parent.error_with_notes(loc, msg, notes);
     }
 
     /// Shortcut for reporting an error.
-    pub fn error_with_labels(&mut self, loc: &Loc, msg: &str, labels: Vec<(Loc, String)>) {
-        self.had_errors = true;
+    pub fn error_with_labels(&self, loc: &Loc, msg: &str, labels: Vec<(Loc, String)>) {
+        *self.had_errors.borrow_mut() = true;
         self.env().error_with_labels(loc, msg, labels);
     }
 
@@ -285,13 +290,13 @@ impl<'env, 'translator, 'module_translator> ExpTranslator<'env, 'translator, 'mo
         notes: Vec<String>,
         labels: Vec<(Loc, String)>,
     ) {
-        self.had_errors = true;
+        *self.had_errors.borrow_mut() = true;
         self.env()
             .diag_with_primary_notes_and_labels(Severity::Error, loc, msg, "", notes, labels);
     }
 
     /// Shortcut for reporting a bug
-    pub fn bug(&mut self, loc: &Loc, msg: &str) {
+    pub fn bug(&self, loc: &Loc, msg: &str) {
         self.env().diag(Severity::Bug, loc, msg)
     }
 
@@ -374,11 +379,10 @@ impl<'env, 'translator, 'module_translator> ExpTranslator<'env, 'translator, 'mo
     /// Finalizes types in this translator, producing errors if some could not be inferred
     /// and remained incomplete.
     pub fn finalize_types(&mut self) {
-        if !self.had_errors {
+        if !*self.had_errors.borrow() {
             let mut reported_vars = BTreeSet::new();
             for i in self.node_counter_start..self.env().next_free_node_number() {
                 let node_id = NodeId::new(i);
-
                 if let Some(ty) = self.get_node_type_opt(node_id) {
                     let ty = self.finalize_type(node_id, &ty, &mut reported_vars);
                     self.update_node_type(node_id, ty);
@@ -626,6 +630,10 @@ impl<'env, 'translator, 'module_translator> ExpTranslator<'env, 'translator, 'mo
         None
     }
 
+    pub fn lookup_struct_entry(&self, name: &QualifiedSymbol) -> &StructEntry {
+        self.parent.parent.lookup_struct_entry_by_name(name)
+    }
+
     /// Analyzes the sequence of type parameters as they are provided via the source AST and enters
     /// them into the environment. Returns a vector for representing them in the target AST.
     pub fn analyze_and_add_type_params<'a, I>(&mut self, type_params: I) -> Vec<TypeParameter>
@@ -747,8 +755,12 @@ impl<'env, 'translator, 'module_translator> ExpTranslator<'env, 'translator, 'mo
 impl<'env, 'builder, 'module_builder> UnificationContext
     for ExpTranslator<'env, 'builder, 'module_builder>
 {
-    fn get_struct_field_map(&self, id: &QualifiedInstId<StructId>) -> BTreeMap<Symbol, Type> {
-        self.parent.parent.lookup_struct_fields(id)
+    fn get_struct_field_decls(
+        &self,
+        id: &QualifiedInstId<StructId>,
+        field_name: Symbol,
+    ) -> (Vec<(Option<Symbol>, Type)>, bool) {
+        self.parent.parent.lookup_struct_field_decl(id, field_name)
     }
 
     fn get_receiver_function(
@@ -1169,7 +1181,7 @@ impl<'env, 'translator, 'module_translator> ExpTranslator<'env, 'translator, 'mo
                     });
                     let maccess = sp(
                         specifier.loc,
-                        EA::ModuleAccess_::ModuleAccess(mident, *resource),
+                        EA::ModuleAccess_::ModuleAccess(mident, *resource, None),
                     );
                     let sym = self.parent.module_access_to_qualified(&maccess);
                     if let Type::Struct(mid, sid, _) = self.parent.parent.lookup_type(&loc, &sym) {
@@ -1486,7 +1498,19 @@ impl<'env, 'translator, 'module_translator> ExpTranslator<'env, 'translator, 'mo
                 }
             },
             EA::Exp_::Pack(maccess, generics, fields) => {
-                self.translate_pack(&loc, maccess, generics, fields, expected_type, context)
+                if let Some(exp) = self.translate_pack(
+                    &loc,
+                    maccess,
+                    generics,
+                    Some(fields),
+                    expected_type,
+                    context,
+                    false,
+                ) {
+                    exp
+                } else {
+                    self.new_error_exp()
+                }
             },
             EA::Exp_::IfElse(cond, then, else_) => {
                 let try_freeze_if_else = |et: &mut ExpTranslator,
@@ -1526,6 +1550,9 @@ impl<'env, 'translator, 'module_translator> ExpTranslator<'env, 'translator, 'mo
                 let id = self.new_node_id_with_type_loc(&rty, &loc);
                 ExpData::IfElse(id, cond.into_exp(), then.into_exp(), else_.into_exp())
             },
+            EA::Exp_::Match(discriminator, arms) => {
+                self.translate_match(loc, context, expected_type, discriminator, arms)
+            },
             EA::Exp_::While(cond, body) => {
                 let cond = self.translate_exp(cond, &Type::new_prim(PrimitiveType::Bool));
                 let body_type = self.check_type(&loc, &Type::unit(), expected_type, context);
@@ -1614,7 +1641,9 @@ impl<'env, 'translator, 'module_translator> ExpTranslator<'env, 'translator, 'mo
                     context,
                 )
             },
-            EA::Exp_::ExpDotted(dotted) => self.translate_dotted(dotted, expected_type, context),
+            EA::Exp_::ExpDotted(dotted) => {
+                self.translate_dotted(dotted, expected_type, false, context)
+            },
             EA::Exp_::Index(target, index) => {
                 self.translate_index(&loc, target, index, expected_type, context)
             },
@@ -1713,7 +1742,19 @@ impl<'env, 'translator, 'module_translator> ExpTranslator<'env, 'translator, 'mo
                 let (rhs_ty, rhs) = self.translate_exp_free(rhs);
                 // Do not freeze when translating the lhs of a mutate operation
                 self.insert_freeze = false;
-                let (lhs_ty, lhs) = self.translate_exp_free(lhs);
+                let (lhs_ty, lhs) = if let EA::Exp_::Index(target, index) = &lhs.value {
+                    let result_ty =
+                        Type::Reference(ReferenceKind::Mutable, Box::new(rhs_ty.clone()));
+                    if let Some(call) = self.try_resource_or_vector_index(
+                        &loc, target, index, context, &result_ty, true,
+                    ) {
+                        (result_ty, call)
+                    } else {
+                        self.translate_exp_free(lhs)
+                    }
+                } else {
+                    self.translate_exp_free(lhs)
+                };
                 self.insert_freeze = true;
                 self.check_type(
                     &self.get_node_loc(lhs.node_id()),
@@ -1729,7 +1770,7 @@ impl<'env, 'translator, 'module_translator> ExpTranslator<'env, 'translator, 'mo
                 let (ty, rhs) = self.translate_exp_free(rhs);
                 // Do not freeze when translating the lhs of a mutate operation
                 self.insert_freeze = false;
-                let lhs = self.translate_dotted(lhs, &ty, &ErrorMessageContext::Assignment);
+                let lhs = self.translate_dotted(lhs, &ty, true, &ErrorMessageContext::Assignment);
                 self.insert_freeze = true;
                 let result_ty = self.check_type(&loc, &Type::unit(), expected_type, context);
                 let id = self.new_node_id_with_type_loc(&result_ty, &loc);
@@ -1752,6 +1793,13 @@ impl<'env, 'translator, 'module_translator> ExpTranslator<'env, 'translator, 'mo
                 let target_ty = self.fresh_type_var();
                 let ty = Type::Reference(ref_kind, Box::new(target_ty.clone()));
                 let result_ty = self.check_type(&loc, &ty, expected_type, context);
+                if let EA::Exp_::Index(target, index) = &exp.value {
+                    if let Some(call) = self.try_resource_or_vector_index(
+                        &loc, target, index, context, &result_ty, *mutable,
+                    ) {
+                        return call;
+                    }
+                }
                 let target_exp = self.translate_exp(exp, &target_ty);
                 if self.subs.specialize(&target_ty).is_reference() {
                     self.error(&loc, "cannot borrow from a reference")
@@ -1795,6 +1843,7 @@ impl<'env, 'translator, 'module_translator> ExpTranslator<'env, 'translator, 'mo
                     vec![exp.into_exp()],
                 )
             },
+            EA::Exp_::Test(exp, tys) => self.translate_test(&loc, exp, tys, expected_type, context),
             EA::Exp_::Annotate(exp, typ) => {
                 let ty = self.translate_type(typ);
                 let exp =
@@ -1847,6 +1896,16 @@ impl<'env, 'translator, 'module_translator> ExpTranslator<'env, 'translator, 'mo
         locals
     }
 
+    /// Returns true if the struct with the name `struct_name` is originally an empty struct.
+    /// During translation, for downwards compatibility we are adding a dummy field to empty
+    /// structs, this allows us to distinguish whether it was originally empty.
+    fn is_empty_struct(&self, struct_name: &QualifiedSymbol) -> bool {
+        self.parent
+            .parent
+            .lookup_struct_entry_by_name(struct_name)
+            .is_empty_struct
+    }
+
     /// This function:
     /// 1) Post processes any placeholders which have been generated while translating expressions
     /// with this builder. This rewrites the given result expression and fills in placeholders
@@ -1894,22 +1953,18 @@ impl<'env, 'translator, 'module_translator> ExpTranslator<'env, 'translator, 'mo
                                 field_name,
                             } => {
                                 // Resolve a field selection into the inferred struct type.
-                                if let Type::Struct(mid, sid, _) = self
+                                if let Type::Struct(mid, sid, inst) = self
                                     .subs
                                     .specialize_with_defaults(struct_ty)
                                     .skip_reference()
                                 {
+                                    let oper = self.create_select_oper(
+                                        &loc,
+                                        &mid.qualified_inst(*sid, inst.clone()),
+                                        *field_name,
+                                    );
                                     RewriteResult::RewrittenAndDescend(
-                                        ExpData::Call(
-                                            id,
-                                            Operation::Select(
-                                                *mid,
-                                                *sid,
-                                                FieldId::new(*field_name),
-                                            ),
-                                            args,
-                                        )
-                                        .into_exp(),
+                                        ExpData::Call(id, oper, args).into_exp(),
                                     )
                                 } else {
                                     RewriteResult::Rewritten(self.new_error_exp().into_exp())
@@ -1962,7 +2017,7 @@ impl<'env, 'translator, 'module_translator> ExpTranslator<'env, 'translator, 'mo
                 }
             },
             &mut |pat, _entering_scope| match pat {
-                Pattern::Struct(sid, std, patterns) => {
+                Pattern::Struct(sid, std, variant, patterns) => {
                     let mut new_inst = vec![];
                     for ty in &std.inst {
                         let nty = subs.specialize(ty);
@@ -1970,7 +2025,8 @@ impl<'env, 'translator, 'module_translator> ExpTranslator<'env, 'translator, 'mo
                     }
                     let mut new_std = std.clone();
                     new_std.inst = new_inst;
-                    let new_pat = Pattern::Struct(*sid, new_std.clone(), patterns.clone());
+                    let new_pat =
+                        Pattern::Struct(*sid, new_std.clone(), *variant, patterns.clone());
                     Some(new_pat)
                 },
                 _ => None,
@@ -2136,6 +2192,72 @@ impl<'env, 'translator, 'module_translator> ExpTranslator<'env, 'translator, 'mo
         std::mem::take(&mut self.parent.inline_spec_builder)
     }
 
+    /// Translates a match expression.
+    fn translate_match(
+        &mut self,
+        loc: Loc,
+        context: &ErrorMessageContext,
+        expected_type: &Type,
+        discriminator: &EA::Exp,
+        arms: &[Spanned<(EA::LValueList, Option<EA::Exp>, EA::Exp)>],
+    ) -> ExpData {
+        let (discr_ty, discr_exp) = self.translate_exp_free(discriminator);
+        // Translate all arms, and compute the joined type of the arms. If
+        // any of the arms produces an immutable reference, the joined type
+        // will also be immutable.
+        let mut joined_type = self.subs.specialize(expected_type);
+        let mut translate_arms = vec![];
+        for arm in arms {
+            // Translate the arms lvalue list into a pattern
+            let pattern = self.translate_lvalue_list(
+                &arm.value.0,
+                &discr_ty,
+                // The discriminator is assigned to the pattern, so like in a binding,
+                // it is allowed to be widened to the pattern type.
+                WideningOrder::RightToLeft,
+                false,
+                &ErrorMessageContext::Binding,
+            );
+            // Declare the variables in the pattern
+            self.enter_scope();
+            self.define_locals_of_pat(&pattern);
+            // Translate the condition, if present.
+            let condition = arm.value.1.as_ref().map(|c| {
+                self.translate_exp(c, &Type::new_prim(PrimitiveType::Bool))
+                    .into_exp()
+            });
+            // Translate the body.
+            let body = self.translate_exp_in_context(&arm.value.2, &joined_type, context);
+            let body_ty = self
+                .subs
+                .specialize(&self.env().get_node_type(body.node_id()));
+            self.exit_scope();
+            translate_arms.push(MatchArm {
+                loc: self.to_loc(&arm.loc),
+                pattern,
+                condition,
+                body: body.into_exp(),
+            });
+            // Refine the joined type from mutable to immutable if needed.
+            joined_type = match (self.subs.specialize(&joined_type), body_ty) {
+                (
+                    Type::Reference(ReferenceKind::Mutable, _),
+                    Type::Reference(ReferenceKind::Immutable, ty),
+                ) => Type::Reference(ReferenceKind::Immutable, ty),
+                (ty, _) => ty,
+            };
+        }
+        // Now go over the arms again and freeze mutable references as needed.
+        if joined_type.is_immutable_reference() {
+            for arm in translate_arms.iter_mut() {
+                let ty = self.env().get_node_type(arm.body.node_id());
+                arm.body = self.try_freeze(&joined_type, &ty, arm.body.clone());
+            }
+        }
+        let id = self.new_node_id_with_type_loc(&joined_type, &loc);
+        ExpData::Match(id, discr_exp.into_exp(), translate_arms)
+    }
+
     fn translate_lvalue_list(
         &mut self,
         list: &EA::LValueList,
@@ -2216,108 +2338,295 @@ impl<'env, 'translator, 'module_translator> ExpTranslator<'env, 'translator, 'mo
     ) -> Pattern {
         let loc = &self.to_loc(&lv.loc);
         match &lv.value {
-            EA::LValue_::Var(maccess, None) => {
-                let name = match &maccess.value {
-                    EA::ModuleAccess_::Name(n) => n,
-                    EA::ModuleAccess_::ModuleAccess(_, n) => n,
-                };
+            EA::LValue_::Var(maccess, generics) => {
                 let mut id = self.new_node_id_with_type_loc(expected_type, loc);
-                if name.value.as_str() == "_" {
-                    let specialized_expected_type = self.subs.specialize(expected_type);
-                    if let Type::Tuple(tys) = specialized_expected_type {
-                        if tys.len() != 1 {
-                            self.error(loc, &context.arity_mismatch(false, tys.len(), 1));
-                            return self.new_error_pat(loc);
-                        }
-                    }
-                    Pattern::Wildcard(id)
-                } else {
-                    let name = self.symbol_pool().make(&name.value);
-                    if match_locals {
-                        if let Some(local_ty) = self
-                            .lookup_local(name, false)
-                            .map(|local| local.type_.clone())
-                        {
-                            // For a pattern where expected type is mutable reference and the original type is immutable ref
-                            // the result type should still be immutable
-                            if local_ty.is_immutable_reference()
-                                && expected_type.is_mutable_reference()
+                match maccess.value {
+                    EA::ModuleAccess_::Name(n) if n.value.as_str() == "_" => {
+                        self.add_constraint_and_report(
+                            loc,
+                            &ErrorMessageContext::General,
+                            expected_type,
+                            Constraint::NoTuple,
+                            None,
+                        );
+                        Pattern::Wildcard(id)
+                    },
+                    EA::ModuleAccess_::Name(n) => {
+                        let name = self.symbol_pool().make(&n.value);
+                        if match_locals {
+                            if let Some(local_ty) = self
+                                .lookup_local(name, false)
+                                .map(|local| local.type_.clone())
                             {
-                                id = self.new_node_id_with_type_loc(&local_ty, loc);
+                                // For a pattern where expected type is mutable reference and the original type is immutable ref
+                                // the result type should still be immutable
+                                if local_ty.is_immutable_reference()
+                                    && expected_type.is_mutable_reference()
+                                {
+                                    id = self.new_node_id_with_type_loc(&local_ty, loc);
+                                }
+                                self.check_type_with_order(
+                                    expected_order,
+                                    loc,
+                                    &local_ty,
+                                    expected_type,
+                                    context,
+                                );
+                            } else {
+                                self.error(
+                                    loc,
+                                    &format!("undeclared `{}`", name.display(self.symbol_pool())),
+                                )
                             }
-                            self.check_type_with_order(
-                                expected_order,
-                                loc,
-                                &local_ty,
-                                expected_type,
-                                context,
-                            );
+                        }
+                        Pattern::Var(id, name)
+                    },
+                    _ => {
+                        // Translate as a struct pattern with no arguments
+                        if let Some(pat) = self.translate_lvalue_unpack(
+                            expected_type,
+                            expected_order,
+                            match_locals,
+                            context,
+                            loc,
+                            maccess,
+                            generics,
+                            None,
+                        ) {
+                            pat
                         } else {
-                            self.error(
-                                loc,
-                                &format!("undeclared `{}`", name.display(self.symbol_pool())),
-                            )
+                            self.new_error_pat(loc)
                         }
-                    }
-                    Pattern::Var(id, name)
+                    },
                 }
             },
             EA::LValue_::Unpack(maccess, generics, args) => {
-                // Check whether the requested type is a reference. If so, we remember this and
-                // the target type of the reference. The reference expectation is pushed down
-                // to the arguments of the unpack if needed.
-                let (ref_expected, expected_type) = if let Type::Reference(kind, ty) = expected_type
-                {
-                    (Some(*kind), ty.as_ref().clone())
-                } else {
-                    (None, expected_type.clone())
-                };
-                if let Some((struct_id, mut args)) = self.translate_lvalue_fields(
+                if let Some(pat) = self.translate_lvalue_unpack(
+                    expected_type,
+                    expected_order,
+                    match_locals,
+                    context,
                     loc,
                     maccess,
                     generics,
-                    args,
-                    ref_expected,
+                    Some(args),
+                ) {
+                    pat
+                } else {
+                    self.new_error_pat(loc)
+                }
+            },
+            EA::LValue_::PositionalUnpack(maccess, generics, args) => {
+                let fields = UniqueMap::maybe_from_iter(args.value.iter().enumerate().map(
+                    |(field_offset, arg)| {
+                        let field_name = Name::new(
+                            arg.loc,
+                            move_symbol_pool::Symbol::from(format!("{}", field_offset)),
+                        );
+                        let field_name = Field(field_name);
+                        (field_name, (field_offset, arg.clone()))
+                    },
+                ))
+                .expect("unique field names");
+                let unpack_ = EA::LValue_::Unpack(maccess.clone(), generics.clone(), fields);
+                let unpack = Spanned::new(lv.loc, unpack_);
+                self.translate_lvalue(
+                    &unpack,
+                    expected_type,
                     expected_order,
                     match_locals,
                     context,
-                ) {
-                    if args.is_empty() {
-                        // TODO: The v1 move compiler inserts a dummy field with the value of false
-                        // for structs with no fields. We simulate this here for now.
-                        let id = self
-                            .new_node_id_with_type_loc(&Type::new_prim(PrimitiveType::Bool), loc);
-                        args.push(Pattern::Wildcard(id))
-                    }
-                    let ty = struct_id.to_type();
-                    let ty = self.check_type_with_order(
+                )
+            },
+        }
+    }
+
+    fn translate_lvalue_unpack(
+        &mut self,
+        expected_type: &Type,
+        expected_order: WideningOrder,
+        match_locals: bool,
+        context: &ErrorMessageContext,
+        loc: &Loc,
+        maccess: &EA::ModuleAccess,
+        generics: &Option<Vec<EA::Type>>,
+        fields: Option<&EA::Fields<EA::LValue>>,
+    ) -> Option<Pattern> {
+        // Translate constructor name
+        let expected_type = self.subs.specialize(expected_type);
+        let Some((
+            QualifiedInstId {
+                module_id,
+                id,
+                inst,
+            },
+            variant,
+        )) = self.translate_constructor_name(
+            &expected_type,
+            expected_order,
+            context,
+            loc,
+            maccess,
+            generics,
+        )
+        else {
+            // error reported by `translate_constructor_name`
+            return None;
+        };
+        let struct_name = self
+            .parent
+            .parent
+            .get_struct_name(module_id.qualified(id))
+            .clone();
+        let struct_name_loc = self.to_loc(&maccess.loc);
+        let ref_expected = expected_type.try_reference_kind();
+
+        // Process argument list
+        let mut args = BTreeMap::new();
+        let (field_decls, _is_positional) =
+            self.get_field_decls_for_pack_unpack(&struct_name, &struct_name_loc, variant)?;
+        let field_decls = field_decls.clone();
+        if let Some(fields) = fields {
+            // Check whether all fields are covered.
+            self.check_missing_or_undeclared_fields(
+                loc,
+                struct_name.clone(),
+                &field_decls,
+                fields,
+            )?;
+            // Translate fields
+            for (_, name, (_, value)) in fields.iter() {
+                let field_name = self.symbol_pool().make(name);
+                if let Some(field_data) = field_decls.get(&field_name) {
+                    let field_ty = field_data.ty.instantiate(&inst);
+                    let expected_field_ty = if let Some(kind) = ref_expected {
+                        Type::Reference(kind, Box::new(field_ty.clone()))
+                    } else {
+                        field_ty.clone()
+                    };
+                    let translated = self.translate_lvalue(
+                        value,
+                        &expected_field_ty,
                         expected_order,
-                        loc,
-                        &ty,
-                        &expected_type,
+                        match_locals,
                         context,
                     );
-                    let node_ty = if let Some(kind) = ref_expected {
-                        Type::Reference(kind, Box::new(ty.clone()))
-                    } else {
-                        ty.clone()
-                    };
-                    let id = self.new_node_id_with_type_loc(&node_ty, loc);
-                    let mut std = struct_id;
-                    if let Type::Struct(_, _, types) = ty {
-                        std.inst = types;
-                    }
-                    Pattern::Struct(id, std, args)
-                } else {
-                    // Error reported
-                    self.new_error_pat(loc)
+                    args.insert(field_data.offset, translated);
                 }
+            }
+        } else if !field_decls.is_empty() {
+            self.error(
+                loc,
+                &format!(
+                    "no arguments provided for unpack, expected {}",
+                    field_decls.len()
+                ),
+            )
+        }
+
+        let mut args = args
+            .into_iter()
+            .sorted_by_key(|(i, _)| *i)
+            .map(|(_, value)| value)
+            .collect_vec();
+        if variant.is_none() && args.is_empty() {
+            // The v1 move compiler inserts a dummy field with the value of false
+            // for structs with no fields. We simulate this here for now.
+            let id = self.new_node_id_with_type_loc(&Type::new_prim(PrimitiveType::Bool), loc);
+            args.push(Pattern::Wildcard(id))
+        }
+
+        let struct_id = module_id.qualified_inst(id, inst);
+        let node_ty = if let Some(kind) = ref_expected {
+            Type::Reference(kind, Box::new(struct_id.to_type()))
+        } else {
+            struct_id.to_type()
+        };
+        let node_id = self.new_node_id_with_type_loc(&node_ty, loc);
+        Some(Pattern::Struct(node_id, struct_id, variant, args))
+    }
+
+    /// Translates a constructor name based on the given module access and
+    /// optional generic type arguments, using the expected_type for name
+    /// resolution.
+    fn translate_constructor_name(
+        &mut self,
+        expected_type: &Type,
+        expected_order: WideningOrder,
+        context: &ErrorMessageContext,
+        loc: &Loc,
+        maccess: &EA::ModuleAccess,
+        generics: &Option<Vec<EA::Type>>,
+    ) -> Option<(QualifiedInstId<StructId>, Option<Symbol>)> {
+        let expected_type = self.subs.specialize(expected_type).drop_reference();
+        // Determine whether expected type is known to have variants (at this
+        // point during inference). If so, they are used for name resolution.
+        let variant_struct_info = if let Type::Struct(mid, sid, _) = expected_type {
+            let entry = self.parent.parent.lookup_struct_entry(mid.qualified(sid));
+            if let StructLayout::Variants(variants) = &entry.layout {
+                Some((
+                    entry,
+                    variants.iter().map(|v| v.name).collect::<BTreeSet<_>>(),
+                ))
+            } else {
+                None
+            }
+        } else {
+            None
+        };
+
+        // Resolve reference to struct.
+        let struct_name_loc = self.to_loc(&maccess.loc);
+        let (struct_name, variant, struct_entry) = match (&maccess.value, variant_struct_info) {
+            (EA::ModuleAccess_::Name(name), Some((struct_entry, _variants))) => {
+                // Simple name and we could infer from expected type that it is a struct with
+                // variants.
+                let variant = self.symbol_pool().make(name.value.as_str());
+                let struct_name = self
+                    .parent
+                    .parent
+                    .get_struct_name(struct_entry.module_id.qualified(struct_entry.struct_id));
+                (struct_name.clone(), Some(variant), struct_entry.clone())
             },
             _ => {
-                self.error(loc, "unsupported language construct");
-                self.new_error_pat(loc)
+                let (struct_name, variant) =
+                    self.parent.module_access_to_qualified_with_variant(maccess);
+                let struct_name_loc = self.to_loc(&maccess.loc);
+                let struct_entry =
+                    self.get_struct_report_undeclared(&struct_name, &struct_name_loc)?;
+                (struct_name, variant, struct_entry)
             },
+        };
+
+        // Resolve type instantiation.
+        let instantiation = self.make_instantiation_or_report(
+            loc,
+            true,
+            struct_name.symbol,
+            &struct_entry.type_params,
+            generics,
+        )?;
+
+        // If this is a struct variant, check whether it exists.
+        if let Some(v) = variant {
+            if !self.check_variant_declared(&struct_name, &struct_entry, &struct_name_loc, v) {
+                return None;
+            }
+        }
+
+        // Verify type derived from reference with expected type.
+        let struct_id = struct_entry
+            .module_id
+            .qualified_inst(struct_entry.struct_id, instantiation);
+        let ty = struct_id.to_type();
+        let ty = self.check_type_with_order(expected_order, loc, &ty, &expected_type, context);
+        // Convert the unified type back to struct id
+        let mut struct_id = struct_id;
+        if let Type::Struct(_, _, types) = ty {
+            struct_id.inst = types;
         }
+
+        Some((struct_id, variant))
     }
 
     fn new_error_pat(&mut self, loc: &Loc) -> Pattern {
@@ -2495,7 +2804,10 @@ impl<'env, 'translator, 'module_translator> ExpTranslator<'env, 'translator, 'mo
         }
 
         // Treat this as a call to a global function.
-        let (module_name, name) = self.parent.module_access_to_parts(maccess);
+        if !self.parent.check_no_variant(maccess) {
+            return self.new_error_exp();
+        }
+        let (module_name, name, _) = self.parent.module_access_to_parts(maccess);
 
         // Process `old(E)` scoping
         let is_old =
@@ -2532,6 +2844,12 @@ impl<'env, 'translator, 'module_translator> ExpTranslator<'env, 'translator, 'mo
         result
     }
 
+    /// Checks whether the given name can be resolve to a struct.
+    fn can_resolve_to_struct(&self, maccess: &EA::ModuleAccess) -> bool {
+        let (struct_name, _variant) = self.parent.module_access_to_qualified_with_variant(maccess);
+        self.parent.parent.struct_table.contains_key(&struct_name)
+    }
+
     fn translate_fun_call_special_cases(
         &mut self,
         expected_type: &Type,
@@ -2550,6 +2868,34 @@ impl<'env, 'translator, 'module_translator> ExpTranslator<'env, 'translator, 'mo
             return None;
         }
 
+        // handles call of struct/variant with positional fields
+        if maccess.value.is_valid_struct_constant_or_schema_name()
+            && self.can_resolve_to_struct(maccess)
+            || ModuleBuilder::is_variant(maccess)
+        {
+            self.check_language_version(loc, "positional fields", LanguageVersion::V2_0);
+            // translates StructName(e0, e1, ...) to pack<StructName> { 0: e0, 1: e1, ... }
+            let fields: EA::Fields<_> =
+                EA::Fields::maybe_from_iter(args.iter().enumerate().map(|(i, &arg)| {
+                    let field_name = move_symbol_pool::Symbol::from(i.to_string());
+                    let loc = arg.loc;
+                    let field = PA::Field(Spanned::new(loc, field_name));
+                    (field, (i, arg.clone()))
+                }))
+                .expect("duplicate keys");
+            return self
+                .translate_pack(
+                    loc,
+                    maccess,
+                    generics,
+                    Some(&fields),
+                    expected_type,
+                    context,
+                    true,
+                )
+                .or_else(|| Some(self.new_error_exp()));
+        }
+
         // Check for builtin specification functions.
         if self.is_spec_mode() {
             if let EA::ModuleAccess_::Name(n) = &maccess.value {
@@ -2762,45 +3108,62 @@ impl<'env, 'translator, 'module_translator> ExpTranslator<'env, 'translator, 'mo
                     self.exit_scope();
                     self.new_bind_exp(loc, pat, binding, rest.into_exp())
                 },
-                Seq(exp) if items.len() > 1 => {
-                    // This is an actual impl language sequence `s;rest`.
-                    self.require_impl_language(loc);
-                    // There is an item after this one, so the value can be dropped. The default
-                    // type of the expression is `()`.
-                    let exp_loc = self.to_loc(&exp.loc);
-                    let var = self.fresh_type_var_idx();
-
-                    let item_type = Type::Var(var);
-                    let exp = self.translate_exp(exp, &item_type);
-                    let item_type = self.subs.specialize(&item_type);
-                    if self.subs.is_free_var_without_constraints(&item_type) {
-                        // If this is a totally unbound item, assign default unit type.
-                        self.add_constraint(
-                            &exp_loc,
-                            &Type::Var(var),
-                            WideningOrder::LeftToRight,
-                            Constraint::WithDefault(Type::unit()),
-                            Some(ConstraintContext::inferred()),
-                        )
-                        .expect("success on fresh var");
-                    }
-                    let rest =
-                        self.translate_seq_recursively(loc, &items[1..], expected_type, context);
-                    let id = self.new_node_id_with_type_loc(expected_type, loc);
-                    let exps = match exp {
-                        ExpData::Sequence(_, mut exps) => {
-                            exps.push(rest.into_exp());
-                            exps
-                        },
-                        _ => vec![exp.into_exp(), rest.into_exp()],
-                    };
-                    ExpData::Sequence(id, exps)
+                Seq(_) if items.len() > 1 => {
+                    self.translate_seq_items(loc, items, expected_type, context)
                 },
                 Seq(exp) => self.translate_exp_in_context(exp, expected_type, context),
             }
         }
     }
 
+    fn translate_seq_items(
+        &mut self,
+        loc: &Loc,
+        items: &[&EA::SequenceItem],
+        expected_type: &Type,
+        context: &ErrorMessageContext,
+    ) -> ExpData {
+        // This is an actual impl language sequence `s;rest`.
+        self.require_impl_language(loc);
+        let mut exps = vec![];
+        let mut k = 0;
+        while k < items.len() - 1 {
+            use EA::SequenceItem_::*;
+            if let Seq(exp) = &items[k].value {
+                // There is an item after this one, so the value can be dropped. The default
+                // type of the expression is `()`.
+                let exp_loc = self.to_loc(&exp.loc);
+                let var = self.fresh_type_var_idx();
+                let item_type = Type::Var(var);
+                let exp = self.translate_exp(exp, &item_type);
+                let item_type = self.subs.specialize(&item_type);
+                if self.subs.is_free_var_without_constraints(&item_type) {
+                    // If this is a totally unbound item, assign default unit type.
+                    self.add_constraint(
+                        &exp_loc,
+                        &Type::Var(var),
+                        WideningOrder::LeftToRight,
+                        Constraint::WithDefault(Type::unit()),
+                        Some(ConstraintContext::inferred()),
+                    )
+                    .expect("success on fresh var");
+                }
+                if let ExpData::Sequence(_, mut es) = exp {
+                    exps.append(&mut es);
+                } else {
+                    exps.push(exp.into_exp());
+                }
+            } else {
+                break;
+            }
+            k += 1;
+        }
+        let rest = self.translate_seq_recursively(loc, &items[k..], expected_type, context);
+        exps.push(rest.into_exp());
+        let id = self.new_node_id_with_type_loc(expected_type, loc);
+        ExpData::Sequence(id, exps)
+    }
+
     /// Create binding expression.
     fn new_bind_exp(
         &mut self,
@@ -2981,38 +3344,249 @@ impl<'env, 'translator, 'module_translator> ExpTranslator<'env, 'translator, 'mo
         }
     }
 
-    /// Translate an Index expression.
-    fn translate_index(
+    fn call_to_borrow_global_for_index_op(
         &mut self,
         loc: &Loc,
-        target: &EA::Exp,
-        index: &EA::Exp,
+        resource_ty_exp: &EA::Exp,
+        addr_exp: &EA::Exp,
+        mutable: bool,
         expected_type: &Type,
         context: &ErrorMessageContext,
     ) -> ExpData {
-        // We must concretize the type of index to decide whether this is a slice
-        // or not. This is not compatible with full type inference, so we may
-        // try to actually represent slicing explicitly in the syntax to fix this.
-        // Alternatively, we could leave it to the backend to figure (after full
-        // type inference) whether this is slice or index.
-        let elem_ty = self.fresh_type_var();
-        let vector_ty = Type::Vector(Box::new(elem_ty.clone()));
-        let vector_exp = self.translate_exp(target, &vector_ty);
-        let (index_ty, ie) = self.translate_exp_free(index);
-        let index_ty = self.subs.specialize(&index_ty);
-        let (result_t, oper) = if let Type::Primitive(PrimitiveType::Range) = &index_ty {
-            (vector_ty, Operation::Slice)
-        } else {
-            // If this is not (known to be) a range, assume its an index.
-            self.check_type(
+        fn convert_name_to_type(
+            loc: &move_ir_types::location::Loc,
+            exp_: EA::Exp_,
+        ) -> Option<EA::Type> {
+            if let EA::Exp_::Name(m, type_opt) = exp_ {
+                Some(EA::Type::new(
+                    *loc,
+                    EA::Type_::Apply(m, type_opt.unwrap_or(vec![])),
+                ))
+            } else {
+                None
+            }
+        }
+        let type_opt = convert_name_to_type(&resource_ty_exp.loc, resource_ty_exp.clone().value);
+        if let Some(ty) = type_opt {
+            let resource_ty = self.translate_type(&ty);
+            let ref_t = Type::Reference(
+                ReferenceKind::from_is_mut(mutable),
+                Box::new(resource_ty.clone()),
+            );
+            let ty = self.check_type(loc, &ref_t, expected_type, context);
+            if ty.is_error() {
+                return self.new_error_exp();
+            }
+            let addr = self.translate_exp_in_context(
+                addr_exp,
+                &Type::Primitive(PrimitiveType::Address),
+                context,
+            );
+            let node = self.new_node_id_with_type_loc(
+                &Type::Reference(
+                    ReferenceKind::from_is_mut(mutable),
+                    Box::new(resource_ty.clone()),
+                ),
                 loc,
-                &index_ty,
-                &Type::new_prim(PrimitiveType::Num),
-                &ErrorMessageContext::General,
             );
-            (elem_ty, Operation::Index)
-        };
-        let result_t = self.check_type(loc, &result_t, expected_type, context);
+            self.set_node_instantiation(node, vec![resource_ty.clone()]);
+            ExpData::Call(
+                node,
+                Operation::BorrowGlobal(ReferenceKind::from_is_mut(mutable)),
+                vec![addr.into()],
+            )
+        } else {
+            self.new_error_exp()
+        }
+    }
+
+    //TODO: make a Lazy const for mid and fid of vector functions
+    fn get_vector_borrow(&self, mutable: bool) -> (Option<ModuleId>, Option<FunId>) {
+        let target_str = if mutable {
+            "vector::borrow_mut"
+        } else {
+            "vector::borrow"
+        };
+        for m in self.env().get_modules() {
+            if m.is_std_vector() {
+                let mid = m.get_id();
+                for f in m.get_functions() {
+                    if f.get_full_name_str() == target_str {
+                        let fid = f.get_id();
+                        return (Some(mid), Some(fid));
+                    }
+                }
+            }
+        }
+        (None, None)
+    }
+
+    fn call_to_vector_borrow_for_index_op(
+        &mut self,
+        loc: &Loc,
+        vec_exp: &EA::Exp,
+        idx_exp: &EA::Exp,
+        mutable: bool,
+        expected_type: &Type,
+        context: &ErrorMessageContext,
+    ) -> ExpData {
+        let inner_ty = if let Type::Reference(_, in_ty) = &expected_type {
+            in_ty.as_ref().clone()
+        } else {
+            expected_type.clone()
+        };
+        let ref_vec_exp_e = &sp(
+            vec_exp.loc,
+            EA::Exp_::Borrow(mutable, Box::new(vec_exp.clone())),
+        );
+        let vec_exp_e = self.translate_exp_in_context(
+            ref_vec_exp_e,
+            &Type::Reference(
+                ReferenceKind::from_is_mut(mutable),
+                Box::new(Type::Vector(Box::new(inner_ty.clone()))),
+            ),
+            context,
+        );
+        let idx_exp_e =
+            self.translate_exp_in_context(idx_exp, &Type::Primitive(PrimitiveType::U64), context);
+        if *self.had_errors.borrow() {
+            return self.new_error_exp();
+        }
+        if let (Some(mid), Some(fid)) = self.get_vector_borrow(mutable) {
+            let instantiated_inner = self.subs.specialize(&inner_ty);
+            let node_id = self.env().new_node(
+                loc.clone(),
+                Type::Reference(
+                    ReferenceKind::from_is_mut(mutable),
+                    Box::new(instantiated_inner.clone()),
+                ),
+            );
+            self.set_node_instantiation(node_id, vec![inner_ty.clone()]);
+            let call = ExpData::Call(node_id, Operation::MoveFunction(mid, fid), vec![
+                vec_exp_e.into_exp(),
+                idx_exp_e.clone().into_exp(),
+            ]);
+            return call;
+        }
+        ExpData::Invalid(self.env().new_node_id())
+    }
+
+    /// Try to translate a resource or vector Index expression
+    fn try_resource_or_vector_index(
+        &mut self,
+        loc: &Loc,
+        target: &EA::Exp,
+        index: &EA::Exp,
+        context: &ErrorMessageContext,
+        ty: &Type,
+        mutable: bool,
+    ) -> Option<ExpData> {
+        let mut call = None;
+        if let EA::Exp_::Name(m, _) = &target.value {
+            let global_var_sym = match &m.value {
+                EA::ModuleAccess_::ModuleAccess(..) => self.parent.module_access_to_qualified(m),
+                EA::ModuleAccess_::Name(name) => {
+                    let sym = self.symbol_pool().make(name.value.as_str());
+                    self.parent.qualified_by_module(sym)
+                },
+            };
+            if self
+                .parent
+                .parent
+                .struct_table
+                .contains_key(&global_var_sym)
+            {
+                self.check_language_version(loc, "resource indexing", LanguageVersion::V2_0);
+                if self
+                    .parent
+                    .parent
+                    .struct_table
+                    .get(&global_var_sym)
+                    .is_some_and(|entry| entry.abilities.has_ability(Ability::Key))
+                {
+                    call = Some(self.call_to_borrow_global_for_index_op(
+                        loc, target, index, mutable, ty, context,
+                    ));
+                } else {
+                    self.error(loc, "resource indexing can only applied to a resource type (a struct type which has key ability)");
+                    call = Some(self.new_error_exp());
+                }
+            } else if self
+                .parent
+                .parent
+                .spec_schema_table
+                .contains_key(&global_var_sym)
+                && self
+                    .env()
+                    .language_version
+                    .is_at_least(LanguageVersion::V2_0)
+            {
+                self.error(loc, "indexing can only be applied to a vector or a resource type (a struct type which has key ability)");
+                call = Some(self.new_error_exp());
+            }
+        }
+        if !self.is_spec_mode() {
+            self.check_language_version(loc, "vector indexing", LanguageVersion::V2_0);
+            // Translate to vector indexing in impl mode if the target is not a resource or a spec schema
+            // spec mode is handled in `translate_index`
+            if call.is_none() {
+                call =
+                    Some(self.call_to_vector_borrow_for_index_op(
+                        loc, target, index, mutable, ty, context,
+                    ));
+            }
+        }
+        call
+    }
+
+    /// Translate an Index expression.
+    fn translate_index(
+        &mut self,
+        loc: &Loc,
+        target: &EA::Exp,
+        index: &EA::Exp,
+        expected_type: &Type,
+        context: &ErrorMessageContext,
+    ) -> ExpData {
+        let index_call_opt = self.try_resource_or_vector_index(
+            loc,
+            target,
+            index,
+            context,
+            &Type::Reference(ReferenceKind::Immutable, Box::new(expected_type.clone())),
+            false,
+        );
+        if let Some(call) = index_call_opt {
+            if !self.is_spec_mode() {
+                // if v[i] is on right hand side, need deref to get the value
+                let deref_id = self.new_node_id_with_type_loc(expected_type, loc);
+                return ExpData::Call(deref_id, Operation::Deref, vec![call.into_exp()]);
+            }
+            return call;
+        }
+        // We must concretize the type of index to decide whether this is a slice
+        // or not. This is not compatible with full type inference, so we may
+        // try to actually represent slicing explicitly in the syntax to fix this.
+        // Alternatively, we could leave it to the backend to figure (after full
+        // type inference) whether this is slice or index.
+        let elem_ty = self.fresh_type_var();
+        let vector_ty = Type::Vector(Box::new(elem_ty.clone()));
+        let vector_exp = self.translate_exp(target, &vector_ty);
+        let (index_ty, ie) = self.translate_exp_free(index);
+        let index_ty = self.subs.specialize(&index_ty);
+        let (result_t, oper) = if let Type::Primitive(PrimitiveType::Range) = &index_ty {
+            (vector_ty, Operation::Slice)
+        } else {
+            // If this is not (known to be) a range, assume its an index.
+            self.check_type(
+                loc,
+                &index_ty,
+                &Type::new_prim(PrimitiveType::Num),
+                &ErrorMessageContext::General,
+            );
+            (elem_ty, Operation::Index)
+        };
+        let result_t = self.check_type(loc, &result_t, expected_type, context);
         let id = self.new_node_id_with_type_loc(&result_t, loc);
         ExpData::Call(id, oper, vec![vector_exp.into_exp(), ie.into_exp()])
     }
@@ -3022,10 +3596,28 @@ impl<'env, 'translator, 'module_translator> ExpTranslator<'env, 'translator, 'mo
         &mut self,
         dotted: &EA::ExpDotted,
         expected_type: &Type,
+        index_mutate: bool,
         context: &ErrorMessageContext,
     ) -> ExpData {
         match &dotted.value {
-            EA::ExpDotted_::Exp(e) => self.translate_exp_in_context(e, expected_type, context),
+            EA::ExpDotted_::Exp(e) => {
+                if let EA::Exp_::Index(target, index) = &e.value {
+                    if let Some(call) = self.try_resource_or_vector_index(
+                        &self.to_loc(&e.loc),
+                        target,
+                        index,
+                        context,
+                        &Type::Reference(
+                            ReferenceKind::from_is_mut(index_mutate),
+                            Box::new(expected_type.clone()),
+                        ),
+                        index_mutate,
+                    ) {
+                        return call;
+                    }
+                }
+                self.translate_exp_in_context(e, expected_type, context)
+            },
             EA::ExpDotted_::Dot(e, n) => {
                 let loc = self.to_loc(&dotted.loc);
                 let field_name = self.symbol_pool().make(n.value.as_str());
@@ -3034,12 +3626,17 @@ impl<'env, 'translator, 'module_translator> ExpTranslator<'env, 'translator, 'mo
                 );
                 let ty =
                     self.fresh_type_var_constr(loc.clone(), WideningOrder::RightToLeft, constraint);
-                let exp = self.translate_dotted(e.as_ref(), &ty, &ErrorMessageContext::General);
+                let exp = self.translate_dotted(
+                    e.as_ref(),
+                    &ty,
+                    index_mutate,
+                    &ErrorMessageContext::General,
+                );
                 let id = self.new_node_id_with_type_loc(expected_type, &loc);
                 self.set_node_instantiation(id, vec![ty.clone()]);
-                let oper = if let Type::Struct(mid, sid, _inst) = self.subs.specialize(&ty) {
+                let oper = if let Type::Struct(mid, sid, inst) = self.subs.specialize(&ty) {
                     // Struct known at this point
-                    Operation::Select(mid, sid, FieldId::new(field_name))
+                    self.create_select_oper(&loc, &mid.qualified_inst(sid, inst), field_name)
                 } else {
                     // Create a placeholder for later resolution.
                     self.placeholder_map
@@ -3054,6 +3651,49 @@ impl<'env, 'translator, 'module_translator> ExpTranslator<'env, 'translator, 'mo
         }
     }
 
+    /// Creates a select operation for the given field name, the kind dependening on whether
+    /// variant fields or struct fields are selected.
+    fn create_select_oper(
+        &mut self,
+        loc: &Loc,
+        id: &QualifiedInstId<StructId>,
+        field_name: Symbol,
+    ) -> Operation {
+        let struct_name = self.parent.parent.get_struct_name(id.to_qualified_id());
+        if self.is_empty_struct(struct_name) {
+            self.error(
+                loc,
+                &format!(
+                    "empty struct `{}` cannot access the field `{}`",
+                    struct_name.display(self.env()),
+                    field_name.display(self.symbol_pool())
+                ),
+            );
+        }
+        let (decls, is_variant) = self.parent.parent.lookup_struct_field_decl(id, field_name);
+        let field_ids = decls
+            .into_iter()
+            .map(|(variant, _)| {
+                if let Some(v) = variant {
+                    // Selects a field variant, the id is qualified by the variant name.
+                    let pool = self.symbol_pool();
+                    FieldId::new(pool.make(&FieldId::make_variant_field_id_str(
+                        pool.string(v).as_str(),
+                        pool.string(field_name).as_str(),
+                    )))
+                } else {
+                    FieldId::new(field_name)
+                }
+            })
+            .collect_vec();
+        if is_variant {
+            Operation::SelectVariants(id.module_id, id.id, field_ids)
+        } else {
+            assert!(field_ids.len() == 1);
+            Operation::Select(id.module_id, id.id, field_ids[0])
+        }
+    }
+
     /// Translate the builtin function `update_field<generics>(args)`. The first arg must
     /// be a field name, the second the expression to assign the field.
     fn translate_update_field(
@@ -3082,14 +3722,16 @@ impl<'env, 'translator, 'module_translator> ExpTranslator<'env, 'translator, 'mo
             let struct_exp = self.translate_exp(args[0], expected_type);
             let expected_type = &self.subs.specialize(expected_type);
             if let Type::Struct(mid, sid, inst) = self.subs.specialize(expected_type) {
-                // field_map contains the instantiated field type.
-                let field_map = self
+                let field_name = self.symbol_pool().make(name.value.as_str());
+                let (field_decls, _) = self
                     .parent
                     .parent
-                    .lookup_struct_fields(&mid.qualified_inst(sid, inst));
-                let field_name = self.symbol_pool().make(name.value.as_str());
-                let expected_field_type =
-                    field_map.get(&field_name).cloned().unwrap_or(Type::Error); // this error is reported via type unification
+                    .lookup_struct_field_decl(&mid.qualified_inst(sid, inst), field_name);
+                let expected_field_type = if let Some((_, ty)) = field_decls.into_iter().next() {
+                    ty
+                } else {
+                    Type::Error // this error is reported via type unification
+                };
                 let constraint = Constraint::SomeStruct(
                     [(field_name, expected_field_type.clone())]
                         .into_iter()
@@ -3128,6 +3770,74 @@ impl<'env, 'translator, 'module_translator> ExpTranslator<'env, 'translator, 'mo
         }
     }
 
+    fn translate_test(
+        &mut self,
+        loc: &Loc,
+        exp: &EA::Exp,
+        tys: &[EA::Type],
+        expected_type: &Type,
+        context: &ErrorMessageContext,
+    ) -> ExpData {
+        let (exp_ty, exp) = self.translate_exp_free(exp);
+        let mut variants = vec![];
+        let mut struct_id = None;
+        for ty in tys {
+            let loc = self.to_loc(&ty.loc);
+            if let EA::Type_::Apply(maccess, generics) = &ty.value {
+                if let Some((inferred_struct_id, variant)) = self.translate_constructor_name(
+                    &exp_ty,
+                    WideningOrder::LeftToRight,
+                    context,
+                    &loc,
+                    maccess,
+                    &Some(generics.clone()),
+                ) {
+                    if let Some(variant) = variant {
+                        // Any time in the loop is the same if type unification succeeds, so
+                        // we can take the first
+                        struct_id.get_or_insert(inferred_struct_id);
+                        variants.push(variant);
+                    } else {
+                        self.error(
+                            &loc,
+                            &format!(
+                                "expected variant of enum type but found type `{}`",
+                                self.env().display(&inferred_struct_id)
+                            ),
+                        )
+                    }
+                } else {
+                    // Error reported by call to `translate_constructor_name`
+                }
+            }
+        }
+        self.check_type(
+            loc,
+            &Type::new_prim(PrimitiveType::Bool),
+            expected_type,
+            context,
+        );
+        if let Some(QualifiedInstId {
+            module_id,
+            id,
+            inst,
+        }) = struct_id
+        {
+            let node_id = self.new_node_id_with_type_loc(expected_type, loc);
+            if !inst.is_empty() {
+                self.set_node_instantiation(node_id, inst)
+            }
+            ExpData::Call(
+                node_id,
+                Operation::TestVariants(module_id, id, variants),
+                vec![exp.into_exp()],
+            )
+        } else {
+            // Error report
+            self.new_error_exp()
+        }
+    }
+
     /// Translates a call, performing overload resolution. Reports an error if the function cannot be found.
     /// This is used to resolve both calls to user functions and builtin operators.
     fn translate_call(
@@ -3707,40 +4417,144 @@ impl<'env, 'translator, 'module_translator> ExpTranslator<'env, 'translator, 'mo
         loc: &Loc,
         maccess: &EA::ModuleAccess,
         generics: &Option<Vec<EA::Type>>,
-        fields: &EA::Fields<EA::Exp>,
+        fields: Option<&EA::Fields<EA::Exp>>,
         expected_type: &Type,
         context: &ErrorMessageContext,
-    ) -> ExpData {
-        if let Some((struct_id, bindings, field_args)) =
-            self.translate_exp_fields(loc, maccess, generics, fields)
-        {
-            let struct_ty = struct_id.to_type();
-            let struct_ty = self.check_type(loc, &struct_ty, expected_type, context);
-            let mut field_args = field_args.into_iter().map(|e| e.into_exp()).collect_vec();
-            if field_args.is_empty() {
-                // The move compiler inserts a dummy field with the value of false
-                // for structs with no fields. This is also what we find in the
-                // Model metadata (i.e. a field `dummy_field`). We simulate this here
-                // for now, though it would be better to remove it everywhere as it
-                // can be confusing to users. However, its currently hard to do this,
-                // because a user could also have defined the `dummy_field`.
-                let id = self.new_node_id_with_type_loc(&BOOL_TYPE, loc);
-                field_args.push(ExpData::Value(id, Value::Bool(false)).into_exp());
+        expected_positional_constructor: bool,
+    ) -> Option<ExpData> {
+        // Resolve reference to struct
+        let (struct_name, variant) = self.parent.module_access_to_qualified_with_variant(maccess);
+        let struct_name_loc = self.to_loc(&maccess.loc);
+        let struct_entry = self.get_struct_report_undeclared(&struct_name, &struct_name_loc)?;
+
+        // Resolve type instantiation
+        let instantiation = self.make_instantiation_or_report(
+            &self.to_loc(&maccess.loc),
+            true,
+            struct_name.symbol,
+            &struct_entry.type_params,
+            generics,
+        )?;
+
+        // If this is a struct variant, check whether it exists.
+        if let Some(v) = variant {
+            if !self.check_variant_declared(&struct_name, &struct_entry, &struct_name_loc, v) {
+                return None;
             }
-            let id = self.new_node_id_with_type_loc(&struct_ty, loc);
-            self.set_node_instantiation(id, struct_id.inst);
-            let body = ExpData::Call(
-                id,
-                Operation::Pack(struct_id.module_id, struct_id.id),
-                field_args,
+        }
+
+        // Process argument list.
+        // given pack<S>{ f_p(1): e_1, ... }, where p is a permutation of the fields
+        // compute:
+        //     - the struct id of S
+        //     - (x_1, e_1), (x_2, e_2), ...
+        //     - arg_1, arg_2, ...
+        // such that the transformed code
+        //     { let x_1 = e_1; let x_2 = e_2; ...; pack(arg1, arg2, ...) }
+        // is equivalent.
+        let mut bindings = BTreeMap::new();
+        let mut args = BTreeMap::new();
+        let (field_decls, is_positional_constructor) =
+            self.get_field_decls_for_pack_unpack(&struct_name, &struct_name_loc, variant)?;
+        let field_decls = field_decls.clone();
+        if is_positional_constructor != expected_positional_constructor {
+            let struct_name_display = struct_name.display(self.env());
+            let variant_name_display = variant
+                .map(|v| format!("::{}", v.display(self.symbol_pool())))
+                .unwrap_or_default();
+            self.error(
+                loc,
+                &format!(
+                    "expected {} for {} `{}`",
+                    if is_positional_constructor {
+                        format!(
+                            "positional constructor `{}{}(..)`",
+                            struct_name_display, variant_name_display
+                        )
+                    } else {
+                        format!(
+                            "struct constructor `{}{} {{ .. }}`",
+                            struct_name_display, variant_name_display
+                        )
+                    },
+                    if variant.is_some() {
+                        "struct variant"
+                    } else {
+                        "struct"
+                    },
+                    struct_name_display
+                ),
             );
-            bindings.into_iter().rev().fold(body, |acc, (x, e)| {
-                self.new_bind_exp(loc, x, Some(e.into_exp()), acc.into_exp())
-            })
-        } else {
-            // Error already reported
-            self.new_error_exp()
+            return None;
         }
+        if let Some(fields) = fields {
+            self.check_missing_or_undeclared_fields(loc, struct_name, &field_decls, fields)?;
+            let in_order_fields = self.in_order_fields(&field_decls, fields);
+            for (_, name, (exp_idx, field_exp)) in fields.iter() {
+                let (def_idx, field_name, translated_field_exp) =
+                    self.translate_exp_field(&field_decls, name, &instantiation, field_exp);
+                if in_order_fields.contains(&def_idx) {
+                    args.insert(def_idx, translated_field_exp);
+                } else {
+                    // starts with $ for internal generated vars
+                    let var_name = self
+                        .symbol_pool()
+                        .make(&format!("${}", field_name.display(self.symbol_pool())));
+                    // the x_i to be used in the let bindings
+                    let var = Pattern::Var(translated_field_exp.node_id(), var_name);
+                    // the x_i to be used in the pack exp
+                    let arg = ExpData::LocalVar(translated_field_exp.node_id(), var_name);
+                    args.insert(def_idx, arg);
+                    bindings.insert(*exp_idx, (var, translated_field_exp));
+                }
+            }
+        } else if !field_decls.is_empty() {
+            self.error(
+                loc,
+                &format!(
+                    "no arguments provided for pack, expected {}",
+                    field_decls.len()
+                ),
+            )
+        }
+        let struct_id = struct_entry
+            .module_id
+            .qualified_inst(struct_entry.struct_id, instantiation);
+        let bindings = bindings
+            .into_iter()
+            .sorted_by_key(|(i, _)| *i)
+            .map(|(_, value)| value)
+            .collect_vec();
+        let args = args
+            .into_iter()
+            .sorted_by_key(|(i, _)| *i)
+            .map(|(_, value)| value)
+            .collect_vec();
+
+        let struct_ty = struct_id.to_type();
+        let struct_ty = self.check_type(loc, &struct_ty, expected_type, context);
+        let mut field_args = args.into_iter().map(|e| e.into_exp()).collect_vec();
+        if variant.is_none() && field_args.is_empty() {
+            // The move compiler inserts a dummy field with the value of false
+            // for structs with no fields. This is also what we find in the
+            // Model metadata (i.e. a field `dummy_field`). We simulate this here
+            // for now, though it would be better to remove it everywhere as it
+            // can be confusing to users. However, its currently hard to do this,
+            // because a user could also have defined the `dummy_field`.
+            let id = self.new_node_id_with_type_loc(&BOOL_TYPE, loc);
+            field_args.push(ExpData::Value(id, Value::Bool(false)).into_exp());
+        }
+        let id = self.new_node_id_with_type_loc(&struct_ty, loc);
+        self.set_node_instantiation(id, struct_id.inst);
+        let body = ExpData::Call(
+            id,
+            Operation::Pack(struct_id.module_id, struct_id.id, variant),
+            field_args,
+        );
+        // Fold the bindings and the body into result exp
+        Some(bindings.into_iter().rev().fold(body, |acc, (x, e)| {
+            self.new_bind_exp(loc, x, Some(e.into_exp()), acc.into_exp())
+        }))
     }
 
     fn get_struct_with_diag(
@@ -3769,23 +4583,68 @@ impl<'env, 'translator, 'module_translator> ExpTranslator<'env, 'translator, 'mo
         )
     }
 
-    fn get_field_decls_for_pack_unpack<'a>(
-        &'a mut self,
-        s: &'a StructEntry,
+    fn check_variant_declared(
+        &mut self,
         struct_name: &QualifiedSymbol,
-        struct_name_loc: &Loc,
-    ) -> Option<&BTreeMap<Symbol, (Loc, usize, Type)>> {
-        if let Some(field_decls) = &s.fields {
-            Some(field_decls)
-        } else {
-            self.error(
-                struct_name_loc,
+        struct_entry: &StructEntry,
+        loc: &Loc,
+        variant: Symbol,
+    ) -> bool {
+        match &struct_entry.layout {
+            StructLayout::Variants(variants) => {
+                if variants.iter().any(|v| v.name == variant) {
+                    return true;
+                }
+                self.error(
+                    loc,
+                    &format!(
+                        "variant `{}` not declared in `{}`",
+                        variant.display(self.symbol_pool()),
+                        struct_name.display(self.env())
+                    ),
+                )
+            },
+            StructLayout::Singleton(..) | StructLayout::None => self.error(
+                loc,
                 &format!(
-                    "native struct `{}` cannot be packed or unpacked",
+                    "struct `{}` has no variants",
                     struct_name.display(self.env())
                 ),
-            );
-            None
+            ),
+        }
+        false
+    }
+
+    fn get_field_decls_for_pack_unpack(
+        &mut self,
+        struct_name: &QualifiedSymbol,
+        struct_name_loc: &Loc,
+        variant: Option<Symbol>,
+    ) -> Option<(&BTreeMap<Symbol, FieldData>, bool)> {
+        let struct_entry = self.lookup_struct_entry(struct_name);
+        match (&struct_entry.layout, variant) {
+            (StructLayout::Singleton(fields, is_positional), None) => {
+                Some((fields, *is_positional))
+            },
+            (StructLayout::Variants(variants), Some(name)) => {
+                if let Some(variant) = variants.iter().find(|v| v.name == name) {
+                    Some((&variant.fields, variant.is_positional))
+                } else {
+                    self.error(
+                        struct_name_loc,
+                        &format!(
+                            "struct `{}` has no variant named `{}`",
+                            struct_name.display(self.env()),
+                            name.display(self.symbol_pool())
+                        ),
+                    );
+                    None
+                }
+            },
+            _ => {
+                self.bug(struct_name_loc, "inconsistent struct definition");
+                None
+            },
         }
     }
 
@@ -3793,26 +4652,28 @@ impl<'env, 'translator, 'module_translator> ExpTranslator<'env, 'translator, 'mo
         &mut self,
         loc: &Loc,
         struct_name: QualifiedSymbol,
-        field_decls: &BTreeMap<Symbol, (Loc, usize, Type)>,
+        field_decls: &BTreeMap<Symbol, FieldData>,
         fields: &EA::Fields<T>,
     ) -> Option<()> {
         let mut succeed = true;
         let mut fields_not_covered: BTreeSet<Symbol> = BTreeSet::new();
         // Exclude from the covered fields the dummy_field added by legacy compiler
-        fields_not_covered.extend(
-            field_decls
-                .keys()
-                .filter(|s| *s != &self.parent.dummy_field_name()),
-        );
+        fields_not_covered.extend(field_decls.keys().filter(|s| {
+            if self.is_empty_struct(&struct_name) {
+                *s != &self.parent.dummy_field_name()
+            } else {
+                true
+            }
+        }));
         for (name_loc, name, (_, _)) in fields.iter() {
             let field_name = self.symbol_pool().make(name);
-            if let Some((_, _, _)) = field_decls.get(&field_name) {
+            if !self.is_empty_struct(&struct_name) && field_decls.contains_key(&field_name) {
                 fields_not_covered.remove(&field_name);
             } else {
                 self.error(
                     &self.to_loc(&name_loc),
                     &format!(
-                        "field `{}` not declared in struct `{}`",
+                        "field `{}` not declared in `{}`",
                         field_name.display(self.symbol_pool()),
                         struct_name.display(self.env())
                     ),
@@ -3824,7 +4685,12 @@ impl<'env, 'translator, 'module_translator> ExpTranslator<'env, 'translator, 'mo
             self.error(
                 loc,
                 &format!(
-                    "missing fields {}",
+                    "missing field{} {}",
+                    if fields_not_covered.len() == 1 {
+                        ""
+                    } else {
+                        "s"
+                    },
                     fields_not_covered
                         .iter()
                         .map(|n| format!("`{}`", n.display(self.symbol_pool())))
@@ -3843,7 +4709,7 @@ impl<'env, 'translator, 'module_translator> ExpTranslator<'env, 'translator, 'mo
     // return the indices of fields that can be left in place during transforming pack exprs
     fn in_order_fields<T>(
         &mut self,
-        field_decls: &BTreeMap<Symbol, (Loc, usize, Type)>,
+        field_decls: &BTreeMap<Symbol, FieldData>,
         fields: &EA::Fields<T>,
     ) -> BTreeSet<usize> {
         // def_indices in evaluation order
@@ -3851,8 +4717,8 @@ impl<'env, 'translator, 'module_translator> ExpTranslator<'env, 'translator, 'mo
             .iter()
             .map(|(_, name, (exp_idx, _))| {
                 let field_name = self.symbol_pool().make(name);
-                let (_, def_idx, _) = field_decls.get(&field_name).unwrap();
-                (*exp_idx, *def_idx)
+                let field_data = field_decls.get(&field_name).unwrap();
+                (*exp_idx, field_data.offset)
             })
             .sorted_by_key(|(exp_idx, _)| *exp_idx)
             .map(|(_, def_idx)| def_idx)
@@ -3879,153 +4745,16 @@ impl<'env, 'translator, 'module_translator> ExpTranslator<'env, 'translator, 'mo
     //     - translated field exp
     fn translate_exp_field(
         &mut self,
-        field_decls: &BTreeMap<Symbol, (Loc, usize, Type)>,
+        field_decls: &BTreeMap<Symbol, FieldData>,
         field_name: &move_symbol_pool::Symbol,
         instantiation: &[Type],
         field_exp: &EA::Exp,
     ) -> (usize, Symbol, ExpData) {
         let field_name = self.symbol_pool().make(field_name);
-        let (_, def_idx, field_ty) = field_decls.get(&field_name).unwrap();
-        let field_ty = field_ty.instantiate(instantiation);
+        let field_data = field_decls.get(&field_name).unwrap();
+        let field_ty = field_data.ty.instantiate(instantiation);
         let translated_field_exp = self.translate_exp(field_exp, &field_ty);
-        (*def_idx, field_name, translated_field_exp)
-    }
-
-    // given pack<S>{ f_p(1): e_1, ... }, where p is a permutation of the fields
-    // return:
-    //     - the struct id of S
-    //     - (x_1, e_1), (x_2, e_2), ...
-    //     - arg_1, arg_2, ...
-    // such that the transformed code
-    //     { let x_1 = e_1; let x_2 = e_2; ...; pack(arg1, arg2, ...) }
-    // is equivalent.
-    fn translate_exp_fields(
-        &mut self,
-        loc: &Loc,
-        maccess: &EA::ModuleAccess,
-        generics: &Option<Vec<EA::Type>>,
-        fields: &EA::Fields<EA::Exp>,
-    ) -> Option<(
-        QualifiedInstId<StructId>,
-        Vec<(Pattern, ExpData)>,
-        Vec<ExpData>,
-    )> {
-        let struct_name = self.parent.module_access_to_qualified(maccess);
-        let struct_name_loc = self.to_loc(&maccess.loc);
-        let struct_entry = self.get_struct_report_undeclared(&struct_name, &struct_name_loc)?;
-        let instantiation = self.make_instantiation_or_report(
-            &self.to_loc(&maccess.loc),
-            true,
-            struct_name.symbol,
-            &struct_entry.type_params,
-            generics,
-        )?;
-        let field_decls = self
-            .get_field_decls_for_pack_unpack(&struct_entry, &struct_name, &struct_name_loc)?
-            .clone();
-
-        self.check_missing_or_undeclared_fields(loc, struct_name, &field_decls, fields)?;
-
-        let in_order_fields = self.in_order_fields(&field_decls, fields);
-        // maps i to (x_i, e_i) where i is the expression idx, i.e., idx of the field exp in the pack exp
-        let mut bindings = BTreeMap::new();
-        // maps i to x_i where i is the field definition idx, i.e., idx of the field in the struct definition
-        let mut args = BTreeMap::new();
-        for (_, name, (exp_idx, field_exp)) in fields.iter() {
-            let (def_idx, field_name, translated_field_exp) =
-                self.translate_exp_field(&field_decls, name, &instantiation, field_exp);
-            if in_order_fields.contains(&def_idx) {
-                args.insert(def_idx, translated_field_exp);
-            } else {
-                // starts with $ for internal generated vars
-                let var_name = self
-                    .symbol_pool()
-                    .make(&format!("${}", field_name.display(self.symbol_pool())));
-                // the x_i to be used in the let bindings
-                let var = Pattern::Var(translated_field_exp.node_id(), var_name);
-                // the x_i to be used in the pack exp
-                let arg = ExpData::LocalVar(translated_field_exp.node_id(), var_name);
-                args.insert(def_idx, arg);
-                bindings.insert(*exp_idx, (var, translated_field_exp));
-            }
-        }
-
-        let struct_id = struct_entry
-            .module_id
-            .qualified_inst(struct_entry.struct_id, instantiation);
-        let bindings = bindings
-            .into_iter()
-            .sorted_by_key(|(i, _)| *i)
-            .map(|(_, value)| value)
-            .collect_vec();
-        let args = args
-            .into_iter()
-            .sorted_by_key(|(i, _)| *i)
-            .map(|(_, value)| value)
-            .collect_vec();
-        Some((struct_id, bindings, args))
-    }
-
-    fn translate_lvalue_fields(
-        &mut self,
-        loc: &Loc,
-        maccess: &EA::ModuleAccess,
-        generics: &Option<Vec<EA::Type>>,
-        fields: &EA::Fields<EA::LValue>,
-        // whether matching against a reference value
-        ref_expected: Option<ReferenceKind>,
-        // pack { f_i : t_i }, should the type of f_i >: t_i or <: t_i
-        expected_order: WideningOrder,
-        // whether the pattern vars are already bound
-        match_locals: bool,
-        context: &ErrorMessageContext,
-    ) -> Option<(QualifiedInstId<StructId>, Vec<Pattern>)> {
-        let struct_name = self.parent.module_access_to_qualified(maccess);
-        let struct_name_loc = self.to_loc(&maccess.loc);
-        let struct_entry = self.get_struct_report_undeclared(&struct_name, &struct_name_loc)?;
-        let instantiation = self.make_instantiation_or_report(
-            &self.to_loc(&maccess.loc),
-            true,
-            struct_name.symbol,
-            &struct_entry.type_params,
-            generics,
-        )?;
-        let field_decls = self
-            .get_field_decls_for_pack_unpack(&struct_entry, &struct_name, &struct_name_loc)?
-            .clone();
-
-        self.check_missing_or_undeclared_fields(loc, struct_name, &field_decls, fields)?;
-
-        let mut args = BTreeMap::new();
-        for (_, name, (_, value)) in fields.iter() {
-            let field_name = self.symbol_pool().make(name);
-            if let Some((_, def_idx, field_ty)) = field_decls.get(&field_name) {
-                let field_ty = field_ty.instantiate(&instantiation);
-                let expected_field_ty = if let Some(kind) = ref_expected {
-                    Type::Reference(kind, Box::new(field_ty.clone()))
-                } else {
-                    field_ty.clone()
-                };
-                let translated = self.translate_lvalue(
-                    value,
-                    &expected_field_ty,
-                    expected_order,
-                    match_locals,
-                    context,
-                );
-                args.insert(def_idx, translated);
-            }
-        }
-
-        let struct_id = struct_entry
-            .module_id
-            .qualified_inst(struct_entry.struct_id, instantiation);
-        let args = args
-            .into_iter()
-            .sorted_by_key(|(i, _)| *i)
-            .map(|(_, value)| value)
-            .collect_vec();
-        Some((struct_id, args))
+        (field_data.offset, field_name, translated_field_exp)
     }
 
     fn translate_lambda(
diff --git a/third_party/move/move-model/src/builder/model_builder.rs b/third_party/move/move-model/src/builder/model_builder.rs
index 1b7874001553d..2be015a56a8dd 100644
--- a/third_party/move/move-model/src/builder/model_builder.rs
+++ b/third_party/move/move-model/src/builder/model_builder.rs
@@ -8,18 +8,19 @@
 //! system, as well as type checking it and translating it to the spec language ast.
 
 use crate::{
-    ast::{Address, Attribute, ModuleName, Operation, QualifiedSymbol, Spec, Value},
+    ast::{Address, Attribute, FriendDecl, ModuleName, Operation, QualifiedSymbol, Spec, Value},
     builder::builtins,
     intrinsics::IntrinsicDecl,
     model::{
-        FunId, FunctionKind, GlobalEnv, Loc, ModuleId, Parameter, QualifiedId, QualifiedInstId,
-        SpecFunId, SpecVarId, StructId, TypeParameter,
+        FieldData, FunId, FunctionKind, GlobalEnv, Loc, ModuleId, Parameter, QualifiedId,
+        QualifiedInstId, SpecFunId, SpecVarId, StructId, TypeParameter,
     },
     symbol::Symbol,
     ty::{Constraint, Type, TypeDisplayContext},
     well_known,
 };
 use codespan_reporting::diagnostic::Severity;
+use itertools::Itertools;
 use move_binary_format::file_format::{AbilitySet, Visibility};
 use move_compiler::{expansion::ast as EA, parser::ast as PA, shared::NumericalAddress};
 use move_core_types::account_address::AccountAddress;
@@ -119,11 +120,32 @@ pub(crate) struct StructEntry {
     pub struct_id: StructId,
     pub type_params: Vec<TypeParameter>,
     pub abilities: AbilitySet,
-    pub fields: Option<BTreeMap<Symbol, (Loc, usize, Type)>>,
+    pub layout: StructLayout,
     pub attributes: Vec<Attribute>,
     /// Maps simple function names to the qualified symbols of receiver functions. The
     /// symbol can be used to index the global function table.
     pub receiver_functions: BTreeMap<Symbol, QualifiedSymbol>,
+    /// Whether the struct is originally empty
+    /// always false when it is enum
+    pub is_empty_struct: bool,
+    pub is_native: bool,
+}
+
+#[derive(Debug, Clone)]
+pub(crate) enum StructLayout {
+    /// The second bool is true iff the struct has positional fields
+    Singleton(BTreeMap<Symbol, FieldData>, bool),
+    Variants(Vec<StructVariant>),
+    None,
+}
+
+#[derive(Debug, Clone)]
+pub(crate) struct StructVariant {
+    pub loc: Loc,
+    pub name: Symbol,
+    pub attributes: Vec<Attribute>,
+    pub fields: BTreeMap<Symbol, FieldData>,
+    pub is_positional: bool,
 }
 
 /// A declaration of a function.
@@ -335,7 +357,8 @@ impl<'env> ModelBuilder<'env> {
         struct_id: StructId,
         abilities: AbilitySet,
         type_params: Vec<TypeParameter>,
-        fields: Option<BTreeMap<Symbol, (Loc, usize, Type)>>,
+        layout: StructLayout,
+        is_native: bool,
     ) {
         let entry = StructEntry {
             loc,
@@ -344,8 +367,10 @@ impl<'env> ModelBuilder<'env> {
             struct_id,
             abilities,
             type_params,
-            fields,
+            layout,
             receiver_functions: BTreeMap::new(),
+            is_empty_struct: false,
+            is_native,
         };
         self.struct_table.insert(name.clone(), entry);
         self.reverse_struct_table
@@ -452,6 +477,37 @@ impl<'env> ModelBuilder<'env> {
         self.const_table.insert(name, entry);
     }
 
+    /// Adds friend declarations for package visibility.
+    /// This should only be called when all modules are loaded.
+    pub fn add_friend_decl_for_package_visibility(&mut self) {
+        let target_modules = self
+            .env
+            .get_modules()
+            .filter(|module_env| module_env.is_primary_target() && !module_env.is_script_module())
+            .map(|module_env| module_env.get_id())
+            .collect_vec();
+        for cur_mod in target_modules {
+            let cur_mod_env = self.env.get_module(cur_mod);
+            let cur_mod_name = cur_mod_env.get_name().clone();
+            for need_to_be_friended_by in cur_mod_env.need_to_be_friended_by() {
+                let need_to_be_friend_with = self.env.get_module_data_mut(need_to_be_friended_by);
+                let already_friended = need_to_be_friend_with
+                    .friend_decls
+                    .iter()
+                    .any(|friend_decl| friend_decl.module_name == cur_mod_name);
+                if !already_friended {
+                    let loc = need_to_be_friend_with.loc.clone();
+                    let friend_decl = FriendDecl {
+                        loc,
+                        module_name: cur_mod_name.clone(),
+                        module_id: Some(cur_mod),
+                    };
+                    need_to_be_friend_with.friend_decls.push(friend_decl);
+                }
+            }
+        }
+    }
+
     pub fn resolve_address(&self, loc: &Loc, addr: &EA::Address) -> NumericalAddress {
         match addr {
             EA::Address::Numerical(_, bytes) => bytes.value,
@@ -483,18 +539,35 @@ impl<'env> ModelBuilder<'env> {
             })
     }
 
-    /// Looks up the fields of a structure, with instantiated field types.
-    pub fn lookup_struct_fields(&self, id: &QualifiedInstId<StructId>) -> BTreeMap<Symbol, Type> {
+    /// Looks up field declaration, returning a list of optional variant name and type of the field
+    /// in the variant. The variant name is None and the list a singleton for proper struct types.
+    pub fn lookup_struct_field_decl(
+        &self,
+        id: &QualifiedInstId<StructId>,
+        field_name: Symbol,
+    ) -> (Vec<(Option<Symbol>, Type)>, bool) {
         let entry = self.lookup_struct_entry(id.to_qualified_id());
-        entry
-            .fields
-            .as_ref()
-            .map(|f| {
-                f.iter()
-                    .map(|(n, (_, _, field_ty))| (*n, field_ty.instantiate(&id.inst)))
-                    .collect::<BTreeMap<_, _>>()
-            })
-            .unwrap_or_default()
+        let get_instantiated_field = |fields: &BTreeMap<Symbol, FieldData>| {
+            fields
+                .get(&field_name)
+                .map(|data| data.ty.instantiate(&id.inst))
+        };
+        match &entry.layout {
+            StructLayout::Singleton(fields, _) => (
+                get_instantiated_field(fields)
+                    .map(|ty| vec![(None, ty)])
+                    .unwrap_or_default(),
+                false,
+            ),
+            StructLayout::Variants(variants) => (
+                variants
+                    .iter()
+                    .filter_map(|v| get_instantiated_field(&v.fields).map(|ty| (Some(v.name), ty)))
+                    .collect(),
+                true,
+            ),
+            _ => (vec![], false),
+        }
     }
 
     /// Looks up a receiver function for a given type.
@@ -513,6 +586,11 @@ impl<'env> ModelBuilder<'env> {
     /// Looks up the StructEntry for a qualified id.
     pub fn lookup_struct_entry(&self, id: QualifiedId<StructId>) -> &StructEntry {
         let struct_name = self.get_struct_name(id);
+        self.lookup_struct_entry_by_name(struct_name)
+    }
+
+    /// Looks up the StructEntry by `struct_name`
+    pub fn lookup_struct_entry_by_name(&self, struct_name: &QualifiedSymbol) -> &StructEntry {
         self.struct_table
             .get(struct_name)
             .expect("invalid Type::Struct")
diff --git a/third_party/move/move-model/src/builder/module_builder.rs b/third_party/move/move-model/src/builder/module_builder.rs
index 3dc8f4ddee9dc..0c15e7b083ed8 100644
--- a/third_party/move/move-model/src/builder/module_builder.rs
+++ b/third_party/move/move-model/src/builder/module_builder.rs
@@ -12,12 +12,13 @@ use crate::{
         exp_builder::ExpTranslator,
         model_builder::{
             ConstEntry, EntryVisibility, FunEntry, LocalVarEntry, ModelBuilder,
-            SpecOrBuiltinFunEntry,
+            SpecOrBuiltinFunEntry, StructLayout, StructVariant,
         },
     },
     constant_folder::ConstantFolder,
     exp_rewriter::{ExpRewriter, ExpRewriterFunctions, RewriteTarget},
     intrinsics::process_intrinsic_declaration,
+    model,
     model::{
         EqIgnoringLoc, FieldData, FieldId, FunId, FunctionData, FunctionKind, Loc, ModuleId,
         MoveIrLoc, NamedConstantData, NamedConstantId, NodeId, Parameter, SchemaId, SpecFunId,
@@ -31,6 +32,7 @@ use crate::{
     },
     symbol::{Symbol, SymbolPool},
     ty::{Constraint, ConstraintContext, ErrorMessageContext, PrimitiveType, Type, BOOL_TYPE},
+    LanguageVersion,
 };
 use codespan_reporting::diagnostic::Severity;
 use itertools::Itertools;
@@ -66,6 +68,12 @@ pub(crate) struct ModuleBuilder<'env, 'translator> {
     pub use_decls: Vec<UseDecl>,
     /// Translated friend declarations.
     pub friend_decls: Vec<FriendDecl>,
+    /// Location of a friend visibility modifier in the current module
+    pub friend_fun_loc: Option<move_ir_types::location::Loc>,
+    /// Location of a package visibility modifier in the current module
+    pub package_fun_loc: Option<move_ir_types::location::Loc>,
+    /// Set of functions with package visibility in the current module
+    pub package_funs: BTreeSet<FunId>,
     /// Translated specification functions.
     pub spec_funs: Vec<SpecFunDecl>,
     /// During the definition analysis, the index into `spec_funs` we are currently
@@ -143,6 +151,9 @@ impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
             module_id,
             module_name,
             use_decls: vec![],
+            friend_fun_loc: None,
+            package_fun_loc: None,
+            package_funs: BTreeSet::new(),
             friend_decls: vec![],
             spec_funs: vec![],
             inline_spec_builder: Spec::default(),
@@ -216,32 +227,70 @@ impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
     pub fn module_access_to_parts(
         &self,
         access: &EA::ModuleAccess,
-    ) -> (Option<ModuleName>, Symbol) {
+    ) -> (Option<ModuleName>, Symbol, Option<Symbol>) {
+        let pool = self.symbol_pool();
         match &access.value {
-            EA::ModuleAccess_::Name(n) => (None, self.symbol_pool().make(n.value.as_str())),
-            EA::ModuleAccess_::ModuleAccess(m, n) => {
+            EA::ModuleAccess_::Name(n) => (None, pool.make(n.value.as_str()), None),
+            EA::ModuleAccess_::ModuleAccess(m, n, v) => {
                 let loc = self.parent.to_loc(&m.loc);
                 let addr_bytes = self.parent.resolve_address(&loc, &m.value.address);
                 let module_name = ModuleName::from_address_bytes_and_name(
                     addr_bytes,
-                    self.symbol_pool().make(m.value.module.0.value.as_str()),
+                    pool.make(m.value.module.0.value.as_str()),
                 );
-                (Some(module_name), self.symbol_pool().make(n.value.as_str()))
+                (
+                    Some(module_name),
+                    pool.make(n.value.as_str()),
+                    v.map(|v| pool.make(v.value.as_str())),
+                )
             },
         }
     }
 
     /// Converts a ModuleAccess into a qualified symbol which can be used for lookup of
-    /// types or functions.
+    /// types or functions. If the access has a struct variant, an error is produced.
     pub fn module_access_to_qualified(&self, access: &EA::ModuleAccess) -> QualifiedSymbol {
-        let (module_name_opt, symbol) = self.module_access_to_parts(access);
-        let module_name = module_name_opt.unwrap_or_else(|| self.module_name.clone());
-        QualifiedSymbol {
-            module_name,
-            symbol,
+        self.check_no_variant(access);
+        let (qsym, _) = self.module_access_to_qualified_with_variant(access);
+        qsym
+    }
+
+    pub fn is_variant(maccess: &EA::ModuleAccess) -> bool {
+        matches!(
+            maccess.value,
+            EA::ModuleAccess_::ModuleAccess(_, _, Some(_))
+        )
+    }
+
+    pub fn check_no_variant(&self, maccess: &EA::ModuleAccess) -> bool {
+        if Self::is_variant(maccess) {
+            self.parent.env.error(
+                &self.parent.to_loc(&maccess.loc),
+                "variants not allowed in this context",
+            );
+            false
+        } else {
+            true
         }
     }
 
+    /// Converts a ModuleAccess into a qualified symbol which can be used for lookup of
+    /// types or functions, plus an optional struct variant.
+    pub fn module_access_to_qualified_with_variant(
+        &self,
+        access: &EA::ModuleAccess,
+    ) -> (QualifiedSymbol, Option<Symbol>) {
+        let (module_name_opt, symbol, variant) = self.module_access_to_parts(access);
+        let module_name = module_name_opt.unwrap_or_else(|| self.module_name.clone());
+        (
+            QualifiedSymbol {
+                module_name,
+                symbol,
+            },
+            variant,
+        )
+    }
+
     /// Creates a SpecBlockContext from the given SpecBlockTarget. The context is used during
     /// definition analysis when visiting a schema block member (condition, invariant, etc.).
     /// This returns None if the SpecBlockTarget cannot be resolved; error reporting happens
@@ -360,7 +409,8 @@ impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
                             None,
                             self.symbol_pool().make(n.value.as_str()),
                         ),
-                        EA::ModuleAccess_::ModuleAccess(mident, n) => {
+                        EA::ModuleAccess_::ModuleAccess(mident, n, _) => {
+                            self.check_no_variant(macc);
                             let addr_bytes = self.parent.resolve_address(
                                 &self.parent.to_loc(&macc.loc),
                                 &mident.value.address,
@@ -408,8 +458,11 @@ impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
             self.decl_ana_use_decl(use_decl)
         }
         for (friend_mod_id, friend) in module_def.friends.key_cloned_iter() {
-            self.decl_ana_friend_decl(&friend_mod_id, friend);
+            self.decl_ana_friend_decl(&friend_mod_id, &friend.loc);
         }
+        // we have collected all package and friend visibilities in the current module
+        // and friend declarations in the current module, before we can check their compatibility
+        self.check_visibility_compatibility();
     }
 
     fn decl_ana_const(&mut self, name: &PA::ConstantName, def: &EA::Constant) {
@@ -458,7 +511,8 @@ impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
             struct_id,
             abilities,
             type_params,
-            None, // will be filled in during definition analysis
+            StructLayout::None, // will be filled in during definition analysis,
+            matches!(def.layout, EA::StructLayout::Native(_)),
         );
     }
 
@@ -471,6 +525,23 @@ impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
             )
         }
         let fun_id = FunId::new(qsym.symbol);
+        let visibility = match def.visibility {
+            EA::Visibility::Public(_) => Visibility::Public,
+            EA::Visibility::Friend(loc) => {
+                if self.friend_fun_loc.is_none() {
+                    self.friend_fun_loc = Some(loc);
+                }
+                Visibility::Friend
+            },
+            EA::Visibility::Internal => Visibility::Private,
+            EA::Visibility::Package(loc) => {
+                if self.package_fun_loc.is_none() {
+                    self.package_fun_loc = Some(loc);
+                }
+                self.package_funs.insert(fun_id);
+                Visibility::Friend
+            },
+        };
         let attributes = self.translate_attributes(&def.attributes);
         let mut et = ExpTranslator::new(self);
         et.set_translate_move_fun();
@@ -485,17 +556,15 @@ impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
         let params = et.analyze_and_add_params(&def.signature.parameters, true);
         let result_type = et.translate_type(&def.signature.return_type);
         let kind = if def.entry.is_some() {
+            if et.env().language_version.is_at_least(LanguageVersion::V2_0) && def.inline {
+                et.error(&et.to_loc(&def.loc), "An entry function cannot be inlined.");
+            }
             FunctionKind::Entry
         } else if def.inline {
             FunctionKind::Inline
         } else {
             FunctionKind::Regular
         };
-        let visibility = match def.visibility {
-            EA::Visibility::Public(_) => Visibility::Public,
-            EA::Visibility::Friend(_) => Visibility::Friend,
-            EA::Visibility::Internal => Visibility::Private,
-        };
         let is_native = matches!(def.body.value, EA::FunctionBody_::Native);
         let def_loc = et.to_loc(&def.loc);
         let name_loc = et.to_loc(&name.loc());
@@ -582,7 +651,11 @@ impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
         });
     }
 
-    fn decl_ana_friend_decl(&mut self, friend_mod_id: &EA::ModuleIdent, friend: &EA::Friend) {
+    fn decl_ana_friend_decl(
+        &mut self,
+        friend_mod_id: &EA::ModuleIdent,
+        friend_loc: &move_ir_types::location::Loc,
+    ) {
         // Get various information about the declared friend module.
         let addr = self.parent.resolve_address(
             &self.parent.to_loc(&friend_mod_id.loc),
@@ -592,7 +665,7 @@ impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
             .symbol_pool()
             .make(friend_mod_id.value.module.0.value.as_str());
         let module_name = ModuleName::from_address_bytes_and_name(addr, name);
-        let loc = self.parent.to_loc(&friend.loc);
+        let loc = self.parent.to_loc(friend_loc);
         // Add a corresponding friend declaration.
         self.friend_decls.push(FriendDecl {
             loc,
@@ -690,6 +763,7 @@ impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
             body: None,
             callees: Default::default(),
             is_recursive: Default::default(),
+            insts_using_generic_type_reflection: Default::default(),
         };
         self.spec_funs.push(fun_decl);
     }
@@ -1149,42 +1223,100 @@ impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
         et.set_translate_move_fun(); // translating structs counts as move fun, not spec
         let loc = et.to_loc(&name.0.loc);
         et.define_type_params(&loc, &type_params, false);
-        let fields = match &def.fields {
-            EA::StructFields::Defined(fields) => {
-                let mut field_map = BTreeMap::new();
-                for (name_loc, field_name_, (idx, ty)) in fields {
-                    let field_loc = et.to_loc(&name_loc);
-                    let field_sym = et.symbol_pool().make(field_name_);
-                    let field_ty = et.translate_type(ty);
-                    let field_ty_loc = et.to_loc(&ty.loc);
-                    for ctr in Constraint::for_field(struct_abilities, &field_ty) {
-                        et.add_constraint_and_report(
-                            &field_ty_loc,
-                            &ErrorMessageContext::General,
-                            &field_ty,
-                            ctr,
-                            Some(ConstraintContext::default().for_field(field_sym)),
-                        )
-                    }
-                    field_map.insert(field_sym, (field_loc, *idx, field_ty));
-                }
-                if field_map.is_empty() {
-                    // The legacy Move compiler inserts a `dummy_field: bool` here, we need to
-                    // simulate this behavior for now, as that is what we find in the bytecode
-                    // generated by the compiler.
-                    let field_sym = et.parent.dummy_field_name();
-                    let field_ty = Type::new_prim(PrimitiveType::Bool);
-                    field_map.insert(field_sym, (loc.clone(), 0, field_ty));
-                }
-                Some(field_map)
+        // Notice: duplicate field and variant declarations are currently checked in
+        // the expansion phase, so don't need to do here again.
+        let (layout, is_empty_struct) = match &def.layout {
+            EA::StructLayout::Singleton(fields, is_positional) => {
+                let (map, is_struct_empty) =
+                    Self::build_field_map(&mut et, None, struct_abilities, &loc, fields);
+                (
+                    StructLayout::Singleton(map, *is_positional),
+                    is_struct_empty,
+                )
+            },
+            EA::StructLayout::Variants(variants) => {
+                let variant_maps = variants
+                    .iter()
+                    .map(|v| {
+                        let variant_loc = et.to_loc(&v.loc);
+                        let variant_name = et.symbol_pool().make(v.name.0.value.as_str());
+                        let attributes = et.parent.translate_attributes(&v.attributes);
+                        let (variant_fields, _) = Self::build_field_map(
+                            &mut et,
+                            Some(variant_name),
+                            struct_abilities,
+                            &variant_loc,
+                            &v.fields,
+                        );
+                        StructVariant {
+                            loc: variant_loc,
+                            name: variant_name,
+                            attributes,
+                            fields: variant_fields,
+                            is_positional: v.is_positional,
+                        }
+                    })
+                    .collect_vec();
+                (StructLayout::Variants(variant_maps), false)
             },
-            EA::StructFields::Native(_) => None,
+            EA::StructLayout::Native(_) => (StructLayout::None, false),
         };
-        self.parent
+        let entry = self
+            .parent
             .struct_table
             .get_mut(&qsym)
-            .expect("struct invalid")
-            .fields = fields;
+            .expect("struct invalid");
+        entry.layout = layout;
+        entry.is_empty_struct = is_empty_struct;
+    }
+
+    fn build_field_map(
+        et: &mut ExpTranslator,
+        for_variant: Option<Symbol>,
+        struct_abilities: AbilitySet,
+        loc: &Loc,
+        fields: &EA::Fields<EA::Type>,
+    ) -> (BTreeMap<Symbol, FieldData>, bool) {
+        let mut field_map = BTreeMap::new();
+        for (name_loc, field_name, (idx, ty)) in fields {
+            let field_loc = et.to_loc(&name_loc);
+            let field_sym = et.symbol_pool().make(field_name);
+            let field_ty = et.translate_type(ty);
+            let field_ty_loc = et.to_loc(&ty.loc);
+            for ctr in Constraint::for_field(struct_abilities, &field_ty) {
+                et.add_constraint_and_report(
+                    &field_ty_loc,
+                    &ErrorMessageContext::General,
+                    &field_ty,
+                    ctr,
+                    Some(ConstraintContext::default().for_field(field_sym)),
+                )
+            }
+            field_map.insert(field_sym, FieldData {
+                name: field_sym,
+                loc: field_loc.clone(),
+                offset: *idx,
+                variant: for_variant,
+                ty: field_ty,
+            });
+        }
+        let mut is_empty_struct = false;
+        if for_variant.is_none() && field_map.is_empty() {
+            // The legacy Move compiler inserts a `dummy_field: bool` here, we need to
+            // simulate this behavior for now, as that is what we find in the bytecode
+            // generated by the v1 compiler and stored on chain.
+            let field_sym = et.parent.dummy_field_name();
+            let field_ty = Type::new_prim(PrimitiveType::Bool);
+            field_map.insert(field_sym, FieldData {
+                name: field_sym,
+                loc: loc.clone(),
+                offset: 0,
+                variant: None,
+                ty: field_ty,
+            });
+            is_empty_struct = true;
+        }
+        (field_map, is_empty_struct)
     }
 
     /// The name of a dummy field the legacy Move compilers adds to zero-arity structs.
@@ -1454,7 +1586,7 @@ impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
                 }
             },
             Some(EA::PragmaValue::Ident(ema)) => match self.module_access_to_parts(ema) {
-                (None, sym) => PropertyValue::Symbol(sym),
+                (None, sym, _) => PropertyValue::Symbol(sym),
                 _ => PropertyValue::QualifiedSymbol(self.module_access_to_qualified(ema)),
             },
         };
@@ -1642,17 +1774,17 @@ impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
 
                 let mut et = ExpTranslator::new_with_old(self, allows_old);
                 et.define_type_params(loc, &entry.type_params, false);
-                if let Some(fields) = &entry.fields {
+                if let StructLayout::Singleton(fields, _is_positional) = &entry.layout {
                     et.enter_scope();
-                    for (n, (_, _, ty)) in fields {
+                    for f in fields.values() {
                         et.define_local(
                             loc,
-                            *n,
-                            ty.clone(),
+                            f.name,
+                            f.ty.clone(),
                             Some(Operation::Select(
                                 entry.module_id,
                                 entry.struct_id,
-                                FieldId::new(*n),
+                                FieldId::new(f.name),
                             )),
                             None,
                         );
@@ -1716,6 +1848,37 @@ impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
 
         et
     }
+
+    /// Checks if both package and friend visibility/declaration are used in the same module
+    fn check_visibility_compatibility(&self) {
+        if let Some(package_vis_loc) = &self.package_fun_loc {
+            let package_vis_loc = self.parent.to_loc(package_vis_loc);
+            let friend_vis_loc = if let Some(friend_vis_loc) = &self.friend_fun_loc {
+                Some(self.parent.to_loc(friend_vis_loc))
+            } else {
+                self.friend_decls
+                    .first()
+                    .map(|friend_decl| friend_decl.loc.clone())
+            };
+            if let Some(friend_vis_loc) = friend_vis_loc {
+                self.parent.env.diag_with_labels(
+                    Severity::Error,
+                    &friend_vis_loc,
+                    "Cannot use both package and friend visibility in the same module",
+                    vec![
+                        (
+                            package_vis_loc,
+                            "package visibility declared here".to_string(),
+                        ),
+                        (
+                            friend_vis_loc.clone(),
+                            "friend visibility declared here".to_string(),
+                        ),
+                    ],
+                );
+            }
+        }
+    }
 }
 
 /// ## Condition Definition Analysis
@@ -3110,6 +3273,10 @@ impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
                     // TODO: model friend visibility properly
                     unimplemented!("Friend visibility not supported yet")
                 },
+                PA::Visibility::Package(..) => {
+                    // TODO: model package visibility properly
+                    unimplemented!("Package visibility not supported yet")
+                },
             }
         }
         let rex = Regex::new(&format!(
@@ -3287,21 +3454,32 @@ impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
             }
             // New struct in this module
             let spec = self.struct_specs.remove(&name.symbol).unwrap_or_default();
-            let field_data = if let Some(fields) = &entry.fields {
-                fields
-                    .iter()
-                    .map(|(name, (loc, offset, ty))| {
-                        (FieldId::new(*name), FieldData {
-                            name: *name,
-                            loc: loc.clone(),
-                            offset: *offset,
-                            ty: ty.clone(),
-                        })
-                    })
-                    .collect::<BTreeMap<_, _>>()
-            } else {
-                BTreeMap::new()
-            };
+            let mut field_data: BTreeMap<FieldId, FieldData> = BTreeMap::new();
+            let mut variants: BTreeMap<Symbol, model::StructVariant> = BTreeMap::new();
+            match &entry.layout {
+                StructLayout::Singleton(fields, _) => {
+                    field_data.extend(fields.values().map(|f| (FieldId::new(f.name), f.clone())));
+                },
+                StructLayout::Variants(entry_variants) => {
+                    for (order, variant) in entry_variants.iter().enumerate() {
+                        variants.insert(variant.name, model::StructVariant {
+                            loc: variant.loc.clone(),
+                            order,
+                            attributes: variant.attributes.clone(),
+                        });
+                        for field in variant.fields.values().sorted_by_key(|f| f.offset).cloned() {
+                            let pool = self.parent.env.symbol_pool();
+                            let field_id =
+                                FieldId::new(pool.make(&FieldId::make_variant_field_id_str(
+                                    pool.string(variant.name).as_str(),
+                                    pool.string(field.name).as_str(),
+                                )));
+                            field_data.insert(field_id, field);
+                        }
+                    }
+                },
+                StructLayout::None => {},
+            }
             let data = StructData {
                 name: name.symbol,
                 loc: entry.loc.clone(),
@@ -3311,7 +3489,13 @@ impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
                 abilities: entry.abilities,
                 spec_var_opt: None,
                 field_data,
+                variants: if variants.is_empty() {
+                    None
+                } else {
+                    Some(variants)
+                },
                 spec: RefCell::new(spec),
+                is_native: entry.is_native,
             };
             struct_data.insert(StructId::new(name.symbol), data);
         }
@@ -3332,6 +3516,7 @@ impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
             let def = self.fun_defs.remove(&name.symbol);
             let called_funs = Some(def.as_ref().map(|e| e.called_funs()).unwrap_or_default());
             let access_specifiers = self.fun_access_specifiers.remove(&name.symbol);
+            let fun_id = FunId::new(name.symbol);
             let data = FunctionData {
                 name: name.symbol,
                 loc: entry.loc.clone(),
@@ -3339,6 +3524,7 @@ impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
                 def_idx: None,
                 handle_idx: None,
                 visibility: entry.visibility,
+                has_package_visibility: self.package_funs.contains(&fun_id),
                 is_native: entry.is_native,
                 kind: entry.kind,
                 attributes: entry.attributes.clone(),
@@ -3352,7 +3538,7 @@ impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
                 calling_funs: RefCell::default(),
                 transitive_closure_of_called_funs: RefCell::default(),
             };
-            function_data.insert(FunId::new(name.symbol), data);
+            function_data.insert(fun_id, data);
         }
 
         let mut named_constants: BTreeMap<NamedConstantId, NamedConstantData> = Default::default();
diff --git a/third_party/move/move-model/src/constant_folder.rs b/third_party/move/move-model/src/constant_folder.rs
index d4f3e156b0c39..1be67699a5eb3 100644
--- a/third_party/move/move-model/src/constant_folder.rs
+++ b/third_party/move/move-model/src/constant_folder.rs
@@ -402,21 +402,12 @@ impl<'env> ExpRewriterFunctions for ConstantFolder<'env> {
                 None
             }
         } else if matches!(oper, Operation::Vector) {
-            if self.in_constant_declaration {
+            // Note that creating an empty vector is less gas than `ld_const_base`,
+            // so if we are optimizing we leave an empty vector as a vector op.
+            if self.in_constant_declaration || !args.is_empty() {
                 self.fold_vector_exp(id, Value::Vector, "vector", args)
             } else {
-                let result_type = self.env.get_node_type(id);
-                let vec_is_of_number = if let Type::Vector(tr) = result_type {
-                    tr.is_number()
-                } else {
-                    false
-                };
-                if !args.is_empty() && vec_is_of_number {
-                    // Nonempty vectors of numbers are probably cheaper as constants.
-                    self.fold_vector_exp(id, Value::Vector, "vector", args)
-                } else {
-                    None
-                }
+                None
             }
         } else if args.len() == 1 {
             // unary op
diff --git a/third_party/move/move-model/src/exp_rewriter.rs b/third_party/move/move-model/src/exp_rewriter.rs
index 616a24b3bdc46..2221274b43b5d 100644
--- a/third_party/move/move-model/src/exp_rewriter.rs
+++ b/third_party/move/move-model/src/exp_rewriter.rs
@@ -4,8 +4,8 @@
 
 use crate::{
     ast::{
-        Condition, Exp, ExpData, MemoryLabel, Operation, Pattern, Spec, SpecBlockTarget, TempIndex,
-        Value,
+        Condition, Exp, ExpData, MatchArm, MemoryLabel, Operation, Pattern, Spec, SpecBlockTarget,
+        TempIndex, Value,
     },
     model::{GlobalEnv, ModuleId, NodeId, SpecVarId},
     symbol::Symbol,
@@ -454,6 +454,34 @@ pub trait ExpRewriterFunctions {
                     exp
                 }
             },
+            Match(id, disc, arms) => {
+                let (id_changed, new_id) = self.internal_rewrite_id(*id);
+                let (disc_changed, new_disc) = self.internal_rewrite_exp(disc);
+                let (mut arms_changed, mut new_arms) = (false, vec![]);
+                for arm in arms {
+                    let (pat_changed, new_pat) = self.internal_rewrite_pattern(&arm.pattern, true);
+                    self.rewrite_enter_block_scope(new_id, &new_pat, &None);
+                    let (cond_changed, new_cond) = if let Some(c) = &arm.condition {
+                        let (c, e) = self.internal_rewrite_exp(c);
+                        (c, Some(e))
+                    } else {
+                        (false, arm.condition.clone())
+                    };
+                    let (body_changed, new_body) = self.internal_rewrite_exp(&arm.body);
+                    new_arms.push(MatchArm {
+                        loc: arm.loc.clone(),
+                        pattern: new_pat,
+                        condition: new_cond,
+                        body: new_body,
+                    });
+                    arms_changed = arms_changed || pat_changed || cond_changed || body_changed;
+                }
+                if id_changed || disc_changed || arms_changed {
+                    Match(*id, new_disc, new_arms).into_exp()
+                } else {
+                    exp
+                }
+            },
             Sequence(id, es) => {
                 let (id_changed, new_id) = self.internal_rewrite_id(*id);
                 let changed_vec = self.internal_rewrite_vec(es);
@@ -549,14 +577,14 @@ pub trait ExpRewriterFunctions {
 
     fn internal_rewrite_pattern(&mut self, pat: &Pattern, creating_scope: bool) -> (bool, Pattern) {
         match pat {
-            Pattern::Tuple(_, pattern_vec) | Pattern::Struct(_, _, pattern_vec) => {
+            Pattern::Tuple(_, pattern_vec) | Pattern::Struct(_, _, _, pattern_vec) => {
                 let (changed, final_pattern_vec) =
                     self.internal_rewrite_pattern_vector(pattern_vec, creating_scope);
                 if changed {
                     let new_pat = match pat {
                         Pattern::Tuple(id, _) => Pattern::Tuple(*id, final_pattern_vec),
-                        Pattern::Struct(id, struct_id, _) => {
-                            Pattern::Struct(*id, struct_id.clone(), final_pattern_vec)
+                        Pattern::Struct(id, struct_id, variant, _) => {
+                            Pattern::Struct(*id, struct_id.clone(), *variant, final_pattern_vec)
                         },
                         _ => unreachable!(),
                     };
diff --git a/third_party/move/move-model/src/lib.rs b/third_party/move/move-model/src/lib.rs
index 4700ac9b5a837..92533e0515fdb 100644
--- a/third_party/move/move-model/src/lib.rs
+++ b/third_party/move/move-model/src/lib.rs
@@ -44,6 +44,7 @@ use move_ir_types::location::sp;
 use move_symbol_pool::Symbol as MoveSymbol;
 use std::{
     collections::{BTreeMap, BTreeSet, VecDeque},
+    fmt::Debug,
     rc::Rc,
 };
 
@@ -75,10 +76,13 @@ pub struct PackageInfo {
     pub address_map: BTreeMap<String, NumericalAddress>,
 }
 
-/// Builds the Move model for the v2 compiler. This builds the model, compiling both code
-/// and specs from sources into typed-checked AST. No bytecode is attached to the model.
-/// This currently uses the v1 compiler as the parser (up to expansion AST), after that
-/// a new type checker.
+/// Builds the Move model for the v2 compiler. This builds the model, compiling both code and specs
+/// from sources into typed-checked AST. No bytecode is attached to the model.  This currently uses
+/// the v1 compiler as the parser (up to expansion AST), after that a new type checker.
+///
+/// Note that `source` and  `source_deps` are either Move files or package subdirectories which
+/// contain Move files, all of which should be compiled (not the root of a package, but the
+/// `sources`, `scripts`, and/or `tests`, depending on compilation mode.
 pub fn run_model_builder_in_compiler_mode(
     source: PackageInfo,
     source_deps: PackageInfo,
@@ -86,7 +90,10 @@ pub fn run_model_builder_in_compiler_mode(
     skip_attribute_checks: bool,
     known_attributes: &BTreeSet<String>,
     language_version: LanguageVersion,
+    warn_of_deprecation_use: bool,
+    warn_of_deprecation_use_in_aptos_libs: bool,
     compile_test_code: bool,
+    compile_verify_code: bool,
 ) -> anyhow::Result<GlobalEnv> {
     let to_package_paths = |PackageInfo {
                                 sources,
@@ -106,8 +113,13 @@ pub fn run_model_builder_in_compiler_mode(
             ..ModelBuilderOptions::default()
         },
         Flags::model_compilation()
+            .set_warn_of_deprecation_use(warn_of_deprecation_use)
+            .set_warn_of_deprecation_use_in_aptos_libs(warn_of_deprecation_use_in_aptos_libs)
             .set_skip_attribute_checks(skip_attribute_checks)
-            .set_keep_testing_functions(compile_test_code),
+            .set_verify(compile_verify_code)
+            .set_keep_testing_functions(compile_test_code)
+            .set_lang_v2(language_version != LanguageVersion::V1)
+            .set_compiler_v2(true),
         known_attributes,
     )
 }
@@ -117,8 +129,8 @@ pub fn run_model_builder_in_compiler_mode(
 
 /// Build the move model with default compilation flags and custom options.
 pub fn run_model_builder_with_options<
-    Paths: Into<MoveSymbol> + Clone,
-    NamedAddress: Into<MoveSymbol> + Clone,
+    Paths: Into<MoveSymbol> + Clone + Debug,
+    NamedAddress: Into<MoveSymbol> + Clone + Debug,
 >(
     move_sources: Vec<PackagePaths<Paths, NamedAddress>>,
     move_deps: Vec<PackagePaths<Paths, NamedAddress>>,
@@ -141,8 +153,8 @@ pub fn run_model_builder_with_options<
 
 /// Build the move model with custom compilation flags and custom options
 pub fn run_model_builder_with_options_and_compilation_flags<
-    Paths: Into<MoveSymbol> + Clone,
-    NamedAddress: Into<MoveSymbol> + Clone,
+    Paths: Into<MoveSymbol> + Clone + Debug,
+    NamedAddress: Into<MoveSymbol> + Clone + Debug,
 >(
     move_sources_targets: Vec<PackagePaths<Paths, NamedAddress>>,
     move_sources_deps: Vec<PackagePaths<Paths, NamedAddress>>,
@@ -170,6 +182,7 @@ pub fn run_model_builder_with_options_and_compilation_flags<
                 .to_owned()
         })
         .collect();
+
     // Step 1: parse the program to get comments and a separation of targets and dependencies.
     let (files, comments_and_compiler_res) =
         Compiler::from_package_paths(move_sources, deps, flags, known_attributes)
@@ -434,6 +447,8 @@ fn run_move_checker(env: &mut GlobalEnv, program: E::Program) {
     // After all specs have been processed, warn about any unused schemas.
     builder.warn_unused_schemas();
 
+    builder.add_friend_decl_for_package_visibility();
+
     // Perform any remaining friend-declaration checks and update friend module id information.
     check_and_update_friend_info(builder);
 }
@@ -666,6 +681,11 @@ pub fn script_into_module(compiled_script: CompiledScript, name: &str) -> Compil
 
         struct_defs: vec![],
         function_defs: vec![main_def],
+
+        struct_variant_handles: vec![],
+        struct_variant_instantiations: vec![],
+        variant_field_handles: vec![],
+        variant_field_instantiations: vec![],
     };
     BoundsChecker::verify_module(&module).expect("invalid bounds in module");
     module
@@ -725,7 +745,7 @@ fn run_spec_checker(env: &mut GlobalEnv, units: Vec<AnnotatedCompiledUnit>, mut
                 // Convert the script into a module.
                 let address = E::Address::Numerical(
                     None,
-                    sp(expanded_script.loc, NumericalAddress::DEFAULT_ERROR_ADDRESS),
+                    sp(expanded_script.loc, NumericalAddress::MAX_ADDRESS),
                 );
                 let ident = sp(
                     expanded_script.loc,
@@ -1024,7 +1044,7 @@ fn downgrade_type_inlining_to_expansion(ty: &N::Type) -> E::Type {
                     E::Type_::Apply(sp(ty.loc, access), rewritten_args)
                 },
                 N::TypeName_::ModuleType(module_ident, struct_name) => {
-                    let access = E::ModuleAccess_::ModuleAccess(*module_ident, struct_name.0);
+                    let access = E::ModuleAccess_::ModuleAccess(*module_ident, struct_name.0, None);
                     E::Type_::Apply(sp(struct_name.loc(), access), rewritten_args)
                 },
                 N::TypeName_::Multiple(size) => {
@@ -1056,7 +1076,7 @@ fn downgrade_exp_inlining_to_expansion(exp: &T::Exp) -> E::Exp {
         UnannotatedExp_::Constant(module_ident_opt, name) => {
             let access = match module_ident_opt {
                 None => E::ModuleAccess_::Name(name.0),
-                Some(module_ident) => E::ModuleAccess_::ModuleAccess(*module_ident, name.0),
+                Some(module_ident) => E::ModuleAccess_::ModuleAccess(*module_ident, name.0, None),
             };
             Exp_::Name(sp(name.loc(), access), None)
         },
@@ -1071,7 +1091,7 @@ fn downgrade_exp_inlining_to_expansion(exp: &T::Exp) -> E::Exp {
                 parameter_types: _,
                 acquires: _,
             } = call.as_ref();
-            let access = E::ModuleAccess_::ModuleAccess(*module, name.0);
+            let access = E::ModuleAccess_::ModuleAccess(*module, name.0, None);
             let rewritten_arguments = match downgrade_exp_inlining_to_expansion(arguments).value {
                 Exp_::Unit { .. } => vec![],
                 Exp_::ExpList(exps) => exps,
@@ -1187,7 +1207,7 @@ fn downgrade_exp_inlining_to_expansion(exp: &T::Exp) -> E::Exp {
         ),
 
         UnannotatedExp_::Pack(module_ident, struct_name, ty_args, fields) => {
-            let access = E::ModuleAccess_::ModuleAccess(*module_ident, struct_name.0);
+            let access = E::ModuleAccess_::ModuleAccess(*module_ident, struct_name.0, None);
             let rewritten_ty_args = ty_args
                 .iter()
                 .map(downgrade_type_inlining_to_expansion)
@@ -1278,7 +1298,7 @@ fn downgrade_lvalue_inlining_to_expansion(val: &T::LValue) -> E::LValue {
         },
         T::LValue_::Unpack(module_ident, struct_name, ty_args, fields)
         | T::LValue_::BorrowUnpack(_, module_ident, struct_name, ty_args, fields) => {
-            let access = E::ModuleAccess_::ModuleAccess(*module_ident, struct_name.0);
+            let access = E::ModuleAccess_::ModuleAccess(*module_ident, struct_name.0, None);
             let rewritten_ty_args: Vec<_> = ty_args
                 .iter()
                 .map(downgrade_type_inlining_to_expansion)
diff --git a/third_party/move/move-model/src/metadata.rs b/third_party/move/move-model/src/metadata.rs
index b8990fa10ba7b..f4073629a6481 100644
--- a/third_party/move/move-model/src/metadata.rs
+++ b/third_party/move/move-model/src/metadata.rs
@@ -2,7 +2,11 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use anyhow::bail;
-use move_command_line_common::env::{get_move_compiler_v2_from_env, read_bool_env_var};
+use move_binary_format::file_format_common::{VERSION_DEFAULT, VERSION_DEFAULT_LANG_V2};
+use move_command_line_common::{
+    env,
+    env::{get_move_compiler_v2_from_env, read_bool_env_var},
+};
 use once_cell::sync::Lazy;
 use serde::{Deserialize, Serialize};
 use std::{
@@ -215,6 +219,20 @@ impl LanguageVersion {
             LanguageVersion::V2_0 => true,
         }
     }
+
+    /// Whether the language version is equal to greater than `ver`
+    pub fn is_at_least(&self, ver: LanguageVersion) -> bool {
+        *self >= ver
+    }
+
+    /// If the bytecode version is not specified, infer it from the language version. For
+    /// debugging purposes, respects the MOVE_BYTECODE_VERSION env var as an override.
+    pub fn infer_bytecode_version(&self, version: Option<u32>) -> u32 {
+        env::get_bytecode_version_from_env(version).unwrap_or(match self {
+            LanguageVersion::V1 => VERSION_DEFAULT,
+            LanguageVersion::V2_0 => VERSION_DEFAULT_LANG_V2,
+        })
+    }
 }
 
 impl Display for LanguageVersion {
diff --git a/third_party/move/move-model/src/model.rs b/third_party/move/move-model/src/model.rs
index d38bf8c168532..218720578a47e 100644
--- a/third_party/move/move-model/src/model.rs
+++ b/third_party/move/move-model/src/model.rs
@@ -45,15 +45,16 @@ use itertools::Itertools;
 #[allow(unused_imports)]
 use log::{info, warn};
 pub use move_binary_format::file_format::{AbilitySet, Visibility};
+#[allow(deprecated)]
+use move_binary_format::normalized::Type as MType;
 use move_binary_format::{
     access::ModuleAccess,
     binary_views::BinaryIndexedView,
     file_format::{
         AccessKind, Bytecode, CodeOffset, Constant as VMConstant, ConstantPoolIndex,
-        FunctionDefinitionIndex, FunctionHandleIndex, SignatureIndex, SignatureToken,
-        StructDefinitionIndex,
+        FunctionDefinitionIndex, FunctionHandleIndex, MemberCount, SignatureIndex, SignatureToken,
+        StructDefinitionIndex, VariantIndex,
     },
-    normalized::Type as MType,
     views::{FunctionDefinitionView, FunctionHandleView, StructHandleView},
     CompiledModule,
 };
@@ -331,6 +332,16 @@ impl FieldId {
     pub fn symbol(self) -> Symbol {
         self.0
     }
+
+    /// Makes a variant field name unique to a given struct.
+    /// TODO: Consider making FieldId containing two symbols, but this can be a breaking change
+    ///   to public APIs.
+    pub fn make_variant_field_id_str(
+        variant_name: impl AsRef<str>,
+        field_name: impl AsRef<str>,
+    ) -> String {
+        format!("{}.{}", variant_name.as_ref(), field_name.as_ref())
+    }
 }
 
 impl SpecFunId {
@@ -1249,12 +1260,14 @@ impl GlobalEnv {
                 reported_ordering
             }
         });
-        for (diag, reported) in self
-            .diags
-            .borrow_mut()
-            .iter_mut()
-            .filter(|(d, reported)| !reported && filter(d))
-        {
+        for (diag, reported) in self.diags.borrow_mut().iter_mut().filter(|(d, reported)| {
+            !reported
+                && filter(d)
+                && (d.severity >= Severity::Error
+                    || d.labels
+                        .iter()
+                        .any(|label| self.file_id_is_primary_target.contains(&label.file_id)))
+        }) {
             if !*reported {
                 // Avoid showing the same message twice. This can happen e.g. because of
                 // duplication of expressions via schema inclusion.
@@ -1359,6 +1372,81 @@ impl GlobalEnv {
         }
     }
 
+    /// Determines whether the given spec fun uses type reflection over type parameters.
+    pub fn spec_fun_uses_generic_type_reflection(
+        &self,
+        fun_id: &QualifiedInstId<SpecFunId>,
+    ) -> bool {
+        fn uses_generic_type_reflection(
+            env: &GlobalEnv,
+            visited: &mut BTreeSet<QualifiedInstId<SpecFunId>>,
+            fun: &QualifiedInstId<SpecFunId>,
+        ) -> bool {
+            if !visited.insert(fun.clone()) {
+                return false;
+            }
+            let module = env.get_module(fun.module_id);
+            let decl = module.get_spec_fun(fun.id);
+            if let Some(def) = &decl.body {
+                // Check called spec funs
+                def.called_spec_funs(env).into_iter().any(|qid| {
+                    let qid_inst = qid.instantiate(&fun.inst);
+                    is_generic_type_reflection(env, &qid_inst)
+                        || uses_generic_type_reflection(env, visited, &qid_inst)
+                })
+            } else {
+                false
+            }
+        }
+        fn is_generic_type_reflection(
+            env: &GlobalEnv,
+            fun_id: &QualifiedInstId<SpecFunId>,
+        ) -> bool {
+            static REFLECTION_FUNS: Lazy<BTreeSet<String>> = Lazy::new(|| {
+                [
+                    well_known::TYPE_INFO_SPEC.to_owned(),
+                    well_known::TYPE_NAME_SPEC.to_owned(),
+                    well_known::TYPE_NAME_GET_SPEC.to_owned(),
+                ]
+                .into_iter()
+                .collect()
+            });
+            // The function must be at `extlib` or `stdlib`.
+            let module = env.get_module(fun_id.module_id);
+            let addr = module.get_name().addr();
+            if addr == &env.get_extlib_address() || addr == &env.get_stdlib_address() {
+                let fun = module.get_spec_fun(fun_id.id);
+                let name = format!(
+                    "{}::{}",
+                    module.get_name().name().display(module.symbol_pool()),
+                    fun.name.display(module.symbol_pool())
+                );
+                REFLECTION_FUNS.contains(&name)
+                    && fun_id.inst.iter().any(|ty| ty.is_type_parameter())
+            } else {
+                false
+            }
+        }
+        let module = self.get_module(fun_id.module_id);
+        let decl = module.get_spec_fun(fun_id.id);
+        let uses = decl
+            .insts_using_generic_type_reflection
+            .borrow()
+            .get(&fun_id.inst)
+            .cloned();
+        if let Some(b) = uses {
+            b
+        } else {
+            let b = uses_generic_type_reflection(self, &mut BTreeSet::new(), fun_id);
+            module
+                .get_spec_fun(fun_id.id)
+                .insts_using_generic_type_reflection
+                .borrow_mut()
+                .insert(fun_id.inst.clone(), b);
+            b
+        }
+    }
+
     /// Returns true if the type represents the well-known event handle type.
     pub fn is_wellknown_event_handle_type(&self, ty: &Type) -> bool {
         if let Type::Struct(mid, sid, _) = ty {
@@ -1614,6 +1702,7 @@ impl GlobalEnv {
             name: field_name,
             loc: loc.clone(),
             offset: 0,
+            variant: None,
             ty,
         });
         StructData {
@@ -1625,7 +1714,9 @@ impl GlobalEnv {
             abilities: AbilitySet::ALL,
             spec_var_opt: Some(var_id),
             field_data,
+            variants: None,
             spec: RefCell::new(Spec::default()),
+            is_native: false,
         }
     }
 
@@ -1753,6 +1844,7 @@ impl GlobalEnv {
         name: Symbol,
         loc: Loc,
         visibility: Visibility,
+        has_package_visibility: bool,
         type_params: Vec<TypeParameter>,
         params: Vec<Parameter>,
         result_type: Type,
@@ -1766,6 +1858,7 @@ impl GlobalEnv {
             def_idx: None,
             handle_idx: None,
             visibility,
+            has_package_visibility,
             is_native: false,
             kind: FunctionKind::Regular,
             attributes: vec![],
@@ -1895,6 +1988,10 @@ impl GlobalEnv {
         }
     }
 
+    pub(crate) fn get_module_data_mut(&mut self, id: ModuleId) -> &mut ModuleData {
+        &mut self.module_data[id.0 as usize]
+    }
+
     /// Gets a struct by qualified id.
     pub fn get_struct_qid(&self, qid: QualifiedId<StructId>) -> StructEnv<'_> {
         self.get_module(qid.module_id).into_struct(qid.id)
@@ -1982,6 +2079,7 @@ impl GlobalEnv {
     }
 
     /// Attempt to compute a struct type for (`mid`, `sid`, `ts`).
+    #[allow(deprecated)]
     pub fn get_struct_type(&self, mid: ModuleId, sid: StructId, ts: &[Type]) -> Option<MType> {
         let menv = self.get_module(mid);
         Some(MType::Struct {
@@ -2308,15 +2406,30 @@ impl GlobalEnv {
                 emitln!(writer, "{}", self.display(&*module_spec));
             }
             for str in module.get_structs() {
-                emitln!(writer, "struct {} {{", str.get_name().display(spool));
-                writer.indent();
-                for fld in str.get_fields() {
-                    emitln!(
-                        writer,
-                        "{}: {},",
-                        fld.get_name().display(spool),
-                        fld.get_type().display(tctx)
-                    );
+                if str.has_variants() {
+                    emitln!(writer, "enum {} {{", str.get_name().display(spool));
+                    writer.indent();
+                    for variant in str.get_variants() {
+                        emit!(writer, "{}", variant.display(spool));
+                        let fields = str.get_fields_of_variant(variant).collect_vec();
+                        if !fields.is_empty() {
+                            emitln!(writer, " {");
+                            writer.indent();
+                            for fld in fields {
+                                emitln!(writer, "{},", self.dump_field(tctx, &fld))
+                            }
+                            writer.unindent();
+                            emitln!(writer, "}")
+                        } else {
+                            emitln!(writer, ",")
+                        }
+                    }
+                } else {
+                    emitln!(writer, "struct {} {{", str.get_name().display(spool));
+                    writer.indent();
+                    for fld in str.get_fields() {
+                        emitln!(writer, "{},", self.dump_field(tctx, &fld))
+                    }
                 }
                 writer.unindent();
                 emitln!(writer, "}");
@@ -2354,6 +2467,14 @@ impl GlobalEnv {
         writer.extract_result()
     }
 
+    fn dump_field(&self, tctx: &TypeDisplayContext, fld: &FieldEnv) -> String {
+        format!(
+            "{}: {}",
+            fld.get_name().display(tctx.env.symbol_pool()),
+            fld.get_type().display(tctx)
+        )
+    }
+
     pub fn dump_fun(&self, fun: &FunctionEnv) -> String {
         let tctx = &self.get_type_display_ctx();
         let writer = CodeWriter::new(self.internal_loc());
@@ -2619,7 +2740,7 @@ impl<'env> ModuleEnv<'env> {
         self.data.name.is_script()
     }
 
-    /// Returns true of this module is target of compilation. A non-target module is
+    /// Returns true if this module is target of compilation. A non-target module is
     /// a dependency only but not explicitly requested to process.
     pub fn is_target(&self) -> bool {
         let file_id = self.data.loc.file_id;
@@ -2700,6 +2821,43 @@ impl<'env> ModuleEnv<'env> {
         self.data.friend_modules.clone()
     }
 
+    /// Returns the set of modules in the current package,
+    /// whose public(package) functions are called in the current module.
+    /// Requires: `self` is a primary target.
+    pub fn need_to_be_friended_by(&self) -> BTreeSet<ModuleId> {
+        debug_assert!(self.is_primary_target());
+        let mut deps = BTreeSet::new();
+        if self.is_script_module() {
+            return deps;
+        }
+        for fun_env in self.get_functions() {
+            let called_funs = fun_env.get_called_functions().expect("called functions");
+            for fun in called_funs {
+                let mod_id = fun.module_id;
+                if self.get_id() == mod_id {
+                    // no need to friend self
+                    continue;
+                }
+                let mod_env = self.env.get_module(mod_id);
+                let fun_env = mod_env.get_function(fun.id);
+                if fun_env.has_package_visibility() && self.can_call_package_fun_in(&mod_env) {
+                    deps.insert(mod_id);
+                }
+            }
+        }
+        deps
+    }
+
+    /// Returns true if functions in the current module can call a public(package) function in the given module.
+    /// Requires: `self` is a primary target.
+    fn can_call_package_fun_in(&self, other: &Self) -> bool {
+        debug_assert!(self.is_primary_target());
+        !self.is_script_module()
+            && !other.is_script_module()
+            && other.is_primary_target()
+            && self.self_address() == other.self_address()
+    }
+
     /// Returns true if the given module is a transitive dependency of this one. The
     /// transitive dependency set contains this module and all directly or indirectly used
     /// modules (without spec usage).
@@ -3116,6 +3274,7 @@ impl<'env> ModuleEnv<'env> {
             print_code: true,
             print_basic_blocks: true,
             print_locals: true,
+            print_bytecode_stats: false,
         });
         Some(
             disas
@@ -3211,8 +3370,23 @@ pub struct StructData {
     /// Field definitions.
     pub(crate) field_data: BTreeMap<FieldId, FieldData>,
 
+    /// If this structure has variants (i.e. is an `enum`), information about the
+    /// names of the variants and the location of their declaration. The fields
+    /// of variants can be identified via the variant name in `FieldData`.
+    pub(crate) variants: Option<BTreeMap<Symbol, StructVariant>>,
+
     /// Associated specification.
     pub(crate) spec: RefCell<Spec>,
+
+    /// Whether this struct is native
+    pub is_native: bool,
+}
+
+#[derive(Debug)]
+pub(crate) struct StructVariant {
+    pub(crate) loc: Loc,
+    pub(crate) attributes: Vec<Attribute>,
+    pub(crate) order: usize,
 }
 
 #[derive(Debug, Clone)]
@@ -3362,11 +3536,76 @@ impl<'env> StructEnv<'env> {
         self.get_abilities().has_key()
     }
 
-    /// Get an iterator for the fields, ordered by offset.
+    /// Returns true if the struct has variants.
+    pub fn has_variants(&self) -> bool {
+        self.data.variants.is_some()
+    }
+
+    /// Returns an iteration of the variant names in the struct, in the order they
+    /// are declared.
+    pub fn get_variants(&self) -> impl Iterator<Item = Symbol> + 'env {
+        self.data
+            .variants
+            .as_ref()
+            .expect("struct has variants")
+            .iter()
+            .sorted_by(|(_, v1), (_, v2)| v1.order.cmp(&v2.order))
+            .map(|(s, _)| *s)
+    }
+
+    /// Returns the location of the variant.
+    pub fn get_variant_loc(&self, variant: Symbol) -> &Loc {
+        self.data
+            .variants
+            .as_ref()
+            .and_then(|vars| vars.get(&variant).map(|v| &v.loc))
+            .expect("variant defined")
+    }
+
+    /// Get the index of the variant in the struct.
+    pub fn get_variant_idx(&self, variant: Symbol) -> Option<VariantIndex> {
+        self.get_variants()
+            .position(|n| variant == n)
+            .map(|p| p as VariantIndex)
+    }
+
+    /// Get the name of the variant in the struct by index.
+    pub fn get_variant_name_by_idx(&self, variant: VariantIndex) -> Option<Symbol> {
+        self.get_variants().nth(variant as usize)
+    }
+
+    /// Returns the attributes of the variant.
+    pub fn get_variant_attributes(&self, variant: Symbol) -> &[Attribute] {
+        self.data
+            .variants
+            .as_ref()
+            .and_then(|vars| vars.get(&variant).map(|v| v.attributes.as_slice()))
+            .expect("variant defined")
+    }
+
+    /// Get an iterator for the fields, ordered by offset. Notice if the struct has
+    /// variants, all fields of all variants are returned.
     pub fn get_fields(&'env self) -> impl Iterator<Item = FieldEnv<'env>> {
+        self.get_fields_optional_variant(None)
+    }
+
+    /// Get fields of a particular variant.
+    pub fn get_fields_of_variant(
+        &'env self,
+        variant: Symbol,
+    ) -> impl Iterator<Item = FieldEnv<'env>> {
+        self.get_fields_optional_variant(Some(variant))
+    }
+
+    /// Get fields of a particular variant.
+    pub fn get_fields_optional_variant(
+        &'env self,
+        variant: Option<Symbol>,
+    ) -> impl Iterator<Item = FieldEnv<'env>> {
         self.data
             .field_data
             .values()
+            .filter(|data| variant.is_none() || data.variant == variant)
             .sorted_by_key(|data| data.offset)
             .map(move |data| FieldEnv {
                 struct_env: self.clone(),
@@ -3374,7 +3613,13 @@ impl<'env> StructEnv<'env> {
             })
     }
 
-    /// Return the number of fields in the struct.
+    /// Return true if it is a native struct
+    pub fn is_native(&self) -> bool {
+        self.data.is_native
+    }
+
+    /// Return the number of fields in the struct. Notice of the struct has variants, this
+    /// includes the sum of all fields in all variants.
     pub fn get_field_count(&self) -> usize {
         self.data.field_data.len()
     }
@@ -3399,12 +3644,19 @@ impl<'env> StructEnv<'env> {
 
     /// Gets a field by its offset.
     pub fn get_field_by_offset(&'env self, offset: usize) -> FieldEnv<'env> {
-        for data in self.data.field_data.values() {
-            if data.offset == offset {
-                return FieldEnv {
-                    struct_env: self.clone(),
-                    data,
-                };
+        self.get_field_by_offset_optional_variant(None, offset)
+    }
+
+    /// Gets a field by its offset, in context of an optional variant.
+    pub fn get_field_by_offset_optional_variant(
+        &'env self,
+        variant: Option<Symbol>,
+        offset: usize,
+    ) -> FieldEnv<'env> {
+        // We may speed this up via a cache RefCell<BTreeMap<(variant, offset), FieldId>>
+        for field in self.get_fields_optional_variant(variant) {
+            if field.get_offset() == offset {
+                return field;
             }
         }
         unreachable!("invalid field lookup")
@@ -3462,7 +3714,7 @@ impl<'env> StructEnv<'env> {
 // =================================================================================================
 /// # Field Environment
 
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub struct FieldData {
     /// The name of this field.
     pub name: Symbol,
@@ -3473,6 +3725,9 @@ pub struct FieldData {
     /// The offset of this field.
     pub offset: usize,
 
+    /// If the field is associated with a variant, the name of that variant.
+    pub variant: Option<Symbol>,
+
     /// The type of this field.
     pub ty: Type,
 }
@@ -3508,13 +3763,18 @@ impl<'env> FieldEnv<'env> {
             self.struct_env.data.def_idx,
             &self.struct_env.module_env.data.source_map,
         ) {
-            if let Ok(smap) = mmap.get_struct_source_map(def_idx) {
-                let loc = self
-                    .struct_env
+            if let Some(loc) = mmap.get_struct_source_map(def_idx).ok().and_then(|smap| {
+                smap.get_field_location(
+                    self.data
+                        .variant
+                        .and_then(|v| self.struct_env.get_variant_idx(v)),
+                    self.data.offset as MemberCount,
+                )
+            }) {
+                self.struct_env
                     .module_env
                     .env
-                    .to_loc(&smap.fields[self.data.offset]);
-                self.struct_env.module_env.env.get_doc(&loc)
+                    .get_doc(&self.struct_env.module_env.env.to_loc(&loc))
             } else {
                 ""
             }
@@ -3532,6 +3792,11 @@ impl<'env> FieldEnv<'env> {
     pub fn get_offset(&self) -> usize {
         self.data.offset
     }
+
+    /// Gets the variant this field is associated with
+    pub fn get_variant(&self) -> Option<Symbol> {
+        self.data.variant
+    }
 }
 
 // =================================================================================================
@@ -3707,6 +3972,10 @@ pub struct FunctionData {
     /// Visibility of this function (private, friend, or public)
     pub(crate) visibility: Visibility,
 
+    /// Whether this function has package visibility before the transformation.
+    /// Invariant: when true, visibility is always friend.
+    pub(crate) has_package_visibility: bool,
+
     /// Whether this is a native function
     pub(crate) is_native: bool,
 
@@ -4074,6 +4343,11 @@ impl<'env> FunctionEnv<'env> {
         self.visibility() == Visibility::Friend
     }
 
+    /// Return true iff this function is has package visibility
+    pub fn has_package_visibility(&self) -> bool {
+        self.data.has_package_visibility
+    }
+
     /// Returns true if invariants are declared disabled in body of function
     pub fn are_invariants_disabled_in_body(&self) -> bool {
         self.is_pragma_true(DISABLE_INVARIANTS_IN_BODY_PRAGMA, || false)
@@ -4564,6 +4838,15 @@ impl GetNameString for QualifiedId<FunId> {
     }
 }
 
+impl GetNameString for QualifiedId<SpecFunId> {
+    fn get_name_for_display(&self, env: &GlobalEnv) -> String {
+        env.get_spec_fun(*self)
+            .name
+            .display(env.symbol_pool())
+            .to_string()
+    }
+}
+
 impl<'a, Id: Clone> fmt::Display for EnvDisplay<'a, QualifiedId<Id>>
 where
     QualifiedId<Id>: GetNameString,
diff --git a/third_party/move/move-model/src/ty.rs b/third_party/move/move-model/src/ty.rs
index 5f90ab3e1f075..64a6d5d519410 100644
--- a/third_party/move/move-model/src/ty.rs
+++ b/third_party/move/move-model/src/ty.rs
@@ -14,10 +14,9 @@ use crate::{
     symbol::Symbol,
 };
 use itertools::Itertools;
-use move_binary_format::{
-    file_format::{Ability, AbilitySet, TypeParameterIndex},
-    normalized::Type as MType,
-};
+use move_binary_format::file_format::{Ability, AbilitySet, TypeParameterIndex};
+#[allow(deprecated)]
+use move_binary_format::normalized::Type as MType;
 use move_core_types::{
     language_storage::{StructTag, TypeTag},
     u256::U256,
@@ -682,6 +681,7 @@ impl PrimitiveType {
     }
 
     /// Attempt to convert this type into a normalized::Type
+    #[allow(deprecated)]
     pub fn into_normalized_type(self) -> Option<MType> {
         use PrimitiveType::*;
         Some(match self {
@@ -806,6 +806,15 @@ impl Type {
         matches!(self, Type::Reference(_, _))
     }
 
+    /// If this is a reference, return the kind of the reference, otherwise None.
+    pub fn ref_kind(&self) -> Option<ReferenceKind> {
+        if let Type::Reference(kind, _) = self {
+            Some(*kind)
+        } else {
+            None
+        }
+    }
+
     /// Determines whether this is a mutable reference.
     pub fn is_mutable_reference(&self) -> bool {
         matches!(self, Type::Reference(ReferenceKind::Mutable, _))
@@ -821,6 +830,11 @@ impl Type {
         matches!(self, Type::Struct(..))
     }
 
+    /// Determines whether this is a variant struct
+    pub fn is_variant_struct(&self, env: &GlobalEnv) -> bool {
+        self.is_struct() && self.get_struct(env).expect("struct").0.has_variants()
+    }
+
     /// Determines whether this is the error type.
     pub fn is_error(&self) -> bool {
         matches!(self, Type::Error)
@@ -967,6 +981,24 @@ impl Type {
         }
     }
 
+    /// Drop reference, consuming the type.
+    pub fn drop_reference(self) -> Type {
+        if let Type::Reference(_, bt) = self {
+            *bt
+        } else {
+            self
+        }
+    }
+
+    /// If this is a reference, return its kind.
+    pub fn try_reference_kind(&self) -> Option<ReferenceKind> {
+        if let Type::Reference(k, _) = self {
+            Some(*k)
+        } else {
+            None
+        }
+    }
+
     /// If this is a struct type, replace the type instantiation.
     pub fn replace_struct_instantiation(&self, inst: &[Type]) -> Type {
         match self {
@@ -1169,6 +1201,7 @@ impl Type {
     }
 
     /// Attempt to convert this type into a normalized::Type
+    #[allow(deprecated)]
     pub fn into_struct_type(self, env: &GlobalEnv) -> Option<MType> {
         use Type::*;
         match self {
@@ -1178,6 +1211,7 @@ impl Type {
     }
 
     /// Attempt to convert this type into a normalized::Type
+    #[allow(deprecated)]
     pub fn into_normalized_type(self, env: &GlobalEnv) -> Option<MType> {
         use Type::*;
         match self {
@@ -1418,8 +1452,16 @@ pub trait AbilityContext {
 
 /// A trait to provide context information for unification.
 pub trait UnificationContext: AbilityContext {
-    /// Get the field map for a struct, with field types instantiated.
-    fn get_struct_field_map(&self, id: &QualifiedInstId<StructId>) -> BTreeMap<Symbol, Type>;
+    /// Get information about the given struct field. Returns a list
+    /// of optional variant and type for the field in that variant,
+    /// or, if the struct is not a variant, None and type.
+    /// If the field is not defined returns an empty list.
+    /// The 2nd return value indicates whether the type is a variant struct.
+    fn get_struct_field_decls(
+        &self,
+        id: &QualifiedInstId<StructId>,
+        field_name: Symbol,
+    ) -> (Vec<(Option<Symbol>, Type)>, bool);
 
     /// For a given type, return a receiver style function of the given name, if available.
     /// If the function is generic it will be instantiated with fresh type variables.
@@ -1461,8 +1503,12 @@ impl ReceiverFunctionInstance {
 pub struct NoUnificationContext;
 
 impl UnificationContext for NoUnificationContext {
-    fn get_struct_field_map(&self, _id: &QualifiedInstId<StructId>) -> BTreeMap<Symbol, Type> {
-        BTreeMap::new()
+    fn get_struct_field_decls(
+        &self,
+        _id: &QualifiedInstId<StructId>,
+        _field_name: Symbol,
+    ) -> (Vec<(Option<Symbol>, Type)>, bool) {
+        (vec![], false)
     }
 
     fn get_receiver_function(
@@ -1673,24 +1719,30 @@ impl Substitution {
                     .map(|_| ())
                     .map_err(|e| e.redirect(loc.clone())),
                 (Constraint::SomeStruct(constr_field_map), Type::Struct(mid, sid, inst)) => {
-                    let field_map =
-                        context.get_struct_field_map(&mid.qualified_inst(*sid, inst.clone()));
-                    // The actual struct must have all the fields in the constraint, with same
-                    // type.
-                    for (field_name, field_ty) in constr_field_map {
-                        if let Some(declared_field_type) = field_map.get(field_name) {
-                            self.unify(
-                                context,
-                                variance,
-                                WideningOrder::RightToLeft,
-                                field_ty,
-                                declared_field_type,
-                            )
-                            .map(|_| ())
-                            .map_err(|e| e.redirect(loc.clone()))?
-                        } else {
+                    let sid = &mid.qualified_inst(*sid, inst.clone());
+                    for (field_name, expected_type) in constr_field_map {
+                        let (mut field_decls, _) = context.get_struct_field_decls(sid, *field_name);
+                        if field_decls.is_empty() {
+                            return constraint_unsatisfied_error();
+                        }
+                        // All available definitions must have the same type, before instantiation.
+                        let (_, decl_type) = field_decls.pop().unwrap();
+                        if field_decls
+                            .into_iter()
+                            .any(|(_, other_ty)| decl_type != other_ty)
+                        {
                             return constraint_unsatisfied_error();
                         }
+                        // The given declared type must unify with the expected type
+                        self.unify(
+                            context,
+                            variance,
+                            WideningOrder::RightToLeft,
+                            expected_type,
+                            &decl_type,
+                        )
+                        .map(|_| ())
+                        .map_err(|e| e.redirect(loc.clone()))?
                     }
                     Ok(())
                 },
@@ -2837,12 +2889,16 @@ impl TypeUnificationError {
                     Constraint::SomeReference(ty) => {
                         error_context.expected_reference(display_context, ty)
                     },
-                    Constraint::SomeStruct(field_map) => Self::message_for_struct(
-                        unification_context,
-                        display_context,
-                        field_map,
-                        ty,
-                    ),
+                    Constraint::SomeStruct(field_map) => {
+                        let (main_msg, mut special_hints) = Self::message_for_struct(
+                            unification_context,
+                            display_context,
+                            field_map,
+                            ty,
+                        );
+                        hints.append(&mut special_hints);
+                        main_msg
+                    },
                     Constraint::SomeReceiverFunction(name, ..) => {
                         format!(
                             "undeclared receiver function `{}` for type `{}`",
@@ -2916,46 +2972,73 @@ impl TypeUnificationError {
         display_context: &TypeDisplayContext,
         field_map: &BTreeMap<Symbol, Type>,
         ty: &Type,
-    ) -> String {
+    ) -> (String, Vec<String>) {
+        let mut hints = vec![];
         // Determine why this constraint did not match for better error message
-        if let Type::Struct(mid, sid, inst) = ty {
-            let actual_field_map =
-                unification_context.get_struct_field_map(&mid.qualified_inst(*sid, inst.clone()));
-            let missing_fields = field_map
-                .keys()
-                .filter(|n| !actual_field_map.contains_key(n))
-                .collect::<Vec<_>>();
-            if !missing_fields.is_empty() {
-                // Primary error is missing fields
-                let fields =
-                    Self::print_fields(display_context.env, missing_fields.into_iter().cloned());
-                format!(
-                    "{} not declared in struct `{}`",
-                    fields,
-                    ty.display(display_context)
-                )
-            } else {
-                // Primary error is a type mismatch
-                let fields = field_map
-                    .iter()
-                    .filter_map(|(n, ty)| {
-                        let Some(actual_ty) = actual_field_map.get(n) else {
-                            return None;
-                        };
-                        if ty != actual_ty {
-                            Some(format!(
-                                "field `{}` has type `{}` instead of `{}`",
-                                n.display(display_context.env.symbol_pool()),
-                                ty.display(display_context),
-                                actual_ty.display(display_context)
-                            ))
+        let msg = if let Type::Struct(mid, sid, inst) = ty {
+            let mut errors = vec![];
+            let sid = mid.qualified_inst(*sid, inst.clone());
+            for (field_name, expected_type) in field_map {
+                let field_str = field_name
+                    .display(display_context.env.symbol_pool())
+                    .to_string();
+                let (mut field_decls, is_variant) =
+                    unification_context.get_struct_field_decls(&sid, *field_name);
+                if field_decls.is_empty() {
+                    errors.push(format!(
+                        "field `{}` not declared in {} `{}`",
+                        field_str,
+                        if is_variant {
+                            "any of the variants of enum"
                         } else {
-                            None
-                        }
-                    })
-                    .join(" and ");
-                format!("{} in `{}`", fields, ty.display(display_context))
+                            "struct"
+                        },
+                        ty.display(display_context)
+                    ))
+                } else {
+                    let (variant_opt, decl_type) = field_decls.pop().unwrap();
+                    let different_type_variants = field_decls
+                        .into_iter()
+                        .filter_map(|(variant_opt, other_ty)| {
+                            if other_ty != decl_type {
+                                Some((variant_opt, other_ty))
+                            } else {
+                                None
+                            }
+                        })
+                        .collect_vec();
+                    if !different_type_variants.is_empty() {
+                        errors.push(format!(
+                            "cannot select field `{}` since it has different \
+                            types in variants of enum `{}`",
+                            field_str,
+                            ty.display(display_context)
+                        ));
+                        let diff_str = iter::once((variant_opt, decl_type))
+                            .chain(different_type_variants)
+                            .map(|(variant_opt, decl_type)| {
+                                format!(
+                                    "type `{}` in variant `{}`",
+                                    decl_type.display(display_context),
+                                    variant_opt
+                                        .unwrap()
+                                        .display(display_context.env.symbol_pool())
+                                )
+                            })
+                            .join(" and ");
+                        hints.push(format!("field `{}` has {}", field_str, diff_str))
+                    } else {
+                        // type error
+                        errors.push(format!(
+                            "field `{}` has type `{}` instead of expected type `{}`",
+                            field_str,
+                            decl_type.display(display_context),
+                            expected_type.display(display_context)
+                        ))
+                    }
+                }
             }
+            errors.join(", ")
         } else {
             format!(
                 "expected a struct{} but found `{}`",
@@ -2969,7 +3052,8 @@ impl TypeUnificationError {
                 },
                 ty.display(display_context)
             )
-        }
+        };
+        (msg, hints)
     }
 
     fn print_fields(env: &GlobalEnv, names: impl Iterator<Item = Symbol>) -> String {
@@ -3317,6 +3401,7 @@ impl<'a> TypeDisplay<'a> {
         }
     }
 
+    #[allow(clippy::assigning_clones)]
     fn struct_str(&self, mid: ModuleId, sid: StructId) -> String {
         let env = self.context.env;
         let mut str = if let Some(builder_table) = self.context.builder_struct_table {
diff --git a/third_party/move/move-model/src/well_known.rs b/third_party/move/move-model/src/well_known.rs
index 5722c961b5ceb..39702c9231a62 100644
--- a/third_party/move/move-model/src/well_known.rs
+++ b/third_party/move/move-model/src/well_known.rs
@@ -44,3 +44,11 @@ pub const TYPE_NAME_GET_SPEC: &str = "type_name::$get";
 
 /// The well-known name of the first parameter of a method.
 pub const RECEIVER_PARAM_NAME: &str = "self";
+
+/// The well-known abort codes used by the compiler. These are marked
+/// by lowest 6 bytes of a sha256 of the string "Move 2 Abort Code",
+/// appended with two bytes for the error type.
+/// TODO: add a check at runtime that user is not clashing with reserved
+/// codes?
+pub const WELL_KNOWN_ABORT_CODE_BASE: u64 = 0xD8CA26CBD9BE << 16;
+pub const INCOMPLETE_MATCH_ABORT_CODE: u64 = WELL_KNOWN_ABORT_CODE_BASE | 0x1;
diff --git a/third_party/move/move-model/tests/sources/compile_via_model/assign.v2_exp b/third_party/move/move-model/tests/sources/compile_via_model/assign.v2_exp
new file mode 100644
index 0000000000000..fd4dd9dc6179c
--- /dev/null
+++ b/third_party/move/move-model/tests/sources/compile_via_model/assign.v2_exp
@@ -0,0 +1 @@
+All good, no errors!
diff --git a/third_party/move/move-model/tests/sources/compile_via_model/let.v2_exp b/third_party/move/move-model/tests/sources/compile_via_model/let.v2_exp
new file mode 100644
index 0000000000000..fd4dd9dc6179c
--- /dev/null
+++ b/third_party/move/move-model/tests/sources/compile_via_model/let.v2_exp
@@ -0,0 +1 @@
+All good, no errors!
diff --git a/third_party/move/move-model/tests/sources/compile_via_model/simple.v2_exp b/third_party/move/move-model/tests/sources/compile_via_model/simple.v2_exp
new file mode 100644
index 0000000000000..fd4dd9dc6179c
--- /dev/null
+++ b/third_party/move/move-model/tests/sources/compile_via_model/simple.v2_exp
@@ -0,0 +1 @@
+All good, no errors!
diff --git a/third_party/move/move-model/tests/sources/conditions_err.v2_exp b/third_party/move/move-model/tests/sources/conditions_err.v2_exp
new file mode 100644
index 0000000000000..079d165453acd
--- /dev/null
+++ b/third_party/move/move-model/tests/sources/conditions_err.v2_exp
@@ -0,0 +1,23 @@
+error: expected `bool` but found a value of type `u64`
+  ┌─ tests/sources/conditions_err.move:7:15
+  │
+7 │     aborts_if x;
+  │               ^
+
+error: expected `bool` but found a value of type `num`
+  ┌─ tests/sources/conditions_err.move:8:13
+  │
+8 │     ensures old(x) + x;
+  │             ^^^^^^^^^^
+
+error: undeclared `result_1`
+   ┌─ tests/sources/conditions_err.move:10:13
+   │
+10 │     ensures result_1 == 0;
+   │             ^^^^^^^^
+
+error: expected `bool` but found a value of type `u64`
+   ┌─ tests/sources/conditions_err.move:17:28
+   │
+17 │     emits _msg to _guid if x;
+   │                            ^
diff --git a/third_party/move/move-model/tests/sources/conditions_ok.v2_exp b/third_party/move/move-model/tests/sources/conditions_ok.v2_exp
new file mode 100644
index 0000000000000..fd4dd9dc6179c
--- /dev/null
+++ b/third_party/move/move-model/tests/sources/conditions_ok.v2_exp
@@ -0,0 +1 @@
+All good, no errors!
diff --git a/third_party/move/move-model/tests/sources/expressions_err.v2_exp b/third_party/move/move-model/tests/sources/expressions_err.v2_exp
new file mode 100644
index 0000000000000..e9ce7d95a641f
--- /dev/null
+++ b/third_party/move/move-model/tests/sources/expressions_err.v2_exp
@@ -0,0 +1,47 @@
+error: undeclared `x`
+   ┌─ tests/sources/expressions_err.move:12:7
+   │
+12 │       x
+   │       ^
+
+error: no function named `not_declared` found
+   ┌─ tests/sources/expressions_err.move:17:7
+   │
+17 │       not_declared()
+   │       ^^^^^^^^^^^^^^
+
+error: cannot return `bool` from a function with result type `num`
+   ┌─ tests/sources/expressions_err.move:22:7
+   │
+22 │       false
+   │       ^^^^^
+
+error: cannot use `vector<num>` with an operator which expects a value of type `num`
+   ┌─ tests/sources/expressions_err.move:27:7
+   │
+27 │       x > y
+   │       ^
+
+error: cannot return `bool` from a function with result type `(num, bool)`
+   ┌─ tests/sources/expressions_err.move:32:7
+   │
+32 │       false
+   │       ^^^^^
+
+error: cannot pass `u256` to a function which expects argument of type `bool`
+   ┌─ tests/sources/expressions_err.move:37:63
+   │
+37 │     fun wrongly_typed_caller(): num { wrongly_typed_callee(1, 1) }
+   │                                                               ^
+
+error: cannot pass `|num|bool` to a function which expects argument of type `|num|num`
+   ┌─ tests/sources/expressions_err.move:41:76
+   │
+41 │     fun wrongly_typed_fun_arg_caller(): num { wrongly_typed_fun_arg_callee(|x| false) }
+   │                                                                            ^^^^^^^^^
+
+error: expected 2 type arguments but 1 were provided
+   ┌─ tests/sources/expressions_err.move:46:7
+   │
+46 │       wrong_instantiation<u64>(x)
+   │       ^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/third_party/move/move-model/tests/sources/expressions_inference_err.v2_exp b/third_party/move/move-model/tests/sources/expressions_inference_err.v2_exp
new file mode 100644
index 0000000000000..01d516b52f2af
--- /dev/null
+++ b/third_party/move/move-model/tests/sources/expressions_inference_err.v2_exp
@@ -0,0 +1,5 @@
+error: unable to infer instantiation of type `_` (consider providing type arguments or annotating the type)
+  ┌─ tests/sources/expressions_inference_err.move:7:16
+  │
+7 │       let f = |x|x;
+  │                ^
diff --git a/third_party/move/move-model/tests/sources/expressions_ok.v2_exp b/third_party/move/move-model/tests/sources/expressions_ok.v2_exp
new file mode 100644
index 0000000000000..fd4dd9dc6179c
--- /dev/null
+++ b/third_party/move/move-model/tests/sources/expressions_ok.v2_exp
@@ -0,0 +1 @@
+All good, no errors!
diff --git a/third_party/move/move-model/tests/sources/if_else_ok.v2_exp b/third_party/move/move-model/tests/sources/if_else_ok.v2_exp
new file mode 100644
index 0000000000000..fd4dd9dc6179c
--- /dev/null
+++ b/third_party/move/move-model/tests/sources/if_else_ok.v2_exp
@@ -0,0 +1 @@
+All good, no errors!
diff --git a/third_party/move/move-model/tests/sources/inline_fun_spec_err.v2_exp b/third_party/move/move-model/tests/sources/inline_fun_spec_err.v2_exp
new file mode 100644
index 0000000000000..ea8506182c08a
--- /dev/null
+++ b/third_party/move/move-model/tests/sources/inline_fun_spec_err.v2_exp
@@ -0,0 +1,5 @@
+error: functional spec blocks for inline functions are not supported yet
+  ┌─ tests/sources/inline_fun_spec_err.move:5:10
+  │
+5 │     spec f {
+  │          ^
diff --git a/third_party/move/move-model/tests/sources/inline_fun_spec_ok.v2_exp b/third_party/move/move-model/tests/sources/inline_fun_spec_ok.v2_exp
new file mode 100644
index 0000000000000..fd4dd9dc6179c
--- /dev/null
+++ b/third_party/move/move-model/tests/sources/inline_fun_spec_ok.v2_exp
@@ -0,0 +1 @@
+All good, no errors!
diff --git a/third_party/move/move-model/tests/sources/inline_spec_err.v2_exp b/third_party/move/move-model/tests/sources/inline_spec_err.v2_exp
new file mode 100644
index 0000000000000..45a35bb763530
--- /dev/null
+++ b/third_party/move/move-model/tests/sources/inline_spec_err.v2_exp
@@ -0,0 +1,26 @@
+error: invalid old(..) expression in inline spec block
+  ┌─ tests/sources/inline_spec_err.move:9:7
+  │
+9 │       assert old(a) == y;
+  │       ^^^^^^^^^^^^^^^^^^^
+  │       │          │
+  │       │          this expression is not a function parameter
+  │       only a function parameter is allowed in old(..) expressions in inline spec block
+
+error: invalid old(..) expression in inline spec block
+   ┌─ tests/sources/inline_spec_err.move:10:7
+   │
+10 │       assert old(b) == 0;
+   │       ^^^^^^^^^^^^^^^^^^^
+   │       │          │
+   │       │          this expression is not a function parameter
+   │       only a function parameter is allowed in old(..) expressions in inline spec block
+
+error: invalid old(..) expression in inline spec block
+   ┌─ tests/sources/inline_spec_err.move:11:7
+   │
+11 │       assert old(x != y);
+   │       ^^^^^^^^^^^^^^^^^^^
+   │       │          │
+   │       │          this expression is not a function parameter
+   │       only a function parameter is allowed in old(..) expressions in inline spec block
diff --git a/third_party/move/move-model/tests/sources/intrinsic_decl_err.v2_exp b/third_party/move/move-model/tests/sources/intrinsic_decl_err.v2_exp
new file mode 100644
index 0000000000000..0f13ded20f35e
--- /dev/null
+++ b/third_party/move/move-model/tests/sources/intrinsic_decl_err.v2_exp
@@ -0,0 +1,69 @@
+error: expect a boolean value or a valid intrinsic type
+   ┌─ tests/sources/intrinsic_decl_err.move:16:9
+   │
+16 │         pragma intrinsic = 0x42::M::MyTable;
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: unknown intrinsic type: no_such_map
+   ┌─ tests/sources/intrinsic_decl_err.move:19:9
+   │
+19 │         pragma intrinsic = no_such_map;
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: property `map_no_such_fun` is not valid in this context
+   ┌─ tests/sources/intrinsic_decl_err.move:22:9
+   │
+22 │ ╭         pragma intrinsic = map,
+23 │ │             map_no_such_fun = new;
+   │ ╰──────────────────────────────────^
+
+error: invalid intrinsic function mapping: map_len
+   ┌─ tests/sources/intrinsic_decl_err.move:26:9
+   │
+26 │ ╭         pragma intrinsic = map,
+27 │ │             map_len = true;
+   │ ╰───────────────────────────^
+
+error: an intrinsic function mapping can only refer to functions declared in the same module while `signer::address_of` is not
+   ┌─ tests/sources/intrinsic_decl_err.move:30:9
+   │
+30 │ ╭         pragma intrinsic = map,
+31 │ │             map_len = 0x1::signer::address_of;
+   │ ╰──────────────────────────────────────────────^
+
+error: unable to find move function for intrinsic mapping: M::no_such_move_fun
+   ┌─ tests/sources/intrinsic_decl_err.move:34:9
+   │
+34 │ ╭         pragma intrinsic = map,
+35 │ │             map_len = no_such_move_fun;
+   │ ╰───────────────────────────────────────^
+
+error: unable to find spec function for intrinsic mapping: M::no_such_spec_fun
+   ┌─ tests/sources/intrinsic_decl_err.move:38:9
+   │
+38 │ ╭         pragma intrinsic = map,
+39 │ │             map_spec_len = no_such_spec_fun;
+   │ ╰────────────────────────────────────────────^
+
+error: unable to find move function for intrinsic mapping: M::spec_len
+   ┌─ tests/sources/intrinsic_decl_err.move:42:9
+   │
+42 │ ╭         pragma intrinsic = map,
+43 │ │             map_len = spec_len;
+   │ ╰───────────────────────────────^
+
+error: duplicated intrinsic mapping for move function: M::length
+   ┌─ tests/sources/intrinsic_decl_err.move:46:9
+   │
+46 │ ╭         pragma intrinsic = map,
+47 │ │             map_len = length,
+48 │ │             map_borrow_mut = length;
+   │ ╰────────────────────────────────────^
+
+error: duplicated intrinsic mapping for spec function: M::spec_len
+   ┌─ tests/sources/intrinsic_decl_err.move:51:9
+   │
+51 │ ╭         pragma intrinsic = map,
+52 │ │             map_spec_len = spec_len,
+53 │ │             map_spec_set = spec_len;
+   │ ╰────────────────────────────────────^
diff --git a/third_party/move/move-model/tests/sources/intrinsic_decl_ok.v2_exp b/third_party/move/move-model/tests/sources/intrinsic_decl_ok.v2_exp
new file mode 100644
index 0000000000000..fd4dd9dc6179c
--- /dev/null
+++ b/third_party/move/move-model/tests/sources/intrinsic_decl_ok.v2_exp
@@ -0,0 +1 @@
+All good, no errors!
diff --git a/third_party/move/move-model/tests/sources/invariants_err.v2_exp b/third_party/move/move-model/tests/sources/invariants_err.v2_exp
new file mode 100644
index 0000000000000..79bdac1d34d4c
--- /dev/null
+++ b/third_party/move/move-model/tests/sources/invariants_err.v2_exp
@@ -0,0 +1,26 @@
+error: expected `bool` but found a value of type `num`
+  ┌─ tests/sources/invariants_err.move:9:15
+  │
+9 │     invariant x + 1;
+  │               ^^^^^
+
+error: `old(..)` expression not allowed in this context
+   ┌─ tests/sources/invariants_err.move:11:15
+   │
+11 │     invariant old(x) > 0;
+   │               ^^^^^^
+
+error: invalid reference to post state
+   ┌─ tests/sources/invariants_err.move:11:5
+   │
+11 │     invariant old(x) > 0;
+   │     ^^^^^^^^^^^^^^^^^^^^^
+   │     │         │
+   │     │         expression referring to post state
+   │     not allowed to refer to post state
+
+error: undeclared `spec_var`
+   ┌─ tests/sources/invariants_err.move:19:11
+   │
+19 │           spec_var > 0
+   │           ^^^^^^^^
diff --git a/third_party/move/move-model/tests/sources/invariants_ok.v2_exp b/third_party/move/move-model/tests/sources/invariants_ok.v2_exp
new file mode 100644
index 0000000000000..fd4dd9dc6179c
--- /dev/null
+++ b/third_party/move/move-model/tests/sources/invariants_ok.v2_exp
@@ -0,0 +1 @@
+All good, no errors!
diff --git a/third_party/move/move-model/tests/sources/lets_err.v2_exp b/third_party/move/move-model/tests/sources/lets_err.v2_exp
new file mode 100644
index 0000000000000..179068253bb79
--- /dev/null
+++ b/third_party/move/move-model/tests/sources/lets_err.v2_exp
@@ -0,0 +1,38 @@
+error: undeclared `one`
+  ┌─ tests/sources/lets_err.move:6:16
+  │
+6 │     let zero = one;
+  │                ^^^
+
+error: let bound `new_a` propagated via schema inclusion is referring to post state
+   ┌─ tests/sources/lets_err.move:22:5
+   │
+21 │     let post new_a = old(a) / sum;
+   │                      ------------ let defined here
+22 │     include Ensures{actual: a, expected: new_a + sum - sum};
+   │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   ·
+28 │     let a = expected;
+   │     ----------------- not allowed to use post state
+
+error: invalid reference to post state
+   ┌─ tests/sources/lets_err.move:43:5
+   │
+43 │     include Requires{a: result};
+   │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │                         │
+   │                         expression referring to post state
+   ·
+48 │     requires a != 0;
+   │     ---------------- not allowed to refer to post state
+
+error: invalid reference to post state
+   ┌─ tests/sources/lets_err.move:44:5
+   │
+44 │     include Requires{a: old(x)};
+   │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │                         │
+   │                         expression referring to post state
+   ·
+48 │     requires a != 0;
+   │     ---------------- not allowed to refer to post state
diff --git a/third_party/move/move-model/tests/sources/lets_ok.v2_exp b/third_party/move/move-model/tests/sources/lets_ok.v2_exp
new file mode 100644
index 0000000000000..fd4dd9dc6179c
--- /dev/null
+++ b/third_party/move/move-model/tests/sources/lets_ok.v2_exp
@@ -0,0 +1 @@
+All good, no errors!
diff --git a/third_party/move/move-model/tests/sources/module_level_spec_err_signature.v2_exp b/third_party/move/move-model/tests/sources/module_level_spec_err_signature.v2_exp
new file mode 100644
index 0000000000000..acd83fcec35cf
--- /dev/null
+++ b/third_party/move/move-model/tests/sources/module_level_spec_err_signature.v2_exp
@@ -0,0 +1,11 @@
+error: provided function signature must match function declaration: parameter mismatch
+   ┌─ tests/sources/module_level_spec_err_signature.move:11:10
+   │
+11 │     spec store(s: &signer) {
+   │          ^^^^^^^^^^^^^^^^^
+
+error: unresolved spec target
+   ┌─ tests/sources/module_level_spec_err_signature.move:14:10
+   │
+14 │     spec store_undefined(s: &signer, value: u64) {
+   │          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/third_party/move/move-model/tests/sources/module_level_spec_err_unassociated.v2_exp b/third_party/move/move-model/tests/sources/module_level_spec_err_unassociated.v2_exp
new file mode 100644
index 0000000000000..27db5dcbd9ce1
--- /dev/null
+++ b/third_party/move/move-model/tests/sources/module_level_spec_err_unassociated.v2_exp
@@ -0,0 +1,5 @@
+error: invalid 'spec' declaration
+  ┌─ tests/sources/module_level_spec_err_unassociated.move:4:12
+  │
+4 │ spec 0x42::TestModuleUndefined {
+  │            ^^^^^^^^^^^^^^^^^^^ Cannot associate specification with any target module in this compilation. A module specification cannot be compiled standalone.
diff --git a/third_party/move/move-model/tests/sources/pack_err.v2_exp b/third_party/move/move-model/tests/sources/pack_err.v2_exp
new file mode 100644
index 0000000000000..ba6b3d003ab51
--- /dev/null
+++ b/third_party/move/move-model/tests/sources/pack_err.v2_exp
@@ -0,0 +1,8 @@
+error: unexpected token
+  ┌─ tests/sources/pack_err.move:9:20
+  │
+9 │     invariant pack sum = sum + x;
+  │                    ^^^
+  │                    │
+  │                    Unexpected 'sum'
+  │                    Expected ';'
diff --git a/third_party/move/move-model/tests/sources/pragmas_err.v2_exp b/third_party/move/move-model/tests/sources/pragmas_err.v2_exp
new file mode 100644
index 0000000000000..735032376e27b
--- /dev/null
+++ b/third_party/move/move-model/tests/sources/pragmas_err.v2_exp
@@ -0,0 +1,11 @@
+error: property `bar` is not valid in this context
+  ┌─ tests/sources/pragmas_err.move:7:9
+  │
+7 │         pragma bar = true;
+  │         ^^^^^^^^^^^^^^^^^^
+
+error: property `verify` specified more than once in the same pragma declaration
+   ┌─ tests/sources/pragmas_err.move:19:24
+   │
+19 │         pragma verify, verify;
+   │                        ^^^^^^
diff --git a/third_party/move/move-model/tests/sources/quantifiers_ok.v2_exp b/third_party/move/move-model/tests/sources/quantifiers_ok.v2_exp
new file mode 100644
index 0000000000000..fd4dd9dc6179c
--- /dev/null
+++ b/third_party/move/move-model/tests/sources/quantifiers_ok.v2_exp
@@ -0,0 +1 @@
+All good, no errors!
diff --git a/third_party/move/move-model/tests/sources/schemas_err.v2_exp b/third_party/move/move-model/tests/sources/schemas_err.v2_exp
new file mode 100644
index 0000000000000..e8f8a22af06c8
--- /dev/null
+++ b/third_party/move/move-model/tests/sources/schemas_err.v2_exp
@@ -0,0 +1,83 @@
+error: undeclared `x`
+  ┌─ tests/sources/schemas_err.move:4:17
+  │
+4 │         ensures x > 0;
+  │                 ^
+
+error: schema `M::Undeclared` undeclared
+  ┌─ tests/sources/schemas_err.move:8:17
+  │
+8 │         include Undeclared;
+  │                 ^^^^^^^^^^
+
+error: wrong number of type arguments (expected 1, got 2)
+   ┌─ tests/sources/schemas_err.move:12:17
+   │
+12 │         include WrongTypeArgsIncluded<num, num>;
+   │                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: `wrong` not declared in schema
+   ┌─ tests/sources/schemas_err.move:19:44
+   │
+19 │         include WrongTypeArgsIncluded<num>{wrong: 1};
+   │                                            ^^^^^
+
+error: expected `num` but found a value of type `bool`
+   ┌─ tests/sources/schemas_err.move:24:47
+   │
+24 │         include WrongTypeArgsIncluded<num>{x: y};
+   │                                               ^
+
+error: expected `bool` but found a value of type `num`
+   ┌─ tests/sources/schemas_err.move:28:48
+   │
+28 │         include WrongTypeArgsIncluded<bool>{x: 1 + 2};
+   │                                                ^^^^^
+
+error: variable `x` bound by schema inclusion expected to have type `bool` but provided was `num`
+   ┌─ tests/sources/schemas_err.move:33:17
+   │
+33 │         include WronglyTypedVarIncluded;
+   │                 ^^^^^^^^^^^^^^^^^^^^^^^
+
+error: variable `x` bound by schema inclusion expected to have type `bool` but provided was `num`
+   ┌─ tests/sources/schemas_err.move:41:17
+   │
+41 │         include WronglyTypedInstantiationIncluded<num>;
+   │                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: `y` cannot be matched to an existing name in inclusion context
+   ┌─ tests/sources/schemas_err.move:52:17
+   │
+52 │         include UndeclaredVarInInclude;
+   │                 ^^^^^^^^^^^^^^^^^^^^^^
+
+error: `requires` not allowed in struct context (included from schema)
+   ┌─ tests/sources/schemas_err.move:70:9
+   │
+70 │         include Condition;
+   │         ^^^^^^^^^^^^^^^^^^
+
+error: cyclic schema dependency: Cycle1 -> Cycle2 -> Cycle3 -> Cycle1
+   ┌─ tests/sources/schemas_err.move:80:17
+   │
+80 │         include Cycle1;
+   │                 ^^^^^^
+
+error: expected `bool` but found a value of type `u256`
+   ┌─ tests/sources/schemas_err.move:84:17
+   │
+84 │         include 22 ==> Condition;
+   │                 ^^
+
+error: expression construct not supported for schemas
+   ┌─ tests/sources/schemas_err.move:85:26
+   │
+85 │         include true ==> 23;
+   │                          ^^
+
+error: expression construct not supported for schemas
+   ┌─ tests/sources/schemas_err.move:86:17
+   │
+86 │         include Condition || Condition;
+   │                 ^^^^^^^^^^^^^^^^^^^^^^
diff --git a/third_party/move/move-model/tests/sources/schemas_ok.v2_exp b/third_party/move/move-model/tests/sources/schemas_ok.v2_exp
new file mode 100644
index 0000000000000..fd4dd9dc6179c
--- /dev/null
+++ b/third_party/move/move-model/tests/sources/schemas_ok.v2_exp
@@ -0,0 +1 @@
+All good, no errors!
diff --git a/third_party/move/move-model/tests/sources/structs_err.v2_exp b/third_party/move/move-model/tests/sources/structs_err.v2_exp
new file mode 100644
index 0000000000000..9829b115f35e8
--- /dev/null
+++ b/third_party/move/move-model/tests/sources/structs_err.v2_exp
@@ -0,0 +1,35 @@
+error: field `xx` not declared in struct `S`
+   ┌─ tests/sources/structs_err.move:26:7
+   │
+26 │       s.xx
+   │       ^
+
+error: expected `bool` but found a value of type `u64`
+   ┌─ tests/sources/structs_err.move:31:7
+   │
+31 │       s.x
+   │       ^^^
+
+error: expected `bool` but found a value of type `u64`
+   ┌─ tests/sources/structs_err.move:36:18
+   │
+36 │       S{x: x, y: y, z: z}
+   │                  ^
+
+error: missing fields `y`, `z`
+   ┌─ tests/sources/structs_err.move:40:7
+   │
+40 │       S{x: x}
+   │       ^^^^^^^
+
+error: cannot return `G<u64>` from a function with result type `G<bool>`
+   ┌─ tests/sources/structs_err.move:45:7
+   │
+45 │       G{x: x, y: y}
+   │       ^^^^^^^^^^^^^
+
+error: expected 1 type argument but 2 were provided
+   ┌─ tests/sources/structs_err.move:50:7
+   │
+50 │       G<u64, bool>{x: x, y: y}
+   │       ^
diff --git a/third_party/move/move-model/tests/sources/structs_ok.v2_exp b/third_party/move/move-model/tests/sources/structs_ok.v2_exp
new file mode 100644
index 0000000000000..fd4dd9dc6179c
--- /dev/null
+++ b/third_party/move/move-model/tests/sources/structs_ok.v2_exp
@@ -0,0 +1 @@
+All good, no errors!
diff --git a/third_party/move/move-model/tests/sources/type_variance_ok.v2_exp b/third_party/move/move-model/tests/sources/type_variance_ok.v2_exp
new file mode 100644
index 0000000000000..fd4dd9dc6179c
--- /dev/null
+++ b/third_party/move/move-model/tests/sources/type_variance_ok.v2_exp
@@ -0,0 +1 @@
+All good, no errors!
diff --git a/third_party/move/move-model/tests/sources/use_erroneous_schema.v2_exp b/third_party/move/move-model/tests/sources/use_erroneous_schema.v2_exp
new file mode 100644
index 0000000000000..60ba63e10bd4b
--- /dev/null
+++ b/third_party/move/move-model/tests/sources/use_erroneous_schema.v2_exp
@@ -0,0 +1,11 @@
+error: undeclared `x`
+  ┌─ tests/sources/use_erroneous_schema.move:5:17
+  │
+5 │         ensures x > 0;
+  │                 ^
+
+error: cannot use `bool` with an operator which expects a value of type `num`
+   ┌─ tests/sources/use_erroneous_schema.move:13:21
+   │
+13 │         ensures 2 < true;
+   │                     ^^^^
diff --git a/third_party/move/move-model/tests/sources/variables_err.v2_exp b/third_party/move/move-model/tests/sources/variables_err.v2_exp
new file mode 100644
index 0000000000000..ce21e503fbb80
--- /dev/null
+++ b/third_party/move/move-model/tests/sources/variables_err.v2_exp
@@ -0,0 +1,8 @@
+error: unexpected token
+   ┌─ tests/sources/variables_err.move:20:20
+   │
+20 │     invariant pack x == 0;
+   │                    ^
+   │                    │
+   │                    Unexpected 'x'
+   │                    Expected ';'
diff --git a/third_party/move/move-model/tests/sources/variables_ok.v2_exp b/third_party/move/move-model/tests/sources/variables_ok.v2_exp
new file mode 100644
index 0000000000000..47f2d647499db
--- /dev/null
+++ b/third_party/move/move-model/tests/sources/variables_ok.v2_exp
@@ -0,0 +1,8 @@
+error: unexpected token
+  ┌─ tests/sources/variables_ok.move:9:20
+  │
+9 │     invariant pack sum = sum + x;
+  │                    ^^^
+  │                    │
+  │                    Unexpected 'sum'
+  │                    Expected ';'
diff --git a/third_party/move/move-model/tests/testsuite.rs b/third_party/move/move-model/tests/testsuite.rs
index 95b2ff6ae32c5..5e001d85e4f9c 100644
--- a/third_party/move/move-model/tests/testsuite.rs
+++ b/third_party/move/move-model/tests/testsuite.rs
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use codespan_reporting::{diagnostic::Severity, term::termcolor::Buffer};
-use move_command_line_common::testing::EXP_EXT;
+use move_command_line_common::testing::get_compiler_exp_extension;
 use move_compiler::shared::{known_attributes::KnownAttribute, PackagePaths};
 use move_model::{options::ModelBuilderOptions, run_model_builder_with_options};
 use move_prover_test_utils::baseline_test::verify_or_update_baseline;
@@ -30,7 +30,7 @@ fn test_runner(path: &Path, options: ModelBuilderOptions) -> datatest_stable::Re
     } else {
         "All good, no errors!".to_string()
     };
-    let baseline_path = path.with_extension(EXP_EXT);
+    let baseline_path = path.with_extension(get_compiler_exp_extension());
     verify_or_update_baseline(baseline_path.as_path(), &diags)?;
     Ok(())
 }
diff --git a/third_party/move/move-prover/boogie-backend/src/boogie_wrapper.rs b/third_party/move/move-prover/boogie-backend/src/boogie_wrapper.rs
index 713b0e1e37329..f4e3db63c5867 100644
--- a/third_party/move/move-prover/boogie-backend/src/boogie_wrapper.rs
+++ b/third_party/move/move-prover/boogie-backend/src/boogie_wrapper.rs
@@ -1628,6 +1628,7 @@ impl ModelValue {
     }
 }
 
+#[allow(dead_code)]
 /// Represents an expression descriptor.
 #[derive(Debug, Clone, PartialEq, Eq, Hash, PartialOrd, Ord)]
 struct ExpDescriptor {
diff --git a/third_party/move/move-prover/boogie-backend/src/bytecode_translator.rs b/third_party/move/move-prover/boogie-backend/src/bytecode_translator.rs
index eca4b3a1f2bfd..87d6f02af9b69 100644
--- a/third_party/move/move-prover/boogie-backend/src/bytecode_translator.rs
+++ b/third_party/move/move-prover/boogie-backend/src/bytecode_translator.rs
@@ -1119,6 +1119,13 @@ impl<'env> FunctionTranslator<'env> {
             Call(_, dests, oper, srcs, aa) => {
                 use Operation::*;
                 match oper {
+                    TestVariant(..)
+                    | PackVariant(..)
+                    | UnpackVariant(..)
+                    | BorrowVariantField(..) => {
+                        let loc = self.fun_target.get_bytecode_loc(attr_id);
+                        self.parent.env.error(&loc, "variants not yet implemented")
+                    },
                     FreezeRef(_) => unreachable!(),
                     UnpackRef | UnpackRefDeep | PackRef | PackRefDeep => {
                         // No effect
@@ -1136,7 +1143,7 @@ impl<'env> FunctionTranslator<'env> {
                                 .flatten()
                                 .into_iter()
                                 .filter_map(|e| match e {
-                                    BorrowEdge::Field(_, offset) => Some(format!("{}", offset)),
+                                    BorrowEdge::Field(_, _, offset) => Some(format!("{}", offset)),
                                     BorrowEdge::Index(_) => Some("-1".to_owned()),
                                     BorrowEdge::Direct => None,
                                     _ => unreachable!(),
@@ -2358,10 +2365,11 @@ impl<'env> FunctionTranslator<'env> {
                 BorrowEdge::Direct => {
                     self.translate_write_back_update(mk_dest, get_path_index, src, edges, at + 1)
                 },
-                BorrowEdge::Field(memory, offset) => {
+                BorrowEdge::Field(memory, variant, offset) => {
                     let memory = memory.to_owned().instantiate(self.type_inst);
                     let struct_env = &self.parent.env.get_struct_qid(memory.to_qualified_id());
-                    let field_env = &struct_env.get_field_by_offset(*offset);
+                    let field_env =
+                        &struct_env.get_field_by_offset_optional_variant(*variant, *offset);
                     let field_sel = boogie_field_sel(field_env);
                     let new_dest = format!("{}->{}", (*mk_dest)(), field_sel);
                     let mut new_dest_needed = false;
diff --git a/third_party/move/move-prover/boogie-backend/src/spec_translator.rs b/third_party/move/move-prover/boogie-backend/src/spec_translator.rs
index 97da9e19fe0f6..c7768b6d43278 100644
--- a/third_party/move/move-prover/boogie-backend/src/spec_translator.rs
+++ b/third_party/move/move-prover/boogie-backend/src/spec_translator.rs
@@ -274,9 +274,11 @@ impl<'env> SpecTranslator<'env> {
             self.error(&fun.loc, "function or tuple result type not yet supported");
             return;
         }
-        let recursive = self
+        let qid = module_env.get_id().qualified(id);
+        let recursive = self.env.is_spec_fun_recursive(qid);
+        let type_reflection = self
             .env
-            .is_spec_fun_recursive(module_env.get_id().qualified(id));
+            .spec_fun_uses_generic_type_reflection(&qid.instantiate(self.type_inst.clone()));
         emitln!(
             self.writer,
             "// {}spec fun {}",
@@ -307,6 +309,18 @@ impl<'env> SpecTranslator<'env> {
                 boogie_type
             }
         };
+        let type_info_params = if type_reflection {
+            (0..fun.type_params.len())
+                .map(|i| {
+                    format!(
+                        "{}_info: $TypeParamInfo",
+                        boogie_type(self.env, &Type::TypeParameter(i as u16))
+                    )
+                })
+                .collect_vec()
+        } else {
+            vec![]
+        };
         let result_type = ty_str_fn(bv_flag_result)(self.env, &self.inst(&fun.result_type));
         // it is possible that the spec fun may refer to the same memory after monomorphization,
         // (e.g., one via concrete type and the other via type parameter being instantiated).
@@ -352,7 +366,10 @@ impl<'env> SpecTranslator<'env> {
             });
         self.writer.set_location(&fun.loc);
         let boogie_name = boogie_spec_fun_name(module_env, id, &self.type_inst, bv_flag_result);
-        let param_list = mem_params.chain(params).join(", ");
+        let param_list = type_info_params
+            .into_iter()
+            .chain(mem_params.chain(params))
+            .join(", ");
         let attrs = if fun.uninterpreted || recursive {
             ""
         } else {
@@ -626,7 +643,7 @@ impl<'env> SpecTranslator<'env> {
         } else {
             // Use a clone with the given type instantiation.
             let mut trans = self.clone();
-            trans.type_inst = type_inst.to_owned();
+            type_inst.clone_into(&mut trans.type_inst);
             trans.translate_exp(exp)
         }
     }
@@ -698,6 +715,10 @@ impl<'env> SpecTranslator<'env> {
                 self.translate_exp_parenthesised(on_false);
                 emit!(self.writer, ")");
             },
+            ExpData::Match(node_id, ..) => self.error(
+                &self.env.get_node_loc(*node_id),
+                "match not yet implemented",
+            ),
             ExpData::Invalid(_) => panic!("unexpected error expression"),
             ExpData::Sequence(_, exp_vec) if exp_vec.len() == 1 => {
                 // Single-element sequence is just a wrapped value.
@@ -825,12 +846,23 @@ impl<'env> SpecTranslator<'env> {
             Operation::SpecFunction(module_id, fun_id, memory_labels) => {
                 self.translate_spec_fun_call(node_id, *module_id, *fun_id, args, memory_labels)
             },
-            Operation::Pack(mid, sid) => self.translate_pack(node_id, *mid, *sid, args),
+            Operation::Pack(_, _, Some(_)) => {
+                self.error(&loc, "variants not yet supported");
+            },
+            Operation::Pack(mid, sid, None) => self.translate_pack(node_id, *mid, *sid, args),
             Operation::Tuple if args.len() == 1 => self.translate_exp(&args[0]),
             Operation::Tuple => self.error(&loc, "Tuple not yet supported"),
             Operation::Select(module_id, struct_id, field_id) => {
                 self.translate_select(node_id, *module_id, *struct_id, *field_id, args)
             },
+            Operation::SelectVariants(_module_id, _struct_id, _field_ids) => {
+                // TODO(#13806): implement for variants
+                self.error(&loc, "selection from variants no yet supported");
+            },
+            Operation::TestVariants(_module_id, _struct_id, _variants) => {
+                // TODO(#13806): implement for variants
+                self.error(&loc, "testing of variants no yet supported");
+            },
             Operation::UpdateField(module_id, struct_id, field_id) => {
                 self.translate_update_field(node_id, *module_id, *struct_id, *field_id, args)
             },
@@ -1024,14 +1056,69 @@ impl<'env> SpecTranslator<'env> {
         let inst = &self.get_node_instantiation(node_id);
         let module_env = &self.env.get_module(module_id);
         let fun_decl = module_env.get_spec_fun(fun_id);
+        if self.try_translate_spec_fun_reflection_call(module_env, fun_decl, inst) {
+            return;
+        }
+
+        // regular path
         let global_state = &self
             .env
             .get_extension::<GlobalNumberOperationState>()
             .expect("global number operation state");
+        let is_vector_table_module = module_env.is_std_vector() || module_env.is_table();
+        let bv_flag = if is_vector_table_module && !args.is_empty() {
+            global_state.get_node_num_oper(args[0].node_id()) == Bitwise
+        } else {
+            global_state.get_node_num_oper(node_id) == Bitwise
+        };
+        let name = boogie_spec_fun_name(module_env, fun_id, inst, bv_flag);
+        emit!(self.writer, "{}(", name);
+        let mut first = true;
+        let mut maybe_comma = || {
+            if first {
+                first = false;
+            } else {
+                emit!(self.writer, ", ");
+            }
+        };
+        // Start with type info parameters
+        if self
+            .env
+            .spec_fun_uses_generic_type_reflection(&module_id.qualified_inst(fun_id, inst.clone()))
+        {
+            for i in 0..fun_decl.type_params.len() {
+                maybe_comma();
+                emit!(
+                    self.writer,
+                    "{}_info",
+                    boogie_type(self.env, &Type::TypeParameter(i as u16))
+                )
+            }
+        }
+        // Add memory parameters.
+        let label_at = |i| memory_labels.as_ref().map(|labels| labels[i]);
+        let mut i = 0;
+        for memory in &fun_decl.used_memory {
+            let memory = &memory.to_owned().instantiate(inst);
+            maybe_comma();
+            let memory = boogie_resource_memory_name(self.env, memory, &label_at(i));
+            emit!(self.writer, &memory);
+            i = usize::saturating_add(i, 1);
+        }
+        // Finally add argument expressions
+        for exp in args {
+            maybe_comma();
+            self.translate_exp(exp);
+        }
+        emit!(self.writer, ")");
+    }
 
-        // special casing for type reflection
-        let mut processed = false;
-
+    fn try_translate_spec_fun_reflection_call(
+        &self,
+        module_env: &ModuleEnv,
+        fun_decl: &SpecFunDecl,
+        inst: &[Type],
+    ) -> bool {
         // TODO(mengxu): change it to a better address name instead of extlib
         if self.env.get_extlib_address() == *module_env.get_name().addr() {
             let qualified_name = format!(
@@ -1046,7 +1133,7 @@ impl<'env> SpecTranslator<'env> {
                     "{}",
                     boogie_reflection_type_name(self.env, &inst[0], false)
                 );
-                processed = true;
+                true
             } else if qualified_name == TYPE_INFO_SPEC {
                 assert_eq!(inst.len(), 1);
                 // TODO(mengxu): by ignoring the first return value of this function, we are
@@ -1054,7 +1141,7 @@ impl<'env> SpecTranslator<'env> {
                 // invoking `type_info` on a primitive type like: `type_info<bool>`.
                 let (_, info) = boogie_reflection_type_info(self.env, &inst[0]);
                 emit!(self.writer, "{}", info);
-                processed = true;
+                true
             } else if qualified_name == TYPE_SPEC_IS_STRUCT {
                 assert_eq!(inst.len(), 1);
                 emit!(
@@ -1062,11 +1149,11 @@ impl<'env> SpecTranslator<'env> {
                     "{}",
                     boogie_reflection_type_is_struct(self.env, &inst[0])
                 );
-                processed = true;
+                true
+            } else {
+                false
             }
-        }
-
-        if self.env.get_stdlib_address() == *module_env.get_name().addr() {
+        } else if self.env.get_stdlib_address() == *module_env.get_name().addr() {
             let qualified_name = format!(
                 "{}::{}",
                 module_env.get_name().name().display(self.env.symbol_pool()),
@@ -1079,42 +1166,12 @@ impl<'env> SpecTranslator<'env> {
                     "{}",
                     boogie_reflection_type_name(self.env, &inst[0], true)
                 );
-                processed = true;
-            }
-        }
-
-        let is_vector_table_module = module_env.is_std_vector() || module_env.is_table();
-        // regular path
-        if !processed {
-            let bv_flag = if is_vector_table_module && !args.is_empty() {
-                global_state.get_node_num_oper(args[0].node_id()) == Bitwise
+                true
             } else {
-                global_state.get_node_num_oper(node_id) == Bitwise
-            };
-            let name = boogie_spec_fun_name(module_env, fun_id, inst, bv_flag);
-            emit!(self.writer, "{}(", name);
-            let mut first = true;
-            let mut maybe_comma = || {
-                if first {
-                    first = false;
-                } else {
-                    emit!(self.writer, ", ");
-                }
-            };
-            let label_at = |i| memory_labels.as_ref().map(|labels| labels[i]);
-            let mut i = 0;
-            for memory in &fun_decl.used_memory {
-                let memory = &memory.to_owned().instantiate(inst);
-                maybe_comma();
-                let memory = boogie_resource_memory_name(self.env, memory, &label_at(i));
-                emit!(self.writer, &memory);
-                i = usize::saturating_add(i, 1);
-            }
-            for exp in args {
-                maybe_comma();
-                self.translate_exp(exp);
+                false
             }
-            emit!(self.writer, ")");
+        } else {
+            false
         }
     }
 
diff --git a/third_party/move/move-prover/bytecode-pipeline/src/mono_analysis.rs b/third_party/move/move-prover/bytecode-pipeline/src/mono_analysis.rs
index beb645e7e1ab1..7f7bda844af1c 100644
--- a/third_party/move/move-prover/bytecode-pipeline/src/mono_analysis.rs
+++ b/third_party/move/move-prover/bytecode-pipeline/src/mono_analysis.rs
@@ -582,7 +582,7 @@ impl<'a> Analyzer<'a> {
     fn add_types_in_borrow_edge(&mut self, edge: &BorrowEdge) {
         match edge {
             BorrowEdge::Direct | BorrowEdge::Index(_) => (),
-            BorrowEdge::Field(qid, _) => {
+            BorrowEdge::Field(qid, _, _) => {
                 self.add_type_root(&qid.to_type());
             },
             BorrowEdge::Hyper(edges) => {
diff --git a/third_party/move/move-prover/bytecode-pipeline/src/spec_instrumentation.rs b/third_party/move/move-prover/bytecode-pipeline/src/spec_instrumentation.rs
index 5c4498a465266..93275129773d8 100644
--- a/third_party/move/move-prover/bytecode-pipeline/src/spec_instrumentation.rs
+++ b/third_party/move/move-prover/bytecode-pipeline/src/spec_instrumentation.rs
@@ -754,7 +754,7 @@ impl<'a> Instrumenter<'a> {
             let (rhs_temp, _) = self.builder.emit_let(self.builder.mk_call_with_inst(
                 &ghost_mem_ty,
                 ghost_mem.inst.clone(),
-                ast::Operation::Pack(ghost_mem.module_id, ghost_mem.id),
+                ast::Operation::Pack(ghost_mem.module_id, ghost_mem.id, None),
                 vec![new_rhs.clone()],
             ));
 
diff --git a/third_party/move/move-prover/bytecode-pipeline/src/well_formed_instrumentation.rs b/third_party/move/move-prover/bytecode-pipeline/src/well_formed_instrumentation.rs
index 4434653781415..a8f8c8d8a21db 100644
--- a/third_party/move/move-prover/bytecode-pipeline/src/well_formed_instrumentation.rs
+++ b/third_party/move/move-prover/bytecode-pipeline/src/well_formed_instrumentation.rs
@@ -95,7 +95,7 @@ impl FunctionTargetProcessor for WellFormedInstrumentationProcessor {
                     let mem_val = builder.mk_call_with_inst(
                         &mem_ty,
                         mem.inst.clone(),
-                        Operation::Pack(mem.module_id, mem.id),
+                        Operation::Pack(mem.module_id, mem.id, None),
                         vec![init.clone()],
                     );
                     let mem_access = builder.mk_call_with_inst(
diff --git a/third_party/move/move-prover/bytecode-pipeline/tests/data_invariant_instrumentation/borrow.v2_exp b/third_party/move/move-prover/bytecode-pipeline/tests/data_invariant_instrumentation/borrow.v2_exp
new file mode 100644
index 0000000000000..544df24772dae
--- /dev/null
+++ b/third_party/move/move-prover/bytecode-pipeline/tests/data_invariant_instrumentation/borrow.v2_exp
@@ -0,0 +1,197 @@
+============ initial translation from Move ================
+
+[variant baseline]
+public fun Test::test_borrow_imm<#0>(): u64 {
+     var $t0: address
+     var $t1: &Test::R<#0>
+     var $t2: &u64
+     var $t3: u64
+  0: $t0 := 0x1
+  1: $t1 := borrow_global<Test::R<#0>>($t0)
+  2: $t2 := borrow_field<Test::R<#0>>.x($t1)
+  3: $t3 := read_ref($t2)
+  4: return $t3
+}
+
+
+[variant baseline]
+public fun Test::test_borrow_mut<#0>(): u64 {
+     var $t0|r: &mut Test::R<#0>
+     var $t1: address
+     var $t2: &mut Test::R<#0>
+     var $t3: u64
+     var $t4: &mut Test::R<#0>
+     var $t5: &mut Test::S
+     var $t6: &mut u64
+     var $t7: u64
+     var $t8: &mut Test::R<#0>
+     var $t9: &mut u64
+     var $t10: &mut Test::R<#0>
+     var $t11: &u64
+     var $t12: u64
+  0: $t1 := 0x1
+  1: $t2 := borrow_global<Test::R<#0>>($t1)
+  2: $t0 := $t2
+  3: $t3 := 2
+  4: $t4 := copy($t0)
+  5: $t5 := borrow_field<Test::R<#0>>.s($t4)
+  6: $t6 := borrow_field<Test::S>.y($t5)
+  7: write_ref($t6, $t3)
+  8: $t7 := 3
+  9: $t8 := copy($t0)
+ 10: $t9 := borrow_field<Test::R<#0>>.x($t8)
+ 11: write_ref($t9, $t7)
+ 12: $t10 := move($t0)
+ 13: $t11 := borrow_field<Test::R<#0>>.x($t10)
+ 14: $t12 := read_ref($t11)
+ 15: return $t12
+}
+
+
+[variant baseline]
+public fun Test::test_borrow_mut_local(): Test::R<u64> {
+     var $t0|d: Test::R<u64>
+     var $t1|r: &mut Test::R<u64>
+     var $t2: u64
+     var $t3: u64
+     var $t4: Test::S
+     var $t5: u64
+     var $t6: Test::R<u64>
+     var $t7: &mut Test::R<u64>
+     var $t8: u64
+     var $t9: &mut Test::R<u64>
+     var $t10: &mut Test::S
+     var $t11: &mut u64
+     var $t12: u64
+     var $t13: &mut Test::R<u64>
+     var $t14: &mut u64
+     var $t15: Test::R<u64>
+  0: $t2 := 2
+  1: $t3 := 1
+  2: $t4 := pack Test::S($t3)
+  3: $t5 := 0
+  4: $t6 := pack Test::R<u64>($t2, $t4, $t5)
+  5: $t0 := $t6
+  6: $t7 := borrow_local($t0)
+  7: $t1 := $t7
+  8: $t8 := 2
+  9: $t9 := copy($t1)
+ 10: $t10 := borrow_field<Test::R<u64>>.s($t9)
+ 11: $t11 := borrow_field<Test::S>.y($t10)
+ 12: write_ref($t11, $t8)
+ 13: $t12 := 3
+ 14: $t13 := move($t1)
+ 15: $t14 := borrow_field<Test::R<u64>>.x($t13)
+ 16: write_ref($t14, $t12)
+ 17: $t15 := move($t0)
+ 18: return $t15
+}
+
+============ after pipeline `data_invariant_instrumentation` ================
+
+[variant verification]
+public fun Test::test_borrow_imm<#0>(): u64 {
+     var $t0: address
+     var $t1: Test::R<#0>
+     var $t2: num
+     var $t3: u64
+  0: assume forall $rsc: Test::R<#0>: ResourceDomain<Test::R<#0>>(): And(WellFormed($rsc), And(Gt(select Test::R.x($rsc), select Test::S.y<Test::S>(select Test::R.s($rsc))), Gt(select Test::S.y(select Test::R.s($rsc)), 0)))
+  1: $t0 := 0x1
+  2: $t1 := get_global<Test::R<#0>>($t0) on_abort goto 6 with $t2
+  3: $t3 := get_field<Test::R<#0>>.x($t1)
+  4: label L1
+  5: return $t3
+  6: label L2
+  7: abort($t2)
+}
+
+
+[variant verification]
+public fun Test::test_borrow_mut<#0>(): u64 {
+     var $t0|r: &mut Test::R<#0>
+     var $t1: address
+     var $t2: &mut Test::R<#0>
+     var $t3: num
+     var $t4: u64
+     var $t5: &mut Test::S
+     var $t6: &mut u64
+     var $t7: u64
+     var $t8: &mut u64
+     var $t9: u64
+  0: assume forall $rsc: Test::R<#0>: ResourceDomain<Test::R<#0>>(): And(WellFormed($rsc), And(Gt(select Test::R.x($rsc), select Test::S.y<Test::S>(select Test::R.s($rsc))), Gt(select Test::S.y(select Test::R.s($rsc)), 0)))
+  1: $t1 := 0x1
+  2: $t2 := borrow_global<Test::R<#0>>($t1) on_abort goto 19 with $t3
+  3: $t4 := 2
+  4: $t5 := borrow_field<Test::R<#0>>.s($t2)
+  5: $t6 := borrow_field<Test::S>.y($t5)
+  6: write_ref($t6, $t4)
+  7: write_back[Reference($t5).y (u64)]($t6)
+  8: write_back[Reference($t2).s (Test::S)]($t5)
+  9: $t7 := 3
+ 10: $t8 := borrow_field<Test::R<#0>>.x($t2)
+ 11: write_ref($t8, $t7)
+ 12: write_back[Reference($t2).x (u64)]($t8)
+ 13: $t9 := get_field<Test::R<#0>>.x($t2)
+     # data invariant at tests/data_invariant_instrumentation/borrow.move:13:9+18
+     # VC: data invariant does not hold at tests/data_invariant_instrumentation/borrow.move:13:9+18
+ 14: assert Gt(select Test::R.x($t2), select Test::S.y<Test::S>(select Test::R.s($t2)))
+     # data invariant at tests/data_invariant_instrumentation/borrow.move:17:9+16
+     # VC: data invariant does not hold at tests/data_invariant_instrumentation/borrow.move:17:9+16
+ 15: assert Gt(select Test::S.y(select Test::R.s($t2)), 0)
+ 16: write_back[Test::R<#0>@]($t2)
+ 17: label L1
+ 18: return $t9
+ 19: label L2
+ 20: abort($t3)
+}
+
+
+[variant verification]
+public fun Test::test_borrow_mut_local(): Test::R<u64> {
+     var $t0|d: Test::R<u64>
+     var $t1|r: &mut Test::R<u64>
+     var $t2: u64
+     var $t3: u64
+     var $t4: Test::S
+     var $t5: u64
+     var $t6: &mut Test::R<u64>
+     var $t7: u64
+     var $t8: &mut Test::S
+     var $t9: &mut u64
+     var $t10: u64
+     var $t11: &mut u64
+     var $t12: Test::R<u64>
+  0: $t2 := 2
+  1: $t3 := 1
+  2: $t4 := pack Test::S($t3)
+     # data invariant at tests/data_invariant_instrumentation/borrow.move:17:9+16
+     # VC: data invariant does not hold at tests/data_invariant_instrumentation/borrow.move:17:9+16
+  3: assert Gt(select Test::S.y($t4), 0)
+  4: $t5 := 0
+  5: $t0 := pack Test::R<u64>($t2, $t4, $t5)
+     # data invariant at tests/data_invariant_instrumentation/borrow.move:13:9+18
+     # VC: data invariant does not hold at tests/data_invariant_instrumentation/borrow.move:13:9+18
+  6: assert Gt(select Test::R.x($t0), select Test::S.y<Test::S>(select Test::R.s($t0)))
+  7: $t6 := borrow_local($t0)
+  8: $t7 := 2
+  9: $t8 := borrow_field<Test::R<u64>>.s($t6)
+ 10: $t9 := borrow_field<Test::S>.y($t8)
+ 11: write_ref($t9, $t7)
+ 12: write_back[Reference($t8).y (u64)]($t9)
+ 13: write_back[Reference($t6).s (Test::S)]($t8)
+ 14: $t10 := 3
+ 15: $t11 := borrow_field<Test::R<u64>>.x($t6)
+ 16: write_ref($t11, $t10)
+ 17: write_back[Reference($t6).x (u64)]($t11)
+     # data invariant at tests/data_invariant_instrumentation/borrow.move:13:9+18
+     # VC: data invariant does not hold at tests/data_invariant_instrumentation/borrow.move:13:9+18
+ 18: assert Gt(select Test::R.x($t6), select Test::S.y<Test::S>(select Test::R.s($t6)))
+     # data invariant at tests/data_invariant_instrumentation/borrow.move:17:9+16
+     # VC: data invariant does not hold at tests/data_invariant_instrumentation/borrow.move:17:9+16
+ 19: assert Gt(select Test::S.y(select Test::R.s($t6)), 0)
+ 20: write_back[LocalRoot($t0)@]($t6)
+ 21: trace_local[d]($t0)
+ 22: $t12 := move($t0)
+ 23: label L1
+ 24: return $t12
+}
diff --git a/third_party/move/move-prover/bytecode-pipeline/tests/data_invariant_instrumentation/pack.v2_exp b/third_party/move/move-prover/bytecode-pipeline/tests/data_invariant_instrumentation/pack.v2_exp
new file mode 100644
index 0000000000000..572e482b9d868
--- /dev/null
+++ b/third_party/move/move-prover/bytecode-pipeline/tests/data_invariant_instrumentation/pack.v2_exp
@@ -0,0 +1,36 @@
+============ initial translation from Move ================
+
+[variant baseline]
+public fun Test::test_pack(): Test::R {
+     var $t0: u64
+     var $t1: u64
+     var $t2: Test::S
+     var $t3: Test::R
+  0: $t0 := 3
+  1: $t1 := 1
+  2: $t2 := pack Test::S($t1)
+  3: $t3 := pack Test::R($t0, $t2)
+  4: return $t3
+}
+
+============ after pipeline `data_invariant_instrumentation` ================
+
+[variant verification]
+public fun Test::test_pack(): Test::R {
+     var $t0: u64
+     var $t1: u64
+     var $t2: Test::S
+     var $t3: Test::R
+  0: $t0 := 3
+  1: $t1 := 1
+  2: $t2 := pack Test::S($t1)
+     # data invariant at tests/data_invariant_instrumentation/pack.move:16:9+16
+     # VC: data invariant does not hold at tests/data_invariant_instrumentation/pack.move:16:9+16
+  3: assert Gt(select Test::S.y($t2), 0)
+  4: $t3 := pack Test::R($t0, $t2)
+     # data invariant at tests/data_invariant_instrumentation/pack.move:12:9+18
+     # VC: data invariant does not hold at tests/data_invariant_instrumentation/pack.move:12:9+18
+  5: assert Gt(select Test::R.x($t3), select Test::S.y<Test::S>(select Test::R.s($t3)))
+  6: label L1
+  7: return $t3
+}
diff --git a/third_party/move/move-prover/bytecode-pipeline/tests/data_invariant_instrumentation/params.v2_exp b/third_party/move/move-prover/bytecode-pipeline/tests/data_invariant_instrumentation/params.v2_exp
new file mode 100644
index 0000000000000..5d342fe5efece
--- /dev/null
+++ b/third_party/move/move-prover/bytecode-pipeline/tests/data_invariant_instrumentation/params.v2_exp
@@ -0,0 +1,25 @@
+============ initial translation from Move ================
+
+[variant baseline]
+public fun Test::test_param($t0|_simple_R: Test::R, $t1|_ref_R: &Test::R, $t2|_simple_S: Test::S, $t3|_mut_R: &mut Test::R) {
+  0: return ()
+}
+
+============ after pipeline `data_invariant_instrumentation` ================
+
+[variant verification]
+public fun Test::test_param($t0|_simple_R: Test::R, $t1|_ref_R: Test::R, $t2|_simple_S: Test::S, $t3|_mut_R: &mut Test::R) {
+  0: assume And(WellFormed($t0), And(Gt(select Test::R.x($t0), select Test::S.y<Test::S>(select Test::R.s($t0))), Gt(select Test::S.y(select Test::R.s($t0)), 0)))
+  1: assume And(WellFormed($t1), And(Gt(select Test::R.x($t1), select Test::S.y<Test::S>(select Test::R.s($t1))), Gt(select Test::S.y(select Test::R.s($t1)), 0)))
+  2: assume And(WellFormed($t2), Gt(select Test::S.y($t2), 0))
+  3: assume And(WellFormed($t3), And(Gt(select Test::R.x($t3), select Test::S.y<Test::S>(select Test::R.s($t3))), Gt(select Test::S.y(select Test::R.s($t3)), 0)))
+  4: trace_local[_mut_R]($t3)
+     # data invariant at tests/data_invariant_instrumentation/params.move:12:9+18
+     # VC: data invariant does not hold at tests/data_invariant_instrumentation/params.move:12:9+18
+  5: assert Gt(select Test::R.x($t3), select Test::S.y<Test::S>(select Test::R.s($t3)))
+     # data invariant at tests/data_invariant_instrumentation/params.move:16:9+16
+     # VC: data invariant does not hold at tests/data_invariant_instrumentation/params.move:16:9+16
+  6: assert Gt(select Test::S.y(select Test::R.s($t3)), 0)
+  7: label L1
+  8: return ()
+}
diff --git a/third_party/move/move-prover/bytecode-pipeline/tests/data_invariant_instrumentation/vector.v2_exp b/third_party/move/move-prover/bytecode-pipeline/tests/data_invariant_instrumentation/vector.v2_exp
new file mode 100644
index 0000000000000..ecfaa9fbfb0cb
--- /dev/null
+++ b/third_party/move/move-prover/bytecode-pipeline/tests/data_invariant_instrumentation/vector.v2_exp
@@ -0,0 +1,15 @@
+============ initial translation from Move ================
+
+[variant baseline]
+public fun Test::test($t0|_r: Test::R) {
+  0: return ()
+}
+
+============ after pipeline `data_invariant_instrumentation` ================
+
+[variant verification]
+public fun Test::test($t0|_r: Test::R) {
+  0: assume And(WellFormed($t0), forall $elem: vector<Test::S>: select Test::R.s($t0): forall $elem: Test::S: $elem: Gt(select Test::S.y($elem), 0))
+  1: label L1
+  2: return ()
+}
diff --git a/third_party/move/move-prover/bytecode-pipeline/tests/eliminate_imm_refs/basic_test.v2_exp b/third_party/move/move-prover/bytecode-pipeline/tests/eliminate_imm_refs/basic_test.v2_exp
new file mode 100644
index 0000000000000..c2090dd93003d
--- /dev/null
+++ b/third_party/move/move-prover/bytecode-pipeline/tests/eliminate_imm_refs/basic_test.v2_exp
@@ -0,0 +1,176 @@
+============ initial translation from Move ================
+
+[variant baseline]
+fun TestEliminateImmRefs::test1(): TestEliminateImmRefs::R {
+     var $t0|r: TestEliminateImmRefs::R
+     var $t1|x_ref: &mut u64
+     var $t2: u64
+     var $t3: TestEliminateImmRefs::R
+     var $t4: &mut TestEliminateImmRefs::R
+     var $t5: &mut u64
+     var $t6: u64
+     var $t7: &mut u64
+     var $t8: TestEliminateImmRefs::R
+  0: $t2 := 3
+  1: $t3 := pack TestEliminateImmRefs::R($t2)
+  2: $t0 := $t3
+  3: $t4 := borrow_local($t0)
+  4: $t5 := borrow_field<TestEliminateImmRefs::R>.x($t4)
+  5: $t1 := $t5
+  6: $t6 := 0
+  7: $t7 := move($t1)
+  8: write_ref($t7, $t6)
+  9: $t8 := move($t0)
+ 10: return $t8
+}
+
+
+[variant baseline]
+fun TestEliminateImmRefs::test2(): u64 {
+     var $t0|r: TestEliminateImmRefs::R
+     var $t1: u64
+     var $t2: TestEliminateImmRefs::R
+     var $t3: &TestEliminateImmRefs::R
+     var $t4: &u64
+     var $t5: u64
+  0: $t1 := 3
+  1: $t2 := pack TestEliminateImmRefs::R($t1)
+  2: $t0 := $t2
+  3: $t3 := borrow_local($t0)
+  4: $t4 := borrow_field<TestEliminateImmRefs::R>.x($t3)
+  5: $t5 := read_ref($t4)
+  6: return $t5
+}
+
+
+[variant baseline]
+fun TestEliminateImmRefs::test3($t0|r_ref: &TestEliminateImmRefs::R): u64 {
+     var $t1: &TestEliminateImmRefs::R
+     var $t2: &u64
+     var $t3: u64
+  0: $t1 := move($t0)
+  1: $t2 := borrow_field<TestEliminateImmRefs::R>.x($t1)
+  2: $t3 := read_ref($t2)
+  3: return $t3
+}
+
+
+[variant baseline]
+fun TestEliminateImmRefs::test4(): u64 {
+     var $t0|r: TestEliminateImmRefs::R
+     var $t1: u64
+     var $t2: TestEliminateImmRefs::R
+     var $t3: &TestEliminateImmRefs::R
+     var $t4: u64
+  0: $t1 := 3
+  1: $t2 := pack TestEliminateImmRefs::R($t1)
+  2: $t0 := $t2
+  3: $t3 := borrow_local($t0)
+  4: $t4 := TestEliminateImmRefs::test3($t3)
+  5: return $t4
+}
+
+
+[variant baseline]
+fun TestEliminateImmRefs::test5(): TestEliminateImmRefs::R {
+     var $t0|r: TestEliminateImmRefs::R
+     var $t1: u64
+     var $t2: TestEliminateImmRefs::R
+     var $t3: &TestEliminateImmRefs::R
+     var $t4: TestEliminateImmRefs::R
+  0: $t1 := 3
+  1: $t2 := pack TestEliminateImmRefs::R($t1)
+  2: $t0 := $t2
+  3: $t3 := borrow_local($t0)
+  4: drop($t3)
+  5: $t4 := move($t0)
+  6: return $t4
+}
+
+============ after pipeline `eliminate_imm_refs` ================
+
+[variant baseline]
+fun TestEliminateImmRefs::test1(): TestEliminateImmRefs::R {
+     var $t0|r: TestEliminateImmRefs::R
+     var $t1|x_ref: &mut u64
+     var $t2: u64
+     var $t3: TestEliminateImmRefs::R
+     var $t4: &mut TestEliminateImmRefs::R
+     var $t5: &mut u64
+     var $t6: u64
+     var $t7: &mut u64
+     var $t8: TestEliminateImmRefs::R
+  0: $t2 := 3
+  1: $t3 := pack TestEliminateImmRefs::R($t2)
+  2: $t0 := $t3
+  3: $t4 := borrow_local($t0)
+  4: $t5 := borrow_field<TestEliminateImmRefs::R>.x($t4)
+  5: $t1 := $t5
+  6: $t6 := 0
+  7: $t7 := move($t1)
+  8: write_ref($t7, $t6)
+  9: $t8 := move($t0)
+ 10: return $t8
+}
+
+
+[variant baseline]
+fun TestEliminateImmRefs::test2(): u64 {
+     var $t0|r: TestEliminateImmRefs::R
+     var $t1: u64
+     var $t2: TestEliminateImmRefs::R
+     var $t3: TestEliminateImmRefs::R
+     var $t4: u64
+     var $t5: u64
+  0: $t1 := 3
+  1: $t2 := pack TestEliminateImmRefs::R($t1)
+  2: $t0 := $t2
+  3: $t3 := copy($t0)
+  4: $t4 := get_field<TestEliminateImmRefs::R>.x($t3)
+  5: $t5 := move($t4)
+  6: return $t5
+}
+
+
+[variant baseline]
+fun TestEliminateImmRefs::test3($t0|r_ref: TestEliminateImmRefs::R): u64 {
+     var $t1: TestEliminateImmRefs::R
+     var $t2: u64
+     var $t3: u64
+  0: $t1 := move($t0)
+  1: $t2 := get_field<TestEliminateImmRefs::R>.x($t1)
+  2: $t3 := move($t2)
+  3: return $t3
+}
+
+
+[variant baseline]
+fun TestEliminateImmRefs::test4(): u64 {
+     var $t0|r: TestEliminateImmRefs::R
+     var $t1: u64
+     var $t2: TestEliminateImmRefs::R
+     var $t3: TestEliminateImmRefs::R
+     var $t4: u64
+  0: $t1 := 3
+  1: $t2 := pack TestEliminateImmRefs::R($t1)
+  2: $t0 := $t2
+  3: $t3 := copy($t0)
+  4: $t4 := TestEliminateImmRefs::test3($t3)
+  5: return $t4
+}
+
+
+[variant baseline]
+fun TestEliminateImmRefs::test5(): TestEliminateImmRefs::R {
+     var $t0|r: TestEliminateImmRefs::R
+     var $t1: u64
+     var $t2: TestEliminateImmRefs::R
+     var $t3: TestEliminateImmRefs::R
+     var $t4: TestEliminateImmRefs::R
+  0: $t1 := 3
+  1: $t2 := pack TestEliminateImmRefs::R($t1)
+  2: $t0 := $t2
+  3: $t3 := copy($t0)
+  4: $t4 := move($t0)
+  5: return $t4
+}
diff --git a/third_party/move/move-prover/bytecode-pipeline/tests/global_invariant_analysis/disable_in_body.v2_exp b/third_party/move/move-prover/bytecode-pipeline/tests/global_invariant_analysis/disable_in_body.v2_exp
new file mode 100644
index 0000000000000..9c89ce115cb80
--- /dev/null
+++ b/third_party/move/move-prover/bytecode-pipeline/tests/global_invariant_analysis/disable_in_body.v2_exp
@@ -0,0 +1,54 @@
+============ initial translation from Move ================
+
+[variant baseline]
+fun DisableInv::foo($t0|s: &signer) {
+     var $t1: &signer
+     var $t2: bool
+     var $t3: DisableInv::R2
+  0: $t1 := move($t0)
+  1: $t2 := false
+  2: $t3 := pack DisableInv::R2($t2)
+  3: move_to<DisableInv::R2>($t3, $t1)
+  4: return ()
+}
+
+============ after pipeline `global_invariant_analysis` ================
+
+[variant verification]
+fun DisableInv::foo($t0|s: signer) {
+     var $t1: bool
+     var $t2: DisableInv::R2
+     var $t3: num
+  0: $t1 := false
+  1: $t2 := pack DisableInv::R2($t1)
+  2: move_to<DisableInv::R2>($t2, $t0) on_abort goto 5 with $t3
+  3: label L1
+  4: return ()
+  5: label L2
+  6: abort($t3)
+}
+
+
+********* Result of global invariant instrumentation *********
+
+DisableInv::foo: [
+  entrypoint {
+    assume @0 = [
+      <> -> [
+        <>
+      ]
+    ]
+  }
+  2: move_to<DisableInv::R2>($t2, $t0) on_abort goto L2 with $t3 {}
+  exitpoint {
+    assert @0 = [
+      <> -> [
+        <>
+      ]
+    ]
+  }
+]
+
+********* Global invariants by ID *********
+
+@0 => invariant [suspendable] forall a: address where exists<R1>(a): exists<R2>(a);
diff --git a/third_party/move/move-prover/bytecode-pipeline/tests/global_invariant_analysis/mutual_inst.v2_exp b/third_party/move/move-prover/bytecode-pipeline/tests/global_invariant_analysis/mutual_inst.v2_exp
new file mode 100644
index 0000000000000..4c558e0ef0c59
--- /dev/null
+++ b/third_party/move/move-prover/bytecode-pipeline/tests/global_invariant_analysis/mutual_inst.v2_exp
@@ -0,0 +1,418 @@
+============ initial translation from Move ================
+
+[variant baseline]
+public fun S::publish_u64_bool($t0|account: signer, $t1|x: u64, $t2|y: bool) {
+     var $t3: &signer
+     var $t4: u64
+     var $t5: bool
+     var $t6: u8
+     var $t7: S::Storage<u64, bool>
+  0: $t3 := borrow_local($t0)
+  1: $t4 := move($t1)
+  2: $t5 := move($t2)
+  3: $t6 := 0
+  4: $t7 := pack S::Storage<u64, bool>($t4, $t5, $t6)
+  5: move_to<S::Storage<u64, bool>>($t7, $t3)
+  6: return ()
+}
+
+
+[variant baseline]
+public fun S::publish_u64_y<#0>($t0|account: signer, $t1|x: u64, $t2|y: #0) {
+     var $t3: &signer
+     var $t4: u64
+     var $t5: #0
+     var $t6: u8
+     var $t7: S::Storage<u64, #0>
+  0: $t3 := borrow_local($t0)
+  1: $t4 := move($t1)
+  2: $t5 := move($t2)
+  3: $t6 := 1
+  4: $t7 := pack S::Storage<u64, #0>($t4, $t5, $t6)
+  5: move_to<S::Storage<u64, #0>>($t7, $t3)
+  6: return ()
+}
+
+
+[variant baseline]
+public fun S::publish_x_bool<#0>($t0|account: signer, $t1|x: #0, $t2|y: bool) {
+     var $t3: &signer
+     var $t4: #0
+     var $t5: bool
+     var $t6: u8
+     var $t7: S::Storage<#0, bool>
+  0: $t3 := borrow_local($t0)
+  1: $t4 := move($t1)
+  2: $t5 := move($t2)
+  3: $t6 := 2
+  4: $t7 := pack S::Storage<#0, bool>($t4, $t5, $t6)
+  5: move_to<S::Storage<#0, bool>>($t7, $t3)
+  6: return ()
+}
+
+
+[variant baseline]
+public fun S::publish_x_y<#0, #1>($t0|account: signer, $t1|x: #0, $t2|y: #1) {
+     var $t3: &signer
+     var $t4: #0
+     var $t5: #1
+     var $t6: u8
+     var $t7: S::Storage<#0, #1>
+  0: $t3 := borrow_local($t0)
+  1: $t4 := move($t1)
+  2: $t5 := move($t2)
+  3: $t6 := 3
+  4: $t7 := pack S::Storage<#0, #1>($t4, $t5, $t6)
+  5: move_to<S::Storage<#0, #1>>($t7, $t3)
+  6: return ()
+}
+
+
+[variant baseline]
+public fun A::good($t0|account1: signer, $t1|account2: signer) {
+     var $t2: signer
+     var $t3: u64
+     var $t4: bool
+     var $t5: signer
+     var $t6: u64
+     var $t7: bool
+  0: $t2 := move($t0)
+  1: $t3 := 1
+  2: $t4 := true
+  3: S::publish_x_y<u64, bool>($t2, $t3, $t4)
+  4: $t5 := move($t1)
+  5: $t6 := 1
+  6: $t7 := true
+  7: S::publish_x_y<u64, bool>($t5, $t6, $t7)
+  8: return ()
+}
+
+============ after pipeline `global_invariant_analysis` ================
+
+[variant verification]
+public fun S::publish_u64_bool($t0|account: signer, $t1|x: u64, $t2|y: bool) {
+     var $t3: u8
+     var $t4: S::Storage<u64, bool>
+     var $t5: num
+  0: $t3 := 0
+  1: $t4 := pack S::Storage<u64, bool>($t1, $t2, $t3)
+  2: move_to<S::Storage<u64, bool>>($t4, $t0) on_abort goto 5 with $t5
+  3: label L1
+  4: return ()
+  5: label L2
+  6: abort($t5)
+}
+
+
+[variant verification]
+public fun S::publish_u64_y<#0>($t0|account: signer, $t1|x: u64, $t2|y: #0) {
+     var $t3: u8
+     var $t4: S::Storage<u64, #0>
+     var $t5: num
+  0: $t3 := 1
+  1: $t4 := pack S::Storage<u64, #0>($t1, $t2, $t3)
+  2: move_to<S::Storage<u64, #0>>($t4, $t0) on_abort goto 5 with $t5
+  3: label L1
+  4: return ()
+  5: label L2
+  6: abort($t5)
+}
+
+
+[variant verification]
+public fun S::publish_x_bool<#0>($t0|account: signer, $t1|x: #0, $t2|y: bool) {
+     var $t3: u8
+     var $t4: S::Storage<#0, bool>
+     var $t5: num
+  0: $t3 := 2
+  1: $t4 := pack S::Storage<#0, bool>($t1, $t2, $t3)
+  2: move_to<S::Storage<#0, bool>>($t4, $t0) on_abort goto 5 with $t5
+  3: label L1
+  4: return ()
+  5: label L2
+  6: abort($t5)
+}
+
+
+[variant baseline]
+public fun S::publish_x_y<#0, #1>($t0|account: signer, $t1|x: #0, $t2|y: #1) {
+     var $t3: u8
+     var $t4: S::Storage<#0, #1>
+     var $t5: num
+  0: $t3 := 3
+  1: $t4 := pack S::Storage<#0, #1>($t1, $t2, $t3)
+  2: move_to<S::Storage<#0, #1>>($t4, $t0) on_abort goto 5 with $t5
+  3: label L1
+  4: return ()
+  5: label L2
+  6: abort($t5)
+}
+
+
+[variant verification]
+public fun S::publish_x_y<#0, #1>($t0|account: signer, $t1|x: #0, $t2|y: #1) {
+     var $t3: u8
+     var $t4: S::Storage<#0, #1>
+     var $t5: num
+  0: $t3 := 3
+  1: $t4 := pack S::Storage<#0, #1>($t1, $t2, $t3)
+  2: move_to<S::Storage<#0, #1>>($t4, $t0) on_abort goto 5 with $t5
+  3: label L1
+  4: return ()
+  5: label L2
+  6: abort($t5)
+}
+
+
+[variant verification]
+public fun A::good($t0|account1: signer, $t1|account2: signer) {
+     var $t2: u64
+     var $t3: bool
+     var $t4: num
+     var $t5: u64
+     var $t6: bool
+  0: $t2 := 1
+  1: $t3 := true
+  2: S::publish_x_y<u64, bool>($t0, $t2, $t3) on_abort goto 8 with $t4
+  3: $t5 := 1
+  4: $t6 := true
+  5: S::publish_x_y<u64, bool>($t1, $t5, $t6) on_abort goto 8 with $t4
+  6: label L1
+  7: return ()
+  8: label L2
+  9: abort($t4)
+}
+
+
+********* Result of global invariant instrumentation *********
+
+S::publish_u64_bool: [
+  entrypoint {
+    assume @0 = [
+      <> -> [
+        <>
+      ]
+    ]
+    assume @1 = [
+      <> -> [
+        <bool>
+      ]
+    ]
+    assume @2 = [
+      <> -> [
+        <u64>
+      ]
+    ]
+    assume @3 = [
+      <> -> [
+        <u64, bool>
+      ]
+    ]
+  }
+  2: move_to<S::Storage<u64, bool>>($t4, $t0) on_abort goto L2 with $t5 {
+    assert @0 = [
+      <> -> [
+        <>
+      ]
+    ]
+    assert @1 = [
+      <> -> [
+        <bool>
+      ]
+    ]
+    assert @2 = [
+      <> -> [
+        <u64>
+      ]
+    ]
+    assert @3 = [
+      <> -> [
+        <u64, bool>
+      ]
+    ]
+  }
+  exitpoint {}
+]
+S::publish_u64_y: [
+  entrypoint {
+    assume @0 = [
+      <bool> -> [
+        <>
+      ]
+    ]
+    assume @1 = [
+      <#0> -> [
+        <#0>
+      ]
+    ]
+    assume @2 = [
+      <bool> -> [
+        <u64>
+      ]
+    ]
+    assume @3 = [
+      <#0> -> [
+        <u64, #0>
+      ]
+    ]
+  }
+  2: move_to<S::Storage<u64, #0>>($t4, $t0) on_abort goto L2 with $t5 {
+    assert @0 = [
+      <bool> -> [
+        <>
+      ]
+    ]
+    assert @1 = [
+      <#0> -> [
+        <#0>
+      ]
+    ]
+    assert @2 = [
+      <bool> -> [
+        <u64>
+      ]
+    ]
+    assert @3 = [
+      <#0> -> [
+        <u64, #0>
+      ]
+    ]
+  }
+  exitpoint {}
+]
+S::publish_x_bool: [
+  entrypoint {
+    assume @0 = [
+      <u64> -> [
+        <>
+      ]
+    ]
+    assume @1 = [
+      <u64> -> [
+        <bool>
+      ]
+    ]
+    assume @2 = [
+      <#0> -> [
+        <#0>
+      ]
+    ]
+    assume @3 = [
+      <#0> -> [
+        <#0, bool>
+      ]
+    ]
+  }
+  2: move_to<S::Storage<#0, bool>>($t4, $t0) on_abort goto L2 with $t5 {
+    assert @0 = [
+      <u64> -> [
+        <>
+      ]
+    ]
+    assert @1 = [
+      <u64> -> [
+        <bool>
+      ]
+    ]
+    assert @2 = [
+      <#0> -> [
+        <#0>
+      ]
+    ]
+    assert @3 = [
+      <#0> -> [
+        <#0, bool>
+      ]
+    ]
+  }
+  exitpoint {}
+]
+S::publish_x_y: [
+  entrypoint {
+    assume @0 = [
+      <u64, bool> -> [
+        <>
+      ]
+    ]
+    assume @1 = [
+      <u64, #1> -> [
+        <#1>
+      ]
+    ]
+    assume @2 = [
+      <#0, bool> -> [
+        <#0>
+      ]
+    ]
+    assume @3 = [
+      <#0, #1> -> [
+        <#0, #1>
+      ]
+    ]
+  }
+  2: move_to<S::Storage<#0, #1>>($t4, $t0) on_abort goto L2 with $t5 {
+    assert @0 = [
+      <u64, bool> -> [
+        <>
+      ]
+    ]
+    assert @1 = [
+      <u64, #1> -> [
+        <#1>
+      ]
+    ]
+    assert @2 = [
+      <#0, bool> -> [
+        <#0>
+      ]
+    ]
+    assert @3 = [
+      <#0, #1> -> [
+        <#0, #1>
+      ]
+    ]
+  }
+  exitpoint {}
+]
+A::good: [
+  entrypoint {
+    assume @0 = [
+      <> -> [
+        <>
+      ]
+    ]
+    assume @1 = [
+      <> -> [
+        <bool>
+      ]
+    ]
+    assume @2 = [
+      <> -> [
+        <u64>
+      ]
+    ]
+    assume @3 = [
+      <> -> [
+        <u64, bool>
+      ]
+    ]
+  }
+  2: S::publish_x_y<u64, bool>($t0, $t2, $t3) on_abort goto L2 with $t4 {}
+  5: S::publish_x_y<u64, bool>($t1, $t5, $t6) on_abort goto L2 with $t4 {}
+  exitpoint {}
+]
+
+********* Global invariants by ID *********
+
+@0 => invariant
+        exists<S::Storage<u64, bool>>(@0x22)
+            ==> global<S::Storage<u64, bool>>(@0x22).x == 1;
+@1 => invariant<Y>
+        exists<S::Storage<u64, Y>>(@0x23)
+            ==> global<S::Storage<u64, Y>>(@0x23).x > 0;
+@2 => invariant<X>
+        exists<S::Storage<X, bool>>(@0x24)
+            ==> global<S::Storage<X, bool>>(@0x24).y;
+@3 => invariant<X, Y>
+        (exists<S::Storage<X, Y>>(@0x25) && exists<S::Storage<X, Y>>(@0x26))
+            ==> global<S::Storage<X, Y>>(@0x25) == global<S::Storage<X, Y>>(@0x26);
diff --git a/third_party/move/move-prover/bytecode-pipeline/tests/global_invariant_analysis/uninst_type_param_in_inv.v2_exp b/third_party/move/move-prover/bytecode-pipeline/tests/global_invariant_analysis/uninst_type_param_in_inv.v2_exp
new file mode 100644
index 0000000000000..ef36c8e42fd0d
--- /dev/null
+++ b/third_party/move/move-prover/bytecode-pipeline/tests/global_invariant_analysis/uninst_type_param_in_inv.v2_exp
@@ -0,0 +1,116 @@
+============ initial translation from Move ================
+
+[variant baseline]
+fun Demo::f1($t0|addr: address) {
+     var $t1: address
+     var $t2: bool
+     var $t3: u8
+     var $t4: address
+     var $t5: &mut Demo::S1<bool>
+     var $t6: &mut u8
+     var $t7: address
+     var $t8: bool
+     var $t9: u8
+     var $t10: address
+     var $t11: &mut Demo::S1<u64>
+     var $t12: &mut u8
+  0: $t1 := copy($t0)
+  1: $t2 := exists<Demo::S1<bool>>($t1)
+  2: if ($t2) goto 3 else goto 10
+  3: label L1
+  4: $t3 := 0
+  5: $t4 := copy($t0)
+  6: $t5 := borrow_global<Demo::S1<bool>>($t4)
+  7: $t6 := borrow_field<Demo::S1<bool>>.v($t5)
+  8: write_ref($t6, $t3)
+  9: goto 10
+ 10: label L0
+ 11: $t7 := copy($t0)
+ 12: $t8 := exists<Demo::S1<u64>>($t7)
+ 13: if ($t8) goto 14 else goto 21
+ 14: label L3
+ 15: $t9 := 0
+ 16: $t10 := move($t0)
+ 17: $t11 := borrow_global<Demo::S1<u64>>($t10)
+ 18: $t12 := borrow_field<Demo::S1<u64>>.v($t11)
+ 19: write_ref($t12, $t9)
+ 20: goto 21
+ 21: label L2
+ 22: return ()
+}
+
+============ after pipeline `global_invariant_analysis` ================
+
+[variant verification]
+fun Demo::f1($t0|addr: address) {
+     var $t1: bool
+     var $t2: u8
+     var $t3: &mut Demo::S1<bool>
+     var $t4: num
+     var $t5: &mut u8
+     var $t6: bool
+     var $t7: u8
+     var $t8: &mut Demo::S1<u64>
+     var $t9: &mut u8
+  0: $t1 := exists<Demo::S1<bool>>($t0)
+  1: if ($t1) goto 2 else goto 9
+  2: label L1
+  3: $t2 := 0
+  4: $t3 := borrow_global<Demo::S1<bool>>($t0) on_abort goto 22 with $t4
+  5: $t5 := borrow_field<Demo::S1<bool>>.v($t3)
+  6: write_ref($t5, $t2)
+  7: write_back[Reference($t3).v (u8)]($t5)
+  8: write_back[Demo::S1<bool>@]($t3)
+  9: label L0
+ 10: $t6 := exists<Demo::S1<u64>>($t0)
+ 11: if ($t6) goto 12 else goto 19
+ 12: label L3
+ 13: $t7 := 0
+ 14: $t8 := borrow_global<Demo::S1<u64>>($t0) on_abort goto 22 with $t4
+ 15: $t9 := borrow_field<Demo::S1<u64>>.v($t8)
+ 16: write_ref($t9, $t7)
+ 17: write_back[Reference($t8).v (u8)]($t9)
+ 18: write_back[Demo::S1<u64>@]($t8)
+ 19: label L2
+ 20: label L4
+ 21: return ()
+ 22: label L5
+ 23: abort($t4)
+}
+
+
+********* Result of global invariant instrumentation *********
+
+Demo::f1: [
+  entrypoint {
+    assume @0 = [
+      <> -> [
+        <bool, #0>
+        <u64, #1>
+      ]
+    ]
+  }
+  0: $t1 := exists<Demo::S1<bool>>($t0) {}
+  8: write_back[Demo::S1<bool>@]($t3) {
+    assert @0 = [
+      <> -> [
+        <bool, #0>
+      ]
+    ]
+  }
+  10: $t6 := exists<Demo::S1<u64>>($t0) {}
+  18: write_back[Demo::S1<u64>@]($t8) {
+    assert @0 = [
+      <> -> [
+        <u64, #1>
+      ]
+    ]
+  }
+  exitpoint {}
+]
+
+********* Global invariants by ID *********
+
+@0 => invariant<T1, T2>
+            (exists<S1<T1>>(@0x2) && exists<S2<T2>>(@0x2))
+                ==> global<S1<T1>>(@0x2).v == 0;
diff --git a/third_party/move/move-prover/bytecode-pipeline/tests/global_invariant_instrumentation/borrow.v2_exp b/third_party/move/move-prover/bytecode-pipeline/tests/global_invariant_instrumentation/borrow.v2_exp
new file mode 100644
index 0000000000000..1128c066e463a
--- /dev/null
+++ b/third_party/move/move-prover/bytecode-pipeline/tests/global_invariant_instrumentation/borrow.v2_exp
@@ -0,0 +1,57 @@
+============ initial translation from Move ================
+
+[variant baseline]
+public fun Test::borrow($t0|a: address) {
+     var $t1|r: &mut Test::R
+     var $t2: address
+     var $t3: &mut Test::R
+     var $t4: &mut Test::R
+     var $t5: &u64
+     var $t6: u64
+     var $t7: u64
+     var $t8: u64
+     var $t9: &mut Test::R
+     var $t10: &mut u64
+  0: $t2 := move($t0)
+  1: $t3 := borrow_global<Test::R>($t2)
+  2: $t1 := $t3
+  3: $t4 := copy($t1)
+  4: $t5 := borrow_field<Test::R>.x($t4)
+  5: $t6 := read_ref($t5)
+  6: $t7 := 1
+  7: $t8 := +($t6, $t7)
+  8: $t9 := move($t1)
+  9: $t10 := borrow_field<Test::R>.x($t9)
+ 10: write_ref($t10, $t8)
+ 11: return ()
+}
+
+============ after pipeline `global_invariant_instrumentation` ================
+
+[variant verification]
+public fun Test::borrow($t0|a: address) {
+     var $t1|r: &mut Test::R
+     var $t2: &mut Test::R
+     var $t3: num
+     var $t4: u64
+     var $t5: u64
+     var $t6: u64
+     var $t7: &mut u64
+     # global invariant at tests/global_invariant_instrumentation/borrow.move:7:9+57
+  0: assume forall a: address: TypeDomain<address>(): Gt(select Test::R.x<Test::R>(global<Test::R>(a)), 0)
+  1: $t2 := borrow_global<Test::R>($t0) on_abort goto 12 with $t3
+  2: $t4 := get_field<Test::R>.x($t2)
+  3: $t5 := 1
+  4: $t6 := +($t4, $t5) on_abort goto 12 with $t3
+  5: $t7 := borrow_field<Test::R>.x($t2)
+  6: write_ref($t7, $t6)
+  7: write_back[Reference($t2).x (u64)]($t7)
+  8: write_back[Test::R@]($t2)
+     # global invariant at tests/global_invariant_instrumentation/borrow.move:7:9+57
+     # VC: global memory invariant does not hold at tests/global_invariant_instrumentation/borrow.move:7:9+57
+  9: assert forall a: address: TypeDomain<address>(): Gt(select Test::R.x<Test::R>(global<Test::R>(a)), 0)
+ 10: label L1
+ 11: return ()
+ 12: label L2
+ 13: abort($t3)
+}
diff --git a/third_party/move/move-prover/bytecode-pipeline/tests/global_invariant_instrumentation/move.v2_exp b/third_party/move/move-prover/bytecode-pipeline/tests/global_invariant_instrumentation/move.v2_exp
new file mode 100644
index 0000000000000..47e7f43c70a29
--- /dev/null
+++ b/third_party/move/move-prover/bytecode-pipeline/tests/global_invariant_instrumentation/move.v2_exp
@@ -0,0 +1,61 @@
+============ initial translation from Move ================
+
+[variant baseline]
+public fun Test::publish($t0|s: &signer) {
+     var $t1: &signer
+     var $t2: u64
+     var $t3: Test::R
+  0: $t1 := move($t0)
+  1: $t2 := 1
+  2: $t3 := pack Test::R($t2)
+  3: move_to<Test::R>($t3, $t1)
+  4: return ()
+}
+
+
+[variant baseline]
+public fun Test::remove($t0|a: address): Test::R {
+     var $t1: address
+     var $t2: Test::R
+  0: $t1 := move($t0)
+  1: $t2 := move_from<Test::R>($t1)
+  2: return $t2
+}
+
+============ after pipeline `global_invariant_instrumentation` ================
+
+[variant verification]
+public fun Test::publish($t0|s: signer) {
+     var $t1: u64
+     var $t2: Test::R
+     var $t3: num
+     # global invariant at tests/global_invariant_instrumentation/move.move:7:9+57
+  0: assume forall a: address: TypeDomain<address>(): Gt(select Test::R.x<Test::R>(global<Test::R>(a)), 0)
+  1: $t1 := 1
+  2: $t2 := pack Test::R($t1)
+  3: move_to<Test::R>($t2, $t0) on_abort goto 7 with $t3
+     # global invariant at tests/global_invariant_instrumentation/move.move:7:9+57
+     # VC: global memory invariant does not hold at tests/global_invariant_instrumentation/move.move:7:9+57
+  4: assert forall a: address: TypeDomain<address>(): Gt(select Test::R.x<Test::R>(global<Test::R>(a)), 0)
+  5: label L1
+  6: return ()
+  7: label L2
+  8: abort($t3)
+}
+
+
+[variant verification]
+public fun Test::remove($t0|a: address): Test::R {
+     var $t1: Test::R
+     var $t2: num
+     # global invariant at tests/global_invariant_instrumentation/move.move:7:9+57
+  0: assume forall a: address: TypeDomain<address>(): Gt(select Test::R.x<Test::R>(global<Test::R>(a)), 0)
+  1: $t1 := move_from<Test::R>($t0) on_abort goto 5 with $t2
+     # global invariant at tests/global_invariant_instrumentation/move.move:7:9+57
+     # VC: global memory invariant does not hold at tests/global_invariant_instrumentation/move.move:7:9+57
+  2: assert forall a: address: TypeDomain<address>(): Gt(select Test::R.x<Test::R>(global<Test::R>(a)), 0)
+  3: label L1
+  4: return $t1
+  5: label L2
+  6: abort($t2)
+}
diff --git a/third_party/move/move-prover/bytecode-pipeline/tests/global_invariant_instrumentation/update.v2_exp b/third_party/move/move-prover/bytecode-pipeline/tests/global_invariant_instrumentation/update.v2_exp
new file mode 100644
index 0000000000000..be2dd70798ead
--- /dev/null
+++ b/third_party/move/move-prover/bytecode-pipeline/tests/global_invariant_instrumentation/update.v2_exp
@@ -0,0 +1,57 @@
+============ initial translation from Move ================
+
+[variant baseline]
+public fun Test::incr($t0|a: address) {
+     var $t1|r: &mut Test::R
+     var $t2: address
+     var $t3: &mut Test::R
+     var $t4: &mut Test::R
+     var $t5: &u64
+     var $t6: u64
+     var $t7: u64
+     var $t8: u64
+     var $t9: &mut Test::R
+     var $t10: &mut u64
+  0: $t2 := move($t0)
+  1: $t3 := borrow_global<Test::R>($t2)
+  2: $t1 := $t3
+  3: $t4 := copy($t1)
+  4: $t5 := borrow_field<Test::R>.x($t4)
+  5: $t6 := read_ref($t5)
+  6: $t7 := 1
+  7: $t8 := +($t6, $t7)
+  8: $t9 := move($t1)
+  9: $t10 := borrow_field<Test::R>.x($t9)
+ 10: write_ref($t10, $t8)
+ 11: return ()
+}
+
+============ after pipeline `global_invariant_instrumentation` ================
+
+[variant verification]
+public fun Test::incr($t0|a: address) {
+     var $t1|r: &mut Test::R
+     var $t2: &mut Test::R
+     var $t3: num
+     var $t4: u64
+     var $t5: u64
+     var $t6: u64
+     var $t7: &mut u64
+  0: $t2 := borrow_global<Test::R>($t0) on_abort goto 12 with $t3
+  1: $t4 := get_field<Test::R>.x($t2)
+  2: $t5 := 1
+  3: $t6 := +($t4, $t5) on_abort goto 12 with $t3
+  4: $t7 := borrow_field<Test::R>.x($t2)
+  5: write_ref($t7, $t6)
+  6: write_back[Reference($t2).x (u64)]($t7)
+     # state save for global update invariants
+  7: @1 := save_mem(Test::R)
+  8: write_back[Test::R@]($t2)
+     # global invariant at tests/global_invariant_instrumentation/update.move:7:9+82
+     # VC: global memory invariant does not hold at tests/global_invariant_instrumentation/update.move:7:9+82
+  9: assert forall a: address: TypeDomain<address>(): Lt(select Test::R.x<Test::R>(global[@1]<Test::R>(a)), select Test::R.x<Test::R>(global<Test::R>(a)))
+ 10: label L1
+ 11: return ()
+ 12: label L2
+ 13: abort($t3)
+}
diff --git a/third_party/move/move-prover/bytecode-pipeline/tests/memory_instr/basic_test.v2_exp b/third_party/move/move-prover/bytecode-pipeline/tests/memory_instr/basic_test.v2_exp
new file mode 100644
index 0000000000000..0ad8278a86014
--- /dev/null
+++ b/third_party/move/move-prover/bytecode-pipeline/tests/memory_instr/basic_test.v2_exp
@@ -0,0 +1,516 @@
+============ initial translation from Move ================
+
+[variant baseline]
+fun TestPackref::test1(): TestPackref::R {
+     var $t0|r: TestPackref::R
+     var $t1|x_ref: &mut u64
+     var $t2: u64
+     var $t3: TestPackref::R
+     var $t4: &mut TestPackref::R
+     var $t5: &mut u64
+     var $t6: u64
+     var $t7: &mut u64
+     var $t8: TestPackref::R
+  0: $t2 := 3
+  1: $t3 := pack TestPackref::R($t2)
+  2: $t0 := $t3
+  3: $t4 := borrow_local($t0)
+  4: $t5 := borrow_field<TestPackref::R>.x($t4)
+  5: $t1 := $t5
+  6: $t6 := 0
+  7: $t7 := move($t1)
+  8: write_ref($t7, $t6)
+  9: $t8 := move($t0)
+ 10: return $t8
+}
+
+
+[variant baseline]
+fun TestPackref::test2($t0|x_ref: &mut u64, $t1|v: u64) {
+     var $t2: u64
+     var $t3: &mut u64
+  0: $t2 := move($t1)
+  1: $t3 := move($t0)
+  2: write_ref($t3, $t2)
+  3: return ()
+}
+
+
+[variant baseline]
+public fun TestPackref::test3($t0|r_ref: &mut TestPackref::R, $t1|v: u64) {
+     var $t2: &mut TestPackref::R
+     var $t3: &mut u64
+     var $t4: u64
+  0: $t2 := move($t0)
+  1: $t3 := borrow_field<TestPackref::R>.x($t2)
+  2: $t4 := move($t1)
+  3: TestPackref::test2($t3, $t4)
+  4: return ()
+}
+
+
+[variant baseline]
+fun TestPackref::test4(): TestPackref::R {
+     var $t0|r: TestPackref::R
+     var $t1: u64
+     var $t2: TestPackref::R
+     var $t3: &mut TestPackref::R
+     var $t4: u64
+     var $t5: TestPackref::R
+  0: $t1 := 3
+  1: $t2 := pack TestPackref::R($t1)
+  2: $t0 := $t2
+  3: $t3 := borrow_local($t0)
+  4: $t4 := 0
+  5: TestPackref::test3($t3, $t4)
+  6: $t5 := move($t0)
+  7: return $t5
+}
+
+
+[variant baseline]
+public fun TestPackref::test5($t0|r_ref: &mut TestPackref::R): &mut u64 {
+     var $t1: &mut TestPackref::R
+     var $t2: &mut u64
+  0: $t1 := move($t0)
+  1: $t2 := borrow_field<TestPackref::R>.x($t1)
+  2: return $t2
+}
+
+
+[variant baseline]
+fun TestPackref::test6(): TestPackref::R {
+     var $t0|r: TestPackref::R
+     var $t1: u64
+     var $t2: TestPackref::R
+     var $t3: &mut TestPackref::R
+     var $t4: &mut u64
+     var $t5: u64
+     var $t6: TestPackref::R
+  0: $t1 := 3
+  1: $t2 := pack TestPackref::R($t1)
+  2: $t0 := $t2
+  3: $t3 := borrow_local($t0)
+  4: $t4 := TestPackref::test5($t3)
+  5: $t5 := 0
+  6: TestPackref::test2($t4, $t5)
+  7: $t6 := move($t0)
+  8: return $t6
+}
+
+
+[variant baseline]
+fun TestPackref::test7($t0|b: bool) {
+     var $t1|r1: TestPackref::R
+     var $t2|r2: TestPackref::R
+     var $t3|r_ref: &mut TestPackref::R
+     var $t4: u64
+     var $t5: TestPackref::R
+     var $t6: u64
+     var $t7: TestPackref::R
+     var $t8: &mut TestPackref::R
+     var $t9: bool
+     var $t10: &mut TestPackref::R
+     var $t11: &mut TestPackref::R
+     var $t12: &mut TestPackref::R
+     var $t13: u64
+  0: $t4 := 3
+  1: $t5 := pack TestPackref::R($t4)
+  2: $t1 := $t5
+  3: $t6 := 4
+  4: $t7 := pack TestPackref::R($t6)
+  5: $t2 := $t7
+  6: $t8 := borrow_local($t1)
+  7: $t3 := $t8
+  8: $t9 := move($t0)
+  9: if ($t9) goto 10 else goto 16
+ 10: label L1
+ 11: $t10 := move($t3)
+ 12: drop($t10)
+ 13: $t11 := borrow_local($t2)
+ 14: $t3 := $t11
+ 15: goto 16
+ 16: label L0
+ 17: $t12 := move($t3)
+ 18: $t13 := 0
+ 19: TestPackref::test3($t12, $t13)
+ 20: return ()
+}
+
+
+[variant baseline]
+fun TestPackref::test8($t0|b: bool, $t1|n: u64, $t2|r_ref: &mut TestPackref::R) {
+     var $t3|r1: TestPackref::R
+     var $t4|r2: TestPackref::R
+     var $t5|t_ref: &mut TestPackref::R
+     var $t6: u64
+     var $t7: TestPackref::R
+     var $t8: u64
+     var $t9: TestPackref::R
+     var $t10: &mut TestPackref::R
+     var $t11: u64
+     var $t12: u64
+     var $t13: bool
+     var $t14: &mut TestPackref::R
+     var $t15: u64
+     var $t16: u64
+     var $t17: u64
+     var $t18: u64
+     var $t19: bool
+     var $t20: &mut TestPackref::R
+     var $t21: &mut TestPackref::R
+     var $t22: u64
+     var $t23: u64
+     var $t24: u64
+     var $t25: bool
+     var $t26: &mut TestPackref::R
+     var $t27: &mut TestPackref::R
+     var $t28: u64
+     var $t29: &mut TestPackref::R
+     var $t30: &mut TestPackref::R
+     var $t31: u64
+  0: $t6 := 3
+  1: $t7 := pack TestPackref::R($t6)
+  2: $t3 := $t7
+  3: $t8 := 4
+  4: $t9 := pack TestPackref::R($t8)
+  5: $t4 := $t9
+  6: $t10 := borrow_local($t4)
+  7: $t5 := $t10
+  8: goto 9
+  9: label L6
+ 10: $t11 := 0
+ 11: $t12 := copy($t1)
+ 12: $t13 := <($t11, $t12)
+ 13: if ($t13) goto 14 else goto 39
+ 14: label L1
+ 15: goto 16
+ 16: label L2
+ 17: $t14 := move($t5)
+ 18: drop($t14)
+ 19: $t15 := copy($t1)
+ 20: $t16 := 2
+ 21: $t17 := /($t15, $t16)
+ 22: $t18 := 0
+ 23: $t19 := ==($t17, $t18)
+ 24: if ($t19) goto 25 else goto 29
+ 25: label L4
+ 26: $t20 := borrow_local($t3)
+ 27: $t5 := $t20
+ 28: goto 33
+ 29: label L3
+ 30: $t21 := borrow_local($t4)
+ 31: $t5 := $t21
+ 32: goto 33
+ 33: label L5
+ 34: $t22 := move($t1)
+ 35: $t23 := 1
+ 36: $t24 := -($t22, $t23)
+ 37: $t1 := $t24
+ 38: goto 9
+ 39: label L0
+ 40: $t25 := move($t0)
+ 41: if ($t25) goto 42 else goto 49
+ 42: label L8
+ 43: $t26 := move($t5)
+ 44: drop($t26)
+ 45: $t27 := move($t2)
+ 46: $t28 := 0
+ 47: TestPackref::test3($t27, $t28)
+ 48: goto 56
+ 49: label L7
+ 50: $t29 := move($t2)
+ 51: drop($t29)
+ 52: $t30 := move($t5)
+ 53: $t31 := 0
+ 54: TestPackref::test3($t30, $t31)
+ 55: goto 56
+ 56: label L9
+ 57: return ()
+}
+
+============ after pipeline `memory_instr` ================
+
+[variant baseline]
+fun TestPackref::test1(): TestPackref::R {
+     var $t0|r: TestPackref::R
+     var $t1|x_ref: &mut u64 [unused]
+     var $t2: u64
+     var $t3: &mut TestPackref::R
+     var $t4: &mut u64
+     var $t5: u64
+     var $t6: TestPackref::R
+  0: $t2 := 3
+  1: $t0 := pack TestPackref::R($t2)
+  2: $t3 := borrow_local($t0)
+  3: $t4 := borrow_field<TestPackref::R>.x($t3)
+  4: $t5 := 0
+  5: write_ref($t4, $t5)
+  6: write_back[Reference($t3).x (u64)]($t4)
+  7: write_back[LocalRoot($t0)@]($t3)
+  8: trace_local[r]($t0)
+  9: $t6 := move($t0)
+ 10: return $t6
+}
+
+
+[variant baseline]
+fun TestPackref::test2($t0|x_ref: &mut u64, $t1|v: u64) {
+  0: write_ref($t0, $t1)
+  1: trace_local[x_ref]($t0)
+  2: return ()
+}
+
+
+[variant baseline]
+public fun TestPackref::test3($t0|r_ref: &mut TestPackref::R, $t1|v: u64) {
+     var $t2: &mut u64
+  0: $t2 := borrow_field<TestPackref::R>.x($t0)
+  1: TestPackref::test2($t2, $t1)
+  2: write_back[Reference($t0).x (u64)]($t2)
+  3: trace_local[r_ref]($t0)
+  4: trace_local[r_ref]($t0)
+  5: return ()
+}
+
+
+[variant baseline]
+fun TestPackref::test4(): TestPackref::R {
+     var $t0|r: TestPackref::R
+     var $t1: u64
+     var $t2: &mut TestPackref::R
+     var $t3: u64
+     var $t4: TestPackref::R
+  0: $t1 := 3
+  1: $t0 := pack TestPackref::R($t1)
+  2: $t2 := borrow_local($t0)
+  3: $t3 := 0
+  4: TestPackref::test3($t2, $t3)
+  5: write_back[LocalRoot($t0)@]($t2)
+  6: trace_local[r]($t0)
+  7: $t4 := move($t0)
+  8: return $t4
+}
+
+
+[variant baseline]
+public fun TestPackref::test5($t0|r_ref: &mut TestPackref::R): &mut u64 {
+     var $t1: &mut u64
+  0: $t1 := borrow_field<TestPackref::R>.x($t0)
+  1: trace_local[r_ref]($t0)
+  2: write_back[Reference($t0).x (u64)]($t1)
+  3: trace_local[r_ref]($t0)
+  4: return $t1
+}
+
+
+[variant baseline]
+fun TestPackref::test6(): TestPackref::R {
+     var $t0|r: TestPackref::R
+     var $t1: u64
+     var $t2: &mut TestPackref::R
+     var $t3: &mut u64
+     var $t4: u64
+     var $t5: TestPackref::R
+  0: $t1 := 3
+  1: $t0 := pack TestPackref::R($t1)
+  2: $t2 := borrow_local($t0)
+  3: $t3 := TestPackref::test5($t2)
+  4: $t4 := 0
+  5: TestPackref::test2($t3, $t4)
+  6: write_back[Reference($t2).x (u64)]($t3)
+  7: write_back[LocalRoot($t0)@]($t2)
+  8: trace_local[r]($t0)
+  9: $t5 := move($t0)
+ 10: return $t5
+}
+
+
+[variant baseline]
+fun TestPackref::test7($t0|b: bool) {
+     var $t1|r1: TestPackref::R
+     var $t2|r2: TestPackref::R
+     var $t3|r_ref: &mut TestPackref::R
+     var $t4: u64
+     var $t5: u64
+     var $t6: &mut TestPackref::R
+     var $t7: &mut TestPackref::R
+     var $t8: u64
+     var $t9: bool
+     var $t10: bool
+  0: $t4 := 3
+  1: $t1 := pack TestPackref::R($t4)
+  2: $t5 := 4
+  3: $t2 := pack TestPackref::R($t5)
+  4: $t6 := borrow_local($t1)
+  5: $t3 := $t6
+  6: if ($t0) goto 31 else goto 35
+  7: label L1
+  8: write_back[LocalRoot($t1)@]($t6)
+  9: trace_local[r1]($t1)
+ 10: drop($t6)
+ 11: $t7 := borrow_local($t2)
+ 12: $t3 := $t7
+ 13: label L0
+ 14: $t8 := 0
+ 15: TestPackref::test3($t3, $t8)
+ 16: $t9 := is_parent[Reference($t6)@]($t3)
+ 17: if ($t9) goto 18 else goto 22
+ 18: label L4
+ 19: write_back[Reference($t6)@]($t3)
+ 20: write_back[LocalRoot($t1)@]($t6)
+ 21: trace_local[r1]($t1)
+ 22: label L5
+ 23: $t10 := is_parent[Reference($t7)@]($t3)
+ 24: if ($t10) goto 25 else goto 29
+ 25: label L6
+ 26: write_back[Reference($t7)@]($t3)
+ 27: write_back[LocalRoot($t2)@]($t7)
+ 28: trace_local[r2]($t2)
+ 29: label L7
+ 30: return ()
+ 31: label L2
+ 32: write_back[Reference($t6)@]($t3)
+ 33: drop($t3)
+ 34: goto 7
+ 35: label L3
+ 36: drop($t6)
+ 37: goto 13
+}
+
+
+[variant baseline]
+fun TestPackref::test8($t0|b: bool, $t1|n: u64, $t2|r_ref: &mut TestPackref::R) {
+     var $t3|r1: TestPackref::R
+     var $t4|r2: TestPackref::R
+     var $t5|t_ref: &mut TestPackref::R
+     var $t6: u64
+     var $t7: u64
+     var $t8: &mut TestPackref::R
+     var $t9: u64
+     var $t10: bool
+     var $t11: u64
+     var $t12: u64
+     var $t13: u64
+     var $t14: bool
+     var $t15: &mut TestPackref::R
+     var $t16: &mut TestPackref::R
+     var $t17: u64
+     var $t18: u64
+     var $t19: u64
+     var $t20: bool
+     var $t21: bool
+     var $t22: bool
+     var $t23: bool
+     var $t24: bool
+     var $t25: bool
+     var $t26: bool
+     var $t27: bool
+     var $t28: bool
+  0: $t6 := 3
+  1: $t3 := pack TestPackref::R($t6)
+  2: $t7 := 4
+  3: $t4 := pack TestPackref::R($t7)
+  4: $t8 := borrow_local($t4)
+  5: $t5 := $t8
+  6: label L6
+  7: $t9 := 0
+  8: $t10 := <($t9, $t1)
+  9: if ($t10) goto 10 else goto 50
+ 10: label L1
+ 11: label L2
+ 12: $t20 := is_parent[Reference($t8)@]($t5)
+ 13: if ($t20) goto 14 else goto 18
+ 14: label L10
+ 15: write_back[Reference($t8)@]($t5)
+ 16: write_back[LocalRoot($t4)@]($t8)
+ 17: trace_local[r2]($t4)
+ 18: label L11
+ 19: $t21 := is_parent[Reference($t15)@]($t5)
+ 20: if ($t21) goto 21 else goto 25
+ 21: label L12
+ 22: write_back[Reference($t15)@]($t5)
+ 23: write_back[LocalRoot($t3)@]($t15)
+ 24: trace_local[r1]($t3)
+ 25: label L13
+ 26: $t22 := is_parent[Reference($t16)@]($t5)
+ 27: if ($t22) goto 28 else goto 32
+ 28: label L14
+ 29: write_back[Reference($t16)@]($t5)
+ 30: write_back[LocalRoot($t4)@]($t16)
+ 31: trace_local[r2]($t4)
+ 32: label L15
+ 33: drop($t5)
+ 34: $t11 := 2
+ 35: $t12 := /($t1, $t11)
+ 36: $t13 := 0
+ 37: $t14 := ==($t12, $t13)
+ 38: if ($t14) goto 39 else goto 43
+ 39: label L4
+ 40: $t15 := borrow_local($t3)
+ 41: $t5 := $t15
+ 42: goto 46
+ 43: label L3
+ 44: $t16 := borrow_local($t4)
+ 45: $t5 := $t16
+ 46: label L5
+ 47: $t17 := 1
+ 48: $t1 := -($t1, $t17)
+ 49: goto 6
+ 50: label L0
+ 51: if ($t0) goto 52 else goto 78
+ 52: label L8
+ 53: $t23 := is_parent[Reference($t8)@]($t5)
+ 54: if ($t23) goto 55 else goto 59
+ 55: label L16
+ 56: write_back[Reference($t8)@]($t5)
+ 57: write_back[LocalRoot($t4)@]($t8)
+ 58: trace_local[r2]($t4)
+ 59: label L17
+ 60: $t24 := is_parent[Reference($t15)@]($t5)
+ 61: if ($t24) goto 62 else goto 66
+ 62: label L18
+ 63: write_back[Reference($t15)@]($t5)
+ 64: write_back[LocalRoot($t3)@]($t15)
+ 65: trace_local[r1]($t3)
+ 66: label L19
+ 67: $t25 := is_parent[Reference($t16)@]($t5)
+ 68: if ($t25) goto 69 else goto 73
+ 69: label L20
+ 70: write_back[Reference($t16)@]($t5)
+ 71: write_back[LocalRoot($t4)@]($t16)
+ 72: trace_local[r2]($t4)
+ 73: label L21
+ 74: drop($t5)
+ 75: $t18 := 0
+ 76: TestPackref::test3($t2, $t18)
+ 77: goto 103
+ 78: label L7
+ 79: drop($t2)
+ 80: $t19 := 0
+ 81: TestPackref::test3($t5, $t19)
+ 82: $t26 := is_parent[Reference($t8)@]($t5)
+ 83: if ($t26) goto 84 else goto 88
+ 84: label L22
+ 85: write_back[Reference($t8)@]($t5)
+ 86: write_back[LocalRoot($t4)@]($t8)
+ 87: trace_local[r2]($t4)
+ 88: label L23
+ 89: $t27 := is_parent[Reference($t15)@]($t5)
+ 90: if ($t27) goto 91 else goto 95
+ 91: label L24
+ 92: write_back[Reference($t15)@]($t5)
+ 93: write_back[LocalRoot($t3)@]($t15)
+ 94: trace_local[r1]($t3)
+ 95: label L25
+ 96: $t28 := is_parent[Reference($t16)@]($t5)
+ 97: if ($t28) goto 98 else goto 102
+ 98: label L26
+ 99: write_back[Reference($t16)@]($t5)
+100: write_back[LocalRoot($t4)@]($t16)
+101: trace_local[r2]($t4)
+102: label L27
+103: label L9
+104: trace_local[r_ref]($t2)
+105: return ()
+}
diff --git a/third_party/move/move-prover/bytecode-pipeline/tests/memory_instr/mut_ref.v2_exp b/third_party/move/move-prover/bytecode-pipeline/tests/memory_instr/mut_ref.v2_exp
new file mode 100644
index 0000000000000..89d52775106cb
--- /dev/null
+++ b/third_party/move/move-prover/bytecode-pipeline/tests/memory_instr/mut_ref.v2_exp
@@ -0,0 +1,495 @@
+============ initial translation from Move ================
+
+[variant baseline]
+public fun TestMutRefs::data_invariant($t0|_x: &mut TestMutRefs::T) {
+  0: return ()
+}
+
+
+[variant baseline]
+public fun TestMutRefs::decrement_invalid($t0|x: &mut TestMutRefs::T) {
+     var $t1|r: &mut TestMutRefs::TSum
+     var $t2: &mut TestMutRefs::T
+     var $t3: &u64
+     var $t4: u64
+     var $t5: u64
+     var $t6: u64
+     var $t7: &mut TestMutRefs::T
+     var $t8: &mut u64
+     var $t9: address
+     var $t10: &mut TestMutRefs::TSum
+     var $t11: &mut TestMutRefs::TSum
+     var $t12: &u64
+     var $t13: u64
+     var $t14: u64
+     var $t15: u64
+     var $t16: &mut TestMutRefs::TSum
+     var $t17: &mut u64
+  0: $t2 := copy($t0)
+  1: $t3 := borrow_field<TestMutRefs::T>.value($t2)
+  2: $t4 := read_ref($t3)
+  3: $t5 := 1
+  4: $t6 := -($t4, $t5)
+  5: $t7 := move($t0)
+  6: $t8 := borrow_field<TestMutRefs::T>.value($t7)
+  7: write_ref($t8, $t6)
+  8: $t9 := 0x0
+  9: $t10 := borrow_global<TestMutRefs::TSum>($t9)
+ 10: $t1 := $t10
+ 11: $t11 := copy($t1)
+ 12: $t12 := borrow_field<TestMutRefs::TSum>.sum($t11)
+ 13: $t13 := read_ref($t12)
+ 14: $t14 := 1
+ 15: $t15 := -($t13, $t14)
+ 16: $t16 := move($t1)
+ 17: $t17 := borrow_field<TestMutRefs::TSum>.sum($t16)
+ 18: write_ref($t17, $t15)
+ 19: return ()
+}
+
+
+[variant baseline]
+public fun TestMutRefs::delete($t0|x: TestMutRefs::T) {
+     var $t1|r: &mut TestMutRefs::TSum
+     var $t2|v: u64
+     var $t3: address
+     var $t4: &mut TestMutRefs::TSum
+     var $t5: TestMutRefs::T
+     var $t6: u64
+     var $t7: &mut TestMutRefs::TSum
+     var $t8: &u64
+     var $t9: u64
+     var $t10: u64
+     var $t11: u64
+     var $t12: &mut TestMutRefs::TSum
+     var $t13: &mut u64
+  0: $t3 := 0x0
+  1: $t4 := borrow_global<TestMutRefs::TSum>($t3)
+  2: $t1 := $t4
+  3: $t5 := move($t0)
+  4: $t6 := unpack TestMutRefs::T($t5)
+  5: $t2 := $t6
+  6: $t7 := copy($t1)
+  7: $t8 := borrow_field<TestMutRefs::TSum>.sum($t7)
+  8: $t9 := read_ref($t8)
+  9: $t10 := move($t2)
+ 10: $t11 := -($t9, $t10)
+ 11: $t12 := move($t1)
+ 12: $t13 := borrow_field<TestMutRefs::TSum>.sum($t12)
+ 13: write_ref($t13, $t11)
+ 14: return ()
+}
+
+
+[variant baseline]
+public fun TestMutRefs::increment($t0|x: &mut TestMutRefs::T) {
+     var $t1|r: &mut TestMutRefs::TSum
+     var $t2: &mut TestMutRefs::T
+     var $t3: &u64
+     var $t4: u64
+     var $t5: u64
+     var $t6: u64
+     var $t7: &mut TestMutRefs::T
+     var $t8: &mut u64
+     var $t9: address
+     var $t10: &mut TestMutRefs::TSum
+     var $t11: &mut TestMutRefs::TSum
+     var $t12: &u64
+     var $t13: u64
+     var $t14: u64
+     var $t15: u64
+     var $t16: &mut TestMutRefs::TSum
+     var $t17: &mut u64
+  0: $t2 := copy($t0)
+  1: $t3 := borrow_field<TestMutRefs::T>.value($t2)
+  2: $t4 := read_ref($t3)
+  3: $t5 := 1
+  4: $t6 := +($t4, $t5)
+  5: $t7 := move($t0)
+  6: $t8 := borrow_field<TestMutRefs::T>.value($t7)
+  7: write_ref($t8, $t6)
+  8: $t9 := 0x0
+  9: $t10 := borrow_global<TestMutRefs::TSum>($t9)
+ 10: $t1 := $t10
+ 11: $t11 := copy($t1)
+ 12: $t12 := borrow_field<TestMutRefs::TSum>.sum($t11)
+ 13: $t13 := read_ref($t12)
+ 14: $t14 := 1
+ 15: $t15 := +($t13, $t14)
+ 16: $t16 := move($t1)
+ 17: $t17 := borrow_field<TestMutRefs::TSum>.sum($t16)
+ 18: write_ref($t17, $t15)
+ 19: return ()
+}
+
+
+[variant baseline]
+public fun TestMutRefs::increment_invalid($t0|x: &mut TestMutRefs::T) {
+     var $t1: &mut TestMutRefs::T
+     var $t2: &u64
+     var $t3: u64
+     var $t4: u64
+     var $t5: u64
+     var $t6: &mut TestMutRefs::T
+     var $t7: &mut u64
+  0: $t1 := copy($t0)
+  1: $t2 := borrow_field<TestMutRefs::T>.value($t1)
+  2: $t3 := read_ref($t2)
+  3: $t4 := 1
+  4: $t5 := +($t3, $t4)
+  5: $t6 := move($t0)
+  6: $t7 := borrow_field<TestMutRefs::T>.value($t6)
+  7: write_ref($t7, $t5)
+  8: return ()
+}
+
+
+[variant baseline]
+public fun TestMutRefs::new($t0|x: u64): TestMutRefs::T {
+     var $t1|r: &mut TestMutRefs::TSum
+     var $t2: address
+     var $t3: &mut TestMutRefs::TSum
+     var $t4: &mut TestMutRefs::TSum
+     var $t5: &u64
+     var $t6: u64
+     var $t7: u64
+     var $t8: u64
+     var $t9: &mut TestMutRefs::TSum
+     var $t10: &mut u64
+     var $t11: u64
+     var $t12: TestMutRefs::T
+  0: $t2 := 0x0
+  1: $t3 := borrow_global<TestMutRefs::TSum>($t2)
+  2: $t1 := $t3
+  3: $t4 := copy($t1)
+  4: $t5 := borrow_field<TestMutRefs::TSum>.sum($t4)
+  5: $t6 := read_ref($t5)
+  6: $t7 := copy($t0)
+  7: $t8 := +($t6, $t7)
+  8: $t9 := move($t1)
+  9: $t10 := borrow_field<TestMutRefs::TSum>.sum($t9)
+ 10: write_ref($t10, $t8)
+ 11: $t11 := move($t0)
+ 12: $t12 := pack TestMutRefs::T($t11)
+ 13: return $t12
+}
+
+
+[variant baseline]
+fun TestMutRefs::private_data_invariant_invalid($t0|_x: &mut TestMutRefs::T) {
+  0: return ()
+}
+
+
+[variant baseline]
+fun TestMutRefs::private_decrement($t0|x: &mut TestMutRefs::T) {
+     var $t1|r: &mut TestMutRefs::TSum
+     var $t2: &mut TestMutRefs::T
+     var $t3: &u64
+     var $t4: u64
+     var $t5: u64
+     var $t6: u64
+     var $t7: &mut TestMutRefs::T
+     var $t8: &mut u64
+     var $t9: address
+     var $t10: &mut TestMutRefs::TSum
+     var $t11: &mut TestMutRefs::TSum
+     var $t12: &u64
+     var $t13: u64
+     var $t14: u64
+     var $t15: u64
+     var $t16: &mut TestMutRefs::TSum
+     var $t17: &mut u64
+  0: $t2 := copy($t0)
+  1: $t3 := borrow_field<TestMutRefs::T>.value($t2)
+  2: $t4 := read_ref($t3)
+  3: $t5 := 1
+  4: $t6 := -($t4, $t5)
+  5: $t7 := move($t0)
+  6: $t8 := borrow_field<TestMutRefs::T>.value($t7)
+  7: write_ref($t8, $t6)
+  8: $t9 := 0x0
+  9: $t10 := borrow_global<TestMutRefs::TSum>($t9)
+ 10: $t1 := $t10
+ 11: $t11 := copy($t1)
+ 12: $t12 := borrow_field<TestMutRefs::TSum>.sum($t11)
+ 13: $t13 := read_ref($t12)
+ 14: $t14 := 1
+ 15: $t15 := -($t13, $t14)
+ 16: $t16 := move($t1)
+ 17: $t17 := borrow_field<TestMutRefs::TSum>.sum($t16)
+ 18: write_ref($t17, $t15)
+ 19: return ()
+}
+
+
+[variant baseline]
+fun TestMutRefs::private_to_public_caller($t0|r: &mut TestMutRefs::T) {
+     var $t1: &mut TestMutRefs::T
+  0: $t1 := move($t0)
+  1: TestMutRefs::increment($t1)
+  2: return ()
+}
+
+
+[variant baseline]
+fun TestMutRefs::private_to_public_caller_invalid_data_invariant() {
+     var $t0|r: &mut TestMutRefs::T
+     var $t1|x: TestMutRefs::T
+     var $t2: u64
+     var $t3: TestMutRefs::T
+     var $t4: &mut TestMutRefs::T
+     var $t5: &mut TestMutRefs::T
+     var $t6: &mut TestMutRefs::T
+  0: $t2 := 1
+  1: $t3 := TestMutRefs::new($t2)
+  2: $t1 := $t3
+  3: $t4 := borrow_local($t1)
+  4: $t0 := $t4
+  5: $t5 := copy($t0)
+  6: TestMutRefs::private_decrement($t5)
+  7: $t6 := move($t0)
+  8: TestMutRefs::increment($t6)
+  9: return ()
+}
+
+
+[variant baseline]
+public fun TestMutRefsUser::valid() {
+     var $t0|x: TestMutRefs::T
+     var $t1: u64
+     var $t2: TestMutRefs::T
+     var $t3: &mut TestMutRefs::T
+     var $t4: TestMutRefs::T
+  0: $t1 := 4
+  1: $t2 := TestMutRefs::new($t1)
+  2: $t0 := $t2
+  3: $t3 := borrow_local($t0)
+  4: TestMutRefs::increment($t3)
+  5: $t4 := move($t0)
+  6: TestMutRefs::delete($t4)
+  7: return ()
+}
+
+============ after pipeline `memory_instr` ================
+
+[variant baseline]
+public fun TestMutRefs::data_invariant($t0|_x: &mut TestMutRefs::T) {
+  0: trace_local[_x]($t0)
+  1: return ()
+}
+
+
+[variant baseline]
+public fun TestMutRefs::decrement_invalid($t0|x: &mut TestMutRefs::T) {
+     var $t1|r: &mut TestMutRefs::TSum [unused]
+     var $t2: u64
+     var $t3: u64
+     var $t4: u64
+     var $t5: &mut u64
+     var $t6: address
+     var $t7: &mut TestMutRefs::TSum
+     var $t8: u64
+     var $t9: u64
+     var $t10: u64
+     var $t11: &mut u64
+  0: $t2 := get_field<TestMutRefs::T>.value($t0)
+  1: $t3 := 1
+  2: $t4 := -($t2, $t3)
+  3: $t5 := borrow_field<TestMutRefs::T>.value($t0)
+  4: write_ref($t5, $t4)
+  5: write_back[Reference($t0).value (u64)]($t5)
+  6: trace_local[x]($t0)
+  7: $t6 := 0x0
+  8: $t7 := borrow_global<TestMutRefs::TSum>($t6)
+  9: $t8 := get_field<TestMutRefs::TSum>.sum($t7)
+ 10: $t9 := 1
+ 11: $t10 := -($t8, $t9)
+ 12: $t11 := borrow_field<TestMutRefs::TSum>.sum($t7)
+ 13: write_ref($t11, $t10)
+ 14: write_back[Reference($t7).sum (u64)]($t11)
+ 15: write_back[TestMutRefs::TSum@]($t7)
+ 16: trace_local[x]($t0)
+ 17: return ()
+}
+
+
+[variant baseline]
+public fun TestMutRefs::delete($t0|x: TestMutRefs::T) {
+     var $t1|r: &mut TestMutRefs::TSum [unused]
+     var $t2|v: u64 [unused]
+     var $t3: address
+     var $t4: &mut TestMutRefs::TSum
+     var $t5: u64
+     var $t6: u64
+     var $t7: u64
+     var $t8: &mut u64
+  0: $t3 := 0x0
+  1: $t4 := borrow_global<TestMutRefs::TSum>($t3)
+  2: $t5 := unpack TestMutRefs::T($t0)
+  3: $t6 := get_field<TestMutRefs::TSum>.sum($t4)
+  4: $t7 := -($t6, $t5)
+  5: $t8 := borrow_field<TestMutRefs::TSum>.sum($t4)
+  6: write_ref($t8, $t7)
+  7: write_back[Reference($t4).sum (u64)]($t8)
+  8: write_back[TestMutRefs::TSum@]($t4)
+  9: return ()
+}
+
+
+[variant baseline]
+public fun TestMutRefs::increment($t0|x: &mut TestMutRefs::T) {
+     var $t1|r: &mut TestMutRefs::TSum [unused]
+     var $t2: u64
+     var $t3: u64
+     var $t4: u64
+     var $t5: &mut u64
+     var $t6: address
+     var $t7: &mut TestMutRefs::TSum
+     var $t8: u64
+     var $t9: u64
+     var $t10: u64
+     var $t11: &mut u64
+  0: $t2 := get_field<TestMutRefs::T>.value($t0)
+  1: $t3 := 1
+  2: $t4 := +($t2, $t3)
+  3: $t5 := borrow_field<TestMutRefs::T>.value($t0)
+  4: write_ref($t5, $t4)
+  5: write_back[Reference($t0).value (u64)]($t5)
+  6: trace_local[x]($t0)
+  7: $t6 := 0x0
+  8: $t7 := borrow_global<TestMutRefs::TSum>($t6)
+  9: $t8 := get_field<TestMutRefs::TSum>.sum($t7)
+ 10: $t9 := 1
+ 11: $t10 := +($t8, $t9)
+ 12: $t11 := borrow_field<TestMutRefs::TSum>.sum($t7)
+ 13: write_ref($t11, $t10)
+ 14: write_back[Reference($t7).sum (u64)]($t11)
+ 15: write_back[TestMutRefs::TSum@]($t7)
+ 16: trace_local[x]($t0)
+ 17: return ()
+}
+
+
+[variant baseline]
+public fun TestMutRefs::increment_invalid($t0|x: &mut TestMutRefs::T) {
+     var $t1: u64
+     var $t2: u64
+     var $t3: u64
+     var $t4: &mut u64
+  0: $t1 := get_field<TestMutRefs::T>.value($t0)
+  1: $t2 := 1
+  2: $t3 := +($t1, $t2)
+  3: $t4 := borrow_field<TestMutRefs::T>.value($t0)
+  4: write_ref($t4, $t3)
+  5: write_back[Reference($t0).value (u64)]($t4)
+  6: trace_local[x]($t0)
+  7: trace_local[x]($t0)
+  8: return ()
+}
+
+
+[variant baseline]
+public fun TestMutRefs::new($t0|x: u64): TestMutRefs::T {
+     var $t1|r: &mut TestMutRefs::TSum [unused]
+     var $t2: address
+     var $t3: &mut TestMutRefs::TSum
+     var $t4: u64
+     var $t5: u64
+     var $t6: &mut u64
+     var $t7: TestMutRefs::T
+  0: $t2 := 0x0
+  1: $t3 := borrow_global<TestMutRefs::TSum>($t2)
+  2: $t4 := get_field<TestMutRefs::TSum>.sum($t3)
+  3: $t5 := +($t4, $t0)
+  4: $t6 := borrow_field<TestMutRefs::TSum>.sum($t3)
+  5: write_ref($t6, $t5)
+  6: write_back[Reference($t3).sum (u64)]($t6)
+  7: write_back[TestMutRefs::TSum@]($t3)
+  8: $t7 := pack TestMutRefs::T($t0)
+  9: return $t7
+}
+
+
+[variant baseline]
+fun TestMutRefs::private_data_invariant_invalid($t0|_x: &mut TestMutRefs::T) {
+  0: trace_local[_x]($t0)
+  1: return ()
+}
+
+
+[variant baseline]
+fun TestMutRefs::private_decrement($t0|x: &mut TestMutRefs::T) {
+     var $t1|r: &mut TestMutRefs::TSum [unused]
+     var $t2: u64
+     var $t3: u64
+     var $t4: u64
+     var $t5: &mut u64
+     var $t6: address
+     var $t7: &mut TestMutRefs::TSum
+     var $t8: u64
+     var $t9: u64
+     var $t10: u64
+     var $t11: &mut u64
+  0: $t2 := get_field<TestMutRefs::T>.value($t0)
+  1: $t3 := 1
+  2: $t4 := -($t2, $t3)
+  3: $t5 := borrow_field<TestMutRefs::T>.value($t0)
+  4: write_ref($t5, $t4)
+  5: write_back[Reference($t0).value (u64)]($t5)
+  6: trace_local[x]($t0)
+  7: $t6 := 0x0
+  8: $t7 := borrow_global<TestMutRefs::TSum>($t6)
+  9: $t8 := get_field<TestMutRefs::TSum>.sum($t7)
+ 10: $t9 := 1
+ 11: $t10 := -($t8, $t9)
+ 12: $t11 := borrow_field<TestMutRefs::TSum>.sum($t7)
+ 13: write_ref($t11, $t10)
+ 14: write_back[Reference($t7).sum (u64)]($t11)
+ 15: write_back[TestMutRefs::TSum@]($t7)
+ 16: trace_local[x]($t0)
+ 17: return ()
+}
+
+
+[variant baseline]
+fun TestMutRefs::private_to_public_caller($t0|r: &mut TestMutRefs::T) {
+  0: TestMutRefs::increment($t0)
+  1: trace_local[r]($t0)
+  2: return ()
+}
+
+
+[variant baseline]
+fun TestMutRefs::private_to_public_caller_invalid_data_invariant() {
+     var $t0|r: &mut TestMutRefs::T [unused]
+     var $t1|x: TestMutRefs::T
+     var $t2: u64
+     var $t3: &mut TestMutRefs::T
+  0: $t2 := 1
+  1: $t1 := TestMutRefs::new($t2)
+  2: $t3 := borrow_local($t1)
+  3: TestMutRefs::private_decrement($t3)
+  4: TestMutRefs::increment($t3)
+  5: write_back[LocalRoot($t1)@]($t3)
+  6: trace_local[x]($t1)
+  7: return ()
+}
+
+
+[variant baseline]
+public fun TestMutRefsUser::valid() {
+     var $t0|x: TestMutRefs::T
+     var $t1: u64
+     var $t2: &mut TestMutRefs::T
+     var $t3: TestMutRefs::T
+  0: $t1 := 4
+  1: $t0 := TestMutRefs::new($t1)
+  2: $t2 := borrow_local($t0)
+  3: TestMutRefs::increment($t2)
+  4: write_back[LocalRoot($t0)@]($t2)
+  5: trace_local[x]($t0)
+  6: $t3 := move($t0)
+  7: TestMutRefs::delete($t3)
+  8: return ()
+}
diff --git a/third_party/move/move-prover/bytecode-pipeline/tests/mono_analysis/test.v2_exp b/third_party/move/move-prover/bytecode-pipeline/tests/mono_analysis/test.v2_exp
new file mode 100644
index 0000000000000..c6e5fe4a87486
--- /dev/null
+++ b/third_party/move/move-prover/bytecode-pipeline/tests/mono_analysis/test.v2_exp
@@ -0,0 +1,79 @@
+============ initial translation from Move ================
+
+[variant baseline]
+public fun Test::f1<#0>($t0|x1: #0): Test::A<#0, u64> {
+     var $t1: #0
+     var $t2: u64
+     var $t3: Test::A<#0, u64>
+  0: $t1 := move($t0)
+  1: $t2 := 10
+  2: $t3 := pack Test::A<#0, u64>($t1, $t2)
+  3: return $t3
+}
+
+
+[variant baseline]
+public fun Test::f2($t0|x: u8): Test::B<u8> {
+     var $t1: u8
+     var $t2: Test::A<u8, u64>
+     var $t3: Test::B<u8>
+  0: $t1 := move($t0)
+  1: $t2 := Test::f1<u8>($t1)
+  2: $t3 := pack Test::B<u8>($t2)
+  3: return $t3
+}
+
+
+[variant baseline]
+public fun Test::f3<#0>($t0|x1: #0): Test::A<#0, u64> {
+     var $t1: #0
+     var $t2: u64
+     var $t3: Test::A<#0, u64>
+  0: $t1 := move($t0)
+  1: $t2 := 1
+  2: $t3 := pack Test::A<#0, u64>($t1, $t2)
+  3: return $t3
+}
+
+
+[variant baseline]
+public fun Test::f4<#0>($t0|x1: #0): Test::B<#0> {
+     var $t1: #0
+     var $t2: Test::A<#0, u64>
+     var $t3: Test::B<#0>
+  0: $t1 := move($t0)
+  1: $t2 := Test::f3<#0>($t1)
+  2: $t3 := pack Test::B<#0>($t2)
+  3: return $t3
+}
+
+
+[variant baseline]
+public fun Test::f5(): Test::B<u128> {
+     var $t0: u128
+     var $t1: Test::B<u128>
+  0: $t0 := 1
+  1: $t1 := Test::f4<u128>($t0)
+  2: return $t1
+}
+
+
+
+==== mono-analysis result ====
+
+struct Test::A = {
+  <u8, u64>
+  <u128, u64>
+  <#0, u64>
+}
+struct Test::B = {
+  <u8>
+  <u128>
+  <#0>
+}
+fun Test::f1 [baseline] = {
+  <u8>
+}
+fun Test::f4 [baseline] = {
+  <u128>
+}
diff --git a/third_party/move/move-prover/bytecode-pipeline/tests/mut_ref_instrumentation/basic_test.v2_exp b/third_party/move/move-prover/bytecode-pipeline/tests/mut_ref_instrumentation/basic_test.v2_exp
new file mode 100644
index 0000000000000..c3fe0790bd1c3
--- /dev/null
+++ b/third_party/move/move-prover/bytecode-pipeline/tests/mut_ref_instrumentation/basic_test.v2_exp
@@ -0,0 +1,460 @@
+============ initial translation from Move ================
+
+[variant baseline]
+fun TestEliminateMutRefs::test1(): TestEliminateMutRefs::R {
+     var $t0|r: TestEliminateMutRefs::R
+     var $t1|x_ref: &mut u64
+     var $t2: u64
+     var $t3: TestEliminateMutRefs::R
+     var $t4: &mut TestEliminateMutRefs::R
+     var $t5: &mut u64
+     var $t6: u64
+     var $t7: &mut u64
+     var $t8: TestEliminateMutRefs::R
+  0: $t2 := 3
+  1: $t3 := pack TestEliminateMutRefs::R($t2)
+  2: $t0 := $t3
+  3: $t4 := borrow_local($t0)
+  4: $t5 := borrow_field<TestEliminateMutRefs::R>.x($t4)
+  5: $t1 := $t5
+  6: $t6 := 0
+  7: $t7 := move($t1)
+  8: write_ref($t7, $t6)
+  9: $t8 := move($t0)
+ 10: return $t8
+}
+
+
+[variant baseline]
+fun TestEliminateMutRefs::test2($t0|x_ref: &mut u64, $t1|v: u64) {
+     var $t2: u64
+     var $t3: &mut u64
+  0: $t2 := move($t1)
+  1: $t3 := move($t0)
+  2: write_ref($t3, $t2)
+  3: return ()
+}
+
+
+[variant baseline]
+public fun TestEliminateMutRefs::test3($t0|r_ref: &mut TestEliminateMutRefs::R, $t1|v: u64) {
+     var $t2: &mut TestEliminateMutRefs::R
+     var $t3: &mut u64
+     var $t4: u64
+  0: $t2 := move($t0)
+  1: $t3 := borrow_field<TestEliminateMutRefs::R>.x($t2)
+  2: $t4 := move($t1)
+  3: TestEliminateMutRefs::test2($t3, $t4)
+  4: return ()
+}
+
+
+[variant baseline]
+fun TestEliminateMutRefs::test4(): TestEliminateMutRefs::R {
+     var $t0|r: TestEliminateMutRefs::R
+     var $t1: u64
+     var $t2: TestEliminateMutRefs::R
+     var $t3: &mut TestEliminateMutRefs::R
+     var $t4: u64
+     var $t5: TestEliminateMutRefs::R
+  0: $t1 := 3
+  1: $t2 := pack TestEliminateMutRefs::R($t1)
+  2: $t0 := $t2
+  3: $t3 := borrow_local($t0)
+  4: $t4 := 0
+  5: TestEliminateMutRefs::test3($t3, $t4)
+  6: $t5 := move($t0)
+  7: return $t5
+}
+
+
+[variant baseline]
+public fun TestEliminateMutRefs::test5($t0|r_ref: &mut TestEliminateMutRefs::R): &mut u64 {
+     var $t1: &mut TestEliminateMutRefs::R
+     var $t2: &mut u64
+  0: $t1 := move($t0)
+  1: $t2 := borrow_field<TestEliminateMutRefs::R>.x($t1)
+  2: return $t2
+}
+
+
+[variant baseline]
+fun TestEliminateMutRefs::test6(): TestEliminateMutRefs::R {
+     var $t0|r: TestEliminateMutRefs::R
+     var $t1: u64
+     var $t2: TestEliminateMutRefs::R
+     var $t3: &mut TestEliminateMutRefs::R
+     var $t4: &mut u64
+     var $t5: u64
+     var $t6: TestEliminateMutRefs::R
+  0: $t1 := 3
+  1: $t2 := pack TestEliminateMutRefs::R($t1)
+  2: $t0 := $t2
+  3: $t3 := borrow_local($t0)
+  4: $t4 := TestEliminateMutRefs::test5($t3)
+  5: $t5 := 0
+  6: TestEliminateMutRefs::test2($t4, $t5)
+  7: $t6 := move($t0)
+  8: return $t6
+}
+
+
+[variant baseline]
+fun TestEliminateMutRefs::test7($t0|b: bool) {
+     var $t1|r1: TestEliminateMutRefs::R
+     var $t2|r2: TestEliminateMutRefs::R
+     var $t3|r_ref: &mut TestEliminateMutRefs::R
+     var $t4: u64
+     var $t5: TestEliminateMutRefs::R
+     var $t6: u64
+     var $t7: TestEliminateMutRefs::R
+     var $t8: &mut TestEliminateMutRefs::R
+     var $t9: bool
+     var $t10: &mut TestEliminateMutRefs::R
+     var $t11: &mut TestEliminateMutRefs::R
+     var $t12: &mut TestEliminateMutRefs::R
+     var $t13: u64
+  0: $t4 := 3
+  1: $t5 := pack TestEliminateMutRefs::R($t4)
+  2: $t1 := $t5
+  3: $t6 := 4
+  4: $t7 := pack TestEliminateMutRefs::R($t6)
+  5: $t2 := $t7
+  6: $t8 := borrow_local($t1)
+  7: $t3 := $t8
+  8: $t9 := move($t0)
+  9: if ($t9) goto 10 else goto 16
+ 10: label L1
+ 11: $t10 := move($t3)
+ 12: drop($t10)
+ 13: $t11 := borrow_local($t2)
+ 14: $t3 := $t11
+ 15: goto 16
+ 16: label L0
+ 17: $t12 := move($t3)
+ 18: $t13 := 0
+ 19: TestEliminateMutRefs::test3($t12, $t13)
+ 20: return ()
+}
+
+
+[variant baseline]
+fun TestEliminateMutRefs::test8($t0|b: bool, $t1|n: u64, $t2|r_ref: &mut TestEliminateMutRefs::R) {
+     var $t3|r1: TestEliminateMutRefs::R
+     var $t4|r2: TestEliminateMutRefs::R
+     var $t5|t_ref: &mut TestEliminateMutRefs::R
+     var $t6: u64
+     var $t7: TestEliminateMutRefs::R
+     var $t8: u64
+     var $t9: TestEliminateMutRefs::R
+     var $t10: &mut TestEliminateMutRefs::R
+     var $t11: u64
+     var $t12: u64
+     var $t13: bool
+     var $t14: &mut TestEliminateMutRefs::R
+     var $t15: u64
+     var $t16: u64
+     var $t17: u64
+     var $t18: u64
+     var $t19: bool
+     var $t20: &mut TestEliminateMutRefs::R
+     var $t21: &mut TestEliminateMutRefs::R
+     var $t22: u64
+     var $t23: u64
+     var $t24: u64
+     var $t25: bool
+     var $t26: &mut TestEliminateMutRefs::R
+     var $t27: &mut TestEliminateMutRefs::R
+     var $t28: u64
+     var $t29: &mut TestEliminateMutRefs::R
+     var $t30: &mut TestEliminateMutRefs::R
+     var $t31: u64
+  0: $t6 := 3
+  1: $t7 := pack TestEliminateMutRefs::R($t6)
+  2: $t3 := $t7
+  3: $t8 := 4
+  4: $t9 := pack TestEliminateMutRefs::R($t8)
+  5: $t4 := $t9
+  6: $t10 := borrow_local($t4)
+  7: $t5 := $t10
+  8: goto 9
+  9: label L6
+ 10: $t11 := 0
+ 11: $t12 := copy($t1)
+ 12: $t13 := <($t11, $t12)
+ 13: if ($t13) goto 14 else goto 39
+ 14: label L1
+ 15: goto 16
+ 16: label L2
+ 17: $t14 := move($t5)
+ 18: drop($t14)
+ 19: $t15 := copy($t1)
+ 20: $t16 := 2
+ 21: $t17 := /($t15, $t16)
+ 22: $t18 := 0
+ 23: $t19 := ==($t17, $t18)
+ 24: if ($t19) goto 25 else goto 29
+ 25: label L4
+ 26: $t20 := borrow_local($t3)
+ 27: $t5 := $t20
+ 28: goto 33
+ 29: label L3
+ 30: $t21 := borrow_local($t4)
+ 31: $t5 := $t21
+ 32: goto 33
+ 33: label L5
+ 34: $t22 := move($t1)
+ 35: $t23 := 1
+ 36: $t24 := -($t22, $t23)
+ 37: $t1 := $t24
+ 38: goto 9
+ 39: label L0
+ 40: $t25 := move($t0)
+ 41: if ($t25) goto 42 else goto 49
+ 42: label L8
+ 43: $t26 := move($t5)
+ 44: drop($t26)
+ 45: $t27 := move($t2)
+ 46: $t28 := 0
+ 47: TestEliminateMutRefs::test3($t27, $t28)
+ 48: goto 56
+ 49: label L7
+ 50: $t29 := move($t2)
+ 51: drop($t29)
+ 52: $t30 := move($t5)
+ 53: $t31 := 0
+ 54: TestEliminateMutRefs::test3($t30, $t31)
+ 55: goto 56
+ 56: label L9
+ 57: return ()
+}
+
+============ after pipeline `mut_ref_instrumentation` ================
+
+[variant baseline]
+fun TestEliminateMutRefs::test1(): TestEliminateMutRefs::R {
+     var $t0|r: TestEliminateMutRefs::R
+     var $t1|x_ref: &mut u64
+     var $t2: u64
+     var $t3: TestEliminateMutRefs::R
+     var $t4: &mut TestEliminateMutRefs::R
+     var $t5: &mut u64
+     var $t6: u64
+     var $t7: &mut u64
+     var $t8: TestEliminateMutRefs::R
+  0: $t2 := 3
+  1: $t3 := pack TestEliminateMutRefs::R($t2)
+  2: $t0 := $t3
+  3: $t4 := borrow_local($t0)
+  4: $t5 := borrow_field<TestEliminateMutRefs::R>.x($t4)
+  5: $t1 := $t5
+  6: $t6 := 0
+  7: $t7 := move($t1)
+  8: write_ref($t7, $t6)
+  9: $t8 := move($t0)
+ 10: return $t8
+}
+
+
+[variant baseline]
+fun TestEliminateMutRefs::test2($t0|x_ref: &mut u64, $t1|v: u64) {
+     var $t2: u64
+     var $t3: &mut u64
+  0: $t2 := move($t1)
+  1: $t3 := copy($t0)
+  2: write_ref($t3, $t2)
+  3: trace_local[x_ref]($t0)
+  4: return ()
+}
+
+
+[variant baseline]
+public fun TestEliminateMutRefs::test3($t0|r_ref: &mut TestEliminateMutRefs::R, $t1|v: u64) {
+     var $t2: &mut TestEliminateMutRefs::R
+     var $t3: &mut u64
+     var $t4: u64
+  0: $t2 := copy($t0)
+  1: $t3 := borrow_field<TestEliminateMutRefs::R>.x($t2)
+  2: $t4 := move($t1)
+  3: TestEliminateMutRefs::test2($t3, $t4)
+  4: trace_local[r_ref]($t0)
+  5: return ()
+}
+
+
+[variant baseline]
+fun TestEliminateMutRefs::test4(): TestEliminateMutRefs::R {
+     var $t0|r: TestEliminateMutRefs::R
+     var $t1: u64
+     var $t2: TestEliminateMutRefs::R
+     var $t3: &mut TestEliminateMutRefs::R
+     var $t4: u64
+     var $t5: TestEliminateMutRefs::R
+  0: $t1 := 3
+  1: $t2 := pack TestEliminateMutRefs::R($t1)
+  2: $t0 := $t2
+  3: $t3 := borrow_local($t0)
+  4: $t4 := 0
+  5: TestEliminateMutRefs::test3($t3, $t4)
+  6: $t5 := move($t0)
+  7: return $t5
+}
+
+
+[variant baseline]
+public fun TestEliminateMutRefs::test5($t0|r_ref: &mut TestEliminateMutRefs::R): &mut u64 {
+     var $t1: &mut TestEliminateMutRefs::R
+     var $t2: &mut u64
+  0: $t1 := copy($t0)
+  1: $t2 := borrow_field<TestEliminateMutRefs::R>.x($t1)
+  2: trace_local[r_ref]($t0)
+  3: return $t2
+}
+
+
+[variant baseline]
+fun TestEliminateMutRefs::test6(): TestEliminateMutRefs::R {
+     var $t0|r: TestEliminateMutRefs::R
+     var $t1: u64
+     var $t2: TestEliminateMutRefs::R
+     var $t3: &mut TestEliminateMutRefs::R
+     var $t4: &mut u64
+     var $t5: u64
+     var $t6: TestEliminateMutRefs::R
+  0: $t1 := 3
+  1: $t2 := pack TestEliminateMutRefs::R($t1)
+  2: $t0 := $t2
+  3: $t3 := borrow_local($t0)
+  4: $t4 := TestEliminateMutRefs::test5($t3)
+  5: $t5 := 0
+  6: TestEliminateMutRefs::test2($t4, $t5)
+  7: $t6 := move($t0)
+  8: return $t6
+}
+
+
+[variant baseline]
+fun TestEliminateMutRefs::test7($t0|b: bool) {
+     var $t1|r1: TestEliminateMutRefs::R
+     var $t2|r2: TestEliminateMutRefs::R
+     var $t3|r_ref: &mut TestEliminateMutRefs::R
+     var $t4: u64
+     var $t5: TestEliminateMutRefs::R
+     var $t6: u64
+     var $t7: TestEliminateMutRefs::R
+     var $t8: &mut TestEliminateMutRefs::R
+     var $t9: bool
+     var $t10: &mut TestEliminateMutRefs::R
+     var $t11: &mut TestEliminateMutRefs::R
+     var $t12: &mut TestEliminateMutRefs::R
+     var $t13: u64
+  0: $t4 := 3
+  1: $t5 := pack TestEliminateMutRefs::R($t4)
+  2: $t1 := $t5
+  3: $t6 := 4
+  4: $t7 := pack TestEliminateMutRefs::R($t6)
+  5: $t2 := $t7
+  6: $t8 := borrow_local($t1)
+  7: $t3 := $t8
+  8: $t9 := move($t0)
+  9: if ($t9) goto 10 else goto 15
+ 10: label L1
+ 11: $t10 := move($t3)
+ 12: drop($t10)
+ 13: $t11 := borrow_local($t2)
+ 14: $t3 := $t11
+ 15: label L0
+ 16: $t12 := move($t3)
+ 17: $t13 := 0
+ 18: TestEliminateMutRefs::test3($t12, $t13)
+ 19: return ()
+}
+
+
+[variant baseline]
+fun TestEliminateMutRefs::test8($t0|b: bool, $t1|n: u64, $t2|r_ref: &mut TestEliminateMutRefs::R) {
+     var $t3|r1: TestEliminateMutRefs::R
+     var $t4|r2: TestEliminateMutRefs::R
+     var $t5|t_ref: &mut TestEliminateMutRefs::R
+     var $t6: u64
+     var $t7: TestEliminateMutRefs::R
+     var $t8: u64
+     var $t9: TestEliminateMutRefs::R
+     var $t10: &mut TestEliminateMutRefs::R
+     var $t11: u64
+     var $t12: u64
+     var $t13: bool
+     var $t14: &mut TestEliminateMutRefs::R
+     var $t15: u64
+     var $t16: u64
+     var $t17: u64
+     var $t18: u64
+     var $t19: bool
+     var $t20: &mut TestEliminateMutRefs::R
+     var $t21: &mut TestEliminateMutRefs::R
+     var $t22: u64
+     var $t23: u64
+     var $t24: u64
+     var $t25: bool
+     var $t26: &mut TestEliminateMutRefs::R
+     var $t27: &mut TestEliminateMutRefs::R
+     var $t28: u64
+     var $t29: &mut TestEliminateMutRefs::R
+     var $t30: &mut TestEliminateMutRefs::R
+     var $t31: u64
+  0: $t6 := 3
+  1: $t7 := pack TestEliminateMutRefs::R($t6)
+  2: $t3 := $t7
+  3: $t8 := 4
+  4: $t9 := pack TestEliminateMutRefs::R($t8)
+  5: $t4 := $t9
+  6: $t10 := borrow_local($t4)
+  7: $t5 := $t10
+  8: label L6
+  9: $t11 := 0
+ 10: $t12 := copy($t1)
+ 11: $t13 := <($t11, $t12)
+ 12: if ($t13) goto 13 else goto 36
+ 13: label L1
+ 14: label L2
+ 15: $t14 := move($t5)
+ 16: drop($t14)
+ 17: $t15 := copy($t1)
+ 18: $t16 := 2
+ 19: $t17 := /($t15, $t16)
+ 20: $t18 := 0
+ 21: $t19 := ==($t17, $t18)
+ 22: if ($t19) goto 23 else goto 27
+ 23: label L4
+ 24: $t20 := borrow_local($t3)
+ 25: $t5 := $t20
+ 26: goto 30
+ 27: label L3
+ 28: $t21 := borrow_local($t4)
+ 29: $t5 := $t21
+ 30: label L5
+ 31: $t22 := move($t1)
+ 32: $t23 := 1
+ 33: $t24 := -($t22, $t23)
+ 34: $t1 := $t24
+ 35: goto 8
+ 36: label L0
+ 37: $t25 := move($t0)
+ 38: if ($t25) goto 39 else goto 46
+ 39: label L8
+ 40: $t26 := move($t5)
+ 41: drop($t26)
+ 42: $t27 := copy($t2)
+ 43: $t28 := 0
+ 44: TestEliminateMutRefs::test3($t27, $t28)
+ 45: goto 52
+ 46: label L7
+ 47: $t29 := copy($t2)
+ 48: drop($t29)
+ 49: $t30 := move($t5)
+ 50: $t31 := 0
+ 51: TestEliminateMutRefs::test3($t30, $t31)
+ 52: label L9
+ 53: trace_local[r_ref]($t2)
+ 54: return ()
+}
diff --git a/third_party/move/move-prover/bytecode-pipeline/tests/spec_instrumentation/fun_spec.v2_exp b/third_party/move/move-prover/bytecode-pipeline/tests/spec_instrumentation/fun_spec.v2_exp
new file mode 100644
index 0000000000000..8b471c086cdd7
--- /dev/null
+++ b/third_party/move/move-prover/bytecode-pipeline/tests/spec_instrumentation/fun_spec.v2_exp
@@ -0,0 +1,460 @@
+============ initial translation from Move ================
+
+[variant baseline]
+fun Test::branching_result($t0|is_div: bool, $t1|a: u64, $t2|b: u64): u64 {
+     var $t3|tmp#$3: u64
+     var $t4: bool
+     var $t5: u64
+     var $t6: u64
+     var $t7: u64
+     var $t8: u64
+     var $t9: u64
+     var $t10: u64
+     var $t11: u64
+  0: $t4 := move($t0)
+  1: if ($t4) goto 2 else goto 8
+  2: label L1
+  3: $t5 := move($t1)
+  4: $t6 := move($t2)
+  5: $t7 := /($t5, $t6)
+  6: $t3 := $t7
+  7: goto 14
+  8: label L0
+  9: $t8 := move($t1)
+ 10: $t9 := move($t2)
+ 11: $t10 := *($t8, $t9)
+ 12: $t3 := $t10
+ 13: goto 14
+ 14: label L2
+ 15: $t11 := move($t3)
+ 16: return $t11
+}
+
+
+[variant baseline]
+fun Test::implicit_and_explicit_abort($t0|a: u64, $t1|b: u64): u64 {
+     var $t2: u64
+     var $t3: u64
+     var $t4: bool
+     var $t5: u64
+     var $t6: u64
+     var $t7: u64
+     var $t8: u64
+  0: $t2 := copy($t1)
+  1: $t3 := 0
+  2: $t4 := !=($t2, $t3)
+  3: if ($t4) goto 4 else goto 7
+  4: label L1
+  5: $t5 := 22
+  6: abort($t5)
+  7: label L0
+  8: $t6 := move($t0)
+  9: $t7 := move($t1)
+ 10: $t8 := /($t6, $t7)
+ 11: return $t8
+}
+
+
+[variant baseline]
+fun Test::multiple_results($t0|a: u64, $t1|b: u64): (u64, u64) {
+     var $t2: u64
+     var $t3: u64
+     var $t4: u64
+     var $t5: u64
+     var $t6: u64
+     var $t7: u64
+  0: $t2 := copy($t0)
+  1: $t3 := copy($t1)
+  2: $t4 := /($t2, $t3)
+  3: $t5 := move($t0)
+  4: $t6 := move($t1)
+  5: $t7 := %($t5, $t6)
+  6: return ($t4, $t7)
+}
+
+
+[variant baseline]
+fun Test::mut_ref_param($t0|r: &mut Test::R): u64 {
+     var $t1|x: u64
+     var $t2: &mut Test::R
+     var $t3: &u64
+     var $t4: u64
+     var $t5: &mut Test::R
+     var $t6: &u64
+     var $t7: u64
+     var $t8: u64
+     var $t9: u64
+     var $t10: &mut Test::R
+     var $t11: &mut u64
+     var $t12: u64
+  0: $t2 := copy($t0)
+  1: $t3 := borrow_field<Test::R>.v($t2)
+  2: $t4 := read_ref($t3)
+  3: $t1 := $t4
+  4: $t5 := copy($t0)
+  5: $t6 := borrow_field<Test::R>.v($t5)
+  6: $t7 := read_ref($t6)
+  7: $t8 := 1
+  8: $t9 := -($t7, $t8)
+  9: $t10 := move($t0)
+ 10: $t11 := borrow_field<Test::R>.v($t10)
+ 11: write_ref($t11, $t9)
+ 12: $t12 := move($t1)
+ 13: return $t12
+}
+
+
+[variant baseline]
+fun Test::ref_param($t0|r: &Test::R): u64 {
+     var $t1: &Test::R
+     var $t2: &u64
+     var $t3: u64
+  0: $t1 := move($t0)
+  1: $t2 := borrow_field<Test::R>.v($t1)
+  2: $t3 := read_ref($t2)
+  3: return $t3
+}
+
+
+[variant baseline]
+fun Test::ref_param_return_ref($t0|r: &Test::R): &u64 {
+     var $t1: &Test::R
+     var $t2: &u64
+  0: $t1 := move($t0)
+  1: $t2 := borrow_field<Test::R>.v($t1)
+  2: return $t2
+}
+
+
+[variant baseline]
+fun Test::resource_with_old($t0|val: u64) {
+     var $t1|r: &mut Test::R
+     var $t2: address
+     var $t3: bool
+     var $t4: bool
+     var $t5: u64
+     var $t6: address
+     var $t7: &mut Test::R
+     var $t8: &mut Test::R
+     var $t9: &u64
+     var $t10: u64
+     var $t11: u64
+     var $t12: u64
+     var $t13: &mut Test::R
+     var $t14: &mut u64
+  0: $t2 := 0x0
+  1: $t3 := exists<Test::R>($t2)
+  2: $t4 := !($t3)
+  3: if ($t4) goto 4 else goto 7
+  4: label L1
+  5: $t5 := 33
+  6: abort($t5)
+  7: label L0
+  8: $t6 := 0x0
+  9: $t7 := borrow_global<Test::R>($t6)
+ 10: $t1 := $t7
+ 11: $t8 := copy($t1)
+ 12: $t9 := borrow_field<Test::R>.v($t8)
+ 13: $t10 := read_ref($t9)
+ 14: $t11 := move($t0)
+ 15: $t12 := +($t10, $t11)
+ 16: $t13 := move($t1)
+ 17: $t14 := borrow_field<Test::R>.v($t13)
+ 18: write_ref($t14, $t12)
+ 19: return ()
+}
+
+============ after pipeline `spec_instrumentation` ================
+
+[variant verification]
+fun Test::branching_result($t0|is_div: bool, $t1|a: u64, $t2|b: u64): u64 {
+     var $t3|tmp#$3: u64
+     var $t4: num
+  0: if ($t0) goto 1 else goto 4
+  1: label L1
+  2: $t3 := /($t1, $t2) on_abort goto 12 with $t4
+  3: goto 6
+  4: label L0
+  5: $t3 := *($t1, $t2) on_abort goto 12 with $t4
+  6: label L2
+  7: label L3
+     # VC: function does not abort under this condition at tests/spec_instrumentation/fun_spec.move:27:6+50
+  8: assert Not(And($t0, Eq<u64>($t2, 0)))
+     # VC: post-condition does not hold at tests/spec_instrumentation/fun_spec.move:28:6+35
+  9: assert Implies($t0, Eq<u64>($t3, Div($t1, $t2)))
+     # VC: post-condition does not hold at tests/spec_instrumentation/fun_spec.move:29:6+36
+ 10: assert Implies(Not($t0), Eq<u64>($t3, Mul($t1, $t2)))
+ 11: return $t3
+ 12: label L4
+     # VC: abort not covered by any of the `aborts_if` clauses at tests/spec_instrumentation/fun_spec.move:26:2+165
+ 13: assert And($t0, Eq<u64>($t2, 0))
+     # VC: abort code not covered by any of the `aborts_if` or `aborts_with` clauses at tests/spec_instrumentation/fun_spec.move:26:2+165
+ 14: assert And(And($t0, Eq<u64>($t2, 0)), Eq(-1, $t4))
+ 15: abort($t4)
+}
+
+
+[variant verification]
+fun Test::implicit_and_explicit_abort($t0|a: u64, $t1|b: u64): u64 {
+     var $t2: u64
+     var $t3: bool
+     var $t4: u64
+     var $t5: num
+     var $t6: u64
+  0: $t2 := 0
+  1: $t3 := !=($t1, $t2)
+  2: if ($t3) goto 3 else goto 7
+  3: label L1
+  4: $t4 := 22
+  5: $t5 := move($t4)
+  6: goto 14
+  7: label L0
+  8: $t6 := /($t0, $t1) on_abort goto 14 with $t5
+  9: label L2
+     # VC: function does not abort under this condition at tests/spec_instrumentation/fun_spec.move:9:6+25
+ 10: assert Not(Eq<u64>($t1, 0))
+     # VC: function does not abort under this condition at tests/spec_instrumentation/fun_spec.move:10:6+17
+ 11: assert Not(Eq<u64>($t0, 0))
+     # VC: post-condition does not hold at tests/spec_instrumentation/fun_spec.move:11:6+24
+ 12: assert Eq<u64>($t6, Div($t0, $t1))
+ 13: return $t6
+ 14: label L3
+     # VC: abort not covered by any of the `aborts_if` clauses at tests/spec_instrumentation/fun_spec.move:8:2+121
+ 15: assert Or(Eq<u64>($t1, 0), Eq<u64>($t0, 0))
+     # VC: abort code not covered by any of the `aborts_if` or `aborts_with` clauses at tests/spec_instrumentation/fun_spec.move:8:2+121
+ 16: assert Or(And(Eq<u64>($t1, 0), Eq(22, $t5)), Eq<u64>($t0, 0))
+ 17: abort($t5)
+}
+
+
+[variant verification]
+fun Test::multiple_results($t0|a: u64, $t1|b: u64): (u64, u64) {
+     var $t2: u64
+     var $t3: num
+     var $t4: u64
+  0: $t2 := /($t0, $t1) on_abort goto 7 with $t3
+  1: $t4 := %($t0, $t1) on_abort goto 7 with $t3
+  2: label L1
+     # VC: function does not abort under this condition at tests/spec_instrumentation/fun_spec.move:18:6+40
+  3: assert Not(Eq<u64>($t1, 0))
+     # VC: post-condition does not hold at tests/spec_instrumentation/fun_spec.move:19:6+26
+  4: assert Eq<u64>($t2, Div($t0, $t1))
+     # VC: post-condition does not hold at tests/spec_instrumentation/fun_spec.move:20:6+26
+  5: assert Eq<u64>($t4, Mod($t0, $t1))
+  6: return ($t2, $t4)
+  7: label L2
+     # VC: abort not covered by any of the `aborts_if` clauses at tests/spec_instrumentation/fun_spec.move:17:2+136
+  8: assert Eq<u64>($t1, 0)
+     # VC: abort code not covered by any of the `aborts_if` or `aborts_with` clauses at tests/spec_instrumentation/fun_spec.move:17:2+136
+  9: assert And(Eq<u64>($t1, 0), Eq(-1, $t3))
+ 10: abort($t3)
+}
+
+
+[variant verification]
+fun Test::mut_ref_param($t0|r: &mut Test::R): u64 {
+     var $t1|x: u64
+     var $t2: Test::R
+     var $t3: u64
+     var $t4: u64
+     var $t5: u64
+     var $t6: u64
+     var $t7: num
+     var $t8: &mut u64
+  0: $t2 := read_ref($t0)
+  1: $t3 := get_field<Test::R>.v($t0)
+  2: $t4 := get_field<Test::R>.v($t0)
+  3: $t5 := 1
+  4: $t6 := -($t4, $t5) on_abort goto 15 with $t7
+  5: $t8 := borrow_field<Test::R>.v($t0)
+  6: write_ref($t8, $t6)
+  7: write_back[Reference($t0).v (u64)]($t8)
+  8: trace_local[r]($t0)
+  9: trace_local[r]($t0)
+ 10: label L1
+     # VC: function does not abort under this condition at tests/spec_instrumentation/fun_spec.move:67:6+42
+ 11: assert Not(Eq<u64>(select Test::R.v<Test::R>($t2), 0))
+     # VC: post-condition does not hold at tests/spec_instrumentation/fun_spec.move:68:6+27
+ 12: assert Eq<u64>($t3, select Test::R.v<Test::R>($t2))
+     # VC: post-condition does not hold at tests/spec_instrumentation/fun_spec.move:69:6+28
+ 13: assert Eq<u64>(select Test::R.v<Test::R>($t0), Add(select Test::R.v<Test::R>($t2), 1))
+ 14: return $t3
+ 15: label L2
+     # VC: abort not covered by any of the `aborts_if` clauses at tests/spec_instrumentation/fun_spec.move:66:2+138
+ 16: assert Eq<u64>(select Test::R.v<Test::R>($t2), 0)
+     # VC: abort code not covered by any of the `aborts_if` or `aborts_with` clauses at tests/spec_instrumentation/fun_spec.move:66:2+138
+ 17: assert And(Eq<u64>(select Test::R.v<Test::R>($t2), 0), Eq(-1, $t7))
+ 18: abort($t7)
+}
+
+
+[variant verification]
+fun Test::ref_param($t0|r: Test::R): u64 {
+     var $t1: u64
+  0: $t1 := get_field<Test::R>.v($t0)
+  1: label L1
+     # VC: post-condition does not hold at tests/spec_instrumentation/fun_spec.move:51:6+22
+  2: assert Eq<u64>($t1, select Test::R.v<Test::R>($t0))
+  3: return $t1
+}
+
+
+[variant verification]
+fun Test::ref_param_return_ref($t0|r: Test::R): u64 {
+     var $t1: u64
+  0: $t1 := get_field<Test::R>.v($t0)
+  1: label L1
+     # VC: post-condition does not hold at tests/spec_instrumentation/fun_spec.move:58:6+22
+  2: assert Eq<u64>($t1, select Test::R.v<Test::R>($t0))
+  3: return $t1
+}
+
+
+[variant verification]
+fun Test::resource_with_old($t0|val: u64) {
+     var $t1|r: &mut Test::R
+     var $t2: address
+     var $t3: bool
+     var $t4: bool
+     var $t5: u64
+     var $t6: num
+     var $t7: address
+     var $t8: &mut Test::R
+     var $t9: u64
+     var $t10: u64
+     var $t11: &mut u64
+  0: assume Gt($t0, 0)
+  1: assume CanModify<Test::R>(0x0)
+  2: @0 := save_mem(Test::R)
+  3: $t2 := 0x0
+  4: $t3 := exists<Test::R>($t2)
+  5: $t4 := !($t3)
+  6: if ($t4) goto 7 else goto 11
+  7: label L1
+  8: $t5 := 33
+  9: $t6 := move($t5)
+ 10: goto 26
+ 11: label L0
+ 12: $t7 := 0x0
+     # VC: caller does not have permission to modify `Test::R` at given address at tests/spec_instrumentation/fun_spec.move:36:14+17
+ 13: assert CanModify<Test::R>($t7)
+ 14: $t8 := borrow_global<Test::R>($t7) on_abort goto 26 with $t6
+ 15: $t9 := get_field<Test::R>.v($t8)
+ 16: $t10 := +($t9, $t0) on_abort goto 26 with $t6
+ 17: $t11 := borrow_field<Test::R>.v($t8)
+ 18: write_ref($t11, $t10)
+ 19: write_back[Reference($t8).v (u64)]($t11)
+ 20: write_back[Test::R@]($t8)
+ 21: label L2
+     # VC: function does not abort under this condition at tests/spec_instrumentation/fun_spec.move:41:6+35
+ 22: assert Not(Not(exists[@0]<Test::R>(0x0)))
+     # VC: function does not abort under this condition at tests/spec_instrumentation/fun_spec.move:42:6+58
+ 23: assert Not(Ge(Add(select Test::R.v<Test::R>(global[@0]<Test::R>(0x0)), $t0), 18446744073709551615))
+     # VC: post-condition does not hold at tests/spec_instrumentation/fun_spec.move:43:6+58
+ 24: assert Eq<u64>(select Test::R.v<Test::R>(global<Test::R>(0x0)), Add(select Test::R.v<Test::R>(global[@0]<Test::R>(0x0)), $t0))
+ 25: return ()
+ 26: label L3
+     # VC: abort not covered by any of the `aborts_if` clauses at tests/spec_instrumentation/fun_spec.move:39:2+250
+ 27: assert Or(Not(exists[@0]<Test::R>(0x0)), Ge(Add(select Test::R.v<Test::R>(global[@0]<Test::R>(0x0)), $t0), 18446744073709551615))
+     # VC: abort code not covered by any of the `aborts_if` or `aborts_with` clauses at tests/spec_instrumentation/fun_spec.move:39:2+250
+ 28: assert Or(And(Not(exists[@0]<Test::R>(0x0)), Eq(33, $t6)), Ge(Add(select Test::R.v<Test::R>(global[@0]<Test::R>(0x0)), $t0), 18446744073709551615))
+ 29: abort($t6)
+}
+
+
+
+==== spec-instrumenter input specs ====
+
+fun Test::branching_result[baseline]
+spec {
+  aborts_if And($t0, Eq<u64>($t2, 0));
+  ensures Implies($t0, Eq<u64>(result0(), Div($t1, $t2)));
+  ensures Implies(Not($t0), Eq<u64>(result0(), Mul($t1, $t2)));
+}
+
+fun Test::branching_result[verification]
+spec {
+  aborts_if And($t0, Eq<u64>($t2, 0));
+  ensures Implies($t0, Eq<u64>(result0(), Div($t1, $t2)));
+  ensures Implies(Not($t0), Eq<u64>(result0(), Mul($t1, $t2)));
+}
+
+fun Test::implicit_and_explicit_abort[baseline]
+spec {
+  aborts_if Eq<u64>($t1, 0);
+  aborts_if Eq<u64>($t0, 0);
+  ensures Eq<u64>(result0(), Div($t0, $t1));
+}
+
+fun Test::implicit_and_explicit_abort[verification]
+spec {
+  aborts_if Eq<u64>($t1, 0);
+  aborts_if Eq<u64>($t0, 0);
+  ensures Eq<u64>(result0(), Div($t0, $t1));
+}
+
+fun Test::multiple_results[baseline]
+spec {
+  aborts_if Eq<u64>($t1, 0);
+  ensures Eq<u64>(result0(), Div($t0, $t1));
+  ensures Eq<u64>(result1(), Mod($t0, $t1));
+}
+
+fun Test::multiple_results[verification]
+spec {
+  aborts_if Eq<u64>($t1, 0);
+  ensures Eq<u64>(result0(), Div($t0, $t1));
+  ensures Eq<u64>(result1(), Mod($t0, $t1));
+}
+
+fun Test::mut_ref_param[baseline]
+spec {
+  aborts_if Eq<u64>(select Test::R.v<Test::R>($t0), 0);
+  ensures Eq<u64>(result0(), Old<u64>(select Test::R.v<Test::R>($t0)));
+  ensures Eq<u64>(select Test::R.v<Test::R>($t0), Add(Old<u64>(select Test::R.v<Test::R>($t0)), 1));
+}
+
+fun Test::mut_ref_param[verification]
+spec {
+  aborts_if Eq<u64>(select Test::R.v<Test::R>($t0), 0);
+  ensures Eq<u64>(result0(), Old<u64>(select Test::R.v<Test::R>($t0)));
+  ensures Eq<u64>(select Test::R.v<Test::R>($t0), Add(Old<u64>(select Test::R.v<Test::R>($t0)), 1));
+}
+
+fun Test::ref_param[baseline]
+spec {
+  ensures Eq<u64>(result0(), select Test::R.v<Test::R>($t0));
+}
+
+fun Test::ref_param[verification]
+spec {
+  ensures Eq<u64>(result0(), select Test::R.v<Test::R>($t0));
+}
+
+fun Test::ref_param_return_ref[baseline]
+spec {
+  ensures Eq<u64>(result0(), select Test::R.v<Test::R>($t0));
+}
+
+fun Test::ref_param_return_ref[verification]
+spec {
+  ensures Eq<u64>(result0(), select Test::R.v<Test::R>($t0));
+}
+
+fun Test::resource_with_old[baseline]
+spec {
+  requires Gt($t0, 0);
+  aborts_if Not(exists<Test::R>(0x0));
+  aborts_if Ge(Add(select Test::R.v<Test::R>(global<Test::R>(0x0)), $t0), 18446744073709551615);
+  ensures Eq<u64>(select Test::R.v<Test::R>(global<Test::R>(0x0)), Add(select Test::R.v<Test::R>(Old<Test::R>(global<Test::R>(0x0))), $t0));
+  modifies global<Test::R>(0x0);
+}
+
+fun Test::resource_with_old[verification]
+spec {
+  requires Gt($t0, 0);
+  aborts_if Not(exists<Test::R>(0x0));
+  aborts_if Ge(Add(select Test::R.v<Test::R>(global<Test::R>(0x0)), $t0), 18446744073709551615);
+  ensures Eq<u64>(select Test::R.v<Test::R>(global<Test::R>(0x0)), Add(select Test::R.v<Test::R>(Old<Test::R>(global<Test::R>(0x0))), $t0));
+  modifies global<Test::R>(0x0);
+}
diff --git a/third_party/move/move-prover/bytecode-pipeline/tests/spec_instrumentation/generics.v2_exp b/third_party/move/move-prover/bytecode-pipeline/tests/spec_instrumentation/generics.v2_exp
new file mode 100644
index 0000000000000..82dcdda4e77a4
--- /dev/null
+++ b/third_party/move/move-prover/bytecode-pipeline/tests/spec_instrumentation/generics.v2_exp
@@ -0,0 +1,94 @@
+============ initial translation from Move ================
+
+[variant baseline]
+fun Generics::remove<#0>($t0|a: address): Generics::R<#0> {
+     var $t1: address
+     var $t2: Generics::R<#0>
+  0: $t1 := move($t0)
+  1: $t2 := move_from<Generics::R<#0>>($t1)
+  2: return $t2
+}
+
+
+[variant baseline]
+fun Generics::remove_u64($t0|a: address): Generics::R<u64> {
+     var $t1: address
+     var $t2: Generics::R<u64>
+  0: $t1 := move($t0)
+  1: $t2 := Generics::remove<u64>($t1)
+  2: return $t2
+}
+
+============ after pipeline `spec_instrumentation` ================
+
+[variant verification]
+fun Generics::remove<#0>($t0|a: address): Generics::R<#0> {
+     var $t1: Generics::R<#0>
+     var $t2: num
+  0: assume CanModify<Generics::R<#0>>($t0)
+     # VC: caller does not have permission to modify `Generics::R<#0>` at given address at tests/spec_instrumentation/generics.move:11:9+9
+  1: assert CanModify<Generics::R<#0>>($t0)
+  2: $t1 := move_from<Generics::R<#0>>($t0) on_abort goto 6 with $t2
+  3: label L1
+     # VC: post-condition does not hold at tests/spec_instrumentation/generics.move:20:9+25
+  4: assert Not(exists<Generics::R<#0>>($t0))
+  5: return $t1
+  6: label L2
+  7: abort($t2)
+}
+
+
+[variant verification]
+fun Generics::remove_u64($t0|a: address): Generics::R<u64> {
+     var $t1: Generics::R<u64>
+     var $t2: bool
+     var $t3: num
+  0: assume CanModify<Generics::R<u64>>($t0)
+     # VC: caller does not have permission to modify `Generics::R<u64>` at given address at tests/spec_instrumentation/generics.move:24:9+14
+  1: assert CanModify<Generics::R<u64>>($t0)
+  2: $t1 := opaque begin: Generics::remove<u64>($t0)
+  3: $t2 := havoc[val]()
+  4: if ($t2) goto 5 else goto 8
+  5: label L4
+  6: trace_abort($t3)
+  7: goto 16
+  8: label L3
+  9: modifies global<Generics::R<u64>>($t0)
+ 10: assume WellFormed($t1)
+ 11: assume Not(exists<Generics::R<u64>>($t0))
+ 12: $t1 := opaque end: Generics::remove<u64>($t0)
+ 13: label L1
+     # VC: post-condition does not hold at tests/spec_instrumentation/generics.move:20:9+25
+ 14: assert Not(exists<Generics::R<u64>>($t0))
+ 15: return $t1
+ 16: label L2
+ 17: abort($t3)
+}
+
+
+
+==== spec-instrumenter input specs ====
+
+fun Generics::remove[baseline]
+spec {
+  modifies global<Generics::R<#0>>($t0);
+  ensures Not(exists<Generics::R<#0>>($t0));
+}
+
+fun Generics::remove[verification]
+spec {
+  modifies global<Generics::R<#0>>($t0);
+  ensures Not(exists<Generics::R<#0>>($t0));
+}
+
+fun Generics::remove_u64[baseline]
+spec {
+  modifies global<Generics::R<u64>>($t0);
+  ensures Not(exists<Generics::R<u64>>($t0));
+}
+
+fun Generics::remove_u64[verification]
+spec {
+  modifies global<Generics::R<u64>>($t0);
+  ensures Not(exists<Generics::R<u64>>($t0));
+}
diff --git a/third_party/move/move-prover/bytecode-pipeline/tests/spec_instrumentation/modifies.v2_exp b/third_party/move/move-prover/bytecode-pipeline/tests/spec_instrumentation/modifies.v2_exp
new file mode 100644
index 0000000000000..a1b6c4102f2f2
--- /dev/null
+++ b/third_party/move/move-prover/bytecode-pipeline/tests/spec_instrumentation/modifies.v2_exp
@@ -0,0 +1,576 @@
+============ initial translation from Move ================
+
+[variant baseline]
+public fun A::mutate_at($t0|addr: address) {
+     var $t1|s: &mut A::S
+     var $t2: address
+     var $t3: &mut A::S
+     var $t4: u64
+     var $t5: &mut A::S
+     var $t6: &mut u64
+  0: $t2 := move($t0)
+  1: $t3 := borrow_global<A::S>($t2)
+  2: $t1 := $t3
+  3: $t4 := 2
+  4: $t5 := move($t1)
+  5: $t6 := borrow_field<A::S>.x($t5)
+  6: write_ref($t6, $t4)
+  7: return ()
+}
+
+
+[variant baseline]
+public fun A::read_at($t0|addr: address): u64 {
+     var $t1: address
+     var $t2: &A::S
+     var $t3: &u64
+     var $t4: u64
+  0: $t1 := move($t0)
+  1: $t2 := borrow_global<A::S>($t1)
+  2: $t3 := borrow_field<A::S>.x($t2)
+  3: $t4 := read_ref($t3)
+  4: return $t4
+}
+
+
+[variant baseline]
+public fun B::move_from_test_incorrect($t0|addr1: address, $t1|addr2: address): B::T {
+     var $t2|v: B::T
+     var $t3|x0: u64
+     var $t4|x1: u64
+     var $t5: address
+     var $t6: u64
+     var $t7: address
+     var $t8: B::T
+     var $t9: address
+     var $t10: u64
+     var $t11: B::T
+  0: $t5 := copy($t1)
+  1: $t6 := A::read_at($t5)
+  2: $t3 := $t6
+  3: $t7 := move($t0)
+  4: $t8 := move_from<B::T>($t7)
+  5: $t2 := $t8
+  6: $t9 := move($t1)
+  7: $t10 := A::read_at($t9)
+  8: $t4 := $t10
+  9: assert Eq<u64>($t3, $t4)
+ 10: $t11 := move($t2)
+ 11: return $t11
+}
+
+
+[variant baseline]
+public fun B::move_to_test_incorrect($t0|account: &signer, $t1|addr2: address) {
+     var $t2|x0: u64
+     var $t3|x1: u64
+     var $t4: address
+     var $t5: u64
+     var $t6: &signer
+     var $t7: u64
+     var $t8: B::T
+     var $t9: address
+     var $t10: u64
+  0: $t4 := copy($t1)
+  1: $t5 := A::read_at($t4)
+  2: $t2 := $t5
+  3: $t6 := move($t0)
+  4: $t7 := 2
+  5: $t8 := pack B::T($t7)
+  6: move_to<B::T>($t8, $t6)
+  7: $t9 := move($t1)
+  8: $t10 := A::read_at($t9)
+  9: $t3 := $t10
+ 10: assert Eq<u64>($t2, $t3)
+ 11: return ()
+}
+
+
+[variant baseline]
+public fun B::mutate_S_test1_incorrect($t0|addr1: address, $t1|addr2: address) {
+     var $t2|x0: u64
+     var $t3|x1: u64
+     var $t4: address
+     var $t5: u64
+     var $t6: address
+     var $t7: address
+     var $t8: u64
+  0: $t4 := copy($t1)
+  1: $t5 := A::read_at($t4)
+  2: $t2 := $t5
+  3: $t6 := move($t0)
+  4: A::mutate_at($t6)
+  5: $t7 := move($t1)
+  6: $t8 := A::read_at($t7)
+  7: $t3 := $t8
+  8: assert Eq<u64>($t2, $t3)
+  9: return ()
+}
+
+
+[variant baseline]
+public fun B::mutate_S_test2_incorrect($t0|addr: address) {
+     var $t1|x0: u64
+     var $t2|x1: u64
+     var $t3: address
+     var $t4: u64
+     var $t5: address
+     var $t6: address
+     var $t7: u64
+  0: $t3 := copy($t0)
+  1: $t4 := A::read_at($t3)
+  2: $t1 := $t4
+  3: $t5 := copy($t0)
+  4: A::mutate_at($t5)
+  5: $t6 := move($t0)
+  6: $t7 := A::read_at($t6)
+  7: $t2 := $t7
+  8: assert Eq<u64>($t1, $t2)
+  9: return ()
+}
+
+
+[variant baseline]
+public fun B::mutate_at_test_incorrect($t0|addr1: address, $t1|addr2: address) {
+     var $t2|t: &mut B::T
+     var $t3|x0: u64
+     var $t4|x1: u64
+     var $t5: address
+     var $t6: u64
+     var $t7: address
+     var $t8: &mut B::T
+     var $t9: u64
+     var $t10: &mut B::T
+     var $t11: &mut u64
+     var $t12: address
+     var $t13: u64
+  0: $t5 := copy($t1)
+  1: $t6 := A::read_at($t5)
+  2: $t3 := $t6
+  3: $t7 := move($t0)
+  4: $t8 := borrow_global<B::T>($t7)
+  5: $t2 := $t8
+  6: $t9 := 2
+  7: $t10 := move($t2)
+  8: $t11 := borrow_field<B::T>.x($t10)
+  9: write_ref($t11, $t9)
+ 10: $t12 := move($t1)
+ 11: $t13 := A::read_at($t12)
+ 12: $t4 := $t13
+ 13: assert Eq<u64>($t3, $t4)
+ 14: return ()
+}
+
+============ after pipeline `spec_instrumentation` ================
+
+[variant verification]
+public fun A::mutate_at($t0|addr: address) {
+     var $t1|s: &mut A::S
+     var $t2: &mut A::S
+     var $t3: num
+     var $t4: u64
+     var $t5: &mut u64
+  0: assume CanModify<A::S>($t0)
+  1: @0 := save_mem(A::S)
+     # VC: caller does not have permission to modify `A::S` at given address at tests/spec_instrumentation/modifies.move:18:17+17
+  2: assert CanModify<A::S>($t0)
+  3: $t2 := borrow_global<A::S>($t0) on_abort goto 13 with $t3
+  4: $t4 := 2
+  5: $t5 := borrow_field<A::S>.x($t2)
+  6: write_ref($t5, $t4)
+  7: write_back[Reference($t2).x (u64)]($t5)
+  8: write_back[A::S@]($t2)
+  9: label L1
+     # VC: function does not abort under this condition at tests/spec_instrumentation/modifies.move:24:9+27
+ 10: assert Not(Not(exists[@0]<A::S>($t0)))
+     # VC: post-condition does not hold at tests/spec_instrumentation/modifies.move:23:9+31
+ 11: assert Eq<u64>(select A::S.x<A::S>(global<A::S>($t0)), 2)
+ 12: return ()
+ 13: label L2
+     # VC: abort not covered by any of the `aborts_if` clauses at tests/spec_instrumentation/modifies.move:21:5+162
+ 14: assert Not(exists[@0]<A::S>($t0))
+ 15: abort($t3)
+}
+
+
+[variant verification]
+public fun A::read_at($t0|addr: address): u64 {
+     var $t1: A::S
+     var $t2: num
+     var $t3: u64
+  0: @1 := save_mem(A::S)
+  1: $t1 := get_global<A::S>($t0) on_abort goto 7 with $t2
+  2: $t3 := get_field<A::S>.x($t1)
+  3: label L1
+     # VC: function does not abort under this condition at tests/spec_instrumentation/modifies.move:13:9+27
+  4: assert Not(Not(exists[@1]<A::S>($t0)))
+     # VC: post-condition does not hold at tests/spec_instrumentation/modifies.move:14:9+36
+  5: assert Eq<u64>($t3, select A::S.x<A::S>(global<A::S>($t0)))
+  6: return $t3
+  7: label L2
+     # VC: abort not covered by any of the `aborts_if` clauses at tests/spec_instrumentation/modifies.move:11:5+131
+  8: assert Not(exists[@1]<A::S>($t0))
+  9: abort($t2)
+}
+
+
+[variant verification]
+public fun B::move_from_test_incorrect($t0|addr1: address, $t1|addr2: address): B::T {
+     var $t2|v: B::T
+     var $t3|x0: u64
+     var $t4|x1: u64
+     var $t5: u64
+     var $t6: bool
+     var $t7: num
+     var $t8: B::T
+     var $t9: u64
+     var $t10: bool
+  0: assume CanModify<B::T>($t1)
+  1: $t5 := opaque begin: A::read_at($t1)
+  2: assume Identical($t6, Not(exists<A::S>($t1)))
+  3: if ($t6) goto 4 else goto 7
+  4: label L4
+  5: trace_abort($t7)
+  6: goto 26
+  7: label L3
+  8: assume WellFormed($t5)
+  9: assume Eq<u64>($t5, select A::S.x<A::S>(global<A::S>($t1)))
+ 10: $t5 := opaque end: A::read_at($t1)
+     # VC: caller does not have permission to modify `B::T` at given address at tests/spec_instrumentation/modifies.move:65:17+9
+ 11: assert CanModify<B::T>($t0)
+ 12: $t8 := move_from<B::T>($t0) on_abort goto 26 with $t7
+ 13: $t9 := opaque begin: A::read_at($t1)
+ 14: assume Identical($t10, Not(exists<A::S>($t1)))
+ 15: if ($t10) goto 16 else goto 19
+ 16: label L6
+ 17: trace_abort($t7)
+ 18: goto 26
+ 19: label L5
+ 20: assume WellFormed($t9)
+ 21: assume Eq<u64>($t9, select A::S.x<A::S>(global<A::S>($t1)))
+ 22: $t9 := opaque end: A::read_at($t1)
+ 23: assert Eq<u64>($t5, $t9)
+ 24: label L1
+ 25: return $t8
+ 26: label L2
+ 27: abort($t7)
+}
+
+
+[variant verification]
+public fun B::move_to_test_incorrect($t0|account: signer, $t1|addr2: address) {
+     var $t2|x0: u64
+     var $t3|x1: u64
+     var $t4: u64
+     var $t5: bool
+     var $t6: num
+     var $t7: u64
+     var $t8: B::T
+     var $t9: u64
+     var $t10: bool
+  0: assume CanModify<B::T>($t1)
+  1: $t4 := opaque begin: A::read_at($t1)
+  2: assume Identical($t5, Not(exists<A::S>($t1)))
+  3: if ($t5) goto 4 else goto 7
+  4: label L4
+  5: trace_abort($t6)
+  6: goto 28
+  7: label L3
+  8: assume WellFormed($t4)
+  9: assume Eq<u64>($t4, select A::S.x<A::S>(global<A::S>($t1)))
+ 10: $t4 := opaque end: A::read_at($t1)
+ 11: $t7 := 2
+ 12: $t8 := pack B::T($t7)
+     # VC: caller does not have permission to modify `B::T` at given address at tests/spec_instrumentation/modifies.move:52:9+7
+ 13: assert CanModify<B::T>($t0)
+ 14: move_to<B::T>($t8, $t0) on_abort goto 28 with $t6
+ 15: $t9 := opaque begin: A::read_at($t1)
+ 16: assume Identical($t10, Not(exists<A::S>($t1)))
+ 17: if ($t10) goto 18 else goto 21
+ 18: label L6
+ 19: trace_abort($t6)
+ 20: goto 28
+ 21: label L5
+ 22: assume WellFormed($t9)
+ 23: assume Eq<u64>($t9, select A::S.x<A::S>(global<A::S>($t1)))
+ 24: $t9 := opaque end: A::read_at($t1)
+ 25: assert Eq<u64>($t4, $t9)
+ 26: label L1
+ 27: return ()
+ 28: label L2
+ 29: abort($t6)
+}
+
+
+[variant verification]
+public fun B::mutate_S_test1_incorrect($t0|addr1: address, $t1|addr2: address) {
+     var $t2|x0: u64
+     var $t3|x1: u64
+     var $t4: u64
+     var $t5: bool
+     var $t6: num
+     var $t7: bool
+     var $t8: u64
+     var $t9: bool
+  0: assume Neq<address>($t0, $t1)
+  1: assume CanModify<A::S>($t1)
+  2: $t4 := opaque begin: A::read_at($t1)
+  3: assume Identical($t5, Not(exists<A::S>($t1)))
+  4: if ($t5) goto 5 else goto 8
+  5: label L4
+  6: trace_abort($t6)
+  7: goto 36
+  8: label L3
+  9: assume WellFormed($t4)
+ 10: assume Eq<u64>($t4, select A::S.x<A::S>(global<A::S>($t1)))
+ 11: $t4 := opaque end: A::read_at($t1)
+     # VC: caller does not have permission to modify `A::S` at given address at tests/spec_instrumentation/modifies.move:79:9+19
+ 12: assert CanModify<A::S>($t0)
+ 13: opaque begin: A::mutate_at($t0)
+ 14: assume Identical($t7, Not(exists<A::S>($t0)))
+ 15: if ($t7) goto 16 else goto 19
+ 16: label L6
+ 17: trace_abort($t6)
+ 18: goto 36
+ 19: label L5
+ 20: modifies global<A::S>($t0)
+ 21: assume Eq<u64>(select A::S.x<A::S>(global<A::S>($t0)), 2)
+ 22: opaque end: A::mutate_at($t0)
+ 23: $t8 := opaque begin: A::read_at($t1)
+ 24: assume Identical($t9, Not(exists<A::S>($t1)))
+ 25: if ($t9) goto 26 else goto 29
+ 26: label L8
+ 27: trace_abort($t6)
+ 28: goto 36
+ 29: label L7
+ 30: assume WellFormed($t8)
+ 31: assume Eq<u64>($t8, select A::S.x<A::S>(global<A::S>($t1)))
+ 32: $t8 := opaque end: A::read_at($t1)
+ 33: assert Eq<u64>($t4, $t8)
+ 34: label L1
+ 35: return ()
+ 36: label L2
+ 37: abort($t6)
+}
+
+
+[variant verification]
+public fun B::mutate_S_test2_incorrect($t0|addr: address) {
+     var $t1|x0: u64
+     var $t2|x1: u64
+     var $t3: u64
+     var $t4: bool
+     var $t5: num
+     var $t6: bool
+     var $t7: u64
+     var $t8: bool
+  0: assume CanModify<A::S>($t0)
+  1: $t3 := opaque begin: A::read_at($t0)
+  2: assume Identical($t4, Not(exists<A::S>($t0)))
+  3: if ($t4) goto 4 else goto 7
+  4: label L4
+  5: trace_abort($t5)
+  6: goto 35
+  7: label L3
+  8: assume WellFormed($t3)
+  9: assume Eq<u64>($t3, select A::S.x<A::S>(global<A::S>($t0)))
+ 10: $t3 := opaque end: A::read_at($t0)
+     # VC: caller does not have permission to modify `A::S` at given address at tests/spec_instrumentation/modifies.move:92:9+18
+ 11: assert CanModify<A::S>($t0)
+ 12: opaque begin: A::mutate_at($t0)
+ 13: assume Identical($t6, Not(exists<A::S>($t0)))
+ 14: if ($t6) goto 15 else goto 18
+ 15: label L6
+ 16: trace_abort($t5)
+ 17: goto 35
+ 18: label L5
+ 19: modifies global<A::S>($t0)
+ 20: assume Eq<u64>(select A::S.x<A::S>(global<A::S>($t0)), 2)
+ 21: opaque end: A::mutate_at($t0)
+ 22: $t7 := opaque begin: A::read_at($t0)
+ 23: assume Identical($t8, Not(exists<A::S>($t0)))
+ 24: if ($t8) goto 25 else goto 28
+ 25: label L8
+ 26: trace_abort($t5)
+ 27: goto 35
+ 28: label L7
+ 29: assume WellFormed($t7)
+ 30: assume Eq<u64>($t7, select A::S.x<A::S>(global<A::S>($t0)))
+ 31: $t7 := opaque end: A::read_at($t0)
+ 32: assert Eq<u64>($t3, $t7)
+ 33: label L1
+ 34: return ()
+ 35: label L2
+ 36: abort($t5)
+}
+
+
+[variant verification]
+public fun B::mutate_at_test_incorrect($t0|addr1: address, $t1|addr2: address) {
+     var $t2|t: &mut B::T
+     var $t3|x0: u64
+     var $t4|x1: u64
+     var $t5: u64
+     var $t6: bool
+     var $t7: num
+     var $t8: &mut B::T
+     var $t9: u64
+     var $t10: &mut u64
+     var $t11: u64
+     var $t12: bool
+  0: assume CanModify<B::T>($t1)
+  1: $t5 := opaque begin: A::read_at($t1)
+  2: assume Identical($t6, Not(exists<A::S>($t1)))
+  3: if ($t6) goto 4 else goto 7
+  4: label L4
+  5: trace_abort($t7)
+  6: goto 31
+  7: label L3
+  8: assume WellFormed($t5)
+  9: assume Eq<u64>($t5, select A::S.x<A::S>(global<A::S>($t1)))
+ 10: $t5 := opaque end: A::read_at($t1)
+     # VC: caller does not have permission to modify `B::T` at given address at tests/spec_instrumentation/modifies.move:38:17+17
+ 11: assert CanModify<B::T>($t0)
+ 12: $t8 := borrow_global<B::T>($t0) on_abort goto 31 with $t7
+ 13: $t9 := 2
+ 14: $t10 := borrow_field<B::T>.x($t8)
+ 15: write_ref($t10, $t9)
+ 16: write_back[Reference($t8).x (u64)]($t10)
+ 17: write_back[B::T@]($t8)
+ 18: $t11 := opaque begin: A::read_at($t1)
+ 19: assume Identical($t12, Not(exists<A::S>($t1)))
+ 20: if ($t12) goto 21 else goto 24
+ 21: label L6
+ 22: trace_abort($t7)
+ 23: goto 31
+ 24: label L5
+ 25: assume WellFormed($t11)
+ 26: assume Eq<u64>($t11, select A::S.x<A::S>(global<A::S>($t1)))
+ 27: $t11 := opaque end: A::read_at($t1)
+ 28: assert Eq<u64>($t5, $t11)
+ 29: label L1
+ 30: return ()
+ 31: label L2
+ 32: abort($t7)
+}
+
+
+
+==== spec-instrumenter input specs ====
+
+fun A::mutate_at[baseline]
+spec {
+  ensures Eq<u64>(select A::S.x<A::S>(global<A::S>($t0)), 2);
+  aborts_if Not(exists<A::S>($t0));
+  modifies global<A::S>($t0);
+}
+
+fun A::mutate_at[verification]
+spec {
+  ensures Eq<u64>(select A::S.x<A::S>(global<A::S>($t0)), 2);
+  aborts_if Not(exists<A::S>($t0));
+  modifies global<A::S>($t0);
+}
+
+fun A::read_at[baseline]
+spec {
+  aborts_if Not(exists<A::S>($t0));
+  ensures Eq<u64>(result0(), select A::S.x<A::S>(global<A::S>($t0)));
+}
+
+fun A::read_at[verification]
+spec {
+  aborts_if Not(exists<A::S>($t0));
+  ensures Eq<u64>(result0(), select A::S.x<A::S>(global<A::S>($t0)));
+}
+
+fun B::move_from_test_incorrect[baseline]
+spec {
+  modifies global<B::T>($t1);
+}
+9 -> spec {
+  assert Eq<u64>($t3, $t4);
+}
+
+
+fun B::move_from_test_incorrect[verification]
+spec {
+  modifies global<B::T>($t1);
+}
+9 -> spec {
+  assert Eq<u64>($t3, $t4);
+}
+
+
+fun B::move_to_test_incorrect[baseline]
+spec {
+  modifies global<B::T>($t1);
+}
+10 -> spec {
+  assert Eq<u64>($t2, $t3);
+}
+
+
+fun B::move_to_test_incorrect[verification]
+spec {
+  modifies global<B::T>($t1);
+}
+10 -> spec {
+  assert Eq<u64>($t2, $t3);
+}
+
+
+fun B::mutate_S_test1_incorrect[baseline]
+spec {
+  requires Neq<address>($t0, $t1);
+  modifies global<A::S>($t1);
+}
+8 -> spec {
+  assert Eq<u64>($t2, $t3);
+}
+
+
+fun B::mutate_S_test1_incorrect[verification]
+spec {
+  requires Neq<address>($t0, $t1);
+  modifies global<A::S>($t1);
+}
+8 -> spec {
+  assert Eq<u64>($t2, $t3);
+}
+
+
+fun B::mutate_S_test2_incorrect[baseline]
+spec {
+  modifies global<A::S>($t0);
+}
+8 -> spec {
+  assert Eq<u64>($t1, $t2);
+}
+
+
+fun B::mutate_S_test2_incorrect[verification]
+spec {
+  modifies global<A::S>($t0);
+}
+8 -> spec {
+  assert Eq<u64>($t1, $t2);
+}
+
+
+fun B::mutate_at_test_incorrect[baseline]
+spec {
+  modifies global<B::T>($t1);
+}
+13 -> spec {
+  assert Eq<u64>($t3, $t4);
+}
+
+
+fun B::mutate_at_test_incorrect[verification]
+spec {
+  modifies global<B::T>($t1);
+}
+13 -> spec {
+  assert Eq<u64>($t3, $t4);
+}
diff --git a/third_party/move/move-prover/bytecode-pipeline/tests/spec_instrumentation/opaque_call.v2_exp b/third_party/move/move-prover/bytecode-pipeline/tests/spec_instrumentation/opaque_call.v2_exp
new file mode 100644
index 0000000000000..4d54e160f9f67
--- /dev/null
+++ b/third_party/move/move-prover/bytecode-pipeline/tests/spec_instrumentation/opaque_call.v2_exp
@@ -0,0 +1,218 @@
+============ initial translation from Move ================
+
+[variant baseline]
+fun Test::get_and_incr($t0|addr: address): u64 {
+     var $t1|r: &mut Test::R
+     var $t2|v: u64
+     var $t3: address
+     var $t4: bool
+     var $t5: bool
+     var $t6: u64
+     var $t7: address
+     var $t8: &mut Test::R
+     var $t9: &mut Test::R
+     var $t10: &u64
+     var $t11: u64
+     var $t12: &mut Test::R
+     var $t13: &u64
+     var $t14: u64
+     var $t15: u64
+     var $t16: u64
+     var $t17: &mut Test::R
+     var $t18: &mut u64
+     var $t19: u64
+  0: $t3 := copy($t0)
+  1: $t4 := exists<Test::R>($t3)
+  2: $t5 := !($t4)
+  3: if ($t5) goto 4 else goto 7
+  4: label L1
+  5: $t6 := 33
+  6: abort($t6)
+  7: label L0
+  8: $t7 := move($t0)
+  9: $t8 := borrow_global<Test::R>($t7)
+ 10: $t1 := $t8
+ 11: $t9 := copy($t1)
+ 12: $t10 := borrow_field<Test::R>.v($t9)
+ 13: $t11 := read_ref($t10)
+ 14: $t2 := $t11
+ 15: $t12 := copy($t1)
+ 16: $t13 := borrow_field<Test::R>.v($t12)
+ 17: $t14 := read_ref($t13)
+ 18: $t15 := 1
+ 19: $t16 := +($t14, $t15)
+ 20: $t17 := move($t1)
+ 21: $t18 := borrow_field<Test::R>.v($t17)
+ 22: write_ref($t18, $t16)
+ 23: $t19 := move($t2)
+ 24: return $t19
+}
+
+
+[variant baseline]
+fun Test::incr_twice() {
+     var $t0: address
+     var $t1: u64
+     var $t2: address
+     var $t3: u64
+  0: $t0 := 0x1
+  1: $t1 := Test::get_and_incr($t0)
+  2: drop($t1)
+  3: $t2 := 0x1
+  4: $t3 := Test::get_and_incr($t2)
+  5: drop($t3)
+  6: return ()
+}
+
+============ after pipeline `spec_instrumentation` ================
+
+[variant verification]
+fun Test::get_and_incr($t0|addr: address): u64 {
+     var $t1|r: &mut Test::R
+     var $t2|v: u64
+     var $t3: bool
+     var $t4: bool
+     var $t5: u64
+     var $t6: num
+     var $t7: &mut Test::R
+     var $t8: u64
+     var $t9: u64
+     var $t10: u64
+     var $t11: u64
+     var $t12: &mut u64
+  0: assume Neq<address>($t0, 0x0)
+  1: assume CanModify<Test::R>($t0)
+  2: @0 := save_mem(Test::R)
+  3: $t3 := exists<Test::R>($t0)
+  4: $t4 := !($t3)
+  5: if ($t4) goto 6 else goto 10
+  6: label L1
+  7: $t5 := 33
+  8: $t6 := move($t5)
+  9: goto 27
+ 10: label L0
+     # VC: caller does not have permission to modify `Test::R` at given address at tests/spec_instrumentation/opaque_call.move:8:14+17
+ 11: assert CanModify<Test::R>($t0)
+ 12: $t7 := borrow_global<Test::R>($t0) on_abort goto 27 with $t6
+ 13: $t8 := get_field<Test::R>.v($t7)
+ 14: $t9 := get_field<Test::R>.v($t7)
+ 15: $t10 := 1
+ 16: $t11 := +($t9, $t10) on_abort goto 27 with $t6
+ 17: $t12 := borrow_field<Test::R>.v($t7)
+ 18: write_ref($t12, $t11)
+ 19: write_back[Reference($t7).v (u64)]($t12)
+ 20: write_back[Test::R@]($t7)
+ 21: label L2
+     # VC: function does not abort under this condition at tests/spec_instrumentation/opaque_call.move:16:6+35
+ 22: assert Not(Not(exists[@0]<Test::R>($t0)))
+     # VC: function does not abort under this condition at tests/spec_instrumentation/opaque_call.move:17:6+56
+ 23: assert Not(Ge(Add(select Test::R.v<Test::R>(global[@0]<Test::R>($t0)), 1), 18446744073709551615))
+     # VC: post-condition does not hold at tests/spec_instrumentation/opaque_call.move:19:6+56
+ 24: assert Eq<u64>(select Test::R.v<Test::R>(global<Test::R>($t0)), Add(select Test::R.v<Test::R>(global[@0]<Test::R>($t0)), 1))
+     # VC: post-condition does not hold at tests/spec_instrumentation/opaque_call.move:20:6+36
+ 25: assert Eq<u64>($t8, select Test::R.v<Test::R>(global<Test::R>($t0)))
+ 26: return $t8
+ 27: label L3
+     # VC: abort not covered by any of the `aborts_if` clauses at tests/spec_instrumentation/opaque_call.move:13:2+308
+ 28: assert Or(Not(exists[@0]<Test::R>($t0)), Ge(Add(select Test::R.v<Test::R>(global[@0]<Test::R>($t0)), 1), 18446744073709551615))
+     # VC: abort code not covered by any of the `aborts_if` or `aborts_with` clauses at tests/spec_instrumentation/opaque_call.move:13:2+308
+ 29: assert Or(And(Not(exists[@0]<Test::R>($t0)), Eq(33, $t6)), Ge(Add(select Test::R.v<Test::R>(global[@0]<Test::R>($t0)), 1), 18446744073709551615))
+ 30: abort($t6)
+}
+
+
+[variant verification]
+fun Test::incr_twice() {
+     var $t0: address
+     var $t1: u64
+     var $t2: bool
+     var $t3: num
+     var $t4: address
+     var $t5: u64
+     var $t6: bool
+  0: @1 := save_mem(Test::R)
+  1: $t0 := 0x1
+     # VC: precondition does not hold at this call at tests/spec_instrumentation/opaque_call.move:15:6+22
+  2: assert Neq<address>($t0, 0x0)
+  3: $t1 := opaque begin: Test::get_and_incr($t0)
+  4: assume Identical($t2, Or(Not(exists<Test::R>($t0)), Ge(Add(select Test::R.v<Test::R>(global<Test::R>($t0)), 1), 18446744073709551615)))
+  5: if ($t2) goto 6 else goto 10
+  6: label L4
+  7: assume Or(And(Not(exists<Test::R>($t0)), Eq(33, $t3)), Ge(Add(select Test::R.v<Test::R>(global<Test::R>($t0)), 1), 18446744073709551615))
+  8: trace_abort($t3)
+  9: goto 39
+ 10: label L3
+ 11: @2 := save_mem(Test::R)
+ 12: modifies global<Test::R>($t0)
+ 13: assume WellFormed($t1)
+ 14: assume Eq<u64>(select Test::R.v<Test::R>(global<Test::R>($t0)), Add(select Test::R.v<Test::R>(global[@2]<Test::R>($t0)), 1))
+ 15: assume Eq<u64>($t1, select Test::R.v<Test::R>(global<Test::R>($t0)))
+ 16: $t1 := opaque end: Test::get_and_incr($t0)
+ 17: drop($t1)
+ 18: $t4 := 0x1
+     # VC: precondition does not hold at this call at tests/spec_instrumentation/opaque_call.move:15:6+22
+ 19: assert Neq<address>($t4, 0x0)
+ 20: $t5 := opaque begin: Test::get_and_incr($t4)
+ 21: assume Identical($t6, Or(Not(exists<Test::R>($t4)), Ge(Add(select Test::R.v<Test::R>(global<Test::R>($t4)), 1), 18446744073709551615)))
+ 22: if ($t6) goto 23 else goto 27
+ 23: label L6
+ 24: assume Or(And(Not(exists<Test::R>($t4)), Eq(33, $t3)), Ge(Add(select Test::R.v<Test::R>(global<Test::R>($t4)), 1), 18446744073709551615))
+ 25: trace_abort($t3)
+ 26: goto 39
+ 27: label L5
+ 28: @3 := save_mem(Test::R)
+ 29: modifies global<Test::R>($t4)
+ 30: assume WellFormed($t5)
+ 31: assume Eq<u64>(select Test::R.v<Test::R>(global<Test::R>($t4)), Add(select Test::R.v<Test::R>(global[@3]<Test::R>($t4)), 1))
+ 32: assume Eq<u64>($t5, select Test::R.v<Test::R>(global<Test::R>($t4)))
+ 33: $t5 := opaque end: Test::get_and_incr($t4)
+ 34: drop($t5)
+ 35: label L1
+     # VC: function does not abort under this condition at tests/spec_instrumentation/opaque_call.move:28:6+35
+ 36: assert Not(Not(exists[@1]<Test::R>(0x1)))
+     # VC: post-condition does not hold at tests/spec_instrumentation/opaque_call.move:29:6+56
+ 37: assert Eq<u64>(select Test::R.v<Test::R>(global<Test::R>(0x1)), Add(select Test::R.v<Test::R>(global[@1]<Test::R>(0x1)), 2))
+ 38: return ()
+ 39: label L2
+     # VC: abort not covered by any of the `aborts_if` clauses at tests/spec_instrumentation/opaque_call.move:27:2+123
+ 40: assert Not(exists[@1]<Test::R>(0x1))
+     # VC: abort code not covered by any of the `aborts_if` or `aborts_with` clauses at tests/spec_instrumentation/opaque_call.move:27:2+123
+ 41: assert And(Not(exists[@1]<Test::R>(0x1)), Eq(33, $t3))
+ 42: abort($t3)
+}
+
+
+
+==== spec-instrumenter input specs ====
+
+fun Test::get_and_incr[baseline]
+spec {
+  requires Neq<address>($t0, 0x0);
+  aborts_if Not(exists<Test::R>($t0));
+  aborts_if Ge(Add(select Test::R.v<Test::R>(global<Test::R>($t0)), 1), 18446744073709551615);
+  modifies global<Test::R>($t0);
+  ensures Eq<u64>(select Test::R.v<Test::R>(global<Test::R>($t0)), Add(select Test::R.v<Test::R>(Old<Test::R>(global<Test::R>($t0))), 1));
+  ensures Eq<u64>(result0(), select Test::R.v<Test::R>(global<Test::R>($t0)));
+}
+
+fun Test::get_and_incr[verification]
+spec {
+  requires Neq<address>($t0, 0x0);
+  aborts_if Not(exists<Test::R>($t0));
+  aborts_if Ge(Add(select Test::R.v<Test::R>(global<Test::R>($t0)), 1), 18446744073709551615);
+  modifies global<Test::R>($t0);
+  ensures Eq<u64>(select Test::R.v<Test::R>(global<Test::R>($t0)), Add(select Test::R.v<Test::R>(Old<Test::R>(global<Test::R>($t0))), 1));
+  ensures Eq<u64>(result0(), select Test::R.v<Test::R>(global<Test::R>($t0)));
+}
+
+fun Test::incr_twice[baseline]
+spec {
+  aborts_if Not(exists<Test::R>(0x1));
+  ensures Eq<u64>(select Test::R.v<Test::R>(global<Test::R>(0x1)), Add(select Test::R.v<Test::R>(Old<Test::R>(global<Test::R>(0x1))), 2));
+}
+
+fun Test::incr_twice[verification]
+spec {
+  aborts_if Not(exists<Test::R>(0x1));
+  ensures Eq<u64>(select Test::R.v<Test::R>(global<Test::R>(0x1)), Add(select Test::R.v<Test::R>(Old<Test::R>(global<Test::R>(0x1))), 2));
+}
diff --git a/third_party/move/move-prover/bytecode-pipeline/tests/verification_analysis/inv_relevance.v2_exp b/third_party/move/move-prover/bytecode-pipeline/tests/verification_analysis/inv_relevance.v2_exp
new file mode 100644
index 0000000000000..91d8e13b2fcfb
--- /dev/null
+++ b/third_party/move/move-prover/bytecode-pipeline/tests/verification_analysis/inv_relevance.v2_exp
@@ -0,0 +1,120 @@
+============ initial translation from Move ================
+
+[variant baseline]
+fun InvRelevance::inner<#0>($t0|s: &signer, $t1|t: #0) {
+     var $t2: &signer
+     var $t3: #0
+     var $t4: InvRelevance::R<#0>
+  0: $t2 := move($t0)
+  1: $t3 := move($t1)
+  2: $t4 := pack InvRelevance::R<#0>($t3)
+  3: move_to<InvRelevance::R<#0>>($t4, $t2)
+  4: return ()
+}
+
+
+[variant baseline]
+public fun InvRelevance::outer_T<#0>($t0|s: &signer, $t1|t: #0) {
+     var $t2: &signer
+     var $t3: #0
+  0: $t2 := move($t0)
+  1: $t3 := move($t1)
+  2: InvRelevance::inner<#0>($t2, $t3)
+  3: return ()
+}
+
+
+[variant baseline]
+public fun InvRelevance::outer_bool($t0|s: &signer, $t1|t: bool) {
+     var $t2: &signer
+     var $t3: bool
+  0: $t2 := move($t0)
+  1: $t3 := move($t1)
+  2: InvRelevance::inner<bool>($t2, $t3)
+  3: return ()
+}
+
+
+[variant baseline]
+public fun InvRelevance::outer_u64($t0|s: &signer, $t1|t: u64) {
+     var $t2: &signer
+     var $t3: u64
+  0: $t2 := move($t0)
+  1: $t3 := move($t1)
+  2: InvRelevance::inner<u64>($t2, $t3)
+  3: return ()
+}
+
+============ after pipeline `verification_analysis` ================
+
+[variant baseline]
+fun InvRelevance::inner<#0>($t0|s: signer, $t1|t: #0) {
+     var $t2: InvRelevance::R<#0>
+  0: $t2 := pack InvRelevance::R<#0>($t1)
+  1: move_to<InvRelevance::R<#0>>($t2, $t0)
+  2: return ()
+}
+
+
+[variant baseline]
+public fun InvRelevance::outer_T<#0>($t0|s: signer, $t1|t: #0) {
+  0: InvRelevance::inner<#0>($t0, $t1)
+  1: return ()
+}
+
+
+[variant baseline]
+public fun InvRelevance::outer_bool($t0|s: signer, $t1|t: bool) {
+  0: InvRelevance::inner<bool>($t0, $t1)
+  1: return ()
+}
+
+
+[variant baseline]
+public fun InvRelevance::outer_u64($t0|s: signer, $t1|t: u64) {
+  0: InvRelevance::inner<u64>($t0, $t1)
+  1: return ()
+}
+
+
+********* Result of verification analysis *********
+
+functions that defer invariant checking at return: [
+]
+
+functions that delegate invariants to its callers: [
+]
+
+invariant applicability: [
+  InvRelevance::inner: {
+    accessed: [@0*]
+    modified: [@0*]
+    directly accessed: [@0*]
+    directly modified: [@0*]
+  }
+  InvRelevance::outer_T: {
+    accessed: [@0*]
+    modified: [@0*]
+    directly accessed: []
+    directly modified: []
+  }
+  InvRelevance::outer_bool: {
+    accessed: [@0*]
+    modified: [@0*]
+    directly accessed: []
+    directly modified: []
+  }
+  InvRelevance::outer_u64: {
+    accessed: []
+    modified: []
+    directly accessed: []
+    directly modified: []
+  }
+]
+
+verification analysis: [
+  InvRelevance::inner: verified + inlined
+  InvRelevance::outer_T: verified
+  InvRelevance::outer_bool: verified
+  InvRelevance::outer_u64: verified
+]
diff --git a/third_party/move/move-prover/bytecode-pipeline/tests/verification_analysis/inv_suspension.v2_exp b/third_party/move/move-prover/bytecode-pipeline/tests/verification_analysis/inv_suspension.v2_exp
new file mode 100644
index 0000000000000..5447894370b34
--- /dev/null
+++ b/third_party/move/move-prover/bytecode-pipeline/tests/verification_analysis/inv_suspension.v2_exp
@@ -0,0 +1,121 @@
+============ initial translation from Move ================
+
+[variant baseline]
+fun InvRelevance::inner<#0>($t0|s: &signer, $t1|t: #0) {
+     var $t2: &signer
+     var $t3: #0
+     var $t4: InvRelevance::R<#0>
+  0: $t2 := move($t0)
+  1: $t3 := move($t1)
+  2: $t4 := pack InvRelevance::R<#0>($t3)
+  3: move_to<InvRelevance::R<#0>>($t4, $t2)
+  4: return ()
+}
+
+
+[variant baseline]
+public fun InvRelevance::outer_T<#0>($t0|s: &signer, $t1|t: #0) {
+     var $t2: &signer
+     var $t3: #0
+  0: $t2 := move($t0)
+  1: $t3 := move($t1)
+  2: InvRelevance::inner<#0>($t2, $t3)
+  3: return ()
+}
+
+
+[variant baseline]
+public fun InvRelevance::outer_bool($t0|s: &signer, $t1|t: bool) {
+     var $t2: &signer
+     var $t3: bool
+  0: $t2 := move($t0)
+  1: $t3 := move($t1)
+  2: InvRelevance::inner<bool>($t2, $t3)
+  3: return ()
+}
+
+
+[variant baseline]
+public fun InvRelevance::outer_u64($t0|s: &signer, $t1|t: u64) {
+     var $t2: &signer
+     var $t3: u64
+  0: $t2 := move($t0)
+  1: $t3 := move($t1)
+  2: InvRelevance::inner<u64>($t2, $t3)
+  3: return ()
+}
+
+============ after pipeline `verification_analysis` ================
+
+[variant baseline]
+fun InvRelevance::inner<#0>($t0|s: signer, $t1|t: #0) {
+     var $t2: InvRelevance::R<#0>
+  0: $t2 := pack InvRelevance::R<#0>($t1)
+  1: move_to<InvRelevance::R<#0>>($t2, $t0)
+  2: return ()
+}
+
+
+[variant baseline]
+public fun InvRelevance::outer_T<#0>($t0|s: signer, $t1|t: #0) {
+  0: InvRelevance::inner<#0>($t0, $t1)
+  1: return ()
+}
+
+
+[variant baseline]
+public fun InvRelevance::outer_bool($t0|s: signer, $t1|t: bool) {
+  0: InvRelevance::inner<bool>($t0, $t1)
+  1: return ()
+}
+
+
+[variant baseline]
+public fun InvRelevance::outer_u64($t0|s: signer, $t1|t: u64) {
+  0: InvRelevance::inner<u64>($t0, $t1)
+  1: return ()
+}
+
+
+********* Result of verification analysis *********
+
+functions that defer invariant checking at return: [
+]
+
+functions that delegate invariants to its callers: [
+  InvRelevance::inner
+]
+
+invariant applicability: [
+  InvRelevance::inner: {
+    accessed: [@0*]
+    modified: [@0*]
+    directly accessed: [@0*]
+    directly modified: [@0*]
+  }
+  InvRelevance::outer_T: {
+    accessed: [@0*, @1*]
+    modified: [@0*, @1*]
+    directly accessed: [@1*]
+    directly modified: [@1*]
+  }
+  InvRelevance::outer_bool: {
+    accessed: [@0*]
+    modified: [@0*]
+    directly accessed: []
+    directly modified: []
+  }
+  InvRelevance::outer_u64: {
+    accessed: [@1*]
+    modified: [@1*]
+    directly accessed: [@1*]
+    directly modified: [@1*]
+  }
+]
+
+verification analysis: [
+  InvRelevance::inner: verified + inlined
+  InvRelevance::outer_T: verified
+  InvRelevance::outer_bool: verified
+  InvRelevance::outer_u64: verified
+]
diff --git a/third_party/move/move-prover/move-abigen/Cargo.toml b/third_party/move/move-prover/move-abigen/Cargo.toml
index d33e3f5de01e9..13880ec1606f9 100644
--- a/third_party/move/move-prover/move-abigen/Cargo.toml
+++ b/third_party/move/move-prover/move-abigen/Cargo.toml
@@ -29,6 +29,9 @@ move-prover = { path = ".." }
 move-prover-test-utils = { path = "../test-utils" }
 tempfile = { workspace = true }
 
+# force more deterministic tests
+move-stdlib = { path = "../../move-stdlib" }
+
 [[test]]
 name = "testsuite"
 harness = false
diff --git a/third_party/move/move-prover/move-abigen/tests/sources/bad_script.abi b/third_party/move/move-prover/move-abigen/tests/sources/bad_script.exp
similarity index 100%
rename from third_party/move/move-prover/move-abigen/tests/sources/bad_script.abi
rename to third_party/move/move-prover/move-abigen/tests/sources/bad_script.exp
diff --git a/third_party/move/move-prover/move-abigen/tests/sources/script_fun_in_module.exp b/third_party/move/move-prover/move-abigen/tests/sources/script_fun_in_module.exp
new file mode 100644
index 0000000000000..2f9e52408877d
--- /dev/null
+++ b/third_party/move/move-prover/move-abigen/tests/sources/script_fun_in_module.exp
@@ -0,0 +1,17 @@
+warning: unused variable
+   ┌─ tests/sources/script_fun_in_module.move:26:57
+   │
+26 │     public entry fun this_is_script_fun_with_signer_ref(account: &signer, _another_arg: u64) { }
+   │                                                         ^^^^^^^ Unused parameter 'account'. Consider removing or prefixing with an underscore: '_account'
+
+warning: unused variable
+   ┌─ tests/sources/script_fun_in_module.move:29:53
+   │
+29 │     public entry fun this_is_script_fun_with_signer(account: signer, _another_arg: u64) { }
+   │                                                     ^^^^^^^ Unused parameter 'account'. Consider removing or prefixing with an underscore: '_account'
+
+warning: unused variable
+   ┌─ tests/sources/script_fun_in_module.move:32:58
+   │
+32 │     public entry fun this_is_script_fun_with_string_args(account: &signer, _val: String) { }
+   │                                                          ^^^^^^^ Unused parameter 'account'. Consider removing or prefixing with an underscore: '_account'
diff --git a/third_party/move/move-prover/move-abigen/tests/testsuite.rs b/third_party/move/move-prover/move-abigen/tests/testsuite.rs
index 9348867573d98..122a3d8b97bdf 100644
--- a/third_party/move/move-prover/move-abigen/tests/testsuite.rs
+++ b/third_party/move/move-prover/move-abigen/tests/testsuite.rs
@@ -8,6 +8,7 @@ use log::debug;
 use move_prover::{cli::Options, run_move_prover};
 use move_prover_test_utils::baseline_test::verify_or_update_baseline;
 use std::{
+    collections::BTreeSet,
     ffi::OsStr,
     fs::{self, File},
     io::Read,
@@ -25,24 +26,26 @@ fn test_runner(path: &Path) -> datatest_stable::Result<()> {
     let mut options = Options::create_from_args(&args)?;
     options.setup_logging_for_test();
     options.abigen.compiled_script_directory = "tests/sources".to_string();
-    options.move_deps.push("../../move-stdlib".to_string());
+    options
+        .move_deps
+        .push("../../move-stdlib/sources".to_string());
     options
         .move_named_address_values
         .push("std=0x1".to_string());
 
-    test_abigen(path, options, "abi")?;
+    test_abigen(path, options, "exp")?;
 
     Ok(())
 }
 
-fn get_generated_abis(dir: &Path) -> std::io::Result<Vec<String>> {
+fn get_abi_paths_under_dir(dir: &Path) -> std::io::Result<Vec<String>> {
     let mut abi_paths = Vec::new();
     if dir.is_dir() {
         for entry in fs::read_dir(dir)? {
             let entry = entry?;
             let path = entry.path();
             if path.is_dir() {
-                abi_paths.append(&mut get_generated_abis(&path)?);
+                abi_paths.append(&mut get_abi_paths_under_dir(&path)?);
             } else if let Some("abi") = path.extension().and_then(OsStr::to_str) {
                 abi_paths.push(path.to_str().unwrap().to_string());
             }
@@ -54,11 +57,16 @@ fn get_generated_abis(dir: &Path) -> std::io::Result<Vec<String>> {
 fn test_abigen(path: &Path, mut options: Options, suffix: &str) -> anyhow::Result<()> {
     let temp_path = PathBuf::from(TempDir::new()?.path());
     options.abigen.output_directory = temp_path.to_string_lossy().to_string();
+    let output_dir = path.with_extension("");
+    let mut expected_apis = match get_abi_paths_under_dir(&output_dir) {
+        Ok(found) => found.iter().map(PathBuf::from).collect::<BTreeSet<_>>(),
+        _ => BTreeSet::new(),
+    };
 
     let mut error_writer = Buffer::no_color();
     match run_move_prover(&mut error_writer, options) {
         Ok(()) => {
-            for abi_path in get_generated_abis(&temp_path)?.iter() {
+            for abi_path in get_abi_paths_under_dir(&temp_path)?.iter() {
                 let mut contents = String::new();
                 if let Ok(mut file) = File::open(abi_path) {
                     file.read_to_string(&mut contents).unwrap();
@@ -68,7 +76,16 @@ fn test_abigen(path: &Path, mut options: Options, suffix: &str) -> anyhow::Resul
                 baseline_file_name.pop();
                 baseline_file_name.push(buf.strip_prefix(&temp_path)?);
                 verify_or_update_baseline(&baseline_file_name, &contents)?;
+                expected_apis.remove(&baseline_file_name);
+            }
+            let empty_contents = "".to_string();
+            for baseline_file_name in expected_apis.iter() {
+                verify_or_update_baseline(Path::new(baseline_file_name), &empty_contents)?;
             }
+            let buffer = error_writer.into_inner();
+            let contents = String::from_utf8_lossy(&buffer);
+            let baseline_path = path.with_extension(suffix);
+            verify_or_update_baseline(&baseline_path, &contents)?;
         },
         Err(err) => {
             let mut contents = format!("Move prover abigen returns: {}\n", err);
diff --git a/third_party/move/move-prover/move-docgen/Cargo.toml b/third_party/move/move-prover/move-docgen/Cargo.toml
index 2b349b757ad5e..c1193b4947ba5 100644
--- a/third_party/move/move-prover/move-docgen/Cargo.toml
+++ b/third_party/move/move-prover/move-docgen/Cargo.toml
@@ -14,6 +14,7 @@ move-core-types = { path = "../../move-core/types" }
 move-model = { path = "../../move-model" }
 
 # external dependencies
+clap = { workspace = true }
 codespan = { workspace = true }
 codespan-reporting = { workspace = true }
 itertools = { workspace = true }
diff --git a/third_party/move/move-prover/move-docgen/src/docgen.rs b/third_party/move/move-prover/move-docgen/src/docgen.rs
index 17d4e2cbb6e68..23556906dab25 100644
--- a/third_party/move/move-prover/move-docgen/src/docgen.rs
+++ b/third_party/move/move-prover/move-docgen/src/docgen.rs
@@ -2,6 +2,7 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
+use clap::ValueEnum;
 use codespan::{ByteIndex, Span};
 use itertools::Itertools;
 #[allow(unused_imports)]
@@ -20,7 +21,7 @@ use move_model::{
     ty::TypeDisplayContext,
 };
 use once_cell::sync::Lazy;
-use regex::Regex;
+use regex::{Captures, Regex};
 use serde::{Deserialize, Serialize};
 use std::{
     cell::RefCell,
@@ -36,6 +37,37 @@ use std::{
 /// The maximum number of subheadings that are allowed
 const MAX_SUBSECTIONS: usize = 6;
 
+/// Regexp for generating code doc
+static REGEX_CODE: Lazy<Regex> = Lazy::new(|| {
+    Regex::new(
+        "(?P<ident>(\\b\\w+\\b\\s*::\\s*)*\\b\\w+\\b)(?P<call>\\s*[(<])?|(?P<lt><)|(?P<gt>>)|(?P<nl>\n)|(?P<lb>\\{)|(?P<rb>\\})|(?P<amper>\\&)|(?P<squote>')|(?P<dquote>\")|(?P<sharp>#)|(?P<mul>\\*)|(?P<plus>\\+)|(?P<minus>\\-)|(?P<eq>\\=)|(?P<bar>\\|)|(?P<tilde>\\~)",
+    )
+        .unwrap()
+});
+
+/// Regexp for replacing html entities
+static REGEX_HTML_ENTITY: Lazy<Regex> = Lazy::new(|| {
+    Regex::new(
+        "(?P<lt><)|(?P<gt>>)|(?P<lb>\\{)|(?P<rb>\\})|(?P<amper>\\&)|(?P<squote>')|(?P<dquote>\")|(?P<mul>\\*)|(?P<plus>\\+)|(?P<minus>\\-)|(?P<eq>\\=)|(?P<bar>\\|)|(?P<tilde>\\~)",
+    )
+        .unwrap()
+});
+
+/// Regexp of html elements which are not encoded and left untouched
+static REGEX_HTML_ELEMENTS_TO_SKIP: Lazy<Regex> = Lazy::new(|| {
+    Regex::new(
+        r"</?(h[1-6]|p|span|div|a|em|strong|br|hr|pre|blockquote|ul|ol|li|dl|dt|dd|table|tr|th|td|thead|tbody|tfoot|code)(\s*|(\s+\b\w+\b\s*=[^>]*))>"
+    ).unwrap()
+});
+
+/// The output format of the docgen
+/// If the format is MDX, generated doc is mdx-compatible
+#[derive(ValueEnum, Clone, Copy, Debug, Eq, PartialEq, PartialOrd, Serialize, Deserialize)]
+pub enum OutputFormat {
+    MD,
+    MDX,
+}
+
 /// Options passed into the documentation generator.
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(default, deny_unknown_fields)]
@@ -93,6 +125,7 @@ pub struct DocgenOptions {
     pub include_call_diagrams: bool,
     /// If this is being compiled relative to a different place where it will be stored (output directory).
     pub compile_relative_to_output_dir: bool,
+    pub output_format: Option<OutputFormat>,
 }
 
 impl Default for DocgenOptions {
@@ -112,10 +145,17 @@ impl Default for DocgenOptions {
             references_file: None,
             include_dep_diagrams: false,
             include_call_diagrams: false,
+            output_format: None,
         }
     }
 }
 
+impl DocgenOptions {
+    fn is_mdx_compatible(&self) -> bool {
+        self.output_format.is_some_and(|o| o == OutputFormat::MDX)
+    }
+}
+
 /// The documentation generator.
 pub struct Docgen<'env> {
     options: &'env DocgenOptions,
@@ -792,7 +832,10 @@ impl<'env> Docgen<'env> {
                     .resolve_to_label(module_name, false)
                     .unwrap_or_default();
                 let module_link = label_link.split('#').next().unwrap_or("").to_string();
-                let suffix = format!(" of the <a href={}>{}</a> module", module_link, module_name);
+                let suffix = format!(
+                    " of the <a href=\"{}\">{}</a> module",
+                    module_link, module_name
+                );
                 (req_tag, module_link, suffix)
             } else {
                 (tag, String::new(), String::new())
@@ -1724,10 +1767,13 @@ impl<'env> Docgen<'env> {
 
     /// Decorates documentation text, identifying code fragments and decorating them
     /// as code. Code blocks in comments are untouched.
+    /// When generating mdx-compatible doc, need to encode html entities
     fn decorate_text(&self, text: &str) -> String {
         let mut decorated_text = String::new();
-        let mut chars = text.chars();
+        let mut chars = text.chars().peekable();
         let non_code_filter = |chr: &char| *chr != '`';
+        let non_code_or_rb_filter = |chr: &char| *chr != '`' && *chr != '>';
+        let non_code_or_lb_filter = |chr: &char| *chr != '`' && *chr != '<';
 
         while let Some(chr) = chars.next() {
             if chr == '`' {
@@ -1749,6 +1795,35 @@ impl<'env> Docgen<'env> {
                     )
                     .unwrap()
                 }
+            } else if self.options.is_mdx_compatible() {
+                if chr == '<' {
+                    let str = chars
+                        .take_while_ref(non_code_or_rb_filter)
+                        .collect::<String>();
+                    if chars.peek().is_some_and(|c| *c == '>') {
+                        let rb = chars.next().unwrap();
+                        let full_str = format!("{}{}{}", chr, str, rb);
+                        // skip encoding if `str` is a html element
+                        if REGEX_HTML_ELEMENTS_TO_SKIP.is_match(&full_str) {
+                            decorated_text.push_str(&full_str);
+                        } else {
+                            decorated_text.push_str(
+                                &self.encode_html_entities_in_text(&full_str.to_string()),
+                            );
+                        }
+                    } else {
+                        decorated_text
+                            .push_str(&self.encode_html_entities_in_text(&chr.to_string()));
+                        decorated_text
+                            .push_str(&self.encode_html_entities_in_text(&str.to_string()));
+                    }
+                } else {
+                    decorated_text.push_str(&self.encode_html_entities_in_text(&chr.to_string()));
+                    let str = chars
+                        .take_while_ref(non_code_or_lb_filter)
+                        .collect::<String>();
+                    decorated_text.push_str(&self.encode_html_entities_in_text(&str));
+                }
             } else {
                 decorated_text.push(chr);
                 decorated_text.extend(chars.take_while_ref(non_code_filter))
@@ -1775,21 +1850,51 @@ impl<'env> Docgen<'env> {
 
     /// Outputs decorated code text in context of a module.
     fn code_text(&self, code: &str) {
-        emitln!(self.writer, &self.decorate_code(code));
+        if self.options.is_mdx_compatible() {
+            emit!(self.writer, "{}<br />", &self.decorate_code(code));
+        } else {
+            emitln!(self.writer, &self.decorate_code(code));
+        }
+    }
+
+    /// Replace html entities if the output format needs to be mdx compatible
+    fn replace_for_mdx(&self, cap: &Captures) -> String {
+        static MDX: Lazy<Vec<(&str, &str)>> = Lazy::new(|| {
+            vec![
+                ("lt", "&lt;"),
+                ("gt", "&gt;"),
+                ("lb", "&#123;"),
+                ("rb", "&#125;"),
+                ("amper", "&amp;"),
+                ("dquote", "&quot;"),
+                ("squote", "&apos;"),
+                ("sharp", "&#35;"),
+                ("mul", "&#42;"),
+                ("plus", "&#43;"),
+                ("minus", "&#45;"),
+                ("eq", "&#61;"),
+                ("bar", "&#124;"),
+                ("tilde", "&#126;"),
+                ("nl", "<br />"),
+            ]
+        });
+        let mut r = "".to_string();
+        for (group_name, replacement) in MDX.iter() {
+            if cap.name(group_name).is_some() {
+                r = replacement.to_string();
+                break;
+            }
+        }
+        r
     }
 
     /// Decorates a code fragment, for use in an html block. Replaces < and >, bolds keywords and
     /// tries to resolve and cross-link references.
+    /// If the output format is MDX, replace all html entities to make the doc mdx compatible
     fn decorate_code(&self, code: &str) -> String {
-        static REX: Lazy<Regex> = Lazy::new(|| {
-            Regex::new(
-                r"(?P<ident>(\b\w+\b\s*::\s*)*\b\w+\b)(?P<call>\s*[(<])?|(?P<lt><)|(?P<gt>>)",
-            )
-            .unwrap()
-        });
         let mut r = String::new();
         let mut at = 0;
-        while let Some(cap) = REX.captures(&code[at..]) {
+        while let Some(cap) = REGEX_CODE.captures(&code[at..]) {
             let replacement = {
                 if cap.name("lt").is_some() {
                     "&lt;".to_owned()
@@ -1808,6 +1913,8 @@ impl<'env> Docgen<'env> {
                     } else {
                         "".to_owned()
                     }
+                } else if self.options.is_mdx_compatible() {
+                    self.replace_for_mdx(&cap)
                 } else {
                     "".to_owned()
                 }
@@ -1830,6 +1937,25 @@ impl<'env> Docgen<'env> {
         r
     }
 
+    /// Encodes html entities during decoration of a text fragment
+    /// Only called when the output is mdx-compatible
+    fn encode_html_entities_in_text(&self, code: &str) -> String {
+        let mut r = String::new();
+        let mut at = 0;
+        while let Some(cap) = REGEX_HTML_ENTITY.captures(&code[at..]) {
+            let replacement = self.replace_for_mdx(&cap);
+            if replacement.is_empty() {
+                r += &code[at..at + cap.get(0).unwrap().end()];
+            } else {
+                r += &code[at..at + cap.get(0).unwrap().start()];
+                r += &replacement;
+            }
+            at += cap.get(0).unwrap().end();
+        }
+        r += &code[at..];
+        r
+    }
+
     /// Resolve a string of the form `ident`, `ident::ident`, or `0xN::ident::ident` into
     /// the label for the declaration inside of this documentation. This uses a
     /// heuristic and may not work in all cases or produce wrong results (for instance, it
diff --git a/third_party/move/move-prover/move-docgen/tests/sources/attribute_placement.spec_inline.md b/third_party/move/move-prover/move-docgen/tests/sources/attribute_placement.spec_inline.md
index a28594de2c7d1..9f4db3a7f89cc 100644
--- a/third_party/move/move-prover/move-docgen/tests/sources/attribute_placement.spec_inline.md
+++ b/third_party/move/move-prover/move-docgen/tests/sources/attribute_placement.spec_inline.md
@@ -169,9 +169,9 @@
 
 
 
-<a id="0x1_main"></a>
+<a id="main"></a>
 
-# Module `0x1::main`
+# Script `main`
 
 
 
@@ -181,7 +181,6 @@
 
 
 -  [Constants](#@Constants_0)
--  [Function `main`](#0x1_main_main)
 
 
 <pre><code><b>use</b> <a href="attribute_placement.md#0x42_M">0x42::M</a>;
@@ -194,23 +193,18 @@
 ## Constants
 
 
-<a id="0x1_main_C"></a>
+<a id="main_C"></a>
 
 
 
-<pre><code><b>const</b> <a href="attribute_placement.md#0x1_main_C">C</a>: u64 = 0;
+<pre><code><b>const</b> <a href="attribute_placement.md#main_C">C</a>: u64 = 0;
 </code></pre>
 
 
 
-<a id="0x1_main_main"></a>
-
-## Function `main`
-
-
 
 <pre><code>#[attr14]
-<b>fun</b> <a href="attribute_placement.md#0x1_main">main</a>()
+<b>fun</b> <a href="attribute_placement.md#main">main</a>()
 </code></pre>
 
 
@@ -219,7 +213,7 @@
 <summary>Implementation</summary>
 
 
-<pre><code><b>fun</b> <a href="attribute_placement.md#0x1_main">main</a>() {
+<pre><code><b>fun</b> <a href="attribute_placement.md#main">main</a>() {
     <a href="attribute_placement.md#0x42_M_foo">M::foo</a>();
 }
 </code></pre>
diff --git a/third_party/move/move-prover/move-docgen/tests/sources/attribute_placement.spec_inline_no_fold.md b/third_party/move/move-prover/move-docgen/tests/sources/attribute_placement.spec_inline_no_fold.md
index 730618ebff222..dec97e824b074 100644
--- a/third_party/move/move-prover/move-docgen/tests/sources/attribute_placement.spec_inline_no_fold.md
+++ b/third_party/move/move-prover/move-docgen/tests/sources/attribute_placement.spec_inline_no_fold.md
@@ -150,9 +150,9 @@
 
 
 
-<a id="0x1_main"></a>
+<a id="main"></a>
 
-# Module `0x1::main`
+# Script `main`
 
 
 
@@ -162,7 +162,6 @@
 
 
 -  [Constants](#@Constants_0)
--  [Function `main`](#0x1_main_main)
 
 
 <pre><code><b>use</b> <a href="attribute_placement.md#0x42_M">0x42::M</a>;
@@ -175,23 +174,18 @@
 ## Constants
 
 
-<a id="0x1_main_C"></a>
+<a id="main_C"></a>
 
 
 
-<pre><code><b>const</b> <a href="attribute_placement.md#0x1_main_C">C</a>: u64 = 0;
+<pre><code><b>const</b> <a href="attribute_placement.md#main_C">C</a>: u64 = 0;
 </code></pre>
 
 
 
-<a id="0x1_main_main"></a>
-
-## Function `main`
-
-
 
 <pre><code>#[attr14]
-<b>fun</b> <a href="attribute_placement.md#0x1_main">main</a>()
+<b>fun</b> <a href="attribute_placement.md#main">main</a>()
 </code></pre>
 
 
@@ -199,7 +193,7 @@
 ##### Implementation
 
 
-<pre><code><b>fun</b> <a href="attribute_placement.md#0x1_main">main</a>() {
+<pre><code><b>fun</b> <a href="attribute_placement.md#main">main</a>() {
     <a href="attribute_placement.md#0x42_M_foo">M::foo</a>();
 }
 </code></pre>
diff --git a/third_party/move/move-prover/move-docgen/tests/sources/attribute_placement.spec_separate.md b/third_party/move/move-prover/move-docgen/tests/sources/attribute_placement.spec_separate.md
index 216da669df1f4..43855be19385d 100644
--- a/third_party/move/move-prover/move-docgen/tests/sources/attribute_placement.spec_separate.md
+++ b/third_party/move/move-prover/move-docgen/tests/sources/attribute_placement.spec_separate.md
@@ -179,9 +179,9 @@
 
 
 
-<a id="0x1_main"></a>
+<a id="main"></a>
 
-# Module `0x1::main`
+# Script `main`
 
 
 
@@ -191,7 +191,6 @@
 
 
 -  [Constants](#@Constants_0)
--  [Function `main`](#0x1_main_main)
 -  [Specification](#@Specification_1)
     -  [Function `main`](#@Specification_1_main)
 
@@ -206,23 +205,18 @@
 ## Constants
 
 
-<a id="0x1_main_C"></a>
+<a id="main_C"></a>
 
 
 
-<pre><code><b>const</b> <a href="attribute_placement.md#0x1_main_C">C</a>: u64 = 0;
+<pre><code><b>const</b> <a href="attribute_placement.md#main_C">C</a>: u64 = 0;
 </code></pre>
 
 
 
-<a id="0x1_main_main"></a>
-
-## Function `main`
-
-
 
 <pre><code>#[attr14]
-<b>fun</b> <a href="attribute_placement.md#0x1_main">main</a>()
+<b>fun</b> <a href="attribute_placement.md#main">main</a>()
 </code></pre>
 
 
@@ -231,7 +225,7 @@
 <summary>Implementation</summary>
 
 
-<pre><code><b>fun</b> <a href="attribute_placement.md#0x1_main">main</a>() {
+<pre><code><b>fun</b> <a href="attribute_placement.md#main">main</a>() {
     <a href="attribute_placement.md#0x42_M_foo">M::foo</a>();
 }
 </code></pre>
@@ -251,5 +245,5 @@
 
 
 <pre><code>#[attr14]
-<b>fun</b> <a href="attribute_placement.md#0x1_main">main</a>()
+<b>fun</b> <a href="attribute_placement.md#main">main</a>()
 </code></pre>
diff --git a/third_party/move/move-prover/move-docgen/tests/sources/code_block_test.spec_inline.md b/third_party/move/move-prover/move-docgen/tests/sources/code_block_test.spec_inline.md
index 00a94135b056b..b4e830abfebd3 100644
--- a/third_party/move/move-prover/move-docgen/tests/sources/code_block_test.spec_inline.md
+++ b/third_party/move/move-prover/move-docgen/tests/sources/code_block_test.spec_inline.md
@@ -1,26 +1,20 @@
 
-<a id="0x1_main"></a>
+<a id="main"></a>
 
-# Module `0x1::main`
+# Script `main`
 
 
 
--  [Function `main`](#0x1_main_main)
-    -  [Explanation of the algorithm](#@Explanation_of_the_algorithm_0)
+-  [Explanation of the algorithm](#@Explanation_of_the_algorithm_0)
 
 
 <pre><code></code></pre>
 
 
 
-<a id="0x1_main_main"></a>
-
-## Function `main`
-
-
 <a id="@Explanation_of_the_algorithm_0"></a>
 
-### Explanation of the algorithm
+## Explanation of the algorithm
 
 ```
 code block
@@ -28,7 +22,7 @@ code block
 then <code>inline code</code>
 
 
-<pre><code><b>fun</b> <a href="code_block_test.md#0x1_main">main</a>()
+<pre><code><b>fun</b> <a href="code_block_test.md#main">main</a>()
 </code></pre>
 
 
@@ -37,7 +31,7 @@ then <code>inline code</code>
 <summary>Implementation</summary>
 
 
-<pre><code><b>fun</b> <a href="code_block_test.md#0x1_main">main</a>() { }
+<pre><code><b>fun</b> <a href="code_block_test.md#main">main</a>() { }
 </code></pre>
 
 
diff --git a/third_party/move/move-prover/move-docgen/tests/sources/code_block_test.spec_inline_no_fold.md b/third_party/move/move-prover/move-docgen/tests/sources/code_block_test.spec_inline_no_fold.md
index cc8c917be0a78..70a6a7a3bdd86 100644
--- a/third_party/move/move-prover/move-docgen/tests/sources/code_block_test.spec_inline_no_fold.md
+++ b/third_party/move/move-prover/move-docgen/tests/sources/code_block_test.spec_inline_no_fold.md
@@ -1,26 +1,20 @@
 
-<a id="0x1_main"></a>
+<a id="main"></a>
 
-# Module `0x1::main`
+# Script `main`
 
 
 
--  [Function `main`](#0x1_main_main)
-    -  [Explanation of the algorithm](#@Explanation_of_the_algorithm_0)
+-  [Explanation of the algorithm](#@Explanation_of_the_algorithm_0)
 
 
 <pre><code></code></pre>
 
 
 
-<a id="0x1_main_main"></a>
-
-## Function `main`
-
-
 <a id="@Explanation_of_the_algorithm_0"></a>
 
-### Explanation of the algorithm
+## Explanation of the algorithm
 
 ```
 code block
@@ -28,7 +22,7 @@ code block
 then <code>inline code</code>
 
 
-<pre><code><b>fun</b> <a href="code_block_test.md#0x1_main">main</a>()
+<pre><code><b>fun</b> <a href="code_block_test.md#main">main</a>()
 </code></pre>
 
 
@@ -36,5 +30,5 @@ then <code>inline code</code>
 ##### Implementation
 
 
-<pre><code><b>fun</b> <a href="code_block_test.md#0x1_main">main</a>() { }
+<pre><code><b>fun</b> <a href="code_block_test.md#main">main</a>() { }
 </code></pre>
diff --git a/third_party/move/move-prover/move-docgen/tests/sources/code_block_test.spec_separate.md b/third_party/move/move-prover/move-docgen/tests/sources/code_block_test.spec_separate.md
index 00a94135b056b..b4e830abfebd3 100644
--- a/third_party/move/move-prover/move-docgen/tests/sources/code_block_test.spec_separate.md
+++ b/third_party/move/move-prover/move-docgen/tests/sources/code_block_test.spec_separate.md
@@ -1,26 +1,20 @@
 
-<a id="0x1_main"></a>
+<a id="main"></a>
 
-# Module `0x1::main`
+# Script `main`
 
 
 
--  [Function `main`](#0x1_main_main)
-    -  [Explanation of the algorithm](#@Explanation_of_the_algorithm_0)
+-  [Explanation of the algorithm](#@Explanation_of_the_algorithm_0)
 
 
 <pre><code></code></pre>
 
 
 
-<a id="0x1_main_main"></a>
-
-## Function `main`
-
-
 <a id="@Explanation_of_the_algorithm_0"></a>
 
-### Explanation of the algorithm
+## Explanation of the algorithm
 
 ```
 code block
@@ -28,7 +22,7 @@ code block
 then <code>inline code</code>
 
 
-<pre><code><b>fun</b> <a href="code_block_test.md#0x1_main">main</a>()
+<pre><code><b>fun</b> <a href="code_block_test.md#main">main</a>()
 </code></pre>
 
 
@@ -37,7 +31,7 @@ then <code>inline code</code>
 <summary>Implementation</summary>
 
 
-<pre><code><b>fun</b> <a href="code_block_test.md#0x1_main">main</a>() { }
+<pre><code><b>fun</b> <a href="code_block_test.md#main">main</a>() { }
 </code></pre>
 
 
diff --git a/third_party/move/move-prover/move-docgen/tests/sources/root_template.spec_inline.md b/third_party/move/move-prover/move-docgen/tests/sources/root_template.spec_inline.md
index cf8a747021dde..ba5a9d56e7b2a 100644
--- a/third_party/move/move-prover/move-docgen/tests/sources/root_template.spec_inline.md
+++ b/third_party/move/move-prover/move-docgen/tests/sources/root_template.spec_inline.md
@@ -7,14 +7,12 @@
 
 This document contains the description of multiple move scripts.
 
-The script <code><a href="root_template_script3.md#0x1_yet_another">yet_another</a></code> is documented in its own file.
+The script <code><a href="root_template_script3.md#yet_another">yet_another</a></code> is documented in its own file.
 
 -  [Some Scripts](#@Some_Scripts_1)
-    -  [Module `0x1::some`](#0x1_some)
-        -  [Function `some`](#0x1_some_some)
+    -  [Script `some`](#some)
 -  [Other Scripts](#@Other_Scripts_2)
-    -  [Module `0x1::other`](#0x1_other)
-        -  [Function `other`](#0x1_other_other)
+    -  [Script `other`](#other)
 -  [Some other scripts from a module](#@Some_other_scripts_from_a_module_3)
     -  [Module `0x1::OneTypeOfScript`](#0x1_OneTypeOfScript)
         -  [Function `script1`](#0x1_OneTypeOfScript_script1)
@@ -32,24 +30,19 @@ The script <code><a href="root_template_script3.md#0x1_yet_another">yet_another<
 
 
 
-<a id="0x1_some"></a>
+<a id="some"></a>
 
-### Module `0x1::some`
+### Script `some`
 
 
 
 <pre><code></code></pre>
 
 
-
-<a id="0x1_some_some"></a>
-
-#### Function `some`
-
 This script does really nothing but just aborts.
 
 
-<pre><code><b>fun</b> <a href="root.md#0x1_some">some</a>&lt;T&gt;(_account: signer)
+<pre><code><b>fun</b> <a href="root.md#some">some</a>&lt;T&gt;(_account: signer)
 </code></pre>
 
 
@@ -58,7 +51,7 @@ This script does really nothing but just aborts.
 <summary>Implementation</summary>
 
 
-<pre><code><b>fun</b> <a href="root.md#0x1_some">some</a>&lt;T&gt;(_account: signer) {
+<pre><code><b>fun</b> <a href="root.md#some">some</a>&lt;T&gt;(_account: signer) {
     <b>abort</b> 1
 }
 </code></pre>
@@ -87,24 +80,19 @@ This script does really nothing but just aborts.
 
 
 
-<a id="0x1_other"></a>
+<a id="other"></a>
 
-### Module `0x1::other`
+### Script `other`
 
 
 
 <pre><code></code></pre>
 
 
-
-<a id="0x1_other_other"></a>
-
-#### Function `other`
-
 This script does also abort.
 
 
-<pre><code><b>fun</b> <a href="root.md#0x1_other">other</a>&lt;T&gt;(_account: signer)
+<pre><code><b>fun</b> <a href="root.md#other">other</a>&lt;T&gt;(_account: signer)
 </code></pre>
 
 
@@ -113,7 +101,7 @@ This script does also abort.
 <summary>Implementation</summary>
 
 
-<pre><code><b>fun</b> <a href="root.md#0x1_other">other</a>&lt;T&gt;(_account: signer) {
+<pre><code><b>fun</b> <a href="root.md#other">other</a>&lt;T&gt;(_account: signer) {
     <b>abort</b> 2
 }
 </code></pre>
@@ -267,6 +255,6 @@ This is another script
 
 -  [`0x1::AnotherTypeOfScript`](root.md#0x1_AnotherTypeOfScript)
 -  [`0x1::OneTypeOfScript`](root.md#0x1_OneTypeOfScript)
--  [`0x1::other`](root.md#0x1_other)
--  [`0x1::some`](root.md#0x1_some)
--  [`0x1::yet_another`](root_template_script3.md#0x1_yet_another)
+-  [`other`](root.md#other)
+-  [`some`](root.md#some)
+-  [`yet_another`](root_template_script3.md#yet_another)
diff --git a/third_party/move/move-prover/move-docgen/tests/sources/root_template.spec_inline_no_fold.md b/third_party/move/move-prover/move-docgen/tests/sources/root_template.spec_inline_no_fold.md
index f278d4a353919..a6b79c73e8616 100644
--- a/third_party/move/move-prover/move-docgen/tests/sources/root_template.spec_inline_no_fold.md
+++ b/third_party/move/move-prover/move-docgen/tests/sources/root_template.spec_inline_no_fold.md
@@ -7,14 +7,12 @@
 
 This document contains the description of multiple move scripts.
 
-The script <code><a href="root_template_script3.md#0x1_yet_another">yet_another</a></code> is documented in its own file.
+The script <code><a href="root_template_script3.md#yet_another">yet_another</a></code> is documented in its own file.
 
 -  [Some Scripts](#@Some_Scripts_1)
-    -  [Module `0x1::some`](#0x1_some)
-        -  [Function `some`](#0x1_some_some)
+    -  [Script `some`](#some)
 -  [Other Scripts](#@Other_Scripts_2)
-    -  [Module `0x1::other`](#0x1_other)
-        -  [Function `other`](#0x1_other_other)
+    -  [Script `other`](#other)
 -  [Some other scripts from a module](#@Some_other_scripts_from_a_module_3)
     -  [Module `0x1::OneTypeOfScript`](#0x1_OneTypeOfScript)
         -  [Function `script1`](#0x1_OneTypeOfScript_script1)
@@ -32,24 +30,19 @@ The script <code><a href="root_template_script3.md#0x1_yet_another">yet_another<
 
 
 
-<a id="0x1_some"></a>
+<a id="some"></a>
 
-### Module `0x1::some`
+### Script `some`
 
 
 
 <pre><code></code></pre>
 
 
-
-<a id="0x1_some_some"></a>
-
-#### Function `some`
-
 This script does really nothing but just aborts.
 
 
-<pre><code><b>fun</b> <a href="root.md#0x1_some">some</a>&lt;T&gt;(_account: signer)
+<pre><code><b>fun</b> <a href="root.md#some">some</a>&lt;T&gt;(_account: signer)
 </code></pre>
 
 
@@ -57,7 +50,7 @@ This script does really nothing but just aborts.
 ##### Implementation
 
 
-<pre><code><b>fun</b> <a href="root.md#0x1_some">some</a>&lt;T&gt;(_account: signer) {
+<pre><code><b>fun</b> <a href="root.md#some">some</a>&lt;T&gt;(_account: signer) {
     <b>abort</b> 1
 }
 </code></pre>
@@ -81,24 +74,19 @@ This script does really nothing but just aborts.
 
 
 
-<a id="0x1_other"></a>
+<a id="other"></a>
 
-### Module `0x1::other`
+### Script `other`
 
 
 
 <pre><code></code></pre>
 
 
-
-<a id="0x1_other_other"></a>
-
-#### Function `other`
-
 This script does also abort.
 
 
-<pre><code><b>fun</b> <a href="root.md#0x1_other">other</a>&lt;T&gt;(_account: signer)
+<pre><code><b>fun</b> <a href="root.md#other">other</a>&lt;T&gt;(_account: signer)
 </code></pre>
 
 
@@ -106,7 +94,7 @@ This script does also abort.
 ##### Implementation
 
 
-<pre><code><b>fun</b> <a href="root.md#0x1_other">other</a>&lt;T&gt;(_account: signer) {
+<pre><code><b>fun</b> <a href="root.md#other">other</a>&lt;T&gt;(_account: signer) {
     <b>abort</b> 2
 }
 </code></pre>
@@ -243,6 +231,6 @@ This is another script
 
 -  [`0x1::AnotherTypeOfScript`](root.md#0x1_AnotherTypeOfScript)
 -  [`0x1::OneTypeOfScript`](root.md#0x1_OneTypeOfScript)
--  [`0x1::other`](root.md#0x1_other)
--  [`0x1::some`](root.md#0x1_some)
--  [`0x1::yet_another`](root_template_script3.md#0x1_yet_another)
+-  [`other`](root.md#other)
+-  [`some`](root.md#some)
+-  [`yet_another`](root_template_script3.md#yet_another)
diff --git a/third_party/move/move-prover/move-docgen/tests/sources/root_template.spec_separate.md b/third_party/move/move-prover/move-docgen/tests/sources/root_template.spec_separate.md
index 32c4074ab4dce..0d43418818867 100644
--- a/third_party/move/move-prover/move-docgen/tests/sources/root_template.spec_separate.md
+++ b/third_party/move/move-prover/move-docgen/tests/sources/root_template.spec_separate.md
@@ -7,15 +7,13 @@
 
 This document contains the description of multiple move scripts.
 
-The script <code><a href="root_template_script3.md#0x1_yet_another">yet_another</a></code> is documented in its own file.
+The script <code><a href="root_template_script3.md#yet_another">yet_another</a></code> is documented in its own file.
 
 -  [Some Scripts](#@Some_Scripts_1)
-    -  [Module `0x1::some`](#0x1_some)
-        -  [Function `some`](#0x1_some_some)
+    -  [Script `some`](#some)
         -  [Specification](#@Specification_2)
 -  [Other Scripts](#@Other_Scripts_3)
-    -  [Module `0x1::other`](#0x1_other)
-        -  [Function `other`](#0x1_other_other)
+    -  [Script `other`](#other)
         -  [Specification](#@Specification_4)
 -  [Some other scripts from a module](#@Some_other_scripts_from_a_module_5)
     -  [Module `0x1::OneTypeOfScript`](#0x1_OneTypeOfScript)
@@ -34,24 +32,19 @@ The script <code><a href="root_template_script3.md#0x1_yet_another">yet_another<
 
 
 
-<a id="0x1_some"></a>
+<a id="some"></a>
 
-### Module `0x1::some`
+### Script `some`
 
 
 
 <pre><code></code></pre>
 
 
-
-<a id="0x1_some_some"></a>
-
-#### Function `some`
-
 This script does really nothing but just aborts.
 
 
-<pre><code><b>fun</b> <a href="root.md#0x1_some">some</a>&lt;T&gt;(_account: signer)
+<pre><code><b>fun</b> <a href="root.md#some">some</a>&lt;T&gt;(_account: signer)
 </code></pre>
 
 
@@ -60,7 +53,7 @@ This script does really nothing but just aborts.
 <summary>Implementation</summary>
 
 
-<pre><code><b>fun</b> <a href="root.md#0x1_some">some</a>&lt;T&gt;(_account: signer) {
+<pre><code><b>fun</b> <a href="root.md#some">some</a>&lt;T&gt;(_account: signer) {
     <b>abort</b> 1
 }
 </code></pre>
@@ -79,7 +72,7 @@ This script does really nothing but just aborts.
 ##### Function `some`
 
 
-<pre><code><b>fun</b> <a href="root.md#0x1_some">some</a>&lt;T&gt;(_account: signer)
+<pre><code><b>fun</b> <a href="root.md#some">some</a>&lt;T&gt;(_account: signer)
 </code></pre>
 
 
@@ -98,24 +91,19 @@ This script does really nothing but just aborts.
 
 
 
-<a id="0x1_other"></a>
+<a id="other"></a>
 
-### Module `0x1::other`
+### Script `other`
 
 
 
 <pre><code></code></pre>
 
 
-
-<a id="0x1_other_other"></a>
-
-#### Function `other`
-
 This script does also abort.
 
 
-<pre><code><b>fun</b> <a href="root.md#0x1_other">other</a>&lt;T&gt;(_account: signer)
+<pre><code><b>fun</b> <a href="root.md#other">other</a>&lt;T&gt;(_account: signer)
 </code></pre>
 
 
@@ -124,7 +112,7 @@ This script does also abort.
 <summary>Implementation</summary>
 
 
-<pre><code><b>fun</b> <a href="root.md#0x1_other">other</a>&lt;T&gt;(_account: signer) {
+<pre><code><b>fun</b> <a href="root.md#other">other</a>&lt;T&gt;(_account: signer) {
     <b>abort</b> 2
 }
 </code></pre>
@@ -143,7 +131,7 @@ This script does also abort.
 ##### Function `other`
 
 
-<pre><code><b>fun</b> <a href="root.md#0x1_other">other</a>&lt;T&gt;(_account: signer)
+<pre><code><b>fun</b> <a href="root.md#other">other</a>&lt;T&gt;(_account: signer)
 </code></pre>
 
 
@@ -287,6 +275,6 @@ This is another script
 
 -  [`0x1::AnotherTypeOfScript`](root.md#0x1_AnotherTypeOfScript)
 -  [`0x1::OneTypeOfScript`](root.md#0x1_OneTypeOfScript)
--  [`0x1::other`](root.md#0x1_other)
--  [`0x1::some`](root.md#0x1_some)
--  [`0x1::yet_another`](root_template_script3.md#0x1_yet_another)
+-  [`other`](root.md#other)
+-  [`some`](root.md#some)
+-  [`yet_another`](root_template_script3.md#yet_another)
diff --git a/third_party/move/move-prover/move-docgen/tests/sources/some_script.spec_inline.md b/third_party/move/move-prover/move-docgen/tests/sources/some_script.spec_inline.md
index e2105321398d1..fe8ec37640a18 100644
--- a/third_party/move/move-prover/move-docgen/tests/sources/some_script.spec_inline.md
+++ b/third_party/move/move-prover/move-docgen/tests/sources/some_script.spec_inline.md
@@ -1,25 +1,19 @@
 
-<a id="0x1_some"></a>
+<a id="some"></a>
 
-# Module `0x1::some`
+# Script `some`
 
 
 
--  [Function `some`](#0x1_some_some)
 
 
 <pre><code></code></pre>
 
 
-
-<a id="0x1_some_some"></a>
-
-## Function `some`
-
 This script does really nothing but just aborts.
 
 
-<pre><code><b>fun</b> <a href="some_script.md#0x1_some">some</a>&lt;T&gt;(_account: signer)
+<pre><code><b>fun</b> <a href="some_script.md#some">some</a>&lt;T&gt;(_account: signer)
 </code></pre>
 
 
@@ -28,7 +22,7 @@ This script does really nothing but just aborts.
 <summary>Implementation</summary>
 
 
-<pre><code><b>fun</b> <a href="some_script.md#0x1_some">some</a>&lt;T&gt;(_account: signer) {
+<pre><code><b>fun</b> <a href="some_script.md#some">some</a>&lt;T&gt;(_account: signer) {
     <b>abort</b> 1
 }
 </code></pre>
diff --git a/third_party/move/move-prover/move-docgen/tests/sources/some_script.spec_inline_no_fold.md b/third_party/move/move-prover/move-docgen/tests/sources/some_script.spec_inline_no_fold.md
index 4c74a5bd84d56..2ee79ecd8031f 100644
--- a/third_party/move/move-prover/move-docgen/tests/sources/some_script.spec_inline_no_fold.md
+++ b/third_party/move/move-prover/move-docgen/tests/sources/some_script.spec_inline_no_fold.md
@@ -1,25 +1,19 @@
 
-<a id="0x1_some"></a>
+<a id="some"></a>
 
-# Module `0x1::some`
+# Script `some`
 
 
 
--  [Function `some`](#0x1_some_some)
 
 
 <pre><code></code></pre>
 
 
-
-<a id="0x1_some_some"></a>
-
-## Function `some`
-
 This script does really nothing but just aborts.
 
 
-<pre><code><b>fun</b> <a href="some_script.md#0x1_some">some</a>&lt;T&gt;(_account: signer)
+<pre><code><b>fun</b> <a href="some_script.md#some">some</a>&lt;T&gt;(_account: signer)
 </code></pre>
 
 
@@ -27,7 +21,7 @@ This script does really nothing but just aborts.
 ##### Implementation
 
 
-<pre><code><b>fun</b> <a href="some_script.md#0x1_some">some</a>&lt;T&gt;(_account: signer) {
+<pre><code><b>fun</b> <a href="some_script.md#some">some</a>&lt;T&gt;(_account: signer) {
     <b>abort</b> 1
 }
 </code></pre>
diff --git a/third_party/move/move-prover/move-docgen/tests/sources/some_script.spec_separate.md b/third_party/move/move-prover/move-docgen/tests/sources/some_script.spec_separate.md
index e2105321398d1..fe8ec37640a18 100644
--- a/third_party/move/move-prover/move-docgen/tests/sources/some_script.spec_separate.md
+++ b/third_party/move/move-prover/move-docgen/tests/sources/some_script.spec_separate.md
@@ -1,25 +1,19 @@
 
-<a id="0x1_some"></a>
+<a id="some"></a>
 
-# Module `0x1::some`
+# Script `some`
 
 
 
--  [Function `some`](#0x1_some_some)
 
 
 <pre><code></code></pre>
 
 
-
-<a id="0x1_some_some"></a>
-
-## Function `some`
-
 This script does really nothing but just aborts.
 
 
-<pre><code><b>fun</b> <a href="some_script.md#0x1_some">some</a>&lt;T&gt;(_account: signer)
+<pre><code><b>fun</b> <a href="some_script.md#some">some</a>&lt;T&gt;(_account: signer)
 </code></pre>
 
 
@@ -28,7 +22,7 @@ This script does really nothing but just aborts.
 <summary>Implementation</summary>
 
 
-<pre><code><b>fun</b> <a href="some_script.md#0x1_some">some</a>&lt;T&gt;(_account: signer) {
+<pre><code><b>fun</b> <a href="some_script.md#some">some</a>&lt;T&gt;(_account: signer) {
     <b>abort</b> 1
 }
 </code></pre>
diff --git a/third_party/move/move-prover/src/cli.rs b/third_party/move/move-prover/src/cli.rs
index f21cc3f082482..078fe41d81e02 100644
--- a/third_party/move/move-prover/src/cli.rs
+++ b/third_party/move/move-prover/src/cli.rs
@@ -60,9 +60,16 @@ pub struct Options {
     /// Whether to run the read write set analysis instead of the prover
     pub run_read_write_set: bool,
     /// The paths to the Move sources.
+    /// Each source path should refer to either (1) a Move file or (2) a directory containing Move
+    /// files, all to be compiled (e.g., not the root directory of a package---which contains
+    /// Move.toml---but a specific subdirectorysuch as `sources`, `scripts`, and/or `tests`,
+    /// depending on compilation mode).
     pub move_sources: Vec<String>,
     /// The paths to any dependencies for the Move sources. Those will not be verified but
     /// can be used by `move_sources`.
+    /// Each move_dep path should refer to either (1) a Move file or (2) a directory containing
+    /// Move files, all to be compiled (e.g., not the root directory of a package---which contains
+    /// Move.toml---but a specific subdirectorysuch as `sources`).
     pub move_deps: Vec<String>,
     /// The values assigned to named addresses in the Move code being verified.
     pub move_named_address_values: Vec<String>,
diff --git a/third_party/move/move-prover/src/lib.rs b/third_party/move/move-prover/src/lib.rs
index 9cf607d374075..d5f4e9f308463 100644
--- a/third_party/move/move-prover/src/lib.rs
+++ b/third_party/move/move-prover/src/lib.rs
@@ -84,9 +84,12 @@ pub fn run_move_prover_v2<W: WriteColor>(
         experiment_cache: Default::default(),
         sources: cloned_options.move_sources,
         sources_deps: vec![],
+        warn_deprecated: false,
+        warn_of_deprecation_use_in_aptos_libs: false,
         warn_unused: false,
         whole_program: false,
         compile_test_code: false,
+        compile_verify_code: true,
     };
 
     let mut env = move_compiler_v2::run_move_compiler_for_analysis(error_writer, compiler_options)?;
diff --git a/third_party/move/move-prover/tests/sources/functional/ModifiesErrorTest.v2_exp b/third_party/move/move-prover/tests/sources/functional/ModifiesErrorTest.v2_exp
index 620e4ee6a4e64..a4c827857f788 100644
--- a/third_party/move/move-prover/tests/sources/functional/ModifiesErrorTest.v2_exp
+++ b/third_party/move/move-prover/tests/sources/functional/ModifiesErrorTest.v2_exp
@@ -1,4 +1,64 @@
 Move prover returns: exiting with verification errors
+warning: Unused assignment to `x0`. Consider removing or prefixing with an underscore: `_x0`
+   ┌─ tests/sources/functional/ModifiesErrorTest.move:37:18
+   │
+37 │         let x0 = A::read_at(addr2);
+   │                  ^^^^^^^^^^^^^^^^^
+
+warning: Unused assignment to `x1`. Consider removing or prefixing with an underscore: `_x1`
+   ┌─ tests/sources/functional/ModifiesErrorTest.move:40:18
+   │
+40 │         let x1 = A::read_at(addr2);
+   │                  ^^^^^^^^^^^^^^^^^
+
+warning: Unused assignment to `x0`. Consider removing or prefixing with an underscore: `_x0`
+   ┌─ tests/sources/functional/ModifiesErrorTest.move:51:18
+   │
+51 │         let x0 = A::read_at(addr2);
+   │                  ^^^^^^^^^^^^^^^^^
+
+warning: Unused assignment to `x1`. Consider removing or prefixing with an underscore: `_x1`
+   ┌─ tests/sources/functional/ModifiesErrorTest.move:53:18
+   │
+53 │         let x1 = A::read_at(addr2);
+   │                  ^^^^^^^^^^^^^^^^^
+
+warning: Unused assignment to `x0`. Consider removing or prefixing with an underscore: `_x0`
+   ┌─ tests/sources/functional/ModifiesErrorTest.move:64:18
+   │
+64 │         let x0 = A::read_at(addr2);
+   │                  ^^^^^^^^^^^^^^^^^
+
+warning: Unused assignment to `x1`. Consider removing or prefixing with an underscore: `_x1`
+   ┌─ tests/sources/functional/ModifiesErrorTest.move:66:18
+   │
+66 │         let x1 = A::read_at(addr2);
+   │                  ^^^^^^^^^^^^^^^^^
+
+warning: Unused assignment to `x0`. Consider removing or prefixing with an underscore: `_x0`
+   ┌─ tests/sources/functional/ModifiesErrorTest.move:78:18
+   │
+78 │         let x0 = A::read_at(addr2);
+   │                  ^^^^^^^^^^^^^^^^^
+
+warning: Unused assignment to `x1`. Consider removing or prefixing with an underscore: `_x1`
+   ┌─ tests/sources/functional/ModifiesErrorTest.move:80:18
+   │
+80 │         let x1 = A::read_at(addr2);
+   │                  ^^^^^^^^^^^^^^^^^
+
+warning: Unused assignment to `x0`. Consider removing or prefixing with an underscore: `_x0`
+   ┌─ tests/sources/functional/ModifiesErrorTest.move:91:18
+   │
+91 │         let x0 = A::read_at(addr);
+   │                  ^^^^^^^^^^^^^^^^
+
+warning: Unused assignment to `x1`. Consider removing or prefixing with an underscore: `_x1`
+   ┌─ tests/sources/functional/ModifiesErrorTest.move:93:18
+   │
+93 │         let x1 = A::read_at(addr);
+   │                  ^^^^^^^^^^^^^^^^
+
 error: caller does not have permission to modify `B::T` at given address
    ┌─ tests/sources/functional/ModifiesErrorTest.move:38:17
    │
diff --git a/third_party/move/move-prover/tests/sources/functional/ModifiesSchemaTest.v2_exp b/third_party/move/move-prover/tests/sources/functional/ModifiesSchemaTest.v2_exp
index 05bcf79e31b18..1a1a7100ee0d3 100644
--- a/third_party/move/move-prover/tests/sources/functional/ModifiesSchemaTest.v2_exp
+++ b/third_party/move/move-prover/tests/sources/functional/ModifiesSchemaTest.v2_exp
@@ -16,7 +16,5 @@ error: caller does not have permission to modify `A::S` at given address
    =     at tests/sources/functional/ModifiesSchemaTest.move:13: mutate_at
    =     at tests/sources/functional/ModifiesSchemaTest.move:14: mutate_at
    =         <redacted> = <redacted>
-   =         s = <redacted>
-   =         <redacted> = <redacted>
    =     at tests/sources/functional/ModifiesSchemaTest.move:15: mutate_at
    =     at tests/sources/functional/ModifiesSchemaTest.move:31: mutate_at_wrapper2
diff --git a/third_party/move/move-prover/tests/sources/functional/ModifiesTest.v2_exp b/third_party/move/move-prover/tests/sources/functional/ModifiesTest.v2_exp
new file mode 100644
index 0000000000000..66abe10c08bf4
--- /dev/null
+++ b/third_party/move/move-prover/tests/sources/functional/ModifiesTest.v2_exp
@@ -0,0 +1,11 @@
+warning: Unused assignment to `x0`. Consider removing or prefixing with an underscore: `_x0`
+   ┌─ tests/sources/functional/ModifiesTest.move:67:18
+   │
+67 │         let x0 = A::read_at(addr2);
+   │                  ^^^^^^^^^^^^^^^^^
+
+warning: Unused assignment to `x1`. Consider removing or prefixing with an underscore: `_x1`
+   ┌─ tests/sources/functional/ModifiesTest.move:69:18
+   │
+69 │         let x1 = A::read_at(addr2);
+   │                  ^^^^^^^^^^^^^^^^^
diff --git a/third_party/move/move-prover/tests/sources/functional/aborts_if.v2_exp b/third_party/move/move-prover/tests/sources/functional/aborts_if.v2_exp
index 4c65caee8196f..58e49d00fd5d7 100644
--- a/third_party/move/move-prover/tests/sources/functional/aborts_if.v2_exp
+++ b/third_party/move/move-prover/tests/sources/functional/aborts_if.v2_exp
@@ -95,7 +95,6 @@ error: function does not abort under this condition
     =     at tests/sources/functional/aborts_if.move:113: multi_abort5_incorrect
     =         x = <redacted>
     =     at tests/sources/functional/aborts_if.move:114: multi_abort5_incorrect
-    =         <redacted> = <redacted>
     =     at tests/sources/functional/aborts_if.move:117: multi_abort5_incorrect
     =     at tests/sources/functional/aborts_if.move:119: multi_abort5_incorrect (spec)
 
@@ -103,7 +102,7 @@ error: abort not covered by any of the `aborts_if` clauses
     ┌─ tests/sources/functional/aborts_if.move:139:5
     │
 137 │           if (x == 2 || x == 3) abort 1;
-    │                                 ------- abort happened here with code 0x1
+    │                         ------ abort happened here with code 0x1
 138 │       }
 139 │ ╭     spec abort_at_2_or_3_total_incorrect {
 140 │ │         // Counter check that we get an error message without the pragma.
@@ -117,8 +116,6 @@ error: abort not covered by any of the `aborts_if` clauses
     =     at tests/sources/functional/aborts_if.move:137: abort_at_2_or_3_total_incorrect
     =         <redacted> = <redacted>
     =     at tests/sources/functional/aborts_if.move:137: abort_at_2_or_3_total_incorrect
-    =         <redacted> = <redacted>
-    =     at tests/sources/functional/aborts_if.move:137: abort_at_2_or_3_total_incorrect
     =         ABORTED
 
 error: function does not abort under this condition
@@ -132,8 +129,6 @@ error: function does not abort under this condition
     =     at tests/sources/functional/aborts_if.move:146: abort_at_2_or_3_spec_incorrect
     =         <redacted> = <redacted>
     =     at tests/sources/functional/aborts_if.move:146: abort_at_2_or_3_spec_incorrect
-    =         <redacted> = <redacted>
-    =     at tests/sources/functional/aborts_if.move:146: abort_at_2_or_3_spec_incorrect
     =     at tests/sources/functional/aborts_if.move:147: abort_at_2_or_3_spec_incorrect
     =     at tests/sources/functional/aborts_if.move:151: abort_at_2_or_3_spec_incorrect (spec)
 
@@ -141,7 +136,7 @@ error: abort not covered by any of the `aborts_if` clauses
     ┌─ tests/sources/functional/aborts_if.move:157:5
     │
 155 │           if (x == 2 || x == 3) abort 1;
-    │                                 ------- abort happened here with code 0x1
+    │                         ------ abort happened here with code 0x1
 156 │       }
 157 │ ╭     spec abort_at_2_or_3_strict_incorrect {
 158 │ │         // When the strict mode is enabled, no aborts_if clause means aborts_if false.
@@ -154,6 +149,4 @@ error: abort not covered by any of the `aborts_if` clauses
     =     at tests/sources/functional/aborts_if.move:155: abort_at_2_or_3_strict_incorrect
     =         <redacted> = <redacted>
     =     at tests/sources/functional/aborts_if.move:155: abort_at_2_or_3_strict_incorrect
-    =         <redacted> = <redacted>
-    =     at tests/sources/functional/aborts_if.move:155: abort_at_2_or_3_strict_incorrect
     =         ABORTED
diff --git a/third_party/move/move-prover/tests/sources/functional/aborts_if_with_code.v2_exp b/third_party/move/move-prover/tests/sources/functional/aborts_if_with_code.v2_exp
index 66d897207f163..36844a9bf44f1 100644
--- a/third_party/move/move-prover/tests/sources/functional/aborts_if_with_code.v2_exp
+++ b/third_party/move/move-prover/tests/sources/functional/aborts_if_with_code.v2_exp
@@ -2,22 +2,22 @@ Move prover returns: exiting with verification errors
 error: abort code not covered by any of the `aborts_if` or `aborts_with` clauses
    ┌─ tests/sources/functional/aborts_if_with_code.move:38:5
    │
-31 │               abort 2
-   │               ------- abort happened here with code 0x2
-   ·
-38 │ ╭     spec conditional_abort_invalid {
-39 │ │         aborts_if x == 1 with 1; // wrong code
-40 │ │         aborts_if y == 2 with 3;
-41 │ │         ensures result == x;
-42 │ │     }
-   │ ╰─────^
+30 │   ╭         if (x == 1) {
+31 │   │             abort 2
+32 │   │         };
+   │   ╰─────────' abort happened here with code 0x2
+   ·   │
+38 │ ╭       spec conditional_abort_invalid {
+39 │ │           aborts_if x == 1 with 1; // wrong code
+40 │ │           aborts_if y == 2 with 3;
+41 │ │           ensures result == x;
+42 │ │       }
+   │ ╰───────^
    │
    =     at tests/sources/functional/aborts_if_with_code.move:29: conditional_abort_invalid
    =         x = <redacted>
    =         y = <redacted>
    =     at tests/sources/functional/aborts_if_with_code.move:30: conditional_abort_invalid
-   =         <redacted> = <redacted>
-   =     at tests/sources/functional/aborts_if_with_code.move:31: conditional_abort_invalid
    =         ABORTED
 
 error: abort code not covered by any of the `aborts_if` or `aborts_with` clauses
@@ -40,8 +40,8 @@ error: abort code not covered by any of the `aborts_if` or `aborts_with` clauses
 error: abort code not covered by any of the `aborts_if` or `aborts_with` clauses
    ┌─ tests/sources/functional/aborts_if_with_code.move:77:5
    │
-74 │               abort(2)
-   │               -------- abort happened here with code 0x2
+73 │           if (x == 2) {
+   │               ------ abort happened here with code 0x2
    ·
 77 │ ╭     spec aborts_if_with_code_mixed_invalid {
 78 │ │         aborts_if x == 1;
@@ -52,17 +52,15 @@ error: abort code not covered by any of the `aborts_if` or `aborts_with` clauses
    =     at tests/sources/functional/aborts_if_with_code.move:69: aborts_if_with_code_mixed_invalid
    =         x = <redacted>
    =     at tests/sources/functional/aborts_if_with_code.move:70: aborts_if_with_code_mixed_invalid
-   =         <redacted> = <redacted>
+   =     at tests/sources/functional/aborts_if_with_code.move:71: aborts_if_with_code_mixed_invalid
    =     at tests/sources/functional/aborts_if_with_code.move:73: aborts_if_with_code_mixed_invalid
-   =         <redacted> = <redacted>
-   =     at tests/sources/functional/aborts_if_with_code.move:74: aborts_if_with_code_mixed_invalid
    =         ABORTED
 
 error: abort code not covered by any of the `aborts_if` or `aborts_with` clauses
     ┌─ tests/sources/functional/aborts_if_with_code.move:105:5
     │
-102 │               abort(2)
-    │               -------- abort happened here with code 0x2
+101 │           if (x == 2) {
+    │               ------ abort happened here with code 0x2
     ·
 105 │ ╭     spec aborts_with_invalid {
 106 │ │         aborts_with 1,3;
@@ -72,17 +70,15 @@ error: abort code not covered by any of the `aborts_if` or `aborts_with` clauses
     =     at tests/sources/functional/aborts_if_with_code.move:97: aborts_with_invalid
     =         x = <redacted>
     =     at tests/sources/functional/aborts_if_with_code.move:98: aborts_with_invalid
-    =         <redacted> = <redacted>
+    =     at tests/sources/functional/aborts_if_with_code.move:99: aborts_with_invalid
     =     at tests/sources/functional/aborts_if_with_code.move:101: aborts_with_invalid
-    =         <redacted> = <redacted>
-    =     at tests/sources/functional/aborts_if_with_code.move:102: aborts_with_invalid
     =         ABORTED
 
 error: abort code not covered by any of the `aborts_if` or `aborts_with` clauses
     ┌─ tests/sources/functional/aborts_if_with_code.move:131:5
     │
-128 │               abort(1)
-    │               -------- abort happened here with code 0x1
+127 │           if (x == 2) {
+    │               ------ abort happened here with code 0x1
     ·
 131 │ ╭     spec aborts_with_mixed_invalid {
 132 │ │         pragma aborts_if_is_partial = true;
@@ -94,8 +90,6 @@ error: abort code not covered by any of the `aborts_if` or `aborts_with` clauses
     =     at tests/sources/functional/aborts_if_with_code.move:123: aborts_with_mixed_invalid
     =         x = <redacted>
     =     at tests/sources/functional/aborts_if_with_code.move:124: aborts_with_mixed_invalid
-    =         <redacted> = <redacted>
+    =     at tests/sources/functional/aborts_if_with_code.move:125: aborts_with_mixed_invalid
     =     at tests/sources/functional/aborts_if_with_code.move:127: aborts_with_mixed_invalid
-    =         <redacted> = <redacted>
-    =     at tests/sources/functional/aborts_if_with_code.move:128: aborts_with_mixed_invalid
     =         ABORTED
diff --git a/third_party/move/move-prover/tests/sources/functional/bitset.v2_exp b/third_party/move/move-prover/tests/sources/functional/bitset.v2_exp
new file mode 100644
index 0000000000000..e50ba75b20d2e
--- /dev/null
+++ b/third_party/move/move-prover/tests/sources/functional/bitset.v2_exp
@@ -0,0 +1,11 @@
+warning: Unused assignment to `s2`. Consider removing or prefixing with an underscore: `_s2`
+   ┌─ tests/sources/functional/bitset.move:59:18
+   │
+59 │         let s2 = intersect(s, s);
+   │                  ^^^^^^^^^^^^^^^
+
+warning: Unused assignment to `s3`. Consider removing or prefixing with an underscore: `_s3`
+   ┌─ tests/sources/functional/bitset.move:60:18
+   │
+60 │         let s3 = union(s, s);
+   │                  ^^^^^^^^^^^
diff --git a/third_party/move/move-prover/tests/sources/functional/bitwise_features.v2_exp b/third_party/move/move-prover/tests/sources/functional/bitwise_features.v2_exp
new file mode 100644
index 0000000000000..7c523ceea6767
--- /dev/null
+++ b/third_party/move/move-prover/tests/sources/functional/bitwise_features.v2_exp
@@ -0,0 +1,5 @@
+warning: Unused assignment to `old_features`. Consider removing or prefixing with an underscore: `_old_features`
+   ┌─ tests/sources/functional/bitwise_features.move:50:28
+   │
+50 │         let old_features = *features; // ghost var
+   │                            ^^^^^^^^^
diff --git a/third_party/move/move-prover/tests/sources/functional/choice.v2_exp b/third_party/move/move-prover/tests/sources/functional/choice.v2_exp
index b77c3d287d72b..ccf3752616dc3 100644
--- a/third_party/move/move-prover/tests/sources/functional/choice.v2_exp
+++ b/third_party/move/move-prover/tests/sources/functional/choice.v2_exp
@@ -48,7 +48,6 @@ error: post-condition does not hold
    =     at tests/sources/functional/choice.move:78: test_not_using_min_incorrect
    =         <redacted> = <redacted>
    =         v_ref = <redacted>
-   =         <redacted> = <redacted>
    =     at tests/sources/functional/choice.move:79: test_not_using_min_incorrect
    =         <redacted> = <redacted>
    =     at tests/sources/functional/choice.move:80: test_not_using_min_incorrect
@@ -56,11 +55,7 @@ error: post-condition does not hold
    =     at tests/sources/functional/choice.move:81: test_not_using_min_incorrect
    =         <redacted> = <redacted>
    =     at tests/sources/functional/choice.move:82: test_not_using_min_incorrect
-   =         <redacted> = <redacted>
    =         v = <redacted>
-   =     at tests/sources/functional/choice.move:83: test_not_using_min_incorrect
-   =         return = <redacted>
-   =     at tests/sources/functional/choice.move:75: test_not_using_min_incorrect
    =         result = <redacted>
    =     at tests/sources/functional/choice.move:84: test_not_using_min_incorrect
    =     at tests/sources/functional/choice.move:87: test_not_using_min_incorrect (spec)
@@ -75,7 +70,6 @@ error: post-condition does not hold
     =     at tests/sources/functional/choice.move:95: test_choice_dup_expected_fail
     =         x = <redacted>
     =     at tests/sources/functional/choice.move:96: test_choice_dup_expected_fail
-    =         <redacted> = <redacted>
     =         result = <redacted>
     =     at tests/sources/functional/choice.move:97: test_choice_dup_expected_fail
     =     at tests/sources/functional/choice.move:100: test_choice_dup_expected_fail (spec)
diff --git a/third_party/move/move-prover/tests/sources/functional/consts.v2_exp b/third_party/move/move-prover/tests/sources/functional/consts.v2_exp
index 36738b49ce085..817510025d1e5 100644
--- a/third_party/move/move-prover/tests/sources/functional/consts.v2_exp
+++ b/third_party/move/move-prover/tests/sources/functional/consts.v2_exp
@@ -33,8 +33,6 @@ error: unknown assertion failed
 67 │             assert v1[0] == @0x111 && v1[1] == @0x222 && v1[2] == @0x333;
    │             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    │
-   =     at tests/sources/functional/consts.move:65: array_in_fun_incorrect
-   =         v1 = <redacted>
    =     at tests/sources/functional/consts.move:67: array_in_fun_incorrect
 
 error: unknown assertion failed
@@ -43,6 +41,4 @@ error: unknown assertion failed
 74 │             assert v1[0] == false && v1[1] == false && v1[2] == false;
    │             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    │
-   =     at tests/sources/functional/consts.move:72: array_in_fun_incorrect_bool
-   =         v1 = <redacted>
    =     at tests/sources/functional/consts.move:74: array_in_fun_incorrect_bool
diff --git a/third_party/move/move-prover/tests/sources/functional/data_invariant_in_map.v2_exp b/third_party/move/move-prover/tests/sources/functional/data_invariant_in_map.v2_exp
index 682d12e236359..a8079e5f4d271 100644
--- a/third_party/move/move-prover/tests/sources/functional/data_invariant_in_map.v2_exp
+++ b/third_party/move/move-prover/tests/sources/functional/data_invariant_in_map.v2_exp
@@ -10,6 +10,4 @@ error: data invariant does not hold
   =     at tests/sources/functional/data_invariant_in_map.move:22: violation_1
   =     at tests/sources/functional/data_invariant_in_map.move:23: violation_1
   =         <redacted> = <redacted>
-  =         s = <redacted>
-  =         <redacted> = <redacted>
   =     at tests/sources/functional/data_invariant_in_map.move:8
diff --git a/third_party/move/move-prover/tests/sources/functional/disable_inv_friends.v2_exp b/third_party/move/move-prover/tests/sources/functional/disable_inv_friends.v2_exp
index 059e9aebf179c..95e7ee12d7bfb 100644
--- a/third_party/move/move-prover/tests/sources/functional/disable_inv_friends.v2_exp
+++ b/third_party/move/move-prover/tests/sources/functional/disable_inv_friends.v2_exp
@@ -11,5 +11,4 @@ error: global memory invariant does not hold
    =     at tests/sources/functional/disable_inv_friends.move:85: f5_incorrect
    =         s = <redacted>
    =     at tests/sources/functional/disable_inv_friends.move:86: f5_incorrect
-   =         <redacted> = <redacted>
    =     at tests/sources/functional/disable_inv_friends.move:25
diff --git a/third_party/move/move-prover/tests/sources/functional/emits.v2_exp b/third_party/move/move-prover/tests/sources/functional/emits.v2_exp
index 3eb55dd020309..0d16bacdb3c2f 100644
--- a/third_party/move/move-prover/tests/sources/functional/emits.v2_exp
+++ b/third_party/move/move-prover/tests/sources/functional/emits.v2_exp
@@ -76,8 +76,6 @@ error: function does not emit the expected event
     =         x = <redacted>
     =         handle = <redacted>
     =     at tests/sources/functional/emits.move:106: conditional_wrong_condition_incorrect
-    =         <redacted> = <redacted>
-    =     at tests/sources/functional/emits.move:106: conditional_wrong_condition_incorrect
     =         handle = <redacted>
     =     at tests/sources/functional/emits.move:109: conditional_wrong_condition_incorrect
     =     at tests/sources/functional/emits.move:111: conditional_wrong_condition_incorrect (spec)
@@ -92,8 +90,6 @@ error: function does not emit the expected event
     =         x = <redacted>
     =         handle = <redacted>
     =     at tests/sources/functional/emits.move:115: conditional_missing_condition_incorrect
-    =         <redacted> = <redacted>
-    =     at tests/sources/functional/emits.move:115: conditional_missing_condition_incorrect
     =         handle = <redacted>
     =     at tests/sources/functional/emits.move:118: conditional_missing_condition_incorrect
     =     at tests/sources/functional/emits.move:120: conditional_missing_condition_incorrect (spec)
@@ -190,10 +186,8 @@ error: function does not emit the expected event
     =     at tests/sources/functional/emits.move:287: opaque_incorrect
     =         <redacted> = <redacted>
     =     at tests/sources/functional/emits.move:288: opaque_incorrect
-    =         <redacted> = <redacted>
     =     at tests/sources/functional/emits.move:289: opaque_incorrect
     =         <redacted> = <redacted>
-    =     at tests/sources/functional/emits.move:286: opaque_incorrect
     =         handle = <redacted>
     =     at tests/sources/functional/emits.move:290: opaque_incorrect
     =     at tests/sources/functional/emits.move:292: opaque_incorrect (spec)
@@ -217,10 +211,8 @@ error: emitted event not covered by any of the `emits` clauses
     =     at tests/sources/functional/emits.move:310: opaque_completeness_incorrect
     =         <redacted> = <redacted>
     =     at tests/sources/functional/emits.move:311: opaque_completeness_incorrect
-    =         <redacted> = <redacted>
     =     at tests/sources/functional/emits.move:312: opaque_completeness_incorrect
     =         <redacted> = <redacted>
-    =     at tests/sources/functional/emits.move:309: opaque_completeness_incorrect
     =         handle = <redacted>
     =     at tests/sources/functional/emits.move:313: opaque_completeness_incorrect
     =     at tests/sources/functional/emits.move:315: opaque_completeness_incorrect (spec)
@@ -245,10 +237,8 @@ error: emitted event not covered by any of the `emits` clauses
     =     at tests/sources/functional/emits.move:351: opaque_partial_incorrect
     =         <redacted> = <redacted>
     =     at tests/sources/functional/emits.move:352: opaque_partial_incorrect
-    =         <redacted> = <redacted>
     =     at tests/sources/functional/emits.move:353: opaque_partial_incorrect
     =         <redacted> = <redacted>
-    =     at tests/sources/functional/emits.move:350: opaque_partial_incorrect
     =         handle = <redacted>
     =     at tests/sources/functional/emits.move:354: opaque_partial_incorrect
     =     at tests/sources/functional/emits.move:356: opaque_partial_incorrect (spec)
diff --git a/third_party/move/move-prover/tests/sources/functional/global_invariants.v2_exp b/third_party/move/move-prover/tests/sources/functional/global_invariants.v2_exp
index 5af72f3d8c9dc..3424ce5a899f2 100644
--- a/third_party/move/move-prover/tests/sources/functional/global_invariants.v2_exp
+++ b/third_party/move/move-prover/tests/sources/functional/global_invariants.v2_exp
@@ -22,19 +22,18 @@ error: global memory invariant does not hold
    =     at tests/sources/functional/global_invariants.move:53: remove_S_invalid
    =         account = <redacted>
    =     at tests/sources/functional/global_invariants.move:55: remove_S_invalid
-   =         <redacted> = <redacted>
    =     at ../move-stdlib/sources/signer.move:12: address_of
    =         s = <redacted>
    =     at ../move-stdlib/sources/signer.move:13: address_of
    =         result = <redacted>
    =     at ../move-stdlib/sources/signer.move:14: address_of
    =     at tests/sources/functional/global_invariants.move:55: remove_S_invalid
-   =     at tests/sources/functional/global_invariants.move:56: remove_S_invalid
    =     at ../move-stdlib/sources/signer.move:12: address_of
    =         s = <redacted>
    =     at ../move-stdlib/sources/signer.move:13: address_of
    =         result = <redacted>
    =     at ../move-stdlib/sources/signer.move:14: address_of
+   =     at tests/sources/functional/global_invariants.move:56: remove_S_invalid
    =     at tests/sources/functional/global_invariants.move:18
 
 error: global memory invariant does not hold
@@ -46,14 +45,12 @@ error: global memory invariant does not hold
    =     at tests/sources/functional/global_invariants.move:62: remove_R_invalid
    =         account = <redacted>
    =     at tests/sources/functional/global_invariants.move:64: remove_R_invalid
-   =         <redacted> = <redacted>
    =     at ../move-stdlib/sources/signer.move:12: address_of
    =         s = <redacted>
    =     at ../move-stdlib/sources/signer.move:13: address_of
    =         result = <redacted>
    =     at ../move-stdlib/sources/signer.move:14: address_of
    =     at tests/sources/functional/global_invariants.move:64: remove_R_invalid
-   =     at tests/sources/functional/global_invariants.move:65: remove_R_invalid
    =     at ../move-stdlib/sources/signer.move:12: address_of
    =         s = <redacted>
    =     at ../move-stdlib/sources/signer.move:13: address_of
diff --git a/third_party/move/move-prover/tests/sources/functional/inline-lambda.v2_exp b/third_party/move/move-prover/tests/sources/functional/inline-lambda.v2_exp
index 4d220149d9a54..a939ef7f0c9c6 100644
--- a/third_party/move/move-prover/tests/sources/functional/inline-lambda.v2_exp
+++ b/third_party/move/move-prover/tests/sources/functional/inline-lambda.v2_exp
@@ -1,4 +1,16 @@
 Move prover returns: exiting with verification errors
+warning: Unused assignment to `r1`. Consider removing or prefixing with an underscore: `_r1`
+   ┌─ tests/sources/functional/inline-lambda.move:11:31
+   │
+11 │         let r1 = apply(0, |v| v >= 0);
+   │                               ^^^^^^
+
+warning: Unused assignment to `r2`. Consider removing or prefixing with an underscore: `_r2`
+   ┌─ tests/sources/functional/inline-lambda.move:16:31
+   │
+16 │         let r2 = apply(0, |v| v != a1 + a2);
+   │                               ^^^^^^^^^^^^
+
 error: unknown assertion failed
   ┌─ tests/sources/functional/inline-lambda.move:5:13
   │
diff --git a/third_party/move/move-prover/tests/sources/functional/inline_fun_simple.v2_exp b/third_party/move/move-prover/tests/sources/functional/inline_fun_simple.v2_exp
index 00f90006edacb..a71d8eee327fb 100644
--- a/third_party/move/move-prover/tests/sources/functional/inline_fun_simple.v2_exp
+++ b/third_party/move/move-prover/tests/sources/functional/inline_fun_simple.v2_exp
@@ -1,4 +1,28 @@
 Move prover returns: exiting with verification errors
+warning: Unused assignment to `r1`. Consider removing or prefixing with an underscore: `_r1`
+   ┌─ tests/sources/functional/inline_fun_simple.move:10:32
+   │
+10 │         let r1 = apply(42, |v| v >= 1);
+   │                                ^^^^^^
+
+warning: Unused assignment to `r2`. Consider removing or prefixing with an underscore: `_r2`
+   ┌─ tests/sources/functional/inline_fun_simple.move:15:32
+   │
+15 │         let r2 = apply(43, |v| v <= 2);
+   │                                ^^^^^^
+
+warning: Unused assignment to `r1`. Consider removing or prefixing with an underscore: `_r1`
+   ┌─ tests/sources/functional/inline_fun_simple.move:22:32
+   │
+22 │         let r1 = apply(42, |v| v >= 1);
+   │                                ^^^^^^
+
+warning: Unused assignment to `r2`. Consider removing or prefixing with an underscore: `_r2`
+   ┌─ tests/sources/functional/inline_fun_simple.move:27:31
+   │
+27 │         let r2 = apply(3, |v| v <= 2);
+   │                               ^^^^^^
+
 error: unknown assertion failed
   ┌─ tests/sources/functional/inline_fun_simple.move:4:13
   │
diff --git a/third_party/move/move-prover/tests/sources/functional/loop_unroll.v2_exp b/third_party/move/move-prover/tests/sources/functional/loop_unroll.v2_exp
index 2fa1757bbbbcb..0cbe6434c9e40 100644
--- a/third_party/move/move-prover/tests/sources/functional/loop_unroll.v2_exp
+++ b/third_party/move/move-prover/tests/sources/functional/loop_unroll.v2_exp
@@ -74,7 +74,7 @@ error: abort not covered by any of the `aborts_if` clauses
     ┌─ tests/sources/functional/loop_unroll.move:128:5
     │
 124 │               assert!(i != 5, 0);
-    │               ------ abort happened here with code 0x0
+    │                       ------ abort happened here with code 0x0
     ·
 128 │ ╭     spec t7_failure {
 129 │ │         pragma unroll = 6;
@@ -89,34 +89,22 @@ error: abort not covered by any of the `aborts_if` clauses
     =         i = <redacted>
     =     at tests/sources/functional/loop_unroll.move:122: t7_failure
     =     at tests/sources/functional/loop_unroll.move:123: t7_failure
-    =         <redacted> = <redacted>
     =         i = <redacted>
     =     at tests/sources/functional/loop_unroll.move:124: t7_failure
-    =         <redacted> = <redacted>
-    =     at tests/sources/functional/loop_unroll.move:124: t7_failure
     =     at tests/sources/functional/loop_unroll.move:122: t7_failure
     =     at tests/sources/functional/loop_unroll.move:123: t7_failure
-    =         <redacted> = <redacted>
     =         i = <redacted>
     =     at tests/sources/functional/loop_unroll.move:124: t7_failure
-    =         <redacted> = <redacted>
     =     at tests/sources/functional/loop_unroll.move:122: t7_failure
     =     at tests/sources/functional/loop_unroll.move:123: t7_failure
-    =         <redacted> = <redacted>
     =         i = <redacted>
     =     at tests/sources/functional/loop_unroll.move:124: t7_failure
-    =         <redacted> = <redacted>
     =     at tests/sources/functional/loop_unroll.move:122: t7_failure
     =     at tests/sources/functional/loop_unroll.move:123: t7_failure
-    =         <redacted> = <redacted>
     =         i = <redacted>
     =     at tests/sources/functional/loop_unroll.move:124: t7_failure
-    =         <redacted> = <redacted>
     =     at tests/sources/functional/loop_unroll.move:122: t7_failure
     =     at tests/sources/functional/loop_unroll.move:123: t7_failure
-    =         <redacted> = <redacted>
     =         i = <redacted>
     =     at tests/sources/functional/loop_unroll.move:124: t7_failure
-    =         <redacted> = <redacted>
-    =     at tests/sources/functional/loop_unroll.move:124: t7_failure
     =         ABORTED
diff --git a/third_party/move/move-prover/tests/sources/functional/mono.v2_exp b/third_party/move/move-prover/tests/sources/functional/mono.v2_exp
index 557a72530aad3..573e40d78820e 100644
--- a/third_party/move/move-prover/tests/sources/functional/mono.v2_exp
+++ b/third_party/move/move-prover/tests/sources/functional/mono.v2_exp
@@ -7,7 +7,6 @@ error: post-condition does not hold
    │
    =     at tests/sources/functional/mono.move:68: vec_int
    =         x = <redacted>
-   =         return = <redacted>
    =         result = <redacted>
    =     at tests/sources/functional/mono.move:69: vec_int (spec)
 
@@ -19,7 +18,6 @@ error: post-condition does not hold
    │
    =     at tests/sources/functional/mono.move:70: vec_addr
    =         x = <redacted>
-   =         return = <redacted>
    =         result = <redacted>
    =     at tests/sources/functional/mono.move:71: vec_addr (spec)
 
@@ -31,7 +29,6 @@ error: post-condition does not hold
    │
    =     at tests/sources/functional/mono.move:72: vec_bool
    =         x = <redacted>
-   =         return = <redacted>
    =         result = <redacted>
    =     at tests/sources/functional/mono.move:73: vec_bool (spec)
 
@@ -43,7 +40,6 @@ error: post-condition does not hold
    │
    =     at tests/sources/functional/mono.move:74: vec_struct_int
    =         x = <redacted>
-   =         return = <redacted>
    =         result = <redacted>
    =     at tests/sources/functional/mono.move:75: vec_struct_int (spec)
 
@@ -55,7 +51,6 @@ error: post-condition does not hold
    │
    =     at tests/sources/functional/mono.move:76: vec_struct_addr
    =         x = <redacted>
-   =         return = <redacted>
    =         result = <redacted>
    =     at tests/sources/functional/mono.move:77: vec_struct_addr (spec)
 
@@ -69,8 +64,6 @@ error: post-condition does not hold
    =         x = <redacted>
    =     at tests/sources/functional/mono.move:80: vec_vec
    =         x = <redacted>
-   =         return = <redacted>
-   =     at tests/sources/functional/mono.move:79: vec_vec
    =         result = <redacted>
    =     at tests/sources/functional/mono.move:81: vec_vec
    =     at tests/sources/functional/mono.move:82: vec_vec (spec)
diff --git a/third_party/move/move-prover/tests/sources/functional/nested_invariants.v2_exp b/third_party/move/move-prover/tests/sources/functional/nested_invariants.v2_exp
index c1a7eb2d8275a..d177659668d6f 100644
--- a/third_party/move/move-prover/tests/sources/functional/nested_invariants.v2_exp
+++ b/third_party/move/move-prover/tests/sources/functional/nested_invariants.v2_exp
@@ -15,8 +15,6 @@ error: data invariant does not hold
    =     at tests/sources/functional/nested_invariants.move:65: mutate_inner_data_invariant_invalid
    =     at tests/sources/functional/nested_invariants.move:66: mutate_inner_data_invariant_invalid
    =         <redacted> = <redacted>
-   =         r = <redacted>
-   =         <redacted> = <redacted>
    =     at tests/sources/functional/nested_invariants.move:29
    =     at tests/sources/functional/nested_invariants.move:32
    =     at tests/sources/functional/nested_invariants.move:16
@@ -46,8 +44,6 @@ error: data invariant does not hold
    =     at tests/sources/functional/nested_invariants.move:59: mutate_outer_data_invariant_invalid
    =     at tests/sources/functional/nested_invariants.move:60: mutate_outer_data_invariant_invalid
    =         <redacted> = <redacted>
-   =         r = <redacted>
-   =         <redacted> = <redacted>
    =     at tests/sources/functional/nested_invariants.move:29
    =     at tests/sources/functional/nested_invariants.move:32
 
diff --git a/third_party/move/move-prover/tests/sources/functional/references.v2_exp b/third_party/move/move-prover/tests/sources/functional/references.v2_exp
index 47440a55d639b..9c36421055ba0 100644
--- a/third_party/move/move-prover/tests/sources/functional/references.v2_exp
+++ b/third_party/move/move-prover/tests/sources/functional/references.v2_exp
@@ -10,16 +10,15 @@ error: function does not abort under this condition
    =     at tests/sources/functional/references.move:70: mut_ref_incorrect
    =     at tests/sources/functional/references.move:71: mut_ref_incorrect
    =         b_ref = <redacted>
-   =         <redacted> = <redacted>
    =     at tests/sources/functional/references.move:50: mut_b
    =         b = <redacted>
    =     at tests/sources/functional/references.move:51: mut_b
    =     at tests/sources/functional/references.move:50: mut_b
    =         b = <redacted>
    =     at tests/sources/functional/references.move:52: mut_b
+   =         b = <redacted>
    =     at tests/sources/functional/references.move:72: mut_ref_incorrect
    =         b = <redacted>
    =     at tests/sources/functional/references.move:73: mut_ref_incorrect
-   =         <redacted> = <redacted>
    =     at tests/sources/functional/references.move:74: mut_ref_incorrect
    =     at tests/sources/functional/references.move:76: mut_ref_incorrect (spec)
diff --git a/third_party/move/move-prover/tests/sources/functional/resource_index.move b/third_party/move/move-prover/tests/sources/functional/resource_index.move
new file mode 100644
index 0000000000000..d1bf8d7883673
--- /dev/null
+++ b/third_party/move/move-prover/tests/sources/functional/resource_index.move
@@ -0,0 +1,19 @@
+module 0x42::test {
+
+    struct X<M> has copy, drop, store {
+        value: M
+    }
+    struct Y<T> has key, drop {
+        field: T
+    }
+
+    fun test_resource_4() acquires Y {
+        let addr = @0x1;
+        let y = borrow_global_mut<Y<X<bool>>>(addr);
+        y.field.value = false;
+        spec {
+            assert Y<X<bool>>[addr].field.value == false;
+        };
+    }
+
+}
diff --git a/third_party/move/move-prover/tests/sources/functional/schema_exp.v2_exp b/third_party/move/move-prover/tests/sources/functional/schema_exp.v2_exp
index 4dcc1cbd37877..cdc6c3cede166 100644
--- a/third_party/move/move-prover/tests/sources/functional/schema_exp.v2_exp
+++ b/third_party/move/move-prover/tests/sources/functional/schema_exp.v2_exp
@@ -3,7 +3,7 @@ error: abort not covered by any of the `aborts_if` clauses
    ┌─ tests/sources/functional/schema_exp.move:29:5
    │
 26 │           if (!c) abort(1);
-   │                   -------- abort happened here with code 0x1
+   │                        --- abort happened here with code 0x1
    ·
 29 │ ╭     spec bar_incorrect {
 30 │ │         // Once we include a schema with aborts, even conditionally, we need to provide a full spec of the aborts
@@ -27,7 +27,6 @@ error: post-condition does not hold
    =     at tests/sources/functional/schema_exp.move:53: baz_incorrect
    =         i = <redacted>
    =     at tests/sources/functional/schema_exp.move:54: baz_incorrect
-   =         <redacted> = <redacted>
    =         result = <redacted>
    =     at tests/sources/functional/schema_exp.move:55: baz_incorrect
    =     at tests/sources/functional/schema_exp.move:47
diff --git a/third_party/move/move-prover/tests/sources/functional/script_incorrect.v2_exp b/third_party/move/move-prover/tests/sources/functional/script_incorrect.v2_exp
index 610c8d5d89276..924116a65e5f2 100644
--- a/third_party/move/move-prover/tests/sources/functional/script_incorrect.v2_exp
+++ b/third_party/move/move-prover/tests/sources/functional/script_incorrect.v2_exp
@@ -19,7 +19,6 @@ error: abort not covered by any of the `aborts_if` clauses
    =     at tests/sources/functional/script_provider.move:8: register
    =         account = <redacted>
    =     at tests/sources/functional/script_provider.move:9: register
-   =         <redacted> = <redacted>
    =     at ../move-stdlib/sources/signer.move:12: address_of
    =         s = <redacted>
    =     at ../move-stdlib/sources/signer.move:13: address_of
diff --git a/third_party/move/move-prover/tests/sources/functional/shift.v2_exp b/third_party/move/move-prover/tests/sources/functional/shift.v2_exp
index 67775be82028a..3f5e18335f048 100644
--- a/third_party/move/move-prover/tests/sources/functional/shift.v2_exp
+++ b/third_party/move/move-prover/tests/sources/functional/shift.v2_exp
@@ -8,7 +8,6 @@ error: post-condition does not hold
    =     at tests/sources/functional/shift.move:33: shiftl_7_incorrect
    =         x = <redacted>
    =     at tests/sources/functional/shift.move:34: shiftl_7_incorrect
-   =         <redacted> = <redacted>
    =         result = <redacted>
    =     at tests/sources/functional/shift.move:35: shiftl_7_incorrect
    =     at tests/sources/functional/shift.move:38: shiftl_7_incorrect (spec)
@@ -22,7 +21,6 @@ error: post-condition does not hold
    =     at tests/sources/functional/shift.move:49: shiftr_7_incorrect
    =         x = <redacted>
    =     at tests/sources/functional/shift.move:50: shiftr_7_incorrect
-   =         <redacted> = <redacted>
    =         result = <redacted>
    =     at tests/sources/functional/shift.move:51: shiftr_7_incorrect
    =     at tests/sources/functional/shift.move:54: shiftr_7_incorrect (spec)
@@ -36,7 +34,6 @@ error: post-condition does not hold
    =     at tests/sources/functional/shift.move:65: shift_l_11_incorrect
    =         x = <redacted>
    =     at tests/sources/functional/shift.move:66: shift_l_11_incorrect
-   =         <redacted> = <redacted>
    =         result = <redacted>
    =     at tests/sources/functional/shift.move:67: shift_l_11_incorrect
    =     at tests/sources/functional/shift.move:95: shift_l_11_incorrect (spec)
diff --git a/third_party/move/move-prover/tests/sources/functional/specs_in_fun.v2_exp b/third_party/move/move-prover/tests/sources/functional/specs_in_fun.v2_exp
index 4dc5d49a730b3..a41ce4e659842 100644
--- a/third_party/move/move-prover/tests/sources/functional/specs_in_fun.v2_exp
+++ b/third_party/move/move-prover/tests/sources/functional/specs_in_fun.v2_exp
@@ -1,4 +1,28 @@
 Move prover returns: exiting with verification errors
+warning: Unused assignment to `y`. Consider removing or prefixing with an underscore: `_y`
+   ┌─ tests/sources/functional/specs_in_fun.move:18:9
+   │
+18 │         y = x + 1;
+   │         ^^^^^^^^^
+
+warning: Unused assignment to `z`. Consider removing or prefixing with an underscore: `_z`
+   ┌─ tests/sources/functional/specs_in_fun.move:33:9
+   │
+33 │         z = x + y;
+   │         ^^^^^^^^^
+
+warning: Unused assignment to `y`. Consider removing or prefixing with an underscore: `_y`
+   ┌─ tests/sources/functional/specs_in_fun.move:51:9
+   │
+51 │         y = x + 1;
+   │         ^^^^^^^^^
+
+warning: Unused assignment to `z`. Consider removing or prefixing with an underscore: `_z`
+   ┌─ tests/sources/functional/specs_in_fun.move:66:9
+   │
+66 │         z = x + y;
+   │         ^^^^^^^^^
+
 error: unknown assertion failed
    ┌─ tests/sources/functional/specs_in_fun.move:45:13
    │
diff --git a/third_party/move/move-prover/tests/sources/functional/specs_in_fun_ref.v2_exp b/third_party/move/move-prover/tests/sources/functional/specs_in_fun_ref.v2_exp
new file mode 100644
index 0000000000000..a7c557355adc9
--- /dev/null
+++ b/third_party/move/move-prover/tests/sources/functional/specs_in_fun_ref.v2_exp
@@ -0,0 +1,29 @@
+warning: Unused assignment to `z`. Consider removing or prefixing with an underscore: `_z`
+   ┌─ tests/sources/functional/specs_in_fun_ref.move:11:9
+   │
+11 │         z = x + y;
+   │         ^^^^^^^^^
+
+warning: Unused assignment to `z`. Consider removing or prefixing with an underscore: `_z`
+   ┌─ tests/sources/functional/specs_in_fun_ref.move:44:9
+   │
+44 │         z = *x + *y;
+   │         ^^^^^^^^^^^
+
+warning: Unused assignment to `vx`. Consider removing or prefixing with an underscore: `_vx`
+   ┌─ tests/sources/functional/specs_in_fun_ref.move:45:18
+   │
+45 │         let vx = *x;
+   │                  ^^
+
+warning: Unused assignment to `vy`. Consider removing or prefixing with an underscore: `_vy`
+   ┌─ tests/sources/functional/specs_in_fun_ref.move:46:18
+   │
+46 │         let vy = *y;
+   │                  ^^
+
+warning: Unused assignment to `fx`. Consider removing or prefixing with an underscore: `_fx`
+   ┌─ tests/sources/functional/specs_in_fun_ref.move:47:18
+   │
+47 │         let fx = freeze(x);
+   │                  ^^^^^^^^^
diff --git a/third_party/move/move-prover/tests/sources/functional/strong_edges.v2_exp b/third_party/move/move-prover/tests/sources/functional/strong_edges.v2_exp
index 745572558712b..9f8fe8053d256 100644
--- a/third_party/move/move-prover/tests/sources/functional/strong_edges.v2_exp
+++ b/third_party/move/move-prover/tests/sources/functional/strong_edges.v2_exp
@@ -12,8 +12,6 @@ error: post-condition does not hold
    =     at tests/sources/functional/strong_edges.move:48: glob_and_field_edges_incorrect
    =     at tests/sources/functional/strong_edges.move:49: glob_and_field_edges_incorrect
    =         <redacted> = <redacted>
-   =         s = <redacted>
-   =         <redacted> = <redacted>
    =     at tests/sources/functional/strong_edges.move:50: glob_and_field_edges_incorrect
    =     at tests/sources/functional/strong_edges.move:55: glob_and_field_edges_incorrect (spec)
    =     at tests/sources/functional/strong_edges.move:54: glob_and_field_edges_incorrect (spec)
diff --git a/third_party/move/move-prover/tests/sources/functional/type_reflection.move b/third_party/move/move-prover/tests/sources/functional/type_reflection.move
index 2e0ba200d3660..0149dd4cc572a 100644
--- a/third_party/move/move-prover/tests/sources/functional/type_reflection.move
+++ b/third_party/move/move-prover/tests/sources/functional/type_reflection.move
@@ -105,6 +105,17 @@ module 0x42::test {
     spec test_type_info_aborts_if_full {
         aborts_if !type_info::spec_is_struct<T>();
     }
+
+    fun generic_type_info_verification_target<A>(): type_info::TypeInfo {
+       type_info::type_of<A>()
+    }
+    spec generic_type_info_verification_target {
+        ensures result == generic_type_info_spec_fun<A>();
+    }
+
+    spec fun generic_type_info_spec_fun<A>(): type_info::TypeInfo {
+        type_info::type_of<A>()
+    }
 }
 
 module 0x43::test {
diff --git a/third_party/move/move-prover/tests/sources/functional/verify_custom_table.v2_exp b/third_party/move/move-prover/tests/sources/functional/verify_custom_table.v2_exp
index 868c816071271..53156854c8c86 100644
--- a/third_party/move/move-prover/tests/sources/functional/verify_custom_table.v2_exp
+++ b/third_party/move/move-prover/tests/sources/functional/verify_custom_table.v2_exp
@@ -1,4 +1,16 @@
 Move prover returns: exiting with verification errors
+warning: Unused assignment to `k`. Consider removing or prefixing with an underscore: `_k`
+    ┌─ tests/sources/functional/verify_custom_table.move:115:22
+    │
+115 │         let (k, v) = table::remove_return_key(&mut t, 2);
+    │                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+warning: Unused assignment to `v`. Consider removing or prefixing with an underscore: `_v`
+    ┌─ tests/sources/functional/verify_custom_table.move:115:22
+    │
+115 │         let (k, v) = table::remove_return_key(&mut t, 2);
+    │                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
 error: post-condition does not hold
    ┌─ tests/sources/functional/verify_custom_table.move:76:9
    │
@@ -14,8 +26,6 @@ error: post-condition does not hold
    =     at tests/sources/functional/verify_custom_table.move:72: add_fail
    =         t = <redacted>
    =     at tests/sources/functional/verify_custom_table.move:73: add_fail
-   =         return = <redacted>
-   =     at tests/sources/functional/verify_custom_table.move:68: add_fail
    =         result = <redacted>
    =     at tests/sources/functional/verify_custom_table.move:74: add_fail
    =     at tests/sources/functional/verify_custom_table.move:76: add_fail (spec)
@@ -31,8 +41,6 @@ error: post-condition does not hold
     =     at tests/sources/functional/verify_custom_table.move:203: create_and_insert_fail_due_to_typed_key_encoding
     =         t = <redacted>
     =     at tests/sources/functional/verify_custom_table.move:204: create_and_insert_fail_due_to_typed_key_encoding
-    =         return = <redacted>
-    =     at tests/sources/functional/verify_custom_table.move:201: create_and_insert_fail_due_to_typed_key_encoding
     =         result = <redacted>
     =     at tests/sources/functional/verify_custom_table.move:205: create_and_insert_fail_due_to_typed_key_encoding
     =     at tests/sources/functional/verify_custom_table.move:210: create_and_insert_fail_due_to_typed_key_encoding (spec)
@@ -48,8 +56,6 @@ error: post-condition does not hold
     =     at tests/sources/functional/verify_custom_table.move:215: create_and_insert_fail1
     =         t = <redacted>
     =     at tests/sources/functional/verify_custom_table.move:216: create_and_insert_fail1
-    =         return = <redacted>
-    =     at tests/sources/functional/verify_custom_table.move:213: create_and_insert_fail1
     =         result = <redacted>
     =     at tests/sources/functional/verify_custom_table.move:217: create_and_insert_fail1
     =     at tests/sources/functional/verify_custom_table.move:219: create_and_insert_fail1 (spec)
@@ -65,8 +71,6 @@ error: post-condition does not hold
     =     at tests/sources/functional/verify_custom_table.move:224: create_and_insert_fail2
     =         t = <redacted>
     =     at tests/sources/functional/verify_custom_table.move:225: create_and_insert_fail2
-    =         return = <redacted>
-    =     at tests/sources/functional/verify_custom_table.move:222: create_and_insert_fail2
     =         result = <redacted>
     =     at tests/sources/functional/verify_custom_table.move:226: create_and_insert_fail2
     =     at tests/sources/functional/verify_custom_table.move:228: create_and_insert_fail2 (spec)
diff --git a/third_party/move/move-prover/tests/sources/functional/verify_table.v2_exp b/third_party/move/move-prover/tests/sources/functional/verify_table.v2_exp
index 6a8a1685a62bb..afae3e87880c6 100644
--- a/third_party/move/move-prover/tests/sources/functional/verify_table.v2_exp
+++ b/third_party/move/move-prover/tests/sources/functional/verify_table.v2_exp
@@ -14,8 +14,6 @@ error: post-condition does not hold
    =     at tests/sources/functional/verify_table.move:27: add_fail
    =         t = <redacted>
    =     at tests/sources/functional/verify_table.move:28: add_fail
-   =         return = <redacted>
-   =     at tests/sources/functional/verify_table.move:23: add_fail
    =         result = <redacted>
    =     at tests/sources/functional/verify_table.move:29: add_fail
    =     at tests/sources/functional/verify_table.move:31: add_fail (spec)
diff --git a/third_party/move/move-prover/tests/sources/regression/bug_828.v2_exp b/third_party/move/move-prover/tests/sources/regression/bug_828.v2_exp
new file mode 100644
index 0000000000000..1632a07cecacd
--- /dev/null
+++ b/third_party/move/move-prover/tests/sources/regression/bug_828.v2_exp
@@ -0,0 +1,5 @@
+warning: Unused assignment to `old_i`. Consider removing or prefixing with an underscore: `_old_i`
+  ┌─ tests/sources/regression/bug_828.move:4:21
+  │
+4 │         let old_i = i;
+  │                     ^
diff --git a/third_party/move/move-prover/tests/sources/regression/mono_after_global_invariant.v2_exp b/third_party/move/move-prover/tests/sources/regression/mono_after_global_invariant.v2_exp
index 3a33f93d22465..9604206e50aa8 100644
--- a/third_party/move/move-prover/tests/sources/regression/mono_after_global_invariant.v2_exp
+++ b/third_party/move/move-prover/tests/sources/regression/mono_after_global_invariant.v2_exp
@@ -10,7 +10,6 @@ error: global memory invariant does not hold
    =         s = <redacted>
    =         v = <redacted>
    =     at tests/sources/regression/mono_after_global_invariant.move:31: put_r
-   =         <redacted> = <redacted>
    =     at tests/sources/regression/mono_after_global_invariant.move:9: put_b
    =         s = <redacted>
    =     at tests/sources/regression/mono_after_global_invariant.move:10: put_b
diff --git a/third_party/move/move-prover/tests/testsuite.rs b/third_party/move/move-prover/tests/testsuite.rs
index df422fbf3f1b3..ce00af413d996 100644
--- a/third_party/move/move-prover/tests/testsuite.rs
+++ b/third_party/move/move-prover/tests/testsuite.rs
@@ -8,6 +8,7 @@ use datatest_stable::Requirements;
 use itertools::Itertools;
 use log::{info, warn};
 use move_command_line_common::{env::read_env_var, testing::EXP_EXT};
+use move_model::metadata::LanguageVersion;
 use move_prover::{cli::Options, run_move_prover, run_move_prover_v2};
 use move_prover_test_utils::{baseline_test::verify_or_update_baseline, extract_test_directives};
 use once_cell::sync::OnceCell;
@@ -168,8 +169,10 @@ fn test_runner_for_feature(path: &Path, feature: &Feature) -> datatest_stable::R
 
     let mut error_writer = Buffer::no_color();
     let result = if feature.v2 {
+        options.language_version = Some(LanguageVersion::V2_0);
         run_move_prover_v2(&mut error_writer, options)
     } else {
+        options.model_builder.language_version = LanguageVersion::V2_0;
         run_move_prover(&mut error_writer, options)
     };
     let mut diags = match result {
diff --git a/third_party/move/move-stdlib/src/natives/debug.rs b/third_party/move/move-stdlib/src/natives/debug.rs
index 123f25515b011..e9cdb47764fcb 100644
--- a/third_party/move/move-stdlib/src/natives/debug.rs
+++ b/third_party/move/move-stdlib/src/natives/debug.rs
@@ -234,7 +234,7 @@ mod testing {
         Ok(())
     }
 
-    fn is_non_empty_vector_u8(vec: &Vec<MoveValue>) -> bool {
+    fn is_non_empty_vector_u8(vec: &[MoveValue]) -> bool {
         if vec.is_empty() {
             false
         } else {
diff --git a/third_party/move/move-vm/integration-tests/Cargo.toml b/third_party/move/move-vm/integration-tests/Cargo.toml
index 86d4016f23e9d..99a7339b94520 100644
--- a/third_party/move/move-vm/integration-tests/Cargo.toml
+++ b/third_party/move/move-vm/integration-tests/Cargo.toml
@@ -14,7 +14,7 @@ edition = "2021"
 anyhow = { workspace = true }
 bytes = { workspace = true }
 memory-stats = { workspace = true }
-move-binary-format = { path = "../../move-binary-format" }
+move-binary-format = { path = "../../move-binary-format", features = ["testing"] }
 move-bytecode-verifier = { path = "../../move-bytecode-verifier" }
 move-compiler = { path = "../../move-compiler" }
 smallvec = { workspace = true }
diff --git a/third_party/move/move-vm/integration-tests/src/tests/bad_entry_point_tests.rs b/third_party/move/move-vm/integration-tests/src/tests/bad_entry_point_tests.rs
index 173348478080d..40dff370a5012 100644
--- a/third_party/move/move-vm/integration-tests/src/tests/bad_entry_point_tests.rs
+++ b/third_party/move/move-vm/integration-tests/src/tests/bad_entry_point_tests.rs
@@ -18,7 +18,7 @@ const TEST_ADDR: AccountAddress = AccountAddress::new([42; AccountAddress::LENGT
 
 #[test]
 fn call_non_existent_module() {
-    let vm = MoveVM::new(vec![]).unwrap();
+    let vm = MoveVM::new(vec![]);
     let storage = BlankStorage;
 
     let mut sess = vm.new_session(&storage);
@@ -56,7 +56,7 @@ fn call_non_existent_function() {
     let module_id = ModuleId::new(TEST_ADDR, Identifier::new("M").unwrap());
     storage.publish_or_overwrite_module(module_id.clone(), blob);
 
-    let vm = MoveVM::new(vec![]).unwrap();
+    let vm = MoveVM::new(vec![]);
     let mut sess = vm.new_session(&storage);
 
     let fun_name = Identifier::new("foo").unwrap();
diff --git a/third_party/move/move-vm/integration-tests/src/tests/bad_storage_tests.rs b/third_party/move/move-vm/integration-tests/src/tests/bad_storage_tests.rs
index d28a3cb5c588f..64dc94029efd3 100644
--- a/third_party/move/move-vm/integration-tests/src/tests/bad_storage_tests.rs
+++ b/third_party/move/move-vm/integration-tests/src/tests/bad_storage_tests.rs
@@ -4,20 +4,21 @@
 
 use crate::compiler::{as_module, as_script, compile_units};
 use bytes::Bytes;
-use move_binary_format::errors::PartialVMError;
+use move_binary_format::errors::{PartialVMError, PartialVMResult};
 use move_core_types::{
     account_address::AccountAddress,
-    effects::{ChangeSet, Op},
     identifier::Identifier,
     language_storage::{ModuleId, StructTag},
     metadata::Metadata,
-    resolver::{ModuleResolver, ResourceResolver},
     value::{serialize_values, MoveTypeLayout, MoveValue},
     vm_status::{StatusCode, StatusType},
 };
 use move_vm_runtime::{module_traversal::*, move_vm::MoveVM};
-use move_vm_test_utils::{DeltaStorage, InMemoryStorage};
-use move_vm_types::gas::UnmeteredGasMeter;
+use move_vm_test_utils::InMemoryStorage;
+use move_vm_types::{
+    gas::UnmeteredGasMeter,
+    resolver::{ModuleResolver, ResourceResolver},
+};
 
 const TEST_ADDR: AccountAddress = AccountAddress::new([42; AccountAddress::LENGTH]);
 
@@ -89,8 +90,7 @@ fn test_malformed_resource() {
     let vm = MoveVM::new(move_stdlib::natives::all_natives(
         AccountAddress::from_hex_literal("0x1").unwrap(),
         move_stdlib::natives::GasParameters::zeros(),
-    ))
-    .unwrap();
+    ));
 
     // Execute the first script to publish a resource Foo.
     let mut script_blob = vec![];
@@ -182,7 +182,7 @@ fn test_malformed_module() {
     {
         let mut storage = InMemoryStorage::new();
         storage.publish_or_overwrite_module(m.self_id(), blob.clone());
-        let vm = MoveVM::new(vec![]).unwrap();
+        let vm = MoveVM::new(vec![]);
         let mut sess = vm.new_session(&storage);
         sess.execute_function_bypass_visibility(
             &module_id,
@@ -208,7 +208,7 @@ fn test_malformed_module() {
         blob[3] = 0xEF;
         let mut storage = InMemoryStorage::new();
         storage.publish_or_overwrite_module(m.self_id(), blob);
-        let vm = MoveVM::new(vec![]).unwrap();
+        let vm = MoveVM::new(vec![]);
         let mut sess = vm.new_session(&storage);
         let err = sess
             .execute_function_bypass_visibility(
@@ -249,7 +249,7 @@ fn test_unverifiable_module() {
         m.serialize(&mut blob).unwrap();
         storage.publish_or_overwrite_module(m.self_id(), blob);
 
-        let vm = MoveVM::new(vec![]).unwrap();
+        let vm = MoveVM::new(vec![]);
         let mut sess = vm.new_session(&storage);
 
         sess.execute_function_bypass_visibility(
@@ -274,7 +274,7 @@ fn test_unverifiable_module() {
         m.serialize(&mut blob).unwrap();
         storage.publish_or_overwrite_module(m.self_id(), blob);
 
-        let vm = MoveVM::new(vec![]).unwrap();
+        let vm = MoveVM::new(vec![]);
         let mut sess = vm.new_session(&storage);
 
         let err = sess
@@ -327,7 +327,7 @@ fn test_missing_module_dependency() {
         storage.publish_or_overwrite_module(m.self_id(), blob_m);
         storage.publish_or_overwrite_module(n.self_id(), blob_n.clone());
 
-        let vm = MoveVM::new(vec![]).unwrap();
+        let vm = MoveVM::new(vec![]);
         let mut sess = vm.new_session(&storage);
 
         sess.execute_function_bypass_visibility(
@@ -347,7 +347,7 @@ fn test_missing_module_dependency() {
         let mut storage = InMemoryStorage::new();
         storage.publish_or_overwrite_module(n.self_id(), blob_n);
 
-        let vm = MoveVM::new(vec![]).unwrap();
+        let vm = MoveVM::new(vec![]);
         let mut sess = vm.new_session(&storage);
 
         let err = sess
@@ -400,7 +400,7 @@ fn test_malformed_module_dependency() {
         storage.publish_or_overwrite_module(m.self_id(), blob_m.clone());
         storage.publish_or_overwrite_module(n.self_id(), blob_n.clone());
 
-        let vm = MoveVM::new(vec![]).unwrap();
+        let vm = MoveVM::new(vec![]);
         let mut sess = vm.new_session(&storage);
 
         sess.execute_function_bypass_visibility(
@@ -426,7 +426,7 @@ fn test_malformed_module_dependency() {
         storage.publish_or_overwrite_module(m.self_id(), blob_m);
         storage.publish_or_overwrite_module(n.self_id(), blob_n);
 
-        let vm = MoveVM::new(vec![]).unwrap();
+        let vm = MoveVM::new(vec![]);
         let mut sess = vm.new_session(&storage);
 
         let err = sess
@@ -480,7 +480,7 @@ fn test_unverifiable_module_dependency() {
         storage.publish_or_overwrite_module(m.self_id(), blob_m);
         storage.publish_or_overwrite_module(n.self_id(), blob_n.clone());
 
-        let vm = MoveVM::new(vec![]).unwrap();
+        let vm = MoveVM::new(vec![]);
         let mut sess = vm.new_session(&storage);
 
         sess.execute_function_bypass_visibility(
@@ -506,7 +506,7 @@ fn test_unverifiable_module_dependency() {
         storage.publish_or_overwrite_module(m.self_id(), blob_m);
         storage.publish_or_overwrite_module(n.self_id(), blob_n);
 
-        let vm = MoveVM::new(vec![]).unwrap();
+        let vm = MoveVM::new(vec![]);
         let mut sess = vm.new_session(&storage);
 
         let err = sess
@@ -524,32 +524,56 @@ fn test_unverifiable_module_dependency() {
     }
 }
 
-struct BogusStorage {
+struct BogusModuleStorage {
     bad_status_code: StatusCode,
 }
 
-impl ModuleResolver for BogusStorage {
-    type Error = PartialVMError;
-
+impl ModuleResolver for BogusModuleStorage {
     fn get_module_metadata(&self, _module_id: &ModuleId) -> Vec<Metadata> {
         vec![]
     }
 
-    fn get_module(&self, _module_id: &ModuleId) -> Result<Option<Bytes>, Self::Error> {
+    fn get_module(&self, _module_id: &ModuleId) -> PartialVMResult<Option<Bytes>> {
         Err(PartialVMError::new(self.bad_status_code))
     }
 }
 
-impl ResourceResolver for BogusStorage {
-    type Error = PartialVMError;
+impl ResourceResolver for BogusModuleStorage {
+    fn get_resource_bytes_with_metadata_and_layout(
+        &self,
+        _address: &AccountAddress,
+        _tag: &StructTag,
+        _metadata: &[Metadata],
+        _maybe_layout: Option<&MoveTypeLayout>,
+    ) -> PartialVMResult<(Option<Bytes>, usize)> {
+        unreachable!()
+    }
+}
+
+// Need another bogus storage implementation to allow querying modules but not resources.
+struct BogusResourceStorage {
+    module_storage: InMemoryStorage,
+    bad_status_code: StatusCode,
+}
+
+impl ModuleResolver for BogusResourceStorage {
+    fn get_module_metadata(&self, module_id: &ModuleId) -> Vec<Metadata> {
+        self.module_storage.get_module_metadata(module_id)
+    }
+
+    fn get_module(&self, module_id: &ModuleId) -> PartialVMResult<Option<Bytes>> {
+        self.module_storage.get_module(module_id)
+    }
+}
 
+impl ResourceResolver for BogusResourceStorage {
     fn get_resource_bytes_with_metadata_and_layout(
         &self,
         _address: &AccountAddress,
         _tag: &StructTag,
         _metadata: &[Metadata],
         _maybe_layout: Option<&MoveTypeLayout>,
-    ) -> Result<(Option<Bytes>, usize), Self::Error> {
+    ) -> PartialVMResult<(Option<Bytes>, usize)> {
         Err(PartialVMError::new(self.bad_status_code))
     }
 }
@@ -571,10 +595,10 @@ fn test_storage_returns_bogus_error_when_loading_module() {
     let traversal_storage = TraversalStorage::new();
 
     for error_code in LIST_OF_ERROR_CODES {
-        let storage = BogusStorage {
+        let storage = BogusModuleStorage {
             bad_status_code: *error_code,
         };
-        let vm = MoveVM::new(vec![]).unwrap();
+        let vm = MoveVM::new(vec![]);
         let mut sess = vm.new_session(&storage);
 
         let err = sess
@@ -626,13 +650,6 @@ fn test_storage_returns_bogus_error_when_loading_resource() {
     let mut s_blob = vec![];
     m.serialize(&mut m_blob).unwrap();
     s.serialize(&mut s_blob).unwrap();
-    let mut delta = ChangeSet::new();
-    delta
-        .add_module_op(m.self_id(), Op::New(m_blob.into()))
-        .unwrap();
-    delta
-        .add_module_op(s.self_id(), Op::New(s_blob.into()))
-        .unwrap();
 
     let m_id = m.self_id();
     let foo_name = Identifier::new("foo").unwrap();
@@ -640,16 +657,18 @@ fn test_storage_returns_bogus_error_when_loading_resource() {
     let traversal_storage = TraversalStorage::new();
 
     for error_code in LIST_OF_ERROR_CODES {
-        let storage = BogusStorage {
+        let mut module_storage = InMemoryStorage::new();
+        module_storage.publish_or_overwrite_module(m.self_id(), m_blob.clone());
+        module_storage.publish_or_overwrite_module(s.self_id(), s_blob.clone());
+        let storage = BogusResourceStorage {
+            module_storage,
             bad_status_code: *error_code,
         };
-        let storage = DeltaStorage::new(&storage, &delta);
 
         let vm = MoveVM::new(move_stdlib::natives::all_natives(
             AccountAddress::from_hex_literal("0x1").unwrap(),
             move_stdlib::natives::GasParameters::zeros(),
-        ))
-        .unwrap();
+        ));
         let mut sess = vm.new_session(&storage);
 
         sess.execute_function_bypass_visibility(
diff --git a/third_party/move/move-vm/integration-tests/src/tests/binary_format_version.rs b/third_party/move/move-vm/integration-tests/src/tests/binary_format_version.rs
index 35338dca36c41..ce7c616f03943 100644
--- a/third_party/move/move-vm/integration-tests/src/tests/binary_format_version.rs
+++ b/third_party/move/move-vm/integration-tests/src/tests/binary_format_version.rs
@@ -27,8 +27,7 @@ fn test_publish_module_with_custom_max_binary_format_version() {
         let vm = MoveVM::new(move_stdlib::natives::all_natives(
             AccountAddress::from_hex_literal("0x1").unwrap(),
             move_stdlib::natives::GasParameters::zeros(),
-        ))
-        .unwrap();
+        ));
         let mut sess = vm.new_session(&storage);
 
         sess.publish_module(
@@ -61,8 +60,7 @@ fn test_publish_module_with_custom_max_binary_format_version() {
                 ),
                 ..Default::default()
             },
-        )
-        .unwrap();
+        );
         let mut sess = vm.new_session(&storage);
 
         assert_eq!(
@@ -102,8 +100,7 @@ fn test_run_script_with_custom_max_binary_format_version() {
         let vm = MoveVM::new(move_stdlib::natives::all_natives(
             AccountAddress::from_hex_literal("0x1").unwrap(),
             move_stdlib::natives::GasParameters::zeros(),
-        ))
-        .unwrap();
+        ));
         let mut sess = vm.new_session(&storage);
 
         let args: Vec<Vec<u8>> = vec![];
@@ -141,8 +138,7 @@ fn test_run_script_with_custom_max_binary_format_version() {
                 ),
                 ..Default::default()
             },
-        )
-        .unwrap();
+        );
         let mut sess = vm.new_session(&storage);
 
         let args: Vec<Vec<u8>> = vec![];
diff --git a/third_party/move/move-vm/integration-tests/src/tests/exec_func_effects_tests.rs b/third_party/move/move-vm/integration-tests/src/tests/exec_func_effects_tests.rs
index 398a29d81daa5..c9384cc307ba9 100644
--- a/third_party/move/move-vm/integration-tests/src/tests/exec_func_effects_tests.rs
+++ b/third_party/move/move-vm/integration-tests/src/tests/exec_func_effects_tests.rs
@@ -119,7 +119,7 @@ type ModuleCode = (ModuleId, String);
 fn setup_vm(modules: &[ModuleCode]) -> (MoveVM, InMemoryStorage) {
     let mut storage = InMemoryStorage::new();
     compile_modules(&mut storage, modules);
-    (MoveVM::new(vec![]).unwrap(), storage)
+    (MoveVM::new(vec![]), storage)
 }
 
 fn compile_modules(storage: &mut InMemoryStorage, modules: &[ModuleCode]) {
diff --git a/third_party/move/move-vm/integration-tests/src/tests/function_arg_tests.rs b/third_party/move/move-vm/integration-tests/src/tests/function_arg_tests.rs
index ccd55169ff6c7..b3576f6287944 100644
--- a/third_party/move/move-vm/integration-tests/src/tests/function_arg_tests.rs
+++ b/third_party/move/move-vm/integration-tests/src/tests/function_arg_tests.rs
@@ -59,7 +59,7 @@ fn run(
     let module_id = ModuleId::new(TEST_ADDR, Identifier::new("M").unwrap());
     storage.publish_or_overwrite_module(module_id.clone(), blob);
 
-    let vm = MoveVM::new(vec![]).unwrap();
+    let vm = MoveVM::new(vec![]);
     let mut sess = vm.new_session(&storage);
 
     let fun_name = Identifier::new("foo").unwrap();
diff --git a/third_party/move/move-vm/integration-tests/src/tests/instantiation_tests.rs b/third_party/move/move-vm/integration-tests/src/tests/instantiation_tests.rs
index afe1b9a6af651..ef24344f33ae2 100644
--- a/third_party/move/move-vm/integration-tests/src/tests/instantiation_tests.rs
+++ b/third_party/move/move-vm/integration-tests/src/tests/instantiation_tests.rs
@@ -4,9 +4,8 @@
 use move_binary_format::file_format::{
     AbilitySet, AddressIdentifierIndex, Bytecode::*, CodeUnit, CompiledModule, FieldDefinition,
     FunctionDefinition, FunctionHandle, FunctionHandleIndex, IdentifierIndex, ModuleHandle,
-    ModuleHandleIndex, Signature, SignatureIndex, SignatureToken, SignatureToken::*,
-    StructDefinition, StructFieldInformation, StructHandle, StructHandleIndex, StructTypeParameter,
-    TypeSignature,
+    ModuleHandleIndex, Signature, SignatureIndex, SignatureToken::*, StructDefinition,
+    StructFieldInformation, StructHandle, StructHandleIndex, StructTypeParameter, TypeSignature,
 };
 use move_core_types::{
     account_address::AccountAddress,
@@ -15,14 +14,15 @@ use move_core_types::{
     language_storage::{StructTag, TypeTag},
     vm_status::StatusCode,
 };
-use move_vm_runtime::{module_traversal::*, move_vm::MoveVM};
-use move_vm_test_utils::{gas_schedule::GasStatus, InMemoryStorage};
+use move_vm_runtime::{config::VMConfig, move_vm::MoveVM};
+use move_vm_test_utils::InMemoryStorage;
+use move_vm_types::gas::UnmeteredGasMeter;
 
 #[test]
 fn instantiation_err() {
     let addr = AccountAddress::from_hex_literal("0xcafe").unwrap();
 
-    let mut big_ty = SignatureToken::TypeParameter(0);
+    let mut big_ty = TypeParameter(0);
 
     const N: usize = 7;
     for _ in 0..2 {
@@ -97,24 +97,32 @@ fn instantiation_err() {
                 ],
             }),
         }],
+        // TODO(#13806): followup on whether we need specific tests for variants here
+        struct_variant_handles: vec![],
+        struct_variant_instantiations: vec![],
+        variant_field_handles: vec![],
+        variant_field_instantiations: vec![],
     };
 
     move_bytecode_verifier::verify_module(&cm).expect("verify failed");
-    let vm = MoveVM::new(vec![]).unwrap();
+
+    let vm_config = VMConfig {
+        paranoid_type_checks: false,
+        ..VMConfig::default()
+    };
+    let vm = MoveVM::new_with_config(vec![], vm_config);
 
     let storage: InMemoryStorage = InMemoryStorage::new();
     let mut session = vm.new_session(&storage);
     let mut mod_bytes = vec![];
     cm.serialize(&mut mod_bytes).unwrap();
-    let traversal_storage = TraversalStorage::new();
 
     session
-        .publish_module(mod_bytes, addr, &mut GasStatus::new_unmetered())
+        .publish_module(mod_bytes, addr, &mut UnmeteredGasMeter)
         .expect("Module must publish");
 
     let mut ty_arg = TypeTag::U128;
     for _ in 0..4 {
-        // ty_arg = TypeTag::Vector(Box::new(ty_arg));
         ty_arg = TypeTag::Struct(Box::new(StructTag {
             address: addr,
             module: Identifier::new("m").unwrap(),
@@ -123,17 +131,13 @@ fn instantiation_err() {
         }));
     }
 
-    let err = session.execute_entry_function(
-        &cm.self_id(),
-        ident_str!("f"),
-        vec![ty_arg],
-        Vec::<Vec<u8>>::new(),
-        &mut GasStatus::new_unmetered(),
-        &mut TraversalContext::new(&traversal_storage),
+    let res = session.load_function(&cm.self_id(), ident_str!("f"), &[ty_arg]);
+    assert!(
+        res.is_err(),
+        "Instantiation must fail at load time when converting from type tag to type "
     );
-    assert!(err.is_err(), "Instantiation must fail at runtime");
     assert_eq!(
-        err.err().unwrap().major_status(),
-        StatusCode::VERIFICATION_ERROR
+        res.err().unwrap().major_status(),
+        StatusCode::TOO_MANY_TYPE_NODES
     );
 }
diff --git a/third_party/move/move-vm/integration-tests/src/tests/invariant_violation_tests.rs b/third_party/move/move-vm/integration-tests/src/tests/invariant_violation_tests.rs
index cb48d3a6dc015..4eed9200011dd 100644
--- a/third_party/move/move-vm/integration-tests/src/tests/invariant_violation_tests.rs
+++ b/third_party/move/move-vm/integration-tests/src/tests/invariant_violation_tests.rs
@@ -7,7 +7,8 @@ use move_binary_format::file_format::{
 };
 use move_core_types::vm_status::StatusCode;
 use move_vm_runtime::{module_traversal::*, move_vm::MoveVM};
-use move_vm_test_utils::{gas_schedule::GasStatus, InMemoryStorage};
+use move_vm_test_utils::InMemoryStorage;
+use move_vm_types::gas::UnmeteredGasMeter;
 
 #[test]
 fn merge_borrow_states_infinite_loop() {
@@ -70,7 +71,7 @@ fn merge_borrow_states_infinite_loop() {
     };
 
     move_bytecode_verifier::verify_script(&cs).expect("verify failed");
-    let vm = MoveVM::new(vec![]).unwrap();
+    let vm = MoveVM::new(vec![]);
 
     let storage: InMemoryStorage = InMemoryStorage::new();
     let mut session = vm.new_session(&storage);
@@ -83,7 +84,7 @@ fn merge_borrow_states_infinite_loop() {
             script_bytes.as_slice(),
             vec![],
             Vec::<Vec<u8>>::new(),
-            &mut GasStatus::new_unmetered(),
+            &mut UnmeteredGasMeter,
             &mut TraversalContext::new(&traversal_storage),
         )
         .unwrap_err();
diff --git a/third_party/move/move-vm/integration-tests/src/tests/leak_tests.rs b/third_party/move/move-vm/integration-tests/src/tests/leak_tests.rs
index 3d6673d6b37fc..bb791af7b8d71 100644
--- a/third_party/move/move-vm/integration-tests/src/tests/leak_tests.rs
+++ b/third_party/move/move-vm/integration-tests/src/tests/leak_tests.rs
@@ -5,7 +5,8 @@ use move_binary_format::file_format::{
     Bytecode::*, CodeUnit, CompiledScript, Signature, SignatureIndex, SignatureToken::*,
 };
 use move_vm_runtime::{module_traversal::*, move_vm::MoveVM};
-use move_vm_test_utils::{gas_schedule::GasStatus, InMemoryStorage};
+use move_vm_test_utils::InMemoryStorage;
+use move_vm_types::gas::UnmeteredGasMeter;
 
 #[ignore] // TODO: figure whether to reactive this test
 #[test]
@@ -45,7 +46,7 @@ fn leak_with_abort() {
     };
 
     move_bytecode_verifier::verify_script(&cs).expect("verify failed");
-    let vm = MoveVM::new(vec![]).unwrap();
+    let vm = MoveVM::new(vec![]);
 
     let storage: InMemoryStorage = InMemoryStorage::new();
     let mut session = vm.new_session(&storage);
@@ -58,7 +59,7 @@ fn leak_with_abort() {
             script_bytes.as_slice(),
             vec![],
             Vec::<Vec<u8>>::new(),
-            &mut GasStatus::new_unmetered(),
+            &mut UnmeteredGasMeter,
             &mut TraversalContext::new(&traversal_storage),
         );
     }
diff --git a/third_party/move/move-vm/integration-tests/src/tests/loader_tests.rs b/third_party/move/move-vm/integration-tests/src/tests/loader_tests.rs
index 429ee3b6d96b9..f9d7b95439727 100644
--- a/third_party/move/move-vm/integration-tests/src/tests/loader_tests.rs
+++ b/third_party/move/move-vm/integration-tests/src/tests/loader_tests.rs
@@ -53,8 +53,9 @@ impl Adapter {
                 Identifier::new("just_c").unwrap(),
             ),
         ];
+
         let config = VMConfig {
-            verifier: VerifierConfig {
+            verifier_config: VerifierConfig {
                 max_dependency_depth: Some(100),
                 ..Default::default()
             },
@@ -62,14 +63,14 @@ impl Adapter {
         };
         Self {
             store,
-            vm: Arc::new(MoveVM::new_with_config(vec![], config).unwrap()),
+            vm: Arc::new(MoveVM::new_with_config(vec![], config)),
             functions,
         }
     }
 
     fn fresh(self) -> Self {
         let config = VMConfig {
-            verifier: VerifierConfig {
+            verifier_config: VerifierConfig {
                 max_dependency_depth: Some(100),
                 ..Default::default()
             },
@@ -77,7 +78,7 @@ impl Adapter {
         };
         Self {
             store: self.store,
-            vm: Arc::new(MoveVM::new_with_config(vec![], config).unwrap()),
+            vm: Arc::new(MoveVM::new_with_config(vec![], config)),
             functions: self.functions,
         }
     }
diff --git a/third_party/move/move-vm/integration-tests/src/tests/mutated_accounts_tests.rs b/third_party/move/move-vm/integration-tests/src/tests/mutated_accounts_tests.rs
index bb1e55fa85fc0..8f390bc373579 100644
--- a/third_party/move/move-vm/integration-tests/src/tests/mutated_accounts_tests.rs
+++ b/third_party/move/move-vm/integration-tests/src/tests/mutated_accounts_tests.rs
@@ -43,7 +43,7 @@ fn mutated_accounts() {
     let module_id = ModuleId::new(TEST_ADDR, Identifier::new("M").unwrap());
     storage.publish_or_overwrite_module(module_id.clone(), blob);
 
-    let vm = MoveVM::new(vec![]).unwrap();
+    let vm = MoveVM::new(vec![]);
     let mut sess = vm.new_session(&storage);
 
     let publish = Identifier::new("publish").unwrap();
diff --git a/third_party/move/move-vm/integration-tests/src/tests/native_tests.rs b/third_party/move/move-vm/integration-tests/src/tests/native_tests.rs
index 86e072a97efa4..70c8c02ca4db7 100644
--- a/third_party/move/move-vm/integration-tests/src/tests/native_tests.rs
+++ b/third_party/move/move-vm/integration-tests/src/tests/native_tests.rs
@@ -65,23 +65,23 @@ fn test_publish_module_with_nested_loops() {
             make_failed_native(),
         )];
         let vm = MoveVM::new_with_config(natives, VMConfig {
-            verifier: VerifierConfig {
+            verifier_config: VerifierConfig {
                 max_loop_depth: Some(2),
                 ..Default::default()
             },
             ..Default::default()
-        })
-        .unwrap();
+        });
 
         let mut sess = vm.new_session(&storage);
         sess.publish_module(m_blob.clone(), TEST_ADDR, &mut UnmeteredGasMeter)
             .unwrap();
 
+        let func = sess
+            .load_function(&m.self_id(), &Identifier::new("foo").unwrap(), &[])
+            .unwrap();
         let err1 = sess
             .execute_entry_function(
-                &m.self_id(),
-                &Identifier::new("foo").unwrap(),
-                vec![],
+                func,
                 Vec::<Vec<u8>>::new(),
                 &mut UnmeteredGasMeter,
                 &mut TraversalContext::new(&traversal_storage),
@@ -90,17 +90,18 @@ fn test_publish_module_with_nested_loops() {
 
         assert!(err1.exec_state().unwrap().stack_trace().is_empty());
 
+        let func = sess
+            .load_function(&m.self_id(), &Identifier::new("foo2").unwrap(), &[])
+            .unwrap();
         let err2 = sess
             .execute_entry_function(
-                &m.self_id(),
-                &Identifier::new("foo2").unwrap(),
-                vec![],
+                func,
                 Vec::<Vec<u8>>::new(),
                 &mut UnmeteredGasMeter,
                 &mut TraversalContext::new(&traversal_storage),
             )
             .unwrap_err();
 
-        assert!(err2.exec_state().unwrap().stack_trace().len() == 1);
+        assert_eq!(err2.exec_state().unwrap().stack_trace().len(), 1);
     }
 }
diff --git a/third_party/move/move-vm/integration-tests/src/tests/nested_loop_tests.rs b/third_party/move/move-vm/integration-tests/src/tests/nested_loop_tests.rs
index f71550c84b30e..92f1291964aa3 100644
--- a/third_party/move/move-vm/integration-tests/src/tests/nested_loop_tests.rs
+++ b/third_party/move/move-vm/integration-tests/src/tests/nested_loop_tests.rs
@@ -44,14 +44,13 @@ fn test_publish_module_with_nested_loops() {
                 move_stdlib::natives::GasParameters::zeros(),
             ),
             VMConfig {
-                verifier: VerifierConfig {
+                verifier_config: VerifierConfig {
                     max_loop_depth: Some(2),
                     ..Default::default()
                 },
                 ..Default::default()
             },
-        )
-        .unwrap();
+        );
 
         let mut sess = vm.new_session(&storage);
         sess.publish_module(m_blob.clone(), TEST_ADDR, &mut UnmeteredGasMeter)
@@ -67,14 +66,13 @@ fn test_publish_module_with_nested_loops() {
                 move_stdlib::natives::GasParameters::zeros(),
             ),
             VMConfig {
-                verifier: VerifierConfig {
+                verifier_config: VerifierConfig {
                     max_loop_depth: Some(1),
                     ..Default::default()
                 },
                 ..Default::default()
             },
-        )
-        .unwrap();
+        );
 
         let mut sess = vm.new_session(&storage);
         sess.publish_module(m_blob, TEST_ADDR, &mut UnmeteredGasMeter)
@@ -117,14 +115,13 @@ fn test_run_script_with_nested_loops() {
                 move_stdlib::natives::GasParameters::zeros(),
             ),
             VMConfig {
-                verifier: VerifierConfig {
+                verifier_config: VerifierConfig {
                     max_loop_depth: Some(2),
                     ..Default::default()
                 },
                 ..Default::default()
             },
-        )
-        .unwrap();
+        );
 
         let mut sess = vm.new_session(&storage);
         let args: Vec<Vec<u8>> = vec![];
@@ -147,14 +144,13 @@ fn test_run_script_with_nested_loops() {
                 move_stdlib::natives::GasParameters::zeros(),
             ),
             VMConfig {
-                verifier: VerifierConfig {
+                verifier_config: VerifierConfig {
                     max_loop_depth: Some(1),
                     ..Default::default()
                 },
                 ..Default::default()
             },
-        )
-        .unwrap();
+        );
 
         let mut sess = vm.new_session(&storage);
         let args: Vec<Vec<u8>> = vec![];
diff --git a/third_party/move/move-vm/integration-tests/src/tests/regression_tests.rs b/third_party/move/move-vm/integration-tests/src/tests/regression_tests.rs
index 8601499503c2e..94b0f103d8c51 100644
--- a/third_party/move/move-vm/integration-tests/src/tests/regression_tests.rs
+++ b/third_party/move/move-vm/integration-tests/src/tests/regression_tests.rs
@@ -108,12 +108,10 @@ fn script_large_ty() {
 
     let mut storage = InMemoryStorage::new();
     let move_vm = MoveVM::new_with_config(vec![], VMConfig {
-        verifier: verifier_config,
+        verifier_config,
         paranoid_type_checks: true,
-        type_size_limit: true,
         ..Default::default()
-    })
-    .unwrap();
+    });
 
     let module_address = AccountAddress::from_hex_literal("0x42").unwrap();
     let module_identifier = Identifier::new("pwn").unwrap();
diff --git a/third_party/move/move-vm/integration-tests/src/tests/return_value_tests.rs b/third_party/move/move-vm/integration-tests/src/tests/return_value_tests.rs
index b23e3d72faaa4..b064de48e555d 100644
--- a/third_party/move/move-vm/integration-tests/src/tests/return_value_tests.rs
+++ b/third_party/move/move-vm/integration-tests/src/tests/return_value_tests.rs
@@ -50,7 +50,7 @@ fn run(
     let module_id = ModuleId::new(TEST_ADDR, Identifier::new("M").unwrap());
     storage.publish_or_overwrite_module(module_id.clone(), blob);
 
-    let vm = MoveVM::new(vec![]).unwrap();
+    let vm = MoveVM::new(vec![]);
     let mut sess = vm.new_session(&storage);
 
     let fun_name = Identifier::new("foo").unwrap();
diff --git a/third_party/move/move-vm/integration-tests/src/tests/runtime_reentrancy_check_tests.rs b/third_party/move/move-vm/integration-tests/src/tests/runtime_reentrancy_check_tests.rs
index 463a724766c48..bc998a6b87a65 100644
--- a/third_party/move/move-vm/integration-tests/src/tests/runtime_reentrancy_check_tests.rs
+++ b/third_party/move/move-vm/integration-tests/src/tests/runtime_reentrancy_check_tests.rs
@@ -157,7 +157,7 @@ fn runtime_reentrancy_check() {
     let args: Vec<Vec<u8>> = vec![];
     let module_id = ModuleId::new(TEST_ADDR, Identifier::new("A").unwrap());
 
-    let vm = MoveVM::new(natives).unwrap();
+    let vm = MoveVM::new(natives);
     let mut sess = vm.new_session(&storage);
     let traversal_storage = TraversalStorage::new();
 
diff --git a/third_party/move/move-vm/integration-tests/src/tests/vm_arguments_tests.rs b/third_party/move/move-vm/integration-tests/src/tests/vm_arguments_tests.rs
index 5f3f1088c158c..0bfcd2a96fb01 100644
--- a/third_party/move/move-vm/integration-tests/src/tests/vm_arguments_tests.rs
+++ b/third_party/move/move-vm/integration-tests/src/tests/vm_arguments_tests.rs
@@ -215,6 +215,10 @@ fn make_module_with_function(
                 code: vec![Bytecode::LdU64(0), Bytecode::Abort],
             }),
         }],
+        struct_variant_handles: vec![],
+        struct_variant_instantiations: vec![],
+        variant_field_handles: vec![],
+        variant_field_instantiations: vec![],
     };
     (module, function_name)
 }
@@ -247,7 +251,7 @@ fn call_script_with_args_ty_args_signers(
     ty_args: Vec<TypeTag>,
     signers: Vec<AccountAddress>,
 ) -> VMResult<()> {
-    let move_vm = MoveVM::new(vec![]).unwrap();
+    let move_vm = MoveVM::new(vec![]);
     let remote_view = InMemoryStorage::new();
     let mut session = move_vm.new_session(&remote_view);
     let traversal_storage = TraversalStorage::new();
@@ -274,7 +278,7 @@ fn call_script_function_with_args_ty_args_signers(
     ty_args: Vec<TypeTag>,
     signers: Vec<AccountAddress>,
 ) -> VMResult<()> {
-    let move_vm = MoveVM::new(vec![]).unwrap();
+    let move_vm = MoveVM::new(vec![]);
     let mut remote_view = InMemoryStorage::new();
 
     let module_id = module.self_id();
@@ -776,7 +780,7 @@ fn call_missing_item() {
 
     // missing module
     let function_name = ident_str!("foo");
-    let move_vm = MoveVM::new(vec![]).unwrap();
+    let move_vm = MoveVM::new(vec![]);
     let mut remote_view = InMemoryStorage::new();
     let mut session = move_vm.new_session(&remote_view);
     let traversal_storage = TraversalStorage::new();
diff --git a/third_party/move/move-vm/paranoid-tests/tests/ability/copy/copy_loc.mvir b/third_party/move/move-vm/paranoid-tests/tests/ability/copy/copy_loc.mvir
index f2a7cde745657..6d02c40c7046e 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/ability/copy/copy_loc.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/ability/copy/copy_loc.mvir
@@ -24,7 +24,7 @@ module 0x2.B {
     }
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.B;
 main(account: signer) {
 label b0:
diff --git a/third_party/move/move-vm/paranoid-tests/tests/ability/copy/copy_loc_2.mvir b/third_party/move/move-vm/paranoid-tests/tests/ability/copy/copy_loc_2.mvir
index a1548d00ad014..8c6ffed3f1447 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/ability/copy/copy_loc_2.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/ability/copy/copy_loc_2.mvir
@@ -24,7 +24,7 @@ module 0x2.B {
     }
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.B;
 main(account: signer) {
 label b0:
diff --git a/third_party/move/move-vm/paranoid-tests/tests/ability/copy/read_ref.mvir b/third_party/move/move-vm/paranoid-tests/tests/ability/copy/read_ref.mvir
index 7f819a88e9064..e3ed8e4dc3ef2 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/ability/copy/read_ref.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/ability/copy/read_ref.mvir
@@ -26,7 +26,7 @@ module 0x2.B {
     }
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.B;
 main(account: signer) {
 label b0:
diff --git a/third_party/move/move-vm/paranoid-tests/tests/ability/copy/read_ref_2.mvir b/third_party/move/move-vm/paranoid-tests/tests/ability/copy/read_ref_2.mvir
index 1efd1fbb9b7e2..5f0dba0f3927b 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/ability/copy/read_ref_2.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/ability/copy/read_ref_2.mvir
@@ -26,7 +26,7 @@ module 0x2.B {
     }
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.B;
 main(account: signer) {
 label b0:
diff --git a/third_party/move/move-vm/paranoid-tests/tests/ability/drop/eq.mvir b/third_party/move/move-vm/paranoid-tests/tests/ability/drop/eq.mvir
index 4d8c4949fb2cc..9dd5fd26caf0b 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/ability/drop/eq.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/ability/drop/eq.mvir
@@ -26,7 +26,7 @@ module 0x2.B {
     }
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.B;
 main(account: signer) {
 label b0:
diff --git a/third_party/move/move-vm/paranoid-tests/tests/ability/drop/eq_2.mvir b/third_party/move/move-vm/paranoid-tests/tests/ability/drop/eq_2.mvir
index d1d515469d329..a2c7a98b4f684 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/ability/drop/eq_2.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/ability/drop/eq_2.mvir
@@ -26,7 +26,7 @@ module 0x2.B {
     }
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.B;
 main(account: signer) {
 label b0:
diff --git a/third_party/move/move-vm/paranoid-tests/tests/ability/drop/eq_3.exp b/third_party/move/move-vm/paranoid-tests/tests/ability/drop/eq_3.exp
index bd9b0572d3815..9a565bac36df8 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/ability/drop/eq_3.exp
+++ b/third_party/move/move-vm/paranoid-tests/tests/ability/drop/eq_3.exp
@@ -3,7 +3,7 @@ processed 2 tasks
 task 1 'run'. lines 17-27:
 Error: Script execution failed with VMError: {
     major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
-    sub_status: None,
+    sub_status: Some(1),
     location: script,
     indices: [],
     offsets: [(FunctionDefinitionIndex(0), 6)],
diff --git a/third_party/move/move-vm/paranoid-tests/tests/ability/drop/eq_3.mvir b/third_party/move/move-vm/paranoid-tests/tests/ability/drop/eq_3.mvir
index 0142099fa60c6..62a74288a0b73 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/ability/drop/eq_3.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/ability/drop/eq_3.mvir
@@ -14,7 +14,7 @@ module 0x2.B {
   }
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.B;
 main(account: signer) {
     let c: B.C;
diff --git a/third_party/move/move-vm/paranoid-tests/tests/ability/drop/hot_potato.mvir b/third_party/move/move-vm/paranoid-tests/tests/ability/drop/hot_potato.mvir
index b53f76325f038..7503504ec085b 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/ability/drop/hot_potato.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/ability/drop/hot_potato.mvir
@@ -21,7 +21,7 @@ module 0x2.B {
     }
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.B;
 main(account: signer) {
 label b0:
diff --git a/third_party/move/move-vm/paranoid-tests/tests/ability/drop/hot_potato_2.mvir b/third_party/move/move-vm/paranoid-tests/tests/ability/drop/hot_potato_2.mvir
index b1324c35542ea..b62e4e82264ae 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/ability/drop/hot_potato_2.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/ability/drop/hot_potato_2.mvir
@@ -21,7 +21,7 @@ module 0x2.B {
     }
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.B;
 main(account: signer) {
 label b0:
diff --git a/third_party/move/move-vm/paranoid-tests/tests/ability/drop/neq.mvir b/third_party/move/move-vm/paranoid-tests/tests/ability/drop/neq.mvir
index d6a1335e248f5..e5effd5c4b9fc 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/ability/drop/neq.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/ability/drop/neq.mvir
@@ -26,7 +26,7 @@ module 0x2.B {
     }
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.B;
 main(account: signer) {
 label b0:
diff --git a/third_party/move/move-vm/paranoid-tests/tests/ability/drop/neq_2.mvir b/third_party/move/move-vm/paranoid-tests/tests/ability/drop/neq_2.mvir
index 98825cf845df5..21db1f3706344 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/ability/drop/neq_2.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/ability/drop/neq_2.mvir
@@ -26,7 +26,7 @@ module 0x2.B {
     }
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.B;
 main(account: signer) {
 label b0:
diff --git a/third_party/move/move-vm/paranoid-tests/tests/ability/drop/pop.mvir b/third_party/move/move-vm/paranoid-tests/tests/ability/drop/pop.mvir
index b81d2c2aec840..244cfea364768 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/ability/drop/pop.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/ability/drop/pop.mvir
@@ -20,7 +20,7 @@ module 0x2.B {
     }
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.B;
 main(account: signer) {
 label b0:
diff --git a/third_party/move/move-vm/paranoid-tests/tests/ability/drop/pop_2.mvir b/third_party/move/move-vm/paranoid-tests/tests/ability/drop/pop_2.mvir
index b6ce3705ae8ab..b2c4991fa3cca 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/ability/drop/pop_2.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/ability/drop/pop_2.mvir
@@ -20,7 +20,7 @@ module 0x2.B {
     }
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.B;
 main(account: signer) {
 label b0:
diff --git a/third_party/move/move-vm/paranoid-tests/tests/ability/drop/ret_vector.mvir b/third_party/move/move-vm/paranoid-tests/tests/ability/drop/ret_vector.mvir
index 380d3edbcc6e0..63fe5011590ae 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/ability/drop/ret_vector.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/ability/drop/ret_vector.mvir
@@ -14,7 +14,7 @@ module 0x2.A {
   }
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.A;
 main(account: signer) {
     let v: vector<A.C>;
@@ -26,7 +26,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.A;
 main(account: signer) {
     let v: vector<A.D>;
diff --git a/third_party/move/move-vm/paranoid-tests/tests/ability/drop/store.mvir b/third_party/move/move-vm/paranoid-tests/tests/ability/drop/store.mvir
index 6c577c7992831..5b6a6516df964 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/ability/drop/store.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/ability/drop/store.mvir
@@ -23,7 +23,7 @@ module 0x2.B {
     }
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.B;
 main(account: signer) {
 label b0:
diff --git a/third_party/move/move-vm/paranoid-tests/tests/ability/drop/store_2.mvir b/third_party/move/move-vm/paranoid-tests/tests/ability/drop/store_2.mvir
index c498ff8d7f14c..7fb42caa0222f 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/ability/drop/store_2.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/ability/drop/store_2.mvir
@@ -23,7 +23,7 @@ module 0x2.B {
     }
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.B;
 main(account: signer) {
 label b0:
diff --git a/third_party/move/move-vm/paranoid-tests/tests/ability/drop/write_ref.mvir b/third_party/move/move-vm/paranoid-tests/tests/ability/drop/write_ref.mvir
index 65620d8f7411c..66bbb4e9f7de9 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/ability/drop/write_ref.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/ability/drop/write_ref.mvir
@@ -27,7 +27,7 @@ module 0x2.B {
     }
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.B;
 main(account: signer) {
 label b0:
diff --git a/third_party/move/move-vm/paranoid-tests/tests/ability/drop/write_ref_2.mvir b/third_party/move/move-vm/paranoid-tests/tests/ability/drop/write_ref_2.mvir
index 20b213e8ae3aa..c9aa8fd249a05 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/ability/drop/write_ref_2.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/ability/drop/write_ref_2.mvir
@@ -27,7 +27,7 @@ module 0x2.B {
     }
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.B;
 main(account: signer) {
 label b0:
diff --git a/third_party/move/move-vm/paranoid-tests/tests/ability/store/hot_potato_store.mvir b/third_party/move/move-vm/paranoid-tests/tests/ability/store/hot_potato_store.mvir
index 6199c52554e3b..99112ee2e476f 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/ability/store/hot_potato_store.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/ability/store/hot_potato_store.mvir
@@ -16,7 +16,7 @@ module 0x2.A {
     }
 }
 
-//# run --signers 0x1  --check-runtime-types
+//# run --signers 0x1 
 import 0x2.A;
 main(account: signer) {
     let a: A.G;
diff --git a/third_party/move/move-vm/paranoid-tests/tests/ability/store/invalid_store.mvir b/third_party/move/move-vm/paranoid-tests/tests/ability/store/invalid_store.mvir
index c6436132b09bd..36d487e7b31bd 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/ability/store/invalid_store.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/ability/store/invalid_store.mvir
@@ -25,7 +25,7 @@ module 0x2.B {
     }
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.B;
 main(account: signer) {
 label b0:
diff --git a/third_party/move/move-vm/paranoid-tests/tests/ability/store/invalid_store_2.mvir b/third_party/move/move-vm/paranoid-tests/tests/ability/store/invalid_store_2.mvir
index 464c8ce1d5542..439c45ad8cc63 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/ability/store/invalid_store_2.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/ability/store/invalid_store_2.mvir
@@ -25,7 +25,7 @@ module 0x2.B {
     }
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.B;
 main(account: signer) {
 label b0:
diff --git a/third_party/move/move-vm/paranoid-tests/tests/encapsulation_safety/borrow_field.mvir b/third_party/move/move-vm/paranoid-tests/tests/encapsulation_safety/borrow_field.mvir
index 2ef0a1bc757ee..c4b2abfbc731a 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/encapsulation_safety/borrow_field.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/encapsulation_safety/borrow_field.mvir
@@ -28,7 +28,7 @@ module 0x2.B {
     }
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.B;
 main(account: signer) {
 label b0:
diff --git a/third_party/move/move-vm/paranoid-tests/tests/encapsulation_safety/borrow_field_2.mvir b/third_party/move/move-vm/paranoid-tests/tests/encapsulation_safety/borrow_field_2.mvir
index 52efe94b95833..a093006de10b2 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/encapsulation_safety/borrow_field_2.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/encapsulation_safety/borrow_field_2.mvir
@@ -23,7 +23,7 @@ module 0x2.A {
   }
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.A;
 main(account: signer) {
     let c: A.C;
diff --git a/third_party/move/move-vm/paranoid-tests/tests/encapsulation_safety/borrow_field_generic.mvir b/third_party/move/move-vm/paranoid-tests/tests/encapsulation_safety/borrow_field_generic.mvir
index 525fbc7cae338..f3e7d4b7aa29b 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/encapsulation_safety/borrow_field_generic.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/encapsulation_safety/borrow_field_generic.mvir
@@ -28,7 +28,7 @@ module 0x2.B {
     }
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.B;
 main(account: signer) {
 label b0:
diff --git a/third_party/move/move-vm/paranoid-tests/tests/encapsulation_safety/cross_function_call.mvir b/third_party/move/move-vm/paranoid-tests/tests/encapsulation_safety/cross_function_call.mvir
index 28c6d2a136407..62edd9cfc1618 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/encapsulation_safety/cross_function_call.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/encapsulation_safety/cross_function_call.mvir
@@ -21,7 +21,7 @@ module 0x3.B {
     }
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x3.B;
 import 0x2.A;
 main(account: signer) {
diff --git a/third_party/move/move-vm/paranoid-tests/tests/encapsulation_safety/cross_native_function_call.mvir b/third_party/move/move-vm/paranoid-tests/tests/encapsulation_safety/cross_native_function_call.mvir
index 81af2b9cd3d69..a657f6024d99d 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/encapsulation_safety/cross_native_function_call.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/encapsulation_safety/cross_native_function_call.mvir
@@ -10,7 +10,7 @@ module 0x2.A {
   }
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.A;
 main(account: signer) {
 label b0:
diff --git a/third_party/move/move-vm/paranoid-tests/tests/encapsulation_safety/move_to.mvir b/third_party/move/move-vm/paranoid-tests/tests/encapsulation_safety/move_to.mvir
index f6c90dcb21a8f..a94ffe9d52f7d 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/encapsulation_safety/move_to.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/encapsulation_safety/move_to.mvir
@@ -23,7 +23,7 @@ module 0x2.B {
     }
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.B;
 main(account: signer) {
 label b0:
diff --git a/third_party/move/move-vm/paranoid-tests/tests/encapsulation_safety/move_to_generic.mvir b/third_party/move/move-vm/paranoid-tests/tests/encapsulation_safety/move_to_generic.mvir
index c90e4b92a9d9b..7dfc05fa4c206 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/encapsulation_safety/move_to_generic.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/encapsulation_safety/move_to_generic.mvir
@@ -23,7 +23,7 @@ module 0x2.B {
     }
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.B;
 main(account: signer) {
 label b0:
diff --git a/third_party/move/move-vm/paranoid-tests/tests/encapsulation_safety/unpack.mvir b/third_party/move/move-vm/paranoid-tests/tests/encapsulation_safety/unpack.mvir
index 6237cc903c341..40a33711abaf3 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/encapsulation_safety/unpack.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/encapsulation_safety/unpack.mvir
@@ -33,7 +33,7 @@ module 0x2.B {
     }
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.B;
 main(account: signer) {
 label b0:
@@ -41,7 +41,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.A;
 main(account: signer) {
     let a: A.C;
diff --git a/third_party/move/move-vm/paranoid-tests/tests/encapsulation_safety/unpack_generic.mvir b/third_party/move/move-vm/paranoid-tests/tests/encapsulation_safety/unpack_generic.mvir
index 0f843b239ee79..159cfaa078adc 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/encapsulation_safety/unpack_generic.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/encapsulation_safety/unpack_generic.mvir
@@ -25,7 +25,7 @@ module 0x2.B {
     }
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.B;
 main(account: signer) {
 label b0:
diff --git a/third_party/move/move-vm/paranoid-tests/tests/encapsulation_safety/unpack_generic_2.mvir b/third_party/move/move-vm/paranoid-tests/tests/encapsulation_safety/unpack_generic_2.mvir
index b6a8ed36e6490..197ba401760c4 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/encapsulation_safety/unpack_generic_2.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/encapsulation_safety/unpack_generic_2.mvir
@@ -15,7 +15,7 @@ module 0x2.A {
   }
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.A;
 main(account: signer) {
     let c: A.C<u64>;
diff --git a/third_party/move/move-vm/paranoid-tests/tests/type_safety/invocation/call_generic_mismatch.mvir b/third_party/move/move-vm/paranoid-tests/tests/type_safety/invocation/call_generic_mismatch.mvir
index 5a89699b9374d..3ecbdbcd57fd3 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/type_safety/invocation/call_generic_mismatch.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/type_safety/invocation/call_generic_mismatch.mvir
@@ -16,7 +16,7 @@ module 0x2.A {
 }
 
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.A;
 main(account: signer) {
     let c: A.C<A.D>;
diff --git a/third_party/move/move-vm/paranoid-tests/tests/type_safety/invocation/call_mismatch.mvir b/third_party/move/move-vm/paranoid-tests/tests/type_safety/invocation/call_mismatch.mvir
index 8548f368305e0..738fdd93f2cb0 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/type_safety/invocation/call_mismatch.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/type_safety/invocation/call_mismatch.mvir
@@ -16,7 +16,7 @@ module 0x2.A {
   }
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.A;
 main(account: signer) {
     let v: A.C;
@@ -38,7 +38,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x2 --check-runtime-types
+//# run --signers 0x2
 import 0x2.A;
 main(account: signer) {
     let v: u64;
diff --git a/third_party/move/move-vm/paranoid-tests/tests/type_safety/invocation/call_with_mutliple_args.mvir b/third_party/move/move-vm/paranoid-tests/tests/type_safety/invocation/call_with_mutliple_args.mvir
index 1e7e09db2d80c..986372c386c8c 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/type_safety/invocation/call_with_mutliple_args.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/type_safety/invocation/call_with_mutliple_args.mvir
@@ -18,7 +18,7 @@ module 0x2.A {
   }
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.A;
 main(account: signer) {
 label b0:
@@ -27,7 +27,7 @@ label b0:
 }
 
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.A;
 main(account: signer) {
 label b0:
@@ -35,7 +35,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.A;
 main(account: signer) {
 label b0:
@@ -43,7 +43,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.A;
 main(account: signer) {
     let a: A.A;
@@ -53,7 +53,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.A;
 main(account: signer) {
     let a: A.A;
diff --git a/third_party/move/move-vm/paranoid-tests/tests/type_safety/invocation/call_with_reference.mvir b/third_party/move/move-vm/paranoid-tests/tests/type_safety/invocation/call_with_reference.mvir
index 9b53923e64834..8ba9fb20932ac 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/type_safety/invocation/call_with_reference.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/type_safety/invocation/call_with_reference.mvir
@@ -16,7 +16,7 @@ module 0x2.A {
   }
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.A;
 main(account: signer) {
     let v: A.C;
diff --git a/third_party/move/move-vm/paranoid-tests/tests/type_safety/invocation/call_with_vector.mvir b/third_party/move/move-vm/paranoid-tests/tests/type_safety/invocation/call_with_vector.mvir
index 44639e1fb1534..4584f412630a7 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/type_safety/invocation/call_with_vector.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/type_safety/invocation/call_with_vector.mvir
@@ -19,7 +19,7 @@ module 0x2.A {
   }
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.A;
 main(account: signer) {
     let v: vector<A.C>;
@@ -33,7 +33,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.A;
 main(account: signer) {
     let v: vector<A.C>;
diff --git a/third_party/move/move-vm/paranoid-tests/tests/type_safety/natives/bcs.mvir b/third_party/move/move-vm/paranoid-tests/tests/type_safety/natives/bcs.mvir
index 7fc26783e6e32..4bb9a5f6a84ab 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/type_safety/natives/bcs.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/type_safety/natives/bcs.mvir
@@ -14,7 +14,7 @@ module 0x2.A {
   }
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x1.bcs;
 import 0x2.A;
 main(account: signer) {
@@ -27,7 +27,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x1.bcs;
 import 0x2.A;
 main(account: signer) {
diff --git a/third_party/move/move-vm/paranoid-tests/tests/type_safety/natives/signer.mvir b/third_party/move/move-vm/paranoid-tests/tests/type_safety/natives/signer.mvir
index 7d249a6010919..2b0a83234ebc1 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/type_safety/natives/signer.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/type_safety/natives/signer.mvir
@@ -1,4 +1,4 @@
-//# run --signers 0x1  --check-runtime-types
+//# run --signers 0x1 
 import 0x1.signer;
 main(account: signer) {
     let u: &address;
diff --git a/third_party/move/move-vm/paranoid-tests/tests/type_safety/natives/type_info.mvir b/third_party/move/move-vm/paranoid-tests/tests/type_safety/natives/type_info.mvir
index 05be2e5caf666..5a877e3c850f3 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/type_safety/natives/type_info.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/type_safety/natives/type_info.mvir
@@ -3,7 +3,7 @@ module 0x2.A {
   struct A has drop { x: u64 }
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x1.type_name;
 import 0x1.ascii;
 import 0x2.A;
diff --git a/third_party/move/move-vm/paranoid-tests/tests/type_safety/primitives/address.exp b/third_party/move/move-vm/paranoid-tests/tests/type_safety/primitives/address.exp
index aadcf424faede..e6044a8610c52 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/type_safety/primitives/address.exp
+++ b/third_party/move/move-vm/paranoid-tests/tests/type_safety/primitives/address.exp
@@ -3,7 +3,7 @@ processed 7 tasks
 task 2 'run'. lines 33-41:
 Error: Script execution failed with VMError: {
     major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
-    sub_status: None,
+    sub_status: Some(1),
     location: 0x2::A,
     indices: [],
     offsets: [(FunctionDefinitionIndex(2), 3)],
@@ -30,7 +30,7 @@ Error: Script execution failed with VMError: {
 task 6 'run'. lines 78-87:
 Error: Script execution failed with VMError: {
     major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
-    sub_status: None,
+    sub_status: Some(1),
     location: script,
     indices: [],
     offsets: [(FunctionDefinitionIndex(0), 6)],
diff --git a/third_party/move/move-vm/paranoid-tests/tests/type_safety/primitives/address.mvir b/third_party/move/move-vm/paranoid-tests/tests/type_safety/primitives/address.mvir
index 229aaa5fcdcca..203bc51111010 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/type_safety/primitives/address.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/type_safety/primitives/address.mvir
@@ -20,7 +20,7 @@ module 0x2.A {
   }
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.A;
 main(account: signer) {
     let a: A.A;
@@ -30,7 +30,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.A;
 main(account: signer) {
     let a: A.A;
@@ -40,7 +40,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 main(account: signer) {
     let a: vector<address>;
     let b: &mut address;
@@ -52,7 +52,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 main(account: signer) {
     let a: vector<address>;
     let b: &mut address;
@@ -64,7 +64,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 main(account: signer) {
     let a: address;
     let b: &mut address;
@@ -75,7 +75,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 main(account: signer) {
     let a: address;
     let b: &mut address;
diff --git a/third_party/move/move-vm/paranoid-tests/tests/type_safety/primitives/bool.exp b/third_party/move/move-vm/paranoid-tests/tests/type_safety/primitives/bool.exp
index 11fc136fc001c..eed474b1852c1 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/type_safety/primitives/bool.exp
+++ b/third_party/move/move-vm/paranoid-tests/tests/type_safety/primitives/bool.exp
@@ -3,7 +3,7 @@ processed 7 tasks
 task 2 'run'. lines 33-41:
 Error: Script execution failed with VMError: {
     major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
-    sub_status: None,
+    sub_status: Some(1),
     location: 0x2::A,
     indices: [],
     offsets: [(FunctionDefinitionIndex(2), 3)],
@@ -21,7 +21,7 @@ Error: Script execution failed with VMError: {
 task 6 'run'. lines 78-87:
 Error: Script execution failed with VMError: {
     major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
-    sub_status: None,
+    sub_status: Some(1),
     location: script,
     indices: [],
     offsets: [(FunctionDefinitionIndex(0), 6)],
diff --git a/third_party/move/move-vm/paranoid-tests/tests/type_safety/primitives/bool.mvir b/third_party/move/move-vm/paranoid-tests/tests/type_safety/primitives/bool.mvir
index b2d41085e0917..6dba0c0d2b09e 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/type_safety/primitives/bool.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/type_safety/primitives/bool.mvir
@@ -20,7 +20,7 @@ module 0x2.A {
   }
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.A;
 main(account: signer) {
     let a: A.A;
@@ -30,7 +30,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.A;
 main(account: signer) {
     let a: A.A;
@@ -40,7 +40,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 main(account: signer) {
     let a: vector<bool>;
     let b: &mut bool;
@@ -52,7 +52,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 main(account: signer) {
     let a: vector<bool>;
     let b: &mut bool;
@@ -64,7 +64,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 main(account: signer) {
     let a: bool;
     let b: &mut bool;
@@ -75,7 +75,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 main(account: signer) {
     let a: bool;
     let b: &mut bool;
diff --git a/third_party/move/move-vm/paranoid-tests/tests/type_safety/primitives/u128.exp b/third_party/move/move-vm/paranoid-tests/tests/type_safety/primitives/u128.exp
index 11fc136fc001c..eed474b1852c1 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/type_safety/primitives/u128.exp
+++ b/third_party/move/move-vm/paranoid-tests/tests/type_safety/primitives/u128.exp
@@ -3,7 +3,7 @@ processed 7 tasks
 task 2 'run'. lines 33-41:
 Error: Script execution failed with VMError: {
     major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
-    sub_status: None,
+    sub_status: Some(1),
     location: 0x2::A,
     indices: [],
     offsets: [(FunctionDefinitionIndex(2), 3)],
@@ -21,7 +21,7 @@ Error: Script execution failed with VMError: {
 task 6 'run'. lines 78-87:
 Error: Script execution failed with VMError: {
     major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
-    sub_status: None,
+    sub_status: Some(1),
     location: script,
     indices: [],
     offsets: [(FunctionDefinitionIndex(0), 6)],
diff --git a/third_party/move/move-vm/paranoid-tests/tests/type_safety/primitives/u128.mvir b/third_party/move/move-vm/paranoid-tests/tests/type_safety/primitives/u128.mvir
index 0ef992946cd93..248fd113724f6 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/type_safety/primitives/u128.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/type_safety/primitives/u128.mvir
@@ -20,7 +20,7 @@ module 0x2.A {
   }
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.A;
 main(account: signer) {
     let a: A.A;
@@ -30,7 +30,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.A;
 main(account: signer) {
     let a: A.A;
@@ -40,7 +40,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 main(account: signer) {
     let a: vector<u128>;
     let b: &mut u128;
@@ -52,7 +52,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 main(account: signer) {
     let a: vector<u128>;
     let b: &mut u128;
@@ -64,7 +64,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 main(account: signer) {
     let a: u128;
     let b: &mut u128;
@@ -75,7 +75,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 main(account: signer) {
     let a: u128;
     let b: &mut u128;
diff --git a/third_party/move/move-vm/paranoid-tests/tests/type_safety/primitives/u16.exp b/third_party/move/move-vm/paranoid-tests/tests/type_safety/primitives/u16.exp
index 11fc136fc001c..eed474b1852c1 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/type_safety/primitives/u16.exp
+++ b/third_party/move/move-vm/paranoid-tests/tests/type_safety/primitives/u16.exp
@@ -3,7 +3,7 @@ processed 7 tasks
 task 2 'run'. lines 33-41:
 Error: Script execution failed with VMError: {
     major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
-    sub_status: None,
+    sub_status: Some(1),
     location: 0x2::A,
     indices: [],
     offsets: [(FunctionDefinitionIndex(2), 3)],
@@ -21,7 +21,7 @@ Error: Script execution failed with VMError: {
 task 6 'run'. lines 78-87:
 Error: Script execution failed with VMError: {
     major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
-    sub_status: None,
+    sub_status: Some(1),
     location: script,
     indices: [],
     offsets: [(FunctionDefinitionIndex(0), 6)],
diff --git a/third_party/move/move-vm/paranoid-tests/tests/type_safety/primitives/u16.mvir b/third_party/move/move-vm/paranoid-tests/tests/type_safety/primitives/u16.mvir
index d3a8980459abc..5823118dd30dc 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/type_safety/primitives/u16.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/type_safety/primitives/u16.mvir
@@ -20,7 +20,7 @@ module 0x2.A {
   }
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.A;
 main(account: signer) {
     let a: A.A;
@@ -30,7 +30,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.A;
 main(account: signer) {
     let a: A.A;
@@ -40,7 +40,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 main(account: signer) {
     let a: vector<u16>;
     let b: &mut u16;
@@ -52,7 +52,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 main(account: signer) {
     let a: vector<u16>;
     let b: &mut u16;
@@ -64,7 +64,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 main(account: signer) {
     let a: u16;
     let b: &mut u16;
@@ -75,7 +75,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 main(account: signer) {
     let a: u16;
     let b: &mut u16;
diff --git a/third_party/move/move-vm/paranoid-tests/tests/type_safety/primitives/u256.exp b/third_party/move/move-vm/paranoid-tests/tests/type_safety/primitives/u256.exp
index 11fc136fc001c..eed474b1852c1 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/type_safety/primitives/u256.exp
+++ b/third_party/move/move-vm/paranoid-tests/tests/type_safety/primitives/u256.exp
@@ -3,7 +3,7 @@ processed 7 tasks
 task 2 'run'. lines 33-41:
 Error: Script execution failed with VMError: {
     major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
-    sub_status: None,
+    sub_status: Some(1),
     location: 0x2::A,
     indices: [],
     offsets: [(FunctionDefinitionIndex(2), 3)],
@@ -21,7 +21,7 @@ Error: Script execution failed with VMError: {
 task 6 'run'. lines 78-87:
 Error: Script execution failed with VMError: {
     major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
-    sub_status: None,
+    sub_status: Some(1),
     location: script,
     indices: [],
     offsets: [(FunctionDefinitionIndex(0), 6)],
diff --git a/third_party/move/move-vm/paranoid-tests/tests/type_safety/primitives/u256.mvir b/third_party/move/move-vm/paranoid-tests/tests/type_safety/primitives/u256.mvir
index d3a770d68526a..d7875c6afe704 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/type_safety/primitives/u256.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/type_safety/primitives/u256.mvir
@@ -20,7 +20,7 @@ module 0x2.A {
   }
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.A;
 main(account: signer) {
     let a: A.A;
@@ -30,7 +30,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.A;
 main(account: signer) {
     let a: A.A;
@@ -40,7 +40,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 main(account: signer) {
     let a: vector<u256>;
     let b: &mut u256;
@@ -52,7 +52,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 main(account: signer) {
     let a: vector<u256>;
     let b: &mut u256;
@@ -64,7 +64,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 main(account: signer) {
     let a: u256;
     let b: &mut u256;
@@ -75,7 +75,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 main(account: signer) {
     let a: u256;
     let b: &mut u256;
diff --git a/third_party/move/move-vm/paranoid-tests/tests/type_safety/primitives/u32.exp b/third_party/move/move-vm/paranoid-tests/tests/type_safety/primitives/u32.exp
index 11fc136fc001c..eed474b1852c1 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/type_safety/primitives/u32.exp
+++ b/third_party/move/move-vm/paranoid-tests/tests/type_safety/primitives/u32.exp
@@ -3,7 +3,7 @@ processed 7 tasks
 task 2 'run'. lines 33-41:
 Error: Script execution failed with VMError: {
     major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
-    sub_status: None,
+    sub_status: Some(1),
     location: 0x2::A,
     indices: [],
     offsets: [(FunctionDefinitionIndex(2), 3)],
@@ -21,7 +21,7 @@ Error: Script execution failed with VMError: {
 task 6 'run'. lines 78-87:
 Error: Script execution failed with VMError: {
     major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
-    sub_status: None,
+    sub_status: Some(1),
     location: script,
     indices: [],
     offsets: [(FunctionDefinitionIndex(0), 6)],
diff --git a/third_party/move/move-vm/paranoid-tests/tests/type_safety/primitives/u32.mvir b/third_party/move/move-vm/paranoid-tests/tests/type_safety/primitives/u32.mvir
index 92f1359967baf..4b5ad6b9b5487 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/type_safety/primitives/u32.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/type_safety/primitives/u32.mvir
@@ -20,7 +20,7 @@ module 0x2.A {
   }
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.A;
 main(account: signer) {
     let a: A.A;
@@ -30,7 +30,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.A;
 main(account: signer) {
     let a: A.A;
@@ -40,7 +40,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 main(account: signer) {
     let a: vector<u32>;
     let b: &mut u32;
@@ -52,7 +52,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 main(account: signer) {
     let a: vector<u32>;
     let b: &mut u32;
@@ -64,7 +64,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 main(account: signer) {
     let a: u32;
     let b: &mut u32;
@@ -75,7 +75,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 main(account: signer) {
     let a: u32;
     let b: &mut u32;
diff --git a/third_party/move/move-vm/paranoid-tests/tests/type_safety/primitives/u64.exp b/third_party/move/move-vm/paranoid-tests/tests/type_safety/primitives/u64.exp
index 11fc136fc001c..eed474b1852c1 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/type_safety/primitives/u64.exp
+++ b/third_party/move/move-vm/paranoid-tests/tests/type_safety/primitives/u64.exp
@@ -3,7 +3,7 @@ processed 7 tasks
 task 2 'run'. lines 33-41:
 Error: Script execution failed with VMError: {
     major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
-    sub_status: None,
+    sub_status: Some(1),
     location: 0x2::A,
     indices: [],
     offsets: [(FunctionDefinitionIndex(2), 3)],
@@ -21,7 +21,7 @@ Error: Script execution failed with VMError: {
 task 6 'run'. lines 78-87:
 Error: Script execution failed with VMError: {
     major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
-    sub_status: None,
+    sub_status: Some(1),
     location: script,
     indices: [],
     offsets: [(FunctionDefinitionIndex(0), 6)],
diff --git a/third_party/move/move-vm/paranoid-tests/tests/type_safety/primitives/u64.mvir b/third_party/move/move-vm/paranoid-tests/tests/type_safety/primitives/u64.mvir
index 486c8e80222bc..7f671ff014c53 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/type_safety/primitives/u64.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/type_safety/primitives/u64.mvir
@@ -20,7 +20,7 @@ module 0x2.A {
   }
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.A;
 main(account: signer) {
     let a: A.A;
@@ -30,7 +30,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.A;
 main(account: signer) {
     let a: A.A;
@@ -40,7 +40,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 main(account: signer) {
     let a: vector<u64>;
     let b: &mut u64;
@@ -52,7 +52,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 main(account: signer) {
     let a: vector<u64>;
     let b: &mut u64;
@@ -64,7 +64,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 main(account: signer) {
     let a: u64;
     let b: &mut u64;
@@ -75,7 +75,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 main(account: signer) {
     let a: u64;
     let b: &mut u64;
diff --git a/third_party/move/move-vm/paranoid-tests/tests/type_safety/primitives/u8.exp b/third_party/move/move-vm/paranoid-tests/tests/type_safety/primitives/u8.exp
index 11fc136fc001c..eed474b1852c1 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/type_safety/primitives/u8.exp
+++ b/third_party/move/move-vm/paranoid-tests/tests/type_safety/primitives/u8.exp
@@ -3,7 +3,7 @@ processed 7 tasks
 task 2 'run'. lines 33-41:
 Error: Script execution failed with VMError: {
     major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
-    sub_status: None,
+    sub_status: Some(1),
     location: 0x2::A,
     indices: [],
     offsets: [(FunctionDefinitionIndex(2), 3)],
@@ -21,7 +21,7 @@ Error: Script execution failed with VMError: {
 task 6 'run'. lines 78-87:
 Error: Script execution failed with VMError: {
     major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
-    sub_status: None,
+    sub_status: Some(1),
     location: script,
     indices: [],
     offsets: [(FunctionDefinitionIndex(0), 6)],
diff --git a/third_party/move/move-vm/paranoid-tests/tests/type_safety/primitives/u8.mvir b/third_party/move/move-vm/paranoid-tests/tests/type_safety/primitives/u8.mvir
index bbff4c6de45cd..13f67ede69373 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/type_safety/primitives/u8.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/type_safety/primitives/u8.mvir
@@ -20,7 +20,7 @@ module 0x2.A {
   }
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.A;
 main(account: signer) {
     let a: A.A;
@@ -30,7 +30,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.A;
 main(account: signer) {
     let a: A.A;
@@ -40,7 +40,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 main(account: signer) {
     let a: vector<u8>;
     let b: &mut u8;
@@ -52,7 +52,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 main(account: signer) {
     let a: vector<u8>;
     let b: &mut u8;
@@ -64,7 +64,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 main(account: signer) {
     let a: u8;
     let b: &mut u8;
@@ -75,7 +75,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 main(account: signer) {
     let a: u8;
     let b: &mut u8;
diff --git a/third_party/move/move-vm/paranoid-tests/tests/type_safety/references/borrow_field.exp b/third_party/move/move-vm/paranoid-tests/tests/type_safety/references/borrow_field.exp
index fddfe9ff9eacf..f7ea3600cee67 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/type_safety/references/borrow_field.exp
+++ b/third_party/move/move-vm/paranoid-tests/tests/type_safety/references/borrow_field.exp
@@ -3,7 +3,7 @@ processed 5 tasks
 task 2 'run'. lines 34-45:
 Error: Script execution failed with VMError: {
     major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
-    sub_status: None,
+    sub_status: Some(1),
     location: script,
     indices: [],
     offsets: [(FunctionDefinitionIndex(0), 7)],
diff --git a/third_party/move/move-vm/paranoid-tests/tests/type_safety/references/borrow_field.mvir b/third_party/move/move-vm/paranoid-tests/tests/type_safety/references/borrow_field.mvir
index b675f91f09c68..c1f4be721ebdd 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/type_safety/references/borrow_field.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/type_safety/references/borrow_field.mvir
@@ -18,7 +18,7 @@ module 0x2.A {
     }
 }
 
-//# run --signers 0x1  --check-runtime-types
+//# run --signers 0x1 
 import 0x2.A;
 main(account: signer) {
     let g: A.G;
@@ -31,7 +31,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1  --check-runtime-types
+//# run --signers 0x1 
 import 0x2.A;
 main(account: signer) {
     let g: A.G;
@@ -44,7 +44,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1  --check-runtime-types
+//# run --signers 0x1 
 import 0x2.A;
 main(account: signer) {
     let g: A.G;
@@ -57,7 +57,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1  --check-runtime-types
+//# run --signers 0x1 
 import 0x2.A;
 main(account: signer) {
     let g: A.G;
diff --git a/third_party/move/move-vm/paranoid-tests/tests/type_safety/references/borrow_field_generic.exp b/third_party/move/move-vm/paranoid-tests/tests/type_safety/references/borrow_field_generic.exp
index fddfe9ff9eacf..f7ea3600cee67 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/type_safety/references/borrow_field_generic.exp
+++ b/third_party/move/move-vm/paranoid-tests/tests/type_safety/references/borrow_field_generic.exp
@@ -3,7 +3,7 @@ processed 5 tasks
 task 2 'run'. lines 34-45:
 Error: Script execution failed with VMError: {
     major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
-    sub_status: None,
+    sub_status: Some(1),
     location: script,
     indices: [],
     offsets: [(FunctionDefinitionIndex(0), 7)],
diff --git a/third_party/move/move-vm/paranoid-tests/tests/type_safety/references/borrow_field_generic.mvir b/third_party/move/move-vm/paranoid-tests/tests/type_safety/references/borrow_field_generic.mvir
index 2e26f2519c23a..80f0e5360f9fa 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/type_safety/references/borrow_field_generic.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/type_safety/references/borrow_field_generic.mvir
@@ -18,7 +18,7 @@ module 0x2.A {
     }
 }
 
-//# run --signers 0x1  --check-runtime-types
+//# run --signers 0x1 
 import 0x2.A;
 main(account: signer) {
     let g: A.G<u64>;
@@ -31,7 +31,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1  --check-runtime-types
+//# run --signers 0x1 
 import 0x2.A;
 main(account: signer) {
     let g: A.G<u64>;
@@ -44,7 +44,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1  --check-runtime-types
+//# run --signers 0x1 
 import 0x2.A;
 main(account: signer) {
     let g: A.G<u64>;
@@ -57,7 +57,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1  --check-runtime-types
+//# run --signers 0x1 
 import 0x2.A;
 main(account: signer) {
     let g: A.G<u64>;
diff --git a/third_party/move/move-vm/paranoid-tests/tests/type_safety/references/borrow_global.exp b/third_party/move/move-vm/paranoid-tests/tests/type_safety/references/borrow_global.exp
index 65e2508c13aa8..293f5a2bb423d 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/type_safety/references/borrow_global.exp
+++ b/third_party/move/move-vm/paranoid-tests/tests/type_safety/references/borrow_global.exp
@@ -12,7 +12,7 @@ Error: Script execution failed with VMError: {
 task 3 'run'. lines 73-86:
 Error: Script execution failed with VMError: {
     major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
-    sub_status: None,
+    sub_status: Some(1),
     location: script,
     indices: [],
     offsets: [(FunctionDefinitionIndex(0), 10)],
@@ -21,7 +21,7 @@ Error: Script execution failed with VMError: {
 task 6 'run'. lines 116-127:
 Error: Script execution failed with VMError: {
     major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
-    sub_status: None,
+    sub_status: Some(1),
     location: script,
     indices: [],
     offsets: [(FunctionDefinitionIndex(0), 8)],
diff --git a/third_party/move/move-vm/paranoid-tests/tests/type_safety/references/borrow_global.mvir b/third_party/move/move-vm/paranoid-tests/tests/type_safety/references/borrow_global.mvir
index 19aa6ac5a5d10..0a1e5e3cabcf1 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/type_safety/references/borrow_global.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/type_safety/references/borrow_global.mvir
@@ -45,7 +45,7 @@ module 0x2.A {
     }
 }
 
-//# run --signers 0x1  --check-runtime-types
+//# run --signers 0x1 
 import 0x2.A;
 import 0x1.signer;
 main(account: signer) {
@@ -56,7 +56,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1  --check-runtime-types
+//# run --signers 0x1 
 import 0x2.A;
 import 0x1.signer;
 main(account: signer) {
@@ -70,7 +70,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1  --check-runtime-types
+//# run --signers 0x1 
 import 0x2.A;
 import 0x1.signer;
 main(account: signer) {
@@ -85,7 +85,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1  --check-runtime-types
+//# run --signers 0x1 
 import 0x2.A;
 import 0x1.signer;
 main(account: signer) {
@@ -99,7 +99,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1  --check-runtime-types
+//# run --signers 0x1 
 import 0x2.A;
 import 0x1.signer;
 main(account: signer) {
@@ -113,7 +113,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1  --check-runtime-types
+//# run --signers 0x1 
 import 0x2.A;
 import 0x1.signer;
 main(account: signer) {
@@ -126,7 +126,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1  --check-runtime-types
+//# run --signers 0x1 
 import 0x2.A;
 import 0x1.signer;
 main(account: signer) {
diff --git a/third_party/move/move-vm/paranoid-tests/tests/type_safety/references/borrow_global_generic.exp b/third_party/move/move-vm/paranoid-tests/tests/type_safety/references/borrow_global_generic.exp
index 65e2508c13aa8..293f5a2bb423d 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/type_safety/references/borrow_global_generic.exp
+++ b/third_party/move/move-vm/paranoid-tests/tests/type_safety/references/borrow_global_generic.exp
@@ -12,7 +12,7 @@ Error: Script execution failed with VMError: {
 task 3 'run'. lines 73-86:
 Error: Script execution failed with VMError: {
     major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
-    sub_status: None,
+    sub_status: Some(1),
     location: script,
     indices: [],
     offsets: [(FunctionDefinitionIndex(0), 10)],
@@ -21,7 +21,7 @@ Error: Script execution failed with VMError: {
 task 6 'run'. lines 116-127:
 Error: Script execution failed with VMError: {
     major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
-    sub_status: None,
+    sub_status: Some(1),
     location: script,
     indices: [],
     offsets: [(FunctionDefinitionIndex(0), 8)],
diff --git a/third_party/move/move-vm/paranoid-tests/tests/type_safety/references/borrow_global_generic.mvir b/third_party/move/move-vm/paranoid-tests/tests/type_safety/references/borrow_global_generic.mvir
index aaffa9cb63006..c9a6b7669052f 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/type_safety/references/borrow_global_generic.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/type_safety/references/borrow_global_generic.mvir
@@ -45,7 +45,7 @@ module 0x2.A {
     }
 }
 
-//# run --signers 0x1  --check-runtime-types
+//# run --signers 0x1 
 import 0x2.A;
 import 0x1.signer;
 main(account: signer) {
@@ -56,7 +56,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1  --check-runtime-types
+//# run --signers 0x1 
 import 0x2.A;
 import 0x1.signer;
 main(account: signer) {
@@ -70,7 +70,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1  --check-runtime-types
+//# run --signers 0x1 
 import 0x2.A;
 import 0x1.signer;
 main(account: signer) {
@@ -85,7 +85,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1  --check-runtime-types
+//# run --signers 0x1 
 import 0x2.A;
 import 0x1.signer;
 main(account: signer) {
@@ -99,7 +99,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1  --check-runtime-types
+//# run --signers 0x1 
 import 0x2.A;
 import 0x1.signer;
 main(account: signer) {
@@ -113,7 +113,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1  --check-runtime-types
+//# run --signers 0x1 
 import 0x2.A;
 import 0x1.signer;
 main(account: signer) {
@@ -126,7 +126,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1  --check-runtime-types
+//# run --signers 0x1 
 import 0x2.A;
 import 0x1.signer;
 main(account: signer) {
diff --git a/third_party/move/move-vm/paranoid-tests/tests/type_safety/references/borrow_loc.mvir b/third_party/move/move-vm/paranoid-tests/tests/type_safety/references/borrow_loc.mvir
index 04ef18ab3e67c..731aec6958514 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/type_safety/references/borrow_loc.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/type_safety/references/borrow_loc.mvir
@@ -1,4 +1,4 @@
-//# run --signers 0x1  --check-runtime-types
+//# run --signers 0x1 
 main(account: signer) {
     let u: u64;
     let u_ref: &mut u64;
@@ -9,7 +9,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1  --check-runtime-types
+//# run --signers 0x1 
 main(account: signer) {
     let u: u64;
     let u_ref: &mut u64;
diff --git a/third_party/move/move-vm/paranoid-tests/tests/type_safety/references/freeze_ref.exp b/third_party/move/move-vm/paranoid-tests/tests/type_safety/references/freeze_ref.exp
index e34a174fa3eda..708eaffa6fadf 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/type_safety/references/freeze_ref.exp
+++ b/third_party/move/move-vm/paranoid-tests/tests/type_safety/references/freeze_ref.exp
@@ -3,7 +3,7 @@ processed 3 tasks
 task 1 'run'. lines 13-22:
 Error: Script execution failed with VMError: {
     major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
-    sub_status: None,
+    sub_status: Some(1),
     location: script,
     indices: [],
     offsets: [(FunctionDefinitionIndex(0), 3)],
@@ -12,7 +12,7 @@ Error: Script execution failed with VMError: {
 task 2 'run'. lines 24-31:
 Error: Script execution failed with VMError: {
     major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
-    sub_status: None,
+    sub_status: Some(1),
     location: script,
     indices: [],
     offsets: [(FunctionDefinitionIndex(0), 3)],
diff --git a/third_party/move/move-vm/paranoid-tests/tests/type_safety/references/freeze_ref.mvir b/third_party/move/move-vm/paranoid-tests/tests/type_safety/references/freeze_ref.mvir
index d227f3fb1bd1e..202becf3be34f 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/type_safety/references/freeze_ref.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/type_safety/references/freeze_ref.mvir
@@ -1,4 +1,4 @@
-//# run --signers 0x1  --check-runtime-types
+//# run --signers 0x1 
 main(account: signer) {
     let u: u64;
     let u_ref: &u64;
@@ -10,7 +10,7 @@ label b0:
 }
 
 
-//# run --signers 0x1  --check-runtime-types
+//# run --signers 0x1 
 main(account: signer) {
     let u: u64;
     let u_ref: &u64;
@@ -21,7 +21,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1  --check-runtime-types
+//# run --signers 0x1 
 main(account: signer) {
     let u: u64;
 label b0:
diff --git a/third_party/move/move-vm/paranoid-tests/tests/type_safety/references/read_ref.mvir b/third_party/move/move-vm/paranoid-tests/tests/type_safety/references/read_ref.mvir
index 6d1e182674c40..0958d68c0969b 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/type_safety/references/read_ref.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/type_safety/references/read_ref.mvir
@@ -1,5 +1,5 @@
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 main(account: signer) {
     let c: u64;
     let a: u64;
@@ -10,7 +10,7 @@ label b0:
 }
 
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 main(account: signer) {
     let c: u64;
     let a: u64;
diff --git a/third_party/move/move-vm/paranoid-tests/tests/type_safety/references/write_ref_with_struct.exp b/third_party/move/move-vm/paranoid-tests/tests/type_safety/references/write_ref_with_struct.exp
index b8e60303e96c0..aa6876c95e780 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/type_safety/references/write_ref_with_struct.exp
+++ b/third_party/move/move-vm/paranoid-tests/tests/type_safety/references/write_ref_with_struct.exp
@@ -3,7 +3,7 @@ processed 3 tasks
 task 2 'run'. lines 47-53:
 Error: Script execution failed with VMError: {
     major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
-    sub_status: None,
+    sub_status: Some(1),
     location: 0x2::A,
     indices: [],
     offsets: [(FunctionDefinitionIndex(3), 10)],
diff --git a/third_party/move/move-vm/paranoid-tests/tests/type_safety/references/write_ref_with_struct.mvir b/third_party/move/move-vm/paranoid-tests/tests/type_safety/references/write_ref_with_struct.mvir
index 508bb57535ac9..cbe1d955f6603 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/type_safety/references/write_ref_with_struct.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/type_safety/references/write_ref_with_struct.mvir
@@ -36,7 +36,7 @@ module 0x2.A {
   }
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.A;
 main(account: signer) {
 label b0:
@@ -44,7 +44,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.A;
 main(account: signer) {
 label b0:
diff --git a/third_party/move/move-vm/paranoid-tests/tests/type_safety/references/write_ref_with_vector.exp b/third_party/move/move-vm/paranoid-tests/tests/type_safety/references/write_ref_with_vector.exp
index e22a99a18ddf6..27611df60689e 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/type_safety/references/write_ref_with_vector.exp
+++ b/third_party/move/move-vm/paranoid-tests/tests/type_safety/references/write_ref_with_vector.exp
@@ -3,7 +3,7 @@ processed 3 tasks
 task 2 'run'. lines 35-50:
 Error: Script execution failed with VMError: {
     major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
-    sub_status: None,
+    sub_status: Some(1),
     location: script,
     indices: [],
     offsets: [(FunctionDefinitionIndex(0), 13)],
diff --git a/third_party/move/move-vm/paranoid-tests/tests/type_safety/references/write_ref_with_vector.mvir b/third_party/move/move-vm/paranoid-tests/tests/type_safety/references/write_ref_with_vector.mvir
index 67ed0ce9b0816..2dbb2649b5a13 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/type_safety/references/write_ref_with_vector.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/type_safety/references/write_ref_with_vector.mvir
@@ -15,7 +15,7 @@ module 0x2.A {
   }
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.A;
 main(account: signer) {
     let c: A.C;
@@ -32,7 +32,7 @@ label b0:
 }
 
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.A;
 main(account: signer) {
     let c: A.C;
diff --git a/third_party/move/move-vm/paranoid-tests/tests/type_safety/simple_instruction/branch.mvir b/third_party/move/move-vm/paranoid-tests/tests/type_safety/simple_instruction/branch.mvir
index 871b116a68a9a..fbf302ab504c5 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/type_safety/simple_instruction/branch.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/type_safety/simple_instruction/branch.mvir
@@ -1,4 +1,4 @@
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 main(account: signer) {
     let c: bool;
 label b0:
@@ -10,7 +10,7 @@ label b2:
     return;
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 main(account: signer) {
     let c: bool;
 label b0:
diff --git a/third_party/move/move-vm/paranoid-tests/tests/type_safety/struct/exists.mvir b/third_party/move/move-vm/paranoid-tests/tests/type_safety/struct/exists.mvir
index cf0a2d40645f3..622572e638d8e 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/type_safety/struct/exists.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/type_safety/struct/exists.mvir
@@ -19,7 +19,7 @@ module 0x2.A {
     }
 }
 
-//# run --signers 0x1  --check-runtime-types
+//# run --signers 0x1 
 import 0x2.A;
 main(account: signer) {
 label b0:
@@ -27,7 +27,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1  --check-runtime-types
+//# run --signers 0x1 
 import 0x2.A;
 import 0x1.signer;
 main(account: signer) {
@@ -38,7 +38,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1  --check-runtime-types
+//# run --signers 0x1 
 import 0x2.A;
 main(account: signer) {
 label b0:
diff --git a/third_party/move/move-vm/paranoid-tests/tests/type_safety/struct/exists_generic.mvir b/third_party/move/move-vm/paranoid-tests/tests/type_safety/struct/exists_generic.mvir
index b7f60e4659074..79d7d46f791b6 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/type_safety/struct/exists_generic.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/type_safety/struct/exists_generic.mvir
@@ -19,7 +19,7 @@ module 0x2.A {
     }
 }
 
-//# run --signers 0x1  --check-runtime-types
+//# run --signers 0x1 
 import 0x2.A;
 main(account: signer) {
 label b0:
@@ -27,7 +27,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1  --check-runtime-types
+//# run --signers 0x1 
 import 0x2.A;
 import 0x1.signer;
 main(account: signer) {
@@ -38,7 +38,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1  --check-runtime-types
+//# run --signers 0x1 
 import 0x2.A;
 main(account: signer) {
 label b0:
diff --git a/third_party/move/move-vm/paranoid-tests/tests/type_safety/struct/move_from.mvir b/third_party/move/move-vm/paranoid-tests/tests/type_safety/struct/move_from.mvir
index c74f302beb4d4..4568a8cfd8104 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/type_safety/struct/move_from.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/type_safety/struct/move_from.mvir
@@ -19,7 +19,7 @@ module 0x2.A {
     }
 }
 
-//# run --signers 0x1  --check-runtime-types
+//# run --signers 0x1 
 import 0x2.A;
 main(account: signer) {
 label b0:
@@ -27,7 +27,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1  --check-runtime-types
+//# run --signers 0x1 
 import 0x2.A;
 import 0x1.signer;
 main(account: signer) {
@@ -38,7 +38,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1  --check-runtime-types
+//# run --signers 0x1 
 import 0x2.A;
 main(account: signer) {
 label b0:
diff --git a/third_party/move/move-vm/paranoid-tests/tests/type_safety/struct/move_from_generic.mvir b/third_party/move/move-vm/paranoid-tests/tests/type_safety/struct/move_from_generic.mvir
index bbd2a03a57783..91bd1f161724d 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/type_safety/struct/move_from_generic.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/type_safety/struct/move_from_generic.mvir
@@ -19,7 +19,7 @@ module 0x2.A {
     }
 }
 
-//# run --signers 0x1  --check-runtime-types
+//# run --signers 0x1 
 import 0x2.A;
 main(account: signer) {
 label b0:
@@ -27,7 +27,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1  --check-runtime-types
+//# run --signers 0x1 
 import 0x2.A;
 import 0x1.signer;
 main(account: signer) {
@@ -38,7 +38,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1  --check-runtime-types
+//# run --signers 0x1 
 import 0x2.A;
 main(account: signer) {
 label b0:
diff --git a/third_party/move/move-vm/paranoid-tests/tests/type_safety/struct/pack_and_move.mvir b/third_party/move/move-vm/paranoid-tests/tests/type_safety/struct/pack_and_move.mvir
index 4bfa455087236..ec78a079d9168 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/type_safety/struct/pack_and_move.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/type_safety/struct/pack_and_move.mvir
@@ -31,7 +31,7 @@ module 0x2.B {
     }
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.B;
 main(account: signer) {
 label b0:
diff --git a/third_party/move/move-vm/paranoid-tests/tests/type_safety/struct/pack_and_unpack.mvir b/third_party/move/move-vm/paranoid-tests/tests/type_safety/struct/pack_and_unpack.mvir
index e4602ff1f8413..f6fa8d4ec1e8a 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/type_safety/struct/pack_and_unpack.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/type_safety/struct/pack_and_unpack.mvir
@@ -42,7 +42,7 @@ module 0x2.B {
     }
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.B;
 main(account: signer) {
 label b0:
diff --git a/third_party/move/move-vm/paranoid-tests/tests/type_safety/struct/pack_generic.mvir b/third_party/move/move-vm/paranoid-tests/tests/type_safety/struct/pack_generic.mvir
index 1f373ced37f93..0be334ad7816d 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/type_safety/struct/pack_generic.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/type_safety/struct/pack_generic.mvir
@@ -16,7 +16,7 @@ module 0x2.A {
 }
 
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.A;
 main(account: signer) {
     let c: A.C<A.D>;
diff --git a/third_party/move/move-vm/paranoid-tests/tests/type_safety/struct/pack_generic_mismatch.mvir b/third_party/move/move-vm/paranoid-tests/tests/type_safety/struct/pack_generic_mismatch.mvir
index 9e3777c69b303..e578de6ff55f5 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/type_safety/struct/pack_generic_mismatch.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/type_safety/struct/pack_generic_mismatch.mvir
@@ -15,7 +15,7 @@ module 0x2.A {
   }
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.A;
 main(account: signer) {
     let c: A.C<u64>;
@@ -24,7 +24,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.A;
 main(account: signer) {
     let c: A.C<A.D>;
diff --git a/third_party/move/move-vm/paranoid-tests/tests/type_safety/vectors/vec_imm_borrow.mvir b/third_party/move/move-vm/paranoid-tests/tests/type_safety/vectors/vec_imm_borrow.mvir
index 0c698c712dc2e..72f064162e7c6 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/type_safety/vectors/vec_imm_borrow.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/type_safety/vectors/vec_imm_borrow.mvir
@@ -1,4 +1,4 @@
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 main(account: signer) {
     let v: vector<u64>;
 
@@ -10,7 +10,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 main(account: signer) {
     let v: vector<u64>;
 
diff --git a/third_party/move/move-vm/paranoid-tests/tests/type_safety/vectors/vec_len.mvir b/third_party/move/move-vm/paranoid-tests/tests/type_safety/vectors/vec_len.mvir
index 8037e4a55d225..979785a5fcc0e 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/type_safety/vectors/vec_len.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/type_safety/vectors/vec_len.mvir
@@ -14,7 +14,7 @@ module 0x2.A {
   }
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.A;
 main(account: signer) {
     let v: vector<A.C>;
@@ -29,7 +29,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.A;
 main(account: signer) {
     let v: vector<A.C>;
diff --git a/third_party/move/move-vm/paranoid-tests/tests/type_safety/vectors/vec_mut_borrow.mvir b/third_party/move/move-vm/paranoid-tests/tests/type_safety/vectors/vec_mut_borrow.mvir
index bb767142d1028..e2f62a7f3069e 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/type_safety/vectors/vec_mut_borrow.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/type_safety/vectors/vec_mut_borrow.mvir
@@ -1,4 +1,4 @@
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 main(account: signer) {
     let v: vector<u64>;
 
@@ -9,7 +9,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 main(account: signer) {
     let v: vector<u64>;
 
@@ -20,7 +20,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 main(account: signer) {
     let v: vector<u64>;
 
diff --git a/third_party/move/move-vm/paranoid-tests/tests/type_safety/vectors/vec_pack_mismatch.mvir b/third_party/move/move-vm/paranoid-tests/tests/type_safety/vectors/vec_pack_mismatch.mvir
index e60e127e29486..10cb9a0e88583 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/type_safety/vectors/vec_pack_mismatch.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/type_safety/vectors/vec_pack_mismatch.mvir
@@ -24,7 +24,7 @@ module 0x2.Math {
   }
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.Math;
 import 0x2.A;
 main(account: signer) {
diff --git a/third_party/move/move-vm/paranoid-tests/tests/type_safety/vectors/vec_pop_back.mvir b/third_party/move/move-vm/paranoid-tests/tests/type_safety/vectors/vec_pop_back.mvir
index fa120970ed2ab..f65247ee547a3 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/type_safety/vectors/vec_pop_back.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/type_safety/vectors/vec_pop_back.mvir
@@ -1,4 +1,4 @@
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 main(account: signer) {
     let v: vector<u64>;
     let u: u64;
@@ -10,7 +10,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 main(account: signer) {
     let v: vector<u64>;
     let u: u64;
@@ -22,7 +22,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 main(account: signer) {
     let v: vector<u64>;
     let u: u32;
diff --git a/third_party/move/move-vm/paranoid-tests/tests/type_safety/vectors/vec_push_back.mvir b/third_party/move/move-vm/paranoid-tests/tests/type_safety/vectors/vec_push_back.mvir
index 3ea0065ad15b1..872258728d7ca 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/type_safety/vectors/vec_push_back.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/type_safety/vectors/vec_push_back.mvir
@@ -14,7 +14,7 @@ module 0x2.A {
   }
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.A;
 main(account: signer) {
     let v: vector<A.C>;
@@ -29,7 +29,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.A;
 main(account: signer) {
     let v: vector<A.C>;
diff --git a/third_party/move/move-vm/paranoid-tests/tests/type_safety/vectors/vec_swap.mvir b/third_party/move/move-vm/paranoid-tests/tests/type_safety/vectors/vec_swap.mvir
index 89cff48477424..d8dcfbae815b1 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/type_safety/vectors/vec_swap.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/type_safety/vectors/vec_swap.mvir
@@ -1,4 +1,4 @@
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 main(account: signer) {
     let v: vector<u64>;
     let u: u64;
@@ -10,7 +10,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 main(account: signer) {
     let v: vector<u64>;
     let u: u64;
@@ -22,7 +22,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 main(account: signer) {
     let v: vector<u64>;
     let u: u64;
diff --git a/third_party/move/move-vm/paranoid-tests/tests/type_safety/vectors/vec_unpack.mvir b/third_party/move/move-vm/paranoid-tests/tests/type_safety/vectors/vec_unpack.mvir
index 6d1decdd76e24..15678090530a7 100644
--- a/third_party/move/move-vm/paranoid-tests/tests/type_safety/vectors/vec_unpack.mvir
+++ b/third_party/move/move-vm/paranoid-tests/tests/type_safety/vectors/vec_unpack.mvir
@@ -8,7 +8,7 @@ module 0x2.A {
   }
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 main(account: signer) {
     let v: vector<u64>;
 
@@ -19,7 +19,7 @@ label b0:
     return;
 }
 
-//# run --signers 0x1 --check-runtime-types
+//# run --signers 0x1
 import 0x2.A;
 main(account: signer) {
     let v: vector<u64>;
diff --git a/third_party/move/move-vm/runtime/src/access_control.rs b/third_party/move/move-vm/runtime/src/access_control.rs
index b10454bb4d982..4f0384f632bf8 100644
--- a/third_party/move/move-vm/runtime/src/access_control.rs
+++ b/third_party/move/move-vm/runtime/src/access_control.rs
@@ -3,7 +3,7 @@
 
 //! Represents the state machine managing resource access control in VM execution.
 
-use crate::{interpreter::ACCESS_STACK_SIZE_LIMIT, loader::Function};
+use crate::{interpreter::ACCESS_STACK_SIZE_LIMIT, LoadedFunction};
 use move_binary_format::errors::{PartialVMError, PartialVMResult};
 use move_core_types::vm_status::StatusCode;
 use move_vm_types::loaded_data::runtime_access_specifier::{
@@ -36,14 +36,14 @@ impl AccessControlState {
     pub(crate) fn enter_function(
         &mut self,
         env: &impl AccessSpecifierEnv,
-        fun: &Function,
+        fun: &LoadedFunction,
     ) -> PartialVMResult<()> {
-        if matches!(fun.access_specifier, AccessSpecifier::Any) {
+        if matches!(fun.access_specifier(), AccessSpecifier::Any) {
             // Shortcut case that no access is specified
             return Ok(());
         }
         // Specialize the functions access specifier
-        let mut fun_specifier = fun.access_specifier.clone();
+        let mut fun_specifier = fun.access_specifier().clone();
         fun_specifier.specialize(env)?;
         // Join with top of stack
         let current = self.check_stack_and_peek()?;
@@ -51,8 +51,12 @@ impl AccessControlState {
         if let Some(false) = new_specifier.subsumes(&fun_specifier) {
             // We don't allow to call this function, even if in some code paths access would be ok.
             // This ensures that static analysis results are compatible.
-            return Err(PartialVMError::new(StatusCode::ACCESS_DENIED)
-                .with_message(format!("not allowed to call `{}`", fun.pretty_string())));
+            return Err(
+                PartialVMError::new(StatusCode::ACCESS_DENIED).with_message(format!(
+                    "not allowed to call `{}`",
+                    fun.name_as_pretty_string()
+                )),
+            );
         }
         if self.specifier_stack.len() >= ACCESS_STACK_SIZE_LIMIT {
             Err(
@@ -68,8 +72,8 @@ impl AccessControlState {
     }
 
     /// Exit function, restoring access state before entering.
-    pub(crate) fn exit_function(&mut self, fun: &Function) -> PartialVMResult<()> {
-        if !matches!(fun.access_specifier, AccessSpecifier::Any) {
+    pub(crate) fn exit_function(&mut self, fun: &LoadedFunction) -> PartialVMResult<()> {
+        if !matches!(fun.access_specifier(), AccessSpecifier::Any) {
             self.check_stack_and_peek()?;
             self.specifier_stack.pop();
         }
diff --git a/third_party/move/move-vm/runtime/src/config.rs b/third_party/move/move-vm/runtime/src/config.rs
index b088b0f3f7fdb..073edd22e1743 100644
--- a/third_party/move/move-vm/runtime/src/config.rs
+++ b/third_party/move/move-vm/runtime/src/config.rs
@@ -1,11 +1,9 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
-use move_binary_format::{
-    deserializer::DeserializerConfig,
-    file_format_common::{IDENTIFIER_SIZE_MAX, VERSION_MAX},
-};
+use move_binary_format::deserializer::DeserializerConfig;
 use move_bytecode_verifier::VerifierConfig;
+use move_vm_types::loaded_data::runtime_types::TypeBuilder;
 use serde::Serialize;
 
 pub const DEFAULT_MAX_VALUE_NEST_DEPTH: u64 = 128;
@@ -13,44 +11,38 @@ pub const DEFAULT_MAX_VALUE_NEST_DEPTH: u64 = 128;
 /// Dynamic config options for the Move VM.
 #[derive(Clone, Serialize)]
 pub struct VMConfig {
-    pub verifier: VerifierConfig,
+    pub verifier_config: VerifierConfig,
     pub deserializer_config: DeserializerConfig,
-    // When this flag is set to true, MoveVM will perform type check at every instruction
-    // execution to ensure that type safety cannot be violated at runtime.
+    /// When this flag is set to true, MoveVM will perform type checks at every instruction
+    /// execution to ensure that type safety cannot be violated at runtime.
     pub paranoid_type_checks: bool,
-    // When this flag is set to true, MoveVM will check invariant violation in swap_loc
-    pub enable_invariant_violation_check_in_swap_loc: bool,
-    pub type_size_limit: bool,
-    /// Maximum value nest depth for structs
+    pub check_invariant_in_swap_loc: bool,
+    /// Maximum value nest depth for structs.
     pub max_value_nest_depth: Option<u64>,
     pub type_max_cost: u64,
     pub type_base_cost: u64,
     pub type_byte_cost: u64,
-    pub aggregator_v2_type_tagging: bool,
+    pub delayed_field_optimization_enabled: bool,
+    pub ty_builder: TypeBuilder,
+    pub disallow_dispatch_for_native: bool,
+    pub use_compatibility_checker_v2: bool,
 }
 
 impl Default for VMConfig {
     fn default() -> Self {
         Self {
-            verifier: VerifierConfig::default(),
-            deserializer_config: DeserializerConfig::new(VERSION_MAX, IDENTIFIER_SIZE_MAX),
+            verifier_config: VerifierConfig::default(),
+            deserializer_config: DeserializerConfig::default(),
             paranoid_type_checks: false,
-            enable_invariant_violation_check_in_swap_loc: true,
-            type_size_limit: false,
+            check_invariant_in_swap_loc: true,
             max_value_nest_depth: Some(DEFAULT_MAX_VALUE_NEST_DEPTH),
             type_max_cost: 0,
             type_base_cost: 0,
             type_byte_cost: 0,
-            aggregator_v2_type_tagging: false,
-        }
-    }
-}
-
-impl VMConfig {
-    pub fn production() -> Self {
-        Self {
-            verifier: VerifierConfig::production(),
-            ..Self::default()
+            delayed_field_optimization_enabled: false,
+            ty_builder: TypeBuilder::with_limits(128, 20),
+            disallow_dispatch_for_native: true,
+            use_compatibility_checker_v2: true,
         }
     }
 }
diff --git a/third_party/move/move-vm/runtime/src/data_cache.rs b/third_party/move/move-vm/runtime/src/data_cache.rs
index 7fe1aa0f22c6f..c562de0594e80 100644
--- a/third_party/move/move-vm/runtime/src/data_cache.rs
+++ b/third_party/move/move-vm/runtime/src/data_cache.rs
@@ -19,12 +19,12 @@ use move_core_types::{
     identifier::Identifier,
     language_storage::{ModuleId, TypeTag},
     metadata::Metadata,
-    resolver::MoveResolver,
     value::MoveTypeLayout,
     vm_status::StatusCode,
 };
 use move_vm_types::{
     loaded_data::runtime_types::Type,
+    resolver::MoveResolver,
     value_serde::deserialize_and_allow_delayed_values,
     values::{GlobalValue, Value},
 };
@@ -51,7 +51,7 @@ impl AccountDataCache {
 }
 
 fn load_module_impl(
-    remote: &dyn MoveResolver<PartialVMError>,
+    remote: &dyn MoveResolver,
     account_map: &BTreeMap<AccountAddress, AccountDataCache>,
     module_id: &ModuleId,
 ) -> PartialVMResult<Bytes> {
@@ -80,7 +80,7 @@ fn load_module_impl(
 /// for a data store related to a transaction. Clients should create an instance of this type
 /// and pass it to the Move VM.
 pub(crate) struct TransactionDataCache<'r> {
-    remote: &'r dyn MoveResolver<PartialVMError>,
+    remote: &'r dyn MoveResolver,
     account_map: BTreeMap<AccountAddress, AccountDataCache>,
 
     deserializer_config: DeserializerConfig,
@@ -95,7 +95,7 @@ impl<'r> TransactionDataCache<'r> {
     /// not updated in the transaction.
     pub(crate) fn new(
         deserializer_config: DeserializerConfig,
-        remote: &'r impl MoveResolver<PartialVMError>,
+        remote: &'r impl MoveResolver,
     ) -> Self {
         TransactionDataCache {
             remote,
diff --git a/third_party/move/move-vm/runtime/src/debug.rs b/third_party/move/move-vm/runtime/src/debug.rs
index 5eacb3743af53..7c020b804248c 100644
--- a/third_party/move/move-vm/runtime/src/debug.rs
+++ b/third_party/move/move-vm/runtime/src/debug.rs
@@ -2,10 +2,7 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::{
-    interpreter::Interpreter,
-    loader::{Function, Loader},
-};
+use crate::{interpreter::Interpreter, loader::Loader, LoadedFunction};
 use move_binary_format::file_format::Bytecode;
 use move_vm_types::values::{self, Locals};
 use std::{
@@ -100,7 +97,7 @@ impl DebugContext {
 
     pub(crate) fn debug_loop(
         &mut self,
-        function_desc: &Function,
+        function: &LoadedFunction,
         locals: &Locals,
         pc: u16,
         instr: &Bytecode,
@@ -108,7 +105,7 @@ impl DebugContext {
         interp: &Interpreter,
     ) {
         let instr_string = format!("{:?}", instr);
-        let function_string = function_desc.pretty_string();
+        let function_string = function.name_as_pretty_string();
         let breakpoint_hit = self.breakpoints.contains(&function_string)
             || self
                 .breakpoints
@@ -165,7 +162,7 @@ impl DebugContext {
                                 interp.debug_print_stack_trace(&mut s, resolver).unwrap();
                                 println!("{}", s);
                                 println!("Current frame: {}\n", function_string);
-                                let code = function_desc.code();
+                                let code = function.code();
                                 println!("        Code:");
                                 for (i, instr) in code.iter().enumerate() {
                                     if i as u16 == pc {
@@ -175,7 +172,7 @@ impl DebugContext {
                                     }
                                 }
                                 println!("        Locals:");
-                                if function_desc.local_count() > 0 {
+                                if !function.local_tys().is_empty() {
                                     let mut s = String::new();
                                     values::debug::print_locals(&mut s, locals).unwrap();
                                     println!("{}", s);
diff --git a/third_party/move/move-vm/runtime/src/interpreter.rs b/third_party/move/move-vm/runtime/src/interpreter.rs
index ec4780142997f..2baff79cc43df 100644
--- a/third_party/move/move-vm/runtime/src/interpreter.rs
+++ b/third_party/move/move-vm/runtime/src/interpreter.rs
@@ -5,11 +5,11 @@
 use crate::{
     access_control::AccessControlState,
     data_cache::TransactionDataCache,
-    loader::{Function, Loader, ModuleStorageAdapter, Resolver},
+    loader::{Loader, ModuleStorageAdapter, Resolver},
     module_traversal::TraversalContext,
     native_extensions::NativeContextExtensions,
     native_functions::NativeContext,
-    trace,
+    trace, LoadedFunction,
 };
 use fail::fail_point;
 use move_binary_format::{
@@ -17,6 +17,7 @@ use move_binary_format::{
     file_format::{
         Ability, AbilitySet, AccessKind, Bytecode, FieldInstantiationIndex, FunctionHandleIndex,
         FunctionInstantiationIndex, LocalIndex, SignatureIndex, StructDefInstantiationIndex,
+        StructVariantInstantiationIndex, VariantFieldInstantiationIndex,
     },
 };
 use move_core_types::{
@@ -43,7 +44,6 @@ use std::{
     cmp::min,
     collections::{BTreeMap, HashSet, VecDeque},
     fmt::Write,
-    sync::Arc,
 };
 
 macro_rules! set_err_info {
@@ -85,8 +85,7 @@ impl Interpreter {
     /// Entrypoint into the interpreter. All external calls need to be routed through this
     /// function.
     pub(crate) fn entrypoint(
-        function: Arc<Function>,
-        ty_args: Vec<Type>,
+        function: LoadedFunction,
         args: Vec<Value>,
         data_store: &mut TransactionDataCache,
         module_store: &ModuleStorageAdapter,
@@ -110,7 +109,6 @@ impl Interpreter {
             traversal_context,
             extensions,
             function,
-            ty_args,
             args,
         )
     }
@@ -129,20 +127,13 @@ impl Interpreter {
         gas_meter: &mut impl GasMeter,
         traversal_context: &mut TraversalContext,
         extensions: &mut NativeContextExtensions,
-        function: Arc<Function>,
-        ty_args: Vec<Type>,
+        function: LoadedFunction,
         args: Vec<Value>,
     ) -> VMResult<Vec<Value>> {
-        let mut locals = Locals::new(function.local_count());
+        let mut locals = Locals::new(function.local_tys().len());
         for (i, value) in args.into_iter().enumerate() {
             locals
-                .store_loc(
-                    i,
-                    value,
-                    loader
-                        .vm_config()
-                        .enable_invariant_violation_check_in_swap_loc,
-                )
+                .store_loc(i, value, loader.vm_config().check_invariant_in_swap_loc)
                 .map_err(|e| self.set_location(e))?;
         }
 
@@ -151,12 +142,12 @@ impl Interpreter {
         }
 
         let mut current_frame = self
-            .make_new_frame(gas_meter, loader, module_store, function, ty_args, locals)
+            .make_new_frame(gas_meter, loader, function, locals)
             .map_err(|err| self.set_location(err))?;
 
         // Access control for the new frame.
         self.access_control
-            .enter_function(&current_frame, current_frame.function.as_ref())
+            .enter_function(&current_frame, &current_frame.function)
             .map_err(|e| self.set_location(e))?;
         loop {
             let resolver = current_frame.resolver(loader, module_store);
@@ -178,7 +169,7 @@ impl Interpreter {
                         .map_err(|e| self.set_location(e))?;
 
                     self.access_control
-                        .exit_function(current_frame.function.as_ref())
+                        .exit_function(&current_frame.function)
                         .map_err(|e| self.set_location(e))?;
 
                     if let Some(frame) = self.call_stack.pop() {
@@ -194,40 +185,41 @@ impl Interpreter {
                         // end of execution. `self` should no longer be used afterward
                         // Clean up access control
                         self.access_control
-                            .exit_function(current_frame.function.as_ref())
+                            .exit_function(&current_frame.function)
                             .map_err(|e| self.set_location(e))?;
                         return Ok(self.operand_stack.value);
                     }
                 },
                 ExitCode::Call(fh_idx) => {
-                    let func = resolver
-                        .function_from_handle(fh_idx)
+                    let function = resolver
+                        .build_loaded_function_from_handle_and_ty_args(fh_idx, vec![])
                         .map_err(|e| self.set_location(e))?;
 
                     if self.paranoid_type_checks {
-                        self.check_friend_or_private_call(&current_frame.function, &func)?;
+                        self.check_friend_or_private_call(&current_frame.function, &function)?;
                     }
 
                     // Charge gas
-                    let module_id = func
-                        .module_id()
-                        .ok_or_else(|| {
+                    let module_id = function.module_id().ok_or_else(|| {
+                        let err =
                             PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
-                                .with_message("Failed to get native function module id".to_string())
-                        })
-                        .map_err(|e| set_err_info!(current_frame, e))?;
+                                .with_message(
+                                    "Failed to get native function module id".to_string(),
+                                );
+                        set_err_info!(current_frame, err)
+                    })?;
                     gas_meter
                         .charge_call(
                             module_id,
-                            func.name(),
+                            function.name(),
                             self.operand_stack
-                                .last_n(func.param_count())
+                                .last_n(function.param_tys().len())
                                 .map_err(|e| set_err_info!(current_frame, e))?,
-                            (func.local_count() as u64).into(),
+                            (function.local_tys().len() as u64).into(),
                         )
                         .map_err(|e| set_err_info!(current_frame, e))?;
 
-                    if func.is_native() {
+                    if function.is_native() {
                         self.call_native(
                             &mut current_frame,
                             &resolver,
@@ -236,34 +228,30 @@ impl Interpreter {
                             gas_meter,
                             traversal_context,
                             extensions,
-                            func,
-                            vec![],
+                            &function,
                         )?;
                         continue;
                     }
-                    self.set_new_call_frame(
-                        &mut current_frame,
-                        gas_meter,
-                        loader,
-                        module_store,
-                        func,
-                        vec![],
-                    )?;
+                    self.set_new_call_frame(&mut current_frame, gas_meter, loader, function)?;
                 },
                 ExitCode::CallGeneric(idx) => {
                     let ty_args = resolver
-                        .instantiate_generic_function(Some(gas_meter), idx, current_frame.ty_args())
+                        .instantiate_generic_function(
+                            Some(gas_meter),
+                            idx,
+                            current_frame.function.ty_args(),
+                        )
                         .map_err(|e| set_err_info!(current_frame, e))?;
-                    let func = resolver
-                        .function_from_instantiation(idx)
+                    let function = resolver
+                        .build_loaded_function_from_instantiation_and_ty_args(idx, ty_args)
                         .map_err(|e| self.set_location(e))?;
 
                     if self.paranoid_type_checks {
-                        self.check_friend_or_private_call(&current_frame.function, &func)?;
+                        self.check_friend_or_private_call(&current_frame.function, &function)?;
                     }
 
                     // Charge gas
-                    let module_id = func
+                    let module_id = function
                         .module_id()
                         .ok_or_else(|| {
                             PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
@@ -273,16 +261,19 @@ impl Interpreter {
                     gas_meter
                         .charge_call_generic(
                             module_id,
-                            func.name(),
-                            ty_args.iter().map(|ty| TypeWithLoader { ty, loader }),
+                            function.name(),
+                            function
+                                .ty_args()
+                                .iter()
+                                .map(|ty| TypeWithLoader { ty, loader }),
                             self.operand_stack
-                                .last_n(func.param_count())
+                                .last_n(function.param_tys().len())
                                 .map_err(|e| set_err_info!(current_frame, e))?,
-                            (func.local_count() as u64).into(),
+                            (function.local_tys().len() as u64).into(),
                         )
                         .map_err(|e| set_err_info!(current_frame, e))?;
 
-                    if func.is_native() {
+                    if function.is_native() {
                         self.call_native(
                             &mut current_frame,
                             &resolver,
@@ -291,19 +282,11 @@ impl Interpreter {
                             gas_meter,
                             traversal_context,
                             extensions,
-                            func,
-                            ty_args,
+                            &function,
                         )?;
                         continue;
                     }
-                    self.set_new_call_frame(
-                        &mut current_frame,
-                        gas_meter,
-                        loader,
-                        module_store,
-                        func,
-                        ty_args,
-                    )?;
+                    self.set_new_call_frame(&mut current_frame, gas_meter, loader, function)?;
                 },
             }
         }
@@ -314,11 +297,9 @@ impl Interpreter {
         current_frame: &mut Frame,
         gas_meter: &mut impl GasMeter,
         loader: &Loader,
-        module_store: &ModuleStorageAdapter,
-        func: Arc<Function>,
-        ty_args: Vec<Type>,
+        function: LoadedFunction,
     ) -> VMResult<()> {
-        match (func.module_id(), current_frame.function.module_id()) {
+        match (function.module_id(), current_frame.function.module_id()) {
             (Some(module_id), Some(current_module_id)) if module_id != current_module_id => {
                 if self.active_modules.contains(module_id) {
                     return Err(self.set_location(
@@ -339,14 +320,14 @@ impl Interpreter {
         }
 
         let mut frame = self
-            .make_call_frame(gas_meter, loader, module_store, func, ty_args)
+            .make_call_frame(gas_meter, loader, function)
             .map_err(|err| {
                 self.attach_state_if_invariant_violation(self.set_location(err), current_frame)
             })?;
 
         // Access control for the new frame.
         self.access_control
-            .enter_function(&frame, frame.function.as_ref())
+            .enter_function(&frame, &frame.function)
             .map_err(|e| self.set_location(e))?;
 
         std::mem::swap(current_frame, &mut frame);
@@ -367,75 +348,71 @@ impl Interpreter {
         &mut self,
         gas_meter: &mut impl GasMeter,
         loader: &Loader,
-        module_store: &ModuleStorageAdapter,
-        func: Arc<Function>,
-        ty_args: Vec<Type>,
+        function: LoadedFunction,
     ) -> PartialVMResult<Frame> {
-        let mut locals = Locals::new(func.local_count());
-        let param_count = func.param_count();
-        let is_generic = !ty_args.is_empty();
+        let mut locals = Locals::new(function.local_tys().len());
+        let num_param_tys = function.param_tys().len();
 
-        for i in 0..param_count {
+        for i in 0..num_param_tys {
             locals.store_loc(
-                param_count - i - 1,
+                num_param_tys - i - 1,
                 self.operand_stack.pop()?,
-                loader
-                    .vm_config()
-                    .enable_invariant_violation_check_in_swap_loc,
+                loader.vm_config().check_invariant_in_swap_loc,
             )?;
 
+            let ty_args = function.ty_args();
             if self.paranoid_type_checks {
                 let ty = self.operand_stack.pop_ty()?;
-                let resolver = func.get_resolver(loader, module_store);
-                if is_generic {
-                    ty.check_eq(
-                        &resolver.subst(&func.local_tys()[param_count - i - 1], &ty_args)?,
-                    )?;
+                let expected_ty = &function.local_tys()[num_param_tys - i - 1];
+                if !ty_args.is_empty() {
+                    let expected_ty = loader
+                        .ty_builder()
+                        .create_ty_with_subst(expected_ty, ty_args)?;
+                    ty.paranoid_check_eq(&expected_ty)?;
                 } else {
                     // Directly check against the expected type to save a clone here.
-                    ty.check_eq(&func.local_tys()[param_count - i - 1])?;
+                    ty.paranoid_check_eq(expected_ty)?;
                 }
             }
         }
-        self.make_new_frame(gas_meter, loader, module_store, func, ty_args, locals)
+        self.make_new_frame(gas_meter, loader, function, locals)
     }
 
-    /// Create a new `Frame` given a `Function` and the function `Locals`.
+    /// Create a new `Frame` given a function and its locals.
     ///
     /// The locals must be loaded before calling this.
     fn make_new_frame(
         &self,
         gas_meter: &mut impl GasMeter,
         loader: &Loader,
-        module_store: &ModuleStorageAdapter,
-        function: Arc<Function>,
-        ty_args: Vec<Type>,
+        function: LoadedFunction,
         locals: Locals,
     ) -> PartialVMResult<Frame> {
+        let ty_args = function.ty_args();
         for ty in function.local_tys() {
             gas_meter
-                .charge_create_ty(NumTypeNodes::new(ty.num_nodes_in_subst(&ty_args)? as u64))?;
+                .charge_create_ty(NumTypeNodes::new(ty.num_nodes_in_subst(ty_args)? as u64))?;
         }
 
         let local_tys = if self.paranoid_type_checks {
             if ty_args.is_empty() {
                 function.local_tys().to_vec()
             } else {
-                let resolver = function.get_resolver(loader, module_store);
+                let ty_builder = loader.ty_builder();
                 function
                     .local_tys()
                     .iter()
-                    .map(|ty| resolver.subst(ty, &ty_args))
+                    .map(|ty| ty_builder.create_ty_with_subst(ty, ty_args))
                     .collect::<PartialVMResult<Vec<_>>>()?
             }
         } else {
             vec![]
         };
+
         Ok(Frame {
             pc: 0,
             locals,
             function,
-            ty_args,
             local_tys,
             ty_cache: FrameTypeCache::default(),
         })
@@ -451,8 +428,7 @@ impl Interpreter {
         gas_meter: &mut impl GasMeter,
         traversal_context: &mut TraversalContext,
         extensions: &mut NativeContextExtensions,
-        function: Arc<Function>,
-        ty_args: Vec<Type>,
+        function: &LoadedFunction,
     ) -> VMResult<()> {
         // Note: refactor if native functions push a frame on the stack
         self.call_native_impl(
@@ -463,8 +439,7 @@ impl Interpreter {
             gas_meter,
             traversal_context,
             extensions,
-            function.clone(),
-            ty_args,
+            function,
         )
         .map_err(|e| match function.module_id() {
             Some(id) => {
@@ -493,28 +468,29 @@ impl Interpreter {
         gas_meter: &mut impl GasMeter,
         traversal_context: &mut TraversalContext,
         extensions: &mut NativeContextExtensions,
-        function: Arc<Function>,
-        ty_args: Vec<Type>,
+        function: &LoadedFunction,
     ) -> PartialVMResult<()> {
-        let is_generic = !ty_args.is_empty();
+        let ty_builder = resolver.loader().ty_builder();
+
         let mut args = VecDeque::new();
-        let expected_args = function.param_count();
-        for _ in 0..expected_args {
+        let num_param_tys = function.param_tys().len();
+        for _ in 0..num_param_tys {
             args.push_front(self.operand_stack.pop()?);
         }
-        let mut args_ty = VecDeque::new();
+        let mut arg_tys = VecDeque::new();
 
+        let ty_args = function.ty_args();
         if self.paranoid_type_checks {
-            for i in 0..expected_args {
+            for i in 0..num_param_tys {
                 let ty = self.operand_stack.pop_ty()?;
-                if is_generic {
-                    let expected_ty =
-                        resolver.subst(&function.param_tys()[expected_args - i - 1], &ty_args)?;
-                    ty.check_eq(&expected_ty)?;
+                let expected_ty = &function.param_tys()[num_param_tys - i - 1];
+                if !ty_args.is_empty() {
+                    let expected_ty = ty_builder.create_ty_with_subst(expected_ty, ty_args)?;
+                    ty.paranoid_check_eq(&expected_ty)?;
                 } else {
-                    ty.check_eq(&function.param_tys()[expected_args - i - 1])?;
+                    ty.paranoid_check_eq(expected_ty)?;
                 }
-                args_ty.push_front(ty);
+                arg_tys.push_front(ty);
             }
         }
 
@@ -536,7 +512,7 @@ impl Interpreter {
             args.iter(),
         )?;
 
-        let result = native_function(&mut native_context, ty_args.clone(), args)?;
+        let result = native_function(&mut native_context, ty_args.to_vec(), args)?;
 
         // Note(Gas): The order by which gas is charged / error gets returned MUST NOT be modified
         //            here or otherwise it becomes an incompatible change!!!
@@ -566,7 +542,8 @@ impl Interpreter {
 
                 if self.paranoid_type_checks {
                     for ty in function.return_tys() {
-                        self.operand_stack.push_ty(resolver.subst(ty, &ty_args)?)?;
+                        let ty = ty_builder.create_ty_with_subst(ty, ty_args)?;
+                        self.operand_stack.push_ty(ty)?;
                     }
                 }
 
@@ -611,8 +588,11 @@ impl Interpreter {
                         PartialVMError::new(StatusCode::FUNCTION_RESOLUTION_FAILURE)
                             .with_message(format!("Module {} doesn't exist", module_name))
                     })?;
-
-                let target_func = resolver.function_from_name(&module_name, &func_name)?;
+                let target_func = resolver.build_loaded_function_from_name_and_ty_args(
+                    &module_name,
+                    &func_name,
+                    ty_args,
+                )?;
 
                 if target_func.is_friend_or_private()
                     || target_func.module_id() == function.module_id()
@@ -623,6 +603,13 @@ impl Interpreter {
                         ));
                 }
 
+                if resolver.loader().vm_config().disallow_dispatch_for_native
+                    && target_func.is_native()
+                {
+                    return Err(PartialVMError::new(StatusCode::RUNTIME_DISPATCH_ERROR)
+                        .with_message("Invoking native function during dispatch".to_string()));
+                }
+
                 // Checking type of the dispatch target function
                 //
                 // MoveVM will check that the native function that performs the dispatch will have the same
@@ -630,9 +617,10 @@ impl Interpreter {
                 // in the end to determine which function to jump to. The native function shouldn't switch ordering of arguments.
                 //
                 // Runtime will use such convention to reconstruct the type stack required to perform paranoid mode checks.
-                if function.ty_param_abilities != target_func.ty_param_abilities
-                    || function.return_tys != target_func.return_tys
-                    || function.param_tys[0..function.param_tys.len() - 1] != target_func.param_tys
+                if function.ty_param_abilities() != target_func.ty_param_abilities()
+                    || function.return_tys() != target_func.return_tys()
+                    || &function.param_tys()[0..function.param_tys().len() - 1]
+                        != target_func.param_tys()
                 {
                     return Err(PartialVMError::new(StatusCode::RUNTIME_DISPATCH_ERROR)
                         .with_message(
@@ -646,21 +634,14 @@ impl Interpreter {
 
                 // Maintaining the type stack for the paranoid mode using calling convention mentioned above.
                 if self.paranoid_type_checks {
-                    args_ty.pop_back();
-                    for ty in args_ty {
+                    arg_tys.pop_back();
+                    for ty in arg_tys {
                         self.operand_stack.push_ty(ty)?;
                     }
                 }
 
-                self.set_new_call_frame(
-                    current_frame,
-                    gas_meter,
-                    resolver.loader(),
-                    module_store,
-                    target_func,
-                    ty_args,
-                )
-                .map_err(|err| err.to_partial())
+                self.set_new_call_frame(current_frame, gas_meter, resolver.loader(), target_func)
+                    .map_err(|err| err.to_partial())
             },
             NativeResult::LoadModule { module_name } => {
                 let arena_id = traversal_context
@@ -698,8 +679,8 @@ impl Interpreter {
     /// Make sure only private/friend function can only be invoked by modules under the same address.
     fn check_friend_or_private_call(
         &self,
-        caller: &Arc<Function>,
-        callee: &Arc<Function>,
+        caller: &LoadedFunction,
+        callee: &LoadedFunction,
     ) -> VMResult<()> {
         if callee.is_friend_or_private() {
             match (caller.module_id(), callee.module_id()) {
@@ -988,20 +969,19 @@ impl Interpreter {
         idx: usize,
         frame: &Frame,
     ) -> PartialVMResult<()> {
-        // Print out the function name with type arguments.
-        let func = &frame.function;
-
         debug_write!(buf, "    [{}] ", idx)?;
-        if let Some(module) = func.module_id() {
-            debug_write!(buf, "{}::{}::", module.address().to_hex(), module.name(),)?;
-        }
-        debug_write!(buf, "{}", func.name())?;
-        let ty_args = frame.ty_args();
-        let mut ty_tags = vec![];
-        for ty in ty_args {
-            ty_tags.push(loader.type_to_type_tag(ty)?);
-        }
-        if !ty_tags.is_empty() {
+
+        // Print out the function name.
+        let function = &frame.function;
+        debug_write!(buf, "{}", function.name_as_pretty_string())?;
+
+        // Print out type arguments, if they exist.
+        let ty_args = function.ty_args();
+        if !ty_args.is_empty() {
+            let mut ty_tags = vec![];
+            for ty in ty_args {
+                ty_tags.push(loader.type_to_type_tag(ty)?);
+            }
             debug_write!(buf, "<")?;
             let mut it = ty_tags.iter();
             if let Some(tag) = it.next() {
@@ -1019,7 +999,7 @@ impl Interpreter {
         debug_writeln!(buf)?;
         debug_writeln!(buf, "        Code:")?;
         let pc = frame.pc as usize;
-        let code = func.code();
+        let code = function.code();
         let before = if pc > 3 { pc - 3 } else { 0 };
         let after = min(code.len(), pc + 4);
         for (idx, instr) in code.iter().enumerate().take(pc).skip(before) {
@@ -1033,7 +1013,7 @@ impl Interpreter {
         // Print out the locals.
         debug_writeln!(buf)?;
         debug_writeln!(buf, "        Locals:")?;
-        if func.local_count() > 0 {
+        if !function.local_tys().is_empty() {
             values::debug::print_locals(buf, &frame.locals)?;
             debug_writeln!(buf)?;
         } else {
@@ -1078,7 +1058,7 @@ impl Interpreter {
                 format!(
                     " frame #{}: {} [pc = {}]\n",
                     i,
-                    frame.function.pretty_string(),
+                    frame.function.name_as_pretty_string(),
                     frame.pc,
                 )
                 .as_str(),
@@ -1088,7 +1068,7 @@ impl Interpreter {
             format!(
                 "*frame #{}: {} [pc = {}]:\n",
                 self.call_stack.0.len(),
-                current_frame.function.pretty_string(),
+                current_frame.function.name_as_pretty_string(),
                 current_frame.pc,
             )
             .as_str(),
@@ -1363,15 +1343,17 @@ fn check_depth_of_type_impl(
     Ok(ty_depth)
 }
 
-/// A `Frame` is the execution context for a function. It holds the locals of the function and
-/// the function itself.
-// #[derive(Debug)]
+/// Represents the execution context for a function. When calls are made, frames are
+/// pushed and then popped to/from the call stack.
 struct Frame {
     pc: u16,
+    // Currently being executed function.
+    function: LoadedFunction,
+    // Locals for this execution context and their instantiated types.
     locals: Locals,
-    function: Arc<Function>,
-    ty_args: Vec<Type>,
     local_tys: Vec<Type>,
+    // Cache of types accessed in this frame, to improve performance when accessing
+    // and constructing types.
     ty_cache: FrameTypeCache,
 }
 
@@ -1379,11 +1361,18 @@ struct Frame {
 struct FrameTypeCache {
     struct_field_type_instantiation:
         BTreeMap<StructDefInstantiationIndex, Vec<(Type, NumTypeNodes)>>,
+    struct_variant_field_type_instantiation:
+        BTreeMap<StructVariantInstantiationIndex, Vec<(Type, NumTypeNodes)>>,
     struct_def_instantiation_type: BTreeMap<StructDefInstantiationIndex, (Type, NumTypeNodes)>,
+    struct_variant_instantiation_type:
+        BTreeMap<StructVariantInstantiationIndex, (Type, NumTypeNodes)>,
     /// For a given field instantiation, the:
     ///    ((Type of the field, size of the field type) and (Type of its defining struct, size of its defining struct)
     field_instantiation:
         BTreeMap<FieldInstantiationIndex, ((Type, NumTypeNodes), (Type, NumTypeNodes))>,
+    /// Same as above, bot for variant field instantiations
+    variant_field_instantiation:
+        BTreeMap<VariantFieldInstantiationIndex, ((Type, NumTypeNodes), (Type, NumTypeNodes))>,
     single_sig_token_type: BTreeMap<SignatureIndex, (Type, NumTypeNodes)>,
 }
 
@@ -1395,18 +1384,6 @@ enum ExitCode {
     CallGeneric(FunctionInstantiationIndex),
 }
 
-fn check_ability(has_ability: bool) -> PartialVMResult<()> {
-    if has_ability {
-        Ok(())
-    } else {
-        Err(
-            PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
-                .with_message("Paranoid Mode: Expected ability mismatch".to_string())
-                .with_sub_status(move_core_types::vm_status::sub_status::unknown_invariant_violation::EPARANOID_FAILURE),
-        )
-    }
-}
-
 impl FrameTypeCache {
     #[inline(always)]
     fn get_or<K: Copy + Ord + Eq, V, F>(
@@ -1437,7 +1414,33 @@ impl FrameTypeCache {
             Self::get_or(&mut self.field_instantiation, idx, |idx| {
                 let struct_type = resolver.field_instantiation_to_struct(idx, ty_args)?;
                 let struct_ty_count = NumTypeNodes::new(struct_type.num_nodes() as u64);
-                let field_ty = resolver.get_field_type_generic(idx, ty_args)?;
+                let field_ty = resolver.get_generic_field_ty(idx, ty_args)?;
+                let field_ty_count = NumTypeNodes::new(field_ty.num_nodes() as u64);
+                Ok(((field_ty, field_ty_count), (struct_type, struct_ty_count)))
+            })?;
+        Ok(((field_ty, *field_ty_count), (struct_ty, *struct_ty_count)))
+    }
+
+    fn get_variant_field_type_and_struct_type(
+        &mut self,
+        idx: VariantFieldInstantiationIndex,
+        resolver: &Resolver,
+        ty_args: &[Type],
+    ) -> PartialVMResult<((&Type, NumTypeNodes), (&Type, NumTypeNodes))> {
+        let ((field_ty, field_ty_count), (struct_ty, struct_ty_count)) =
+            Self::get_or(&mut self.variant_field_instantiation, idx, |idx| {
+                let info = resolver.variant_field_instantiation_info_at(idx);
+                let struct_type = resolver.create_struct_instantiation_ty(
+                    &info.definition_struct_type,
+                    &info.instantiation,
+                    ty_args,
+                )?;
+                let struct_ty_count = NumTypeNodes::new(struct_type.num_nodes() as u64);
+                let field_ty = resolver.instantiate_ty(
+                    &info.uninstantiated_field_ty,
+                    ty_args,
+                    &info.instantiation,
+                )?;
                 let field_ty_count = NumTypeNodes::new(field_ty.num_nodes() as u64);
                 Ok(((field_ty, field_ty_count), (struct_type, struct_ty_count)))
             })?;
@@ -1452,13 +1455,34 @@ impl FrameTypeCache {
         ty_args: &[Type],
     ) -> PartialVMResult<(&Type, NumTypeNodes)> {
         let (ty, ty_count) = Self::get_or(&mut self.struct_def_instantiation_type, idx, |idx| {
-            let ty = resolver.get_struct_type_generic(idx, ty_args)?;
+            let ty = resolver.get_generic_struct_ty(idx, ty_args)?;
             let ty_count = NumTypeNodes::new(ty.num_nodes() as u64);
             Ok((ty, ty_count))
         })?;
         Ok((ty, *ty_count))
     }
 
+    #[inline(always)]
+    fn get_struct_variant_type(
+        &mut self,
+        idx: StructVariantInstantiationIndex,
+        resolver: &Resolver,
+        ty_args: &[Type],
+    ) -> PartialVMResult<(&Type, NumTypeNodes)> {
+        let (ty, ty_count) =
+            Self::get_or(&mut self.struct_variant_instantiation_type, idx, |idx| {
+                let info = resolver.get_struct_variant_instantiation_at(idx);
+                let ty = resolver.create_struct_instantiation_ty(
+                    &info.definition_struct_type,
+                    &info.instantiation,
+                    ty_args,
+                )?;
+                let ty_count = NumTypeNodes::new(ty.num_nodes() as u64);
+                Ok((ty, ty_count))
+            })?;
+        Ok((ty, *ty_count))
+    }
+
     #[inline(always)]
     fn get_struct_fields_types(
         &mut self,
@@ -1482,6 +1506,29 @@ impl FrameTypeCache {
         )?)
     }
 
+    #[inline(always)]
+    fn get_struct_variant_fields_types(
+        &mut self,
+        idx: StructVariantInstantiationIndex,
+        resolver: &Resolver,
+        ty_args: &[Type],
+    ) -> PartialVMResult<&[(Type, NumTypeNodes)]> {
+        Ok(Self::get_or(
+            &mut self.struct_variant_field_type_instantiation,
+            idx,
+            |idx| {
+                Ok(resolver
+                    .instantiate_generic_struct_variant_fields(idx, ty_args)?
+                    .into_iter()
+                    .map(|ty| {
+                        let num_nodes = NumTypeNodes::new(ty.num_nodes() as u64);
+                        (ty, num_nodes)
+                    })
+                    .collect::<Vec<_>>())
+            },
+        )?)
+    }
+
     #[inline(always)]
     fn get_signature_index_type(
         &mut self,
@@ -1525,8 +1572,7 @@ impl Frame {
                 } else {
                     e
                 };
-                e.at_code_offset(self.function.index(), self.pc)
-                    .finish(self.location())
+                set_err_info!(self, e)
             })
     }
 
@@ -1552,7 +1598,7 @@ impl Frame {
             Bytecode::Ret => {
                 for (idx, ty) in local_tys.iter().enumerate() {
                     if !locals.is_invalid(idx)? {
-                        check_ability(ty.abilities()?.has_drop())?;
+                        ty.paranoid_check_has_ability(Ability::Drop)?;
                     }
                 }
             },
@@ -1563,9 +1609,9 @@ impl Frame {
             Bytecode::StLoc(idx) => {
                 let ty = local_tys[*idx as usize].clone();
                 let val_ty = interpreter.operand_stack.pop_ty()?;
-                ty.check_eq(&val_ty)?;
+                ty.paranoid_check_eq(&val_ty)?;
                 if !locals.is_invalid(*idx as usize)? {
-                    check_ability(ty.abilities()?.has_drop())?;
+                    ty.paranoid_check_has_ability(Ability::Drop)?;
                 }
             },
             // We will check the rest of the instructions after execution phase.
@@ -1638,6 +1684,18 @@ impl Frame {
             | Bytecode::VecPopBack(_)
             | Bytecode::VecUnpack(_, _)
             | Bytecode::VecSwap(_) => (),
+
+            // Since bytecode version 7
+            Bytecode::PackVariant(_)
+            | Bytecode::PackVariantGeneric(_)
+            | Bytecode::UnpackVariant(_)
+            | Bytecode::UnpackVariantGeneric(_)
+            | Bytecode::TestVariant(_)
+            | Bytecode::TestVariantGeneric(_)
+            | Bytecode::MutBorrowVariantField(_)
+            | Bytecode::MutBorrowVariantFieldGeneric(_)
+            | Bytecode::ImmBorrowVariantField(_)
+            | Bytecode::ImmBorrowVariantFieldGeneric(_) => (),
         };
         Ok(())
     }
@@ -1653,6 +1711,8 @@ impl Frame {
         ty_cache: &mut FrameTypeCache,
         instruction: &Bytecode,
     ) -> PartialVMResult<()> {
+        let ty_builder = resolver.loader().ty_builder();
+
         match instruction {
             Bytecode::BrTrue(_) | Bytecode::BrFalse(_) => (),
             Bytecode::Branch(_)
@@ -1665,26 +1725,44 @@ impl Frame {
             },
             Bytecode::Pop => {
                 let ty = interpreter.operand_stack.pop_ty()?;
-                check_ability(ty.abilities()?.has_drop())?;
-            },
-            Bytecode::LdU8(_) => interpreter.operand_stack.push_ty(Type::U8)?,
-            Bytecode::LdU16(_) => interpreter.operand_stack.push_ty(Type::U16)?,
-            Bytecode::LdU32(_) => interpreter.operand_stack.push_ty(Type::U32)?,
-            Bytecode::LdU64(_) => interpreter.operand_stack.push_ty(Type::U64)?,
-            Bytecode::LdU128(_) => interpreter.operand_stack.push_ty(Type::U128)?,
-            Bytecode::LdU256(_) => interpreter.operand_stack.push_ty(Type::U256)?,
+                ty.paranoid_check_has_ability(Ability::Drop)?;
+            },
+            Bytecode::LdU8(_) => {
+                let u8_ty = ty_builder.create_u8_ty();
+                interpreter.operand_stack.push_ty(u8_ty)?
+            },
+            Bytecode::LdU16(_) => {
+                let u16_ty = ty_builder.create_u16_ty();
+                interpreter.operand_stack.push_ty(u16_ty)?
+            },
+            Bytecode::LdU32(_) => {
+                let u32_ty = ty_builder.create_u32_ty();
+                interpreter.operand_stack.push_ty(u32_ty)?
+            },
+            Bytecode::LdU64(_) => {
+                let u64_ty = ty_builder.create_u64_ty();
+                interpreter.operand_stack.push_ty(u64_ty)?
+            },
+            Bytecode::LdU128(_) => {
+                let u128_ty = ty_builder.create_u128_ty();
+                interpreter.operand_stack.push_ty(u128_ty)?
+            },
+            Bytecode::LdU256(_) => {
+                let u256_ty = ty_builder.create_u256_ty();
+                interpreter.operand_stack.push_ty(u256_ty)?
+            },
             Bytecode::LdTrue | Bytecode::LdFalse => {
-                interpreter.operand_stack.push_ty(Type::Bool)?
+                let bool_ty = ty_builder.create_bool_ty();
+                interpreter.operand_stack.push_ty(bool_ty)?
             },
             Bytecode::LdConst(i) => {
                 let constant = resolver.constant_at(*i);
-                interpreter
-                    .operand_stack
-                    .push_ty(Type::from_const_signature(&constant.type_)?)?;
+                let ty = ty_builder.create_constant_ty(&constant.type_)?;
+                interpreter.operand_stack.push_ty(ty)?;
             },
             Bytecode::CopyLoc(idx) => {
                 let ty = local_tys[*idx as usize].clone();
-                check_ability(ty.abilities()?.has_copy())?;
+                ty.paranoid_check_has_ability(Ability::Copy)?;
                 interpreter.operand_stack.push_ty(ty)?;
             },
             Bytecode::MoveLoc(idx) => {
@@ -1693,139 +1771,114 @@ impl Frame {
             },
             Bytecode::StLoc(_) => (),
             Bytecode::MutBorrowLoc(idx) => {
-                let ty = local_tys[*idx as usize].clone();
-                interpreter
-                    .operand_stack
-                    .push_ty(Type::MutableReference(Box::new(ty)))?;
+                let ty = &local_tys[*idx as usize];
+                let mut_ref_ty = ty_builder.create_ref_ty(ty, true)?;
+                interpreter.operand_stack.push_ty(mut_ref_ty)?;
             },
             Bytecode::ImmBorrowLoc(idx) => {
-                let ty = local_tys[*idx as usize].clone();
-                interpreter
-                    .operand_stack
-                    .push_ty(Type::Reference(Box::new(ty)))?;
+                let ty = &local_tys[*idx as usize];
+                let ref_ty = ty_builder.create_ref_ty(ty, false)?;
+                interpreter.operand_stack.push_ty(ref_ty)?;
             },
             Bytecode::ImmBorrowField(fh_idx) => {
-                let expected_ty = resolver.field_handle_to_struct(*fh_idx)?;
-                let top_ty = interpreter.operand_stack.pop_ty()?;
-                top_ty.check_ref_eq(&expected_ty)?;
-                interpreter
-                    .operand_stack
-                    .push_ty(Type::Reference(Box::new(resolver.get_field_type(*fh_idx)?)))?;
+                let ty = interpreter.operand_stack.pop_ty()?;
+                let expected_ty = resolver.field_handle_to_struct(*fh_idx);
+                ty.paranoid_check_ref_eq(&expected_ty, false)?;
+
+                let field_ty = resolver.get_field_ty(*fh_idx)?;
+                let field_ref_ty = ty_builder.create_ref_ty(field_ty, false)?;
+                interpreter.operand_stack.push_ty(field_ref_ty)?;
             },
             Bytecode::MutBorrowField(fh_idx) => {
-                let expected_ty = resolver.field_handle_to_struct(*fh_idx)?;
-                let top_ty = interpreter.operand_stack.pop_ty()?;
-                top_ty.check_eq(&Type::MutableReference(Box::new(expected_ty)))?;
-                interpreter
-                    .operand_stack
-                    .push_ty(Type::MutableReference(Box::new(
-                        resolver.get_field_type(*fh_idx)?,
-                    )))?;
+                let ref_ty = interpreter.operand_stack.pop_ty()?;
+                let expected_inner_ty = resolver.field_handle_to_struct(*fh_idx);
+                ref_ty.paranoid_check_ref_eq(&expected_inner_ty, true)?;
+
+                let field_ty = resolver.get_field_ty(*fh_idx)?;
+                let field_mut_ref_ty = ty_builder.create_ref_ty(field_ty, true)?;
+                interpreter.operand_stack.push_ty(field_mut_ref_ty)?;
             },
             Bytecode::ImmBorrowFieldGeneric(idx) => {
-                let ((expected_field_ty, _), (expected_struct_ty, _)) =
+                let struct_ty = interpreter.operand_stack.pop_ty()?;
+                let ((field_ty, _), (expected_struct_ty, _)) =
                     ty_cache.get_field_type_and_struct_type(*idx, resolver, ty_args)?;
-                let top_ty = interpreter.operand_stack.pop_ty()?;
-                top_ty.check_ref_eq(expected_struct_ty)?;
-                interpreter
-                    .operand_stack
-                    .push_ty(Type::Reference(Box::new(expected_field_ty.clone())))?;
+                struct_ty.paranoid_check_ref_eq(expected_struct_ty, false)?;
+
+                let field_ref_ty = ty_builder.create_ref_ty(field_ty, false)?;
+                interpreter.operand_stack.push_ty(field_ref_ty)?;
             },
             Bytecode::MutBorrowFieldGeneric(idx) => {
-                let ((expected_field_ty, _), (expected_struct_ty, _)) =
+                let struct_ty = interpreter.operand_stack.pop_ty()?;
+                let ((field_ty, _), (expected_struct_ty, _)) =
                     ty_cache.get_field_type_and_struct_type(*idx, resolver, ty_args)?;
-                let top_ty = interpreter.operand_stack.pop_ty()?;
-                top_ty.check_eq(&Type::MutableReference(Box::new(
-                    expected_struct_ty.clone(),
-                )))?;
-                interpreter
-                    .operand_stack
-                    .push_ty(Type::MutableReference(Box::new(expected_field_ty.clone())))?;
+                struct_ty.paranoid_check_ref_eq(expected_struct_ty, true)?;
+
+                let field_mut_ref_ty = ty_builder.create_ref_ty(field_ty, true)?;
+                interpreter.operand_stack.push_ty(field_mut_ref_ty)?;
+            },
+            Bytecode::ImmBorrowVariantField(fh_idx) | Bytecode::MutBorrowVariantField(fh_idx) => {
+                let is_mut = matches!(instruction, Bytecode::MutBorrowVariantField(..));
+                let field_info = resolver.variant_field_info_at(*fh_idx);
+                let ty = interpreter.operand_stack.pop_ty()?;
+                let expected_ty = resolver.create_struct_ty(&field_info.definition_struct_type);
+                ty.paranoid_check_ref_eq(&expected_ty, is_mut)?;
+                let field_ty = &field_info.uninstantiated_field_ty;
+                let field_ref_ty = ty_builder.create_ref_ty(field_ty, is_mut)?;
+                interpreter.operand_stack.push_ty(field_ref_ty)?;
+            },
+            Bytecode::ImmBorrowVariantFieldGeneric(idx)
+            | Bytecode::MutBorrowVariantFieldGeneric(idx) => {
+                let is_mut = matches!(instruction, Bytecode::MutBorrowVariantFieldGeneric(..));
+                let struct_ty = interpreter.operand_stack.pop_ty()?;
+                let ((field_ty, _), (expected_struct_ty, _)) =
+                    ty_cache.get_variant_field_type_and_struct_type(*idx, resolver, ty_args)?;
+                struct_ty.paranoid_check_ref_eq(expected_struct_ty, is_mut)?;
+                let field_ref_ty = ty_builder.create_ref_ty(field_ty, is_mut)?;
+                interpreter.operand_stack.push_ty(field_ref_ty)?;
             },
             Bytecode::Pack(idx) => {
                 let field_count = resolver.field_count(*idx);
-                let args_ty = resolver.get_struct_field_tys(*idx)?;
-                let output_ty = resolver.get_struct_type(*idx)?;
-                let ability = output_ty.abilities()?;
-
-                // If the struct has a key ability, we expects all of its field to have store ability but not key ability.
-                let field_expected_abilities = if ability.has_key() {
-                    ability
-                        .remove(Ability::Key)
-                        .union(AbilitySet::singleton(Ability::Store))
-                } else {
-                    ability
-                };
-
-                if field_count as usize != args_ty.field_tys.len() {
-                    return Err(
-                        PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
-                            .with_message("Args count mismatch".to_string()),
-                    );
-                }
-
-                for (ty, expected_ty) in interpreter
-                    .operand_stack
-                    .popn_tys(field_count)?
-                    .into_iter()
-                    .zip(args_ty.field_tys.iter())
-                {
-                    // Fields ability should be a subset of the struct ability because abilities can be weakened but not the other direction.
-                    // For example, it is ok to have a struct that doesn't have a copy capability where its field is a struct that has copy capability but not vice versa.
-                    check_ability(field_expected_abilities.is_subset(ty.abilities()?))?;
-                    ty.check_eq(expected_ty)?;
-                }
-
-                interpreter.operand_stack.push_ty(output_ty)?;
+                let args_ty = resolver.get_struct(*idx)?;
+                let field_tys = args_ty.fields(None)?.iter().map(|(_, ty)| ty);
+                let output_ty = resolver.get_struct_ty(*idx);
+                Self::verify_pack(interpreter, field_count, field_tys, output_ty)?;
             },
             Bytecode::PackGeneric(idx) => {
                 let field_count = resolver.field_instantiation_count(*idx);
                 let output_ty = ty_cache.get_struct_type(*idx, resolver, ty_args)?.0.clone();
                 let args_ty = ty_cache.get_struct_fields_types(*idx, resolver, ty_args)?;
-                let ability = output_ty.abilities()?;
-
-                // If the struct has a key ability, we expects all of its field to have store ability but not key ability.
-                let field_expected_abilities = if ability.has_key() {
-                    ability
-                        .remove(Ability::Key)
-                        .union(AbilitySet::singleton(Ability::Store))
-                } else {
-                    ability
-                };
 
                 if field_count as usize != args_ty.len() {
+                    // This is an inconsistency between the cache and the actual
+                    // type declaration. We would crash if for some reason this invariant does
+                    // not hold. It seems impossible to hit, but we keep it here for safety
+                    // reasons, as a previous version of this code had this too.
                     return Err(
                         PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
                             .with_message("Args count mismatch".to_string()),
                     );
                 }
 
-                for (ty, (expected_ty, _)) in interpreter
-                    .operand_stack
-                    .popn_tys(field_count)?
-                    .into_iter()
-                    .zip(args_ty.iter())
-                {
-                    // Fields ability should be a subset of the struct ability because abilities can be weakened but not the other direction.
-                    // For example, it is ok to have a struct that doesn't have a copy capability where its field is a struct that has copy capability but not vice versa.
-                    check_ability(field_expected_abilities.is_subset(ty.abilities()?))?;
-                    ty.check_eq(expected_ty)?;
-                }
-
-                interpreter.operand_stack.push_ty(output_ty)?;
+                Self::verify_pack(
+                    interpreter,
+                    field_count,
+                    args_ty.iter().map(|(ty, _)| ty),
+                    output_ty,
+                )?;
             },
             Bytecode::Unpack(idx) => {
                 let struct_ty = interpreter.operand_stack.pop_ty()?;
-                struct_ty.check_eq(&resolver.get_struct_type(*idx)?)?;
-                let struct_decl = resolver.get_struct_field_tys(*idx)?;
-                for ty in struct_decl.field_tys.iter() {
+                struct_ty.paranoid_check_eq(&resolver.get_struct_ty(*idx))?;
+                let struct_decl = resolver.get_struct(*idx)?;
+                for (_name, ty) in struct_decl.fields(None)?.iter() {
                     interpreter.operand_stack.push_ty(ty.clone())?;
                 }
             },
             Bytecode::UnpackGeneric(idx) => {
                 let struct_ty = interpreter.operand_stack.pop_ty()?;
 
-                struct_ty.check_eq(ty_cache.get_struct_type(*idx, resolver, ty_args)?.0)?;
+                struct_ty
+                    .paranoid_check_eq(ty_cache.get_struct_type(*idx, resolver, ty_args)?.0)?;
 
                 let struct_fields_types =
                     ty_cache.get_struct_fields_types(*idx, resolver, ty_args)?;
@@ -1833,70 +1886,111 @@ impl Frame {
                     interpreter.operand_stack.push_ty(ty.clone())?;
                 }
             },
+            Bytecode::PackVariant(idx) => {
+                let info = resolver.get_struct_variant_at(*idx);
+                let field_tys = info
+                    .definition_struct_type
+                    .fields(Some(info.variant))?
+                    .iter()
+                    .map(|(_, ty)| ty);
+                let output_ty = resolver.create_struct_ty(&info.definition_struct_type);
+                Self::verify_pack(interpreter, info.field_count, field_tys, output_ty)?;
+            },
+            Bytecode::PackVariantGeneric(idx) => {
+                let info = resolver.get_struct_variant_instantiation_at(*idx);
+                let output_ty = ty_cache
+                    .get_struct_variant_type(*idx, resolver, ty_args)?
+                    .0
+                    .clone();
+                let args_ty = ty_cache.get_struct_variant_fields_types(*idx, resolver, ty_args)?;
+                Self::verify_pack(
+                    interpreter,
+                    info.field_count,
+                    args_ty.iter().map(|(ty, _)| ty),
+                    output_ty,
+                )?;
+            },
+            Bytecode::UnpackVariant(idx) => {
+                let info = resolver.get_struct_variant_at(*idx);
+                let expected_struct_ty = resolver.create_struct_ty(&info.definition_struct_type);
+                let actual_struct_ty = interpreter.operand_stack.pop_ty()?;
+                actual_struct_ty.paranoid_check_eq(&expected_struct_ty)?;
+                for (_name, ty) in info
+                    .definition_struct_type
+                    .fields(Some(info.variant))?
+                    .iter()
+                {
+                    interpreter.operand_stack.push_ty(ty.clone())?;
+                }
+            },
+            Bytecode::UnpackVariantGeneric(idx) => {
+                let expected_struct_type =
+                    ty_cache.get_struct_variant_type(*idx, resolver, ty_args)?.0;
+                let actual_struct_type = interpreter.operand_stack.pop_ty()?;
+                actual_struct_type.paranoid_check_eq(expected_struct_type)?;
+                let struct_fields_types =
+                    ty_cache.get_struct_variant_fields_types(*idx, resolver, ty_args)?;
+                for (ty, _) in struct_fields_types {
+                    interpreter.operand_stack.push_ty(ty.clone())?;
+                }
+            },
+            Bytecode::TestVariant(idx) => {
+                let info = resolver.get_struct_variant_at(*idx);
+                let expected_struct_ty = resolver.create_struct_ty(&info.definition_struct_type);
+                let actual_struct_ty = interpreter.operand_stack.pop_ty()?;
+                actual_struct_ty.paranoid_check_ref_eq(&expected_struct_ty, false)?;
+                interpreter
+                    .operand_stack
+                    .push_ty(ty_builder.create_bool_ty())?;
+            },
+            Bytecode::TestVariantGeneric(idx) => {
+                let expected_struct_ty =
+                    ty_cache.get_struct_variant_type(*idx, resolver, ty_args)?.0;
+                let actual_struct_ty = interpreter.operand_stack.pop_ty()?;
+                actual_struct_ty.paranoid_check_ref_eq(expected_struct_ty, false)?;
+                interpreter
+                    .operand_stack
+                    .push_ty(ty_builder.create_bool_ty())?;
+            },
             Bytecode::ReadRef => {
                 let ref_ty = interpreter.operand_stack.pop_ty()?;
-                match ref_ty {
-                    Type::Reference(inner) | Type::MutableReference(inner) => {
-                        check_ability(inner.abilities()?.has_copy())?;
-                        interpreter.operand_stack.push_ty(inner.as_ref().clone())?;
-                    },
-                    _ => {
-                        return Err(PartialVMError::new(
-                            StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR,
-                        )
-                        .with_message("ReadRef expecting a value of reference type".to_string()))
-                    },
-                }
+                let inner_ty = ref_ty.paranoid_read_ref()?;
+                interpreter.operand_stack.push_ty(inner_ty)?;
             },
             Bytecode::WriteRef => {
-                let ref_ty = interpreter.operand_stack.pop_ty()?;
+                let mut_ref_ty = interpreter.operand_stack.pop_ty()?;
                 let val_ty = interpreter.operand_stack.pop_ty()?;
-                match ref_ty {
-                    Type::MutableReference(inner) => {
-                        if *inner == val_ty {
-                            check_ability(inner.abilities()?.has_drop())?;
-                        } else {
-                            return Err(PartialVMError::new(
-                                StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR,
-                            )
-                            .with_message(
-                                "WriteRef tried to write references of different types".to_string(),
-                            ));
-                        }
-                    },
-                    _ => {
-                        return Err(PartialVMError::new(
-                            StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR,
-                        )
-                        .with_message(
-                            "WriteRef expecting a value of mutable reference type".to_string(),
-                        ))
-                    },
-                }
+                mut_ref_ty.paranoid_write_ref(&val_ty)?;
             },
             Bytecode::CastU8 => {
                 interpreter.operand_stack.pop_ty()?;
-                interpreter.operand_stack.push_ty(Type::U8)?;
+                let u8_ty = ty_builder.create_u8_ty();
+                interpreter.operand_stack.push_ty(u8_ty)?;
             },
             Bytecode::CastU16 => {
                 interpreter.operand_stack.pop_ty()?;
-                interpreter.operand_stack.push_ty(Type::U16)?;
+                let u16_ty = ty_builder.create_u16_ty();
+                interpreter.operand_stack.push_ty(u16_ty)?;
             },
             Bytecode::CastU32 => {
                 interpreter.operand_stack.pop_ty()?;
-                interpreter.operand_stack.push_ty(Type::U32)?;
+                let u32_ty = ty_builder.create_u32_ty();
+                interpreter.operand_stack.push_ty(u32_ty)?;
             },
             Bytecode::CastU64 => {
                 interpreter.operand_stack.pop_ty()?;
-                interpreter.operand_stack.push_ty(Type::U64)?;
+                let u64_ty = ty_builder.create_u64_ty();
+                interpreter.operand_stack.push_ty(u64_ty)?;
             },
             Bytecode::CastU128 => {
                 interpreter.operand_stack.pop_ty()?;
-                interpreter.operand_stack.push_ty(Type::U128)?;
+                let u128_ty = ty_builder.create_u128_ty();
+                interpreter.operand_stack.push_ty(u128_ty)?;
             },
             Bytecode::CastU256 => {
                 interpreter.operand_stack.pop_ty()?;
-                interpreter.operand_stack.push_ty(Type::U256)?;
+                let u256_ty = ty_builder.create_u256_ty();
+                interpreter.operand_stack.push_ty(u256_ty)?;
             },
             Bytecode::Add
             | Bytecode::Sub
@@ -1908,229 +2002,258 @@ impl Frame {
             | Bytecode::Xor
             | Bytecode::Or
             | Bytecode::And => {
-                let lhs = interpreter.operand_stack.pop_ty()?;
-                let rhs = interpreter.operand_stack.pop_ty()?;
-                lhs.check_eq(&rhs)?;
-                interpreter.operand_stack.push_ty(lhs)?;
+                let rhs_ty = interpreter.operand_stack.pop_ty()?;
+                let lhs_ty = interpreter.operand_stack.pop_ty()?;
+                rhs_ty.paranoid_check_eq(&lhs_ty)?;
+                interpreter.operand_stack.push_ty(rhs_ty)?;
             },
             Bytecode::Shl | Bytecode::Shr => {
-                interpreter.operand_stack.pop_ty()?;
-                let rhs = interpreter.operand_stack.pop_ty()?;
-                interpreter.operand_stack.push_ty(rhs)?;
+                let _rhs = interpreter.operand_stack.pop_ty()?;
+                let lhs = interpreter.operand_stack.pop_ty()?;
+                interpreter.operand_stack.push_ty(lhs)?;
             },
             Bytecode::Lt | Bytecode::Le | Bytecode::Gt | Bytecode::Ge => {
-                let lhs = interpreter.operand_stack.pop_ty()?;
-                let rhs = interpreter.operand_stack.pop_ty()?;
-                lhs.check_eq(&rhs)?;
-                interpreter.operand_stack.push_ty(Type::Bool)?;
+                let rhs_ty = interpreter.operand_stack.pop_ty()?;
+                let lhs_ty = interpreter.operand_stack.pop_ty()?;
+                rhs_ty.paranoid_check_eq(&lhs_ty)?;
+
+                let bool_ty = ty_builder.create_bool_ty();
+                interpreter.operand_stack.push_ty(bool_ty)?;
             },
             Bytecode::Eq | Bytecode::Neq => {
-                let lhs = interpreter.operand_stack.pop_ty()?;
-                let rhs = interpreter.operand_stack.pop_ty()?;
-                if lhs != rhs {
-                    return Err(
-                        PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
-                            .with_message(
-                                "Integer binary operation expecting values of same type"
-                                    .to_string(),
-                            ),
-                    );
-                }
-                check_ability(lhs.abilities()?.has_drop())?;
-                interpreter.operand_stack.push_ty(Type::Bool)?;
+                let rhs_ty = interpreter.operand_stack.pop_ty()?;
+                let lhs_ty = interpreter.operand_stack.pop_ty()?;
+                rhs_ty.paranoid_check_eq(&lhs_ty)?;
+                rhs_ty.paranoid_check_has_ability(Ability::Drop)?;
+
+                let bool_ty = ty_builder.create_bool_ty();
+                interpreter.operand_stack.push_ty(bool_ty)?;
             },
             Bytecode::MutBorrowGlobal(idx) => {
                 interpreter
                     .operand_stack
                     .pop_ty()?
-                    .check_eq(&Type::Address)?;
-                let ty = resolver.get_struct_type(*idx)?;
-                check_ability(ty.abilities()?.has_key())?;
-                interpreter
-                    .operand_stack
-                    .push_ty(Type::MutableReference(Box::new(ty)))?;
+                    .paranoid_check_is_address_ty()?;
+                let struct_ty = resolver.get_struct_ty(*idx);
+                struct_ty.paranoid_check_has_ability(Ability::Key)?;
+
+                let struct_mut_ref_ty = ty_builder.create_ref_ty(&struct_ty, true)?;
+                interpreter.operand_stack.push_ty(struct_mut_ref_ty)?;
             },
             Bytecode::ImmBorrowGlobal(idx) => {
                 interpreter
                     .operand_stack
                     .pop_ty()?
-                    .check_eq(&Type::Address)?;
-                let ty = resolver.get_struct_type(*idx)?;
-                check_ability(ty.abilities()?.has_key())?;
-                interpreter
-                    .operand_stack
-                    .push_ty(Type::Reference(Box::new(ty)))?;
+                    .paranoid_check_is_address_ty()?;
+                let struct_ty = resolver.get_struct_ty(*idx);
+                struct_ty.paranoid_check_has_ability(Ability::Key)?;
+
+                let struct_ref_ty = ty_builder.create_ref_ty(&struct_ty, false)?;
+                interpreter.operand_stack.push_ty(struct_ref_ty)?;
             },
             Bytecode::MutBorrowGlobalGeneric(idx) => {
                 interpreter
                     .operand_stack
                     .pop_ty()?
-                    .check_eq(&Type::Address)?;
-                let ty = ty_cache.get_struct_type(*idx, resolver, ty_args)?.0.clone();
-                check_ability(ty.abilities()?.has_key())?;
-                interpreter
-                    .operand_stack
-                    .push_ty(Type::MutableReference(Box::new(ty)))?;
+                    .paranoid_check_is_address_ty()?;
+                let struct_ty = ty_cache.get_struct_type(*idx, resolver, ty_args)?.0;
+                struct_ty.paranoid_check_has_ability(Ability::Key)?;
+
+                let struct_mut_ref_ty = ty_builder.create_ref_ty(struct_ty, true)?;
+                interpreter.operand_stack.push_ty(struct_mut_ref_ty)?;
             },
             Bytecode::ImmBorrowGlobalGeneric(idx) => {
                 interpreter
                     .operand_stack
                     .pop_ty()?
-                    .check_eq(&Type::Address)?;
-                let ty = ty_cache.get_struct_type(*idx, resolver, ty_args)?.0.clone();
-                check_ability(ty.abilities()?.has_key())?;
-                interpreter
-                    .operand_stack
-                    .push_ty(Type::Reference(Box::new(ty)))?;
+                    .paranoid_check_is_address_ty()?;
+                let struct_ty = ty_cache.get_struct_type(*idx, resolver, ty_args)?.0;
+                struct_ty.paranoid_check_has_ability(Ability::Key)?;
+
+                let struct_ref_ty = ty_builder.create_ref_ty(struct_ty, false)?;
+                interpreter.operand_stack.push_ty(struct_ref_ty)?;
             },
             Bytecode::Exists(_) | Bytecode::ExistsGeneric(_) => {
                 interpreter
                     .operand_stack
                     .pop_ty()?
-                    .check_eq(&Type::Address)?;
-                interpreter.operand_stack.push_ty(Type::Bool)?;
+                    .paranoid_check_is_address_ty()?;
+
+                let bool_ty = ty_builder.create_bool_ty();
+                interpreter.operand_stack.push_ty(bool_ty)?;
             },
             Bytecode::MoveTo(idx) => {
                 let ty = interpreter.operand_stack.pop_ty()?;
                 interpreter
                     .operand_stack
                     .pop_ty()?
-                    .check_eq(&Type::Reference(Box::new(Type::Signer)))?;
-                ty.check_eq(&resolver.get_struct_type(*idx)?)?;
-                check_ability(ty.abilities()?.has_key())?;
+                    .paranoid_check_is_signer_ref_ty()?;
+                ty.paranoid_check_eq(&resolver.get_struct_ty(*idx))?;
+                ty.paranoid_check_has_ability(Ability::Key)?;
             },
             Bytecode::MoveToGeneric(idx) => {
                 let ty = interpreter.operand_stack.pop_ty()?;
                 interpreter
                     .operand_stack
                     .pop_ty()?
-                    .check_eq(&Type::Reference(Box::new(Type::Signer)))?;
-                ty.check_eq(ty_cache.get_struct_type(*idx, resolver, ty_args)?.0)?;
-                check_ability(ty.abilities()?.has_key())?;
+                    .paranoid_check_is_signer_ref_ty()?;
+                ty.paranoid_check_eq(ty_cache.get_struct_type(*idx, resolver, ty_args)?.0)?;
+                ty.paranoid_check_has_ability(Ability::Key)?;
             },
             Bytecode::MoveFrom(idx) => {
                 interpreter
                     .operand_stack
                     .pop_ty()?
-                    .check_eq(&Type::Address)?;
-                let ty = resolver.get_struct_type(*idx)?;
-                check_ability(ty.abilities()?.has_key())?;
+                    .paranoid_check_is_address_ty()?;
+                let ty = resolver.get_struct_ty(*idx);
+                ty.paranoid_check_has_ability(Ability::Key)?;
                 interpreter.operand_stack.push_ty(ty)?;
             },
             Bytecode::MoveFromGeneric(idx) => {
                 interpreter
                     .operand_stack
                     .pop_ty()?
-                    .check_eq(&Type::Address)?;
+                    .paranoid_check_is_address_ty()?;
                 let ty = ty_cache.get_struct_type(*idx, resolver, ty_args)?.0.clone();
-                check_ability(ty.abilities()?.has_key())?;
+                ty.paranoid_check_has_ability(Ability::Key)?;
                 interpreter.operand_stack.push_ty(ty)?;
             },
             Bytecode::FreezeRef => {
-                match interpreter.operand_stack.pop_ty()? {
-                    Type::MutableReference(ty) => {
-                        interpreter.operand_stack.push_ty(Type::Reference(ty))?
-                    },
-                    _ => {
-                        return Err(PartialVMError::new(
-                            StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR,
-                        )
-                        .with_message("FreezeRef expects a mutable reference".to_string()))
-                    },
-                };
+                let mut_ref_ty = interpreter.operand_stack.pop_ty()?;
+                let ref_ty = mut_ref_ty.paranoid_freeze_ref_ty()?;
+                interpreter.operand_stack.push_ty(ref_ty)?;
             },
             Bytecode::Nop => (),
             Bytecode::Not => {
-                interpreter.operand_stack.pop_ty()?.check_eq(&Type::Bool)?;
-                interpreter.operand_stack.push_ty(Type::Bool)?;
+                interpreter
+                    .operand_stack
+                    .pop_ty()?
+                    .paranoid_check_is_bool_ty()?;
+                let bool_ty = ty_builder.create_bool_ty();
+                interpreter.operand_stack.push_ty(bool_ty)?;
             },
             Bytecode::VecPack(si, num) => {
                 let (ty, _) = ty_cache.get_signature_index_type(*si, resolver, ty_args)?;
                 let elem_tys = interpreter.operand_stack.popn_tys(*num as u16)?;
                 for elem_ty in elem_tys.iter() {
-                    elem_ty.check_eq(ty)?;
+                    elem_ty.paranoid_check_eq(ty)?;
                 }
-                interpreter
-                    .operand_stack
-                    .push_ty(Type::Vector(triomphe::Arc::new(ty.clone())))?;
+
+                let vec_ty = ty_builder.create_vec_ty(ty)?;
+                interpreter.operand_stack.push_ty(vec_ty)?;
             },
             Bytecode::VecLen(si) => {
                 let (ty, _) = ty_cache.get_signature_index_type(*si, resolver, ty_args)?;
                 interpreter
                     .operand_stack
                     .pop_ty()?
-                    .check_vec_ref(ty, false)?;
-                interpreter.operand_stack.push_ty(Type::U64)?;
+                    .paranoid_check_is_vec_ref_ty(ty, false)?;
+
+                let u64_ty = ty_builder.create_u64_ty();
+                interpreter.operand_stack.push_ty(u64_ty)?;
             },
             Bytecode::VecImmBorrow(si) => {
                 let (ty, _) = ty_cache.get_signature_index_type(*si, resolver, ty_args)?;
-                interpreter.operand_stack.pop_ty()?.check_eq(&Type::U64)?;
-                let inner_ty = interpreter
+                interpreter
                     .operand_stack
                     .pop_ty()?
-                    .check_vec_ref(ty, false)?;
-                interpreter
+                    .paranoid_check_is_u64_ty()?;
+                let elem_ref_ty = interpreter
                     .operand_stack
-                    .push_ty(Type::Reference(Box::new(inner_ty)))?;
+                    .pop_ty()?
+                    .paranoid_check_and_get_vec_elem_ref_ty(ty, false)?;
+
+                interpreter.operand_stack.push_ty(elem_ref_ty)?;
             },
             Bytecode::VecMutBorrow(si) => {
                 let (ty, _) = ty_cache.get_signature_index_type(*si, resolver, ty_args)?;
-                interpreter.operand_stack.pop_ty()?.check_eq(&Type::U64)?;
-                let inner_ty = interpreter
+                interpreter
                     .operand_stack
                     .pop_ty()?
-                    .check_vec_ref(ty, true)?;
-                interpreter
+                    .paranoid_check_is_u64_ty()?;
+                let elem_ref_ty = interpreter
                     .operand_stack
-                    .push_ty(Type::MutableReference(Box::new(inner_ty)))?;
+                    .pop_ty()?
+                    .paranoid_check_and_get_vec_elem_ref_ty(ty, true)?;
+                interpreter.operand_stack.push_ty(elem_ref_ty)?;
             },
             Bytecode::VecPushBack(si) => {
                 let (ty, _) = ty_cache.get_signature_index_type(*si, resolver, ty_args)?;
-                interpreter.operand_stack.pop_ty()?.check_eq(ty)?;
+                interpreter.operand_stack.pop_ty()?.paranoid_check_eq(ty)?;
                 interpreter
                     .operand_stack
                     .pop_ty()?
-                    .check_vec_ref(ty, true)?;
+                    .paranoid_check_is_vec_ref_ty(ty, true)?;
             },
             Bytecode::VecPopBack(si) => {
                 let (ty, _) = ty_cache.get_signature_index_type(*si, resolver, ty_args)?;
-                let inner_ty = interpreter
+                let elem_ty = interpreter
                     .operand_stack
                     .pop_ty()?
-                    .check_vec_ref(ty, true)?;
-                interpreter.operand_stack.push_ty(inner_ty)?;
+                    .paranoid_check_and_get_vec_elem_ty(ty, true)?;
+                interpreter.operand_stack.push_ty(elem_ty)?;
             },
             Bytecode::VecUnpack(si, num) => {
-                let (ty, _) = ty_cache.get_signature_index_type(*si, resolver, ty_args)?;
+                let (expected_elem_ty, _) =
+                    ty_cache.get_signature_index_type(*si, resolver, ty_args)?;
                 let vec_ty = interpreter.operand_stack.pop_ty()?;
-                match vec_ty {
-                    Type::Vector(v) => {
-                        v.check_eq(ty)?;
-                        for _ in 0..*num {
-                            interpreter.operand_stack.push_ty(v.as_ref().clone())?;
-                        }
-                    },
-                    _ => {
-                        return Err(PartialVMError::new(
-                            StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR,
-                        )
-                        .with_message("VecUnpack expect a vector type".to_string()))
-                    },
-                };
+                vec_ty.paranoid_check_is_vec_ty(expected_elem_ty)?;
+                for _ in 0..*num {
+                    interpreter
+                        .operand_stack
+                        .push_ty(expected_elem_ty.clone())?;
+                }
             },
             Bytecode::VecSwap(si) => {
                 let (ty, _) = ty_cache.get_signature_index_type(*si, resolver, ty_args)?;
-                interpreter.operand_stack.pop_ty()?.check_eq(&Type::U64)?;
-                interpreter.operand_stack.pop_ty()?.check_eq(&Type::U64)?;
                 interpreter
                     .operand_stack
                     .pop_ty()?
-                    .check_vec_ref(ty, true)?;
+                    .paranoid_check_is_u64_ty()?;
+                interpreter
+                    .operand_stack
+                    .pop_ty()?
+                    .paranoid_check_is_u64_ty()?;
+                interpreter
+                    .operand_stack
+                    .pop_ty()?
+                    .paranoid_check_is_vec_ref_ty(ty, true)?;
             },
         }
         Ok(())
     }
 
+    fn verify_pack<'a>(
+        interpreter: &mut Interpreter,
+        field_count: u16,
+        field_tys: impl Iterator<Item = &'a Type>,
+        output_ty: Type,
+    ) -> PartialVMResult<()> {
+        let ability = output_ty.abilities()?;
+
+        // If the struct has a key ability, we expect all of its field to have store ability but not key ability.
+        let field_expected_abilities = if ability.has_key() {
+            ability
+                .remove(Ability::Key)
+                .union(AbilitySet::singleton(Ability::Store))
+        } else {
+            ability
+        };
+        for (ty, expected_ty) in interpreter
+            .operand_stack
+            .popn_tys(field_count)?
+            .into_iter()
+            .zip(field_tys)
+        {
+            // Fields ability should be a subset of the struct ability because abilities can be weakened but not the other direction.
+            // For example, it is ok to have a struct that doesn't have a copy capability where its field is a struct that has copy capability but not vice versa.
+            ty.paranoid_check_abilities(field_expected_abilities)?;
+            ty.paranoid_check_eq(expected_ty)?;
+        }
+
+        interpreter.operand_stack.push_ty(output_ty)
+    }
+
     fn execute_code_impl(
         &mut self,
         resolver: &Resolver,
@@ -2183,7 +2306,7 @@ impl Frame {
                     Self::pre_execution_type_stack_transition(
                         &self.local_tys,
                         &self.locals,
-                        self.ty_args(),
+                        self.function.ty_args(),
                         resolver,
                         interpreter,
                         instruction,
@@ -2284,10 +2407,7 @@ impl Frame {
                     Bytecode::MoveLoc(idx) => {
                         let local = self.locals.move_loc(
                             *idx as usize,
-                            resolver
-                                .loader()
-                                .vm_config()
-                                .enable_invariant_violation_check_in_swap_loc,
+                            resolver.loader().vm_config().check_invariant_in_swap_loc,
                         )?;
                         gas_meter.charge_move_loc(&local)?;
 
@@ -2299,10 +2419,7 @@ impl Frame {
                         self.locals.store_loc(
                             *idx as usize,
                             value_to_store,
-                            resolver
-                                .loader()
-                                .vm_config()
-                                .enable_invariant_violation_check_in_swap_loc,
+                            resolver.loader().vm_config().check_invariant_in_swap_loc,
                         )?;
                     },
                     Bytecode::Call(idx) => {
@@ -2341,15 +2458,19 @@ impl Frame {
                         //
                         //       This is a bit wasteful since the newly created types are
                         //       dropped immediately.
-                        let ((_, field_ty_count), (_, struct_ty_count)) = self
-                            .ty_cache
-                            .get_field_type_and_struct_type(*fi_idx, resolver, &self.ty_args)?;
+                        let ((_, field_ty_count), (_, struct_ty_count)) =
+                            self.ty_cache.get_field_type_and_struct_type(
+                                *fi_idx,
+                                resolver,
+                                self.function.ty_args(),
+                            )?;
                         gas_meter.charge_create_ty(struct_ty_count)?;
                         gas_meter.charge_create_ty(field_ty_count)?;
 
-                        let instr = match instruction {
-                            Bytecode::MutBorrowFieldGeneric(_) => S::MutBorrowFieldGeneric,
-                            _ => S::ImmBorrowFieldGeneric,
+                        let instr = if matches!(instruction, Bytecode::MutBorrowFieldGeneric(_)) {
+                            S::MutBorrowFieldGeneric
+                        } else {
+                            S::ImmBorrowFieldGeneric
                         };
                         gas_meter.charge_simple_instr(instr)?;
 
@@ -2359,9 +2480,67 @@ impl Frame {
                         let field_ref = reference.borrow_field(offset)?;
                         interpreter.operand_stack.push(field_ref)?;
                     },
+                    Bytecode::ImmBorrowVariantField(idx) | Bytecode::MutBorrowVariantField(idx) => {
+                        let instr = if matches!(instruction, Bytecode::MutBorrowVariantField(_)) {
+                            S::MutBorrowVariantField
+                        } else {
+                            S::ImmBorrowVariantField
+                        };
+                        gas_meter.charge_simple_instr(instr)?;
+
+                        let field_info = resolver.variant_field_info_at(*idx);
+                        let reference = interpreter.operand_stack.pop_as::<StructRef>()?;
+                        let field_ref = reference.borrow_variant_field(
+                            &field_info.variants,
+                            field_info.offset,
+                            &|v| {
+                                field_info
+                                    .definition_struct_type
+                                    .variant_name_for_message(v)
+                            },
+                        )?;
+                        interpreter.operand_stack.push(field_ref)?;
+                    },
+                    Bytecode::ImmBorrowVariantFieldGeneric(fi_idx)
+                    | Bytecode::MutBorrowVariantFieldGeneric(fi_idx) => {
+                        // TODO: Even though the types are not needed for execution, we still
+                        //       instantiate them for gas metering.
+                        //
+                        //       This is a bit wasteful since the newly created types are
+                        //       dropped immediately.
+                        let ((_, field_ty_count), (_, struct_ty_count)) =
+                            self.ty_cache.get_variant_field_type_and_struct_type(
+                                *fi_idx,
+                                resolver,
+                                self.function.ty_args(),
+                            )?;
+                        gas_meter.charge_create_ty(struct_ty_count)?;
+                        gas_meter.charge_create_ty(field_ty_count)?;
+
+                        let instr = match instruction {
+                            Bytecode::MutBorrowVariantFieldGeneric(_) => {
+                                S::MutBorrowVariantFieldGeneric
+                            },
+                            _ => S::ImmBorrowVariantFieldGeneric,
+                        };
+                        gas_meter.charge_simple_instr(instr)?;
+
+                        let field_info = resolver.variant_field_instantiation_info_at(*fi_idx);
+                        let reference = interpreter.operand_stack.pop_as::<StructRef>()?;
+                        let field_ref = reference.borrow_variant_field(
+                            &field_info.variants,
+                            field_info.offset,
+                            &|v| {
+                                field_info
+                                    .definition_struct_type
+                                    .variant_name_for_message(v)
+                            },
+                        )?;
+                        interpreter.operand_stack.push(field_ref)?;
+                    },
                     Bytecode::Pack(sd_idx) => {
                         let field_count = resolver.field_count(*sd_idx);
-                        let struct_type = resolver.get_struct_type(*sd_idx)?;
+                        let struct_type = resolver.get_struct_ty(*sd_idx);
                         check_depth_of_type(resolver, &struct_type)?;
                         gas_meter.charge_pack(
                             false,
@@ -2372,25 +2551,38 @@ impl Frame {
                             .operand_stack
                             .push(Value::struct_(Struct::pack(args)))?;
                     },
+                    Bytecode::PackVariant(idx) => {
+                        let info = resolver.get_struct_variant_at(*idx);
+                        let struct_type = resolver.create_struct_ty(&info.definition_struct_type);
+                        check_depth_of_type(resolver, &struct_type)?;
+                        gas_meter.charge_pack_variant(
+                            false,
+                            interpreter
+                                .operand_stack
+                                .last_n(info.field_count as usize)?,
+                        )?;
+                        let args = interpreter.operand_stack.popn(info.field_count)?;
+                        interpreter
+                            .operand_stack
+                            .push(Value::struct_(Struct::pack_variant(info.variant, args)))?;
+                    },
                     Bytecode::PackGeneric(si_idx) => {
                         // TODO: Even though the types are not needed for execution, we still
                         //       instantiate them for gas metering.
                         //
                         //       This is a bit wasteful since the newly created types are
                         //       dropped immediately.
-                        let field_tys = self.ty_cache.get_struct_fields_types(
-                            *si_idx,
-                            resolver,
-                            &self.ty_args,
-                        )?;
+                        let ty_args = self.function.ty_args();
+                        let field_tys = self
+                            .ty_cache
+                            .get_struct_fields_types(*si_idx, resolver, ty_args)?;
 
                         for (_, ty_count) in field_tys {
                             gas_meter.charge_create_ty(*ty_count)?;
                         }
 
                         let (ty, ty_count) =
-                            self.ty_cache
-                                .get_struct_type(*si_idx, resolver, &self.ty_args)?;
+                            self.ty_cache.get_struct_type(*si_idx, resolver, ty_args)?;
                         gas_meter.charge_create_ty(ty_count)?;
                         check_depth_of_type(resolver, ty)?;
 
@@ -2404,12 +2596,52 @@ impl Frame {
                             .operand_stack
                             .push(Value::struct_(Struct::pack(args)))?;
                     },
+                    Bytecode::PackVariantGeneric(si_idx) => {
+                        let ty_args = self.function.ty_args();
+                        let field_tys = self
+                            .ty_cache
+                            .get_struct_variant_fields_types(*si_idx, resolver, ty_args)?;
+
+                        for (_, ty_count) in field_tys {
+                            gas_meter.charge_create_ty(*ty_count)?;
+                        }
+
+                        let (ty, ty_count) = self
+                            .ty_cache
+                            .get_struct_variant_type(*si_idx, resolver, ty_args)?;
+                        gas_meter.charge_create_ty(ty_count)?;
+                        check_depth_of_type(resolver, ty)?;
+
+                        let info = resolver.get_struct_variant_instantiation_at(*si_idx);
+                        gas_meter.charge_pack_variant(
+                            true,
+                            interpreter
+                                .operand_stack
+                                .last_n(info.field_count as usize)?,
+                        )?;
+                        let args = interpreter.operand_stack.popn(info.field_count)?;
+                        interpreter
+                            .operand_stack
+                            .push(Value::struct_(Struct::pack_variant(info.variant, args)))?;
+                    },
                     Bytecode::Unpack(_sd_idx) => {
-                        let struct_ = interpreter.operand_stack.pop_as::<Struct>()?;
+                        let struct_value = interpreter.operand_stack.pop_as::<Struct>()?;
 
-                        gas_meter.charge_unpack(false, struct_.field_views())?;
+                        gas_meter.charge_unpack(false, struct_value.field_views())?;
 
-                        for value in struct_.unpack()? {
+                        for value in struct_value.unpack()? {
+                            interpreter.operand_stack.push(value)?;
+                        }
+                    },
+                    Bytecode::UnpackVariant(sd_idx) => {
+                        let struct_value = interpreter.operand_stack.pop_as::<Struct>()?;
+
+                        gas_meter.charge_unpack_variant(false, struct_value.field_views())?;
+
+                        let info = resolver.get_struct_variant_at(*sd_idx);
+                        for value in struct_value.unpack_variant(info.variant, &|v| {
+                            info.definition_struct_type.variant_name_for_message(v)
+                        })? {
                             interpreter.operand_stack.push(value)?;
                         }
                     },
@@ -2419,18 +2651,16 @@ impl Frame {
                         //
                         //       This is a bit wasteful since the newly created types are
                         //       dropped immediately.
-                        let ty_and_field_counts = self.ty_cache.get_struct_fields_types(
-                            *si_idx,
-                            resolver,
-                            &self.ty_args,
-                        )?;
+                        let ty_args = self.function.ty_args();
+                        let ty_and_field_counts = self
+                            .ty_cache
+                            .get_struct_fields_types(*si_idx, resolver, ty_args)?;
                         for (_, ty_count) in ty_and_field_counts {
                             gas_meter.charge_create_ty(*ty_count)?;
                         }
 
                         let (ty, ty_count) =
-                            self.ty_cache
-                                .get_struct_type(*si_idx, resolver, &self.ty_args)?;
+                            self.ty_cache.get_struct_type(*si_idx, resolver, ty_args)?;
                         gas_meter.charge_create_ty(ty_count)?;
 
                         check_depth_of_type(resolver, ty)?;
@@ -2446,6 +2676,61 @@ impl Frame {
                             interpreter.operand_stack.push(value)?;
                         }
                     },
+                    Bytecode::UnpackVariantGeneric(si_idx) => {
+                        let ty_args = self.function.ty_args();
+                        let ty_and_field_counts = self
+                            .ty_cache
+                            .get_struct_variant_fields_types(*si_idx, resolver, ty_args)?;
+                        for (_, ty_count) in ty_and_field_counts {
+                            gas_meter.charge_create_ty(*ty_count)?;
+                        }
+
+                        let (ty, ty_count) = self
+                            .ty_cache
+                            .get_struct_variant_type(*si_idx, resolver, ty_args)?;
+                        gas_meter.charge_create_ty(ty_count)?;
+
+                        check_depth_of_type(resolver, ty)?;
+
+                        let struct_ = interpreter.operand_stack.pop_as::<Struct>()?;
+
+                        gas_meter.charge_unpack_variant(true, struct_.field_views())?;
+
+                        let info = resolver.get_struct_variant_instantiation_at(*si_idx);
+                        for value in struct_.unpack_variant(info.variant, &|v| {
+                            info.definition_struct_type.variant_name_for_message(v)
+                        })? {
+                            interpreter.operand_stack.push(value)?;
+                        }
+                    },
+                    Bytecode::TestVariant(sd_idx) => {
+                        let reference = interpreter.operand_stack.pop_as::<StructRef>()?;
+                        gas_meter.charge_simple_instr(S::TestVariant)?;
+                        let info = resolver.get_struct_variant_at(*sd_idx);
+                        interpreter
+                            .operand_stack
+                            .push(reference.test_variant(info.variant)?)?;
+                    },
+                    Bytecode::TestVariantGeneric(sd_idx) => {
+                        // TODO: Even though the types are not needed for execution, we still
+                        //       instantiate them for gas metering.
+                        //
+                        //       This is a bit wasteful since the newly created types are
+                        //       dropped immediately.
+                        let (_, struct_ty_count) = self.ty_cache.get_struct_variant_type(
+                            *sd_idx,
+                            resolver,
+                            self.function.ty_args(),
+                        )?;
+                        gas_meter.charge_create_ty(struct_ty_count)?;
+
+                        let reference = interpreter.operand_stack.pop_as::<StructRef>()?;
+                        gas_meter.charge_simple_instr(S::TestVariantGeneric)?;
+                        let info = resolver.get_struct_variant_instantiation_at(*sd_idx);
+                        interpreter
+                            .operand_stack
+                            .push(reference.test_variant(info.variant)?)?;
+                    },
                     Bytecode::ReadRef => {
                         let reference = interpreter.operand_stack.pop_as::<Reference>()?;
                         gas_meter.charge_read_ref(reference.value_view())?;
@@ -2580,7 +2865,7 @@ impl Frame {
                             .with_sub_status(error_code)
                             .with_message(format!(
                                 "{} at offset {}",
-                                self.function.pretty_string(),
+                                self.function.name_as_pretty_string(),
                                 self.pc,
                             ));
                         return Err(error);
@@ -2604,7 +2889,7 @@ impl Frame {
                     Bytecode::MutBorrowGlobal(sd_idx) | Bytecode::ImmBorrowGlobal(sd_idx) => {
                         let is_mut = matches!(instruction, Bytecode::MutBorrowGlobal(_));
                         let addr = interpreter.operand_stack.pop_as::<AccountAddress>()?;
-                        let ty = resolver.get_struct_type(*sd_idx)?;
+                        let ty = resolver.get_struct_ty(*sd_idx);
                         interpreter.borrow_global(
                             is_mut,
                             false,
@@ -2620,9 +2905,11 @@ impl Frame {
                     | Bytecode::ImmBorrowGlobalGeneric(si_idx) => {
                         let is_mut = matches!(instruction, Bytecode::MutBorrowGlobalGeneric(_));
                         let addr = interpreter.operand_stack.pop_as::<AccountAddress>()?;
-                        let (ty, ty_count) =
-                            self.ty_cache
-                                .get_struct_type(*si_idx, resolver, &self.ty_args)?;
+                        let (ty, ty_count) = self.ty_cache.get_struct_type(
+                            *si_idx,
+                            resolver,
+                            self.function.ty_args(),
+                        )?;
                         gas_meter.charge_create_ty(ty_count)?;
                         interpreter.borrow_global(
                             is_mut,
@@ -2637,7 +2924,7 @@ impl Frame {
                     },
                     Bytecode::Exists(sd_idx) => {
                         let addr = interpreter.operand_stack.pop_as::<AccountAddress>()?;
-                        let ty = resolver.get_struct_type(*sd_idx)?;
+                        let ty = resolver.get_struct_ty(*sd_idx);
                         interpreter.exists(
                             false,
                             resolver.loader(),
@@ -2650,9 +2937,11 @@ impl Frame {
                     },
                     Bytecode::ExistsGeneric(si_idx) => {
                         let addr = interpreter.operand_stack.pop_as::<AccountAddress>()?;
-                        let (ty, ty_count) =
-                            self.ty_cache
-                                .get_struct_type(*si_idx, resolver, &self.ty_args)?;
+                        let (ty, ty_count) = self.ty_cache.get_struct_type(
+                            *si_idx,
+                            resolver,
+                            self.function.ty_args(),
+                        )?;
                         gas_meter.charge_create_ty(ty_count)?;
                         interpreter.exists(
                             true,
@@ -2666,7 +2955,7 @@ impl Frame {
                     },
                     Bytecode::MoveFrom(sd_idx) => {
                         let addr = interpreter.operand_stack.pop_as::<AccountAddress>()?;
-                        let ty = resolver.get_struct_type(*sd_idx)?;
+                        let ty = resolver.get_struct_ty(*sd_idx);
                         interpreter.move_from(
                             false,
                             resolver.loader(),
@@ -2679,9 +2968,11 @@ impl Frame {
                     },
                     Bytecode::MoveFromGeneric(si_idx) => {
                         let addr = interpreter.operand_stack.pop_as::<AccountAddress>()?;
-                        let (ty, ty_count) =
-                            self.ty_cache
-                                .get_struct_type(*si_idx, resolver, &self.ty_args)?;
+                        let (ty, ty_count) = self.ty_cache.get_struct_type(
+                            *si_idx,
+                            resolver,
+                            self.function.ty_args(),
+                        )?;
                         gas_meter.charge_create_ty(ty_count)?;
                         interpreter.move_from(
                             true,
@@ -2701,7 +2992,7 @@ impl Frame {
                             .value_as::<Reference>()?
                             .read_ref()?
                             .value_as::<AccountAddress>()?;
-                        let ty = resolver.get_struct_type(*sd_idx)?;
+                        let ty = resolver.get_struct_ty(*sd_idx);
                         interpreter.move_to(
                             false,
                             resolver.loader(),
@@ -2721,9 +3012,11 @@ impl Frame {
                             .value_as::<Reference>()?
                             .read_ref()?
                             .value_as::<AccountAddress>()?;
-                        let (ty, ty_count) =
-                            self.ty_cache
-                                .get_struct_type(*si_idx, resolver, &self.ty_args)?;
+                        let (ty, ty_count) = self.ty_cache.get_struct_type(
+                            *si_idx,
+                            resolver,
+                            self.function.ty_args(),
+                        )?;
                         gas_meter.charge_create_ty(ty_count)?;
                         interpreter.move_to(
                             true,
@@ -2750,9 +3043,11 @@ impl Frame {
                         gas_meter.charge_simple_instr(S::Nop)?;
                     },
                     Bytecode::VecPack(si, num) => {
-                        let (ty, ty_count) =
-                            self.ty_cache
-                                .get_signature_index_type(*si, resolver, &self.ty_args)?;
+                        let (ty, ty_count) = self.ty_cache.get_signature_index_type(
+                            *si,
+                            resolver,
+                            self.function.ty_args(),
+                        )?;
                         gas_meter.charge_create_ty(ty_count)?;
                         check_depth_of_type(resolver, ty)?;
                         gas_meter.charge_vec_pack(
@@ -2765,9 +3060,11 @@ impl Frame {
                     },
                     Bytecode::VecLen(si) => {
                         let vec_ref = interpreter.operand_stack.pop_as::<VectorRef>()?;
-                        let (ty, ty_count) =
-                            self.ty_cache
-                                .get_signature_index_type(*si, resolver, &self.ty_args)?;
+                        let (ty, ty_count) = self.ty_cache.get_signature_index_type(
+                            *si,
+                            resolver,
+                            self.function.ty_args(),
+                        )?;
                         gas_meter.charge_create_ty(ty_count)?;
                         gas_meter.charge_vec_len(TypeWithLoader {
                             ty,
@@ -2779,9 +3076,11 @@ impl Frame {
                     Bytecode::VecImmBorrow(si) => {
                         let idx = interpreter.operand_stack.pop_as::<u64>()? as usize;
                         let vec_ref = interpreter.operand_stack.pop_as::<VectorRef>()?;
-                        let (ty, ty_count) =
-                            self.ty_cache
-                                .get_signature_index_type(*si, resolver, &self.ty_args)?;
+                        let (ty, ty_count) = self.ty_cache.get_signature_index_type(
+                            *si,
+                            resolver,
+                            self.function.ty_args(),
+                        )?;
                         gas_meter.charge_create_ty(ty_count)?;
                         let res = vec_ref.borrow_elem(idx, ty);
                         gas_meter.charge_vec_borrow(false, make_ty!(ty), res.is_ok())?;
@@ -2790,9 +3089,11 @@ impl Frame {
                     Bytecode::VecMutBorrow(si) => {
                         let idx = interpreter.operand_stack.pop_as::<u64>()? as usize;
                         let vec_ref = interpreter.operand_stack.pop_as::<VectorRef>()?;
-                        let (ty, ty_count) =
-                            self.ty_cache
-                                .get_signature_index_type(*si, resolver, &self.ty_args)?;
+                        let (ty, ty_count) = self.ty_cache.get_signature_index_type(
+                            *si,
+                            resolver,
+                            self.function.ty_args(),
+                        )?;
                         gas_meter.charge_create_ty(ty_count)?;
                         let res = vec_ref.borrow_elem(idx, ty);
                         gas_meter.charge_vec_borrow(true, make_ty!(ty), res.is_ok())?;
@@ -2801,18 +3102,22 @@ impl Frame {
                     Bytecode::VecPushBack(si) => {
                         let elem = interpreter.operand_stack.pop()?;
                         let vec_ref = interpreter.operand_stack.pop_as::<VectorRef>()?;
-                        let (ty, ty_count) =
-                            self.ty_cache
-                                .get_signature_index_type(*si, resolver, &self.ty_args)?;
+                        let (ty, ty_count) = self.ty_cache.get_signature_index_type(
+                            *si,
+                            resolver,
+                            self.function.ty_args(),
+                        )?;
                         gas_meter.charge_create_ty(ty_count)?;
                         gas_meter.charge_vec_push_back(make_ty!(ty), &elem)?;
                         vec_ref.push_back(elem, ty)?;
                     },
                     Bytecode::VecPopBack(si) => {
                         let vec_ref = interpreter.operand_stack.pop_as::<VectorRef>()?;
-                        let (ty, ty_count) =
-                            self.ty_cache
-                                .get_signature_index_type(*si, resolver, &self.ty_args)?;
+                        let (ty, ty_count) = self.ty_cache.get_signature_index_type(
+                            *si,
+                            resolver,
+                            self.function.ty_args(),
+                        )?;
                         gas_meter.charge_create_ty(ty_count)?;
                         let res = vec_ref.pop(ty);
                         gas_meter.charge_vec_pop_back(make_ty!(ty), res.as_ref().ok())?;
@@ -2820,9 +3125,11 @@ impl Frame {
                     },
                     Bytecode::VecUnpack(si, num) => {
                         let vec_val = interpreter.operand_stack.pop_as::<Vector>()?;
-                        let (ty, ty_count) =
-                            self.ty_cache
-                                .get_signature_index_type(*si, resolver, &self.ty_args)?;
+                        let (ty, ty_count) = self.ty_cache.get_signature_index_type(
+                            *si,
+                            resolver,
+                            self.function.ty_args(),
+                        )?;
                         gas_meter.charge_create_ty(ty_count)?;
                         gas_meter.charge_vec_unpack(
                             make_ty!(ty),
@@ -2838,9 +3145,11 @@ impl Frame {
                         let idx2 = interpreter.operand_stack.pop_as::<u64>()? as usize;
                         let idx1 = interpreter.operand_stack.pop_as::<u64>()? as usize;
                         let vec_ref = interpreter.operand_stack.pop_as::<VectorRef>()?;
-                        let (ty, ty_count) =
-                            self.ty_cache
-                                .get_signature_index_type(*si, resolver, &self.ty_args)?;
+                        let (ty, ty_count) = self.ty_cache.get_signature_index_type(
+                            *si,
+                            resolver,
+                            self.function.ty_args(),
+                        )?;
                         gas_meter.charge_create_ty(ty_count)?;
                         gas_meter.charge_vec_swap(make_ty!(ty))?;
                         vec_ref.swap(idx1, idx2, ty)?;
@@ -2849,7 +3158,7 @@ impl Frame {
                 if interpreter.paranoid_type_checks {
                     Self::post_execution_type_stack_transition(
                         &self.local_tys,
-                        &self.ty_args,
+                        self.function.ty_args(),
                         resolver,
                         interpreter,
                         &mut self.ty_cache,
@@ -2878,10 +3187,6 @@ impl Frame {
         }
     }
 
-    fn ty_args(&self) -> &[Type] {
-        &self.ty_args
-    }
-
     fn resolver<'a>(
         &self,
         loader: &'a Loader,
diff --git a/third_party/move/move-vm/runtime/src/lib.rs b/third_party/move/move-vm/runtime/src/lib.rs
index bdb8b68373ecf..770862ddf2fbb 100644
--- a/third_party/move/move-vm/runtime/src/lib.rs
+++ b/third_party/move/move-vm/runtime/src/lib.rs
@@ -3,6 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #![forbid(unsafe_code)]
+#![deny(deprecated)]
 
 //! The core Move VM logic.
 //!
@@ -29,3 +30,5 @@ pub mod module_traversal;
 mod debug;
 
 mod access_control;
+
+pub use loader::LoadedFunction;
diff --git a/third_party/move/move-vm/runtime/src/loader/function.rs b/third_party/move/move-vm/runtime/src/loader/function.rs
index 8430e9d6468aa..8ce692e9d87bf 100644
--- a/third_party/move/move-vm/runtime/src/loader/function.rs
+++ b/third_party/move/move-vm/runtime/src/loader/function.rs
@@ -2,10 +2,10 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
-use super::ModuleStorageAdapter;
 use crate::{
     loader::{
-        access_specifier_loader::load_access_specifier, Loader, Module, Resolver, ScriptHash,
+        access_specifier_loader::load_access_specifier, Loader, Module, ModuleStorageAdapter,
+        Resolver, Script,
     },
     native_functions::{NativeFunction, NativeFunctions, UnboxedNativeFunction},
 };
@@ -22,43 +22,143 @@ use move_vm_types::loaded_data::{
 };
 use std::{fmt::Debug, sync::Arc};
 
-// A simple wrapper for the "owner" of the function (Module or Script)
-#[derive(Clone, Debug)]
-pub(crate) enum Scope {
-    Module(ModuleId),
-    Script(ScriptHash),
-}
-
-// A runtime function representation.
+/// A runtime function definition representation.
 pub struct Function {
     #[allow(unused)]
     pub(crate) file_format_version: u32,
     pub(crate) index: FunctionDefinitionIndex,
     pub(crate) code: Vec<Bytecode>,
-    pub ty_param_abilities: Vec<AbilitySet>,
+    pub(crate) ty_param_abilities: Vec<AbilitySet>,
     // TODO: Make `native` and `def_is_native` become an enum.
     pub(crate) native: Option<NativeFunction>,
-    pub(crate) def_is_native: bool,
-    pub def_is_friend_or_private: bool,
-    pub(crate) scope: Scope,
+    pub(crate) is_native: bool,
+    pub(crate) is_friend_or_private: bool,
+    pub(crate) is_entry: bool,
     pub(crate) name: Identifier,
-    pub return_tys: Vec<Type>,
+    pub(crate) return_tys: Vec<Type>,
     pub(crate) local_tys: Vec<Type>,
-    pub param_tys: Vec<Type>,
+    pub(crate) param_tys: Vec<Type>,
     pub(crate) access_specifier: AccessSpecifier,
 }
 
-// This struct must be treated as an identifier for a function and not somehow relying on
-// the internal implementation.
+/// For loaded function representation, specifies the owner: a script or a module.
+pub(crate) enum LoadedFunctionOwner {
+    Script(Arc<Script>),
+    Module(Arc<Module>),
+}
+
+/// A loaded runtime function representation along with type arguments used to instantiate it.
 pub struct LoadedFunction {
-    pub(crate) module: Arc<Module>,
+    pub(crate) owner: LoadedFunctionOwner,
+    // A set of verified type arguments provided for this definition. If
+    // function is not generic, an empty vector.
+    pub(crate) ty_args: Vec<Type>,
+    // Definition of the loaded function.
     pub(crate) function: Arc<Function>,
 }
 
-impl std::fmt::Debug for Function {
+impl LoadedFunction {
+    /// Returns type arguments used to instantiate the loaded function.
+    pub fn ty_args(&self) -> &[Type] {
+        &self.ty_args
+    }
+
+    /// Returns the corresponding module id of this function, i.e., its address and module name.
+    pub fn module_id(&self) -> Option<&ModuleId> {
+        match &self.owner {
+            LoadedFunctionOwner::Module(m) => Some(m.self_id()),
+            LoadedFunctionOwner::Script(_) => None,
+        }
+    }
+
+    /// Returns the name of this function.
+    pub fn name(&self) -> &str {
+        self.function.name()
+    }
+
+    /// Returns true if the loaded function has friend or private visibility.
+    pub fn is_friend_or_private(&self) -> bool {
+        self.function.is_friend_or_private()
+    }
+
+    /// Returns true if the loaded function is an entry function.
+    pub(crate) fn is_entry(&self) -> bool {
+        self.function.is_entry()
+    }
+
+    /// Returns parameter types from the function's definition signature.
+    pub fn param_tys(&self) -> &[Type] {
+        self.function.param_tys()
+    }
+
+    /// Returns return types from the function's definition signature.
+    pub fn return_tys(&self) -> &[Type] {
+        self.function.return_tys()
+    }
+
+    /// Returns abilities of type parameters from the function's definition signature.
+    pub fn ty_param_abilities(&self) -> &[AbilitySet] {
+        self.function.ty_param_abilities()
+    }
+
+    /// Returns types of locals, defined by this function.
+    pub fn local_tys(&self) -> &[Type] {
+        self.function.local_tys()
+    }
+
+    /// Returns true if this function is a native function, i.e. which does not contain
+    /// code and instead using the Rust implementation.
+    pub fn is_native(&self) -> bool {
+        self.function.is_native()
+    }
+
+    pub fn get_native(&self) -> PartialVMResult<&UnboxedNativeFunction> {
+        self.function.get_native()
+    }
+
+    pub(crate) fn index(&self) -> FunctionDefinitionIndex {
+        self.function.index
+    }
+
+    pub(crate) fn code(&self) -> &[Bytecode] {
+        &self.function.code
+    }
+
+    pub(crate) fn access_specifier(&self) -> &AccessSpecifier {
+        &self.function.access_specifier
+    }
+
+    pub(crate) fn name_as_pretty_string(&self) -> String {
+        match &self.owner {
+            LoadedFunctionOwner::Script(_) => "script::main".into(),
+            LoadedFunctionOwner::Module(m) => format!(
+                "0x{}::{}::{}",
+                m.module().self_addr().to_hex(),
+                m.module().self_name().as_str(),
+                self.function.name()
+            ),
+        }
+    }
+
+    pub(crate) fn get_resolver<'a>(
+        &self,
+        loader: &'a Loader,
+        module_store: &'a ModuleStorageAdapter,
+    ) -> Resolver<'a> {
+        match &self.owner {
+            LoadedFunctionOwner::Module(module) => {
+                Resolver::for_module(loader, module_store, module.clone())
+            },
+            LoadedFunctionOwner::Script(script) => {
+                Resolver::for_script(loader, module_store, script.clone())
+            },
+        }
+    }
+}
+
+impl Debug for Function {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> Result<(), std::fmt::Error> {
         f.debug_struct("Function")
-            .field("scope", &self.scope)
             .field("name", &self.name)
             .finish()
     }
@@ -76,23 +176,23 @@ impl Function {
         let handle = module.function_handle_at(def.function);
         let name = module.identifier_at(handle.name).to_owned();
         let module_id = module.self_id();
-        let def_is_friend_or_private = match def.visibility {
+
+        let is_friend_or_private = match def.visibility {
             Visibility::Friend | Visibility::Private => true,
             Visibility::Public => false,
         };
-        let (native, def_is_native) = if def.is_native() {
-            (
-                natives.resolve(
-                    module_id.address(),
-                    module_id.name().as_str(),
-                    name.as_str(),
-                ),
-                true,
-            )
+        let is_entry = def.is_entry;
+
+        let (native, is_native) = if def.is_native() {
+            let native = natives.resolve(
+                module_id.address(),
+                module_id.name().as_str(),
+                name.as_str(),
+            );
+            (native, true)
         } else {
             (None, false)
         };
-        let scope = Scope::Module(module_id);
         // Native functions do not have a code unit
         let code = match &def.code {
             Some(code) => code.code.clone(),
@@ -122,9 +222,9 @@ impl Function {
             code,
             ty_param_abilities,
             native,
-            def_is_native,
-            def_is_friend_or_private,
-            scope,
+            is_native,
+            is_friend_or_private,
+            is_entry,
             name,
             local_tys,
             return_tys,
@@ -138,41 +238,7 @@ impl Function {
         self.file_format_version
     }
 
-    pub(crate) fn module_id(&self) -> Option<&ModuleId> {
-        match &self.scope {
-            Scope::Module(module_id) => Some(module_id),
-            Scope::Script(_) => None,
-        }
-    }
-
-    pub(crate) fn index(&self) -> FunctionDefinitionIndex {
-        self.index
-    }
-
-    pub(crate) fn get_resolver<'a>(
-        &self,
-        loader: &'a Loader,
-        module_store: &'a ModuleStorageAdapter,
-    ) -> Resolver<'a> {
-        match &self.scope {
-            Scope::Module(module_id) => {
-                let module = module_store
-                    .module_at(module_id)
-                    .expect("ModuleId on Function must exist");
-                Resolver::for_module(loader, module_store, module)
-            },
-            Scope::Script(script_hash) => {
-                let script = loader.get_script(script_hash);
-                Resolver::for_script(loader, module_store, script)
-            },
-        }
-    }
-
-    pub(crate) fn local_count(&self) -> usize {
-        self.local_tys.len()
-    }
-
-    pub(crate) fn param_count(&self) -> usize {
+    pub fn param_count(&self) -> usize {
         self.param_tys.len()
     }
 
@@ -180,11 +246,7 @@ impl Function {
         self.name.as_str()
     }
 
-    pub(crate) fn code(&self) -> &[Bytecode] {
-        &self.code
-    }
-
-    pub(crate) fn ty_arg_abilities(&self) -> &[AbilitySet] {
+    pub fn ty_param_abilities(&self) -> &[AbilitySet] {
         &self.ty_param_abilities
     }
 
@@ -192,32 +254,24 @@ impl Function {
         &self.local_tys
     }
 
-    pub(crate) fn return_tys(&self) -> &[Type] {
+    pub fn return_tys(&self) -> &[Type] {
         &self.return_tys
     }
 
-    pub(crate) fn param_tys(&self) -> &[Type] {
+    pub fn param_tys(&self) -> &[Type] {
         &self.param_tys
     }
 
-    pub(crate) fn pretty_string(&self) -> String {
-        match &self.scope {
-            Scope::Script(_) => "Script::main".into(),
-            Scope::Module(id) => format!(
-                "0x{}::{}::{}",
-                id.address().to_hex(),
-                id.name().as_str(),
-                self.name.as_str()
-            ),
-        }
+    pub fn is_native(&self) -> bool {
+        self.is_native
     }
 
-    pub(crate) fn is_native(&self) -> bool {
-        self.def_is_native
+    pub fn is_friend_or_private(&self) -> bool {
+        self.is_friend_or_private
     }
 
-    pub(crate) fn is_friend_or_private(&self) -> bool {
-        self.def_is_friend_or_private
+    pub(crate) fn is_entry(&self) -> bool {
+        self.is_entry
     }
 
     pub(crate) fn get_native(&self) -> PartialVMResult<&UnboxedNativeFunction> {
diff --git a/third_party/move/move-vm/runtime/src/loader/mod.rs b/third_party/move/move-vm/runtime/src/loader/mod.rs
index f1603e2b219db..f785ec41b0c96 100644
--- a/third_party/move/move-vm/runtime/src/loader/mod.rs
+++ b/third_party/move/move-vm/runtime/src/loader/mod.rs
@@ -5,7 +5,6 @@
 use crate::{
     config::VMConfig, data_cache::TransactionDataCache, logging::expect_no_verification_errors,
     module_traversal::TraversalContext, native_functions::NativeFunctions,
-    session::LoadedFunctionInstantiation,
 };
 use hashbrown::Equivalent;
 use lazy_static::lazy_static;
@@ -13,7 +12,7 @@ use move_binary_format::{
     access::{ModuleAccess, ScriptAccess},
     errors::{verification_error, Location, PartialVMError, PartialVMResult, VMResult},
     file_format::{
-        AbilitySet, CompiledModule, CompiledScript, Constant, ConstantPoolIndex, FieldHandleIndex,
+        CompiledModule, CompiledScript, Constant, ConstantPoolIndex, FieldHandleIndex,
         FieldInstantiationIndex, FunctionHandleIndex, FunctionInstantiationIndex, SignatureIndex,
         StructDefInstantiationIndex, StructDefinitionIndex, StructFieldInformation, TableIndex,
         TypeParameterIndex,
@@ -51,8 +50,15 @@ mod modules;
 mod script;
 mod type_loader;
 
-pub(crate) use function::{Function, FunctionHandle, FunctionInstantiation, LoadedFunction, Scope};
+use crate::loader::modules::{StructVariantInfo, VariantFieldInfo};
+pub use function::LoadedFunction;
+pub(crate) use function::{Function, FunctionHandle, FunctionInstantiation, LoadedFunctionOwner};
 pub(crate) use modules::{Module, ModuleCache, ModuleStorage, ModuleStorageAdapter};
+use move_binary_format::file_format::{
+    StructVariantHandleIndex, StructVariantInstantiationIndex, VariantFieldHandleIndex,
+    VariantFieldInstantiationIndex, VariantIndex,
+};
+use move_vm_types::loaded_data::runtime_types::{StructLayout, TypeBuilder};
 pub(crate) use script::{Script, ScriptCache};
 use type_loader::intern_type;
 
@@ -228,6 +234,10 @@ impl Loader {
         &self.vm_config
     }
 
+    pub(crate) fn ty_builder(&self) -> &TypeBuilder {
+        &self.vm_config.ty_builder
+    }
+
     /// Flush this cache if it is marked as invalidated.
     pub(crate) fn flush_if_invalidated(&self) {
         let mut invalidated = self.invalidated.write();
@@ -294,14 +304,14 @@ impl Loader {
         ty_args: &[TypeTag],
         data_store: &mut TransactionDataCache,
         module_store: &ModuleStorageAdapter,
-    ) -> VMResult<(Arc<Function>, LoadedFunctionInstantiation)> {
+    ) -> VMResult<LoadedFunction> {
         // Retrieve or load the script.
         let mut sha3_256 = Sha3_256::new();
         sha3_256.update(script_blob);
         let hash_value: [u8; 32] = sha3_256.finalize().into();
 
         let mut scripts = self.scripts.write();
-        let (main, param_tys, return_tys) = match scripts.get(&hash_value) {
+        let script = match scripts.get(&hash_value) {
             Some(cached) => cached,
             None => {
                 let ver_script = self.deserialize_and_verify_script(
@@ -310,7 +320,7 @@ impl Loader {
                     data_store,
                     module_store,
                 )?;
-                let script = Script::new(ver_script, &hash_value, module_store, &self.name_cache)?;
+                let script = Script::new(ver_script, module_store, &self.name_cache)?;
                 scripts.insert(hash_value, script)
             },
         };
@@ -319,35 +329,21 @@ impl Loader {
             .iter()
             .map(|ty| self.load_type(ty, data_store, module_store))
             .collect::<VMResult<Vec<_>>>()?;
-        if self.vm_config.type_size_limit
-            && ty_args
-                .iter()
-                .map(|ty| self.count_type_nodes(ty))
-                .sum::<u64>()
-                > MAX_TYPE_INSTANTIATION_NODES
-        {
-            return Err(PartialVMError::new(StatusCode::TOO_MANY_TYPE_NODES)
-                .with_message(format!(
-                    "Too many type nodes when instantiating a type for script {}",
-                    &main.name
-                ))
-                .finish(Location::Script));
-        };
 
-        self.verify_ty_arg_abilities(main.ty_arg_abilities(), &ty_args)
-            .map_err(|e| {
-                e.with_message(format!(
-                    "Failed to verify type arguments for script {}",
-                    &main.name
-                ))
-                .finish(Location::Script)
-            })?;
-        let instantiation = LoadedFunctionInstantiation {
+        let main = script.entry_point();
+        Type::verify_ty_arg_abilities(main.ty_param_abilities(), &ty_args).map_err(|e| {
+            e.with_message(format!(
+                "Failed to verify type arguments for script {}",
+                main.name()
+            ))
+            .finish(Location::Script)
+        })?;
+
+        Ok(LoadedFunction {
+            owner: LoadedFunctionOwner::Script(script),
             ty_args,
-            param_tys,
-            return_tys,
-        };
-        Ok((main, instantiation))
+            function: main,
+        })
     }
 
     // The process of deserialization and verification is not and it must not be under lock.
@@ -363,39 +359,20 @@ impl Loader {
     ) -> VMResult<Arc<CompiledScript>> {
         let script = data_store.load_compiled_script_to_cache(script, hash_value)?;
 
-        match self.verify_script(&script) {
-            Ok(_) => {
-                // verify dependencies
-                let loaded_deps = script
-                    .immediate_dependencies()
-                    .into_iter()
-                    .map(|module_id| self.load_module(&module_id, data_store, module_store))
-                    .collect::<VMResult<_>>()?;
-                self.verify_script_dependencies(&script, loaded_deps)?;
-                Ok(script)
-            },
-            Err(err) => Err(err),
-        }
-    }
-
-    // Script verification steps.
-    // See `verify_module()` for module verification steps.
-    fn verify_script(&self, script: &CompiledScript) -> VMResult<()> {
-        fail::fail_point!("verifier-failpoint-3", |_| { Ok(()) });
-
-        move_bytecode_verifier::verify_script_with_config(&self.vm_config.verifier, script)
-    }
-
-    fn verify_script_dependencies(
-        &self,
-        script: &CompiledScript,
-        dependencies: Vec<Arc<Module>>,
-    ) -> VMResult<()> {
-        let mut deps = vec![];
-        for dep in &dependencies {
-            deps.push(dep.module());
-        }
-        dependencies::verify_script(script, deps)
+        // Verification:
+        //   - Local, using a bytecode verifier.
+        //   - Global, loading & verifying module dependencies.
+        move_bytecode_verifier::verify_script_with_config(
+            &self.vm_config.verifier_config,
+            script.as_ref(),
+        )?;
+        let loaded_deps = script
+            .immediate_dependencies()
+            .into_iter()
+            .map(|module_id| self.load_module(&module_id, data_store, module_store))
+            .collect::<VMResult<Vec<_>>>()?;
+        dependencies::verify_script(&script, loaded_deps.iter().map(|m| m.module()))?;
+        Ok(script)
     }
 
     //
@@ -409,15 +386,12 @@ impl Loader {
         function_name: &IdentStr,
         data_store: &mut TransactionDataCache,
         module_store: &ModuleStorageAdapter,
-    ) -> VMResult<(Arc<Module>, Arc<Function>, Vec<Type>, Vec<Type>)> {
-        let module = self.load_module(module_id, data_store, module_store)?;
-        let func = module_store
-            .resolve_function_by_name(function_name, module_id)
-            .map_err(|err| err.finish(Location::Undefined))?;
-
-        let param_tys = func.param_tys().to_vec();
-        let return_tys = func.return_tys().to_vec();
-        Ok((module, func, param_tys, return_tys))
+    ) -> VMResult<(Arc<Module>, Arc<Function>)> {
+        // Need to load the module first, before resolving it and the function.
+        self.load_module(module_id, data_store, module_store)?;
+        module_store
+            .resolve_module_and_function_by_name(module_id, function_name)
+            .map_err(|err| err.finish(Location::Undefined))
     }
 
     // Matches the actual returned type to the expected type, binding any type args to the
@@ -514,21 +488,21 @@ impl Loader {
         expected_return_type: &Type,
         data_store: &mut TransactionDataCache,
         module_store: &ModuleStorageAdapter,
-    ) -> VMResult<(LoadedFunction, LoadedFunctionInstantiation)> {
-        let (module, func, param_tys, return_tys) = self.load_function_without_type_args(
+    ) -> VMResult<LoadedFunction> {
+        let (module, function) = self.load_function_without_type_args(
             module_id,
             function_name,
             data_store,
             module_store,
         )?;
 
-        if return_tys.len() != 1 {
+        if function.return_tys().len() != 1 {
             // For functions that are marked constructor this should not happen.
             return Err(PartialVMError::new(StatusCode::ABORTED).finish(Location::Undefined));
         }
 
         let mut map = BTreeMap::new();
-        if !Self::match_return_type(&return_tys[0], expected_return_type, &mut map) {
+        if !Self::match_return_type(&function.return_tys()[0], expected_return_type, &mut map) {
             // For functions that are marked constructor this should not happen.
             return Err(
                 PartialVMError::new(StatusCode::INVALID_MAIN_FUNCTION_SIGNATURE)
@@ -538,7 +512,7 @@ impl Loader {
 
         // Construct the type arguments from the match
         let mut ty_args = vec![];
-        let num_ty_args = func.ty_arg_abilities().len();
+        let num_ty_args = function.ty_param_abilities().len();
         for i in 0..num_ty_args {
             if let Some(t) = map.get(&(i as u16)) {
                 ty_args.push((*t).clone());
@@ -552,24 +526,16 @@ impl Loader {
             }
         }
 
-        self.verify_ty_arg_abilities(func.ty_arg_abilities(), &ty_args)
+        Type::verify_ty_arg_abilities(function.ty_param_abilities(), &ty_args)
             .map_err(|e| e.finish(Location::Module(module_id.clone())))?;
 
-        let loaded = LoadedFunctionInstantiation {
+        Ok(LoadedFunction {
+            owner: LoadedFunctionOwner::Module(module),
             ty_args,
-            param_tys,
-            return_tys,
-        };
-        Ok((
-            LoadedFunction {
-                module,
-                function: func,
-            },
-            loaded,
-        ))
+            function,
+        })
     }
 
-    // Entry point for function execution (`MoveVM::execute_function`).
     // Loading verifies the module if it was never loaded.
     // Type parameters are checked as well after every type is loaded.
     pub(crate) fn load_function(
@@ -579,8 +545,8 @@ impl Loader {
         ty_args: &[TypeTag],
         data_store: &mut TransactionDataCache,
         module_store: &ModuleStorageAdapter,
-    ) -> VMResult<(Arc<Module>, Arc<Function>, LoadedFunctionInstantiation)> {
-        let (module, func, param_tys, return_tys) = self.load_function_without_type_args(
+    ) -> VMResult<LoadedFunction> {
+        let (module, function) = self.load_function_without_type_args(
             module_id,
             function_name,
             data_store,
@@ -599,15 +565,14 @@ impl Loader {
                 err
             })?;
 
-        self.verify_ty_arg_abilities(func.ty_arg_abilities(), &ty_args)
+        Type::verify_ty_arg_abilities(function.ty_param_abilities(), &ty_args)
             .map_err(|e| e.finish(Location::Module(module_id.clone())))?;
 
-        let loaded = LoadedFunctionInstantiation {
+        Ok(LoadedFunction {
+            owner: LoadedFunctionOwner::Module(module),
             ty_args,
-            param_tys,
-            return_tys,
-        };
-        Ok((module, func, loaded))
+            function,
+        })
     }
 
     // Entry point for module publishing (`MoveVM::publish_module_bundle`).
@@ -663,7 +628,7 @@ impl Loader {
         // module will NOT show up in `module_cache`. In the module republishing case, it means
         // that the old module is still in the `module_cache`, unless a new Loader is created,
         // which means that a new MoveVM instance needs to be created.
-        move_bytecode_verifier::verify_module_with_config(&self.vm_config.verifier, module)?;
+        move_bytecode_verifier::verify_module_with_config(&self.vm_config.verifier_config, module)?;
         self.check_natives(module)?;
 
         let mut visited = BTreeSet::new();
@@ -682,7 +647,6 @@ impl Loader {
             &mut visited,
             &mut friends_discovered,
             /* allow_dependency_loading_failure */ true,
-            /* dependencies_depth */ 0,
         )?;
 
         // upward exploration of the modules's dependency graph. Similar to dependency loading, as
@@ -695,7 +659,6 @@ impl Loader {
             data_store,
             module_store,
             /* allow_friend_loading_failure */ true,
-            /* dependencies_depth */ 0,
         )?;
 
         // make sure there is no cyclic dependency
@@ -775,55 +738,18 @@ impl Loader {
 
     pub(crate) fn load_type(
         &self,
-        type_tag: &TypeTag,
+        ty_tag: &TypeTag,
         data_store: &mut TransactionDataCache,
         module_store: &ModuleStorageAdapter,
     ) -> VMResult<Type> {
-        Ok(match type_tag {
-            TypeTag::Bool => Type::Bool,
-            TypeTag::U8 => Type::U8,
-            TypeTag::U16 => Type::U16,
-            TypeTag::U32 => Type::U32,
-            TypeTag::U64 => Type::U64,
-            TypeTag::U128 => Type::U128,
-            TypeTag::U256 => Type::U256,
-            TypeTag::Address => Type::Address,
-            TypeTag::Signer => Type::Signer,
-            TypeTag::Vector(elem_tag) => Type::Vector(triomphe::Arc::new(self.load_type(
-                elem_tag,
-                data_store,
-                module_store,
-            )?)),
-            TypeTag::Struct(struct_tag) => {
-                let module_id = ModuleId::new(struct_tag.address, struct_tag.module.clone());
-                self.load_module(&module_id, data_store, module_store)?;
-                let struct_type = module_store
-                    .get_struct_type_by_identifier(&struct_tag.name, &module_id)
-                    .map_err(|e| e.finish(Location::Undefined))?;
-                if struct_type.ty_params.is_empty() && struct_tag.type_args.is_empty() {
-                    Type::Struct {
-                        idx: struct_type.idx,
-                        ability: AbilityInfo::struct_(struct_type.abilities),
-                    }
-                } else {
-                    let ty_args = struct_tag
-                        .type_args
-                        .iter()
-                        .map(|ty| self.load_type(ty, data_store, module_store))
-                        .collect::<VMResult<Vec<_>>>()?;
-                    self.verify_ty_arg_abilities(struct_type.ty_param_constraints(), &ty_args)
-                        .map_err(|e| e.finish(Location::Undefined))?;
-                    Type::StructInstantiation {
-                        idx: struct_type.idx,
-                        ty_args: triomphe::Arc::new(ty_args),
-                        ability: AbilityInfo::generic_struct(
-                            struct_type.abilities,
-                            struct_type.phantom_ty_params_mask.clone(),
-                        ),
-                    }
-                }
-            },
-        })
+        let resolver = |struct_tag: &StructTag| -> VMResult<Arc<StructType>> {
+            let module_id = ModuleId::new(struct_tag.address, struct_tag.module.clone());
+            self.load_module(&module_id, data_store, module_store)?;
+            module_store
+                .get_struct_type_by_identifier(&struct_tag.name, &module_id)
+                .map_err(|e| e.finish(Location::Undefined))
+        };
+        self.ty_builder().create_ty(ty_tag, resolver)
     }
 
     /// Traverses the whole transitive closure of dependencies, starting from the specified
@@ -910,48 +836,6 @@ impl Loader {
         Ok(())
     }
 
-    /// Similar to `check_dependencies_and_charge_gas`, except that this does not recurse
-    /// into transitive dependencies and allows non-existent modules.
-    pub(crate) fn check_dependencies_and_charge_gas_non_recursive_optional<'a, I>(
-        &self,
-        module_store: &ModuleStorageAdapter,
-        data_store: &mut TransactionDataCache,
-        gas_meter: &mut impl GasMeter,
-        visited: &mut BTreeMap<(&'a AccountAddress, &'a IdentStr), ()>,
-        ids: I,
-    ) -> VMResult<()>
-    where
-        I: IntoIterator<Item = (&'a AccountAddress, &'a IdentStr)>,
-    {
-        for (addr, name) in ids.into_iter() {
-            // TODO: Allow the check of special addresses to be customized.
-            if !addr.is_special() && visited.insert((addr, name), ()).is_some() {
-                continue;
-            }
-
-            // Load and deserialize the module only if it has not been cached by the loader.
-            // Otherwise this will cause a significant regression in performance.
-            let size = match module_store.module_at_by_ref(addr, name) {
-                Some(module) => module.size,
-                None => match data_store
-                    .load_compiled_module_to_cache(ModuleId::new(*addr, name.to_owned()), true)
-                {
-                    Ok((_module, size, _hash)) => size,
-                    Err(err) if err.major_status() == StatusCode::LINKER_ERROR => continue,
-                    Err(err) => return Err(err),
-                },
-            };
-
-            gas_meter
-                .charge_dependency(false, addr, name, NumBytes::new(size as u64))
-                .map_err(|err| {
-                    err.finish(Location::Module(ModuleId::new(*addr, name.to_owned())))
-                })?;
-        }
-
-        Ok(())
-    }
-
     // The interface for module loading. Aligned with `load_type` and `load_function`, this function
     // verifies that the module is OK instead of expect it.
     pub(crate) fn load_module(
@@ -959,17 +843,6 @@ impl Loader {
         id: &ModuleId,
         data_store: &mut TransactionDataCache,
         module_store: &ModuleStorageAdapter,
-    ) -> VMResult<Arc<Module>> {
-        self.load_module_internal(id, data_store, module_store)
-    }
-
-    // Load the transitive closure of the target module first, and then verify that the modules in
-    // the closure do not have cyclic dependencies.
-    fn load_module_internal(
-        &self,
-        id: &ModuleId,
-        data_store: &mut TransactionDataCache,
-        module_store: &ModuleStorageAdapter,
     ) -> VMResult<Arc<Module>> {
         // if the module is already in the code cache, load the cached version
         if let Some(cached) = module_store.module_at(id) {
@@ -985,7 +858,6 @@ impl Loader {
             data_store,
             module_store,
             /* allow_module_loading_failure */ true,
-            /* dependencies_depth */ 0,
         )?;
 
         // verify that the transitive closure does not have cycles
@@ -1021,8 +893,11 @@ impl Loader {
 
         // Verify the module if it hasn't been verified before.
         if VERIFIED_MODULES.lock().get(&hash_value).is_none() {
-            move_bytecode_verifier::verify_module_with_config(&self.vm_config.verifier, &module)
-                .map_err(expect_no_verification_errors)?;
+            move_bytecode_verifier::verify_module_with_config(
+                &self.vm_config.verifier_config,
+                &module,
+            )
+            .map_err(expect_no_verification_errors)?;
 
             VERIFIED_MODULES.lock().put(hash_value, ());
         }
@@ -1043,7 +918,6 @@ impl Loader {
         visited: &mut BTreeSet<ModuleId>,
         friends_discovered: &mut BTreeSet<ModuleId>,
         allow_module_loading_failure: bool,
-        dependencies_depth: usize,
     ) -> VMResult<Arc<Module>> {
         // dependency loading does not permit cycles
         if visited.contains(id) {
@@ -1067,7 +941,6 @@ impl Loader {
             visited,
             friends_discovered,
             /* allow_dependency_loading_failure */ false,
-            dependencies_depth,
         )?;
 
         // if linking goes well, insert the module to the code cache
@@ -1087,7 +960,6 @@ impl Loader {
         visited: &mut BTreeSet<ModuleId>,
         friends_discovered: &mut BTreeSet<ModuleId>,
         allow_dependency_loading_failure: bool,
-        dependencies_depth: usize,
     ) -> VMResult<()> {
         // all immediate dependencies of the module being verified should be in one of the locations
         // - the verified portion of the bundle (e.g., verified before this module)
@@ -1108,7 +980,6 @@ impl Loader {
                         visited,
                         friends_discovered,
                         allow_dependency_loading_failure,
-                        dependencies_depth + 1,
                     )?,
                     Some(cached) => cached,
                 };
@@ -1144,7 +1015,6 @@ impl Loader {
         data_store: &mut TransactionDataCache,
         module_store: &ModuleStorageAdapter,
         allow_module_loading_failure: bool,
-        dependencies_depth: usize,
     ) -> VMResult<Arc<Module>> {
         // load the closure of the module in terms of dependency relation
         let mut visited = BTreeSet::new();
@@ -1157,7 +1027,6 @@ impl Loader {
             &mut visited,
             &mut friends_discovered,
             allow_module_loading_failure,
-            0,
         )?;
 
         // upward exploration of the module's friendship graph and expand the friendship frontier.
@@ -1170,7 +1039,6 @@ impl Loader {
             data_store,
             module_store,
             /* allow_friend_loading_failure */ false,
-            dependencies_depth,
         )?;
         Ok(module_ref)
     }
@@ -1184,7 +1052,6 @@ impl Loader {
         data_store: &mut TransactionDataCache,
         module_store: &ModuleStorageAdapter,
         allow_friend_loading_failure: bool,
-        dependencies_depth: usize,
     ) -> VMResult<()> {
         // for each new module discovered in the frontier, load them fully and expand the frontier.
         // apply three filters to the new friend modules discovered
@@ -1219,94 +1086,10 @@ impl Loader {
                 data_store,
                 module_store,
                 allow_friend_loading_failure,
-                dependencies_depth + 1,
             )?;
         }
         Ok(())
     }
-
-    // Return an instantiated type given a generic and an instantiation.
-    // Stopgap to avoid a recursion that is either taking too long or using too
-    // much memory
-    fn subst(&self, ty: &Type, ty_args: &[Type]) -> PartialVMResult<Type> {
-        // Before instantiating the type, count the # of nodes of all type arguments plus
-        // existing type instantiation.
-        // If that number is larger than MAX_TYPE_INSTANTIATION_NODES, refuse to construct this type.
-        // This prevents constructing larger and lager types via struct instantiation.
-        match ty {
-            Type::MutableReference(_) | Type::Reference(_) | Type::Vector(_) => {
-                if self.vm_config.type_size_limit
-                    && self.count_type_nodes(ty) > MAX_TYPE_INSTANTIATION_NODES
-                {
-                    return Err(PartialVMError::new(StatusCode::TOO_MANY_TYPE_NODES));
-                }
-            },
-            Type::StructInstantiation {
-                ty_args: struct_inst,
-                ..
-            } => {
-                let mut sum_nodes = 1u64;
-                for ty in ty_args.iter().chain(struct_inst.iter()) {
-                    sum_nodes = sum_nodes.saturating_add(self.count_type_nodes(ty));
-                    if sum_nodes > MAX_TYPE_INSTANTIATION_NODES {
-                        return Err(PartialVMError::new(StatusCode::TOO_MANY_TYPE_NODES));
-                    }
-                }
-            },
-            Type::Address
-            | Type::Bool
-            | Type::Signer
-            | Type::Struct { .. }
-            | Type::TyParam(_)
-            | Type::U8
-            | Type::U16
-            | Type::U32
-            | Type::U64
-            | Type::U128
-            | Type::U256 => (),
-        };
-        ty.subst(ty_args)
-    }
-
-    // Verify the kind (constraints) of an instantiation.
-    // Both function and script invocation use this function to verify correctness
-    // of type arguments provided
-    fn verify_ty_arg_abilities<'a, I>(
-        &self,
-        expected_ty_arg_abilities: I,
-        ty_args: &[Type],
-    ) -> PartialVMResult<()>
-    where
-        I: IntoIterator<Item = &'a AbilitySet>,
-        I::IntoIter: ExactSizeIterator,
-    {
-        let expected_ty_arg_abilities = expected_ty_arg_abilities.into_iter();
-        if expected_ty_arg_abilities.len() != ty_args.len() {
-            return Err(PartialVMError::new(
-                StatusCode::NUMBER_OF_TYPE_ARGUMENTS_MISMATCH,
-            ));
-        }
-        for (ty, expected_ability) in ty_args.iter().zip(expected_ty_arg_abilities) {
-            if !expected_ability.is_subset(ty.abilities()?) {
-                return Err(PartialVMError::new(StatusCode::CONSTRAINT_NOT_SATISFIED));
-            }
-        }
-        Ok(())
-    }
-
-    //
-    // Internal helpers
-    //
-
-    fn get_script(&self, hash: &ScriptHash) -> Arc<Script> {
-        Arc::clone(
-            self.scripts
-                .read()
-                .scripts
-                .get(hash)
-                .expect("Script hash on Function must exist"),
-        )
-    }
 }
 
 //
@@ -1369,36 +1152,85 @@ impl<'a> Resolver<'a> {
     //
     // Function resolution
     //
+}
 
-    pub(crate) fn function_from_handle(
-        &self,
-        idx: FunctionHandleIndex,
-    ) -> PartialVMResult<Arc<Function>> {
-        let idx = match &self.binary {
-            BinaryType::Module(module) => module.function_at(idx.0),
-            BinaryType::Script(script) => script.function_at(idx.0),
-        };
-        self.module_store.function_at(idx)
-    }
-
-    pub(crate) fn function_from_instantiation(
-        &self,
-        idx: FunctionInstantiationIndex,
-    ) -> PartialVMResult<Arc<Function>> {
-        let func_inst = match &self.binary {
-            BinaryType::Module(module) => module.function_instantiation_at(idx.0),
-            BinaryType::Script(script) => script.function_instantiation_at(idx.0),
-        };
-        self.module_store.function_at(&func_inst.handle)
-    }
+macro_rules! build_loaded_function {
+    ($function_name:ident, $idx_ty:ty, $get_function_handle:ident) => {
+        pub(crate) fn $function_name(
+            &self,
+            idx: $idx_ty,
+            verified_ty_args: Vec<Type>,
+        ) -> PartialVMResult<LoadedFunction> {
+            let (owner, function) = match &self.binary {
+                BinaryType::Module(module) => {
+                    let handle = module.$get_function_handle(idx.0);
+                    match handle {
+                        FunctionHandle::Local(function) => (
+                            LoadedFunctionOwner::Module(module.clone()),
+                            function.clone(),
+                        ),
+                        FunctionHandle::Remote { module, name } => {
+                            let (module, function) = self
+                                .module_store()
+                                .resolve_module_and_function_by_name(module, name)?;
+                            (LoadedFunctionOwner::Module(module), function)
+                        },
+                    }
+                },
+                BinaryType::Script(script) => {
+                    let handle = script.$get_function_handle(idx.0);
+                    match handle {
+                        FunctionHandle::Local(_) => {
+                            return Err(PartialVMError::new(
+                                StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR,
+                            )
+                            .with_message("Scripts never have local functions".to_string()));
+                        },
+                        FunctionHandle::Remote { module, name } => {
+                            let (module, function) = self
+                                .module_store()
+                                .resolve_module_and_function_by_name(module, name)?;
+                            (LoadedFunctionOwner::Module(module), function)
+                        },
+                    }
+                },
+            };
+            Ok(LoadedFunction {
+                owner,
+                ty_args: verified_ty_args,
+                function,
+            })
+        }
+    };
+}
 
-    pub(crate) fn function_from_name(
+impl<'a> Resolver<'a> {
+    build_loaded_function!(
+        build_loaded_function_from_handle_and_ty_args,
+        FunctionHandleIndex,
+        function_at
+    );
+
+    build_loaded_function!(
+        build_loaded_function_from_instantiation_and_ty_args,
+        FunctionInstantiationIndex,
+        function_instantiation_handle_at
+    );
+
+    pub(crate) fn build_loaded_function_from_name_and_ty_args(
         &self,
         module_id: &ModuleId,
-        func_name: &IdentStr,
-    ) -> PartialVMResult<Arc<Function>> {
-        self.module_store
-            .resolve_function_by_name(func_name, module_id)
+        function_name: &IdentStr,
+        verified_ty_args: Vec<Type>,
+    ) -> PartialVMResult<LoadedFunction> {
+        let (module, function) = self
+            .module_store
+            .resolve_module_and_function_by_name(module_id, function_name)?;
+        Ok(LoadedFunction {
+            owner: LoadedFunctionOwner::Module(module),
+            ty_args: verified_ty_args,
+            function,
+        })
     }
 
     pub(crate) fn instantiate_generic_function(
@@ -1407,59 +1239,59 @@ impl<'a> Resolver<'a> {
         idx: FunctionInstantiationIndex,
         ty_args: &[Type],
     ) -> PartialVMResult<Vec<Type>> {
-        let func_inst = match &self.binary {
+        let instantiation = match &self.binary {
             BinaryType::Module(module) => module.function_instantiation_at(idx.0),
             BinaryType::Script(script) => script.function_instantiation_at(idx.0),
         };
 
         if let Some(gas_meter) = gas_meter {
-            for ty in &func_inst.instantiation {
+            for ty in instantiation {
                 gas_meter
                     .charge_create_ty(NumTypeNodes::new(ty.num_nodes_in_subst(ty_args)? as u64))?;
             }
         }
 
-        let mut instantiation = vec![];
-        for ty in &func_inst.instantiation {
-            instantiation.push(self.subst(ty, ty_args)?);
-        }
-        // Check if the function instantiation over all generics is larger
-        // than MAX_TYPE_INSTANTIATION_NODES.
-        let mut sum_nodes = 1u64;
-        for ty in ty_args.iter().chain(instantiation.iter()) {
-            sum_nodes = sum_nodes.saturating_add(self.loader.count_type_nodes(ty));
-            if sum_nodes > MAX_TYPE_INSTANTIATION_NODES {
-                return Err(PartialVMError::new(StatusCode::TOO_MANY_TYPE_NODES));
-            }
-        }
+        let ty_builder = self.loader().ty_builder();
+        let instantiation = instantiation
+            .iter()
+            .map(|ty| ty_builder.create_ty_with_subst(ty, ty_args))
+            .collect::<PartialVMResult<Vec<_>>>()?;
         Ok(instantiation)
     }
 
-    #[allow(unused)]
-    pub(crate) fn type_params_count(&self, idx: FunctionInstantiationIndex) -> usize {
-        let func_inst = match &self.binary {
-            BinaryType::Module(module) => module.function_instantiation_at(idx.0),
-            BinaryType::Script(script) => script.function_instantiation_at(idx.0),
-        };
-        func_inst.instantiation.len()
-    }
-
     //
     // Type resolution
     //
 
-    pub(crate) fn get_struct_type(&self, idx: StructDefinitionIndex) -> PartialVMResult<Type> {
-        let struct_def = match &self.binary {
+    pub(crate) fn get_struct_ty(&self, idx: StructDefinitionIndex) -> Type {
+        let struct_ty = match &self.binary {
             BinaryType::Module(module) => module.struct_at(idx),
             BinaryType::Script(_) => unreachable!("Scripts cannot have type instructions"),
         };
-        Ok(Type::Struct {
-            idx: struct_def.idx,
-            ability: AbilityInfo::struct_(struct_def.abilities),
-        })
+        self.create_struct_ty(&struct_ty)
+    }
+
+    pub(crate) fn get_struct_variant_at(
+        &self,
+        idx: StructVariantHandleIndex,
+    ) -> &StructVariantInfo {
+        match &self.binary {
+            BinaryType::Module(module) => module.struct_variant_at(idx),
+            BinaryType::Script(_) => unreachable!("Scripts cannot have type instructions"),
+        }
+    }
+
+    pub(crate) fn get_struct_variant_instantiation_at(
+        &self,
+        idx: StructVariantInstantiationIndex,
+    ) -> &StructVariantInfo {
+        match &self.binary {
+            BinaryType::Module(module) => module.struct_variant_instantiation_at(idx),
+            BinaryType::Script(_) => unreachable!("Scripts cannot have type instructions"),
+        }
     }
 
-    pub(crate) fn get_struct_type_generic(
+    pub(crate) fn get_generic_struct_ty(
         &self,
         idx: StructDefInstantiationIndex,
         ty_args: &[Type],
@@ -1469,52 +1301,22 @@ impl<'a> Resolver<'a> {
             BinaryType::Script(_) => unreachable!("Scripts cannot have type instructions"),
         };
 
-        // Before instantiating the type, count the # of nodes of all type arguments plus
-        // existing type instantiation.
-        // If that number is larger than MAX_TYPE_INSTANTIATION_NODES, refuse to construct this type.
-        // This prevents constructing larger and larger types via struct instantiation.
-        let mut sum_nodes = 1u64;
-        for ty in ty_args.iter().chain(struct_inst.instantiation.iter()) {
-            sum_nodes = sum_nodes.saturating_add(self.loader.count_type_nodes(ty));
-            if sum_nodes > MAX_TYPE_INSTANTIATION_NODES {
-                return Err(
-                    PartialVMError::new(StatusCode::TOO_MANY_TYPE_NODES).with_message(format!(
-                        "Number of type instantiation nodes exceeded the maximum of {}",
-                        MAX_TYPE_INSTANTIATION_NODES
-                    )),
-                );
-            }
-        }
-
-        let struct_ = &struct_inst.definition_struct_type;
-        Ok(Type::StructInstantiation {
-            idx: struct_.idx,
-            ty_args: triomphe::Arc::new(
-                struct_inst
-                    .instantiation
-                    .iter()
-                    .map(|ty| self.subst(ty, ty_args))
-                    .collect::<PartialVMResult<_>>()?,
-            ),
-            ability: AbilityInfo::generic_struct(
-                struct_.abilities,
-                struct_.phantom_ty_params_mask.clone(),
-            ),
-        })
+        let struct_ty = &struct_inst.definition_struct_type;
+        let ty_builder = self.loader().ty_builder();
+        ty_builder.create_struct_instantiation_ty(struct_ty, &struct_inst.instantiation, ty_args)
     }
 
-    pub(crate) fn get_field_type(&self, idx: FieldHandleIndex) -> PartialVMResult<Type> {
+    pub(crate) fn get_field_ty(&self, idx: FieldHandleIndex) -> PartialVMResult<&Type> {
         match &self.binary {
             BinaryType::Module(module) => {
                 let handle = &module.field_handles[idx.0 as usize];
-
-                Ok(handle.definition_struct_type.field_tys[handle.offset].clone())
+                Ok(&handle.field_ty)
             },
             BinaryType::Script(_) => unreachable!("Scripts cannot have type instructions"),
         }
     }
 
-    pub(crate) fn get_field_type_generic(
+    pub(crate) fn get_generic_field_ty(
         &self,
         idx: FieldInstantiationIndex,
         ty_args: &[Type],
@@ -1523,19 +1325,42 @@ impl<'a> Resolver<'a> {
             BinaryType::Module(module) => &module.field_instantiations[idx.0 as usize],
             BinaryType::Script(_) => unreachable!("Scripts cannot have type instructions"),
         };
+        let field_ty = &field_instantiation.uninstantiated_field_ty;
+        self.instantiate_ty(field_ty, ty_args, &field_instantiation.instantiation)
+    }
 
-        let instantiation_types = field_instantiation
-            .instantiation
+    pub(crate) fn instantiate_ty(
+        &self,
+        ty: &Type,
+        ty_args: &[Type],
+        instantiation_tys: &[Type],
+    ) -> PartialVMResult<Type> {
+        let ty_builder = self.loader().ty_builder();
+        let instantiation_tys = instantiation_tys
             .iter()
-            .map(|inst_ty| inst_ty.subst(ty_args))
+            .map(|inst_ty| ty_builder.create_ty_with_subst(inst_ty, ty_args))
             .collect::<PartialVMResult<Vec<_>>>()?;
+        ty_builder.create_ty_with_subst(ty, &instantiation_tys)
+    }
 
-        // TODO: Is this type substitution unbounded?
-        field_instantiation.definition_struct_type.field_tys[field_instantiation.offset]
-            .subst(&instantiation_types)
+    pub(crate) fn variant_field_info_at(&self, idx: VariantFieldHandleIndex) -> &VariantFieldInfo {
+        match &self.binary {
+            BinaryType::Module(module) => module.variant_field_info_at(idx),
+            BinaryType::Script(_) => unreachable!("Scripts cannot have type instructions"),
+        }
     }
 
-    pub(crate) fn get_struct_field_tys(
+    pub(crate) fn variant_field_instantiation_info_at(
+        &self,
+        idx: VariantFieldInstantiationIndex,
+    ) -> &VariantFieldInfo {
+        match &self.binary {
+            BinaryType::Module(module) => module.variant_field_instantiation_info_at(idx),
+            BinaryType::Script(_) => unreachable!("Scripts cannot have type instructions"),
+        }
+    }
+
+    pub(crate) fn get_struct(
         &self,
         idx: StructDefinitionIndex,
     ) -> PartialVMResult<Arc<StructType>> {
@@ -1554,18 +1379,45 @@ impl<'a> Resolver<'a> {
             BinaryType::Module(module) => module.struct_instantiation_at(idx.0),
             BinaryType::Script(_) => unreachable!("Scripts cannot have type instructions"),
         };
-        let struct_type = &struct_inst.definition_struct_type;
+        let struct_ty = &struct_inst.definition_struct_type;
+        self.instantiate_generic_fields(struct_ty, None, &struct_inst.instantiation, ty_args)
+    }
+
+    pub(crate) fn instantiate_generic_struct_variant_fields(
+        &self,
+        idx: StructVariantInstantiationIndex,
+        ty_args: &[Type],
+    ) -> PartialVMResult<Vec<Type>> {
+        let struct_inst = match &self.binary {
+            BinaryType::Module(module) => module.struct_variant_instantiation_at(idx),
+            BinaryType::Script(_) => unreachable!("Scripts cannot have type instructions"),
+        };
+        let struct_ty = &struct_inst.definition_struct_type;
+        self.instantiate_generic_fields(
+            struct_ty,
+            Some(struct_inst.variant),
+            &struct_inst.instantiation,
+            ty_args,
+        )
+    }
 
-        let instantiation_types = struct_inst
-            .instantiation
+    pub(crate) fn instantiate_generic_fields(
+        &self,
+        struct_ty: &Arc<StructType>,
+        variant: Option<VariantIndex>,
+        instantiation: &[Type],
+        ty_args: &[Type],
+    ) -> PartialVMResult<Vec<Type>> {
+        let ty_builder = self.loader().ty_builder();
+        let instantiation_tys = instantiation
             .iter()
-            .map(|inst_ty| inst_ty.subst(ty_args))
+            .map(|inst_ty| ty_builder.create_ty_with_subst(inst_ty, ty_args))
             .collect::<PartialVMResult<Vec<_>>>()?;
 
-        struct_type
-            .field_tys
+        struct_ty
+            .fields(variant)?
             .iter()
-            .map(|ty| ty.subst(&instantiation_types))
+            .map(|(_, inst_ty)| ty_builder.create_ty_with_subst(inst_ty, &instantiation_tys))
             .collect::<PartialVMResult<Vec<_>>>()
     }
 
@@ -1584,16 +1436,12 @@ impl<'a> Resolver<'a> {
         let ty = self.single_type_at(idx);
 
         if !ty_args.is_empty() {
-            self.subst(ty, ty_args)
+            self.loader().ty_builder().create_ty_with_subst(ty, ty_args)
         } else {
             Ok(ty.clone())
         }
     }
 
-    pub(crate) fn subst(&self, ty: &Type, ty_args: &[Type]) -> PartialVMResult<Type> {
-        self.loader.subst(ty, ty_args)
-    }
-
     //
     // Fields resolution
     //
@@ -1626,14 +1474,13 @@ impl<'a> Resolver<'a> {
         }
     }
 
-    pub(crate) fn field_handle_to_struct(&self, idx: FieldHandleIndex) -> PartialVMResult<Type> {
+    pub(crate) fn field_handle_to_struct(&self, idx: FieldHandleIndex) -> Type {
         match &self.binary {
             BinaryType::Module(module) => {
-                let struct_ = &module.field_handles[idx.0 as usize].definition_struct_type;
-                Ok(Type::Struct {
-                    idx: struct_.idx,
-                    ability: AbilityInfo::struct_(struct_.abilities),
-                })
+                let struct_ty = &module.field_handles[idx.0 as usize].definition_struct_type;
+                self.loader()
+                    .ty_builder()
+                    .create_struct_ty(struct_ty.idx, AbilityInfo::struct_(struct_ty.abilities))
             },
             BinaryType::Script(_) => unreachable!("Scripts cannot have field instructions"),
         }
@@ -1642,33 +1489,36 @@ impl<'a> Resolver<'a> {
     pub(crate) fn field_instantiation_to_struct(
         &self,
         idx: FieldInstantiationIndex,
-        args: &[Type],
+        ty_args: &[Type],
     ) -> PartialVMResult<Type> {
         match &self.binary {
             BinaryType::Module(module) => {
                 let field_inst = &module.field_instantiations[idx.0 as usize];
-
-                let struct_ = &field_inst.definition_struct_type;
-
-                Ok(Type::StructInstantiation {
-                    idx: struct_.idx,
-                    ty_args: triomphe::Arc::new(
-                        field_inst
-                            .instantiation
-                            .iter()
-                            .map(|ty| ty.subst(args))
-                            .collect::<PartialVMResult<Vec<_>>>()?,
-                    ),
-                    ability: AbilityInfo::generic_struct(
-                        struct_.abilities,
-                        struct_.phantom_ty_params_mask.clone(),
-                    ),
-                })
+                let struct_ty = &field_inst.definition_struct_type;
+                let ty_params = &field_inst.instantiation;
+                self.create_struct_instantiation_ty(struct_ty, ty_params, ty_args)
             },
             BinaryType::Script(_) => unreachable!("Scripts cannot have field instructions"),
         }
     }
 
+    pub(crate) fn create_struct_ty(&self, struct_ty: &Arc<StructType>) -> Type {
+        self.loader()
+            .ty_builder()
+            .create_struct_ty(struct_ty.idx, AbilityInfo::struct_(struct_ty.abilities))
+    }
+
+    pub(crate) fn create_struct_instantiation_ty(
+        &self,
+        struct_ty: &Arc<StructType>,
+        ty_params: &[Type],
+        ty_args: &[Type],
+    ) -> PartialVMResult<Type> {
+        self.loader()
+            .ty_builder()
+            .create_struct_instantiation_ty(struct_ty, ty_params, ty_args)
+    }
+
     pub(crate) fn type_to_type_layout(&self, ty: &Type) -> PartialVMResult<MoveTypeLayout> {
         self.loader.type_to_type_layout(ty, self.module_store)
     }
@@ -1689,12 +1539,10 @@ impl<'a> Resolver<'a> {
             .type_to_fully_annotated_layout(ty, self.module_store)
     }
 
-    // get the loader
     pub(crate) fn loader(&self) -> &Loader {
         self.loader
     }
 
-    // get the loader
     pub(crate) fn module_store(&self) -> &ModuleStorageAdapter {
         self.module_store
     }
@@ -1751,10 +1599,6 @@ pub const VALUE_DEPTH_MAX: u64 = 128;
 /// fields for struct types.
 const MAX_TYPE_TO_LAYOUT_NODES: u64 = 256;
 
-/// Maximal nodes which are all allowed when instantiating a generic type. This does not include
-/// field types of structs.
-const MAX_TYPE_INSTANTIATION_NODES: u64 = 128;
-
 struct PseudoGasContext {
     max_cost: u64,
     cost: u64,
@@ -1839,7 +1683,10 @@ impl Loader {
             Type::U256 => TypeTag::U256,
             Type::Address => TypeTag::Address,
             Type::Signer => TypeTag::Signer,
-            Type::Vector(ty) => TypeTag::Vector(Box::new(self.type_to_type_tag(ty)?)),
+            Type::Vector(ty) => {
+                let el_ty_tag = self.type_to_type_tag_impl(ty, gas_context)?;
+                TypeTag::Vector(Box::new(el_ty_tag))
+            },
             Type::Struct { idx, .. } => TypeTag::Struct(Box::new(self.struct_name_to_type_tag(
                 *idx,
                 &[],
@@ -1857,31 +1704,6 @@ impl Loader {
         })
     }
 
-    fn count_type_nodes(&self, ty: &Type) -> u64 {
-        let mut todo = vec![ty];
-        let mut result = 0;
-        while let Some(ty) = todo.pop() {
-            match ty {
-                Type::Vector(ty) => {
-                    result += 1;
-                    todo.push(ty);
-                },
-                Type::Reference(ty) | Type::MutableReference(ty) => {
-                    result += 1;
-                    todo.push(ty);
-                },
-                Type::StructInstantiation { ty_args, .. } => {
-                    result += 1;
-                    todo.extend(ty_args.iter())
-                },
-                _ => {
-                    result += 1;
-                },
-            }
-        }
-        result
-    }
-
     fn struct_name_to_type_layout(
         &self,
         struct_idx: StructNameIndex,
@@ -1906,43 +1728,72 @@ impl Loader {
         let count_before = *count;
         let struct_type = module_store.get_struct_type_by_identifier(&name.name, &name.module)?;
 
-        // Some types can have fields which are lifted at serialization or deserialization
-        // times. Right now these are Aggregator and AggregatorSnapshot.
-        let maybe_mapping = self.get_identifier_mapping_kind(name);
+        let mut has_identifier_mappings = false;
 
-        let field_tys = struct_type
-            .field_tys
-            .iter()
-            .map(|ty| self.subst(ty, ty_args))
-            .collect::<PartialVMResult<Vec<_>>>()?;
-        let (mut field_layouts, field_has_identifier_mappings): (Vec<MoveTypeLayout>, Vec<bool>) =
-            field_tys
-                .iter()
-                .map(|ty| self.type_to_type_layout_impl(ty, module_store, count, depth))
-                .collect::<PartialVMResult<Vec<_>>>()?
-                .into_iter()
-                .unzip();
+        let layout = match &struct_type.layout {
+            StructLayout::Single(fields) => {
+                // Some types can have fields which are lifted at serialization or deserialization
+                // times. Right now these are Aggregator and AggregatorSnapshot.
+                let maybe_mapping = self.get_identifier_mapping_kind(name);
 
-        let has_identifier_mappings =
-            maybe_mapping.is_some() || field_has_identifier_mappings.into_iter().any(|b| b);
+                let field_tys = fields
+                    .iter()
+                    .map(|(_, ty)| self.ty_builder().create_ty_with_subst(ty, ty_args))
+                    .collect::<PartialVMResult<Vec<_>>>()?;
+                let (mut field_layouts, field_has_identifier_mappings): (
+                    Vec<MoveTypeLayout>,
+                    Vec<bool>,
+                ) = field_tys
+                    .iter()
+                    .map(|ty| self.type_to_type_layout_impl(ty, module_store, count, depth))
+                    .collect::<PartialVMResult<Vec<_>>>()?
+                    .into_iter()
+                    .unzip();
 
-        let field_node_count = *count - count_before;
-        let layout = if Some(IdentifierMappingKind::DerivedString) == maybe_mapping {
-            // For DerivedString, the whole object should be lifted.
-            MoveTypeLayout::Native(
-                IdentifierMappingKind::DerivedString,
-                Box::new(MoveTypeLayout::Struct(MoveStructLayout::new(field_layouts))),
-            )
-        } else {
-            // For aggregators / snapshots, the first field should be lifted.
-            if let Some(kind) = &maybe_mapping {
-                if let Some(l) = field_layouts.first_mut() {
-                    *l = MoveTypeLayout::Native(kind.clone(), Box::new(l.clone()));
-                }
-            }
-            MoveTypeLayout::Struct(MoveStructLayout::new(field_layouts))
+                has_identifier_mappings =
+                    maybe_mapping.is_some() || field_has_identifier_mappings.into_iter().any(|b| b);
+
+                let layout = if Some(IdentifierMappingKind::DerivedString) == maybe_mapping {
+                    // For DerivedString, the whole object should be lifted.
+                    MoveTypeLayout::Native(
+                        IdentifierMappingKind::DerivedString,
+                        Box::new(MoveTypeLayout::Struct(MoveStructLayout::new(field_layouts))),
+                    )
+                } else {
+                    // For aggregators / snapshots, the first field should be lifted.
+                    if let Some(kind) = &maybe_mapping {
+                        if let Some(l) = field_layouts.first_mut() {
+                            *l = MoveTypeLayout::Native(kind.clone(), Box::new(l.clone()));
+                        }
+                    }
+                    MoveTypeLayout::Struct(MoveStructLayout::new(field_layouts))
+                };
+                layout
+            },
+            StructLayout::Variants(variants) => {
+                // We do not support variants to have direct identifier mappings,
+                // but their inner types may.
+                let variant_layouts = variants
+                    .iter()
+                    .map(|variant| {
+                        variant
+                            .1
+                            .iter()
+                            .map(|(_, ty)| {
+                                let ty = self.ty_builder().create_ty_with_subst(ty, ty_args)?;
+                                let (ty, has_id_mappings) =
+                                    self.type_to_type_layout_impl(&ty, module_store, count, depth)?;
+                                has_identifier_mappings |= has_id_mappings;
+                                Ok(ty)
+                            })
+                            .collect::<PartialVMResult<Vec<_>>>()
+                    })
+                    .collect::<PartialVMResult<Vec<_>>>()?;
+                MoveTypeLayout::Struct(MoveStructLayout::RuntimeVariants(variant_layouts))
+            },
         };
 
+        let field_node_count = *count - count_before;
         let mut cache = self.type_cache.write();
         let info = cache
             .structs
@@ -1968,7 +1819,7 @@ impl Loader {
         &self,
         struct_name: &StructIdentifier,
     ) -> Option<IdentifierMappingKind> {
-        if !self.vm_config.aggregator_v2_type_tagging {
+        if !self.vm_config.delayed_field_optimization_enabled {
             return None;
         }
 
@@ -2101,15 +1952,13 @@ impl Loader {
         }
 
         let struct_type = module_store.get_struct_type_by_identifier(&name.name, &name.module)?;
-        if struct_type.field_tys.len() != struct_type.field_names.len() {
-            return Err(
-                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR).with_message(
-                    format!(
-                    "Field types did not match the length of field names in loaded struct {}::{}",
-                    &name.module, &name.name
-                ),
-                ),
-            );
+
+        // TODO(#13806): have annotated layouts for variants. Currently, we just return the raw
+        //   layout for them.
+        if matches!(struct_type.layout, StructLayout::Variants(_)) {
+            return self
+                .struct_name_to_type_layout(struct_idx, module_store, ty_args, count, depth)
+                .map(|(l, _)| l);
         }
 
         let count_before = *count;
@@ -2120,12 +1969,12 @@ impl Loader {
             cost_per_byte: self.vm_config.type_byte_cost,
         };
         let struct_tag = self.struct_name_to_type_tag(struct_idx, ty_args, &mut gas_context)?;
-        let field_layouts = struct_type
-            .field_names
+        let fields = struct_type.fields(None)?;
+
+        let field_layouts = fields
             .iter()
-            .zip(&struct_type.field_tys)
             .map(|(n, ty)| {
-                let ty = self.subst(ty, ty_args)?;
+                let ty = self.ty_builder().create_ty_with_subst(ty, ty_args)?;
                 let l =
                     self.type_to_fully_annotated_layout_impl(&ty, module_store, count, depth)?;
                 Ok(MoveFieldLayout::new(n.clone(), l))
@@ -2219,12 +2068,18 @@ impl Loader {
         }
 
         let struct_type = module_store.get_struct_type_by_identifier(&name.name, &name.module)?;
+        let formulas = match &struct_type.layout {
+            StructLayout::Single(fields) => fields
+                .iter()
+                .map(|(_, field_ty)| self.calculate_depth_of_type(field_ty, module_store))
+                .collect::<PartialVMResult<Vec<_>>>()?,
+            StructLayout::Variants(variants) => variants
+                .iter()
+                .flat_map(|variant| variant.1.iter().map(|(_, ty)| ty))
+                .map(|field_ty| self.calculate_depth_of_type(field_ty, module_store))
+                .collect::<PartialVMResult<Vec<_>>>()?,
+        };
 
-        let formulas = struct_type
-            .field_tys
-            .iter()
-            .map(|field_type| self.calculate_depth_of_type(field_type, module_store))
-            .collect::<PartialVMResult<Vec<_>>>()?;
         let formula = DepthFormula::normalize(formulas);
         let prev = self
             .type_cache
diff --git a/third_party/move/move-vm/runtime/src/loader/modules.rs b/third_party/move/move-vm/runtime/src/loader/modules.rs
index e4ab55c8a0999..456d954935b4a 100644
--- a/third_party/move/move-vm/runtime/src/loader/modules.rs
+++ b/third_party/move/move-vm/runtime/src/loader/modules.rs
@@ -16,9 +16,10 @@ use move_binary_format::{
     binary_views::BinaryIndexedView,
     errors::{Location, PartialVMError, PartialVMResult, VMResult},
     file_format::{
-        Bytecode, CompiledModule, FieldHandleIndex, FieldInstantiationIndex,
+        Bytecode, CompiledModule, FieldDefinition, FieldHandleIndex, FieldInstantiationIndex,
         FunctionDefinitionIndex, SignatureIndex, StructDefinition, StructDefinitionIndex,
-        StructFieldInformation, TableIndex,
+        StructFieldInformation, StructVariantHandleIndex, StructVariantInstantiationIndex,
+        TableIndex, VariantFieldHandleIndex, VariantFieldInstantiationIndex, VariantIndex,
     },
 };
 use move_core_types::{
@@ -28,7 +29,7 @@ use move_core_types::{
     vm_status::StatusCode,
 };
 use move_vm_types::loaded_data::runtime_types::{
-    StructIdentifier, StructNameIndex, StructType, Type,
+    StructIdentifier, StructLayout, StructNameIndex, StructType, Type,
 };
 use parking_lot::RwLock;
 use std::{
@@ -72,11 +73,11 @@ impl ModuleStorage for ModuleCache {
     }
 
     fn fetch_module(&self, module_id: &ModuleId) -> Option<Arc<Module>> {
-        self.0.read().get(module_id).map(Arc::clone)
+        self.0.read().get(module_id).cloned()
     }
 
     fn fetch_module_by_ref(&self, addr: &AccountAddress, name: &IdentStr) -> Option<Arc<Module>> {
-        self.0.read().get(&(addr, name)).map(Arc::clone)
+        self.0.read().get(&(addr, name)).cloned()
     }
 }
 
@@ -146,44 +147,28 @@ impl ModuleStorageAdapter {
             })
     }
 
-    // Given a ModuleId::func_name, retrieve the `StructType` and the index associated.
-    // Return and error if the function has not been loaded
-    pub(crate) fn resolve_function_by_name(
+    /// Given module address/name and the function name, returns the corresponding module
+    /// and function if they exist in module store cache. If not, an error is returned.
+    pub(crate) fn resolve_module_and_function_by_name(
         &self,
-        func_name: &IdentStr,
         module_id: &ModuleId,
-    ) -> PartialVMResult<Arc<Function>> {
-        match self.modules.fetch_module(module_id).and_then(|module| {
-            let idx = module.function_map.get(func_name)?;
-            module.function_defs.get(*idx).map(Arc::clone)
-        }) {
-            Some(func) => Ok(func),
-            None => Err(
-                PartialVMError::new(StatusCode::FUNCTION_RESOLUTION_FAILURE).with_message(format!(
-                    "Cannot find {:?}::{:?} in cache",
-                    module_id, func_name
-                )),
-            ),
-        }
-    }
+        func_name: &IdentStr,
+    ) -> PartialVMResult<(Arc<Module>, Arc<Function>)> {
+        let error = || {
+            PartialVMError::new(StatusCode::FUNCTION_RESOLUTION_FAILURE).with_message(format!(
+                "Cannot find {:?}::{:?} in cache",
+                module_id, func_name
+            ))
+        };
 
-    pub(crate) fn function_at(&self, handle: &FunctionHandle) -> PartialVMResult<Arc<Function>> {
-        match handle {
-            FunctionHandle::Local(func) => Ok(func.clone()),
-            FunctionHandle::Remote { module, name } => {
-                self.modules
-                    .fetch_module(module)
-                    .and_then(|module| {
-                        let idx = module.function_map.get(name)?;
-                        module.function_defs.get(*idx).cloned()
-                    })
-                    .ok_or_else(|| {
-                        PartialVMError::new(StatusCode::TYPE_RESOLUTION_FAILURE).with_message(
-                            format!("Failed to resolve function: {:?}::{:?}", module, name),
-                        )
-                    })
-            },
-        }
+        let module = self.modules.fetch_module(module_id).ok_or_else(error)?;
+        let function = module
+            .function_map
+            .get(func_name)
+            .and_then(|idx| module.function_defs.get(*idx))
+            .cloned()
+            .ok_or_else(error)?;
+        Ok((module, function.clone()))
     }
 }
 
@@ -193,7 +178,6 @@ impl ModuleStorageAdapter {
 // so that any data needed for execution is immediately available
 #[derive(Clone, Debug)]
 pub struct Module {
-    #[allow(dead_code)]
     id: ModuleId,
 
     // size in bytes
@@ -208,6 +192,9 @@ pub struct Module {
     pub(crate) structs: Vec<StructDef>,
     // materialized instantiations, whether partial or not
     pub(crate) struct_instantiations: Vec<StructInstantiation>,
+    // same for struct variants
+    pub(crate) struct_variant_infos: Vec<StructVariantInfo>,
+    pub(crate) struct_variant_instantiation_infos: Vec<StructVariantInfo>,
 
     // functions as indexes into the Loader function list
     // That is effectively an indirection over the ref table:
@@ -223,6 +210,9 @@ pub struct Module {
     pub(crate) field_handles: Vec<FieldHandle>,
     // materialized instantiations, whether partial or not
     pub(crate) field_instantiations: Vec<FieldInstantiation>,
+    // Information about variant fields.
+    pub(crate) variant_field_infos: Vec<VariantFieldInfo>,
+    pub(crate) variant_field_instantiation_infos: Vec<VariantFieldInfo>,
 
     // function name to index into the Loader function list.
     // This allows a direct access from function name to `Function`
@@ -240,23 +230,30 @@ pub struct Module {
 
 #[derive(Clone, Debug)]
 pub(crate) struct StructDef {
-    // struct field count
     pub(crate) field_count: u16,
     pub(crate) definition_struct_type: Arc<StructType>,
 }
 
 #[derive(Clone, Debug)]
 pub(crate) struct StructInstantiation {
-    // struct field count
     pub(crate) field_count: u16,
     pub(crate) definition_struct_type: Arc<StructType>,
     pub(crate) instantiation: Vec<Type>,
 }
 
+#[derive(Clone, Debug)]
+pub(crate) struct StructVariantInfo {
+    pub(crate) field_count: u16,
+    pub(crate) variant: VariantIndex,
+    pub(crate) definition_struct_type: Arc<StructType>,
+    pub(crate) instantiation: Vec<Type>,
+}
+
 // A field handle. The offset is the only used information when operating on a field
 #[derive(Clone, Debug)]
 pub(crate) struct FieldHandle {
     pub(crate) offset: usize,
+    pub(crate) field_ty: Type,
     pub(crate) definition_struct_type: Arc<StructType>,
 }
 
@@ -264,6 +261,17 @@ pub(crate) struct FieldHandle {
 #[derive(Clone, Debug)]
 pub(crate) struct FieldInstantiation {
     pub(crate) offset: usize,
+    pub(crate) uninstantiated_field_ty: Type,
+    pub(crate) definition_struct_type: Arc<StructType>,
+    pub(crate) instantiation: Vec<Type>,
+}
+
+// Information about to support both generic and non-generic variant fields.
+#[derive(Clone, Debug)]
+pub(crate) struct VariantFieldInfo {
+    pub(crate) offset: usize,
+    pub(crate) uninstantiated_field_ty: Type,
+    pub(crate) variants: Vec<VariantIndex>,
     pub(crate) definition_struct_type: Arc<StructType>,
     pub(crate) instantiation: Vec<Type>,
 }
@@ -280,11 +288,15 @@ impl Module {
 
         let mut structs = vec![];
         let mut struct_instantiations = vec![];
+        let mut struct_variant_infos = vec![];
+        let mut struct_variant_instantiation_infos = vec![];
         let mut function_refs = vec![];
         let mut function_defs = vec![];
         let mut function_instantiations = vec![];
         let mut field_handles = vec![];
         let mut field_instantiations: Vec<FieldInstantiation> = vec![];
+        let mut variant_field_infos = vec![];
+        let mut variant_field_instantiation_infos = vec![];
         let mut function_map = HashMap::new();
         let mut struct_map = HashMap::new();
         let mut single_signature_token_map = BTreeMap::new();
@@ -329,7 +341,7 @@ impl Module {
                 let definition_struct_type =
                     Arc::new(Self::make_struct_type(&module, struct_def, &struct_idxs)?);
                 structs.push(StructDef {
-                    field_count: definition_struct_type.field_tys.len() as u16,
+                    field_count: definition_struct_type.field_count(None),
                     definition_struct_type,
                 });
                 let name =
@@ -340,14 +352,37 @@ impl Module {
             for struct_inst in module.struct_instantiations() {
                 let def = struct_inst.def.0 as usize;
                 let struct_def = &structs[def];
-                let field_count = struct_def.field_count;
                 struct_instantiations.push(StructInstantiation {
-                    field_count,
+                    field_count: struct_def.definition_struct_type.field_count(None),
                     instantiation: signature_table[struct_inst.type_parameters.0 as usize].clone(),
                     definition_struct_type: struct_def.definition_struct_type.clone(),
                 });
             }
 
+            for struct_variant in module.struct_variant_handles() {
+                let definition_struct_type = structs[struct_variant.struct_index.0 as usize]
+                    .definition_struct_type
+                    .clone();
+                let variant = struct_variant.variant;
+                struct_variant_infos.push(StructVariantInfo {
+                    field_count: definition_struct_type.field_count(Some(variant)),
+                    variant,
+                    definition_struct_type,
+                    instantiation: vec![],
+                })
+            }
+
+            for struct_variant_inst in module.struct_variant_instantiations() {
+                let variant = &struct_variant_infos[struct_variant_inst.handle.0 as usize];
+                struct_variant_instantiation_infos.push(StructVariantInfo {
+                    field_count: variant.field_count,
+                    variant: variant.variant,
+                    definition_struct_type: variant.definition_struct_type.clone(),
+                    instantiation: signature_table[struct_variant_inst.type_parameters.0 as usize]
+                        .clone(),
+                })
+            }
+
             for (idx, func) in module.function_defs().iter().enumerate() {
                 let findex = FunctionDefinitionIndex(idx as TableIndex);
                 let function = Function::new(
@@ -432,13 +467,15 @@ impl Module {
                 });
             }
 
-            for func_handle in module.field_handles() {
-                let def_idx = func_handle.owner;
+            for field_handle in module.field_handles() {
+                let def_idx = field_handle.owner;
                 let definition_struct_type =
                     structs[def_idx.0 as usize].definition_struct_type.clone();
-                let offset = func_handle.field as usize;
+                let offset = field_handle.field as usize;
+                let ty = definition_struct_type.field_at(None, offset)?.1.clone();
                 field_handles.push(FieldHandle {
                     offset,
+                    field_ty: ty,
                     definition_struct_type,
                 });
             }
@@ -447,13 +484,60 @@ impl Module {
                 let fh_idx = field_inst.handle;
                 let offset = field_handles[fh_idx.0 as usize].offset;
                 let owner_struct_def = &structs[module.field_handle_at(fh_idx).owner.0 as usize];
+                let uninstantiated_ty = owner_struct_def
+                    .definition_struct_type
+                    .field_at(None, offset)?
+                    .1
+                    .clone();
                 field_instantiations.push(FieldInstantiation {
                     offset,
+                    uninstantiated_field_ty: uninstantiated_ty,
                     instantiation: signature_table[field_inst.type_parameters.0 as usize].clone(),
                     definition_struct_type: owner_struct_def.definition_struct_type.clone(),
                 });
             }
 
+            for variant_handle in module.variant_field_handles() {
+                let def_idx = variant_handle.struct_index;
+                let definition_struct_type =
+                    structs[def_idx.0 as usize].definition_struct_type.clone();
+                let offset = variant_handle.field as usize;
+                let variants = variant_handle.variants.clone();
+                let ty = definition_struct_type
+                    .field_at(Some(variants[0]), offset)?
+                    .1
+                    .clone();
+                variant_field_infos.push(VariantFieldInfo {
+                    offset,
+                    variants,
+                    definition_struct_type,
+                    uninstantiated_field_ty: ty,
+                    instantiation: vec![],
+                });
+            }
+
+            for variant_inst in module.variant_field_instantiations() {
+                let variant_info = &variant_field_infos[variant_inst.handle.0 as usize];
+                let definition_struct_type = variant_info.definition_struct_type.clone();
+                let variants = variant_info.variants.clone();
+                let offset = variant_info.offset;
+                let instantiation =
+                    signature_table[variant_inst.type_parameters.0 as usize].clone();
+                // We can select one representative variant for finding the field type, all
+                // must have the same type as the verifier ensured.
+                let uninstantiated_ty = definition_struct_type
+                    .field_at(Some(variants[0]), offset)?
+                    .1
+                    .clone();
+                variant_field_instantiation_infos.push(VariantFieldInfo {
+                    offset,
+                    uninstantiated_field_ty: uninstantiated_ty,
+                    variants,
+                    definition_struct_type,
+                    instantiation,
+                });
+            }
+
             Ok(())
         };
 
@@ -464,11 +548,15 @@ impl Module {
                 module,
                 structs,
                 struct_instantiations,
+                struct_variant_infos,
+                struct_variant_instantiation_infos,
                 function_refs,
                 function_defs,
                 function_instantiations,
                 field_handles,
                 field_instantiations,
+                variant_field_infos,
+                variant_field_instantiation_infos,
                 function_map,
                 struct_map,
                 single_signature_token_map,
@@ -483,40 +571,42 @@ impl Module {
         struct_name_table: &[StructNameIndex],
     ) -> PartialVMResult<StructType> {
         let struct_handle = module.struct_handle_at(struct_def.struct_handle);
-        let field_names = match &struct_def.field_information {
-            StructFieldInformation::Native => vec![],
-            StructFieldInformation::Declared(field_info) => field_info
-                .iter()
-                .map(|f| module.identifier_at(f.name).to_owned())
-                .collect(),
-        };
         let abilities = struct_handle.abilities;
         let name = module.identifier_at(struct_handle.name).to_owned();
         let ty_params = struct_handle.type_parameters.clone();
-        let fields = match &struct_def.field_information {
+        let layout = match &struct_def.field_information {
             StructFieldInformation::Native => unreachable!("native structs have been removed"),
-            StructFieldInformation::Declared(fields) => fields,
+            StructFieldInformation::Declared(fields) => {
+                let fields: PartialVMResult<Vec<(Identifier, Type)>> = fields
+                    .iter()
+                    .map(|f| Self::make_field(module, f, struct_name_table))
+                    .collect();
+                StructLayout::Single(fields?)
+            },
+            StructFieldInformation::DeclaredVariants(variants) => {
+                let variants: PartialVMResult<Vec<(Identifier, Vec<(Identifier, Type)>)>> =
+                    variants
+                        .iter()
+                        .map(|v| {
+                            let fields: PartialVMResult<Vec<(Identifier, Type)>> = v
+                                .fields
+                                .iter()
+                                .map(|f| Self::make_field(module, f, struct_name_table))
+                                .collect();
+                            fields.map(|fields| (module.identifier_at(v.name).to_owned(), fields))
+                        })
+                        .collect();
+                StructLayout::Variants(variants?)
+            },
         };
 
-        let mut field_tys = vec![];
-        for field in fields {
-            let ty = intern_type(
-                BinaryIndexedView::Module(module),
-                &field.signature.0,
-                struct_name_table,
-            )?;
-            debug_assert!(field_tys.len() < usize::max_value());
-            field_tys.push(ty);
-        }
-
         Ok(StructType {
-            field_tys,
+            layout,
             phantom_ty_params_mask: struct_handle
                 .type_parameters
                 .iter()
                 .map(|ty| ty.is_phantom)
                 .collect(),
-            field_names,
             abilities,
             ty_params,
             idx: struct_name_table[struct_def.struct_handle.0 as usize],
@@ -525,6 +615,23 @@ impl Module {
         })
     }
 
+    fn make_field(
+        module: &CompiledModule,
+        field: &FieldDefinition,
+        struct_name_table: &[StructNameIndex],
+    ) -> PartialVMResult<(Identifier, Type)> {
+        let ty = intern_type(
+            BinaryIndexedView::Module(module),
+            &field.signature.0,
+            struct_name_table,
+        )?;
+        Ok((module.identifier_at(field.name).to_owned(), ty))
+    }
+
+    pub(crate) fn self_id(&self) -> &ModuleId {
+        &self.id
+    }
+
     pub(crate) fn struct_at(&self, idx: StructDefinitionIndex) -> Arc<StructType> {
         self.structs[idx.0 as usize].definition_struct_type.clone()
     }
@@ -533,12 +640,27 @@ impl Module {
         &self.struct_instantiations[idx as usize]
     }
 
+    pub(crate) fn struct_variant_at(&self, idx: StructVariantHandleIndex) -> &StructVariantInfo {
+        &self.struct_variant_infos[idx.0 as usize]
+    }
+
+    pub(crate) fn struct_variant_instantiation_at(
+        &self,
+        idx: StructVariantInstantiationIndex,
+    ) -> &StructVariantInfo {
+        &self.struct_variant_instantiation_infos[idx.0 as usize]
+    }
+
     pub(crate) fn function_at(&self, idx: u16) -> &FunctionHandle {
         &self.function_refs[idx as usize]
     }
 
-    pub(crate) fn function_instantiation_at(&self, idx: u16) -> &FunctionInstantiation {
-        &self.function_instantiations[idx as usize]
+    pub(crate) fn function_instantiation_at(&self, idx: u16) -> &[Type] {
+        &self.function_instantiations[idx as usize].instantiation
+    }
+
+    pub(crate) fn function_instantiation_handle_at(&self, idx: u16) -> &FunctionHandle {
+        &self.function_instantiations[idx as usize].handle
     }
 
     pub(crate) fn field_count(&self, idx: u16) -> u16 {
@@ -565,6 +687,17 @@ impl Module {
         self.field_instantiations[idx.0 as usize].offset
     }
 
+    pub(crate) fn variant_field_info_at(&self, idx: VariantFieldHandleIndex) -> &VariantFieldInfo {
+        &self.variant_field_infos[idx.0 as usize]
+    }
+
+    pub(crate) fn variant_field_instantiation_info_at(
+        &self,
+        idx: VariantFieldInstantiationIndex,
+    ) -> &VariantFieldInfo {
+        &self.variant_field_instantiation_infos[idx.0 as usize]
+    }
+
     pub(crate) fn single_type_at(&self, idx: SignatureIndex) -> &Type {
         self.single_signature_token_map.get(&idx).unwrap()
     }
diff --git a/third_party/move/move-vm/runtime/src/loader/script.rs b/third_party/move/move-vm/runtime/src/loader/script.rs
index 4a8787e886c73..26d823cb260ec 100644
--- a/third_party/move/move-vm/runtime/src/loader/script.rs
+++ b/third_party/move/move-vm/runtime/src/loader/script.rs
@@ -3,7 +3,7 @@
 
 use super::{
     intern_type, BinaryCache, Function, FunctionHandle, FunctionInstantiation,
-    ModuleStorageAdapter, Scope, ScriptHash, StructNameCache,
+    ModuleStorageAdapter, ScriptHash, StructNameCache,
 };
 use move_binary_format::{
     access::ScriptAccess,
@@ -23,7 +23,7 @@ use std::{collections::BTreeMap, sync::Arc};
 // When code executes, indices in instructions are resolved against runtime structures
 // (rather than "compiled") to make available data needed for execution.
 #[derive(Clone, Debug)]
-pub(crate) struct Script {
+pub struct Script {
     // primitive pools
     pub(crate) script: Arc<CompiledScript>,
 
@@ -42,7 +42,6 @@ pub(crate) struct Script {
 impl Script {
     pub(crate) fn new(
         script: Arc<CompiledScript>,
-        script_hash: &ScriptHash,
         cache: &ModuleStorageAdapter,
         name_cache: &StructNameCache,
     ) -> VMResult<Self> {
@@ -93,8 +92,6 @@ impl Script {
             });
         }
 
-        let scope = Scope::Script(*script_hash);
-
         let code: Vec<Bytecode> = script.code.code.clone();
         let parameters = script.signature_at(script.parameters).clone();
 
@@ -128,9 +125,9 @@ impl Script {
             code,
             ty_param_abilities,
             native,
-            def_is_native,
-            def_is_friend_or_private: false,
-            scope,
+            is_native: def_is_native,
+            is_friend_or_private: false,
+            is_entry: false,
             name,
             // Script must not return values.
             return_tys: vec![],
@@ -193,8 +190,12 @@ impl Script {
         &self.function_refs[idx as usize]
     }
 
-    pub(crate) fn function_instantiation_at(&self, idx: u16) -> &FunctionInstantiation {
-        &self.function_instantiations[idx as usize]
+    pub(crate) fn function_instantiation_handle_at(&self, idx: u16) -> &FunctionHandle {
+        &self.function_instantiations[idx as usize].handle
+    }
+
+    pub(crate) fn function_instantiation_at(&self, idx: u16) -> &[Type] {
+        &self.function_instantiations[idx as usize].instantiation
     }
 
     pub(crate) fn single_type_at(&self, idx: SignatureIndex) -> &Type {
@@ -217,31 +218,14 @@ impl ScriptCache {
         }
     }
 
-    pub(crate) fn get(&self, hash: &ScriptHash) -> Option<(Arc<Function>, Vec<Type>, Vec<Type>)> {
-        self.scripts.get(hash).map(|script| {
-            (
-                script.entry_point(),
-                script.entry_point().param_tys().to_vec(),
-                script.entry_point().return_tys().to_vec(),
-            )
-        })
+    pub(crate) fn get(&self, hash: &ScriptHash) -> Option<Arc<Script>> {
+        self.scripts.get(hash).cloned()
     }
 
-    pub(crate) fn insert(
-        &mut self,
-        hash: ScriptHash,
-        script: Script,
-    ) -> (Arc<Function>, Vec<Type>, Vec<Type>) {
+    pub(crate) fn insert(&mut self, hash: ScriptHash, script: Script) -> Arc<Script> {
         match self.get(&hash) {
             Some(cached) => cached,
-            None => {
-                let script = self.scripts.insert(hash, script);
-                (
-                    script.entry_point(),
-                    script.entry_point().param_tys().to_vec(),
-                    script.entry_point().return_tys().to_vec(),
-                )
-            },
+            None => self.scripts.insert(hash, script).clone(),
         }
     }
 }
diff --git a/third_party/move/move-vm/runtime/src/move_vm.rs b/third_party/move/move-vm/runtime/src/move_vm.rs
index 5fa7f549cb8b5..ab01a38850dd3 100644
--- a/third_party/move/move-vm/runtime/src/move_vm.rs
+++ b/third_party/move/move-vm/runtime/src/move_vm.rs
@@ -11,14 +11,12 @@ use crate::{
     runtime::VMRuntime,
     session::Session,
 };
-use move_binary_format::{
-    errors::{Location, PartialVMError, VMResult},
-    CompiledModule,
-};
+use move_binary_format::{errors::VMResult, CompiledModule};
 use move_core_types::{
     account_address::AccountAddress, identifier::Identifier, language_storage::ModuleId,
-    metadata::Metadata, resolver::MoveResolver,
+    metadata::Metadata,
 };
+use move_vm_types::resolver::MoveResolver;
 use std::sync::Arc;
 
 #[derive(Clone)]
@@ -27,20 +25,33 @@ pub struct MoveVM {
 }
 
 impl MoveVM {
+    /// Creates a new VM instance, using default configurations. Panics if there are duplicated
+    /// natives.
     pub fn new(
         natives: impl IntoIterator<Item = (AccountAddress, Identifier, Identifier, NativeFunction)>,
-    ) -> VMResult<Self> {
-        Self::new_with_config(natives, VMConfig::default())
+    ) -> Self {
+        let vm_config = VMConfig {
+            // Keep the paranoid mode on as we most likely want this for tests.
+            paranoid_type_checks: true,
+            ..VMConfig::default()
+        };
+        Self::new_with_config(natives, vm_config)
     }
 
+    /// Creates a new VM instance, with provided VM configurations. Panics if there are duplicated
+    /// natives.
     pub fn new_with_config(
         natives: impl IntoIterator<Item = (AccountAddress, Identifier, Identifier, NativeFunction)>,
         vm_config: VMConfig,
-    ) -> VMResult<Self> {
-        Ok(Self {
-            runtime: VMRuntime::new(natives, vm_config)
-                .map_err(|err| err.finish(Location::Undefined))?,
-        })
+    ) -> Self {
+        Self {
+            runtime: VMRuntime::new(natives, vm_config),
+        }
+    }
+
+    /// Returns VM configuration used to initialize the VM.
+    pub fn vm_config(&self) -> &VMConfig {
+        self.runtime.loader().vm_config()
     }
 
     /// Create a new Session backed by the given storage.
@@ -57,17 +68,14 @@ impl MoveVM {
     ///     cases where this may not be necessary, with the most notable one being the common module
     ///     publishing flow: you can keep using the same Move VM if you publish some modules in a Session
     ///     and apply the effects to the storage when the Session ends.
-    pub fn new_session<'r>(
-        &self,
-        remote: &'r impl MoveResolver<PartialVMError>,
-    ) -> Session<'r, '_> {
+    pub fn new_session<'r>(&self, remote: &'r impl MoveResolver) -> Session<'r, '_> {
         self.new_session_with_extensions(remote, NativeContextExtensions::default())
     }
 
     /// Create a new session, as in `new_session`, but provide native context extensions.
     pub fn new_session_with_extensions<'r>(
         &self,
-        remote: &'r impl MoveResolver<PartialVMError>,
+        remote: &'r impl MoveResolver,
         native_extensions: NativeContextExtensions<'r>,
     ) -> Session<'r, '_> {
         Session {
@@ -88,7 +96,7 @@ impl MoveVM {
     /// Create a new session, as in `new_session`, but provide native context extensions and custome storage for resolved modules.
     pub fn new_session_with_extensions_and_modules<'r>(
         &self,
-        remote: &'r impl MoveResolver<PartialVMError>,
+        remote: &'r impl MoveResolver,
         module_storage: Arc<dyn ModuleStorage>,
         native_extensions: NativeContextExtensions<'r>,
     ) -> Session<'r, '_> {
@@ -111,7 +119,7 @@ impl MoveVM {
     pub fn load_module(
         &self,
         module_id: &ModuleId,
-        remote: &impl MoveResolver<PartialVMError>,
+        remote: &impl MoveResolver,
     ) -> VMResult<Arc<CompiledModule>> {
         self.runtime
             .loader()
diff --git a/third_party/move/move-vm/runtime/src/native_functions.rs b/third_party/move/move-vm/runtime/src/native_functions.rs
index 107120a6bc4e5..434c1163e2f8e 100644
--- a/third_party/move/move-vm/runtime/src/native_functions.rs
+++ b/third_party/move/move-vm/runtime/src/native_functions.rs
@@ -211,8 +211,10 @@ impl<'a, 'b, 'c> NativeContext<'a, 'b, 'c> {
                     .with_message(format!("Module {} doesn't exist", module))
             })?;
 
-        self.resolver
+        let (_, function) = self
+            .resolver
             .module_store()
-            .resolve_function_by_name(function_name, module)
+            .resolve_module_and_function_by_name(module, function_name)?;
+        Ok(function)
     }
 }
diff --git a/third_party/move/move-vm/runtime/src/runtime.rs b/third_party/move/move-vm/runtime/src/runtime.rs
index 008c8b415f0b6..b049568d8bfb6 100644
--- a/third_party/move/move-vm/runtime/src/runtime.rs
+++ b/third_party/move/move-vm/runtime/src/runtime.rs
@@ -6,27 +6,22 @@ use crate::{
     config::VMConfig,
     data_cache::TransactionDataCache,
     interpreter::Interpreter,
-    loader::{Function, LoadedFunction, Loader, ModuleCache, ModuleStorage, ModuleStorageAdapter},
+    loader::{LoadedFunction, Loader, ModuleCache, ModuleStorage, ModuleStorageAdapter},
     module_traversal::TraversalContext,
     native_extensions::NativeContextExtensions,
     native_functions::{NativeFunction, NativeFunctions},
-    session::{LoadedFunctionInstantiation, SerializedReturnValues},
+    session::SerializedReturnValues,
 };
 use move_binary_format::{
     access::ModuleAccess,
-    binary_views::BinaryIndexedView,
     compatibility::Compatibility,
     errors::{verification_error, Location, PartialVMError, PartialVMResult, VMResult},
-    file_format::{LocalIndex, SignatureIndex},
+    file_format::LocalIndex,
     normalized, CompiledModule, IndexKind,
 };
-use move_bytecode_verifier::script_signature;
 use move_core_types::{
-    account_address::AccountAddress,
-    identifier::{IdentStr, Identifier},
-    language_storage::{ModuleId, TypeTag},
-    value::MoveTypeLayout,
-    vm_status::StatusCode,
+    account_address::AccountAddress, identifier::Identifier, language_storage::TypeTag,
+    value::MoveTypeLayout, vm_status::StatusCode,
 };
 use move_vm_types::{
     gas::GasMeter,
@@ -51,14 +46,20 @@ impl Clone for VMRuntime {
 }
 
 impl VMRuntime {
+    /// Creates a new runtime instance with provided native functions and VM
+    /// configurations. If there are duplicated natives, panics.
     pub(crate) fn new(
         natives: impl IntoIterator<Item = (AccountAddress, Identifier, Identifier, NativeFunction)>,
         vm_config: VMConfig,
-    ) -> PartialVMResult<Self> {
-        Ok(VMRuntime {
-            loader: Loader::new(NativeFunctions::new(natives)?, vm_config),
+    ) -> Self {
+        VMRuntime {
+            loader: Loader::new(
+                NativeFunctions::new(natives)
+                    .unwrap_or_else(|e| panic!("Failed to create native functions: {}", e)),
+                vm_config,
+            ),
             module_cache: Arc::new(ModuleCache::new()),
-        })
+        }
     }
 
     pub(crate) fn publish_module_bundle(
@@ -123,11 +124,21 @@ impl VMRuntime {
                     self.loader
                         .load_module(&module_id, data_store, module_store)?;
                 let old_module = old_module_ref.module();
-                let old_m = normalized::Module::new(old_module);
-                let new_m = normalized::Module::new(module);
-                compat
-                    .check(&old_m, &new_m)
-                    .map_err(|e| e.finish(Location::Undefined))?;
+                if self.loader.vm_config().use_compatibility_checker_v2 {
+                    compat
+                        .check(old_module, module)
+                        .map_err(|e| e.finish(Location::Undefined))?
+                } else {
+                    #[allow(deprecated)]
+                    let old_m = normalized::Module::new(old_module)
+                        .map_err(|e| e.finish(Location::Undefined))?;
+                    #[allow(deprecated)]
+                    let new_m = normalized::Module::new(module)
+                        .map_err(|e| e.finish(Location::Undefined))?;
+                    compat
+                        .legacy_check(&old_m, &new_m)
+                        .map_err(|e| e.finish(Location::Undefined))?
+                }
             }
             if !bundle_unverified.insert(module_id) {
                 return Err(PartialVMError::new(StatusCode::DUPLICATE_MODULE_NAME)
@@ -276,9 +287,7 @@ impl VMRuntime {
                     dummy_locals.store_loc(
                         idx,
                         self.deserialize_arg(module_store, inner_t, arg_bytes)?,
-                        self.loader
-                            .vm_config()
-                            .enable_invariant_violation_check_in_swap_loc,
+                        self.loader.vm_config().check_invariant_in_swap_loc,
                     )?;
                     dummy_locals.borrow_loc(idx)
                 },
@@ -354,13 +363,9 @@ impl VMRuntime {
             .collect()
     }
 
-    #[allow(clippy::needless_collect)]
     fn execute_function_impl(
         &self,
-        func: Arc<Function>,
-        ty_args: Vec<Type>,
-        param_tys: Vec<Type>,
-        return_tys: Vec<Type>,
+        function: LoadedFunction,
         serialized_args: Vec<impl Borrow<[u8]>>,
         data_store: &mut TransactionDataCache,
         module_store: &ModuleStorageAdapter,
@@ -368,9 +373,13 @@ impl VMRuntime {
         traversal_context: &mut TraversalContext,
         extensions: &mut NativeContextExtensions,
     ) -> VMResult<SerializedReturnValues> {
-        let param_tys = param_tys
-            .into_iter()
-            .map(|ty| ty.subst(&ty_args))
+        let ty_builder = self.loader().ty_builder();
+        let ty_args = function.ty_args();
+
+        let param_tys = function
+            .param_tys()
+            .iter()
+            .map(|ty| ty_builder.create_ty_with_subst(ty, ty_args))
             .collect::<PartialVMResult<Vec<_>>>()
             .map_err(|err| err.finish(Location::Undefined))?;
         let mut_ref_args = param_tys
@@ -384,15 +393,15 @@ impl VMRuntime {
         let (mut dummy_locals, deserialized_args) = self
             .deserialize_args(module_store, param_tys, serialized_args)
             .map_err(|e| e.finish(Location::Undefined))?;
-        let return_tys = return_tys
-            .into_iter()
-            .map(|ty| ty.subst(&ty_args))
+        let return_tys = function
+            .return_tys()
+            .iter()
+            .map(|ty| ty_builder.create_ty_with_subst(ty, ty_args))
             .collect::<PartialVMResult<Vec<_>>>()
             .map_err(|err| err.finish(Location::Undefined))?;
 
         let return_values = Interpreter::entrypoint(
-            func,
-            ty_args,
+            function,
             deserialized_args,
             data_store,
             module_store,
@@ -409,12 +418,8 @@ impl VMRuntime {
             .into_iter()
             .map(|(idx, ty)| {
                 // serialize return values first in the case that a value points into this local
-                let local_val = dummy_locals.move_loc(
-                    idx,
-                    self.loader
-                        .vm_config()
-                        .enable_invariant_violation_check_in_swap_loc,
-                )?;
+                let local_val = dummy_locals
+                    .move_loc(idx, self.loader.vm_config().check_invariant_in_swap_loc)?;
                 let (bytes, layout) = self.serialize_return_value(module_store, &ty, local_val)?;
                 Ok((idx as LocalIndex, bytes, layout))
             })
@@ -422,7 +427,7 @@ impl VMRuntime {
             .map_err(|e| e.finish(Location::Undefined))?;
 
         // locals should not be dropped until all return values are serialized
-        std::mem::drop(dummy_locals);
+        drop(dummy_locals);
 
         Ok(SerializedReturnValues {
             mutable_reference_outputs: serialized_mut_ref_outputs,
@@ -430,87 +435,18 @@ impl VMRuntime {
         })
     }
 
-    pub(crate) fn execute_function(
-        &self,
-        module: &ModuleId,
-        function_name: &IdentStr,
-        ty_args: Vec<TypeTag>,
-        serialized_args: Vec<impl Borrow<[u8]>>,
-        data_store: &mut TransactionDataCache,
-        module_store: &ModuleStorageAdapter,
-        gas_meter: &mut impl GasMeter,
-        traversal_context: &mut TraversalContext,
-        extensions: &mut NativeContextExtensions,
-        bypass_declared_entry_check: bool,
-    ) -> VMResult<SerializedReturnValues> {
-        let (module, function, instantiation) =
-            self.loader
-                .load_function(module, function_name, &ty_args, data_store, module_store)?;
-
-        self.execute_function_instantiation(
-            LoadedFunction { module, function },
-            instantiation,
-            serialized_args,
-            data_store,
-            module_store,
-            gas_meter,
-            traversal_context,
-            extensions,
-            bypass_declared_entry_check,
-        )
-    }
-
     pub(crate) fn execute_function_instantiation(
         &self,
         func: LoadedFunction,
-        function_instantiation: LoadedFunctionInstantiation,
         serialized_args: Vec<impl Borrow<[u8]>>,
         data_store: &mut TransactionDataCache,
         module_store: &ModuleStorageAdapter,
         gas_meter: &mut impl GasMeter,
         traversal_context: &mut TraversalContext,
         extensions: &mut NativeContextExtensions,
-        bypass_declared_entry_check: bool,
     ) -> VMResult<SerializedReturnValues> {
-        let LoadedFunctionInstantiation {
-            ty_args,
-            param_tys,
-            return_tys,
-        } = function_instantiation;
-
-        fn check_is_entry(
-            _resolver: &BinaryIndexedView,
-            is_entry: bool,
-            _parameters_idx: SignatureIndex,
-            _return_idx: Option<SignatureIndex>,
-        ) -> PartialVMResult<()> {
-            if is_entry {
-                Ok(())
-            } else {
-                Err(PartialVMError::new(
-                    StatusCode::EXECUTE_ENTRY_FUNCTION_CALLED_ON_NON_ENTRY_FUNCTION,
-                ))
-            }
-        }
-        let additional_signature_checks = if bypass_declared_entry_check {
-            move_bytecode_verifier::no_additional_script_signature_checks
-        } else {
-            check_is_entry
-        };
-
-        let LoadedFunction { module, function } = func;
-
-        script_signature::verify_module_function_signature_by_name(
-            module.module(),
-            IdentStr::new(function.as_ref().name()).unwrap(),
-            additional_signature_checks,
-        )?;
-
         self.execute_function_impl(
-            function,
-            ty_args,
-            param_tys,
-            return_tys,
+            func,
             serialized_args,
             data_store,
             module_store,
@@ -520,7 +456,6 @@ impl VMRuntime {
         )
     }
 
-    // See Session::execute_script for what contracts to follow.
     pub(crate) fn execute_script(
         &self,
         script: impl Borrow<[u8]>,
@@ -532,22 +467,12 @@ impl VMRuntime {
         traversal_context: &mut TraversalContext,
         extensions: &mut NativeContextExtensions,
     ) -> VMResult<()> {
-        // load the script, perform verification
-        let (
-            func,
-            LoadedFunctionInstantiation {
-                ty_args,
-                param_tys,
-                return_tys,
-            },
-        ) = self
+        // Load the script first, verify it, and then execute the entry-point main function.
+        let main = self
             .loader
             .load_script(script.borrow(), &ty_args, data_store, module_store)?;
         self.execute_function_impl(
-            func,
-            ty_args,
-            param_tys,
-            return_tys,
+            main,
             serialized_args,
             data_store,
             module_store,
diff --git a/third_party/move/move-vm/runtime/src/session.rs b/third_party/move/move-vm/runtime/src/session.rs
index d803c5f15c9c6..b2681a55c8bf0 100644
--- a/third_party/move/move-vm/runtime/src/session.rs
+++ b/third_party/move/move-vm/runtime/src/session.rs
@@ -11,11 +11,7 @@ use crate::{
     native_extensions::NativeContextExtensions,
 };
 use bytes::Bytes;
-use move_binary_format::{
-    compatibility::Compatibility,
-    errors::*,
-    file_format::{AbilitySet, LocalIndex},
-};
+use move_binary_format::{compatibility::Compatibility, errors::*, file_format::LocalIndex};
 use move_core_types::{
     account_address::AccountAddress,
     effects::{ChangeSet, Changes},
@@ -23,10 +19,11 @@ use move_core_types::{
     identifier::IdentStr,
     language_storage::{ModuleId, TypeTag},
     value::MoveTypeLayout,
+    vm_status::StatusCode,
 };
 use move_vm_types::{
     gas::GasMeter,
-    loaded_data::runtime_types::{StructNameIndex, StructType, Type},
+    loaded_data::runtime_types::{StructNameIndex, StructType, Type, TypeBuilder},
     values::{GlobalValue, Value},
 };
 use std::{borrow::Borrow, sync::Arc};
@@ -50,57 +47,44 @@ pub struct SerializedReturnValues {
 }
 
 impl<'r, 'l> Session<'r, 'l> {
-    /// Execute a Move function with the given arguments. This is mainly designed for an external
-    /// environment to invoke system logic written in Move.
-    ///
-    /// NOTE: There are NO checks on the `args` except that they can deserialize into the provided
-    /// types.
-    /// The ability to deserialize `args` into arbitrary types is *very* powerful, e.g. it can
-    /// used to manufacture `signer`'s or `Coin`'s from raw bytes. It is the responsibility of the
-    /// caller (e.g. adapter) to ensure that this power is used responsibly/securely for its
-    /// use-case.
-    ///
-    /// The caller MUST ensure
-    ///   - All types and modules referred to by the type arguments exist.
-    ///   - The signature is valid for the rules of the adapter
-    ///
-    /// The Move VM MUST return an invariant violation if the caller fails to follow any of the
-    /// rules above.
-    ///
-    /// The VM will check that the function is marked as an 'entry' function.
+    /// Execute a Move entry function.
     ///
-    /// Currently if any other error occurs during execution, the Move VM will simply propagate that
-    /// error back to the outer environment without handling/translating it. This behavior may be
-    /// revised in the future.
-    ///
-    /// In case an invariant violation occurs, the whole Session should be considered corrupted and
-    /// one shall not proceed with effect generation.
+    /// NOTE: There are NO checks on the `args` except that they can deserialize
+    /// into the provided types. The ability to deserialize `args` into arbitrary
+    /// types is *very* powerful, e.g., it can be used to manufacture `signer`s
+    /// or `Coin`s from raw bytes. It is the responsibility of the caller to ensure
+    /// that this power is used responsibly/securely for its use-case.
     pub fn execute_entry_function(
         &mut self,
-        module: &ModuleId,
-        function_name: &IdentStr,
-        ty_args: Vec<TypeTag>,
+        func: LoadedFunction,
         args: Vec<impl Borrow<[u8]>>,
         gas_meter: &mut impl GasMeter,
         traversal_context: &mut TraversalContext,
     ) -> VMResult<()> {
-        let bypass_declared_entry_check = false;
-        self.move_vm.runtime.execute_function(
-            module,
-            function_name,
-            ty_args,
+        if !func.is_entry() {
+            let module_id = func
+                .module_id()
+                .cloned()
+                .expect("Entry function always has module id");
+            return Err(PartialVMError::new(
+                StatusCode::EXECUTE_ENTRY_FUNCTION_CALLED_ON_NON_ENTRY_FUNCTION,
+            )
+            .finish(Location::Module(module_id)));
+        }
+
+        self.move_vm.runtime.execute_function_instantiation(
+            func,
             args,
             &mut self.data_cache,
             &self.module_store,
             gas_meter,
             traversal_context,
             &mut self.native_extensions,
-            bypass_declared_entry_check,
         )?;
         Ok(())
     }
 
-    /// Similar to execute_entry_function, but it bypasses visibility checks
+    /// Execute a Move function ignoring its visibility and whether it is entry or not.
     pub fn execute_function_bypass_visibility(
         &mut self,
         module: &ModuleId,
@@ -110,39 +94,40 @@ impl<'r, 'l> Session<'r, 'l> {
         gas_meter: &mut impl GasMeter,
         traversal_context: &mut TraversalContext,
     ) -> VMResult<SerializedReturnValues> {
-        let bypass_declared_entry_check = true;
-        self.move_vm.runtime.execute_function(
+        let func = self.move_vm.runtime.loader().load_function(
             module,
             function_name,
-            ty_args,
+            &ty_args,
+            &mut self.data_cache,
+            &self.module_store,
+        )?;
+
+        self.move_vm.runtime.execute_function_instantiation(
+            func,
             args,
             &mut self.data_cache,
             &self.module_store,
             gas_meter,
             traversal_context,
             &mut self.native_extensions,
-            bypass_declared_entry_check,
         )
     }
 
-    pub fn execute_instantiated_function(
+    pub fn execute_loaded_function(
         &mut self,
         func: LoadedFunction,
-        instantiation: LoadedFunctionInstantiation,
         args: Vec<impl Borrow<[u8]>>,
         gas_meter: &mut impl GasMeter,
         traversal_context: &mut TraversalContext,
     ) -> VMResult<SerializedReturnValues> {
         self.move_vm.runtime.execute_function_instantiation(
             func,
-            instantiation,
             args,
             &mut self.data_cache,
             &self.module_store,
             gas_meter,
             traversal_context,
             &mut self.native_extensions,
-            true,
         )
     }
 
@@ -348,33 +333,14 @@ impl<'r, 'l> Session<'r, 'l> {
     pub fn load_script(
         &mut self,
         script: impl Borrow<[u8]>,
-        ty_args: Vec<TypeTag>,
-    ) -> VMResult<LoadedFunctionInstantiation> {
-        let (_, instantiation) = self.move_vm.runtime.loader().load_script(
+        ty_args: &[TypeTag],
+    ) -> VMResult<LoadedFunction> {
+        self.move_vm.runtime.loader().load_script(
             script.borrow(),
-            &ty_args,
-            &mut self.data_cache,
-            &self.module_store,
-        )?;
-        Ok(instantiation)
-    }
-
-    /// Note: Cannot return a `Function` struct here due to its `pub(crate)` visibility.
-    pub fn load_function_and_is_friend_or_private_def(
-        &mut self,
-        module_id: &ModuleId,
-        function_name: &IdentStr,
-        type_arguments: &[TypeTag],
-    ) -> VMResult<(LoadedFunctionInstantiation, bool)> {
-        let (_, func, instantiation) = self.move_vm.runtime.loader().load_function(
-            module_id,
-            function_name,
-            type_arguments,
+            ty_args,
             &mut self.data_cache,
             &self.module_store,
-        )?;
-
-        Ok((instantiation, func.is_friend_or_private()))
+        )
     }
 
     /// Load a module, a function, and all of its types into cache
@@ -383,9 +349,8 @@ impl<'r, 'l> Session<'r, 'l> {
         module_id: &ModuleId,
         function_name: &IdentStr,
         expected_return_type: &Type,
-    ) -> VMResult<(LoadedFunction, LoadedFunctionInstantiation)> {
-        let (func, instantiation) = self
-            .move_vm
+    ) -> VMResult<LoadedFunction> {
+        self.move_vm
             .runtime
             .loader()
             .load_function_with_type_arg_inference(
@@ -394,8 +359,7 @@ impl<'r, 'l> Session<'r, 'l> {
                 expected_return_type,
                 &mut self.data_cache,
                 &self.module_store,
-            )?;
-        Ok((func, instantiation))
+            )
     }
 
     /// Load a module, a function, and all of its types into cache
@@ -403,16 +367,15 @@ impl<'r, 'l> Session<'r, 'l> {
         &mut self,
         module_id: &ModuleId,
         function_name: &IdentStr,
-        type_arguments: &[TypeTag],
-    ) -> VMResult<LoadedFunctionInstantiation> {
-        let (_, _, instantiation) = self.move_vm.runtime.loader().load_function(
+        ty_args: &[TypeTag],
+    ) -> VMResult<LoadedFunction> {
+        self.move_vm.runtime.loader().load_function(
             module_id,
             function_name,
-            type_arguments,
+            ty_args,
             &mut self.data_cache,
             &self.module_store,
-        )?;
-        Ok(instantiation)
+        )
     }
 
     pub fn load_type(&mut self, type_tag: &TypeTag) -> VMResult<Type> {
@@ -448,11 +411,6 @@ impl<'r, 'l> Session<'r, 'l> {
             .map_err(|e| e.finish(Location::Undefined))
     }
 
-    /// Gets the abilities for this type, at it's particular instantiation
-    pub fn get_type_abilities(&self, ty: &Type) -> VMResult<AbilitySet> {
-        ty.abilities().map_err(|e| e.finish(Location::Undefined))
-    }
-
     /// Gets the underlying native extensions.
     pub fn get_native_extensions(&mut self) -> &mut NativeContextExtensions<'r> {
         &mut self.native_extensions
@@ -466,6 +424,10 @@ impl<'r, 'l> Session<'r, 'l> {
         self.move_vm.runtime.loader().vm_config()
     }
 
+    pub fn get_ty_builder(&self) -> &'l TypeBuilder {
+        self.move_vm.runtime.loader().ty_builder()
+    }
+
     pub fn get_struct_type(&self, index: StructNameIndex) -> Option<Arc<StructType>> {
         let name = self
             .move_vm
@@ -501,27 +463,6 @@ impl<'r, 'l> Session<'r, 'l> {
             )
     }
 
-    pub fn check_dependencies_and_charge_gas_non_recursive_optional<'a, I>(
-        &mut self,
-        gas_meter: &mut impl GasMeter,
-        traversal_context: &mut TraversalContext<'a>,
-        ids: I,
-    ) -> VMResult<()>
-    where
-        I: IntoIterator<Item = (&'a AccountAddress, &'a IdentStr)>,
-    {
-        self.move_vm
-            .runtime
-            .loader()
-            .check_dependencies_and_charge_gas_non_recursive_optional(
-                &self.module_store,
-                &mut self.data_cache,
-                gas_meter,
-                &mut traversal_context.visited,
-                ids,
-            )
-    }
-
     pub fn check_script_dependencies_and_check_gas(
         &mut self,
         gas_meter: &mut impl GasMeter,
@@ -540,9 +481,3 @@ impl<'r, 'l> Session<'r, 'l> {
             )
     }
 }
-
-pub struct LoadedFunctionInstantiation {
-    pub ty_args: Vec<Type>,
-    pub param_tys: Vec<Type>,
-    pub return_tys: Vec<Type>,
-}
diff --git a/third_party/move/move-vm/runtime/src/tracing.rs b/third_party/move/move-vm/runtime/src/tracing.rs
index bda432021292d..3e68eef03b073 100644
--- a/third_party/move/move-vm/runtime/src/tracing.rs
+++ b/third_party/move/move-vm/runtime/src/tracing.rs
@@ -7,7 +7,7 @@ use crate::debug::DebugContext;
 #[cfg(any(debug_assertions, feature = "debugging"))]
 use crate::{
     interpreter::Interpreter,
-    loader::{Function, Loader},
+    loader::{LoadedFunction, Loader},
 };
 #[cfg(any(debug_assertions, feature = "debugging"))]
 use ::{
@@ -47,7 +47,6 @@ static DEBUGGING_ENABLED: Lazy<bool> =
 #[cfg(any(debug_assertions, feature = "debugging"))]
 pub static LOGGING_FILE_WRITER: Lazy<Mutex<std::io::BufWriter<File>>> = Lazy::new(|| {
     let file = OpenOptions::new()
-        .write(true)
         .create(true)
         .append(true)
         .open(&*FILE_PATH)
@@ -68,7 +67,7 @@ static DEBUG_CONTEXT: Lazy<Mutex<DebugContext>> = Lazy::new(|| Mutex::new(DebugC
 // Only include in debug builds
 #[cfg(any(debug_assertions, feature = "debugging"))]
 pub(crate) fn trace(
-    function_desc: &Function,
+    function: &LoadedFunction,
     locals: &Locals,
     pc: u16,
     instr: &Bytecode,
@@ -78,7 +77,11 @@ pub(crate) fn trace(
     if *TRACING_ENABLED {
         let buf_writer = &mut *LOGGING_FILE_WRITER.lock().unwrap();
         buf_writer
-            .write_fmt(format_args!("{},{}\n", function_desc.pretty_string(), pc,))
+            .write_fmt(format_args!(
+                "{},{}\n",
+                function.name_as_pretty_string(),
+                pc,
+            ))
             .unwrap();
         if *SINGLE_STEP_FLUSHING {
             buf_writer.flush().unwrap();
@@ -88,7 +91,7 @@ pub(crate) fn trace(
         DEBUG_CONTEXT
             .lock()
             .unwrap()
-            .debug_loop(function_desc, locals, pc, instr, loader, interp);
+            .debug_loop(function, locals, pc, instr, loader, interp);
     }
 }
 
diff --git a/third_party/move/move-vm/test-utils/src/gas_schedule.rs b/third_party/move/move-vm/test-utils/src/gas_schedule.rs
index 95489e6f6c126..89500bca8b8c5 100644
--- a/third_party/move/move-vm/test-utils/src/gas_schedule.rs
+++ b/third_party/move/move-vm/test-utils/src/gas_schedule.rs
@@ -12,7 +12,8 @@ use move_binary_format::{
     file_format::{
         Bytecode, CodeOffset, ConstantPoolIndex, FieldHandleIndex, FieldInstantiationIndex,
         FunctionHandleIndex, FunctionInstantiationIndex, SignatureIndex,
-        StructDefInstantiationIndex, StructDefinitionIndex,
+        StructDefInstantiationIndex, StructDefinitionIndex, StructVariantHandleIndex,
+        StructVariantInstantiationIndex, VariantFieldHandleIndex, VariantFieldInstantiationIndex,
     },
     file_format_common::{instruction_key, Opcodes},
 };
@@ -578,6 +579,22 @@ pub fn zero_cost_instruction_table() -> Vec<(Bytecode, GasCost)> {
             ImmBorrowFieldGeneric(FieldInstantiationIndex::new(0)),
             GasCost::new(0, 0),
         ),
+        (
+            MutBorrowVariantField(VariantFieldHandleIndex::new(0)),
+            GasCost::new(0, 0),
+        ),
+        (
+            MutBorrowVariantFieldGeneric(VariantFieldInstantiationIndex::new(0)),
+            GasCost::new(0, 0),
+        ),
+        (
+            ImmBorrowVariantField(VariantFieldHandleIndex::new(0)),
+            GasCost::new(0, 0),
+        ),
+        (
+            ImmBorrowVariantFieldGeneric(VariantFieldInstantiationIndex::new(0)),
+            GasCost::new(0, 0),
+        ),
         (Add, GasCost::new(0, 0)),
         (CopyLoc(0), GasCost::new(0, 0)),
         (StLoc(0), GasCost::new(0, 0)),
@@ -611,6 +628,14 @@ pub fn zero_cost_instruction_table() -> Vec<(Bytecode, GasCost)> {
             UnpackGeneric(StructDefInstantiationIndex::new(0)),
             GasCost::new(0, 0),
         ),
+        (
+            UnpackVariant(StructVariantHandleIndex::new(0)),
+            GasCost::new(0, 0),
+        ),
+        (
+            UnpackVariantGeneric(StructVariantInstantiationIndex::new(0)),
+            GasCost::new(0, 0),
+        ),
         (Or, GasCost::new(0, 0)),
         (LdFalse, GasCost::new(0, 0)),
         (LdTrue, GasCost::new(0, 0)),
@@ -647,6 +672,22 @@ pub fn zero_cost_instruction_table() -> Vec<(Bytecode, GasCost)> {
             PackGeneric(StructDefInstantiationIndex::new(0)),
             GasCost::new(0, 0),
         ),
+        (
+            PackVariant(StructVariantHandleIndex::new(0)),
+            GasCost::new(0, 0),
+        ),
+        (
+            PackVariantGeneric(StructVariantInstantiationIndex::new(0)),
+            GasCost::new(0, 0),
+        ),
+        (
+            TestVariant(StructVariantHandleIndex::new(0)),
+            GasCost::new(0, 0),
+        ),
+        (
+            TestVariantGeneric(StructVariantInstantiationIndex::new(0)),
+            GasCost::new(0, 0),
+        ),
         (Nop, GasCost::new(0, 0)),
         (VecPack(SignatureIndex::new(0), 0), GasCost::new(0, 0)),
         (VecLen(SignatureIndex::new(0)), GasCost::new(0, 0)),
@@ -711,6 +752,22 @@ pub fn bytecode_instruction_costs() -> Vec<(Bytecode, GasCost)> {
             ImmBorrowFieldGeneric(FieldInstantiationIndex::new(0)),
             GasCost::new(1, 1),
         ),
+        (
+            MutBorrowVariantField(VariantFieldHandleIndex::new(0)),
+            GasCost::new(1, 1),
+        ),
+        (
+            MutBorrowVariantFieldGeneric(VariantFieldInstantiationIndex::new(0)),
+            GasCost::new(1, 1),
+        ),
+        (
+            ImmBorrowVariantField(VariantFieldHandleIndex::new(0)),
+            GasCost::new(1, 1),
+        ),
+        (
+            ImmBorrowVariantFieldGeneric(VariantFieldInstantiationIndex::new(0)),
+            GasCost::new(1, 1),
+        ),
         (Add, GasCost::new(1, 1)),
         (CopyLoc(0), GasCost::new(1, 1)),
         (StLoc(0), GasCost::new(1, 1)),
@@ -744,6 +801,14 @@ pub fn bytecode_instruction_costs() -> Vec<(Bytecode, GasCost)> {
             UnpackGeneric(StructDefInstantiationIndex::new(0)),
             GasCost::new(2, 1),
         ),
+        (
+            UnpackVariant(StructVariantHandleIndex::new(0)),
+            GasCost::new(2, 1),
+        ),
+        (
+            UnpackVariantGeneric(StructVariantInstantiationIndex::new(0)),
+            GasCost::new(2, 1),
+        ),
         (Or, GasCost::new(2, 1)),
         (LdFalse, GasCost::new(1, 1)),
         (LdTrue, GasCost::new(1, 1)),
@@ -780,6 +845,22 @@ pub fn bytecode_instruction_costs() -> Vec<(Bytecode, GasCost)> {
             PackGeneric(StructDefInstantiationIndex::new(0)),
             GasCost::new(2, 1),
         ),
+        (
+            PackVariant(StructVariantHandleIndex::new(0)),
+            GasCost::new(2, 1),
+        ),
+        (
+            PackVariantGeneric(StructVariantInstantiationIndex::new(0)),
+            GasCost::new(2, 1),
+        ),
+        (
+            TestVariant(StructVariantHandleIndex::new(0)),
+            GasCost::new(2, 1),
+        ),
+        (
+            TestVariantGeneric(StructVariantInstantiationIndex::new(0)),
+            GasCost::new(2, 1),
+        ),
         (Nop, GasCost::new(1, 1)),
         (VecPack(SignatureIndex::new(0), 0), GasCost::new(84, 1)),
         (VecLen(SignatureIndex::new(0)), GasCost::new(98, 1)),
diff --git a/third_party/move/move-vm/test-utils/src/lib.rs b/third_party/move/move-vm/test-utils/src/lib.rs
index a56aba81a8fd5..60eac026c7bde 100644
--- a/third_party/move/move-vm/test-utils/src/lib.rs
+++ b/third_party/move/move-vm/test-utils/src/lib.rs
@@ -7,4 +7,4 @@
 mod storage;
 
 pub mod gas_schedule;
-pub use storage::{BlankStorage, DeltaStorage, InMemoryStorage};
+pub use storage::{BlankStorage, InMemoryStorage};
diff --git a/third_party/move/move-vm/test-utils/src/storage.rs b/third_party/move/move-vm/test-utils/src/storage.rs
index 501f13ad289c0..fd25015171fbf 100644
--- a/third_party/move/move-vm/test-utils/src/storage.rs
+++ b/third_party/move/move-vm/test-utils/src/storage.rs
@@ -16,12 +16,12 @@ use move_core_types::{
     identifier::Identifier,
     language_storage::{ModuleId, StructTag},
     metadata::Metadata,
-    resolver::{resource_size, ModuleResolver, MoveResolver, ResourceResolver},
     value::MoveTypeLayout,
     vm_status::StatusCode,
 };
 #[cfg(feature = "table-extension")]
 use move_table_extension::{TableChangeSet, TableHandle, TableResolver};
+use move_vm_types::resolver::{resource_size, ModuleResolver, ResourceResolver};
 use std::{
     collections::{btree_map, BTreeMap},
     fmt::Debug,
@@ -38,27 +38,23 @@ impl BlankStorage {
 }
 
 impl ModuleResolver for BlankStorage {
-    type Error = PartialVMError;
-
     fn get_module_metadata(&self, _module_id: &ModuleId) -> Vec<Metadata> {
         vec![]
     }
 
-    fn get_module(&self, _module_id: &ModuleId) -> Result<Option<Bytes>, Self::Error> {
+    fn get_module(&self, _module_id: &ModuleId) -> PartialVMResult<Option<Bytes>> {
         Ok(None)
     }
 }
 
 impl ResourceResolver for BlankStorage {
-    type Error = PartialVMError;
-
     fn get_resource_bytes_with_metadata_and_layout(
         &self,
         _address: &AccountAddress,
         _tag: &StructTag,
         _metadata: &[Metadata],
         _maybe_layout: Option<&MoveTypeLayout>,
-    ) -> Result<(Option<Bytes>, usize), Self::Error> {
+    ) -> PartialVMResult<(Option<Bytes>, usize)> {
         Ok((None, 0))
     }
 }
@@ -70,82 +66,11 @@ impl TableResolver for BlankStorage {
         _handle: &TableHandle,
         _key: &[u8],
         _maybe_layout: Option<&MoveTypeLayout>,
-    ) -> Result<Option<Bytes>, PartialVMError> {
+    ) -> PartialVMResult<Option<Bytes>> {
         Ok(None)
     }
 }
 
-/// A storage adapter created by stacking a change set on top of an existing storage backend.
-/// This can be used for additional computations without modifying the base.
-#[derive(Debug, Clone)]
-pub struct DeltaStorage<'a, 'b, S> {
-    base: &'a S,
-    change_set: &'b ChangeSet,
-}
-
-impl<'a, 'b, S: ModuleResolver> ModuleResolver for DeltaStorage<'a, 'b, S> {
-    type Error = S::Error;
-
-    fn get_module_metadata(&self, _module_id: &ModuleId) -> Vec<Metadata> {
-        vec![]
-    }
-
-    fn get_module(&self, module_id: &ModuleId) -> Result<Option<Bytes>, Self::Error> {
-        if let Some(account_storage) = self.change_set.accounts().get(module_id.address()) {
-            if let Some(blob_opt) = account_storage.modules().get(module_id.name()) {
-                return Ok(blob_opt.clone().ok());
-            }
-        }
-
-        self.base.get_module(module_id)
-    }
-}
-
-impl<'a, 'b, S: ResourceResolver> ResourceResolver for DeltaStorage<'a, 'b, S> {
-    type Error = S::Error;
-
-    fn get_resource_bytes_with_metadata_and_layout(
-        &self,
-        address: &AccountAddress,
-        tag: &StructTag,
-        metadata: &[Metadata],
-        layout: Option<&MoveTypeLayout>,
-    ) -> Result<(Option<Bytes>, usize), Self::Error> {
-        if let Some(account_storage) = self.change_set.accounts().get(address) {
-            if let Some(blob_opt) = account_storage.resources().get(tag) {
-                let buf = blob_opt.clone().ok();
-                let buf_size = resource_size(&buf);
-                return Ok((buf, buf_size));
-            }
-        }
-        self.base
-            .get_resource_bytes_with_metadata_and_layout(address, tag, metadata, layout)
-    }
-}
-
-#[cfg(feature = "table-extension")]
-impl<'a, 'b, S: TableResolver> TableResolver for DeltaStorage<'a, 'b, S> {
-    fn resolve_table_entry_bytes_with_layout(
-        &self,
-        handle: &TableHandle,
-        key: &[u8],
-        maybe_layout: Option<&MoveTypeLayout>,
-    ) -> Result<Option<Bytes>, PartialVMError> {
-        // TODO: In addition to `change_set`, cache table outputs.
-        self.base
-            .resolve_table_entry_bytes_with_layout(handle, key, maybe_layout)
-    }
-}
-
-impl<'a, 'b, S: MoveResolver<PartialVMError>> DeltaStorage<'a, 'b, S> {
-    pub fn new(base: &'a S, delta: &'b ChangeSet) -> Self {
-        Self {
-            base,
-            change_set: delta,
-        }
-    }
-}
-
 /// Simple in-memory storage for modules and resources under an account.
 #[derive(Debug, Clone)]
 struct InMemoryAccountStorage {
@@ -329,13 +254,11 @@ impl InMemoryStorage {
 }
 
 impl ModuleResolver for InMemoryStorage {
-    type Error = PartialVMError;
-
     fn get_module_metadata(&self, _module_id: &ModuleId) -> Vec<Metadata> {
         vec![]
     }
 
-    fn get_module(&self, module_id: &ModuleId) -> Result<Option<Bytes>, Self::Error> {
+    fn get_module(&self, module_id: &ModuleId) -> PartialVMResult<Option<Bytes>> {
         if let Some(account_storage) = self.accounts.get(module_id.address()) {
             return Ok(account_storage.modules.get(module_id.name()).cloned());
         }
@@ -344,15 +267,13 @@ impl ModuleResolver for InMemoryStorage {
 }
 
 impl ResourceResolver for InMemoryStorage {
-    type Error = PartialVMError;
-
     fn get_resource_bytes_with_metadata_and_layout(
         &self,
         address: &AccountAddress,
         tag: &StructTag,
         _metadata: &[Metadata],
         _maybe_layout: Option<&MoveTypeLayout>,
-    ) -> Result<(Option<Bytes>, usize), Self::Error> {
+    ) -> PartialVMResult<(Option<Bytes>, usize)> {
         if let Some(account_storage) = self.accounts.get(address) {
             let buf = account_storage.resources.get(tag).cloned();
             let buf_size = resource_size(&buf);
@@ -369,7 +290,7 @@ impl TableResolver for InMemoryStorage {
         handle: &TableHandle,
         key: &[u8],
         _maybe_layout: Option<&MoveTypeLayout>,
-    ) -> Result<Option<Bytes>, PartialVMError> {
+    ) -> PartialVMResult<Option<Bytes>> {
         Ok(self.tables.get(handle).and_then(|t| t.get(key).cloned()))
     }
 }
diff --git a/third_party/move/move-vm/transactional-tests/tests/builtins/gen_move_to.v2_exp b/third_party/move/move-vm/transactional-tests/tests/builtins/gen_move_to.v2_exp
new file mode 100644
index 0000000000000..8c37110a41a8c
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/builtins/gen_move_to.v2_exp
@@ -0,0 +1 @@
+processed 9 tasks
diff --git a/third_party/move/move-vm/transactional-tests/tests/builtins/get_missing_struct.v2_exp b/third_party/move/move-vm/transactional-tests/tests/builtins/get_missing_struct.v2_exp
new file mode 100644
index 0000000000000..12d91af83680e
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/builtins/get_missing_struct.v2_exp
@@ -0,0 +1,12 @@
+processed 2 tasks
+
+task 1 'run'. lines 31-38:
+Error: Script execution failed with VMError: {
+    message: Failed to borrow global resource from 0000000000000000000000000000000000000000000000001111111111111110,
+    major_status: MISSING_DATA,
+    sub_status: None,
+    location: 0x1::Token,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(2), 3)],
+    exec_state: Some(ExecutionState { stack_trace: [(None, FunctionDefinitionIndex(0), 0)] }),
+}
diff --git a/third_party/move/move-vm/transactional-tests/tests/builtins/get_published_resource.v2_exp b/third_party/move/move-vm/transactional-tests/tests/builtins/get_published_resource.v2_exp
new file mode 100644
index 0000000000000..5d92c423f3fd8
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/builtins/get_published_resource.v2_exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/third_party/move/move-vm/transactional-tests/tests/builtins/get_txn_sender.v2_exp b/third_party/move/move-vm/transactional-tests/tests/builtins/get_txn_sender.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/builtins/get_txn_sender.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-vm/transactional-tests/tests/builtins/has_published_struct.v2_exp b/third_party/move/move-vm/transactional-tests/tests/builtins/has_published_struct.v2_exp
new file mode 100644
index 0000000000000..5d92c423f3fd8
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/builtins/has_published_struct.v2_exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/third_party/move/move-vm/transactional-tests/tests/builtins/move_from.v2_exp b/third_party/move/move-vm/transactional-tests/tests/builtins/move_from.v2_exp
new file mode 100644
index 0000000000000..457ace9c4acb6
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/builtins/move_from.v2_exp
@@ -0,0 +1 @@
+processed 4 tasks
diff --git a/third_party/move/move-vm/transactional-tests/tests/builtins/move_published_resource.v2_exp b/third_party/move/move-vm/transactional-tests/tests/builtins/move_published_resource.v2_exp
new file mode 100644
index 0000000000000..5d92c423f3fd8
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/builtins/move_published_resource.v2_exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/third_party/move/move-vm/transactional-tests/tests/builtins/move_to_and_from_resource_with_primitive_fields.v2_exp b/third_party/move/move-vm/transactional-tests/tests/builtins/move_to_and_from_resource_with_primitive_fields.v2_exp
new file mode 100644
index 0000000000000..fc5a4436b29d4
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/builtins/move_to_and_from_resource_with_primitive_fields.v2_exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/third_party/move/move-vm/transactional-tests/tests/builtins/move_to_and_from_resource_with_u128_field.v2_exp b/third_party/move/move-vm/transactional-tests/tests/builtins/move_to_and_from_resource_with_u128_field.v2_exp
new file mode 100644
index 0000000000000..fc5a4436b29d4
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/builtins/move_to_and_from_resource_with_u128_field.v2_exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/third_party/move/move-vm/transactional-tests/tests/builtins/move_to_and_from_resource_with_u64_field.v2_exp b/third_party/move/move-vm/transactional-tests/tests/builtins/move_to_and_from_resource_with_u64_field.v2_exp
new file mode 100644
index 0000000000000..fc5a4436b29d4
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/builtins/move_to_and_from_resource_with_u64_field.v2_exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/third_party/move/move-vm/transactional-tests/tests/builtins/move_to_and_from_resource_with_u8_field.v2_exp b/third_party/move/move-vm/transactional-tests/tests/builtins/move_to_and_from_resource_with_u8_field.v2_exp
new file mode 100644
index 0000000000000..fc5a4436b29d4
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/builtins/move_to_and_from_resource_with_u8_field.v2_exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/third_party/move/move-vm/transactional-tests/tests/builtins/publish_then_unpublish.v2_exp b/third_party/move/move-vm/transactional-tests/tests/builtins/publish_then_unpublish.v2_exp
new file mode 100644
index 0000000000000..dfc967956802c
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/builtins/publish_then_unpublish.v2_exp
@@ -0,0 +1,4 @@
+processed 3 tasks
+
+task 2 'view'. lines 25-25:
+[No Resource Exists]
diff --git a/third_party/move/move-vm/transactional-tests/tests/builtins/read_and_dont_write_to_global_storage.v2_exp b/third_party/move/move-vm/transactional-tests/tests/builtins/read_and_dont_write_to_global_storage.v2_exp
new file mode 100644
index 0000000000000..5d92c423f3fd8
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/builtins/read_and_dont_write_to_global_storage.v2_exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/third_party/move/move-vm/transactional-tests/tests/builtins/resources_are_distinct_by_published_account.v2_exp b/third_party/move/move-vm/transactional-tests/tests/builtins/resources_are_distinct_by_published_account.v2_exp
new file mode 100644
index 0000000000000..3439c5eeb51f0
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/builtins/resources_are_distinct_by_published_account.v2_exp
@@ -0,0 +1,7 @@
+processed 2 tasks
+
+task 0 'publish'. lines 1-50:
+Error: Dependency not provided for 0000000000000000000000000000000000000000000000000000000000000001.Account
+
+task 1 'run'. lines 52-59:
+Error: Dependency not provided for 0000000000000000000000000000000000000000000000000000000000000042.Account
diff --git a/third_party/move/move-vm/transactional-tests/tests/builtins/signer_runtime_dummy.v2_exp b/third_party/move/move-vm/transactional-tests/tests/builtins/signer_runtime_dummy.v2_exp
new file mode 100644
index 0000000000000..fc5a4436b29d4
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/builtins/signer_runtime_dummy.v2_exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/third_party/move/move-vm/transactional-tests/tests/builtins/signer_runtime_move_to.v2_exp b/third_party/move/move-vm/transactional-tests/tests/builtins/signer_runtime_move_to.v2_exp
new file mode 100644
index 0000000000000..457ace9c4acb6
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/builtins/signer_runtime_move_to.v2_exp
@@ -0,0 +1 @@
+processed 4 tasks
diff --git a/third_party/move/move-vm/transactional-tests/tests/builtins/struct_borrow_and_modify.v2_exp b/third_party/move/move-vm/transactional-tests/tests/builtins/struct_borrow_and_modify.v2_exp
new file mode 100644
index 0000000000000..2301000e50ae4
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/builtins/struct_borrow_and_modify.v2_exp
@@ -0,0 +1 @@
+processed 6 tasks
diff --git a/third_party/move/move-vm/transactional-tests/tests/builtins/unpublish_then_publish.v2_exp b/third_party/move/move-vm/transactional-tests/tests/builtins/unpublish_then_publish.v2_exp
new file mode 100644
index 0000000000000..0c10038aec2a0
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/builtins/unpublish_then_publish.v2_exp
@@ -0,0 +1,11 @@
+processed 5 tasks
+
+task 2 'view'. lines 31-31:
+key 0x1::M::R {
+    x: false
+}
+
+task 4 'view'. lines 42-42:
+key 0x1::M::R {
+    x: false
+}
diff --git a/third_party/move/move-vm/transactional-tests/tests/builtins/vector_ops_all_ok.v2_exp b/third_party/move/move-vm/transactional-tests/tests/builtins/vector_ops_all_ok.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/builtins/vector_ops_all_ok.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-vm/transactional-tests/tests/builtins/vector_ops_borrow_and_modify_ok.v2_exp b/third_party/move/move-vm/transactional-tests/tests/builtins/vector_ops_borrow_and_modify_ok.v2_exp
new file mode 100644
index 0000000000000..457ace9c4acb6
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/builtins/vector_ops_borrow_and_modify_ok.v2_exp
@@ -0,0 +1 @@
+processed 4 tasks
diff --git a/third_party/move/move-vm/transactional-tests/tests/builtins/vector_ops_bound_ok.v2_exp b/third_party/move/move-vm/transactional-tests/tests/builtins/vector_ops_bound_ok.v2_exp
new file mode 100644
index 0000000000000..2301000e50ae4
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/builtins/vector_ops_bound_ok.v2_exp
@@ -0,0 +1 @@
+processed 6 tasks
diff --git a/third_party/move/move-vm/transactional-tests/tests/builtins/vector_ops_len_ok.v2_exp b/third_party/move/move-vm/transactional-tests/tests/builtins/vector_ops_len_ok.v2_exp
new file mode 100644
index 0000000000000..fc5a4436b29d4
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/builtins/vector_ops_len_ok.v2_exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/third_party/move/move-vm/transactional-tests/tests/builtins/vector_ops_out_of_bound.v2_exp b/third_party/move/move-vm/transactional-tests/tests/builtins/vector_ops_out_of_bound.v2_exp
new file mode 100644
index 0000000000000..49e618b5631b2
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/builtins/vector_ops_out_of_bound.v2_exp
@@ -0,0 +1,28 @@
+processed 3 tasks
+
+task 0 'run'. lines 1-10:
+Error: Script execution failed with VMError: {
+    major_status: VECTOR_OPERATION_ERROR,
+    sub_status: Some(1),
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 7)],
+}
+
+task 1 'run'. lines 12-21:
+Error: Script execution failed with VMError: {
+    major_status: VECTOR_OPERATION_ERROR,
+    sub_status: Some(1),
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 7)],
+}
+
+task 2 'run'. lines 23-31:
+Error: Script execution failed with VMError: {
+    major_status: VECTOR_OPERATION_ERROR,
+    sub_status: Some(1),
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 5)],
+}
diff --git a/third_party/move/move-vm/transactional-tests/tests/builtins/vector_ops_pack_unpack_ok.v2_exp b/third_party/move/move-vm/transactional-tests/tests/builtins/vector_ops_pack_unpack_ok.v2_exp
new file mode 100644
index 0000000000000..5d92c423f3fd8
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/builtins/vector_ops_pack_unpack_ok.v2_exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/third_party/move/move-vm/transactional-tests/tests/builtins/vector_ops_pop_empty.v2_exp b/third_party/move/move-vm/transactional-tests/tests/builtins/vector_ops_pop_empty.v2_exp
new file mode 100644
index 0000000000000..84163a1705890
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/builtins/vector_ops_pop_empty.v2_exp
@@ -0,0 +1,19 @@
+processed 2 tasks
+
+task 0 'run'. lines 1-9:
+Error: Script execution failed with VMError: {
+    major_status: VECTOR_OPERATION_ERROR,
+    sub_status: Some(2),
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
+
+task 1 'run'. lines 11-20:
+Error: Script execution failed with VMError: {
+    major_status: VECTOR_OPERATION_ERROR,
+    sub_status: Some(2),
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 7)],
+}
diff --git a/third_party/move/move-vm/transactional-tests/tests/builtins/vector_ops_pop_ok.v2_exp b/third_party/move/move-vm/transactional-tests/tests/builtins/vector_ops_pop_ok.v2_exp
new file mode 100644
index 0000000000000..5d92c423f3fd8
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/builtins/vector_ops_pop_ok.v2_exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/third_party/move/move-vm/transactional-tests/tests/builtins/vector_ops_unpack_less.v2_exp b/third_party/move/move-vm/transactional-tests/tests/builtins/vector_ops_unpack_less.v2_exp
new file mode 100644
index 0000000000000..d9de2df4a2696
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/builtins/vector_ops_unpack_less.v2_exp
@@ -0,0 +1,28 @@
+processed 3 tasks
+
+task 0 'run'. lines 1-9:
+Error: Script execution failed with VMError: {
+    major_status: VECTOR_OPERATION_ERROR,
+    sub_status: Some(3),
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 4)],
+}
+
+task 1 'run'. lines 11-19:
+Error: Script execution failed with VMError: {
+    major_status: VECTOR_OPERATION_ERROR,
+    sub_status: Some(3),
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 5)],
+}
+
+task 2 'run'. lines 21-30:
+Error: Script execution failed with VMError: {
+    major_status: VECTOR_OPERATION_ERROR,
+    sub_status: Some(3),
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 7)],
+}
diff --git a/third_party/move/move-vm/transactional-tests/tests/builtins/vector_ops_unpack_more.v2_exp b/third_party/move/move-vm/transactional-tests/tests/builtins/vector_ops_unpack_more.v2_exp
new file mode 100644
index 0000000000000..84831f9a5ffc7
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/builtins/vector_ops_unpack_more.v2_exp
@@ -0,0 +1,28 @@
+processed 3 tasks
+
+task 0 'run'. lines 1-9:
+Error: Script execution failed with VMError: {
+    major_status: VECTOR_OPERATION_ERROR,
+    sub_status: Some(3),
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
+
+task 1 'run'. lines 11-19:
+Error: Script execution failed with VMError: {
+    major_status: VECTOR_OPERATION_ERROR,
+    sub_status: Some(3),
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 4)],
+}
+
+task 2 'run'. lines 21-30:
+Error: Script execution failed with VMError: {
+    major_status: VECTOR_OPERATION_ERROR,
+    sub_status: Some(3),
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 7)],
+}
diff --git a/third_party/move/move-vm/transactional-tests/tests/builtins/vector_ops_unpack_ok.v2_exp b/third_party/move/move-vm/transactional-tests/tests/builtins/vector_ops_unpack_ok.v2_exp
new file mode 100644
index 0000000000000..457ace9c4acb6
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/builtins/vector_ops_unpack_ok.v2_exp
@@ -0,0 +1 @@
+processed 4 tasks
diff --git a/third_party/move/move-vm/transactional-tests/tests/builtins/vector_ops_using_generics.v2_exp b/third_party/move/move-vm/transactional-tests/tests/builtins/vector_ops_using_generics.v2_exp
new file mode 100644
index 0000000000000..fc5a4436b29d4
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/builtins/vector_ops_using_generics.v2_exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/third_party/move/move-vm/transactional-tests/tests/builtins/verify_valid_bytearray.v2_exp b/third_party/move/move-vm/transactional-tests/tests/builtins/verify_valid_bytearray.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/builtins/verify_valid_bytearray.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-vm/transactional-tests/tests/commands/abort_in_module.v2_exp b/third_party/move/move-vm/transactional-tests/tests/commands/abort_in_module.v2_exp
new file mode 100644
index 0000000000000..19c425b4f9305
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/commands/abort_in_module.v2_exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 10-18:
+Error: Script execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(22),
+    location: 0x1::M,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
diff --git a/third_party/move/move-vm/transactional-tests/tests/commands/local_assigned_many_times.v2_exp b/third_party/move/move-vm/transactional-tests/tests/commands/local_assigned_many_times.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/commands/local_assigned_many_times.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-vm/transactional-tests/tests/control_flow/break_accumulator.v2_exp b/third_party/move/move-vm/transactional-tests/tests/control_flow/break_accumulator.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/control_flow/break_accumulator.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-vm/transactional-tests/tests/control_flow/break_continue_simple.v2_exp b/third_party/move/move-vm/transactional-tests/tests/control_flow/break_continue_simple.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/control_flow/break_continue_simple.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-vm/transactional-tests/tests/control_flow/break_continue_sum_of_odds.v2_exp b/third_party/move/move-vm/transactional-tests/tests/control_flow/break_continue_sum_of_odds.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/control_flow/break_continue_sum_of_odds.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-vm/transactional-tests/tests/control_flow/fields_packed_in_order.v2_exp b/third_party/move/move-vm/transactional-tests/tests/control_flow/fields_packed_in_order.v2_exp
new file mode 100644
index 0000000000000..208303ad6cade
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/control_flow/fields_packed_in_order.v2_exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 19-26:
+Error: Script execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(42),
+    location: 0x1::M,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
diff --git a/third_party/move/move-vm/transactional-tests/tests/control_flow/if_branch_diverges_1.v2_exp b/third_party/move/move-vm/transactional-tests/tests/control_flow/if_branch_diverges_1.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/control_flow/if_branch_diverges_1.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-vm/transactional-tests/tests/control_flow/if_branch_diverges_10.v2_exp b/third_party/move/move-vm/transactional-tests/tests/control_flow/if_branch_diverges_10.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/control_flow/if_branch_diverges_10.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-vm/transactional-tests/tests/control_flow/if_branch_diverges_2.v2_exp b/third_party/move/move-vm/transactional-tests/tests/control_flow/if_branch_diverges_2.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/control_flow/if_branch_diverges_2.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-vm/transactional-tests/tests/control_flow/if_branch_diverges_3.v2_exp b/third_party/move/move-vm/transactional-tests/tests/control_flow/if_branch_diverges_3.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/control_flow/if_branch_diverges_3.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-vm/transactional-tests/tests/control_flow/if_branch_diverges_4.v2_exp b/third_party/move/move-vm/transactional-tests/tests/control_flow/if_branch_diverges_4.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/control_flow/if_branch_diverges_4.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-vm/transactional-tests/tests/control_flow/if_branch_diverges_7.v2_exp b/third_party/move/move-vm/transactional-tests/tests/control_flow/if_branch_diverges_7.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/control_flow/if_branch_diverges_7.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-vm/transactional-tests/tests/control_flow/if_branch_diverges_9.v2_exp b/third_party/move/move-vm/transactional-tests/tests/control_flow/if_branch_diverges_9.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/control_flow/if_branch_diverges_9.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-vm/transactional-tests/tests/control_flow/loop_nested_breaks.v2_exp b/third_party/move/move-vm/transactional-tests/tests/control_flow/loop_nested_breaks.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/control_flow/loop_nested_breaks.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-vm/transactional-tests/tests/control_flow/loop_return.v2_exp b/third_party/move/move-vm/transactional-tests/tests/control_flow/loop_return.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/control_flow/loop_return.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-vm/transactional-tests/tests/control_flow/loop_simple.v2_exp b/third_party/move/move-vm/transactional-tests/tests/control_flow/loop_simple.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/control_flow/loop_simple.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-vm/transactional-tests/tests/control_flow/return_in_if_branch_taken.v2_exp b/third_party/move/move-vm/transactional-tests/tests/control_flow/return_in_if_branch_taken.v2_exp
new file mode 100644
index 0000000000000..5d92c423f3fd8
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/control_flow/return_in_if_branch_taken.v2_exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/third_party/move/move-vm/transactional-tests/tests/control_flow/return_in_if_branch_taken_local.v2_exp b/third_party/move/move-vm/transactional-tests/tests/control_flow/return_in_if_branch_taken_local.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/control_flow/return_in_if_branch_taken_local.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-vm/transactional-tests/tests/control_flow/return_in_if_branch_taken_no_else.v2_exp b/third_party/move/move-vm/transactional-tests/tests/control_flow/return_in_if_branch_taken_no_else.v2_exp
new file mode 100644
index 0000000000000..5d92c423f3fd8
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/control_flow/return_in_if_branch_taken_no_else.v2_exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/third_party/move/move-vm/transactional-tests/tests/control_flow/while_false.v2_exp b/third_party/move/move-vm/transactional-tests/tests/control_flow/while_false.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/control_flow/while_false.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-vm/transactional-tests/tests/control_flow/while_nested.v2_exp b/third_party/move/move-vm/transactional-tests/tests/control_flow/while_nested.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/control_flow/while_nested.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-vm/transactional-tests/tests/control_flow/while_nested_return.v2_exp b/third_party/move/move-vm/transactional-tests/tests/control_flow/while_nested_return.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/control_flow/while_nested_return.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-vm/transactional-tests/tests/control_flow/while_return.v2_exp b/third_party/move/move-vm/transactional-tests/tests/control_flow/while_return.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/control_flow/while_return.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-vm/transactional-tests/tests/control_flow/while_simple.v2_exp b/third_party/move/move-vm/transactional-tests/tests/control_flow/while_simple.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/control_flow/while_simple.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-vm/transactional-tests/tests/entry_points/address_arg_is_not_signer.v2_exp b/third_party/move/move-vm/transactional-tests/tests/entry_points/address_arg_is_not_signer.v2_exp
new file mode 100644
index 0000000000000..5d92c423f3fd8
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/entry_points/address_arg_is_not_signer.v2_exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/third_party/move/move-vm/transactional-tests/tests/entry_points/all_possible_param_types.v2_exp b/third_party/move/move-vm/transactional-tests/tests/entry_points/all_possible_param_types.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/entry_points/all_possible_param_types.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-vm/transactional-tests/tests/entry_points/expected_0_args_got_0.v2_exp b/third_party/move/move-vm/transactional-tests/tests/entry_points/expected_0_args_got_0.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/entry_points/expected_0_args_got_0.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-vm/transactional-tests/tests/entry_points/expected_0_args_got_1.v2_exp b/third_party/move/move-vm/transactional-tests/tests/entry_points/expected_0_args_got_1.v2_exp
new file mode 100644
index 0000000000000..9ac9e5ab024db
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/entry_points/expected_0_args_got_1.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-6:
+Error: Script execution failed with VMError: {
+    major_status: NUMBER_OF_ARGUMENTS_MISMATCH,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/third_party/move/move-vm/transactional-tests/tests/entry_points/expected_0_signer_args_got_1_ok.v2_exp b/third_party/move/move-vm/transactional-tests/tests/entry_points/expected_0_signer_args_got_1_ok.v2_exp
new file mode 100644
index 0000000000000..301fd72bf8207
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/entry_points/expected_0_signer_args_got_1_ok.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-5:
+Error: Script execution failed with VMError: {
+    major_status: NUMBER_OF_ARGUMENTS_MISMATCH,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/third_party/move/move-vm/transactional-tests/tests/entry_points/expected_1_arg_got_0.v2_exp b/third_party/move/move-vm/transactional-tests/tests/entry_points/expected_1_arg_got_0.v2_exp
new file mode 100644
index 0000000000000..9ac9e5ab024db
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/entry_points/expected_1_arg_got_0.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-6:
+Error: Script execution failed with VMError: {
+    major_status: NUMBER_OF_ARGUMENTS_MISMATCH,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/third_party/move/move-vm/transactional-tests/tests/entry_points/expected_1_arg_got_2.v2_exp b/third_party/move/move-vm/transactional-tests/tests/entry_points/expected_1_arg_got_2.v2_exp
new file mode 100644
index 0000000000000..301fd72bf8207
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/entry_points/expected_1_arg_got_2.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-5:
+Error: Script execution failed with VMError: {
+    major_status: NUMBER_OF_ARGUMENTS_MISMATCH,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/third_party/move/move-vm/transactional-tests/tests/entry_points/expected_1_signer_arg_got_1.v2_exp b/third_party/move/move-vm/transactional-tests/tests/entry_points/expected_1_signer_arg_got_1.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/entry_points/expected_1_signer_arg_got_1.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-vm/transactional-tests/tests/entry_points/expected_2_args_got_3.v2_exp b/third_party/move/move-vm/transactional-tests/tests/entry_points/expected_2_args_got_3.v2_exp
new file mode 100644
index 0000000000000..301fd72bf8207
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/entry_points/expected_2_args_got_3.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-5:
+Error: Script execution failed with VMError: {
+    major_status: NUMBER_OF_ARGUMENTS_MISMATCH,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/third_party/move/move-vm/transactional-tests/tests/entry_points/expected_2_signer_args_got_1.v2_exp b/third_party/move/move-vm/transactional-tests/tests/entry_points/expected_2_signer_args_got_1.v2_exp
new file mode 100644
index 0000000000000..9ac9e5ab024db
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/entry_points/expected_2_signer_args_got_1.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-6:
+Error: Script execution failed with VMError: {
+    major_status: NUMBER_OF_ARGUMENTS_MISMATCH,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/third_party/move/move-vm/transactional-tests/tests/entry_points/expected_u64_addr_got_addr.v2_exp b/third_party/move/move-vm/transactional-tests/tests/entry_points/expected_u64_addr_got_addr.v2_exp
new file mode 100644
index 0000000000000..301fd72bf8207
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/entry_points/expected_u64_addr_got_addr.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-5:
+Error: Script execution failed with VMError: {
+    major_status: NUMBER_OF_ARGUMENTS_MISMATCH,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/third_party/move/move-vm/transactional-tests/tests/entry_points/expected_u64_addr_got_addr_u64.v2_exp b/third_party/move/move-vm/transactional-tests/tests/entry_points/expected_u64_addr_got_addr_u64.v2_exp
new file mode 100644
index 0000000000000..3c2908c16e2b5
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/entry_points/expected_u64_addr_got_addr_u64.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-5:
+Error: Script execution failed with VMError: {
+    major_status: FAILED_TO_DESERIALIZE_ARGUMENT,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/third_party/move/move-vm/transactional-tests/tests/entry_points/expected_u64_addr_got_u64_addr.v2_exp b/third_party/move/move-vm/transactional-tests/tests/entry_points/expected_u64_addr_got_u64_addr.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/entry_points/expected_u64_addr_got_u64_addr.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-vm/transactional-tests/tests/entry_points/expected_u64_addr_got_u64_u64.v2_exp b/third_party/move/move-vm/transactional-tests/tests/entry_points/expected_u64_addr_got_u64_u64.v2_exp
new file mode 100644
index 0000000000000..3c2908c16e2b5
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/entry_points/expected_u64_addr_got_u64_u64.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-5:
+Error: Script execution failed with VMError: {
+    major_status: FAILED_TO_DESERIALIZE_ARGUMENT,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/third_party/move/move-vm/transactional-tests/tests/entry_points/expected_u64_got_address.v2_exp b/third_party/move/move-vm/transactional-tests/tests/entry_points/expected_u64_got_address.v2_exp
new file mode 100644
index 0000000000000..3c2908c16e2b5
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/entry_points/expected_u64_got_address.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-5:
+Error: Script execution failed with VMError: {
+    major_status: FAILED_TO_DESERIALIZE_ARGUMENT,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/third_party/move/move-vm/transactional-tests/tests/entry_points/expected_u64_got_u64.v2_exp b/third_party/move/move-vm/transactional-tests/tests/entry_points/expected_u64_got_u64.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/entry_points/expected_u64_got_u64.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-vm/transactional-tests/tests/entry_points/expected_u64_u64_address_got_u64_u64_address.v2_exp b/third_party/move/move-vm/transactional-tests/tests/entry_points/expected_u64_u64_address_got_u64_u64_address.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/entry_points/expected_u64_u64_address_got_u64_u64_address.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-vm/transactional-tests/tests/entry_points/generic_return_values.v2_exp b/third_party/move/move-vm/transactional-tests/tests/entry_points/generic_return_values.v2_exp
new file mode 100644
index 0000000000000..5045f170009ae
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/entry_points/generic_return_values.v2_exp
@@ -0,0 +1,49 @@
+processed 17 tasks
+
+task 1 'run'. lines 25-25:
+return values: 0
+
+task 2 'run'. lines 27-27:
+return values: 0
+
+task 3 'run'. lines 29-29:
+return values: [119, 97, 116]
+
+task 4 'run'. lines 31-31:
+return values: { 0 }
+
+task 5 'run'. lines 35-35:
+return values: [0]
+
+task 6 'run'. lines 37-37:
+return values: [0]
+
+task 7 'run'. lines 39-39:
+return values: [[119, 97, 116]]
+
+task 8 'run'. lines 41-41:
+return values: [{ 0 }]
+
+task 9 'run'. lines 45-45:
+return values: { 0 }
+
+task 10 'run'. lines 47-47:
+return values: { 0 }
+
+task 11 'run'. lines 49-49:
+return values: { [119, 97, 116] }
+
+task 12 'run'. lines 51-51:
+return values: { { 0 } }
+
+task 13 'run'. lines 55-55:
+return values: 0, 0
+
+task 14 'run'. lines 57-57:
+return values: false, 0
+
+task 15 'run'. lines 59-59:
+return values: { 0 }, [119, 97, 116]
+
+task 16 'run'. lines 61-61:
+return values: 0000000000000000000000000000000000000000000000000000000000000042, { 0 }
diff --git a/third_party/move/move-vm/transactional-tests/tests/entry_points/mixed_signer_inputs_function.v2_exp b/third_party/move/move-vm/transactional-tests/tests/entry_points/mixed_signer_inputs_function.v2_exp
new file mode 100644
index 0000000000000..457ace9c4acb6
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/entry_points/mixed_signer_inputs_function.v2_exp
@@ -0,0 +1 @@
+processed 4 tasks
diff --git a/third_party/move/move-vm/transactional-tests/tests/entry_points/mixed_signer_inputs_scripts.v2_exp b/third_party/move/move-vm/transactional-tests/tests/entry_points/mixed_signer_inputs_scripts.v2_exp
new file mode 100644
index 0000000000000..fc5a4436b29d4
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/entry_points/mixed_signer_inputs_scripts.v2_exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/third_party/move/move-vm/transactional-tests/tests/entry_points/modify_mutable_ref_inputs.v2_exp b/third_party/move/move-vm/transactional-tests/tests/entry_points/modify_mutable_ref_inputs.v2_exp
new file mode 100644
index 0000000000000..39b95de45d2e6
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/entry_points/modify_mutable_ref_inputs.v2_exp
@@ -0,0 +1,4 @@
+processed 3 tasks
+
+task 2 'run'. lines 42-42:
+mutable inputs after call: local#0: 112, local#1: { 224 }, local#2: [120, 0, 122]
diff --git a/third_party/move/move-vm/transactional-tests/tests/entry_points/ref_inputs.v2_exp b/third_party/move/move-vm/transactional-tests/tests/entry_points/ref_inputs.v2_exp
new file mode 100644
index 0000000000000..e7053a80af656
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/entry_points/ref_inputs.v2_exp
@@ -0,0 +1,10 @@
+processed 9 tasks
+
+task 6 'run'. lines 56-56:
+mutable inputs after call: local#0: false
+
+task 7 'run'. lines 58-58:
+mutable inputs after call: local#1: false, local#3: { 0 }
+
+task 8 'run'. lines 60-60:
+mutable inputs after call: local#1: false, local#3: { 0 }
diff --git a/third_party/move/move-vm/transactional-tests/tests/entry_points/return_values.v2_exp b/third_party/move/move-vm/transactional-tests/tests/entry_points/return_values.v2_exp
new file mode 100644
index 0000000000000..13f10dcbdf982
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/entry_points/return_values.v2_exp
@@ -0,0 +1,5 @@
+processed 2 tasks
+
+task 1 'run'. lines 20-20:
+mutable inputs after call: local#4: { 4 }
+return values: 0, { 0000000000000000000000000000000000000000000000000000000000000001 }, { 2 }, { 3 }, 3, 4
diff --git a/third_party/move/move-vm/transactional-tests/tests/entry_points/script_too_few_type_args.v2_exp b/third_party/move/move-vm/transactional-tests/tests/entry_points/script_too_few_type_args.v2_exp
new file mode 100644
index 0000000000000..b478f8ff04487
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/entry_points/script_too_few_type_args.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-5:
+Error: Script execution failed with VMError: {
+    major_status: NUMBER_OF_TYPE_ARGUMENTS_MISMATCH,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [],
+}
diff --git a/third_party/move/move-vm/transactional-tests/tests/entry_points/script_too_few_type_args_inner.v2_exp b/third_party/move/move-vm/transactional-tests/tests/entry_points/script_too_few_type_args_inner.v2_exp
new file mode 100644
index 0000000000000..8bfde526b7e76
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/entry_points/script_too_few_type_args_inner.v2_exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 6-10:
+Error: Script execution failed with VMError: {
+    major_status: NUMBER_OF_TYPE_ARGUMENTS_MISMATCH,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/third_party/move/move-vm/transactional-tests/tests/entry_points/script_too_many_type_args.v2_exp b/third_party/move/move-vm/transactional-tests/tests/entry_points/script_too_many_type_args.v2_exp
new file mode 100644
index 0000000000000..b478f8ff04487
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/entry_points/script_too_many_type_args.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-5:
+Error: Script execution failed with VMError: {
+    major_status: NUMBER_OF_TYPE_ARGUMENTS_MISMATCH,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [],
+}
diff --git a/third_party/move/move-vm/transactional-tests/tests/entry_points/script_too_many_type_args_inner.v2_exp b/third_party/move/move-vm/transactional-tests/tests/entry_points/script_too_many_type_args_inner.v2_exp
new file mode 100644
index 0000000000000..8bfde526b7e76
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/entry_points/script_too_many_type_args_inner.v2_exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 6-10:
+Error: Script execution failed with VMError: {
+    major_status: NUMBER_OF_TYPE_ARGUMENTS_MISMATCH,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/third_party/move/move-vm/transactional-tests/tests/entry_points/script_type_arg_kind_mismatch_1.v2_exp b/third_party/move/move-vm/transactional-tests/tests/entry_points/script_type_arg_kind_mismatch_1.v2_exp
new file mode 100644
index 0000000000000..1dddbff45c64e
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/entry_points/script_type_arg_kind_mismatch_1.v2_exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 20-24:
+Error: Script execution failed with VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [],
+}
diff --git a/third_party/move/move-vm/transactional-tests/tests/entry_points/script_type_arg_kind_mismatch_2.v2_exp b/third_party/move/move-vm/transactional-tests/tests/entry_points/script_type_arg_kind_mismatch_2.v2_exp
new file mode 100644
index 0000000000000..3c37d5fbfa6e7
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/entry_points/script_type_arg_kind_mismatch_2.v2_exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-5:
+Error: Script execution failed with VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [],
+}
diff --git a/third_party/move/move-vm/transactional-tests/tests/entry_points/script_type_args_type_eq.v2_exp b/third_party/move/move-vm/transactional-tests/tests/entry_points/script_type_args_type_eq.v2_exp
new file mode 100644
index 0000000000000..457ace9c4acb6
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/entry_points/script_type_args_type_eq.v2_exp
@@ -0,0 +1 @@
+processed 4 tasks
diff --git a/third_party/move/move-vm/transactional-tests/tests/entry_points/serializer_deserializer.v2_exp b/third_party/move/move-vm/transactional-tests/tests/entry_points/serializer_deserializer.v2_exp
new file mode 100644
index 0000000000000..9e6ada76f35d1
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/entry_points/serializer_deserializer.v2_exp
@@ -0,0 +1,11 @@
+processed 4 tasks
+
+task 2 'view'. lines 42-42:
+drop key 0x42::t::Ints {
+    f8: 128u8
+    f16: 32768u16
+    f32: 2147483648u32
+    f64: 9223372036854775808
+    f128: 170141183460469231731687303715884105728u128
+    f256: 57896044618658097711785492504343953926634992332820282019728792003956564819968u256
+}
diff --git a/third_party/move/move-vm/transactional-tests/tests/entry_points/struct_arguments.v2_exp b/third_party/move/move-vm/transactional-tests/tests/entry_points/struct_arguments.v2_exp
new file mode 100644
index 0000000000000..bd5ac63bb2bad
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/entry_points/struct_arguments.v2_exp
@@ -0,0 +1,7 @@
+processed 5 tasks
+
+task 3 'run'. lines 32-32:
+mutable inputs after call: local#2: { 0 }
+
+task 4 'run'. lines 34-34:
+mutable inputs after call: local#2: { 0 }
diff --git a/third_party/move/move-vm/transactional-tests/tests/example_programs/coin_wrapper.v2_exp b/third_party/move/move-vm/transactional-tests/tests/example_programs/coin_wrapper.v2_exp
new file mode 100644
index 0000000000000..2301000e50ae4
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/example_programs/coin_wrapper.v2_exp
@@ -0,0 +1 @@
+processed 6 tasks
diff --git a/third_party/move/move-vm/transactional-tests/tests/example_programs/sorted-linked-list.v2_exp b/third_party/move/move-vm/transactional-tests/tests/example_programs/sorted-linked-list.v2_exp
new file mode 100644
index 0000000000000..e20d099e05c8a
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/example_programs/sorted-linked-list.v2_exp
@@ -0,0 +1,136 @@
+processed 26 tasks
+
+task 2 'run'. lines 246-254:
+Error: Script execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(1),
+    location: 0x1::SortedLinkedList,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(3), 9)],
+}
+
+task 4 'run'. lines 265-273:
+Error: Script execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(3),
+    location: 0x1::SortedLinkedList,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(4), 9)],
+}
+
+task 5 'run'. lines 275-283:
+Error: Script execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(7),
+    location: 0x1::SortedLinkedList,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(4), 61)],
+}
+
+task 7 'run'. lines 294-302:
+Error: Script execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(6),
+    location: 0x1::SortedLinkedList,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(4), 52)],
+}
+
+task 9 'run'. lines 313-321:
+Error: Script execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(5),
+    location: 0x1::SortedLinkedList,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(4), 15)],
+}
+
+task 10 'run'. lines 323-331:
+Error: Script execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(6),
+    location: 0x1::SortedLinkedList,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(4), 52)],
+}
+
+task 11 'run'. lines 333-341:
+Error: Script execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(3),
+    location: 0x1::SortedLinkedList,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(4), 9)],
+}
+
+task 14 'run'. lines 361-369:
+Error: Script execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(11),
+    location: 0x1::SortedLinkedList,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(6), 8)],
+}
+
+task 17 'run'. lines 389-397:
+Error: Script execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(11),
+    location: 0x1::SortedLinkedList,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(6), 8)],
+}
+
+task 18 'run'. lines 399-407:
+Error: Script execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(15),
+    location: 0x1::SortedLinkedList,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(7), 27)],
+}
+
+task 19 'run'. lines 409-417:
+Error: Script execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(14),
+    location: 0x1::SortedLinkedList,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(7), 12)],
+}
+
+task 20 'run'. lines 419-427:
+Error: Script execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(12),
+    location: 0x1::SortedLinkedList,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(6), 15)],
+}
+
+task 21 'run'. lines 429-437:
+Error: Script execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(9),
+    location: 0x1::SortedLinkedList,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(5), 32)],
+}
+
+task 22 'run'. lines 439-450:
+Error: Script execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(14),
+    location: 0x1::SortedLinkedList,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(7), 12)],
+}
+
+task 23 'run'. lines 452-463:
+Error: Script execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(12),
+    location: 0x1::SortedLinkedList,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(6), 15)],
+}
diff --git a/third_party/move/move-vm/transactional-tests/tests/instructions/address_equality.v2_exp b/third_party/move/move-vm/transactional-tests/tests/instructions/address_equality.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/instructions/address_equality.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u128.v2_exp b/third_party/move/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u128.v2_exp
new file mode 100644
index 0000000000000..894e2537104b3
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u128.v2_exp
@@ -0,0 +1,109 @@
+processed 17 tasks
+
+task 1 'run'. lines 17-22:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 2 'run'. lines 24-29:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 4 'run'. lines 48-53:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 5 'run'. lines 55-60:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 7 'run'. lines 78-83:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 8 'run'. lines 85-90:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 10 'run'. lines 109-114:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 11 'run'. lines 116-121:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 12 'run'. lines 125-130:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 14 'run'. lines 148-153:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 15 'run'. lines 155-160:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 16 'run'. lines 162-167:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
diff --git a/third_party/move/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u16.v2_exp b/third_party/move/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u16.v2_exp
new file mode 100644
index 0000000000000..1ee584a384e0f
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u16.v2_exp
@@ -0,0 +1,109 @@
+processed 17 tasks
+
+task 1 'run'. lines 17-22:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 2 'run'. lines 24-29:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 4 'run'. lines 48-53:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 5 'run'. lines 55-60:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 7 'run'. lines 77-82:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 8 'run'. lines 84-89:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 10 'run'. lines 108-113:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 11 'run'. lines 115-120:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 12 'run'. lines 122-127:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 14 'run'. lines 145-150:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 15 'run'. lines 152-157:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 16 'run'. lines 159-164:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
diff --git a/third_party/move/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u256.v2_exp b/third_party/move/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u256.v2_exp
new file mode 100644
index 0000000000000..894e2537104b3
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u256.v2_exp
@@ -0,0 +1,109 @@
+processed 17 tasks
+
+task 1 'run'. lines 17-22:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 2 'run'. lines 24-29:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 4 'run'. lines 48-53:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 5 'run'. lines 55-60:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 7 'run'. lines 78-83:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 8 'run'. lines 85-90:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 10 'run'. lines 109-114:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 11 'run'. lines 116-121:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 12 'run'. lines 125-130:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 14 'run'. lines 148-153:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 15 'run'. lines 155-160:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 16 'run'. lines 162-167:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
diff --git a/third_party/move/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u32.v2_exp b/third_party/move/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u32.v2_exp
new file mode 100644
index 0000000000000..1ee584a384e0f
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u32.v2_exp
@@ -0,0 +1,109 @@
+processed 17 tasks
+
+task 1 'run'. lines 17-22:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 2 'run'. lines 24-29:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 4 'run'. lines 48-53:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 5 'run'. lines 55-60:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 7 'run'. lines 77-82:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 8 'run'. lines 84-89:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 10 'run'. lines 108-113:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 11 'run'. lines 115-120:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 12 'run'. lines 122-127:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 14 'run'. lines 145-150:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 15 'run'. lines 152-157:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 16 'run'. lines 159-164:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
diff --git a/third_party/move/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u64.v2_exp b/third_party/move/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u64.v2_exp
new file mode 100644
index 0000000000000..1ee584a384e0f
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u64.v2_exp
@@ -0,0 +1,109 @@
+processed 17 tasks
+
+task 1 'run'. lines 17-22:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 2 'run'. lines 24-29:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 4 'run'. lines 48-53:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 5 'run'. lines 55-60:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 7 'run'. lines 77-82:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 8 'run'. lines 84-89:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 10 'run'. lines 108-113:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 11 'run'. lines 115-120:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 12 'run'. lines 122-127:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 14 'run'. lines 145-150:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 15 'run'. lines 152-157:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 16 'run'. lines 159-164:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
diff --git a/third_party/move/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u8.v2_exp b/third_party/move/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u8.v2_exp
new file mode 100644
index 0000000000000..0cfc9bb8085fc
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u8.v2_exp
@@ -0,0 +1,133 @@
+processed 17 tasks
+
+task 1 'run'. lines 17-22:
+Error: Script execution failed with VMError: {
+    message: Addition overflow,
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+    exec_state: Some(ExecutionState { stack_trace: [] }),
+}
+
+task 2 'run'. lines 24-29:
+Error: Script execution failed with VMError: {
+    message: Addition overflow,
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+    exec_state: Some(ExecutionState { stack_trace: [] }),
+}
+
+task 4 'run'. lines 48-53:
+Error: Script execution failed with VMError: {
+    message: Subtraction overflow,
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+    exec_state: Some(ExecutionState { stack_trace: [] }),
+}
+
+task 5 'run'. lines 55-60:
+Error: Script execution failed with VMError: {
+    message: Subtraction overflow,
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+    exec_state: Some(ExecutionState { stack_trace: [] }),
+}
+
+task 7 'run'. lines 77-82:
+Error: Script execution failed with VMError: {
+    message: Multiplication overflow,
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+    exec_state: Some(ExecutionState { stack_trace: [] }),
+}
+
+task 8 'run'. lines 84-89:
+Error: Script execution failed with VMError: {
+    message: Multiplication overflow,
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+    exec_state: Some(ExecutionState { stack_trace: [] }),
+}
+
+task 10 'run'. lines 108-113:
+Error: Script execution failed with VMError: {
+    message: Division by zero,
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+    exec_state: Some(ExecutionState { stack_trace: [] }),
+}
+
+task 11 'run'. lines 115-120:
+Error: Script execution failed with VMError: {
+    message: Division by zero,
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+    exec_state: Some(ExecutionState { stack_trace: [] }),
+}
+
+task 12 'run'. lines 122-127:
+Error: Script execution failed with VMError: {
+    message: Division by zero,
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+    exec_state: Some(ExecutionState { stack_trace: [] }),
+}
+
+task 14 'run'. lines 146-151:
+Error: Script execution failed with VMError: {
+    message: Integer remainder by zero,
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+    exec_state: Some(ExecutionState { stack_trace: [] }),
+}
+
+task 15 'run'. lines 153-158:
+Error: Script execution failed with VMError: {
+    message: Integer remainder by zero,
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+    exec_state: Some(ExecutionState { stack_trace: [] }),
+}
+
+task 16 'run'. lines 160-165:
+Error: Script execution failed with VMError: {
+    message: Integer remainder by zero,
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+    exec_state: Some(ExecutionState { stack_trace: [] }),
+}
diff --git a/third_party/move/move-vm/transactional-tests/tests/instructions/assign_struct_field.v2_exp b/third_party/move/move-vm/transactional-tests/tests/instructions/assign_struct_field.v2_exp
new file mode 100644
index 0000000000000..acfa04e68ce1b
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/instructions/assign_struct_field.v2_exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 27-47:
+Error: Script execution failed with VMError: {
+    major_status: CALL_BORROWED_MUTABLE_REFERENCE_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 19)],
+}
diff --git a/third_party/move/move-vm/transactional-tests/tests/instructions/bitwise_operators.v2_exp b/third_party/move/move-vm/transactional-tests/tests/instructions/bitwise_operators.v2_exp
new file mode 100644
index 0000000000000..fc5a4436b29d4
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/instructions/bitwise_operators.v2_exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/third_party/move/move-vm/transactional-tests/tests/instructions/boolean_operators.v2_exp b/third_party/move/move-vm/transactional-tests/tests/instructions/boolean_operators.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/instructions/boolean_operators.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-vm/transactional-tests/tests/instructions/casting_operators.v2_exp b/third_party/move/move-vm/transactional-tests/tests/instructions/casting_operators.v2_exp
new file mode 100644
index 0000000000000..2f4f39f7ed21f
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/instructions/casting_operators.v2_exp
@@ -0,0 +1,289 @@
+processed 38 tasks
+
+task 6 'run'. lines 175-181:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 7 'run'. lines 183-189:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 8 'run'. lines 191-197:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 9 'run'. lines 199-205:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 10 'run'. lines 207-213:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 11 'run'. lines 215-221:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 12 'run'. lines 223-229:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 13 'run'. lines 231-237:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 14 'run'. lines 239-245:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 15 'run'. lines 247-253:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 16 'run'. lines 255-261:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 17 'run'. lines 263-271:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 18 'run'. lines 272-278:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 19 'run'. lines 280-286:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 20 'run'. lines 288-294:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 21 'run'. lines 296-302:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 22 'run'. lines 304-310:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 23 'run'. lines 312-320:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 24 'run'. lines 321-327:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 25 'run'. lines 329-335:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 26 'run'. lines 337-343:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 27 'run'. lines 345-351:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 28 'run'. lines 353-359:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 29 'run'. lines 361-367:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 30 'run'. lines 369-375:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 31 'run'. lines 377-385:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 32 'run'. lines 386-392:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 33 'run'. lines 394-400:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 34 'run'. lines 402-408:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 35 'run'. lines 410-416:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 36 'run'. lines 418-424:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 37 'run'. lines 426-432:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
diff --git a/third_party/move/move-vm/transactional-tests/tests/instructions/comparison_operators.v2_exp b/third_party/move/move-vm/transactional-tests/tests/instructions/comparison_operators.v2_exp
new file mode 100644
index 0000000000000..2301000e50ae4
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/instructions/comparison_operators.v2_exp
@@ -0,0 +1 @@
+processed 6 tasks
diff --git a/third_party/move/move-vm/transactional-tests/tests/instructions/deref_value.v2_exp b/third_party/move/move-vm/transactional-tests/tests/instructions/deref_value.v2_exp
new file mode 100644
index 0000000000000..5d92c423f3fd8
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/instructions/deref_value.v2_exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/third_party/move/move-vm/transactional-tests/tests/instructions/deref_value_nested.v2_exp b/third_party/move/move-vm/transactional-tests/tests/instructions/deref_value_nested.v2_exp
new file mode 100644
index 0000000000000..fc5a4436b29d4
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/instructions/deref_value_nested.v2_exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/third_party/move/move-vm/transactional-tests/tests/instructions/equality_reference_value.v2_exp b/third_party/move/move-vm/transactional-tests/tests/instructions/equality_reference_value.v2_exp
new file mode 100644
index 0000000000000..5d92c423f3fd8
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/instructions/equality_reference_value.v2_exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/third_party/move/move-vm/transactional-tests/tests/instructions/field_reads.v2_exp b/third_party/move/move-vm/transactional-tests/tests/instructions/field_reads.v2_exp
new file mode 100644
index 0000000000000..fc5a4436b29d4
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/instructions/field_reads.v2_exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/third_party/move/move-vm/transactional-tests/tests/instructions/field_writes.v2_exp b/third_party/move/move-vm/transactional-tests/tests/instructions/field_writes.v2_exp
new file mode 100644
index 0000000000000..fc5a4436b29d4
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/instructions/field_writes.v2_exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/third_party/move/move-vm/transactional-tests/tests/instructions/operator_precedence.v2_exp b/third_party/move/move-vm/transactional-tests/tests/instructions/operator_precedence.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/instructions/operator_precedence.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-vm/transactional-tests/tests/instructions/pack_unpack.v2_exp b/third_party/move/move-vm/transactional-tests/tests/instructions/pack_unpack.v2_exp
new file mode 100644
index 0000000000000..5d92c423f3fd8
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/instructions/pack_unpack.v2_exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/third_party/move/move-vm/transactional-tests/tests/instructions/shift_operators.v2_exp b/third_party/move/move-vm/transactional-tests/tests/instructions/shift_operators.v2_exp
new file mode 100644
index 0000000000000..6736be6c172ea
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/instructions/shift_operators.v2_exp
@@ -0,0 +1,91 @@
+processed 16 tasks
+
+task 0 'run'. lines 1-7:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 1 'run'. lines 9-14:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 2 'run'. lines 16-21:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 3 'run'. lines 23-28:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 4 'run'. lines 30-35:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 5 'run'. lines 37-42:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 6 'run'. lines 44-49:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 7 'run'. lines 51-56:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 8 'run'. lines 58-63:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 9 'run'. lines 65-73:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
diff --git a/third_party/move/move-vm/transactional-tests/tests/instructions/simple_arithmetic.v2_exp b/third_party/move/move-vm/transactional-tests/tests/instructions/simple_arithmetic.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/instructions/simple_arithmetic.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-vm/transactional-tests/tests/module_publishing/publish_module_and_use.v2_exp b/third_party/move/move-vm/transactional-tests/tests/module_publishing/publish_module_and_use.v2_exp
new file mode 100644
index 0000000000000..fc5a4436b29d4
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/module_publishing/publish_module_and_use.v2_exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/third_party/move/move-vm/transactional-tests/tests/module_publishing/publish_module_and_use_2.v2_exp b/third_party/move/move-vm/transactional-tests/tests/module_publishing/publish_module_and_use_2.v2_exp
new file mode 100644
index 0000000000000..5d92c423f3fd8
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/module_publishing/publish_module_and_use_2.v2_exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/third_party/move/move-vm/transactional-tests/tests/module_publishing/publish_module_and_use_3.v2_exp b/third_party/move/move-vm/transactional-tests/tests/module_publishing/publish_module_and_use_3.v2_exp
new file mode 100644
index 0000000000000..5d92c423f3fd8
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/module_publishing/publish_module_and_use_3.v2_exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/third_party/move/move-vm/transactional-tests/tests/module_publishing/publish_module_and_use_with_multiple_return_values.v2_exp b/third_party/move/move-vm/transactional-tests/tests/module_publishing/publish_module_and_use_with_multiple_return_values.v2_exp
new file mode 100644
index 0000000000000..5d92c423f3fd8
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/module_publishing/publish_module_and_use_with_multiple_return_values.v2_exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/third_party/move/move-vm/transactional-tests/tests/module_publishing/publish_two_modules.v2_exp b/third_party/move/move-vm/transactional-tests/tests/module_publishing/publish_two_modules.v2_exp
new file mode 100644
index 0000000000000..457ace9c4acb6
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/module_publishing/publish_two_modules.v2_exp
@@ -0,0 +1 @@
+processed 4 tasks
diff --git a/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_compatible.v2_exp b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_compatible.v2_exp
new file mode 100644
index 0000000000000..5d92c423f3fd8
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_compatible.v2_exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_compatible_add_entry.v2_exp b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_compatible_add_entry.v2_exp
new file mode 100644
index 0000000000000..2301000e50ae4
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_compatible_add_entry.v2_exp
@@ -0,0 +1 @@
+processed 6 tasks
diff --git a/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_compatible_add_friend.v2_exp b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_compatible_add_friend.v2_exp
new file mode 100644
index 0000000000000..457ace9c4acb6
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_compatible_add_friend.v2_exp
@@ -0,0 +1 @@
+processed 4 tasks
diff --git a/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_compatible_friend_fn_to_public.v2_exp b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_compatible_friend_fn_to_public.v2_exp
new file mode 100644
index 0000000000000..457ace9c4acb6
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_compatible_friend_fn_to_public.v2_exp
@@ -0,0 +1 @@
+processed 4 tasks
diff --git a/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_cyclic_dependencies_fn.v2_exp b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_cyclic_dependencies_fn.v2_exp
new file mode 100644
index 0000000000000..1c2f44bd46053
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_cyclic_dependencies_fn.v2_exp
@@ -0,0 +1,10 @@
+processed 5 tasks
+
+task 4 'publish'. lines 39-46:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::A'. Got VMError: {
+    major_status: CYCLIC_MODULE_DEPENDENCY,
+    sub_status: None,
+    location: 0x42::A,
+    indices: [],
+    offsets: [],
+}
diff --git a/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_cyclic_dependencies_friend.v2_exp b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_cyclic_dependencies_friend.v2_exp
new file mode 100644
index 0000000000000..bf028fa1b2d57
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_cyclic_dependencies_friend.v2_exp
@@ -0,0 +1,10 @@
+processed 4 tasks
+
+task 3 'publish'. lines 15-18:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::A'. Got VMError: {
+    major_status: CYCLIC_MODULE_FRIENDSHIP,
+    sub_status: None,
+    location: 0x42::A,
+    indices: [],
+    offsets: [],
+}
diff --git a/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_cyclic_dependencies_struct.v2_exp b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_cyclic_dependencies_struct.v2_exp
new file mode 100644
index 0000000000000..7784f42b4a64e
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_cyclic_dependencies_struct.v2_exp
@@ -0,0 +1,10 @@
+processed 4 tasks
+
+task 3 'publish'. lines 24-33:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::A'. Got VMError: {
+    major_status: CYCLIC_MODULE_DEPENDENCY,
+    sub_status: None,
+    location: 0x42::A,
+    indices: [],
+    offsets: [],
+}
diff --git a/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_change_friend_fn.exp b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_change_friend_fn.exp
index 3d2556fa937d2..a96adea92e28c 100644
--- a/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_change_friend_fn.exp
+++ b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_change_friend_fn.exp
@@ -2,7 +2,7 @@ processed 4 tasks
 
 task 3 'publish'. lines 28-36:
 Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
-    message: Module Update Failure: Friend signature of new module differs from existing module in 0000000000000000000000000000000000000000000000000000000000000042::M,
+    message: Module update failure: new module not compatible with existing module in `0000000000000000000000000000000000000000000000000000000000000042::M`: changed return type of function `foo`,
     major_status: BACKWARD_INCOMPATIBLE_MODULE_UPDATE,
     sub_status: None,
     location: undefined,
diff --git a/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_change_friend_fn.v2_exp b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_change_friend_fn.v2_exp
new file mode 100644
index 0000000000000..a96adea92e28c
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_change_friend_fn.v2_exp
@@ -0,0 +1,12 @@
+processed 4 tasks
+
+task 3 'publish'. lines 28-36:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    message: Module update failure: new module not compatible with existing module in `0000000000000000000000000000000000000000000000000000000000000042::M`: changed return type of function `foo`,
+    major_status: BACKWARD_INCOMPATIBLE_MODULE_UPDATE,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+    exec_state: None,
+}
diff --git a/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_change_unused_friend_fn.exp b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_change_unused_friend_fn.exp
index 58a8653c2cd8d..1a9382c9ac73f 100644
--- a/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_change_unused_friend_fn.exp
+++ b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_change_unused_friend_fn.exp
@@ -2,7 +2,7 @@ processed 3 tasks
 
 task 2 'publish'. lines 14-22:
 Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
-    message: Module Update Failure: Friend signature of new module differs from existing module in 0000000000000000000000000000000000000000000000000000000000000042::M,
+    message: Module update failure: new module not compatible with existing module in `0000000000000000000000000000000000000000000000000000000000000042::M`: changed return type of function `foo`,
     major_status: BACKWARD_INCOMPATIBLE_MODULE_UPDATE,
     sub_status: None,
     location: undefined,
diff --git a/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_change_unused_friend_fn.v2_exp b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_change_unused_friend_fn.v2_exp
new file mode 100644
index 0000000000000..1a9382c9ac73f
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_change_unused_friend_fn.v2_exp
@@ -0,0 +1,12 @@
+processed 3 tasks
+
+task 2 'publish'. lines 14-22:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    message: Module update failure: new module not compatible with existing module in `0000000000000000000000000000000000000000000000000000000000000042::M`: changed return type of function `foo`,
+    major_status: BACKWARD_INCOMPATIBLE_MODULE_UPDATE,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+    exec_state: None,
+}
diff --git a/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_delete_friend_fn.exp b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_delete_friend_fn.exp
index afeb9af951c20..99cd9994fff4c 100644
--- a/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_delete_friend_fn.exp
+++ b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_delete_friend_fn.exp
@@ -2,7 +2,7 @@ processed 4 tasks
 
 task 3 'publish'. lines 28-33:
 Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
-    message: Module Update Failure: Friend signature of new module differs from existing module in 0000000000000000000000000000000000000000000000000000000000000042::M,
+    message: Module update failure: new module not compatible with existing module in `0000000000000000000000000000000000000000000000000000000000000042::M`: removed function `foo`,
     major_status: BACKWARD_INCOMPATIBLE_MODULE_UPDATE,
     sub_status: None,
     location: undefined,
diff --git a/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_delete_friend_fn.v2_exp b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_delete_friend_fn.v2_exp
new file mode 100644
index 0000000000000..99cd9994fff4c
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_delete_friend_fn.v2_exp
@@ -0,0 +1,12 @@
+processed 4 tasks
+
+task 3 'publish'. lines 28-33:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    message: Module update failure: new module not compatible with existing module in `0000000000000000000000000000000000000000000000000000000000000042::M`: removed function `foo`,
+    major_status: BACKWARD_INCOMPATIBLE_MODULE_UPDATE,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+    exec_state: None,
+}
diff --git a/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_delete_unused_friend_fn.exp b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_delete_unused_friend_fn.exp
index ff8b588225af6..e8825d18338e0 100644
--- a/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_delete_unused_friend_fn.exp
+++ b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_delete_unused_friend_fn.exp
@@ -2,7 +2,7 @@ processed 3 tasks
 
 task 2 'publish'. lines 14-18:
 Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
-    message: Module Update Failure: Friend signature of new module differs from existing module in 0000000000000000000000000000000000000000000000000000000000000042::M,
+    message: Module update failure: new module not compatible with existing module in `0000000000000000000000000000000000000000000000000000000000000042::M`: removed function `foo`,
     major_status: BACKWARD_INCOMPATIBLE_MODULE_UPDATE,
     sub_status: None,
     location: undefined,
diff --git a/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_delete_unused_friend_fn.v2_exp b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_delete_unused_friend_fn.v2_exp
new file mode 100644
index 0000000000000..e8825d18338e0
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_delete_unused_friend_fn.v2_exp
@@ -0,0 +1,12 @@
+processed 3 tasks
+
+task 2 'publish'. lines 14-18:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    message: Module update failure: new module not compatible with existing module in `0000000000000000000000000000000000000000000000000000000000000042::M`: removed function `foo`,
+    major_status: BACKWARD_INCOMPATIBLE_MODULE_UPDATE,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+    exec_state: None,
+}
diff --git a/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_drop_friend.exp b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_drop_friend.exp
index 1eb3dedbb7114..048657e5ca812 100644
--- a/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_drop_friend.exp
+++ b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_drop_friend.exp
@@ -2,7 +2,7 @@ processed 4 tasks
 
 task 3 'publish'. lines 28-35:
 Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
-    message: Module Update Failure: Friend signature of new module differs from existing module in 0000000000000000000000000000000000000000000000000000000000000042::M,
+    message: Module update failure: new module not compatible with existing module in `0000000000000000000000000000000000000000000000000000000000000042::M`: removed friend declaration `0000000000000000000000000000000000000000000000000000000000000042::N`,
     major_status: BACKWARD_INCOMPATIBLE_MODULE_UPDATE,
     sub_status: None,
     location: undefined,
diff --git a/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_drop_friend.v2_exp b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_drop_friend.v2_exp
new file mode 100644
index 0000000000000..048657e5ca812
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_drop_friend.v2_exp
@@ -0,0 +1,12 @@
+processed 4 tasks
+
+task 3 'publish'. lines 28-35:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    message: Module update failure: new module not compatible with existing module in `0000000000000000000000000000000000000000000000000000000000000042::M`: removed friend declaration `0000000000000000000000000000000000000000000000000000000000000042::N`,
+    major_status: BACKWARD_INCOMPATIBLE_MODULE_UPDATE,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+    exec_state: None,
+}
diff --git a/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_drop_unlinked_friend.exp b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_drop_unlinked_friend.exp
index 23d878577c143..fdc2824fef743 100644
--- a/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_drop_unlinked_friend.exp
+++ b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_drop_unlinked_friend.exp
@@ -2,7 +2,7 @@ processed 3 tasks
 
 task 2 'publish'. lines 14-21:
 Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
-    message: Module Update Failure: Friend signature of new module differs from existing module in 0000000000000000000000000000000000000000000000000000000000000042::M,
+    message: Module update failure: new module not compatible with existing module in `0000000000000000000000000000000000000000000000000000000000000042::M`: removed friend declaration `0000000000000000000000000000000000000000000000000000000000000042::N`,
     major_status: BACKWARD_INCOMPATIBLE_MODULE_UPDATE,
     sub_status: None,
     location: undefined,
diff --git a/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_drop_unlinked_friend.v2_exp b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_drop_unlinked_friend.v2_exp
new file mode 100644
index 0000000000000..fdc2824fef743
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_drop_unlinked_friend.v2_exp
@@ -0,0 +1,12 @@
+processed 3 tasks
+
+task 2 'publish'. lines 14-21:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    message: Module update failure: new module not compatible with existing module in `0000000000000000000000000000000000000000000000000000000000000042::M`: removed friend declaration `0000000000000000000000000000000000000000000000000000000000000042::N`,
+    major_status: BACKWARD_INCOMPATIBLE_MODULE_UPDATE,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+    exec_state: None,
+}
diff --git a/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_entry_removed.exp b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_entry_removed.exp
index c499538eb82b9..acafde99a2e4d 100644
--- a/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_entry_removed.exp
+++ b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_entry_removed.exp
@@ -2,7 +2,7 @@ processed 6 tasks
 
 task 1 'publish'. lines 11-17:
 Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::Priv'. Got VMError: {
-    message: Module Update Failure: Public function/struct signature of new module differs from existing module in 0000000000000000000000000000000000000000000000000000000000000042::Priv,
+    message: Module update failure: new module not compatible with existing module in `0000000000000000000000000000000000000000000000000000000000000042::Priv`: removed `entry` modifier of function `foo`,
     major_status: BACKWARD_INCOMPATIBLE_MODULE_UPDATE,
     sub_status: None,
     location: undefined,
@@ -13,7 +13,7 @@ Error: Unable to publish module '00000000000000000000000000000000000000000000000
 
 task 3 'publish'. lines 27-33:
 Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::Pub'. Got VMError: {
-    message: Module Update Failure: Public function/struct signature of new module differs from existing module in 0000000000000000000000000000000000000000000000000000000000000042::Pub,
+    message: Module update failure: new module not compatible with existing module in `0000000000000000000000000000000000000000000000000000000000000042::Pub`: removed `entry` modifier of function `foo`,
     major_status: BACKWARD_INCOMPATIBLE_MODULE_UPDATE,
     sub_status: None,
     location: undefined,
@@ -24,7 +24,7 @@ Error: Unable to publish module '00000000000000000000000000000000000000000000000
 
 task 5 'publish'. lines 43-49:
 Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::Fr'. Got VMError: {
-    message: Module Update Failure: Friend signature of new module differs from existing module in 0000000000000000000000000000000000000000000000000000000000000042::Fr,
+    message: Module update failure: new module not compatible with existing module in `0000000000000000000000000000000000000000000000000000000000000042::Fr`: removed `entry` modifier of function `foo`,
     major_status: BACKWARD_INCOMPATIBLE_MODULE_UPDATE,
     sub_status: None,
     location: undefined,
diff --git a/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_entry_removed.v2_exp b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_entry_removed.v2_exp
new file mode 100644
index 0000000000000..acafde99a2e4d
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_entry_removed.v2_exp
@@ -0,0 +1,34 @@
+processed 6 tasks
+
+task 1 'publish'. lines 11-17:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::Priv'. Got VMError: {
+    message: Module update failure: new module not compatible with existing module in `0000000000000000000000000000000000000000000000000000000000000042::Priv`: removed `entry` modifier of function `foo`,
+    major_status: BACKWARD_INCOMPATIBLE_MODULE_UPDATE,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+    exec_state: None,
+}
+
+task 3 'publish'. lines 27-33:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::Pub'. Got VMError: {
+    message: Module update failure: new module not compatible with existing module in `0000000000000000000000000000000000000000000000000000000000000042::Pub`: removed `entry` modifier of function `foo`,
+    major_status: BACKWARD_INCOMPATIBLE_MODULE_UPDATE,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+    exec_state: None,
+}
+
+task 5 'publish'. lines 43-49:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::Fr'. Got VMError: {
+    message: Module update failure: new module not compatible with existing module in `0000000000000000000000000000000000000000000000000000000000000042::Fr`: removed `entry` modifier of function `foo`,
+    major_status: BACKWARD_INCOMPATIBLE_MODULE_UPDATE,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+    exec_state: None,
+}
diff --git a/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_friend_fn_skip_check_friend_linking.v2_exp b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_friend_fn_skip_check_friend_linking.v2_exp
new file mode 100644
index 0000000000000..256b0148cfabd
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_friend_fn_skip_check_friend_linking.v2_exp
@@ -0,0 +1,10 @@
+processed 5 tasks
+
+task 4 'run'. lines 39-39:
+Error: Function execution failed with VMError: {
+    major_status: UNEXPECTED_VERIFIER_ERROR,
+    sub_status: None,
+    location: 0x42::N,
+    indices: [(FunctionHandle, 1)],
+    offsets: [],
+}
diff --git a/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_friend_fn_skip_check_friend_linking_remove.v2_exp b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_friend_fn_skip_check_friend_linking_remove.v2_exp
new file mode 100644
index 0000000000000..5453beaf0d865
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_friend_fn_skip_check_friend_linking_remove.v2_exp
@@ -0,0 +1,10 @@
+processed 5 tasks
+
+task 4 'run'. lines 34-34:
+Error: Function execution failed with VMError: {
+    major_status: UNEXPECTED_VERIFIER_ERROR,
+    sub_status: None,
+    location: 0x42::N,
+    indices: [(FunctionHandle, 1)],
+    offsets: [],
+}
diff --git a/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_friend_fn_to_private.exp b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_friend_fn_to_private.exp
index 3d2556fa937d2..beb49de9269c5 100644
--- a/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_friend_fn_to_private.exp
+++ b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_friend_fn_to_private.exp
@@ -2,7 +2,7 @@ processed 4 tasks
 
 task 3 'publish'. lines 28-36:
 Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
-    message: Module Update Failure: Friend signature of new module differs from existing module in 0000000000000000000000000000000000000000000000000000000000000042::M,
+    message: Module update failure: new module not compatible with existing module in `0000000000000000000000000000000000000000000000000000000000000042::M`: changed visibility of function `foo`,
     major_status: BACKWARD_INCOMPATIBLE_MODULE_UPDATE,
     sub_status: None,
     location: undefined,
diff --git a/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_friend_fn_to_private.v2_exp b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_friend_fn_to_private.v2_exp
new file mode 100644
index 0000000000000..beb49de9269c5
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_friend_fn_to_private.v2_exp
@@ -0,0 +1,12 @@
+processed 4 tasks
+
+task 3 'publish'. lines 28-36:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    message: Module update failure: new module not compatible with existing module in `0000000000000000000000000000000000000000000000000000000000000042::M`: changed visibility of function `foo`,
+    major_status: BACKWARD_INCOMPATIBLE_MODULE_UPDATE,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+    exec_state: None,
+}
diff --git a/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_layout.exp b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_layout.exp
index d9f71cedb190a..c49e0dc2556a4 100644
--- a/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_layout.exp
+++ b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_layout.exp
@@ -2,7 +2,7 @@ processed 2 tasks
 
 task 1 'publish'. lines 6-10:
 Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::Duplicate'. Got VMError: {
-    message: Module Update Failure: Struct layout of new module differs from existing modul in 0000000000000000000000000000000000000000000000000000000000000042::Duplicate,
+    message: Module update failure: new module not compatible with existing module in `0000000000000000000000000000000000000000000000000000000000000042::Duplicate`: changed layout of struct `T`,
     major_status: BACKWARD_INCOMPATIBLE_MODULE_UPDATE,
     sub_status: None,
     location: undefined,
diff --git a/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_layout.v2_exp b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_layout.v2_exp
new file mode 100644
index 0000000000000..c49e0dc2556a4
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_layout.v2_exp
@@ -0,0 +1,12 @@
+processed 2 tasks
+
+task 1 'publish'. lines 6-10:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::Duplicate'. Got VMError: {
+    message: Module update failure: new module not compatible with existing module in `0000000000000000000000000000000000000000000000000000000000000042::Duplicate`: changed layout of struct `T`,
+    major_status: BACKWARD_INCOMPATIBLE_MODULE_UPDATE,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+    exec_state: None,
+}
diff --git a/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_layout_struct.exp b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_layout_struct.exp
index 8c247432ee505..06e885050301d 100644
--- a/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_layout_struct.exp
+++ b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_layout_struct.exp
@@ -2,7 +2,7 @@ processed 2 tasks
 
 task 1 'publish'. lines 7-13:
 Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::Duplicate'. Got VMError: {
-    message: Module Update Failure: Struct layout of new module differs from existing modul in 0000000000000000000000000000000000000000000000000000000000000042::Duplicate,
+    message: Module update failure: new module not compatible with existing module in `0000000000000000000000000000000000000000000000000000000000000042::Duplicate`: changed layout of struct `T`,
     major_status: BACKWARD_INCOMPATIBLE_MODULE_UPDATE,
     sub_status: None,
     location: undefined,
diff --git a/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_layout_struct.v2_exp b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_layout_struct.v2_exp
new file mode 100644
index 0000000000000..06e885050301d
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_layout_struct.v2_exp
@@ -0,0 +1,12 @@
+processed 2 tasks
+
+task 1 'publish'. lines 7-13:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::Duplicate'. Got VMError: {
+    message: Module update failure: new module not compatible with existing module in `0000000000000000000000000000000000000000000000000000000000000042::Duplicate`: changed layout of struct `T`,
+    major_status: BACKWARD_INCOMPATIBLE_MODULE_UPDATE,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+    exec_state: None,
+}
diff --git a/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_linking.exp b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_linking.exp
index 074055f193525..a363ee34f86d7 100644
--- a/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_linking.exp
+++ b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_linking.exp
@@ -2,7 +2,7 @@ processed 2 tasks
 
 task 1 'publish'. lines 7-11:
 Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::Duplicate'. Got VMError: {
-    message: Module Update Failure: Public function/struct signature of new module differs from existing module in 0000000000000000000000000000000000000000000000000000000000000042::Duplicate,
+    message: Module update failure: new module not compatible with existing module in `0000000000000000000000000000000000000000000000000000000000000042::Duplicate`: removed function `g`,
     major_status: BACKWARD_INCOMPATIBLE_MODULE_UPDATE,
     sub_status: None,
     location: undefined,
diff --git a/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_linking.v2_exp b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_linking.v2_exp
new file mode 100644
index 0000000000000..a363ee34f86d7
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_linking.v2_exp
@@ -0,0 +1,12 @@
+processed 2 tasks
+
+task 1 'publish'. lines 7-11:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::Duplicate'. Got VMError: {
+    message: Module update failure: new module not compatible with existing module in `0000000000000000000000000000000000000000000000000000000000000042::Duplicate`: removed function `g`,
+    major_status: BACKWARD_INCOMPATIBLE_MODULE_UPDATE,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+    exec_state: None,
+}
diff --git a/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_skip_compatible_linking.v2_exp b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_skip_compatible_linking.v2_exp
new file mode 100644
index 0000000000000..ddb83526e75ae
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_skip_compatible_linking.v2_exp
@@ -0,0 +1,10 @@
+processed 6 tasks
+
+task 5 'run'. lines 69-69:
+Error: Function execution failed with VMError: {
+    major_status: UNEXPECTED_VERIFIER_ERROR,
+    sub_status: None,
+    location: 0x43::B,
+    indices: [(FunctionHandle, 2)],
+    offsets: [],
+}
diff --git a/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_skip_compatible_linking_hack_struct.exp b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_skip_compatible_linking_hack_struct.exp
deleted file mode 100644
index 7fda414fa2fca..0000000000000
--- a/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_skip_compatible_linking_hack_struct.exp
+++ /dev/null
@@ -1,30 +0,0 @@
-processed 5 tasks
-
-task 2 'publish'. lines 18-23:
-Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::A'. Got VMError: {
-    major_status: BACKWARD_INCOMPATIBLE_MODULE_UPDATE,
-    sub_status: None,
-    location: undefined,
-    indices: [],
-    offsets: [],
-}
-
-task 3 'publish'. lines 25-45:
-Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::A'. Got VMError: {
-    message: Module Update Failure: Public function/struct signature of new module differs from existing module in 0000000000000000000000000000000000000000000000000000000000000042::A,
-    major_status: BACKWARD_INCOMPATIBLE_MODULE_UPDATE,
-    sub_status: None,
-    location: undefined,
-    indices: [],
-    offsets: [],
-    exec_state: None,
-}
-
-task 4 'run'. lines 47-47:
-Error: Function execution failed with VMError: {
-    major_status: FUNCTION_RESOLUTION_FAILURE,
-    sub_status: None,
-    location: undefined,
-    indices: [],
-    offsets: [],
-}
diff --git a/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_skip_compatible_linking_hack_struct.mvir b/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_skip_compatible_linking_hack_struct.mvir
deleted file mode 100644
index c60f304a3d60a..0000000000000
--- a/third_party/move/move-vm/transactional-tests/tests/module_publishing/republish_module_skip_compatible_linking_hack_struct.mvir
+++ /dev/null
@@ -1,47 +0,0 @@
-//# publish
-module 0x42.A {
-  struct A has store,drop {
-        f: u64,
-  }
-  struct K has key, store,drop {
-        a: Self.A,
-  }
-  public entry make_save_k(sender: signer){
-  label b0:
-    move_to<K>(&sender, K { a: A { f: 100 } });
-    return;
-  }
-}
-
-//# run 0x42::A::make_save_k --signers 0x42
-
-//# publish --skip-check-struct-and-pub-function-linking
-module 0x42.A {
-  struct A has store,drop {
-        f: u64,
-  }
-}
-
-//# publish --verbose
-module 0x42.A {
-  struct A has store,drop {
-        f: u64,
-  }
-  struct B has store,drop {
-        f: u64,
-  }
-  struct K has key, store,drop {
-        a: Self.B,
-  }
-  public entry take_check_k() acquires K {
-    let a: Self.B;
-    let f: u64;
-  label b0:
-    K { a } = move_from<K>(0x42);
-    B { f } = move(a);
-    assert(move(f) == 100, 42);
-    return;
-  }
-}
-
-//# run 0x42::A::take_check_k
diff --git a/third_party/move/move-vm/transactional-tests/tests/module_publishing/use_modules_published.v2_exp b/third_party/move/move-vm/transactional-tests/tests/module_publishing/use_modules_published.v2_exp
new file mode 100644
index 0000000000000..82b2219078c6f
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/module_publishing/use_modules_published.v2_exp
@@ -0,0 +1,10 @@
+processed 6 tasks
+
+task 2 'publish'. lines 17-31:
+Error: Unbound function 0000000000000000000000000000000000000000000000000000000000000043.M.foo
+
+task 3 'run'. lines 33-40:
+Error: Unbound function 0000000000000000000000000000000000000000000000000000000000000042.M.run
+
+task 5 'run'. lines 50-65:
+Error: Dependency not provided for 0000000000000000000000000000000000000000000000000000000000000044.M
diff --git a/third_party/move/move-vm/transactional-tests/tests/native_functions/clever_non_existant_native_function.v2_exp b/third_party/move/move-vm/transactional-tests/tests/native_functions/clever_non_existant_native_function.v2_exp
new file mode 100644
index 0000000000000..fc5a4436b29d4
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/native_functions/clever_non_existant_native_function.v2_exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/third_party/move/move-vm/transactional-tests/tests/native_functions/non_existant_native_function.v2_exp b/third_party/move/move-vm/transactional-tests/tests/native_functions/non_existant_native_function.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/native_functions/non_existant_native_function.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-vm/transactional-tests/tests/recursion/direct_recursion.v2_exp b/third_party/move/move-vm/transactional-tests/tests/recursion/direct_recursion.v2_exp
new file mode 100644
index 0000000000000..5d92c423f3fd8
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/recursion/direct_recursion.v2_exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/third_party/move/move-vm/transactional-tests/tests/recursion/mutual_recursion.v2_exp b/third_party/move/move-vm/transactional-tests/tests/recursion/mutual_recursion.v2_exp
new file mode 100644
index 0000000000000..5d92c423f3fd8
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/recursion/mutual_recursion.v2_exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/third_party/move/move-vm/transactional-tests/tests/recursion/runtime_layout_deeply_nested.v2_exp b/third_party/move/move-vm/transactional-tests/tests/recursion/runtime_layout_deeply_nested.v2_exp
new file mode 100644
index 0000000000000..ff2cde123ef29
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/recursion/runtime_layout_deeply_nested.v2_exp
@@ -0,0 +1,19 @@
+processed 4 tasks
+
+task 2 'run'. lines 79-86:
+Error: Script execution failed with VMError: {
+    major_status: VM_MAX_VALUE_DEPTH_REACHED,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 3 'run'. lines 89-96:
+Error: Script execution failed with VMError: {
+    major_status: VM_MAX_VALUE_DEPTH_REACHED,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
diff --git a/third_party/move/move-vm/transactional-tests/tests/recursion/runtime_type_deeply_nested.exp b/third_party/move/move-vm/transactional-tests/tests/recursion/runtime_type_deeply_nested.exp
index b37da7a441ce2..7f266bea7cd9a 100644
--- a/third_party/move/move-vm/transactional-tests/tests/recursion/runtime_type_deeply_nested.exp
+++ b/third_party/move/move-vm/transactional-tests/tests/recursion/runtime_type_deeply_nested.exp
@@ -2,18 +2,18 @@ processed 3 tasks
 
 task 1 'run'. lines 72-79:
 Error: Script execution failed with VMError: {
-    major_status: TOO_MANY_TYPE_NODES,
+    major_status: VM_MAX_TYPE_DEPTH_REACHED,
     sub_status: None,
     location: 0x42::M,
     indices: [],
-    offsets: [(FunctionDefinitionIndex(48), 0)],
+    offsets: [(FunctionDefinitionIndex(60), 0)],
 }
 
 task 2 'run'. lines 81-89:
 Error: Script execution failed with VMError: {
-    major_status: TOO_MANY_TYPE_NODES,
+    major_status: VM_MAX_TYPE_DEPTH_REACHED,
     sub_status: None,
     location: 0x42::M,
     indices: [],
-    offsets: [(FunctionDefinitionIndex(49), 0)],
+    offsets: [(FunctionDefinitionIndex(60), 0)],
 }
diff --git a/third_party/move/move-vm/transactional-tests/tests/recursion/runtime_type_deeply_nested.v2_exp b/third_party/move/move-vm/transactional-tests/tests/recursion/runtime_type_deeply_nested.v2_exp
new file mode 100644
index 0000000000000..7f266bea7cd9a
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/recursion/runtime_type_deeply_nested.v2_exp
@@ -0,0 +1,19 @@
+processed 3 tasks
+
+task 1 'run'. lines 72-79:
+Error: Script execution failed with VMError: {
+    major_status: VM_MAX_TYPE_DEPTH_REACHED,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(60), 0)],
+}
+
+task 2 'run'. lines 81-89:
+Error: Script execution failed with VMError: {
+    major_status: VM_MAX_TYPE_DEPTH_REACHED,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(60), 0)],
+}
diff --git a/third_party/move/move-vm/transactional-tests/tests/references/borrow_in_loop.v2_exp b/third_party/move/move-vm/transactional-tests/tests/references/borrow_in_loop.v2_exp
new file mode 100644
index 0000000000000..a479dc573113a
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/references/borrow_in_loop.v2_exp
@@ -0,0 +1,28 @@
+processed 3 tasks
+
+task 0 'publish'. lines 1-23:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: STLOC_UNSAFE_TO_DESTROY_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 11)],
+}
+
+task 1 'run'. lines 25-25:
+Error: Function execution failed with VMError: {
+    major_status: LINKER_ERROR,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
+
+task 2 'run'. lines 27-41:
+Error: Script execution failed with VMError: {
+    major_status: STLOC_UNSAFE_TO_DESTROY_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 5)],
+}
diff --git a/third_party/move/move-vm/transactional-tests/tests/references/deref_borrow_local_ok.v2_exp b/third_party/move/move-vm/transactional-tests/tests/references/deref_borrow_local_ok.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/references/deref_borrow_local_ok.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-vm/transactional-tests/tests/references/deref_move_module_ok.v2_exp b/third_party/move/move-vm/transactional-tests/tests/references/deref_move_module_ok.v2_exp
new file mode 100644
index 0000000000000..5d92c423f3fd8
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/references/deref_move_module_ok.v2_exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/third_party/move/move-vm/transactional-tests/tests/references/deref_move_ok.v2_exp b/third_party/move/move-vm/transactional-tests/tests/references/deref_move_ok.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/references/deref_move_ok.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-vm/transactional-tests/tests/references/deref_parens_ok.v2_exp b/third_party/move/move-vm/transactional-tests/tests/references/deref_parens_ok.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/references/deref_parens_ok.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-vm/transactional-tests/tests/references/drop_ref.v2_exp b/third_party/move/move-vm/transactional-tests/tests/references/drop_ref.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/references/drop_ref.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-vm/transactional-tests/tests/references/mixed_lvalue.v2_exp b/third_party/move/move-vm/transactional-tests/tests/references/mixed_lvalue.v2_exp
new file mode 100644
index 0000000000000..5d92c423f3fd8
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/references/mixed_lvalue.v2_exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/third_party/move/move-vm/transactional-tests/tests/references/mutate_borrow_local_ok.v2_exp b/third_party/move/move-vm/transactional-tests/tests/references/mutate_borrow_local_ok.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/references/mutate_borrow_local_ok.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-vm/transactional-tests/tests/references/mutate_copy_ok.v2_exp b/third_party/move/move-vm/transactional-tests/tests/references/mutate_copy_ok.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/references/mutate_copy_ok.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-vm/transactional-tests/tests/references/mutate_move_ok.v2_exp b/third_party/move/move-vm/transactional-tests/tests/references/mutate_move_ok.v2_exp
new file mode 100644
index 0000000000000..5d92c423f3fd8
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/references/mutate_move_ok.v2_exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/third_party/move/move-vm/transactional-tests/tests/references/mutate_parens_ok.v2_exp b/third_party/move/move-vm/transactional-tests/tests/references/mutate_parens_ok.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/references/mutate_parens_ok.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-vm/transactional-tests/tests/stack_and_function_calls/add_function_calls.v2_exp b/third_party/move/move-vm/transactional-tests/tests/stack_and_function_calls/add_function_calls.v2_exp
new file mode 100644
index 0000000000000..5d92c423f3fd8
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/stack_and_function_calls/add_function_calls.v2_exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/third_party/move/move-vm/transactional-tests/tests/stack_and_function_calls/assign_expression_list.v2_exp b/third_party/move/move-vm/transactional-tests/tests/stack_and_function_calls/assign_expression_list.v2_exp
new file mode 100644
index 0000000000000..6cd67db3f6472
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/stack_and_function_calls/assign_expression_list.v2_exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/third_party/move/move-vm/transactional-tests/tests/stack_and_function_calls/assign_function_call.v2_exp b/third_party/move/move-vm/transactional-tests/tests/stack_and_function_calls/assign_function_call.v2_exp
new file mode 100644
index 0000000000000..5d92c423f3fd8
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/stack_and_function_calls/assign_function_call.v2_exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/third_party/move/move-vm/transactional-tests/tests/stack_and_function_calls/binop_function_calls_as_args.v2_exp b/third_party/move/move-vm/transactional-tests/tests/stack_and_function_calls/binop_function_calls_as_args.v2_exp
new file mode 100644
index 0000000000000..5d92c423f3fd8
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/stack_and_function_calls/binop_function_calls_as_args.v2_exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/third_party/move/move-vm/transactional-tests/tests/stack_and_function_calls/function_composition.v2_exp b/third_party/move/move-vm/transactional-tests/tests/stack_and_function_calls/function_composition.v2_exp
new file mode 100644
index 0000000000000..5d92c423f3fd8
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/stack_and_function_calls/function_composition.v2_exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/third_party/move/move-vm/transactional-tests/tests/stack_and_function_calls/many_function_calls_as_args.v2_exp b/third_party/move/move-vm/transactional-tests/tests/stack_and_function_calls/many_function_calls_as_args.v2_exp
new file mode 100644
index 0000000000000..5d92c423f3fd8
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/stack_and_function_calls/many_function_calls_as_args.v2_exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/third_party/move/move-vm/transactional-tests/tests/stack_and_function_calls/multiple_composite_functions.v2_exp b/third_party/move/move-vm/transactional-tests/tests/stack_and_function_calls/multiple_composite_functions.v2_exp
new file mode 100644
index 0000000000000..5d92c423f3fd8
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/stack_and_function_calls/multiple_composite_functions.v2_exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/third_party/move/move-vm/transactional-tests/tests/stack_and_function_calls/pass_args_on_stack_as_expressions.v2_exp b/third_party/move/move-vm/transactional-tests/tests/stack_and_function_calls/pass_args_on_stack_as_expressions.v2_exp
new file mode 100644
index 0000000000000..5d92c423f3fd8
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/stack_and_function_calls/pass_args_on_stack_as_expressions.v2_exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/third_party/move/move-vm/transactional-tests/tests/stack_and_function_calls/pop_weird.v2_exp b/third_party/move/move-vm/transactional-tests/tests/stack_and_function_calls/pop_weird.v2_exp
new file mode 100644
index 0000000000000..5d92c423f3fd8
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/stack_and_function_calls/pop_weird.v2_exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/third_party/move/move-vm/transactional-tests/tests/stack_and_function_calls/push_args_before_function_call.v2_exp b/third_party/move/move-vm/transactional-tests/tests/stack_and_function_calls/push_args_before_function_call.v2_exp
new file mode 100644
index 0000000000000..5d92c423f3fd8
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/stack_and_function_calls/push_args_before_function_call.v2_exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/third_party/move/move-vm/transactional-tests/tests/stack_and_function_calls/push_args_before_function_composition.v2_exp b/third_party/move/move-vm/transactional-tests/tests/stack_and_function_calls/push_args_before_function_composition.v2_exp
new file mode 100644
index 0000000000000..5d92c423f3fd8
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/stack_and_function_calls/push_args_before_function_composition.v2_exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/third_party/move/move-vm/transactional-tests/tests/stack_and_function_calls/return_expression_lists.v2_exp b/third_party/move/move-vm/transactional-tests/tests/stack_and_function_calls/return_expression_lists.v2_exp
new file mode 100644
index 0000000000000..5d92c423f3fd8
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/stack_and_function_calls/return_expression_lists.v2_exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/third_party/move/move-vm/transactional-tests/tests/stack_and_function_calls/return_function_in_if_binop_in_else.v2_exp b/third_party/move/move-vm/transactional-tests/tests/stack_and_function_calls/return_function_in_if_binop_in_else.v2_exp
new file mode 100644
index 0000000000000..5d92c423f3fd8
--- /dev/null
+++ b/third_party/move/move-vm/transactional-tests/tests/stack_and_function_calls/return_function_in_if_binop_in_else.v2_exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/third_party/move/move-vm/types/Cargo.toml b/third_party/move/move-vm/types/Cargo.toml
index 4952f0cdf0b7b..53cbd1e3b23fd 100644
--- a/third_party/move/move-vm/types/Cargo.toml
+++ b/third_party/move/move-vm/types/Cargo.toml
@@ -10,6 +10,8 @@ publish = false
 edition = "2021"
 
 [dependencies]
+bcs = { workspace = true }
+bytes = { workspace = true }
 derivative = { workspace = true }
 itertools = { workspace = true }
 proptest = { workspace = true, optional = true }
@@ -18,8 +20,6 @@ smallbitvec = { workspace = true }
 smallvec = { workspace = true }
 triomphe = { workspace = true }
 
-bcs = { workspace = true }
-
 move-binary-format = { path = "../../move-binary-format" }
 move-core-types = { path = "../../move-core/types" }
 
diff --git a/third_party/move/move-vm/types/src/delayed_values/derived_string_snapshot.rs b/third_party/move/move-vm/types/src/delayed_values/derived_string_snapshot.rs
index ea1677c8f95f9..b2f0b59d0c978 100644
--- a/third_party/move/move-vm/types/src/delayed_values/derived_string_snapshot.rs
+++ b/third_party/move/move-vm/types/src/delayed_values/derived_string_snapshot.rs
@@ -15,7 +15,7 @@ use std::str::FromStr;
 fn is_string_layout(layout: &MoveTypeLayout) -> bool {
     use MoveTypeLayout as L;
     if let L::Struct(move_struct) = layout {
-        if let [L::Vector(elem)] = move_struct.fields().iter().as_slice() {
+        if let [L::Vector(elem)] = move_struct.fields(None).iter().as_slice() {
             if let L::U8 = elem.as_ref() {
                 return true;
             }
@@ -27,7 +27,7 @@ fn is_string_layout(layout: &MoveTypeLayout) -> bool {
 pub fn is_derived_string_struct_layout(layout: &MoveTypeLayout) -> bool {
     use MoveTypeLayout as L;
     if let L::Struct(move_struct) = layout {
-        if let [value_field, L::Vector(padding_elem)] = move_struct.fields().iter().as_slice() {
+        if let [value_field, L::Vector(padding_elem)] = move_struct.fields(None).iter().as_slice() {
             if is_string_layout(value_field) {
                 if let L::U8 = padding_elem.as_ref() {
                     return true;
diff --git a/third_party/move/move-vm/types/src/gas.rs b/third_party/move/move-vm/types/src/gas.rs
index 9c408422f377b..5765754854e18 100644
--- a/third_party/move/move-vm/types/src/gas.rs
+++ b/third_party/move/move-vm/types/src/gas.rs
@@ -31,6 +31,12 @@ pub enum SimpleInstruction {
     MutBorrowField,
     ImmBorrowFieldGeneric,
     MutBorrowFieldGeneric,
+    ImmBorrowVariantField,
+    MutBorrowVariantField,
+    ImmBorrowVariantFieldGeneric,
+    MutBorrowVariantFieldGeneric,
+    TestVariant,
+    TestVariantGeneric,
 
     CastU8,
     CastU64,
@@ -89,6 +95,12 @@ impl SimpleInstruction {
             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,
 
             CastU8 => CAST_U8,
             CastU64 => CAST_U64,
@@ -176,12 +188,30 @@ pub trait GasMeter {
         args: impl ExactSizeIterator<Item = impl ValueView> + Clone,
     ) -> PartialVMResult<()>;
 
+    fn charge_pack_variant(
+        &mut self,
+        is_generic: bool,
+        args: impl ExactSizeIterator<Item = impl ValueView> + Clone,
+    ) -> PartialVMResult<()> {
+        // Currently mapped to pack, can be specialized if needed
+        self.charge_pack(is_generic, args)
+    }
+
     fn charge_unpack(
         &mut self,
         is_generic: bool,
         args: impl ExactSizeIterator<Item = impl ValueView> + Clone,
     ) -> PartialVMResult<()>;
 
+    fn charge_unpack_variant(
+        &mut self,
+        is_generic: bool,
+        args: impl ExactSizeIterator<Item = impl ValueView> + Clone,
+    ) -> PartialVMResult<()> {
+        // Currently mapped to pack, can be specialized if needed
+        self.charge_unpack(is_generic, args)
+    }
+
     fn charge_read_ref(&mut self, val: impl ValueView) -> PartialVMResult<()>;
 
     fn charge_write_ref(
diff --git a/third_party/move/move-vm/types/src/lib.rs b/third_party/move/move-vm/types/src/lib.rs
index 7565b35943f91..45269861108c3 100644
--- a/third_party/move/move-vm/types/src/lib.rs
+++ b/third_party/move/move-vm/types/src/lib.rs
@@ -28,6 +28,7 @@ pub mod delayed_values;
 pub mod gas;
 pub mod loaded_data;
 pub mod natives;
+pub mod resolver;
 pub mod value_serde;
 pub mod value_traversal;
 pub mod values;
diff --git a/third_party/move/move-vm/types/src/loaded_data/runtime_access_specifiers_prop_tests.rs b/third_party/move/move-vm/types/src/loaded_data/runtime_access_specifiers_prop_tests.rs
index caa6e20a3d28f..9826a5f39fdfd 100644
--- a/third_party/move/move-vm/types/src/loaded_data/runtime_access_specifiers_prop_tests.rs
+++ b/third_party/move/move-vm/types/src/loaded_data/runtime_access_specifiers_prop_tests.rs
@@ -5,7 +5,7 @@ use crate::loaded_data::{
     runtime_access_specifier::{
         AccessInstance, AccessSpecifier, AccessSpecifierClause, AddressSpecifier, ResourceSpecifier,
     },
-    runtime_types::{StructIdentifier, Type},
+    runtime_types::{StructIdentifier, Type, TypeBuilder},
 };
 use move_binary_format::file_format::AccessKind;
 use move_core_types::{
@@ -116,10 +116,13 @@ fn address_specifier_strategy() -> impl Strategy<Value = AddressSpecifier> {
 }
 
 fn type_args_strategy() -> impl Strategy<Value = Vec<Type>> {
+    // Actual type builder limits do not matter because creating primitive
+    // integer types is always possible.
+    let ty_builder = TypeBuilder::with_limits(10, 10);
     prop_oneof![
         Just(vec![]),
-        Just(vec![Type::U8]),
-        Just(vec![Type::U16, Type::U32])
+        Just(vec![ty_builder.create_u8_ty()]),
+        Just(vec![ty_builder.create_u16_ty(), ty_builder.create_u32_ty()])
     ]
 }
 
diff --git a/third_party/move/move-vm/types/src/loaded_data/runtime_types.rs b/third_party/move/move-vm/types/src/loaded_data/runtime_types.rs
index 4c60b6e07de7b..d96d01a23161a 100644
--- a/third_party/move/move-vm/types/src/loaded_data/runtime_types.rs
+++ b/third_party/move/move-vm/types/src/loaded_data/runtime_types.rs
@@ -7,15 +7,20 @@
 use derivative::Derivative;
 use itertools::Itertools;
 use move_binary_format::{
-    errors::{PartialVMError, PartialVMResult},
+    errors::{Location, PartialVMError, PartialVMResult, VMResult},
     file_format::{
-        AbilitySet, SignatureToken, StructHandle, StructTypeParameter, TypeParameterIndex,
+        Ability, AbilitySet, SignatureToken, StructHandle, StructTypeParameter, TypeParameterIndex,
+        VariantIndex,
     },
 };
+#[cfg(test)]
+use move_core_types::account_address::AccountAddress;
 use move_core_types::{
-    gas_algebra::AbstractMemorySize, identifier::Identifier, language_storage::ModuleId,
-    vm_status::StatusCode,
+    identifier::Identifier,
+    language_storage::{ModuleId, StructTag, TypeTag},
+    vm_status::{sub_status::unknown_invariant_violation::EPARANOID_FAILURE, StatusCode},
 };
+use serde::Serialize;
 use smallbitvec::SmallBitVec;
 use smallvec::{smallvec, SmallVec};
 use std::{
@@ -24,11 +29,10 @@ use std::{
     collections::{btree_map, BTreeMap},
     fmt,
     fmt::Debug,
+    sync::Arc,
 };
 use triomphe::Arc as TriompheArc;
 
-pub const TYPE_DEPTH_MAX: usize = 256;
-
 #[derive(PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Debug)]
 /// A formula describing the value depth of a type, using (the depths of) the type parameters as inputs.
 ///
@@ -125,8 +129,7 @@ impl DepthFormula {
 #[derive(Debug, Clone, Eq, Hash, PartialEq)]
 pub struct StructType {
     pub idx: StructNameIndex,
-    pub field_tys: Vec<Type>,
-    pub field_names: Vec<Identifier>,
+    pub layout: StructLayout,
     pub phantom_ty_params_mask: SmallBitVec,
     pub abilities: AbilitySet,
     pub ty_params: Vec<StructTypeParameter>,
@@ -134,7 +137,83 @@ pub struct StructType {
     pub module: ModuleId,
 }
 
+#[derive(Debug, Clone, Eq, Hash, PartialEq)]
+pub enum StructLayout {
+    Single(Vec<(Identifier, Type)>),
+    Variants(Vec<(Identifier, Vec<(Identifier, Type)>)>),
+}
+
 impl StructType {
+    /// Get the fields from this struct type. If this is a proper struct, the `variant`
+    /// must be None. Otherwise if its a variant struct, the variant for which the fields
+    /// are requested must be given. For non-matching parameters, the function returns
+    /// an empty list.
+    pub fn fields(&self, variant: Option<VariantIndex>) -> PartialVMResult<&[(Identifier, Type)]> {
+        match (&self.layout, variant) {
+            (StructLayout::Single(fields), None) => Ok(fields.as_slice()),
+            (StructLayout::Variants(variants), Some(variant))
+                if (variant as usize) < variants.len() =>
+            {
+                Ok(variants[variant as usize].1.as_slice())
+            },
+            _ => Err(
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR).with_message(
+                    "inconsistent struct field query: not a variant struct, or variant index out bounds"
+                        .to_string(),
+                ),
+            ),
+        }
+    }
+
+    /// Selects the field information from this struct type at the given offset. Returns
+    /// error if field is not defined.
+    pub fn field_at(
+        &self,
+        variant: Option<VariantIndex>,
+        offset: usize,
+    ) -> PartialVMResult<&(Identifier, Type)> {
+        let slice = self.fields(variant)?;
+        if offset < slice.len() {
+            Ok(&slice[offset])
+        } else {
+            Err(
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR).with_message(
+                    format!(
+                        "field offset out of bounds -- len {} got {}",
+                        slice.len(),
+                        offset
+                    ),
+                ),
+            )
+        }
+    }
+
+    /// Same as `struct_type.fields(variant_opt).len()`
+    pub fn field_count(&self, variant: Option<VariantIndex>) -> u16 {
+        match (&self.layout, variant) {
+            (StructLayout::Single(fields), None) => fields.len() as u16,
+            (StructLayout::Variants(variants), Some(variant))
+                if (variant as usize) < variants.len() =>
+            {
+                variants[variant as usize].1.len() as u16
+            },
+            _ => 0,
+        }
+    }
+
+    /// Returns a string for the variant for error messages. If this is
+    /// not a type with this variant, returns a string anyway indicating
+    /// its undefined.
+    pub fn variant_name_for_message(&self, variant: VariantIndex) -> String {
+        let variant = variant as usize;
+        match &self.layout {
+            StructLayout::Variants(variants) if variant < variants.len() => {
+                variants[variant].0.to_string()
+            },
+            _ => "<undefined>".to_string(),
+        }
+    }
+
     pub fn ty_param_constraints(&self) -> impl ExactSizeIterator<Item = &AbilitySet> {
         self.ty_params.iter().map(|param| &param.constraints)
     }
@@ -166,6 +245,19 @@ impl StructType {
 
         Ok(())
     }
+
+    #[cfg(test)]
+    pub fn for_test() -> StructType {
+        Self {
+            idx: StructNameIndex(0),
+            layout: StructLayout::Single(vec![]),
+            phantom_ty_params_mask: SmallBitVec::new(),
+            abilities: AbilitySet::EMPTY,
+            ty_params: vec![],
+            name: Identifier::new("Foo").unwrap(),
+            module: ModuleId::new(AccountAddress::ONE, Identifier::new("foo").unwrap()),
+        }
+    }
 }
 
 #[derive(Debug, Copy, Clone, Eq, Hash, Ord, PartialEq, PartialOrd)]
@@ -282,183 +374,231 @@ impl AbilityInfo {
     }
 }
 
+macro_rules! paranoid_failure {
+    ($msg:ident) => {
+        Err(
+            PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                .with_message($msg)
+                .with_sub_status(EPARANOID_FAILURE),
+        )
+    };
+}
+
 impl Type {
-    #[allow(deprecated)]
-    const LEGACY_BASE_MEMORY_SIZE: AbstractMemorySize = AbstractMemorySize::new(1);
+    pub fn verify_ty_arg_abilities<'a, I>(
+        ty_param_abilities: I,
+        ty_args: &[Self],
+    ) -> PartialVMResult<()>
+    where
+        I: IntoIterator<Item = &'a AbilitySet>,
+        I::IntoIter: ExactSizeIterator,
+    {
+        let ty_param_abilities = ty_param_abilities.into_iter();
+        if ty_param_abilities.len() != ty_args.len() {
+            return Err(PartialVMError::new(
+                StatusCode::NUMBER_OF_TYPE_ARGUMENTS_MISMATCH,
+            ));
+        }
+        for (ty, expected_ability_set) in ty_args.iter().zip(ty_param_abilities) {
+            if !expected_ability_set.is_subset(ty.abilities()?) {
+                return Err(PartialVMError::new(StatusCode::CONSTRAINT_NOT_SATISFIED));
+            }
+        }
+        Ok(())
+    }
 
-    fn clone_impl(&self, depth: usize) -> PartialVMResult<Type> {
-        self.apply_subst(|idx, _| Ok(Type::TyParam(idx)), depth)
+    pub fn paranoid_check_is_bool_ty(&self) -> PartialVMResult<()> {
+        if !matches!(self, Self::Bool) {
+            let msg = format!("Expected boolean type, got {}", self);
+            return paranoid_failure!(msg);
+        }
+        Ok(())
     }
 
-    fn apply_subst<F>(&self, subst: F, depth: usize) -> PartialVMResult<Type>
-    where
-        F: Fn(u16, usize) -> PartialVMResult<Type> + Copy,
-    {
-        if depth > TYPE_DEPTH_MAX {
-            return Err(PartialVMError::new(StatusCode::VM_MAX_TYPE_DEPTH_REACHED));
-        }
-        let res = match self {
-            Type::TyParam(idx) => subst(*idx, depth)?,
-            Type::Bool => Type::Bool,
-            Type::U8 => Type::U8,
-            Type::U16 => Type::U16,
-            Type::U32 => Type::U32,
-            Type::U64 => Type::U64,
-            Type::U128 => Type::U128,
-            Type::U256 => Type::U256,
-            Type::Address => Type::Address,
-            Type::Signer => Type::Signer,
-            Type::Vector(ty) => Type::Vector(TriompheArc::new(ty.apply_subst(subst, depth + 1)?)),
-            Type::Reference(ty) => Type::Reference(Box::new(ty.apply_subst(subst, depth + 1)?)),
-            Type::MutableReference(ty) => {
-                Type::MutableReference(Box::new(ty.apply_subst(subst, depth + 1)?))
-            },
-            Type::Struct { idx, ability } => Type::Struct {
-                idx: *idx,
-                ability: ability.clone(),
-            },
-            Type::StructInstantiation {
-                idx,
-                ty_args: instantiation,
-                ability,
-            } => {
-                let mut inst = vec![];
-                for ty in instantiation.iter() {
-                    inst.push(ty.apply_subst(subst, depth + 1)?)
-                }
-                Type::StructInstantiation {
-                    idx: *idx,
-                    ty_args: TriompheArc::new(inst),
-                    ability: ability.clone(),
+    pub fn paranoid_check_is_u64_ty(&self) -> PartialVMResult<()> {
+        if !matches!(self, Self::U64) {
+            let msg = format!("Expected U64 type, got {}", self);
+            return paranoid_failure!(msg);
+        }
+        Ok(())
+    }
+
+    pub fn paranoid_check_is_address_ty(&self) -> PartialVMResult<()> {
+        if !matches!(self, Self::Address) {
+            let msg = format!("Expected address type, got {}", self);
+            return paranoid_failure!(msg);
+        }
+        Ok(())
+    }
+
+    pub fn paranoid_check_is_signer_ref_ty(&self) -> PartialVMResult<()> {
+        if let Self::Reference(inner_ty) = self {
+            if matches!(inner_ty.as_ref(), Self::Signer) {
+                return Ok(());
+            }
+        }
+        let msg = format!("Expected address type, got {}", self);
+        paranoid_failure!(msg)
+    }
+
+    pub fn paranoid_check_has_ability(&self, ability: Ability) -> PartialVMResult<()> {
+        if !self.abilities()?.has_ability(ability) {
+            let msg = format!("Type {} does not have expected ability {}", self, ability);
+            return paranoid_failure!(msg);
+        }
+        Ok(())
+    }
+
+    pub fn paranoid_check_abilities(&self, expected_abilities: AbilitySet) -> PartialVMResult<()> {
+        let abilities = self.abilities()?;
+        if !expected_abilities.is_subset(abilities) {
+            let msg = format!(
+                "Type {} has unexpected ability: expected {}, got {}",
+                self, expected_abilities, abilities
+            );
+            return paranoid_failure!(msg);
+        }
+        Ok(())
+    }
+
+    pub fn paranoid_check_eq(&self, expected_ty: &Self) -> PartialVMResult<()> {
+        if self != expected_ty {
+            let msg = format!("Expected type {}, got {}", expected_ty, self);
+            return paranoid_failure!(msg);
+        }
+        Ok(())
+    }
+
+    pub fn paranoid_check_is_vec_ty(&self, expected_elem_ty: &Self) -> PartialVMResult<()> {
+        if let Self::Vector(elem_ty) = self {
+            return elem_ty.paranoid_check_eq(expected_elem_ty);
+        }
+
+        let msg = format!("Expected vector type, got {}", self);
+        paranoid_failure!(msg)
+    }
+
+    pub fn paranoid_check_is_vec_ref_ty(
+        &self,
+        expected_elem_ty: &Self,
+        is_mut: bool,
+    ) -> PartialVMResult<()> {
+        if let Self::MutableReference(inner_ty) = self {
+            if let Self::Vector(elem_ty) = inner_ty.as_ref() {
+                elem_ty.paranoid_check_eq(expected_elem_ty)?;
+                return Ok(());
+            }
+        }
+
+        if let Self::Reference(inner_ty) = self {
+            if !is_mut {
+                if let Self::Vector(elem_ty) = inner_ty.as_ref() {
+                    elem_ty.paranoid_check_eq(expected_elem_ty)?;
+                    return Ok(());
                 }
-            },
-        };
-        Ok(res)
+            }
+        }
+
+        let msg = format!(
+            "Expected a (mutable: {}) vector reference, got {}",
+            is_mut, self
+        );
+        paranoid_failure!(msg)
     }
 
-    pub fn subst(&self, ty_args: &[Type]) -> PartialVMResult<Type> {
-        self.apply_subst(
-            |idx, depth| match ty_args.get(idx as usize) {
-                Some(ty) => ty.clone_impl(depth),
-                None => Err(
-                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
-                        .with_message(format!(
-                            "type substitution failed: index out of bounds -- len {} got {}",
-                            ty_args.len(),
-                            idx
-                        )),
-                ),
-            },
-            1,
-        )
+    /// Returns an error if the type is not a (mutable) vector reference. Otherwise, returns
+    /// a (mutable) reference to its element type.
+    pub fn paranoid_check_and_get_vec_elem_ref_ty(
+        &self,
+        expected_elem_ty: &Self,
+        is_mut: bool,
+    ) -> PartialVMResult<Self> {
+        self.paranoid_check_is_vec_ref_ty(expected_elem_ty, is_mut)?;
+        let elem_ty = Box::new(self.get_vec_ref_elem_ty());
+
+        // SAFETY: This type construction satisfies all constraints on size/depth because the parent
+        //         vector reference type has been safely constructed.
+        Ok(if is_mut {
+            Type::MutableReference(elem_ty)
+        } else {
+            Type::Reference(elem_ty)
+        })
     }
 
-    /// Returns the abstract memory size the data structure occupies.
-    ///
-    /// This kept only for legacy reasons.
-    /// New applications should not use this.
-    pub fn size(&self) -> AbstractMemorySize {
-        use Type::*;
+    /// Returns an error if the type is not a (mutable) vector reference. Otherwise, returns
+    /// its element type.
+    pub fn paranoid_check_and_get_vec_elem_ty(
+        &self,
+        expected_elem_ty: &Self,
+        is_mut: bool,
+    ) -> PartialVMResult<Self> {
+        self.paranoid_check_is_vec_ref_ty(expected_elem_ty, is_mut)?;
+        Ok(self.get_vec_ref_elem_ty())
+    }
 
+    fn get_vec_ref_elem_ty(&self) -> Self {
         match self {
-            TyParam(_) | Bool | U8 | U16 | U32 | U64 | U128 | U256 | Address | Signer => {
-                Self::LEGACY_BASE_MEMORY_SIZE
+            Self::Reference(inner_ty) | Self::MutableReference(inner_ty) => match inner_ty.as_ref()
+            {
+                Self::Vector(elem_ty) => elem_ty.as_ref().clone(),
+                _ => unreachable!("The inner type must be a vector"),
             },
-            Reference(ty) | MutableReference(ty) => Self::LEGACY_BASE_MEMORY_SIZE + ty.size(),
-            Vector(ty) => Self::LEGACY_BASE_MEMORY_SIZE + ty.size(),
-            Struct { .. } => Self::LEGACY_BASE_MEMORY_SIZE,
-            StructInstantiation { ty_args: tys, .. } => tys
-                .iter()
-                .fold(Self::LEGACY_BASE_MEMORY_SIZE, |acc, ty| acc + ty.size()),
+            _ => unreachable!("The top-level type must be a reference"),
         }
     }
 
-    pub fn from_const_signature(constant_signature: &SignatureToken) -> PartialVMResult<Self> {
-        use SignatureToken as S;
-        use Type as L;
-
-        Ok(match constant_signature {
-            S::Bool => L::Bool,
-            S::U8 => L::U8,
-            S::U16 => L::U16,
-            S::U32 => L::U32,
-            S::U64 => L::U64,
-            S::U128 => L::U128,
-            S::U256 => L::U256,
-            S::Address => L::Address,
-            S::Vector(inner) => L::Vector(TriompheArc::new(Self::from_const_signature(inner)?)),
-            // Not yet supported
-            S::Struct(_) | S::StructInstantiation(_, _) => {
-                return Err(
-                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
-                        .with_message("Unable to load const type signature".to_string()),
-                )
-            },
-            // Not allowed/Not meaningful
-            S::TypeParameter(_) | S::Reference(_) | S::MutableReference(_) | S::Signer => {
-                return Err(
-                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
-                        .with_message("Unable to load const type signature".to_string()),
-                )
+    #[inline]
+    pub fn paranoid_freeze_ref_ty(self) -> PartialVMResult<Type> {
+        match self {
+            Type::MutableReference(ty) => Ok(Type::Reference(ty)),
+            _ => {
+                let msg = format!("Expected a mutable reference to freeze, got {}", self);
+                paranoid_failure!(msg)
             },
-        })
+        }
     }
 
-    pub fn check_vec_ref(&self, inner_ty: &Type, is_mut: bool) -> PartialVMResult<Type> {
+    #[inline]
+    pub fn paranoid_read_ref(self) -> PartialVMResult<Type> {
         match self {
-            Type::MutableReference(inner) => match &**inner {
-                Type::Vector(inner) => {
-                    inner.check_eq(inner_ty)?;
-                    Ok(inner.as_ref().clone())
-                },
-                _ => Err(
-                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
-                        .with_message("VecMutBorrow expects a vector reference".to_string())
-                        .with_sub_status(move_core_types::vm_status::sub_status::unknown_invariant_violation::EPARANOID_FAILURE),
-                ),
+            Type::Reference(inner_ty) | Type::MutableReference(inner_ty) => {
+                inner_ty.paranoid_check_has_ability(Ability::Copy)?;
+                Ok(inner_ty.as_ref().clone())
             },
-            Type::Reference(inner) if !is_mut => match &**inner {
-                Type::Vector(inner) => {
-                    inner.check_eq(inner_ty)?;
-                    Ok(inner.as_ref().clone())
-                },
-                _ => Err(
-                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
-                        .with_message("VecMutBorrow expects a vector reference".to_string())
-                        .with_sub_status(move_core_types::vm_status::sub_status::unknown_invariant_violation::EPARANOID_FAILURE),
-                ),
+            _ => {
+                let msg = format!("Expected a reference to read, got {}", self);
+                paranoid_failure!(msg)
             },
-            _ => Err(
-                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
-                    .with_message("VecMutBorrow expects a vector reference".to_string())
-                    .with_sub_status(move_core_types::vm_status::sub_status::unknown_invariant_violation::EPARANOID_FAILURE),
-            ),
         }
     }
 
-    pub fn check_eq(&self, other: &Self) -> PartialVMResult<()> {
-        if self != other {
-            return Err(
-                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
-                    .with_message(format!(
-                        "Type mismatch: expected {:?}, got {:?}",
-                        self, other
-                    ))
-                    .with_sub_status(move_core_types::vm_status::sub_status::unknown_invariant_violation::EPARANOID_FAILURE),
-            );
+    #[inline]
+    pub fn paranoid_write_ref(&self, val_ty: &Type) -> PartialVMResult<()> {
+        if let Type::MutableReference(inner_ty) = self {
+            if inner_ty.as_ref() == val_ty {
+                return inner_ty.paranoid_check_has_ability(Ability::Drop);
+            }
         }
-        Ok(())
+
+        let msg = format!("Cannot write type {} to type {}", val_ty, self);
+        paranoid_failure!(msg)
     }
 
-    pub fn check_ref_eq(&self, expected_inner: &Self) -> PartialVMResult<()> {
+    pub fn paranoid_check_ref_eq(
+        &self,
+        expected_inner_ty: &Self,
+        is_mut: bool,
+    ) -> PartialVMResult<()> {
         match self {
-            Type::MutableReference(inner) | Type::Reference(inner) => {
-                inner.check_eq(expected_inner)
+            Type::MutableReference(inner_ty) => inner_ty.paranoid_check_eq(expected_inner_ty),
+            Type::Reference(inner_ty) if !is_mut => inner_ty.paranoid_check_eq(expected_inner_ty),
+            _ => {
+                let msg = format!(
+                    "Expected a (mutable: {}) reference type, got {}",
+                    is_mut, self
+                );
+                paranoid_failure!(msg)
             },
-            _ => Err(
-                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
-                    .with_message("VecMutBorrow expects a vector reference".to_string()),
-            ),
         }
     }
 
@@ -530,7 +670,7 @@ impl Type {
         use Type::*;
 
         thread_local! {
-            static CACHE: RefCell<BTreeMap<usize, usize>> = RefCell::new(BTreeMap::new());
+            static CACHE: RefCell<BTreeMap<usize, usize>> = const { RefCell::new(BTreeMap::new()) };
         }
 
         CACHE.with(|cache| {
@@ -624,11 +764,449 @@ impl fmt::Display for Type {
     }
 }
 
+/// Controls creation of runtime types, i.e., methods offered by this struct
+/// should be the only way to construct any type.
+#[derive(Clone, Serialize)]
+pub struct TypeBuilder {
+    // Maximum number of nodes a fully-instantiated type has.
+    max_ty_size: u64,
+    // Maximum depth (in terms of number of nodes) a fully-instantiated type has.
+    max_ty_depth: u64,
+}
+
+impl TypeBuilder {
+    pub fn with_limits(max_ty_size: u64, max_ty_depth: u64) -> Self {
+        Self {
+            max_ty_size,
+            max_ty_depth,
+        }
+    }
+
+    #[inline]
+    pub fn create_bool_ty(&self) -> Type {
+        Type::Bool
+    }
+
+    #[inline]
+    pub fn create_u8_ty(&self) -> Type {
+        Type::U8
+    }
+
+    #[inline]
+    pub fn create_u16_ty(&self) -> Type {
+        Type::U16
+    }
+
+    #[inline]
+    pub fn create_u32_ty(&self) -> Type {
+        Type::U32
+    }
+
+    #[inline]
+    pub fn create_u64_ty(&self) -> Type {
+        Type::U64
+    }
+
+    #[inline]
+    pub fn create_u128_ty(&self) -> Type {
+        Type::U128
+    }
+
+    #[inline]
+    pub fn create_u256_ty(&self) -> Type {
+        Type::U256
+    }
+
+    /// Creates a (possibly mutable) reference type from the given inner type.
+    /// Returns an error if the type size or depth are too large.
+    #[inline]
+    pub fn create_ref_ty(&self, inner_ty: &Type, is_mut: bool) -> PartialVMResult<Type> {
+        let mut count = 1;
+        let check = |c: &mut u64, d: u64| self.check(c, d);
+        let inner_ty = self
+            .clone_impl(inner_ty, &mut count, 2, check)
+            .map_err(|e| {
+                e.append_message_with_separator(
+                    '.',
+                    format!(
+                        "Failed to create a (mutable: {}) reference type with inner type {}",
+                        is_mut, inner_ty
+                    ),
+                )
+            })?;
+        let inner_ty = Box::new(inner_ty);
+        Ok(if is_mut {
+            Type::MutableReference(inner_ty)
+        } else {
+            Type::Reference(inner_ty)
+        })
+    }
+
+    /// Creates a vector type with the given element type, returning an error
+    /// if the type size or depth are too large.
+    #[inline]
+    pub fn create_vec_ty(&self, elem_ty: &Type) -> PartialVMResult<Type> {
+        let mut count = 1;
+        let check = |c: &mut u64, d: u64| self.check(c, d);
+        let elem_ty = self
+            .clone_impl(elem_ty, &mut count, 2, check)
+            .map_err(|e| {
+                e.append_message_with_separator(
+                    '.',
+                    format!(
+                        "Failed to create a vector type with element type {}",
+                        elem_ty
+                    ),
+                )
+            })?;
+        Ok(Type::Vector(TriompheArc::new(elem_ty)))
+    }
+
+    #[inline]
+    pub fn create_struct_ty(&self, idx: StructNameIndex, ability: AbilityInfo) -> Type {
+        Type::Struct { idx, ability }
+    }
+
+    /// Creates a fully-instantiated struct type, performing the type substitution.
+    /// Returns an error if the type size or depth are too large.
+    #[inline]
+    pub fn create_struct_instantiation_ty(
+        &self,
+        struct_ty: &StructType,
+        ty_params: &[Type],
+        ty_args: &[Type],
+    ) -> PartialVMResult<Type> {
+        // We cannot call substitution API directly because we have to take into
+        // account struct type itself. We simply shift count and depth by 1 and
+        // call inner APIs, to save extra cloning.
+        let mut count = 1;
+        let check = |c: &mut u64, d: u64| self.check(c, d);
+
+        let ty_args = ty_params
+            .iter()
+            .map(|ty| {
+                // Note that depth is 2 because we accounted for the parent struct type.
+                self.subst_impl(ty, ty_args, &mut count, 2, check)
+                    .map_err(|e| {
+                        e.append_message_with_separator(
+                            '.',
+                            format!(
+                                "Failed to instantiate a type {} with type arguments {:?}",
+                                ty, ty_args
+                            ),
+                        )
+                    })
+            })
+            .collect::<PartialVMResult<Vec<_>>>()?;
+
+        Ok(Type::StructInstantiation {
+            idx: struct_ty.idx,
+            ty_args: triomphe::Arc::new(ty_args),
+            ability: AbilityInfo::generic_struct(
+                struct_ty.abilities,
+                struct_ty.phantom_ty_params_mask.clone(),
+            ),
+        })
+    }
+
+    /// Creates a type for a Move constant. Note that constant types can be
+    /// more restrictive and therefore have their own creation API.
+    pub fn create_constant_ty(&self, const_tok: &SignatureToken) -> PartialVMResult<Type> {
+        let mut count = 0;
+        self.create_constant_ty_impl(const_tok, &mut count, 1)
+            .map_err(|e| {
+                e.append_message_with_separator(
+                    '.',
+                    format!(
+                        "Failed to construct a type for constant token {:?}",
+                        const_tok
+                    ),
+                )
+            })
+    }
+
+    /// Creates a fully-instantiated type from its storage representation.
+    pub fn create_ty<F>(&self, ty_tag: &TypeTag, mut resolver: F) -> VMResult<Type>
+    where
+        F: FnMut(&StructTag) -> VMResult<Arc<StructType>>,
+    {
+        let mut count = 0;
+        self.create_ty_impl(ty_tag, &mut resolver, &mut count, 1)
+    }
+
+    /// Clones the given type, at the same time instantiating all its type parameters.
+    pub fn create_ty_with_subst(&self, ty: &Type, ty_args: &[Type]) -> PartialVMResult<Type> {
+        let mut count = 0;
+        let check = |c: &mut u64, d: u64| self.check(c, d);
+        self.subst_impl(ty, ty_args, &mut count, 1, check)
+    }
+
+    fn check(&self, count: &mut u64, depth: u64) -> PartialVMResult<()> {
+        if *count >= self.max_ty_size {
+            return Err(
+                PartialVMError::new(StatusCode::TOO_MANY_TYPE_NODES).with_message(format!(
+                    "Type size is larger than maximum {}",
+                    self.max_ty_size
+                )),
+            );
+        }
+        if depth > self.max_ty_depth {
+            return Err(
+                PartialVMError::new(StatusCode::VM_MAX_TYPE_DEPTH_REACHED).with_message(format!(
+                    "Type depth is larger than maximum {}",
+                    self.max_ty_depth
+                )),
+            );
+        }
+        Ok(())
+    }
+
+    fn create_constant_ty_impl(
+        &self,
+        const_tok: &SignatureToken,
+        count: &mut u64,
+        depth: u64,
+    ) -> PartialVMResult<Type> {
+        use SignatureToken as S;
+        use Type::*;
+
+        self.check(count, depth)?;
+        *count += 1;
+        Ok(match const_tok {
+            S::Bool => Bool,
+            S::U8 => U8,
+            S::U16 => U16,
+            S::U32 => U32,
+            S::U64 => U64,
+            S::U128 => U128,
+            S::U256 => U256,
+            S::Address => Address,
+            S::Vector(elem_tok) => {
+                let elem_ty = self.create_constant_ty_impl(elem_tok, count, depth + 1)?;
+                Vector(TriompheArc::new(elem_ty))
+            },
+
+            S::Struct(_) | S::StructInstantiation(_, _) => {
+                return Err(
+                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                        .with_message("Struct constants are not supported".to_string()),
+                );
+            },
+
+            tok => {
+                return Err(
+                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                        .with_message(format!(
+                            "{:?} is not allowed or is not a meaningful token for a constant",
+                            tok
+                        )),
+                );
+            },
+        })
+    }
+
+    fn subst_impl<G>(
+        &self,
+        ty: &Type,
+        ty_args: &[Type],
+        count: &mut u64,
+        depth: u64,
+        check: G,
+    ) -> PartialVMResult<Type>
+    where
+        G: Fn(&mut u64, u64) -> PartialVMResult<()> + Copy,
+    {
+        Self::apply_subst(
+            ty,
+            |idx, c, d| match ty_args.get(idx as usize) {
+                Some(ty) => self.clone_impl(ty, c, d, check),
+                None => Err(
+                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                        .with_message(format!(
+                        "Type substitution failed: index {} is out of bounds for {} type arguments",
+                        idx,
+                        ty_args.len()
+                    )),
+                ),
+            },
+            count,
+            depth,
+            check,
+        )
+    }
+
+    fn clone_impl<G>(
+        &self,
+        ty: &Type,
+        count: &mut u64,
+        depth: u64,
+        check: G,
+    ) -> PartialVMResult<Type>
+    where
+        G: Fn(&mut u64, u64) -> PartialVMResult<()> + Copy,
+    {
+        Self::apply_subst(
+            ty,
+            |idx, _, _| {
+                // The type cannot contain type parameters anymore (it also does not make
+                // sense to have them!), and so it is the caller's responsibility to ensure
+                // type substitution has been performed.
+                Err(
+                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                        .with_message(format!(
+                        "There is an unresolved type parameter (index: {}) when cloning type {}",
+                        idx, ty
+                    )),
+                )
+            },
+            count,
+            depth,
+            check,
+        )
+    }
+
+    fn apply_subst<F, G>(
+        ty: &Type,
+        subst: F,
+        count: &mut u64,
+        depth: u64,
+        check: G,
+    ) -> PartialVMResult<Type>
+    where
+        F: Fn(u16, &mut u64, u64) -> PartialVMResult<Type> + Copy,
+        G: Fn(&mut u64, u64) -> PartialVMResult<()> + Copy,
+    {
+        use Type::*;
+
+        check(count, depth)?;
+        *count += 1;
+        Ok(match ty {
+            TyParam(idx) => {
+                // To avoid double-counting, revert counting the type parameter.
+                *count -= 1;
+                subst(*idx, count, depth)?
+            },
+
+            Bool => Bool,
+            U8 => U8,
+            U16 => U16,
+            U32 => U32,
+            U64 => U64,
+            U128 => U128,
+            U256 => U256,
+            Address => Address,
+            Signer => Signer,
+            Vector(elem_ty) => {
+                let elem_ty = Self::apply_subst(elem_ty, subst, count, depth + 1, check)?;
+                Vector(TriompheArc::new(elem_ty))
+            },
+            Reference(inner_ty) => {
+                let inner_ty = Self::apply_subst(inner_ty, subst, count, depth + 1, check)?;
+                Reference(Box::new(inner_ty))
+            },
+            MutableReference(inner_ty) => {
+                let inner_ty = Self::apply_subst(inner_ty, subst, count, depth + 1, check)?;
+                MutableReference(Box::new(inner_ty))
+            },
+            Struct { idx, ability } => Struct {
+                idx: *idx,
+                ability: ability.clone(),
+            },
+            StructInstantiation {
+                idx,
+                ty_args: non_instantiated_tys,
+                ability,
+            } => {
+                let mut instantiated_tys = vec![];
+                for ty in non_instantiated_tys.iter() {
+                    let ty = Self::apply_subst(ty, subst, count, depth + 1, check)?;
+                    instantiated_tys.push(ty);
+                }
+                StructInstantiation {
+                    idx: *idx,
+                    ty_args: TriompheArc::new(instantiated_tys),
+                    ability: ability.clone(),
+                }
+            },
+        })
+    }
+
+    fn create_ty_impl<F>(
+        &self,
+        ty_tag: &TypeTag,
+        resolver: &mut F,
+        count: &mut u64,
+        depth: u64,
+    ) -> VMResult<Type>
+    where
+        F: FnMut(&StructTag) -> VMResult<Arc<StructType>>,
+    {
+        use Type::*;
+        use TypeTag as T;
+
+        self.check(count, depth)
+            .map_err(|e| e.finish(Location::Undefined))?;
+        *count += 1;
+        Ok(match ty_tag {
+            T::Bool => Bool,
+            T::U8 => U8,
+            T::U16 => U16,
+            T::U32 => U32,
+            T::U64 => U64,
+            T::U128 => U128,
+            T::U256 => U256,
+            T::Address => Address,
+            T::Signer => Signer,
+            T::Vector(elem_ty_tag) => {
+                let elem_ty = self.create_ty_impl(elem_ty_tag, resolver, count, depth + 1)?;
+                Vector(triomphe::Arc::new(elem_ty))
+            },
+            T::Struct(struct_tag) => {
+                let struct_ty = resolver(struct_tag.as_ref())?;
+
+                if struct_ty.ty_params.is_empty() && struct_tag.type_args.is_empty() {
+                    Struct {
+                        idx: struct_ty.idx,
+                        ability: AbilityInfo::struct_(struct_ty.abilities),
+                    }
+                } else {
+                    let mut ty_args = vec![];
+                    for ty_arg in &struct_tag.type_args {
+                        let ty_arg = self.create_ty_impl(ty_arg, resolver, count, depth + 1)?;
+                        ty_args.push(ty_arg);
+                    }
+                    Type::verify_ty_arg_abilities(struct_ty.ty_param_constraints(), &ty_args)
+                        .map_err(|e| e.finish(Location::Undefined))?;
+                    StructInstantiation {
+                        idx: struct_ty.idx,
+                        ty_args: triomphe::Arc::new(ty_args),
+                        ability: AbilityInfo::generic_struct(
+                            struct_ty.abilities,
+                            struct_ty.phantom_ty_params_mask.clone(),
+                        ),
+                    }
+                }
+            },
+        })
+    }
+
+    #[cfg(test)]
+    fn num_nodes_in_subst(&self, ty: &Type, ty_args: &[Type]) -> PartialVMResult<usize> {
+        let mut count = 0;
+
+        let check = |c: &mut u64, d: u64| self.check(c, d);
+        self.subst_impl(ty, ty_args, &mut count, 1, check)?;
+        Ok(count as usize)
+    }
+}
+
 #[cfg(test)]
 mod unit_tests {
     use super::*;
+    use claims::{assert_err, assert_matches, assert_ok};
+    use move_binary_format::file_format::StructHandleIndex;
 
-    fn struct_inst_for_test(ty_args: Vec<Type>) -> Type {
+    fn struct_instantiation_ty_for_test(ty_args: Vec<Type>) -> Type {
         Type::StructInstantiation {
             idx: StructNameIndex(0),
             ability: AbilityInfo::struct_(AbilitySet::EMPTY),
@@ -636,13 +1214,32 @@ mod unit_tests {
         }
     }
 
-    fn struct_for_test() -> Type {
+    fn struct_ty_for_test() -> Type {
         Type::Struct {
             idx: StructNameIndex(0),
             ability: AbilityInfo::struct_(AbilitySet::EMPTY),
         }
     }
 
+    fn nested_vec_for_test(ty_depth: u64) -> (Type, SignatureToken, TypeTag) {
+        use SignatureToken as S;
+        use Type::*;
+        use TypeTag as T;
+
+        let mut ty = U8;
+        let mut tok = S::U8;
+        let mut tag = T::U8;
+
+        let mut depth = 1;
+        while depth < ty_depth {
+            ty = Vector(TriompheArc::new(ty.clone()));
+            tok = S::Vector(Box::new(tok.clone()));
+            tag = T::Vector(Box::new(tag.clone()));
+            depth += 1;
+        }
+        (ty, tok, tag)
+    }
+
     #[test]
     fn test_num_nodes_in_type() {
         use Type::*;
@@ -653,10 +1250,14 @@ mod unit_tests {
             (Vector(TriompheArc::new(Vector(TriompheArc::new(U8)))), 3),
             (Reference(Box::new(Bool)), 2),
             (TyParam(0), 1),
-            (struct_for_test(), 1),
-            (struct_inst_for_test(vec![U8, U8]), 3),
+            (struct_ty_for_test(), 1),
+            (struct_instantiation_ty_for_test(vec![U8, U8]), 3),
             (
-                struct_inst_for_test(vec![U8, struct_inst_for_test(vec![Bool, Bool, Bool]), U8]),
+                struct_instantiation_ty_for_test(vec![
+                    U8,
+                    struct_instantiation_ty_for_test(vec![Bool, Bool, Bool]),
+                    U8,
+                ]),
                 7,
             ),
         ];
@@ -670,17 +1271,18 @@ mod unit_tests {
     fn test_num_nodes_in_subst() {
         use Type::*;
 
+        let ty_builder = TypeBuilder::with_limits(11, 5);
         let cases: Vec<(Type, Vec<Type>, usize)> = vec![
             (TyParam(0), vec![Bool], 1),
             (TyParam(0), vec![Vector(TriompheArc::new(Bool))], 2),
             (Bool, vec![], 1),
             (
-                struct_inst_for_test(vec![TyParam(0), TyParam(0)]),
+                struct_instantiation_ty_for_test(vec![TyParam(0), TyParam(0)]),
                 vec![Vector(TriompheArc::new(Bool))],
                 5,
             ),
             (
-                struct_inst_for_test(vec![TyParam(0), TyParam(1)]),
+                struct_instantiation_ty_for_test(vec![TyParam(0), TyParam(1)]),
                 vec![
                     Vector(TriompheArc::new(Bool)),
                     Vector(TriompheArc::new(Vector(TriompheArc::new(Bool)))),
@@ -689,8 +1291,306 @@ mod unit_tests {
             ),
         ];
 
-        for (ty, ty_args, expected) in cases {
-            assert_eq!(ty.num_nodes_in_subst(&ty_args).unwrap(), expected);
+        for (ty, ty_args, expected_num_nodes) in cases {
+            let num_nodes = assert_ok!(ty_builder.num_nodes_in_subst(&ty, &ty_args));
+            assert_eq!(num_nodes, expected_num_nodes);
+            assert_eq!(ty.num_nodes_in_subst(&ty_args).unwrap(), expected_num_nodes);
+        }
+    }
+
+    #[test]
+    fn test_substitution_large_depth() {
+        use Type::*;
+
+        let ty_builder = TypeBuilder::with_limits(11, 5);
+
+        let ty = Vector(TriompheArc::new(Vector(TriompheArc::new(TyParam(0)))));
+        let ty_arg = Vector(TriompheArc::new(Vector(TriompheArc::new(Bool))));
+        assert_ok!(ty_builder.create_ty_with_subst(&ty, &[ty_arg.clone()]));
+
+        let ty_arg = Vector(TriompheArc::new(ty_arg));
+        let err = assert_err!(ty_builder.create_ty_with_subst(&ty, &[ty_arg]));
+        assert_eq!(err.major_status(), StatusCode::VM_MAX_TYPE_DEPTH_REACHED);
+    }
+
+    #[test]
+    fn test_substitution_large_count() {
+        use Type::*;
+
+        let ty_builder = TypeBuilder::with_limits(11, 5);
+
+        let ty_params: Vec<Type> = (0..5).map(TyParam).collect();
+        let ty = struct_instantiation_ty_for_test(ty_params);
+
+        // Each type argument contributes 2 nodes, so in total the count is 11.
+        let ty_args: Vec<Type> = (0..5).map(|_| Vector(TriompheArc::new(Bool))).collect();
+        let num_nodes = assert_ok!(ty_builder.num_nodes_in_subst(&ty, &ty_args));
+        assert_eq!(num_nodes, 11);
+
+        let ty_args: Vec<Type> = (0..5)
+            .map(|i| {
+                if i == 4 {
+                    // 3 nodes, to increase the total count to 12.
+                    struct_instantiation_ty_for_test(vec![U64, struct_ty_for_test()])
+                } else {
+                    Vector(TriompheArc::new(Bool))
+                }
+            })
+            .collect();
+        let err = assert_err!(ty_builder.create_ty_with_subst(&ty, &ty_args));
+        assert_eq!(err.major_status(), StatusCode::TOO_MANY_TYPE_NODES);
+    }
+
+    #[test]
+    fn test_create_primitive_tys() {
+        use Type::*;
+
+        // Limits are irrelevant here.
+        let ty_builder = TypeBuilder::with_limits(1, 1);
+
+        assert_eq!(ty_builder.create_u8_ty(), U8);
+        assert_eq!(ty_builder.create_u16_ty(), U16);
+        assert_eq!(ty_builder.create_u32_ty(), U32);
+        assert_eq!(ty_builder.create_u64_ty(), U64);
+        assert_eq!(ty_builder.create_u128_ty(), U128);
+        assert_eq!(ty_builder.create_u256_ty(), U256);
+        assert_eq!(ty_builder.create_bool_ty(), Bool);
+    }
+
+    #[test]
+    fn test_create_struct_ty() {
+        let idx = StructNameIndex(0);
+        let ability_info = AbilityInfo::struct_(AbilitySet::EMPTY);
+
+        // Limits are not relevant here.
+        let struct_ty = TypeBuilder::with_limits(1, 1).create_struct_ty(idx, ability_info.clone());
+        assert_matches!(struct_ty, Type::Struct { .. });
+    }
+
+    #[test]
+    fn test_create_struct_instantiation_ty() {
+        use Type::*;
+
+        let struct_ty = StructType::for_test();
+        let ty_params = [TyParam(0), Bool, TyParam(1)];
+
+        // Should succeed, type size limit is 5, and we have 5 nodes.
+        let ty_builder = TypeBuilder::with_limits(5, 100);
+        let ty_args = [Bool, Vector(TriompheArc::new(Bool))];
+        assert_ok!(ty_builder.create_struct_instantiation_ty(&struct_ty, &ty_params, &ty_args));
+
+        // Should fail, we have size of 6 now.
+        let ty_args = [
+            Vector(TriompheArc::new(Bool)),
+            Vector(TriompheArc::new(Bool)),
+        ];
+        let err = assert_err!(
+            ty_builder.create_struct_instantiation_ty(&struct_ty, &ty_params, &ty_args)
+        );
+        assert_eq!(err.major_status(), StatusCode::TOO_MANY_TYPE_NODES);
+
+        // Should succeed, type depth limit is 4, and we have 4 nodes (3 in type parameter + struct).
+        let nested_vec = Vector(TriompheArc::new(Vector(TriompheArc::new(Bool))));
+        let ty_args = vec![Bool, nested_vec.clone()];
+        let ty_builder = TypeBuilder::with_limits(100, 4);
+        assert_ok!(ty_builder.create_struct_instantiation_ty(&struct_ty, &ty_params, &ty_args));
+
+        // Should fail, we have depth of 5 now.
+        let ty_params = vec![Bool, Vector(TriompheArc::new(nested_vec))];
+        let err = assert_err!(
+            ty_builder.create_struct_instantiation_ty(&struct_ty, &ty_params, &ty_args)
+        );
+        assert_eq!(err.major_status(), StatusCode::VM_MAX_TYPE_DEPTH_REACHED);
+    }
+
+    #[test]
+    fn test_create_vec_ty() {
+        let max_ty_depth = 5;
+        let ty_builder = TypeBuilder::with_limits(100, max_ty_depth);
+
+        let mut depth = 1;
+        let mut ty = Type::Bool;
+        while depth < max_ty_depth {
+            ty = assert_ok!(ty_builder.create_vec_ty(&ty));
+            assert_matches!(ty, Type::Vector(_));
+            depth += 1;
+        }
+        assert_eq!(depth, max_ty_depth);
+
+        // Type creation fails on exceeding the depth.
+        let err = assert_err!(ty_builder.create_vec_ty(&ty));
+        assert_eq!(err.major_status(), StatusCode::VM_MAX_TYPE_DEPTH_REACHED);
+
+        // The checks are always ordered: first number of nodes, then depth. Using
+        // a type builder with smaller than depth size limit must return a different
+        // error code.
+        let max_ty_size = 5;
+        let ty_builder = TypeBuilder::with_limits(max_ty_size, 100);
+        let err = assert_err!(ty_builder.create_vec_ty(&ty));
+        assert_eq!(err.major_status(), StatusCode::TOO_MANY_TYPE_NODES);
+    }
+
+    #[test]
+    fn test_create_ref_ty() {
+        let max_ty_depth = 5;
+        let ty_builder = TypeBuilder::with_limits(100, max_ty_depth);
+
+        let mut depth = 1;
+        let mut ty = Type::Bool;
+        while depth < max_ty_depth {
+            ty = assert_ok!(ty_builder.create_ref_ty(&ty, false));
+            assert_matches!(ty, Type::Reference(_));
+            depth += 1;
         }
+        assert_eq!(depth, max_ty_depth);
+
+        let err = assert_err!(ty_builder.create_ref_ty(&ty, false));
+        assert_eq!(err.major_status(), StatusCode::VM_MAX_TYPE_DEPTH_REACHED);
+
+        let max_ty_size = 5;
+        let ty_builder = TypeBuilder::with_limits(max_ty_size, 100);
+        let err = assert_err!(ty_builder.create_ref_ty(&ty, false));
+        assert_eq!(err.major_status(), StatusCode::TOO_MANY_TYPE_NODES);
+    }
+
+    #[test]
+    fn test_create_mut_ref_ty() {
+        let max_ty_depth = 5;
+        let ty_builder = TypeBuilder::with_limits(100, max_ty_depth);
+
+        let mut depth = 1;
+        let mut ty = Type::Bool;
+        while depth < max_ty_depth {
+            ty = assert_ok!(ty_builder.create_ref_ty(&ty, true));
+            assert_matches!(ty, Type::MutableReference(_));
+            depth += 1;
+        }
+        assert_eq!(depth, max_ty_depth);
+
+        let err = assert_err!(ty_builder.create_ref_ty(&ty, true));
+        assert_eq!(err.major_status(), StatusCode::VM_MAX_TYPE_DEPTH_REACHED);
+
+        let max_ty_size = 5;
+        let ty_builder = TypeBuilder::with_limits(max_ty_size, 100);
+        let err = assert_err!(ty_builder.create_ref_ty(&ty, true));
+        assert_eq!(err.major_status(), StatusCode::TOO_MANY_TYPE_NODES);
+    }
+
+    #[test]
+    fn test_create_constant_ty() {
+        use SignatureToken as S;
+        use Type::*;
+
+        let max_ty_depth = 5;
+        let ty_builder = TypeBuilder::with_limits(100, max_ty_depth);
+
+        assert_eq!(assert_ok!(ty_builder.create_constant_ty(&S::U8)), U8);
+        assert_eq!(assert_ok!(ty_builder.create_constant_ty(&S::U16)), U16);
+        assert_eq!(assert_ok!(ty_builder.create_constant_ty(&S::U32)), U32);
+        assert_eq!(assert_ok!(ty_builder.create_constant_ty(&S::U64)), U64);
+        assert_eq!(assert_ok!(ty_builder.create_constant_ty(&S::U128)), U128);
+        assert_eq!(assert_ok!(ty_builder.create_constant_ty(&S::U256)), U256);
+        assert_eq!(assert_ok!(ty_builder.create_constant_ty(&S::Bool)), Bool);
+        assert_eq!(
+            assert_ok!(ty_builder.create_constant_ty(&S::Address)),
+            Address
+        );
+
+        // Vectors are special, because we limit their depth (and size).
+        // Here, we test the boundary cases.
+
+        for depth in [max_ty_depth - 1, max_ty_depth] {
+            let (expected_ty, vec_tok, _) = nested_vec_for_test(depth);
+            let ty = assert_ok!(ty_builder.create_constant_ty(&vec_tok));
+            assert_eq!(&ty, &expected_ty);
+        }
+
+        let (_, vec_tok, _) = nested_vec_for_test(max_ty_depth + 1);
+        let err = assert_err!(ty_builder.create_constant_ty(&vec_tok));
+        assert_eq!(err.major_status(), StatusCode::VM_MAX_TYPE_DEPTH_REACHED);
+
+        let max_ty_size = 5;
+        let ty_builder = TypeBuilder::with_limits(max_ty_size, 100);
+
+        for size in [max_ty_size - 1, max_ty_size] {
+            let (expected_ty, vec_tok, _) = nested_vec_for_test(size);
+            let ty = assert_ok!(ty_builder.create_constant_ty(&vec_tok));
+            assert_eq!(&ty, &expected_ty);
+        }
+
+        let (_, vec_tok, _) = nested_vec_for_test(max_ty_size + 1);
+        let err = assert_err!(ty_builder.create_constant_ty(&vec_tok));
+        assert_eq!(err.major_status(), StatusCode::TOO_MANY_TYPE_NODES);
+
+        // The following tokens cannot be constants:
+
+        let struct_tok = S::Struct(StructHandleIndex::new(0));
+        assert_err!(ty_builder.create_constant_ty(&struct_tok));
+
+        let struct_instantiation_tok = S::StructInstantiation(StructHandleIndex::new(0), vec![]);
+        assert_err!(ty_builder.create_constant_ty(&struct_instantiation_tok));
+
+        assert_err!(ty_builder.create_constant_ty(&S::Signer));
+
+        let ref_tok = S::Reference(Box::new(S::U8));
+        assert_err!(ty_builder.create_constant_ty(&ref_tok));
+
+        let mut_ref_tok = S::Reference(Box::new(S::U8));
+        assert_err!(ty_builder.create_constant_ty(&mut_ref_tok));
+
+        let ty_param_tok = S::TypeParameter(0);
+        assert_err!(ty_builder.create_constant_ty(&ty_param_tok));
+    }
+
+    #[test]
+    fn test_create_ty() {
+        use Type::*;
+        use TypeTag as T;
+
+        let max_ty_size = 11;
+        let max_ty_depth = 5;
+        let ty_builder = TypeBuilder::with_limits(max_ty_size, max_ty_depth);
+
+        let no_op = |_: &StructTag| unreachable!("Should not be called");
+
+        // Primitive types.
+
+        assert_eq!(assert_ok!(ty_builder.create_ty(&T::U8, no_op)), U8);
+        assert_eq!(assert_ok!(ty_builder.create_ty(&T::U16, no_op)), U16);
+        assert_eq!(assert_ok!(ty_builder.create_ty(&T::U32, no_op)), U32);
+        assert_eq!(assert_ok!(ty_builder.create_ty(&T::U64, no_op)), U64);
+        assert_eq!(assert_ok!(ty_builder.create_ty(&T::U128, no_op)), U128);
+        assert_eq!(assert_ok!(ty_builder.create_ty(&T::U256, no_op)), U256);
+        assert_eq!(assert_ok!(ty_builder.create_ty(&T::Bool, no_op)), Bool);
+        assert_eq!(
+            assert_ok!(ty_builder.create_ty(&T::Address, no_op)),
+            Address
+        );
+        assert_eq!(assert_ok!(ty_builder.create_ty(&T::Signer, no_op)), Signer);
+
+        // Vectors.
+
+        for depth in [max_ty_depth - 1, max_ty_depth] {
+            let (expected_ty, _, vec_tag) = nested_vec_for_test(depth);
+            let ty = assert_ok!(ty_builder.create_ty(&vec_tag, no_op));
+            assert_eq!(&ty, &expected_ty);
+        }
+
+        let (_, _, vec_tag) = nested_vec_for_test(max_ty_depth + 1);
+        let err = assert_err!(ty_builder.create_ty(&vec_tag, no_op));
+        assert_eq!(err.major_status(), StatusCode::VM_MAX_TYPE_DEPTH_REACHED);
+
+        let max_ty_size = 5;
+        let ty_builder = TypeBuilder::with_limits(max_ty_size, 100);
+
+        for size in [max_ty_size - 1, max_ty_size] {
+            let (expected_ty, _, vec_tag) = nested_vec_for_test(size);
+            let ty = assert_ok!(ty_builder.create_ty(&vec_tag, no_op));
+            assert_eq!(&ty, &expected_ty);
+        }
+
+        let (_, _, vec_tag) = nested_vec_for_test(max_ty_size + 1);
+        let err = assert_err!(ty_builder.create_ty(&vec_tag, no_op));
+        assert_eq!(err.major_status(), StatusCode::TOO_MANY_TYPE_NODES);
     }
 }
diff --git a/third_party/move/move-vm/types/src/resolver.rs b/third_party/move/move-vm/types/src/resolver.rs
new file mode 100644
index 0000000000000..3d3971baf5e4f
--- /dev/null
+++ b/third_party/move/move-vm/types/src/resolver.rs
@@ -0,0 +1,57 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use bytes::Bytes;
+use move_binary_format::errors::PartialVMResult;
+use move_core_types::{
+    account_address::AccountAddress,
+    language_storage::{ModuleId, StructTag},
+    metadata::Metadata,
+    value::MoveTypeLayout,
+};
+
+/// Traits for resolving Move modules and resources from persistent storage
+
+/// A persistent storage backend that can resolve modules by address + name.
+/// Storage backends should return
+///   - Ok(Some(..)) if the data exists
+///   - Ok(None)     if the data does not exist
+///   - Err(..)      only when something really wrong happens, for example
+///                    - invariants are broken and observable from the storage side
+///                      (this is not currently possible as ModuleId and StructTag
+///                       are always structurally valid)
+///                    - storage encounters internal error
+pub trait ModuleResolver {
+    fn get_module_metadata(&self, module_id: &ModuleId) -> Vec<Metadata>;
+
+    fn get_module(&self, id: &ModuleId) -> PartialVMResult<Option<Bytes>>;
+}
+
+pub fn resource_size(resource: &Option<Bytes>) -> usize {
+    resource.as_ref().map(|bytes| bytes.len()).unwrap_or(0)
+}
+
+/// A persistent storage backend that can resolve resources by address + type
+/// Storage backends should return
+///   - Ok(Some(..)) if the data exists
+///   - Ok(None)     if the data does not exist
+///   - Err(..)      only when something really wrong happens, for example
+///                    - invariants are broken and observable from the storage side
+///                      (this is not currently possible as ModuleId and StructTag
+///                       are always structurally valid)
+///                    - storage encounters internal error
+pub trait ResourceResolver {
+    fn get_resource_bytes_with_metadata_and_layout(
+        &self,
+        address: &AccountAddress,
+        struct_tag: &StructTag,
+        metadata: &[Metadata],
+        layout: Option<&MoveTypeLayout>,
+    ) -> PartialVMResult<(Option<Bytes>, usize)>;
+}
+
+/// A persistent storage implementation that can resolve both resources and modules
+pub trait MoveResolver: ModuleResolver + ResourceResolver {}
+
+impl<T: ModuleResolver + ResourceResolver + ?Sized> MoveResolver for T {}
diff --git a/third_party/move/move-vm/types/src/value_serde.rs b/third_party/move/move-vm/types/src/value_serde.rs
index 1d044370cb3bb..5f17bfe9b3848 100644
--- a/third_party/move/move-vm/types/src/value_serde.rs
+++ b/third_party/move/move-vm/types/src/value_serde.rs
@@ -150,6 +150,28 @@ pub fn serialize_and_allow_delayed_values(
         .transpose()
 }
 
+/// Returns the serialized size in bytes of a Move value, with compatible layout.
+/// Note that the layout should match, as otherwise serialization fails. This
+/// method explicitly allows having delayed values inside the passed in Move value
+/// because their size is fixed and cannot change.
+pub fn serialized_size_allowing_delayed_values(
+    value: &Value,
+    layout: &MoveTypeLayout,
+) -> PartialVMResult<usize> {
+    let native_serializer = RelaxedCustomSerDe::new();
+    let value = SerializationReadyValue {
+        custom_serializer: Some(&native_serializer),
+        layout,
+        value: &value.0,
+    };
+    bcs::serialized_size(&value).map_err(|e| {
+        PartialVMError::new(StatusCode::VALUE_SERIALIZATION_ERROR).with_message(format!(
+            "failed to compute serialized size of a value: {:?}",
+            e
+        ))
+    })
+}
+
 /// Allow conversion between values and identifiers (delayed values). For example,
 /// this trait can be implemented to fetch a concrete Move value from the global
 /// state based on the identifier stored inside a delayed value.
diff --git a/third_party/move/move-vm/types/src/values/mod.rs b/third_party/move/move-vm/types/src/values/mod.rs
index 9ce8415cbcdfd..4796eb7fbd947 100644
--- a/third_party/move/move-vm/types/src/values/mod.rs
+++ b/third_party/move/move-vm/types/src/values/mod.rs
@@ -7,6 +7,8 @@ pub mod values_impl;
 #[cfg(test)]
 mod value_tests;
 
+#[cfg(test)]
+mod serialization_tests;
 #[cfg(all(test, feature = "fuzzing"))]
 mod value_prop_tests;
 
diff --git a/third_party/move/move-vm/types/src/values/serialization_tests.rs b/third_party/move/move-vm/types/src/values/serialization_tests.rs
new file mode 100644
index 0000000000000..6085a50183e2c
--- /dev/null
+++ b/third_party/move/move-vm/types/src/values/serialization_tests.rs
@@ -0,0 +1,246 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! Contains tests for serialization
+
+use crate::{
+    delayed_values::delayed_field_id::DelayedFieldID,
+    value_serde::{serialize_and_allow_delayed_values, serialized_size_allowing_delayed_values},
+    values::{values_impl, Struct, Value},
+};
+use claims::{assert_err, assert_ok, assert_some};
+use move_core_types::{
+    account_address::AccountAddress,
+    u256,
+    value::{IdentifierMappingKind, MoveStruct, MoveStructLayout, MoveTypeLayout, MoveValue},
+};
+use serde::{Deserialize, Serialize};
+use std::iter;
+
+fn test_layout() -> MoveTypeLayout {
+    MoveTypeLayout::Struct(MoveStructLayout::RuntimeVariants(vec![
+        vec![MoveTypeLayout::U64],
+        vec![],
+        vec![MoveTypeLayout::Bool, MoveTypeLayout::U32],
+    ]))
+}
+
+// ---------------------------------------------------------------------------
+// Serialization round trip tests
+
+#[test]
+fn enum_round_trip_move_value() {
+    let layout = test_layout();
+    let good_values = vec![
+        MoveValue::Struct(MoveStruct::RuntimeVariant(0, vec![MoveValue::U64(42)])),
+        MoveValue::Struct(MoveStruct::RuntimeVariant(1, vec![])),
+        MoveValue::Struct(MoveStruct::RuntimeVariant(2, vec![
+            MoveValue::Bool(true),
+            MoveValue::U32(13),
+        ])),
+    ];
+    for value in good_values {
+        let blob = value.simple_serialize().expect("serialization succeeds");
+        let de_value =
+            MoveValue::simple_deserialize(&blob, &layout).expect("deserialization succeeds");
+        assert_eq!(value, de_value, "roundtrip serialization succeeds")
+    }
+    let bad_tag_value = MoveValue::Struct(MoveStruct::RuntimeVariant(3, vec![MoveValue::U64(42)]));
+    let blob = bad_tag_value
+        .simple_serialize()
+        .expect("serialization succeeds");
+    MoveValue::simple_deserialize(&blob, &layout)
+        .inspect_err(|e| {
+            assert!(
+                e.to_string().contains("invalid length"),
+                "unexpected error message: {}",
+                e
+            );
+        })
+        .expect_err("bad tag value deserialization fails");
+    let bad_struct_value = MoveValue::Struct(MoveStruct::Runtime(vec![MoveValue::U64(42)]));
+    let blob = bad_struct_value
+        .simple_serialize()
+        .expect("serialization succeeds");
+    MoveValue::simple_deserialize(&blob, &layout)
+        .inspect_err(|e| {
+            assert!(
+                e.to_string().contains("invalid length"),
+                "unexpected error message: {}",
+                e
+            );
+        })
+        .expect_err("bad struct value deserialization fails");
+}
+
+#[test]
+fn enum_round_trip_vm_value() {
+    let layout = test_layout();
+    let good_values = vec![
+        Value::struct_(Struct::pack_variant(0, iter::once(Value::u64(42)))),
+        Value::struct_(Struct::pack_variant(1, iter::empty())),
+        Value::struct_(Struct::pack_variant(
+            2,
+            [Value::bool(true), Value::u32(13)].into_iter(),
+        )),
+    ];
+    for value in good_values {
+        let blob = value
+            .simple_serialize(&layout)
+            .expect("serialization succeeds");
+        let de_value = Value::simple_deserialize(&blob, &layout).expect("deserialization succeeds");
+        assert!(
+            value.equals(&de_value).unwrap(),
+            "roundtrip serialization succeeds"
+        )
+    }
+    let bad_tag_value = Value::struct_(Struct::pack_variant(3, [Value::u64(42)]));
+    assert!(
+        bad_tag_value.simple_serialize(&layout).is_none(),
+        "serialization fails"
+    );
+    let bad_struct_value = Value::struct_(Struct::pack([Value::u64(42)]));
+    assert!(
+        bad_struct_value.simple_serialize(&layout).is_none(),
+        "serialization fails"
+    );
+}
+
+// ---------------------------------------------------------------------------
+// Rust cross-serialization tests
+
+#[derive(Serialize, Deserialize, PartialEq, Eq, Debug)]
+pub enum RustEnum {
+    Number(u64),
+    Empty,
+    BoolNumber(bool, u32),
+}
+
+#[test]
+fn enum_rust_round_trip_move_value() {
+    let layout = test_layout();
+    let move_values = vec![
+        MoveValue::Struct(MoveStruct::RuntimeVariant(0, vec![MoveValue::U64(42)])),
+        MoveValue::Struct(MoveStruct::RuntimeVariant(1, vec![])),
+        MoveValue::Struct(MoveStruct::RuntimeVariant(2, vec![
+            MoveValue::Bool(true),
+            MoveValue::U32(13),
+        ])),
+    ];
+    let rust_values = vec![
+        RustEnum::Number(42),
+        RustEnum::Empty,
+        RustEnum::BoolNumber(true, 13),
+    ];
+    for (move_value, rust_value) in move_values.into_iter().zip(rust_values) {
+        let from_move = move_value.simple_serialize().expect("from move succeeds");
+        let to_rust = bcs::from_bytes::<RustEnum>(&from_move).expect("to rust successful");
+        assert_eq!(to_rust, rust_value);
+
+        let from_rust = bcs::to_bytes(&rust_value).expect("from rust succeeds");
+        let to_move = MoveValue::simple_deserialize(&from_rust, &layout).expect("to move succeeds");
+        assert_eq!(to_move, move_value)
+    }
+}
+
+#[test]
+fn enum_rust_round_trip_vm_value() {
+    let layout = test_layout();
+    let move_values = vec![
+        Value::struct_(Struct::pack_variant(0, iter::once(Value::u64(42)))),
+        Value::struct_(Struct::pack_variant(1, iter::empty())),
+        Value::struct_(Struct::pack_variant(
+            2,
+            [Value::bool(true), Value::u32(13)].into_iter(),
+        )),
+    ];
+    let rust_values = vec![
+        RustEnum::Number(42),
+        RustEnum::Empty,
+        RustEnum::BoolNumber(true, 13),
+    ];
+    for (move_value, rust_value) in move_values.into_iter().zip(rust_values) {
+        let from_move = move_value
+            .simple_serialize(&layout)
+            .expect("from move succeeds");
+        let to_rust = bcs::from_bytes::<RustEnum>(&from_move).expect("to rust successful");
+        assert_eq!(to_rust, rust_value);
+
+        let from_rust = bcs::to_bytes(&rust_value).expect("from rust succeeds");
+        let to_move = Value::simple_deserialize(&from_rust, &layout).expect("to move succeeds");
+        assert!(
+            to_move.equals(&move_value).unwrap(),
+            "from rust to move failed"
+        )
+    }
+}
+
+// --------------------------------------------------------------------------
+// Serialization size tests
+
+#[test]
+fn test_serialized_size() {
+    use IdentifierMappingKind::*;
+    use MoveStructLayout::*;
+    use MoveTypeLayout::*;
+
+    let u64_delayed_value = Value::delayed_value(DelayedFieldID::new_with_width(12, 8));
+    let u128_delayed_value = Value::delayed_value(DelayedFieldID::new_with_width(123, 16));
+    let derived_string_delayed_value = Value::delayed_value(DelayedFieldID::new_with_width(12, 60));
+
+    // First field is a string, second field is a padding to ensure constant size.
+    let derived_string_layout = Struct(Runtime(vec![
+        Struct(Runtime(vec![Vector(Box::new(U8))])),
+        Vector(Box::new(U8)),
+    ]));
+
+    // All these pairs should serialize.
+    let good_values_layouts_sizes = [
+        (Value::u8(10), U8),
+        (Value::u16(10), U16),
+        (Value::u32(10), U32),
+        (Value::u64(10), U64),
+        (Value::u128(10), U128),
+        (Value::u256(u256::U256::one()), U256),
+        (Value::bool(true), Bool),
+        (Value::address(AccountAddress::ONE), Address),
+        (Value::signer(AccountAddress::ONE), Signer),
+        (u64_delayed_value, Native(Aggregator, Box::new(U64))),
+        (u128_delayed_value, Native(Snapshot, Box::new(U128))),
+        (
+            derived_string_delayed_value,
+            Native(DerivedString, Box::new(derived_string_layout)),
+        ),
+        (
+            Value::vector_address(vec![AccountAddress::ONE]),
+            Vector(Box::new(Address)),
+        ),
+        (
+            Value::struct_(values_impl::Struct::pack(vec![
+                Value::bool(true),
+                Value::vector_u32(vec![1, 2, 3, 4, 5]),
+            ])),
+            Struct(Runtime(vec![Bool, Vector(Box::new(U32))])),
+        ),
+    ];
+    for (value, layout) in good_values_layouts_sizes {
+        let bytes = assert_some!(assert_ok!(serialize_and_allow_delayed_values(
+            &value, &layout
+        )));
+        let size = assert_ok!(serialized_size_allowing_delayed_values(&value, &layout));
+        assert_eq!(size, bytes.len());
+    }
+
+    // Also test unhappy path, mostly mismatches in value-layout.
+    let u64_delayed_value = Value::delayed_value(DelayedFieldID::new_with_width(0, 8));
+    let malformed_delayed_value = Value::delayed_value(DelayedFieldID::new_with_width(1, 7));
+    let bad_values_layouts_sizes = [
+        (Value::u8(10), U16),
+        (u64_delayed_value, U64),
+        (malformed_delayed_value, U64),
+        (Value::u64(12), Native(Aggregator, Box::new(U64))),
+    ];
+    for (value, layout) in bad_values_layouts_sizes {
+        assert_err!(serialized_size_allowing_delayed_values(&value, &layout));
+    }
+}
diff --git a/third_party/move/move-vm/types/src/values/value_tests.rs b/third_party/move/move-vm/types/src/values/value_tests.rs
index d97edd0f51f51..4e939be5c7a23 100644
--- a/third_party/move/move-vm/types/src/values/value_tests.rs
+++ b/third_party/move/move-vm/types/src/values/value_tests.rs
@@ -2,7 +2,7 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::{loaded_data::runtime_types::Type, values::*, views::*};
+use crate::{loaded_data::runtime_types::TypeBuilder, values::*, views::*};
 use move_binary_format::errors::*;
 use move_core_types::{account_address::AccountAddress, u256::U256};
 
@@ -150,8 +150,11 @@ fn legacy_ref_abstract_memory_size_consistency() -> PartialVMResult<()> {
     let r = locals.borrow_loc(1)?;
     assert_eq!(r.legacy_abstract_memory_size(), r.legacy_size());
 
+    // Actual limits for type builder are irrelevant for the test.
+    let u8_ty = TypeBuilder::with_limits(10, 10).create_u8_ty();
+
     let r: VectorRef = r.value_as()?;
-    let r = r.borrow_elem(0, &Type::U8)?;
+    let r = r.borrow_elem(0, &u8_ty)?;
     assert_eq!(r.legacy_abstract_memory_size(), r.legacy_size());
 
     locals.store_loc(2, Value::struct_(Struct::pack([])), false)?;
diff --git a/third_party/move/move-vm/types/src/values/values_impl.rs b/third_party/move/move-vm/types/src/values/values_impl.rs
index c16ed09b541a4..006c16d6b9dd1 100644
--- a/third_party/move/move-vm/types/src/values/values_impl.rs
+++ b/third_party/move/move-vm/types/src/values/values_impl.rs
@@ -8,6 +8,7 @@ use crate::{
     loaded_data::runtime_types::Type,
     views::{ValueView, ValueVisitor},
 };
+use itertools::Itertools;
 use move_binary_format::{
     errors::*,
     file_format::{Constant, SignatureToken},
@@ -16,7 +17,7 @@ use move_core_types::{
     account_address::AccountAddress,
     effects::Op,
     gas_algebra::AbstractMemorySize,
-    u256,
+    u256, value,
     value::{MoveStructLayout, MoveTypeLayout},
     vm_status::{sub_status::NFE_VECTOR_ERROR_BASE, StatusCode},
 };
@@ -981,6 +982,37 @@ impl StructRef {
     pub fn borrow_field(&self, idx: usize) -> PartialVMResult<Value> {
         Ok(Value(self.0.borrow_elem(idx)?))
     }
+
+    pub fn borrow_variant_field(
+        &self,
+        allowed: &[VariantIndex],
+        idx: usize,
+        variant_to_str: &impl Fn(VariantIndex) -> String,
+    ) -> PartialVMResult<Value> {
+        let tag = self.get_variant_tag()?;
+        if allowed.contains(&tag) {
+            Ok(Value(self.0.borrow_elem(idx + 1)?))
+        } else {
+            Err(
+                PartialVMError::new(StatusCode::STRUCT_VARIANT_MISMATCH).with_message(format!(
+                    "expected enum variant {}, found `{}`",
+                    allowed.iter().cloned().map(variant_to_str).join(" or "),
+                    variant_to_str(tag)
+                )),
+            )
+        }
+    }
+
+    pub fn test_variant(&self, variant: VariantIndex) -> PartialVMResult<Value> {
+        let tag = self.get_variant_tag()?;
+        Ok(Value::bool(variant == tag))
+    }
+
+    fn get_variant_tag(&self) -> PartialVMResult<VariantIndex> {
+        let tag_ref = Value(self.0.borrow_elem(0)?).value_as::<Reference>()?;
+        let tag_value = tag_ref.read_ref()?;
+        tag_value.value_as::<u16>()
+    }
 }
 
 impl Locals {
@@ -2489,6 +2521,48 @@ impl Struct {
     pub fn unpack(self) -> PartialVMResult<impl Iterator<Item = Value>> {
         Ok(self.fields.into_iter().map(Value))
     }
+
+    pub fn pack_variant<I: IntoIterator<Item = Value>>(variant: VariantIndex, vals: I) -> Self {
+        Self {
+            fields: iter::once(Value::u16(variant))
+                .chain(vals)
+                .map(|v| v.0)
+                .collect(),
+        }
+    }
+
+    pub fn unpack_variant(
+        self,
+        variant: VariantIndex,
+        variant_to_str: impl Fn(VariantIndex) -> String,
+    ) -> PartialVMResult<impl Iterator<Item = Value>> {
+        let (tag, values) = self.unpack_with_tag()?;
+        if tag == variant {
+            Ok(values)
+        } else {
+            Err(
+                PartialVMError::new(StatusCode::STRUCT_VARIANT_MISMATCH).with_message(format!(
+                    "expected enum variant {}, found {}",
+                    variant_to_str(variant),
+                    variant_to_str(tag)
+                )),
+            )
+        }
+    }
+
+    pub fn unpack_with_tag(self) -> PartialVMResult<(VariantIndex, impl Iterator<Item = Value>)> {
+        let Self { fields } = self;
+        if fields.is_empty() {
+            return Err(
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                    .with_message("invalid empty enum variant".to_string()),
+            );
+        }
+        let mut values = fields.into_iter();
+        let tag_value = Value(values.next().unwrap());
+        let tag = tag_value.value_as::<u16>()?;
+        Ok((tag, values.map(Value)))
+    }
 }
 
 /***************************************************************************************
@@ -3028,9 +3102,10 @@ pub mod debug {
  *
  **************************************************************************************/
 use crate::value_serde::{CustomDeserializer, CustomSerializer, RelaxedCustomSerDe};
+use move_binary_format::file_format::VariantIndex;
 use serde::{
-    de::Error as DeError,
-    ser::{Error as SerError, SerializeSeq, SerializeTuple},
+    de::{EnumAccess, Error as DeError, Unexpected, VariantAccess},
+    ser::{Error as SerError, SerializeSeq, SerializeTuple, SerializeTupleVariant},
     Deserialize,
 };
 
@@ -3196,23 +3271,69 @@ impl<'c, 'l, 'v, C: CustomSerializer> serde::Serialize
     for SerializationReadyValue<'c, 'l, 'v, MoveStructLayout, Vec<ValueImpl>, C>
 {
     fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
-        let values = &self.value;
-        let fields = self.layout.fields();
-        if fields.len() != values.len() {
-            return Err(invariant_violation::<S>(format!(
-                "cannot serialize struct value {:?} as {:?} -- number of fields mismatch",
-                self.value, self.layout
-            )));
-        }
-        let mut t = serializer.serialize_tuple(values.len())?;
-        for (field_layout, value) in fields.iter().zip(values.iter()) {
-            t.serialize_element(&SerializationReadyValue {
-                custom_serializer: self.custom_serializer,
-                layout: field_layout,
-                value,
-            })?;
+        let mut values = self.value.as_slice();
+        if let Some((tag, variant_layouts)) = try_get_variant_field_layouts(self.layout, values) {
+            let tag_idx = tag as usize;
+            let variant_tag = tag_idx as u32;
+            let variant_name = value::variant_name_placeholder((tag + 1) as usize)[tag_idx];
+            values = &values[1..];
+            if variant_layouts.len() != values.len() {
+                return Err(invariant_violation::<S>(format!(
+                    "cannot serialize struct value {:?} as {:?} -- number of fields mismatch",
+                    self.value, self.layout
+                )));
+            }
+            match values.len() {
+                0 => serializer.serialize_unit_variant(
+                    value::MOVE_ENUM_NAME,
+                    variant_tag,
+                    variant_name,
+                ),
+                1 => serializer.serialize_newtype_variant(
+                    value::MOVE_ENUM_NAME,
+                    variant_tag,
+                    variant_name,
+                    &SerializationReadyValue {
+                        custom_serializer: self.custom_serializer,
+                        layout: &variant_layouts[0],
+                        value: &values[0],
+                    },
+                ),
+                _ => {
+                    let mut t = serializer.serialize_tuple_variant(
+                        value::MOVE_ENUM_NAME,
+                        variant_tag,
+                        variant_name,
+                        values.len(),
+                    )?;
+                    for (layout, value) in variant_layouts.iter().zip(values) {
+                        t.serialize_field(&SerializationReadyValue {
+                            custom_serializer: self.custom_serializer,
+                            layout,
+                            value,
+                        })?
+                    }
+                    t.end()
+                },
+            }
+        } else {
+            let field_layouts = self.layout.fields(None);
+            let mut t = serializer.serialize_tuple(values.len())?;
+            if field_layouts.len() != values.len() {
+                return Err(invariant_violation::<S>(format!(
+                    "cannot serialize struct value {:?} as {:?} -- number of fields mismatch",
+                    self.value, self.layout
+                )));
+            }
+            for (field_layout, value) in field_layouts.iter().zip(values.iter()) {
+                t.serialize_element(&SerializationReadyValue {
+                    custom_serializer: self.custom_serializer,
+                    layout: field_layout,
+                    value,
+                })?;
+            }
+            t.end()
         }
-        t.end()
     }
 }
 
@@ -3313,12 +3434,32 @@ impl<'d, C: CustomDeserializer> serde::de::DeserializeSeed<'d>
         self,
         deserializer: D,
     ) -> Result<Self::Value, D::Error> {
-        let field_layouts = self.layout.fields();
-        let fields = deserializer.deserialize_tuple(
-            field_layouts.len(),
-            StructFieldVisitor(self.custom_deserializer, field_layouts),
-        )?;
-        Ok(Struct::pack(fields))
+        match &self.layout {
+            MoveStructLayout::Runtime(field_layouts) => {
+                let fields = deserializer.deserialize_tuple(
+                    field_layouts.len(),
+                    StructFieldVisitor(self.custom_deserializer, field_layouts),
+                )?;
+                Ok(Struct::pack(fields))
+            },
+            MoveStructLayout::RuntimeVariants(variants) => {
+                if variants.len() > (u16::MAX as usize) {
+                    return Err(D::Error::custom("variant count out of range"));
+                }
+                let variant_names = value::variant_name_placeholder(variants.len());
+                let fields = deserializer.deserialize_enum(
+                    value::MOVE_ENUM_NAME,
+                    variant_names,
+                    StructVariantVisitor(self.custom_deserializer, variants),
+                )?;
+                Ok(Struct::pack(fields))
+            },
+            MoveStructLayout::WithFields(_)
+            | MoveStructLayout::WithTypes { .. }
+            | MoveStructLayout::WithVariants(_) => {
+                Err(D::Error::custom("cannot deserialize from decorated type"))
+            },
+        }
     }
 }
 
@@ -3374,6 +3515,96 @@ impl<'d, 'c, 'l, C: CustomDeserializer> serde::de::Visitor<'d> for StructFieldVi
     }
 }
 
+struct StructVariantVisitor<'c, 'l, C>(Option<&'c C>, &'l [Vec<MoveTypeLayout>]);
+
+impl<'d, 'c, 'l, C: CustomDeserializer> serde::de::Visitor<'d> for StructVariantVisitor<'c, 'l, C> {
+    type Value = Vec<Value>;
+
+    fn expecting(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
+        formatter.write_str("Variant")
+    }
+
+    fn visit_enum<A>(self, data: A) -> Result<Self::Value, A::Error>
+    where
+        A: EnumAccess<'d>,
+    {
+        let (tag, rest) = data.variant()?;
+        if tag as usize >= self.1.len() {
+            Err(A::Error::invalid_length(0, &self))
+        } else {
+            let mut values = vec![Value::u16(tag)];
+            let fields = &self.1[tag as usize];
+            match fields.len() {
+                0 => {
+                    rest.unit_variant()?;
+                    Ok(values)
+                },
+                1 => {
+                    values.push(rest.newtype_variant_seed(DeserializationSeed {
+                        custom_deserializer: self.0,
+                        layout: &fields[0],
+                    })?);
+                    Ok(values)
+                },
+                _ => {
+                    values.append(
+                        &mut rest
+                            .tuple_variant(fields.len(), StructFieldVisitor(self.0, fields))?,
+                    );
+                    Ok(values)
+                },
+            }
+        }
+    }
+
+    fn visit_seq<A>(self, mut seq: A) -> Result<Self::Value, A::Error>
+    where
+        A: serde::de::SeqAccess<'d>,
+    {
+        let mut val = Vec::new();
+
+        // First deserialize the variant tag.
+        // Note this is actually directly serialized as u16, but this is equivalent
+        // to MoveTypeLayout::U16, so we can reuse the custom deserializer seed.
+        let variant_tag = match seq.next_element_seed(DeserializationSeed {
+            custom_deserializer: self.0,
+            layout: &MoveTypeLayout::U16,
+        })? {
+            Some(elem) => {
+                let variant_tag = if let Ok(tag) = elem.value_as::<u16>() {
+                    tag as usize
+                } else {
+                    // This shouldn't happen but be robust and produce an error
+                    return Err(A::Error::invalid_value(
+                        Unexpected::Other("not a valid enum variant tag"),
+                        &self,
+                    ));
+                };
+                if variant_tag >= self.1.len() {
+                    return Err(A::Error::invalid_value(Unexpected::StructVariant, &self));
+                }
+                variant_tag
+            },
+            None => return Err(A::Error::invalid_length(0, &self)),
+        };
+
+        val.push(Value::u16(variant_tag as u16));
+
+        // Based on the validated variant tag, we know the field types
+        for (i, field_layout) in self.1[variant_tag].iter().enumerate() {
+            if let Some(elem) = seq.next_element_seed(DeserializationSeed {
+                custom_deserializer: self.0,
+                layout: field_layout,
+            })? {
+                val.push(elem)
+            } else {
+                return Err(A::Error::invalid_length(i, &self));
+            }
+        }
+        Ok(val)
+    }
+}
+
 /***************************************************************************************
 *
 * Constants
@@ -3773,9 +4004,17 @@ pub mod prop {
                     })
                     .boxed(),
             },
+            L::Struct(struct_layout @ MoveStructLayout::RuntimeVariants(variants)) => struct_layout
+                // TODO(#13806): do we need to have a strategy for different variants?
+                .fields(Some(variants.len().wrapping_sub(1))) // choose last variant
+                .iter()
+                .map(value_strategy_with_layout)
+                .collect::<Vec<_>>()
+                .prop_map(move |vals| Value::struct_(Struct::pack(vals)))
+                .boxed(),
 
             L::Struct(struct_layout) => struct_layout
-                .fields()
+                .fields(None)
                 .iter()
                 .map(value_strategy_with_layout)
                 .collect::<Vec<_>>()
@@ -3845,11 +4084,30 @@ impl ValueImpl {
             (L::Address, ValueImpl::Address(x)) => MoveValue::Address(*x),
 
             (L::Struct(struct_layout), ValueImpl::Container(Container::Struct(r))) => {
-                let mut fields = vec![];
-                for (v, field_layout) in r.borrow().iter().zip(struct_layout.fields().iter()) {
-                    fields.push(v.as_move_value(field_layout));
+                let values_ref = r.borrow();
+                let values = values_ref.as_slice();
+                if let Some((tag, variant_layouts)) =
+                    try_get_variant_field_layouts(struct_layout, values)
+                {
+                    MoveValue::Struct(MoveStruct::new_variant(
+                        tag,
+                        values
+                            .iter()
+                            // Skip the tag value
+                            .skip(1)
+                            .zip(variant_layouts.iter())
+                            .map(|(v, field_layout)| v.as_move_value(field_layout))
+                            .collect(),
+                    ))
+                } else {
+                    MoveValue::Struct(MoveStruct::new(
+                        values
+                            .iter()
+                            .zip(struct_layout.fields(None))
+                            .map(|(v, field_layout)| v.as_move_value(field_layout))
+                            .collect(),
+                    ))
                 }
-                MoveValue::Struct(MoveStruct::new(fields))
             },
 
             (L::Vector(inner_layout), ValueImpl::Container(c)) => MoveValue::Vector(match c {
@@ -3896,3 +4154,15 @@ impl Value {
         self.0.as_move_value(layout)
     }
 }
+
+fn try_get_variant_field_layouts<'a>(
+    layout: &'a MoveStructLayout,
+    values: &[ValueImpl],
+) -> Option<(u16, &'a [MoveTypeLayout])> {
+    if matches!(layout, MoveStructLayout::RuntimeVariants(..)) {
+        if let Some(ValueImpl::U16(tag)) = values.first() {
+            return Some((*tag, layout.fields(Some(*tag as usize))));
+        }
+    }
+    None
+}
diff --git a/third_party/move/scripts/move_pr.sh b/third_party/move/scripts/move_pr.sh
index 9efbca149b535..6bd539a1f8449 100755
--- a/third_party/move/scripts/move_pr.sh
+++ b/third_party/move/scripts/move_pr.sh
@@ -5,9 +5,13 @@
 
 # A script to check whether a local commit related to Move is ready for a PR.
 
+# Note that if tests aren't running for you try `cargo update` and maybe
+# `cargo install cargo-nextest`.
+
 set -e
 
-MOVE_PR_PROFILE=ci
+MOVE_PR_PROFILE="${MOVE_PR_PROFILE:-ci}"
+MOVE_PR_NEXTEST_PROFILE="${MOVE_PR_NEXTEST_PROFILE:-smoke-test}"
 
 BASE=$(git rev-parse --show-toplevel)
 
@@ -41,6 +45,8 @@ Flags:
     You can use the `MOVE_PR_PROFILE` environment variable to
     determine which cargo profile to use. (The default
     is `ci`, `debug` might be faster for build.)
+    You can also run those tests with `UB=1` to record new
+    baseline files where applicable.
 EOF
       exit 1
       ;;
@@ -65,7 +71,6 @@ EOF
     a)
       INTEGRATION_TEST=1
       COMPILER_V2_TEST=1
-      CHECK=1
       GEN_ARTIFACTS=1
       GIT_CHECKS=1
   esac
@@ -84,32 +89,56 @@ ARTIFACT_CRATE_PATHS="\
 # This is a partial list of Move crates, to keep this script fast.
 # May be extended as needed but should be kept minimal.
 MOVE_CRATES="\
-  -p move-model\
   -p move-stackless-bytecode\
   -p move-stdlib\
   -p move-bytecode-verifier\
   -p move-binary-format\
   -p move-compiler\
+  -p move-compiler-transactional-tests\
   -p move-compiler-v2\
   -p move-compiler-v2-transactional-tests\
+  -p move-ir-compiler-transactional-tests\
   -p move-prover-boogie-backend\
-  -p move-prover-bytecode-pipeline\
   -p move-prover\
-  -p move-docgen\
-  -p move-to-yul\
   -p move-transactional-test-runner\
   -p move-vm-runtime\
-  -p move-vm-transactional-tests\
   -p move-vm-types\
-  -p move-unit-test\
-  -p move-package\
 "
 
-INTEGRATION_TEST_CRATES="\
+# This is a list of crates for integration testing which depends on the
+# MOVE_COMPILER_V2 env var.
+MOVE_CRATES_V2_ENV_DEPENDENT="\
+  -p aptos-transactional-test-harness \
+  -p bytecode-verifier-tests \
+  -p bytecode-verifier-transactional-tests \
+  -p move-async-vm \
+  -p move-cli \
+  -p move-model \
+  -p move-package \
+  -p move-prover-bytecode-pipeline \
+  -p move-stackless-bytecode \
+  -p move-to-yul \
+  -p move-transactional-test-runner \
+  -p move-unit-test \
+  -p move-vm-transactional-tests \
+  -p aptos-move-stdlib\
+  -p move-abigen\
+  -p move-docgen\
+  -p move-stdlib\
+  -p move-table-extension\
+  -p move-vm-integration-tests\
+  -p aptos-move-examples\
   -p e2e-move-tests\
   -p aptos-framework\
 "
 
+# Crates which do depend on compiler env but currently
+# do not maintain separate v2 baseline files. Those
+# are listed here for documentation and later fixing.
+MOVE_CRATES_V2_ENV_DEPENDENT_FAILURES="\
+  -p aptos-api\
+"
+
 if [ ! -z "$CHECK" ]; then
   echo "*************** [move-pr] Running checks"
   (
@@ -120,41 +149,45 @@ if [ ! -z "$CHECK" ]; then
   )
 fi
 
+CARGO_OP_PARAMS="--profile $MOVE_PR_PROFILE"
+CARGO_NEXTEST_PARAMS="--profile $MOVE_PR_NEXTEST_PROFILE --cargo-profile $MOVE_PR_PROFILE"
+
 # Artifact generation needs to be run before testing as tests may depend on its result
 if [ ! -z "$GEN_ARTIFACTS" ]; then
-  for dir in $ARTIFACT_CRATE_PATHS; do
-    echo "*************** [move-pr] Generating artifacts for crate $dir"
+    for dir in $ARTIFACT_CRATE_PATHS; do
+        echo "*************** [move-pr] Generating artifacts for crate $dir"
+        (
+            cd $MOVE_BASE/$dir
+            cargo run $CARGO_OP_PARAMS
+        )
+    done
+
+    # Add hoc treatment
     (
-      cd $MOVE_BASE/$dir
-      cargo run --profile $MOVE_PR_PROFILE
+        cd $BASE
+        cargo build $CARGO_OP_PARAMS -p aptos-cached-packages
     )
-  done
-  # Add hoc treatment
-  (
-    cd $BASE
-    cargo build --profile $MOVE_PR_PROFILE -p aptos-cached-packages
-  )
 fi
 
-
-
 if [ ! -z "$TEST" ]; then
   echo "*************** [move-pr] Running tests"
   (
     # It is important to run all tests from one cargo command to keep cargo features
     # stable.
     cd $BASE
-    cargo nextest run --cargo-profile $MOVE_PR_PROFILE \
+    cargo nextest run $CARGO_NEXTEST_PARAMS \
      $MOVE_CRATES
   )
 fi
 
 if [ ! -z "$INTEGRATION_TEST" ]; then
-  echo "*************** [move-pr] Running extended tests"
+  echo "*************** [move-pr] Running integration tests"
   (
     cd $BASE
-    cargo nextest run --cargo-profile $MOVE_PR_PROFILE \
-     $MOVE_CRATES $INTEGRATION_TEST_CRATES
+    MOVE_COMPILER_V2=false cargo build $CARGO_OP_PARAMS \
+       $MOVE_CRATES $MOVE_CRATES_V2_ENV_DEPENDENT
+    MOVE_COMPILER_V2=false cargo nextest run $CARGO_NEXTEST_PARAMS \
+       $MOVE_CRATES $MOVE_CRATES_V2_ENV_DEPENDENT
   )
 fi
 
@@ -162,12 +195,14 @@ if [ ! -z "$COMPILER_V2_TEST" ]; then
   echo "*************** [move-pr] Running integration tests with compiler v2"
   (
     cd $BASE
-    MOVE_COMPILER_V2=true cargo nextest run --cargo-profile $MOVE_PR_PROFILE \
-     $INTEGRATION_TEST_CRATES
+    MVC_DOCGEN_OUTPUT_DIR=tests/compiler-v2-doc MOVE_COMPILER_V2=true cargo build $CARGO_OP_PARAMS \
+       $MOVE_CRATES_V2_ENV_DEPENDENT
+    MVC_DOCGEN_OUTPUT_DIR=tests/compiler-v2-doc \
+       MOVE_COMPILER_V2=true cargo nextest run $CARGO_NEXTEST_PARAMS \
+       $MOVE_CRATES_V2_ENV_DEPENDENT
   )
 fi
 
-
 if [ ! -z "$GIT_CHECKS" ]; then
    echo "*************** [move-pr] Running git checks"
    $BASE/scripts/git-checks.sh
diff --git a/third_party/move/testing-infra/test-generation/Cargo.toml b/third_party/move/testing-infra/test-generation/Cargo.toml
index 86f443cfc0b81..5989986af868a 100644
--- a/third_party/move/testing-infra/test-generation/Cargo.toml
+++ b/third_party/move/testing-infra/test-generation/Cargo.toml
@@ -17,7 +17,6 @@ hex = { workspace = true }
 itertools = { workspace = true }
 module-generation = { path = "../module-generation" }
 num_cpus = { workspace = true }
-once_cell = { workspace = true }
 # Cannot use workspace version as aptos-core currently cannot be upgraded
 # to newer rand. See https://github.com/aptos-labs/aptos-core/issues/13031
 rand = { version = "0.8.5" }
diff --git a/third_party/move/testing-infra/test-generation/src/abstract_state.rs b/third_party/move/testing-infra/test-generation/src/abstract_state.rs
index cbb49c2acddf7..39e2ec6b5a1ed 100644
--- a/third_party/move/testing-infra/test-generation/src/abstract_state.rs
+++ b/third_party/move/testing-infra/test-generation/src/abstract_state.rs
@@ -560,7 +560,7 @@ impl AbstractState {
 
     /// Check if the local at index `i` exists
     pub fn local_exists(&self, i: usize) -> bool {
-        self.locals.get(&i).is_some()
+        self.locals.contains_key(&i)
     }
 
     /// Get the local at index `i` if it exists
diff --git a/third_party/move/testing-infra/test-generation/src/borrow_graph.rs b/third_party/move/testing-infra/test-generation/src/borrow_graph.rs
index df1ea3fde6c18..9e9f6a517efef 100644
--- a/third_party/move/testing-infra/test-generation/src/borrow_graph.rs
+++ b/third_party/move/testing-infra/test-generation/src/borrow_graph.rs
@@ -62,7 +62,7 @@ impl BorrowGraph {
     /// cannot be chosen.
     pub fn fresh_partition(&mut self, n: Nonce) -> Result<(), String> {
         if self.partition_counter.checked_add(1).is_some() {
-            if self.partition_map.get(&self.partition_counter).is_some() {
+            if self.partition_map.contains_key(&self.partition_counter) {
                 return Err("Partition map already contains ID".to_string());
             }
             self.partition_map.insert(self.partition_counter, vec![n]);
@@ -102,7 +102,7 @@ impl BorrowGraph {
     /// with an error if the given partition ID is not in the graph.
     pub fn partition_freezable(&self, partition_id: PartitionID) -> Result<bool, String> {
         let mut freezable = true;
-        if self.partition_map.get(&partition_id).is_some() {
+        if self.partition_map.contains_key(&partition_id) {
             for (p1, p2, _, _) in self.edges.iter() {
                 if *p1 == partition_id && self.partition_mutability(*p2)? == Mutability::Mutable {
                     freezable = false;
diff --git a/third_party/move/testing-infra/test-generation/src/bytecode_generator.rs b/third_party/move/testing-infra/test-generation/src/bytecode_generator.rs
index f83987fad606c..e7c3d8137d257 100644
--- a/third_party/move/testing-infra/test-generation/src/bytecode_generator.rs
+++ b/third_party/move/testing-infra/test-generation/src/bytecode_generator.rs
@@ -930,6 +930,10 @@ impl<'a> BytecodeGenerator<'a> {
                     .struct_def_at(StructDefinitionIndex(struct_def_idx as TableIndex));
                 let fields = match &struct_def.field_information {
                     StructFieldInformation::Native => panic!("Can't inhabit native structs"),
+                    StructFieldInformation::DeclaredVariants(..) => {
+                        // TODO(#13806): consider implementing for variants
+                        panic!("Can't work with enum variants")
+                    },
                     StructFieldInformation::Declared(fields) => fields.clone(),
                 };
                 let mut bytecodes: Vec<Bytecode> = fields
@@ -958,6 +962,10 @@ impl<'a> BytecodeGenerator<'a> {
                     .struct_def_at(StructDefinitionIndex(struct_def_idx as TableIndex));
                 let fields = match &struct_def.field_information {
                     StructFieldInformation::Native => panic!("Can't inhabit native structs"),
+                    StructFieldInformation::DeclaredVariants(..) => {
+                        // TODO(#13806): consider adding support for variants
+                        panic!("Can't work with enum variants")
+                    },
                     StructFieldInformation::Declared(fields) => fields.clone(),
                 };
                 let mut bytecodes: Vec<Bytecode> = fields
diff --git a/third_party/move/testing-infra/test-generation/src/control_flow_graph.rs b/third_party/move/testing-infra/test-generation/src/control_flow_graph.rs
index 6b9a19cbfd68e..cdc8a9380b828 100644
--- a/third_party/move/testing-infra/test-generation/src/control_flow_graph.rs
+++ b/third_party/move/testing-infra/test-generation/src/control_flow_graph.rs
@@ -318,7 +318,7 @@ impl CFG {
     /// instruction sequence.
     fn get_block_offset(cfg: &CFG, block_order: &[BlockIDSize], block_id: BlockIDSize) -> u16 {
         assert!(
-            (0..block_id).all(|id| cfg.basic_blocks.get(&id).is_some()),
+            (0..block_id).all(|id| cfg.basic_blocks.contains_key(&id)),
             "Error: Invalid block_id given"
         );
         let mut offset: u16 = 0;
diff --git a/third_party/move/testing-infra/test-generation/src/lib.rs b/third_party/move/testing-infra/test-generation/src/lib.rs
index 1f175f7a38399..b5ef94b651fe9 100644
--- a/third_party/move/testing-infra/test-generation/src/lib.rs
+++ b/third_party/move/testing-infra/test-generation/src/lib.rs
@@ -20,7 +20,6 @@ use getrandom::getrandom;
 use module_generation::generate_module;
 use move_binary_format::{
     access::ModuleAccess,
-    errors::PartialVMError,
     file_format::{
         AbilitySet, CompiledModule, FunctionDefinitionIndex, SignatureToken, StructHandleIndex,
     },
@@ -33,16 +32,13 @@ use move_compiler::{
 };
 use move_core_types::{
     account_address::AccountAddress,
-    effects::{ChangeSet, Op},
     language_storage::TypeTag,
-    resolver::MoveResolver,
     value::MoveValue,
     vm_status::{StatusCode, VMStatus},
 };
 use move_vm_runtime::{module_traversal::*, move_vm::MoveVM};
-use move_vm_test_utils::{DeltaStorage, InMemoryStorage};
+use move_vm_test_utils::InMemoryStorage;
 use move_vm_types::gas::UnmeteredGasMeter;
-use once_cell::sync::Lazy;
 use rand::{rngs::StdRng, Rng, SeedableRng};
 use std::{fs, io::Write, panic, thread};
 use tracing::{debug, error, info};
@@ -58,8 +54,11 @@ fn run_verifier(module: CompiledModule) -> Result<CompiledModule, String> {
     }
 }
 
-static STORAGE_WITH_MOVE_STDLIB: Lazy<InMemoryStorage> = Lazy::new(|| {
+// Creates a storage with Move standard library as well as a few additional modules.
+fn storage_with_stdlib_and_modules(additional_modules: Vec<&CompiledModule>) -> InMemoryStorage {
     let mut storage = InMemoryStorage::new();
+
+    // First, compile and add standard library.
     let (_, compiled_units) = Compiler::from_files(
         move_stdlib::move_stdlib_files(),
         vec![],
@@ -78,8 +77,15 @@ static STORAGE_WITH_MOVE_STDLIB: Lazy<InMemoryStorage> = Lazy::new(|| {
         module.serialize(&mut blob).unwrap();
         storage.publish_or_overwrite_module(module.self_id(), blob);
     }
+
+    // Now add the additional modules.
+    for module in additional_modules {
+        let mut blob = vec![];
+        module.serialize(&mut blob).unwrap();
+        storage.publish_or_overwrite_module(module.self_id(), blob);
+    }
     storage
-});
+}
 
 /// This function runs a verified module in the VM runtime
 fn run_vm(module: CompiledModule) -> Result<(), VMStatus> {
@@ -118,13 +124,7 @@ fn run_vm(module: CompiledModule) -> Result<(), VMStatus> {
         })
         .collect();
 
-    execute_function_in_module(
-        module,
-        entry_idx,
-        vec![],
-        main_args,
-        &*STORAGE_WITH_MOVE_STDLIB,
-    )
+    execute_function_in_module(module, entry_idx, vec![], main_args)
 }
 
 /// Execute the first function in a module
@@ -133,7 +133,6 @@ fn execute_function_in_module(
     idx: FunctionDefinitionIndex,
     ty_args: Vec<TypeTag>,
     args: Vec<Vec<u8>>,
-    storage: &impl MoveResolver<PartialVMError>,
 ) -> Result<(), VMStatus> {
     let module_id = module.self_id();
     let entry_name = {
@@ -145,19 +144,12 @@ fn execute_function_in_module(
         let vm = MoveVM::new(move_stdlib::natives::all_natives(
             AccountAddress::from_hex_literal("0x1").unwrap(),
             move_stdlib::natives::GasParameters::zeros(),
-        ))
-        .unwrap();
+        ));
 
-        let mut changeset = ChangeSet::new();
-        let mut blob = vec![];
-        module.serialize(&mut blob).unwrap();
-        changeset
-            .add_module_op(module_id.clone(), Op::New(blob.into()))
-            .unwrap();
-        let delta_storage = DeltaStorage::new(storage, &changeset);
-        let mut sess = vm.new_session(&delta_storage);
-        let traversal_storage = TraversalStorage::new();
+        let storage = storage_with_stdlib_and_modules(vec![&module]);
 
+        let mut sess = vm.new_session(&storage);
+        let traversal_storage = TraversalStorage::new();
         sess.execute_function_bypass_visibility(
             &module_id,
             entry_name,
diff --git a/third_party/move/testing-infra/test-generation/src/summaries.rs b/third_party/move/testing-infra/test-generation/src/summaries.rs
index 2376e65764cd3..66077c91d2981 100644
--- a/third_party/move/testing-infra/test-generation/src/summaries.rs
+++ b/third_party/move/testing-infra/test-generation/src/summaries.rs
@@ -617,5 +617,18 @@ pub fn instruction_summary(instruction: Bytecode, exact: bool) -> Summary {
         | Bytecode::VecPopBack(_)
         | Bytecode::VecUnpack(..)
         | Bytecode::VecSwap(_) => unimplemented!("Vector bytecode not supported yet"),
+        Bytecode::TestVariant(_)
+        | Bytecode::TestVariantGeneric(_)
+        | Bytecode::PackVariant(_)
+        | Bytecode::PackVariantGeneric(_)
+        | Bytecode::UnpackVariant(_)
+        | Bytecode::UnpackVariantGeneric(_)
+        | Bytecode::MutBorrowVariantField(_)
+        | Bytecode::MutBorrowVariantFieldGeneric(_)
+        | Bytecode::ImmBorrowVariantField(_)
+        | Bytecode::ImmBorrowVariantFieldGeneric(_) => {
+            // TODO(#13806): consider implementing for struct variants
+            unimplemented!("Enum types bytecode not supported yet")
+        },
     }
 }
diff --git a/third_party/move/testing-infra/test-generation/src/transitions.rs b/third_party/move/testing-infra/test-generation/src/transitions.rs
index 43706bd362b13..18f592c470902 100644
--- a/third_party/move/testing-infra/test-generation/src/transitions.rs
+++ b/third_party/move/testing-infra/test-generation/src/transitions.rs
@@ -837,6 +837,10 @@ pub fn stack_struct_borrow_field(
         StructFieldInformation::Native => {
             return Err(VMError::new("Borrow field on a native struct".to_string()));
         },
+        StructFieldInformation::DeclaredVariants(..) => {
+            // TODO(#13806): consider implementing for struct variants
+            return Err(VMError::new("Enum types not yet supported".to_string()));
+        },
         StructFieldInformation::Declared(fields) => {
             let field_def = &fields[field_handle.field as usize];
             &field_def.signature.0
diff --git a/third_party/move/testing-infra/test-generation/tests/generic_instructions.rs b/third_party/move/testing-infra/test-generation/tests/generic_instructions.rs
index 66eb17078de50..0f6305f419638 100644
--- a/third_party/move/testing-infra/test-generation/tests/generic_instructions.rs
+++ b/third_party/move/testing-infra/test-generation/tests/generic_instructions.rs
@@ -13,7 +13,7 @@ use test_generation::transitions::Subst;
 #[test]
 fn unify_no_subst() {
     use SignatureToken::*;
-    let tys = vec![Bool, U64, Vector(Box::new(U8)), Address];
+    let tys = [Bool, U64, Vector(Box::new(U8)), Address];
     for tok1 in tys.iter() {
         for tok2 in tys.iter() {
             let should_unify = tok1.clone() == tok2.clone();
diff --git a/third_party/move/testing-infra/test-generation/tests/struct_instructions.rs b/third_party/move/testing-infra/test-generation/tests/struct_instructions.rs
index 13dd66777ccbf..a213bc0c3fdb7 100644
--- a/third_party/move/testing-infra/test-generation/tests/struct_instructions.rs
+++ b/third_party/move/testing-infra/test-generation/tests/struct_instructions.rs
@@ -89,6 +89,10 @@ fn get_field_signature<'a>(module: &'a CompiledModule, handle: &FieldHandle) ->
     match &struct_def.field_information {
         StructFieldInformation::Native => panic!("borrow field on a native struct"),
         StructFieldInformation::Declared(fields) => &fields[handle.field as usize].signature.0,
+        StructFieldInformation::DeclaredVariants(..) => {
+            // TODO(#13806): consider implementing for struct variants
+            panic!("enum types not yet implemented")
+        },
     }
 }
 
diff --git a/third_party/move/testing-infra/transactional-test-runner/Cargo.toml b/third_party/move/testing-infra/transactional-test-runner/Cargo.toml
index 3cb8f9bfd5796..3249bb20ec279 100644
--- a/third_party/move/testing-infra/transactional-test-runner/Cargo.toml
+++ b/third_party/move/testing-infra/transactional-test-runner/Cargo.toml
@@ -14,7 +14,7 @@ anyhow = { workspace = true }
 clap = { workspace = true, features = ["derive"] }
 move-binary-format = { path = "../../move-binary-format", features = ["testing"] }
 move-bytecode-source-map = { path = "../../move-ir-compiler/move-bytecode-source-map" }
-move-cli = { path = "../../tools/move-cli" }
+move-bytecode-verifier = { path = "../../move-bytecode-verifier" }
 move-command-line-common = { path = "../../move-command-line-common" }
 move-compiler = { path = "../../move-compiler" }
 move-compiler-v2 = { path = "../../move-compiler-v2" }
@@ -31,7 +31,7 @@ termcolor = { workspace = true }
 
 move-stdlib = { path = "../../move-stdlib", features = ["testing"] }
 move-symbol-pool = { path = "../../move-symbol-pool" }
-move-vm-runtime = { path = "../../move-vm/runtime" }
+move-vm-runtime = { path = "../../move-vm/runtime", features = ["testing"] }
 move-vm-test-utils = { path = "../../move-vm/test-utils" }
 move-vm-types = { path = "../../move-vm/types" }
 
diff --git a/third_party/move/testing-infra/transactional-test-runner/src/framework.rs b/third_party/move/testing-infra/transactional-test-runner/src/framework.rs
index 3895482cbdb1b..be05bd2c0e333 100644
--- a/third_party/move/testing-infra/transactional-test-runner/src/framework.rs
+++ b/third_party/move/testing-infra/transactional-test-runner/src/framework.rs
@@ -32,7 +32,9 @@ use move_command_line_common::{
 use move_compiler::{
     compiled_unit::{AnnotatedCompiledModule, AnnotatedCompiledUnit},
     diagnostics::{Diagnostics, FilesSourceText},
-    shared::NumericalAddress,
+    shared::{
+        string_map_to_symbol_map, string_vec_to_symbol_vec, Flags, NumericalAddress, PackagePaths,
+    },
     FullyCompiledProgram,
 };
 use move_core_types::{
@@ -42,7 +44,10 @@ use move_core_types::{
 };
 use move_disassembler::disassembler::{Disassembler, DisassemblerOptions};
 use move_ir_types::location::Spanned;
-use move_model::metadata::LanguageVersion;
+use move_model::{
+    metadata::LanguageVersion, model::GlobalEnv, options::ModelBuilderOptions,
+    run_model_builder_with_options_and_compilation_flags,
+};
 use move_symbol_pool::Symbol;
 use move_vm_runtime::session::SerializedReturnValues;
 use once_cell::sync::Lazy;
@@ -61,7 +66,7 @@ pub struct ProcessedModule {
 }
 
 pub struct CompiledState<'a> {
-    pre_compiled_deps_v1: Option<&'a FullyCompiledProgram>,
+    pre_compiled_deps_v1: Option<&'a (FullyCompiledProgram, Vec<PackagePaths>)>,
     pre_compiled_deps_v2: Option<&'a PrecompiledFilesModules>,
     pre_compiled_ids: BTreeSet<(AccountAddress, String)>,
     compiled_module_named_address_mapping: BTreeMap<ModuleId, Symbol>,
@@ -130,9 +135,10 @@ fn annotated_module_from_unit(unit: &AnnotatedCompiledUnit) -> Option<&Annotated
     }
 }
 
-impl PreCompiledModules for FullyCompiledProgram {
+impl PreCompiledModules for (FullyCompiledProgram, Vec<PackagePaths>) {
     fn get_pre_compiled_modules(&self) -> Vec<&AnnotatedCompiledModule> {
-        self.compiled
+        self.0
+            .compiled
             .iter()
             .filter_map(annotated_module_from_unit)
             .collect()
@@ -178,7 +184,7 @@ pub trait MoveTestAdapter<'a>: Sized {
         default_syntax: SyntaxChoice,
         comparison_mode: bool,
         run_config: TestRunConfig,
-        pre_compiled_deps_v1: Option<&'a FullyCompiledProgram>,
+        pre_compiled_deps_v1: Option<&'a (FullyCompiledProgram, Vec<PackagePaths>)>,
         pre_compiled_deps_v2: Option<&'a PrecompiledFilesModules>,
         init_data: Option<TaskInput<(InitCommand, Self::ExtraInitArgs)>>,
     ) -> (Self, Option<String>);
@@ -232,6 +238,25 @@ pub trait MoveTestAdapter<'a>: Sized {
         Option<Symbol>,
         CompiledModule,
         Option<String>,
+    )> {
+        let (data, named_addr_opt, module, _opt_model, warnings_opt) =
+            self.compile_module_default(syntax, data, start_line, command_lines_stop, false)?;
+        Ok((data, named_addr_opt, module, warnings_opt))
+    }
+
+    fn compile_module_default(
+        &mut self,
+        syntax: SyntaxChoice,
+        data: Option<NamedTempFile>,
+        start_line: usize,
+        command_lines_stop: usize,
+        need_model: bool,
+    ) -> Result<(
+        NamedTempFile,
+        Option<Symbol>,
+        CompiledModule,
+        Option<GlobalEnv>,
+        Option<String>,
     )> {
         let data = match data {
             Some(f) => f,
@@ -243,9 +268,9 @@ pub trait MoveTestAdapter<'a>: Sized {
         let data_path = data.path().to_str().unwrap();
         let run_config = self.run_config();
         let state = self.compiled_state();
-        let (named_addr_opt, module, warnings_opt) = match syntax {
+        let (named_addr_opt, module, opt_model, warnings_opt) = match syntax {
             SyntaxChoice::Source => {
-                let (unit, warnings_opt) = match run_config {
+                let (unit, opt_model, warnings_opt) = match run_config {
                     // Run the V2 compiler if requested
                     TestRunConfig::CompilerV2 {
                         language_version,
@@ -266,6 +291,7 @@ pub trait MoveTestAdapter<'a>: Sized {
                         &state.source_files().cloned().collect::<Vec<_>>(),
                         data_path.to_owned(),
                         self.known_attributes(),
+                        need_model,
                     )?,
                 };
                 let (named_addr_opt, module) = match unit {
@@ -282,15 +308,15 @@ pub trait MoveTestAdapter<'a>: Sized {
                         start_line, command_lines_stop
                     ),
                 };
-                (named_addr_opt, module, warnings_opt)
+                (named_addr_opt, module, opt_model, warnings_opt)
             },
             SyntaxChoice::IR => {
                 let module = compile_ir_module(state.dep_modules(), data_path)?;
-                (None, module, None)
+                (None, module, None, None)
             },
         };
         self.register_temp_filename(&data);
-        Ok((data, named_addr_opt, module, warnings_opt))
+        Ok((data, named_addr_opt, module, opt_model, warnings_opt))
     }
 
     fn compile_script(
@@ -300,6 +326,19 @@ pub trait MoveTestAdapter<'a>: Sized {
         start_line: usize,
         command_lines_stop: usize,
     ) -> Result<(CompiledScript, Option<String>)> {
+        let (compiled_script, _opt_model, warnings_opt) =
+            self.compile_script_default(syntax, data, start_line, command_lines_stop, false)?;
+        Ok((compiled_script, warnings_opt))
+    }
+
+    fn compile_script_default(
+        &mut self,
+        syntax: SyntaxChoice,
+        data: Option<NamedTempFile>,
+        start_line: usize,
+        command_lines_stop: usize,
+        need_model: bool,
+    ) -> Result<(CompiledScript, Option<GlobalEnv>, Option<String>)> {
         let data = match data {
             Some(f) => f,
             None => panic!(
@@ -310,9 +349,9 @@ pub trait MoveTestAdapter<'a>: Sized {
         let data_path = data.path().to_str().unwrap();
         let run_config = self.run_config();
         let state = self.compiled_state();
-        let (script, warning_opt) = match syntax {
+        let (script, opt_model, warning_opt) = match syntax {
             SyntaxChoice::Source => {
-                let (unit, warning_opt) = match run_config {
+                let (unit, opt_model, warning_opt) = match run_config {
                     // Run the V2 compiler if requested.
                     TestRunConfig::CompilerV2 {
                         language_version,
@@ -333,19 +372,23 @@ pub trait MoveTestAdapter<'a>: Sized {
                         &state.source_files().cloned().collect::<Vec<_>>(),
                         data_path.to_owned(),
                         self.known_attributes(),
+                        need_model,
                     )?,
                 };
                 match unit {
-                    AnnotatedCompiledUnit::Script(annot_script) => (annot_script.named_script.script, warning_opt),
+                    AnnotatedCompiledUnit::Script(annot_script) => (annot_script.named_script.script, opt_model, warning_opt),
                     AnnotatedCompiledUnit::Module(_) => panic!(
                         "Expected a script text block, not a module, following 'run' starting on lines {}-{}",
                         start_line, command_lines_stop
                     ),
                 }
             },
-            SyntaxChoice::IR => (compile_ir_script(state.dep_modules(), data_path)?, None),
+            SyntaxChoice::IR => {
+                let script = compile_ir_script(state.dep_modules(), data_path)?;
+                (script, None, None)
+            },
         };
-        Ok((script, warning_opt))
+        Ok((script, opt_model, warning_opt))
     }
 
     fn handle_command(
@@ -622,7 +665,7 @@ fn display_return_values(return_values: SerializedReturnValues) -> Option<String
 impl<'a> CompiledState<'a> {
     pub fn new(
         named_address_mapping: BTreeMap<String, NumericalAddress>,
-        pre_compiled_deps_v1: Option<&'a FullyCompiledProgram>,
+        pre_compiled_deps_v1: Option<&'a (FullyCompiledProgram, Vec<PackagePaths>)>,
         pre_compiled_deps_v2: Option<&'a PrecompiledFilesModules>,
         default_named_address_mapping: Option<NumericalAddress>,
     ) -> Self {
@@ -746,7 +789,7 @@ fn compile_source_unit_v2(
     known_attributes: &BTreeSet<String>,
     language_version: LanguageVersion,
     experiments: Vec<(String, bool)>,
-) -> Result<(AnnotatedCompiledUnit, Option<String>)> {
+) -> Result<(AnnotatedCompiledUnit, Option<GlobalEnv>, Option<String>)> {
     let deps = if let Some(p) = pre_compiled_deps {
         // The v2 compiler does not really support precompiled programs, so we must include all the
         // dependent sources with their directories here.
@@ -783,7 +826,7 @@ fn compile_source_unit_v2(
     let mut error_writer = termcolor::Buffer::no_color();
     let result = move_compiler_v2::run_move_compiler(&mut error_writer, options);
     let error_str = String::from_utf8_lossy(&error_writer.into_inner()).to_string();
-    let (_, mut units) =
+    let (model, mut units) =
         result.map_err(|_| anyhow::anyhow!("compilation errors:\n {}", error_str))?;
     let unit = if units.len() != 1 {
         anyhow::bail!("expected either one script or one module")
@@ -791,9 +834,9 @@ fn compile_source_unit_v2(
         units.pop().unwrap()
     };
     if error_str.is_empty() {
-        Ok((unit, None))
+        Ok((unit, Some(model), None))
     } else {
-        Ok((unit, Some(error_str)))
+        Ok((unit, None, Some(error_str)))
     }
 }
 
@@ -809,12 +852,13 @@ fn remove_sub_dirs(dirs: &mut BTreeSet<String>) {
 }
 
 fn compile_source_unit(
-    pre_compiled_deps: Option<&FullyCompiledProgram>,
+    pre_compiled_deps: Option<&(FullyCompiledProgram, Vec<PackagePaths>)>,
     named_address_mapping: BTreeMap<String, NumericalAddress>,
     deps: &[String],
     path: String,
     known_attributes: &BTreeSet<String>,
-) -> Result<(AnnotatedCompiledUnit, Option<String>)> {
+    need_model: bool,
+) -> Result<(AnnotatedCompiledUnit, Option<GlobalEnv>, Option<String>)> {
     fn rendered_diags(files: &FilesSourceText, diags: Diagnostics) -> Option<String> {
         if diags.is_empty() {
             return None;
@@ -829,23 +873,25 @@ fn compile_source_unit(
     }
 
     use move_compiler::PASS_COMPILATION;
+    let flags = move_compiler::Flags::empty()
+        .set_sources_shadow_deps(true)
+        .set_skip_attribute_checks(false);
+
     let (mut files, comments_and_compiler_res) = move_compiler::Compiler::from_files(
-        vec![path],
+        vec![path.clone()],
         deps.to_vec(),
-        named_address_mapping,
-        move_compiler::Flags::empty()
-            .set_sources_shadow_deps(true)
-            .set_skip_attribute_checks(false), // In case of bugs in transactional test code.
+        named_address_mapping.clone(),
+        flags,
         known_attributes,
     )
-    .set_pre_compiled_lib_opt(pre_compiled_deps)
+    .set_pre_compiled_lib_opt(pre_compiled_deps.map(|(prog, _)| prog))
     .run::<PASS_COMPILATION>()?;
     let units_or_diags = comments_and_compiler_res
         .map(|(_comments, move_compiler)| move_compiler.into_compiled_units());
 
     match units_or_diags {
         Err(diags) => {
-            if let Some(pcd) = pre_compiled_deps {
+            if let Some((pcd, _paths)) = pre_compiled_deps {
                 for (file_name, text) in &pcd.files {
                     // TODO This is bad. Rethink this when errors are redone
                     if !files.contains_key(file_name) {
@@ -863,7 +909,38 @@ fn compile_source_unit(
                 panic!("Invalid input. Expected 1 compiled unit but got {}", len)
             }
             let unit = units.pop().unwrap();
-            Ok((unit, warnings))
+            let opt_model = if need_model {
+                if let Some((_fully_compiled_program, lib_paths)) = pre_compiled_deps {
+                    let symbol_map = string_map_to_symbol_map(&named_address_mapping);
+                    let move_target_package = vec![PackagePaths {
+                        name: None,
+                        paths: vec![Symbol::from(path)],
+                        named_address_map: symbol_map.clone(),
+                    }];
+                    let deps_target_package = vec![PackagePaths {
+                        name: None,
+                        paths: string_vec_to_symbol_vec(deps),
+                        named_address_map: symbol_map.clone(),
+                    }];
+                    let model_options = ModelBuilderOptions::default();
+                    // This choice of flags matches that used to build model in `CompiledPackage::build_all()`
+                    let flags = Flags::verification();
+                    let model = run_model_builder_with_options_and_compilation_flags(
+                        move_target_package,
+                        deps_target_package,
+                        lib_paths.to_vec(),
+                        model_options,
+                        flags,
+                        known_attributes,
+                    )?;
+                    Some(model)
+                } else {
+                    None
+                }
+            } else {
+                None
+            };
+            Ok((unit, opt_model, warnings))
         },
     }
 }
@@ -890,7 +967,7 @@ fn compile_ir_script<'a>(
 pub fn run_test_impl<'a, Adapter>(
     config: TestRunConfig,
     path: &Path,
-    pre_compiled_deps_v1: Option<&'a FullyCompiledProgram>,
+    pre_compiled_deps_v1: Option<&'a (FullyCompiledProgram, Vec<PackagePaths>)>,
     pre_compiled_deps_v2: Option<&'a PrecompiledFilesModules>,
     exp_suffix: &Option<String>,
 ) -> Result<(), Box<dyn std::error::Error>>
diff --git a/third_party/move/testing-infra/transactional-test-runner/src/vm_test_harness.rs b/third_party/move/testing-infra/transactional-test-runner/src/vm_test_harness.rs
index 17546cdec9809..9357904402bc4 100644
--- a/third_party/move/testing-infra/transactional-test-runner/src/vm_test_harness.rs
+++ b/third_party/move/testing-infra/transactional-test-runner/src/vm_test_harness.rs
@@ -6,12 +6,13 @@ use crate::{
     framework::{either_or_no_modules, run_test_impl, CompiledState, MoveTestAdapter},
     tasks::{EmptyCommand, InitCommand, SyntaxChoice, TaskInput},
 };
-use anyhow::{anyhow, Result};
+use anyhow::{anyhow, bail, Result};
 use clap::Parser;
 use move_binary_format::{
     compatibility::Compatibility, errors::VMResult, file_format::CompiledScript,
     file_format_common, CompiledModule,
 };
+use move_bytecode_verifier::VerifierConfig;
 use move_command_line_common::{
     address::ParsedAddress,
     env::{get_move_compiler_block_v1_from_env, get_move_compiler_v2_from_env, read_bool_env_var},
@@ -20,14 +21,16 @@ use move_command_line_common::{
 };
 use move_compiler::{
     compiled_unit::AnnotatedCompiledUnit,
-    shared::{known_attributes::KnownAttribute, Flags, PackagePaths},
+    shared::{
+        known_attributes::KnownAttribute, string_packagepath_to_symbol_packagepath, Flags,
+        NumericalAddress, PackagePaths,
+    },
     FullyCompiledProgram,
 };
 use move_core_types::{
     account_address::AccountAddress,
     identifier::{IdentStr, Identifier},
     language_storage::{ModuleId, StructTag, TypeTag},
-    resolver::MoveResolver,
     value::MoveValue,
 };
 use move_model::metadata::LanguageVersion;
@@ -40,7 +43,11 @@ use move_vm_runtime::{
     move_vm::MoveVM,
     session::{SerializedReturnValues, Session},
 };
-use move_vm_test_utils::{gas_schedule::GasStatus, InMemoryStorage};
+use move_vm_test_utils::{
+    gas_schedule::{CostTable, Gas, GasStatus},
+    InMemoryStorage,
+};
+use move_vm_types::resolver::ResourceResolver;
 use once_cell::sync::Lazy;
 use std::{
     collections::{BTreeMap, BTreeSet},
@@ -61,7 +68,6 @@ struct SimpleVMTestAdapter<'a> {
 #[derive(Debug, Parser)]
 pub struct AdapterPublishArgs {
     #[clap(long)]
-    /// is skip the struct_and_pub_function_linking compatibility check
     pub skip_check_struct_and_pub_function_linking: bool,
     #[clap(long)]
     /// is skip the struct_layout compatibility check
@@ -76,8 +82,6 @@ pub struct AdapterPublishArgs {
 
 #[derive(Debug, Parser)]
 pub struct AdapterExecuteArgs {
-    #[clap(long, default_value = "true")]
-    pub check_runtime_types: bool,
     /// print more complete information for VMErrors on run
     #[clap(long)]
     pub verbose: bool,
@@ -115,7 +119,7 @@ impl<'a> MoveTestAdapter<'a> for SimpleVMTestAdapter<'a> {
         default_syntax: SyntaxChoice,
         comparison_mode: bool,
         run_config: TestRunConfig,
-        pre_compiled_deps_v1: Option<&'a FullyCompiledProgram>,
+        pre_compiled_deps_v1: Option<&'a (FullyCompiledProgram, Vec<PackagePaths>)>,
         pre_compiled_deps_v2: Option<&'a PrecompiledFilesModules>,
         task_opt: Option<TaskInput<(InitCommand, EmptyCommand)>>,
     ) -> (Self, Option<String>) {
@@ -150,30 +154,26 @@ impl<'a> MoveTestAdapter<'a> for SimpleVMTestAdapter<'a> {
         };
 
         adapter
-            .perform_session_action(
-                None,
-                |session, gas_status| {
-                    for module in either_or_no_modules(pre_compiled_deps_v1, pre_compiled_deps_v2)
-                        .into_iter()
-                        .map(|tmod| &tmod.named_module.module)
-                    {
-                        let mut module_bytes = vec![];
-                        module
-                            .serialize_for_version(
-                                Some(file_format_common::VERSION_MAX),
-                                &mut module_bytes,
-                            )
-                            .unwrap();
-                        let id = module.self_id();
-                        let sender = *id.address();
-                        session
-                            .publish_module(module_bytes, sender, gas_status)
-                            .unwrap();
-                    }
-                    Ok(())
-                },
-                production_vm_config_with_paranoid_type_checks(),
-            )
+            .perform_session_action(None, |session, gas_status| {
+                for module in either_or_no_modules(pre_compiled_deps_v1, pre_compiled_deps_v2)
+                    .into_iter()
+                    .map(|tmod| &tmod.named_module.module)
+                {
+                    let mut module_bytes = vec![];
+                    module
+                        .serialize_for_version(
+                            Some(file_format_common::VERSION_MAX),
+                            &mut module_bytes,
+                        )
+                        .unwrap();
+                    let id = module.self_id();
+                    let sender = *id.address();
+                    session
+                        .publish_module(module_bytes, sender, gas_status)
+                        .unwrap();
+                }
+                Ok(())
+            })
             .unwrap();
         let mut addr_to_name_mapping = BTreeMap::new();
         for (name, addr) in move_stdlib_named_addresses() {
@@ -207,24 +207,23 @@ impl<'a> MoveTestAdapter<'a> for SimpleVMTestAdapter<'a> {
         let id = module.self_id();
         let sender = *id.address();
         let verbose = extra_args.verbose;
-        match self.perform_session_action(
-            gas_budget,
-            |session, gas_status| {
-                let compat = Compatibility::new(
-                    !extra_args.skip_check_struct_and_pub_function_linking,
+        let result = self.perform_session_action(gas_budget, |session, gas_status| {
+            let compat = if extra_args.skip_check_struct_and_pub_function_linking {
+                Compatibility::no_check()
+            } else {
+                Compatibility::new(
                     !extra_args.skip_check_struct_layout,
                     !extra_args.skip_check_friend_linking,
-                );
-
-                session.publish_module_bundle_with_compat_config(
-                    vec![module_bytes],
-                    sender,
-                    gas_status,
-                    compat,
                 )
-            },
-            production_vm_config_with_paranoid_type_checks(),
-        ) {
+            };
+            session.publish_module_bundle_with_compat_config(
+                vec![module_bytes],
+                sender,
+                gas_status,
+                compat,
+            )
+        });
+        match result {
             Ok(()) => Ok((None, module)),
             Err(vm_error) => Err(anyhow!(
                 "Unable to publish module '{}'. Got VMError: {}",
@@ -266,19 +265,15 @@ impl<'a> MoveTestAdapter<'a> for SimpleVMTestAdapter<'a> {
             .collect();
         let verbose = extra_args.verbose;
         let traversal_storage = TraversalStorage::new();
-        self.perform_session_action(
-            gas_budget,
-            |session, gas_status| {
-                session.execute_script(
-                    script_bytes,
-                    type_args,
-                    args,
-                    gas_status,
-                    &mut TraversalContext::new(&traversal_storage),
-                )
-            },
-            VMConfig::from(extra_args),
-        )
+        self.perform_session_action(gas_budget, |session, gas_status| {
+            session.execute_script(
+                script_bytes,
+                type_args,
+                args,
+                gas_status,
+                &mut TraversalContext::new(&traversal_storage),
+            )
+        })
         .map_err(|vm_error| {
             anyhow!(
                 "Script execution failed with VMError: {}",
@@ -320,20 +315,16 @@ impl<'a> MoveTestAdapter<'a> for SimpleVMTestAdapter<'a> {
         let traversal_storage = TraversalStorage::new();
 
         let serialized_return_values = self
-            .perform_session_action(
-                gas_budget,
-                |session, gas_status| {
-                    session.execute_function_bypass_visibility(
-                        module,
-                        function,
-                        type_args,
-                        args,
-                        gas_status,
-                        &mut TraversalContext::new(&traversal_storage),
-                    )
-                },
-                VMConfig::from(extra_args),
-            )
+            .perform_session_action(gas_budget, |session, gas_status| {
+                session.execute_function_bypass_visibility(
+                    module,
+                    function,
+                    type_args,
+                    args,
+                    gas_status,
+                    &mut TraversalContext::new(&traversal_storage),
+                )
+            })
             .map_err(|vm_error| {
                 anyhow!(
                     "Function execution failed with VMError: {}",
@@ -359,7 +350,12 @@ impl<'a> MoveTestAdapter<'a> for SimpleVMTestAdapter<'a> {
             name: resource.to_owned(),
             type_args,
         };
-        match self.storage.get_resource(&address, &tag).unwrap() {
+        match self
+            .storage
+            .get_resource_bytes_with_metadata_and_layout(&address, &tag, &[], None)
+            .unwrap()
+            .0
+        {
             None => Ok("[No Resource Exists]".to_owned()),
             Some(data) => {
                 let annotated =
@@ -379,9 +375,12 @@ impl<'a> SimpleVMTestAdapter<'a> {
         &mut self,
         gas_budget: Option<u64>,
         f: impl FnOnce(&mut Session, &mut GasStatus) -> VMResult<Ret>,
-        vm_config: VMConfig,
     ) -> VMResult<Ret> {
-        // start session
+        let vm_config = VMConfig {
+            verifier_config: VerifierConfig::production(),
+            paranoid_type_checks: true,
+            ..VMConfig::default()
+        };
         let vm = MoveVM::new_with_config(
             move_stdlib::natives::all_natives(
                 STD_ADDR,
@@ -389,10 +388,9 @@ impl<'a> SimpleVMTestAdapter<'a> {
                 move_stdlib::natives::GasParameters::zeros(),
             ),
             vm_config,
-        )
-        .unwrap();
+        );
         let (mut session, mut gas_status) = {
-            let gas_status = move_cli::sandbox::utils::get_gas_status(
+            let gas_status = get_gas_status(
                 &move_vm_test_utils::gas_schedule::INITIAL_COST_SCHEDULE,
                 gas_budget,
             )
@@ -411,29 +409,48 @@ impl<'a> SimpleVMTestAdapter<'a> {
     }
 }
 
-static PRECOMPILED_MOVE_STDLIB: Lazy<Option<FullyCompiledProgram>> = Lazy::new(|| {
-    if get_move_compiler_block_v1_from_env() {
-        return None;
-    }
-    let program_res = move_compiler::construct_pre_compiled_lib(
-        vec![PackagePaths {
+fn get_gas_status(cost_table: &CostTable, gas_budget: Option<u64>) -> Result<GasStatus> {
+    let gas_status = if let Some(gas_budget) = gas_budget {
+        // TODO(Gas): This should not be hardcoded.
+        let max_gas_budget = u64::MAX.checked_div(1000).unwrap();
+        if gas_budget >= max_gas_budget {
+            bail!("Gas budget set too high; maximum is {}", max_gas_budget)
+        }
+        GasStatus::new(cost_table, Gas::new(gas_budget))
+    } else {
+        // no budget specified. Disable gas metering
+        GasStatus::new_unmetered()
+    };
+    Ok(gas_status)
+}
+
+static PRECOMPILED_MOVE_STDLIB: Lazy<Option<(FullyCompiledProgram, Vec<PackagePaths>)>> =
+    Lazy::new(|| {
+        if get_move_compiler_block_v1_from_env() {
+            return None;
+        }
+        let lib_paths = PackagePaths {
             name: None,
             paths: move_stdlib::move_stdlib_files(),
             named_address_map: move_stdlib::move_stdlib_named_addresses(),
-        }],
-        None,
-        Flags::empty().set_skip_attribute_checks(true), // no point in checking.
-        KnownAttribute::get_all_attribute_names(),
-    )
-    .unwrap();
-    match program_res {
-        Ok(stdlib) => Some(stdlib),
-        Err((files, errors)) => {
-            eprintln!("!!!Standard library failed to compile!!!");
-            move_compiler::diagnostics::report_diagnostics(&files, errors)
-        },
-    }
-});
+        };
+        let lib_paths_movesym =
+            string_packagepath_to_symbol_packagepath::<NumericalAddress>(&lib_paths);
+        let program_res = move_compiler::construct_pre_compiled_lib(
+            vec![lib_paths],
+            None,
+            Flags::empty().set_skip_attribute_checks(true), // no point in checking.
+            KnownAttribute::get_all_attribute_names(),
+        )
+        .unwrap();
+        match program_res {
+            Ok(stdlib) => Some((stdlib, vec![lib_paths_movesym])),
+            Err((files, errors)) => {
+                eprintln!("!!!Standard library failed to compile!!!");
+                move_compiler::diagnostics::report_diagnostics(&files, errors)
+            },
+        }
+    });
 
 pub struct PrecompiledFilesModules(Vec<String>, Vec<AnnotatedCompiledUnit>);
 
@@ -486,7 +503,7 @@ pub fn run_test(path: &Path) -> Result<(), Box<dyn std::error::Error>> {
 
 fn precompiled_v1_stdlib_if_needed(
     config: &TestRunConfig,
-) -> Option<&'static FullyCompiledProgram> {
+) -> Option<&'static (FullyCompiledProgram, Vec<PackagePaths>)> {
     match config {
         TestRunConfig::CompilerV1 { .. } => PRECOMPILED_MOVE_STDLIB.as_ref(),
         TestRunConfig::ComparisonV1V2 { .. } => PRECOMPILED_MOVE_STDLIB.as_ref(),
@@ -540,19 +557,3 @@ pub fn run_test_with_config_and_exp_suffix(
     let v2_lib = precompiled_v2_stdlib_if_needed(&config);
     run_test_impl::<SimpleVMTestAdapter>(config, path, v1_lib, v2_lib, exp_suffix)
 }
-
-impl From<AdapterExecuteArgs> for VMConfig {
-    fn from(arg: AdapterExecuteArgs) -> VMConfig {
-        VMConfig {
-            paranoid_type_checks: arg.check_runtime_types,
-            ..Self::production()
-        }
-    }
-}
-
-fn production_vm_config_with_paranoid_type_checks() -> VMConfig {
-    VMConfig {
-        paranoid_type_checks: true,
-        ..VMConfig::production()
-    }
-}
diff --git a/third_party/move/testing-infra/transactional-test-runner/tests/vm_test_harness/example.v2_exp b/third_party/move/testing-infra/transactional-test-runner/tests/vm_test_harness/example.v2_exp
index 1abe641554375..092951dd1c2af 100644
--- a/third_party/move/testing-infra/transactional-test-runner/tests/vm_test_harness/example.v2_exp
+++ b/third_party/move/testing-infra/transactional-test-runner/tests/vm_test_harness/example.v2_exp
@@ -6,12 +6,12 @@ task 3 'view'. lines 13-15:
 task 4 'publish'. lines 17-35:
 Error: compilation errors:
  error: duplicate declaration, item, or annotation
-   ┌─ TMPFILE:4:11
+   ┌─ TEMPFILE:4:11
    │
  4 │ module A::N {
    │           ^ Duplicate definition for module '(A=0x42)::N'
    │
-   ┌─ TMPFILE2:18:11
+   ┌─ TEMPFILE2:18:11
    │
 18 │ module A::N {
    │           - Module previously defined here, with '(A=0x42)::N'
@@ -30,7 +30,7 @@ Error: Function execution failed with VMError: {
 task 6 'run'. lines 39-45:
 Error: compilation errors:
  error: no function named `N::give` found
-   ┌─ TMPFILE3:42:9
+   ┌─ TEMPFILE3:42:9
    │
 42 │         A::N::give(&s)
    │         ^^^^^^^^^^^^^^
diff --git a/third_party/move/testing-infra/transactional-test-runner/tests/vm_test_harness/print_move_bytecode.v2_exp b/third_party/move/testing-infra/transactional-test-runner/tests/vm_test_harness/print_move_bytecode.v2_exp
index e2ba9a32d342a..d9856e46d5951 100644
--- a/third_party/move/testing-infra/transactional-test-runner/tests/vm_test_harness/print_move_bytecode.v2_exp
+++ b/third_party/move/testing-infra/transactional-test-runner/tests/vm_test_harness/print_move_bytecode.v2_exp
@@ -20,7 +20,5 @@ entry public ex(Arg0: signer, Arg1: u64) /* def_idx: 0 */ {
 B0:
 	0: LdU64(0)
 	1: Abort
-B1:
-	2: Ret
 }
 }
diff --git a/third_party/move/tools/move-bytecode-utils/src/layout.rs b/third_party/move/tools/move-bytecode-utils/src/layout.rs
index fc2a50aed1c1b..ccbda4d4276af 100644
--- a/third_party/move/tools/move-bytecode-utils/src/layout.rs
+++ b/third_party/move/tools/move-bytecode-utils/src/layout.rs
@@ -2,6 +2,8 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
+#![allow(deprecated)]
+
 use crate::compiled_module_viewer::CompiledModuleView;
 use anyhow::{anyhow, bail};
 use move_binary_format::{
@@ -196,7 +198,8 @@ impl<'a, T: CompiledModuleView> SerdeLayoutBuilder<'a, T> {
                     declaring_module.borrow().name()
                 )
             });
-        let normalized_struct = Struct::new(declaring_module.borrow(), def).1;
+        #[allow(deprecated)]
+        let normalized_struct = Struct::new(declaring_module.borrow(), def)?.1;
         assert_eq!(
             normalized_struct.type_parameters.len(),
             type_arguments.len(),
@@ -530,6 +533,9 @@ impl StructLayoutBuilder {
                     },
                 })
             },
+            StructFieldInformation::DeclaredVariants(..) => {
+                bail!("enum variants not yet supported by layouts")
+            },
         }
     }
 
diff --git a/third_party/move/tools/move-cli/Cargo.toml b/third_party/move/tools/move-cli/Cargo.toml
index 09d13080281d5..f7ee5cf507ff3 100644
--- a/third_party/move/tools/move-cli/Cargo.toml
+++ b/third_party/move/tools/move-cli/Cargo.toml
@@ -11,25 +11,13 @@ edition = "2021"
 
 [dependencies]
 anyhow = { workspace = true }
-bytes = { workspace = true }
 clap = { workspace = true, features = ["derive"] }
 codespan-reporting = { workspace = true }
 colored = { workspace = true }
-difference = { workspace = true }
 once_cell = { workspace = true }
-reqwest = { workspace = true, features = ["blocking", "json"] }
-serde = { workspace = true }
-serde_json = { workspace = true }
-serde_yaml = { workspace = true }
 tempfile = { workspace = true }
-toml_edit = { workspace = true, features = ["easy"] }
-walkdir = { workspace = true }
 
-bcs = { workspace = true }
 move-binary-format = { path = "../../move-binary-format" }
-move-bytecode-utils = { path = "../move-bytecode-utils" }
-
-move-bytecode-verifier = { path = "../../move-bytecode-verifier" }
 move-bytecode-viewer = { path = "../move-bytecode-viewer" }
 move-command-line-common = { path = "../../move-command-line-common" }
 move-compiler = { path = "../../move-compiler" }
@@ -39,13 +27,10 @@ move-coverage = { path = "../move-coverage" }
 move-disassembler = { path = "../move-disassembler" }
 move-docgen = { path = "../../move-prover/move-docgen" }
 move-errmapgen = { path = "../../move-prover/move-errmapgen" }
-move-ir-types = { path = "../../move-ir/types" }
 move-model = { path = "../../move-model" }
 move-package = { path = "../move-package" }
 move-prover = { path = "../../move-prover" }
-move-resource-viewer = { path = "../move-resource-viewer" }
 move-stdlib = { path = "../../move-stdlib" }
-# move-symbol-pool = { path = "../../move-symbol-pool" }
 move-unit-test = { path = "../move-unit-test" }
 move-vm-runtime = { path = "../../move-vm/runtime", features = ["debugging"] }
 move-vm-test-utils = { path = "../../move-vm/test-utils" }
@@ -58,10 +43,6 @@ httpmock = { workspace = true }
 name = "move"
 path = "src/main.rs"
 
-[[test]]
-name = "sandbox_testsuite"
-harness = false
-
 [[test]]
 name = "move_unit_tests_move_vm_and_stackless_vm"
 harness = false
diff --git a/third_party/move/tools/move-cli/src/base/mod.rs b/third_party/move/tools/move-cli/src/base/mod.rs
index f17d540d3e55b..8cd506d77ebeb 100644
--- a/third_party/move/tools/move-cli/src/base/mod.rs
+++ b/third_party/move/tools/move-cli/src/base/mod.rs
@@ -6,8 +6,6 @@ pub mod coverage;
 pub mod disassemble;
 pub mod docgen;
 pub mod errmap;
-pub mod movey_login;
-pub mod movey_upload;
 pub mod new;
 pub mod prove;
 pub mod test;
diff --git a/third_party/move/tools/move-cli/src/base/movey_login.rs b/third_party/move/tools/move-cli/src/base/movey_login.rs
deleted file mode 100644
index 496fb209d9d45..0000000000000
--- a/third_party/move/tools/move-cli/src/base/movey_login.rs
+++ /dev/null
@@ -1,227 +0,0 @@
-// Copyright (c) The Move Contributors
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::utils::movey_credential::read_credential_file;
-use anyhow::{bail, Result};
-use clap::Parser;
-use move_command_line_common::{
-    env::MOVE_HOME,
-    movey_constants::{MOVEY_CREDENTIAL_PATH, MOVEY_URL},
-};
-use std::{fs, fs::File, io, path::PathBuf};
-use toml_edit::easy::{map::Map, Value};
-
-#[derive(Parser)]
-#[clap(name = "movey-login")]
-pub struct MoveyLogin;
-
-impl MoveyLogin {
-    pub fn execute(self) -> Result<()> {
-        println!(
-            "Please paste the API Token found on {}/settings/tokens below",
-            MOVEY_URL
-        );
-        let mut line = String::new();
-        loop {
-            match io::stdin().read_line(&mut line) {
-                Ok(_) => {
-                    line = line.trim().to_string();
-                    if !line.is_empty() {
-                        break;
-                    }
-                    println!("Invalid API Token. Try again!");
-                },
-                Err(err) => {
-                    bail!("Error reading file: {}", err);
-                },
-            }
-        }
-        Self::save_credential(line, MOVE_HOME.clone())?;
-        println!("Token for Movey saved.");
-        Ok(())
-    }
-
-    pub fn save_credential(token: String, move_home: String) -> Result<()> {
-        fs::create_dir_all(&move_home)?;
-        let credential_path = move_home + MOVEY_CREDENTIAL_PATH;
-        let credential_file = PathBuf::from(&credential_path);
-        if !credential_file.exists() {
-            create_credential_file(&credential_path)?;
-        }
-
-        let mut toml: Value = read_credential_file(&credential_path)?;
-        // only update token key, keep the rest of the file intact
-        if let Some(registry) = toml.as_table_mut().unwrap().get_mut("registry") {
-            if let Some(toml_token) = registry.as_table_mut().unwrap().get_mut("token") {
-                *toml_token = Value::String(token);
-            } else {
-                registry
-                    .as_table_mut()
-                    .unwrap()
-                    .insert(String::from("token"), Value::String(token));
-            }
-        } else {
-            let mut value = Map::new();
-            value.insert(String::from("token"), Value::String(token));
-            toml.as_table_mut()
-                .unwrap()
-                .insert(String::from("registry"), Value::Table(value));
-        }
-
-        let new_contents = toml.to_string();
-        fs::write(credential_file, new_contents).expect("Unable to write file");
-        Ok(())
-    }
-}
-
-#[cfg(unix)]
-fn create_credential_file(credential_path: &str) -> Result<()> {
-    use std::os::unix::fs::PermissionsExt;
-    let credential_file = File::create(credential_path)?;
-
-    let mut perms = credential_file.metadata()?.permissions();
-    perms.set_mode(0o600);
-    credential_file.set_permissions(perms)?;
-    Ok(())
-}
-
-#[cfg(windows)]
-#[allow(unused)]
-fn create_credential_file(credential_path: &str) -> Result<()> {
-    let windows_path = credential_path.replace("/", "\\");
-    File::create(&windows_path)?;
-    Ok(())
-}
-
-#[cfg(not(any(unix, windows)))]
-#[allow(unused)]
-fn create_credential_file(credential_path: &str) -> Result<()> {
-    bail!("OS not supported")
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use std::env;
-
-    fn setup_move_home(test_path: &str) -> (String, String) {
-        let cwd = env::current_dir().unwrap();
-        let mut move_home: String = String::from(cwd.to_string_lossy());
-        if !test_path.is_empty() {
-            move_home.push_str(test_path);
-        } else {
-            move_home.push_str("/test");
-        }
-        let credential_path = move_home.clone() + MOVEY_CREDENTIAL_PATH;
-        (move_home, credential_path)
-    }
-
-    fn clean_up(move_home: &str) {
-        let _ = fs::remove_dir_all(move_home);
-    }
-
-    #[test]
-    fn save_credential_works_if_no_credential_file_exists() {
-        let (move_home, credential_path) =
-            setup_move_home("/save_credential_works_if_no_credential_file_exists");
-        let _ = fs::remove_dir_all(&move_home);
-        MoveyLogin::save_credential(String::from("test_token"), move_home.clone()).unwrap();
-
-        let contents = fs::read_to_string(credential_path).expect("Unable to read file");
-        let mut toml: Value = contents.parse().unwrap();
-        let registry = toml.as_table_mut().unwrap().get_mut("registry").unwrap();
-        let token = registry.as_table_mut().unwrap().get_mut("token").unwrap();
-        assert!(token.to_string().contains("test_token"));
-
-        clean_up(&move_home);
-    }
-
-    #[test]
-    fn save_credential_works_if_empty_credential_file_exists() {
-        let (move_home, credential_path) =
-            setup_move_home("/save_credential_works_if_empty_credential_file_exists");
-
-        let _ = fs::remove_dir_all(&move_home);
-        fs::create_dir_all(&move_home).unwrap();
-        File::create(&credential_path).unwrap();
-
-        let contents = fs::read_to_string(&credential_path).expect("Unable to read file");
-        let mut toml: Value = contents.parse().unwrap();
-        assert!(toml.as_table_mut().unwrap().get_mut("registry").is_none());
-
-        MoveyLogin::save_credential(String::from("test_token"), move_home.clone()).unwrap();
-
-        let contents = fs::read_to_string(&credential_path).expect("Unable to read file");
-        let mut toml: Value = contents.parse().unwrap();
-        let registry = toml.as_table_mut().unwrap().get_mut("registry").unwrap();
-        let token = registry.as_table_mut().unwrap().get_mut("token").unwrap();
-        assert!(token.to_string().contains("test_token"));
-
-        clean_up(&move_home);
-    }
-
-    #[test]
-    fn save_credential_works_if_token_field_exists() {
-        let (move_home, credential_path) =
-            setup_move_home("/save_credential_works_if_token_field_exists");
-
-        let _ = fs::remove_dir_all(&move_home);
-        fs::create_dir_all(&move_home).unwrap();
-        File::create(&credential_path).unwrap();
-
-        let old_content =
-            String::from("[registry]\ntoken = \"old_test_token\"\nversion = \"0.0.0\"\n");
-        fs::write(&credential_path, old_content).expect("Unable to write file");
-
-        let contents = fs::read_to_string(&credential_path).expect("Unable to read file");
-        let mut toml: Value = contents.parse().unwrap();
-        let registry = toml.as_table_mut().unwrap().get_mut("registry").unwrap();
-        let token = registry.as_table_mut().unwrap().get_mut("token").unwrap();
-        assert!(token.to_string().contains("old_test_token"));
-        assert!(!token.to_string().contains("new_world"));
-
-        MoveyLogin::save_credential(String::from("new_world"), move_home.clone()).unwrap();
-
-        let contents = fs::read_to_string(&credential_path).expect("Unable to read file");
-        let mut toml: Value = contents.parse().unwrap();
-        let registry = toml.as_table_mut().unwrap().get_mut("registry").unwrap();
-        let token = registry.as_table_mut().unwrap().get_mut("token").unwrap();
-        assert!(token.to_string().contains("new_world"));
-        assert!(!token.to_string().contains("old_test_token"));
-        let version = registry.as_table_mut().unwrap().get_mut("version").unwrap();
-        assert!(version.to_string().contains("0.0.0"));
-
-        clean_up(&move_home);
-    }
-
-    #[test]
-    fn save_credential_works_if_empty_token_field_exists() {
-        let (move_home, credential_path) =
-            setup_move_home("/save_credential_works_if_empty_token_field_exists");
-
-        let _ = fs::remove_dir_all(&move_home);
-        fs::create_dir_all(&move_home).unwrap();
-        File::create(&credential_path).unwrap();
-
-        let old_content = String::from("[registry]\ntoken = \"\"\nversion = \"0.0.0\"\n");
-        fs::write(&credential_path, old_content).expect("Unable to write file");
-
-        let contents = fs::read_to_string(&credential_path).expect("Unable to read file");
-        let mut toml: Value = contents.parse().unwrap();
-        let registry = toml.as_table_mut().unwrap().get_mut("registry").unwrap();
-        let token = registry.as_table_mut().unwrap().get_mut("token").unwrap();
-        assert!(!token.to_string().contains("test_token"));
-
-        MoveyLogin::save_credential(String::from("test_token"), move_home.clone()).unwrap();
-
-        let contents = fs::read_to_string(&credential_path).expect("Unable to read file");
-        let mut toml: Value = contents.parse().unwrap();
-        let registry = toml.as_table_mut().unwrap().get_mut("registry").unwrap();
-        let token = registry.as_table_mut().unwrap().get_mut("token").unwrap();
-        assert!(token.to_string().contains("test_token"));
-        let version = registry.as_table_mut().unwrap().get_mut("version").unwrap();
-        assert!(version.to_string().contains("0.0.0"));
-
-        clean_up(&move_home);
-    }
-}
diff --git a/third_party/move/tools/move-cli/src/base/movey_upload.rs b/third_party/move/tools/move-cli/src/base/movey_upload.rs
deleted file mode 100644
index 6530f81065ce8..0000000000000
--- a/third_party/move/tools/move-cli/src/base/movey_upload.rs
+++ /dev/null
@@ -1,134 +0,0 @@
-// Copyright (c) The Move Contributors
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::utils::movey_credential;
-use anyhow::bail;
-use clap::*;
-use move_command_line_common::env::MOVE_HOME;
-use reqwest::blocking::Client;
-use std::{env, fs::File, path::PathBuf, process::Command};
-
-// Metadata that will be collected by Movey
-#[derive(serde::Serialize, Default)]
-pub struct MoveyUploadRequest {
-    github_repo_url: String,
-    total_files: usize,
-    token: String,
-    subdir: String,
-}
-
-/// Upload the package metadata to Movey.net.
-#[derive(Parser)]
-#[clap(name = "movey-upload")]
-pub struct MoveyUpload;
-
-impl MoveyUpload {
-    pub fn execute(self, path: Option<PathBuf>) -> anyhow::Result<()> {
-        if let Some(path) = path {
-            if path.exists() && path.is_dir() {
-                let _ = env::set_current_dir(&path);
-            } else {
-                bail!("invalid directory")
-            }
-        }
-        // make sure it's a Move project
-        let move_toml = File::open("Move.toml");
-        if move_toml.is_err() {
-            bail!("Move.toml not found")
-        }
-        let metadata = move_toml.unwrap().metadata()?;
-        if metadata.len() == 0 {
-            bail!("Move.toml not found")
-        }
-
-        // use git command to get the repository url
-        let mut movey_upload_request: MoveyUploadRequest = Default::default();
-        let mut output = Command::new("git")
-            .current_dir(".")
-            .args(["remote", "-v"])
-            .output()
-            .unwrap();
-        if !output.status.success() || output.stdout.is_empty() {
-            bail!("invalid git repository")
-        }
-
-        let lines = String::from_utf8_lossy(output.stdout.as_slice());
-        let lines = lines.split('\n');
-        for line in lines {
-            if line.contains("github.com") {
-                let tokens: Vec<&str> = line.split(&['\t', ' '][..]).collect();
-                if tokens.len() != 3 {
-                    bail!("invalid remote url")
-                }
-                // convert ssh url to https
-                let https_url = if tokens[1].starts_with("git@github.com") {
-                    tokens[1].replace(':', "/").replace("git@", "https://")
-                } else {
-                    String::from(tokens[1])
-                };
-                movey_upload_request.github_repo_url = if https_url.ends_with(".git") {
-                    https_url[..https_url.len() - 4].to_string()
-                } else {
-                    https_url
-                };
-            }
-        }
-
-        // use git command to get the subdir if move package is not on the top level
-        output = Command::new("git")
-            .current_dir(".")
-            .args(["rev-parse", "--show-prefix"])
-            .output()
-            .unwrap();
-        let subdir = String::from_utf8_lossy(output.stdout.as_slice());
-        movey_upload_request.subdir = String::from(subdir);
-
-        // use git command to count total files
-        output = Command::new("git")
-            .current_dir(".")
-            .args(["ls-files"])
-            .output()
-            .unwrap();
-        let tracked_files = String::from_utf8_lossy(output.stdout.as_slice());
-        let tracked_files: Vec<&str> = tracked_files.split('\n').collect();
-        let mut total_files = tracked_files.len();
-        for file_path in tracked_files {
-            if file_path.is_empty() {
-                total_files -= 1;
-                continue;
-            }
-        }
-        movey_upload_request.total_files = total_files;
-        movey_upload_request.token = movey_credential::get_registry_api_token(&MOVE_HOME)?;
-        let movey_url = movey_credential::get_movey_url(&MOVE_HOME);
-        match movey_url {
-            Ok(url) => {
-                let client = Client::new();
-                let response = client
-                    .post(format!("{}/api/v1/packages/upload", &url))
-                    .json(&movey_upload_request)
-                    .send();
-                match response {
-                    Ok(response) => {
-                        if response.status().is_success() {
-                            println!(
-                                "Your package has been successfully uploaded to Movey at {}/packages/{}.",
-                                url,
-                                response.text()?
-                            );
-                        } else if response.status().is_client_error() {
-                            bail!("{}", response.text()?)
-                        } else if response.status().is_server_error() {
-                            bail!("An unexpected error occurred. Please try again later");
-                        }
-                    },
-                    Err(_) => {
-                        bail!("An unexpected error occurred. Please try again later");
-                    },
-                }
-            },
-            Err(_) => bail!("An unexpected error occurred. Please try again later"),
-        }
-        Ok(())
-    }
-}
diff --git a/third_party/move/tools/move-cli/src/lib.rs b/third_party/move/tools/move-cli/src/lib.rs
index 743a29f6c27a0..3070f1468e774 100644
--- a/third_party/move/tools/move-cli/src/lib.rs
+++ b/third_party/move/tools/move-cli/src/lib.rs
@@ -4,13 +4,12 @@
 
 use base::{
     build::Build, coverage::Coverage, disassemble::Disassemble, docgen::Docgen, errmap::Errmap,
-    movey_login::MoveyLogin, movey_upload::MoveyUpload, new::New, prove::Prove, test::Test,
+    new::New, prove::Prove, test::Test,
 };
 use move_package::BuildConfig;
 
 pub mod base;
-pub mod sandbox;
-pub mod utils;
+pub mod test;
 
 /// Default directory where saved Move resources live
 pub const DEFAULT_STORAGE_DIR: &str = "storage";
@@ -18,14 +17,10 @@ pub const DEFAULT_STORAGE_DIR: &str = "storage";
 /// Default directory for build output
 pub const DEFAULT_BUILD_DIR: &str = ".";
 
-/// Extension for resource and event files, which are in BCS format
-const BCS_EXTENSION: &str = "bcs";
-
 use anyhow::Result;
 use clap::Parser;
 use move_core_types::{
-    account_address::AccountAddress, effects::ChangeSet, errmap::ErrorMapping,
-    identifier::Identifier,
+    account_address::AccountAddress, effects::ChangeSet, identifier::Identifier,
 };
 use move_vm_runtime::native_functions::NativeFunction;
 use move_vm_test_utils::gas_schedule::CostTable;
@@ -68,29 +63,15 @@ pub enum Command {
     Disassemble(Disassemble),
     Docgen(Docgen),
     Errmap(Errmap),
-    MoveyUpload(MoveyUpload),
     New(New),
     Prove(Prove),
     Test(Test),
-    /// Execute a sandbox command.
-    #[clap(name = "sandbox")]
-    Sandbox {
-        /// Directory storing Move resources, events, and module bytecodes produced by module publishing
-        /// and script execution.
-        #[clap(long, default_value = DEFAULT_STORAGE_DIR, value_parser)]
-        storage_dir: PathBuf,
-        #[clap(subcommand)]
-        cmd: sandbox::cli::SandboxCommand,
-    },
-    #[clap(name = "movey-login")]
-    MoveyLogin(MoveyLogin),
 }
 
 pub fn run_cli(
     natives: Vec<NativeFunctionRecord>,
     genesis: ChangeSet,
     cost_table: &CostTable,
-    error_descriptions: &ErrorMapping,
     move_args: Move,
     cmd: Command,
 ) -> Result<()> {
@@ -103,7 +84,6 @@ pub fn run_cli(
         Command::Disassemble(c) => c.execute(move_args.package_path, move_args.build_config),
         Command::Docgen(c) => c.execute(move_args.package_path, move_args.build_config),
         Command::Errmap(c) => c.execute(move_args.package_path, move_args.build_config),
-        Command::MoveyUpload(c) => c.execute(move_args.package_path),
         Command::New(c) => c.execute_with_defaults(move_args.package_path),
         Command::Prove(c) => c.execute(move_args.package_path, move_args.build_config),
         Command::Test(c) => c.execute(
@@ -113,14 +93,6 @@ pub fn run_cli(
             genesis,
             Some(cost_table.clone()),
         ),
-        Command::Sandbox { storage_dir, cmd } => cmd.handle_command(
-            natives,
-            cost_table,
-            error_descriptions,
-            &move_args,
-            &storage_dir,
-        ),
-        Command::MoveyLogin(c) => c.execute(),
     }
 }
 
@@ -128,17 +100,9 @@ pub fn move_cli(
     natives: Vec<NativeFunctionRecord>,
     genesis: ChangeSet,
     cost_table: &CostTable,
-    error_descriptions: &ErrorMapping,
 ) -> Result<()> {
     let args = MoveCLI::parse();
-    run_cli(
-        natives,
-        genesis,
-        cost_table,
-        error_descriptions,
-        args.move_args,
-        args.cmd,
-    )
+    run_cli(natives, genesis, cost_table, args.move_args, args.cmd)
 }
 
 #[test]
diff --git a/third_party/move/tools/move-cli/src/main.rs b/third_party/move/tools/move-cli/src/main.rs
index 0c45876dc4d80..f356e5b7e6f91 100644
--- a/third_party/move/tools/move-cli/src/main.rs
+++ b/third_party/move/tools/move-cli/src/main.rs
@@ -3,11 +3,10 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use anyhow::Result;
-use move_core_types::{account_address::AccountAddress, effects::ChangeSet, errmap::ErrorMapping};
+use move_core_types::{account_address::AccountAddress, effects::ChangeSet};
 use move_stdlib::natives::{all_natives, nursery_natives, GasParameters, NurseryGasParameters};
 
 fn main() -> Result<()> {
-    let error_descriptions: ErrorMapping = bcs::from_bytes(move_stdlib::error_descriptions())?;
     let cost_table = &move_vm_test_utils::gas_schedule::INITIAL_COST_SCHEDULE;
     let addr = AccountAddress::from_hex_literal("0x1").unwrap();
     let natives = all_natives(addr, GasParameters::zeros())
@@ -15,5 +14,5 @@ fn main() -> Result<()> {
         .chain(nursery_natives(addr, NurseryGasParameters::zeros()))
         .collect();
 
-    move_cli::move_cli(natives, ChangeSet::new(), cost_table, &error_descriptions)
+    move_cli::move_cli(natives, ChangeSet::new(), cost_table)
 }
diff --git a/third_party/move/tools/move-cli/src/sandbox/cli.rs b/third_party/move/tools/move-cli/src/sandbox/cli.rs
deleted file mode 100644
index d8fb0e1efb074..0000000000000
--- a/third_party/move/tools/move-cli/src/sandbox/cli.rs
+++ /dev/null
@@ -1,324 +0,0 @@
-// Copyright (c) The Diem Core Contributors
-// Copyright (c) The Move Contributors
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::{
-    sandbox::{
-        self,
-        utils::{on_disk_state_view::OnDiskStateView, PackageContext},
-    },
-    Move, NativeFunctionRecord, DEFAULT_BUILD_DIR,
-};
-use anyhow::Result;
-use clap::Parser;
-use move_core_types::{
-    errmap::ErrorMapping, language_storage::TypeTag, parser,
-    transaction_argument::TransactionArgument,
-};
-use move_package::compilation::package_layout::CompiledPackageLayout;
-use move_vm_test_utils::gas_schedule::CostTable;
-use std::{
-    fs,
-    path::{Path, PathBuf},
-};
-
-#[derive(Parser)]
-pub enum SandboxCommand {
-    /// Compile the modules in this package and its dependencies and publish the resulting bytecodes in global storage.
-    #[clap(name = "publish")]
-    Publish {
-        /// If set, fail when attempting to publish a module that already
-        /// exists in global storage.
-        #[clap(long = "no-republish")]
-        no_republish: bool,
-        /// By default, code that might cause breaking changes for bytecode
-        /// linking or data layout compatibility checks will not be published.
-        /// Set this flag to ignore breaking changes checks and publish anyway.
-        #[clap(long = "ignore-breaking-changes")]
-        ignore_breaking_changes: bool,
-        /// If set, publish not only the modules in this package but also
-        /// modules in all its dependencies.
-        #[clap(long = "with-deps")]
-        with_deps: bool,
-        /// If set, all modules at once as a bundle. The default is to publish
-        /// modules sequentially.
-        #[clap(long = "bundle")]
-        bundle: bool,
-        /// Manually specify the publishing order of modules.
-        #[clap(
-            long = "override-ordering",
-            num_args = 0..
-        )]
-        override_ordering: Option<Vec<String>>,
-    },
-    /// Run a Move script that reads/writes resources stored on disk in `storage-dir`.
-    /// The script must be defined in the package.
-    #[clap(name = "run")]
-    Run {
-        /// Path to .mv file containing either script or module bytecodes. If the file is a module, the
-        /// `script_name` parameter must be set.
-        #[clap(name = "script", value_parser)]
-        script_file: PathBuf,
-        /// Name of the script function inside `script_file` to call. Should only be set if `script_file`
-        /// points to a module.
-        #[clap(name = "name")]
-        script_name: Option<String>,
-        /// Possibly-empty list of signers for the current transaction (e.g., `account` in
-        /// `main(&account: signer)`). Must match the number of signers expected by `script_file`.
-        #[clap(
-            long = "signers",
-            num_args = 0..
-        )]
-        signers: Vec<String>,
-        /// Possibly-empty list of arguments passed to the transaction (e.g., `i` in
-        /// `main(i: u64)`). Must match the arguments types expected by `script_file`.
-        /// Supported argument types are
-        /// bool literals (`true`, `false`),
-        /// u64 literals (e.g., `10`, `58`),
-        /// address literals (e.g., `0x12`, `0x0000000000000000000000000000000f`),
-        /// hexadecimal strings (e.g., `x"0012"` will parse as the `vector<u8>` value `[00, 12]`), and
-        /// ASCII strings (e.g., `'b"hi"` will parse as the `vector<u8>` value `[68, 69]`).
-        #[clap(
-            long = "args",
-            value_parser = parser::parse_transaction_argument,
-            num_args = 0..
-        )]
-        args: Vec<TransactionArgument>,
-        /// Possibly-empty list of type arguments passed to the transaction (e.g., `T` in
-        /// `main<T>()`). Must match the type arguments kinds expected by `script_file`.
-        #[clap(
-            long = "type-args",
-            value_parser = parser::parse_type_tag,
-            num_args = 0..
-        )]
-        type_args: Vec<TypeTag>,
-        /// Maximum number of gas units to be consumed by execution.
-        /// When the budget is exhaused, execution will abort.
-        /// By default, no `gas-budget` is specified and gas metering is disabled.
-        #[clap(long = "gas-budget", short = 'g')]
-        gas_budget: Option<u64>,
-        /// If set, the effects of executing `script_file` (i.e., published, updated, and
-        /// deleted resources) will NOT be committed to disk.
-        #[clap(long = "dry-run", short = 'n')]
-        dry_run: bool,
-    },
-    /// Run expected value tests using the given batch file.
-    #[clap(name = "exp-test")]
-    Test {
-        /// Use an ephemeral directory to serve as the testing workspace.
-        /// By default, the directory containing the `args.txt` will be the workspace.
-        #[clap(long = "use-temp-dir")]
-        use_temp_dir: bool,
-        /// Show coverage information after tests are done.
-        /// By default, coverage will not be tracked nor shown.
-        #[clap(long = "track-cov")]
-        track_cov: bool,
-    },
-    /// View Move resources, events files, and modules stored on disk.
-    #[clap(name = "view")]
-    View {
-        /// Path to a resource, events file, or module stored on disk.
-        #[clap(name = "file", value_parser)]
-        file: PathBuf,
-    },
-    /// Delete all resources, events, and modules stored on disk under `storage-dir`.
-    /// Does *not* delete anything in `src`.
-    Clean {},
-    /// Run well-formedness checks on the `storage-dir` and `install-dir` directories.
-    #[clap(name = "doctor")]
-    Doctor {},
-    /// Generate struct layout bindings for the modules stored on disk under `storage-dir`
-    // TODO: expand this to generate script bindings, etc.?.
-    #[clap(name = "generate")]
-    Generate {
-        #[clap(subcommand)]
-        cmd: GenerateCommand,
-    },
-}
-
-#[derive(Parser)]
-pub enum GenerateCommand {
-    /// Generate struct layout bindings for the modules stored on disk under `storage-dir`.
-    #[clap(name = "struct-layouts")]
-    StructLayouts {
-        /// Path to a module stored on disk.
-        #[clap(long, value_parser)]
-        module: PathBuf,
-        /// If set, generate bindings for the specified struct and type arguments. If unset,
-        /// generate bindings for all closed struct definitions.
-        #[clap(flatten)]
-        options: StructLayoutOptions,
-    },
-}
-#[derive(Parser)]
-pub struct StructLayoutOptions {
-    /// Generate layout bindings for this struct.
-    #[clap(long = "struct")]
-    struct_: Option<String>,
-    /// Generate layout bindings for `struct` bound to these type arguments.
-    #[clap(
-        long = "type-args",
-        value_parser = parser::parse_type_tag,
-        requires = "struct_",
-        num_args = 0..
-    )]
-    type_args: Option<Vec<TypeTag>>,
-    /// If set, replace all Move source syntax separators ("::" for address/struct/module name
-    /// separation, "<", ">", and "," for generics separation) with this string.
-    /// If unset, use the same syntax as Move source
-    #[clap(long = "separator")]
-    separator: Option<String>,
-    /// If true, do not include addresses in fully qualified type names.
-    /// If there is a name conflict (e.g., the registry we're building has both
-    /// 0x1::M::T and 0x2::M::T), layout generation will fail when this option is true.
-    #[clap(long = "omit-addresses")]
-    omit_addresses: bool,
-    /// If true, do not include phantom types in fully qualified type names, since they do not contribute to the layout
-    /// E.g., if we have `struct S<phantom T> { u: 64 }` and try to generate bindings for this struct with `T = u8`,
-    /// the name for `S` in the registry will be `S<u64>` when this option is false, and `S` when this option is true
-    #[clap(long = "ignore-phantom-types")]
-    ignore_phantom_types: bool,
-    /// If set, generate bindings only for the struct passed in.
-    /// When unset, generates bindings for the struct and all of its transitive dependencies.
-    #[clap(long = "shallow")]
-    shallow: bool,
-}
-
-impl SandboxCommand {
-    pub fn handle_command(
-        &self,
-        natives: Vec<NativeFunctionRecord>,
-        cost_table: &CostTable,
-        error_descriptions: &ErrorMapping,
-        move_args: &Move,
-        storage_dir: &Path,
-    ) -> Result<()> {
-        let bytecode_version = None;
-        match self {
-            SandboxCommand::Publish {
-                no_republish,
-                ignore_breaking_changes,
-                with_deps,
-                bundle,
-                override_ordering,
-            } => {
-                let context =
-                    PackageContext::new(&move_args.package_path, &move_args.build_config)?;
-                let state = context.prepare_state(bytecode_version, storage_dir)?;
-                sandbox::commands::publish(
-                    natives,
-                    cost_table,
-                    &state,
-                    context.package(),
-                    bytecode_version,
-                    *no_republish,
-                    *ignore_breaking_changes,
-                    *with_deps,
-                    *bundle,
-                    override_ordering.as_ref().map(|o| o.as_slice()),
-                    move_args.verbose,
-                )
-            },
-            SandboxCommand::Run {
-                script_file,
-                script_name,
-                signers,
-                args,
-                type_args,
-                gas_budget,
-                dry_run,
-            } => {
-                let context =
-                    PackageContext::new(&move_args.package_path, &move_args.build_config)?;
-                let state = context.prepare_state(bytecode_version, storage_dir)?;
-                sandbox::commands::run(
-                    natives,
-                    cost_table,
-                    error_descriptions,
-                    &state,
-                    context.package(),
-                    script_file,
-                    script_name,
-                    signers,
-                    args,
-                    type_args.to_vec(),
-                    *gas_budget,
-                    bytecode_version,
-                    *dry_run,
-                    move_args.verbose,
-                )
-            },
-            SandboxCommand::Test {
-                use_temp_dir,
-                track_cov,
-            } => sandbox::commands::run_all(
-                move_args
-                    .package_path
-                    .as_deref()
-                    .unwrap_or_else(|| Path::new(".")),
-                &std::env::current_exe()?,
-                *use_temp_dir,
-                *track_cov,
-            ),
-            SandboxCommand::View { file } => {
-                let state = PackageContext::new(&move_args.package_path, &move_args.build_config)?
-                    .prepare_state(bytecode_version, storage_dir)?;
-                sandbox::commands::view(&state, file)
-            },
-            SandboxCommand::Clean {} => {
-                // delete storage
-                let storage_dir = Path::new(storage_dir);
-                if storage_dir.exists() {
-                    fs::remove_dir_all(storage_dir)?;
-                }
-
-                // delete build
-                let build_dir = Path::new(
-                    &move_args
-                        .build_config
-                        .install_dir
-                        .as_ref()
-                        .unwrap_or(&PathBuf::from(DEFAULT_BUILD_DIR)),
-                )
-                .join(CompiledPackageLayout::Root.path());
-                if build_dir.exists() {
-                    fs::remove_dir_all(&build_dir)?;
-                }
-                Ok(())
-            },
-            SandboxCommand::Doctor {} => {
-                let state = PackageContext::new(&move_args.package_path, &move_args.build_config)?
-                    .prepare_state(bytecode_version, storage_dir)?;
-                sandbox::commands::doctor(&state)
-            },
-            SandboxCommand::Generate { cmd } => {
-                let state = PackageContext::new(&move_args.package_path, &move_args.build_config)?
-                    .prepare_state(bytecode_version, storage_dir)?;
-                handle_generate_commands(cmd, &state)
-            },
-        }
-    }
-}
-
-fn handle_generate_commands(cmd: &GenerateCommand, state: &OnDiskStateView) -> Result<()> {
-    match cmd {
-        GenerateCommand::StructLayouts { module, options } => {
-            sandbox::commands::generate::generate_struct_layouts(
-                module,
-                &options.struct_,
-                &options.type_args,
-                options.separator.clone(),
-                options.omit_addresses,
-                options.ignore_phantom_types,
-                options.shallow,
-                state,
-            )
-        },
-    }
-}
-
-#[test]
-fn verify_tool() {
-    use clap::CommandFactory;
-    SandboxCommand::command().debug_assert()
-}
diff --git a/third_party/move/tools/move-cli/src/sandbox/commands/doctor.rs b/third_party/move/tools/move-cli/src/sandbox/commands/doctor.rs
deleted file mode 100644
index d68b0fd48007f..0000000000000
--- a/third_party/move/tools/move-cli/src/sandbox/commands/doctor.rs
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright (c) The Diem Core Contributors
-// Copyright (c) The Move Contributors
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::sandbox::utils::on_disk_state_view::OnDiskStateView;
-use anyhow::{bail, Result};
-use move_binary_format::{access::ModuleAccess, errors::PartialVMError};
-use move_bytecode_utils::Modules;
-use move_core_types::vm_status::StatusCode;
-use std::{ffi::OsStr, path::Path};
-
-/// Run sanity checks on storage and build dirs. This is primarily intended for testing the CLI;
-/// doctor should never fail unless `publish --ignore-breaking changes` is used or files under
-/// `storage` or `build` are modified manually. This runs the following checks:
-/// (1) all modules pass the bytecode verifier
-/// (2) all modules pass the linker
-/// (3) all resources can be deserialized
-/// (4) all events can be deserialized
-/// (5) build/mv_interfaces is consistent with the global storage (TODO?)
-pub fn doctor(state: &OnDiskStateView) -> Result<()> {
-    fn parent_addr(p: &Path) -> &OsStr {
-        p.parent().unwrap().parent().unwrap().file_name().unwrap()
-    }
-
-    // verify and link each module
-    let all_modules = state.get_all_modules()?;
-    let code_cache = Modules::new(&all_modules);
-    for module in &all_modules {
-        if move_bytecode_verifier::verify_module(module).is_err() {
-            bail!("Failed to verify module {:?}", module.self_id())
-        }
-
-        let imm_deps = code_cache.get_immediate_dependencies(&module.self_id())?;
-        if move_bytecode_verifier::dependencies::verify_module(module, imm_deps).is_err() {
-            bail!(
-                "Failed to link module {:?} against its dependencies",
-                module.self_id()
-            )
-        }
-
-        let cyclic_check_result = move_bytecode_verifier::cyclic_dependencies::verify_module(
-            module,
-            |module_id| {
-                code_cache
-                    .get_module(module_id)
-                    .map_err(|_| PartialVMError::new(StatusCode::MISSING_DEPENDENCY))
-                    .map(|m| m.immediate_dependencies())
-            },
-            |module_id| {
-                code_cache
-                    .get_module(module_id)
-                    .map_err(|_| PartialVMError::new(StatusCode::MISSING_DEPENDENCY))
-                    .map(|m| m.immediate_friends())
-            },
-        );
-        if let Err(cyclic_check_error) = cyclic_check_result {
-            // the only possible error in the CLI's context is CYCLIC_MODULE_DEPENDENCY
-            assert_eq!(
-                cyclic_check_error.major_status(),
-                StatusCode::CYCLIC_MODULE_DEPENDENCY
-            );
-            bail!(
-                "Cyclic module dependencies are detected with module {} in the loop",
-                module.self_id()
-            )
-        }
-    }
-    // deserialize each resource
-    for resource_path in state.resource_paths() {
-        let resource = state.view_resource(&resource_path);
-        if resource.is_err() {
-            bail!(
-                "Failed to deserialize resource {:?} stored under address {:?}",
-                resource_path.file_name().unwrap(),
-                parent_addr(&resource_path)
-            )
-        }
-    }
-    Ok(())
-}
diff --git a/third_party/move/tools/move-cli/src/sandbox/commands/generate.rs b/third_party/move/tools/move-cli/src/sandbox/commands/generate.rs
deleted file mode 100644
index 3035ec0daa667..0000000000000
--- a/third_party/move/tools/move-cli/src/sandbox/commands/generate.rs
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright (c) The Diem Core Contributors
-// Copyright (c) The Move Contributors
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::sandbox::utils::on_disk_state_view::OnDiskStateView;
-use anyhow::{bail, Result};
-use move_bytecode_utils::layout::{SerdeLayoutBuilder, SerdeLayoutConfig};
-use move_core_types::{
-    identifier::Identifier,
-    language_storage::{StructTag, TypeTag},
-};
-use std::path::Path;
-
-pub fn generate_struct_layouts(
-    path: &Path,
-    struct_opt: &Option<String>,
-    type_args_opt: &Option<Vec<TypeTag>>,
-    separator: Option<String>,
-    omit_addresses: bool,
-    ignore_phantom_types: bool,
-    shallow: bool,
-    state: &OnDiskStateView,
-) -> Result<()> {
-    if let Some(module_id) = state.get_module_id(path) {
-        if let Some(struct_) = struct_opt {
-            // Generate for one struct
-            let type_args = type_args_opt.as_ref().cloned().unwrap_or_default();
-            let name = Identifier::new(struct_.as_str())?;
-            let struct_tag = StructTag {
-                address: *module_id.address(),
-                module: module_id.name().to_owned(),
-                name,
-                type_args,
-            };
-            let mut layout_builder =
-                SerdeLayoutBuilder::new_with_config(state, SerdeLayoutConfig {
-                    separator,
-                    omit_addresses,
-                    ignore_phantom_types,
-                    shallow,
-                });
-            layout_builder.build_struct_layout(&struct_tag)?;
-            let layout = serde_yaml::to_string(layout_builder.registry())?;
-            state.save_struct_layouts(&layout)?;
-            println!("{}", layout);
-        } else {
-            unimplemented!("Generating layout for all structs in a module. Use the --module and --struct options")
-        }
-        Ok(())
-    } else {
-        bail!("Can't resolve module at {:?}", path)
-    }
-}
diff --git a/third_party/move/tools/move-cli/src/sandbox/commands/mod.rs b/third_party/move/tools/move-cli/src/sandbox/commands/mod.rs
deleted file mode 100644
index 452822c357938..0000000000000
--- a/third_party/move/tools/move-cli/src/sandbox/commands/mod.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (c) The Diem Core Contributors
-// Copyright (c) The Move Contributors
-// SPDX-License-Identifier: Apache-2.0
-
-pub mod doctor;
-pub mod generate;
-pub mod publish;
-pub mod run;
-pub mod test;
-pub mod view;
-
-pub use doctor::*;
-pub use publish::*;
-pub use run::*;
-pub use test::*;
-pub use view::*;
diff --git a/third_party/move/tools/move-cli/src/sandbox/commands/publish.rs b/third_party/move/tools/move-cli/src/sandbox/commands/publish.rs
deleted file mode 100644
index fbec5710cac79..0000000000000
--- a/third_party/move/tools/move-cli/src/sandbox/commands/publish.rs
+++ /dev/null
@@ -1,179 +0,0 @@
-// Copyright (c) The Diem Core Contributors
-// Copyright (c) The Move Contributors
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::{
-    sandbox::utils::{
-        explain_publish_changeset, explain_publish_error, get_gas_status, module,
-        on_disk_state_view::OnDiskStateView,
-    },
-    NativeFunctionRecord,
-};
-use anyhow::{bail, Result};
-use move_binary_format::errors::Location;
-use move_command_line_common::env::get_bytecode_version_from_env;
-use move_package::compilation::compiled_package::CompiledPackage;
-use move_vm_runtime::move_vm::MoveVM;
-use move_vm_test_utils::gas_schedule::CostTable;
-use std::collections::BTreeMap;
-
-pub fn publish(
-    natives: impl IntoIterator<Item = NativeFunctionRecord>,
-    cost_table: &CostTable,
-    state: &OnDiskStateView,
-    package: &CompiledPackage,
-    bytecode_version: Option<u32>,
-    no_republish: bool,
-    ignore_breaking_changes: bool,
-    with_deps: bool,
-    bundle: bool,
-    override_ordering: Option<&[String]>,
-    verbose: bool,
-) -> Result<()> {
-    // collect all modules compiled
-    let compiled_modules = if with_deps {
-        package.all_modules().collect::<Vec<_>>()
-    } else {
-        package.root_modules().collect::<Vec<_>>()
-    };
-    if verbose {
-        println!("Found {} modules", compiled_modules.len());
-    }
-
-    // order the modules for publishing
-    let modules_to_publish = match override_ordering {
-        Some(ordering) => {
-            let module_map: BTreeMap<_, _> = compiled_modules
-                .into_iter()
-                .map(|unit| (unit.unit.name().to_string(), unit))
-                .collect();
-
-            let mut ordered_modules = vec![];
-            for name in ordering {
-                match module_map.get(name) {
-                    None => bail!("Invalid module name in publish ordering: {}", name),
-                    Some(unit) => {
-                        ordered_modules.push(*unit);
-                    },
-                }
-            }
-            ordered_modules
-        },
-        None => compiled_modules,
-    };
-
-    if no_republish {
-        let republished = modules_to_publish
-            .iter()
-            .filter_map(|unit| {
-                let id = module(&unit.unit).ok()?.self_id();
-                if state.has_module(&id) {
-                    Some(format!("{}", id))
-                } else {
-                    None
-                }
-            })
-            .collect::<Vec<_>>();
-
-        if !republished.is_empty() {
-            eprintln!("Failed to republish modules since the --no-republish flag is set. Tried to republish the following modules: {}",
-                republished.join(", "));
-            return Ok(());
-        }
-    }
-
-    let bytecode_version = get_bytecode_version_from_env(bytecode_version);
-
-    // use the publish_module API from the VM if we do not allow breaking changes
-    if !ignore_breaking_changes {
-        let vm = MoveVM::new(natives).unwrap();
-        let mut gas_status = get_gas_status(cost_table, None)?;
-        let mut session = vm.new_session(state);
-        let mut has_error = false;
-
-        if bundle {
-            // publish all modules together as a bundle
-            let mut sender_opt = None;
-            let mut module_bytes_vec = vec![];
-            for unit in &modules_to_publish {
-                let module_bytes = unit.unit.serialize(bytecode_version);
-                module_bytes_vec.push(module_bytes);
-
-                let module_address = *module(&unit.unit)?.self_id().address();
-                match &sender_opt {
-                    None => {
-                        sender_opt = Some(module_address);
-                    },
-                    Some(val) => {
-                        if val != &module_address {
-                            bail!("All modules in the bundle must share the same address");
-                        }
-                    },
-                }
-            }
-            match sender_opt {
-                None => bail!("No modules to publish"),
-                Some(sender) => {
-                    let res =
-                        session.publish_module_bundle(module_bytes_vec, sender, &mut gas_status);
-                    if let Err(err) = res {
-                        println!("Invalid multi-module publishing: {}", err);
-                        if let Location::Module(module_id) = err.location() {
-                            // find the module where error occures and explain
-                            if let Some(unit) = modules_to_publish
-                                .into_iter()
-                                .find(|&x| x.unit.name().as_str() == module_id.name().as_str())
-                            {
-                                explain_publish_error(err, state, unit)?
-                            } else {
-                                println!("Unable to locate the module in the multi-module publishing error");
-                            }
-                        }
-                        has_error = true;
-                    }
-                },
-            }
-        } else {
-            // publish modules sequentially, one module at a time
-            for unit in &modules_to_publish {
-                let module_bytes = unit.unit.serialize(bytecode_version);
-                let id = module(&unit.unit)?.self_id();
-                let sender = *id.address();
-
-                let res = session.publish_module(module_bytes, sender, &mut gas_status);
-                if let Err(err) = res {
-                    explain_publish_error(err, state, unit)?;
-                    has_error = true;
-                    break;
-                }
-            }
-        }
-
-        if !has_error {
-            let changeset = session.finish().map_err(|e| e.into_vm_status())?;
-            if verbose {
-                explain_publish_changeset(&changeset);
-            }
-            let modules: Vec<_> = changeset
-                .into_modules()
-                .map(|(module_id, blob_opt)| {
-                    (module_id, blob_opt.ok().expect("must be non-deletion"))
-                })
-                .collect();
-            state.save_modules(&modules)?;
-        }
-    } else {
-        // NOTE: the VM enforces the most strict way of module republishing and does not allow
-        // backward incompatible changes, as as result, if this flag is set, we skip the VM process
-        // and force the CLI to override the on-disk state directly
-        let mut serialized_modules = vec![];
-        for unit in modules_to_publish {
-            let id = module(&unit.unit)?.self_id();
-            let module_bytes = unit.unit.serialize(bytecode_version);
-            serialized_modules.push((id, module_bytes.into()));
-        }
-        state.save_modules(&serialized_modules)?;
-    }
-
-    Ok(())
-}
diff --git a/third_party/move/tools/move-cli/src/sandbox/commands/run.rs b/third_party/move/tools/move-cli/src/sandbox/commands/run.rs
deleted file mode 100644
index 9d56adb15a1d3..0000000000000
--- a/third_party/move/tools/move-cli/src/sandbox/commands/run.rs
+++ /dev/null
@@ -1,141 +0,0 @@
-// Copyright (c) The Diem Core Contributors
-// Copyright (c) The Move Contributors
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::{
-    sandbox::utils::{
-        contains_module, explain_execution_effects, explain_execution_error, get_gas_status,
-        is_bytecode_file, maybe_commit_effects, on_disk_state_view::OnDiskStateView,
-    },
-    NativeFunctionRecord,
-};
-use anyhow::{anyhow, bail, Result};
-use move_binary_format::file_format::CompiledModule;
-use move_command_line_common::env::get_bytecode_version_from_env;
-use move_core_types::{
-    account_address::AccountAddress,
-    errmap::ErrorMapping,
-    identifier::IdentStr,
-    language_storage::TypeTag,
-    transaction_argument::{convert_txn_args, TransactionArgument},
-    value::MoveValue,
-};
-use move_package::compilation::compiled_package::CompiledPackage;
-use move_vm_runtime::{
-    module_traversal::{TraversalContext, TraversalStorage},
-    move_vm::MoveVM,
-};
-use move_vm_test_utils::gas_schedule::CostTable;
-use std::{fs, path::Path};
-
-#[allow(clippy::too_many_arguments)]
-pub fn run(
-    natives: impl IntoIterator<Item = NativeFunctionRecord>,
-    cost_table: &CostTable,
-    error_descriptions: &ErrorMapping,
-    state: &OnDiskStateView,
-    package: &CompiledPackage,
-    script_path: &Path,
-    script_name_opt: &Option<String>,
-    signers: &[String],
-    txn_args: &[TransactionArgument],
-    vm_type_args: Vec<TypeTag>,
-    gas_budget: Option<u64>,
-    bytecode_version: Option<u32>,
-    dry_run: bool,
-    verbose: bool,
-) -> Result<()> {
-    if !script_path.exists() {
-        bail!("Script file {:?} does not exist", script_path)
-    };
-    let bytecode_version = get_bytecode_version_from_env(bytecode_version);
-
-    let bytecode = if is_bytecode_file(script_path) {
-        assert!(
-            state.is_module_path(script_path) || !contains_module(script_path),
-            "Attempting to run module {:?} outside of the `storage/` directory.
-move run` must be applied to a module inside `storage/`",
-            script_path
-        );
-        // script bytecode; read directly from file
-        fs::read(script_path)?
-    } else {
-        // TODO(tzakian): support calling scripts in transitive deps
-        let file_contents = std::fs::read_to_string(script_path)?;
-        let script_opt = package
-            .scripts()
-            .find(|unit| unit.unit.source_map().check(&file_contents));
-        // script source file; package is already compiled so load it up
-        match script_opt {
-            Some(unit) => unit.unit.serialize(bytecode_version),
-            None => bail!("Unable to find script in file {:?}", script_path),
-        }
-    };
-
-    let signer_addresses = signers
-        .iter()
-        .map(|s| AccountAddress::from_hex_literal(s))
-        .collect::<Result<Vec<AccountAddress>, _>>()?;
-    // TODO: parse Value's directly instead of going through the indirection of TransactionArgument?
-    let vm_args: Vec<Vec<u8>> = convert_txn_args(txn_args);
-
-    let vm = MoveVM::new(natives).unwrap();
-    let mut gas_status = get_gas_status(cost_table, gas_budget)?;
-    let mut session = vm.new_session(state);
-
-    let script_type_parameters = vec![];
-    let script_parameters = vec![];
-    // TODO rethink move-cli arguments for executing functions
-    let vm_args = signer_addresses
-        .iter()
-        .map(|a| {
-            MoveValue::Signer(*a)
-                .simple_serialize()
-                .expect("transaction arguments must serialize")
-        })
-        .chain(vm_args)
-        .collect();
-
-    let storage = TraversalStorage::new();
-    let res = match script_name_opt {
-        Some(script_name) => {
-            // script fun. parse module, extract script ID to pass to VM
-            let module = CompiledModule::deserialize(&bytecode)
-                .map_err(|e| anyhow!("Error deserializing module: {:?}", e))?;
-            session.execute_entry_function(
-                &module.self_id(),
-                IdentStr::new(script_name)?,
-                vm_type_args.clone(),
-                vm_args,
-                &mut gas_status,
-                &mut TraversalContext::new(&storage),
-            )
-        },
-        None => session.execute_script(
-            bytecode.to_vec(),
-            vm_type_args.clone(),
-            vm_args,
-            &mut gas_status,
-            &mut TraversalContext::new(&storage),
-        ),
-    };
-
-    if let Err(err) = res {
-        explain_execution_error(
-            error_descriptions,
-            err,
-            state,
-            &script_type_parameters,
-            &script_parameters,
-            &vm_type_args,
-            &signer_addresses,
-            txn_args,
-        )
-    } else {
-        let changeset = session.finish().map_err(|e| e.into_vm_status())?;
-        if verbose {
-            explain_execution_effects(&changeset, state)?
-        }
-        maybe_commit_effects(!dry_run, changeset, state)
-    }
-}
diff --git a/third_party/move/tools/move-cli/src/sandbox/commands/test.rs b/third_party/move/tools/move-cli/src/sandbox/commands/test.rs
deleted file mode 100644
index 808d363ecede4..0000000000000
--- a/third_party/move/tools/move-cli/src/sandbox/commands/test.rs
+++ /dev/null
@@ -1,408 +0,0 @@
-// Copyright (c) The Diem Core Contributors
-// Copyright (c) The Move Contributors
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::{sandbox::utils::module, DEFAULT_BUILD_DIR, DEFAULT_STORAGE_DIR};
-use move_command_line_common::{
-    env::{get_move_compiler_v2_from_env, read_bool_env_var, NO_COLOR_MODE_ENV_VAR},
-    files::{find_filenames, path_to_string},
-    testing::{
-        add_update_baseline_fix, format_diff, read_env_update_baseline, EXP_EXT, EXP_EXT_V2,
-    },
-};
-use move_compiler::command_line::COLOR_MODE_ENV_VAR;
-use move_coverage::coverage_map::{CoverageMap, ExecCoverageMapWithModules};
-use move_package::{
-    compilation::{compiled_package::OnDiskCompiledPackage, package_layout::CompiledPackageLayout},
-    resolution::resolution_graph::ResolvedGraph,
-    source_package::{layout::SourcePackageLayout, manifest_parser::parse_move_manifest_from_file},
-    BuildConfig,
-};
-use std::{
-    collections::{BTreeMap, HashMap},
-    env,
-    fmt::Write as FmtWrite,
-    fs::{self, File},
-    io::{self, BufRead, Write},
-    path::{Path, PathBuf},
-    process::Command,
-};
-use tempfile::tempdir;
-
-/// Basic datatest testing framework for the CLI. The `run_one` entrypoint expects
-/// an `args.txt` file with arguments that the `move` binary understands (one set
-/// of arguments per line). The testing framework runs the commands, compares the
-/// result to the expected output, and runs `move clean` to discard resources,
-/// modules, and event data created by running the test.
-
-/// If this env var is set, `move clean` will not be run after each test.
-/// this is useful if you want to look at the `storage` or `move_events`
-/// produced by a test. However, you'll have to manually run `move clean`
-/// before re-running the test.
-const NO_MOVE_CLEAN: &str = "NO_MOVE_CLEAN";
-
-/// The filename that contains the arguments to the Move binary.
-pub const TEST_ARGS_FILENAME: &str = "args.txt";
-
-/// Name of the environment variable we need to set in order to get tracing
-/// enabled in the move VM.
-const MOVE_VM_TRACING_ENV_VAR_NAME: &str = "MOVE_VM_TRACE";
-
-/// Name of the environment variable we need to set in order to flush
-/// after every trace call.
-const MOVE_VM_TRACING_FLUSH_ENV_VAR_NAME: &str = "MOVE_VM_TRACE_FLUSH";
-
-/// The default file name (inside the build output dir) for the runtime to
-/// dump the execution trace to. The trace will be used by the coverage tool
-/// if --track-cov is set. If --track-cov is not set, then no trace file will
-/// be produced.
-const DEFAULT_TRACE_FILE: &str = "trace";
-
-fn collect_coverage(
-    trace_file: &Path,
-    build_dir: &Path,
-) -> anyhow::Result<ExecCoverageMapWithModules> {
-    let canonical_build = build_dir.canonicalize().unwrap();
-    let package_name = parse_move_manifest_from_file(
-        &SourcePackageLayout::try_find_root(&canonical_build).unwrap(),
-    )?
-    .package
-    .name
-    .to_string();
-    let pkg = OnDiskCompiledPackage::from_path(
-        &build_dir
-            .join(package_name)
-            .join(CompiledPackageLayout::BuildInfo.path()),
-    )?
-    .into_compiled_package()?;
-    let src_modules = pkg
-        .all_modules()
-        .map(|unit| {
-            let absolute_path = path_to_string(&unit.source_path.canonicalize()?)?;
-            Ok((absolute_path, module(&unit.unit)?.clone()))
-        })
-        .collect::<anyhow::Result<HashMap<_, _>>>()?;
-
-    // build the filter
-    let mut filter = BTreeMap::new();
-    for (entry, module) in src_modules.into_iter() {
-        let module_id = module.self_id();
-        filter
-            .entry(*module_id.address())
-            .or_insert_with(BTreeMap::new)
-            .insert(module_id.name().to_owned(), (entry, module));
-    }
-
-    // collect filtered trace
-    let coverage_map = CoverageMap::from_trace_file(trace_file)
-        .to_unified_exec_map()
-        .into_coverage_map_with_modules(filter);
-
-    Ok(coverage_map)
-}
-
-fn determine_package_nest_depth(
-    resolution_graph: &ResolvedGraph,
-    pkg_dir: &Path,
-) -> anyhow::Result<usize> {
-    let mut depth = 0;
-    for (_, dep) in resolution_graph.package_table.iter() {
-        depth = std::cmp::max(
-            depth,
-            dep.package_path.strip_prefix(pkg_dir)?.components().count() + 1,
-        );
-    }
-    Ok(depth)
-}
-
-fn pad_tmp_path(tmp_dir: &Path, pad_amount: usize) -> anyhow::Result<PathBuf> {
-    let mut tmp_dir = tmp_dir.to_path_buf();
-    for i in 0..pad_amount {
-        tmp_dir.push(format!("{}", i));
-    }
-    std::fs::create_dir_all(&tmp_dir)?;
-    Ok(tmp_dir)
-}
-
-// We need to copy dependencies over (transitively) and at the same time keep the paths valid in
-// the package. To do this we compute the resolution graph for all possible dependencies (so in dev
-// mode) and then calculate the nesting under `tmp_dir` the we need to copy the root package so
-// that it, and all its dependencies reside under `tmp_dir` with the same paths as in the original
-// package manifest.
-fn copy_deps(tmp_dir: &Path, pkg_dir: &Path) -> anyhow::Result<PathBuf> {
-    // Sometimes we run a test that isn't a package for metatests so if there isn't a package we
-    // don't need to nest at all. Resolution graph diagnostics are only needed for CLI commands so
-    // ignore them by passing a vector as the writer.
-    let package_resolution = match (BuildConfig {
-        dev_mode: true,
-        ..Default::default()
-    })
-    .resolution_graph_for_package(pkg_dir, &mut Vec::new())
-    {
-        Ok(pkg) => pkg,
-        Err(_) => return Ok(tmp_dir.to_path_buf()),
-    };
-    let package_nest_depth = determine_package_nest_depth(&package_resolution, pkg_dir)?;
-    let tmp_dir = pad_tmp_path(tmp_dir, package_nest_depth)?;
-    for (_, dep) in package_resolution.package_table.iter() {
-        let source_dep_path = &dep.package_path;
-        let dest_dep_path = tmp_dir.join(dep.package_path.strip_prefix(pkg_dir).unwrap());
-        if !dest_dep_path.exists() {
-            fs::create_dir_all(&dest_dep_path)?;
-        }
-        simple_copy_dir(&dest_dep_path, source_dep_path)?;
-    }
-    Ok(tmp_dir)
-}
-
-fn simple_copy_dir(dst: &Path, src: &Path) -> io::Result<()> {
-    for entry in fs::read_dir(src)? {
-        let src_entry = entry?;
-        let src_entry_path = src_entry.path();
-        let dst_entry_path = dst.join(src_entry.file_name());
-        if src_entry_path.is_dir() {
-            fs::create_dir_all(&dst_entry_path)?;
-            simple_copy_dir(&dst_entry_path, &src_entry_path)?;
-        } else {
-            fs::copy(&src_entry_path, &dst_entry_path)?;
-        }
-    }
-    Ok(())
-}
-
-/// Run the `args_path` batch file with`cli_binary`
-pub fn run_one(
-    args_path: &Path,
-    cli_binary: &Path,
-    use_temp_dir: bool,
-    track_cov: bool,
-) -> anyhow::Result<Option<ExecCoverageMapWithModules>> {
-    let args_file = io::BufReader::new(File::open(args_path)?).lines();
-    let cli_binary_path = cli_binary.canonicalize()?;
-
-    // path where we will run the binary
-    let exe_dir = args_path.parent().unwrap();
-    let temp_dir = if use_temp_dir {
-        // symlink everything in the exe_dir into the temp_dir
-        let dir = tempdir()?;
-        let padded_dir = copy_deps(dir.path(), exe_dir)?;
-        simple_copy_dir(&padded_dir, exe_dir)?;
-        Some((dir, padded_dir))
-    } else {
-        None
-    };
-    let wks_dir = temp_dir.as_ref().map_or(exe_dir, |t| &t.1);
-
-    let storage_dir = wks_dir.join(DEFAULT_STORAGE_DIR);
-    let build_output = wks_dir
-        .join(DEFAULT_BUILD_DIR)
-        .join(CompiledPackageLayout::Root.path());
-
-    // template for preparing a cli command
-    let cli_command_template = || {
-        let mut command = Command::new(cli_binary_path.clone());
-        if let Some(work_dir) = temp_dir.as_ref() {
-            command.current_dir(&work_dir.1);
-        } else {
-            command.current_dir(exe_dir);
-        }
-        command
-    };
-
-    if storage_dir.exists() || build_output.exists() {
-        // need to clean before testing
-        cli_command_template()
-            .arg("sandbox")
-            .arg("clean")
-            .output()?;
-    }
-    let mut output = "".to_string();
-
-    // always use the absolute path for the trace file as we may change dirs in the process
-    let trace_file = if track_cov {
-        Some(wks_dir.canonicalize()?.join(DEFAULT_TRACE_FILE))
-    } else {
-        None
-    };
-
-    // Disable colors in error reporting from the Move compiler
-    env::set_var(COLOR_MODE_ENV_VAR, "NONE");
-    // Disable colors in error reporting from other tools.
-    env::set_var(NO_COLOR_MODE_ENV_VAR, "true");
-    for args_line in args_file {
-        let args_line = args_line?;
-
-        if let Some(external_cmd) = args_line.strip_prefix('>') {
-            let external_cmd = external_cmd.trim_start();
-            let mut cmd_iter = external_cmd.split_ascii_whitespace();
-
-            let external_program = cmd_iter.next().expect("empty external command");
-
-            let mut command = Command::new(external_program);
-            command.args(cmd_iter);
-            if let Some(work_dir) = temp_dir.as_ref() {
-                command.current_dir(&work_dir.1);
-            } else {
-                command.current_dir(exe_dir);
-            }
-            let cmd_output = command.output()?;
-
-            writeln!(&mut output, "External Command `{}`:", external_cmd)?;
-            output += std::str::from_utf8(&cmd_output.stdout)?;
-            output += std::str::from_utf8(&cmd_output.stderr)?;
-
-            continue;
-        }
-
-        if args_line.starts_with('#') {
-            // allow comments in args.txt
-            continue;
-        }
-        let args_iter: Vec<&str> = args_line.split_whitespace().collect();
-        if args_iter.is_empty() {
-            // allow blank lines in args.txt
-            continue;
-        }
-
-        // enable tracing in the VM by setting the env var.
-        match &trace_file {
-            None => {
-                // this check prevents cascading the coverage tracking flag.
-                // in particular, if
-                //   1. we run with move-cli test <path-to-args-A.txt> --track-cov, and
-                //   2. in this <args-A.txt>, there is another command: test <args-B.txt>
-                // then, when running <args-B.txt>, coverage will not be tracked nor printed
-                env::remove_var(MOVE_VM_TRACING_ENV_VAR_NAME);
-            },
-            Some(path) => {
-                env::set_var(MOVE_VM_TRACING_ENV_VAR_NAME, path.as_os_str());
-                env::set_var(MOVE_VM_TRACING_FLUSH_ENV_VAR_NAME, path.as_os_str());
-            },
-        }
-
-        let cmd_output = cli_command_template().args(args_iter).output()?;
-        writeln!(&mut output, "Command `{}`:", args_line)?;
-        output += std::str::from_utf8(&cmd_output.stdout)?;
-        output += std::str::from_utf8(&cmd_output.stderr)?;
-    }
-
-    // collect coverage information
-    let cov_info = match &trace_file {
-        None => None,
-        Some(trace_path) => {
-            if trace_path.exists() {
-                Some(collect_coverage(trace_path, &build_output)?)
-            } else {
-                eprintln!(
-                    "Trace file {:?} not found: coverage is only available with at least one `run` \
-                    command in the args.txt (after a `clean`, if there is one)",
-                    trace_path
-                );
-                None
-            }
-        },
-    };
-
-    // post-test cleanup and cleanup checks
-    // check that the test command didn't create a src dir
-    let run_move_clean = !read_bool_env_var(NO_MOVE_CLEAN);
-    if run_move_clean {
-        // run the clean command to ensure that temporary state is cleaned up
-        cli_command_template()
-            .arg("sandbox")
-            .arg("clean")
-            .output()?;
-
-        // check that build and storage was deleted
-        assert!(
-            !storage_dir.exists(),
-            "`move clean` failed to eliminate {} directory",
-            DEFAULT_STORAGE_DIR
-        );
-        assert!(
-            !build_output.exists(),
-            "`move clean` failed to eliminate {} directory",
-            DEFAULT_BUILD_DIR
-        );
-
-        // clean the trace file as well if it exists
-        if let Some(trace_path) = &trace_file {
-            if trace_path.exists() {
-                fs::remove_file(trace_path)?;
-            }
-        }
-    }
-
-    // release the temporary workspace explicitly
-    if let Some((t, _)) = temp_dir {
-        t.close()?;
-    }
-
-    // compare output and exp_file
-    let update_baseline = read_env_update_baseline();
-    let exp_ext = if get_move_compiler_v2_from_env() {
-        EXP_EXT_V2
-    } else {
-        EXP_EXT
-    };
-    let exp_path = args_path.with_extension(exp_ext);
-    if update_baseline {
-        fs::write(exp_path, &output)?;
-        return Ok(cov_info);
-    }
-
-    let expected_output = fs::read_to_string(exp_path).unwrap_or_else(|_| "".to_string());
-    if expected_output != output {
-        let msg = format!(
-            "Expected output differs from actual output:\n{}",
-            format_diff(expected_output, output)
-        );
-        anyhow::bail!(add_update_baseline_fix(msg))
-    } else {
-        Ok(cov_info)
-    }
-}
-
-pub fn run_all(
-    args_path: &Path,
-    cli_binary: &Path,
-    use_temp_dir: bool,
-    track_cov: bool,
-) -> anyhow::Result<()> {
-    let mut test_total: u64 = 0;
-    let mut test_passed: u64 = 0;
-    let mut cov_info = ExecCoverageMapWithModules::empty();
-
-    // find `args.txt` and iterate over them
-    for entry in find_filenames(&[args_path], |fpath| {
-        fpath.file_name().expect("unexpected file entry path") == TEST_ARGS_FILENAME
-    })? {
-        match run_one(Path::new(&entry), cli_binary, use_temp_dir, track_cov) {
-            Ok(cov_opt) => {
-                test_passed = test_passed.checked_add(1).unwrap();
-                if let Some(cov) = cov_opt {
-                    cov_info.merge(cov);
-                }
-            },
-            Err(ex) => eprintln!("Test {} failed with error: {}", entry, ex),
-        }
-        test_total = test_total.checked_add(1).unwrap();
-    }
-    println!("{} / {} test(s) passed.", test_passed, test_total);
-
-    // if any test fails, bail
-    let test_failed = test_total.checked_sub(test_passed).unwrap();
-    if test_failed != 0 {
-        anyhow::bail!("{} / {} test(s) failed.", test_failed, test_total)
-    }
-
-    // show coverage information if requested
-    if track_cov {
-        let mut summary_writer: Box<dyn Write> = Box::new(io::stdout());
-        for (_, module_summary) in cov_info.into_module_summaries() {
-            module_summary.summarize_human(&mut summary_writer, true)?;
-        }
-    }
-
-    Ok(())
-}
diff --git a/third_party/move/tools/move-cli/src/sandbox/commands/view.rs b/third_party/move/tools/move-cli/src/sandbox/commands/view.rs
deleted file mode 100644
index 6269f5ee94440..0000000000000
--- a/third_party/move/tools/move-cli/src/sandbox/commands/view.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright (c) The Diem Core Contributors
-// Copyright (c) The Move Contributors
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::sandbox::utils::{
-    contains_module, is_bytecode_file, on_disk_state_view::OnDiskStateView,
-};
-use anyhow::{bail, Result};
-use std::path::Path;
-/// Print a module or resource stored in `file`
-pub fn view(state: &OnDiskStateView, path: &Path) -> Result<()> {
-    if state.is_resource_path(path) {
-        match state.view_resource(path)? {
-            Some(resource) => println!("{}", resource),
-            None => println!("Resource not found."),
-        }
-    } else if is_bytecode_file(path) {
-        let bytecode_opt = if contains_module(path) {
-            OnDiskStateView::view_module(path)?
-        } else {
-            // bytecode extension, but not a module--assume it's a script
-            OnDiskStateView::view_script(path)?
-        };
-        match bytecode_opt {
-            Some(bytecode) => println!("{}", bytecode),
-            None => println!("Bytecode not found."),
-        }
-    } else {
-        bail!("`move view <file>` must point to a valid file under storage")
-    }
-    Ok(())
-}
diff --git a/third_party/move/tools/move-cli/src/sandbox/mod.rs b/third_party/move/tools/move-cli/src/sandbox/mod.rs
deleted file mode 100644
index e0034473c4275..0000000000000
--- a/third_party/move/tools/move-cli/src/sandbox/mod.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright (c) The Diem Core Contributors
-// Copyright (c) The Move Contributors
-// SPDX-License-Identifier: Apache-2.0
-
-pub mod cli;
-pub mod commands;
-pub mod utils;
diff --git a/third_party/move/tools/move-cli/src/sandbox/utils/mod.rs b/third_party/move/tools/move-cli/src/sandbox/utils/mod.rs
deleted file mode 100644
index 8b0fb1b743013..0000000000000
--- a/third_party/move/tools/move-cli/src/sandbox/utils/mod.rs
+++ /dev/null
@@ -1,572 +0,0 @@
-// Copyright (c) The Diem Core Contributors
-// Copyright (c) The Move Contributors
-// SPDX-License-Identifier: Apache-2.0
-
-use anyhow::{bail, Result};
-use colored::Colorize;
-use difference::{Changeset, Difference};
-use move_binary_format::{
-    access::ModuleAccess,
-    compatibility::Compatibility,
-    errors::VMError,
-    file_format::{AbilitySet, CompiledModule, FunctionDefinitionIndex, SignatureToken},
-    normalized, IndexKind,
-};
-use move_bytecode_utils::Modules;
-use move_command_line_common::files::{FileHash, MOVE_COMPILED_EXTENSION};
-use move_compiler::{
-    compiled_unit::{CompiledUnit, NamedCompiledModule},
-    diagnostics::{self, report_diagnostics, Diagnostic, Diagnostics, FileName},
-};
-use move_core_types::{
-    account_address::AccountAddress,
-    effects::{ChangeSet, Op},
-    errmap::ErrorMapping,
-    language_storage::{ModuleId, TypeTag},
-    transaction_argument::TransactionArgument,
-    vm_status::{AbortLocation, StatusCode, VMStatus},
-};
-use move_ir_types::location::Loc;
-use move_package::compilation::compiled_package::CompiledUnitWithSource;
-use move_resource_viewer::{AnnotatedMoveStruct, MoveValueAnnotator};
-use move_vm_test_utils::gas_schedule::Gas;
-use std::{
-    collections::{BTreeMap, HashMap},
-    fs,
-    path::Path,
-};
-
-pub mod on_disk_state_view;
-pub mod package_context;
-
-use move_bytecode_utils::compiled_module_viewer::CompiledModuleView;
-use move_vm_test_utils::gas_schedule::{CostTable, GasStatus};
-pub use on_disk_state_view::*;
-pub use package_context::*;
-
-pub fn get_gas_status(cost_table: &CostTable, gas_budget: Option<u64>) -> Result<GasStatus> {
-    let gas_status = if let Some(gas_budget) = gas_budget {
-        // TODO(Gas): This should not be hardcoded.
-        let max_gas_budget = u64::MAX.checked_div(1000).unwrap();
-        if gas_budget >= max_gas_budget {
-            bail!("Gas budget set too high; maximum is {}", max_gas_budget)
-        }
-        GasStatus::new(cost_table, Gas::new(gas_budget))
-    } else {
-        // no budget specified. Disable gas metering
-        GasStatus::new_unmetered()
-    };
-    Ok(gas_status)
-}
-
-pub(crate) fn module(unit: &CompiledUnit) -> Result<&CompiledModule> {
-    match unit {
-        CompiledUnit::Module(NamedCompiledModule { module, .. }) => Ok(module),
-        _ => bail!("Found script in modules -- this shouldn't happen"),
-    }
-}
-
-pub(crate) fn explain_publish_changeset(changeset: &ChangeSet) {
-    // publish effects should contain no resources
-    assert!(changeset.resources().next().is_none());
-    // total bytes written across all accounts
-    let mut total_bytes_written = 0;
-    for (addr, name, blob_op) in changeset.modules() {
-        match blob_op {
-            Op::New(module_bytes) => {
-                let bytes_written = addr.len() + name.len() + module_bytes.len();
-                total_bytes_written += bytes_written;
-                let module_id = ModuleId::new(addr, name.clone());
-                println!(
-                    "Publishing a new module {} (wrote {:?} bytes)",
-                    module_id, bytes_written
-                );
-            },
-            Op::Modify(module_bytes) => {
-                let bytes_written = addr.len() + name.len() + module_bytes.len();
-                total_bytes_written += bytes_written;
-                let module_id = ModuleId::new(addr, name.clone());
-                println!(
-                    "Updating an existing module {} (wrote {:?} bytes)",
-                    module_id, bytes_written
-                );
-            },
-            Op::Delete => {
-                panic!("Deleting a module is not supported")
-            },
-        }
-    }
-    println!(
-        "Wrote {:?} bytes of module ID's and code",
-        total_bytes_written
-    )
-}
-
-// Print a struct with a specified outer indent
-fn print_struct_with_indent(value: &AnnotatedMoveStruct, indent: u64) {
-    let indent_str: String = (0..indent).map(|_| " ").collect::<String>();
-    let value_str = format!("{}", value);
-    let lines = value_str.split('\n');
-    for line in lines {
-        println!("{}{}", indent_str, line)
-    }
-}
-
-// Print struct diff with a specified outer indent
-fn print_struct_diff_with_indent(
-    value1: &AnnotatedMoveStruct,
-    value2: &AnnotatedMoveStruct,
-    indent: u64,
-) {
-    let indent_str: String = (0..indent).map(|_| " ").collect::<String>();
-    let prev_str = format!("{}", value1);
-    let new_str = format!("{}", value2);
-
-    let Changeset { diffs, .. } = Changeset::new(&prev_str, &new_str, "\n");
-
-    for diff in diffs {
-        match diff {
-            Difference::Same(ref x) => {
-                let lines = x.split('\n');
-                for line in lines {
-                    println!(" {}{}", indent_str, line);
-                }
-            },
-            Difference::Add(ref x) => {
-                let lines = x.split('\n');
-                for line in lines {
-                    println!("{}{}{}", "+".green(), indent_str, line.green());
-                }
-            },
-            Difference::Rem(ref x) => {
-                let lines = x.split('\n');
-                for line in lines {
-                    println!("{}{}{}", "-".red(), indent_str, line.red());
-                }
-            },
-        }
-    }
-}
-
-pub(crate) fn explain_execution_effects(
-    changeset: &ChangeSet,
-    state: &OnDiskStateView,
-) -> Result<()> {
-    // execution effects should contain no modules
-    assert!(changeset.modules().next().is_none());
-    if !changeset.accounts().is_empty() {
-        println!(
-            "Changed resource(s) under {:?} address(es):",
-            changeset.accounts().len()
-        );
-    }
-    // total bytes written across all accounts
-    let mut total_bytes_written = 0;
-    for (addr, account) in changeset.accounts() {
-        print!("  ");
-        if account.resources().is_empty() {
-            continue;
-        }
-        println!(
-            "Changed {:?} resource(s) under address {:?}:",
-            account.resources().len(),
-            addr
-        );
-
-        let annotator = MoveValueAnnotator::new(state.clone());
-        for (struct_tag, write_op) in account.resources() {
-            print!("    ");
-            let mut bytes_to_write = struct_tag.access_vector().len();
-            match write_op {
-                Op::New(blob) => {
-                    bytes_to_write += blob.len();
-                    println!(
-                        "Added type {}: {:?} (wrote {:?} bytes)",
-                        struct_tag, blob, bytes_to_write
-                    );
-                    // Print new resource
-                    let resource = annotator.view_resource(struct_tag, blob)?;
-                    print_struct_with_indent(&resource, 6)
-                },
-                Op::Modify(blob) => {
-                    bytes_to_write += blob.len();
-                    println!(
-                        "Changed type {}: {:?} (wrote {:?} bytes)",
-                        struct_tag, blob, bytes_to_write
-                    );
-                    // Print resource diff
-                    let resource_data = state
-                        .get_resource_bytes(*addr, struct_tag.clone())?
-                        .unwrap();
-                    let resource_old = annotator.view_resource(struct_tag, &resource_data)?;
-                    let resource_new = annotator.view_resource(struct_tag, blob)?;
-
-                    print_struct_diff_with_indent(&resource_old, &resource_new, 8)
-                },
-                Op::Delete => {
-                    println!(
-                        "Deleted type {} (wrote {:?} bytes)",
-                        struct_tag, bytes_to_write
-                    );
-                    // Print deleted resource
-                    let resource_data = state
-                        .get_resource_bytes(*addr, struct_tag.clone())?
-                        .unwrap();
-                    let resource_old = annotator.view_resource(struct_tag, &resource_data)?;
-                    print_struct_with_indent(&resource_old, 6);
-                },
-            };
-            total_bytes_written += bytes_to_write;
-        }
-    }
-    if total_bytes_written != 0 {
-        println!(
-            "Wrote {:?} bytes of resource ID's and data",
-            total_bytes_written
-        );
-    }
-
-    Ok(())
-}
-
-/// Commit the resources modified by a transaction to disk
-pub(crate) fn maybe_commit_effects(
-    commit: bool,
-    changeset: ChangeSet,
-    state: &OnDiskStateView,
-) -> Result<()> {
-    // similar to explain effects, all module publishing happens via save_modules(), so effects
-    // shouldn't contain modules
-    if commit {
-        for (addr, account) in changeset.into_inner() {
-            for (struct_tag, blob_op) in account.into_resources() {
-                match blob_op {
-                    Op::New(blob) | Op::Modify(blob) => {
-                        state.save_resource(addr, struct_tag, &blob)?
-                    },
-                    Op::Delete => state.delete_resource(addr, struct_tag)?,
-                }
-            }
-        }
-    } else if changeset.resources().next().is_some() {
-        println!("Discarding changes; re-run without --dry-run if you would like to keep them.")
-    }
-
-    Ok(())
-}
-
-pub(crate) fn explain_type_error(
-    script_params: &[SignatureToken],
-    signers: &[AccountAddress],
-    txn_args: &[TransactionArgument],
-) {
-    use SignatureToken::*;
-    let expected_num_signers = script_params
-        .iter()
-        .filter(|t| match t {
-            Reference(r) => r.is_signer(),
-            _ => false,
-        })
-        .count();
-    if expected_num_signers != signers.len() {
-        println!(
-            "Execution failed with incorrect number of signers: script expected {:?}, but found \
-             {:?}",
-            expected_num_signers,
-            signers.len()
-        );
-        return;
-    }
-
-    // TODO: printing type(s) of missing arguments could be useful
-    let expected_num_args = script_params.len() - signers.len();
-    if expected_num_args != txn_args.len() {
-        println!(
-            "Execution failed with incorrect number of arguments: script expected {:?}, but found \
-             {:?}",
-            expected_num_args,
-            txn_args.len()
-        );
-        return;
-    }
-
-    // TODO: print more helpful error message pinpointing the (argument, type)
-    // pair that didn't match
-    println!("Execution failed with type error when binding type arguments to type parameters")
-}
-
-pub(crate) fn explain_publish_error(
-    error: VMError,
-    state: &OnDiskStateView,
-    unit: &CompiledUnitWithSource,
-) -> Result<()> {
-    use StatusCode::*;
-    let mut files = HashMap::new();
-    let file_contents = std::fs::read_to_string(&unit.source_path)?;
-    let file_hash = FileHash::new(&file_contents);
-    files.insert(
-        file_hash,
-        (
-            FileName::from(unit.source_path.to_string_lossy()),
-            file_contents,
-        ),
-    );
-
-    let module = module(&unit.unit)?;
-    let module_id = module.self_id();
-    let error_clone = error.clone();
-    match error.into_vm_status() {
-        VMStatus::Error {
-            status_code: DUPLICATE_MODULE_NAME,
-            ..
-        } => {
-            println!(
-                "Module {} exists already. Re-run without --no-republish to publish anyway.",
-                module_id
-            );
-        },
-        VMStatus::Error {
-            status_code: BACKWARD_INCOMPATIBLE_MODULE_UPDATE,
-            ..
-        } => {
-            println!("Breaking change detected--publishing aborted. Re-run with --ignore-breaking-changes to publish anyway.");
-
-            let old_module = state.view_compiled_module(&module_id)?.unwrap();
-            let old_api = normalized::Module::new(&old_module);
-            let new_api = normalized::Module::new(module);
-
-            if Compatibility::new(false, true, false)
-                .check(&old_api, &new_api)
-                .is_err()
-            {
-                // TODO: we could choose to make this more precise by walking the global state and looking for published
-                // structs of this type. but probably a bad idea
-                println!("Layout API for structs of module {} has changed. Need to do a data migration of published structs", module_id)
-            } else if Compatibility::new(true, false, false)
-                .check(&old_api, &new_api)
-                .is_err()
-            {
-                // TODO: this will report false positives if we *are* simultaneously redeploying all dependent modules.
-                // but this is not easy to check without walking the global state and looking for everything
-                println!("Linking API for structs/functions of module {} has changed. Need to redeploy all dependent modules.", module_id)
-            }
-        },
-        VMStatus::Error {
-            status_code: CYCLIC_MODULE_DEPENDENCY,
-            ..
-        } => {
-            println!(
-                "Publishing module {} introduces cyclic dependencies.",
-                module_id
-            );
-            // find all cycles with an iterative DFS
-            let all_modules = state.get_all_modules()?;
-            let code_cache = Modules::new(&all_modules);
-
-            let mut stack = vec![];
-            let mut state = BTreeMap::new();
-            state.insert(module_id.clone(), true);
-            for dep in module.immediate_dependencies() {
-                stack.push((code_cache.get_module(&dep)?, false));
-            }
-
-            while let Some((cur, is_exit)) = stack.pop() {
-                let cur_id = cur.self_id();
-                if is_exit {
-                    state.insert(cur_id, false);
-                } else {
-                    state.insert(cur_id, true);
-                    stack.push((cur, true));
-                    for next in cur.immediate_dependencies() {
-                        if let Some(is_discovered_but_not_finished) = state.get(&next) {
-                            if *is_discovered_but_not_finished {
-                                let cycle_path: Vec<_> = stack
-                                    .iter()
-                                    .filter(|(_, is_exit)| *is_exit)
-                                    .map(|(m, _)| m.self_id().to_string())
-                                    .collect();
-                                println!(
-                                    "Cycle detected: {} -> {} -> {}",
-                                    module_id,
-                                    cycle_path.join(" -> "),
-                                    module_id,
-                                );
-                            }
-                        } else {
-                            stack.push((code_cache.get_module(&next)?, false));
-                        }
-                    }
-                }
-            }
-            println!("Re-run with --ignore-breaking-changes to publish anyway.")
-        },
-        VMStatus::Error {
-            status_code: MISSING_DEPENDENCY,
-            ..
-        } => {
-            let err_indices = error_clone.indices();
-            let mut diags = Diagnostics::new();
-            for (ind_kind, table_ind) in err_indices {
-                if let IndexKind::FunctionHandle = ind_kind {
-                    let native_function = &(module.function_defs())[*table_ind as usize];
-                    let fh = module.function_handle_at(native_function.function);
-                    let mh = module.module_handle_at(fh.module);
-                    let function_source_map = unit
-                        .unit
-                        .source_map()
-                        .get_function_source_map(FunctionDefinitionIndex(*table_ind));
-                    if let Ok(map) = function_source_map {
-                        let err_string = format!(
-                            "Missing implementation for the native function {}::{}",
-                            module.identifier_at(mh.name).as_str(),
-                            module.identifier_at(fh.name).as_str()
-                        );
-                        let diag = Diagnostic::new(
-                            diagnostics::codes::Declarations::InvalidFunction,
-                            (map.definition_location, err_string),
-                            Vec::<(Loc, String)>::new(),
-                            Vec::<String>::new(),
-                        );
-                        diags.add(diag);
-                    }
-                }
-            }
-            report_diagnostics(&files, diags)
-        },
-        VMStatus::Error { status_code, .. } => {
-            println!("Publishing failed with unexpected error {:?}", status_code)
-        },
-        VMStatus::Executed | VMStatus::MoveAbort(..) | VMStatus::ExecutionFailure { .. } => {
-            unreachable!()
-        },
-    }
-
-    Ok(())
-}
-
-/// Explain an execution error
-pub(crate) fn explain_execution_error(
-    error_descriptions: &ErrorMapping,
-    error: VMError,
-    state: &OnDiskStateView,
-    script_type_parameters: &[AbilitySet],
-    script_parameters: &[SignatureToken],
-    vm_type_args: &[TypeTag],
-    signers: &[AccountAddress],
-    txn_args: &[TransactionArgument],
-) -> Result<()> {
-    use StatusCode::*;
-    match error.into_vm_status() {
-        VMStatus::MoveAbort(AbortLocation::Module(id), abort_code) => {
-            // try to use move-explain to explain the abort
-
-            print!(
-                "Execution aborted with code {} in module {}.",
-                abort_code, id
-            );
-
-            if let Some(error_desc) =
-                error_descriptions.get_explanation(&id.to_string(), abort_code)
-            {
-                println!(
-                    " Abort code details:\nName: {}\nDescription:{}",
-                    error_desc.code_name, error_desc.code_description,
-                )
-            } else {
-                println!()
-            }
-        },
-        VMStatus::MoveAbort(AbortLocation::Script, abort_code) => {
-            // TODO: map to source code location
-            println!(
-                "Execution aborted with code {} in transaction script",
-                abort_code
-            )
-        },
-        VMStatus::ExecutionFailure {
-            status_code,
-            location,
-            function,
-            code_offset,
-            ..
-        } => {
-            let status_explanation = match status_code {
-                RESOURCE_ALREADY_EXISTS => "a RESOURCE_ALREADY_EXISTS error (i.e., \
-                                            `move_to<T>(account)` when there is already a \
-                                            resource of type `T` under `account`)"
-                    .to_string(),
-                MISSING_DATA => "a RESOURCE_DOES_NOT_EXIST error (i.e., `move_from<T>(a)`, \
-                                 `borrow_global<T>(a)`, or `borrow_global_mut<T>(a)` when there \
-                                 is no resource of type `T` at address `a`)"
-                    .to_string(),
-                ARITHMETIC_ERROR => "an arithmetic error (i.e., integer overflow/underflow, \
-                                     div/mod by zero, or invalid shift)"
-                    .to_string(),
-                VECTOR_OPERATION_ERROR => "an error originated from vector operations (i.e., \
-                                           index out of bound, pop an empty vector, or unpack a \
-                                           vector with a wrong parity)"
-                    .to_string(),
-                EXECUTION_STACK_OVERFLOW => "an execution stack overflow".to_string(),
-                CALL_STACK_OVERFLOW => "a call stack overflow".to_string(),
-                OUT_OF_GAS => "an out of gas error".to_string(),
-                _ => format!("a {} error", status_code.status_type()),
-            };
-            // TODO: map to source code location
-            let location_explanation = match location {
-                AbortLocation::Module(id) => {
-                    format!("{}::{}", id, state.resolve_function(&id, function)?)
-                },
-                AbortLocation::Script => "script".to_string(),
-            };
-            println!(
-                "Execution failed because of {} in {} at code offset {}",
-                status_explanation, location_explanation, code_offset
-            )
-        },
-        VMStatus::Error {
-            status_code: NUMBER_OF_TYPE_ARGUMENTS_MISMATCH,
-            ..
-        } => println!(
-            "Execution failed with incorrect number of type arguments: script expected {:?}, but \
-             found {:?}",
-            script_type_parameters.len(),
-            vm_type_args.len()
-        ),
-        VMStatus::Error {
-            status_code: TYPE_MISMATCH,
-            ..
-        } => explain_type_error(script_parameters, signers, txn_args),
-        VMStatus::Error {
-            status_code: LINKER_ERROR,
-            ..
-        } => {
-            // TODO: is this the only reason we can see LINKER_ERROR?
-            // Can we also see it if someone manually deletes modules in storage?
-            println!(
-                "Execution failed due to unresolved type argument(s) (i.e., `--type-args \
-                 0x1::M:T` when there is no module named M at 0x1 or no type named T in module \
-                 0x1::M)"
-            );
-        },
-        VMStatus::Error { status_code, .. } => {
-            println!("Execution failed with unexpected error {:?}", status_code)
-        },
-        VMStatus::Executed => unreachable!(),
-    }
-    Ok(())
-}
-
-/// Return `true` if `path` is a Move bytecode file based on its extension
-pub(crate) fn is_bytecode_file(path: &Path) -> bool {
-    path.extension()
-        .map_or(false, |ext| ext == MOVE_COMPILED_EXTENSION)
-}
-
-/// Return `true` if path contains a valid Move bytecode module
-pub(crate) fn contains_module(path: &Path) -> bool {
-    is_bytecode_file(path)
-        && match fs::read(path) {
-            Ok(bytes) => CompiledModule::deserialize(&bytes).is_ok(),
-            Err(_) => false,
-        }
-}
diff --git a/third_party/move/tools/move-cli/src/sandbox/utils/on_disk_state_view.rs b/third_party/move/tools/move-cli/src/sandbox/utils/on_disk_state_view.rs
deleted file mode 100644
index 077ed17ec1dd9..0000000000000
--- a/third_party/move/tools/move-cli/src/sandbox/utils/on_disk_state_view.rs
+++ /dev/null
@@ -1,438 +0,0 @@
-// Copyright (c) The Diem Core Contributors
-// Copyright (c) The Move Contributors
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::{BCS_EXTENSION, DEFAULT_BUILD_DIR, DEFAULT_STORAGE_DIR};
-use anyhow::{anyhow, bail, Result};
-use bytes::Bytes;
-use move_binary_format::{
-    access::ModuleAccess,
-    binary_views::BinaryIndexedView,
-    errors::PartialVMError,
-    file_format::{CompiledModule, CompiledScript, FunctionDefinitionIndex},
-};
-use move_bytecode_utils::compiled_module_viewer::CompiledModuleView;
-use move_command_line_common::files::MOVE_COMPILED_EXTENSION;
-use move_core_types::{
-    account_address::AccountAddress,
-    identifier::Identifier,
-    language_storage::{ModuleId, StructTag, TypeTag},
-    metadata::Metadata,
-    parser,
-    resolver::{resource_size, ModuleResolver, ResourceResolver},
-    value::MoveTypeLayout,
-    vm_status::StatusCode,
-};
-use move_disassembler::disassembler::Disassembler;
-use move_ir_types::location::Spanned;
-use move_resource_viewer::{AnnotatedMoveStruct, MoveValueAnnotator};
-use std::{
-    fmt::Debug,
-    fs,
-    path::{Path, PathBuf},
-};
-
-/// subdirectory of `DEFAULT_STORAGE_DIR/<addr>` where resources are stored
-pub const RESOURCES_DIR: &str = "resources";
-/// subdirectory of `DEFAULT_STORAGE_DIR/<addr>` where modules are stored
-pub const MODULES_DIR: &str = "modules";
-
-/// file under `DEFAULT_BUILD_DIR` where a registry of generated struct layouts are stored
-pub const STRUCT_LAYOUTS_FILE: &str = "struct_layouts.yaml";
-
-#[derive(Debug, Clone)]
-pub struct OnDiskStateView {
-    build_dir: PathBuf,
-    storage_dir: PathBuf,
-}
-
-impl OnDiskStateView {
-    /// Create an `OnDiskStateView` that reads/writes resource data and modules in `storage_dir`.
-    pub fn create<P: Into<PathBuf>>(build_dir: P, storage_dir: P) -> Result<Self> {
-        let build_dir = build_dir.into();
-        if !build_dir.exists() {
-            fs::create_dir_all(&build_dir)?;
-        }
-
-        let storage_dir = storage_dir.into();
-        if !storage_dir.exists() {
-            fs::create_dir_all(&storage_dir)?;
-        }
-
-        Ok(Self {
-            build_dir,
-            // it is important to canonicalize the path here because `is_data_path()` relies on the
-            // fact that storage_dir is canonicalized.
-            storage_dir: storage_dir.canonicalize()?,
-        })
-    }
-
-    pub fn build_dir(&self) -> &PathBuf {
-        &self.build_dir
-    }
-
-    pub fn struct_layouts_file(&self) -> PathBuf {
-        self.build_dir.join(STRUCT_LAYOUTS_FILE)
-    }
-
-    fn is_data_path(&self, p: &Path, parent_dir: &str) -> bool {
-        if !p.exists() {
-            return false;
-        }
-        let p = p.canonicalize().unwrap();
-        p.starts_with(&self.storage_dir)
-            && match p.parent() {
-                Some(parent) => parent.ends_with(parent_dir),
-                None => false,
-            }
-    }
-
-    pub fn is_resource_path(&self, p: &Path) -> bool {
-        self.is_data_path(p, RESOURCES_DIR)
-    }
-
-    pub fn is_module_path(&self, p: &Path) -> bool {
-        self.is_data_path(p, MODULES_DIR)
-    }
-
-    fn get_addr_path(&self, addr: &AccountAddress) -> PathBuf {
-        let mut path = self.storage_dir.clone();
-        path.push(format!("0x{}", addr.to_hex()));
-        path
-    }
-
-    fn get_resource_path(&self, addr: AccountAddress, tag: StructTag) -> PathBuf {
-        let mut path = self.get_addr_path(&addr);
-        path.push(RESOURCES_DIR);
-        path.push(StructID(tag).to_string());
-        path.with_extension(BCS_EXTENSION)
-    }
-
-    fn get_module_path(&self, module_id: &ModuleId) -> PathBuf {
-        let mut path = self.get_addr_path(module_id.address());
-        path.push(MODULES_DIR);
-        path.push(module_id.name().to_string());
-        path.with_extension(MOVE_COMPILED_EXTENSION)
-    }
-
-    /// Extract a module ID from a path
-    pub fn get_module_id(&self, p: &Path) -> Option<ModuleId> {
-        if !self.is_module_path(p) {
-            return None;
-        }
-        let name = Identifier::new(p.file_stem().unwrap().to_str().unwrap()).unwrap();
-        match p.parent().and_then(|parent| parent.parent()) {
-            Some(parent) => {
-                let addr =
-                    AccountAddress::from_hex_literal(parent.file_stem().unwrap().to_str().unwrap())
-                        .unwrap();
-                Some(ModuleId::new(addr, name))
-            },
-            None => None,
-        }
-    }
-
-    /// Read the resource bytes stored on-disk at `addr`/`tag`
-    pub fn get_resource_bytes(
-        &self,
-        addr: AccountAddress,
-        tag: StructTag,
-    ) -> Result<Option<Bytes>> {
-        Self::get_bytes(&self.get_resource_path(addr, tag))
-    }
-
-    /// Read the resource bytes stored on-disk at `addr`/`tag`
-    fn get_module_bytes(&self, module_id: &ModuleId) -> Result<Option<Bytes>> {
-        Self::get_bytes(&self.get_module_path(module_id))
-    }
-
-    /// Check if a module at `addr`/`module_id` exists
-    pub fn has_module(&self, module_id: &ModuleId) -> bool {
-        self.get_module_path(module_id).exists()
-    }
-
-    /// Return the name of the function at `idx` in `module_id`
-    pub fn resolve_function(&self, module_id: &ModuleId, idx: u16) -> Result<Identifier> {
-        let m = self.view_compiled_module(module_id)?.unwrap();
-        Ok(m.identifier_at(
-            m.function_handle_at(m.function_def_at(FunctionDefinitionIndex(idx)).function)
-                .name,
-        )
-        .to_owned())
-    }
-
-    fn get_bytes(path: &Path) -> Result<Option<Bytes>> {
-        Ok(if path.exists() {
-            Some(fs::read(path)?.into())
-        } else {
-            None
-        })
-    }
-
-    /// Returns a deserialized representation of the resource value stored at `resource_path`.
-    /// Returns Err if the path does not hold a resource value or the resource cannot be deserialized
-    pub fn view_resource(&self, resource_path: &Path) -> Result<Option<AnnotatedMoveStruct>> {
-        if resource_path.is_dir() {
-            bail!(
-                "Bad resource path {:?}. Needed file, found directory",
-                resource_path
-            )
-        }
-        match resource_path.file_stem() {
-            None => bail!(
-                "Bad resource path {:?}; last component must be a file",
-                resource_path
-            ),
-            Some(name) => Ok({
-                let id = match parser::parse_type_tag(&name.to_string_lossy())? {
-                    TypeTag::Struct(s) => s,
-                    t => bail!("Expected to parse struct tag, but got {}", t),
-                };
-                match Self::get_bytes(resource_path)? {
-                    Some(resource_data) => Some(
-                        MoveValueAnnotator::new(self.clone()).view_resource(&id, &resource_data)?,
-                    ),
-                    None => None,
-                }
-            }),
-        }
-    }
-
-    fn view_bytecode(path: &Path, is_module: bool) -> Result<Option<String>> {
-        if path.is_dir() {
-            bail!("Bad bytecode path {:?}. Needed file, found directory", path)
-        }
-
-        Ok(match Self::get_bytes(path)? {
-            Some(bytes) => {
-                let module: CompiledModule;
-                let script: CompiledScript;
-                let view = if is_module {
-                    module = CompiledModule::deserialize(&bytes)
-                        .map_err(|e| anyhow!("Failure deserializing module: {:?}", e))?;
-                    BinaryIndexedView::Module(&module)
-                } else {
-                    script = CompiledScript::deserialize(&bytes)
-                        .map_err(|e| anyhow!("Failure deserializing script: {:?}", e))?;
-                    BinaryIndexedView::Script(&script)
-                };
-                // TODO: find or create source map and pass it to disassembler
-                let d: Disassembler =
-                    Disassembler::from_view(view, Spanned::unsafe_no_loc(()).loc)?;
-                Some(d.disassemble()?)
-            },
-            None => None,
-        })
-    }
-
-    pub fn view_module(module_path: &Path) -> Result<Option<String>> {
-        Self::view_bytecode(module_path, true)
-    }
-
-    pub fn view_script(script_path: &Path) -> Result<Option<String>> {
-        Self::view_bytecode(script_path, false)
-    }
-
-    /// Delete resource stored on disk at the path `addr`/`tag`
-    pub fn delete_resource(&self, addr: AccountAddress, tag: StructTag) -> Result<()> {
-        let path = self.get_resource_path(addr, tag);
-        fs::remove_file(path)?;
-
-        // delete addr directory if this address is now empty
-        let addr_path = self.get_addr_path(&addr);
-        if addr_path.read_dir()?.next().is_none() {
-            fs::remove_dir(addr_path)?
-        }
-        Ok(())
-    }
-
-    pub fn save_resource(
-        &self,
-        addr: AccountAddress,
-        tag: StructTag,
-        bcs_bytes: &[u8],
-    ) -> Result<()> {
-        let path = self.get_resource_path(addr, tag);
-        if !path.exists() {
-            fs::create_dir_all(path.parent().unwrap())?;
-        }
-        Ok(fs::write(path, bcs_bytes)?)
-    }
-
-    /// Save `module` on disk under the path `module.address()`/`module.name()`
-    pub fn save_module(&self, module_id: &ModuleId, module_bytes: &[u8]) -> Result<()> {
-        let path = self.get_module_path(module_id);
-        if !path.exists() {
-            fs::create_dir_all(path.parent().unwrap())?
-        }
-        Ok(fs::write(path, module_bytes)?)
-    }
-
-    /// Save the YAML encoding `layout` on disk under `build_dir/layouts/id`.
-    pub fn save_struct_layouts(&self, layouts: &str) -> Result<()> {
-        let layouts_file = self.struct_layouts_file();
-        if !layouts_file.exists() {
-            fs::create_dir_all(layouts_file.parent().unwrap())?
-        }
-        Ok(fs::write(layouts_file, layouts)?)
-    }
-
-    /// Save all the modules in the local cache, re-generate mv_interfaces if required.
-    pub fn save_modules<'a>(
-        &self,
-        modules: impl IntoIterator<Item = &'a (ModuleId, Bytes)>,
-    ) -> Result<()> {
-        for (module_id, module_bytes) in modules {
-            self.save_module(module_id, module_bytes)?;
-        }
-        Ok(())
-    }
-
-    pub fn delete_module(&self, id: &ModuleId) -> Result<()> {
-        let path = self.get_module_path(id);
-        fs::remove_file(path)?;
-
-        // delete addr directory if this address is now empty
-        let addr_path = self.get_addr_path(id.address());
-        if addr_path.read_dir()?.next().is_none() {
-            fs::remove_dir(addr_path)?
-        }
-        Ok(())
-    }
-
-    fn iter_paths<F>(&self, f: F) -> impl Iterator<Item = PathBuf>
-    where
-        F: FnOnce(&Path) -> bool + Copy,
-    {
-        walkdir::WalkDir::new(&self.storage_dir)
-            .follow_links(true)
-            .into_iter()
-            .filter_map(|e| e.ok())
-            .map(|e| e.path().to_path_buf())
-            .filter(move |path| f(path))
-    }
-
-    pub fn resource_paths(&self) -> impl Iterator<Item = PathBuf> + '_ {
-        self.iter_paths(move |p| self.is_resource_path(p))
-    }
-
-    pub fn module_paths(&self) -> impl Iterator<Item = PathBuf> + '_ {
-        self.iter_paths(move |p| self.is_module_path(p))
-    }
-
-    /// Build all modules in the self.storage_dir.
-    /// Returns an Err if a module does not deserialize.
-    pub fn get_all_modules(&self) -> Result<Vec<CompiledModule>> {
-        self.module_paths()
-            .map(|path| {
-                CompiledModule::deserialize(&Self::get_bytes(&path)?.unwrap())
-                    .map_err(|e| anyhow!("Failed to deserialized module: {:?}", e))
-            })
-            .collect::<Result<Vec<CompiledModule>>>()
-    }
-}
-
-impl ModuleResolver for OnDiskStateView {
-    type Error = PartialVMError;
-
-    fn get_module_metadata(&self, _module_id: &ModuleId) -> Vec<Metadata> {
-        vec![]
-    }
-
-    fn get_module(&self, module_id: &ModuleId) -> Result<Option<Bytes>, Self::Error> {
-        self.get_module_bytes(module_id).map_err(|e| {
-            PartialVMError::new(StatusCode::STORAGE_ERROR)
-                .with_message(format!("Storage error: {:?}", e))
-        })
-    }
-}
-
-impl ResourceResolver for OnDiskStateView {
-    type Error = PartialVMError;
-
-    fn get_resource_bytes_with_metadata_and_layout(
-        &self,
-        address: &AccountAddress,
-        struct_tag: &StructTag,
-        _metadata: &[Metadata],
-        _maybe_layout: Option<&MoveTypeLayout>,
-    ) -> Result<(Option<Bytes>, usize), Self::Error> {
-        let buf = self
-            .get_resource_bytes(*address, struct_tag.clone())
-            .map_err(|e| {
-                PartialVMError::new(StatusCode::STORAGE_ERROR)
-                    .with_message(format!("Storage error: {:?}", e))
-            })?;
-        let buf_size = resource_size(&buf);
-        Ok((buf, buf_size))
-    }
-}
-
-impl CompiledModuleView for OnDiskStateView {
-    type Item = CompiledModule;
-
-    fn view_compiled_module(&self, id: &ModuleId) -> anyhow::Result<Option<Self::Item>> {
-        if let Some(bytes) = self.get_module_bytes(id)? {
-            let module = CompiledModule::deserialize(&bytes)
-                .map_err(|e| anyhow!("Failure deserializing module {}: {:?}", id, e))?;
-            Ok(Some(module))
-        } else {
-            bail!("Module {} not found", id)
-        }
-    }
-}
-
-impl Default for OnDiskStateView {
-    fn default() -> Self {
-        OnDiskStateView::create(Path::new(DEFAULT_BUILD_DIR), Path::new(DEFAULT_STORAGE_DIR))
-            .expect("Failure creating OnDiskStateView")
-    }
-}
-
-// wrappers of TypeTag, StructTag, Vec<TypeTag> to allow us to implement the FromStr/ToString traits
-#[derive(Debug)]
-struct TypeID(TypeTag);
-#[derive(Debug)]
-struct StructID(StructTag);
-#[derive(Debug)]
-struct Generics(Vec<TypeTag>);
-
-impl ToString for TypeID {
-    fn to_string(&self) -> String {
-        match &self.0 {
-            TypeTag::Struct(s) => StructID(*s.clone()).to_string(),
-            TypeTag::Vector(t) => format!("vector<{}>", TypeID(*t.clone()).to_string()),
-            t => t.to_string(),
-        }
-    }
-}
-
-impl ToString for StructID {
-    fn to_string(&self) -> String {
-        let tag = &self.0;
-        // TODO: TypeTag parser insists on leading 0x for StructTag's, so we insert one here.
-        // Would be nice to expose a StructTag parser and get rid of the 0x here
-        format!(
-            "0x{}::{}::{}{}",
-            tag.address.to_hex(),
-            tag.module,
-            tag.name,
-            Generics(tag.type_args.clone()).to_string()
-        )
-    }
-}
-
-impl ToString for Generics {
-    fn to_string(&self) -> String {
-        if self.0.is_empty() {
-            "".to_string()
-        } else {
-            let generics: Vec<String> = self
-                .0
-                .iter()
-                .map(|t| TypeID(t.clone()).to_string())
-                .collect();
-            format!("<{}>", generics.join(","))
-        }
-    }
-}
diff --git a/third_party/move/tools/move-cli/src/sandbox/utils/package_context.rs b/third_party/move/tools/move-cli/src/sandbox/utils/package_context.rs
deleted file mode 100644
index 644114bf69bda..0000000000000
--- a/third_party/move/tools/move-cli/src/sandbox/utils/package_context.rs
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright (c) The Diem Core Contributors
-// Copyright (c) The Move Contributors
-// SPDX-License-Identifier: Apache-2.0
-use crate::{sandbox::utils::OnDiskStateView, DEFAULT_BUILD_DIR};
-use anyhow::Result;
-use move_command_line_common::env::get_bytecode_version_from_env;
-use move_package::{compilation::compiled_package::CompiledPackage, BuildConfig};
-use std::path::{Path, PathBuf};
-
-/// The PackageContext controls the package that the CLI is executing with respect to, and handles the
-/// creation of the `OnDiskStateView` with the package's dependencies.
-pub struct PackageContext {
-    package: CompiledPackage,
-    build_dir: PathBuf,
-}
-
-impl PackageContext {
-    pub fn new(path: &Option<PathBuf>, build_config: &BuildConfig) -> Result<Self> {
-        let path = path.as_deref().unwrap_or_else(|| Path::new("."));
-        let build_dir = build_config
-            .install_dir
-            .as_ref()
-            .unwrap_or(&PathBuf::from(DEFAULT_BUILD_DIR))
-            .clone();
-        let package = build_config
-            .clone()
-            .compile_package(path, &mut Vec::new())?;
-        Ok(PackageContext { package, build_dir })
-    }
-
-    /// Prepare an OnDiskStateView that is ready to use. Library modules will be preloaded into the
-    /// storage if `load_libraries` is true.
-    ///
-    /// NOTE: this is the only way to get a state view in Move CLI, and thus, this function needs
-    /// to be run before every command that needs a state view, i.e., `publish`, `run`,
-    /// `view`, and `doctor`.
-    pub fn prepare_state(
-        &self,
-        bytecode_version: Option<u32>,
-        storage_dir: &Path,
-    ) -> Result<OnDiskStateView> {
-        let bytecode_version = get_bytecode_version_from_env(bytecode_version);
-        let state = OnDiskStateView::create(self.build_dir.as_path(), storage_dir)?;
-
-        // preload the storage with library modules (if such modules do not exist yet)
-        let package = self.package();
-        let new_modules = package
-            .deps_compiled_units
-            .iter()
-            .map(|(_, unit)| match &unit.unit {
-                move_compiler::compiled_unit::CompiledUnitEnum::Module(m) => &m.module,
-                _ => unreachable!(),
-            })
-            .filter(|m| !state.has_module(&m.self_id()));
-
-        let mut serialized_modules = vec![];
-        for module in new_modules {
-            let self_id = module.self_id();
-            let mut module_bytes = vec![];
-            module.serialize_for_version(bytecode_version, &mut module_bytes)?;
-            serialized_modules.push((self_id, module_bytes.into()));
-        }
-        state.save_modules(&serialized_modules)?;
-
-        Ok(state)
-    }
-
-    pub fn package(&self) -> &CompiledPackage {
-        &self.package
-    }
-}
-
-impl Default for PackageContext {
-    fn default() -> Self {
-        Self::new(&None, &BuildConfig::default()).unwrap()
-    }
-}
diff --git a/third_party/move/tools/move-cli/src/test/mod.rs b/third_party/move/tools/move-cli/src/test/mod.rs
new file mode 100644
index 0000000000000..83b10ca3f00e5
--- /dev/null
+++ b/third_party/move/tools/move-cli/src/test/mod.rs
@@ -0,0 +1,418 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{DEFAULT_BUILD_DIR, DEFAULT_STORAGE_DIR};
+use move_binary_format::CompiledModule;
+use move_command_line_common::{
+    env::{read_bool_env_var, NO_COLOR_MODE_ENV_VAR},
+    files::{find_filenames, path_to_string},
+    testing::{
+        add_update_baseline_fix, format_diff, get_compiler_exp_extension, read_env_update_baseline,
+    },
+};
+use move_compiler::{
+    command_line::COLOR_MODE_ENV_VAR,
+    compiled_unit::{CompiledUnit, NamedCompiledModule},
+};
+use move_coverage::coverage_map::{CoverageMap, ExecCoverageMapWithModules};
+use move_package::{
+    compilation::{compiled_package::OnDiskCompiledPackage, package_layout::CompiledPackageLayout},
+    resolution::resolution_graph::ResolvedGraph,
+    source_package::{layout::SourcePackageLayout, manifest_parser::parse_move_manifest_from_file},
+    BuildConfig,
+};
+use std::{
+    collections::{BTreeMap, HashMap},
+    env,
+    fmt::Write as FmtWrite,
+    fs,
+    fs::File,
+    io,
+    io::{BufRead, Write},
+    path::{Path, PathBuf},
+    process::Command,
+};
+use tempfile::tempdir;
+
+/// Basic datatest testing framework for the CLI. The `run_one` entrypoint expects
+/// an `args.txt` file with arguments that the `move` binary understands (one set
+/// of arguments per line). The testing framework runs the commands, compares the
+/// result to the expected output, and runs `move clean` to discard resources,
+/// modules, and event data created by running the test.
+
+/// If this env var is set, `move clean` will not be run after each test.
+/// this is useful if you want to look at the `storage` or `move_events`
+/// produced by a test. However, you'll have to manually run `move clean`
+/// before re-running the test.
+const NO_MOVE_CLEAN: &str = "NO_MOVE_CLEAN";
+
+/// The filename that contains the arguments to the Move binary.
+pub const TEST_ARGS_FILENAME: &str = "args.txt";
+
+/// Name of the environment variable we need to set in order to get tracing
+/// enabled in the move VM.
+const MOVE_VM_TRACING_ENV_VAR_NAME: &str = "MOVE_VM_TRACE";
+
+/// Name of the environment variable we need to set in order to flush
+/// after every trace call.
+const MOVE_VM_TRACING_FLUSH_ENV_VAR_NAME: &str = "MOVE_VM_TRACE_FLUSH";
+
+/// The default file name (inside the build output dir) for the runtime to
+/// dump the execution trace to. The trace will be used by the coverage tool
+/// if --track-cov is set. If --track-cov is not set, then no trace file will
+/// be produced.
+const DEFAULT_TRACE_FILE: &str = "trace";
+
+pub(crate) fn module(unit: &CompiledUnit) -> anyhow::Result<&CompiledModule> {
+    match unit {
+        CompiledUnit::Module(NamedCompiledModule { module, .. }) => Ok(module),
+        _ => anyhow::bail!("Found script in modules -- this shouldn't happen"),
+    }
+}
+
+fn collect_coverage(
+    trace_file: &Path,
+    build_dir: &Path,
+) -> anyhow::Result<ExecCoverageMapWithModules> {
+    let canonical_build = build_dir.canonicalize().unwrap();
+    let package_name = parse_move_manifest_from_file(
+        &SourcePackageLayout::try_find_root(&canonical_build).unwrap(),
+    )?
+    .package
+    .name
+    .to_string();
+    let pkg = OnDiskCompiledPackage::from_path(
+        &build_dir
+            .join(package_name)
+            .join(CompiledPackageLayout::BuildInfo.path()),
+    )?
+    .into_compiled_package()?;
+    let src_modules = pkg
+        .all_modules()
+        .map(|unit| {
+            let absolute_path = path_to_string(&unit.source_path.canonicalize()?)?;
+            Ok((absolute_path, module(&unit.unit)?.clone()))
+        })
+        .collect::<anyhow::Result<HashMap<_, _>>>()?;
+
+    // build the filter
+    let mut filter = BTreeMap::new();
+    for (entry, module) in src_modules.into_iter() {
+        let module_id = module.self_id();
+        filter
+            .entry(*module_id.address())
+            .or_insert_with(BTreeMap::new)
+            .insert(module_id.name().to_owned(), (entry, module));
+    }
+
+    // collect filtered trace
+    let coverage_map = CoverageMap::from_trace_file(trace_file)
+        .to_unified_exec_map()
+        .into_coverage_map_with_modules(filter);
+
+    Ok(coverage_map)
+}
+
+fn determine_package_nest_depth(
+    resolution_graph: &ResolvedGraph,
+    pkg_dir: &Path,
+) -> anyhow::Result<usize> {
+    let mut depth = 0;
+    for (_, dep) in resolution_graph.package_table.iter() {
+        depth = std::cmp::max(
+            depth,
+            dep.package_path.strip_prefix(pkg_dir)?.components().count() + 1,
+        );
+    }
+    Ok(depth)
+}
+
+fn pad_tmp_path(tmp_dir: &Path, pad_amount: usize) -> anyhow::Result<PathBuf> {
+    let mut tmp_dir = tmp_dir.to_path_buf();
+    for i in 0..pad_amount {
+        tmp_dir.push(format!("{}", i));
+    }
+    std::fs::create_dir_all(&tmp_dir)?;
+    Ok(tmp_dir)
+}
+
+// We need to copy dependencies over (transitively) and at the same time keep the paths valid in
+// the package. To do this we compute the resolution graph for all possible dependencies (so in dev
+// mode) and then calculate the nesting under `tmp_dir` the we need to copy the root package so
+// that it, and all its dependencies reside under `tmp_dir` with the same paths as in the original
+// package manifest.
+fn copy_deps(tmp_dir: &Path, pkg_dir: &Path) -> anyhow::Result<PathBuf> {
+    // Sometimes we run a test that isn't a package for metatests so if there isn't a package we
+    // don't need to nest at all. Resolution graph diagnostics are only needed for CLI commands so
+    // ignore them by passing a vector as the writer.
+    let package_resolution = match (BuildConfig {
+        dev_mode: true,
+        ..Default::default()
+    })
+    .resolution_graph_for_package(pkg_dir, &mut Vec::new())
+    {
+        Ok(pkg) => pkg,
+        Err(_) => return Ok(tmp_dir.to_path_buf()),
+    };
+    let package_nest_depth = determine_package_nest_depth(&package_resolution, pkg_dir)?;
+    let tmp_dir = pad_tmp_path(tmp_dir, package_nest_depth)?;
+    for (_, dep) in package_resolution.package_table.iter() {
+        let source_dep_path = &dep.package_path;
+        let dest_dep_path = tmp_dir.join(dep.package_path.strip_prefix(pkg_dir).unwrap());
+        if !dest_dep_path.exists() {
+            fs::create_dir_all(&dest_dep_path)?;
+        }
+        simple_copy_dir(&dest_dep_path, source_dep_path)?;
+    }
+    Ok(tmp_dir)
+}
+
+fn simple_copy_dir(dst: &Path, src: &Path) -> io::Result<()> {
+    for entry in fs::read_dir(src)? {
+        let src_entry = entry?;
+        let src_entry_path = src_entry.path();
+        let dst_entry_path = dst.join(src_entry.file_name());
+        if src_entry_path.is_dir() {
+            fs::create_dir_all(&dst_entry_path)?;
+            simple_copy_dir(&dst_entry_path, &src_entry_path)?;
+        } else {
+            fs::copy(&src_entry_path, &dst_entry_path)?;
+        }
+    }
+    Ok(())
+}
+
+/// Run the `args_path` batch file with`cli_binary`
+pub fn run_one(
+    args_path: &Path,
+    cli_binary: &Path,
+    use_temp_dir: bool,
+    track_cov: bool,
+) -> anyhow::Result<Option<ExecCoverageMapWithModules>> {
+    let args_file = io::BufReader::new(File::open(args_path)?).lines();
+    let cli_binary_path = cli_binary.canonicalize()?;
+
+    // path where we will run the binary
+    let exe_dir = args_path.parent().unwrap();
+    let temp_dir = if use_temp_dir {
+        // symlink everything in the exe_dir into the temp_dir
+        let dir = tempdir()?;
+        let padded_dir = copy_deps(dir.path(), exe_dir)?;
+        simple_copy_dir(&padded_dir, exe_dir)?;
+        Some((dir, padded_dir))
+    } else {
+        None
+    };
+    let wks_dir = temp_dir.as_ref().map_or(exe_dir, |t| &t.1);
+
+    let storage_dir = wks_dir.join(DEFAULT_STORAGE_DIR);
+    let build_output = wks_dir
+        .join(DEFAULT_BUILD_DIR)
+        .join(CompiledPackageLayout::Root.path());
+
+    // template for preparing a cli command
+    let cli_command_template = || {
+        let mut command = Command::new(cli_binary_path.clone());
+        if let Some(work_dir) = temp_dir.as_ref() {
+            command.current_dir(&work_dir.1);
+        } else {
+            command.current_dir(exe_dir);
+        }
+        command
+    };
+
+    if storage_dir.exists() {
+        fs::remove_dir_all(&storage_dir)?;
+    }
+
+    if build_output.exists() {
+        fs::remove_dir_all(&build_output)?;
+    }
+    let mut output = "".to_string();
+
+    // always use the absolute path for the trace file as we may change dirs in the process
+    let trace_file = if track_cov {
+        Some(wks_dir.canonicalize()?.join(DEFAULT_TRACE_FILE))
+    } else {
+        None
+    };
+
+    // Disable colors in error reporting from the Move compiler
+    env::set_var(COLOR_MODE_ENV_VAR, "NONE");
+    // Disable colors in error reporting from other tools.
+    env::set_var(NO_COLOR_MODE_ENV_VAR, "true");
+    for args_line in args_file {
+        let args_line = args_line?;
+
+        if let Some(external_cmd) = args_line.strip_prefix('>') {
+            let external_cmd = external_cmd.trim_start();
+            let mut cmd_iter = external_cmd.split_ascii_whitespace();
+
+            let external_program = cmd_iter.next().expect("empty external command");
+
+            let mut command = Command::new(external_program);
+            command.args(cmd_iter);
+            if let Some(work_dir) = temp_dir.as_ref() {
+                command.current_dir(&work_dir.1);
+            } else {
+                command.current_dir(exe_dir);
+            }
+            let cmd_output = command.output()?;
+
+            writeln!(&mut output, "External Command `{}`:", external_cmd)?;
+            output += std::str::from_utf8(&cmd_output.stdout)?;
+            output += std::str::from_utf8(&cmd_output.stderr)?;
+
+            continue;
+        }
+
+        if args_line.starts_with('#') {
+            // allow comments in args.txt
+            continue;
+        }
+        let args_iter: Vec<&str> = args_line.split_whitespace().collect();
+        if args_iter.is_empty() {
+            // allow blank lines in args.txt
+            continue;
+        }
+
+        // enable tracing in the VM by setting the env var.
+        match &trace_file {
+            None => {
+                // this check prevents cascading the coverage tracking flag.
+                // in particular, if
+                //   1. we run with move-cli test <path-to-args-A.txt> --track-cov, and
+                //   2. in this <args-A.txt>, there is another command: test <args-B.txt>
+                // then, when running <args-B.txt>, coverage will not be tracked nor printed
+                env::remove_var(MOVE_VM_TRACING_ENV_VAR_NAME);
+            },
+            Some(path) => {
+                env::set_var(MOVE_VM_TRACING_ENV_VAR_NAME, path.as_os_str());
+                env::set_var(MOVE_VM_TRACING_FLUSH_ENV_VAR_NAME, path.as_os_str());
+            },
+        }
+
+        let cmd_output = cli_command_template().args(args_iter).output()?;
+        writeln!(&mut output, "Command `{}`:", args_line)?;
+        output += std::str::from_utf8(&cmd_output.stdout)?;
+        output += std::str::from_utf8(&cmd_output.stderr)?;
+    }
+
+    // collect coverage information
+    let cov_info = match &trace_file {
+        None => None,
+        Some(trace_path) => {
+            if trace_path.exists() {
+                Some(collect_coverage(trace_path, &build_output)?)
+            } else {
+                eprintln!(
+                    "Trace file {:?} not found: coverage is only available with at least one `run` \
+                    command in the args.txt (after a `clean`, if there is one)",
+                    trace_path
+                );
+                None
+            }
+        },
+    };
+
+    // post-test cleanup and cleanup checks
+    // check that the test command didn't create a src dir
+    let run_move_clean = !read_bool_env_var(NO_MOVE_CLEAN);
+    if run_move_clean {
+        if storage_dir.exists() {
+            fs::remove_dir_all(&storage_dir)?;
+        }
+        if build_output.exists() {
+            fs::remove_dir_all(&build_output)?;
+        }
+
+        // check that build and storage was deleted
+        assert!(
+            !storage_dir.exists(),
+            "`move clean` failed to eliminate {} directory",
+            DEFAULT_STORAGE_DIR
+        );
+        assert!(
+            !build_output.exists(),
+            "`move clean` failed to eliminate {} directory",
+            DEFAULT_BUILD_DIR
+        );
+
+        // clean the trace file as well if it exists
+        if let Some(trace_path) = &trace_file {
+            if trace_path.exists() {
+                fs::remove_file(trace_path)?;
+            }
+        }
+    }
+
+    // release the temporary workspace explicitly
+    if let Some((t, _)) = temp_dir {
+        t.close()?;
+    }
+
+    // compare output and exp_file
+    let update_baseline = read_env_update_baseline();
+
+    let exp_ext = get_compiler_exp_extension();
+    let exp_path = args_path.with_extension(exp_ext);
+    if update_baseline {
+        fs::write(exp_path, &output)?;
+        return Ok(cov_info);
+    }
+
+    let expected_output = fs::read_to_string(exp_path).unwrap_or_else(|_| "".to_string());
+    if expected_output != output {
+        let msg = format!(
+            "Expected output differs from actual output:\n{}",
+            format_diff(expected_output, output)
+        );
+        anyhow::bail!(add_update_baseline_fix(msg))
+    } else {
+        Ok(cov_info)
+    }
+}
+
+pub fn run_all(
+    args_path: &Path,
+    cli_binary: &Path,
+    use_temp_dir: bool,
+    track_cov: bool,
+) -> anyhow::Result<()> {
+    let mut test_total: u64 = 0;
+    let mut test_passed: u64 = 0;
+    let mut cov_info = ExecCoverageMapWithModules::empty();
+
+    // find `args.txt` and iterate over them
+    for entry in find_filenames(&[args_path], |fpath| {
+        fpath.file_name().expect("unexpected file entry path") == TEST_ARGS_FILENAME
+    })? {
+        match run_one(Path::new(&entry), cli_binary, use_temp_dir, track_cov) {
+            Ok(cov_opt) => {
+                test_passed = test_passed.checked_add(1).unwrap();
+                if let Some(cov) = cov_opt {
+                    cov_info.merge(cov);
+                }
+            },
+            Err(ex) => eprintln!("Test {} failed with error: {}", entry, ex),
+        }
+        test_total = test_total.checked_add(1).unwrap();
+    }
+    println!("{} / {} test(s) passed.", test_passed, test_total);
+
+    // if any test fails, bail
+    let test_failed = test_total.checked_sub(test_passed).unwrap();
+    if test_failed != 0 {
+        anyhow::bail!("{} / {} test(s) failed.", test_failed, test_total)
+    }
+
+    // show coverage information if requested
+    if track_cov {
+        let mut summary_writer: Box<dyn Write> = Box::new(io::stdout());
+        for (_, module_summary) in cov_info.into_module_summaries() {
+            module_summary.summarize_human(&mut summary_writer, true)?;
+        }
+    }
+
+    Ok(())
+}
diff --git a/third_party/move/tools/move-cli/src/utils/mod.rs b/third_party/move/tools/move-cli/src/utils/mod.rs
deleted file mode 100644
index e304f0120bac2..0000000000000
--- a/third_party/move/tools/move-cli/src/utils/mod.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright (c) The Move Contributors
-// SPDX-License-Identifier: Apache-2.0
-
-pub mod movey_credential;
diff --git a/third_party/move/tools/move-cli/src/utils/movey_credential.rs b/third_party/move/tools/move-cli/src/utils/movey_credential.rs
deleted file mode 100644
index ed03b09836e23..0000000000000
--- a/third_party/move/tools/move-cli/src/utils/movey_credential.rs
+++ /dev/null
@@ -1,192 +0,0 @@
-// Copyright (c) The Move Contributors
-// SPDX-License-Identifier: Apache-2.0
-
-use anyhow::{bail, Context, Result};
-use move_command_line_common::movey_constants::{MOVEY_CREDENTIAL_PATH, MOVEY_URL};
-use std::fs;
-use toml_edit::easy::Value;
-
-pub fn get_registry_api_token(move_home: &str) -> Result<String> {
-    if let Ok(content) = get_api_token(move_home) {
-        Ok(content)
-    } else {
-        bail!(
-            "There seems to be an error with your Movey API token. \
-            Please run `move movey-login` and follow the instructions."
-        )
-    }
-}
-
-pub fn get_api_token(move_home: &str) -> Result<String> {
-    let credential_path = format!("{}{}", move_home, MOVEY_CREDENTIAL_PATH);
-    let mut toml: Value = read_credential_file(&credential_path)?;
-    let token = get_registry_field(&mut toml, "token")?;
-    Ok(token.to_string().replace('\"', ""))
-}
-
-pub fn get_movey_url(move_home: &str) -> Result<String> {
-    let credential_path = format!("{}{}", move_home, MOVEY_CREDENTIAL_PATH);
-    let contents = fs::read_to_string(credential_path)?;
-    let mut toml: Value = contents.parse()?;
-
-    let movey_url = get_registry_field(&mut toml, "url");
-    if let Ok(url) = movey_url {
-        Ok(url.to_string().replace('\"', ""))
-    } else {
-        Ok(MOVEY_URL.to_string())
-    }
-}
-
-fn get_registry_field<'a>(toml: &'a mut Value, field: &'a str) -> Result<&'a mut Value> {
-    let registry = toml
-        .as_table_mut()
-        .context(format!("Error parsing {}", MOVEY_CREDENTIAL_PATH))?
-        .get_mut("registry")
-        .context(format!("Error parsing {}", MOVEY_CREDENTIAL_PATH))?;
-    let value = registry
-        .as_table_mut()
-        .context("Error parsing registry table")?
-        .get_mut(field)
-        .context("Error parsing token")?;
-    Ok(value)
-}
-
-pub fn read_credential_file(credential_path: &str) -> Result<Value> {
-    let content = match fs::read_to_string(credential_path) {
-        Ok(content) => content,
-        Err(error) => bail!("Error reading input: {}", error),
-    };
-    content.parse().map_err(|e| {
-        anyhow::Error::from(e).context(format!(
-            "could not parse input at {} as TOML",
-            &credential_path
-        ))
-    })
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use std::{env, fs::File};
-
-    fn setup_move_home(test_path: &str) -> (String, String) {
-        let cwd = env::current_dir().unwrap();
-        let mut move_home: String = String::from(cwd.to_string_lossy());
-        move_home.push_str(test_path);
-        let credential_path = move_home.clone() + MOVEY_CREDENTIAL_PATH;
-
-        (move_home, credential_path)
-    }
-
-    fn clean_up(move_home: &str) {
-        let _ = fs::remove_dir_all(move_home);
-    }
-
-    #[test]
-    fn get_api_token_works() {
-        let test_path = String::from("/get_api_token_works");
-        let (move_home, credential_path) = setup_move_home(&test_path);
-        let _ = fs::create_dir_all(&move_home);
-        File::create(&credential_path).unwrap();
-
-        let content = r#"
-            [registry]
-            token = "test-token"
-            "#;
-        fs::write(&credential_path, content).unwrap();
-
-        let token = get_registry_api_token(&move_home).unwrap();
-        assert!(token.contains("test-token"));
-
-        clean_up(&move_home)
-    }
-
-    #[test]
-    fn get_api_token_fails_if_there_is_no_move_home_directory() {
-        let test_path = String::from("/get_api_token_fails_if_there_is_no_move_home_directory");
-        let (move_home, _) = setup_move_home(&test_path);
-        let _ = fs::remove_dir_all(&move_home);
-
-        let token = get_registry_api_token(&move_home);
-        assert!(token.is_err());
-
-        clean_up(&move_home)
-    }
-
-    #[test]
-    fn get_api_token_fails_if_there_is_no_credential_file() {
-        let test_path = String::from("/get_api_token_fails_if_there_is_no_credential_file");
-        let (move_home, _) = setup_move_home(&test_path);
-        let _ = fs::remove_dir_all(&move_home);
-        fs::create_dir_all(&move_home).unwrap();
-
-        let token = get_registry_api_token(&move_home);
-        assert!(token.is_err());
-
-        clean_up(&move_home)
-    }
-
-    #[test]
-    fn get_api_token_fails_if_credential_file_is_in_wrong_format() {
-        let test_path = String::from("/get_api_token_fails_if_credential_file_is_in_wrong_format");
-        let (move_home, credential_path) = setup_move_home(&test_path);
-        let _ = fs::remove_dir_all(&move_home);
-        fs::create_dir_all(&move_home).unwrap();
-        File::create(&credential_path).unwrap();
-
-        let missing_double_quote = r#"
-            [registry]
-            token = test-token
-            "#;
-        fs::write(&credential_path, missing_double_quote).unwrap();
-        let token = get_registry_api_token(&move_home);
-        assert!(token.is_err());
-
-        let wrong_token_field = r#"
-            [registry]
-            tokens = "test-token"
-            "#;
-        fs::write(&credential_path, wrong_token_field).unwrap();
-        let token = get_registry_api_token(&move_home);
-        assert!(token.is_err());
-
-        clean_up(&move_home)
-    }
-
-    #[test]
-    fn get_movey_url_works() {
-        let test_path = String::from("/get_movey_url_works");
-        let (move_home, credential_path) = setup_move_home(&test_path);
-        let _ = fs::create_dir_all(&move_home);
-        File::create(&credential_path).unwrap();
-        let content = r#"
-            [registry]
-            token = "test-token"
-            url = "test-url"
-            "#;
-        fs::write(&credential_path, content).unwrap();
-
-        let url = get_movey_url(&move_home).unwrap();
-        assert_eq!(url, "test-url");
-
-        clean_up(&move_home)
-    }
-
-    #[test]
-    fn get_movey_url_returns_default_url_if_url_field_not_existed() {
-        let test_path = String::from("/get_movey_url_returns_default_url_if_url_field_not_existed");
-        let (move_home, credential_path) = setup_move_home(&test_path);
-        let _ = fs::create_dir_all(&move_home);
-        File::create(&credential_path).unwrap();
-        let content = r#"
-            [registry]
-            token = "test-token"
-            "#;
-        fs::write(&credential_path, content).unwrap();
-
-        let url = get_movey_url(&move_home).unwrap();
-        assert_eq!(url, MOVEY_URL);
-
-        clean_up(&move_home)
-    }
-}
diff --git a/third_party/move/tools/move-cli/tests/build_tests/build_with_warnings/args.v2_exp b/third_party/move/tools/move-cli/tests/build_tests/build_with_warnings/args.v2_exp
index 6ef895bd98506..ad68bb1cf49e7 100644
--- a/third_party/move/tools/move-cli/tests/build_tests/build_with_warnings/args.v2_exp
+++ b/third_party/move/tools/move-cli/tests/build_tests/build_with_warnings/args.v2_exp
@@ -13,10 +13,8 @@ module 42.m {
 
 public foo(x: u64): u64 /* def_idx: 0 */ {
 B0:
-	0: LdU64(1)
-	1: LdU64(1)
-	2: Add
-	3: Ret
+	0: LdU64(2)
+	1: Ret
 }
 }
 warning: Unused parameter `x`. Consider removing or prefixing with an underscore: `_x`
diff --git a/third_party/move/tools/move-cli/tests/build_tests/disassemble_script/args.v2_exp b/third_party/move/tools/move-cli/tests/build_tests/disassemble_script/args.v2_exp
index 67120319e8522..908c6e505761d 100644
--- a/third_party/move/tools/move-cli/tests/build_tests/disassemble_script/args.v2_exp
+++ b/third_party/move/tools/move-cli/tests/build_tests/disassemble_script/args.v2_exp
@@ -5,16 +5,14 @@ script {
 
 main() /* def_idx: 0 */ {
 B0:
-	0: LdU64(420)
-	1: LdU64(420)
-	2: Eq
-	3: BrFalse(5)
+	0: LdTrue
+	1: BrFalse(3)
 B1:
-	4: Branch(7)
+	2: Branch(5)
 B2:
-	5: LdU64(0)
-	6: Abort
+	3: LdU64(0)
+	4: Abort
 B3:
-	7: Ret
+	5: Ret
 }
 }
diff --git a/third_party/move/tools/move-cli/tests/build_tests/include_exclude_stdlib/args.exp b/third_party/move/tools/move-cli/tests/build_tests/include_exclude_stdlib/args.exp
index 1d60e31b47be4..0381b2823aacf 100644
--- a/third_party/move/tools/move-cli/tests/build_tests/include_exclude_stdlib/args.exp
+++ b/third_party/move/tools/move-cli/tests/build_tests/include_exclude_stdlib/args.exp
@@ -16,7 +16,7 @@ error[E03002]: unbound module
   ┌─ ./sources/UseSigner.move:6:5
   │
 6 │     signer::address_of(account)
-  │     ^^^^^^ Unbound module alias 'signer'
+  │     ^^^^^^ Unbound module or type alias 'signer'
 
 Command `-d -v build`:
 INCLUDING DEPENDENCY MoveStdlib
diff --git a/third_party/move/tools/move-cli/tests/build_tests/include_exclude_stdlib/args.v2_exp b/third_party/move/tools/move-cli/tests/build_tests/include_exclude_stdlib/args.v2_exp
index c75244dd72bf6..f7e92a4cad5cc 100644
--- a/third_party/move/tools/move-cli/tests/build_tests/include_exclude_stdlib/args.v2_exp
+++ b/third_party/move/tools/move-cli/tests/build_tests/include_exclude_stdlib/args.v2_exp
@@ -16,7 +16,7 @@ error: unbound module
   ┌─ ./sources/UseSigner.move:6:5
   │
 6 │     signer::address_of(account)
-  │     ^^^^^^ Unbound module alias 'signer'
+  │     ^^^^^^ Unbound module or type alias 'signer'
 
 Command `-d -v build`:
 INCLUDING DEPENDENCY MoveStdlib
diff --git a/third_party/move/tools/move-cli/tests/build_testsuite.rs b/third_party/move/tools/move-cli/tests/build_testsuite.rs
index 28466684a4f9b..c4be89f622669 100644
--- a/third_party/move/tools/move-cli/tests/build_testsuite.rs
+++ b/third_party/move/tools/move-cli/tests/build_testsuite.rs
@@ -2,13 +2,13 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
-use move_cli::sandbox::commands::test;
+use move_cli::test::run_one;
 use std::path::{Path, PathBuf};
 
 fn run_all(args_path: &Path) -> datatest_stable::Result<()> {
     let cli_exe = env!("CARGO_BIN_EXE_move");
     let use_temp_dir = !args_path.parent().unwrap().join("NO_TEMPDIR").exists();
-    test::run_one(
+    run_one(
         args_path,
         &PathBuf::from(cli_exe),
         /* use_temp_dir */ use_temp_dir,
diff --git a/third_party/move/tools/move-cli/tests/build_testsuite_evm.rs b/third_party/move/tools/move-cli/tests/build_testsuite_evm.rs
index dd557df942514..f4b6aa8b6d46d 100644
--- a/third_party/move/tools/move-cli/tests/build_testsuite_evm.rs
+++ b/third_party/move/tools/move-cli/tests/build_testsuite_evm.rs
@@ -2,13 +2,13 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
-use move_cli::sandbox::commands::test;
+use move_cli::test::run_one;
 use std::path::{Path, PathBuf};
 
 fn run_all(args_path: &Path) -> datatest_stable::Result<()> {
     let cli_exe = env!("CARGO_BIN_EXE_move");
     let use_temp_dir = !args_path.parent().unwrap().join("NO_TEMPDIR").exists();
-    test::run_one(
+    run_one(
         args_path,
         &PathBuf::from(cli_exe),
         /* use_temp_dir */ use_temp_dir,
diff --git a/third_party/move/tools/move-cli/tests/cli_tests.rs b/third_party/move/tools/move-cli/tests/cli_tests.rs
index ab9406ab921d2..2e8c0177cf9f3 100644
--- a/third_party/move/tools/move-cli/tests/cli_tests.rs
+++ b/third_party/move/tools/move-cli/tests/cli_tests.rs
@@ -2,53 +2,7 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
-use httpmock::{prelude::*, Mock};
-use move_cli::sandbox::commands::test;
-use move_command_line_common::{
-    files,
-    movey_constants::{MOVEY_CREDENTIAL_PATH, MOVEY_URL},
-};
-use serde_json::json;
-#[cfg(unix)]
-use std::fs::File;
-#[cfg(unix)]
-use std::os::unix::fs::PermissionsExt;
-use std::{
-    env, fs,
-    io::Write,
-    path::PathBuf,
-    process::{Command, Stdio},
-};
-use toml_edit::easy::Value;
-
-pub const CLI_METATEST_PATH: [&str; 3] = ["tests", "metatests", "args.txt"];
-
-fn get_cli_binary_path() -> PathBuf {
-    let cli_exe = env!("CARGO_BIN_EXE_move");
-    PathBuf::from(cli_exe)
-}
-
-fn get_metatest_path() -> PathBuf {
-    CLI_METATEST_PATH.iter().collect()
-}
-
-#[test]
-fn run_metatest() {
-    let path_cli_binary = get_cli_binary_path();
-    let path_metatest = get_metatest_path();
-
-    // local workspace + with coverage
-    assert!(test::run_all(&path_metatest, path_cli_binary.as_path(), false, true).is_ok());
-
-    // temp workspace + with coverage
-    assert!(test::run_all(&path_metatest, &path_cli_binary, true, true).is_ok());
-
-    // local workspace + without coverage
-    assert!(test::run_all(&path_metatest, &path_cli_binary, false, false).is_ok());
-
-    // temp workspace + without coverage
-    assert!(test::run_all(&path_metatest, &path_cli_binary, true, false).is_ok());
-}
+use std::{env, process::Command};
 
 #[test]
 fn cross_process_locking_git_deps() {
@@ -68,313 +22,3 @@ fn cross_process_locking_git_deps() {
         .expect("Package2 failed");
     handle.join().unwrap();
 }
-
-const UPLOAD_PACKAGE_PATH: &str = "./tests/upload_tests";
-#[test]
-#[ignore]
-fn upload_package_to_movey_works() {
-    let package_path = format!("{}/valid_package1", UPLOAD_PACKAGE_PATH);
-    init_git(&package_path, true);
-    let server = MockServer::start();
-    let server_mock = mock_movey_upload_with_response_body_and_status_code(&server, 200, None);
-    init_stub_registry_file(&package_path, &server.base_url());
-    let relative_package_path = PathBuf::from(&package_path);
-    let absolute_package_path =
-        files::path_to_string(&relative_package_path.canonicalize().unwrap()).unwrap();
-
-    let cli_exe = env!("CARGO_BIN_EXE_move");
-    let output = Command::new(cli_exe)
-        .env("MOVE_HOME", &absolute_package_path)
-        .current_dir(&absolute_package_path)
-        .args(["movey-upload"])
-        .output()
-        .unwrap();
-
-    server_mock.assert();
-    assert!(output.status.success());
-    let output = String::from_utf8_lossy(output.stdout.as_slice()).to_string();
-    assert!(
-        output.contains("Your package has been successfully uploaded to Movey"),
-        "{}",
-        output
-    );
-
-    clean_up(&absolute_package_path);
-}
-
-#[test]
-#[ignore]
-fn upload_package_to_movey_prints_error_message_if_server_respond_4xx() {
-    let package_path = format!("{}/valid_package2", UPLOAD_PACKAGE_PATH);
-    init_git(&package_path, true);
-    let server = MockServer::start();
-    let server_mock = mock_movey_upload_with_response_body_and_status_code(
-        &server,
-        400,
-        Some("Invalid Api token"),
-    );
-    init_stub_registry_file(&package_path, &server.base_url());
-    let relative_package_path = PathBuf::from(&package_path);
-    let absolute_package_path =
-        files::path_to_string(&relative_package_path.canonicalize().unwrap()).unwrap();
-
-    let cli_exe = env!("CARGO_BIN_EXE_move");
-    let output = Command::new(cli_exe)
-        .env("MOVE_HOME", &absolute_package_path)
-        .current_dir(&absolute_package_path)
-        .args(["movey-upload"])
-        .output()
-        .unwrap();
-
-    server_mock.assert();
-    assert!(!output.status.success());
-    let output = String::from_utf8_lossy(output.stderr.as_slice()).to_string();
-    assert!(output.contains("Error: Invalid Api token"), "{}", output);
-
-    clean_up(&absolute_package_path);
-}
-
-#[test]
-#[ignore]
-fn upload_package_to_movey_prints_hardcoded_error_message_if_server_respond_5xx() {
-    let package_path = format!("{}/valid_package3", UPLOAD_PACKAGE_PATH);
-    init_git(&package_path, true);
-    let server = MockServer::start();
-    let server_mock = mock_movey_upload_with_response_body_and_status_code(
-        &server,
-        500,
-        Some("Invalid Api token"),
-    );
-    init_stub_registry_file(&package_path, &server.base_url());
-    let relative_package_path = PathBuf::from(&package_path);
-    let absolute_package_path =
-        files::path_to_string(&relative_package_path.canonicalize().unwrap()).unwrap();
-
-    let cli_exe = env!("CARGO_BIN_EXE_move");
-    let output = Command::new(cli_exe)
-        .env("MOVE_HOME", &absolute_package_path)
-        .current_dir(&absolute_package_path)
-        .args(["movey-upload"])
-        .output()
-        .unwrap();
-
-    server_mock.assert();
-    assert!(!output.status.success());
-    let output = String::from_utf8_lossy(output.stderr.as_slice()).to_string();
-    assert!(
-        output.contains("Error: An unexpected error occurred. Please try again later"),
-        "{}",
-        output
-    );
-
-    clean_up(&absolute_package_path);
-}
-
-#[test]
-fn upload_package_to_movey_with_no_remote_should_panic() {
-    let package_path = format!("{}/no_git_remote_package", UPLOAD_PACKAGE_PATH);
-    init_git(&package_path, false);
-
-    let cli_exe = env!("CARGO_BIN_EXE_move");
-    let output = Command::new(cli_exe)
-        .current_dir(&package_path)
-        .args(["movey-upload"])
-        .output()
-        .unwrap();
-
-    assert!(!output.status.success());
-    let error = String::from_utf8_lossy(output.stderr.as_slice()).to_string();
-    assert!(error.contains("invalid git repository"));
-
-    clean_up(&package_path);
-}
-
-// is_valid == true: all git commands are run
-// is_valid == false: missing git remote add command
-fn init_git(package_path: &str, is_valid: bool) {
-    Command::new("git")
-        .current_dir(package_path)
-        .args(["init"])
-        .output()
-        .unwrap();
-    Command::new("git")
-        .current_dir(package_path)
-        .args(["add", "."])
-        .output()
-        .unwrap();
-    if is_valid {
-        Command::new("git")
-            .current_dir(package_path)
-            .args([
-                "remote",
-                "add",
-                "test-origin",
-                "git@github.com:move-language/move.git",
-            ])
-            .output()
-            .unwrap();
-        Command::new("git")
-            .current_dir(package_path)
-            .args(["config", "user.email", "\"you@example.com\""])
-            .output()
-            .unwrap();
-        Command::new("git")
-            .current_dir(package_path)
-            .args(["config", "user.name", "\"Your Name\""])
-            .output()
-            .unwrap();
-        Command::new("git")
-            .current_dir(package_path)
-            .args(["commit", "--allow-empty", "-m", "initial commit"])
-            .output()
-            .unwrap();
-    }
-}
-#[test]
-fn save_credential_works() {
-    let cli_exe = env!("CARGO_BIN_EXE_move");
-    let (move_home, credential_path) = setup_move_home("/save_credential_works");
-    assert!(fs::read_to_string(&credential_path).is_err());
-
-    match Command::new(cli_exe)
-        .env("MOVE_HOME", &move_home)
-        .current_dir(".")
-        .args(["movey-login"])
-        .stdin(Stdio::piped())
-        .stdout(Stdio::piped())
-        .spawn()
-    {
-        Ok(child) => {
-            let token = "test_token";
-            child
-                .stdin
-                .as_ref()
-                .unwrap()
-                .write_all(token.as_bytes())
-                .unwrap();
-            match child.wait_with_output() {
-                Ok(output) => {
-                    assert!(String::from_utf8_lossy(&output.stdout).contains(&format!(
-                        "Please paste the API Token found on {}/settings/tokens below",
-                        MOVEY_URL
-                    )));
-                    Ok(())
-                },
-                Err(error) => Err(error),
-            }
-        },
-        Err(error) => Err(error),
-    }
-    .unwrap();
-
-    let contents = fs::read_to_string(&credential_path).expect("Unable to read file");
-    let mut toml: Value = contents.parse().unwrap();
-    let registry = toml.as_table_mut().unwrap().get_mut("registry").unwrap();
-    let token = registry.as_table_mut().unwrap().get_mut("token").unwrap();
-    assert!(token.to_string().contains("test_token"));
-
-    let _ = fs::remove_dir_all(move_home);
-}
-
-#[cfg(unix)]
-#[test]
-fn save_credential_fails_if_undeletable_credential_file_exists() {
-    let cli_exe = env!("CARGO_BIN_EXE_move");
-    let (move_home, credential_path) =
-        setup_move_home("/save_credential_fails_if_undeletable_credential_file_exists");
-    let file = File::create(&credential_path).unwrap();
-    let mut perms = file.metadata().unwrap().permissions();
-    perms.set_mode(0o000);
-    file.set_permissions(perms).unwrap();
-
-    match std::process::Command::new(cli_exe)
-        .env("MOVE_HOME", &move_home)
-        .current_dir(".")
-        .args(["movey-login"])
-        .stdin(Stdio::piped())
-        .stdout(Stdio::piped())
-        .stderr(Stdio::piped())
-        .spawn()
-    {
-        Ok(child) => {
-            let token = "test_token";
-            child
-                .stdin
-                .as_ref()
-                .unwrap()
-                .write_all(token.as_bytes())
-                .unwrap();
-            match child.wait_with_output() {
-                Ok(output) => {
-                    assert!(String::from_utf8_lossy(&output.stdout).contains(&format!(
-                        "Please paste the API Token found on {}/settings/tokens below",
-                        MOVEY_URL
-                    )));
-                    assert!(String::from_utf8_lossy(&output.stderr)
-                        .contains("Error: Error reading input: Permission denied (os error 13)"));
-                    Ok(())
-                },
-                Err(error) => Err(error),
-            }
-        },
-        Err(error) => Err(error),
-    }
-    .unwrap();
-
-    let mut perms = file.metadata().unwrap().permissions();
-    perms.set_mode(0o600);
-    file.set_permissions(perms).unwrap();
-    let _ = fs::remove_file(&credential_path);
-
-    let _ = fs::remove_dir_all(move_home);
-}
-
-fn setup_move_home(test_path: &str) -> (String, String) {
-    let cwd = env::current_dir().unwrap();
-    let mut move_home: String = String::from(cwd.to_string_lossy());
-    move_home.push_str(test_path);
-    let _ = fs::remove_dir_all(&move_home);
-    fs::create_dir_all(&move_home).unwrap();
-    let credential_path = move_home.clone() + MOVEY_CREDENTIAL_PATH;
-    (move_home, credential_path)
-}
-
-fn clean_up(package_path: &str) {
-    fs::remove_dir_all(format!("{}/.git", package_path)).unwrap();
-    let credential_path = format!("{}{}", package_path, MOVEY_CREDENTIAL_PATH);
-    let _ = fs::remove_file(credential_path);
-}
-
-// create a dummy move_credential.toml file for testing
-fn init_stub_registry_file(package_path: &str, base_url: &str) {
-    let credential_path = format!("{}{}", package_path, MOVEY_CREDENTIAL_PATH);
-    let content = format!(
-        r#"
-        [registry]
-        token = "test-token"
-        url = "{}"
-        "#,
-        base_url
-    );
-    fs::write(credential_path, content).expect("Unable to write file");
-}
-
-// create a mock server to check if the request is sent or not, also returns a stub response for testing
-fn mock_movey_upload_with_response_body_and_status_code<'a>(
-    server: &'a MockServer,
-    status_code: u16,
-    response_body: Option<&str>,
-) -> Mock<'a> {
-    server.mock(|when, then| {
-        when.method(POST)
-            .path("/api/v1/packages/upload")
-            .header("content-type", "application/json")
-            .json_body(json!({
-            "github_repo_url": "https://github.com/move-language/move",
-            "total_files": 2,
-            "token": "test-token",
-            "subdir": '\n'
-            }));
-        then.status(status_code).body(response_body.unwrap_or(""));
-    })
-}
diff --git a/third_party/move/tools/move-cli/tests/metatests/args.exp b/third_party/move/tools/move-cli/tests/metatests/args.exp
deleted file mode 100644
index f5e63154798dc..0000000000000
--- a/third_party/move/tools/move-cli/tests/metatests/args.exp
+++ /dev/null
@@ -1,36 +0,0 @@
-Command `sandbox exp-test -p dummy/test_1/args.txt`:
-1 / 1 test(s) passed.
-Command `sandbox exp-test -p dummy/test_2`:
-1 / 1 test(s) passed.
-Command `sandbox exp-test -p dummy`:
-2 / 2 test(s) passed.
-Command `sandbox exp-test -p cov/plain --track-cov`:
-1 / 1 test(s) passed.
-Module 0000000000000000000000000000000000000000000000000000000000000042::M
-	fun test
-		total: 1
-		covered: 1
-		% coverage: 100.00
->>> % Module coverage: 100.00
-Command `sandbox exp-test -p cov/two-runs-same-module --track-cov`:
-1 / 1 test(s) passed.
-Module 0000000000000000000000000000000000000000000000000000000000000042::M
-	fun test
-		total: 6
-		covered: 6
-		% coverage: 100.00
->>> % Module coverage: 100.00
-Command `sandbox exp-test -p cov/two-runs-diff-module --track-cov`:
-1 / 1 test(s) passed.
-Module 0000000000000000000000000000000000000000000000000000000000000042::M1
-	fun test
-		total: 1
-		covered: 1
-		% coverage: 100.00
->>> % Module coverage: 100.00
-Module 0000000000000000000000000000000000000000000000000000000000000042::M2
-	fun test
-		total: 1
-		covered: 1
-		% coverage: 100.00
->>> % Module coverage: 100.00
diff --git a/third_party/move/tools/move-cli/tests/metatests/args.txt b/third_party/move/tools/move-cli/tests/metatests/args.txt
deleted file mode 100644
index 02a5655087e94..0000000000000
--- a/third_party/move/tools/move-cli/tests/metatests/args.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-sandbox exp-test -p dummy/test_1/args.txt
-sandbox exp-test -p dummy/test_2
-sandbox exp-test -p dummy
-sandbox exp-test -p cov/plain --track-cov
-sandbox exp-test -p cov/two-runs-same-module --track-cov
-sandbox exp-test -p cov/two-runs-diff-module --track-cov
diff --git a/third_party/move/tools/move-cli/tests/metatests/args.v2_exp b/third_party/move/tools/move-cli/tests/metatests/args.v2_exp
deleted file mode 100644
index 3f29c7e615403..0000000000000
--- a/third_party/move/tools/move-cli/tests/metatests/args.v2_exp
+++ /dev/null
@@ -1,36 +0,0 @@
-Command `sandbox exp-test -p dummy/test_1/args.txt`:
-1 / 1 test(s) passed.
-Command `sandbox exp-test -p dummy/test_2`:
-1 / 1 test(s) passed.
-Command `sandbox exp-test -p dummy`:
-2 / 2 test(s) passed.
-Command `sandbox exp-test -p cov/plain --track-cov`:
-1 / 1 test(s) passed.
-Module 0000000000000000000000000000000000000000000000000000000000000042::M
-	fun test
-		total: 1
-		covered: 1
-		% coverage: 100.00
->>> % Module coverage: 100.00
-Command `sandbox exp-test -p cov/two-runs-same-module --track-cov`:
-1 / 1 test(s) passed.
-Module 0000000000000000000000000000000000000000000000000000000000000042::M
-	fun test
-		total: 10
-		covered: 8
-		% coverage: 80.00
->>> % Module coverage: 80.00
-Command `sandbox exp-test -p cov/two-runs-diff-module --track-cov`:
-1 / 1 test(s) passed.
-Module 0000000000000000000000000000000000000000000000000000000000000042::M1
-	fun test
-		total: 1
-		covered: 1
-		% coverage: 100.00
->>> % Module coverage: 100.00
-Module 0000000000000000000000000000000000000000000000000000000000000042::M2
-	fun test
-		total: 1
-		covered: 1
-		% coverage: 100.00
->>> % Module coverage: 100.00
diff --git a/third_party/move/tools/move-cli/tests/metatests/cov/plain/Move.toml b/third_party/move/tools/move-cli/tests/metatests/cov/plain/Move.toml
deleted file mode 100644
index 4ee420a1025f0..0000000000000
--- a/third_party/move/tools/move-cli/tests/metatests/cov/plain/Move.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[package]
-name = "plain"
-version = "0.0.0"
diff --git a/third_party/move/tools/move-cli/tests/metatests/cov/plain/args.exp b/third_party/move/tools/move-cli/tests/metatests/cov/plain/args.exp
deleted file mode 100644
index 913e418e4aae6..0000000000000
--- a/third_party/move/tools/move-cli/tests/metatests/cov/plain/args.exp
+++ /dev/null
@@ -1,2 +0,0 @@
-Command `sandbox publish`:
-Command `sandbox run scripts/test.move --dry-run`:
diff --git a/third_party/move/tools/move-cli/tests/metatests/cov/plain/args.txt b/third_party/move/tools/move-cli/tests/metatests/cov/plain/args.txt
deleted file mode 100644
index 092391bf94ad9..0000000000000
--- a/third_party/move/tools/move-cli/tests/metatests/cov/plain/args.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-sandbox publish
-sandbox run scripts/test.move --dry-run
diff --git a/third_party/move/tools/move-cli/tests/metatests/cov/plain/args.v2_exp b/third_party/move/tools/move-cli/tests/metatests/cov/plain/args.v2_exp
deleted file mode 100644
index 913e418e4aae6..0000000000000
--- a/third_party/move/tools/move-cli/tests/metatests/cov/plain/args.v2_exp
+++ /dev/null
@@ -1,2 +0,0 @@
-Command `sandbox publish`:
-Command `sandbox run scripts/test.move --dry-run`:
diff --git a/third_party/move/tools/move-cli/tests/metatests/cov/plain/scripts/test.move b/third_party/move/tools/move-cli/tests/metatests/cov/plain/scripts/test.move
deleted file mode 100644
index d63dd6c5346d1..0000000000000
--- a/third_party/move/tools/move-cli/tests/metatests/cov/plain/scripts/test.move
+++ /dev/null
@@ -1,7 +0,0 @@
-script {
-    use 0x42::M;
-
-    fun test() {
-        M::test();
-    }
-}
diff --git a/third_party/move/tools/move-cli/tests/metatests/cov/plain/sources/M.move b/third_party/move/tools/move-cli/tests/metatests/cov/plain/sources/M.move
deleted file mode 100644
index 48502e76cae58..0000000000000
--- a/third_party/move/tools/move-cli/tests/metatests/cov/plain/sources/M.move
+++ /dev/null
@@ -1,3 +0,0 @@
-module 0x42::M {
-    public fun test() {}
-}
diff --git a/third_party/move/tools/move-cli/tests/metatests/cov/two-runs-diff-module/Move.toml b/third_party/move/tools/move-cli/tests/metatests/cov/two-runs-diff-module/Move.toml
deleted file mode 100644
index c960e3829bac6..0000000000000
--- a/third_party/move/tools/move-cli/tests/metatests/cov/two-runs-diff-module/Move.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[package]
-name = "two-runs-diff-module"
-version = "0.0.0"
diff --git a/third_party/move/tools/move-cli/tests/metatests/cov/two-runs-diff-module/args.exp b/third_party/move/tools/move-cli/tests/metatests/cov/two-runs-diff-module/args.exp
deleted file mode 100644
index f06a082ecb5f6..0000000000000
--- a/third_party/move/tools/move-cli/tests/metatests/cov/two-runs-diff-module/args.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-Command `sandbox publish`:
-Command `sandbox run scripts/test.move --args 0u8 --dry-run`:
-Command `sandbox run scripts/test.move --args 1u8 --dry-run`:
diff --git a/third_party/move/tools/move-cli/tests/metatests/cov/two-runs-diff-module/args.txt b/third_party/move/tools/move-cli/tests/metatests/cov/two-runs-diff-module/args.txt
deleted file mode 100644
index f814a47012cca..0000000000000
--- a/third_party/move/tools/move-cli/tests/metatests/cov/two-runs-diff-module/args.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-sandbox publish
-sandbox run scripts/test.move --args 0u8 --dry-run
-sandbox run scripts/test.move --args 1u8 --dry-run
diff --git a/third_party/move/tools/move-cli/tests/metatests/cov/two-runs-diff-module/args.v2_exp b/third_party/move/tools/move-cli/tests/metatests/cov/two-runs-diff-module/args.v2_exp
deleted file mode 100644
index f06a082ecb5f6..0000000000000
--- a/third_party/move/tools/move-cli/tests/metatests/cov/two-runs-diff-module/args.v2_exp
+++ /dev/null
@@ -1,3 +0,0 @@
-Command `sandbox publish`:
-Command `sandbox run scripts/test.move --args 0u8 --dry-run`:
-Command `sandbox run scripts/test.move --args 1u8 --dry-run`:
diff --git a/third_party/move/tools/move-cli/tests/metatests/cov/two-runs-diff-module/scripts/test.move b/third_party/move/tools/move-cli/tests/metatests/cov/two-runs-diff-module/scripts/test.move
deleted file mode 100644
index fb8e286c84789..0000000000000
--- a/third_party/move/tools/move-cli/tests/metatests/cov/two-runs-diff-module/scripts/test.move
+++ /dev/null
@@ -1,12 +0,0 @@
-script {
-    use 0x42::M1;
-    use 0x42::M2;
-
-    fun test(x: u8) {
-        if (x == 0) {
-            M1::test();
-        } else {
-            M2::test();
-        }
-    }
-}
diff --git a/third_party/move/tools/move-cli/tests/metatests/cov/two-runs-diff-module/sources/M1.move b/third_party/move/tools/move-cli/tests/metatests/cov/two-runs-diff-module/sources/M1.move
deleted file mode 100644
index e0526a316b184..0000000000000
--- a/third_party/move/tools/move-cli/tests/metatests/cov/two-runs-diff-module/sources/M1.move
+++ /dev/null
@@ -1,5 +0,0 @@
-address 0x42 {
-module M1 {
-    public fun test() {}
-}
-}
diff --git a/third_party/move/tools/move-cli/tests/metatests/cov/two-runs-diff-module/sources/M2.move b/third_party/move/tools/move-cli/tests/metatests/cov/two-runs-diff-module/sources/M2.move
deleted file mode 100644
index 31554319df199..0000000000000
--- a/third_party/move/tools/move-cli/tests/metatests/cov/two-runs-diff-module/sources/M2.move
+++ /dev/null
@@ -1,5 +0,0 @@
-address 0x42 {
-module M2 {
-    public fun test() {}
-}
-}
diff --git a/third_party/move/tools/move-cli/tests/metatests/cov/two-runs-same-module/Move.toml b/third_party/move/tools/move-cli/tests/metatests/cov/two-runs-same-module/Move.toml
deleted file mode 100644
index d57bc0714caf6..0000000000000
--- a/third_party/move/tools/move-cli/tests/metatests/cov/two-runs-same-module/Move.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[package]
-name = "two-runs-same-module"
-version = "0.0.0"
diff --git a/third_party/move/tools/move-cli/tests/metatests/cov/two-runs-same-module/args.exp b/third_party/move/tools/move-cli/tests/metatests/cov/two-runs-same-module/args.exp
deleted file mode 100644
index f06a082ecb5f6..0000000000000
--- a/third_party/move/tools/move-cli/tests/metatests/cov/two-runs-same-module/args.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-Command `sandbox publish`:
-Command `sandbox run scripts/test.move --args 0u8 --dry-run`:
-Command `sandbox run scripts/test.move --args 1u8 --dry-run`:
diff --git a/third_party/move/tools/move-cli/tests/metatests/cov/two-runs-same-module/args.txt b/third_party/move/tools/move-cli/tests/metatests/cov/two-runs-same-module/args.txt
deleted file mode 100644
index f814a47012cca..0000000000000
--- a/third_party/move/tools/move-cli/tests/metatests/cov/two-runs-same-module/args.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-sandbox publish
-sandbox run scripts/test.move --args 0u8 --dry-run
-sandbox run scripts/test.move --args 1u8 --dry-run
diff --git a/third_party/move/tools/move-cli/tests/metatests/cov/two-runs-same-module/args.v2_exp b/third_party/move/tools/move-cli/tests/metatests/cov/two-runs-same-module/args.v2_exp
deleted file mode 100644
index f06a082ecb5f6..0000000000000
--- a/third_party/move/tools/move-cli/tests/metatests/cov/two-runs-same-module/args.v2_exp
+++ /dev/null
@@ -1,3 +0,0 @@
-Command `sandbox publish`:
-Command `sandbox run scripts/test.move --args 0u8 --dry-run`:
-Command `sandbox run scripts/test.move --args 1u8 --dry-run`:
diff --git a/third_party/move/tools/move-cli/tests/metatests/cov/two-runs-same-module/scripts/test.move b/third_party/move/tools/move-cli/tests/metatests/cov/two-runs-same-module/scripts/test.move
deleted file mode 100644
index ae8115e561230..0000000000000
--- a/third_party/move/tools/move-cli/tests/metatests/cov/two-runs-same-module/scripts/test.move
+++ /dev/null
@@ -1,7 +0,0 @@
-script {
-    use 0x42::M;
-
-    fun test(x: u8) {
-        M::test(x);
-    }
-}
diff --git a/third_party/move/tools/move-cli/tests/metatests/cov/two-runs-same-module/sources/M.move b/third_party/move/tools/move-cli/tests/metatests/cov/two-runs-same-module/sources/M.move
deleted file mode 100644
index 356473bcc959b..0000000000000
--- a/third_party/move/tools/move-cli/tests/metatests/cov/two-runs-same-module/sources/M.move
+++ /dev/null
@@ -1,11 +0,0 @@
-address 0x42 {
-module M {
-    public fun test(x: u8) {
-        if (x == 0) {
-            return ()
-        } else {
-            return ()
-        }
-    }
-}
-}
diff --git a/third_party/move/tools/move-cli/tests/metatests/dummy/test_2/args.exp b/third_party/move/tools/move-cli/tests/metatests/dummy/test_2/args.exp
deleted file mode 100644
index e69de29bb2d1d..0000000000000
diff --git a/third_party/move/tools/move-cli/tests/metatests/dummy/test_2/args.txt b/third_party/move/tools/move-cli/tests/metatests/dummy/test_2/args.txt
deleted file mode 100644
index e69de29bb2d1d..0000000000000
diff --git a/third_party/move/tools/move-cli/tests/metatests/dummy/test_2/args.v2_exp b/third_party/move/tools/move-cli/tests/metatests/dummy/test_2/args.v2_exp
deleted file mode 100644
index e69de29bb2d1d..0000000000000
diff --git a/third_party/move/tools/move-cli/tests/move_unit_tests_evm.rs b/third_party/move/tools/move-cli/tests/move_unit_tests_evm.rs
index cb286c2623943..9b374debbcae9 100644
--- a/third_party/move/tools/move-cli/tests/move_unit_tests_evm.rs
+++ b/third_party/move/tools/move-cli/tests/move_unit_tests_evm.rs
@@ -2,13 +2,13 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
-use move_cli::sandbox::commands::test;
+use move_cli::test::run_one;
 use std::path::{Path, PathBuf};
 
 fn run_all(args_path: &Path) -> datatest_stable::Result<()> {
     let cli_exe = env!("CARGO_BIN_EXE_move");
     let use_temp_dir = !args_path.parent().unwrap().join("NO_TEMPDIR").exists();
-    test::run_one(
+    run_one(
         args_path,
         &PathBuf::from(cli_exe),
         /* use_temp_dir */ use_temp_dir,
diff --git a/third_party/move/tools/move-cli/tests/move_unit_tests_move_vm_and_stackless_vm.rs b/third_party/move/tools/move-cli/tests/move_unit_tests_move_vm_and_stackless_vm.rs
index 4c665792bca57..52ff1bbe35f36 100644
--- a/third_party/move/tools/move-cli/tests/move_unit_tests_move_vm_and_stackless_vm.rs
+++ b/third_party/move/tools/move-cli/tests/move_unit_tests_move_vm_and_stackless_vm.rs
@@ -2,13 +2,13 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
-use move_cli::sandbox::commands::test;
+use move_cli::test::run_one;
 use std::path::{Path, PathBuf};
 
 fn run_all(args_path: &Path) -> datatest_stable::Result<()> {
     let cli_exe = env!("CARGO_BIN_EXE_move");
     let use_temp_dir = !args_path.parent().unwrap().join("NO_TEMPDIR").exists();
-    test::run_one(
+    run_one(
         args_path,
         &PathBuf::from(cli_exe),
         /* use_temp_dir */ use_temp_dir,
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/.gitattributes b/third_party/move/tools/move-cli/tests/sandbox_tests/.gitattributes
deleted file mode 100644
index d1bcf26826514..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-*.exp text -whitespace
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/build_modules_and_scripts/Move.toml b/third_party/move/tools/move-cli/tests/sandbox_tests/build_modules_and_scripts/Move.toml
deleted file mode 100644
index 77a58870f2895..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/build_modules_and_scripts/Move.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[package]
-name = "build_modules_and_scripts"
-version = "0.0.0"
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/build_modules_and_scripts/args.exp b/third_party/move/tools/move-cli/tests/sandbox_tests/build_modules_and_scripts/args.exp
deleted file mode 100644
index 8a9cdeb809d60..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/build_modules_and_scripts/args.exp
+++ /dev/null
@@ -1,4 +0,0 @@
-Command `-v sandbox publish`:
-Found 1 modules
-Publishing a new module 0000000000000000000000000000000000000000000000000000000000000042::M (wrote 88 bytes)
-Wrote 88 bytes of module ID's and code
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/build_modules_and_scripts/args.txt b/third_party/move/tools/move-cli/tests/sandbox_tests/build_modules_and_scripts/args.txt
deleted file mode 100644
index 434d064fe9663..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/build_modules_and_scripts/args.txt
+++ /dev/null
@@ -1 +0,0 @@
--v sandbox publish
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/build_modules_and_scripts/args.v2_exp b/third_party/move/tools/move-cli/tests/sandbox_tests/build_modules_and_scripts/args.v2_exp
deleted file mode 100644
index 8798b21a74da1..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/build_modules_and_scripts/args.v2_exp
+++ /dev/null
@@ -1,4 +0,0 @@
-Command `-v sandbox publish`:
-Found 1 modules
-Publishing a new module 0000000000000000000000000000000000000000000000000000000000000042::M (wrote 129 bytes)
-Wrote 129 bytes of module ID's and code
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/build_modules_and_scripts/scripts/script1.move b/third_party/move/tools/move-cli/tests/sandbox_tests/build_modules_and_scripts/scripts/script1.move
deleted file mode 100644
index 2aad422f7285e..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/build_modules_and_scripts/scripts/script1.move
+++ /dev/null
@@ -1,4 +0,0 @@
-script {
-    fun script1() {
-    }
-}
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/build_modules_and_scripts/scripts/script2.move b/third_party/move/tools/move-cli/tests/sandbox_tests/build_modules_and_scripts/scripts/script2.move
deleted file mode 100644
index 705487768e62d..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/build_modules_and_scripts/scripts/script2.move
+++ /dev/null
@@ -1,5 +0,0 @@
-script {
-    fun script1() {
-        _ = 1 + 3;
-    }
-}
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/build_modules_and_scripts/sources/M.move b/third_party/move/tools/move-cli/tests/sandbox_tests/build_modules_and_scripts/sources/M.move
deleted file mode 100644
index 323f521c5fa9b..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/build_modules_and_scripts/sources/M.move
+++ /dev/null
@@ -1,4 +0,0 @@
-address 0x42 {
-module M {
-}
-}
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/cyclic_multi_module_publish/README.md b/third_party/move/tools/move-cli/tests/sandbox_tests/cyclic_multi_module_publish/README.md
deleted file mode 100644
index 376d5b6cd8343..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/cyclic_multi_module_publish/README.md
+++ /dev/null
@@ -1,26 +0,0 @@
-## Test Case Explanation
-
-The goal of this test case is to check that the VM properly rejects a module
-with cyclic dependencies even in the multi-module publishing setting.
-
-Here is the procedure:
-
-1. publish two modules with dependencies `B --depends_on--> A`.
-
-   (See the code in package `p1`)
-
-
-2. compile a set of modules with dependencies `A --may_use--> C --depends_on--> B'`
-
-   (See the code in package `p2`)
-
-   NOTE that module `B'` is an update to module `B` with dependency to module
-   `A` removed.  We need this tweak here, otherwise, the compiler will flag the
-   cyclic dependency and we can never reach the publishing step to test the VM.
-
-
-3. publish the modules compiled in step 2, but only module `A` and `C` with the
-   `--override-ordering` flag. Without this flag, all modules will be published.
-
-   This will trigger the check on the VM side and the VM aborts correctly with
-   `INVALID_FRIEND_DECL_WITH_MODULES_IN_DEPENDENCIES`.
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/cyclic_multi_module_publish/args.exp b/third_party/move/tools/move-cli/tests/sandbox_tests/cyclic_multi_module_publish/args.exp
deleted file mode 100644
index d8de26f5dbe0d..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/cyclic_multi_module_publish/args.exp
+++ /dev/null
@@ -1,9 +0,0 @@
-Command `-p p1 sandbox publish --bundle --override-ordering A --override-ordering B -v`:
-Found 2 modules
-Publishing a new module 0000000000000000000000000000000000000000000000000000000000000003::A (wrote 114 bytes)
-Publishing a new module 0000000000000000000000000000000000000000000000000000000000000003::B (wrote 125 bytes)
-Wrote 239 bytes of module ID's and code
-Command `-p p2 sandbox publish --bundle --override-ordering A --override-ordering C -v`:
-Found 3 modules
-Invalid multi-module publishing: VMError with status INVALID_FRIEND_DECL_WITH_MODULES_IN_DEPENDENCIES at location Module ModuleId { address: 0000000000000000000000000000000000000000000000000000000000000003, name: Identifier("C") } and message At least one module, 0000000000000000000000000000000000000000000000000000000000000003::A, appears in both the dependency set and the friend set
-Publishing failed with unexpected error INVALID_FRIEND_DECL_WITH_MODULES_IN_DEPENDENCIES
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/cyclic_multi_module_publish/args.txt b/third_party/move/tools/move-cli/tests/sandbox_tests/cyclic_multi_module_publish/args.txt
deleted file mode 100644
index eaea2a25709ab..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/cyclic_multi_module_publish/args.txt
+++ /dev/null
@@ -1,2 +0,0 @@
--p p1 sandbox publish --bundle --override-ordering A --override-ordering B -v
--p p2 sandbox publish --bundle --override-ordering A --override-ordering C -v
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/cyclic_multi_module_publish/args.v2_exp b/third_party/move/tools/move-cli/tests/sandbox_tests/cyclic_multi_module_publish/args.v2_exp
deleted file mode 100644
index c15789332f29b..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/cyclic_multi_module_publish/args.v2_exp
+++ /dev/null
@@ -1,9 +0,0 @@
-Command `-p p1 sandbox publish --bundle --override-ordering A --override-ordering B -v`:
-Found 2 modules
-Publishing a new module 0000000000000000000000000000000000000000000000000000000000000003::A (wrote 155 bytes)
-Publishing a new module 0000000000000000000000000000000000000000000000000000000000000003::B (wrote 166 bytes)
-Wrote 321 bytes of module ID's and code
-Command `-p p2 sandbox publish --bundle --override-ordering A --override-ordering C -v`:
-Found 3 modules
-Invalid multi-module publishing: VMError with status INVALID_FRIEND_DECL_WITH_MODULES_IN_DEPENDENCIES at location Module ModuleId { address: 0000000000000000000000000000000000000000000000000000000000000003, name: Identifier("C") } and message At least one module, 0000000000000000000000000000000000000000000000000000000000000003::A, appears in both the dependency set and the friend set
-Publishing failed with unexpected error INVALID_FRIEND_DECL_WITH_MODULES_IN_DEPENDENCIES
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/cyclic_multi_module_publish/p1/Move.toml b/third_party/move/tools/move-cli/tests/sandbox_tests/cyclic_multi_module_publish/p1/Move.toml
deleted file mode 100644
index 8122f5f269b66..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/cyclic_multi_module_publish/p1/Move.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[package]
-name = "cyclic_multi_module_publish"
-version = "0.0.0"
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/cyclic_multi_module_publish/p1/sources/CyclicFriendsPart1.move b/third_party/move/tools/move-cli/tests/sandbox_tests/cyclic_multi_module_publish/p1/sources/CyclicFriendsPart1.move
deleted file mode 100644
index 3a68b35b590af..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/cyclic_multi_module_publish/p1/sources/CyclicFriendsPart1.move
+++ /dev/null
@@ -1,7 +0,0 @@
-module 0x3::A {
-    public fun foo() {}
-}
-
-module 0x3::B {
-    public fun foo() { 0x3::A::foo() }
-}
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/cyclic_multi_module_publish/p2/Move.toml b/third_party/move/tools/move-cli/tests/sandbox_tests/cyclic_multi_module_publish/p2/Move.toml
deleted file mode 100644
index 8122f5f269b66..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/cyclic_multi_module_publish/p2/Move.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[package]
-name = "cyclic_multi_module_publish"
-version = "0.0.0"
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/cyclic_multi_module_publish/p2/sources/CyclicFriendsPart2.move b/third_party/move/tools/move-cli/tests/sandbox_tests/cyclic_multi_module_publish/p2/sources/CyclicFriendsPart2.move
deleted file mode 100644
index 4636c56919971..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/cyclic_multi_module_publish/p2/sources/CyclicFriendsPart2.move
+++ /dev/null
@@ -1,12 +0,0 @@
-module 0x3::A {
-    public fun foo() {}
-}
-
-module 0x3::B {
-    public fun foo() {}
-}
-
-module 0x3::C {
-    friend 0x3::A;
-    public fun foo() { 0x3::B::foo() }
-}
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/doctor_with_stdlib/Move.toml b/third_party/move/tools/move-cli/tests/sandbox_tests/doctor_with_stdlib/Move.toml
deleted file mode 100644
index b493d270832e9..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/doctor_with_stdlib/Move.toml
+++ /dev/null
@@ -1,9 +0,0 @@
-[package]
-name = "doctor_with_stdlib"
-version = "0.0.0"
-
-[addresses]
-std = "0x1"
-
-[dependencies]
-MoveNursery = { local = "../../../../../move-stdlib/nursery" }
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/doctor_with_stdlib/args.exp b/third_party/move/tools/move-cli/tests/sandbox_tests/doctor_with_stdlib/args.exp
deleted file mode 100644
index 2716d857ba324..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/doctor_with_stdlib/args.exp
+++ /dev/null
@@ -1,2 +0,0 @@
-Command `sandbox publish`:
-Command `sandbox doctor`:
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/doctor_with_stdlib/args.txt b/third_party/move/tools/move-cli/tests/sandbox_tests/doctor_with_stdlib/args.txt
deleted file mode 100644
index d53e1486a4350..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/doctor_with_stdlib/args.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-sandbox publish
-sandbox doctor
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/doctor_with_stdlib/args.v2_exp b/third_party/move/tools/move-cli/tests/sandbox_tests/doctor_with_stdlib/args.v2_exp
deleted file mode 100644
index 2716d857ba324..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/doctor_with_stdlib/args.v2_exp
+++ /dev/null
@@ -1,2 +0,0 @@
-Command `sandbox publish`:
-Command `sandbox doctor`:
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/doctor_with_stdlib/sources/M.move b/third_party/move/tools/move-cli/tests/sandbox_tests/doctor_with_stdlib/sources/M.move
deleted file mode 100644
index 1e7f6b8cd0c05..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/doctor_with_stdlib/sources/M.move
+++ /dev/null
@@ -1,9 +0,0 @@
-address 0x2 {
-module M {
-    use std::debug;
-
-    fun f() {
-        debug::print(&7);
-    }
-}
-}
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/examples_published_dev_mode/Move.toml b/third_party/move/tools/move-cli/tests/sandbox_tests/examples_published_dev_mode/Move.toml
deleted file mode 100644
index 25a260f200516..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/examples_published_dev_mode/Move.toml
+++ /dev/null
@@ -1,6 +0,0 @@
-[package]
-name = "examples_published_dev_mode"
-version = "0.0.0"
-
-[addresses]
-Addr = "0x1"
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/examples_published_dev_mode/args.exp b/third_party/move/tools/move-cli/tests/sandbox_tests/examples_published_dev_mode/args.exp
deleted file mode 100644
index 93aff9811ae07..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/examples_published_dev_mode/args.exp
+++ /dev/null
@@ -1,9 +0,0 @@
-Command `sandbox publish -v`:
-Found 1 modules
-Publishing a new module 0000000000000000000000000000000000000000000000000000000000000001::Module (wrote 98 bytes)
-Wrote 98 bytes of module ID's and code
-Command `-d sandbox publish -v`:
-Found 2 modules
-Publishing a new module 0000000000000000000000000000000000000000000000000000000000000001::Example (wrote 100 bytes)
-Updating an existing module 0000000000000000000000000000000000000000000000000000000000000001::Module (wrote 98 bytes)
-Wrote 198 bytes of module ID's and code
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/examples_published_dev_mode/args.txt b/third_party/move/tools/move-cli/tests/sandbox_tests/examples_published_dev_mode/args.txt
deleted file mode 100644
index b4ff25538dfbd..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/examples_published_dev_mode/args.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-sandbox publish -v
--d sandbox publish -v
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/examples_published_dev_mode/args.v2_exp b/third_party/move/tools/move-cli/tests/sandbox_tests/examples_published_dev_mode/args.v2_exp
deleted file mode 100644
index 64c3ac15aa1d5..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/examples_published_dev_mode/args.v2_exp
+++ /dev/null
@@ -1,9 +0,0 @@
-Command `sandbox publish -v`:
-Found 1 modules
-Publishing a new module 0000000000000000000000000000000000000000000000000000000000000001::Module (wrote 139 bytes)
-Wrote 139 bytes of module ID's and code
-Command `-d sandbox publish -v`:
-Found 2 modules
-Publishing a new module 0000000000000000000000000000000000000000000000000000000000000001::Example (wrote 141 bytes)
-Updating an existing module 0000000000000000000000000000000000000000000000000000000000000001::Module (wrote 139 bytes)
-Wrote 280 bytes of module ID's and code
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/examples_published_dev_mode/examples/Example.move b/third_party/move/tools/move-cli/tests/sandbox_tests/examples_published_dev_mode/examples/Example.move
deleted file mode 100644
index 3243baffdf0a2..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/examples_published_dev_mode/examples/Example.move
+++ /dev/null
@@ -1,2 +0,0 @@
-module Addr::Example {
-}
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/examples_published_dev_mode/sources/Module.move b/third_party/move/tools/move-cli/tests/sandbox_tests/examples_published_dev_mode/sources/Module.move
deleted file mode 100644
index 95105893d8474..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/examples_published_dev_mode/sources/Module.move
+++ /dev/null
@@ -1 +0,0 @@
-module Addr::Module { }
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_arithmetic_failure/Move.toml b/third_party/move/tools/move-cli/tests/sandbox_tests/explain_arithmetic_failure/Move.toml
deleted file mode 100644
index 63e2701b7a22a..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_arithmetic_failure/Move.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[package]
-name = "explain_arithmetic_failure"
-version = "0.0.0"
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_arithmetic_failure/args.exp b/third_party/move/tools/move-cli/tests/sandbox_tests/explain_arithmetic_failure/args.exp
deleted file mode 100644
index f729dfdcb7b6a..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_arithmetic_failure/args.exp
+++ /dev/null
@@ -1,2 +0,0 @@
-Command `sandbox run sources/script.move`:
-Execution failed because of an arithmetic error (i.e., integer overflow/underflow, div/mod by zero, or invalid shift) in script at code offset 2
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_arithmetic_failure/args.txt b/third_party/move/tools/move-cli/tests/sandbox_tests/explain_arithmetic_failure/args.txt
deleted file mode 100644
index b8a403e4594ee..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_arithmetic_failure/args.txt
+++ /dev/null
@@ -1 +0,0 @@
-sandbox run sources/script.move
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_arithmetic_failure/args.v2_exp b/third_party/move/tools/move-cli/tests/sandbox_tests/explain_arithmetic_failure/args.v2_exp
deleted file mode 100644
index f729dfdcb7b6a..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_arithmetic_failure/args.v2_exp
+++ /dev/null
@@ -1,2 +0,0 @@
-Command `sandbox run sources/script.move`:
-Execution failed because of an arithmetic error (i.e., integer overflow/underflow, div/mod by zero, or invalid shift) in script at code offset 2
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_arithmetic_failure/sources/script.move b/third_party/move/tools/move-cli/tests/sandbox_tests/explain_arithmetic_failure/sources/script.move
deleted file mode 100644
index c503669145818..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_arithmetic_failure/sources/script.move
+++ /dev/null
@@ -1,5 +0,0 @@
-script {
-    fun main() {
-        1 - 2; // will cause integer underflow
-    }
-}
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_missing_resource/Move.toml b/third_party/move/tools/move-cli/tests/sandbox_tests/explain_missing_resource/Move.toml
deleted file mode 100644
index a5a7d46e94233..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_missing_resource/Move.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[package]
-name = "explain_missing_resource"
-version = "0.0.0"
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_missing_resource/args.exp b/third_party/move/tools/move-cli/tests/sandbox_tests/explain_missing_resource/args.exp
deleted file mode 100644
index 6bbfb33e90dd9..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_missing_resource/args.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-Command `sandbox publish`:
-Command `sandbox run scripts/missing_resource.move`:
-Execution failed because of a RESOURCE_DOES_NOT_EXIST error (i.e., `move_from<T>(a)`, `borrow_global<T>(a)`, or `borrow_global_mut<T>(a)` when there is no resource of type `T` at address `a`) in 0000000000000000000000000000000000000000000000000000000000000002::MissingResource::f at code offset 1
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_missing_resource/args.txt b/third_party/move/tools/move-cli/tests/sandbox_tests/explain_missing_resource/args.txt
deleted file mode 100644
index a2939f709fa83..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_missing_resource/args.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-sandbox publish
-sandbox run scripts/missing_resource.move
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_missing_resource/args.v2_exp b/third_party/move/tools/move-cli/tests/sandbox_tests/explain_missing_resource/args.v2_exp
deleted file mode 100644
index 6bbfb33e90dd9..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_missing_resource/args.v2_exp
+++ /dev/null
@@ -1,3 +0,0 @@
-Command `sandbox publish`:
-Command `sandbox run scripts/missing_resource.move`:
-Execution failed because of a RESOURCE_DOES_NOT_EXIST error (i.e., `move_from<T>(a)`, `borrow_global<T>(a)`, or `borrow_global_mut<T>(a)` when there is no resource of type `T` at address `a`) in 0000000000000000000000000000000000000000000000000000000000000002::MissingResource::f at code offset 1
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_missing_resource/scripts/missing_resource.move b/third_party/move/tools/move-cli/tests/sandbox_tests/explain_missing_resource/scripts/missing_resource.move
deleted file mode 100644
index 3e2d7851980d0..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_missing_resource/scripts/missing_resource.move
+++ /dev/null
@@ -1,6 +0,0 @@
-script {
-    use 0x2::MissingResource;
-    fun missing_resource() {
-        MissingResource::f();
-    }
-}
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_missing_resource/sources/MissingResource.move b/third_party/move/tools/move-cli/tests/sandbox_tests/explain_missing_resource/sources/MissingResource.move
deleted file mode 100644
index ab202a5b1e76f..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_missing_resource/sources/MissingResource.move
+++ /dev/null
@@ -1,9 +0,0 @@
-address 0x2 {
-module MissingResource {
-    struct R has key { }
-
-    public fun f() acquires R {
-        borrow_global<R>(@0x0);
-    }
-}
-}
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_resource_already_exists/Move.toml b/third_party/move/tools/move-cli/tests/sandbox_tests/explain_resource_already_exists/Move.toml
deleted file mode 100644
index 217d4854f1ad0..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_resource_already_exists/Move.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[package]
-name = "explain_resource_already_exists"
-version = "0.0.0"
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_resource_already_exists/args.exp b/third_party/move/tools/move-cli/tests/sandbox_tests/explain_resource_already_exists/args.exp
deleted file mode 100644
index 2cf7a69ee80e5..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_resource_already_exists/args.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-Command `sandbox publish`:
-Command `sandbox run scripts/resource_already_exists.move --signers 0xA`:
-Execution failed because of a RESOURCE_ALREADY_EXISTS error (i.e., `move_to<T>(account)` when there is already a resource of type `T` under `account`) in 0000000000000000000000000000000000000000000000000000000000000002::ResourceExists::f at code offset 7
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_resource_already_exists/args.txt b/third_party/move/tools/move-cli/tests/sandbox_tests/explain_resource_already_exists/args.txt
deleted file mode 100644
index 5d43e9b206bc5..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_resource_already_exists/args.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-sandbox publish
-sandbox run scripts/resource_already_exists.move --signers 0xA
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_resource_already_exists/args.v2_exp b/third_party/move/tools/move-cli/tests/sandbox_tests/explain_resource_already_exists/args.v2_exp
deleted file mode 100644
index 25ab94d4d6565..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_resource_already_exists/args.v2_exp
+++ /dev/null
@@ -1,3 +0,0 @@
-Command `sandbox publish`:
-Command `sandbox run scripts/resource_already_exists.move --signers 0xA`:
-Execution failed because of a RESOURCE_ALREADY_EXISTS error (i.e., `move_to<T>(account)` when there is already a resource of type `T` under `account`) in 0000000000000000000000000000000000000000000000000000000000000002::ResourceExists::f at code offset 11
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_resource_already_exists/scripts/resource_already_exists.move b/third_party/move/tools/move-cli/tests/sandbox_tests/explain_resource_already_exists/scripts/resource_already_exists.move
deleted file mode 100644
index ca46a0e39afd3..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_resource_already_exists/scripts/resource_already_exists.move
+++ /dev/null
@@ -1,6 +0,0 @@
-script {
-    use 0x2::ResourceExists;
-    fun resource_already_exists(account: signer) {
-        ResourceExists::f(&account);
-    }
-}
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_resource_already_exists/sources/ResourceExists.move b/third_party/move/tools/move-cli/tests/sandbox_tests/explain_resource_already_exists/sources/ResourceExists.move
deleted file mode 100644
index c298a3ef00bd4..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_resource_already_exists/sources/ResourceExists.move
+++ /dev/null
@@ -1,10 +0,0 @@
-address 0x2 {
-module ResourceExists {
-    struct R has key { }
-
-    public fun f(account: &signer) {
-        move_to<R>(account, R {});
-        move_to<R>(account, R {}); // will fail here
-    }
-}
-}
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_stdlib_abort/Move.toml b/third_party/move/tools/move-cli/tests/sandbox_tests/explain_stdlib_abort/Move.toml
deleted file mode 100644
index f3b9482f6f9a0..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_stdlib_abort/Move.toml
+++ /dev/null
@@ -1,9 +0,0 @@
-[package]
-name = "explain_stdlib_abort"
-version = "0.0.0"
-
-[addresses]
-std = "0x1"
-
-[dependencies]
-MoveStdlib = { local = "../../../../../move-stdlib" }
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_stdlib_abort/args.exp b/third_party/move/tools/move-cli/tests/sandbox_tests/explain_stdlib_abort/args.exp
deleted file mode 100644
index 639dbbd0e18a2..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_stdlib_abort/args.exp
+++ /dev/null
@@ -1,2 +0,0 @@
-Command `sandbox run sources/bad_borrow.move`:
-Execution failed because of an error originated from vector operations (i.e., index out of bound, pop an empty vector, or unpack a vector with a wrong parity) in script at code offset 4
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_stdlib_abort/args.txt b/third_party/move/tools/move-cli/tests/sandbox_tests/explain_stdlib_abort/args.txt
deleted file mode 100644
index 71e0ea75858e0..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_stdlib_abort/args.txt
+++ /dev/null
@@ -1 +0,0 @@
-sandbox run sources/bad_borrow.move
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_stdlib_abort/args.v2_exp b/third_party/move/tools/move-cli/tests/sandbox_tests/explain_stdlib_abort/args.v2_exp
deleted file mode 100644
index 639dbbd0e18a2..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_stdlib_abort/args.v2_exp
+++ /dev/null
@@ -1,2 +0,0 @@
-Command `sandbox run sources/bad_borrow.move`:
-Execution failed because of an error originated from vector operations (i.e., index out of bound, pop an empty vector, or unpack a vector with a wrong parity) in script at code offset 4
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_stdlib_abort/sources/bad_borrow.move b/third_party/move/tools/move-cli/tests/sandbox_tests/explain_stdlib_abort/sources/bad_borrow.move
deleted file mode 100644
index 40beeef533dcd..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_stdlib_abort/sources/bad_borrow.move
+++ /dev/null
@@ -1,7 +0,0 @@
-script {
-    use std::vector;
-    fun bad_borrow() {
-        let v = vector::empty<bool>();
-        let _ref = vector::borrow(&v, 0);
-    }
-}
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_user_module_abort/Move.toml b/third_party/move/tools/move-cli/tests/sandbox_tests/explain_user_module_abort/Move.toml
deleted file mode 100644
index 0a336b3dee5c0..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_user_module_abort/Move.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[package]
-name = "explain_user_module_abort"
-version = "0.0.0"
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_user_module_abort/args.exp b/third_party/move/tools/move-cli/tests/sandbox_tests/explain_user_module_abort/args.exp
deleted file mode 100644
index e6721ea17638f..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_user_module_abort/args.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-Command `sandbox publish`:
-Command `sandbox run scripts/fail_script.move`:
-Execution aborted with code 77 in module 0000000000000000000000000000000000000000000000000000000000000002::Fail.
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_user_module_abort/args.txt b/third_party/move/tools/move-cli/tests/sandbox_tests/explain_user_module_abort/args.txt
deleted file mode 100644
index 933129d701898..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_user_module_abort/args.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-sandbox publish
-sandbox run scripts/fail_script.move
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_user_module_abort/args.v2_exp b/third_party/move/tools/move-cli/tests/sandbox_tests/explain_user_module_abort/args.v2_exp
deleted file mode 100644
index e6721ea17638f..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_user_module_abort/args.v2_exp
+++ /dev/null
@@ -1,3 +0,0 @@
-Command `sandbox publish`:
-Command `sandbox run scripts/fail_script.move`:
-Execution aborted with code 77 in module 0000000000000000000000000000000000000000000000000000000000000002::Fail.
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_user_module_abort/scripts/fail_script.move b/third_party/move/tools/move-cli/tests/sandbox_tests/explain_user_module_abort/scripts/fail_script.move
deleted file mode 100644
index 369f8b216cb27..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_user_module_abort/scripts/fail_script.move
+++ /dev/null
@@ -1,6 +0,0 @@
-script {
-    use 0x2::Fail;
-    fun fail_script() {
-        Fail::f();
-    }
-}
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_user_module_abort/sources/Fail.move b/third_party/move/tools/move-cli/tests/sandbox_tests/explain_user_module_abort/sources/Fail.move
deleted file mode 100644
index 955eb18c7cf1c..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_user_module_abort/sources/Fail.move
+++ /dev/null
@@ -1,7 +0,0 @@
-address 0x2 {
-module Fail {
-    public fun f() {
-        abort 77
-    }
-}
-}
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_user_tx_script_abort/Move.toml b/third_party/move/tools/move-cli/tests/sandbox_tests/explain_user_tx_script_abort/Move.toml
deleted file mode 100644
index 56019a3fcbf14..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_user_tx_script_abort/Move.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[package]
-name = "explain_user_tx_script_abort"
-version = "0.0.0"
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_user_tx_script_abort/args.exp b/third_party/move/tools/move-cli/tests/sandbox_tests/explain_user_tx_script_abort/args.exp
deleted file mode 100644
index 3e9f0ecf88050..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_user_tx_script_abort/args.exp
+++ /dev/null
@@ -1,2 +0,0 @@
-Command `sandbox run sources/abort_script.move`:
-Execution aborted with code 17 in transaction script
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_user_tx_script_abort/args.txt b/third_party/move/tools/move-cli/tests/sandbox_tests/explain_user_tx_script_abort/args.txt
deleted file mode 100644
index a1771fd7ab49a..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_user_tx_script_abort/args.txt
+++ /dev/null
@@ -1 +0,0 @@
-sandbox run sources/abort_script.move
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_user_tx_script_abort/args.v2_exp b/third_party/move/tools/move-cli/tests/sandbox_tests/explain_user_tx_script_abort/args.v2_exp
deleted file mode 100644
index 3e9f0ecf88050..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_user_tx_script_abort/args.v2_exp
+++ /dev/null
@@ -1,2 +0,0 @@
-Command `sandbox run sources/abort_script.move`:
-Execution aborted with code 17 in transaction script
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_user_tx_script_abort/sources/abort_script.move b/third_party/move/tools/move-cli/tests/sandbox_tests/explain_user_tx_script_abort/sources/abort_script.move
deleted file mode 100644
index 754f4d4e06b9b..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/explain_user_tx_script_abort/sources/abort_script.move
+++ /dev/null
@@ -1,5 +0,0 @@
-script {
-    fun abort_script() {
-        abort 17
-    }
-}
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/gas_metering/Move.toml b/third_party/move/tools/move-cli/tests/sandbox_tests/gas_metering/Move.toml
deleted file mode 100644
index 166d65b672ef8..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/gas_metering/Move.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[package]
-name = "gas_metering"
-version = "0.0.0"
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/gas_metering/args.exp b/third_party/move/tools/move-cli/tests/sandbox_tests/gas_metering/args.exp
deleted file mode 100644
index b3b52aa344e92..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/gas_metering/args.exp
+++ /dev/null
@@ -1,2 +0,0 @@
-Command `sandbox run sources/looper.move --gas-budget 100`:
-Execution failed because of an out of gas error in script at code offset 0
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/gas_metering/args.txt b/third_party/move/tools/move-cli/tests/sandbox_tests/gas_metering/args.txt
deleted file mode 100644
index d7ac52339c574..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/gas_metering/args.txt
+++ /dev/null
@@ -1 +0,0 @@
-sandbox run sources/looper.move --gas-budget 100
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/gas_metering/args.v2_exp b/third_party/move/tools/move-cli/tests/sandbox_tests/gas_metering/args.v2_exp
deleted file mode 100644
index b3b52aa344e92..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/gas_metering/args.v2_exp
+++ /dev/null
@@ -1,2 +0,0 @@
-Command `sandbox run sources/looper.move --gas-budget 100`:
-Execution failed because of an out of gas error in script at code offset 0
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/gas_metering/sources/looper.move b/third_party/move/tools/move-cli/tests/sandbox_tests/gas_metering/sources/looper.move
deleted file mode 100644
index b2cbcdd5890a9..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/gas_metering/sources/looper.move
+++ /dev/null
@@ -1,5 +0,0 @@
-script {
-    fun looper() {
-        loop {}
-    }
-}
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/generate_struct_layout/Move.toml b/third_party/move/tools/move-cli/tests/sandbox_tests/generate_struct_layout/Move.toml
deleted file mode 100644
index f8dbe44abd789..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/generate_struct_layout/Move.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[package]
-name = "generate_struct_layout"
-version = "0.0.0"
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/generate_struct_layout/args.exp b/third_party/move/tools/move-cli/tests/sandbox_tests/generate_struct_layout/args.exp
deleted file mode 100644
index 49e2fd0f3643c..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/generate_struct_layout/args.exp
+++ /dev/null
@@ -1,41 +0,0 @@
-Command `sandbox publish`:
-Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/M2.mv --struct C --type-args u64`:
-Error: Can't resolve module at "storage/0x00000000000000000000000000000001/modules/M2.mv"
-Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/M2.mv --struct C --type-args address`:
-Error: Can't resolve module at "storage/0x00000000000000000000000000000001/modules/M2.mv"
-Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/M2.mv --struct C --type-args vector<u8>`:
-Error: Can't resolve module at "storage/0x00000000000000000000000000000001/modules/M2.mv"
-Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/M1.mv --struct B --type-args bool`:
-Error: Can't resolve module at "storage/0x00000000000000000000000000000001/modules/M1.mv"
-Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/M1.mv --struct B --type-args bool --shallow`:
-Error: Can't resolve module at "storage/0x00000000000000000000000000000001/modules/M1.mv"
-Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/M1.mv --struct A --type-args 0x1::M1::S<u64>`:
-Error: Can't resolve module at "storage/0x00000000000000000000000000000001/modules/M1.mv"
-Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/M1.mv --struct A --type-args vector<0x1::M1::S<u64>>`:
-Error: Can't resolve module at "storage/0x00000000000000000000000000000001/modules/M1.mv"
-Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/M1.mv --struct A --type-args 0x1::M1::S<u64> --shallow`:
-Error: Can't resolve module at "storage/0x00000000000000000000000000000001/modules/M1.mv"
-Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/M1.mv --struct A --type-args vector<0x1::M1::S<u64>> --shallow`:
-Error: Can't resolve module at "storage/0x00000000000000000000000000000001/modules/M1.mv"
-Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/M2.mv --struct C --type-args 0x1::M2::C<u64>`:
-Error: Can't resolve module at "storage/0x00000000000000000000000000000001/modules/M2.mv"
-Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/M1.mv --struct G`:
-Error: Can't resolve module at "storage/0x00000000000000000000000000000001/modules/M1.mv"
-Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/phantoms.mv --struct A --type-args bool --ignore-phantom-types`:
-Error: Can't resolve module at "storage/0x00000000000000000000000000000001/modules/phantoms.mv"
-Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/phantoms.mv --struct A --type-args u64 --ignore-phantom-types`:
-Error: Can't resolve module at "storage/0x00000000000000000000000000000001/modules/phantoms.mv"
-Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/phantoms.mv --struct B --type-args bool u8 --ignore-phantom-types`:
-Error: Can't resolve module at "storage/0x00000000000000000000000000000001/modules/phantoms.mv"
-Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/phantoms.mv --struct C --type-args u8 u64 u128 --ignore-phantom-types`:
-Error: Can't resolve module at "storage/0x00000000000000000000000000000001/modules/phantoms.mv"
-Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/phantoms.mv --struct D --type-args bool u64 --ignore-phantom-types`:
-Error: Can't resolve module at "storage/0x00000000000000000000000000000001/modules/phantoms.mv"
-Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/phantoms.mv --struct E --type-args bool u64 u128 --ignore-phantom-types`:
-Error: Can't resolve module at "storage/0x00000000000000000000000000000001/modules/phantoms.mv"
-Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/phantoms.mv --struct E --type-args bool u64 u128 --omit-addresses`:
-Error: Can't resolve module at "storage/0x00000000000000000000000000000001/modules/phantoms.mv"
-Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/phantoms.mv --struct E --type-args bool u64 u128 --separator __`:
-Error: Can't resolve module at "storage/0x00000000000000000000000000000001/modules/phantoms.mv"
-Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/phantoms.mv --struct E --type-args bool u64 u128 --omit-addresses --separator __`:
-Error: Can't resolve module at "storage/0x00000000000000000000000000000001/modules/phantoms.mv"
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/generate_struct_layout/args.txt b/third_party/move/tools/move-cli/tests/sandbox_tests/generate_struct_layout/args.txt
deleted file mode 100644
index 48e05d1b0d6da..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/generate_struct_layout/args.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-sandbox publish
-
-# basics
-sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/M2.mv --struct C --type-args u64
-sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/M2.mv --struct C --type-args address
-sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/M2.mv --struct C --type-args vector<u8>
-
-# across modules deep
-sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/M1.mv --struct B --type-args bool
-# across modules shallow
-sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/M1.mv --struct B --type-args bool --shallow
-
-# with fancy type parameters
-sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/M1.mv --struct A --type-args 0x1::M1::S<u64>
-sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/M1.mv --struct A --type-args vector<0x1::M1::S<u64>>
-# same thing, but shallow
-sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/M1.mv --struct A --type-args 0x1::M1::S<u64> --shallow
-sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/M1.mv --struct A --type-args vector<0x1::M1::S<u64>> --shallow
-
-# recursive type definition
-sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/M2.mv --struct C --type-args 0x1::M2::C<u64>
-
-# without --type-args
-sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/M1.mv --struct G
-
-# phantom type arguments should not appear in struct keys when --ignore-phantom-types is set
-sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/phantoms.mv --struct A --type-args bool --ignore-phantom-types
-sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/phantoms.mv --struct A --type-args u64 --ignore-phantom-types
-sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/phantoms.mv --struct B --type-args bool u8 --ignore-phantom-types
-sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/phantoms.mv --struct C --type-args u8 u64 u128 --ignore-phantom-types
-sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/phantoms.mv --struct D --type-args bool u64 --ignore-phantom-types
-sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/phantoms.mv --struct E --type-args bool u64 u128 --ignore-phantom-types
-
-# test config options: address omission + separators
-sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/phantoms.mv --struct E --type-args bool u64 u128 --omit-addresses
-
-sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/phantoms.mv --struct E --type-args bool u64 u128 --separator __
-
-sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/phantoms.mv --struct E --type-args bool u64 u128 --omit-addresses --separator __
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/generate_struct_layout/args.v2_exp b/third_party/move/tools/move-cli/tests/sandbox_tests/generate_struct_layout/args.v2_exp
deleted file mode 100644
index 49e2fd0f3643c..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/generate_struct_layout/args.v2_exp
+++ /dev/null
@@ -1,41 +0,0 @@
-Command `sandbox publish`:
-Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/M2.mv --struct C --type-args u64`:
-Error: Can't resolve module at "storage/0x00000000000000000000000000000001/modules/M2.mv"
-Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/M2.mv --struct C --type-args address`:
-Error: Can't resolve module at "storage/0x00000000000000000000000000000001/modules/M2.mv"
-Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/M2.mv --struct C --type-args vector<u8>`:
-Error: Can't resolve module at "storage/0x00000000000000000000000000000001/modules/M2.mv"
-Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/M1.mv --struct B --type-args bool`:
-Error: Can't resolve module at "storage/0x00000000000000000000000000000001/modules/M1.mv"
-Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/M1.mv --struct B --type-args bool --shallow`:
-Error: Can't resolve module at "storage/0x00000000000000000000000000000001/modules/M1.mv"
-Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/M1.mv --struct A --type-args 0x1::M1::S<u64>`:
-Error: Can't resolve module at "storage/0x00000000000000000000000000000001/modules/M1.mv"
-Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/M1.mv --struct A --type-args vector<0x1::M1::S<u64>>`:
-Error: Can't resolve module at "storage/0x00000000000000000000000000000001/modules/M1.mv"
-Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/M1.mv --struct A --type-args 0x1::M1::S<u64> --shallow`:
-Error: Can't resolve module at "storage/0x00000000000000000000000000000001/modules/M1.mv"
-Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/M1.mv --struct A --type-args vector<0x1::M1::S<u64>> --shallow`:
-Error: Can't resolve module at "storage/0x00000000000000000000000000000001/modules/M1.mv"
-Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/M2.mv --struct C --type-args 0x1::M2::C<u64>`:
-Error: Can't resolve module at "storage/0x00000000000000000000000000000001/modules/M2.mv"
-Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/M1.mv --struct G`:
-Error: Can't resolve module at "storage/0x00000000000000000000000000000001/modules/M1.mv"
-Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/phantoms.mv --struct A --type-args bool --ignore-phantom-types`:
-Error: Can't resolve module at "storage/0x00000000000000000000000000000001/modules/phantoms.mv"
-Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/phantoms.mv --struct A --type-args u64 --ignore-phantom-types`:
-Error: Can't resolve module at "storage/0x00000000000000000000000000000001/modules/phantoms.mv"
-Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/phantoms.mv --struct B --type-args bool u8 --ignore-phantom-types`:
-Error: Can't resolve module at "storage/0x00000000000000000000000000000001/modules/phantoms.mv"
-Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/phantoms.mv --struct C --type-args u8 u64 u128 --ignore-phantom-types`:
-Error: Can't resolve module at "storage/0x00000000000000000000000000000001/modules/phantoms.mv"
-Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/phantoms.mv --struct D --type-args bool u64 --ignore-phantom-types`:
-Error: Can't resolve module at "storage/0x00000000000000000000000000000001/modules/phantoms.mv"
-Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/phantoms.mv --struct E --type-args bool u64 u128 --ignore-phantom-types`:
-Error: Can't resolve module at "storage/0x00000000000000000000000000000001/modules/phantoms.mv"
-Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/phantoms.mv --struct E --type-args bool u64 u128 --omit-addresses`:
-Error: Can't resolve module at "storage/0x00000000000000000000000000000001/modules/phantoms.mv"
-Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/phantoms.mv --struct E --type-args bool u64 u128 --separator __`:
-Error: Can't resolve module at "storage/0x00000000000000000000000000000001/modules/phantoms.mv"
-Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/phantoms.mv --struct E --type-args bool u64 u128 --omit-addresses --separator __`:
-Error: Can't resolve module at "storage/0x00000000000000000000000000000001/modules/phantoms.mv"
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/generate_struct_layout/sources/M1.move b/third_party/move/tools/move-cli/tests/sandbox_tests/generate_struct_layout/sources/M1.move
deleted file mode 100644
index a12e3be55d928..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/generate_struct_layout/sources/M1.move
+++ /dev/null
@@ -1,11 +0,0 @@
-module 0x1::M1 {
-    use 0x1::M2::C;
-
-    struct A<T> { f: u64, v: vector<u8>, b: B<T> }
-
-    struct B<T> { a: address, c: C<T>, t: T }
-
-    struct S<T> { t: T }
-
-    struct G { x: u64, s: S<bool> }
-}
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/generate_struct_layout/sources/M2.move b/third_party/move/tools/move-cli/tests/sandbox_tests/generate_struct_layout/sources/M2.move
deleted file mode 100644
index 17e03489f6430..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/generate_struct_layout/sources/M2.move
+++ /dev/null
@@ -1,4 +0,0 @@
-module 0x1::M2 {
-
-    struct C<T> { t: T, b: bool }
-}
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/generate_struct_layout/sources/phantoms.move b/third_party/move/tools/move-cli/tests/sandbox_tests/generate_struct_layout/sources/phantoms.move
deleted file mode 100644
index 592b8eeb9945b..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/generate_struct_layout/sources/phantoms.move
+++ /dev/null
@@ -1,19 +0,0 @@
-module 0x1::phantoms {
-    struct A<phantom T> {}
-
-    struct B<phantom T1, phantom T2> {}
-
-    struct C<phantom T1, phantom T2, phantom T3> {
-        a: A<T1>,
-        b: B<T2, T3>
-    }
-
-    struct D<phantom T1, T2: store> {
-        v: vector<T2>
-    }
-
-    struct E<T1, phantom T2: store, T3> {
-        v1: vector<T1>,
-        v2: vector<T3>
-    }
-}
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/module_disassemble/Move.toml b/third_party/move/tools/move-cli/tests/sandbox_tests/module_disassemble/Move.toml
deleted file mode 100644
index 3540e09a07244..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/module_disassemble/Move.toml
+++ /dev/null
@@ -1,11 +0,0 @@
-[package]
-name = "module_publish_view"
-version = "0.0.0"
-
-[addresses]
-std = "0x1"
-
-[dependencies]
-MoveStdlib = { local = "../../../../../move-stdlib" }
-Deps1 = { local = "deps1" }
-Deps2 = { local = "deps2" }
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/module_disassemble/args.exp b/third_party/move/tools/move-cli/tests/sandbox_tests/module_disassemble/args.exp
deleted file mode 100644
index 4565e2163d869..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/module_disassemble/args.exp
+++ /dev/null
@@ -1,9 +0,0 @@
-Command `sandbox publish -v`:
-Found 2 modules
-Publishing a new module 000000000000000000000000000000000000000000000000000000000000000a::M1 (wrote 247 bytes)
-Publishing a new module 000000000000000000000000000000000000000000000000000000000000000c::M (wrote 297 bytes)
-Wrote 544 bytes of module ID's and code
-Command `sandbox view storage/0x0000000000000000000000000000000a/modules/M1.mv`:
-Bytecode not found.
-Command `sandbox view storage/0x0000000000000000000000000000000c/modules/M.mv`:
-Bytecode not found.
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/module_disassemble/args.txt b/third_party/move/tools/move-cli/tests/sandbox_tests/module_disassemble/args.txt
deleted file mode 100644
index 6952aaf9162f5..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/module_disassemble/args.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-sandbox publish -v
-
-sandbox view storage/0x0000000000000000000000000000000a/modules/M1.mv
-sandbox view storage/0x0000000000000000000000000000000c/modules/M.mv
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/module_disassemble/args.v2_exp b/third_party/move/tools/move-cli/tests/sandbox_tests/module_disassemble/args.v2_exp
deleted file mode 100644
index 9dfdd3e1ff442..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/module_disassemble/args.v2_exp
+++ /dev/null
@@ -1,9 +0,0 @@
-Command `sandbox publish -v`:
-Found 2 modules
-Publishing a new module 000000000000000000000000000000000000000000000000000000000000000a::M1 (wrote 289 bytes)
-Publishing a new module 000000000000000000000000000000000000000000000000000000000000000c::M (wrote 339 bytes)
-Wrote 628 bytes of module ID's and code
-Command `sandbox view storage/0x0000000000000000000000000000000a/modules/M1.mv`:
-Bytecode not found.
-Command `sandbox view storage/0x0000000000000000000000000000000c/modules/M.mv`:
-Bytecode not found.
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/module_disassemble/deps1/Move.toml b/third_party/move/tools/move-cli/tests/sandbox_tests/module_disassemble/deps1/Move.toml
deleted file mode 100644
index 1ef5af7255d26..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/module_disassemble/deps1/Move.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[package]
-name = "Deps1"
-version = "0.0.0"
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/module_disassemble/deps1/sources/NameConflict.move b/third_party/move/tools/move-cli/tests/sandbox_tests/module_disassemble/deps1/sources/NameConflict.move
deleted file mode 100644
index fb8f12e6c026a..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/module_disassemble/deps1/sources/NameConflict.move
+++ /dev/null
@@ -1,5 +0,0 @@
-module 0xa::M {
-    public fun f(): u64 {
-        7
-    }
-}
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/module_disassemble/deps1/sources/NotAConflict.move b/third_party/move/tools/move-cli/tests/sandbox_tests/module_disassemble/deps1/sources/NotAConflict.move
deleted file mode 100644
index 6884c72abd27b..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/module_disassemble/deps1/sources/NotAConflict.move
+++ /dev/null
@@ -1,5 +0,0 @@
-module 0xA::A {
-    public fun g(): u64 {
-        7
-    }
-}
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/module_disassemble/deps2/Move.toml b/third_party/move/tools/move-cli/tests/sandbox_tests/module_disassemble/deps2/Move.toml
deleted file mode 100644
index 73b27bc13276e..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/module_disassemble/deps2/Move.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[package]
-name = "Deps2"
-version = "0.0.0"
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/module_disassemble/deps2/sources/NameConflict.move b/third_party/move/tools/move-cli/tests/sandbox_tests/module_disassemble/deps2/sources/NameConflict.move
deleted file mode 100644
index 3b0ef36d22a69..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/module_disassemble/deps2/sources/NameConflict.move
+++ /dev/null
@@ -1,5 +0,0 @@
-module 0xb::M {
-    public fun f(): u64 {
-        7
-    }
-}
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/module_disassemble/deps2/sources/NotAConflict.move b/third_party/move/tools/move-cli/tests/sandbox_tests/module_disassemble/deps2/sources/NotAConflict.move
deleted file mode 100644
index 25170afebce3a..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/module_disassemble/deps2/sources/NotAConflict.move
+++ /dev/null
@@ -1,5 +0,0 @@
-module 0xB::B {
-    public fun g(): u64 {
-        7
-    }
-}
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/module_disassemble/sources/M1.move b/third_party/move/tools/move-cli/tests/sandbox_tests/module_disassemble/sources/M1.move
deleted file mode 100644
index c62537c599a5c..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/module_disassemble/sources/M1.move
+++ /dev/null
@@ -1,14 +0,0 @@
-module 0xa::M1 {
-    use std::vector;
-
-    struct S { i: u64 }
-
-    public fun foo(x: u64): vector<u64> {
-        let y = bar();
-        vector::singleton(x + y)
-    }
-
-    public fun bar(): u64 {
-        7
-    }
-}
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/module_disassemble/sources/NameConflict.move b/third_party/move/tools/move-cli/tests/sandbox_tests/module_disassemble/sources/NameConflict.move
deleted file mode 100644
index 658fca02bbbd0..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/module_disassemble/sources/NameConflict.move
+++ /dev/null
@@ -1,18 +0,0 @@
-module 0xc::M {
-
-    public fun f(): u64 {
-        7
-    }
-
-    public fun g(): u64 {
-        12
-    }
-
-    public fun call_f(): u64 {
-        f() + 0xa::M::f() + 0xb::M::f()
-    }
-
-    public fun call_g(): u64 {
-        g() + 0xa::A::g() + 0xb::B::g()
-    }
-}
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/module_publish_view/Move.toml b/third_party/move/tools/move-cli/tests/sandbox_tests/module_publish_view/Move.toml
deleted file mode 100644
index c737ec728cf95..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/module_publish_view/Move.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[package]
-name = "module_publish_view"
-version = "0.0.0"
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/module_publish_view/args.exp b/third_party/move/tools/move-cli/tests/sandbox_tests/module_publish_view/args.exp
deleted file mode 100644
index 8a5628e89af10..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/module_publish_view/args.exp
+++ /dev/null
@@ -1,6 +0,0 @@
-Command `sandbox publish -v`:
-Found 1 modules
-Publishing a new module 0000000000000000000000000000000000000000000000000000000000000042::Module (wrote 152 bytes)
-Wrote 152 bytes of module ID's and code
-Command `sandbox view storage/0x00000000000000000000000000000042/modules/Module.mv`:
-Bytecode not found.
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/module_publish_view/args.txt b/third_party/move/tools/move-cli/tests/sandbox_tests/module_publish_view/args.txt
deleted file mode 100644
index abef8105e914a..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/module_publish_view/args.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-sandbox publish -v
-sandbox view storage/0x00000000000000000000000000000042/modules/Module.mv
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/module_publish_view/args.v2_exp b/third_party/move/tools/move-cli/tests/sandbox_tests/module_publish_view/args.v2_exp
deleted file mode 100644
index 3b91c3615e37e..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/module_publish_view/args.v2_exp
+++ /dev/null
@@ -1,6 +0,0 @@
-Command `sandbox publish -v`:
-Found 1 modules
-Publishing a new module 0000000000000000000000000000000000000000000000000000000000000042::Module (wrote 193 bytes)
-Wrote 193 bytes of module ID's and code
-Command `sandbox view storage/0x00000000000000000000000000000042/modules/Module.mv`:
-Bytecode not found.
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/module_publish_view/sources/Module.move b/third_party/move/tools/move-cli/tests/sandbox_tests/module_publish_view/sources/Module.move
deleted file mode 100644
index 3bde7f18c916b..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/module_publish_view/sources/Module.move
+++ /dev/null
@@ -1,9 +0,0 @@
-address 0x42 {
-module Module {
-    struct S { i: u64 }
-
-    public fun foo(i: u64): S {
-        S { i }
-    }
-}
-}
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/multi_module_publish/Move.toml b/third_party/move/tools/move-cli/tests/sandbox_tests/multi_module_publish/Move.toml
deleted file mode 100644
index 63d7cf4b95a51..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/multi_module_publish/Move.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[package]
-name = "multi_module_publish"
-version = "0.0.0"
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/multi_module_publish/args.exp b/third_party/move/tools/move-cli/tests/sandbox_tests/multi_module_publish/args.exp
deleted file mode 100644
index 65ad6cdf308b1..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/multi_module_publish/args.exp
+++ /dev/null
@@ -1,18 +0,0 @@
-Command `sandbox publish --bundle --override-ordering A -v`:
-Found 2 modules
-Invalid multi-module publishing: VMError with status LINKER_ERROR at location UNDEFINED and message Linker Error: Module 0000000000000000000000000000000000000000000000000000000000000002::B doesn't exist
-Command `sandbox publish --bundle --override-ordering B -v`:
-Found 2 modules
-Invalid multi-module publishing: VMError with status LINKER_ERROR at location UNDEFINED and message Linker Error: Module 0000000000000000000000000000000000000000000000000000000000000002::A doesn't exist
-Command `sandbox publish --bundle --override-ordering B --override-ordering A -v`:
-Found 2 modules
-Invalid multi-module publishing: VMError with status LINKER_ERROR at location UNDEFINED and message Linker Error: Module 0000000000000000000000000000000000000000000000000000000000000002::A doesn't exist
-Command `sandbox publish --bundle --override-ordering A --override-ordering B -v`:
-Found 2 modules
-Publishing a new module 0000000000000000000000000000000000000000000000000000000000000002::A (wrote 121 bytes)
-Publishing a new module 0000000000000000000000000000000000000000000000000000000000000002::B (wrote 129 bytes)
-Wrote 250 bytes of module ID's and code
-Command `sandbox view storage/0x00000000000000000000000000000002/modules/A.mv`:
-Bytecode not found.
-Command `sandbox view storage/0x00000000000000000000000000000002/modules/B.mv`:
-Bytecode not found.
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/multi_module_publish/args.txt b/third_party/move/tools/move-cli/tests/sandbox_tests/multi_module_publish/args.txt
deleted file mode 100644
index 704e4ab799bab..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/multi_module_publish/args.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-# expect failure as A friends B and B is missing in the bundle
-sandbox publish --bundle --override-ordering A -v
-
-# expect failure as B depends on A and A is missing in the bundle
-sandbox publish --bundle --override-ordering B -v
-
-# expect failure as B depends on A but A appears after B in the bundle
-sandbox publish --bundle --override-ordering B --override-ordering A -v
-
-# expect success: this is the correct order of publishing A and B
-# with friend relationship
-sandbox publish --bundle --override-ordering A --override-ordering B -v
-sandbox view storage/0x00000000000000000000000000000002/modules/A.mv
-sandbox view storage/0x00000000000000000000000000000002/modules/B.mv
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/multi_module_publish/args.v2_exp b/third_party/move/tools/move-cli/tests/sandbox_tests/multi_module_publish/args.v2_exp
deleted file mode 100644
index 9f884f9f0ae7c..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/multi_module_publish/args.v2_exp
+++ /dev/null
@@ -1,18 +0,0 @@
-Command `sandbox publish --bundle --override-ordering A -v`:
-Found 2 modules
-Invalid multi-module publishing: VMError with status LINKER_ERROR at location UNDEFINED and message Linker Error: Cannot find ModuleId { address: 0000000000000000000000000000000000000000000000000000000000000002, name: Identifier("B") } in data cache
-Command `sandbox publish --bundle --override-ordering B -v`:
-Found 2 modules
-Invalid multi-module publishing: VMError with status LINKER_ERROR at location UNDEFINED and message Linker Error: Cannot find ModuleId { address: 0000000000000000000000000000000000000000000000000000000000000002, name: Identifier("A") } in data cache
-Command `sandbox publish --bundle --override-ordering B --override-ordering A -v`:
-Found 2 modules
-Invalid multi-module publishing: VMError with status LINKER_ERROR at location UNDEFINED and message Linker Error: Cannot find ModuleId { address: 0000000000000000000000000000000000000000000000000000000000000002, name: Identifier("A") } in data cache
-Command `sandbox publish --bundle --override-ordering A --override-ordering B -v`:
-Found 2 modules
-Publishing a new module 0000000000000000000000000000000000000000000000000000000000000002::A (wrote 162 bytes)
-Publishing a new module 0000000000000000000000000000000000000000000000000000000000000002::B (wrote 170 bytes)
-Wrote 332 bytes of module ID's and code
-Command `sandbox view storage/0x00000000000000000000000000000002/modules/A.mv`:
-Bytecode not found.
-Command `sandbox view storage/0x00000000000000000000000000000002/modules/B.mv`:
-Bytecode not found.
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/multi_module_publish/sources/GoodFriends.move b/third_party/move/tools/move-cli/tests/sandbox_tests/multi_module_publish/sources/GoodFriends.move
deleted file mode 100644
index 272fe9b210881..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/multi_module_publish/sources/GoodFriends.move
+++ /dev/null
@@ -1,8 +0,0 @@
-module 0x2::A {
-    friend 0x2::B;
-    public(friend) fun foo() {}
-}
-
-module 0x2::B {
-    fun bar() { 0x2::A::foo() }
-}
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/offer_smoke/Move.toml b/third_party/move/tools/move-cli/tests/sandbox_tests/offer_smoke/Move.toml
deleted file mode 100644
index 13feeae8c046e..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/offer_smoke/Move.toml
+++ /dev/null
@@ -1,9 +0,0 @@
-[package]
-name = "build_include_exclude_stdlib"
-version = "0.0.0"
-
-[addresses]
-std = "0x1"
-
-[dependencies]
-MoveNursery = { local = "../../../../../move-stdlib/nursery" }
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/offer_smoke/args.exp b/third_party/move/tools/move-cli/tests/sandbox_tests/offer_smoke/args.exp
deleted file mode 100644
index 5051cf46cc9d4..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/offer_smoke/args.exp
+++ /dev/null
@@ -1,14 +0,0 @@
-Command `sandbox publish`:
-Command `sandbox run scripts/create_offer.move --signers 0xA11CE`:
-Command `sandbox run scripts/redeem_offer.move --signers 0xCA21`:
-Execution aborted with code 65536 in module 0000000000000000000000000000000000000000000000000000000000000001::offer.
-Command `sandbox run scripts/redeem_offer_bob.move --signers 0xB0B`:
-Command `sandbox run scripts/reclaim_offer.move --signers 0xB0B`:
-Command `sandbox clean`:
-Command `sandbox run scripts/self_offer_create.move --signers 0xA11CE`:
-Command `sandbox clean`:
-Command `sandbox run scripts/multi_offer.move --signers 0xA11CE`:
-Execution aborted with code 524289 in module 0000000000000000000000000000000000000000000000000000000000000001::offer.
-Command `sandbox clean`:
-Command `sandbox run scripts/non_existent_offer.move --signers 0xA11CE`:
-Execution aborted with code 393218 in module 0000000000000000000000000000000000000000000000000000000000000001::offer.
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/offer_smoke/args.txt b/third_party/move/tools/move-cli/tests/sandbox_tests/offer_smoke/args.txt
deleted file mode 100644
index 23a39e5fcbc0c..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/offer_smoke/args.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-sandbox publish
-sandbox run scripts/create_offer.move --signers 0xA11CE
-sandbox run scripts/redeem_offer.move --signers 0xCA21
-sandbox run scripts/redeem_offer_bob.move --signers 0xB0B
-sandbox run scripts/reclaim_offer.move --signers 0xB0B
-sandbox clean
-sandbox run scripts/self_offer_create.move --signers 0xA11CE
-sandbox clean
-sandbox run scripts/multi_offer.move --signers 0xA11CE
-sandbox clean
-sandbox run scripts/non_existent_offer.move --signers 0xA11CE
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/offer_smoke/args.v2_exp b/third_party/move/tools/move-cli/tests/sandbox_tests/offer_smoke/args.v2_exp
deleted file mode 100644
index 5051cf46cc9d4..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/offer_smoke/args.v2_exp
+++ /dev/null
@@ -1,14 +0,0 @@
-Command `sandbox publish`:
-Command `sandbox run scripts/create_offer.move --signers 0xA11CE`:
-Command `sandbox run scripts/redeem_offer.move --signers 0xCA21`:
-Execution aborted with code 65536 in module 0000000000000000000000000000000000000000000000000000000000000001::offer.
-Command `sandbox run scripts/redeem_offer_bob.move --signers 0xB0B`:
-Command `sandbox run scripts/reclaim_offer.move --signers 0xB0B`:
-Command `sandbox clean`:
-Command `sandbox run scripts/self_offer_create.move --signers 0xA11CE`:
-Command `sandbox clean`:
-Command `sandbox run scripts/multi_offer.move --signers 0xA11CE`:
-Execution aborted with code 524289 in module 0000000000000000000000000000000000000000000000000000000000000001::offer.
-Command `sandbox clean`:
-Command `sandbox run scripts/non_existent_offer.move --signers 0xA11CE`:
-Execution aborted with code 393218 in module 0000000000000000000000000000000000000000000000000000000000000001::offer.
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/offer_smoke/scripts/create_offer.move b/third_party/move/tools/move-cli/tests/sandbox_tests/offer_smoke/scripts/create_offer.move
deleted file mode 100644
index 909448d5a4797..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/offer_smoke/scripts/create_offer.move
+++ /dev/null
@@ -1,14 +0,0 @@
-// 1
-script {
-use 0x1::M;
-use std::offer;
-use std::signer;
-
-// Alice creates an offer for Bob that contains an M::T resource
-fun create_offer(account: signer) {
-    let sender = signer::address_of(&account);
-    offer::create(&account, M::create(), @0xB0B);
-    assert!(offer::exists_at<M::T>(sender), 77);
-    assert!(offer::address_of<M::T>(sender) == @0xB0B , 78);
-}
-}
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/offer_smoke/scripts/multi_offer.move b/third_party/move/tools/move-cli/tests/sandbox_tests/offer_smoke/scripts/multi_offer.move
deleted file mode 100644
index 2702012dfc6c5..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/offer_smoke/scripts/multi_offer.move
+++ /dev/null
@@ -1,8 +0,0 @@
-// Script 1, sender: alice
-script {
-use std::offer;
-fun multi_offer(account: signer) {
-    offer::create(&account, 0, @0xA11CE);
-    offer::create(&account, 0, @0x4);
-}
-}
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/offer_smoke/scripts/non_existent_offer.move b/third_party/move/tools/move-cli/tests/sandbox_tests/offer_smoke/scripts/non_existent_offer.move
deleted file mode 100644
index 61613cc992719..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/offer_smoke/scripts/non_existent_offer.move
+++ /dev/null
@@ -1,7 +0,0 @@
-script {
-use std::offer;
-fun non_existent_offer(account: signer) {
-    offer::redeem<u64>(&account, @0xA11CE);
-    offer::address_of<u64>(@0xA11CE);
-}
-}
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/offer_smoke/scripts/reclaim_offer.move b/third_party/move/tools/move-cli/tests/sandbox_tests/offer_smoke/scripts/reclaim_offer.move
deleted file mode 100644
index 5fd8aec0689c7..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/offer_smoke/scripts/reclaim_offer.move
+++ /dev/null
@@ -1,10 +0,0 @@
-// script 4, sender: bob
-script {
-use 0x1::M;
-use std::offer;
-
-// Bob should be able to reclaim his own offer for Carl
-fun reclaim_offer(account: signer) {
-    M::publish(&account, offer::redeem<M::T>(&account, @0xB0B));
-}
-}
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/offer_smoke/scripts/redeem_offer.move b/third_party/move/tools/move-cli/tests/sandbox_tests/offer_smoke/scripts/redeem_offer.move
deleted file mode 100644
index 082c9dfff8f18..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/offer_smoke/scripts/redeem_offer.move
+++ /dev/null
@@ -1,10 +0,0 @@
-// script 2: sender: Carl
-script {
-use 0x1::M;
-use std::offer;
-
-// Carl should *not* be able to claim Alice's offer for Bob
-fun redeem_offer(account: signer) {
-    M::publish(&account, offer::redeem(&account, @0xA11CE));
-}
-}
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/offer_smoke/scripts/redeem_offer_bob.move b/third_party/move/tools/move-cli/tests/sandbox_tests/offer_smoke/scripts/redeem_offer_bob.move
deleted file mode 100644
index 491b6e99aff53..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/offer_smoke/scripts/redeem_offer_bob.move
+++ /dev/null
@@ -1,17 +0,0 @@
-// script 3, sender: bob
-script {
-use 0x1::M;
-use std::offer;
-
-// Bob should be able to claim Alice's offer for him
-fun redeem_offer_bob(account: signer) {
-    // claimed successfully
-    let redeemed: M::T = offer::redeem(&account, @0xA11CE);
-
-    // offer should not longer exist
-    assert!(!offer::exists_at<M::T>(@0xA11CE), 79);
-
-    // create a new offer for Carl
-    offer::create(&account, redeemed, @0xCA21);
-}
-}
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/offer_smoke/scripts/self_offer_create.move b/third_party/move/tools/move-cli/tests/sandbox_tests/offer_smoke/scripts/self_offer_create.move
deleted file mode 100644
index 9c890536572ba..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/offer_smoke/scripts/self_offer_create.move
+++ /dev/null
@@ -1,13 +0,0 @@
-// Script 1, seder: alice
-script {
-use std::offer;
-use std::signer;
-
-// Create a self offer containing a u64
-fun self_offer_create(account: signer) {
-    let sender = signer::address_of(&account);
-    offer::create(&account, 7, @0xA11CE);
-    assert!(offer::address_of<u64>(sender) == @0xA11CE , 100);
-    assert!(offer::redeem(&account, @0xA11CE) == 7, 101);
-}
-}
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/offer_smoke/sources/M.move b/third_party/move/tools/move-cli/tests/sandbox_tests/offer_smoke/sources/M.move
deleted file mode 100644
index 6ed3177bb6614..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/offer_smoke/sources/M.move
+++ /dev/null
@@ -1,14 +0,0 @@
-// Just a dummy module with a test resource
-address 0x1 {
-module M {
-    struct T has key, store { b: bool }
-
-    public fun create(): T {
-        T { b: true }
-    }
-
-    public fun publish(account: &signer, t: T) {
-        move_to(account,  t);
-    }
-}
-}
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/package_basics/Move.toml b/third_party/move/tools/move-cli/tests/sandbox_tests/package_basics/Move.toml
deleted file mode 100644
index 3a0e252b18546..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/package_basics/Move.toml
+++ /dev/null
@@ -1,9 +0,0 @@
-[package]
-name = "PackageBasics"
-version = "0.0.0"
-
-[addresses]
-std = "0x1"
-
-[dependencies]
-MoveStdlib = { local = "../../../../../move-stdlib" }
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/package_basics/args.exp b/third_party/move/tools/move-cli/tests/sandbox_tests/package_basics/args.exp
deleted file mode 100644
index 4c354d7743af5..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/package_basics/args.exp
+++ /dev/null
@@ -1,105 +0,0 @@
-Command `build`:
-INCLUDING DEPENDENCY MoveStdlib
-BUILDING PackageBasics
-Command `test --coverage --threads 1`:
-INCLUDING DEPENDENCY MoveStdlib
-BUILDING PackageBasics
-Running Move unit tests
-[ PASS    ] 0x1::AModule::double_three
-[ PASS    ] 0x1::AModule::double_two
-[ PASS    ] 0x1::AModuleTests::double_one_one
-[ PASS    ] 0x1::AModuleTests::double_three
-[ PASS    ] 0x1::AModuleTests::double_zero_zero
-[ PASS    ] 0x1::AModuleTests::double_zero_zero_wrong
-Test result: OK. Total tests: 6; passed: 6; failed: 0
-Command `coverage summary --summarize-functions`:
-+-------------------------+
-| Move Coverage Summary   |
-+-------------------------+
-Module 0000000000000000000000000000000000000000000000000000000000000001::AModule
-	fun double_except_three
-		total: 11
-		covered: 11
-		% coverage: 100.00
->>> % Module coverage: 100.00
-+-------------------------+
-| % Move Coverage: 100.00  |
-+-------------------------+
-Command `coverage source --module AModule`:
-module std::AModule {
-
-    /// x was three
-    const E_IS_THREE: u64 = 0;
-
-    public fun double_except_three(x: u64): u64 {
-        assert!(x != 3, E_IS_THREE);
-        x * x
-    }
-
-    #[test]
-    fun double_two() {
-        assert!(double_except_three(4) == 16, 0)
-    }
-
-    #[test]
-    #[expected_failure]
-    fun double_three() {
-        double_except_three(3);
-    }
-}
-Command `coverage bytecode --module AModule`:
-// Move bytecode v6
-module 1.AModule {
-
-
-public double_except_three(x: u64): u64 /* def_idx: 0 */ {
-B0:
-[6]	0: CopyLoc[0](x: u64)
-[6]	1: LdU64(3)
-[6]	2: Neq
-[6]	3: BrFalse(5)
-B1:
-[4]	4: Branch(7)
-B2:
-[2]	5: LdConst[0](U64: [0, 0, 0, 0, 0, 0, 0, 0])
-[2]	6: Abort
-B3:
-[4]	7: CopyLoc[0](x: u64)
-[4]	8: MoveLoc[0](x: u64)
-[4]	9: Mul
-[4]	10: Ret
-}
-}
-Command `disassemble --package MoveStdlib --name signer`:
-// Move bytecode v6
-module 1.signer {
-
-
-public address_of(s: &signer): address /* def_idx: 0 */ {
-B0:
-	0: MoveLoc[0](s: &signer)
-	1: Call borrow_address(&signer): &address
-	2: ReadRef
-	3: Ret
-}
-native public borrow_address(s: &signer): &address /* def_idx: 1 */
-}
-Command `errmap`:
-Command `info`:
-error: unrecognized subcommand 'info'
-
-Usage: move [OPTIONS] <COMMAND>
-
-For more information, try '--help'.
-Command `test double_two`:
-INCLUDING DEPENDENCY MoveStdlib
-BUILDING PackageBasics
-Running Move unit tests
-[ PASS    ] 0x1::AModule::double_two
-Test result: OK. Total tests: 1; passed: 1; failed: 0
-Command `test one_one`:
-INCLUDING DEPENDENCY MoveStdlib
-BUILDING PackageBasics
-Running Move unit tests
-[ PASS    ] 0x1::AModuleTests::double_one_one
-Test result: OK. Total tests: 1; passed: 1; failed: 0
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/package_basics/args.txt b/third_party/move/tools/move-cli/tests/sandbox_tests/package_basics/args.txt
deleted file mode 100644
index 64ea070e28d34..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/package_basics/args.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-build
-test --coverage --threads 1
-coverage summary --summarize-functions
-coverage source --module AModule
-coverage bytecode --module AModule
-disassemble --package MoveStdlib --name signer
-errmap
-info
-test double_two
-test one_one
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/package_basics/args.v2_exp b/third_party/move/tools/move-cli/tests/sandbox_tests/package_basics/args.v2_exp
deleted file mode 100644
index eec23a8086190..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/package_basics/args.v2_exp
+++ /dev/null
@@ -1,108 +0,0 @@
-Command `build`:
-INCLUDING DEPENDENCY MoveStdlib
-BUILDING PackageBasics
-Command `test --coverage --threads 1`:
-INCLUDING DEPENDENCY MoveStdlib
-BUILDING PackageBasics
-Running Move unit tests
-[ PASS    ] 0x1::AModule::double_three
-[ PASS    ] 0x1::AModule::double_two
-[ PASS    ] 0x1::AModuleTests::double_one_one
-[ PASS    ] 0x1::AModuleTests::double_three
-[ PASS    ] 0x1::AModuleTests::double_zero_zero
-[ PASS    ] 0x1::AModuleTests::double_zero_zero_wrong
-Test result: OK. Total tests: 6; passed: 6; failed: 0
-Command `coverage summary --summarize-functions`:
-+-------------------------+
-| Move Coverage Summary   |
-+-------------------------+
-Module 0000000000000000000000000000000000000000000000000000000000000001::AModule
-	fun double_except_three
-		total: 13
-		covered: 13
-		% coverage: 100.00
->>> % Module coverage: 100.00
-+-------------------------+
-| % Move Coverage: 100.00  |
-+-------------------------+
-Command `coverage source --module AModule`:
-module std::AModule {
-
-    /// x was three
-    const E_IS_THREE: u64 = 0;
-
-    public fun double_except_three(x: u64): u64 {
-        assert!(x != 3, E_IS_THREE);
-        x * x
-    }
-
-    #[test]
-    fun double_two() {
-        assert!(double_except_three(4) == 16, 0)
-    }
-
-    #[test]
-    #[expected_failure]
-    fun double_three() {
-        double_except_three(3);
-    }
-}
-Command `coverage bytecode --module AModule`:
-// Move bytecode v7
-module 1.AModule {
-
-
-public double_except_three(x: u64): u64 /* def_idx: 0 */ {
-L1:	$t3: u64
-B0:
-[6]	0: LdU64(3)
-[6]	1: StLoc[1]($t3: u64)
-[6]	2: CopyLoc[0](x: u64)
-[6]	3: MoveLoc[1]($t3: u64)
-[6]	4: Neq
-[6]	5: BrFalse(7)
-B1:
-[4]	6: Branch(9)
-B2:
-[2]	7: LdU64(0)
-[2]	8: Abort
-B3:
-[4]	9: CopyLoc[0](x: u64)
-[4]	10: MoveLoc[0](x: u64)
-[4]	11: Mul
-[4]	12: Ret
-}
-}
-Command `disassemble --package MoveStdlib --name signer`:
-// Move bytecode v7
-module 1.signer {
-
-
-public address_of(s: &signer): address /* def_idx: 0 */ {
-B0:
-	0: MoveLoc[0](s: &signer)
-	1: Call borrow_address(&signer): &address
-	2: ReadRef
-	3: Ret
-}
-native public borrow_address(s: &signer): &address /* def_idx: 1 */
-}
-Command `errmap`:
-Command `info`:
-error: unrecognized subcommand 'info'
-
-Usage: move [OPTIONS] <COMMAND>
-
-For more information, try '--help'.
-Command `test double_two`:
-INCLUDING DEPENDENCY MoveStdlib
-BUILDING PackageBasics
-Running Move unit tests
-[ PASS    ] 0x1::AModule::double_two
-Test result: OK. Total tests: 1; passed: 1; failed: 0
-Command `test one_one`:
-INCLUDING DEPENDENCY MoveStdlib
-BUILDING PackageBasics
-Running Move unit tests
-[ PASS    ] 0x1::AModuleTests::double_one_one
-Test result: OK. Total tests: 1; passed: 1; failed: 0
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/package_basics/error_map.errmap b/third_party/move/tools/move-cli/tests/sandbox_tests/package_basics/error_map.errmap
deleted file mode 100644
index 9aee442b1a8cd..0000000000000
Binary files a/third_party/move/tools/move-cli/tests/sandbox_tests/package_basics/error_map.errmap and /dev/null differ
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/package_basics/sources/AModule.move b/third_party/move/tools/move-cli/tests/sandbox_tests/package_basics/sources/AModule.move
deleted file mode 100644
index 4c186804d715e..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/package_basics/sources/AModule.move
+++ /dev/null
@@ -1,21 +0,0 @@
-module std::AModule {
-
-    /// x was three
-    const E_IS_THREE: u64 = 0;
-
-    public fun double_except_three(x: u64): u64 {
-        assert!(x != 3, E_IS_THREE);
-        x * x
-    }
-
-    #[test]
-    fun double_two() {
-        assert!(double_except_three(4) == 16, 0)
-    }
-
-    #[test]
-    #[expected_failure]
-    fun double_three() {
-        double_except_three(3);
-    }
-}
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/package_basics/tests/AModuleTests.move b/third_party/move/tools/move-cli/tests/sandbox_tests/package_basics/tests/AModuleTests.move
deleted file mode 100644
index a1bebfeee06c4..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/package_basics/tests/AModuleTests.move
+++ /dev/null
@@ -1,26 +0,0 @@
-#[test_only]
-module std::AModuleTests {
-    use std::AModule;
-
-    #[test]
-    fun double_zero_zero() {
-        assert!(AModule::double_except_three(0) == 0, 0)
-    }
-
-    #[test]
-    #[expected_failure(abort_code = 0, location = std::AModule)]
-    fun double_three() {
-        AModule::double_except_three(3);
-    }
-
-    #[test]
-    #[expected_failure(abort_code = 0, location = Self)]
-    fun double_zero_zero_wrong() {
-        assert!(AModule::double_except_three(0) == 1, 0)
-    }
-
-    #[test]
-    fun double_one_one() {
-        assert!(AModule::double_except_three(1) == 1, 0)
-    }
-}
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/print_stack_trace/Move.toml b/third_party/move/tools/move-cli/tests/sandbox_tests/print_stack_trace/Move.toml
deleted file mode 100644
index 1530886a0c8bf..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/print_stack_trace/Move.toml
+++ /dev/null
@@ -1,9 +0,0 @@
-[package]
-name = "print_stack_trace"
-version = "0.0.0"
-
-[addresses]
-std = "0x1"
-
-[dependencies]
-MoveNursery = { local = "../../../../../move-stdlib/nursery" }
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/print_stack_trace/args.exp b/third_party/move/tools/move-cli/tests/sandbox_tests/print_stack_trace/args.exp
deleted file mode 100644
index 145843946bca7..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/print_stack_trace/args.exp
+++ /dev/null
@@ -1,178 +0,0 @@
-Command `sandbox publish`:
-Command `sandbox run scripts/print_stack_trace.move --dry-run`:
-Call Stack:
-    [0] main
-
-        Code:
-            [10] LdU64(1)
-            [11] VecImmBorrow(2)
-            [12] StLoc(0)
-          > [13] CallGeneric(0)
-            [14] StLoc(2)
-            [15] ImmBorrowLoc(2)
-            [16] CallGeneric(1)
-
-        Locals:
-            [0] false
-            [1] [true, false]
-            [2] -
-
-
-    [1] 0000000000000000000000000000000000000000000000000000000000000002::N::foo<bool, u64>
-
-        Code:
-            [2] MutBorrowLoc(0)
-            [3] StLoc(1)
-            [4] LdU64(4)
-          > [5] Call(1)
-            [6] StLoc(2)
-            [7] MoveLoc(1)
-            [8] Pop
-
-        Locals:
-            [0] 3
-            [1] 3
-            [2] -
-
-
-    [2] 0000000000000000000000000000000000000000000000000000000000000002::M::sum
-
-        Code:
-            [9] MoveLoc(0)
-            [10] LdU64(1)
-            [11] Sub
-          > [12] Call(0)
-            [13] Add
-            [14] StLoc(1)
-            [15] MoveLoc(1)
-
-        Locals:
-            [0] -
-            [1] -
-
-
-    [3] 0000000000000000000000000000000000000000000000000000000000000002::M::sum
-
-        Code:
-            [9] MoveLoc(0)
-            [10] LdU64(1)
-            [11] Sub
-          > [12] Call(0)
-            [13] Add
-            [14] StLoc(1)
-            [15] MoveLoc(1)
-
-        Locals:
-            [0] -
-            [1] -
-
-
-    [4] 0000000000000000000000000000000000000000000000000000000000000002::M::sum
-
-        Code:
-            [9] MoveLoc(0)
-            [10] LdU64(1)
-            [11] Sub
-          > [12] Call(0)
-            [13] Add
-            [14] StLoc(1)
-            [15] MoveLoc(1)
-
-        Locals:
-            [0] -
-            [1] -
-
-
-Operand Stack:
-    [0] 4
-    [1] 3
-    [2] 2
-
-[debug] 10
-Call Stack:
-    [0] main
-
-        Code:
-            [16] CallGeneric(1)
-            [17] MoveLoc(0)
-            [18] Pop
-          > [19] CallGeneric(2)
-            [20] Pop
-            [21] Ret
-
-        Locals:
-            [0] -
-            [1] [true, false]
-            [2] 10
-
-
-    [1] 0000000000000000000000000000000000000000000000000000000000000002::N::foo<u8, bool>
-
-        Code:
-            [2] MutBorrowLoc(0)
-            [3] StLoc(1)
-            [4] LdU64(4)
-          > [5] Call(1)
-            [6] StLoc(2)
-            [7] MoveLoc(1)
-            [8] Pop
-
-        Locals:
-            [0] 3
-            [1] 3
-            [2] -
-
-
-    [2] 0000000000000000000000000000000000000000000000000000000000000002::M::sum
-
-        Code:
-            [9] MoveLoc(0)
-            [10] LdU64(1)
-            [11] Sub
-          > [12] Call(0)
-            [13] Add
-            [14] StLoc(1)
-            [15] MoveLoc(1)
-
-        Locals:
-            [0] -
-            [1] -
-
-
-    [3] 0000000000000000000000000000000000000000000000000000000000000002::M::sum
-
-        Code:
-            [9] MoveLoc(0)
-            [10] LdU64(1)
-            [11] Sub
-          > [12] Call(0)
-            [13] Add
-            [14] StLoc(1)
-            [15] MoveLoc(1)
-
-        Locals:
-            [0] -
-            [1] -
-
-
-    [4] 0000000000000000000000000000000000000000000000000000000000000002::M::sum
-
-        Code:
-            [9] MoveLoc(0)
-            [10] LdU64(1)
-            [11] Sub
-          > [12] Call(0)
-            [13] Add
-            [14] StLoc(1)
-            [15] MoveLoc(1)
-
-        Locals:
-            [0] -
-            [1] -
-
-
-Operand Stack:
-    [0] 4
-    [1] 3
-    [2] 2
-
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/print_stack_trace/args.txt b/third_party/move/tools/move-cli/tests/sandbox_tests/print_stack_trace/args.txt
deleted file mode 100644
index dc867f58aa8f0..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/print_stack_trace/args.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-sandbox publish
-sandbox run scripts/print_stack_trace.move --dry-run
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/print_stack_trace/args.v2_exp b/third_party/move/tools/move-cli/tests/sandbox_tests/print_stack_trace/args.v2_exp
deleted file mode 100644
index e454f0e81500b..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/print_stack_trace/args.v2_exp
+++ /dev/null
@@ -1,197 +0,0 @@
-Command `sandbox publish`:
-Command `sandbox run scripts/print_stack_trace.move --dry-run`:
-Call Stack:
-    [0] main
-
-        Code:
-            [9] FreezeRef
-            [10] LdU64(1)
-            [11] VecImmBorrow(1)
-          > [12] CallGeneric(0)
-            [13] StLoc(1)
-            [14] ImmBorrowLoc(1)
-            [15] CallGeneric(1)
-
-        Locals:
-            [0] [true, false]
-            [1] -
-            [2] -
-
-
-    [1] 0000000000000000000000000000000000000000000000000000000000000002::N::foo<bool, u64>
-
-        Code:
-            [1] StLoc(0)
-            [2] MutBorrowLoc(0)
-            [3] LdU64(4)
-          > [4] Call(1)
-            [5] StLoc(1)
-            [6] StLoc(2)
-            [7] MoveLoc(2)
-
-        Locals:
-            [0] 3
-            [1] -
-            [2] -
-            [3] -
-            [4] -
-
-
-    [2] 0000000000000000000000000000000000000000000000000000000000000002::M::sum
-
-        Code:
-            [12] CopyLoc(0)
-            [13] MoveLoc(3)
-            [14] Sub
-          > [15] Call(0)
-            [16] StLoc(4)
-            [17] MoveLoc(0)
-            [18] MoveLoc(4)
-
-        Locals:
-            [0] 4
-            [1] -
-            [2] -
-            [3] -
-            [4] -
-
-
-    [3] 0000000000000000000000000000000000000000000000000000000000000002::M::sum
-
-        Code:
-            [12] CopyLoc(0)
-            [13] MoveLoc(3)
-            [14] Sub
-          > [15] Call(0)
-            [16] StLoc(4)
-            [17] MoveLoc(0)
-            [18] MoveLoc(4)
-
-        Locals:
-            [0] 3
-            [1] -
-            [2] -
-            [3] -
-            [4] -
-
-
-    [4] 0000000000000000000000000000000000000000000000000000000000000002::M::sum
-
-        Code:
-            [12] CopyLoc(0)
-            [13] MoveLoc(3)
-            [14] Sub
-          > [15] Call(0)
-            [16] StLoc(4)
-            [17] MoveLoc(0)
-            [18] MoveLoc(4)
-
-        Locals:
-            [0] 2
-            [1] -
-            [2] -
-            [3] -
-            [4] -
-
-
-Operand Stack:
-    [0] false
-    [1] 3
-
-[debug] 10
-Call Stack:
-    [0] main
-
-        Code:
-            [16] StLoc(2)
-            [17] MoveLoc(2)
-            [18] Pop
-          > [19] CallGeneric(2)
-            [20] Pop
-            [21] Ret
-
-        Locals:
-            [0] [true, false]
-            [1] 10
-            [2] -
-
-
-    [1] 0000000000000000000000000000000000000000000000000000000000000002::N::foo<u8, bool>
-
-        Code:
-            [1] StLoc(0)
-            [2] MutBorrowLoc(0)
-            [3] LdU64(4)
-          > [4] Call(1)
-            [5] StLoc(1)
-            [6] StLoc(2)
-            [7] MoveLoc(2)
-
-        Locals:
-            [0] 3
-            [1] -
-            [2] -
-            [3] -
-            [4] -
-
-
-    [2] 0000000000000000000000000000000000000000000000000000000000000002::M::sum
-
-        Code:
-            [12] CopyLoc(0)
-            [13] MoveLoc(3)
-            [14] Sub
-          > [15] Call(0)
-            [16] StLoc(4)
-            [17] MoveLoc(0)
-            [18] MoveLoc(4)
-
-        Locals:
-            [0] 4
-            [1] -
-            [2] -
-            [3] -
-            [4] -
-
-
-    [3] 0000000000000000000000000000000000000000000000000000000000000002::M::sum
-
-        Code:
-            [12] CopyLoc(0)
-            [13] MoveLoc(3)
-            [14] Sub
-          > [15] Call(0)
-            [16] StLoc(4)
-            [17] MoveLoc(0)
-            [18] MoveLoc(4)
-
-        Locals:
-            [0] 3
-            [1] -
-            [2] -
-            [3] -
-            [4] -
-
-
-    [4] 0000000000000000000000000000000000000000000000000000000000000002::M::sum
-
-        Code:
-            [12] CopyLoc(0)
-            [13] MoveLoc(3)
-            [14] Sub
-          > [15] Call(0)
-            [16] StLoc(4)
-            [17] MoveLoc(0)
-            [18] MoveLoc(4)
-
-        Locals:
-            [0] 2
-            [1] -
-            [2] -
-            [3] -
-            [4] -
-
-
-Operand Stack:
-    [0] 3
-
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/print_stack_trace/scripts/print_stack_trace.move b/third_party/move/tools/move-cli/tests/sandbox_tests/print_stack_trace/scripts/print_stack_trace.move
deleted file mode 100644
index 5b89a53615c1f..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/print_stack_trace/scripts/print_stack_trace.move
+++ /dev/null
@@ -1,16 +0,0 @@
-script {
-use std::debug;
-use std::vector;
-use 0x2::N;
-
-fun print_stack_trace() {
-    let v = vector::empty();
-    vector::push_back(&mut v, true);
-    vector::push_back(&mut v, false);
-    let r = vector::borrow(&mut v, 1);
-    let x = N::foo<bool, u64>();
-    debug::print(&x);
-    _ = r;
-    N::foo<u8,bool>();
-}
-}
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/print_stack_trace/sources/M.move b/third_party/move/tools/move-cli/tests/sandbox_tests/print_stack_trace/sources/M.move
deleted file mode 100644
index 3cc1425e225a1..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/print_stack_trace/sources/M.move
+++ /dev/null
@@ -1,14 +0,0 @@
-address 0x2 {
-module M {
-    use std::debug;
-
-    public fun sum(n: u64): u64 {
-        if (n < 2) {
-            debug::print_stack_trace();
-            n
-        } else {
-            n + sum(n - 1)
-        }
-    }
-}
-}
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/print_stack_trace/sources/N.move b/third_party/move/tools/move-cli/tests/sandbox_tests/print_stack_trace/sources/N.move
deleted file mode 100644
index 92e494a15d065..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/print_stack_trace/sources/N.move
+++ /dev/null
@@ -1,13 +0,0 @@
-address 0x2 {
-module N {
-    use 0x2::M;
-
-    public fun foo<T1, T2>(): u64 {
-        let x = 3;
-        let y = &mut x;
-        let z = M::sum(4);
-        _ = y;
-        z
-    }
-}
-}
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/print_values/Move.toml b/third_party/move/tools/move-cli/tests/sandbox_tests/print_values/Move.toml
deleted file mode 100644
index 6d7495809ca87..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/print_values/Move.toml
+++ /dev/null
@@ -1,9 +0,0 @@
-[package]
-name = "print_values"
-version = "0.0.0"
-
-[addresses]
-std = "0x1"
-
-[dependencies]
-MoveNursery = { local = "../../../../../move-stdlib/nursery" }
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/print_values/args.exp b/third_party/move/tools/move-cli/tests/sandbox_tests/print_values/args.exp
deleted file mode 100644
index c6d94de4f98f7..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/print_values/args.exp
+++ /dev/null
@@ -1,170 +0,0 @@
-Command `sandbox publish`:
-Command `test`:
-INCLUDING DEPENDENCY MoveNursery
-INCLUDING DEPENDENCY MoveStdlib
-BUILDING print_values
-Running Move unit tests
-[debug] 42
-[debug] [ 100, 200, 300 ]
-[debug] 0x2::M::Foo {
-  dummy_field: false
-}
-[debug] 0x2::M::Bar {
-  x: 404,
-  y: 0x2::M::Foo {
-    dummy_field: false
-  },
-  z: true
-}
-[debug] 0x2::M::Box<0x2::M::Foo> {
-  x: 0x2::M::Foo {
-    dummy_field: false
-  }
-}
-[debug] "test_print_quoted_string"
-[debug] "Can you say \"Hel\\lo\"?"
-[debug] "test_print_string"
-[debug] 0x48656c6c6f2c2073616e65204d6f766520646562756767696e6721
-[debug] "Hello, sane Move debugging!"
-[debug] "test_print_ascii_string"
-[debug] "Hello, sane Move debugging!"
-[debug] "test_print_primitive_types"
-[debug] 255
-[debug] 65535
-[debug] 4294967295
-[debug] 18446744073709551615
-[debug] 340282366920938463463374607431768211455
-[debug] 115792089237316195423570985008687907853269984665640564039457584007913129639935
-[debug] false
-[debug] true
-[debug] @0x1234c0ffee
-[debug] signer(0x0)
-[debug] "test_print_struct"
-[debug] 0x2::M::TestInner {
-  val: 100,
-  vec: [ 200, 400 ],
-  msgs: [
-    0x616263646566,
-    0x313233343536
-  ]
-}
-[debug] 0x2::M::TestInner {
-  val: 10,
-  vec: [],
-  msgs: []
-}
-[debug] "test_print_vectors"
-[debug] 0xffabcdef
-[debug] [ 16, 17, 18, 19 ]
-[debug] [ 32, 33, 34, 35 ]
-[debug] [ 64, 65, 66, 67 ]
-[debug] [ 128, 129, 130, 131 ]
-[debug] [ 256, 257, 258, 259 ]
-[debug] [ true, false ]
-[debug] [ @0x1234, @0x5678, @0xabcdef ]
-[debug] [ signer(0x0), signer(0x100000000000000000000000000000000000000000000000000000000000000), signer(0x200000000000000000000000000000000000000000000000000000000000000), signer(0x300000000000000000000000000000000000000000000000000000000000000) ]
-[debug] [
-  0x2::M::TestInner {
-    val: 4,
-    vec: [ 127, 128 ],
-    msgs: [
-      0x00ff,
-      0xabcd
-    ]
-  },
-  0x2::M::TestInner {
-    val: 8,
-    vec: [ 128, 129 ],
-    msgs: [
-      0x0000
-    ]
-  }
-]
-[debug] "test_print_vector_of_vectors"
-[debug] [
-  0xffab,
-  0xcdef
-]
-[debug] [
-  [ 16, 17 ],
-  [ 18, 19 ]
-]
-[debug] [
-  [ 32, 33 ],
-  [ 34, 35 ]
-]
-[debug] [
-  [ 64, 65 ],
-  [ 66, 67 ]
-]
-[debug] [
-  [ 128, 129 ],
-  [ 130, 131 ]
-]
-[debug] [
-  [ 256, 257 ],
-  [ 258, 259 ]
-]
-[debug] [
-  [ true, false ],
-  [ false, true ]
-]
-[debug] [
-  [ @0x1234, @0x5678 ],
-  [ @0xabcdef, @0x9999 ]
-]
-[debug] [
-  [ signer(0x0), signer(0x100000000000000000000000000000000000000000000000000000000000000) ],
-  [ signer(0x0), signer(0x100000000000000000000000000000000000000000000000000000000000000) ]
-]
-[debug] [
-  [
-    0x2::M::TestInner {
-      val: 4,
-      vec: [ 127, 128 ],
-      msgs: []
-    },
-    0x2::M::TestInner {
-      val: 8,
-      vec: [ 128, 129 ],
-      msgs: []
-    }
-  ],
-  [
-    0x2::M::TestInner {
-      val: 4,
-      vec: [ 127, 128 ],
-      msgs: []
-    },
-    0x2::M::TestInner {
-      val: 8,
-      vec: [ 128, 129 ],
-      msgs: []
-    }
-  ]
-]
-[debug] "test_print_nested_struct"
-[debug] 0x2::M::TestStruct {
-  addr: @0x1,
-  number: 255,
-  bytes: 0xc0ffee,
-  name: "He\"llo",
-  vec: [
-    0x2::M::TestInner {
-      val: 1,
-      vec: [ 130, 131 ],
-      msgs: []
-    },
-    0x2::M::TestInner {
-      val: 2,
-      vec: [ 132, 133 ],
-      msgs: []
-    }
-  ]
-}
-[debug] "test_print_generic_struct"
-[debug] 0x2::M::GenericStruct<0x2::M::Foo> {
-  val: 60
-}
-[ PASS    ] 0x2::M::test
-Test result: OK. Total tests: 1; passed: 1; failed: 0
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/print_values/args.txt b/third_party/move/tools/move-cli/tests/sandbox_tests/print_values/args.txt
deleted file mode 100644
index 7bbe6d2f5de00..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/print_values/args.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-sandbox publish
-test
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/print_values/args.v2_exp b/third_party/move/tools/move-cli/tests/sandbox_tests/print_values/args.v2_exp
deleted file mode 100644
index c6d94de4f98f7..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/print_values/args.v2_exp
+++ /dev/null
@@ -1,170 +0,0 @@
-Command `sandbox publish`:
-Command `test`:
-INCLUDING DEPENDENCY MoveNursery
-INCLUDING DEPENDENCY MoveStdlib
-BUILDING print_values
-Running Move unit tests
-[debug] 42
-[debug] [ 100, 200, 300 ]
-[debug] 0x2::M::Foo {
-  dummy_field: false
-}
-[debug] 0x2::M::Bar {
-  x: 404,
-  y: 0x2::M::Foo {
-    dummy_field: false
-  },
-  z: true
-}
-[debug] 0x2::M::Box<0x2::M::Foo> {
-  x: 0x2::M::Foo {
-    dummy_field: false
-  }
-}
-[debug] "test_print_quoted_string"
-[debug] "Can you say \"Hel\\lo\"?"
-[debug] "test_print_string"
-[debug] 0x48656c6c6f2c2073616e65204d6f766520646562756767696e6721
-[debug] "Hello, sane Move debugging!"
-[debug] "test_print_ascii_string"
-[debug] "Hello, sane Move debugging!"
-[debug] "test_print_primitive_types"
-[debug] 255
-[debug] 65535
-[debug] 4294967295
-[debug] 18446744073709551615
-[debug] 340282366920938463463374607431768211455
-[debug] 115792089237316195423570985008687907853269984665640564039457584007913129639935
-[debug] false
-[debug] true
-[debug] @0x1234c0ffee
-[debug] signer(0x0)
-[debug] "test_print_struct"
-[debug] 0x2::M::TestInner {
-  val: 100,
-  vec: [ 200, 400 ],
-  msgs: [
-    0x616263646566,
-    0x313233343536
-  ]
-}
-[debug] 0x2::M::TestInner {
-  val: 10,
-  vec: [],
-  msgs: []
-}
-[debug] "test_print_vectors"
-[debug] 0xffabcdef
-[debug] [ 16, 17, 18, 19 ]
-[debug] [ 32, 33, 34, 35 ]
-[debug] [ 64, 65, 66, 67 ]
-[debug] [ 128, 129, 130, 131 ]
-[debug] [ 256, 257, 258, 259 ]
-[debug] [ true, false ]
-[debug] [ @0x1234, @0x5678, @0xabcdef ]
-[debug] [ signer(0x0), signer(0x100000000000000000000000000000000000000000000000000000000000000), signer(0x200000000000000000000000000000000000000000000000000000000000000), signer(0x300000000000000000000000000000000000000000000000000000000000000) ]
-[debug] [
-  0x2::M::TestInner {
-    val: 4,
-    vec: [ 127, 128 ],
-    msgs: [
-      0x00ff,
-      0xabcd
-    ]
-  },
-  0x2::M::TestInner {
-    val: 8,
-    vec: [ 128, 129 ],
-    msgs: [
-      0x0000
-    ]
-  }
-]
-[debug] "test_print_vector_of_vectors"
-[debug] [
-  0xffab,
-  0xcdef
-]
-[debug] [
-  [ 16, 17 ],
-  [ 18, 19 ]
-]
-[debug] [
-  [ 32, 33 ],
-  [ 34, 35 ]
-]
-[debug] [
-  [ 64, 65 ],
-  [ 66, 67 ]
-]
-[debug] [
-  [ 128, 129 ],
-  [ 130, 131 ]
-]
-[debug] [
-  [ 256, 257 ],
-  [ 258, 259 ]
-]
-[debug] [
-  [ true, false ],
-  [ false, true ]
-]
-[debug] [
-  [ @0x1234, @0x5678 ],
-  [ @0xabcdef, @0x9999 ]
-]
-[debug] [
-  [ signer(0x0), signer(0x100000000000000000000000000000000000000000000000000000000000000) ],
-  [ signer(0x0), signer(0x100000000000000000000000000000000000000000000000000000000000000) ]
-]
-[debug] [
-  [
-    0x2::M::TestInner {
-      val: 4,
-      vec: [ 127, 128 ],
-      msgs: []
-    },
-    0x2::M::TestInner {
-      val: 8,
-      vec: [ 128, 129 ],
-      msgs: []
-    }
-  ],
-  [
-    0x2::M::TestInner {
-      val: 4,
-      vec: [ 127, 128 ],
-      msgs: []
-    },
-    0x2::M::TestInner {
-      val: 8,
-      vec: [ 128, 129 ],
-      msgs: []
-    }
-  ]
-]
-[debug] "test_print_nested_struct"
-[debug] 0x2::M::TestStruct {
-  addr: @0x1,
-  number: 255,
-  bytes: 0xc0ffee,
-  name: "He\"llo",
-  vec: [
-    0x2::M::TestInner {
-      val: 1,
-      vec: [ 130, 131 ],
-      msgs: []
-    },
-    0x2::M::TestInner {
-      val: 2,
-      vec: [ 132, 133 ],
-      msgs: []
-    }
-  ]
-}
-[debug] "test_print_generic_struct"
-[debug] 0x2::M::GenericStruct<0x2::M::Foo> {
-  val: 60
-}
-[ PASS    ] 0x2::M::test
-Test result: OK. Total tests: 1; passed: 1; failed: 0
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/print_values/sources/M.move b/third_party/move/tools/move-cli/tests/sandbox_tests/print_values/sources/M.move
deleted file mode 100644
index 3b65890acc8b5..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/print_values/sources/M.move
+++ /dev/null
@@ -1,276 +0,0 @@
-address 0x2 {
-module M {
-    #[test_only]
-    use std::ascii;
-    #[test_only]
-    use std::debug::print;
-    #[test_only]
-    use std::debug::print_string;
-    use std::string;
-    #[test_only]
-    use std::unit_test::create_signers_for_testing;
-    #[test_only]
-    use std::vector;
-
-    struct Foo has drop {}
-    struct Bar has drop { x: u128, y: Foo, z: bool }
-    struct Box<T> has drop { x: T }
-
-    struct GenericStruct<phantom T> has drop {
-        val: u64,
-    }
-
-    struct TestInner has drop {
-        val: u128,
-        vec: vector<u128>,
-        msgs: vector<vector<u8>>
-    }
-
-    struct TestStruct has drop {
-        addr: address,
-        number: u8,
-        bytes: vector<u8>,
-        name: string::String,
-        vec: vector<TestInner>,
-    }
-
-    #[test]
-    public fun test()  {
-        let x = 42;
-        print(&x);
-
-        let v = vector::empty();
-        vector::push_back(&mut v, 100);
-        vector::push_back(&mut v, 200);
-        vector::push_back(&mut v, 300);
-        print(&v);
-
-        let foo = Foo {};
-        print(&foo);
-
-        let bar = Bar { x: 404, y: Foo {}, z: true };
-        print(&bar);
-
-        let box = Box { x: Foo {} };
-        print(&box);
-
-        test_print_quoted_string();
-        test_print_string();
-        test_print_ascii_string();
-        test_print_primitive_types();
-        test_print_struct();
-        test_print_vectors();
-        test_print_vector_of_vectors();
-        test_print_nested_struct();
-        test_print_generic_struct();
-    }
-
-    #[test_only]
-    fun test_print_string() {
-        print_string(b"test_print_string");
-
-        let str_bytes = b"Hello, sane Move debugging!";
-
-        print(&str_bytes);
-
-        let str = string::utf8(str_bytes);
-        print<string::String>(&str);
-    }
-
-    #[test_only]
-    fun test_print_ascii_string() {
-        print_string(b"test_print_ascii_string");
-        print(&ascii::string(b"Hello, sane Move debugging!"));
-    }
-
-    #[test_only]
-    fun test_print_quoted_string() {
-        print_string(b"test_print_quoted_string");
-
-        let str_bytes = b"Can you say \"Hel\\lo\"?";
-
-        let str = string::utf8(str_bytes);
-        print<string::String>(&str);
-    }
-
-    #[test_only]
-    fun test_print_primitive_types() {
-        print_string(b"test_print_primitive_types");
-
-        let u8 = 255u8;
-        print(&u8);
-
-        let u16 = 65535u16;
-        print(&u16);
-
-        let u32 = 4294967295u32;
-        print(&u32);
-
-        let u64 = 18446744073709551615u64;
-        print(&u64);
-
-        let u128 = 340282366920938463463374607431768211455u128;
-        print(&u128);
-
-        let u256 = 115792089237316195423570985008687907853269984665640564039457584007913129639935u256;
-        print(&u256);
-
-        let bool = false;
-        print(&bool);
-
-        let bool = true;
-        print(&bool);
-
-        let a = @0x1234c0ffee;
-        print(&a);
-
-        // print a signer
-        let senders = create_signers_for_testing(1);
-        let sender = vector::pop_back(&mut senders);
-        print(&sender);
-    }
-
-    const MSG_1 : vector<u8> = b"abcdef";
-    const MSG_2 : vector<u8> = b"123456";
-
-    #[test_only]
-    fun test_print_struct() {
-        print_string(b"test_print_struct");
-
-        let obj = TestInner {
-            val: 100,
-            vec: vector[200u128, 400u128],
-            msgs: vector[MSG_1, MSG_2],
-        };
-
-        print(&obj);
-
-        let obj = TestInner {
-            val: 10,
-            vec: vector[],
-            msgs: vector[],
-        };
-
-        print(&obj);
-    }
-
-    #[test_only]
-    fun test_print_vectors() {
-        print_string(b"test_print_vectors");
-
-        let v_u8 = x"ffabcdef";
-        print(&v_u8);
-
-        let v_u16 = vector[16u16, 17u16, 18u16, 19u16];
-        print(&v_u16);
-
-        let v_u32 = vector[32u32, 33u32, 34u32, 35u32];
-        print(&v_u32);
-
-        let v_u64 = vector[64u64, 65u64, 66u64, 67u64];
-        print(&v_u64);
-
-        let v_u128 = vector[128u128, 129u128, 130u128, 131u128];
-        print(&v_u128);
-
-        let v_u256 = vector[256u256, 257u256, 258u256, 259u256];
-        print(&v_u256);
-
-        let v_bool = vector[true, false];
-        print(&v_bool);
-
-        let v_addr = vector[@0x1234, @0x5678, @0xabcdef];
-        print(&v_addr);
-
-        let v_signer = create_signers_for_testing(4);
-        print(&v_signer);
-
-        let v = vector[
-            TestInner {
-                val: 4u128,
-                vec: vector[127u128, 128u128],
-                msgs: vector[x"00ff", x"abcd"],
-            },
-            TestInner {
-                val: 8u128 ,
-                vec: vector[128u128, 129u128],
-                msgs: vector[x"0000"],
-            }
-        ];
-        print(&v);
-    }
-
-    #[test_only]
-    fun test_print_vector_of_vectors() {
-        print_string(b"test_print_vector_of_vectors");
-
-        let v_u8 = vector[x"ffab", x"cdef"];
-        print(&v_u8);
-
-        let v_u16 = vector[vector[16u16, 17u16], vector[18u16, 19u16]];
-        print(&v_u16);
-
-        let v_u32 = vector[vector[32u32, 33u32], vector[34u32, 35u32]];
-        print(&v_u32);
-
-        let v_u64 = vector[vector[64u64, 65u64], vector[66u64, 67u64]];
-        print(&v_u64);
-
-        let v_u128 = vector[vector[128u128, 129u128], vector[130u128, 131u128]];
-        print(&v_u128);
-
-        let v_u256 = vector[vector[256u256, 257u256], vector[258u256, 259u256]];
-        print(&v_u256);
-
-        let v_bool = vector[vector[true, false], vector[false, true]];
-        print(&v_bool);
-
-        let v_addr = vector[vector[@0x1234, @0x5678], vector[@0xabcdef, @0x9999]];
-        print(&v_addr);
-
-        let v_signer = vector[create_signers_for_testing(2), create_signers_for_testing(2)];
-        print(&v_signer);
-
-        let v = vector[
-            vector[
-                TestInner { val: 4u128, vec: vector[127u128, 128u128], msgs: vector[] },
-                TestInner { val: 8u128 , vec: vector[128u128, 129u128], msgs: vector[] }
-            ],
-            vector[
-                TestInner { val: 4u128, vec: vector[127u128, 128u128], msgs: vector[] },
-                TestInner { val: 8u128 , vec: vector[128u128, 129u128], msgs: vector[] }
-            ]
-        ];
-        print(&v);
-    }
-
-    #[test_only]
-    fun test_print_nested_struct() {
-        print_string(b"test_print_nested_struct");
-
-        let obj = TestStruct {
-            addr: @0x1,
-            number: 255u8,
-            bytes: x"c0ffee",
-            name: string::utf8(b"He\"llo"),
-            vec: vector[
-                TestInner { val: 1, vec: vector[130u128, 131u128], msgs: vector[] },
-                TestInner { val: 2, vec: vector[132u128, 133u128], msgs: vector[] }
-            ],
-        };
-
-        print(&obj);
-    }
-
-    #[test_only]
-    fun test_print_generic_struct() {
-        print_string(b"test_print_generic_struct");
-
-        let obj = GenericStruct<Foo> {
-        val: 60u64,
-        };
-
-        print(&obj);
-    }
-}
-}
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/publish_then_run/Move.toml b/third_party/move/tools/move-cli/tests/sandbox_tests/publish_then_run/Move.toml
deleted file mode 100644
index 65548f9207621..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/publish_then_run/Move.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[package]
-name = "publish_then_run"
-version = "0.0.0"
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/publish_then_run/args.exp b/third_party/move/tools/move-cli/tests/sandbox_tests/publish_then_run/args.exp
deleted file mode 100644
index d7b74549ea3a4..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/publish_then_run/args.exp
+++ /dev/null
@@ -1,2 +0,0 @@
-Command `sandbox publish`:
-Command `sandbox run scripts/main.move`:
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/publish_then_run/args.txt b/third_party/move/tools/move-cli/tests/sandbox_tests/publish_then_run/args.txt
deleted file mode 100644
index 39a7a4d70c5c3..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/publish_then_run/args.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-sandbox publish
-sandbox run scripts/main.move
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/publish_then_run/args.v2_exp b/third_party/move/tools/move-cli/tests/sandbox_tests/publish_then_run/args.v2_exp
deleted file mode 100644
index d7b74549ea3a4..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/publish_then_run/args.v2_exp
+++ /dev/null
@@ -1,2 +0,0 @@
-Command `sandbox publish`:
-Command `sandbox run scripts/main.move`:
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/publish_then_run/scripts/main.move b/third_party/move/tools/move-cli/tests/sandbox_tests/publish_then_run/scripts/main.move
deleted file mode 100644
index 9bed1bc4048bd..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/publish_then_run/scripts/main.move
+++ /dev/null
@@ -1,3 +0,0 @@
-script {
-fun main() {}
-}
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/publish_then_run/sources/M.move b/third_party/move/tools/move-cli/tests/sandbox_tests/publish_then_run/sources/M.move
deleted file mode 100644
index aac8c3531c67c..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/publish_then_run/sources/M.move
+++ /dev/null
@@ -1,5 +0,0 @@
-address 0x2 {
-module M {
-    public fun f() {}
-}
-}
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/republish/Move.toml b/third_party/move/tools/move-cli/tests/sandbox_tests/republish/Move.toml
deleted file mode 100644
index 3169eb4c51dce..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/republish/Move.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[package]
-name = "republish"
-version = "0.0.0"
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/republish/args.exp b/third_party/move/tools/move-cli/tests/sandbox_tests/republish/args.exp
deleted file mode 100644
index 185b372c2234e..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/republish/args.exp
+++ /dev/null
@@ -1,21 +0,0 @@
-Command `sandbox publish -v`:
-Found 2 modules
-Publishing a new module 0000000000000000000000000000000000000000000000000000000000000042::M (wrote 88 bytes)
-Publishing a new module 0000000000000000000000000000000000000000000000000000000000000043::N (wrote 88 bytes)
-Wrote 176 bytes of module ID's and code
-Command `sandbox view storage/0x00000000000000000000000000000042/modules/M.mv`:
-Bytecode not found.
-Command `sandbox view storage/0x00000000000000000000000000000043/modules/N.mv`:
-Bytecode not found.
-Command `sandbox publish -v`:
-Found 2 modules
-Updating an existing module 0000000000000000000000000000000000000000000000000000000000000042::M (wrote 88 bytes)
-Updating an existing module 0000000000000000000000000000000000000000000000000000000000000043::N (wrote 88 bytes)
-Wrote 176 bytes of module ID's and code
-Command `sandbox view storage/0x00000000000000000000000000000042/modules/M.mv`:
-Bytecode not found.
-Command `sandbox view storage/0x00000000000000000000000000000043/modules/N.mv`:
-Bytecode not found.
-Command `sandbox publish -v --no-republish`:
-Found 2 modules
-Failed to republish modules since the --no-republish flag is set. Tried to republish the following modules: 0000000000000000000000000000000000000000000000000000000000000042::M, 0000000000000000000000000000000000000000000000000000000000000043::N
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/republish/args.txt b/third_party/move/tools/move-cli/tests/sandbox_tests/republish/args.txt
deleted file mode 100644
index d9b75c73fdda9..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/republish/args.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-sandbox publish -v
-sandbox view storage/0x00000000000000000000000000000042/modules/M.mv
-sandbox view storage/0x00000000000000000000000000000043/modules/N.mv
-sandbox publish -v
-sandbox view storage/0x00000000000000000000000000000042/modules/M.mv
-sandbox view storage/0x00000000000000000000000000000043/modules/N.mv
-sandbox publish -v --no-republish
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/republish/args.v2_exp b/third_party/move/tools/move-cli/tests/sandbox_tests/republish/args.v2_exp
deleted file mode 100644
index f2b38b2d6ad43..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/republish/args.v2_exp
+++ /dev/null
@@ -1,21 +0,0 @@
-Command `sandbox publish -v`:
-Found 2 modules
-Publishing a new module 0000000000000000000000000000000000000000000000000000000000000042::M (wrote 129 bytes)
-Publishing a new module 0000000000000000000000000000000000000000000000000000000000000043::N (wrote 129 bytes)
-Wrote 258 bytes of module ID's and code
-Command `sandbox view storage/0x00000000000000000000000000000042/modules/M.mv`:
-Bytecode not found.
-Command `sandbox view storage/0x00000000000000000000000000000043/modules/N.mv`:
-Bytecode not found.
-Command `sandbox publish -v`:
-Found 2 modules
-Updating an existing module 0000000000000000000000000000000000000000000000000000000000000042::M (wrote 129 bytes)
-Updating an existing module 0000000000000000000000000000000000000000000000000000000000000043::N (wrote 129 bytes)
-Wrote 258 bytes of module ID's and code
-Command `sandbox view storage/0x00000000000000000000000000000042/modules/M.mv`:
-Bytecode not found.
-Command `sandbox view storage/0x00000000000000000000000000000043/modules/N.mv`:
-Bytecode not found.
-Command `sandbox publish -v --no-republish`:
-Found 2 modules
-Failed to republish modules since the --no-republish flag is set. Tried to republish the following modules: 0000000000000000000000000000000000000000000000000000000000000042::M, 0000000000000000000000000000000000000000000000000000000000000043::N
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/republish/sources/M.move b/third_party/move/tools/move-cli/tests/sandbox_tests/republish/sources/M.move
deleted file mode 100644
index 4c50013da3bb3..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/republish/sources/M.move
+++ /dev/null
@@ -1,5 +0,0 @@
-address 0x42 {
-module M {
-
-}
-}
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/republish/sources/N.move b/third_party/move/tools/move-cli/tests/sandbox_tests/republish/sources/N.move
deleted file mode 100644
index cfac5ac3ba646..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/republish/sources/N.move
+++ /dev/null
@@ -1,4 +0,0 @@
-address 0x43 {
-module N {
-}
-}
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/republish_module/Move.toml b/third_party/move/tools/move-cli/tests/sandbox_tests/republish_module/Move.toml
deleted file mode 100644
index 754b8df90515f..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/republish_module/Move.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[package]
-name = "republish_module"
-version = "0.0.0"
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/republish_module/args.exp b/third_party/move/tools/move-cli/tests/sandbox_tests/republish_module/args.exp
deleted file mode 100644
index a0896d0162b1f..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/republish_module/args.exp
+++ /dev/null
@@ -1,2 +0,0 @@
-Command `sandbox publish`:
-Command `sandbox publish`:
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/republish_module/args.txt b/third_party/move/tools/move-cli/tests/sandbox_tests/republish_module/args.txt
deleted file mode 100644
index d486ccdbb3b2a..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/republish_module/args.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-sandbox publish
-sandbox publish
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/republish_module/args.v2_exp b/third_party/move/tools/move-cli/tests/sandbox_tests/republish_module/args.v2_exp
deleted file mode 100644
index a0896d0162b1f..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/republish_module/args.v2_exp
+++ /dev/null
@@ -1,2 +0,0 @@
-Command `sandbox publish`:
-Command `sandbox publish`:
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/republish_module/sources/M.move b/third_party/move/tools/move-cli/tests/sandbox_tests/republish_module/sources/M.move
deleted file mode 100644
index aac8c3531c67c..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/republish_module/sources/M.move
+++ /dev/null
@@ -1,5 +0,0 @@
-address 0x2 {
-module M {
-    public fun f() {}
-}
-}
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/use_named_address/Move.toml b/third_party/move/tools/move-cli/tests/sandbox_tests/use_named_address/Move.toml
deleted file mode 100644
index cfdde9f411483..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/use_named_address/Move.toml
+++ /dev/null
@@ -1,6 +0,0 @@
-[package]
-name = "use_named_address"
-version = "0.0.0"
-
-[addresses]
-A = "0x42"
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/use_named_address/args.exp b/third_party/move/tools/move-cli/tests/sandbox_tests/use_named_address/args.exp
deleted file mode 100644
index fd9fe26181cea..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/use_named_address/args.exp
+++ /dev/null
@@ -1,12 +0,0 @@
-Command `sandbox publish`:
-error[E02001]: duplicate declaration, item, or annotation
-  ┌─ ./sources/M_no_named.move:1:14
-  │
-1 │ module 0x42::M {
-  │              ^ Duplicate definition for module '0x42::M'
-  │
-  ┌─ ./sources/M.move:1:11
-  │
-1 │ module A::M {
-  │           - Module previously defined here, with '(A=0x42)::M'
-
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/use_named_address/args.txt b/third_party/move/tools/move-cli/tests/sandbox_tests/use_named_address/args.txt
deleted file mode 100644
index 616afc250bfeb..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/use_named_address/args.txt
+++ /dev/null
@@ -1 +0,0 @@
-sandbox publish
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/use_named_address/args.v2_exp b/third_party/move/tools/move-cli/tests/sandbox_tests/use_named_address/args.v2_exp
deleted file mode 100644
index 19c7ebab656e2..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/use_named_address/args.v2_exp
+++ /dev/null
@@ -1,12 +0,0 @@
-Command `sandbox publish`:
-error: duplicate declaration, item, or annotation
-  ┌─ ./sources/M_no_named.move:1:14
-  │
-1 │ module 0x42::M {
-  │              ^ Duplicate definition for module '0x42::M'
-  │
-  ┌─ ./sources/M.move:1:11
-  │
-1 │ module A::M {
-  │           - Module previously defined here, with '(A=0x42)::M'
-
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/use_named_address/sources/M.move b/third_party/move/tools/move-cli/tests/sandbox_tests/use_named_address/sources/M.move
deleted file mode 100644
index a4c0e117479b1..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/use_named_address/sources/M.move
+++ /dev/null
@@ -1,4 +0,0 @@
-module A::M {
-    public fun useless() {
-    }
-}
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/use_named_address/sources/M_no_named.move b/third_party/move/tools/move-cli/tests/sandbox_tests/use_named_address/sources/M_no_named.move
deleted file mode 100644
index 5892ff62df5be..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/use_named_address/sources/M_no_named.move
+++ /dev/null
@@ -1,4 +0,0 @@
-module 0x42::M {
-    public fun useless() {
-    }
-}
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/use_named_address/sources/N.move b/third_party/move/tools/move-cli/tests/sandbox_tests/use_named_address/sources/N.move
deleted file mode 100644
index be69510ded19e..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/use_named_address/sources/N.move
+++ /dev/null
@@ -1,6 +0,0 @@
-
-module A::N {
-    public fun useless() {
-        A::M::useless()
-    }
-}
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_multi_module_publish/Move.toml b/third_party/move/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_multi_module_publish/Move.toml
deleted file mode 100644
index 25d4f10fdfce4..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_multi_module_publish/Move.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[package]
-name = "verify_native_functions_in_publish"
-version = "0.0.0"
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_multi_module_publish/args.exp b/third_party/move/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_multi_module_publish/args.exp
deleted file mode 100644
index ef5d34e0203fa..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_multi_module_publish/args.exp
+++ /dev/null
@@ -1 +0,0 @@
-Command `sandbox publish --bundle --override-ordering M --override-ordering N`:
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_multi_module_publish/args.txt b/third_party/move/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_multi_module_publish/args.txt
deleted file mode 100644
index 0a739f8bccc61..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_multi_module_publish/args.txt
+++ /dev/null
@@ -1 +0,0 @@
-sandbox publish --bundle --override-ordering M --override-ordering N
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_multi_module_publish/args.v2_exp b/third_party/move/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_multi_module_publish/args.v2_exp
deleted file mode 100644
index ef5d34e0203fa..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_multi_module_publish/args.v2_exp
+++ /dev/null
@@ -1 +0,0 @@
-Command `sandbox publish --bundle --override-ordering M --override-ordering N`:
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_multi_module_publish/sources/example.move b/third_party/move/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_multi_module_publish/sources/example.move
deleted file mode 100644
index 916813c8af1c4..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_multi_module_publish/sources/example.move
+++ /dev/null
@@ -1,4 +0,0 @@
-module 0x42::M {
-    native fun create_signer(addr: address): signer;
-    native fun create_nothing();
-}
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_multi_module_publish/sources/example_another.move b/third_party/move/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_multi_module_publish/sources/example_another.move
deleted file mode 100644
index 62eccfb87e155..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_multi_module_publish/sources/example_another.move
+++ /dev/null
@@ -1,4 +0,0 @@
-module 0x42::N {
-    native fun create_signer(addr: address): signer;
-    native fun create_nothing();
-}
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_publish/Move.toml b/third_party/move/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_publish/Move.toml
deleted file mode 100644
index 25d4f10fdfce4..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_publish/Move.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[package]
-name = "verify_native_functions_in_publish"
-version = "0.0.0"
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_publish/args.exp b/third_party/move/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_publish/args.exp
deleted file mode 100644
index 64ff72dc9cd6b..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_publish/args.exp
+++ /dev/null
@@ -1 +0,0 @@
-Command `sandbox publish`:
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_publish/args.txt b/third_party/move/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_publish/args.txt
deleted file mode 100644
index 616afc250bfeb..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_publish/args.txt
+++ /dev/null
@@ -1 +0,0 @@
-sandbox publish
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_publish/args.v2_exp b/third_party/move/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_publish/args.v2_exp
deleted file mode 100644
index 64ff72dc9cd6b..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_publish/args.v2_exp
+++ /dev/null
@@ -1 +0,0 @@
-Command `sandbox publish`:
diff --git a/third_party/move/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_publish/sources/example.move b/third_party/move/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_publish/sources/example.move
deleted file mode 100644
index 916813c8af1c4..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_publish/sources/example.move
+++ /dev/null
@@ -1,4 +0,0 @@
-module 0x42::M {
-    native fun create_signer(addr: address): signer;
-    native fun create_nothing();
-}
diff --git a/third_party/move/tools/move-cli/tests/sandbox_testsuite.rs b/third_party/move/tools/move-cli/tests/sandbox_testsuite.rs
deleted file mode 100644
index 1cd24cfa746b1..0000000000000
--- a/third_party/move/tools/move-cli/tests/sandbox_testsuite.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) The Diem Core Contributors
-// Copyright (c) The Move Contributors
-// SPDX-License-Identifier: Apache-2.0
-
-use move_cli::sandbox::commands::test;
-use std::path::{Path, PathBuf};
-
-fn run_all(args_path: &Path) -> datatest_stable::Result<()> {
-    let cli_exe = env!("CARGO_BIN_EXE_move");
-    let use_temp_dir = !args_path.parent().unwrap().join("NO_TEMPDIR").exists();
-    test::run_one(
-        args_path,
-        &PathBuf::from(cli_exe),
-        /* use_temp_dir */ use_temp_dir,
-        /* track_cov */ false,
-    )?;
-    Ok(())
-}
-
-// runs all the tests
-datatest_stable::harness!(run_all, "tests/sandbox_tests", r"args\.txt$");
diff --git a/third_party/move/tools/move-cli/tests/upload_tests/no_git_remote_package/Move.toml b/third_party/move/tools/move-cli/tests/upload_tests/no_git_remote_package/Move.toml
deleted file mode 100644
index 1591df0a97dcf..0000000000000
--- a/third_party/move/tools/move-cli/tests/upload_tests/no_git_remote_package/Move.toml
+++ /dev/null
@@ -1,6 +0,0 @@
-[package]
-name = "Package1"
-version = "0.0.0"
-
-[addresses]
-std = "0x1"
diff --git a/third_party/move/tools/move-cli/tests/upload_tests/no_git_remote_package/sources/Dummy.move b/third_party/move/tools/move-cli/tests/upload_tests/no_git_remote_package/sources/Dummy.move
deleted file mode 100644
index 45646f1b13bc1..0000000000000
--- a/third_party/move/tools/move-cli/tests/upload_tests/no_git_remote_package/sources/Dummy.move
+++ /dev/null
@@ -1 +0,0 @@
-module 0x1::Dummy {}
diff --git a/third_party/move/tools/move-cli/tests/upload_tests/valid_package1/Move.toml b/third_party/move/tools/move-cli/tests/upload_tests/valid_package1/Move.toml
deleted file mode 100644
index 1591df0a97dcf..0000000000000
--- a/third_party/move/tools/move-cli/tests/upload_tests/valid_package1/Move.toml
+++ /dev/null
@@ -1,6 +0,0 @@
-[package]
-name = "Package1"
-version = "0.0.0"
-
-[addresses]
-std = "0x1"
diff --git a/third_party/move/tools/move-cli/tests/upload_tests/valid_package1/sources/Dummy.move b/third_party/move/tools/move-cli/tests/upload_tests/valid_package1/sources/Dummy.move
deleted file mode 100644
index 45646f1b13bc1..0000000000000
--- a/third_party/move/tools/move-cli/tests/upload_tests/valid_package1/sources/Dummy.move
+++ /dev/null
@@ -1 +0,0 @@
-module 0x1::Dummy {}
diff --git a/third_party/move/tools/move-cli/tests/upload_tests/valid_package2/Move.toml b/third_party/move/tools/move-cli/tests/upload_tests/valid_package2/Move.toml
deleted file mode 100644
index 1591df0a97dcf..0000000000000
--- a/third_party/move/tools/move-cli/tests/upload_tests/valid_package2/Move.toml
+++ /dev/null
@@ -1,6 +0,0 @@
-[package]
-name = "Package1"
-version = "0.0.0"
-
-[addresses]
-std = "0x1"
diff --git a/third_party/move/tools/move-cli/tests/upload_tests/valid_package2/sources/Dummy.move b/third_party/move/tools/move-cli/tests/upload_tests/valid_package2/sources/Dummy.move
deleted file mode 100644
index 45646f1b13bc1..0000000000000
--- a/third_party/move/tools/move-cli/tests/upload_tests/valid_package2/sources/Dummy.move
+++ /dev/null
@@ -1 +0,0 @@
-module 0x1::Dummy {}
diff --git a/third_party/move/tools/move-cli/tests/upload_tests/valid_package3/Move.toml b/third_party/move/tools/move-cli/tests/upload_tests/valid_package3/Move.toml
deleted file mode 100644
index 1591df0a97dcf..0000000000000
--- a/third_party/move/tools/move-cli/tests/upload_tests/valid_package3/Move.toml
+++ /dev/null
@@ -1,6 +0,0 @@
-[package]
-name = "Package1"
-version = "0.0.0"
-
-[addresses]
-std = "0x1"
diff --git a/third_party/move/tools/move-cli/tests/upload_tests/valid_package3/sources/Dummy.move b/third_party/move/tools/move-cli/tests/upload_tests/valid_package3/sources/Dummy.move
deleted file mode 100644
index 45646f1b13bc1..0000000000000
--- a/third_party/move/tools/move-cli/tests/upload_tests/valid_package3/sources/Dummy.move
+++ /dev/null
@@ -1 +0,0 @@
-module 0x1::Dummy {}
diff --git a/third_party/move/tools/move-disassembler/src/disassembler.rs b/third_party/move/tools/move-disassembler/src/disassembler.rs
index 819512bcd7cf2..3dedaa3f942b1 100644
--- a/third_party/move/tools/move-disassembler/src/disassembler.rs
+++ b/third_party/move/tools/move-disassembler/src/disassembler.rs
@@ -2,22 +2,23 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
-use anyhow::{bail, format_err, Error, Result};
+use anyhow::{anyhow, bail, format_err, Error, Result};
 use clap::Parser;
 use colored::*;
 use move_binary_format::{
     binary_views::BinaryIndexedView,
     control_flow_graph::{ControlFlowGraph, VMControlFlowGraph},
     file_format::{
-        Ability, AbilitySet, Bytecode, CodeUnit, FieldHandleIndex, FunctionDefinition,
+        Ability, AbilitySet, Bytecode, CodeUnit, FieldDefinition, FunctionDefinition,
         FunctionDefinitionIndex, FunctionHandle, ModuleHandle, Signature, SignatureIndex,
         SignatureToken, StructDefinition, StructDefinitionIndex, StructFieldInformation,
-        StructTypeParameter, TableIndex, TypeSignature, Visibility,
+        StructTypeParameter, StructVariantHandleIndex, TableIndex, VariantIndex, Visibility,
     },
+    views::FieldOrVariantIndex,
 };
 use move_bytecode_source_map::{
     mapping::SourceMapping,
-    source_map::{FunctionSourceMap, SourceName},
+    source_map::{FunctionSourceMap, SourceName, StructSourceMap},
 };
 use move_compiler::compiled_unit::{CompiledUnit, NamedCompiledModule, NamedCompiledScript};
 use move_core_types::{ident_str, identifier::IdentStr, language_storage::ModuleId};
@@ -28,7 +29,7 @@ use std::collections::HashMap;
 /// Holds the various options that we support while disassembling code.
 #[derive(Debug, Default, Parser)]
 pub struct DisassemblerOptions {
-    /// Only print non-private functions
+    /// Only print public functions.
     #[clap(long = "only-public")]
     pub only_externally_visible: bool,
 
@@ -43,6 +44,10 @@ pub struct DisassemblerOptions {
     /// Print the locals inside each function body.
     #[clap(long = "print-locals")]
     pub print_locals: bool,
+
+    /// Print bytecode statistics for the module.
+    #[clap(long = "print-bytecode-stats")]
+    pub print_bytecode_stats: bool,
 }
 
 impl DisassemblerOptions {
@@ -52,6 +57,7 @@ impl DisassemblerOptions {
             print_code: true,
             print_basic_blocks: true,
             print_locals: true,
+            print_bytecode_stats: false,
         }
     }
 }
@@ -238,6 +244,17 @@ impl<'a> Disassembler<'a> {
         }
     }
 
+    fn get_instruction_count(&self) -> usize {
+        match self.source_mapper.bytecode {
+            BinaryIndexedView::Module(module) => module
+                .function_defs
+                .iter()
+                .map(|function| function.code.as_ref().map(|c| c.code.len()).unwrap_or(0))
+                .sum(),
+            BinaryIndexedView::Script(script) => script.code.code.len(),
+        }
+    }
+
     //***************************************************************************
     // Code Coverage Helpers
     //***************************************************************************
@@ -294,57 +311,130 @@ impl<'a> Disassembler<'a> {
     // Formatting Helpers
     //***************************************************************************
 
-    fn name_for_field(&self, field_idx: FieldHandleIndex) -> Result<String> {
-        let field_handle = self.source_mapper.bytecode.field_handle_at(field_idx)?;
-        let struct_def = self
-            .source_mapper
-            .bytecode
-            .struct_def_at(field_handle.owner)?;
-        let field_def = match &struct_def.field_information {
-            StructFieldInformation::Native => {
-                return Err(format_err!("Attempt to access field on a native struct"));
+    fn name_for_struct(&self, idx: StructDefinitionIndex) -> Result<String> {
+        let code = self.source_mapper.bytecode;
+        let struct_def = code.struct_def_at(idx)?;
+        Ok(code
+            .identifier_at(code.struct_handle_at(struct_def.struct_handle).name)
+            .to_string())
+    }
+
+    fn name_for_struct_variant(&self, idx: StructVariantHandleIndex) -> Result<String> {
+        let code = self.source_mapper.bytecode;
+        let struct_variant_handle = code.struct_variant_handle_at(idx)?;
+        let struct_name = self.name_for_struct(struct_variant_handle.struct_index)?;
+        let variant_name = self.name_for_variant(
+            struct_variant_handle.struct_index,
+            struct_variant_handle.variant,
+        )?;
+        Ok(format!("{}/{}", struct_name, variant_name))
+    }
+
+    fn name_for_variant(
+        &self,
+        idx: StructDefinitionIndex,
+        variant: VariantIndex,
+    ) -> Result<String> {
+        let code = self.source_mapper.bytecode;
+        let struct_def = code.struct_def_at(idx)?;
+        let variant_name = struct_def
+            .field_information
+            .variants()
+            .get(variant as usize)
+            .ok_or_else(|| anyhow!("Inconsistent variant offset"))?
+            .name;
+        Ok(format!("{}", code.identifier_at(variant_name)))
+    }
+
+    fn name_for_field(&self, field_idx: FieldOrVariantIndex) -> Result<String> {
+        let code = self.source_mapper.bytecode;
+        match field_idx {
+            FieldOrVariantIndex::FieldIndex(idx) => {
+                let field_handle = code.field_handle_at(idx)?;
+                let struct_name = self.name_for_struct(field_handle.owner)?;
+                let struct_def = code.struct_def_at(field_handle.owner)?;
+                let field_name = struct_def
+                    .field_information
+                    .fields(None)
+                    .get(field_handle.field as usize)
+                    .ok_or_else(|| anyhow!("Inconsistent field offset"))?
+                    .name;
+                Ok(format!(
+                    "{}.{}",
+                    struct_name,
+                    code.identifier_at(field_name)
+                ))
             },
-            StructFieldInformation::Declared(fields) => fields
-                .get(field_handle.field as usize)
-                .ok_or_else(|| format_err!("Bad field index"))?,
-        };
-        let field_name = self
-            .source_mapper
-            .bytecode
-            .identifier_at(field_def.name)
-            .to_string();
-        let struct_handle = self
-            .source_mapper
-            .bytecode
-            .struct_handle_at(struct_def.struct_handle);
-        let struct_name = self
-            .source_mapper
-            .bytecode
-            .identifier_at(struct_handle.name)
-            .to_string();
-        Ok(format!("{}.{}", struct_name, field_name))
+            FieldOrVariantIndex::VariantFieldIndex(idx) => {
+                let field_handle = code.variant_field_handle_at(idx)?;
+                let struct_def = code.struct_def_at(field_handle.struct_index)?;
+                Ok(field_handle
+                    .variants
+                    .iter()
+                    .map(|v| {
+                        let variant_name = self.name_for_variant(field_handle.struct_index, *v)?;
+                        let field_name = struct_def
+                            .field_information
+                            .fields(Some(*v))
+                            .get(field_handle.field as usize)
+                            .map(|f| {
+                                self.source_mapper
+                                    .bytecode
+                                    .identifier_at(f.name)
+                                    .to_string()
+                            })
+                            .ok_or_else(|| anyhow!("Inconsistent field offset"))?;
+                        Ok(format!("{}.{}", variant_name, field_name))
+                    })
+                    .collect::<Result<Vec<String>>>()?
+                    .join("|"))
+            },
+        }
     }
 
-    fn type_for_field(&self, field_idx: FieldHandleIndex) -> Result<String> {
-        let field_handle = self.source_mapper.bytecode.field_handle_at(field_idx)?;
-        let struct_def = self
-            .source_mapper
-            .bytecode
-            .struct_def_at(field_handle.owner)?;
-        let field_def = match &struct_def.field_information {
-            StructFieldInformation::Native => {
-                return Err(format_err!("Attempt to access field on a native struct"));
+    fn type_for_field(&self, field_idx: FieldOrVariantIndex) -> Result<String> {
+        let code = self.source_mapper.bytecode;
+        let (field_ty, struct_def_idx) = match field_idx {
+            FieldOrVariantIndex::FieldIndex(idx) => {
+                let field_handle = code.field_handle_at(idx)?;
+                let struct_def = code.struct_def_at(field_handle.owner)?;
+                (
+                    struct_def
+                        .field_information
+                        .fields(None)
+                        .get(field_handle.field as usize)
+                        .ok_or_else(|| anyhow!("Inconsistent field offset"))?
+                        .signature
+                        .0
+                        .clone(),
+                    field_handle.owner,
+                )
+            },
+            FieldOrVariantIndex::VariantFieldIndex(idx) => {
+                let field_handle = code.variant_field_handle_at(idx)?;
+                // We can take any representative for verified code.
+                let Some(variant) = field_handle.variants.first().cloned() else {
+                    bail!("Inconsistent empty variant field list")
+                };
+                let struct_def = code.struct_def_at(field_handle.struct_index)?;
+                (
+                    struct_def
+                        .field_information
+                        .fields(Some(variant))
+                        .get(field_handle.field as usize)
+                        .ok_or_else(|| anyhow!("Inconsistent field offset"))?
+                        .signature
+                        .0
+                        .clone(),
+                    field_handle.struct_index,
+                )
             },
-            StructFieldInformation::Declared(fields) => fields
-                .get(field_handle.field as usize)
-                .ok_or_else(|| format_err!("Bad field index"))?,
         };
         let struct_source_info = self
             .source_mapper
             .source_map
-            .get_struct_source_map(field_handle.owner)?;
-        let field_type_sig = field_def.signature.0.clone();
-        let ty = self.disassemble_sig_tok(field_type_sig, &struct_source_info.type_parameters)?;
+            .get_struct_source_map(struct_def_idx)?;
+        let ty = self.disassemble_sig_tok(field_ty, &struct_source_info.type_parameters)?;
         Ok(ty)
     }
 
@@ -354,22 +444,27 @@ impl<'a> Disassembler<'a> {
         signature: &Signature,
         type_param_context: &[SourceName],
     ) -> Result<(String, String)> {
-        let struct_definition = self.get_struct_def(struct_idx)?;
+        let name = self.name_for_struct(struct_idx)?;
         let type_arguments = signature
             .0
             .iter()
             .map(|sig_tok| self.disassemble_sig_tok(sig_tok.clone(), type_param_context))
             .collect::<Result<Vec<String>>>()?;
+        Ok((name, Self::format_type_params(&type_arguments)))
+    }
 
-        let struct_handle = self
-            .source_mapper
-            .bytecode
-            .struct_handle_at(struct_definition.struct_handle);
-        let name = self
-            .source_mapper
-            .bytecode
-            .identifier_at(struct_handle.name)
-            .to_string();
+    fn variant_struct_type_info(
+        &self,
+        struct_variant_idx: StructVariantHandleIndex,
+        signature: &Signature,
+        type_param_context: &[SourceName],
+    ) -> Result<(String, String)> {
+        let name = self.name_for_struct_variant(struct_variant_idx)?;
+        let type_arguments = signature
+            .0
+            .iter()
+            .map(|sig_tok| self.disassemble_sig_tok(sig_tok.clone(), type_param_context))
+            .collect::<Result<Vec<String>>>()?;
         Ok((name, Self::format_type_params(&type_arguments)))
     }
 
@@ -609,8 +704,9 @@ impl<'a> Disassembler<'a> {
                 Ok(format!("ImmBorrowLoc[{}]({}: {})", local_idx, name, ty))
             },
             Bytecode::MutBorrowField(field_idx) => {
-                let name = self.name_for_field(*field_idx)?;
-                let ty = self.type_for_field(*field_idx)?;
+                let idx = FieldOrVariantIndex::FieldIndex(*field_idx);
+                let name = self.name_for_field(idx)?;
+                let ty = self.type_for_field(idx)?;
                 Ok(format!("MutBorrowField[{}]({}: {})", field_idx, name, ty))
             },
             Bytecode::MutBorrowFieldGeneric(field_idx) => {
@@ -618,16 +714,18 @@ impl<'a> Disassembler<'a> {
                     .source_mapper
                     .bytecode
                     .field_instantiation_at(*field_idx)?;
-                let name = self.name_for_field(field_inst.handle)?;
-                let ty = self.type_for_field(field_inst.handle)?;
+                let idx = FieldOrVariantIndex::FieldIndex(field_inst.handle);
+                let name = self.name_for_field(idx)?;
+                let ty = self.type_for_field(idx)?;
                 Ok(format!(
                     "MutBorrowFieldGeneric[{}]({}: {})",
                     field_idx, name, ty
                 ))
             },
             Bytecode::ImmBorrowField(field_idx) => {
-                let name = self.name_for_field(*field_idx)?;
-                let ty = self.type_for_field(*field_idx)?;
+                let idx = FieldOrVariantIndex::FieldIndex(*field_idx);
+                let name = self.name_for_field(idx)?;
+                let ty = self.type_for_field(idx)?;
                 Ok(format!("ImmBorrowField[{}]({}: {})", field_idx, name, ty))
             },
             Bytecode::ImmBorrowFieldGeneric(field_idx) => {
@@ -635,13 +733,58 @@ impl<'a> Disassembler<'a> {
                     .source_mapper
                     .bytecode
                     .field_instantiation_at(*field_idx)?;
-                let name = self.name_for_field(field_inst.handle)?;
-                let ty = self.type_for_field(field_inst.handle)?;
+                let idx = FieldOrVariantIndex::FieldIndex(field_inst.handle);
+                let name = self.name_for_field(idx)?;
+                let ty = self.type_for_field(idx)?;
                 Ok(format!(
                     "ImmBorrowFieldGeneric[{}]({}: {})",
                     field_idx, name, ty
                 ))
             },
+            Bytecode::MutBorrowVariantField(field_idx) => {
+                let idx = FieldOrVariantIndex::VariantFieldIndex(*field_idx);
+                let name = self.name_for_field(idx)?;
+                let ty = self.type_for_field(idx)?;
+                Ok(format!(
+                    "MutBorrowVariantField[{}]({}: {})",
+                    field_idx, name, ty
+                ))
+            },
+            Bytecode::MutBorrowVariantFieldGeneric(field_idx) => {
+                let field_inst = self
+                    .source_mapper
+                    .bytecode
+                    .variant_field_instantiation_at(*field_idx)?;
+                let idx = FieldOrVariantIndex::VariantFieldIndex(field_inst.handle);
+                let name = self.name_for_field(idx)?;
+                let ty = self.type_for_field(idx)?;
+                Ok(format!(
+                    "MutBorrowVariantFieldGeneric[{}]({}: {})",
+                    field_idx, name, ty
+                ))
+            },
+            Bytecode::ImmBorrowVariantField(field_idx) => {
+                let idx = FieldOrVariantIndex::VariantFieldIndex(*field_idx);
+                let name = self.name_for_field(idx)?;
+                let ty = self.type_for_field(idx)?;
+                Ok(format!(
+                    "ImmBorrowVariantField[{}]({}: {})",
+                    field_idx, name, ty
+                ))
+            },
+            Bytecode::ImmBorrowVariantFieldGeneric(field_idx) => {
+                let field_inst = self
+                    .source_mapper
+                    .bytecode
+                    .variant_field_instantiation_at(*field_idx)?;
+                let idx = FieldOrVariantIndex::VariantFieldIndex(field_inst.handle);
+                let name = self.name_for_field(idx)?;
+                let ty = self.type_for_field(idx)?;
+                Ok(format!(
+                    "ImmBorrowVariantFieldGeneric[{}]({}: {})",
+                    field_idx, name, ty
+                ))
+            },
             Bytecode::Pack(struct_idx) => {
                 let (name, ty_params) = self.struct_type_info(
                     *struct_idx,
@@ -651,14 +794,9 @@ impl<'a> Disassembler<'a> {
                 Ok(format!("Pack[{}]({}{})", struct_idx, name, ty_params))
             },
             Bytecode::PackGeneric(struct_idx) => {
-                let struct_inst = self
-                    .source_mapper
-                    .bytecode
-                    .struct_instantiation_at(*struct_idx)?;
-                let type_params = self
-                    .source_mapper
-                    .bytecode
-                    .signature_at(struct_inst.type_parameters);
+                let code = self.source_mapper.bytecode;
+                let struct_inst = code.struct_instantiation_at(*struct_idx)?;
+                let type_params = code.signature_at(struct_inst.type_parameters);
                 let (name, ty_params) = self.struct_type_info(
                     struct_inst.def,
                     type_params,
@@ -678,14 +816,9 @@ impl<'a> Disassembler<'a> {
                 Ok(format!("Unpack[{}]({}{})", struct_idx, name, ty_params))
             },
             Bytecode::UnpackGeneric(struct_idx) => {
-                let struct_inst = self
-                    .source_mapper
-                    .bytecode
-                    .struct_instantiation_at(*struct_idx)?;
-                let type_params = self
-                    .source_mapper
-                    .bytecode
-                    .signature_at(struct_inst.type_parameters);
+                let code = self.source_mapper.bytecode;
+                let struct_inst = code.struct_instantiation_at(*struct_idx)?;
+                let type_params = code.signature_at(struct_inst.type_parameters);
                 let (name, ty_params) = self.struct_type_info(
                     struct_inst.def,
                     type_params,
@@ -696,6 +829,81 @@ impl<'a> Disassembler<'a> {
                     struct_idx, name, ty_params
                 ))
             },
+            Bytecode::PackVariant(struct_idx) => {
+                let (name, ty_params) = self.variant_struct_type_info(
+                    *struct_idx,
+                    &Signature(vec![]),
+                    &function_source_map.type_parameters,
+                )?;
+                Ok(format!(
+                    "PackVariant[{}]({}{})",
+                    struct_idx, name, ty_params
+                ))
+            },
+            Bytecode::PackVariantGeneric(struct_idx) => {
+                let code = self.source_mapper.bytecode;
+                let struct_inst = code.struct_variant_instantiation_at(*struct_idx)?;
+                let type_params = code.signature_at(struct_inst.type_parameters);
+                let (name, ty_params) = self.variant_struct_type_info(
+                    struct_inst.handle,
+                    type_params,
+                    &function_source_map.type_parameters,
+                )?;
+                Ok(format!(
+                    "PackVariantGeneric[{}]({}{})",
+                    struct_idx, name, ty_params
+                ))
+            },
+            Bytecode::UnpackVariant(struct_idx) => {
+                let (name, ty_params) = self.variant_struct_type_info(
+                    *struct_idx,
+                    &Signature(vec![]),
+                    &function_source_map.type_parameters,
+                )?;
+                Ok(format!(
+                    "UnpackVariant[{}]({}{})",
+                    struct_idx, name, ty_params
+                ))
+            },
+            Bytecode::UnpackVariantGeneric(struct_idx) => {
+                let code = self.source_mapper.bytecode;
+                let struct_inst = code.struct_variant_instantiation_at(*struct_idx)?;
+                let type_params = code.signature_at(struct_inst.type_parameters);
+                let (name, ty_params) = self.variant_struct_type_info(
+                    struct_inst.handle,
+                    type_params,
+                    &function_source_map.type_parameters,
+                )?;
+                Ok(format!(
+                    "UnpackVariantGeneric[{}]({}{})",
+                    struct_idx, name, ty_params
+                ))
+            },
+            Bytecode::TestVariant(struct_idx) => {
+                let (name, ty_params) = self.variant_struct_type_info(
+                    *struct_idx,
+                    &Signature(vec![]),
+                    &function_source_map.type_parameters,
+                )?;
+                Ok(format!(
+                    "TestVariant[{}]({}{})",
+                    struct_idx, name, ty_params
+                ))
+            },
+            Bytecode::TestVariantGeneric(struct_idx) => {
+                let code = self.source_mapper.bytecode;
+                let struct_inst = code.struct_variant_instantiation_at(*struct_idx)?;
+                let type_params = code.signature_at(struct_inst.type_parameters);
+                let (name, ty_params) = self.variant_struct_type_info(
+                    struct_inst.handle,
+                    type_params,
+                    &function_source_map.type_parameters,
+                )?;
+                Ok(format!(
+                    "TestVariantGeneric[{}]({}{})",
+                    struct_idx, name, ty_params
+                ))
+            },
             Bytecode::Exists(struct_idx) => {
                 let (name, ty_params) = self.struct_type_info(
                     *struct_idx,
@@ -1175,76 +1383,79 @@ impl<'a> Disassembler<'a> {
             .source_mapper
             .source_map
             .get_struct_source_map(struct_def_idx)?;
-
-        let field_info: Option<Vec<(&IdentStr, &TypeSignature)>> =
-            match &struct_definition.field_information {
-                StructFieldInformation::Native => None,
-                StructFieldInformation::Declared(fields) => Some(
-                    fields
-                        .iter()
-                        .map(|field_definition| {
-                            let type_sig = &field_definition.signature;
-                            let field_name = self
-                                .source_mapper
-                                .bytecode
-                                .identifier_at(field_definition.name);
-                            (field_name, type_sig)
-                        })
-                        .collect(),
-                ),
-            };
-
-        let native = if field_info.is_none() { "native " } else { "" };
-
-        let abilities = if struct_handle.abilities == AbilitySet::EMPTY {
-            String::new()
-        } else {
-            let ability_vec: Vec<_> = struct_handle
-                .abilities
-                .into_iter()
-                .map(Self::format_ability)
-                .collect();
-            format!(" has {}", ability_vec.join(", "))
-        };
-
         let name = self
             .source_mapper
             .bytecode
             .identifier_at(struct_handle.name)
             .to_string();
-
         let ty_params = Self::disassemble_struct_type_formals(
             &struct_source_map.type_parameters,
             &struct_handle.type_parameters,
         );
-        let mut fields = match field_info {
-            None => vec![],
-            Some(field_info) => field_info
-                .iter()
-                .map(|(name, ty)| {
-                    let ty_str =
-                        self.disassemble_sig_tok(ty.0.clone(), &struct_source_map.type_parameters)?;
-                    Ok(format!("{}: {}", name, ty_str))
-                })
-                .collect::<Result<Vec<String>>>()?,
+        let abilities = if struct_handle.abilities == AbilitySet::EMPTY {
+            String::new()
+        } else {
+            let ability_vec: Vec<_> = struct_handle
+                .abilities
+                .into_iter()
+                .map(Self::format_ability)
+                .collect();
+            format!(" has {}", ability_vec.join(", "))
         };
 
-        if let Some(first_elem) = fields.first_mut() {
-            first_elem.insert_str(0, "{\n\t");
-        }
-
-        if let Some(last_elem) = fields.last_mut() {
-            last_elem.push_str("\n}");
+        match &struct_definition.field_information {
+            StructFieldInformation::Native => {
+                Ok(format!("native struct {}{}{}", name, ty_params, abilities))
+            },
+            StructFieldInformation::Declared(fields) => Ok(format!(
+                "struct {}{}{} {{\n{}\n}}",
+                name,
+                ty_params,
+                abilities,
+                self.print_fields(struct_source_map, fields.iter())
+            )),
+            StructFieldInformation::DeclaredVariants(variants) => {
+                let variant_strs = variants
+                    .iter()
+                    .map(|v| {
+                        let name_str = self.source_mapper.bytecode.identifier_at(v.name);
+                        format!(
+                            " {}{{\n{}\n }}",
+                            name_str,
+                            self.print_fields(struct_source_map, v.fields.iter())
+                        )
+                    })
+                    .collect::<Vec<_>>()
+                    .join(",\n");
+                Ok(format!(
+                    "enum {}{}{} {{\n{}\n}}",
+                    name, ty_params, abilities, variant_strs
+                ))
+            },
         }
+    }
 
-        Ok(format!(
-            "{native}struct {name}{ty_params}{abilities} {fields}",
-            native = native,
-            name = name,
-            ty_params = ty_params,
-            abilities = abilities,
-            fields = &fields.join(",\n\t"),
-        ))
+    fn print_fields<'l>(
+        &self,
+        source_map: &StructSourceMap,
+        fields: impl Iterator<Item = &'l FieldDefinition>,
+    ) -> String {
+        fields
+            .map(|field_definition| {
+                let field_name = self
+                    .source_mapper
+                    .bytecode
+                    .identifier_at(field_definition.name);
+                let ty_str = self
+                    .disassemble_sig_tok(
+                        field_definition.signature.0.clone(),
+                        &source_map.type_parameters,
+                    )
+                    .unwrap_or_else(|_| "??".to_string());
+                format!("\t{}: {}", field_name, ty_str)
+            })
+            .collect::<Vec<_>>()
+            .join(",\n")
     }
 
     pub fn disassemble(&self) -> Result<String> {
@@ -1309,18 +1520,27 @@ impl<'a> Disassembler<'a> {
                 })
                 .collect::<Result<Vec<String>>>()?,
         };
+
+        let stats = if self.options.print_bytecode_stats {
+            let count = self.get_instruction_count();
+            format!("\n\n// Total number of instructions: {}\n", count)
+        } else {
+            "".to_owned()
+        };
+
         let imports_str = if imports.is_empty() {
             "".to_string()
         } else {
             format!("\n{}\n\n", imports.join("\n"))
         };
         Ok(format!(
-            "// Move bytecode v{version}\n{header} {{{imports}\n{struct_defs}\n\n{function_defs}\n}}",
+            "// Move bytecode v{version}\n{header} {{{imports}\n{struct_defs}\n\n{function_defs}\n}}{stats}",
             version = version,
             header = header,
             imports = &imports_str,
             struct_defs = &struct_defs.join("\n"),
-            function_defs = &function_defs.join("\n")
+            function_defs = &function_defs.join("\n"),
+            stats = stats
         ))
     }
 }
diff --git a/third_party/move/tools/move-disassembler/src/main.rs b/third_party/move/tools/move-disassembler/src/main.rs
index b412cf7947295..b8f2e36db8a88 100644
--- a/third_party/move/tools/move-disassembler/src/main.rs
+++ b/third_party/move/tools/move-disassembler/src/main.rs
@@ -25,7 +25,7 @@ struct Args {
     #[clap(long = "skip-private")]
     pub skip_private: bool,
 
-    /// Do not print the disassembled bytecodes of each function.
+    /// Do not print the disassembled bytecode for each function.
     #[clap(long = "skip-code")]
     pub skip_code: bool,
 
@@ -37,6 +37,10 @@ struct Args {
     #[clap(long = "skip-basic-blocks")]
     pub skip_basic_blocks: bool,
 
+    /// Print statistics about the bytecode.
+    #[clap(long = "print-bytecode-stats")]
+    pub print_bytecode_stats: bool,
+
     /// Treat input file as a script (default is to treat file as a module)
     #[clap(short = 's', long = "script")]
     pub is_script: bool,
@@ -85,6 +89,7 @@ fn main() {
     disassembler_options.only_externally_visible = args.skip_private;
     disassembler_options.print_basic_blocks = !args.skip_basic_blocks;
     disassembler_options.print_locals = !args.skip_locals;
+    disassembler_options.print_bytecode_stats = args.print_bytecode_stats;
 
     // TODO: make source mapping work with the Move source language
     let no_loc = Spanned::unsafe_no_loc(()).loc;
@@ -123,9 +128,9 @@ fn main() {
         );
     }
 
-    let dissassemble_string = disassembler.disassemble().expect("Unable to dissassemble");
+    let disassemble_string = disassembler.disassemble().expect("Unable to disassemble");
 
-    println!("{}", dissassemble_string);
+    println!("{}", disassemble_string);
 }
 
 #[test]
diff --git a/third_party/move/tools/move-package/Cargo.toml b/third_party/move/tools/move-package/Cargo.toml
index ee1609ac73a64..7c57f7cffc06b 100644
--- a/third_party/move/tools/move-package/Cargo.toml
+++ b/third_party/move/tools/move-package/Cargo.toml
@@ -45,6 +45,7 @@ whoami = { workspace = true }
 
 [dev-dependencies]
 datatest-stable = { workspace = true }
+move-stdlib = { path = "../../move-stdlib" }
 
 [[test]]
 name = "test_runner"
diff --git a/third_party/move/tools/move-package/src/compilation/compiled_package.rs b/third_party/move/tools/move-package/src/compilation/compiled_package.rs
index 1990ced35f954..80828bc2ac3ea 100644
--- a/third_party/move/tools/move-package/src/compilation/compiled_package.rs
+++ b/third_party/move/tools/move-package/src/compilation/compiled_package.rs
@@ -18,12 +18,8 @@ use move_abigen::{Abigen, AbigenOptions};
 use move_binary_format::file_format::{CompiledModule, CompiledScript};
 use move_bytecode_source_map::utils::source_map_from_file;
 use move_bytecode_utils::Modules;
-use move_command_line_common::{
-    env::get_bytecode_version_from_env,
-    files::{
-        extension_equals, find_filenames, MOVE_COMPILED_EXTENSION, MOVE_EXTENSION,
-        SOURCE_MAP_EXTENSION,
-    },
+use move_command_line_common::files::{
+    extension_equals, find_filenames, MOVE_COMPILED_EXTENSION, MOVE_EXTENSION, SOURCE_MAP_EXTENSION,
 };
 use move_compiler::{
     attr_derivation,
@@ -327,7 +323,7 @@ impl OnDiskCompiledPackage {
         &self,
         package_name: Symbol,
         compiled_unit: &CompiledUnitWithSource,
-        bytecode_version: Option<u32>,
+        bytecode_version: u32,
     ) -> Result<()> {
         let root_package = self.package.compiled_package_info.package_name;
         assert!(self.root_path.ends_with(root_package.as_str()));
@@ -353,7 +349,7 @@ impl OnDiskCompiledPackage {
                 .with_extension(MOVE_COMPILED_EXTENSION),
             compiled_unit
                 .unit
-                .serialize(get_bytecode_version_from_env(bytecode_version))
+                .serialize(Some(bytecode_version))
                 .as_slice(),
         )?;
         self.save_under(
@@ -622,7 +618,7 @@ impl CompiledPackage {
         // If bytecode dependency is not empty, do not allow renaming
         if !bytecode_deps.is_empty() {
             if let Some(pkg_name) = resolution_graph.contains_renaming() {
-                anyhow::bail!(
+                bail!(
                     "Found address renaming in package '{}' when \
                     building with bytecode dependencies -- this is currently not supported",
                     pkg_name
@@ -695,6 +691,9 @@ impl CompiledPackage {
                     compile_test_code: flags.keep_testing_functions(),
                     ..Default::default()
                 };
+                for experiment in &config.experiments {
+                    options = options.set_experiment(experiment, true)
+                }
                 options = options.set_experiment(Experiment::ATTACH_COMPILED_MODULE, true);
                 compiler_driver_v2(options)?
             },
@@ -736,8 +735,10 @@ impl CompiledPackage {
                 deps_compiled_units.push((package_name, unit))
             }
         }
-        let bytecode_version = get_bytecode_version_from_env(config.bytecode_version);
-
+        let bytecode_version = config
+            .language_version
+            .unwrap_or_default()
+            .infer_bytecode_version(config.bytecode_version);
         let mut compiled_docs = None;
         let mut compiled_abis = None;
         let mut move_model = None;
@@ -872,7 +873,7 @@ impl CompiledPackage {
     pub(crate) fn save_to_disk(
         &self,
         under_path: PathBuf,
-        bytecode_version: Option<u32>,
+        bytecode_version: u32,
     ) -> Result<OnDiskCompiledPackage> {
         self.check_filepaths_ok()?;
         assert!(under_path.ends_with(CompiledPackageLayout::Root.path()));
@@ -939,7 +940,7 @@ impl CompiledPackage {
     }
 
     fn build_abis(
-        bytecode_version: Option<u32>,
+        bytecode_version: u32,
         model: &GlobalEnv,
         compiled_units: &[CompiledUnitWithSource],
     ) -> Vec<(String, Vec<u8>)> {
@@ -948,11 +949,11 @@ impl CompiledPackage {
             .map(|unit| match &unit.unit {
                 CompiledUnit::Script(script) => (
                     script.name.to_string(),
-                    unit.unit.serialize(bytecode_version),
+                    unit.unit.serialize(Some(bytecode_version)),
                 ),
                 CompiledUnit::Module(module) => (
                     module.name.to_string(),
-                    unit.unit.serialize(bytecode_version),
+                    unit.unit.serialize(Some(bytecode_version)),
                 ),
             })
             .collect();
diff --git a/third_party/move/tools/move-package/src/compilation/model_builder.rs b/third_party/move/tools/move-package/src/compilation/model_builder.rs
index 69f703ab45418..dea3e926120e5 100644
--- a/third_party/move/tools/move-package/src/compilation/model_builder.rs
+++ b/third_party/move/tools/move-package/src/compilation/model_builder.rs
@@ -143,7 +143,7 @@ impl ModelBuilder {
                     .build_options
                     .compiler_config
                     .language_version;
-                options.known_attributes = known_attributes.clone();
+                options.known_attributes.clone_from(known_attributes);
                 options.skip_attribute_checks = skip_attribute_checks;
                 let mut error_writer = StandardStream::stderr(ColorChoice::Auto);
                 move_compiler_v2::run_move_compiler_for_analysis(&mut error_writer, options)
diff --git a/third_party/move/tools/move-package/src/lib.rs b/third_party/move/tools/move-package/src/lib.rs
index 89ded94d5a966..573b6bfc54845 100644
--- a/third_party/move/tools/move-package/src/lib.rs
+++ b/third_party/move/tools/move-package/src/lib.rs
@@ -28,7 +28,7 @@ use move_model::{
     model,
 };
 use serde::{Deserialize, Serialize};
-use source_package::layout::SourcePackageLayout;
+use source_package::{layout::SourcePackageLayout, std_lib::StdVersion};
 use std::{
     collections::{BTreeMap, BTreeSet},
     fmt,
@@ -109,6 +109,10 @@ pub struct BuildConfig {
     #[clap(name = "test-mode", long = "test", global = true)]
     pub test_mode: bool,
 
+    /// Whether to override the standard library with the given version.
+    #[clap(long = "override-std", global = true, value_parser)]
+    pub override_std: Option<StdVersion>,
+
     /// Generate documentation for packages
     #[clap(name = "generate-docs", long = "doc", global = true)]
     pub generate_docs: bool,
@@ -175,6 +179,10 @@ pub struct CompilerConfig {
     #[clap(long = "language-version", global = true,
            value_parser = clap::value_parser!(LanguageVersion))]
     pub language_version: Option<LanguageVersion>,
+
+    /// Experiments for v2 compiler to set to true
+    #[clap(long = "experiments", global = true)]
+    pub experiments: Vec<String>,
 }
 
 #[derive(Debug, Clone, Eq, PartialEq, PartialOrd)]
diff --git a/third_party/move/tools/move-package/src/resolution/resolution_graph.rs b/third_party/move/tools/move-package/src/resolution/resolution_graph.rs
index 49b763e4e3895..45223e632edd6 100644
--- a/third_party/move/tools/move-package/src/resolution/resolution_graph.rs
+++ b/third_party/move/tools/move-package/src/resolution/resolution_graph.rs
@@ -12,6 +12,7 @@ use crate::{
             Dependencies, Dependency, FileName, NamedAddress, PackageDigest, PackageName,
             SourceManifest, SubstOrRename,
         },
+        std_lib::{StdLib, StdVersion},
     },
     BuildConfig,
 };
@@ -107,14 +108,22 @@ impl ResolvingGraph {
         }
         let mut resolution_graph = Self {
             root_package_path: root_package_path.clone(),
-            build_options,
+            build_options: build_options.clone(),
             root_package: root_package.clone(),
             graph: DiGraphMap::new(),
             package_table: BTreeMap::new(),
         };
 
+        let override_std = &build_options.override_std;
+
         resolution_graph
-            .build_resolution_graph(root_package.clone(), root_package_path, true, writer)
+            .build_resolution_graph(
+                root_package.clone(),
+                root_package_path,
+                true,
+                override_std,
+                writer,
+            )
             .with_context(|| {
                 format!(
                     "Unable to resolve packages for package '{}'",
@@ -199,6 +208,7 @@ impl ResolvingGraph {
         package: SourceManifest,
         package_path: PathBuf,
         is_root_package: bool,
+        override_std: &Option<StdVersion>,
         writer: &mut W,
     ) -> Result<()> {
         let package_name = package.package.name;
@@ -237,12 +247,17 @@ impl ResolvingGraph {
             BTreeMap::new()
         };
 
-        for (dep_name, dep) in package
+        for (dep_name, mut dep) in package
             .dependencies
             .clone()
             .into_iter()
             .chain(additional_deps.into_iter())
         {
+            if let Some(std_version) = &override_std {
+                if let Some(std_lib) = StdLib::from_package_name(dep_name) {
+                    dep = std_lib.dependency(std_version);
+                }
+            }
             let dep_node_id = self.get_or_add_node(dep_name).with_context(|| {
                 format!(
                     "Cycle between packages {} and {} found",
@@ -252,7 +267,7 @@ impl ResolvingGraph {
             self.graph.add_edge(package_node_id, dep_node_id, ());
 
             let (dep_renaming, dep_resolution_table) = self
-                .process_dependency(dep_name, dep, package_path.clone(), writer)
+                .process_dependency(dep_name, dep, package_path.clone(), override_std, writer)
                 .with_context(|| {
                     format!(
                         "While resolving dependency '{}' in package '{}'",
@@ -393,6 +408,7 @@ impl ResolvingGraph {
         dep_name_in_pkg: PackageName,
         dep: Dependency,
         root_path: PathBuf,
+        override_std: &Option<StdVersion>,
         writer: &mut W,
     ) -> Result<(Renaming, ResolvingTable)> {
         Self::download_and_update_if_remote(
@@ -404,10 +420,14 @@ impl ResolvingGraph {
         let (dep_package, dep_package_dir) =
             Self::parse_package_manifest(&dep, &dep_name_in_pkg, root_path)
                 .with_context(|| format!("While processing dependency '{}'", dep_name_in_pkg))?;
-        self.build_resolution_graph(dep_package.clone(), dep_package_dir, false, writer)
-            .with_context(|| {
-                format!("Unable to resolve package dependency '{}'", dep_name_in_pkg)
-            })?;
+        self.build_resolution_graph(
+            dep_package.clone(),
+            dep_package_dir,
+            false,
+            override_std,
+            writer,
+        )
+        .with_context(|| format!("Unable to resolve package dependency '{}'", dep_name_in_pkg))?;
 
         if dep_name_in_pkg != dep_package.package.name {
             bail!("Name of dependency declared in package '{}' does not match dependency's package name '{}'",
diff --git a/third_party/move/tools/move-package/src/source_package/layout.rs b/third_party/move/tools/move-package/src/source_package/layout.rs
index 662cecd9bc450..0a4827691e06d 100644
--- a/third_party/move/tools/move-package/src/source_package/layout.rs
+++ b/third_party/move/tools/move-package/src/source_package/layout.rs
@@ -17,6 +17,7 @@ pub enum SourcePackageLayout {
     Examples,
     Manifest,
     DocTemplates,
+    Build,
 }
 
 impl SourcePackageLayout {
@@ -28,7 +29,8 @@ impl SourcePackageLayout {
     /// ├── scripts        (optional)
     /// ├── specifications (optional)
     /// ├── doc_templates      (optional)
-    /// └── tests          (optional, test mode)
+    /// ├── tests          (optional, test mode)
+    /// └── build          (created by package build to contain build artifacts)
     pub fn path(&self) -> &Path {
         Path::new(self.location_str())
     }
@@ -57,6 +59,7 @@ impl SourcePackageLayout {
             Self::Examples => "examples",
             Self::Specifications => "specifications",
             Self::DocTemplates => "doc_templates",
+            Self::Build => "build",
         }
     }
 
@@ -67,7 +70,8 @@ impl SourcePackageLayout {
             | Self::Scripts
             | Self::Examples
             | Self::Specifications
-            | Self::DocTemplates => true,
+            | Self::DocTemplates
+            | Self::Build => true,
         }
     }
 }
diff --git a/third_party/move/tools/move-package/src/source_package/manifest_parser.rs b/third_party/move/tools/move-package/src/source_package/manifest_parser.rs
index 9a6bb2322c8d7..384724e666944 100644
--- a/third_party/move/tools/move-package/src/source_package/manifest_parser.rs
+++ b/third_party/move/tools/move-package/src/source_package/manifest_parser.rs
@@ -355,7 +355,6 @@ fn parse_dependency(dep_name: &str, tval: TV) -> Result<PM::Dependency> {
                     })
                 },
                 (None, Some(git), None) => {
-                    let move_home = MOVE_HOME.clone();
                     let rev_name = match table.remove("rev") {
                         None => bail!("Git revision not supplied for dependency"),
                         Some(r) => Symbol::from(
@@ -367,11 +366,7 @@ fn parse_dependency(dep_name: &str, tval: TV) -> Result<PM::Dependency> {
                     let git_url = git
                         .as_str()
                         .ok_or_else(|| anyhow::anyhow!("Git URL not a string"))?;
-                    let local_path = PathBuf::from(move_home).join(format!(
-                        "{}_{}",
-                        url_to_file_name(git_url),
-                        rev_name.replace('/', "__")
-                    ));
+                    let local_path = git_repo_cache_path(git_url, rev_name.as_str());
                     let subdir = PathBuf::from(match table.remove("subdir") {
                         None => "".to_string(),
                         Some(path) => path
@@ -571,3 +566,13 @@ fn check_for_required_field_names(
 
     Ok(())
 }
+
+/// Gets the local path to download the package from a git repo
+pub fn git_repo_cache_path(git_url: &str, rev_name: &str) -> PathBuf {
+    let move_home = MOVE_HOME.clone();
+    PathBuf::from(move_home).join(format!(
+        "{}_{}",
+        url_to_file_name(git_url),
+        rev_name.replace('/', "__")
+    ))
+}
diff --git a/third_party/move/tools/move-package/src/source_package/mod.rs b/third_party/move/tools/move-package/src/source_package/mod.rs
index a3829eaea18c1..c3819ef1938f4 100644
--- a/third_party/move/tools/move-package/src/source_package/mod.rs
+++ b/third_party/move/tools/move-package/src/source_package/mod.rs
@@ -5,3 +5,4 @@
 pub mod layout;
 pub mod manifest_parser;
 pub mod parsed_manifest;
+pub mod std_lib;
diff --git a/third_party/move/tools/move-package/src/source_package/std_lib.rs b/third_party/move/tools/move-package/src/source_package/std_lib.rs
new file mode 100644
index 0000000000000..4dfd8c6f6f8a0
--- /dev/null
+++ b/third_party/move/tools/move-package/src/source_package/std_lib.rs
@@ -0,0 +1,109 @@
+// Copyright (c) Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    manifest_parser::git_repo_cache_path,
+    source_package::parsed_manifest::{Dependency, GitInfo},
+};
+use clap::ValueEnum;
+use move_symbol_pool::symbol::Symbol;
+use serde::{Deserialize, Serialize};
+use std::{fmt::Display, path::PathBuf};
+
+/// Represents a standard library.
+pub enum StdLib {
+    AptosFramework,
+    AptosStdlib,
+    MoveStdlib,
+}
+
+impl StdLib {
+    /// The well-known git URL for the standard library.
+    const STD_GIT_URL: &'static str = "https://github.com/aptos-labs/aptos-core.git";
+
+    /// Returns the dependency for the standard library with the given version.
+    pub fn dependency(&self, version: &StdVersion) -> Dependency {
+        let local = git_repo_cache_path(Self::STD_GIT_URL, version.rev());
+        Dependency {
+            local: local.join(self.sub_dir()),
+            subst: None,
+            version: None,
+            digest: None,
+            git_info: Some(GitInfo {
+                git_url: Symbol::from(StdLib::STD_GIT_URL),
+                git_rev: Symbol::from(version.rev()),
+                subdir: PathBuf::from(self.sub_dir()),
+                download_to: local,
+            }),
+            node_info: None,
+        }
+    }
+
+    /// Returns the name of the standard library.
+    pub fn as_str(&self) -> &'static str {
+        match self {
+            StdLib::AptosFramework => "AptosFramework",
+            StdLib::AptosStdlib => "AptosStdlib",
+            StdLib::MoveStdlib => "MoveStdlib",
+        }
+    }
+
+    /// Returns the standard library from the given package name, or `None` if the package name is not a standard library.
+    pub fn from_package_name(package_name: Symbol) -> Option<StdLib> {
+        match package_name.as_str() {
+            "AptosFramework" => Some(StdLib::AptosFramework),
+            "AptosStdlib" => Some(StdLib::AptosStdlib),
+            "MoveStdlib" => Some(StdLib::MoveStdlib),
+            _ => None,
+        }
+    }
+
+    /// Returns the subdirectory of the standard library in the git repository.
+    fn sub_dir(&self) -> &'static str {
+        match self {
+            StdLib::AptosFramework => "aptos-move/framework/aptos-framework",
+            StdLib::AptosStdlib => "aptos-move/framework/aptos-stdlib",
+            StdLib::MoveStdlib => "aptos-move/framework/move-stdlib",
+        }
+    }
+}
+
+/// Represents a standard library version.
+#[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Eq, PartialOrd, ValueEnum)]
+#[clap(rename_all = "lower")]
+pub enum StdVersion {
+    Mainnet,
+    Testnet,
+    Devnet,
+}
+
+impl StdVersion {
+    const DEVNET: &'static str = "devnet";
+    const MAINNET: &'static str = "mainnet";
+    const TESTNET: &'static str = "testnet";
+
+    /// Returns the rev name of the standard library version.
+    pub fn rev(&self) -> &'static str {
+        match self {
+            StdVersion::Mainnet => StdVersion::MAINNET,
+            StdVersion::Testnet => StdVersion::TESTNET,
+            StdVersion::Devnet => StdVersion::DEVNET,
+        }
+    }
+
+    /// Returns the standard library version from the given rev name, or `None` if the string is not a standard library version.
+    pub fn from_rev(version: &str) -> Option<StdVersion> {
+        match version {
+            StdVersion::MAINNET => Some(Self::Mainnet),
+            StdVersion::TESTNET => Some(Self::Testnet),
+            StdVersion::DEVNET => Some(Self::Devnet),
+            _ => None,
+        }
+    }
+}
+
+impl Display for StdVersion {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self.rev())
+    }
+}
diff --git a/third_party/move/tools/move-package/tests/test_runner.rs b/third_party/move/tools/move-package/tests/test_runner.rs
index 486959f756b71..43f831e63838d 100644
--- a/third_party/move/tools/move-package/tests/test_runner.rs
+++ b/third_party/move/tools/move-package/tests/test_runner.rs
@@ -10,12 +10,12 @@ use move_compiler::shared::known_attributes::KnownAttribute;
 use move_model::metadata::{CompilerVersion, LanguageVersion};
 use move_package::{
     compilation::{build_plan::BuildPlan, model_builder::ModelBuilder},
-    package_hooks,
-    package_hooks::PackageHooks,
+    package_hooks::{self, PackageHooks},
     resolution::resolution_graph as RG,
     source_package::{
         manifest_parser as MP,
         parsed_manifest::{CustomDepInfo, PackageDigest},
+        std_lib::StdVersion,
     },
     BuildConfig, CompilerConfig, ModelConfig,
 };
@@ -29,6 +29,7 @@ use tempfile::tempdir;
 
 const COMPILE_EXT: &str = "compile";
 const MODEL_EXT: &str = "model";
+const OVERRIDE_EXT: &str = "override";
 
 fn run_test_impl(
     path: &Path,
@@ -39,6 +40,15 @@ fn run_test_impl(
         ..Default::default()
     };
     compiler_config.compiler_version = Some(compiler_version);
+    let override_path = path.with_extension(OVERRIDE_EXT);
+    let override_std = if override_path.is_file() {
+        Some(
+            StdVersion::from_rev(&fs::read_to_string(override_path)?)
+                .expect("one of mainnet/testnet/devnet"),
+        )
+    } else {
+        None
+    };
     let should_compile = path.with_extension(COMPILE_EXT).is_file();
     let should_model = path.with_extension(MODEL_EXT).is_file();
     let contents = fs::read_to_string(path)?;
@@ -51,6 +61,7 @@ fn run_test_impl(
                 BuildConfig {
                     dev_mode: true,
                     test_mode: false,
+                    override_std,
                     generate_docs: false,
                     generate_abis: false,
                     install_dir: Some(tempdir().unwrap().path().to_path_buf()),
diff --git a/third_party/move/tools/move-package/tests/test_sources/compilation/basic_no_deps/Move.exp b/third_party/move/tools/move-package/tests/test_sources/compilation/basic_no_deps/Move.exp
index c7db84b07c642..f277bec044d5e 100644
--- a/third_party/move/tools/move-package/tests/test_sources/compilation/basic_no_deps/Move.exp
+++ b/third_party/move/tools/move-package/tests/test_sources/compilation/basic_no_deps/Move.exp
@@ -7,6 +7,7 @@ CompiledPackageInfo {
     build_flags: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
@@ -35,6 +36,7 @@ CompiledPackageInfo {
                 V1,
             ),
             language_version: None,
+            experiments: [],
         },
     },
 }
diff --git a/third_party/move/tools/move-package/tests/test_sources/compilation/basic_no_deps/Move.v2_exp b/third_party/move/tools/move-package/tests/test_sources/compilation/basic_no_deps/Move.v2_exp
index adaca3b1886fd..f5a12c4636830 100644
--- a/third_party/move/tools/move-package/tests/test_sources/compilation/basic_no_deps/Move.v2_exp
+++ b/third_party/move/tools/move-package/tests/test_sources/compilation/basic_no_deps/Move.v2_exp
@@ -7,6 +7,7 @@ CompiledPackageInfo {
     build_flags: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
@@ -35,6 +36,7 @@ CompiledPackageInfo {
                 V2_0,
             ),
             language_version: None,
+            experiments: [],
         },
     },
 }
diff --git a/third_party/move/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_assigned/Move.exp b/third_party/move/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_assigned/Move.exp
index 7719a13c2b504..78e5b738ff140 100644
--- a/third_party/move/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_assigned/Move.exp
+++ b/third_party/move/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_assigned/Move.exp
@@ -9,6 +9,7 @@ CompiledPackageInfo {
     build_flags: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
@@ -37,6 +38,7 @@ CompiledPackageInfo {
                 V1,
             ),
             language_version: None,
+            experiments: [],
         },
     },
 }
diff --git a/third_party/move/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_assigned/Move.v2_exp b/third_party/move/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_assigned/Move.v2_exp
index 5d9dcfb4ccff0..1204f2f05c5b4 100644
--- a/third_party/move/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_assigned/Move.v2_exp
+++ b/third_party/move/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_assigned/Move.v2_exp
@@ -9,6 +9,7 @@ CompiledPackageInfo {
     build_flags: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
@@ -37,6 +38,7 @@ CompiledPackageInfo {
                 V2_0,
             ),
             language_version: None,
+            experiments: [],
         },
     },
 }
diff --git a/third_party/move/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_not_assigned_with_dev_assignment/Move.exp b/third_party/move/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_not_assigned_with_dev_assignment/Move.exp
index de543cb5e5995..c20a994de952c 100644
--- a/third_party/move/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_not_assigned_with_dev_assignment/Move.exp
+++ b/third_party/move/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_not_assigned_with_dev_assignment/Move.exp
@@ -9,6 +9,7 @@ CompiledPackageInfo {
     build_flags: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
@@ -37,6 +38,7 @@ CompiledPackageInfo {
                 V1,
             ),
             language_version: None,
+            experiments: [],
         },
     },
 }
diff --git a/third_party/move/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_not_assigned_with_dev_assignment/Move.v2_exp b/third_party/move/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_not_assigned_with_dev_assignment/Move.v2_exp
index 972262e9be61c..e6fe8c22f8394 100644
--- a/third_party/move/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_not_assigned_with_dev_assignment/Move.v2_exp
+++ b/third_party/move/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_not_assigned_with_dev_assignment/Move.v2_exp
@@ -9,6 +9,7 @@ CompiledPackageInfo {
     build_flags: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
@@ -37,6 +38,7 @@ CompiledPackageInfo {
                 V2_0,
             ),
             language_version: None,
+            experiments: [],
         },
     },
 }
diff --git a/third_party/move/tools/move-package/tests/test_sources/compilation/basic_no_deps_test_mode/Move.exp b/third_party/move/tools/move-package/tests/test_sources/compilation/basic_no_deps_test_mode/Move.exp
index ead9bb2d6164d..fa3d8726f836e 100644
--- a/third_party/move/tools/move-package/tests/test_sources/compilation/basic_no_deps_test_mode/Move.exp
+++ b/third_party/move/tools/move-package/tests/test_sources/compilation/basic_no_deps_test_mode/Move.exp
@@ -9,6 +9,7 @@ CompiledPackageInfo {
     build_flags: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
@@ -37,6 +38,7 @@ CompiledPackageInfo {
                 V1,
             ),
             language_version: None,
+            experiments: [],
         },
     },
 }
diff --git a/third_party/move/tools/move-package/tests/test_sources/compilation/basic_no_deps_test_mode/Move.v2_exp b/third_party/move/tools/move-package/tests/test_sources/compilation/basic_no_deps_test_mode/Move.v2_exp
index 538af07d87225..024e4894a045c 100644
--- a/third_party/move/tools/move-package/tests/test_sources/compilation/basic_no_deps_test_mode/Move.v2_exp
+++ b/third_party/move/tools/move-package/tests/test_sources/compilation/basic_no_deps_test_mode/Move.v2_exp
@@ -9,6 +9,7 @@ CompiledPackageInfo {
     build_flags: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
@@ -37,6 +38,7 @@ CompiledPackageInfo {
                 V2_0,
             ),
             language_version: None,
+            experiments: [],
         },
     },
 }
diff --git a/third_party/move/tools/move-cli/tests/metatests/dummy/test_1/args.txt b/third_party/move/tools/move-package/tests/test_sources/compilation/call_package_fun_from_other_package/Move.compile
similarity index 100%
rename from third_party/move/tools/move-cli/tests/metatests/dummy/test_1/args.txt
rename to third_party/move/tools/move-package/tests/test_sources/compilation/call_package_fun_from_other_package/Move.compile
diff --git a/third_party/move/tools/move-package/tests/test_sources/compilation/call_package_fun_from_other_package/Move.exp b/third_party/move/tools/move-package/tests/test_sources/compilation/call_package_fun_from_other_package/Move.exp
new file mode 100644
index 0000000000000..7f85acfe8af72
--- /dev/null
+++ b/third_party/move/tools/move-package/tests/test_sources/compilation/call_package_fun_from_other_package/Move.exp
@@ -0,0 +1 @@
+Compilation error
diff --git a/third_party/move/tools/move-package/tests/test_sources/compilation/call_package_fun_from_other_package/Move.toml b/third_party/move/tools/move-package/tests/test_sources/compilation/call_package_fun_from_other_package/Move.toml
new file mode 100644
index 0000000000000..560ea4772f369
--- /dev/null
+++ b/third_party/move/tools/move-package/tests/test_sources/compilation/call_package_fun_from_other_package/Move.toml
@@ -0,0 +1,10 @@
+[package]
+name = "test"
+version = "1.0.0"
+authors = []
+
+[addresses]
+A = "0x42"
+
+[dependencies]
+deps = { local = "./deps_only" }
diff --git a/third_party/move/tools/move-package/tests/test_sources/compilation/call_package_fun_from_other_package/Move.v2_exp b/third_party/move/tools/move-package/tests/test_sources/compilation/call_package_fun_from_other_package/Move.v2_exp
new file mode 100644
index 0000000000000..48fc6a6cf7e3e
--- /dev/null
+++ b/third_party/move/tools/move-package/tests/test_sources/compilation/call_package_fun_from_other_package/Move.v2_exp
@@ -0,0 +1 @@
+exiting with checking errors
diff --git a/third_party/move/tools/move-package/tests/test_sources/compilation/call_package_fun_from_other_package/deps_only/Move.toml b/third_party/move/tools/move-package/tests/test_sources/compilation/call_package_fun_from_other_package/deps_only/Move.toml
new file mode 100644
index 0000000000000..a12f8c2565731
--- /dev/null
+++ b/third_party/move/tools/move-package/tests/test_sources/compilation/call_package_fun_from_other_package/deps_only/Move.toml
@@ -0,0 +1,7 @@
+[package]
+name = "deps"
+version = "1.0.0"
+authors = []
+
+[addresses]
+B = "0x42"
\ No newline at end of file
diff --git a/third_party/move/tools/move-package/tests/test_sources/compilation/call_package_fun_from_other_package/deps_only/sources/B.move b/third_party/move/tools/move-package/tests/test_sources/compilation/call_package_fun_from_other_package/deps_only/sources/B.move
new file mode 100644
index 0000000000000..e58e9c924a64c
--- /dev/null
+++ b/third_party/move/tools/move-package/tests/test_sources/compilation/call_package_fun_from_other_package/deps_only/sources/B.move
@@ -0,0 +1,17 @@
+module B::B {
+    public(package) fun foo() {
+        0x43::B::bar()
+    }
+}
+
+module 0x43::B {
+    public(package) fun bar() {
+
+    }
+}
+
+module B::C {
+    public fun baz() {
+        B::B::foo()
+    }
+}
diff --git a/third_party/move/tools/move-package/tests/test_sources/compilation/call_package_fun_from_other_package/sources/A.move b/third_party/move/tools/move-package/tests/test_sources/compilation/call_package_fun_from_other_package/sources/A.move
new file mode 100644
index 0000000000000..f3e4492061c26
--- /dev/null
+++ b/third_party/move/tools/move-package/tests/test_sources/compilation/call_package_fun_from_other_package/sources/A.move
@@ -0,0 +1,9 @@
+module A::A {
+	use B::B;
+	use B::C;
+
+	fun foo() {
+		B::foo();
+		C::baz();
+	}
+}
diff --git a/third_party/move/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/Move.exp b/third_party/move/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/Move.exp
index 14caf20ea4a78..4ef184538d63c 100644
--- a/third_party/move/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/Move.exp
+++ b/third_party/move/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/Move.exp
@@ -10,6 +10,7 @@ CompiledPackageInfo {
     build_flags: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
@@ -38,6 +39,7 @@ CompiledPackageInfo {
                 V1,
             ),
             language_version: None,
+            experiments: [],
         },
     },
 }
diff --git a/third_party/move/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/Move.v2_exp b/third_party/move/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/Move.v2_exp
index 5bb1b26ab4d70..4ba2ad8103f43 100644
--- a/third_party/move/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/Move.v2_exp
+++ b/third_party/move/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/Move.v2_exp
@@ -10,6 +10,7 @@ CompiledPackageInfo {
     build_flags: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
@@ -38,6 +39,7 @@ CompiledPackageInfo {
                 V2_0,
             ),
             language_version: None,
+            experiments: [],
         },
     },
 }
diff --git a/third_party/move/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/Move.exp b/third_party/move/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/Move.exp
index 14caf20ea4a78..4ef184538d63c 100644
--- a/third_party/move/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/Move.exp
+++ b/third_party/move/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/Move.exp
@@ -10,6 +10,7 @@ CompiledPackageInfo {
     build_flags: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
@@ -38,6 +39,7 @@ CompiledPackageInfo {
                 V1,
             ),
             language_version: None,
+            experiments: [],
         },
     },
 }
diff --git a/third_party/move/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/Move.v2_exp b/third_party/move/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/Move.v2_exp
index 5bb1b26ab4d70..4ba2ad8103f43 100644
--- a/third_party/move/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/Move.v2_exp
+++ b/third_party/move/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/Move.v2_exp
@@ -10,6 +10,7 @@ CompiledPackageInfo {
     build_flags: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
@@ -38,6 +39,7 @@ CompiledPackageInfo {
                 V2_0,
             ),
             language_version: None,
+            experiments: [],
         },
     },
 }
diff --git a/third_party/move/tools/move-package/tests/test_sources/compilation/multiple_deps_rename/Move.exp b/third_party/move/tools/move-package/tests/test_sources/compilation/multiple_deps_rename/Move.exp
index 08b31aacb2e40..fd875adc58651 100644
--- a/third_party/move/tools/move-package/tests/test_sources/compilation/multiple_deps_rename/Move.exp
+++ b/third_party/move/tools/move-package/tests/test_sources/compilation/multiple_deps_rename/Move.exp
@@ -11,6 +11,7 @@ CompiledPackageInfo {
     build_flags: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
@@ -39,6 +40,7 @@ CompiledPackageInfo {
                 V1,
             ),
             language_version: None,
+            experiments: [],
         },
     },
 }
diff --git a/third_party/move/tools/move-package/tests/test_sources/compilation/multiple_deps_rename_one/Move.exp b/third_party/move/tools/move-package/tests/test_sources/compilation/multiple_deps_rename_one/Move.exp
index 4951314aa0ea8..b04d7877e4499 100644
--- a/third_party/move/tools/move-package/tests/test_sources/compilation/multiple_deps_rename_one/Move.exp
+++ b/third_party/move/tools/move-package/tests/test_sources/compilation/multiple_deps_rename_one/Move.exp
@@ -11,6 +11,7 @@ CompiledPackageInfo {
     build_flags: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
@@ -39,6 +40,7 @@ CompiledPackageInfo {
                 V1,
             ),
             language_version: None,
+            experiments: [],
         },
     },
 }
diff --git a/third_party/move/tools/move-package/tests/test_sources/compilation/one_dep/Move.exp b/third_party/move/tools/move-package/tests/test_sources/compilation/one_dep/Move.exp
index 6197567116d6a..8c1a733f9ae82 100644
--- a/third_party/move/tools/move-package/tests/test_sources/compilation/one_dep/Move.exp
+++ b/third_party/move/tools/move-package/tests/test_sources/compilation/one_dep/Move.exp
@@ -9,6 +9,7 @@ CompiledPackageInfo {
     build_flags: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
@@ -37,6 +38,7 @@ CompiledPackageInfo {
                 V1,
             ),
             language_version: None,
+            experiments: [],
         },
     },
 }
diff --git a/third_party/move/tools/move-package/tests/test_sources/compilation/one_dep/Move.v2_exp b/third_party/move/tools/move-package/tests/test_sources/compilation/one_dep/Move.v2_exp
index 27e2ded9923af..3d4a54324f9e0 100644
--- a/third_party/move/tools/move-package/tests/test_sources/compilation/one_dep/Move.v2_exp
+++ b/third_party/move/tools/move-package/tests/test_sources/compilation/one_dep/Move.v2_exp
@@ -9,6 +9,7 @@ CompiledPackageInfo {
     build_flags: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
@@ -37,6 +38,7 @@ CompiledPackageInfo {
                 V2_0,
             ),
             language_version: None,
+            experiments: [],
         },
     },
 }
diff --git a/third_party/move/tools/move-package/tests/test_sources/compilation/one_dep_assigned_address/Move.exp b/third_party/move/tools/move-package/tests/test_sources/compilation/one_dep_assigned_address/Move.exp
index b739c18644d23..735284605e681 100644
--- a/third_party/move/tools/move-package/tests/test_sources/compilation/one_dep_assigned_address/Move.exp
+++ b/third_party/move/tools/move-package/tests/test_sources/compilation/one_dep_assigned_address/Move.exp
@@ -9,6 +9,7 @@ CompiledPackageInfo {
     build_flags: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
@@ -37,6 +38,7 @@ CompiledPackageInfo {
                 V1,
             ),
             language_version: None,
+            experiments: [],
         },
     },
 }
diff --git a/third_party/move/tools/move-package/tests/test_sources/compilation/one_dep_assigned_address/Move.v2_exp b/third_party/move/tools/move-package/tests/test_sources/compilation/one_dep_assigned_address/Move.v2_exp
index aa27396b2824b..ff244b98291bf 100644
--- a/third_party/move/tools/move-package/tests/test_sources/compilation/one_dep_assigned_address/Move.v2_exp
+++ b/third_party/move/tools/move-package/tests/test_sources/compilation/one_dep_assigned_address/Move.v2_exp
@@ -9,6 +9,7 @@ CompiledPackageInfo {
     build_flags: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
@@ -37,6 +38,7 @@ CompiledPackageInfo {
                 V2_0,
             ),
             language_version: None,
+            experiments: [],
         },
     },
 }
diff --git a/third_party/move/tools/move-package/tests/test_sources/compilation/one_dep_renamed/Move.exp b/third_party/move/tools/move-package/tests/test_sources/compilation/one_dep_renamed/Move.exp
index 6197567116d6a..8c1a733f9ae82 100644
--- a/third_party/move/tools/move-package/tests/test_sources/compilation/one_dep_renamed/Move.exp
+++ b/third_party/move/tools/move-package/tests/test_sources/compilation/one_dep_renamed/Move.exp
@@ -9,6 +9,7 @@ CompiledPackageInfo {
     build_flags: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
@@ -37,6 +38,7 @@ CompiledPackageInfo {
                 V1,
             ),
             language_version: None,
+            experiments: [],
         },
     },
 }
diff --git a/third_party/move/tools/move-package/tests/test_sources/compilation/one_dep_renamed/Move.v2_exp b/third_party/move/tools/move-package/tests/test_sources/compilation/one_dep_renamed/Move.v2_exp
index 27e2ded9923af..3d4a54324f9e0 100644
--- a/third_party/move/tools/move-package/tests/test_sources/compilation/one_dep_renamed/Move.v2_exp
+++ b/third_party/move/tools/move-package/tests/test_sources/compilation/one_dep_renamed/Move.v2_exp
@@ -9,6 +9,7 @@ CompiledPackageInfo {
     build_flags: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
@@ -37,6 +38,7 @@ CompiledPackageInfo {
                 V2_0,
             ),
             language_version: None,
+            experiments: [],
         },
     },
 }
diff --git a/third_party/move/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/Move.exp b/third_party/move/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/Move.exp
index 6197567116d6a..8c1a733f9ae82 100644
--- a/third_party/move/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/Move.exp
+++ b/third_party/move/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/Move.exp
@@ -9,6 +9,7 @@ CompiledPackageInfo {
     build_flags: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
@@ -37,6 +38,7 @@ CompiledPackageInfo {
                 V1,
             ),
             language_version: None,
+            experiments: [],
         },
     },
 }
diff --git a/third_party/move/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/Move.v2_exp b/third_party/move/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/Move.v2_exp
index 27e2ded9923af..3d4a54324f9e0 100644
--- a/third_party/move/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/Move.v2_exp
+++ b/third_party/move/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/Move.v2_exp
@@ -9,6 +9,7 @@ CompiledPackageInfo {
     build_flags: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
@@ -37,6 +38,7 @@ CompiledPackageInfo {
                 V2_0,
             ),
             language_version: None,
+            experiments: [],
         },
     },
 }
diff --git a/third_party/move/tools/move-package/tests/test_sources/compilation/std-lib-conflicts/Move.v2_exp b/third_party/move/tools/move-package/tests/test_sources/compilation/std-lib-conflicts/Move.v2_exp
new file mode 100644
index 0000000000000..842d430239fea
--- /dev/null
+++ b/third_party/move/tools/move-package/tests/test_sources/compilation/std-lib-conflicts/Move.v2_exp
@@ -0,0 +1,53 @@
+CompiledPackageInfo {
+    package_name: "std-lib-conflicts",
+    address_alias_instantiation: {
+        "A": 0000000000000000000000000000000000000000000000000000000000000042,
+        "B": 0000000000000000000000000000000000000000000000000000000000000043,
+        "Extensions": 0000000000000000000000000000000000000000000000000000000000000001,
+        "aptos_framework": 0000000000000000000000000000000000000000000000000000000000000001,
+        "aptos_fungible_asset": 000000000000000000000000000000000000000000000000000000000000000a,
+        "aptos_std": 0000000000000000000000000000000000000000000000000000000000000001,
+        "aptos_token": 0000000000000000000000000000000000000000000000000000000000000003,
+        "core_resources": 000000000000000000000000000000000000000000000000000000000a550c18,
+        "std": 0000000000000000000000000000000000000000000000000000000000000001,
+        "vm": 0000000000000000000000000000000000000000000000000000000000000000,
+        "vm_reserved": 0000000000000000000000000000000000000000000000000000000000000000,
+    },
+    source_digest: Some(
+        "ELIDED_FOR_TEST",
+    ),
+    build_flags: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        override_std: None,
+        generate_docs: false,
+        generate_abis: false,
+        generate_move_model: false,
+        full_model_generation: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        additional_named_addresses: {},
+        architecture: None,
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        compiler_config: CompilerConfig {
+            bytecode_version: None,
+            known_attributes: {
+                "bytecode_instruction",
+                "deprecated",
+                "expected_failure",
+                "native_interface",
+                "test",
+                "test_only",
+                "verify_only",
+            },
+            skip_attribute_checks: false,
+            compiler_version: Some(
+                V2_0,
+            ),
+            language_version: None,
+        },
+    },
+}
diff --git a/third_party/move/tools/move-cli/tests/metatests/dummy/test_1/args.v2_exp b/third_party/move/tools/move-package/tests/test_sources/compilation/std-lib-override/Move.compile
similarity index 100%
rename from third_party/move/tools/move-cli/tests/metatests/dummy/test_1/args.v2_exp
rename to third_party/move/tools/move-package/tests/test_sources/compilation/std-lib-override/Move.compile
diff --git a/third_party/move/tools/move-package/tests/test_sources/compilation/std-lib-override/Move.exp b/third_party/move/tools/move-package/tests/test_sources/compilation/std-lib-override/Move.exp
new file mode 100644
index 0000000000000..162057ccc613f
--- /dev/null
+++ b/third_party/move/tools/move-package/tests/test_sources/compilation/std-lib-override/Move.exp
@@ -0,0 +1,55 @@
+CompiledPackageInfo {
+    package_name: "std-lib-conflicts",
+    address_alias_instantiation: {
+        "A": 0000000000000000000000000000000000000000000000000000000000000042,
+        "B": 0000000000000000000000000000000000000000000000000000000000000043,
+        "Extensions": 0000000000000000000000000000000000000000000000000000000000000001,
+        "aptos_framework": 0000000000000000000000000000000000000000000000000000000000000001,
+        "aptos_fungible_asset": 000000000000000000000000000000000000000000000000000000000000000a,
+        "aptos_std": 0000000000000000000000000000000000000000000000000000000000000001,
+        "aptos_token": 0000000000000000000000000000000000000000000000000000000000000003,
+        "core_resources": 000000000000000000000000000000000000000000000000000000000a550c18,
+        "std": 0000000000000000000000000000000000000000000000000000000000000001,
+        "vm": 0000000000000000000000000000000000000000000000000000000000000000,
+        "vm_reserved": 0000000000000000000000000000000000000000000000000000000000000000,
+    },
+    source_digest: Some(
+        "ELIDED_FOR_TEST",
+    ),
+    build_flags: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        override_std: Some(
+            Devnet,
+        ),
+        generate_docs: false,
+        generate_abis: false,
+        generate_move_model: false,
+        full_model_generation: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        additional_named_addresses: {},
+        architecture: None,
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        compiler_config: CompilerConfig {
+            bytecode_version: None,
+            known_attributes: {
+                "bytecode_instruction",
+                "deprecated",
+                "expected_failure",
+                "native_interface",
+                "test",
+                "test_only",
+                "verify_only",
+            },
+            skip_attribute_checks: false,
+            compiler_version: Some(
+                V1,
+            ),
+            language_version: None,
+        },
+    },
+}
diff --git a/third_party/move/tools/move-package/tests/test_sources/compilation/std-lib-override/Move.override b/third_party/move/tools/move-package/tests/test_sources/compilation/std-lib-override/Move.override
new file mode 100644
index 0000000000000..ff693d99966be
--- /dev/null
+++ b/third_party/move/tools/move-package/tests/test_sources/compilation/std-lib-override/Move.override
@@ -0,0 +1 @@
+devnet
\ No newline at end of file
diff --git a/third_party/move/tools/move-package/tests/test_sources/compilation/std-lib-override/Move.toml_deactivated b/third_party/move/tools/move-package/tests/test_sources/compilation/std-lib-override/Move.toml_deactivated
new file mode 100644
index 0000000000000..b6220b8e4c7b0
--- /dev/null
+++ b/third_party/move/tools/move-package/tests/test_sources/compilation/std-lib-override/Move.toml_deactivated
@@ -0,0 +1,19 @@
+[package]
+name = "std-lib-conflicts"
+version = "1.0.0"
+authors = []
+
+[addresses]
+A = "0x42"
+
+[dev-addresses]
+
+[dependencies.AptosFramework]
+git = "https://github.com/aptos-labs/aptos-core.git"
+rev = "devnet"
+subdir = "aptos-move/framework/aptos-framework"
+
+[dependencies.B]
+local = "./deps_only"
+
+[dev-dependencies]
diff --git a/third_party/move/tools/move-package/tests/test_sources/compilation/std-lib-override/deps_only/Move.toml b/third_party/move/tools/move-package/tests/test_sources/compilation/std-lib-override/deps_only/Move.toml
new file mode 100644
index 0000000000000..c056666dea12d
--- /dev/null
+++ b/third_party/move/tools/move-package/tests/test_sources/compilation/std-lib-override/deps_only/Move.toml
@@ -0,0 +1,16 @@
+[package]
+name = "B"
+version = "1.0.0"
+authors = []
+
+[addresses]
+B = "0x43"
+
+[dev-addresses]
+
+[dependencies.AptosFramework]
+git = "https://github.com/aptos-labs/aptos-core.git"
+rev = "mainnet"
+subdir = "aptos-move/framework/aptos-framework"
+
+[dev-dependencies]
diff --git a/third_party/move/tools/move-package/tests/test_sources/compilation/std-lib-override/deps_only/sources/B.move b/third_party/move/tools/move-package/tests/test_sources/compilation/std-lib-override/deps_only/sources/B.move
new file mode 100644
index 0000000000000..6167a02cb4ac2
--- /dev/null
+++ b/third_party/move/tools/move-package/tests/test_sources/compilation/std-lib-override/deps_only/sources/B.move
@@ -0,0 +1,3 @@
+module B::B {
+	public fun foo() {}
+}
diff --git a/third_party/move/tools/move-package/tests/test_sources/compilation/std-lib-override/sources/A.move b/third_party/move/tools/move-package/tests/test_sources/compilation/std-lib-override/sources/A.move
new file mode 100644
index 0000000000000..52551bda99f85
--- /dev/null
+++ b/third_party/move/tools/move-package/tests/test_sources/compilation/std-lib-override/sources/A.move
@@ -0,0 +1,6 @@
+module A::A {
+	use B::B;
+	public fun foo() {
+		B::foo();
+	}
+}
diff --git a/third_party/move/tools/move-package/tests/test_sources/compilation/test_symlinks/Move.exp b/third_party/move/tools/move-package/tests/test_sources/compilation/test_symlinks/Move.exp
index 7719a13c2b504..78e5b738ff140 100644
--- a/third_party/move/tools/move-package/tests/test_sources/compilation/test_symlinks/Move.exp
+++ b/third_party/move/tools/move-package/tests/test_sources/compilation/test_symlinks/Move.exp
@@ -9,6 +9,7 @@ CompiledPackageInfo {
     build_flags: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
@@ -37,6 +38,7 @@ CompiledPackageInfo {
                 V1,
             ),
             language_version: None,
+            experiments: [],
         },
     },
 }
diff --git a/third_party/move/tools/move-package/tests/test_sources/compilation/test_symlinks/Move.v2_exp b/third_party/move/tools/move-package/tests/test_sources/compilation/test_symlinks/Move.v2_exp
index 5d9dcfb4ccff0..1204f2f05c5b4 100644
--- a/third_party/move/tools/move-package/tests/test_sources/compilation/test_symlinks/Move.v2_exp
+++ b/third_party/move/tools/move-package/tests/test_sources/compilation/test_symlinks/Move.v2_exp
@@ -9,6 +9,7 @@ CompiledPackageInfo {
     build_flags: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
@@ -37,6 +38,7 @@ CompiledPackageInfo {
                 V2_0,
             ),
             language_version: None,
+            experiments: [],
         },
     },
 }
diff --git a/third_party/move/tools/move-package/tests/test_sources/parsing/invalid_identifier_package_name/Move.exp b/third_party/move/tools/move-package/tests/test_sources/parsing/invalid_identifier_package_name/Move.exp
index 7e24cce41b587..5528f6cf13b86 100644
--- a/third_party/move/tools/move-package/tests/test_sources/parsing/invalid_identifier_package_name/Move.exp
+++ b/third_party/move/tools/move-package/tests/test_sources/parsing/invalid_identifier_package_name/Move.exp
@@ -3,6 +3,7 @@ ResolutionGraph {
     build_options: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
@@ -31,6 +32,7 @@ ResolutionGraph {
                 V1,
             ),
             language_version: None,
+            experiments: [],
         },
     },
     root_package: SourceManifest {
diff --git a/third_party/move/tools/move-package/tests/test_sources/parsing/invalid_identifier_package_name/Move.v2_exp b/third_party/move/tools/move-package/tests/test_sources/parsing/invalid_identifier_package_name/Move.v2_exp
index 02350c3e42619..3b7d707dd6b41 100644
--- a/third_party/move/tools/move-package/tests/test_sources/parsing/invalid_identifier_package_name/Move.v2_exp
+++ b/third_party/move/tools/move-package/tests/test_sources/parsing/invalid_identifier_package_name/Move.v2_exp
@@ -3,6 +3,7 @@ ResolutionGraph {
     build_options: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
@@ -31,6 +32,7 @@ ResolutionGraph {
                 V2_0,
             ),
             language_version: None,
+            experiments: [],
         },
     },
     root_package: SourceManifest {
diff --git a/third_party/move/tools/move-package/tests/test_sources/parsing/minimal_manifest/Move.exp b/third_party/move/tools/move-package/tests/test_sources/parsing/minimal_manifest/Move.exp
index d9a9a2eb11344..2df5c76e3bc05 100644
--- a/third_party/move/tools/move-package/tests/test_sources/parsing/minimal_manifest/Move.exp
+++ b/third_party/move/tools/move-package/tests/test_sources/parsing/minimal_manifest/Move.exp
@@ -3,6 +3,7 @@ ResolutionGraph {
     build_options: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
@@ -31,6 +32,7 @@ ResolutionGraph {
                 V1,
             ),
             language_version: None,
+            experiments: [],
         },
     },
     root_package: SourceManifest {
diff --git a/third_party/move/tools/move-package/tests/test_sources/parsing/minimal_manifest/Move.v2_exp b/third_party/move/tools/move-package/tests/test_sources/parsing/minimal_manifest/Move.v2_exp
index 90b6acee1ce5b..0adbe79c7baf5 100644
--- a/third_party/move/tools/move-package/tests/test_sources/parsing/minimal_manifest/Move.v2_exp
+++ b/third_party/move/tools/move-package/tests/test_sources/parsing/minimal_manifest/Move.v2_exp
@@ -3,6 +3,7 @@ ResolutionGraph {
     build_options: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
@@ -31,6 +32,7 @@ ResolutionGraph {
                 V2_0,
             ),
             language_version: None,
+            experiments: [],
         },
     },
     root_package: SourceManifest {
diff --git a/third_party/move/tools/move-package/tests/test_sources/resolution/basic_no_deps/Move.exp b/third_party/move/tools/move-package/tests/test_sources/resolution/basic_no_deps/Move.exp
index c7a32db370932..b2ebf329b47fe 100644
--- a/third_party/move/tools/move-package/tests/test_sources/resolution/basic_no_deps/Move.exp
+++ b/third_party/move/tools/move-package/tests/test_sources/resolution/basic_no_deps/Move.exp
@@ -3,6 +3,7 @@ ResolutionGraph {
     build_options: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
@@ -31,6 +32,7 @@ ResolutionGraph {
                 V1,
             ),
             language_version: None,
+            experiments: [],
         },
     },
     root_package: SourceManifest {
diff --git a/third_party/move/tools/move-package/tests/test_sources/resolution/basic_no_deps/Move.v2_exp b/third_party/move/tools/move-package/tests/test_sources/resolution/basic_no_deps/Move.v2_exp
index 923aef2b025f4..ae019911d9c17 100644
--- a/third_party/move/tools/move-package/tests/test_sources/resolution/basic_no_deps/Move.v2_exp
+++ b/third_party/move/tools/move-package/tests/test_sources/resolution/basic_no_deps/Move.v2_exp
@@ -3,6 +3,7 @@ ResolutionGraph {
     build_options: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
@@ -31,6 +32,7 @@ ResolutionGraph {
                 V2_0,
             ),
             language_version: None,
+            experiments: [],
         },
     },
     root_package: SourceManifest {
diff --git a/third_party/move/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_assigned/Move.exp b/third_party/move/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_assigned/Move.exp
index f2173a630b7ae..f472d120921bf 100644
--- a/third_party/move/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_assigned/Move.exp
+++ b/third_party/move/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_assigned/Move.exp
@@ -3,6 +3,7 @@ ResolutionGraph {
     build_options: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
@@ -31,6 +32,7 @@ ResolutionGraph {
                 V1,
             ),
             language_version: None,
+            experiments: [],
         },
     },
     root_package: SourceManifest {
diff --git a/third_party/move/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_assigned/Move.v2_exp b/third_party/move/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_assigned/Move.v2_exp
index a18ee763f196b..0cd0d443b3279 100644
--- a/third_party/move/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_assigned/Move.v2_exp
+++ b/third_party/move/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_assigned/Move.v2_exp
@@ -3,6 +3,7 @@ ResolutionGraph {
     build_options: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
@@ -31,6 +32,7 @@ ResolutionGraph {
                 V2_0,
             ),
             language_version: None,
+            experiments: [],
         },
     },
     root_package: SourceManifest {
diff --git a/third_party/move/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_not_assigned_with_dev_assignment/Move.exp b/third_party/move/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_not_assigned_with_dev_assignment/Move.exp
index 8323aebec23be..60112f5f450be 100644
--- a/third_party/move/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_not_assigned_with_dev_assignment/Move.exp
+++ b/third_party/move/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_not_assigned_with_dev_assignment/Move.exp
@@ -3,6 +3,7 @@ ResolutionGraph {
     build_options: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
@@ -31,6 +32,7 @@ ResolutionGraph {
                 V1,
             ),
             language_version: None,
+            experiments: [],
         },
     },
     root_package: SourceManifest {
diff --git a/third_party/move/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_not_assigned_with_dev_assignment/Move.v2_exp b/third_party/move/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_not_assigned_with_dev_assignment/Move.v2_exp
index 2bd608ac8bb28..754bbcc1e381a 100644
--- a/third_party/move/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_not_assigned_with_dev_assignment/Move.v2_exp
+++ b/third_party/move/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_not_assigned_with_dev_assignment/Move.v2_exp
@@ -3,6 +3,7 @@ ResolutionGraph {
     build_options: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
@@ -31,6 +32,7 @@ ResolutionGraph {
                 V2_0,
             ),
             language_version: None,
+            experiments: [],
         },
     },
     root_package: SourceManifest {
diff --git a/third_party/move/tools/move-package/tests/test_sources/resolution/dep_good_digest/Move.exp b/third_party/move/tools/move-package/tests/test_sources/resolution/dep_good_digest/Move.exp
index 14d3339915f56..9cc24f4611183 100644
--- a/third_party/move/tools/move-package/tests/test_sources/resolution/dep_good_digest/Move.exp
+++ b/third_party/move/tools/move-package/tests/test_sources/resolution/dep_good_digest/Move.exp
@@ -3,6 +3,7 @@ ResolutionGraph {
     build_options: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
@@ -31,6 +32,7 @@ ResolutionGraph {
                 V1,
             ),
             language_version: None,
+            experiments: [],
         },
     },
     root_package: SourceManifest {
diff --git a/third_party/move/tools/move-package/tests/test_sources/resolution/dep_good_digest/Move.v2_exp b/third_party/move/tools/move-package/tests/test_sources/resolution/dep_good_digest/Move.v2_exp
index e06ca0547ab30..4212374697db4 100644
--- a/third_party/move/tools/move-package/tests/test_sources/resolution/dep_good_digest/Move.v2_exp
+++ b/third_party/move/tools/move-package/tests/test_sources/resolution/dep_good_digest/Move.v2_exp
@@ -3,6 +3,7 @@ ResolutionGraph {
     build_options: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
@@ -31,6 +32,7 @@ ResolutionGraph {
                 V2_0,
             ),
             language_version: None,
+            experiments: [],
         },
     },
     root_package: SourceManifest {
diff --git a/third_party/move/tools/move-package/tests/test_sources/resolution/diamond_problem_backflow_resolution/Move.exp b/third_party/move/tools/move-package/tests/test_sources/resolution/diamond_problem_backflow_resolution/Move.exp
index daeee0be6a2b4..6cc8da3e6158d 100644
--- a/third_party/move/tools/move-package/tests/test_sources/resolution/diamond_problem_backflow_resolution/Move.exp
+++ b/third_party/move/tools/move-package/tests/test_sources/resolution/diamond_problem_backflow_resolution/Move.exp
@@ -3,6 +3,7 @@ ResolutionGraph {
     build_options: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
@@ -31,6 +32,7 @@ ResolutionGraph {
                 V1,
             ),
             language_version: None,
+            experiments: [],
         },
     },
     root_package: SourceManifest {
diff --git a/third_party/move/tools/move-package/tests/test_sources/resolution/diamond_problem_backflow_resolution/Move.v2_exp b/third_party/move/tools/move-package/tests/test_sources/resolution/diamond_problem_backflow_resolution/Move.v2_exp
index ecdc89bf8e457..c4e7272f540a3 100644
--- a/third_party/move/tools/move-package/tests/test_sources/resolution/diamond_problem_backflow_resolution/Move.v2_exp
+++ b/third_party/move/tools/move-package/tests/test_sources/resolution/diamond_problem_backflow_resolution/Move.v2_exp
@@ -3,6 +3,7 @@ ResolutionGraph {
     build_options: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
@@ -31,6 +32,7 @@ ResolutionGraph {
                 V2_0,
             ),
             language_version: None,
+            experiments: [],
         },
     },
     root_package: SourceManifest {
diff --git a/third_party/move/tools/move-package/tests/test_sources/resolution/diamond_problem_no_conflict/Move.exp b/third_party/move/tools/move-package/tests/test_sources/resolution/diamond_problem_no_conflict/Move.exp
index 7a12b7249fe8e..80f47e5558a7b 100644
--- a/third_party/move/tools/move-package/tests/test_sources/resolution/diamond_problem_no_conflict/Move.exp
+++ b/third_party/move/tools/move-package/tests/test_sources/resolution/diamond_problem_no_conflict/Move.exp
@@ -3,6 +3,7 @@ ResolutionGraph {
     build_options: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
@@ -31,6 +32,7 @@ ResolutionGraph {
                 V1,
             ),
             language_version: None,
+            experiments: [],
         },
     },
     root_package: SourceManifest {
diff --git a/third_party/move/tools/move-package/tests/test_sources/resolution/diamond_problem_no_conflict/Move.v2_exp b/third_party/move/tools/move-package/tests/test_sources/resolution/diamond_problem_no_conflict/Move.v2_exp
index e21847fbd867b..d3d893fbc8001 100644
--- a/third_party/move/tools/move-package/tests/test_sources/resolution/diamond_problem_no_conflict/Move.v2_exp
+++ b/third_party/move/tools/move-package/tests/test_sources/resolution/diamond_problem_no_conflict/Move.v2_exp
@@ -3,6 +3,7 @@ ResolutionGraph {
     build_options: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
@@ -31,6 +32,7 @@ ResolutionGraph {
                 V2_0,
             ),
             language_version: None,
+            experiments: [],
         },
     },
     root_package: SourceManifest {
diff --git a/third_party/move/tools/move-package/tests/test_sources/resolution/multiple_deps_rename/Move.exp b/third_party/move/tools/move-package/tests/test_sources/resolution/multiple_deps_rename/Move.exp
index 930b16d46aef9..2879157e0dcf3 100644
--- a/third_party/move/tools/move-package/tests/test_sources/resolution/multiple_deps_rename/Move.exp
+++ b/third_party/move/tools/move-package/tests/test_sources/resolution/multiple_deps_rename/Move.exp
@@ -3,6 +3,7 @@ ResolutionGraph {
     build_options: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
@@ -31,6 +32,7 @@ ResolutionGraph {
                 V1,
             ),
             language_version: None,
+            experiments: [],
         },
     },
     root_package: SourceManifest {
diff --git a/third_party/move/tools/move-package/tests/test_sources/resolution/multiple_deps_rename/Move.v2_exp b/third_party/move/tools/move-package/tests/test_sources/resolution/multiple_deps_rename/Move.v2_exp
index 7008fb15c56ba..91d9a2331f5d0 100644
--- a/third_party/move/tools/move-package/tests/test_sources/resolution/multiple_deps_rename/Move.v2_exp
+++ b/third_party/move/tools/move-package/tests/test_sources/resolution/multiple_deps_rename/Move.v2_exp
@@ -3,6 +3,7 @@ ResolutionGraph {
     build_options: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
@@ -31,6 +32,7 @@ ResolutionGraph {
                 V2_0,
             ),
             language_version: None,
+            experiments: [],
         },
     },
     root_package: SourceManifest {
diff --git a/third_party/move/tools/move-package/tests/test_sources/resolution/one_dep/Move.exp b/third_party/move/tools/move-package/tests/test_sources/resolution/one_dep/Move.exp
index d27f5a7a508ae..d1460cf0b525a 100644
--- a/third_party/move/tools/move-package/tests/test_sources/resolution/one_dep/Move.exp
+++ b/third_party/move/tools/move-package/tests/test_sources/resolution/one_dep/Move.exp
@@ -3,6 +3,7 @@ ResolutionGraph {
     build_options: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
@@ -31,6 +32,7 @@ ResolutionGraph {
                 V1,
             ),
             language_version: None,
+            experiments: [],
         },
     },
     root_package: SourceManifest {
diff --git a/third_party/move/tools/move-package/tests/test_sources/resolution/one_dep/Move.v2_exp b/third_party/move/tools/move-package/tests/test_sources/resolution/one_dep/Move.v2_exp
index a4c32b07747f0..3adcf67e7b513 100644
--- a/third_party/move/tools/move-package/tests/test_sources/resolution/one_dep/Move.v2_exp
+++ b/third_party/move/tools/move-package/tests/test_sources/resolution/one_dep/Move.v2_exp
@@ -3,6 +3,7 @@ ResolutionGraph {
     build_options: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
@@ -31,6 +32,7 @@ ResolutionGraph {
                 V2_0,
             ),
             language_version: None,
+            experiments: [],
         },
     },
     root_package: SourceManifest {
diff --git a/third_party/move/tools/move-package/tests/test_sources/resolution/one_dep_assigned_address/Move.exp b/third_party/move/tools/move-package/tests/test_sources/resolution/one_dep_assigned_address/Move.exp
index 3d7ded2cd6d62..32261c6978b51 100644
--- a/third_party/move/tools/move-package/tests/test_sources/resolution/one_dep_assigned_address/Move.exp
+++ b/third_party/move/tools/move-package/tests/test_sources/resolution/one_dep_assigned_address/Move.exp
@@ -3,6 +3,7 @@ ResolutionGraph {
     build_options: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
@@ -31,6 +32,7 @@ ResolutionGraph {
                 V1,
             ),
             language_version: None,
+            experiments: [],
         },
     },
     root_package: SourceManifest {
diff --git a/third_party/move/tools/move-package/tests/test_sources/resolution/one_dep_assigned_address/Move.v2_exp b/third_party/move/tools/move-package/tests/test_sources/resolution/one_dep_assigned_address/Move.v2_exp
index 21a2c21581e8d..27602ba509765 100644
--- a/third_party/move/tools/move-package/tests/test_sources/resolution/one_dep_assigned_address/Move.v2_exp
+++ b/third_party/move/tools/move-package/tests/test_sources/resolution/one_dep_assigned_address/Move.v2_exp
@@ -3,6 +3,7 @@ ResolutionGraph {
     build_options: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
@@ -31,6 +32,7 @@ ResolutionGraph {
                 V2_0,
             ),
             language_version: None,
+            experiments: [],
         },
     },
     root_package: SourceManifest {
diff --git a/third_party/move/tools/move-package/tests/test_sources/resolution/one_dep_multiple_of_same_name/Move.exp b/third_party/move/tools/move-package/tests/test_sources/resolution/one_dep_multiple_of_same_name/Move.exp
index 75a513d49cea0..4de9d7b9554e2 100644
--- a/third_party/move/tools/move-package/tests/test_sources/resolution/one_dep_multiple_of_same_name/Move.exp
+++ b/third_party/move/tools/move-package/tests/test_sources/resolution/one_dep_multiple_of_same_name/Move.exp
@@ -3,6 +3,7 @@ ResolutionGraph {
     build_options: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
@@ -31,6 +32,7 @@ ResolutionGraph {
                 V1,
             ),
             language_version: None,
+            experiments: [],
         },
     },
     root_package: SourceManifest {
diff --git a/third_party/move/tools/move-package/tests/test_sources/resolution/one_dep_multiple_of_same_name/Move.v2_exp b/third_party/move/tools/move-package/tests/test_sources/resolution/one_dep_multiple_of_same_name/Move.v2_exp
index 0f5e470e6914f..16bba3a0a17de 100644
--- a/third_party/move/tools/move-package/tests/test_sources/resolution/one_dep_multiple_of_same_name/Move.v2_exp
+++ b/third_party/move/tools/move-package/tests/test_sources/resolution/one_dep_multiple_of_same_name/Move.v2_exp
@@ -3,6 +3,7 @@ ResolutionGraph {
     build_options: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
@@ -31,6 +32,7 @@ ResolutionGraph {
                 V2_0,
             ),
             language_version: None,
+            experiments: [],
         },
     },
     root_package: SourceManifest {
diff --git a/third_party/move/tools/move-package/tests/test_sources/resolution/one_dep_reassigned_address/Move.exp b/third_party/move/tools/move-package/tests/test_sources/resolution/one_dep_reassigned_address/Move.exp
index a35b649a97837..75c563d6c9d99 100644
--- a/third_party/move/tools/move-package/tests/test_sources/resolution/one_dep_reassigned_address/Move.exp
+++ b/third_party/move/tools/move-package/tests/test_sources/resolution/one_dep_reassigned_address/Move.exp
@@ -3,6 +3,7 @@ ResolutionGraph {
     build_options: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
@@ -31,6 +32,7 @@ ResolutionGraph {
                 V1,
             ),
             language_version: None,
+            experiments: [],
         },
     },
     root_package: SourceManifest {
diff --git a/third_party/move/tools/move-package/tests/test_sources/resolution/one_dep_reassigned_address/Move.v2_exp b/third_party/move/tools/move-package/tests/test_sources/resolution/one_dep_reassigned_address/Move.v2_exp
index d9e5dfc3fc2dc..e4db7941c99cb 100644
--- a/third_party/move/tools/move-package/tests/test_sources/resolution/one_dep_reassigned_address/Move.v2_exp
+++ b/third_party/move/tools/move-package/tests/test_sources/resolution/one_dep_reassigned_address/Move.v2_exp
@@ -3,6 +3,7 @@ ResolutionGraph {
     build_options: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
@@ -31,6 +32,7 @@ ResolutionGraph {
                 V2_0,
             ),
             language_version: None,
+            experiments: [],
         },
     },
     root_package: SourceManifest {
diff --git a/third_party/move/tools/move-package/tests/test_sources/resolution/one_dep_unification_across_local_renamings/Move.exp b/third_party/move/tools/move-package/tests/test_sources/resolution/one_dep_unification_across_local_renamings/Move.exp
index 29f0a821f714c..3bcc48a03b3c9 100644
--- a/third_party/move/tools/move-package/tests/test_sources/resolution/one_dep_unification_across_local_renamings/Move.exp
+++ b/third_party/move/tools/move-package/tests/test_sources/resolution/one_dep_unification_across_local_renamings/Move.exp
@@ -3,6 +3,7 @@ ResolutionGraph {
     build_options: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
@@ -31,6 +32,7 @@ ResolutionGraph {
                 V1,
             ),
             language_version: None,
+            experiments: [],
         },
     },
     root_package: SourceManifest {
diff --git a/third_party/move/tools/move-package/tests/test_sources/resolution/one_dep_unification_across_local_renamings/Move.v2_exp b/third_party/move/tools/move-package/tests/test_sources/resolution/one_dep_unification_across_local_renamings/Move.v2_exp
index a793634bf9363..f9b382921f681 100644
--- a/third_party/move/tools/move-package/tests/test_sources/resolution/one_dep_unification_across_local_renamings/Move.v2_exp
+++ b/third_party/move/tools/move-package/tests/test_sources/resolution/one_dep_unification_across_local_renamings/Move.v2_exp
@@ -3,6 +3,7 @@ ResolutionGraph {
     build_options: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
@@ -31,6 +32,7 @@ ResolutionGraph {
                 V2_0,
             ),
             language_version: None,
+            experiments: [],
         },
     },
     root_package: SourceManifest {
diff --git a/third_party/move/tools/move-resource-viewer/src/fat_type.rs b/third_party/move/tools/move-resource-viewer/src/fat_type.rs
index a373c67515524..d5c832ce94aa9 100644
--- a/third_party/move/tools/move-resource-viewer/src/fat_type.rs
+++ b/third_party/move/tools/move-resource-viewer/src/fat_type.rs
@@ -50,7 +50,13 @@ pub(crate) struct FatStructType {
     pub name: Identifier,
     pub abilities: WrappedAbilitySet,
     pub ty_args: Vec<FatType>,
-    pub layout: Vec<FatType>,
+    pub layout: FatStructLayout,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub(crate) enum FatStructLayout {
+    Singleton(Vec<FatType>),
+    Variants(Vec<Vec<FatType>>),
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -88,11 +94,25 @@ impl FatStructType {
                 .iter()
                 .map(|ty| ty.clone_with_limit(limit))
                 .collect::<PartialVMResult<_>>()?,
-            layout: self
-                .layout
-                .iter()
-                .map(|ty| ty.clone_with_limit(limit))
-                .collect::<PartialVMResult<_>>()?,
+            layout: match &self.layout {
+                FatStructLayout::Singleton(fields) => FatStructLayout::Singleton(
+                    fields
+                        .iter()
+                        .map(|ty| ty.clone_with_limit(limit))
+                        .collect::<PartialVMResult<_>>()?,
+                ),
+                FatStructLayout::Variants(variants) => FatStructLayout::Variants(
+                    variants
+                        .iter()
+                        .map(|fields| {
+                            fields
+                                .iter()
+                                .map(|ty| ty.clone_with_limit(limit))
+                                .collect::<PartialVMResult<Vec<_>>>()
+                        })
+                        .collect::<PartialVMResult<_>>()?,
+                ),
+            },
         })
     }
 
@@ -114,11 +134,25 @@ impl FatStructType {
                 .iter()
                 .map(|ty| ty.subst(ty_args, limiter))
                 .collect::<PartialVMResult<_>>()?,
-            layout: self
-                .layout
-                .iter()
-                .map(|ty| ty.subst(ty_args, limiter))
-                .collect::<PartialVMResult<_>>()?,
+            layout: match &self.layout {
+                FatStructLayout::Singleton(fields) => FatStructLayout::Singleton(
+                    fields
+                        .iter()
+                        .map(|ty| ty.subst(ty_args, limiter))
+                        .collect::<PartialVMResult<_>>()?,
+                ),
+                FatStructLayout::Variants(variants) => FatStructLayout::Variants(
+                    variants
+                        .iter()
+                        .map(|fields| {
+                            fields
+                                .iter()
+                                .map(|ty| ty.subst(ty_args, limiter))
+                                .collect::<PartialVMResult<_>>()
+                        })
+                        .collect::<PartialVMResult<_>>()?,
+                ),
+            },
         })
     }
 
@@ -259,7 +293,7 @@ impl From<&StructTag> for FatStructType {
                 .iter()
                 .map(|inner| inner.into())
                 .collect(),
-            layout: vec![], // We can't get field types from struct tag
+            layout: FatStructLayout::Singleton(vec![]), // We can't get field types from struct tag
         }
     }
 }
@@ -268,15 +302,26 @@ impl TryInto<MoveStructLayout> for &FatStructType {
     type Error = PartialVMError;
 
     fn try_into(self) -> Result<MoveStructLayout, Self::Error> {
-        Ok(MoveStructLayout::new(
-            self.layout
-                .iter()
-                .map(|ty| ty.try_into())
-                .collect::<PartialVMResult<Vec<_>>>()?,
-        ))
+        Ok(match &self.layout {
+            FatStructLayout::Singleton(fields) => MoveStructLayout::new(into_types(fields.iter())?),
+            FatStructLayout::Variants(variants) => MoveStructLayout::new_variants(
+                variants
+                    .iter()
+                    .map(|fields| into_types(fields.iter()))
+                    .collect::<PartialVMResult<_>>()?,
+            ),
+        })
     }
 }
 
+fn into_types<'a>(
+    types: impl Iterator<Item = &'a FatType>,
+) -> PartialVMResult<Vec<MoveTypeLayout>> {
+    types
+        .map(|ty| ty.try_into())
+        .collect::<PartialVMResult<Vec<_>>>()
+}
+
 impl TryInto<MoveTypeLayout> for &FatType {
     type Error = PartialVMError;
 
@@ -291,12 +336,7 @@ impl TryInto<MoveTypeLayout> for &FatType {
             FatType::U256 => MoveTypeLayout::U256,
             FatType::Bool => MoveTypeLayout::Bool,
             FatType::Vector(v) => MoveTypeLayout::Vector(Box::new(v.as_ref().try_into()?)),
-            FatType::Struct(s) => MoveTypeLayout::Struct(MoveStructLayout::new(
-                s.layout
-                    .iter()
-                    .map(|ty| ty.try_into())
-                    .collect::<PartialVMResult<Vec<_>>>()?,
-            )),
+            FatType::Struct(s) => MoveTypeLayout::Struct(s.as_ref().try_into()?),
             FatType::Signer => MoveTypeLayout::Signer,
             FatType::Reference(_) | FatType::MutableReference(_) | FatType::TyParam(_) => {
                 return Err(PartialVMError::new(StatusCode::ABORT_TYPE_MISMATCH_ERROR))
diff --git a/third_party/move/tools/move-resource-viewer/src/lib.rs b/third_party/move/tools/move-resource-viewer/src/lib.rs
index 3c8983fae9311..6691bed783f3f 100644
--- a/third_party/move/tools/move-resource-viewer/src/lib.rs
+++ b/third_party/move/tools/move-resource-viewer/src/lib.rs
@@ -2,15 +2,16 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::fat_type::{FatStructType, FatType, WrappedAbilitySet};
+use crate::fat_type::{FatStructLayout, FatStructType, FatType, WrappedAbilitySet};
 use anyhow::{anyhow, bail};
 pub use limit::Limiter;
 use move_binary_format::{
-    access::ModuleAccess,
+    access::{ModuleAccess, ScriptAccess},
+    binary_views::BinaryIndexedView,
     errors::{Location, PartialVMError},
     file_format::{
-        Ability, AbilitySet, SignatureToken, StructDefinitionIndex, StructFieldInformation,
-        StructHandleIndex,
+        Ability, AbilitySet, CompiledScript, FieldDefinition, SignatureToken,
+        StructDefinitionIndex, StructFieldInformation, StructHandleIndex,
     },
     views::FunctionHandleView,
     CompiledModule,
@@ -20,6 +21,7 @@ use move_core_types::{
     account_address::AccountAddress,
     identifier::{IdentStr, Identifier},
     language_storage::{ModuleId, StructTag, TypeTag},
+    transaction_argument::{convert_txn_args, TransactionArgument},
     u256,
     value::{MoveStruct, MoveTypeLayout, MoveValue},
     vm_status::VMStatus,
@@ -38,6 +40,7 @@ mod limit;
 pub struct AnnotatedMoveStruct {
     pub abilities: AbilitySet,
     pub ty_tag: StructTag,
+    pub variant_info: Option<(u16, Identifier)>,
     pub value: Vec<(Identifier, AnnotatedMoveValue)>,
 }
 
@@ -115,6 +118,27 @@ impl<V: CompiledModuleView> MoveValueAnnotator<V> {
         }
     }
 
+    pub fn view_script_arguments(
+        &self,
+        script_bytes: &[u8],
+        args: &[TransactionArgument],
+        ty_args: &[TypeTag],
+    ) -> anyhow::Result<Vec<AnnotatedMoveValue>> {
+        let mut limit = Limiter::default();
+        let compiled_script = CompiledScript::deserialize(script_bytes)
+            .map_err(|err| anyhow!("Failed to deserialzie script: {:?}", err))?;
+        let param_tys = compiled_script
+            .signature_at(compiled_script.parameters)
+            .0
+            .iter()
+            .map(|tok| {
+                self.resolve_signature(BinaryIndexedView::Script(&compiled_script), tok, &mut limit)
+            })
+            .collect::<anyhow::Result<Vec<_>>>()?;
+        let args_bytes = convert_txn_args(args);
+        self.view_arguments_impl(&param_tys, ty_args, &args_bytes, &mut limit)
+    }
+
     pub fn view_function_arguments(
         &self,
         module: &ModuleId,
@@ -123,9 +147,19 @@ impl<V: CompiledModuleView> MoveValueAnnotator<V> {
         args: &[Vec<u8>],
     ) -> anyhow::Result<Vec<AnnotatedMoveValue>> {
         let mut limit = Limiter::default();
-        let types: Vec<FatType> = self
-            .resolve_function_arguments(module, function)?
-            .into_iter()
+        let param_tys = self.resolve_function_arguments(module, function, &mut limit)?;
+        self.view_arguments_impl(&param_tys, ty_args, args, &mut limit)
+    }
+
+    fn view_arguments_impl(
+        &self,
+        param_tys: &[FatType],
+        ty_args: &[TypeTag],
+        args: &[Vec<u8>],
+        limit: &mut Limiter,
+    ) -> anyhow::Result<Vec<AnnotatedMoveValue>> {
+        let types: Vec<&FatType> = param_tys
+            .iter()
             .filter(|t| match t {
                 FatType::Signer => false,
                 FatType::Reference(inner) => !matches!(&**inner, FatType::Signer),
@@ -157,11 +191,9 @@ impl<V: CompiledModuleView> MoveValueAnnotator<V> {
             .iter()
             .enumerate()
             .map(|(i, ty)| {
-                ty.subst(&ty_args, &mut limit)
+                ty.subst(&ty_args, limit)
                     .map_err(anyhow::Error::from)
-                    .and_then(|fat_type| {
-                        self.view_value_by_fat_type(&fat_type, &args[i], &mut limit)
-                    })
+                    .and_then(|fat_type| self.view_value_by_fat_type(&fat_type, &args[i], limit))
             })
             .collect::<anyhow::Result<Vec<AnnotatedMoveValue>>>()
     }
@@ -170,8 +202,8 @@ impl<V: CompiledModuleView> MoveValueAnnotator<V> {
         &self,
         module: &ModuleId,
         function: &IdentStr,
+        limit: &mut Limiter,
     ) -> anyhow::Result<Vec<FatType>> {
-        let mut limit = Limiter::default();
         let m = self.view_existing_module(module)?;
         let m = m.borrow();
         for def in m.function_defs.iter() {
@@ -182,7 +214,9 @@ impl<V: CompiledModuleView> MoveValueAnnotator<V> {
                     .parameters()
                     .0
                     .iter()
-                    .map(|signature| self.resolve_signature(m, signature, &mut limit))
+                    .map(|signature| {
+                        self.resolve_signature(BinaryIndexedView::Module(m), signature, limit)
+                    })
                     .collect::<anyhow::Result<_>>();
             }
         }
@@ -213,16 +247,24 @@ impl<V: CompiledModuleView> MoveValueAnnotator<V> {
         &self,
         tag: &StructTag,
         blob: &[u8],
-    ) -> anyhow::Result<Vec<(Identifier, MoveValue)>> {
+    ) -> anyhow::Result<(Option<Identifier>, Vec<(Identifier, MoveValue)>)> {
         let ty = self.resolve_struct(tag)?;
         let struct_def = (&ty).try_into().map_err(into_vm_status)?;
         Ok(match MoveStruct::simple_deserialize(blob, &struct_def)? {
-            MoveStruct::Runtime(runtime) => self
-                .get_field_names(&ty)?
-                .into_iter()
-                .zip(runtime)
-                .collect(),
-            MoveStruct::WithFields(fields) | MoveStruct::WithTypes { fields, .. } => fields,
+            MoveStruct::Runtime(values) => {
+                let (tag, field_names) = self.get_field_information(&ty, None)?;
+                debug_assert_eq!(tag, None);
+                (None, field_names.into_iter().zip(values).collect())
+            },
+            MoveStruct::RuntimeVariant(tag, values) => {
+                let (variant_info, field_names) = self.get_field_information(&ty, Some(tag))?;
+                (
+                    variant_info.map(|(_, name)| name),
+                    field_names.into_iter().zip(values).collect(),
+                )
+            },
+            MoveStruct::WithFields(fields) | MoveStruct::WithTypes { fields, .. } => (None, fields),
+            MoveStruct::WithVariantFields(name, _, fields) => (Some(name), fields),
         })
     }
 
@@ -271,25 +313,49 @@ impl<V: CompiledModuleView> MoveValueAnnotator<V> {
         limit.charge(module_name.as_bytes().len())?;
         limit.charge(name.as_bytes().len())?;
 
+        let make_fields =
+            |fields: &[FieldDefinition], limit: &mut Limiter| -> anyhow::Result<Vec<FatType>> {
+                fields
+                    .iter()
+                    .map(|field_def| {
+                        self.resolve_signature(
+                            BinaryIndexedView::Module(module),
+                            &field_def.signature.0,
+                            limit,
+                        )
+                    })
+                    .collect::<anyhow::Result<_>>()
+            };
+
         match &struct_def.field_information {
             StructFieldInformation::Native => Err(anyhow!("Unexpected Native Struct")),
-            StructFieldInformation::Declared(defs) => Ok(FatStructType {
+            StructFieldInformation::Declared(fields) => Ok(FatStructType {
                 address,
                 module: module_name,
                 name,
                 abilities: WrappedAbilitySet(abilities),
                 ty_args,
-                layout: defs
-                    .iter()
-                    .map(|field_def| self.resolve_signature(module, &field_def.signature.0, limit))
-                    .collect::<anyhow::Result<_>>()?,
+                layout: FatStructLayout::Singleton(make_fields(fields, limit)?),
+            }),
+            StructFieldInformation::DeclaredVariants(variants) => Ok(FatStructType {
+                address,
+                module: module_name,
+                name,
+                abilities: WrappedAbilitySet(abilities),
+                ty_args,
+                layout: FatStructLayout::Variants(
+                    variants
+                        .iter()
+                        .map(|variant| make_fields(&variant.fields, limit))
+                        .collect::<anyhow::Result<_>>()?,
+                ),
             }),
         }
     }
 
     fn resolve_signature(
         &self,
-        module: &CompiledModule,
+        module: BinaryIndexedView,
         sig: &SignatureToken,
         limit: &mut Limiter,
     ) -> anyhow::Result<FatType> {
@@ -332,7 +398,7 @@ impl<V: CompiledModuleView> MoveValueAnnotator<V> {
 
     fn resolve_struct_handle(
         &self,
-        module: &CompiledModule,
+        module: BinaryIndexedView,
         idx: StructHandleIndex,
         limit: &mut Limiter,
     ) -> anyhow::Result<FatStructType> {
@@ -397,34 +463,81 @@ impl<V: CompiledModuleView> MoveValueAnnotator<V> {
         let struct_tag = ty
             .struct_tag(limit)
             .map_err(|e| e.finish(Location::Undefined).into_vm_status())?;
-        let field_names = self.get_field_names(ty)?;
-        for names in field_names.iter() {
-            limit.charge(names.as_bytes().len())?;
+        let (variant_tag, field_values) = move_struct.optional_variant_and_fields();
+        let (variant_info, field_names) = self.get_field_information(ty, variant_tag)?;
+        if let Some((_, name)) = &variant_info {
+            limit.charge(name.as_bytes().len())?;
         }
-        let mut annotated_fields = vec![];
-        for (ty, v) in ty.layout.iter().zip(move_struct.fields().iter()) {
-            annotated_fields.push(self.annotate_value(v, ty, limit)?);
+        for name in field_names.iter() {
+            limit.charge(name.as_bytes().len())?;
+        }
+
+        let annotate_values = |values: &[MoveValue], tys: &[FatType], limit: &mut Limiter| {
+            values
+                .iter()
+                .zip(tys)
+                .zip(field_names.iter())
+                .map(|((v, ty), n)| self.annotate_value(v, ty, limit).map(|v| (n.clone(), v)))
+                .collect::<anyhow::Result<Vec<_>>>()
+        };
+
+        match &ty.layout {
+            FatStructLayout::Singleton(field_tys) => Ok(AnnotatedMoveStruct {
+                abilities: ty.abilities.0,
+                ty_tag: struct_tag,
+                variant_info: None,
+                value: annotate_values(field_values, field_tys, limit)?,
+            }),
+            FatStructLayout::Variants(variants) => match variant_tag {
+                Some(tag) if (tag as usize) < variants.len() => {
+                    let field_tys = &variants[tag as usize];
+                    Ok(AnnotatedMoveStruct {
+                        abilities: ty.abilities.0,
+                        ty_tag: struct_tag,
+                        variant_info,
+                        value: annotate_values(field_values, field_tys, limit)?,
+                    })
+                },
+                _ => bail!("type and value mismatch: malformed variant tag"),
+            },
         }
-        Ok(AnnotatedMoveStruct {
-            abilities: ty.abilities.0,
-            ty_tag: struct_tag,
-            value: field_names.into_iter().zip(annotated_fields).collect(),
-        })
     }
 
-    fn get_field_names(&self, ty: &FatStructType) -> anyhow::Result<Vec<Identifier>> {
+    fn get_field_information(
+        &self,
+        ty: &FatStructType,
+        variant: Option<u16>,
+    ) -> anyhow::Result<(Option<(u16, Identifier)>, Vec<Identifier>)> {
         let module_id = ModuleId::new(ty.address, ty.module.clone());
         let module = self.view_existing_module(&module_id)?;
         let module = module.borrow();
         let struct_def_idx = find_struct_def_in_module(module, ty.name.as_ident_str())?;
         let struct_def = module.struct_def_at(struct_def_idx);
 
-        match &struct_def.field_information {
-            StructFieldInformation::Native => Err(anyhow!("Unexpected Native Struct")),
-            StructFieldInformation::Declared(defs) => Ok(defs
-                .iter()
-                .map(|field_def| module.identifier_at(field_def.name).to_owned())
-                .collect()),
+        let ident_at = |name| module.identifier_at(name).to_owned();
+
+        match (variant, &struct_def.field_information) {
+            (_, StructFieldInformation::Native) => Err(anyhow!("Unexpected Native Struct")),
+            (None, StructFieldInformation::Declared(defs)) => Ok((
+                None,
+                defs.iter()
+                    .map(|field_def| ident_at(field_def.name))
+                    .collect(),
+            )),
+            (Some(tag), StructFieldInformation::DeclaredVariants(variants))
+                if (tag as usize) < variants.len() =>
+            {
+                let variant = &variants[tag as usize];
+                Ok((
+                    Some((tag, ident_at(variant.name))),
+                    variant
+                        .fields
+                        .iter()
+                        .map(|field_def| ident_at(field_def.name).to_owned())
+                        .collect(),
+                ))
+            },
+            _ => bail!("inconsistent layout information"),
         }
     }
 
@@ -546,7 +659,11 @@ fn pretty_print_struct(
     indent: u64,
 ) -> std::fmt::Result {
     pretty_print_ability_modifiers(f, value.abilities)?;
-    writeln!(f, "{} {{", value.ty_tag)?;
+    write!(f, "{}", value.ty_tag)?;
+    if let Some((_, name)) = &value.variant_info {
+        write!(f, "::{}", name)?;
+    }
+    writeln!(f, " {{")?;
     for (field_name, v) in value.value.iter() {
         write_indent(f, indent + 4)?;
         write!(f, "{}: ", field_name)?;
@@ -571,7 +688,13 @@ fn pretty_print_ability_modifiers(f: &mut Formatter, abilities: AbilitySet) -> s
 
 impl serde::Serialize for AnnotatedMoveStruct {
     fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
-        let mut s = serializer.serialize_map(Some(self.value.len()))?;
+        let mut s;
+        if let Some((_, name)) = &self.variant_info {
+            s = serializer.serialize_map(Some(self.value.len() + 1))?;
+            s.serialize_entry("$variant", name)?;
+        } else {
+            s = serializer.serialize_map(Some(self.value.len()))?;
+        }
         for (f, v) in &self.value {
             s.serialize_entry(f, v)?
         }
diff --git a/third_party/move/tools/move-unit-test/src/test_runner.rs b/third_party/move/tools/move-unit-test/src/test_runner.rs
index f13586f8ff43b..256cdc04f4677 100644
--- a/third_party/move/tools/move-unit-test/src/test_runner.rs
+++ b/third_party/move/tools/move-unit-test/src/test_runner.rs
@@ -22,7 +22,6 @@ use move_core_types::{
 };
 use move_resource_viewer::MoveValueAnnotator;
 use move_vm_runtime::{
-    config::VMConfig,
     module_traversal::{TraversalContext, TraversalStorage},
     move_vm::MoveVM,
     native_extensions::NativeContextExtensions,
@@ -267,10 +266,7 @@ impl SharedTestingConfig {
         VMResult<Vec<Vec<u8>>>,
         TestRunInfo,
     ) {
-        let mut config = VMConfig::default();
-        config.paranoid_type_checks = true;
-
-        let move_vm = MoveVM::new_with_config(self.native_function_table.clone(), config).unwrap();
+        let move_vm = MoveVM::new(self.native_function_table.clone());
         let extensions = extensions::new_extensions();
         let mut session =
             move_vm.new_session_with_extensions(&self.starting_storage_state, extensions);
diff --git a/third_party/move/tools/move-unit-test/tests/move_unit_test_testsuite.rs b/third_party/move/tools/move-unit-test/tests/move_unit_test_testsuite.rs
index b59ab9706c943..49c67cd687724 100644
--- a/third_party/move/tools/move-unit-test/tests/move_unit_test_testsuite.rs
+++ b/third_party/move/tools/move-unit-test/tests/move_unit_test_testsuite.rs
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use move_command_line_common::testing::{
-    add_update_baseline_fix, format_diff, read_env_update_baseline, EXP_EXT,
+    add_update_baseline_fix, format_diff, get_compiler_exp_extension, read_env_update_baseline,
 };
 use move_unit_test::{self, UnitTestingConfig};
 use regex::RegexBuilder;
@@ -37,8 +37,9 @@ fn run_test_with_modifiers(
 ) -> anyhow::Result<Vec<((Vec<u8>, bool), PathBuf)>> {
     let mut results = Vec::new();
 
+    let exp_ext = get_compiler_exp_extension();
     for modifier in TEST_MODIFIER_STRS.iter() {
-        let modified_exp_path = path.with_extension(format!("{}.{}", modifier, EXP_EXT));
+        let modified_exp_path = path.with_extension(format!("{}.{}", modifier, exp_ext));
         if let (Some(test_config), true) = (
             modify(unit_test_config.clone(), modifier),
             modified_exp_path.exists(),
@@ -75,7 +76,7 @@ fn run_test_with_modifiers(
 
     results.push((
         unit_test_config.run_and_report_unit_tests(test_plan.unwrap(), None, None, None, buffer)?,
-        path.with_extension(EXP_EXT),
+        path.with_extension(exp_ext),
     ));
 
     Ok(results)
diff --git a/third_party/move/tools/move-unit-test/tests/test_sources/address_args.v2_exp b/third_party/move/tools/move-unit-test/tests/test_sources/address_args.v2_exp
new file mode 100644
index 0000000000000..5fe7141325f78
--- /dev/null
+++ b/third_party/move/tools/move-unit-test/tests/test_sources/address_args.v2_exp
@@ -0,0 +1,11 @@
+Running Move unit tests
+[ PASS    ] 0x1::M::correct_address
+[ PASS    ] 0x1::M::correct_addresses
+[ PASS    ] 0x1::M::wrong_address
+0x1::M::correct_address
+Output: Ok(Changes { accounts: {} })
+0x1::M::correct_addresses
+Output: Ok(Changes { accounts: {} })
+0x1::M::wrong_address
+Output: Ok(Changes { accounts: {} })
+Test result: OK. Total tests: 3; passed: 3; failed: 0
diff --git a/third_party/move/tools/move-unit-test/tests/test_sources/arithmetic_errors.v2_exp b/third_party/move/tools/move-unit-test/tests/test_sources/arithmetic_errors.v2_exp
new file mode 100644
index 0000000000000..ec171140a7d59
--- /dev/null
+++ b/third_party/move/tools/move-unit-test/tests/test_sources/arithmetic_errors.v2_exp
@@ -0,0 +1,14 @@
+Running Move unit tests
+[ PASS    ] 0x1::M::u64_add_overflow
+[ PASS    ] 0x1::M::u64_div_by_zero
+[ PASS    ] 0x1::M::u64_mul_overflow
+[ PASS    ] 0x1::M::u64_sub_underflow
+0x1::M::u64_add_overflow
+Output: Ok(Changes { accounts: {} })
+0x1::M::u64_div_by_zero
+Output: Ok(Changes { accounts: {} })
+0x1::M::u64_mul_overflow
+Output: Ok(Changes { accounts: {} })
+0x1::M::u64_sub_underflow
+Output: Ok(Changes { accounts: {} })
+Test result: OK. Total tests: 4; passed: 4; failed: 0
diff --git a/third_party/move/tools/move-unit-test/tests/test_sources/construct_data.v2_exp b/third_party/move/tools/move-unit-test/tests/test_sources/construct_data.v2_exp
new file mode 100644
index 0000000000000..75022e15b3292
--- /dev/null
+++ b/third_party/move/tools/move-unit-test/tests/test_sources/construct_data.v2_exp
@@ -0,0 +1,8 @@
+Running Move unit tests
+[ PASS    ] 0x1::M::make_sure_not_other_number
+[ PASS    ] 0x1::M::make_sure_number_matches
+0x1::M::make_sure_not_other_number
+Output: Ok(Changes { accounts: {} })
+0x1::M::make_sure_number_matches
+Output: Ok(Changes { accounts: {} })
+Test result: OK. Total tests: 2; passed: 2; failed: 0
diff --git a/third_party/move/tools/move-unit-test/tests/test_sources/cross_module_aborts.v2_exp b/third_party/move/tools/move-unit-test/tests/test_sources/cross_module_aborts.v2_exp
new file mode 100644
index 0000000000000..095f52acf16f0
--- /dev/null
+++ b/third_party/move/tools/move-unit-test/tests/test_sources/cross_module_aborts.v2_exp
@@ -0,0 +1,28 @@
+Running Move unit tests
+[ FAIL    ] 0x1::B::failing_test
+[ PASS    ] 0x1::M::dummy_test
+0x1::B::failing_test
+Output: Ok(Changes { accounts: {} })
+0x1::M::dummy_test
+Output: Ok(Changes { accounts: {} })
+
+Test failures:
+
+Failures in 0x1::B:
+
+┌── failing_test ──────
+│ error[E11001]: test failure
+│   ┌─ cross_module_aborts.move:5:9
+│   │
+│ 4 │     public fun this_aborts() {
+│   │                ----------- In this function in 0x1::M
+│ 5 │         abort 0
+│   │         ^^^^^^^ Test was not expected to error, but it aborted with code 0 originating in the module 0000000000000000000000000000000000000000000000000000000000000001::M rooted here
+│ 
+│ 
+│ stack trace
+│ 	B::failing_test(tests/test_sources/cross_module_aborts.move:19)
+│ 
+└──────────────────
+
+Test result: FAILED. Total tests: 2; passed: 1; failed: 1
diff --git a/third_party/move/tools/move-unit-test/tests/test_sources/do_nothing.v2_exp b/third_party/move/tools/move-unit-test/tests/test_sources/do_nothing.v2_exp
new file mode 100644
index 0000000000000..56fe4a9c2efa2
--- /dev/null
+++ b/third_party/move/tools/move-unit-test/tests/test_sources/do_nothing.v2_exp
@@ -0,0 +1,5 @@
+Running Move unit tests
+[ PASS    ] 0x1::M::do_nothing
+0x1::M::do_nothing
+Output: Ok(Changes { accounts: {} })
+Test result: OK. Total tests: 1; passed: 1; failed: 0
diff --git a/third_party/move/tools/move-unit-test/tests/test_sources/expected_abort_no_abort.v2_exp b/third_party/move/tools/move-unit-test/tests/test_sources/expected_abort_no_abort.v2_exp
new file mode 100644
index 0000000000000..26f5e8d74ef7e
--- /dev/null
+++ b/third_party/move/tools/move-unit-test/tests/test_sources/expected_abort_no_abort.v2_exp
@@ -0,0 +1,22 @@
+Running Move unit tests
+[ FAIL    ] 0x1::M::fail
+[ FAIL    ] 0x1::M::fail_with_code
+0x1::M::fail
+Output: Ok(Changes { accounts: {} })
+0x1::M::fail_with_code
+Output: Ok(Changes { accounts: {} })
+
+Test failures:
+
+Failures in 0x1::M:
+
+┌── fail ──────
+│ Test did not error as expected
+└──────────────────
+
+
+┌── fail_with_code ──────
+│ Test did not error as expected
+└──────────────────
+
+Test result: FAILED. Total tests: 2; passed: 0; failed: 2
diff --git a/third_party/move/tools/move-unit-test/tests/test_sources/missing_data.v2_exp b/third_party/move/tools/move-unit-test/tests/test_sources/missing_data.v2_exp
new file mode 100644
index 0000000000000..2b61f4e0d5a72
--- /dev/null
+++ b/third_party/move/tools/move-unit-test/tests/test_sources/missing_data.v2_exp
@@ -0,0 +1,47 @@
+Running Move unit tests
+[ FAIL    ] 0x1::MissingData::missing_data
+[ PASS    ] 0x1::MissingData::missing_data_captured
+[ PASS    ] 0x1::MissingData::missing_data_exact
+[ FAIL    ] 0x1::MissingData::missing_data_from_other_function
+0x1::MissingData::missing_data
+Output: Ok(Changes { accounts: {} })
+0x1::MissingData::missing_data_captured
+Output: Ok(Changes { accounts: {} })
+0x1::MissingData::missing_data_exact
+Output: Ok(Changes { accounts: {} })
+0x1::MissingData::missing_data_from_other_function
+Output: Ok(Changes { accounts: {} })
+
+Test failures:
+
+Failures in 0x1::MissingData:
+
+┌── missing_data ──────
+│ error[E11001]: test failure
+│   ┌─ missing_data.move:6:9
+│   │
+│ 5 │     fun missing_data() acquires Missing {
+│   │         ------------ In this function in 0x1::MissingData
+│ 6 │         borrow_global<Missing>(@0x0);
+│   │         ^^^^^^^^^^^^^ Test was not expected to error, but it gave a MISSING_DATA (code 4008) error with error message: "Failed to borrow global resource from 0000000000000000000000000000000000000000000000000000000000000000". Error originating in the module 0000000000000000000000000000000000000000000000000000000000000001::MissingData rooted here
+│ 
+│ 
+└──────────────────
+
+
+┌── missing_data_from_other_function ──────
+│ error[E11001]: test failure
+│   ┌─ missing_data.move:6:9
+│   │
+│ 5 │     fun missing_data() acquires Missing {
+│   │         ------------ In this function in 0x1::MissingData
+│ 6 │         borrow_global<Missing>(@0x0);
+│   │         ^^^^^^^^^^^^^ Test was not expected to error, but it gave a MISSING_DATA (code 4008) error with error message: "Failed to borrow global resource from 0000000000000000000000000000000000000000000000000000000000000000". Error originating in the module 0000000000000000000000000000000000000000000000000000000000000001::MissingData rooted here
+│ 
+│ 
+│ stack trace
+│ 	MissingData::missing_data_from_other_function(tests/test_sources/missing_data.move:12)
+│ 
+└──────────────────
+
+Test result: FAILED. Total tests: 4; passed: 2; failed: 2
diff --git a/third_party/move/tools/move-unit-test/tests/test_sources/native_abort.v2_exp b/third_party/move/tools/move-unit-test/tests/test_sources/native_abort.v2_exp
new file mode 100644
index 0000000000000..760e3a52a966c
--- /dev/null
+++ b/third_party/move/tools/move-unit-test/tests/test_sources/native_abort.v2_exp
@@ -0,0 +1,41 @@
+Running Move unit tests
+[ PASS    ] 0x1::A::native_abort_good_right_code
+[ FAIL    ] 0x1::A::native_abort_good_wrong_code
+[ FAIL    ] 0x1::A::native_abort_unexpected_abort
+0x1::A::native_abort_good_right_code
+Output: Ok(Changes { accounts: {} })
+0x1::A::native_abort_good_wrong_code
+Output: Ok(Changes { accounts: {} })
+0x1::A::native_abort_unexpected_abort
+Output: Ok(Changes { accounts: {} })
+
+Test failures:
+
+Failures in 0x1::A:
+
+┌── native_abort_good_wrong_code ──────
+│ error[E11001]: test failure
+│    ┌─ native_abort.move:12:9
+│    │
+│ 11 │     fun native_abort_good_wrong_code() {
+│    │         ---------------------------- In this function in 0x1::A
+│ 12 │         vector::borrow(&vector::empty<u64>(), 1);
+│    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Test did not error as expected. Expected test to give a vector operation error with sub-status 0 originating in the module 0000000000000000000000000000000000000000000000000000000000000001::A but instead it gave a vector operation error with sub-status 1 originating in the module 0000000000000000000000000000000000000000000000000000000000000001::A rooted here
+│ 
+│ 
+└──────────────────
+
+
+┌── native_abort_unexpected_abort ──────
+│ error[E11001]: test failure
+│   ┌─ native_abort.move:6:9
+│   │
+│ 5 │     fun native_abort_unexpected_abort() {
+│   │         ----------------------------- In this function in 0x1::A
+│ 6 │         vector::borrow(&vector::empty<u64>(), 1);
+│   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Test was not expected to error, but it gave a vector operation error with sub-status 1 originating in the module 0000000000000000000000000000000000000000000000000000000000000001::A rooted here
+│ 
+│ 
+└──────────────────
+
+Test result: FAILED. Total tests: 3; passed: 1; failed: 2
diff --git a/third_party/move/tools/move-unit-test/tests/test_sources/native_signer_creation.v2_exp b/third_party/move/tools/move-unit-test/tests/test_sources/native_signer_creation.v2_exp
new file mode 100644
index 0000000000000..9b98bb942e7bf
--- /dev/null
+++ b/third_party/move/tools/move-unit-test/tests/test_sources/native_signer_creation.v2_exp
@@ -0,0 +1,29 @@
+Running Move unit tests
+[ PASS    ] 0x1::M::test_determinisim
+[ FAIL    ] 0x1::M::test_doesnt_exist
+[ PASS    ] 0x1::M::test_exists
+0x1::M::test_determinisim
+Output: Ok(Changes { accounts: {} })
+0x1::M::test_doesnt_exist
+Output: Ok(Changes { accounts: {0000000000000000000000000000000000000000000000000000000000000000: AccountChanges { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_args: [] }: New(b"\0")} }, 0100000000000000000000000000000000000000000000000000000000000000: AccountChanges { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_args: [] }: New(b"\0")} }, 0200000000000000000000000000000000000000000000000000000000000000: AccountChanges { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_args: [] }: New(b"\0")} }, 0300000000000000000000000000000000000000000000000000000000000000: AccountChanges { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_args: [] }: New(b"\0")} }, 0400000000000000000000000000000000000000000000000000000000000000: AccountChanges { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_args: [] }: New(b"\0")} }, 0500000000000000000000000000000000000000000000000000000000000000: AccountChanges { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_args: [] }: New(b"\0")} }, 0600000000000000000000000000000000000000000000000000000000000000: AccountChanges { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_args: [] }: New(b"\0")} }, 0700000000000000000000000000000000000000000000000000000000000000: AccountChanges { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_args: [] }: New(b"\0")} }, 0800000000000000000000000000000000000000000000000000000000000000: AccountChanges { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_args: [] }: New(b"\0")} }, 0900000000000000000000000000000000000000000000000000000000000000: AccountChanges { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_args: [] }: New(b"\0")} }} })
+0x1::M::test_exists
+Output: Ok(Changes { accounts: {0000000000000000000000000000000000000000000000000000000000000000: AccountChanges { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_args: [] }: New(b"\0")} }, 0100000000000000000000000000000000000000000000000000000000000000: AccountChanges { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_args: [] }: New(b"\0")} }, 0200000000000000000000000000000000000000000000000000000000000000: AccountChanges { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_args: [] }: New(b"\0")} }, 0300000000000000000000000000000000000000000000000000000000000000: AccountChanges { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_args: [] }: New(b"\0")} }, 0400000000000000000000000000000000000000000000000000000000000000: AccountChanges { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_args: [] }: New(b"\0")} }, 0500000000000000000000000000000000000000000000000000000000000000: AccountChanges { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_args: [] }: New(b"\0")} }, 0600000000000000000000000000000000000000000000000000000000000000: AccountChanges { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_args: [] }: New(b"\0")} }, 0700000000000000000000000000000000000000000000000000000000000000: AccountChanges { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_args: [] }: New(b"\0")} }, 0800000000000000000000000000000000000000000000000000000000000000: AccountChanges { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_args: [] }: New(b"\0")} }, 0900000000000000000000000000000000000000000000000000000000000000: AccountChanges { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_args: [] }: New(b"\0")} }} })
+
+Test failures:
+
+Failures in 0x1::M:
+
+┌── test_doesnt_exist ──────
+│ error[E11001]: test failure
+│    ┌─ native_signer_creation.move:47:9
+│    │
+│ 36 │     fun test_doesnt_exist() {
+│    │         ----------------- In this function in 0x1::M
+│    ·
+│ 47 │         abort 0
+│    │         ^^^^^^^ Test was not expected to error, but it aborted with code 0 originating in the module 0000000000000000000000000000000000000000000000000000000000000001::M rooted here
+│ 
+│ 
+└──────────────────
+
+Test result: FAILED. Total tests: 3; passed: 2; failed: 1
diff --git a/third_party/move/tools/move-unit-test/tests/test_sources/non_exsistent_native.v2_exp b/third_party/move/tools/move-unit-test/tests/test_sources/non_exsistent_native.v2_exp
new file mode 100644
index 0000000000000..0cc3807c63d18
--- /dev/null
+++ b/third_party/move/tools/move-unit-test/tests/test_sources/non_exsistent_native.v2_exp
@@ -0,0 +1,24 @@
+Running Move unit tests
+[ FAIL    ] 0x1::M::non_existent_native
+0x1::M::non_existent_native
+Output: Ok(Changes { accounts: {} })
+
+Test failures:
+
+Failures in 0x1::M:
+
+┌── non_existent_native ──────
+│ error[E11001]: test failure
+│   ┌─ non_exsistent_native.move:3:16
+│   │
+│ 3 │     native fun foo();
+│   │                ^^^
+│   │                │
+│   │                INTERNAL TEST ERROR: Unexpected Verification Error
+│ Test was not expected to error, but it gave a MISSING_DEPENDENCY (code 1021) error with error message: "Missing Native Function `foo`". Error originating in the module 0000000000000000000000000000000000000000000000000000000000000001::M rooted here
+│   │                In this function in 0x1::M
+│ 
+│ 
+└──────────────────
+
+Test result: FAILED. Total tests: 1; passed: 0; failed: 1
diff --git a/third_party/move/tools/move-unit-test/tests/test_sources/other_expected_failures.v2_exp b/third_party/move/tools/move-unit-test/tests/test_sources/other_expected_failures.v2_exp
new file mode 100644
index 0000000000000..52a89320ebd7a
--- /dev/null
+++ b/third_party/move/tools/move-unit-test/tests/test_sources/other_expected_failures.v2_exp
@@ -0,0 +1,20 @@
+Running Move unit tests
+[ PASS    ] 0x42::m::t0
+[ PASS    ] 0x42::m::t1
+[ PASS    ] 0x42::m::t2
+[ PASS    ] 0x42::m::t3
+[ PASS    ] 0x42::m::t4
+[ PASS    ] 0x42::m::t5
+0x42::m::t0
+Output: Ok(Changes { accounts: {} })
+0x42::m::t1
+Output: Ok(Changes { accounts: {} })
+0x42::m::t2
+Output: Ok(Changes { accounts: {} })
+0x42::m::t3
+Output: Ok(Changes { accounts: {} })
+0x42::m::t4
+Output: Ok(Changes { accounts: {} })
+0x42::m::t5
+Output: Ok(Changes { accounts: {0000000000000000000000000000000000000000000000000000000000000001: AccountChanges { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000042, module: Identifier("m"), name: Identifier("R"), type_args: [] }: New(b"\0")} }} })
+Test result: OK. Total tests: 6; passed: 6; failed: 0
diff --git a/third_party/move/tools/move-unit-test/tests/test_sources/out_of_gas.v2_exp b/third_party/move/tools/move-unit-test/tests/test_sources/out_of_gas.v2_exp
new file mode 100644
index 0000000000000..ee93f3921bb8c
--- /dev/null
+++ b/third_party/move/tools/move-unit-test/tests/test_sources/out_of_gas.v2_exp
@@ -0,0 +1,46 @@
+Running Move unit tests
+[ FAIL    ] 0x42::m::t0
+[ FAIL    ] 0x42::m::t1
+[ FAIL    ] 0x42::m::t2
+0x42::m::t0
+Output: Ok(Changes { accounts: {} })
+0x42::m::t1
+Output: Ok(Changes { accounts: {} })
+0x42::m::t2
+Output: Ok(Changes { accounts: {} })
+
+Test failures:
+
+Failures in 0x42::m:
+
+┌── t0 ──────
+│ Test did not error as expected
+└──────────────────
+
+
+┌── t1 ──────
+│ error[E11001]: test failure
+│    ┌─ out_of_gas.move:10:10
+│    │
+│  9 │ fun t1() {
+│    │     -- In this function in 0x42::m
+│ 10 │     loop {}
+│    │          ^^ Test did not error as expected. Expected test to give an arithmetic error originating in the module 0000000000000000000000000000000000000000000000000000000000000042::m but instead it ran out of gas in the module 0000000000000000000000000000000000000000000000000000000000000042::m rooted here
+│ 
+│ 
+└──────────────────
+
+
+┌── t2 ──────
+│ error[E11001]: test failure
+│    ┌─ out_of_gas.move:16:7
+│    │
+│ 15 │ fun t2() {
+│    │     -- In this function in 0x42::m
+│ 16 │     0 - 1;
+│    │       ^ Test did not error as expected. Expected test to run out of gas in the module 0000000000000000000000000000000000000000000000000000000000000042::m but instead it gave an arithmetic error with error message: "Subtraction overflow". Error originating in the module 0000000000000000000000000000000000000000000000000000000000000042::m rooted here
+│ 
+│ 
+└──────────────────
+
+Test result: FAILED. Total tests: 3; passed: 0; failed: 3
diff --git a/third_party/move/tools/move-unit-test/tests/test_sources/proposal_test.v2_exp b/third_party/move/tools/move-unit-test/tests/test_sources/proposal_test.v2_exp
new file mode 100644
index 0000000000000..2bfad174e6b53
--- /dev/null
+++ b/third_party/move/tools/move-unit-test/tests/test_sources/proposal_test.v2_exp
@@ -0,0 +1,38 @@
+Running Move unit tests
+[ PASS    ] 0x1::Module::other_module_aborts
+[ PASS    ] 0x1::Module::tests_a
+[ PASS    ] 0x1::Module::tests_aborts
+[ PASS    ] 0x1::Module::tests_b
+[ PASS    ] 0x1::Module::tests_c
+[ FAIL    ] 0x1::Module::tests_d
+0x1::Module::other_module_aborts
+Output: Ok(Changes { accounts: {} })
+0x1::Module::tests_a
+Output: Ok(Changes { accounts: {} })
+0x1::Module::tests_aborts
+Output: Ok(Changes { accounts: {} })
+0x1::Module::tests_b
+Output: Ok(Changes { accounts: {0000000000000000000000000000000000000000000000000000000000000001: AccountChanges { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("Module"), name: Identifier("A"), type_args: [] }: New(b"\x05\0\0\0\0\0\0\0")} }, 0000000000000000000000000000000000000000000000000000000000000002: AccountChanges { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("Module"), name: Identifier("A"), type_args: [] }: New(b"\x05\0\0\0\0\0\0\0")} }} })
+0x1::Module::tests_c
+Output: Ok(Changes { accounts: {0000000000000000000000000000000000000000000000000000000000000001: AccountChanges { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("Module"), name: Identifier("A"), type_args: [] }: New(b"\x05\0\0\0\0\0\0\0")} }, 0000000000000000000000000000000000000000000000000000000000000002: AccountChanges { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("Module"), name: Identifier("A"), type_args: [] }: New(b"\x06\0\0\0\0\0\0\0")} }} })
+0x1::Module::tests_d
+Output: Ok(Changes { accounts: {0000000000000000000000000000000000000000000000000000000000000001: AccountChanges { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("Module"), name: Identifier("B"), type_args: [U64] }: New(b"\x05\0\0\0\0\0\0\0")} }, 0000000000000000000000000000000000000000000000000000000000000002: AccountChanges { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("Module"), name: Identifier("B"), type_args: [Bool] }: New(b"\x06\0\0\0\0\0\0\0"), StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("Module"), name: Identifier("B"), type_args: [U64] }: New(b"\x05\0\0\0\0\0\0\0"), StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("Module"), name: Identifier("B"), type_args: [Struct(StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("Module"), name: Identifier("C"), type_args: [U64] })] }: New(b"\x05\0\0\0\0\0\0\0")} }} })
+
+Test failures:
+
+Failures in 0x1::Module:
+
+┌── tests_d ──────
+│ error[E11001]: test failure
+│     ┌─ proposal_test.move:102:9
+│     │
+│  95 │     fun tests_d(a1: signer, a2: signer)
+│     │         ------- In this function in 0x1::Module
+│     ·
+│ 102 │         assert!(d<u64>(@0x2, 6), 3);
+│     │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^ Test was not expected to error, but it aborted with code 3 originating in the module 0000000000000000000000000000000000000000000000000000000000000001::Module rooted here
+│ 
+│ 
+└──────────────────
+
+Test result: FAILED. Total tests: 6; passed: 5; failed: 1
diff --git a/third_party/move/tools/move-unit-test/tests/test_sources/signer_args.v2_exp b/third_party/move/tools/move-unit-test/tests/test_sources/signer_args.v2_exp
new file mode 100644
index 0000000000000..0617b7c4791ec
--- /dev/null
+++ b/third_party/move/tools/move-unit-test/tests/test_sources/signer_args.v2_exp
@@ -0,0 +1,42 @@
+Running Move unit tests
+[ FAIL    ] 0x1::M::multi_signer_fail
+[ PASS    ] 0x1::M::multi_signer_pass
+[ PASS    ] 0x1::M::multi_signer_pass_expected_failure
+[ FAIL    ] 0x1::M::single_signer_fail
+[ PASS    ] 0x1::M::single_signer_pass
+[ PASS    ] 0x1::M::test_correct_signer_arg_addrs
+0x1::M::multi_signer_fail
+Output: Ok(Changes { accounts: {} })
+0x1::M::multi_signer_pass
+Output: Ok(Changes { accounts: {} })
+0x1::M::multi_signer_pass_expected_failure
+Output: Ok(Changes { accounts: {} })
+0x1::M::single_signer_fail
+Output: Ok(Changes { accounts: {} })
+0x1::M::single_signer_pass
+Output: Ok(Changes { accounts: {} })
+0x1::M::test_correct_signer_arg_addrs
+Output: Ok(Changes { accounts: {} })
+
+Test failures:
+
+Failures in 0x1::M:
+
+┌── multi_signer_fail ──────
+│ Test did not error as expected
+└──────────────────
+
+
+┌── single_signer_fail ──────
+│ error[E11001]: test failure
+│   ┌─ signer_args.move:9:9
+│   │
+│ 8 │     fun single_signer_fail(_a: signer) {
+│   │         ------------------ In this function in 0x1::M
+│ 9 │         abort 0
+│   │         ^^^^^^^ Test was not expected to error, but it aborted with code 0 originating in the module 0000000000000000000000000000000000000000000000000000000000000001::M rooted here
+│ 
+│ 
+└──────────────────
+
+Test result: FAILED. Total tests: 6; passed: 4; failed: 2
diff --git a/third_party/move/tools/move-unit-test/tests/test_sources/storage_on_error_empty_and_non_empty.v2_exp b/third_party/move/tools/move-unit-test/tests/test_sources/storage_on_error_empty_and_non_empty.v2_exp
new file mode 100644
index 0000000000000..810826f242b8d
--- /dev/null
+++ b/third_party/move/tools/move-unit-test/tests/test_sources/storage_on_error_empty_and_non_empty.v2_exp
@@ -0,0 +1,48 @@
+Running Move unit tests
+[ PASS    ] 0x1::A::a
+[ PASS    ] 0x1::A::b
+[ PASS    ] 0x1::A::c
+[ FAIL    ] 0x1::A::x
+[ FAIL    ] 0x1::A::y
+0x1::A::a
+Output: Ok(Changes { accounts: {} })
+0x1::A::b
+Output: Ok(Changes { accounts: {0000000000000000000000000000000000000000000000000000000000000001: AccountChanges { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("A"), name: Identifier("A"), type_args: [] }: New(b"\0")} }} })
+0x1::A::c
+Output: Ok(Changes { accounts: {0000000000000000000000000000000000000000000000000000000000000001: AccountChanges { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("A"), name: Identifier("A"), type_args: [] }: New(b"\0")} }} })
+0x1::A::x
+Output: Ok(Changes { accounts: {} })
+0x1::A::y
+Output: Ok(Changes { accounts: {0000000000000000000000000000000000000000000000000000000000000001: AccountChanges { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("A"), name: Identifier("A"), type_args: [] }: New(b"\0")} }} })
+
+Test failures:
+
+Failures in 0x1::A:
+
+┌── x ──────
+│ error[E11001]: test failure
+│   ┌─ storage_on_error_empty_and_non_empty.move:6:9
+│   │
+│ 5 │     fun x() {
+│   │         - In this function in 0x1::A
+│ 6 │         abort 0
+│   │         ^^^^^^^ Test was not expected to error, but it aborted with code 0 originating in the module 0000000000000000000000000000000000000000000000000000000000000001::A rooted here
+│ 
+│ 
+└──────────────────
+
+
+┌── y ──────
+│ error[E11001]: test failure
+│    ┌─ storage_on_error_empty_and_non_empty.move:12:9
+│    │
+│ 10 │     fun y(a: signer) {
+│    │         - In this function in 0x1::A
+│ 11 │         move_to(&a, A {});
+│ 12 │         abort 0
+│    │         ^^^^^^^ Test was not expected to error, but it aborted with code 0 originating in the module 0000000000000000000000000000000000000000000000000000000000000001::A rooted here
+│ 
+│ 
+└──────────────────
+
+Test result: FAILED. Total tests: 5; passed: 3; failed: 2
diff --git a/third_party/move/tools/move-unit-test/tests/test_sources/storage_test.v2_exp b/third_party/move/tools/move-unit-test/tests/test_sources/storage_test.v2_exp
new file mode 100644
index 0000000000000..79b0678e0221b
--- /dev/null
+++ b/third_party/move/tools/move-unit-test/tests/test_sources/storage_test.v2_exp
@@ -0,0 +1,8 @@
+Running Move unit tests
+[ PASS    ] 0x1::B::tests_a
+[ PASS    ] 0x1::B::tests_b
+0x1::B::tests_a
+Output: Ok(Changes { accounts: {0000000000000000000000000000000000000000000000000000000000000001: AccountChanges { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("B"), name: Identifier("A"), type_args: [U64] }: New(b"\x05\0\0\0\0\0\0\0")} }, 0000000000000000000000000000000000000000000000000000000000000002: AccountChanges { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("B"), name: Identifier("A"), type_args: [Bool] }: New(b"\0")} }} })
+0x1::B::tests_b
+Output: Ok(Changes { accounts: {0000000000000000000000000000000000000000000000000000000000000001: AccountChanges { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("B"), name: Identifier("A"), type_args: [U64] }: New(b"\x05\0\0\0\0\0\0\0")} }, 0000000000000000000000000000000000000000000000000000000000000002: AccountChanges { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("B"), name: Identifier("A"), type_args: [U64] }: New(b"\x06\0\0\0\0\0\0\0")} }} })
+Test result: OK. Total tests: 2; passed: 2; failed: 0
diff --git a/third_party/move/tools/move-unit-test/tests/test_sources/timeout.v2_exp b/third_party/move/tools/move-unit-test/tests/test_sources/timeout.v2_exp
new file mode 100644
index 0000000000000..b3ad463eb726f
--- /dev/null
+++ b/third_party/move/tools/move-unit-test/tests/test_sources/timeout.v2_exp
@@ -0,0 +1,39 @@
+Running Move unit tests
+[ PASS    ] 0x1::M::no_timeout
+[ FAIL    ] 0x1::M::no_timeout_fail
+[ PASS    ] 0x1::M::no_timeout_while_loop
+[ TIMEOUT ] 0x1::M::timeout_fail
+[ PASS    ] 0x1::M::timeout_fail_with_expected_failure
+0x1::M::no_timeout
+Output: Ok(Changes { accounts: {} })
+0x1::M::no_timeout_fail
+Output: Ok(Changes { accounts: {} })
+0x1::M::no_timeout_while_loop
+Output: Ok(Changes { accounts: {} })
+0x1::M::timeout_fail
+Output: Ok(Changes { accounts: {} })
+0x1::M::timeout_fail_with_expected_failure
+Output: Ok(Changes { accounts: {} })
+
+Test failures:
+
+Failures in 0x1::M:
+
+┌── no_timeout_fail ──────
+│ error[E11001]: test failure
+│    ┌─ timeout.move:18:29
+│    │
+│ 18 │     fun no_timeout_fail() { abort 0 }
+│    │         ---------------     ^^^^^^^ Test was not expected to error, but it aborted with code 0 originating in the module 0000000000000000000000000000000000000000000000000000000000000001::M rooted here
+│    │         │                    
+│    │         In this function in 0x1::M
+│ 
+│ 
+└──────────────────
+
+
+┌── timeout_fail ──────
+│ Test timed out
+└──────────────────
+
+Test result: FAILED. Total tests: 5; passed: 3; failed: 2
diff --git a/third_party/move/tools/move-unit-test/tests/test_sources/unexpected_abort.v2_exp b/third_party/move/tools/move-unit-test/tests/test_sources/unexpected_abort.v2_exp
new file mode 100644
index 0000000000000..3542197d1399a
--- /dev/null
+++ b/third_party/move/tools/move-unit-test/tests/test_sources/unexpected_abort.v2_exp
@@ -0,0 +1,63 @@
+Running Move unit tests
+[ PASS    ] 0x1::M::correct_abort_code
+[ PASS    ] 0x1::M::just_test_failure
+[ FAIL    ] 0x1::M::unexpected_abort
+[ FAIL    ] 0x1::M::unexpected_abort_in_other_function
+[ FAIL    ] 0x1::M::wrong_abort_code
+0x1::M::correct_abort_code
+Output: Ok(Changes { accounts: {} })
+0x1::M::just_test_failure
+Output: Ok(Changes { accounts: {} })
+0x1::M::unexpected_abort
+Output: Ok(Changes { accounts: {} })
+0x1::M::unexpected_abort_in_other_function
+Output: Ok(Changes { accounts: {} })
+0x1::M::wrong_abort_code
+Output: Ok(Changes { accounts: {} })
+
+Test failures:
+
+Failures in 0x1::M:
+
+┌── unexpected_abort ──────
+│ error[E11001]: test failure
+│   ┌─ unexpected_abort.move:5:9
+│   │
+│ 4 │     public fun unexpected_abort() {
+│   │                ---------------- In this function in 0x1::M
+│ 5 │         abort 0
+│   │         ^^^^^^^ Test was not expected to error, but it aborted with code 0 originating in the module 0000000000000000000000000000000000000000000000000000000000000001::M rooted here
+│ 
+│ 
+└──────────────────
+
+
+┌── unexpected_abort_in_other_function ──────
+│ error[E11001]: test failure
+│    ┌─ unexpected_abort.move:28:9
+│    │
+│ 27 │     fun abort_in_other_function() {
+│    │         ----------------------- In this function in 0x1::M
+│ 28 │         abort 1
+│    │         ^^^^^^^ Test was not expected to error, but it aborted with code 1 originating in the module 0000000000000000000000000000000000000000000000000000000000000001::M rooted here
+│ 
+│ 
+│ stack trace
+│ 	M::unexpected_abort_in_other_function(tests/test_sources/unexpected_abort.move:33)
+│ 
+└──────────────────
+
+
+┌── wrong_abort_code ──────
+│ error[E11001]: test failure
+│    ┌─ unexpected_abort.move:11:9
+│    │
+│ 10 │     public fun wrong_abort_code() {
+│    │                ---------------- In this function in 0x1::M
+│ 11 │         abort 0
+│    │         ^^^^^^^ Test did not error as expected. Expected test to abort with code 1 originating in the module 0000000000000000000000000000000000000000000000000000000000000001::M but instead it aborted with code 0 originating in the module 0000000000000000000000000000000000000000000000000000000000000001::M rooted here
+│ 
+│ 
+└──────────────────
+
+Test result: FAILED. Total tests: 5; passed: 2; failed: 3
diff --git a/third_party/move/tools/move-unit-test/tests/test_sources/use_unit_test_module.v2_exp b/third_party/move/tools/move-unit-test/tests/test_sources/use_unit_test_module.v2_exp
new file mode 100644
index 0000000000000..5118fbe5314cf
--- /dev/null
+++ b/third_party/move/tools/move-unit-test/tests/test_sources/use_unit_test_module.v2_exp
@@ -0,0 +1,5 @@
+Running Move unit tests
+[ PASS    ] 0x1::M::poison_call
+0x1::M::poison_call
+Output: Ok(Changes { accounts: {} })
+Test result: OK. Total tests: 1; passed: 1; failed: 0
diff --git a/tools/compute-module-expansion-size/Cargo.toml b/tools/compute-module-expansion-size/Cargo.toml
new file mode 100644
index 0000000000000..c87bec5a4b5d1
--- /dev/null
+++ b/tools/compute-module-expansion-size/Cargo.toml
@@ -0,0 +1,21 @@
+[package]
+name = "compute-module-expansion-size"
+version = "0.1.0"
+
+# Workspace inherited keys
+authors = { workspace = true }
+edition = { workspace = true }
+homepage = { workspace = true }
+license = { workspace = true }
+publish = { workspace = true }
+repository = { workspace = true }
+rust-version = { workspace = true }
+
+[dependencies]
+anyhow = { workspace = true }
+clap = { workspace = true }
+futures = { workspace = true }
+move-binary-format = { workspace = true }
+move-core-types = { workspace = true }
+rayon = { workspace = true }
+tokio = { workspace = true }
diff --git a/tools/compute-module-expansion-size/src/main.rs b/tools/compute-module-expansion-size/src/main.rs
new file mode 100644
index 0000000000000..e1b9e13105813
--- /dev/null
+++ b/tools/compute-module-expansion-size/src/main.rs
@@ -0,0 +1,115 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use anyhow::{format_err, Result};
+use clap::Parser;
+use move_binary_format::CompiledModule;
+use move_core_types::language_storage::ModuleId;
+use rayon::iter::{IntoParallelRefIterator, ParallelIterator};
+use std::{fmt::Write, path::PathBuf};
+use tokio::fs;
+
+#[derive(Parser, Debug)]
+#[clap(author, version, about, long_about = None)]
+struct Args {
+    /// Path to the module directory
+    #[clap(long, value_parser)]
+    path: String,
+}
+
+async fn list_files_with_extension(
+    dir: &str,
+    extension: &str,
+) -> Result<Vec<PathBuf>, std::io::Error> {
+    let mut paths = vec![];
+    let mut stack = vec![PathBuf::from(dir)];
+
+    while let Some(curr_dir) = stack.pop() {
+        let mut entries = fs::read_dir(curr_dir).await?;
+        while let Some(entry) = entries.next_entry().await? {
+            let path = entry.path();
+            if path.is_file() && path.extension().map_or(false, |ext| ext == extension) {
+                paths.push(path);
+            } else if path.is_dir() {
+                stack.push(path);
+            }
+        }
+    }
+
+    Ok(paths)
+}
+
+async fn read_modules(dir: &str) -> Result<Vec<Vec<u8>>> {
+    let paths = list_files_with_extension(dir, "mv").await?;
+
+    let reads = paths
+        .into_iter()
+        .map(|path| async move { fs::read(path).await });
+
+    futures::future::join_all(reads)
+        .await
+        .into_iter()
+        .map(|res| res.map_err(|_e| format_err!("failed to read file")))
+        .collect()
+}
+
+#[derive(Debug, Clone)]
+struct ModuleInfo {
+    size: usize,
+    expansion_size: u64,
+}
+
+fn extract_module_info_single(bytes: &[u8]) -> Result<(ModuleId, ModuleInfo)> {
+    let res = CompiledModule::deserialize(bytes);
+    let module = res?;
+
+    let expansion_size =
+        move_binary_format::check_complexity::check_module_complexity(&module, u64::MAX).unwrap();
+
+    Ok((module.self_id().clone(), ModuleInfo {
+        size: bytes.len(),
+        expansion_size,
+    }))
+}
+
+fn extract_module_info(modules: &Vec<Vec<u8>>) -> Result<Vec<(ModuleId, ModuleInfo)>> {
+    Ok(rayon::scope(move |_s| {
+        modules
+            .par_iter()
+            .flat_map(|bytes| extract_module_info_single(bytes).ok())
+    })
+    .collect())
+}
+
+fn render_data_csv<'a>(
+    info: impl IntoIterator<Item = (&'a ModuleId, &'a ModuleInfo)>,
+) -> Result<String> {
+    let mut s = String::new();
+    writeln!(s, "module,size,\"expansion size\"")?;
+
+    for (module_id, info) in info.into_iter() {
+        writeln!(s, "{},{},{}", module_id, info.size, info.expansion_size)?;
+    }
+
+    Ok(s)
+}
+
+#[tokio::main]
+async fn main() -> Result<()> {
+    let args = Args::parse();
+
+    let modules = read_modules(&args.path).await?;
+    println!("Read {} modules", modules.len());
+
+    let info = extract_module_info(&modules)?;
+    println!(
+        "Deserialized {} out of {} modules",
+        info.len(),
+        modules.len()
+    );
+
+    let csv = render_data_csv(info.iter().map(|(id, info)| (id, info)))?;
+    fs::write("modules.csv", csv).await?;
+
+    Ok(())
+}
diff --git a/types/Cargo.toml b/types/Cargo.toml
index b0839cf49d05e..79c5b17de97c1 100644
--- a/types/Cargo.toml
+++ b/types/Cargo.toml
@@ -35,14 +35,18 @@ hex = { workspace = true }
 itertools = { workspace = true }
 jsonwebtoken = { workspace = true }
 move-binary-format = { workspace = true }
+move-bytecode-verifier = { workspace = true }
 move-core-types = { workspace = true }
 move-table-extension = { workspace = true }
+move-vm-runtime = { workspace = true }
 move-vm-types = { workspace = true }
 num-bigint = { workspace = true }
 num-derive = { workspace = true }
 num-traits = { workspace = true }
 once_cell = { workspace = true }
 passkey-types = { workspace = true }
+poem-openapi = { workspace = true }
+poem-openapi-derive = { workspace = true }
 proptest = { workspace = true, optional = true }
 proptest-derive = { workspace = true, optional = true }
 quick_cache = { workspace = true }
@@ -93,3 +97,6 @@ harness = false
 [[bench]]
 name = "state_key"
 harness = false
+
+[package.metadata.cargo-machete]
+ignored = ['poem-openapi']
diff --git a/types/src/account_config/events/new_block.rs b/types/src/account_config/events/new_block.rs
index 76274a03a2864..8e8de3b295a05 100644
--- a/types/src/account_config/events/new_block.rs
+++ b/types/src/account_config/events/new_block.rs
@@ -21,15 +21,15 @@ use serde::{Deserialize, Serialize};
 /// Should be kept in-sync with NewBlockEvent move struct in block.move.
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct NewBlockEvent {
-    hash: AccountAddress,
-    epoch: u64,
-    round: u64,
-    height: u64,
-    previous_block_votes_bitvec: Vec<u8>,
-    proposer: AccountAddress,
-    failed_proposer_indices: Vec<u64>,
+    pub hash: AccountAddress,
+    pub epoch: u64,
+    pub round: u64,
+    pub height: u64,
+    pub previous_block_votes_bitvec: Vec<u8>,
+    pub proposer: AccountAddress,
+    pub failed_proposer_indices: Vec<u64>,
     // usecs (microseconds)
-    timestamp: u64,
+    pub timestamp: u64,
 }
 
 impl NewBlockEvent {
diff --git a/types/src/delayed_fields.rs b/types/src/delayed_fields.rs
index c40758bdc738c..6b1898546d527 100644
--- a/types/src/delayed_fields.rs
+++ b/types/src/delayed_fields.rs
@@ -10,6 +10,7 @@ use move_vm_types::delayed_values::{
     error::code_invariant_error,
 };
 use once_cell::sync::Lazy;
+use std::fmt::Display;
 
 // Represents something that should never happen - i.e. a code invariant error,
 // which we would generally just panic, but since we are inside of the VM,
@@ -19,10 +20,10 @@ pub enum PanicError {
     CodeInvariantError(String),
 }
 
-impl ToString for PanicError {
-    fn to_string(&self) -> String {
+impl Display for PanicError {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            PanicError::CodeInvariantError(e) => e.clone(),
+            PanicError::CodeInvariantError(e) => write!(f, "{}", e),
         }
     }
 }
diff --git a/types/src/dkg/real_dkg/rounding/mod.rs b/types/src/dkg/real_dkg/rounding/mod.rs
index cdf1eb882fc3c..e548b8a4cef07 100644
--- a/types/src/dkg/real_dkg/rounding/mod.rs
+++ b/types/src/dkg/real_dkg/rounding/mod.rs
@@ -11,7 +11,7 @@ use std::{
     fmt::{Debug, Formatter},
 };
 
-pub fn total_weight_lower_bound(validator_stakes: &Vec<u64>) -> usize {
+pub fn total_weight_lower_bound(validator_stakes: &[u64]) -> usize {
     // Each validator has at least 1 weight.
     validator_stakes.len()
 }
@@ -32,7 +32,7 @@ pub fn total_weight_lower_bound(validator_stakes: &Vec<u64>) -> usize {
 /// - when `r > 2/3`, `weight_sub_total >= 2*n + 8 - rounding_weight_loss_total >= 1.5*n + 8 + rounding_weight_gain_total > reconstruction_threshold`.
 
 pub fn total_weight_upper_bound(
-    validator_stakes: &Vec<u64>,
+    validator_stakes: &[u64],
     mut reconstruct_threshold_in_stake_ratio: U64F64,
     secrecy_threshold_in_stake_ratio: U64F64,
 ) -> usize {
diff --git a/types/src/executable.rs b/types/src/executable.rs
index d1794e4650d10..7a4ec3e2bf704 100644
--- a/types/src/executable.rs
+++ b/types/src/executable.rs
@@ -1,12 +1,9 @@
 // Copyright © Aptos Foundation
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::{
-    access_path::AccessPath,
-    state_store::state_key::{inner::StateKeyInner, StateKey},
-};
+use crate::state_store::state_key::{inner::StateKeyInner, StateKey};
 use aptos_crypto::HashValue;
-use std::sync::Arc;
+use move_core_types::{account_address::AccountAddress, identifier::IdentStr};
 
 #[derive(PartialEq, Eq, Debug)]
 pub enum ExecutableDescriptor {
@@ -18,17 +15,22 @@ pub enum ExecutableDescriptor {
 }
 
 pub trait ModulePath {
-    fn module_path(&self) -> Option<AccessPath>;
+    // TODO(George):
+    //   Improve this in the future, right now all writes use state keys
+    //   and we need to use this trait to check if a generic state key is
+    //   for code or not.
+    fn is_module_path(&self) -> bool;
+
+    fn from_address_and_module_name(address: &AccountAddress, module_name: &IdentStr) -> Self;
 }
 
 impl ModulePath for StateKey {
-    fn module_path(&self) -> Option<AccessPath> {
-        if let StateKeyInner::AccessPath(ap) = self.inner() {
-            if ap.is_code() {
-                return Some(ap.clone());
-            }
-        }
-        None
+    fn is_module_path(&self) -> bool {
+        matches!(self.inner(), StateKeyInner::AccessPath(ap) if ap.is_code())
+    }
+
+    fn from_address_and_module_name(address: &AccountAddress, module_name: &IdentStr) -> Self {
+        Self::module(address, module_name)
     }
 }
 
@@ -49,43 +51,3 @@ impl Executable for ExecutableTestType {
         0
     }
 }
-
-// TODO: variant for a compiled module when available to avoid deserialization.
-pub enum FetchedModule<X: Executable> {
-    Blob(Option<Vec<u8>>),
-    // Note: We could use Weak / & for parallel and sequential modes, respectively
-    // but rely on Arc for a simple and unified treatment for the time being.
-    // TODO: change Arc<X> to custom reference when we have memory manager / arena.
-    Executable(Arc<X>),
-}
-
-/// View for the VM for interacting with the multi-versioned executable cache.
-pub trait ExecutableView {
-    type Key;
-    type Executable: Executable;
-
-    /// This is an optimization to bypass transactional semantics and share the
-    /// executable (and all the useful work for producing it) as early as possible
-    /// other txns / VM sessions. It is safe as storage-version module can't change,
-    /// and o.w. the key is the (cryptographic) hash of the module blob.
-    ///
-    /// W.o. this, we would have to include executables in TransactionOutputExt.
-    /// This may occur much later leading to work duplication (producing the same
-    /// executable by other sessions) in the common case when the executable isn't
-    /// based on the module published by the transaction itself.
-    fn store_executable(
-        &self,
-        key: &Self::Key,
-        descriptor: ExecutableDescriptor,
-        executable: Self::Executable,
-    );
-
-    /// Returns either the blob of the module, that will need to be deserialized into
-    /// CompiledModule and then made into an executable, or executable directly, if
-    /// the executable corresponding to the latest published module was already stored.
-    /// TODO: Return CompiledModule directly to avoid deserialization.
-    fn fetch_module(
-        &self,
-        key: &Self::Key,
-    ) -> anyhow::Result<(ExecutableDescriptor, FetchedModule<Self::Executable>)>;
-}
diff --git a/types/src/indexer/indexer_db_reader.rs b/types/src/indexer/indexer_db_reader.rs
new file mode 100644
index 0000000000000..016524dc5bb67
--- /dev/null
+++ b/types/src/indexer/indexer_db_reader.rs
@@ -0,0 +1,73 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    account_address::AccountAddress,
+    contract_event::EventWithVersion,
+    event::EventKey,
+    state_store::{
+        state_key::{prefix::StateKeyPrefix, StateKey},
+        state_value::StateValue,
+        table::{TableHandle, TableInfo},
+    },
+    transaction::{AccountTransactionsWithProof, Version},
+};
+use anyhow::Result;
+
+#[derive(Clone, Copy, Eq, PartialEq)]
+pub enum Order {
+    Ascending,
+    Descending,
+}
+
+pub trait IndexerReader: Send + Sync {
+    fn get_table_info(&self, handle: TableHandle) -> Result<Option<TableInfo>>;
+
+    fn get_events(
+        &self,
+        event_key: &EventKey,
+        start: u64,
+        order: Order,
+        limit: u64,
+        ledger_version: Version,
+    ) -> Result<Vec<EventWithVersion>>;
+
+    fn get_events_by_event_key(
+        &self,
+        event_key: &EventKey,
+        start_seq_num: u64,
+        order: Order,
+        limit: u64,
+        ledger_version: Version,
+    ) -> Result<Vec<EventWithVersion>>;
+
+    fn get_account_transactions(
+        &self,
+        address: AccountAddress,
+        start_seq_num: u64,
+        limit: u64,
+        include_events: bool,
+        ledger_version: Version,
+    ) -> Result<AccountTransactionsWithProof>;
+
+    fn get_prefixed_state_value_iterator(
+        &self,
+        key_prefix: &StateKeyPrefix,
+        cursor: Option<&StateKey>,
+        version: Version,
+    ) -> Result<Box<dyn Iterator<Item = Result<(StateKey, StateValue)>> + '_>>;
+
+    fn get_latest_internal_indexer_ledger_version(&self) -> Result<Option<Version>>;
+
+    #[cfg(any(test, feature = "fuzzing"))]
+    fn wait_for_internal_indexer(&self, version: Version) -> Result<()> {
+        while self
+            .get_latest_internal_indexer_ledger_version()?
+            .map_or(true, |v| v < version)
+        {
+            std::thread::sleep(std::time::Duration::from_millis(200));
+        }
+
+        Ok(())
+    }
+}
diff --git a/types/src/indexer/mod.rs b/types/src/indexer/mod.rs
new file mode 100644
index 0000000000000..1b4cb5194ed86
--- /dev/null
+++ b/types/src/indexer/mod.rs
@@ -0,0 +1,4 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod indexer_db_reader;
diff --git a/types/src/jwks/jwk/mod.rs b/types/src/jwks/jwk/mod.rs
index f5d692162b815..4d45eac86fa33 100644
--- a/types/src/jwks/jwk/mod.rs
+++ b/types/src/jwks/jwk/mod.rs
@@ -1,6 +1,8 @@
 // Copyright © Aptos Foundation
 // SPDX-License-Identifier: Apache-2.0
 
+#![allow(clippy::match_result_ok)]
+
 use crate::{
     jwks::{rsa::RSA_JWK, unsupported::UnsupportedJWK},
     move_any::{Any as MoveAny, AsMoveAny},
@@ -9,6 +11,7 @@ use crate::{
 use anyhow::anyhow;
 use aptos_crypto_derive::{BCSCryptoHash, CryptoHasher};
 use move_core_types::value::{MoveStruct, MoveValue};
+use poem_openapi_derive::Union;
 use serde::{Deserialize, Serialize};
 use std::{
     cmp::Ordering,
@@ -47,7 +50,7 @@ impl From<RSA_JWK> for JWKMoveStruct {
 }
 
 /// The JWK type that can be converted from/to `JWKMoveStruct` but easier to use in rust.
-#[derive(Debug, PartialEq, Eq)]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Union)]
 pub enum JWK {
     RSA(RSA_JWK),
     Unsupported(UnsupportedJWK),
diff --git a/types/src/jwks/mod.rs b/types/src/jwks/mod.rs
index 53477915d4eec..c43c7387dcaa9 100644
--- a/types/src/jwks/mod.rs
+++ b/types/src/jwks/mod.rs
@@ -1,7 +1,10 @@
 // Copyright © Aptos Foundation
 // SPDX-License-Identifier: Apache-2.0
 
-use self::jwk::JWK;
+use self::{
+    jwk::JWK,
+    rsa::{INSECURE_TEST_RSA_JWK, RSA_JWK, SECURE_TEST_RSA_JWK},
+};
 use crate::{
     aggregate_signature::AggregateSignature, move_utils::as_move_value::AsMoveValue,
     on_chain_config::OnChainConfig,
@@ -30,6 +33,14 @@ pub mod unsupported;
 
 pub type Issuer = Vec<u8>;
 
+pub fn secure_test_rsa_jwk() -> RSA_JWK {
+    SECURE_TEST_RSA_JWK.clone()
+}
+
+pub fn insecure_test_rsa_jwk() -> RSA_JWK {
+    INSECURE_TEST_RSA_JWK.clone()
+}
+
 pub fn issuer_from_str(s: &str) -> Issuer {
     s.as_bytes().to_vec()
 }
diff --git a/types/src/jwks/patch/mod.rs b/types/src/jwks/patch/mod.rs
index 6cbaaa660e082..cdcc693551ba5 100644
--- a/types/src/jwks/patch/mod.rs
+++ b/types/src/jwks/patch/mod.rs
@@ -1,8 +1,6 @@
 // Copyright © Aptos Foundation
 // SPDX-License-Identifier: Apache-2.0
 
-// Copyright © Aptos Foundation
-
 use crate::{
     jwks::jwk::JWKMoveStruct,
     move_any::{Any as MoveAny, AsMoveAny},
diff --git a/types/src/jwks/rsa/insecure_test_jwk.json b/types/src/jwks/rsa/insecure_test_jwk.json
new file mode 100644
index 0000000000000..0e6524dccd8d9
--- /dev/null
+++ b/types/src/jwks/rsa/insecure_test_jwk.json
@@ -0,0 +1,11 @@
+{
+    "keys": [
+        {
+            "kty": "RSA",
+            "n": "6S7asUuzq5Q_3U9rbs-PkDVIdjgmtgWreG5qWPsC9xXZKiMV1AiV9LXyqQsAYpCqEDM3XbfmZqGb48yLhb_XqZaKgSYaC_h2DjM7lgrIQAp9902Rr8fUmLN2ivr5tnLxUUOnMOc2SQtr9dgzTONYW5Zu3PwyvAWk5D6ueIUhLtYzpcB-etoNdL3Ir2746KIy_VUsDwAM7dhrqSK8U2xFCGlau4ikOTtvzDownAMHMrfE7q1B6WZQDAQlBmxRQsyKln5DIsKv6xauNsHRgBAKctUxZG8M4QJIx3S6Aughd3RZC4Ca5Ae9fd8L8mlNYBCrQhOZ7dS0f4at4arlLcajtw",
+            "e": "AQAB",
+            "kid": "test-rsa",
+            "alg": "RS256"
+        }
+    ]
+}
diff --git a/types/src/jwks/rsa/insecure_test_jwk_private_key.pem b/types/src/jwks/rsa/insecure_test_jwk_private_key.pem
new file mode 100644
index 0000000000000..288a76e4c23b0
--- /dev/null
+++ b/types/src/jwks/rsa/insecure_test_jwk_private_key.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEwAIBADANBgkqhkiG9w0BAQEFAASCBKowggSmAgEAAoIBAQDpLtqxS7OrlD/d
+T2tuz4+QNUh2OCa2Bat4bmpY+wL3FdkqIxXUCJX0tfKpCwBikKoQMzddt+ZmoZvj
+zIuFv9eploqBJhoL+HYOMzuWCshACn33TZGvx9SYs3aK+vm2cvFRQ6cw5zZJC2v1
+2DNM41hblm7c/DK8BaTkPq54hSEu1jOlwH562g10vcivbvjoojL9VSwPAAzt2Gup
+IrxTbEUIaVq7iKQ5O2/MOjCcAwcyt8TurUHpZlAMBCUGbFFCzIqWfkMiwq/rFq42
+wdGAEApy1TFkbwzhAkjHdLoC6CF3dFkLgJrkB7193wvyaU1gEKtCE5nt1LR/hq3h
+quUtxqO3AgMBAAECggEBANX6C+7EA/TADrbcCT7fMuNnMb5iGovPuiDCWc6bUIZC
+Q0yac45l7o1nZWzfzpOkIprJFNZoSgIF7NJmQeYTPCjAHwsSVraDYnn3Y4d1D3tM
+5XjJcpX2bs1NactxMTLOWUl0JnkGwtbWp1Qq+DBnMw6ghc09lKTbHQvhxSKNL/0U
+C+YmCYT5ODmxzLBwkzN5RhxQZNqol/4LYVdji9bS7N/UITw5E6LGDOo/hZHWqJsE
+fgrJTPsuCyrYlwrNkgmV2KpRrGz5MpcRM7XHgnqVym+HyD/r9E7MEFdTLEaiiHcm
+Ish1usJDEJMFIWkF+rnEoJkQHbqiKlQBcoqSbCmoMWECgYEA/4379mMPF0JJ/EER
+4VH7/ZYxjdyphenx2VYCWY/uzT0KbCWQF8KXckuoFrHAIP3EuFn6JNoIbja0NbhI
+HGrU29BZkATG8h/xjFy/zPBauxTQmM+yS2T37XtMoXNZNS/ubz2lJXMOapQQiXVR
+l/tzzpyWaCe9j0NT7DAU0ZFmDbECgYEA6ZbjkcOs2jwHsOwwfamFm4VpUFxYtED7
+9vKzq5d7+Ii1kPKHj5fDnYkZd+mNwNZ02O6OGxh40EDML+i6nOABPg/FmXeVCya9
+Vump2Yqr2fAK3xm6QY5KxAjWWq2kVqmdRmICSL2Z9rBzpXmD5o06y9viOwd2bhBo
+0wB02416GecCgYEA+S/ZoEa3UFazDeXlKXBn5r2tVEb2hj24NdRINkzC7h23K/z0
+pDZ6tlhPbtGkJodMavZRk92GmvF8h2VJ62vAYxamPmhqFW5Qei12WL+FuSZywI7F
+q/6oQkkYT9XKBrLWLGJPxlSKmiIGfgKHrUrjgXPutWEK1ccw7f10T2UXvgECgYEA
+nXqLa58G7o4gBUgGnQFnwOSdjn7jkoppFCClvp4/BtxrxA+uEsGXMKLYV75OQd6T
+IhkaFuxVrtiwj/APt2lRjRym9ALpqX3xkiGvz6ismR46xhQbPM0IXMc0dCeyrnZl
+QKkcrxucK/Lj1IBqy0kVhZB1IaSzVBqeAPrCza3AzqsCgYEAvSiEjDvGLIlqoSvK
+MHEVe8PBGOZYLcAdq4YiOIBgddoYyRsq5bzHtTQFgYQVK99Cnxo+PQAvzGb+dpjN
+/LIEAS2LuuWHGtOrZlwef8ZpCQgrtmp/phXfVi6llcZx4mMm7zYmGhh2AsA9yEQc
+acgc4kgDThAjD7VlXad9UHpNMO8=
+-----END PRIVATE KEY-----
\ No newline at end of file
diff --git a/types/src/jwks/rsa/mod.rs b/types/src/jwks/rsa/mod.rs
index 154c6bb44283d..23a9cd6fba819 100644
--- a/types/src/jwks/rsa/mod.rs
+++ b/types/src/jwks/rsa/mod.rs
@@ -7,12 +7,15 @@ use aptos_crypto::poseidon_bn254;
 use base64::URL_SAFE_NO_PAD;
 use jsonwebtoken::{Algorithm, DecodingKey, TokenData, Validation};
 use move_core_types::value::{MoveStruct, MoveValue};
+use once_cell::sync::Lazy;
+use poem_openapi_derive::Object;
+use ring::signature::RsaKeyPair;
+use rsa::{pkcs1::EncodeRsaPrivateKey, pkcs8::DecodePrivateKey};
 use serde::{Deserialize, Serialize};
-
 /// Move type `0x1::jwks::RSA_JWK` in rust.
 /// See its doc in Move for more details.
 #[allow(non_camel_case_types)]
-#[derive(Clone, Debug, Hash, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, Hash, PartialEq, Eq, Serialize, Deserialize, Object)]
 pub struct RSA_JWK {
     pub kid: String,
     pub kty: String,
@@ -21,6 +24,31 @@ pub struct RSA_JWK {
     pub n: String,
 }
 
+#[derive(Debug, Deserialize, Serialize)]
+struct RsaJwkSet {
+    keys: Vec<RSA_JWK>,
+}
+
+pub fn get_jwk_from_str(s: &str) -> RSA_JWK {
+    let RsaJwkSet { keys } = serde_json::from_str(s).expect("Unable to parse JSON");
+    keys[0].clone()
+}
+
+pub static SECURE_TEST_RSA_JWK: Lazy<RSA_JWK> =
+    Lazy::new(|| get_jwk_from_str(include_str!("secure_test_jwk.json")));
+
+pub static INSECURE_TEST_RSA_JWK: Lazy<RSA_JWK> =
+    Lazy::new(|| get_jwk_from_str(include_str!("insecure_test_jwk.json")));
+
+pub static INSECURE_TEST_RSA_KEY_PAIR: Lazy<RsaKeyPair> = Lazy::new(|| {
+    // TODO(keyless): Hacking around the difficulty of parsing PKCS#8-encoded PEM files with the `pem` crate
+    let der = rsa::RsaPrivateKey::from_pkcs8_pem(include_str!("insecure_test_jwk_private_key.pem"))
+        .unwrap()
+        .to_pkcs1_der()
+        .unwrap();
+    RsaKeyPair::from_der(der.as_bytes()).unwrap()
+});
+
 impl RSA_JWK {
     /// The circuit-supported RSA modulus size.
     pub const RSA_MODULUS_BYTES: usize = 256;
diff --git a/types/src/jwks/rsa/secure_test_jwk.json b/types/src/jwks/rsa/secure_test_jwk.json
new file mode 100644
index 0000000000000..b46a87e12772b
--- /dev/null
+++ b/types/src/jwks/rsa/secure_test_jwk.json
@@ -0,0 +1,11 @@
+{
+    "keys": [
+        {
+            "kty": "RSA",
+            "n": "y5Efs1ZzisLLKCARSvTztgWj5JFP3778dZWt-od78fmOZFxem3a_aYbOXSJToRp862do0PxJ4PDMpmqwV5f7KplFI6NswQV-WPufQH8IaHXZtuPdCjPOcHybcDiLkO12d0dG6iZQUzypjAJf63APcadio-4JDNWlGC5_Ow_XQ9lIY71kTMiT9lkCCd0ZxqEifGtnJe5xSoZoaMRKrvlOw-R6iVjLUtPAk5hyUX95LDKxwAR-oshnj7gmATejga2EvH9ozdn3M8Go11PSDa04OQxPcA25OoDTfxLvT28LRpSXrbmUWZ-O_lGtDl3ZAtjIguYGEobTk4N11eRssC95Cw",
+            "e": "AQAB",
+            "kid": "test-rsa",
+            "alg": "RS256"
+        }
+    ]
+}
diff --git a/types/src/jwks/unsupported/mod.rs b/types/src/jwks/unsupported/mod.rs
index 6a6c15e2fc6f3..813747b4aee10 100644
--- a/types/src/jwks/unsupported/mod.rs
+++ b/types/src/jwks/unsupported/mod.rs
@@ -4,12 +4,13 @@
 use crate::{move_any::AsMoveAny, move_utils::as_move_value::AsMoveValue};
 use aptos_crypto::HashValue;
 use move_core_types::value::{MoveStruct, MoveValue};
+use poem_openapi_derive::Object;
 use serde::{Deserialize, Serialize};
 use std::fmt::{Debug, Formatter};
 
 /// Move type `0x1::jwks::UnsupportedJWK` in rust.
 /// See its doc in Move for more details.
-#[derive(Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(Clone, PartialEq, Eq, Serialize, Deserialize, Object)]
 pub struct UnsupportedJWK {
     pub id: Vec<u8>,
     pub payload: Vec<u8>,
diff --git a/types/src/keyless/circuit_testcases.rs b/types/src/keyless/circuit_testcases.rs
index 73063b7267dc3..9597f994e0856 100644
--- a/types/src/keyless/circuit_testcases.rs
+++ b/types/src/keyless/circuit_testcases.rs
@@ -5,7 +5,10 @@
 //^ `input_gen.py` in the `keyless-circuit` repo (or can be derived implicitly from that code).
 
 use crate::{
-    jwks::rsa::RSA_JWK,
+    jwks::{
+        insecure_test_rsa_jwk,
+        rsa::{INSECURE_TEST_RSA_KEY_PAIR, RSA_JWK},
+    },
     keyless::{
         base64url_encode_str,
         bn254_circom::{G1Bytes, G2Bytes},
@@ -19,7 +22,6 @@ use ark_bn254::Bn254;
 use ark_groth16::{PreparedVerifyingKey, VerifyingKey};
 use once_cell::sync::Lazy;
 use ring::signature::RsaKeyPair;
-use rsa::{pkcs1::EncodeRsaPrivateKey, pkcs8::DecodePrivateKey};
 
 /// The JWT header, decoded as JSON
 pub(crate) static SAMPLE_JWT_HEADER_JSON: Lazy<String> = Lazy::new(|| {
@@ -86,56 +88,11 @@ pub(crate) static SAMPLE_JWT_EXTRA_FIELD: Lazy<String> =
 pub(crate) static SAMPLE_JWT_PARSED: Lazy<Claims> =
     Lazy::new(|| serde_json::from_str(SAMPLE_JWT_PAYLOAD_JSON.as_str()).unwrap());
 
-/// The JWK under which the JWT is signed, taken from https://token.dev
-pub(crate) static SAMPLE_JWK: Lazy<RSA_JWK> = Lazy::new(|| {
-    RSA_JWK {
-    kid: "test-rsa".to_owned(),
-    kty: "RSA".to_owned(),
-    alg: "RS256".to_owned(),
-    e: "AQAB".to_owned(),
-    n: "6S7asUuzq5Q_3U9rbs-PkDVIdjgmtgWreG5qWPsC9xXZKiMV1AiV9LXyqQsAYpCqEDM3XbfmZqGb48yLhb_XqZaKgSYaC_h2DjM7lgrIQAp9902Rr8fUmLN2ivr5tnLxUUOnMOc2SQtr9dgzTONYW5Zu3PwyvAWk5D6ueIUhLtYzpcB-etoNdL3Ir2746KIy_VUsDwAM7dhrqSK8U2xFCGlau4ikOTtvzDownAMHMrfE7q1B6WZQDAQlBmxRQsyKln5DIsKv6xauNsHRgBAKctUxZG8M4QJIx3S6Aughd3RZC4Ca5Ae9fd8L8mlNYBCrQhOZ7dS0f4at4arlLcajtw".to_owned(),
-}
-});
+pub(crate) static SAMPLE_JWK: Lazy<RSA_JWK> = Lazy::new(insecure_test_rsa_jwk);
 
 /// This is the SK from https://token.dev/.
 /// To convert it into a JSON, you can use https://irrte.ch/jwt-js-decode/pem2jwk.html
-pub(crate) static SAMPLE_JWK_SK: Lazy<RsaKeyPair> = Lazy::new(|| {
-    let sk = r#"-----BEGIN PRIVATE KEY-----
-MIIEwAIBADANBgkqhkiG9w0BAQEFAASCBKowggSmAgEAAoIBAQDpLtqxS7OrlD/d
-T2tuz4+QNUh2OCa2Bat4bmpY+wL3FdkqIxXUCJX0tfKpCwBikKoQMzddt+ZmoZvj
-zIuFv9eploqBJhoL+HYOMzuWCshACn33TZGvx9SYs3aK+vm2cvFRQ6cw5zZJC2v1
-2DNM41hblm7c/DK8BaTkPq54hSEu1jOlwH562g10vcivbvjoojL9VSwPAAzt2Gup
-IrxTbEUIaVq7iKQ5O2/MOjCcAwcyt8TurUHpZlAMBCUGbFFCzIqWfkMiwq/rFq42
-wdGAEApy1TFkbwzhAkjHdLoC6CF3dFkLgJrkB7193wvyaU1gEKtCE5nt1LR/hq3h
-quUtxqO3AgMBAAECggEBANX6C+7EA/TADrbcCT7fMuNnMb5iGovPuiDCWc6bUIZC
-Q0yac45l7o1nZWzfzpOkIprJFNZoSgIF7NJmQeYTPCjAHwsSVraDYnn3Y4d1D3tM
-5XjJcpX2bs1NactxMTLOWUl0JnkGwtbWp1Qq+DBnMw6ghc09lKTbHQvhxSKNL/0U
-C+YmCYT5ODmxzLBwkzN5RhxQZNqol/4LYVdji9bS7N/UITw5E6LGDOo/hZHWqJsE
-fgrJTPsuCyrYlwrNkgmV2KpRrGz5MpcRM7XHgnqVym+HyD/r9E7MEFdTLEaiiHcm
-Ish1usJDEJMFIWkF+rnEoJkQHbqiKlQBcoqSbCmoMWECgYEA/4379mMPF0JJ/EER
-4VH7/ZYxjdyphenx2VYCWY/uzT0KbCWQF8KXckuoFrHAIP3EuFn6JNoIbja0NbhI
-HGrU29BZkATG8h/xjFy/zPBauxTQmM+yS2T37XtMoXNZNS/ubz2lJXMOapQQiXVR
-l/tzzpyWaCe9j0NT7DAU0ZFmDbECgYEA6ZbjkcOs2jwHsOwwfamFm4VpUFxYtED7
-9vKzq5d7+Ii1kPKHj5fDnYkZd+mNwNZ02O6OGxh40EDML+i6nOABPg/FmXeVCya9
-Vump2Yqr2fAK3xm6QY5KxAjWWq2kVqmdRmICSL2Z9rBzpXmD5o06y9viOwd2bhBo
-0wB02416GecCgYEA+S/ZoEa3UFazDeXlKXBn5r2tVEb2hj24NdRINkzC7h23K/z0
-pDZ6tlhPbtGkJodMavZRk92GmvF8h2VJ62vAYxamPmhqFW5Qei12WL+FuSZywI7F
-q/6oQkkYT9XKBrLWLGJPxlSKmiIGfgKHrUrjgXPutWEK1ccw7f10T2UXvgECgYEA
-nXqLa58G7o4gBUgGnQFnwOSdjn7jkoppFCClvp4/BtxrxA+uEsGXMKLYV75OQd6T
-IhkaFuxVrtiwj/APt2lRjRym9ALpqX3xkiGvz6ismR46xhQbPM0IXMc0dCeyrnZl
-QKkcrxucK/Lj1IBqy0kVhZB1IaSzVBqeAPrCza3AzqsCgYEAvSiEjDvGLIlqoSvK
-MHEVe8PBGOZYLcAdq4YiOIBgddoYyRsq5bzHtTQFgYQVK99Cnxo+PQAvzGb+dpjN
-/LIEAS2LuuWHGtOrZlwef8ZpCQgrtmp/phXfVi6llcZx4mMm7zYmGhh2AsA9yEQc
-acgc4kgDThAjD7VlXad9UHpNMO8=
------END PRIVATE KEY-----"#;
-
-    // TODO(keyless): Hacking around the difficulty of parsing PKCS#8-encoded PEM files with the `pem` crate
-    let der = rsa::RsaPrivateKey::from_pkcs8_pem(sk)
-        .unwrap()
-        .to_pkcs1_der()
-        .unwrap();
-    RsaKeyPair::from_der(der.as_bytes()).unwrap()
-});
+pub(crate) static SAMPLE_JWK_SK: Lazy<&RsaKeyPair> = Lazy::new(|| &*INSECURE_TEST_RSA_KEY_PAIR);
 
 pub(crate) const SAMPLE_UID_KEY: &str = "sub";
 
diff --git a/types/src/keyless/test_utils.rs b/types/src/keyless/test_utils.rs
index 4d46647b96312..82644adcc1a21 100644
--- a/types/src/keyless/test_utils.rs
+++ b/types/src/keyless/test_utils.rs
@@ -175,7 +175,7 @@ pub fn get_sample_jwt_token() -> String {
     let jwt_payload_b64 = base64url_encode_str(SAMPLE_JWT_PAYLOAD_JSON.as_str());
     let msg = jwt_header_b64.clone() + "." + jwt_payload_b64.as_str();
     let rng = ring::rand::SystemRandom::new();
-    let sk = &*SAMPLE_JWK_SK;
+    let sk = *SAMPLE_JWK_SK;
     let mut jwt_sig = vec![0u8; sk.public_modulus_len()];
 
     sk.sign(
@@ -198,7 +198,7 @@ pub fn get_sample_openid_sig_and_pk() -> (KeylessSignature, KeylessPublicKey) {
     let jwt_payload_b64 = base64url_encode_str(SAMPLE_JWT_PAYLOAD_JSON.as_str());
     let msg = jwt_header_b64.clone() + "." + jwt_payload_b64.as_str();
     let rng = ring::rand::SystemRandom::new();
-    let sk = &*SAMPLE_JWK_SK;
+    let sk = *SAMPLE_JWK_SK;
     let mut jwt_sig = vec![0u8; sk.public_modulus_len()];
 
     sk.sign(
diff --git a/types/src/ledger_info.rs b/types/src/ledger_info.rs
index 2955664c8e6bb..98761caf913e4 100644
--- a/types/src/ledger_info.rs
+++ b/types/src/ledger_info.rs
@@ -52,7 +52,12 @@ pub struct LedgerInfo {
 
 impl Display for LedgerInfo {
     fn fmt(&self, f: &mut Formatter) -> std::fmt::Result {
-        write!(f, "LedgerInfo: [commit_info: {}]", self.commit_info())
+        write!(
+            f,
+            "LedgerInfo: [commit_info: {}] [Consensus data hash: {}]",
+            self.commit_info(),
+            self.consensus_data_hash()
+        )
     }
 }
 
diff --git a/types/src/lib.rs b/types/src/lib.rs
index f76c5a467865a..9081b6c0f0a4d 100644
--- a/types/src/lib.rs
+++ b/types/src/lib.rs
@@ -20,6 +20,7 @@ pub mod event;
 pub mod executable;
 pub mod fee_statement;
 pub mod governance;
+pub mod indexer;
 pub mod jwks;
 pub mod ledger_info;
 pub mod mempool_status;
@@ -66,3 +67,4 @@ pub mod keyless;
 pub mod state_store;
 #[cfg(test)]
 mod unit_tests;
+pub mod vm;
diff --git a/types/src/on_chain_config/aptos_features.rs b/types/src/on_chain_config/aptos_features.rs
index 32539af6601b0..79d2045b551ce 100644
--- a/types/src/on_chain_config/aptos_features.rs
+++ b/types/src/on_chain_config/aptos_features.rs
@@ -2,14 +2,18 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::on_chain_config::OnChainConfig;
+use move_binary_format::{
+    file_format_common,
+    file_format_common::{IDENTIFIER_SIZE_MAX, LEGACY_IDENTIFIER_SIZE_MAX},
+};
 use move_core_types::{
     effects::{ChangeSet, Op},
     language_storage::CORE_CODE_ADDRESS,
 };
 use serde::{Deserialize, Serialize};
-use strum_macros::FromRepr;
+use strum_macros::{EnumString, FromRepr};
 /// The feature flags define in the Move source. This must stay aligned with the constants there.
-#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, FromRepr)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, FromRepr, EnumString)]
 #[allow(non_camel_case_types)]
 pub enum FeatureFlag {
     CODE_DEPENDENCY_CHECK = 1,
@@ -75,6 +79,19 @@ pub enum FeatureFlag {
     PRIMARY_APT_FUNGIBLE_STORE_AT_USER_ADDRESS = 61,
     OBJECT_NATIVE_DERIVED_ADDRESS = 62,
     DISPATCHABLE_FUNGIBLE_ASSET = 63,
+    NEW_ACCOUNTS_DEFAULT_TO_FA_APT_STORE = 64,
+    OPERATIONS_DEFAULT_TO_FA_APT_STORE = 65,
+    AGGREGATOR_V2_IS_AT_LEAST_API = 66,
+    CONCURRENT_FUNGIBLE_BALANCE = 67,
+    DEFAULT_TO_CONCURRENT_FUNGIBLE_BALANCE = 68,
+    LIMIT_VM_TYPE_SIZE = 69,
+    ABORT_IF_MULTISIG_PAYLOAD_MISMATCH = 70,
+    DISALLOW_USER_NATIVES = 71,
+    ALLOW_SERIALIZED_SCRIPT_ARGS = 72,
+    USE_COMPATIBILITY_CHECKER_V2 = 73,
+    ENABLE_ENUM_TYPES = 74,
+    ENABLE_RESOURCE_ACCESS_CONTROL = 75,
+    REJECT_UNSTABLE_BYTECODE_FOR_SCRIPT = 76,
 }
 
 impl FeatureFlag {
@@ -84,7 +101,10 @@ impl FeatureFlag {
             FeatureFlag::TREAT_FRIEND_AS_PRIVATE,
             FeatureFlag::SHA_512_AND_RIPEMD_160_NATIVES,
             FeatureFlag::APTOS_STD_CHAIN_ID_NATIVES,
+            // Feature flag V6 is used to enable metadata v1 format and needs to stay on, even
+            // if we enable a higher version.
             FeatureFlag::VM_BINARY_FORMAT_V6,
+            FeatureFlag::VM_BINARY_FORMAT_V7,
             FeatureFlag::MULTI_ED25519_PK_VALIDATE_V2_NATIVES,
             FeatureFlag::BLAKE2B_256_NATIVE,
             FeatureFlag::RESOURCE_GROUPS,
@@ -137,6 +157,16 @@ impl FeatureFlag {
             FeatureFlag::DISPATCHABLE_FUNGIBLE_ASSET,
             FeatureFlag::REMOVE_DETAILED_ERROR_FROM_HASH,
             FeatureFlag::CONCURRENT_FUNGIBLE_ASSETS,
+            FeatureFlag::AGGREGATOR_V2_IS_AT_LEAST_API,
+            FeatureFlag::CONCURRENT_FUNGIBLE_BALANCE,
+            FeatureFlag::LIMIT_VM_TYPE_SIZE,
+            FeatureFlag::ABORT_IF_MULTISIG_PAYLOAD_MISMATCH,
+            FeatureFlag::DISALLOW_USER_NATIVES,
+            FeatureFlag::ALLOW_SERIALIZED_SCRIPT_ARGS,
+            FeatureFlag::USE_COMPATIBILITY_CHECKER_V2,
+            FeatureFlag::ENABLE_ENUM_TYPES,
+            FeatureFlag::ENABLE_RESOURCE_ACCESS_CONTROL,
+            FeatureFlag::REJECT_UNSTABLE_BYTECODE_FOR_SCRIPT,
         ]
     }
 }
@@ -157,6 +187,7 @@ impl Default for Features {
         for feature in FeatureFlag::default_features() {
             features.enable(feature);
         }
+
         features
     }
 }
@@ -227,12 +258,6 @@ impl Features {
             && self.is_enabled(FeatureFlag::STORAGE_DELETION_REFUND)
     }
 
-    /// Whether the Aggregator V2 API feature is enabled.
-    /// Once enabled, the functions from aggregator_v2.move will be available for use.
-    pub fn is_aggregator_v2_api_enabled(&self) -> bool {
-        self.is_enabled(FeatureFlag::AGGREGATOR_V2_API)
-    }
-
     /// Whether the Aggregator V2 delayed fields feature is enabled.
     /// Once enabled, Aggregator V2 functions become parallel.
     pub fn is_aggregator_v2_delayed_fields_enabled(&self) -> bool {
@@ -274,6 +299,28 @@ impl Features {
     pub fn is_refundable_bytes_enabled(&self) -> bool {
         self.is_enabled(FeatureFlag::REFUNDABLE_BYTES)
     }
+
+    pub fn is_abort_if_multisig_payload_mismatch_enabled(&self) -> bool {
+        self.is_enabled(FeatureFlag::ABORT_IF_MULTISIG_PAYLOAD_MISMATCH)
+    }
+
+    pub fn get_max_identifier_size(&self) -> u64 {
+        if self.is_enabled(FeatureFlag::LIMIT_MAX_IDENTIFIER_LENGTH) {
+            IDENTIFIER_SIZE_MAX
+        } else {
+            LEGACY_IDENTIFIER_SIZE_MAX
+        }
+    }
+
+    pub fn get_max_binary_format_version(&self) -> u32 {
+        if self.is_enabled(FeatureFlag::VM_BINARY_FORMAT_V7) {
+            file_format_common::VERSION_7
+        } else if self.is_enabled(FeatureFlag::VM_BINARY_FORMAT_V6) {
+            file_format_common::VERSION_6
+        } else {
+            file_format_common::VERSION_5
+        }
+    }
 }
 
 pub fn aptos_test_feature_flags_genesis() -> ChangeSet {
@@ -292,17 +339,36 @@ pub fn aptos_test_feature_flags_genesis() -> ChangeSet {
     change_set
 }
 
-#[test]
-fn test_features_into_flag_vec() {
-    let mut features = Features { features: vec![] };
-    features.enable(FeatureFlag::BLS12_381_STRUCTURES);
-    features.enable(FeatureFlag::BN254_STRUCTURES);
-    let flag_vec = features.into_flag_vec();
-    assert_eq!(
-        vec![
-            FeatureFlag::BLS12_381_STRUCTURES,
-            FeatureFlag::BN254_STRUCTURES
-        ],
-        flag_vec
-    );
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[test]
+    fn test_features_into_flag_vec() {
+        let mut features = Features { features: vec![] };
+        features.enable(FeatureFlag::BLS12_381_STRUCTURES);
+        features.enable(FeatureFlag::BN254_STRUCTURES);
+
+        assert_eq!(
+            vec![
+                FeatureFlag::BLS12_381_STRUCTURES,
+                FeatureFlag::BN254_STRUCTURES
+            ],
+            features.into_flag_vec()
+        );
+    }
+
+    #[test]
+    fn test_min_max_binary_format() {
+        // Ensure querying max binary format implementation is correct and checks
+        // versions 5 to 7.
+        assert_eq!(
+            file_format_common::VERSION_5,
+            file_format_common::VERSION_MIN
+        );
+        assert_eq!(
+            file_format_common::VERSION_7,
+            file_format_common::VERSION_MAX
+        );
+    }
 }
diff --git a/types/src/on_chain_config/consensus_config.rs b/types/src/on_chain_config/consensus_config.rs
index 88295b2fafb0b..a6b7387948f53 100644
--- a/types/src/on_chain_config/consensus_config.rs
+++ b/types/src/on_chain_config/consensus_config.rs
@@ -2,10 +2,7 @@
 // Parts of the project are originally copyright © Meta Platforms, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::{
-    block_info::Round,
-    on_chain_config::{ConsensusAlgorithmConfig::Jolteon, OnChainConfig},
-};
+use crate::{block_info::Round, on_chain_config::OnChainConfig};
 use anyhow::{format_err, Result};
 use move_core_types::account_address::AccountAddress;
 use serde::{Deserialize, Serialize};
@@ -18,20 +15,27 @@ pub enum ConsensusAlgorithmConfig {
         quorum_store_enabled: bool,
     },
     DAG(DagConsensusConfigV1),
+    JolteonV2 {
+        main: ConsensusConfigV1,
+        quorum_store_enabled: bool,
+        order_vote_enabled: bool,
+    },
 }
 
 impl ConsensusAlgorithmConfig {
     pub fn default_for_genesis() -> Self {
-        Self::Jolteon {
+        Self::JolteonV2 {
             main: ConsensusConfigV1::default(),
             quorum_store_enabled: true,
+            order_vote_enabled: true,
         }
     }
 
     pub fn default_if_missing() -> Self {
-        Self::Jolteon {
+        Self::JolteonV2 {
             main: ConsensusConfigV1::default(),
             quorum_store_enabled: true,
+            order_vote_enabled: false,
         }
     }
 
@@ -40,28 +44,44 @@ impl ConsensusAlgorithmConfig {
             ConsensusAlgorithmConfig::Jolteon {
                 quorum_store_enabled,
                 ..
+            }
+            | ConsensusAlgorithmConfig::JolteonV2 {
+                quorum_store_enabled,
+                ..
             } => *quorum_store_enabled,
             ConsensusAlgorithmConfig::DAG(_) => true,
         }
     }
 
+    pub fn order_vote_enabled(&self) -> bool {
+        match self {
+            ConsensusAlgorithmConfig::JolteonV2 {
+                order_vote_enabled, ..
+            } => *order_vote_enabled,
+            _ => false,
+        }
+    }
+
     pub fn is_dag_enabled(&self) -> bool {
         match self {
-            ConsensusAlgorithmConfig::Jolteon { .. } => false,
+            ConsensusAlgorithmConfig::Jolteon { .. }
+            | ConsensusAlgorithmConfig::JolteonV2 { .. } => false,
             ConsensusAlgorithmConfig::DAG(_) => true,
         }
     }
 
     pub fn leader_reputation_exclude_round(&self) -> u64 {
         match self {
-            ConsensusAlgorithmConfig::Jolteon { main, .. } => main.exclude_round,
+            ConsensusAlgorithmConfig::Jolteon { main, .. }
+            | ConsensusAlgorithmConfig::JolteonV2 { main, .. } => main.exclude_round,
             _ => unimplemented!("method not supported"),
         }
     }
 
     pub fn max_failed_authors_to_store(&self) -> usize {
         match self {
-            ConsensusAlgorithmConfig::Jolteon { main, .. } => main.max_failed_authors_to_store,
+            ConsensusAlgorithmConfig::Jolteon { main, .. }
+            | ConsensusAlgorithmConfig::JolteonV2 { main, .. } => main.max_failed_authors_to_store,
             _ => unimplemented!("method not supported"),
         }
     }
@@ -69,6 +89,7 @@ impl ConsensusAlgorithmConfig {
     pub fn proposer_election_type(&self) -> &ProposerElectionType {
         match self {
             ConsensusAlgorithmConfig::Jolteon { main, .. } => &main.proposer_election_type,
+            ConsensusAlgorithmConfig::JolteonV2 { main, .. } => &main.proposer_election_type,
             _ => unimplemented!("method not supported"),
         }
     }
@@ -83,6 +104,7 @@ impl ConsensusAlgorithmConfig {
     pub fn unwrap_jolteon_config_v1(&self) -> &ConsensusConfigV1 {
         match self {
             ConsensusAlgorithmConfig::Jolteon { main, .. } => main,
+            ConsensusAlgorithmConfig::JolteonV2 { main, .. } => main,
             _ => unreachable!("not a jolteon config"),
         }
     }
@@ -217,6 +239,14 @@ impl OnChainConsensusConfig {
         }
     }
 
+    pub fn order_vote_enabled(&self) -> bool {
+        match &self {
+            OnChainConsensusConfig::V1(_config) => false,
+            OnChainConsensusConfig::V2(_) => false,
+            OnChainConsensusConfig::V3 { alg, .. } => alg.order_vote_enabled(),
+        }
+    }
+
     pub fn is_dag_enabled(&self) -> bool {
         match self {
             OnChainConsensusConfig::V1(_) => false,
@@ -259,16 +289,18 @@ impl OnChainConsensusConfig {
     pub fn enable_validator_txns(&mut self) {
         let new_self = match std::mem::take(self) {
             OnChainConsensusConfig::V1(config) => OnChainConsensusConfig::V3 {
-                alg: Jolteon {
+                alg: ConsensusAlgorithmConfig::JolteonV2 {
                     main: config,
                     quorum_store_enabled: false,
+                    order_vote_enabled: false,
                 },
                 vtxn: ValidatorTxnConfig::default_enabled(),
             },
             OnChainConsensusConfig::V2(config) => OnChainConsensusConfig::V3 {
-                alg: Jolteon {
+                alg: ConsensusAlgorithmConfig::JolteonV2 {
                     main: config,
                     quorum_store_enabled: true,
+                    order_vote_enabled: false,
                 },
                 vtxn: ValidatorTxnConfig::default_enabled(),
             },
diff --git a/types/src/on_chain_config/execution_config.rs b/types/src/on_chain_config/execution_config.rs
index 65bd487ddd0ca..97ce9773022af 100644
--- a/types/src/on_chain_config/execution_config.rs
+++ b/types/src/on_chain_config/execution_config.rs
@@ -70,22 +70,8 @@ impl OnChainExecutionConfig {
     /// Features that are ready for deployment can be enabled here.
     pub fn default_for_genesis() -> Self {
         OnChainExecutionConfig::V4(ExecutionConfigV4 {
-            transaction_shuffler_type: TransactionShufflerType::Fairness {
-                sender_conflict_window_size: 32,
-                module_conflict_window_size: 1,
-                entry_fun_conflict_window_size: 2,
-            },
-            block_gas_limit_type: BlockGasLimitType::ComplexLimitV1 {
-                effective_block_gas_limit: 30000,
-                execution_gas_effective_multiplier: 1,
-                io_gas_effective_multiplier: 1,
-                conflict_penalty_window: 9,
-                use_granular_resource_group_conflicts: false,
-                use_module_publishing_block_conflict: true,
-                block_output_limit: Some(5 * 1024 * 1024),
-                include_user_txn_size_in_block_output: true,
-                add_block_limit_outcome_onchain: false,
-            },
+            transaction_shuffler_type: TransactionShufflerType::default_for_genesis(),
+            block_gas_limit_type: BlockGasLimitType::default_for_genesis(),
             transaction_deduper_type: TransactionDeduperType::TxnHashAndAuthenticatorV1,
         })
     }
@@ -97,6 +83,22 @@ impl OnChainExecutionConfig {
     }
 }
 
+impl BlockGasLimitType {
+    pub fn default_for_genesis() -> Self {
+        BlockGasLimitType::ComplexLimitV1 {
+            effective_block_gas_limit: 30000,
+            execution_gas_effective_multiplier: 1,
+            io_gas_effective_multiplier: 1,
+            conflict_penalty_window: 9,
+            use_granular_resource_group_conflicts: false,
+            use_module_publishing_block_conflict: true,
+            block_output_limit: Some(5 * 1024 * 1024),
+            include_user_txn_size_in_block_output: true,
+            add_block_limit_outcome_onchain: true,
+        }
+    }
+}
+
 impl OnChainConfig for OnChainExecutionConfig {
     const MODULE_IDENTIFIER: &'static str = "execution_config";
     const TYPE_IDENTIFIER: &'static str = "ExecutionConfig";
@@ -146,11 +148,26 @@ pub enum TransactionShufflerType {
     NoShuffling,
     DeprecatedSenderAwareV1(u32),
     SenderAwareV2(u32),
-    Fairness {
+    DeprecatedFairness {
         sender_conflict_window_size: u32,
         module_conflict_window_size: u32,
         entry_fun_conflict_window_size: u32,
     },
+    UseCaseAware {
+        sender_spread_factor: usize,
+        platform_use_case_spread_factor: usize,
+        user_use_case_spread_factor: usize,
+    },
+}
+
+impl TransactionShufflerType {
+    pub fn default_for_genesis() -> Self {
+        TransactionShufflerType::UseCaseAware {
+            sender_spread_factor: 32,
+            platform_use_case_spread_factor: 0,
+            user_use_case_spread_factor: 4,
+        }
+    }
 }
 
 #[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
@@ -335,29 +352,29 @@ mod test {
     #[test]
     fn test_config_serialization() {
         let config = OnChainExecutionConfig::V1(ExecutionConfigV1 {
-            transaction_shuffler_type: TransactionShufflerType::SenderAwareV2(32),
+            transaction_shuffler_type: TransactionShufflerType::default_for_genesis(),
         });
 
         let s = serde_yaml::to_string(&config).unwrap();
         let result = serde_yaml::from_str::<OnChainExecutionConfig>(&s).unwrap();
-        assert!(matches!(
+        assert_eq!(
             result.transaction_shuffler_type(),
-            TransactionShufflerType::SenderAwareV2(32)
-        ));
+            TransactionShufflerType::default_for_genesis(),
+        );
 
         // V2 test with random per-block gas limit
         let rand_gas_limit = rand::thread_rng().gen_range(0, 1000000) as u64;
         let config = OnChainExecutionConfig::V2(ExecutionConfigV2 {
-            transaction_shuffler_type: TransactionShufflerType::SenderAwareV2(32),
+            transaction_shuffler_type: TransactionShufflerType::default_for_genesis(),
             block_gas_limit: Some(rand_gas_limit),
         });
 
         let s = serde_yaml::to_string(&config).unwrap();
         let result = serde_yaml::from_str::<OnChainExecutionConfig>(&s).unwrap();
-        assert!(matches!(
+        assert_eq!(
             result.transaction_shuffler_type(),
-            TransactionShufflerType::SenderAwareV2(32)
-        ));
+            TransactionShufflerType::default_for_genesis(),
+        );
         assert_eq!(
             result.block_gas_limit_type(),
             BlockGasLimitType::Limit(rand_gas_limit)
@@ -365,16 +382,16 @@ mod test {
 
         // V2 test with no per-block gas limit
         let config = OnChainExecutionConfig::V2(ExecutionConfigV2 {
-            transaction_shuffler_type: TransactionShufflerType::SenderAwareV2(32),
+            transaction_shuffler_type: TransactionShufflerType::default_for_genesis(),
             block_gas_limit: None,
         });
 
         let s = serde_yaml::to_string(&config).unwrap();
         let result = serde_yaml::from_str::<OnChainExecutionConfig>(&s).unwrap();
-        assert!(matches!(
+        assert_eq!(
             result.transaction_shuffler_type(),
-            TransactionShufflerType::SenderAwareV2(32)
-        ));
+            TransactionShufflerType::default_for_genesis(),
+        );
         assert_eq!(result.block_gas_limit_type(), BlockGasLimitType::NoLimit);
     }
 
diff --git a/types/src/on_chain_config/gas_schedule.rs b/types/src/on_chain_config/gas_schedule.rs
index d9817e4b84479..8f2811f4c51e8 100644
--- a/types/src/on_chain_config/gas_schedule.rs
+++ b/types/src/on_chain_config/gas_schedule.rs
@@ -3,7 +3,7 @@
 
 use crate::on_chain_config::OnChainConfig;
 use serde::{Deserialize, Serialize};
-use std::collections::BTreeMap;
+use std::collections::{btree_map, BTreeMap};
 
 #[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize)]
 pub struct GasSchedule {
@@ -16,6 +16,13 @@ pub struct GasScheduleV2 {
     pub entries: Vec<(String, u64)>,
 }
 
+#[derive(Debug)]
+pub enum DiffItem<T> {
+    Add { new_val: T },
+    Delete { old_val: T },
+    Modify { old_val: T, new_val: T },
+}
+
 #[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize)]
 pub struct StorageGasSchedule {
     pub per_item_read: u64,
@@ -40,17 +47,49 @@ impl StorageGasSchedule {
 }
 
 impl GasSchedule {
-    pub fn to_btree_map(self) -> BTreeMap<String, u64> {
+    pub fn into_btree_map(self) -> BTreeMap<String, u64> {
         // TODO: what if the gas schedule contains duplicated entries?
         self.entries.into_iter().collect()
     }
 }
 
 impl GasScheduleV2 {
-    pub fn to_btree_map(self) -> BTreeMap<String, u64> {
+    pub fn into_btree_map(self) -> BTreeMap<String, u64> {
         // TODO: what if the gas schedule contains duplicated entries?
         self.entries.into_iter().collect()
     }
+
+    pub fn to_btree_map_borrowed(&self) -> BTreeMap<&str, u64> {
+        self.entries.iter().map(|(k, v)| (k.as_str(), *v)).collect()
+    }
+
+    pub fn diff<'a>(old: &'a Self, new: &'a Self) -> BTreeMap<&'a str, DiffItem<u64>> {
+        let mut old = old.to_btree_map_borrowed();
+        let new = new.to_btree_map_borrowed();
+
+        let mut diff = BTreeMap::new();
+        for (param_name, new_val) in new {
+            match old.entry(param_name) {
+                btree_map::Entry::Occupied(entry) => {
+                    let (param_name, old_val) = entry.remove_entry();
+
+                    if old_val != new_val {
+                        diff.insert(param_name, DiffItem::Modify { old_val, new_val });
+                    }
+                },
+                btree_map::Entry::Vacant(entry) => {
+                    let param_name = entry.into_key();
+                    diff.insert(param_name, DiffItem::Add { new_val });
+                },
+            }
+        }
+        diff.extend(
+            old.into_iter()
+                .map(|(param_name, old_val)| (param_name, DiffItem::Delete { old_val })),
+        );
+
+        diff
+    }
 }
 
 impl OnChainConfig for GasSchedule {
diff --git a/types/src/on_chain_config/mod.rs b/types/src/on_chain_config/mod.rs
index 1284385d58f88..32692e9aec19a 100644
--- a/types/src/on_chain_config/mod.rs
+++ b/types/src/on_chain_config/mod.rs
@@ -52,7 +52,7 @@ pub use self::{
         BlockGasLimitType, ExecutionConfigV1, ExecutionConfigV2, ExecutionConfigV4,
         OnChainExecutionConfig, TransactionDeduperType, TransactionShufflerType,
     },
-    gas_schedule::{GasSchedule, GasScheduleV2, StorageGasSchedule},
+    gas_schedule::{DiffItem, GasSchedule, GasScheduleV2, StorageGasSchedule},
     jwk_consensus_config::{
         ConfigV1 as JWKConsensusConfigV1, OIDCProvider, OnChainJWKConsensusConfig,
     },
diff --git a/types/src/on_chain_config/randomness_api_v0_config.rs b/types/src/on_chain_config/randomness_api_v0_config.rs
index 2029da9dfe921..14538def2c702 100644
--- a/types/src/on_chain_config/randomness_api_v0_config.rs
+++ b/types/src/on_chain_config/randomness_api_v0_config.rs
@@ -12,9 +12,7 @@ pub struct RequiredGasDeposit {
 
 impl RequiredGasDeposit {
     pub fn default_for_genesis() -> Self {
-        Self {
-            gas_amount: Some(10_000),
-        }
+        Self { gas_amount: None }
     }
 
     pub fn default_if_missing() -> Self {
@@ -40,7 +38,7 @@ pub struct AllowCustomMaxGasFlag {
 
 impl AllowCustomMaxGasFlag {
     pub fn default_for_genesis() -> Self {
-        Self { value: true }
+        Self { value: false }
     }
 
     pub fn default_if_missing() -> Self {
diff --git a/types/src/on_chain_config/timed_features.rs b/types/src/on_chain_config/timed_features.rs
index 979728d19d995..74b9cf568b320 100644
--- a/types/src/on_chain_config/timed_features.rs
+++ b/types/src/on_chain_config/timed_features.rs
@@ -10,10 +10,11 @@ use strum_macros::{EnumCount as EnumCountMacro, EnumIter};
 const NOT_YET_SPECIFIED: u64 = END_OF_TIME; /* Thursday, December 31, 2099 11:59:59 PM */
 
 pub const END_OF_TIME: u64 = 4102444799000; /* Thursday, December 31, 2099 11:59:59 PM */
-#[derive(Debug, EnumCountMacro, EnumIter, Clone, Copy)]
+#[derive(Debug, EnumCountMacro, EnumIter, Clone, Copy, Eq, PartialEq)]
 pub enum TimedFeatureFlag {
     DisableInvariantViolationCheckInSwapLoc,
     LimitTypeTagSize,
+    ModuleComplexityCheck,
 }
 
 /// Representation of features that are gated by the block timestamps.
@@ -41,6 +42,7 @@ impl TimedFeatureOverride {
         Some(match self {
             Replay => match flag {
                 LimitTypeTagSize => true,
+                ModuleComplexityCheck => true,
                 // Add overrides for replay here.
                 _ => return None,
             },
@@ -58,6 +60,9 @@ impl TimedFeatureFlag {
             (DisableInvariantViolationCheckInSwapLoc, TESTNET) => NOT_YET_SPECIFIED,
             (DisableInvariantViolationCheckInSwapLoc, MAINNET) => NOT_YET_SPECIFIED,
 
+            (ModuleComplexityCheck, TESTNET) => 1719356400000, /* Tuesday, June 21, 2024 16:00:00 AM GMT-07:00 */
+            (ModuleComplexityCheck, MAINNET) => 1720033200000, /* Wednesday, July 3, 2024 12:00:00 AM GMT-07:00 */
+
             // If unspecified, a timed feature is considered enabled from the very beginning of time.
             _ => 0,
         }
@@ -128,7 +133,7 @@ impl TimedFeaturesBuilder {
     }
 }
 
-#[derive(Clone, Debug, Serialize)]
+#[derive(Clone, Debug, Serialize, Eq, PartialEq)]
 pub struct TimedFeatures([bool; TimedFeatureFlag::COUNT]);
 
 impl TimedFeatures {
diff --git a/types/src/proof/definition.rs b/types/src/proof/definition.rs
index 0586db2d9edc7..15eb25d2adc50 100644
--- a/types/src/proof/definition.rs
+++ b/types/src/proof/definition.rs
@@ -11,7 +11,7 @@ use super::{
 use crate::{
     ledger_info::LedgerInfo,
     proof::accumulator::InMemoryTransactionAccumulator,
-    transaction::{TransactionAuxiliaryData, TransactionInfo, Version},
+    transaction::{TransactionInfo, Version},
 };
 use anyhow::{bail, ensure, format_err, Context, Result};
 #[cfg(any(test, feature = "fuzzing"))]
@@ -848,16 +848,6 @@ impl TransactionInfoWithProof {
         }
     }
 
-    /// Inject auxiliary error data into transaction info if auxiliary data is present
-    pub fn inject_auxiliary_error_data(
-        &mut self,
-        auxiliary_data_opt: Option<TransactionAuxiliaryData>,
-    ) {
-        if let Some(aux_data) = auxiliary_data_opt {
-            self.transaction_info.inject_auxiliary_error_data(aux_data);
-        }
-    }
-
     /// Returns the `ledger_info_to_transaction_info_proof` object in this proof.
     pub fn ledger_info_to_transaction_info_proof(&self) -> &TransactionAccumulatorProof {
         &self.ledger_info_to_transaction_info_proof
diff --git a/types/src/proptest_types.rs b/types/src/proptest_types.rs
index 77298f9ed0d38..3605e6e88f8f3 100644
--- a/types/src/proptest_types.rs
+++ b/types/src/proptest_types.rs
@@ -21,10 +21,10 @@ use crate::{
     proof::TransactionInfoListWithProof,
     state_store::{state_key::StateKey, state_value::StateValue},
     transaction::{
-        ChangeSet, ExecutionStatus, Module, RawTransaction, Script, SignatureCheckedTransaction,
-        SignedTransaction, Transaction, TransactionArgument, TransactionAuxiliaryData,
-        TransactionInfo, TransactionListWithProof, TransactionPayload, TransactionStatus,
-        TransactionToCommit, Version, WriteSetPayload,
+        block_epilogue::BlockEndInfo, ChangeSet, ExecutionStatus, Module, RawTransaction, Script,
+        SignatureCheckedTransaction, SignedTransaction, Transaction, TransactionArgument,
+        TransactionAuxiliaryData, TransactionInfo, TransactionListWithProof, TransactionPayload,
+        TransactionStatus, TransactionToCommit, Version, WriteSetPayload,
     },
     validator_info::ValidatorInfo,
     validator_signer::ValidatorSigner,
@@ -1267,3 +1267,28 @@ impl Arbitrary for ValidatorTransaction {
             .boxed()
     }
 }
+
+impl Arbitrary for BlockEndInfo {
+    type Parameters = SizeRange;
+    type Strategy = BoxedStrategy<Self>;
+
+    fn arbitrary_with(_args: Self::Parameters) -> Self::Strategy {
+        (any::<bool>(), any::<bool>(), any::<u64>(), any::<u64>())
+            .prop_map(
+                |(
+                    block_gas_limit_reached,
+                    block_output_limit_reached,
+                    block_effective_block_gas,
+                    block_approx_output_size,
+                )| {
+                    BlockEndInfo::V0 {
+                        block_gas_limit_reached,
+                        block_output_limit_reached,
+                        block_effective_block_gas_units: block_effective_block_gas,
+                        block_approx_output_size,
+                    }
+                },
+            )
+            .boxed()
+    }
+}
diff --git a/types/src/state_store/mod.rs b/types/src/state_store/mod.rs
index a0e34f75af336..f9632a48ff86c 100644
--- a/types/src/state_store/mod.rs
+++ b/types/src/state_store/mod.rs
@@ -60,13 +60,20 @@ impl<T: TStateView<Key = StateKey>> StateView for T {}
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]
 pub enum StateViewId {
     /// State-sync applying a chunk of transactions.
-    ChunkExecution { first_version: Version },
+    ChunkExecution {
+        first_version: Version,
+    },
     /// LEC applying a block.
-    BlockExecution { block_id: HashValue },
+    BlockExecution {
+        block_id: HashValue,
+    },
     /// VmValidator verifying incoming transaction.
-    TransactionValidation { base_version: Version },
+    TransactionValidation {
+        base_version: Version,
+    },
     /// For test, db-bootstrapper, etc. Usually not aimed to pass to VM.
     Miscellaneous,
+    Replay,
 }
 
 impl<R, S, K> TStateView for R
diff --git a/types/src/state_store/state_value.rs b/types/src/state_store/state_value.rs
index a8f31ab42198f..d69b8b3fc8ec5 100644
--- a/types/src/state_store/state_value.rs
+++ b/types/src/state_store/state_value.rs
@@ -354,3 +354,15 @@ pub struct StaleStateValueIndex {
     /// The `StateKey` identifying the value associated with this record.
     pub state_key: StateKey,
 }
+
+/// Indicates a state value becomes stale since `stale_since_version`.
+#[derive(Clone, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
+#[cfg_attr(any(test, feature = "fuzzing"), derive(proptest_derive::Arbitrary))]
+pub struct StaleStateValueByKeyHashIndex {
+    /// The version since when the node is overwritten and becomes stale.
+    pub stale_since_version: Version,
+    /// The version identifying the value associated with this record.
+    pub version: Version,
+    /// The hash of `StateKey` identifying the value associated with this record.
+    pub state_key_hash: HashValue,
+}
diff --git a/types/src/transaction/block_epilogue.rs b/types/src/transaction/block_epilogue.rs
new file mode 100644
index 0000000000000..b9ac969bee068
--- /dev/null
+++ b/types/src/transaction/block_epilogue.rs
@@ -0,0 +1,51 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use aptos_crypto::HashValue;
+#[cfg(any(test, feature = "fuzzing"))]
+use proptest_derive::Arbitrary;
+use serde::{Deserialize, Serialize};
+use std::fmt::Debug;
+
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
+#[cfg_attr(any(test, feature = "fuzzing"), derive(Arbitrary))]
+pub enum BlockEpiloguePayload {
+    V0 {
+        block_id: HashValue,
+        block_end_info: BlockEndInfo,
+    },
+}
+
+impl BlockEpiloguePayload {
+    pub fn try_as_block_end_info(&self) -> Option<&BlockEndInfo> {
+        match self {
+            BlockEpiloguePayload::V0 { block_end_info, .. } => Some(block_end_info),
+        }
+    }
+}
+
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
+pub enum BlockEndInfo {
+    V0 {
+        /// Whether block gas limit was reached
+        block_gas_limit_reached: bool,
+        /// Whether block output limit was reached
+        block_output_limit_reached: bool,
+        /// Total gas_units block consumed
+        block_effective_block_gas_units: u64,
+        /// Total output size block produced
+        block_approx_output_size: u64,
+    },
+}
+
+impl BlockEndInfo {
+    pub fn limit_reached(&self) -> bool {
+        match self {
+            Self::V0 {
+                block_gas_limit_reached,
+                block_output_limit_reached,
+                ..
+            } => *block_gas_limit_reached || *block_output_limit_reached,
+        }
+    }
+}
diff --git a/types/src/transaction/block_output.rs b/types/src/transaction/block_output.rs
index acfbdd084290e..35f974f4d16b8 100644
--- a/types/src/transaction/block_output.rs
+++ b/types/src/transaction/block_output.rs
@@ -1,36 +1,41 @@
 // Copyright © Aptos Foundation
 // SPDX-License-Identifier: Apache-2.0
 
+use super::block_epilogue::BlockEndInfo;
 use std::fmt::Debug;
 
 #[derive(Debug)]
 pub struct BlockOutput<Output: Debug> {
     transaction_outputs: Vec<Output>,
-    // TODO add block_limit_info
+    block_end_info: Option<BlockEndInfo>,
 }
 
 impl<Output: Debug> BlockOutput<Output> {
-    pub fn new(transaction_outputs: Vec<Output>) -> Self {
+    pub fn new(transaction_outputs: Vec<Output>, block_end_info: Option<BlockEndInfo>) -> Self {
         Self {
             transaction_outputs,
+            block_end_info,
         }
     }
 
+    fn is_block_limit_reached(&self) -> bool {
+        self.block_end_info
+            .as_ref()
+            .map_or(false, BlockEndInfo::limit_reached)
+    }
+
     /// If block limit is not set (i.e. in tests), we can safely unwrap here
     pub fn into_transaction_outputs_forced(self) -> Vec<Output> {
-        // TODO assert there is no block limit info?
-        // assert!(self.block_limit_info_transaction.is_none());
+        assert!(!self.is_block_limit_reached());
         self.transaction_outputs
     }
 
-    // TODO add block_limit_info
-    pub fn into_inner(self) -> Vec<Output> {
-        self.transaction_outputs
+    pub fn into_inner(self) -> (Vec<Output>, Option<BlockEndInfo>) {
+        (self.transaction_outputs, self.block_end_info)
     }
 
     pub fn get_transaction_outputs_forced(&self) -> &[Output] {
-        // TODO assert there is no block limit info?
-        // assert!(self.block_limit_info_transaction.is_none());
+        assert!(!self.is_block_limit_reached());
         &self.transaction_outputs
     }
 }
diff --git a/types/src/transaction/mod.rs b/types/src/transaction/mod.rs
index 95677c986ccdd..1c2a83bea32df 100644
--- a/types/src/transaction/mod.rs
+++ b/types/src/transaction/mod.rs
@@ -42,15 +42,18 @@ use std::{
 
 pub mod analyzed_transaction;
 pub mod authenticator;
+pub mod block_epilogue;
 mod block_output;
 mod change_set;
 mod module;
 mod multisig;
 mod script;
 pub mod signature_verified_transaction;
+pub mod use_case;
 pub mod user_transaction_context;
 pub mod webauthn;
 
+pub use self::block_epilogue::{BlockEndInfo, BlockEpiloguePayload};
 #[cfg(any(test, feature = "fuzzing"))]
 use crate::state_store::create_empty_sharded_state_updates;
 use crate::{
@@ -565,19 +568,14 @@ impl SignedTransaction {
         fee_payer_address: AccountAddress,
         fee_payer_signer: AccountAuthenticator,
     ) -> Self {
-        SignedTransaction {
-            raw_txn,
-            authenticator: TransactionAuthenticator::fee_payer(
-                sender,
-                secondary_signer_addresses,
-                secondary_signers,
-                fee_payer_address,
-                fee_payer_signer,
-            ),
-            raw_txn_size: OnceCell::new(),
-            authenticator_size: OnceCell::new(),
-            committed_hash: OnceCell::new(),
-        }
+        let authenticator = TransactionAuthenticator::fee_payer(
+            sender,
+            secondary_signer_addresses,
+            secondary_signers,
+            fee_payer_address,
+            fee_payer_signer,
+        );
+        Self::new_signed_transaction(raw_txn, authenticator)
     }
 
     pub fn new_multisig(
@@ -586,13 +584,7 @@ impl SignedTransaction {
         signature: MultiEd25519Signature,
     ) -> SignedTransaction {
         let authenticator = TransactionAuthenticator::multi_ed25519(public_key, signature);
-        SignedTransaction {
-            raw_txn,
-            authenticator,
-            raw_txn_size: OnceCell::new(),
-            authenticator_size: OnceCell::new(),
-            committed_hash: OnceCell::new(),
-        }
+        Self::new_signed_transaction(raw_txn, authenticator)
     }
 
     pub fn new_multi_agent(
@@ -601,17 +593,12 @@ impl SignedTransaction {
         secondary_signer_addresses: Vec<AccountAddress>,
         secondary_signers: Vec<AccountAuthenticator>,
     ) -> Self {
-        SignedTransaction {
-            raw_txn,
-            authenticator: TransactionAuthenticator::multi_agent(
-                sender,
-                secondary_signer_addresses,
-                secondary_signers,
-            ),
-            raw_txn_size: OnceCell::new(),
-            authenticator_size: OnceCell::new(),
-            committed_hash: OnceCell::new(),
-        }
+        let authenticator = TransactionAuthenticator::multi_agent(
+            sender,
+            secondary_signer_addresses,
+            secondary_signers,
+        );
+        Self::new_signed_transaction(raw_txn, authenticator)
     }
 
     pub fn new_secp256k1_ecdsa(
@@ -619,19 +606,11 @@ impl SignedTransaction {
         public_key: secp256k1_ecdsa::PublicKey,
         signature: secp256k1_ecdsa::Signature,
     ) -> SignedTransaction {
-        let authenticator = TransactionAuthenticator::single_sender(
-            AccountAuthenticator::single_key(SingleKeyAuthenticator::new(
-                AnyPublicKey::secp256k1_ecdsa(public_key),
-                AnySignature::secp256k1_ecdsa(signature),
-            )),
-        );
-        SignedTransaction {
-            raw_txn,
-            authenticator,
-            raw_txn_size: OnceCell::new(),
-            authenticator_size: OnceCell::new(),
-            committed_hash: OnceCell::new(),
-        }
+        let authenticator = AccountAuthenticator::single_key(SingleKeyAuthenticator::new(
+            AnyPublicKey::secp256k1_ecdsa(public_key),
+            AnySignature::secp256k1_ecdsa(signature),
+        ));
+        Self::new_single_sender(raw_txn, authenticator)
     }
 
     pub fn new_keyless(
@@ -639,45 +618,21 @@ impl SignedTransaction {
         public_key: KeylessPublicKey,
         signature: KeylessSignature,
     ) -> SignedTransaction {
-        let authenticator = TransactionAuthenticator::single_sender(
-            AccountAuthenticator::single_key(SingleKeyAuthenticator::new(
-                AnyPublicKey::keyless(public_key),
-                AnySignature::keyless(signature),
-            )),
-        );
-        SignedTransaction {
-            raw_txn,
-            authenticator,
-            raw_txn_size: OnceCell::new(),
-            authenticator_size: OnceCell::new(),
-            committed_hash: OnceCell::new(),
-        }
+        let authenticator = AccountAuthenticator::single_key(SingleKeyAuthenticator::new(
+            AnyPublicKey::keyless(public_key),
+            AnySignature::keyless(signature),
+        ));
+        Self::new_single_sender(raw_txn, authenticator)
     }
 
     pub fn new_single_sender(
         raw_txn: RawTransaction,
         authenticator: AccountAuthenticator,
     ) -> SignedTransaction {
-        SignedTransaction {
-            raw_txn,
-            authenticator: TransactionAuthenticator::single_sender(authenticator),
-            raw_txn_size: OnceCell::new(),
-            authenticator_size: OnceCell::new(),
-            committed_hash: OnceCell::new(),
-        }
-    }
-
-    pub fn new_with_authenticator(
-        raw_txn: RawTransaction,
-        authenticator: TransactionAuthenticator,
-    ) -> Self {
-        Self {
+        Self::new_signed_transaction(
             raw_txn,
-            authenticator,
-            raw_txn_size: OnceCell::new(),
-            authenticator_size: OnceCell::new(),
-            committed_hash: OnceCell::new(),
-        }
+            TransactionAuthenticator::single_sender(authenticator),
+        )
     }
 
     pub fn authenticator(&self) -> TransactionAuthenticator {
@@ -922,6 +877,30 @@ impl ExecutionStatus {
         matches!(self, ExecutionStatus::Success)
     }
 
+    // Used by simulation API for showing detail error message. Should not be used by production code.
+    pub fn conmbine_vm_status_for_simulation(
+        aux_data: &TransactionAuxiliaryData,
+        partial_status: TransactionStatus,
+    ) -> Self {
+        match partial_status {
+            TransactionStatus::Keep(exec_status) => {
+                if let Some(aux_error) = aux_data.get_detail_error_message() {
+                    let status_code = aux_error.status_code;
+                    match exec_status {
+                        ExecutionStatus::MiscellaneousError(_) => {
+                            ExecutionStatus::MiscellaneousError(Some(status_code))
+                        },
+                        _ => exec_status,
+                    }
+                } else {
+                    exec_status
+                }
+            },
+            TransactionStatus::Discard(status) => ExecutionStatus::MiscellaneousError(Some(status)),
+            _ => ExecutionStatus::MiscellaneousError(None),
+        }
+    }
+
     pub fn remove_error_detail(self) -> Self {
         match self {
             ExecutionStatus::MoveAbort {
@@ -1382,14 +1361,6 @@ impl TransactionInfo {
         ))
     }
 
-    pub fn inject_auxiliary_error_data(&mut self, auxiliary_data: TransactionAuxiliaryData) {
-        match self {
-            Self::V0(ref mut info) => {
-                info.inject_auxiliary_error_data(auxiliary_data);
-            },
-        }
-    }
-
     #[cfg(any(test, feature = "fuzzing"))]
     pub fn new_placeholder(
         gas_used: u64,
@@ -1479,14 +1450,6 @@ impl TransactionInfoV0 {
         }
     }
 
-    pub fn inject_auxiliary_error_data(&mut self, auxiliary_data: TransactionAuxiliaryData) {
-        if let Some(detail) = auxiliary_data.get_detail_error_message() {
-            if let ExecutionStatus::MiscellaneousError(None) = &mut self.status {
-                self.status = ExecutionStatus::MiscellaneousError(Some(detail.status_code()))
-            }
-        }
-    }
-
     pub fn transaction_hash(&self) -> HashValue {
         self.transaction_hash
     }
@@ -1495,7 +1458,7 @@ impl TransactionInfoV0 {
         self.state_change_hash
     }
 
-    pub fn is_state_checkpoint(&self) -> bool {
+    pub fn has_state_checkpoint_hash(&self) -> bool {
         self.state_checkpoint_hash().is_some()
     }
 
@@ -1610,8 +1573,8 @@ impl TransactionToCommit {
         &self.transaction_info
     }
 
-    pub fn is_state_checkpoint(&self) -> bool {
-        self.transaction_info().is_state_checkpoint()
+    pub fn has_state_checkpoint_hash(&self) -> bool {
+        self.transaction_info().has_state_checkpoint_hash()
     }
 
     #[cfg(any(test, feature = "fuzzing"))]
@@ -1998,6 +1961,12 @@ pub enum Transaction {
     /// Transaction to update the block metadata resource at the beginning of a block,
     /// when on-chain randomness is enabled.
     BlockMetadataExt(BlockMetadataExt),
+
+    /// Transaction to let the executor update the global state tree and record the root hash
+    /// in the TransactionInfo
+    /// The hash value inside is unique block id which can generate unique hash of state checkpoint transaction
+    /// Replaces StateCheckpoint, with optionally having more data.
+    BlockEpilogue(BlockEpiloguePayload),
 }
 
 impl From<BlockMetadataExt> for Transaction {
@@ -2044,7 +2013,8 @@ impl Transaction {
             Transaction::GenesisTransaction(_) => "genesis_transaction",
             Transaction::BlockMetadata(_) => "block_metadata",
             Transaction::StateCheckpoint(_) => "state_checkpoint",
-            Transaction::ValidatorTransaction(_) => "validator_transaction",
+            Transaction::BlockEpilogue(_) => "block_epilogue",
+            Transaction::ValidatorTransaction(vt) => vt.type_name(),
             Transaction::BlockMetadataExt(_) => "block_metadata_ext",
         }
     }
@@ -2053,6 +2023,28 @@ impl Transaction {
     pub fn dummy() -> Self {
         Transaction::StateCheckpoint(HashValue::zero())
     }
+
+    pub fn is_non_reconfig_block_ending(&self) -> bool {
+        match self {
+            Transaction::StateCheckpoint(_) | Transaction::BlockEpilogue(_) => true,
+            Transaction::UserTransaction(_)
+            | Transaction::GenesisTransaction(_)
+            | Transaction::BlockMetadata(_)
+            | Transaction::BlockMetadataExt(_)
+            | Transaction::ValidatorTransaction(_) => false,
+        }
+    }
+
+    pub fn is_block_start(&self) -> bool {
+        match self {
+            Transaction::BlockMetadata(_) | Transaction::BlockMetadataExt(_) => true,
+            Transaction::StateCheckpoint(_)
+            | Transaction::BlockEpilogue(_)
+            | Transaction::UserTransaction(_)
+            | Transaction::GenesisTransaction(_)
+            | Transaction::ValidatorTransaction(_) => false,
+        }
+    }
 }
 
 impl TryFrom<Transaction> for SignedTransaction {
diff --git a/types/src/transaction/use_case.rs b/types/src/transaction/use_case.rs
new file mode 100644
index 0000000000000..ee72a61b5d964
--- /dev/null
+++ b/types/src/transaction/use_case.rs
@@ -0,0 +1,54 @@
+// Copyright (c) Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::transaction::SignedTransaction;
+use move_core_types::account_address::AccountAddress;
+
+#[derive(Clone, Eq, Hash, PartialEq)]
+pub enum UseCaseKey {
+    Platform,
+    ContractAddress(AccountAddress),
+    // ModuleBundle (deprecated anyway), scripts, Multisig.
+    Others,
+}
+
+impl std::fmt::Debug for UseCaseKey {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        use UseCaseKey::*;
+
+        match self {
+            Platform => write!(f, "PP"),
+            ContractAddress(addr) => write!(f, "c{}", hex::encode_upper(&addr[31..])),
+            Others => write!(f, "OO"),
+        }
+    }
+}
+
+pub trait UseCaseAwareTransaction {
+    fn parse_sender(&self) -> AccountAddress;
+
+    fn parse_use_case(&self) -> UseCaseKey;
+}
+
+impl UseCaseAwareTransaction for SignedTransaction {
+    fn parse_sender(&self) -> AccountAddress {
+        self.sender()
+    }
+
+    fn parse_use_case(&self) -> UseCaseKey {
+        use crate::transaction::TransactionPayload::*;
+        use UseCaseKey::*;
+
+        match self.payload() {
+            Script(_) | ModuleBundle(_) | Multisig(_) => Others,
+            EntryFunction(entry_fun) => {
+                let module_id = entry_fun.module();
+                if module_id.address().is_special() {
+                    Platform
+                } else {
+                    ContractAddress(*module_id.address())
+                }
+            },
+        }
+    }
+}
diff --git a/types/src/validator_txn.rs b/types/src/validator_txn.rs
index d99b43a96a1d2..ad6481b36f52f 100644
--- a/types/src/validator_txn.rs
+++ b/types/src/validator_txn.rs
@@ -40,6 +40,15 @@ impl ValidatorTransaction {
             },
         }
     }
+
+    pub fn type_name(&self) -> &'static str {
+        match self {
+            ValidatorTransaction::DKGResult(_) => "validator_transaction__dkg_result",
+            ValidatorTransaction::ObservedJWKUpdate(_) => {
+                "validator_transaction__observed_jwk_update"
+            },
+        }
+    }
 }
 
 #[derive(Clone, Debug, Eq, Hash, PartialEq)]
diff --git a/types/src/vm/configs.rs b/types/src/vm/configs.rs
new file mode 100644
index 0000000000000..647eaa82d924b
--- /dev/null
+++ b/types/src/vm/configs.rs
@@ -0,0 +1,138 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::on_chain_config::{
+    randomness_api_v0_config::{AllowCustomMaxGasFlag, RequiredGasDeposit},
+    ConfigStorage, FeatureFlag, Features, OnChainConfig, TimedFeatureFlag, TimedFeatureOverride,
+    TimedFeatures,
+};
+use move_binary_format::deserializer::DeserializerConfig;
+use move_bytecode_verifier::VerifierConfig;
+use move_vm_runtime::config::VMConfig;
+use move_vm_types::loaded_data::runtime_types::TypeBuilder;
+use once_cell::sync::OnceCell;
+
+static PARANOID_TYPE_CHECKS: OnceCell<bool> = OnceCell::new();
+static TIMED_FEATURE_OVERRIDE: OnceCell<TimedFeatureOverride> = OnceCell::new();
+
+pub fn set_paranoid_type_checks(enable: bool) {
+    PARANOID_TYPE_CHECKS.set(enable).ok();
+}
+
+/// Get the paranoid type check flag if already set, otherwise default to true.
+pub fn get_paranoid_type_checks() -> bool {
+    PARANOID_TYPE_CHECKS.get().cloned().unwrap_or(true)
+}
+
+pub fn set_timed_feature_override(profile: TimedFeatureOverride) {
+    TIMED_FEATURE_OVERRIDE.set(profile).ok();
+}
+
+pub fn get_timed_feature_override() -> Option<TimedFeatureOverride> {
+    TIMED_FEATURE_OVERRIDE.get().cloned()
+}
+
+pub fn aptos_prod_deserializer_config(features: &Features) -> DeserializerConfig {
+    DeserializerConfig::new(
+        features.get_max_binary_format_version(),
+        features.get_max_identifier_size(),
+    )
+}
+
+pub fn aptos_prod_verifier_config(features: &Features) -> VerifierConfig {
+    let use_signature_checker_v2 = features.is_enabled(FeatureFlag::SIGNATURE_CHECKER_V2);
+    let sig_checker_v2_fix_script_ty_param_count =
+        features.is_enabled(FeatureFlag::SIGNATURE_CHECKER_V2_SCRIPT_FIX);
+    let enable_enum_types = features.is_enabled(FeatureFlag::ENABLE_ENUM_TYPES);
+    let enable_resource_access_control =
+        features.is_enabled(FeatureFlag::ENABLE_RESOURCE_ACCESS_CONTROL);
+
+    VerifierConfig {
+        max_loop_depth: Some(5),
+        max_generic_instantiation_length: Some(32),
+        max_function_parameters: Some(128),
+        max_basic_blocks: Some(1024),
+        max_value_stack_size: 1024,
+        max_type_nodes: Some(256),
+        max_dependency_depth: Some(256),
+        max_push_size: Some(10000),
+        max_struct_definitions: None,
+        max_struct_variants: None,
+        max_fields_in_struct: None,
+        max_function_definitions: None,
+        max_back_edges_per_function: None,
+        max_back_edges_per_module: None,
+        max_basic_blocks_in_script: None,
+        max_per_fun_meter_units: Some(1000 * 80000),
+        max_per_mod_meter_units: Some(1000 * 80000),
+        use_signature_checker_v2,
+        sig_checker_v2_fix_script_ty_param_count,
+        enable_enum_types,
+        enable_resource_access_control,
+    }
+}
+
+pub fn aptos_prod_vm_config(
+    features: &Features,
+    timed_features: &TimedFeatures,
+    ty_builder: TypeBuilder,
+) -> VMConfig {
+    let check_invariant_in_swap_loc =
+        !timed_features.is_enabled(TimedFeatureFlag::DisableInvariantViolationCheckInSwapLoc);
+    let paranoid_type_checks = get_paranoid_type_checks();
+
+    let mut type_max_cost = 0;
+    let mut type_base_cost = 0;
+    let mut type_byte_cost = 0;
+    if timed_features.is_enabled(TimedFeatureFlag::LimitTypeTagSize) {
+        // 5000 limits type tag total size < 5000 bytes and < 50 nodes
+        type_max_cost = 5000;
+        type_base_cost = 100;
+        type_byte_cost = 1;
+    }
+
+    let deserializer_config = aptos_prod_deserializer_config(features);
+    let verifier_config = aptos_prod_verifier_config(features);
+
+    // Compatibility checker v2 is enabled either by its own flag or if enum types are enabled.
+    let use_compatibility_checker_v2 = verifier_config.enable_enum_types
+        || features.is_enabled(FeatureFlag::USE_COMPATIBILITY_CHECKER_V2);
+
+    VMConfig {
+        verifier_config,
+        deserializer_config,
+        paranoid_type_checks,
+        check_invariant_in_swap_loc,
+        max_value_nest_depth: Some(128),
+        type_max_cost,
+        type_base_cost,
+        type_byte_cost,
+        // By default, do not use delayed field optimization. Instead, clients should enable it
+        // manually where applicable.
+        delayed_field_optimization_enabled: false,
+        ty_builder,
+        disallow_dispatch_for_native: false,
+        use_compatibility_checker_v2,
+    }
+}
+
+/// A collection of on-chain randomness API configs that VM needs to be aware of.
+pub struct RandomnessConfig {
+    pub randomness_api_v0_required_deposit: Option<u64>,
+    pub allow_rand_contract_custom_max_gas: bool,
+}
+
+impl RandomnessConfig {
+    pub fn fetch(storage: &impl ConfigStorage) -> Self {
+        let randomness_api_v0_required_deposit = RequiredGasDeposit::fetch_config(storage)
+            .unwrap_or_else(RequiredGasDeposit::default_if_missing)
+            .gas_amount;
+        let allow_rand_contract_custom_max_gas = AllowCustomMaxGasFlag::fetch_config(storage)
+            .unwrap_or_else(AllowCustomMaxGasFlag::default_if_missing)
+            .value;
+        Self {
+            randomness_api_v0_required_deposit,
+            allow_rand_contract_custom_max_gas,
+        }
+    }
+}
diff --git a/types/src/vm/mod.rs b/types/src/vm/mod.rs
new file mode 100644
index 0000000000000..650941f42498d
--- /dev/null
+++ b/types/src/vm/mod.rs
@@ -0,0 +1,4 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod configs;
diff --git a/vm-validator/src/vm_validator.rs b/vm-validator/src/vm_validator.rs
index b559f48d13163..2fad8d72cea63 100644
--- a/vm-validator/src/vm_validator.rs
+++ b/vm-validator/src/vm_validator.rs
@@ -15,7 +15,7 @@ use aptos_types::{
     state_store::{MoveResourceExt, StateView},
     transaction::{SignedTransaction, VMValidatorResult},
 };
-use aptos_vm::{data_cache::AsMoveResolver, AptosVM};
+use aptos_vm::AptosVM;
 use aptos_vm_logging::log_schema::AdapterLogSchema;
 use fail::fail_point;
 use rand::{thread_rng, Rng};
@@ -56,10 +56,7 @@ impl VMValidator {
             AdapterLogSchema::new(state_view.id(), 0),
             "AptosVM created for Validation"
         );
-        AptosVM::new(
-            &state_view.as_move_resolver(),
-            /*override_is_delayed_field_optimization_capable=*/ None,
-        )
+        AptosVM::new(state_view)
     }
 
     pub fn new(db_reader: Arc<dyn DbReader>) -> Self {